update translations

36 files changed, 105068 insertions, 78670 deletions

diff --git a/po/be.po b/po/be.po
index e19f6dcbc..09a2e1813 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: 2019-07-02 02:06+0000\n"
+"POT-Creation-Date: 2019-08-11 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,71 +18,71 @@ 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:550
+#: gajim/chat_control_base.py:557
 msgid "_Undo"
 msgstr ""
 
-#: gajim/chat_control_base.py:558 gajim/conversation_textview.py:529
+#: gajim/chat_control_base.py:565 gajim/conversation_textview.py:529
 msgid "_Clear"
 msgstr ""
 
-#: gajim/chat_control_base.py:563
+#: gajim/chat_control_base.py:570
 msgid "Paste as quote"
 msgstr ""
 
-#: gajim/chat_control_base.py:613
+#: gajim/chat_control_base.py:620
 #, fuzzy
 msgid "Paste Image"
 msgstr "Выберыце малюнак"
 
-#: gajim/chat_control_base.py:614
+#: gajim/chat_control_base.py:621
 #, fuzzy
 msgid "You are trying to paste an image"
 msgstr "Вы не злучаны з серверам"
 
-#: gajim/chat_control_base.py:615
+#: gajim/chat_control_base.py:622
 #, fuzzy
 msgid ""
 "Are you sure you want to paste your clipboard's image into the chat window?"
 msgstr "Вы сапраўды хочаце сысці з групавой размовы \"%s\"?"
 
-#: gajim/chat_control_base.py:617 gajim/groupchat_control.py:2310
-#: gajim/roster_window.py:2848 gajim/roster_window.py:4167
-#: gajim/message_window.py:252 gajim/gtk/dialogs.py:418
+#: gajim/chat_control_base.py:624 gajim/groupchat_control.py:2218
+#: gajim/roster_window.py:2841 gajim/roster_window.py:4118
+#: gajim/message_window.py:359 gajim/gtk/dialogs.py:330
 #, fuzzy
 msgid "_Do not ask me again"
 msgstr "_Больш не пытацца"
 
-#: gajim/chat_control_base.py:620
+#: gajim/chat_control_base.py:627
 msgid "_Paste"
 msgstr ""
 
-#: gajim/chat_control_base.py:1162 gajim/gtk/accounts.py:351
+#: gajim/chat_control_base.py:1169 gajim/gtk/accounts.py:354
 #, fuzzy
 msgid "Privacy"
 msgstr "Спіс прыватнасці"
 
-#: gajim/chat_control_base.py:1163
+#: gajim/chat_control_base.py:1170
 #, fuzzy
 msgid "Warning"
 msgstr "Забарона казання для %s"
 
-#: gajim/chat_control_base.py:1164
+#: gajim/chat_control_base.py:1171
 #, python-format
 msgid "If you send a file to <b>%s</b>, your real JID will be revealed."
 msgstr ""
 
-#: gajim/chat_control_base.py:1169
+#: gajim/chat_control_base.py:1176
 #, fuzzy
 msgid "Continue"
 msgstr "_Працягнуць"
 
-#: gajim/gtkgui_helpers.py:163 gajim/gtk/filetransfer.py:393
+#: gajim/gtkgui_helpers.py:163 gajim/gtk/filetransfer.py:398
 #, fuzzy, python-format
 msgid "Cannot overwrite existing file '%s'"
 msgstr "Немагчыма перапісаць наяўны файл \"%s\""
 
-#: gajim/gtkgui_helpers.py:164 gajim/gtk/filetransfer.py:394
+#: gajim/gtkgui_helpers.py:164 gajim/gtk/filetransfer.py:399
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
@@ -170,232 +170,226 @@ msgstr ""
 msgid " resource with priority "
 msgstr " рэсурс з прыярытэтам "
 
-#: gajim/gui_menu_builder.py:96
-#, fuzzy
-msgid "_New Group Chat"
-msgstr "Новая групавая размова"
-
-#: gajim/gui_menu_builder.py:289 gajim/gui_menu_builder.py:380
-#: gajim/chat_control.py:303 gajim/roster_window.py:786
-#: gajim/roster_window.py:1719 gajim/roster_window.py:1721
-#: gajim/roster_window.py:2030 gajim/roster_window.py:3336
-#: gajim/roster_window.py:3369 gajim/gui_interface.py:413
-#: gajim/common/contacts.py:206 gajim/common/contacts.py:343
-#: gajim/common/helpers.py:83 gajim/common/helpers.py:311
-#: gajim/gtk/add_contact.py:319 gajim/gtk/subscription_request.py:70
-#: gajim/gtk/subscription_request.py:99 gajim/gtk/roster_item_exchange.py:112
-msgid "Not in Roster"
-msgstr "Няма ў спісе"
+#: gajim/gui_menu_builder.py:251 gajim/gui_menu_builder.py:342
+#: gajim/chat_control.py:305 gajim/roster_window.py:783
+#: gajim/roster_window.py:1716 gajim/roster_window.py:1718
+#: gajim/roster_window.py:2027 gajim/roster_window.py:3292
+#: gajim/roster_window.py:3325 gajim/gui_interface.py:396
+#: gajim/common/contacts.py:222 gajim/common/contacts.py:359
+#: gajim/common/contacts.py:471 gajim/common/helpers.py:86
+#: gajim/common/helpers.py:317 gajim/gtk/add_contact.py:319
+#: gajim/gtk/subscription_request.py:70 gajim/gtk/subscription_request.py:99
+#: gajim/gtk/roster_item_exchange.py:112
+#, fuzzy
+msgid "Not in contact list"
+msgstr "Паказаць _адлучаных людзей"
 
-#: gajim/gui_menu_builder.py:393
-msgid "I would like to add you to my roster"
-msgstr "Я хачу дадаць Вас у мой кантактны ліст"
+#: gajim/gui_menu_builder.py:355
+#, fuzzy
+msgid "I would like to add you to my contact list"
+msgstr "Я хачу дадаць Вас у свой кантактны ліст."
 
-#: gajim/gui_menu_builder.py:471
+#: gajim/gui_menu_builder.py:433
 #, fuzzy
 msgid "Send Single _Message…"
 msgstr "Адправіць _асобнае паведамленне"
 
-#: gajim/gui_menu_builder.py:486
+#: gajim/gui_menu_builder.py:448
 #, fuzzy
 msgid "E_xecute Command…"
 msgstr "_Выканаць загад..."
 
-#: gajim/gui_menu_builder.py:494
+#: gajim/gui_menu_builder.py:456
 #, fuzzy
 msgid "_Manage Transport"
 msgstr "Транспарты"
 
-#: gajim/gui_menu_builder.py:500
+#: gajim/gui_menu_builder.py:462
 #, fuzzy
 msgid "_Modify Transport"
 msgstr "Паказаць _транспарты"
 
-#: gajim/gui_menu_builder.py:507 gajim/roster_window.py:5046
+#: gajim/gui_menu_builder.py:469 gajim/roster_window.py:4985
 #, fuzzy
 msgid "_Rename…"
 msgstr "Змяніць _імя"
 
-#: gajim/gui_menu_builder.py:518 gajim/roster_window.py:5062
-#: gajim/roster_window.py:5177 gajim/data/gui/blocked_contacts_window.ui:52
+#: gajim/gui_menu_builder.py:480 gajim/roster_window.py:5001
+#: gajim/roster_window.py:5116 gajim/data/gui/blocked_contacts_window.ui:52
 #: gajim/data/gui/gc_occupants_menu.ui:148
 #: gajim/data/gui/contact_context_menu.ui:143
 msgid "_Unblock"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:521 gajim/roster_window.py:5067
-#: gajim/roster_window.py:5181 gajim/data/gui/gc_occupants_menu.ui:140
+#: gajim/gui_menu_builder.py:483 gajim/roster_window.py:5006
+#: gajim/roster_window.py:5120 gajim/data/gui/gc_occupants_menu.ui:140
 #: gajim/data/gui/contact_context_menu.ui:151
 msgid "_Block"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:529 gajim/roster_window.py:5074
+#: gajim/gui_menu_builder.py:491 gajim/roster_window.py:5013
 #: gajim/data/gui/contact_context_menu.ui:181
 #, fuzzy
 msgid "Remo_ve"
 msgstr "Вы_даліць"
 
-#: gajim/gui_menu_builder.py:539 gajim/data/gui/contact_context_menu.ui:198
+#: gajim/gui_menu_builder.py:501 gajim/data/gui/contact_context_menu.ui:198
 #, fuzzy
 msgid "_Information"
 msgstr "Асабістыя звесткі"
 
-#: gajim/gui_menu_builder.py:552
+#: gajim/gui_menu_builder.py:514
 #, fuzzy
 msgid "Save _As"
 msgstr "Мае "
 
-#: gajim/gui_menu_builder.py:564 gajim/groupchat_control.py:501
-#: gajim/chat_control.py:340
+#: gajim/gui_menu_builder.py:526 gajim/groupchat_control.py:507
+#: gajim/chat_control.py:342
 #, fuzzy
 msgid "Send File…"
 msgstr "Адправіць _файл"
 
-#: gajim/gui_menu_builder.py:565
+#: gajim/gui_menu_builder.py:527
 #, fuzzy
 msgid "Upload File…"
 msgstr "Захаваць файл як..."
 
-#: gajim/gui_menu_builder.py:566
+#: gajim/gui_menu_builder.py:528
 #, fuzzy
 msgid "Send File Directly…"
 msgstr "Захаваць файл як..."
 
-#: gajim/gui_menu_builder.py:568 gajim/gui_menu_builder.py:632
+#: gajim/gui_menu_builder.py:530 gajim/gui_menu_builder.py:596
 #, fuzzy
 msgid "Send Chatstate"
 msgstr "Апошняе паведамленне: %s"
 
-#: gajim/gui_menu_builder.py:569
+#: gajim/gui_menu_builder.py:531
 #, fuzzy
 msgid "Invite Contacts"
 msgstr "Людзі"
 
-#: gajim/gui_menu_builder.py:570
+#: gajim/gui_menu_builder.py:532
 #, fuzzy
-msgid "Add to Roster"
-msgstr "_Дадаць у кантактны ліст"
+msgid "Add to Contact List"
+msgstr "_Дадаць чалавека..."
 
-#: gajim/gui_menu_builder.py:571
-msgid "Audio Session"
-msgstr ""
+#: gajim/gui_menu_builder.py:533
+#, fuzzy
+msgid "Voice Chat"
+msgstr "Запыт на перадачу файла"
 
-#: gajim/gui_menu_builder.py:572
-msgid "Video Session"
-msgstr ""
+#: gajim/gui_menu_builder.py:534
+#, fuzzy
+msgid "Video Chat"
+msgstr "Прыватная размова"
 
-#: gajim/gui_menu_builder.py:573
+#: gajim/gui_menu_builder.py:535 gajim/gui_menu_builder.py:582
 #, fuzzy
 msgid "Information"
 msgstr "Асабістыя звесткі"
 
-#: gajim/gui_menu_builder.py:574 gajim/gui_menu_builder.py:639
+#: gajim/gui_menu_builder.py:536 gajim/gui_menu_builder.py:602
 #: gajim/data/gui/application_menu.ui:37
 #, fuzzy
 msgid "History"
 msgstr "_Журнал"
 
-#: gajim/gui_menu_builder.py:580 gajim/gui_menu_builder.py:687
+#: gajim/gui_menu_builder.py:542 gajim/gui_menu_builder.py:650
 #: gajim/data/gui/preferences_window.ui:1823
 msgid "Disabled"
 msgstr "Адключана"
 
-#: gajim/gui_menu_builder.py:581 gajim/gui_menu_builder.py:688
+#: gajim/gui_menu_builder.py:543 gajim/gui_menu_builder.py:651
 #, fuzzy
 msgid "Composing only"
 msgstr "Піша"
 
-#: gajim/gui_menu_builder.py:582 gajim/gui_menu_builder.py:689
+#: gajim/gui_menu_builder.py:544 gajim/gui_menu_builder.py:652
 #, fuzzy
 msgid "All chat states"
 msgstr "Усе станы"
 
-#: gajim/gui_menu_builder.py:620
+#: gajim/gui_menu_builder.py:583
 #, fuzzy
-msgid "Manage Room"
-msgstr "Кіраванне закладкамі"
+msgid "Manage Group Chat"
+msgstr "Сысці з групавых размоў"
 
-#: gajim/gui_menu_builder.py:621
+#: gajim/gui_menu_builder.py:584 gajim/data/gui/groupchat_control.ui:649
 #, fuzzy
 msgid "Change Subject"
 msgstr "Змяніць _тэму"
 
-#: gajim/gui_menu_builder.py:622
+#: gajim/gui_menu_builder.py:585
 #, fuzzy
-msgid "Configure Room"
-msgstr "Настаўленні _пакоя"
+msgid "Configure Group Chat"
+msgstr "Сысці з групавых размоў"
 
-#: gajim/gui_menu_builder.py:623
+#: gajim/gui_menu_builder.py:586
 #, fuzzy
 msgid "Upload Avatar…"
 msgstr "Выберыце малюнак"
 
-#: gajim/gui_menu_builder.py:624
+#: gajim/gui_menu_builder.py:587
 #, fuzzy
-msgid "Destroy Room"
-msgstr "Апісанне: %s"
+msgid "Destroy Group Chat"
+msgstr "Новая групавая размова"
 
-#: gajim/gui_menu_builder.py:626 gajim/data/gui/preferences_window.ui:790
+#: gajim/gui_menu_builder.py:589 gajim/data/gui/preferences_window.ui:790
 #, fuzzy
 msgid "Chat Settings"
 msgstr "Памылка злучэння"
 
-#: gajim/gui_menu_builder.py:627
+#: gajim/gui_menu_builder.py:590
 msgid "Show join/leave"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:628
+#: gajim/gui_menu_builder.py:591
 #, fuzzy
 msgid "Show status changes"
 msgstr "_Пісаць у журнал паведамленні аб змене стану чалавека"
 
-#: gajim/gui_menu_builder.py:629 gajim/data/gui/gc_control_popup_menu.ui:72
+#: gajim/gui_menu_builder.py:592 gajim/data/gui/gc_control_popup_menu.ui:72
 #, fuzzy
 msgid "Notify on all messages"
 msgstr "Стандартныя паведамленні:"
 
-#: gajim/gui_menu_builder.py:630
+#: gajim/gui_menu_builder.py:593
 msgid "Minimize on close"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:631
-msgid "Minimize on autojoin"
+#: gajim/gui_menu_builder.py:595
+msgid "Minimize when joining automatically"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:634
+#: gajim/gui_menu_builder.py:598
 msgid "Sync Threshold"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:635
+#: gajim/gui_menu_builder.py:599
 #, fuzzy
-msgid "Change Nick"
+msgid "Change Nickname"
 msgstr "Змяніць м_янушку"
 
-#: gajim/gui_menu_builder.py:636
-#, fuzzy
-msgid "Bookmark Room"
-msgstr "_Змясціць у закладках"
-
-#: gajim/gui_menu_builder.py:637
+#: gajim/gui_menu_builder.py:600
 #, fuzzy
 msgid "Request Voice"
 msgstr "_Голас"
 
-#: gajim/gui_menu_builder.py:638 gajim/roster_window.py:5246
+#: gajim/gui_menu_builder.py:601 gajim/roster_window.py:5185
 #, fuzzy
 msgid "Execute command"
 msgstr "_Выканаць загад..."
 
-#: gajim/gui_menu_builder.py:640
-#, fuzzy
-msgid "Disconnect"
-msgstr "Чалавек адлучыўся"
+#: gajim/gui_menu_builder.py:603
+msgid "Leave"
+msgstr ""
 
-#: gajim/gui_menu_builder.py:678 gajim/gtk/preferences.py:156
+#: gajim/gui_menu_builder.py:641 gajim/gtk/preferences.py:155
 msgid "No threshold"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:680 gajim/gtk/preferences.py:158
+#: gajim/gui_menu_builder.py:643 gajim/gtk/preferences.py:157
 #, fuzzy, python-format
 msgid "%i day"
 msgid_plural "%i days"
@@ -403,159 +397,174 @@ msgstr[0] "%i дзён таму"
 msgstr[1] "%i дзён таму"
 msgstr[2] "%i дзён таму"
 
-#: gajim/gui_menu_builder.py:709 gajim/gui_menu_builder.py:747
-#: gajim/gtk/join_groupchat.py:43
-msgid "Join Group Chat"
-msgstr "Удзельнічаць у групавой размове"
-
-#: gajim/gui_menu_builder.py:746
+#: gajim/gui_menu_builder.py:672
 #, fuzzy
 msgid "Add Contact…"
 msgstr "_Дадаць чалавека..."
 
-#: gajim/gui_menu_builder.py:748 gajim/gtk/profile.py:52
-#: gajim/gtk/accounts.py:770 gajim/gtk/accounts.py:808
+#: gajim/gui_menu_builder.py:673 gajim/gtk/profile.py:52
+#: gajim/gtk/accounts.py:773 gajim/gtk/accounts.py:811
 #, fuzzy
 msgid "Profile"
 msgstr "файл"
 
-#: gajim/gui_menu_builder.py:749
+#: gajim/gui_menu_builder.py:674
+#, fuzzy
+msgid "Send Single Message…"
+msgstr "Адправіць _асобнае паведамленне"
+
+#: gajim/gui_menu_builder.py:675
 #, fuzzy
 msgid "Discover Services"
 msgstr "_Пошук сервісаў"
 
-#: gajim/gui_menu_builder.py:750
+#: gajim/gui_menu_builder.py:676 gajim/gtk/server_info.py:36
 #, fuzzy
-msgid "Send Single Message…"
-msgstr "Адправіць _асобнае паведамленне"
+msgid "Server Info"
+msgstr "Сервер"
 
-#: gajim/gui_menu_builder.py:751 gajim/data/gui/preferences_window.ui:2741
+#: gajim/gui_menu_builder.py:677 gajim/data/gui/preferences_window.ui:2741
 msgid "Advanced"
 msgstr "Адмысловы"
 
-#: gajim/gui_menu_builder.py:752 gajim/gtk/mam_preferences.py:88
+#: gajim/gui_menu_builder.py:678 gajim/gtk/mam_preferences.py:88
 #, fuzzy
 msgid "Archiving Preferences"
 msgstr "_Настаўленні"
 
-#: gajim/gui_menu_builder.py:753
+#: gajim/gui_menu_builder.py:679
 #, fuzzy
 msgid "Blocking List"
 msgstr "Чорны спіс"
 
-#: gajim/gui_menu_builder.py:754 gajim/gtk/history_sync.py:108
+#: gajim/gui_menu_builder.py:680
+#, fuzzy
+msgid "Bookmarks"
+msgstr "_Змясціць у закладках"
+
+#: gajim/gui_menu_builder.py:681
+#, fuzzy
+msgid "PEP Configuration"
+msgstr "Настаўленні пакоя"
+
+#: gajim/gui_menu_builder.py:682 gajim/gtk/history_sync.py:108
 #: gajim/gtk/history_sync.py:186
 #, fuzzy
 msgid "Synchronise History"
 msgstr "Паказаць _адлучаных людзей"
 
-#: gajim/gui_menu_builder.py:755 gajim/gtk/privacy_list.py:427
+#: gajim/gui_menu_builder.py:683 gajim/gtk/privacy_list.py:427
 msgid "Privacy Lists"
 msgstr "Спісы прыватнасці"
 
-#: gajim/gui_menu_builder.py:756 gajim/gtk/server_info.py:36
-#, fuzzy
-msgid "Server Info"
-msgstr "Сервер"
-
-#: gajim/gui_menu_builder.py:757 gajim/gui_menu_builder.py:768
+#: gajim/gui_menu_builder.py:685 gajim/gui_menu_builder.py:696
 #: gajim/data/gui/xml_console_window.ui:77
 msgid "XML Console"
 msgstr "Кансоль XML"
 
-#: gajim/gui_menu_builder.py:759 gajim/data/gui/groupchat_config.ui:36
+#: gajim/gui_menu_builder.py:687 gajim/data/gui/groupchat_config.ui:36
 #, fuzzy
 msgid "Admin"
 msgstr "_Адміністратар"
 
-#: gajim/gui_menu_builder.py:760
+#: gajim/gui_menu_builder.py:688
 #, fuzzy
 msgid "Send Server Message…"
 msgstr "Ад_правіць паведамленне серверу"
 
-#: gajim/gui_menu_builder.py:761
+#: gajim/gui_menu_builder.py:689
 #, fuzzy
 msgid "Set MOTD…"
 msgstr "Вызначыць MOTD"
 
-#: gajim/gui_menu_builder.py:762
+#: gajim/gui_menu_builder.py:690
 #, fuzzy
 msgid "Update MOTD…"
 msgstr "Абнавіць MOTD"
 
-#: gajim/gui_menu_builder.py:763
+#: gajim/gui_menu_builder.py:691
 #, fuzzy
 msgid "Delete MOTD…"
 msgstr "Выдаліць MOTD"
 
-#: gajim/gui_menu_builder.py:812
+#: gajim/gui_menu_builder.py:736
 #, fuzzy
-msgid "No Accounts available"
-msgstr "Рахункаў няма"
+msgid "_Add Account…"
+msgstr "_Дадаць чалавека..."
+
+#: gajim/gui_menu_builder.py:742
+#, fuzzy
+msgid "_Modify Accounts…"
+msgstr "Змяніць рахунак"
+
+#: gajim/gui_menu_builder.py:751 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:823 gajim/data/gui/application_menu.ui:5
-#: gajim/data/gui/application_menu.ui:71 gajim/data/gui/shortcuts_window.ui:182
-#: gajim/gtk/accounts.py:58
+#: gajim/gui_menu_builder.py:755 gajim/data/gui/application_menu.ui:5
+#: gajim/data/gui/shortcuts_window.ui:182 gajim/gtk/accounts.py:57
 msgid "Accounts"
 msgstr "Рахункі"
 
-#: gajim/gui_menu_builder.py:881 gajim/gui_menu_builder.py:886
+#: gajim/gui_menu_builder.py:784 gajim/gui_menu_builder.py:789
 #, fuzzy
-msgid "Copy JID"
-msgstr "Пакой:"
+msgid "Copy XMPP Address"
+msgstr "_Скапіяваць JID / паштовы адрас"
 
-#: gajim/gui_menu_builder.py:882 gajim/gui_menu_builder.py:914
+#: gajim/gui_menu_builder.py:785 gajim/gui_menu_builder.py:817
 #, fuzzy
 msgid "Join Groupchat"
 msgstr "Удзельнічаць у групавой размове"
 
-#: gajim/gui_menu_builder.py:887 gajim/gui_menu_builder.py:913
-#: gajim/data/gui/application_menu.ui:76
+#: gajim/gui_menu_builder.py:790 gajim/gui_menu_builder.py:816
+#: gajim/data/gui/application_menu.ui:71
 #: gajim/data/gui/subscription_request_window.ui:106
 msgid "Start Chat"
 msgstr "Пачаць размову"
 
-#: gajim/gui_menu_builder.py:888 gajim/gui_menu_builder.py:915
+#: gajim/gui_menu_builder.py:791 gajim/gui_menu_builder.py:818
 #, fuzzy
-msgid "Add to Roster…"
-msgstr "_Дадаць у кантактны ліст"
+msgid "Add to Contact List…"
+msgstr "_Дадаць чалавека..."
 
-#: gajim/gui_menu_builder.py:893
+#: gajim/gui_menu_builder.py:796
 #, fuzzy
 msgid "Copy Link Location"
 msgstr "_Скапіяваць адрас спасылкі"
 
-#: gajim/gui_menu_builder.py:894
+#: gajim/gui_menu_builder.py:797
 #, fuzzy
 msgid "Open Link in Browser"
 msgstr "_Адкрыць у праглядальніку"
 
-#: gajim/gui_menu_builder.py:899
+#: gajim/gui_menu_builder.py:802
 #, fuzzy
 msgid "Copy Email Address"
 msgstr "_Скапіяваць JID / паштовы адрас"
 
-#: gajim/gui_menu_builder.py:900 gajim/gui_menu_builder.py:912
+#: gajim/gui_menu_builder.py:803 gajim/gui_menu_builder.py:815
 #, fuzzy
 msgid "Open Email Composer"
 msgstr "_Напісаць ліст"
 
-#: gajim/gui_menu_builder.py:905
+#: gajim/gui_menu_builder.py:808
 #, fuzzy
 msgid "Copy Location"
 msgstr "_Скапіяваць адрас спасылкі"
 
-#: gajim/gui_menu_builder.py:906
+#: gajim/gui_menu_builder.py:809
 #, fuzzy
 msgid "Show Location"
 msgstr "Змяненне рахунка"
 
-#: gajim/gui_menu_builder.py:911
+#: gajim/gui_menu_builder.py:814
 #, fuzzy
-msgid "Copy JID/Email"
+msgid "Copy XMPP Address/Email"
 msgstr "_Скапіяваць JID / паштовы адрас"
 
-#: gajim/gui_menu_builder.py:945
+#: gajim/gui_menu_builder.py:852
 #, fuzzy
 msgid "Copy"
 msgstr "Пакой:"
@@ -578,44 +587,55 @@ msgstr ""
 msgid "Choose folder for logfile"
 msgstr ""
 
-#: gajim/history_manager.py:107
+#: gajim/history_manager.py:106
 msgid "Cannot find history logs database"
 msgstr "Немагчыма адшукаць базу дадзеных"
 
-#: gajim/history_manager.py:108
+#: gajim/history_manager.py:107
 #, fuzzy, python-format
 msgid "%s does not exist."
 msgstr "Такой групавой размовы няма."
 
-#: gajim/history_manager.py:141 gajim/history_manager.py:195
-#: gajim/gtk/discovery.py:829 gajim/gtk/roster_item_exchange.py:80
-msgid "JID"
-msgstr "JID"
+#: gajim/history_manager.py:140 gajim/history_manager.py:194
+#: 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:30
+#: gajim/gtk/accounts.py:804
+#, fuzzy
+msgid "XMPP Address"
+msgstr "Адрас AIM:"
 
-#: gajim/history_manager.py:154 gajim/history_manager.py:202
+#: gajim/history_manager.py:153 gajim/history_manager.py:201
 #: gajim/data/gui/history_window.ui:89 gajim/gtk/history.py:108
 msgid "Date"
 msgstr "Дата"
 
-#: gajim/history_manager.py:161 gajim/history_manager.py:225
+#: gajim/history_manager.py:160 gajim/history_manager.py:224
 #: gajim/data/gui/join_groupchat_window.ui:208
 #: gajim/data/gui/profile_window.ui:214
 #: gajim/data/gui/vcard_information_window.ui:443
+#: gajim/data/gui/bookmarks.ui:140
 msgid "Nickname"
 msgstr "Мянушка"
 
-#: gajim/history_manager.py:172 gajim/history_manager.py:211
+#: gajim/history_manager.py:171 gajim/history_manager.py:210
 #: gajim/data/gui/preferences_window.ui:1344
 #: gajim/data/gui/single_message_window.ui:275 gajim/gtk/history.py:117
 msgid "Message"
 msgstr "Паведамленне"
 
-#: gajim/history_manager.py:180 gajim/history_manager.py:218
+#: gajim/history_manager.py:179 gajim/history_manager.py:217
 #: gajim/data/gui/groups_post_window.ui:49
 #: gajim/data/gui/single_message_window.ui:214
 msgid "Subject"
 msgstr "Тэма"
 
+#: gajim/history_manager.py:247
+msgid "Database Cleanup"
+msgstr ""
+
 #: gajim/history_manager.py:248
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
@@ -627,11 +647,8 @@ msgstr ""
 #: gajim/history_manager.py:250
 #, fuzzy
 msgid ""
-"Normally allocated database size will not be freed, it will just become "
-"reusable. If you really want to reduce database filesize, click YES, else "
-"click NO.\n"
-"\n"
-"In case you click YES, please wait…"
+"Normally, the allocated database size will not be freed, it will just become "
+"reusable. This operation may take a while."
 msgstr ""
 "Звычайна памер базы дадзеных не змяншаецца, але вызваленае месца можа быць "
 "скарыстаным для пазнейшых размоў. Калі Вы хочаце зменшыць памер базы "
@@ -640,26 +657,27 @@ msgstr ""
 "Калі Вы выбралі Так, пачакайце..."
 
 #: gajim/history_manager.py:255
-msgid "Database Cleanup"
-msgstr ""
+#, fuzzy
+msgid "_Cleanup"
+msgstr "Па_чысціць"
 
-#: gajim/history_manager.py:519 gajim/gtk/filetransfer.py:238
-#: gajim/gtk/filetransfer.py:248
+#: gajim/history_manager.py:518 gajim/gtk/filetransfer.py:237
+#: gajim/gtk/filetransfer.py:247
 msgid "You"
 msgstr "Вы"
 
-#: gajim/history_manager.py:531
+#: gajim/history_manager.py:530
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(who)s а %(time)s сказаў: %(message)s\n"
 
-#: gajim/history_manager.py:568 gajim/history_manager.py:607
-#: gajim/gtk/dialogs.py:58 gajim/gtk/themes.py:319
+#: gajim/history_manager.py:567 gajim/history_manager.py:606
+#: gajim/gtk/dialogs.py:57 gajim/gtk/themes.py:319
 #: gajim/gtk/roster_item_exchange.py:75 gajim/gtk/roster_item_exchange.py:185
 msgid "Delete"
 msgstr "Выдаліць"
 
-#: gajim/history_manager.py:569
+#: gajim/history_manager.py:568
 #, fuzzy
 msgid "Delete Conversation"
 msgid_plural "Delete Conversations"
@@ -667,7 +685,7 @@ msgstr[0] "Асабістыя звесткі"
 msgstr[1] "Асабістыя звесткі"
 msgstr[2] "Асабістыя звесткі"
 
-#: gajim/history_manager.py:570
+#: gajim/history_manager.py:569
 #, 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?"
@@ -675,7 +693,7 @@ msgstr[0] "Вы сапраўды хочаце выдаліць выбранае
 msgstr[1] "Вы сапраўды хочаце выдаліць выбранае паведамленне?"
 msgstr[2] "Вы сапраўды хочаце выдаліць выбранае паведамленне?"
 
-#: gajim/history_manager.py:608
+#: gajim/history_manager.py:607
 #, fuzzy
 msgid "Delete Message"
 msgid_plural "Delete Messages"
@@ -683,7 +701,7 @@ msgstr[0] "Стандартныя паведамленні стану"
 msgstr[1] "Стандартныя паведамленні стану"
 msgstr[2] "Стандартныя паведамленні стану"
 
-#: gajim/history_manager.py:609
+#: gajim/history_manager.py:608
 #, fuzzy
 msgid "Do you want to permanently delete this message"
 msgid_plural "Do you want to permanently delete these messages"
@@ -697,15 +715,15 @@ msgid "Contact name: <i>%s</i>"
 msgstr "Імя чалавека: <i>%s</i>"
 
 #: gajim/dialogs.py:84
-#, fuzzy, python-format
-msgid "JID: <i>%s</i>"
-msgstr "Jabber ID: <i>%s</i>"
+#, python-format
+msgid "XMPP Address: <i>%s</i>"
+msgstr ""
 
-#: gajim/dialogs.py:115 gajim/dialogs.py:128 gajim/roster_window.py:2901
-#: gajim/roster_window.py:3833 gajim/roster_window.py:5084
-#: gajim/common/contacts.py:157 gajim/common/contacts.py:190
+#: gajim/dialogs.py:115 gajim/dialogs.py:128 gajim/roster_window.py:2894
+#: gajim/roster_window.py:3784 gajim/roster_window.py:5023
+#: gajim/common/contacts.py:157 gajim/common/contacts.py:206
 #: gajim/data/gui/preferences_window.ui:558
-#: gajim/data/gui/shortcuts_window.ui:177 gajim/gtk/accounts.py:349
+#: gajim/data/gui/shortcuts_window.ui:177 gajim/gtk/accounts.py:352
 msgid "General"
 msgstr "Агульная"
 
@@ -752,7 +770,7 @@ msgstr "Паведамленне аб змене стану"
 msgid "Preset name is already in use. Do you want to overwrite this preset?"
 msgstr "Гэтая назва ўжо скарыстаная для іншага рахунка. Выберыце іншую назву."
 
-#: gajim/dialogs.py:703
+#: gajim/dialogs.py:703 gajim/plugins/gui.py:292
 msgid "_Overwrite"
 msgstr ""
 
@@ -764,9 +782,7 @@ msgstr "Захаваць гэтае паведамленне аб змене с�
 msgid "Please type a name for this status message"
 msgstr "Вызначце назву гэтага паведамлення аб змене стану"
 
-#: gajim/dialogs.py:740 gajim/gui_interface.py:1441 gajim/dialog_messages.py:31
-#: gajim/gtk/discovery.py:518 gajim/gtk/profile.py:323
-#: gajim/gtk/join_groupchat.py:234
+#: gajim/dialogs.py:740 gajim/gtk/discovery.py:517 gajim/gtk/profile.py:323
 msgid "You are not connected to the server"
 msgstr "Вы не злучаны з серверам"
 
@@ -775,9 +791,11 @@ msgstr "Вы не злучаны з серверам"
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Вы не можаце змяніць пароль, не злучыўшыся з серверам."
 
-#: gajim/dialogs.py:752 gajim/dialogs.py:823 gajim/gtk/discovery.py:822
-#: gajim/gtk/discovery.py:1648 gajim/gtk/discovery.py:1941
-#: gajim/gtk/history.py:99 gajim/gtk/roster_item_exchange.py:83
+#: gajim/dialogs.py:752 gajim/dialogs.py:823
+#: gajim/data/gui/groupchat_info_scrolled.ui:16 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/gtk/roster_item_exchange.py:83
 msgid "Name"
 msgstr "Назва"
 
@@ -800,398 +818,344 @@ msgstr ""
 msgid "Synchronise"
 msgstr ""
 
-#: gajim/dialogs.py:1043
+#: gajim/dialogs.py:1042
 msgid "an audio and video"
 msgstr ""
 
-#: gajim/dialogs.py:1045
+#: gajim/dialogs.py:1044
 msgid "an audio"
 msgstr ""
 
-#: gajim/dialogs.py:1047
+#: gajim/dialogs.py:1046
 msgid "a video"
 msgstr ""
 
-#: gajim/dialogs.py:1051
+#: gajim/dialogs.py:1050
 #, python-format
 msgid ""
-"%(contact)s wants to start %(type)s session with you. Do you want to answer "
+"%(contact)s wants to start a %(type)s chat with you. Do you want to answer "
 "the call?"
 msgstr ""
 
-#: gajim/groupchat_control.py:505
+#: gajim/groupchat_control.py:511
 #, fuzzy, python-format
 msgid "Send File (max. %s MiB)…"
 msgstr "Захаваць файл як..."
 
-#: gajim/groupchat_control.py:507 gajim/chat_control.py:342
+#: gajim/groupchat_control.py:513 gajim/chat_control.py:344
 #, fuzzy
 msgid "No File Transfer available"
 msgstr "Перадача файлаў"
 
-#: gajim/groupchat_control.py:630 gajim/groupchat_control.py:2349
-msgid "Changing Subject"
-msgstr "Змяненне тэмы"
-
-#: gajim/groupchat_control.py:631 gajim/groupchat_control.py:2350
-msgid "Please specify the new subject:"
-msgstr "Вызначце новую тэму:"
-
-#: gajim/groupchat_control.py:638
-msgid "Changing Nickname"
-msgstr "Змена мянушкі"
-
-#: gajim/groupchat_control.py:639
-msgid "Please specify the new nickname you want to use:"
-msgstr "Вызначце сваю новую мянушку:"
-
-#: gajim/groupchat_control.py:657
+#: gajim/groupchat_control.py:655
 #, fuzzy
-msgid "Invalid group chat JID"
+msgid "Invalid group chat XMPP Address"
 msgstr "Няправільны Jabber ID групавой размовы"
 
-#: gajim/groupchat_control.py:658
+#: gajim/groupchat_control.py:656
 #, fuzzy
-msgid "The group chat JID has not allowed characters."
+msgid "The group chat XMPP Address has not allowed characters."
 msgstr "Jabber ID групавой размовы ўтрымлівае няправільныя знакі."
 
-#: gajim/groupchat_control.py:758 gajim/gtk/profile.py:136
+#: gajim/groupchat_control.py:743 gajim/gtk/profile.py:136
 msgid "Could not load image"
 msgstr "Немагчыма загрузіць малюнак"
 
-#: gajim/groupchat_control.py:888
+#: gajim/groupchat_control.py:873
 msgid "Insert Nickname"
 msgstr "Уставіць мянушку"
 
-#: gajim/groupchat_control.py:1056 gajim/chat_control.py:824
+#: gajim/groupchat_control.py:1041 gajim/chat_control.py:848
 #, fuzzy
 msgid "and authenticated"
 msgstr "Аўтарызацыя"
 
-#: gajim/groupchat_control.py:1060 gajim/chat_control.py:828
+#: gajim/groupchat_control.py:1045 gajim/chat_control.py:852
 #, fuzzy
 msgid "and NOT authenticated"
 msgstr "Аўтарызацыя"
 
-#: gajim/groupchat_control.py:1064
+#: gajim/groupchat_control.py:1049
 #, python-format
 msgid "%(type)s encryption is active %(authenticated)s."
 msgstr ""
 
-#: gajim/groupchat_control.py:1111
+#: gajim/groupchat_control.py:1096
 #, fuzzy
 msgid "Conversation with "
 msgstr "Журнал размоў"
 
-#: gajim/groupchat_control.py:1113
+#: gajim/groupchat_control.py:1098
 #, fuzzy
 msgid "Continued conversation"
 msgstr "Злучэнне"
 
-#: gajim/groupchat_control.py:1411
+#: gajim/groupchat_control.py:1357
 #, fuzzy, python-format
 msgid "%(nick)s has set the subject to %(subject)s"
 msgstr "%(nick)s пакараны: %(reason)s"
 
-#: gajim/groupchat_control.py:1433
-msgid "Room now shows unavailable members"
+#: gajim/groupchat_control.py:1374
+msgid "Group chat now shows unavailable members"
 msgstr ""
 
-#: gajim/groupchat_control.py:1436
-msgid "Room now does not show unavailable members"
-msgstr ""
+#: gajim/groupchat_control.py:1377
+#, fuzzy
+msgid "Group chat now does not show unavailable members"
+msgstr "Такой групавой размовы няма."
 
-#: gajim/groupchat_control.py:1439
+#: gajim/groupchat_control.py:1380
 msgid "A setting not related to privacy has been changed"
 msgstr ""
 
-#: gajim/groupchat_control.py:1446
-msgid "Room logging is now enabled"
-msgstr ""
+#: gajim/groupchat_control.py:1387 gajim/groupchat_control.py:1659
+#, fuzzy
+msgid "Conversations are stored on the server"
+msgstr "Вы не злучаны з серверам"
 
-#: gajim/groupchat_control.py:1449
-msgid "Room logging is now disabled"
-msgstr ""
+#: gajim/groupchat_control.py:1390
+#, fuzzy
+msgid "Conversations are not stored on the server"
+msgstr "Звесткі аб Вас, якія захоўваюцца на серверы"
 
-#: gajim/groupchat_control.py:1452
-msgid "Room is now non-anonymous"
-msgstr ""
+#: gajim/groupchat_control.py:1393
+#, fuzzy
+msgid "Group chat is now non-anonymous"
+msgstr "Групавыя размовы"
 
-#: gajim/groupchat_control.py:1456
-msgid "Room is now semi-anonymous"
-msgstr ""
+#: gajim/groupchat_control.py:1397
+#, fuzzy
+msgid "Group chat is now semi-anonymous"
+msgstr "Фарбаванае паведамленне ў групавой размове"
 
-#: gajim/groupchat_control.py:1460
-msgid "Room is now fully anonymous"
-msgstr ""
+#: gajim/groupchat_control.py:1401
+#, fuzzy
+msgid "Group chat is now fully anonymous"
+msgstr "Групавыя размовы"
 
-#: gajim/groupchat_control.py:1500
+#: gajim/groupchat_control.py:1439
 #, python-format
 msgid "Ping? (%s)"
 msgstr ""
 
-#: gajim/groupchat_control.py:1503
+#: gajim/groupchat_control.py:1442
 #, python-format
 msgid "Pong! (%(nick)s %(delay)s s.)"
 msgstr ""
 
-#: gajim/groupchat_control.py:1506 gajim/chat_control.py:1213
+#: gajim/groupchat_control.py:1445 gajim/chat_control.py:1237
 #, fuzzy
 msgid "Error."
 msgstr "Памылка Avahi"
 
-#: gajim/groupchat_control.py:1711
+#: gajim/groupchat_control.py:1650
 #, fuzzy, python-format
-msgid "You (%s) joined the room"
+msgid "You (%s) joined the group chat"
 msgstr "%s далучыўся да групавой размовы"
 
-#: gajim/groupchat_control.py:1717
-msgid "Any occupant is allowed to see your full JID"
+#: gajim/groupchat_control.py:1655
+msgid "Any participant is allowed to see your full XMPP Address"
 msgstr ""
 
-#: gajim/groupchat_control.py:1721
-msgid "Room logging is enabled"
-msgstr ""
-
-#: gajim/groupchat_control.py:1725
-msgid "The server has assigned or modified your roomnick"
-msgstr ""
+#: gajim/groupchat_control.py:1663
+#, fuzzy
+msgid "The server has assigned or modified your nickname in this group chat"
+msgstr "Змяніць м_янушку"
 
-#: gajim/groupchat_control.py:1732
+#: gajim/groupchat_control.py:1671
 #, fuzzy
-msgid "A new room has been created"
+msgid "A new group chat has been created"
 msgstr "Новы рахунак паспяхова створаны"
 
-#: gajim/groupchat_control.py:1740 gajim/privatechat_control.py:112
+#: gajim/groupchat_control.py:1679 gajim/privatechat_control.py:115
 #, python-format
 msgid "You are now known as %s"
 msgstr "Вашая мянушка змененая на %s"
 
-#: gajim/groupchat_control.py:1742 gajim/privatechat_control.py:114
+#: gajim/groupchat_control.py:1681 gajim/privatechat_control.py:117
 #, fuzzy, python-brace-format
 msgid "{nick} is now known as {new_nick}"
 msgstr "%s змяніў мянушку на %s"
 
-#: gajim/groupchat_control.py:1767 gajim/privatechat_control.py:141
+#: gajim/groupchat_control.py:1706 gajim/privatechat_control.py:144
 #, fuzzy, python-brace-format
 msgid "You are now {show}{status}"
 msgstr "Вашая мянушка змененая на %s"
 
-#: gajim/groupchat_control.py:1773 gajim/privatechat_control.py:147
+#: gajim/groupchat_control.py:1712 gajim/privatechat_control.py:150
 #, fuzzy, python-brace-format
 msgid "{nick} is now {show}{status}"
 msgstr "%(nick)s цяпер %(status)s"
 
-#: gajim/groupchat_control.py:1790 gajim/groupchat_control.py:1819
-#: gajim/groupchat_control.py:1849 gajim/groupchat_control.py:1909
+#: gajim/groupchat_control.py:1729 gajim/groupchat_control.py:1758
+#: gajim/groupchat_control.py:1788 gajim/groupchat_control.py:1848
 #, python-brace-format
 msgid " by {actor}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1793
+#: gajim/groupchat_control.py:1732
 #, python-brace-format
 msgid "** Your Affiliation has been set to {affiliation}{actor}{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1799
+#: gajim/groupchat_control.py:1738
 #, python-brace-format
 msgid "** Affiliation of {nick} has been set to {affiliation}{actor}{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1822
+#: gajim/groupchat_control.py:1761
 #, fuzzy, python-brace-format
 msgid "** Your Role has been set to {role}{actor}{reason}"
 msgstr "%(who)s пакараў %(nick)s: %(reason)s"
 
-#: gajim/groupchat_control.py:1827
+#: gajim/groupchat_control.py:1766
 #, fuzzy, python-brace-format
 msgid "** Role of {nick} has been set to {role}{actor}{reason}"
 msgstr "%(who)s пакараў %(nick)s: %(reason)s"
 
-#: gajim/groupchat_control.py:1852
+#: gajim/groupchat_control.py:1791
 #, fuzzy, python-brace-format
-msgid "You have been removed from the room{actor}{reason}"
+msgid "You have been removed from the group chat{actor}{reason}"
 msgstr "%(who)s пакараў %(nick)s: %(reason)s"
 
-#: gajim/groupchat_control.py:1857
+#: gajim/groupchat_control.py:1796
 #, python-brace-format
 msgid "You have left due to an error{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1863
+#: gajim/groupchat_control.py:1802
 #, python-brace-format
 msgid "You have been kicked{actor}{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1870
+#: gajim/groupchat_control.py:1809
 #, python-brace-format
 msgid "You have been banned{actor}{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1877 gajim/groupchat_control.py:1943
+#: gajim/groupchat_control.py:1816 gajim/groupchat_control.py:1882
 #, fuzzy
 msgid ": Affiliation changed"
 msgstr "Адносіны: "
 
-#: gajim/groupchat_control.py:1883 gajim/groupchat_control.py:1948
-msgid ": Room configuration changed to members-only"
+#: gajim/groupchat_control.py:1822 gajim/groupchat_control.py:1887
+msgid ": Group chat configuration changed to members-only"
 msgstr ""
 
-#: gajim/groupchat_control.py:1912
+#: gajim/groupchat_control.py:1851
 #, fuzzy, python-brace-format
-msgid "{nick} has been removed from the room{by}{reason}"
+msgid "{nick} has been removed from the group chat{by}{reason}"
 msgstr "%(who)s пакараў %(nick)s: %(reason)s"
 
-#: gajim/groupchat_control.py:1922
+#: gajim/groupchat_control.py:1861
 #, python-brace-format
 msgid "{nick} has left due to an error{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1928
+#: gajim/groupchat_control.py:1867
 #, fuzzy, python-brace-format
 msgid "{nick} has been kicked{actor}{reason}"
 msgstr "%(nick)s пакараны: %(reason)s"
 
-#: gajim/groupchat_control.py:1936
+#: gajim/groupchat_control.py:1875
 #, fuzzy, python-brace-format
 msgid "{nick} has been banned{actor}{reason}"
 msgstr "Для %(nick)s забаронена казанне: %(reason)s"
 
-#: gajim/groupchat_control.py:1953
+#: gajim/groupchat_control.py:1892
 #, python-brace-format
 msgid "{nick} has left{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1970
+#: gajim/groupchat_control.py:1914
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s далучыўся да групавой размовы"
 
-#: gajim/groupchat_control.py:1985 gajim/groupchat_control.py:1990
-#: gajim/groupchat_control.py:1995 gajim/groupchat_control.py:2000
-#: gajim/groupchat_control.py:2011
-msgid "Unable to join group chat"
-msgstr "Немагчыма ўвайсці ў групавую размову"
-
-#: gajim/groupchat_control.py:1986
-#, fuzzy, python-format
-msgid "You are banned from group chat <b>%s</b>."
-msgstr "Вам забаронена казанне ў гэтай групавой размове."
-
-#: gajim/groupchat_control.py:1991
-#, fuzzy, python-format
-msgid "Remote server <b>%s</b> does not exist."
-msgstr "Такой групавой размовы няма."
-
-#: gajim/groupchat_control.py:1996
-#, fuzzy, python-format
-msgid "Group chat <b>%s</b> does not exist."
-msgstr "Такой групавой размовы няма."
-
-#: gajim/groupchat_control.py:2001
+#: gajim/groupchat_control.py:1981
 #, fuzzy
-msgid "Group chat creation is not permitted."
-msgstr "Стварэнне групавых размоў абмежаванае."
-
-#: gajim/groupchat_control.py:2005
-#, fuzzy
-msgid "Unable to join groupchat"
-msgstr "Немагчыма ўвайсці ў групавую размову"
-
-#: gajim/groupchat_control.py:2006
-#, fuzzy, python-format
-msgid "You must use your registered nickname in <b>%s</b>."
-msgstr "Вы павінны карыстацца зарэгістраванай для Вас мянушкай."
-
-#: gajim/groupchat_control.py:2012
-#, fuzzy, python-format
-msgid "You are not in the members list in groupchat %s."
-msgstr "Вас няма ў спісе ўдзельнікаў."
-
-#: gajim/groupchat_control.py:2068
-#, fuzzy
-msgid "Room has been destroyed"
+msgid "Group chat has been destroyed"
 msgstr "Аўтарызацыя забраная"
 
-#: gajim/groupchat_control.py:2073
-#, python-format
-msgid "You can join this room instead: xmpp:%s?join"
-msgstr ""
+#: gajim/groupchat_control.py:1986
+#, fuzzy, python-format
+msgid "You can join this group chat instead: xmpp:%s?join"
+msgstr "%s далучыўся да групавой размовы"
 
-#: gajim/groupchat_control.py:2306
+#: gajim/groupchat_control.py:2214
 #, fuzzy
 msgid "Leave Group Chat"
 msgstr "Сысці з групавых размоў"
 
-#: gajim/groupchat_control.py:2307
+#: gajim/groupchat_control.py:2215
 #, fuzzy
 msgid "Are you sure you want to leave this group chat?"
 msgstr "Вы сапраўды хочаце сысці з групавой размовы \"%s\"?"
 
-#: gajim/groupchat_control.py:2308
+#: gajim/groupchat_control.py:2216
 #, fuzzy, python-format
-msgid "If you close this window, you will be disconnected from '%s'."
+msgid "If you close this window, you will leave '%s'."
 msgstr "Калі Вы закрыеце гэтае вакно, Вы выйдзеце з гэтай групавой размовы."
 
-#: gajim/groupchat_control.py:2314
+#: gajim/groupchat_control.py:2222 gajim/roster_window.py:5177
 msgid "_Leave"
 msgstr ""
 
-#: gajim/groupchat_control.py:2377
+#: gajim/groupchat_control.py:2280 gajim/roster_window.py:3008
 #, fuzzy, python-format
 msgid "%(jid)s has been invited to this group chat"
 msgstr "%(who)s пакараў %(nick)s: %(reason)s"
 
-#: gajim/groupchat_control.py:2527
+#: gajim/groupchat_control.py:2463
 #, python-format
 msgid "Kicking %s"
 msgstr "Пакаранне %s"
 
-#: gajim/groupchat_control.py:2528 gajim/groupchat_control.py:2829
+#: gajim/groupchat_control.py:2464 gajim/groupchat_control.py:2765
 msgid "You may specify a reason below:"
 msgstr "Вы можаце вызначыць прычыну:"
 
-#: gajim/groupchat_control.py:2828
+#: gajim/groupchat_control.py:2764
 #, python-format
 msgid "Banning %s"
 msgstr "Забарона казання для %s"
 
-#: gajim/chat_control.py:408
+#: gajim/chat_control.py:432
 #, fuzzy
 msgid "Show a list of formattings"
 msgstr "Пстрыкніце, каб уставіць сымболік (Alt+M)"
 
-#: gajim/chat_control.py:412
+#: gajim/chat_control.py:436
 #, fuzzy
 msgid "This contact does not support HTML"
 msgstr "Спіс актыўных, скончаных і спыненых перадачаў файлаў"
 
-#: gajim/chat_control.py:562
+#: gajim/chat_control.py:586
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr ""
 
-#: gajim/chat_control.py:686
+#: gajim/chat_control.py:710
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s з групавой размовы %(room_name)s"
 
-#: gajim/chat_control.py:832
+#: gajim/chat_control.py:856
 #, python-format
 msgid "%(type)s encryption is active %(authenticated)s"
 msgstr ""
 
-#: gajim/chat_control.py:1160 gajim/chat_control.py:1168
+#: gajim/chat_control.py:1184 gajim/chat_control.py:1192
 #, fuzzy
 msgid "Close"
 msgstr "Ад_правіць і закрыць"
 
-#: gajim/chat_control.py:1161
+#: gajim/chat_control.py:1185
 #, fuzzy, python-format
 msgid "You just received a new message from %s"
 msgstr "Вам адправіў паведамленне \"%s\""
 
-#: gajim/chat_control.py:1163
+#: gajim/chat_control.py:1187
 #, fuzzy
 msgid ""
 "If you close this tab while having chat history disabled, this message will "
@@ -1200,16 +1164,16 @@ msgstr ""
 "Калі Вы закрыеце гэтую картку з адключаным вядзеннем журналаў, гэтае "
 "паведамленне згубіцца."
 
-#: gajim/chat_control.py:1208
+#: gajim/chat_control.py:1232
 msgid "Ping?"
 msgstr ""
 
-#: gajim/chat_control.py:1211
+#: gajim/chat_control.py:1235
 #, python-format
 msgid "Pong! (%s seconds)"
 msgstr ""
 
-#: gajim/chat_control.py:1308
+#: gajim/chat_control.py:1332
 #, fuzzy, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -1218,275 +1182,283 @@ msgstr ""
 "Тэма: %s\n"
 "%s"
 
-#: gajim/chat_control.py:1416
+#: gajim/chat_control.py:1440
 #, fuzzy, python-format
 msgid "%(name)s is now %(show)s %(status)s"
 msgstr "%(nick)s цяпер %(status)s"
 
-#: gajim/chat_control.py:1476 gajim/data/gui/application_menu.ui:32
+#: gajim/chat_control.py:1500 gajim/data/gui/application_menu.ui:32
 #: gajim/gtk/http_upload_progress.py:35
 #, fuzzy
 msgid "File Transfer"
 msgstr "Перадача файлаў"
 
-#: gajim/chat_control.py:1480
+#: gajim/chat_control.py:1504
 #, fuzzy
 msgid "Size"
 msgstr "Памер: %s"
 
-#: gajim/chat_control.py:1482 gajim/chat_control.py:1546
+#: gajim/chat_control.py:1506 gajim/chat_control.py:1566
+#: gajim/gui_interface.py:190
 #: gajim/data/gui/groupchat_invitation_received.ui:77
-#: gajim/gtk/filetransfer.py:485
+#: gajim/gtk/filetransfer.py:490
 #, fuzzy
 msgid "_Accept"
 msgstr "Прыняць"
 
-#: gajim/chat_control.py:1484 gajim/chat_control.py:1548
+#: gajim/chat_control.py:1508 gajim/chat_control.py:1568
 #: gajim/data/gui/groupchat_invitation_received.ui:62
 #, fuzzy
 msgid "_Decline"
 msgstr "_Адключаны"
 
-#: gajim/chat_control.py:1506 gajim/gui_interface.py:791
-#: gajim/gui_interface.py:821 gajim/gui_interface.py:847
+#: gajim/chat_control.py:1530 gajim/gui_interface.py:777
+#: gajim/gui_interface.py:807 gajim/gui_interface.py:833
 #: gajim/gtk/notification.py:173 gajim/gtk/notification.py:278
 msgid "File Transfer Completed"
 msgstr "Перадача файла скончаная"
 
-#: gajim/chat_control.py:1510 gajim/gtk/filetransfer.py:259
+#: gajim/chat_control.py:1534 gajim/gtk/filetransfer.py:258
 #, fuzzy
 msgid "Open _Folder"
 msgstr "_Адкрыць дырэкторыю з файлам"
 
-#: gajim/chat_control.py:1512 gajim/chat_control.py:1521
+#: gajim/chat_control.py:1536 gajim/chat_control.py:1545
+#: gajim/data/gui/groupchat_control.ui:962
+#: gajim/data/gui/groupchat_control.ui:1049
+#: gajim/data/gui/groupchat_control.ui:1155
 #, fuzzy
 msgid "_Close"
 msgstr "Ад_правіць і закрыць"
 
-#: gajim/chat_control.py:1543 gajim/gui_interface.py:484
+#: gajim/chat_control.py:1563 gajim/gui_interface.py:473
+#: gajim/data/gui/groupchat_invitation_received.ui:42
 #: gajim/gtk/notification.py:174 gajim/gtk/notification.py:195
 #: gajim/gtk/notification.py:281
-msgid "Groupchat Invitation"
+#, fuzzy
+msgid "Group Chat Invitation"
 msgstr "Запрашэнне ў групавую размову"
 
-#: gajim/chat_control.py:1568 gajim/roster_window.py:1954
+#: gajim/chat_control.py:1588 gajim/roster_window.py:1951
 #, fuzzy
 msgid "Remote contact stopped transfer"
 msgstr "Выдаліць чалавека з спіса"
 
-#: gajim/chat_control.py:1570 gajim/roster_window.py:1956
+#: gajim/chat_control.py:1590 gajim/roster_window.py:1953
 #, fuzzy
 msgid "Error opening file"
 msgstr "Памылка чытання файла:"
 
-#: gajim/chat_control.py:1572 gajim/gtk/filetransfer.py:297
+#: gajim/chat_control.py:1592 gajim/gtk/filetransfer.py:296
 #, fuzzy
 msgid "File transfer stopped"
 msgstr "Перадача файла спыненая"
 
-#: gajim/chat_control.py:1575 gajim/gtk/filetransfer.py:275
-#: gajim/gtk/filetransfer.py:284
+#: gajim/chat_control.py:1595 gajim/gtk/filetransfer.py:274
+#: gajim/gtk/filetransfer.py:283
 msgid "File transfer cancelled"
 msgstr "Перадача файла скасаваная"
 
-#: gajim/chat_control.py:1576
+#: gajim/chat_control.py:1596
 msgid "Connection with peer cannot be established."
 msgstr "Немагчыма ўсталяваць злучэнне з атрымальнікам."
 
-#: gajim/application.py:72
+#: gajim/application.py:75
 #, fuzzy
 msgid "Show the application's version"
 msgstr "_Значка панэлі паведамленняў"
 
-#: gajim/application.py:79
+#: gajim/application.py:82
 #, fuzzy
 msgid "Show only critical errors"
 msgstr "Паказваць толькі ў _галоўным вакне"
 
-#: gajim/application.py:86
+#: gajim/application.py:89
 msgid "Separate profile files completely (even history database and plugins)"
 msgstr ""
 
-#: gajim/application.py:94
+#: gajim/application.py:97
 msgid "Print XML stanzas and other debug information"
 msgstr ""
 
-#: gajim/application.py:101
+#: gajim/application.py:104
 #, fuzzy
 msgid "Use defined profile in configuration directory"
 msgstr "Адмысловы рэдактар настаўленняў"
 
-#: gajim/application.py:109
+#: gajim/application.py:112
 #, fuzzy
 msgid "Set configuration directory"
 msgstr "Настаўленні пакоя"
 
-#: gajim/application.py:117
+#: gajim/application.py:120
 msgid "Configure logging system"
 msgstr ""
 
-#: gajim/application.py:125
+#: gajim/application.py:128
 #, fuzzy
 msgid "Show all warnings"
 msgstr "Паказаць нягледжаныя _падзеі"
 
-#: gajim/application.py:132
+#: gajim/application.py:135
 msgid "Open IPython shell"
 msgstr ""
 
-#: gajim/application.py:139
+#: gajim/application.py:142
 msgid "Pops up a window with the next pending event"
 msgstr "Паказаць выплыўнае вакно з наступнай нягледжанай падзеяй"
 
-#: gajim/application.py:145 gajim/data/gui/shortcuts_window.ui:203
+#: gajim/application.py:148 gajim/data/gui/shortcuts_window.ui:203
 #: data/org.gajim.Gajim.desktop.in:21
 #, fuzzy
 msgid "Start a new chat"
 msgstr "Пачаць размову"
 
-#: gajim/application.py:152
+#: gajim/application.py:155
 msgid "Simulate loss of connectivity"
 msgstr ""
 
-#: gajim/application.py:159
+#: gajim/application.py:162
 msgid "Simulate regaining connectivity"
 msgstr ""
 
-#: gajim/application.py:201 gajim/gui_interface.py:133
+#: gajim/application.py:204 gajim/gui_interface.py:133
 msgid "Database Error"
 msgstr ""
 
-#: gajim/roster_window.py:294 gajim/roster_window.py:1030
+#: gajim/roster_window.py:291 gajim/roster_window.py:1027
 msgid "Merged accounts"
 msgstr "Аб'яднаныя рахункі"
 
-#: gajim/roster_window.py:853 gajim/roster_window.py:1631
-#: gajim/roster_window.py:1664 gajim/roster_window.py:1715
-#: gajim/roster_window.py:1717 gajim/roster_window.py:1872
-#: gajim/roster_window.py:2531 gajim/roster_window.py:5025
-#: gajim/common/contacts.py:188 gajim/common/contacts.py:447
-#: gajim/common/helpers.py:83 gajim/gtk/discovery.py:129
-#: gajim/gtk/discovery.py:130 gajim/gtk/discovery.py:1416
+#: gajim/roster_window.py:850 gajim/roster_window.py:1628
+#: gajim/roster_window.py:1661 gajim/roster_window.py:1712
+#: gajim/roster_window.py:1714 gajim/roster_window.py:1869
+#: gajim/roster_window.py:2528 gajim/roster_window.py:4331
+#: gajim/roster_window.py:4964 gajim/common/contacts.py:204
+#: gajim/common/contacts.py:463 gajim/common/helpers.py:86
+#: gajim/gtk/discovery.py:127 gajim/gtk/discovery.py:128
+#: gajim/gtk/discovery.py:1414
 msgid "Transports"
 msgstr "Транспарты"
 
-#: gajim/roster_window.py:1723 gajim/roster_window.py:1725
-#: gajim/roster_window.py:4995 gajim/gui_interface.py:1613
-#: gajim/gui_interface.py:1639 gajim/common/contacts.py:186
-#: gajim/common/helpers.py:83 gajim/common/modules/adhoc_commands.py:245
-msgid "Groupchats"
+#: gajim/roster_window.py:1720 gajim/roster_window.py:1722
+#: gajim/roster_window.py:4331 gajim/roster_window.py:4934
+#: gajim/gui_interface.py:1527 gajim/common/contacts.py:202
+#: gajim/common/helpers.py:86 gajim/common/modules/adhoc_commands.py:245
+#, fuzzy
+msgid "Group chats"
 msgstr "Групавыя размовы"
 
-#: gajim/roster_window.py:2012
+#: gajim/roster_window.py:2009
 #, fuzzy
 msgid "Authorization sent"
 msgstr "Адпраўленая аўтарызацыя"
 
-#: gajim/roster_window.py:2013
+#: gajim/roster_window.py:2010
 #, fuzzy, python-format
 msgid "\"%s\" will now see your status."
 msgstr "Цяпер \"%s\" можа бачыць Ваш стан."
 
-#: gajim/roster_window.py:2031
+#: gajim/roster_window.py:2028
 msgid "Subscription request has been sent"
 msgstr "Адпраўлены запыт на падпіску"
 
-#: gajim/roster_window.py:2032
-#, python-format
-msgid "If \"%s\" accepts this request you will know his or her status."
+#: gajim/roster_window.py:2029
+#, fuzzy, python-format
+msgid "If \"%s\" accepts this request you will know their status."
 msgstr "Калі \"%s\" задаволіць гэты запыт, Вы зможаце бачыць яго стан."
 
-#: gajim/roster_window.py:2046
+#: gajim/roster_window.py:2043
 #, fuzzy
 msgid "Authorization removed"
 msgstr "Аўтарызацыя забраная"
 
-#: gajim/roster_window.py:2047
+#: gajim/roster_window.py:2044
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Цяпер \"%s\" будзе заўсёды бачыць Вас адлучаным."
 
-#: gajim/roster_window.py:2250 gajim/roster_window.py:3504
+#: gajim/roster_window.py:2247 gajim/roster_window.py:3460
 msgid "Disconnect for Invisibility"
 msgstr ""
 
-#: gajim/roster_window.py:2251 gajim/roster_window.py:3505
+#: gajim/roster_window.py:2248 gajim/roster_window.py:3461
 msgid "You are participating in one or more group chats"
 msgstr "Вы ўдзельнічаеце ў некалькіх групавых размовах"
 
-#: gajim/roster_window.py:2252 gajim/roster_window.py:3506
+#: gajim/roster_window.py:2249 gajim/roster_window.py:3462
 #, fuzzy
 msgid ""
-"Changing your status to invisible will result in disconnection from those "
-"group chats.\n"
+"Changing your status to invisible will result in you leaving those group "
+"chats.\n"
 "Are you sure you want to go invisible?"
 msgstr ""
 "Змяніўшы свой стан на нябачны, Вы такім чынам выйдзеце з гэтых групавых "
 "размоў. Вы сапраўды хочаце стаць нябачным?"
 
-#: gajim/roster_window.py:2257 gajim/roster_window.py:3512
-#: gajim/roster_window.py:5238 gajim/data/gui/gc_control_popup_menu.ui:120
+#: gajim/roster_window.py:2254 gajim/roster_window.py:3468
+#: gajim/data/gui/gc_control_popup_menu.ui:120
 #, fuzzy
 msgid "_Disconnect"
 msgstr "Чалавек адлучыўся"
 
-#: gajim/roster_window.py:2285
+#: gajim/roster_window.py:2282
 #, fuzzy
 msgid "desynced"
 msgstr "Адмысловы"
 
-#: gajim/roster_window.py:2353 gajim/data/gui/shortcuts_window.ui:224
+#: gajim/roster_window.py:2350 gajim/data/gui/shortcuts_window.ui:224
 #, fuzzy
 msgid "Quit Gajim"
 msgstr "Gajim"
 
-#: gajim/roster_window.py:2354
+#: gajim/roster_window.py:2351
 #, fuzzy
 msgid "You are about to quit Gajim"
 msgstr "Вы сапраўды хочаце сысці з групавой размовы \"%s\"?"
 
-#: gajim/roster_window.py:2355
+#: gajim/roster_window.py:2352
 #, fuzzy
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Вы сапраўды хочаце сысці з групавой размовы \"%s\"?"
 
-#: gajim/roster_window.py:2356
+#: gajim/roster_window.py:2353
 msgid "_Always quit when closing Gajim"
 msgstr ""
 
-#: gajim/roster_window.py:2359 gajim/roster_window.py:2455
-#: gajim/roster_window.py:2495 gajim/data/gui/systray_context_menu.ui:90
+#: gajim/roster_window.py:2356 gajim/roster_window.py:2452
+#: gajim/roster_window.py:2492 gajim/data/gui/systray_context_menu.ui:83
 #, fuzzy
 msgid "_Quit"
 msgstr "_Выйсці"
 
-#: gajim/roster_window.py:2448
+#: gajim/roster_window.py:2445
 #, fuzzy
 msgid "Stop File Transfers"
 msgstr "Перадача файлаў"
 
-#: gajim/roster_window.py:2449
+#: gajim/roster_window.py:2446
 #, fuzzy
 msgid "You still have running file transfers"
 msgstr "Скасаваць перадачу файла"
 
-#: gajim/roster_window.py:2450
+#: gajim/roster_window.py:2447
 msgid ""
 "If you quit now, the file(s) being transferred will be lost.\n"
 "Do you still want to quit?"
 msgstr ""
 
-#: gajim/roster_window.py:2488
+#: gajim/roster_window.py:2485
 #, fuzzy
 msgid "Unread Messages"
 msgstr "Нягледжаныя падзеі"
 
-#: gajim/roster_window.py:2489
+#: gajim/roster_window.py:2486
 #, fuzzy
 msgid "You still have unread messages"
 msgstr "Ёсць нечытаныя паведамленні"
 
-#: gajim/roster_window.py:2490
+#: gajim/roster_window.py:2487
 #, fuzzy
 msgid ""
 "Messages will only be available for reading them later if storing chat "
@@ -1495,31 +1467,31 @@ msgstr ""
 "Вы зможаце прачытаць нечытаныя паведамленні толькі з уключаным вядзеннем "
 "журналаў размоў."
 
-#: gajim/roster_window.py:2760
+#: gajim/roster_window.py:2753
 msgid "You have unread messages"
 msgstr "Ёсць нечытаныя паведамленні"
 
-#: gajim/roster_window.py:2761
+#: gajim/roster_window.py:2754
 msgid "You must read them before removing this transport."
 msgstr "Вы павінны прачытаць іх перад выдаленнем гэтага транспарта."
 
-#: gajim/roster_window.py:2764
+#: gajim/roster_window.py:2757
 #, fuzzy, python-format
 msgid "Transport '%s' will be removed"
 msgstr "Транспарт \"%s\" будзе выдалены"
 
-#: gajim/roster_window.py:2765
+#: gajim/roster_window.py:2758
 #, fuzzy
 msgid ""
 "You will no longer be able to send and receive messages from and to contacts "
 "using this transport."
 msgstr "Вы больш не зможаце мець зносіны з людзьмі праз гэты транспарт."
 
-#: gajim/roster_window.py:2768
+#: gajim/roster_window.py:2761
 msgid "Transports will be removed"
 msgstr "Транспарты будуць выдаленыя"
 
-#: gajim/roster_window.py:2773
+#: gajim/roster_window.py:2766
 #, fuzzy, python-format
 msgid ""
 "You will no longer be able to send and receive messages from and to contacts "
@@ -1527,85 +1499,80 @@ msgid ""
 "%s"
 msgstr "Вы больш не зможаце мець зносіны з людзьмі праз гэты транспарт."
 
-#: gajim/roster_window.py:2777
+#: gajim/roster_window.py:2770
 #, fuzzy
 msgid "Remove Transport"
 msgstr "Паказаць _транспарты"
 
-#: gajim/roster_window.py:2844
+#: gajim/roster_window.py:2837
 #, fuzzy
 msgid "Block Contact"
 msgstr "Людзі"
 
-#: gajim/roster_window.py:2845
+#: gajim/roster_window.py:2838
 #, fuzzy
 msgid "Really block this contact?"
 msgstr "Ці ўжыты OpenPGP ў размове з гэтым чалавекам?"
 
-#: gajim/roster_window.py:2846
+#: gajim/roster_window.py:2839
 msgid ""
 "This contact will see you offline and you will not receive any messages sent "
 "to you by this contact."
 msgstr ""
 
-#: gajim/roster_window.py:2851
+#: gajim/roster_window.py:2844
 #, fuzzy
 msgid "_Block Contact"
 msgstr "Людзі"
 
-#: gajim/roster_window.py:2896
+#: gajim/roster_window.py:2889
 msgid "Rename Contact"
 msgstr "Змяніць імя чалавека"
 
-#: gajim/roster_window.py:2897
+#: gajim/roster_window.py:2890
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Вызначце новую мянушку для чалавека %s."
 
-#: gajim/roster_window.py:2904
+#: gajim/roster_window.py:2897
 msgid "Rename Group"
 msgstr "Змяніць назву групы"
 
-#: gajim/roster_window.py:2905
+#: gajim/roster_window.py:2898
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Вызначце новую назву групы %s"
 
-#: gajim/roster_window.py:2953 gajim/roster_window.py:2954
+#: gajim/roster_window.py:2946 gajim/roster_window.py:2947
 msgid "Remove Group"
 msgstr "Выдаліць групу"
 
-#: gajim/roster_window.py:2955
+#: gajim/roster_window.py:2948
 #, fuzzy, python-format
 msgid "Do you want to remove %s from the contact list?"
 msgstr "Хочаце выдаліць групу %s з кантактнага ліста?"
 
-#: gajim/roster_window.py:2956
+#: gajim/roster_window.py:2949
 #, fuzzy
 msgid "_Also remove all contacts of this group from contact list"
 msgstr "Таксама выдаліць усіх людзей з гэтай групы"
 
-#: gajim/roster_window.py:3044
-#, fuzzy, python-format
-msgid "%(jid)s has been invited in this room"
-msgstr "%(who)s пакараў %(nick)s: %(reason)s"
-
-#: gajim/roster_window.py:3353
+#: gajim/roster_window.py:3309
 #, fuzzy
 msgid "Remove Contact"
 msgstr "Змяніць імя чалавека"
 
-#: gajim/roster_window.py:3354
+#: gajim/roster_window.py:3310
 #, fuzzy
 msgid "Remove contact from contact list"
 msgstr "Выдаліць чалавека з спіса"
 
-#: gajim/roster_window.py:3355
+#: gajim/roster_window.py:3311
 #, python-format
 msgid "You are about to remove '%(name)s' (%(jid)s) from your contact list.\n"
 msgstr ""
 
-#: gajim/roster_window.py:3364 gajim/roster_window.py:3384
+#: gajim/roster_window.py:3320 gajim/roster_window.py:3340
 #, fuzzy
 msgid ""
 "By removing this contact you also remove authorization. This means the "
@@ -1615,22 +1582,22 @@ msgstr ""
 "з Вашага кантактнага ліста, Вы такім чынам таксама прыбярэце ў іх "
 "аўтарызацыю, і яны заўсёды будуць бачыць Вас адлучаным."
 
-#: gajim/roster_window.py:3375
+#: gajim/roster_window.py:3331
 #, fuzzy
 msgid "Do you want to continue?"
 msgstr "Што Вы хочаце зрабіць?"
 
-#: gajim/roster_window.py:3386
+#: gajim/roster_window.py:3342
 #, fuzzy
 msgid "_I want this contact to know my status after removal"
 msgstr "Я хачу, каб гэты чалавек мог бачыць мой стан пасля выдалення"
 
-#: gajim/roster_window.py:3393
+#: gajim/roster_window.py:3349
 #, fuzzy
 msgid "Remove contacts from contact list"
 msgstr "Выдаліць чалавека з спіса"
 
-#: gajim/roster_window.py:3399
+#: gajim/roster_window.py:3355
 #, fuzzy, python-format
 msgid ""
 "By removing the following contacts, you will also remove authorization. This "
@@ -1642,24 +1609,24 @@ msgstr ""
 "з Вашага кантактнага ліста, Вы такім чынам таксама прыбярэце ў іх "
 "аўтарызацыю, і яны заўсёды будуць бачыць Вас адлучаным."
 
-#: gajim/roster_window.py:3403
+#: gajim/roster_window.py:3359
 #, fuzzy
 msgid "Remove Contacts"
 msgstr "Змяніць імя чалавека"
 
-#: gajim/roster_window.py:3423
+#: gajim/roster_window.py:3379
 msgid "No account available"
 msgstr "Рахункаў няма"
 
-#: gajim/roster_window.py:3424
+#: gajim/roster_window.py:3380
 msgid "You must create an account before you can chat with other contacts."
 msgstr "Вы павінны стварыць рахунак, каб размаўляць з іншымі людзьмі."
 
-#: gajim/roster_window.py:4060
+#: gajim/roster_window.py:4011
 msgid "Metacontacts storage not supported by your server"
 msgstr "Сервер не падтрымлівае сховішча мета-кантактаў"
 
-#: gajim/roster_window.py:4062
+#: gajim/roster_window.py:4013
 #, fuzzy
 msgid ""
 "Your server does not support storing metacontacts information. So this "
@@ -1668,12 +1635,12 @@ msgstr ""
 "Сервер не падтрымлівае мета-кантакты. Гэтае настаўленне не захаваецца для "
 "наступных сеансаў."
 
-#: gajim/roster_window.py:4159
+#: gajim/roster_window.py:4110
 #, fuzzy
 msgid "You are about to create a metacontact"
 msgstr "Вы ствараеце мета-кантакт. Вы сапраўды хочаце працягнуць?"
 
-#: gajim/roster_window.py:4160
+#: gajim/roster_window.py:4111
 #, fuzzy
 msgid ""
 "Metacontacts are a way to regroup several contacts in one single contact. "
@@ -1684,27 +1651,27 @@ msgstr ""
 "кантактнага ліста. Звычайна ўжываецца, калі ў чалавека некалькі рахункаў "
 "Jabber альбо некалькі транспартных рахункаў."
 
-#: gajim/roster_window.py:4164
+#: gajim/roster_window.py:4115
 #, fuzzy
 msgid "Create Metacontact"
 msgstr "Змяніць імя чалавека"
 
-#: gajim/roster_window.py:4170
+#: gajim/roster_window.py:4121 gajim/data/gui/groupchat_creation.ui:317
 #, fuzzy
 msgid "_Create"
 msgstr "Неактывізаваны"
 
-#: gajim/roster_window.py:4287
+#: gajim/roster_window.py:4238
 #, fuzzy
 msgid "Invalid file URI:"
 msgstr "Няправільны файл"
 
-#: gajim/roster_window.py:4298
+#: gajim/roster_window.py:4249
 #, fuzzy
 msgid "Send file?"
 msgstr "Адправіць _файл"
 
-#: gajim/roster_window.py:4299
+#: gajim/roster_window.py:4250
 #, fuzzy, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
@@ -1712,101 +1679,92 @@ msgstr[0] "%s хоча адправіць Вам файл:"
 msgstr[1] "%s хоча адправіць Вам файл:"
 msgstr[2] "%s хоча адправіць Вам файл:"
 
-#: gajim/roster_window.py:4451
+#: gajim/roster_window.py:4401
 #, fuzzy, python-format
 msgid "Send %(from)s to %(to)s"
 msgstr "Адправіць %s"
 
-#: gajim/roster_window.py:4464
+#: gajim/roster_window.py:4414
 #, fuzzy, python-format
 msgid "Make %s first contact"
 msgstr "Зрабіць %s і %s мета-кантактамі"
 
-#: gajim/roster_window.py:4469
+#: gajim/roster_window.py:4419
 #, fuzzy, python-format
 msgid "Make %(contact1)s and %(contact2)s metacontacts"
 msgstr "Зрабіць %s і %s мета-кантактамі"
 
-#: gajim/roster_window.py:4825 gajim/roster_window.py:4923
+#: gajim/roster_window.py:4775 gajim/roster_window.py:4862
 msgid "_Change Status Message"
 msgstr "З_мяніць паведамленне аб стане"
 
-#: gajim/roster_window.py:4845
+#: gajim/roster_window.py:4795
 #, fuzzy
 msgid "Publish Tune"
 msgstr "_Абнавіць"
 
-#: gajim/roster_window.py:4856
+#: gajim/roster_window.py:4806
 #, fuzzy
 msgid "Publish Location"
 msgstr "_Абнавіць"
 
-#: gajim/roster_window.py:4868
-#, fuzzy
-msgid "Configure Services…"
-msgstr "_Праглядзець сервісы..."
-
-#: gajim/roster_window.py:4997
+#: gajim/roster_window.py:4936
 msgid "_Maximize All"
 msgstr ""
 
-#: gajim/roster_window.py:5004 gajim/roster_window.py:5146
+#: gajim/roster_window.py:4943 gajim/roster_window.py:5085
 msgid "Send Group M_essage"
 msgstr "Ад_правіць групавое паведамленне"
 
-#: gajim/roster_window.py:5011
+#: gajim/roster_window.py:4950
 msgid "To all users"
 msgstr "Усім карыстальнікам"
 
-#: gajim/roster_window.py:5015
+#: gajim/roster_window.py:4954
 msgid "To all online users"
 msgstr "Усім актыўным карыстальнікам"
 
-#: gajim/roster_window.py:5027 gajim/roster_window.py:5152
+#: gajim/roster_window.py:4966 gajim/roster_window.py:5091
 #: gajim/data/gui/gc_occupants_menu.ui:110
 #: gajim/data/gui/contact_context_menu.ui:36
 msgid "In_vite to"
 msgstr "За_прасіць"
 
-#: gajim/roster_window.py:5162
+#: gajim/roster_window.py:5101
 #, fuzzy
 msgid "_Manage Contacts"
 msgstr "Змяніць імя чалавека"
 
-#: gajim/roster_window.py:5168
+#: gajim/roster_window.py:5107
 #, fuzzy
 msgid "Edit _Groups…"
 msgstr "Змяніць _групы"
 
-#: gajim/roster_window.py:5189 gajim/data/gui/filetransfers.ui:12
+#: gajim/roster_window.py:5128 gajim/data/gui/filetransfers.ui:12
 #: gajim/data/gui/remove_account_window.ui:134
 msgid "_Remove"
 msgstr "Вы_даліць"
 
-#: gajim/roster_window.py:5226
+#: gajim/roster_window.py:5165
 msgid "_Maximize"
 msgstr ""
 
-#: gajim/roster_window.py:5233
+#: gajim/roster_window.py:5172
 #, fuzzy
 msgid "_Reconnect"
 msgstr "Чалавек адлучыўся"
 
-#: gajim/roster_window.py:5254 gajim/data/gui/gc_occupants_menu.ui:170
+#: gajim/roster_window.py:5193 gajim/data/gui/gc_occupants_menu.ui:170
 #: gajim/data/gui/gc_control_popup_menu.ui:113
 #: gajim/data/gui/contact_context_menu.ui:205
 msgid "_History"
 msgstr "_Журнал"
 
-#: gajim/roster_window.py:5335 gajim/data/gui/application_menu.ui:86
+#: gajim/roster_window.py:5274 gajim/data/gui/application_menu.ui:83
 #: gajim/data/gui/history_window.ui:57
 msgid "History Manager"
 msgstr "Кіраўнік журналаў"
 
-#: gajim/roster_window.py:5343
-msgid "_Join New Group Chat"
-msgstr "_Удзельнічаць у групавой размове"
-
 #: gajim/dataforms_widget.py:585
 #, fuzzy
 msgid "Unable to load image"
@@ -1929,276 +1887,293 @@ msgstr "Тэма: %s\n"
 msgid "Write a message…"
 msgstr "Новае прыватнае паведамленне"
 
-#: gajim/message_window.py:250
+#: gajim/message_window.py:356
+#, fuzzy
+msgid "Close Tabs"
+msgstr "Ад_правіць і закрыць"
+
+#: gajim/message_window.py:357
 #, fuzzy
 msgid "You are going to close several tabs"
 msgstr "Вы не злучаны з серверам"
 
-#: gajim/message_window.py:251
+#: gajim/message_window.py:358
 #, fuzzy
 msgid "Do you really want to close them all?"
 msgstr "Вы сапраўды хочаце выдаліць выбранае паведамленне?"
 
-#: gajim/message_window.py:539
+#: gajim/message_window.py:514
 #, fuzzy
 msgid "?Noun:Chats"
 msgstr "Групавыя размовы"
 
-#: gajim/message_window.py:543
+#: gajim/message_window.py:518
 #, fuzzy
 msgid "Group Chats"
 msgstr "_Групавая размова"
 
-#: gajim/message_window.py:547
+#: gajim/message_window.py:522
 msgid "Private Chats"
 msgstr "Прыватныя размовы"
 
-#: gajim/message_window.py:553
+#: gajim/message_window.py:528
 msgid "Messages"
 msgstr "Паведамленні"
 
-#: gajim/gui_interface.py:173
+#: gajim/gui_interface.py:170
+#, fuzzy, python-format
+msgid "HTTP (%(method)s) Authorization for %(url)s (ID: %(id)s)"
+msgstr "HTTP (%s) аўтарызацыя для %s (id: %s)"
+
+#: gajim/gui_interface.py:175
 msgid "Do you accept this request?"
 msgstr "Хочаце задаволіць гэты запыт?"
 
-#: gajim/gui_interface.py:175
+#: gajim/gui_interface.py:177
 #, fuzzy, python-format
-msgid "Do you accept this request on account %s?"
+msgid "Do you accept this request (account: %s)?"
 msgstr "Хочаце задаволіць гэты запыт?"
 
-#: gajim/gui_interface.py:178
-#, fuzzy, python-format
-msgid "HTTP (%(method)s) Authorization for %(url)s (ID: %(id)s)"
-msgstr "HTTP (%s) аўтарызацыя для %s (id: %s)"
+#: gajim/gui_interface.py:182
+#, fuzzy
+msgid "Authorization"
+msgstr "Адпраўленая аўтарызацыя"
+
+#: gajim/gui_interface.py:186 gajim/gui_interface.py:420
+#: gajim/gtk/filetransfer.py:338
+#, fuzzy
+msgid "_No"
+msgstr "Ніякі"
 
-#: gajim/gui_interface.py:194 gajim/gtk/notification.py:175
+#: gajim/gui_interface.py:205 gajim/gtk/notification.py:175
 #: gajim/gtk/notification.py:197
 msgid "Connection Failed"
 msgstr "Памылка злучэння"
 
-#: gajim/gui_interface.py:279 gajim/gui_interface.py:529
-msgid "Password Required"
-msgstr "Патрабуецца пароль"
-
-#: gajim/gui_interface.py:280
-#, fuzzy, python-format
-msgid "A Password is required to join the room %s. Please type it."
-msgstr "Каб удзельнічаць у гэтай групавой размове, трэба ведаць пароль."
-
-#: gajim/gui_interface.py:342 gajim/gui_interface.py:346
+#: gajim/gui_interface.py:325 gajim/gui_interface.py:329
 #, fuzzy, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr "%(nickname)s: %(message)s"
 
-#: gajim/gui_interface.py:357 gajim/gui_interface.py:376
+#: gajim/gui_interface.py:340 gajim/gui_interface.py:359
 #: gajim/common/modules/message.py:122
 #, fuzzy, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "памылка адпраўкі %s ( %s )"
 
-#: gajim/gui_interface.py:401 gajim/gtk/notification.py:175
+#: gajim/gui_interface.py:384 gajim/gtk/notification.py:175
 #, fuzzy
 msgid "Subscription request"
 msgstr "Запыт падпіскі"
 
-#: gajim/gui_interface.py:413 gajim/common/contacts.py:184
-#: gajim/common/helpers.py:83
+#: gajim/gui_interface.py:396 gajim/common/contacts.py:200
+#: gajim/common/helpers.py:86
 msgid "Observers"
 msgstr "Назіральнікі"
 
-#: gajim/gui_interface.py:422
+#: gajim/gui_interface.py:405
 msgid "Authorization accepted"
 msgstr "Паспяховая аўтарызацыя"
 
-#: gajim/gui_interface.py:423
+#: gajim/gui_interface.py:406
 #, fuzzy, python-format
 msgid "The contact \"%s\" has authorized you to see their status."
 msgstr "Чалавек \"%s\" дазволіў Вам бачыць змены яго стану."
 
-#: gajim/gui_interface.py:431
-#, python-format
-msgid "Contact \"%s\" removed subscription from you"
+#: gajim/gui_interface.py:415
+#, fuzzy
+msgid "Subscription Removed"
+msgstr "Запыт падпіскі"
+
+#: gajim/gui_interface.py:416
+#, fuzzy, python-format
+msgid "Contact '%s' removed subscription from you"
 msgstr "Чалавек \"%s\" забраў у Вас аўтарызацыю"
 
-#: gajim/gui_interface.py:432
+#: gajim/gui_interface.py:417
 msgid ""
-"You will always see them as offline.\n"
+"You will always see this contact as offline.\n"
 "Do you want to remove them from your contact list?"
 msgstr ""
 
-#: gajim/gui_interface.py:453 gajim/gtk/notification.py:176
+#: gajim/gui_interface.py:442 gajim/gtk/notification.py:176
 #, fuzzy
 msgid "Unsubscribed"
 msgstr "_Адпісацца"
 
-#: gajim/gui_interface.py:465
+#: gajim/gui_interface.py:454
 #, python-format
 msgid "%(jid)s declined the invitation: %(reason)s"
 msgstr ""
 
-#: gajim/gui_interface.py:469
+#: gajim/gui_interface.py:458
 #, python-format
 msgid "%(jid)s declined the invitation"
 msgstr ""
 
-#: gajim/gui_interface.py:485
+#: gajim/gui_interface.py:474
 #, fuzzy, python-brace-format
 msgid "You are invited to {room} by {user}"
 msgstr "Вы не ўвайшлі ў пакой групавой размовы."
 
-#: gajim/gui_interface.py:506
+#: gajim/gui_interface.py:495
 #, fuzzy
 msgid "Certificate Passphrase Required"
 msgstr "Патрэбны пароль"
 
-#: gajim/gui_interface.py:507
+#: gajim/gui_interface.py:496
 #, fuzzy, python-format
 msgid "Enter the certificate passphrase for account %s"
 msgstr "Вызначце пароль GPG для рахунка %s."
 
-#: gajim/gui_interface.py:516 gajim/gtk/accounts.py:963
+#: gajim/gui_interface.py:505 gajim/gtk/accounts.py:966
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Увядзіце пароль для рахунка %s"
 
-#: gajim/gui_interface.py:529 gajim/gtk/accounts.py:964
+#: gajim/gui_interface.py:518
+msgid "Password Required"
+msgstr "Патрабуецца пароль"
+
+#: gajim/gui_interface.py:518 gajim/gtk/accounts.py:967
 msgid "Save password"
 msgstr "Захаваць пароль"
 
-#: gajim/gui_interface.py:601 gajim/gui_interface.py:632
+#: gajim/gui_interface.py:587 gajim/gui_interface.py:618
+#: gajim/gtk/filetransfer.py:332 gajim/gtk/filetransfer.py:333
 #: gajim/gtk/notification.py:173 gajim/gtk/notification.py:276
 msgid "File Transfer Error"
 msgstr "Памылка перадачы файла"
 
-#: gajim/gui_interface.py:666
+#: gajim/gui_interface.py:652
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s хоча адправіць Вам файл."
 
-#: gajim/gui_interface.py:668 gajim/gtk/filetransfer.py:479
+#: gajim/gui_interface.py:654 gajim/gtk/filetransfer.py:484
 #: gajim/gtk/notification.py:172 gajim/gtk/notification.py:274
 msgid "File Transfer Request"
 msgstr "Запыт на перадачу файла"
 
-#: gajim/gui_interface.py:767
+#: gajim/gui_interface.py:753
 #, fuzzy
 msgid "Remote Contact Stopped Transfer"
 msgstr "Выдаліць чалавека з спіса"
 
-#: gajim/gui_interface.py:772
+#: gajim/gui_interface.py:758
 #, fuzzy
 msgid "Error Opening File"
 msgstr "Памылка чытання файла:"
 
-#: gajim/gui_interface.py:782
+#: gajim/gui_interface.py:768
 #, fuzzy
 msgid "SSL Certificate Error"
 msgstr "Няправільнае імя карыстальніка"
 
-#: gajim/gui_interface.py:795 gajim/gui_interface.py:826
-#: gajim/gui_interface.py:853 gajim/gtk/notification.py:174
+#: gajim/gui_interface.py:781 gajim/gui_interface.py:812
+#: gajim/gui_interface.py:839 gajim/gtk/notification.py:174
 #: gajim/gtk/notification.py:279
 msgid "File Transfer Stopped"
 msgstr "Перадача файла спыненая"
 
-#: gajim/gui_interface.py:799
+#: gajim/gui_interface.py:785
 #, fuzzy
 msgid "File Transfer Failed"
 msgstr "Перадача файлаў"
 
-#: gajim/gui_interface.py:822
+#: gajim/gui_interface.py:808
 #, fuzzy, python-format
 msgid "%(filename)s received from %(name)s."
 msgstr "Перадача файла %(filename)s ад %(name)s спыненая."
 
-#: gajim/gui_interface.py:827
+#: gajim/gui_interface.py:813
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Перадача файла %(filename)s ад %(name)s спыненая."
 
-#: gajim/gui_interface.py:833
+#: gajim/gui_interface.py:819
 #, fuzzy, python-format
 msgid "File transfer of %(filename)s from %(name)s failed."
 msgstr "Перадача файла %(filename)s ад %(name)s спыненая."
 
-#: gajim/gui_interface.py:848
+#: gajim/gui_interface.py:834
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Вы паспяхова адправілі файл %(filename)s для %(name)s."
 
-#: gajim/gui_interface.py:854
+#: gajim/gui_interface.py:840
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Перадача файла %(filename)s для %(name)s спыненая."
 
-#: gajim/gui_interface.py:860
+#: gajim/gui_interface.py:846
 #, fuzzy, python-format
 msgid "File transfer of %(filename)s to %(name)s failed."
 msgstr "Перадача файла %(filename)s для %(name)s спыненая."
 
-#: gajim/gui_interface.py:971
+#: gajim/gui_interface.py:957
 msgid "Username Conflict"
 msgstr "Канфлікт імёнаў карыстальнікаў"
 
-#: gajim/gui_interface.py:972
+#: gajim/gui_interface.py:958
 msgid "Please type a new username for your local account"
 msgstr "Вызначце імя карыстальніка для мясцовага рахунка"
 
-#: gajim/gui_interface.py:995
+#: gajim/gui_interface.py:981
 #, fuzzy
 msgid "Resource Conflict"
 msgstr "Канфлікт імёнаў карыстальнікаў"
 
-#: gajim/gui_interface.py:996
+#: gajim/gui_interface.py:982
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
 msgstr ""
 
-#: gajim/gui_interface.py:1053
+#: gajim/gui_interface.py:1039
 #, fuzzy, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s хоча адправіць Вам файл."
 
-#: gajim/gui_interface.py:1055
+#: gajim/gui_interface.py:1041
 #, fuzzy
 msgid "Voice Chat Request"
 msgstr "Запыт на перадачу файла"
 
-#: gajim/gui_interface.py:1123 gajim/gtk/account_wizard.py:312
+#: gajim/gui_interface.py:1109 gajim/gtk/account_wizard.py:312
 #, fuzzy
 msgid "Certificate Already in File"
 msgstr "Чалавек ужо ёсць у кантактным лісце"
 
-#: gajim/gui_interface.py:1124 gajim/gtk/account_wizard.py:313
+#: gajim/gui_interface.py:1110 gajim/gtk/account_wizard.py:313
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr ""
 
-#: gajim/gui_interface.py:1145
+#: gajim/gui_interface.py:1131
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid"
 msgstr ""
 
-#: gajim/gui_interface.py:1148
+#: gajim/gui_interface.py:1134
 #, python-format
 msgid ""
 "\n"
 "Unknown SSL error: %d"
 msgstr ""
 
-#: gajim/gui_interface.py:1150
+#: gajim/gui_interface.py:1136
 #, python-format
 msgid ""
 "\n"
 "SSL Error: <b>%s</b>"
 msgstr ""
 
-#: gajim/gui_interface.py:1155
+#: gajim/gui_interface.py:1141
 msgid "Error verifying SSL certificate"
 msgstr ""
 
-#: gajim/gui_interface.py:1156
+#: gajim/gui_interface.py:1142
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your XMPP server: "
@@ -2206,7 +2181,7 @@ msgid ""
 "Do you still want to connect to this server?"
 msgstr ""
 
-#: gajim/gui_interface.py:1160 gajim/gtk/account_wizard.py:412
+#: gajim/gui_interface.py:1146 gajim/gtk/account_wizard.py:413
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -2216,207 +2191,194 @@ msgid ""
 "%(sha256)s"
 msgstr ""
 
-#: gajim/gui_interface.py:1166
+#: gajim/gui_interface.py:1152
 msgid "Ignore this error for this certificate."
 msgstr ""
 
-#: gajim/gui_interface.py:1174
+#: gajim/gui_interface.py:1160
 #, fuzzy, python-format
 msgid "SSL Certificate Verification for %s"
 msgstr "Дадаць асабістае нагадванне для %s"
 
-#: gajim/gui_interface.py:1442 gajim/gtk/join_groupchat.py:235
-msgid "You can not join a group chat unless you are connected."
-msgstr ""
-"Вы не можаце ўдзельнічаць у групавой размове, не злучыўшыся з серверам."
-
-#: gajim/gui_interface.py:1448
-#, fuzzy
-msgid "JID is not a Groupchat"
-msgstr "Гэта не групавая размова"
-
-#: gajim/gui_interface.py:1579
-msgid "This is not a group chat"
-msgstr "Гэта не групавая размова"
-
-#: gajim/gui_interface.py:1580
-#, python-format
-msgid ""
-"%(room_jid)s is already in your roster. Please check if %(room_jid)s is a "
-"correct group chat name. If it is, delete it from your roster and try "
-"joining the group chat again."
-msgstr ""
-
-#: gajim/gui_interface.py:1604 gajim/dialog_messages.py:58
+#: gajim/gui_interface.py:1577
 msgid "You cannot join a group chat while you are invisible"
 msgstr "Вы не можаце ўдзельнічаць у групавой размове нябачным"
 
-#: gajim/gui_interface.py:2037
+#: gajim/gui_interface.py:1976
 msgid "Could not save your settings and preferences"
 msgstr "Немагчыма захаваць настаўленні"
 
-#: gajim/gui_interface.py:2098
+#: gajim/gui_interface.py:2037
 msgid "Gajim: IPython Console"
 msgstr ""
 
-#: gajim/dialog_messages.py:32
+#: gajim/dialog_messages.py:31 gajim/dialog_messages.py:36
+#: gajim/gtk/single_message.py:305 gajim/gtk/account_wizard.py:229
 #, fuzzy
-msgid "You can not start a new conversation unless you are connected."
-msgstr ""
-"Вы не можаце ўдзельнічаць у групавой размове, не злучыўшыся з серверам."
-
-#: gajim/dialog_messages.py:36 gajim/dialog_messages.py:41
-#: gajim/gtk/single_message.py:305 gajim/gtk/join_groupchat.py:211
-#: gajim/gtk/account_wizard.py:229
-msgid "Invalid JID"
-msgstr "Няправільны JID"
+msgid "Invalid XMPP Address"
+msgstr "Няправільны файл"
 
-#: gajim/dialog_messages.py:42 gajim/gtk/single_message.py:306
+#: gajim/dialog_messages.py:37
 #, fuzzy, python-format
-msgid "It is not possible to send a message to %s, this JID is not valid."
+msgid ""
+"It is not possible to send a message to %s. This XMPP Address is not valid."
 msgstr "Немагчыма адправіць пусты файл"
 
-#: gajim/dialog_messages.py:47
-msgid "Unread events"
+#: gajim/dialog_messages.py:42
+#, fuzzy
+msgid "Unread Events"
 msgstr "Нягледжаныя падзеі"
 
-#: gajim/dialog_messages.py:48
-msgid "Read all pending events before removing this account."
+#: gajim/dialog_messages.py:43
+#, fuzzy
+msgid "Read or acknowledge all pending events before removing this account."
 msgstr "Прагледзьце нягледжаныя падзеі перад выдаленнем гэтага рахунка."
 
-#: gajim/dialog_messages.py:52
+#: gajim/dialog_messages.py:48
 #, fuzzy
 msgid "Invalid Form"
 msgstr "Няправільны элемент"
 
-#: gajim/dialog_messages.py:53
+#: gajim/dialog_messages.py:49
 #, fuzzy
 msgid "The form is not filled correctly."
 msgstr "Jabber ID групавой размовы ўтрымлівае няправільныя знакі."
 
-#: gajim/dialog_messages.py:57 gajim/common/helpers.py:309
+#: gajim/dialog_messages.py:53 gajim/common/helpers.py:315
 msgid "Invisible"
 msgstr "Нябачны"
 
-#: gajim/dialog_messages.py:62
-msgid "A connection is not available"
+#: gajim/dialog_messages.py:54
+#, fuzzy
+msgid "You cannot join a group chat while being invisible."
+msgstr "Вы не можаце ўдзельнічаць у групавой размове нябачным"
+
+#: gajim/dialog_messages.py:58
+#, fuzzy
+msgid "No Connection Available"
 msgstr "Няма злучэння"
 
-#: gajim/dialog_messages.py:63
+#: gajim/dialog_messages.py:59
 msgid "Your message can not be sent until you are connected."
 msgstr "Вы не можаце адпраўляць паведамленні без злучэння."
 
-#: gajim/dialog_messages.py:67
-#, fuzzy
-msgid "JID already in list"
-msgstr "Jabber-праграма"
-
-#: gajim/dialog_messages.py:68
-msgid "The JID you entered is already in the list. Choose another one."
+#: gajim/dialog_messages.py:63
+msgid "XMPP Address Already in List"
 msgstr ""
 
-#: gajim/dialog_messages.py:72
-msgid "Invalid answer"
+#: gajim/dialog_messages.py:64
+#, fuzzy
+msgid ""
+"The XMPP Address you entered is already in the list. Please choose another "
+"one."
+msgstr "Гэтая назва ўжо скарыстаная для іншага рахунка. Выберыце іншую назву."
+
+#: gajim/dialog_messages.py:69
+#, fuzzy
+msgid "Invalid Answer"
 msgstr "Няправільны адказ"
 
-#: gajim/dialog_messages.py:73
+#: gajim/dialog_messages.py:70
 #, fuzzy, python-format
 msgid "Transport %(name)s answered wrongly to register request: %(error)s"
 msgstr "Транспарт %s некарэктна адказаў, каб зарэгістраваць запыт: %s"
 
-#: gajim/dialog_messages.py:78
+#: gajim/dialog_messages.py:75
 #, fuzzy
 msgid "Wrong Custom Hostname"
 msgstr "Адмысловы вузел / порт"
 
-#: gajim/dialog_messages.py:79
+#: gajim/dialog_messages.py:76
 #, fuzzy, python-format
-msgid "Wrong custom hostname \"%s\". Ignoring it."
+msgid "Custom hostname \"%s\" is wrong. It will be ignored."
 msgstr "Адмысловы вузел / порт"
 
-#: gajim/dialog_messages.py:83
-msgid "Error while removing privacy list"
+#: gajim/dialog_messages.py:80
+#, fuzzy
+msgid "Error While Removing Privacy List"
 msgstr "Памылка ў часе выдалення спіса прыватнасці"
 
-#: gajim/dialog_messages.py:84
+#: gajim/dialog_messages.py:81
 #, fuzzy, python-format
 msgid ""
-"Privacy list %s has not been removed. It is maybe active in one of your "
-"connected resources. Deactivate it and try again."
+"Privacy list %s has not been removed. It is probably active in one of your "
+"connected resources. Please deactivate it and try again."
 msgstr ""
 "Спіс прыватнасці %s не выдалены. Магчыма, ён ужываецца ў адным з Вашых "
 "злучаных рэсурсаў. Дэактывізуйце іх і паўтарыце свае дзеянні."
 
-#: gajim/dialog_messages.py:90
+#: gajim/dialog_messages.py:87
 #, fuzzy
-msgid "Invisibility not supported"
+msgid "Invisibility Not Supported"
 msgstr "Пашырэнне не падтрымліваецца"
 
-#: gajim/dialog_messages.py:91
-#, python-format
-msgid "Account %s doesn't support invisibility."
-msgstr ""
+#: gajim/dialog_messages.py:88
+#, fuzzy, python-format
+msgid "This account %s doesn't support invisibility."
+msgstr "Спіс актыўных, скончаных і спыненых перадачаў файлаў"
 
-#: gajim/dialog_messages.py:95
+#: gajim/dialog_messages.py:92
 #, fuzzy
-msgid "Unregister failed"
+msgid "Unregister Failed"
 msgstr "Памылка злучэння"
 
-#: gajim/dialog_messages.py:96
-#, python-format
-msgid "Unregistration with server %(server)s failed: %(error)s"
-msgstr ""
+#: gajim/dialog_messages.py:93
+#, fuzzy, python-format
+msgid "Unregistration on server %(server)s failed: %(error)s"
+msgstr "Памылка злучэння"
 
-#: gajim/dialog_messages.py:100
+#: gajim/dialog_messages.py:97
 #, fuzzy
-msgid "Registration succeeded"
+msgid "Registration Succeeded"
 msgstr "Зарэгістравацца на %s"
 
-#: gajim/dialog_messages.py:101
-#, python-format
-msgid "Registration with agent %s succeeded"
-msgstr ""
+#: gajim/dialog_messages.py:98
+#, fuzzy, python-format
+msgid "Registration with agent %s succeeded."
+msgstr "Зарэгістравацца на %s"
 
-#: gajim/dialog_messages.py:105 gajim/gtk/service_registration.py:215
+#: gajim/dialog_messages.py:102
 #, fuzzy
-msgid "Registration failed"
+msgid "Registration Failed"
 msgstr "Памылка злучэння"
 
-#: gajim/dialog_messages.py:106
+#: gajim/dialog_messages.py:103
 #, python-format
 msgid ""
 "Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
 msgstr ""
 
-#: gajim/dialog_messages.py:111
+#: gajim/dialog_messages.py:108
 #, fuzzy
 msgid "Unable to Join Group Chat"
 msgstr "Немагчыма ўвайсці ў групавую размову"
 
-#: gajim/dialog_messages.py:116
-msgid "GStreamer error"
+#: gajim/dialog_messages.py:113
+msgid "GStreamer Error"
 msgstr ""
 
-#: gajim/dialog_messages.py:117
+#: gajim/dialog_messages.py:114
 #, fuzzy, python-format
 msgid ""
 "Error: %(error)s\n"
 "Debug: %(debug)s"
 msgstr "Памылка: %s"
 
-#: gajim/dialog_messages.py:121
-msgid "Wrong host"
+#: gajim/dialog_messages.py:118
+#, fuzzy
+msgid "Wrong Host"
 msgstr "Няправільны вузел"
 
-#: gajim/dialog_messages.py:122
+#: gajim/dialog_messages.py:119
 msgid "Invalid local address? :-O"
 msgstr ""
 
-#: gajim/dialog_messages.py:126
-msgid "Avahi error"
+#: gajim/dialog_messages.py:123
+#, fuzzy
+msgid "Avahi Error"
 msgstr "Памылка Avahi"
 
-#: gajim/dialog_messages.py:127
+#: gajim/dialog_messages.py:124
 #, python-format
 msgid ""
 "%s\n"
@@ -2425,66 +2387,66 @@ msgstr ""
 "%s\n"
 "Мясцовыя паведамленні могуць не працаваць."
 
-#: gajim/dialog_messages.py:131 gajim/dialog_messages.py:136
+#: gajim/dialog_messages.py:128 gajim/dialog_messages.py:133
 #, fuzzy
-msgid "Could not request upload slot"
+msgid "Could not request upload slot for HTTP File Upload"
 msgstr "Немагчыма стартаваць мясцовы сервіс"
 
-#: gajim/dialog_messages.py:137
-msgid "Got unexpected response from server (see log)"
+#: gajim/dialog_messages.py:134
+msgid "Got unexpected response from server (see log)."
 msgstr ""
 
-#: gajim/dialog_messages.py:141 gajim/dialog_messages.py:146
+#: gajim/dialog_messages.py:138 gajim/dialog_messages.py:143
 #, fuzzy
-msgid "Could not open file"
+msgid "Could not Open File"
 msgstr "Немагчыма загрузіць малюнак"
 
-#: gajim/dialog_messages.py:142
-msgid "Exception raised while opening file (see log)"
+#: gajim/dialog_messages.py:139
+msgid "Exception raised while trying to open file (see log)."
 msgstr ""
 
-#: gajim/dialog_messages.py:151
-msgid "Unsecure"
-msgstr ""
+#: gajim/dialog_messages.py:148
+#, fuzzy
+msgid "Not Secure"
+msgstr "Не пачатая"
 
-#: gajim/dialog_messages.py:152
-msgid "Server returned unsecure transport (HTTP)"
+#: gajim/dialog_messages.py:149
+msgid "The server returned an insecure transport (HTTP)."
 msgstr ""
 
-#: gajim/dialog_messages.py:156
+#: gajim/dialog_messages.py:153
 #, fuzzy
-msgid "Could not upload file"
+msgid "Could not Upload File"
 msgstr "Немагчыма загрузіць малюнак"
 
-#: gajim/dialog_messages.py:157
+#: gajim/dialog_messages.py:154
 #, python-format
 msgid "HTTP response code from server: %s"
 msgstr ""
 
-#: gajim/dialog_messages.py:161
+#: gajim/dialog_messages.py:158
 msgid "Upload Error"
 msgstr ""
 
-#: gajim/dialog_messages.py:166
+#: gajim/dialog_messages.py:163
 #, fuzzy
 msgid "Encryption Error"
 msgstr "Шыфраванне дзейнічае"
 
-#: gajim/dialog_messages.py:167
-#, fuzzy
-msgid "For the chosen encryption there is no encryption method available"
-msgstr "Няма злучэння"
+#: gajim/dialog_messages.py:164
+msgid "There is no encryption method available for the chosen encryption."
+msgstr ""
 
-#: gajim/dialog_messages.py:171
+#: gajim/dialog_messages.py:169
 #, fuzzy
-msgid "Avatar upload failed"
+msgid "Avatar Upload Failed"
 msgstr "Памылка абнаўлення vCard"
 
-#: gajim/privatechat_control.py:204
+#: gajim/privatechat_control.py:207
 msgid "Sending private message failed"
 msgstr "Памылка адпраўкі прыватнага паведамлення"
 
-#: gajim/privatechat_control.py:206
+#: gajim/privatechat_control.py:209
 #, fuzzy, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr "Вы выйшлі з пакоя \"%s\", альбо \"%s\" сышоў."
@@ -2507,7 +2469,7 @@ msgstr "паказаць даведку па загадзе"
 
 #: gajim/gajim_remote.py:85
 #, fuzzy
-msgid "Lists all contacts in roster, one for each line"
+msgid "Lists all contacts in the contact list, one for each line"
 msgstr ""
 "Паказаць спіс усіх людзей у кантактным лісце. Звесткі пра кожнага чалавека "
 "друкуюцца на асобным радку"
@@ -2590,11 +2552,13 @@ msgstr ""
 
 #: gajim/gajim_remote.py:118
 #, fuzzy
-msgid "Sends new chat message to a contact in the roster. Account is optional."
+msgid ""
+"Sends new chat message to a contact in the contact list. Account is optional."
 msgstr "Карыстанне: /%s, хавае кнопкі размовы."
 
 #: gajim/gajim_remote.py:120 gajim/gajim_remote.py:130
-msgid "JID of the contact that will receive the message"
+#, fuzzy
+msgid "XMPP Address of the contact that will receive the message"
 msgstr "JID чалавека, які атрымае паведамленне"
 
 #: gajim/gajim_remote.py:121 gajim/gajim_remote.py:132
@@ -2608,8 +2572,10 @@ msgid "if specified, the message will be sent using this account"
 msgstr "Калі вызначана, паведамленне будзе адпраўленае праз гэты рахунак"
 
 #: gajim/gajim_remote.py:127
-msgid "Sends a chat message to someone on your roster. Account is optional."
-msgstr ""
+#, fuzzy
+msgid ""
+"Sends a chat message to someone on your contact list. Account is optional."
+msgstr "Карыстанне: /%s, хавае кнопкі размовы."
 
 #: gajim/gajim_remote.py:131
 msgid "subject"
@@ -2620,12 +2586,12 @@ msgid "message subject"
 msgstr "тэма паведамлення"
 
 #: gajim/gajim_remote.py:138
-msgid "Sends new message to a groupchat you've joined."
+msgid "Sends new message to a group chat you've joined."
 msgstr ""
 
 #: gajim/gajim_remote.py:140
 #, fuzzy
-msgid "JID of the room that will receive the message"
+msgid "XMPP Address of the group chat that will receive the message"
 msgstr "JID чалавека, які атрымае паведамленне"
 
 #: gajim/gajim_remote.py:147
@@ -2634,7 +2600,8 @@ msgstr "Атрымаць падрабязныя звесткі пра чалав
 
 #: gajim/gajim_remote.py:149 gajim/gajim_remote.py:162
 #: gajim/gajim_remote.py:192
-msgid "JID of the contact"
+#, fuzzy
+msgid "XMPP Address of the contact"
 msgstr "JID чалавека"
 
 #: gajim/gajim_remote.py:153
@@ -2695,7 +2662,8 @@ msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Запісвае бягучыя настаўленні Gajim у файл .config"
 
 #: gajim/gajim_remote.py:190
-msgid "Removes contact from roster"
+#, fuzzy
+msgid "Removes contact from contact list"
 msgstr "Выдаліць чалавека з спіса"
 
 #: gajim/gajim_remote.py:193
@@ -2743,9 +2711,9 @@ msgid "Missing argument \"contact_jid\""
 msgstr "Не хапае аргумента \"contact_jid\""
 
 #: gajim/gajim_remote.py:275
-#, python-format
+#, fuzzy, python-format
 msgid ""
-"'%s' is not in your roster.\n"
+"'%s' is not in your contact list.\n"
 "Please specify account for sending the message."
 msgstr ""
 "'%s' няма ў Вашым спісе.\n"
@@ -2966,12 +2934,12 @@ msgstr "Канец тыдня"
 msgid "Weekend!"
 msgstr "Выходныя!"
 
-#: gajim/common/logger.py:192 gajim/common/logger.py:197
+#: gajim/common/logger.py:189 gajim/common/logger.py:194
 #, python-format
 msgid "%s is a directory but should be a file"
 msgstr "%s з'яўляецца дырэкторыяй, але павінны быць файл"
 
-#: gajim/common/logger.py:217
+#: gajim/common/logger.py:214
 #, fuzzy, python-format
 msgid "Creating %s"
 msgstr "Апісанне: %s"
@@ -3046,23 +3014,22 @@ msgstr "%(nickname)s сышоў"
 msgid "Contact Signed Out"
 msgstr "Чалавек сышоў"
 
-#: gajim/common/contacts.py:455
-msgid "Not in roster"
-msgstr "Няма ў спісе"
-
 #: gajim/common/config.py:80
+#, fuzzy
 msgid ""
 "Show desktop notification even when a chat window is opened for this contact "
-"and does not have focus"
+"and does not have focus."
 msgstr ""
+"Дазволіць паказ паведамленняў і нагадванні, калі я _сышоў/заняты/нябачны"
 
 #: gajim/common/config.py:81
-msgid "Play sound when user is busy"
+msgid "Play sound even when being busy."
 msgstr ""
 
 #: gajim/common/config.py:83
-msgid "Show only online and free for chat contacts in roster."
-msgstr ""
+#, fuzzy
+msgid "Show only online and free for chat contacts in the contact list."
+msgstr "Я хачу дадаць Вас у свой кантактны ліст."
 
 #: gajim/common/config.py:86
 msgid "Time in minutes, after which your status changes to away."
@@ -3070,11 +3037,13 @@ msgstr "Праз колькі хвілінаў змяняць стан на сы
 
 #: gajim/common/config.py:87
 #, fuzzy
-msgid "$S (Away as a result of being idle more than $T min)"
+msgid "$S (Away: Idle more than $T min)"
 msgstr "Сышоў як вынік марнавання часу"
 
 #: gajim/common/config.py:87
-msgid "$S will be replaced by current status message, $T by autoawaytime."
+msgid ""
+"$S will be replaced by current status message, $T by the 'autoawaytime' "
+"value."
 msgstr ""
 
 #: gajim/common/config.py:89
@@ -3083,69 +3052,72 @@ msgstr "Праз колькі хвілінаў змяняць стан на не
 
 #: gajim/common/config.py:90
 #, fuzzy
-msgid "$S (Not available as a result of being idle more than $T min)"
+msgid "$S (Not available: Idle more than $T min)"
 msgstr "Недаступны ў выніку марнавання часу"
 
 #: gajim/common/config.py:90
-msgid "$S will be replaced by current status message, $T by autoxatime."
+msgid ""
+"$S will be replaced by current status message, $T by the 'autoxatime' value."
 msgstr ""
 
 #: gajim/common/config.py:93
 msgid ""
-"When to show notification area icon. Can be 'never', 'on_event', 'always'."
+"When to show the notification area icon. Can be 'never', 'on_event', and "
+"'always'."
 msgstr ""
 
 #: gajim/common/config.py:94
-msgid "Allow to hide the roster window even if the tray icon is not shown."
+msgid ""
+"Allow to hide the contact list window even if the notification area icon is "
+"not shown."
 msgstr ""
 
 #: gajim/common/config.py:97
 #, fuzzy
-msgid "Contact signed in notification color."
-msgstr "_Паказваць падзею ў галоўным вакне"
+msgid "Notification color for contacts signing in."
+msgstr "Паведамляць мне аб людзях, якія: "
 
 #: gajim/common/config.py:98
 #, fuzzy
-msgid "Contact signout notification color"
-msgstr "_Паказваць падзею ў галоўным вакне"
+msgid "Notification color for contacts signing out."
+msgstr "Паведамляць мне аб людзях, якія: "
 
 #: gajim/common/config.py:99
 #, fuzzy
-msgid "New message notification color."
+msgid "Notification color for new message notification."
 msgstr "_Паказваць падзею ў галоўным вакне"
 
 #: gajim/common/config.py:100
 #, fuzzy
-msgid "File transfer request notification color."
-msgstr "Запыт на перадачу файла"
+msgid "Notification color for file transfer request."
+msgstr "_Паведамляць мне аб сканчэнні перадачы файлаў"
 
 #: gajim/common/config.py:101
 #, fuzzy
-msgid "File transfer error notification color."
-msgstr "Перадача файла скасаваная"
+msgid "Notification color for file transfer errors."
+msgstr "_Паведамляць мне аб сканчэнні перадачы файлаў"
 
 #: gajim/common/config.py:102
-#, fuzzy
-msgid "File transfer complete or stopped notification color."
-msgstr "Паказаць нагадванне па сканчэнні перадачы файла"
+msgid "Notification color for stopped or completed file transfers."
+msgstr ""
 
 #: gajim/common/config.py:103
-#, fuzzy
-msgid "Groupchat invitation notification color"
-msgstr "Запрашэнне ў групавую размову"
+msgid "Notification color for group chat invitations."
+msgstr ""
 
 #: gajim/common/config.py:104
 #, fuzzy
-msgid "Background color of status changed notification"
+msgid "Notification background color for changed status."
 msgstr "Фонавы колер для толькі ўвайшоўшых людзей."
 
 #: gajim/common/config.py:105
-msgid "Other dialogs color."
+msgid "Notification color for other dialogs."
 msgstr ""
 
 #: gajim/common/config.py:106
+#, fuzzy
 msgid ""
-"List (space separated) of rows (accounts and groups) that are collapsed."
+"List of rows (accounts and groups) that are collapsed (space separated)."
 msgstr "Спіс падзеленых прагаламі згорнутых рахункаў і групаў."
 
 #: gajim/common/config.py:107
@@ -3153,8 +3125,10 @@ msgstr "Спіс падзеленых прагаламі згорнутых ра
 msgid "default"
 msgstr "Прадвызначана"
 
-#: gajim/common/config.py:113
-msgid "Language used by speller"
+#: gajim/common/config.py:113 gajim/common/config.py:424
+#: gajim/common/config.py:431
+#, fuzzy
+msgid "Language used for spell checking."
 msgstr "Мова правапісу"
 
 #: gajim/common/config.py:114
@@ -3168,10 +3142,11 @@ msgstr ""
 "'never' - не паказваць час."
 
 #: gajim/common/config.py:115
+#, fuzzy
 msgid ""
 "Print time in chats using Fuzzy Clock. Value of fuzziness from 1 to 4, or 0 "
-"to disable fuzzyclock. 1 is the most precise clock, 4 the least precise one. "
-"This is used only if print_time is 'sometimes'."
+"to disable Fuzzy Clock. 1 is the most precise clock, 4 the least precise "
+"one. This is used only if 'print_time' is 'sometimes'."
 msgstr ""
 "Паказваць час у вокнах размовы прыблізна. Значэнне прыблізнасці ад 1 да 4, "
 "альбо 0, каб адключыць прыблізнасць. 1 паказвае самы дакладны час, 4 "
@@ -3189,16 +3164,18 @@ msgstr "Лічыць спалучэнні * / _  мажлівымі знакам
 #: gajim/common/config.py:120
 #, fuzzy
 msgid ""
-"If true, do not remove */_ . So *abc* will be bold but with * * not removed."
+"If enabled, do not remove */_ . So *abc* will be bold but with * * not "
+"removed."
 msgstr ""
 "Калі true, не выдаляць */_ . Такім чынам, *abc* будзе тлустым, але * * не "
 "выдаляецца."
 
 #: gajim/common/config.py:123
+#, fuzzy
 msgid ""
-"Uses ReStructured text markup to send HTML, plus ascii formatting if "
-"selected. For syntax, see http://docutils.sourceforge.net/docs/ref/rst/"
-"restructuredtext.html (If you want to use this, install docutils)"
+"Uses ReStructured text markup to send HTML, plus ASCII formatting if "
+"selected. Needs docutils installed (for syntax, see http://docutils."
+"sourceforge.net/docs/ref/rst/restructuredtext.html)."
 msgstr ""
 "Ужыць рэструктураваную мову тэкставай разметкі для адпраўлення HTML, а "
 "таксама фарматаванне ASCII, калі ўключаная адпаведная опцыя. Глядзіце "
@@ -3206,33 +3183,36 @@ msgstr ""
 "html (калі Вы хочаце ўжыць гэтую магчымасць, усталюйце docutils)"
 
 #: gajim/common/config.py:132
+#, fuzzy
 msgid ""
-"Character to add after nickname when using nick completion (tab) in group "
-"chat."
+"Character to add after nickname when using nickname completion (tab) in "
+"group chat."
 msgstr "Знак пасля дапоўненай мянушкі ў групавой размове."
 
 #: gajim/common/config.py:133
+#, fuzzy
 msgid ""
-"Character to propose to add after desired nickname when desired nickname is "
-"used by someone else in group chat."
+"Character to propose to add after desired nickname when nickname is already "
+"used in group chat."
 msgstr "Знак пасля вызначанай мянушкі, калі яе згадваюць у групавой размове."
 
 #: gajim/common/config.py:155
 msgid ""
-"If true, Gajim will save roster position when hiding roster, and restore it "
-"when showing roster."
+"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:161
-msgid "Place the roster on the right in single window mode"
+msgid "Place the contact list on the right in single window mode"
 msgstr ""
 
 #: gajim/common/config.py:167
 #, fuzzy
 msgid ""
-"This option let you customize timestamp that is printed in conversation. For "
-"example \"[%H:%M] \" will show \"[hour:minute] \". See python doc on "
-"strftime for full documentation: http://docs.python.org/lib/module-time.html"
+"This option lets you customize the timestamp that is printed in "
+"conversation. For example '[%H:%M] ' will show '[hour:minute] '. See python "
+"doc on strftime for full documentation (https://docs.python.org/3/library/"
+"time.html)."
 msgstr ""
 "З дапамогай гэтай опцыі Вы можаце змяніць фармат часавых мецінаў, якія "
 "паказваюцца ў вокнах размовы. Напр., \"[%H:%M] \" азначае, што трэба "
@@ -3241,251 +3221,254 @@ msgstr ""
 "module-time.html"
 
 #: gajim/common/config.py:168
-msgid "Characters that are printed before the nickname in conversations"
+#, fuzzy
+msgid "Characters that are printed before the nickname in conversations."
 msgstr "Знакі, якія друкуюцца ў вокнах размовы перад мянушкай"
 
 #: gajim/common/config.py:169
-msgid "Characters that are printed after the nickname in conversations"
+#, fuzzy
+msgid "Characters that are printed after the nickname in conversations."
 msgstr "Знакі, якія друкуюцца ў вокнах размовы пасля мянушкі"
 
 #: gajim/common/config.py:170
-msgid "Add * and [n] in roster title?"
-msgstr "Дадаць * і [n] у назву галоўнага вакна?"
+#, fuzzy
+msgid "If enabled, Gajim will add * and [n] in contact list window title."
+msgstr ""
+"Калі гэтая опцыя ўключаная, Gajim паказвае аватары ў галоўным вакне і ў "
+"групавых размовах"
 
 #: gajim/common/config.py:171
 #, fuzzy
 msgid ""
-"How many history messages should be restored when a chat tab/window is "
-"reopened?"
+"Number of messages from chat history to be restored when a chat tab/window "
+"is reopened."
 msgstr ""
 "Колькі радкоў помніць з апошняй размовы, калі размова наноў адкрываецца."
 
 #: gajim/common/config.py:172
-msgid "How far back in time (minutes) history is restored. -1 means no limit."
+msgid ""
+"How far back in time (minutes) chat history is restored. -1 means no limit."
 msgstr ""
 
 #: gajim/common/config.py:173
 msgid ""
-"How many lines to request from server when entering a groupchat. -1 means no "
-"limit"
+"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:174
 msgid ""
-"Minutes of backlog to request when entering a groupchat. -1 means no limit"
+"Should automatic rejoin be activated when you were kicked from a group chat?"
 msgstr ""
 
 #: gajim/common/config.py:175
-msgid ""
-"How many seconds to wait before trying to autorejoin to a conference you are "
-"being disconnected from. Set to 0 to disable autorejoining."
-msgstr ""
-
-#: gajim/common/config.py:176
-msgid "Should autorejoin be activated when kicked from a conference?"
-msgstr ""
-
-#: gajim/common/config.py:177
-msgid ""
-"Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
-"Client default behaviour)."
+#, fuzzy
+msgid "Send message on Ctrl+Enter and make a new line with Enter."
 msgstr ""
 "Адпраўляць паведамленне праз Ctrl+Enter, а Enter стварае новы радок "
 "(стандартныя паводзіны Mirabilis ICQ)."
 
-#: gajim/common/config.py:179
-msgid "How many lines to store for Ctrl+KeyUP."
+#: gajim/common/config.py:177
+#, fuzzy
+msgid "How many lines to store for Ctrl+KeyUP (previously sent messages)."
 msgstr "Колькі радкоў захоўваць для Ctrl+KeyUP."
 
-#: gajim/common/config.py:182
+#: gajim/common/config.py:180
 #, fuzzy, python-format
 msgid ""
-"Either custom URL with %%s in it where %%s is the word/phrase or "
-"'WIKTIONARY' which means use Wikitionary."
+"Either a custom URL with %%s in it (where %%s is the word/phrase) or "
+"'WIKTIONARY' (which means use Wikitionary)."
 msgstr ""
 "Альбо адмысловы адрас з %s, дзе %s ёсць словам/выразам, альбо 'WIKTIONARY', "
 "што значыць выкарыстанне Вікі-Слоўніка."
 
-#: gajim/common/config.py:185
+#: gajim/common/config.py:183
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr ""
 "Калі гэтая опцыя ўключаная, Gajim можа кантралявацца з дапамогай gajim-"
 "remote."
 
-#: gajim/common/config.py:187
+#: gajim/common/config.py:185
+#, fuzzy
 msgid ""
-"When not printing time for every message (print_time==sometimes), print it "
+"When not printing time for every message ('print_time'==sometimes), print it "
 "every x minutes."
 msgstr ""
 "Калі трэба паказваць час не для кожнага паведамлення "
 "(print_time==sometimes), паказваць яго кожныя x хвілінаў."
 
-#: gajim/common/config.py:188
+#: gajim/common/config.py:186
 msgid "Ask before pasting an image."
 msgstr ""
 
-#: gajim/common/config.py:189
+#: gajim/common/config.py:187
 msgid "Ask before closing a group chat tab/window."
 msgstr "Пытацца пацверджання закрыцця групавой размовы."
 
-#: gajim/common/config.py:190
+#: gajim/common/config.py:188
 #, fuzzy
 msgid ""
-"Always ask for confirmation before closing groupchats with any of the JIDs "
-"on this space separated list."
+"Always ask for confirmation before closing group chats with any of the XMPP "
+"Addresses on this list (space separated)."
 msgstr ""
 "Заўсёды пытацца пацверджання закрыцця групавых размоў з гэтага спіса "
 "падзеленых прагаламі назваў групавых размоў."
 
-#: gajim/common/config.py:191
+#: gajim/common/config.py:189
 #, fuzzy
 msgid ""
-"Never ask for confirmation before closing groupchats with any of the JIDs on "
-"this space separated list."
+"Never ask for confirmation before closing group chats with any of the XMPP "
+"Addresses on this list (space separated)."
 msgstr ""
 "Ніколі не пытацца пацверджання закрыцця групавых размоў з гэтага спіса "
 "падзеленых прагаламі назваў групавых размоў."
 
-#: gajim/common/config.py:192
+#: gajim/common/config.py:190
 msgid ""
-"Ask before closing tabbed chat window if there are controls that can lose "
-"data (chat, private chat, groupchat that will not be minimized)"
+"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:195
+#: gajim/common/config.py:193
 #, fuzzy
 msgid ""
-"Comma separated list of sent hosts, in addition of local interfaces, for "
-"File Transfer in case of address translation/port forwarding."
+"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:196
+#: gajim/common/config.py:194
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "У стандарце IEC вызначана, што КіБ = 1024 байтаў, КБ = 1000 байтаў."
 
-#: gajim/common/config.py:198
+#: gajim/common/config.py:196
 #, fuzzy
 msgid "Notify of events in the notification area."
 msgstr "Нагадваць аб падзеях праз значку прасторы паведамленняў."
 
-#: gajim/common/config.py:199
+#: gajim/common/config.py:197
 msgid ""
-"If False, Gajim will display a static event icon instead of the blinking "
-"status icon in the notification area when notifying on event."
+"If disabled, Gajim will display a static event icon instead of the blinking "
+"status icon in the notification area when notifying about an event."
 msgstr ""
 
-#: gajim/common/config.py:205
+#: gajim/common/config.py:203
 msgid "Show tab when only one conversation?"
 msgstr "Паказваць картку, калі актыўная толькі адна размова?"
 
-#: gajim/common/config.py:206
+#: gajim/common/config.py:204
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "Паказваць межы картак у вокнах размовы?"
 
-#: gajim/common/config.py:207
+#: gajim/common/config.py:205
 msgid "Show close button in tab?"
 msgstr "Паказваць кнопку закрыцця на картцы?"
 
-#: gajim/common/config.py:220
+#: gajim/common/config.py:218
 msgid "Preview new messages in notification popup?"
 msgstr ""
 
-#: gajim/common/config.py:223
+#: gajim/common/config.py:221
+#, fuzzy
 msgid ""
-"A semicolon-separated list of words that will be highlighted in group chats."
+"A list of words (semicolon separated) that will be highlighted in group "
+"chats."
 msgstr ""
 "Спіс падзеленых кропкай з коскай слоў, якія трэба фарбаваць у групавых "
 "размовах."
 
-#: gajim/common/config.py:224
+#: gajim/common/config.py:222
 #, fuzzy
 msgid ""
-"If true, quits Gajim when X button of Window Manager is clicked. This "
-"setting is taken into account only if notification icon is used."
+"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 ""
 "Калі true, Gajim сканчвае работу па націску кнопкі X вакна. Гэтае "
 "настаўленне ўлічваецца толькі разам з значкай прасторы паведамленняў."
 
-#: gajim/common/config.py:225
+#: gajim/common/config.py:223
 msgid ""
-"If true, Gajim hides the Roster window on pressing the X button instead of "
-"minimizing into the Dock."
+"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:226
+#: gajim/common/config.py:224
 #, fuzzy
 msgid ""
-"If true, Gajim will display an icon on each tab containing unread messages. "
-"Depending on the theme, this icon may be animated."
+"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:227
+#: gajim/common/config.py:225
 #, fuzzy
 msgid ""
-"If true, Gajim will display the status message, if not empty, for every "
-"contact under the contact name in roster window."
+"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:233
-msgid "Define the position of the avatar in roster. Can be left or right"
+#: gajim/common/config.py:231
+msgid ""
+"Define the position of avatars in the contact list. Can be 'left' or 'right'."
 msgstr ""
 
-#: gajim/common/config.py:234
+#: gajim/common/config.py:232
 #, fuzzy
 msgid ""
-"If False, Gajim will no longer print status line in chats when a contact "
-"changes their status and/or their status message."
+"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:235
+#: gajim/common/config.py:233
 #, fuzzy
 msgid ""
 "Default Setting: Show a status message for every join or leave in a group "
-"chat"
+"chat."
 msgstr "Немагчыма ўвайсці ў групавую размову"
 
-#: gajim/common/config.py:236
+#: gajim/common/config.py:234
+#, fuzzy
 msgid ""
-"Default Setting: Show a status message for all status (away, dnd, etc.) "
-"changes of users in a group chat"
-msgstr ""
+"Default Setting: Show a status message for all status changes (away, dnd, "
+"etc.) of users in a group chat."
+msgstr "Немагчыма ўвайсці ў групавую размову"
 
-#: gajim/common/config.py:238
-msgid "Log XHTML messages instead of plain text messages."
+#: gajim/common/config.py:236
+msgid "Store XHTML messages in chat history instead of plain text messages."
 msgstr ""
 
-#: gajim/common/config.py:239
+#: gajim/common/config.py:237
 msgid "Don't show avatar for the transport itself."
 msgstr "Не паказваць аватар для транспарта."
 
-#: gajim/common/config.py:240
-msgid "Don't show roster in the system taskbar."
+#: gajim/common/config.py:238
+#, fuzzy
+msgid "Don't show contact list window in the system taskbar."
 msgstr "Не паказваць галоўнае вакно на панэлі заданняў."
 
-#: gajim/common/config.py:241
+#: gajim/common/config.py:239
 #, fuzzy
 msgid ""
-"If true, make the window flash (the default behaviour in most Window "
-"Managers) when holding pending events."
+"If enabled, Gajim makes the window flash (the default behaviour in most "
+"Window Managers) when holding pending events."
 msgstr ""
 "Калі true і калі ўсталяваныя GTK+ і PyGTK версіі, вышэйшай за 2.8, міргаць "
 "вакном (звычайныя паводзіны ў бальшыні кіраўнікоў вокнаў) пры наяўнасці "
 "нягледжаных падзей."
 
-#: gajim/common/config.py:245
+#: gajim/common/config.py:243
 #, fuzzy
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
 "'always_with_roster' - Like 'always' but the messages are in a single window "
-"along with the roster.\n"
+"along with the contact list.\n"
 "'never' - All messages get their own window.\n"
 "'peracct' - Messages for each account are sent to a specific window.\n"
-"'pertype' - Each message type (e.g. chats vs. groupchats) is sent to a "
+"'pertype' - Each message type (e.g. chats vs. group chats) is sent to a "
 "specific window."
 msgstr ""
 "Вызначае вакно для новых паведамленняў.\n"
@@ -3496,249 +3479,273 @@ msgstr ""
 "адпраўляюцца ў асобныя вокны. Зважайце, што гэтыя змены будуць ужытыя толькі "
 "пасля перазапуску праграмы."
 
-#: gajim/common/config.py:246
+#: gajim/common/config.py:244
 msgid ""
-"Show roster on startup.\n"
-"'always' - Always show roster.\n"
-"'never' - Never show roster.\n"
-"'last_state' - Restore the last state roster."
+"Show contact list window on startup.\n"
+"'always' - Always show contact list window.\n"
+"'never' - Never show contact list window.\n"
+"'last_state' - Restore last state of the contact list window."
 msgstr ""
 
-#: gajim/common/config.py:247
-msgid "If False, you will no longer see the avatar in the chat window."
+#: gajim/common/config.py:245
+#, fuzzy
+msgid "If enabled, Gajim displays the avatar in the chat window."
 msgstr "Калі false, не паказваць аватары ў вакне размовы."
 
-#: gajim/common/config.py:248
+#: gajim/common/config.py:246
 #, fuzzy
-msgid "If true, pressing the escape key closes a tab/window."
+msgid "If enabled, pressing Esc closes a tab/window."
 msgstr "Калі true, клавіша Escape закрывае картку / вакно."
 
-#: gajim/common/config.py:249
-msgid "Hides the banner in a group chat window"
+#: gajim/common/config.py:247
+#, fuzzy
+msgid "Hides the banner in a group chat window."
 msgstr "Хавае банер у групавой размове"
 
-#: gajim/common/config.py:250
-msgid "Hides the banner in two persons chat window"
-msgstr "Хавае банер у прыватнай размове"
+#: gajim/common/config.py:248
+#, fuzzy
+msgid "Hides the banner in a 1:1 chat window."
+msgstr "Хавае банер у групавой размове"
 
-#: gajim/common/config.py:251
-msgid "Hides the group chat occupants list in group chat window."
+#: gajim/common/config.py:249
+#, fuzzy
+msgid "Hides the group chat participants list in a group chat window."
 msgstr "Схаваць спіс удзельнікаў групавой размовы."
 
-#: gajim/common/config.py:252
+#: gajim/common/config.py:250
+#, fuzzy
 msgid ""
 "In a chat, show the nickname at the beginning of a line only when it's not "
-"the same person talking than in previous message."
+"the same person talking as in the previous message."
 msgstr ""
 "У групавой размове не паказваць мянушку, калі папярэдняе паведамленне "
 "напісаў той самы чалавек."
 
-#: gajim/common/config.py:253
+#: gajim/common/config.py:251
 msgid "Indentation when using merge consecutive nickname."
 msgstr "Водступ пры шматмэтавым прызначэнні паведамлення."
 
-#: gajim/common/config.py:254
-msgid "Ctrl-Tab go to next composing tab when none is unread."
+#: gajim/common/config.py:252
+#, 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:255
+#: gajim/common/config.py:253
 #, fuzzy
 msgid ""
-"Show the confirm metacontacts creation dialog or not? Empty string means "
-"never show the dialog."
+"Show a confirmation dialog to create metacontacts? Empty string means never "
+"show the dialog."
 msgstr ""
 "Ці трэба паказваць вакно пацверджання пры стварэнні мета-кантакта? Пусты "
 "радок адключае гэтае вакно."
 
-#: gajim/common/config.py:256
+#: gajim/common/config.py:254
 #, fuzzy
 msgid ""
-"Show the confirm block contact dialog or not? Empty string means never show "
+"Show a confirmation dialog to block a contact? Empty string means never show "
 "the dialog."
 msgstr ""
 "Ці трэба паказваць вакно пацверджання пры стварэнні мета-кантакта? Пусты "
 "радок адключае гэтае вакно."
 
-#: gajim/common/config.py:257
+#: gajim/common/config.py:255
 #, fuzzy
 msgid ""
-"Show the confirm custom status dialog or not? Empty string means never show "
-"the dialog."
+"Show a confirmation dialog for a custom status? Empty string means never "
+"show the dialog."
 msgstr ""
 "Ці трэба паказваць вакно пацверджання пры стварэнні мета-кантакта? Пусты "
 "радок адключае гэтае вакно."
 
-#: gajim/common/config.py:258
+#: gajim/common/config.py:256
 #, fuzzy
 msgid ""
-"If true, you will be able to set a negative priority to your account in "
-"account modification window. BE CAREFUL, when you are logged in with a "
-"negative priority, you will NOT receive any message from your server."
+"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 ""
 "Калі true, Вы зможаце выставіць для рахунка адмоўны прыярытэт. Увага: калі "
 "Вы ўвайшлі з адмоўным прыярытэтам, Вы не будзеце атрымліваць паведамленняў "
 "ад Вашага сервера."
 
-#: gajim/common/config.py:259
+#: gajim/common/config.py:257
 #, fuzzy
 msgid ""
-"If true, Gajim will show number of online and total contacts in account and "
-"group rows."
+"If enabled, Gajim will show both the number of online and total contacts in "
+"account rows as well as in group rows."
 msgstr ""
 "Калі true, Gajim будзе паказваць у кантактным лісце колькасць падлучаных "
 "людзей і агульную колькасць у радках групаў і рахункаў."
 
-#: gajim/common/config.py:260
+#: gajim/common/config.py:258
+#, fuzzy
 msgid ""
-"Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
-"as if they were of this type"
+"Can be empty, 'chat' or 'normal'. If not empty, all incoming messages are "
+"treated as if they were of this type."
 msgstr ""
 "Можа мець значэнні 'chat', 'normal' альбо быць пустым. Калі не пустое, то "
 "лічыць усе ўваходныя паведамленні гэтага тыпу"
 
-#: gajim/common/config.py:261
+#: gajim/common/config.py:259
 msgid ""
-"If true, Gajim will scroll and select the contact who sent you the last "
-"message, if chat window is not already opened."
+"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:262
+#: gajim/common/config.py:260
 msgid "Time of inactivity needed before the change status window closes down."
 msgstr ""
 
-#: gajim/common/config.py:263
+#: gajim/common/config.py:261
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
 msgstr ""
 
-#: gajim/common/config.py:264
+#: gajim/common/config.py:262
 msgid ""
-"If true, notification windows from notification-daemon will be attached to "
-"notification icon."
+"If enabled, notification windows from notification-daemon will be attached "
+"to the notification area icon."
 msgstr ""
 
-#: gajim/common/config.py:265
+#: gajim/common/config.py:263
 msgid "Choose interval between 2 checks of idleness."
 msgstr ""
 
-#: gajim/common/config.py:266
+#: gajim/common/config.py:264
 msgid ""
-"Valid uri schemes. Only schemes in this list will be accepted as \"real\" "
-"uri. (mailto and xmpp are handled separately)"
+"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:265
+msgid ""
+"If enabled, completion in group chats will be like a shell auto-completion."
+msgstr ""
+
+#: gajim/common/config.py:270
+msgid "Optionally fix Jingle output video framerate. Example: 10/1 or 25/2."
 msgstr ""
 
-#: gajim/common/config.py:267
-msgid "If true, completion in groupchats will be like a shell auto-completion"
+#: gajim/common/config.py:271
+msgid "Optionally resize Jingle output video. Example: 320x240."
 msgstr ""
 
 #: gajim/common/config.py:272
-msgid "Optionally fix jingle output video framerate. Example: 10/1 or 25/2"
+msgid "If enabled, you will see your webcam's video stream as well."
 msgstr ""
 
-#: gajim/common/config.py:273
-msgid "Optionally resize jingle output video. Example: 320x240"
+#: gajim/common/config.py:275
+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:274
-msgid "If true, You will also see your webcam"
+#: gajim/common/config.py:276
+msgid "STUN server to use when using Jingle"
 msgstr ""
 
 #: gajim/common/config.py:277
 msgid ""
-"If true, Gajim will try to use a STUN server when using Jingle. The one in "
-"\"stun_server\" option, or the one given by the XMPP server."
+"If enabled, Gajim will show affiliation of group chat participants by adding "
+"a colored square to the status icon."
 msgstr ""
 
 #: gajim/common/config.py:278
-msgid "STUN server to use when using Jingle"
+msgid ""
+"Proxy used for all outgoing connections if the account does not have a "
+"specific proxy configured."
 msgstr ""
 
 #: gajim/common/config.py:279
-msgid ""
-"If true, Gajim will show affiliation of groupchat occupants by adding a "
-"colored square to the status icon"
+msgid "If enabled, Gajim will ignore incoming attention requests ('wizz')."
 msgstr ""
 
 #: gajim/common/config.py:280
 msgid ""
-"Proxy used for all outgoing connections if the account does not have a "
-"specific proxy configured"
+"If enabled, Gajim will reopen chat windows that were opened last time Gajim "
+"was closed."
 msgstr ""
 
 #: gajim/common/config.py:281
-msgid "If true, Gajim will ignore incoming attention requests (\"wizz\")."
+msgid ""
+"If enabled, Gajim will display an icon to show that sent messages have been "
+"received by your contact."
 msgstr ""
 
 #: gajim/common/config.py:282
-msgid ""
-"If enabled, Gajim will reopen chat windows that were opened last time Gajim "
-"was closed."
+msgid "Show a mini avatar in chat window tabs and as the window's icon."
 msgstr ""
 
 #: gajim/common/config.py:283
+#, fuzzy
 msgid ""
-"If enabled, Gajim will show an icon to show that sent message has been "
-"received by your contact"
+"If enabled, Gajim will use the System's Keyring to store account passwords."
 msgstr ""
+"Калі true, Gajim будзе захоўваць паролі ад рахункаў з дапамогай кіраўніка "
+"пароляў Gnome Keyring (калі ўсталяваны)."
 
 #: gajim/common/config.py:284
-msgid "Show a mini avatar in chat window tabs and in window icon"
+msgid "If enabled, Gajim will execute XEP-0146 Commands."
 msgstr ""
 
 #: gajim/common/config.py:285
-#, fuzzy
-msgid "If true, Gajim will use the Systems Keyring to store account passwords."
+msgid "2: System, 1: Enabled, 0: Disabled"
 msgstr ""
-"Калі true, Gajim будзе захоўваць паролі ад рахункаў з дапамогай кіраўніка "
-"пароляў Gnome Keyring (калі ўсталяваны)."
 
 #: gajim/common/config.py:286
-msgid "If true, Gajim will execute XEP-0146 Commands."
+msgid "Options in days which can be chosen in the sync threshold menu"
 msgstr ""
 
 #: gajim/common/config.py:287
-msgid "2: System, 1: Enabled, 0: Disabled"
+msgid ""
+"Maximum history in days we request from a public group chat archive. 0: As "
+"much as possible."
 msgstr ""
 
 #: gajim/common/config.py:288
-msgid "Options in days which can be chosen in the sync threshold menu"
+msgid ""
+"Maximum history in days we request from a private group chat archive. 0: As "
+"much as possible."
 msgstr ""
 
 #: gajim/common/config.py:289
 msgid ""
-"Maximum history in days we request from a public room archive. 0: As much as "
-"possible"
+"If enabled, Gajim shows the group chat subject in the chat window when "
+"joining."
 msgstr ""
 
 #: gajim/common/config.py:290
+#, fuzzy
 msgid ""
-"Maximum history in days we request from a private room archive. 0: As much "
-"as possible"
+"If enabled, the contact row is colored according to the current chat state "
+"of the contact."
 msgstr ""
+"Калі гэтая опцыя ўключаная, Gajim далучыцца да гэтай групавой размовы пры "
+"запуску"
 
 #: gajim/common/config.py:291
-msgid "If the room subject is shown in chat on join"
+#, fuzzy
+msgid ""
+"If enabled, the tab is colored according to the current chat state of the "
+"contact."
 msgstr ""
+"Калі гэтая опцыя ўключаная, Gajim далучыцца да гэтай групавой размовы пры "
+"запуску"
 
 #: gajim/common/config.py:292
+#, fuzzy
 msgid ""
-"If the contact row is colored according to the current chatstate of the "
-"contact"
+"Shows a text in the banner that describes the current chat state of the "
+"contact."
 msgstr ""
+"Калі гэтая опцыя ўключаная, Gajim далучыцца да гэтай групавой размовы пры "
+"запуску"
 
 #: gajim/common/config.py:293
-msgid "If the tab is colored according to the current chatstate of the contact"
-msgstr ""
-
-#: gajim/common/config.py:294
-msgid ""
-"Shows a text in the banner that describes the current chatstate of the "
-"contact"
-msgstr ""
-
-#: gajim/common/config.py:295 gajim/common/config.py:424
 #, fuzzy
 msgid ""
 "Chat state notifications that are sent to contacts. Possible values: all, "
@@ -3747,127 +3754,137 @@ msgstr ""
 "Адпраўляць паведамленні аб стане размовы. Адно з наступных значэнняў: all, "
 "composing_only, disabled."
 
-#: gajim/common/config.py:296 gajim/common/config.py:438
+#: gajim/common/config.py:294
 #, fuzzy
 msgid ""
 "Chat state notifications that are sent to the group chat. Possible values: "
-"all, composing_only, disabled"
+"'all', 'composing_only', 'disabled'"
 msgstr ""
 "Адпраўляць паведамленні аб стане размовы. Адно з наступных значэнняў: all, "
 "composing_only, disabled."
 
-#: gajim/common/config.py:312
+#: gajim/common/config.py:297
+msgid "API Preferences. Possible values: 'http', 'iq'"
+msgstr ""
+
+#: gajim/common/config.py:313
+#, fuzzy
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
-"defined in autopriority_* options."
+"defined in 'autopriority_*' options."
 msgstr ""
 "Аўтаматычна змяняць прыярытэт згодна з станам. Прыярытэты выстаўленыя ў "
 "опцыях autopriority_*."
 
-#: gajim/common/config.py:320
+#: gajim/common/config.py:321
 msgid ""
-"Status used to autoconnect as. Can be online, chat, away, xa, dnd, "
-"invisible. NOTE: this option is used only if restore_last_status is disabled"
+"Status to be used automatically when connecting. Can be 'online', 'chat', "
+"'away', 'xa', 'dnd' or 'invisible'. NOTE: This option is used only if "
+"'restore_last_status' is disabled."
 msgstr ""
 
-#: gajim/common/config.py:321
-msgid "If enabled, restore the last status that was used."
+#: gajim/common/config.py:322
+msgid "If enabled, the last status will be restored."
 msgstr ""
 
-#: gajim/common/config.py:322
+#: gajim/common/config.py:323
 msgid ""
-"If true, Contacts requesting authorization will be automatically accepted."
+"If enabled, Contacts requesting authorization will be accepted automatically."
 msgstr ""
 
-#: gajim/common/config.py:323
+#: gajim/common/config.py:324
 #, fuzzy
 msgid ""
-"If False, this account will be disabled and will not appear in roster window."
+"If disabled, this account will be disabled and will not appear in the "
+"contact list window."
 msgstr "Калі false, не паказваць аватары ў вакне размовы."
 
-#: gajim/common/config.py:327
-msgid "Allow plaintext connections"
+#: gajim/common/config.py:328
+msgid "Allow plaintext connections."
 msgstr ""
 
-#: gajim/common/config.py:330
+#: gajim/common/config.py:331
 msgid ""
-"List (space separated) of authentication mechanisms to try. Can contain "
-"ANONYMOUS, EXTERNAL, GSSAPI, SCRAM-SHA-1-PLUS, SCRAM-SHA-1, DIGEST-MD5, "
-"PLAIN, X-MESSENGER-OAUTH2 or XEP-0078"
+"List of authentication mechanisms to try (space separated). Can contain "
+"'ANONYMOUS', 'EXTERNAL', 'GSSAPI', 'SCRAM-SHA-1-PLUS', 'SCRAM-SHA-1', "
+"'DIGEST-MD5', 'PLAIN', 'X-MESSENGER-OAUTH2' or 'XEP-0078'."
 msgstr ""
 
-#: gajim/common/config.py:331
+#: gajim/common/config.py:332
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection. "
-"Can be 'warn', 'connect', 'disconnect'"
+"Can be 'warn', 'connect' or 'disconnect'."
 msgstr ""
 
-#: gajim/common/config.py:332
+#: gajim/common/config.py:333
 msgid "Show a warning dialog before using standard SSL library."
 msgstr ""
 
-#: gajim/common/config.py:333
+#: gajim/common/config.py:334
 msgid ""
 "Show a warning dialog before sending PLAIN password over a plain connection."
 msgstr ""
 
-#: gajim/common/config.py:334
-msgid "Space separated list of ssl errors to ignore."
+#: gajim/common/config.py:335
+msgid "List of SSL errors to ignore (space separated)."
 msgstr ""
 
-#: gajim/common/config.py:340
+#: gajim/common/config.py:341
 msgid ""
-"Space separated list of JIDs for which you do not want to store logs. You "
-"can also add account name to log nothing for this account."
+"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:341
+#: gajim/common/config.py:342
 msgid ""
-"Space separated list of JIDs for which you accept to not log conversations "
-"if he does not want to."
+"List of XMPP Addresses (space separated) for which you accept to not store "
+"chat history if your contact does not want to."
 msgstr ""
 
-#: gajim/common/config.py:343
-msgid "Whitespace sent after inactivity"
+#: gajim/common/config.py:344
+msgid "If enabled, a whitespace is sent after inactivity (keep alive)."
 msgstr ""
 
-#: gajim/common/config.py:344
-msgid "XMPP ping sent after inactivity"
+#: gajim/common/config.py:345
+msgid "If enabled, an XMPP ping is sent after inactivity (ping alive)."
 msgstr ""
 
-#: gajim/common/config.py:348
+#: gajim/common/config.py:349
 msgid ""
-"How many seconds to wait for the answer of ping alive packet before trying "
-"to reconnect?"
+"How many seconds to wait for the answer of a ping alive packet before trying "
+"to reconnect."
 msgstr ""
 
-#: gajim/common/config.py:352
-msgid "Jabberd2 workaround"
+#: gajim/common/config.py:353
+#, fuzzy
+msgid "Jabberd2 workaround."
 msgstr "Выпраўленне хібы Jabberd2"
 
-#: gajim/common/config.py:355
+#: gajim/common/config.py:356
+#, fuzzy
 msgid ""
-"If checked, Gajim will use your IP and proxies defined in "
-"file_transfer_proxies option for file transfer."
+"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/common/config.py:356
+#: gajim/common/config.py:357
 msgid ""
-"If true, Gajim will test file transfer proxies on startup to be sure it "
-"works. Openfire's proxies are known to fail this test even if they work."
+"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:369
-msgid "Answer to receipt requests"
+#: gajim/common/config.py:370
+msgid "If enabled, Gajim will answer to message receipt requests."
 msgstr ""
 
-#: gajim/common/config.py:370
-msgid "Sent receipt requests"
+#: gajim/common/config.py:371
+msgid "If enabled, Gajim will send message receipt requests."
 msgstr ""
 
-#: gajim/common/config.py:379
+#: gajim/common/config.py:380
 #, fuzzy
 msgid ""
 "Allow Gajim to send information about the operating system you are running."
@@ -3875,183 +3892,198 @@ msgstr ""
 "Калі гэтая опцыя ўключаная, Gajim далучыцца да гэтай групавой размовы пры "
 "запуску"
 
-#: gajim/common/config.py:380
+#: gajim/common/config.py:381
 #, fuzzy
 msgid "Allow Gajim to send your local time."
 msgstr "%s хоча адправіць Вам файл."
 
-#: gajim/common/config.py:383
+#: gajim/common/config.py:384
 #, fuzzy
-msgid "Message that is sent to contacts you want to add"
+msgid "Message that is sent to contacts you want to add."
 msgstr "Запоўніце палі звесткамі, каб дадаць чалавека ў спіс"
 
-#: gajim/common/config.py:384
-msgid ""
-"If enabled, Gajim will send your local IPs so your contact can connect to "
-"your machine to transfer files."
-msgstr ""
-
 #: gajim/common/config.py:385
+#, fuzzy
 msgid ""
-"Space separated list of JIDs for which chat window will be re-opened on next "
-"startup."
+"If enabled, Gajim will send your local IP so your contact can connect to "
+"your machine for file transfers."
 msgstr ""
+"Калі выстаўленая гэтая опцыя, Gajim будзе ўжываць для перадачы файлаў "
+"выстаўленыя IP-адрас і проксі-серверы з параметра file_transfer_proxies."
 
-#: gajim/common/config.py:387
-msgid "HTTP Upload: Enable HTTPS Verification"
+#: gajim/common/config.py:386
+msgid ""
+"List of XMPP Addresses (space separated) for which the chat window will be "
+"re-opened on next startup."
 msgstr ""
 
 #: gajim/common/config.py:388
-msgid ""
-"Preferred file transfer mechanism for file drag&drop on chat window. Can be "
-"'httpupload' (default) or 'jingle'"
+msgid "HTTP File Upload: Enable HTTPS Verification."
 msgstr ""
 
 #: gajim/common/config.py:389
-msgid "Allow cert verification with POSH"
+msgid ""
+"Preferred file transfer mechanism for file drag&drop on a chat window. Can "
+"be 'httpupload' (default) or 'jingle'."
 msgstr ""
 
-#: gajim/common/config.py:423 gajim/common/config.py:430
+#: gajim/common/config.py:390
 #, fuzzy
-msgid "Language for which misspelled words will be checked"
-msgstr "Мова праверкі правапісу"
-
-#: gajim/common/config.py:427
-msgid "The currently active encryption for that contact"
-msgstr ""
+msgid "Allow certificate verification with POSH."
+msgstr "Дадаць асабістае нагадванне для %s"
 
-#: gajim/common/config.py:431
+#: gajim/common/config.py:425
+#, fuzzy
 msgid ""
-"How many lines to request from server when entering a groupchat. -1 means no "
-"limit, -2 means global value"
+"Chat state notifications that are sent to contacts. Possible values: 'all', "
+"'composing_only', 'disabled'"
 msgstr ""
+"Адпраўляць паведамленні аб стане размовы. Адно з наступных значэнняў: all, "
+"composing_only, disabled."
+
+#: gajim/common/config.py:428
+#, fuzzy
+msgid "The currently active encryption for that contact."
+msgstr "Ці ўжыты OpenPGP ў размове з гэтым чалавекам?"
 
 #: gajim/common/config.py:432
 msgid ""
-"Minutes of backlog to request when entering a groupchat. -1 means no limit, "
-"-2 means global value"
+"If enabled, a notification is created for every message in this group chat."
 msgstr ""
 
 #: gajim/common/config.py:433
-msgid "State whether a notification is created for every message in this room"
-msgstr ""
-
-#: gajim/common/config.py:434
+#, fuzzy
 msgid ""
-"Show a status message for all status (away, dnd, etc.) changes of users in a "
-"group chat"
-msgstr ""
+"Show a status message for all status changes (away, dnd, etc.) of users in a "
+"group chat."
+msgstr "Немагчыма ўвайсці ў групавую размову"
 
-#: gajim/common/config.py:435
+#: gajim/common/config.py:434
 #, fuzzy
-msgid "Show a status message for every join or leave in a group chat"
+msgid "Show a status message for every join or leave in a group chat."
 msgstr "Немагчыма ўвайсці ў групавую размову"
 
+#: gajim/common/config.py:435
+msgid ""
+"If enabled, the group chat is minimized into the contact list when joining "
+"automatically."
+msgstr ""
+
 #: gajim/common/config.py:436
-msgid "If the group chat is minimized into the roster on autojoin"
+msgid ""
+"If enabled, the group chat is minimized into the contact list when closing "
+"it."
 msgstr ""
 
 #: gajim/common/config.py:437
-msgid "If the group chat is minimized into the roster on close"
+#, fuzzy
+msgid ""
+"Chat state notifications that are sent to the group chat. Possible values: "
+"'all', 'composing_only' or 'disabled'."
 msgstr ""
+"Адпраўляць паведамленні аб стане размовы. Адно з наступных значэнняў: all, "
+"composing_only, disabled."
 
-#: gajim/common/config.py:441
+#: gajim/common/config.py:440
 msgid ""
-"State whether plugins should be activated on startup (this is saved on Gajim "
-"exit). This option SHOULD NOT be used to (de)activate plug-ins. Use GUI "
-"instead."
+"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:446 gajim/common/const.py:281
+#: gajim/common/config.py:445 gajim/common/const.py:315
 msgid "Sleeping"
 msgstr "Сон"
 
-#: gajim/common/config.py:447
+#: gajim/common/config.py:446
 msgid "Back soon"
 msgstr "Хутка буду"
 
-#: gajim/common/config.py:447
+#: gajim/common/config.py:446
 msgid "Back in some minutes."
 msgstr "Хутка буду."
 
-#: gajim/common/config.py:448 gajim/common/const.py:247
+#: gajim/common/config.py:447 gajim/common/const.py:281
 msgid "Eating"
 msgstr "Ежа"
 
-#: gajim/common/config.py:448
-msgid "I'm eating, so leave me a message."
-msgstr "Ямо, пакіньце мне паведамленне."
+#: gajim/common/config.py:447
+#, fuzzy
+msgid "I'm eating."
+msgstr "Працую."
 
-#: gajim/common/config.py:449
+#: gajim/common/config.py:448
 msgid "Movie"
 msgstr "Фільм"
 
-#: gajim/common/config.py:449
+#: gajim/common/config.py:448
 msgid "I'm watching a movie."
 msgstr "Гляджу фільм."
 
-#: gajim/common/config.py:450 gajim/common/const.py:314
+#: gajim/common/config.py:449 gajim/common/const.py:348
 msgid "Working"
 msgstr "Працую"
 
-#: gajim/common/config.py:450
+#: gajim/common/config.py:449
 msgid "I'm working."
 msgstr "Працую."
 
-#: gajim/common/config.py:451
+#: gajim/common/config.py:450
 msgid "Phone"
 msgstr "Тэлефон"
 
-#: gajim/common/config.py:451
+#: gajim/common/config.py:450
 msgid "I'm on the phone."
 msgstr "Я на тэлефоне."
 
-#: gajim/common/config.py:452
+#: gajim/common/config.py:451
 msgid "Out"
 msgstr "Сышоў"
 
-#: gajim/common/config.py:452
+#: gajim/common/config.py:451
 msgid "I'm out enjoying life."
 msgstr "Я цешуся з жыцця."
 
-#: gajim/common/config.py:463
+#: gajim/common/config.py:462
 msgid "I'm available."
 msgstr "Я даступны."
 
-#: gajim/common/config.py:464
+#: gajim/common/config.py:463
 msgid "I'm free for chat."
 msgstr "Я магу размаўляць."
 
-#: gajim/common/config.py:465 gajim/gtk/accounts.py:134
+#: gajim/common/config.py:464 gajim/gtk/accounts.py:133
 msgid "Be right back."
 msgstr "Хутка прыйду."
 
-#: gajim/common/config.py:466
+#: gajim/common/config.py:465
 msgid "I'm not available."
 msgstr "Мяне няма."
 
-#: gajim/common/config.py:467
+#: gajim/common/config.py:466
 msgid "Do not disturb."
 msgstr "Не турбаваць."
 
-#: gajim/common/config.py:468 gajim/common/config.py:469
+#: gajim/common/config.py:467 gajim/common/config.py:468
 msgid "Bye!"
 msgstr "Бывай!"
 
-#: gajim/common/config.py:480
+#: gajim/common/config.py:479
+#, fuzzy
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
-"muc_highlight_words, or when a group chat message contains your nickname."
+"'muc_highlight_words' your nickname is mentioned."
 msgstr ""
 "Прайграць гэты гук, калі прыходзіць групавое паведамленне з адным з слоў, "
 "вызначаных у параметры muc_highlight_words, ці калі гэтае паведамленне "
 "ўтрымлівае Вашую мянушку."
 
-#: gajim/common/config.py:481
-msgid "Sound to play when any MUC message arrives."
+#: gajim/common/config.py:480
+#, fuzzy
+msgid "Sound to play when any group chat message arrives."
 msgstr "Прайграць гук пры атрыманні паведамлення MUC."
 
-#: gajim/common/config.py:485
+#: gajim/common/config.py:484
 #, fuzzy
 msgid "Tor"
 msgstr "Да"
@@ -4061,952 +4093,1048 @@ msgstr "Да"
 msgid "Error: cannot open %s for reading"
 msgstr "Памылка: немагчыма прачытаць %s"
 
-#: gajim/common/const.py:214
+#: gajim/common/const.py:216
+#, fuzzy
+msgid "?Group chat name:Team"
+msgstr "?Роля чалавека:Няма"
+
+#: gajim/common/const.py:217
+msgid "?Group chat description:Project discussion"
+msgstr ""
+
+#: gajim/common/const.py:218
+#, fuzzy
+msgid "?Group chat address:team"
+msgstr "Групавыя размовы"
+
+#: gajim/common/const.py:219
+#, fuzzy
+msgid "?Group chat name:Family"
+msgstr "Фарбаванае паведамленне ў групавой размове"
+
+#: gajim/common/const.py:220
+msgid "?Group chat description:Spring gathering"
+msgstr ""
+
+#: gajim/common/const.py:221
+msgid "?Group chat address:family"
+msgstr ""
+
+#: gajim/common/const.py:222
+#, fuzzy
+msgid "?Group chat name:Vacation"
+msgstr "Запрашэнне ў групавую размову"
+
+#: gajim/common/const.py:223
+msgid "?Group chat description:Trip planning"
+msgstr ""
+
+#: gajim/common/const.py:224
+#, fuzzy
+msgid "?Group chat address:vacation"
+msgstr "Запрашэнне ў групавую размову"
+
+#: gajim/common/const.py:225
+#, fuzzy
+msgid "?Group chat name:Repairs"
+msgstr "Групавая размова"
+
+#: gajim/common/const.py:226
+msgid "?Group chat description:Local help group"
+msgstr ""
+
+#: gajim/common/const.py:227
+#, fuzzy
+msgid "?Group chat address:repairs"
+msgstr "Групавыя размовы"
+
+#: gajim/common/const.py:228
+#, fuzzy
+msgid "?Group chat name:News"
+msgstr "?Роля чалавека:Няма"
+
+#: gajim/common/const.py:229
+#, fuzzy
+msgid "?Group chat description:Local news and reports"
+msgstr "Стварэнне групавых размоў абмежаванае."
+
+#: gajim/common/const.py:230
+#, fuzzy
+msgid "?Group chat address:news"
+msgstr "Новая групавая размова"
+
+#: gajim/common/const.py:235
+#, fuzzy
+msgid "Remote server not found"
+msgstr "Немагчыма знайсці сервіс"
+
+#: gajim/common/const.py:236
+msgid "Remote server timeout"
+msgstr ""
+
+#: gajim/common/const.py:237 gajim/common/const.py:238
+#: gajim/common/const.py:239
+#, fuzzy
+msgid "Address does not belong to a group chat server"
+msgstr "Гэта не групавая размова"
+
+#: gajim/common/const.py:240
+#, fuzzy
+msgid "Group chat already exists"
+msgstr "Мясцовы рахунак Local ужо існуе."
+
+#: gajim/common/const.py:241
+#, fuzzy
+msgid "Group chat does not exist"
+msgstr "Такой групавой размовы няма."
+
+#: gajim/common/const.py:247
 msgid "This message was encrypted with OTR and could not be decrypted."
 msgstr ""
 
-#: gajim/common/const.py:217
+#: gajim/common/const.py:250
 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:221
+#: gajim/common/const.py:254
 msgid ""
-"This message was encrypted with OpenPGP for XMPP and could not be decrypted."
+"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:224
+#: gajim/common/const.py:258
 #, python-format
 msgid "This message was encrypted with %s and could not be decrypted."
 msgstr ""
 
-#: gajim/common/const.py:231
+#: gajim/common/const.py:265
 #, fuzzy
 msgid "Doing Chores"
 msgstr "Няправільны вузел"
 
-#: gajim/common/const.py:232
+#: gajim/common/const.py:266
 msgid "Buying Groceries"
 msgstr ""
 
-#: gajim/common/const.py:233
+#: gajim/common/const.py:267
 #, fuzzy
 msgid "Cleaning"
 msgstr "Вечар"
 
-#: gajim/common/const.py:234
+#: gajim/common/const.py:268
 #, fuzzy
 msgid "Cooking"
 msgstr "Піша"
 
-#: gajim/common/const.py:235
+#: gajim/common/const.py:269
 msgid "Doing Maintenance"
 msgstr ""
 
-#: gajim/common/const.py:236
+#: gajim/common/const.py:270
 msgid "Doing the Dishes"
 msgstr ""
 
-#: gajim/common/const.py:237
+#: gajim/common/const.py:271
 msgid "Doing the Laundry"
 msgstr ""
 
-#: gajim/common/const.py:238
+#: gajim/common/const.py:272
 #, fuzzy
 msgid "Gardening"
 msgstr "Раніца"
 
-#: gajim/common/const.py:239
+#: gajim/common/const.py:273
 msgid "Running an Errand"
 msgstr ""
 
-#: gajim/common/const.py:240
+#: gajim/common/const.py:274
 #, fuzzy
 msgid "Walking the Dog"
 msgstr "усе з групы"
 
-#: gajim/common/const.py:242
+#: gajim/common/const.py:276
 #, fuzzy
 msgid "Drinking"
 msgstr "Працую"
 
-#: gajim/common/const.py:243
+#: gajim/common/const.py:277
 msgid "Having a Beer"
 msgstr ""
 
-#: gajim/common/const.py:244
+#: gajim/common/const.py:278
 msgid "Having Coffee"
 msgstr ""
 
-#: gajim/common/const.py:245
+#: gajim/common/const.py:279
 msgid "Having Tea"
 msgstr ""
 
-#: gajim/common/const.py:248
+#: gajim/common/const.py:282
 msgid "Having a Snack"
 msgstr ""
 
-#: gajim/common/const.py:249
+#: gajim/common/const.py:283
 msgid "Having Breakfast"
 msgstr ""
 
-#: gajim/common/const.py:250
+#: gajim/common/const.py:284
 msgid "Having Dinner"
 msgstr ""
 
-#: gajim/common/const.py:251
+#: gajim/common/const.py:285
 msgid "Having Lunch"
 msgstr ""
 
-#: gajim/common/const.py:253
+#: gajim/common/const.py:287
 msgid "Exercising"
 msgstr ""
 
-#: gajim/common/const.py:254 gajim/common/const.py:305
+#: gajim/common/const.py:288 gajim/common/const.py:339
 msgid "Cycling"
 msgstr ""
 
-#: gajim/common/const.py:255
+#: gajim/common/const.py:289
 #, fuzzy
 msgid "Dancing"
 msgstr "Вечар"
 
-#: gajim/common/const.py:256
+#: gajim/common/const.py:290
 #, fuzzy
 msgid "Hiking"
 msgstr "Пакаранне %s"
 
-#: gajim/common/const.py:257
+#: gajim/common/const.py:291
 #, fuzzy
 msgid "Jogging"
 msgstr "_Далучыцца"
 
-#: gajim/common/const.py:258
+#: gajim/common/const.py:292
 msgid "Playing Sports"
 msgstr ""
 
-#: gajim/common/const.py:259
+#: gajim/common/const.py:293
 msgid "Running"
 msgstr ""
 
-#: gajim/common/const.py:260
+#: gajim/common/const.py:294
 #, fuzzy
 msgid "Skiing"
 msgstr "Працую"
 
-#: gajim/common/const.py:261
+#: gajim/common/const.py:295
 msgid "Swimming"
 msgstr ""
 
-#: gajim/common/const.py:262
+#: gajim/common/const.py:296
 #, fuzzy
 msgid "Working out"
 msgstr "Працую"
 
-#: gajim/common/const.py:264
+#: gajim/common/const.py:298
 #, fuzzy
 msgid "Grooming"
 msgstr "пакой"
 
-#: gajim/common/const.py:265
+#: gajim/common/const.py:299
 msgid "At the Spa"
 msgstr ""
 
-#: gajim/common/const.py:266
+#: gajim/common/const.py:300
 msgid "Brushing Teeth"
 msgstr ""
 
-#: gajim/common/const.py:267
+#: gajim/common/const.py:301
 msgid "Getting a Haircut"
 msgstr ""
 
-#: gajim/common/const.py:268
+#: gajim/common/const.py:302
 #, fuzzy
 msgid "Shaving"
 msgstr "Ежа"
 
-#: gajim/common/const.py:269
+#: gajim/common/const.py:303
 msgid "Taking a Bath"
 msgstr ""
 
-#: gajim/common/const.py:270
+#: gajim/common/const.py:304
 msgid "Taking a Shower"
 msgstr ""
 
-#: gajim/common/const.py:272
+#: gajim/common/const.py:306
 msgid "Having an Appointment"
 msgstr ""
 
-#: gajim/common/const.py:274
+#: gajim/common/const.py:308
 msgid "Inactive"
 msgstr "Неактыўны"
 
-#: gajim/common/const.py:275
+#: gajim/common/const.py:309
 msgid "Day Off"
 msgstr ""
 
-#: gajim/common/const.py:276
+#: gajim/common/const.py:310
 #, fuzzy
 msgid "Hanging out"
 msgstr "Змяненне тэмы"
 
-#: gajim/common/const.py:277
+#: gajim/common/const.py:311
 #, fuzzy
 msgid "Hiding"
 msgstr "Пакаранне %s"
 
-#: gajim/common/const.py:278
+#: gajim/common/const.py:312
 msgid "On Vacation"
 msgstr ""
 
-#: gajim/common/const.py:279
+#: gajim/common/const.py:313
 #, fuzzy
 msgid "Praying"
 msgstr "Ежа"
 
-#: gajim/common/const.py:280
+#: gajim/common/const.py:314
 msgid "Scheduled Holiday"
 msgstr ""
 
-#: gajim/common/const.py:282
+#: gajim/common/const.py:316
 #, fuzzy
 msgid "Thinking"
 msgstr "Працую"
 
-#: gajim/common/const.py:284
+#: gajim/common/const.py:318
 msgid "Relaxing"
 msgstr ""
 
-#: gajim/common/const.py:285
+#: gajim/common/const.py:319
 #, fuzzy
 msgid "Fishing"
 msgstr "Пакаранне %s"
 
-#: gajim/common/const.py:286
+#: gajim/common/const.py:320
 #, fuzzy
 msgid "Gaming"
 msgstr "Ежа"
 
-#: gajim/common/const.py:287
+#: gajim/common/const.py:321
 #, fuzzy
 msgid "Going out"
 msgstr "З_ысці"
 
-#: gajim/common/const.py:288
+#: gajim/common/const.py:322
 #, fuzzy
 msgid "Partying"
 msgstr "Ежа"
 
-#: gajim/common/const.py:289
+#: gajim/common/const.py:323
 #, fuzzy
 msgid "Reading"
 msgstr "Прычына"
 
-#: gajim/common/const.py:290
+#: gajim/common/const.py:324
 #, fuzzy
 msgid "Rehearsing"
 msgstr "Прычына"
 
-#: gajim/common/const.py:291
+#: gajim/common/const.py:325
 #, fuzzy
 msgid "Shopping"
 msgstr "Сон"
 
-#: gajim/common/const.py:292
+#: gajim/common/const.py:326
 #, fuzzy
 msgid "Smoking"
 msgstr "Працую"
 
-#: gajim/common/const.py:293
+#: gajim/common/const.py:327
 msgid "Socializing"
 msgstr ""
 
-#: gajim/common/const.py:294
+#: gajim/common/const.py:328
 #, fuzzy
 msgid "Sunbathing"
 msgstr "Ежа"
 
-#: gajim/common/const.py:295
+#: gajim/common/const.py:329
 msgid "Watching TV"
 msgstr ""
 
-#: gajim/common/const.py:296
+#: gajim/common/const.py:330
 #, fuzzy
 msgid "Watching a Movie"
 msgstr "Гляджу фільм."
 
-#: gajim/common/const.py:298
+#: gajim/common/const.py:332
 #, fuzzy
 msgid "Talking"
 msgstr "Ежа"
 
-#: gajim/common/const.py:299
+#: gajim/common/const.py:333
 msgid "In Real Life"
 msgstr ""
 
-#: gajim/common/const.py:300
+#: gajim/common/const.py:334
 #, fuzzy
 msgid "On the Phone"
 msgstr "Я на тэлефоне."
 
-#: gajim/common/const.py:301
+#: gajim/common/const.py:335
 msgid "On Video Phone"
 msgstr ""
 
-#: gajim/common/const.py:303
+#: gajim/common/const.py:337
 #, fuzzy
 msgid "Traveling"
 msgstr "Перадача"
 
-#: gajim/common/const.py:304
+#: gajim/common/const.py:338
 #, fuzzy
 msgid "Commuting"
 msgstr "Піша"
 
-#: gajim/common/const.py:306
+#: gajim/common/const.py:340
 msgid "Driving"
 msgstr ""
 
-#: gajim/common/const.py:307
+#: gajim/common/const.py:341
 msgid "In a Car"
 msgstr ""
 
-#: gajim/common/const.py:308
+#: gajim/common/const.py:342
 msgid "On a Bus"
 msgstr ""
 
-#: gajim/common/const.py:309
+#: gajim/common/const.py:343
 #, fuzzy
 msgid "On a Plane"
 msgstr "У сетцы"
 
-#: gajim/common/const.py:310
+#: gajim/common/const.py:344
 #, fuzzy
 msgid "On a Train"
 msgstr "Адкрыць _спасылку"
 
-#: gajim/common/const.py:311
+#: gajim/common/const.py:345
 msgid "On a Trip"
 msgstr ""
 
-#: gajim/common/const.py:312
+#: gajim/common/const.py:346
 #, fuzzy
 msgid "Walking"
 msgstr "Працую"
 
-#: gajim/common/const.py:315
+#: gajim/common/const.py:349
 #, fuzzy
 msgid "Coding"
 msgstr "Піша"
 
-#: gajim/common/const.py:316
+#: gajim/common/const.py:350
 msgid "In a Meeting"
 msgstr ""
 
-#: gajim/common/const.py:317
+#: gajim/common/const.py:351
 msgid "Studying"
 msgstr ""
 
-#: gajim/common/const.py:318
+#: gajim/common/const.py:352
 #, fuzzy
 msgid "Writing"
 msgstr "Працую"
 
-#: gajim/common/const.py:321
+#: gajim/common/const.py:355
 msgid "Afraid"
 msgstr ""
 
-#: gajim/common/const.py:322
+#: gajim/common/const.py:356
 msgid "Amazed"
 msgstr ""
 
-#: gajim/common/const.py:323
+#: gajim/common/const.py:357
 msgid "Amorous"
 msgstr ""
 
-#: gajim/common/const.py:324
+#: gajim/common/const.py:358
 msgid "Angry"
 msgstr ""
 
-#: gajim/common/const.py:325
+#: gajim/common/const.py:359
 msgid "Annoyed"
 msgstr ""
 
-#: gajim/common/const.py:326
+#: gajim/common/const.py:360
 msgid "Anxious"
 msgstr ""
 
-#: gajim/common/const.py:327
+#: gajim/common/const.py:361
 #, fuzzy
 msgid "Aroused"
 msgstr "Прыпынена"
 
-#: gajim/common/const.py:328
+#: gajim/common/const.py:362
 msgid "Ashamed"
 msgstr ""
 
-#: gajim/common/const.py:329
+#: gajim/common/const.py:363
 #, fuzzy
 msgid "Bored"
 msgstr "Тлусты"
 
-#: gajim/common/const.py:330
+#: gajim/common/const.py:364
 #, fuzzy
 msgid "Brave"
 msgstr "Мае "
 
-#: gajim/common/const.py:331
+#: gajim/common/const.py:365
 msgid "Calm"
 msgstr ""
 
-#: gajim/common/const.py:332
+#: gajim/common/const.py:366
 #, fuzzy
 msgid "Cautious"
 msgstr "Размовы"
 
-#: gajim/common/const.py:333
+#: gajim/common/const.py:367
 #, fuzzy
 msgid "Cold"
 msgstr "Тлусты"
 
-#: gajim/common/const.py:334
+#: gajim/common/const.py:368
 #, fuzzy
 msgid "Confident"
 msgstr "_Змест"
 
-#: gajim/common/const.py:335
+#: gajim/common/const.py:369
 msgid "Confused"
 msgstr ""
 
-#: gajim/common/const.py:336
+#: gajim/common/const.py:370
 #, fuzzy
 msgid "Contemplative"
 msgstr "Скончаная"
 
-#: gajim/common/const.py:337
+#: gajim/common/const.py:371
 #, fuzzy
 msgid "Contented"
 msgstr "_Змест"
 
-#: gajim/common/const.py:338
+#: gajim/common/const.py:372
 msgid "Cranky"
 msgstr ""
 
-#: gajim/common/const.py:339
+#: gajim/common/const.py:373
 msgid "Crazy"
 msgstr ""
 
-#: gajim/common/const.py:340
+#: gajim/common/const.py:374
 #, fuzzy
 msgid "Creative"
 msgstr "Неактывізаваны"
 
-#: gajim/common/const.py:341
+#: gajim/common/const.py:375
 #, fuzzy
 msgid "Curious"
 msgstr "спасылка"
 
-#: gajim/common/const.py:342
+#: gajim/common/const.py:376
 #, fuzzy
 msgid "Dejected"
 msgstr "Выдаліць"
 
-#: gajim/common/const.py:343
+#: gajim/common/const.py:377
 msgid "Depressed"
 msgstr ""
 
-#: gajim/common/const.py:344
+#: gajim/common/const.py:378
 #, fuzzy
 msgid "Disappointed"
 msgstr "Адключана"
 
-#: gajim/common/const.py:345
+#: gajim/common/const.py:379
 msgid "Disgusted"
 msgstr ""
 
-#: gajim/common/const.py:346
+#: gajim/common/const.py:380
 #, fuzzy
 msgid "Dismayed"
 msgstr "Адключана"
 
-#: gajim/common/const.py:347
+#: gajim/common/const.py:381
 #, fuzzy
 msgid "Distracted"
 msgstr "Адключана"
 
-#: gajim/common/const.py:348
+#: gajim/common/const.py:382
 msgid "Embarrassed"
 msgstr ""
 
-#: gajim/common/const.py:349
+#: gajim/common/const.py:383
 msgid "Envious"
 msgstr ""
 
-#: gajim/common/const.py:350
+#: gajim/common/const.py:384
 #, fuzzy
 msgid "Excited"
 msgstr "Актывізаваны"
 
-#: gajim/common/const.py:351
+#: gajim/common/const.py:385
 msgid "Flirtatious"
 msgstr ""
 
-#: gajim/common/const.py:352
+#: gajim/common/const.py:386
 msgid "Frustrated"
 msgstr ""
 
-#: gajim/common/const.py:353
+#: gajim/common/const.py:387
 msgid "Grateful"
 msgstr ""
 
-#: gajim/common/const.py:354
+#: gajim/common/const.py:388
 msgid "Grieving"
 msgstr ""
 
-#: gajim/common/const.py:355
+#: gajim/common/const.py:389
 #, fuzzy
 msgid "Grumpy"
 msgstr "Група"
 
-#: gajim/common/const.py:356
+#: gajim/common/const.py:390
 msgid "Guilty"
 msgstr ""
 
-#: gajim/common/const.py:357
+#: gajim/common/const.py:391
 msgid "Happy"
 msgstr ""
 
-#: gajim/common/const.py:358
+#: gajim/common/const.py:392
 msgid "Hopeful"
 msgstr ""
 
-#: gajim/common/const.py:359
+#: gajim/common/const.py:393
 #, fuzzy
 msgid "Hot"
 msgstr "_Вузел:"
 
-#: gajim/common/const.py:360
+#: gajim/common/const.py:394
 msgid "Humbled"
 msgstr ""
 
-#: gajim/common/const.py:361
+#: gajim/common/const.py:395
 msgid "Humiliated"
 msgstr ""
 
-#: gajim/common/const.py:362
+#: gajim/common/const.py:396
 msgid "Hungry"
 msgstr ""
 
-#: gajim/common/const.py:363
+#: gajim/common/const.py:397
 msgid "Hurt"
 msgstr ""
 
-#: gajim/common/const.py:364
+#: gajim/common/const.py:398
 #, fuzzy
 msgid "Impressed"
 msgstr "паведамленне"
 
-#: gajim/common/const.py:365
+#: gajim/common/const.py:399
 msgid "In Awe"
 msgstr ""
 
-#: gajim/common/const.py:366
+#: gajim/common/const.py:400
 msgid "In Love"
 msgstr ""
 
-#: gajim/common/const.py:367
+#: gajim/common/const.py:401
 msgid "Indignant"
 msgstr ""
 
-#: gajim/common/const.py:368
+#: gajim/common/const.py:402
 msgid "Interested"
 msgstr ""
 
-#: gajim/common/const.py:369
+#: gajim/common/const.py:403
 #, fuzzy
 msgid "Intoxicated"
 msgstr "Актывізаваны"
 
-#: gajim/common/const.py:370
+#: gajim/common/const.py:404
 #, fuzzy
 msgid "Invincible"
 msgstr "Нябачны"
 
-#: gajim/common/const.py:371
+#: gajim/common/const.py:405
 msgid "Jealous"
 msgstr ""
 
-#: gajim/common/const.py:372
+#: gajim/common/const.py:406
 #, fuzzy
 msgid "Lonely"
 msgstr "адзін"
 
-#: gajim/common/const.py:373
+#: gajim/common/const.py:407
 #, fuzzy
 msgid "Lost"
 msgstr "_Вузел:"
 
-#: gajim/common/const.py:374
+#: gajim/common/const.py:408
 msgid "Lucky"
 msgstr ""
 
-#: gajim/common/const.py:375
+#: gajim/common/const.py:409
 #, fuzzy
 msgid "Mean"
 msgstr "Нямецкая"
 
-#: gajim/common/const.py:376
+#: gajim/common/const.py:410
 #, fuzzy
 msgid "Moody"
 msgstr "_Змяніць"
 
-#: gajim/common/const.py:377
+#: gajim/common/const.py:411
 msgid "Nervous"
 msgstr ""
 
-#: gajim/common/const.py:378
+#: gajim/common/const.py:412
 msgid "Neutral"
 msgstr ""
 
-#: gajim/common/const.py:379
+#: gajim/common/const.py:413
 #, fuzzy
 msgid "Offended"
 msgstr "Адключаны"
 
-#: gajim/common/const.py:380
+#: gajim/common/const.py:414
 msgid "Outraged"
 msgstr ""
 
-#: gajim/common/const.py:381
+#: gajim/common/const.py:415
 msgid "Playful"
 msgstr ""
 
-#: gajim/common/const.py:382
+#: gajim/common/const.py:416
 #, fuzzy
 msgid "Proud"
 msgstr "Група"
 
-#: gajim/common/const.py:383
+#: gajim/common/const.py:417
 msgid "Relaxed"
 msgstr ""
 
-#: gajim/common/const.py:384
+#: gajim/common/const.py:418
 #, fuzzy
 msgid "Relieved"
 msgstr "адзінаццаць"
 
-#: gajim/common/const.py:385
+#: gajim/common/const.py:419
 msgid "Remorseful"
 msgstr ""
 
-#: gajim/common/const.py:386
+#: gajim/common/const.py:420
 msgid "Restless"
 msgstr ""
 
-#: gajim/common/const.py:387
+#: gajim/common/const.py:421
 #, fuzzy
 msgid "Sad"
 msgstr "Марнаванне часу"
 
-#: gajim/common/const.py:388
+#: gajim/common/const.py:422
 msgid "Sarcastic"
 msgstr ""
 
-#: gajim/common/const.py:389
+#: gajim/common/const.py:423
 #, fuzzy
 msgid "Satisfied"
 msgstr "Апошняя змена:"
 
-#: gajim/common/const.py:390
+#: gajim/common/const.py:424
 msgid "Serious"
 msgstr ""
 
-#: gajim/common/const.py:391
+#: gajim/common/const.py:425
 msgid "Shocked"
 msgstr ""
 
-#: gajim/common/const.py:392
+#: gajim/common/const.py:426
 msgid "Shy"
 msgstr ""
 
-#: gajim/common/const.py:393
+#: gajim/common/const.py:427
 #, fuzzy
 msgid "Sick"
 msgstr "Мянушка"
 
-#: gajim/common/const.py:394
+#: gajim/common/const.py:428
 #, fuzzy
 msgid "Sleepy"
 msgstr "Сон"
 
-#: gajim/common/const.py:395
+#: gajim/common/const.py:429
 msgid "Spontaneous"
 msgstr ""
 
-#: gajim/common/const.py:396
+#: gajim/common/const.py:430
 #, fuzzy
 msgid "Stressed"
 msgstr "Вуліца:"
 
-#: gajim/common/const.py:397
+#: gajim/common/const.py:431
 msgid "Strong"
 msgstr ""
 
-#: gajim/common/const.py:398
+#: gajim/common/const.py:432
 #, fuzzy
 msgid "Surprised"
 msgstr "Падпісаны"
 
-#: gajim/common/const.py:399
+#: gajim/common/const.py:433
 msgid "Thankful"
 msgstr ""
 
-#: gajim/common/const.py:400
+#: gajim/common/const.py:434
 msgid "Thirsty"
 msgstr ""
 
-#: gajim/common/const.py:401
+#: gajim/common/const.py:435
 #, fuzzy
 msgid "Tired"
 msgstr "Час"
 
-#: gajim/common/const.py:402
+#: gajim/common/const.py:436
 #, fuzzy
 msgid "Undefined"
 msgstr "дзевяць"
 
-#: gajim/common/const.py:403
+#: gajim/common/const.py:437
 msgid "Weak"
 msgstr ""
 
-#: gajim/common/const.py:404
+#: gajim/common/const.py:438
 msgid "Worried"
 msgstr ""
 
-#: gajim/common/const.py:408
+#: gajim/common/const.py:442
 msgid "accuracy"
 msgstr ""
 
-#: gajim/common/const.py:409
+#: gajim/common/const.py:443
 #, fuzzy
 msgid "alt"
 msgstr "Прадвызначана"
 
-#: gajim/common/const.py:410
+#: gajim/common/const.py:444
 msgid "area"
 msgstr ""
 
-#: gajim/common/const.py:411
+#: gajim/common/const.py:445
 #, fuzzy
 msgid "bearing"
 msgstr "мора"
 
-#: gajim/common/const.py:412
+#: gajim/common/const.py:446
 #, fuzzy
 msgid "building"
 msgstr "Пакаранне %s"
 
-#: gajim/common/const.py:413
+#: gajim/common/const.py:447
 #, fuzzy
 msgid "country"
 msgstr "Краіна:"
 
-#: gajim/common/const.py:414
+#: gajim/common/const.py:448
 #, fuzzy
 msgid "countrycode"
 msgstr "Рахунак"
 
-#: gajim/common/const.py:415
+#: gajim/common/const.py:449
 msgid "datum"
 msgstr ""
 
-#: gajim/common/const.py:416
+#: gajim/common/const.py:450
 #, fuzzy
 msgid "description"
 msgstr "Апісанне"
 
-#: gajim/common/const.py:417
+#: gajim/common/const.py:451
 #, fuzzy
 msgid "error"
 msgstr "Памылка Avahi"
 
-#: gajim/common/const.py:418
+#: gajim/common/const.py:452
 msgid "floor"
 msgstr ""
 
-#: gajim/common/const.py:419
+#: gajim/common/const.py:453
 msgid "lat"
 msgstr ""
 
-#: gajim/common/const.py:420
+#: gajim/common/const.py:454
 msgid "locality"
 msgstr ""
 
-#: gajim/common/const.py:421
+#: gajim/common/const.py:455
 #, fuzzy
 msgid "lon"
 msgstr "адзін"
 
-#: gajim/common/const.py:422
+#: gajim/common/const.py:456
 msgid "postalcode"
 msgstr ""
 
-#: gajim/common/const.py:423
+#: gajim/common/const.py:457
 msgid "region"
 msgstr ""
 
-#: gajim/common/const.py:424
+#: gajim/common/const.py:458
 msgid "room"
 msgstr "пакой"
 
-#: gajim/common/const.py:425
+#: gajim/common/const.py:459
 msgid "speed"
 msgstr ""
 
-#: gajim/common/const.py:426
+#: gajim/common/const.py:460
 msgid "street"
 msgstr ""
 
-#: gajim/common/const.py:427
+#: gajim/common/const.py:461
 msgid "text"
 msgstr ""
 
-#: gajim/common/const.py:428
+#: gajim/common/const.py:462
 msgid "timestamp"
 msgstr ""
 
-#: gajim/common/const.py:429
+#: gajim/common/const.py:463
 msgid "URI"
 msgstr ""
 
-#: gajim/common/const.py:434
+#: gajim/common/const.py:468
 msgid "Unable to get issuer certificate"
 msgstr ""
 
-#: gajim/common/const.py:435
+#: gajim/common/const.py:469
 msgid "Unable to get certificate CRL"
 msgstr ""
 
-#: gajim/common/const.py:436
+#: gajim/common/const.py:470
 msgid "Unable to decrypt certificate's signature"
 msgstr ""
 
-#: gajim/common/const.py:437
+#: gajim/common/const.py:471
 msgid "Unable to decrypt CRL's signature"
 msgstr ""
 
-#: gajim/common/const.py:438
+#: gajim/common/const.py:472
 #, fuzzy
 msgid "Unable to decode issuer public key"
 msgstr "Немагчыма загрузіць модуль idle"
 
-#: gajim/common/const.py:439
+#: gajim/common/const.py:473
 msgid "Certificate signature failure"
 msgstr ""
 
-#: gajim/common/const.py:440
+#: gajim/common/const.py:474
 msgid "CRL signature failure"
 msgstr ""
 
-#: gajim/common/const.py:441
+#: gajim/common/const.py:475
 msgid "Certificate is not yet valid"
 msgstr ""
 
-#: gajim/common/const.py:442
+#: gajim/common/const.py:476
 msgid "Certificate has expired"
 msgstr ""
 
-#: gajim/common/const.py:443
+#: gajim/common/const.py:477
 msgid "CRL is not yet valid"
 msgstr ""
 
-#: gajim/common/const.py:444
+#: gajim/common/const.py:478
 msgid "CRL has expired"
 msgstr ""
 
-#: gajim/common/const.py:445
+#: gajim/common/const.py:479
 msgid "Format error in certificate's notBefore field"
 msgstr ""
 
-#: gajim/common/const.py:446
+#: gajim/common/const.py:480
 msgid "Format error in certificate's notAfter field"
 msgstr ""
 
-#: gajim/common/const.py:447
+#: gajim/common/const.py:481
 msgid "Format error in CRL's lastUpdate field"
 msgstr ""
 
-#: gajim/common/const.py:448
+#: gajim/common/const.py:482
 msgid "Format error in CRL's nextUpdate field"
 msgstr ""
 
-#: gajim/common/const.py:449
+#: gajim/common/const.py:483
 msgid "Out of memory"
 msgstr ""
 
-#: gajim/common/const.py:450
+#: gajim/common/const.py:484
 msgid "Self signed certificate"
 msgstr ""
 
-#: gajim/common/const.py:451
+#: gajim/common/const.py:485
 msgid "Self signed certificate in certificate chain"
 msgstr ""
 
-#: gajim/common/const.py:452
+#: gajim/common/const.py:486
 msgid "Unable to get local issuer certificate"
 msgstr ""
 
-#: gajim/common/const.py:453
+#: gajim/common/const.py:487
 msgid "Unable to verify the first certificate"
 msgstr ""
 
-#: gajim/common/const.py:454
+#: gajim/common/const.py:488
 msgid "Certificate chain too long"
 msgstr ""
 
-#: gajim/common/const.py:455
+#: gajim/common/const.py:489
 msgid "Certificate revoked"
 msgstr ""
 
-#: gajim/common/const.py:456
+#: gajim/common/const.py:490
 #, fuzzy
 msgid "Invalid CA certificate"
 msgstr "Няправільнае імя карыстальніка"
 
-#: gajim/common/const.py:457
+#: gajim/common/const.py:491
 msgid "Path length constraint exceeded"
 msgstr ""
 
-#: gajim/common/const.py:458
+#: gajim/common/const.py:492
 msgid "Unsupported certificate purpose"
 msgstr ""
 
-#: gajim/common/const.py:459
+#: gajim/common/const.py:493
 msgid "Certificate not trusted"
 msgstr ""
 
-#: gajim/common/const.py:460
+#: gajim/common/const.py:494
 msgid "Certificate rejected"
 msgstr ""
 
-#: gajim/common/const.py:461
+#: gajim/common/const.py:495
 msgid "Subject issuer mismatch"
 msgstr ""
 
-#: gajim/common/const.py:462
+#: gajim/common/const.py:496
 msgid "Authority and subject key identifier mismatch"
 msgstr ""
 
-#: gajim/common/const.py:463
+#: gajim/common/const.py:497
 msgid "Authority and issuer serial number mismatch"
 msgstr ""
 
-#: gajim/common/const.py:464
+#: gajim/common/const.py:498
 msgid "Key usage does not include certificate signing"
 msgstr ""
 
-#: gajim/common/const.py:465
+#: gajim/common/const.py:499
 msgid "Application verification failure"
 msgstr ""
 
@@ -5172,199 +5300,199 @@ msgstr ""
 msgid "video output"
 msgstr ""
 
-#: gajim/common/helpers.py:210
+#: gajim/common/helpers.py:216
 msgid "Server must be between 1 and 1023 bytes"
 msgstr ""
 
-#: gajim/common/helpers.py:214
+#: gajim/common/helpers.py:220
 msgid "Invalid character in hostname."
 msgstr "Няправільны знак у назве вузла."
 
-#: gajim/common/helpers.py:216
+#: gajim/common/helpers.py:222
 msgid "Server address required."
 msgstr "Патрэбны адрас сервера."
 
-#: gajim/common/helpers.py:220
+#: gajim/common/helpers.py:226
 msgid "Username must be between 1 and 1023 bytes"
 msgstr ""
 
-#: gajim/common/helpers.py:224
+#: gajim/common/helpers.py:230
 msgid "Invalid character in username."
 msgstr "Няправільны знак у імені карыстальніка."
 
-#: gajim/common/helpers.py:230
+#: gajim/common/helpers.py:236
 msgid "Resource must be between 1 and 1023 bytes"
 msgstr ""
 
-#: gajim/common/helpers.py:234
+#: gajim/common/helpers.py:240
 msgid "Invalid character in resource."
 msgstr "Няправільны знак у назве рэсурса."
 
-#: gajim/common/helpers.py:275
+#: gajim/common/helpers.py:281
 msgid "_Busy"
 msgstr "_Заняты"
 
-#: gajim/common/helpers.py:277 gajim/gtk/tooltips.py:647
+#: gajim/common/helpers.py:283 gajim/gtk/tooltips.py:647
 msgid "Busy"
 msgstr "Заняты"
 
-#: gajim/common/helpers.py:280
+#: gajim/common/helpers.py:286
 msgid "_Not Available"
 msgstr "М_яне няма"
 
-#: gajim/common/helpers.py:282 gajim/gtk/tooltips.py:649
+#: gajim/common/helpers.py:288 gajim/gtk/tooltips.py:649
 msgid "Not Available"
 msgstr "Мяне няма"
 
-#: gajim/common/helpers.py:285
+#: gajim/common/helpers.py:291
 msgid "_Free for Chat"
 msgstr "_Магу размаўляць"
 
-#: gajim/common/helpers.py:287 gajim/gtk/tooltips.py:643
+#: gajim/common/helpers.py:293 gajim/gtk/tooltips.py:643
 msgid "Free for Chat"
 msgstr "Магу размаўляць"
 
-#: gajim/common/helpers.py:290
+#: gajim/common/helpers.py:296
 #, fuzzy
 msgid "?user status:_Available"
 msgstr "?transfer status:Прыпыненая"
 
-#: gajim/common/helpers.py:292 gajim/gtk/tooltips.py:641
+#: gajim/common/helpers.py:298 gajim/gtk/tooltips.py:641
 #, fuzzy
 msgid "?user status:Available"
 msgstr "?transfer status:Прыпыненая"
 
-#: gajim/common/helpers.py:294
+#: gajim/common/helpers.py:300
 msgid "Connecting"
 msgstr "Злучэнне"
 
-#: gajim/common/helpers.py:297 gajim/data/gui/preferences_window.ui:1251
+#: gajim/common/helpers.py:303 gajim/data/gui/preferences_window.ui:1251
 msgid "A_way"
 msgstr "Н_е тут"
 
-#: gajim/common/helpers.py:299 gajim/common/modules/adhoc_commands.py:120
-#: gajim/command_system/implementation/standard.py:139
+#: gajim/common/helpers.py:305 gajim/common/modules/adhoc_commands.py:120
+#: gajim/command_system/implementation/standard.py:141
 #: gajim/gtk/tooltips.py:645
 msgid "Away"
 msgstr "Сышоў"
 
-#: gajim/common/helpers.py:302
+#: gajim/common/helpers.py:308
 msgid "_Offline"
 msgstr "_Адключаны"
 
-#: gajim/common/helpers.py:304 gajim/gtk/tooltips.py:651
+#: gajim/common/helpers.py:310 gajim/gtk/tooltips.py:651
 msgid "Offline"
 msgstr "Адключаны"
 
-#: gajim/common/helpers.py:307
+#: gajim/common/helpers.py:313
 msgid "_Invisible"
 msgstr "_Нябачны"
 
-#: gajim/common/helpers.py:313
+#: gajim/common/helpers.py:319
 msgid "?contact has status:Unknown"
 msgstr "?чалавек у стане:Невядомы"
 
-#: gajim/common/helpers.py:315
+#: gajim/common/helpers.py:321
 msgid "?contact has status:Has errors"
 msgstr "?чалавек у стане:Ёсць памылкі"
 
-#: gajim/common/helpers.py:330
+#: gajim/common/helpers.py:336
 msgid "?Subscription we already have:None"
 msgstr "?Ужо ёсць падпіскі:Няма"
 
-#: gajim/common/helpers.py:332
+#: gajim/common/helpers.py:338
 msgid "To"
 msgstr "Да"
 
-#: gajim/common/helpers.py:334 gajim/data/gui/groups_post_window.ui:33
+#: gajim/common/helpers.py:340 gajim/data/gui/groups_post_window.ui:33
 msgid "From"
 msgstr "Ад"
 
-#: gajim/common/helpers.py:336
+#: gajim/common/helpers.py:342
 msgid "Both"
 msgstr "Абодва"
 
-#: gajim/common/helpers.py:338 gajim/gtk/server_info.py:151
+#: gajim/common/helpers.py:344 gajim/gtk/server_info.py:151
 #, fuzzy
 msgid "Unknown"
 msgstr "?Сістэма:Невядомая"
 
-#: gajim/common/helpers.py:344
+#: gajim/common/helpers.py:350
 msgid "?Ask (for Subscription):None"
 msgstr "?Запыт (на падпіску):Няма"
 
-#: gajim/common/helpers.py:346
+#: gajim/common/helpers.py:352
 msgid "Subscribe"
 msgstr "Падпісацца"
 
-#: gajim/common/helpers.py:355
+#: gajim/common/helpers.py:361
 msgid "?Group Chat Contact Role:None"
 msgstr "?Роля чалавека:Няма"
 
-#: gajim/common/helpers.py:358
+#: gajim/common/helpers.py:364
 msgid "Moderators"
 msgstr "Мадэратары"
 
-#: gajim/common/helpers.py:360
+#: gajim/common/helpers.py:366
 msgid "Moderator"
 msgstr "Мадэратар"
 
-#: gajim/common/helpers.py:363
+#: gajim/common/helpers.py:369 gajim/data/gui/groupchat_info_scrolled.ui:243
 msgid "Participants"
 msgstr "Удзельнікі"
 
-#: gajim/common/helpers.py:365
+#: gajim/common/helpers.py:371
 msgid "Participant"
 msgstr "Удзельнік"
 
-#: gajim/common/helpers.py:368
+#: gajim/common/helpers.py:374
 msgid "Visitors"
 msgstr "Наведвальнікі"
 
-#: gajim/common/helpers.py:370
+#: gajim/common/helpers.py:376
 msgid "Visitor"
 msgstr "Наведвальнік"
 
-#: gajim/common/helpers.py:376 gajim/gtk/tooltips.py:253
+#: gajim/common/helpers.py:382 gajim/gtk/tooltips.py:253
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "?Адносіны ўдзельніка групавой размовы:Няма"
 
-#: gajim/common/helpers.py:378 gajim/data/gui/groupchat_config.ui:32
+#: gajim/common/helpers.py:384 gajim/data/gui/groupchat_config.ui:32
 #: gajim/gtk/tooltips.py:259
 msgid "Owner"
 msgstr "Уладальнік"
 
-#: gajim/common/helpers.py:380 gajim/gtk/tooltips.py:257
+#: gajim/common/helpers.py:386 gajim/gtk/tooltips.py:257
 msgid "Administrator"
 msgstr "Адміністратар"
 
-#: gajim/common/helpers.py:382 gajim/data/gui/groupchat_config.ui:40
+#: gajim/common/helpers.py:388 gajim/data/gui/groupchat_config.ui:40
 #: gajim/gtk/tooltips.py:255 gajim/gtk/groupchat_config.py:105
 msgid "Member"
 msgstr "Удзельнік"
 
-#: gajim/common/helpers.py:421
+#: gajim/common/helpers.py:427
 msgid "is paying attention to the conversation"
 msgstr "сочыць за размовай"
 
-#: gajim/common/helpers.py:423
+#: gajim/common/helpers.py:429
 msgid "is doing something else"
 msgstr "заняты чымсьці іншым"
 
-#: gajim/common/helpers.py:425
+#: gajim/common/helpers.py:431
 #, fuzzy
 msgid "is composing a message…"
 msgstr "піша паведамленне..."
 
-#: gajim/common/helpers.py:428
+#: gajim/common/helpers.py:434
 msgid "paused composing a message"
 msgstr "перастаў пісаць"
 
-#: gajim/common/helpers.py:430
+#: gajim/common/helpers.py:436
 msgid "has closed the chat window or tab"
 msgstr "закрыў вакно / картку размовы"
 
-#: gajim/common/helpers.py:936 gajim/common/helpers.py:943
+#: gajim/common/helpers.py:942 gajim/common/helpers.py:949
 #, fuzzy, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
@@ -5372,22 +5500,22 @@ msgstr[0] "Адправіць паведамленне"
 msgstr[1] "Адправіць паведамленне"
 msgstr[2] "Адправіць паведамленне"
 
-#: gajim/common/helpers.py:950
+#: gajim/common/helpers.py:956
 #, fuzzy, python-format
-msgid "from room %s"
-msgstr "Я %s"
+msgid "from group chat %s"
+msgstr "Удзельнічаць у _групавой размове"
 
-#: gajim/common/helpers.py:953 gajim/common/helpers.py:970
+#: gajim/common/helpers.py:959 gajim/common/helpers.py:976
 #, python-format
 msgid "from user %s"
 msgstr ""
 
-#: gajim/common/helpers.py:955
+#: gajim/common/helpers.py:961
 #, fuzzy, python-format
 msgid "from %s"
 msgstr "Ад"
 
-#: gajim/common/helpers.py:962 gajim/common/helpers.py:968
+#: gajim/common/helpers.py:968 gajim/common/helpers.py:974
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
@@ -5395,40 +5523,40 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: gajim/common/helpers.py:986 gajim/common/helpers.py:998
+#: gajim/common/helpers.py:992 gajim/common/helpers.py:1004
 #: gajim/data/gui/roster_window.ui:85 data/org.gajim.Gajim.desktop.in:4
 #: data/org.gajim.Gajim.appdata.xml.in:9
 msgid "Gajim"
 msgstr "Gajim"
 
-#: gajim/common/helpers.py:1000
+#: gajim/common/helpers.py:1006
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: gajim/common/helpers.py:1109 gajim/data/gui/add_new_contact_window.ui:25
+#: gajim/common/helpers.py:1115 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:1111
+#: gajim/common/helpers.py:1117
 msgid "Hello, I am $name."
 msgstr ""
 
-#: gajim/common/helpers.py:1215 gajim/common/helpers.py:1224
-#: gajim/common/helpers.py:1282
+#: gajim/common/helpers.py:1221 gajim/common/helpers.py:1230
+#: gajim/common/helpers.py:1288
 #, fuzzy
 msgid "Timeout loading image"
 msgstr "Немагчыма загрузіць малюнак"
 
-#: gajim/common/helpers.py:1234 gajim/common/helpers.py:1280
+#: gajim/common/helpers.py:1240 gajim/common/helpers.py:1286
 msgid "Image is too big"
 msgstr ""
 
-#: gajim/common/helpers.py:1245
+#: gajim/common/helpers.py:1251
 msgid "PyCURL is not installed"
 msgstr ""
 
-#: gajim/common/helpers.py:1284
+#: gajim/common/helpers.py:1290
 #, fuzzy
 msgid "Error loading image"
 msgstr "Немагчыма загрузіць малюнак"
@@ -5608,7 +5736,8 @@ msgstr "Стан змяніўся."
 
 #: gajim/common/modules/adhoc_commands.py:202
 #: gajim/common/modules/adhoc_commands.py:239
-msgid "Leave Groupchats"
+#, fuzzy
+msgid "Leave Group Chats"
 msgstr "Сысці з групавых размоў"
 
 #: gajim/common/modules/adhoc_commands.py:228
@@ -5617,16 +5746,18 @@ msgid "%(nickname)s on %(room_jid)s"
 msgstr "%(nickname)s на %(room_jid)s"
 
 #: gajim/common/modules/adhoc_commands.py:232
-msgid "You have not joined a groupchat."
+#, fuzzy
+msgid "You have not joined a group chat."
 msgstr "Вы не ўвайшлі ў пакой групавой размовы."
 
 #: gajim/common/modules/adhoc_commands.py:240
-msgid "Choose the groupchats you want to leave"
+#, fuzzy
+msgid "Choose the group chats you want to leave"
 msgstr "Выберыце групавыя размовы, з якіх Вы хочаце сысці"
 
 #: gajim/common/modules/adhoc_commands.py:289
 #, fuzzy
-msgid "You left the following groupchats:"
+msgid "You left the following group chats:"
 msgstr "Вы сышлі з наступных групавых размоў:"
 
 #: gajim/common/modules/roster_item_exchange.py:102
@@ -5644,7 +5775,7 @@ msgstr "Людзі"
 msgid "Blocked Contacts"
 msgstr "Людзі"
 
-#: gajim/data/gui/destroy_muc_dialog.ui:79 gajim/gtk/dialogs.py:736
+#: gajim/data/gui/destroy_muc_dialog.ui:79 gajim/gtk/dialogs.py:563
 msgid "Destroy this group chat permanently?"
 msgstr ""
 
@@ -5653,7 +5784,7 @@ msgstr ""
 msgid "Reason..."
 msgstr "Прычына"
 
-#: gajim/data/gui/destroy_muc_dialog.ui:124 gajim/gtk/dialogs.py:738
+#: gajim/data/gui/destroy_muc_dialog.ui:124 gajim/gtk/dialogs.py:565
 msgid "Where participants should go (optional)"
 msgstr ""
 
@@ -5665,33 +5796,6 @@ msgstr ""
 msgid "_Reason and alternate venue (optional)"
 msgstr ""
 
-#: gajim/data/gui/advanced_configuration_window.ui:7
-#: gajim/data/gui/preferences_window.ui:2723
-#, fuzzy
-msgid "Advanced Configuration Editor (ACE)"
-msgstr "Адмысловы рэдактар настаўленняў"
-
-#: gajim/data/gui/advanced_configuration_window.ui:52
-#, fuzzy
-msgid "You should restart Gajim for some changes to take effect"
-msgstr "<b>Увага:</b> Каб ужыць некаторыя змены, трэба перазапусціць Gajim"
-
-#: gajim/data/gui/advanced_configuration_window.ui:84
-#, fuzzy
-msgid "_Filter"
-msgstr "_Фільтар:"
-
-#: gajim/data/gui/advanced_configuration_window.ui:153
-#: gajim/data/gui/filetransfers_send_file_dialog.ui:15
-#: gajim/gtk/discovery.py:1666
-msgid "Description"
-msgstr "Апісанне"
-
-#: gajim/data/gui/advanced_configuration_window.ui:197
-#, fuzzy
-msgid "_Reset to default"
-msgstr "_Вярнуць звычайныя колеры"
-
 #: gajim/data/gui/join_groupchat_window.ui:56
 #: gajim/data/gui/chat_to_muc_window.ui:67
 #: gajim/data/gui/chat_to_muc_window.ui:78
@@ -5703,9 +5807,8 @@ msgid "Join group chat every time Gajim is started"
 msgstr ""
 
 #: gajim/data/gui/join_groupchat_window.ui:113
-#, fuzzy
-msgid "Auto Join"
-msgstr "Аўтаматычна далучацца"
+msgid "Join Automatically"
+msgstr ""
 
 #: gajim/data/gui/join_groupchat_window.ui:131
 #: gajim/data/gui/profile_window.ui:233
@@ -5714,10 +5817,11 @@ msgstr "Рахунак"
 
 #: gajim/data/gui/join_groupchat_window.ui:147
 #, fuzzy
-msgid "Room"
-msgstr "Пакой:"
+msgid "Group chat"
+msgstr "Групавыя размовы"
 
-#: gajim/data/gui/join_groupchat_window.ui:180 gajim/gtk/accounts.py:886
+#: gajim/data/gui/join_groupchat_window.ui:180 gajim/data/gui/bookmarks.ui:158
+#: gajim/gtk/accounts.py:889
 #, fuzzy
 msgid "Password"
 msgstr "Пароль:"
@@ -5741,93 +5845,11 @@ msgstr "Удзельнічаць у _групавой размове"
 msgid "Search group chats on selected server"
 msgstr ""
 
-#: gajim/data/gui/join_groupchat_window.ui:437 gajim/gtk/discovery.py:1271
+#: gajim/data/gui/join_groupchat_window.ui:437 gajim/gtk/discovery.py:1270
 #, fuzzy
 msgid "Join"
 msgstr "_Далучыцца"
 
-#: gajim/data/gui/manage_proxies_window.ui:12
-#, fuzzy
-msgid "HTTP Connect"
-msgstr "Злучэнне HTTP"
-
-#: gajim/data/gui/manage_proxies_window.ui:15
-msgid "SOCKS5"
-msgstr ""
-
-#: gajim/data/gui/manage_proxies_window.ui:18
-msgid "BOSH"
-msgstr ""
-
-#: gajim/data/gui/manage_proxies_window.ui:27
-msgid "Manage Proxy Profiles"
-msgstr "Кіраванне профілямі проксі"
-
-#: gajim/data/gui/manage_proxies_window.ui:83
-#, fuzzy
-msgid "Add Proxy"
-msgstr "Проксі:"
-
-#: gajim/data/gui/manage_proxies_window.ui:97
-#, fuzzy
-msgid "Remove Proxy"
-msgstr "Выдаліць групу"
-
-#: gajim/data/gui/manage_proxies_window.ui:141
-#, fuzzy
-msgid "Properties"
-msgstr "<b>Уласцівасці</b>"
-
-#: gajim/data/gui/manage_proxies_window.ui:157
-#, fuzzy
-msgid "_Name"
-msgstr "_Імя:"
-
-#: gajim/data/gui/manage_proxies_window.ui:173
-#, fuzzy
-msgid "_Type"
-msgstr "Тып:"
-
-#: gajim/data/gui/manage_proxies_window.ui:236
-#, fuzzy
-msgid "_BOSH URL"
-msgstr "_Спасылка:"
-
-#: gajim/data/gui/manage_proxies_window.ui:261
-#, fuzzy
-msgid "Use HTTP prox_y"
-msgstr "С_карыстаць проксі"
-
-#: gajim/data/gui/manage_proxies_window.ui:280
-#, fuzzy
-msgid "Proxy _Host"
-msgstr "Проксі:"
-
-#: gajim/data/gui/manage_proxies_window.ui:307
-#, fuzzy
-msgid "Proxy _Port"
-msgstr "_Порт:"
-
-#: gajim/data/gui/manage_proxies_window.ui:334
-#, fuzzy
-msgid "_Username"
-msgstr "_Імя карыстальніка:"
-
-#: gajim/data/gui/manage_proxies_window.ui:347
-#, fuzzy
-msgid "Use proxy auth_entication"
-msgstr "Аўтарызацыя"
-
-#: gajim/data/gui/manage_proxies_window.ui:377
-#, fuzzy
-msgid "Pass_word"
-msgstr "Па_роль:"
-
-#: gajim/data/gui/manage_proxies_window.ui:405 gajim/gtk/adhoc.py:321
-#, fuzzy
-msgid "Settings"
-msgstr "Памылка злучэння"
-
 #: gajim/data/gui/change_password_dialog.ui:17
 #, fuzzy
 msgid "New Password"
@@ -5858,11 +5880,13 @@ msgid "Status:"
 msgstr "Стан:"
 
 #: gajim/data/gui/zeroconf_information_window.ui:89
-msgid "_Log conversation history"
+#, fuzzy
+msgid "_Store conversation history"
 msgstr "_Весці журнал размоў"
 
 #: gajim/data/gui/zeroconf_information_window.ui:215
 #: gajim/data/gui/vcard_information_window.ui:390
+#: gajim/data/gui/groupchat_info_scrolled.ui:166
 msgid "Contact"
 msgstr "Чалавек"
 
@@ -5875,8 +5899,9 @@ msgid "Last Name:"
 msgstr "Прозвішча:"
 
 #: gajim/data/gui/zeroconf_information_window.ui:260
-msgid "Jabber ID:"
-msgstr "Jabber ID:"
+#, fuzzy
+msgid "XMPP Address:"
+msgstr "Адрас AIM:"
 
 #: gajim/data/gui/zeroconf_information_window.ui:273
 msgid "E-Mail:"
@@ -5897,8 +5922,8 @@ msgstr "Адправіць _файл"
 
 #: gajim/data/gui/gc_occupants_menu.ui:29
 #, fuzzy
-msgid "Occupant Actions"
-msgstr "_Дзеянні ўдзельнікаў"
+msgid "Participant Actions"
+msgstr "Удзельнікі"
 
 #: gajim/data/gui/gc_occupants_menu.ui:38
 msgid "_Voice"
@@ -5929,8 +5954,9 @@ msgid "_Ban"
 msgstr "_Забараніць казанне"
 
 #: gajim/data/gui/gc_occupants_menu.ui:124
-msgid "_Add to Roster"
-msgstr "_Дадаць у кантактны ліст"
+#, fuzzy
+msgid "_Add to Contact List"
+msgstr "_Дадаць чалавека..."
 
 #: gajim/data/gui/gc_occupants_menu.ui:132
 #, fuzzy
@@ -5971,11 +5997,6 @@ msgstr "Падпіска:"
 msgid "_Status"
 msgstr "_Стан"
 
-#: gajim/data/gui/zeroconf_context_menu.ui:26
-#: gajim/data/gui/account_context_menu.ui:79
-msgid "_Modify Account..."
-msgstr "_Змяніць рахунак..."
-
 #: gajim/data/gui/certificate_dialog.ui:66
 #: gajim/data/gui/certificate_dialog.ui:178
 msgid "Common Name (CN)"
@@ -6057,13 +6078,19 @@ msgstr "Апошняя змена:"
 msgid "Next entry"
 msgstr ""
 
+#: gajim/data/gui/filetransfers_send_file_dialog.ui:15
+#: gajim/data/gui/advanced_configuration.ui:143
+#: gajim/data/gui/groupchat_info_scrolled.ui:48 gajim/gtk/discovery.py:1663
+msgid "Description"
+msgstr "Апісанне"
+
 #: gajim/data/gui/filetransfers_send_file_dialog.ui:54
 #, fuzzy
 msgid "_Send Files"
 msgstr "Адправіць _файл"
 
 #: gajim/data/gui/filetransfers_send_file_dialog.ui:58
-#: gajim/gtk/xml_console.py:90
+#: gajim/gtk/xml_console.py:87
 #, fuzzy
 msgid "Send"
 msgstr "Ад_правіць"
@@ -6090,8 +6117,8 @@ msgstr "Змяніць м_янушку"
 
 #: gajim/data/gui/gc_control_popup_menu.ui:20
 #, fuzzy
-msgid "_Manage Room"
-msgstr "Кіраванне закладкамі"
+msgid "_Manage Group Chat"
+msgstr "Новая групавая размова"
 
 #: gajim/data/gui/gc_control_popup_menu.ui:31
 #, fuzzy
@@ -6100,13 +6127,13 @@ msgstr "Змяніць _тэму"
 
 #: gajim/data/gui/gc_control_popup_menu.ui:38
 #, fuzzy
-msgid "Configure _Room..."
-msgstr "Настаўленні _пакоя"
+msgid "Configure _Group Chat..."
+msgstr "Удзельнічаць у _групавой размове"
 
 #: gajim/data/gui/gc_control_popup_menu.ui:52
 #, fuzzy
-msgid "_Destroy Room"
-msgstr "Апісанне: %s"
+msgid "_Destroy Group Chat"
+msgstr "Новая групавая размова"
 
 #: gajim/data/gui/gc_control_popup_menu.ui:64
 msgid "_Minimize on close"
@@ -6117,7 +6144,7 @@ msgstr ""
 msgid "_Request Voice"
 msgstr "_Голас"
 
-#: gajim/data/gui/gc_control_popup_menu.ui:99 gajim/gtk/discovery.py:1704
+#: gajim/data/gui/gc_control_popup_menu.ui:99
 #, fuzzy
 msgid "_Bookmark"
 msgstr "_Змясціць у закладках"
@@ -6170,14 +6197,6 @@ msgstr "У Сеціве:"
 msgid "E-Mail"
 msgstr "E-mail:"
 
-#: 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/blocking_list.ui:115 gajim/gtk/add_contact.py:30
-#: gajim/gtk/accounts.py:801
-#, fuzzy
-msgid "Jabber ID"
-msgstr "Jabber ID:"
-
 #: gajim/data/gui/profile_window.ui:440
 msgid "Main"
 msgstr ""
@@ -6313,35 +6332,42 @@ msgstr "Праца"
 msgid "About"
 msgstr "Пра мяне"
 
-#: gajim/data/gui/start_chat_dialog.ui:114 gajim/gtk/discovery.py:1658
-msgid "Users"
-msgstr "Карыстальнікі"
-
-#: gajim/data/gui/start_chat_dialog.ui:185
-msgid "Name:"
-msgstr "Імя:"
+#: gajim/data/gui/start_chat_dialog.ui:53
+#, fuzzy
+msgid "Global Group Chat Search"
+msgstr "Удзельнічаць у групавой размове"
 
-#: gajim/data/gui/start_chat_dialog.ui:197
+#: 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
-msgid "Description:"
-msgstr "Апісанне: %s"
+msgid "_Back"
+msgstr "Хутка буду"
 
-#: gajim/data/gui/start_chat_dialog.ui:209
+#: gajim/data/gui/start_chat_dialog.ui:245
+#: gajim/data/gui/groupchat_control.ui:796
+#: gajim/data/gui/groupchat_control.ui:888 gajim/gtk/discovery.py:1701
+#: gajim/gtk/groupchat_join.py:62
+msgid "_Join"
+msgstr "_Далучыцца"
+
+#: gajim/data/gui/start_chat_dialog.ui:289
 #, fuzzy
-msgid "Address:"
-msgstr "_Адрас:"
+msgid "Select Account"
+msgstr "Выдаленне рахунка %s"
 
-#: gajim/data/gui/start_chat_dialog.ui:246
-msgid ""
-"Semi-Anonymous\n"
-"<span size=\"small\">(Only moderators can see your XMPP-Address)</span>"
+#: gajim/data/gui/start_chat_dialog.ui:380
+msgid "_Select"
 msgstr ""
 
 #: gajim/data/gui/filetransfers.ui:21
 msgid "Pa_use/Resume"
 msgstr ""
 
-#: gajim/data/gui/filetransfers.ui:30 gajim/gtk/filechoosers.py:178
+#: gajim/data/gui/filetransfers.ui:30 gajim/data/gui/groupchat_control.ui:575
+#: gajim/data/gui/groupchat_control.ui:667
+#: gajim/data/gui/groupchat_control.ui:779
+#: gajim/data/gui/groupchat_control.ui:871 gajim/gtk/filechoosers.py:178
 msgid "_Cancel"
 msgstr "_Скасаваць"
 
@@ -6383,7 +6409,8 @@ msgid "Cancel the selected file transfer and remove incomplete files"
 msgstr "Скасаваць выбраную перадачу файла і выдаліць няскончаны файл"
 
 #: gajim/data/gui/filetransfers.ui:207
-msgid "Shows a list of file transfers between you and others"
+#, fuzzy
+msgid "Shows a list of file transfers between you and your contacts"
 msgstr "Паказаць спіс перадаваных і атрыманых файлаў"
 
 #: gajim/data/gui/groupchat_control.ui:13 gajim/data/gui/chat_control.ui:277
@@ -6405,7 +6432,6 @@ msgid "Strike"
 msgstr "Мянушка"
 
 #: gajim/data/gui/groupchat_control.ui:54 gajim/data/gui/chat_control.ui:318
-#: gajim/gtk/advanced_config.py:86
 msgid "Color"
 msgstr "Колер"
 
@@ -6419,16 +6445,45 @@ msgstr "_Шрыфт:"
 msgid "Clear formatting"
 msgstr "Асабістыя звесткі"
 
-#: gajim/data/gui/groupchat_control.ui:290 gajim/data/gui/chat_control.ui:880
+#: gajim/data/gui/groupchat_control.ui:291 gajim/data/gui/chat_control.ui:880
 #, fuzzy
 msgid "Choose encryption"
 msgstr "Выберыце файл..."
 
-#: gajim/data/gui/groupchat_control.ui:336 gajim/data/gui/chat_control.ui:640
+#: gajim/data/gui/groupchat_control.ui:337 gajim/data/gui/chat_control.ui:640
 #, fuzzy
 msgid "Show a list of emojis (Alt+M)"
 msgstr "Пстрыкніце, каб уставіць сымболік (Alt+M)"
 
+#: gajim/data/gui/groupchat_control.ui:484
+#, fuzzy
+msgid "Joining…"
+msgstr "Забараніць казанне..."
+
+#: gajim/data/gui/groupchat_control.ui:496
+msgid "_Abort"
+msgstr ""
+
+#: gajim/data/gui/groupchat_control.ui:542
+#, fuzzy
+msgid "Enter new nickname"
+msgstr "_Пасля мянушкі:"
+
+#: gajim/data/gui/groupchat_control.ui:592
+#: gajim/data/gui/groupchat_control.ui:684
+#, fuzzy
+msgid "Ch_ange"
+msgstr "Змяніць м_янушку"
+
+#: gajim/data/gui/groupchat_control.ui:761
+#, fuzzy
+msgid "Enter password"
+msgstr "Увядзіце новы пароль:"
+
+#: gajim/data/gui/groupchat_control.ui:1067
+msgid "_Try again"
+msgstr ""
+
 #: gajim/data/gui/popup_notification_window.ui:42
 #, fuzzy
 msgid "Event Type"
@@ -6510,8 +6565,8 @@ msgstr "Сышоў"
 
 #: gajim/data/gui/mam_preferences.ui:18
 #, fuzzy
-msgid "Roster"
-msgstr "Паказаць _галоўнае вакно"
+msgid "Contact List"
+msgstr "Людзі"
 
 #: gajim/data/gui/mam_preferences.ui:22
 #: gajim/data/gui/preferences_window.ui:123
@@ -6537,12 +6592,12 @@ msgid "Add"
 msgstr "Адрас"
 
 #: gajim/data/gui/mam_preferences.ui:194 gajim/data/gui/groupchat_config.ui:151
-#: gajim/gtk/dialogs.py:63 gajim/gtk/accounts.py:381
+#: gajim/gtk/dialogs.py:62 gajim/gtk/accounts.py:384
 #, fuzzy
 msgid "Remove"
 msgstr "Вы_даліць"
 
-#: gajim/data/gui/vcard_information_window.ui:72 gajim/gtk/accounts.py:753
+#: gajim/data/gui/vcard_information_window.ui:72 gajim/gtk/accounts.py:756
 #, fuzzy
 msgid "Resource"
 msgstr "Рэсурс:"
@@ -6595,6 +6650,7 @@ msgstr "Падпіска:"
 #: gajim/data/gui/vcard_information_window.ui:974
 #: gajim/data/gui/vcard_information_window.ui:993
 #: gajim/data/gui/vcard_information_window.ui:1427
+#: gajim/data/gui/groupchat_info_scrolled.ui:222
 msgid "button"
 msgstr ""
 
@@ -6627,15 +6683,15 @@ msgstr "_Паведамляць мне пра гэта"
 
 #: gajim/data/gui/preferences_window.ui:58
 #, fuzzy
-msgid "Show only in roster"
-msgstr "Паказваць толькі ў _галоўным вакне"
+msgid "Show only in contact list"
+msgstr "Паказаць _адлучаных людзей"
 
 #: gajim/data/gui/preferences_window.ui:69
-msgid "Detached roster with detached chats"
+msgid "Detached contact list with detached chats"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:72
-msgid "Detached roster with single chat"
+msgid "Detached contact list with single chat"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:75
@@ -6643,11 +6699,11 @@ msgid "Single window for everything"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:78
-msgid "Detached roster with chat grouped by account"
+msgid "Detached contact list with chat grouped by account"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:81
-msgid "Detached roster with chat grouped by type"
+msgid "Detached contact list with chat grouped by type"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:92
@@ -6698,7 +6754,7 @@ msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:296
 #, fuzzy
-msgid "_Show roster on startup"
+msgid "_Show contact list on startup"
 msgstr "Паказаць _галоўнае вакно"
 
 #: gajim/data/gui/preferences_window.ui:311
@@ -6714,12 +6770,12 @@ msgid "_Tabs placement"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:363
-msgid "_Quit Gajim when closing roster window"
+msgid "_Quit Gajim when closing contact list"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:367
 msgid ""
-"If enabled, Gajim will quit when closing the roster window instead of "
+"If enabled, Gajim will quit when closing the contact list window instead of "
 "minimizing to the system's notification area"
 msgstr ""
 
@@ -6729,41 +6785,42 @@ msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:423
 #, fuzzy
-msgid "Show a_vatars of contacts in roster"
+msgid "Show a_vatars of contacts in contact list"
 msgstr "Паказваць _малюнкі ў галоўным вакне"
 
 #: gajim/data/gui/preferences_window.ui:427
 #, fuzzy
 msgid ""
-"If checked, avatars of contacts will be shown in the roster window and in "
-"group chats"
+"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
 #, fuzzy
-msgid "Show status _messages of contacts in roster"
+msgid "Show status _messages of contacts in contact list"
 msgstr "Паказваць _стан у галоўным вакне"
 
 #: gajim/data/gui/preferences_window.ui:445
 #, fuzzy
 msgid ""
 "If checked, status messages of contacts will be shown under the contact's "
-"name, in the roster window, and in group chats"
+"name, in the contact list window, and in group chats"
 msgstr ""
 "Калі гэтая опцыя ўключаная, Gajim паказвае паведамленні аб зменах стану для "
 "кожнага чалавека ў галоўным вакне і ў групавых размовах"
 
 #: gajim/data/gui/preferences_window.ui:459
 #, fuzzy
-msgid "Show e_xtra information of contacts in roster (mood, activity, ...)"
+msgid ""
+"Show e_xtra information of contacts in contact list (mood, activity, ...)"
 msgstr "Паказваць _малюнкі ў галоўным вакне"
 
 #: gajim/data/gui/preferences_window.ui:463
 msgid ""
-"If checked, additional info published by the contact will be shown in "
-"roster. Additional infos (published via PEP) may include e.g. mood, "
+"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 ""
 
@@ -6774,8 +6831,8 @@ msgstr "_Упарадкаваць людзей па стане"
 
 #: gajim/data/gui/preferences_window.ui:494
 #, fuzzy
-msgid "in _roster"
-msgstr "Няма ў спісе"
+msgid "in _contact list"
+msgstr "Людзі"
 
 #: gajim/data/gui/preferences_window.ui:511
 #, fuzzy
@@ -6784,8 +6841,8 @@ msgstr "Удзельнічаць у _групавой размове"
 
 #: gajim/data/gui/preferences_window.ui:540
 #, fuzzy
-msgid "Roster Appearance"
-msgstr "<b>Змяніць правіла</b>"
+msgid "Contact List Appearance"
+msgstr "Чалавек адлучыўся"
 
 #: gajim/data/gui/preferences_window.ui:585
 msgid "Enable spell _checking"
@@ -6844,7 +6901,7 @@ msgstr "Немагчыма ўвайсці ў групавую размову"
 
 #: gajim/data/gui/preferences_window.ui:660
 #, fuzzy
-msgid "If checked, the room subject will be shown when joining a group chat"
+msgid "If checked, the subject will be shown when joining a group chat"
 msgstr "Немагчыма ўвайсці ў групавую размову"
 
 #: gajim/data/gui/preferences_window.ui:682
@@ -6859,13 +6916,13 @@ msgstr ""
 #: gajim/data/gui/preferences_window.ui:701
 msgid ""
 "If join/leave status messages are shown in the group chat. This setting can "
-"be overridden in the groupchat menu."
+"be overridden in the group chat menu."
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:720
 msgid ""
 "The default sync threshold for new public group chats. This setting can be "
-"overridden in the groupchat menu."
+"overridden in the group chat menu."
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:722
@@ -6880,7 +6937,7 @@ msgstr "_Пісаць у журнал паведамленні аб змене �
 #: gajim/data/gui/preferences_window.ui:768
 msgid ""
 "If status change messages are shown in the group chat. This setting can be "
-"overridden in the groupchat menu."
+"overridden in the group chat menu."
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:825
@@ -6899,8 +6956,8 @@ msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:843
 #, fuzzy
-msgid "Show chatstate in roster"
-msgstr "Паказваць _малюнкі ў галоўным вакне"
+msgid "Show chatstate in contact list"
+msgstr "Паказваць кнопку закрыцця на картцы?"
 
 #: gajim/data/gui/preferences_window.ui:847
 msgid ""
@@ -7195,7 +7252,7 @@ msgstr ""
 msgid "Vi_ew own video source"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2281 gajim/gtk/accounts.py:352
+#: gajim/data/gui/preferences_window.ui:2281 gajim/gtk/accounts.py:355
 msgid "Connection"
 msgstr "Злучэнне"
 
@@ -7249,7 +7306,8 @@ msgid "_Manage..."
 msgstr "Кіраванне..."
 
 #: gajim/data/gui/preferences_window.ui:2616
-msgid "_Log status changes of contacts"
+#, fuzzy
+msgid "_Store status changes of contacts in history"
 msgstr "_Пісаць у журнал паведамленні аб змене стану чалавека"
 
 #: gajim/data/gui/preferences_window.ui:2633
@@ -7274,10 +7332,15 @@ msgstr ""
 msgid "_Open..."
 msgstr "_Адкрыць..."
 
+#: gajim/data/gui/preferences_window.ui:2723 gajim/gtk/advanced_config.py:84
+#, fuzzy
+msgid "Advanced Configuration Editor (ACE)"
+msgstr "Адмысловы рэдактар настаўленняў"
+
 #: gajim/data/gui/groupchat_config.ui:55
 #, fuzzy
 msgid ""
-"<b>Jabber-ID</b>\n"
+"<b>XMPP Address</b>\n"
 "&lt;user@domain/resource&gt; (only that resource matches)\n"
 "&lt;user@domain&gt; (any resource matches)\n"
 "&lt;domain/resource&gt; (only that resource matches)\n"
@@ -7296,7 +7359,8 @@ msgstr ""
 msgid "Only Admins and Owners can modify the affiliation"
 msgstr ""
 
-#: gajim/data/gui/groupchat_config.ui:270 gajim/plugins/gui.py:312
+#: gajim/data/gui/groupchat_config.ui:270
+#: gajim/data/gui/groupchat_info_scrolled.ui:210 gajim/plugins/gui.py:324
 #, fuzzy
 msgid "Configuration"
 msgstr "Настаўленні пакоя"
@@ -7329,7 +7393,7 @@ msgid "Start _Chat"
 msgstr "Пачаць _размову"
 
 #: gajim/data/gui/contact_context_menu.ui:20
-#: gajim/data/gui/systray_context_menu.ui:36
+#: gajim/data/gui/systray_context_menu.ui:29
 msgid "Send Single _Message..."
 msgstr "Адправіць _асобнае паведамленне..."
 
@@ -7398,17 +7462,42 @@ msgstr ""
 
 #: gajim/data/gui/contact_context_menu.ui:174
 #, fuzzy
-msgid "_Add to Roster..."
-msgstr "_Дадаць у кантактны ліст"
+msgid "_Add to Contact List..."
+msgstr "_Дадаць чалавека..."
+
+#: gajim/data/gui/advanced_configuration.ui:39
+#, fuzzy
+msgid "You should restart Gajim for some changes to take effect"
+msgstr "<b>Увага:</b> Каб ужыць некаторыя змены, трэба перазапусціць Gajim"
+
+#: gajim/data/gui/advanced_configuration.ui:71
+#, fuzzy
+msgid "_Filter"
+msgstr "_Фільтар:"
+
+#: gajim/data/gui/advanced_configuration.ui:88
+msgid "Type to search for values..."
+msgstr ""
+
+#: gajim/data/gui/advanced_configuration.ui:180
+#, fuzzy
+msgid "_Reset Value"
+msgstr "_Вярнуць звычайныя колеры"
+
+#: gajim/data/gui/advanced_configuration.ui:185
+#, fuzzy
+msgid "Resets value to default"
+msgstr "_Вярнуць звычайныя колеры"
 
 #: gajim/data/gui/account_creation_wizard_window.ui:43
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim: Стварэнне рахунка"
 
 #: gajim/data/gui/account_creation_wizard_window.ui:70
+#, fuzzy
 msgid ""
 "You need to have an account in order to connect\n"
-"to the Jabber network."
+"to the XMPP network."
 msgstr ""
 "Трэба зарэгістраваць рахунак, каб далучыцца да\n"
 "сеткі Jabber."
@@ -7432,8 +7521,9 @@ msgid "<b>Please fill in the data for your existing account</b>"
 msgstr "<b>Запоўніце звесткі Вашага рахунка</b>"
 
 #: gajim/data/gui/account_creation_wizard_window.ui:187
-msgid "_Jabber ID:"
-msgstr "_Jabber ID:"
+#, fuzzy
+msgid "_XMPP Address:"
+msgstr "Адрас AIM:"
 
 #: gajim/data/gui/account_creation_wizard_window.ui:239
 #: gajim/data/gui/account_creation_wizard_window.ui:394
@@ -7522,6 +7612,7 @@ msgid "Privacy Lists:"
 msgstr "Спісы прыватнасці:"
 
 #: gajim/data/gui/service_discovery_window.ui:111
+#: gajim/data/gui/groupchat_creation.ui:227
 #, fuzzy
 msgid "_Address"
 msgstr "_Адрас:"
@@ -7540,11 +7631,6 @@ msgstr ""
 msgid "Select the contacts you want to synchronise"
 msgstr "JID чалавека, з якім Вы хочаце паразмаўляць"
 
-#: gajim/data/gui/groupchat_invitation_received.ui:42
-#, fuzzy
-msgid "Group Chat Invitation"
-msgstr "Запрашэнне ў групавую размову"
-
 #: gajim/data/gui/groupchat_invitation_received.ui:111
 #, fuzzy
 msgid "Message..."
@@ -7596,11 +7682,10 @@ msgstr ""
 
 #: gajim/data/gui/add_new_contact_window.ui:84
 #, fuzzy
-msgid "_Jabber ID"
-msgstr "_Jabber ID:"
+msgid "_XMPP Address"
+msgstr "_Адрас:"
 
 #: gajim/data/gui/add_new_contact_window.ui:100
-#: gajim/data/gui/manage_bookmarks_window.ui:192
 #, fuzzy
 msgid "_Nickname"
 msgstr "_Мянушка:"
@@ -7680,7 +7765,7 @@ msgstr "<b>Гукі</b>"
 msgid "<b>Message:</b>"
 msgstr "<b>Паведамленні аб змене стану</b>"
 
-#: gajim/data/gui/plugins_window.ui:10 gajim/data/gui/application_menu.ui:90
+#: gajim/data/gui/plugins_window.ui:10 gajim/data/gui/application_menu.ui:87
 msgid "Plugins"
 msgstr ""
 
@@ -7789,10 +7874,6 @@ msgstr "Дазволіць"
 msgid "Deny"
 msgstr "Адмовіць"
 
-#: gajim/data/gui/privacy_list_window.ui:317
-msgid "JabberID"
-msgstr "JabberID"
-
 #: gajim/data/gui/privacy_list_window.ui:358
 msgid "all in the group"
 msgstr "усе з групы"
@@ -7835,7 +7916,7 @@ msgstr "Парадак:"
 msgid "Manage sounds"
 msgstr "Кіраванне рахункамі"
 
-#: gajim/data/gui/manage_sounds_window.ui:55 gajim/plugins/gui.py:100
+#: gajim/data/gui/manage_sounds_window.ui:55 gajim/plugins/gui.py:101
 msgid "Active"
 msgstr "Актыўны"
 
@@ -7874,23 +7955,114 @@ msgstr "Выдаліць рахунак для Gajim і на _серверы"
 msgid "_Personal Events"
 msgstr "Асабістыя звесткі"
 
-#: gajim/data/gui/account_context_menu.ui:35
-#: gajim/data/gui/systray_context_menu.ui:28
-msgid "Join _Group Chat"
-msgstr "Удзельнічаць у _групавой размове"
-
-#: gajim/data/gui/account_context_menu.ui:49
+#: gajim/data/gui/account_context_menu.ui:41
 msgid "_Add Contact..."
 msgstr "_Дадаць чалавека..."
 
-#: gajim/data/gui/account_context_menu.ui:57
+#: gajim/data/gui/account_context_menu.ui:49
 msgid "_Discover Services"
 msgstr "_Пошук сервісаў"
 
-#: gajim/data/gui/account_context_menu.ui:65
+#: gajim/data/gui/account_context_menu.ui:57
 msgid "_Execute Command..."
 msgstr "_Выканаць загад..."
 
+#: gajim/data/gui/account_context_menu.ui:65
+#, fuzzy
+msgid "_View Certificate"
+msgstr "Няправільнае імя карыстальніка"
+
+#: gajim/data/gui/manage_proxies.ui:12
+#, fuzzy
+msgctxt "proxy configuration"
+msgid "HTTP Connect"
+msgstr "Злучэнне HTTP"
+
+#: gajim/data/gui/manage_proxies.ui:15
+msgctxt "proxy configuration"
+msgid "SOCKS5"
+msgstr ""
+
+#: gajim/data/gui/manage_proxies.ui:18
+#, fuzzy
+msgctxt "proxy configuration"
+msgid "BOSH"
+msgstr "_Спасылка:"
+
+#: gajim/data/gui/manage_proxies.ui:68
+#, fuzzy
+msgid "Add Proxy"
+msgstr "Проксі:"
+
+#: gajim/data/gui/manage_proxies.ui:82
+#, fuzzy
+msgid "Remove Proxy"
+msgstr "Выдаліць групу"
+
+#: gajim/data/gui/manage_proxies.ui:134
+#, fuzzy
+msgid "Pass_word"
+msgstr "Па_роль:"
+
+#: gajim/data/gui/manage_proxies.ui:159
+#, fuzzy
+msgid "Use proxy auth_entication"
+msgstr "Аўтарызацыя"
+
+#: gajim/data/gui/manage_proxies.ui:179
+#, fuzzy
+msgid "_Username"
+msgstr "_Імя карыстальніка:"
+
+#: gajim/data/gui/manage_proxies.ui:209
+#, fuzzy
+msgid "_Port"
+msgstr "_Порт:"
+
+#: gajim/data/gui/manage_proxies.ui:226
+msgid "example.org"
+msgstr ""
+
+#: gajim/data/gui/manage_proxies.ui:240
+#, fuzzy
+msgid "_Host"
+msgstr "_Вузел:"
+
+#: gajim/data/gui/manage_proxies.ui:254
+#, fuzzy
+msgid "Use HTTP prox_y"
+msgstr "С_карыстаць проксі"
+
+#: gajim/data/gui/manage_proxies.ui:275
+msgid "https://example.org/http-bind/"
+msgstr ""
+
+#: gajim/data/gui/manage_proxies.ui:291
+#, fuzzy
+msgid "_BOSH URL"
+msgstr "_Спасылка:"
+
+#: gajim/data/gui/manage_proxies.ui:309 gajim/gtk/adhoc.py:322
+#, fuzzy
+msgid "Settings"
+msgstr "Памылка злучэння"
+
+#: gajim/data/gui/manage_proxies.ui:344
+#, fuzzy
+msgid "_Type"
+msgstr "Тып:"
+
+#: gajim/data/gui/manage_proxies.ui:361
+#: gajim/data/gui/groupchat_creation.ui:105
+#, fuzzy
+msgid "_Name"
+msgstr "_Імя:"
+
+#: gajim/data/gui/manage_proxies.ui:391 gajim/gtk/accounts.py:742
+#, fuzzy
+msgid "Proxy"
+msgstr "Проксі:"
+
 #: gajim/data/gui/application_menu.ui:8
 #, fuzzy
 msgid "View"
@@ -7898,8 +8070,8 @@ msgstr "_Выгляд"
 
 #: gajim/data/gui/application_menu.ui:11
 #, fuzzy
-msgid "Show Roster"
-msgstr "Паказаць _галоўнае вакно"
+msgid "Show Contact List"
+msgstr "Паказаць _адлучаных людзей"
 
 #: gajim/data/gui/application_menu.ui:16
 #, fuzzy
@@ -7941,23 +8113,24 @@ msgstr ""
 msgid "Features"
 msgstr "Здольнасці сервера"
 
-#: gajim/data/gui/application_menu.ui:81
+#: gajim/data/gui/application_menu.ui:77
+#: gajim/data/gui/groupchat_creation.ui:81 gajim/gtk/groupchat_creation.py:45
 #, fuzzy
-msgid "Bookmarks"
-msgstr "_Змясціць у закладках"
+msgid "Create Group Chat"
+msgstr "Сысці з групавых размоў"
 
-#: gajim/data/gui/application_menu.ui:94 gajim/data/gui/shortcuts_window.ui:189
-#: gajim/gtk/preferences.py:59
+#: gajim/data/gui/application_menu.ui:91 gajim/data/gui/shortcuts_window.ui:189
+#: gajim/gtk/preferences.py:58
 msgid "Preferences"
 msgstr "Уласцівасці"
 
-#: gajim/data/gui/application_menu.ui:99
+#: gajim/data/gui/application_menu.ui:96
 #, fuzzy
 msgid "Quit"
 msgstr "_Выйсці"
 
 #: gajim/data/gui/httpupload_progress_dialog.ui:110
-#: gajim/gtk/filetransfer.py:121
+#: gajim/gtk/filetransfer.py:120
 msgid "Progress"
 msgstr "Ступень выкананасці"
 
@@ -7974,52 +8147,33 @@ msgstr ""
 msgid "_Cancel Upload"
 msgstr "_Скасаваць"
 
-#: gajim/data/gui/manage_bookmarks_window.ui:13
-#, fuzzy
-msgid "Group Chat Bookmarks"
-msgstr "Групавая размова"
-
-#: gajim/data/gui/manage_bookmarks_window.ui:68
-#, fuzzy
-msgid "Add Bookmark"
-msgstr "_Змясціць у закладках"
-
-#: gajim/data/gui/manage_bookmarks_window.ui:82
-#, fuzzy
-msgid "Remove Bookmark"
-msgstr "_Змясціць у закладках"
+#: gajim/data/gui/groupchat_creation.ui:27
+msgid "Public or Private?"
+msgstr ""
 
-#: gajim/data/gui/manage_bookmarks_window.ui:126
-msgid "N_ame"
+#: 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 ""
 
-#: gajim/data/gui/manage_bookmarks_window.ui:145
-#, fuzzy
-msgid "Bookmark Name"
-msgstr "_Змясціць у закладках"
+#: gajim/data/gui/groupchat_creation.ui:58
+msgid "<b>Public:</b> Anyone who knows the address can join."
+msgstr ""
 
-#: gajim/data/gui/manage_bookmarks_window.ui:160
+#: gajim/data/gui/groupchat_creation.ui:122
 #, fuzzy
-msgid "_Server"
-msgstr "_Сервер:"
+msgid "_Description"
+msgstr "Апісанне"
 
-#: gajim/data/gui/manage_bookmarks_window.ui:223
-msgid "Roo_m"
+#: gajim/data/gui/groupchat_creation.ui:164
+msgid "_Public"
 msgstr ""
 
-#: gajim/data/gui/manage_bookmarks_window.ui:253
+#: gajim/data/gui/groupchat_creation.ui:278
 #, fuzzy
-msgid "_Password"
-msgstr "_Пароль:"
-
-#: gajim/data/gui/manage_bookmarks_window.ui:299
-#, fuzzy
-msgid "Join chat when connected"
-msgstr "Чалавек адлучыўся"
-
-#: gajim/data/gui/manage_bookmarks_window.ui:307
-msgid "_Join Automatically"
-msgstr ""
+msgid "_Account"
+msgstr "Рахункі"
 
 #: gajim/data/gui/exception_dialog.ui:49
 msgid "Sorry, that should not have happened"
@@ -8062,6 +8216,29 @@ msgstr "Аўтарызаваць чалавека, каб ён мог бачыц
 msgid "Presets"
 msgstr "_Прысутнасць"
 
+#: gajim/data/gui/groupchat_info_scrolled.ui:32
+#, fuzzy
+msgid "Address"
+msgstr "_Адрас:"
+
+#: gajim/data/gui/groupchat_info_scrolled.ui:64
+msgid "Topic"
+msgstr ""
+
+#: gajim/data/gui/groupchat_info_scrolled.ui:80
+#, fuzzy
+msgid "Author"
+msgstr "А_ўтарызаваць"
+
+#: gajim/data/gui/groupchat_info_scrolled.ui:182
+msgid "Discussion Logs"
+msgstr ""
+
+#: gajim/data/gui/groupchat_info_scrolled.ui:260
+#, fuzzy
+msgid "Group Chat Language"
+msgstr "Запрашэнне ў групавую размову"
+
 #: gajim/data/gui/emoji_chooser.ui:98
 msgid "No Results Found"
 msgstr ""
@@ -8073,24 +8250,34 @@ msgstr ""
 #: gajim/data/gui/chat_to_muc_window.ui:39
 #, fuzzy
 msgid ""
-"You are now entering a groupchat.\n"
+"You are now entering a group chat.\n"
 "Select the contacts you want to invite"
 msgstr "JID чалавека, з якім Вы хочаце паразмаўляць"
 
 #: gajim/data/gui/chat_to_muc_window.ui:112
-msgid "Please select a MUC server."
-msgstr ""
+#, fuzzy
+msgid "Please select a group chat server."
+msgstr "Гэта не групавая размова"
 
 #: gajim/data/gui/chat_to_muc_window.ui:141
 #, fuzzy
-msgid "MUC server"
-msgstr "Назіральнікі"
+msgid "Group chat server"
+msgstr "Групавыя размовы"
 
 #: gajim/data/gui/chat_to_muc_window.ui:176
 #, fuzzy
 msgid "In_vite"
 msgstr "За_прасіць"
 
+#: gajim/data/gui/bookmarks.ui:176
+#, fuzzy
+msgid "Autojoin"
+msgstr "Аўтаматычна далучацца"
+
+#: gajim/data/gui/bookmarks.ui:211
+msgid "_Apply"
+msgstr ""
+
 #: gajim/data/gui/history_manager.ui:11
 #, fuzzy
 msgid "_Export"
@@ -8107,11 +8294,11 @@ msgstr "Gajim - Кіраўнік журналаў размоў"
 
 #: gajim/data/gui/history_manager.ui:108
 msgid ""
-"This log manager is not intended for log viewing. If you are looking for "
-"such functionality, use the history window instead.\n"
+"This history manager is not intended for viewing chat history. If you are "
+"looking for such functionality, please use the history window instead.\n"
 "\n"
-"Use this program to delete or export logs. You can select logs from the left "
-"and/or search database from below."
+"You can use this program to delete or export history. Either select logs "
+"from the left or search the database."
 msgstr ""
 
 #: gajim/data/gui/history_manager.ui:124
@@ -8164,8 +8351,9 @@ msgid "Select an emoji"
 msgstr ""
 
 #: gajim/data/gui/shortcuts_window.ui:38
-msgid "Complete a command or a nick"
-msgstr ""
+#, fuzzy
+msgid "Complete a command or a nickname"
+msgstr "Стварыць новы допіс"
 
 #: gajim/data/gui/shortcuts_window.ui:45
 #, fuzzy
@@ -8205,7 +8393,7 @@ msgstr ""
 msgid "Scroll down"
 msgstr ""
 
-#: gajim/data/gui/shortcuts_window.ui:100 gajim/gtk/xml_console.py:72
+#: gajim/data/gui/shortcuts_window.ui:100 gajim/gtk/xml_console.py:69
 #, fuzzy
 msgid "Clear"
 msgstr "Вечар"
@@ -8247,8 +8435,9 @@ msgid "Close chat"
 msgstr ""
 
 #: gajim/data/gui/shortcuts_window.ui:173
-msgid "Roster Shortcuts"
-msgstr ""
+#, fuzzy
+msgid "Contact List Shortcuts"
+msgstr "Чалавек адлучыўся"
 
 #: gajim/data/gui/shortcuts_window.ui:196
 #, fuzzy
@@ -8281,7 +8470,7 @@ msgid "Show only active contacts"
 msgstr "Паказаць _адлучаных людзей"
 
 #: gajim/data/gui/shortcuts_window.ui:251
-msgid "Enable roster filtering"
+msgid "Enable contact list filtering"
 msgstr ""
 
 #: gajim/data/gui/shortcuts_window.ui:259
@@ -8327,12 +8516,12 @@ msgid "Search selected day only"
 msgstr ""
 
 #: gajim/data/gui/history_window.ui:317
-msgid "Record history for this chat"
+msgid "Store history for this chat"
 msgstr ""
 
 #: gajim/data/gui/history_window.ui:332
 #, fuzzy
-msgid "Record History"
+msgid "Store History"
 msgstr "Нядаўна:"
 
 #: gajim/data/gui/history_window.ui:350
@@ -8353,9 +8542,10 @@ msgstr "Стварыць новы допіс"
 msgid "Fill in the form."
 msgstr "Запоўніце форму."
 
-#: gajim/data/gui/data_form_window.ui:229
-msgid "Room Configuration"
-msgstr "Настаўленні пакоя"
+#: gajim/data/gui/data_form_window.ui:229 gajim/gtk/groupchat_config.py:41
+#, fuzzy
+msgid "Group Chat Configuration"
+msgstr "Запрашэнне ў групавую размову"
 
 #: gajim/data/gui/roster_item_exchange_window.ui:39
 #: gajim/gtk/roster_item_exchange.py:35
@@ -8377,15 +8567,15 @@ msgstr "Ст_ан"
 msgid "_Start Chat..."
 msgstr "_Пачаць размову"
 
-#: gajim/data/gui/systray_context_menu.ui:50
+#: gajim/data/gui/systray_context_menu.ui:43
 msgid "Show All Pending _Events"
 msgstr "Паказаць нягледжаныя _падзеі"
 
-#: gajim/data/gui/systray_context_menu.ui:59
+#: gajim/data/gui/systray_context_menu.ui:52
 msgid "Mute Sounds"
 msgstr "Адключыць гукі"
 
-#: gajim/data/gui/systray_context_menu.ui:75
+#: gajim/data/gui/systray_context_menu.ui:68
 #, fuzzy
 msgid "_Preferences"
 msgstr "Уласцівасці"
@@ -8478,34 +8668,34 @@ msgstr ""
 msgid "Execute expression inside a shell, send output"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:45
+#: gajim/command_system/implementation/standard.py:47
 msgid ""
 "Show help on a given command or a list of available commands if -a is given"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:73
+#: gajim/command_system/implementation/standard.py:75
 #, fuzzy
 msgid "Send a message to the contact"
 msgstr "Карыстанне: /%s, хавае кнопкі размовы."
 
-#: gajim/command_system/implementation/standard.py:78
+#: gajim/command_system/implementation/standard.py:80
 msgid "Send action (in the third person) to the current chat"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:83
+#: gajim/command_system/implementation/standard.py:85
 msgid "Show logged messages which mention given text"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:88
+#: gajim/command_system/implementation/standard.py:90
 #, fuzzy, python-format
 msgid "%s: Nothing found"
 msgstr "%s не знойдзены"
 
-#: gajim/command_system/implementation/standard.py:94
+#: gajim/command_system/implementation/standard.py:96
 msgid "Limit must be an integer"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:118
+#: gajim/command_system/implementation/standard.py:120
 msgid ""
 "\n"
 "    Set the current status\n"
@@ -8515,131 +8705,131 @@ msgid ""
 "    "
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:136
+#: gajim/command_system/implementation/standard.py:138
 msgid "Set the current status to away"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:150
+#: gajim/command_system/implementation/standard.py:152
 msgid "Set the current status to online"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:153
+#: gajim/command_system/implementation/standard.py:155
 #, fuzzy
 msgid "Available"
 msgstr "_Тут"
 
-#: gajim/command_system/implementation/standard.py:173
-#: gajim/command_system/implementation/standard.py:250
+#: gajim/command_system/implementation/standard.py:175
+#: gajim/command_system/implementation/standard.py:252
 #, fuzzy
 msgid "Clear the text window"
 msgstr "Карыстанне: /%s, прыбірае тэкст у вакне."
 
-#: gajim/command_system/implementation/standard.py:178
-#: gajim/command_system/implementation/standard.py:397
+#: gajim/command_system/implementation/standard.py:180
+#: gajim/command_system/implementation/standard.py:401
 #, fuzzy
 msgid "Send a ping to the contact"
 msgstr "Адправіць файл чалавеку"
 
-#: gajim/command_system/implementation/standard.py:181
-#: gajim/command_system/implementation/standard.py:400
+#: gajim/command_system/implementation/standard.py:183
+#: gajim/command_system/implementation/standard.py:404
 msgid "Command is not supported for zeroconf accounts"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:185
-msgid "Send DTMF sequence through an open audio session"
+#: gajim/command_system/implementation/standard.py:187
+msgid "Send DTMF sequence through an open voice chat"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:188
+#: gajim/command_system/implementation/standard.py:190
 #, fuzzy
-msgid "No open audio sessions with the contact"
+msgid "No open voice chats with the contact"
 msgstr "Пстрыкніце, каб праглядзець былыя размовы з гэтым чалавекам"
 
-#: gajim/command_system/implementation/standard.py:191
+#: gajim/command_system/implementation/standard.py:193
 #, python-format
 msgid "%s is not a valid tone"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:198
-msgid "Toggle audio session"
+#: gajim/command_system/implementation/standard.py:200
+msgid "Toggle Voice Chat"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:201
+#: gajim/command_system/implementation/standard.py:203
 #, fuzzy
-msgid "Audio sessions are not available"
+msgid "Voice chats are not available"
 msgstr "Няма злучэння"
 
-#: gajim/command_system/implementation/standard.py:208
-msgid "Toggle video session"
+#: gajim/command_system/implementation/standard.py:210
+msgid "Toggle Video Chat"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:211
+#: gajim/command_system/implementation/standard.py:213
 #, fuzzy
-msgid "Video sessions are not available"
+msgid "Video chats are not available"
 msgstr "Няма злучэння"
 
-#: gajim/command_system/implementation/standard.py:218
+#: gajim/command_system/implementation/standard.py:220
 #, fuzzy
 msgid "Send a message to the contact that will attract their attention"
 msgstr "Карыстанне: /%s, хавае кнопкі размовы."
 
-#: gajim/command_system/implementation/standard.py:255
+#: gajim/command_system/implementation/standard.py:257
 #, fuzzy
 msgid "Change your nickname in a group chat"
 msgstr "Змяніць м_янушку"
 
-#: gajim/command_system/implementation/standard.py:260 gajim/gtk/dialogs.py:674
-#: gajim/gtk/bookmarks.py:272
+#: gajim/command_system/implementation/standard.py:262
 #, fuzzy
 msgid "Invalid nickname"
 msgstr "Няправільнае імя карыстальніка"
 
-#: gajim/command_system/implementation/standard.py:267
+#: gajim/command_system/implementation/standard.py:269
 #, fuzzy
-msgid "Open a private chat window with a specified occupant"
+msgid "Open a private chat window with a specified participant"
 msgstr ""
 "Карыстанне: /%s <мянушка>, адкрывае вакно прыватнай размовы з чалавекам."
 
-#: gajim/command_system/implementation/standard.py:273
-#: gajim/command_system/implementation/standard.py:282
-#: gajim/command_system/implementation/standard.py:332
-#: gajim/command_system/implementation/standard.py:345
-#: gajim/command_system/implementation/standard.py:357
+#: gajim/command_system/implementation/standard.py:275
+#: gajim/command_system/implementation/standard.py:284
+#: gajim/command_system/implementation/standard.py:336
+#: gajim/command_system/implementation/standard.py:349
+#: gajim/command_system/implementation/standard.py:361
 #, fuzzy
 msgid "Nickname not found"
 msgstr "Мянушка не знойдзеная: %s"
 
-#: gajim/command_system/implementation/standard.py:276
+#: gajim/command_system/implementation/standard.py:278
 #, fuzzy
 msgid ""
-"Open a private chat window with a specified occupant and send him a message"
+"Open a private chat window with a specified participant and send him a "
+"message"
 msgstr ""
 "Карыстанне: /%s <мянушка>, адкрывае вакно прыватнай размовы з чалавекам."
 
-#: gajim/command_system/implementation/standard.py:285
+#: gajim/command_system/implementation/standard.py:287
 #, fuzzy
 msgid "Display or change a group chat topic"
 msgstr "Пытацца пацверджання закрыцця групавой размовы."
 
-#: gajim/command_system/implementation/standard.py:294
-msgid "Invite a user to a room for a reason"
+#: gajim/command_system/implementation/standard.py:296
+msgid "Invite a user to a group chat for a reason"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:297
+#: gajim/command_system/implementation/standard.py:299
 #, fuzzy, python-format
 msgid "Invited %(jid)s to %(room_jid)s"
 msgstr "%(contact_jid)s запрошаныя ў %(room_jid)s."
 
-#: gajim/command_system/implementation/standard.py:301
+#: gajim/command_system/implementation/standard.py:303
 #, fuzzy
-msgid "Join a group chat given by a JID"
+msgid "Join a group chat given by an XMPP Address"
 msgstr "Удзельнічаць у _групавой размове"
 
-#: gajim/command_system/implementation/standard.py:309
+#: gajim/command_system/implementation/standard.py:313
 msgid ""
-"Leave the groupchat, optionally giving a reason, and close tab or window"
+"Leave the group chat, optionally giving a reason, and close tab or window"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:314
+#: gajim/command_system/implementation/standard.py:318
 msgid ""
 "\n"
 "    Ban user by a nick or a JID from a groupchat\n"
@@ -8648,46 +8838,46 @@ msgid ""
 "    "
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:329
+#: gajim/command_system/implementation/standard.py:333
 #, fuzzy
-msgid "Kick user by a nick from a groupchat"
+msgid "Kick user by a nick from a group chat"
 msgstr "Вы не ўвайшлі ў пакой групавой размовы."
 
-#: gajim/command_system/implementation/standard.py:338
+#: gajim/command_system/implementation/standard.py:342
 msgid ""
-"Set occupant role in group chat.\n"
+"Set participant role in group chat.\n"
 "    Role can be given as one of the following values:\n"
 "    moderator, participant, visitor, none"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:343
+#: gajim/command_system/implementation/standard.py:347
 #, fuzzy
 msgid "Invalid role given"
 msgstr "Няправільнае імя карыстальніка"
 
-#: gajim/command_system/implementation/standard.py:350
+#: gajim/command_system/implementation/standard.py:354
 msgid ""
-"Set occupant affiliation in group chat.\n"
+"Set participant affiliation in group chat.\n"
 "    Affiliation can be given as one of the following values:\n"
 "    owner, admin, member, outcast, none"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:355
+#: gajim/command_system/implementation/standard.py:359
 #, fuzzy
 msgid "Invalid affiliation given"
 msgstr "Адносіны: "
 
-#: gajim/command_system/implementation/standard.py:365
+#: gajim/command_system/implementation/standard.py:369
 #, fuzzy
-msgid "Display names of all group chat occupants"
+msgid "Display names of all group chat participants"
 msgstr "Карыстанне: /%s, хавае кнопкі групавой размовы."
 
-#: gajim/command_system/implementation/standard.py:387
-msgid "Forbid an occupant to send you public or private messages"
+#: gajim/command_system/implementation/standard.py:391
+msgid "Forbid a participant to send you public or private messages"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:392
-msgid "Allow an occupant to send you public or private messages"
+#: gajim/command_system/implementation/standard.py:396
+msgid "Allow a participant to send you public or private messages"
 msgstr ""
 
 #: gajim/command_system/implementation/middleware.py:74
@@ -8698,204 +8888,330 @@ msgstr ""
 msgid "The same as using a doc-string, except it supports translation"
 msgstr ""
 
-#: gajim/gtk/filetransfer.py:91
+#: gajim/gtk/groupchat_info.py:36
+#, fuzzy
+msgid "?Group chat feature:Archiving"
+msgstr "Запрашэнне ў групавую размову"
+
+#: gajim/gtk/groupchat_info.py:37
+#, fuzzy
+msgid "Messages are archived on the server"
+msgstr "Вы не злучаны з серверам"
+
+#: gajim/gtk/groupchat_info.py:40
+#, fuzzy
+msgid "?Group chat feature:Persistent"
+msgstr "Групавыя размовы"
+
+#: gajim/gtk/groupchat_info.py:41
+msgid "This group chat persists even if there are no participants"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:45
+#, fuzzy
+msgid "?Group chat feature:Temporary"
+msgstr "?Роля чалавека:Няма"
+
+#: gajim/gtk/groupchat_info.py:46
+msgid "This group chat will be destroyed once the last participant left"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:50
+#, fuzzy
+msgid "?Group chat feature:Moderated"
+msgstr "?Роля чалавека:Няма"
+
+#: gajim/gtk/groupchat_info.py:51
+msgid ""
+"Participants entering this group chat need to request permission to send "
+"messages"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:55
+#, fuzzy
+msgid "?Group chat feature:Not Moderated"
+msgstr "Групавыя размовы"
+
+#: gajim/gtk/groupchat_info.py:56
+msgid "Participants entering this group chat are allowed to send messages"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:60
+#, fuzzy
+msgid "?Group chat feature:Open"
+msgstr "?Роля чалавека:Няма"
+
+#: gajim/gtk/groupchat_info.py:61
+#, fuzzy
+msgid "Anyone can join this group chat"
+msgstr "%s далучыўся да групавой размовы"
+
+#: gajim/gtk/groupchat_info.py:64
+#, fuzzy
+msgid "?Group chat feature:Members Only"
+msgstr "Фарбаванае паведамленне ў групавой размове"
+
+#: gajim/gtk/groupchat_info.py:65
+msgid "This group chat is restricted to members only"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:69
+#, fuzzy
+msgid "?Group chat feature:Public"
+msgstr "Фарбаванае паведамленне ў групавой размове"
+
+#: gajim/gtk/groupchat_info.py:70
+msgid "Group chat can be found via search"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:73
+#, fuzzy
+msgid "?Group chat feature:Hidden"
+msgstr "?Роля чалавека:Няма"
+
+#: gajim/gtk/groupchat_info.py:74
+#, fuzzy
+msgid "This group chat can not be found via search"
+msgstr "Для гэтай групавой размовы не вызначаная тэма размовы"
+
+#: gajim/gtk/groupchat_info.py:77
+#, fuzzy
+msgid "?Group chat feature:Not Anonymous"
+msgstr "Групавыя размовы"
+
+#: gajim/gtk/groupchat_info.py:78
+msgid "All other group chat participants can see your XMPP address"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:82
+#, fuzzy
+msgid "?Group chat feature:Semi-Anonymous"
+msgstr "Фарбаванае паведамленне ў групавой размове"
+
+#: gajim/gtk/groupchat_info.py:83
+msgid "Only moderators can see your XMPP address"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:86
+#, fuzzy
+msgid "?Group chat feature:Password Required"
+msgstr "Групавыя размовы"
+
+#: gajim/gtk/groupchat_info.py:87
+msgid "This group chat does require a password upon entry"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:91
+#, fuzzy
+msgid "?Group chat feature:No Password Required"
+msgstr "Групавыя размовы"
+
+#: gajim/gtk/groupchat_info.py:92
+msgid "This group chat does not require a password upon entry"
+msgstr ""
+
+#: gajim/gtk/filetransfer.py:90
 msgid "File"
 msgstr "Файл"
 
-#: gajim/gtk/filetransfer.py:108
+#: gajim/gtk/filetransfer.py:107
 msgid "Time"
 msgstr "Час"
 
-#: gajim/gtk/filetransfer.py:228
+#: gajim/gtk/filetransfer.py:227
 #, fuzzy, python-format
 msgid "File name: %s"
 msgstr "Файл: %s"
 
-#: gajim/gtk/filetransfer.py:229 gajim/gtk/filetransfer.py:464
+#: gajim/gtk/filetransfer.py:228 gajim/gtk/filetransfer.py:469
 #, python-format
 msgid "Size: %s"
 msgstr "Памер: %s"
 
-#: gajim/gtk/filetransfer.py:239
+#: gajim/gtk/filetransfer.py:238
 #, python-format
 msgid "Sender: %s"
 msgstr "Адпраўнік: %s"
 
-#: gajim/gtk/filetransfer.py:240 gajim/gtk/filetransfer.py:744
+#: gajim/gtk/filetransfer.py:239 gajim/gtk/filetransfer.py:749
 #: gajim/gtk/tooltips.py:577
 msgid "Recipient: "
 msgstr "Атрымальнік: "
 
-#: gajim/gtk/filetransfer.py:251
+#: gajim/gtk/filetransfer.py:250
 #, python-format
 msgid "Saved in: %s"
 msgstr "Захаваць у: %s"
 
-#: gajim/gtk/filetransfer.py:256
+#: gajim/gtk/filetransfer.py:255
 msgid "File transfer completed"
 msgstr "Перадача файла скончаная"
 
-#: gajim/gtk/filetransfer.py:276 gajim/gtk/filetransfer.py:285
+#: gajim/gtk/filetransfer.py:275 gajim/gtk/filetransfer.py:284
 #, fuzzy
 msgid "Connection with peer could not be established."
 msgstr "Немагчыма ўсталяваць злучэнне з атрымальнікам."
 
-#: gajim/gtk/filetransfer.py:293
+#: gajim/gtk/filetransfer.py:292
 #, python-format
 msgid "Filename: %s"
 msgstr "Файл: %s"
 
-#: gajim/gtk/filetransfer.py:294
+#: gajim/gtk/filetransfer.py:293
 #, python-format
 msgid "Recipient: %s"
 msgstr "Атрымальнік: %s"
 
-#: gajim/gtk/filetransfer.py:296
+#: gajim/gtk/filetransfer.py:295
 #, python-format
 msgid "Error message: %s"
 msgstr "Памылка: %s"
 
-#: gajim/gtk/filetransfer.py:333
-#, fuzzy
-msgid "File transfer error"
-msgstr "Памылка перадачы файла"
-
 #: gajim/gtk/filetransfer.py:334
 #, python-format
 msgid ""
-"The file %(file)s has been received, but it seems to have been damaged along "
-"the way.\n"
+"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 ""
 
-#: gajim/gtk/filetransfer.py:350
+#: gajim/gtk/filetransfer.py:340
+#, fuzzy
+msgid "_Download Again"
+msgstr "_Больш не пытацца"
+
+#: gajim/gtk/filetransfer.py:355
 #, fuzzy
 msgid "Gajim can not read this file"
 msgstr "Gajim не можа даступіцца да гэтага файла"
 
-#: gajim/gtk/filetransfer.py:351
+#: gajim/gtk/filetransfer.py:356
 msgid "Another process is using this file."
 msgstr ""
 
-#: gajim/gtk/filetransfer.py:418
+#: gajim/gtk/filetransfer.py:423
 #, fuzzy
 msgid "File Transfer Conflict"
 msgstr "Перадача файла скончаная"
 
-#: gajim/gtk/filetransfer.py:419
+#: gajim/gtk/filetransfer.py:424
 msgid "This file already exists"
 msgstr "Такі файл ужо ёсць"
 
-#: gajim/gtk/filetransfer.py:420
+#: gajim/gtk/filetransfer.py:425
 msgid "Resume download or replace file?"
 msgstr ""
 
-#: gajim/gtk/filetransfer.py:424
+#: gajim/gtk/filetransfer.py:429
 #, fuzzy
 msgid "Replace _File"
 msgstr "Вечар"
 
-#: gajim/gtk/filetransfer.py:427
+#: gajim/gtk/filetransfer.py:432
 #, fuzzy
 msgid "Resume _Download"
 msgstr "Сцягнуць"
 
-#: gajim/gtk/filetransfer.py:437
+#: gajim/gtk/filetransfer.py:442
 #, fuzzy, python-format
 msgid "Directory '%s' is not writable"
 msgstr "Немагчыма запісваць файлы ў дырэкторыю \"%s\""
 
-#: gajim/gtk/filetransfer.py:438
+#: gajim/gtk/filetransfer.py:443
 #, fuzzy
 msgid "You do not have permissions to create files in this directory."
 msgstr "Вы не маеце права ствараць файлы ў гэтай дырэкторыі."
 
-#: gajim/gtk/filetransfer.py:461
+#: gajim/gtk/filetransfer.py:466
 #, python-format
 msgid "File: %s"
 msgstr "Файл: %s"
 
-#: gajim/gtk/filetransfer.py:467
+#: gajim/gtk/filetransfer.py:472
 #, python-format
 msgid "Type: %s"
 msgstr "Тып: %s"
 
-#: gajim/gtk/filetransfer.py:469
+#: gajim/gtk/filetransfer.py:474
 #, python-format
 msgid "Description: %s"
 msgstr "Апісанне: %s"
 
-#: gajim/gtk/filetransfer.py:480
+#: gajim/gtk/filetransfer.py:485
 #, fuzzy, python-format
 msgid "%s wants to send you a file"
 msgstr "%s хоча адправіць Вам файл."
 
-#: gajim/gtk/filetransfer.py:509
+#: gajim/gtk/filetransfer.py:514
 #, fuzzy
 msgid "Checking file…"
 msgstr "Адпраўленне профіля..."
 
-#: gajim/gtk/filetransfer.py:524
+#: gajim/gtk/filetransfer.py:529
 #, fuzzy
 msgid "File error"
 msgstr "Памылка перадачы файла"
 
-#: gajim/gtk/filetransfer.py:561
+#: gajim/gtk/filetransfer.py:566
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 
-#: gajim/gtk/filetransfer.py:658
+#: gajim/gtk/filetransfer.py:663
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/с)"
 
-#: gajim/gtk/filetransfer.py:711 gajim/gtk/filetransfer.py:715
+#: gajim/gtk/filetransfer.py:716 gajim/gtk/filetransfer.py:720
 msgid "Invalid File"
 msgstr "Няправільны файл"
 
-#: gajim/gtk/filetransfer.py:711
+#: gajim/gtk/filetransfer.py:716
 msgid "File: "
 msgstr "Файл: "
 
-#: gajim/gtk/filetransfer.py:716
+#: gajim/gtk/filetransfer.py:721
 msgid "It is not possible to send empty files"
 msgstr "Немагчыма адправіць пусты файл"
 
-#: gajim/gtk/filetransfer.py:742 gajim/gtk/tooltips.py:571
+#: gajim/gtk/filetransfer.py:747 gajim/gtk/tooltips.py:571
 msgid "Sender: "
 msgstr "Адпраўнік:"
 
-#: gajim/gtk/filetransfer.py:1038
+#: gajim/gtk/filetransfer.py:1043
 #, fuzzy
 msgid "Choose a File to Send…"
 msgstr "Выберыце файл..."
 
 #: gajim/gtk/start_chat.py:51
 #, fuzzy
-msgid "Start new Conversation"
+msgid "Start New Conversation"
 msgstr "Злучэнне"
 
-#: gajim/gtk/start_chat.py:424
-#, fuzzy
-msgid "New Groupchat"
-msgstr "Новая групавая размова"
+#: gajim/gtk/start_chat.py:260 gajim/gtk/start_chat.py:328
+msgid "You can not join a group chat unless you are connected."
+msgstr ""
+"Вы не можаце ўдзельнічаць у групавой размове, не злучыўшыся з серверам."
 
-#: gajim/gtk/start_chat.py:426
+#: gajim/gtk/start_chat.py:603 gajim/gtk/groupchat_join.py:38
+msgid "Join Group Chat"
+msgstr "Удзельнічаць у групавой размове"
+
+#: gajim/gtk/start_chat.py:605 gajim/gtk/add_contact.py:40
 #, fuzzy
-msgid "New Contact"
-msgstr "Дадаць новага чалавека"
+msgid "Add Contact"
+msgstr "_Дадаць чалавека..."
 
-#: gajim/gtk/start_chat.py:588
+#: gajim/gtk/start_chat.py:746
 #, fuzzy, python-format
-msgid "%s Group chats found"
+msgid "%s group chats found"
 msgstr "%s не знойдзены"
 
-#: gajim/gtk/discovery.py:70
+#: gajim/gtk/discovery.py:69
 msgid "This service has not yet responded with detailed information"
 msgstr "Гэты сервіс яшчэ не адказаў на запыт падрабязных звестак"
 
-#: gajim/gtk/discovery.py:71
+#: gajim/gtk/discovery.py:70
 #, fuzzy
 msgid ""
 "This service could not respond with detailed information.\n"
@@ -8904,33 +9220,34 @@ msgstr ""
 "Гэты сервіс не дае падрабязных звестак.\n"
 "Хутчэй за ўсё, гэты сервіс састарэлы ці зламаны"
 
-#: gajim/gtk/discovery.py:128
+#: gajim/gtk/discovery.py:126
 msgid "Others"
 msgstr "Іншыя"
 
-#: gajim/gtk/discovery.py:131
-msgid "Conference"
-msgstr "Канферэнцыі"
+#: gajim/gtk/discovery.py:129
+#, fuzzy
+msgid "Group Chat"
+msgstr "_Групавая размова"
 
-#: gajim/gtk/discovery.py:519
+#: gajim/gtk/discovery.py:518
 msgid "Without a connection, you can not browse available services"
 msgstr ""
 "Вы не можаце праглядзець спіс даступных сервісаў, не злучыўшыся з серверам."
 
-#: gajim/gtk/discovery.py:606
+#: gajim/gtk/discovery.py:605
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Пошук сервісаў для рахунка %s"
 
-#: gajim/gtk/discovery.py:608
+#: gajim/gtk/discovery.py:607
 msgid "Service Discovery"
 msgstr "Пошук сервісаў"
 
-#: gajim/gtk/discovery.py:691
+#: gajim/gtk/discovery.py:690
 msgid "The service could not be found"
 msgstr "Немагчыма знайсці сервіс"
 
-#: gajim/gtk/discovery.py:692
+#: gajim/gtk/discovery.py:691
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -8938,104 +9255,82 @@ msgstr ""
 "Па вызначаным адрасе няма сервісаў, альбо яны не адказваюць на запыты. "
 "Праверце адрас і паспрабуйце зноў."
 
-#: gajim/gtk/discovery.py:699 gajim/gtk/discovery.py:1042
+#: gajim/gtk/discovery.py:698 gajim/gtk/discovery.py:1041
 msgid "The service is not browsable"
 msgstr "Немагчыма праглядзець сервіс"
 
-#: gajim/gtk/discovery.py:700
+#: gajim/gtk/discovery.py:699
 msgid "This type of service does not contain any items to browse."
 msgstr "Гэты сервіс не ўтрымлівае ў сабе элементаў."
 
-#: gajim/gtk/discovery.py:738 gajim/gtk/discovery.py:747
+#: gajim/gtk/discovery.py:737 gajim/gtk/discovery.py:746
 #, fuzzy
 msgid "Invalid Server Name"
 msgstr "Няправільнае імя карыстальніка"
 
-#: gajim/gtk/discovery.py:806
+#: gajim/gtk/discovery.py:805
 #, fuzzy, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Прагляд %s для рахунка %s"
 
-#: gajim/gtk/discovery.py:851
+#: gajim/gtk/discovery.py:850
 #, fuzzy
 msgid "Browse"
 msgstr "_Праглядзець"
 
-#: gajim/gtk/discovery.py:1043
+#: gajim/gtk/discovery.py:1042
 msgid "This service does not contain any items to browse."
 msgstr "Гэты сервіс не ўтрымлівае ў сабе элементаў, якія можна праглядзець."
 
-#: gajim/gtk/discovery.py:1255
+#: gajim/gtk/discovery.py:1254
 #, fuzzy
 msgid "_Command"
 msgstr "Загады: %s"
 
-#: gajim/gtk/discovery.py:1264 gajim/gtk/discovery.py:1422
+#: gajim/gtk/discovery.py:1263 gajim/gtk/discovery.py:1420
 msgid "Re_gister"
 msgstr "Зарэ_гістравацца"
 
-#: gajim/gtk/discovery.py:1277
+#: gajim/gtk/discovery.py:1276
 msgid "_Search"
 msgstr "П_ошук"
 
-#: gajim/gtk/discovery.py:1420
+#: gajim/gtk/discovery.py:1418
 msgid "_Edit"
 msgstr "_Змяніць"
 
-#: gajim/gtk/discovery.py:1458
+#: gajim/gtk/discovery.py:1456
 #, fuzzy, python-format
 msgid "Scanning %(current)d / %(total)d ..."
 msgstr "Пошук у %d / %d.."
 
-#: gajim/gtk/discovery.py:1674
+#: gajim/gtk/discovery.py:1655
+msgid "Users"
+msgstr "Карыстальнікі"
+
+#: gajim/gtk/discovery.py:1671
 msgid "Id"
 msgstr "Id"
 
-#: gajim/gtk/discovery.py:1713
-msgid "_Join"
-msgstr "_Далучыцца"
-
-#: gajim/gtk/discovery.py:1736
-msgid "Bookmark already set"
-msgstr "Закладка ўжо ўсталяваная"
-
-#: gajim/gtk/discovery.py:1737
-#, fuzzy, python-format
-msgid "Group Chat '%s' is already in your bookmarks."
-msgstr "Групавая размова \"%s\" ужо знаходзіцца ў Вашых закладках."
-
-#: gajim/gtk/discovery.py:1748
-msgid "Bookmark has been added successfully"
-msgstr "Закладка паспяхова дададзеная"
-
-#: gajim/gtk/discovery.py:1749
-#, fuzzy
-msgid ""
-"You can manage your bookmarks by clicking the Bookmarks menu item in your "
-"contact list."
-msgstr ""
-"Вы можаце рэдагаваць спіс Вашых закладак праз меню \"Дзеянні\" галоўнага "
-"вакна."
-
-#: gajim/gtk/discovery.py:1950
+#: gajim/gtk/discovery.py:1900
 msgid "Subscribed"
 msgstr "Падпісаны"
 
-#: gajim/gtk/discovery.py:1959
+#: gajim/gtk/discovery.py:1909
 #, fuzzy
 msgid "Node"
 msgstr "Ніякі"
 
-#: gajim/gtk/discovery.py:2028
+#: gajim/gtk/discovery.py:1978
 #, fuzzy
 msgid "_New post"
 msgstr "Новы допіс"
 
-#: gajim/gtk/discovery.py:2037
+#: gajim/gtk/discovery.py:1987
 msgid "_Subscribe"
 msgstr "Падп_ісацца"
 
-#: gajim/gtk/discovery.py:2045
+#: gajim/gtk/discovery.py:1995
 msgid "_Unsubscribe"
 msgstr "_Адпісацца"
 
@@ -9083,7 +9378,7 @@ msgstr "Я %s"
 msgid "Characters typed: %s"
 msgstr "Такая мянушка не дазволеная: %s"
 
-#: gajim/gtk/single_message.py:274 gajim/gtk/xml_console.py:169
+#: gajim/gtk/single_message.py:274 gajim/gtk/xml_console.py:166
 msgid "Connection not available"
 msgstr "Няма злучэння"
 
@@ -9092,6 +9387,12 @@ msgstr "Няма злучэння"
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Праверце злучэнне з \"%s\"."
 
+#: gajim/gtk/single_message.py:306
+#, 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:330
 #, python-format
 msgid "RE: %s"
@@ -9102,28 +9403,28 @@ msgstr "RE: %s"
 msgid "%s wrote:\n"
 msgstr "%s сказаў:\n"
 
-#: gajim/gtk/pep_config.py:44
+#: gajim/gtk/pep_config.py:45
 #, fuzzy, python-format
 msgid "PEP Service Configuration (%s)"
 msgstr "Настаўленні пакоя"
 
-#: gajim/gtk/pep_config.py:77
+#: gajim/gtk/pep_config.py:78
 #, fuzzy
 msgid "Service"
 msgstr "Сервер"
 
-#: gajim/gtk/pep_config.py:114
+#: gajim/gtk/pep_config.py:115
 msgid "PEP node was not removed"
 msgstr ""
 
-#: gajim/gtk/pep_config.py:115
+#: gajim/gtk/pep_config.py:116
 #, python-format
 msgid ""
 "PEP node %(node)s was not removed:\n"
 "%(message)s"
 msgstr ""
 
-#: gajim/gtk/pep_config.py:146
+#: gajim/gtk/pep_config.py:147
 #, fuzzy, python-format
 msgid "Configure %s"
 msgstr "_Працягнуць"
@@ -9139,17 +9440,22 @@ msgstr "_Рэгістрацыя"
 msgid "Registration successful"
 msgstr "Зарэгістравацца на %s"
 
-#: gajim/gtk/dialogs.py:54 gajim/gtk/dataform.py:659 gajim/gtk/adhoc.py:85
+#: gajim/gtk/service_registration.py:215
+#, fuzzy
+msgid "Registration failed"
+msgstr "Памылка злучэння"
+
+#: gajim/gtk/dialogs.py:53 gajim/gtk/dataform.py:668 gajim/gtk/adhoc.py:86
 #, fuzzy
 msgid "Cancel"
 msgstr "_Скасаваць"
 
-#: gajim/gtk/dialogs.py:129
+#: gajim/gtk/dialogs.py:128
 #, fuzzy, python-format
 msgid "Dictionary for language \"%s\" not available"
 msgstr "Слоўніка для мовы %s няма"
 
-#: gajim/gtk/dialogs.py:130
+#: gajim/gtk/dialogs.py:129
 #, fuzzy, python-format
 msgid ""
 "You have to install the dictionary \"%s\" to use spellchecking, or choose "
@@ -9160,12 +9466,12 @@ msgstr ""
 "Вы павінны ўсталяваць слоўнік %s, каб спраўджваць правапіс, альбо выбраць "
 "іншую мову праз опцыю speller_language."
 
-#: gajim/gtk/dialogs.py:410 gajim/gtk/dialogs.py:425
+#: gajim/gtk/dialogs.py:322 gajim/gtk/dialogs.py:337
 #, fuzzy
 msgid "Insecure connection"
 msgstr "Злучэнне"
 
-#: gajim/gtk/dialogs.py:411
+#: gajim/gtk/dialogs.py:323
 #, fuzzy, python-format
 msgid ""
 "You are about to connect to the account %(account)s (%(server)s) insecurely. "
@@ -9174,120 +9480,115 @@ msgid ""
 "Are you sure you want to do that?"
 msgstr "Вы ствараеце мета-кантакт. Вы сапраўды хочаце працягнуць?"
 
-#: gajim/gtk/dialogs.py:416
+#: gajim/gtk/dialogs.py:328
 msgid "Yes, I really want to connect insecurely"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:417
+#: gajim/gtk/dialogs.py:329
 msgid "Gajim will NOT connect unless you check this box"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:675
-#, fuzzy
-msgid "The nickname contains invalid characters."
-msgstr "Jabber ID групавой размовы ўтрымлівае няправільныя знакі."
-
-#: gajim/gtk/dialogs.py:734
+#: gajim/gtk/dialogs.py:561
 #, fuzzy, python-format
 msgid "Destroy %s"
 msgstr "Апісанне: %s"
 
-#: gajim/gtk/dialogs.py:775
+#: gajim/gtk/dialogs.py:602
 #, fuzzy
 msgid "Certificate"
 msgstr "Няправільнае імя карыстальніка"
 
-#: gajim/gtk/dialogs.py:786
+#: gajim/gtk/dialogs.py:613
 #, fuzzy, python-format
 msgid ""
 "Certificate for account\n"
 "%s"
 msgstr "для рахунка %s"
 
-#: gajim/gtk/dialogs.py:824
+#: gajim/gtk/dialogs.py:651
 msgid "Issued to\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:825 gajim/gtk/dialogs.py:830
+#: gajim/gtk/dialogs.py:652 gajim/gtk/dialogs.py:657
 msgid "Common Name (CN): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:826 gajim/gtk/dialogs.py:831
+#: gajim/gtk/dialogs.py:653 gajim/gtk/dialogs.py:658
 msgid "Organization (O): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:827 gajim/gtk/dialogs.py:832
+#: gajim/gtk/dialogs.py:654 gajim/gtk/dialogs.py:659
 msgid "Organizational Unit (OU): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:828
+#: gajim/gtk/dialogs.py:655
 #, fuzzy
 msgid "Serial Number: "
 msgstr "Нумар GG:"
 
-#: gajim/gtk/dialogs.py:829
+#: gajim/gtk/dialogs.py:656
 msgid "Issued by\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:833
+#: gajim/gtk/dialogs.py:660
 msgid "Validity\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:834
+#: gajim/gtk/dialogs.py:661
 msgid "Issued on: "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:835
+#: gajim/gtk/dialogs.py:662
 msgid "Expires on: "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:836
+#: gajim/gtk/dialogs.py:663
 msgid "SHA-1:"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:838
+#: gajim/gtk/dialogs.py:665
 msgid "SHA-256:"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:852
+#: gajim/gtk/dialogs.py:679
 #, fuzzy
 msgid "View certificate…"
 msgstr "Няправільнае імя карыстальніка"
 
-#: gajim/gtk/dialogs.py:864 gajim/gtk/accounts.py:893
+#: gajim/gtk/dialogs.py:691 gajim/gtk/accounts.py:896
 msgid "Change Password"
 msgstr "Змяніць пароль"
 
-#: gajim/gtk/dialogs.py:878
+#: gajim/gtk/dialogs.py:705
 msgid "_OK"
 msgstr "_Добра"
 
-#: gajim/gtk/dialogs.py:891
+#: gajim/gtk/dialogs.py:718
 #, fuzzy
 msgid "You must enter a password"
 msgstr "Вы павінны ўвесці пароль."
 
-#: gajim/gtk/dialogs.py:895
+#: gajim/gtk/dialogs.py:722
 msgid "Passwords do not match"
 msgstr "Паролі розняцца"
 
-#: gajim/gtk/dialogs.py:923
+#: gajim/gtk/dialogs.py:750
 #, fuzzy
 msgid "Group Chat Invitation "
 msgstr "Запрашэнне ў групавую размову"
 
-#: gajim/gtk/dialogs.py:948
+#: gajim/gtk/dialogs.py:775
 #, fuzzy, python-format
 msgid "<b>%s</b> has invited you to join a discussion"
 msgstr "$Contact запрасіў Вас у групавую размову %(room_jid)s"
 
-#: gajim/gtk/dialogs.py:951
+#: gajim/gtk/dialogs.py:778
 #, 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:959
+#: gajim/gtk/dialogs.py:786
 #, python-format
 msgid "Comment: %s"
 msgstr "Каментарый: %s"
@@ -9302,11 +9603,6 @@ msgstr "Нумар GG:"
 msgid "ICQ Number"
 msgstr "Нумар ICQ:"
 
-#: gajim/gtk/add_contact.py:40
-#, fuzzy
-msgid "Add Contact"
-msgstr "_Дадаць чалавека..."
-
 #: gajim/gtk/add_contact.py:259
 #, fuzzy, python-format
 msgid "%s Missing"
@@ -9328,7 +9624,7 @@ msgstr "ID карыстальніка не павінны вызначаць р�
 
 #: gajim/gtk/add_contact.py:299
 #, fuzzy
-msgid "You cannot add yourself to your roster."
+msgid "You cannot add yourself to your contact list."
 msgstr "Я хачу дадаць Вас у мой кантактны ліст."
 
 #: gajim/gtk/add_contact.py:304
@@ -9341,11 +9637,13 @@ msgid "Your account must be online to add new contacts."
 msgstr ""
 
 #: gajim/gtk/add_contact.py:321
-msgid "Contact already in roster"
+#, fuzzy
+msgid "Contact Already in Contact List"
 msgstr "Чалавек ужо ёсць у кантактным лісце"
 
 #: gajim/gtk/add_contact.py:322
-msgid "This contact is already listed in your roster."
+#, fuzzy
+msgid "This contact is already in your contact list."
 msgstr "Гэты чалавек ужо ёсць у у кантактным лісце."
 
 #: gajim/gtk/add_contact.py:379 gajim/gtk/add_contact.py:417
@@ -9386,14 +9684,14 @@ msgstr "Змяніць стан"
 
 #: gajim/gtk/themes.py:52
 #, fuzzy
-msgid "MUC Tab New Directed Message"
+msgid "Group Chat Tab New Directed Message"
 msgstr ""
 "Накіраваны MUC\n"
 "Паведамленні"
 
 #: gajim/gtk/themes.py:56
 #, fuzzy
-msgid "MUC Tab New Message"
+msgid "Group Chat Tab New Message"
 msgstr "Новае паведамленне"
 
 #: gajim/gtk/themes.py:60
@@ -9610,13 +9908,13 @@ msgstr "Усе файлы"
 msgid "Clear File"
 msgstr "Вечар"
 
-#: gajim/gtk/settings.py:570
+#: gajim/gtk/settings.py:570 gajim/gtk/proxies.py:32
 #, fuzzy
 msgid "Manage Proxies"
 msgstr "Кіраванне профілямі проксі"
 
-#: gajim/gtk/settings.py:591 gajim/gtk/preferences.py:971
-#: gajim/gtk/preferences.py:984 gajim/gtk/preferences.py:988
+#: gajim/gtk/settings.py:591 gajim/gtk/preferences.py:968
+#: gajim/gtk/preferences.py:982 gajim/gtk/preferences.py:986
 #, fuzzy
 msgid "No Proxy"
 msgstr "Проксі:"
@@ -9696,14 +9994,15 @@ msgid ""
 "        "
 msgstr ""
 
-#: gajim/gtk/about.py:47 data/org.gajim.Gajim.appdata.xml.in:10
+#: gajim/gtk/about.py:47 data/org.gajim.Gajim.desktop.in:6
+#: data/org.gajim.Gajim.appdata.xml.in:10
 #, fuzzy
-msgid "A GTK+ XMPP client"
+msgid "A GTK XMPP client"
 msgstr "Jabber-праграма для GTK+"
 
 #: gajim/gtk/about.py:48
 #, fuzzy, python-format
-msgid "GTK+ Version: %s"
+msgid "GTK Version: %s"
 msgstr "Версія GTK+:"
 
 #: gajim/gtk/about.py:49
@@ -9885,6 +10184,25 @@ msgstr "?transfer status:Прыпыненая"
 msgid "?transfer status:Not started"
 msgstr "?transfer status:Прыпыненая"
 
+#: gajim/gtk/groupchat_creation.py:97 gajim/gtk/groupchat_creation.py:99
+msgid " (optional)..."
+msgstr ""
+
+#: gajim/gtk/groupchat_creation.py:134
+#, fuzzy
+msgid "Invalid Address"
+msgstr "Няправільны файл"
+
+#: gajim/gtk/groupchat_creation.py:182
+#, fuzzy
+msgid "Not Connected"
+msgstr "Злучэнне"
+
+#: gajim/gtk/groupchat_creation.py:183
+#, fuzzy
+msgid "You have to be connected to create a group chat."
+msgstr "Вы не ўвайшлі ў пакой групавой размовы."
+
 #: gajim/gtk/sounds.py:39
 msgid "Wav Sounds"
 msgstr "Файлы Wav"
@@ -9928,50 +10246,45 @@ msgstr "Фарбаванае паведамленне ў групавой раз
 msgid "Group Chat Message Received"
 msgstr "Новае паведамленне ў групавой размове"
 
-#: gajim/gtk/dataform.py:226 gajim/gtk/dataform.py:262
+#: gajim/gtk/dataform.py:232 gajim/gtk/dataform.py:268
 #, fuzzy
 msgid "Required"
 msgstr "Патрабуецца пароль"
 
-#: gajim/gtk/dataform.py:286
+#: gajim/gtk/dataform.py:293
 msgid "Yes"
 msgstr ""
 
-#: gajim/gtk/dataform.py:286
+#: gajim/gtk/dataform.py:293
 #, fuzzy
 msgid "No"
 msgstr "Ніякі"
 
-#: gajim/gtk/dataform.py:661
+#: gajim/gtk/dataform.py:670
 msgid "Submit"
 msgstr ""
 
-#: gajim/gtk/statusicon.py:213
+#: gajim/gtk/statusicon.py:206
 #, fuzzy
 msgid "_Change Status Message…"
 msgstr "З_мяніць паведамленне аб стане"
 
-#: gajim/gtk/statusicon.py:247 gajim/gtk/statusicon.py:292
-#: gajim/gtk/statusicon.py:299
+#: gajim/gtk/statusicon.py:258
 #, python-format
 msgid "using account %s"
 msgstr "выкарыстоўвае рахунак %s"
 
-#: gajim/gtk/statusicon.py:309
+#: gajim/gtk/statusicon.py:269
 #, fuzzy
-msgid "_Manage Bookmarks…"
-msgstr "Кіраванне закладкамі"
+msgid "Hide _Contact List"
+msgstr "Людзі"
 
-#: gajim/gtk/statusicon.py:325
+#: gajim/gtk/statusicon.py:273
 #, fuzzy
-msgid "Hide _Roster"
-msgstr "Няма ў спісе"
-
-#: gajim/gtk/statusicon.py:329
-msgid "Show _Roster"
-msgstr "Паказаць _галоўнае вакно"
+msgid "Show _Contact List"
+msgstr "Паказаць _адлучаных людзей"
 
-#: gajim/gtk/statusicon.py:337
+#: gajim/gtk/statusicon.py:281
 msgid "Hide this menu"
 msgstr "Схаваць гэтае меню"
 
@@ -10021,37 +10334,6 @@ msgstr ""
 "У часе абнаўлення Вашых асабістых звестак адбылася памылка, паспрабуйце "
 "абнавіць пазней."
 
-#: gajim/gtk/join_groupchat.py:202
-#, fuzzy
-msgid "Invalid Room"
-msgstr "Няправільны элемент"
-
-#: gajim/gtk/join_groupchat.py:203
-msgid "Please choose a room"
-msgstr ""
-
-#: gajim/gtk/join_groupchat.py:222 gajim/gtk/join_groupchat.py:229
-#, fuzzy
-msgid "Invalid Nickname"
-msgstr "Няправільнае імя карыстальніка"
-
-#: gajim/gtk/join_groupchat.py:223
-#, fuzzy
-msgid "Please choose a nickname"
-msgstr "Стварыць новы допіс"
-
-#: gajim/gtk/join_groupchat.py:282 gajim/gtk/join_groupchat.py:288
-#: gajim/gtk/join_groupchat.py:293
-#, fuzzy
-msgid "Wrong server"
-msgstr "Няправільная спасылка"
-
-#: gajim/gtk/join_groupchat.py:283 gajim/gtk/join_groupchat.py:289
-#: gajim/gtk/join_groupchat.py:294
-#, fuzzy, python-format
-msgid "%s is not a groupchat server"
-msgstr "Гэта не групавая размова"
-
 #: gajim/gtk/mam_preferences.py:38
 #, python-format
 msgid "Archiving Preferences for %s"
@@ -10082,45 +10364,53 @@ msgstr "Вы атрымалі новае паведамленне:"
 msgid "Archiving Preferences Error"
 msgstr "_Настаўленні"
 
-#: gajim/gtk/advanced_config.py:81
+#: gajim/gtk/advanced_config.py:95
 msgid "Activated"
 msgstr "Актывізаваны"
 
-#: gajim/gtk/advanced_config.py:81
+#: gajim/gtk/advanced_config.py:95
 msgid "Deactivated"
 msgstr "Неактывізаваны"
 
-#: gajim/gtk/advanced_config.py:83
-msgid "Boolean"
-msgstr "Лагічнае"
+#: gajim/gtk/advanced_config.py:97
+msgid "?config type:Boolean"
+msgstr ""
+
+#: gajim/gtk/advanced_config.py:98
+msgid "?config type:Integer"
+msgstr ""
 
-#: gajim/gtk/advanced_config.py:84
-msgid "Integer"
-msgstr "Цэлы лік"
+#: gajim/gtk/advanced_config.py:99
+msgid "?config type:Text"
+msgstr ""
 
-#: gajim/gtk/advanced_config.py:85
-msgid "Text"
-msgstr "Тэкставае"
+#: gajim/gtk/advanced_config.py:100
+msgid "?config type:Color"
+msgstr ""
 
-#: gajim/gtk/advanced_config.py:97
-msgid "Preference Name"
+#: gajim/gtk/advanced_config.py:112
+#, fuzzy
+msgid "?config:Preference Name"
 msgstr "Назва ўласцівасці"
 
-#: gajim/gtk/advanced_config.py:104
-msgid "Value"
-msgstr "Значэнне"
+#: gajim/gtk/advanced_config.py:123
+#, fuzzy
+msgid "?config:Value"
+msgstr "_Працягнуць"
 
-#: gajim/gtk/advanced_config.py:113
-msgid "Type"
-msgstr "Тып"
+#: gajim/gtk/advanced_config.py:132
+msgid "?config:Type"
+msgstr ""
 
-#: gajim/gtk/advanced_config.py:168
-msgid "(None)"
-msgstr "(Няма)"
+#: gajim/gtk/advanced_config.py:187
+#, fuzzy
+msgid "?config description:None"
+msgstr "?Запыт (на падпіску):Няма"
 
-#: gajim/gtk/advanced_config.py:299
-msgid "Hidden"
-msgstr "Схаваны"
+#: gajim/gtk/advanced_config.py:322
+#, fuzzy
+msgid "?password:Hidden"
+msgstr "Пароль:"
 
 #: gajim/gtk/server_info.py:66
 #, fuzzy
@@ -10132,8 +10422,8 @@ msgstr "_Скапіяваць адрас спасылкі"
 msgid "%(days)s days, %(hours)s hours"
 msgstr ""
 
-#: gajim/gtk/server_info.py:218 gajim/gtk/accounts.py:749
-#: gajim/gtk/accounts.py:853
+#: gajim/gtk/server_info.py:218 gajim/gtk/accounts.py:752
+#: gajim/gtk/accounts.py:856
 #, fuzzy
 msgid "Hostname"
 msgstr "Назва вузла: "
@@ -10311,11 +10601,6 @@ msgstr "Няправільная назва спіса"
 msgid "You must enter a name to create a privacy list."
 msgstr "Вы павінны вызначыць назву для новага спіса прыватнасці."
 
-#: gajim/gtk/groupchat_config.py:41
-#, fuzzy
-msgid "Group Chat Configuration"
-msgstr "Запрашэнне ў групавую размову"
-
 #: gajim/gtk/groupchat_config.py:134
 #, fuzzy
 msgid "A Group Chat needs at least one Owner"
@@ -10326,69 +10611,69 @@ msgid "You are not allowed to modify the affiliation of Admins and Owners"
 msgstr ""
 
 #: gajim/gtk/groupchat_config.py:399
-msgid "An entry with this Jabber-ID already exists"
+msgid "An entry with this XMPP Address already exists"
 msgstr ""
 
-#: gajim/gtk/adhoc.py:91
+#: gajim/gtk/adhoc.py:92
 #, fuzzy
 msgid "Finish"
 msgstr "_Скончыць"
 
-#: gajim/gtk/adhoc.py:97 gajim/gtk/adhoc.py:283
+#: gajim/gtk/adhoc.py:98 gajim/gtk/adhoc.py:284
 #, fuzzy
 msgid "Commands"
 msgstr "Загады: %s"
 
-#: gajim/gtk/adhoc.py:103
+#: gajim/gtk/adhoc.py:104
 msgid "Next"
 msgstr ""
 
-#: gajim/gtk/adhoc.py:109
+#: gajim/gtk/adhoc.py:110
 #, fuzzy
 msgid "Previous"
 msgstr "спасылка"
 
-#: gajim/gtk/adhoc.py:115
+#: gajim/gtk/adhoc.py:116
 #, fuzzy
 msgid "Execute"
 msgstr "_Выканаць загад..."
 
-#: gajim/gtk/adhoc.py:195
+#: gajim/gtk/adhoc.py:196
 #, fuzzy
 msgid "No commands available"
 msgstr "Рахункаў няма"
 
-#: gajim/gtk/adhoc.py:244
+#: gajim/gtk/adhoc.py:245
 #, fuzzy
 msgid "Request Command List"
 msgstr "_Выканаць загад..."
 
-#: gajim/gtk/adhoc.py:259
+#: gajim/gtk/adhoc.py:260
 #, fuzzy
 msgid "Executing…"
 msgstr "_Выканаць загад..."
 
-#: gajim/gtk/adhoc.py:266
+#: gajim/gtk/adhoc.py:267
 #, fuzzy
 msgid "Command List"
 msgstr "Загады: %s"
 
-#: gajim/gtk/adhoc.py:384
+#: gajim/gtk/adhoc.py:385
 #, fuzzy
 msgid "Finished"
 msgstr "_Скончыць"
 
-#: gajim/gtk/adhoc.py:453
+#: gajim/gtk/adhoc.py:454
 #, fuzzy
 msgid "Execution failed"
 msgstr "Памылка злучэння"
 
-#: gajim/gtk/blocking.py:37
+#: gajim/gtk/blocking.py:38
 #, fuzzy, python-format
 msgid "Blocking List for %s"
 msgstr "Спіс прыватнасці для %s"
 
-#: gajim/gtk/blocking.py:71
+#: gajim/gtk/blocking.py:72
 #, fuzzy
 msgid "Error!"
 msgstr "Памылка Avahi"
@@ -10441,8 +10726,7 @@ msgstr ""
 "Вы павінны пазначыць імя карыстальніка, каб змяніць настаўленні гэтага "
 "рахунка."
 
-#: gajim/gtk/account_wizard.py:252 gajim/gtk/bookmarks.py:290
-#: gajim/gtk/bookmarks.py:303
+#: gajim/gtk/account_wizard.py:252
 #, fuzzy
 msgid "Invalid server"
 msgstr "Няправільнае імя карыстальніка"
@@ -10460,7 +10744,7 @@ msgstr "Няправільны элемент"
 msgid "Custom port must be a port number."
 msgstr "Адмысловы порт павінны быць нумарам порта."
 
-#: gajim/gtk/account_wizard.py:405
+#: gajim/gtk/account_wizard.py:406
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -10470,15 +10754,15 @@ msgid ""
 "Do you still want to connect to this server?"
 msgstr ""
 
-#: gajim/gtk/account_wizard.py:446 gajim/gtk/account_wizard.py:480
+#: gajim/gtk/account_wizard.py:447 gajim/gtk/account_wizard.py:481
 msgid "An error occurred during account creation"
 msgstr "Адбылася памылка ў часе стварэння рахунка"
 
-#: gajim/gtk/account_wizard.py:545
+#: gajim/gtk/account_wizard.py:546
 msgid "Account name is in use"
 msgstr "Назва рахунка ўжо скарыстаная"
 
-#: gajim/gtk/account_wizard.py:546
+#: gajim/gtk/account_wizard.py:547
 msgid "You already have an account using this name."
 msgstr "Вы ўжо маеце рахунак з такой назваю."
 
@@ -10505,26 +10789,26 @@ msgstr "Перадача файла %(filename)s ад %(name)s спыненая.
 msgid "%(minutes)s min %(seconds)s sec"
 msgstr ""
 
-#: gajim/gtk/xml_console.py:77
+#: gajim/gtk/xml_console.py:74
 #, fuzzy
 msgid "Filter"
 msgstr "Фільтар:"
 
-#: gajim/gtk/xml_console.py:82
+#: gajim/gtk/xml_console.py:79
 #, fuzzy
 msgid "XML Input"
 msgstr "<b>Увод XML</b>"
 
-#: gajim/gtk/xml_console.py:86
+#: gajim/gtk/xml_console.py:83
 msgid "Paste Last Input"
 msgstr ""
 
-#: gajim/gtk/xml_console.py:170
+#: gajim/gtk/xml_console.py:167
 #, fuzzy, python-format
 msgid "Please make sure you are connected with '%s'."
 msgstr "Праверце злучэнне з \"%s\"."
 
-#: gajim/gtk/xml_console.py:182
+#: gajim/gtk/xml_console.py:177
 #, fuzzy
 msgid "Invalid Node"
 msgstr "Няправільны файл"
@@ -10557,153 +10841,168 @@ msgstr "Пошук"
 msgid "No results found"
 msgstr "%s не знойдзены"
 
-#: gajim/gtk/preferences.py:358 gajim/gtk/preferences.py:362
+#: gajim/gtk/preferences.py:357 gajim/gtk/preferences.py:361
 msgid "Default"
 msgstr "Прадвызначана"
 
-#: gajim/gtk/preferences.py:801
+#: gajim/gtk/preferences.py:798
 msgid "status message title"
 msgstr "загаловак паведамлення аб змене стану"
 
-#: gajim/gtk/preferences.py:802
+#: gajim/gtk/preferences.py:799
 msgid "status message text"
 msgstr "тэкст паведамлення аб змене стану"
 
+#: gajim/gtk/accounts.py:137
+#, fuzzy
+msgid "Re-Login"
+msgstr "Перадалучыцца?"
+
 #: gajim/gtk/accounts.py:138
-msgid "Relogin now?"
+#, fuzzy
+msgid "Re-Login now?"
 msgstr "Перадалучыцца?"
 
 #: gajim/gtk/accounts.py:139
-msgid "If you want all the changes to apply instantly, you must relogin."
+#, fuzzy
+msgid "To apply all changes instantly, you have to re-login."
 msgstr "Калі Вы хочаце ўжыць усе зробленыя змены, перадалучыцеся."
 
-#: gajim/gtk/accounts.py:191 gajim/gtk/accounts.py:975
+#: gajim/gtk/accounts.py:141
+msgid "_Later"
+msgstr ""
+
+#: gajim/gtk/accounts.py:143
+msgid "_Re-Login"
+msgstr ""
+
+#: gajim/gtk/accounts.py:194 gajim/gtk/accounts.py:978
 #, fuzzy
 msgid "Remove Account"
 msgstr "Выдаленне рахунка %s"
 
-#: gajim/gtk/accounts.py:192
+#: gajim/gtk/accounts.py:195
 #, fuzzy, python-format
 msgid "You still have open chats in your account %s"
 msgstr "Вы пачалі размову ў рахунку %s"
 
-#: gajim/gtk/accounts.py:193
+#: gajim/gtk/accounts.py:196
 #, fuzzy
 msgid ""
 "All chat and group chat windows will be closed.\n"
 "Do you want to continue?"
 msgstr "Усе размоўныя вокны закрыюцца. Хочаце працягнуць?"
 
-#: gajim/gtk/accounts.py:424
+#: gajim/gtk/accounts.py:427
 #, fuzzy
 msgid "Back"
 msgstr "Хутка буду"
 
-#: gajim/gtk/accounts.py:530
+#: gajim/gtk/accounts.py:533
 #, fuzzy
 msgid "Please check if Bonjour is installed."
 msgstr "Праверце, ці ўсталяваны Avahi."
 
-#: gajim/gtk/accounts.py:532
+#: gajim/gtk/accounts.py:535
 #, fuzzy
 msgid "Please check if Avahi is installed."
 msgstr "Праверце, ці ўсталяваны Avahi."
 
-#: gajim/gtk/accounts.py:569
+#: gajim/gtk/accounts.py:572
 #, fuzzy
 msgid "Disable Account"
 msgstr "Няправільная назва рахунка"
 
-#: gajim/gtk/accounts.py:570
+#: gajim/gtk/accounts.py:573
 #, fuzzy, python-format
 msgid "Account %s is still connected"
 msgstr "Рахунак \"%s\" злучаны з серверам"
 
-#: gajim/gtk/accounts.py:571
+#: gajim/gtk/accounts.py:574
 #, fuzzy
 msgid ""
 "All chat and group chat windows will be closed. Do you want to continue?"
 msgstr "Усе размоўныя вокны закрыюцца. Хочаце працягнуць?"
 
-#: gajim/gtk/accounts.py:576
+#: gajim/gtk/accounts.py:579
 #, fuzzy
 msgid "_Disable Account"
 msgstr "Няправільная назва рахунка"
 
-#: gajim/gtk/accounts.py:595
+#: gajim/gtk/accounts.py:598
 #, fuzzy
 msgid "Add Account"
 msgstr "_Дадаць чалавека..."
 
-#: gajim/gtk/accounts.py:663
+#: gajim/gtk/accounts.py:666
 msgid "Label"
 msgstr ""
 
-#: gajim/gtk/accounts.py:667
+#: gajim/gtk/accounts.py:670
 msgid "Login"
 msgstr ""
 
-#: gajim/gtk/accounts.py:670
+#: gajim/gtk/accounts.py:673
 #, fuzzy
 msgid "Import Contacts"
 msgstr "Людзі"
 
-#: gajim/gtk/accounts.py:674 gajim/gtk/accounts.py:870
+#: gajim/gtk/accounts.py:677 gajim/gtk/accounts.py:873
 #, fuzzy
 msgid "Client Certificate"
 msgstr "Няправільнае імя карыстальніка"
 
-#: gajim/gtk/accounts.py:677 gajim/gtk/accounts.py:774
+#: gajim/gtk/accounts.py:680 gajim/gtk/accounts.py:777
 #, fuzzy
 msgid "Connect on startup"
 msgstr "_Злучацца па старце Gajim"
 
-#: gajim/gtk/accounts.py:681 gajim/gtk/accounts.py:779
+#: gajim/gtk/accounts.py:684 gajim/gtk/accounts.py:782
 #, fuzzy
 msgid "Save conversations for all contacts"
 msgstr "Захоўваць _журналы размоў з усімі людзьмі"
 
-#: gajim/gtk/accounts.py:683 gajim/gtk/accounts.py:781
+#: gajim/gtk/accounts.py:686 gajim/gtk/accounts.py:784
 msgid "Store conversations on the harddrive"
 msgstr ""
 
-#: gajim/gtk/accounts.py:685 gajim/gtk/accounts.py:783
+#: gajim/gtk/accounts.py:688 gajim/gtk/accounts.py:786
 #, fuzzy
 msgid "Global Status"
 msgstr "Усе станы"
 
-#: gajim/gtk/accounts.py:687
+#: gajim/gtk/accounts.py:690
 #, fuzzy
 msgid "Synchronise the status of all accounts"
 msgstr "Змяніць стан рахунка(ў)"
 
-#: gajim/gtk/accounts.py:689
+#: gajim/gtk/accounts.py:692
 msgid "Use file transfer proxies"
 msgstr "Ужыць проксі для перадачы файлаў"
 
-#: gajim/gtk/accounts.py:705
+#: gajim/gtk/accounts.py:708
 #, fuzzy
 msgid "Idle Time"
 msgstr " ад %s"
 
-#: gajim/gtk/accounts.py:707
+#: gajim/gtk/accounts.py:710
 msgid "Disclose the time of your last activity"
 msgstr ""
 
-#: gajim/gtk/accounts.py:709
+#: gajim/gtk/accounts.py:712
 msgid "Local System Time"
 msgstr ""
 
-#: gajim/gtk/accounts.py:711
+#: gajim/gtk/accounts.py:714
 msgid "Disclose the local system time of the device Gajim runs on"
 msgstr ""
 
-#: gajim/gtk/accounts.py:714
+#: gajim/gtk/accounts.py:717
 #, fuzzy
 msgid "Client / Operating System"
 msgstr "Няправільнае імя карыстальніка"
 
-#: gajim/gtk/accounts.py:716
+#: gajim/gtk/accounts.py:719
 #, fuzzy
 msgid ""
 "Disclose informations about the client and operating system you currently use"
@@ -10711,153 +11010,148 @@ msgstr ""
 "Калі гэтая опцыя ўключаная, Gajim далучыцца да гэтай групавой размовы пры "
 "запуску"
 
-#: gajim/gtk/accounts.py:719
+#: gajim/gtk/accounts.py:722
 #, fuzzy
 msgid "Ignore Unknown Contacts"
 msgstr "Людзі"
 
-#: gajim/gtk/accounts.py:721
+#: gajim/gtk/accounts.py:724
 #, fuzzy
 msgid "Ignore everything from contacts not in your Roster"
 msgstr "_Ігнараваць падзеі ад людзей, якіх няма ў кантактным лісце"
 
-#: gajim/gtk/accounts.py:737 gajim/gtk/accounts.py:776
+#: gajim/gtk/accounts.py:740 gajim/gtk/accounts.py:779
 #, fuzzy
 msgid "Use environment variable"
 msgstr "Няма злучэння"
 
-#: gajim/gtk/accounts.py:739
-#, fuzzy
-msgid "Proxy"
-msgstr "Проксі:"
-
-#: gajim/gtk/accounts.py:742
+#: gajim/gtk/accounts.py:745
 #, fuzzy
 msgid "Warn on insecure connection"
 msgstr "Злучэнне"
 
-#: gajim/gtk/accounts.py:746
+#: gajim/gtk/accounts.py:749
 msgid "Send keep-alive packets"
 msgstr "Адпраўляць праверачныя пакункі серверу"
 
-#: gajim/gtk/accounts.py:750
+#: gajim/gtk/accounts.py:753
 msgid "Manually set the hostname for the server"
 msgstr ""
 
-#: gajim/gtk/accounts.py:756 gajim/gtk/accounts.py:826
-#: gajim/gtk/accounts.py:831
+#: gajim/gtk/accounts.py:759 gajim/gtk/accounts.py:829
+#: gajim/gtk/accounts.py:834
 #, fuzzy
 msgid "Priority"
 msgstr "Прыяры_тэт:"
 
-#: gajim/gtk/accounts.py:785
+#: gajim/gtk/accounts.py:788
 #, fuzzy
 msgid "Synchronize the status of all accounts"
 msgstr "Змяніць стан рахунка(ў)"
 
-#: gajim/gtk/accounts.py:795
+#: gajim/gtk/accounts.py:798
 #, fuzzy
 msgid "First Name"
 msgstr "Імя:"
 
-#: gajim/gtk/accounts.py:798
+#: gajim/gtk/accounts.py:801
 #, fuzzy
 msgid "Last Name"
 msgstr "Прозвішча:"
 
-#: gajim/gtk/accounts.py:804
+#: gajim/gtk/accounts.py:807
 #, fuzzy
 msgid "Email"
 msgstr "Новы ліст"
 
-#: gajim/gtk/accounts.py:822
+#: gajim/gtk/accounts.py:825
 #, fuzzy
 msgid "Adjust to status"
 msgstr "_Адпаведна стану"
 
-#: gajim/gtk/accounts.py:849
+#: gajim/gtk/accounts.py:852
 msgid "Enable"
 msgstr "Уключыць"
 
-#: gajim/gtk/accounts.py:857
+#: gajim/gtk/accounts.py:860
 #, fuzzy
 msgid "Port"
 msgstr "_Порт:"
 
-#: gajim/gtk/accounts.py:862
+#: gajim/gtk/accounts.py:865
 #, fuzzy
 msgid "Connection Settings"
 msgstr "Злучэнне"
 
-#: gajim/gtk/accounts.py:872
+#: gajim/gtk/accounts.py:875
 msgid "PKCS12 Files"
 msgstr ""
 
-#: gajim/gtk/accounts.py:874
+#: gajim/gtk/accounts.py:877
 #, fuzzy
 msgid "Encrypted Certificate"
 msgstr "Няправільнае імя карыстальніка"
 
-#: gajim/gtk/accounts.py:878
+#: gajim/gtk/accounts.py:881
 #, fuzzy
 msgid "Certificate Settings"
 msgstr "Няправільнае імя карыстальніка"
 
-#: gajim/gtk/accounts.py:890
+#: gajim/gtk/accounts.py:893
 #, fuzzy
 msgid "Save Password"
 msgstr "Захаваць пароль"
 
-#: gajim/gtk/accounts.py:898
+#: gajim/gtk/accounts.py:901
 #, fuzzy
 msgid "Login Settings"
 msgstr "Памылка злучэння"
 
-#: gajim/gtk/accounts.py:931
+#: gajim/gtk/accounts.py:934
 #, fuzzy, python-format
 msgid "Removing account %s"
 msgstr "Выдаленне рахунка %s"
 
-#: gajim/gtk/accounts.py:946
+#: gajim/gtk/accounts.py:949
 #, fuzzy
 msgid "Account is disabled"
 msgstr "Шыфраванне адключанае"
 
-#: gajim/gtk/accounts.py:947
+#: gajim/gtk/accounts.py:950
 #, fuzzy
 msgid "To unregister from a server, the account must be enabled."
 msgstr "Каб змяніць назву рахунка, трэба папярэдне адлучыцца."
 
-#: gajim/gtk/accounts.py:962
+#: gajim/gtk/accounts.py:965
 #, fuzzy
 msgid "Password required"
 msgstr "Патрабуецца пароль"
 
-#: gajim/gtk/accounts.py:976
+#: gajim/gtk/accounts.py:979
 #, fuzzy, python-format
 msgid "Account '%s' is still connected to the server"
 msgstr "Рахунак \"%s\" злучаны з серверам"
 
-#: gajim/gtk/accounts.py:978
+#: gajim/gtk/accounts.py:981
 msgid "If you remove it, the connection will be lost."
 msgstr "Калі Вы выдаліце яго, згубіцца злучэнне."
 
-#: gajim/gtk/accounts.py:995
+#: gajim/gtk/accounts.py:998
 #, fuzzy, python-format
 msgid "Connection to server %s failed"
 msgstr "Памылка злучэння"
 
-#: gajim/gtk/accounts.py:996
+#: gajim/gtk/accounts.py:999
 #, fuzzy
 msgid "What would you like to do?"
 msgstr "Што Вы хочаце зрабіць?"
 
-#: gajim/gtk/accounts.py:997
+#: gajim/gtk/accounts.py:1000
 #, fuzzy
 msgid "Remove only from Gajim"
 msgstr "Выдаліць рахунак _толькі для Gajim"
 
-#: gajim/gtk/accounts.py:998
+#: gajim/gtk/accounts.py:1001
 msgid "Don't remove anything. I'll try again later"
 msgstr ""
 
@@ -10881,6 +11175,10 @@ msgstr "Я хачу дадаць Вас у свой кантактны ліст.
 msgid "Modify"
 msgstr "_Змяніць"
 
+#: gajim/gtk/roster_item_exchange.py:80
+msgid "JID"
+msgstr "JID"
+
 #: gajim/gtk/roster_item_exchange.py:86
 #, fuzzy
 msgid "Groups"
@@ -10907,48 +11205,29 @@ msgstr[0] "Выдаліць чалавека з спіса"
 msgstr[1] "Выдаліць чалавека з спіса"
 msgstr[2] "Выдаліць чалавека з спіса"
 
-#: gajim/gtk/util.py:581
+#: gajim/gtk/util.py:583
 msgid "Unknown Artist"
 msgstr ""
 
-#: gajim/gtk/util.py:582
+#: gajim/gtk/util.py:584
 msgid "Unknown Title"
 msgstr ""
 
-#: gajim/gtk/util.py:583
+#: gajim/gtk/util.py:585
 msgid "Unknown Source"
 msgstr ""
 
-#: gajim/gtk/util.py:585
+#: gajim/gtk/util.py:587
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
 "from <i>%(source)s</i>"
 msgstr ""
 
-#: gajim/gtk/bookmarks.py:121
-msgid "New Group Chat"
-msgstr "Новая групавая размова"
-
-#: gajim/gtk/bookmarks.py:161
-msgid "This bookmark has invalid data"
-msgstr "Гэтая закладка мае няправільныя звесткі"
-
-#: gajim/gtk/bookmarks.py:162
-msgid ""
-"Please be sure to fill out server and room fields or remove this bookmark."
-msgstr "Запоўніце палі сервера і пакоя альбо выдаліце гэтую закладку."
-
-#: gajim/gtk/bookmarks.py:273 gajim/gtk/bookmarks.py:291
-#: gajim/gtk/bookmarks.py:304 gajim/gtk/bookmarks.py:335
-#, fuzzy
-msgid "Character not allowed"
-msgstr "Такая мянушка не дазволеная: %s"
-
-#: gajim/gtk/bookmarks.py:334
-#, fuzzy
-msgid "Invalid room"
-msgstr "Няправільны элемент"
+#: gajim/gtk/bookmarks.py:47
+#, fuzzy, python-format
+msgid "Bookmarks for %s"
+msgstr "_Змясціць у закладках"
 
 #: gajim/plugins/pluginmanager.py:736 gajim/plugins/pluginmanager.py:742
 msgid "Archive corrupted"
@@ -10960,50 +11239,53 @@ msgid "Archive empty"
 msgstr "Месца файла"
 
 #: gajim/plugins/pluginmanager.py:750 gajim/plugins/pluginmanager.py:758
-#: gajim/plugins/gui.py:257
+#: gajim/plugins/gui.py:258
 msgid "Archive is malformed"
 msgstr ""
 
-#: gajim/plugins/pluginmanager.py:766 gajim/plugins/gui.py:281
-#: gajim/plugins/gui.py:289
+#: gajim/plugins/pluginmanager.py:766 gajim/plugins/gui.py:288
+#: gajim/plugins/gui.py:301
 #, fuzzy
 msgid "Plugin already exists"
 msgstr "Такі файл ужо ёсць"
 
-#: gajim/plugins/gui.py:82
+#: gajim/plugins/gui.py:83
 msgid "Click to view Gajim's wiki page on how to install plugins in Flatpak."
 msgstr ""
 
-#: gajim/plugins/gui.py:89
+#: gajim/plugins/gui.py:90
 msgid "Plugin"
 msgstr ""
 
-#: gajim/plugins/gui.py:151
+#: gajim/plugins/gui.py:152
 #, fuzzy, python-format
 msgid "Warning: %s"
 msgstr "Забарона казання для %s"
 
-#: gajim/plugins/gui.py:206
+#: gajim/plugins/gui.py:207
 #, fuzzy
 msgid "Plugin failed"
 msgstr "Памылка злучэння"
 
-#: gajim/plugins/gui.py:245
+#: gajim/plugins/gui.py:246
 msgid "Unable to properly remove the plugin"
 msgstr ""
 
-#: gajim/plugins/gui.py:281
-msgid "Overwrite?"
-msgstr ""
+#: gajim/plugins/gui.py:287
+#, fuzzy
+msgid "Overwrite Plugin?"
+msgstr "Паведамленне аб змене стану"
+
+#: gajim/plugins/gui.py:289
+#, fuzzy
+msgid "Do you want to overwrite the currently installed version?"
+msgstr "Хочаце выдаліць групу %s з кантактнага ліста?"
 
 #: data/org.gajim.Gajim.desktop.in:5
-msgid "Jabber IM Client"
+#, fuzzy
+msgid "XMPP IM Client"
 msgstr "Jabber-праграма"
 
-#: data/org.gajim.Gajim.desktop.in:6
-msgid "A GTK+ Jabber client"
-msgstr "Jabber-праграма для GTK+"
-
 #: data/org.gajim.Gajim.desktop.in:8
 msgid "chat;messaging;im;xmpp;bonjour;voip;"
 msgstr ""
@@ -11055,7 +11337,7 @@ msgid "Easily send pictures, videos or other files to friends and groups"
 msgstr ""
 
 #: data/org.gajim.Gajim.appdata.xml.in:27
-msgid "Chat securely with End-to-End encryption via OMEMO or PGP"
+msgid "Chat securely with End-to-End encryption via OMEMO or OpenPGP"
 msgstr ""
 
 #: data/org.gajim.Gajim.appdata.xml.in:28
@@ -11116,7 +11398,7 @@ msgstr ""
 
 #: data/org.gajim.Gajim.appdata.xml.in:52
 #, fuzzy
-msgid "Roster, list of contacts"
+msgid "Contact list, list of contacts"
 msgstr "_Пісаць у журнал паведамленні аб змене стану чалавека"
 
 #: data/org.gajim.Gajim.appdata.xml.in:56
@@ -11138,6 +11420,488 @@ msgstr "Нядаўна:"
 msgid "Plugin manager"
 msgstr "Памылка злучэння"
 
+#, fuzzy
+#~ msgid "Configure Services…"
+#~ msgstr "_Праглядзець сервісы..."
+
+#, fuzzy
+#~ msgid "Group Chat Bookmarks"
+#~ msgstr "Групавая размова"
+
+#, fuzzy
+#~ msgid "Add Bookmark"
+#~ msgstr "_Змясціць у закладках"
+
+#, fuzzy
+#~ msgid "Remove Bookmark"
+#~ msgstr "_Змясціць у закладках"
+
+#, fuzzy
+#~ msgid "Bookmark Name"
+#~ msgstr "_Змясціць у закладках"
+
+#, fuzzy
+#~ msgid "_Server"
+#~ msgstr "_Сервер:"
+
+#, fuzzy
+#~ msgid "_Password"
+#~ msgstr "_Пароль:"
+
+#, fuzzy
+#~ msgid "Join chat when connected"
+#~ msgstr "Чалавек адлучыўся"
+
+#~ msgid "New Group Chat"
+#~ msgstr "Новая групавая размова"
+
+#~ msgid "This bookmark has invalid data"
+#~ msgstr "Гэтая закладка мае няправільныя звесткі"
+
+#, fuzzy
+#~ msgid ""
+#~ "Please be sure to fill out server and group chat fields or remove this "
+#~ "bookmark."
+#~ msgstr "Запоўніце палі сервера і пакоя альбо выдаліце гэтую закладку."
+
+#, fuzzy
+#~ msgid "Character not allowed"
+#~ msgstr "Такая мянушка не дазволеная: %s"
+
+#, fuzzy
+#~ msgid "Invalid Group Chat"
+#~ msgstr "Няправільны Jabber ID групавой размовы"
+
+#~ msgid "Unable to join group chat"
+#~ msgstr "Немагчыма ўвайсці ў групавую размову"
+
+#, fuzzy
+#~ msgid "You are banned from group chat <b>%s</b>."
+#~ msgstr "Вам забаронена казанне ў гэтай групавой размове."
+
+#, fuzzy
+#~ msgid "Remote server <b>%s</b> does not exist."
+#~ msgstr "Такой групавой размовы няма."
+
+#, fuzzy
+#~ msgid "Group chat <b>%s</b> does not exist."
+#~ msgstr "Такой групавой размовы няма."
+
+#, fuzzy
+#~ msgid "Group chat creation is not permitted."
+#~ msgstr "Стварэнне групавых размоў абмежаванае."
+
+#, fuzzy
+#~ msgid "You must use your registered nickname in <b>%s</b>."
+#~ msgstr "Вы павінны карыстацца зарэгістраванай для Вас мянушкай."
+
+#, fuzzy
+#~ msgid "You are not in the members list in group chat %s."
+#~ msgstr "Вас няма ў спісе ўдзельнікаў."
+
+#, fuzzy
+#~ msgid "XMPP Address is not a group chat"
+#~ msgstr "Гэта не групавая размова"
+
+#~ msgid "This is not a group chat"
+#~ msgstr "Гэта не групавая размова"
+
+#, fuzzy
+#~ msgid "Please choose a group chat"
+#~ msgstr "Стварыць новы допіс"
+
+#, fuzzy
+#~ msgid "Invalid Nickname"
+#~ msgstr "Няправільнае імя карыстальніка"
+
+#, fuzzy
+#~ msgid "Please choose a nickname"
+#~ msgstr "Стварыць новы допіс"
+
+#, fuzzy
+#~ msgid "Wrong server"
+#~ msgstr "Няправільная спасылка"
+
+#, fuzzy
+#~ msgid "%s is not a group chat server"
+#~ msgstr "Гэта не групавая размова"
+
+#, fuzzy
+#~ msgid "A Password is required to join the group chat %s. Please type it."
+#~ msgstr "Каб удзельнічаць у гэтай групавой размове, трэба ведаць пароль."
+
+#~ msgid "Not in Roster"
+#~ msgstr "Няма ў спісе"
+
+#~ msgid "I would like to add you to my roster"
+#~ msgstr "Я хачу дадаць Вас у мой кантактны ліст"
+
+#, fuzzy
+#~ msgid "Add to Roster"
+#~ msgstr "_Дадаць у кантактны ліст"
+
+#, fuzzy
+#~ msgid "Manage Room"
+#~ msgstr "Кіраванне закладкамі"
+
+#, fuzzy
+#~ msgid "Configure Room"
+#~ msgstr "Настаўленні _пакоя"
+
+#, fuzzy
+#~ msgid "Destroy Room"
+#~ msgstr "Апісанне: %s"
+
+#, fuzzy
+#~ msgid "Change Nick"
+#~ msgstr "Змяніць м_янушку"
+
+#, fuzzy
+#~ msgid "Disconnect"
+#~ msgstr "Чалавек адлучыўся"
+
+#, fuzzy
+#~ msgid "Copy JID"
+#~ msgstr "Пакой:"
+
+#, fuzzy
+#~ msgid "Add to Roster…"
+#~ msgstr "_Дадаць у кантактны ліст"
+
+#, fuzzy
+#~ msgid "Copy JID/Email"
+#~ msgstr "_Скапіяваць JID / паштовы адрас"
+
+#, fuzzy
+#~ msgid "JID: <i>%s</i>"
+#~ msgstr "Jabber ID: <i>%s</i>"
+
+#~ msgid "Changing Subject"
+#~ msgstr "Змяненне тэмы"
+
+#~ msgid "Please specify the new subject:"
+#~ msgstr "Вызначце новую тэму:"
+
+#, fuzzy
+#~ msgid "You (%s) joined the room"
+#~ msgstr "%s далучыўся да групавой размовы"
+
+#, fuzzy
+#~ msgid "Unable to join groupchat"
+#~ msgstr "Немагчыма ўвайсці ў групавую размову"
+
+#~ msgid "Groupchat Invitation"
+#~ msgstr "Запрашэнне ў групавую размову"
+
+#, fuzzy
+#~ msgid "%(jid)s has been invited in this room"
+#~ msgstr "%(who)s пакараў %(nick)s: %(reason)s"
+
+#, fuzzy
+#~ msgid "JID is not a Groupchat"
+#~ msgstr "Гэта не групавая размова"
+
+#~ msgid "Invalid JID"
+#~ msgstr "Няправільны JID"
+
+#~ msgid "A connection is not available"
+#~ msgstr "Няма злучэння"
+
+#, fuzzy
+#~ msgid "JID already in list"
+#~ msgstr "Jabber-праграма"
+
+#, fuzzy
+#~ msgid "For the chosen encryption there is no encryption method available"
+#~ msgstr "Няма злучэння"
+
+#~ msgid "Removes contact from roster"
+#~ msgstr "Выдаліць чалавека з спіса"
+
+#~ msgid "Not in roster"
+#~ msgstr "Няма ў спісе"
+
+#, fuzzy
+#~ msgid "Contact signed in notification color."
+#~ msgstr "_Паказваць падзею ў галоўным вакне"
+
+#, fuzzy
+#~ msgid "Contact signout notification color"
+#~ msgstr "_Паказваць падзею ў галоўным вакне"
+
+#, fuzzy
+#~ msgid "File transfer request notification color."
+#~ msgstr "Запыт на перадачу файла"
+
+#, fuzzy
+#~ msgid "File transfer error notification color."
+#~ msgstr "Перадача файла скасаваная"
+
+#, fuzzy
+#~ msgid "File transfer complete or stopped notification color."
+#~ msgstr "Паказаць нагадванне па сканчэнні перадачы файла"
+
+#, fuzzy
+#~ msgid "Groupchat invitation notification color"
+#~ msgstr "Запрашэнне ў групавую размову"
+
+#~ msgid "Add * and [n] in roster title?"
+#~ msgstr "Дадаць * і [n] у назву галоўнага вакна?"
+
+#~ msgid "Hides the banner in two persons chat window"
+#~ msgstr "Хавае банер у прыватнай размове"
+
+#, fuzzy
+#~ msgid ""
+#~ "Show the confirm metacontacts creation dialog or not? Empty string means "
+#~ "never show the dialog."
+#~ msgstr ""
+#~ "Ці трэба паказваць вакно пацверджання пры стварэнні мета-кантакта? Пусты "
+#~ "радок адключае гэтае вакно."
+
+#, fuzzy
+#~ msgid "Language for which misspelled words will be checked"
+#~ msgstr "Мова праверкі правапісу"
+
+#~ msgid "I'm eating, so leave me a message."
+#~ msgstr "Ямо, пакіньце мне паведамленне."
+
+#, fuzzy
+#~ msgid "from room %s"
+#~ msgstr "Я %s"
+
+#~ msgid "Leave Groupchats"
+#~ msgstr "Сысці з групавых размоў"
+
+#, fuzzy
+#~ msgid "Auto Join"
+#~ msgstr "Аўтаматычна далучацца"
+
+#, fuzzy
+#~ msgid "Room"
+#~ msgstr "Пакой:"
+
+#~ msgid "Jabber ID:"
+#~ msgstr "Jabber ID:"
+
+#, fuzzy
+#~ msgid "Occupant Actions"
+#~ msgstr "_Дзеянні ўдзельнікаў"
+
+#~ msgid "_Add to Roster"
+#~ msgstr "_Дадаць у кантактны ліст"
+
+#, fuzzy
+#~ msgid "_Manage Room"
+#~ msgstr "Кіраванне закладкамі"
+
+#, fuzzy
+#~ msgid "Configure _Room..."
+#~ msgstr "Настаўленні _пакоя"
+
+#, fuzzy
+#~ msgid "_Destroy Room"
+#~ msgstr "Апісанне: %s"
+
+#, fuzzy
+#~ msgid "Jabber ID"
+#~ msgstr "Jabber ID:"
+
+#, fuzzy
+#~ msgid "account"
+#~ msgstr "Рахунак"
+
+#, fuzzy
+#~ msgid "Roster"
+#~ msgstr "Паказаць _галоўнае вакно"
+
+#, fuzzy
+#~ msgid "Show only in roster"
+#~ msgstr "Паказваць толькі ў _галоўным вакне"
+
+#, fuzzy
+#~ msgid "in _roster"
+#~ msgstr "Няма ў спісе"
+
+#, fuzzy
+#~ msgid "Roster Appearance"
+#~ msgstr "<b>Змяніць правіла</b>"
+
+#, fuzzy
+#~ msgid "Show chatstate in roster"
+#~ msgstr "Паказваць _малюнкі ў галоўным вакне"
+
+#, fuzzy
+#~ msgid "_Add to Roster..."
+#~ msgstr "_Дадаць у кантактны ліст"
+
+#~ msgid "_Jabber ID:"
+#~ msgstr "_Jabber ID:"
+
+#, fuzzy
+#~ msgid "_Jabber ID"
+#~ msgstr "_Jabber ID:"
+
+#~ msgid "JabberID"
+#~ msgstr "JabberID"
+
+#, fuzzy
+#~ msgid "Show Roster"
+#~ msgstr "Паказаць _галоўнае вакно"
+
+#, fuzzy
+#~ msgid "MUC server"
+#~ msgstr "Назіральнікі"
+
+#~ msgid "Room Configuration"
+#~ msgstr "Настаўленні пакоя"
+
+#~ msgid "Join _Group Chat"
+#~ msgstr "Удзельнічаць у _групавой размове"
+
+#, fuzzy
+#~ msgid "Audio sessions are not available"
+#~ msgstr "Няма злучэння"
+
+#~ msgid "Conference"
+#~ msgstr "Канферэнцыі"
+
+#, fuzzy
+#~ msgid "_Manage Bookmarks…"
+#~ msgstr "Кіраванне закладкамі"
+
+#, fuzzy
+#~ msgid "Hide _Roster"
+#~ msgstr "Няма ў спісе"
+
+#~ msgid "Show _Roster"
+#~ msgstr "Паказаць _галоўнае вакно"
+
+#, fuzzy
+#~ msgid "Invalid Room"
+#~ msgstr "Няправільны элемент"
+
+#, fuzzy
+#~ msgid "Invalid room"
+#~ msgstr "Няправільны элемент"
+
+#~ msgid "A GTK+ Jabber client"
+#~ msgstr "Jabber-праграма для GTK+"
+
+#~ msgid "Changing Nickname"
+#~ msgstr "Змена мянушкі"
+
+#~ msgid "Please specify the new nickname you want to use:"
+#~ msgstr "Вызначце сваю новую мянушку:"
+
+#~ msgid "Bookmark already set"
+#~ msgstr "Закладка ўжо ўсталяваная"
+
+#, fuzzy
+#~ msgid "Group Chat '%s' is already in your bookmarks."
+#~ msgstr "Групавая размова \"%s\" ужо знаходзіцца ў Вашых закладках."
+
+#~ msgid "Bookmark has been added successfully"
+#~ msgstr "Закладка паспяхова дададзеная"
+
+#, fuzzy
+#~ msgid ""
+#~ "You can manage your bookmarks by clicking the Bookmarks menu item in your "
+#~ "contact list."
+#~ msgstr ""
+#~ "Вы можаце рэдагаваць спіс Вашых закладак праз меню \"Дзеянні\" галоўнага "
+#~ "вакна."
+
+#, fuzzy
+#~ msgid "The nickname contains invalid characters."
+#~ msgstr "Jabber ID групавой размовы ўтрымлівае няправільныя знакі."
+
+#, fuzzy
+#~ msgid "Bookmark Room"
+#~ msgstr "_Змясціць у закладках"
+
+#~ msgid "_Join New Group Chat"
+#~ msgstr "_Удзельнічаць у групавой размове"
+
+#, fuzzy
+#~ msgid "_Create Group Chat"
+#~ msgstr "Сысці з групавых размоў"
+
+#~ msgid "Name:"
+#~ msgstr "Імя:"
+
+#, fuzzy
+#~ msgid "Description:"
+#~ msgstr "Апісанне: %s"
+
+#, fuzzy
+#~ msgid "Address:"
+#~ msgstr "_Адрас:"
+
+#, fuzzy
+#~ msgid "You can not start a new conversation unless you are connected."
+#~ msgstr ""
+#~ "Вы не можаце ўдзельнічаць у групавой размове, не злучыўшыся з серверам."
+
+#, fuzzy
+#~ msgid "Occupants"
+#~ msgstr "_Дзеянні ўдзельнікаў"
+
+#, fuzzy
+#~ msgid "File transfer error"
+#~ msgstr "Памылка перадачы файла"
+
+#, fuzzy
+#~ msgid "No Accounts available"
+#~ msgstr "Рахункаў няма"
+
+#~ msgid "_Modify Account..."
+#~ msgstr "_Змяніць рахунак..."
+
+#~ msgid "Boolean"
+#~ msgstr "Лагічнае"
+
+#~ msgid "Integer"
+#~ msgstr "Цэлы лік"
+
+#~ msgid "Text"
+#~ msgstr "Тэкставае"
+
+#~ msgid "Value"
+#~ msgstr "Значэнне"
+
+#~ msgid "Type"
+#~ msgstr "Тып"
+
+#~ msgid "(None)"
+#~ msgstr "(Няма)"
+
+#~ msgid "Hidden"
+#~ msgstr "Схаваны"
+
+#~ msgid "Manage Proxy Profiles"
+#~ msgstr "Кіраванне профілямі проксі"
+
+#, fuzzy
+#~ msgid "Properties"
+#~ msgstr "<b>Уласцівасці</b>"
+
+#, fuzzy
+#~ msgid "Proxy _Host"
+#~ msgstr "Проксі:"
+
+#, fuzzy
+#~ msgid "Proxy _Port"
+#~ msgstr "_Порт:"
+
+#, fuzzy
+#~ msgid "New Groupchat"
+#~ msgstr "Новая групавая размова"
+
+#, fuzzy
+#~ msgid "New Contact"
+#~ msgstr "Дадаць новага чалавека"
+
 #~ msgid "%s GiB"
 #~ msgstr "%s ГіБ"
 
@@ -11217,9 +11981,6 @@ msgstr "Памылка злучэння"
 #~ msgid "_Pause"
 #~ msgstr "_Прыпыніць"
 
-#~ msgid "Clean _up"
-#~ msgstr "Па_чысціць"
-
 #~ msgid "Remove file transfer from the list."
 #~ msgstr "Выдаліць перадачу файла з спіса."
 
@@ -11785,10 +12546,6 @@ msgstr "Памылка злучэння"
 #~ msgid "Nick"
 #~ msgstr "Мянушка"
 
-#, fuzzy
-#~ msgid "Banning…"
-#~ msgstr "Забараніць казанне..."
-
 #~ msgid ""
 #~ "<b>Whom do you want to ban?</b>\n"
 #~ "\n"
@@ -11858,13 +12615,6 @@ msgstr "Памылка злучэння"
 #~ msgstr "Фільтар:"
 
 #, fuzzy
-#~ msgid ""
-#~ "If checked, Gajim will display the mood of contacts in the roster window"
-#~ msgstr ""
-#~ "Калі гэтая опцыя ўключаная, Gajim паказвае аватары ў галоўным вакне і ў "
-#~ "групавых размовах"
-
-#, fuzzy
 #~ msgid "<b>Chat Appearance</b>"
 #~ msgstr "<b>Змяніць правіла</b>"
 
@@ -12106,10 +12856,6 @@ msgstr "Памылка злучэння"
 #~ msgstr "П_аведамленне стану:"
 
 #, fuzzy
-#~ msgid "Group chat highlight"
-#~ msgstr "Фарбаванае паведамленне ў групавой размове"
-
-#, fuzzy
 #~ msgid "Your nickname"
 #~ msgstr "П_ерад мянушкай:"
 
@@ -12272,9 +13018,6 @@ msgstr "Памылка злучэння"
 #~ msgid "The passwords typed in both fields must be identical."
 #~ msgstr "Паролі ў абодвух палях павінны быць аднолькавымі."
 
-#~ msgid "Enter new password:"
-#~ msgstr "Увядзіце новы пароль:"
-
 #~ msgid "Enter it again for confirmation:"
 #~ msgstr "Увядзіце для пацверджання:"
 
@@ -12290,10 +13033,6 @@ msgstr "Памылка злучэння"
 #~ msgstr "запыт адпіскі ад %s"
 
 #, fuzzy
-#~ msgid "Autojoin"
-#~ msgstr "Аўтаматычна далучацца"
-
-#, fuzzy
 #~ msgid "Homepage:"
 #~ msgstr "У Сеціве:"
 
@@ -12388,9 +13127,6 @@ msgstr "Памылка злучэння"
 #~ msgid "Forward unread message then disconnect"
 #~ msgstr "%d нечытанае паведамленне"
 
-#~ msgid "AIM Address:"
-#~ msgstr "Адрас AIM:"
-
 #~ msgid "MSN Address:"
 #~ msgstr "Адрас MSN:"
 
@@ -12612,9 +13348,6 @@ msgstr "Памылка злучэння"
 #~ msgid "Server:"
 #~ msgstr "Сервер:"
 
-#~ msgid "Password:"
-#~ msgstr "Пароль:"
-
 #, fuzzy
 #~ msgid "Join this room _automatically when I connect"
 #~ msgstr "Увайсці ў гэты пакой па злучэнні"
@@ -12631,10 +13364,6 @@ msgstr "Памылка злучэння"
 #~ msgid "Requires gnome-network-manager"
 #~ msgstr "Кіраўнік журналаў"
 
-#, fuzzy
-#~ msgid "This contact does not support file transfer."
-#~ msgstr "Спіс актыўных, скончаных і спыненых перадачаў файлаў"
-
 #~ msgid ""
 #~ "You have to install %s dictionary to use spellchecking, or choose another "
 #~ "language by setting the speller_language option."
@@ -12902,9 +13631,6 @@ msgstr "Памылка злучэння"
 #~ msgid "_Edit Personal Information..."
 #~ msgstr "Змяніць асабістыя звесткі..."
 
-#~ msgid "Information about you, as stored in the server"
-#~ msgstr "Звесткі аб Вас, якія захоўваюцца на серверы"
-
 #~ msgid "<b>Personal Information</b>"
 #~ msgstr "<b>Асабістыя звесткі</b>"
 
@@ -12945,12 +13671,6 @@ msgstr "Памылка злучэння"
 #~ msgid "Account Name Already Used"
 #~ msgstr "Назва рахунка ўжо скарыстаная"
 
-#~ msgid ""
-#~ "This name is already used by another of your accounts. Please choose "
-#~ "another name."
-#~ msgstr ""
-#~ "Гэтая назва ўжо скарыстаная для іншага рахунка. Выберыце іншую назву."
-
 #~ msgid "Invalid account name"
 #~ msgstr "Няправільная назва рахунка"
 
@@ -12985,9 +13705,6 @@ msgstr "Памылка злучэння"
 #~ msgid "Your server can't save your personal information."
 #~ msgstr "Сервер не можа захаваць Вашыя асабістыя звесткі."
 
-#~ msgid "Account Local already exists."
-#~ msgstr "Мясцовы рахунак Local ужо існуе."
-
 #~ msgid "Please rename or remove it before enabling link-local messaging."
 #~ msgstr ""
 #~ "Змяніце назву альбо выдаліце яго, каб скарыстаць мясцовыя паведамленні."
@@ -13060,10 +13777,6 @@ msgstr "Памылка злучэння"
 #~ msgid "The following message was NOT encrypted"
 #~ msgstr "[Гэтае паведамленне зашыфраванае]"
 
-#, fuzzy
-#~ msgid "Encryption used for this contact."
-#~ msgstr "Ці ўжыты OpenPGP ў размове з гэтым чалавекам?"
-
 #~ msgid "Toggle Open_PGP Encryption"
 #~ msgstr "Пераключыць шыфраванне Open_PGP"
 
@@ -13132,10 +13845,6 @@ msgstr "Памылка злучэння"
 #~ msgid "Add _Contact..."
 #~ msgstr "_Дадаць чалавека..."
 
-#, fuzzy
-#~ msgid "_Accounts"
-#~ msgstr "Рахункі"
-
 #~ msgid "Profile, A_vatar"
 #~ msgstr "Профіль, а_ватар"
 
@@ -13331,14 +14040,6 @@ msgstr "Памылка злучэння"
 #~ msgstr "Актывізаваны"
 
 #, fuzzy
-#~ msgid "Join _Group Chat..."
-#~ msgstr "Удзельнічаць у _групавой размове"
-
-#, fuzzy
-#~ msgid "_Modify Account"
-#~ msgstr "Змяніць рахунак"
-
-#, fuzzy
 #~ msgid "Check on startup if Gajim is the _default Jabber client"
 #~ msgstr ""
 #~ "Заўсёды пры запуску спраўджваць, ці з'яўляецца Gajim _прадвызначанай "
@@ -13883,9 +14584,6 @@ msgstr "Памылка злучэння"
 #~ msgid "Nickname not found: %s"
 #~ msgstr "Мянушка не знойдзеная: %s"
 
-#~ msgid "This group chat has no subject"
-#~ msgstr "Для гэтай групавой размовы не вызначаная тэма размовы"
-
 #, fuzzy
 #~ msgid ""
 #~ "Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
@@ -13960,9 +14658,6 @@ msgstr "Памылка злучэння"
 #~ "Пстрыкніце, каб праглядзець спіс здольнасцяў jabber-сервераў (напр., "
 #~ "транспарты MSN, ICQ)"
 
-#~ msgid "_Host:"
-#~ msgstr "_Вузел:"
-
 #~ msgid "Modify Account"
 #~ msgstr "Змяніць рахунак"
 
@@ -14212,9 +14907,6 @@ msgstr "Памылка злучэння"
 #~ msgid "Session Management support not available (missing gnome.ui module)"
 #~ msgstr "Падтрымка працоўных сеансаў адсутнічае (няма модуля gnome.ui)"
 
-#~ msgid "Private Chat"
-#~ msgstr "Прыватная размова"
-
 #~ msgid "%s does not appear to be a valid JID"
 #~ msgstr "%s не з'яўляецца карэктным JID"
 
@@ -14273,9 +14965,6 @@ msgstr "Памылка злучэння"
 #~ msgid "Connection to host could not be established"
 #~ msgstr "Немагчыма ўсталяваць злучэнне з вузлом"
 
-#~ msgid "A_fter nickname:"
-#~ msgstr "_Пасля мянушкі:"
-
 #~ msgid "_After time:"
 #~ msgstr "_Праз пэўны час:"
 
diff --git a/po/be@latin.po b/po/be@latin.po
index 68273b5e9..a2a6e54d9 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: 2019-07-02 02:06+0000\n"
+"POT-Creation-Date: 2019-08-11 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,71 +19,71 @@ 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:550
+#: gajim/chat_control_base.py:557
 msgid "_Undo"
 msgstr ""
 
-#: gajim/chat_control_base.py:558 gajim/conversation_textview.py:529
+#: gajim/chat_control_base.py:565 gajim/conversation_textview.py:529
 msgid "_Clear"
 msgstr ""
 
-#: gajim/chat_control_base.py:563
+#: gajim/chat_control_base.py:570
 msgid "Paste as quote"
 msgstr ""
 
-#: gajim/chat_control_base.py:613
+#: gajim/chat_control_base.py:620
 #, fuzzy
 msgid "Paste Image"
 msgstr "Abiary vyjavu"
 
-#: gajim/chat_control_base.py:614
+#: gajim/chat_control_base.py:621
 #, fuzzy
 msgid "You are trying to paste an image"
 msgstr "Niama złučeńnia z serveram"
 
-#: gajim/chat_control_base.py:615
+#: gajim/chat_control_base.py:622
 #, 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:617 gajim/groupchat_control.py:2310
-#: gajim/roster_window.py:2848 gajim/roster_window.py:4167
-#: gajim/message_window.py:252 gajim/gtk/dialogs.py:418
+#: gajim/chat_control_base.py:624 gajim/groupchat_control.py:2218
+#: gajim/roster_window.py:2841 gajim/roster_window.py:4118
+#: gajim/message_window.py:359 gajim/gtk/dialogs.py:330
 #, fuzzy
 msgid "_Do not ask me again"
 msgstr "_Bolš nie pytajsia"
 
-#: gajim/chat_control_base.py:620
+#: gajim/chat_control_base.py:627
 msgid "_Paste"
 msgstr ""
 
-#: gajim/chat_control_base.py:1162 gajim/gtk/accounts.py:351
+#: gajim/chat_control_base.py:1169 gajim/gtk/accounts.py:354
 #, fuzzy
 msgid "Privacy"
 msgstr "Śpis pryvatnaści"
 
-#: gajim/chat_control_base.py:1163
+#: gajim/chat_control_base.py:1170
 #, fuzzy
 msgid "Warning"
 msgstr "Blakavańnie %s"
 
-#: gajim/chat_control_base.py:1164
+#: gajim/chat_control_base.py:1171
 #, python-format
 msgid "If you send a file to <b>%s</b>, your real JID will be revealed."
 msgstr ""
 
-#: gajim/chat_control_base.py:1169
+#: gajim/chat_control_base.py:1176
 #, fuzzy
 msgid "Continue"
 msgstr "_Praciahni"
 
-#: gajim/gtkgui_helpers.py:163 gajim/gtk/filetransfer.py:393
+#: gajim/gtkgui_helpers.py:163 gajim/gtk/filetransfer.py:398
 #, fuzzy, python-format
 msgid "Cannot overwrite existing file '%s'"
 msgstr "Niemahčyma nadpisać fajł \"%s\""
 
-#: gajim/gtkgui_helpers.py:164 gajim/gtk/filetransfer.py:394
+#: gajim/gtkgui_helpers.py:164 gajim/gtk/filetransfer.py:399
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
@@ -175,232 +175,226 @@ msgstr ""
 msgid " resource with priority "
 msgstr " krynica z pryjarytetam "
 
-#: gajim/gui_menu_builder.py:96
-#, fuzzy
-msgid "_New Group Chat"
-msgstr "Novaja hrupavaja razmova"
-
-#: gajim/gui_menu_builder.py:289 gajim/gui_menu_builder.py:380
-#: gajim/chat_control.py:303 gajim/roster_window.py:786
-#: gajim/roster_window.py:1719 gajim/roster_window.py:1721
-#: gajim/roster_window.py:2030 gajim/roster_window.py:3336
-#: gajim/roster_window.py:3369 gajim/gui_interface.py:413
-#: gajim/common/contacts.py:206 gajim/common/contacts.py:343
-#: gajim/common/helpers.py:83 gajim/common/helpers.py:311
-#: gajim/gtk/add_contact.py:319 gajim/gtk/subscription_request.py:70
-#: gajim/gtk/subscription_request.py:99 gajim/gtk/roster_item_exchange.py:112
-msgid "Not in Roster"
-msgstr "Niama ŭ śpisie"
+#: gajim/gui_menu_builder.py:251 gajim/gui_menu_builder.py:342
+#: gajim/chat_control.py:305 gajim/roster_window.py:783
+#: gajim/roster_window.py:1716 gajim/roster_window.py:1718
+#: gajim/roster_window.py:2027 gajim/roster_window.py:3292
+#: gajim/roster_window.py:3325 gajim/gui_interface.py:396
+#: gajim/common/contacts.py:222 gajim/common/contacts.py:359
+#: gajim/common/contacts.py:471 gajim/common/helpers.py:86
+#: gajim/common/helpers.py:317 gajim/gtk/add_contact.py:319
+#: gajim/gtk/subscription_request.py:70 gajim/gtk/subscription_request.py:99
+#: 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:393
-msgid "I would like to add you to my roster"
-msgstr "Ja chaču dadać ciabie da svajho śpisu kantaktaŭ"
+#: gajim/gui_menu_builder.py:355
+#, 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:471
+#: gajim/gui_menu_builder.py:433
 #, fuzzy
 msgid "Send Single _Message…"
 msgstr "Vyšli _asobnaje paviedamleńnie"
 
-#: gajim/gui_menu_builder.py:486
+#: gajim/gui_menu_builder.py:448
 #, fuzzy
 msgid "E_xecute Command…"
 msgstr "_Vykanaj zahad..."
 
-#: gajim/gui_menu_builder.py:494
+#: gajim/gui_menu_builder.py:456
 #, fuzzy
 msgid "_Manage Transport"
 msgstr "Transparty"
 
-#: gajim/gui_menu_builder.py:500
+#: gajim/gui_menu_builder.py:462
 #, fuzzy
 msgid "_Modify Transport"
 msgstr "Pakažy _transparty"
 
-#: gajim/gui_menu_builder.py:507 gajim/roster_window.py:5046
+#: gajim/gui_menu_builder.py:469 gajim/roster_window.py:4985
 #, fuzzy
 msgid "_Rename…"
 msgstr "Źmiani _nazvu"
 
-#: gajim/gui_menu_builder.py:518 gajim/roster_window.py:5062
-#: gajim/roster_window.py:5177 gajim/data/gui/blocked_contacts_window.ui:52
+#: gajim/gui_menu_builder.py:480 gajim/roster_window.py:5001
+#: gajim/roster_window.py:5116 gajim/data/gui/blocked_contacts_window.ui:52
 #: gajim/data/gui/gc_occupants_menu.ui:148
 #: gajim/data/gui/contact_context_menu.ui:143
 msgid "_Unblock"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:521 gajim/roster_window.py:5067
-#: gajim/roster_window.py:5181 gajim/data/gui/gc_occupants_menu.ui:140
+#: gajim/gui_menu_builder.py:483 gajim/roster_window.py:5006
+#: gajim/roster_window.py:5120 gajim/data/gui/gc_occupants_menu.ui:140
 #: gajim/data/gui/contact_context_menu.ui:151
 msgid "_Block"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:529 gajim/roster_window.py:5074
+#: gajim/gui_menu_builder.py:491 gajim/roster_window.py:5013
 #: gajim/data/gui/contact_context_menu.ui:181
 #, fuzzy
 msgid "Remo_ve"
 msgstr "_Vydal"
 
-#: gajim/gui_menu_builder.py:539 gajim/data/gui/contact_context_menu.ui:198
+#: gajim/gui_menu_builder.py:501 gajim/data/gui/contact_context_menu.ui:198
 #, fuzzy
 msgid "_Information"
 msgstr "Źviestki ab kantakcie"
 
-#: gajim/gui_menu_builder.py:552
+#: gajim/gui_menu_builder.py:514
 #, fuzzy
 msgid "Save _As"
 msgstr "Nie razmaŭlaju "
 
-#: gajim/gui_menu_builder.py:564 gajim/groupchat_control.py:501
-#: gajim/chat_control.py:340
+#: gajim/gui_menu_builder.py:526 gajim/groupchat_control.py:507
+#: gajim/chat_control.py:342
 #, fuzzy
 msgid "Send File…"
 msgstr "Vyšli _fajł"
 
-#: gajim/gui_menu_builder.py:565
+#: gajim/gui_menu_builder.py:527
 #, fuzzy
 msgid "Upload File…"
 msgstr "Zapišy fajł jak..."
 
-#: gajim/gui_menu_builder.py:566
+#: gajim/gui_menu_builder.py:528
 #, fuzzy
 msgid "Send File Directly…"
 msgstr "Zapišy fajł jak..."
 
-#: gajim/gui_menu_builder.py:568 gajim/gui_menu_builder.py:632
+#: gajim/gui_menu_builder.py:530 gajim/gui_menu_builder.py:596
 #, fuzzy
 msgid "Send Chatstate"
 msgstr "Apošni status: %s"
 
-#: gajim/gui_menu_builder.py:569
+#: gajim/gui_menu_builder.py:531
 #, fuzzy
 msgid "Invite Contacts"
 msgstr "Kantakty"
 
-#: gajim/gui_menu_builder.py:570
+#: gajim/gui_menu_builder.py:532
 #, fuzzy
-msgid "Add to Roster"
-msgstr "_Dadaj u śpis kantaktaŭ"
+msgid "Add to Contact List"
+msgstr "_Dadaj kantakt..."
 
-#: gajim/gui_menu_builder.py:571
-msgid "Audio Session"
-msgstr ""
+#: gajim/gui_menu_builder.py:533
+#, fuzzy
+msgid "Voice Chat"
+msgstr "Zapyt na pieradaču fajłu"
 
-#: gajim/gui_menu_builder.py:572
-msgid "Video Session"
-msgstr ""
+#: gajim/gui_menu_builder.py:534
+#, fuzzy
+msgid "Video Chat"
+msgstr "Прыватная размова"
 
-#: gajim/gui_menu_builder.py:573
+#: gajim/gui_menu_builder.py:535 gajim/gui_menu_builder.py:582
 #, fuzzy
 msgid "Information"
 msgstr "Źviestki ab kantakcie"
 
-#: gajim/gui_menu_builder.py:574 gajim/gui_menu_builder.py:639
+#: gajim/gui_menu_builder.py:536 gajim/gui_menu_builder.py:602
 #: gajim/data/gui/application_menu.ui:37
 #, fuzzy
 msgid "History"
 msgstr "_Žurnał razmoŭ"
 
-#: gajim/gui_menu_builder.py:580 gajim/gui_menu_builder.py:687
+#: gajim/gui_menu_builder.py:542 gajim/gui_menu_builder.py:650
 #: gajim/data/gui/preferences_window.ui:1823
 msgid "Disabled"
 msgstr "Adklučana"
 
-#: gajim/gui_menu_builder.py:581 gajim/gui_menu_builder.py:688
+#: gajim/gui_menu_builder.py:543 gajim/gui_menu_builder.py:651
 #, fuzzy
 msgid "Composing only"
 msgstr "Uvod paviedamleńnia"
 
-#: gajim/gui_menu_builder.py:582 gajim/gui_menu_builder.py:689
+#: gajim/gui_menu_builder.py:544 gajim/gui_menu_builder.py:652
 #, fuzzy
 msgid "All chat states"
 msgstr "Usie statusy"
 
-#: gajim/gui_menu_builder.py:620
+#: gajim/gui_menu_builder.py:583
 #, fuzzy
-msgid "Manage Room"
-msgstr "Kiruj zakładkami"
+msgid "Manage Group Chat"
+msgstr "Pakiń pakoji"
 
-#: gajim/gui_menu_builder.py:621
+#: gajim/gui_menu_builder.py:584 gajim/data/gui/groupchat_control.ui:649
 #, fuzzy
 msgid "Change Subject"
 msgstr "Źmiani _temu"
 
-#: gajim/gui_menu_builder.py:622
+#: gajim/gui_menu_builder.py:585
 #, fuzzy
-msgid "Configure Room"
-msgstr "Kanfihuruj _pakoj"
+msgid "Configure Group Chat"
+msgstr "Pakiń pakoji"
 
-#: gajim/gui_menu_builder.py:623
+#: gajim/gui_menu_builder.py:586
 #, fuzzy
 msgid "Upload Avatar…"
 msgstr "Abiary vyjavu"
 
-#: gajim/gui_menu_builder.py:624
+#: gajim/gui_menu_builder.py:587
 #, fuzzy
-msgid "Destroy Room"
-msgstr "Apisańnie: %s"
+msgid "Destroy Group Chat"
+msgstr "Novaja hrupavaja razmova"
 
-#: gajim/gui_menu_builder.py:626 gajim/data/gui/preferences_window.ui:790
+#: gajim/gui_menu_builder.py:589 gajim/data/gui/preferences_window.ui:790
 #, fuzzy
 msgid "Chat Settings"
 msgstr "Niemahvyma dałučycca"
 
-#: gajim/gui_menu_builder.py:627
+#: gajim/gui_menu_builder.py:590
 msgid "Show join/leave"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:628
+#: gajim/gui_menu_builder.py:591
 #, fuzzy
 msgid "Show status changes"
 msgstr "_Zachoŭvać u žurnale źmieny statusu kantaktaŭ"
 
-#: gajim/gui_menu_builder.py:629 gajim/data/gui/gc_control_popup_menu.ui:72
+#: gajim/gui_menu_builder.py:592 gajim/data/gui/gc_control_popup_menu.ui:72
 #, fuzzy
 msgid "Notify on all messages"
 msgstr "Šablony paviedamleńniaŭ statusu:"
 
-#: gajim/gui_menu_builder.py:630
+#: gajim/gui_menu_builder.py:593
 msgid "Minimize on close"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:631
-msgid "Minimize on autojoin"
+#: gajim/gui_menu_builder.py:595
+msgid "Minimize when joining automatically"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:634
+#: gajim/gui_menu_builder.py:598
 msgid "Sync Threshold"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:635
+#: gajim/gui_menu_builder.py:599
 #, fuzzy
-msgid "Change Nick"
+msgid "Change Nickname"
 msgstr "Źmiani _mianušku"
 
-#: gajim/gui_menu_builder.py:636
-#, fuzzy
-msgid "Bookmark Room"
-msgstr "_Stvary zakładku dla hetaja pakoju"
-
-#: gajim/gui_menu_builder.py:637
+#: gajim/gui_menu_builder.py:600
 #, fuzzy
 msgid "Request Voice"
 msgstr "_Daj hołas"
 
-#: gajim/gui_menu_builder.py:638 gajim/roster_window.py:5246
+#: gajim/gui_menu_builder.py:601 gajim/roster_window.py:5185
 #, fuzzy
 msgid "Execute command"
 msgstr "_Vykanaj zahad..."
 
-#: gajim/gui_menu_builder.py:640
-#, fuzzy
-msgid "Disconnect"
-msgstr "Kantakt adłučyŭsia"
+#: gajim/gui_menu_builder.py:603
+msgid "Leave"
+msgstr ""
 
-#: gajim/gui_menu_builder.py:678 gajim/gtk/preferences.py:156
+#: gajim/gui_menu_builder.py:641 gajim/gtk/preferences.py:155
 msgid "No threshold"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:680 gajim/gtk/preferences.py:158
+#: gajim/gui_menu_builder.py:643 gajim/gtk/preferences.py:157
 #, fuzzy, python-format
 msgid "%i day"
 msgid_plural "%i days"
@@ -408,159 +402,174 @@ msgstr[0] "%i dzion tamu"
 msgstr[1] "%i dzion tamu"
 msgstr[2] "%i dzion tamu"
 
-#: gajim/gui_menu_builder.py:709 gajim/gui_menu_builder.py:747
-#: gajim/gtk/join_groupchat.py:43
-msgid "Join Group Chat"
-msgstr "Dałučysia da pakoju"
-
-#: gajim/gui_menu_builder.py:746
+#: gajim/gui_menu_builder.py:672
 #, fuzzy
 msgid "Add Contact…"
 msgstr "_Dadaj kantakt..."
 
-#: gajim/gui_menu_builder.py:748 gajim/gtk/profile.py:52
-#: gajim/gtk/accounts.py:770 gajim/gtk/accounts.py:808
+#: gajim/gui_menu_builder.py:673 gajim/gtk/profile.py:52
+#: gajim/gtk/accounts.py:773 gajim/gtk/accounts.py:811
 #, fuzzy
 msgid "Profile"
 msgstr "fajł"
 
-#: gajim/gui_menu_builder.py:749
+#: gajim/gui_menu_builder.py:674
+#, fuzzy
+msgid "Send Single Message…"
+msgstr "Vyšli _asobnaje paviedamleńnie"
+
+#: gajim/gui_menu_builder.py:675
 #, fuzzy
 msgid "Discover Services"
 msgstr "_Šukaj servisy"
 
-#: gajim/gui_menu_builder.py:750
+#: gajim/gui_menu_builder.py:676 gajim/gtk/server_info.py:36
 #, fuzzy
-msgid "Send Single Message…"
-msgstr "Vyšli _asobnaje paviedamleńnie"
+msgid "Server Info"
+msgstr "Server"
 
-#: gajim/gui_menu_builder.py:751 gajim/data/gui/preferences_window.ui:2741
+#: gajim/gui_menu_builder.py:677 gajim/data/gui/preferences_window.ui:2741
 msgid "Advanced"
 msgstr "Pašyranyja"
 
-#: gajim/gui_menu_builder.py:752 gajim/gtk/mam_preferences.py:88
+#: gajim/gui_menu_builder.py:678 gajim/gtk/mam_preferences.py:88
 #, fuzzy
 msgid "Archiving Preferences"
 msgstr "_Nałady"
 
-#: gajim/gui_menu_builder.py:753
+#: gajim/gui_menu_builder.py:679
 #, fuzzy
 msgid "Blocking List"
 msgstr "Śpis zablakavanych kantaktaŭ"
 
-#: gajim/gui_menu_builder.py:754 gajim/gtk/history_sync.py:108
+#: gajim/gui_menu_builder.py:680
+#, fuzzy
+msgid "Bookmarks"
+msgstr "_Stvary zakładku dla hetaja pakoju"
+
+#: gajim/gui_menu_builder.py:681
+#, fuzzy
+msgid "PEP Configuration"
+msgstr "Kanfihuracyja pakoju"
+
+#: gajim/gui_menu_builder.py:682 gajim/gtk/history_sync.py:108
 #: gajim/gtk/history_sync.py:186
 #, fuzzy
 msgid "Synchronise History"
 msgstr "Pakažy _adłučanyja kantakty"
 
-#: gajim/gui_menu_builder.py:755 gajim/gtk/privacy_list.py:427
+#: gajim/gui_menu_builder.py:683 gajim/gtk/privacy_list.py:427
 msgid "Privacy Lists"
 msgstr "Śpisy pryvatnaści"
 
-#: gajim/gui_menu_builder.py:756 gajim/gtk/server_info.py:36
-#, fuzzy
-msgid "Server Info"
-msgstr "Server"
-
-#: gajim/gui_menu_builder.py:757 gajim/gui_menu_builder.py:768
+#: gajim/gui_menu_builder.py:685 gajim/gui_menu_builder.py:696
 #: gajim/data/gui/xml_console_window.ui:77
 msgid "XML Console"
 msgstr "Kansol XML"
 
-#: gajim/gui_menu_builder.py:759 gajim/data/gui/groupchat_config.ui:36
+#: gajim/gui_menu_builder.py:687 gajim/data/gui/groupchat_config.ui:36
 #, fuzzy
 msgid "Admin"
 msgstr "_Administratar"
 
-#: gajim/gui_menu_builder.py:760
+#: gajim/gui_menu_builder.py:688
 #, fuzzy
 msgid "Send Server Message…"
 msgstr "_Dašli paviedamleńnie servera"
 
-#: gajim/gui_menu_builder.py:761
+#: gajim/gui_menu_builder.py:689
 #, fuzzy
 msgid "Set MOTD…"
 msgstr "Vyznač MOTD"
 
-#: gajim/gui_menu_builder.py:762
+#: gajim/gui_menu_builder.py:690
 #, fuzzy
 msgid "Update MOTD…"
 msgstr "Aktualizuj MOTD"
 
-#: gajim/gui_menu_builder.py:763
+#: gajim/gui_menu_builder.py:691
 #, fuzzy
 msgid "Delete MOTD…"
 msgstr "Vydal MOTD"
 
-#: gajim/gui_menu_builder.py:812
+#: gajim/gui_menu_builder.py:736
 #, fuzzy
-msgid "No Accounts available"
-msgstr "Konty niedastupnyja"
+msgid "_Add Account…"
+msgstr "_Dadaj kantakt..."
+
+#: gajim/gui_menu_builder.py:742
+#, fuzzy
+msgid "_Modify Accounts…"
+msgstr "Madyfikuj kont"
+
+#: gajim/gui_menu_builder.py:751 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:823 gajim/data/gui/application_menu.ui:5
-#: gajim/data/gui/application_menu.ui:71 gajim/data/gui/shortcuts_window.ui:182
-#: gajim/gtk/accounts.py:58
+#: gajim/gui_menu_builder.py:755 gajim/data/gui/application_menu.ui:5
+#: gajim/data/gui/shortcuts_window.ui:182 gajim/gtk/accounts.py:57
 msgid "Accounts"
 msgstr "Konty"
 
-#: gajim/gui_menu_builder.py:881 gajim/gui_menu_builder.py:886
+#: gajim/gui_menu_builder.py:784 gajim/gui_menu_builder.py:789
 #, fuzzy
-msgid "Copy JID"
-msgstr "Pakoj:"
+msgid "Copy XMPP Address"
+msgstr "S_kapijuj JID/Email"
 
-#: gajim/gui_menu_builder.py:882 gajim/gui_menu_builder.py:914
+#: gajim/gui_menu_builder.py:785 gajim/gui_menu_builder.py:817
 #, fuzzy
 msgid "Join Groupchat"
 msgstr "Dałučysia da pakoju"
 
-#: gajim/gui_menu_builder.py:887 gajim/gui_menu_builder.py:913
-#: gajim/data/gui/application_menu.ui:76
+#: gajim/gui_menu_builder.py:790 gajim/gui_menu_builder.py:816
+#: gajim/data/gui/application_menu.ui:71
 #: gajim/data/gui/subscription_request_window.ui:106
 msgid "Start Chat"
 msgstr "Pačni razmovu"
 
-#: gajim/gui_menu_builder.py:888 gajim/gui_menu_builder.py:915
+#: gajim/gui_menu_builder.py:791 gajim/gui_menu_builder.py:818
 #, fuzzy
-msgid "Add to Roster…"
-msgstr "_Dadaj u śpis kantaktaŭ"
+msgid "Add to Contact List…"
+msgstr "_Dadaj kantakt..."
 
-#: gajim/gui_menu_builder.py:893
+#: gajim/gui_menu_builder.py:796
 #, fuzzy
 msgid "Copy Link Location"
 msgstr "S_kapijuj adras spasyłki"
 
-#: gajim/gui_menu_builder.py:894
+#: gajim/gui_menu_builder.py:797
 #, fuzzy
 msgid "Open Link in Browser"
 msgstr "_Adčyni spasyłku ŭ hartačy"
 
-#: gajim/gui_menu_builder.py:899
+#: gajim/gui_menu_builder.py:802
 #, fuzzy
 msgid "Copy Email Address"
 msgstr "S_kapijuj JID/Email"
 
-#: gajim/gui_menu_builder.py:900 gajim/gui_menu_builder.py:912
+#: gajim/gui_menu_builder.py:803 gajim/gui_menu_builder.py:815
 #, fuzzy
 msgid "Open Email Composer"
 msgstr "_Adčyni paštovuju prahramu"
 
-#: gajim/gui_menu_builder.py:905
+#: gajim/gui_menu_builder.py:808
 #, fuzzy
 msgid "Copy Location"
 msgstr "S_kapijuj adras spasyłki"
 
-#: gajim/gui_menu_builder.py:906
+#: gajim/gui_menu_builder.py:809
 #, fuzzy
 msgid "Show Location"
 msgstr "Madyfikacyja kontu"
 
-#: gajim/gui_menu_builder.py:911
+#: gajim/gui_menu_builder.py:814
 #, fuzzy
-msgid "Copy JID/Email"
+msgid "Copy XMPP Address/Email"
 msgstr "S_kapijuj JID/Email"
 
-#: gajim/gui_menu_builder.py:945
+#: gajim/gui_menu_builder.py:852
 #, fuzzy
 msgid "Copy"
 msgstr "Pakoj:"
@@ -583,44 +592,55 @@ msgstr ""
 msgid "Choose folder for logfile"
 msgstr ""
 
-#: gajim/history_manager.py:107
+#: gajim/history_manager.py:106
 msgid "Cannot find history logs database"
 msgstr "Niemahčyma znajści bazu žurnałaŭ razmoŭ"
 
-#: gajim/history_manager.py:108
+#: gajim/history_manager.py:107
 #, fuzzy, python-format
 msgid "%s does not exist."
 msgstr "Takoha pakoju niama."
 
-#: gajim/history_manager.py:141 gajim/history_manager.py:195
-#: gajim/gtk/discovery.py:829 gajim/gtk/roster_item_exchange.py:80
-msgid "JID"
-msgstr "JID"
+#: gajim/history_manager.py:140 gajim/history_manager.py:194
+#: 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:30
+#: gajim/gtk/accounts.py:804
+#, fuzzy
+msgid "XMPP Address"
+msgstr "Adras AIM:"
 
-#: gajim/history_manager.py:154 gajim/history_manager.py:202
+#: gajim/history_manager.py:153 gajim/history_manager.py:201
 #: gajim/data/gui/history_window.ui:89 gajim/gtk/history.py:108
 msgid "Date"
 msgstr "Data"
 
-#: gajim/history_manager.py:161 gajim/history_manager.py:225
+#: gajim/history_manager.py:160 gajim/history_manager.py:224
 #: gajim/data/gui/join_groupchat_window.ui:208
 #: gajim/data/gui/profile_window.ui:214
 #: gajim/data/gui/vcard_information_window.ui:443
+#: gajim/data/gui/bookmarks.ui:140
 msgid "Nickname"
 msgstr "Mianuška"
 
-#: gajim/history_manager.py:172 gajim/history_manager.py:211
+#: gajim/history_manager.py:171 gajim/history_manager.py:210
 #: gajim/data/gui/preferences_window.ui:1344
 #: gajim/data/gui/single_message_window.ui:275 gajim/gtk/history.py:117
 msgid "Message"
 msgstr "Paviedamleńnie"
 
-#: gajim/history_manager.py:180 gajim/history_manager.py:218
+#: gajim/history_manager.py:179 gajim/history_manager.py:217
 #: gajim/data/gui/groups_post_window.ui:49
 #: gajim/data/gui/single_message_window.ui:214
 msgid "Subject"
 msgstr "Tema"
 
+#: gajim/history_manager.py:247
+msgid "Database Cleanup"
+msgstr ""
+
 #: gajim/history_manager.py:248
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
@@ -631,11 +651,8 @@ msgstr ""
 #: gajim/history_manager.py:250
 #, fuzzy
 msgid ""
-"Normally allocated database size will not be freed, it will just become "
-"reusable. If you really want to reduce database filesize, click YES, else "
-"click NO.\n"
-"\n"
-"In case you click YES, please wait…"
+"Normally, the allocated database size will not be freed, it will just become "
+"reusable. This operation may take a while."
 msgstr ""
 "Zvyčajna zaniataja bazaj źviestak prastora nie vyzvalajecca, ale "
 "rezervujecca dla paźniejšych patrebaŭ prahramy. Kali ty sapraŭdy chočaš "
@@ -644,26 +661,27 @@ msgstr ""
 "Kali ty abraŭ \"Tak\", pačakaj..."
 
 #: gajim/history_manager.py:255
-msgid "Database Cleanup"
-msgstr ""
+#, fuzzy
+msgid "_Cleanup"
+msgstr "Pry_biarysia"
 
-#: gajim/history_manager.py:519 gajim/gtk/filetransfer.py:238
-#: gajim/gtk/filetransfer.py:248
+#: gajim/history_manager.py:518 gajim/gtk/filetransfer.py:237
+#: gajim/gtk/filetransfer.py:247
 msgid "You"
 msgstr "Ty"
 
-#: gajim/history_manager.py:531
+#: gajim/history_manager.py:530
 #, 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:568 gajim/history_manager.py:607
-#: gajim/gtk/dialogs.py:58 gajim/gtk/themes.py:319
+#: gajim/history_manager.py:567 gajim/history_manager.py:606
+#: gajim/gtk/dialogs.py:57 gajim/gtk/themes.py:319
 #: gajim/gtk/roster_item_exchange.py:75 gajim/gtk/roster_item_exchange.py:185
 msgid "Delete"
 msgstr "Vydal"
 
-#: gajim/history_manager.py:569
+#: gajim/history_manager.py:568
 #, fuzzy
 msgid "Delete Conversation"
 msgid_plural "Delete Conversations"
@@ -671,7 +689,7 @@ msgstr[0] "Źviestki ab kantakcie"
 msgstr[1] "Źviestki ab kantakcie"
 msgstr[2] "Źviestki ab kantakcie"
 
-#: gajim/history_manager.py:570
+#: gajim/history_manager.py:569
 #, 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?"
@@ -679,7 +697,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:608
+#: gajim/history_manager.py:607
 #, fuzzy
 msgid "Delete Message"
 msgid_plural "Delete Messages"
@@ -687,7 +705,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:609
+#: gajim/history_manager.py:608
 #, fuzzy
 msgid "Do you want to permanently delete this message"
 msgid_plural "Do you want to permanently delete these messages"
@@ -701,15 +719,15 @@ msgid "Contact name: <i>%s</i>"
 msgstr "Nazva kantaktu: <i>%s</i>"
 
 #: gajim/dialogs.py:84
-#, fuzzy, python-format
-msgid "JID: <i>%s</i>"
-msgstr "JID: <i>%s</i>"
+#, python-format
+msgid "XMPP Address: <i>%s</i>"
+msgstr ""
 
-#: gajim/dialogs.py:115 gajim/dialogs.py:128 gajim/roster_window.py:2901
-#: gajim/roster_window.py:3833 gajim/roster_window.py:5084
-#: gajim/common/contacts.py:157 gajim/common/contacts.py:190
+#: gajim/dialogs.py:115 gajim/dialogs.py:128 gajim/roster_window.py:2894
+#: gajim/roster_window.py:3784 gajim/roster_window.py:5023
+#: gajim/common/contacts.py:157 gajim/common/contacts.py:206
 #: gajim/data/gui/preferences_window.ui:558
-#: gajim/data/gui/shortcuts_window.ui:177 gajim/gtk/accounts.py:349
+#: gajim/data/gui/shortcuts_window.ui:177 gajim/gtk/accounts.py:352
 msgid "General"
 msgstr "Ahulnaja"
 
@@ -756,7 +774,7 @@ msgstr "Paviedamleńnie statusu"
 msgid "Preset 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:703
+#: gajim/dialogs.py:703 gajim/plugins/gui.py:292
 msgid "_Overwrite"
 msgstr ""
 
@@ -768,9 +786,7 @@ msgstr "Zapišy jak šablon paviedamleńnia statusu"
 msgid "Please type a name for this status message"
 msgstr "Kali łaska, uviadzi nazvu dla hetaha paviedamleńnia statusu"
 
-#: gajim/dialogs.py:740 gajim/gui_interface.py:1441 gajim/dialog_messages.py:31
-#: gajim/gtk/discovery.py:518 gajim/gtk/profile.py:323
-#: gajim/gtk/join_groupchat.py:234
+#: gajim/dialogs.py:740 gajim/gtk/discovery.py:517 gajim/gtk/profile.py:323
 msgid "You are not connected to the server"
 msgstr "Niama złučeńnia z serveram"
 
@@ -779,9 +795,11 @@ msgstr "Niama złučeńnia z serveram"
 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:752 gajim/dialogs.py:823 gajim/gtk/discovery.py:822
-#: gajim/gtk/discovery.py:1648 gajim/gtk/discovery.py:1941
-#: gajim/gtk/history.py:99 gajim/gtk/roster_item_exchange.py:83
+#: gajim/dialogs.py:752 gajim/dialogs.py:823
+#: gajim/data/gui/groupchat_info_scrolled.ui:16 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/gtk/roster_item_exchange.py:83
 msgid "Name"
 msgstr "Nazva"
 
@@ -804,398 +822,344 @@ msgstr ""
 msgid "Synchronise"
 msgstr ""
 
-#: gajim/dialogs.py:1043
+#: gajim/dialogs.py:1042
 msgid "an audio and video"
 msgstr ""
 
-#: gajim/dialogs.py:1045
+#: gajim/dialogs.py:1044
 msgid "an audio"
 msgstr ""
 
-#: gajim/dialogs.py:1047
+#: gajim/dialogs.py:1046
 msgid "a video"
 msgstr ""
 
-#: gajim/dialogs.py:1051
+#: gajim/dialogs.py:1050
 #, python-format
 msgid ""
-"%(contact)s wants to start %(type)s session with you. Do you want to answer "
+"%(contact)s wants to start a %(type)s chat with you. Do you want to answer "
 "the call?"
 msgstr ""
 
-#: gajim/groupchat_control.py:505
+#: gajim/groupchat_control.py:511
 #, fuzzy, python-format
 msgid "Send File (max. %s MiB)…"
 msgstr "Zapišy fajł jak..."
 
-#: gajim/groupchat_control.py:507 gajim/chat_control.py:342
+#: gajim/groupchat_control.py:513 gajim/chat_control.py:344
 #, fuzzy
 msgid "No File Transfer available"
 msgstr "Pieradačy fajłaŭ"
 
-#: gajim/groupchat_control.py:630 gajim/groupchat_control.py:2349
-msgid "Changing Subject"
-msgstr "Źmianiajecca tema"
-
-#: gajim/groupchat_control.py:631 gajim/groupchat_control.py:2350
-msgid "Please specify the new subject:"
-msgstr "Kali łaska, vyznač novuju temu:"
-
-#: gajim/groupchat_control.py:638
-msgid "Changing Nickname"
-msgstr "Źmianiajecca mianuška"
-
-#: gajim/groupchat_control.py:639
-msgid "Please specify the new nickname you want to use:"
-msgstr "Kali łaska, vyznač dla siabie novuju mianušku:"
-
-#: gajim/groupchat_control.py:657
+#: gajim/groupchat_control.py:655
 #, fuzzy
-msgid "Invalid group chat JID"
+msgid "Invalid group chat XMPP Address"
 msgstr "Niapravilny JID pakoju"
 
-#: gajim/groupchat_control.py:658
+#: gajim/groupchat_control.py:656
 #, fuzzy
-msgid "The group chat JID has not allowed characters."
+msgid "The group chat XMPP Address has not allowed characters."
 msgstr "JID pakoju ŭtrymlivaje niedazvolenyja znaki."
 
-#: gajim/groupchat_control.py:758 gajim/gtk/profile.py:136
+#: gajim/groupchat_control.py:743 gajim/gtk/profile.py:136
 msgid "Could not load image"
 msgstr "Niemahčyma adčytać vyjavu"
 
-#: gajim/groupchat_control.py:888
+#: gajim/groupchat_control.py:873
 msgid "Insert Nickname"
 msgstr "Ustaŭ mianušku"
 
-#: gajim/groupchat_control.py:1056 gajim/chat_control.py:824
+#: gajim/groupchat_control.py:1041 gajim/chat_control.py:848
 #, fuzzy
 msgid "and authenticated"
 msgstr "Užyvaj aŭtaryzacyju"
 
-#: gajim/groupchat_control.py:1060 gajim/chat_control.py:828
+#: gajim/groupchat_control.py:1045 gajim/chat_control.py:852
 #, fuzzy
 msgid "and NOT authenticated"
 msgstr "Užyvaj aŭtaryzacyju"
 
-#: gajim/groupchat_control.py:1064
+#: gajim/groupchat_control.py:1049
 #, python-format
 msgid "%(type)s encryption is active %(authenticated)s."
 msgstr ""
 
-#: gajim/groupchat_control.py:1111
+#: gajim/groupchat_control.py:1096
 #, fuzzy
 msgid "Conversation with "
 msgstr "Žurnał razmoŭ"
 
-#: gajim/groupchat_control.py:1113
+#: gajim/groupchat_control.py:1098
 #, fuzzy
 msgid "Continued conversation"
 msgstr "Złučeńnie"
 
-#: gajim/groupchat_control.py:1411
+#: gajim/groupchat_control.py:1357
 #, 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:1433
-msgid "Room now shows unavailable members"
+#: gajim/groupchat_control.py:1374
+msgid "Group chat now shows unavailable members"
 msgstr ""
 
-#: gajim/groupchat_control.py:1436
-msgid "Room now does not show unavailable members"
-msgstr ""
+#: gajim/groupchat_control.py:1377
+#, fuzzy
+msgid "Group chat now does not show unavailable members"
+msgstr "Takoha pakoju niama."
 
-#: gajim/groupchat_control.py:1439
+#: gajim/groupchat_control.py:1380
 msgid "A setting not related to privacy has been changed"
 msgstr ""
 
-#: gajim/groupchat_control.py:1446
-msgid "Room logging is now enabled"
-msgstr ""
+#: gajim/groupchat_control.py:1387 gajim/groupchat_control.py:1659
+#, fuzzy
+msgid "Conversations are stored on the server"
+msgstr "Niama złučeńnia z serveram"
 
-#: gajim/groupchat_control.py:1449
-msgid "Room logging is now disabled"
-msgstr ""
+#: gajim/groupchat_control.py:1390
+#, fuzzy
+msgid "Conversations are not stored on the server"
+msgstr "Źviestki pra ciabie, jakija zachoŭvajucca na servery"
 
-#: gajim/groupchat_control.py:1452
-msgid "Room is now non-anonymous"
-msgstr ""
+#: gajim/groupchat_control.py:1393
+#, fuzzy
+msgid "Group chat is now non-anonymous"
+msgstr "Pakoji"
 
-#: gajim/groupchat_control.py:1456
-msgid "Room is now semi-anonymous"
-msgstr ""
+#: gajim/groupchat_control.py:1397
+#, fuzzy
+msgid "Group chat is now semi-anonymous"
+msgstr "Padśviatleńnie paviedamleńnia ŭ pakoji"
 
-#: gajim/groupchat_control.py:1460
-msgid "Room is now fully anonymous"
-msgstr ""
+#: gajim/groupchat_control.py:1401
+#, fuzzy
+msgid "Group chat is now fully anonymous"
+msgstr "Pakoji"
 
-#: gajim/groupchat_control.py:1500
+#: gajim/groupchat_control.py:1439
 #, python-format
 msgid "Ping? (%s)"
 msgstr ""
 
-#: gajim/groupchat_control.py:1503
+#: gajim/groupchat_control.py:1442
 #, python-format
 msgid "Pong! (%(nick)s %(delay)s s.)"
 msgstr ""
 
-#: gajim/groupchat_control.py:1506 gajim/chat_control.py:1213
+#: gajim/groupchat_control.py:1445 gajim/chat_control.py:1237
 #, fuzzy
 msgid "Error."
 msgstr "Pamyłka Avahi"
 
-#: gajim/groupchat_control.py:1711
+#: gajim/groupchat_control.py:1650
 #, fuzzy, python-format
-msgid "You (%s) joined the room"
+msgid "You (%s) joined the group chat"
 msgstr "%s dałučyŭsia da pakoju"
 
-#: gajim/groupchat_control.py:1717
-msgid "Any occupant is allowed to see your full JID"
+#: gajim/groupchat_control.py:1655
+msgid "Any participant is allowed to see your full XMPP Address"
 msgstr ""
 
-#: gajim/groupchat_control.py:1721
-msgid "Room logging is enabled"
-msgstr ""
-
-#: gajim/groupchat_control.py:1725
-msgid "The server has assigned or modified your roomnick"
-msgstr ""
+#: gajim/groupchat_control.py:1663
+#, fuzzy
+msgid "The server has assigned or modified your nickname in this group chat"
+msgstr "Źmiani _mianušku"
 
-#: gajim/groupchat_control.py:1732
+#: gajim/groupchat_control.py:1671
 #, fuzzy
-msgid "A new room has been created"
+msgid "A new group chat has been created"
 msgstr "Aŭtaryzacyja anulavanaja"
 
-#: gajim/groupchat_control.py:1740 gajim/privatechat_control.py:112
+#: gajim/groupchat_control.py:1679 gajim/privatechat_control.py:115
 #, python-format
 msgid "You are now known as %s"
 msgstr "Ciabie ciapier viedajuć jak %s"
 
-#: gajim/groupchat_control.py:1742 gajim/privatechat_control.py:114
+#: gajim/groupchat_control.py:1681 gajim/privatechat_control.py:117
 #, fuzzy, python-brace-format
 msgid "{nick} is now known as {new_nick}"
 msgstr "%s ciapier viadomy jak %s"
 
-#: gajim/groupchat_control.py:1767 gajim/privatechat_control.py:141
+#: gajim/groupchat_control.py:1706 gajim/privatechat_control.py:144
 #, fuzzy, python-brace-format
 msgid "You are now {show}{status}"
 msgstr "Ciabie ciapier viedajuć jak %s"
 
-#: gajim/groupchat_control.py:1773 gajim/privatechat_control.py:147
+#: gajim/groupchat_control.py:1712 gajim/privatechat_control.py:150
 #, fuzzy, python-brace-format
 msgid "{nick} is now {show}{status}"
 msgstr "%(nick)s maje ciapier status %(status)s"
 
-#: gajim/groupchat_control.py:1790 gajim/groupchat_control.py:1819
-#: gajim/groupchat_control.py:1849 gajim/groupchat_control.py:1909
+#: gajim/groupchat_control.py:1729 gajim/groupchat_control.py:1758
+#: gajim/groupchat_control.py:1788 gajim/groupchat_control.py:1848
 #, python-brace-format
 msgid " by {actor}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1793
+#: gajim/groupchat_control.py:1732
 #, python-brace-format
 msgid "** Your Affiliation has been set to {affiliation}{actor}{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1799
+#: gajim/groupchat_control.py:1738
 #, python-brace-format
 msgid "** Affiliation of {nick} has been set to {affiliation}{actor}{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1822
+#: gajim/groupchat_control.py:1761
 #, fuzzy, python-brace-format
 msgid "** Your Role has been set to {role}{actor}{reason}"
 msgstr "%(who)s vypchnuŭ %(nick)s: %(reason)s"
 
-#: gajim/groupchat_control.py:1827
+#: gajim/groupchat_control.py:1766
 #, fuzzy, python-brace-format
 msgid "** Role of {nick} has been set to {role}{actor}{reason}"
 msgstr "%(who)s vypchnuŭ %(nick)s: %(reason)s"
 
-#: gajim/groupchat_control.py:1852
+#: gajim/groupchat_control.py:1791
 #, fuzzy, python-brace-format
-msgid "You have been removed from the room{actor}{reason}"
+msgid "You have been removed from the group chat{actor}{reason}"
 msgstr "%(who)s vypchnuŭ %(nick)s: %(reason)s"
 
-#: gajim/groupchat_control.py:1857
+#: gajim/groupchat_control.py:1796
 #, python-brace-format
 msgid "You have left due to an error{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1863
+#: gajim/groupchat_control.py:1802
 #, python-brace-format
 msgid "You have been kicked{actor}{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1870
+#: gajim/groupchat_control.py:1809
 #, python-brace-format
 msgid "You have been banned{actor}{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1877 gajim/groupchat_control.py:1943
+#: gajim/groupchat_control.py:1816 gajim/groupchat_control.py:1882
 #, fuzzy
 msgid ": Affiliation changed"
 msgstr "Suviaź: "
 
-#: gajim/groupchat_control.py:1883 gajim/groupchat_control.py:1948
-msgid ": Room configuration changed to members-only"
+#: gajim/groupchat_control.py:1822 gajim/groupchat_control.py:1887
+msgid ": Group chat configuration changed to members-only"
 msgstr ""
 
-#: gajim/groupchat_control.py:1912
+#: gajim/groupchat_control.py:1851
 #, fuzzy, python-brace-format
-msgid "{nick} has been removed from the room{by}{reason}"
+msgid "{nick} has been removed from the group chat{by}{reason}"
 msgstr "%(who)s vypchnuŭ %(nick)s: %(reason)s"
 
-#: gajim/groupchat_control.py:1922
+#: gajim/groupchat_control.py:1861
 #, python-brace-format
 msgid "{nick} has left due to an error{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1928
+#: gajim/groupchat_control.py:1867
 #, fuzzy, python-brace-format
 msgid "{nick} has been kicked{actor}{reason}"
 msgstr "%(nick)s vypchnuty z pakoju: %(reason)s"
 
-#: gajim/groupchat_control.py:1936
+#: gajim/groupchat_control.py:1875
 #, fuzzy, python-brace-format
 msgid "{nick} has been banned{actor}{reason}"
 msgstr "%(nick)s zablakavany: %(reason)s"
 
-#: gajim/groupchat_control.py:1953
+#: gajim/groupchat_control.py:1892
 #, python-brace-format
 msgid "{nick} has left{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1970
+#: gajim/groupchat_control.py:1914
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s dałučyŭsia da pakoju"
 
-#: gajim/groupchat_control.py:1985 gajim/groupchat_control.py:1990
-#: gajim/groupchat_control.py:1995 gajim/groupchat_control.py:2000
-#: gajim/groupchat_control.py:2011
-msgid "Unable to join group chat"
-msgstr "Niemahčyma dałučycca da pakoju"
-
-#: gajim/groupchat_control.py:1986
-#, fuzzy, python-format
-msgid "You are banned from group chat <b>%s</b>."
-msgstr "Ty zablakavany ŭ hetym pakoji."
-
-#: gajim/groupchat_control.py:1991
-#, fuzzy, python-format
-msgid "Remote server <b>%s</b> does not exist."
-msgstr "Takoha pakoju niama."
-
-#: gajim/groupchat_control.py:1996
-#, fuzzy, python-format
-msgid "Group chat <b>%s</b> does not exist."
-msgstr "Takoha pakoju niama."
-
-#: gajim/groupchat_control.py:2001
+#: gajim/groupchat_control.py:1981
 #, fuzzy
-msgid "Group chat creation is not permitted."
-msgstr "Stvareńnie pakojaŭ abmiežavanaje."
-
-#: gajim/groupchat_control.py:2005
-#, fuzzy
-msgid "Unable to join groupchat"
-msgstr "Niemahčyma dałučycca da pakoju"
-
-#: gajim/groupchat_control.py:2006
-#, fuzzy, python-format
-msgid "You must use your registered nickname in <b>%s</b>."
-msgstr "Treba karystacca zarehistravanaj na siabie mianuškaj."
-
-#: gajim/groupchat_control.py:2012
-#, fuzzy, python-format
-msgid "You are not in the members list in groupchat %s."
-msgstr "Ciabie niama ŭ śpisie ŭdzielnikaŭ."
-
-#: gajim/groupchat_control.py:2068
-#, fuzzy
-msgid "Room has been destroyed"
+msgid "Group chat has been destroyed"
 msgstr "Aŭtaryzacyja anulavanaja"
 
-#: gajim/groupchat_control.py:2073
-#, python-format
-msgid "You can join this room instead: xmpp:%s?join"
-msgstr ""
+#: gajim/groupchat_control.py:1986
+#, fuzzy, python-format
+msgid "You can join this group chat instead: xmpp:%s?join"
+msgstr "%s dałučyŭsia da pakoju"
 
-#: gajim/groupchat_control.py:2306
+#: gajim/groupchat_control.py:2214
 #, fuzzy
 msgid "Leave Group Chat"
 msgstr "Pakiń pakoji"
 
-#: gajim/groupchat_control.py:2307
+#: gajim/groupchat_control.py:2215
 #, fuzzy
 msgid "Are you sure you want to leave this group chat?"
 msgstr "Ty sapraŭdy chočaš pakinuć pakoj \"%s\"?"
 
-#: gajim/groupchat_control.py:2308
+#: gajim/groupchat_control.py:2216
 #, fuzzy, python-format
-msgid "If you close this window, you will be disconnected from '%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:2314
+#: gajim/groupchat_control.py:2222 gajim/roster_window.py:5177
 msgid "_Leave"
 msgstr ""
 
-#: gajim/groupchat_control.py:2377
+#: gajim/groupchat_control.py:2280 gajim/roster_window.py:3008
 #, fuzzy, python-format
 msgid "%(jid)s has been invited to this group chat"
 msgstr "%(who)s vypchnuŭ %(nick)s: %(reason)s"
 
-#: gajim/groupchat_control.py:2527
+#: gajim/groupchat_control.py:2463
 #, python-format
 msgid "Kicking %s"
 msgstr "Vypichvajecca %s"
 
-#: gajim/groupchat_control.py:2528 gajim/groupchat_control.py:2829
+#: gajim/groupchat_control.py:2464 gajim/groupchat_control.py:2765
 msgid "You may specify a reason below:"
 msgstr "Možaš akreślić pryčynu nižej:"
 
-#: gajim/groupchat_control.py:2828
+#: gajim/groupchat_control.py:2764
 #, python-format
 msgid "Banning %s"
 msgstr "Blakavańnie %s"
 
-#: gajim/chat_control.py:408
+#: gajim/chat_control.py:432
 #, fuzzy
 msgid "Show a list of formattings"
 msgstr "Klikni, kab ustavić smajlik (Alt+M)"
 
-#: gajim/chat_control.py:412
+#: gajim/chat_control.py:436
 #, fuzzy
 msgid "This contact does not support HTML"
 msgstr "Śpis dziejnych, skončanych i spynienych pieradačaŭ fajłaŭ"
 
-#: gajim/chat_control.py:562
+#: gajim/chat_control.py:586
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr ""
 
-#: gajim/chat_control.py:686
+#: gajim/chat_control.py:710
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s z pakoju %(room_name)s"
 
-#: gajim/chat_control.py:832
+#: gajim/chat_control.py:856
 #, python-format
 msgid "%(type)s encryption is active %(authenticated)s"
 msgstr ""
 
-#: gajim/chat_control.py:1160 gajim/chat_control.py:1168
+#: gajim/chat_control.py:1184 gajim/chat_control.py:1192
 #, fuzzy
 msgid "Close"
 msgstr "_Dašli i začyni"
 
-#: gajim/chat_control.py:1161
+#: gajim/chat_control.py:1185
 #, fuzzy, python-format
 msgid "You just received a new message from %s"
 msgstr "Tolki što atrymanaje paviedamleńnie ad \"%s\""
 
-#: gajim/chat_control.py:1163
+#: gajim/chat_control.py:1187
 #, fuzzy
 msgid ""
 "If you close this tab while having chat history disabled, this message will "
@@ -1204,16 +1168,16 @@ msgstr ""
 "Kali ty začyniš hetuju kartku i kali žurnały nie vieducca, to hetaje "
 "paviedamleńnie źniknie nazaŭždy."
 
-#: gajim/chat_control.py:1208
+#: gajim/chat_control.py:1232
 msgid "Ping?"
 msgstr ""
 
-#: gajim/chat_control.py:1211
+#: gajim/chat_control.py:1235
 #, python-format
 msgid "Pong! (%s seconds)"
 msgstr ""
 
-#: gajim/chat_control.py:1308
+#: gajim/chat_control.py:1332
 #, fuzzy, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -1222,275 +1186,283 @@ msgstr ""
 "Tema: %s\n"
 "%s"
 
-#: gajim/chat_control.py:1416
+#: gajim/chat_control.py:1440
 #, fuzzy, python-format
 msgid "%(name)s is now %(show)s %(status)s"
 msgstr "%(nick)s maje ciapier status %(status)s"
 
-#: gajim/chat_control.py:1476 gajim/data/gui/application_menu.ui:32
+#: gajim/chat_control.py:1500 gajim/data/gui/application_menu.ui:32
 #: gajim/gtk/http_upload_progress.py:35
 #, fuzzy
 msgid "File Transfer"
 msgstr "Pieradačy fajłaŭ"
 
-#: gajim/chat_control.py:1480
+#: gajim/chat_control.py:1504
 #, fuzzy
 msgid "Size"
 msgstr "Pamier: %s"
 
-#: gajim/chat_control.py:1482 gajim/chat_control.py:1546
+#: gajim/chat_control.py:1506 gajim/chat_control.py:1566
+#: gajim/gui_interface.py:190
 #: gajim/data/gui/groupchat_invitation_received.ui:77
-#: gajim/gtk/filetransfer.py:485
+#: gajim/gtk/filetransfer.py:490
 #, fuzzy
 msgid "_Accept"
 msgstr "Dazvol"
 
-#: gajim/chat_control.py:1484 gajim/chat_control.py:1548
+#: gajim/chat_control.py:1508 gajim/chat_control.py:1568
 #: gajim/data/gui/groupchat_invitation_received.ui:62
 #, fuzzy
 msgid "_Decline"
 msgstr "Adł_učany"
 
-#: gajim/chat_control.py:1506 gajim/gui_interface.py:791
-#: gajim/gui_interface.py:821 gajim/gui_interface.py:847
+#: gajim/chat_control.py:1530 gajim/gui_interface.py:777
+#: gajim/gui_interface.py:807 gajim/gui_interface.py:833
 #: gajim/gtk/notification.py:173 gajim/gtk/notification.py:278
 msgid "File Transfer Completed"
 msgstr "Pieradača fajłu skončana"
 
-#: gajim/chat_control.py:1510 gajim/gtk/filetransfer.py:259
+#: gajim/chat_control.py:1534 gajim/gtk/filetransfer.py:258
 #, fuzzy
 msgid "Open _Folder"
 msgstr "_Adčyni kataloh z fajłam"
 
-#: gajim/chat_control.py:1512 gajim/chat_control.py:1521
+#: gajim/chat_control.py:1536 gajim/chat_control.py:1545
+#: gajim/data/gui/groupchat_control.ui:962
+#: gajim/data/gui/groupchat_control.ui:1049
+#: gajim/data/gui/groupchat_control.ui:1155
 #, fuzzy
 msgid "_Close"
 msgstr "_Dašli i začyni"
 
-#: gajim/chat_control.py:1543 gajim/gui_interface.py:484
+#: gajim/chat_control.py:1563 gajim/gui_interface.py:473
+#: gajim/data/gui/groupchat_invitation_received.ui:42
 #: gajim/gtk/notification.py:174 gajim/gtk/notification.py:195
 #: gajim/gtk/notification.py:281
-msgid "Groupchat Invitation"
+#, fuzzy
+msgid "Group Chat Invitation"
 msgstr "Zaprašeńnie ŭ pakoj"
 
-#: gajim/chat_control.py:1568 gajim/roster_window.py:1954
+#: gajim/chat_control.py:1588 gajim/roster_window.py:1951
 #, fuzzy
 msgid "Remote contact stopped transfer"
 msgstr "Vydalaje kantakt sa śpisu"
 
-#: gajim/chat_control.py:1570 gajim/roster_window.py:1956
+#: gajim/chat_control.py:1590 gajim/roster_window.py:1953
 #, fuzzy
 msgid "Error opening file"
 msgstr "Pamyłka adčytańnia fajłu:"
 
-#: gajim/chat_control.py:1572 gajim/gtk/filetransfer.py:297
+#: gajim/chat_control.py:1592 gajim/gtk/filetransfer.py:296
 #, fuzzy
 msgid "File transfer stopped"
 msgstr "Pieradača fajłu spyniena"
 
-#: gajim/chat_control.py:1575 gajim/gtk/filetransfer.py:275
-#: gajim/gtk/filetransfer.py:284
+#: gajim/chat_control.py:1595 gajim/gtk/filetransfer.py:274
+#: gajim/gtk/filetransfer.py:283
 msgid "File transfer cancelled"
 msgstr "Pieradača fajłu anulavana"
 
-#: gajim/chat_control.py:1576
+#: gajim/chat_control.py:1596
 msgid "Connection with peer cannot be established."
 msgstr "NIemahčyma złučycca ź inšym bokam."
 
-#: gajim/application.py:72
+#: gajim/application.py:75
 #, fuzzy
 msgid "Show the application's version"
 msgstr "Pakazvaj _ikonu ŭ poli nahadvańnia"
 
-#: gajim/application.py:79
+#: gajim/application.py:82
 #, fuzzy
 msgid "Show only critical errors"
 msgstr "Pakazvaj tolki ŭ śpisie _kantaktaŭ"
 
-#: gajim/application.py:86
+#: gajim/application.py:89
 msgid "Separate profile files completely (even history database and plugins)"
 msgstr ""
 
-#: gajim/application.py:94
+#: gajim/application.py:97
 msgid "Print XML stanzas and other debug information"
 msgstr ""
 
-#: gajim/application.py:101
+#: gajim/application.py:104
 #, fuzzy
 msgid "Use defined profile in configuration directory"
 msgstr "Redaktar dadatkovych naładaŭ"
 
-#: gajim/application.py:109
+#: gajim/application.py:112
 #, fuzzy
 msgid "Set configuration directory"
 msgstr "Kanfihuracyja pakoju"
 
-#: gajim/application.py:117
+#: gajim/application.py:120
 msgid "Configure logging system"
 msgstr ""
 
-#: gajim/application.py:125
+#: gajim/application.py:128
 #, fuzzy
 msgid "Show all warnings"
 msgstr "Pakažy ŭsie niahledžanyja _padzieji"
 
-#: gajim/application.py:132
+#: gajim/application.py:135
 msgid "Open IPython shell"
 msgstr ""
 
-#: gajim/application.py:139
+#: gajim/application.py:142
 msgid "Pops up a window with the next pending event"
 msgstr "Adčyniaje akno z nastupnym niečytanym paviedamleńniem"
 
-#: gajim/application.py:145 gajim/data/gui/shortcuts_window.ui:203
+#: gajim/application.py:148 gajim/data/gui/shortcuts_window.ui:203
 #: data/org.gajim.Gajim.desktop.in:21
 #, fuzzy
 msgid "Start a new chat"
 msgstr "Pačni razmovu"
 
-#: gajim/application.py:152
+#: gajim/application.py:155
 msgid "Simulate loss of connectivity"
 msgstr ""
 
-#: gajim/application.py:159
+#: gajim/application.py:162
 msgid "Simulate regaining connectivity"
 msgstr ""
 
-#: gajim/application.py:201 gajim/gui_interface.py:133
+#: gajim/application.py:204 gajim/gui_interface.py:133
 msgid "Database Error"
 msgstr ""
 
-#: gajim/roster_window.py:294 gajim/roster_window.py:1030
+#: gajim/roster_window.py:291 gajim/roster_window.py:1027
 msgid "Merged accounts"
 msgstr "Abjadnanyja konty"
 
-#: gajim/roster_window.py:853 gajim/roster_window.py:1631
-#: gajim/roster_window.py:1664 gajim/roster_window.py:1715
-#: gajim/roster_window.py:1717 gajim/roster_window.py:1872
-#: gajim/roster_window.py:2531 gajim/roster_window.py:5025
-#: gajim/common/contacts.py:188 gajim/common/contacts.py:447
-#: gajim/common/helpers.py:83 gajim/gtk/discovery.py:129
-#: gajim/gtk/discovery.py:130 gajim/gtk/discovery.py:1416
+#: gajim/roster_window.py:850 gajim/roster_window.py:1628
+#: gajim/roster_window.py:1661 gajim/roster_window.py:1712
+#: gajim/roster_window.py:1714 gajim/roster_window.py:1869
+#: gajim/roster_window.py:2528 gajim/roster_window.py:4331
+#: gajim/roster_window.py:4964 gajim/common/contacts.py:204
+#: gajim/common/contacts.py:463 gajim/common/helpers.py:86
+#: gajim/gtk/discovery.py:127 gajim/gtk/discovery.py:128
+#: gajim/gtk/discovery.py:1414
 msgid "Transports"
 msgstr "Transparty"
 
-#: gajim/roster_window.py:1723 gajim/roster_window.py:1725
-#: gajim/roster_window.py:4995 gajim/gui_interface.py:1613
-#: gajim/gui_interface.py:1639 gajim/common/contacts.py:186
-#: gajim/common/helpers.py:83 gajim/common/modules/adhoc_commands.py:245
-msgid "Groupchats"
+#: gajim/roster_window.py:1720 gajim/roster_window.py:1722
+#: gajim/roster_window.py:4331 gajim/roster_window.py:4934
+#: gajim/gui_interface.py:1527 gajim/common/contacts.py:202
+#: gajim/common/helpers.py:86 gajim/common/modules/adhoc_commands.py:245
+#, fuzzy
+msgid "Group chats"
 msgstr "Pakoji"
 
-#: gajim/roster_window.py:2012
+#: gajim/roster_window.py:2009
 #, fuzzy
 msgid "Authorization sent"
 msgstr "Aŭtaryzacyja dasłanaja"
 
-#: gajim/roster_window.py:2013
+#: gajim/roster_window.py:2010
 #, fuzzy, python-format
 msgid "\"%s\" will now see your status."
 msgstr "Ciapier \"%s\" budzie viedać tvoj status."
 
-#: gajim/roster_window.py:2031
+#: gajim/roster_window.py:2028
 msgid "Subscription request has been sent"
 msgstr "Zapyt aŭtaryzacyi dasłany"
 
-#: gajim/roster_window.py:2032
-#, python-format
-msgid "If \"%s\" accepts this request you will know his or her status."
+#: gajim/roster_window.py:2029
+#, 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:2046
+#: gajim/roster_window.py:2043
 #, fuzzy
 msgid "Authorization removed"
 msgstr "Aŭtaryzacyja anulavanaja"
 
-#: gajim/roster_window.py:2047
+#: gajim/roster_window.py:2044
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Ciapier \"%s\" budzie zaŭsiody bačyć ciabie jak adłučanaha."
 
-#: gajim/roster_window.py:2250 gajim/roster_window.py:3504
+#: gajim/roster_window.py:2247 gajim/roster_window.py:3460
 msgid "Disconnect for Invisibility"
 msgstr ""
 
-#: gajim/roster_window.py:2251 gajim/roster_window.py:3505
+#: gajim/roster_window.py:2248 gajim/roster_window.py:3461
 msgid "You are participating in one or more group chats"
 msgstr "Ty znachodziśsia ŭ adnym ci niekalkich pakojach"
 
-#: gajim/roster_window.py:2252 gajim/roster_window.py:3506
+#: gajim/roster_window.py:2249 gajim/roster_window.py:3462
 #, fuzzy
 msgid ""
-"Changing your status to invisible will result in disconnection from those "
-"group chats.\n"
+"Changing your status to invisible will result in you leaving those group "
+"chats.\n"
 "Are you sure you want to go invisible?"
 msgstr ""
 "Źmianiŭšy status na niabačny, ty adłučyśsia ad hetych pakojaŭ. Ty sapraŭdy "
 "chočaš stać niabačnym?"
 
-#: gajim/roster_window.py:2257 gajim/roster_window.py:3512
-#: gajim/roster_window.py:5238 gajim/data/gui/gc_control_popup_menu.ui:120
+#: gajim/roster_window.py:2254 gajim/roster_window.py:3468
+#: gajim/data/gui/gc_control_popup_menu.ui:120
 #, fuzzy
 msgid "_Disconnect"
 msgstr "Kantakt adłučyŭsia"
 
-#: gajim/roster_window.py:2285
+#: gajim/roster_window.py:2282
 #, fuzzy
 msgid "desynced"
 msgstr "Pašyranyja"
 
-#: gajim/roster_window.py:2353 gajim/data/gui/shortcuts_window.ui:224
+#: gajim/roster_window.py:2350 gajim/data/gui/shortcuts_window.ui:224
 #, fuzzy
 msgid "Quit Gajim"
 msgstr "Gajim"
 
-#: gajim/roster_window.py:2354
+#: gajim/roster_window.py:2351
 #, fuzzy
 msgid "You are about to quit Gajim"
 msgstr "Ty sapraŭdy chočaš pakinuć pakoj \"%s\"?"
 
-#: gajim/roster_window.py:2355
+#: gajim/roster_window.py:2352
 #, fuzzy
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Ty sapraŭdy chočaš pakinuć pakoj \"%s\"?"
 
-#: gajim/roster_window.py:2356
+#: gajim/roster_window.py:2353
 msgid "_Always quit when closing Gajim"
 msgstr ""
 
-#: gajim/roster_window.py:2359 gajim/roster_window.py:2455
-#: gajim/roster_window.py:2495 gajim/data/gui/systray_context_menu.ui:90
+#: gajim/roster_window.py:2356 gajim/roster_window.py:2452
+#: gajim/roster_window.py:2492 gajim/data/gui/systray_context_menu.ui:83
 #, fuzzy
 msgid "_Quit"
 msgstr "_Skonč pracu"
 
-#: gajim/roster_window.py:2448
+#: gajim/roster_window.py:2445
 #, fuzzy
 msgid "Stop File Transfers"
 msgstr "Pieradačy fajłaŭ"
 
-#: gajim/roster_window.py:2449
+#: gajim/roster_window.py:2446
 #, fuzzy
 msgid "You still have running file transfers"
 msgstr "Anuluj pieradaču fajła"
 
-#: gajim/roster_window.py:2450
+#: gajim/roster_window.py:2447
 msgid ""
 "If you quit now, the file(s) being transferred will be lost.\n"
 "Do you still want to quit?"
 msgstr ""
 
-#: gajim/roster_window.py:2488
+#: gajim/roster_window.py:2485
 #, fuzzy
 msgid "Unread Messages"
 msgstr "Niepračytanyja paviedamleńni"
 
-#: gajim/roster_window.py:2489
+#: gajim/roster_window.py:2486
 #, fuzzy
 msgid "You still have unread messages"
 msgstr "Jość niečytanyja paviedamleńni"
 
-#: gajim/roster_window.py:2490
+#: gajim/roster_window.py:2487
 #, fuzzy
 msgid ""
 "Messages will only be available for reading them later if storing chat "
@@ -1499,20 +1471,20 @@ msgstr ""
 "Paviedamleńni možna budzie pračytać paźniej, kali ŭklučana viadzieńnie "
 "žurnałaŭ razmoŭ."
 
-#: gajim/roster_window.py:2760
+#: gajim/roster_window.py:2753
 msgid "You have unread messages"
 msgstr "Jość niečytanyja paviedamleńni"
 
-#: gajim/roster_window.py:2761
+#: gajim/roster_window.py:2754
 msgid "You must read them before removing this transport."
 msgstr "Musiš pračytać ich pierad vydaleńniem hetaha transpartu."
 
-#: gajim/roster_window.py:2764
+#: gajim/roster_window.py:2757
 #, fuzzy, python-format
 msgid "Transport '%s' will be removed"
 msgstr "Transpart \"%s\" budzie vydaleny"
 
-#: gajim/roster_window.py:2765
+#: gajim/roster_window.py:2758
 #, fuzzy
 msgid ""
 "You will no longer be able to send and receive messages from and to contacts "
@@ -1521,11 +1493,11 @@ msgstr ""
 "Ty bolš nia zmožaš kamunikavać z kantaktami, jakija karystajucca hetym "
 "transpartam."
 
-#: gajim/roster_window.py:2768
+#: gajim/roster_window.py:2761
 msgid "Transports will be removed"
 msgstr "Transparty buduć vydalenyja"
 
-#: gajim/roster_window.py:2773
+#: gajim/roster_window.py:2766
 #, fuzzy, python-format
 msgid ""
 "You will no longer be able to send and receive messages from and to contacts "
@@ -1535,85 +1507,80 @@ msgstr ""
 "Ty bolš nia zmožaš kamunikavać z kantaktami, jakija karystajucca hetym "
 "transpartam."
 
-#: gajim/roster_window.py:2777
+#: gajim/roster_window.py:2770
 #, fuzzy
 msgid "Remove Transport"
 msgstr "Pakažy _transparty"
 
-#: gajim/roster_window.py:2844
+#: gajim/roster_window.py:2837
 #, fuzzy
 msgid "Block Contact"
 msgstr "Kantakty"
 
-#: gajim/roster_window.py:2845
+#: gajim/roster_window.py:2838
 #, fuzzy
 msgid "Really block this contact?"
 msgstr "Ci vykarystoŭvajecca šyfravańnie OpenPGP dla hetaha kantaktu?"
 
-#: gajim/roster_window.py:2846
+#: gajim/roster_window.py:2839
 msgid ""
 "This contact will see you offline and you will not receive any messages sent "
 "to you by this contact."
 msgstr ""
 
-#: gajim/roster_window.py:2851
+#: gajim/roster_window.py:2844
 #, fuzzy
 msgid "_Block Contact"
 msgstr "Kantakty"
 
-#: gajim/roster_window.py:2896
+#: gajim/roster_window.py:2889
 msgid "Rename Contact"
 msgstr "Źmiani nazvu kantaktu"
 
-#: gajim/roster_window.py:2897
+#: gajim/roster_window.py:2890
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Vyznač novuju mianušku dla kantaktu %s."
 
-#: gajim/roster_window.py:2904
+#: gajim/roster_window.py:2897
 msgid "Rename Group"
 msgstr "Źmiani nazvu hrupy"
 
-#: gajim/roster_window.py:2905
+#: gajim/roster_window.py:2898
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Vyznač novuju nazvu dla hrupy %s"
 
-#: gajim/roster_window.py:2953 gajim/roster_window.py:2954
+#: gajim/roster_window.py:2946 gajim/roster_window.py:2947
 msgid "Remove Group"
 msgstr "Vydal hrupu"
 
-#: gajim/roster_window.py:2955
+#: gajim/roster_window.py:2948
 #, fuzzy, python-format
 msgid "Do you want to remove %s from the contact list?"
 msgstr "Chočaš vydalić hrupu %s sa śpisu kantaktaŭ?"
 
-#: gajim/roster_window.py:2956
+#: gajim/roster_window.py:2949
 #, fuzzy
 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:3044
-#, fuzzy, python-format
-msgid "%(jid)s has been invited in this room"
-msgstr "%(who)s vypchnuŭ %(nick)s: %(reason)s"
-
-#: gajim/roster_window.py:3353
+#: gajim/roster_window.py:3309
 #, fuzzy
 msgid "Remove Contact"
 msgstr "Źmiani nazvu kantaktu"
 
-#: gajim/roster_window.py:3354
+#: gajim/roster_window.py:3310
 #, fuzzy
 msgid "Remove contact from contact list"
 msgstr "Vydalaje kantakt sa śpisu"
 
-#: gajim/roster_window.py:3355
+#: gajim/roster_window.py:3311
 #, python-format
 msgid "You are about to remove '%(name)s' (%(jid)s) from your contact list.\n"
 msgstr ""
 
-#: gajim/roster_window.py:3364 gajim/roster_window.py:3384
+#: gajim/roster_window.py:3320 gajim/roster_window.py:3340
 #, fuzzy
 msgid ""
 "By removing this contact you also remove authorization. This means the "
@@ -1623,22 +1590,22 @@ msgstr ""
 "ty taksama anuluješ ichnyja aŭtaryzacyi. U vyniku jany zaŭsiody buduć bačyć "
 "ciabie adłučanym."
 
-#: gajim/roster_window.py:3375
+#: gajim/roster_window.py:3331
 #, fuzzy
 msgid "Do you want to continue?"
 msgstr "Što chočaš zrabić?"
 
-#: gajim/roster_window.py:3386
+#: gajim/roster_window.py:3342
 #, 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:3393
+#: gajim/roster_window.py:3349
 #, fuzzy
 msgid "Remove contacts from contact list"
 msgstr "Vydalaje kantakt sa śpisu"
 
-#: gajim/roster_window.py:3399
+#: gajim/roster_window.py:3355
 #, fuzzy, python-format
 msgid ""
 "By removing the following contacts, you will also remove authorization. This "
@@ -1650,24 +1617,24 @@ msgstr ""
 "ty taksama anuluješ ichnyja aŭtaryzacyi. U vyniku jany zaŭsiody buduć bačyć "
 "ciabie adłučanym."
 
-#: gajim/roster_window.py:3403
+#: gajim/roster_window.py:3359
 #, fuzzy
 msgid "Remove Contacts"
 msgstr "Źmiani nazvu kantaktu"
 
-#: gajim/roster_window.py:3423
+#: gajim/roster_window.py:3379
 msgid "No account available"
 msgstr "Konty niedastupnyja"
 
-#: gajim/roster_window.py:3424
+#: gajim/roster_window.py:3380
 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:4060
+#: gajim/roster_window.py:4011
 msgid "Metacontacts storage not supported by your server"
 msgstr "Tvoj server nie padtrymvaje zachoŭvańnia metakantaktaŭ"
 
-#: gajim/roster_window.py:4062
+#: gajim/roster_window.py:4013
 #, fuzzy
 msgid ""
 "Your server does not support storing metacontacts information. So this "
@@ -1676,12 +1643,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:4159
+#: gajim/roster_window.py:4110
 #, fuzzy
 msgid "You are about to create a metacontact"
 msgstr "Stvarajecca metakantakt. Ty sapraŭdy chočaš praciahnuć?"
 
-#: gajim/roster_window.py:4160
+#: gajim/roster_window.py:4111
 #, fuzzy
 msgid ""
 "Metacontacts are a way to regroup several contacts in one single contact. "
@@ -1692,27 +1659,27 @@ 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:4164
+#: gajim/roster_window.py:4115
 #, fuzzy
 msgid "Create Metacontact"
 msgstr "Źmiani nazvu kantaktu"
 
-#: gajim/roster_window.py:4170
+#: gajim/roster_window.py:4121 gajim/data/gui/groupchat_creation.ui:317
 #, fuzzy
 msgid "_Create"
 msgstr "Niadziejny"
 
-#: gajim/roster_window.py:4287
+#: gajim/roster_window.py:4238
 #, fuzzy
 msgid "Invalid file URI:"
 msgstr "Niapravilny fajł"
 
-#: gajim/roster_window.py:4298
+#: gajim/roster_window.py:4249
 #, fuzzy
 msgid "Send file?"
 msgstr "Vyšli _fajł"
 
-#: gajim/roster_window.py:4299
+#: gajim/roster_window.py:4250
 #, fuzzy, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
@@ -1720,101 +1687,92 @@ 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:4451
+#: gajim/roster_window.py:4401
 #, fuzzy, python-format
 msgid "Send %(from)s to %(to)s"
 msgstr "Dašli %s"
 
-#: gajim/roster_window.py:4464
+#: gajim/roster_window.py:4414
 #, fuzzy, python-format
 msgid "Make %s first contact"
 msgstr "Zrabi z %s i %s metakantakt"
 
-#: gajim/roster_window.py:4469
+#: gajim/roster_window.py:4419
 #, fuzzy, python-format
 msgid "Make %(contact1)s and %(contact2)s metacontacts"
 msgstr "Zrabi z %s i %s metakantakt"
 
-#: gajim/roster_window.py:4825 gajim/roster_window.py:4923
+#: gajim/roster_window.py:4775 gajim/roster_window.py:4862
 msgid "_Change Status Message"
 msgstr "Ź_miani paviedamleńnie statusu"
 
-#: gajim/roster_window.py:4845
+#: gajim/roster_window.py:4795
 #, fuzzy
 msgid "Publish Tune"
 msgstr "_Абнавіць"
 
-#: gajim/roster_window.py:4856
+#: gajim/roster_window.py:4806
 #, fuzzy
 msgid "Publish Location"
 msgstr "_Абнавіць"
 
-#: gajim/roster_window.py:4868
-#, fuzzy
-msgid "Configure Services…"
-msgstr "_Šukaj servisy..."
-
-#: gajim/roster_window.py:4997
+#: gajim/roster_window.py:4936
 msgid "_Maximize All"
 msgstr ""
 
-#: gajim/roster_window.py:5004 gajim/roster_window.py:5146
+#: gajim/roster_window.py:4943 gajim/roster_window.py:5085
 msgid "Send Group M_essage"
 msgstr "_Dašli hrupavoje paviedamleńnie"
 
-#: gajim/roster_window.py:5011
+#: gajim/roster_window.py:4950
 msgid "To all users"
 msgstr "Usim karystalnikam"
 
-#: gajim/roster_window.py:5015
+#: gajim/roster_window.py:4954
 msgid "To all online users"
 msgstr "Usim dałučanym karystalnikam"
 
-#: gajim/roster_window.py:5027 gajim/roster_window.py:5152
+#: gajim/roster_window.py:4966 gajim/roster_window.py:5091
 #: gajim/data/gui/gc_occupants_menu.ui:110
 #: gajim/data/gui/contact_context_menu.ui:36
 msgid "In_vite to"
 msgstr "_Zaprasi"
 
-#: gajim/roster_window.py:5162
+#: gajim/roster_window.py:5101
 #, fuzzy
 msgid "_Manage Contacts"
 msgstr "Źmiani nazvu kantaktu"
 
-#: gajim/roster_window.py:5168
+#: gajim/roster_window.py:5107
 #, fuzzy
 msgid "Edit _Groups…"
 msgstr "Źmiani _hrupy"
 
-#: gajim/roster_window.py:5189 gajim/data/gui/filetransfers.ui:12
+#: gajim/roster_window.py:5128 gajim/data/gui/filetransfers.ui:12
 #: gajim/data/gui/remove_account_window.ui:134
 msgid "_Remove"
 msgstr "_Vydal"
 
-#: gajim/roster_window.py:5226
+#: gajim/roster_window.py:5165
 msgid "_Maximize"
 msgstr ""
 
-#: gajim/roster_window.py:5233
+#: gajim/roster_window.py:5172
 #, fuzzy
 msgid "_Reconnect"
 msgstr "Kantakt adłučyŭsia"
 
-#: gajim/roster_window.py:5254 gajim/data/gui/gc_occupants_menu.ui:170
+#: gajim/roster_window.py:5193 gajim/data/gui/gc_occupants_menu.ui:170
 #: gajim/data/gui/gc_control_popup_menu.ui:113
 #: gajim/data/gui/contact_context_menu.ui:205
 msgid "_History"
 msgstr "_Žurnał razmoŭ"
 
-#: gajim/roster_window.py:5335 gajim/data/gui/application_menu.ui:86
+#: gajim/roster_window.py:5274 gajim/data/gui/application_menu.ui:83
 #: gajim/data/gui/history_window.ui:57
 msgid "History Manager"
 msgstr "Kiraŭnik žurnałaŭ"
 
-#: gajim/roster_window.py:5343
-msgid "_Join New Group Chat"
-msgstr "_Dałučysia da pakoju"
-
 #: gajim/dataforms_widget.py:585
 #, fuzzy
 msgid "Unable to load image"
@@ -1939,277 +1897,294 @@ msgstr "Tema: %s\n"
 msgid "Write a message…"
 msgstr "Novaje pryvatnaje paviedamleńnie"
 
-#: gajim/message_window.py:250
+#: gajim/message_window.py:356
+#, fuzzy
+msgid "Close Tabs"
+msgstr "_Dašli i začyni"
+
+#: gajim/message_window.py:357
 #, fuzzy
 msgid "You are going to close several tabs"
 msgstr "Niama złučeńnia z serveram"
 
-#: gajim/message_window.py:251
+#: gajim/message_window.py:358
 #, fuzzy
 msgid "Do you really want to close them all?"
 msgstr "Sapraŭdy chočaš vydalić zaznačanaje paviedamleńnie?"
 
-#: gajim/message_window.py:539
+#: gajim/message_window.py:514
 #, fuzzy
 msgid "?Noun:Chats"
 msgstr "Pakoji"
 
-#: gajim/message_window.py:543
+#: gajim/message_window.py:518
 #, fuzzy
 msgid "Group Chats"
 msgstr "_Pakoj"
 
-#: gajim/message_window.py:547
+#: gajim/message_window.py:522
 msgid "Private Chats"
 msgstr "Pryvatnyja razmovy"
 
-#: gajim/message_window.py:553
+#: gajim/message_window.py:528
 msgid "Messages"
 msgstr "Paviedamleńni"
 
-#: gajim/gui_interface.py:173
+#: gajim/gui_interface.py:170
+#, 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:175
 msgid "Do you accept this request?"
 msgstr "Prymaješ hety zapyt?"
 
-#: gajim/gui_interface.py:175
+#: gajim/gui_interface.py:177
 #, fuzzy, python-format
-msgid "Do you accept this request on account %s?"
+msgid "Do you accept this request (account: %s)?"
 msgstr "Prymaješ hety zapyt?"
 
-#: gajim/gui_interface.py:178
-#, 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:182
+#, fuzzy
+msgid "Authorization"
+msgstr "Aŭtaryzacyja dasłanaja"
+
+#: gajim/gui_interface.py:186 gajim/gui_interface.py:420
+#: gajim/gtk/filetransfer.py:338
+#, fuzzy
+msgid "_No"
+msgstr "Nijaki"
 
-#: gajim/gui_interface.py:194 gajim/gtk/notification.py:175
+#: gajim/gui_interface.py:205 gajim/gtk/notification.py:175
 #: gajim/gtk/notification.py:197
 msgid "Connection Failed"
 msgstr "Niemahvyma dałučycca"
 
-#: gajim/gui_interface.py:279 gajim/gui_interface.py:529
-msgid "Password Required"
-msgstr "Vymahaje parolu"
-
-#: gajim/gui_interface.py:280
-#, fuzzy, python-format
-msgid "A Password is required to join the room %s. Please type it."
-msgstr "Treba ŭvieści parol, kab dałučycca da pakoju."
-
-#: gajim/gui_interface.py:342 gajim/gui_interface.py:346
+#: gajim/gui_interface.py:325 gajim/gui_interface.py:329
 #, fuzzy, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr "%(nickname)s: %(message)s"
 
-#: gajim/gui_interface.py:357 gajim/gui_interface.py:376
+#: gajim/gui_interface.py:340 gajim/gui_interface.py:359
 #: gajim/common/modules/message.py:122
 #, fuzzy, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "pamyłka dasyłańnia %s ( %s )"
 
-#: gajim/gui_interface.py:401 gajim/gtk/notification.py:175
+#: gajim/gui_interface.py:384 gajim/gtk/notification.py:175
 #, fuzzy
 msgid "Subscription request"
 msgstr "Zapyt aŭtaryzacyi"
 
-#: gajim/gui_interface.py:413 gajim/common/contacts.py:184
-#: gajim/common/helpers.py:83
+#: gajim/gui_interface.py:396 gajim/common/contacts.py:200
+#: gajim/common/helpers.py:86
 msgid "Observers"
 msgstr "Naziralniki"
 
-#: gajim/gui_interface.py:422
+#: gajim/gui_interface.py:405
 msgid "Authorization accepted"
 msgstr "Aŭtaryzacyja pryniataja"
 
-#: gajim/gui_interface.py:423
+#: gajim/gui_interface.py:406
 #, 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:431
-#, python-format
-msgid "Contact \"%s\" removed subscription from you"
+#: gajim/gui_interface.py:415
+#, fuzzy
+msgid "Subscription Removed"
+msgstr "Zapyt aŭtaryzacyi"
+
+#: gajim/gui_interface.py:416
+#, fuzzy, python-format
+msgid "Contact '%s' removed subscription from you"
 msgstr "Kantakt \"%s\" anulavaŭ tvaju aŭtaryzacyju"
 
-#: gajim/gui_interface.py:432
+#: gajim/gui_interface.py:417
 msgid ""
-"You will always see them as offline.\n"
+"You will always see this contact as offline.\n"
 "Do you want to remove them from your contact list?"
 msgstr ""
 
-#: gajim/gui_interface.py:453 gajim/gtk/notification.py:176
+#: gajim/gui_interface.py:442 gajim/gtk/notification.py:176
 #, fuzzy
 msgid "Unsubscribed"
 msgstr "_Anuluj aŭtaryzacyju"
 
-#: gajim/gui_interface.py:465
+#: gajim/gui_interface.py:454
 #, python-format
 msgid "%(jid)s declined the invitation: %(reason)s"
 msgstr ""
 
-#: gajim/gui_interface.py:469
+#: gajim/gui_interface.py:458
 #, python-format
 msgid "%(jid)s declined the invitation"
 msgstr ""
 
-#: gajim/gui_interface.py:485
+#: gajim/gui_interface.py:474
 #, 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:506
+#: gajim/gui_interface.py:495
 #, fuzzy
 msgid "Certificate Passphrase Required"
 msgstr "Musiš vyznačyć parol"
 
-#: gajim/gui_interface.py:507
+#: gajim/gui_interface.py:496
 #, fuzzy, python-format
 msgid "Enter the certificate passphrase for account %s"
 msgstr "Vyznač parol GPG dla kontu %s."
 
-#: gajim/gui_interface.py:516 gajim/gtk/accounts.py:963
+#: gajim/gui_interface.py:505 gajim/gtk/accounts.py:966
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Uviadzi parol dla kontu %s"
 
-#: gajim/gui_interface.py:529 gajim/gtk/accounts.py:964
+#: gajim/gui_interface.py:518
+msgid "Password Required"
+msgstr "Vymahaje parolu"
+
+#: gajim/gui_interface.py:518 gajim/gtk/accounts.py:967
 msgid "Save password"
 msgstr "Zachavaj parol"
 
-#: gajim/gui_interface.py:601 gajim/gui_interface.py:632
+#: gajim/gui_interface.py:587 gajim/gui_interface.py:618
+#: gajim/gtk/filetransfer.py:332 gajim/gtk/filetransfer.py:333
 #: gajim/gtk/notification.py:173 gajim/gtk/notification.py:276
 msgid "File Transfer Error"
 msgstr "Pamyłka pieradačy fajłu"
 
-#: gajim/gui_interface.py:666
+#: gajim/gui_interface.py:652
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s choča dasłać tabie fajł."
 
-#: gajim/gui_interface.py:668 gajim/gtk/filetransfer.py:479
+#: gajim/gui_interface.py:654 gajim/gtk/filetransfer.py:484
 #: gajim/gtk/notification.py:172 gajim/gtk/notification.py:274
 msgid "File Transfer Request"
 msgstr "Zapyt na pieradaču fajłu"
 
-#: gajim/gui_interface.py:767
+#: gajim/gui_interface.py:753
 #, fuzzy
 msgid "Remote Contact Stopped Transfer"
 msgstr "Vydalaje kantakt sa śpisu"
 
-#: gajim/gui_interface.py:772
+#: gajim/gui_interface.py:758
 #, fuzzy
 msgid "Error Opening File"
 msgstr "Pamyłka adčytańnia fajłu:"
 
-#: gajim/gui_interface.py:782
+#: gajim/gui_interface.py:768
 #, fuzzy
 msgid "SSL Certificate Error"
 msgstr "Niapravilnaje imia karystalnika"
 
-#: gajim/gui_interface.py:795 gajim/gui_interface.py:826
-#: gajim/gui_interface.py:853 gajim/gtk/notification.py:174
+#: gajim/gui_interface.py:781 gajim/gui_interface.py:812
+#: gajim/gui_interface.py:839 gajim/gtk/notification.py:174
 #: gajim/gtk/notification.py:279
 msgid "File Transfer Stopped"
 msgstr "Pieradača fajłu spyniena"
 
-#: gajim/gui_interface.py:799
+#: gajim/gui_interface.py:785
 #, fuzzy
 msgid "File Transfer Failed"
 msgstr "Pieradačy fajłaŭ"
 
-#: gajim/gui_interface.py:822
+#: gajim/gui_interface.py:808
 #, 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:827
+#: gajim/gui_interface.py:813
 #, 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:833
+#: gajim/gui_interface.py:819
 #, 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:848
+#: gajim/gui_interface.py:834
 #, 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:854
+#: gajim/gui_interface.py:840
 #, 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:860
+#: gajim/gui_interface.py:846
 #, 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:971
+#: gajim/gui_interface.py:957
 msgid "Username Conflict"
 msgstr "Kanflikt imionaŭ karystalnikaŭ"
 
-#: gajim/gui_interface.py:972
+#: gajim/gui_interface.py:958
 msgid "Please type a new username for your local account"
 msgstr "Kali łaska, akreśli novaje imia karystalnika dla lakalnaha kontu"
 
-#: gajim/gui_interface.py:995
+#: gajim/gui_interface.py:981
 #, fuzzy
 msgid "Resource Conflict"
 msgstr "Kanflikt imionaŭ karystalnikaŭ"
 
-#: gajim/gui_interface.py:996
+#: gajim/gui_interface.py:982
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
 msgstr ""
 
-#: gajim/gui_interface.py:1053
+#: gajim/gui_interface.py:1039
 #, fuzzy, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s choča dasłać tabie fajł."
 
-#: gajim/gui_interface.py:1055
+#: gajim/gui_interface.py:1041
 #, fuzzy
 msgid "Voice Chat Request"
 msgstr "Zapyt na pieradaču fajłu"
 
-#: gajim/gui_interface.py:1123 gajim/gtk/account_wizard.py:312
+#: gajim/gui_interface.py:1109 gajim/gtk/account_wizard.py:312
 #, fuzzy
 msgid "Certificate Already in File"
 msgstr "Kantakt užo jość u śpisie kantaktaŭ"
 
-#: gajim/gui_interface.py:1124 gajim/gtk/account_wizard.py:313
+#: gajim/gui_interface.py:1110 gajim/gtk/account_wizard.py:313
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr ""
 
-#: gajim/gui_interface.py:1145
+#: gajim/gui_interface.py:1131
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid"
 msgstr ""
 
-#: gajim/gui_interface.py:1148
+#: gajim/gui_interface.py:1134
 #, python-format
 msgid ""
 "\n"
 "Unknown SSL error: %d"
 msgstr ""
 
-#: gajim/gui_interface.py:1150
+#: gajim/gui_interface.py:1136
 #, python-format
 msgid ""
 "\n"
 "SSL Error: <b>%s</b>"
 msgstr ""
 
-#: gajim/gui_interface.py:1155
+#: gajim/gui_interface.py:1141
 msgid "Error verifying SSL certificate"
 msgstr ""
 
-#: gajim/gui_interface.py:1156
+#: gajim/gui_interface.py:1142
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your XMPP server: "
@@ -2217,7 +2192,7 @@ msgid ""
 "Do you still want to connect to this server?"
 msgstr ""
 
-#: gajim/gui_interface.py:1160 gajim/gtk/account_wizard.py:412
+#: gajim/gui_interface.py:1146 gajim/gtk/account_wizard.py:413
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -2227,207 +2202,194 @@ msgid ""
 "%(sha256)s"
 msgstr ""
 
-#: gajim/gui_interface.py:1166
+#: gajim/gui_interface.py:1152
 msgid "Ignore this error for this certificate."
 msgstr ""
 
-#: gajim/gui_interface.py:1174
+#: gajim/gui_interface.py:1160
 #, fuzzy, python-format
 msgid "SSL Certificate Verification for %s"
 msgstr "Dadajecca admysłovaje nahadvańnie dla %s"
 
-#: gajim/gui_interface.py:1442 gajim/gtk/join_groupchat.py:235
-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/gui_interface.py:1448
-#, fuzzy
-msgid "JID is not a Groupchat"
-msgstr "Heta nie pakoj"
-
-#: gajim/gui_interface.py:1579
-msgid "This is not a group chat"
-msgstr "Heta nie pakoj"
-
-#: gajim/gui_interface.py:1580
-#, python-format
-msgid ""
-"%(room_jid)s is already in your roster. Please check if %(room_jid)s is a "
-"correct group chat name. If it is, delete it from your roster and try "
-"joining the group chat again."
-msgstr ""
-
-#: gajim/gui_interface.py:1604 gajim/dialog_messages.py:58
+#: gajim/gui_interface.py:1577
 msgid "You cannot join a group chat while you are invisible"
 msgstr "Niemahčyma dałučycca da pakoju, kali ty niabačny"
 
-#: gajim/gui_interface.py:2037
+#: gajim/gui_interface.py:1976
 msgid "Could not save your settings and preferences"
 msgstr "Niemahčyma zapisać tvaje nałady i opcyi"
 
-#: gajim/gui_interface.py:2098
+#: gajim/gui_interface.py:2037
 msgid "Gajim: IPython Console"
 msgstr ""
 
-#: gajim/dialog_messages.py:32
+#: gajim/dialog_messages.py:31 gajim/dialog_messages.py:36
+#: gajim/gtk/single_message.py:305 gajim/gtk/account_wizard.py:229
 #, fuzzy
-msgid "You can not start a new conversation unless you are connected."
-msgstr ""
-"Niemahčyma ŭdzielničać u hrupavoj razmovie, nie dałučyŭšysia da servera."
-
-#: gajim/dialog_messages.py:36 gajim/dialog_messages.py:41
-#: gajim/gtk/single_message.py:305 gajim/gtk/join_groupchat.py:211
-#: gajim/gtk/account_wizard.py:229
-msgid "Invalid JID"
-msgstr "Niapravilny JID"
+msgid "Invalid XMPP Address"
+msgstr "Niapravilny fajł"
 
-#: gajim/dialog_messages.py:42 gajim/gtk/single_message.py:306
+#: gajim/dialog_messages.py:37
 #, fuzzy, python-format
-msgid "It is not possible to send a message to %s, this JID is not valid."
+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/dialog_messages.py:47
-msgid "Unread events"
+#: gajim/dialog_messages.py:42
+#, fuzzy
+msgid "Unread Events"
 msgstr "Niepračytanyja paviedamleńni"
 
-#: gajim/dialog_messages.py:48
-msgid "Read all pending events before removing this account."
+#: gajim/dialog_messages.py:43
+#, fuzzy
+msgid "Read or acknowledge all pending events before removing this account."
 msgstr "Pračytaj usie novyja paviedamleńni pierad vydaleńniem kontu."
 
-#: gajim/dialog_messages.py:52
+#: gajim/dialog_messages.py:48
 #, fuzzy
 msgid "Invalid Form"
 msgstr "Niapravilny zapis"
 
-#: gajim/dialog_messages.py:53
+#: gajim/dialog_messages.py:49
 #, fuzzy
 msgid "The form is not filled correctly."
 msgstr "JID pakoju ŭtrymlivaje niedazvolenyja znaki."
 
-#: gajim/dialog_messages.py:57 gajim/common/helpers.py:309
+#: gajim/dialog_messages.py:53 gajim/common/helpers.py:315
 msgid "Invisible"
 msgstr "Niabačny"
 
-#: gajim/dialog_messages.py:62
-msgid "A connection is not available"
-msgstr "Złučeńnie niemahčymaje"
+#: gajim/dialog_messages.py:54
+#, fuzzy
+msgid "You cannot join a group chat while being invisible."
+msgstr "Niemahčyma dałučycca da pakoju, kali ty niabačny"
 
-#: gajim/dialog_messages.py:63
+#: gajim/dialog_messages.py:58
+#, fuzzy
+msgid "No Connection Available"
+msgstr "Złučeńnia niama"
+
+#: gajim/dialog_messages.py:59
 msgid "Your message can not be sent until you are connected."
 msgstr "Ty nia možaš dasłać paviedamleńnie, pakul nia złučyśsia z serveram."
 
-#: gajim/dialog_messages.py:67
-#, fuzzy
-msgid "JID already in list"
-msgstr "Klijent kamunikacyi dla Jabber"
-
-#: gajim/dialog_messages.py:68
-msgid "The JID you entered is already in the list. Choose another one."
+#: gajim/dialog_messages.py:63
+msgid "XMPP Address Already in List"
 msgstr ""
 
-#: gajim/dialog_messages.py:72
-msgid "Invalid answer"
+#: gajim/dialog_messages.py:64
+#, fuzzy
+msgid ""
+"The XMPP Address you entered is already in the list. Please choose another "
+"one."
+msgstr "Kont z takoj nazvaj užo zaniaty. Kali łaska, abiary inšuju nazvu."
+
+#: gajim/dialog_messages.py:69
+#, fuzzy
+msgid "Invalid Answer"
 msgstr "Niapravilny adkaz"
 
-#: gajim/dialog_messages.py:73
+#: gajim/dialog_messages.py:70
 #, fuzzy, python-format
 msgid "Transport %(name)s answered wrongly to register request: %(error)s"
 msgstr "Transpart %s niapravilna adkazaŭ na zapyt rehistracyi: %s"
 
-#: gajim/dialog_messages.py:78
+#: gajim/dialog_messages.py:75
 #, fuzzy
 msgid "Wrong Custom Hostname"
 msgstr "Skarystaj admysłovy host/port"
 
-#: gajim/dialog_messages.py:79
+#: gajim/dialog_messages.py:76
 #, fuzzy, python-format
-msgid "Wrong custom hostname \"%s\". Ignoring it."
+msgid "Custom hostname \"%s\" is wrong. It will be ignored."
 msgstr "Skarystaj admysłovy host/port"
 
-#: gajim/dialog_messages.py:83
-msgid "Error while removing privacy list"
+#: gajim/dialog_messages.py:80
+#, fuzzy
+msgid "Error While Removing Privacy List"
 msgstr "Pamyłka vydaleńnia śpisu pryvatnaści"
 
-#: gajim/dialog_messages.py:84
+#: gajim/dialog_messages.py:81
 #, fuzzy, python-format
 msgid ""
-"Privacy list %s has not been removed. It is maybe active in one of your "
-"connected resources. Deactivate it and try again."
+"Privacy list %s has not been removed. It is probably active in one of your "
+"connected resources. Please deactivate it and try again."
 msgstr ""
 "Śpis pryvatnaści %s nia vydaleny. Jon vykarystoŭvajecca adnoj z dałučanych "
 "krynic. Adklučy jaje i paŭtary znoŭ."
 
-#: gajim/dialog_messages.py:90
+#: gajim/dialog_messages.py:87
 #, fuzzy
-msgid "Invisibility not supported"
+msgid "Invisibility Not Supported"
 msgstr "Pašyreńnie nie padtrymvajecca"
 
-#: gajim/dialog_messages.py:91
-#, python-format
-msgid "Account %s doesn't support invisibility."
-msgstr ""
+#: gajim/dialog_messages.py:88
+#, fuzzy, python-format
+msgid "This account %s doesn't support invisibility."
+msgstr "Śpis dziejnych, skončanych i spynienych pieradačaŭ fajłaŭ"
 
-#: gajim/dialog_messages.py:95
+#: gajim/dialog_messages.py:92
 #, fuzzy
-msgid "Unregister failed"
+msgid "Unregister Failed"
 msgstr "Niemahvyma dałučycca"
 
-#: gajim/dialog_messages.py:96
-#, python-format
-msgid "Unregistration with server %(server)s failed: %(error)s"
-msgstr ""
+#: gajim/dialog_messages.py:93
+#, fuzzy, python-format
+msgid "Unregistration on server %(server)s failed: %(error)s"
+msgstr "Niemahvyma dałučycca"
 
-#: gajim/dialog_messages.py:100
+#: gajim/dialog_messages.py:97
 #, fuzzy
-msgid "Registration succeeded"
+msgid "Registration Succeeded"
 msgstr "Zarehistrujsia na %s"
 
-#: gajim/dialog_messages.py:101
-#, python-format
-msgid "Registration with agent %s succeeded"
-msgstr ""
+#: gajim/dialog_messages.py:98
+#, fuzzy, python-format
+msgid "Registration with agent %s succeeded."
+msgstr "Zarehistrujsia na %s"
 
-#: gajim/dialog_messages.py:105 gajim/gtk/service_registration.py:215
+#: gajim/dialog_messages.py:102
 #, fuzzy
-msgid "Registration failed"
+msgid "Registration Failed"
 msgstr "Niemahvyma dałučycca"
 
-#: gajim/dialog_messages.py:106
+#: gajim/dialog_messages.py:103
 #, python-format
 msgid ""
 "Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
 msgstr ""
 
-#: gajim/dialog_messages.py:111
+#: gajim/dialog_messages.py:108
 #, fuzzy
 msgid "Unable to Join Group Chat"
 msgstr "Niemahčyma dałučycca da pakoju"
 
-#: gajim/dialog_messages.py:116
-msgid "GStreamer error"
+#: gajim/dialog_messages.py:113
+msgid "GStreamer Error"
 msgstr ""
 
-#: gajim/dialog_messages.py:117
+#: gajim/dialog_messages.py:114
 #, fuzzy, python-format
 msgid ""
 "Error: %(error)s\n"
 "Debug: %(debug)s"
 msgstr "Tekst pamyłki: %s"
 
-#: gajim/dialog_messages.py:121
-msgid "Wrong host"
+#: gajim/dialog_messages.py:118
+#, fuzzy
+msgid "Wrong Host"
 msgstr "Niapravilny host"
 
-#: gajim/dialog_messages.py:122
+#: gajim/dialog_messages.py:119
 msgid "Invalid local address? :-O"
 msgstr ""
 
-#: gajim/dialog_messages.py:126
-msgid "Avahi error"
+#: gajim/dialog_messages.py:123
+#, fuzzy
+msgid "Avahi Error"
 msgstr "Pamyłka Avahi"
 
-#: gajim/dialog_messages.py:127
+#: gajim/dialog_messages.py:124
 #, python-format
 msgid ""
 "%s\n"
@@ -2436,66 +2398,66 @@ msgstr ""
 "%s\n"
 "Lakalnyja paviedamleńni mohuć pracavać pamyłkova."
 
-#: gajim/dialog_messages.py:131 gajim/dialog_messages.py:136
+#: gajim/dialog_messages.py:128 gajim/dialog_messages.py:133
 #, fuzzy
-msgid "Could not request upload slot"
+msgid "Could not request upload slot for HTTP File Upload"
 msgstr "Niemahčyma ŭruchomić lakalny servis"
 
-#: gajim/dialog_messages.py:137
-msgid "Got unexpected response from server (see log)"
+#: gajim/dialog_messages.py:134
+msgid "Got unexpected response from server (see log)."
 msgstr ""
 
-#: gajim/dialog_messages.py:141 gajim/dialog_messages.py:146
+#: gajim/dialog_messages.py:138 gajim/dialog_messages.py:143
 #, fuzzy
-msgid "Could not open file"
+msgid "Could not Open File"
 msgstr "Niemahčyma adčytać vyjavu"
 
-#: gajim/dialog_messages.py:142
-msgid "Exception raised while opening file (see log)"
+#: gajim/dialog_messages.py:139
+msgid "Exception raised while trying to open file (see log)."
 msgstr ""
 
-#: gajim/dialog_messages.py:151
-msgid "Unsecure"
-msgstr ""
+#: gajim/dialog_messages.py:148
+#, fuzzy
+msgid "Not Secure"
+msgstr "Nie pačata"
 
-#: gajim/dialog_messages.py:152
-msgid "Server returned unsecure transport (HTTP)"
+#: gajim/dialog_messages.py:149
+msgid "The server returned an insecure transport (HTTP)."
 msgstr ""
 
-#: gajim/dialog_messages.py:156
+#: gajim/dialog_messages.py:153
 #, fuzzy
-msgid "Could not upload file"
+msgid "Could not Upload File"
 msgstr "Niemahčyma adčytać vyjavu"
 
-#: gajim/dialog_messages.py:157
+#: gajim/dialog_messages.py:154
 #, python-format
 msgid "HTTP response code from server: %s"
 msgstr ""
 
-#: gajim/dialog_messages.py:161
+#: gajim/dialog_messages.py:158
 msgid "Upload Error"
 msgstr ""
 
-#: gajim/dialog_messages.py:166
+#: gajim/dialog_messages.py:163
 #, fuzzy
 msgid "Encryption Error"
 msgstr "Šyfravańnie ŭklučanaje"
 
-#: gajim/dialog_messages.py:167
-#, fuzzy
-msgid "For the chosen encryption there is no encryption method available"
-msgstr "Złučeńnie niemahčymaje"
+#: gajim/dialog_messages.py:164
+msgid "There is no encryption method available for the chosen encryption."
+msgstr ""
 
-#: gajim/dialog_messages.py:171
+#: gajim/dialog_messages.py:169
 #, fuzzy
-msgid "Avatar upload failed"
+msgid "Avatar Upload Failed"
 msgstr "Pamyłka publikacyi vCard"
 
-#: gajim/privatechat_control.py:204
+#: gajim/privatechat_control.py:207
 msgid "Sending private message failed"
 msgstr "Pamyłka dasyłańnia pryvatnaha paviedamleńnia"
 
-#: gajim/privatechat_control.py:206
+#: gajim/privatechat_control.py:209
 #, 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."
@@ -2518,7 +2480,7 @@ msgstr "pakažy daviedku pa zahadzie"
 
 #: gajim/gajim_remote.py:85
 #, fuzzy
-msgid "Lists all contacts in roster, one for each line"
+msgid "Lists all contacts in the contact list, one for each line"
 msgstr ""
 "Pakazvaje śpis usich kantaktaŭ sa śpisu kantaktaŭ. Źviestki ab kožnym "
 "kantakcie źjaŭlajucca na novym radku"
@@ -2603,11 +2565,13 @@ msgstr ""
 
 #: gajim/gajim_remote.py:118
 #, fuzzy
-msgid "Sends new chat message to a contact in the roster. Account is optional."
+msgid ""
+"Sends new chat message to a contact in the contact list. Account is optional."
 msgstr "Užyvańnie: /%s, chavaje knopki razmovy."
 
 #: gajim/gajim_remote.py:120 gajim/gajim_remote.py:130
-msgid "JID of the contact that will receive the message"
+#, fuzzy
+msgid "XMPP Address of the contact that will receive the message"
 msgstr "JID kantaktu, jaki atrymaje paviedamleńnie"
 
 #: gajim/gajim_remote.py:121 gajim/gajim_remote.py:132
@@ -2621,8 +2585,10 @@ msgid "if specified, the message will be sent using this account"
 msgstr "Kali akreślena, paviedamleńnie budzie dasłanaje z hetaha kontu"
 
 #: gajim/gajim_remote.py:127
-msgid "Sends a chat message to someone on your roster. Account is optional."
-msgstr ""
+#, fuzzy
+msgid ""
+"Sends a chat message to someone on your contact list. Account is optional."
+msgstr "Užyvańnie: /%s, chavaje knopki razmovy."
 
 #: gajim/gajim_remote.py:131
 msgid "subject"
@@ -2633,12 +2599,12 @@ msgid "message subject"
 msgstr "tema paviedamleńnia"
 
 #: gajim/gajim_remote.py:138
-msgid "Sends new message to a groupchat you've joined."
+msgid "Sends new message to a group chat you've joined."
 msgstr ""
 
 #: gajim/gajim_remote.py:140
 #, fuzzy
-msgid "JID of the room that will receive the message"
+msgid "XMPP Address of the group chat that will receive the message"
 msgstr "JID kantaktu, jaki atrymaje paviedamleńnie"
 
 #: gajim/gajim_remote.py:147
@@ -2647,7 +2613,8 @@ msgstr "Atrymvaje padrabiaznyja źviestki ab kantakcie"
 
 #: gajim/gajim_remote.py:149 gajim/gajim_remote.py:162
 #: gajim/gajim_remote.py:192
-msgid "JID of the contact"
+#, fuzzy
+msgid "XMPP Address of the contact"
 msgstr "JID kantaktu"
 
 #: gajim/gajim_remote.py:153
@@ -2708,7 +2675,8 @@ msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Zapisvaje dziejnyja nałady Gajima ŭ fajł .config"
 
 #: gajim/gajim_remote.py:190
-msgid "Removes contact from roster"
+#, fuzzy
+msgid "Removes contact from contact list"
 msgstr "Vydalaje kantakt sa śpisu"
 
 #: gajim/gajim_remote.py:193
@@ -2757,9 +2725,9 @@ msgid "Missing argument \"contact_jid\""
 msgstr "Nie staje arhumenta \"contact_jid\""
 
 #: gajim/gajim_remote.py:275
-#, python-format
+#, fuzzy, python-format
 msgid ""
-"'%s' is not in your roster.\n"
+"'%s' is not in your contact list.\n"
 "Please specify account for sending the message."
 msgstr ""
 "'%s' niama ŭ tvajim śpisie kantaktaŭ.\n"
@@ -2980,12 +2948,12 @@ msgstr "Kaniec tydnia"
 msgid "Weekend!"
 msgstr "Vychodny!"
 
-#: gajim/common/logger.py:192 gajim/common/logger.py:197
+#: gajim/common/logger.py:189 gajim/common/logger.py:194
 #, python-format
 msgid "%s is a directory but should be a file"
 msgstr "%s jość kataloham, ale musiŭ być fajł"
 
-#: gajim/common/logger.py:217
+#: gajim/common/logger.py:214
 #, fuzzy, python-format
 msgid "Creating %s"
 msgstr "Apisańnie: %s"
@@ -3060,23 +3028,23 @@ msgstr "%(nickname)s adłučyŭsia"
 msgid "Contact Signed Out"
 msgstr "Kantakt adłučyŭsia"
 
-#: gajim/common/contacts.py:455
-msgid "Not in roster"
-msgstr "Niama ŭ śpisie kantaktaŭ"
-
 #: gajim/common/config.py:80
+#, fuzzy
 msgid ""
 "Show desktop notification even when a chat window is opened for this contact "
-"and does not have focus"
+"and does not have focus."
 msgstr ""
+"Pakazvaj vypłyŭnyja vokny i nahadvańni, kali ja ŭ stanie _Adyjšoŭ/"
+"Niedastupny/Zaniaty/Niabačny"
 
 #: gajim/common/config.py:81
-msgid "Play sound when user is busy"
+msgid "Play sound even when being busy."
 msgstr ""
 
 #: gajim/common/config.py:83
-msgid "Show only online and free for chat contacts in roster."
-msgstr ""
+#, fuzzy
+msgid "Show only online and free for chat contacts in the contact list."
+msgstr "Ja chaču dadać Vas u svoj śpis kantaktaŭ."
 
 #: gajim/common/config.py:86
 msgid "Time in minutes, after which your status changes to away."
@@ -3084,11 +3052,13 @@ msgstr "Čas u chvilinach, paśla katoraha tvoj status źmienicca na \"Adyjšoŭ
 
 #: gajim/common/config.py:87
 #, fuzzy
-msgid "$S (Away as a result of being idle more than $T min)"
+msgid "$S (Away: Idle more than $T min)"
 msgstr "Status \"Adyjšoŭ\" jak vynik biaździejnaści prahramy"
 
 #: gajim/common/config.py:87
-msgid "$S will be replaced by current status message, $T by autoawaytime."
+msgid ""
+"$S will be replaced by current status message, $T by the 'autoawaytime' "
+"value."
 msgstr ""
 
 #: gajim/common/config.py:89
@@ -3098,69 +3068,72 @@ msgstr ""
 
 #: gajim/common/config.py:90
 #, fuzzy
-msgid "$S (Not available as a result of being idle more than $T min)"
+msgid "$S (Not available: Idle more than $T min)"
 msgstr "Status \"Niedastupny\" jak vynik biaździejnaści prahramy"
 
 #: gajim/common/config.py:90
-msgid "$S will be replaced by current status message, $T by autoxatime."
+msgid ""
+"$S will be replaced by current status message, $T by the 'autoxatime' value."
 msgstr ""
 
 #: gajim/common/config.py:93
 msgid ""
-"When to show notification area icon. Can be 'never', 'on_event', 'always'."
+"When to show the notification area icon. Can be 'never', 'on_event', and "
+"'always'."
 msgstr ""
 
 #: gajim/common/config.py:94
-msgid "Allow to hide the roster window even if the tray icon is not shown."
+msgid ""
+"Allow to hide the contact list window even if the notification area icon is "
+"not shown."
 msgstr ""
 
 #: gajim/common/config.py:97
 #, fuzzy
-msgid "Contact signed in notification color."
-msgstr "_Pakazvaj padzieju ŭ śpisie kantaktaŭ"
+msgid "Notification color for contacts signing in."
+msgstr "Paviedamlaj mnie ab kantaktach, jakija źmianiajuć status na: "
 
 #: gajim/common/config.py:98
 #, fuzzy
-msgid "Contact signout notification color"
-msgstr "_Pakazvaj padzieju ŭ śpisie kantaktaŭ"
+msgid "Notification color for contacts signing out."
+msgstr "Paviedamlaj mnie ab kantaktach, jakija źmianiajuć status na: "
 
 #: gajim/common/config.py:99
 #, fuzzy
-msgid "New message notification color."
+msgid "Notification color for new message notification."
 msgstr "_Pakazvaj padzieju ŭ śpisie kantaktaŭ"
 
 #: gajim/common/config.py:100
 #, fuzzy
-msgid "File transfer request notification color."
-msgstr "Zapyt na pieradaču fajłu"
+msgid "Notification color for file transfer request."
+msgstr "_Nahadaj mnie ab zakančeńni pieradačy fajła"
 
 #: gajim/common/config.py:101
 #, fuzzy
-msgid "File transfer error notification color."
-msgstr "Pieradača fajłu anulavana"
+msgid "Notification color for file transfer errors."
+msgstr "_Nahadaj mnie ab zakančeńni pieradačy fajła"
 
 #: gajim/common/config.py:102
-#, fuzzy
-msgid "File transfer complete or stopped notification color."
-msgstr "Pakažy nahadvańnie ŭ vypłyŭnym aknie pa zakančeńni pieradačy fajła"
+msgid "Notification color for stopped or completed file transfers."
+msgstr ""
 
 #: gajim/common/config.py:103
-#, fuzzy
-msgid "Groupchat invitation notification color"
-msgstr "Zaprašeńnie ŭ pakoj"
+msgid "Notification color for group chat invitations."
+msgstr ""
 
 #: gajim/common/config.py:104
 #, fuzzy
-msgid "Background color of status changed notification"
+msgid "Notification background color for changed status."
 msgstr "Fonavy koler kantaktaŭ, kali jany tolki dałučylisia."
 
 #: gajim/common/config.py:105
-msgid "Other dialogs color."
+msgid "Notification color for other dialogs."
 msgstr ""
 
 #: gajim/common/config.py:106
+#, fuzzy
 msgid ""
-"List (space separated) of rows (accounts and groups) that are collapsed."
+"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:107
@@ -3168,8 +3141,10 @@ msgstr "Śpis (padzielenych prabiełami) zhornutych radkoŭ (kontaŭ i hrupaŭ).
 msgid "default"
 msgstr "Zmoŭčany"
 
-#: gajim/common/config.py:113
-msgid "Language used by speller"
+#: gajim/common/config.py:113 gajim/common/config.py:424
+#: gajim/common/config.py:431
+#, fuzzy
+msgid "Language used for spell checking."
 msgstr "Mova pravierki pravapisu"
 
 #: gajim/common/config.py:114
@@ -3184,10 +3159,11 @@ msgstr ""
 "'never' - nie pakazvaj času."
 
 #: gajim/common/config.py:115
+#, fuzzy
 msgid ""
 "Print time in chats using Fuzzy Clock. Value of fuzziness from 1 to 4, or 0 "
-"to disable fuzzyclock. 1 is the most precise clock, 4 the least precise one. "
-"This is used only if print_time is 'sometimes'."
+"to disable Fuzzy Clock. 1 is the most precise clock, 4 the least precise "
+"one. This is used only if 'print_time' is 'sometimes'."
 msgstr ""
 "Pakazvaj niedakładny čas. Vartaść niedakładnaści ad 1 da 4 albo 0, kab "
 "adklučyć niedakładnaść. 1 akreślivaje samy dakładny čas, 4 akreślivaje samy "
@@ -3204,16 +3180,18 @@ msgstr "Traktuj pary znakaŭ * / _  jak znaki farmatavańnia."
 #: gajim/common/config.py:120
 #, fuzzy
 msgid ""
-"If true, do not remove */_ . So *abc* will be bold but with * * not removed."
+"If enabled, do not remove */_ . So *abc* will be bold but with * * not "
+"removed."
 msgstr ""
 "Kali maje vartaść True, nie vydalaj */_ . Takim čynam *abc* budzie tłustym, "
 "ale i znaki * * nia vydalacca."
 
 #: gajim/common/config.py:123
+#, fuzzy
 msgid ""
-"Uses ReStructured text markup to send HTML, plus ascii formatting if "
-"selected. For syntax, see http://docutils.sourceforge.net/docs/ref/rst/"
-"restructuredtext.html (If you want to use this, install docutils)"
+"Uses ReStructured text markup to send HTML, plus ASCII formatting if "
+"selected. Needs docutils installed (for syntax, see http://docutils."
+"sourceforge.net/docs/ref/rst/restructuredtext.html)."
 msgstr ""
 "Užyvaje restrukturavanuju movu tekstavaj raźmietki dla dasyłańnia HTML, a "
 "taksama farmatavańnie ASCII, kali zadziejničana adpaviednaja opcyja. Hladzi "
@@ -3222,36 +3200,39 @@ msgstr ""
 "zainstaluj docutils)"
 
 #: gajim/common/config.py:132
+#, fuzzy
 msgid ""
-"Character to add after nickname when using nick completion (tab) in group "
-"chat."
+"Character to add after nickname when using nickname completion (tab) in "
+"group chat."
 msgstr ""
 "Znak, jaki dadajecca paśla mianuški pry dapaŭnieńni (klavišaj TAB) u pakoji."
 
 #: gajim/common/config.py:133
+#, fuzzy
 msgid ""
-"Character to propose to add after desired nickname when desired nickname is "
-"used by someone else in group chat."
+"Character to propose to add after desired nickname when nickname is already "
+"used in group chat."
 msgstr ""
 "Znak, jaki dadajecca paśla mianuški, kali akreślenaja mianuška ŭžyvajecca ŭ "
 "movie inšaha ŭdzielnika pakoju."
 
 #: gajim/common/config.py:155
 msgid ""
-"If true, Gajim will save roster position when hiding roster, and restore it "
-"when showing roster."
+"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:161
-msgid "Place the roster on the right in single window mode"
+msgid "Place the contact list on the right in single window mode"
 msgstr ""
 
 #: gajim/common/config.py:167
 #, fuzzy
 msgid ""
-"This option let you customize timestamp that is printed in conversation. For "
-"example \"[%H:%M] \" will show \"[hour:minute] \". See python doc on "
-"strftime for full documentation: http://docs.python.org/lib/module-time.html"
+"This option lets you customize the timestamp that is printed in "
+"conversation. For example '[%H:%M] ' will show '[hour:minute] '. See python "
+"doc on strftime for full documentation (https://docs.python.org/3/library/"
+"time.html)."
 msgstr ""
 "Hetaja opcyja dazvalaje tabie akreślić farmat miecin času ŭ razmovie. "
 "Naprykład, \"[%H:%M] \" akreślaje, što treba pakazvać \"[hadziny:chviliny] "
@@ -3259,256 +3240,259 @@ msgstr ""
 "strftime: http://docs.python.org/lib/module-time.html"
 
 #: gajim/common/config.py:168
-msgid "Characters that are printed before the nickname in conversations"
+#, fuzzy
+msgid "Characters that are printed before the nickname in conversations."
 msgstr "Znaki, što pakazvajucca ŭ razmovie pierad mianuškaj"
 
 #: gajim/common/config.py:169
-msgid "Characters that are printed after the nickname in conversations"
+#, fuzzy
+msgid "Characters that are printed after the nickname in conversations."
 msgstr "Znaki, što pakazvajucca ŭ razmovie paśla mianuški"
 
 #: gajim/common/config.py:170
-msgid "Add * and [n] in roster title?"
-msgstr "Dadać * i [n] u zahałovak śpisu kantaktaŭ?"
+#, 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:171
 #, fuzzy
 msgid ""
-"How many history messages should be restored when a chat tab/window is "
-"reopened?"
+"Number of messages from chat history to be restored when a chat tab/window "
+"is reopened."
 msgstr ""
 "Kolki radkoŭ z apošniaj razmovy zapaminać i pakazvać u znoŭ adčynienym aknie."
 
 #: gajim/common/config.py:172
-msgid "How far back in time (minutes) history is restored. -1 means no limit."
+msgid ""
+"How far back in time (minutes) chat history is restored. -1 means no limit."
 msgstr ""
 
 #: gajim/common/config.py:173
 msgid ""
-"How many lines to request from server when entering a groupchat. -1 means no "
-"limit"
+"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:174
 msgid ""
-"Minutes of backlog to request when entering a groupchat. -1 means no limit"
+"Should automatic rejoin be activated when you were kicked from a group chat?"
 msgstr ""
 
 #: gajim/common/config.py:175
-msgid ""
-"How many seconds to wait before trying to autorejoin to a conference you are "
-"being disconnected from. Set to 0 to disable autorejoining."
-msgstr ""
-
-#: gajim/common/config.py:176
-msgid "Should autorejoin be activated when kicked from a conference?"
-msgstr ""
-
-#: gajim/common/config.py:177
-msgid ""
-"Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
-"Client default behaviour)."
+#, 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:179
-msgid "How many lines to store for Ctrl+KeyUP."
+#: gajim/common/config.py:177
+#, 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:182
+#: gajim/common/config.py:180
 #, fuzzy, python-format
 msgid ""
-"Either custom URL with %%s in it where %%s is the word/phrase or "
-"'WIKTIONARY' which means use Wikitionary."
+"Either a custom URL with %%s in it (where %%s is the word/phrase) or "
+"'WIKTIONARY' (which means use Wikitionary)."
 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:185
+#: gajim/common/config.py:183
 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:187
+#: gajim/common/config.py:185
+#, fuzzy
 msgid ""
-"When not printing time for every message (print_time==sometimes), print it "
+"When not printing time for every message ('print_time'==sometimes), print it "
 "every x minutes."
 msgstr ""
 "Kali čas pakazvajecca nie dla kožnaha paviedamleńnia "
 "(print_time==sometimes), pakazvaj jaho kožnyja x chvilinaŭ."
 
-#: gajim/common/config.py:188
+#: gajim/common/config.py:186
 msgid "Ask before pasting an image."
 msgstr ""
 
-#: gajim/common/config.py:189
+#: gajim/common/config.py:187
 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:190
+#: gajim/common/config.py:188
 #, fuzzy
 msgid ""
-"Always ask for confirmation before closing groupchats with any of the JIDs "
-"on this space separated list."
+"Always ask for confirmation before closing group chats with any of the XMPP "
+"Addresses on this list (space separated)."
 msgstr ""
 "Zaŭsiody pytajsia paćvierdžańnia pierad začynieńniem kartki/akna razmovy z "
 "hetaha śpisu padzielenych prabiełami nazvaŭ pakojaŭ."
 
-#: gajim/common/config.py:191
+#: gajim/common/config.py:189
 #, fuzzy
 msgid ""
-"Never ask for confirmation before closing groupchats with any of the JIDs on "
-"this space separated list."
+"Never ask for confirmation before closing group chats with any of the XMPP "
+"Addresses on this list (space separated)."
 msgstr ""
 "Nikoli nie pytajsia paćvierdžańnia pierad začynieńniem kartki/akna razmovy z "
 "hetaha śpisu padzielenych prabiełami nazvaŭ pakojaŭ."
 
-#: gajim/common/config.py:192
+#: gajim/common/config.py:190
 msgid ""
-"Ask before closing tabbed chat window if there are controls that can lose "
-"data (chat, private chat, groupchat that will not be minimized)"
+"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:195
+#: gajim/common/config.py:193
 #, fuzzy
 msgid ""
-"Comma separated list of sent hosts, in addition of local interfaces, for "
-"File Transfer in case of address translation/port forwarding."
+"List of send hosts (comma separated) in addition to local interfaces for "
+"file transfers (in case of address translation/port forwarding)."
 msgstr ""
 "Nadpisvaje host, jaki vysyłajecca dla Pieradačy fajłaŭ, u vypadku tranślacyi "
 "adrasoŭ/pieranakiravańnia partoŭ."
 
-#: gajim/common/config.py:196
+#: gajim/common/config.py:194
 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:198
+#: gajim/common/config.py:196
 #, fuzzy
 msgid "Notify of events in the notification area."
 msgstr "Nahadvaj ab padziejach ikonaj pola nahadvańnia."
 
-#: gajim/common/config.py:199
+#: gajim/common/config.py:197
 msgid ""
-"If False, Gajim will display a static event icon instead of the blinking "
-"status icon in the notification area when notifying on event."
+"If disabled, Gajim will display a static event icon instead of the blinking "
+"status icon in the notification area when notifying about an event."
 msgstr ""
 
-#: gajim/common/config.py:205
+#: gajim/common/config.py:203
 msgid "Show tab when only one conversation?"
 msgstr "Pakazvać kartku, kali dziejnaja tolki adna razmova?"
 
-#: gajim/common/config.py:206
+#: gajim/common/config.py:204
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "Pakazvać padzieł kartak u voknach razmovy?"
 
-#: gajim/common/config.py:207
+#: gajim/common/config.py:205
 msgid "Show close button in tab?"
 msgstr "Pakazvać knopki začynieńnia na kartkach?"
 
-#: gajim/common/config.py:220
+#: gajim/common/config.py:218
 msgid "Preview new messages in notification popup?"
 msgstr ""
 
-#: gajim/common/config.py:223
+#: gajim/common/config.py:221
+#, fuzzy
 msgid ""
-"A semicolon-separated list of words that will be highlighted in group chats."
+"A list of words (semicolon separated) that will be highlighted in group "
+"chats."
 msgstr ""
 "Śpis padzielenych kropkaj z koskaj słovaŭ, jakija treba padśviatlać u "
 "pakojach."
 
-#: gajim/common/config.py:224
+#: gajim/common/config.py:222
 #, fuzzy
 msgid ""
-"If true, quits Gajim when X button of Window Manager is clicked. This "
-"setting is taken into account only if notification icon is used."
+"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 ""
 "Kali opcyja maje vartaść True, Gajim zaviaršaje vykanańnie pa nacisku knopki "
 "X Kiraŭnika voknaŭ. Hetaja nałada dziejničaje tolki ź dziejnaj ikonaj pola "
 "nahadvańnia."
 
-#: gajim/common/config.py:225
+#: gajim/common/config.py:223
 msgid ""
-"If true, Gajim hides the Roster window on pressing the X button instead of "
-"minimizing into the Dock."
+"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:226
+#: gajim/common/config.py:224
 #, fuzzy
 msgid ""
-"If true, Gajim will display an icon on each tab containing unread messages. "
-"Depending on the theme, this icon may be animated."
+"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:227
+#: gajim/common/config.py:225
 #, fuzzy
 msgid ""
-"If true, Gajim will display the status message, if not empty, for every "
-"contact under the contact name in roster window."
+"If enabled, Gajim will display the status message (if not empty) underneath "
+"the contact name in the contact list window."
 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:233
-msgid "Define the position of the avatar in roster. Can be left or right"
+#: gajim/common/config.py:231
+msgid ""
+"Define the position of avatars in the contact list. Can be 'left' or 'right'."
 msgstr ""
 
-#: gajim/common/config.py:234
+#: gajim/common/config.py:232
 #, fuzzy
 msgid ""
-"If False, Gajim will no longer print status line in chats when a contact "
-"changes their status and/or their status message."
+"If disabled, Gajim will no longer print status messages in chats when a "
+"contact changes their status (and/or their status message)."
 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:235
+#: gajim/common/config.py:233
 #, fuzzy
 msgid ""
 "Default Setting: Show a status message for every join or leave in a group "
-"chat"
+"chat."
 msgstr "Niemahčyma dałučycca da pakoju"
 
-#: gajim/common/config.py:236
+#: gajim/common/config.py:234
+#, fuzzy
 msgid ""
-"Default Setting: Show a status message for all status (away, dnd, etc.) "
-"changes of users in a group chat"
-msgstr ""
+"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:238
-msgid "Log XHTML messages instead of plain text messages."
+#: gajim/common/config.py:236
+msgid "Store XHTML messages in chat history instead of plain text messages."
 msgstr ""
 
-#: gajim/common/config.py:239
+#: gajim/common/config.py:237
 msgid "Don't show avatar for the transport itself."
 msgstr "Nie pakazvaj avatara dla transpartu."
 
-#: gajim/common/config.py:240
-msgid "Don't show roster in the system taskbar."
+#: gajim/common/config.py:238
+#, 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:241
+#: gajim/common/config.py:239
 #, fuzzy
 msgid ""
-"If true, make the window flash (the default behaviour in most Window "
-"Managers) when holding pending events."
+"If enabled, Gajim makes the window flash (the default behaviour in most "
+"Window Managers) when holding pending events."
 msgstr ""
 "Kali opcyja maje vartaść True i kali instalavanyja GTK+ i PyGTK versii 2.8 "
 "albo paźniejšaj, mirhaj aknom (zmoŭčanyja pavodziny akna ŭ bolšaści "
 "Kiraŭnikoŭ voknaŭ) pry najaŭnaści niečytanych paviedamleńniaŭ."
 
-#: gajim/common/config.py:245
+#: gajim/common/config.py:243
 #, fuzzy
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
 "'always_with_roster' - Like 'always' but the messages are in a single window "
-"along with the roster.\n"
+"along with the contact list.\n"
 "'never' - All messages get their own window.\n"
 "'peracct' - Messages for each account are sent to a specific window.\n"
-"'pertype' - Each message type (e.g. chats vs. groupchats) is sent to a "
+"'pertype' - Each message type (e.g. chats vs. group chats) is sent to a "
 "specific window."
 msgstr ""
 "Kiruje aknom, u jakim pakazvajucca novyja paviedamleńni.\n"
@@ -3519,252 +3503,276 @@ msgstr ""
 "pakazvajucca ŭ asobnych voknach. Zvažaj, što kab ubačyć źmieny, treba "
 "ŭruchomić Gajima nanoŭ."
 
-#: gajim/common/config.py:246
+#: gajim/common/config.py:244
 msgid ""
-"Show roster on startup.\n"
-"'always' - Always show roster.\n"
-"'never' - Never show roster.\n"
-"'last_state' - Restore the last state roster."
+"Show contact list window on startup.\n"
+"'always' - Always show contact list window.\n"
+"'never' - Never show contact list window.\n"
+"'last_state' - Restore last state of the contact list window."
 msgstr ""
 
-#: gajim/common/config.py:247
-msgid "If False, you will no longer see the avatar in the chat window."
+#: gajim/common/config.py:245
+#, 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:248
+#: gajim/common/config.py:246
 #, fuzzy
-msgid "If true, pressing the escape key closes a tab/window."
+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:249
-msgid "Hides the banner in a group chat window"
+#: gajim/common/config.py:247
+#, fuzzy
+msgid "Hides the banner in a group chat window."
 msgstr "Chavaje baner u aknie pakoju"
 
-#: gajim/common/config.py:250
-msgid "Hides the banner in two persons chat window"
-msgstr "Chavaje baner u aknie pryvatnaj razmovy"
+#: gajim/common/config.py:248
+#, fuzzy
+msgid "Hides the banner in a 1:1 chat window."
+msgstr "Chavaje baner u aknie pakoju"
 
-#: gajim/common/config.py:251
-msgid "Hides the group chat occupants list in group chat window."
+#: gajim/common/config.py:249
+#, fuzzy
+msgid "Hides the group chat participants list in a group chat window."
 msgstr "Chavaje śpis naviednikaŭ pakoju."
 
-#: gajim/common/config.py:252
+#: gajim/common/config.py:250
+#, fuzzy
 msgid ""
 "In a chat, show the nickname at the beginning of a line only when it's not "
-"the same person talking than in previous message."
+"the same person talking as in the previous message."
 msgstr ""
 "U pakoji pakazvaj mianušku pierad paviedamleńniem, tolki kali jaho napisała "
 "nia taja asoba, što napisała papiaredniaje paviedamleńnie."
 
-#: gajim/common/config.py:253
+#: gajim/common/config.py:251
 msgid "Indentation when using merge consecutive nickname."
 msgstr "Vodstup pry šmatmetavym pryznačeńni paviedamleńnia."
 
-#: gajim/common/config.py:254
-msgid "Ctrl-Tab go to next composing tab when none is unread."
+#: gajim/common/config.py:252
+#, fuzzy
+msgid ""
+"Ctrl+Tab switches to the next composing tab when there are no tabs with "
+"messages pending."
 msgstr ""
 "Ctrl-Tab pierachodzić na nastupnuju kartku, kali na dziejnaj niama "
 "niečytanych paviedamleńniaŭ."
 
-#: gajim/common/config.py:255
+#: gajim/common/config.py:253
 #, fuzzy
 msgid ""
-"Show the confirm metacontacts creation dialog or not? Empty string means "
-"never show the dialog."
+"Show a confirmation dialog to create metacontacts? Empty string means never "
+"show the dialog."
 msgstr ""
 "Ci treba pakazvać akno paćvierdžańnia pry stvareńni metakantaktu? Pusty "
 "radok aznačaje, što hetaje akno nikoli nia budzie pakazvacca."
 
-#: gajim/common/config.py:256
+#: gajim/common/config.py:254
 #, fuzzy
 msgid ""
-"Show the confirm block contact dialog or not? Empty string means never show "
+"Show a confirmation dialog to block a contact? Empty string means never show "
 "the dialog."
 msgstr ""
 "Ci treba pakazvać akno paćvierdžańnia pry stvareńni metakantaktu? Pusty "
 "radok aznačaje, što hetaje akno nikoli nia budzie pakazvacca."
 
-#: gajim/common/config.py:257
+#: gajim/common/config.py:255
 #, fuzzy
 msgid ""
-"Show the confirm custom status dialog or not? Empty string means never show "
-"the dialog."
+"Show a confirmation dialog for a custom status? Empty string means never "
+"show the dialog."
 msgstr ""
 "Ci treba pakazvać akno paćvierdžańnia pry stvareńni metakantaktu? Pusty "
 "radok aznačaje, što hetaje akno nikoli nia budzie pakazvacca."
 
-#: gajim/common/config.py:258
+#: gajim/common/config.py:256
 #, fuzzy
 msgid ""
-"If true, you will be able to set a negative priority to your account in "
-"account modification window. BE CAREFUL, when you are logged in with a "
-"negative priority, you will NOT receive any message from your server."
+"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 ""
 "Kali opcyja maje vartaść True, ty zmožaš akreślić admoŭny pryjarytet ŭ aknie "
 "madyfikacyi kontu. UHAVA: kali ty dałučajeśsia z admoŭnym pryjarytetam, to "
 "nia budzieš atrymvać paviedamleńniaŭ z servera."
 
-#: gajim/common/config.py:259
+#: gajim/common/config.py:257
 #, fuzzy
 msgid ""
-"If true, Gajim will show number of online and total contacts in account and "
-"group rows."
+"If enabled, Gajim will show both the number of online and total contacts in "
+"account rows as well as in group rows."
 msgstr ""
 "Kali opcyja maje vartaść True, Gajim budzie pakazvać kolkaść dałučanych "
 "kantaktaŭ i ahulnuju kolkaść kantaktaŭ u radkach kontaŭ i hrupaŭ."
 
-#: gajim/common/config.py:260
+#: gajim/common/config.py:258
+#, fuzzy
 msgid ""
-"Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
-"as if they were of this type"
+"Can be empty, 'chat' or 'normal'. If not empty, all incoming messages are "
+"treated as if they were of this type."
 msgstr ""
 "Moža być pustym albo mieć vartaść 'chat' ci 'normal'. Kali vartaść nie "
 "pustaja, traktuj usie ŭvachodnyja paviedamleńni jak paviedamleńni hetaha typu"
 
-#: gajim/common/config.py:261
+#: gajim/common/config.py:259
 msgid ""
-"If true, Gajim will scroll and select the contact who sent you the last "
-"message, if chat window is not already opened."
+"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:262
+#: gajim/common/config.py:260
 msgid "Time of inactivity needed before the change status window closes down."
 msgstr ""
 
-#: gajim/common/config.py:263
+#: gajim/common/config.py:261
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
 msgstr ""
 
-#: gajim/common/config.py:264
+#: gajim/common/config.py:262
 msgid ""
-"If true, notification windows from notification-daemon will be attached to "
-"notification icon."
+"If enabled, notification windows from notification-daemon will be attached "
+"to the notification area icon."
 msgstr ""
 
-#: gajim/common/config.py:265
+#: gajim/common/config.py:263
 msgid "Choose interval between 2 checks of idleness."
 msgstr ""
 
-#: gajim/common/config.py:266
+#: gajim/common/config.py:264
 msgid ""
-"Valid uri schemes. Only schemes in this list will be accepted as \"real\" "
-"uri. (mailto and xmpp are handled separately)"
+"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:265
+msgid ""
+"If enabled, completion in group chats will be like a shell auto-completion."
+msgstr ""
+
+#: gajim/common/config.py:270
+msgid "Optionally fix Jingle output video framerate. Example: 10/1 or 25/2."
 msgstr ""
 
-#: gajim/common/config.py:267
-msgid "If true, completion in groupchats will be like a shell auto-completion"
+#: gajim/common/config.py:271
+msgid "Optionally resize Jingle output video. Example: 320x240."
 msgstr ""
 
 #: gajim/common/config.py:272
-msgid "Optionally fix jingle output video framerate. Example: 10/1 or 25/2"
+msgid "If enabled, you will see your webcam's video stream as well."
 msgstr ""
 
-#: gajim/common/config.py:273
-msgid "Optionally resize jingle output video. Example: 320x240"
+#: gajim/common/config.py:275
+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:274
-msgid "If true, You will also see your webcam"
+#: gajim/common/config.py:276
+msgid "STUN server to use when using Jingle"
 msgstr ""
 
 #: gajim/common/config.py:277
 msgid ""
-"If true, Gajim will try to use a STUN server when using Jingle. The one in "
-"\"stun_server\" option, or the one given by the XMPP server."
+"If enabled, Gajim will show affiliation of group chat participants by adding "
+"a colored square to the status icon."
 msgstr ""
 
 #: gajim/common/config.py:278
-msgid "STUN server to use when using Jingle"
+msgid ""
+"Proxy used for all outgoing connections if the account does not have a "
+"specific proxy configured."
 msgstr ""
 
 #: gajim/common/config.py:279
-msgid ""
-"If true, Gajim will show affiliation of groupchat occupants by adding a "
-"colored square to the status icon"
+msgid "If enabled, Gajim will ignore incoming attention requests ('wizz')."
 msgstr ""
 
 #: gajim/common/config.py:280
 msgid ""
-"Proxy used for all outgoing connections if the account does not have a "
-"specific proxy configured"
+"If enabled, Gajim will reopen chat windows that were opened last time Gajim "
+"was closed."
 msgstr ""
 
 #: gajim/common/config.py:281
-msgid "If true, Gajim will ignore incoming attention requests (\"wizz\")."
+msgid ""
+"If enabled, Gajim will display an icon to show that sent messages have been "
+"received by your contact."
 msgstr ""
 
 #: gajim/common/config.py:282
-msgid ""
-"If enabled, Gajim will reopen chat windows that were opened last time Gajim "
-"was closed."
+msgid "Show a mini avatar in chat window tabs and as the window's icon."
 msgstr ""
 
 #: gajim/common/config.py:283
+#, fuzzy
 msgid ""
-"If enabled, Gajim will show an icon to show that sent message has been "
-"received by your contact"
+"If enabled, Gajim will use the System's Keyring to store account passwords."
 msgstr ""
+"Kali opcyja maje vartaść True, Gajim budzie zachoŭvać paroli z dapamohaj "
+"Kiraŭnika parolaŭ GNOME (kali jość mahčymaść)."
 
 #: gajim/common/config.py:284
-msgid "Show a mini avatar in chat window tabs and in window icon"
+msgid "If enabled, Gajim will execute XEP-0146 Commands."
 msgstr ""
 
 #: gajim/common/config.py:285
-#, fuzzy
-msgid "If true, Gajim will use the Systems Keyring to store account passwords."
+msgid "2: System, 1: Enabled, 0: Disabled"
 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:286
-msgid "If true, Gajim will execute XEP-0146 Commands."
+msgid "Options in days which can be chosen in the sync threshold menu"
 msgstr ""
 
 #: gajim/common/config.py:287
-msgid "2: System, 1: Enabled, 0: Disabled"
+msgid ""
+"Maximum history in days we request from a public group chat archive. 0: As "
+"much as possible."
 msgstr ""
 
 #: gajim/common/config.py:288
-msgid "Options in days which can be chosen in the sync threshold menu"
+msgid ""
+"Maximum history in days we request from a private group chat archive. 0: As "
+"much as possible."
 msgstr ""
 
 #: gajim/common/config.py:289
 msgid ""
-"Maximum history in days we request from a public room archive. 0: As much as "
-"possible"
+"If enabled, Gajim shows the group chat subject in the chat window when "
+"joining."
 msgstr ""
 
 #: gajim/common/config.py:290
+#, fuzzy
 msgid ""
-"Maximum history in days we request from a private room archive. 0: As much "
-"as possible"
+"If enabled, the contact row is colored according to the current chat state "
+"of the contact."
 msgstr ""
+"Kali ŭklučanaja hetaja opcyja, Gajim budzie dałučacca da hetaha pakoju pry "
+"starcie"
 
 #: gajim/common/config.py:291
-msgid "If the room subject is shown in chat on join"
+#, fuzzy
+msgid ""
+"If enabled, the tab is colored according to the current chat state of the "
+"contact."
 msgstr ""
+"Kali ŭklučanaja hetaja opcyja, Gajim budzie dałučacca da hetaha pakoju pry "
+"starcie"
 
 #: gajim/common/config.py:292
+#, fuzzy
 msgid ""
-"If the contact row is colored according to the current chatstate of the "
-"contact"
+"Shows a text in the banner that describes the current chat state of the "
+"contact."
 msgstr ""
+"Kali ŭklučanaja hetaja opcyja, Gajim budzie dałučacca da hetaha pakoju pry "
+"starcie"
 
 #: gajim/common/config.py:293
-msgid "If the tab is colored according to the current chatstate of the contact"
-msgstr ""
-
-#: gajim/common/config.py:294
-msgid ""
-"Shows a text in the banner that describes the current chatstate of the "
-"contact"
-msgstr ""
-
-#: gajim/common/config.py:295 gajim/common/config.py:424
 #, fuzzy
 msgid ""
 "Chat state notifications that are sent to contacts. Possible values: all, "
@@ -3773,128 +3781,138 @@ msgstr ""
 "Dasyłaj nahadvańni ab stanie razmovy. Musić być adnoj z nastupnych "
 "vartaściaŭ: all, composing_only, disabled."
 
-#: gajim/common/config.py:296 gajim/common/config.py:438
+#: gajim/common/config.py:294
 #, fuzzy
 msgid ""
 "Chat state notifications that are sent to the group chat. Possible values: "
-"all, composing_only, disabled"
+"'all', 'composing_only', 'disabled'"
 msgstr ""
 "Dasyłaj nahadvańni ab stanie razmovy. Musić być adnoj z nastupnych "
 "vartaściaŭ: all, composing_only, disabled."
 
-#: gajim/common/config.py:312
+#: gajim/common/config.py:297
+msgid "API Preferences. Possible values: 'http', 'iq'"
+msgstr ""
+
+#: gajim/common/config.py:313
+#, fuzzy
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
-"defined in autopriority_* options."
+"defined in 'autopriority_*' options."
 msgstr ""
 "Pryjarytet budzie aŭtamatyčna źmianiacca zhodna tvajmu statusu. Pryjarytety "
 "akreślivajucca ŭ opcyjach autopriority_*."
 
-#: gajim/common/config.py:320
+#: gajim/common/config.py:321
 msgid ""
-"Status used to autoconnect as. Can be online, chat, away, xa, dnd, "
-"invisible. NOTE: this option is used only if restore_last_status is disabled"
+"Status to be used automatically when connecting. Can be 'online', 'chat', "
+"'away', 'xa', 'dnd' or 'invisible'. NOTE: This option is used only if "
+"'restore_last_status' is disabled."
 msgstr ""
 
-#: gajim/common/config.py:321
-msgid "If enabled, restore the last status that was used."
+#: gajim/common/config.py:322
+msgid "If enabled, the last status will be restored."
 msgstr ""
 
-#: gajim/common/config.py:322
+#: gajim/common/config.py:323
 msgid ""
-"If true, Contacts requesting authorization will be automatically accepted."
+"If enabled, Contacts requesting authorization will be accepted automatically."
 msgstr ""
 
-#: gajim/common/config.py:323
+#: gajim/common/config.py:324
 #, fuzzy
 msgid ""
-"If False, this account will be disabled and will not appear in roster window."
+"If disabled, this account will be disabled and will not appear in the "
+"contact list window."
 msgstr ""
 "Kali opcyja maje vartaść False, ty bolš nia ŭbačyš avatara ŭ aknie razmovy."
 
-#: gajim/common/config.py:327
-msgid "Allow plaintext connections"
+#: gajim/common/config.py:328
+msgid "Allow plaintext connections."
 msgstr ""
 
-#: gajim/common/config.py:330
+#: gajim/common/config.py:331
 msgid ""
-"List (space separated) of authentication mechanisms to try. Can contain "
-"ANONYMOUS, EXTERNAL, GSSAPI, SCRAM-SHA-1-PLUS, SCRAM-SHA-1, DIGEST-MD5, "
-"PLAIN, X-MESSENGER-OAUTH2 or XEP-0078"
+"List of authentication mechanisms to try (space separated). Can contain "
+"'ANONYMOUS', 'EXTERNAL', 'GSSAPI', 'SCRAM-SHA-1-PLUS', 'SCRAM-SHA-1', "
+"'DIGEST-MD5', 'PLAIN', 'X-MESSENGER-OAUTH2' or 'XEP-0078'."
 msgstr ""
 
-#: gajim/common/config.py:331
+#: gajim/common/config.py:332
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection. "
-"Can be 'warn', 'connect', 'disconnect'"
+"Can be 'warn', 'connect' or 'disconnect'."
 msgstr ""
 
-#: gajim/common/config.py:332
+#: gajim/common/config.py:333
 msgid "Show a warning dialog before using standard SSL library."
 msgstr ""
 
-#: gajim/common/config.py:333
+#: gajim/common/config.py:334
 msgid ""
 "Show a warning dialog before sending PLAIN password over a plain connection."
 msgstr ""
 
-#: gajim/common/config.py:334
-msgid "Space separated list of ssl errors to ignore."
+#: gajim/common/config.py:335
+msgid "List of SSL errors to ignore (space separated)."
 msgstr ""
 
-#: gajim/common/config.py:340
+#: gajim/common/config.py:341
 msgid ""
-"Space separated list of JIDs for which you do not want to store logs. You "
-"can also add account name to log nothing for this account."
+"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:341
+#: gajim/common/config.py:342
 msgid ""
-"Space separated list of JIDs for which you accept to not log conversations "
-"if he does not want to."
+"List of XMPP Addresses (space separated) for which you accept to not store "
+"chat history if your contact does not want to."
 msgstr ""
 
-#: gajim/common/config.py:343
-msgid "Whitespace sent after inactivity"
+#: gajim/common/config.py:344
+msgid "If enabled, a whitespace is sent after inactivity (keep alive)."
 msgstr ""
 
-#: gajim/common/config.py:344
-msgid "XMPP ping sent after inactivity"
+#: gajim/common/config.py:345
+msgid "If enabled, an XMPP ping is sent after inactivity (ping alive)."
 msgstr ""
 
-#: gajim/common/config.py:348
+#: gajim/common/config.py:349
 msgid ""
-"How many seconds to wait for the answer of ping alive packet before trying "
-"to reconnect?"
+"How many seconds to wait for the answer of a ping alive packet before trying "
+"to reconnect."
 msgstr ""
 
-#: gajim/common/config.py:352
-msgid "Jabberd2 workaround"
+#: gajim/common/config.py:353
+#, fuzzy
+msgid "Jabberd2 workaround."
 msgstr "Abychod dla Jabberd2"
 
-#: gajim/common/config.py:355
+#: gajim/common/config.py:356
+#, fuzzy
 msgid ""
-"If checked, Gajim will use your IP and proxies defined in "
-"file_transfer_proxies option for file transfer."
+"If enabled, Gajim will use your IP and proxies defined in "
+"'file_transfer_proxies' option for file transfers."
 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:356
+#: gajim/common/config.py:357
 msgid ""
-"If true, Gajim will test file transfer proxies on startup to be sure it "
-"works. Openfire's proxies are known to fail this test even if they work."
+"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:369
-msgid "Answer to receipt requests"
+#: gajim/common/config.py:370
+msgid "If enabled, Gajim will answer to message receipt requests."
 msgstr ""
 
-#: gajim/common/config.py:370
-msgid "Sent receipt requests"
+#: gajim/common/config.py:371
+msgid "If enabled, Gajim will send message receipt requests."
 msgstr ""
 
-#: gajim/common/config.py:379
+#: gajim/common/config.py:380
 #, fuzzy
 msgid ""
 "Allow Gajim to send information about the operating system you are running."
@@ -3902,182 +3920,197 @@ msgstr ""
 "Kali ŭklučanaja hetaja opcyja, Gajim budzie dałučacca da hetaha pakoju pry "
 "starcie"
 
-#: gajim/common/config.py:380
+#: gajim/common/config.py:381
 #, fuzzy
 msgid "Allow Gajim to send your local time."
 msgstr "%s choča dasłać tabie fajł."
 
-#: gajim/common/config.py:383
+#: gajim/common/config.py:384
 #, fuzzy
-msgid "Message that is sent to contacts you want to add"
+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:384
-msgid ""
-"If enabled, Gajim will send your local IPs so your contact can connect to "
-"your machine to transfer files."
-msgstr ""
-
 #: gajim/common/config.py:385
+#, fuzzy
 msgid ""
-"Space separated list of JIDs for which chat window will be re-opened on next "
-"startup."
+"If enabled, Gajim will send your local IP so your contact can connect to "
+"your machine for file transfers."
 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:387
-msgid "HTTP Upload: Enable HTTPS Verification"
+#: gajim/common/config.py:386
+msgid ""
+"List of XMPP Addresses (space separated) for which the chat window will be "
+"re-opened on next startup."
 msgstr ""
 
 #: gajim/common/config.py:388
-msgid ""
-"Preferred file transfer mechanism for file drag&drop on chat window. Can be "
-"'httpupload' (default) or 'jingle'"
+msgid "HTTP File Upload: Enable HTTPS Verification."
 msgstr ""
 
 #: gajim/common/config.py:389
-msgid "Allow cert verification with POSH"
+msgid ""
+"Preferred file transfer mechanism for file drag&drop on a chat window. Can "
+"be 'httpupload' (default) or 'jingle'."
 msgstr ""
 
-#: gajim/common/config.py:423 gajim/common/config.py:430
+#: gajim/common/config.py:390
 #, fuzzy
-msgid "Language for which misspelled words will be checked"
-msgstr "Mova, dla jakoj treba praviarać pravapis"
-
-#: gajim/common/config.py:427
-msgid "The currently active encryption for that contact"
-msgstr ""
+msgid "Allow certificate verification with POSH."
+msgstr "Dadajecca admysłovaje nahadvańnie dla %s"
 
-#: gajim/common/config.py:431
+#: gajim/common/config.py:425
+#, fuzzy
 msgid ""
-"How many lines to request from server when entering a groupchat. -1 means no "
-"limit, -2 means global value"
+"Chat state notifications that are sent to contacts. Possible values: 'all', "
+"'composing_only', 'disabled'"
 msgstr ""
+"Dasyłaj nahadvańni ab stanie razmovy. Musić być adnoj z nastupnych "
+"vartaściaŭ: all, composing_only, disabled."
+
+#: gajim/common/config.py:428
+#, fuzzy
+msgid "The currently active encryption for that contact."
+msgstr "Ci vykarystoŭvajecca šyfravańnie OpenPGP dla hetaha kantaktu?"
 
 #: gajim/common/config.py:432
 msgid ""
-"Minutes of backlog to request when entering a groupchat. -1 means no limit, "
-"-2 means global value"
+"If enabled, a notification is created for every message in this group chat."
 msgstr ""
 
 #: gajim/common/config.py:433
-msgid "State whether a notification is created for every message in this room"
-msgstr ""
-
-#: gajim/common/config.py:434
+#, fuzzy
 msgid ""
-"Show a status message for all status (away, dnd, etc.) changes of users in a "
-"group chat"
-msgstr ""
+"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:435
+#: gajim/common/config.py:434
 #, fuzzy
-msgid "Show a status message for every join or leave in a group chat"
+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:435
+msgid ""
+"If enabled, the group chat is minimized into the contact list when joining "
+"automatically."
+msgstr ""
+
 #: gajim/common/config.py:436
-msgid "If the group chat is minimized into the roster on autojoin"
+msgid ""
+"If enabled, the group chat is minimized into the contact list when closing "
+"it."
 msgstr ""
 
 #: gajim/common/config.py:437
-msgid "If the group chat is minimized into the roster on close"
+#, fuzzy
+msgid ""
+"Chat state notifications that are sent to the group chat. Possible values: "
+"'all', 'composing_only' or 'disabled'."
 msgstr ""
+"Dasyłaj nahadvańni ab stanie razmovy. Musić być adnoj z nastupnych "
+"vartaściaŭ: all, composing_only, disabled."
 
-#: gajim/common/config.py:441
+#: gajim/common/config.py:440
 msgid ""
-"State whether plugins should be activated on startup (this is saved on Gajim "
-"exit). This option SHOULD NOT be used to (de)activate plug-ins. Use GUI "
-"instead."
+"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:446 gajim/common/const.py:281
+#: gajim/common/config.py:445 gajim/common/const.py:315
 msgid "Sleeping"
 msgstr "Splu"
 
-#: gajim/common/config.py:447
+#: gajim/common/config.py:446
 msgid "Back soon"
 msgstr "Chutka viarnusia"
 
-#: gajim/common/config.py:447
+#: gajim/common/config.py:446
 msgid "Back in some minutes."
 msgstr "Viarnusia praz paru chvilinaŭ."
 
-#: gajim/common/config.py:448 gajim/common/const.py:247
+#: gajim/common/config.py:447 gajim/common/const.py:281
 msgid "Eating"
 msgstr "Jem"
 
-#: gajim/common/config.py:448
-msgid "I'm eating, so leave me a message."
-msgstr "Ja jem, možaš pakinuć mnie paviedamleńnie."
+#: gajim/common/config.py:447
+#, fuzzy
+msgid "I'm eating."
+msgstr "Ja pracuju."
 
-#: gajim/common/config.py:449
+#: gajim/common/config.py:448
 msgid "Movie"
 msgstr "Film"
 
-#: gajim/common/config.py:449
+#: gajim/common/config.py:448
 msgid "I'm watching a movie."
 msgstr "Hladžu film."
 
-#: gajim/common/config.py:450 gajim/common/const.py:314
+#: gajim/common/config.py:449 gajim/common/const.py:348
 msgid "Working"
 msgstr "Pracuju"
 
-#: gajim/common/config.py:450
+#: gajim/common/config.py:449
 msgid "I'm working."
 msgstr "Ja pracuju."
 
-#: gajim/common/config.py:451
+#: gajim/common/config.py:450
 msgid "Phone"
 msgstr "Telefon"
 
-#: gajim/common/config.py:451
+#: gajim/common/config.py:450
 msgid "I'm on the phone."
 msgstr "Ja razmaŭlaju pa telefonie."
 
-#: gajim/common/config.py:452
+#: gajim/common/config.py:451
 msgid "Out"
 msgstr "Vyjšaŭ"
 
-#: gajim/common/config.py:452
+#: gajim/common/config.py:451
 msgid "I'm out enjoying life."
 msgstr "Vyjšaŭ ciešycca z žyćcia."
 
-#: gajim/common/config.py:463
+#: gajim/common/config.py:462
 msgid "I'm available."
 msgstr "Dastupny."
 
-#: gajim/common/config.py:464
+#: gajim/common/config.py:463
 msgid "I'm free for chat."
 msgstr "Achvotna parazmaŭlaju."
 
-#: gajim/common/config.py:465 gajim/gtk/accounts.py:134
+#: gajim/common/config.py:464 gajim/gtk/accounts.py:133
 msgid "Be right back."
 msgstr "Chutka viarnusia."
 
-#: gajim/common/config.py:466
+#: gajim/common/config.py:465
 msgid "I'm not available."
 msgstr "Niedastupny."
 
-#: gajim/common/config.py:467
+#: gajim/common/config.py:466
 msgid "Do not disturb."
 msgstr "Nie turbavać."
 
-#: gajim/common/config.py:468 gajim/common/config.py:469
+#: gajim/common/config.py:467 gajim/common/config.py:468
 msgid "Bye!"
 msgstr "Byvaj!"
 
-#: gajim/common/config.py:480
+#: gajim/common/config.py:479
+#, fuzzy
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
-"muc_highlight_words, or when a group chat message contains your nickname."
+"'muc_highlight_words' your nickname is mentioned."
 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:481
-msgid "Sound to play when any MUC message arrives."
+#: gajim/common/config.py:480
+#, 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:485
+#: gajim/common/config.py:484
 #, fuzzy
 msgid "Tor"
 msgstr "Da"
@@ -4087,952 +4120,1048 @@ msgstr "Da"
 msgid "Error: cannot open %s for reading"
 msgstr "Pamyłka: niemahčyma adčytać %s"
 
-#: gajim/common/const.py:214
+#: gajim/common/const.py:216
+#, fuzzy
+msgid "?Group chat name:Team"
+msgstr "?Funkcyja kantaktu ŭ pakoji:Niama"
+
+#: gajim/common/const.py:217
+msgid "?Group chat description:Project discussion"
+msgstr ""
+
+#: gajim/common/const.py:218
+#, fuzzy
+msgid "?Group chat address:team"
+msgstr "Pakoji"
+
+#: gajim/common/const.py:219
+#, fuzzy
+msgid "?Group chat name:Family"
+msgstr "Padśviatleńnie paviedamleńnia ŭ pakoji"
+
+#: gajim/common/const.py:220
+msgid "?Group chat description:Spring gathering"
+msgstr ""
+
+#: gajim/common/const.py:221
+msgid "?Group chat address:family"
+msgstr ""
+
+#: gajim/common/const.py:222
+#, fuzzy
+msgid "?Group chat name:Vacation"
+msgstr "Zaprašeńnie ŭ pakoj"
+
+#: gajim/common/const.py:223
+msgid "?Group chat description:Trip planning"
+msgstr ""
+
+#: gajim/common/const.py:224
+#, fuzzy
+msgid "?Group chat address:vacation"
+msgstr "Zaprašeńnie ŭ pakoj"
+
+#: gajim/common/const.py:225
+#, fuzzy
+msgid "?Group chat name:Repairs"
+msgstr "Групавая размова"
+
+#: gajim/common/const.py:226
+msgid "?Group chat description:Local help group"
+msgstr ""
+
+#: gajim/common/const.py:227
+#, fuzzy
+msgid "?Group chat address:repairs"
+msgstr "Pakoji"
+
+#: gajim/common/const.py:228
+#, fuzzy
+msgid "?Group chat name:News"
+msgstr "?Funkcyja kantaktu ŭ pakoji:Niama"
+
+#: gajim/common/const.py:229
+#, fuzzy
+msgid "?Group chat description:Local news and reports"
+msgstr "Stvareńnie pakojaŭ abmiežavanaje."
+
+#: gajim/common/const.py:230
+#, fuzzy
+msgid "?Group chat address:news"
+msgstr "Novaja hrupavaja razmova"
+
+#: gajim/common/const.py:235
+#, fuzzy
+msgid "Remote server not found"
+msgstr "Niemahčyma znajści servis"
+
+#: gajim/common/const.py:236
+msgid "Remote server timeout"
+msgstr ""
+
+#: gajim/common/const.py:237 gajim/common/const.py:238
+#: gajim/common/const.py:239
+#, fuzzy
+msgid "Address does not belong to a group chat server"
+msgstr "Heta nie pakoj"
+
+#: gajim/common/const.py:240
+#, fuzzy
+msgid "Group chat already exists"
+msgstr "Kont Local užo isnuje."
+
+#: gajim/common/const.py:241
+#, fuzzy
+msgid "Group chat does not exist"
+msgstr "Takoha pakoju niama."
+
+#: gajim/common/const.py:247
 msgid "This message was encrypted with OTR and could not be decrypted."
 msgstr ""
 
-#: gajim/common/const.py:217
+#: gajim/common/const.py:250
 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:221
+#: gajim/common/const.py:254
 msgid ""
-"This message was encrypted with OpenPGP for XMPP and could not be decrypted."
+"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:224
+#: gajim/common/const.py:258
 #, python-format
 msgid "This message was encrypted with %s and could not be decrypted."
 msgstr ""
 
-#: gajim/common/const.py:231
+#: gajim/common/const.py:265
 #, fuzzy
 msgid "Doing Chores"
 msgstr "Niapravilny host"
 
-#: gajim/common/const.py:232
+#: gajim/common/const.py:266
 msgid "Buying Groceries"
 msgstr ""
 
-#: gajim/common/const.py:233
+#: gajim/common/const.py:267
 #, fuzzy
 msgid "Cleaning"
 msgstr "Viečar"
 
-#: gajim/common/const.py:234
+#: gajim/common/const.py:268
 #, fuzzy
 msgid "Cooking"
 msgstr "Uvod paviedamleńnia"
 
-#: gajim/common/const.py:235
+#: gajim/common/const.py:269
 msgid "Doing Maintenance"
 msgstr ""
 
-#: gajim/common/const.py:236
+#: gajim/common/const.py:270
 msgid "Doing the Dishes"
 msgstr ""
 
-#: gajim/common/const.py:237
+#: gajim/common/const.py:271
 msgid "Doing the Laundry"
 msgstr ""
 
-#: gajim/common/const.py:238
+#: gajim/common/const.py:272
 #, fuzzy
 msgid "Gardening"
 msgstr "Ranica"
 
-#: gajim/common/const.py:239
+#: gajim/common/const.py:273
 msgid "Running an Errand"
 msgstr ""
 
-#: gajim/common/const.py:240
+#: gajim/common/const.py:274
 #, fuzzy
 msgid "Walking the Dog"
 msgstr "pavodle hrupy"
 
-#: gajim/common/const.py:242
+#: gajim/common/const.py:276
 #, fuzzy
 msgid "Drinking"
 msgstr "Pracuju"
 
-#: gajim/common/const.py:243
+#: gajim/common/const.py:277
 msgid "Having a Beer"
 msgstr ""
 
-#: gajim/common/const.py:244
+#: gajim/common/const.py:278
 msgid "Having Coffee"
 msgstr ""
 
-#: gajim/common/const.py:245
+#: gajim/common/const.py:279
 msgid "Having Tea"
 msgstr ""
 
-#: gajim/common/const.py:248
+#: gajim/common/const.py:282
 msgid "Having a Snack"
 msgstr ""
 
-#: gajim/common/const.py:249
+#: gajim/common/const.py:283
 msgid "Having Breakfast"
 msgstr ""
 
-#: gajim/common/const.py:250
+#: gajim/common/const.py:284
 msgid "Having Dinner"
 msgstr ""
 
-#: gajim/common/const.py:251
+#: gajim/common/const.py:285
 msgid "Having Lunch"
 msgstr ""
 
-#: gajim/common/const.py:253
+#: gajim/common/const.py:287
 msgid "Exercising"
 msgstr ""
 
-#: gajim/common/const.py:254 gajim/common/const.py:305
+#: gajim/common/const.py:288 gajim/common/const.py:339
 msgid "Cycling"
 msgstr ""
 
-#: gajim/common/const.py:255
+#: gajim/common/const.py:289
 #, fuzzy
 msgid "Dancing"
 msgstr "Viečar"
 
-#: gajim/common/const.py:256
+#: gajim/common/const.py:290
 #, fuzzy
 msgid "Hiking"
 msgstr "Vypichvajecca %s"
 
-#: gajim/common/const.py:257
+#: gajim/common/const.py:291
 #, fuzzy
 msgid "Jogging"
 msgstr "_Dałučysia"
 
-#: gajim/common/const.py:258
+#: gajim/common/const.py:292
 msgid "Playing Sports"
 msgstr ""
 
-#: gajim/common/const.py:259
+#: gajim/common/const.py:293
 msgid "Running"
 msgstr ""
 
-#: gajim/common/const.py:260
+#: gajim/common/const.py:294
 #, fuzzy
 msgid "Skiing"
 msgstr "Pracuju"
 
-#: gajim/common/const.py:261
+#: gajim/common/const.py:295
 msgid "Swimming"
 msgstr ""
 
-#: gajim/common/const.py:262
+#: gajim/common/const.py:296
 #, fuzzy
 msgid "Working out"
 msgstr "Pracuju"
 
-#: gajim/common/const.py:264
+#: gajim/common/const.py:298
 #, fuzzy
 msgid "Grooming"
 msgstr "pakoj"
 
-#: gajim/common/const.py:265
+#: gajim/common/const.py:299
 msgid "At the Spa"
 msgstr ""
 
-#: gajim/common/const.py:266
+#: gajim/common/const.py:300
 msgid "Brushing Teeth"
 msgstr ""
 
-#: gajim/common/const.py:267
+#: gajim/common/const.py:301
 msgid "Getting a Haircut"
 msgstr ""
 
-#: gajim/common/const.py:268
+#: gajim/common/const.py:302
 #, fuzzy
 msgid "Shaving"
 msgstr "Jem"
 
-#: gajim/common/const.py:269
+#: gajim/common/const.py:303
 msgid "Taking a Bath"
 msgstr ""
 
-#: gajim/common/const.py:270
+#: gajim/common/const.py:304
 msgid "Taking a Shower"
 msgstr ""
 
-#: gajim/common/const.py:272
+#: gajim/common/const.py:306
 msgid "Having an Appointment"
 msgstr ""
 
-#: gajim/common/const.py:274
+#: gajim/common/const.py:308
 msgid "Inactive"
 msgstr "Pasiŭny"
 
-#: gajim/common/const.py:275
+#: gajim/common/const.py:309
 msgid "Day Off"
 msgstr ""
 
-#: gajim/common/const.py:276
+#: gajim/common/const.py:310
 #, fuzzy
 msgid "Hanging out"
 msgstr "Źmianiajecca tema"
 
-#: gajim/common/const.py:277
+#: gajim/common/const.py:311
 #, fuzzy
 msgid "Hiding"
 msgstr "Vypichvajecca %s"
 
-#: gajim/common/const.py:278
+#: gajim/common/const.py:312
 msgid "On Vacation"
 msgstr ""
 
-#: gajim/common/const.py:279
+#: gajim/common/const.py:313
 #, fuzzy
 msgid "Praying"
 msgstr "Jem"
 
-#: gajim/common/const.py:280
+#: gajim/common/const.py:314
 msgid "Scheduled Holiday"
 msgstr ""
 
-#: gajim/common/const.py:282
+#: gajim/common/const.py:316
 #, fuzzy
 msgid "Thinking"
 msgstr "Pracuju"
 
-#: gajim/common/const.py:284
+#: gajim/common/const.py:318
 msgid "Relaxing"
 msgstr ""
 
-#: gajim/common/const.py:285
+#: gajim/common/const.py:319
 #, fuzzy
 msgid "Fishing"
 msgstr "Vypichvajecca %s"
 
-#: gajim/common/const.py:286
+#: gajim/common/const.py:320
 #, fuzzy
 msgid "Gaming"
 msgstr "Jem"
 
-#: gajim/common/const.py:287
+#: gajim/common/const.py:321
 #, fuzzy
 msgid "Going out"
 msgstr "_Adłučajusia"
 
-#: gajim/common/const.py:288
+#: gajim/common/const.py:322
 #, fuzzy
 msgid "Partying"
 msgstr "Jem"
 
-#: gajim/common/const.py:289
+#: gajim/common/const.py:323
 #, fuzzy
 msgid "Reading"
 msgstr "Pryčyna"
 
-#: gajim/common/const.py:290
+#: gajim/common/const.py:324
 #, fuzzy
 msgid "Rehearsing"
 msgstr "Pryčyna"
 
-#: gajim/common/const.py:291
+#: gajim/common/const.py:325
 #, fuzzy
 msgid "Shopping"
 msgstr "Splu"
 
-#: gajim/common/const.py:292
+#: gajim/common/const.py:326
 #, fuzzy
 msgid "Smoking"
 msgstr "Pracuju"
 
-#: gajim/common/const.py:293
+#: gajim/common/const.py:327
 msgid "Socializing"
 msgstr ""
 
-#: gajim/common/const.py:294
+#: gajim/common/const.py:328
 #, fuzzy
 msgid "Sunbathing"
 msgstr "Jem"
 
-#: gajim/common/const.py:295
+#: gajim/common/const.py:329
 msgid "Watching TV"
 msgstr ""
 
-#: gajim/common/const.py:296
+#: gajim/common/const.py:330
 #, fuzzy
 msgid "Watching a Movie"
 msgstr "Hladžu film."
 
-#: gajim/common/const.py:298
+#: gajim/common/const.py:332
 #, fuzzy
 msgid "Talking"
 msgstr "Jem"
 
-#: gajim/common/const.py:299
+#: gajim/common/const.py:333
 msgid "In Real Life"
 msgstr ""
 
-#: gajim/common/const.py:300
+#: gajim/common/const.py:334
 #, fuzzy
 msgid "On the Phone"
 msgstr "Ja razmaŭlaju pa telefonie."
 
-#: gajim/common/const.py:301
+#: gajim/common/const.py:335
 msgid "On Video Phone"
 msgstr ""
 
-#: gajim/common/const.py:303
+#: gajim/common/const.py:337
 #, fuzzy
 msgid "Traveling"
 msgstr "Pieradajecca"
 
-#: gajim/common/const.py:304
+#: gajim/common/const.py:338
 #, fuzzy
 msgid "Commuting"
 msgstr "Uvod paviedamleńnia"
 
-#: gajim/common/const.py:306
+#: gajim/common/const.py:340
 msgid "Driving"
 msgstr ""
 
-#: gajim/common/const.py:307
+#: gajim/common/const.py:341
 msgid "In a Car"
 msgstr ""
 
-#: gajim/common/const.py:308
+#: gajim/common/const.py:342
 msgid "On a Bus"
 msgstr ""
 
-#: gajim/common/const.py:309
+#: gajim/common/const.py:343
 #, fuzzy
 msgid "On a Plane"
 msgstr "Dałučany"
 
-#: gajim/common/const.py:310
+#: gajim/common/const.py:344
 #, fuzzy
 msgid "On a Train"
 msgstr "Adčyni jak _spasyłku"
 
-#: gajim/common/const.py:311
+#: gajim/common/const.py:345
 msgid "On a Trip"
 msgstr ""
 
-#: gajim/common/const.py:312
+#: gajim/common/const.py:346
 #, fuzzy
 msgid "Walking"
 msgstr "Pracuju"
 
-#: gajim/common/const.py:315
+#: gajim/common/const.py:349
 #, fuzzy
 msgid "Coding"
 msgstr "Uvod paviedamleńnia"
 
-#: gajim/common/const.py:316
+#: gajim/common/const.py:350
 msgid "In a Meeting"
 msgstr ""
 
-#: gajim/common/const.py:317
+#: gajim/common/const.py:351
 msgid "Studying"
 msgstr ""
 
-#: gajim/common/const.py:318
+#: gajim/common/const.py:352
 #, fuzzy
 msgid "Writing"
 msgstr "Pracuju"
 
-#: gajim/common/const.py:321
+#: gajim/common/const.py:355
 msgid "Afraid"
 msgstr ""
 
-#: gajim/common/const.py:322
+#: gajim/common/const.py:356
 msgid "Amazed"
 msgstr ""
 
-#: gajim/common/const.py:323
+#: gajim/common/const.py:357
 msgid "Amorous"
 msgstr ""
 
-#: gajim/common/const.py:324
+#: gajim/common/const.py:358
 msgid "Angry"
 msgstr ""
 
-#: gajim/common/const.py:325
+#: gajim/common/const.py:359
 msgid "Annoyed"
 msgstr ""
 
-#: gajim/common/const.py:326
+#: gajim/common/const.py:360
 msgid "Anxious"
 msgstr ""
 
-#: gajim/common/const.py:327
+#: gajim/common/const.py:361
 #, fuzzy
 msgid "Aroused"
 msgstr "Prypynienaja"
 
-#: gajim/common/const.py:328
+#: gajim/common/const.py:362
 msgid "Ashamed"
 msgstr ""
 
-#: gajim/common/const.py:329
+#: gajim/common/const.py:363
 #, fuzzy
 msgid "Bored"
 msgstr "Tłusty"
 
-#: gajim/common/const.py:330
+#: gajim/common/const.py:364
 #, fuzzy
 msgid "Brave"
 msgstr "Nie razmaŭlaju "
 
-#: gajim/common/const.py:331
+#: gajim/common/const.py:365
 msgid "Calm"
 msgstr ""
 
-#: gajim/common/const.py:332
+#: gajim/common/const.py:366
 #, fuzzy
 msgid "Cautious"
 msgstr "Razmovy"
 
-#: gajim/common/const.py:333
+#: gajim/common/const.py:367
 #, fuzzy
 msgid "Cold"
 msgstr "Tłusty"
 
-#: gajim/common/const.py:334
+#: gajim/common/const.py:368
 #, fuzzy
 msgid "Confident"
 msgstr "_Źmiest"
 
-#: gajim/common/const.py:335
+#: gajim/common/const.py:369
 msgid "Confused"
 msgstr ""
 
-#: gajim/common/const.py:336
+#: gajim/common/const.py:370
 #, fuzzy
 msgid "Contemplative"
 msgstr "Zavieršana"
 
-#: gajim/common/const.py:337
+#: gajim/common/const.py:371
 #, fuzzy
 msgid "Contented"
 msgstr "_Źmiest"
 
-#: gajim/common/const.py:338
+#: gajim/common/const.py:372
 msgid "Cranky"
 msgstr ""
 
-#: gajim/common/const.py:339
+#: gajim/common/const.py:373
 msgid "Crazy"
 msgstr ""
 
-#: gajim/common/const.py:340
+#: gajim/common/const.py:374
 #, fuzzy
 msgid "Creative"
 msgstr "Niadziejny"
 
-#: gajim/common/const.py:341
+#: gajim/common/const.py:375
 #, fuzzy
 msgid "Curious"
 msgstr "uri"
 
-#: gajim/common/const.py:342
+#: gajim/common/const.py:376
 #, fuzzy
 msgid "Dejected"
 msgstr "Vydal"
 
-#: gajim/common/const.py:343
+#: gajim/common/const.py:377
 msgid "Depressed"
 msgstr ""
 
-#: gajim/common/const.py:344
+#: gajim/common/const.py:378
 #, fuzzy
 msgid "Disappointed"
 msgstr "Adklučana"
 
-#: gajim/common/const.py:345
+#: gajim/common/const.py:379
 msgid "Disgusted"
 msgstr ""
 
-#: gajim/common/const.py:346
+#: gajim/common/const.py:380
 #, fuzzy
 msgid "Dismayed"
 msgstr "Adklučana"
 
-#: gajim/common/const.py:347
+#: gajim/common/const.py:381
 #, fuzzy
 msgid "Distracted"
 msgstr "Adklučana"
 
-#: gajim/common/const.py:348
+#: gajim/common/const.py:382
 msgid "Embarrassed"
 msgstr ""
 
-#: gajim/common/const.py:349
+#: gajim/common/const.py:383
 msgid "Envious"
 msgstr ""
 
-#: gajim/common/const.py:350
+#: gajim/common/const.py:384
 #, fuzzy
 msgid "Excited"
 msgstr "Dziejny"
 
-#: gajim/common/const.py:351
+#: gajim/common/const.py:385
 msgid "Flirtatious"
 msgstr ""
 
-#: gajim/common/const.py:352
+#: gajim/common/const.py:386
 msgid "Frustrated"
 msgstr ""
 
-#: gajim/common/const.py:353
+#: gajim/common/const.py:387
 msgid "Grateful"
 msgstr ""
 
-#: gajim/common/const.py:354
+#: gajim/common/const.py:388
 msgid "Grieving"
 msgstr ""
 
-#: gajim/common/const.py:355
+#: gajim/common/const.py:389
 #, fuzzy
 msgid "Grumpy"
 msgstr "Hrupa"
 
-#: gajim/common/const.py:356
+#: gajim/common/const.py:390
 msgid "Guilty"
 msgstr ""
 
-#: gajim/common/const.py:357
+#: gajim/common/const.py:391
 msgid "Happy"
 msgstr ""
 
-#: gajim/common/const.py:358
+#: gajim/common/const.py:392
 msgid "Hopeful"
 msgstr ""
 
-#: gajim/common/const.py:359
+#: gajim/common/const.py:393
 #, fuzzy
 msgid "Hot"
 msgstr "_Host:"
 
-#: gajim/common/const.py:360
+#: gajim/common/const.py:394
 msgid "Humbled"
 msgstr ""
 
-#: gajim/common/const.py:361
+#: gajim/common/const.py:395
 msgid "Humiliated"
 msgstr ""
 
-#: gajim/common/const.py:362
+#: gajim/common/const.py:396
 msgid "Hungry"
 msgstr ""
 
-#: gajim/common/const.py:363
+#: gajim/common/const.py:397
 msgid "Hurt"
 msgstr ""
 
-#: gajim/common/const.py:364
+#: gajim/common/const.py:398
 #, fuzzy
 msgid "Impressed"
 msgstr "paviedamleńnie"
 
-#: gajim/common/const.py:365
+#: gajim/common/const.py:399
 msgid "In Awe"
 msgstr ""
 
-#: gajim/common/const.py:366
+#: gajim/common/const.py:400
 msgid "In Love"
 msgstr ""
 
-#: gajim/common/const.py:367
+#: gajim/common/const.py:401
 msgid "Indignant"
 msgstr ""
 
-#: gajim/common/const.py:368
+#: gajim/common/const.py:402
 msgid "Interested"
 msgstr ""
 
-#: gajim/common/const.py:369
+#: gajim/common/const.py:403
 #, fuzzy
 msgid "Intoxicated"
 msgstr "Dziejny"
 
-#: gajim/common/const.py:370
+#: gajim/common/const.py:404
 #, fuzzy
 msgid "Invincible"
 msgstr "Niabačny"
 
-#: gajim/common/const.py:371
+#: gajim/common/const.py:405
 msgid "Jealous"
 msgstr ""
 
-#: gajim/common/const.py:372
+#: gajim/common/const.py:406
 #, fuzzy
 msgid "Lonely"
 msgstr "pieršaja"
 
-#: gajim/common/const.py:373
+#: gajim/common/const.py:407
 #, fuzzy
 msgid "Lost"
 msgstr "_Host:"
 
-#: gajim/common/const.py:374
+#: gajim/common/const.py:408
 msgid "Lucky"
 msgstr ""
 
-#: gajim/common/const.py:375
+#: gajim/common/const.py:409
 #, fuzzy
 msgid "Mean"
 msgstr "Niamieckaja"
 
-#: gajim/common/const.py:376
+#: gajim/common/const.py:410
 #, fuzzy
 msgid "Moody"
 msgstr "_Madyfikuj"
 
-#: gajim/common/const.py:377
+#: gajim/common/const.py:411
 msgid "Nervous"
 msgstr ""
 
-#: gajim/common/const.py:378
+#: gajim/common/const.py:412
 msgid "Neutral"
 msgstr ""
 
-#: gajim/common/const.py:379
+#: gajim/common/const.py:413
 #, fuzzy
 msgid "Offended"
 msgstr "Adłučany"
 
-#: gajim/common/const.py:380
+#: gajim/common/const.py:414
 msgid "Outraged"
 msgstr ""
 
-#: gajim/common/const.py:381
+#: gajim/common/const.py:415
 msgid "Playful"
 msgstr ""
 
-#: gajim/common/const.py:382
+#: gajim/common/const.py:416
 #, fuzzy
 msgid "Proud"
 msgstr "Hrupa"
 
-#: gajim/common/const.py:383
+#: gajim/common/const.py:417
 msgid "Relaxed"
 msgstr ""
 
-#: gajim/common/const.py:384
+#: gajim/common/const.py:418
 #, fuzzy
 msgid "Relieved"
 msgstr "adzinaccataja"
 
-#: gajim/common/const.py:385
+#: gajim/common/const.py:419
 msgid "Remorseful"
 msgstr ""
 
-#: gajim/common/const.py:386
+#: gajim/common/const.py:420
 msgid "Restless"
 msgstr ""
 
-#: gajim/common/const.py:387
+#: gajim/common/const.py:421
 #, fuzzy
 msgid "Sad"
 msgstr "Zatrymana"
 
-#: gajim/common/const.py:388
+#: gajim/common/const.py:422
 msgid "Sarcastic"
 msgstr ""
 
-#: gajim/common/const.py:389
+#: gajim/common/const.py:423
 #, fuzzy
 msgid "Satisfied"
 msgstr "Apošniaja źmiena:"
 
-#: gajim/common/const.py:390
+#: gajim/common/const.py:424
 msgid "Serious"
 msgstr ""
 
-#: gajim/common/const.py:391
+#: gajim/common/const.py:425
 msgid "Shocked"
 msgstr ""
 
-#: gajim/common/const.py:392
+#: gajim/common/const.py:426
 msgid "Shy"
 msgstr ""
 
-#: gajim/common/const.py:393
+#: gajim/common/const.py:427
 #, fuzzy
 msgid "Sick"
 msgstr "Mianuška"
 
-#: gajim/common/const.py:394
+#: gajim/common/const.py:428
 #, fuzzy
 msgid "Sleepy"
 msgstr "Splu"
 
-#: gajim/common/const.py:395
+#: gajim/common/const.py:429
 msgid "Spontaneous"
 msgstr ""
 
-#: gajim/common/const.py:396
+#: gajim/common/const.py:430
 #, fuzzy
 msgid "Stressed"
 msgstr "Vulica:"
 
-#: gajim/common/const.py:397
+#: gajim/common/const.py:431
 msgid "Strong"
 msgstr ""
 
-#: gajim/common/const.py:398
+#: gajim/common/const.py:432
 #, fuzzy
 msgid "Surprised"
 msgstr "Aŭtaryzavany"
 
-#: gajim/common/const.py:399
+#: gajim/common/const.py:433
 msgid "Thankful"
 msgstr ""
 
-#: gajim/common/const.py:400
+#: gajim/common/const.py:434
 msgid "Thirsty"
 msgstr ""
 
-#: gajim/common/const.py:401
+#: gajim/common/const.py:435
 #, fuzzy
 msgid "Tired"
 msgstr "Čas"
 
-#: gajim/common/const.py:402
+#: gajim/common/const.py:436
 #, fuzzy
 msgid "Undefined"
 msgstr "dziaviataja"
 
-#: gajim/common/const.py:403
+#: gajim/common/const.py:437
 msgid "Weak"
 msgstr ""
 
-#: gajim/common/const.py:404
+#: gajim/common/const.py:438
 msgid "Worried"
 msgstr ""
 
-#: gajim/common/const.py:408
+#: gajim/common/const.py:442
 msgid "accuracy"
 msgstr ""
 
-#: gajim/common/const.py:409
+#: gajim/common/const.py:443
 #, fuzzy
 msgid "alt"
 msgstr "Zmoŭčany"
 
-#: gajim/common/const.py:410
+#: gajim/common/const.py:444
 msgid "area"
 msgstr ""
 
-#: gajim/common/const.py:411
+#: gajim/common/const.py:445
 #, fuzzy
 msgid "bearing"
 msgstr "marski"
 
-#: gajim/common/const.py:412
+#: gajim/common/const.py:446
 #, fuzzy
 msgid "building"
 msgstr "Vypichvajecca %s"
 
-#: gajim/common/const.py:413
+#: gajim/common/const.py:447
 #, fuzzy
 msgid "country"
 msgstr "Krajina:"
 
-#: gajim/common/const.py:414
+#: gajim/common/const.py:448
 #, fuzzy
 msgid "countrycode"
 msgstr "Kont"
 
-#: gajim/common/const.py:415
+#: gajim/common/const.py:449
 msgid "datum"
 msgstr ""
 
-#: gajim/common/const.py:416
+#: gajim/common/const.py:450
 #, fuzzy
 msgid "description"
 msgstr "Apisańnie"
 
-#: gajim/common/const.py:417
+#: gajim/common/const.py:451
 #, fuzzy
 msgid "error"
 msgstr "Pamyłka Avahi"
 
-#: gajim/common/const.py:418
+#: gajim/common/const.py:452
 msgid "floor"
 msgstr ""
 
-#: gajim/common/const.py:419
+#: gajim/common/const.py:453
 msgid "lat"
 msgstr ""
 
-#: gajim/common/const.py:420
+#: gajim/common/const.py:454
 msgid "locality"
 msgstr ""
 
-#: gajim/common/const.py:421
+#: gajim/common/const.py:455
 #, fuzzy
 msgid "lon"
 msgstr "pieršaja"
 
-#: gajim/common/const.py:422
+#: gajim/common/const.py:456
 msgid "postalcode"
 msgstr ""
 
-#: gajim/common/const.py:423
+#: gajim/common/const.py:457
 msgid "region"
 msgstr ""
 
-#: gajim/common/const.py:424
+#: gajim/common/const.py:458
 msgid "room"
 msgstr "pakoj"
 
-#: gajim/common/const.py:425
+#: gajim/common/const.py:459
 msgid "speed"
 msgstr ""
 
-#: gajim/common/const.py:426
+#: gajim/common/const.py:460
 msgid "street"
 msgstr ""
 
-#: gajim/common/const.py:427
+#: gajim/common/const.py:461
 msgid "text"
 msgstr ""
 
-#: gajim/common/const.py:428
+#: gajim/common/const.py:462
 msgid "timestamp"
 msgstr ""
 
-#: gajim/common/const.py:429
+#: gajim/common/const.py:463
 msgid "URI"
 msgstr ""
 
-#: gajim/common/const.py:434
+#: gajim/common/const.py:468
 msgid "Unable to get issuer certificate"
 msgstr ""
 
-#: gajim/common/const.py:435
+#: gajim/common/const.py:469
 msgid "Unable to get certificate CRL"
 msgstr ""
 
-#: gajim/common/const.py:436
+#: gajim/common/const.py:470
 msgid "Unable to decrypt certificate's signature"
 msgstr ""
 
-#: gajim/common/const.py:437
+#: gajim/common/const.py:471
 msgid "Unable to decrypt CRL's signature"
 msgstr ""
 
-#: gajim/common/const.py:438
+#: gajim/common/const.py:472
 #, fuzzy
 msgid "Unable to decode issuer public key"
 msgstr "Niemahčyma adčytać modulu idle"
 
-#: gajim/common/const.py:439
+#: gajim/common/const.py:473
 msgid "Certificate signature failure"
 msgstr ""
 
-#: gajim/common/const.py:440
+#: gajim/common/const.py:474
 msgid "CRL signature failure"
 msgstr ""
 
-#: gajim/common/const.py:441
+#: gajim/common/const.py:475
 msgid "Certificate is not yet valid"
 msgstr ""
 
-#: gajim/common/const.py:442
+#: gajim/common/const.py:476
 msgid "Certificate has expired"
 msgstr ""
 
-#: gajim/common/const.py:443
+#: gajim/common/const.py:477
 msgid "CRL is not yet valid"
 msgstr ""
 
-#: gajim/common/const.py:444
+#: gajim/common/const.py:478
 msgid "CRL has expired"
 msgstr ""
 
-#: gajim/common/const.py:445
+#: gajim/common/const.py:479
 msgid "Format error in certificate's notBefore field"
 msgstr ""
 
-#: gajim/common/const.py:446
+#: gajim/common/const.py:480
 msgid "Format error in certificate's notAfter field"
 msgstr ""
 
-#: gajim/common/const.py:447
+#: gajim/common/const.py:481
 msgid "Format error in CRL's lastUpdate field"
 msgstr ""
 
-#: gajim/common/const.py:448
+#: gajim/common/const.py:482
 msgid "Format error in CRL's nextUpdate field"
 msgstr ""
 
-#: gajim/common/const.py:449
+#: gajim/common/const.py:483
 msgid "Out of memory"
 msgstr ""
 
-#: gajim/common/const.py:450
+#: gajim/common/const.py:484
 msgid "Self signed certificate"
 msgstr ""
 
-#: gajim/common/const.py:451
+#: gajim/common/const.py:485
 msgid "Self signed certificate in certificate chain"
 msgstr ""
 
-#: gajim/common/const.py:452
+#: gajim/common/const.py:486
 msgid "Unable to get local issuer certificate"
 msgstr ""
 
-#: gajim/common/const.py:453
+#: gajim/common/const.py:487
 msgid "Unable to verify the first certificate"
 msgstr ""
 
-#: gajim/common/const.py:454
+#: gajim/common/const.py:488
 msgid "Certificate chain too long"
 msgstr ""
 
-#: gajim/common/const.py:455
+#: gajim/common/const.py:489
 msgid "Certificate revoked"
 msgstr ""
 
-#: gajim/common/const.py:456
+#: gajim/common/const.py:490
 #, fuzzy
 msgid "Invalid CA certificate"
 msgstr "Niapravilnaje imia karystalnika"
 
-#: gajim/common/const.py:457
+#: gajim/common/const.py:491
 msgid "Path length constraint exceeded"
 msgstr ""
 
-#: gajim/common/const.py:458
+#: gajim/common/const.py:492
 msgid "Unsupported certificate purpose"
 msgstr ""
 
-#: gajim/common/const.py:459
+#: gajim/common/const.py:493
 msgid "Certificate not trusted"
 msgstr ""
 
-#: gajim/common/const.py:460
+#: gajim/common/const.py:494
 msgid "Certificate rejected"
 msgstr ""
 
-#: gajim/common/const.py:461
+#: gajim/common/const.py:495
 msgid "Subject issuer mismatch"
 msgstr ""
 
-#: gajim/common/const.py:462
+#: gajim/common/const.py:496
 msgid "Authority and subject key identifier mismatch"
 msgstr ""
 
-#: gajim/common/const.py:463
+#: gajim/common/const.py:497
 msgid "Authority and issuer serial number mismatch"
 msgstr ""
 
-#: gajim/common/const.py:464
+#: gajim/common/const.py:498
 msgid "Key usage does not include certificate signing"
 msgstr ""
 
-#: gajim/common/const.py:465
+#: gajim/common/const.py:499
 msgid "Application verification failure"
 msgstr ""
 
@@ -5198,199 +5327,199 @@ msgstr ""
 msgid "video output"
 msgstr ""
 
-#: gajim/common/helpers.py:210
+#: gajim/common/helpers.py:216
 msgid "Server must be between 1 and 1023 bytes"
 msgstr ""
 
-#: gajim/common/helpers.py:214
+#: gajim/common/helpers.py:220
 msgid "Invalid character in hostname."
 msgstr "Niapravilny znak u naźvie hostu."
 
-#: gajim/common/helpers.py:216
+#: gajim/common/helpers.py:222
 msgid "Server address required."
 msgstr "Patrabujecca adras servera."
 
-#: gajim/common/helpers.py:220
+#: gajim/common/helpers.py:226
 msgid "Username must be between 1 and 1023 bytes"
 msgstr ""
 
-#: gajim/common/helpers.py:224
+#: gajim/common/helpers.py:230
 msgid "Invalid character in username."
 msgstr "Niapravilny znak u imiani karystalnika."
 
-#: gajim/common/helpers.py:230
+#: gajim/common/helpers.py:236
 msgid "Resource must be between 1 and 1023 bytes"
 msgstr ""
 
-#: gajim/common/helpers.py:234
+#: gajim/common/helpers.py:240
 msgid "Invalid character in resource."
 msgstr "Niapravilny znak u naźvie krynicy."
 
-#: gajim/common/helpers.py:275
+#: gajim/common/helpers.py:281
 msgid "_Busy"
 msgstr "_Zaniaty"
 
-#: gajim/common/helpers.py:277 gajim/gtk/tooltips.py:647
+#: gajim/common/helpers.py:283 gajim/gtk/tooltips.py:647
 msgid "Busy"
 msgstr "Zaniaty"
 
-#: gajim/common/helpers.py:280
+#: gajim/common/helpers.py:286
 msgid "_Not Available"
 msgstr "_Niedastupny"
 
-#: gajim/common/helpers.py:282 gajim/gtk/tooltips.py:649
+#: gajim/common/helpers.py:288 gajim/gtk/tooltips.py:649
 msgid "Not Available"
 msgstr "Niedastupny"
 
-#: gajim/common/helpers.py:285
+#: gajim/common/helpers.py:291
 msgid "_Free for Chat"
 msgstr "_Achvotna parazmaŭlaju"
 
-#: gajim/common/helpers.py:287 gajim/gtk/tooltips.py:643
+#: gajim/common/helpers.py:293 gajim/gtk/tooltips.py:643
 msgid "Free for Chat"
 msgstr "Achvotna parazmaŭlaju"
 
-#: gajim/common/helpers.py:290
+#: gajim/common/helpers.py:296
 #, fuzzy
 msgid "?user status:_Available"
 msgstr "?status pieradačy:Prypyniena"
 
-#: gajim/common/helpers.py:292 gajim/gtk/tooltips.py:641
+#: gajim/common/helpers.py:298 gajim/gtk/tooltips.py:641
 #, fuzzy
 msgid "?user status:Available"
 msgstr "?status pieradačy:Prypyniena"
 
-#: gajim/common/helpers.py:294
+#: gajim/common/helpers.py:300
 msgid "Connecting"
 msgstr "Dałučajusia"
 
-#: gajim/common/helpers.py:297 gajim/data/gui/preferences_window.ui:1251
+#: gajim/common/helpers.py:303 gajim/data/gui/preferences_window.ui:1251
 msgid "A_way"
 msgstr "_Adyjšoŭ"
 
-#: gajim/common/helpers.py:299 gajim/common/modules/adhoc_commands.py:120
-#: gajim/command_system/implementation/standard.py:139
+#: gajim/common/helpers.py:305 gajim/common/modules/adhoc_commands.py:120
+#: gajim/command_system/implementation/standard.py:141
 #: gajim/gtk/tooltips.py:645
 msgid "Away"
 msgstr "Adyjšoŭ"
 
-#: gajim/common/helpers.py:302
+#: gajim/common/helpers.py:308
 msgid "_Offline"
 msgstr "Adł_učany"
 
-#: gajim/common/helpers.py:304 gajim/gtk/tooltips.py:651
+#: gajim/common/helpers.py:310 gajim/gtk/tooltips.py:651
 msgid "Offline"
 msgstr "Adłučany"
 
-#: gajim/common/helpers.py:307
+#: gajim/common/helpers.py:313
 msgid "_Invisible"
 msgstr "N_iabačny"
 
-#: gajim/common/helpers.py:313
+#: gajim/common/helpers.py:319
 msgid "?contact has status:Unknown"
 msgstr "?kantakt maje status:Nieviadomy"
 
-#: gajim/common/helpers.py:315
+#: gajim/common/helpers.py:321
 msgid "?contact has status:Has errors"
 msgstr "?kantakt maje status:Jość pamyłki"
 
-#: gajim/common/helpers.py:330
+#: gajim/common/helpers.py:336
 msgid "?Subscription we already have:None"
 msgstr "?Najaŭnaja aŭtaryzacyja:Niama"
 
-#: gajim/common/helpers.py:332
+#: gajim/common/helpers.py:338
 msgid "To"
 msgstr "Da"
 
-#: gajim/common/helpers.py:334 gajim/data/gui/groups_post_window.ui:33
+#: gajim/common/helpers.py:340 gajim/data/gui/groups_post_window.ui:33
 msgid "From"
 msgstr "Ad"
 
-#: gajim/common/helpers.py:336
+#: gajim/common/helpers.py:342
 msgid "Both"
 msgstr "Dvuchbakovaja"
 
-#: gajim/common/helpers.py:338 gajim/gtk/server_info.py:151
+#: gajim/common/helpers.py:344 gajim/gtk/server_info.py:151
 #, fuzzy
 msgid "Unknown"
 msgstr "?AS:Nieviadomaja"
 
-#: gajim/common/helpers.py:344
+#: gajim/common/helpers.py:350
 msgid "?Ask (for Subscription):None"
 msgstr "?Zapyt (aŭtaryzacyi):Niama"
 
-#: gajim/common/helpers.py:346
+#: gajim/common/helpers.py:352
 msgid "Subscribe"
 msgstr "Aŭtaryzuj"
 
-#: gajim/common/helpers.py:355
+#: gajim/common/helpers.py:361
 msgid "?Group Chat Contact Role:None"
 msgstr "?Funkcyja kantaktu ŭ pakoji:Niama"
 
-#: gajim/common/helpers.py:358
+#: gajim/common/helpers.py:364
 msgid "Moderators"
 msgstr "Maderatary"
 
-#: gajim/common/helpers.py:360
+#: gajim/common/helpers.py:366
 msgid "Moderator"
 msgstr "Maderatar"
 
-#: gajim/common/helpers.py:363
+#: gajim/common/helpers.py:369 gajim/data/gui/groupchat_info_scrolled.ui:243
 msgid "Participants"
 msgstr "Udzielniki"
 
-#: gajim/common/helpers.py:365
+#: gajim/common/helpers.py:371
 msgid "Participant"
 msgstr "Udzielnik"
 
-#: gajim/common/helpers.py:368
+#: gajim/common/helpers.py:374
 msgid "Visitors"
 msgstr "Naviedniki"
 
-#: gajim/common/helpers.py:370
+#: gajim/common/helpers.py:376
 msgid "Visitor"
 msgstr "Naviednik"
 
-#: gajim/common/helpers.py:376 gajim/gtk/tooltips.py:253
+#: gajim/common/helpers.py:382 gajim/gtk/tooltips.py:253
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "?Suviaź udzielnikaŭ pakoju:Niama"
 
-#: gajim/common/helpers.py:378 gajim/data/gui/groupchat_config.ui:32
+#: gajim/common/helpers.py:384 gajim/data/gui/groupchat_config.ui:32
 #: gajim/gtk/tooltips.py:259
 msgid "Owner"
 msgstr "Ułaśnik"
 
-#: gajim/common/helpers.py:380 gajim/gtk/tooltips.py:257
+#: gajim/common/helpers.py:386 gajim/gtk/tooltips.py:257
 msgid "Administrator"
 msgstr "Administratar"
 
-#: gajim/common/helpers.py:382 gajim/data/gui/groupchat_config.ui:40
+#: gajim/common/helpers.py:388 gajim/data/gui/groupchat_config.ui:40
 #: gajim/gtk/tooltips.py:255 gajim/gtk/groupchat_config.py:105
 msgid "Member"
 msgstr "Udzielnik"
 
-#: gajim/common/helpers.py:421
+#: gajim/common/helpers.py:427
 msgid "is paying attention to the conversation"
 msgstr "sočyć za razmovaj"
 
-#: gajim/common/helpers.py:423
+#: gajim/common/helpers.py:429
 msgid "is doing something else"
 msgstr "robić štości inšaje"
 
-#: gajim/common/helpers.py:425
+#: gajim/common/helpers.py:431
 #, fuzzy
 msgid "is composing a message…"
 msgstr "piša paviedamleńnie..."
 
-#: gajim/common/helpers.py:428
+#: gajim/common/helpers.py:434
 msgid "paused composing a message"
 msgstr "pierastaŭ pisać"
 
-#: gajim/common/helpers.py:430
+#: gajim/common/helpers.py:436
 msgid "has closed the chat window or tab"
 msgstr "začyniŭ akno/kartku razmovy"
 
-#: gajim/common/helpers.py:936 gajim/common/helpers.py:943
+#: gajim/common/helpers.py:942 gajim/common/helpers.py:949
 #, fuzzy, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
@@ -5398,22 +5527,22 @@ msgstr[0] "Dašli paviedamleńnie"
 msgstr[1] "Dašli paviedamleńnie"
 msgstr[2] "Dašli paviedamleńnie"
 
-#: gajim/common/helpers.py:950
+#: gajim/common/helpers.py:956
 #, fuzzy, python-format
-msgid "from room %s"
-msgstr "Я %s"
+msgid "from group chat %s"
+msgstr "Dałučysia da _pakoju"
 
-#: gajim/common/helpers.py:953 gajim/common/helpers.py:970
+#: gajim/common/helpers.py:959 gajim/common/helpers.py:976
 #, python-format
 msgid "from user %s"
 msgstr ""
 
-#: gajim/common/helpers.py:955
+#: gajim/common/helpers.py:961
 #, fuzzy, python-format
 msgid "from %s"
 msgstr "Ad"
 
-#: gajim/common/helpers.py:962 gajim/common/helpers.py:968
+#: gajim/common/helpers.py:968 gajim/common/helpers.py:974
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
@@ -5421,40 +5550,40 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: gajim/common/helpers.py:986 gajim/common/helpers.py:998
+#: gajim/common/helpers.py:992 gajim/common/helpers.py:1004
 #: gajim/data/gui/roster_window.ui:85 data/org.gajim.Gajim.desktop.in:4
 #: data/org.gajim.Gajim.appdata.xml.in:9
 msgid "Gajim"
 msgstr "Gajim"
 
-#: gajim/common/helpers.py:1000
+#: gajim/common/helpers.py:1006
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: gajim/common/helpers.py:1109 gajim/data/gui/add_new_contact_window.ui:25
+#: gajim/common/helpers.py:1115 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:1111
+#: gajim/common/helpers.py:1117
 msgid "Hello, I am $name."
 msgstr ""
 
-#: gajim/common/helpers.py:1215 gajim/common/helpers.py:1224
-#: gajim/common/helpers.py:1282
+#: gajim/common/helpers.py:1221 gajim/common/helpers.py:1230
+#: gajim/common/helpers.py:1288
 #, fuzzy
 msgid "Timeout loading image"
 msgstr "Niemahčyma adčytać vyjavu"
 
-#: gajim/common/helpers.py:1234 gajim/common/helpers.py:1280
+#: gajim/common/helpers.py:1240 gajim/common/helpers.py:1286
 msgid "Image is too big"
 msgstr ""
 
-#: gajim/common/helpers.py:1245
+#: gajim/common/helpers.py:1251
 msgid "PyCURL is not installed"
 msgstr ""
 
-#: gajim/common/helpers.py:1284
+#: gajim/common/helpers.py:1290
 #, fuzzy
 msgid "Error loading image"
 msgstr "Niemahčyma adčytać vyjavu"
@@ -5637,7 +5766,8 @@ msgstr "Status źmianiŭsia."
 
 #: gajim/common/modules/adhoc_commands.py:202
 #: gajim/common/modules/adhoc_commands.py:239
-msgid "Leave Groupchats"
+#, fuzzy
+msgid "Leave Group Chats"
 msgstr "Pakiń pakoji"
 
 #: gajim/common/modules/adhoc_commands.py:228
@@ -5646,16 +5776,18 @@ msgid "%(nickname)s on %(room_jid)s"
 msgstr "%(nickname)s z pakoju %(room_jid)s"
 
 #: gajim/common/modules/adhoc_commands.py:232
-msgid "You have not joined a groupchat."
+#, fuzzy
+msgid "You have not joined a group chat."
 msgstr "Ty nie dałučyŭsia da pakoju."
 
 #: gajim/common/modules/adhoc_commands.py:240
-msgid "Choose the groupchats you want to leave"
+#, fuzzy
+msgid "Choose the group chats you want to leave"
 msgstr "Zaznač pakoji, jakija chočaš pakinuć"
 
 #: gajim/common/modules/adhoc_commands.py:289
 #, fuzzy
-msgid "You left the following groupchats:"
+msgid "You left the following group chats:"
 msgstr "Ty pakinuŭ nastupnyja pakoji:"
 
 #: gajim/common/modules/roster_item_exchange.py:102
@@ -5673,7 +5805,7 @@ msgstr "Kantakty"
 msgid "Blocked Contacts"
 msgstr "Kantakty"
 
-#: gajim/data/gui/destroy_muc_dialog.ui:79 gajim/gtk/dialogs.py:736
+#: gajim/data/gui/destroy_muc_dialog.ui:79 gajim/gtk/dialogs.py:563
 msgid "Destroy this group chat permanently?"
 msgstr ""
 
@@ -5682,7 +5814,7 @@ msgstr ""
 msgid "Reason..."
 msgstr "Pryčyna"
 
-#: gajim/data/gui/destroy_muc_dialog.ui:124 gajim/gtk/dialogs.py:738
+#: gajim/data/gui/destroy_muc_dialog.ui:124 gajim/gtk/dialogs.py:565
 msgid "Where participants should go (optional)"
 msgstr ""
 
@@ -5694,33 +5826,6 @@ msgstr ""
 msgid "_Reason and alternate venue (optional)"
 msgstr ""
 
-#: gajim/data/gui/advanced_configuration_window.ui:7
-#: gajim/data/gui/preferences_window.ui:2723
-#, fuzzy
-msgid "Advanced Configuration Editor (ACE)"
-msgstr "Redaktar dadatkovych naładaŭ"
-
-#: gajim/data/gui/advanced_configuration_window.ui:52
-#, fuzzy
-msgid "You should restart Gajim for some changes to take effect"
-msgstr "<b>UVAHA:</b> Kab ubačyć niekatoryja źmieny, uruchom Gajim"
-
-#: gajim/data/gui/advanced_configuration_window.ui:84
-#, fuzzy
-msgid "_Filter"
-msgstr "_Filter:"
-
-#: gajim/data/gui/advanced_configuration_window.ui:153
-#: gajim/data/gui/filetransfers_send_file_dialog.ui:15
-#: gajim/gtk/discovery.py:1666
-msgid "Description"
-msgstr "Apisańnie"
-
-#: gajim/data/gui/advanced_configuration_window.ui:197
-#, fuzzy
-msgid "_Reset to default"
-msgstr "_Viarni zvyčajnyja kolery"
-
 #: gajim/data/gui/join_groupchat_window.ui:56
 #: gajim/data/gui/chat_to_muc_window.ui:67
 #: gajim/data/gui/chat_to_muc_window.ui:78
@@ -5732,9 +5837,8 @@ msgid "Join group chat every time Gajim is started"
 msgstr ""
 
 #: gajim/data/gui/join_groupchat_window.ui:113
-#, fuzzy
-msgid "Auto Join"
-msgstr "Aŭtamatyčna dałučajsia"
+msgid "Join Automatically"
+msgstr ""
 
 #: gajim/data/gui/join_groupchat_window.ui:131
 #: gajim/data/gui/profile_window.ui:233
@@ -5743,10 +5847,11 @@ msgstr "Kont"
 
 #: gajim/data/gui/join_groupchat_window.ui:147
 #, fuzzy
-msgid "Room"
-msgstr "Pakoj:"
+msgid "Group chat"
+msgstr "Pakoji"
 
-#: gajim/data/gui/join_groupchat_window.ui:180 gajim/gtk/accounts.py:886
+#: gajim/data/gui/join_groupchat_window.ui:180 gajim/data/gui/bookmarks.ui:158
+#: gajim/gtk/accounts.py:889
 #, fuzzy
 msgid "Password"
 msgstr "Parol:"
@@ -5770,93 +5875,11 @@ 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:1271
+#: gajim/data/gui/join_groupchat_window.ui:437 gajim/gtk/discovery.py:1270
 #, fuzzy
 msgid "Join"
 msgstr "_Dałučysia"
 
-#: gajim/data/gui/manage_proxies_window.ui:12
-#, fuzzy
-msgid "HTTP Connect"
-msgstr "Złučeńnie HTTP"
-
-#: gajim/data/gui/manage_proxies_window.ui:15
-msgid "SOCKS5"
-msgstr ""
-
-#: gajim/data/gui/manage_proxies_window.ui:18
-msgid "BOSH"
-msgstr ""
-
-#: gajim/data/gui/manage_proxies_window.ui:27
-msgid "Manage Proxy Profiles"
-msgstr "Kiruj profilami proxy"
-
-#: gajim/data/gui/manage_proxies_window.ui:83
-#, fuzzy
-msgid "Add Proxy"
-msgstr "Proxy:"
-
-#: gajim/data/gui/manage_proxies_window.ui:97
-#, fuzzy
-msgid "Remove Proxy"
-msgstr "Vydal hrupu"
-
-#: gajim/data/gui/manage_proxies_window.ui:141
-#, fuzzy
-msgid "Properties"
-msgstr "<b>Ułaścivaści</b>"
-
-#: gajim/data/gui/manage_proxies_window.ui:157
-#, fuzzy
-msgid "_Name"
-msgstr "_Imia:"
-
-#: gajim/data/gui/manage_proxies_window.ui:173
-#, fuzzy
-msgid "_Type"
-msgstr "Typ:"
-
-#: gajim/data/gui/manage_proxies_window.ui:236
-#, fuzzy
-msgid "_BOSH URL"
-msgstr "_URL:"
-
-#: gajim/data/gui/manage_proxies_window.ui:261
-#, fuzzy
-msgid "Use HTTP prox_y"
-msgstr "S_karystaj proxy"
-
-#: gajim/data/gui/manage_proxies_window.ui:280
-#, fuzzy
-msgid "Proxy _Host"
-msgstr "Proxy:"
-
-#: gajim/data/gui/manage_proxies_window.ui:307
-#, fuzzy
-msgid "Proxy _Port"
-msgstr "_Port:"
-
-#: gajim/data/gui/manage_proxies_window.ui:334
-#, fuzzy
-msgid "_Username"
-msgstr "_Imia karystalnika:"
-
-#: gajim/data/gui/manage_proxies_window.ui:347
-#, fuzzy
-msgid "Use proxy auth_entication"
-msgstr "Užyvaj aŭtaryzacyju"
-
-#: gajim/data/gui/manage_proxies_window.ui:377
-#, fuzzy
-msgid "Pass_word"
-msgstr "_Parol:"
-
-#: gajim/data/gui/manage_proxies_window.ui:405 gajim/gtk/adhoc.py:321
-#, fuzzy
-msgid "Settings"
-msgstr "Niemahvyma dałučycca"
-
 #: gajim/data/gui/change_password_dialog.ui:17
 #, fuzzy
 msgid "New Password"
@@ -5887,11 +5910,13 @@ msgid "Status:"
 msgstr "Status:"
 
 #: gajim/data/gui/zeroconf_information_window.ui:89
-msgid "_Log conversation history"
+#, fuzzy
+msgid "_Store conversation history"
 msgstr "_Zachoŭvaj žurnał razmoŭ"
 
 #: gajim/data/gui/zeroconf_information_window.ui:215
 #: gajim/data/gui/vcard_information_window.ui:390
+#: gajim/data/gui/groupchat_info_scrolled.ui:166
 msgid "Contact"
 msgstr "Kantakt"
 
@@ -5904,8 +5929,9 @@ msgid "Last Name:"
 msgstr "Proźvišča:"
 
 #: gajim/data/gui/zeroconf_information_window.ui:260
-msgid "Jabber ID:"
-msgstr "JID:"
+#, fuzzy
+msgid "XMPP Address:"
+msgstr "Adras AIM:"
 
 #: gajim/data/gui/zeroconf_information_window.ui:273
 msgid "E-Mail:"
@@ -5926,8 +5952,8 @@ msgstr "Vyšli _fajł"
 
 #: gajim/data/gui/gc_occupants_menu.ui:29
 #, fuzzy
-msgid "Occupant Actions"
-msgstr "_Dziejańni haspadara"
+msgid "Participant Actions"
+msgstr "Udzielniki"
 
 #: gajim/data/gui/gc_occupants_menu.ui:38
 msgid "_Voice"
@@ -5958,8 +5984,9 @@ msgid "_Ban"
 msgstr "Za_blakuj"
 
 #: gajim/data/gui/gc_occupants_menu.ui:124
-msgid "_Add to Roster"
-msgstr "_Dadaj u śpis kantaktaŭ"
+#, fuzzy
+msgid "_Add to Contact List"
+msgstr "_Dadaj kantakt..."
 
 #: gajim/data/gui/gc_occupants_menu.ui:132
 #, fuzzy
@@ -6000,11 +6027,6 @@ msgstr "Aŭtaryzacyja:"
 msgid "_Status"
 msgstr "_Status"
 
-#: gajim/data/gui/zeroconf_context_menu.ui:26
-#: gajim/data/gui/account_context_menu.ui:79
-msgid "_Modify Account..."
-msgstr "_Madyfikuj kont..."
-
 #: gajim/data/gui/certificate_dialog.ui:66
 #: gajim/data/gui/certificate_dialog.ui:178
 msgid "Common Name (CN)"
@@ -6086,13 +6108,19 @@ msgstr "Apošniaja źmiena:"
 msgid "Next entry"
 msgstr ""
 
+#: gajim/data/gui/filetransfers_send_file_dialog.ui:15
+#: gajim/data/gui/advanced_configuration.ui:143
+#: gajim/data/gui/groupchat_info_scrolled.ui:48 gajim/gtk/discovery.py:1663
+msgid "Description"
+msgstr "Apisańnie"
+
 #: gajim/data/gui/filetransfers_send_file_dialog.ui:54
 #, fuzzy
 msgid "_Send Files"
 msgstr "Vyšli _fajł"
 
 #: gajim/data/gui/filetransfers_send_file_dialog.ui:58
-#: gajim/gtk/xml_console.py:90
+#: gajim/gtk/xml_console.py:87
 #, fuzzy
 msgid "Send"
 msgstr "_Vyšli"
@@ -6119,8 +6147,8 @@ msgstr "Źmiani _mianušku"
 
 #: gajim/data/gui/gc_control_popup_menu.ui:20
 #, fuzzy
-msgid "_Manage Room"
-msgstr "Kiruj zakładkami"
+msgid "_Manage Group Chat"
+msgstr "Novaja hrupavaja razmova"
 
 #: gajim/data/gui/gc_control_popup_menu.ui:31
 #, fuzzy
@@ -6129,13 +6157,13 @@ msgstr "Źmiani _temu"
 
 #: gajim/data/gui/gc_control_popup_menu.ui:38
 #, fuzzy
-msgid "Configure _Room..."
-msgstr "Kanfihuruj _pakoj"
+msgid "Configure _Group Chat..."
+msgstr "Dałučysia da _pakoju"
 
 #: gajim/data/gui/gc_control_popup_menu.ui:52
 #, fuzzy
-msgid "_Destroy Room"
-msgstr "Apisańnie: %s"
+msgid "_Destroy Group Chat"
+msgstr "Novaja hrupavaja razmova"
 
 #: gajim/data/gui/gc_control_popup_menu.ui:64
 msgid "_Minimize on close"
@@ -6146,7 +6174,7 @@ msgstr ""
 msgid "_Request Voice"
 msgstr "_Daj hołas"
 
-#: gajim/data/gui/gc_control_popup_menu.ui:99 gajim/gtk/discovery.py:1704
+#: gajim/data/gui/gc_control_popup_menu.ui:99
 #, fuzzy
 msgid "_Bookmark"
 msgstr "_Stvary zakładku dla hetaja pakoju"
@@ -6199,14 +6227,6 @@ msgstr "Chatniaja staronka:"
 msgid "E-Mail"
 msgstr "E-mail:"
 
-#: 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/blocking_list.ui:115 gajim/gtk/add_contact.py:30
-#: gajim/gtk/accounts.py:801
-#, fuzzy
-msgid "Jabber ID"
-msgstr "JID:"
-
 #: gajim/data/gui/profile_window.ui:440
 msgid "Main"
 msgstr ""
@@ -6342,35 +6362,42 @@ msgstr "Praca"
 msgid "About"
 msgstr "Pra siabie"
 
-#: gajim/data/gui/start_chat_dialog.ui:114 gajim/gtk/discovery.py:1658
-msgid "Users"
-msgstr "Karystalniki"
-
-#: gajim/data/gui/start_chat_dialog.ui:185
-msgid "Name:"
-msgstr "Nazva:"
+#: gajim/data/gui/start_chat_dialog.ui:53
+#, fuzzy
+msgid "Global Group Chat Search"
+msgstr "Dałučysia da pakoju"
 
-#: gajim/data/gui/start_chat_dialog.ui:197
+#: 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
-msgid "Description:"
-msgstr "Apisańnie: %s"
+msgid "_Back"
+msgstr "Chutka viarnusia"
+
+#: gajim/data/gui/start_chat_dialog.ui:245
+#: gajim/data/gui/groupchat_control.ui:796
+#: gajim/data/gui/groupchat_control.ui:888 gajim/gtk/discovery.py:1701
+#: gajim/gtk/groupchat_join.py:62
+msgid "_Join"
+msgstr "_Dałučysia"
 
-#: gajim/data/gui/start_chat_dialog.ui:209
+#: gajim/data/gui/start_chat_dialog.ui:289
 #, fuzzy
-msgid "Address:"
-msgstr "_Adras:"
+msgid "Select Account"
+msgstr "Vydalajecca kont %s"
 
-#: gajim/data/gui/start_chat_dialog.ui:246
-msgid ""
-"Semi-Anonymous\n"
-"<span size=\"small\">(Only moderators can see your XMPP-Address)</span>"
+#: gajim/data/gui/start_chat_dialog.ui:380
+msgid "_Select"
 msgstr ""
 
 #: gajim/data/gui/filetransfers.ui:21
 msgid "Pa_use/Resume"
 msgstr ""
 
-#: gajim/data/gui/filetransfers.ui:30 gajim/gtk/filechoosers.py:178
+#: gajim/data/gui/filetransfers.ui:30 gajim/data/gui/groupchat_control.ui:575
+#: gajim/data/gui/groupchat_control.ui:667
+#: gajim/data/gui/groupchat_control.ui:779
+#: gajim/data/gui/groupchat_control.ui:871 gajim/gtk/filechoosers.py:178
 msgid "_Cancel"
 msgstr "_Anuluj"
 
@@ -6412,7 +6439,8 @@ msgid "Cancel the selected file transfer and remove incomplete files"
 msgstr "Anuluj abranuju pieradaču fajła i vydal niedaciahnuty fajł"
 
 #: gajim/data/gui/filetransfers.ui:207
-msgid "Shows a list of file transfers between you and others"
+#, fuzzy
+msgid "Shows a list of file transfers between you and your contacts"
 msgstr "Pakažy śpis pieradačaŭ fajłaŭ"
 
 #: gajim/data/gui/groupchat_control.ui:13 gajim/data/gui/chat_control.ui:277
@@ -6434,7 +6462,6 @@ msgid "Strike"
 msgstr "Mianuška"
 
 #: gajim/data/gui/groupchat_control.ui:54 gajim/data/gui/chat_control.ui:318
-#: gajim/gtk/advanced_config.py:86
 msgid "Color"
 msgstr "Koler"
 
@@ -6448,16 +6475,45 @@ msgstr "_Šryft:"
 msgid "Clear formatting"
 msgstr "Źviestki ab kantakcie"
 
-#: gajim/data/gui/groupchat_control.ui:290 gajim/data/gui/chat_control.ui:880
+#: gajim/data/gui/groupchat_control.ui:291 gajim/data/gui/chat_control.ui:880
 #, fuzzy
 msgid "Choose encryption"
 msgstr "Abiary fajł dla adsyłańnia..."
 
-#: gajim/data/gui/groupchat_control.ui:336 gajim/data/gui/chat_control.ui:640
+#: gajim/data/gui/groupchat_control.ui:337 gajim/data/gui/chat_control.ui:640
 #, fuzzy
 msgid "Show a list of emojis (Alt+M)"
 msgstr "Klikni, kab ustavić smajlik (Alt+M)"
 
+#: gajim/data/gui/groupchat_control.ui:484
+#, fuzzy
+msgid "Joining…"
+msgstr "Blakavańnie..."
+
+#: gajim/data/gui/groupchat_control.ui:496
+msgid "_Abort"
+msgstr ""
+
+#: gajim/data/gui/groupchat_control.ui:542
+#, fuzzy
+msgid "Enter new nickname"
+msgstr "_Пасля мянушкі:"
+
+#: gajim/data/gui/groupchat_control.ui:592
+#: gajim/data/gui/groupchat_control.ui:684
+#, fuzzy
+msgid "Ch_ange"
+msgstr "Źmiani _mianušku"
+
+#: gajim/data/gui/groupchat_control.ui:761
+#, fuzzy
+msgid "Enter password"
+msgstr "Uviadzi novy parol:"
+
+#: gajim/data/gui/groupchat_control.ui:1067
+msgid "_Try again"
+msgstr ""
+
 #: gajim/data/gui/popup_notification_window.ui:42
 #, fuzzy
 msgid "Event Type"
@@ -6539,8 +6595,8 @@ msgstr "Adyjšoŭ"
 
 #: gajim/data/gui/mam_preferences.ui:18
 #, fuzzy
-msgid "Roster"
-msgstr "Pakažy _śpis kantaktaŭ"
+msgid "Contact List"
+msgstr "Kantakty"
 
 #: gajim/data/gui/mam_preferences.ui:22
 #: gajim/data/gui/preferences_window.ui:123
@@ -6566,12 +6622,12 @@ msgid "Add"
 msgstr "Adras"
 
 #: gajim/data/gui/mam_preferences.ui:194 gajim/data/gui/groupchat_config.ui:151
-#: gajim/gtk/dialogs.py:63 gajim/gtk/accounts.py:381
+#: gajim/gtk/dialogs.py:62 gajim/gtk/accounts.py:384
 #, fuzzy
 msgid "Remove"
 msgstr "_Vydal"
 
-#: gajim/data/gui/vcard_information_window.ui:72 gajim/gtk/accounts.py:753
+#: gajim/data/gui/vcard_information_window.ui:72 gajim/gtk/accounts.py:756
 #, fuzzy
 msgid "Resource"
 msgstr "Krynica:"
@@ -6624,6 +6680,7 @@ msgstr "Aŭtaryzacyja:"
 #: gajim/data/gui/vcard_information_window.ui:974
 #: gajim/data/gui/vcard_information_window.ui:993
 #: gajim/data/gui/vcard_information_window.ui:1427
+#: gajim/data/gui/groupchat_info_scrolled.ui:222
 msgid "button"
 msgstr ""
 
@@ -6656,15 +6713,15 @@ msgstr "_Paviedam mnie pra heta"
 
 #: gajim/data/gui/preferences_window.ui:58
 #, fuzzy
-msgid "Show only in roster"
-msgstr "Pakazvaj tolki ŭ śpisie _kantaktaŭ"
+msgid "Show only in contact list"
+msgstr "Pakažy _adłučanyja kantakty"
 
 #: gajim/data/gui/preferences_window.ui:69
-msgid "Detached roster with detached chats"
+msgid "Detached contact list with detached chats"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:72
-msgid "Detached roster with single chat"
+msgid "Detached contact list with single chat"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:75
@@ -6672,11 +6729,11 @@ msgid "Single window for everything"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:78
-msgid "Detached roster with chat grouped by account"
+msgid "Detached contact list with chat grouped by account"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:81
-msgid "Detached roster with chat grouped by type"
+msgid "Detached contact list with chat grouped by type"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:92
@@ -6727,7 +6784,7 @@ msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:296
 #, fuzzy
-msgid "_Show roster on startup"
+msgid "_Show contact list on startup"
 msgstr "Pakažy _śpis kantaktaŭ"
 
 #: gajim/data/gui/preferences_window.ui:311
@@ -6743,12 +6800,12 @@ msgid "_Tabs placement"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:363
-msgid "_Quit Gajim when closing roster window"
+msgid "_Quit Gajim when closing contact list"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:367
 msgid ""
-"If enabled, Gajim will quit when closing the roster window instead of "
+"If enabled, Gajim will quit when closing the contact list window instead of "
 "minimizing to the system's notification area"
 msgstr ""
 
@@ -6758,41 +6815,42 @@ msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:423
 #, fuzzy
-msgid "Show a_vatars of contacts in roster"
+msgid "Show a_vatars of contacts in contact list"
 msgstr "Pakazvaj a_vatary kantaktaŭ u śpisie kantaktaŭ"
 
 #: gajim/data/gui/preferences_window.ui:427
 #, fuzzy
 msgid ""
-"If checked, avatars of contacts will be shown in the roster window and in "
-"group chats"
+"If checked, avatars of contacts will be shown in the contact list window and "
+"in group chats"
 msgstr ""
 "Kali ŭklučanaja hetaja opcyja, Gajim budzie pakazvać avatary kantaktaŭ u "
 "śpisie kantaktaŭ i ŭ pakojach"
 
 #: gajim/data/gui/preferences_window.ui:441
 #, fuzzy
-msgid "Show status _messages of contacts in roster"
+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
 #, fuzzy
 msgid ""
 "If checked, status messages of contacts will be shown under the contact's "
-"name, in the roster window, and in group chats"
+"name, in the contact list window, and in group chats"
 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
 #, fuzzy
-msgid "Show e_xtra information of contacts in roster (mood, activity, ...)"
+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
 msgid ""
-"If checked, additional info published by the contact will be shown in "
-"roster. Additional infos (published via PEP) may include e.g. mood, "
+"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 ""
 
@@ -6803,8 +6861,8 @@ msgstr "_Paradkuj kantakty pa statusie"
 
 #: gajim/data/gui/preferences_window.ui:494
 #, fuzzy
-msgid "in _roster"
-msgstr "Niama ŭ śpisie kantaktaŭ"
+msgid "in _contact list"
+msgstr "Kantakty"
 
 #: gajim/data/gui/preferences_window.ui:511
 #, fuzzy
@@ -6813,8 +6871,8 @@ msgstr "Dałučysia da _pakoju"
 
 #: gajim/data/gui/preferences_window.ui:540
 #, fuzzy
-msgid "Roster Appearance"
-msgstr "<b>Redahuj praviła</b>"
+msgid "Contact List Appearance"
+msgstr "Kantakt adłučyŭsia"
 
 #: gajim/data/gui/preferences_window.ui:585
 msgid "Enable spell _checking"
@@ -6876,7 +6934,7 @@ msgstr "Niemahčyma dałučycca da pakoju"
 
 #: gajim/data/gui/preferences_window.ui:660
 #, fuzzy
-msgid "If checked, the room subject will be shown when joining a group chat"
+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:682
@@ -6891,13 +6949,13 @@ msgstr ""
 #: gajim/data/gui/preferences_window.ui:701
 msgid ""
 "If join/leave status messages are shown in the group chat. This setting can "
-"be overridden in the groupchat menu."
+"be overridden in the group chat menu."
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:720
 msgid ""
 "The default sync threshold for new public group chats. This setting can be "
-"overridden in the groupchat menu."
+"overridden in the group chat menu."
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:722
@@ -6912,7 +6970,7 @@ msgstr "_Zachoŭvać u žurnale źmieny statusu kantaktaŭ"
 #: gajim/data/gui/preferences_window.ui:768
 msgid ""
 "If status change messages are shown in the group chat. This setting can be "
-"overridden in the groupchat menu."
+"overridden in the group chat menu."
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:825
@@ -6931,8 +6989,8 @@ msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:843
 #, fuzzy
-msgid "Show chatstate in roster"
-msgstr "Pakazvaj a_vatary kantaktaŭ u śpisie kantaktaŭ"
+msgid "Show chatstate in contact list"
+msgstr "Pakazvać knopki začynieńnia na kartkach?"
 
 #: gajim/data/gui/preferences_window.ui:847
 msgid ""
@@ -7229,7 +7287,7 @@ msgstr ""
 msgid "Vi_ew own video source"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2281 gajim/gtk/accounts.py:352
+#: gajim/data/gui/preferences_window.ui:2281 gajim/gtk/accounts.py:355
 msgid "Connection"
 msgstr "Złučeńnie"
 
@@ -7283,7 +7341,8 @@ msgid "_Manage..."
 msgstr "Kiruj..."
 
 #: gajim/data/gui/preferences_window.ui:2616
-msgid "_Log status changes of contacts"
+#, fuzzy
+msgid "_Store status changes of contacts in history"
 msgstr "_Zachoŭvać u žurnale źmieny statusu kantaktaŭ"
 
 #: gajim/data/gui/preferences_window.ui:2633
@@ -7308,10 +7367,15 @@ msgstr ""
 msgid "_Open..."
 msgstr "_Adčyni..."
 
+#: gajim/data/gui/preferences_window.ui:2723 gajim/gtk/advanced_config.py:84
+#, fuzzy
+msgid "Advanced Configuration Editor (ACE)"
+msgstr "Redaktar dadatkovych naładaŭ"
+
 #: gajim/data/gui/groupchat_config.ui:55
 #, fuzzy
 msgid ""
-"<b>Jabber-ID</b>\n"
+"<b>XMPP Address</b>\n"
 "&lt;user@domain/resource&gt; (only that resource matches)\n"
 "&lt;user@domain&gt; (any resource matches)\n"
 "&lt;domain/resource&gt; (only that resource matches)\n"
@@ -7330,7 +7394,8 @@ msgstr ""
 msgid "Only Admins and Owners can modify the affiliation"
 msgstr ""
 
-#: gajim/data/gui/groupchat_config.ui:270 gajim/plugins/gui.py:312
+#: gajim/data/gui/groupchat_config.ui:270
+#: gajim/data/gui/groupchat_info_scrolled.ui:210 gajim/plugins/gui.py:324
 #, fuzzy
 msgid "Configuration"
 msgstr "Kanfihuracyja pakoju"
@@ -7363,7 +7428,7 @@ msgid "Start _Chat"
 msgstr "Pačni _razmovu"
 
 #: gajim/data/gui/contact_context_menu.ui:20
-#: gajim/data/gui/systray_context_menu.ui:36
+#: gajim/data/gui/systray_context_menu.ui:29
 msgid "Send Single _Message..."
 msgstr "Dašli _asobnaje aviedamleńnie..."
 
@@ -7432,17 +7497,42 @@ msgstr ""
 
 #: gajim/data/gui/contact_context_menu.ui:174
 #, fuzzy
-msgid "_Add to Roster..."
-msgstr "_Dadaj u śpis kantaktaŭ"
+msgid "_Add to Contact List..."
+msgstr "_Dadaj kantakt..."
+
+#: gajim/data/gui/advanced_configuration.ui:39
+#, fuzzy
+msgid "You should restart Gajim for some changes to take effect"
+msgstr "<b>UVAHA:</b> Kab ubačyć niekatoryja źmieny, uruchom Gajim"
+
+#: gajim/data/gui/advanced_configuration.ui:71
+#, fuzzy
+msgid "_Filter"
+msgstr "_Filter:"
+
+#: gajim/data/gui/advanced_configuration.ui:88
+msgid "Type to search for values..."
+msgstr ""
+
+#: gajim/data/gui/advanced_configuration.ui:180
+#, fuzzy
+msgid "_Reset Value"
+msgstr "_Viarni zvyčajnyja kolery"
+
+#: gajim/data/gui/advanced_configuration.ui:185
+#, fuzzy
+msgid "Resets value to default"
+msgstr "_Viarni zvyčajnyja kolery"
 
 #: gajim/data/gui/account_creation_wizard_window.ui:43
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim: Stvareńnie kontu"
 
 #: gajim/data/gui/account_creation_wizard_window.ui:70
+#, fuzzy
 msgid ""
 "You need to have an account in order to connect\n"
-"to the Jabber network."
+"to the XMPP network."
 msgstr ""
 "Ty musiš mieć kont, kab dałučycca da sietki\n"
 "Jabber."
@@ -7466,8 +7556,9 @@ msgid "<b>Please fill in the data for your existing account</b>"
 msgstr "<b>Kali łaska, zapoŭni kartku źviestak dla novaha kontu</b>"
 
 #: gajim/data/gui/account_creation_wizard_window.ui:187
-msgid "_Jabber ID:"
-msgstr "_Jabber ID:"
+#, fuzzy
+msgid "_XMPP Address:"
+msgstr "Adras AIM:"
 
 #: gajim/data/gui/account_creation_wizard_window.ui:239
 #: gajim/data/gui/account_creation_wizard_window.ui:394
@@ -7556,6 +7647,7 @@ msgid "Privacy Lists:"
 msgstr "Śpisy pryvatnaści:"
 
 #: gajim/data/gui/service_discovery_window.ui:111
+#: gajim/data/gui/groupchat_creation.ui:227
 #, fuzzy
 msgid "_Address"
 msgstr "_Adras:"
@@ -7574,11 +7666,6 @@ msgstr ""
 msgid "Select the contacts you want to synchronise"
 msgstr "JID kantaktu, ź jakim chočaš parazmaŭlać"
 
-#: gajim/data/gui/groupchat_invitation_received.ui:42
-#, fuzzy
-msgid "Group Chat Invitation"
-msgstr "Zaprašeńnie ŭ pakoj"
-
 #: gajim/data/gui/groupchat_invitation_received.ui:111
 #, fuzzy
 msgid "Message..."
@@ -7630,11 +7717,10 @@ msgstr ""
 
 #: gajim/data/gui/add_new_contact_window.ui:84
 #, fuzzy
-msgid "_Jabber ID"
-msgstr "_Jabber ID:"
+msgid "_XMPP Address"
+msgstr "_Adras:"
 
 #: gajim/data/gui/add_new_contact_window.ui:100
-#: gajim/data/gui/manage_bookmarks_window.ui:192
 #, fuzzy
 msgid "_Nickname"
 msgstr "_Mianuška:"
@@ -7714,7 +7800,7 @@ msgstr "<b>Huki</b>"
 msgid "<b>Message:</b>"
 msgstr "<b>Šablony paviedamleńniaŭ statusu</b>"
 
-#: gajim/data/gui/plugins_window.ui:10 gajim/data/gui/application_menu.ui:90
+#: gajim/data/gui/plugins_window.ui:10 gajim/data/gui/application_menu.ui:87
 msgid "Plugins"
 msgstr ""
 
@@ -7823,10 +7909,6 @@ msgstr "Dazvol"
 msgid "Deny"
 msgstr "Admoŭ"
 
-#: gajim/data/gui/privacy_list_window.ui:317
-msgid "JabberID"
-msgstr "JID"
-
 #: gajim/data/gui/privacy_list_window.ui:358
 msgid "all in the group"
 msgstr "pavodle hrupy"
@@ -7869,7 +7951,7 @@ msgstr "Paradak:"
 msgid "Manage sounds"
 msgstr "Kiruj kontami"
 
-#: gajim/data/gui/manage_sounds_window.ui:55 gajim/plugins/gui.py:100
+#: gajim/data/gui/manage_sounds_window.ui:55 gajim/plugins/gui.py:101
 msgid "Active"
 msgstr "Dziejny"
 
@@ -7908,23 +7990,114 @@ msgstr "Vydal kont i dla Gajim, i na _servery"
 msgid "_Personal Events"
 msgstr "Asabistyja źviestki"
 
-#: gajim/data/gui/account_context_menu.ui:35
-#: gajim/data/gui/systray_context_menu.ui:28
-msgid "Join _Group Chat"
-msgstr "Dałučysia da _pakoju"
-
-#: gajim/data/gui/account_context_menu.ui:49
+#: gajim/data/gui/account_context_menu.ui:41
 msgid "_Add Contact..."
 msgstr "_Dadaj kantakt..."
 
-#: gajim/data/gui/account_context_menu.ui:57
+#: gajim/data/gui/account_context_menu.ui:49
 msgid "_Discover Services"
 msgstr "_Šukaj servisy"
 
-#: gajim/data/gui/account_context_menu.ui:65
+#: gajim/data/gui/account_context_menu.ui:57
 msgid "_Execute Command..."
 msgstr "_Vykanaj zahad..."
 
+#: gajim/data/gui/account_context_menu.ui:65
+#, fuzzy
+msgid "_View Certificate"
+msgstr "Niapravilnaje imia karystalnika"
+
+#: gajim/data/gui/manage_proxies.ui:12
+#, fuzzy
+msgctxt "proxy configuration"
+msgid "HTTP Connect"
+msgstr "Złučeńnie HTTP"
+
+#: gajim/data/gui/manage_proxies.ui:15
+msgctxt "proxy configuration"
+msgid "SOCKS5"
+msgstr ""
+
+#: gajim/data/gui/manage_proxies.ui:18
+#, fuzzy
+msgctxt "proxy configuration"
+msgid "BOSH"
+msgstr "_URL:"
+
+#: gajim/data/gui/manage_proxies.ui:68
+#, fuzzy
+msgid "Add Proxy"
+msgstr "Proxy:"
+
+#: gajim/data/gui/manage_proxies.ui:82
+#, fuzzy
+msgid "Remove Proxy"
+msgstr "Vydal hrupu"
+
+#: gajim/data/gui/manage_proxies.ui:134
+#, fuzzy
+msgid "Pass_word"
+msgstr "_Parol:"
+
+#: gajim/data/gui/manage_proxies.ui:159
+#, fuzzy
+msgid "Use proxy auth_entication"
+msgstr "Užyvaj aŭtaryzacyju"
+
+#: gajim/data/gui/manage_proxies.ui:179
+#, fuzzy
+msgid "_Username"
+msgstr "_Imia karystalnika:"
+
+#: gajim/data/gui/manage_proxies.ui:209
+#, fuzzy
+msgid "_Port"
+msgstr "_Port:"
+
+#: gajim/data/gui/manage_proxies.ui:226
+msgid "example.org"
+msgstr ""
+
+#: gajim/data/gui/manage_proxies.ui:240
+#, fuzzy
+msgid "_Host"
+msgstr "_Host:"
+
+#: gajim/data/gui/manage_proxies.ui:254
+#, fuzzy
+msgid "Use HTTP prox_y"
+msgstr "S_karystaj proxy"
+
+#: gajim/data/gui/manage_proxies.ui:275
+msgid "https://example.org/http-bind/"
+msgstr ""
+
+#: gajim/data/gui/manage_proxies.ui:291
+#, fuzzy
+msgid "_BOSH URL"
+msgstr "_URL:"
+
+#: gajim/data/gui/manage_proxies.ui:309 gajim/gtk/adhoc.py:322
+#, fuzzy
+msgid "Settings"
+msgstr "Niemahvyma dałučycca"
+
+#: gajim/data/gui/manage_proxies.ui:344
+#, fuzzy
+msgid "_Type"
+msgstr "Typ:"
+
+#: gajim/data/gui/manage_proxies.ui:361
+#: gajim/data/gui/groupchat_creation.ui:105
+#, fuzzy
+msgid "_Name"
+msgstr "_Imia:"
+
+#: gajim/data/gui/manage_proxies.ui:391 gajim/gtk/accounts.py:742
+#, fuzzy
+msgid "Proxy"
+msgstr "Proxy:"
+
 #: gajim/data/gui/application_menu.ui:8
 #, fuzzy
 msgid "View"
@@ -7932,8 +8105,8 @@ msgstr "_Vyhlad"
 
 #: gajim/data/gui/application_menu.ui:11
 #, fuzzy
-msgid "Show Roster"
-msgstr "Pakažy _śpis kantaktaŭ"
+msgid "Show Contact List"
+msgstr "Pakažy _adłučanyja kantakty"
 
 #: gajim/data/gui/application_menu.ui:16
 #, fuzzy
@@ -7975,23 +8148,24 @@ msgstr ""
 msgid "Features"
 msgstr "Zdolnaści serveraŭ"
 
-#: gajim/data/gui/application_menu.ui:81
+#: gajim/data/gui/application_menu.ui:77
+#: gajim/data/gui/groupchat_creation.ui:81 gajim/gtk/groupchat_creation.py:45
 #, fuzzy
-msgid "Bookmarks"
-msgstr "_Stvary zakładku dla hetaja pakoju"
+msgid "Create Group Chat"
+msgstr "Pakiń pakoji"
 
-#: gajim/data/gui/application_menu.ui:94 gajim/data/gui/shortcuts_window.ui:189
-#: gajim/gtk/preferences.py:59
+#: gajim/data/gui/application_menu.ui:91 gajim/data/gui/shortcuts_window.ui:189
+#: gajim/gtk/preferences.py:58
 msgid "Preferences"
 msgstr "Nałady"
 
-#: gajim/data/gui/application_menu.ui:99
+#: gajim/data/gui/application_menu.ui:96
 #, fuzzy
 msgid "Quit"
 msgstr "_Skonč pracu"
 
 #: gajim/data/gui/httpupload_progress_dialog.ui:110
-#: gajim/gtk/filetransfer.py:121
+#: gajim/gtk/filetransfer.py:120
 msgid "Progress"
 msgstr "Prahres"
 
@@ -8008,52 +8182,33 @@ msgstr ""
 msgid "_Cancel Upload"
 msgstr "_Anuluj"
 
-#: gajim/data/gui/manage_bookmarks_window.ui:13
-#, fuzzy
-msgid "Group Chat Bookmarks"
-msgstr "Групавая размова"
-
-#: gajim/data/gui/manage_bookmarks_window.ui:68
-#, fuzzy
-msgid "Add Bookmark"
-msgstr "_Stvary zakładku dla hetaja pakoju"
-
-#: gajim/data/gui/manage_bookmarks_window.ui:82
-#, fuzzy
-msgid "Remove Bookmark"
-msgstr "_Stvary zakładku dla hetaja pakoju"
+#: gajim/data/gui/groupchat_creation.ui:27
+msgid "Public or Private?"
+msgstr ""
 
-#: gajim/data/gui/manage_bookmarks_window.ui:126
-msgid "N_ame"
+#: 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 ""
 
-#: gajim/data/gui/manage_bookmarks_window.ui:145
-#, fuzzy
-msgid "Bookmark Name"
-msgstr "_Stvary zakładku dla hetaja pakoju"
+#: gajim/data/gui/groupchat_creation.ui:58
+msgid "<b>Public:</b> Anyone who knows the address can join."
+msgstr ""
 
-#: gajim/data/gui/manage_bookmarks_window.ui:160
+#: gajim/data/gui/groupchat_creation.ui:122
 #, fuzzy
-msgid "_Server"
-msgstr "_Server:"
+msgid "_Description"
+msgstr "Apisańnie"
 
-#: gajim/data/gui/manage_bookmarks_window.ui:223
-msgid "Roo_m"
+#: gajim/data/gui/groupchat_creation.ui:164
+msgid "_Public"
 msgstr ""
 
-#: gajim/data/gui/manage_bookmarks_window.ui:253
+#: gajim/data/gui/groupchat_creation.ui:278
 #, fuzzy
-msgid "_Password"
-msgstr "_Parol:"
-
-#: gajim/data/gui/manage_bookmarks_window.ui:299
-#, fuzzy
-msgid "Join chat when connected"
-msgstr "Kantakt adłučyŭsia"
-
-#: gajim/data/gui/manage_bookmarks_window.ui:307
-msgid "_Join Automatically"
-msgstr ""
+msgid "_Account"
+msgstr "Konty"
 
 #: gajim/data/gui/exception_dialog.ui:49
 msgid "Sorry, that should not have happened"
@@ -8099,6 +8254,29 @@ msgstr ""
 msgid "Presets"
 msgstr "P_rysutnaść"
 
+#: gajim/data/gui/groupchat_info_scrolled.ui:32
+#, fuzzy
+msgid "Address"
+msgstr "_Adras:"
+
+#: gajim/data/gui/groupchat_info_scrolled.ui:64
+msgid "Topic"
+msgstr ""
+
+#: gajim/data/gui/groupchat_info_scrolled.ui:80
+#, fuzzy
+msgid "Author"
+msgstr "_Aŭtaryzuj"
+
+#: gajim/data/gui/groupchat_info_scrolled.ui:182
+msgid "Discussion Logs"
+msgstr ""
+
+#: gajim/data/gui/groupchat_info_scrolled.ui:260
+#, fuzzy
+msgid "Group Chat Language"
+msgstr "Zaprašeńnie ŭ pakoj"
+
 #: gajim/data/gui/emoji_chooser.ui:98
 msgid "No Results Found"
 msgstr ""
@@ -8110,24 +8288,34 @@ msgstr ""
 #: gajim/data/gui/chat_to_muc_window.ui:39
 #, fuzzy
 msgid ""
-"You are now entering a groupchat.\n"
+"You are now entering a group chat.\n"
 "Select the contacts you want to invite"
 msgstr "JID kantaktu, ź jakim chočaš parazmaŭlać"
 
 #: gajim/data/gui/chat_to_muc_window.ui:112
-msgid "Please select a MUC server."
-msgstr ""
+#, fuzzy
+msgid "Please select a group chat server."
+msgstr "Heta nie pakoj"
 
 #: gajim/data/gui/chat_to_muc_window.ui:141
 #, fuzzy
-msgid "MUC server"
-msgstr "Naziralniki"
+msgid "Group chat server"
+msgstr "Pakoji"
 
 #: gajim/data/gui/chat_to_muc_window.ui:176
 #, fuzzy
 msgid "In_vite"
 msgstr "_Zaprasi"
 
+#: gajim/data/gui/bookmarks.ui:176
+#, fuzzy
+msgid "Autojoin"
+msgstr "Aŭtamatyčna dałučajsia"
+
+#: gajim/data/gui/bookmarks.ui:211
+msgid "_Apply"
+msgstr ""
+
 #: gajim/data/gui/history_manager.ui:11
 #, fuzzy
 msgid "_Export"
@@ -8144,11 +8332,11 @@ msgstr "Kiraŭnik žurnałaŭ razmoŭ Gajim"
 
 #: gajim/data/gui/history_manager.ui:108
 msgid ""
-"This log manager is not intended for log viewing. If you are looking for "
-"such functionality, use the history window instead.\n"
+"This history manager is not intended for viewing chat history. If you are "
+"looking for such functionality, please use the history window instead.\n"
 "\n"
-"Use this program to delete or export logs. You can select logs from the left "
-"and/or search database from below."
+"You can use this program to delete or export history. Either select logs "
+"from the left or search the database."
 msgstr ""
 
 #: gajim/data/gui/history_manager.ui:124
@@ -8201,8 +8389,9 @@ msgid "Select an emoji"
 msgstr ""
 
 #: gajim/data/gui/shortcuts_window.ui:38
-msgid "Complete a command or a nick"
-msgstr ""
+#, fuzzy
+msgid "Complete a command or a nickname"
+msgstr "Stvary novy zapis"
 
 #: gajim/data/gui/shortcuts_window.ui:45
 #, fuzzy
@@ -8242,7 +8431,7 @@ msgstr ""
 msgid "Scroll down"
 msgstr ""
 
-#: gajim/data/gui/shortcuts_window.ui:100 gajim/gtk/xml_console.py:72
+#: gajim/data/gui/shortcuts_window.ui:100 gajim/gtk/xml_console.py:69
 #, fuzzy
 msgid "Clear"
 msgstr "Viečar"
@@ -8284,8 +8473,9 @@ msgid "Close chat"
 msgstr ""
 
 #: gajim/data/gui/shortcuts_window.ui:173
-msgid "Roster Shortcuts"
-msgstr ""
+#, fuzzy
+msgid "Contact List Shortcuts"
+msgstr "Kantakt adłučyŭsia"
 
 #: gajim/data/gui/shortcuts_window.ui:196
 #, fuzzy
@@ -8318,7 +8508,7 @@ msgid "Show only active contacts"
 msgstr "Pakažy _adłučanyja kantakty"
 
 #: gajim/data/gui/shortcuts_window.ui:251
-msgid "Enable roster filtering"
+msgid "Enable contact list filtering"
 msgstr ""
 
 #: gajim/data/gui/shortcuts_window.ui:259
@@ -8364,12 +8554,12 @@ msgid "Search selected day only"
 msgstr ""
 
 #: gajim/data/gui/history_window.ui:317
-msgid "Record history for this chat"
+msgid "Store history for this chat"
 msgstr ""
 
 #: gajim/data/gui/history_window.ui:332
 #, fuzzy
-msgid "Record History"
+msgid "Store History"
 msgstr "Niadaŭna:"
 
 #: gajim/data/gui/history_window.ui:350
@@ -8390,9 +8580,10 @@ msgstr "Stvary novy zapis"
 msgid "Fill in the form."
 msgstr "Zapoŭni formu."
 
-#: gajim/data/gui/data_form_window.ui:229
-msgid "Room Configuration"
-msgstr "Kanfihuracyja pakoju"
+#: gajim/data/gui/data_form_window.ui:229 gajim/gtk/groupchat_config.py:41
+#, fuzzy
+msgid "Group Chat Configuration"
+msgstr "Zaprašeńnie ŭ pakoj"
 
 #: gajim/data/gui/roster_item_exchange_window.ui:39
 #: gajim/gtk/roster_item_exchange.py:35
@@ -8414,15 +8605,15 @@ msgstr "Sta_tus"
 msgid "_Start Chat..."
 msgstr "_Pačni razmovu"
 
-#: gajim/data/gui/systray_context_menu.ui:50
+#: gajim/data/gui/systray_context_menu.ui:43
 msgid "Show All Pending _Events"
 msgstr "Pakažy ŭsie niahledžanyja _padzieji"
 
-#: gajim/data/gui/systray_context_menu.ui:59
+#: gajim/data/gui/systray_context_menu.ui:52
 msgid "Mute Sounds"
 msgstr "Ściš huki"
 
-#: gajim/data/gui/systray_context_menu.ui:75
+#: gajim/data/gui/systray_context_menu.ui:68
 #, fuzzy
 msgid "_Preferences"
 msgstr "Nałady"
@@ -8515,34 +8706,34 @@ msgstr ""
 msgid "Execute expression inside a shell, send output"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:45
+#: gajim/command_system/implementation/standard.py:47
 msgid ""
 "Show help on a given command or a list of available commands if -a is given"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:73
+#: gajim/command_system/implementation/standard.py:75
 #, fuzzy
 msgid "Send a message to the contact"
 msgstr "Užyvańnie: /%s, chavaje knopki razmovy."
 
-#: gajim/command_system/implementation/standard.py:78
+#: gajim/command_system/implementation/standard.py:80
 msgid "Send action (in the third person) to the current chat"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:83
+#: gajim/command_system/implementation/standard.py:85
 msgid "Show logged messages which mention given text"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:88
+#: gajim/command_system/implementation/standard.py:90
 #, fuzzy, python-format
 msgid "%s: Nothing found"
 msgstr "%s nia znojdzieny"
 
-#: gajim/command_system/implementation/standard.py:94
+#: gajim/command_system/implementation/standard.py:96
 msgid "Limit must be an integer"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:118
+#: gajim/command_system/implementation/standard.py:120
 msgid ""
 "\n"
 "    Set the current status\n"
@@ -8552,133 +8743,133 @@ msgid ""
 "    "
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:136
+#: gajim/command_system/implementation/standard.py:138
 msgid "Set the current status to away"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:150
+#: gajim/command_system/implementation/standard.py:152
 msgid "Set the current status to online"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:153
+#: gajim/command_system/implementation/standard.py:155
 #, fuzzy
 msgid "Available"
 msgstr "_Dastupny"
 
-#: gajim/command_system/implementation/standard.py:173
-#: gajim/command_system/implementation/standard.py:250
+#: gajim/command_system/implementation/standard.py:175
+#: gajim/command_system/implementation/standard.py:252
 #, fuzzy
 msgid "Clear the text window"
 msgstr "Užyvańnie: /%s, ačyščaje akno ad tekstu."
 
-#: gajim/command_system/implementation/standard.py:178
-#: gajim/command_system/implementation/standard.py:397
+#: gajim/command_system/implementation/standard.py:180
+#: gajim/command_system/implementation/standard.py:401
 #, fuzzy
 msgid "Send a ping to the contact"
 msgstr "Dasyłaje kantaktu fajł"
 
-#: gajim/command_system/implementation/standard.py:181
-#: gajim/command_system/implementation/standard.py:400
+#: gajim/command_system/implementation/standard.py:183
+#: gajim/command_system/implementation/standard.py:404
 msgid "Command is not supported for zeroconf accounts"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:185
-msgid "Send DTMF sequence through an open audio session"
+#: gajim/command_system/implementation/standard.py:187
+msgid "Send DTMF sequence through an open voice chat"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:188
+#: gajim/command_system/implementation/standard.py:190
 #, fuzzy
-msgid "No open audio sessions with the contact"
+msgid "No open voice chats with the contact"
 msgstr "Klikni, kab pahladzieć tekt papiarednich razmoŭ z hetym kantaktam"
 
-#: gajim/command_system/implementation/standard.py:191
+#: gajim/command_system/implementation/standard.py:193
 #, python-format
 msgid "%s is not a valid tone"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:198
-msgid "Toggle audio session"
+#: gajim/command_system/implementation/standard.py:200
+msgid "Toggle Voice Chat"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:201
+#: gajim/command_system/implementation/standard.py:203
 #, fuzzy
-msgid "Audio sessions are not available"
-msgstr "Złučeńnie niemahčymaje"
+msgid "Voice chats are not available"
+msgstr "Złučeńnia niama"
 
-#: gajim/command_system/implementation/standard.py:208
-msgid "Toggle video session"
+#: gajim/command_system/implementation/standard.py:210
+msgid "Toggle Video Chat"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:211
+#: gajim/command_system/implementation/standard.py:213
 #, fuzzy
-msgid "Video sessions are not available"
+msgid "Video chats are not available"
 msgstr "Złučeńnia niama"
 
-#: gajim/command_system/implementation/standard.py:218
+#: gajim/command_system/implementation/standard.py:220
 #, fuzzy
 msgid "Send a message to the contact that will attract their attention"
 msgstr "Užyvańnie: /%s, chavaje knopki razmovy."
 
-#: gajim/command_system/implementation/standard.py:255
+#: gajim/command_system/implementation/standard.py:257
 #, fuzzy
 msgid "Change your nickname in a group chat"
 msgstr "Źmiani _mianušku"
 
-#: gajim/command_system/implementation/standard.py:260 gajim/gtk/dialogs.py:674
-#: gajim/gtk/bookmarks.py:272
+#: gajim/command_system/implementation/standard.py:262
 #, fuzzy
 msgid "Invalid nickname"
 msgstr "Niapravilnaje imia karystalnika"
 
-#: gajim/command_system/implementation/standard.py:267
+#: gajim/command_system/implementation/standard.py:269
 #, fuzzy
-msgid "Open a private chat window with a specified occupant"
+msgid "Open a private chat window with a specified participant"
 msgstr ""
 "Užyvańnie: /%s <mianuška>, adčyniaje akno pryvatnaj razmovy z akreślenaj "
 "asobaj."
 
-#: gajim/command_system/implementation/standard.py:273
-#: gajim/command_system/implementation/standard.py:282
-#: gajim/command_system/implementation/standard.py:332
-#: gajim/command_system/implementation/standard.py:345
-#: gajim/command_system/implementation/standard.py:357
+#: gajim/command_system/implementation/standard.py:275
+#: gajim/command_system/implementation/standard.py:284
+#: gajim/command_system/implementation/standard.py:336
+#: gajim/command_system/implementation/standard.py:349
+#: gajim/command_system/implementation/standard.py:361
 #, fuzzy
 msgid "Nickname not found"
 msgstr "Mianuška nia znojdziena: %s"
 
-#: gajim/command_system/implementation/standard.py:276
+#: gajim/command_system/implementation/standard.py:278
 #, fuzzy
 msgid ""
-"Open a private chat window with a specified occupant and send him a message"
+"Open a private chat window with a specified participant and send him a "
+"message"
 msgstr ""
 "Užyvańnie: /%s <mianuška>, adčyniaje akno pryvatnaj razmovy z akreślenaj "
 "asobaj."
 
-#: gajim/command_system/implementation/standard.py:285
+#: gajim/command_system/implementation/standard.py:287
 #, fuzzy
 msgid "Display or change a group chat topic"
 msgstr "Pytajsia paćvierdžańnia pierad začynieńniem kartki/akna razmovy."
 
-#: gajim/command_system/implementation/standard.py:294
-msgid "Invite a user to a room for a reason"
+#: gajim/command_system/implementation/standard.py:296
+msgid "Invite a user to a group chat for a reason"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:297
+#: gajim/command_system/implementation/standard.py:299
 #, fuzzy, python-format
 msgid "Invited %(jid)s to %(room_jid)s"
 msgstr "%(contact_jid)s zaprošany ŭ %(room_jid)s."
 
-#: gajim/command_system/implementation/standard.py:301
+#: gajim/command_system/implementation/standard.py:303
 #, fuzzy
-msgid "Join a group chat given by a JID"
+msgid "Join a group chat given by an XMPP Address"
 msgstr "Dałučysia da _pakoju"
 
-#: gajim/command_system/implementation/standard.py:309
+#: gajim/command_system/implementation/standard.py:313
 msgid ""
-"Leave the groupchat, optionally giving a reason, and close tab or window"
+"Leave the group chat, optionally giving a reason, and close tab or window"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:314
+#: gajim/command_system/implementation/standard.py:318
 msgid ""
 "\n"
 "    Ban user by a nick or a JID from a groupchat\n"
@@ -8687,46 +8878,46 @@ msgid ""
 "    "
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:329
+#: gajim/command_system/implementation/standard.py:333
 #, fuzzy
-msgid "Kick user by a nick from a groupchat"
+msgid "Kick user by a nick from a group chat"
 msgstr "Ty nie dałučyŭsia da pakoju."
 
-#: gajim/command_system/implementation/standard.py:338
+#: gajim/command_system/implementation/standard.py:342
 msgid ""
-"Set occupant role in group chat.\n"
+"Set participant role in group chat.\n"
 "    Role can be given as one of the following values:\n"
 "    moderator, participant, visitor, none"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:343
+#: gajim/command_system/implementation/standard.py:347
 #, fuzzy
 msgid "Invalid role given"
 msgstr "Niapravilnaje imia karystalnika"
 
-#: gajim/command_system/implementation/standard.py:350
+#: gajim/command_system/implementation/standard.py:354
 msgid ""
-"Set occupant affiliation in group chat.\n"
+"Set participant affiliation in group chat.\n"
 "    Affiliation can be given as one of the following values:\n"
 "    owner, admin, member, outcast, none"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:355
+#: gajim/command_system/implementation/standard.py:359
 #, fuzzy
 msgid "Invalid affiliation given"
 msgstr "Suviaź: "
 
-#: gajim/command_system/implementation/standard.py:365
+#: gajim/command_system/implementation/standard.py:369
 #, fuzzy
-msgid "Display names of all group chat occupants"
+msgid "Display names of all group chat participants"
 msgstr "Užyvańnie: /%s, pakazvaje imiony naviednikaŭ pakoju."
 
-#: gajim/command_system/implementation/standard.py:387
-msgid "Forbid an occupant to send you public or private messages"
+#: gajim/command_system/implementation/standard.py:391
+msgid "Forbid a participant to send you public or private messages"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:392
-msgid "Allow an occupant to send you public or private messages"
+#: gajim/command_system/implementation/standard.py:396
+msgid "Allow a participant to send you public or private messages"
 msgstr ""
 
 #: gajim/command_system/implementation/middleware.py:74
@@ -8737,204 +8928,330 @@ msgstr ""
 msgid "The same as using a doc-string, except it supports translation"
 msgstr ""
 
-#: gajim/gtk/filetransfer.py:91
+#: gajim/gtk/groupchat_info.py:36
+#, fuzzy
+msgid "?Group chat feature:Archiving"
+msgstr "Zaprašeńnie ŭ pakoj"
+
+#: gajim/gtk/groupchat_info.py:37
+#, fuzzy
+msgid "Messages are archived on the server"
+msgstr "Niama złučeńnia z serveram"
+
+#: gajim/gtk/groupchat_info.py:40
+#, fuzzy
+msgid "?Group chat feature:Persistent"
+msgstr "Pakoji"
+
+#: gajim/gtk/groupchat_info.py:41
+msgid "This group chat persists even if there are no participants"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:45
+#, fuzzy
+msgid "?Group chat feature:Temporary"
+msgstr "?Funkcyja kantaktu ŭ pakoji:Niama"
+
+#: gajim/gtk/groupchat_info.py:46
+msgid "This group chat will be destroyed once the last participant left"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:50
+#, fuzzy
+msgid "?Group chat feature:Moderated"
+msgstr "?Funkcyja kantaktu ŭ pakoji:Niama"
+
+#: gajim/gtk/groupchat_info.py:51
+msgid ""
+"Participants entering this group chat need to request permission to send "
+"messages"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:55
+#, fuzzy
+msgid "?Group chat feature:Not Moderated"
+msgstr "Pakoji"
+
+#: gajim/gtk/groupchat_info.py:56
+msgid "Participants entering this group chat are allowed to send messages"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:60
+#, fuzzy
+msgid "?Group chat feature:Open"
+msgstr "?Funkcyja kantaktu ŭ pakoji:Niama"
+
+#: gajim/gtk/groupchat_info.py:61
+#, fuzzy
+msgid "Anyone can join this group chat"
+msgstr "%s dałučyŭsia da pakoju"
+
+#: gajim/gtk/groupchat_info.py:64
+#, fuzzy
+msgid "?Group chat feature:Members Only"
+msgstr "Padśviatleńnie paviedamleńnia ŭ pakoji"
+
+#: gajim/gtk/groupchat_info.py:65
+msgid "This group chat is restricted to members only"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:69
+#, fuzzy
+msgid "?Group chat feature:Public"
+msgstr "Padśviatleńnie paviedamleńnia ŭ pakoji"
+
+#: gajim/gtk/groupchat_info.py:70
+msgid "Group chat can be found via search"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:73
+#, fuzzy
+msgid "?Group chat feature:Hidden"
+msgstr "?Funkcyja kantaktu ŭ pakoji:Niama"
+
+#: gajim/gtk/groupchat_info.py:74
+#, fuzzy
+msgid "This group chat can not be found via search"
+msgstr "Dla hetaha pakoju nie akreślena tema"
+
+#: gajim/gtk/groupchat_info.py:77
+#, fuzzy
+msgid "?Group chat feature:Not Anonymous"
+msgstr "Pakoji"
+
+#: gajim/gtk/groupchat_info.py:78
+msgid "All other group chat participants can see your XMPP address"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:82
+#, fuzzy
+msgid "?Group chat feature:Semi-Anonymous"
+msgstr "Padśviatleńnie paviedamleńnia ŭ pakoji"
+
+#: gajim/gtk/groupchat_info.py:83
+msgid "Only moderators can see your XMPP address"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:86
+#, fuzzy
+msgid "?Group chat feature:Password Required"
+msgstr "Pakoji"
+
+#: gajim/gtk/groupchat_info.py:87
+msgid "This group chat does require a password upon entry"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:91
+#, fuzzy
+msgid "?Group chat feature:No Password Required"
+msgstr "Pakoji"
+
+#: gajim/gtk/groupchat_info.py:92
+msgid "This group chat does not require a password upon entry"
+msgstr ""
+
+#: gajim/gtk/filetransfer.py:90
 msgid "File"
 msgstr "Fajł"
 
-#: gajim/gtk/filetransfer.py:108
+#: gajim/gtk/filetransfer.py:107
 msgid "Time"
 msgstr "Čas"
 
-#: gajim/gtk/filetransfer.py:228
+#: gajim/gtk/filetransfer.py:227
 #, fuzzy, python-format
 msgid "File name: %s"
 msgstr "Nazva fajłu: %s"
 
-#: gajim/gtk/filetransfer.py:229 gajim/gtk/filetransfer.py:464
+#: gajim/gtk/filetransfer.py:228 gajim/gtk/filetransfer.py:469
 #, python-format
 msgid "Size: %s"
 msgstr "Pamier: %s"
 
-#: gajim/gtk/filetransfer.py:239
+#: gajim/gtk/filetransfer.py:238
 #, python-format
 msgid "Sender: %s"
 msgstr "Dasłaŭ: %s"
 
-#: gajim/gtk/filetransfer.py:240 gajim/gtk/filetransfer.py:744
+#: gajim/gtk/filetransfer.py:239 gajim/gtk/filetransfer.py:749
 #: gajim/gtk/tooltips.py:577
 msgid "Recipient: "
 msgstr "Atrymaŭ: "
 
-#: gajim/gtk/filetransfer.py:251
+#: gajim/gtk/filetransfer.py:250
 #, python-format
 msgid "Saved in: %s"
 msgstr "Zapisany ŭ: %s"
 
-#: gajim/gtk/filetransfer.py:256
+#: gajim/gtk/filetransfer.py:255
 msgid "File transfer completed"
 msgstr "Pieradača fajłu skončana"
 
-#: gajim/gtk/filetransfer.py:276 gajim/gtk/filetransfer.py:285
+#: gajim/gtk/filetransfer.py:275 gajim/gtk/filetransfer.py:284
 #, fuzzy
 msgid "Connection with peer could not be established."
 msgstr "NIemahčyma złučycca ź inšym bokam."
 
-#: gajim/gtk/filetransfer.py:293
+#: gajim/gtk/filetransfer.py:292
 #, python-format
 msgid "Filename: %s"
 msgstr "Nazva fajłu: %s"
 
-#: gajim/gtk/filetransfer.py:294
+#: gajim/gtk/filetransfer.py:293
 #, python-format
 msgid "Recipient: %s"
 msgstr "Atrymoŭca: %s"
 
-#: gajim/gtk/filetransfer.py:296
+#: gajim/gtk/filetransfer.py:295
 #, python-format
 msgid "Error message: %s"
 msgstr "Tekst pamyłki: %s"
 
-#: gajim/gtk/filetransfer.py:333
-#, fuzzy
-msgid "File transfer error"
-msgstr "Pamyłka pieradačy fajłu"
-
 #: gajim/gtk/filetransfer.py:334
 #, python-format
 msgid ""
-"The file %(file)s has been received, but it seems to have been damaged along "
-"the way.\n"
+"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 ""
 
-#: gajim/gtk/filetransfer.py:350
+#: gajim/gtk/filetransfer.py:340
+#, fuzzy
+msgid "_Download Again"
+msgstr "_Bolš nie pytajsia"
+
+#: gajim/gtk/filetransfer.py:355
 #, fuzzy
 msgid "Gajim can not read this file"
 msgstr "Gajim nia moža dastupicca da hetaha fajłu"
 
-#: gajim/gtk/filetransfer.py:351
+#: gajim/gtk/filetransfer.py:356
 msgid "Another process is using this file."
 msgstr ""
 
-#: gajim/gtk/filetransfer.py:418
+#: gajim/gtk/filetransfer.py:423
 #, fuzzy
 msgid "File Transfer Conflict"
 msgstr "Pieradača fajłu skončana"
 
-#: gajim/gtk/filetransfer.py:419
+#: gajim/gtk/filetransfer.py:424
 msgid "This file already exists"
 msgstr "Hety fajł užo isnuje"
 
-#: gajim/gtk/filetransfer.py:420
+#: gajim/gtk/filetransfer.py:425
 msgid "Resume download or replace file?"
 msgstr ""
 
-#: gajim/gtk/filetransfer.py:424
+#: gajim/gtk/filetransfer.py:429
 #, fuzzy
 msgid "Replace _File"
 msgstr "Viečar"
 
-#: gajim/gtk/filetransfer.py:427
+#: gajim/gtk/filetransfer.py:432
 #, fuzzy
 msgid "Resume _Download"
 msgstr "Ściahni"
 
-#: gajim/gtk/filetransfer.py:437
+#: gajim/gtk/filetransfer.py:442
 #, fuzzy, python-format
 msgid "Directory '%s' is not writable"
 msgstr "Niemahčyma zapisać u kataloh \"%s\""
 
-#: gajim/gtk/filetransfer.py:438
+#: gajim/gtk/filetransfer.py:443
 #, fuzzy
 msgid "You do not have permissions to create files in this directory."
 msgstr "Nie staje pravoŭ dla stvareńnia fajłaŭ u hetym katalohu."
 
-#: gajim/gtk/filetransfer.py:461
+#: gajim/gtk/filetransfer.py:466
 #, python-format
 msgid "File: %s"
 msgstr "Fajł: %s"
 
-#: gajim/gtk/filetransfer.py:467
+#: gajim/gtk/filetransfer.py:472
 #, python-format
 msgid "Type: %s"
 msgstr "Typ: %s"
 
-#: gajim/gtk/filetransfer.py:469
+#: gajim/gtk/filetransfer.py:474
 #, python-format
 msgid "Description: %s"
 msgstr "Apisańnie: %s"
 
-#: gajim/gtk/filetransfer.py:480
+#: gajim/gtk/filetransfer.py:485
 #, fuzzy, python-format
 msgid "%s wants to send you a file"
 msgstr "%s choča dasłać tabie fajł."
 
-#: gajim/gtk/filetransfer.py:509
+#: gajim/gtk/filetransfer.py:514
 #, fuzzy
 msgid "Checking file…"
 msgstr "Dasyłańnie profilu..."
 
-#: gajim/gtk/filetransfer.py:524
+#: gajim/gtk/filetransfer.py:529
 #, fuzzy
 msgid "File error"
 msgstr "Pamyłka pieradačy fajłu"
 
-#: gajim/gtk/filetransfer.py:561
+#: gajim/gtk/filetransfer.py:566
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 
-#: gajim/gtk/filetransfer.py:658
+#: gajim/gtk/filetransfer.py:663
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/s)"
 
-#: gajim/gtk/filetransfer.py:711 gajim/gtk/filetransfer.py:715
+#: gajim/gtk/filetransfer.py:716 gajim/gtk/filetransfer.py:720
 msgid "Invalid File"
 msgstr "Niapravilny fajł"
 
-#: gajim/gtk/filetransfer.py:711
+#: gajim/gtk/filetransfer.py:716
 msgid "File: "
 msgstr "Fajł: "
 
-#: gajim/gtk/filetransfer.py:716
+#: gajim/gtk/filetransfer.py:721
 msgid "It is not possible to send empty files"
 msgstr "Niemahčyma dasyłać pustyja fajły"
 
-#: gajim/gtk/filetransfer.py:742 gajim/gtk/tooltips.py:571
+#: gajim/gtk/filetransfer.py:747 gajim/gtk/tooltips.py:571
 msgid "Sender: "
 msgstr "Adpraŭnik:"
 
-#: gajim/gtk/filetransfer.py:1038
+#: gajim/gtk/filetransfer.py:1043
 #, fuzzy
 msgid "Choose a File to Send…"
 msgstr "Abiary fajł dla adsyłańnia..."
 
 #: gajim/gtk/start_chat.py:51
 #, fuzzy
-msgid "Start new Conversation"
+msgid "Start New Conversation"
 msgstr "Złučeńnie"
 
-#: gajim/gtk/start_chat.py:424
-#, fuzzy
-msgid "New Groupchat"
-msgstr "Novaja hrupavaja razmova"
+#: gajim/gtk/start_chat.py:260 gajim/gtk/start_chat.py:328
+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:426
+#: gajim/gtk/start_chat.py:603 gajim/gtk/groupchat_join.py:38
+msgid "Join Group Chat"
+msgstr "Dałučysia da pakoju"
+
+#: gajim/gtk/start_chat.py:605 gajim/gtk/add_contact.py:40
 #, fuzzy
-msgid "New Contact"
-msgstr "Dadaj novy kantakt"
+msgid "Add Contact"
+msgstr "_Dadaj kantakt..."
 
-#: gajim/gtk/start_chat.py:588
+#: gajim/gtk/start_chat.py:746
 #, fuzzy, python-format
-msgid "%s Group chats found"
+msgid "%s group chats found"
 msgstr "%s nia znojdzieny"
 
-#: gajim/gtk/discovery.py:70
+#: gajim/gtk/discovery.py:69
 msgid "This service has not yet responded with detailed information"
 msgstr "Hety servis dahetul nie adkazaŭ na zapyt padrabiaznych źviestak"
 
-#: gajim/gtk/discovery.py:71
+#: gajim/gtk/discovery.py:70
 #, fuzzy
 msgid ""
 "This service could not respond with detailed information.\n"
@@ -8943,32 +9260,33 @@ msgstr ""
 "Hety servis nia zmoh adkazać na zapyt padrabiaznych źviestak.\n"
 "Servis sastareły albo złamany"
 
-#: gajim/gtk/discovery.py:128
+#: gajim/gtk/discovery.py:126
 msgid "Others"
 msgstr "Inšyja"
 
-#: gajim/gtk/discovery.py:131
-msgid "Conference"
-msgstr "Kanferencyja"
+#: gajim/gtk/discovery.py:129
+#, fuzzy
+msgid "Group Chat"
+msgstr "_Pakoj"
 
-#: gajim/gtk/discovery.py:519
+#: gajim/gtk/discovery.py:518
 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:606
+#: gajim/gtk/discovery.py:605
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Prahlad servisaŭ dla kontu %s"
 
-#: gajim/gtk/discovery.py:608
+#: gajim/gtk/discovery.py:607
 msgid "Service Discovery"
 msgstr "Prahlad servisaŭ"
 
-#: gajim/gtk/discovery.py:691
+#: gajim/gtk/discovery.py:690
 msgid "The service could not be found"
 msgstr "Niemahčyma znajści servis"
 
-#: gajim/gtk/discovery.py:692
+#: gajim/gtk/discovery.py:691
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -8976,103 +9294,82 @@ msgstr ""
 "Niama servisu z akreślenym adrasam, albo jon nie adkazvaje. Pravier adras i "
 "pasprabuj znoŭ."
 
-#: gajim/gtk/discovery.py:699 gajim/gtk/discovery.py:1042
+#: gajim/gtk/discovery.py:698 gajim/gtk/discovery.py:1041
 msgid "The service is not browsable"
 msgstr "Niemahčyma ahladać hety servis"
 
-#: gajim/gtk/discovery.py:700
+#: gajim/gtk/discovery.py:699
 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:738 gajim/gtk/discovery.py:747
+#: gajim/gtk/discovery.py:737 gajim/gtk/discovery.py:746
 #, fuzzy
 msgid "Invalid Server Name"
 msgstr "Niapravilnaje imia karystalnika"
 
-#: gajim/gtk/discovery.py:806
+#: gajim/gtk/discovery.py:805
 #, fuzzy, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Prahlad %s dla kontu %s"
 
-#: gajim/gtk/discovery.py:851
+#: gajim/gtk/discovery.py:850
 #, fuzzy
 msgid "Browse"
 msgstr "_Prahladaj"
 
-#: gajim/gtk/discovery.py:1043
+#: gajim/gtk/discovery.py:1042
 msgid "This service does not contain any items to browse."
 msgstr "Hety servis nia ŭtrymlivaje elementaŭ dla prahladu."
 
-#: gajim/gtk/discovery.py:1255
+#: gajim/gtk/discovery.py:1254
 #, fuzzy
 msgid "_Command"
 msgstr "Zahady: %s"
 
-#: gajim/gtk/discovery.py:1264 gajim/gtk/discovery.py:1422
+#: gajim/gtk/discovery.py:1263 gajim/gtk/discovery.py:1420
 msgid "Re_gister"
 msgstr "_Zarehistrujsia"
 
-#: gajim/gtk/discovery.py:1277
+#: gajim/gtk/discovery.py:1276
 msgid "_Search"
 msgstr "Š_ukaj"
 
-#: gajim/gtk/discovery.py:1420
+#: gajim/gtk/discovery.py:1418
 msgid "_Edit"
 msgstr "_Źmianić"
 
-#: gajim/gtk/discovery.py:1458
+#: gajim/gtk/discovery.py:1456
 #, fuzzy, python-format
 msgid "Scanning %(current)d / %(total)d ..."
 msgstr "Skanavańnie %d / %d.."
 
-#: gajim/gtk/discovery.py:1674
+#: gajim/gtk/discovery.py:1655
+msgid "Users"
+msgstr "Karystalniki"
+
+#: gajim/gtk/discovery.py:1671
 msgid "Id"
 msgstr "Identyfikatar"
 
-#: gajim/gtk/discovery.py:1713
-msgid "_Join"
-msgstr "_Dałučysia"
-
-#: gajim/gtk/discovery.py:1736
-msgid "Bookmark already set"
-msgstr "Zakładka ŭžo dadana"
-
-#: gajim/gtk/discovery.py:1737
-#, fuzzy, python-format
-msgid "Group Chat '%s' is already in your bookmarks."
-msgstr "Pakoj \"%s\" užo jość u tvajich zakładkach."
-
-#: gajim/gtk/discovery.py:1748
-msgid "Bookmark has been added successfully"
-msgstr "Zakładka paśpiachova dadanaja"
-
-#: gajim/gtk/discovery.py:1749
-#, fuzzy
-msgid ""
-"You can manage your bookmarks by clicking the Bookmarks menu item in your "
-"contact list."
-msgstr ""
-"Možaš kiravać svajimi zakładkami praz menu \"Dziejańni\" śpisu kantaktaŭ."
-
-#: gajim/gtk/discovery.py:1950
+#: gajim/gtk/discovery.py:1900
 msgid "Subscribed"
 msgstr "Aŭtaryzavany"
 
-#: gajim/gtk/discovery.py:1959
+#: gajim/gtk/discovery.py:1909
 #, fuzzy
 msgid "Node"
 msgstr "Nijaki"
 
-#: gajim/gtk/discovery.py:2028
+#: gajim/gtk/discovery.py:1978
 #, fuzzy
 msgid "_New post"
 msgstr "Novy zapis"
 
-#: gajim/gtk/discovery.py:2037
+#: gajim/gtk/discovery.py:1987
 msgid "_Subscribe"
 msgstr "_Aŭtaryzuj"
 
-#: gajim/gtk/discovery.py:2045
+#: gajim/gtk/discovery.py:1995
 msgid "_Unsubscribe"
 msgstr "_Anuluj aŭtaryzacyju"
 
@@ -9120,7 +9417,7 @@ msgstr "Я %s"
 msgid "Characters typed: %s"
 msgstr "Mianuška nie dazvolenaja: %s"
 
-#: gajim/gtk/single_message.py:274 gajim/gtk/xml_console.py:169
+#: gajim/gtk/single_message.py:274 gajim/gtk/xml_console.py:166
 msgid "Connection not available"
 msgstr "Złučeńnia niama"
 
@@ -9129,6 +9426,12 @@ msgstr "Złučeńnia niama"
 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:306
+#, 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:330
 #, python-format
 msgid "RE: %s"
@@ -9139,28 +9442,28 @@ msgstr "RE: %s"
 msgid "%s wrote:\n"
 msgstr "%s napisaŭ:\n"
 
-#: gajim/gtk/pep_config.py:44
+#: gajim/gtk/pep_config.py:45
 #, fuzzy, python-format
 msgid "PEP Service Configuration (%s)"
 msgstr "Kanfihuracyja pakoju"
 
-#: gajim/gtk/pep_config.py:77
+#: gajim/gtk/pep_config.py:78
 #, fuzzy
 msgid "Service"
 msgstr "Server"
 
-#: gajim/gtk/pep_config.py:114
+#: gajim/gtk/pep_config.py:115
 msgid "PEP node was not removed"
 msgstr ""
 
-#: gajim/gtk/pep_config.py:115
+#: gajim/gtk/pep_config.py:116
 #, python-format
 msgid ""
 "PEP node %(node)s was not removed:\n"
 "%(message)s"
 msgstr ""
 
-#: gajim/gtk/pep_config.py:146
+#: gajim/gtk/pep_config.py:147
 #, fuzzy, python-format
 msgid "Configure %s"
 msgstr "_Praciahni"
@@ -9176,17 +9479,22 @@ msgstr "_Rehistruj"
 msgid "Registration successful"
 msgstr "Zarehistrujsia na %s"
 
-#: gajim/gtk/dialogs.py:54 gajim/gtk/dataform.py:659 gajim/gtk/adhoc.py:85
+#: gajim/gtk/service_registration.py:215
+#, fuzzy
+msgid "Registration failed"
+msgstr "Niemahvyma dałučycca"
+
+#: gajim/gtk/dialogs.py:53 gajim/gtk/dataform.py:668 gajim/gtk/adhoc.py:86
 #, fuzzy
 msgid "Cancel"
 msgstr "_Anuluj"
 
-#: gajim/gtk/dialogs.py:129
+#: gajim/gtk/dialogs.py:128
 #, fuzzy, python-format
 msgid "Dictionary for language \"%s\" not available"
 msgstr "Słoŭnik dla movy %s niedastupny"
 
-#: gajim/gtk/dialogs.py:130
+#: gajim/gtk/dialogs.py:129
 #, fuzzy, python-format
 msgid ""
 "You have to install the dictionary \"%s\" to use spellchecking, or choose "
@@ -9197,12 +9505,12 @@ msgstr ""
 "Treba zainstalavać słoŭnik %s, kab praviarać pravapis, albo abrać inšuju "
 "movu ŭ opcyi speller_language."
 
-#: gajim/gtk/dialogs.py:410 gajim/gtk/dialogs.py:425
+#: gajim/gtk/dialogs.py:322 gajim/gtk/dialogs.py:337
 #, fuzzy
 msgid "Insecure connection"
 msgstr "Złučeńnie"
 
-#: gajim/gtk/dialogs.py:411
+#: gajim/gtk/dialogs.py:323
 #, fuzzy, python-format
 msgid ""
 "You are about to connect to the account %(account)s (%(server)s) insecurely. "
@@ -9211,120 +9519,115 @@ msgid ""
 "Are you sure you want to do that?"
 msgstr "Stvarajecca metakantakt. Ty sapraŭdy chočaš praciahnuć?"
 
-#: gajim/gtk/dialogs.py:416
+#: gajim/gtk/dialogs.py:328
 msgid "Yes, I really want to connect insecurely"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:417
+#: gajim/gtk/dialogs.py:329
 msgid "Gajim will NOT connect unless you check this box"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:675
-#, fuzzy
-msgid "The nickname contains invalid characters."
-msgstr "JID pakoju ŭtrymlivaje niedazvolenyja znaki."
-
-#: gajim/gtk/dialogs.py:734
+#: gajim/gtk/dialogs.py:561
 #, fuzzy, python-format
 msgid "Destroy %s"
 msgstr "Apisańnie: %s"
 
-#: gajim/gtk/dialogs.py:775
+#: gajim/gtk/dialogs.py:602
 #, fuzzy
 msgid "Certificate"
 msgstr "Niapravilnaje imia karystalnika"
 
-#: gajim/gtk/dialogs.py:786
+#: gajim/gtk/dialogs.py:613
 #, fuzzy, python-format
 msgid ""
 "Certificate for account\n"
 "%s"
 msgstr "dla kontu %s"
 
-#: gajim/gtk/dialogs.py:824
+#: gajim/gtk/dialogs.py:651
 msgid "Issued to\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:825 gajim/gtk/dialogs.py:830
+#: gajim/gtk/dialogs.py:652 gajim/gtk/dialogs.py:657
 msgid "Common Name (CN): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:826 gajim/gtk/dialogs.py:831
+#: gajim/gtk/dialogs.py:653 gajim/gtk/dialogs.py:658
 msgid "Organization (O): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:827 gajim/gtk/dialogs.py:832
+#: gajim/gtk/dialogs.py:654 gajim/gtk/dialogs.py:659
 msgid "Organizational Unit (OU): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:828
+#: gajim/gtk/dialogs.py:655
 #, fuzzy
 msgid "Serial Number: "
 msgstr "Numer GG:"
 
-#: gajim/gtk/dialogs.py:829
+#: gajim/gtk/dialogs.py:656
 msgid "Issued by\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:833
+#: gajim/gtk/dialogs.py:660
 msgid "Validity\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:834
+#: gajim/gtk/dialogs.py:661
 msgid "Issued on: "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:835
+#: gajim/gtk/dialogs.py:662
 msgid "Expires on: "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:836
+#: gajim/gtk/dialogs.py:663
 msgid "SHA-1:"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:838
+#: gajim/gtk/dialogs.py:665
 msgid "SHA-256:"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:852
+#: gajim/gtk/dialogs.py:679
 #, fuzzy
 msgid "View certificate…"
 msgstr "Niapravilnaje imia karystalnika"
 
-#: gajim/gtk/dialogs.py:864 gajim/gtk/accounts.py:893
+#: gajim/gtk/dialogs.py:691 gajim/gtk/accounts.py:896
 msgid "Change Password"
 msgstr "Źmiani parol"
 
-#: gajim/gtk/dialogs.py:878
+#: gajim/gtk/dialogs.py:705
 msgid "_OK"
 msgstr "_Tak"
 
-#: gajim/gtk/dialogs.py:891
+#: gajim/gtk/dialogs.py:718
 #, fuzzy
 msgid "You must enter a password"
 msgstr "Treba ŭvieści parol."
 
-#: gajim/gtk/dialogs.py:895
+#: gajim/gtk/dialogs.py:722
 msgid "Passwords do not match"
 msgstr "Paroli roźniacca"
 
-#: gajim/gtk/dialogs.py:923
+#: gajim/gtk/dialogs.py:750
 #, fuzzy
 msgid "Group Chat Invitation "
 msgstr "Zaprašeńnie ŭ pakoj"
 
-#: gajim/gtk/dialogs.py:948
+#: gajim/gtk/dialogs.py:775
 #, fuzzy, python-format
 msgid "<b>%s</b> has invited you to join a discussion"
 msgstr "$Contact zaprasiŭ ciabie ŭ pakoj %(room_jid)s"
 
-#: gajim/gtk/dialogs.py:951
+#: gajim/gtk/dialogs.py:778
 #, 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:959
+#: gajim/gtk/dialogs.py:786
 #, python-format
 msgid "Comment: %s"
 msgstr "Kamentar: %s"
@@ -9339,11 +9642,6 @@ msgstr "Numer GG:"
 msgid "ICQ Number"
 msgstr "Numer ICQ:"
 
-#: gajim/gtk/add_contact.py:40
-#, fuzzy
-msgid "Add Contact"
-msgstr "_Dadaj kantakt..."
-
 #: gajim/gtk/add_contact.py:259
 #, fuzzy, python-format
 msgid "%s Missing"
@@ -9365,7 +9663,7 @@ msgstr "Identyfikatar karystalnika nia moža ŭtrymlivać krynicy."
 
 #: gajim/gtk/add_contact.py:299
 #, fuzzy
-msgid "You cannot add yourself to your roster."
+msgid "You cannot add yourself to your contact list."
 msgstr "Ja chaču dadać ciabie ŭ svoj śpis kantaktaŭ."
 
 #: gajim/gtk/add_contact.py:304
@@ -9378,11 +9676,13 @@ msgid "Your account must be online to add new contacts."
 msgstr ""
 
 #: gajim/gtk/add_contact.py:321
-msgid "Contact already in roster"
+#, fuzzy
+msgid "Contact Already in Contact List"
 msgstr "Kantakt užo jość u śpisie kantaktaŭ"
 
 #: gajim/gtk/add_contact.py:322
-msgid "This contact is already listed in your roster."
+#, fuzzy
+msgid "This contact is already in your contact list."
 msgstr "Hety kantakt užo jość u tvajim śpisie kantaktaŭ."
 
 #: gajim/gtk/add_contact.py:379 gajim/gtk/add_contact.py:417
@@ -9423,14 +9723,14 @@ msgstr "Źmiani status"
 
 #: gajim/gtk/themes.py:52
 #, fuzzy
-msgid "MUC Tab New Directed Message"
+msgid "Group Chat Tab New Directed Message"
 msgstr ""
 "Razmova\n"
 "Paviedamleńni"
 
 #: gajim/gtk/themes.py:56
 #, fuzzy
-msgid "MUC Tab New Message"
+msgid "Group Chat Tab New Message"
 msgstr "Novaje paviedamleńnie"
 
 #: gajim/gtk/themes.py:60
@@ -9647,13 +9947,13 @@ msgstr "Usie fajły"
 msgid "Clear File"
 msgstr "Viečar"
 
-#: gajim/gtk/settings.py:570
+#: gajim/gtk/settings.py:570 gajim/gtk/proxies.py:32
 #, fuzzy
 msgid "Manage Proxies"
 msgstr "Kiruj profilami proxy"
 
-#: gajim/gtk/settings.py:591 gajim/gtk/preferences.py:971
-#: gajim/gtk/preferences.py:984 gajim/gtk/preferences.py:988
+#: gajim/gtk/settings.py:591 gajim/gtk/preferences.py:968
+#: gajim/gtk/preferences.py:982 gajim/gtk/preferences.py:986
 #, fuzzy
 msgid "No Proxy"
 msgstr "Proxy:"
@@ -9733,14 +10033,15 @@ msgid ""
 "        "
 msgstr ""
 
-#: gajim/gtk/about.py:47 data/org.gajim.Gajim.appdata.xml.in:10
+#: gajim/gtk/about.py:47 data/org.gajim.Gajim.desktop.in:6
+#: data/org.gajim.Gajim.appdata.xml.in:10
 #, fuzzy
-msgid "A GTK+ XMPP client"
+msgid "A GTK XMPP client"
 msgstr "Klijent Jabber dla GTK+"
 
 #: gajim/gtk/about.py:48
 #, fuzzy, python-format
-msgid "GTK+ Version: %s"
+msgid "GTK Version: %s"
 msgstr "Versija GTK+:"
 
 #: gajim/gtk/about.py:49
@@ -9920,6 +10221,25 @@ msgstr "?status pieradačy:Prypyniena"
 msgid "?transfer status:Not started"
 msgstr "?status pieradačy:Prypyniena"
 
+#: gajim/gtk/groupchat_creation.py:97 gajim/gtk/groupchat_creation.py:99
+msgid " (optional)..."
+msgstr ""
+
+#: gajim/gtk/groupchat_creation.py:134
+#, fuzzy
+msgid "Invalid Address"
+msgstr "Niapravilny fajł"
+
+#: gajim/gtk/groupchat_creation.py:182
+#, fuzzy
+msgid "Not Connected"
+msgstr "Złučeńnie"
+
+#: gajim/gtk/groupchat_creation.py:183
+#, fuzzy
+msgid "You have to be connected to create a group chat."
+msgstr "Ty nie dałučyŭsia da pakoju."
+
 #: gajim/gtk/sounds.py:39
 msgid "Wav Sounds"
 msgstr "Fajły ŭ Wav"
@@ -9963,50 +10283,45 @@ msgstr "Padśviatleńnie paviedamleńnia ŭ pakoji"
 msgid "Group Chat Message Received"
 msgstr "Novaje paviedamleńnie ŭ pakoji"
 
-#: gajim/gtk/dataform.py:226 gajim/gtk/dataform.py:262
+#: gajim/gtk/dataform.py:232 gajim/gtk/dataform.py:268
 #, fuzzy
 msgid "Required"
 msgstr "Vymahaje parolu"
 
-#: gajim/gtk/dataform.py:286
+#: gajim/gtk/dataform.py:293
 msgid "Yes"
 msgstr ""
 
-#: gajim/gtk/dataform.py:286
+#: gajim/gtk/dataform.py:293
 #, fuzzy
 msgid "No"
 msgstr "Nijaki"
 
-#: gajim/gtk/dataform.py:661
+#: gajim/gtk/dataform.py:670
 msgid "Submit"
 msgstr ""
 
-#: gajim/gtk/statusicon.py:213
+#: gajim/gtk/statusicon.py:206
 #, fuzzy
 msgid "_Change Status Message…"
 msgstr "Ź_miani paviedamleńnie statusu"
 
-#: gajim/gtk/statusicon.py:247 gajim/gtk/statusicon.py:292
-#: gajim/gtk/statusicon.py:299
+#: gajim/gtk/statusicon.py:258
 #, python-format
 msgid "using account %s"
 msgstr "praz kont %s"
 
-#: gajim/gtk/statusicon.py:309
+#: gajim/gtk/statusicon.py:269
 #, fuzzy
-msgid "_Manage Bookmarks…"
-msgstr "Kiruj zakładkami"
+msgid "Hide _Contact List"
+msgstr "Kantakty"
 
-#: gajim/gtk/statusicon.py:325
+#: gajim/gtk/statusicon.py:273
 #, fuzzy
-msgid "Hide _Roster"
-msgstr "Niama ŭ śpisie kantaktaŭ"
-
-#: gajim/gtk/statusicon.py:329
-msgid "Show _Roster"
-msgstr "Pakažy _śpis kantaktaŭ"
+msgid "Show _Contact List"
+msgstr "Pakažy _adłučanyja kantakty"
 
-#: gajim/gtk/statusicon.py:337
+#: gajim/gtk/statusicon.py:281
 msgid "Hide this menu"
 msgstr "Schavaj hetaje menu"
 
@@ -10055,37 +10370,6 @@ msgid ""
 msgstr ""
 "Adbyłasia pamyłka padčas publikacyi asabistych źviestak, pasprabuj paźniej."
 
-#: gajim/gtk/join_groupchat.py:202
-#, fuzzy
-msgid "Invalid Room"
-msgstr "Niapravilny zapis"
-
-#: gajim/gtk/join_groupchat.py:203
-msgid "Please choose a room"
-msgstr ""
-
-#: gajim/gtk/join_groupchat.py:222 gajim/gtk/join_groupchat.py:229
-#, fuzzy
-msgid "Invalid Nickname"
-msgstr "Niapravilnaje imia karystalnika"
-
-#: gajim/gtk/join_groupchat.py:223
-#, fuzzy
-msgid "Please choose a nickname"
-msgstr "Stvary novy zapis"
-
-#: gajim/gtk/join_groupchat.py:282 gajim/gtk/join_groupchat.py:288
-#: gajim/gtk/join_groupchat.py:293
-#, fuzzy
-msgid "Wrong server"
-msgstr "Niapravilnaja spasyłka"
-
-#: gajim/gtk/join_groupchat.py:283 gajim/gtk/join_groupchat.py:289
-#: gajim/gtk/join_groupchat.py:294
-#, fuzzy, python-format
-msgid "%s is not a groupchat server"
-msgstr "Heta nie pakoj"
-
 #: gajim/gtk/mam_preferences.py:38
 #, python-format
 msgid "Archiving Preferences for %s"
@@ -10116,45 +10400,53 @@ msgstr "Atrymaŭ novy zapis:"
 msgid "Archiving Preferences Error"
 msgstr "_Nałady"
 
-#: gajim/gtk/advanced_config.py:81
+#: gajim/gtk/advanced_config.py:95
 msgid "Activated"
 msgstr "Dziejny"
 
-#: gajim/gtk/advanced_config.py:81
+#: gajim/gtk/advanced_config.py:95
 msgid "Deactivated"
 msgstr "Niadziejny"
 
-#: gajim/gtk/advanced_config.py:83
-msgid "Boolean"
-msgstr "Lahičnaja źmiennaja"
+#: gajim/gtk/advanced_config.py:97
+msgid "?config type:Boolean"
+msgstr ""
+
+#: gajim/gtk/advanced_config.py:98
+msgid "?config type:Integer"
+msgstr ""
 
-#: gajim/gtk/advanced_config.py:84
-msgid "Integer"
-msgstr "Cely lik"
+#: gajim/gtk/advanced_config.py:99
+msgid "?config type:Text"
+msgstr ""
 
-#: gajim/gtk/advanced_config.py:85
-msgid "Text"
-msgstr "Tekst"
+#: gajim/gtk/advanced_config.py:100
+msgid "?config type:Color"
+msgstr ""
 
-#: gajim/gtk/advanced_config.py:97
-msgid "Preference Name"
+#: gajim/gtk/advanced_config.py:112
+#, fuzzy
+msgid "?config:Preference Name"
 msgstr "Nazva nałady"
 
-#: gajim/gtk/advanced_config.py:104
-msgid "Value"
-msgstr "Vartaść"
+#: gajim/gtk/advanced_config.py:123
+#, fuzzy
+msgid "?config:Value"
+msgstr "_Praciahni"
 
-#: gajim/gtk/advanced_config.py:113
-msgid "Type"
-msgstr "Typ"
+#: gajim/gtk/advanced_config.py:132
+msgid "?config:Type"
+msgstr ""
 
-#: gajim/gtk/advanced_config.py:168
-msgid "(None)"
-msgstr "(Niama)"
+#: gajim/gtk/advanced_config.py:187
+#, fuzzy
+msgid "?config description:None"
+msgstr "?Zapyt (aŭtaryzacyi):Niama"
 
-#: gajim/gtk/advanced_config.py:299
-msgid "Hidden"
-msgstr "Schavany"
+#: gajim/gtk/advanced_config.py:322
+#, fuzzy
+msgid "?password:Hidden"
+msgstr "Parol:"
 
 #: gajim/gtk/server_info.py:66
 #, fuzzy
@@ -10166,8 +10458,8 @@ msgstr "S_kapijuj adras spasyłki"
 msgid "%(days)s days, %(hours)s hours"
 msgstr ""
 
-#: gajim/gtk/server_info.py:218 gajim/gtk/accounts.py:749
-#: gajim/gtk/accounts.py:853
+#: gajim/gtk/server_info.py:218 gajim/gtk/accounts.py:752
+#: gajim/gtk/accounts.py:856
 #, fuzzy
 msgid "Hostname"
 msgstr "Nazva hosta: "
@@ -10345,11 +10637,6 @@ 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_config.py:41
-#, fuzzy
-msgid "Group Chat Configuration"
-msgstr "Zaprašeńnie ŭ pakoj"
-
 #: gajim/gtk/groupchat_config.py:134
 #, fuzzy
 msgid "A Group Chat needs at least one Owner"
@@ -10360,69 +10647,69 @@ msgid "You are not allowed to modify the affiliation of Admins and Owners"
 msgstr ""
 
 #: gajim/gtk/groupchat_config.py:399
-msgid "An entry with this Jabber-ID already exists"
+msgid "An entry with this XMPP Address already exists"
 msgstr ""
 
-#: gajim/gtk/adhoc.py:91
+#: gajim/gtk/adhoc.py:92
 #, fuzzy
 msgid "Finish"
 msgstr "_Skonč"
 
-#: gajim/gtk/adhoc.py:97 gajim/gtk/adhoc.py:283
+#: gajim/gtk/adhoc.py:98 gajim/gtk/adhoc.py:284
 #, fuzzy
 msgid "Commands"
 msgstr "Zahady: %s"
 
-#: gajim/gtk/adhoc.py:103
+#: gajim/gtk/adhoc.py:104
 msgid "Next"
 msgstr ""
 
-#: gajim/gtk/adhoc.py:109
+#: gajim/gtk/adhoc.py:110
 #, fuzzy
 msgid "Previous"
 msgstr "uri"
 
-#: gajim/gtk/adhoc.py:115
+#: gajim/gtk/adhoc.py:116
 #, fuzzy
 msgid "Execute"
 msgstr "_Vykanaj zahad..."
 
-#: gajim/gtk/adhoc.py:195
+#: gajim/gtk/adhoc.py:196
 #, fuzzy
 msgid "No commands available"
 msgstr "Konty niedastupnyja"
 
-#: gajim/gtk/adhoc.py:244
+#: gajim/gtk/adhoc.py:245
 #, fuzzy
 msgid "Request Command List"
 msgstr "_Vykanaj zahad..."
 
-#: gajim/gtk/adhoc.py:259
+#: gajim/gtk/adhoc.py:260
 #, fuzzy
 msgid "Executing…"
 msgstr "_Vykanaj zahad..."
 
-#: gajim/gtk/adhoc.py:266
+#: gajim/gtk/adhoc.py:267
 #, fuzzy
 msgid "Command List"
 msgstr "Zahady: %s"
 
-#: gajim/gtk/adhoc.py:384
+#: gajim/gtk/adhoc.py:385
 #, fuzzy
 msgid "Finished"
 msgstr "_Skonč"
 
-#: gajim/gtk/adhoc.py:453
+#: gajim/gtk/adhoc.py:454
 #, fuzzy
 msgid "Execution failed"
 msgstr "Niemahvyma dałučycca"
 
-#: gajim/gtk/blocking.py:37
+#: gajim/gtk/blocking.py:38
 #, fuzzy, python-format
 msgid "Blocking List for %s"
 msgstr "Śpis pryvatnaści dla %s"
 
-#: gajim/gtk/blocking.py:71
+#: gajim/gtk/blocking.py:72
 #, fuzzy
 msgid "Error!"
 msgstr "Pamyłka Avahi"
@@ -10472,8 +10759,7 @@ msgstr "Niapravilnaje imia karystalnika"
 msgid "You must provide a username to configure this account."
 msgstr "Treba vyznačyć imia karystalnika, kab skanfihuravać hety kont."
 
-#: gajim/gtk/account_wizard.py:252 gajim/gtk/bookmarks.py:290
-#: gajim/gtk/bookmarks.py:303
+#: gajim/gtk/account_wizard.py:252
 #, fuzzy
 msgid "Invalid server"
 msgstr "Niapravilnaje imia karystalnika"
@@ -10491,7 +10777,7 @@ msgstr "Niapravilny zapis"
 msgid "Custom port must be a port number."
 msgstr "Abrany port musić być numeram portu."
 
-#: gajim/gtk/account_wizard.py:405
+#: gajim/gtk/account_wizard.py:406
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -10501,15 +10787,15 @@ msgid ""
 "Do you still want to connect to this server?"
 msgstr ""
 
-#: gajim/gtk/account_wizard.py:446 gajim/gtk/account_wizard.py:480
+#: gajim/gtk/account_wizard.py:447 gajim/gtk/account_wizard.py:481
 msgid "An error occurred during account creation"
 msgstr "Adbyłasia pamyłka padčas stvareńnia kontu"
 
-#: gajim/gtk/account_wizard.py:545
+#: gajim/gtk/account_wizard.py:546
 msgid "Account name is in use"
 msgstr "Nazva kontu ŭžo vykarystoŭvajecca"
 
-#: gajim/gtk/account_wizard.py:546
+#: gajim/gtk/account_wizard.py:547
 msgid "You already have an account using this name."
 msgstr "Kont z takoj nazvaj užo isnuje."
 
@@ -10536,26 +10822,26 @@ msgstr "Pieradača fajłu %(filename)s ad %(name)s spyniena."
 msgid "%(minutes)s min %(seconds)s sec"
 msgstr ""
 
-#: gajim/gtk/xml_console.py:77
+#: gajim/gtk/xml_console.py:74
 #, fuzzy
 msgid "Filter"
 msgstr "Filter:"
 
-#: gajim/gtk/xml_console.py:82
+#: gajim/gtk/xml_console.py:79
 #, fuzzy
 msgid "XML Input"
 msgstr "<b>Uvod XML</b>"
 
-#: gajim/gtk/xml_console.py:86
+#: gajim/gtk/xml_console.py:83
 msgid "Paste Last Input"
 msgstr ""
 
-#: gajim/gtk/xml_console.py:170
+#: gajim/gtk/xml_console.py:167
 #, fuzzy, 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/xml_console.py:182
+#: gajim/gtk/xml_console.py:177
 #, fuzzy
 msgid "Invalid Node"
 msgstr "Niapravilny fajł"
@@ -10588,153 +10874,168 @@ msgstr "Šukaj"
 msgid "No results found"
 msgstr "%s nia znojdzieny"
 
-#: gajim/gtk/preferences.py:358 gajim/gtk/preferences.py:362
+#: gajim/gtk/preferences.py:357 gajim/gtk/preferences.py:361
 msgid "Default"
 msgstr "Zmoŭčany"
 
-#: gajim/gtk/preferences.py:801
+#: gajim/gtk/preferences.py:798
 msgid "status message title"
 msgstr "zahałovak statusu"
 
-#: gajim/gtk/preferences.py:802
+#: gajim/gtk/preferences.py:799
 msgid "status message text"
 msgstr "tekst paviedamleńnia statusu"
 
+#: gajim/gtk/accounts.py:137
+#, fuzzy
+msgid "Re-Login"
+msgstr "Pieradałučycca?"
+
 #: gajim/gtk/accounts.py:138
-msgid "Relogin now?"
+#, fuzzy
+msgid "Re-Login now?"
 msgstr "Pieradałučycca?"
 
 #: gajim/gtk/accounts.py:139
-msgid "If you want all the changes to apply instantly, you must relogin."
+#, 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:191 gajim/gtk/accounts.py:975
+#: gajim/gtk/accounts.py:141
+msgid "_Later"
+msgstr ""
+
+#: gajim/gtk/accounts.py:143
+msgid "_Re-Login"
+msgstr ""
+
+#: gajim/gtk/accounts.py:194 gajim/gtk/accounts.py:978
 #, fuzzy
 msgid "Remove Account"
 msgstr "Vydalajecca kont %s"
 
-#: gajim/gtk/accounts.py:192
+#: gajim/gtk/accounts.py:195
 #, fuzzy, python-format
 msgid "You still have open chats in your account %s"
 msgstr "Akno razmovy adčynienaje dla kontu %s"
 
-#: gajim/gtk/accounts.py:193
+#: gajim/gtk/accounts.py:196
 #, fuzzy
 msgid ""
 "All chat and group chat windows will be closed.\n"
 "Do you want to continue?"
 msgstr "Usie adčynienyja vokny razmovy buduć začynienyja. Praciahnuć?"
 
-#: gajim/gtk/accounts.py:424
+#: gajim/gtk/accounts.py:427
 #, fuzzy
 msgid "Back"
 msgstr "Chutka viarnusia"
 
-#: gajim/gtk/accounts.py:530
+#: gajim/gtk/accounts.py:533
 #, fuzzy
 msgid "Please check if Bonjour is installed."
 msgstr "Kali łaska, pravier instalacyju Avahi."
 
-#: gajim/gtk/accounts.py:532
+#: gajim/gtk/accounts.py:535
 #, fuzzy
 msgid "Please check if Avahi is installed."
 msgstr "Kali łaska, pravier instalacyju Avahi."
 
-#: gajim/gtk/accounts.py:569
+#: gajim/gtk/accounts.py:572
 #, fuzzy
 msgid "Disable Account"
 msgstr "Niapravilnaja nazva kontu"
 
-#: gajim/gtk/accounts.py:570
+#: gajim/gtk/accounts.py:573
 #, fuzzy, python-format
 msgid "Account %s is still connected"
 msgstr "Kont \"%s\" dałučany da servera"
 
-#: gajim/gtk/accounts.py:571
+#: gajim/gtk/accounts.py:574
 #, fuzzy
 msgid ""
 "All chat and group chat windows will be closed. Do you want to continue?"
 msgstr "Usie adčynienyja vokny razmovy buduć začynienyja. Praciahnuć?"
 
-#: gajim/gtk/accounts.py:576
+#: gajim/gtk/accounts.py:579
 #, fuzzy
 msgid "_Disable Account"
 msgstr "Niapravilnaja nazva kontu"
 
-#: gajim/gtk/accounts.py:595
+#: gajim/gtk/accounts.py:598
 #, fuzzy
 msgid "Add Account"
 msgstr "_Dadaj kantakt..."
 
-#: gajim/gtk/accounts.py:663
+#: gajim/gtk/accounts.py:666
 msgid "Label"
 msgstr ""
 
-#: gajim/gtk/accounts.py:667
+#: gajim/gtk/accounts.py:670
 msgid "Login"
 msgstr ""
 
-#: gajim/gtk/accounts.py:670
+#: gajim/gtk/accounts.py:673
 #, fuzzy
 msgid "Import Contacts"
 msgstr "Kantakty"
 
-#: gajim/gtk/accounts.py:674 gajim/gtk/accounts.py:870
+#: gajim/gtk/accounts.py:677 gajim/gtk/accounts.py:873
 #, fuzzy
 msgid "Client Certificate"
 msgstr "Niapravilnaje imia karystalnika"
 
-#: gajim/gtk/accounts.py:677 gajim/gtk/accounts.py:774
+#: gajim/gtk/accounts.py:680 gajim/gtk/accounts.py:777
 #, fuzzy
 msgid "Connect on startup"
 msgstr "_Zlučajsia pry starcie Gajim"
 
-#: gajim/gtk/accounts.py:681 gajim/gtk/accounts.py:779
+#: gajim/gtk/accounts.py:684 gajim/gtk/accounts.py:782
 #, fuzzy
 msgid "Save conversations for all contacts"
 msgstr "Zachoŭvaj _žurnały razmoŭ dla ŭsich kantaktaŭ"
 
-#: gajim/gtk/accounts.py:683 gajim/gtk/accounts.py:781
+#: gajim/gtk/accounts.py:686 gajim/gtk/accounts.py:784
 msgid "Store conversations on the harddrive"
 msgstr ""
 
-#: gajim/gtk/accounts.py:685 gajim/gtk/accounts.py:783
+#: gajim/gtk/accounts.py:688 gajim/gtk/accounts.py:786
 #, fuzzy
 msgid "Global Status"
 msgstr "Usie statusy"
 
-#: gajim/gtk/accounts.py:687
+#: gajim/gtk/accounts.py:690
 #, fuzzy
 msgid "Synchronise the status of all accounts"
 msgstr "Źmianiaje status kontu albo kontaŭ"
 
-#: gajim/gtk/accounts.py:689
+#: gajim/gtk/accounts.py:692
 msgid "Use file transfer proxies"
 msgstr "Skarystaj proxy dla pieradačy fajłaŭ"
 
-#: gajim/gtk/accounts.py:705
+#: gajim/gtk/accounts.py:708
 #, fuzzy
 msgid "Idle Time"
 msgstr " ad %s"
 
-#: gajim/gtk/accounts.py:707
+#: gajim/gtk/accounts.py:710
 msgid "Disclose the time of your last activity"
 msgstr ""
 
-#: gajim/gtk/accounts.py:709
+#: gajim/gtk/accounts.py:712
 msgid "Local System Time"
 msgstr ""
 
-#: gajim/gtk/accounts.py:711
+#: gajim/gtk/accounts.py:714
 msgid "Disclose the local system time of the device Gajim runs on"
 msgstr ""
 
-#: gajim/gtk/accounts.py:714
+#: gajim/gtk/accounts.py:717
 #, fuzzy
 msgid "Client / Operating System"
 msgstr "Niapravilnaje imia karystalnika"
 
-#: gajim/gtk/accounts.py:716
+#: gajim/gtk/accounts.py:719
 #, fuzzy
 msgid ""
 "Disclose informations about the client and operating system you currently use"
@@ -10742,153 +11043,148 @@ msgstr ""
 "Kali ŭklučanaja hetaja opcyja, Gajim budzie dałučacca da hetaha pakoju pry "
 "starcie"
 
-#: gajim/gtk/accounts.py:719
+#: gajim/gtk/accounts.py:722
 #, fuzzy
 msgid "Ignore Unknown Contacts"
 msgstr "Kantakty"
 
-#: gajim/gtk/accounts.py:721
+#: gajim/gtk/accounts.py:724
 #, fuzzy
 msgid "Ignore everything from contacts not in your Roster"
 msgstr "_Ihnaruj padzieji ad kantaktaŭ, jakich niama ŭ śpisie kantaktaŭ"
 
-#: gajim/gtk/accounts.py:737 gajim/gtk/accounts.py:776
+#: gajim/gtk/accounts.py:740 gajim/gtk/accounts.py:779
 #, fuzzy
 msgid "Use environment variable"
 msgstr "Złučeńnia niama"
 
-#: gajim/gtk/accounts.py:739
-#, fuzzy
-msgid "Proxy"
-msgstr "Proxy:"
-
-#: gajim/gtk/accounts.py:742
+#: gajim/gtk/accounts.py:745
 #, fuzzy
 msgid "Warn on insecure connection"
 msgstr "Złučeńnie"
 
-#: gajim/gtk/accounts.py:746
+#: gajim/gtk/accounts.py:749
 msgid "Send keep-alive packets"
 msgstr "Dasyłaj pravieračnyja infarmacyjnyja pakiety"
 
-#: gajim/gtk/accounts.py:750
+#: gajim/gtk/accounts.py:753
 msgid "Manually set the hostname for the server"
 msgstr ""
 
-#: gajim/gtk/accounts.py:756 gajim/gtk/accounts.py:826
-#: gajim/gtk/accounts.py:831
+#: gajim/gtk/accounts.py:759 gajim/gtk/accounts.py:829
+#: gajim/gtk/accounts.py:834
 #, fuzzy
 msgid "Priority"
 msgstr "Pryjary_tet:"
 
-#: gajim/gtk/accounts.py:785
+#: gajim/gtk/accounts.py:788
 #, fuzzy
 msgid "Synchronize the status of all accounts"
 msgstr "Źmianiaje status kontu albo kontaŭ"
 
-#: gajim/gtk/accounts.py:795
+#: gajim/gtk/accounts.py:798
 #, fuzzy
 msgid "First Name"
 msgstr "Imia:"
 
-#: gajim/gtk/accounts.py:798
+#: gajim/gtk/accounts.py:801
 #, fuzzy
 msgid "Last Name"
 msgstr "Proźvišča:"
 
-#: gajim/gtk/accounts.py:804
+#: gajim/gtk/accounts.py:807
 #, fuzzy
 msgid "Email"
 msgstr "Novy list"
 
-#: gajim/gtk/accounts.py:822
+#: gajim/gtk/accounts.py:825
 #, fuzzy
 msgid "Adjust to status"
 msgstr "_Dastasuj da statusu"
 
-#: gajim/gtk/accounts.py:849
+#: gajim/gtk/accounts.py:852
 msgid "Enable"
 msgstr "Ukluč"
 
-#: gajim/gtk/accounts.py:857
+#: gajim/gtk/accounts.py:860
 #, fuzzy
 msgid "Port"
 msgstr "_Port:"
 
-#: gajim/gtk/accounts.py:862
+#: gajim/gtk/accounts.py:865
 #, fuzzy
 msgid "Connection Settings"
 msgstr "Złučeńnie"
 
-#: gajim/gtk/accounts.py:872
+#: gajim/gtk/accounts.py:875
 msgid "PKCS12 Files"
 msgstr ""
 
-#: gajim/gtk/accounts.py:874
+#: gajim/gtk/accounts.py:877
 #, fuzzy
 msgid "Encrypted Certificate"
 msgstr "Niapravilnaje imia karystalnika"
 
-#: gajim/gtk/accounts.py:878
+#: gajim/gtk/accounts.py:881
 #, fuzzy
 msgid "Certificate Settings"
 msgstr "Niapravilnaje imia karystalnika"
 
-#: gajim/gtk/accounts.py:890
+#: gajim/gtk/accounts.py:893
 #, fuzzy
 msgid "Save Password"
 msgstr "Zachavaj parol"
 
-#: gajim/gtk/accounts.py:898
+#: gajim/gtk/accounts.py:901
 #, fuzzy
 msgid "Login Settings"
 msgstr "Niemahvyma dałučycca"
 
-#: gajim/gtk/accounts.py:931
+#: gajim/gtk/accounts.py:934
 #, fuzzy, python-format
 msgid "Removing account %s"
 msgstr "Vydalajecca kont %s"
 
-#: gajim/gtk/accounts.py:946
+#: gajim/gtk/accounts.py:949
 #, fuzzy
 msgid "Account is disabled"
 msgstr "Šyfravańnie adklučanaje"
 
-#: gajim/gtk/accounts.py:947
+#: gajim/gtk/accounts.py:950
 #, fuzzy
 msgid "To unregister from a server, the account must be enabled."
 msgstr "Kab źmianić nazvu kontu, treba pieradałučycca."
 
-#: gajim/gtk/accounts.py:962
+#: gajim/gtk/accounts.py:965
 #, fuzzy
 msgid "Password required"
 msgstr "Vymahaje parolu"
 
-#: gajim/gtk/accounts.py:976
+#: gajim/gtk/accounts.py:979
 #, fuzzy, python-format
 msgid "Account '%s' is still connected to the server"
 msgstr "Kont \"%s\" dałučany da servera"
 
-#: gajim/gtk/accounts.py:978
+#: gajim/gtk/accounts.py:981
 msgid "If you remove it, the connection will be lost."
 msgstr "Kali ty vydališ jaho, złučeńnie razarviecca."
 
-#: gajim/gtk/accounts.py:995
+#: gajim/gtk/accounts.py:998
 #, fuzzy, python-format
 msgid "Connection to server %s failed"
 msgstr "Niemahvyma dałučycca"
 
-#: gajim/gtk/accounts.py:996
+#: gajim/gtk/accounts.py:999
 #, fuzzy
 msgid "What would you like to do?"
 msgstr "Što chočaš zrabić?"
 
-#: gajim/gtk/accounts.py:997
+#: gajim/gtk/accounts.py:1000
 #, fuzzy
 msgid "Remove only from Gajim"
 msgstr "Vydal kont _tolki dla Gajim"
 
-#: gajim/gtk/accounts.py:998
+#: gajim/gtk/accounts.py:1001
 msgid "Don't remove anything. I'll try again later"
 msgstr ""
 
@@ -10912,6 +11208,10 @@ msgstr "Ja chaču dadać Vas u svoj śpis kantaktaŭ."
 msgid "Modify"
 msgstr "_Madyfikuj"
 
+#: gajim/gtk/roster_item_exchange.py:80
+msgid "JID"
+msgstr "JID"
+
 #: gajim/gtk/roster_item_exchange.py:86
 #, fuzzy
 msgid "Groups"
@@ -10938,50 +11238,29 @@ msgstr[0] "Vydalaje kantakt sa śpisu"
 msgstr[1] "Vydalaje kantakt sa śpisu"
 msgstr[2] "Vydalaje kantakt sa śpisu"
 
-#: gajim/gtk/util.py:581
+#: gajim/gtk/util.py:583
 msgid "Unknown Artist"
 msgstr ""
 
-#: gajim/gtk/util.py:582
+#: gajim/gtk/util.py:584
 msgid "Unknown Title"
 msgstr ""
 
-#: gajim/gtk/util.py:583
+#: gajim/gtk/util.py:585
 msgid "Unknown Source"
 msgstr ""
 
-#: gajim/gtk/util.py:585
+#: gajim/gtk/util.py:587
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
 "from <i>%(source)s</i>"
 msgstr ""
 
-#: gajim/gtk/bookmarks.py:121
-msgid "New Group Chat"
-msgstr "Novaja hrupavaja razmova"
-
-#: gajim/gtk/bookmarks.py:161
-msgid "This bookmark has invalid data"
-msgstr "Hetaja zakładka źmiaščaje niapravilnyja źviestki"
-
-#: gajim/gtk/bookmarks.py:162
-msgid ""
-"Please be sure to fill out server and room fields or remove this bookmark."
-msgstr ""
-"Kali łaska, pravier, ci vyznačanyja pali servera i pakoju, albo vydal hetuju "
-"zakładku."
-
-#: gajim/gtk/bookmarks.py:273 gajim/gtk/bookmarks.py:291
-#: gajim/gtk/bookmarks.py:304 gajim/gtk/bookmarks.py:335
-#, fuzzy
-msgid "Character not allowed"
-msgstr "Mianuška nie dazvolenaja: %s"
-
-#: gajim/gtk/bookmarks.py:334
-#, fuzzy
-msgid "Invalid room"
-msgstr "Niapravilny zapis"
+#: gajim/gtk/bookmarks.py:47
+#, fuzzy, python-format
+msgid "Bookmarks for %s"
+msgstr "_Stvary zakładku dla hetaja pakoju"
 
 #: gajim/plugins/pluginmanager.py:736 gajim/plugins/pluginmanager.py:742
 msgid "Archive corrupted"
@@ -10993,50 +11272,53 @@ msgid "Archive empty"
 msgstr "Ściežka da fajłu"
 
 #: gajim/plugins/pluginmanager.py:750 gajim/plugins/pluginmanager.py:758
-#: gajim/plugins/gui.py:257
+#: gajim/plugins/gui.py:258
 msgid "Archive is malformed"
 msgstr ""
 
-#: gajim/plugins/pluginmanager.py:766 gajim/plugins/gui.py:281
-#: gajim/plugins/gui.py:289
+#: gajim/plugins/pluginmanager.py:766 gajim/plugins/gui.py:288
+#: gajim/plugins/gui.py:301
 #, fuzzy
 msgid "Plugin already exists"
 msgstr "Hety fajł užo isnuje"
 
-#: gajim/plugins/gui.py:82
+#: gajim/plugins/gui.py:83
 msgid "Click to view Gajim's wiki page on how to install plugins in Flatpak."
 msgstr ""
 
-#: gajim/plugins/gui.py:89
+#: gajim/plugins/gui.py:90
 msgid "Plugin"
 msgstr ""
 
-#: gajim/plugins/gui.py:151
+#: gajim/plugins/gui.py:152
 #, fuzzy, python-format
 msgid "Warning: %s"
 msgstr "Blakavańnie %s"
 
-#: gajim/plugins/gui.py:206
+#: gajim/plugins/gui.py:207
 #, fuzzy
 msgid "Plugin failed"
 msgstr "Niemahvyma dałučycca"
 
-#: gajim/plugins/gui.py:245
+#: gajim/plugins/gui.py:246
 msgid "Unable to properly remove the plugin"
 msgstr ""
 
-#: gajim/plugins/gui.py:281
-msgid "Overwrite?"
-msgstr ""
+#: gajim/plugins/gui.py:287
+#, fuzzy
+msgid "Overwrite Plugin?"
+msgstr "Paviedamleńnie statusu"
+
+#: gajim/plugins/gui.py:289
+#, fuzzy
+msgid "Do you want to overwrite the currently installed version?"
+msgstr "%s choča dasłać tabie fajł:"
 
 #: data/org.gajim.Gajim.desktop.in:5
-msgid "Jabber IM Client"
+#, fuzzy
+msgid "XMPP IM Client"
 msgstr "Klijent kamunikacyi dla Jabber"
 
-#: data/org.gajim.Gajim.desktop.in:6
-msgid "A GTK+ Jabber client"
-msgstr "Klijent Jabber dla GTK+"
-
 #: data/org.gajim.Gajim.desktop.in:8
 msgid "chat;messaging;im;xmpp;bonjour;voip;"
 msgstr ""
@@ -11088,7 +11370,7 @@ msgid "Easily send pictures, videos or other files to friends and groups"
 msgstr ""
 
 #: data/org.gajim.Gajim.appdata.xml.in:27
-msgid "Chat securely with End-to-End encryption via OMEMO or PGP"
+msgid "Chat securely with End-to-End encryption via OMEMO or OpenPGP"
 msgstr ""
 
 #: data/org.gajim.Gajim.appdata.xml.in:28
@@ -11149,7 +11431,7 @@ msgstr ""
 
 #: data/org.gajim.Gajim.appdata.xml.in:52
 #, fuzzy
-msgid "Roster, list of contacts"
+msgid "Contact list, list of contacts"
 msgstr "_Zachoŭvać u žurnale źmieny statusu kantaktaŭ"
 
 #: data/org.gajim.Gajim.appdata.xml.in:56
@@ -11171,6 +11453,489 @@ msgstr "Niadaŭna:"
 msgid "Plugin manager"
 msgstr "Niemahvyma dałučycca"
 
+#, fuzzy
+#~ msgid "Configure Services…"
+#~ msgstr "_Šukaj servisy..."
+
+#, fuzzy
+#~ msgid "Group Chat Bookmarks"
+#~ msgstr "Групавая размова"
+
+#, fuzzy
+#~ msgid "Add Bookmark"
+#~ msgstr "_Stvary zakładku dla hetaja pakoju"
+
+#, fuzzy
+#~ msgid "Remove Bookmark"
+#~ msgstr "_Stvary zakładku dla hetaja pakoju"
+
+#, fuzzy
+#~ msgid "Bookmark Name"
+#~ msgstr "_Stvary zakładku dla hetaja pakoju"
+
+#, fuzzy
+#~ msgid "_Server"
+#~ msgstr "_Server:"
+
+#, fuzzy
+#~ msgid "_Password"
+#~ msgstr "_Parol:"
+
+#, fuzzy
+#~ msgid "Join chat when connected"
+#~ msgstr "Kantakt adłučyŭsia"
+
+#~ msgid "New Group Chat"
+#~ msgstr "Novaja hrupavaja razmova"
+
+#~ msgid "This bookmark has invalid data"
+#~ msgstr "Hetaja zakładka źmiaščaje niapravilnyja źviestki"
+
+#, fuzzy
+#~ msgid ""
+#~ "Please be sure to fill out server and group chat fields or remove this "
+#~ "bookmark."
+#~ msgstr ""
+#~ "Kali łaska, pravier, ci vyznačanyja pali servera i pakoju, albo vydal "
+#~ "hetuju zakładku."
+
+#, fuzzy
+#~ msgid "Character not allowed"
+#~ msgstr "Mianuška nie dazvolenaja: %s"
+
+#, fuzzy
+#~ msgid "Invalid Group Chat"
+#~ msgstr "Niapravilny JID pakoju"
+
+#~ msgid "Unable to join group chat"
+#~ msgstr "Niemahčyma dałučycca da pakoju"
+
+#, fuzzy
+#~ msgid "You are banned from group chat <b>%s</b>."
+#~ msgstr "Ty zablakavany ŭ hetym pakoji."
+
+#, fuzzy
+#~ msgid "Remote server <b>%s</b> does not exist."
+#~ msgstr "Takoha pakoju niama."
+
+#, fuzzy
+#~ msgid "Group chat <b>%s</b> does not exist."
+#~ msgstr "Takoha pakoju niama."
+
+#, fuzzy
+#~ msgid "Group chat creation is not permitted."
+#~ msgstr "Stvareńnie pakojaŭ abmiežavanaje."
+
+#, fuzzy
+#~ msgid "You must use your registered nickname in <b>%s</b>."
+#~ msgstr "Treba karystacca zarehistravanaj na siabie mianuškaj."
+
+#, fuzzy
+#~ msgid "You are not in the members list in group chat %s."
+#~ msgstr "Ciabie niama ŭ śpisie ŭdzielnikaŭ."
+
+#, fuzzy
+#~ msgid "XMPP Address is not a group chat"
+#~ msgstr "Heta nie pakoj"
+
+#~ msgid "This is not a group chat"
+#~ msgstr "Heta nie pakoj"
+
+#, fuzzy
+#~ msgid "Please choose a group chat"
+#~ msgstr "Stvary novy zapis"
+
+#, fuzzy
+#~ msgid "Invalid Nickname"
+#~ msgstr "Niapravilnaje imia karystalnika"
+
+#, fuzzy
+#~ msgid "Please choose a nickname"
+#~ msgstr "Stvary novy zapis"
+
+#, fuzzy
+#~ msgid "Wrong server"
+#~ msgstr "Niapravilnaja spasyłka"
+
+#, fuzzy
+#~ msgid "%s is not a group chat server"
+#~ msgstr "Heta nie pakoj"
+
+#, fuzzy
+#~ msgid "A Password is required to join the group chat %s. Please type it."
+#~ msgstr "Treba ŭvieści parol, kab dałučycca da pakoju."
+
+#~ msgid "Not in Roster"
+#~ msgstr "Niama ŭ śpisie"
+
+#~ msgid "I would like to add you to my roster"
+#~ msgstr "Ja chaču dadać ciabie da svajho śpisu kantaktaŭ"
+
+#, fuzzy
+#~ msgid "Add to Roster"
+#~ msgstr "_Dadaj u śpis kantaktaŭ"
+
+#, fuzzy
+#~ msgid "Manage Room"
+#~ msgstr "Kiruj zakładkami"
+
+#, fuzzy
+#~ msgid "Configure Room"
+#~ msgstr "Kanfihuruj _pakoj"
+
+#, fuzzy
+#~ msgid "Destroy Room"
+#~ msgstr "Apisańnie: %s"
+
+#, fuzzy
+#~ msgid "Change Nick"
+#~ msgstr "Źmiani _mianušku"
+
+#, fuzzy
+#~ msgid "Disconnect"
+#~ msgstr "Kantakt adłučyŭsia"
+
+#, fuzzy
+#~ msgid "Copy JID"
+#~ msgstr "Pakoj:"
+
+#, fuzzy
+#~ msgid "Add to Roster…"
+#~ msgstr "_Dadaj u śpis kantaktaŭ"
+
+#, fuzzy
+#~ msgid "Copy JID/Email"
+#~ msgstr "S_kapijuj JID/Email"
+
+#, fuzzy
+#~ msgid "JID: <i>%s</i>"
+#~ msgstr "JID: <i>%s</i>"
+
+#~ msgid "Changing Subject"
+#~ msgstr "Źmianiajecca tema"
+
+#~ msgid "Please specify the new subject:"
+#~ msgstr "Kali łaska, vyznač novuju temu:"
+
+#, fuzzy
+#~ msgid "You (%s) joined the room"
+#~ msgstr "%s dałučyŭsia da pakoju"
+
+#, fuzzy
+#~ msgid "Unable to join groupchat"
+#~ msgstr "Niemahčyma dałučycca da pakoju"
+
+#~ msgid "Groupchat Invitation"
+#~ msgstr "Zaprašeńnie ŭ pakoj"
+
+#, fuzzy
+#~ msgid "%(jid)s has been invited in this room"
+#~ msgstr "%(who)s vypchnuŭ %(nick)s: %(reason)s"
+
+#, fuzzy
+#~ msgid "JID is not a Groupchat"
+#~ msgstr "Heta nie pakoj"
+
+#~ msgid "Invalid JID"
+#~ msgstr "Niapravilny JID"
+
+#~ msgid "A connection is not available"
+#~ msgstr "Złučeńnie niemahčymaje"
+
+#, fuzzy
+#~ msgid "JID already in list"
+#~ msgstr "Klijent kamunikacyi dla Jabber"
+
+#, fuzzy
+#~ msgid "For the chosen encryption there is no encryption method available"
+#~ msgstr "Złučeńnie niemahčymaje"
+
+#~ msgid "Removes contact from roster"
+#~ msgstr "Vydalaje kantakt sa śpisu"
+
+#~ msgid "Not in roster"
+#~ msgstr "Niama ŭ śpisie kantaktaŭ"
+
+#, fuzzy
+#~ msgid "Contact signed in notification color."
+#~ msgstr "_Pakazvaj padzieju ŭ śpisie kantaktaŭ"
+
+#, fuzzy
+#~ msgid "Contact signout notification color"
+#~ msgstr "_Pakazvaj padzieju ŭ śpisie kantaktaŭ"
+
+#, fuzzy
+#~ msgid "File transfer request notification color."
+#~ msgstr "Zapyt na pieradaču fajłu"
+
+#, fuzzy
+#~ msgid "File transfer error notification color."
+#~ msgstr "Pieradača fajłu anulavana"
+
+#, fuzzy
+#~ msgid "File transfer complete or stopped notification color."
+#~ msgstr "Pakažy nahadvańnie ŭ vypłyŭnym aknie pa zakančeńni pieradačy fajła"
+
+#, fuzzy
+#~ msgid "Groupchat invitation notification color"
+#~ msgstr "Zaprašeńnie ŭ pakoj"
+
+#~ msgid "Add * and [n] in roster title?"
+#~ msgstr "Dadać * i [n] u zahałovak śpisu kantaktaŭ?"
+
+#~ msgid "Hides the banner in two persons chat window"
+#~ msgstr "Chavaje baner u aknie pryvatnaj razmovy"
+
+#, fuzzy
+#~ msgid ""
+#~ "Show the confirm metacontacts creation dialog or not? Empty string means "
+#~ "never show the dialog."
+#~ msgstr ""
+#~ "Ci treba pakazvać akno paćvierdžańnia pry stvareńni metakantaktu? Pusty "
+#~ "radok aznačaje, što hetaje akno nikoli nia budzie pakazvacca."
+
+#, fuzzy
+#~ msgid "Language for which misspelled words will be checked"
+#~ msgstr "Mova, dla jakoj treba praviarać pravapis"
+
+#~ msgid "I'm eating, so leave me a message."
+#~ msgstr "Ja jem, možaš pakinuć mnie paviedamleńnie."
+
+#, fuzzy
+#~ msgid "from room %s"
+#~ msgstr "Я %s"
+
+#~ msgid "Leave Groupchats"
+#~ msgstr "Pakiń pakoji"
+
+#, fuzzy
+#~ msgid "Auto Join"
+#~ msgstr "Aŭtamatyčna dałučajsia"
+
+#, fuzzy
+#~ msgid "Room"
+#~ msgstr "Pakoj:"
+
+#~ msgid "Jabber ID:"
+#~ msgstr "JID:"
+
+#, fuzzy
+#~ msgid "Occupant Actions"
+#~ msgstr "_Dziejańni haspadara"
+
+#~ msgid "_Add to Roster"
+#~ msgstr "_Dadaj u śpis kantaktaŭ"
+
+#, fuzzy
+#~ msgid "_Manage Room"
+#~ msgstr "Kiruj zakładkami"
+
+#, fuzzy
+#~ msgid "Configure _Room..."
+#~ msgstr "Kanfihuruj _pakoj"
+
+#, fuzzy
+#~ msgid "_Destroy Room"
+#~ msgstr "Apisańnie: %s"
+
+#, fuzzy
+#~ msgid "Jabber ID"
+#~ msgstr "JID:"
+
+#, fuzzy
+#~ msgid "account"
+#~ msgstr "Kont"
+
+#, fuzzy
+#~ msgid "Roster"
+#~ msgstr "Pakažy _śpis kantaktaŭ"
+
+#, fuzzy
+#~ msgid "Show only in roster"
+#~ msgstr "Pakazvaj tolki ŭ śpisie _kantaktaŭ"
+
+#, fuzzy
+#~ msgid "in _roster"
+#~ msgstr "Niama ŭ śpisie kantaktaŭ"
+
+#, fuzzy
+#~ msgid "Roster Appearance"
+#~ msgstr "<b>Redahuj praviła</b>"
+
+#, fuzzy
+#~ msgid "Show chatstate in roster"
+#~ msgstr "Pakazvaj a_vatary kantaktaŭ u śpisie kantaktaŭ"
+
+#, fuzzy
+#~ msgid "_Add to Roster..."
+#~ msgstr "_Dadaj u śpis kantaktaŭ"
+
+#~ msgid "_Jabber ID:"
+#~ msgstr "_Jabber ID:"
+
+#, fuzzy
+#~ msgid "_Jabber ID"
+#~ msgstr "_Jabber ID:"
+
+#~ msgid "JabberID"
+#~ msgstr "JID"
+
+#, fuzzy
+#~ msgid "Show Roster"
+#~ msgstr "Pakažy _śpis kantaktaŭ"
+
+#, fuzzy
+#~ msgid "MUC server"
+#~ msgstr "Naziralniki"
+
+#~ msgid "Room Configuration"
+#~ msgstr "Kanfihuracyja pakoju"
+
+#~ msgid "Join _Group Chat"
+#~ msgstr "Dałučysia da _pakoju"
+
+#, fuzzy
+#~ msgid "Audio sessions are not available"
+#~ msgstr "Złučeńnie niemahčymaje"
+
+#~ msgid "Conference"
+#~ msgstr "Kanferencyja"
+
+#, fuzzy
+#~ msgid "_Manage Bookmarks…"
+#~ msgstr "Kiruj zakładkami"
+
+#, fuzzy
+#~ msgid "Hide _Roster"
+#~ msgstr "Niama ŭ śpisie kantaktaŭ"
+
+#~ msgid "Show _Roster"
+#~ msgstr "Pakažy _śpis kantaktaŭ"
+
+#, fuzzy
+#~ msgid "Invalid Room"
+#~ msgstr "Niapravilny zapis"
+
+#, fuzzy
+#~ msgid "Invalid room"
+#~ msgstr "Niapravilny zapis"
+
+#~ msgid "A GTK+ Jabber client"
+#~ msgstr "Klijent Jabber dla GTK+"
+
+#~ msgid "Changing Nickname"
+#~ msgstr "Źmianiajecca mianuška"
+
+#~ msgid "Please specify the new nickname you want to use:"
+#~ msgstr "Kali łaska, vyznač dla siabie novuju mianušku:"
+
+#~ msgid "Bookmark already set"
+#~ msgstr "Zakładka ŭžo dadana"
+
+#, fuzzy
+#~ msgid "Group Chat '%s' is already in your bookmarks."
+#~ msgstr "Pakoj \"%s\" užo jość u tvajich zakładkach."
+
+#~ msgid "Bookmark has been added successfully"
+#~ msgstr "Zakładka paśpiachova dadanaja"
+
+#, fuzzy
+#~ msgid ""
+#~ "You can manage your bookmarks by clicking the Bookmarks menu item in your "
+#~ "contact list."
+#~ msgstr ""
+#~ "Možaš kiravać svajimi zakładkami praz menu \"Dziejańni\" śpisu kantaktaŭ."
+
+#, fuzzy
+#~ msgid "The nickname contains invalid characters."
+#~ msgstr "JID pakoju ŭtrymlivaje niedazvolenyja znaki."
+
+#, fuzzy
+#~ msgid "Bookmark Room"
+#~ msgstr "_Stvary zakładku dla hetaja pakoju"
+
+#~ msgid "_Join New Group Chat"
+#~ msgstr "_Dałučysia da pakoju"
+
+#, fuzzy
+#~ msgid "_Create Group Chat"
+#~ msgstr "Pakiń pakoji"
+
+#~ msgid "Name:"
+#~ msgstr "Nazva:"
+
+#, fuzzy
+#~ msgid "Description:"
+#~ msgstr "Apisańnie: %s"
+
+#, fuzzy
+#~ msgid "Address:"
+#~ msgstr "_Adras:"
+
+#, fuzzy
+#~ msgid "You can not start a new conversation unless you are connected."
+#~ msgstr ""
+#~ "Niemahčyma ŭdzielničać u hrupavoj razmovie, nie dałučyŭšysia da servera."
+
+#, fuzzy
+#~ msgid "Occupants"
+#~ msgstr "_Dziejańni haspadara"
+
+#, fuzzy
+#~ msgid "File transfer error"
+#~ msgstr "Pamyłka pieradačy fajłu"
+
+#, fuzzy
+#~ msgid "No Accounts available"
+#~ msgstr "Konty niedastupnyja"
+
+#~ msgid "_Modify Account..."
+#~ msgstr "_Madyfikuj kont..."
+
+#~ msgid "Boolean"
+#~ msgstr "Lahičnaja źmiennaja"
+
+#~ msgid "Integer"
+#~ msgstr "Cely lik"
+
+#~ msgid "Text"
+#~ msgstr "Tekst"
+
+#~ msgid "Value"
+#~ msgstr "Vartaść"
+
+#~ msgid "Type"
+#~ msgstr "Typ"
+
+#~ msgid "(None)"
+#~ msgstr "(Niama)"
+
+#~ msgid "Hidden"
+#~ msgstr "Schavany"
+
+#~ msgid "Manage Proxy Profiles"
+#~ msgstr "Kiruj profilami proxy"
+
+#, fuzzy
+#~ msgid "Properties"
+#~ msgstr "<b>Ułaścivaści</b>"
+
+#, fuzzy
+#~ msgid "Proxy _Host"
+#~ msgstr "Proxy:"
+
+#, fuzzy
+#~ msgid "Proxy _Port"
+#~ msgstr "_Port:"
+
+#, fuzzy
+#~ msgid "New Groupchat"
+#~ msgstr "Novaja hrupavaja razmova"
+
+#, fuzzy
+#~ msgid "New Contact"
+#~ msgstr "Dadaj novy kantakt"
+
 #~ msgid "%s GiB"
 #~ msgstr "%s GiB"
 
@@ -11250,9 +12015,6 @@ msgstr "Niemahvyma dałučycca"
 #~ msgid "_Pause"
 #~ msgstr "_Prypyni"
 
-#~ msgid "Clean _up"
-#~ msgstr "Pry_biarysia"
-
 #~ msgid "Remove file transfer from the list."
 #~ msgstr "Vydal pieradaču fajła ź śpisu."
 
@@ -11646,10 +12408,6 @@ msgstr "Niemahvyma dałučycca"
 #~ msgid "You are invited to a groupchat"
 #~ msgstr "Ty nie dałučyŭsia da pakoju."
 
-#, fuzzy
-#~ msgid "Do you want to accept the invitation?"
-#~ msgstr "%s choča dasłać tabie fajł:"
-
 #~ msgid "_Start Chat"
 #~ msgstr "_Pačni razmovu"
 
@@ -11822,10 +12580,6 @@ msgstr "Niemahvyma dałučycca"
 #~ msgid "Nick"
 #~ msgstr "Mianuška"
 
-#, fuzzy
-#~ msgid "Banning…"
-#~ msgstr "Blakavańnie..."
-
 #~ msgid ""
 #~ "<b>Whom do you want to ban?</b>\n"
 #~ "\n"
@@ -11895,13 +12649,6 @@ msgstr "Niemahvyma dałučycca"
 #~ msgstr "Filter:"
 
 #, fuzzy
-#~ msgid ""
-#~ "If checked, Gajim will display the mood of contacts in the roster window"
-#~ msgstr ""
-#~ "Kali ŭklučanaja hetaja opcyja, Gajim budzie pakazvać avatary kantaktaŭ u "
-#~ "śpisie kantaktaŭ i ŭ pakojach"
-
-#, fuzzy
 #~ msgid "<b>Chat Appearance</b>"
 #~ msgstr "<b>Redahuj praviła</b>"
 
@@ -12143,10 +12890,6 @@ msgstr "Niemahvyma dałučycca"
 #~ msgstr "Pa_viedamleńnie statusu:"
 
 #, fuzzy
-#~ msgid "Group chat highlight"
-#~ msgstr "Padśviatleńnie paviedamleńnia ŭ pakoji"
-
-#, fuzzy
 #~ msgid "Your nickname"
 #~ msgstr "П_ерад мянушкай:"
 
@@ -12309,9 +13052,6 @@ msgstr "Niemahvyma dałučycca"
 #~ msgid "The passwords typed in both fields must be identical."
 #~ msgstr "Parolu ŭ abodvuch palach nie pavinny roźnicca."
 
-#~ msgid "Enter new password:"
-#~ msgstr "Uviadzi novy parol:"
-
 #~ msgid "Enter it again for confirmation:"
 #~ msgstr "Paŭtary parol dla paćvierdžańnia:"
 
@@ -12327,10 +13067,6 @@ msgstr "Niemahvyma dałučycca"
 #~ msgstr "zapyt adpiski ad %s"
 
 #, fuzzy
-#~ msgid "Autojoin"
-#~ msgstr "Aŭtamatyčna dałučajsia"
-
-#, fuzzy
 #~ msgid "Homepage:"
 #~ msgstr "Chatniaja staronka:"
 
@@ -12424,9 +13160,6 @@ msgstr "Niemahvyma dałučycca"
 #~ msgid "Forward unread message then disconnect"
 #~ msgstr "%d niečytanaje paviedamleńnie"
 
-#~ msgid "AIM Address:"
-#~ msgstr "Adras AIM:"
-
 #~ msgid "MSN Address:"
 #~ msgstr "Adras MSN:"
 
@@ -12655,9 +13388,6 @@ msgstr "Niemahvyma dałučycca"
 #~ msgid "Server:"
 #~ msgstr "Server:"
 
-#~ msgid "Password:"
-#~ msgstr "Parol:"
-
 #, fuzzy
 #~ msgid "Join this room _automatically when I connect"
 #~ msgstr "Dałučajsia da hetaha pakoju aŭtamatyčna pry kožnym złučeńni"
@@ -12674,10 +13404,6 @@ msgstr "Niemahvyma dałučycca"
 #~ msgid "Requires gnome-network-manager"
 #~ msgstr "Kiraŭnik žurnałaŭ"
 
-#, fuzzy
-#~ msgid "This contact does not support file transfer."
-#~ msgstr "Śpis dziejnych, skončanych i spynienych pieradačaŭ fajłaŭ"
-
 #~ msgid ""
 #~ "You have to install %s dictionary to use spellchecking, or choose another "
 #~ "language by setting the speller_language option."
@@ -12946,9 +13672,6 @@ msgstr "Niemahvyma dałučycca"
 #~ msgid "_Edit Personal Information..."
 #~ msgstr "Źmiani asabistyja źviestki..."
 
-#~ msgid "Information about you, as stored in the server"
-#~ msgstr "Źviestki pra ciabie, jakija zachoŭvajucca na servery"
-
 #~ msgid "<b>Personal Information</b>"
 #~ msgstr "<b>Asabistyja źviestki</b>"
 
@@ -12989,11 +13712,6 @@ msgstr "Niemahvyma dałučycca"
 #~ msgid "Account Name Already Used"
 #~ msgstr "Taki kont užo zaniaty"
 
-#~ msgid ""
-#~ "This name is already used by another of your accounts. Please choose "
-#~ "another name."
-#~ msgstr "Kont z takoj nazvaj užo zaniaty. Kali łaska, abiary inšuju nazvu."
-
 #~ msgid "Invalid account name"
 #~ msgstr "Niapravilnaja nazva kontu"
 
@@ -13029,9 +13747,6 @@ msgstr "Niemahvyma dałučycca"
 #~ msgid "Your server can't save your personal information."
 #~ msgstr "Server nia moža zachoŭvać asabistyja źviestki."
 
-#~ msgid "Account Local already exists."
-#~ msgstr "Kont Local užo isnuje."
-
 #~ msgid "Please rename or remove it before enabling link-local messaging."
 #~ msgstr ""
 #~ "Kali łaska, źmiani nazvu albo vydal jaho pierad uklučeńniem miascovych "
@@ -13107,10 +13822,6 @@ msgstr "Niemahvyma dałučycca"
 #~ msgid "The following message was NOT encrypted"
 #~ msgstr "[Hetaje paviedamleńnie zašyfravanaje]"
 
-#, fuzzy
-#~ msgid "Encryption used for this contact."
-#~ msgstr "Ci vykarystoŭvajecca šyfravańnie OpenPGP dla hetaha kantaktu?"
-
 #~ msgid "Toggle Open_PGP Encryption"
 #~ msgstr "Uklučy/Adklučy šyfravańnie Open_PGP"
 
@@ -13179,10 +13890,6 @@ msgstr "Niemahvyma dałučycca"
 #~ msgid "Add _Contact..."
 #~ msgstr "_Dadaj kantakt..."
 
-#, fuzzy
-#~ msgid "_Accounts"
-#~ msgstr "Konty"
-
 #~ msgid "Profile, A_vatar"
 #~ msgstr "Profil, a_vatar"
 
@@ -13379,14 +14086,6 @@ msgstr "Niemahvyma dałučycca"
 #~ msgstr "Dziejny"
 
 #, fuzzy
-#~ msgid "Join _Group Chat..."
-#~ msgstr "Dałučysia da _pakoju"
-
-#, fuzzy
-#~ msgid "_Modify Account"
-#~ msgstr "Madyfikuj kont"
-
-#, fuzzy
 #~ msgid "Check on startup if Gajim is the _default Jabber client"
 #~ msgstr ""
 #~ "Zaŭsiody pry starcie praviaraj, ci pryznačany Gajim _zmoŭčanym klijentam "
@@ -13922,9 +14621,6 @@ msgstr "Niemahvyma dałučycca"
 #~ msgid "Nickname not found: %s"
 #~ msgstr "Mianuška nia znojdziena: %s"
 
-#~ msgid "This group chat has no subject"
-#~ msgstr "Dla hetaha pakoju nie akreślena tema"
-
 #, fuzzy
 #~ msgid ""
 #~ "Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
@@ -13999,9 +14695,6 @@ msgstr "Niemahvyma dałučycca"
 #~ "Pstykni, kab pahladzieć zdolnaści serveraŭ Jabber (naprykład, šluzy MSN, "
 #~ "ICQ)"
 
-#~ msgid "_Host:"
-#~ msgstr "_Host:"
-
 #~ msgid "Modify Account"
 #~ msgstr "Madyfikuj kont"
 
@@ -14304,9 +14997,6 @@ msgstr "Niemahvyma dałučycca"
 #~ msgid "Basc"
 #~ msgstr "Basckaja"
 
-#~ msgid "Private Chat"
-#~ msgstr "Прыватная размова"
-
 #~ msgid "invisible"
 #~ msgstr "нябачны"
 
@@ -14322,9 +15012,6 @@ msgstr "Niemahvyma dałučycca"
 #~ msgid "Soliloquy"
 #~ msgstr "Маналог"
 
-#~ msgid "A_fter nickname:"
-#~ msgstr "_Пасля мянушкі:"
-
 #~ msgid "_After time:"
 #~ msgstr "_Праз пэўны час:"
 
diff --git a/po/bg.po b/po/bg.po
index 0dcb64d71..149eaa2ae 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: 2019-07-02 02:06+0000\n"
+"POT-Creation-Date: 2019-08-11 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,71 +18,71 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: gajim/chat_control_base.py:550
+#: gajim/chat_control_base.py:557
 msgid "_Undo"
 msgstr ""
 
-#: gajim/chat_control_base.py:558 gajim/conversation_textview.py:529
+#: gajim/chat_control_base.py:565 gajim/conversation_textview.py:529
 msgid "_Clear"
 msgstr ""
 
-#: gajim/chat_control_base.py:563
+#: gajim/chat_control_base.py:570
 msgid "Paste as quote"
 msgstr ""
 
-#: gajim/chat_control_base.py:613
+#: gajim/chat_control_base.py:620
 #, fuzzy
 msgid "Paste Image"
 msgstr "Избор на изображение"
 
-#: gajim/chat_control_base.py:614
+#: gajim/chat_control_base.py:621
 #, fuzzy
 msgid "You are trying to paste an image"
 msgstr "Не сте свързани към сървъра."
 
-#: gajim/chat_control_base.py:615
+#: gajim/chat_control_base.py:622
 #, fuzzy
 msgid ""
 "Are you sure you want to paste your clipboard's image into the chat window?"
 msgstr "Сигурни ли сте, че искате да напуснете стаята „%s“?"
 
-#: gajim/chat_control_base.py:617 gajim/groupchat_control.py:2310
-#: gajim/roster_window.py:2848 gajim/roster_window.py:4167
-#: gajim/message_window.py:252 gajim/gtk/dialogs.py:418
+#: gajim/chat_control_base.py:624 gajim/groupchat_control.py:2218
+#: gajim/roster_window.py:2841 gajim/roster_window.py:4118
+#: gajim/message_window.py:359 gajim/gtk/dialogs.py:330
 #, fuzzy
 msgid "_Do not ask me again"
 msgstr "Да _не се задава този въпрос отново"
 
-#: gajim/chat_control_base.py:620
+#: gajim/chat_control_base.py:627
 msgid "_Paste"
 msgstr ""
 
-#: gajim/chat_control_base.py:1162 gajim/gtk/accounts.py:351
+#: gajim/chat_control_base.py:1169 gajim/gtk/accounts.py:354
 #, fuzzy
 msgid "Privacy"
 msgstr "Филтър за уединение"
 
-#: gajim/chat_control_base.py:1163
+#: gajim/chat_control_base.py:1170
 #, fuzzy
 msgid "Warning"
 msgstr "Отлъчване на %s"
 
-#: gajim/chat_control_base.py:1164
+#: gajim/chat_control_base.py:1171
 #, fuzzy, python-format
 msgid "If you send a file to <b>%s</b>, your real JID will be revealed."
 msgstr "Ако изпратите файл на %s, той/тя ще разбере истинския ви Jabber ID."
 
-#: gajim/chat_control_base.py:1169
+#: gajim/chat_control_base.py:1176
 #, fuzzy
 msgid "Continue"
 msgstr "П_родължаване"
 
-#: gajim/gtkgui_helpers.py:163 gajim/gtk/filetransfer.py:393
+#: gajim/gtkgui_helpers.py:163 gajim/gtk/filetransfer.py:398
 #, fuzzy, python-format
 msgid "Cannot overwrite existing file '%s'"
 msgstr "Неуспех при презаписването на съществуващия файл „%s“"
 
-#: gajim/gtkgui_helpers.py:164 gajim/gtk/filetransfer.py:394
+#: gajim/gtkgui_helpers.py:164 gajim/gtk/filetransfer.py:399
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
@@ -176,390 +176,398 @@ msgstr "Няма чакащо запитване за записване."
 msgid " resource with priority "
 msgstr " ресурс с приоритет "
 
-#: gajim/gui_menu_builder.py:96
-msgid "_New Group Chat"
-msgstr "_Нова стая"
+#: gajim/gui_menu_builder.py:251 gajim/gui_menu_builder.py:342
+#: gajim/chat_control.py:305 gajim/roster_window.py:783
+#: gajim/roster_window.py:1716 gajim/roster_window.py:1718
+#: gajim/roster_window.py:2027 gajim/roster_window.py:3292
+#: gajim/roster_window.py:3325 gajim/gui_interface.py:396
+#: gajim/common/contacts.py:222 gajim/common/contacts.py:359
+#: gajim/common/contacts.py:471 gajim/common/helpers.py:86
+#: gajim/common/helpers.py:317 gajim/gtk/add_contact.py:319
+#: gajim/gtk/subscription_request.py:70 gajim/gtk/subscription_request.py:99
+#: gajim/gtk/roster_item_exchange.py:112
+#, fuzzy
+msgid "Not in contact list"
+msgstr "Показване на изкл_ючените контакти"
 
-#: gajim/gui_menu_builder.py:289 gajim/gui_menu_builder.py:380
-#: gajim/chat_control.py:303 gajim/roster_window.py:786
-#: gajim/roster_window.py:1719 gajim/roster_window.py:1721
-#: gajim/roster_window.py:2030 gajim/roster_window.py:3336
-#: gajim/roster_window.py:3369 gajim/gui_interface.py:413
-#: gajim/common/contacts.py:206 gajim/common/contacts.py:343
-#: gajim/common/helpers.py:83 gajim/common/helpers.py:311
-#: gajim/gtk/add_contact.py:319 gajim/gtk/subscription_request.py:70
-#: gajim/gtk/subscription_request.py:99 gajim/gtk/roster_item_exchange.py:112
-msgid "Not in Roster"
-msgstr "Не е в списъка"
-
-#: gajim/gui_menu_builder.py:393
-msgid "I would like to add you to my roster"
-msgstr ""
-"Бих искал(а) да Ви добавя към списъка си. I would like to add you to my "
-"roster."
+#: gajim/gui_menu_builder.py:355
+#, fuzzy
+msgid "I would like to add you to my contact list"
+msgstr "Бих искал(а) да ви добавя към списъка си."
 
-#: gajim/gui_menu_builder.py:471
+#: gajim/gui_menu_builder.py:433
 #, fuzzy
 msgid "Send Single _Message…"
 msgstr "Изпращане на _еднократно съобщение"
 
-#: gajim/gui_menu_builder.py:486
+#: gajim/gui_menu_builder.py:448
 #, fuzzy
 msgid "E_xecute Command…"
 msgstr "_Изпълнение на команда"
 
-#: gajim/gui_menu_builder.py:494
+#: gajim/gui_menu_builder.py:456
 msgid "_Manage Transport"
 msgstr "Управление на _транспорт"
 
-#: gajim/gui_menu_builder.py:500
+#: gajim/gui_menu_builder.py:462
 msgid "_Modify Transport"
 msgstr "Промяна на т_ранспорт"
 
-#: gajim/gui_menu_builder.py:507 gajim/roster_window.py:5046
+#: gajim/gui_menu_builder.py:469 gajim/roster_window.py:4985
 #, fuzzy
 msgid "_Rename…"
 msgstr "_Преименуване"
 
-#: gajim/gui_menu_builder.py:518 gajim/roster_window.py:5062
-#: gajim/roster_window.py:5177 gajim/data/gui/blocked_contacts_window.ui:52
+#: gajim/gui_menu_builder.py:480 gajim/roster_window.py:5001
+#: gajim/roster_window.py:5116 gajim/data/gui/blocked_contacts_window.ui:52
 #: gajim/data/gui/gc_occupants_menu.ui:148
 #: gajim/data/gui/contact_context_menu.ui:143
 msgid "_Unblock"
 msgstr "_Деблокиране"
 
-#: gajim/gui_menu_builder.py:521 gajim/roster_window.py:5067
-#: gajim/roster_window.py:5181 gajim/data/gui/gc_occupants_menu.ui:140
+#: gajim/gui_menu_builder.py:483 gajim/roster_window.py:5006
+#: gajim/roster_window.py:5120 gajim/data/gui/gc_occupants_menu.ui:140
 #: gajim/data/gui/contact_context_menu.ui:151
 msgid "_Block"
 msgstr "_Блокиране"
 
-#: gajim/gui_menu_builder.py:529 gajim/roster_window.py:5074
+#: gajim/gui_menu_builder.py:491 gajim/roster_window.py:5013
 #: gajim/data/gui/contact_context_menu.ui:181
 msgid "Remo_ve"
 msgstr "П_ремахване"
 
-#: gajim/gui_menu_builder.py:539 gajim/data/gui/contact_context_menu.ui:198
+#: gajim/gui_menu_builder.py:501 gajim/data/gui/contact_context_menu.ui:198
 msgid "_Information"
 msgstr "_Информация"
 
-#: gajim/gui_menu_builder.py:552
+#: gajim/gui_menu_builder.py:514
 #, fuzzy
 msgid "Save _As"
 msgstr "имам "
 
-#: gajim/gui_menu_builder.py:564 gajim/groupchat_control.py:501
-#: gajim/chat_control.py:340
+#: gajim/gui_menu_builder.py:526 gajim/groupchat_control.py:507
+#: gajim/chat_control.py:342
 #, fuzzy
 msgid "Send File…"
 msgstr "Изпращане на _файл"
 
-#: gajim/gui_menu_builder.py:565
+#: gajim/gui_menu_builder.py:527
 #, fuzzy
 msgid "Upload File…"
 msgstr "Запазване на файла като…"
 
-#: gajim/gui_menu_builder.py:566
+#: gajim/gui_menu_builder.py:528
 #, fuzzy
 msgid "Send File Directly…"
 msgstr "Запазване на файла като…"
 
-#: gajim/gui_menu_builder.py:568 gajim/gui_menu_builder.py:632
+#: gajim/gui_menu_builder.py:530 gajim/gui_menu_builder.py:596
 #, fuzzy
 msgid "Send Chatstate"
 msgstr "Последно състояние: %s"
 
-#: gajim/gui_menu_builder.py:569
+#: gajim/gui_menu_builder.py:531
 #, fuzzy
 msgid "Invite Contacts"
 msgstr "Покана на _контакти"
 
-#: gajim/gui_menu_builder.py:570
+#: gajim/gui_menu_builder.py:532
 #, fuzzy
-msgid "Add to Roster"
-msgstr "Добавяне към _списъка…"
+msgid "Add to Contact List"
+msgstr "_Добавяне на контакт…"
 
-#: gajim/gui_menu_builder.py:571
-msgid "Audio Session"
-msgstr ""
+#: gajim/gui_menu_builder.py:533
+#, fuzzy
+msgid "Voice Chat"
+msgstr "Запитване за файлов трансфер"
 
-#: gajim/gui_menu_builder.py:572
-msgid "Video Session"
-msgstr ""
+#: gajim/gui_menu_builder.py:534
+#, fuzzy
+msgid "Video Chat"
+msgstr "Лични разговори"
 
-#: gajim/gui_menu_builder.py:573
+#: gajim/gui_menu_builder.py:535 gajim/gui_menu_builder.py:582
 #, fuzzy
 msgid "Information"
 msgstr "_Информация"
 
-#: gajim/gui_menu_builder.py:574 gajim/gui_menu_builder.py:639
+#: gajim/gui_menu_builder.py:536 gajim/gui_menu_builder.py:602
 #: gajim/data/gui/application_menu.ui:37
 #, fuzzy
 msgid "History"
 msgstr "Ист_ория"
 
-#: gajim/gui_menu_builder.py:580 gajim/gui_menu_builder.py:687
+#: gajim/gui_menu_builder.py:542 gajim/gui_menu_builder.py:650
 #: gajim/data/gui/preferences_window.ui:1823
 msgid "Disabled"
 msgstr "Изключени"
 
-#: gajim/gui_menu_builder.py:581 gajim/gui_menu_builder.py:688
+#: gajim/gui_menu_builder.py:543 gajim/gui_menu_builder.py:651
 #, fuzzy
 msgid "Composing only"
 msgstr "Пише"
 
-#: gajim/gui_menu_builder.py:582 gajim/gui_menu_builder.py:689
+#: gajim/gui_menu_builder.py:544 gajim/gui_menu_builder.py:652
 #, fuzzy
 msgid "All chat states"
 msgstr "Всички състояния"
 
-#: gajim/gui_menu_builder.py:620
+#: gajim/gui_menu_builder.py:583
 #, fuzzy
-msgid "Manage Room"
-msgstr "_Управление на стаята"
+msgid "Manage Group Chat"
+msgstr "Излизане от стаите"
 
-#: gajim/gui_menu_builder.py:621
+#: gajim/gui_menu_builder.py:584 gajim/data/gui/groupchat_control.ui:649
 #, fuzzy
 msgid "Change Subject"
 msgstr "Промяна на _темата…"
 
-#: gajim/gui_menu_builder.py:622
+#: gajim/gui_menu_builder.py:585
 #, fuzzy
-msgid "Configure Room"
-msgstr "Настройки на _стаята…"
+msgid "Configure Group Chat"
+msgstr "Излизане от стаите"
 
-#: gajim/gui_menu_builder.py:623
+#: gajim/gui_menu_builder.py:586
 #, fuzzy
 msgid "Upload Avatar…"
 msgstr "Избор на изображение"
 
-#: gajim/gui_menu_builder.py:624
+#: gajim/gui_menu_builder.py:587
 #, fuzzy
-msgid "Destroy Room"
-msgstr "_Унищожаване на стаята"
+msgid "Destroy Group Chat"
+msgstr "Нова стая"
 
-#: gajim/gui_menu_builder.py:626 gajim/data/gui/preferences_window.ui:790
+#: gajim/gui_menu_builder.py:589 gajim/data/gui/preferences_window.ui:790
 #, fuzzy
 msgid "Chat Settings"
 msgstr "Неуспех при свързването"
 
-#: gajim/gui_menu_builder.py:627
+#: gajim/gui_menu_builder.py:590
 msgid "Show join/leave"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:628
+#: gajim/gui_menu_builder.py:591
 #, fuzzy
 msgid "Show status changes"
 msgstr "Запазване на промените на _състоянията на контактите"
 
-#: gajim/gui_menu_builder.py:629 gajim/data/gui/gc_control_popup_menu.ui:72
+#: gajim/gui_menu_builder.py:592 gajim/data/gui/gc_control_popup_menu.ui:72
 #, fuzzy
 msgid "Notify on all messages"
 msgstr "Настроени съобщения:"
 
-#: gajim/gui_menu_builder.py:630
+#: gajim/gui_menu_builder.py:593
 #, fuzzy
 msgid "Minimize on close"
 msgstr "_Минимизиране при затваряне"
 
-#: gajim/gui_menu_builder.py:631
+#: gajim/gui_menu_builder.py:595
 #, fuzzy
-msgid "Minimize on autojoin"
+msgid "Minimize when joining automatically"
 msgstr "Минимизиране при автоматично влизане"
 
-#: gajim/gui_menu_builder.py:634
+#: gajim/gui_menu_builder.py:598
 msgid "Sync Threshold"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:635
+#: gajim/gui_menu_builder.py:599
 #, fuzzy
-msgid "Change Nick"
+msgid "Change Nickname"
 msgstr "Смяна на псе_вдоним…"
 
-#: gajim/gui_menu_builder.py:636
-#, fuzzy
-msgid "Bookmark Room"
-msgstr "_Добавяне на стаята към отметките (Ctrl+B)"
-
-#: gajim/gui_menu_builder.py:637
+#: gajim/gui_menu_builder.py:600
 #, fuzzy
 msgid "Request Voice"
 msgstr "_Глас"
 
-#: gajim/gui_menu_builder.py:638 gajim/roster_window.py:5246
+#: gajim/gui_menu_builder.py:601 gajim/roster_window.py:5185
 #, fuzzy
 msgid "Execute command"
 msgstr "_Изпълнение на команда"
 
-#: gajim/gui_menu_builder.py:640
-#, fuzzy
-msgid "Disconnect"
-msgstr "_Изключване"
+#: gajim/gui_menu_builder.py:603
+msgid "Leave"
+msgstr ""
 
-#: gajim/gui_menu_builder.py:678 gajim/gtk/preferences.py:156
+#: gajim/gui_menu_builder.py:641 gajim/gtk/preferences.py:155
 msgid "No threshold"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:680 gajim/gtk/preferences.py:158
+#: gajim/gui_menu_builder.py:643 gajim/gtk/preferences.py:157
 #, fuzzy, python-format
 msgid "%i day"
 msgid_plural "%i days"
 msgstr[0] "Преди %i дни"
 msgstr[1] "Преди %i дни"
 
-#: gajim/gui_menu_builder.py:709 gajim/gui_menu_builder.py:747
-#: gajim/gtk/join_groupchat.py:43
-msgid "Join Group Chat"
-msgstr "Влизане в стая"
-
-#: gajim/gui_menu_builder.py:746
+#: gajim/gui_menu_builder.py:672
 #, fuzzy
 msgid "Add Contact…"
 msgstr "_Добавяне на контакт…"
 
-#: gajim/gui_menu_builder.py:748 gajim/gtk/profile.py:52
-#: gajim/gtk/accounts.py:770 gajim/gtk/accounts.py:808
+#: gajim/gui_menu_builder.py:673 gajim/gtk/profile.py:52
+#: gajim/gtk/accounts.py:773 gajim/gtk/accounts.py:811
 #, fuzzy
 msgid "Profile"
 msgstr "файл"
 
-#: gajim/gui_menu_builder.py:749
+#: gajim/gui_menu_builder.py:674
+#, fuzzy
+msgid "Send Single Message…"
+msgstr "Изпращане на _еднократно съобщение"
+
+#: gajim/gui_menu_builder.py:675
 #, fuzzy
 msgid "Discover Services"
 msgstr "_Откриване на услуги"
 
-#: gajim/gui_menu_builder.py:750
+#: gajim/gui_menu_builder.py:676 gajim/gtk/server_info.py:36
 #, fuzzy
-msgid "Send Single Message…"
-msgstr "Изпращане на _еднократно съобщение"
+msgid "Server Info"
+msgstr "Сървър"
 
-#: gajim/gui_menu_builder.py:751 gajim/data/gui/preferences_window.ui:2741
+#: gajim/gui_menu_builder.py:677 gajim/data/gui/preferences_window.ui:2741
 msgid "Advanced"
 msgstr "Напреднали"
 
-#: gajim/gui_menu_builder.py:752 gajim/gtk/mam_preferences.py:88
+#: gajim/gui_menu_builder.py:678 gajim/gtk/mam_preferences.py:88
 #, fuzzy
 msgid "Archiving Preferences"
 msgstr "_Настройки"
 
-#: gajim/gui_menu_builder.py:753
+#: gajim/gui_menu_builder.py:679
 #, fuzzy
 msgid "Blocking List"
 msgstr "Списък с отлъчени"
 
-#: gajim/gui_menu_builder.py:754 gajim/gtk/history_sync.py:108
+#: gajim/gui_menu_builder.py:680
+#, fuzzy
+msgid "Bookmarks"
+msgstr "_Добавяне на стаята към отметките"
+
+#: gajim/gui_menu_builder.py:681
+#, fuzzy
+msgid "PEP Configuration"
+msgstr "Настройки на стаята"
+
+#: gajim/gui_menu_builder.py:682 gajim/gtk/history_sync.py:108
 #: gajim/gtk/history_sync.py:186
 #, fuzzy
 msgid "Synchronise History"
 msgstr "Синхронизиране"
 
-#: gajim/gui_menu_builder.py:755 gajim/gtk/privacy_list.py:427
+#: gajim/gui_menu_builder.py:683 gajim/gtk/privacy_list.py:427
 msgid "Privacy Lists"
 msgstr "Филтри за уединение"
 
-#: gajim/gui_menu_builder.py:756 gajim/gtk/server_info.py:36
-#, fuzzy
-msgid "Server Info"
-msgstr "Сървър"
-
-#: gajim/gui_menu_builder.py:757 gajim/gui_menu_builder.py:768
+#: gajim/gui_menu_builder.py:685 gajim/gui_menu_builder.py:696
 #: gajim/data/gui/xml_console_window.ui:77
 msgid "XML Console"
 msgstr "XML конзола"
 
-#: gajim/gui_menu_builder.py:759 gajim/data/gui/groupchat_config.ui:36
+#: gajim/gui_menu_builder.py:687 gajim/data/gui/groupchat_config.ui:36
 #, fuzzy
 msgid "Admin"
 msgstr "_Администратор"
 
-#: gajim/gui_menu_builder.py:760
+#: gajim/gui_menu_builder.py:688
 #, fuzzy
 msgid "Send Server Message…"
 msgstr "_Изпращане на съобщение от сървъра…"
 
-#: gajim/gui_menu_builder.py:761
+#: gajim/gui_menu_builder.py:689
 #, fuzzy
 msgid "Set MOTD…"
 msgstr "Настройване на MOTD…"
 
-#: gajim/gui_menu_builder.py:762
+#: gajim/gui_menu_builder.py:690
 #, fuzzy
 msgid "Update MOTD…"
 msgstr "Актуализиране на MOTD…"
 
-#: gajim/gui_menu_builder.py:763
+#: gajim/gui_menu_builder.py:691
 #, fuzzy
 msgid "Delete MOTD…"
 msgstr "Изтриване на MOTD"
 
-#: gajim/gui_menu_builder.py:812
+#: gajim/gui_menu_builder.py:736
 #, fuzzy
-msgid "No Accounts available"
-msgstr "Няма наличен акаунт"
+msgid "_Add Account…"
+msgstr "_Добавяне на контакт…"
+
+#: gajim/gui_menu_builder.py:742
+#, fuzzy
+msgid "_Modify Accounts…"
+msgstr "_Промяна на акаунт"
 
-#: gajim/gui_menu_builder.py:823 gajim/data/gui/application_menu.ui:5
-#: gajim/data/gui/application_menu.ui:71 gajim/data/gui/shortcuts_window.ui:182
-#: gajim/gtk/accounts.py:58
+#: gajim/gui_menu_builder.py:751 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:755 gajim/data/gui/application_menu.ui:5
+#: gajim/data/gui/shortcuts_window.ui:182 gajim/gtk/accounts.py:57
 msgid "Accounts"
 msgstr "Акаунти"
 
-#: gajim/gui_menu_builder.py:881 gajim/gui_menu_builder.py:886
+#: gajim/gui_menu_builder.py:784 gajim/gui_menu_builder.py:789
 #, fuzzy
-msgid "Copy JID"
-msgstr "JID на стая"
+msgid "Copy XMPP Address"
+msgstr "Копиране на _JID/Е-поща"
 
-#: gajim/gui_menu_builder.py:882 gajim/gui_menu_builder.py:914
+#: gajim/gui_menu_builder.py:785 gajim/gui_menu_builder.py:817
 #, fuzzy
 msgid "Join Groupchat"
 msgstr "Влизане в стая"
 
-#: gajim/gui_menu_builder.py:887 gajim/gui_menu_builder.py:913
-#: gajim/data/gui/application_menu.ui:76
+#: gajim/gui_menu_builder.py:790 gajim/gui_menu_builder.py:816
+#: gajim/data/gui/application_menu.ui:71
 #: gajim/data/gui/subscription_request_window.ui:106
 msgid "Start Chat"
 msgstr "Започване на разговор"
 
-#: gajim/gui_menu_builder.py:888 gajim/gui_menu_builder.py:915
+#: gajim/gui_menu_builder.py:791 gajim/gui_menu_builder.py:818
 #, fuzzy
-msgid "Add to Roster…"
-msgstr "Добавяне към _списъка…"
+msgid "Add to Contact List…"
+msgstr "_Добавяне на контакт…"
 
-#: gajim/gui_menu_builder.py:893
+#: gajim/gui_menu_builder.py:796
 #, fuzzy
 msgid "Copy Link Location"
 msgstr "_Копиране на адреса на връзката"
 
-#: gajim/gui_menu_builder.py:894
+#: gajim/gui_menu_builder.py:797
 #, fuzzy
 msgid "Open Link in Browser"
 msgstr "_Отваряне на връзката в браузър"
 
-#: gajim/gui_menu_builder.py:899
+#: gajim/gui_menu_builder.py:802
 #, fuzzy
 msgid "Copy Email Address"
 msgstr "Копиране на _JID/Е-поща"
 
-#: gajim/gui_menu_builder.py:900 gajim/gui_menu_builder.py:912
+#: gajim/gui_menu_builder.py:803 gajim/gui_menu_builder.py:815
 #, fuzzy
 msgid "Open Email Composer"
 msgstr "_Отваряне на пощенската програма"
 
-#: gajim/gui_menu_builder.py:905
+#: gajim/gui_menu_builder.py:808
 #, fuzzy
 msgid "Copy Location"
 msgstr "_Копиране на адреса на връзката"
 
-#: gajim/gui_menu_builder.py:906
+#: gajim/gui_menu_builder.py:809
 #, fuzzy
 msgid "Show Location"
 msgstr "Уведомления"
 
-#: gajim/gui_menu_builder.py:911
+#: gajim/gui_menu_builder.py:814
 #, fuzzy
-msgid "Copy JID/Email"
+msgid "Copy XMPP Address/Email"
 msgstr "Копиране на _JID/Е-поща"
 
-#: gajim/gui_menu_builder.py:945
+#: gajim/gui_menu_builder.py:852
 #, fuzzy
 msgid "Copy"
 msgstr "JID на стая"
@@ -582,44 +590,56 @@ msgstr ""
 msgid "Choose folder for logfile"
 msgstr ""
 
-#: gajim/history_manager.py:107
+#: gajim/history_manager.py:106
 msgid "Cannot find history logs database"
 msgstr "Неуспех при откриването на базата от данни за разговорите"
 
-#: gajim/history_manager.py:108
+#: gajim/history_manager.py:107
 #, fuzzy, python-format
 msgid "%s does not exist."
 msgstr "Файлът не съществува"
 
-#: gajim/history_manager.py:141 gajim/history_manager.py:195
-#: gajim/gtk/discovery.py:829 gajim/gtk/roster_item_exchange.py:80
-msgid "JID"
-msgstr "JID"
+#: gajim/history_manager.py:140 gajim/history_manager.py:194
+#: 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:30
+#: gajim/gtk/accounts.py:804
+#, fuzzy
+msgid "XMPP Address"
+msgstr "Адрес на AIM:"
 
-#: gajim/history_manager.py:154 gajim/history_manager.py:202
+#: gajim/history_manager.py:153 gajim/history_manager.py:201
 #: gajim/data/gui/history_window.ui:89 gajim/gtk/history.py:108
 msgid "Date"
 msgstr "Дата"
 
-#: gajim/history_manager.py:161 gajim/history_manager.py:225
+#: gajim/history_manager.py:160 gajim/history_manager.py:224
 #: gajim/data/gui/join_groupchat_window.ui:208
 #: gajim/data/gui/profile_window.ui:214
 #: gajim/data/gui/vcard_information_window.ui:443
+#: gajim/data/gui/bookmarks.ui:140
 msgid "Nickname"
 msgstr "Псевдоним"
 
-#: gajim/history_manager.py:172 gajim/history_manager.py:211
+#: gajim/history_manager.py:171 gajim/history_manager.py:210
 #: gajim/data/gui/preferences_window.ui:1344
 #: gajim/data/gui/single_message_window.ui:275 gajim/gtk/history.py:117
 msgid "Message"
 msgstr "Съобщение"
 
-#: gajim/history_manager.py:180 gajim/history_manager.py:218
+#: gajim/history_manager.py:179 gajim/history_manager.py:217
 #: gajim/data/gui/groups_post_window.ui:49
 #: gajim/data/gui/single_message_window.ui:214
 msgid "Subject"
 msgstr "Тема"
 
+#: gajim/history_manager.py:247
+#, fuzzy
+msgid "Database Cleanup"
+msgstr "Грешка в базата от данни"
+
 #: gajim/history_manager.py:248
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
@@ -631,11 +651,8 @@ msgstr ""
 #: gajim/history_manager.py:250
 #, fuzzy
 msgid ""
-"Normally allocated database size will not be freed, it will just become "
-"reusable. If you really want to reduce database filesize, click YES, else "
-"click NO.\n"
-"\n"
-"In case you click YES, please wait…"
+"Normally, the allocated database size will not be freed, it will just become "
+"reusable. This operation may take a while."
 msgstr ""
 "Разпределеното пространство на базата от данни няма да бъде освободено, а ще "
 "стане наново използваемо. Ако наистина искате да намалите файловия размер на "
@@ -645,47 +662,47 @@ msgstr ""
 
 #: gajim/history_manager.py:255
 #, fuzzy
-msgid "Database Cleanup"
-msgstr "Грешка в базата от данни"
+msgid "_Cleanup"
+msgstr "Из_чистване"
 
-#: gajim/history_manager.py:519 gajim/gtk/filetransfer.py:238
-#: gajim/gtk/filetransfer.py:248
+#: gajim/history_manager.py:518 gajim/gtk/filetransfer.py:237
+#: gajim/gtk/filetransfer.py:247
 msgid "You"
 msgstr "Вие"
 
-#: gajim/history_manager.py:531
+#: gajim/history_manager.py:530
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(who)s каза в %(time)s: %(message)s\n"
 
-#: gajim/history_manager.py:568 gajim/history_manager.py:607
-#: gajim/gtk/dialogs.py:58 gajim/gtk/themes.py:319
+#: gajim/history_manager.py:567 gajim/history_manager.py:606
+#: gajim/gtk/dialogs.py:57 gajim/gtk/themes.py:319
 #: gajim/gtk/roster_item_exchange.py:75 gajim/gtk/roster_item_exchange.py:185
 msgid "Delete"
 msgstr "Изтриване"
 
-#: gajim/history_manager.py:569
+#: gajim/history_manager.py:568
 #, fuzzy
 msgid "Delete Conversation"
 msgid_plural "Delete Conversations"
 msgstr[0] "Отмяна на потвърждението"
 msgstr[1] "Отмяна на потвърждението"
 
-#: gajim/history_manager.py:570
+#: gajim/history_manager.py:569
 #, 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:608
+#: gajim/history_manager.py:607
 #, fuzzy
 msgid "Delete Message"
 msgid_plural "Delete Messages"
 msgstr[0] "Стандартно съобщение"
 msgstr[1] "Стандартно съобщение"
 
-#: gajim/history_manager.py:609
+#: gajim/history_manager.py:608
 #, fuzzy
 msgid "Do you want to permanently delete this message"
 msgid_plural "Do you want to permanently delete these messages"
@@ -698,15 +715,15 @@ msgid "Contact name: <i>%s</i>"
 msgstr "Име на контакта: <i>%s</i>"
 
 #: gajim/dialogs.py:84
-#, fuzzy, python-format
-msgid "JID: <i>%s</i>"
-msgstr "Jabber ID: <i>%s</i>"
+#, python-format
+msgid "XMPP Address: <i>%s</i>"
+msgstr ""
 
-#: gajim/dialogs.py:115 gajim/dialogs.py:128 gajim/roster_window.py:2901
-#: gajim/roster_window.py:3833 gajim/roster_window.py:5084
-#: gajim/common/contacts.py:157 gajim/common/contacts.py:190
+#: gajim/dialogs.py:115 gajim/dialogs.py:128 gajim/roster_window.py:2894
+#: gajim/roster_window.py:3784 gajim/roster_window.py:5023
+#: gajim/common/contacts.py:157 gajim/common/contacts.py:206
 #: gajim/data/gui/preferences_window.ui:558
-#: gajim/data/gui/shortcuts_window.ui:177 gajim/gtk/accounts.py:349
+#: gajim/data/gui/shortcuts_window.ui:177 gajim/gtk/accounts.py:352
 msgid "General"
 msgstr "Общи"
 
@@ -753,7 +770,7 @@ msgstr ""
 "Това име вече се използва. Искате ли да презапишете това съобщение за "
 "състояние?"
 
-#: gajim/dialogs.py:703
+#: gajim/dialogs.py:703 gajim/plugins/gui.py:292
 msgid "_Overwrite"
 msgstr ""
 
@@ -765,9 +782,7 @@ msgstr "Запазване като настроено съобщение за �
 msgid "Please type a name for this status message"
 msgstr "Напишете име за това съобщение за състояние"
 
-#: gajim/dialogs.py:740 gajim/gui_interface.py:1441 gajim/dialog_messages.py:31
-#: gajim/gtk/discovery.py:518 gajim/gtk/profile.py:323
-#: gajim/gtk/join_groupchat.py:234
+#: gajim/dialogs.py:740 gajim/gtk/discovery.py:517 gajim/gtk/profile.py:323
 msgid "You are not connected to the server"
 msgstr "Не сте свързани към сървъра."
 
@@ -775,9 +790,11 @@ msgstr "Не сте свързани към сървъра."
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Трябва да сте свързани, за да синхронизирате контактите си."
 
-#: gajim/dialogs.py:752 gajim/dialogs.py:823 gajim/gtk/discovery.py:822
-#: gajim/gtk/discovery.py:1648 gajim/gtk/discovery.py:1941
-#: gajim/gtk/history.py:99 gajim/gtk/roster_item_exchange.py:83
+#: gajim/dialogs.py:752 gajim/dialogs.py:823
+#: gajim/data/gui/groupchat_info_scrolled.ui:16 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/gtk/roster_item_exchange.py:83
 msgid "Name"
 msgstr "Име"
 
@@ -797,399 +814,346 @@ msgstr "Не може да се синхронизирате с акаунт, а
 msgid "Synchronise"
 msgstr "Синхронизиране"
 
-#: gajim/dialogs.py:1043
+#: gajim/dialogs.py:1042
 msgid "an audio and video"
 msgstr ""
 
-#: gajim/dialogs.py:1045
+#: gajim/dialogs.py:1044
 msgid "an audio"
 msgstr ""
 
-#: gajim/dialogs.py:1047
+#: gajim/dialogs.py:1046
 msgid "a video"
 msgstr ""
 
-#: gajim/dialogs.py:1051
+#: gajim/dialogs.py:1050
 #, python-format
 msgid ""
-"%(contact)s wants to start %(type)s session with you. Do you want to answer "
+"%(contact)s wants to start a %(type)s chat with you. Do you want to answer "
 "the call?"
 msgstr ""
 
-#: gajim/groupchat_control.py:505
+#: gajim/groupchat_control.py:511
 #, fuzzy, python-format
 msgid "Send File (max. %s MiB)…"
 msgstr "Запазване на файла като…"
 
-#: gajim/groupchat_control.py:507 gajim/chat_control.py:342
+#: gajim/groupchat_control.py:513 gajim/chat_control.py:344
 #, fuzzy
 msgid "No File Transfer available"
 msgstr "Файлови трансфери"
 
-#: gajim/groupchat_control.py:630 gajim/groupchat_control.py:2349
-msgid "Changing Subject"
-msgstr "Промяна на темата"
-
-#: gajim/groupchat_control.py:631 gajim/groupchat_control.py:2350
-msgid "Please specify the new subject:"
-msgstr "Въведете новата тема:"
-
-#: gajim/groupchat_control.py:638
-msgid "Changing Nickname"
-msgstr "Промяна на псевдонима"
-
-#: gajim/groupchat_control.py:639
-msgid "Please specify the new nickname you want to use:"
-msgstr "Въведете новия псевдоним, който искате да използвате:"
-
-#: gajim/groupchat_control.py:657
+#: gajim/groupchat_control.py:655
 #, fuzzy
-msgid "Invalid group chat JID"
+msgid "Invalid group chat XMPP Address"
 msgstr "Невалиден Jabber ID на стая"
 
-#: gajim/groupchat_control.py:658
+#: gajim/groupchat_control.py:656
 #, fuzzy
-msgid "The group chat JID has not allowed characters."
+msgid "The group chat XMPP Address has not allowed characters."
 msgstr "Jabber ID на стаята съдържа непозволени знаци."
 
-#: gajim/groupchat_control.py:758 gajim/gtk/profile.py:136
+#: gajim/groupchat_control.py:743 gajim/gtk/profile.py:136
 msgid "Could not load image"
 msgstr "Неуспех при зареждането на изображението"
 
-#: gajim/groupchat_control.py:888
+#: gajim/groupchat_control.py:873
 msgid "Insert Nickname"
 msgstr "Въведете псевдоним"
 
-#: gajim/groupchat_control.py:1056 gajim/chat_control.py:824
+#: gajim/groupchat_control.py:1041 gajim/chat_control.py:848
 msgid "and authenticated"
 msgstr "и удостоверяването е успешно"
 
-#: gajim/groupchat_control.py:1060 gajim/chat_control.py:828
+#: gajim/groupchat_control.py:1045 gajim/chat_control.py:852
 msgid "and NOT authenticated"
 msgstr "и удостоверяването НЕ Е успешно"
 
-#: gajim/groupchat_control.py:1064
+#: gajim/groupchat_control.py:1049
 #, fuzzy, python-format
 msgid "%(type)s encryption is active %(authenticated)s."
 msgstr ""
 "Шифрирането чрез %(type)s %(status)s включено %(authenticated)s.\n"
 "%(logged)s се запазва дневник за сесията."
 
-#: gajim/groupchat_control.py:1111
+#: gajim/groupchat_control.py:1096
 msgid "Conversation with "
 msgstr "Разговор с "
 
-#: gajim/groupchat_control.py:1113
+#: gajim/groupchat_control.py:1098
 msgid "Continued conversation"
 msgstr "Продължен разговор"
 
-#: gajim/groupchat_control.py:1411
+#: gajim/groupchat_control.py:1357
 #, fuzzy, python-format
 msgid "%(nick)s has set the subject to %(subject)s"
 msgstr "%(jid)s зададе темата на %(subject)s"
 
-#: gajim/groupchat_control.py:1433
+#: gajim/groupchat_control.py:1374
 #, fuzzy
-msgid "Room now shows unavailable members"
+msgid "Group chat now shows unavailable members"
 msgstr "Стаята показва отсъстващ член"
 
-#: gajim/groupchat_control.py:1436
+#: gajim/groupchat_control.py:1377
 #, fuzzy
-msgid "Room now does not show unavailable members"
+msgid "Group chat now does not show unavailable members"
 msgstr "Стаята не показва отсъстващи членове"
 
-#: gajim/groupchat_control.py:1439
+#: gajim/groupchat_control.py:1380
 msgid "A setting not related to privacy has been changed"
 msgstr ""
 
-#: gajim/groupchat_control.py:1446
-msgid "Room logging is now enabled"
-msgstr "Воденето на дневник на стаята е включено"
+#: gajim/groupchat_control.py:1387 gajim/groupchat_control.py:1659
+#, fuzzy
+msgid "Conversations are stored on the server"
+msgstr "НЯМА да се запазва дневник за сесията"
 
-#: gajim/groupchat_control.py:1449
-msgid "Room logging is now disabled"
-msgstr "Воденето на дневник на стаята е изключено"
+#: gajim/groupchat_control.py:1390
+#, fuzzy
+msgid "Conversations are not stored on the server"
+msgstr "Вашите лични данни, както са запазени на сървъра"
 
-#: gajim/groupchat_control.py:1452
-msgid "Room is now non-anonymous"
+#: gajim/groupchat_control.py:1393
+#, fuzzy
+msgid "Group chat is now non-anonymous"
 msgstr "Стаята не е анонимна"
 
-#: gajim/groupchat_control.py:1456
-msgid "Room is now semi-anonymous"
+#: gajim/groupchat_control.py:1397
+#, fuzzy
+msgid "Group chat is now semi-anonymous"
 msgstr "Стаята е полу-анонимна"
 
-#: gajim/groupchat_control.py:1460
+#: gajim/groupchat_control.py:1401
 #, fuzzy
-msgid "Room is now fully anonymous"
+msgid "Group chat is now fully anonymous"
 msgstr "Стаята е напълно анонимна"
 
-#: gajim/groupchat_control.py:1500
+#: gajim/groupchat_control.py:1439
 #, fuzzy, python-format
 msgid "Ping? (%s)"
 msgstr "Понг! (%s сек)"
 
-#: gajim/groupchat_control.py:1503
+#: gajim/groupchat_control.py:1442
 #, fuzzy, python-format
 msgid "Pong! (%(nick)s %(delay)s s.)"
 msgstr "Понг! (%s сек)"
 
-#: gajim/groupchat_control.py:1506 gajim/chat_control.py:1213
+#: gajim/groupchat_control.py:1445 gajim/chat_control.py:1237
 msgid "Error."
 msgstr "Грешка."
 
-#: gajim/groupchat_control.py:1711
+#: gajim/groupchat_control.py:1650
 #, fuzzy, python-format
-msgid "You (%s) joined the room"
+msgid "You (%s) joined the group chat"
 msgstr "%s влезе в стаята"
 
-#: gajim/groupchat_control.py:1717
-msgid "Any occupant is allowed to see your full JID"
+#: gajim/groupchat_control.py:1655
+#, fuzzy
+msgid "Any participant is allowed to see your full XMPP Address"
 msgstr "На всеки участник е позволено да вижда вашия JID"
 
-#: gajim/groupchat_control.py:1721
-msgid "Room logging is enabled"
-msgstr "Воденето на дневник на стаята е включено"
-
-#: gajim/groupchat_control.py:1725
-msgid "The server has assigned or modified your roomnick"
+#: gajim/groupchat_control.py:1663
+#, fuzzy
+msgid "The server has assigned or modified your nickname in this group chat"
 msgstr "Сървърът назначи или промени псевдонима ви в стаята"
 
-#: gajim/groupchat_control.py:1732
-msgid "A new room has been created"
+#: gajim/groupchat_control.py:1671
+#, fuzzy
+msgid "A new group chat has been created"
 msgstr "Беше създадена нова стая"
 
-#: gajim/groupchat_control.py:1740 gajim/privatechat_control.py:112
+#: gajim/groupchat_control.py:1679 gajim/privatechat_control.py:115
 #, python-format
 msgid "You are now known as %s"
 msgstr "Вече сте познати като %s"
 
-#: gajim/groupchat_control.py:1742 gajim/privatechat_control.py:114
+#: gajim/groupchat_control.py:1681 gajim/privatechat_control.py:117
 #, fuzzy, python-brace-format
 msgid "{nick} is now known as {new_nick}"
 msgstr "%(nick)s вече е познат като %(new_nick)s"
 
-#: gajim/groupchat_control.py:1767 gajim/privatechat_control.py:141
+#: gajim/groupchat_control.py:1706 gajim/privatechat_control.py:144
 #, fuzzy, python-brace-format
 msgid "You are now {show}{status}"
 msgstr "Вече сте познати като %s"
 
-#: gajim/groupchat_control.py:1773 gajim/privatechat_control.py:147
+#: gajim/groupchat_control.py:1712 gajim/privatechat_control.py:150
 #, fuzzy, python-brace-format
 msgid "{nick} is now {show}{status}"
 msgstr "%(nick)s вече е %(status)s"
 
-#: gajim/groupchat_control.py:1790 gajim/groupchat_control.py:1819
-#: gajim/groupchat_control.py:1849 gajim/groupchat_control.py:1909
+#: gajim/groupchat_control.py:1729 gajim/groupchat_control.py:1758
+#: gajim/groupchat_control.py:1788 gajim/groupchat_control.py:1848
 #, python-brace-format
 msgid " by {actor}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1793
+#: gajim/groupchat_control.py:1732
 #, fuzzy, python-brace-format
 msgid "** Your Affiliation has been set to {affiliation}{actor}{reason}"
 msgstr "** Рангът на %(nick)s бе зададен на %(affiliation)s от %(actor)s"
 
-#: gajim/groupchat_control.py:1799
+#: gajim/groupchat_control.py:1738
 #, fuzzy, python-brace-format
 msgid "** Affiliation of {nick} has been set to {affiliation}{actor}{reason}"
 msgstr "** Рангът на %(nick)s бе зададен на %(affiliation)s"
 
-#: gajim/groupchat_control.py:1822
+#: gajim/groupchat_control.py:1761
 #, fuzzy, python-brace-format
 msgid "** Your Role has been set to {role}{actor}{reason}"
 msgstr "** Ролята на %(nick)s бе зададена на %(role)s от %(actor)s"
 
-#: gajim/groupchat_control.py:1827
+#: gajim/groupchat_control.py:1766
 #, fuzzy, python-brace-format
 msgid "** Role of {nick} has been set to {role}{actor}{reason}"
 msgstr "** Ролята на %(nick)s бе зададена на %(role)s от %(actor)s"
 
-#: gajim/groupchat_control.py:1852
+#: gajim/groupchat_control.py:1791
 #, fuzzy, python-brace-format
-msgid "You have been removed from the room{actor}{reason}"
+msgid "You have been removed from the group chat{actor}{reason}"
 msgstr "%(nick)s беше изритан от стаята (%(reason)s)"
 
-#: gajim/groupchat_control.py:1857
+#: gajim/groupchat_control.py:1796
 #, python-brace-format
 msgid "You have left due to an error{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1863
+#: gajim/groupchat_control.py:1802
 #, python-brace-format
 msgid "You have been kicked{actor}{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1870
+#: gajim/groupchat_control.py:1809
 #, python-brace-format
 msgid "You have been banned{actor}{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1877 gajim/groupchat_control.py:1943
+#: gajim/groupchat_control.py:1816 gajim/groupchat_control.py:1882
 #, fuzzy
 msgid ": Affiliation changed"
 msgstr "рангът е променен"
 
-#: gajim/groupchat_control.py:1883 gajim/groupchat_control.py:1948
+#: gajim/groupchat_control.py:1822 gajim/groupchat_control.py:1887
 #, fuzzy
-msgid ": Room configuration changed to members-only"
+msgid ": Group chat configuration changed to members-only"
 msgstr "Конфигурацията на стаята бе променена на „само за членове“"
 
-#: gajim/groupchat_control.py:1912
+#: gajim/groupchat_control.py:1851
 #, fuzzy, python-brace-format
-msgid "{nick} has been removed from the room{by}{reason}"
+msgid "{nick} has been removed from the group chat{by}{reason}"
 msgstr "%(nick)s беше изритан от стаята (%(reason)s)"
 
-#: gajim/groupchat_control.py:1922
+#: gajim/groupchat_control.py:1861
 #, python-brace-format
 msgid "{nick} has left due to an error{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1928
+#: gajim/groupchat_control.py:1867
 #, fuzzy, python-brace-format
 msgid "{nick} has been kicked{actor}{reason}"
 msgstr "%(nick)s беше изритан: %(reason)s"
 
-#: gajim/groupchat_control.py:1936
+#: gajim/groupchat_control.py:1875
 #, fuzzy, python-brace-format
 msgid "{nick} has been banned{actor}{reason}"
 msgstr "%(nick)s беше отлъчен: %(reason)s"
 
-#: gajim/groupchat_control.py:1953
+#: gajim/groupchat_control.py:1892
 #, python-brace-format
 msgid "{nick} has left{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1970
+#: gajim/groupchat_control.py:1914
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s влезе в стаята"
 
-#: gajim/groupchat_control.py:1985 gajim/groupchat_control.py:1990
-#: gajim/groupchat_control.py:1995 gajim/groupchat_control.py:2000
-#: gajim/groupchat_control.py:2011
-msgid "Unable to join group chat"
-msgstr "Неуспех при влизането в стаята"
-
-#: gajim/groupchat_control.py:1986
-#, fuzzy, python-format
-msgid "You are banned from group chat <b>%s</b>."
-msgstr "Вие сте отлъчени от стаята %s."
-
-#: gajim/groupchat_control.py:1991
-#, fuzzy, python-format
-msgid "Remote server <b>%s</b> does not exist."
-msgstr "Стаята %s не съществува."
-
-#: gajim/groupchat_control.py:1996
-#, fuzzy, python-format
-msgid "Group chat <b>%s</b> does not exist."
-msgstr "Стаята %s не съществува."
-
-#: gajim/groupchat_control.py:2001
-#, fuzzy
-msgid "Group chat creation is not permitted."
-msgstr "Създаването на стаи е ограничено."
-
-#: gajim/groupchat_control.py:2005
+#: gajim/groupchat_control.py:1981
 #, fuzzy
-msgid "Unable to join groupchat"
-msgstr "Неуспех при влизането в стаята"
-
-#: gajim/groupchat_control.py:2006
-#, fuzzy, python-format
-msgid "You must use your registered nickname in <b>%s</b>."
-msgstr "Трябва да се използва регистрирания ви псевдоним в стаята %s."
-
-#: gajim/groupchat_control.py:2012
-#, python-format
-msgid "You are not in the members list in groupchat %s."
-msgstr "Не сте в списъка с членове на стаята %s."
-
-#: gajim/groupchat_control.py:2068
-msgid "Room has been destroyed"
+msgid "Group chat has been destroyed"
 msgstr "Стаята е била унищожена"
 
-#: gajim/groupchat_control.py:2073
+#: gajim/groupchat_control.py:1986
 #, fuzzy, python-format
-msgid "You can join this room instead: xmpp:%s?join"
+msgid "You can join this group chat instead: xmpp:%s?join"
 msgstr "Вместо това може да влезете в тази стая: %s"
 
-#: gajim/groupchat_control.py:2306
+#: gajim/groupchat_control.py:2214
 #, fuzzy
 msgid "Leave Group Chat"
 msgstr "Излизане от стаите"
 
-#: gajim/groupchat_control.py:2307
+#: gajim/groupchat_control.py:2215
 #, fuzzy
 msgid "Are you sure you want to leave this group chat?"
 msgstr "Сигурни ли сте, че искате да напуснете стаята „%s“?"
 
-#: gajim/groupchat_control.py:2308
+#: gajim/groupchat_control.py:2216
 #, fuzzy, python-format
-msgid "If you close this window, you will be disconnected from '%s'."
+msgid "If you close this window, you will leave '%s'."
 msgstr "Ако затворите този прозорец, връзката със стаята ще бъде прекъсната."
 
-#: gajim/groupchat_control.py:2314
+#: gajim/groupchat_control.py:2222 gajim/roster_window.py:5177
 msgid "_Leave"
 msgstr ""
 
-#: gajim/groupchat_control.py:2377
+#: gajim/groupchat_control.py:2280 gajim/roster_window.py:3008
 #, fuzzy, python-format
 msgid "%(jid)s has been invited to this group chat"
 msgstr "%(nick)s беше изритан от стаята (%(reason)s)"
 
-#: gajim/groupchat_control.py:2527
+#: gajim/groupchat_control.py:2463
 #, python-format
 msgid "Kicking %s"
 msgstr "Изритване на %s"
 
-#: gajim/groupchat_control.py:2528 gajim/groupchat_control.py:2829
+#: gajim/groupchat_control.py:2464 gajim/groupchat_control.py:2765
 msgid "You may specify a reason below:"
 msgstr "Може да уточните причина по-долу:"
 
-#: gajim/groupchat_control.py:2828
+#: gajim/groupchat_control.py:2764
 #, python-format
 msgid "Banning %s"
 msgstr "Отлъчване на %s"
 
-#: gajim/chat_control.py:408
+#: gajim/chat_control.py:432
 #, fuzzy
 msgid "Show a list of formattings"
 msgstr "Списък с емотикони (Alt+M)"
 
-#: gajim/chat_control.py:412
+#: gajim/chat_control.py:436
 #, fuzzy
 msgid "This contact does not support HTML"
 msgstr "Списък с активни, завършили и прекъснати файлови трансфери"
 
-#: gajim/chat_control.py:562
+#: gajim/chat_control.py:586
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr ""
 
-#: gajim/chat_control.py:686
+#: gajim/chat_control.py:710
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s от стая %(room_name)s"
 
-#: gajim/chat_control.py:832
+#: gajim/chat_control.py:856
 #, fuzzy, python-format
 msgid "%(type)s encryption is active %(authenticated)s"
 msgstr ""
 "Шифрирането чрез %(type)s %(status)s включено %(authenticated)s.\n"
 "%(logged)s се запазва дневник за сесията."
 
-#: gajim/chat_control.py:1160 gajim/chat_control.py:1168
+#: gajim/chat_control.py:1184 gajim/chat_control.py:1192
 #, fuzzy
 msgid "Close"
 msgstr "Изпра_щане и затваряне"
 
-#: gajim/chat_control.py:1161
+#: gajim/chat_control.py:1185
 #, fuzzy, python-format
 msgid "You just received a new message from %s"
 msgstr "Току-що получихте ново съобщение от „%s“"
 
-#: gajim/chat_control.py:1163
+#: gajim/chat_control.py:1187
 #, fuzzy
 msgid ""
 "If you close this tab while having chat history disabled, this message will "
@@ -1198,16 +1162,16 @@ msgstr ""
 "Ако затворите този прозорец и нямате включена опция за запазване на "
 "историята, съобщението ще бъде загубено."
 
-#: gajim/chat_control.py:1208
+#: gajim/chat_control.py:1232
 msgid "Ping?"
 msgstr "Пинг?"
 
-#: gajim/chat_control.py:1211
+#: gajim/chat_control.py:1235
 #, fuzzy, python-format
 msgid "Pong! (%s seconds)"
 msgstr "Понг! (%s сек)"
 
-#: gajim/chat_control.py:1308
+#: gajim/chat_control.py:1332
 #, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -1216,274 +1180,282 @@ msgstr ""
 "Тема: %(subject)s\n"
 "%(message)s"
 
-#: gajim/chat_control.py:1416
+#: gajim/chat_control.py:1440
 #, fuzzy, python-format
 msgid "%(name)s is now %(show)s %(status)s"
 msgstr "%(name)s вече е %(status)s"
 
-#: gajim/chat_control.py:1476 gajim/data/gui/application_menu.ui:32
+#: gajim/chat_control.py:1500 gajim/data/gui/application_menu.ui:32
 #: gajim/gtk/http_upload_progress.py:35
 #, fuzzy
 msgid "File Transfer"
 msgstr "Файлови трансфери"
 
-#: gajim/chat_control.py:1480
+#: gajim/chat_control.py:1504
 #, fuzzy
 msgid "Size"
 msgstr "Размер: %s"
 
-#: gajim/chat_control.py:1482 gajim/chat_control.py:1546
+#: gajim/chat_control.py:1506 gajim/chat_control.py:1566
+#: gajim/gui_interface.py:190
 #: gajim/data/gui/groupchat_invitation_received.ui:77
-#: gajim/gtk/filetransfer.py:485
+#: gajim/gtk/filetransfer.py:490
 #, fuzzy
 msgid "_Accept"
 msgstr "_Акаунти"
 
-#: gajim/chat_control.py:1484 gajim/chat_control.py:1548
+#: gajim/chat_control.py:1508 gajim/chat_control.py:1568
 #: gajim/data/gui/groupchat_invitation_received.ui:62
 #, fuzzy
 msgid "_Decline"
 msgstr "_Изключен"
 
-#: gajim/chat_control.py:1506 gajim/gui_interface.py:791
-#: gajim/gui_interface.py:821 gajim/gui_interface.py:847
+#: gajim/chat_control.py:1530 gajim/gui_interface.py:777
+#: gajim/gui_interface.py:807 gajim/gui_interface.py:833
 #: gajim/gtk/notification.py:173 gajim/gtk/notification.py:278
 msgid "File Transfer Completed"
 msgstr "Файловият трансфер е приключен"
 
-#: gajim/chat_control.py:1510 gajim/gtk/filetransfer.py:259
+#: gajim/chat_control.py:1534 gajim/gtk/filetransfer.py:258
 #, fuzzy
 msgid "Open _Folder"
 msgstr "_Отваряне на папката"
 
-#: gajim/chat_control.py:1512 gajim/chat_control.py:1521
+#: gajim/chat_control.py:1536 gajim/chat_control.py:1545
+#: gajim/data/gui/groupchat_control.ui:962
+#: gajim/data/gui/groupchat_control.ui:1049
+#: gajim/data/gui/groupchat_control.ui:1155
 #, fuzzy
 msgid "_Close"
 msgstr "Изпра_щане и затваряне"
 
-#: gajim/chat_control.py:1543 gajim/gui_interface.py:484
+#: gajim/chat_control.py:1563 gajim/gui_interface.py:473
+#: gajim/data/gui/groupchat_invitation_received.ui:42
 #: gajim/gtk/notification.py:174 gajim/gtk/notification.py:195
 #: gajim/gtk/notification.py:281
-msgid "Groupchat Invitation"
+#, fuzzy
+msgid "Group Chat Invitation"
 msgstr "Покана за разговор в стая"
 
-#: gajim/chat_control.py:1568 gajim/roster_window.py:1954
+#: gajim/chat_control.py:1588 gajim/roster_window.py:1951
 #, fuzzy
 msgid "Remote contact stopped transfer"
 msgstr "Премахване на контакт от списъка"
 
-#: gajim/chat_control.py:1570 gajim/roster_window.py:1956
+#: gajim/chat_control.py:1590 gajim/roster_window.py:1953
 #, fuzzy
 msgid "Error opening file"
 msgstr "Грешка при четене на файл:"
 
-#: gajim/chat_control.py:1572 gajim/gtk/filetransfer.py:297
+#: gajim/chat_control.py:1592 gajim/gtk/filetransfer.py:296
 #, fuzzy
 msgid "File transfer stopped"
 msgstr "Файловият трансфер е преустановен"
 
-#: gajim/chat_control.py:1575 gajim/gtk/filetransfer.py:275
-#: gajim/gtk/filetransfer.py:284
+#: gajim/chat_control.py:1595 gajim/gtk/filetransfer.py:274
+#: gajim/gtk/filetransfer.py:283
 msgid "File transfer cancelled"
 msgstr "Файловият трансфер е прекъснат"
 
-#: gajim/chat_control.py:1576
+#: gajim/chat_control.py:1596
 msgid "Connection with peer cannot be established."
 msgstr "Не може да бъде установен контакт с отсрещната машина."
 
-#: gajim/application.py:72
+#: gajim/application.py:75
 #, fuzzy
 msgid "Show the application's version"
 msgstr "Демон за уведомления"
 
-#: gajim/application.py:79
+#: gajim/application.py:82
 #, fuzzy
 msgid "Show only critical errors"
 msgstr "Показване на събитието в спис_ъка"
 
-#: gajim/application.py:86
+#: gajim/application.py:89
 msgid "Separate profile files completely (even history database and plugins)"
 msgstr ""
 
-#: gajim/application.py:94
+#: gajim/application.py:97
 msgid "Print XML stanzas and other debug information"
 msgstr ""
 
-#: gajim/application.py:101
+#: gajim/application.py:104
 #, fuzzy
 msgid "Use defined profile in configuration directory"
 msgstr "Редактор на настройки за напреднали"
 
-#: gajim/application.py:109
+#: gajim/application.py:112
 #, fuzzy
 msgid "Set configuration directory"
 msgstr "Настройки на стаята"
 
-#: gajim/application.py:117
+#: gajim/application.py:120
 msgid "Configure logging system"
 msgstr ""
 
-#: gajim/application.py:125
+#: gajim/application.py:128
 #, fuzzy
 msgid "Show all warnings"
 msgstr "Показване на всички _чакащи събития"
 
-#: gajim/application.py:132
+#: gajim/application.py:135
 msgid "Open IPython shell"
 msgstr ""
 
-#: gajim/application.py:139
+#: gajim/application.py:142
 msgid "Pops up a window with the next pending event"
 msgstr "Показва следващото чакащо събитие в изскачащ прозорец"
 
-#: gajim/application.py:145 gajim/data/gui/shortcuts_window.ui:203
+#: gajim/application.py:148 gajim/data/gui/shortcuts_window.ui:203
 #: data/org.gajim.Gajim.desktop.in:21
 #, fuzzy
 msgid "Start a new chat"
 msgstr "Започване на разговор"
 
-#: gajim/application.py:152
+#: gajim/application.py:155
 msgid "Simulate loss of connectivity"
 msgstr ""
 
-#: gajim/application.py:159
+#: gajim/application.py:162
 msgid "Simulate regaining connectivity"
 msgstr ""
 
-#: gajim/application.py:201 gajim/gui_interface.py:133
+#: gajim/application.py:204 gajim/gui_interface.py:133
 msgid "Database Error"
 msgstr "Грешка в базата от данни"
 
-#: gajim/roster_window.py:294 gajim/roster_window.py:1030
+#: gajim/roster_window.py:291 gajim/roster_window.py:1027
 msgid "Merged accounts"
 msgstr "Смесени акаунти"
 
-#: gajim/roster_window.py:853 gajim/roster_window.py:1631
-#: gajim/roster_window.py:1664 gajim/roster_window.py:1715
-#: gajim/roster_window.py:1717 gajim/roster_window.py:1872
-#: gajim/roster_window.py:2531 gajim/roster_window.py:5025
-#: gajim/common/contacts.py:188 gajim/common/contacts.py:447
-#: gajim/common/helpers.py:83 gajim/gtk/discovery.py:129
-#: gajim/gtk/discovery.py:130 gajim/gtk/discovery.py:1416
+#: gajim/roster_window.py:850 gajim/roster_window.py:1628
+#: gajim/roster_window.py:1661 gajim/roster_window.py:1712
+#: gajim/roster_window.py:1714 gajim/roster_window.py:1869
+#: gajim/roster_window.py:2528 gajim/roster_window.py:4331
+#: gajim/roster_window.py:4964 gajim/common/contacts.py:204
+#: gajim/common/contacts.py:463 gajim/common/helpers.py:86
+#: gajim/gtk/discovery.py:127 gajim/gtk/discovery.py:128
+#: gajim/gtk/discovery.py:1414
 msgid "Transports"
 msgstr "Транспорти"
 
-#: gajim/roster_window.py:1723 gajim/roster_window.py:1725
-#: gajim/roster_window.py:4995 gajim/gui_interface.py:1613
-#: gajim/gui_interface.py:1639 gajim/common/contacts.py:186
-#: gajim/common/helpers.py:83 gajim/common/modules/adhoc_commands.py:245
-msgid "Groupchats"
+#: gajim/roster_window.py:1720 gajim/roster_window.py:1722
+#: gajim/roster_window.py:4331 gajim/roster_window.py:4934
+#: gajim/gui_interface.py:1527 gajim/common/contacts.py:202
+#: gajim/common/helpers.py:86 gajim/common/modules/adhoc_commands.py:245
+#, fuzzy
+msgid "Group chats"
 msgstr "Стаи"
 
-#: gajim/roster_window.py:2012
+#: gajim/roster_window.py:2009
 #, fuzzy
 msgid "Authorization sent"
 msgstr "Упълномощаването беше изпратено"
 
-#: gajim/roster_window.py:2013
+#: gajim/roster_window.py:2010
 #, fuzzy, python-format
 msgid "\"%s\" will now see your status."
 msgstr "„%s“ вече ще знае състоянието ви."
 
-#: gajim/roster_window.py:2031
+#: gajim/roster_window.py:2028
 msgid "Subscription request has been sent"
 msgstr "Искането за записване беше изпратено"
 
-#: gajim/roster_window.py:2032
-#, python-format
-msgid "If \"%s\" accepts this request you will know his or her status."
+#: gajim/roster_window.py:2029
+#, fuzzy, python-format
+msgid "If \"%s\" accepts this request you will know their status."
 msgstr "Ако „%s“ приеме това запитване, ще знаете за състоянието му."
 
-#: gajim/roster_window.py:2046
+#: gajim/roster_window.py:2043
 #, fuzzy
 msgid "Authorization removed"
 msgstr "Упълномощаването беше прекратено"
 
-#: gajim/roster_window.py:2047
+#: gajim/roster_window.py:2044
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "„%s“ винаги ще ви вижда като изключен."
 
-#: gajim/roster_window.py:2250 gajim/roster_window.py:3504
+#: gajim/roster_window.py:2247 gajim/roster_window.py:3460
 msgid "Disconnect for Invisibility"
 msgstr ""
 
-#: gajim/roster_window.py:2251 gajim/roster_window.py:3505
+#: gajim/roster_window.py:2248 gajim/roster_window.py:3461
 msgid "You are participating in one or more group chats"
 msgstr "Участвате в една или повече стаи"
 
-#: gajim/roster_window.py:2252 gajim/roster_window.py:3506
+#: gajim/roster_window.py:2249 gajim/roster_window.py:3462
 #, fuzzy
 msgid ""
-"Changing your status to invisible will result in disconnection from those "
-"group chats.\n"
+"Changing your status to invisible will result in you leaving those group "
+"chats.\n"
 "Are you sure you want to go invisible?"
 msgstr ""
 "Промяната на състоянието до „Невидим“ ще ви изключи от тези стаи. Сигурни ли "
 "сте, че искате да станете „Невидим“?"
 
-#: gajim/roster_window.py:2257 gajim/roster_window.py:3512
-#: gajim/roster_window.py:5238 gajim/data/gui/gc_control_popup_menu.ui:120
+#: gajim/roster_window.py:2254 gajim/roster_window.py:3468
+#: gajim/data/gui/gc_control_popup_menu.ui:120
 msgid "_Disconnect"
 msgstr "_Изключване"
 
-#: gajim/roster_window.py:2285
+#: gajim/roster_window.py:2282
 #, fuzzy
 msgid "desynced"
 msgstr "без синхронизация"
 
-#: gajim/roster_window.py:2353 gajim/data/gui/shortcuts_window.ui:224
+#: gajim/roster_window.py:2350 gajim/data/gui/shortcuts_window.ui:224
 #, fuzzy
 msgid "Quit Gajim"
 msgstr "Gajim"
 
-#: gajim/roster_window.py:2354
+#: gajim/roster_window.py:2351
 #, fuzzy
 msgid "You are about to quit Gajim"
 msgstr "Сигурни ли сте, че искате да напуснете стаята „%s“?"
 
-#: gajim/roster_window.py:2355
+#: gajim/roster_window.py:2352
 #, fuzzy
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Сигурни ли сте, че искате да напуснете стаята „%s“?"
 
-#: gajim/roster_window.py:2356
+#: gajim/roster_window.py:2353
 msgid "_Always quit when closing Gajim"
 msgstr ""
 
-#: gajim/roster_window.py:2359 gajim/roster_window.py:2455
-#: gajim/roster_window.py:2495 gajim/data/gui/systray_context_menu.ui:90
+#: gajim/roster_window.py:2356 gajim/roster_window.py:2452
+#: gajim/roster_window.py:2492 gajim/data/gui/systray_context_menu.ui:83
 #, fuzzy
 msgid "_Quit"
 msgstr "_Изход"
 
-#: gajim/roster_window.py:2448
+#: gajim/roster_window.py:2445
 #, fuzzy
 msgid "Stop File Transfers"
 msgstr "Файлови трансфери"
 
-#: gajim/roster_window.py:2449
+#: gajim/roster_window.py:2446
 #, fuzzy
 msgid "You still have running file transfers"
 msgstr "Отменя файловия трансфер"
 
-#: gajim/roster_window.py:2450
+#: gajim/roster_window.py:2447
 msgid ""
 "If you quit now, the file(s) being transferred will be lost.\n"
 "Do you still want to quit?"
 msgstr ""
 
-#: gajim/roster_window.py:2488
+#: gajim/roster_window.py:2485
 #, fuzzy
 msgid "Unread Messages"
 msgstr "Непрочетени събития"
 
-#: gajim/roster_window.py:2489
+#: gajim/roster_window.py:2486
 #, fuzzy
 msgid "You still have unread messages"
 msgstr "Имате непрочетени съобщения"
 
-#: gajim/roster_window.py:2490
+#: gajim/roster_window.py:2487
 #, fuzzy
 msgid ""
 "Messages will only be available for reading them later if storing chat "
@@ -1492,20 +1464,20 @@ msgstr ""
 "Може да преглеждате съобщенията по-късно само ако е активирана опцията за "
 "историята и контактът е в списъка."
 
-#: gajim/roster_window.py:2760
+#: gajim/roster_window.py:2753
 msgid "You have unread messages"
 msgstr "Имате непрочетени съобщения"
 
-#: gajim/roster_window.py:2761
+#: gajim/roster_window.py:2754
 msgid "You must read them before removing this transport."
 msgstr "Трябва да ги прочетете преди да премахнете този транспорт."
 
-#: gajim/roster_window.py:2764
+#: gajim/roster_window.py:2757
 #, fuzzy, python-format
 msgid "Transport '%s' will be removed"
 msgstr "Транспортът „%s“ ще бъде премахнат"
 
-#: gajim/roster_window.py:2765
+#: gajim/roster_window.py:2758
 #, fuzzy
 msgid ""
 "You will no longer be able to send and receive messages from and to contacts "
@@ -1514,11 +1486,11 @@ msgstr ""
 "Вече няма да можете да получавате и изпращате съобщения до контакти чрез "
 "този транспорт."
 
-#: gajim/roster_window.py:2768
+#: gajim/roster_window.py:2761
 msgid "Transports will be removed"
 msgstr "Ще бъдат премахнати транспорти"
 
-#: gajim/roster_window.py:2773
+#: gajim/roster_window.py:2766
 #, fuzzy, python-format
 msgid ""
 "You will no longer be able to send and receive messages from and to contacts "
@@ -1528,85 +1500,80 @@ msgstr ""
 "Вече няма да можете да получавате и изпращате съобщения до контакти чрез "
 "този транспорт."
 
-#: gajim/roster_window.py:2777
+#: gajim/roster_window.py:2770
 #, fuzzy
 msgid "Remove Transport"
 msgstr "Показване на т_ранспорти"
 
-#: gajim/roster_window.py:2844
+#: gajim/roster_window.py:2837
 #, fuzzy
 msgid "Block Contact"
 msgstr "Блокирани контакти"
 
-#: gajim/roster_window.py:2845
+#: gajim/roster_window.py:2838
 #, fuzzy
 msgid "Really block this contact?"
 msgstr "Активиран ли е OpenPGP за този контакт?"
 
-#: gajim/roster_window.py:2846
+#: gajim/roster_window.py:2839
 msgid ""
 "This contact will see you offline and you will not receive any messages sent "
 "to you by this contact."
 msgstr ""
 
-#: gajim/roster_window.py:2851
+#: gajim/roster_window.py:2844
 #, fuzzy
 msgid "_Block Contact"
 msgstr "Блокирани контакти"
 
-#: gajim/roster_window.py:2896
+#: gajim/roster_window.py:2889
 msgid "Rename Contact"
 msgstr "Преименуване на контакт"
 
-#: gajim/roster_window.py:2897
+#: gajim/roster_window.py:2890
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Въведете нов псевдоним за контакт „%s“"
 
-#: gajim/roster_window.py:2904
+#: gajim/roster_window.py:2897
 msgid "Rename Group"
 msgstr "Преименуване на група"
 
-#: gajim/roster_window.py:2905
+#: gajim/roster_window.py:2898
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Въведете ново име за група „%s“"
 
-#: gajim/roster_window.py:2953 gajim/roster_window.py:2954
+#: gajim/roster_window.py:2946 gajim/roster_window.py:2947
 msgid "Remove Group"
 msgstr "Премахване на група"
 
-#: gajim/roster_window.py:2955
+#: gajim/roster_window.py:2948
 #, fuzzy, python-format
 msgid "Do you want to remove %s from the contact list?"
 msgstr "Искате ли да премахнете групата „%s“ от списъка?"
 
-#: gajim/roster_window.py:2956
+#: gajim/roster_window.py:2949
 #, fuzzy
 msgid "_Also remove all contacts of this group from contact list"
 msgstr "Премахване от списъка и на всички контакти в тази група"
 
-#: gajim/roster_window.py:3044
-#, fuzzy, python-format
-msgid "%(jid)s has been invited in this room"
-msgstr "%(nick)s беше изритан от стаята (%(reason)s)"
-
-#: gajim/roster_window.py:3353
+#: gajim/roster_window.py:3309
 #, fuzzy
 msgid "Remove Contact"
 msgstr "Преименуване на контакт"
 
-#: gajim/roster_window.py:3354
+#: gajim/roster_window.py:3310
 #, fuzzy
 msgid "Remove contact from contact list"
 msgstr "Премахване на контакт от списъка"
 
-#: gajim/roster_window.py:3355
+#: gajim/roster_window.py:3311
 #, python-format
 msgid "You are about to remove '%(name)s' (%(jid)s) from your contact list.\n"
 msgstr ""
 
-#: gajim/roster_window.py:3364 gajim/roster_window.py:3384
+#: gajim/roster_window.py:3320 gajim/roster_window.py:3340
 #, fuzzy
 msgid ""
 "By removing this contact you also remove authorization. This means the "
@@ -1615,21 +1582,21 @@ msgstr ""
 "Премахвайки тези контакти: %s\n"
 "прекратявате и упълномощаването, така че винаги ще ви виждат изключен(а)."
 
-#: gajim/roster_window.py:3375
+#: gajim/roster_window.py:3331
 msgid "Do you want to continue?"
 msgstr "Искате ли да продължите?"
 
-#: gajim/roster_window.py:3386
+#: gajim/roster_window.py:3342
 #, fuzzy
 msgid "_I want this contact to know my status after removal"
 msgstr "Искам този контакт да вижда състоянието ми след премахването"
 
-#: gajim/roster_window.py:3393
+#: gajim/roster_window.py:3349
 #, fuzzy
 msgid "Remove contacts from contact list"
 msgstr "Премахване на контакт от списъка"
 
-#: gajim/roster_window.py:3399
+#: gajim/roster_window.py:3355
 #, fuzzy, python-format
 msgid ""
 "By removing the following contacts, you will also remove authorization. This "
@@ -1640,25 +1607,25 @@ msgstr ""
 "Премахвайки тези контакти: %s\n"
 "прекратявате и упълномощаването, така че винаги ще ви виждат изключен(а)."
 
-#: gajim/roster_window.py:3403
+#: gajim/roster_window.py:3359
 #, fuzzy
 msgid "Remove Contacts"
 msgstr "Преименуване на контакт"
 
-#: gajim/roster_window.py:3423
+#: gajim/roster_window.py:3379
 msgid "No account available"
 msgstr "Няма наличен акаунт"
 
-#: gajim/roster_window.py:3424
+#: gajim/roster_window.py:3380
 msgid "You must create an account before you can chat with other contacts."
 msgstr ""
 "За да разговаряте с други контакти, първо трябва да създадете Джабър акаунт."
 
-#: gajim/roster_window.py:4060
+#: gajim/roster_window.py:4011
 msgid "Metacontacts storage not supported by your server"
 msgstr "Сървърът ви няма поддръжка за мета-контакти"
 
-#: gajim/roster_window.py:4062
+#: gajim/roster_window.py:4013
 #, fuzzy
 msgid ""
 "Your server does not support storing metacontacts information. So this "
@@ -1667,14 +1634,14 @@ msgstr ""
 "Вашият сървър не поддържа съхраняването на информация за мета-контакти, така "
 "че тази информация няма да се запази при следващото свързване."
 
-#: gajim/roster_window.py:4159
+#: gajim/roster_window.py:4110
 #, fuzzy
 msgid "You are about to create a metacontact"
 msgstr ""
 "На път сте да създадете мета-контакт. Сигурни ли сте, че искате да "
 "продължите?"
 
-#: gajim/roster_window.py:4160
+#: gajim/roster_window.py:4111
 #, fuzzy
 msgid ""
 "Metacontacts are a way to regroup several contacts in one single contact. "
@@ -1685,125 +1652,116 @@ msgstr ""
 "Основно се използва, когато един и същ потребител има няколко акаунта за "
 "Джабър или акаунти за транспорти."
 
-#: gajim/roster_window.py:4164
+#: gajim/roster_window.py:4115
 #, fuzzy
 msgid "Create Metacontact"
 msgstr "Преименуване на контакт"
 
-#: gajim/roster_window.py:4170
+#: gajim/roster_window.py:4121 gajim/data/gui/groupchat_creation.ui:317
 #, fuzzy
 msgid "_Create"
 msgstr "Съзидателен"
 
-#: gajim/roster_window.py:4287
+#: gajim/roster_window.py:4238
 msgid "Invalid file URI:"
 msgstr "Невалиден адрес на файл:"
 
-#: gajim/roster_window.py:4298
+#: gajim/roster_window.py:4249
 #, fuzzy
 msgid "Send file?"
 msgstr "Изпращане на _файл"
 
-#: gajim/roster_window.py:4299
+#: gajim/roster_window.py:4250
 #, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
 msgstr[0] "Искате ли да изпратите този файл на %s:"
 msgstr[1] "Искате ли да изпратите тези файлове на %s:"
 
-#: gajim/roster_window.py:4451
+#: gajim/roster_window.py:4401
 #, fuzzy, python-format
 msgid "Send %(from)s to %(to)s"
 msgstr "Изпращане на %s"
 
-#: gajim/roster_window.py:4464
+#: gajim/roster_window.py:4414
 #, fuzzy, python-format
 msgid "Make %s first contact"
 msgstr "Изпращане на файл до контакт"
 
-#: gajim/roster_window.py:4469
+#: gajim/roster_window.py:4419
 #, fuzzy, python-format
 msgid "Make %(contact1)s and %(contact2)s metacontacts"
 msgstr "Изпращане на файл до контакт"
 
-#: gajim/roster_window.py:4825 gajim/roster_window.py:4923
+#: gajim/roster_window.py:4775 gajim/roster_window.py:4862
 msgid "_Change Status Message"
 msgstr "Пром_яна на съобщението за състояние"
 
-#: gajim/roster_window.py:4845
+#: gajim/roster_window.py:4795
 msgid "Publish Tune"
 msgstr "Публикуване на мелодия"
 
-#: gajim/roster_window.py:4856
+#: gajim/roster_window.py:4806
 #, fuzzy
 msgid "Publish Location"
 msgstr "Публикуване на мелодия"
 
-#: gajim/roster_window.py:4868
-#, fuzzy
-msgid "Configure Services…"
-msgstr "Настройване на услуги…"
-
-#: gajim/roster_window.py:4997
+#: gajim/roster_window.py:4936
 msgid "_Maximize All"
 msgstr "_Максимизиране на всички"
 
-#: gajim/roster_window.py:5004 gajim/roster_window.py:5146
+#: gajim/roster_window.py:4943 gajim/roster_window.py:5085
 msgid "Send Group M_essage"
 msgstr "_Изпращане на групово съобщение"
 
-#: gajim/roster_window.py:5011
+#: gajim/roster_window.py:4950
 msgid "To all users"
 msgstr "До всички потребители"
 
-#: gajim/roster_window.py:5015
+#: gajim/roster_window.py:4954
 msgid "To all online users"
 msgstr "До всички включени потребители"
 
-#: gajim/roster_window.py:5027 gajim/roster_window.py:5152
+#: gajim/roster_window.py:4966 gajim/roster_window.py:5091
 #: gajim/data/gui/gc_occupants_menu.ui:110
 #: gajim/data/gui/contact_context_menu.ui:36
 msgid "In_vite to"
 msgstr "По_кана в"
 
-#: gajim/roster_window.py:5162
+#: gajim/roster_window.py:5101
 msgid "_Manage Contacts"
 msgstr "_Управление на контакти"
 
-#: gajim/roster_window.py:5168
+#: gajim/roster_window.py:5107
 #, fuzzy
 msgid "Edit _Groups…"
 msgstr "Редактиране на _групи"
 
-#: gajim/roster_window.py:5189 gajim/data/gui/filetransfers.ui:12
+#: gajim/roster_window.py:5128 gajim/data/gui/filetransfers.ui:12
 #: gajim/data/gui/remove_account_window.ui:134
 msgid "_Remove"
 msgstr "_Премахване"
 
-#: gajim/roster_window.py:5226
+#: gajim/roster_window.py:5165
 msgid "_Maximize"
 msgstr "_Максимизиране"
 
-#: gajim/roster_window.py:5233
+#: gajim/roster_window.py:5172
 #, fuzzy
 msgid "_Reconnect"
 msgstr "_Изключване"
 
-#: gajim/roster_window.py:5254 gajim/data/gui/gc_occupants_menu.ui:170
+#: gajim/roster_window.py:5193 gajim/data/gui/gc_occupants_menu.ui:170
 #: gajim/data/gui/gc_control_popup_menu.ui:113
 #: gajim/data/gui/contact_context_menu.ui:205
 msgid "_History"
 msgstr "Ист_ория"
 
-#: gajim/roster_window.py:5335 gajim/data/gui/application_menu.ui:86
+#: gajim/roster_window.py:5274 gajim/data/gui/application_menu.ui:83
 #: gajim/data/gui/history_window.ui:57
 msgid "History Manager"
 msgstr "Мениджър на историята"
 
-#: gajim/roster_window.py:5343
-msgid "_Join New Group Chat"
-msgstr "_Влизане в нова стая"
-
 #: gajim/dataforms_widget.py:585
 #, fuzzy
 msgid "Unable to load image"
@@ -1927,260 +1885,277 @@ msgstr "Тема: %s\n"
 msgid "Write a message…"
 msgstr "Ново лично съобщение"
 
-#: gajim/message_window.py:250
+#: gajim/message_window.py:356
+#, fuzzy
+msgid "Close Tabs"
+msgstr "Изпра_щане и затваряне"
+
+#: gajim/message_window.py:357
 #, fuzzy
 msgid "You are going to close several tabs"
 msgstr "Не сте свързани към сървъра."
 
-#: gajim/message_window.py:251
+#: gajim/message_window.py:358
 #, fuzzy
 msgid "Do you really want to close them all?"
 msgstr "Наистина ли искате да изтриете избраното съобщение?"
 
-#: gajim/message_window.py:539
+#: gajim/message_window.py:514
 #, fuzzy
 msgid "?Noun:Chats"
 msgstr "Стаи"
 
-#: gajim/message_window.py:543
+#: gajim/message_window.py:518
 #, fuzzy
 msgid "Group Chats"
 msgstr "Стаи"
 
-#: gajim/message_window.py:547
+#: gajim/message_window.py:522
 msgid "Private Chats"
 msgstr "Лични разговори"
 
-#: gajim/message_window.py:553
+#: gajim/message_window.py:528
 msgid "Messages"
 msgstr "Съобщения"
 
-#: gajim/gui_interface.py:173
+#: gajim/gui_interface.py:170
+#, 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:175
 msgid "Do you accept this request?"
 msgstr "Приемате ли това запитване?"
 
-#: gajim/gui_interface.py:175
-#, python-format
-msgid "Do you accept this request on account %s?"
+#: gajim/gui_interface.py:177
+#, fuzzy, python-format
+msgid "Do you accept this request (account: %s)?"
 msgstr "Приемате ли това запитване за акаунт %s?"
 
-#: gajim/gui_interface.py:178
-#, 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:182
+#, fuzzy
+msgid "Authorization"
+msgstr "Упълномощаването беше изпратено"
+
+#: gajim/gui_interface.py:186 gajim/gui_interface.py:420
+#: gajim/gtk/filetransfer.py:338
+#, fuzzy
+msgid "_No"
+msgstr "Няма"
 
-#: gajim/gui_interface.py:194 gajim/gtk/notification.py:175
+#: gajim/gui_interface.py:205 gajim/gtk/notification.py:175
 #: gajim/gtk/notification.py:197
 msgid "Connection Failed"
 msgstr "Неуспех при свързването"
 
-#: gajim/gui_interface.py:279 gajim/gui_interface.py:529
-msgid "Password Required"
-msgstr "Необходима е парола"
-
-#: gajim/gui_interface.py:280
-#, python-format
-msgid "A Password is required to join the room %s. Please type it."
-msgstr "Необходима е парола за влизане в стаята „%s“. Въведете я."
-
-#: gajim/gui_interface.py:342 gajim/gui_interface.py:346
+#: gajim/gui_interface.py:325 gajim/gui_interface.py:329
 #, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr "Грешка %(code)s: %(msg)s"
 
-#: gajim/gui_interface.py:357 gajim/gui_interface.py:376
+#: gajim/gui_interface.py:340 gajim/gui_interface.py:359
 #: gajim/common/modules/message.py:122
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "грешка при изпращане на %(message)s ( %(error)s )"
 
-#: gajim/gui_interface.py:401 gajim/gtk/notification.py:175
+#: gajim/gui_interface.py:384 gajim/gtk/notification.py:175
 #, fuzzy
 msgid "Subscription request"
 msgstr "Искане за записване"
 
-#: gajim/gui_interface.py:413 gajim/common/contacts.py:184
-#: gajim/common/helpers.py:83
+#: gajim/gui_interface.py:396 gajim/common/contacts.py:200
+#: gajim/common/helpers.py:86
 msgid "Observers"
 msgstr "Наблюдатели"
 
-#: gajim/gui_interface.py:422
+#: gajim/gui_interface.py:405
 msgid "Authorization accepted"
 msgstr "Упълномощаването е прието"
 
-#: gajim/gui_interface.py:423
+#: gajim/gui_interface.py:406
 #, fuzzy, python-format
 msgid "The contact \"%s\" has authorized you to see their status."
 msgstr "Контактът „%s“ ви упълномощи да виждате състоянието му."
 
-#: gajim/gui_interface.py:431
-#, python-format
-msgid "Contact \"%s\" removed subscription from you"
+#: gajim/gui_interface.py:415
+#, fuzzy
+msgid "Subscription Removed"
+msgstr "Искане за записване"
+
+#: gajim/gui_interface.py:416
+#, fuzzy, python-format
+msgid "Contact '%s' removed subscription from you"
 msgstr "Контактът „%s“ премахна записването за вас"
 
-#: gajim/gui_interface.py:432
+#: gajim/gui_interface.py:417
 #, fuzzy
 msgid ""
-"You will always see them as offline.\n"
+"You will always see this contact as offline.\n"
 "Do you want to remove them from your contact list?"
 msgstr ""
 "Винаги ще го виждате като изключен.\n"
 "Искате ли да го премахнете от списъка с контакти?"
 
-#: gajim/gui_interface.py:453 gajim/gtk/notification.py:176
+#: gajim/gui_interface.py:442 gajim/gtk/notification.py:176
 #, fuzzy
 msgid "Unsubscribed"
 msgstr "_Отписване"
 
-#: gajim/gui_interface.py:465
+#: gajim/gui_interface.py:454
 #, python-format
 msgid "%(jid)s declined the invitation: %(reason)s"
 msgstr ""
 
-#: gajim/gui_interface.py:469
+#: gajim/gui_interface.py:458
 #, python-format
 msgid "%(jid)s declined the invitation"
 msgstr ""
 
-#: gajim/gui_interface.py:485
+#: gajim/gui_interface.py:474
 #, fuzzy, python-brace-format
 msgid "You are invited to {room} by {user}"
 msgstr "Поканени сте в стая."
 
-#: gajim/gui_interface.py:506
+#: gajim/gui_interface.py:495
 #, fuzzy
 msgid "Certificate Passphrase Required"
 msgstr "Валидността на сертификата е изтекла"
 
-#: gajim/gui_interface.py:507
+#: gajim/gui_interface.py:496
 #, fuzzy, python-format
 msgid "Enter the certificate passphrase for account %s"
 msgstr "Въведете парола за ключ на GPG %(keyid)s (акаунт „%(account)s“)."
 
-#: gajim/gui_interface.py:516 gajim/gtk/accounts.py:963
+#: gajim/gui_interface.py:505 gajim/gtk/accounts.py:966
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Въведете парола за акаунт „%s“"
 
-#: gajim/gui_interface.py:529 gajim/gtk/accounts.py:964
+#: gajim/gui_interface.py:518
+msgid "Password Required"
+msgstr "Необходима е парола"
+
+#: gajim/gui_interface.py:518 gajim/gtk/accounts.py:967
 msgid "Save password"
 msgstr "Запазване на паролата"
 
-#: gajim/gui_interface.py:601 gajim/gui_interface.py:632
+#: gajim/gui_interface.py:587 gajim/gui_interface.py:618
+#: gajim/gtk/filetransfer.py:332 gajim/gtk/filetransfer.py:333
 #: gajim/gtk/notification.py:173 gajim/gtk/notification.py:276
 msgid "File Transfer Error"
 msgstr "Грешка при файловия трансфер"
 
-#: gajim/gui_interface.py:666
+#: gajim/gui_interface.py:652
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s иска да ви изпрати файл."
 
-#: gajim/gui_interface.py:668 gajim/gtk/filetransfer.py:479
+#: gajim/gui_interface.py:654 gajim/gtk/filetransfer.py:484
 #: gajim/gtk/notification.py:172 gajim/gtk/notification.py:274
 msgid "File Transfer Request"
 msgstr "Запитване за файлов трансфер"
 
-#: gajim/gui_interface.py:767
+#: gajim/gui_interface.py:753
 #, fuzzy
 msgid "Remote Contact Stopped Transfer"
 msgstr "Премахване на контакт от списъка"
 
-#: gajim/gui_interface.py:772
+#: gajim/gui_interface.py:758
 #, fuzzy
 msgid "Error Opening File"
 msgstr "Грешка при четене на файл:"
 
-#: gajim/gui_interface.py:782
+#: gajim/gui_interface.py:768
 #, fuzzy
 msgid "SSL Certificate Error"
 msgstr "Грешка в сертификата на SSL"
 
-#: gajim/gui_interface.py:795 gajim/gui_interface.py:826
-#: gajim/gui_interface.py:853 gajim/gtk/notification.py:174
+#: gajim/gui_interface.py:781 gajim/gui_interface.py:812
+#: gajim/gui_interface.py:839 gajim/gtk/notification.py:174
 #: gajim/gtk/notification.py:279
 msgid "File Transfer Stopped"
 msgstr "Файловият трансфер е преустановен"
 
-#: gajim/gui_interface.py:799
+#: gajim/gui_interface.py:785
 #, fuzzy
 msgid "File Transfer Failed"
 msgstr "Файлови трансфери"
 
-#: gajim/gui_interface.py:822
+#: gajim/gui_interface.py:808
 #, fuzzy, python-format
 msgid "%(filename)s received from %(name)s."
 msgstr "Файловият трансфер на %(filename)s от %(name)s прекъсна."
 
-#: gajim/gui_interface.py:827
+#: gajim/gui_interface.py:813
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Файловият трансфер на %(filename)s от %(name)s прекъсна."
 
-#: gajim/gui_interface.py:833
+#: gajim/gui_interface.py:819
 #, fuzzy, python-format
 msgid "File transfer of %(filename)s from %(name)s failed."
 msgstr "Файловият трансфер на %(filename)s от %(name)s прекъсна."
 
-#: gajim/gui_interface.py:848
+#: gajim/gui_interface.py:834
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Успешно изпратихте %(filename)s на %(name)s."
 
-#: gajim/gui_interface.py:854
+#: gajim/gui_interface.py:840
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Файловият трансфер на %(filename)s до %(name)s прекъсна."
 
-#: gajim/gui_interface.py:860
+#: gajim/gui_interface.py:846
 #, fuzzy, python-format
 msgid "File transfer of %(filename)s to %(name)s failed."
 msgstr "Файловият трансфер на %(filename)s до %(name)s прекъсна."
 
-#: gajim/gui_interface.py:971
+#: gajim/gui_interface.py:957
 msgid "Username Conflict"
 msgstr "Конфликт с имената на потребители"
 
-#: gajim/gui_interface.py:972
+#: gajim/gui_interface.py:958
 msgid "Please type a new username for your local account"
 msgstr "Укажете ново потребителско име за локалния ви акаунт"
 
-#: gajim/gui_interface.py:995
+#: gajim/gui_interface.py:981
 msgid "Resource Conflict"
 msgstr "Конфликт на ресурсите"
 
-#: gajim/gui_interface.py:996
+#: gajim/gui_interface.py:982
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
 msgstr "Вече сте свързани към този акаунт със същия ресурс. Въведете нов."
 
-#: gajim/gui_interface.py:1053
+#: gajim/gui_interface.py:1039
 #, fuzzy, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s иска да ви изпрати файл."
 
-#: gajim/gui_interface.py:1055
+#: gajim/gui_interface.py:1041
 #, fuzzy
 msgid "Voice Chat Request"
 msgstr "Запитване за файлов трансфер"
 
-#: gajim/gui_interface.py:1123 gajim/gtk/account_wizard.py:312
+#: gajim/gui_interface.py:1109 gajim/gtk/account_wizard.py:312
 msgid "Certificate Already in File"
 msgstr "Сертификатът вече е във файла"
 
-#: gajim/gui_interface.py:1124 gajim/gtk/account_wizard.py:313
+#: gajim/gui_interface.py:1110 gajim/gtk/account_wizard.py:313
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr ""
 "Този сертификат вече е във файла „%s“, така че няма да бъде добавен наново."
 
-#: gajim/gui_interface.py:1145
+#: gajim/gui_interface.py:1131
 #, fuzzy, python-format
 msgid "The authenticity of the %s certificate could be invalid"
 msgstr "Автентичността на сертификата на %s може да е под въпрос."
 
-#: gajim/gui_interface.py:1148
+#: gajim/gui_interface.py:1134
 #, python-format
 msgid ""
 "\n"
@@ -2189,7 +2164,7 @@ msgstr ""
 "\n"
 "Неизвестна грешка на SSL: %d"
 
-#: gajim/gui_interface.py:1150
+#: gajim/gui_interface.py:1136
 #, python-format
 msgid ""
 "\n"
@@ -2198,11 +2173,11 @@ msgstr ""
 "\n"
 "Грешка на SSL: <b>%s</b>"
 
-#: gajim/gui_interface.py:1155
+#: gajim/gui_interface.py:1141
 msgid "Error verifying SSL certificate"
 msgstr "Грешка при проверка на сертификата на SSL"
 
-#: gajim/gui_interface.py:1156
+#: gajim/gui_interface.py:1142
 #, fuzzy, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your XMPP server: "
@@ -2213,7 +2188,7 @@ msgstr ""
 "%(error)s\n"
 "Все още ли искате да се свържете със сървъра?"
 
-#: gajim/gui_interface.py:1160 gajim/gtk/account_wizard.py:412
+#: gajim/gui_interface.py:1146 gajim/gtk/account_wizard.py:413
 #, fuzzy, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -2226,207 +2201,197 @@ msgstr ""
 "Отпечатък тип SHA1 на сертификата:\n"
 "%s"
 
-#: gajim/gui_interface.py:1166
+#: gajim/gui_interface.py:1152
 msgid "Ignore this error for this certificate."
 msgstr "Пренебрегване на грешката за този сертификат."
 
-#: gajim/gui_interface.py:1174
+#: gajim/gui_interface.py:1160
 #, fuzzy, python-format
 msgid "SSL Certificate Verification for %s"
 msgstr "Грешка в сертификата на SSL"
 
-#: gajim/gui_interface.py:1442 gajim/gtk/join_groupchat.py:235
-msgid "You can not join a group chat unless you are connected."
-msgstr "Трябва да сте свързани, за да влезете в стая."
-
-#: gajim/gui_interface.py:1448
-#, fuzzy
-msgid "JID is not a Groupchat"
-msgstr "Това не е стая"
-
-#: gajim/gui_interface.py:1579
-msgid "This is not a group chat"
-msgstr "Това не е стая"
-
-#: gajim/gui_interface.py:1580
-#, python-format
-msgid ""
-"%(room_jid)s is already in your roster. Please check if %(room_jid)s is a "
-"correct group chat name. If it is, delete it from your roster and try "
-"joining the group chat again."
-msgstr ""
-
-#: gajim/gui_interface.py:1604 gajim/dialog_messages.py:58
+#: gajim/gui_interface.py:1577
 msgid "You cannot join a group chat while you are invisible"
 msgstr "Не може да влезете в стая, докато сте невидими."
 
-#: gajim/gui_interface.py:2037
+#: gajim/gui_interface.py:1976
 msgid "Could not save your settings and preferences"
 msgstr "Неуспех при запазването на настройките"
 
-#: gajim/gui_interface.py:2098
+#: gajim/gui_interface.py:2037
 msgid "Gajim: IPython Console"
 msgstr ""
 
-#: gajim/dialog_messages.py:32
+#: gajim/dialog_messages.py:31 gajim/dialog_messages.py:36
+#: gajim/gtk/single_message.py:305 gajim/gtk/account_wizard.py:229
 #, fuzzy
-msgid "You can not start a new conversation unless you are connected."
-msgstr "Трябва да сте свързани, за да влезете в стая."
-
-#: gajim/dialog_messages.py:36 gajim/dialog_messages.py:41
-#: gajim/gtk/single_message.py:305 gajim/gtk/join_groupchat.py:211
-#: gajim/gtk/account_wizard.py:229
-msgid "Invalid JID"
-msgstr "Невалиден JID"
+msgid "Invalid XMPP Address"
+msgstr "Невалиден файл"
 
-#: gajim/dialog_messages.py:42 gajim/gtk/single_message.py:306
+#: gajim/dialog_messages.py:37
 #, fuzzy, python-format
-msgid "It is not possible to send a message to %s, this JID is not valid."
+msgid ""
+"It is not possible to send a message to %s. This XMPP Address is not valid."
 msgstr "Не е възможно да бъдат изпращани празни файлове"
 
-#: gajim/dialog_messages.py:47
-msgid "Unread events"
+#: gajim/dialog_messages.py:42
+#, fuzzy
+msgid "Unread Events"
 msgstr "Непрочетени събития"
 
-#: gajim/dialog_messages.py:48
-msgid "Read all pending events before removing this account."
+#: gajim/dialog_messages.py:43
+#, fuzzy
+msgid "Read or acknowledge all pending events before removing this account."
 msgstr "Преди да премахнете този акаунт, прочетете всички чакащи събития."
 
-#: gajim/dialog_messages.py:52
+#: gajim/dialog_messages.py:48
 #, fuzzy
 msgid "Invalid Form"
 msgstr "Невалиден формат"
 
-#: gajim/dialog_messages.py:53
+#: gajim/dialog_messages.py:49
 #, fuzzy
 msgid "The form is not filled correctly."
 msgstr "Псевдонимът съдържа непозволени знаци."
 
-#: gajim/dialog_messages.py:57 gajim/common/helpers.py:309
+#: gajim/dialog_messages.py:53 gajim/common/helpers.py:315
 msgid "Invisible"
 msgstr "Невидим"
 
-#: gajim/dialog_messages.py:62
-msgid "A connection is not available"
+#: gajim/dialog_messages.py:54
+#, fuzzy
+msgid "You cannot join a group chat while being invisible."
+msgstr "Не може да влезете в стая, докато сте невидими."
+
+#: gajim/dialog_messages.py:58
+#, fuzzy
+msgid "No Connection Available"
 msgstr "В момента няма връзка"
 
-#: gajim/dialog_messages.py:63
+#: gajim/dialog_messages.py:59
 msgid "Your message can not be sent until you are connected."
 msgstr "Съобщението не може да бъде изпратено, докато не се свържете."
 
-#: gajim/dialog_messages.py:67
-#, fuzzy
-msgid "JID already in list"
-msgstr "В списъка вече има такъв Jabber ID"
+#: gajim/dialog_messages.py:63
+msgid "XMPP Address Already in List"
+msgstr ""
 
-#: gajim/dialog_messages.py:68
+#: gajim/dialog_messages.py:64
 #, fuzzy
-msgid "The JID you entered is already in the list. Choose another one."
+msgid ""
+"The XMPP Address you entered is already in the list. Please choose another "
+"one."
 msgstr "Въведеният Jabber ID вече съществува в списъка. Изберете друг."
 
-#: gajim/dialog_messages.py:72
-msgid "Invalid answer"
+#: gajim/dialog_messages.py:69
+#, fuzzy
+msgid "Invalid Answer"
 msgstr "Невалиден отговор"
 
-#: gajim/dialog_messages.py:73
+#: gajim/dialog_messages.py:70
 #, python-format
 msgid "Transport %(name)s answered wrongly to register request: %(error)s"
 msgstr ""
 "Транспортът „%(name)s“ отговори погрешно на запитването за регистрация: "
 "%(error)s"
 
-#: gajim/dialog_messages.py:78
+#: gajim/dialog_messages.py:75
 #, fuzzy
 msgid "Wrong Custom Hostname"
 msgstr "Използване на нестандартен хост/порт"
 
-#: gajim/dialog_messages.py:79
+#: gajim/dialog_messages.py:76
 #, fuzzy, python-format
-msgid "Wrong custom hostname \"%s\". Ignoring it."
+msgid "Custom hostname \"%s\" is wrong. It will be ignored."
 msgstr "Използване на нестандартен хост/порт"
 
-#: gajim/dialog_messages.py:83
-msgid "Error while removing privacy list"
+#: gajim/dialog_messages.py:80
+#, fuzzy
+msgid "Error While Removing Privacy List"
 msgstr "Грешка при премахването на списъка за уединение"
 
-#: gajim/dialog_messages.py:84
-#, python-format
+#: gajim/dialog_messages.py:81
+#, fuzzy, python-format
 msgid ""
-"Privacy list %s has not been removed. It is maybe active in one of your "
-"connected resources. Deactivate it and try again."
+"Privacy list %s has not been removed. It is probably active in one of your "
+"connected resources. Please deactivate it and try again."
 msgstr ""
 "Списъкът за уединение „%s“ не беше премахнат. Навярно е активен в някой от "
 "свързаните ви ресурси. Изключете го и опитайте отново."
 
-#: gajim/dialog_messages.py:90
-msgid "Invisibility not supported"
+#: gajim/dialog_messages.py:87
+#, fuzzy
+msgid "Invisibility Not Supported"
 msgstr "Състоянието „Невидим“ не се поддържа."
 
-#: gajim/dialog_messages.py:91
-#, python-format
-msgid "Account %s doesn't support invisibility."
+#: gajim/dialog_messages.py:88
+#, fuzzy, python-format
+msgid "This account %s doesn't support invisibility."
 msgstr "Акаунтът „%s“ не поддържа невидимост."
 
-#: gajim/dialog_messages.py:95
+#: gajim/dialog_messages.py:92
 #, fuzzy
-msgid "Unregister failed"
+msgid "Unregister Failed"
 msgstr "Неуспех при свързването"
 
-#: gajim/dialog_messages.py:96
-#, python-format
-msgid "Unregistration with server %(server)s failed: %(error)s"
-msgstr ""
+#: gajim/dialog_messages.py:93
+#, fuzzy, python-format
+msgid "Unregistration on server %(server)s failed: %(error)s"
+msgstr "Неуспех при свързването със сървъра-посредник"
 
-#: gajim/dialog_messages.py:100
+#: gajim/dialog_messages.py:97
 #, fuzzy
-msgid "Registration succeeded"
+msgid "Registration Succeeded"
 msgstr "Регистриране в %s"
 
-#: gajim/dialog_messages.py:101
-#, python-format
-msgid "Registration with agent %s succeeded"
-msgstr ""
+#: gajim/dialog_messages.py:98
+#, fuzzy, python-format
+msgid "Registration with agent %s succeeded."
+msgstr "Регистриране в %s"
 
-#: gajim/dialog_messages.py:105 gajim/gtk/service_registration.py:215
+#: gajim/dialog_messages.py:102
 #, fuzzy
-msgid "Registration failed"
+msgid "Registration Failed"
 msgstr "Неуспех при свързването"
 
-#: gajim/dialog_messages.py:106
+#: gajim/dialog_messages.py:103
 #, python-format
 msgid ""
 "Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
 msgstr ""
 
-#: gajim/dialog_messages.py:111
+#: gajim/dialog_messages.py:108
 #, fuzzy
 msgid "Unable to Join Group Chat"
 msgstr "Неуспех при влизането в стаята"
 
-#: gajim/dialog_messages.py:116
-msgid "GStreamer error"
-msgstr ""
+#: gajim/dialog_messages.py:113
+#, fuzzy
+msgid "GStreamer Error"
+msgstr "Грешка в базата от данни"
 
-#: gajim/dialog_messages.py:117
+#: gajim/dialog_messages.py:114
 #, fuzzy, python-format
 msgid ""
 "Error: %(error)s\n"
 "Debug: %(debug)s"
 msgstr "Грешка: %s"
 
-#: gajim/dialog_messages.py:121
-msgid "Wrong host"
+#: gajim/dialog_messages.py:118
+#, fuzzy
+msgid "Wrong Host"
 msgstr "Грешен хост"
 
-#: gajim/dialog_messages.py:122
+#: gajim/dialog_messages.py:119
 msgid "Invalid local address? :-O"
 msgstr "Невалиден локален адрес? :-O"
 
-#: gajim/dialog_messages.py:126
-msgid "Avahi error"
+#: gajim/dialog_messages.py:123
+#, fuzzy
+msgid "Avahi Error"
 msgstr "Грешка на Avahi"
 
-#: gajim/dialog_messages.py:127
+#: gajim/dialog_messages.py:124
 #, python-format
 msgid ""
 "%s\n"
@@ -2436,66 +2401,66 @@ msgstr ""
 "Изпращането и получаването на съобщения тип „link-local“ може и да не "
 "функционира правилно."
 
-#: gajim/dialog_messages.py:131 gajim/dialog_messages.py:136
+#: gajim/dialog_messages.py:128 gajim/dialog_messages.py:133
 #, fuzzy
-msgid "Could not request upload slot"
+msgid "Could not request upload slot for HTTP File Upload"
 msgstr "Неуспех при стартирането на локална услуга"
 
-#: gajim/dialog_messages.py:137
-msgid "Got unexpected response from server (see log)"
+#: gajim/dialog_messages.py:134
+msgid "Got unexpected response from server (see log)."
 msgstr ""
 
-#: gajim/dialog_messages.py:141 gajim/dialog_messages.py:146
+#: gajim/dialog_messages.py:138 gajim/dialog_messages.py:143
 #, fuzzy
-msgid "Could not open file"
+msgid "Could not Open File"
 msgstr "Неуспех при зареждането на изображението"
 
-#: gajim/dialog_messages.py:142
-msgid "Exception raised while opening file (see log)"
+#: gajim/dialog_messages.py:139
+msgid "Exception raised while trying to open file (see log)."
 msgstr ""
 
-#: gajim/dialog_messages.py:151
-msgid "Unsecure"
-msgstr ""
+#: gajim/dialog_messages.py:148
+#, fuzzy
+msgid "Not Secure"
+msgstr "Не е започнал"
 
-#: gajim/dialog_messages.py:152
+#: gajim/dialog_messages.py:149
 #, fuzzy
-msgid "Server returned unsecure transport (HTTP)"
+msgid "The server returned an insecure transport (HTTP)."
 msgstr "Услугата върна грешка."
 
-#: gajim/dialog_messages.py:156
+#: gajim/dialog_messages.py:153
 #, fuzzy
-msgid "Could not upload file"
+msgid "Could not Upload File"
 msgstr "Неуспех при зареждането на изображението"
 
-#: gajim/dialog_messages.py:157
+#: gajim/dialog_messages.py:154
 #, python-format
 msgid "HTTP response code from server: %s"
 msgstr ""
 
-#: gajim/dialog_messages.py:161
+#: gajim/dialog_messages.py:158
 msgid "Upload Error"
 msgstr ""
 
-#: gajim/dialog_messages.py:166
+#: gajim/dialog_messages.py:163
 msgid "Encryption Error"
 msgstr ""
 
-#: gajim/dialog_messages.py:167
-#, fuzzy
-msgid "For the chosen encryption there is no encryption method available"
-msgstr "В момента няма връзка"
+#: gajim/dialog_messages.py:164
+msgid "There is no encryption method available for the chosen encryption."
+msgstr ""
 
-#: gajim/dialog_messages.py:171
+#: gajim/dialog_messages.py:169
 #, fuzzy
-msgid "Avatar upload failed"
+msgid "Avatar Upload Failed"
 msgstr "Неуспех при публикуването на визитката"
 
-#: gajim/privatechat_control.py:204
+#: gajim/privatechat_control.py:207
 msgid "Sending private message failed"
 msgstr "Неуспех при изпращането на лично съобщение"
 
-#: gajim/privatechat_control.py:206
+#: gajim/privatechat_control.py:209
 #, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr "Вече не сте в стая „%(room)s“ или „%(nick)s“ е напуснал(а)."
@@ -2518,7 +2483,7 @@ msgstr "показване на помощ за команда"
 
 #: gajim/gajim_remote.py:85
 #, fuzzy
-msgid "Lists all contacts in roster, one for each line"
+msgid "Lists all contacts in the contact list, one for each line"
 msgstr ""
 "Показване на списък с всички контакти. Всеки контакт се появява на отделен "
 "ред"
@@ -2606,11 +2571,13 @@ msgstr ""
 
 #: gajim/gajim_remote.py:118
 #, fuzzy
-msgid "Sends new chat message to a contact in the roster. Account is optional."
+msgid ""
+"Sends new chat message to a contact in the contact list. Account is optional."
 msgstr "Употреба: /%s, изпраща съобщение до контакта."
 
 #: gajim/gajim_remote.py:120 gajim/gajim_remote.py:130
-msgid "JID of the contact that will receive the message"
+#, fuzzy
+msgid "XMPP Address of the contact that will receive the message"
 msgstr "JID на контакта, който ще получи съобщението"
 
 #: gajim/gajim_remote.py:121 gajim/gajim_remote.py:132
@@ -2624,8 +2591,10 @@ msgid "if specified, the message will be sent using this account"
 msgstr "ако е указано, съобщението ще бъде изпратено от този акаунт"
 
 #: gajim/gajim_remote.py:127
-msgid "Sends a chat message to someone on your roster. Account is optional."
-msgstr ""
+#, fuzzy
+msgid ""
+"Sends a chat message to someone on your contact list. Account is optional."
+msgstr "Употреба: /%s, изпраща съобщение до контакта."
 
 #: gajim/gajim_remote.py:131
 msgid "subject"
@@ -2636,11 +2605,13 @@ msgid "message subject"
 msgstr "тема на съобщението"
 
 #: gajim/gajim_remote.py:138
-msgid "Sends new message to a groupchat you've joined."
+#, fuzzy
+msgid "Sends new message to a group chat you've joined."
 msgstr "Изпраща ново съобщение до стаята, в която сте влезли."
 
 #: gajim/gajim_remote.py:140
-msgid "JID of the room that will receive the message"
+#, fuzzy
+msgid "XMPP Address of the group chat that will receive the message"
 msgstr "JID на стаята, която ще получи съобщението"
 
 #: gajim/gajim_remote.py:147
@@ -2649,7 +2620,8 @@ msgstr "Получаване на подробна информация за к�
 
 #: gajim/gajim_remote.py:149 gajim/gajim_remote.py:162
 #: gajim/gajim_remote.py:192
-msgid "JID of the contact"
+#, fuzzy
+msgid "XMPP Address of the contact"
 msgstr "JID на контакта"
 
 #: gajim/gajim_remote.py:153
@@ -2711,7 +2683,8 @@ msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Запазва текущото състояние на настройките във файла .config"
 
 #: gajim/gajim_remote.py:190
-msgid "Removes contact from roster"
+#, fuzzy
+msgid "Removes contact from contact list"
 msgstr "Премахване на контакт от списъка"
 
 #: gajim/gajim_remote.py:193
@@ -2759,9 +2732,9 @@ msgid "Missing argument \"contact_jid\""
 msgstr "Липсващ аргумент „contact_jid“"
 
 #: gajim/gajim_remote.py:275
-#, python-format
+#, fuzzy, python-format
 msgid ""
-"'%s' is not in your roster.\n"
+"'%s' is not in your contact list.\n"
 "Please specify account for sending the message."
 msgstr ""
 "„%s“ не е в списъка ви.\n"
@@ -2985,12 +2958,12 @@ msgstr "Края на седмицата"
 msgid "Weekend!"
 msgstr "Събота и неделя!"
 
-#: gajim/common/logger.py:192 gajim/common/logger.py:197
+#: gajim/common/logger.py:189 gajim/common/logger.py:194
 #, python-format
 msgid "%s is a directory but should be a file"
 msgstr "%s e папка, а би трябвало да е файл"
 
-#: gajim/common/logger.py:217
+#: gajim/common/logger.py:214
 #, fuzzy, python-format
 msgid "Creating %s"
 msgstr "Унищожаване на %s"
@@ -3064,35 +3037,38 @@ msgstr "%(nickname)s се изключи"
 msgid "Contact Signed Out"
 msgstr "Изключи се контакт"
 
-#: gajim/common/contacts.py:455
-msgid "Not in roster"
-msgstr "Не е в списъка"
-
 #: gajim/common/config.py:80
+#, fuzzy
 msgid ""
 "Show desktop notification even when a chat window is opened for this contact "
-"and does not have focus"
+"and does not have focus."
 msgstr ""
+"Позволяване на прозорци/уведомления при _Отсъствам/Не съм на разположение/"
+"Зает/Невидим"
 
 #: gajim/common/config.py:81
-msgid "Play sound when user is busy"
+msgid "Play sound even when being busy."
 msgstr ""
 
 #: gajim/common/config.py:83
-msgid "Show only online and free for chat contacts in roster."
-msgstr ""
+#, fuzzy
+msgid "Show only online and free for chat contacts in the contact list."
+msgstr "Бих искал(а) да ви добавя към списъка си."
 
 #: gajim/common/config.py:86
 msgid "Time in minutes, after which your status changes to away."
 msgstr "Време в минути, след което състоянието да се променя на „Отсъствам“."
 
 #: gajim/common/config.py:87
-msgid "$S (Away as a result of being idle more than $T min)"
+#, fuzzy
+msgid "$S (Away: Idle more than $T min)"
 msgstr "$S (Отсъствам поради липса на активност над $T мин)"
 
 #: gajim/common/config.py:87
 #, fuzzy
-msgid "$S will be replaced by current status message, $T by autoawaytime."
+msgid ""
+"$S will be replaced by current status message, $T by the 'autoawaytime' "
+"value."
 msgstr ""
 "$S ще бъде заменено от текущото съобщение за състояние, а $T от времето на "
 "отсъствие."
@@ -3104,72 +3080,76 @@ msgstr ""
 "разположение“."
 
 #: gajim/common/config.py:90
-msgid "$S (Not available as a result of being idle more than $T min)"
+#, fuzzy
+msgid "$S (Not available: Idle more than $T min)"
 msgstr "$S (Не съм на разположение поради липса на активност над $T мин)"
 
 #: gajim/common/config.py:90
 #, fuzzy
-msgid "$S will be replaced by current status message, $T by autoxatime."
+msgid ""
+"$S will be replaced by current status message, $T by the 'autoxatime' value."
 msgstr ""
 "$S ще бъде заменено от текущото съобщение за състояние, а $T от времето на "
 "отсъствие."
 
 #: gajim/common/config.py:93
 msgid ""
-"When to show notification area icon. Can be 'never', 'on_event', 'always'."
+"When to show the notification area icon. Can be 'never', 'on_event', and "
+"'always'."
 msgstr ""
 
 #: gajim/common/config.py:94
-msgid "Allow to hide the roster window even if the tray icon is not shown."
+msgid ""
+"Allow to hide the contact list window even if the notification area icon is "
+"not shown."
 msgstr ""
 
 #: gajim/common/config.py:97
 #, fuzzy
-msgid "Contact signed in notification color."
-msgstr "Показване на събитието в спис_ъка"
+msgid "Notification color for contacts signing in."
+msgstr "Уведомяване за _включващи се контакти"
 
 #: gajim/common/config.py:98
 #, fuzzy
-msgid "Contact signout notification color"
-msgstr "Показване на събитието в спис_ъка"
+msgid "Notification color for contacts signing out."
+msgstr "Уведомяване за _изключващи се контакти"
 
 #: gajim/common/config.py:99
 #, fuzzy
-msgid "New message notification color."
+msgid "Notification color for new message notification."
 msgstr "Показване на нови съобщения в изскачащ прозорец?"
 
 #: gajim/common/config.py:100
 #, fuzzy
-msgid "File transfer request notification color."
-msgstr "Запитване за файлов трансфер"
+msgid "Notification color for file transfer request."
+msgstr "_Уведомяване при завършване на файловия трансфер"
 
 #: gajim/common/config.py:101
 #, fuzzy
-msgid "File transfer error notification color."
-msgstr "Файловият трансфер е прекъснат"
+msgid "Notification color for file transfer errors."
+msgstr "_Уведомяване при завършване на файловия трансфер"
 
 #: gajim/common/config.py:102
-#, fuzzy
-msgid "File transfer complete or stopped notification color."
-msgstr "Уведомяване чрез изскачащ прозорец при завършване на файловия трансфер"
+msgid "Notification color for stopped or completed file transfers."
+msgstr ""
 
 #: gajim/common/config.py:103
-#, fuzzy
-msgid "Groupchat invitation notification color"
-msgstr "Покана за разговор в стая"
+msgid "Notification color for group chat invitations."
+msgstr ""
 
 #: gajim/common/config.py:104
 #, fuzzy
-msgid "Background color of status changed notification"
+msgid "Notification background color for changed status."
 msgstr "Цвят на фона на контактите, които се включват."
 
 #: gajim/common/config.py:105
-msgid "Other dialogs color."
+msgid "Notification color for other dialogs."
 msgstr ""
 
 #: gajim/common/config.py:106
+#, fuzzy
 msgid ""
-"List (space separated) of rows (accounts and groups) that are collapsed."
+"List of rows (accounts and groups) that are collapsed (space separated)."
 msgstr ""
 "Списък (разделен с интервали) на редове (акаунти и групи), които да се "
 "свиват автоматично."
@@ -3178,8 +3158,10 @@ msgstr ""
 msgid "default"
 msgstr "по подразбиране"
 
-#: gajim/common/config.py:113
-msgid "Language used by speller"
+#: gajim/common/config.py:113 gajim/common/config.py:424
+#: gajim/common/config.py:431
+#, fuzzy
+msgid "Language used for spell checking."
 msgstr "Език, който да се използва за проверката на правописа"
 
 #: gajim/common/config.py:114
@@ -3194,10 +3176,11 @@ msgstr ""
 "„never“ - никога да не се изписва часа."
 
 #: gajim/common/config.py:115
+#, fuzzy
 msgid ""
 "Print time in chats using Fuzzy Clock. Value of fuzziness from 1 to 4, or 0 "
-"to disable fuzzyclock. 1 is the most precise clock, 4 the least precise one. "
-"This is used only if print_time is 'sometimes'."
+"to disable Fuzzy Clock. 1 is the most precise clock, 4 the least precise "
+"one. This is used only if 'print_time' is 'sometimes'."
 msgstr ""
 "Изписване на часа при разговорите чрез „Относителен часовник“. Стойността на "
 "относителността е от 1 до 4, или 0 за премахването на относителния часовник. "
@@ -3215,16 +3198,18 @@ msgstr "Тълкуване на двойки от „* / _“ като възм�
 #: gajim/common/config.py:120
 #, fuzzy
 msgid ""
-"If true, do not remove */_ . So *abc* will be bold but with * * not removed."
+"If enabled, do not remove */_ . So *abc* will be bold but with * * not "
+"removed."
 msgstr ""
 "Ако е активирана, не се премахват */_. Така *абв* ще е в получер стил, но "
 "със символите * *."
 
 #: gajim/common/config.py:123
+#, fuzzy
 msgid ""
-"Uses ReStructured text markup to send HTML, plus ascii formatting if "
-"selected. For syntax, see http://docutils.sourceforge.net/docs/ref/rst/"
-"restructuredtext.html (If you want to use this, install docutils)"
+"Uses ReStructured text markup to send HTML, plus ASCII formatting if "
+"selected. Needs docutils installed (for syntax, see http://docutils."
+"sourceforge.net/docs/ref/rst/restructuredtext.html)."
 msgstr ""
 "Ако е избрана, използва реструктуриран текст за изпращане на HTML и "
 "форматиране в ASCII, ако е указано. За синтаксиса, вижте http://docutils."
@@ -3232,37 +3217,40 @@ msgstr ""
 "това, инсталирайте docutils)"
 
 #: gajim/common/config.py:132
+#, fuzzy
 msgid ""
-"Character to add after nickname when using nick completion (tab) in group "
-"chat."
+"Character to add after nickname when using nickname completion (tab) in "
+"group chat."
 msgstr ""
 "Знак за добавяне след името на псевдонима при използване на автоматично "
 "допълване (TAB) в стая."
 
 #: gajim/common/config.py:133
+#, fuzzy
 msgid ""
-"Character to propose to add after desired nickname when desired nickname is "
-"used by someone else in group chat."
+"Character to propose to add after desired nickname when nickname is already "
+"used in group chat."
 msgstr ""
 "Знак, който да се предложи да бъде добавен след желания псевдоним, когато "
 "той вече е използван от някой в стаята."
 
 #: gajim/common/config.py:155
 msgid ""
-"If true, Gajim will save roster position when hiding roster, and restore it "
-"when showing roster."
+"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:161
-msgid "Place the roster on the right in single window mode"
+msgid "Place the contact list on the right in single window mode"
 msgstr ""
 
 #: gajim/common/config.py:167
 #, fuzzy
 msgid ""
-"This option let you customize timestamp that is printed in conversation. For "
-"example \"[%H:%M] \" will show \"[hour:minute] \". See python doc on "
-"strftime for full documentation: http://docs.python.org/lib/module-time.html"
+"This option lets you customize the timestamp that is printed in "
+"conversation. For example '[%H:%M] ' will show '[hour:minute] '. See python "
+"doc on strftime for full documentation (https://docs.python.org/3/library/"
+"time.html)."
 msgstr ""
 "Чрез тази опция може да персонализирате начина на изписване на времето в "
 "разговор. Например „[%H:%M] “ ще показва „час:минути] “. Вижте "
@@ -3270,257 +3258,261 @@ msgstr ""
 "python.org/lib/module-time.html"
 
 #: gajim/common/config.py:168
-msgid "Characters that are printed before the nickname in conversations"
+#, fuzzy
+msgid "Characters that are printed before the nickname in conversations."
 msgstr "Знаци, които се изобразяват в разговори преди псевдонима"
 
 #: gajim/common/config.py:169
-msgid "Characters that are printed after the nickname in conversations"
+#, fuzzy
+msgid "Characters that are printed after the nickname in conversations."
 msgstr "Знаци, които се изобразяват в разговори след псевдонима"
 
 #: gajim/common/config.py:170
-msgid "Add * and [n] in roster title?"
-msgstr "Добавяне на * и [n] към заглавието на списъка?"
+#, fuzzy
+msgid "If enabled, Gajim will add * and [n] in contact list window title."
+msgstr ""
+"Ако тази опция е избрана, Gajim ще изобразява настроението на контактите в "
+"списъка."
 
 #: gajim/common/config.py:171
 #, fuzzy
 msgid ""
-"How many history messages should be restored when a chat tab/window is "
-"reopened?"
+"Number of messages from chat history to be restored when a chat tab/window "
+"is reopened."
 msgstr ""
 "Колко реда от предишния разговор да за запомнят при повторното отваряне на "
 "подпрозорец/прозорец."
 
 #: gajim/common/config.py:172
-msgid "How far back in time (minutes) history is restored. -1 means no limit."
+msgid ""
+"How far back in time (minutes) chat history is restored. -1 means no limit."
 msgstr ""
 
 #: gajim/common/config.py:173
 msgid ""
-"How many lines to request from server when entering a groupchat. -1 means no "
-"limit"
+"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:174
 msgid ""
-"Minutes of backlog to request when entering a groupchat. -1 means no limit"
+"Should automatic rejoin be activated when you were kicked from a group chat?"
 msgstr ""
 
 #: gajim/common/config.py:175
-msgid ""
-"How many seconds to wait before trying to autorejoin to a conference you are "
-"being disconnected from. Set to 0 to disable autorejoining."
-msgstr ""
-
-#: gajim/common/config.py:176
-msgid "Should autorejoin be activated when kicked from a conference?"
-msgstr ""
-
-#: gajim/common/config.py:177
-msgid ""
-"Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
-"Client default behaviour)."
+#, fuzzy
+msgid "Send message on Ctrl+Enter and make a new line with Enter."
 msgstr "Изпращане на съобщение при Ctrl+Enter и нов ред с „Enter“."
 
-#: gajim/common/config.py:179
-msgid "How many lines to store for Ctrl+KeyUP."
+#: gajim/common/config.py:177
+#, fuzzy
+msgid "How many lines to store for Ctrl+KeyUP (previously sent messages)."
 msgstr "Колко реда да се запазват за Ctrl+горна стрелка."
 
-#: gajim/common/config.py:182
+#: gajim/common/config.py:180
 #, fuzzy, python-format
 msgid ""
-"Either custom URL with %%s in it where %%s is the word/phrase or "
-"'WIKTIONARY' which means use Wikitionary."
+"Either a custom URL with %%s in it (where %%s is the word/phrase) or "
+"'WIKTIONARY' (which means use Wikitionary)."
 msgstr ""
 "Или определен адрес, съдържащ %s, където %s е думата/фразата, или "
 "„WIKTIONARY“, което означава използване на wiktionary."
 
-#: gajim/common/config.py:185
+#: gajim/common/config.py:183
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr ""
 "Ако тази опция е избрана, Gajim може да се контролира отдалечено чрез gajim-"
 "remote."
 
-#: gajim/common/config.py:187
+#: gajim/common/config.py:185
+#, fuzzy
 msgid ""
-"When not printing time for every message (print_time==sometimes), print it "
+"When not printing time for every message ('print_time'==sometimes), print it "
 "every x minutes."
 msgstr ""
 "Когато не се изписва часа на всяко съобщение („print_time“ е настроено на "
 "„sometimes“), да се показва на всеки x минути."
 
-#: gajim/common/config.py:188
+#: gajim/common/config.py:186
 msgid "Ask before pasting an image."
 msgstr ""
 
-#: gajim/common/config.py:189
+#: gajim/common/config.py:187
 msgid "Ask before closing a group chat tab/window."
 msgstr "Питане преди затваряне на подпрозорец/прозорец на стая."
 
-#: gajim/common/config.py:190
+#: gajim/common/config.py:188
 #, fuzzy
 msgid ""
-"Always ask for confirmation before closing groupchats with any of the JIDs "
-"on this space separated list."
+"Always ask for confirmation before closing group chats with any of the XMPP "
+"Addresses on this list (space separated)."
 msgstr ""
 "Винаги да се пита преди затваряне на подпрозорец/прозорец на стая от този "
 "списък с адреси на стаи."
 
-#: gajim/common/config.py:191
+#: gajim/common/config.py:189
 #, fuzzy
 msgid ""
-"Never ask for confirmation before closing groupchats with any of the JIDs on "
-"this space separated list."
+"Never ask for confirmation before closing group chats with any of the XMPP "
+"Addresses on this list (space separated)."
 msgstr ""
 "Никога да не се пита преди затваряне на подпрозорец/прозорец на стая от този "
 "списък с адреси на стаи."
 
-#: gajim/common/config.py:192
+#: gajim/common/config.py:190
 msgid ""
-"Ask before closing tabbed chat window if there are controls that can lose "
-"data (chat, private chat, groupchat that will not be minimized)"
+"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:195
+#: gajim/common/config.py:193
 #, fuzzy
 msgid ""
-"Comma separated list of sent hosts, in addition of local interfaces, for "
-"File Transfer in case of address translation/port forwarding."
+"List of send hosts (comma separated) in addition to local interfaces for "
+"file transfers (in case of address translation/port forwarding)."
 msgstr ""
 "Списък от хостове, разделен със запетаи, които се изпращат като допълнение "
 "към локалните интерфейси за файлов трансфер в случай, че се ползва NAT/"
 "пренасочване на портове."
 
-#: gajim/common/config.py:196
+#: gajim/common/config.py:194
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "Според стандарта на IEC KiB = 1024 байта, KB = 1000 байта."
 
-#: gajim/common/config.py:198
+#: gajim/common/config.py:196
 #, fuzzy
 msgid "Notify of events in the notification area."
 msgstr "Уведомяване за събития в областта за уведомяване."
 
-#: gajim/common/config.py:199
+#: gajim/common/config.py:197
 msgid ""
-"If False, Gajim will display a static event icon instead of the blinking "
-"status icon in the notification area when notifying on event."
+"If disabled, Gajim will display a static event icon instead of the blinking "
+"status icon in the notification area when notifying about an event."
 msgstr ""
 
-#: gajim/common/config.py:205
+#: gajim/common/config.py:203
 msgid "Show tab when only one conversation?"
 msgstr "Показване на подпрозорец при един разговор?"
 
-#: gajim/common/config.py:206
+#: gajim/common/config.py:204
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "Показване на границата на подпрозореца в прозорците за разговор?"
 
-#: gajim/common/config.py:207
+#: gajim/common/config.py:205
 msgid "Show close button in tab?"
 msgstr "Показване на бутона за затваряне на подпрозореца?"
 
-#: gajim/common/config.py:220
+#: gajim/common/config.py:218
 msgid "Preview new messages in notification popup?"
 msgstr "Показване на нови съобщения в изскачащ прозорец?"
 
-#: gajim/common/config.py:223
+#: gajim/common/config.py:221
+#, fuzzy
 msgid ""
-"A semicolon-separated list of words that will be highlighted in group chats."
+"A list of words (semicolon separated) that will be highlighted in group "
+"chats."
 msgstr ""
 "Списък с думи, отделени с точка и запетая, които ще се осветяват при "
 "разговор в стая."
 
-#: gajim/common/config.py:224
+#: gajim/common/config.py:222
 #, fuzzy
 msgid ""
-"If true, quits Gajim when X button of Window Manager is clicked. This "
-"setting is taken into account only if notification icon is used."
+"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/common/config.py:225
+#: gajim/common/config.py:223
 msgid ""
-"If true, Gajim hides the Roster window on pressing the X button instead of "
-"minimizing into the Dock."
+"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:226
+#: gajim/common/config.py:224
 #, fuzzy
 msgid ""
-"If true, Gajim will display an icon on each tab containing unread messages. "
-"Depending on the theme, this icon may be animated."
+"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:227
+#: gajim/common/config.py:225
 #, fuzzy
 msgid ""
-"If true, Gajim will display the status message, if not empty, for every "
-"contact under the contact name in roster window."
+"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:233
-msgid "Define the position of the avatar in roster. Can be left or right"
+#: gajim/common/config.py:231
+#, fuzzy
+msgid ""
+"Define the position of avatars in the contact list. Can be 'left' or 'right'."
 msgstr ""
 "Позиция на аватара в списъка.  Може да е ляво (left) или дясно (right)."
 
-#: gajim/common/config.py:234
+#: gajim/common/config.py:232
 #, fuzzy
 msgid ""
-"If False, Gajim will no longer print status line in chats when a contact "
-"changes their status and/or their status message."
+"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:235
+#: gajim/common/config.py:233
 #, fuzzy
 msgid ""
 "Default Setting: Show a status message for every join or leave in a group "
-"chat"
+"chat."
 msgstr "Неуспех при влизането в стаята"
 
-#: gajim/common/config.py:236
+#: gajim/common/config.py:234
+#, fuzzy
 msgid ""
-"Default Setting: Show a status message for all status (away, dnd, etc.) "
-"changes of users in a group chat"
-msgstr ""
+"Default Setting: Show a status message for all status changes (away, dnd, "
+"etc.) of users in a group chat."
+msgstr "Неуспех при влизането в стаята"
 
-#: gajim/common/config.py:238
-msgid "Log XHTML messages instead of plain text messages."
+#: gajim/common/config.py:236
+msgid "Store XHTML messages in chat history instead of plain text messages."
 msgstr ""
 
-#: gajim/common/config.py:239
+#: gajim/common/config.py:237
 msgid "Don't show avatar for the transport itself."
 msgstr "Да не се показва аватара на транспорта."
 
-#: gajim/common/config.py:240
-msgid "Don't show roster in the system taskbar."
+#: gajim/common/config.py:238
+#, fuzzy
+msgid "Don't show contact list window in the system taskbar."
 msgstr "Да не се показва списъка в панела."
 
-#: gajim/common/config.py:241
+#: gajim/common/config.py:239
 #, fuzzy
 msgid ""
-"If true, make the window flash (the default behaviour in most Window "
-"Managers) when holding pending events."
+"If enabled, Gajim makes the window flash (the default behaviour in most "
+"Window Managers) when holding pending events."
 msgstr ""
 "Ако е активирана и инсталираните версии на GTK+ и PyGTK са поне 2.8, "
 "прозорецът ще мига (стандартното поведение при повечето мениджъри на "
 "прозорци) при задържане на чакащи събития."
 
-#: gajim/common/config.py:245
+#: gajim/common/config.py:243
 #, fuzzy
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
 "'always_with_roster' - Like 'always' but the messages are in a single window "
-"along with the roster.\n"
+"along with the contact list.\n"
 "'never' - All messages get their own window.\n"
 "'peracct' - Messages for each account are sent to a specific window.\n"
-"'pertype' - Each message type (e.g. chats vs. groupchats) is sent to a "
+"'pertype' - Each message type (e.g. chats vs. group chats) is sent to a "
 "specific window."
 msgstr ""
 "Контролира прозореца, където се отварят нови съобщения.\n"
@@ -3532,126 +3524,135 @@ msgstr ""
 "„pertype“ — Всеки тип съобщение (т.е. разговор и от стая) се отварят в "
 "специфичен прозорец."
 
-#: gajim/common/config.py:246
+#: gajim/common/config.py:244
 msgid ""
-"Show roster on startup.\n"
-"'always' - Always show roster.\n"
-"'never' - Never show roster.\n"
-"'last_state' - Restore the last state roster."
+"Show contact list window on startup.\n"
+"'always' - Always show contact list window.\n"
+"'never' - Never show contact list window.\n"
+"'last_state' - Restore last state of the contact list window."
 msgstr ""
 
-#: gajim/common/config.py:247
-msgid "If False, you will no longer see the avatar in the chat window."
+#: gajim/common/config.py:245
+#, fuzzy
+msgid "If enabled, Gajim displays the avatar in the chat window."
 msgstr ""
 "Ако е изключена, повече няма да виждате аватар в прозореца за разговор."
 
-#: gajim/common/config.py:248
+#: gajim/common/config.py:246
 #, fuzzy
-msgid "If true, pressing the escape key closes a tab/window."
+msgid "If enabled, pressing Esc closes a tab/window."
 msgstr ""
 "Ако е активирана, натискането на клавиша „Escape“ затваря прозореца/"
 "подпрозореца."
 
-#: gajim/common/config.py:249
-msgid "Hides the banner in a group chat window"
+#: gajim/common/config.py:247
+#, fuzzy
+msgid "Hides the banner in a group chat window."
 msgstr "Скрива лентата в прозореца на стаята"
 
-#: gajim/common/config.py:250
-msgid "Hides the banner in two persons chat window"
-msgstr "Скрива лентата в прозорец за разговор с два контакта"
+#: gajim/common/config.py:248
+#, fuzzy
+msgid "Hides the banner in a 1:1 chat window."
+msgstr "Скрива лентата в прозореца на стаята"
 
-#: gajim/common/config.py:251
-msgid "Hides the group chat occupants list in group chat window."
+#: gajim/common/config.py:249
+#, fuzzy
+msgid "Hides the group chat participants list in a group chat window."
 msgstr "Скрива списъка на участниците в прозореца на стаята."
 
-#: gajim/common/config.py:252
+#: gajim/common/config.py:250
+#, fuzzy
 msgid ""
 "In a chat, show the nickname at the beginning of a line only when it's not "
-"the same person talking than in previous message."
+"the same person talking as in the previous message."
 msgstr ""
 "В разговор, показва псевдонима в началото на реда само ако не е същия човек, "
 "който е написал предното съобщение."
 
-#: gajim/common/config.py:253
+#: gajim/common/config.py:251
 msgid "Indentation when using merge consecutive nickname."
 msgstr "Отстъп, когато се използва смесване на последователен псевдоним."
 
-#: gajim/common/config.py:254
-msgid "Ctrl-Tab go to next composing tab when none is unread."
+#: gajim/common/config.py:252
+#, 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:255
+#: gajim/common/config.py:253
 #, fuzzy
 msgid ""
-"Show the confirm metacontacts creation dialog or not? Empty string means "
-"never show the dialog."
+"Show a confirmation dialog to create metacontacts? Empty string means never "
+"show the dialog."
 msgstr ""
 "Да се показва ли диалогов прозорец за потвърждение при създаване на мета-"
 "контакти? Празен низ означава никога да не се показва диалогов прозорец."
 
-#: gajim/common/config.py:256
+#: gajim/common/config.py:254
 #, fuzzy
 msgid ""
-"Show the confirm block contact dialog or not? Empty string means never show "
+"Show a confirmation dialog to block a contact? Empty string means never show "
 "the dialog."
 msgstr ""
 "Да се показва ли диалогов прозорец за потвърждение при създаване на мета-"
 "контакти? Празен низ означава никога да не се показва диалогов прозорец."
 
-#: gajim/common/config.py:257
+#: gajim/common/config.py:255
 #, fuzzy
 msgid ""
-"Show the confirm custom status dialog or not? Empty string means never show "
-"the dialog."
+"Show a confirmation dialog for a custom status? Empty string means never "
+"show the dialog."
 msgstr ""
 "Да се показва ли диалогов прозорец за потвърждение при създаване на мета-"
 "контакти? Празен низ означава никога да не се показва диалогов прозорец."
 
-#: gajim/common/config.py:258
+#: gajim/common/config.py:256
 #, fuzzy
 msgid ""
-"If true, you will be able to set a negative priority to your account in "
-"account modification window. BE CAREFUL, when you are logged in with a "
-"negative priority, you will NOT receive any message from your server."
+"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:259
+#: gajim/common/config.py:257
 #, fuzzy
 msgid ""
-"If true, Gajim will show number of online and total contacts in account and "
-"group rows."
+"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:260
+#: gajim/common/config.py:258
+#, fuzzy
 msgid ""
-"Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
-"as if they were of this type"
+"Can be empty, 'chat' or 'normal'. If not empty, all incoming messages are "
+"treated as if they were of this type."
 msgstr ""
 "Може да е празно, „chat“ или „normal“. Ако не е празно, всички входящи "
 "съобщения се третират като от указания тип."
 
-#: gajim/common/config.py:261
+#: gajim/common/config.py:259
 #, fuzzy
 msgid ""
-"If true, Gajim will scroll and select the contact who sent you the last "
-"message, if chat window is not already opened."
+"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 ще прелиства списъка избирайки контакта, който ви е "
 "изпратил последното съобщение, в случай, че прозорецът за разговор не е вече "
 "отворен."
 
-#: gajim/common/config.py:262
+#: gajim/common/config.py:260
 msgid "Time of inactivity needed before the change status window closes down."
 msgstr ""
 "Необходимо време без активност преди прозорецът за промяна на състоянието да "
 "се затвори."
 
-#: gajim/common/config.py:263
+#: gajim/common/config.py:261
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
@@ -3659,141 +3660,156 @@ msgstr ""
 "Максимален брой редове, които да се показват в разговорите. Най-старите "
 "редове се изчистват."
 
-#: gajim/common/config.py:264
+#: gajim/common/config.py:262
 #, fuzzy
 msgid ""
-"If true, notification windows from notification-daemon will be attached to "
-"notification icon."
+"If enabled, notification windows from notification-daemon will be attached "
+"to the notification area icon."
 msgstr ""
 "Ако активирана, прозорците за уведомления от „notification-daemon“ ще бъдат "
 "прикрепени към иконата в областта за уведомяване."
 
-#: gajim/common/config.py:265
+#: gajim/common/config.py:263
 msgid "Choose interval between 2 checks of idleness."
 msgstr "Интервал между две проверки за липса на активност."
 
-#: gajim/common/config.py:266
+#: gajim/common/config.py:264
 #, fuzzy
 msgid ""
-"Valid uri schemes. Only schemes in this list will be accepted as \"real\" "
-"uri. (mailto and xmpp are handled separately)"
+"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:267
-msgid "If true, completion in groupchats will be like a shell auto-completion"
+#: gajim/common/config.py:265
+msgid ""
+"If enabled, completion in group chats will be like a shell auto-completion."
 msgstr ""
 
-#: gajim/common/config.py:272
-msgid "Optionally fix jingle output video framerate. Example: 10/1 or 25/2"
+#: gajim/common/config.py:270
+msgid "Optionally fix Jingle output video framerate. Example: 10/1 or 25/2."
 msgstr ""
 
-#: gajim/common/config.py:273
-msgid "Optionally resize jingle output video. Example: 320x240"
+#: gajim/common/config.py:271
+msgid "Optionally resize Jingle output video. Example: 320x240."
 msgstr ""
 
-#: gajim/common/config.py:274
-msgid "If true, You will also see your webcam"
+#: gajim/common/config.py:272
+msgid "If enabled, you will see your webcam's video stream as well."
 msgstr ""
 
-#: gajim/common/config.py:277
+#: gajim/common/config.py:275
 msgid ""
-"If true, Gajim will try to use a STUN server when using Jingle. The one in "
-"\"stun_server\" option, or the one given by the XMPP server."
+"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:278
+#: gajim/common/config.py:276
 msgid "STUN server to use when using Jingle"
 msgstr ""
 
-#: gajim/common/config.py:279
+#: gajim/common/config.py:277
 msgid ""
-"If true, Gajim will show affiliation of groupchat occupants by adding a "
-"colored square to the status icon"
+"If enabled, Gajim will show affiliation of group chat participants by adding "
+"a colored square to the status icon."
 msgstr ""
 
-#: gajim/common/config.py:280
+#: gajim/common/config.py:278
 msgid ""
 "Proxy used for all outgoing connections if the account does not have a "
-"specific proxy configured"
+"specific proxy configured."
 msgstr ""
 
-#: gajim/common/config.py:281
-msgid "If true, Gajim will ignore incoming attention requests (\"wizz\")."
+#: gajim/common/config.py:279
+msgid "If enabled, Gajim will ignore incoming attention requests ('wizz')."
 msgstr ""
 
-#: gajim/common/config.py:282
+#: gajim/common/config.py:280
 msgid ""
 "If enabled, Gajim will reopen chat windows that were opened last time Gajim "
 "was closed."
 msgstr ""
 
-#: gajim/common/config.py:283
+#: gajim/common/config.py:281
 #, fuzzy
 msgid ""
-"If enabled, Gajim will show an icon to show that sent message has been "
-"received by your contact"
+"If enabled, Gajim will display an icon to show that sent messages have been "
+"received by your contact."
 msgstr ""
 "Ако тази опция е избрана, няма да се пита за съобщение за състояние — ще се "
 "използва стандартно зададеното."
 
-#: gajim/common/config.py:284
-msgid "Show a mini avatar in chat window tabs and in window icon"
+#: gajim/common/config.py:282
+msgid "Show a mini avatar in chat window tabs and as the window's icon."
 msgstr ""
 
-#: gajim/common/config.py:285
+#: gajim/common/config.py:283
 #, fuzzy
-msgid "If true, Gajim will use the Systems Keyring to store account passwords."
+msgid ""
+"If enabled, Gajim will use the System's Keyring to store account passwords."
 msgstr ""
 "Ако е активирана, Gajim ще използва набора на ключове на GNOME (gnome-"
 "keyring), ако е достъпен, за да запазва информация за паролите на акаунтите."
 
+#: gajim/common/config.py:284
+msgid "If enabled, Gajim will execute XEP-0146 Commands."
+msgstr ""
+
+#: gajim/common/config.py:285
+msgid "2: System, 1: Enabled, 0: Disabled"
+msgstr ""
+
 #: gajim/common/config.py:286
-msgid "If true, Gajim will execute XEP-0146 Commands."
+msgid "Options in days which can be chosen in the sync threshold menu"
 msgstr ""
 
 #: gajim/common/config.py:287
-msgid "2: System, 1: Enabled, 0: Disabled"
+msgid ""
+"Maximum history in days we request from a public group chat archive. 0: As "
+"much as possible."
 msgstr ""
 
 #: gajim/common/config.py:288
-msgid "Options in days which can be chosen in the sync threshold menu"
+msgid ""
+"Maximum history in days we request from a private group chat archive. 0: As "
+"much as possible."
 msgstr ""
 
 #: gajim/common/config.py:289
 msgid ""
-"Maximum history in days we request from a public room archive. 0: As much as "
-"possible"
+"If enabled, Gajim shows the group chat subject in the chat window when "
+"joining."
 msgstr ""
 
 #: gajim/common/config.py:290
+#, fuzzy
 msgid ""
-"Maximum history in days we request from a private room archive. 0: As much "
-"as possible"
+"If enabled, the contact row is colored according to the current chat state "
+"of the contact."
 msgstr ""
+"Ако тази опция е избрана, контактите ще могат да откриват операционната "
+"система, която използвате."
 
 #: gajim/common/config.py:291
-msgid "If the room subject is shown in chat on join"
+#, fuzzy
+msgid ""
+"If enabled, the tab is colored according to the current chat state of the "
+"contact."
 msgstr ""
+"Ако тази опция е избрана, контактите ще могат да откриват операционната "
+"система, която използвате."
 
 #: gajim/common/config.py:292
+#, fuzzy
 msgid ""
-"If the contact row is colored according to the current chatstate of the "
-"contact"
+"Shows a text in the banner that describes the current chat state of the "
+"contact."
 msgstr ""
+"Ако тази опция е избрана, контактите ще могат да откриват операционната "
+"система, която използвате."
 
 #: gajim/common/config.py:293
-msgid "If the tab is colored according to the current chatstate of the contact"
-msgstr ""
-
-#: gajim/common/config.py:294
-msgid ""
-"Shows a text in the banner that describes the current chatstate of the "
-"contact"
-msgstr ""
-
-#: gajim/common/config.py:295 gajim/common/config.py:424
 #, fuzzy
 msgid ""
 "Chat state notifications that are sent to contacts. Possible values: all, "
@@ -3802,75 +3818,84 @@ msgstr ""
 "Изпращане на уведомления за състоянието на разговор. Може да бъде „all“, "
 "„composing_only“, „disabled“."
 
-#: gajim/common/config.py:296 gajim/common/config.py:438
+#: gajim/common/config.py:294
 #, fuzzy
 msgid ""
 "Chat state notifications that are sent to the group chat. Possible values: "
-"all, composing_only, disabled"
+"'all', 'composing_only', 'disabled'"
 msgstr ""
 "Изпращане на уведомления за състоянието на разговор. Може да бъде „all“, "
 "„composing_only“, „disabled“."
 
-#: gajim/common/config.py:312
+#: gajim/common/config.py:297
+msgid "API Preferences. Possible values: 'http', 'iq'"
+msgstr ""
+
+#: gajim/common/config.py:313
+#, fuzzy
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
-"defined in autopriority_* options."
+"defined in 'autopriority_*' options."
 msgstr ""
 "Приоритетът ще се променя автоматично в съответствие със състоянието ви. "
 "Приоритетите се настройват в опциите „autopriority_*“."
 
-#: gajim/common/config.py:320
+#: gajim/common/config.py:321
+#, fuzzy
 msgid ""
-"Status used to autoconnect as. Can be online, chat, away, xa, dnd, "
-"invisible. NOTE: this option is used only if restore_last_status is disabled"
+"Status to be used automatically when connecting. Can be 'online', 'chat', "
+"'away', 'xa', 'dnd' or 'invisible'. NOTE: This option is used only if "
+"'restore_last_status' is disabled."
 msgstr ""
 "Състояние при автоматично включване. Може да е „online“, „chat“, „away“, "
 "„xa“, „dnd“ или „invisible“. ЗАБЕЛЕЖКА: Тази опция се използва само ако "
 "„restore_last_status“ е изключена."
 
-#: gajim/common/config.py:321
-msgid "If enabled, restore the last status that was used."
+#: gajim/common/config.py:322
+#, fuzzy
+msgid "If enabled, the last status will be restored."
 msgstr "Ако е активирана, възстановява се последното използвано състояние."
 
-#: gajim/common/config.py:322
+#: gajim/common/config.py:323
 msgid ""
-"If true, Contacts requesting authorization will be automatically accepted."
+"If enabled, Contacts requesting authorization will be accepted automatically."
 msgstr ""
 
-#: gajim/common/config.py:323
+#: gajim/common/config.py:324
 #, fuzzy
 msgid ""
-"If False, this account will be disabled and will not appear in roster window."
+"If disabled, this account will be disabled and will not appear in the "
+"contact list window."
 msgstr ""
 "Ако е изключена, повече няма да виждате аватар в прозореца за разговор."
 
-#: gajim/common/config.py:327
-msgid "Allow plaintext connections"
+#: gajim/common/config.py:328
+msgid "Allow plaintext connections."
 msgstr ""
 
-#: gajim/common/config.py:330
+#: gajim/common/config.py:331
 msgid ""
-"List (space separated) of authentication mechanisms to try. Can contain "
-"ANONYMOUS, EXTERNAL, GSSAPI, SCRAM-SHA-1-PLUS, SCRAM-SHA-1, DIGEST-MD5, "
-"PLAIN, X-MESSENGER-OAUTH2 or XEP-0078"
+"List of authentication mechanisms to try (space separated). Can contain "
+"'ANONYMOUS', 'EXTERNAL', 'GSSAPI', 'SCRAM-SHA-1-PLUS', 'SCRAM-SHA-1', "
+"'DIGEST-MD5', 'PLAIN', 'X-MESSENGER-OAUTH2' or 'XEP-0078'."
 msgstr ""
 
-#: gajim/common/config.py:331
+#: gajim/common/config.py:332
 #, fuzzy
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection. "
-"Can be 'warn', 'connect', 'disconnect'"
+"Can be 'warn', 'connect' or 'disconnect'."
 msgstr ""
 "Показване на предупреждение преди изпращане на паролата при нешифрирана "
 "връзка."
 
-#: gajim/common/config.py:332
+#: gajim/common/config.py:333
 msgid "Show a warning dialog before using standard SSL library."
 msgstr ""
 "Показване на предупреждение преди използване на стандартната библиотека на "
 "SSL."
 
-#: gajim/common/config.py:333
+#: gajim/common/config.py:334
 #, fuzzy
 msgid ""
 "Show a warning dialog before sending PLAIN password over a plain connection."
@@ -3878,66 +3903,72 @@ msgstr ""
 "Показване на предупреждение преди изпращане на паролата при нешифрирана "
 "връзка."
 
-#: gajim/common/config.py:334
-msgid "Space separated list of ssl errors to ignore."
-msgstr "Списък (разделен с шпации) от грешки на SSL, които да се пренебрегват."
-
-#: gajim/common/config.py:340
-msgid ""
-"Space separated list of JIDs for which you do not want to store logs. You "
-"can also add account name to log nothing for this account."
+#: gajim/common/config.py:335
+msgid "List of SSL errors to ignore (space separated)."
 msgstr ""
 
 #: gajim/common/config.py:341
 msgid ""
-"Space separated list of JIDs for which you accept to not log conversations "
-"if he does not want to."
+"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:343
-msgid "Whitespace sent after inactivity"
+#: gajim/common/config.py:342
+msgid ""
+"List of XMPP Addresses (space separated) for which you accept to not store "
+"chat history if your contact does not want to."
 msgstr ""
 
 #: gajim/common/config.py:344
-msgid "XMPP ping sent after inactivity"
+msgid "If enabled, a whitespace is sent after inactivity (keep alive)."
+msgstr ""
+
+#: gajim/common/config.py:345
+msgid "If enabled, an XMPP ping is sent after inactivity (ping alive)."
 msgstr ""
 
-#: gajim/common/config.py:348
+#: gajim/common/config.py:349
 #, fuzzy
 msgid ""
-"How many seconds to wait for the answer of ping alive packet before trying "
-"to reconnect?"
+"How many seconds to wait for the answer of a ping alive packet before trying "
+"to reconnect."
 msgstr ""
 "Колко секунди да се чака за отговор на изпратен пакет за поддържане на "
 "връзката, преди да да се опита свързване наново."
 
-#: gajim/common/config.py:352
-msgid "Jabberd2 workaround"
+#: gajim/common/config.py:353
+#, fuzzy
+msgid "Jabberd2 workaround."
 msgstr "Заобикалка заради Jabberd2"
 
-#: gajim/common/config.py:355
+#: gajim/common/config.py:356
+#, fuzzy
 msgid ""
-"If checked, Gajim will use your IP and proxies defined in "
-"file_transfer_proxies option for file transfer."
+"If enabled, Gajim will use your IP and proxies defined in "
+"'file_transfer_proxies' option for file transfers."
 msgstr ""
 "Ако тази опция е избрана, ще се използва вашия IP адрес и сървърите-"
 "посредници, указани в опцията file_transfer_proxies, за файлови трансфери."
 
-#: gajim/common/config.py:356
+#: gajim/common/config.py:357
 msgid ""
-"If true, Gajim will test file transfer proxies on startup to be sure it "
-"works. Openfire's proxies are known to fail this test even if they work."
+"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:369
-msgid "Answer to receipt requests"
-msgstr "Отговор на заявки"
-
 #: gajim/common/config.py:370
-msgid "Sent receipt requests"
-msgstr "Изпратени заявки"
+#, fuzzy
+msgid "If enabled, Gajim will answer to message receipt requests."
+msgstr ""
+"Ако тази опция е избрана, няма да се пита за съобщение за състояние — ще се "
+"използва стандартно зададеното."
+
+#: gajim/common/config.py:371
+msgid "If enabled, Gajim will send message receipt requests."
+msgstr ""
 
-#: gajim/common/config.py:379
+#: gajim/common/config.py:380
 #, fuzzy
 msgid ""
 "Allow Gajim to send information about the operating system you are running."
@@ -3945,182 +3976,197 @@ msgstr ""
 "Ако тази опция е избрана, контактите ще могат да откриват операционната "
 "система, която използвате."
 
-#: gajim/common/config.py:380
+#: gajim/common/config.py:381
 #, fuzzy
 msgid "Allow Gajim to send your local time."
 msgstr "%s иска да ви изпрати файл."
 
-#: gajim/common/config.py:383
+#: gajim/common/config.py:384
 #, fuzzy
-msgid "Message that is sent to contacts you want to add"
+msgid "Message that is sent to contacts you want to add."
 msgstr "Попълнете данните за контакта, който искате да добавите"
 
-#: gajim/common/config.py:384
-msgid ""
-"If enabled, Gajim will send your local IPs so your contact can connect to "
-"your machine to transfer files."
-msgstr ""
-
 #: gajim/common/config.py:385
+#, fuzzy
 msgid ""
-"Space separated list of JIDs for which chat window will be re-opened on next "
-"startup."
+"If enabled, Gajim will send your local IP so your contact can connect to "
+"your machine for file transfers."
 msgstr ""
+"Ако тази опция е избрана, ще се използва вашия IP адрес и сървърите-"
+"посредници, указани в опцията file_transfer_proxies, за файлови трансфери."
 
-#: gajim/common/config.py:387
-msgid "HTTP Upload: Enable HTTPS Verification"
+#: gajim/common/config.py:386
+msgid ""
+"List of XMPP Addresses (space separated) for which the chat window will be "
+"re-opened on next startup."
 msgstr ""
 
 #: gajim/common/config.py:388
-msgid ""
-"Preferred file transfer mechanism for file drag&drop on chat window. Can be "
-"'httpupload' (default) or 'jingle'"
+msgid "HTTP File Upload: Enable HTTPS Verification."
 msgstr ""
 
 #: gajim/common/config.py:389
-msgid "Allow cert verification with POSH"
+msgid ""
+"Preferred file transfer mechanism for file drag&drop on a chat window. Can "
+"be 'httpupload' (default) or 'jingle'."
 msgstr ""
 
-#: gajim/common/config.py:423 gajim/common/config.py:430
+#: gajim/common/config.py:390
 #, fuzzy
-msgid "Language for which misspelled words will be checked"
-msgstr "Език, за който желаете да се проверяват сгрешените думи."
-
-#: gajim/common/config.py:427
-msgid "The currently active encryption for that contact"
-msgstr ""
+msgid "Allow certificate verification with POSH."
+msgstr "Грешка в сертификата на SSL"
 
-#: gajim/common/config.py:431
+#: gajim/common/config.py:425
+#, fuzzy
 msgid ""
-"How many lines to request from server when entering a groupchat. -1 means no "
-"limit, -2 means global value"
+"Chat state notifications that are sent to contacts. Possible values: 'all', "
+"'composing_only', 'disabled'"
 msgstr ""
+"Изпращане на уведомления за състоянието на разговор. Може да бъде „all“, "
+"„composing_only“, „disabled“."
+
+#: gajim/common/config.py:428
+#, fuzzy
+msgid "The currently active encryption for that contact."
+msgstr "Активира шифриране тип „ESessions“ за този акаунт."
 
 #: gajim/common/config.py:432
 msgid ""
-"Minutes of backlog to request when entering a groupchat. -1 means no limit, "
-"-2 means global value"
+"If enabled, a notification is created for every message in this group chat."
 msgstr ""
 
 #: gajim/common/config.py:433
-msgid "State whether a notification is created for every message in this room"
-msgstr ""
-
-#: gajim/common/config.py:434
+#, fuzzy
 msgid ""
-"Show a status message for all status (away, dnd, etc.) changes of users in a "
-"group chat"
-msgstr ""
+"Show a status message for all status changes (away, dnd, etc.) of users in a "
+"group chat."
+msgstr "Неуспех при влизането в стаята"
 
-#: gajim/common/config.py:435
+#: gajim/common/config.py:434
 #, fuzzy
-msgid "Show a status message for every join or leave in a group chat"
+msgid "Show a status message for every join or leave in a group chat."
 msgstr "Неуспех при влизането в стаята"
 
+#: gajim/common/config.py:435
+msgid ""
+"If enabled, the group chat is minimized into the contact list when joining "
+"automatically."
+msgstr ""
+
 #: gajim/common/config.py:436
-msgid "If the group chat is minimized into the roster on autojoin"
+msgid ""
+"If enabled, the group chat is minimized into the contact list when closing "
+"it."
 msgstr ""
 
 #: gajim/common/config.py:437
-msgid "If the group chat is minimized into the roster on close"
+#, fuzzy
+msgid ""
+"Chat state notifications that are sent to the group chat. Possible values: "
+"'all', 'composing_only' or 'disabled'."
 msgstr ""
+"Изпращане на уведомления за състоянието на разговор. Може да бъде „all“, "
+"„composing_only“, „disabled“."
 
-#: gajim/common/config.py:441
+#: gajim/common/config.py:440
 msgid ""
-"State whether plugins should be activated on startup (this is saved on Gajim "
-"exit). This option SHOULD NOT be used to (de)activate plug-ins. Use GUI "
-"instead."
+"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:446 gajim/common/const.py:281
+#: gajim/common/config.py:445 gajim/common/const.py:315
 msgid "Sleeping"
 msgstr "Спя"
 
-#: gajim/common/config.py:447
+#: gajim/common/config.py:446
 msgid "Back soon"
 msgstr "Връщам се скоро"
 
-#: gajim/common/config.py:447
+#: gajim/common/config.py:446
 msgid "Back in some minutes."
 msgstr "Ще се върна след малко."
 
-#: gajim/common/config.py:448 gajim/common/const.py:247
+#: gajim/common/config.py:447 gajim/common/const.py:281
 msgid "Eating"
 msgstr "Хапвам"
 
-#: gajim/common/config.py:448
-msgid "I'm eating, so leave me a message."
-msgstr "Хапвам, така че ми оставете съобщение."
+#: gajim/common/config.py:447
+#, fuzzy
+msgid "I'm eating."
+msgstr "Работя."
 
-#: gajim/common/config.py:449
+#: gajim/common/config.py:448
 msgid "Movie"
 msgstr "Филм"
 
-#: gajim/common/config.py:449
+#: gajim/common/config.py:448
 msgid "I'm watching a movie."
 msgstr "Гледам филм."
 
-#: gajim/common/config.py:450 gajim/common/const.py:314
+#: gajim/common/config.py:449 gajim/common/const.py:348
 msgid "Working"
 msgstr "Работя"
 
-#: gajim/common/config.py:450
+#: gajim/common/config.py:449
 msgid "I'm working."
 msgstr "Работя."
 
-#: gajim/common/config.py:451
+#: gajim/common/config.py:450
 msgid "Phone"
 msgstr "Телефон"
 
-#: gajim/common/config.py:451
+#: gajim/common/config.py:450
 msgid "I'm on the phone."
 msgstr "Говоря по телефона."
 
-#: gajim/common/config.py:452
+#: gajim/common/config.py:451
 msgid "Out"
 msgstr "Навън"
 
-#: gajim/common/config.py:452
+#: gajim/common/config.py:451
 msgid "I'm out enjoying life."
 msgstr "Наслаждавам се на живота навън."
 
-#: gajim/common/config.py:463
+#: gajim/common/config.py:462
 msgid "I'm available."
 msgstr "На линия съм."
 
-#: gajim/common/config.py:464
+#: gajim/common/config.py:463
 msgid "I'm free for chat."
 msgstr "Свободен за разговор."
 
-#: gajim/common/config.py:465 gajim/gtk/accounts.py:134
+#: gajim/common/config.py:464 gajim/gtk/accounts.py:133
 msgid "Be right back."
 msgstr "Сега се връщам."
 
-#: gajim/common/config.py:466
+#: gajim/common/config.py:465
 msgid "I'm not available."
 msgstr "Не съм на разположение."
 
-#: gajim/common/config.py:467
+#: gajim/common/config.py:466
 msgid "Do not disturb."
 msgstr "Не ме притеснявайте."
 
-#: gajim/common/config.py:468 gajim/common/config.py:469
+#: gajim/common/config.py:467 gajim/common/config.py:468
 msgid "Bye!"
 msgstr "Довиждане!"
 
-#: gajim/common/config.py:480
+#: gajim/common/config.py:479
+#, fuzzy
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
-"muc_highlight_words, or when a group chat message contains your nickname."
+"'muc_highlight_words' your nickname is mentioned."
 msgstr ""
 "Звукът, който да се възпроизвежда, когато в стаята се изпише дума от "
 "„muc_higlighted_words“ или когато съобщение съдържа псевдонима ви."
 
-#: gajim/common/config.py:481
-msgid "Sound to play when any MUC message arrives."
+#: gajim/common/config.py:480
+#, fuzzy
+msgid "Sound to play when any group chat message arrives."
 msgstr "Звук за изпълнение при получаване на каквото и да е съобщение в стая."
 
-#: gajim/common/config.py:485
+#: gajim/common/config.py:484
 #, fuzzy
 msgid "Tor"
 msgstr "За"
@@ -4130,883 +4176,979 @@ msgstr "За"
 msgid "Error: cannot open %s for reading"
 msgstr "Грешка: %s не може да бъде отворен за четене"
 
-#: gajim/common/const.py:214
+#: gajim/common/const.py:216
+#, fuzzy
+msgid "?Group chat name:Team"
+msgstr "Не е установен"
+
+#: gajim/common/const.py:217
+msgid "?Group chat description:Project discussion"
+msgstr ""
+
+#: gajim/common/const.py:218
+#, fuzzy
+msgid "?Group chat address:team"
+msgstr "Стаи"
+
+#: gajim/common/const.py:219
+#, fuzzy
+msgid "?Group chat name:Family"
+msgstr "Осветено съобщение в стая"
+
+#: gajim/common/const.py:220
+msgid "?Group chat description:Spring gathering"
+msgstr ""
+
+#: gajim/common/const.py:221
+msgid "?Group chat address:family"
+msgstr ""
+
+#: gajim/common/const.py:222
+#, fuzzy
+msgid "?Group chat name:Vacation"
+msgstr "Покана за разговор в стая"
+
+#: gajim/common/const.py:223
+msgid "?Group chat description:Trip planning"
+msgstr ""
+
+#: gajim/common/const.py:224
+#, fuzzy
+msgid "?Group chat address:vacation"
+msgstr "Покана за разговор в стая"
+
+#: gajim/common/const.py:225
+#, fuzzy
+msgid "?Group chat name:Repairs"
+msgstr "С_тая"
+
+#: gajim/common/const.py:226
+msgid "?Group chat description:Local help group"
+msgstr ""
+
+#: gajim/common/const.py:227
+#, fuzzy
+msgid "?Group chat address:repairs"
+msgstr "Стаи"
+
+#: gajim/common/const.py:228
+#, fuzzy
+msgid "?Group chat name:News"
+msgstr "Не е установен"
+
+#: gajim/common/const.py:229
+#, fuzzy
+msgid "?Group chat description:Local news and reports"
+msgstr "Създаването на стаи е ограничено."
+
+#: gajim/common/const.py:230
+#, fuzzy
+msgid "?Group chat address:news"
+msgstr "Нова стая"
+
+#: gajim/common/const.py:235
+#, fuzzy
+msgid "Remote server not found"
+msgstr "Услугата не може да бъде намерена"
+
+#: gajim/common/const.py:236
+msgid "Remote server timeout"
+msgstr ""
+
+#: gajim/common/const.py:237 gajim/common/const.py:238
+#: gajim/common/const.py:239
+#, fuzzy
+msgid "Address does not belong to a group chat server"
+msgstr "Това не е стая"
+
+#: gajim/common/const.py:240
+#, fuzzy
+msgid "Group chat already exists"
+msgstr "Името на акаунта вече се използва."
+
+#: gajim/common/const.py:241
+#, fuzzy
+msgid "Group chat does not exist"
+msgstr "Стаята %s не съществува."
+
+#: gajim/common/const.py:247
 msgid "This message was encrypted with OTR and could not be decrypted."
 msgstr ""
 
-#: gajim/common/const.py:217
+#: gajim/common/const.py:250
 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:221
+#: gajim/common/const.py:254
 msgid ""
-"This message was encrypted with OpenPGP for XMPP and could not be decrypted."
+"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:224
+#: gajim/common/const.py:258
 #, python-format
 msgid "This message was encrypted with %s and could not be decrypted."
 msgstr ""
 
-#: gajim/common/const.py:231
+#: gajim/common/const.py:265
 msgid "Doing Chores"
 msgstr "Домакинствам"
 
-#: gajim/common/const.py:232
+#: gajim/common/const.py:266
 msgid "Buying Groceries"
 msgstr "Купувам хранителни продукти"
 
-#: gajim/common/const.py:233
+#: gajim/common/const.py:267
 msgid "Cleaning"
 msgstr "Чистя"
 
-#: gajim/common/const.py:234
+#: gajim/common/const.py:268
 msgid "Cooking"
 msgstr "Готвя"
 
-#: gajim/common/const.py:235
+#: gajim/common/const.py:269
 msgid "Doing Maintenance"
 msgstr "Ремонтирам"
 
-#: gajim/common/const.py:236
+#: gajim/common/const.py:270
 msgid "Doing the Dishes"
 msgstr "Мия чиниите"
 
-#: gajim/common/const.py:237
+#: gajim/common/const.py:271
 msgid "Doing the Laundry"
 msgstr "Пера"
 
-#: gajim/common/const.py:238
+#: gajim/common/const.py:272
 msgid "Gardening"
 msgstr "Работя в градината"
 
-#: gajim/common/const.py:239
+#: gajim/common/const.py:273
 msgid "Running an Errand"
 msgstr "Изпълнявам поръчка"
 
-#: gajim/common/const.py:240
+#: gajim/common/const.py:274
 msgid "Walking the Dog"
 msgstr "Разхождам кучето"
 
-#: gajim/common/const.py:242
+#: gajim/common/const.py:276
 msgid "Drinking"
 msgstr "Пия"
 
-#: gajim/common/const.py:243
+#: gajim/common/const.py:277
 msgid "Having a Beer"
 msgstr "Пия бира"
 
-#: gajim/common/const.py:244
+#: gajim/common/const.py:278
 msgid "Having Coffee"
 msgstr "Пия кафе"
 
-#: gajim/common/const.py:245
+#: gajim/common/const.py:279
 msgid "Having Tea"
 msgstr "Пия чай"
 
-#: gajim/common/const.py:248
+#: gajim/common/const.py:282
 msgid "Having a Snack"
 msgstr "Похапвам"
 
-#: gajim/common/const.py:249
+#: gajim/common/const.py:283
 msgid "Having Breakfast"
 msgstr "Закусвам"
 
-#: gajim/common/const.py:250
+#: gajim/common/const.py:284
 msgid "Having Dinner"
 msgstr "Вечерям"
 
-#: gajim/common/const.py:251
+#: gajim/common/const.py:285
 msgid "Having Lunch"
 msgstr "Обядвам"
 
-#: gajim/common/const.py:253
+#: gajim/common/const.py:287
 msgid "Exercising"
 msgstr "Правя упражнения"
 
-#: gajim/common/const.py:254 gajim/common/const.py:305
+#: gajim/common/const.py:288 gajim/common/const.py:339
 msgid "Cycling"
 msgstr "Карам велосипед"
 
-#: gajim/common/const.py:255
+#: gajim/common/const.py:289
 msgid "Dancing"
 msgstr "Танцувам"
 
-#: gajim/common/const.py:256
+#: gajim/common/const.py:290
 msgid "Hiking"
 msgstr "На поход съм"
 
-#: gajim/common/const.py:257
+#: gajim/common/const.py:291
 msgid "Jogging"
 msgstr "Тичам за здраве"
 
-#: gajim/common/const.py:258
+#: gajim/common/const.py:292
 msgid "Playing Sports"
 msgstr "Спортувам"
 
-#: gajim/common/const.py:259
+#: gajim/common/const.py:293
 msgid "Running"
 msgstr "Бягам"
 
-#: gajim/common/const.py:260
+#: gajim/common/const.py:294
 msgid "Skiing"
 msgstr "Карам ски"
 
-#: gajim/common/const.py:261
+#: gajim/common/const.py:295
 msgid "Swimming"
 msgstr "Плувам"
 
-#: gajim/common/const.py:262
+#: gajim/common/const.py:296
 msgid "Working out"
 msgstr "Тренирам"
 
-#: gajim/common/const.py:264
+#: gajim/common/const.py:298
 msgid "Grooming"
 msgstr "Поддържам се"
 
-#: gajim/common/const.py:265
+#: gajim/common/const.py:299
 msgid "At the Spa"
 msgstr "В Спа-центъра"
 
-#: gajim/common/const.py:266
+#: gajim/common/const.py:300
 msgid "Brushing Teeth"
 msgstr "Мия си зъбите"
 
-#: gajim/common/const.py:267
+#: gajim/common/const.py:301
 msgid "Getting a Haircut"
 msgstr "Подстригвам се"
 
-#: gajim/common/const.py:268
+#: gajim/common/const.py:302
 msgid "Shaving"
 msgstr "Бръсна се"
 
-#: gajim/common/const.py:269
+#: gajim/common/const.py:303
 msgid "Taking a Bath"
 msgstr "Във ваната"
 
-#: gajim/common/const.py:270
+#: gajim/common/const.py:304
 msgid "Taking a Shower"
 msgstr "Взимам си душ"
 
-#: gajim/common/const.py:272
+#: gajim/common/const.py:306
 msgid "Having an Appointment"
 msgstr "На среща"
 
-#: gajim/common/const.py:274
+#: gajim/common/const.py:308
 msgid "Inactive"
 msgstr "Бездеен"
 
-#: gajim/common/const.py:275
+#: gajim/common/const.py:309
 msgid "Day Off"
 msgstr "Почивен ден"
 
-#: gajim/common/const.py:276
+#: gajim/common/const.py:310
 msgid "Hanging out"
 msgstr "Вися си"
 
-#: gajim/common/const.py:277
+#: gajim/common/const.py:311
 msgid "Hiding"
 msgstr "Крия се"
 
-#: gajim/common/const.py:278
+#: gajim/common/const.py:312
 msgid "On Vacation"
 msgstr "В отпуск"
 
-#: gajim/common/const.py:279
+#: gajim/common/const.py:313
 msgid "Praying"
 msgstr "Моля се"
 
-#: gajim/common/const.py:280
+#: gajim/common/const.py:314
 msgid "Scheduled Holiday"
 msgstr "Планиран отдих"
 
-#: gajim/common/const.py:282
+#: gajim/common/const.py:316
 msgid "Thinking"
 msgstr "Мисля"
 
-#: gajim/common/const.py:284
+#: gajim/common/const.py:318
 msgid "Relaxing"
 msgstr "Почивам"
 
-#: gajim/common/const.py:285
+#: gajim/common/const.py:319
 msgid "Fishing"
 msgstr "Ловя риба"
 
-#: gajim/common/const.py:286
+#: gajim/common/const.py:320
 msgid "Gaming"
 msgstr "Играя"
 
-#: gajim/common/const.py:287
+#: gajim/common/const.py:321
 msgid "Going out"
 msgstr "Навън съм"
 
-#: gajim/common/const.py:288
+#: gajim/common/const.py:322
 msgid "Partying"
 msgstr "На купон съм"
 
-#: gajim/common/const.py:289
+#: gajim/common/const.py:323
 msgid "Reading"
 msgstr "Чета"
 
-#: gajim/common/const.py:290
+#: gajim/common/const.py:324
 msgid "Rehearsing"
 msgstr "Репетирам"
 
-#: gajim/common/const.py:291
+#: gajim/common/const.py:325
 msgid "Shopping"
 msgstr "На пазар съм"
 
-#: gajim/common/const.py:292
+#: gajim/common/const.py:326
 msgid "Smoking"
 msgstr "Пуша"
 
-#: gajim/common/const.py:293
+#: gajim/common/const.py:327
 msgid "Socializing"
 msgstr "Общувам"
 
-#: gajim/common/const.py:294
+#: gajim/common/const.py:328
 msgid "Sunbathing"
 msgstr "На плаж съм"
 
-#: gajim/common/const.py:295
+#: gajim/common/const.py:329
 msgid "Watching TV"
 msgstr "Гледам телевизия"
 
-#: gajim/common/const.py:296
+#: gajim/common/const.py:330
 msgid "Watching a Movie"
 msgstr "Гледам филм"
 
-#: gajim/common/const.py:298
+#: gajim/common/const.py:332
 msgid "Talking"
 msgstr "Разговарям"
 
-#: gajim/common/const.py:299
+#: gajim/common/const.py:333
 msgid "In Real Life"
 msgstr "На четири очи"
 
-#: gajim/common/const.py:300
+#: gajim/common/const.py:334
 msgid "On the Phone"
 msgstr "Говоря по телефона"
 
-#: gajim/common/const.py:301
+#: gajim/common/const.py:335
 msgid "On Video Phone"
 msgstr "Говоря по видеотелефона"
 
-#: gajim/common/const.py:303
+#: gajim/common/const.py:337
 msgid "Traveling"
 msgstr "Пътувам"
 
-#: gajim/common/const.py:304
+#: gajim/common/const.py:338
 msgid "Commuting"
 msgstr "Пътувам от/до работа"
 
-#: gajim/common/const.py:306
+#: gajim/common/const.py:340
 msgid "Driving"
 msgstr "Карам велосипед"
 
-#: gajim/common/const.py:307
+#: gajim/common/const.py:341
 msgid "In a Car"
 msgstr "В колата"
 
-#: gajim/common/const.py:308
+#: gajim/common/const.py:342
 msgid "On a Bus"
 msgstr "В автобуса"
 
-#: gajim/common/const.py:309
+#: gajim/common/const.py:343
 msgid "On a Plane"
 msgstr "В самолета"
 
-#: gajim/common/const.py:310
+#: gajim/common/const.py:344
 msgid "On a Train"
 msgstr "Във влака"
 
-#: gajim/common/const.py:311
+#: gajim/common/const.py:345
 msgid "On a Trip"
 msgstr "На екскурзия"
 
-#: gajim/common/const.py:312
+#: gajim/common/const.py:346
 msgid "Walking"
 msgstr "Разхождам се"
 
-#: gajim/common/const.py:315
+#: gajim/common/const.py:349
 msgid "Coding"
 msgstr "Програмирам"
 
-#: gajim/common/const.py:316
+#: gajim/common/const.py:350
 msgid "In a Meeting"
 msgstr "На съвещание"
 
-#: gajim/common/const.py:317
+#: gajim/common/const.py:351
 msgid "Studying"
 msgstr "Уча"
 
-#: gajim/common/const.py:318
+#: gajim/common/const.py:352
 msgid "Writing"
 msgstr "Пиша"
 
-#: gajim/common/const.py:321
+#: gajim/common/const.py:355
 msgid "Afraid"
 msgstr "Уплашен"
 
-#: gajim/common/const.py:322
+#: gajim/common/const.py:356
 msgid "Amazed"
 msgstr "Изумен"
 
-#: gajim/common/const.py:323
+#: gajim/common/const.py:357
 msgid "Amorous"
 msgstr "Страстен"
 
-#: gajim/common/const.py:324
+#: gajim/common/const.py:358
 msgid "Angry"
 msgstr "Ядосан"
 
-#: gajim/common/const.py:325
+#: gajim/common/const.py:359
 msgid "Annoyed"
 msgstr "Раздразнен"
 
-#: gajim/common/const.py:326
+#: gajim/common/const.py:360
 msgid "Anxious"
 msgstr "Обезпокоен"
 
-#: gajim/common/const.py:327
+#: gajim/common/const.py:361
 msgid "Aroused"
 msgstr "Възбуден"
 
-#: gajim/common/const.py:328
+#: gajim/common/const.py:362
 msgid "Ashamed"
 msgstr "Засрамен"
 
-#: gajim/common/const.py:329
+#: gajim/common/const.py:363
 msgid "Bored"
 msgstr "Отегчен"
 
-#: gajim/common/const.py:330
+#: gajim/common/const.py:364
 msgid "Brave"
 msgstr "Смел"
 
-#: gajim/common/const.py:331
+#: gajim/common/const.py:365
 msgid "Calm"
 msgstr "Спокоен"
 
-#: gajim/common/const.py:332
+#: gajim/common/const.py:366
 msgid "Cautious"
 msgstr "Предпазлив"
 
-#: gajim/common/const.py:333
+#: gajim/common/const.py:367
 msgid "Cold"
 msgstr "Бездушен"
 
-#: gajim/common/const.py:334
+#: gajim/common/const.py:368
 msgid "Confident"
 msgstr "Уверен"
 
-#: gajim/common/const.py:335
+#: gajim/common/const.py:369
 msgid "Confused"
 msgstr "Объркан"
 
-#: gajim/common/const.py:336
+#: gajim/common/const.py:370
 msgid "Contemplative"
 msgstr "Замислен"
 
-#: gajim/common/const.py:337
+#: gajim/common/const.py:371
 msgid "Contented"
 msgstr "Спорещ"
 
-#: gajim/common/const.py:338
+#: gajim/common/const.py:372
 msgid "Cranky"
 msgstr "Раздразнителен"
 
-#: gajim/common/const.py:339
+#: gajim/common/const.py:373
 msgid "Crazy"
 msgstr "Луд"
 
-#: gajim/common/const.py:340
+#: gajim/common/const.py:374
 msgid "Creative"
 msgstr "Съзидателен"
 
-#: gajim/common/const.py:341
+#: gajim/common/const.py:375
 msgid "Curious"
 msgstr "Любопитен"
 
-#: gajim/common/const.py:342
+#: gajim/common/const.py:376
 msgid "Dejected"
 msgstr "Обезсърчен"
 
-#: gajim/common/const.py:343
+#: gajim/common/const.py:377
 msgid "Depressed"
 msgstr "Депресиран"
 
-#: gajim/common/const.py:344
+#: gajim/common/const.py:378
 msgid "Disappointed"
 msgstr "Разочарован"
 
-#: gajim/common/const.py:345
+#: gajim/common/const.py:379
 msgid "Disgusted"
 msgstr "Отвратен"
 
-#: gajim/common/const.py:346
+#: gajim/common/const.py:380
 msgid "Dismayed"
 msgstr "Уплашен"
 
-#: gajim/common/const.py:347
+#: gajim/common/const.py:381
 msgid "Distracted"
 msgstr "Шашнат"
 
-#: gajim/common/const.py:348
+#: gajim/common/const.py:382
 msgid "Embarrassed"
 msgstr "Смутен"
 
-#: gajim/common/const.py:349
+#: gajim/common/const.py:383
 msgid "Envious"
 msgstr "Завистлив"
 
-#: gajim/common/const.py:350
+#: gajim/common/const.py:384
 msgid "Excited"
 msgstr "Развълнуван"
 
-#: gajim/common/const.py:351
+#: gajim/common/const.py:385
 msgid "Flirtatious"
 msgstr "Склонен към флиртуване"
 
-#: gajim/common/const.py:352
+#: gajim/common/const.py:386
 msgid "Frustrated"
 msgstr "Разочарован"
 
-#: gajim/common/const.py:353
+#: gajim/common/const.py:387
 msgid "Grateful"
 msgstr "Признателен"
 
-#: gajim/common/const.py:354
+#: gajim/common/const.py:388
 msgid "Grieving"
 msgstr "Опечален"
 
-#: gajim/common/const.py:355
+#: gajim/common/const.py:389
 msgid "Grumpy"
 msgstr "Кисел"
 
-#: gajim/common/const.py:356
+#: gajim/common/const.py:390
 msgid "Guilty"
 msgstr "Виновен"
 
-#: gajim/common/const.py:357
+#: gajim/common/const.py:391
 msgid "Happy"
 msgstr "Щастлив"
 
-#: gajim/common/const.py:358
+#: gajim/common/const.py:392
 msgid "Hopeful"
 msgstr "С надежда"
 
-#: gajim/common/const.py:359
+#: gajim/common/const.py:393
 msgid "Hot"
 msgstr "Сгорещен"
 
-#: gajim/common/const.py:360
+#: gajim/common/const.py:394
 msgid "Humbled"
 msgstr "Скромен"
 
-#: gajim/common/const.py:361
+#: gajim/common/const.py:395
 msgid "Humiliated"
 msgstr "Унизен"
 
-#: gajim/common/const.py:362
+#: gajim/common/const.py:396
 msgid "Hungry"
 msgstr "Гладен"
 
-#: gajim/common/const.py:363
+#: gajim/common/const.py:397
 msgid "Hurt"
 msgstr "Ранен"
 
-#: gajim/common/const.py:364
+#: gajim/common/const.py:398
 msgid "Impressed"
 msgstr "Впечатлен"
 
-#: gajim/common/const.py:365
+#: gajim/common/const.py:399
 msgid "In Awe"
 msgstr "Със страхопочитание"
 
-#: gajim/common/const.py:366
+#: gajim/common/const.py:400
 msgid "In Love"
 msgstr "Влюбен"
 
-#: gajim/common/const.py:367
+#: gajim/common/const.py:401
 msgid "Indignant"
 msgstr "Възмутен"
 
-#: gajim/common/const.py:368
+#: gajim/common/const.py:402
 msgid "Interested"
 msgstr "Заинтересуван"
 
-#: gajim/common/const.py:369
+#: gajim/common/const.py:403
 msgid "Intoxicated"
 msgstr "Пиян"
 
-#: gajim/common/const.py:370
+#: gajim/common/const.py:404
 msgid "Invincible"
 msgstr "Непобедим"
 
-#: gajim/common/const.py:371
+#: gajim/common/const.py:405
 msgid "Jealous"
 msgstr "Ревнив"
 
-#: gajim/common/const.py:372
+#: gajim/common/const.py:406
 msgid "Lonely"
 msgstr "Самотен"
 
-#: gajim/common/const.py:373
+#: gajim/common/const.py:407
 msgid "Lost"
 msgstr "Безпомощен"
 
-#: gajim/common/const.py:374
+#: gajim/common/const.py:408
 msgid "Lucky"
 msgstr "Късметлия"
 
-#: gajim/common/const.py:375
+#: gajim/common/const.py:409
 msgid "Mean"
 msgstr "Подъл"
 
-#: gajim/common/const.py:376
+#: gajim/common/const.py:410
 msgid "Moody"
 msgstr "Унил"
 
-#: gajim/common/const.py:377
+#: gajim/common/const.py:411
 msgid "Nervous"
 msgstr "Нервен"
 
-#: gajim/common/const.py:378
+#: gajim/common/const.py:412
 msgid "Neutral"
 msgstr "Безразличен"
 
-#: gajim/common/const.py:379
+#: gajim/common/const.py:413
 msgid "Offended"
 msgstr "Обиден"
 
-#: gajim/common/const.py:380
+#: gajim/common/const.py:414
 msgid "Outraged"
 msgstr "Оскърбен"
 
-#: gajim/common/const.py:381
+#: gajim/common/const.py:415
 msgid "Playful"
 msgstr "Игрив"
 
-#: gajim/common/const.py:382
+#: gajim/common/const.py:416
 msgid "Proud"
 msgstr "Горд"
 
-#: gajim/common/const.py:383
+#: gajim/common/const.py:417
 msgid "Relaxed"
 msgstr "Отпуснат"
 
-#: gajim/common/const.py:384
+#: gajim/common/const.py:418
 msgid "Relieved"
 msgstr "Облекчен"
 
-#: gajim/common/const.py:385
+#: gajim/common/const.py:419
 msgid "Remorseful"
 msgstr "Разкайващ се"
 
-#: gajim/common/const.py:386
+#: gajim/common/const.py:420
 msgid "Restless"
 msgstr "Неспокоен"
 
-#: gajim/common/const.py:387
+#: gajim/common/const.py:421
 msgid "Sad"
 msgstr "Тъжен"
 
-#: gajim/common/const.py:388
+#: gajim/common/const.py:422
 msgid "Sarcastic"
 msgstr "Саркастичен"
 
-#: gajim/common/const.py:389
+#: gajim/common/const.py:423
 msgid "Satisfied"
 msgstr "Удовлетворен"
 
-#: gajim/common/const.py:390
+#: gajim/common/const.py:424
 msgid "Serious"
 msgstr "Сериозен"
 
-#: gajim/common/const.py:391
+#: gajim/common/const.py:425
 msgid "Shocked"
 msgstr "Шокиран"
 
-#: gajim/common/const.py:392
+#: gajim/common/const.py:426
 msgid "Shy"
 msgstr "Срамежлив"
 
-#: gajim/common/const.py:393
+#: gajim/common/const.py:427
 msgid "Sick"
 msgstr "Болен"
 
-#: gajim/common/const.py:394
+#: gajim/common/const.py:428
 msgid "Sleepy"
 msgstr "Сънен"
 
-#: gajim/common/const.py:395
+#: gajim/common/const.py:429
 msgid "Spontaneous"
 msgstr "Спонтанен"
 
-#: gajim/common/const.py:396
+#: gajim/common/const.py:430
 msgid "Stressed"
 msgstr "Стресиран"
 
-#: gajim/common/const.py:397
+#: gajim/common/const.py:431
 msgid "Strong"
 msgstr "Твърд"
 
-#: gajim/common/const.py:398
+#: gajim/common/const.py:432
 msgid "Surprised"
 msgstr "Изненадан"
 
-#: gajim/common/const.py:399
+#: gajim/common/const.py:433
 msgid "Thankful"
 msgstr "Благодарен"
 
-#: gajim/common/const.py:400
+#: gajim/common/const.py:434
 msgid "Thirsty"
 msgstr "Жаден"
 
-#: gajim/common/const.py:401
+#: gajim/common/const.py:435
 msgid "Tired"
 msgstr "Уморен"
 
-#: gajim/common/const.py:402
+#: gajim/common/const.py:436
 msgid "Undefined"
 msgstr "Неопределен"
 
-#: gajim/common/const.py:403
+#: gajim/common/const.py:437
 msgid "Weak"
 msgstr "Слаб"
 
-#: gajim/common/const.py:404
+#: gajim/common/const.py:438
 msgid "Worried"
 msgstr "Обезпокоен"
 
-#: gajim/common/const.py:408
+#: gajim/common/const.py:442
 msgid "accuracy"
 msgstr ""
 
-#: gajim/common/const.py:409
+#: gajim/common/const.py:443
 #, fuzzy
 msgid "alt"
 msgstr "по подразбиране"
 
-#: gajim/common/const.py:410
+#: gajim/common/const.py:444
 msgid "area"
 msgstr ""
 
-#: gajim/common/const.py:411
+#: gajim/common/const.py:445
 #, fuzzy
 msgid "bearing"
 msgstr "морска"
 
-#: gajim/common/const.py:412
+#: gajim/common/const.py:446
 #, fuzzy
 msgid "building"
 msgstr "Крия се"
 
-#: gajim/common/const.py:413
+#: gajim/common/const.py:447
 #, fuzzy
 msgid "country"
 msgstr "Акаунт"
 
-#: gajim/common/const.py:414
+#: gajim/common/const.py:448
 #, fuzzy
 msgid "countrycode"
 msgstr "Акаунт"
 
-#: gajim/common/const.py:415
+#: gajim/common/const.py:449
 msgid "datum"
 msgstr ""
 
-#: gajim/common/const.py:416
+#: gajim/common/const.py:450
 #, fuzzy
 msgid "description"
 msgstr "Описание"
 
-#: gajim/common/const.py:417
+#: gajim/common/const.py:451
 #, fuzzy
 msgid "error"
 msgstr "Грешка."
 
-#: gajim/common/const.py:418
+#: gajim/common/const.py:452
 msgid "floor"
 msgstr ""
 
-#: gajim/common/const.py:419
+#: gajim/common/const.py:453
 msgid "lat"
 msgstr ""
 
-#: gajim/common/const.py:420
+#: gajim/common/const.py:454
 msgid "locality"
 msgstr ""
 
-#: gajim/common/const.py:421
+#: gajim/common/const.py:455
 #, fuzzy
 msgid "lon"
 msgstr "един"
 
-#: gajim/common/const.py:422
+#: gajim/common/const.py:456
 msgid "postalcode"
 msgstr ""
 
-#: gajim/common/const.py:423
+#: gajim/common/const.py:457
 msgid "region"
 msgstr ""
 
-#: gajim/common/const.py:424
+#: gajim/common/const.py:458
 msgid "room"
 msgstr "стая"
 
-#: gajim/common/const.py:425
+#: gajim/common/const.py:459
 msgid "speed"
 msgstr ""
 
-#: gajim/common/const.py:426
+#: gajim/common/const.py:460
 msgid "street"
 msgstr ""
 
-#: gajim/common/const.py:427
+#: gajim/common/const.py:461
 msgid "text"
 msgstr ""
 
-#: gajim/common/const.py:428
+#: gajim/common/const.py:462
 msgid "timestamp"
 msgstr ""
 
-#: gajim/common/const.py:429
+#: gajim/common/const.py:463
 msgid "URI"
 msgstr ""
 
-#: gajim/common/const.py:434
+#: gajim/common/const.py:468
 msgid "Unable to get issuer certificate"
 msgstr "Неуспех при получаването на сертификата на издателя"
 
-#: gajim/common/const.py:435
+#: gajim/common/const.py:469
 msgid "Unable to get certificate CRL"
 msgstr "Неуспех при получаването на списъка с отменени сертификати"
 
-#: gajim/common/const.py:436
+#: gajim/common/const.py:470
 msgid "Unable to decrypt certificate's signature"
 msgstr "Неуспех при дешифрирането на подписа на сертификата"
 
-#: gajim/common/const.py:437
+#: gajim/common/const.py:471
 msgid "Unable to decrypt CRL's signature"
 msgstr "Неуспех при дешифрирането на подписа на списъка с отменени сертификати"
 
-#: gajim/common/const.py:438
+#: gajim/common/const.py:472
 msgid "Unable to decode issuer public key"
 msgstr "Неуспех при декодирането на публичния ключ на издателя"
 
-#: gajim/common/const.py:439
+#: gajim/common/const.py:473
 msgid "Certificate signature failure"
 msgstr "Грешка при проверката на подписа на сертификата"
 
-#: gajim/common/const.py:440
+#: gajim/common/const.py:474
 msgid "CRL signature failure"
 msgstr "Грешка при проверката на подписа на списъка с отменени сертификати"
 
-#: gajim/common/const.py:441
+#: gajim/common/const.py:475
 msgid "Certificate is not yet valid"
 msgstr "Сертификатът все още не е валиден"
 
-#: gajim/common/const.py:442
+#: gajim/common/const.py:476
 msgid "Certificate has expired"
 msgstr "Валидността на сертификата е изтекла"
 
-#: gajim/common/const.py:443
+#: gajim/common/const.py:477
 msgid "CRL is not yet valid"
 msgstr "Списъкът с отменени сертификати все още не е валиден"
 
-#: gajim/common/const.py:444
+#: gajim/common/const.py:478
 msgid "CRL has expired"
 msgstr "Валидността на списъка с отменени сертификати е изтекла"
 
-#: gajim/common/const.py:445
+#: gajim/common/const.py:479
 msgid "Format error in certificate's notBefore field"
 msgstr "Грешка при форматирането на полето „notBefore“ на сертификата"
 
-#: gajim/common/const.py:446
+#: gajim/common/const.py:480
 msgid "Format error in certificate's notAfter field"
 msgstr "Грешка при форматирането на полето „notAfter“ на сертификата"
 
-#: gajim/common/const.py:447
+#: gajim/common/const.py:481
 msgid "Format error in CRL's lastUpdate field"
 msgstr ""
 "Грешка при форматирането на полето „lastUpdate“ на списъка с отменени "
 "сертификати"
 
-#: gajim/common/const.py:448
+#: gajim/common/const.py:482
 msgid "Format error in CRL's nextUpdate field"
 msgstr ""
 "Грешка при форматирането на полето „nextUpdate“ на списъка с отменени "
 "сертификати"
 
-#: gajim/common/const.py:449
+#: gajim/common/const.py:483
 msgid "Out of memory"
 msgstr "Изчерпана памет"
 
-#: gajim/common/const.py:450
+#: gajim/common/const.py:484
 msgid "Self signed certificate"
 msgstr "Само-подписан сертификат"
 
-#: gajim/common/const.py:451
+#: gajim/common/const.py:485
 msgid "Self signed certificate in certificate chain"
 msgstr "Само-подписан сертификат в удостоверителската верига"
 
-#: gajim/common/const.py:452
+#: gajim/common/const.py:486
 msgid "Unable to get local issuer certificate"
 msgstr "Неуспех при получаването на сертификата на издателя"
 
-#: gajim/common/const.py:453
+#: gajim/common/const.py:487
 msgid "Unable to verify the first certificate"
 msgstr "Неуспех при проверката на първия сертификат"
 
-#: gajim/common/const.py:454
+#: gajim/common/const.py:488
 msgid "Certificate chain too long"
 msgstr "Удостоверителската верига е твърде дълга"
 
-#: gajim/common/const.py:455
+#: gajim/common/const.py:489
 msgid "Certificate revoked"
 msgstr "Сертификатът е отменен"
 
-#: gajim/common/const.py:456
+#: gajim/common/const.py:490
 msgid "Invalid CA certificate"
 msgstr "Невалиден сертификат на удостоверителя"
 
-#: gajim/common/const.py:457
+#: gajim/common/const.py:491
 msgid "Path length constraint exceeded"
 msgstr "Максималната дължина на пътя е надвишена"
 
-#: gajim/common/const.py:458
+#: gajim/common/const.py:492
 msgid "Unsupported certificate purpose"
 msgstr "Неподдържана цел на сертификата"
 
-#: gajim/common/const.py:459
+#: gajim/common/const.py:493
 msgid "Certificate not trusted"
 msgstr "Сертификатът не е доверен"
 
-#: gajim/common/const.py:460
+#: gajim/common/const.py:494
 msgid "Certificate rejected"
 msgstr "Сертификатът е отхвърлен"
 
-#: gajim/common/const.py:461
+#: gajim/common/const.py:495
 msgid "Subject issuer mismatch"
 msgstr "Несъответствие на издателя на сертификата"
 
-#: gajim/common/const.py:462
+#: gajim/common/const.py:496
 msgid "Authority and subject key identifier mismatch"
 msgstr "Несъответствие на идентификатора и сертифициращия орган"
 
-#: gajim/common/const.py:463
+#: gajim/common/const.py:497
 msgid "Authority and issuer serial number mismatch"
 msgstr "Несъответствие на серийния номер на издателя и сертифициращия орган"
 
-#: gajim/common/const.py:464
+#: gajim/common/const.py:498
 msgid "Key usage does not include certificate signing"
 msgstr "Основната употреба не включва подписване на сертификати"
 
-#: gajim/common/const.py:465
+#: gajim/common/const.py:499
 msgid "Application verification failure"
 msgstr "Грешка на приложението за проверка"
 
@@ -5173,261 +5315,261 @@ msgstr ""
 msgid "video output"
 msgstr ""
 
-#: gajim/common/helpers.py:210
+#: gajim/common/helpers.py:216
 msgid "Server must be between 1 and 1023 bytes"
 msgstr ""
 
-#: gajim/common/helpers.py:214
+#: gajim/common/helpers.py:220
 msgid "Invalid character in hostname."
 msgstr "Невалиден символ в името на хоста."
 
-#: gajim/common/helpers.py:216
+#: gajim/common/helpers.py:222
 msgid "Server address required."
 msgstr "Необходим е адрес на сървъра."
 
-#: gajim/common/helpers.py:220
+#: gajim/common/helpers.py:226
 msgid "Username must be between 1 and 1023 bytes"
 msgstr ""
 
-#: gajim/common/helpers.py:224
+#: gajim/common/helpers.py:230
 msgid "Invalid character in username."
 msgstr "Невалиден символ в потребителското име."
 
-#: gajim/common/helpers.py:230
+#: gajim/common/helpers.py:236
 msgid "Resource must be between 1 and 1023 bytes"
 msgstr ""
 
-#: gajim/common/helpers.py:234
+#: gajim/common/helpers.py:240
 msgid "Invalid character in resource."
 msgstr "Невалиден символ в ресурса."
 
-#: gajim/common/helpers.py:275
+#: gajim/common/helpers.py:281
 msgid "_Busy"
 msgstr "_Зает"
 
-#: gajim/common/helpers.py:277 gajim/gtk/tooltips.py:647
+#: gajim/common/helpers.py:283 gajim/gtk/tooltips.py:647
 msgid "Busy"
 msgstr "Зает"
 
-#: gajim/common/helpers.py:280
+#: gajim/common/helpers.py:286
 msgid "_Not Available"
 msgstr "_Не съм на разположение"
 
-#: gajim/common/helpers.py:282 gajim/gtk/tooltips.py:649
+#: gajim/common/helpers.py:288 gajim/gtk/tooltips.py:649
 msgid "Not Available"
 msgstr "Не съм на разположение"
 
-#: gajim/common/helpers.py:285
+#: gajim/common/helpers.py:291
 msgid "_Free for Chat"
 msgstr "_Свободен за разговор"
 
-#: gajim/common/helpers.py:287 gajim/gtk/tooltips.py:643
+#: gajim/common/helpers.py:293 gajim/gtk/tooltips.py:643
 msgid "Free for Chat"
 msgstr "Свободен за разговор"
 
-#: gajim/common/helpers.py:290
+#: gajim/common/helpers.py:296
 #, fuzzy
 msgid "?user status:_Available"
 msgstr "Временно прекъснат"
 
-#: gajim/common/helpers.py:292 gajim/gtk/tooltips.py:641
+#: gajim/common/helpers.py:298 gajim/gtk/tooltips.py:641
 #, fuzzy
 msgid "?user status:Available"
 msgstr "Временно прекъснат"
 
-#: gajim/common/helpers.py:294
+#: gajim/common/helpers.py:300
 msgid "Connecting"
 msgstr "Свързване"
 
-#: gajim/common/helpers.py:297 gajim/data/gui/preferences_window.ui:1251
+#: gajim/common/helpers.py:303 gajim/data/gui/preferences_window.ui:1251
 msgid "A_way"
 msgstr "_Отсъствам"
 
-#: gajim/common/helpers.py:299 gajim/common/modules/adhoc_commands.py:120
-#: gajim/command_system/implementation/standard.py:139
+#: gajim/common/helpers.py:305 gajim/common/modules/adhoc_commands.py:120
+#: gajim/command_system/implementation/standard.py:141
 #: gajim/gtk/tooltips.py:645
 msgid "Away"
 msgstr "Отсъствам"
 
-#: gajim/common/helpers.py:302
+#: gajim/common/helpers.py:308
 msgid "_Offline"
 msgstr "_Изключен"
 
-#: gajim/common/helpers.py:304 gajim/gtk/tooltips.py:651
+#: gajim/common/helpers.py:310 gajim/gtk/tooltips.py:651
 msgid "Offline"
 msgstr "Изключен"
 
-#: gajim/common/helpers.py:307
+#: gajim/common/helpers.py:313
 msgid "_Invisible"
 msgstr "Не_видим"
 
-#: gajim/common/helpers.py:313
+#: gajim/common/helpers.py:319
 msgid "?contact has status:Unknown"
 msgstr "Неизвестно"
 
-#: gajim/common/helpers.py:315
+#: gajim/common/helpers.py:321
 msgid "?contact has status:Has errors"
 msgstr "Има грешки"
 
-#: gajim/common/helpers.py:330
+#: gajim/common/helpers.py:336
 msgid "?Subscription we already have:None"
 msgstr "Няма"
 
-#: gajim/common/helpers.py:332
+#: gajim/common/helpers.py:338
 msgid "To"
 msgstr "За"
 
-#: gajim/common/helpers.py:334 gajim/data/gui/groups_post_window.ui:33
+#: gajim/common/helpers.py:340 gajim/data/gui/groups_post_window.ui:33
 msgid "From"
 msgstr "От"
 
-#: gajim/common/helpers.py:336
+#: gajim/common/helpers.py:342
 msgid "Both"
 msgstr "Двустранно"
 
-#: gajim/common/helpers.py:338 gajim/gtk/server_info.py:151
+#: gajim/common/helpers.py:344 gajim/gtk/server_info.py:151
 #, fuzzy
 msgid "Unknown"
 msgstr "Неизвестна"
 
-#: gajim/common/helpers.py:344
+#: gajim/common/helpers.py:350
 msgid "?Ask (for Subscription):None"
 msgstr "Няма"
 
-#: gajim/common/helpers.py:346
+#: gajim/common/helpers.py:352
 msgid "Subscribe"
 msgstr "Записване"
 
-#: gajim/common/helpers.py:355
+#: gajim/common/helpers.py:361
 msgid "?Group Chat Contact Role:None"
 msgstr "Не е установен"
 
-#: gajim/common/helpers.py:358
+#: gajim/common/helpers.py:364
 msgid "Moderators"
 msgstr "Председатели"
 
-#: gajim/common/helpers.py:360
+#: gajim/common/helpers.py:366
 msgid "Moderator"
 msgstr "Председател"
 
-#: gajim/common/helpers.py:363
+#: gajim/common/helpers.py:369 gajim/data/gui/groupchat_info_scrolled.ui:243
 msgid "Participants"
 msgstr "Участници"
 
-#: gajim/common/helpers.py:365
+#: gajim/common/helpers.py:371
 msgid "Participant"
 msgstr "Участник"
 
-#: gajim/common/helpers.py:368
+#: gajim/common/helpers.py:374
 msgid "Visitors"
 msgstr "Посетители"
 
-#: gajim/common/helpers.py:370
+#: gajim/common/helpers.py:376
 msgid "Visitor"
 msgstr "Посетител"
 
-#: gajim/common/helpers.py:376 gajim/gtk/tooltips.py:253
+#: gajim/common/helpers.py:382 gajim/gtk/tooltips.py:253
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "Няма"
 
-#: gajim/common/helpers.py:378 gajim/data/gui/groupchat_config.ui:32
+#: gajim/common/helpers.py:384 gajim/data/gui/groupchat_config.ui:32
 #: gajim/gtk/tooltips.py:259
 msgid "Owner"
 msgstr "Собственик"
 
-#: gajim/common/helpers.py:380 gajim/gtk/tooltips.py:257
+#: gajim/common/helpers.py:386 gajim/gtk/tooltips.py:257
 msgid "Administrator"
 msgstr "Администратор"
 
-#: gajim/common/helpers.py:382 gajim/data/gui/groupchat_config.ui:40
+#: gajim/common/helpers.py:388 gajim/data/gui/groupchat_config.ui:40
 #: gajim/gtk/tooltips.py:255 gajim/gtk/groupchat_config.py:105
 msgid "Member"
 msgstr "Член"
 
-#: gajim/common/helpers.py:421
+#: gajim/common/helpers.py:427
 msgid "is paying attention to the conversation"
 msgstr "обръща внимание на разговора"
 
-#: gajim/common/helpers.py:423
+#: gajim/common/helpers.py:429
 msgid "is doing something else"
 msgstr "прави нещо друго"
 
-#: gajim/common/helpers.py:425
+#: gajim/common/helpers.py:431
 #, fuzzy
 msgid "is composing a message…"
 msgstr "пише съобщение…"
 
-#: gajim/common/helpers.py:428
+#: gajim/common/helpers.py:434
 msgid "paused composing a message"
 msgstr "спря да пише съобщение"
 
-#: gajim/common/helpers.py:430
+#: gajim/common/helpers.py:436
 msgid "has closed the chat window or tab"
 msgstr "затвори прозореца или подпрозореца"
 
-#: gajim/common/helpers.py:936 gajim/common/helpers.py:943
+#: gajim/common/helpers.py:942 gajim/common/helpers.py:949
 #, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
 msgstr[0] "%d непрочетено съобщение"
 msgstr[1] "%d непрочетени съобщения"
 
-#: gajim/common/helpers.py:950
+#: gajim/common/helpers.py:956
 #, fuzzy, python-format
-msgid "from room %s"
-msgstr " от стая %s"
+msgid "from group chat %s"
+msgstr "в _стаи"
 
-#: gajim/common/helpers.py:953 gajim/common/helpers.py:970
+#: gajim/common/helpers.py:959 gajim/common/helpers.py:976
 #, fuzzy, python-format
 msgid "from user %s"
 msgstr " от потребител %s"
 
-#: gajim/common/helpers.py:955
+#: gajim/common/helpers.py:961
 #, fuzzy, python-format
 msgid "from %s"
 msgstr " от %s"
 
-#: gajim/common/helpers.py:962 gajim/common/helpers.py:968
+#: gajim/common/helpers.py:968 gajim/common/helpers.py:974
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
 msgstr[0] "%d чакащо събитие"
 msgstr[1] "%d чакащи събития"
 
-#: gajim/common/helpers.py:986 gajim/common/helpers.py:998
+#: gajim/common/helpers.py:992 gajim/common/helpers.py:1004
 #: gajim/data/gui/roster_window.ui:85 data/org.gajim.Gajim.desktop.in:4
 #: data/org.gajim.Gajim.appdata.xml.in:9
 msgid "Gajim"
 msgstr "Gajim"
 
-#: gajim/common/helpers.py:1000
+#: gajim/common/helpers.py:1006
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: gajim/common/helpers.py:1109 gajim/data/gui/add_new_contact_window.ui:25
+#: gajim/common/helpers.py:1115 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:1111
+#: gajim/common/helpers.py:1117
 msgid "Hello, I am $name."
 msgstr ""
 
-#: gajim/common/helpers.py:1215 gajim/common/helpers.py:1224
-#: gajim/common/helpers.py:1282
+#: gajim/common/helpers.py:1221 gajim/common/helpers.py:1230
+#: gajim/common/helpers.py:1288
 msgid "Timeout loading image"
 msgstr "Изтече времето за зареждане на изображението"
 
-#: gajim/common/helpers.py:1234 gajim/common/helpers.py:1280
+#: gajim/common/helpers.py:1240 gajim/common/helpers.py:1286
 msgid "Image is too big"
 msgstr "Изображението е твърде голямо"
 
-#: gajim/common/helpers.py:1245
+#: gajim/common/helpers.py:1251
 #, fuzzy
 msgid "PyCURL is not installed"
 msgstr "Списъкът с отменени сертификати все още не е валиден"
 
-#: gajim/common/helpers.py:1284
+#: gajim/common/helpers.py:1290
 #, fuzzy
 msgid "Error loading image"
 msgstr "Изтече времето за зареждане на изображението"
@@ -5611,7 +5753,8 @@ msgstr "Състоянието беше променено."
 
 #: gajim/common/modules/adhoc_commands.py:202
 #: gajim/common/modules/adhoc_commands.py:239
-msgid "Leave Groupchats"
+#, fuzzy
+msgid "Leave Group Chats"
 msgstr "Излизане от стаите"
 
 #: gajim/common/modules/adhoc_commands.py:228
@@ -5620,15 +5763,18 @@ msgid "%(nickname)s on %(room_jid)s"
 msgstr "%(nickname)s от стая %(room_jid)s"
 
 #: gajim/common/modules/adhoc_commands.py:232
-msgid "You have not joined a groupchat."
+#, fuzzy
+msgid "You have not joined a group chat."
 msgstr "Не сте влезли в стая."
 
 #: gajim/common/modules/adhoc_commands.py:240
-msgid "Choose the groupchats you want to leave"
+#, fuzzy
+msgid "Choose the group chats you want to leave"
 msgstr "Изберете стаите, които искате да напуснете"
 
 #: gajim/common/modules/adhoc_commands.py:289
-msgid "You left the following groupchats:"
+#, fuzzy
+msgid "You left the following group chats:"
 msgstr "Напуснахте следните стаи:"
 
 #: gajim/common/modules/roster_item_exchange.py:102
@@ -5645,7 +5791,7 @@ msgstr "Покана на _контакти"
 msgid "Blocked Contacts"
 msgstr "Блокирани контакти"
 
-#: gajim/data/gui/destroy_muc_dialog.ui:79 gajim/gtk/dialogs.py:736
+#: gajim/data/gui/destroy_muc_dialog.ui:79 gajim/gtk/dialogs.py:563
 msgid "Destroy this group chat permanently?"
 msgstr ""
 
@@ -5654,7 +5800,7 @@ msgstr ""
 msgid "Reason..."
 msgstr "Причина"
 
-#: gajim/data/gui/destroy_muc_dialog.ui:124 gajim/gtk/dialogs.py:738
+#: gajim/data/gui/destroy_muc_dialog.ui:124 gajim/gtk/dialogs.py:565
 msgid "Where participants should go (optional)"
 msgstr ""
 
@@ -5667,35 +5813,6 @@ msgstr ""
 msgid "_Reason and alternate venue (optional)"
 msgstr "Може да въведете и друго място за срещи:"
 
-#: gajim/data/gui/advanced_configuration_window.ui:7
-#: gajim/data/gui/preferences_window.ui:2723
-#, fuzzy
-msgid "Advanced Configuration Editor (ACE)"
-msgstr "Редактор на настройки за напреднали"
-
-#: gajim/data/gui/advanced_configuration_window.ui:52
-#, fuzzy
-msgid "You should restart Gajim for some changes to take effect"
-msgstr ""
-"<b>ЗАБЕЛЕЖКА:</b> Трябва да рестартирате Gajim, за да влязат в сила някои от "
-"настройките"
-
-#: gajim/data/gui/advanced_configuration_window.ui:84
-#, fuzzy
-msgid "_Filter"
-msgstr "Филтър:"
-
-#: gajim/data/gui/advanced_configuration_window.ui:153
-#: gajim/data/gui/filetransfers_send_file_dialog.ui:15
-#: gajim/gtk/discovery.py:1666
-msgid "Description"
-msgstr "Описание"
-
-#: gajim/data/gui/advanced_configuration_window.ui:197
-#, fuzzy
-msgid "_Reset to default"
-msgstr "Възстановяване на стандартните _цветове"
-
 #: gajim/data/gui/join_groupchat_window.ui:56
 #: gajim/data/gui/chat_to_muc_window.ui:67
 #: gajim/data/gui/chat_to_muc_window.ui:78
@@ -5707,9 +5824,8 @@ msgid "Join group chat every time Gajim is started"
 msgstr ""
 
 #: gajim/data/gui/join_groupchat_window.ui:113
-#, fuzzy
-msgid "Auto Join"
-msgstr "Автоматично влизане"
+msgid "Join Automatically"
+msgstr ""
 
 #: gajim/data/gui/join_groupchat_window.ui:131
 #: gajim/data/gui/profile_window.ui:233
@@ -5718,10 +5834,11 @@ msgstr "Акаунт"
 
 #: gajim/data/gui/join_groupchat_window.ui:147
 #, fuzzy
-msgid "Room"
-msgstr "Стая:"
+msgid "Group chat"
+msgstr "Стаи"
 
-#: gajim/data/gui/join_groupchat_window.ui:180 gajim/gtk/accounts.py:886
+#: gajim/data/gui/join_groupchat_window.ui:180 gajim/data/gui/bookmarks.ui:158
+#: gajim/gtk/accounts.py:889
 #, fuzzy
 msgid "Password"
 msgstr "Парола:"
@@ -5745,93 +5862,11 @@ msgstr "в _стаи"
 msgid "Search group chats on selected server"
 msgstr ""
 
-#: gajim/data/gui/join_groupchat_window.ui:437 gajim/gtk/discovery.py:1271
+#: gajim/data/gui/join_groupchat_window.ui:437 gajim/gtk/discovery.py:1270
 #, fuzzy
 msgid "Join"
 msgstr "_Влизане"
 
-#: gajim/data/gui/manage_proxies_window.ui:12
-#, fuzzy
-msgid "HTTP Connect"
-msgstr ""
-"Свързване по HTTP\n"
-"SOCKS5"
-
-#: gajim/data/gui/manage_proxies_window.ui:15
-msgid "SOCKS5"
-msgstr ""
-
-#: gajim/data/gui/manage_proxies_window.ui:18
-msgid "BOSH"
-msgstr ""
-
-#: gajim/data/gui/manage_proxies_window.ui:27
-msgid "Manage Proxy Profiles"
-msgstr "Настройки на сървъра-посредник"
-
-#: gajim/data/gui/manage_proxies_window.ui:83
-#, fuzzy
-msgid "Add Proxy"
-msgstr "Сървър-посредник:"
-
-#: gajim/data/gui/manage_proxies_window.ui:97
-#, fuzzy
-msgid "Remove Proxy"
-msgstr "Премахване на група"
-
-#: gajim/data/gui/manage_proxies_window.ui:141
-#, fuzzy
-msgid "Properties"
-msgstr "<b>Настройки</b>"
-
-#: gajim/data/gui/manage_proxies_window.ui:157
-#, fuzzy
-msgid "_Name"
-msgstr "_Име:"
-
-#: gajim/data/gui/manage_proxies_window.ui:173
-#, fuzzy
-msgid "_Type"
-msgstr "Тип:"
-
-#: gajim/data/gui/manage_proxies_window.ui:236
-msgid "_BOSH URL"
-msgstr ""
-
-#: gajim/data/gui/manage_proxies_window.ui:261
-msgid "Use HTTP prox_y"
-msgstr ""
-
-#: gajim/data/gui/manage_proxies_window.ui:280
-#, fuzzy
-msgid "Proxy _Host"
-msgstr "Сървър-посредник:"
-
-#: gajim/data/gui/manage_proxies_window.ui:307
-#, fuzzy
-msgid "Proxy _Port"
-msgstr "По_рт:"
-
-#: gajim/data/gui/manage_proxies_window.ui:334
-#, fuzzy
-msgid "_Username"
-msgstr "И_ме на потребител:"
-
-#: gajim/data/gui/manage_proxies_window.ui:347
-#, fuzzy
-msgid "Use proxy auth_entication"
-msgstr "Използване на удостоверяване"
-
-#: gajim/data/gui/manage_proxies_window.ui:377
-#, fuzzy
-msgid "Pass_word"
-msgstr "Паро_ла:"
-
-#: gajim/data/gui/manage_proxies_window.ui:405 gajim/gtk/adhoc.py:321
-#, fuzzy
-msgid "Settings"
-msgstr "Неуспех при свързването"
-
 #: gajim/data/gui/change_password_dialog.ui:17
 #, fuzzy
 msgid "New Password"
@@ -5862,11 +5897,13 @@ msgid "Status:"
 msgstr "Състояние:"
 
 #: gajim/data/gui/zeroconf_information_window.ui:89
-msgid "_Log conversation history"
+#, fuzzy
+msgid "_Store conversation history"
 msgstr "_Запазване на разговорите"
 
 #: gajim/data/gui/zeroconf_information_window.ui:215
 #: gajim/data/gui/vcard_information_window.ui:390
+#: gajim/data/gui/groupchat_info_scrolled.ui:166
 msgid "Contact"
 msgstr "Контакт"
 
@@ -5879,8 +5916,9 @@ msgid "Last Name:"
 msgstr "Фамилия:"
 
 #: gajim/data/gui/zeroconf_information_window.ui:260
-msgid "Jabber ID:"
-msgstr "Jabber ID:"
+#, fuzzy
+msgid "XMPP Address:"
+msgstr "Адрес на AIM:"
 
 #: gajim/data/gui/zeroconf_information_window.ui:273
 msgid "E-Mail:"
@@ -5900,8 +5938,9 @@ msgid "Send _File"
 msgstr "Изпращане на _файл"
 
 #: gajim/data/gui/gc_occupants_menu.ui:29
-msgid "Occupant Actions"
-msgstr "_Действия на участника"
+#, fuzzy
+msgid "Participant Actions"
+msgstr "Участници"
 
 #: gajim/data/gui/gc_occupants_menu.ui:38
 msgid "_Voice"
@@ -5932,8 +5971,9 @@ msgid "_Ban"
 msgstr "_Забраняване на достъпа"
 
 #: gajim/data/gui/gc_occupants_menu.ui:124
-msgid "_Add to Roster"
-msgstr "Добавяне към _списъка…"
+#, fuzzy
+msgid "_Add to Contact List"
+msgstr "_Добавяне на контакт…"
 
 #: gajim/data/gui/gc_occupants_menu.ui:132
 #, fuzzy
@@ -5973,11 +6013,6 @@ msgstr "Записване: "
 msgid "_Status"
 msgstr "_Състояние"
 
-#: gajim/data/gui/zeroconf_context_menu.ui:26
-#: gajim/data/gui/account_context_menu.ui:79
-msgid "_Modify Account..."
-msgstr "_Промяна на акаунт…"
-
 #: gajim/data/gui/certificate_dialog.ui:66
 #: gajim/data/gui/certificate_dialog.ui:178
 msgid "Common Name (CN)"
@@ -6059,13 +6094,19 @@ msgstr "Последно променена:"
 msgid "Next entry"
 msgstr ""
 
+#: gajim/data/gui/filetransfers_send_file_dialog.ui:15
+#: gajim/data/gui/advanced_configuration.ui:143
+#: gajim/data/gui/groupchat_info_scrolled.ui:48 gajim/gtk/discovery.py:1663
+msgid "Description"
+msgstr "Описание"
+
 #: gajim/data/gui/filetransfers_send_file_dialog.ui:54
 #, fuzzy
 msgid "_Send Files"
 msgstr "Изпращане на _файл"
 
 #: gajim/data/gui/filetransfers_send_file_dialog.ui:58
-#: gajim/gtk/xml_console.py:90
+#: gajim/gtk/xml_console.py:87
 #, fuzzy
 msgid "Send"
 msgstr "_Изпращане"
@@ -6090,20 +6131,23 @@ msgid "Change _Nickname..."
 msgstr "Смяна на псе_вдоним…"
 
 #: gajim/data/gui/gc_control_popup_menu.ui:20
-msgid "_Manage Room"
-msgstr "_Управление на стаята"
+#, fuzzy
+msgid "_Manage Group Chat"
+msgstr "_Нова стая"
 
 #: gajim/data/gui/gc_control_popup_menu.ui:31
 msgid "Change _Subject..."
 msgstr "Промяна на _темата…"
 
 #: gajim/data/gui/gc_control_popup_menu.ui:38
-msgid "Configure _Room..."
-msgstr "Настройки на _стаята…"
+#, fuzzy
+msgid "Configure _Group Chat..."
+msgstr "_Влизане в стая…"
 
 #: gajim/data/gui/gc_control_popup_menu.ui:52
-msgid "_Destroy Room"
-msgstr "_Унищожаване на стаята"
+#, fuzzy
+msgid "_Destroy Group Chat"
+msgstr "_Нова стая"
 
 #: gajim/data/gui/gc_control_popup_menu.ui:64
 msgid "_Minimize on close"
@@ -6114,7 +6158,7 @@ msgstr "_Минимизиране при затваряне"
 msgid "_Request Voice"
 msgstr "_Глас"
 
-#: gajim/data/gui/gc_control_popup_menu.ui:99 gajim/gtk/discovery.py:1704
+#: gajim/data/gui/gc_control_popup_menu.ui:99
 msgid "_Bookmark"
 msgstr "_Добавяне на стаята към отметките"
 
@@ -6166,14 +6210,6 @@ msgstr "<b>Страница в Интернет:</b>"
 msgid "E-Mail"
 msgstr "Е-поща:"
 
-#: 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/blocking_list.ui:115 gajim/gtk/add_contact.py:30
-#: gajim/gtk/accounts.py:801
-#, fuzzy
-msgid "Jabber ID"
-msgstr "Jabber ID:"
-
 #: gajim/data/gui/profile_window.ui:440
 msgid "Main"
 msgstr ""
@@ -6306,35 +6342,42 @@ msgstr "Работа"
 msgid "About"
 msgstr "Относно"
 
-#: gajim/data/gui/start_chat_dialog.ui:114 gajim/gtk/discovery.py:1658
-msgid "Users"
-msgstr "Потребители"
-
-#: gajim/data/gui/start_chat_dialog.ui:185
-msgid "Name:"
-msgstr "Име:"
+#: gajim/data/gui/start_chat_dialog.ui:53
+#, fuzzy
+msgid "Global Group Chat Search"
+msgstr "Влизане в стая"
 
-#: gajim/data/gui/start_chat_dialog.ui:197
+#: 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
-msgid "Description:"
-msgstr "Описание: "
+msgid "_Back"
+msgstr "Връщам се скоро"
 
-#: gajim/data/gui/start_chat_dialog.ui:209
+#: gajim/data/gui/start_chat_dialog.ui:245
+#: gajim/data/gui/groupchat_control.ui:796
+#: gajim/data/gui/groupchat_control.ui:888 gajim/gtk/discovery.py:1701
+#: gajim/gtk/groupchat_join.py:62
+msgid "_Join"
+msgstr "_Влизане"
+
+#: gajim/data/gui/start_chat_dialog.ui:289
 #, fuzzy
-msgid "Address:"
-msgstr "_Адрес:"
+msgid "Select Account"
+msgstr "Премахване на акаунт „%s“"
 
-#: gajim/data/gui/start_chat_dialog.ui:246
-msgid ""
-"Semi-Anonymous\n"
-"<span size=\"small\">(Only moderators can see your XMPP-Address)</span>"
+#: gajim/data/gui/start_chat_dialog.ui:380
+msgid "_Select"
 msgstr ""
 
 #: gajim/data/gui/filetransfers.ui:21
 msgid "Pa_use/Resume"
 msgstr ""
 
-#: gajim/data/gui/filetransfers.ui:30 gajim/gtk/filechoosers.py:178
+#: gajim/data/gui/filetransfers.ui:30 gajim/data/gui/groupchat_control.ui:575
+#: gajim/data/gui/groupchat_control.ui:667
+#: gajim/data/gui/groupchat_control.ui:779
+#: gajim/data/gui/groupchat_control.ui:871 gajim/gtk/filechoosers.py:178
 msgid "_Cancel"
 msgstr "_Отказ"
 
@@ -6377,7 +6420,8 @@ msgid "Cancel the selected file transfer and remove incomplete files"
 msgstr "Отменя избрания файлов трансфер и изтрива непълния файл"
 
 #: gajim/data/gui/filetransfers.ui:207
-msgid "Shows a list of file transfers between you and others"
+#, fuzzy
+msgid "Shows a list of file transfers between you and your contacts"
 msgstr "Показва списък с файловите трансфери между вас и останалите"
 
 #: gajim/data/gui/groupchat_control.ui:13 gajim/data/gui/chat_control.ui:277
@@ -6399,7 +6443,6 @@ msgid "Strike"
 msgstr "Болен"
 
 #: gajim/data/gui/groupchat_control.ui:54 gajim/data/gui/chat_control.ui:318
-#: gajim/gtk/advanced_config.py:86
 msgid "Color"
 msgstr "Цвят"
 
@@ -6412,16 +6455,46 @@ msgstr ""
 msgid "Clear formatting"
 msgstr "Информация за контакта"
 
-#: gajim/data/gui/groupchat_control.ui:290 gajim/data/gui/chat_control.ui:880
+#: gajim/data/gui/groupchat_control.ui:291 gajim/data/gui/chat_control.ui:880
 #, fuzzy
 msgid "Choose encryption"
 msgstr "Избор на файл за изпращане…"
 
-#: gajim/data/gui/groupchat_control.ui:336 gajim/data/gui/chat_control.ui:640
+#: gajim/data/gui/groupchat_control.ui:337 gajim/data/gui/chat_control.ui:640
 #, fuzzy
 msgid "Show a list of emojis (Alt+M)"
 msgstr "Списък с емотикони (Alt+M)"
 
+#: gajim/data/gui/groupchat_control.ui:484
+#, fuzzy
+msgid "Joining…"
+msgstr "Отлъчване…"
+
+#: gajim/data/gui/groupchat_control.ui:496
+msgid "_Abort"
+msgstr ""
+
+#: gajim/data/gui/groupchat_control.ui:542
+#, fuzzy
+msgid "Enter new nickname"
+msgstr "Въведете нов псевдоним за контакт „%s“"
+
+#: gajim/data/gui/groupchat_control.ui:592
+#: gajim/data/gui/groupchat_control.ui:684
+#, fuzzy
+msgid "Ch_ange"
+msgstr "Смяна на псе_вдоним…"
+
+#: gajim/data/gui/groupchat_control.ui:761
+#, fuzzy
+msgid "Enter password"
+msgstr "Въведете нова парола:"
+
+#: gajim/data/gui/groupchat_control.ui:1067
+#, fuzzy
+msgid "_Try again"
+msgstr "Проверка наново…"
+
 #: gajim/data/gui/popup_notification_window.ui:42
 #, fuzzy
 msgid "Event Type"
@@ -6503,8 +6576,8 @@ msgstr "Отсъствам"
 
 #: gajim/data/gui/mam_preferences.ui:18
 #, fuzzy
-msgid "Roster"
-msgstr "П_оказване на списъка"
+msgid "Contact List"
+msgstr "Контакти"
 
 #: gajim/data/gui/mam_preferences.ui:22
 #: gajim/data/gui/preferences_window.ui:123
@@ -6529,12 +6602,12 @@ msgid "Add"
 msgstr ""
 
 #: gajim/data/gui/mam_preferences.ui:194 gajim/data/gui/groupchat_config.ui:151
-#: gajim/gtk/dialogs.py:63 gajim/gtk/accounts.py:381
+#: gajim/gtk/dialogs.py:62 gajim/gtk/accounts.py:384
 #, fuzzy
 msgid "Remove"
 msgstr "_Премахване"
 
-#: gajim/data/gui/vcard_information_window.ui:72 gajim/gtk/accounts.py:753
+#: gajim/data/gui/vcard_information_window.ui:72 gajim/gtk/accounts.py:756
 #, fuzzy
 msgid "Resource"
 msgstr "Ресурс:"
@@ -6586,6 +6659,7 @@ msgstr "Записване: "
 #: gajim/data/gui/vcard_information_window.ui:974
 #: gajim/data/gui/vcard_information_window.ui:993
 #: gajim/data/gui/vcard_information_window.ui:1427
+#: gajim/data/gui/groupchat_info_scrolled.ui:222
 msgid "button"
 msgstr ""
 
@@ -6616,15 +6690,15 @@ msgstr "Уведомяване за _изключващи се контакти"
 
 #: gajim/data/gui/preferences_window.ui:58
 #, fuzzy
-msgid "Show only in roster"
-msgstr "Показване на събитието в спис_ъка"
+msgid "Show only in contact list"
+msgstr "Показване на изкл_ючените контакти"
 
 #: gajim/data/gui/preferences_window.ui:69
-msgid "Detached roster with detached chats"
+msgid "Detached contact list with detached chats"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:72
-msgid "Detached roster with single chat"
+msgid "Detached contact list with single chat"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:75
@@ -6632,11 +6706,11 @@ msgid "Single window for everything"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:78
-msgid "Detached roster with chat grouped by account"
+msgid "Detached contact list with chat grouped by account"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:81
-msgid "Detached roster with chat grouped by type"
+msgid "Detached contact list with chat grouped by type"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:92
@@ -6688,7 +6762,7 @@ msgstr "_Поведение на прозорците:"
 
 #: gajim/data/gui/preferences_window.ui:296
 #, fuzzy
-msgid "_Show roster on startup"
+msgid "_Show contact list on startup"
 msgstr "П_оказване на списъка"
 
 #: gajim/data/gui/preferences_window.ui:311
@@ -6704,12 +6778,12 @@ msgid "_Tabs placement"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:363
-msgid "_Quit Gajim when closing roster window"
+msgid "_Quit Gajim when closing contact list"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:367
 msgid ""
-"If enabled, Gajim will quit when closing the roster window instead of "
+"If enabled, Gajim will quit when closing the contact list window instead of "
 "minimizing to the system's notification area"
 msgstr ""
 
@@ -6719,41 +6793,42 @@ msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:423
 #, fuzzy
-msgid "Show a_vatars of contacts in roster"
+msgid "Show a_vatars of contacts in contact list"
 msgstr "Показване на _аватари на контактите в списъка"
 
 #: gajim/data/gui/preferences_window.ui:427
 #, fuzzy
 msgid ""
-"If checked, avatars of contacts will be shown in the roster window and in "
-"group chats"
+"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
 #, fuzzy
-msgid "Show status _messages of contacts in roster"
+msgid "Show status _messages of contacts in contact list"
 msgstr "Показване на _съобщенията за състояние на контактите в списъка"
 
 #: gajim/data/gui/preferences_window.ui:445
 #, fuzzy
 msgid ""
 "If checked, status messages of contacts will be shown under the contact's "
-"name, in the roster window, and in group chats"
+"name, in the contact list window, and in group chats"
 msgstr ""
 "Ако тази опция е избрана, съобщенията за състояние на контактите ще се "
 "показват под имената им в списъка и в стаите"
 
 #: gajim/data/gui/preferences_window.ui:459
 #, fuzzy
-msgid "Show e_xtra information of contacts in roster (mood, activity, ...)"
+msgid ""
+"Show e_xtra information of contacts in contact list (mood, activity, ...)"
 msgstr "Показване на _настроенията на контактите в списъка"
 
 #: gajim/data/gui/preferences_window.ui:463
 msgid ""
-"If checked, additional info published by the contact will be shown in "
-"roster. Additional infos (published via PEP) may include e.g. mood, "
+"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 ""
 
@@ -6762,8 +6837,9 @@ msgid "Sort contacts by status"
 msgstr "Подреждане на контактите по състояние"
 
 #: gajim/data/gui/preferences_window.ui:494
-msgid "in _roster"
-msgstr "в с_писъка"
+#, fuzzy
+msgid "in _contact list"
+msgstr "Покана на _контакти"
 
 #: gajim/data/gui/preferences_window.ui:511
 msgid "in _group chats"
@@ -6771,8 +6847,8 @@ msgstr "в _стаи"
 
 #: gajim/data/gui/preferences_window.ui:540
 #, fuzzy
-msgid "Roster Appearance"
-msgstr "<b>Изглед на списъка</b>"
+msgid "Contact List Appearance"
+msgstr "Изключване на контакт"
 
 #: gajim/data/gui/preferences_window.ui:585
 #, fuzzy
@@ -6839,7 +6915,7 @@ msgstr "Неуспех при влизането в стаята"
 
 #: gajim/data/gui/preferences_window.ui:660
 #, fuzzy
-msgid "If checked, the room subject will be shown when joining a group chat"
+msgid "If checked, the subject will be shown when joining a group chat"
 msgstr "Неуспех при влизането в стаята"
 
 #: gajim/data/gui/preferences_window.ui:682
@@ -6854,13 +6930,13 @@ msgstr ""
 #: gajim/data/gui/preferences_window.ui:701
 msgid ""
 "If join/leave status messages are shown in the group chat. This setting can "
-"be overridden in the groupchat menu."
+"be overridden in the group chat menu."
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:720
 msgid ""
 "The default sync threshold for new public group chats. This setting can be "
-"overridden in the groupchat menu."
+"overridden in the group chat menu."
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:722
@@ -6875,7 +6951,7 @@ msgstr "Запазване на промените на _състоянията
 #: gajim/data/gui/preferences_window.ui:768
 msgid ""
 "If status change messages are shown in the group chat. This setting can be "
-"overridden in the groupchat menu."
+"overridden in the group chat menu."
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:825
@@ -6894,8 +6970,8 @@ msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:843
 #, fuzzy
-msgid "Show chatstate in roster"
-msgstr "Показване на _аватари на контактите в списъка"
+msgid "Show chatstate in contact list"
+msgstr "Показване на бутона за затваряне на подпрозореца?"
 
 #: gajim/data/gui/preferences_window.ui:847
 msgid ""
@@ -7198,7 +7274,7 @@ msgstr ""
 msgid "Vi_ew own video source"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2281 gajim/gtk/accounts.py:352
+#: gajim/data/gui/preferences_window.ui:2281 gajim/gtk/accounts.py:355
 msgid "Connection"
 msgstr "Свързване"
 
@@ -7252,7 +7328,8 @@ msgid "_Manage..."
 msgstr "Управление на…"
 
 #: gajim/data/gui/preferences_window.ui:2616
-msgid "_Log status changes of contacts"
+#, fuzzy
+msgid "_Store status changes of contacts in history"
 msgstr "Запазване на промените на _състоянията на контактите"
 
 #: gajim/data/gui/preferences_window.ui:2633
@@ -7277,10 +7354,15 @@ msgstr ""
 msgid "_Open..."
 msgstr "_Отваряне…"
 
+#: gajim/data/gui/preferences_window.ui:2723 gajim/gtk/advanced_config.py:84
+#, fuzzy
+msgid "Advanced Configuration Editor (ACE)"
+msgstr "Редактор на настройки за напреднали"
+
 #: gajim/data/gui/groupchat_config.ui:55
 #, fuzzy
 msgid ""
-"<b>Jabber-ID</b>\n"
+"<b>XMPP Address</b>\n"
 "&lt;user@domain/resource&gt; (only that resource matches)\n"
 "&lt;user@domain&gt; (any resource matches)\n"
 "&lt;domain/resource&gt; (only that resource matches)\n"
@@ -7299,7 +7381,8 @@ msgstr ""
 msgid "Only Admins and Owners can modify the affiliation"
 msgstr ""
 
-#: gajim/data/gui/groupchat_config.ui:270 gajim/plugins/gui.py:312
+#: gajim/data/gui/groupchat_config.ui:270
+#: gajim/data/gui/groupchat_info_scrolled.ui:210 gajim/plugins/gui.py:324
 #, fuzzy
 msgid "Configuration"
 msgstr "Настройки на стаята"
@@ -7332,7 +7415,7 @@ msgid "Start _Chat"
 msgstr "Започване на _разговор"
 
 #: gajim/data/gui/contact_context_menu.ui:20
-#: gajim/data/gui/systray_context_menu.ui:36
+#: gajim/data/gui/systray_context_menu.ui:29
 msgid "Send Single _Message..."
 msgstr "Изпращане на _еднократно съобщение…"
 
@@ -7394,17 +7477,45 @@ msgid "_Ignore"
 msgstr "_Игнориране"
 
 #: gajim/data/gui/contact_context_menu.ui:174
-msgid "_Add to Roster..."
-msgstr "Добавяне към _списъка…"
+#, fuzzy
+msgid "_Add to Contact List..."
+msgstr "_Добавяне на контакт…"
+
+#: gajim/data/gui/advanced_configuration.ui:39
+#, fuzzy
+msgid "You should restart Gajim for some changes to take effect"
+msgstr ""
+"<b>ЗАБЕЛЕЖКА:</b> Трябва да рестартирате Gajim, за да влязат в сила някои от "
+"настройките"
+
+#: gajim/data/gui/advanced_configuration.ui:71
+#, fuzzy
+msgid "_Filter"
+msgstr "Филтър:"
+
+#: gajim/data/gui/advanced_configuration.ui:88
+msgid "Type to search for values..."
+msgstr ""
+
+#: gajim/data/gui/advanced_configuration.ui:180
+#, fuzzy
+msgid "_Reset Value"
+msgstr "Възстановяване на стандартните _цветове"
+
+#: gajim/data/gui/advanced_configuration.ui:185
+#, fuzzy
+msgid "Resets value to default"
+msgstr "Възстановяване на стандартните _цветове"
 
 #: gajim/data/gui/account_creation_wizard_window.ui:43
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim: Помощник за създаване на акаунт"
 
 #: gajim/data/gui/account_creation_wizard_window.ui:70
+#, fuzzy
 msgid ""
 "You need to have an account in order to connect\n"
-"to the Jabber network."
+"to the XMPP network."
 msgstr ""
 "Трябва да имате акаунт, за да се свържете с\n"
 "мрежата на Джабър."
@@ -7426,8 +7537,9 @@ msgid "<b>Please fill in the data for your existing account</b>"
 msgstr "<b>Попълнете данните за съществуващия ви акаунт</b>"
 
 #: gajim/data/gui/account_creation_wizard_window.ui:187
-msgid "_Jabber ID:"
-msgstr "_Jabber ID:"
+#, fuzzy
+msgid "_XMPP Address:"
+msgstr "Адрес на AIM:"
 
 #: gajim/data/gui/account_creation_wizard_window.ui:239
 #: gajim/data/gui/account_creation_wizard_window.ui:394
@@ -7515,6 +7627,7 @@ msgid "Privacy Lists:"
 msgstr "Филтри за уединение:"
 
 #: gajim/data/gui/service_discovery_window.ui:111
+#: gajim/data/gui/groupchat_creation.ui:227
 #, fuzzy
 msgid "_Address"
 msgstr "_Адрес:"
@@ -7532,11 +7645,6 @@ msgstr "Синхронизиране: избор на контакти"
 msgid "Select the contacts you want to synchronise"
 msgstr "Изберете контактите, които искате да синхронизирате"
 
-#: gajim/data/gui/groupchat_invitation_received.ui:42
-#, fuzzy
-msgid "Group Chat Invitation"
-msgstr "Покана за разговор в стая"
-
 #: gajim/data/gui/groupchat_invitation_received.ui:111
 #, fuzzy
 msgid "Message..."
@@ -7587,11 +7695,10 @@ msgstr ""
 
 #: gajim/data/gui/add_new_contact_window.ui:84
 #, fuzzy
-msgid "_Jabber ID"
-msgstr "_Jabber ID:"
+msgid "_XMPP Address"
+msgstr "_Адрес:"
 
 #: gajim/data/gui/add_new_contact_window.ui:100
-#: gajim/data/gui/manage_bookmarks_window.ui:192
 #, fuzzy
 msgid "_Nickname"
 msgstr "Псе_вдоним:"
@@ -7669,7 +7776,7 @@ msgstr "<b>Настроение:</b>"
 msgid "<b>Message:</b>"
 msgstr "<b>Съобщение:</b>"
 
-#: gajim/data/gui/plugins_window.ui:10 gajim/data/gui/application_menu.ui:90
+#: gajim/data/gui/plugins_window.ui:10 gajim/data/gui/application_menu.ui:87
 msgid "Plugins"
 msgstr ""
 
@@ -7778,10 +7885,6 @@ msgstr "Позволяване на"
 msgid "Deny"
 msgstr "Отказване"
 
-#: gajim/data/gui/privacy_list_window.ui:317
-msgid "JabberID"
-msgstr "Jabber ID"
-
 #: gajim/data/gui/privacy_list_window.ui:358
 msgid "all in the group"
 msgstr "всички в групата"
@@ -7824,7 +7927,7 @@ msgstr "Ред:"
 msgid "Manage sounds"
 msgstr "Управление на акаунти"
 
-#: gajim/data/gui/manage_sounds_window.ui:55 gajim/plugins/gui.py:100
+#: gajim/data/gui/manage_sounds_window.ui:55 gajim/plugins/gui.py:101
 msgid "Active"
 msgstr "Активен"
 
@@ -7862,23 +7965,113 @@ msgstr "Премахване на акаунт от Gajim и от с_ървър�
 msgid "_Personal Events"
 msgstr "_Лични събития"
 
-#: gajim/data/gui/account_context_menu.ui:35
-#: gajim/data/gui/systray_context_menu.ui:28
-msgid "Join _Group Chat"
-msgstr "_Влизане в стая"
-
-#: gajim/data/gui/account_context_menu.ui:49
+#: gajim/data/gui/account_context_menu.ui:41
 msgid "_Add Contact..."
 msgstr "_Добавяне на контакт…"
 
-#: gajim/data/gui/account_context_menu.ui:57
+#: gajim/data/gui/account_context_menu.ui:49
 msgid "_Discover Services"
 msgstr "_Откриване на услуги"
 
-#: gajim/data/gui/account_context_menu.ui:65
+#: gajim/data/gui/account_context_menu.ui:57
 msgid "_Execute Command..."
 msgstr "_Изпълнение на команда…"
 
+#: gajim/data/gui/account_context_menu.ui:65
+#, fuzzy
+msgid "_View Certificate"
+msgstr "Само-подписан сертификат"
+
+#: gajim/data/gui/manage_proxies.ui:12
+#, fuzzy
+msgctxt "proxy configuration"
+msgid "HTTP Connect"
+msgstr ""
+"Свързване по HTTP\n"
+"SOCKS5"
+
+#: gajim/data/gui/manage_proxies.ui:15
+msgctxt "proxy configuration"
+msgid "SOCKS5"
+msgstr ""
+
+#: gajim/data/gui/manage_proxies.ui:18
+msgctxt "proxy configuration"
+msgid "BOSH"
+msgstr ""
+
+#: gajim/data/gui/manage_proxies.ui:68
+#, fuzzy
+msgid "Add Proxy"
+msgstr "Сървър-посредник:"
+
+#: gajim/data/gui/manage_proxies.ui:82
+#, fuzzy
+msgid "Remove Proxy"
+msgstr "Премахване на група"
+
+#: gajim/data/gui/manage_proxies.ui:134
+#, fuzzy
+msgid "Pass_word"
+msgstr "Паро_ла:"
+
+#: gajim/data/gui/manage_proxies.ui:159
+#, fuzzy
+msgid "Use proxy auth_entication"
+msgstr "Използване на удостоверяване"
+
+#: gajim/data/gui/manage_proxies.ui:179
+#, fuzzy
+msgid "_Username"
+msgstr "И_ме на потребител:"
+
+#: gajim/data/gui/manage_proxies.ui:209
+#, fuzzy
+msgid "_Port"
+msgstr "По_рт:"
+
+#: gajim/data/gui/manage_proxies.ui:226
+msgid "example.org"
+msgstr ""
+
+#: gajim/data/gui/manage_proxies.ui:240
+#, fuzzy
+msgid "_Host"
+msgstr "_Хост:"
+
+#: gajim/data/gui/manage_proxies.ui:254
+msgid "Use HTTP prox_y"
+msgstr ""
+
+#: gajim/data/gui/manage_proxies.ui:275
+msgid "https://example.org/http-bind/"
+msgstr ""
+
+#: gajim/data/gui/manage_proxies.ui:291
+msgid "_BOSH URL"
+msgstr ""
+
+#: gajim/data/gui/manage_proxies.ui:309 gajim/gtk/adhoc.py:322
+#, fuzzy
+msgid "Settings"
+msgstr "Неуспех при свързването"
+
+#: gajim/data/gui/manage_proxies.ui:344
+#, fuzzy
+msgid "_Type"
+msgstr "Тип:"
+
+#: gajim/data/gui/manage_proxies.ui:361
+#: gajim/data/gui/groupchat_creation.ui:105
+#, fuzzy
+msgid "_Name"
+msgstr "_Име:"
+
+#: gajim/data/gui/manage_proxies.ui:391 gajim/gtk/accounts.py:742
+#, fuzzy
+msgid "Proxy"
+msgstr "Сървър-посредник:"
+
 #: gajim/data/gui/application_menu.ui:8
 #, fuzzy
 msgid "View"
@@ -7886,8 +8079,8 @@ msgstr "_Изглед"
 
 #: gajim/data/gui/application_menu.ui:11
 #, fuzzy
-msgid "Show Roster"
-msgstr "П_оказване на списъка"
+msgid "Show Contact List"
+msgstr "Показване на изкл_ючените контакти"
 
 #: gajim/data/gui/application_menu.ui:16
 #, fuzzy
@@ -7928,23 +8121,24 @@ msgstr ""
 msgid "Features"
 msgstr "Възможности"
 
-#: gajim/data/gui/application_menu.ui:81
+#: gajim/data/gui/application_menu.ui:77
+#: gajim/data/gui/groupchat_creation.ui:81 gajim/gtk/groupchat_creation.py:45
 #, fuzzy
-msgid "Bookmarks"
-msgstr "_Добавяне на стаята към отметките"
+msgid "Create Group Chat"
+msgstr "Излизане от стаите"
 
-#: gajim/data/gui/application_menu.ui:94 gajim/data/gui/shortcuts_window.ui:189
-#: gajim/gtk/preferences.py:59
+#: gajim/data/gui/application_menu.ui:91 gajim/data/gui/shortcuts_window.ui:189
+#: gajim/gtk/preferences.py:58
 msgid "Preferences"
 msgstr "Настройки"
 
-#: gajim/data/gui/application_menu.ui:99
+#: gajim/data/gui/application_menu.ui:96
 #, fuzzy
 msgid "Quit"
 msgstr "_Изход"
 
 #: gajim/data/gui/httpupload_progress_dialog.ui:110
-#: gajim/gtk/filetransfer.py:121
+#: gajim/gtk/filetransfer.py:120
 msgid "Progress"
 msgstr "Напредък"
 
@@ -7961,52 +8155,33 @@ msgstr ""
 msgid "_Cancel Upload"
 msgstr "_Отказ"
 
-#: gajim/data/gui/manage_bookmarks_window.ui:13
-#, fuzzy
-msgid "Group Chat Bookmarks"
-msgstr "С_тая"
-
-#: gajim/data/gui/manage_bookmarks_window.ui:68
-#, fuzzy
-msgid "Add Bookmark"
-msgstr "_Добавяне на стаята към отметките"
-
-#: gajim/data/gui/manage_bookmarks_window.ui:82
-#, fuzzy
-msgid "Remove Bookmark"
-msgstr "_Добавяне на стаята към отметките"
+#: gajim/data/gui/groupchat_creation.ui:27
+msgid "Public or Private?"
+msgstr ""
 
-#: gajim/data/gui/manage_bookmarks_window.ui:126
-msgid "N_ame"
+#: 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 ""
 
-#: gajim/data/gui/manage_bookmarks_window.ui:145
-#, fuzzy
-msgid "Bookmark Name"
-msgstr "_Добавяне на стаята към отметките (Ctrl+B)"
+#: gajim/data/gui/groupchat_creation.ui:58
+msgid "<b>Public:</b> Anyone who knows the address can join."
+msgstr ""
 
-#: gajim/data/gui/manage_bookmarks_window.ui:160
+#: gajim/data/gui/groupchat_creation.ui:122
 #, fuzzy
-msgid "_Server"
-msgstr "С_ървър:"
+msgid "_Description"
+msgstr "Описание"
 
-#: gajim/data/gui/manage_bookmarks_window.ui:223
-msgid "Roo_m"
+#: gajim/data/gui/groupchat_creation.ui:164
+msgid "_Public"
 msgstr ""
 
-#: gajim/data/gui/manage_bookmarks_window.ui:253
+#: gajim/data/gui/groupchat_creation.ui:278
 #, fuzzy
-msgid "_Password"
-msgstr "_Парола:"
-
-#: gajim/data/gui/manage_bookmarks_window.ui:299
-#, fuzzy
-msgid "Join chat when connected"
-msgstr "Изключване на контакт"
-
-#: gajim/data/gui/manage_bookmarks_window.ui:307
-msgid "_Join Automatically"
-msgstr ""
+msgid "_Account"
+msgstr "_Акаунти"
 
 #: gajim/data/gui/exception_dialog.ui:49
 msgid "Sorry, that should not have happened"
@@ -8050,6 +8225,29 @@ msgstr "Упълномощаване на контакта, така че да �
 msgid "Presets"
 msgstr "С_ъстояние"
 
+#: gajim/data/gui/groupchat_info_scrolled.ui:32
+#, fuzzy
+msgid "Address"
+msgstr "_Адрес:"
+
+#: gajim/data/gui/groupchat_info_scrolled.ui:64
+msgid "Topic"
+msgstr ""
+
+#: gajim/data/gui/groupchat_info_scrolled.ui:80
+#, fuzzy
+msgid "Author"
+msgstr "_Упълномощаване"
+
+#: gajim/data/gui/groupchat_info_scrolled.ui:182
+msgid "Discussion Logs"
+msgstr ""
+
+#: gajim/data/gui/groupchat_info_scrolled.ui:260
+#, fuzzy
+msgid "Group Chat Language"
+msgstr "Покана за разговор в стая"
+
 #: gajim/data/gui/emoji_chooser.ui:98
 #, fuzzy
 msgid "No Results Found"
@@ -8062,24 +8260,35 @@ msgstr "Поканете приятели!"
 #: gajim/data/gui/chat_to_muc_window.ui:39
 #, fuzzy
 msgid ""
-"You are now entering a groupchat.\n"
+"You are now entering a group chat.\n"
 "Select the contacts you want to invite"
 msgstr ""
 "На път сте да започнете разговор в стая.\n"
 "Изберете контактите, които искате да поканите."
 
 #: gajim/data/gui/chat_to_muc_window.ui:112
-msgid "Please select a MUC server."
+#, fuzzy
+msgid "Please select a group chat server."
 msgstr "Изберете сървър за стаи."
 
 #: gajim/data/gui/chat_to_muc_window.ui:141
-msgid "MUC server"
-msgstr "Сървър за стаи"
+#, fuzzy
+msgid "Group chat server"
+msgstr "Стаи"
 
 #: gajim/data/gui/chat_to_muc_window.ui:176
 msgid "In_vite"
 msgstr "По_кана"
 
+#: gajim/data/gui/bookmarks.ui:176
+#, fuzzy
+msgid "Autojoin"
+msgstr "Автоматично влизане"
+
+#: gajim/data/gui/bookmarks.ui:211
+msgid "_Apply"
+msgstr ""
+
 #: gajim/data/gui/history_manager.ui:11
 #, fuzzy
 msgid "_Export"
@@ -8095,12 +8304,13 @@ msgid "Gajim History Logs Manager"
 msgstr "Мениджър на историята на разговорите"
 
 #: gajim/data/gui/history_manager.ui:108
+#, fuzzy
 msgid ""
-"This log manager is not intended for log viewing. If you are looking for "
-"such functionality, use the history window instead.\n"
+"This history manager is not intended for viewing chat history. If you are "
+"looking for such functionality, please use the history window instead.\n"
 "\n"
-"Use this program to delete or export logs. You can select logs from the left "
-"and/or search database from below."
+"You can use this program to delete or export history. Either select logs "
+"from the left or search the database."
 msgstr ""
 "Този мениджър не е предназначен за преглед на историята на разговорите. Ако "
 "търсите такава функционалност, използвайте прозореца за история.\n"
@@ -8153,8 +8363,9 @@ msgid "Select an emoji"
 msgstr ""
 
 #: gajim/data/gui/shortcuts_window.ui:38
-msgid "Complete a command or a nick"
-msgstr ""
+#, fuzzy
+msgid "Complete a command or a nickname"
+msgstr "Създайте нова тема с желаното име."
 
 #: gajim/data/gui/shortcuts_window.ui:45
 #, fuzzy
@@ -8194,7 +8405,7 @@ msgstr ""
 msgid "Scroll down"
 msgstr ""
 
-#: gajim/data/gui/shortcuts_window.ui:100 gajim/gtk/xml_console.py:72
+#: gajim/data/gui/shortcuts_window.ui:100 gajim/gtk/xml_console.py:69
 #, fuzzy
 msgid "Clear"
 msgstr "Чистя"
@@ -8236,8 +8447,9 @@ msgid "Close chat"
 msgstr ""
 
 #: gajim/data/gui/shortcuts_window.ui:173
-msgid "Roster Shortcuts"
-msgstr ""
+#, fuzzy
+msgid "Contact List Shortcuts"
+msgstr "Изключване на контакт"
 
 #: gajim/data/gui/shortcuts_window.ui:196
 #, fuzzy
@@ -8270,7 +8482,7 @@ msgid "Show only active contacts"
 msgstr "Показване на изкл_ючените контакти"
 
 #: gajim/data/gui/shortcuts_window.ui:251
-msgid "Enable roster filtering"
+msgid "Enable contact list filtering"
 msgstr ""
 
 #: gajim/data/gui/shortcuts_window.ui:259
@@ -8317,12 +8529,12 @@ msgstr ""
 
 #: gajim/data/gui/history_window.ui:317
 #, fuzzy
-msgid "Record history for this chat"
+msgid "Store history for this chat"
 msgstr "Пренебрегване на грешката за този сертификат."
 
 #: gajim/data/gui/history_window.ui:332
 #, fuzzy
-msgid "Record History"
+msgid "Store History"
 msgstr "Скоро посетени:"
 
 #: gajim/data/gui/history_window.ui:350
@@ -8343,9 +8555,10 @@ msgstr "Създаване на ново съобщение"
 msgid "Fill in the form."
 msgstr "Попълнете формуляра."
 
-#: gajim/data/gui/data_form_window.ui:229
-msgid "Room Configuration"
-msgstr "Настройки на стаята"
+#: gajim/data/gui/data_form_window.ui:229 gajim/gtk/groupchat_config.py:41
+#, fuzzy
+msgid "Group Chat Configuration"
+msgstr "Покана за разговор в стая"
 
 #: gajim/data/gui/roster_item_exchange_window.ui:39
 #: gajim/gtk/roster_item_exchange.py:35
@@ -8366,15 +8579,15 @@ msgstr "С_ъстояние"
 msgid "_Start Chat..."
 msgstr "_Започване на разговор…"
 
-#: gajim/data/gui/systray_context_menu.ui:50
+#: gajim/data/gui/systray_context_menu.ui:43
 msgid "Show All Pending _Events"
 msgstr "Показване на всички _чакащи събития"
 
-#: gajim/data/gui/systray_context_menu.ui:59
+#: gajim/data/gui/systray_context_menu.ui:52
 msgid "Mute Sounds"
 msgstr "Изключване на звука"
 
-#: gajim/data/gui/systray_context_menu.ui:75
+#: gajim/data/gui/systray_context_menu.ui:68
 #, fuzzy
 msgid "_Preferences"
 msgstr "Настройки"
@@ -8466,34 +8679,34 @@ msgstr ""
 msgid "Execute expression inside a shell, send output"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:45
+#: gajim/command_system/implementation/standard.py:47
 msgid ""
 "Show help on a given command or a list of available commands if -a is given"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:73
+#: gajim/command_system/implementation/standard.py:75
 #, fuzzy
 msgid "Send a message to the contact"
 msgstr "Употреба: /%s, изпраща съобщение до контакта."
 
-#: gajim/command_system/implementation/standard.py:78
+#: gajim/command_system/implementation/standard.py:80
 msgid "Send action (in the third person) to the current chat"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:83
+#: gajim/command_system/implementation/standard.py:85
 msgid "Show logged messages which mention given text"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:88
+#: gajim/command_system/implementation/standard.py:90
 #, fuzzy, python-format
 msgid "%s: Nothing found"
 msgstr "%s не е намерен"
 
-#: gajim/command_system/implementation/standard.py:94
+#: gajim/command_system/implementation/standard.py:96
 msgid "Limit must be an integer"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:118
+#: gajim/command_system/implementation/standard.py:120
 msgid ""
 "\n"
 "    Set the current status\n"
@@ -8503,132 +8716,133 @@ msgid ""
 "    "
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:136
+#: gajim/command_system/implementation/standard.py:138
 msgid "Set the current status to away"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:150
+#: gajim/command_system/implementation/standard.py:152
 msgid "Set the current status to online"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:153
+#: gajim/command_system/implementation/standard.py:155
 #, fuzzy
 msgid "Available"
 msgstr "На _линия"
 
-#: gajim/command_system/implementation/standard.py:173
-#: gajim/command_system/implementation/standard.py:250
+#: gajim/command_system/implementation/standard.py:175
+#: gajim/command_system/implementation/standard.py:252
 #, fuzzy
 msgid "Clear the text window"
 msgstr "Употреба: /%s, изчиства текстовия прозорец."
 
-#: gajim/command_system/implementation/standard.py:178
-#: gajim/command_system/implementation/standard.py:397
+#: gajim/command_system/implementation/standard.py:180
+#: gajim/command_system/implementation/standard.py:401
 #, fuzzy
 msgid "Send a ping to the contact"
 msgstr "Употреба: /%s, изпраща „ping“ до контакта."
 
-#: gajim/command_system/implementation/standard.py:181
-#: gajim/command_system/implementation/standard.py:400
+#: gajim/command_system/implementation/standard.py:183
+#: gajim/command_system/implementation/standard.py:404
 #, fuzzy
 msgid "Command is not supported for zeroconf accounts"
 msgstr "Командата не се поддържа за акаунт тип „zeroconf“."
 
-#: gajim/command_system/implementation/standard.py:185
-msgid "Send DTMF sequence through an open audio session"
+#: gajim/command_system/implementation/standard.py:187
+msgid "Send DTMF sequence through an open voice chat"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:188
-msgid "No open audio sessions with the contact"
-msgstr ""
+#: gajim/command_system/implementation/standard.py:190
+#, fuzzy
+msgid "No open voice chats with the contact"
+msgstr " отворен прозорец/подпрозорец с този контакт "
 
-#: gajim/command_system/implementation/standard.py:191
+#: gajim/command_system/implementation/standard.py:193
 #, fuzzy, python-format
 msgid "%s is not a valid tone"
 msgstr "%s не е валидно ниво за дневник"
 
-#: gajim/command_system/implementation/standard.py:198
-msgid "Toggle audio session"
+#: gajim/command_system/implementation/standard.py:200
+msgid "Toggle Voice Chat"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:201
+#: gajim/command_system/implementation/standard.py:203
 #, fuzzy
-msgid "Audio sessions are not available"
+msgid "Voice chats are not available"
 msgstr "В момента няма връзка"
 
-#: gajim/command_system/implementation/standard.py:208
-msgid "Toggle video session"
+#: gajim/command_system/implementation/standard.py:210
+msgid "Toggle Video Chat"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:211
+#: gajim/command_system/implementation/standard.py:213
 #, fuzzy
-msgid "Video sessions are not available"
+msgid "Video chats are not available"
 msgstr "В момента няма връзка"
 
-#: gajim/command_system/implementation/standard.py:218
+#: gajim/command_system/implementation/standard.py:220
 #, fuzzy
 msgid "Send a message to the contact that will attract their attention"
 msgstr "Употреба: /%s, изпраща съобщение до контакта."
 
-#: gajim/command_system/implementation/standard.py:255
+#: gajim/command_system/implementation/standard.py:257
 #, fuzzy
 msgid "Change your nickname in a group chat"
 msgstr "Смяна на псевдоним (Ctrl+N)"
 
-#: gajim/command_system/implementation/standard.py:260 gajim/gtk/dialogs.py:674
-#: gajim/gtk/bookmarks.py:272
+#: gajim/command_system/implementation/standard.py:262
 msgid "Invalid nickname"
 msgstr "Невалиден псевдоним"
 
-#: gajim/command_system/implementation/standard.py:267
+#: gajim/command_system/implementation/standard.py:269
 #, fuzzy
-msgid "Open a private chat window with a specified occupant"
+msgid "Open a private chat window with a specified participant"
 msgstr ""
 "Употреба: /%s <псевдоним>, отваря прозорец за лично съобщение със съответния "
 "участник."
 
-#: gajim/command_system/implementation/standard.py:273
-#: gajim/command_system/implementation/standard.py:282
-#: gajim/command_system/implementation/standard.py:332
-#: gajim/command_system/implementation/standard.py:345
-#: gajim/command_system/implementation/standard.py:357
+#: gajim/command_system/implementation/standard.py:275
+#: gajim/command_system/implementation/standard.py:284
+#: gajim/command_system/implementation/standard.py:336
+#: gajim/command_system/implementation/standard.py:349
+#: gajim/command_system/implementation/standard.py:361
 #, fuzzy
 msgid "Nickname not found"
 msgstr "Псевдонимът не е намерен: %s"
 
-#: gajim/command_system/implementation/standard.py:276
+#: gajim/command_system/implementation/standard.py:278
 #, fuzzy
 msgid ""
-"Open a private chat window with a specified occupant and send him a message"
+"Open a private chat window with a specified participant and send him a "
+"message"
 msgstr ""
 "Употреба: /%s <псевдоним>, отваря прозорец за лично съобщение със съответния "
 "участник."
 
-#: gajim/command_system/implementation/standard.py:285
+#: gajim/command_system/implementation/standard.py:287
 #, fuzzy
 msgid "Display or change a group chat topic"
 msgstr "Питане преди затваряне на подпрозорец/прозорец на стая."
 
-#: gajim/command_system/implementation/standard.py:294
-msgid "Invite a user to a room for a reason"
+#: gajim/command_system/implementation/standard.py:296
+msgid "Invite a user to a group chat for a reason"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:297
+#: gajim/command_system/implementation/standard.py:299
 #, fuzzy, python-format
 msgid "Invited %(jid)s to %(room_jid)s"
 msgstr "%(contact_jid)s е поканен в %(room_jid)s."
 
-#: gajim/command_system/implementation/standard.py:301
+#: gajim/command_system/implementation/standard.py:303
 #, fuzzy
-msgid "Join a group chat given by a JID"
+msgid "Join a group chat given by an XMPP Address"
 msgstr "в _стаи"
 
-#: gajim/command_system/implementation/standard.py:309
+#: gajim/command_system/implementation/standard.py:313
 msgid ""
-"Leave the groupchat, optionally giving a reason, and close tab or window"
+"Leave the group chat, optionally giving a reason, and close tab or window"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:314
+#: gajim/command_system/implementation/standard.py:318
 msgid ""
 "\n"
 "    Ban user by a nick or a JID from a groupchat\n"
@@ -8637,46 +8851,46 @@ msgid ""
 "    "
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:329
+#: gajim/command_system/implementation/standard.py:333
 #, fuzzy
-msgid "Kick user by a nick from a groupchat"
+msgid "Kick user by a nick from a group chat"
 msgstr "Поканени сте в стая."
 
-#: gajim/command_system/implementation/standard.py:338
+#: gajim/command_system/implementation/standard.py:342
 msgid ""
-"Set occupant role in group chat.\n"
+"Set participant role in group chat.\n"
 "    Role can be given as one of the following values:\n"
 "    moderator, participant, visitor, none"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:343
+#: gajim/command_system/implementation/standard.py:347
 #, fuzzy
 msgid "Invalid role given"
 msgstr "Невалиден сървър"
 
-#: gajim/command_system/implementation/standard.py:350
+#: gajim/command_system/implementation/standard.py:354
 msgid ""
-"Set occupant affiliation in group chat.\n"
+"Set participant affiliation in group chat.\n"
 "    Affiliation can be given as one of the following values:\n"
 "    owner, admin, member, outcast, none"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:355
+#: gajim/command_system/implementation/standard.py:359
 #, fuzzy
 msgid "Invalid affiliation given"
 msgstr "рангът е променен"
 
-#: gajim/command_system/implementation/standard.py:365
+#: gajim/command_system/implementation/standard.py:369
 #, fuzzy
-msgid "Display names of all group chat occupants"
+msgid "Display names of all group chat participants"
 msgstr "Употреба: /%s, показва имената на участниците в стаята."
 
-#: gajim/command_system/implementation/standard.py:387
-msgid "Forbid an occupant to send you public or private messages"
+#: gajim/command_system/implementation/standard.py:391
+msgid "Forbid a participant to send you public or private messages"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:392
-msgid "Allow an occupant to send you public or private messages"
+#: gajim/command_system/implementation/standard.py:396
+msgid "Allow a participant to send you public or private messages"
 msgstr ""
 
 #: gajim/command_system/implementation/middleware.py:74
@@ -8687,204 +8901,329 @@ msgstr ""
 msgid "The same as using a doc-string, except it supports translation"
 msgstr ""
 
-#: gajim/gtk/filetransfer.py:91
+#: gajim/gtk/groupchat_info.py:36
+#, fuzzy
+msgid "?Group chat feature:Archiving"
+msgstr "Покана за разговор в стая"
+
+#: gajim/gtk/groupchat_info.py:37
+#, fuzzy
+msgid "Messages are archived on the server"
+msgstr "НЯМА да се запазва дневник за сесията"
+
+#: gajim/gtk/groupchat_info.py:40
+#, fuzzy
+msgid "?Group chat feature:Persistent"
+msgstr "Стаи"
+
+#: gajim/gtk/groupchat_info.py:41
+msgid "This group chat persists even if there are no participants"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:45
+#, fuzzy
+msgid "?Group chat feature:Temporary"
+msgstr "Не е установен"
+
+#: gajim/gtk/groupchat_info.py:46
+msgid "This group chat will be destroyed once the last participant left"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:50
+#, fuzzy
+msgid "?Group chat feature:Moderated"
+msgstr "Не е установен"
+
+#: gajim/gtk/groupchat_info.py:51
+msgid ""
+"Participants entering this group chat need to request permission to send "
+"messages"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:55
+#, fuzzy
+msgid "?Group chat feature:Not Moderated"
+msgstr "Стаи"
+
+#: gajim/gtk/groupchat_info.py:56
+msgid "Participants entering this group chat are allowed to send messages"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:60
+#, fuzzy
+msgid "?Group chat feature:Open"
+msgstr "Не е установен"
+
+#: gajim/gtk/groupchat_info.py:61
+#, fuzzy
+msgid "Anyone can join this group chat"
+msgstr "%s влезе в стаята"
+
+#: gajim/gtk/groupchat_info.py:64
+#, fuzzy
+msgid "?Group chat feature:Members Only"
+msgstr "Осветено съобщение в стая"
+
+#: gajim/gtk/groupchat_info.py:65
+msgid "This group chat is restricted to members only"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:69
+#, fuzzy
+msgid "?Group chat feature:Public"
+msgstr "Осветено съобщение в стая"
+
+#: gajim/gtk/groupchat_info.py:70
+msgid "Group chat can be found via search"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:73
+#, fuzzy
+msgid "?Group chat feature:Hidden"
+msgstr "Не е установен"
+
+#: gajim/gtk/groupchat_info.py:74
+#, fuzzy
+msgid "This group chat can not be found via search"
+msgstr "Тази стая няма тема"
+
+#: gajim/gtk/groupchat_info.py:77
+#, fuzzy
+msgid "?Group chat feature:Not Anonymous"
+msgstr "Стаи"
+
+#: gajim/gtk/groupchat_info.py:78
+msgid "All other group chat participants can see your XMPP address"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:82
+#, fuzzy
+msgid "?Group chat feature:Semi-Anonymous"
+msgstr "Осветено съобщение в стая"
+
+#: gajim/gtk/groupchat_info.py:83
+msgid "Only moderators can see your XMPP address"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:86
+#, fuzzy
+msgid "?Group chat feature:Password Required"
+msgstr "Стаи"
+
+#: gajim/gtk/groupchat_info.py:87
+msgid "This group chat does require a password upon entry"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:91
+#, fuzzy
+msgid "?Group chat feature:No Password Required"
+msgstr "Стаи"
+
+#: gajim/gtk/groupchat_info.py:92
+msgid "This group chat does not require a password upon entry"
+msgstr ""
+
+#: gajim/gtk/filetransfer.py:90
 msgid "File"
 msgstr "Файл:"
 
-#: gajim/gtk/filetransfer.py:108
+#: gajim/gtk/filetransfer.py:107
 msgid "Time"
 msgstr "Време"
 
-#: gajim/gtk/filetransfer.py:228
+#: gajim/gtk/filetransfer.py:227
 #, fuzzy, python-format
 msgid "File name: %s"
 msgstr "Име на файл: %s"
 
-#: gajim/gtk/filetransfer.py:229 gajim/gtk/filetransfer.py:464
+#: gajim/gtk/filetransfer.py:228 gajim/gtk/filetransfer.py:469
 #, python-format
 msgid "Size: %s"
 msgstr "Размер: %s"
 
-#: gajim/gtk/filetransfer.py:239
+#: gajim/gtk/filetransfer.py:238
 #, python-format
 msgid "Sender: %s"
 msgstr "Изпращач: %s"
 
-#: gajim/gtk/filetransfer.py:240 gajim/gtk/filetransfer.py:744
+#: gajim/gtk/filetransfer.py:239 gajim/gtk/filetransfer.py:749
 #: gajim/gtk/tooltips.py:577
 msgid "Recipient: "
 msgstr "Получател: "
 
-#: gajim/gtk/filetransfer.py:251
+#: gajim/gtk/filetransfer.py:250
 #, python-format
 msgid "Saved in: %s"
 msgstr "Запазен в: %s"
 
-#: gajim/gtk/filetransfer.py:256
+#: gajim/gtk/filetransfer.py:255
 msgid "File transfer completed"
 msgstr "Файловият трансфер завърши"
 
-#: gajim/gtk/filetransfer.py:276 gajim/gtk/filetransfer.py:285
+#: gajim/gtk/filetransfer.py:275 gajim/gtk/filetransfer.py:284
 #, fuzzy
 msgid "Connection with peer could not be established."
 msgstr "Не може да бъде установен контакт с отсрещната машина."
 
-#: gajim/gtk/filetransfer.py:293
+#: gajim/gtk/filetransfer.py:292
 #, python-format
 msgid "Filename: %s"
 msgstr "Име на файл: %s"
 
-#: gajim/gtk/filetransfer.py:294
+#: gajim/gtk/filetransfer.py:293
 #, python-format
 msgid "Recipient: %s"
 msgstr "Получател: %s"
 
-#: gajim/gtk/filetransfer.py:296
+#: gajim/gtk/filetransfer.py:295
 #, python-format
 msgid "Error message: %s"
 msgstr "Грешка: %s"
 
-#: gajim/gtk/filetransfer.py:333
-#, fuzzy
-msgid "File transfer error"
-msgstr "Грешка при файловия трансфер"
-
 #: gajim/gtk/filetransfer.py:334
 #, python-format
 msgid ""
-"The file %(file)s has been received, but it seems to have been damaged along "
-"the way.\n"
+"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 ""
 
-#: gajim/gtk/filetransfer.py:350
+#: gajim/gtk/filetransfer.py:340
+#, fuzzy
+msgid "_Download Again"
+msgstr "Да _не се задава този въпрос отново"
+
+#: gajim/gtk/filetransfer.py:355
 #, fuzzy
 msgid "Gajim can not read this file"
 msgstr "Неуспех при достъпа до този файл"
 
-#: gajim/gtk/filetransfer.py:351
+#: gajim/gtk/filetransfer.py:356
 msgid "Another process is using this file."
 msgstr ""
 
-#: gajim/gtk/filetransfer.py:418
+#: gajim/gtk/filetransfer.py:423
 #, fuzzy
 msgid "File Transfer Conflict"
 msgstr "Файловият трансфер е приключен"
 
-#: gajim/gtk/filetransfer.py:419
+#: gajim/gtk/filetransfer.py:424
 msgid "This file already exists"
 msgstr "Този файл вече съществува"
 
-#: gajim/gtk/filetransfer.py:420
+#: gajim/gtk/filetransfer.py:425
 msgid "Resume download or replace file?"
 msgstr ""
 
-#: gajim/gtk/filetransfer.py:424
+#: gajim/gtk/filetransfer.py:429
 #, fuzzy
 msgid "Replace _File"
 msgstr "Чистя"
 
-#: gajim/gtk/filetransfer.py:427
+#: gajim/gtk/filetransfer.py:432
 #, fuzzy
 msgid "Resume _Download"
 msgstr "Изтегляне"
 
-#: gajim/gtk/filetransfer.py:437
+#: gajim/gtk/filetransfer.py:442
 #, fuzzy, python-format
 msgid "Directory '%s' is not writable"
 msgstr "Папката „%s“ не е разрешена за запис"
 
-#: gajim/gtk/filetransfer.py:438
+#: gajim/gtk/filetransfer.py:443
 #, fuzzy
 msgid "You do not have permissions to create files in this directory."
 msgstr "Нямата права да създавате файлове в тази папка."
 
-#: gajim/gtk/filetransfer.py:461
+#: gajim/gtk/filetransfer.py:466
 #, python-format
 msgid "File: %s"
 msgstr "Файл: %s"
 
-#: gajim/gtk/filetransfer.py:467
+#: gajim/gtk/filetransfer.py:472
 #, python-format
 msgid "Type: %s"
 msgstr "Тип: %s"
 
-#: gajim/gtk/filetransfer.py:469
+#: gajim/gtk/filetransfer.py:474
 #, python-format
 msgid "Description: %s"
 msgstr "Описание: %s"
 
-#: gajim/gtk/filetransfer.py:480
+#: gajim/gtk/filetransfer.py:485
 #, fuzzy, python-format
 msgid "%s wants to send you a file"
 msgstr "%s иска да ви изпрати файл."
 
-#: gajim/gtk/filetransfer.py:509
+#: gajim/gtk/filetransfer.py:514
 #, fuzzy
 msgid "Checking file…"
 msgstr "Изпращане на профила…"
 
-#: gajim/gtk/filetransfer.py:524
+#: gajim/gtk/filetransfer.py:529
 #, fuzzy
 msgid "File error"
 msgstr "Грешка при файловия трансфер"
 
-#: gajim/gtk/filetransfer.py:561
+#: gajim/gtk/filetransfer.py:566
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 
-#: gajim/gtk/filetransfer.py:658
+#: gajim/gtk/filetransfer.py:663
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/сек)"
 
-#: gajim/gtk/filetransfer.py:711 gajim/gtk/filetransfer.py:715
+#: gajim/gtk/filetransfer.py:716 gajim/gtk/filetransfer.py:720
 msgid "Invalid File"
 msgstr "Невалиден файл"
 
-#: gajim/gtk/filetransfer.py:711
+#: gajim/gtk/filetransfer.py:716
 msgid "File: "
 msgstr "Файл: "
 
-#: gajim/gtk/filetransfer.py:716
+#: gajim/gtk/filetransfer.py:721
 msgid "It is not possible to send empty files"
 msgstr "Не е възможно да бъдат изпращани празни файлове"
 
-#: gajim/gtk/filetransfer.py:742 gajim/gtk/tooltips.py:571
+#: gajim/gtk/filetransfer.py:747 gajim/gtk/tooltips.py:571
 msgid "Sender: "
 msgstr "Изпращач: "
 
-#: gajim/gtk/filetransfer.py:1038
+#: gajim/gtk/filetransfer.py:1043
 #, fuzzy
 msgid "Choose a File to Send…"
 msgstr "Избор на файл за изпращане…"
 
 #: gajim/gtk/start_chat.py:51
 #, fuzzy
-msgid "Start new Conversation"
+msgid "Start New Conversation"
 msgstr "Продължен разговор"
 
-#: gajim/gtk/start_chat.py:424
-#, fuzzy
-msgid "New Groupchat"
-msgstr "Нова стая"
+#: gajim/gtk/start_chat.py:260 gajim/gtk/start_chat.py:328
+msgid "You can not join a group chat unless you are connected."
+msgstr "Трябва да сте свързани, за да влезете в стая."
 
-#: gajim/gtk/start_chat.py:426
+#: gajim/gtk/start_chat.py:603 gajim/gtk/groupchat_join.py:38
+msgid "Join Group Chat"
+msgstr "Влизане в стая"
+
+#: gajim/gtk/start_chat.py:605 gajim/gtk/add_contact.py:40
 #, fuzzy
-msgid "New Contact"
-msgstr "Добавяне на нов контакт"
+msgid "Add Contact"
+msgstr "_Добавяне на контакт…"
 
-#: gajim/gtk/start_chat.py:588
+#: gajim/gtk/start_chat.py:746
 #, fuzzy, python-format
-msgid "%s Group chats found"
+msgid "%s group chats found"
 msgstr "%s не е намерен"
 
-#: gajim/gtk/discovery.py:70
+#: gajim/gtk/discovery.py:69
 msgid "This service has not yet responded with detailed information"
 msgstr "Тази услуга все още не е отговорила с подробна информация"
 
-#: gajim/gtk/discovery.py:71
+#: gajim/gtk/discovery.py:70
 #, fuzzy
 msgid ""
 "This service could not respond with detailed information.\n"
@@ -8893,32 +9232,33 @@ msgstr ""
 "Тази услуга не можа да отговори с подробна информация.\n"
 "Най-вероятно е извън употреба или повредена"
 
-#: gajim/gtk/discovery.py:128
+#: gajim/gtk/discovery.py:126
 msgid "Others"
 msgstr "Други"
 
-#: gajim/gtk/discovery.py:131
-msgid "Conference"
-msgstr "Стаи за разговор"
+#: gajim/gtk/discovery.py:129
+#, fuzzy
+msgid "Group Chat"
+msgstr "Стаи"
 
-#: gajim/gtk/discovery.py:519
+#: gajim/gtk/discovery.py:518
 msgid "Without a connection, you can not browse available services"
 msgstr "Трябва да сте свързани, за да разглеждате наличните услуги"
 
-#: gajim/gtk/discovery.py:606
+#: gajim/gtk/discovery.py:605
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Откриване на налични услуги за акаунт „%s“"
 
-#: gajim/gtk/discovery.py:608
+#: gajim/gtk/discovery.py:607
 msgid "Service Discovery"
 msgstr "Откриване на услуги"
 
-#: gajim/gtk/discovery.py:691
+#: gajim/gtk/discovery.py:690
 msgid "The service could not be found"
 msgstr "Услугата не може да бъде намерена"
 
-#: gajim/gtk/discovery.py:692
+#: gajim/gtk/discovery.py:691
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -8926,100 +9266,80 @@ msgstr ""
 "Няма услуга на въведения адрес или не отговаря. Проверете адреса и опитайте "
 "отново."
 
-#: gajim/gtk/discovery.py:699 gajim/gtk/discovery.py:1042
+#: gajim/gtk/discovery.py:698 gajim/gtk/discovery.py:1041
 msgid "The service is not browsable"
 msgstr "Услугата не е достъпна"
 
-#: gajim/gtk/discovery.py:700
+#: gajim/gtk/discovery.py:699
 msgid "This type of service does not contain any items to browse."
 msgstr "Този вид услуга не съдържа обекти за показване."
 
-#: gajim/gtk/discovery.py:738 gajim/gtk/discovery.py:747
+#: gajim/gtk/discovery.py:737 gajim/gtk/discovery.py:746
 msgid "Invalid Server Name"
 msgstr "Невалидно име на сървър"
 
-#: gajim/gtk/discovery.py:806
+#: gajim/gtk/discovery.py:805
 #, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Търсене в %(address)s от акаунт „%(account)s“"
 
-#: gajim/gtk/discovery.py:851
+#: gajim/gtk/discovery.py:850
 #, fuzzy
 msgid "Browse"
 msgstr "_Търсене"
 
-#: gajim/gtk/discovery.py:1043
+#: gajim/gtk/discovery.py:1042
 msgid "This service does not contain any items to browse."
 msgstr "Тази услуга не съдържа обекти за показване."
 
-#: gajim/gtk/discovery.py:1255
+#: gajim/gtk/discovery.py:1254
 #, fuzzy
 msgid "_Command"
 msgstr "Команди: %s"
 
-#: gajim/gtk/discovery.py:1264 gajim/gtk/discovery.py:1422
+#: gajim/gtk/discovery.py:1263 gajim/gtk/discovery.py:1420
 msgid "Re_gister"
 msgstr "_Регистриране"
 
-#: gajim/gtk/discovery.py:1277
+#: gajim/gtk/discovery.py:1276
 msgid "_Search"
 msgstr "_Търсене"
 
-#: gajim/gtk/discovery.py:1420
+#: gajim/gtk/discovery.py:1418
 msgid "_Edit"
 msgstr "_Редактиране"
 
-#: gajim/gtk/discovery.py:1458
+#: gajim/gtk/discovery.py:1456
 #, fuzzy, python-format
 msgid "Scanning %(current)d / %(total)d ..."
 msgstr "Сканиране на %(current)d / %(total)d…"
 
-#: gajim/gtk/discovery.py:1674
+#: gajim/gtk/discovery.py:1655
+msgid "Users"
+msgstr "Потребители"
+
+#: gajim/gtk/discovery.py:1671
 msgid "Id"
 msgstr "Идентификатор"
 
-#: gajim/gtk/discovery.py:1713
-msgid "_Join"
-msgstr "_Влизане"
-
-#: gajim/gtk/discovery.py:1736
-msgid "Bookmark already set"
-msgstr "Отметката вече е установена"
-
-#: gajim/gtk/discovery.py:1737
-#, fuzzy, python-format
-msgid "Group Chat '%s' is already in your bookmarks."
-msgstr "Стаята „%s“ вече присъства в отметките."
-
-#: gajim/gtk/discovery.py:1748
-msgid "Bookmark has been added successfully"
-msgstr "Отметката беше добавена успешно"
-
-#: gajim/gtk/discovery.py:1749
-#, fuzzy
-msgid ""
-"You can manage your bookmarks by clicking the Bookmarks menu item in your "
-"contact list."
-msgstr "Може да организирате отметките чрез менюто „Действия“."
-
-#: gajim/gtk/discovery.py:1950
+#: gajim/gtk/discovery.py:1900
 msgid "Subscribed"
 msgstr "Записан"
 
-#: gajim/gtk/discovery.py:1959
+#: gajim/gtk/discovery.py:1909
 msgid "Node"
 msgstr "Възел"
 
-#: gajim/gtk/discovery.py:2028
+#: gajim/gtk/discovery.py:1978
 #, fuzzy
 msgid "_New post"
 msgstr "Ново съобщение"
 
-#: gajim/gtk/discovery.py:2037
+#: gajim/gtk/discovery.py:1987
 msgid "_Subscribe"
 msgstr "_Записване"
 
-#: gajim/gtk/discovery.py:2045
+#: gajim/gtk/discovery.py:1995
 msgid "_Unsubscribe"
 msgstr "_Отписване"
 
@@ -9066,7 +9386,7 @@ msgstr "От %s"
 msgid "Characters typed: %s"
 msgstr "Псевдонимът не е позволен: %s"
 
-#: gajim/gtk/single_message.py:274 gajim/gtk/xml_console.py:169
+#: gajim/gtk/single_message.py:274 gajim/gtk/xml_console.py:166
 msgid "Connection not available"
 msgstr "В момента няма връзка"
 
@@ -9075,6 +9395,12 @@ msgstr "В момента няма връзка"
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Уверете се, че сте свързани към „%s“."
 
+#: gajim/gtk/single_message.py:306
+#, 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:330
 #, python-format
 msgid "RE: %s"
@@ -9085,28 +9411,28 @@ msgstr "Относно: %s"
 msgid "%s wrote:\n"
 msgstr "%s написа:\n"
 
-#: gajim/gtk/pep_config.py:44
+#: gajim/gtk/pep_config.py:45
 #, fuzzy, python-format
 msgid "PEP Service Configuration (%s)"
 msgstr "Настройки на услугата PEP"
 
-#: gajim/gtk/pep_config.py:77
+#: gajim/gtk/pep_config.py:78
 #, fuzzy
 msgid "Service"
 msgstr "Сървър"
 
-#: gajim/gtk/pep_config.py:114
+#: gajim/gtk/pep_config.py:115
 msgid "PEP node was not removed"
 msgstr "Възелът на PEP не беше премахнат"
 
-#: gajim/gtk/pep_config.py:115
+#: gajim/gtk/pep_config.py:116
 #, fuzzy, python-format
 msgid ""
 "PEP node %(node)s was not removed:\n"
 "%(message)s"
 msgstr "Възелът на PEP %(node)s не беше премахнат: %(message)s"
 
-#: gajim/gtk/pep_config.py:146
+#: gajim/gtk/pep_config.py:147
 #, fuzzy, python-format
 msgid "Configure %s"
 msgstr "_Настройване"
@@ -9122,17 +9448,22 @@ msgstr "_Регистриране"
 msgid "Registration successful"
 msgstr "Регистриране в %s"
 
-#: gajim/gtk/dialogs.py:54 gajim/gtk/dataform.py:659 gajim/gtk/adhoc.py:85
+#: gajim/gtk/service_registration.py:215
+#, fuzzy
+msgid "Registration failed"
+msgstr "Неуспех при свързването"
+
+#: gajim/gtk/dialogs.py:53 gajim/gtk/dataform.py:668 gajim/gtk/adhoc.py:86
 #, fuzzy
 msgid "Cancel"
 msgstr "_Отказ"
 
-#: gajim/gtk/dialogs.py:129
+#: gajim/gtk/dialogs.py:128
 #, fuzzy, python-format
 msgid "Dictionary for language \"%s\" not available"
 msgstr "Няма наличен речник за %s език"
 
-#: gajim/gtk/dialogs.py:130
+#: gajim/gtk/dialogs.py:129
 #, fuzzy, python-format
 msgid ""
 "You have to install the dictionary \"%s\" to use spellchecking, or choose "
@@ -9145,11 +9476,11 @@ msgstr ""
 "\n"
 "Функционалността за осветяване на сгрешени думи ще е изключена"
 
-#: gajim/gtk/dialogs.py:410 gajim/gtk/dialogs.py:425
+#: gajim/gtk/dialogs.py:322 gajim/gtk/dialogs.py:337
 msgid "Insecure connection"
 msgstr "Несигурна връзка"
 
-#: gajim/gtk/dialogs.py:411
+#: gajim/gtk/dialogs.py:323
 #, fuzzy, python-format
 msgid ""
 "You are about to connect to the account %(account)s (%(server)s) insecurely. "
@@ -9161,120 +9492,115 @@ msgstr ""
 "инсталирате PyOpenSSL, за да предотвратите това. Сигурни ли сте, че искате "
 "да го направите?"
 
-#: gajim/gtk/dialogs.py:416
+#: gajim/gtk/dialogs.py:328
 msgid "Yes, I really want to connect insecurely"
 msgstr "Да, наистина искам да се свържа по несигурен начин"
 
-#: gajim/gtk/dialogs.py:417
+#: gajim/gtk/dialogs.py:329
 msgid "Gajim will NOT connect unless you check this box"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:675
-#, fuzzy
-msgid "The nickname contains invalid characters."
-msgstr "Псевдонимът съдържа непозволени знаци."
-
-#: gajim/gtk/dialogs.py:734
+#: gajim/gtk/dialogs.py:561
 #, fuzzy, python-format
 msgid "Destroy %s"
 msgstr "Унищожаване на %s"
 
-#: gajim/gtk/dialogs.py:775
+#: gajim/gtk/dialogs.py:602
 #, fuzzy
 msgid "Certificate"
 msgstr "Само-подписан сертификат"
 
-#: gajim/gtk/dialogs.py:786
+#: gajim/gtk/dialogs.py:613
 #, fuzzy, python-format
 msgid ""
 "Certificate for account\n"
 "%s"
 msgstr "за акаунт „%s“"
 
-#: gajim/gtk/dialogs.py:824
+#: gajim/gtk/dialogs.py:651
 msgid "Issued to\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:825 gajim/gtk/dialogs.py:830
+#: gajim/gtk/dialogs.py:652 gajim/gtk/dialogs.py:657
 msgid "Common Name (CN): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:826 gajim/gtk/dialogs.py:831
+#: gajim/gtk/dialogs.py:653 gajim/gtk/dialogs.py:658
 msgid "Organization (O): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:827 gajim/gtk/dialogs.py:832
+#: gajim/gtk/dialogs.py:654 gajim/gtk/dialogs.py:659
 msgid "Organizational Unit (OU): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:828
+#: gajim/gtk/dialogs.py:655
 #, fuzzy
 msgid "Serial Number: "
 msgstr "Номер на GG:"
 
-#: gajim/gtk/dialogs.py:829
+#: gajim/gtk/dialogs.py:656
 msgid "Issued by\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:833
+#: gajim/gtk/dialogs.py:660
 msgid "Validity\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:834
+#: gajim/gtk/dialogs.py:661
 msgid "Issued on: "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:835
+#: gajim/gtk/dialogs.py:662
 msgid "Expires on: "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:836
+#: gajim/gtk/dialogs.py:663
 msgid "SHA-1:"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:838
+#: gajim/gtk/dialogs.py:665
 msgid "SHA-256:"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:852
+#: gajim/gtk/dialogs.py:679
 #, fuzzy
 msgid "View certificate…"
 msgstr "Само-подписан сертификат"
 
-#: gajim/gtk/dialogs.py:864 gajim/gtk/accounts.py:893
+#: gajim/gtk/dialogs.py:691 gajim/gtk/accounts.py:896
 msgid "Change Password"
 msgstr "Промяна на парола"
 
-#: gajim/gtk/dialogs.py:878
+#: gajim/gtk/dialogs.py:705
 msgid "_OK"
 msgstr "_Да"
 
-#: gajim/gtk/dialogs.py:891
+#: gajim/gtk/dialogs.py:718
 #, fuzzy
 msgid "You must enter a password"
 msgstr "Трябва да въведете парола."
 
-#: gajim/gtk/dialogs.py:895
+#: gajim/gtk/dialogs.py:722
 msgid "Passwords do not match"
 msgstr "Паролите не съвпадат"
 
-#: gajim/gtk/dialogs.py:923
+#: gajim/gtk/dialogs.py:750
 #, fuzzy
 msgid "Group Chat Invitation "
 msgstr "Покана за разговор в стая"
 
-#: gajim/gtk/dialogs.py:948
+#: gajim/gtk/dialogs.py:775
 #, fuzzy, python-format
 msgid "<b>%s</b> has invited you to join a discussion"
 msgstr "$Contact ви покани да се присъедините към дискусия"
 
-#: gajim/gtk/dialogs.py:951
+#: gajim/gtk/dialogs.py:778
 #, 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:959
+#: gajim/gtk/dialogs.py:786
 #, python-format
 msgid "Comment: %s"
 msgstr "Коментар: %s"
@@ -9289,11 +9615,6 @@ msgstr "Номер на GG:"
 msgid "ICQ Number"
 msgstr "Номер на ICQ:"
 
-#: gajim/gtk/add_contact.py:40
-#, fuzzy
-msgid "Add Contact"
-msgstr "_Добавяне на контакт…"
-
 #: gajim/gtk/add_contact.py:259
 #, fuzzy, python-format
 msgid "%s Missing"
@@ -9314,7 +9635,8 @@ msgid "The user ID must not contain a resource."
 msgstr "Потребителският идентификатор не трябва да съдържа ресурс."
 
 #: gajim/gtk/add_contact.py:299
-msgid "You cannot add yourself to your roster."
+#, fuzzy
+msgid "You cannot add yourself to your contact list."
 msgstr "Не може да добавите себе си към списъка."
 
 #: gajim/gtk/add_contact.py:304
@@ -9327,11 +9649,13 @@ msgid "Your account must be online to add new contacts."
 msgstr ""
 
 #: gajim/gtk/add_contact.py:321
-msgid "Contact already in roster"
+#, fuzzy
+msgid "Contact Already in Contact List"
 msgstr "Контактът вече е в списъка"
 
 #: gajim/gtk/add_contact.py:322
-msgid "This contact is already listed in your roster."
+#, fuzzy
+msgid "This contact is already in your contact list."
 msgstr "Контактът вече съществува в списъка."
 
 #: gajim/gtk/add_contact.py:379 gajim/gtk/add_contact.py:417
@@ -9372,14 +9696,14 @@ msgstr "Промяна на състоянието"
 
 #: gajim/gtk/themes.py:52
 #, fuzzy
-msgid "MUC Tab New Directed Message"
+msgid "Group Chat Tab New Directed Message"
 msgstr ""
 "Съобщения\n"
 "за стая"
 
 #: gajim/gtk/themes.py:56
 #, fuzzy
-msgid "MUC Tab New Message"
+msgid "Group Chat Tab New Message"
 msgstr "Ново съобщение"
 
 #: gajim/gtk/themes.py:60
@@ -9597,13 +9921,13 @@ msgstr "Всички файлове"
 msgid "Clear File"
 msgstr "Чистя"
 
-#: gajim/gtk/settings.py:570
+#: gajim/gtk/settings.py:570 gajim/gtk/proxies.py:32
 #, fuzzy
 msgid "Manage Proxies"
 msgstr "Настройки на сървъра-посредник"
 
-#: gajim/gtk/settings.py:591 gajim/gtk/preferences.py:971
-#: gajim/gtk/preferences.py:984 gajim/gtk/preferences.py:988
+#: gajim/gtk/settings.py:591 gajim/gtk/preferences.py:968
+#: gajim/gtk/preferences.py:982 gajim/gtk/preferences.py:986
 #, fuzzy
 msgid "No Proxy"
 msgstr "Сървър-посредник:"
@@ -9683,14 +10007,15 @@ msgid ""
 "        "
 msgstr ""
 
-#: gajim/gtk/about.py:47 data/org.gajim.Gajim.appdata.xml.in:10
+#: gajim/gtk/about.py:47 data/org.gajim.Gajim.desktop.in:6
+#: data/org.gajim.Gajim.appdata.xml.in:10
 #, fuzzy
-msgid "A GTK+ XMPP client"
+msgid "A GTK XMPP client"
 msgstr "Джабър клиент за GTK+"
 
 #: gajim/gtk/about.py:48
 #, fuzzy, python-format
-msgid "GTK+ Version: %s"
+msgid "GTK Version: %s"
 msgstr "Версия на GTK+:"
 
 #: gajim/gtk/about.py:49
@@ -9875,6 +10200,25 @@ msgstr "Временно прекъснат"
 msgid "?transfer status:Not started"
 msgstr "Временно прекъснат"
 
+#: gajim/gtk/groupchat_creation.py:97 gajim/gtk/groupchat_creation.py:99
+msgid " (optional)..."
+msgstr ""
+
+#: gajim/gtk/groupchat_creation.py:134
+#, fuzzy
+msgid "Invalid Address"
+msgstr "Невалиден файл"
+
+#: gajim/gtk/groupchat_creation.py:182
+#, fuzzy
+msgid "Not Connected"
+msgstr "Свързан"
+
+#: gajim/gtk/groupchat_creation.py:183
+#, fuzzy
+msgid "You have to be connected to create a group chat."
+msgstr "Не сте влезли в стая."
+
 #: gajim/gtk/sounds.py:39
 msgid "Wav Sounds"
 msgstr "Формат WAV"
@@ -9916,50 +10260,45 @@ msgstr "Осветено съобщение в стая"
 msgid "Group Chat Message Received"
 msgstr "Получено съобщение в стая"
 
-#: gajim/gtk/dataform.py:226 gajim/gtk/dataform.py:262
+#: gajim/gtk/dataform.py:232 gajim/gtk/dataform.py:268
 #, fuzzy
 msgid "Required"
 msgstr "Необходима е парола"
 
-#: gajim/gtk/dataform.py:286
+#: gajim/gtk/dataform.py:293
 msgid "Yes"
 msgstr ""
 
-#: gajim/gtk/dataform.py:286
+#: gajim/gtk/dataform.py:293
 #, fuzzy
 msgid "No"
 msgstr "Няма"
 
-#: gajim/gtk/dataform.py:661
+#: gajim/gtk/dataform.py:670
 msgid "Submit"
 msgstr ""
 
-#: gajim/gtk/statusicon.py:213
+#: gajim/gtk/statusicon.py:206
 #, fuzzy
 msgid "_Change Status Message…"
 msgstr "Пром_яна на съобщението за състояние"
 
-#: gajim/gtk/statusicon.py:247 gajim/gtk/statusicon.py:292
-#: gajim/gtk/statusicon.py:299
+#: gajim/gtk/statusicon.py:258
 #, python-format
 msgid "using account %s"
 msgstr "от акаунт „%s“"
 
-#: gajim/gtk/statusicon.py:309
+#: gajim/gtk/statusicon.py:269
 #, fuzzy
-msgid "_Manage Bookmarks…"
-msgstr "Управление на отметките"
+msgid "Hide _Contact List"
+msgstr "Покана на _контакти"
 
-#: gajim/gtk/statusicon.py:325
+#: gajim/gtk/statusicon.py:273
 #, fuzzy
-msgid "Hide _Roster"
-msgstr "в с_писъка"
-
-#: gajim/gtk/statusicon.py:329
-msgid "Show _Roster"
-msgstr "П_оказване на списъка"
+msgid "Show _Contact List"
+msgstr "Показване на изкл_ючените контакти"
 
-#: gajim/gtk/statusicon.py:337
+#: gajim/gtk/statusicon.py:281
 msgid "Hide this menu"
 msgstr "Скриване на това меню"
 
@@ -10007,36 +10346,6 @@ msgid ""
 msgstr ""
 "Възникна грешка при публикуване на личните данни, опитайте отново по-късно."
 
-#: gajim/gtk/join_groupchat.py:202
-#, fuzzy
-msgid "Invalid Room"
-msgstr "Невалиден формат"
-
-#: gajim/gtk/join_groupchat.py:203
-msgid "Please choose a room"
-msgstr ""
-
-#: gajim/gtk/join_groupchat.py:222 gajim/gtk/join_groupchat.py:229
-msgid "Invalid Nickname"
-msgstr "Невалиден псевдоним"
-
-#: gajim/gtk/join_groupchat.py:223
-#, fuzzy
-msgid "Please choose a nickname"
-msgstr "Създайте нова тема с желаното име."
-
-#: gajim/gtk/join_groupchat.py:282 gajim/gtk/join_groupchat.py:288
-#: gajim/gtk/join_groupchat.py:293
-#, fuzzy
-msgid "Wrong server"
-msgstr "Грешен адрес"
-
-#: gajim/gtk/join_groupchat.py:283 gajim/gtk/join_groupchat.py:289
-#: gajim/gtk/join_groupchat.py:294
-#, fuzzy, python-format
-msgid "%s is not a groupchat server"
-msgstr "Това не е стая"
-
 #: gajim/gtk/mam_preferences.py:38
 #, python-format
 msgid "Archiving Preferences for %s"
@@ -10067,45 +10376,53 @@ msgstr "Грешка в получените данни"
 msgid "Archiving Preferences Error"
 msgstr "_Настройки"
 
-#: gajim/gtk/advanced_config.py:81
+#: gajim/gtk/advanced_config.py:95
 msgid "Activated"
 msgstr "Активирана"
 
-#: gajim/gtk/advanced_config.py:81
+#: gajim/gtk/advanced_config.py:95
 msgid "Deactivated"
 msgstr "Изключена"
 
-#: gajim/gtk/advanced_config.py:83
-msgid "Boolean"
-msgstr "Булев израз"
+#: gajim/gtk/advanced_config.py:97
+msgid "?config type:Boolean"
+msgstr ""
+
+#: gajim/gtk/advanced_config.py:98
+msgid "?config type:Integer"
+msgstr ""
 
-#: gajim/gtk/advanced_config.py:84
-msgid "Integer"
-msgstr "Число"
+#: gajim/gtk/advanced_config.py:99
+msgid "?config type:Text"
+msgstr ""
 
-#: gajim/gtk/advanced_config.py:85
-msgid "Text"
-msgstr "Текст"
+#: gajim/gtk/advanced_config.py:100
+msgid "?config type:Color"
+msgstr ""
 
-#: gajim/gtk/advanced_config.py:97
-msgid "Preference Name"
+#: gajim/gtk/advanced_config.py:112
+#, fuzzy
+msgid "?config:Preference Name"
 msgstr "Име на опцията"
 
-#: gajim/gtk/advanced_config.py:104
-msgid "Value"
-msgstr "Стойност"
+#: gajim/gtk/advanced_config.py:123
+#, fuzzy
+msgid "?config:Value"
+msgstr "_Настройване"
 
-#: gajim/gtk/advanced_config.py:113
-msgid "Type"
-msgstr "Тип"
+#: gajim/gtk/advanced_config.py:132
+msgid "?config:Type"
+msgstr ""
 
-#: gajim/gtk/advanced_config.py:168
-msgid "(None)"
-msgstr "(Няма)"
+#: gajim/gtk/advanced_config.py:187
+#, fuzzy
+msgid "?config description:None"
+msgstr "Няма"
 
-#: gajim/gtk/advanced_config.py:299
-msgid "Hidden"
-msgstr "Скрита"
+#: gajim/gtk/advanced_config.py:322
+#, fuzzy
+msgid "?password:Hidden"
+msgstr "Парола:"
 
 #: gajim/gtk/server_info.py:66
 #, fuzzy
@@ -10117,8 +10434,8 @@ msgstr "_Копиране на адреса на връзката"
 msgid "%(days)s days, %(hours)s hours"
 msgstr ""
 
-#: gajim/gtk/server_info.py:218 gajim/gtk/accounts.py:749
-#: gajim/gtk/accounts.py:853
+#: gajim/gtk/server_info.py:218 gajim/gtk/accounts.py:752
+#: gajim/gtk/accounts.py:856
 #, fuzzy
 msgid "Hostname"
 msgstr "_Хост:"
@@ -10309,11 +10626,6 @@ msgstr "Невалидно име на филтър"
 msgid "You must enter a name to create a privacy list."
 msgstr "Трябва да въведете име, за да се създаде филтър за уединение."
 
-#: gajim/gtk/groupchat_config.py:41
-#, fuzzy
-msgid "Group Chat Configuration"
-msgstr "Покана за разговор в стая"
-
 #: gajim/gtk/groupchat_config.py:134
 #, fuzzy
 msgid "A Group Chat needs at least one Owner"
@@ -10324,69 +10636,69 @@ msgid "You are not allowed to modify the affiliation of Admins and Owners"
 msgstr ""
 
 #: gajim/gtk/groupchat_config.py:399
-msgid "An entry with this Jabber-ID already exists"
+msgid "An entry with this XMPP Address already exists"
 msgstr ""
 
-#: gajim/gtk/adhoc.py:91
+#: gajim/gtk/adhoc.py:92
 #, fuzzy
 msgid "Finish"
 msgstr "_Приключване"
 
-#: gajim/gtk/adhoc.py:97 gajim/gtk/adhoc.py:283
+#: gajim/gtk/adhoc.py:98 gajim/gtk/adhoc.py:284
 #, fuzzy
 msgid "Commands"
 msgstr "Команди: %s"
 
-#: gajim/gtk/adhoc.py:103
+#: gajim/gtk/adhoc.py:104
 msgid "Next"
 msgstr ""
 
-#: gajim/gtk/adhoc.py:109
+#: gajim/gtk/adhoc.py:110
 #, fuzzy
 msgid "Previous"
 msgstr "Завистлив"
 
-#: gajim/gtk/adhoc.py:115
+#: gajim/gtk/adhoc.py:116
 #, fuzzy
 msgid "Execute"
 msgstr "_Изпълнение на команда"
 
-#: gajim/gtk/adhoc.py:195
+#: gajim/gtk/adhoc.py:196
 #, fuzzy
 msgid "No commands available"
 msgstr "Няма наличен акаунт"
 
-#: gajim/gtk/adhoc.py:244
+#: gajim/gtk/adhoc.py:245
 #, fuzzy
 msgid "Request Command List"
 msgstr "_Изпълнение на команда"
 
-#: gajim/gtk/adhoc.py:259
+#: gajim/gtk/adhoc.py:260
 #, fuzzy
 msgid "Executing…"
 msgstr "_Изпълнение на команда"
 
-#: gajim/gtk/adhoc.py:266
+#: gajim/gtk/adhoc.py:267
 #, fuzzy
 msgid "Command List"
 msgstr "Команди: %s"
 
-#: gajim/gtk/adhoc.py:384
+#: gajim/gtk/adhoc.py:385
 #, fuzzy
 msgid "Finished"
 msgstr "_Приключване"
 
-#: gajim/gtk/adhoc.py:453
+#: gajim/gtk/adhoc.py:454
 #, fuzzy
 msgid "Execution failed"
 msgstr "Неуспех при свързването"
 
-#: gajim/gtk/blocking.py:37
+#: gajim/gtk/blocking.py:38
 #, fuzzy, python-format
 msgid "Blocking List for %s"
 msgstr "Филтър за уединение за %s"
 
-#: gajim/gtk/blocking.py:71
+#: gajim/gtk/blocking.py:72
 #, fuzzy
 msgid "Error!"
 msgstr "Грешка."
@@ -10436,8 +10748,7 @@ msgstr "Невалидно потребителско име"
 msgid "You must provide a username to configure this account."
 msgstr "Трябва да въведете име на потребител за новия акаунт."
 
-#: gajim/gtk/account_wizard.py:252 gajim/gtk/bookmarks.py:290
-#: gajim/gtk/bookmarks.py:303
+#: gajim/gtk/account_wizard.py:252
 msgid "Invalid server"
 msgstr "Невалиден сървър"
 
@@ -10453,7 +10764,7 @@ msgstr "Невалиден формат"
 msgid "Custom port must be a port number."
 msgstr "Портът по избор трябва все пак да е номер на порт."
 
-#: gajim/gtk/account_wizard.py:405
+#: gajim/gtk/account_wizard.py:406
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -10468,15 +10779,15 @@ msgstr ""
 "Грешка на SSL: %(error)s\n"
 "Все още ли искате да се свържете с този сървър?"
 
-#: gajim/gtk/account_wizard.py:446 gajim/gtk/account_wizard.py:480
+#: gajim/gtk/account_wizard.py:447 gajim/gtk/account_wizard.py:481
 msgid "An error occurred during account creation"
 msgstr "Възникна грешка при създаването на акаунта"
 
-#: gajim/gtk/account_wizard.py:545
+#: gajim/gtk/account_wizard.py:546
 msgid "Account name is in use"
 msgstr "Името на акаунта се използва"
 
-#: gajim/gtk/account_wizard.py:546
+#: gajim/gtk/account_wizard.py:547
 msgid "You already have an account using this name."
 msgstr "Вече има регистриран акаунт с това име."
 
@@ -10503,26 +10814,26 @@ msgstr "Файловият трансфер на %(filename)s от %(name)s пр
 msgid "%(minutes)s min %(seconds)s sec"
 msgstr ""
 
-#: gajim/gtk/xml_console.py:77
+#: gajim/gtk/xml_console.py:74
 #, fuzzy
 msgid "Filter"
 msgstr "Филтър:"
 
-#: gajim/gtk/xml_console.py:82
+#: gajim/gtk/xml_console.py:79
 #, fuzzy
 msgid "XML Input"
 msgstr "<b>Вход в XML формат</b>"
 
-#: gajim/gtk/xml_console.py:86
+#: gajim/gtk/xml_console.py:83
 msgid "Paste Last Input"
 msgstr ""
 
-#: gajim/gtk/xml_console.py:170
+#: gajim/gtk/xml_console.py:167
 #, fuzzy, python-format
 msgid "Please make sure you are connected with '%s'."
 msgstr "Уверете се, че сте свързани към „%s“."
 
-#: gajim/gtk/xml_console.py:182
+#: gajim/gtk/xml_console.py:177
 #, fuzzy
 msgid "Invalid Node"
 msgstr "Невалиден файл"
@@ -10555,39 +10866,54 @@ msgstr "Търсене"
 msgid "No results found"
 msgstr "Няма резултати"
 
-#: gajim/gtk/preferences.py:358 gajim/gtk/preferences.py:362
+#: gajim/gtk/preferences.py:357 gajim/gtk/preferences.py:361
 msgid "Default"
 msgstr "По подразбиране"
 
-#: gajim/gtk/preferences.py:801
+#: gajim/gtk/preferences.py:798
 msgid "status message title"
 msgstr "заглавие на съобщението за състояние"
 
-#: gajim/gtk/preferences.py:802
+#: gajim/gtk/preferences.py:799
 msgid "status message text"
 msgstr "текст на съобщението за състояние"
 
+#: gajim/gtk/accounts.py:137
+#, fuzzy
+msgid "Re-Login"
+msgstr "Свързване наново?"
+
 #: gajim/gtk/accounts.py:138
-msgid "Relogin now?"
+#, fuzzy
+msgid "Re-Login now?"
 msgstr "Свързване наново?"
 
 #: gajim/gtk/accounts.py:139
-msgid "If you want all the changes to apply instantly, you must relogin."
+#, fuzzy
+msgid "To apply all changes instantly, you have to re-login."
 msgstr ""
 "Ако искате всички промени да влязат в сила веднага, трябва да се свържете "
 "наново."
 
-#: gajim/gtk/accounts.py:191 gajim/gtk/accounts.py:975
+#: gajim/gtk/accounts.py:141
+msgid "_Later"
+msgstr ""
+
+#: gajim/gtk/accounts.py:143
+msgid "_Re-Login"
+msgstr ""
+
+#: gajim/gtk/accounts.py:194 gajim/gtk/accounts.py:978
 #, fuzzy
 msgid "Remove Account"
 msgstr "Премахване на акаунт „%s“"
 
-#: gajim/gtk/accounts.py:192
+#: gajim/gtk/accounts.py:195
 #, fuzzy, python-format
 msgid "You still have open chats in your account %s"
 msgstr "Имате активни разговори за акаунт „%s“"
 
-#: gajim/gtk/accounts.py:193
+#: gajim/gtk/accounts.py:196
 #, fuzzy
 msgid ""
 "All chat and group chat windows will be closed.\n"
@@ -10596,32 +10922,32 @@ msgstr ""
 "Всички прозорци за разговори и стаи ще бъдат затворени. Искате ли да "
 "продължите?"
 
-#: gajim/gtk/accounts.py:424
+#: gajim/gtk/accounts.py:427
 #, fuzzy
 msgid "Back"
 msgstr "Връщам се скоро"
 
-#: gajim/gtk/accounts.py:530
+#: gajim/gtk/accounts.py:533
 #, fuzzy
 msgid "Please check if Bonjour is installed."
 msgstr "Проверете дали Avahi или Bonjour е инсталиран."
 
-#: gajim/gtk/accounts.py:532
+#: gajim/gtk/accounts.py:535
 #, fuzzy
 msgid "Please check if Avahi is installed."
 msgstr "Проверете дали Avahi или Bonjour е инсталиран."
 
-#: gajim/gtk/accounts.py:569
+#: gajim/gtk/accounts.py:572
 #, fuzzy
 msgid "Disable Account"
 msgstr "Невалидно име на акаунт"
 
-#: gajim/gtk/accounts.py:570
+#: gajim/gtk/accounts.py:573
 #, fuzzy, python-format
 msgid "Account %s is still connected"
 msgstr "Акаунт „%s“ е свързан към сървъра"
 
-#: gajim/gtk/accounts.py:571
+#: gajim/gtk/accounts.py:574
 #, fuzzy
 msgid ""
 "All chat and group chat windows will be closed. Do you want to continue?"
@@ -10629,85 +10955,85 @@ msgstr ""
 "Всички прозорци за разговори и стаи ще бъдат затворени. Искате ли да "
 "продължите?"
 
-#: gajim/gtk/accounts.py:576
+#: gajim/gtk/accounts.py:579
 #, fuzzy
 msgid "_Disable Account"
 msgstr "Невалидно име на акаунт"
 
-#: gajim/gtk/accounts.py:595
+#: gajim/gtk/accounts.py:598
 #, fuzzy
 msgid "Add Account"
 msgstr "_Добавяне на контакт…"
 
-#: gajim/gtk/accounts.py:663
+#: gajim/gtk/accounts.py:666
 msgid "Label"
 msgstr ""
 
-#: gajim/gtk/accounts.py:667
+#: gajim/gtk/accounts.py:670
 msgid "Login"
 msgstr ""
 
-#: gajim/gtk/accounts.py:670
+#: gajim/gtk/accounts.py:673
 #, fuzzy
 msgid "Import Contacts"
 msgstr "Покана на _контакти"
 
-#: gajim/gtk/accounts.py:674 gajim/gtk/accounts.py:870
+#: gajim/gtk/accounts.py:677 gajim/gtk/accounts.py:873
 #, fuzzy
 msgid "Client Certificate"
 msgstr "Само-подписан сертификат"
 
-#: gajim/gtk/accounts.py:677 gajim/gtk/accounts.py:774
+#: gajim/gtk/accounts.py:680 gajim/gtk/accounts.py:777
 #, fuzzy
 msgid "Connect on startup"
 msgstr "С_вързване при стартиране"
 
-#: gajim/gtk/accounts.py:681 gajim/gtk/accounts.py:779
+#: gajim/gtk/accounts.py:684 gajim/gtk/accounts.py:782
 #, fuzzy
 msgid "Save conversations for all contacts"
 msgstr "Запазване на история на _разговорите за всички контакти"
 
-#: gajim/gtk/accounts.py:683 gajim/gtk/accounts.py:781
+#: gajim/gtk/accounts.py:686 gajim/gtk/accounts.py:784
 msgid "Store conversations on the harddrive"
 msgstr ""
 
-#: gajim/gtk/accounts.py:685 gajim/gtk/accounts.py:783
+#: gajim/gtk/accounts.py:688 gajim/gtk/accounts.py:786
 #, fuzzy
 msgid "Global Status"
 msgstr "Всички състояния"
 
-#: gajim/gtk/accounts.py:687
+#: gajim/gtk/accounts.py:690
 #, fuzzy
 msgid "Synchronise the status of all accounts"
 msgstr "Промяна на състоянието на акаунта или акаунтите"
 
-#: gajim/gtk/accounts.py:689
+#: gajim/gtk/accounts.py:692
 msgid "Use file transfer proxies"
 msgstr "Използване на сървъри-посредници за файлови трансфери"
 
-#: gajim/gtk/accounts.py:705
+#: gajim/gtk/accounts.py:708
 #, fuzzy
 msgid "Idle Time"
 msgstr " от %s"
 
-#: gajim/gtk/accounts.py:707
+#: gajim/gtk/accounts.py:710
 msgid "Disclose the time of your last activity"
 msgstr ""
 
-#: gajim/gtk/accounts.py:709
+#: gajim/gtk/accounts.py:712
 msgid "Local System Time"
 msgstr ""
 
-#: gajim/gtk/accounts.py:711
+#: gajim/gtk/accounts.py:714
 msgid "Disclose the local system time of the device Gajim runs on"
 msgstr ""
 
-#: gajim/gtk/accounts.py:714
+#: gajim/gtk/accounts.py:717
 #, fuzzy
 msgid "Client / Operating System"
 msgstr "Само-подписан сертификат"
 
-#: gajim/gtk/accounts.py:716
+#: gajim/gtk/accounts.py:719
 #, fuzzy
 msgid ""
 "Disclose informations about the client and operating system you currently use"
@@ -10715,153 +11041,148 @@ msgstr ""
 "Ако тази опция е избрана, контактите ще могат да откриват операционната "
 "система, която използвате."
 
-#: gajim/gtk/accounts.py:719
+#: gajim/gtk/accounts.py:722
 #, fuzzy
 msgid "Ignore Unknown Contacts"
 msgstr "Покана на _контакти"
 
-#: gajim/gtk/accounts.py:721
+#: gajim/gtk/accounts.py:724
 #, fuzzy
 msgid "Ignore everything from contacts not in your Roster"
 msgstr "Прене_брегване на събития от контакти, които не са в списъка"
 
-#: gajim/gtk/accounts.py:737 gajim/gtk/accounts.py:776
+#: gajim/gtk/accounts.py:740 gajim/gtk/accounts.py:779
 #, fuzzy
 msgid "Use environment variable"
 msgstr "Използване на променливата на обкръжението „HTTP_PROXY“"
 
-#: gajim/gtk/accounts.py:739
-#, fuzzy
-msgid "Proxy"
-msgstr "Сървър-посредник:"
-
-#: gajim/gtk/accounts.py:742
+#: gajim/gtk/accounts.py:745
 #, fuzzy
 msgid "Warn on insecure connection"
 msgstr "Предупре_ждаване преди използване на несигурна връзка"
 
-#: gajim/gtk/accounts.py:746
+#: gajim/gtk/accounts.py:749
 msgid "Send keep-alive packets"
 msgstr "Изпращане на пакети за поддържане на връзката"
 
-#: gajim/gtk/accounts.py:750
+#: gajim/gtk/accounts.py:753
 msgid "Manually set the hostname for the server"
 msgstr ""
 
-#: gajim/gtk/accounts.py:756 gajim/gtk/accounts.py:826
-#: gajim/gtk/accounts.py:831
+#: gajim/gtk/accounts.py:759 gajim/gtk/accounts.py:829
+#: gajim/gtk/accounts.py:834
 #, fuzzy
 msgid "Priority"
 msgstr "Приори_тет:"
 
-#: gajim/gtk/accounts.py:785
+#: gajim/gtk/accounts.py:788
 #, fuzzy
 msgid "Synchronize the status of all accounts"
 msgstr "Промяна на състоянието на акаунта или акаунтите"
 
-#: gajim/gtk/accounts.py:795
+#: gajim/gtk/accounts.py:798
 #, fuzzy
 msgid "First Name"
 msgstr "Собствено име:"
 
-#: gajim/gtk/accounts.py:798
+#: gajim/gtk/accounts.py:801
 #, fuzzy
 msgid "Last Name"
 msgstr "Фамилия:"
 
-#: gajim/gtk/accounts.py:804
+#: gajim/gtk/accounts.py:807
 #, fuzzy
 msgid "Email"
 msgstr "Нова е-поща"
 
-#: gajim/gtk/accounts.py:822
+#: gajim/gtk/accounts.py:825
 #, fuzzy
 msgid "Adjust to status"
 msgstr "_Съгласуване спрямо състоянието"
 
-#: gajim/gtk/accounts.py:849
+#: gajim/gtk/accounts.py:852
 msgid "Enable"
 msgstr "Активиране"
 
-#: gajim/gtk/accounts.py:857
+#: gajim/gtk/accounts.py:860
 #, fuzzy
 msgid "Port"
 msgstr "По_рт:"
 
-#: gajim/gtk/accounts.py:862
+#: gajim/gtk/accounts.py:865
 #, fuzzy
 msgid "Connection Settings"
 msgstr "Свързване"
 
-#: gajim/gtk/accounts.py:872
+#: gajim/gtk/accounts.py:875
 msgid "PKCS12 Files"
 msgstr ""
 
-#: gajim/gtk/accounts.py:874
+#: gajim/gtk/accounts.py:877
 #, fuzzy
 msgid "Encrypted Certificate"
 msgstr "Само-подписан сертификат"
 
-#: gajim/gtk/accounts.py:878
+#: gajim/gtk/accounts.py:881
 #, fuzzy
 msgid "Certificate Settings"
 msgstr "Само-подписан сертификат"
 
-#: gajim/gtk/accounts.py:890
+#: gajim/gtk/accounts.py:893
 #, fuzzy
 msgid "Save Password"
 msgstr "Запазване на паролата"
 
-#: gajim/gtk/accounts.py:898
+#: gajim/gtk/accounts.py:901
 #, fuzzy
 msgid "Login Settings"
 msgstr "Неуспех при свързването"
 
-#: gajim/gtk/accounts.py:931
+#: gajim/gtk/accounts.py:934
 #, fuzzy, python-format
 msgid "Removing account %s"
 msgstr "Премахване на акаунт „%s“"
 
-#: gajim/gtk/accounts.py:946
+#: gajim/gtk/accounts.py:949
 #, fuzzy
 msgid "Account is disabled"
 msgstr "Емотиконите са изключени"
 
-#: gajim/gtk/accounts.py:947
+#: gajim/gtk/accounts.py:950
 #, fuzzy
 msgid "To unregister from a server, the account must be enabled."
 msgstr "Трябва да сте изключени, за да смените името на акаунта."
 
-#: gajim/gtk/accounts.py:962
+#: gajim/gtk/accounts.py:965
 #, fuzzy
 msgid "Password required"
 msgstr "Необходима е парола"
 
-#: gajim/gtk/accounts.py:976
+#: gajim/gtk/accounts.py:979
 #, fuzzy, python-format
 msgid "Account '%s' is still connected to the server"
 msgstr "Акаунт „%s“ е свързан към сървъра"
 
-#: gajim/gtk/accounts.py:978
+#: gajim/gtk/accounts.py:981
 msgid "If you remove it, the connection will be lost."
 msgstr "Ако го премахнете, връзката ще се разпадне."
 
-#: gajim/gtk/accounts.py:995
+#: gajim/gtk/accounts.py:998
 #, fuzzy, python-format
 msgid "Connection to server %s failed"
 msgstr "Неуспех при свързването със сървъра-посредник"
 
-#: gajim/gtk/accounts.py:996
+#: gajim/gtk/accounts.py:999
 #, fuzzy
 msgid "What would you like to do?"
 msgstr "Какво искате да направите?"
 
-#: gajim/gtk/accounts.py:997
+#: gajim/gtk/accounts.py:1000
 #, fuzzy
 msgid "Remove only from Gajim"
 msgstr "Премахване на акаунт _само от Gajim"
 
-#: gajim/gtk/accounts.py:998
+#: gajim/gtk/accounts.py:1001
 msgid "Don't remove anything. I'll try again later"
 msgstr ""
 
@@ -10885,6 +11206,10 @@ msgstr "Бих искал(а) да ви добавя към списъка си.
 msgid "Modify"
 msgstr "Унил"
 
+#: gajim/gtk/roster_item_exchange.py:80
+msgid "JID"
+msgstr "JID"
+
 #: gajim/gtk/roster_item_exchange.py:86
 #, fuzzy
 msgid "Groups"
@@ -10911,19 +11236,19 @@ msgid_plural "Removed %d contacts"
 msgstr[0] "Премахване на контакт от списъка"
 msgstr[1] "Премахване на контакт от списъка"
 
-#: gajim/gtk/util.py:581
+#: gajim/gtk/util.py:583
 msgid "Unknown Artist"
 msgstr "Неизвестен изпълнител"
 
-#: gajim/gtk/util.py:582
+#: gajim/gtk/util.py:584
 msgid "Unknown Title"
 msgstr "Неизвестно заглавие"
 
-#: gajim/gtk/util.py:583
+#: gajim/gtk/util.py:585
 msgid "Unknown Source"
 msgstr "Неизвестен източник"
 
-#: gajim/gtk/util.py:585
+#: gajim/gtk/util.py:587
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
@@ -10932,29 +11257,10 @@ msgstr ""
 "<b>\"%(title)s\"</b> на <i>%(artist)s</i>\n"
 "от <i>%(source)s</i>"
 
-#: gajim/gtk/bookmarks.py:121
-msgid "New Group Chat"
-msgstr "Нова стая"
-
-#: gajim/gtk/bookmarks.py:161
-msgid "This bookmark has invalid data"
-msgstr "Тази отметка съдържа невалидни данни"
-
-#: gajim/gtk/bookmarks.py:162
-msgid ""
-"Please be sure to fill out server and room fields or remove this bookmark."
-msgstr "Попълнете полетата за сървър и стая или изтрийте тази отметка."
-
-#: gajim/gtk/bookmarks.py:273 gajim/gtk/bookmarks.py:291
-#: gajim/gtk/bookmarks.py:304 gajim/gtk/bookmarks.py:335
-#, fuzzy
-msgid "Character not allowed"
-msgstr "Псевдонимът не е позволен: %s"
-
-#: gajim/gtk/bookmarks.py:334
-#, fuzzy
-msgid "Invalid room"
-msgstr "Невалиден формат"
+#: gajim/gtk/bookmarks.py:47
+#, fuzzy, python-format
+msgid "Bookmarks for %s"
+msgstr "_Добавяне на стаята към отметките"
 
 #: gajim/plugins/pluginmanager.py:736 gajim/plugins/pluginmanager.py:742
 msgid "Archive corrupted"
@@ -10966,51 +11272,54 @@ msgid "Archive empty"
 msgstr "Файлът не съдържа нищо"
 
 #: gajim/plugins/pluginmanager.py:750 gajim/plugins/pluginmanager.py:758
-#: gajim/plugins/gui.py:257
+#: gajim/plugins/gui.py:258
 #, fuzzy
 msgid "Archive is malformed"
 msgstr "Услугата изпрати лошо форматирани данни"
 
-#: gajim/plugins/pluginmanager.py:766 gajim/plugins/gui.py:281
-#: gajim/plugins/gui.py:289
+#: gajim/plugins/pluginmanager.py:766 gajim/plugins/gui.py:288
+#: gajim/plugins/gui.py:301
 #, fuzzy
 msgid "Plugin already exists"
 msgstr "Този файл вече съществува"
 
-#: gajim/plugins/gui.py:82
+#: gajim/plugins/gui.py:83
 msgid "Click to view Gajim's wiki page on how to install plugins in Flatpak."
 msgstr ""
 
-#: gajim/plugins/gui.py:89
+#: gajim/plugins/gui.py:90
 msgid "Plugin"
 msgstr ""
 
-#: gajim/plugins/gui.py:151
+#: gajim/plugins/gui.py:152
 #, fuzzy, python-format
 msgid "Warning: %s"
 msgstr "Отлъчване на %s"
 
-#: gajim/plugins/gui.py:206
+#: gajim/plugins/gui.py:207
 #, fuzzy
 msgid "Plugin failed"
 msgstr "Неуспех при свързването"
 
-#: gajim/plugins/gui.py:245
+#: gajim/plugins/gui.py:246
 msgid "Unable to properly remove the plugin"
 msgstr ""
 
-#: gajim/plugins/gui.py:281
-msgid "Overwrite?"
-msgstr ""
+#: gajim/plugins/gui.py:287
+#, fuzzy
+msgid "Overwrite Plugin?"
+msgstr "Презаписване на съобщението за състояние?"
+
+#: gajim/plugins/gui.py:289
+#, fuzzy
+msgid "Do you want to overwrite the currently installed version?"
+msgstr "Искате ли да приемете поканата?"
 
 #: data/org.gajim.Gajim.desktop.in:5
-msgid "Jabber IM Client"
+#, fuzzy
+msgid "XMPP IM Client"
 msgstr "Джабър клиент за бързи съобщения"
 
-#: data/org.gajim.Gajim.desktop.in:6
-msgid "A GTK+ Jabber client"
-msgstr "Джабър клиент за GTK+"
-
 #: data/org.gajim.Gajim.desktop.in:8
 msgid "chat;messaging;im;xmpp;bonjour;voip;"
 msgstr ""
@@ -11062,7 +11371,7 @@ msgid "Easily send pictures, videos or other files to friends and groups"
 msgstr ""
 
 #: data/org.gajim.Gajim.appdata.xml.in:27
-msgid "Chat securely with End-to-End encryption via OMEMO or PGP"
+msgid "Chat securely with End-to-End encryption via OMEMO or OpenPGP"
 msgstr ""
 
 #: data/org.gajim.Gajim.appdata.xml.in:28
@@ -11124,7 +11433,7 @@ msgstr ""
 
 #: data/org.gajim.Gajim.appdata.xml.in:52
 #, fuzzy
-msgid "Roster, list of contacts"
+msgid "Contact list, list of contacts"
 msgstr "Запазване на промените на _състоянията на контактите"
 
 #: data/org.gajim.Gajim.appdata.xml.in:56
@@ -11146,6 +11455,503 @@ msgstr "Скоро посетени:"
 msgid "Plugin manager"
 msgstr "Неуспех при свързването"
 
+#, fuzzy
+#~ msgid "Configure Services…"
+#~ msgstr "Настройване на услуги…"
+
+#, fuzzy
+#~ msgid "Group Chat Bookmarks"
+#~ msgstr "С_тая"
+
+#, fuzzy
+#~ msgid "Add Bookmark"
+#~ msgstr "_Добавяне на стаята към отметките"
+
+#, fuzzy
+#~ msgid "Remove Bookmark"
+#~ msgstr "_Добавяне на стаята към отметките"
+
+#, fuzzy
+#~ msgid "Bookmark Name"
+#~ msgstr "_Добавяне на стаята към отметките (Ctrl+B)"
+
+#, fuzzy
+#~ msgid "_Server"
+#~ msgstr "С_ървър:"
+
+#, fuzzy
+#~ msgid "_Password"
+#~ msgstr "_Парола:"
+
+#, fuzzy
+#~ msgid "Join chat when connected"
+#~ msgstr "Изключване на контакт"
+
+#~ msgid "New Group Chat"
+#~ msgstr "Нова стая"
+
+#~ msgid "This bookmark has invalid data"
+#~ msgstr "Тази отметка съдържа невалидни данни"
+
+#, fuzzy
+#~ msgid ""
+#~ "Please be sure to fill out server and group chat fields or remove this "
+#~ "bookmark."
+#~ msgstr "Попълнете полетата за сървър и стая или изтрийте тази отметка."
+
+#, fuzzy
+#~ msgid "Character not allowed"
+#~ msgstr "Псевдонимът не е позволен: %s"
+
+#, fuzzy
+#~ msgid "Invalid Group Chat"
+#~ msgstr "Невалиден Jabber ID на стая"
+
+#~ msgid "Unable to join group chat"
+#~ msgstr "Неуспех при влизането в стаята"
+
+#, fuzzy
+#~ msgid "You are banned from group chat <b>%s</b>."
+#~ msgstr "Вие сте отлъчени от стаята %s."
+
+#, fuzzy
+#~ msgid "Remote server <b>%s</b> does not exist."
+#~ msgstr "Стаята %s не съществува."
+
+#, fuzzy
+#~ msgid "Group chat <b>%s</b> does not exist."
+#~ msgstr "Стаята %s не съществува."
+
+#, fuzzy
+#~ msgid "Group chat creation is not permitted."
+#~ msgstr "Създаването на стаи е ограничено."
+
+#, fuzzy
+#~ msgid "You must use your registered nickname in <b>%s</b>."
+#~ msgstr "Трябва да се използва регистрирания ви псевдоним в стаята %s."
+
+#, fuzzy
+#~ msgid "You are not in the members list in group chat %s."
+#~ msgstr "Не сте в списъка с членове на стаята %s."
+
+#, fuzzy
+#~ msgid "XMPP Address is not a group chat"
+#~ msgstr "Това не е стая"
+
+#~ msgid "This is not a group chat"
+#~ msgstr "Това не е стая"
+
+#, fuzzy
+#~ msgid "Please choose a group chat"
+#~ msgstr "Създайте нова тема с желаното име."
+
+#~ msgid "Invalid Nickname"
+#~ msgstr "Невалиден псевдоним"
+
+#, fuzzy
+#~ msgid "Please choose a nickname"
+#~ msgstr "Създайте нова тема с желаното име."
+
+#, fuzzy
+#~ msgid "Wrong server"
+#~ msgstr "Грешен адрес"
+
+#, fuzzy
+#~ msgid "%s is not a group chat server"
+#~ msgstr "Това не е стая"
+
+#, fuzzy
+#~ msgid "A Password is required to join the group chat %s. Please type it."
+#~ msgstr "Необходима е парола за влизане в стаята „%s“. Въведете я."
+
+#~ msgid "Not in Roster"
+#~ msgstr "Не е в списъка"
+
+#~ msgid "I would like to add you to my roster"
+#~ msgstr ""
+#~ "Бих искал(а) да Ви добавя към списъка си. I would like to add you to my "
+#~ "roster."
+
+#, fuzzy
+#~ msgid "Add to Roster"
+#~ msgstr "Добавяне към _списъка…"
+
+#, fuzzy
+#~ msgid "Manage Room"
+#~ msgstr "_Управление на стаята"
+
+#, fuzzy
+#~ msgid "Configure Room"
+#~ msgstr "Настройки на _стаята…"
+
+#, fuzzy
+#~ msgid "Destroy Room"
+#~ msgstr "_Унищожаване на стаята"
+
+#, fuzzy
+#~ msgid "Change Nick"
+#~ msgstr "Смяна на псе_вдоним…"
+
+#, fuzzy
+#~ msgid "Disconnect"
+#~ msgstr "_Изключване"
+
+#, fuzzy
+#~ msgid "Copy JID"
+#~ msgstr "JID на стая"
+
+#, fuzzy
+#~ msgid "Add to Roster…"
+#~ msgstr "Добавяне към _списъка…"
+
+#, fuzzy
+#~ msgid "Copy JID/Email"
+#~ msgstr "Копиране на _JID/Е-поща"
+
+#, fuzzy
+#~ msgid "JID: <i>%s</i>"
+#~ msgstr "Jabber ID: <i>%s</i>"
+
+#~ msgid "Changing Subject"
+#~ msgstr "Промяна на темата"
+
+#~ msgid "Please specify the new subject:"
+#~ msgstr "Въведете новата тема:"
+
+#~ msgid "Room logging is now enabled"
+#~ msgstr "Воденето на дневник на стаята е включено"
+
+#~ msgid "Room logging is now disabled"
+#~ msgstr "Воденето на дневник на стаята е изключено"
+
+#, fuzzy
+#~ msgid "You (%s) joined the room"
+#~ msgstr "%s влезе в стаята"
+
+#~ msgid "Room logging is enabled"
+#~ msgstr "Воденето на дневник на стаята е включено"
+
+#, fuzzy
+#~ msgid "Unable to join groupchat"
+#~ msgstr "Неуспех при влизането в стаята"
+
+#~ msgid "Groupchat Invitation"
+#~ msgstr "Покана за разговор в стая"
+
+#, fuzzy
+#~ msgid "%(jid)s has been invited in this room"
+#~ msgstr "%(nick)s беше изритан от стаята (%(reason)s)"
+
+#, fuzzy
+#~ msgid "JID is not a Groupchat"
+#~ msgstr "Това не е стая"
+
+#~ msgid "Invalid JID"
+#~ msgstr "Невалиден JID"
+
+#~ msgid "A connection is not available"
+#~ msgstr "В момента няма връзка"
+
+#, fuzzy
+#~ msgid "JID already in list"
+#~ msgstr "В списъка вече има такъв Jabber ID"
+
+#, fuzzy
+#~ msgid "For the chosen encryption there is no encryption method available"
+#~ msgstr "В момента няма връзка"
+
+#~ msgid "Removes contact from roster"
+#~ msgstr "Премахване на контакт от списъка"
+
+#~ msgid "Not in roster"
+#~ msgstr "Не е в списъка"
+
+#, fuzzy
+#~ msgid "Contact signed in notification color."
+#~ msgstr "Показване на събитието в спис_ъка"
+
+#, fuzzy
+#~ msgid "Contact signout notification color"
+#~ msgstr "Показване на събитието в спис_ъка"
+
+#, fuzzy
+#~ msgid "File transfer request notification color."
+#~ msgstr "Запитване за файлов трансфер"
+
+#, fuzzy
+#~ msgid "File transfer error notification color."
+#~ msgstr "Файловият трансфер е прекъснат"
+
+#, fuzzy
+#~ msgid "File transfer complete or stopped notification color."
+#~ msgstr ""
+#~ "Уведомяване чрез изскачащ прозорец при завършване на файловия трансфер"
+
+#, fuzzy
+#~ msgid "Groupchat invitation notification color"
+#~ msgstr "Покана за разговор в стая"
+
+#~ msgid "Add * and [n] in roster title?"
+#~ msgstr "Добавяне на * и [n] към заглавието на списъка?"
+
+#~ msgid "Hides the banner in two persons chat window"
+#~ msgstr "Скрива лентата в прозорец за разговор с два контакта"
+
+#, fuzzy
+#~ msgid ""
+#~ "Show the confirm metacontacts creation dialog or not? Empty string means "
+#~ "never show the dialog."
+#~ msgstr ""
+#~ "Да се показва ли диалогов прозорец за потвърждение при създаване на мета-"
+#~ "контакти? Празен низ означава никога да не се показва диалогов прозорец."
+
+#~ msgid "Space separated list of ssl errors to ignore."
+#~ msgstr ""
+#~ "Списък (разделен с шпации) от грешки на SSL, които да се пренебрегват."
+
+#~ msgid "Answer to receipt requests"
+#~ msgstr "Отговор на заявки"
+
+#~ msgid "Sent receipt requests"
+#~ msgstr "Изпратени заявки"
+
+#, fuzzy
+#~ msgid "Language for which misspelled words will be checked"
+#~ msgstr "Език, за който желаете да се проверяват сгрешените думи."
+
+#~ msgid "I'm eating, so leave me a message."
+#~ msgstr "Хапвам, така че ми оставете съобщение."
+
+#, fuzzy
+#~ msgid "from room %s"
+#~ msgstr " от стая %s"
+
+#~ msgid "Leave Groupchats"
+#~ msgstr "Излизане от стаите"
+
+#, fuzzy
+#~ msgid "Auto Join"
+#~ msgstr "Автоматично влизане"
+
+#, fuzzy
+#~ msgid "Room"
+#~ msgstr "Стая:"
+
+#~ msgid "Jabber ID:"
+#~ msgstr "Jabber ID:"
+
+#~ msgid "Occupant Actions"
+#~ msgstr "_Действия на участника"
+
+#~ msgid "_Add to Roster"
+#~ msgstr "Добавяне към _списъка…"
+
+#~ msgid "_Manage Room"
+#~ msgstr "_Управление на стаята"
+
+#~ msgid "Configure _Room..."
+#~ msgstr "Настройки на _стаята…"
+
+#~ msgid "_Destroy Room"
+#~ msgstr "_Унищожаване на стаята"
+
+#, fuzzy
+#~ msgid "Jabber ID"
+#~ msgstr "Jabber ID:"
+
+#, fuzzy
+#~ msgid "icon"
+#~ msgstr "Икона в областта за уведомяване"
+
+#, fuzzy
+#~ msgid "account"
+#~ msgstr "Акаунт"
+
+#, fuzzy
+#~ msgid "Roster"
+#~ msgstr "П_оказване на списъка"
+
+#, fuzzy
+#~ msgid "Show only in roster"
+#~ msgstr "Показване на събитието в спис_ъка"
+
+#~ msgid "in _roster"
+#~ msgstr "в с_писъка"
+
+#, fuzzy
+#~ msgid "Roster Appearance"
+#~ msgstr "<b>Изглед на списъка</b>"
+
+#, fuzzy
+#~ msgid "Show chatstate in roster"
+#~ msgstr "Показване на _аватари на контактите в списъка"
+
+#~ msgid "_Add to Roster..."
+#~ msgstr "Добавяне към _списъка…"
+
+#~ msgid "_Jabber ID:"
+#~ msgstr "_Jabber ID:"
+
+#, fuzzy
+#~ msgid "_Jabber ID"
+#~ msgstr "_Jabber ID:"
+
+#~ msgid "JabberID"
+#~ msgstr "Jabber ID"
+
+#, fuzzy
+#~ msgid "Show Roster"
+#~ msgstr "П_оказване на списъка"
+
+#~ msgid "MUC server"
+#~ msgstr "Сървър за стаи"
+
+#~ msgid "Room Configuration"
+#~ msgstr "Настройки на стаята"
+
+#~ msgid "Join _Group Chat"
+#~ msgstr "_Влизане в стая"
+
+#, fuzzy
+#~ msgid "Audio sessions are not available"
+#~ msgstr "В момента няма връзка"
+
+#~ msgid "Conference"
+#~ msgstr "Стаи за разговор"
+
+#, fuzzy
+#~ msgid "_Manage Bookmarks…"
+#~ msgstr "Управление на отметките"
+
+#, fuzzy
+#~ msgid "Hide _Roster"
+#~ msgstr "в с_писъка"
+
+#~ msgid "Show _Roster"
+#~ msgstr "П_оказване на списъка"
+
+#, fuzzy
+#~ msgid "Invalid Room"
+#~ msgstr "Невалиден формат"
+
+#, fuzzy
+#~ msgid "Invalid room"
+#~ msgstr "Невалиден формат"
+
+#~ msgid "A GTK+ Jabber client"
+#~ msgstr "Джабър клиент за GTK+"
+
+#~ msgid "Changing Nickname"
+#~ msgstr "Промяна на псевдонима"
+
+#~ msgid "Please specify the new nickname you want to use:"
+#~ msgstr "Въведете новия псевдоним, който искате да използвате:"
+
+#~ msgid "Bookmark already set"
+#~ msgstr "Отметката вече е установена"
+
+#, fuzzy
+#~ msgid "Group Chat '%s' is already in your bookmarks."
+#~ msgstr "Стаята „%s“ вече присъства в отметките."
+
+#~ msgid "Bookmark has been added successfully"
+#~ msgstr "Отметката беше добавена успешно"
+
+#, fuzzy
+#~ msgid ""
+#~ "You can manage your bookmarks by clicking the Bookmarks menu item in your "
+#~ "contact list."
+#~ msgstr "Може да организирате отметките чрез менюто „Действия“."
+
+#, fuzzy
+#~ msgid "The nickname contains invalid characters."
+#~ msgstr "Псевдонимът съдържа непозволени знаци."
+
+#, fuzzy
+#~ msgid "Bookmark Room"
+#~ msgstr "_Добавяне на стаята към отметките (Ctrl+B)"
+
+#~ msgid "_Join New Group Chat"
+#~ msgstr "_Влизане в нова стая"
+
+#, fuzzy
+#~ msgid "_Create Group Chat"
+#~ msgstr "Излизане от стаите"
+
+#~ msgid "Name:"
+#~ msgstr "Име:"
+
+#, fuzzy
+#~ msgid "Description:"
+#~ msgstr "Описание: "
+
+#, fuzzy
+#~ msgid "Address:"
+#~ msgstr "_Адрес:"
+
+#, fuzzy
+#~ msgid "You can not start a new conversation unless you are connected."
+#~ msgstr "Трябва да сте свързани, за да влезете в стая."
+
+#, fuzzy
+#~ msgid "Occupants"
+#~ msgstr "_Действия на участника"
+
+#, fuzzy
+#~ msgid "File transfer error"
+#~ msgstr "Грешка при файловия трансфер"
+
+#, fuzzy
+#~ msgid "No Accounts available"
+#~ msgstr "Няма наличен акаунт"
+
+#~ msgid "_Modify Account..."
+#~ msgstr "_Промяна на акаунт…"
+
+#~ msgid "Boolean"
+#~ msgstr "Булев израз"
+
+#~ msgid "Integer"
+#~ msgstr "Число"
+
+#~ msgid "Text"
+#~ msgstr "Текст"
+
+#~ msgid "Value"
+#~ msgstr "Стойност"
+
+#~ msgid "Type"
+#~ msgstr "Тип"
+
+#~ msgid "(None)"
+#~ msgstr "(Няма)"
+
+#~ msgid "Hidden"
+#~ msgstr "Скрита"
+
+#~ msgid "Manage Proxy Profiles"
+#~ msgstr "Настройки на сървъра-посредник"
+
+#, fuzzy
+#~ msgid "Properties"
+#~ msgstr "<b>Настройки</b>"
+
+#, fuzzy
+#~ msgid "Proxy _Host"
+#~ msgstr "Сървър-посредник:"
+
+#, fuzzy
+#~ msgid "Proxy _Port"
+#~ msgstr "По_рт:"
+
+#, fuzzy
+#~ msgid "New Groupchat"
+#~ msgstr "Нова стая"
+
+#, fuzzy
+#~ msgid "New Contact"
+#~ msgstr "Добавяне на нов контакт"
+
 #~ msgid "%s GiB"
 #~ msgstr "%s GiB"
 
@@ -11223,9 +12029,6 @@ msgstr "Неуспех при свързването"
 #~ msgid "_Pause"
 #~ msgstr "П_ауза"
 
-#~ msgid "Clean _up"
-#~ msgstr "Из_чистване"
-
 #~ msgid "Remove file transfer from the list."
 #~ msgstr "Премахване на файловия трансфер от списъка."
 
@@ -11672,9 +12475,6 @@ msgstr "Неуспех при свързването"
 #~ msgid "You are invited to a groupchat"
 #~ msgstr "Поканени сте в стая."
 
-#~ msgid "Do you want to accept the invitation?"
-#~ msgstr "Искате ли да приемете поканата?"
-
 #~ msgid "_Start Chat"
 #~ msgstr "_Започване на разговор"
 
@@ -11881,10 +12681,6 @@ msgstr "Неуспех при свързването"
 #~ msgid "Nick"
 #~ msgstr "Псевдоним"
 
-#, fuzzy
-#~ msgid "Banning…"
-#~ msgstr "Отлъчване…"
-
 #~ msgid ""
 #~ "<b>Whom do you want to ban?</b>\n"
 #~ "\n"
@@ -11969,12 +12765,6 @@ msgstr "Неуспех при свързването"
 #~ msgid "Filter:"
 #~ msgstr "Филтър:"
 
-#~ msgid ""
-#~ "If checked, Gajim will display the mood of contacts in the roster window"
-#~ msgstr ""
-#~ "Ако тази опция е избрана, Gajim ще изобразява настроението на контактите "
-#~ "в списъка."
-
 #~ msgid "<b>Chat Appearance</b>"
 #~ msgstr "<b>Изглед на разговорите</b>"
 
@@ -12228,10 +13018,6 @@ msgstr "Неуспех при свързването"
 #~ msgstr "С_ъобщение за състояние:"
 
 #, fuzzy
-#~ msgid "Group chat highlight"
-#~ msgstr "Осветено съобщение в стая"
-
-#, fuzzy
 #~ msgid "Your nickname"
 #~ msgstr "Псевдоним:"
 
@@ -12371,9 +13157,6 @@ msgstr "Неуспех при свързването"
 #~ msgid "The passwords typed in both fields must be identical."
 #~ msgstr "Паролите, написани в двете полета, трябва да са едни и същи."
 
-#~ msgid "Enter new password:"
-#~ msgstr "Въведете нова парола:"
-
 #~ msgid "Enter it again for confirmation:"
 #~ msgstr "Въведете я отново за потвърждение:"
 
@@ -12389,10 +13172,6 @@ msgstr "Неуспех при свързването"
 #~ msgstr "искане за отписване от %s"
 
 #, fuzzy
-#~ msgid "Autojoin"
-#~ msgstr "Автоматично влизане"
-
-#, fuzzy
 #~ msgid "Homepage:"
 #~ msgstr "<b>Страница в Интернет:</b>"
 
@@ -12505,9 +13284,6 @@ msgstr "Неуспех при свързването"
 #~ msgid "Forward unread message then disconnect"
 #~ msgstr "Препращане на непрочетени съобщения"
 
-#~ msgid "AIM Address:"
-#~ msgstr "Адрес на AIM:"
-
 #~ msgid "MSN Address:"
 #~ msgstr "Адрес на MSN:"
 
@@ -12559,10 +13335,6 @@ msgstr "Неуспех при свързването"
 #~ msgid "Session negotiation cancelled"
 #~ msgstr "Договорката за сесията отменена"
 
-#, fuzzy
-#~ msgid "This session WILL NOT be archived on server"
-#~ msgstr "НЯМА да се запазва дневник за сесията"
-
 #~ msgid "This session is encrypted"
 #~ msgstr "Тази сесия е шифрирана"
 
@@ -12871,9 +13643,6 @@ msgstr "Неуспех при свързването"
 #~ msgid "Server:"
 #~ msgstr "Сървър:"
 
-#~ msgid "Password:"
-#~ msgstr "Парола:"
-
 #, fuzzy
 #~ msgid "Join this room _automatically when I connect"
 #~ msgstr "Влизане в тази стая автоматично при свързване"
@@ -13217,9 +13986,6 @@ msgstr "Неуспех при свързването"
 #~ msgid "_Edit Personal Information..."
 #~ msgstr "Редактиране на личните данни…"
 
-#~ msgid "Information about you, as stored in the server"
-#~ msgstr "Вашите лични данни, както са запазени на сървъра"
-
 #~ msgid "<b>Personal Information</b>"
 #~ msgstr "<b>Лични данни</b>"
 
@@ -13301,9 +14067,6 @@ msgstr "Неуспех при свързването"
 #~ msgid "Your server can't save your personal information."
 #~ msgstr "Сървърът ви не може да запази личната ви информация."
 
-#~ msgid "Account Local already exists."
-#~ msgstr "Името на акаунта вече се използва."
-
 #~ msgid "Please rename or remove it before enabling link-local messaging."
 #~ msgstr ""
 #~ "Преименувайте го или го премахнете преди да активирате съобщения от/за "
@@ -13387,10 +14150,6 @@ msgstr "Неуспех при свързването"
 #~ msgid "The following message was NOT encrypted"
 #~ msgstr "Следното съобщение НЕ БЕШЕ шифрирано"
 
-#, fuzzy
-#~ msgid "Encryption used for this contact."
-#~ msgstr "Активира шифриране тип „ESessions“ за този акаунт."
-
 #~ msgid "Toggle Open_PGP Encryption"
 #~ msgstr "Превключване на шифриране тип „Open_PGP“"
 
@@ -13467,10 +14226,6 @@ msgstr "Неуспех при свързването"
 #~ msgid "Contact's identity verified"
 #~ msgstr "Идентичността на контакта проверена"
 
-#, fuzzy
-#~ msgid "Verify again…"
-#~ msgstr "Проверка наново…"
-
 #~ msgid ""
 #~ "To be certain that <b>only</b> the expected person can read your messages "
 #~ "or send you messages, you need to verify their identity by clicking the "
@@ -13594,9 +14349,6 @@ msgstr "Неуспех при свързването"
 #~ msgid "Add _Contact..."
 #~ msgstr "_Добавяне на контакт…"
 
-#~ msgid "_Accounts"
-#~ msgstr "_Акаунти"
-
 #~ msgid "Profile, A_vatar"
 #~ msgstr "_Профил, аватар"
 
@@ -13814,12 +14566,6 @@ msgstr "Неуспех при свързването"
 #~ msgid "Activity: "
 #~ msgstr "Дейност:"
 
-#~ msgid "Join _Group Chat..."
-#~ msgstr "_Влизане в стая…"
-
-#~ msgid "_Modify Account"
-#~ msgstr "_Промяна на акаунт"
-
 #~ msgid "Check on startup if Gajim is the _default Jabber client"
 #~ msgstr ""
 #~ "_Да се проверява дали Gajim е стандартния Джабър клиент при стартиране"
@@ -13845,9 +14591,6 @@ msgstr "Неуспех при свързването"
 #~ msgid "Execute Command..."
 #~ msgstr "Изпълнение на команда…"
 
-#~ msgid " a window/tab opened with that contact "
-#~ msgstr " отворен прозорец/подпрозорец с този контакт "
-
 #~ msgid "<b>Actions</b>"
 #~ msgstr "<b>Действия</b>"
 
@@ -14430,9 +15173,6 @@ msgstr "Неуспех при свързването"
 #~ msgid "[This message is encrypted]"
 #~ msgstr "[Това съобщение е шифрирано]"
 
-#~ msgid "Trayicon"
-#~ msgstr "Икона в областта за уведомяване"
-
 #~ msgid "A icon in systemtray reflecting the current presence."
 #~ msgstr "Икона в областта за уведомяване, отразяваща текущото състояние."
 
@@ -14466,9 +15206,6 @@ msgstr "Неуспех при свързването"
 #~ msgid "Nickname not found: %s"
 #~ msgstr "Псевдонимът не е намерен: %s"
 
-#~ msgid "This group chat has no subject"
-#~ msgstr "Тази стая няма тема"
-
 #, fuzzy
 #~ msgid ""
 #~ "Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
@@ -14542,9 +15279,6 @@ msgstr "Неуспех при свързването"
 #~ "Натиснете, за да видите функционалностите (като MSN, ICQ транспорти) на "
 #~ "Джабър сървърите"
 
-#~ msgid "_Host:"
-#~ msgstr "_Хост:"
-
 #, fuzzy
 #~ msgid "Select the account with which to synchronise"
 #~ msgstr "Изберете акаунт, с който искате да синхронизирате"
diff --git a/po/br.po b/po/br.po
index 710b5654e..815e93fe2 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: 2019-07-02 02:06+0000\n"
+"POT-Creation-Date: 2019-08-11 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,71 +23,71 @@ msgstr ""
 "X-Poedit-Language: French\n"
 "X-Poedit-Country: FRANCE\n"
 
-#: gajim/chat_control_base.py:550
+#: gajim/chat_control_base.py:557
 msgid "_Undo"
 msgstr ""
 
-#: gajim/chat_control_base.py:558 gajim/conversation_textview.py:529
+#: gajim/chat_control_base.py:565 gajim/conversation_textview.py:529
 msgid "_Clear"
 msgstr ""
 
-#: gajim/chat_control_base.py:563
+#: gajim/chat_control_base.py:570
 msgid "Paste as quote"
 msgstr ""
 
-#: gajim/chat_control_base.py:613
+#: gajim/chat_control_base.py:620
 #, fuzzy
 msgid "Paste Image"
 msgstr "Dibabit ur skeudenn"
 
-#: gajim/chat_control_base.py:614
+#: gajim/chat_control_base.py:621
 #, fuzzy
 msgid "You are trying to paste an image"
 msgstr "N'oc'h ket luget d'ar servijer"
 
-#: gajim/chat_control_base.py:615
+#: gajim/chat_control_base.py:622
 #, 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:617 gajim/groupchat_control.py:2310
-#: gajim/roster_window.py:2848 gajim/roster_window.py:4167
-#: gajim/message_window.py:252 gajim/gtk/dialogs.py:418
+#: gajim/chat_control_base.py:624 gajim/groupchat_control.py:2218
+#: gajim/roster_window.py:2841 gajim/roster_window.py:4118
+#: gajim/message_window.py:359 gajim/gtk/dialogs.py:330
 #, fuzzy
 msgid "_Do not ask me again"
 msgstr "_Chom hep goulenn ket"
 
-#: gajim/chat_control_base.py:620
+#: gajim/chat_control_base.py:627
 msgid "_Paste"
 msgstr ""
 
-#: gajim/chat_control_base.py:1162 gajim/gtk/accounts.py:351
+#: gajim/chat_control_base.py:1169 gajim/gtk/accounts.py:354
 #, fuzzy
 msgid "Privacy"
 msgstr "Roll argas"
 
-#: gajim/chat_control_base.py:1163
+#: gajim/chat_control_base.py:1170
 #, fuzzy
 msgid "Warning"
 msgstr "Argas %s"
 
-#: gajim/chat_control_base.py:1164
+#: gajim/chat_control_base.py:1171
 #, python-format
 msgid "If you send a file to <b>%s</b>, your real JID will be revealed."
 msgstr ""
 
-#: gajim/chat_control_base.py:1169
+#: gajim/chat_control_base.py:1176
 #, fuzzy
 msgid "Continue"
 msgstr "_Kenderc'hel"
 
-#: gajim/gtkgui_helpers.py:163 gajim/gtk/filetransfer.py:393
+#: gajim/gtkgui_helpers.py:163 gajim/gtk/filetransfer.py:398
 #, python-format
 msgid "Cannot overwrite existing file '%s'"
 msgstr ""
 
-#: gajim/gtkgui_helpers.py:164 gajim/gtk/filetransfer.py:394
+#: gajim/gtkgui_helpers.py:164 gajim/gtk/filetransfer.py:399
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
@@ -177,391 +177,400 @@ msgstr ""
 msgid " resource with priority "
 msgstr ""
 
-#: gajim/gui_menu_builder.py:96
+#: gajim/gui_menu_builder.py:251 gajim/gui_menu_builder.py:342
+#: gajim/chat_control.py:305 gajim/roster_window.py:783
+#: gajim/roster_window.py:1716 gajim/roster_window.py:1718
+#: gajim/roster_window.py:2027 gajim/roster_window.py:3292
+#: gajim/roster_window.py:3325 gajim/gui_interface.py:396
+#: gajim/common/contacts.py:222 gajim/common/contacts.py:359
+#: gajim/common/contacts.py:471 gajim/common/helpers.py:86
+#: gajim/common/helpers.py:317 gajim/gtk/add_contact.py:319
+#: gajim/gtk/subscription_request.py:70 gajim/gtk/subscription_request.py:99
+#: gajim/gtk/roster_item_exchange.py:112
 #, fuzzy
-msgid "_New Group Chat"
-msgstr "Flap a-stroll"
-
-#: gajim/gui_menu_builder.py:289 gajim/gui_menu_builder.py:380
-#: gajim/chat_control.py:303 gajim/roster_window.py:786
-#: gajim/roster_window.py:1719 gajim/roster_window.py:1721
-#: gajim/roster_window.py:2030 gajim/roster_window.py:3336
-#: gajim/roster_window.py:3369 gajim/gui_interface.py:413
-#: gajim/common/contacts.py:206 gajim/common/contacts.py:343
-#: gajim/common/helpers.py:83 gajim/common/helpers.py:311
-#: gajim/gtk/add_contact.py:319 gajim/gtk/subscription_request.py:70
-#: gajim/gtk/subscription_request.py:99 gajim/gtk/roster_item_exchange.py:112
-msgid "Not in Roster"
-msgstr "Ket er roll"
+msgid "Not in contact list"
+msgstr "Diskouez an darempredoù _ezlinenn"
 
-#: gajim/gui_menu_builder.py:393
-msgid "I would like to add you to my roster"
-msgstr "Laouen 'vefen d'az ouzhpennañ em roll-darempredoù"
+#: gajim/gui_menu_builder.py:355
+#, 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:471
+#: gajim/gui_menu_builder.py:433
 #, fuzzy
 msgid "Send Single _Message…"
 msgstr "Kas ur gemennadenn _simpl"
 
-#: gajim/gui_menu_builder.py:486
+#: gajim/gui_menu_builder.py:448
 #, fuzzy
 msgid "E_xecute Command…"
 msgstr "urzhiad"
 
-#: gajim/gui_menu_builder.py:494
+#: gajim/gui_menu_builder.py:456
 #, fuzzy
 msgid "_Manage Transport"
 msgstr "Dorioù"
 
-#: gajim/gui_menu_builder.py:500
+#: gajim/gui_menu_builder.py:462
 #, fuzzy
 msgid "_Modify Transport"
 msgstr "Dorioù"
 
-#: gajim/gui_menu_builder.py:507 gajim/roster_window.py:5046
+#: gajim/gui_menu_builder.py:469 gajim/roster_window.py:4985
 #, fuzzy
 msgid "_Rename…"
 msgstr "_Adenvel"
 
-#: gajim/gui_menu_builder.py:518 gajim/roster_window.py:5062
-#: gajim/roster_window.py:5177 gajim/data/gui/blocked_contacts_window.ui:52
+#: gajim/gui_menu_builder.py:480 gajim/roster_window.py:5001
+#: gajim/roster_window.py:5116 gajim/data/gui/blocked_contacts_window.ui:52
 #: gajim/data/gui/gc_occupants_menu.ui:148
 #: gajim/data/gui/contact_context_menu.ui:143
 msgid "_Unblock"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:521 gajim/roster_window.py:5067
-#: gajim/roster_window.py:5181 gajim/data/gui/gc_occupants_menu.ui:140
+#: gajim/gui_menu_builder.py:483 gajim/roster_window.py:5006
+#: gajim/roster_window.py:5120 gajim/data/gui/gc_occupants_menu.ui:140
 #: gajim/data/gui/contact_context_menu.ui:151
 msgid "_Block"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:529 gajim/roster_window.py:5074
+#: gajim/gui_menu_builder.py:491 gajim/roster_window.py:5013
 #: gajim/data/gui/contact_context_menu.ui:181
 #, fuzzy
 msgid "Remo_ve"
 msgstr "_Dilemel"
 
-#: gajim/gui_menu_builder.py:539 gajim/data/gui/contact_context_menu.ui:198
+#: gajim/gui_menu_builder.py:501 gajim/data/gui/contact_context_menu.ui:198
 #, fuzzy
 msgid "_Information"
 msgstr "Titouroù"
 
-#: gajim/gui_menu_builder.py:552
+#: gajim/gui_menu_builder.py:514
 #, fuzzy
 msgid "Save _As"
 msgstr "Enrollet e-barzh: %s"
 
-#: gajim/gui_menu_builder.py:564 gajim/groupchat_control.py:501
-#: gajim/chat_control.py:340
+#: gajim/gui_menu_builder.py:526 gajim/groupchat_control.py:507
+#: gajim/chat_control.py:342
 #, fuzzy
 msgid "Send File…"
 msgstr "Kas ur _restr"
 
-#: gajim/gui_menu_builder.py:565
+#: gajim/gui_menu_builder.py:527
 #, fuzzy
 msgid "Upload File…"
 msgstr "Enrollañ ar restr dindan..."
 
-#: gajim/gui_menu_builder.py:566
+#: gajim/gui_menu_builder.py:528
 #, fuzzy
 msgid "Send File Directly…"
 msgstr "Enrollañ ar restr dindan..."
 
-#: gajim/gui_menu_builder.py:568 gajim/gui_menu_builder.py:632
+#: gajim/gui_menu_builder.py:530 gajim/gui_menu_builder.py:596
 #, fuzzy
 msgid "Send Chatstate"
 msgstr "Stad diwezhañ: %s"
 
-#: gajim/gui_menu_builder.py:569
+#: gajim/gui_menu_builder.py:531
 #, fuzzy
 msgid "Invite Contacts"
 msgstr "Darempredoù"
 
-#: gajim/gui_menu_builder.py:570
+#: gajim/gui_menu_builder.py:532
 #, fuzzy
-msgid "Add to Roster"
-msgstr "_Ouzhpennañ er roll"
+msgid "Add to Contact List"
+msgstr "_Ouzhpennañ un darempred..."
 
-#: gajim/gui_menu_builder.py:571
-msgid "Audio Session"
-msgstr ""
+#: gajim/gui_menu_builder.py:533
+#, fuzzy
+msgid "Voice Chat"
+msgstr "Goulenn treuzkas"
 
-#: gajim/gui_menu_builder.py:572
-msgid "Video Session"
-msgstr ""
+#: gajim/gui_menu_builder.py:534
+#, fuzzy
+msgid "Video Chat"
+msgstr "Flap prevez"
 
-#: gajim/gui_menu_builder.py:573
+#: gajim/gui_menu_builder.py:535 gajim/gui_menu_builder.py:582
 #, fuzzy
 msgid "Information"
 msgstr "Titouroù"
 
-#: gajim/gui_menu_builder.py:574 gajim/gui_menu_builder.py:639
+#: gajim/gui_menu_builder.py:536 gajim/gui_menu_builder.py:602
 #: gajim/data/gui/application_menu.ui:37
 #, fuzzy
 msgid "History"
 msgstr "_Istoradur"
 
-#: gajim/gui_menu_builder.py:580 gajim/gui_menu_builder.py:687
+#: gajim/gui_menu_builder.py:542 gajim/gui_menu_builder.py:650
 #: gajim/data/gui/preferences_window.ui:1823
 msgid "Disabled"
 msgstr "Dizoberiant"
 
-#: gajim/gui_menu_builder.py:581 gajim/gui_menu_builder.py:688
+#: gajim/gui_menu_builder.py:543 gajim/gui_menu_builder.py:651
 #, fuzzy
 msgid "Composing only"
 msgstr "O skrivañ"
 
-#: gajim/gui_menu_builder.py:582 gajim/gui_menu_builder.py:689
+#: gajim/gui_menu_builder.py:544 gajim/gui_menu_builder.py:652
 #, fuzzy
 msgid "All chat states"
 msgstr "Stad:"
 
-#: gajim/gui_menu_builder.py:620
+#: gajim/gui_menu_builder.py:583
 #, fuzzy
-msgid "Manage Room"
-msgstr "Merañ ar sinedoù"
+msgid "Manage Group Chat"
+msgstr "Flap a-stroll"
 
-#: gajim/gui_menu_builder.py:621
+#: gajim/gui_menu_builder.py:584 gajim/data/gui/groupchat_control.ui:649
 #, fuzzy
 msgid "Change Subject"
 msgstr "Kemmañ ar _sujed"
 
-#: gajim/gui_menu_builder.py:622
+#: gajim/gui_menu_builder.py:585
 #, fuzzy
-msgid "Configure Room"
-msgstr "Ke_fluniañ ar flap"
+msgid "Configure Group Chat"
+msgstr "Flap a-stroll"
 
-#: gajim/gui_menu_builder.py:623
+#: gajim/gui_menu_builder.py:586
 #, fuzzy
 msgid "Upload Avatar…"
 msgstr "Dibabit ur skeudenn"
 
-#: gajim/gui_menu_builder.py:624
+#: gajim/gui_menu_builder.py:587
 #, fuzzy
-msgid "Destroy Room"
-msgstr "Taolennadur: %s"
+msgid "Destroy Group Chat"
+msgstr "Flap a-stroll"
 
-#: gajim/gui_menu_builder.py:626 gajim/data/gui/preferences_window.ui:790
+#: gajim/gui_menu_builder.py:589 gajim/data/gui/preferences_window.ui:790
 #, fuzzy
 msgid "Chat Settings"
 msgstr "échec lors de la publication de votre vCard"
 
-#: gajim/gui_menu_builder.py:627
+#: gajim/gui_menu_builder.py:590
 msgid "Show join/leave"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:628
+#: gajim/gui_menu_builder.py:591
 #, fuzzy
 msgid "Show status changes"
 msgstr "_Menegiñ kemmoù stad an darempredoù e-barzh an istoradur"
 
-#: gajim/gui_menu_builder.py:629 gajim/data/gui/gc_control_popup_menu.ui:72
+#: gajim/gui_menu_builder.py:592 gajim/data/gui/gc_control_popup_menu.ui:72
 #, fuzzy
 msgid "Notify on all messages"
 msgstr "Kemennadennoù raklakaet:"
 
-#: gajim/gui_menu_builder.py:630
+#: gajim/gui_menu_builder.py:593
 msgid "Minimize on close"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:631
-msgid "Minimize on autojoin"
+#: gajim/gui_menu_builder.py:595
+msgid "Minimize when joining automatically"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:634
+#: gajim/gui_menu_builder.py:598
 msgid "Sync Threshold"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:635
+#: gajim/gui_menu_builder.py:599
 #, fuzzy
-msgid "Change Nick"
+msgid "Change Nickname"
 msgstr "Cheñch _lesanv"
 
-#: gajim/gui_menu_builder.py:636
-#, fuzzy
-msgid "Bookmark Room"
-msgstr "_Ouzhpennañ ar webgaoz d'ar sinedoù"
-
-#: gajim/gui_menu_builder.py:637
+#: gajim/gui_menu_builder.py:600
 msgid "Request Voice"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:638 gajim/roster_window.py:5246
+#: gajim/gui_menu_builder.py:601 gajim/roster_window.py:5185
 #, fuzzy
 msgid "Execute command"
 msgstr "urzhiad"
 
-#: gajim/gui_menu_builder.py:640
-#, fuzzy
-msgid "Disconnect"
-msgstr "Darempred diluget"
+#: gajim/gui_menu_builder.py:603
+msgid "Leave"
+msgstr ""
 
-#: gajim/gui_menu_builder.py:678 gajim/gtk/preferences.py:156
+#: gajim/gui_menu_builder.py:641 gajim/gtk/preferences.py:155
 msgid "No threshold"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:680 gajim/gtk/preferences.py:158
+#: gajim/gui_menu_builder.py:643 gajim/gtk/preferences.py:157
 #, 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:709 gajim/gui_menu_builder.py:747
-#: gajim/gtk/join_groupchat.py:43
-msgid "Join Group Chat"
-msgstr "Ebarzhiñ ur sal-flapiñ"
-
-#: gajim/gui_menu_builder.py:746
+#: gajim/gui_menu_builder.py:672
 #, fuzzy
 msgid "Add Contact…"
 msgstr "_Ouzhpennañ un darempred..."
 
-#: gajim/gui_menu_builder.py:748 gajim/gtk/profile.py:52
-#: gajim/gtk/accounts.py:770 gajim/gtk/accounts.py:808
+#: gajim/gui_menu_builder.py:673 gajim/gtk/profile.py:52
+#: gajim/gtk/accounts.py:773 gajim/gtk/accounts.py:811
 #, fuzzy
 msgid "Profile"
 msgstr "restr"
 
-#: gajim/gui_menu_builder.py:749
+#: gajim/gui_menu_builder.py:674
+#, fuzzy
+msgid "Send Single Message…"
+msgstr "Kas ur gemennadenn _simpl"
+
+#: gajim/gui_menu_builder.py:675
 #, fuzzy
 msgid "Discover Services"
 msgstr "_Dizoleiñ ar servijoù"
 
-#: gajim/gui_menu_builder.py:750
+#: gajim/gui_menu_builder.py:676 gajim/gtk/server_info.py:36
 #, fuzzy
-msgid "Send Single Message…"
-msgstr "Kas ur gemennadenn _simpl"
+msgid "Server Info"
+msgstr "Servijer"
 
-#: gajim/gui_menu_builder.py:751 gajim/data/gui/preferences_window.ui:2741
+#: gajim/gui_menu_builder.py:677 gajim/data/gui/preferences_window.ui:2741
 msgid "Advanced"
 msgstr "Dre ar munut"
 
-#: gajim/gui_menu_builder.py:752 gajim/gtk/mam_preferences.py:88
+#: gajim/gui_menu_builder.py:678 gajim/gtk/mam_preferences.py:88
 #, fuzzy
 msgid "Archiving Preferences"
 msgstr "_Penndibaboù"
 
-#: gajim/gui_menu_builder.py:753
+#: gajim/gui_menu_builder.py:679
 #, fuzzy
 msgid "Blocking List"
 msgstr "Roll argas"
 
-#: gajim/gui_menu_builder.py:754 gajim/gtk/history_sync.py:108
+#: gajim/gui_menu_builder.py:680
+#, fuzzy
+msgid "Bookmarks"
+msgstr "_Ouzhpennañ ar webgaoz d'ar sinedoù"
+
+#: gajim/gui_menu_builder.py:681
+#, fuzzy
+msgid "PEP Configuration"
+msgstr "Kefluniañ ar webgaoz"
+
+#: gajim/gui_menu_builder.py:682 gajim/gtk/history_sync.py:108
 #: gajim/gtk/history_sync.py:186
 #, fuzzy
 msgid "Synchronise History"
 msgstr "Diskouez an darempredoù _ezlinenn"
 
-#: gajim/gui_menu_builder.py:755 gajim/gtk/privacy_list.py:427
+#: gajim/gui_menu_builder.py:683 gajim/gtk/privacy_list.py:427
 #, fuzzy
 msgid "Privacy Lists"
 msgstr "Flapoù prevez"
 
-#: gajim/gui_menu_builder.py:756 gajim/gtk/server_info.py:36
-#, fuzzy
-msgid "Server Info"
-msgstr "Servijer"
-
-#: gajim/gui_menu_builder.py:757 gajim/gui_menu_builder.py:768
+#: gajim/gui_menu_builder.py:685 gajim/gui_menu_builder.py:696
 #: gajim/data/gui/xml_console_window.ui:77
 msgid "XML Console"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:759 gajim/data/gui/groupchat_config.ui:36
+#: gajim/gui_menu_builder.py:687 gajim/data/gui/groupchat_config.ui:36
 #, fuzzy
 msgid "Admin"
 msgstr "_Merour-ez"
 
-#: gajim/gui_menu_builder.py:760
+#: gajim/gui_menu_builder.py:688
 #, fuzzy
 msgid "Send Server Message…"
 msgstr "_Kas ur gemennadenn d'ar servijer"
 
-#: gajim/gui_menu_builder.py:761
+#: gajim/gui_menu_builder.py:689
 #, fuzzy
 msgid "Set MOTD…"
 msgstr "Lakaat MOTD"
 
-#: gajim/gui_menu_builder.py:762
+#: gajim/gui_menu_builder.py:690
 #, fuzzy
 msgid "Update MOTD…"
 msgstr "Hizivaat MOTD"
 
-#: gajim/gui_menu_builder.py:763
+#: gajim/gui_menu_builder.py:691
 #, fuzzy
 msgid "Delete MOTD…"
 msgstr "Dilemel MOTD"
 
-#: gajim/gui_menu_builder.py:812
+#: gajim/gui_menu_builder.py:736
 #, fuzzy
-msgid "No Accounts available"
-msgstr "Kont ebet hegerz"
+msgid "_Add Account…"
+msgstr "_Ouzhpennañ un darempred..."
+
+#: gajim/gui_menu_builder.py:742
+#, fuzzy
+msgid "_Modify Accounts…"
+msgstr "_Kemmañ ar gont..."
 
-#: gajim/gui_menu_builder.py:823 gajim/data/gui/application_menu.ui:5
-#: gajim/data/gui/application_menu.ui:71 gajim/data/gui/shortcuts_window.ui:182
-#: gajim/gtk/accounts.py:58
+#: gajim/gui_menu_builder.py:751 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:755 gajim/data/gui/application_menu.ui:5
+#: gajim/data/gui/shortcuts_window.ui:182 gajim/gtk/accounts.py:57
 msgid "Accounts"
 msgstr "Kontoù"
 
-#: gajim/gui_menu_builder.py:881 gajim/gui_menu_builder.py:886
+#: gajim/gui_menu_builder.py:784 gajim/gui_menu_builder.py:789
 #, fuzzy
-msgid "Copy JID"
-msgstr "Webgaoz:"
+msgid "Copy XMPP Address"
+msgstr "_Kopiañ ar JID/Chomlec'h postel"
 
-#: gajim/gui_menu_builder.py:882 gajim/gui_menu_builder.py:914
+#: gajim/gui_menu_builder.py:785 gajim/gui_menu_builder.py:817
 #, fuzzy
 msgid "Join Groupchat"
 msgstr "Ebarzhiñ ur sal-flapiñ"
 
-#: gajim/gui_menu_builder.py:887 gajim/gui_menu_builder.py:913
-#: gajim/data/gui/application_menu.ui:76
+#: gajim/gui_menu_builder.py:790 gajim/gui_menu_builder.py:816
+#: gajim/data/gui/application_menu.ui:71
 #: gajim/data/gui/subscription_request_window.ui:106
 msgid "Start Chat"
 msgstr "Kregiñ da flapiñ"
 
-#: gajim/gui_menu_builder.py:888 gajim/gui_menu_builder.py:915
+#: gajim/gui_menu_builder.py:791 gajim/gui_menu_builder.py:818
 #, fuzzy
-msgid "Add to Roster…"
-msgstr "_Ouzhpennañ er roll"
+msgid "Add to Contact List…"
+msgstr "_Ouzhpennañ un darempred..."
 
-#: gajim/gui_menu_builder.py:893
+#: gajim/gui_menu_builder.py:796
 #, fuzzy
 msgid "Copy Link Location"
 msgstr "_Kopiañ chomlec'h an ere"
 
-#: gajim/gui_menu_builder.py:894
+#: gajim/gui_menu_builder.py:797
 #, fuzzy
 msgid "Open Link in Browser"
 msgstr "_Digerién an ere er furcher web"
 
-#: gajim/gui_menu_builder.py:899
+#: gajim/gui_menu_builder.py:802
 #, fuzzy
 msgid "Copy Email Address"
 msgstr "_Kopiañ ar JID/Chomlec'h postel"
 
-#: gajim/gui_menu_builder.py:900 gajim/gui_menu_builder.py:912
+#: gajim/gui_menu_builder.py:803 gajim/gui_menu_builder.py:815
 #, fuzzy
 msgid "Open Email Composer"
 msgstr "_Digeriñ ar bostelerez"
 
-#: gajim/gui_menu_builder.py:905
+#: gajim/gui_menu_builder.py:808
 #, fuzzy
 msgid "Copy Location"
 msgstr "_Kopiañ chomlec'h an ere"
 
-#: gajim/gui_menu_builder.py:906
+#: gajim/gui_menu_builder.py:809
 #, fuzzy
 msgid "Show Location"
 msgstr "Kemmañ ar gont"
 
-#: gajim/gui_menu_builder.py:911
+#: gajim/gui_menu_builder.py:814
 #, fuzzy
-msgid "Copy JID/Email"
+msgid "Copy XMPP Address/Email"
 msgstr "_Kopiañ ar JID/Chomlec'h postel"
 
-#: gajim/gui_menu_builder.py:945
+#: gajim/gui_menu_builder.py:852
 #, fuzzy
 msgid "Copy"
 msgstr "Webgaoz:"
@@ -584,44 +593,55 @@ msgstr ""
 msgid "Choose folder for logfile"
 msgstr ""
 
-#: gajim/history_manager.py:107
+#: gajim/history_manager.py:106
 msgid "Cannot find history logs database"
 msgstr "Dibosupl eo kavout titourva an istoradur"
 
-#: gajim/history_manager.py:108
+#: gajim/history_manager.py:107
 #, fuzzy, python-format
 msgid "%s does not exist."
 msgstr "Ce salon n'existe pas."
 
-#: gajim/history_manager.py:141 gajim/history_manager.py:195
-#: gajim/gtk/discovery.py:829 gajim/gtk/roster_item_exchange.py:80
-msgid "JID"
-msgstr "JID"
+#: gajim/history_manager.py:140 gajim/history_manager.py:194
+#: 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:30
+#: gajim/gtk/accounts.py:804
+#, fuzzy
+msgid "XMPP Address"
+msgstr "_Chomlec'h:"
 
-#: gajim/history_manager.py:154 gajim/history_manager.py:202
+#: gajim/history_manager.py:153 gajim/history_manager.py:201
 #: gajim/data/gui/history_window.ui:89 gajim/gtk/history.py:108
 msgid "Date"
 msgstr "Deiziad"
 
-#: gajim/history_manager.py:161 gajim/history_manager.py:225
+#: gajim/history_manager.py:160 gajim/history_manager.py:224
 #: gajim/data/gui/join_groupchat_window.ui:208
 #: gajim/data/gui/profile_window.ui:214
 #: gajim/data/gui/vcard_information_window.ui:443
+#: gajim/data/gui/bookmarks.ui:140
 msgid "Nickname"
 msgstr "Lesanv"
 
-#: gajim/history_manager.py:172 gajim/history_manager.py:211
+#: gajim/history_manager.py:171 gajim/history_manager.py:210
 #: gajim/data/gui/preferences_window.ui:1344
 #: gajim/data/gui/single_message_window.ui:275 gajim/gtk/history.py:117
 msgid "Message"
 msgstr "Kemennadenn"
 
-#: gajim/history_manager.py:180 gajim/history_manager.py:218
+#: gajim/history_manager.py:179 gajim/history_manager.py:217
 #: gajim/data/gui/groups_post_window.ui:49
 #: gajim/data/gui/single_message_window.ui:214
 msgid "Subject"
 msgstr "Titl"
 
+#: gajim/history_manager.py:247
+msgid "Database Cleanup"
+msgstr ""
+
 #: gajim/history_manager.py:248
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
@@ -632,55 +652,53 @@ msgstr ""
 
 #: gajim/history_manager.py:250
 msgid ""
-"Normally allocated database size will not be freed, it will just become "
-"reusable. If you really want to reduce database filesize, click YES, else "
-"click NO.\n"
-"\n"
-"In case you click YES, please wait…"
+"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
-msgid "Database Cleanup"
-msgstr ""
+#, fuzzy
+msgid "_Cleanup"
+msgstr "_Naetaat"
 
-#: gajim/history_manager.py:519 gajim/gtk/filetransfer.py:238
-#: gajim/gtk/filetransfer.py:248
+#: gajim/history_manager.py:518 gajim/gtk/filetransfer.py:237
+#: gajim/gtk/filetransfer.py:247
 msgid "You"
 msgstr "C'hwi"
 
-#: gajim/history_manager.py:531
+#: gajim/history_manager.py:530
 #, 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:568 gajim/history_manager.py:607
-#: gajim/gtk/dialogs.py:58 gajim/gtk/themes.py:319
+#: gajim/history_manager.py:567 gajim/history_manager.py:606
+#: gajim/gtk/dialogs.py:57 gajim/gtk/themes.py:319
 #: gajim/gtk/roster_item_exchange.py:75 gajim/gtk/roster_item_exchange.py:185
 msgid "Delete"
 msgstr "Dilemel"
 
-#: gajim/history_manager.py:569
+#: gajim/history_manager.py:568
 #, fuzzy
 msgid "Delete Conversation"
 msgid_plural "Delete Conversations"
 msgstr[0] "Titouroù"
 msgstr[1] "Titouroù"
 
-#: gajim/history_manager.py:570
+#: gajim/history_manager.py:569
 #, 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:608
+#: gajim/history_manager.py:607
 #, fuzzy
 msgid "Delete Message"
 msgid_plural "Delete Messages"
 msgstr[0] "Titour-stad"
 msgstr[1] "Titour-stad"
 
-#: gajim/history_manager.py:609
+#: gajim/history_manager.py:608
 #, fuzzy
 msgid "Do you want to permanently delete this message"
 msgid_plural "Do you want to permanently delete these messages"
@@ -693,15 +711,15 @@ msgid "Contact name: <i>%s</i>"
 msgstr "Anv an darempred: <i>%s</i>"
 
 #: gajim/dialogs.py:84
-#, fuzzy, python-format
-msgid "JID: <i>%s</i>"
-msgstr "JID: <i>%s</i>"
+#, python-format
+msgid "XMPP Address: <i>%s</i>"
+msgstr ""
 
-#: gajim/dialogs.py:115 gajim/dialogs.py:128 gajim/roster_window.py:2901
-#: gajim/roster_window.py:3833 gajim/roster_window.py:5084
-#: gajim/common/contacts.py:157 gajim/common/contacts.py:190
+#: gajim/dialogs.py:115 gajim/dialogs.py:128 gajim/roster_window.py:2894
+#: gajim/roster_window.py:3784 gajim/roster_window.py:5023
+#: gajim/common/contacts.py:157 gajim/common/contacts.py:206
 #: gajim/data/gui/preferences_window.ui:558
-#: gajim/data/gui/shortcuts_window.ui:177 gajim/gtk/accounts.py:349
+#: gajim/data/gui/shortcuts_window.ui:177 gajim/gtk/accounts.py:352
 msgid "General"
 msgstr "Hollek"
 
@@ -750,7 +768,7 @@ msgstr ""
 "Implijet e vez an anv-mañ gant unan eus ho kontoù dija. Dibabit un anv all "
 "marplij."
 
-#: gajim/dialogs.py:703
+#: gajim/dialogs.py:703 gajim/plugins/gui.py:292
 msgid "_Overwrite"
 msgstr ""
 
@@ -762,9 +780,7 @@ msgstr "Enrollañ evel titour-stad rakenrollet"
 msgid "Please type a name for this status message"
 msgstr "Roit un anv d'an titour-stad-mañ"
 
-#: gajim/dialogs.py:740 gajim/gui_interface.py:1441 gajim/dialog_messages.py:31
-#: gajim/gtk/discovery.py:518 gajim/gtk/profile.py:323
-#: gajim/gtk/join_groupchat.py:234
+#: gajim/dialogs.py:740 gajim/gtk/discovery.py:517 gajim/gtk/profile.py:323
 msgid "You are not connected to the server"
 msgstr "N'oc'h ket luget d'ar servijer"
 
@@ -773,9 +789,11 @@ msgstr "N'oc'h ket luget d'ar servijer"
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Rankout a rit bezañ luget evit cheñch ger-kuzh."
 
-#: gajim/dialogs.py:752 gajim/dialogs.py:823 gajim/gtk/discovery.py:822
-#: gajim/gtk/discovery.py:1648 gajim/gtk/discovery.py:1941
-#: gajim/gtk/history.py:99 gajim/gtk/roster_item_exchange.py:83
+#: gajim/dialogs.py:752 gajim/dialogs.py:823
+#: gajim/data/gui/groupchat_info_scrolled.ui:16 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/gtk/roster_item_exchange.py:83
 msgid "Name"
 msgstr "Anv"
 
@@ -797,400 +815,345 @@ msgstr "N'hellit ket ebarzhiñ ur sal-flapiñ keit ha ma n'oc'h ket luget."
 msgid "Synchronise"
 msgstr ""
 
-#: gajim/dialogs.py:1043
+#: gajim/dialogs.py:1042
 msgid "an audio and video"
 msgstr ""
 
-#: gajim/dialogs.py:1045
+#: gajim/dialogs.py:1044
 msgid "an audio"
 msgstr ""
 
-#: gajim/dialogs.py:1047
+#: gajim/dialogs.py:1046
 msgid "a video"
 msgstr ""
 
-#: gajim/dialogs.py:1051
+#: gajim/dialogs.py:1050
 #, python-format
 msgid ""
-"%(contact)s wants to start %(type)s session with you. Do you want to answer "
+"%(contact)s wants to start a %(type)s chat with you. Do you want to answer "
 "the call?"
 msgstr ""
 
-#: gajim/groupchat_control.py:505
+#: gajim/groupchat_control.py:511
 #, fuzzy, python-format
 msgid "Send File (max. %s MiB)…"
 msgstr "Enrollañ ar restr dindan..."
 
-#: gajim/groupchat_control.py:507 gajim/chat_control.py:342
+#: gajim/groupchat_control.py:513 gajim/chat_control.py:344
 #, fuzzy
 msgid "No File Transfer available"
 msgstr "Treuzkasoù"
 
-#: gajim/groupchat_control.py:630 gajim/groupchat_control.py:2349
-msgid "Changing Subject"
-msgstr "Cheñch ar sujed"
-
-#: gajim/groupchat_control.py:631 gajim/groupchat_control.py:2350
-msgid "Please specify the new subject:"
-msgstr "Skrivit ar sujed nevez:"
-
-#: gajim/groupchat_control.py:638
-msgid "Changing Nickname"
-msgstr "Cheñch lesanv"
-
-#: gajim/groupchat_control.py:639
-msgid "Please specify the new nickname you want to use:"
-msgstr "Skrivit al lesanv nevez a fell deoc'h implij:"
-
-#: gajim/groupchat_control.py:657
+#: gajim/groupchat_control.py:655
 #, fuzzy
-msgid "Invalid group chat JID"
+msgid "Invalid group chat XMPP Address"
 msgstr "ID jabber direizh"
 
-#: gajim/groupchat_control.py:658
+#: gajim/groupchat_control.py:656
 #, fuzzy
-msgid "The group chat JID has not allowed characters."
+msgid "The group chat XMPP Address has not allowed characters."
 msgstr "Bez ez eus arouezioù difennet en anv ar sal pe hini ar servijer."
 
-#: gajim/groupchat_control.py:758 gajim/gtk/profile.py:136
+#: gajim/groupchat_control.py:743 gajim/gtk/profile.py:136
 msgid "Could not load image"
 msgstr "Dibosupl eo kargañ ar skeudenn"
 
-#: gajim/groupchat_control.py:888
+#: gajim/groupchat_control.py:873
 #, fuzzy
 msgid "Insert Nickname"
 msgstr "Cheñch _lesanv"
 
-#: gajim/groupchat_control.py:1056 gajim/chat_control.py:824
+#: gajim/groupchat_control.py:1041 gajim/chat_control.py:848
 #, fuzzy
 msgid "and authenticated"
 msgstr "Implij an diskleriañ"
 
-#: gajim/groupchat_control.py:1060 gajim/chat_control.py:828
+#: gajim/groupchat_control.py:1045 gajim/chat_control.py:852
 #, fuzzy
 msgid "and NOT authenticated"
 msgstr "Implij an diskleriañ"
 
-#: gajim/groupchat_control.py:1064
+#: gajim/groupchat_control.py:1049
 #, python-format
 msgid "%(type)s encryption is active %(authenticated)s."
 msgstr ""
 
-#: gajim/groupchat_control.py:1111
+#: gajim/groupchat_control.py:1096
 #, fuzzy
 msgid "Conversation with "
 msgstr "Istoradur ar gaoz"
 
-#: gajim/groupchat_control.py:1113
+#: gajim/groupchat_control.py:1098
 #, fuzzy
 msgid "Continued conversation"
 msgstr "Kevreadenn"
 
-#: gajim/groupchat_control.py:1411
+#: gajim/groupchat_control.py:1357
 #, 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:1433
-msgid "Room now shows unavailable members"
+#: gajim/groupchat_control.py:1374
+msgid "Group chat now shows unavailable members"
 msgstr ""
 
-#: gajim/groupchat_control.py:1436
-msgid "Room now does not show unavailable members"
-msgstr ""
+#: gajim/groupchat_control.py:1377
+#, fuzzy
+msgid "Group chat now does not show unavailable members"
+msgstr "Ce salon n'existe pas."
 
-#: gajim/groupchat_control.py:1439
+#: gajim/groupchat_control.py:1380
 msgid "A setting not related to privacy has been changed"
 msgstr ""
 
-#: gajim/groupchat_control.py:1446
-msgid "Room logging is now enabled"
-msgstr ""
+#: gajim/groupchat_control.py:1387 gajim/groupchat_control.py:1659
+#, fuzzy
+msgid "Conversations are stored on the server"
+msgstr "N'oc'h ket luget d'ar servijer"
 
-#: gajim/groupchat_control.py:1449
-msgid "Room logging is now disabled"
-msgstr ""
+#: gajim/groupchat_control.py:1390
+#, fuzzy
+msgid "Conversations are not stored on the server"
+msgstr "Titouroù diwar ho penn, miret war ar servijer"
 
-#: gajim/groupchat_control.py:1452
-msgid "Room is now non-anonymous"
-msgstr ""
+#: gajim/groupchat_control.py:1393
+#, fuzzy
+msgid "Group chat is now non-anonymous"
+msgstr "Flapoù a-stroll"
 
-#: gajim/groupchat_control.py:1456
-msgid "Room is now semi-anonymous"
-msgstr ""
+#: gajim/groupchat_control.py:1397
+#, fuzzy
+msgid "Group chat is now semi-anonymous"
+msgstr "Message d'un Salon mis en Sur-brillance"
 
-#: gajim/groupchat_control.py:1460
-msgid "Room is now fully anonymous"
-msgstr ""
+#: gajim/groupchat_control.py:1401
+#, fuzzy
+msgid "Group chat is now fully anonymous"
+msgstr "Flapoù a-stroll"
 
-#: gajim/groupchat_control.py:1500
+#: gajim/groupchat_control.py:1439
 #, python-format
 msgid "Ping? (%s)"
 msgstr ""
 
-#: gajim/groupchat_control.py:1503
+#: gajim/groupchat_control.py:1442
 #, python-format
 msgid "Pong! (%(nick)s %(delay)s s.)"
 msgstr ""
 
-#: gajim/groupchat_control.py:1506 gajim/chat_control.py:1213
+#: gajim/groupchat_control.py:1445 gajim/chat_control.py:1237
 #, fuzzy
 msgid "Error."
 msgstr "Fazi en ur lenn ar restr:"
 
-#: gajim/groupchat_control.py:1711
+#: gajim/groupchat_control.py:1650
 #, fuzzy, python-format
-msgid "You (%s) joined the room"
+msgid "You (%s) joined the group chat"
 msgstr "Er strollad"
 
-#: gajim/groupchat_control.py:1717
-msgid "Any occupant is allowed to see your full JID"
-msgstr ""
-
-#: gajim/groupchat_control.py:1721
-msgid "Room logging is enabled"
+#: gajim/groupchat_control.py:1655
+msgid "Any participant is allowed to see your full XMPP Address"
 msgstr ""
 
-#: gajim/groupchat_control.py:1725
-msgid "The server has assigned or modified your roomnick"
-msgstr ""
+#: gajim/groupchat_control.py:1663
+#, fuzzy
+msgid "The server has assigned or modified your nickname in this group chat"
+msgstr "Cheñch _lesanv"
 
-#: gajim/groupchat_control.py:1732
+#: gajim/groupchat_control.py:1671
 #, fuzzy
-msgid "A new room has been created"
+msgid "A new group chat has been created"
 msgstr "Gant berzh eo bet krouet ho kont nevez!"
 
-#: gajim/groupchat_control.py:1740 gajim/privatechat_control.py:112
+#: gajim/groupchat_control.py:1679 gajim/privatechat_control.py:115
 #, python-format
 msgid "You are now known as %s"
 msgstr "Anavezet oc'h bremañ gant an anv %s"
 
-#: gajim/groupchat_control.py:1742 gajim/privatechat_control.py:114
+#: gajim/groupchat_control.py:1681 gajim/privatechat_control.py:117
 #, fuzzy, python-brace-format
 msgid "{nick} is now known as {new_nick}"
 msgstr "%s a zo bremañ %s"
 
-#: gajim/groupchat_control.py:1767 gajim/privatechat_control.py:141
+#: gajim/groupchat_control.py:1706 gajim/privatechat_control.py:144
 #, fuzzy, python-brace-format
 msgid "You are now {show}{status}"
 msgstr "Anavezet oc'h bremañ gant an anv %s"
 
-#: gajim/groupchat_control.py:1773 gajim/privatechat_control.py:147
+#: gajim/groupchat_control.py:1712 gajim/privatechat_control.py:150
 #, fuzzy, python-brace-format
 msgid "{nick} is now {show}{status}"
 msgstr "%(nick)s a zo bremañ %(status)s"
 
-#: gajim/groupchat_control.py:1790 gajim/groupchat_control.py:1819
-#: gajim/groupchat_control.py:1849 gajim/groupchat_control.py:1909
+#: gajim/groupchat_control.py:1729 gajim/groupchat_control.py:1758
+#: gajim/groupchat_control.py:1788 gajim/groupchat_control.py:1848
 #, python-brace-format
 msgid " by {actor}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1793
+#: gajim/groupchat_control.py:1732
 #, python-brace-format
 msgid "** Your Affiliation has been set to {affiliation}{actor}{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1799
+#: gajim/groupchat_control.py:1738
 #, python-brace-format
 msgid "** Affiliation of {nick} has been set to {affiliation}{actor}{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1822
+#: gajim/groupchat_control.py:1761
 #, fuzzy, python-brace-format
 msgid "** Your Role has been set to {role}{actor}{reason}"
 msgstr "%(nick)s a zo bet skarzhet gant %(who)s : %(reason)s"
 
-#: gajim/groupchat_control.py:1827
+#: gajim/groupchat_control.py:1766
 #, fuzzy, python-brace-format
 msgid "** Role of {nick} has been set to {role}{actor}{reason}"
 msgstr "%(nick)s a zo bet skarzhet gant %(who)s : %(reason)s"
 
-#: gajim/groupchat_control.py:1852
+#: gajim/groupchat_control.py:1791
 #, fuzzy, python-brace-format
-msgid "You have been removed from the room{actor}{reason}"
+msgid "You have been removed from the group chat{actor}{reason}"
 msgstr "%(nick)s a zo bet skarzhet gant %(who)s : %(reason)s"
 
-#: gajim/groupchat_control.py:1857
+#: gajim/groupchat_control.py:1796
 #, python-brace-format
 msgid "You have left due to an error{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1863
+#: gajim/groupchat_control.py:1802
 #, python-brace-format
 msgid "You have been kicked{actor}{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1870
+#: gajim/groupchat_control.py:1809
 #, python-brace-format
 msgid "You have been banned{actor}{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1877 gajim/groupchat_control.py:1943
+#: gajim/groupchat_control.py:1816 gajim/groupchat_control.py:1882
 #, fuzzy
 msgid ": Affiliation changed"
 msgstr "<b>Poelladoù</b>"
 
-#: gajim/groupchat_control.py:1883 gajim/groupchat_control.py:1948
-msgid ": Room configuration changed to members-only"
+#: gajim/groupchat_control.py:1822 gajim/groupchat_control.py:1887
+msgid ": Group chat configuration changed to members-only"
 msgstr ""
 
-#: gajim/groupchat_control.py:1912
+#: gajim/groupchat_control.py:1851
 #, fuzzy, python-brace-format
-msgid "{nick} has been removed from the room{by}{reason}"
+msgid "{nick} has been removed from the group chat{by}{reason}"
 msgstr "%(nick)s a zo bet skarzhet gant %(who)s : %(reason)s"
 
-#: gajim/groupchat_control.py:1922
+#: gajim/groupchat_control.py:1861
 #, python-brace-format
 msgid "{nick} has left due to an error{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1928
+#: gajim/groupchat_control.py:1867
 #, fuzzy, python-brace-format
 msgid "{nick} has been kicked{actor}{reason}"
 msgstr "%(nick)s a zo bet skarzhet : %(reason)s"
 
-#: gajim/groupchat_control.py:1936
+#: gajim/groupchat_control.py:1875
 #, fuzzy, python-brace-format
 msgid "{nick} has been banned{actor}{reason}"
 msgstr "%(nick)s a zo argaset : %(reason)s"
 
-#: gajim/groupchat_control.py:1953
+#: gajim/groupchat_control.py:1892
 #, python-brace-format
 msgid "{nick} has left{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1970
+#: gajim/groupchat_control.py:1914
 #, fuzzy, python-format
 msgid "%s has joined the group chat"
 msgstr "Er strollad"
 
-#: gajim/groupchat_control.py:1985 gajim/groupchat_control.py:1990
-#: gajim/groupchat_control.py:1995 gajim/groupchat_control.py:2000
-#: gajim/groupchat_control.py:2011
+#: gajim/groupchat_control.py:1981
 #, fuzzy
-msgid "Unable to join group chat"
-msgstr "Impossible de rejoindre le salon"
+msgid "Group chat has been destroyed"
+msgstr "Dilamet eo bet an aotre"
 
 #: gajim/groupchat_control.py:1986
 #, fuzzy, python-format
-msgid "You are banned from group chat <b>%s</b>."
-msgstr "Vous êtes banni de ce salon."
-
-#: gajim/groupchat_control.py:1991
-#, fuzzy, python-format
-msgid "Remote server <b>%s</b> does not exist."
-msgstr "Ce salon n'existe pas."
-
-#: gajim/groupchat_control.py:1996
-#, fuzzy, python-format
-msgid "Group chat <b>%s</b> does not exist."
-msgstr "Ce salon n'existe pas."
-
-#: gajim/groupchat_control.py:2001
-#, fuzzy
-msgid "Group chat creation is not permitted."
-msgstr "La création de salon est réservée aux administrateurs."
-
-#: gajim/groupchat_control.py:2005
-#, fuzzy
-msgid "Unable to join groupchat"
-msgstr "Impossible de rejoindre le salon"
-
-#: gajim/groupchat_control.py:2006
-#, fuzzy, python-format
-msgid "You must use your registered nickname in <b>%s</b>."
-msgstr "Vous devez utiliser le surnom donné lors de l'enregistrement."
-
-#: gajim/groupchat_control.py:2012
-#, fuzzy, python-format
-msgid "You are not in the members list in groupchat %s."
-msgstr "Vous n'êtes pas dans la liste des membres."
-
-#: gajim/groupchat_control.py:2068
-#, fuzzy
-msgid "Room has been destroyed"
-msgstr "Dilamet eo bet an aotre"
-
-#: gajim/groupchat_control.py:2073
-#, python-format
-msgid "You can join this room instead: xmpp:%s?join"
-msgstr ""
+msgid "You can join this group chat instead: xmpp:%s?join"
+msgstr "Er strollad"
 
-#: gajim/groupchat_control.py:2306
+#: gajim/groupchat_control.py:2214
 #, fuzzy
 msgid "Leave Group Chat"
 msgstr "Flap a-stroll"
 
-#: gajim/groupchat_control.py:2307
+#: gajim/groupchat_control.py:2215
 #, fuzzy
 msgid "Are you sure you want to leave this group chat?"
 msgstr "Ha sur oc'h e fell deoc'h kuitaat ar flap \"%s\"?"
 
-#: gajim/groupchat_control.py:2308
+#: gajim/groupchat_control.py:2216
 #, fuzzy, python-format
-msgid "If you close this window, you will be disconnected from '%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:2314
+#: gajim/groupchat_control.py:2222 gajim/roster_window.py:5177
 msgid "_Leave"
 msgstr ""
 
-#: gajim/groupchat_control.py:2377
+#: gajim/groupchat_control.py:2280 gajim/roster_window.py:3008
 #, 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/groupchat_control.py:2527
+#: gajim/groupchat_control.py:2463
 #, python-format
 msgid "Kicking %s"
 msgstr "Skarzhañ %s"
 
-#: gajim/groupchat_control.py:2528 gajim/groupchat_control.py:2829
+#: gajim/groupchat_control.py:2464 gajim/groupchat_control.py:2765
 msgid "You may specify a reason below:"
 msgstr "Bez e c'hellit reiñ un abeg amañ dindan:"
 
-#: gajim/groupchat_control.py:2828
+#: gajim/groupchat_control.py:2764
 #, python-format
 msgid "Banning %s"
 msgstr "Argas %s"
 
-#: gajim/chat_control.py:408
+#: gajim/chat_control.py:432
 #, fuzzy
 msgid "Show a list of formattings"
 msgstr "Klikit evit enlakaat ur boulomell (Alt+M)"
 
-#: gajim/chat_control.py:412
+#: gajim/chat_control.py:436
 #, fuzzy
 msgid "This contact does not support HTML"
 msgstr "Ur roll eus an treuzkasoù oberiant, echu pe arsavet"
 
-#: gajim/chat_control.py:562
+#: gajim/chat_control.py:586
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr ""
 
-#: gajim/chat_control.py:686
+#: gajim/chat_control.py:710
 #, fuzzy, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s : %(message)s"
 
-#: gajim/chat_control.py:832
+#: gajim/chat_control.py:856
 #, python-format
 msgid "%(type)s encryption is active %(authenticated)s"
 msgstr ""
 
-#: gajim/chat_control.py:1160 gajim/chat_control.py:1168
+#: gajim/chat_control.py:1184 gajim/chat_control.py:1192
 #, fuzzy
 msgid "Close"
 msgstr "_Kas & Serriñ"
 
-#: gajim/chat_control.py:1161
+#: gajim/chat_control.py:1185
 #, fuzzy, python-format
 msgid "You just received a new message from %s"
 msgstr "O paouez resev ur gemennadenn nevez digant \"%s\" emaoc'h"
 
-#: gajim/chat_control.py:1163
+#: gajim/chat_control.py:1187
 #, fuzzy
 msgid ""
 "If you close this tab while having chat history disabled, this message will "
@@ -1199,16 +1162,16 @@ msgstr ""
 "Ma serrit ar prenestr-mañ ha n'eo ket enaouet an istoradur, e vo kollet ar "
 "gemennadenn."
 
-#: gajim/chat_control.py:1208
+#: gajim/chat_control.py:1232
 msgid "Ping?"
 msgstr ""
 
-#: gajim/chat_control.py:1211
+#: gajim/chat_control.py:1235
 #, python-format
 msgid "Pong! (%s seconds)"
 msgstr ""
 
-#: gajim/chat_control.py:1308
+#: gajim/chat_control.py:1332
 #, fuzzy, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -1217,278 +1180,285 @@ msgstr ""
 "Titl : %s\n"
 "%s"
 
-#: gajim/chat_control.py:1416
+#: gajim/chat_control.py:1440
 #, fuzzy, python-format
 msgid "%(name)s is now %(show)s %(status)s"
 msgstr "%(nick)s a zo bremañ %(status)s"
 
-#: gajim/chat_control.py:1476 gajim/data/gui/application_menu.ui:32
+#: gajim/chat_control.py:1500 gajim/data/gui/application_menu.ui:32
 #: gajim/gtk/http_upload_progress.py:35
 #, fuzzy
 msgid "File Transfer"
 msgstr "Treuzkasoù"
 
-#: gajim/chat_control.py:1480
+#: gajim/chat_control.py:1504
 #, fuzzy
 msgid "Size"
 msgstr "Taille : "
 
-#: gajim/chat_control.py:1482 gajim/chat_control.py:1546
+#: gajim/chat_control.py:1506 gajim/chat_control.py:1566
+#: gajim/gui_interface.py:190
 #: gajim/data/gui/groupchat_invitation_received.ui:77
-#: gajim/gtk/filetransfer.py:485
+#: gajim/gtk/filetransfer.py:490
 #, fuzzy
 msgid "_Accept"
 msgstr "Asantiñ"
 
-#: gajim/chat_control.py:1484 gajim/chat_control.py:1548
+#: gajim/chat_control.py:1508 gajim/chat_control.py:1568
 #: gajim/data/gui/groupchat_invitation_received.ui:62
 #, fuzzy
 msgid "_Decline"
 msgstr "_Ezlinenn"
 
-#: gajim/chat_control.py:1506 gajim/gui_interface.py:791
-#: gajim/gui_interface.py:821 gajim/gui_interface.py:847
+#: gajim/chat_control.py:1530 gajim/gui_interface.py:777
+#: gajim/gui_interface.py:807 gajim/gui_interface.py:833
 #: gajim/gtk/notification.py:173 gajim/gtk/notification.py:278
 msgid "File Transfer Completed"
 msgstr "Echu an treuzkasadenn"
 
-#: gajim/chat_control.py:1510 gajim/gtk/filetransfer.py:259
+#: gajim/chat_control.py:1534 gajim/gtk/filetransfer.py:258
 #, fuzzy
 msgid "Open _Folder"
 msgstr "_Digeriñ ar renkell pal"
 
-#: gajim/chat_control.py:1512 gajim/chat_control.py:1521
+#: gajim/chat_control.py:1536 gajim/chat_control.py:1545
+#: gajim/data/gui/groupchat_control.ui:962
+#: gajim/data/gui/groupchat_control.ui:1049
+#: gajim/data/gui/groupchat_control.ui:1155
 #, fuzzy
 msgid "_Close"
 msgstr "_Kas & Serriñ"
 
-#: gajim/chat_control.py:1543 gajim/gui_interface.py:484
+#: gajim/chat_control.py:1563 gajim/gui_interface.py:473
+#: gajim/data/gui/groupchat_invitation_received.ui:42
 #: gajim/gtk/notification.py:174 gajim/gtk/notification.py:195
 #: gajim/gtk/notification.py:281
-msgid "Groupchat Invitation"
+#, fuzzy
+msgid "Group Chat Invitation"
 msgstr "Pedadenn evit ur sal-flapiñ"
 
-#: gajim/chat_control.py:1568 gajim/roster_window.py:1954
+#: gajim/chat_control.py:1588 gajim/roster_window.py:1951
 #, fuzzy
 msgid "Remote contact stopped transfer"
 msgstr "Dilemel an darempred diouzh ar roll"
 
-#: gajim/chat_control.py:1570 gajim/roster_window.py:1956
+#: gajim/chat_control.py:1590 gajim/roster_window.py:1953
 #, fuzzy
 msgid "Error opening file"
 msgstr "Fazi en ur lenn ar restr:"
 
-#: gajim/chat_control.py:1572 gajim/gtk/filetransfer.py:297
+#: gajim/chat_control.py:1592 gajim/gtk/filetransfer.py:296
 #, fuzzy
 msgid "File transfer stopped"
 msgstr "Sac'het an treuzkas"
 
-#: gajim/chat_control.py:1575 gajim/gtk/filetransfer.py:275
-#: gajim/gtk/filetransfer.py:284
+#: gajim/chat_control.py:1595 gajim/gtk/filetransfer.py:274
+#: gajim/gtk/filetransfer.py:283
 #, fuzzy
 msgid "File transfer cancelled"
 msgstr "Nullet eo bet an treuzkas"
 
-#: gajim/chat_control.py:1576
+#: gajim/chat_control.py:1596
 msgid "Connection with peer cannot be established."
 msgstr "N'eus ket tu seveniñ al lugadenn gant an darempred."
 
-#: gajim/application.py:72
+#: gajim/application.py:75
 #, fuzzy
 msgid "Show the application's version"
 msgstr "_Implij an arlun-gelaouiñ (trayicon)"
 
-#: gajim/application.py:79
+#: gajim/application.py:82
 #, fuzzy
 msgid "Show only critical errors"
 msgstr "Diskouez er _roll hepken"
 
-#: gajim/application.py:86
+#: gajim/application.py:89
 msgid "Separate profile files completely (even history database and plugins)"
 msgstr ""
 
-#: gajim/application.py:94
+#: gajim/application.py:97
 msgid "Print XML stanzas and other debug information"
 msgstr ""
 
-#: gajim/application.py:101
+#: gajim/application.py:104
 #, fuzzy
 msgid "Use defined profile in configuration directory"
 msgstr "Aozer kefluniañ dre ar munut"
 
-#: gajim/application.py:109
+#: gajim/application.py:112
 #, fuzzy
 msgid "Set configuration directory"
 msgstr "Kefluniañ ar webgaoz"
 
-#: gajim/application.py:117
+#: gajim/application.py:120
 msgid "Configure logging system"
 msgstr ""
 
-#: gajim/application.py:125
+#: gajim/application.py:128
 #, fuzzy
 msgid "Show all warnings"
 msgstr "Diskouez an holl _zarvoudoù o c'hortoz"
 
-#: gajim/application.py:132
+#: gajim/application.py:135
 msgid "Open IPython shell"
 msgstr ""
 
-#: gajim/application.py:139
+#: gajim/application.py:142
 #, 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:145 gajim/data/gui/shortcuts_window.ui:203
+#: gajim/application.py:148 gajim/data/gui/shortcuts_window.ui:203
 #: data/org.gajim.Gajim.desktop.in:21
 #, fuzzy
 msgid "Start a new chat"
 msgstr "Kregiñ da flapiñ"
 
-#: gajim/application.py:152
+#: gajim/application.py:155
 msgid "Simulate loss of connectivity"
 msgstr ""
 
-#: gajim/application.py:159
+#: gajim/application.py:162
 msgid "Simulate regaining connectivity"
 msgstr ""
 
-#: gajim/application.py:201 gajim/gui_interface.py:133
+#: gajim/application.py:204 gajim/gui_interface.py:133
 msgid "Database Error"
 msgstr ""
 
-#: gajim/roster_window.py:294 gajim/roster_window.py:1030
+#: gajim/roster_window.py:291 gajim/roster_window.py:1027
 msgid "Merged accounts"
 msgstr "Kontoù strollet"
 
-#: gajim/roster_window.py:853 gajim/roster_window.py:1631
-#: gajim/roster_window.py:1664 gajim/roster_window.py:1715
-#: gajim/roster_window.py:1717 gajim/roster_window.py:1872
-#: gajim/roster_window.py:2531 gajim/roster_window.py:5025
-#: gajim/common/contacts.py:188 gajim/common/contacts.py:447
-#: gajim/common/helpers.py:83 gajim/gtk/discovery.py:129
-#: gajim/gtk/discovery.py:130 gajim/gtk/discovery.py:1416
+#: gajim/roster_window.py:850 gajim/roster_window.py:1628
+#: gajim/roster_window.py:1661 gajim/roster_window.py:1712
+#: gajim/roster_window.py:1714 gajim/roster_window.py:1869
+#: gajim/roster_window.py:2528 gajim/roster_window.py:4331
+#: gajim/roster_window.py:4964 gajim/common/contacts.py:204
+#: gajim/common/contacts.py:463 gajim/common/helpers.py:86
+#: gajim/gtk/discovery.py:127 gajim/gtk/discovery.py:128
+#: gajim/gtk/discovery.py:1414
 msgid "Transports"
 msgstr "Dorioù"
 
-#: gajim/roster_window.py:1723 gajim/roster_window.py:1725
-#: gajim/roster_window.py:4995 gajim/gui_interface.py:1613
-#: gajim/gui_interface.py:1639 gajim/common/contacts.py:186
-#: gajim/common/helpers.py:83 gajim/common/modules/adhoc_commands.py:245
+#: gajim/roster_window.py:1720 gajim/roster_window.py:1722
+#: gajim/roster_window.py:4331 gajim/roster_window.py:4934
+#: gajim/gui_interface.py:1527 gajim/common/contacts.py:202
+#: gajim/common/helpers.py:86 gajim/common/modules/adhoc_commands.py:245
 #, fuzzy
-msgid "Groupchats"
+msgid "Group chats"
 msgstr "Flapoù a-stroll"
 
-#: gajim/roster_window.py:2012
+#: gajim/roster_window.py:2009
 #, fuzzy
 msgid "Authorization sent"
 msgstr "Kaset eo bet an aotre"
 
-#: gajim/roster_window.py:2013
+#: gajim/roster_window.py:2010
 #, fuzzy, python-format
 msgid "\"%s\" will now see your status."
 msgstr "Anavezout a raio \"%s\" ho stad adalek bremañ."
 
-#: gajim/roster_window.py:2031
+#: gajim/roster_window.py:2028
 msgid "Subscription request has been sent"
 msgstr "Kaset eo bet ar goulenn goumanantiñ"
 
-#: gajim/roster_window.py:2032
-#, python-format
-msgid "If \"%s\" accepts this request you will know his or her status."
+#: gajim/roster_window.py:2029
+#, 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:2046
+#: gajim/roster_window.py:2043
 #, fuzzy
 msgid "Authorization removed"
 msgstr "Dilamet eo bet an aotre"
 
-#: gajim/roster_window.py:2047
+#: gajim/roster_window.py:2044
 #, 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."
 
-#: gajim/roster_window.py:2250 gajim/roster_window.py:3504
+#: gajim/roster_window.py:2247 gajim/roster_window.py:3460
 msgid "Disconnect for Invisibility"
 msgstr ""
 
-#: gajim/roster_window.py:2251 gajim/roster_window.py:3505
+#: gajim/roster_window.py:2248 gajim/roster_window.py:3461
 msgid "You are participating in one or more group chats"
 msgstr "Kemer a rit perzh e unan pe meur a webgaoz"
 
-#: gajim/roster_window.py:2252 gajim/roster_window.py:3506
+#: gajim/roster_window.py:2249 gajim/roster_window.py:3462
 #, fuzzy
 msgid ""
-"Changing your status to invisible will result in disconnection from those "
-"group chats.\n"
+"Changing your status to invisible will result in you leaving those group "
+"chats.\n"
 "Are you sure you want to go invisible?"
 msgstr ""
 "Tremen d'ar stad diwelus a lakao ac'hanoc'h da zilugañ diouzh ar webkaozioù-"
 "se. Ha sur oc'h e fell deoc'h bezañ diwelus?"
 
-#: gajim/roster_window.py:2257 gajim/roster_window.py:3512
-#: gajim/roster_window.py:5238 gajim/data/gui/gc_control_popup_menu.ui:120
+#: gajim/roster_window.py:2254 gajim/roster_window.py:3468
+#: gajim/data/gui/gc_control_popup_menu.ui:120
 #, fuzzy
 msgid "_Disconnect"
 msgstr "Darempred diluget"
 
-#: gajim/roster_window.py:2285
+#: gajim/roster_window.py:2282
 #, fuzzy
 msgid "desynced"
 msgstr "Dre ar munut"
 
-#: gajim/roster_window.py:2353 gajim/data/gui/shortcuts_window.ui:224
+#: gajim/roster_window.py:2350 gajim/data/gui/shortcuts_window.ui:224
 #, fuzzy
 msgid "Quit Gajim"
 msgstr "Gajim"
 
-#: gajim/roster_window.py:2354
+#: gajim/roster_window.py:2351
 #, fuzzy
 msgid "You are about to quit Gajim"
 msgstr "Êtes-vous sûr de vouloir quitter les salons \"%s\" ?"
 
-#: gajim/roster_window.py:2355
+#: gajim/roster_window.py:2352
 #, fuzzy
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Êtes-vous sûr de vouloir quitter les salons \"%s\" ?"
 
-#: gajim/roster_window.py:2356
+#: gajim/roster_window.py:2353
 msgid "_Always quit when closing Gajim"
 msgstr ""
 
-#: gajim/roster_window.py:2359 gajim/roster_window.py:2455
-#: gajim/roster_window.py:2495 gajim/data/gui/systray_context_menu.ui:90
+#: gajim/roster_window.py:2356 gajim/roster_window.py:2452
+#: gajim/roster_window.py:2492 gajim/data/gui/systray_context_menu.ui:83
 #, fuzzy
 msgid "_Quit"
 msgstr "_Kuitaat"
 
-#: gajim/roster_window.py:2448
+#: gajim/roster_window.py:2445
 #, fuzzy
 msgid "Stop File Transfers"
 msgstr "Treuzkasoù"
 
-#: gajim/roster_window.py:2449
+#: gajim/roster_window.py:2446
 #, fuzzy
 msgid "You still have running file transfers"
 msgstr "Nullañ an treuzkas"
 
-#: gajim/roster_window.py:2450
+#: gajim/roster_window.py:2447
 msgid ""
 "If you quit now, the file(s) being transferred will be lost.\n"
 "Do you still want to quit?"
 msgstr ""
 
-#: gajim/roster_window.py:2488
+#: gajim/roster_window.py:2485
 #, fuzzy
 msgid "Unread Messages"
 msgstr "Darvoudoù chomet dilenn"
 
-#: gajim/roster_window.py:2489
+#: gajim/roster_window.py:2486
 #, fuzzy
 msgid "You still have unread messages"
 msgstr "Kemennadennoù nevez ho peus"
 
-#: gajim/roster_window.py:2490
+#: gajim/roster_window.py:2487
 #, fuzzy
 msgid ""
 "Messages will only be available for reading them later if storing chat "
@@ -1496,21 +1466,21 @@ msgid ""
 msgstr ""
 "Posubl e vo lenn ar gemennadennoù diwezhatoc'h m'emañ an istoradur war enaou."
 
-#: gajim/roster_window.py:2760
+#: gajim/roster_window.py:2753
 msgid "You have unread messages"
 msgstr "Kemennadennoù nevez ho peus"
 
-#: gajim/roster_window.py:2761
+#: gajim/roster_window.py:2754
 #, fuzzy
 msgid "You must read them before removing this transport."
 msgstr "Lennit an holl zarvoudoù a-raok lemel ar gont-mañ."
 
-#: gajim/roster_window.py:2764
+#: gajim/roster_window.py:2757
 #, fuzzy, python-format
 msgid "Transport '%s' will be removed"
 msgstr "Dilamet e vo an nor \"%s\""
 
-#: gajim/roster_window.py:2765
+#: gajim/roster_window.py:2758
 #, fuzzy
 msgid ""
 "You will no longer be able to send and receive messages from and to contacts "
@@ -1519,12 +1489,12 @@ msgstr ""
 "N'helloc'h ket mui kas pe resev kemennadennoù d'an darempredoù liammet gant "
 "an nor-mañ."
 
-#: gajim/roster_window.py:2768
+#: gajim/roster_window.py:2761
 #, fuzzy
 msgid "Transports will be removed"
 msgstr "Dilamet e vo an nor \"%s\""
 
-#: gajim/roster_window.py:2773
+#: gajim/roster_window.py:2766
 #, fuzzy, python-format
 msgid ""
 "You will no longer be able to send and receive messages from and to contacts "
@@ -1534,88 +1504,83 @@ msgstr ""
 "N'helloc'h ket mui kas pe resev kemennadennoù d'an darempredoù liammet gant "
 "an nor-mañ."
 
-#: gajim/roster_window.py:2777
+#: gajim/roster_window.py:2770
 #, fuzzy
 msgid "Remove Transport"
 msgstr "Dorioù"
 
-#: gajim/roster_window.py:2844
+#: gajim/roster_window.py:2837
 #, fuzzy
 msgid "Block Contact"
 msgstr "Darempredoù"
 
-#: gajim/roster_window.py:2845
+#: gajim/roster_window.py:2838
 #, fuzzy
 msgid "Really block this contact?"
 msgstr "N'eus ket tu da implij OpenPGP war an urzhiataer-mañ"
 
-#: gajim/roster_window.py:2846
+#: gajim/roster_window.py:2839
 msgid ""
 "This contact will see you offline and you will not receive any messages sent "
 "to you by this contact."
 msgstr ""
 
-#: gajim/roster_window.py:2851
+#: gajim/roster_window.py:2844
 #, fuzzy
 msgid "_Block Contact"
 msgstr "Darempredoù"
 
-#: gajim/roster_window.py:2896
+#: gajim/roster_window.py:2889
 #, fuzzy
 msgid "Rename Contact"
 msgstr "Darempredoù"
 
-#: gajim/roster_window.py:2897
+#: gajim/roster_window.py:2890
 #, fuzzy, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Roit ho ker-kuzh GPG evit ar gont %s."
 
-#: gajim/roster_window.py:2904
+#: gajim/roster_window.py:2897
 #, fuzzy
 msgid "Rename Group"
 msgstr "_Adenvel"
 
-#: gajim/roster_window.py:2905
+#: gajim/roster_window.py:2898
 #, fuzzy, python-format
 msgid "Enter a new name for group %s"
 msgstr "Roit ho ker-kuzh GPG evit ar gont %s."
 
-#: gajim/roster_window.py:2953 gajim/roster_window.py:2954
+#: gajim/roster_window.py:2946 gajim/roster_window.py:2947
 #, fuzzy
 msgid "Remove Group"
 msgstr "_Dilemel"
 
-#: gajim/roster_window.py:2955
+#: gajim/roster_window.py:2948
 #, fuzzy, python-format
 msgid "Do you want to remove %s from the contact list?"
 msgstr "Fellout a ra din emezelañ evit krouiñ ur gont"
 
-#: gajim/roster_window.py:2956
+#: gajim/roster_window.py:2949
 #, fuzzy
 msgid "_Also remove all contacts of this group from contact list"
 msgstr "Dilemel an darempred diouzh ar roll"
 
-#: gajim/roster_window.py:3044
-#, fuzzy, python-format
-msgid "%(jid)s has been invited in this room"
-msgstr "%(nick)s a zo bet skarzhet gant %(who)s : %(reason)s"
-
-#: gajim/roster_window.py:3353
+#: gajim/roster_window.py:3309
 #, fuzzy
 msgid "Remove Contact"
 msgstr "Darempredoù"
 
-#: gajim/roster_window.py:3354
+#: gajim/roster_window.py:3310
 #, fuzzy
 msgid "Remove contact from contact list"
 msgstr "Dilemel an darempred diouzh ar roll"
 
-#: gajim/roster_window.py:3355
+#: gajim/roster_window.py:3311
 #, python-format
 msgid "You are about to remove '%(name)s' (%(jid)s) from your contact list.\n"
 msgstr ""
 
-#: gajim/roster_window.py:3364 gajim/roster_window.py:3384
+#: gajim/roster_window.py:3320 gajim/roster_window.py:3340
 #, fuzzy
 msgid ""
 "By removing this contact you also remove authorization. This means the "
@@ -1624,22 +1589,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:3375
+#: gajim/roster_window.py:3331
 #, fuzzy
 msgid "Do you want to continue?"
 msgstr "Petra a fell deoc'h ober?"
 
-#: gajim/roster_window.py:3386
+#: gajim/roster_window.py:3342
 #, 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:3393
+#: gajim/roster_window.py:3349
 #, fuzzy
 msgid "Remove contacts from contact list"
 msgstr "Dilemel an darempred diouzh ar roll"
 
-#: gajim/roster_window.py:3399
+#: gajim/roster_window.py:3355
 #, fuzzy, python-format
 msgid ""
 "By removing the following contacts, you will also remove authorization. This "
@@ -1650,166 +1615,156 @@ 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:3403
+#: gajim/roster_window.py:3359
 #, fuzzy
 msgid "Remove Contacts"
 msgstr "Darempredoù"
 
-#: gajim/roster_window.py:3423
+#: gajim/roster_window.py:3379
 msgid "No account available"
 msgstr "Kont ebet hegerz"
 
-#: gajim/roster_window.py:3424
+#: gajim/roster_window.py:3380
 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:4060
+#: gajim/roster_window.py:4011
 msgid "Metacontacts storage not supported by your server"
 msgstr ""
 
-#: gajim/roster_window.py:4062
+#: gajim/roster_window.py:4013
 msgid ""
 "Your server does not support storing metacontacts information. So this "
 "information will not be saved on next reconnection."
 msgstr ""
 
-#: gajim/roster_window.py:4159
+#: gajim/roster_window.py:4110
 #, 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:4160
+#: gajim/roster_window.py:4111
 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:4164
+#: gajim/roster_window.py:4115
 #, fuzzy
 msgid "Create Metacontact"
 msgstr "Darempredoù"
 
-#: gajim/roster_window.py:4170
+#: gajim/roster_window.py:4121 gajim/data/gui/groupchat_creation.ui:317
 #, fuzzy
 msgid "_Create"
 msgstr "Dizoberiant"
 
-#: gajim/roster_window.py:4287
+#: gajim/roster_window.py:4238
 #, fuzzy
 msgid "Invalid file URI:"
 msgstr "Restr direizh"
 
-#: gajim/roster_window.py:4298
+#: gajim/roster_window.py:4249
 #, fuzzy
 msgid "Send file?"
 msgstr "Kas ur _restr"
 
-#: gajim/roster_window.py:4299
+#: gajim/roster_window.py:4250
 #, fuzzy, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
 msgstr[0] "Fellout a ra da %s kas deoc'h ur restr:"
 msgstr[1] "Fellout a ra da %s kas deoc'h ur restr:"
 
-#: gajim/roster_window.py:4451
+#: gajim/roster_window.py:4401
 #, fuzzy, python-format
 msgid "Send %(from)s to %(to)s"
 msgstr "Kas %s"
 
-#: gajim/roster_window.py:4464
+#: gajim/roster_window.py:4414
 #, fuzzy, python-format
 msgid "Make %s first contact"
 msgstr "Strollañ %s ha %s"
 
-#: gajim/roster_window.py:4469
+#: gajim/roster_window.py:4419
 #, fuzzy, python-format
 msgid "Make %(contact1)s and %(contact2)s metacontacts"
 msgstr "Strollañ %s ha %s"
 
-#: gajim/roster_window.py:4825 gajim/roster_window.py:4923
+#: gajim/roster_window.py:4775 gajim/roster_window.py:4862
 msgid "_Change Status Message"
 msgstr "_Kemmañ an titour-stad"
 
-#: gajim/roster_window.py:4845
+#: gajim/roster_window.py:4795
 #, fuzzy
 msgid "Publish Tune"
 msgstr "_Embann"
 
-#: gajim/roster_window.py:4856
+#: gajim/roster_window.py:4806
 #, fuzzy
 msgid "Publish Location"
 msgstr "_Embann"
 
-#: gajim/roster_window.py:4868
-#, fuzzy
-msgid "Configure Services…"
-msgstr "_Dizoleiñ ar servijoù..."
-
-#: gajim/roster_window.py:4997
+#: gajim/roster_window.py:4936
 msgid "_Maximize All"
 msgstr ""
 
-#: gajim/roster_window.py:5004 gajim/roster_window.py:5146
+#: gajim/roster_window.py:4943 gajim/roster_window.py:5085
 #, fuzzy
 msgid "Send Group M_essage"
 msgstr "_Kas ur gemennadenn d'ar servijer"
 
-#: gajim/roster_window.py:5011
+#: gajim/roster_window.py:4950
 msgid "To all users"
 msgstr ""
 
-#: gajim/roster_window.py:5015
+#: gajim/roster_window.py:4954
 #, fuzzy
 msgid "To all online users"
 msgstr "Utilisateurs En _Ligne"
 
-#: gajim/roster_window.py:5027 gajim/roster_window.py:5152
+#: gajim/roster_window.py:4966 gajim/roster_window.py:5091
 #: gajim/data/gui/gc_occupants_menu.ui:110
 #: gajim/data/gui/contact_context_menu.ui:36
 msgid "In_vite to"
 msgstr ""
 
-#: gajim/roster_window.py:5162
+#: gajim/roster_window.py:5101
 #, fuzzy
 msgid "_Manage Contacts"
 msgstr "Darempredoù"
 
-#: gajim/roster_window.py:5168
+#: gajim/roster_window.py:5107
 #, fuzzy
 msgid "Edit _Groups…"
 msgstr "Kemmañ ar _strolladoù"
 
-#: gajim/roster_window.py:5189 gajim/data/gui/filetransfers.ui:12
+#: gajim/roster_window.py:5128 gajim/data/gui/filetransfers.ui:12
 #: gajim/data/gui/remove_account_window.ui:134
 msgid "_Remove"
 msgstr "_Dilemel"
 
-#: gajim/roster_window.py:5226
+#: gajim/roster_window.py:5165
 msgid "_Maximize"
 msgstr ""
 
-#: gajim/roster_window.py:5233
+#: gajim/roster_window.py:5172
 #, fuzzy
 msgid "_Reconnect"
 msgstr "Darempred diluget"
 
-#: gajim/roster_window.py:5254 gajim/data/gui/gc_occupants_menu.ui:170
+#: gajim/roster_window.py:5193 gajim/data/gui/gc_occupants_menu.ui:170
 #: gajim/data/gui/gc_control_popup_menu.ui:113
 #: gajim/data/gui/contact_context_menu.ui:205
 msgid "_History"
 msgstr "_Istoradur"
 
-#: gajim/roster_window.py:5335 gajim/data/gui/application_menu.ui:86
+#: gajim/roster_window.py:5274 gajim/data/gui/application_menu.ui:83
 #: gajim/data/gui/history_window.ui:57
 msgid "History Manager"
 msgstr "Merour an istoradur"
 
-#: gajim/roster_window.py:5343
-#, fuzzy
-msgid "_Join New Group Chat"
-msgstr "Ebarzhiñ ur sal-flapiñ"
-
 #: gajim/dataforms_widget.py:585
 #, fuzzy
 msgid "Unable to load image"
@@ -1934,277 +1889,294 @@ msgstr "Sujed: %s\n"
 msgid "Write a message…"
 msgstr "Kemennadenn hiniennel nevez"
 
-#: gajim/message_window.py:250
+#: gajim/message_window.py:356
+#, fuzzy
+msgid "Close Tabs"
+msgstr "_Kas & Serriñ"
+
+#: gajim/message_window.py:357
 #, fuzzy
 msgid "You are going to close several tabs"
 msgstr "N'oc'h ket luget d'ar servijer"
 
-#: gajim/message_window.py:251
+#: gajim/message_window.py:358
 #, fuzzy
 msgid "Do you really want to close them all?"
 msgstr "Ha fellout a ra deoc'h da vat diverkañ ar gemennadenn ziuzet?"
 
-#: gajim/message_window.py:539
+#: gajim/message_window.py:514
 #, fuzzy
 msgid "?Noun:Chats"
 msgstr "Flapoù a-stroll"
 
-#: gajim/message_window.py:543
+#: gajim/message_window.py:518
 #, fuzzy
 msgid "Group Chats"
 msgstr "_Webkaozioù"
 
-#: gajim/message_window.py:547
+#: gajim/message_window.py:522
 msgid "Private Chats"
 msgstr "Flapoù prevez"
 
-#: gajim/message_window.py:553
+#: gajim/message_window.py:528
 msgid "Messages"
 msgstr "Kemennadennoù"
 
-#: gajim/gui_interface.py:173
+#: gajim/gui_interface.py:170
+#, 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:175
 msgid "Do you accept this request?"
 msgstr "Degemer a rit ar goulenn-mañ?"
 
-#: gajim/gui_interface.py:175
+#: gajim/gui_interface.py:177
 #, fuzzy, python-format
-msgid "Do you accept this request on account %s?"
+msgid "Do you accept this request (account: %s)?"
 msgstr "Degemer a rit ar goulenn-mañ?"
 
-#: gajim/gui_interface.py:178
-#, 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:182
+#, fuzzy
+msgid "Authorization"
+msgstr "Kaset eo bet an aotre"
+
+#: gajim/gui_interface.py:186 gajim/gui_interface.py:420
+#: gajim/gtk/filetransfer.py:338
+#, fuzzy
+msgid "_No"
+msgstr "Hini ebet"
 
-#: gajim/gui_interface.py:194 gajim/gtk/notification.py:175
+#: gajim/gui_interface.py:205 gajim/gtk/notification.py:175
 #: gajim/gtk/notification.py:197
 #, fuzzy
 msgid "Connection Failed"
 msgstr "Kevreadenn"
 
-#: gajim/gui_interface.py:279 gajim/gui_interface.py:529
-msgid "Password Required"
-msgstr "Ger-kuzh ret"
-
-#: gajim/gui_interface.py:280
-#, fuzzy, python-format
-msgid "A Password is required to join the room %s. Please type it."
-msgstr "Un mot de passe est requis pour rejoindre ce salon."
-
-#: gajim/gui_interface.py:342 gajim/gui_interface.py:346
+#: gajim/gui_interface.py:325 gajim/gui_interface.py:329
 #, fuzzy, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr "%(nickname)s : %(message)s"
 
-#: gajim/gui_interface.py:357 gajim/gui_interface.py:376
+#: gajim/gui_interface.py:340 gajim/gui_interface.py:359
 #: gajim/common/modules/message.py:122
 #, fuzzy, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "fazi en ur gas %s ( %s )"
 
-#: gajim/gui_interface.py:401 gajim/gtk/notification.py:175
+#: gajim/gui_interface.py:384 gajim/gtk/notification.py:175
 #, fuzzy
 msgid "Subscription request"
 msgstr "Goulenn koumanantiñ"
 
-#: gajim/gui_interface.py:413 gajim/common/contacts.py:184
-#: gajim/common/helpers.py:83
+#: gajim/gui_interface.py:396 gajim/common/contacts.py:200
+#: gajim/common/helpers.py:86
 msgid "Observers"
 msgstr "Sellerien"
 
-#: gajim/gui_interface.py:422
+#: gajim/gui_interface.py:405
 msgid "Authorization accepted"
 msgstr "Aotre degmeret"
 
-#: gajim/gui_interface.py:423
+#: gajim/gui_interface.py:406
 #, 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:431
-#, python-format
-msgid "Contact \"%s\" removed subscription from you"
+#: gajim/gui_interface.py:415
+#, fuzzy
+msgid "Subscription Removed"
+msgstr "Goulenn koumanantiñ"
+
+#: gajim/gui_interface.py:416
+#, fuzzy, python-format
+msgid "Contact '%s' removed subscription from you"
 msgstr "Dilamet eo bet ho aotre digant \"%s\""
 
-#: gajim/gui_interface.py:432
+#: gajim/gui_interface.py:417
 msgid ""
-"You will always see them as offline.\n"
+"You will always see this contact as offline.\n"
 "Do you want to remove them from your contact list?"
 msgstr ""
 
-#: gajim/gui_interface.py:453 gajim/gtk/notification.py:176
+#: gajim/gui_interface.py:442 gajim/gtk/notification.py:176
 #, fuzzy
 msgid "Unsubscribed"
 msgstr "_Koumanantiñ"
 
-#: gajim/gui_interface.py:465
+#: gajim/gui_interface.py:454
 #, python-format
 msgid "%(jid)s declined the invitation: %(reason)s"
 msgstr ""
 
-#: gajim/gui_interface.py:469
+#: gajim/gui_interface.py:458
 #, python-format
 msgid "%(jid)s declined the invitation"
 msgstr ""
 
-#: gajim/gui_interface.py:485
+#: gajim/gui_interface.py:474
 #, fuzzy, python-brace-format
 msgid "You are invited to {room} by {user}"
 msgstr "Vous êtes banni de ce salon."
 
-#: gajim/gui_interface.py:506
+#: gajim/gui_interface.py:495
 #, fuzzy
 msgid "Certificate Passphrase Required"
 msgstr "Ger-kuzh ret"
 
-#: gajim/gui_interface.py:507
+#: gajim/gui_interface.py:496
 #, 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:516 gajim/gtk/accounts.py:963
+#: gajim/gui_interface.py:505 gajim/gtk/accounts.py:966
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Roit ho ker-kuzh evit ar gont %s"
 
-#: gajim/gui_interface.py:529 gajim/gtk/accounts.py:964
+#: gajim/gui_interface.py:518
+msgid "Password Required"
+msgstr "Ger-kuzh ret"
+
+#: gajim/gui_interface.py:518 gajim/gtk/accounts.py:967
 msgid "Save password"
 msgstr "Enrollañ ar ger-kuzh"
 
-#: gajim/gui_interface.py:601 gajim/gui_interface.py:632
+#: gajim/gui_interface.py:587 gajim/gui_interface.py:618
+#: gajim/gtk/filetransfer.py:332 gajim/gtk/filetransfer.py:333
 #: gajim/gtk/notification.py:173 gajim/gtk/notification.py:276
 msgid "File Transfer Error"
 msgstr "Fazi treuzkas"
 
-#: gajim/gui_interface.py:666
+#: gajim/gui_interface.py:652
 #, 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:668 gajim/gtk/filetransfer.py:479
+#: gajim/gui_interface.py:654 gajim/gtk/filetransfer.py:484
 #: gajim/gtk/notification.py:172 gajim/gtk/notification.py:274
 msgid "File Transfer Request"
 msgstr "Goulenn treuzkas"
 
-#: gajim/gui_interface.py:767
+#: gajim/gui_interface.py:753
 #, fuzzy
 msgid "Remote Contact Stopped Transfer"
 msgstr "Dilemel an darempred diouzh ar roll"
 
-#: gajim/gui_interface.py:772
+#: gajim/gui_interface.py:758
 #, fuzzy
 msgid "Error Opening File"
 msgstr "Fazi en ur lenn ar restr:"
 
-#: gajim/gui_interface.py:782
+#: gajim/gui_interface.py:768
 #, fuzzy
 msgid "SSL Certificate Error"
 msgstr "Anv-arveriad-ez direizh"
 
-#: gajim/gui_interface.py:795 gajim/gui_interface.py:826
-#: gajim/gui_interface.py:853 gajim/gtk/notification.py:174
+#: gajim/gui_interface.py:781 gajim/gui_interface.py:812
+#: gajim/gui_interface.py:839 gajim/gtk/notification.py:174
 #: gajim/gtk/notification.py:279
 msgid "File Transfer Stopped"
 msgstr "Sac'het an treuzkas"
 
-#: gajim/gui_interface.py:799
+#: gajim/gui_interface.py:785
 #, fuzzy
 msgid "File Transfer Failed"
 msgstr "Treuzkasoù"
 
-#: gajim/gui_interface.py:822
+#: gajim/gui_interface.py:808
 #, 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:827
+#: gajim/gui_interface.py:813
 #, 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:833
+#: gajim/gui_interface.py:819
 #, 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:848
+#: gajim/gui_interface.py:834
 #, 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:854
+#: gajim/gui_interface.py:840
 #, 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:860
+#: gajim/gui_interface.py:846
 #, 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:971
+#: gajim/gui_interface.py:957
 msgid "Username Conflict"
 msgstr ""
 
-#: gajim/gui_interface.py:972
+#: gajim/gui_interface.py:958
 #, fuzzy
 msgid "Please type a new username for your local account"
 msgstr "<b>Leuniit an titouroù evit ho kont nevez</b>"
 
-#: gajim/gui_interface.py:995
+#: gajim/gui_interface.py:981
 msgid "Resource Conflict"
 msgstr ""
 
-#: gajim/gui_interface.py:996
+#: gajim/gui_interface.py:982
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
 msgstr ""
 
-#: gajim/gui_interface.py:1053
+#: gajim/gui_interface.py:1039
 #, 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:1055
+#: gajim/gui_interface.py:1041
 #, fuzzy
 msgid "Voice Chat Request"
 msgstr "Goulenn treuzkas"
 
-#: gajim/gui_interface.py:1123 gajim/gtk/account_wizard.py:312
+#: gajim/gui_interface.py:1109 gajim/gtk/account_wizard.py:312
 #, fuzzy
 msgid "Certificate Already in File"
 msgstr "Darempred er roll dija"
 
-#: gajim/gui_interface.py:1124 gajim/gtk/account_wizard.py:313
+#: gajim/gui_interface.py:1110 gajim/gtk/account_wizard.py:313
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr ""
 
-#: gajim/gui_interface.py:1145
+#: gajim/gui_interface.py:1131
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid"
 msgstr ""
 
-#: gajim/gui_interface.py:1148
+#: gajim/gui_interface.py:1134
 #, fuzzy, python-format
 msgid ""
 "\n"
 "Unknown SSL error: %d"
 msgstr "Aozadur D-Bus dianav: %s"
 
-#: gajim/gui_interface.py:1150
+#: gajim/gui_interface.py:1136
 #, python-format
 msgid ""
 "\n"
 "SSL Error: <b>%s</b>"
 msgstr ""
 
-#: gajim/gui_interface.py:1155
+#: gajim/gui_interface.py:1141
 msgid "Error verifying SSL certificate"
 msgstr ""
 
-#: gajim/gui_interface.py:1156
+#: gajim/gui_interface.py:1142
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your XMPP server: "
@@ -2212,7 +2184,7 @@ msgid ""
 "Do you still want to connect to this server?"
 msgstr ""
 
-#: gajim/gui_interface.py:1160 gajim/gtk/account_wizard.py:412
+#: gajim/gui_interface.py:1146 gajim/gtk/account_wizard.py:413
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -2222,272 +2194,259 @@ msgid ""
 "%(sha256)s"
 msgstr ""
 
-#: gajim/gui_interface.py:1166
+#: gajim/gui_interface.py:1152
 msgid "Ignore this error for this certificate."
 msgstr ""
 
-#: gajim/gui_interface.py:1174
+#: gajim/gui_interface.py:1160
 #, fuzzy, python-format
 msgid "SSL Certificate Verification for %s"
 msgstr "Oc'h ouzhpennañ ur gelaouenn nevez evit %s"
 
-#: gajim/gui_interface.py:1442 gajim/gtk/join_groupchat.py:235
-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/gui_interface.py:1448
-#, fuzzy
-msgid "JID is not a Groupchat"
-msgstr "A guzha an nozelennoù er prenestr flapiñ"
-
-#: gajim/gui_interface.py:1579
-msgid "This is not a group chat"
-msgstr ""
-
-#: gajim/gui_interface.py:1580
-#, python-format
-msgid ""
-"%(room_jid)s is already in your roster. Please check if %(room_jid)s is a "
-"correct group chat name. If it is, delete it from your roster and try "
-"joining the group chat again."
-msgstr ""
-
-#: gajim/gui_interface.py:1604 gajim/dialog_messages.py:58
+#: gajim/gui_interface.py:1577
 #, fuzzy
 msgid "You cannot join a group chat while you are invisible"
 msgstr "N'hellit ket ebarzhiñ ur webgaoz keit ha m'emaoc'h diwelus."
 
-#: gajim/gui_interface.py:2037
+#: gajim/gui_interface.py:1976
 msgid "Could not save your settings and preferences"
 msgstr "Dibosupl eo enrollañ ho tibarzhioù ha dibaboù"
 
-#: gajim/gui_interface.py:2098
+#: gajim/gui_interface.py:2037
 msgid "Gajim: IPython Console"
 msgstr ""
 
-#: gajim/dialog_messages.py:32
+#: gajim/dialog_messages.py:31 gajim/dialog_messages.py:36
+#: gajim/gtk/single_message.py:305 gajim/gtk/account_wizard.py:229
 #, fuzzy
-msgid "You can not start a new conversation unless you are connected."
-msgstr "N'hellit ket ebarzhiñ ur sal-flapiñ keit ha ma n'oc'h ket luget."
-
-#: gajim/dialog_messages.py:36 gajim/dialog_messages.py:41
-#: gajim/gtk/single_message.py:305 gajim/gtk/join_groupchat.py:211
-#: gajim/gtk/account_wizard.py:229
-#, fuzzy
-msgid "Invalid JID"
-msgstr "ID jabber direizh"
+msgid "Invalid XMPP Address"
+msgstr "Restr direizh"
 
-#: gajim/dialog_messages.py:42 gajim/gtk/single_message.py:306
+#: gajim/dialog_messages.py:37
 #, fuzzy, python-format
-msgid "It is not possible to send a message to %s, this JID is not valid."
+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/dialog_messages.py:47
-msgid "Unread events"
+#: gajim/dialog_messages.py:42
+#, fuzzy
+msgid "Unread Events"
 msgstr "Darvoudoù chomet dilenn"
 
-#: gajim/dialog_messages.py:48
-msgid "Read all pending events before removing this account."
+#: gajim/dialog_messages.py:43
+#, fuzzy
+msgid "Read or acknowledge all pending events before removing this account."
 msgstr "Lennit an holl zarvoudoù a-raok lemel ar gont-mañ."
 
-#: gajim/dialog_messages.py:52
+#: gajim/dialog_messages.py:48
 #, fuzzy
 msgid "Invalid Form"
 msgstr "Road direizh"
 
-#: gajim/dialog_messages.py:53
+#: gajim/dialog_messages.py:49
 #, fuzzy
 msgid "The form is not filled correctly."
 msgstr "Bez ez eus arouezioù difennet en anv ar sal pe hini ar servijer."
 
-#: gajim/dialog_messages.py:57 gajim/common/helpers.py:309
+#: gajim/dialog_messages.py:53 gajim/common/helpers.py:315
 msgid "Invisible"
 msgstr "Diwelus"
 
-#: gajim/dialog_messages.py:62
-msgid "A connection is not available"
-msgstr "N'eus ket tu da gevreañ"
+#: gajim/dialog_messages.py:54
+#, fuzzy
+msgid "You cannot join a group chat while being invisible."
+msgstr "N'hellit ket ebarzhiñ ur webgaoz keit ha m'emaoc'h diwelus."
 
-#: gajim/dialog_messages.py:63
+#: gajim/dialog_messages.py:58
+#, fuzzy
+msgid "No Connection Available"
+msgstr "N'eus ket tu en em lugañ"
+
+#: gajim/dialog_messages.py:59
 msgid "Your message can not be sent until you are connected."
 msgstr "N'eus ket tu da gas ho kemennadenn keit ha ma n'oc'h ket luget."
 
-#: gajim/dialog_messages.py:67
-#, fuzzy
-msgid "JID already in list"
-msgstr "Flaperez Jabber"
+#: gajim/dialog_messages.py:63
+msgid "XMPP Address Already in List"
+msgstr ""
 
-#: gajim/dialog_messages.py:68
-msgid "The JID you entered is already in the list. Choose another one."
+#: gajim/dialog_messages.py:64
+#, fuzzy
+msgid ""
+"The XMPP Address you entered is already in the list. Please choose another "
+"one."
 msgstr ""
+"Implijet e vez an anv-mañ gant unan eus ho kontoù dija. Dibabit un anv all "
+"marplij."
 
-#: gajim/dialog_messages.py:72
-msgid "Invalid answer"
+#: gajim/dialog_messages.py:69
+#, fuzzy
+msgid "Invalid Answer"
 msgstr "Respont direizh"
 
-#: gajim/dialog_messages.py:73
+#: gajim/dialog_messages.py:70
 #, fuzzy, python-format
 msgid "Transport %(name)s answered wrongly to register request: %(error)s"
 msgstr "Respontet fall he deus an nor %s d'ar goulenn emezelañ."
 
-#: gajim/dialog_messages.py:78
+#: gajim/dialog_messages.py:75
 #, fuzzy
 msgid "Wrong Custom Hostname"
 msgstr "Implij un anv ostiz/porzh personelaet"
 
-#: gajim/dialog_messages.py:79
+#: gajim/dialog_messages.py:76
 #, fuzzy, python-format
-msgid "Wrong custom hostname \"%s\". Ignoring it."
+msgid "Custom hostname \"%s\" is wrong. It will be ignored."
 msgstr "Implij un anv ostiz/porzh personelaet"
 
-#: gajim/dialog_messages.py:83
+#: gajim/dialog_messages.py:80
 #, fuzzy
-msgid "Error while removing privacy list"
+msgid "Error While Removing Privacy List"
 msgstr "fazi en ur gas %s ( %s )"
 
-#: gajim/dialog_messages.py:84
+#: gajim/dialog_messages.py:81
 #, python-format
 msgid ""
-"Privacy list %s has not been removed. It is maybe active in one of your "
-"connected resources. Deactivate it and try again."
+"Privacy list %s has not been removed. It is probably active in one of your "
+"connected resources. Please deactivate it and try again."
 msgstr ""
 
-#: gajim/dialog_messages.py:90
-msgid "Invisibility not supported"
+#: gajim/dialog_messages.py:87
+msgid "Invisibility Not Supported"
 msgstr ""
 
-#: gajim/dialog_messages.py:91
-#, python-format
-msgid "Account %s doesn't support invisibility."
-msgstr ""
+#: gajim/dialog_messages.py:88
+#, fuzzy, python-format
+msgid "This account %s doesn't support invisibility."
+msgstr "Ur roll eus an treuzkasoù oberiant, echu pe arsavet"
 
-#: gajim/dialog_messages.py:95
+#: gajim/dialog_messages.py:92
 #, fuzzy
-msgid "Unregister failed"
+msgid "Unregister Failed"
 msgstr "échec lors de la publication de votre vCard"
 
-#: gajim/dialog_messages.py:96
-#, python-format
-msgid "Unregistration with server %(server)s failed: %(error)s"
-msgstr ""
+#: gajim/dialog_messages.py:93
+#, fuzzy, python-format
+msgid "Unregistration on server %(server)s failed: %(error)s"
+msgstr "Kevreadenn"
 
-#: gajim/dialog_messages.py:100
+#: gajim/dialog_messages.py:97
 #, fuzzy
-msgid "Registration succeeded"
+msgid "Registration Succeeded"
 msgstr "Gant berzh eo bet embannet ar vCard"
 
-#: gajim/dialog_messages.py:101
-#, python-format
-msgid "Registration with agent %s succeeded"
-msgstr ""
+#: gajim/dialog_messages.py:98
+#, fuzzy, python-format
+msgid "Registration with agent %s succeeded."
+msgstr "Gant berzh eo bet embannet ar vCard"
 
-#: gajim/dialog_messages.py:105 gajim/gtk/service_registration.py:215
+#: gajim/dialog_messages.py:102
 #, fuzzy
-msgid "Registration failed"
+msgid "Registration Failed"
 msgstr "échec lors de la publication de votre vCard"
 
-#: gajim/dialog_messages.py:106
+#: gajim/dialog_messages.py:103
 #, python-format
 msgid ""
 "Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
 msgstr ""
 
-#: gajim/dialog_messages.py:111
+#: gajim/dialog_messages.py:108
 #, fuzzy
 msgid "Unable to Join Group Chat"
 msgstr "Impossible de rejoindre le salon"
 
-#: gajim/dialog_messages.py:116
-msgid "GStreamer error"
+#: gajim/dialog_messages.py:113
+msgid "GStreamer Error"
 msgstr ""
 
-#: gajim/dialog_messages.py:117
+#: gajim/dialog_messages.py:114
 #, fuzzy, python-format
 msgid ""
 "Error: %(error)s\n"
 "Debug: %(debug)s"
 msgstr "Fazi en ur lenn ar restr:"
 
-#: gajim/dialog_messages.py:121
+#: gajim/dialog_messages.py:118
 #, fuzzy
-msgid "Wrong host"
+msgid "Wrong Host"
 msgstr "Ger-kuzh faos"
 
-#: gajim/dialog_messages.py:122
+#: gajim/dialog_messages.py:119
 msgid "Invalid local address? :-O"
 msgstr ""
 
-#: gajim/dialog_messages.py:126
-msgid "Avahi error"
+#: gajim/dialog_messages.py:123
+msgid "Avahi Error"
 msgstr ""
 
-#: gajim/dialog_messages.py:127
+#: gajim/dialog_messages.py:124
 #, python-format
 msgid ""
 "%s\n"
 "Link-local messaging might not work properly."
 msgstr ""
 
-#: gajim/dialog_messages.py:131 gajim/dialog_messages.py:136
+#: gajim/dialog_messages.py:128 gajim/dialog_messages.py:133
 #, fuzzy
-msgid "Could not request upload slot"
+msgid "Could not request upload slot for HTTP File Upload"
 msgstr "Dibosupl eo kargañ ar skeudenn"
 
-#: gajim/dialog_messages.py:137
-msgid "Got unexpected response from server (see log)"
+#: gajim/dialog_messages.py:134
+msgid "Got unexpected response from server (see log)."
 msgstr ""
 
-#: gajim/dialog_messages.py:141 gajim/dialog_messages.py:146
+#: gajim/dialog_messages.py:138 gajim/dialog_messages.py:143
 #, fuzzy
-msgid "Could not open file"
+msgid "Could not Open File"
 msgstr "Dibosupl eo kargañ ar skeudenn"
 
-#: gajim/dialog_messages.py:142
-msgid "Exception raised while opening file (see log)"
+#: gajim/dialog_messages.py:139
+msgid "Exception raised while trying to open file (see log)."
 msgstr ""
 
-#: gajim/dialog_messages.py:151
-msgid "Unsecure"
-msgstr ""
+#: gajim/dialog_messages.py:148
+#, fuzzy
+msgid "Not Secure"
+msgstr "N'eo ket kroget"
 
-#: gajim/dialog_messages.py:152
-msgid "Server returned unsecure transport (HTTP)"
+#: gajim/dialog_messages.py:149
+msgid "The server returned an insecure transport (HTTP)."
 msgstr ""
 
-#: gajim/dialog_messages.py:156
+#: gajim/dialog_messages.py:153
 #, fuzzy
-msgid "Could not upload file"
+msgid "Could not Upload File"
 msgstr "Dibosupl eo kargañ ar skeudenn"
 
-#: gajim/dialog_messages.py:157
+#: gajim/dialog_messages.py:154
 #, python-format
 msgid "HTTP response code from server: %s"
 msgstr ""
 
-#: gajim/dialog_messages.py:161
+#: gajim/dialog_messages.py:158
 msgid "Upload Error"
 msgstr ""
 
-#: gajim/dialog_messages.py:166
+#: gajim/dialog_messages.py:163
 #, fuzzy
 msgid "Encryption Error"
 msgstr "War enaou emañ ar sifrañ"
 
-#: gajim/dialog_messages.py:167
-#, fuzzy
-msgid "For the chosen encryption there is no encryption method available"
-msgstr "N'eus ket tu da gevreañ"
+#: gajim/dialog_messages.py:164
+msgid "There is no encryption method available for the chosen encryption."
+msgstr ""
 
-#: gajim/dialog_messages.py:171
+#: gajim/dialog_messages.py:169
 #, fuzzy
-msgid "Avatar upload failed"
+msgid "Avatar Upload Failed"
 msgstr "C'hwitet eo embannadur ar vCard"
 
-#: gajim/privatechat_control.py:204
+#: gajim/privatechat_control.py:207
 msgid "Sending private message failed"
 msgstr "Kas ar gemennadenn brevez c'hwitet"
 
-#: gajim/privatechat_control.py:206
+#: gajim/privatechat_control.py:209
 #, 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\"."
@@ -2512,7 +2471,7 @@ msgstr "diskouez ar skoazell evit an urzhiad"
 
 #: gajim/gajim_remote.py:85
 #, fuzzy
-msgid "Lists all contacts in roster, one for each line"
+msgid "Lists all contacts in the contact list, one for each line"
 msgstr ""
 "A ziskouez ur roll eus an holl zarempredoù, pep darempred war ul linenn."
 
@@ -2594,11 +2553,13 @@ msgstr ""
 
 #: gajim/gajim_remote.py:118
 #, fuzzy
-msgid "Sends new chat message to a contact in the roster. Account is optional."
+msgid ""
+"Sends new chat message to a contact in the contact list. Account is optional."
 msgstr "Usage: /%s, cache les boutons de discussion."
 
 #: gajim/gajim_remote.py:120 gajim/gajim_remote.py:130
-msgid "JID of the contact that will receive the message"
+#, fuzzy
+msgid "XMPP Address of the contact that will receive the message"
 msgstr "JID an darempred hag a resevo ar gemennadenn"
 
 #: gajim/gajim_remote.py:121 gajim/gajim_remote.py:132
@@ -2612,8 +2573,10 @@ msgid "if specified, the message will be sent using this account"
 msgstr "Ma vez resisaet, e vo kaset ar gemennadenn en ur implij ar gont-mañ"
 
 #: gajim/gajim_remote.py:127
-msgid "Sends a chat message to someone on your roster. Account is optional."
-msgstr ""
+#, fuzzy
+msgid ""
+"Sends a chat message to someone on your contact list. Account is optional."
+msgstr "Usage: /%s, cache les boutons de discussion."
 
 #: gajim/gajim_remote.py:131
 #, fuzzy
@@ -2626,12 +2589,12 @@ msgid "message subject"
 msgstr "Kemennadenn gaset"
 
 #: gajim/gajim_remote.py:138
-msgid "Sends new message to a groupchat you've joined."
+msgid "Sends new message to a group chat you've joined."
 msgstr ""
 
 #: gajim/gajim_remote.py:140
 #, fuzzy
-msgid "JID of the room that will receive the message"
+msgid "XMPP Address of the group chat that will receive the message"
 msgstr "JID an darempred hag a resevo ar gemennadenn"
 
 #: gajim/gajim_remote.py:147
@@ -2640,7 +2603,8 @@ msgstr "Evit kargañ titouroù-munut un darempred"
 
 #: gajim/gajim_remote.py:149 gajim/gajim_remote.py:162
 #: gajim/gajim_remote.py:192
-msgid "JID of the contact"
+#, fuzzy
+msgid "XMPP Address of the contact"
 msgstr "JID an darempred"
 
 #: gajim/gajim_remote.py:153
@@ -2701,7 +2665,8 @@ msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "A skriv stad red dibaboù Gajim er restr .config"
 
 #: gajim/gajim_remote.py:190
-msgid "Removes contact from roster"
+#, fuzzy
+msgid "Removes contact from contact list"
 msgstr "Dilemel an darempred diouzh ar roll"
 
 #: gajim/gajim_remote.py:193
@@ -2748,9 +2713,9 @@ msgid "Missing argument \"contact_jid\""
 msgstr ""
 
 #: gajim/gajim_remote.py:275
-#, python-format
+#, fuzzy, python-format
 msgid ""
-"'%s' is not in your roster.\n"
+"'%s' is not in your contact list.\n"
 "Please specify account for sending the message."
 msgstr ""
 "N'emañ ket '%s' en hor roll darempredoù.\n"
@@ -2978,12 +2943,12 @@ msgstr ""
 msgid "Weekend!"
 msgstr ""
 
-#: gajim/common/logger.py:192 gajim/common/logger.py:197
+#: gajim/common/logger.py:189 gajim/common/logger.py:194
 #, 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:217
+#: gajim/common/logger.py:214
 #, fuzzy, python-format
 msgid "Creating %s"
 msgstr "Taolennadur: %s"
@@ -3058,24 +3023,21 @@ msgstr "Emañ %(nickname)s o paouez dilugañ"
 msgid "Contact Signed Out"
 msgstr "Darempred diluget"
 
-#: gajim/common/contacts.py:455
-#, fuzzy
-msgid "Not in roster"
-msgstr "Ket er roll"
-
 #: gajim/common/config.py:80
+#, fuzzy
 msgid ""
 "Show desktop notification even when a chat window is opened for this contact "
-"and does not have focus"
-msgstr ""
+"and does not have focus."
+msgstr "Aotren ar c'helaouennoù p'emaon _ezvezant/dihegerz/busy/diwelus"
 
 #: gajim/common/config.py:81
-msgid "Play sound when user is busy"
+msgid "Play sound even when being busy."
 msgstr ""
 
 #: gajim/common/config.py:83
-msgid "Show only online and free for chat contacts in roster."
-msgstr ""
+#, fuzzy
+msgid "Show only online and free for chat contacts in the contact list."
+msgstr "Me blijfe din ouzhpennañ ac'hanoc'h em roll-darempredoù."
 
 #: gajim/common/config.py:86
 msgid "Time in minutes, after which your status changes to away."
@@ -3083,11 +3045,13 @@ msgstr "War-lerc'h pet munutenn e vo lakaet ho stad evel ezvezant."
 
 #: gajim/common/config.py:87
 #, fuzzy
-msgid "$S (Away as a result of being idle more than $T min)"
+msgid "$S (Away: Idle more than $T min)"
 msgstr "Ezvezant rak dizoberiant"
 
 #: gajim/common/config.py:87
-msgid "$S will be replaced by current status message, $T by autoawaytime."
+msgid ""
+"$S will be replaced by current status message, $T by the 'autoawaytime' "
+"value."
 msgstr ""
 
 #: gajim/common/config.py:89
@@ -3096,68 +3060,70 @@ msgstr "War-lerc'h pet munutenn e vo lakaet ho stad evel dihegerz."
 
 #: gajim/common/config.py:90
 #, fuzzy
-msgid "$S (Not available as a result of being idle more than $T min)"
+msgid "$S (Not available: Idle more than $T min)"
 msgstr "Dihegerz rak dizoberiant."
 
 #: gajim/common/config.py:90
-msgid "$S will be replaced by current status message, $T by autoxatime."
+msgid ""
+"$S will be replaced by current status message, $T by the 'autoxatime' value."
 msgstr ""
 
 #: gajim/common/config.py:93
 msgid ""
-"When to show notification area icon. Can be 'never', 'on_event', 'always'."
+"When to show the notification area icon. Can be 'never', 'on_event', and "
+"'always'."
 msgstr ""
 
 #: gajim/common/config.py:94
-msgid "Allow to hide the roster window even if the tray icon is not shown."
+msgid ""
+"Allow to hide the contact list window even if the notification area icon is "
+"not shown."
 msgstr ""
 
 #: gajim/common/config.py:97
 #, fuzzy
-msgid "Contact signed in notification color."
-msgstr "Diskouez er _roll hepken"
+msgid "Notification color for contacts signing in."
+msgstr "Ma c'helaouiñ pa c'hoarvez gant un darempred:"
 
 #: gajim/common/config.py:98
 #, fuzzy
-msgid "Contact signout notification color"
-msgstr "Diskouez er _roll hepken"
+msgid "Notification color for contacts signing out."
+msgstr "Ma c'helaouiñ pa c'hoarvez gant un darempred:"
 
 #: gajim/common/config.py:99
 #, fuzzy
-msgid "New message notification color."
+msgid "Notification color for new message notification."
 msgstr "Noti_fications d'état de discussion"
 
 #: gajim/common/config.py:100
 #, fuzzy
-msgid "File transfer request notification color."
-msgstr "Goulenn treuzkas"
+msgid "Notification color for file transfer request."
+msgstr "_Kelaouiñ ac'hanon p'eo echu un treuzkas"
 
 #: gajim/common/config.py:101
 #, fuzzy
-msgid "File transfer error notification color."
-msgstr "Nullet eo bet an treuzkas"
+msgid "Notification color for file transfer errors."
+msgstr "_Kelaouiñ ac'hanon p'eo echu un treuzkas"
 
 #: gajim/common/config.py:102
-#, fuzzy
-msgid "File transfer complete or stopped notification color."
-msgstr "P'eo echu un treuzkas, diskouez ur gemennadenn gelaouiñ difoupus"
+msgid "Notification color for stopped or completed file transfers."
+msgstr ""
 
 #: gajim/common/config.py:103
-#, fuzzy
-msgid "Groupchat invitation notification color"
-msgstr "Pedadenn evit ur sal-flapiñ"
+msgid "Notification color for group chat invitations."
+msgstr ""
 
 #: gajim/common/config.py:104
-msgid "Background color of status changed notification"
+msgid "Notification background color for changed status."
 msgstr ""
 
 #: gajim/common/config.py:105
-msgid "Other dialogs color."
+msgid "Notification color for other dialogs."
 msgstr ""
 
 #: gajim/common/config.py:106
 msgid ""
-"List (space separated) of rows (accounts and groups) that are collapsed."
+"List of rows (accounts and groups) that are collapsed (space separated)."
 msgstr ""
 
 #: gajim/common/config.py:107
@@ -3165,8 +3131,9 @@ msgstr ""
 msgid "default"
 msgstr "Dilemel"
 
-#: gajim/common/config.py:113
-msgid "Language used by speller"
+#: gajim/common/config.py:113 gajim/common/config.py:424
+#: gajim/common/config.py:431
+msgid "Language used for spell checking."
 msgstr ""
 
 #: gajim/common/config.py:114
@@ -3179,8 +3146,8 @@ msgstr ""
 #: gajim/common/config.py:115
 msgid ""
 "Print time in chats using Fuzzy Clock. Value of fuzziness from 1 to 4, or 0 "
-"to disable fuzzyclock. 1 is the most precise clock, 4 the least precise one. "
-"This is used only if print_time is 'sometimes'."
+"to disable Fuzzy Clock. 1 is the most precise clock, 4 the least precise "
+"one. This is used only if 'print_time' is 'sometimes'."
 msgstr ""
 
 #: gajim/common/config.py:117
@@ -3194,278 +3161,278 @@ msgstr "Implij ur re */_ evel arouezioù neuziañ an destenn."
 #: gajim/common/config.py:120
 #, fuzzy
 msgid ""
-"If true, do not remove */_ . So *abc* will be bold but with * * not removed."
+"If enabled, do not remove */_ . So *abc* will be bold but with * * not "
+"removed."
 msgstr ""
 "M'eo gwir, ne vo ket dilamet */_. Neuze e vo *abc* tev ma ne vez ket dilamet "
 "* *."
 
 #: gajim/common/config.py:123
 msgid ""
-"Uses ReStructured text markup to send HTML, plus ascii formatting if "
-"selected. For syntax, see http://docutils.sourceforge.net/docs/ref/rst/"
-"restructuredtext.html (If you want to use this, install docutils)"
+"Uses ReStructured text markup to send HTML, plus ASCII formatting if "
+"selected. Needs docutils installed (for syntax, see http://docutils."
+"sourceforge.net/docs/ref/rst/restructuredtext.html)."
 msgstr ""
 
 #: gajim/common/config.py:132
 msgid ""
-"Character to add after nickname when using nick completion (tab) in group "
-"chat."
+"Character to add after nickname when using nickname completion (tab) in "
+"group chat."
 msgstr ""
 
 #: gajim/common/config.py:133
 msgid ""
-"Character to propose to add after desired nickname when desired nickname is "
-"used by someone else in group chat."
+"Character to propose to add after desired nickname when nickname is already "
+"used in group chat."
 msgstr ""
 
 #: gajim/common/config.py:155
 msgid ""
-"If true, Gajim will save roster position when hiding roster, and restore it "
-"when showing roster."
+"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:161
-msgid "Place the roster on the right in single window mode"
+msgid "Place the contact list on the right in single window mode"
 msgstr ""
 
 #: gajim/common/config.py:167
 msgid ""
-"This option let you customize timestamp that is printed in conversation. For "
-"example \"[%H:%M] \" will show \"[hour:minute] \". See python doc on "
-"strftime for full documentation: http://docs.python.org/lib/module-time.html"
+"This option lets you customize the timestamp that is printed in "
+"conversation. For example '[%H:%M] ' will show '[hour:minute] '. See python "
+"doc on strftime for full documentation (https://docs.python.org/3/library/"
+"time.html)."
 msgstr ""
 
 #: gajim/common/config.py:168
-msgid "Characters that are printed before the nickname in conversations"
+msgid "Characters that are printed before the nickname in conversations."
 msgstr ""
 
 #: gajim/common/config.py:169
-msgid "Characters that are printed after the nickname in conversations"
+msgid "Characters that are printed after the nickname in conversations."
 msgstr ""
 
 #: gajim/common/config.py:170
-msgid "Add * and [n] in roster title?"
-msgstr "Ouzhpennañ * hag [n] da ditl ar roll darempredoù?"
+#, 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:171
 #, fuzzy
 msgid ""
-"How many history messages should be restored when a chat tab/window is "
-"reopened?"
+"Number of messages from chat history to be restored when a chat tab/window "
+"is reopened."
 msgstr ""
 "Niver a linennoù da vemoriñ diouzh ar gaozeadenn gent pa vez addigoret un "
 "ivinell pe ur prenestr."
 
 #: gajim/common/config.py:172
-msgid "How far back in time (minutes) history is restored. -1 means no limit."
+msgid ""
+"How far back in time (minutes) chat history is restored. -1 means no limit."
 msgstr ""
 
 #: gajim/common/config.py:173
 msgid ""
-"How many lines to request from server when entering a groupchat. -1 means no "
-"limit"
+"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:174
 msgid ""
-"Minutes of backlog to request when entering a groupchat. -1 means no limit"
+"Should automatic rejoin be activated when you were kicked from a group chat?"
 msgstr ""
 
 #: gajim/common/config.py:175
-msgid ""
-"How many seconds to wait before trying to autorejoin to a conference you are "
-"being disconnected from. Set to 0 to disable autorejoining."
-msgstr ""
-
-#: gajim/common/config.py:176
-msgid "Should autorejoin be activated when kicked from a conference?"
-msgstr ""
-
-#: gajim/common/config.py:177
-msgid ""
-"Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
-"Client default behaviour)."
+#, 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:179
-msgid "How many lines to store for Ctrl+KeyUP."
+#: gajim/common/config.py:177
+#, 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:182
+#: gajim/common/config.py:180
 #, fuzzy, python-format
 msgid ""
-"Either custom URL with %%s in it where %%s is the word/phrase or "
-"'WIKTIONARY' which means use Wikitionary."
+"Either a custom URL with %%s in it (where %%s is the word/phrase) or "
+"'WIKTIONARY' (which means use Wikitionary)."
 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:185
+#: gajim/common/config.py:183
 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:187
+#: gajim/common/config.py:185
 msgid ""
-"When not printing time for every message (print_time==sometimes), print it "
+"When not printing time for every message ('print_time'==sometimes), print it "
 "every x minutes."
 msgstr ""
 
-#: gajim/common/config.py:188
+#: gajim/common/config.py:186
 msgid "Ask before pasting an image."
 msgstr ""
 
-#: gajim/common/config.py:189
+#: gajim/common/config.py:187
 msgid "Ask before closing a group chat tab/window."
 msgstr "Goulenn a-raok serriñ un ivinell pe ur prenestr."
 
-#: gajim/common/config.py:190
+#: gajim/common/config.py:188
 #, fuzzy
 msgid ""
-"Always ask for confirmation before closing groupchats with any of the JIDs "
-"on this space separated list."
+"Always ask for confirmation before closing group chats with any of the XMPP "
+"Addresses on this list (space separated)."
 msgstr ""
 "Goulenn atav a-raok serriñ ar webgaozioù dispartiet gant un esaouenn ar roll-"
 "mañ."
 
-#: gajim/common/config.py:191
+#: gajim/common/config.py:189
 #, fuzzy
 msgid ""
-"Never ask for confirmation before closing groupchats with any of the JIDs on "
-"this space separated list."
+"Never ask for confirmation before closing group chats with any of the XMPP "
+"Addresses on this list (space separated)."
 msgstr ""
 "Chom hep goulenn morse a-raok serriñ ar webgaozioù dispartiet gant un "
 "esaouenn er roll-mañ."
 
-#: gajim/common/config.py:192
+#: gajim/common/config.py:190
 msgid ""
-"Ask before closing tabbed chat window if there are controls that can lose "
-"data (chat, private chat, groupchat that will not be minimized)"
+"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:195
+#: gajim/common/config.py:193
 msgid ""
-"Comma separated list of sent hosts, in addition of local interfaces, for "
-"File Transfer in case of address translation/port forwarding."
+"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:196
+#: gajim/common/config.py:194
 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:198
+#: gajim/common/config.py:196
 msgid "Notify of events in the notification area."
 msgstr ""
 
-#: gajim/common/config.py:199
+#: gajim/common/config.py:197
 msgid ""
-"If False, Gajim will display a static event icon instead of the blinking "
-"status icon in the notification area when notifying on event."
+"If disabled, Gajim will display a static event icon instead of the blinking "
+"status icon in the notification area when notifying about an event."
 msgstr ""
 
-#: gajim/common/config.py:205
+#: gajim/common/config.py:203
 msgid "Show tab when only one conversation?"
 msgstr "Diskouez an ivinell pa 'z eus ur gaoz hepken?"
 
-#: gajim/common/config.py:206
+#: gajim/common/config.py:204
 #, fuzzy
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "Diskouez an ivinell pa 'z eus ur gaoz hepken?"
 
-#: gajim/common/config.py:207
+#: gajim/common/config.py:205
 msgid "Show close button in tab?"
 msgstr "Diskouez an nozelenn-serriñ war an ivinell?"
 
-#: gajim/common/config.py:220
+#: gajim/common/config.py:218
 #, fuzzy
 msgid "Preview new messages in notification popup?"
 msgstr "Noti_fications d'état de discussion"
 
-#: gajim/common/config.py:223
+#: gajim/common/config.py:221
 msgid ""
-"A semicolon-separated list of words that will be highlighted in group chats."
+"A list of words (semicolon separated) that will be highlighted in group "
+"chats."
 msgstr ""
 
-#: gajim/common/config.py:224
+#: gajim/common/config.py:222
 msgid ""
-"If true, quits Gajim when X button of Window Manager is clicked. This "
-"setting is taken into account only if notification icon is used."
+"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:225
+#: gajim/common/config.py:223
 msgid ""
-"If true, Gajim hides the Roster window on pressing the X button instead of "
-"minimizing into the Dock."
+"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:226
+#: gajim/common/config.py:224
 msgid ""
-"If true, Gajim will display an icon on each tab containing unread messages. "
-"Depending on the theme, this icon may be animated."
+"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:227
+#: gajim/common/config.py:225
 #, fuzzy
 msgid ""
-"If true, Gajim will display the status message, if not empty, for every "
-"contact under the contact name in roster window."
+"If enabled, Gajim will display the status message (if not empty) underneath "
+"the contact name in the contact list window."
 msgstr ""
 "Si cette case est cochée, Gajim affichera le message d'état, sous le nom de "
 "chaque contact dans la fenêtre principale et les salons"
 
-#: gajim/common/config.py:233
-msgid "Define the position of the avatar in roster. Can be left or right"
+#: gajim/common/config.py:231
+msgid ""
+"Define the position of avatars in the contact list. Can be 'left' or 'right'."
 msgstr ""
 
-#: gajim/common/config.py:234
+#: gajim/common/config.py:232
 msgid ""
-"If False, Gajim will no longer print status line in chats when a contact "
-"changes their status and/or their status message."
+"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:235
+#: gajim/common/config.py:233
 #, fuzzy
 msgid ""
 "Default Setting: Show a status message for every join or leave in a group "
-"chat"
+"chat."
 msgstr "Impossible de rejoindre le salon"
 
-#: gajim/common/config.py:236
+#: gajim/common/config.py:234
+#, fuzzy
 msgid ""
-"Default Setting: Show a status message for all status (away, dnd, etc.) "
-"changes of users in a group chat"
-msgstr ""
+"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:238
-msgid "Log XHTML messages instead of plain text messages."
+#: gajim/common/config.py:236
+msgid "Store XHTML messages in chat history instead of plain text messages."
 msgstr ""
 
-#: gajim/common/config.py:239
+#: gajim/common/config.py:237
 msgid "Don't show avatar for the transport itself."
 msgstr ""
 
-#: gajim/common/config.py:240
-msgid "Don't show roster in the system taskbar."
+#: gajim/common/config.py:238
+msgid "Don't show contact list window in the system taskbar."
 msgstr ""
 
-#: gajim/common/config.py:241
+#: gajim/common/config.py:239
 msgid ""
-"If true, make the window flash (the default behaviour in most Window "
-"Managers) when holding pending events."
+"If enabled, Gajim makes the window flash (the default behaviour in most "
+"Window Managers) when holding pending events."
 msgstr ""
 
-#: gajim/common/config.py:245
+#: gajim/common/config.py:243
 #, fuzzy
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
 "'always_with_roster' - Like 'always' but the messages are in a single window "
-"along with the roster.\n"
+"along with the contact list.\n"
 "'never' - All messages get their own window.\n"
 "'peracct' - Messages for each account are sent to a specific window.\n"
-"'pertype' - Each message type (e.g. chats vs. groupchats) is sent to a "
+"'pertype' - Each message type (e.g. chats vs. group chats) is sent to a "
 "specific window."
 msgstr ""
 "A reolia ar prenestr a vez lakaet ar c'hemennadennoù nevez enni.\n"
@@ -3474,529 +3441,554 @@ 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:246
+#: gajim/common/config.py:244
 msgid ""
-"Show roster on startup.\n"
-"'always' - Always show roster.\n"
-"'never' - Never show roster.\n"
-"'last_state' - Restore the last state roster."
+"Show contact list window on startup.\n"
+"'always' - Always show contact list window.\n"
+"'never' - Never show contact list window.\n"
+"'last_state' - Restore last state of the contact list window."
 msgstr ""
 
-#: gajim/common/config.py:247
+#: gajim/common/config.py:245
 #, fuzzy
-msgid "If False, you will no longer see the avatar in the chat window."
+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:248
+#: gajim/common/config.py:246
 #, fuzzy
-msgid "If true, pressing the escape key closes a tab/window."
+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:249
-msgid "Hides the banner in a group chat window"
+#: gajim/common/config.py:247
+#, fuzzy
+msgid "Hides the banner in a group chat window."
+msgstr "A guzha an nozelennoù er prenestr flapiñ"
+
+#: gajim/common/config.py:248
+#, fuzzy
+msgid "Hides the banner in a 1:1 chat window."
 msgstr "A guzha an nozelennoù er prenestr flapiñ"
 
+#: gajim/common/config.py:249
+#, 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:250
-msgid "Hides the banner in two persons chat window"
+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:251
-#, fuzzy
-msgid "Hides the group chat occupants list in group chat window."
-msgstr "A guzha roll ar berzhidi en ur prenestr webgaoz"
+msgid "Indentation when using merge consecutive nickname."
+msgstr ""
 
 #: gajim/common/config.py:252
 msgid ""
-"In a chat, show the nickname at the beginning of a line only when it's not "
-"the same person talking than in previous message."
+"Ctrl+Tab switches to the next composing tab when there are no tabs with "
+"messages pending."
 msgstr ""
 
 #: gajim/common/config.py:253
-msgid "Indentation when using merge consecutive nickname."
+msgid ""
+"Show a confirmation dialog to create metacontacts? Empty string means never "
+"show the dialog."
 msgstr ""
 
 #: gajim/common/config.py:254
-msgid "Ctrl-Tab go to next composing tab when none is unread."
+msgid ""
+"Show a confirmation dialog to block a contact? Empty string means never show "
+"the dialog."
 msgstr ""
 
 #: gajim/common/config.py:255
 msgid ""
-"Show the confirm metacontacts creation dialog or not? Empty string means "
-"never show the dialog."
+"Show a confirmation dialog for a custom status? Empty string means never "
+"show the dialog."
 msgstr ""
 
 #: gajim/common/config.py:256
 msgid ""
-"Show the confirm block contact dialog or not? Empty string means never show "
-"the dialog."
+"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:257
 msgid ""
-"Show the confirm custom status dialog or not? Empty string means never show "
-"the dialog."
+"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:258
 msgid ""
-"If true, you will be able to set a negative priority to your account in "
-"account modification window. BE CAREFUL, when you are logged in with a "
-"negative priority, you will NOT receive any message from your server."
+"Can be empty, 'chat' or 'normal'. If not empty, all incoming messages are "
+"treated as if they were of this type."
 msgstr ""
 
 #: gajim/common/config.py:259
 msgid ""
-"If true, Gajim will show number of online and total contacts in account and "
-"group rows."
+"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:260
-msgid ""
-"Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
-"as if they were of this type"
+msgid "Time of inactivity needed before the change status window closes down."
 msgstr ""
 
 #: gajim/common/config.py:261
 msgid ""
-"If true, Gajim will scroll and select the contact who sent you the last "
-"message, if chat window is not already opened."
+"Maximum number of lines that are printed in conversations. Oldest lines are "
+"cleared."
 msgstr ""
 
 #: gajim/common/config.py:262
-msgid "Time of inactivity needed before the change status window closes down."
+msgid ""
+"If enabled, notification windows from notification-daemon will be attached "
+"to the notification area icon."
 msgstr ""
 
 #: gajim/common/config.py:263
-msgid ""
-"Maximum number of lines that are printed in conversations. Oldest lines are "
-"cleared."
+msgid "Choose interval between 2 checks of idleness."
 msgstr ""
 
 #: gajim/common/config.py:264
 msgid ""
-"If true, notification windows from notification-daemon will be attached to "
-"notification icon."
+"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:265
-msgid "Choose interval between 2 checks of idleness."
+msgid ""
+"If enabled, completion in group chats will be like a shell auto-completion."
 msgstr ""
 
-#: gajim/common/config.py:266
-msgid ""
-"Valid uri schemes. Only schemes in this list will be accepted as \"real\" "
-"uri. (mailto and xmpp are handled separately)"
+#: gajim/common/config.py:270
+msgid "Optionally fix Jingle output video framerate. Example: 10/1 or 25/2."
 msgstr ""
 
-#: gajim/common/config.py:267
-msgid "If true, completion in groupchats will be like a shell auto-completion"
+#: gajim/common/config.py:271
+msgid "Optionally resize Jingle output video. Example: 320x240."
 msgstr ""
 
 #: gajim/common/config.py:272
-msgid "Optionally fix jingle output video framerate. Example: 10/1 or 25/2"
+msgid "If enabled, you will see your webcam's video stream as well."
 msgstr ""
 
-#: gajim/common/config.py:273
-msgid "Optionally resize jingle output video. Example: 320x240"
+#: gajim/common/config.py:275
+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:274
-msgid "If true, You will also see your webcam"
+#: gajim/common/config.py:276
+msgid "STUN server to use when using Jingle"
 msgstr ""
 
 #: gajim/common/config.py:277
 msgid ""
-"If true, Gajim will try to use a STUN server when using Jingle. The one in "
-"\"stun_server\" option, or the one given by the XMPP server."
+"If enabled, Gajim will show affiliation of group chat participants by adding "
+"a colored square to the status icon."
 msgstr ""
 
 #: gajim/common/config.py:278
-msgid "STUN server to use when using Jingle"
+msgid ""
+"Proxy used for all outgoing connections if the account does not have a "
+"specific proxy configured."
 msgstr ""
 
 #: gajim/common/config.py:279
-msgid ""
-"If true, Gajim will show affiliation of groupchat occupants by adding a "
-"colored square to the status icon"
+msgid "If enabled, Gajim will ignore incoming attention requests ('wizz')."
 msgstr ""
 
 #: gajim/common/config.py:280
 msgid ""
-"Proxy used for all outgoing connections if the account does not have a "
-"specific proxy configured"
+"If enabled, Gajim will reopen chat windows that were opened last time Gajim "
+"was closed."
 msgstr ""
 
 #: gajim/common/config.py:281
-msgid "If true, Gajim will ignore incoming attention requests (\"wizz\")."
+msgid ""
+"If enabled, Gajim will display an icon to show that sent messages have been "
+"received by your contact."
 msgstr ""
 
 #: gajim/common/config.py:282
-msgid ""
-"If enabled, Gajim will reopen chat windows that were opened last time Gajim "
-"was closed."
+msgid "Show a mini avatar in chat window tabs and as the window's icon."
 msgstr ""
 
 #: gajim/common/config.py:283
 msgid ""
-"If enabled, Gajim will show an icon to show that sent message has been "
-"received by your contact"
+"If enabled, Gajim will use the System's Keyring to store account passwords."
 msgstr ""
 
 #: gajim/common/config.py:284
-msgid "Show a mini avatar in chat window tabs and in window icon"
+msgid "If enabled, Gajim will execute XEP-0146 Commands."
 msgstr ""
 
 #: gajim/common/config.py:285
-msgid "If true, Gajim will use the Systems Keyring to store account passwords."
+msgid "2: System, 1: Enabled, 0: Disabled"
 msgstr ""
 
 #: gajim/common/config.py:286
-msgid "If true, Gajim will execute XEP-0146 Commands."
+msgid "Options in days which can be chosen in the sync threshold menu"
 msgstr ""
 
 #: gajim/common/config.py:287
-msgid "2: System, 1: Enabled, 0: Disabled"
+msgid ""
+"Maximum history in days we request from a public group chat archive. 0: As "
+"much as possible."
 msgstr ""
 
 #: gajim/common/config.py:288
-msgid "Options in days which can be chosen in the sync threshold menu"
+msgid ""
+"Maximum history in days we request from a private group chat archive. 0: As "
+"much as possible."
 msgstr ""
 
 #: gajim/common/config.py:289
 msgid ""
-"Maximum history in days we request from a public room archive. 0: As much as "
-"possible"
+"If enabled, Gajim shows the group chat subject in the chat window when "
+"joining."
 msgstr ""
 
 #: gajim/common/config.py:290
+#, fuzzy
 msgid ""
-"Maximum history in days we request from a private room archive. 0: As much "
-"as possible"
-msgstr ""
+"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:291
-msgid "If the room subject is shown in chat on join"
-msgstr ""
+#, 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:292
+#, fuzzy
 msgid ""
-"If the contact row is colored according to the current chatstate of the "
-"contact"
-msgstr ""
+"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:293
-msgid "If the tab is colored according to the current chatstate of the contact"
-msgstr ""
-
-#: gajim/common/config.py:294
-msgid ""
-"Shows a text in the banner that describes the current chatstate of the "
-"contact"
-msgstr ""
-
-#: gajim/common/config.py:295 gajim/common/config.py:424
 msgid ""
 "Chat state notifications that are sent to contacts. Possible values: all, "
 "composing_only, disabled"
 msgstr ""
 
-#: gajim/common/config.py:296 gajim/common/config.py:438
+#: gajim/common/config.py:294
 msgid ""
 "Chat state notifications that are sent to the group chat. Possible values: "
-"all, composing_only, disabled"
+"'all', 'composing_only', 'disabled'"
 msgstr ""
 
-#: gajim/common/config.py:312
-msgid ""
-"Priority will change automatically according to your status. Priorities are "
-"defined in autopriority_* options."
+#: gajim/common/config.py:297
+msgid "API Preferences. Possible values: 'http', 'iq'"
 msgstr ""
 
-#: gajim/common/config.py:320
+#: gajim/common/config.py:313
 msgid ""
-"Status used to autoconnect as. Can be online, chat, away, xa, dnd, "
-"invisible. NOTE: this option is used only if restore_last_status is disabled"
+"Priority will change automatically according to your status. Priorities are "
+"defined in 'autopriority_*' options."
 msgstr ""
 
 #: gajim/common/config.py:321
-msgid "If enabled, restore the last status that was used."
+msgid ""
+"Status to be used automatically when connecting. Can be 'online', 'chat', "
+"'away', 'xa', 'dnd' or 'invisible'. NOTE: This option is used only if "
+"'restore_last_status' is disabled."
 msgstr ""
 
 #: gajim/common/config.py:322
-msgid ""
-"If true, Contacts requesting authorization will be automatically accepted."
+msgid "If enabled, the last status will be restored."
 msgstr ""
 
 #: gajim/common/config.py:323
+msgid ""
+"If enabled, Contacts requesting authorization will be accepted automatically."
+msgstr ""
+
+#: gajim/common/config.py:324
 #, fuzzy
 msgid ""
-"If False, this account will be disabled and will not appear in roster window."
+"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:327
-msgid "Allow plaintext connections"
+#: gajim/common/config.py:328
+msgid "Allow plaintext connections."
 msgstr ""
 
-#: gajim/common/config.py:330
+#: gajim/common/config.py:331
 msgid ""
-"List (space separated) of authentication mechanisms to try. Can contain "
-"ANONYMOUS, EXTERNAL, GSSAPI, SCRAM-SHA-1-PLUS, SCRAM-SHA-1, DIGEST-MD5, "
-"PLAIN, X-MESSENGER-OAUTH2 or XEP-0078"
+"List of authentication mechanisms to try (space separated). Can contain "
+"'ANONYMOUS', 'EXTERNAL', 'GSSAPI', 'SCRAM-SHA-1-PLUS', 'SCRAM-SHA-1', "
+"'DIGEST-MD5', 'PLAIN', 'X-MESSENGER-OAUTH2' or 'XEP-0078'."
 msgstr ""
 
-#: gajim/common/config.py:331
+#: gajim/common/config.py:332
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection. "
-"Can be 'warn', 'connect', 'disconnect'"
+"Can be 'warn', 'connect' or 'disconnect'."
 msgstr ""
 
-#: gajim/common/config.py:332
+#: gajim/common/config.py:333
 msgid "Show a warning dialog before using standard SSL library."
 msgstr ""
 
-#: gajim/common/config.py:333
+#: gajim/common/config.py:334
 msgid ""
 "Show a warning dialog before sending PLAIN password over a plain connection."
 msgstr ""
 
-#: gajim/common/config.py:334
-msgid "Space separated list of ssl errors to ignore."
+#: gajim/common/config.py:335
+msgid "List of SSL errors to ignore (space separated)."
 msgstr ""
 
-#: gajim/common/config.py:340
+#: gajim/common/config.py:341
 msgid ""
-"Space separated list of JIDs for which you do not want to store logs. You "
-"can also add account name to log nothing for this account."
+"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:341
+#: gajim/common/config.py:342
 msgid ""
-"Space separated list of JIDs for which you accept to not log conversations "
-"if he does not want to."
+"List of XMPP Addresses (space separated) for which you accept to not store "
+"chat history if your contact does not want to."
 msgstr ""
 
-#: gajim/common/config.py:343
-msgid "Whitespace sent after inactivity"
+#: gajim/common/config.py:344
+msgid "If enabled, a whitespace is sent after inactivity (keep alive)."
 msgstr ""
 
-#: gajim/common/config.py:344
-msgid "XMPP ping sent after inactivity"
+#: gajim/common/config.py:345
+msgid "If enabled, an XMPP ping is sent after inactivity (ping alive)."
 msgstr ""
 
-#: gajim/common/config.py:348
+#: gajim/common/config.py:349
 msgid ""
-"How many seconds to wait for the answer of ping alive packet before trying "
-"to reconnect?"
+"How many seconds to wait for the answer of a ping alive packet before trying "
+"to reconnect."
 msgstr ""
 
-#: gajim/common/config.py:352
-msgid "Jabberd2 workaround"
+#: gajim/common/config.py:353
+msgid "Jabberd2 workaround."
 msgstr ""
 
-#: gajim/common/config.py:355
+#: gajim/common/config.py:356
 msgid ""
-"If checked, Gajim will use your IP and proxies defined in "
-"file_transfer_proxies option for file transfer."
+"If enabled, Gajim will use your IP and proxies defined in "
+"'file_transfer_proxies' option for file transfers."
 msgstr ""
 
-#: gajim/common/config.py:356
+#: gajim/common/config.py:357
 msgid ""
-"If true, Gajim will test file transfer proxies on startup to be sure it "
-"works. Openfire's proxies are known to fail this test even if they work."
+"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:369
-msgid "Answer to receipt requests"
+#: gajim/common/config.py:370
+msgid "If enabled, Gajim will answer to message receipt requests."
 msgstr ""
 
-#: gajim/common/config.py:370
-msgid "Sent receipt requests"
+#: gajim/common/config.py:371
+msgid "If enabled, Gajim will send message receipt requests."
 msgstr ""
 
-#: gajim/common/config.py:379
+#: gajim/common/config.py:380
 #, 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:380
+#: gajim/common/config.py:381
 #, fuzzy
 msgid "Allow Gajim to send your local time."
 msgstr "Fellout a ra da %s kas deoc'h ur restr."
 
-#: gajim/common/config.py:383
+#: gajim/common/config.py:384
 #, fuzzy
-msgid "Message that is sent to contacts you want to add"
+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:384
-msgid ""
-"If enabled, Gajim will send your local IPs so your contact can connect to "
-"your machine to transfer files."
-msgstr ""
-
 #: gajim/common/config.py:385
 msgid ""
-"Space separated list of JIDs for which chat window will be re-opened on next "
-"startup."
+"If enabled, Gajim will send your local IP so your contact can connect to "
+"your machine for file transfers."
 msgstr ""
 
-#: gajim/common/config.py:387
-msgid "HTTP Upload: Enable HTTPS Verification"
+#: gajim/common/config.py:386
+msgid ""
+"List of XMPP Addresses (space separated) for which the chat window will be "
+"re-opened on next startup."
 msgstr ""
 
 #: gajim/common/config.py:388
-msgid ""
-"Preferred file transfer mechanism for file drag&drop on chat window. Can be "
-"'httpupload' (default) or 'jingle'"
+msgid "HTTP File Upload: Enable HTTPS Verification."
 msgstr ""
 
 #: gajim/common/config.py:389
-msgid "Allow cert verification with POSH"
-msgstr ""
-
-#: gajim/common/config.py:423 gajim/common/config.py:430
-msgid "Language for which misspelled words will be checked"
+msgid ""
+"Preferred file transfer mechanism for file drag&drop on a chat window. Can "
+"be 'httpupload' (default) or 'jingle'."
 msgstr ""
 
-#: gajim/common/config.py:427
-msgid "The currently active encryption for that contact"
-msgstr ""
+#: gajim/common/config.py:390
+#, fuzzy
+msgid "Allow certificate verification with POSH."
+msgstr "Oc'h ouzhpennañ ur gelaouenn nevez evit %s"
 
-#: gajim/common/config.py:431
+#: gajim/common/config.py:425
 msgid ""
-"How many lines to request from server when entering a groupchat. -1 means no "
-"limit, -2 means global value"
+"Chat state notifications that are sent to contacts. Possible values: 'all', "
+"'composing_only', 'disabled'"
 msgstr ""
 
+#: gajim/common/config.py:428
+#, 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:432
 msgid ""
-"Minutes of backlog to request when entering a groupchat. -1 means no limit, "
-"-2 means global value"
+"If enabled, a notification is created for every message in this group chat."
 msgstr ""
 
 #: gajim/common/config.py:433
-msgid "State whether a notification is created for every message in this room"
-msgstr ""
-
-#: gajim/common/config.py:434
+#, fuzzy
 msgid ""
-"Show a status message for all status (away, dnd, etc.) changes of users in a "
-"group chat"
-msgstr ""
+"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:435
+#: gajim/common/config.py:434
 #, fuzzy
-msgid "Show a status message for every join or leave in a group chat"
+msgid "Show a status message for every join or leave in a group chat."
 msgstr "Impossible de rejoindre le salon"
 
+#: gajim/common/config.py:435
+msgid ""
+"If enabled, the group chat is minimized into the contact list when joining "
+"automatically."
+msgstr ""
+
 #: gajim/common/config.py:436
-msgid "If the group chat is minimized into the roster on autojoin"
+msgid ""
+"If enabled, the group chat is minimized into the contact list when closing "
+"it."
 msgstr ""
 
 #: gajim/common/config.py:437
-msgid "If the group chat is minimized into the roster on close"
+msgid ""
+"Chat state notifications that are sent to the group chat. Possible values: "
+"'all', 'composing_only' or 'disabled'."
 msgstr ""
 
-#: gajim/common/config.py:441
+#: gajim/common/config.py:440
 msgid ""
-"State whether plugins should be activated on startup (this is saved on Gajim "
-"exit). This option SHOULD NOT be used to (de)activate plug-ins. Use GUI "
-"instead."
+"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:446 gajim/common/const.py:281
+#: gajim/common/config.py:445 gajim/common/const.py:315
 msgid "Sleeping"
 msgstr "O kousket"
 
-#: gajim/common/config.py:447
+#: gajim/common/config.py:446
 msgid "Back soon"
 msgstr "Distro 'benn nebeut"
 
-#: gajim/common/config.py:447
+#: gajim/common/config.py:446
 msgid "Back in some minutes."
 msgstr "Distro 'vin a-benn un nebeut munutennoù.."
 
-#: gajim/common/config.py:448 gajim/common/const.py:247
+#: gajim/common/config.py:447 gajim/common/const.py:281
 msgid "Eating"
 msgstr "O tebriñ"
 
-#: gajim/common/config.py:448
-msgid "I'm eating, so leave me a message."
-msgstr "O tebriñ 'maon, neuze laoskit ur gemennadenn."
+#: gajim/common/config.py:447
+#, fuzzy
+msgid "I'm eating."
+msgstr "O labourat 'maon."
 
-#: gajim/common/config.py:449
+#: gajim/common/config.py:448
 msgid "Movie"
 msgstr "Film"
 
-#: gajim/common/config.py:449
+#: gajim/common/config.py:448
 msgid "I'm watching a movie."
 msgstr "O sellout ouzh ur film 'maon."
 
-#: gajim/common/config.py:450 gajim/common/const.py:314
+#: gajim/common/config.py:449 gajim/common/const.py:348
 msgid "Working"
 msgstr "O labourat"
 
-#: gajim/common/config.py:450
+#: gajim/common/config.py:449
 msgid "I'm working."
 msgstr "O labourat 'maon."
 
-#: gajim/common/config.py:451
+#: gajim/common/config.py:450
 msgid "Phone"
 msgstr "Pellgomz"
 
-#: gajim/common/config.py:451
+#: gajim/common/config.py:450
 msgid "I'm on the phone."
 msgstr "Ouzh ar pellgomz emaon."
 
-#: gajim/common/config.py:452
+#: gajim/common/config.py:451
 msgid "Out"
 msgstr "Er-maez"
 
-#: gajim/common/config.py:452
+#: gajim/common/config.py:451
 #, fuzzy
 msgid "I'm out enjoying life."
 msgstr "Er-maez emaon o profitañ eus ar vuhez"
 
-#: gajim/common/config.py:463
+#: gajim/common/config.py:462
 #, fuzzy
 msgid "I'm available."
 msgstr "Hegerz"
 
-#: gajim/common/config.py:464
+#: gajim/common/config.py:463
 #, fuzzy
 msgid "I'm free for chat."
 msgstr "Prest da flapiñ"
 
-#: gajim/common/config.py:465 gajim/gtk/accounts.py:134
+#: gajim/common/config.py:464 gajim/gtk/accounts.py:133
 msgid "Be right back."
 msgstr "Distro a-benn nebeut."
 
-#: gajim/common/config.py:466
+#: gajim/common/config.py:465
 #, fuzzy
 msgid "I'm not available."
 msgstr "Dihegerz"
 
-#: gajim/common/config.py:467
+#: gajim/common/config.py:466
 msgid "Do not disturb."
 msgstr ""
 
-#: gajim/common/config.py:468 gajim/common/config.py:469
+#: gajim/common/config.py:467 gajim/common/config.py:468
 msgid "Bye!"
 msgstr ""
 
-#: gajim/common/config.py:480
+#: gajim/common/config.py:479
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
-"muc_highlight_words, or when a group chat message contains your nickname."
+"'muc_highlight_words' your nickname is mentioned."
 msgstr ""
 
-#: gajim/common/config.py:481
-msgid "Sound to play when any MUC message arrives."
+#: gajim/common/config.py:480
+msgid "Sound to play when any group chat message arrives."
 msgstr ""
 
-#: gajim/common/config.py:485
+#: gajim/common/config.py:484
 #, fuzzy
 msgid "Tor"
 msgstr "Da"
@@ -4006,945 +3998,1041 @@ msgstr "Da"
 msgid "Error: cannot open %s for reading"
 msgstr "Fazi: dibosupl eo digeriñ %s evit e lenn"
 
-#: gajim/common/const.py:214
+#: gajim/common/const.py:216
+#, fuzzy
+msgid "?Group chat name:Team"
+msgstr "Hini ebet"
+
+#: gajim/common/const.py:217
+msgid "?Group chat description:Project discussion"
+msgstr ""
+
+#: gajim/common/const.py:218
+#, fuzzy
+msgid "?Group chat address:team"
+msgstr "Flapoù a-stroll"
+
+#: gajim/common/const.py:219
+#, fuzzy
+msgid "?Group chat name:Family"
+msgstr "Message d'un Salon mis en Sur-brillance"
+
+#: gajim/common/const.py:220
+msgid "?Group chat description:Spring gathering"
+msgstr ""
+
+#: gajim/common/const.py:221
+msgid "?Group chat address:family"
+msgstr ""
+
+#: gajim/common/const.py:222
+#, fuzzy
+msgid "?Group chat name:Vacation"
+msgstr "Pedadenn evit ur sal-flapiñ"
+
+#: gajim/common/const.py:223
+msgid "?Group chat description:Trip planning"
+msgstr ""
+
+#: gajim/common/const.py:224
+#, fuzzy
+msgid "?Group chat address:vacation"
+msgstr "Pedadenn evit ur sal-flapiñ"
+
+#: gajim/common/const.py:225
+#, fuzzy
+msgid "?Group chat name:Repairs"
+msgstr "Flap a-stroll"
+
+#: gajim/common/const.py:226
+msgid "?Group chat description:Local help group"
+msgstr ""
+
+#: gajim/common/const.py:227
+#, fuzzy
+msgid "?Group chat address:repairs"
+msgstr "Flapoù a-stroll"
+
+#: gajim/common/const.py:228
+#, fuzzy
+msgid "?Group chat name:News"
+msgstr "Hini ebet"
+
+#: gajim/common/const.py:229
+#, 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:230
+#, fuzzy
+msgid "?Group chat address:news"
+msgstr "Flap a-stroll"
+
+#: gajim/common/const.py:235
+#, fuzzy
+msgid "Remote server not found"
+msgstr "N'eo ket bet kavet ar servij"
+
+#: gajim/common/const.py:236
+msgid "Remote server timeout"
+msgstr ""
+
+#: gajim/common/const.py:237 gajim/common/const.py:238
+#: gajim/common/const.py:239
+#, fuzzy
+msgid "Address does not belong to a group chat server"
+msgstr "A guzha an nozelennoù er prenestr flapiñ"
+
+#: gajim/common/const.py:240
+#, fuzzy
+msgid "Group chat already exists"
+msgstr "Anv-kont implijet dija"
+
+#: gajim/common/const.py:241
+#, fuzzy
+msgid "Group chat does not exist"
+msgstr "Ce salon n'existe pas."
+
+#: gajim/common/const.py:247
 msgid "This message was encrypted with OTR and could not be decrypted."
 msgstr ""
 
-#: gajim/common/const.py:217
+#: gajim/common/const.py:250
 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:221
+#: gajim/common/const.py:254
 msgid ""
-"This message was encrypted with OpenPGP for XMPP and could not be decrypted."
+"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:224
+#: gajim/common/const.py:258
 #, python-format
 msgid "This message was encrypted with %s and could not be decrypted."
 msgstr ""
 
-#: gajim/common/const.py:231
+#: gajim/common/const.py:265
 #, fuzzy
 msgid "Doing Chores"
 msgstr "Ger-kuzh faos"
 
-#: gajim/common/const.py:232
+#: gajim/common/const.py:266
 msgid "Buying Groceries"
 msgstr ""
 
-#: gajim/common/const.py:233
+#: gajim/common/const.py:267
 #, fuzzy
 msgid "Cleaning"
 msgstr "Darvoud"
 
-#: gajim/common/const.py:234
+#: gajim/common/const.py:268
 #, fuzzy
 msgid "Cooking"
 msgstr "O skrivañ"
 
-#: gajim/common/const.py:235
+#: gajim/common/const.py:269
 msgid "Doing Maintenance"
 msgstr ""
 
-#: gajim/common/const.py:236
+#: gajim/common/const.py:270
 msgid "Doing the Dishes"
 msgstr ""
 
-#: gajim/common/const.py:237
+#: gajim/common/const.py:271
 msgid "Doing the Laundry"
 msgstr ""
 
-#: gajim/common/const.py:238
+#: gajim/common/const.py:272
 #, fuzzy
 msgid "Gardening"
 msgstr "O labourat"
 
-#: gajim/common/const.py:239
+#: gajim/common/const.py:273
 msgid "Running an Errand"
 msgstr ""
 
-#: gajim/common/const.py:240
+#: gajim/common/const.py:274
 #, fuzzy
 msgid "Walking the Dog"
 msgstr "Er strollad"
 
-#: gajim/common/const.py:242
+#: gajim/common/const.py:276
 #, fuzzy
 msgid "Drinking"
 msgstr "O labourat"
 
-#: gajim/common/const.py:243
+#: gajim/common/const.py:277
 msgid "Having a Beer"
 msgstr ""
 
-#: gajim/common/const.py:244
+#: gajim/common/const.py:278
 msgid "Having Coffee"
 msgstr ""
 
-#: gajim/common/const.py:245
+#: gajim/common/const.py:279
 msgid "Having Tea"
 msgstr ""
 
-#: gajim/common/const.py:248
+#: gajim/common/const.py:282
 msgid "Having a Snack"
 msgstr ""
 
-#: gajim/common/const.py:249
+#: gajim/common/const.py:283
 msgid "Having Breakfast"
 msgstr ""
 
-#: gajim/common/const.py:250
+#: gajim/common/const.py:284
 msgid "Having Dinner"
 msgstr ""
 
-#: gajim/common/const.py:251
+#: gajim/common/const.py:285
 msgid "Having Lunch"
 msgstr ""
 
-#: gajim/common/const.py:253
+#: gajim/common/const.py:287
 msgid "Exercising"
 msgstr ""
 
-#: gajim/common/const.py:254 gajim/common/const.py:305
+#: gajim/common/const.py:288 gajim/common/const.py:339
 msgid "Cycling"
 msgstr ""
 
-#: gajim/common/const.py:255
+#: gajim/common/const.py:289
 #, fuzzy
 msgid "Dancing"
 msgstr "Darvoud"
 
-#: gajim/common/const.py:256
+#: gajim/common/const.py:290
 #, fuzzy
 msgid "Hiking"
 msgstr "Skarzhañ %s"
 
-#: gajim/common/const.py:257
+#: gajim/common/const.py:291
 #, fuzzy
 msgid "Jogging"
 msgstr "E_barzhiñ"
 
-#: gajim/common/const.py:258
+#: gajim/common/const.py:292
 msgid "Playing Sports"
 msgstr ""
 
-#: gajim/common/const.py:259
+#: gajim/common/const.py:293
 msgid "Running"
 msgstr ""
 
-#: gajim/common/const.py:260
+#: gajim/common/const.py:294
 #, fuzzy
 msgid "Skiing"
 msgstr "O labourat"
 
-#: gajim/common/const.py:261
+#: gajim/common/const.py:295
 msgid "Swimming"
 msgstr ""
 
-#: gajim/common/const.py:262
+#: gajim/common/const.py:296
 #, fuzzy
 msgid "Working out"
 msgstr "O labourat"
 
-#: gajim/common/const.py:264
+#: gajim/common/const.py:298
 msgid "Grooming"
 msgstr ""
 
-#: gajim/common/const.py:265
+#: gajim/common/const.py:299
 msgid "At the Spa"
 msgstr ""
 
-#: gajim/common/const.py:266
+#: gajim/common/const.py:300
 msgid "Brushing Teeth"
 msgstr ""
 
-#: gajim/common/const.py:267
+#: gajim/common/const.py:301
 msgid "Getting a Haircut"
 msgstr ""
 
-#: gajim/common/const.py:268
+#: gajim/common/const.py:302
 #, fuzzy
 msgid "Shaving"
 msgstr "O tebriñ"
 
-#: gajim/common/const.py:269
+#: gajim/common/const.py:303
 msgid "Taking a Bath"
 msgstr ""
 
-#: gajim/common/const.py:270
+#: gajim/common/const.py:304
 msgid "Taking a Shower"
 msgstr ""
 
-#: gajim/common/const.py:272
+#: gajim/common/const.py:306
 msgid "Having an Appointment"
 msgstr ""
 
-#: gajim/common/const.py:274
+#: gajim/common/const.py:308
 msgid "Inactive"
 msgstr "Dizoberiant"
 
-#: gajim/common/const.py:275
+#: gajim/common/const.py:309
 msgid "Day Off"
 msgstr ""
 
-#: gajim/common/const.py:276
+#: gajim/common/const.py:310
 #, fuzzy
 msgid "Hanging out"
 msgstr "Cheñch ar sujed"
 
-#: gajim/common/const.py:277
+#: gajim/common/const.py:311
 #, fuzzy
 msgid "Hiding"
 msgstr "Skarzhañ %s"
 
-#: gajim/common/const.py:278
+#: gajim/common/const.py:312
 msgid "On Vacation"
 msgstr ""
 
-#: gajim/common/const.py:279
+#: gajim/common/const.py:313
 #, fuzzy
 msgid "Praying"
 msgstr "O tebriñ"
 
-#: gajim/common/const.py:280
+#: gajim/common/const.py:314
 msgid "Scheduled Holiday"
 msgstr ""
 
-#: gajim/common/const.py:282
+#: gajim/common/const.py:316
 #, fuzzy
 msgid "Thinking"
 msgstr "O labourat"
 
-#: gajim/common/const.py:284
+#: gajim/common/const.py:318
 #, fuzzy
 msgid "Relaxing"
 msgstr "Standard"
 
-#: gajim/common/const.py:285
+#: gajim/common/const.py:319
 #, fuzzy
 msgid "Fishing"
 msgstr "Skarzhañ %s"
 
-#: gajim/common/const.py:286
+#: gajim/common/const.py:320
 #, fuzzy
 msgid "Gaming"
 msgstr "O tebriñ"
 
-#: gajim/common/const.py:287
+#: gajim/common/const.py:321
 #, fuzzy
 msgid "Going out"
 msgstr "_Dilugañ"
 
-#: gajim/common/const.py:288
+#: gajim/common/const.py:322
 #, fuzzy
 msgid "Partying"
 msgstr "O tebriñ"
 
-#: gajim/common/const.py:289
+#: gajim/common/const.py:323
 #, fuzzy
 msgid "Reading"
 msgstr "Abeg"
 
-#: gajim/common/const.py:290
+#: gajim/common/const.py:324
 #, fuzzy
 msgid "Rehearsing"
 msgstr "Abeg"
 
-#: gajim/common/const.py:291
+#: gajim/common/const.py:325
 #, fuzzy
 msgid "Shopping"
 msgstr "O kousket"
 
-#: gajim/common/const.py:292
+#: gajim/common/const.py:326
 #, fuzzy
 msgid "Smoking"
 msgstr "O labourat"
 
-#: gajim/common/const.py:293
+#: gajim/common/const.py:327
 msgid "Socializing"
 msgstr ""
 
-#: gajim/common/const.py:294
+#: gajim/common/const.py:328
 #, fuzzy
 msgid "Sunbathing"
 msgstr "O tebriñ"
 
-#: gajim/common/const.py:295
+#: gajim/common/const.py:329
 msgid "Watching TV"
 msgstr ""
 
-#: gajim/common/const.py:296
+#: gajim/common/const.py:330
 #, fuzzy
 msgid "Watching a Movie"
 msgstr "O sellout ouzh ur film 'maon."
 
-#: gajim/common/const.py:298
+#: gajim/common/const.py:332
 #, fuzzy
 msgid "Talking"
 msgstr "O tebriñ"
 
-#: gajim/common/const.py:299
+#: gajim/common/const.py:333
 msgid "In Real Life"
 msgstr ""
 
-#: gajim/common/const.py:300
+#: gajim/common/const.py:334
 #, fuzzy
 msgid "On the Phone"
 msgstr "Ouzh ar pellgomz emaon."
 
-#: gajim/common/const.py:301
+#: gajim/common/const.py:335
 msgid "On Video Phone"
 msgstr ""
 
-#: gajim/common/const.py:303
+#: gajim/common/const.py:337
 #, fuzzy
 msgid "Traveling"
 msgstr "O treuzkas"
 
-#: gajim/common/const.py:304
+#: gajim/common/const.py:338
 #, fuzzy
 msgid "Commuting"
 msgstr "O skrivañ"
 
-#: gajim/common/const.py:306
+#: gajim/common/const.py:340
 msgid "Driving"
 msgstr ""
 
-#: gajim/common/const.py:307
+#: gajim/common/const.py:341
 msgid "In a Car"
 msgstr ""
 
-#: gajim/common/const.py:308
+#: gajim/common/const.py:342
 msgid "On a Bus"
 msgstr ""
 
-#: gajim/common/const.py:309
+#: gajim/common/const.py:343
 msgid "On a Plane"
 msgstr ""
 
-#: gajim/common/const.py:310
+#: gajim/common/const.py:344
 msgid "On a Train"
 msgstr ""
 
-#: gajim/common/const.py:311
+#: gajim/common/const.py:345
 msgid "On a Trip"
 msgstr ""
 
-#: gajim/common/const.py:312
+#: gajim/common/const.py:346
 #, fuzzy
 msgid "Walking"
 msgstr "O labourat"
 
-#: gajim/common/const.py:315
+#: gajim/common/const.py:349
 #, fuzzy
 msgid "Coding"
 msgstr "O skrivañ"
 
-#: gajim/common/const.py:316
+#: gajim/common/const.py:350
 msgid "In a Meeting"
 msgstr ""
 
-#: gajim/common/const.py:317
+#: gajim/common/const.py:351
 msgid "Studying"
 msgstr ""
 
-#: gajim/common/const.py:318
+#: gajim/common/const.py:352
 #, fuzzy
 msgid "Writing"
 msgstr "O labourat"
 
-#: gajim/common/const.py:321
+#: gajim/common/const.py:355
 msgid "Afraid"
 msgstr ""
 
-#: gajim/common/const.py:322
+#: gajim/common/const.py:356
 msgid "Amazed"
 msgstr ""
 
-#: gajim/common/const.py:323
+#: gajim/common/const.py:357
 msgid "Amorous"
 msgstr ""
 
-#: gajim/common/const.py:324
+#: gajim/common/const.py:358
 msgid "Angry"
 msgstr ""
 
-#: gajim/common/const.py:325
+#: gajim/common/const.py:359
 msgid "Annoyed"
 msgstr ""
 
-#: gajim/common/const.py:326
+#: gajim/common/const.py:360
 msgid "Anxious"
 msgstr ""
 
-#: gajim/common/const.py:327
+#: gajim/common/const.py:361
 #, fuzzy
 msgid "Aroused"
 msgstr "Ehan"
 
-#: gajim/common/const.py:328
+#: gajim/common/const.py:362
 msgid "Ashamed"
 msgstr ""
 
-#: gajim/common/const.py:329
+#: gajim/common/const.py:363
 #, fuzzy
 msgid "Bored"
 msgstr "Tev"
 
-#: gajim/common/const.py:330
+#: gajim/common/const.py:364
 msgid "Brave"
 msgstr ""
 
-#: gajim/common/const.py:331
+#: gajim/common/const.py:365
 msgid "Calm"
 msgstr ""
 
-#: gajim/common/const.py:332
+#: gajim/common/const.py:366
 #, fuzzy
 msgid "Cautious"
 msgstr "Flapoù"
 
-#: gajim/common/const.py:333
+#: gajim/common/const.py:367
 #, fuzzy
 msgid "Cold"
 msgstr "Tev"
 
-#: gajim/common/const.py:334
+#: gajim/common/const.py:368
 #, fuzzy
 msgid "Confident"
 msgstr "_Endalc'hadoù"
 
-#: gajim/common/const.py:335
+#: gajim/common/const.py:369
 msgid "Confused"
 msgstr ""
 
-#: gajim/common/const.py:336
+#: gajim/common/const.py:370
 #, fuzzy
 msgid "Contemplative"
 msgstr "Echu"
 
-#: gajim/common/const.py:337
+#: gajim/common/const.py:371
 #, fuzzy
 msgid "Contented"
 msgstr "_Endalc'hadoù"
 
-#: gajim/common/const.py:338
+#: gajim/common/const.py:372
 msgid "Cranky"
 msgstr ""
 
-#: gajim/common/const.py:339
+#: gajim/common/const.py:373
 msgid "Crazy"
 msgstr ""
 
-#: gajim/common/const.py:340
+#: gajim/common/const.py:374
 #, fuzzy
 msgid "Creative"
 msgstr "Dizoberiant"
 
-#: gajim/common/const.py:341
+#: gajim/common/const.py:375
 msgid "Curious"
 msgstr ""
 
-#: gajim/common/const.py:342
+#: gajim/common/const.py:376
 #, fuzzy
 msgid "Dejected"
 msgstr "Dilemel"
 
-#: gajim/common/const.py:343
+#: gajim/common/const.py:377
 msgid "Depressed"
 msgstr ""
 
-#: gajim/common/const.py:344
+#: gajim/common/const.py:378
 #, fuzzy
 msgid "Disappointed"
 msgstr "Dizoberiant"
 
-#: gajim/common/const.py:345
+#: gajim/common/const.py:379
 msgid "Disgusted"
 msgstr ""
 
-#: gajim/common/const.py:346
+#: gajim/common/const.py:380
 #, fuzzy
 msgid "Dismayed"
 msgstr "Dizoberiant"
 
-#: gajim/common/const.py:347
+#: gajim/common/const.py:381
 #, fuzzy
 msgid "Distracted"
 msgstr "Dizoberiant"
 
-#: gajim/common/const.py:348
+#: gajim/common/const.py:382
 msgid "Embarrassed"
 msgstr ""
 
-#: gajim/common/const.py:349
+#: gajim/common/const.py:383
 msgid "Envious"
 msgstr ""
 
-#: gajim/common/const.py:350
+#: gajim/common/const.py:384
 msgid "Excited"
 msgstr ""
 
-#: gajim/common/const.py:351
+#: gajim/common/const.py:385
 msgid "Flirtatious"
 msgstr ""
 
-#: gajim/common/const.py:352
+#: gajim/common/const.py:386
 msgid "Frustrated"
 msgstr ""
 
-#: gajim/common/const.py:353
+#: gajim/common/const.py:387
 msgid "Grateful"
 msgstr ""
 
-#: gajim/common/const.py:354
+#: gajim/common/const.py:388
 msgid "Grieving"
 msgstr ""
 
-#: gajim/common/const.py:355
+#: gajim/common/const.py:389
 #, fuzzy
 msgid "Grumpy"
 msgstr "Strollad"
 
-#: gajim/common/const.py:356
+#: gajim/common/const.py:390
 msgid "Guilty"
 msgstr ""
 
-#: gajim/common/const.py:357
+#: gajim/common/const.py:391
 msgid "Happy"
 msgstr ""
 
-#: gajim/common/const.py:358
+#: gajim/common/const.py:392
 msgid "Hopeful"
 msgstr ""
 
-#: gajim/common/const.py:359
+#: gajim/common/const.py:393
 #, fuzzy
 msgid "Hot"
 msgstr "_Ostiz:"
 
-#: gajim/common/const.py:360
+#: gajim/common/const.py:394
 msgid "Humbled"
 msgstr ""
 
-#: gajim/common/const.py:361
+#: gajim/common/const.py:395
 msgid "Humiliated"
 msgstr ""
 
-#: gajim/common/const.py:362
+#: gajim/common/const.py:396
 msgid "Hungry"
 msgstr ""
 
-#: gajim/common/const.py:363
+#: gajim/common/const.py:397
 msgid "Hurt"
 msgstr ""
 
-#: gajim/common/const.py:364
+#: gajim/common/const.py:398
 #, fuzzy
 msgid "Impressed"
 msgstr "kemennadenn"
 
-#: gajim/common/const.py:365
+#: gajim/common/const.py:399
 msgid "In Awe"
 msgstr ""
 
-#: gajim/common/const.py:366
+#: gajim/common/const.py:400
 msgid "In Love"
 msgstr ""
 
-#: gajim/common/const.py:367
+#: gajim/common/const.py:401
 msgid "Indignant"
 msgstr ""
 
-#: gajim/common/const.py:368
+#: gajim/common/const.py:402
 msgid "Interested"
 msgstr ""
 
-#: gajim/common/const.py:369
+#: gajim/common/const.py:403
 msgid "Intoxicated"
 msgstr ""
 
-#: gajim/common/const.py:370
+#: gajim/common/const.py:404
 #, fuzzy
 msgid "Invincible"
 msgstr "Diwelus"
 
-#: gajim/common/const.py:371
+#: gajim/common/const.py:405
 msgid "Jealous"
 msgstr ""
 
-#: gajim/common/const.py:372
+#: gajim/common/const.py:406
 #, fuzzy
 msgid "Lonely"
 msgstr "Hini ebet"
 
-#: gajim/common/const.py:373
+#: gajim/common/const.py:407
 #, fuzzy
 msgid "Lost"
 msgstr "_Ostiz:"
 
-#: gajim/common/const.py:374
+#: gajim/common/const.py:408
 msgid "Lucky"
 msgstr ""
 
-#: gajim/common/const.py:375
+#: gajim/common/const.py:409
 #, fuzzy
 msgid "Mean"
 msgstr "Hollek"
 
-#: gajim/common/const.py:376
+#: gajim/common/const.py:410
 #, fuzzy
 msgid "Moody"
 msgstr "_Kemmañ"
 
-#: gajim/common/const.py:377
+#: gajim/common/const.py:411
 msgid "Nervous"
 msgstr ""
 
-#: gajim/common/const.py:378
+#: gajim/common/const.py:412
 msgid "Neutral"
 msgstr ""
 
-#: gajim/common/const.py:379
+#: gajim/common/const.py:413
 #, fuzzy
 msgid "Offended"
 msgstr "Ezlinenn"
 
-#: gajim/common/const.py:380
+#: gajim/common/const.py:414
 msgid "Outraged"
 msgstr ""
 
-#: gajim/common/const.py:381
+#: gajim/common/const.py:415
 msgid "Playful"
 msgstr ""
 
-#: gajim/common/const.py:382
+#: gajim/common/const.py:416
 #, fuzzy
 msgid "Proud"
 msgstr "Strollad"
 
-#: gajim/common/const.py:383
+#: gajim/common/const.py:417
 msgid "Relaxed"
 msgstr ""
 
-#: gajim/common/const.py:384
+#: gajim/common/const.py:418
 #, fuzzy
 msgid "Relieved"
 msgstr "Dilemel"
 
-#: gajim/common/const.py:385
+#: gajim/common/const.py:419
 msgid "Remorseful"
 msgstr ""
 
-#: gajim/common/const.py:386
+#: gajim/common/const.py:420
 msgid "Restless"
 msgstr ""
 
-#: gajim/common/const.py:387
+#: gajim/common/const.py:421
 msgid "Sad"
 msgstr ""
 
-#: gajim/common/const.py:388
+#: gajim/common/const.py:422
 msgid "Sarcastic"
 msgstr ""
 
-#: gajim/common/const.py:389
+#: gajim/common/const.py:423
 #, fuzzy
 msgid "Satisfied"
 msgstr "Anv:"
 
-#: gajim/common/const.py:390
+#: gajim/common/const.py:424
 msgid "Serious"
 msgstr ""
 
-#: gajim/common/const.py:391
+#: gajim/common/const.py:425
 msgid "Shocked"
 msgstr ""
 
-#: gajim/common/const.py:392
+#: gajim/common/const.py:426
 msgid "Shy"
 msgstr ""
 
-#: gajim/common/const.py:393
+#: gajim/common/const.py:427
 #, fuzzy
 msgid "Sick"
 msgstr "Lesanv"
 
-#: gajim/common/const.py:394
+#: gajim/common/const.py:428
 #, fuzzy
 msgid "Sleepy"
 msgstr "O kousket"
 
-#: gajim/common/const.py:395
+#: gajim/common/const.py:429
 msgid "Spontaneous"
 msgstr ""
 
-#: gajim/common/const.py:396
+#: gajim/common/const.py:430
 #, fuzzy
 msgid "Stressed"
 msgstr "Straed:"
 
-#: gajim/common/const.py:397
+#: gajim/common/const.py:431
 msgid "Strong"
 msgstr ""
 
-#: gajim/common/const.py:398
+#: gajim/common/const.py:432
 #, fuzzy
 msgid "Surprised"
 msgstr "Emezelañ"
 
-#: gajim/common/const.py:399
+#: gajim/common/const.py:433
 msgid "Thankful"
 msgstr ""
 
-#: gajim/common/const.py:400
+#: gajim/common/const.py:434
 msgid "Thirsty"
 msgstr ""
 
-#: gajim/common/const.py:401
+#: gajim/common/const.py:435
 #, fuzzy
 msgid "Tired"
 msgstr "Mare"
 
-#: gajim/common/const.py:402
+#: gajim/common/const.py:436
 #, fuzzy
 msgid "Undefined"
 msgstr "Islinennañ"
 
-#: gajim/common/const.py:403
+#: gajim/common/const.py:437
 msgid "Weak"
 msgstr ""
 
-#: gajim/common/const.py:404
+#: gajim/common/const.py:438
 msgid "Worried"
 msgstr ""
 
-#: gajim/common/const.py:408
+#: gajim/common/const.py:442
 msgid "accuracy"
 msgstr ""
 
-#: gajim/common/const.py:409
+#: gajim/common/const.py:443
 #, fuzzy
 msgid "alt"
 msgstr "Dilemel"
 
-#: gajim/common/const.py:410
+#: gajim/common/const.py:444
 msgid "area"
 msgstr ""
 
-#: gajim/common/const.py:411
+#: gajim/common/const.py:445
 #, fuzzy
 msgid "bearing"
 msgstr "Glas-mor"
 
-#: gajim/common/const.py:412
+#: gajim/common/const.py:446
 #, fuzzy
 msgid "building"
 msgstr "Skarzhañ %s"
 
-#: gajim/common/const.py:413
+#: gajim/common/const.py:447
 #, fuzzy
 msgid "country"
 msgstr "Bro:"
 
-#: gajim/common/const.py:414
+#: gajim/common/const.py:448
 #, fuzzy
 msgid "countrycode"
 msgstr "Kont"
 
-#: gajim/common/const.py:415
+#: gajim/common/const.py:449
 msgid "datum"
 msgstr ""
 
-#: gajim/common/const.py:416
+#: gajim/common/const.py:450
 #, fuzzy
 msgid "description"
 msgstr "Taolennadur"
 
-#: gajim/common/const.py:417
+#: gajim/common/const.py:451
 msgid "error"
 msgstr ""
 
-#: gajim/common/const.py:418
+#: gajim/common/const.py:452
 msgid "floor"
 msgstr ""
 
-#: gajim/common/const.py:419
+#: gajim/common/const.py:453
 msgid "lat"
 msgstr ""
 
-#: gajim/common/const.py:420
+#: gajim/common/const.py:454
 msgid "locality"
 msgstr ""
 
-#: gajim/common/const.py:421
+#: gajim/common/const.py:455
 #, fuzzy
 msgid "lon"
 msgstr "Hini ebet"
 
-#: gajim/common/const.py:422
+#: gajim/common/const.py:456
 msgid "postalcode"
 msgstr ""
 
-#: gajim/common/const.py:423
+#: gajim/common/const.py:457
 msgid "region"
 msgstr ""
 
-#: gajim/common/const.py:424
+#: gajim/common/const.py:458
 #, fuzzy
 msgid "room"
 msgstr "Digant"
 
-#: gajim/common/const.py:425
+#: gajim/common/const.py:459
 msgid "speed"
 msgstr ""
 
-#: gajim/common/const.py:426
+#: gajim/common/const.py:460
 msgid "street"
 msgstr ""
 
-#: gajim/common/const.py:427
+#: gajim/common/const.py:461
 msgid "text"
 msgstr ""
 
-#: gajim/common/const.py:428
+#: gajim/common/const.py:462
 msgid "timestamp"
 msgstr ""
 
-#: gajim/common/const.py:429
+#: gajim/common/const.py:463
 msgid "URI"
 msgstr ""
 
-#: gajim/common/const.py:434
+#: gajim/common/const.py:468
 msgid "Unable to get issuer certificate"
 msgstr ""
 
-#: gajim/common/const.py:435
+#: gajim/common/const.py:469
 msgid "Unable to get certificate CRL"
 msgstr ""
 
-#: gajim/common/const.py:436
+#: gajim/common/const.py:470
 msgid "Unable to decrypt certificate's signature"
 msgstr ""
 
-#: gajim/common/const.py:437
+#: gajim/common/const.py:471
 msgid "Unable to decrypt CRL's signature"
 msgstr ""
 
-#: gajim/common/const.py:438
+#: gajim/common/const.py:472
 #, fuzzy
 msgid "Unable to decode issuer public key"
 msgstr "Impossible de rejoindre le salon"
 
-#: gajim/common/const.py:439
+#: gajim/common/const.py:473
 msgid "Certificate signature failure"
 msgstr ""
 
-#: gajim/common/const.py:440
+#: gajim/common/const.py:474
 msgid "CRL signature failure"
 msgstr ""
 
-#: gajim/common/const.py:441
+#: gajim/common/const.py:475
 msgid "Certificate is not yet valid"
 msgstr ""
 
-#: gajim/common/const.py:442
+#: gajim/common/const.py:476
 msgid "Certificate has expired"
 msgstr ""
 
-#: gajim/common/const.py:443
+#: gajim/common/const.py:477
 msgid "CRL is not yet valid"
 msgstr ""
 
-#: gajim/common/const.py:444
+#: gajim/common/const.py:478
 msgid "CRL has expired"
 msgstr ""
 
-#: gajim/common/const.py:445
+#: gajim/common/const.py:479
 msgid "Format error in certificate's notBefore field"
 msgstr ""
 
-#: gajim/common/const.py:446
+#: gajim/common/const.py:480
 msgid "Format error in certificate's notAfter field"
 msgstr ""
 
-#: gajim/common/const.py:447
+#: gajim/common/const.py:481
 msgid "Format error in CRL's lastUpdate field"
 msgstr ""
 
-#: gajim/common/const.py:448
+#: gajim/common/const.py:482
 msgid "Format error in CRL's nextUpdate field"
 msgstr ""
 
-#: gajim/common/const.py:449
+#: gajim/common/const.py:483
 msgid "Out of memory"
 msgstr ""
 
-#: gajim/common/const.py:450
+#: gajim/common/const.py:484
 msgid "Self signed certificate"
 msgstr ""
 
-#: gajim/common/const.py:451
+#: gajim/common/const.py:485
 msgid "Self signed certificate in certificate chain"
 msgstr ""
 
-#: gajim/common/const.py:452
+#: gajim/common/const.py:486
 msgid "Unable to get local issuer certificate"
 msgstr ""
 
-#: gajim/common/const.py:453
+#: gajim/common/const.py:487
 msgid "Unable to verify the first certificate"
 msgstr ""
 
-#: gajim/common/const.py:454
+#: gajim/common/const.py:488
 msgid "Certificate chain too long"
 msgstr ""
 
-#: gajim/common/const.py:455
+#: gajim/common/const.py:489
 msgid "Certificate revoked"
 msgstr ""
 
-#: gajim/common/const.py:456
+#: gajim/common/const.py:490
 #, fuzzy
 msgid "Invalid CA certificate"
 msgstr "Anv-arveriad-ez direizh"
 
-#: gajim/common/const.py:457
+#: gajim/common/const.py:491
 msgid "Path length constraint exceeded"
 msgstr ""
 
-#: gajim/common/const.py:458
+#: gajim/common/const.py:492
 msgid "Unsupported certificate purpose"
 msgstr ""
 
-#: gajim/common/const.py:459
+#: gajim/common/const.py:493
 msgid "Certificate not trusted"
 msgstr ""
 
-#: gajim/common/const.py:460
+#: gajim/common/const.py:494
 msgid "Certificate rejected"
 msgstr ""
 
-#: gajim/common/const.py:461
+#: gajim/common/const.py:495
 msgid "Subject issuer mismatch"
 msgstr ""
 
-#: gajim/common/const.py:462
+#: gajim/common/const.py:496
 msgid "Authority and subject key identifier mismatch"
 msgstr ""
 
-#: gajim/common/const.py:463
+#: gajim/common/const.py:497
 msgid "Authority and issuer serial number mismatch"
 msgstr ""
 
-#: gajim/common/const.py:464
+#: gajim/common/const.py:498
 msgid "Key usage does not include certificate signing"
 msgstr ""
 
-#: gajim/common/const.py:465
+#: gajim/common/const.py:499
 msgid "Application verification failure"
 msgstr ""
 
@@ -5110,265 +5198,265 @@ msgstr ""
 msgid "video output"
 msgstr ""
 
-#: gajim/common/helpers.py:210
+#: gajim/common/helpers.py:216
 msgid "Server must be between 1 and 1023 bytes"
 msgstr ""
 
-#: gajim/common/helpers.py:214
+#: gajim/common/helpers.py:220
 msgid "Invalid character in hostname."
 msgstr "Arouezenn zireizh en anv-ostiz."
 
-#: gajim/common/helpers.py:216
+#: gajim/common/helpers.py:222
 msgid "Server address required."
 msgstr "Chomlec'h ar servijer dre ret"
 
-#: gajim/common/helpers.py:220
+#: gajim/common/helpers.py:226
 msgid "Username must be between 1 and 1023 bytes"
 msgstr ""
 
-#: gajim/common/helpers.py:224
+#: gajim/common/helpers.py:230
 msgid "Invalid character in username."
 msgstr "Arouezenn ziereizh en anv-arveriad-ez"
 
-#: gajim/common/helpers.py:230
+#: gajim/common/helpers.py:236
 msgid "Resource must be between 1 and 1023 bytes"
 msgstr ""
 
-#: gajim/common/helpers.py:234
+#: gajim/common/helpers.py:240
 msgid "Invalid character in resource."
 msgstr ""
 
-#: gajim/common/helpers.py:275
+#: gajim/common/helpers.py:281
 msgid "_Busy"
 msgstr ""
 
-#: gajim/common/helpers.py:277 gajim/gtk/tooltips.py:647
+#: gajim/common/helpers.py:283 gajim/gtk/tooltips.py:647
 msgid "Busy"
 msgstr ""
 
-#: gajim/common/helpers.py:280
+#: gajim/common/helpers.py:286
 msgid "_Not Available"
 msgstr "D_ihegerz"
 
-#: gajim/common/helpers.py:282 gajim/gtk/tooltips.py:649
+#: gajim/common/helpers.py:288 gajim/gtk/tooltips.py:649
 msgid "Not Available"
 msgstr "Dihegerz"
 
-#: gajim/common/helpers.py:285
+#: gajim/common/helpers.py:291
 msgid "_Free for Chat"
 msgstr "_Prest da flapiñ"
 
-#: gajim/common/helpers.py:287 gajim/gtk/tooltips.py:643
+#: gajim/common/helpers.py:293 gajim/gtk/tooltips.py:643
 msgid "Free for Chat"
 msgstr "Prest da flapiñ"
 
-#: gajim/common/helpers.py:290
+#: gajim/common/helpers.py:296
 #, fuzzy
 msgid "?user status:_Available"
 msgstr "_Hegerz"
 
-#: gajim/common/helpers.py:292 gajim/gtk/tooltips.py:641
+#: gajim/common/helpers.py:298 gajim/gtk/tooltips.py:641
 #, fuzzy
 msgid "?user status:Available"
 msgstr "Diskouez an eur:"
 
-#: gajim/common/helpers.py:294
+#: gajim/common/helpers.py:300
 msgid "Connecting"
 msgstr "O lugañ"
 
-#: gajim/common/helpers.py:297 gajim/data/gui/preferences_window.ui:1251
+#: gajim/common/helpers.py:303 gajim/data/gui/preferences_window.ui:1251
 msgid "A_way"
 msgstr "E_zvezant"
 
-#: gajim/common/helpers.py:299 gajim/common/modules/adhoc_commands.py:120
-#: gajim/command_system/implementation/standard.py:139
+#: gajim/common/helpers.py:305 gajim/common/modules/adhoc_commands.py:120
+#: gajim/command_system/implementation/standard.py:141
 #: gajim/gtk/tooltips.py:645
 msgid "Away"
 msgstr "Ezvezant"
 
-#: gajim/common/helpers.py:302
+#: gajim/common/helpers.py:308
 msgid "_Offline"
 msgstr "_Ezlinenn"
 
-#: gajim/common/helpers.py:304 gajim/gtk/tooltips.py:651
+#: gajim/common/helpers.py:310 gajim/gtk/tooltips.py:651
 msgid "Offline"
 msgstr "Ezlinenn"
 
-#: gajim/common/helpers.py:307
+#: gajim/common/helpers.py:313
 msgid "_Invisible"
 msgstr "_Diwelus"
 
-#: gajim/common/helpers.py:313
+#: gajim/common/helpers.py:319
 msgid "?contact has status:Unknown"
 msgstr "Dianav"
 
-#: gajim/common/helpers.py:315
+#: gajim/common/helpers.py:321
 msgid "?contact has status:Has errors"
 msgstr "fazi"
 
-#: gajim/common/helpers.py:330
+#: gajim/common/helpers.py:336
 msgid "?Subscription we already have:None"
 msgstr "Hini ebet"
 
-#: gajim/common/helpers.py:332
+#: gajim/common/helpers.py:338
 msgid "To"
 msgstr "Da"
 
-#: gajim/common/helpers.py:334 gajim/data/gui/groups_post_window.ui:33
+#: gajim/common/helpers.py:340 gajim/data/gui/groups_post_window.ui:33
 msgid "From"
 msgstr "Digant"
 
-#: gajim/common/helpers.py:336
+#: gajim/common/helpers.py:342
 msgid "Both"
 msgstr "An daou"
 
-#: gajim/common/helpers.py:338 gajim/gtk/server_info.py:151
+#: gajim/common/helpers.py:344 gajim/gtk/server_info.py:151
 #, fuzzy
 msgid "Unknown"
 msgstr "Dianav"
 
-#: gajim/common/helpers.py:344
+#: gajim/common/helpers.py:350
 msgid "?Ask (for Subscription):None"
 msgstr "Hini ebet"
 
-#: gajim/common/helpers.py:346
+#: gajim/common/helpers.py:352
 msgid "Subscribe"
 msgstr "Emezelañ"
 
-#: gajim/common/helpers.py:355
+#: gajim/common/helpers.py:361
 msgid "?Group Chat Contact Role:None"
 msgstr "Hini ebet"
 
-#: gajim/common/helpers.py:358
+#: gajim/common/helpers.py:364
 msgid "Moderators"
 msgstr "Kasourien"
 
-#: gajim/common/helpers.py:360
+#: gajim/common/helpers.py:366
 msgid "Moderator"
 msgstr "Kasour-ez"
 
-#: gajim/common/helpers.py:363
+#: gajim/common/helpers.py:369 gajim/data/gui/groupchat_info_scrolled.ui:243
 msgid "Participants"
 msgstr "Perzhidi"
 
-#: gajim/common/helpers.py:365
+#: gajim/common/helpers.py:371
 msgid "Participant"
 msgstr "Perzhiad-ez"
 
-#: gajim/common/helpers.py:368
+#: gajim/common/helpers.py:374
 msgid "Visitors"
 msgstr "Gweladennerien"
 
-#: gajim/common/helpers.py:370
+#: gajim/common/helpers.py:376
 msgid "Visitor"
 msgstr "Gweladenner-ez"
 
-#: gajim/common/helpers.py:376 gajim/gtk/tooltips.py:253
+#: gajim/common/helpers.py:382 gajim/gtk/tooltips.py:253
 #, fuzzy
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "Hini ebet"
 
-#: gajim/common/helpers.py:378 gajim/data/gui/groupchat_config.ui:32
+#: gajim/common/helpers.py:384 gajim/data/gui/groupchat_config.ui:32
 #: gajim/gtk/tooltips.py:259
 #, fuzzy
 msgid "Owner"
 msgstr "_Perc'hener-ez"
 
-#: gajim/common/helpers.py:380 gajim/gtk/tooltips.py:257
+#: gajim/common/helpers.py:386 gajim/gtk/tooltips.py:257
 #, fuzzy
 msgid "Administrator"
 msgstr "_Merour-ez"
 
-#: gajim/common/helpers.py:382 gajim/data/gui/groupchat_config.ui:40
+#: gajim/common/helpers.py:388 gajim/data/gui/groupchat_config.ui:40
 #: gajim/gtk/tooltips.py:255 gajim/gtk/groupchat_config.py:105
 #, fuzzy
 msgid "Member"
 msgstr "_Ezel"
 
-#: gajim/common/helpers.py:421
+#: gajim/common/helpers.py:427
 msgid "is paying attention to the conversation"
 msgstr "a zo aketus d'ar gaozeadenn"
 
-#: gajim/common/helpers.py:423
+#: gajim/common/helpers.py:429
 msgid "is doing something else"
 msgstr "a ra un dra bennak all"
 
-#: gajim/common/helpers.py:425
+#: gajim/common/helpers.py:431
 #, fuzzy
 msgid "is composing a message…"
 msgstr "a skriv ur gemennadenn..."
 
-#: gajim/common/helpers.py:428
+#: gajim/common/helpers.py:434
 msgid "paused composing a message"
 msgstr "a zo paouezet da skrivañ ar gemennadenn"
 
-#: gajim/common/helpers.py:430
+#: gajim/common/helpers.py:436
 msgid "has closed the chat window or tab"
 msgstr "he/en deus serret ar prenestr-flapiñ pe an ivinell"
 
-#: gajim/common/helpers.py:936 gajim/common/helpers.py:943
+#: gajim/common/helpers.py:942 gajim/common/helpers.py:949
 #, 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:950
+#: gajim/common/helpers.py:956
 #, fuzzy, python-format
-msgid "from room %s"
-msgstr "De %s"
+msgid "from group chat %s"
+msgstr "Ebarzhiñ ur _webgaoz"
 
-#: gajim/common/helpers.py:953 gajim/common/helpers.py:970
+#: gajim/common/helpers.py:959 gajim/common/helpers.py:976
 #, fuzzy, python-format
 msgid "from user %s"
 msgstr "De %s"
 
-#: gajim/common/helpers.py:955
+#: gajim/common/helpers.py:961
 #, fuzzy, python-format
 msgid "from %s"
 msgstr "De %s"
 
-#: gajim/common/helpers.py:962 gajim/common/helpers.py:968
+#: gajim/common/helpers.py:968 gajim/common/helpers.py:974
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
 msgstr[0] ""
 msgstr[1] ""
 
-#: gajim/common/helpers.py:986 gajim/common/helpers.py:998
+#: gajim/common/helpers.py:992 gajim/common/helpers.py:1004
 #: gajim/data/gui/roster_window.ui:85 data/org.gajim.Gajim.desktop.in:4
 #: data/org.gajim.Gajim.appdata.xml.in:9
 msgid "Gajim"
 msgstr "Gajim"
 
-#: gajim/common/helpers.py:1000
+#: gajim/common/helpers.py:1006
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: gajim/common/helpers.py:1109 gajim/data/gui/add_new_contact_window.ui:25
+#: gajim/common/helpers.py:1115 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:1111
+#: gajim/common/helpers.py:1117
 msgid "Hello, I am $name."
 msgstr ""
 
-#: gajim/common/helpers.py:1215 gajim/common/helpers.py:1224
-#: gajim/common/helpers.py:1282
+#: gajim/common/helpers.py:1221 gajim/common/helpers.py:1230
+#: gajim/common/helpers.py:1288
 #, fuzzy
 msgid "Timeout loading image"
 msgstr "Dibosupl eo kargañ ar skeudenn"
 
-#: gajim/common/helpers.py:1234 gajim/common/helpers.py:1280
+#: gajim/common/helpers.py:1240 gajim/common/helpers.py:1286
 msgid "Image is too big"
 msgstr "L'image est trop grande"
 
-#: gajim/common/helpers.py:1245
+#: gajim/common/helpers.py:1251
 msgid "PyCURL is not installed"
 msgstr ""
 
-#: gajim/common/helpers.py:1284
+#: gajim/common/helpers.py:1290
 #, fuzzy
 msgid "Error loading image"
 msgstr "Dibosupl eo kargañ ar skeudenn"
@@ -5552,7 +5640,7 @@ msgstr ""
 #: gajim/common/modules/adhoc_commands.py:202
 #: gajim/common/modules/adhoc_commands.py:239
 #, fuzzy
-msgid "Leave Groupchats"
+msgid "Leave Group Chats"
 msgstr "Flap a-stroll"
 
 #: gajim/common/modules/adhoc_commands.py:228
@@ -5562,16 +5650,17 @@ msgstr "%(nickname)s : %(message)s"
 
 #: gajim/common/modules/adhoc_commands.py:232
 #, fuzzy
-msgid "You have not joined a groupchat."
+msgid "You have not joined a group chat."
 msgstr "Er strollad"
 
 #: gajim/common/modules/adhoc_commands.py:240
-msgid "Choose the groupchats you want to leave"
-msgstr ""
+#, fuzzy
+msgid "Choose the group chats you want to leave"
+msgstr "Leuniit an titouroù diwar-benn an darempred da ouzhpennañ"
 
 #: gajim/common/modules/adhoc_commands.py:289
 #, fuzzy
-msgid "You left the following groupchats:"
+msgid "You left the following group chats:"
 msgstr "Emaoc'h er webgaoz %s dija"
 
 #: gajim/common/modules/roster_item_exchange.py:102
@@ -5589,7 +5678,7 @@ msgstr "Darempredoù"
 msgid "Blocked Contacts"
 msgstr "Darempredoù"
 
-#: gajim/data/gui/destroy_muc_dialog.ui:79 gajim/gtk/dialogs.py:736
+#: gajim/data/gui/destroy_muc_dialog.ui:79 gajim/gtk/dialogs.py:563
 msgid "Destroy this group chat permanently?"
 msgstr ""
 
@@ -5598,7 +5687,7 @@ msgstr ""
 msgid "Reason..."
 msgstr "Abeg"
 
-#: gajim/data/gui/destroy_muc_dialog.ui:124 gajim/gtk/dialogs.py:738
+#: gajim/data/gui/destroy_muc_dialog.ui:124 gajim/gtk/dialogs.py:565
 msgid "Where participants should go (optional)"
 msgstr ""
 
@@ -5610,34 +5699,6 @@ msgstr ""
 msgid "_Reason and alternate venue (optional)"
 msgstr ""
 
-#: gajim/data/gui/advanced_configuration_window.ui:7
-#: gajim/data/gui/preferences_window.ui:2723
-#, fuzzy
-msgid "Advanced Configuration Editor (ACE)"
-msgstr "Aozer kefluniañ dre ar munut"
-
-#: gajim/data/gui/advanced_configuration_window.ui:52
-#, fuzzy
-msgid "You should restart Gajim for some changes to take effect"
-msgstr ""
-"<b>NOTENN :</b> Dav eo deoc'h adloc'hañ Gajim evit ma vo efedus kemmoù 'zo"
-
-#: gajim/data/gui/advanced_configuration_window.ui:84
-#, fuzzy
-msgid "_Filter"
-msgstr "_Sil:"
-
-#: gajim/data/gui/advanced_configuration_window.ui:153
-#: gajim/data/gui/filetransfers_send_file_dialog.ui:15
-#: gajim/gtk/discovery.py:1666
-msgid "Description"
-msgstr "Taolennadur"
-
-#: gajim/data/gui/advanced_configuration_window.ui:197
-#, fuzzy
-msgid "_Reset to default"
-msgstr "_Distreiñ gant al livioù dre-ziouer"
-
 #: gajim/data/gui/join_groupchat_window.ui:56
 #: gajim/data/gui/chat_to_muc_window.ui:67
 #: gajim/data/gui/chat_to_muc_window.ui:78
@@ -5649,9 +5710,8 @@ msgid "Join group chat every time Gajim is started"
 msgstr ""
 
 #: gajim/data/gui/join_groupchat_window.ui:113
-#, fuzzy
-msgid "Auto Join"
-msgstr "E_barzhiñ"
+msgid "Join Automatically"
+msgstr ""
 
 #: gajim/data/gui/join_groupchat_window.ui:131
 #: gajim/data/gui/profile_window.ui:233
@@ -5660,10 +5720,11 @@ msgstr "Kont"
 
 #: gajim/data/gui/join_groupchat_window.ui:147
 #, fuzzy
-msgid "Room"
-msgstr "Webgaoz:"
+msgid "Group chat"
+msgstr "Flapoù a-stroll"
 
-#: gajim/data/gui/join_groupchat_window.ui:180 gajim/gtk/accounts.py:886
+#: gajim/data/gui/join_groupchat_window.ui:180 gajim/data/gui/bookmarks.ui:158
+#: gajim/gtk/accounts.py:889
 #, fuzzy
 msgid "Password"
 msgstr "Ger-kuzh:"
@@ -5687,93 +5748,11 @@ msgstr "Ebarzhiñ ur _webgaoz"
 msgid "Search group chats on selected server"
 msgstr ""
 
-#: gajim/data/gui/join_groupchat_window.ui:437 gajim/gtk/discovery.py:1271
+#: gajim/data/gui/join_groupchat_window.ui:437 gajim/gtk/discovery.py:1270
 #, fuzzy
 msgid "Join"
 msgstr "E_barzhiñ"
 
-#: gajim/data/gui/manage_proxies_window.ui:12
-#, fuzzy
-msgid "HTTP Connect"
-msgstr "Kevreadenn HTTP"
-
-#: gajim/data/gui/manage_proxies_window.ui:15
-msgid "SOCKS5"
-msgstr ""
-
-#: gajim/data/gui/manage_proxies_window.ui:18
-msgid "BOSH"
-msgstr ""
-
-#: gajim/data/gui/manage_proxies_window.ui:27
-msgid "Manage Proxy Profiles"
-msgstr "Merañ an aeladoù proksi"
-
-#: gajim/data/gui/manage_proxies_window.ui:83
-#, fuzzy
-msgid "Add Proxy"
-msgstr "Proksi:"
-
-#: gajim/data/gui/manage_proxies_window.ui:97
-#, fuzzy
-msgid "Remove Proxy"
-msgstr "_Dilemel"
-
-#: gajim/data/gui/manage_proxies_window.ui:141
-#, fuzzy
-msgid "Properties"
-msgstr "<b>Perzhioù</b>"
-
-#: gajim/data/gui/manage_proxies_window.ui:157
-#, fuzzy
-msgid "_Name"
-msgstr "_Anv:"
-
-#: gajim/data/gui/manage_proxies_window.ui:173
-#, fuzzy
-msgid "_Type"
-msgstr "Doare:"
-
-#: gajim/data/gui/manage_proxies_window.ui:236
-#, fuzzy
-msgid "_BOSH URL"
-msgstr "_URL :"
-
-#: gajim/data/gui/manage_proxies_window.ui:261
-#, fuzzy
-msgid "Use HTTP prox_y"
-msgstr "_Implij ur proxy"
-
-#: gajim/data/gui/manage_proxies_window.ui:280
-#, fuzzy
-msgid "Proxy _Host"
-msgstr "Proksi:"
-
-#: gajim/data/gui/manage_proxies_window.ui:307
-#, fuzzy
-msgid "Proxy _Port"
-msgstr "_Porzh:"
-
-#: gajim/data/gui/manage_proxies_window.ui:334
-#, fuzzy
-msgid "_Username"
-msgstr "_Anv:"
-
-#: gajim/data/gui/manage_proxies_window.ui:347
-#, fuzzy
-msgid "Use proxy auth_entication"
-msgstr "Implij an diskleriañ"
-
-#: gajim/data/gui/manage_proxies_window.ui:377
-#, fuzzy
-msgid "Pass_word"
-msgstr "_Ger-kuzh:"
-
-#: gajim/data/gui/manage_proxies_window.ui:405 gajim/gtk/adhoc.py:321
-#, fuzzy
-msgid "Settings"
-msgstr "échec lors de la publication de votre vCard"
-
 #: gajim/data/gui/change_password_dialog.ui:17
 #, fuzzy
 msgid "New Password"
@@ -5804,11 +5783,13 @@ msgid "Status:"
 msgstr "Stad:"
 
 #: gajim/data/gui/zeroconf_information_window.ui:89
-msgid "_Log conversation history"
+#, fuzzy
+msgid "_Store conversation history"
 msgstr "_Istoradur flapiñ"
 
 #: gajim/data/gui/zeroconf_information_window.ui:215
 #: gajim/data/gui/vcard_information_window.ui:390
+#: gajim/data/gui/groupchat_info_scrolled.ui:166
 #, fuzzy
 msgid "Contact"
 msgstr "Darempredoù"
@@ -5824,8 +5805,9 @@ msgid "Last Name:"
 msgstr "Anv:"
 
 #: gajim/data/gui/zeroconf_information_window.ui:260
-msgid "Jabber ID:"
-msgstr "ID Jabber:"
+#, fuzzy
+msgid "XMPP Address:"
+msgstr "_Chomlec'h:"
 
 #: gajim/data/gui/zeroconf_information_window.ui:273
 msgid "E-Mail:"
@@ -5847,8 +5829,8 @@ msgstr "Kas ur _restr"
 
 #: gajim/data/gui/gc_occupants_menu.ui:29
 #, fuzzy
-msgid "Occupant Actions"
-msgstr "_Galloudoù an darempred"
+msgid "Participant Actions"
+msgstr "Perzhidi"
 
 #: gajim/data/gui/gc_occupants_menu.ui:38
 msgid "_Voice"
@@ -5879,8 +5861,9 @@ msgid "_Ban"
 msgstr "_Argas"
 
 #: gajim/data/gui/gc_occupants_menu.ui:124
-msgid "_Add to Roster"
-msgstr "_Ouzhpennañ er roll"
+#, fuzzy
+msgid "_Add to Contact List"
+msgstr "_Ouzhpennañ un darempred..."
 
 #: gajim/data/gui/gc_occupants_menu.ui:132
 #, fuzzy
@@ -5921,11 +5904,6 @@ msgstr "Koumanant:"
 msgid "_Status"
 msgstr "_Stad"
 
-#: gajim/data/gui/zeroconf_context_menu.ui:26
-#: gajim/data/gui/account_context_menu.ui:79
-msgid "_Modify Account..."
-msgstr "_Kemmañ ar gont..."
-
 #: gajim/data/gui/certificate_dialog.ui:66
 #: gajim/data/gui/certificate_dialog.ui:178
 msgid "Common Name (CN)"
@@ -6010,13 +5988,19 @@ msgstr "Anv:"
 msgid "Next entry"
 msgstr ""
 
+#: gajim/data/gui/filetransfers_send_file_dialog.ui:15
+#: gajim/data/gui/advanced_configuration.ui:143
+#: gajim/data/gui/groupchat_info_scrolled.ui:48 gajim/gtk/discovery.py:1663
+msgid "Description"
+msgstr "Taolennadur"
+
 #: gajim/data/gui/filetransfers_send_file_dialog.ui:54
 #, fuzzy
 msgid "_Send Files"
 msgstr "Kas ur _restr"
 
 #: gajim/data/gui/filetransfers_send_file_dialog.ui:58
-#: gajim/gtk/xml_console.py:90
+#: gajim/gtk/xml_console.py:87
 msgid "Send"
 msgstr "Envoyer"
 
@@ -6042,8 +6026,8 @@ msgstr "Cheñch _lesanv"
 
 #: gajim/data/gui/gc_control_popup_menu.ui:20
 #, fuzzy
-msgid "_Manage Room"
-msgstr "Merañ ar sinedoù"
+msgid "_Manage Group Chat"
+msgstr "Flap a-stroll"
 
 #: gajim/data/gui/gc_control_popup_menu.ui:31
 #, fuzzy
@@ -6052,13 +6036,13 @@ msgstr "Kemmañ ar _sujed"
 
 #: gajim/data/gui/gc_control_popup_menu.ui:38
 #, fuzzy
-msgid "Configure _Room..."
-msgstr "Ke_fluniañ ar flap"
+msgid "Configure _Group Chat..."
+msgstr "Ebarzhiñ ur _webgaoz"
 
 #: gajim/data/gui/gc_control_popup_menu.ui:52
 #, fuzzy
-msgid "_Destroy Room"
-msgstr "Taolennadur: %s"
+msgid "_Destroy Group Chat"
+msgstr "Flap a-stroll"
 
 #: gajim/data/gui/gc_control_popup_menu.ui:64
 msgid "_Minimize on close"
@@ -6068,7 +6052,7 @@ msgstr ""
 msgid "_Request Voice"
 msgstr ""
 
-#: gajim/data/gui/gc_control_popup_menu.ui:99 gajim/gtk/discovery.py:1704
+#: gajim/data/gui/gc_control_popup_menu.ui:99
 #, fuzzy
 msgid "_Bookmark"
 msgstr "_Ouzhpennañ ar webgaoz d'ar sinedoù"
@@ -6121,14 +6105,6 @@ msgstr "Lec'hienn hiniennel:"
 msgid "E-Mail"
 msgstr "Postel:"
 
-#: 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/blocking_list.ui:115 gajim/gtk/add_contact.py:30
-#: gajim/gtk/accounts.py:801
-#, fuzzy
-msgid "Jabber ID"
-msgstr "ID Jabber:"
-
 #: gajim/data/gui/profile_window.ui:440
 msgid "Main"
 msgstr ""
@@ -6264,35 +6240,42 @@ msgstr "Labour"
 msgid "About"
 msgstr "Diwar-benn"
 
-#: gajim/data/gui/start_chat_dialog.ui:114 gajim/gtk/discovery.py:1658
-msgid "Users"
-msgstr "Arveridi"
-
-#: gajim/data/gui/start_chat_dialog.ui:185
-msgid "Name:"
-msgstr "Anv:"
+#: gajim/data/gui/start_chat_dialog.ui:53
+#, fuzzy
+msgid "Global Group Chat Search"
+msgstr "Ebarzhiñ ur sal-flapiñ"
 
-#: gajim/data/gui/start_chat_dialog.ui:197
+#: 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
-msgid "Description:"
-msgstr "Taolennadur: %s"
+msgid "_Back"
+msgstr "Distro 'benn nebeut"
+
+#: gajim/data/gui/start_chat_dialog.ui:245
+#: gajim/data/gui/groupchat_control.ui:796
+#: gajim/data/gui/groupchat_control.ui:888 gajim/gtk/discovery.py:1701
+#: gajim/gtk/groupchat_join.py:62
+msgid "_Join"
+msgstr "E_barzhiñ"
 
-#: gajim/data/gui/start_chat_dialog.ui:209
+#: gajim/data/gui/start_chat_dialog.ui:289
 #, fuzzy
-msgid "Address:"
-msgstr "_Chomlec'h:"
+msgid "Select Account"
+msgstr "Lemel ar gont %s"
 
-#: gajim/data/gui/start_chat_dialog.ui:246
-msgid ""
-"Semi-Anonymous\n"
-"<span size=\"small\">(Only moderators can see your XMPP-Address)</span>"
+#: gajim/data/gui/start_chat_dialog.ui:380
+msgid "_Select"
 msgstr ""
 
 #: gajim/data/gui/filetransfers.ui:21
 msgid "Pa_use/Resume"
 msgstr ""
 
-#: gajim/data/gui/filetransfers.ui:30 gajim/gtk/filechoosers.py:178
+#: gajim/data/gui/filetransfers.ui:30 gajim/data/gui/groupchat_control.ui:575
+#: gajim/data/gui/groupchat_control.ui:667
+#: gajim/data/gui/groupchat_control.ui:779
+#: gajim/data/gui/groupchat_control.ui:871 gajim/gtk/filechoosers.py:178
 msgid "_Cancel"
 msgstr "_Nullañ"
 
@@ -6335,7 +6318,7 @@ msgstr "A nulla an treuzkas dibabet hag a zilam ar restr diglok"
 
 #: gajim/data/gui/filetransfers.ui:207
 #, fuzzy
-msgid "Shows a list of file transfers between you and others"
+msgid "Shows a list of file transfers between you and your contacts"
 msgstr "A ziskouez ur roll eus an dreuzkasoù etrezoc'h hag ar re all"
 
 #: gajim/data/gui/groupchat_control.ui:13 gajim/data/gui/chat_control.ui:277
@@ -6357,7 +6340,6 @@ msgid "Strike"
 msgstr "Lesanv"
 
 #: gajim/data/gui/groupchat_control.ui:54 gajim/data/gui/chat_control.ui:318
-#: gajim/gtk/advanced_config.py:86
 msgid "Color"
 msgstr ""
 
@@ -6371,16 +6353,45 @@ msgstr "_Nodrezh:"
 msgid "Clear formatting"
 msgstr "Titouroù"
 
-#: gajim/data/gui/groupchat_control.ui:290 gajim/data/gui/chat_control.ui:880
+#: gajim/data/gui/groupchat_control.ui:291 gajim/data/gui/chat_control.ui:880
 #, fuzzy
 msgid "Choose encryption"
 msgstr "Dibabit ur restr da gas..."
 
-#: gajim/data/gui/groupchat_control.ui:336 gajim/data/gui/chat_control.ui:640
+#: gajim/data/gui/groupchat_control.ui:337 gajim/data/gui/chat_control.ui:640
 #, fuzzy
 msgid "Show a list of emojis (Alt+M)"
 msgstr "Klikit evit enlakaat ur boulomell (Alt+M)"
 
+#: gajim/data/gui/groupchat_control.ui:484
+#, fuzzy
+msgid "Joining…"
+msgstr "Oc'h argas..."
+
+#: gajim/data/gui/groupchat_control.ui:496
+msgid "_Abort"
+msgstr ""
+
+#: gajim/data/gui/groupchat_control.ui:542
+#, fuzzy
+msgid "Enter new nickname"
+msgstr "Da _heul al lesanv:"
+
+#: gajim/data/gui/groupchat_control.ui:592
+#: gajim/data/gui/groupchat_control.ui:684
+#, fuzzy
+msgid "Ch_ange"
+msgstr "Cheñch _lesanv"
+
+#: gajim/data/gui/groupchat_control.ui:761
+#, fuzzy
+msgid "Enter password"
+msgstr "Roit ur ger-kuzh nevez:"
+
+#: gajim/data/gui/groupchat_control.ui:1067
+msgid "_Try again"
+msgstr ""
+
 #: gajim/data/gui/popup_notification_window.ui:42
 #, fuzzy
 msgid "Event Type"
@@ -6462,8 +6473,8 @@ msgstr "Ezvezant"
 
 #: gajim/data/gui/mam_preferences.ui:18
 #, fuzzy
-msgid "Roster"
-msgstr "Diskouez ar _roll-darempredoù"
+msgid "Contact List"
+msgstr "Darempredoù"
 
 #: gajim/data/gui/mam_preferences.ui:22
 #: gajim/data/gui/preferences_window.ui:123
@@ -6489,12 +6500,12 @@ msgid "Add"
 msgstr "Chomlec'h"
 
 #: gajim/data/gui/mam_preferences.ui:194 gajim/data/gui/groupchat_config.ui:151
-#: gajim/gtk/dialogs.py:63 gajim/gtk/accounts.py:381
+#: gajim/gtk/dialogs.py:62 gajim/gtk/accounts.py:384
 #, fuzzy
 msgid "Remove"
 msgstr "_Dilemel"
 
-#: gajim/data/gui/vcard_information_window.ui:72 gajim/gtk/accounts.py:753
+#: gajim/data/gui/vcard_information_window.ui:72 gajim/gtk/accounts.py:756
 #, fuzzy
 msgid "Resource"
 msgstr "Une erreur de protocole s'est produite :"
@@ -6547,6 +6558,7 @@ msgstr "Koumanant:"
 #: gajim/data/gui/vcard_information_window.ui:974
 #: gajim/data/gui/vcard_information_window.ui:993
 #: gajim/data/gui/vcard_information_window.ui:1427
+#: gajim/data/gui/groupchat_info_scrolled.ui:222
 msgid "button"
 msgstr ""
 
@@ -6581,15 +6593,15 @@ msgstr "_Kelaouiñ ac'hanon"
 
 #: gajim/data/gui/preferences_window.ui:58
 #, fuzzy
-msgid "Show only in roster"
-msgstr "Diskouez er _roll hepken"
+msgid "Show only in contact list"
+msgstr "Diskouez an darempredoù _ezlinenn"
 
 #: gajim/data/gui/preferences_window.ui:69
-msgid "Detached roster with detached chats"
+msgid "Detached contact list with detached chats"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:72
-msgid "Detached roster with single chat"
+msgid "Detached contact list with single chat"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:75
@@ -6597,11 +6609,11 @@ msgid "Single window for everything"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:78
-msgid "Detached roster with chat grouped by account"
+msgid "Detached contact list with chat grouped by account"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:81
-msgid "Detached roster with chat grouped by type"
+msgid "Detached contact list with chat grouped by type"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:92
@@ -6651,7 +6663,7 @@ msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:296
 #, fuzzy
-msgid "_Show roster on startup"
+msgid "_Show contact list on startup"
 msgstr "Diskouez ar _roll-darempredoù"
 
 #: gajim/data/gui/preferences_window.ui:311
@@ -6667,12 +6679,12 @@ msgid "_Tabs placement"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:363
-msgid "_Quit Gajim when closing roster window"
+msgid "_Quit Gajim when closing contact list"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:367
 msgid ""
-"If enabled, Gajim will quit when closing the roster window instead of "
+"If enabled, Gajim will quit when closing the contact list window instead of "
 "minimizing to the system's notification area"
 msgstr ""
 
@@ -6682,41 +6694,42 @@ msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:423
 #, fuzzy
-msgid "Show a_vatars of contacts in roster"
+msgid "Show a_vatars of contacts in contact list"
 msgstr "Diskouez _skeudennigoù an darempredoù er roll"
 
 #: gajim/data/gui/preferences_window.ui:427
 #, fuzzy
 msgid ""
-"If checked, avatars of contacts will be shown in the roster window and in "
-"group chats"
+"If checked, avatars of contacts will be shown in the contact list window and "
+"in group chats"
 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
 #, fuzzy
-msgid "Show status _messages of contacts in roster"
+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
 #, fuzzy
 msgid ""
 "If checked, status messages of contacts will be shown under the contact's "
-"name, in the roster window, and in group chats"
+"name, in the contact list window, and in group chats"
 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
 #, fuzzy
-msgid "Show e_xtra information of contacts in roster (mood, activity, ...)"
+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
 msgid ""
-"If checked, additional info published by the contact will be shown in "
-"roster. Additional infos (published via PEP) may include e.g. mood, "
+"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 ""
 
@@ -6727,8 +6740,8 @@ msgstr "_Urzhiañ an darempredoù hervez o stad"
 
 #: gajim/data/gui/preferences_window.ui:494
 #, fuzzy
-msgid "in _roster"
-msgstr "Ket er roll"
+msgid "in _contact list"
+msgstr "Darempredoù"
 
 #: gajim/data/gui/preferences_window.ui:511
 #, fuzzy
@@ -6737,8 +6750,8 @@ msgstr "Ebarzhiñ ur _webgaoz"
 
 #: gajim/data/gui/preferences_window.ui:540
 #, fuzzy
-msgid "Roster Appearance"
-msgstr "<b>Furmad ul linenn</b>"
+msgid "Contact List Appearance"
+msgstr "Darempred diluget"
 
 #: gajim/data/gui/preferences_window.ui:585
 msgid "Enable spell _checking"
@@ -6792,7 +6805,7 @@ msgstr "Impossible de rejoindre le salon"
 
 #: gajim/data/gui/preferences_window.ui:660
 #, fuzzy
-msgid "If checked, the room subject will be shown when joining a group chat"
+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:682
@@ -6807,13 +6820,13 @@ msgstr ""
 #: gajim/data/gui/preferences_window.ui:701
 msgid ""
 "If join/leave status messages are shown in the group chat. This setting can "
-"be overridden in the groupchat menu."
+"be overridden in the group chat menu."
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:720
 msgid ""
 "The default sync threshold for new public group chats. This setting can be "
-"overridden in the groupchat menu."
+"overridden in the group chat menu."
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:722
@@ -6828,7 +6841,7 @@ msgstr "_Menegiñ kemmoù stad an darempredoù e-barzh an istoradur"
 #: gajim/data/gui/preferences_window.ui:768
 msgid ""
 "If status change messages are shown in the group chat. This setting can be "
-"overridden in the groupchat menu."
+"overridden in the group chat menu."
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:825
@@ -6845,8 +6858,8 @@ msgstr "Si cette case est cochée, Gajim se connectera à ce salon au démarrage
 
 #: gajim/data/gui/preferences_window.ui:843
 #, fuzzy
-msgid "Show chatstate in roster"
-msgstr "Diskouez _skeudennigoù an darempredoù er roll"
+msgid "Show chatstate in contact list"
+msgstr "Diskouez an nozelenn-serriñ war an ivinell?"
 
 #: gajim/data/gui/preferences_window.ui:847
 msgid ""
@@ -7145,7 +7158,7 @@ msgstr ""
 msgid "Vi_ew own video source"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2281 gajim/gtk/accounts.py:352
+#: gajim/data/gui/preferences_window.ui:2281 gajim/gtk/accounts.py:355
 msgid "Connection"
 msgstr "Kevreadenn"
 
@@ -7199,7 +7212,8 @@ msgid "_Manage..."
 msgstr "Kemmañ..."
 
 #: gajim/data/gui/preferences_window.ui:2616
-msgid "_Log status changes of contacts"
+#, 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:2633
@@ -7225,10 +7239,15 @@ msgstr ""
 msgid "_Open..."
 msgstr "_Digeriñ..."
 
+#: gajim/data/gui/preferences_window.ui:2723 gajim/gtk/advanced_config.py:84
+#, fuzzy
+msgid "Advanced Configuration Editor (ACE)"
+msgstr "Aozer kefluniañ dre ar munut"
+
 #: gajim/data/gui/groupchat_config.ui:55
 #, fuzzy
 msgid ""
-"<b>Jabber-ID</b>\n"
+"<b>XMPP Address</b>\n"
 "&lt;user@domain/resource&gt; (only that resource matches)\n"
 "&lt;user@domain&gt; (any resource matches)\n"
 "&lt;domain/resource&gt; (only that resource matches)\n"
@@ -7248,7 +7267,8 @@ msgstr ""
 msgid "Only Admins and Owners can modify the affiliation"
 msgstr ""
 
-#: gajim/data/gui/groupchat_config.ui:270 gajim/plugins/gui.py:312
+#: gajim/data/gui/groupchat_config.ui:270
+#: gajim/data/gui/groupchat_info_scrolled.ui:210 gajim/plugins/gui.py:324
 #, fuzzy
 msgid "Configuration"
 msgstr "Kefluniañ ar webgaoz"
@@ -7281,7 +7301,7 @@ msgid "Start _Chat"
 msgstr "Kregiñ da _flapiñ"
 
 #: gajim/data/gui/contact_context_menu.ui:20
-#: gajim/data/gui/systray_context_menu.ui:36
+#: gajim/data/gui/systray_context_menu.ui:29
 msgid "Send Single _Message..."
 msgstr "Kas ur gemennadenn _simpl..."
 
@@ -7350,17 +7370,43 @@ msgstr ""
 
 #: gajim/data/gui/contact_context_menu.ui:174
 #, fuzzy
-msgid "_Add to Roster..."
-msgstr "_Ouzhpennañ er roll"
+msgid "_Add to Contact List..."
+msgstr "_Ouzhpennañ un darempred..."
+
+#: gajim/data/gui/advanced_configuration.ui:39
+#, fuzzy
+msgid "You should restart Gajim for some changes to take effect"
+msgstr ""
+"<b>NOTENN :</b> Dav eo deoc'h adloc'hañ Gajim evit ma vo efedus kemmoù 'zo"
+
+#: gajim/data/gui/advanced_configuration.ui:71
+#, fuzzy
+msgid "_Filter"
+msgstr "_Sil:"
+
+#: gajim/data/gui/advanced_configuration.ui:88
+msgid "Type to search for values..."
+msgstr ""
+
+#: gajim/data/gui/advanced_configuration.ui:180
+#, fuzzy
+msgid "_Reset Value"
+msgstr "_Distreiñ gant al livioù dre-ziouer"
+
+#: gajim/data/gui/advanced_configuration.ui:185
+#, fuzzy
+msgid "Resets value to default"
+msgstr "_Distreiñ gant al livioù dre-ziouer"
 
 #: gajim/data/gui/account_creation_wizard_window.ui:43
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim : Assistant de création de compte"
 
 #: gajim/data/gui/account_creation_wizard_window.ui:70
+#, fuzzy
 msgid ""
 "You need to have an account in order to connect\n"
-"to the Jabber network."
+"to the XMPP network."
 msgstr ""
 "Rankout a rit kaout ur gont evit en em lugañ\n"
 "d'ar rouedad Jabber."
@@ -7384,8 +7430,9 @@ msgid "<b>Please fill in the data for your existing account</b>"
 msgstr "<b>Leuniit an titouroù evit ho kont nevez</b>"
 
 #: gajim/data/gui/account_creation_wizard_window.ui:187
-msgid "_Jabber ID:"
-msgstr "ID _Jabber:"
+#, fuzzy
+msgid "_XMPP Address:"
+msgstr "_Chomlec'h:"
 
 #: gajim/data/gui/account_creation_wizard_window.ui:239
 #: gajim/data/gui/account_creation_wizard_window.ui:394
@@ -7476,6 +7523,7 @@ msgid "Privacy Lists:"
 msgstr "Flapoù prevez"
 
 #: gajim/data/gui/service_discovery_window.ui:111
+#: gajim/data/gui/groupchat_creation.ui:227
 #, fuzzy
 msgid "_Address"
 msgstr "_Chomlec'h:"
@@ -7494,11 +7542,6 @@ msgstr ""
 msgid "Select the contacts you want to synchronise"
 msgstr "JID an darempred ho peus c'hoant flapiñ gantañ"
 
-#: gajim/data/gui/groupchat_invitation_received.ui:42
-#, fuzzy
-msgid "Group Chat Invitation"
-msgstr "Pedadenn evit ur sal-flapiñ"
-
 #: gajim/data/gui/groupchat_invitation_received.ui:111
 #, fuzzy
 msgid "Message..."
@@ -7550,11 +7593,10 @@ msgstr ""
 
 #: gajim/data/gui/add_new_contact_window.ui:84
 #, fuzzy
-msgid "_Jabber ID"
-msgstr "ID _Jabber:"
+msgid "_XMPP Address"
+msgstr "_Chomlec'h:"
 
 #: gajim/data/gui/add_new_contact_window.ui:100
-#: gajim/data/gui/manage_bookmarks_window.ui:192
 #, fuzzy
 msgid "_Nickname"
 msgstr "Lesanv:"
@@ -7628,7 +7670,7 @@ msgstr "<b>Sonioù</b>"
 msgid "<b>Message:</b>"
 msgstr "<b>Titouroù-stad raklakaet</b>"
 
-#: gajim/data/gui/plugins_window.ui:10 gajim/data/gui/application_menu.ui:90
+#: gajim/data/gui/plugins_window.ui:10 gajim/data/gui/application_menu.ui:87
 msgid "Plugins"
 msgstr ""
 
@@ -7737,11 +7779,6 @@ msgstr ""
 msgid "Deny"
 msgstr "Nac'hañ"
 
-#: gajim/data/gui/privacy_list_window.ui:317
-#, fuzzy
-msgid "JabberID"
-msgstr "ID Jabber:"
-
 #: gajim/data/gui/privacy_list_window.ui:358
 #, fuzzy
 msgid "all in the group"
@@ -7790,7 +7827,7 @@ msgstr "Servijer:"
 msgid "Manage sounds"
 msgstr "Merañ ar c'hontoù"
 
-#: gajim/data/gui/manage_sounds_window.ui:55 gajim/plugins/gui.py:100
+#: gajim/data/gui/manage_sounds_window.ui:55 gajim/plugins/gui.py:101
 msgid "Active"
 msgstr "Oberiant"
 
@@ -7829,32 +7866,123 @@ msgstr "Dilemel ar gont diwar Gajim ha diwar ar _servijer"
 msgid "_Personal Events"
 msgstr "Titouroù hiniennel"
 
-#: gajim/data/gui/account_context_menu.ui:35
-#: gajim/data/gui/systray_context_menu.ui:28
-msgid "Join _Group Chat"
-msgstr "Ebarzhiñ ur _webgaoz"
-
-#: gajim/data/gui/account_context_menu.ui:49
+#: gajim/data/gui/account_context_menu.ui:41
 msgid "_Add Contact..."
 msgstr "_Ouzhpennañ un darempred..."
 
-#: gajim/data/gui/account_context_menu.ui:57
+#: gajim/data/gui/account_context_menu.ui:49
 msgid "_Discover Services"
 msgstr "_Dizoleiñ ar servijoù"
 
-#: gajim/data/gui/account_context_menu.ui:65
+#: gajim/data/gui/account_context_menu.ui:57
 #, fuzzy
 msgid "_Execute Command..."
 msgstr "urzhiad"
 
+#: gajim/data/gui/account_context_menu.ui:65
+#, fuzzy
+msgid "_View Certificate"
+msgstr "Anv-arveriad-ez direizh"
+
+#: gajim/data/gui/manage_proxies.ui:12
+#, fuzzy
+msgctxt "proxy configuration"
+msgid "HTTP Connect"
+msgstr "Kevreadenn HTTP"
+
+#: gajim/data/gui/manage_proxies.ui:15
+msgctxt "proxy configuration"
+msgid "SOCKS5"
+msgstr ""
+
+#: gajim/data/gui/manage_proxies.ui:18
+#, fuzzy
+msgctxt "proxy configuration"
+msgid "BOSH"
+msgstr "_URL :"
+
+#: gajim/data/gui/manage_proxies.ui:68
+#, fuzzy
+msgid "Add Proxy"
+msgstr "Proksi:"
+
+#: gajim/data/gui/manage_proxies.ui:82
+#, fuzzy
+msgid "Remove Proxy"
+msgstr "_Dilemel"
+
+#: gajim/data/gui/manage_proxies.ui:134
+#, fuzzy
+msgid "Pass_word"
+msgstr "_Ger-kuzh:"
+
+#: gajim/data/gui/manage_proxies.ui:159
+#, fuzzy
+msgid "Use proxy auth_entication"
+msgstr "Implij an diskleriañ"
+
+#: gajim/data/gui/manage_proxies.ui:179
+#, fuzzy
+msgid "_Username"
+msgstr "_Anv:"
+
+#: gajim/data/gui/manage_proxies.ui:209
+#, fuzzy
+msgid "_Port"
+msgstr "_Porzh:"
+
+#: gajim/data/gui/manage_proxies.ui:226
+msgid "example.org"
+msgstr ""
+
+#: gajim/data/gui/manage_proxies.ui:240
+#, fuzzy
+msgid "_Host"
+msgstr "_Ostiz:"
+
+#: gajim/data/gui/manage_proxies.ui:254
+#, fuzzy
+msgid "Use HTTP prox_y"
+msgstr "_Implij ur proxy"
+
+#: gajim/data/gui/manage_proxies.ui:275
+msgid "https://example.org/http-bind/"
+msgstr ""
+
+#: gajim/data/gui/manage_proxies.ui:291
+#, fuzzy
+msgid "_BOSH URL"
+msgstr "_URL :"
+
+#: gajim/data/gui/manage_proxies.ui:309 gajim/gtk/adhoc.py:322
+#, fuzzy
+msgid "Settings"
+msgstr "échec lors de la publication de votre vCard"
+
+#: gajim/data/gui/manage_proxies.ui:344
+#, fuzzy
+msgid "_Type"
+msgstr "Doare:"
+
+#: gajim/data/gui/manage_proxies.ui:361
+#: gajim/data/gui/groupchat_creation.ui:105
+#, fuzzy
+msgid "_Name"
+msgstr "_Anv:"
+
+#: gajim/data/gui/manage_proxies.ui:391 gajim/gtk/accounts.py:742
+#, fuzzy
+msgid "Proxy"
+msgstr "Proksi:"
+
 #: gajim/data/gui/application_menu.ui:8
 msgid "View"
 msgstr ""
 
 #: gajim/data/gui/application_menu.ui:11
 #, fuzzy
-msgid "Show Roster"
-msgstr "Diskouez ar _roll-darempredoù"
+msgid "Show Contact List"
+msgstr "Diskouez an darempredoù _ezlinenn"
 
 #: gajim/data/gui/application_menu.ui:16
 #, fuzzy
@@ -7896,23 +8024,24 @@ msgstr ""
 msgid "Features"
 msgstr "Perzhioù ar servijerien"
 
-#: gajim/data/gui/application_menu.ui:81
+#: gajim/data/gui/application_menu.ui:77
+#: gajim/data/gui/groupchat_creation.ui:81 gajim/gtk/groupchat_creation.py:45
 #, fuzzy
-msgid "Bookmarks"
-msgstr "_Ouzhpennañ ar webgaoz d'ar sinedoù"
+msgid "Create Group Chat"
+msgstr "Flap a-stroll"
 
-#: gajim/data/gui/application_menu.ui:94 gajim/data/gui/shortcuts_window.ui:189
-#: gajim/gtk/preferences.py:59
+#: gajim/data/gui/application_menu.ui:91 gajim/data/gui/shortcuts_window.ui:189
+#: gajim/gtk/preferences.py:58
 msgid "Preferences"
 msgstr "Penndibaboù"
 
-#: gajim/data/gui/application_menu.ui:99
+#: gajim/data/gui/application_menu.ui:96
 #, fuzzy
 msgid "Quit"
 msgstr "_Kuitaat"
 
 #: gajim/data/gui/httpupload_progress_dialog.ui:110
-#: gajim/gtk/filetransfer.py:121
+#: gajim/gtk/filetransfer.py:120
 msgid "Progress"
 msgstr "Araokadur"
 
@@ -7929,52 +8058,33 @@ msgstr ""
 msgid "_Cancel Upload"
 msgstr "_Nullañ"
 
-#: gajim/data/gui/manage_bookmarks_window.ui:13
-#, fuzzy
-msgid "Group Chat Bookmarks"
-msgstr "Flap a-stroll"
-
-#: gajim/data/gui/manage_bookmarks_window.ui:68
-#, fuzzy
-msgid "Add Bookmark"
-msgstr "_Ouzhpennañ ar webgaoz d'ar sinedoù"
-
-#: gajim/data/gui/manage_bookmarks_window.ui:82
-#, fuzzy
-msgid "Remove Bookmark"
-msgstr "_Ouzhpennañ ar webgaoz d'ar sinedoù"
+#: gajim/data/gui/groupchat_creation.ui:27
+msgid "Public or Private?"
+msgstr ""
 
-#: gajim/data/gui/manage_bookmarks_window.ui:126
-msgid "N_ame"
+#: 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 ""
 
-#: gajim/data/gui/manage_bookmarks_window.ui:145
-#, fuzzy
-msgid "Bookmark Name"
-msgstr "_Ouzhpennañ ar webgaoz d'ar sinedoù"
+#: gajim/data/gui/groupchat_creation.ui:58
+msgid "<b>Public:</b> Anyone who knows the address can join."
+msgstr ""
 
-#: gajim/data/gui/manage_bookmarks_window.ui:160
+#: gajim/data/gui/groupchat_creation.ui:122
 #, fuzzy
-msgid "_Server"
-msgstr "_Servijer:"
+msgid "_Description"
+msgstr "Taolennadur"
 
-#: gajim/data/gui/manage_bookmarks_window.ui:223
-msgid "Roo_m"
+#: gajim/data/gui/groupchat_creation.ui:164
+msgid "_Public"
 msgstr ""
 
-#: gajim/data/gui/manage_bookmarks_window.ui:253
+#: gajim/data/gui/groupchat_creation.ui:278
 #, fuzzy
-msgid "_Password"
-msgstr "_Ger-kuzh:"
-
-#: gajim/data/gui/manage_bookmarks_window.ui:299
-#, fuzzy
-msgid "Join chat when connected"
-msgstr "Darempred diluget"
-
-#: gajim/data/gui/manage_bookmarks_window.ui:307
-msgid "_Join Automatically"
-msgstr ""
+msgid "_Account"
+msgstr "Kontoù"
 
 #: gajim/data/gui/exception_dialog.ui:49
 msgid "Sorry, that should not have happened"
@@ -8018,6 +8128,28 @@ msgstr "Aotren an darempred da welet hag emaon kevreet pe get"
 msgid "Presets"
 msgstr "_Bezañs"
 
+#: gajim/data/gui/groupchat_info_scrolled.ui:32
+msgid "Address"
+msgstr "Chomlec'h"
+
+#: gajim/data/gui/groupchat_info_scrolled.ui:64
+msgid "Topic"
+msgstr ""
+
+#: gajim/data/gui/groupchat_info_scrolled.ui:80
+#, fuzzy
+msgid "Author"
+msgstr "_Aotren"
+
+#: gajim/data/gui/groupchat_info_scrolled.ui:182
+msgid "Discussion Logs"
+msgstr ""
+
+#: gajim/data/gui/groupchat_info_scrolled.ui:260
+#, fuzzy
+msgid "Group Chat Language"
+msgstr "Pedadenn evit ur sal-flapiñ"
+
 #: gajim/data/gui/emoji_chooser.ui:98
 msgid "No Results Found"
 msgstr ""
@@ -8029,24 +8161,34 @@ msgstr ""
 #: gajim/data/gui/chat_to_muc_window.ui:39
 #, fuzzy
 msgid ""
-"You are now entering a groupchat.\n"
+"You are now entering a group chat.\n"
 "Select the contacts you want to invite"
 msgstr "JID an darempred ho peus c'hoant flapiñ gantañ"
 
 #: gajim/data/gui/chat_to_muc_window.ui:112
-msgid "Please select a MUC server."
-msgstr ""
+#, fuzzy
+msgid "Please select a group chat server."
+msgstr "A guzha an nozelennoù er prenestr flapiñ"
 
 #: gajim/data/gui/chat_to_muc_window.ui:141
 #, fuzzy
-msgid "MUC server"
-msgstr "Sellerien"
+msgid "Group chat server"
+msgstr "Flapoù a-stroll"
 
 #: gajim/data/gui/chat_to_muc_window.ui:176
 #, fuzzy
 msgid "In_vite"
 msgstr "Diwelus"
 
+#: gajim/data/gui/bookmarks.ui:176
+#, fuzzy
+msgid "Autojoin"
+msgstr "E_barzhiñ"
+
+#: gajim/data/gui/bookmarks.ui:211
+msgid "_Apply"
+msgstr ""
+
 #: gajim/data/gui/history_manager.ui:11
 #, fuzzy
 msgid "_Export"
@@ -8063,11 +8205,11 @@ msgstr "Merour istoradur Gajim"
 
 #: gajim/data/gui/history_manager.ui:108
 msgid ""
-"This log manager is not intended for log viewing. If you are looking for "
-"such functionality, use the history window instead.\n"
+"This history manager is not intended for viewing chat history. If you are "
+"looking for such functionality, please use the history window instead.\n"
 "\n"
-"Use this program to delete or export logs. You can select logs from the left "
-"and/or search database from below."
+"You can use this program to delete or export history. Either select logs "
+"from the left or search the database."
 msgstr ""
 
 #: gajim/data/gui/history_manager.ui:124
@@ -8111,7 +8253,7 @@ msgid "Select an emoji"
 msgstr "Utiliser les _frimousses"
 
 #: gajim/data/gui/shortcuts_window.ui:38
-msgid "Complete a command or a nick"
+msgid "Complete a command or a nickname"
 msgstr ""
 
 #: gajim/data/gui/shortcuts_window.ui:45
@@ -8152,7 +8294,7 @@ msgstr ""
 msgid "Scroll down"
 msgstr ""
 
-#: gajim/data/gui/shortcuts_window.ui:100 gajim/gtk/xml_console.py:72
+#: gajim/data/gui/shortcuts_window.ui:100 gajim/gtk/xml_console.py:69
 #, fuzzy
 msgid "Clear"
 msgstr "Darvoud"
@@ -8194,8 +8336,9 @@ msgid "Close chat"
 msgstr ""
 
 #: gajim/data/gui/shortcuts_window.ui:173
-msgid "Roster Shortcuts"
-msgstr ""
+#, fuzzy
+msgid "Contact List Shortcuts"
+msgstr "Darempred diluget"
 
 #: gajim/data/gui/shortcuts_window.ui:196
 #, fuzzy
@@ -8228,7 +8371,7 @@ msgid "Show only active contacts"
 msgstr "Diskouez an darempredoù _ezlinenn"
 
 #: gajim/data/gui/shortcuts_window.ui:251
-msgid "Enable roster filtering"
+msgid "Enable contact list filtering"
 msgstr ""
 
 #: gajim/data/gui/shortcuts_window.ui:259
@@ -8274,12 +8417,12 @@ msgid "Search selected day only"
 msgstr ""
 
 #: gajim/data/gui/history_window.ui:317
-msgid "Record history for this chat"
+msgid "Store history for this chat"
 msgstr ""
 
 #: gajim/data/gui/history_window.ui:332
 #, fuzzy
-msgid "Record History"
+msgid "Store History"
 msgstr "Nevez 'zo:"
 
 #: gajim/data/gui/history_window.ui:350
@@ -8301,9 +8444,10 @@ msgstr ""
 msgid "Fill in the form."
 msgstr "Er strollad"
 
-#: gajim/data/gui/data_form_window.ui:229
-msgid "Room Configuration"
-msgstr "Kefluniañ ar webgaoz"
+#: gajim/data/gui/data_form_window.ui:229 gajim/gtk/groupchat_config.py:41
+#, fuzzy
+msgid "Group Chat Configuration"
+msgstr "Pedadenn evit ur sal-flapiñ"
 
 #: gajim/data/gui/roster_item_exchange_window.ui:39
 #: gajim/gtk/roster_item_exchange.py:35
@@ -8325,16 +8469,16 @@ msgstr "S_tad"
 msgid "_Start Chat..."
 msgstr "_Kregiñ da flapiñ"
 
-#: gajim/data/gui/systray_context_menu.ui:50
+#: gajim/data/gui/systray_context_menu.ui:43
 msgid "Show All Pending _Events"
 msgstr "Diskouez an holl _zarvoudoù o c'hortoz"
 
-#: gajim/data/gui/systray_context_menu.ui:59
+#: gajim/data/gui/systray_context_menu.ui:52
 #, fuzzy
 msgid "Mute Sounds"
 msgstr "Sonioù wav"
 
-#: gajim/data/gui/systray_context_menu.ui:75
+#: gajim/data/gui/systray_context_menu.ui:68
 #, fuzzy
 msgid "_Preferences"
 msgstr "Penndibaboù"
@@ -8427,34 +8571,34 @@ msgstr ""
 msgid "Execute expression inside a shell, send output"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:45
+#: gajim/command_system/implementation/standard.py:47
 msgid ""
 "Show help on a given command or a list of available commands if -a is given"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:73
+#: gajim/command_system/implementation/standard.py:75
 #, fuzzy
 msgid "Send a message to the contact"
 msgstr "Usage: /%s, cache les boutons de discussion."
 
-#: gajim/command_system/implementation/standard.py:78
+#: gajim/command_system/implementation/standard.py:80
 msgid "Send action (in the third person) to the current chat"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:83
+#: gajim/command_system/implementation/standard.py:85
 msgid "Show logged messages which mention given text"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:88
+#: gajim/command_system/implementation/standard.py:90
 #, fuzzy, python-format
 msgid "%s: Nothing found"
 msgstr "N'eo ket bet kavet %s"
 
-#: gajim/command_system/implementation/standard.py:94
+#: gajim/command_system/implementation/standard.py:96
 msgid "Limit must be an integer"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:118
+#: gajim/command_system/implementation/standard.py:120
 msgid ""
 "\n"
 "    Set the current status\n"
@@ -8464,133 +8608,133 @@ msgid ""
 "    "
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:136
+#: gajim/command_system/implementation/standard.py:138
 msgid "Set the current status to away"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:150
+#: gajim/command_system/implementation/standard.py:152
 msgid "Set the current status to online"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:153
+#: gajim/command_system/implementation/standard.py:155
 #, fuzzy
 msgid "Available"
 msgstr "Dihegerz"
 
-#: gajim/command_system/implementation/standard.py:173
-#: gajim/command_system/implementation/standard.py:250
+#: gajim/command_system/implementation/standard.py:175
+#: gajim/command_system/implementation/standard.py:252
 #, fuzzy
 msgid "Clear the text window"
 msgstr "Usage : /%s, nettoie la fenêtre."
 
-#: gajim/command_system/implementation/standard.py:178
-#: gajim/command_system/implementation/standard.py:397
+#: gajim/command_system/implementation/standard.py:180
+#: gajim/command_system/implementation/standard.py:401
 #, fuzzy
 msgid "Send a ping to the contact"
 msgstr "Usage : /%s, passe la fenêtre de salon de discussion en vue compacte."
 
-#: gajim/command_system/implementation/standard.py:181
-#: gajim/command_system/implementation/standard.py:400
+#: gajim/command_system/implementation/standard.py:183
+#: gajim/command_system/implementation/standard.py:404
 msgid "Command is not supported for zeroconf accounts"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:185
-msgid "Send DTMF sequence through an open audio session"
+#: gajim/command_system/implementation/standard.py:187
+msgid "Send DTMF sequence through an open voice chat"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:188
+#: gajim/command_system/implementation/standard.py:190
 #, fuzzy
-msgid "No open audio sessions with the contact"
+msgid "No open voice chats with the contact"
 msgstr "Klikit amañ evit gwelout kaozioù kent gant an darempred-mañ"
 
-#: gajim/command_system/implementation/standard.py:191
+#: gajim/command_system/implementation/standard.py:193
 #, python-format
 msgid "%s is not a valid tone"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:198
-msgid "Toggle audio session"
+#: gajim/command_system/implementation/standard.py:200
+msgid "Toggle Voice Chat"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:201
+#: gajim/command_system/implementation/standard.py:203
 #, fuzzy
-msgid "Audio sessions are not available"
-msgstr "N'eus ket tu da gevreañ"
+msgid "Voice chats are not available"
+msgstr "N'eus ket tu en em lugañ"
 
-#: gajim/command_system/implementation/standard.py:208
-msgid "Toggle video session"
+#: gajim/command_system/implementation/standard.py:210
+msgid "Toggle Video Chat"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:211
+#: gajim/command_system/implementation/standard.py:213
 #, fuzzy
-msgid "Video sessions are not available"
+msgid "Video chats are not available"
 msgstr "N'eus ket tu en em lugañ"
 
-#: gajim/command_system/implementation/standard.py:218
+#: gajim/command_system/implementation/standard.py:220
 #, fuzzy
 msgid "Send a message to the contact that will attract their attention"
 msgstr "Usage: /%s, cache les boutons de discussion."
 
-#: gajim/command_system/implementation/standard.py:255
+#: gajim/command_system/implementation/standard.py:257
 #, fuzzy
 msgid "Change your nickname in a group chat"
 msgstr "Cheñch _lesanv"
 
-#: gajim/command_system/implementation/standard.py:260 gajim/gtk/dialogs.py:674
-#: gajim/gtk/bookmarks.py:272
+#: gajim/command_system/implementation/standard.py:262
 #, fuzzy
 msgid "Invalid nickname"
 msgstr "Anv-arveriad-ez direizh"
 
-#: gajim/command_system/implementation/standard.py:267
+#: gajim/command_system/implementation/standard.py:269
 #, fuzzy
-msgid "Open a private chat window with a specified occupant"
+msgid "Open a private chat window with a specified participant"
 msgstr ""
 "Usage : /%s <surnom>, ouvre une fenêtre de discussion privée avec l'occupant "
 "spécifié."
 
-#: gajim/command_system/implementation/standard.py:273
-#: gajim/command_system/implementation/standard.py:282
-#: gajim/command_system/implementation/standard.py:332
-#: gajim/command_system/implementation/standard.py:345
-#: gajim/command_system/implementation/standard.py:357
+#: gajim/command_system/implementation/standard.py:275
+#: gajim/command_system/implementation/standard.py:284
+#: gajim/command_system/implementation/standard.py:336
+#: gajim/command_system/implementation/standard.py:349
+#: gajim/command_system/implementation/standard.py:361
 #, fuzzy
 msgid "Nickname not found"
 msgstr "N'eus ket bet kavet al lesanv : %s"
 
-#: gajim/command_system/implementation/standard.py:276
+#: gajim/command_system/implementation/standard.py:278
 #, fuzzy
 msgid ""
-"Open a private chat window with a specified occupant and send him a message"
+"Open a private chat window with a specified participant and send him a "
+"message"
 msgstr ""
 "Usage : /%s <surnom>, ouvre une fenêtre de discussion privée avec l'occupant "
 "spécifié."
 
-#: gajim/command_system/implementation/standard.py:285
+#: gajim/command_system/implementation/standard.py:287
 #, fuzzy
 msgid "Display or change a group chat topic"
 msgstr "Goulenn a-raok serriñ un ivinell pe ur prenestr."
 
-#: gajim/command_system/implementation/standard.py:294
-msgid "Invite a user to a room for a reason"
+#: gajim/command_system/implementation/standard.py:296
+msgid "Invite a user to a group chat for a reason"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:297
+#: gajim/command_system/implementation/standard.py:299
 #, fuzzy, python-format
 msgid "Invited %(jid)s to %(room_jid)s"
 msgstr "Darempred %(contact_jid)s bet pedet e-barzh %(room_jid)s."
 
-#: gajim/command_system/implementation/standard.py:301
+#: gajim/command_system/implementation/standard.py:303
 #, fuzzy
-msgid "Join a group chat given by a JID"
+msgid "Join a group chat given by an XMPP Address"
 msgstr "Ebarzhiñ ur _webgaoz"
 
-#: gajim/command_system/implementation/standard.py:309
+#: gajim/command_system/implementation/standard.py:313
 msgid ""
-"Leave the groupchat, optionally giving a reason, and close tab or window"
+"Leave the group chat, optionally giving a reason, and close tab or window"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:314
+#: gajim/command_system/implementation/standard.py:318
 msgid ""
 "\n"
 "    Ban user by a nick or a JID from a groupchat\n"
@@ -8599,45 +8743,45 @@ msgid ""
 "    "
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:329
+#: gajim/command_system/implementation/standard.py:333
 #, fuzzy
-msgid "Kick user by a nick from a groupchat"
+msgid "Kick user by a nick from a group chat"
 msgstr "Vous êtes banni de ce salon."
 
-#: gajim/command_system/implementation/standard.py:338
+#: gajim/command_system/implementation/standard.py:342
 msgid ""
-"Set occupant role in group chat.\n"
+"Set participant role in group chat.\n"
 "    Role can be given as one of the following values:\n"
 "    moderator, participant, visitor, none"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:343
+#: gajim/command_system/implementation/standard.py:347
 #, fuzzy
 msgid "Invalid role given"
 msgstr "Anv-arveriad-ez direizh"
 
-#: gajim/command_system/implementation/standard.py:350
+#: gajim/command_system/implementation/standard.py:354
 msgid ""
-"Set occupant affiliation in group chat.\n"
+"Set participant affiliation in group chat.\n"
 "    Affiliation can be given as one of the following values:\n"
 "    owner, admin, member, outcast, none"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:355
+#: gajim/command_system/implementation/standard.py:359
 msgid "Invalid affiliation given"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:365
+#: gajim/command_system/implementation/standard.py:369
 #, fuzzy
-msgid "Display names of all group chat occupants"
+msgid "Display names of all group chat participants"
 msgstr "Usage : /%s [sujet], affiche ou met à jour le sujet actuel du salon."
 
-#: gajim/command_system/implementation/standard.py:387
-msgid "Forbid an occupant to send you public or private messages"
+#: gajim/command_system/implementation/standard.py:391
+msgid "Forbid a participant to send you public or private messages"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:392
-msgid "Allow an occupant to send you public or private messages"
+#: gajim/command_system/implementation/standard.py:396
+msgid "Allow a participant to send you public or private messages"
 msgstr ""
 
 #: gajim/command_system/implementation/middleware.py:74
@@ -8648,203 +8792,328 @@ msgstr ""
 msgid "The same as using a doc-string, except it supports translation"
 msgstr ""
 
-#: gajim/gtk/filetransfer.py:91
+#: gajim/gtk/groupchat_info.py:36
+#, fuzzy
+msgid "?Group chat feature:Archiving"
+msgstr "Pedadenn evit ur sal-flapiñ"
+
+#: gajim/gtk/groupchat_info.py:37
+#, fuzzy
+msgid "Messages are archived on the server"
+msgstr "N'oc'h ket luget d'ar servijer"
+
+#: gajim/gtk/groupchat_info.py:40
+#, fuzzy
+msgid "?Group chat feature:Persistent"
+msgstr "Flapoù a-stroll"
+
+#: gajim/gtk/groupchat_info.py:41
+msgid "This group chat persists even if there are no participants"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:45
+#, fuzzy
+msgid "?Group chat feature:Temporary"
+msgstr "Hini ebet"
+
+#: gajim/gtk/groupchat_info.py:46
+msgid "This group chat will be destroyed once the last participant left"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:50
+#, fuzzy
+msgid "?Group chat feature:Moderated"
+msgstr "Hini ebet"
+
+#: gajim/gtk/groupchat_info.py:51
+msgid ""
+"Participants entering this group chat need to request permission to send "
+"messages"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:55
+#, fuzzy
+msgid "?Group chat feature:Not Moderated"
+msgstr "Flapoù a-stroll"
+
+#: gajim/gtk/groupchat_info.py:56
+msgid "Participants entering this group chat are allowed to send messages"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:60
+#, fuzzy
+msgid "?Group chat feature:Open"
+msgstr "Hini ebet"
+
+#: gajim/gtk/groupchat_info.py:61
+#, fuzzy
+msgid "Anyone can join this group chat"
+msgstr "Er strollad"
+
+#: gajim/gtk/groupchat_info.py:64
+#, fuzzy
+msgid "?Group chat feature:Members Only"
+msgstr "Message d'un Salon mis en Sur-brillance"
+
+#: gajim/gtk/groupchat_info.py:65
+msgid "This group chat is restricted to members only"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:69
+#, fuzzy
+msgid "?Group chat feature:Public"
+msgstr "Message d'un Salon mis en Sur-brillance"
+
+#: gajim/gtk/groupchat_info.py:70
+msgid "Group chat can be found via search"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:73
+#, fuzzy
+msgid "?Group chat feature:Hidden"
+msgstr "Hini ebet"
+
+#: gajim/gtk/groupchat_info.py:74
+#, 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:77
+#, fuzzy
+msgid "?Group chat feature:Not Anonymous"
+msgstr "Flapoù a-stroll"
+
+#: gajim/gtk/groupchat_info.py:78
+msgid "All other group chat participants can see your XMPP address"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:82
+#, fuzzy
+msgid "?Group chat feature:Semi-Anonymous"
+msgstr "Message d'un Salon mis en Sur-brillance"
+
+#: gajim/gtk/groupchat_info.py:83
+msgid "Only moderators can see your XMPP address"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:86
+#, fuzzy
+msgid "?Group chat feature:Password Required"
+msgstr "Flapoù a-stroll"
+
+#: gajim/gtk/groupchat_info.py:87
+msgid "This group chat does require a password upon entry"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:91
+#, fuzzy
+msgid "?Group chat feature:No Password Required"
+msgstr "Flapoù a-stroll"
+
+#: gajim/gtk/groupchat_info.py:92
+msgid "This group chat does not require a password upon entry"
+msgstr ""
+
+#: gajim/gtk/filetransfer.py:90
 msgid "File"
 msgstr "Restr"
 
-#: gajim/gtk/filetransfer.py:108
+#: gajim/gtk/filetransfer.py:107
 msgid "Time"
 msgstr "Mare"
 
-#: gajim/gtk/filetransfer.py:228
+#: gajim/gtk/filetransfer.py:227
 #, fuzzy, python-format
 msgid "File name: %s"
 msgstr "Anv ar restr: %s"
 
-#: gajim/gtk/filetransfer.py:229 gajim/gtk/filetransfer.py:464
+#: gajim/gtk/filetransfer.py:228 gajim/gtk/filetransfer.py:469
 #, python-format
 msgid "Size: %s"
 msgstr "Ment: %s"
 
-#: gajim/gtk/filetransfer.py:239
+#: gajim/gtk/filetransfer.py:238
 #, python-format
 msgid "Sender: %s"
 msgstr "Kaser: %s"
 
-#: gajim/gtk/filetransfer.py:240 gajim/gtk/filetransfer.py:744
+#: gajim/gtk/filetransfer.py:239 gajim/gtk/filetransfer.py:749
 #: gajim/gtk/tooltips.py:577
 msgid "Recipient: "
 msgstr "Resever:"
 
-#: gajim/gtk/filetransfer.py:251
+#: gajim/gtk/filetransfer.py:250
 #, python-format
 msgid "Saved in: %s"
 msgstr "Enrollet e-barzh: %s"
 
-#: gajim/gtk/filetransfer.py:256
+#: gajim/gtk/filetransfer.py:255
 msgid "File transfer completed"
 msgstr "Echu eo an treuzkas"
 
-#: gajim/gtk/filetransfer.py:276 gajim/gtk/filetransfer.py:285
+#: gajim/gtk/filetransfer.py:275 gajim/gtk/filetransfer.py:284
 #, fuzzy
 msgid "Connection with peer could not be established."
 msgstr "N'eus ket tu seveniñ al lugadenn gant an darempred."
 
-#: gajim/gtk/filetransfer.py:293
+#: gajim/gtk/filetransfer.py:292
 #, python-format
 msgid "Filename: %s"
 msgstr "Anv ar restr: %s"
 
-#: gajim/gtk/filetransfer.py:294
+#: gajim/gtk/filetransfer.py:293
 #, fuzzy, python-format
 msgid "Recipient: %s"
 msgstr "Resever:"
 
-#: gajim/gtk/filetransfer.py:296
+#: gajim/gtk/filetransfer.py:295
 #, fuzzy, python-format
 msgid "Error message: %s"
 msgstr "Fazi en ur lenn ar restr:"
 
-#: gajim/gtk/filetransfer.py:333
-#, fuzzy
-msgid "File transfer error"
-msgstr "Fazi treuzkas"
-
 #: gajim/gtk/filetransfer.py:334
 #, python-format
 msgid ""
-"The file %(file)s has been received, but it seems to have been damaged along "
-"the way.\n"
+"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 ""
 
-#: gajim/gtk/filetransfer.py:350
+#: gajim/gtk/filetransfer.py:340
+#, fuzzy
+msgid "_Download Again"
+msgstr "_Chom hep goulenn ket"
+
+#: gajim/gtk/filetransfer.py:355
 #, fuzzy
 msgid "Gajim can not read this file"
 msgstr "N'hell ket Gajim tizhout ar restr-mañ"
 
-#: gajim/gtk/filetransfer.py:351
+#: gajim/gtk/filetransfer.py:356
 msgid "Another process is using this file."
 msgstr ""
 
-#: gajim/gtk/filetransfer.py:418
+#: gajim/gtk/filetransfer.py:423
 #, fuzzy
 msgid "File Transfer Conflict"
 msgstr "Echu an treuzkasadenn"
 
-#: gajim/gtk/filetransfer.py:419
+#: gajim/gtk/filetransfer.py:424
 msgid "This file already exists"
 msgstr "Bez ez eus eus ar restr-mañ dija"
 
-#: gajim/gtk/filetransfer.py:420
+#: gajim/gtk/filetransfer.py:425
 msgid "Resume download or replace file?"
 msgstr ""
 
-#: gajim/gtk/filetransfer.py:424
+#: gajim/gtk/filetransfer.py:429
 #, fuzzy
 msgid "Replace _File"
 msgstr "Darvoud"
 
-#: gajim/gtk/filetransfer.py:427
+#: gajim/gtk/filetransfer.py:432
 #, fuzzy
 msgid "Resume _Download"
 msgstr "Pellgargañ"
 
-#: gajim/gtk/filetransfer.py:437
+#: gajim/gtk/filetransfer.py:442
 #, python-format
 msgid "Directory '%s' is not writable"
 msgstr ""
 
-#: gajim/gtk/filetransfer.py:438
+#: gajim/gtk/filetransfer.py:443
 msgid "You do not have permissions to create files in this directory."
 msgstr ""
 
-#: gajim/gtk/filetransfer.py:461
+#: gajim/gtk/filetransfer.py:466
 #, python-format
 msgid "File: %s"
 msgstr "Restr: %s"
 
-#: gajim/gtk/filetransfer.py:467
+#: gajim/gtk/filetransfer.py:472
 #, python-format
 msgid "Type: %s"
 msgstr "Doare: %s"
 
-#: gajim/gtk/filetransfer.py:469
+#: gajim/gtk/filetransfer.py:474
 #, python-format
 msgid "Description: %s"
 msgstr "Taolennadur: %s"
 
-#: gajim/gtk/filetransfer.py:480
+#: gajim/gtk/filetransfer.py:485
 #, fuzzy, python-format
 msgid "%s wants to send you a file"
 msgstr "Fellout a ra da %s kas deoc'h ur restr."
 
-#: gajim/gtk/filetransfer.py:509
+#: gajim/gtk/filetransfer.py:514
 #, fuzzy
 msgid "Checking file…"
 msgstr "Kas ur _restr"
 
-#: gajim/gtk/filetransfer.py:524
+#: gajim/gtk/filetransfer.py:529
 #, fuzzy
 msgid "File error"
 msgstr "Fazi treuzkas"
 
-#: gajim/gtk/filetransfer.py:561
+#: gajim/gtk/filetransfer.py:566
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 
-#: gajim/gtk/filetransfer.py:658
+#: gajim/gtk/filetransfer.py:663
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/s)"
 
-#: gajim/gtk/filetransfer.py:711 gajim/gtk/filetransfer.py:715
+#: gajim/gtk/filetransfer.py:716 gajim/gtk/filetransfer.py:720
 msgid "Invalid File"
 msgstr "Restr direizh"
 
-#: gajim/gtk/filetransfer.py:711
+#: gajim/gtk/filetransfer.py:716
 msgid "File: "
 msgstr "Restr:"
 
-#: gajim/gtk/filetransfer.py:716
+#: gajim/gtk/filetransfer.py:721
 msgid "It is not possible to send empty files"
 msgstr "N'eus ket tu da gas restroù goullo"
 
-#: gajim/gtk/filetransfer.py:742 gajim/gtk/tooltips.py:571
+#: gajim/gtk/filetransfer.py:747 gajim/gtk/tooltips.py:571
 msgid "Sender: "
 msgstr "Kaser:"
 
-#: gajim/gtk/filetransfer.py:1038
+#: gajim/gtk/filetransfer.py:1043
 #, fuzzy
 msgid "Choose a File to Send…"
 msgstr "Dibabit ur restr da gas..."
 
 #: gajim/gtk/start_chat.py:51
 #, fuzzy
-msgid "Start new Conversation"
+msgid "Start New Conversation"
 msgstr "Kevreadenn"
 
-#: gajim/gtk/start_chat.py:424
-#, fuzzy
-msgid "New Groupchat"
-msgstr "Flap a-stroll"
+#: gajim/gtk/start_chat.py:260 gajim/gtk/start_chat.py:328
+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:426
+#: gajim/gtk/start_chat.py:603 gajim/gtk/groupchat_join.py:38
+msgid "Join Group Chat"
+msgstr "Ebarzhiñ ur sal-flapiñ"
+
+#: gajim/gtk/start_chat.py:605 gajim/gtk/add_contact.py:40
 #, fuzzy
-msgid "New Contact"
-msgstr "Ouzhpennañ un darempred nevez"
+msgid "Add Contact"
+msgstr "_Ouzhpennañ un darempred..."
 
-#: gajim/gtk/start_chat.py:588
+#: gajim/gtk/start_chat.py:746
 #, fuzzy, python-format
-msgid "%s Group chats found"
+msgid "%s group chats found"
 msgstr "N'eo ket bet kavet %s"
 
-#: gajim/gtk/discovery.py:70
+#: gajim/gtk/discovery.py:69
 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:71
+#: gajim/gtk/discovery.py:70
 #, fuzzy
 msgid ""
 "This service could not respond with detailed information.\n"
@@ -8853,32 +9122,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:128
+#: gajim/gtk/discovery.py:126
 msgid "Others"
 msgstr "Traoù all"
 
-#: gajim/gtk/discovery.py:131
-msgid "Conference"
-msgstr "Kendiviz"
+#: gajim/gtk/discovery.py:129
+#, fuzzy
+msgid "Group Chat"
+msgstr "_Webkaozioù"
 
-#: gajim/gtk/discovery.py:519
+#: gajim/gtk/discovery.py:518
 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:606
+#: gajim/gtk/discovery.py:605
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Merañ servijoù ar gont %s"
 
-#: gajim/gtk/discovery.py:608
+#: gajim/gtk/discovery.py:607
 msgid "Service Discovery"
 msgstr "Merañ ar servijoù"
 
-#: gajim/gtk/discovery.py:691
+#: gajim/gtk/discovery.py:690
 msgid "The service could not be found"
 msgstr "N'eo ket bet kavet ar servij"
 
-#: gajim/gtk/discovery.py:692
+#: gajim/gtk/discovery.py:691
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -8886,104 +9156,83 @@ 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:699 gajim/gtk/discovery.py:1042
+#: gajim/gtk/discovery.py:698 gajim/gtk/discovery.py:1041
 msgid "The service is not browsable"
 msgstr "N'eus ket tu furchal er servij"
 
-#: gajim/gtk/discovery.py:700
+#: gajim/gtk/discovery.py:699
 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:738 gajim/gtk/discovery.py:747
+#: gajim/gtk/discovery.py:737 gajim/gtk/discovery.py:746
 #, fuzzy
 msgid "Invalid Server Name"
 msgstr "Anv-arveriad-ez direizh"
 
-#: gajim/gtk/discovery.py:806
+#: gajim/gtk/discovery.py:805
 #, 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:851
+#: gajim/gtk/discovery.py:850
 #, fuzzy
 msgid "Browse"
 msgstr "_Furchal"
 
-#: gajim/gtk/discovery.py:1043
+#: gajim/gtk/discovery.py:1042
 msgid "This service does not contain any items to browse."
 msgstr "N'eus elfenn ebet da furchal er servij-mañ."
 
-#: gajim/gtk/discovery.py:1255
+#: gajim/gtk/discovery.py:1254
 #, fuzzy
 msgid "_Command"
 msgstr "Urzhioù: %s"
 
-#: gajim/gtk/discovery.py:1264 gajim/gtk/discovery.py:1422
+#: gajim/gtk/discovery.py:1263 gajim/gtk/discovery.py:1420
 msgid "Re_gister"
 msgstr "_Emezelañ"
 
-#: gajim/gtk/discovery.py:1277
+#: gajim/gtk/discovery.py:1276
 msgid "_Search"
 msgstr "_Klask"
 
-#: gajim/gtk/discovery.py:1420
+#: gajim/gtk/discovery.py:1418
 msgid "_Edit"
 msgstr "_Aozañ"
 
-#: gajim/gtk/discovery.py:1458
+#: gajim/gtk/discovery.py:1456
 #, python-format
 msgid "Scanning %(current)d / %(total)d ..."
 msgstr ""
 
-#: gajim/gtk/discovery.py:1674
-msgid "Id"
-msgstr ""
-
-#: gajim/gtk/discovery.py:1713
-msgid "_Join"
-msgstr "E_barzhiñ"
-
-#: gajim/gtk/discovery.py:1736
-msgid "Bookmark already set"
-msgstr "Sined lakaet dija"
-
-#: gajim/gtk/discovery.py:1737
-#, fuzzy, python-format
-msgid "Group Chat '%s' is already in your bookmarks."
-msgstr "Emañ ar flap \"%s\" en ho sinedoù dija."
-
-#: gajim/gtk/discovery.py:1748
-msgid "Bookmark has been added successfully"
-msgstr "Gant berzh eo bet ouzhpennet ar sined"
+#: gajim/gtk/discovery.py:1655
+msgid "Users"
+msgstr "Arveridi"
 
-#: gajim/gtk/discovery.py:1749
-#, fuzzy
-msgid ""
-"You can manage your bookmarks by clicking the Bookmarks menu item in your "
-"contact list."
+#: gajim/gtk/discovery.py:1671
+msgid "Id"
 msgstr ""
-"Bez e c'hellit merañ ho sinedoù dre ar meuziad Oberoù er roll-darempredoù."
 
-#: gajim/gtk/discovery.py:1950
+#: gajim/gtk/discovery.py:1900
 #, fuzzy
 msgid "Subscribed"
 msgstr "Emezelañ"
 
-#: gajim/gtk/discovery.py:1959
+#: gajim/gtk/discovery.py:1909
 #, fuzzy
 msgid "Node"
 msgstr "Hini ebet"
 
-#: gajim/gtk/discovery.py:2028
+#: gajim/gtk/discovery.py:1978
 #, fuzzy
 msgid "_New post"
 msgstr "Sal-flapiñ nevez"
 
-#: gajim/gtk/discovery.py:2037
+#: gajim/gtk/discovery.py:1987
 msgid "_Subscribe"
 msgstr "_Koumanantiñ"
 
-#: gajim/gtk/discovery.py:2045
+#: gajim/gtk/discovery.py:1995
 #, fuzzy
 msgid "_Unsubscribe"
 msgstr "_Koumanantiñ"
@@ -9032,7 +9281,7 @@ msgstr "De %s"
 msgid "Characters typed: %s"
 msgstr "N'eus ket bet kavet al lesanv : %s"
 
-#: gajim/gtk/single_message.py:274 gajim/gtk/xml_console.py:169
+#: gajim/gtk/single_message.py:274 gajim/gtk/xml_console.py:166
 msgid "Connection not available"
 msgstr "N'eus ket tu en em lugañ"
 
@@ -9041,6 +9290,12 @@ msgstr "N'eus ket tu en em lugañ"
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Gwiriekait oc'h luget gant \"%s\"."
 
+#: gajim/gtk/single_message.py:306
+#, 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:330
 #, python-format
 msgid "RE: %s"
@@ -9051,28 +9306,28 @@ msgstr "RE: %s"
 msgid "%s wrote:\n"
 msgstr "%s a skrivas:\n"
 
-#: gajim/gtk/pep_config.py:44
+#: gajim/gtk/pep_config.py:45
 #, fuzzy, python-format
 msgid "PEP Service Configuration (%s)"
 msgstr "Kefluniañ ar webgaoz"
 
-#: gajim/gtk/pep_config.py:77
+#: gajim/gtk/pep_config.py:78
 #, fuzzy
 msgid "Service"
 msgstr "Servijer"
 
-#: gajim/gtk/pep_config.py:114
+#: gajim/gtk/pep_config.py:115
 msgid "PEP node was not removed"
 msgstr ""
 
-#: gajim/gtk/pep_config.py:115
+#: gajim/gtk/pep_config.py:116
 #, python-format
 msgid ""
 "PEP node %(node)s was not removed:\n"
 "%(message)s"
 msgstr ""
 
-#: gajim/gtk/pep_config.py:146
+#: gajim/gtk/pep_config.py:147
 #, fuzzy, python-format
 msgid "Configure %s"
 msgstr "_Kenderc'hel"
@@ -9088,17 +9343,22 @@ msgstr "_Emezelañ"
 msgid "Registration successful"
 msgstr "Gant berzh eo bet embannet ar vCard"
 
-#: gajim/gtk/dialogs.py:54 gajim/gtk/dataform.py:659 gajim/gtk/adhoc.py:85
+#: gajim/gtk/service_registration.py:215
+#, fuzzy
+msgid "Registration failed"
+msgstr "échec lors de la publication de votre vCard"
+
+#: gajim/gtk/dialogs.py:53 gajim/gtk/dataform.py:668 gajim/gtk/adhoc.py:86
 #, fuzzy
 msgid "Cancel"
 msgstr "_Nullañ"
 
-#: gajim/gtk/dialogs.py:129
+#: gajim/gtk/dialogs.py:128
 #, fuzzy, python-format
 msgid "Dictionary for language \"%s\" not available"
 msgstr "N'eus ket tu da gevreañ"
 
-#: gajim/gtk/dialogs.py:130
+#: gajim/gtk/dialogs.py:129
 #, python-format
 msgid ""
 "You have to install the dictionary \"%s\" to use spellchecking, or choose "
@@ -9107,12 +9367,12 @@ msgid ""
 "Highlighting misspelled words feature will not be used"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:410 gajim/gtk/dialogs.py:425
+#: gajim/gtk/dialogs.py:322 gajim/gtk/dialogs.py:337
 #, fuzzy
 msgid "Insecure connection"
 msgstr "Kevreadenn"
 
-#: gajim/gtk/dialogs.py:411
+#: gajim/gtk/dialogs.py:323
 #, fuzzy, python-format
 msgid ""
 "You are about to connect to the account %(account)s (%(server)s) insecurely. "
@@ -9121,119 +9381,114 @@ msgid ""
 "Are you sure you want to do that?"
 msgstr "Rankout a rit krouiñ ur gont a-raok gellout flapiñ gant tud all."
 
-#: gajim/gtk/dialogs.py:416
+#: gajim/gtk/dialogs.py:328
 msgid "Yes, I really want to connect insecurely"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:417
+#: gajim/gtk/dialogs.py:329
 msgid "Gajim will NOT connect unless you check this box"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:675
-#, fuzzy
-msgid "The nickname contains invalid characters."
-msgstr "Bez ez eus arouezioù difennet en anv ar sal pe hini ar servijer."
-
-#: gajim/gtk/dialogs.py:734
+#: gajim/gtk/dialogs.py:561
 #, fuzzy, python-format
 msgid "Destroy %s"
 msgstr "Taolennadur: %s"
 
-#: gajim/gtk/dialogs.py:775
+#: gajim/gtk/dialogs.py:602
 #, fuzzy
 msgid "Certificate"
 msgstr "Anv-arveriad-ez direizh"
 
-#: gajim/gtk/dialogs.py:786
+#: gajim/gtk/dialogs.py:613
 #, fuzzy, python-format
 msgid ""
 "Certificate for account\n"
 "%s"
 msgstr "evit ar gont %s"
 
-#: gajim/gtk/dialogs.py:824
+#: gajim/gtk/dialogs.py:651
 msgid "Issued to\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:825 gajim/gtk/dialogs.py:830
+#: gajim/gtk/dialogs.py:652 gajim/gtk/dialogs.py:657
 msgid "Common Name (CN): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:826 gajim/gtk/dialogs.py:831
+#: gajim/gtk/dialogs.py:653 gajim/gtk/dialogs.py:658
 msgid "Organization (O): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:827 gajim/gtk/dialogs.py:832
+#: gajim/gtk/dialogs.py:654 gajim/gtk/dialogs.py:659
 msgid "Organizational Unit (OU): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:828
+#: gajim/gtk/dialogs.py:655
 msgid "Serial Number: "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:829
+#: gajim/gtk/dialogs.py:656
 msgid "Issued by\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:833
+#: gajim/gtk/dialogs.py:660
 msgid "Validity\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:834
+#: gajim/gtk/dialogs.py:661
 msgid "Issued on: "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:835
+#: gajim/gtk/dialogs.py:662
 msgid "Expires on: "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:836
+#: gajim/gtk/dialogs.py:663
 msgid "SHA-1:"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:838
+#: gajim/gtk/dialogs.py:665
 msgid "SHA-256:"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:852
+#: gajim/gtk/dialogs.py:679
 #, fuzzy
 msgid "View certificate…"
 msgstr "Anv-arveriad-ez direizh"
 
-#: gajim/gtk/dialogs.py:864 gajim/gtk/accounts.py:893
+#: gajim/gtk/dialogs.py:691 gajim/gtk/accounts.py:896
 msgid "Change Password"
 msgstr "Cheñch ar ger-kuzh"
 
-#: gajim/gtk/dialogs.py:878
+#: gajim/gtk/dialogs.py:705
 msgid "_OK"
 msgstr "_Mat eo"
 
-#: gajim/gtk/dialogs.py:891
+#: gajim/gtk/dialogs.py:718
 #, fuzzy
 msgid "You must enter a password"
 msgstr "Rankout a rit reiñ ur ger-kuzh."
 
-#: gajim/gtk/dialogs.py:895
+#: gajim/gtk/dialogs.py:722
 msgid "Passwords do not match"
 msgstr "Ne glot ket ar gerioù-kuzh"
 
-#: gajim/gtk/dialogs.py:923
+#: gajim/gtk/dialogs.py:750
 #, fuzzy
 msgid "Group Chat Invitation "
 msgstr "Pedadenn evit ur sal-flapiñ"
 
-#: gajim/gtk/dialogs.py:948
+#: gajim/gtk/dialogs.py:775
 #, fuzzy, python-format
 msgid "<b>%s</b> has invited you to join a discussion"
 msgstr "Pedet oc'h bet gant %(contact_jid)s er sal-flapiñ %(room_jid)s"
 
-#: gajim/gtk/dialogs.py:951
+#: gajim/gtk/dialogs.py:778
 #, 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:959
+#: gajim/gtk/dialogs.py:786
 #, python-format
 msgid "Comment: %s"
 msgstr "Evezhiadenn: %s"
@@ -9246,11 +9501,6 @@ msgstr ""
 msgid "ICQ Number"
 msgstr ""
 
-#: gajim/gtk/add_contact.py:40
-#, fuzzy
-msgid "Add Contact"
-msgstr "_Ouzhpennañ un darempred..."
-
 #: gajim/gtk/add_contact.py:259
 #, fuzzy, python-format
 msgid "%s Missing"
@@ -9272,7 +9522,7 @@ msgstr ""
 
 #: gajim/gtk/add_contact.py:299
 #, fuzzy
-msgid "You cannot add yourself to your roster."
+msgid "You cannot add yourself to your contact list."
 msgstr "Laouen 'vefen d'ho ouzhpennañ em roll-darempredoù."
 
 #: gajim/gtk/add_contact.py:304
@@ -9285,11 +9535,13 @@ msgid "Your account must be online to add new contacts."
 msgstr ""
 
 #: gajim/gtk/add_contact.py:321
-msgid "Contact already in roster"
+#, fuzzy
+msgid "Contact Already in Contact List"
 msgstr "Darempred er roll dija"
 
 #: gajim/gtk/add_contact.py:322
-msgid "This contact is already listed in your roster."
+#, fuzzy
+msgid "This contact is already in your contact list."
 msgstr "Emañ an darempred en ho roll-darempredoù dija."
 
 #: gajim/gtk/add_contact.py:379 gajim/gtk/add_contact.py:417
@@ -9331,7 +9583,7 @@ msgstr "Darempred diluget"
 
 #: gajim/gtk/themes.py:52
 #, fuzzy
-msgid "MUC Tab New Directed Message"
+msgid "Group Chat Tab New Directed Message"
 msgstr ""
 "Kemennadennoù\n"
 "kaset davet\n"
@@ -9339,7 +9591,7 @@ msgstr ""
 
 #: gajim/gtk/themes.py:56
 #, fuzzy
-msgid "MUC Tab New Message"
+msgid "Group Chat Tab New Message"
 msgstr "Kemennadenn nevez"
 
 #: gajim/gtk/themes.py:60
@@ -9555,13 +9807,13 @@ msgstr "An holl restroù"
 msgid "Clear File"
 msgstr "Darvoud"
 
-#: gajim/gtk/settings.py:570
+#: gajim/gtk/settings.py:570 gajim/gtk/proxies.py:32
 #, fuzzy
 msgid "Manage Proxies"
 msgstr "Merañ an aeladoù proksi"
 
-#: gajim/gtk/settings.py:591 gajim/gtk/preferences.py:971
-#: gajim/gtk/preferences.py:984 gajim/gtk/preferences.py:988
+#: gajim/gtk/settings.py:591 gajim/gtk/preferences.py:968
+#: gajim/gtk/preferences.py:982 gajim/gtk/preferences.py:986
 #, fuzzy
 msgid "No Proxy"
 msgstr "Proksi:"
@@ -9641,15 +9893,16 @@ msgid ""
 "        "
 msgstr ""
 
-#: gajim/gtk/about.py:47 data/org.gajim.Gajim.appdata.xml.in:10
+#: gajim/gtk/about.py:47 data/org.gajim.Gajim.desktop.in:6
+#: data/org.gajim.Gajim.appdata.xml.in:10
 #, fuzzy
-msgid "A GTK+ XMPP client"
+msgid "A GTK XMPP client"
 msgstr "Ur flaperez Jabber e GTK+"
 
 #: gajim/gtk/about.py:48
-#, python-format
-msgid "GTK+ Version: %s"
-msgstr ""
+#, fuzzy, python-format
+msgid "GTK Version: %s"
+msgstr "Taolennadur: %s"
 
 #: gajim/gtk/about.py:49
 #, python-format
@@ -9831,6 +10084,25 @@ msgstr "Diskouez an eur:"
 msgid "?transfer status:Not started"
 msgstr "Diskouez an eur:"
 
+#: gajim/gtk/groupchat_creation.py:97 gajim/gtk/groupchat_creation.py:99
+msgid " (optional)..."
+msgstr ""
+
+#: gajim/gtk/groupchat_creation.py:134
+#, fuzzy
+msgid "Invalid Address"
+msgstr "Restr direizh"
+
+#: gajim/gtk/groupchat_creation.py:182
+#, fuzzy
+msgid "Not Connected"
+msgstr "Kevreadenn"
+
+#: gajim/gtk/groupchat_creation.py:183
+#, fuzzy
+msgid "You have to be connected to create a group chat."
+msgstr "Er strollad"
+
 #: gajim/gtk/sounds.py:39
 msgid "Wav Sounds"
 msgstr "Sonioù wav"
@@ -9874,50 +10146,45 @@ msgstr "Message d'un Salon mis en Sur-brillance"
 msgid "Group Chat Message Received"
 msgstr "Kemennadenn digant ur sal-flapiñ"
 
-#: gajim/gtk/dataform.py:226 gajim/gtk/dataform.py:262
+#: gajim/gtk/dataform.py:232 gajim/gtk/dataform.py:268
 #, fuzzy
 msgid "Required"
 msgstr "Ger-kuzh ret"
 
-#: gajim/gtk/dataform.py:286
+#: gajim/gtk/dataform.py:293
 msgid "Yes"
 msgstr ""
 
-#: gajim/gtk/dataform.py:286
+#: gajim/gtk/dataform.py:293
 #, fuzzy
 msgid "No"
 msgstr "Hini ebet"
 
-#: gajim/gtk/dataform.py:661
+#: gajim/gtk/dataform.py:670
 msgid "Submit"
 msgstr ""
 
-#: gajim/gtk/statusicon.py:213
+#: gajim/gtk/statusicon.py:206
 #, fuzzy
 msgid "_Change Status Message…"
 msgstr "_Kemmañ an titour-stad"
 
-#: gajim/gtk/statusicon.py:247 gajim/gtk/statusicon.py:292
-#: gajim/gtk/statusicon.py:299
+#: gajim/gtk/statusicon.py:258
 #, python-format
 msgid "using account %s"
 msgstr "en ur implij ar gont %s"
 
-#: gajim/gtk/statusicon.py:309
+#: gajim/gtk/statusicon.py:269
 #, fuzzy
-msgid "_Manage Bookmarks…"
-msgstr "Merañ ar sinedoù"
+msgid "Hide _Contact List"
+msgstr "Darempredoù"
 
-#: gajim/gtk/statusicon.py:325
+#: gajim/gtk/statusicon.py:273
 #, fuzzy
-msgid "Hide _Roster"
-msgstr "Ket er roll"
-
-#: gajim/gtk/statusicon.py:329
-msgid "Show _Roster"
-msgstr "Diskouez ar _roll-darempredoù"
+msgid "Show _Contact List"
+msgstr "Diskouez an darempredoù _ezlinenn"
 
-#: gajim/gtk/statusicon.py:337
+#: gajim/gtk/statusicon.py:281
 msgid "Hide this menu"
 msgstr "Kuzhat ar meuziad-mañ"
 
@@ -9966,36 +10233,6 @@ msgstr ""
 "Bez ez eus bet ur fazi en ur embann ho titouroù hiniennel, klaskit en-dro "
 "diwezhatoc'h."
 
-#: gajim/gtk/join_groupchat.py:202
-#, fuzzy
-msgid "Invalid Room"
-msgstr "Road direizh"
-
-#: gajim/gtk/join_groupchat.py:203
-msgid "Please choose a room"
-msgstr ""
-
-#: gajim/gtk/join_groupchat.py:222 gajim/gtk/join_groupchat.py:229
-#, fuzzy
-msgid "Invalid Nickname"
-msgstr "Anv-arveriad-ez direizh"
-
-#: gajim/gtk/join_groupchat.py:223
-msgid "Please choose a nickname"
-msgstr ""
-
-#: gajim/gtk/join_groupchat.py:282 gajim/gtk/join_groupchat.py:288
-#: gajim/gtk/join_groupchat.py:293
-#, fuzzy
-msgid "Wrong server"
-msgstr "Ger-kuzh faos"
-
-#: gajim/gtk/join_groupchat.py:283 gajim/gtk/join_groupchat.py:289
-#: gajim/gtk/join_groupchat.py:294
-#, fuzzy, python-format
-msgid "%s is not a groupchat server"
-msgstr "A guzha an nozelennoù er prenestr flapiñ"
-
 #: gajim/gtk/mam_preferences.py:38
 #, python-format
 msgid "Archiving Preferences for %s"
@@ -10025,48 +10262,55 @@ msgstr ""
 msgid "Archiving Preferences Error"
 msgstr "_Penndibaboù"
 
-#: gajim/gtk/advanced_config.py:81
+#: gajim/gtk/advanced_config.py:95
 #, fuzzy
 msgid "Activated"
 msgstr "Oberiant"
 
-#: gajim/gtk/advanced_config.py:81
+#: gajim/gtk/advanced_config.py:95
 #, fuzzy
 msgid "Deactivated"
 msgstr "Dizoberiant"
 
-#: gajim/gtk/advanced_config.py:83
-msgid "Boolean"
+#: gajim/gtk/advanced_config.py:97
+msgid "?config type:Boolean"
 msgstr ""
 
-#: gajim/gtk/advanced_config.py:84
-#, fuzzy
-msgid "Integer"
-msgstr "Er strollad"
+#: gajim/gtk/advanced_config.py:98
+msgid "?config type:Integer"
+msgstr ""
 
-#: gajim/gtk/advanced_config.py:85
-msgid "Text"
-msgstr "Texte"
+#: gajim/gtk/advanced_config.py:99
+msgid "?config type:Text"
+msgstr ""
 
-#: gajim/gtk/advanced_config.py:97
-msgid "Preference Name"
+#: gajim/gtk/advanced_config.py:100
+msgid "?config type:Color"
+msgstr ""
+
+#: gajim/gtk/advanced_config.py:112
+#, fuzzy
+msgid "?config:Preference Name"
 msgstr "Dibab"
 
-#: gajim/gtk/advanced_config.py:104
-msgid "Value"
-msgstr "Talvoud"
+#: gajim/gtk/advanced_config.py:123
+#, fuzzy
+msgid "?config:Value"
+msgstr "_Kenderc'hel"
 
-#: gajim/gtk/advanced_config.py:113
-msgid "Type"
-msgstr "Doare"
+#: gajim/gtk/advanced_config.py:132
+msgid "?config:Type"
+msgstr ""
 
-#: gajim/gtk/advanced_config.py:168
-msgid "(None)"
-msgstr "(Hini ebet)"
+#: gajim/gtk/advanced_config.py:187
+#, fuzzy
+msgid "?config description:None"
+msgstr "Hini ebet"
 
-#: gajim/gtk/advanced_config.py:299
-msgid "Hidden"
-msgstr "Elfennoù kuzh"
+#: gajim/gtk/advanced_config.py:322
+#, fuzzy
+msgid "?password:Hidden"
+msgstr "Ger-kuzh:"
 
 #: gajim/gtk/server_info.py:66
 #, fuzzy
@@ -10078,8 +10322,8 @@ msgstr "_Kopiañ chomlec'h an ere"
 msgid "%(days)s days, %(hours)s hours"
 msgstr ""
 
-#: gajim/gtk/server_info.py:218 gajim/gtk/accounts.py:749
-#: gajim/gtk/accounts.py:853
+#: gajim/gtk/server_info.py:218 gajim/gtk/accounts.py:752
+#: gajim/gtk/accounts.py:856
 #, fuzzy
 msgid "Hostname"
 msgstr "Servijer:"
@@ -10261,11 +10505,6 @@ 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_config.py:41
-#, fuzzy
-msgid "Group Chat Configuration"
-msgstr "Pedadenn evit ur sal-flapiñ"
-
 #: gajim/gtk/groupchat_config.py:134
 #, fuzzy
 msgid "A Group Chat needs at least one Owner"
@@ -10276,68 +10515,68 @@ msgid "You are not allowed to modify the affiliation of Admins and Owners"
 msgstr ""
 
 #: gajim/gtk/groupchat_config.py:399
-msgid "An entry with this Jabber-ID already exists"
+msgid "An entry with this XMPP Address already exists"
 msgstr ""
 
-#: gajim/gtk/adhoc.py:91
+#: gajim/gtk/adhoc.py:92
 #, fuzzy
 msgid "Finish"
 msgstr "_Echuiñ"
 
-#: gajim/gtk/adhoc.py:97 gajim/gtk/adhoc.py:283
+#: gajim/gtk/adhoc.py:98 gajim/gtk/adhoc.py:284
 #, fuzzy
 msgid "Commands"
 msgstr "Urzhioù: %s"
 
-#: gajim/gtk/adhoc.py:103
+#: gajim/gtk/adhoc.py:104
 msgid "Next"
 msgstr ""
 
-#: gajim/gtk/adhoc.py:109
+#: gajim/gtk/adhoc.py:110
 msgid "Previous"
 msgstr ""
 
-#: gajim/gtk/adhoc.py:115
+#: gajim/gtk/adhoc.py:116
 #, fuzzy
 msgid "Execute"
 msgstr "urzhiad"
 
-#: gajim/gtk/adhoc.py:195
+#: gajim/gtk/adhoc.py:196
 #, fuzzy
 msgid "No commands available"
 msgstr "Kont ebet hegerz"
 
-#: gajim/gtk/adhoc.py:244
+#: gajim/gtk/adhoc.py:245
 #, fuzzy
 msgid "Request Command List"
 msgstr "urzhiad"
 
-#: gajim/gtk/adhoc.py:259
+#: gajim/gtk/adhoc.py:260
 #, fuzzy
 msgid "Executing…"
 msgstr "urzhiad"
 
-#: gajim/gtk/adhoc.py:266
+#: gajim/gtk/adhoc.py:267
 #, fuzzy
 msgid "Command List"
 msgstr "Urzhioù: %s"
 
-#: gajim/gtk/adhoc.py:384
+#: gajim/gtk/adhoc.py:385
 #, fuzzy
 msgid "Finished"
 msgstr "_Echuiñ"
 
-#: gajim/gtk/adhoc.py:453
+#: gajim/gtk/adhoc.py:454
 #, fuzzy
 msgid "Execution failed"
 msgstr "Kevreadenn"
 
-#: gajim/gtk/blocking.py:37
+#: gajim/gtk/blocking.py:38
 #, python-format
 msgid "Blocking List for %s"
 msgstr ""
 
-#: gajim/gtk/blocking.py:71
+#: gajim/gtk/blocking.py:72
 #, fuzzy
 msgid "Error!"
 msgstr "Fazi en ur lenn ar restr:"
@@ -10388,8 +10627,7 @@ msgstr "Anv-arveriad-ez direizh"
 msgid "You must provide a username to configure this account."
 msgstr "Rankout a rit reiñ un anv-arveriad-ez evit kefluniañ ar gont-mañ."
 
-#: gajim/gtk/account_wizard.py:252 gajim/gtk/bookmarks.py:290
-#: gajim/gtk/bookmarks.py:303
+#: gajim/gtk/account_wizard.py:252
 #, fuzzy
 msgid "Invalid server"
 msgstr "Anv-arveriad-ez direizh"
@@ -10407,7 +10645,7 @@ msgstr "Road direizh"
 msgid "Custom port must be a port number."
 msgstr "Ar porzh personelaet a rank bezañ un niverenn borzh"
 
-#: gajim/gtk/account_wizard.py:405
+#: gajim/gtk/account_wizard.py:406
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -10417,16 +10655,16 @@ msgid ""
 "Do you still want to connect to this server?"
 msgstr ""
 
-#: gajim/gtk/account_wizard.py:446 gajim/gtk/account_wizard.py:480
+#: gajim/gtk/account_wizard.py:447 gajim/gtk/account_wizard.py:481
 #, 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:545
+#: gajim/gtk/account_wizard.py:546
 msgid "Account name is in use"
 msgstr "Implijet eo an anv-kont dija"
 
-#: gajim/gtk/account_wizard.py:546
+#: gajim/gtk/account_wizard.py:547
 msgid "You already have an account using this name."
 msgstr "Bez ho peus ur gont gant an anv-se dija."
 
@@ -10453,25 +10691,25 @@ msgstr "Arsavet eo an treuskas eus %(filename)s digant %(name)s."
 msgid "%(minutes)s min %(seconds)s sec"
 msgstr ""
 
-#: gajim/gtk/xml_console.py:77
+#: gajim/gtk/xml_console.py:74
 #, fuzzy
 msgid "Filter"
 msgstr "Sil:"
 
-#: gajim/gtk/xml_console.py:82
+#: gajim/gtk/xml_console.py:79
 msgid "XML Input"
 msgstr ""
 
-#: gajim/gtk/xml_console.py:86
+#: gajim/gtk/xml_console.py:83
 msgid "Paste Last Input"
 msgstr ""
 
-#: gajim/gtk/xml_console.py:170
+#: gajim/gtk/xml_console.py:167
 #, fuzzy, python-format
 msgid "Please make sure you are connected with '%s'."
 msgstr "Gwiriekait oc'h luget gant \"%s\"."
 
-#: gajim/gtk/xml_console.py:182
+#: gajim/gtk/xml_console.py:177
 #, fuzzy
 msgid "Invalid Node"
 msgstr "Restr direizh"
@@ -10504,301 +10742,311 @@ msgstr "Klask"
 msgid "No results found"
 msgstr "N'eo ket bet kavet %s"
 
-#: gajim/gtk/preferences.py:358 gajim/gtk/preferences.py:362
+#: gajim/gtk/preferences.py:357 gajim/gtk/preferences.py:361
 #, fuzzy
 msgid "Default"
 msgstr "Dilemel"
 
-#: gajim/gtk/preferences.py:801
+#: gajim/gtk/preferences.py:798
 msgid "status message title"
 msgstr "titl ar gemennadenn stad"
 
-#: gajim/gtk/preferences.py:802
+#: gajim/gtk/preferences.py:799
 msgid "status message text"
 msgstr "korf ar gemennadenn stad"
 
+#: gajim/gtk/accounts.py:137
+#, fuzzy
+msgid "Re-Login"
+msgstr "Adlugañ bremañ?"
+
 #: gajim/gtk/accounts.py:138
-msgid "Relogin now?"
+#, fuzzy
+msgid "Re-Login now?"
 msgstr "Adlugañ bremañ?"
 
 #: gajim/gtk/accounts.py:139
-msgid "If you want all the changes to apply instantly, you must relogin."
+#, 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:191 gajim/gtk/accounts.py:975
+#: gajim/gtk/accounts.py:141
+msgid "_Later"
+msgstr ""
+
+#: gajim/gtk/accounts.py:143
+msgid "_Re-Login"
+msgstr ""
+
+#: gajim/gtk/accounts.py:194 gajim/gtk/accounts.py:978
 #, fuzzy
 msgid "Remove Account"
 msgstr "Lemel ar gont %s"
 
-#: gajim/gtk/accounts.py:192
+#: gajim/gtk/accounts.py:195
 #, fuzzy, python-format
 msgid "You still have open chats in your account %s"
 msgstr "N'ho peus kont bev ebet"
 
-#: gajim/gtk/accounts.py:193
+#: gajim/gtk/accounts.py:196
 msgid ""
 "All chat and group chat windows will be closed.\n"
 "Do you want to continue?"
 msgstr ""
 
-#: gajim/gtk/accounts.py:424
+#: gajim/gtk/accounts.py:427
 #, fuzzy
 msgid "Back"
 msgstr "Distro 'benn nebeut"
 
-#: gajim/gtk/accounts.py:530
+#: gajim/gtk/accounts.py:533
 msgid "Please check if Bonjour is installed."
 msgstr ""
 
-#: gajim/gtk/accounts.py:532
+#: gajim/gtk/accounts.py:535
 msgid "Please check if Avahi is installed."
 msgstr ""
 
-#: gajim/gtk/accounts.py:569
+#: gajim/gtk/accounts.py:572
 #, fuzzy
 msgid "Disable Account"
 msgstr "Anv-kont direizh"
 
-#: gajim/gtk/accounts.py:570
+#: gajim/gtk/accounts.py:573
 #, fuzzy, python-format
 msgid "Account %s is still connected"
 msgstr "Luget eo ar gont \"%s\" d'ar servijer"
 
-#: gajim/gtk/accounts.py:571
+#: gajim/gtk/accounts.py:574
 msgid ""
 "All chat and group chat windows will be closed. Do you want to continue?"
 msgstr ""
 
-#: gajim/gtk/accounts.py:576
+#: gajim/gtk/accounts.py:579
 #, fuzzy
 msgid "_Disable Account"
 msgstr "Anv-kont direizh"
 
-#: gajim/gtk/accounts.py:595
+#: gajim/gtk/accounts.py:598
 #, fuzzy
 msgid "Add Account"
 msgstr "_Ouzhpennañ un darempred..."
 
-#: gajim/gtk/accounts.py:663
+#: gajim/gtk/accounts.py:666
 msgid "Label"
 msgstr ""
 
-#: gajim/gtk/accounts.py:667
+#: gajim/gtk/accounts.py:670
 msgid "Login"
 msgstr ""
 
-#: gajim/gtk/accounts.py:670
+#: gajim/gtk/accounts.py:673
 #, fuzzy
 msgid "Import Contacts"
 msgstr "Darempredoù"
 
-#: gajim/gtk/accounts.py:674 gajim/gtk/accounts.py:870
+#: gajim/gtk/accounts.py:677 gajim/gtk/accounts.py:873
 #, fuzzy
 msgid "Client Certificate"
 msgstr "Anv-arveriad-ez direizh"
 
-#: gajim/gtk/accounts.py:677 gajim/gtk/accounts.py:774
+#: gajim/gtk/accounts.py:680 gajim/gtk/accounts.py:777
 #, fuzzy
 msgid "Connect on startup"
 msgstr "K_evreañ en ur loc'hañ Gajim"
 
-#: gajim/gtk/accounts.py:681 gajim/gtk/accounts.py:779
+#: gajim/gtk/accounts.py:684 gajim/gtk/accounts.py:782
 #, fuzzy
 msgid "Save conversations for all contacts"
 msgstr "Enrollaén an _istoradur-flapiñ evit an holl zarempredoù"
 
-#: gajim/gtk/accounts.py:683 gajim/gtk/accounts.py:781
+#: gajim/gtk/accounts.py:686 gajim/gtk/accounts.py:784
 msgid "Store conversations on the harddrive"
 msgstr ""
 
-#: gajim/gtk/accounts.py:685 gajim/gtk/accounts.py:783
+#: gajim/gtk/accounts.py:688 gajim/gtk/accounts.py:786
 #, fuzzy
 msgid "Global Status"
 msgstr "Stad:"
 
-#: gajim/gtk/accounts.py:687
+#: gajim/gtk/accounts.py:690
 #, fuzzy
 msgid "Synchronise the status of all accounts"
 msgstr "A cheñch stad ar gont pe ar c'hontoù"
 
-#: gajim/gtk/accounts.py:689
+#: gajim/gtk/accounts.py:692
 msgid "Use file transfer proxies"
 msgstr "Implij ar proksioù evit treuzkas restroù"
 
-#: gajim/gtk/accounts.py:705
+#: gajim/gtk/accounts.py:708
 #, fuzzy
 msgid "Idle Time"
 msgstr "dibaoe %s"
 
-#: gajim/gtk/accounts.py:707
+#: gajim/gtk/accounts.py:710
 msgid "Disclose the time of your last activity"
 msgstr ""
 
-#: gajim/gtk/accounts.py:709
+#: gajim/gtk/accounts.py:712
 msgid "Local System Time"
 msgstr ""
 
-#: gajim/gtk/accounts.py:711
+#: gajim/gtk/accounts.py:714
 msgid "Disclose the local system time of the device Gajim runs on"
 msgstr ""
 
-#: gajim/gtk/accounts.py:714
+#: gajim/gtk/accounts.py:717
 #, fuzzy
 msgid "Client / Operating System"
 msgstr "Anv-arveriad-ez direizh"
 
-#: gajim/gtk/accounts.py:716
+#: gajim/gtk/accounts.py:719
 #, fuzzy
 msgid ""
 "Disclose informations 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:719
+#: gajim/gtk/accounts.py:722
 #, fuzzy
 msgid "Ignore Unknown Contacts"
 msgstr "Darempredoù"
 
-#: gajim/gtk/accounts.py:721
+#: gajim/gtk/accounts.py:724
 #, 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:737 gajim/gtk/accounts.py:776
+#: gajim/gtk/accounts.py:740 gajim/gtk/accounts.py:779
 #, fuzzy
 msgid "Use environment variable"
 msgstr "N'eus ket tu en em lugañ"
 
-#: gajim/gtk/accounts.py:739
-#, fuzzy
-msgid "Proxy"
-msgstr "Proksi:"
-
-#: gajim/gtk/accounts.py:742
+#: gajim/gtk/accounts.py:745
 #, fuzzy
 msgid "Warn on insecure connection"
 msgstr "Kevreadenn"
 
-#: gajim/gtk/accounts.py:746
+#: gajim/gtk/accounts.py:749
 msgid "Send keep-alive packets"
 msgstr "Kas ar pakadoù derc'hel al lugadenn vev"
 
-#: gajim/gtk/accounts.py:750
+#: gajim/gtk/accounts.py:753
 msgid "Manually set the hostname for the server"
 msgstr ""
 
-#: gajim/gtk/accounts.py:756 gajim/gtk/accounts.py:826
-#: gajim/gtk/accounts.py:831
+#: gajim/gtk/accounts.py:759 gajim/gtk/accounts.py:829
+#: gajim/gtk/accounts.py:834
 msgid "Priority"
 msgstr ""
 
-#: gajim/gtk/accounts.py:785
+#: gajim/gtk/accounts.py:788
 #, fuzzy
 msgid "Synchronize the status of all accounts"
 msgstr "A cheñch stad ar gont pe ar c'hontoù"
 
-#: gajim/gtk/accounts.py:795
+#: gajim/gtk/accounts.py:798
 #, fuzzy
 msgid "First Name"
 msgstr "Anv:"
 
-#: gajim/gtk/accounts.py:798
+#: gajim/gtk/accounts.py:801
 #, fuzzy
 msgid "Last Name"
 msgstr "Anv:"
 
-#: gajim/gtk/accounts.py:804
+#: gajim/gtk/accounts.py:807
 #, fuzzy
 msgid "Email"
 msgstr "Postel nevez"
 
-#: gajim/gtk/accounts.py:822
+#: gajim/gtk/accounts.py:825
 #, fuzzy
 msgid "Adjust to status"
 msgstr "Goulenn evit gwelet e/he stad"
 
-#: gajim/gtk/accounts.py:849
+#: gajim/gtk/accounts.py:852
 msgid "Enable"
 msgstr "Enaouiñ"
 
-#: gajim/gtk/accounts.py:857
+#: gajim/gtk/accounts.py:860
 #, fuzzy
 msgid "Port"
 msgstr "_Porzh:"
 
-#: gajim/gtk/accounts.py:862
+#: gajim/gtk/accounts.py:865
 #, fuzzy
 msgid "Connection Settings"
 msgstr "Kevreadenn"
 
-#: gajim/gtk/accounts.py:872
+#: gajim/gtk/accounts.py:875
 msgid "PKCS12 Files"
 msgstr ""
 
-#: gajim/gtk/accounts.py:874
+#: gajim/gtk/accounts.py:877
 #, fuzzy
 msgid "Encrypted Certificate"
 msgstr "Anv-arveriad-ez direizh"
 
-#: gajim/gtk/accounts.py:878
+#: gajim/gtk/accounts.py:881
 #, fuzzy
 msgid "Certificate Settings"
 msgstr "Anv-arveriad-ez direizh"
 
-#: gajim/gtk/accounts.py:890
+#: gajim/gtk/accounts.py:893
 #, fuzzy
 msgid "Save Password"
 msgstr "Enrollañ ar ger-kuzh"
 
-#: gajim/gtk/accounts.py:898
+#: gajim/gtk/accounts.py:901
 #, fuzzy
 msgid "Login Settings"
 msgstr "échec lors de la publication de votre vCard"
 
-#: gajim/gtk/accounts.py:931
+#: gajim/gtk/accounts.py:934
 #, fuzzy, python-format
 msgid "Removing account %s"
 msgstr "Lemel ar gont %s"
 
-#: gajim/gtk/accounts.py:946
+#: gajim/gtk/accounts.py:949
 #, fuzzy
 msgid "Account is disabled"
 msgstr "Lazhet eo ar sifrañ"
 
-#: gajim/gtk/accounts.py:947
+#: gajim/gtk/accounts.py:950
 #, fuzzy
 msgid "To unregister from a server, the account must be enabled."
 msgstr "Rankout a rit bezañ diluget evit cheñch anv ar gont."
 
-#: gajim/gtk/accounts.py:962
+#: gajim/gtk/accounts.py:965
 #, fuzzy
 msgid "Password required"
 msgstr "Ger-kuzh ret"
 
-#: gajim/gtk/accounts.py:976
+#: gajim/gtk/accounts.py:979
 #, fuzzy, python-format
 msgid "Account '%s' is still connected to the server"
 msgstr "Luget eo ar gont \"%s\" d'ar servijer"
 
-#: gajim/gtk/accounts.py:978
+#: gajim/gtk/accounts.py:981
 msgid "If you remove it, the connection will be lost."
 msgstr "Ma tilamit anezhañ, e voc'h diluget."
 
-#: gajim/gtk/accounts.py:995
+#: gajim/gtk/accounts.py:998
 #, fuzzy, python-format
 msgid "Connection to server %s failed"
 msgstr "Kevreadenn"
 
-#: gajim/gtk/accounts.py:996
+#: gajim/gtk/accounts.py:999
 #, fuzzy
 msgid "What would you like to do?"
 msgstr "Petra a fell deoc'h ober?"
 
-#: gajim/gtk/accounts.py:997
+#: gajim/gtk/accounts.py:1000
 #, fuzzy
 msgid "Remove only from Gajim"
 msgstr "Dilemel ar gont diwar Gajim _hepken"
 
-#: gajim/gtk/accounts.py:998
+#: gajim/gtk/accounts.py:1001
 msgid "Don't remove anything. I'll try again later"
 msgstr ""
 
@@ -10822,6 +11070,10 @@ msgstr "Me blijfe din ouzhpennañ ac'hanoc'h em roll-darempredoù."
 msgid "Modify"
 msgstr "_Kemmañ"
 
+#: gajim/gtk/roster_item_exchange.py:80
+msgid "JID"
+msgstr "JID"
+
 #: gajim/gtk/roster_item_exchange.py:86
 #, fuzzy
 msgid "Groups"
@@ -10846,51 +11098,29 @@ 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:581
+#: gajim/gtk/util.py:583
 msgid "Unknown Artist"
 msgstr ""
 
-#: gajim/gtk/util.py:582
+#: gajim/gtk/util.py:584
 msgid "Unknown Title"
 msgstr ""
 
-#: gajim/gtk/util.py:583
+#: gajim/gtk/util.py:585
 msgid "Unknown Source"
 msgstr ""
 
-#: gajim/gtk/util.py:585
+#: gajim/gtk/util.py:587
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
 "from <i>%(source)s</i>"
 msgstr ""
 
-#: gajim/gtk/bookmarks.py:121
-#, fuzzy
-msgid "New Group Chat"
-msgstr "Flap a-stroll"
-
-#: gajim/gtk/bookmarks.py:161
-msgid "This bookmark has invalid data"
-msgstr "Bez ez eus titouroù direizh er sined-mañ"
-
-#: gajim/gtk/bookmarks.py:162
-msgid ""
-"Please be sure to fill out server and room fields or remove this bookmark."
-msgstr ""
-"Gwiriekait ho peus leuniet an takadoù servijer ha sal-flapiñ pe lamit ar "
-"sined-mañ."
-
-#: gajim/gtk/bookmarks.py:273 gajim/gtk/bookmarks.py:291
-#: gajim/gtk/bookmarks.py:304 gajim/gtk/bookmarks.py:335
-#, fuzzy
-msgid "Character not allowed"
-msgstr "N'eus ket bet kavet al lesanv : %s"
-
-#: gajim/gtk/bookmarks.py:334
-#, fuzzy
-msgid "Invalid room"
-msgstr "Road direizh"
+#: gajim/gtk/bookmarks.py:47
+#, fuzzy, python-format
+msgid "Bookmarks for %s"
+msgstr "_Ouzhpennañ ar webgaoz d'ar sinedoù"
 
 #: gajim/plugins/pluginmanager.py:736 gajim/plugins/pluginmanager.py:742
 msgid "Archive corrupted"
@@ -10902,50 +11132,53 @@ msgid "Archive empty"
 msgstr "Treug ar restr"
 
 #: gajim/plugins/pluginmanager.py:750 gajim/plugins/pluginmanager.py:758
-#: gajim/plugins/gui.py:257
+#: gajim/plugins/gui.py:258
 msgid "Archive is malformed"
 msgstr ""
 
-#: gajim/plugins/pluginmanager.py:766 gajim/plugins/gui.py:281
-#: gajim/plugins/gui.py:289
+#: gajim/plugins/pluginmanager.py:766 gajim/plugins/gui.py:288
+#: gajim/plugins/gui.py:301
 #, fuzzy
 msgid "Plugin already exists"
 msgstr "Bez ez eus eus ar restr-mañ dija"
 
-#: gajim/plugins/gui.py:82
+#: gajim/plugins/gui.py:83
 msgid "Click to view Gajim's wiki page on how to install plugins in Flatpak."
 msgstr ""
 
-#: gajim/plugins/gui.py:89
+#: gajim/plugins/gui.py:90
 msgid "Plugin"
 msgstr ""
 
-#: gajim/plugins/gui.py:151
+#: gajim/plugins/gui.py:152
 #, fuzzy, python-format
 msgid "Warning: %s"
 msgstr "Argas %s"
 
-#: gajim/plugins/gui.py:206
+#: gajim/plugins/gui.py:207
 #, fuzzy
 msgid "Plugin failed"
 msgstr "échec lors de la publication de votre vCard"
 
-#: gajim/plugins/gui.py:245
+#: gajim/plugins/gui.py:246
 msgid "Unable to properly remove the plugin"
 msgstr ""
 
-#: gajim/plugins/gui.py:281
-msgid "Overwrite?"
-msgstr ""
+#: gajim/plugins/gui.py:287
+#, fuzzy
+msgid "Overwrite Plugin?"
+msgstr "Titour-stad"
+
+#: gajim/plugins/gui.py:289
+#, fuzzy
+msgid "Do you want to overwrite the currently installed version?"
+msgstr "Fellout a ra din emezelañ evit krouiñ ur gont"
 
 #: data/org.gajim.Gajim.desktop.in:5
-msgid "Jabber IM Client"
+#, fuzzy
+msgid "XMPP IM Client"
 msgstr "Flaperez Jabber"
 
-#: data/org.gajim.Gajim.desktop.in:6
-msgid "A GTK+ Jabber client"
-msgstr "Ur flaperez Jabber e GTK+"
-
 #: data/org.gajim.Gajim.desktop.in:8
 msgid "chat;messaging;im;xmpp;bonjour;voip;"
 msgstr ""
@@ -10997,7 +11230,7 @@ msgid "Easily send pictures, videos or other files to friends and groups"
 msgstr ""
 
 #: data/org.gajim.Gajim.appdata.xml.in:27
-msgid "Chat securely with End-to-End encryption via OMEMO or PGP"
+msgid "Chat securely with End-to-End encryption via OMEMO or OpenPGP"
 msgstr ""
 
 #: data/org.gajim.Gajim.appdata.xml.in:28
@@ -11058,7 +11291,7 @@ msgstr ""
 
 #: data/org.gajim.Gajim.appdata.xml.in:52
 #, fuzzy
-msgid "Roster, list of contacts"
+msgid "Contact list, list of contacts"
 msgstr "_Menegiñ kemmoù stad an darempredoù e-barzh an istoradur"
 
 #: data/org.gajim.Gajim.appdata.xml.in:56
@@ -11080,6 +11313,467 @@ msgstr "Nevez 'zo:"
 msgid "Plugin manager"
 msgstr "échec lors de la publication de votre vCard"
 
+#, fuzzy
+#~ msgid "Configure Services…"
+#~ msgstr "_Dizoleiñ ar servijoù..."
+
+#, fuzzy
+#~ msgid "Group Chat Bookmarks"
+#~ msgstr "Flap a-stroll"
+
+#, fuzzy
+#~ msgid "Add Bookmark"
+#~ msgstr "_Ouzhpennañ ar webgaoz d'ar sinedoù"
+
+#, fuzzy
+#~ msgid "Remove Bookmark"
+#~ msgstr "_Ouzhpennañ ar webgaoz d'ar sinedoù"
+
+#, fuzzy
+#~ msgid "Bookmark Name"
+#~ msgstr "_Ouzhpennañ ar webgaoz d'ar sinedoù"
+
+#, fuzzy
+#~ msgid "_Server"
+#~ msgstr "_Servijer:"
+
+#, fuzzy
+#~ msgid "_Password"
+#~ msgstr "_Ger-kuzh:"
+
+#, fuzzy
+#~ msgid "Join chat when connected"
+#~ msgstr "Darempred diluget"
+
+#, fuzzy
+#~ msgid "New Group Chat"
+#~ msgstr "Flap a-stroll"
+
+#~ msgid "This bookmark has invalid data"
+#~ msgstr "Bez ez eus titouroù direizh er sined-mañ"
+
+#, fuzzy
+#~ msgid ""
+#~ "Please be sure to fill out server and group chat fields or remove this "
+#~ "bookmark."
+#~ msgstr ""
+#~ "Gwiriekait ho peus leuniet an takadoù servijer ha sal-flapiñ pe lamit ar "
+#~ "sined-mañ."
+
+#, fuzzy
+#~ msgid "Character not allowed"
+#~ msgstr "N'eus ket bet kavet al lesanv : %s"
+
+#, fuzzy
+#~ msgid "Invalid Group Chat"
+#~ msgstr "ID jabber direizh"
+
+#, fuzzy
+#~ msgid "Unable to join group chat"
+#~ msgstr "Impossible de rejoindre le salon"
+
+#, fuzzy
+#~ msgid "You are banned from group chat <b>%s</b>."
+#~ msgstr "Vous êtes banni de ce salon."
+
+#, fuzzy
+#~ msgid "Remote server <b>%s</b> does not exist."
+#~ msgstr "Ce salon n'existe pas."
+
+#, fuzzy
+#~ msgid "Group chat <b>%s</b> does not exist."
+#~ msgstr "Ce salon n'existe pas."
+
+#, fuzzy
+#~ msgid "Group chat creation is not permitted."
+#~ msgstr "La création de salon est réservée aux administrateurs."
+
+#, fuzzy
+#~ msgid "You must use your registered nickname in <b>%s</b>."
+#~ msgstr "Vous devez utiliser le surnom donné lors de l'enregistrement."
+
+#, fuzzy
+#~ msgid "You are not in the members list in group chat %s."
+#~ msgstr "Vous n'êtes pas dans la liste des membres."
+
+#, fuzzy
+#~ msgid "XMPP Address is not a group chat"
+#~ msgstr "A guzha an nozelennoù er prenestr flapiñ"
+
+#, fuzzy
+#~ msgid "Please choose a group chat"
+#~ msgstr "Ebarzhiñ ur _webgaoz"
+
+#, fuzzy
+#~ msgid "Invalid Nickname"
+#~ msgstr "Anv-arveriad-ez direizh"
+
+#, fuzzy
+#~ msgid "Wrong server"
+#~ msgstr "Ger-kuzh faos"
+
+#, fuzzy
+#~ msgid "%s is not a group chat server"
+#~ msgstr "A guzha an nozelennoù er prenestr flapiñ"
+
+#, fuzzy
+#~ msgid "A Password is required to join the group chat %s. Please type it."
+#~ msgstr "Un mot de passe est requis pour rejoindre ce salon."
+
+#~ msgid "Not in Roster"
+#~ msgstr "Ket er roll"
+
+#~ msgid "I would like to add you to my roster"
+#~ msgstr "Laouen 'vefen d'az ouzhpennañ em roll-darempredoù"
+
+#, fuzzy
+#~ msgid "Add to Roster"
+#~ msgstr "_Ouzhpennañ er roll"
+
+#, fuzzy
+#~ msgid "Manage Room"
+#~ msgstr "Merañ ar sinedoù"
+
+#, fuzzy
+#~ msgid "Configure Room"
+#~ msgstr "Ke_fluniañ ar flap"
+
+#, fuzzy
+#~ msgid "Destroy Room"
+#~ msgstr "Taolennadur: %s"
+
+#, fuzzy
+#~ msgid "Change Nick"
+#~ msgstr "Cheñch _lesanv"
+
+#, fuzzy
+#~ msgid "Disconnect"
+#~ msgstr "Darempred diluget"
+
+#, fuzzy
+#~ msgid "Copy JID"
+#~ msgstr "Webgaoz:"
+
+#, fuzzy
+#~ msgid "Add to Roster…"
+#~ msgstr "_Ouzhpennañ er roll"
+
+#, fuzzy
+#~ msgid "Copy JID/Email"
+#~ msgstr "_Kopiañ ar JID/Chomlec'h postel"
+
+#, fuzzy
+#~ msgid "JID: <i>%s</i>"
+#~ msgstr "JID: <i>%s</i>"
+
+#~ msgid "Changing Subject"
+#~ msgstr "Cheñch ar sujed"
+
+#~ msgid "Please specify the new subject:"
+#~ msgstr "Skrivit ar sujed nevez:"
+
+#, fuzzy
+#~ msgid "You (%s) joined the room"
+#~ msgstr "Er strollad"
+
+#, fuzzy
+#~ msgid "Unable to join groupchat"
+#~ msgstr "Impossible de rejoindre le salon"
+
+#~ msgid "Groupchat Invitation"
+#~ msgstr "Pedadenn evit ur sal-flapiñ"
+
+#, fuzzy
+#~ msgid "%(jid)s has been invited in this room"
+#~ msgstr "%(nick)s a zo bet skarzhet gant %(who)s : %(reason)s"
+
+#, fuzzy
+#~ msgid "JID is not a Groupchat"
+#~ msgstr "A guzha an nozelennoù er prenestr flapiñ"
+
+#, fuzzy
+#~ msgid "Invalid JID"
+#~ msgstr "ID jabber direizh"
+
+#~ msgid "A connection is not available"
+#~ msgstr "N'eus ket tu da gevreañ"
+
+#, fuzzy
+#~ msgid "JID already in list"
+#~ msgstr "Flaperez Jabber"
+
+#, fuzzy
+#~ msgid "For the chosen encryption there is no encryption method available"
+#~ msgstr "N'eus ket tu da gevreañ"
+
+#~ msgid "Removes contact from roster"
+#~ msgstr "Dilemel an darempred diouzh ar roll"
+
+#, fuzzy
+#~ msgid "Not in roster"
+#~ msgstr "Ket er roll"
+
+#, fuzzy
+#~ msgid "Contact signed in notification color."
+#~ msgstr "Diskouez er _roll hepken"
+
+#, fuzzy
+#~ msgid "Contact signout notification color"
+#~ msgstr "Diskouez er _roll hepken"
+
+#, fuzzy
+#~ msgid "File transfer request notification color."
+#~ msgstr "Goulenn treuzkas"
+
+#, fuzzy
+#~ msgid "File transfer error notification color."
+#~ msgstr "Nullet eo bet an treuzkas"
+
+#, fuzzy
+#~ msgid "File transfer complete or stopped notification color."
+#~ msgstr "P'eo echu un treuzkas, diskouez ur gemennadenn gelaouiñ difoupus"
+
+#, fuzzy
+#~ msgid "Groupchat invitation notification color"
+#~ msgstr "Pedadenn evit ur sal-flapiñ"
+
+#~ msgid "Add * and [n] in roster title?"
+#~ msgstr "Ouzhpennañ * hag [n] da ditl ar roll darempredoù?"
+
+#~ msgid "I'm eating, so leave me a message."
+#~ msgstr "O tebriñ 'maon, neuze laoskit ur gemennadenn."
+
+#, fuzzy
+#~ msgid "from room %s"
+#~ msgstr "De %s"
+
+#, fuzzy
+#~ msgid "Leave Groupchats"
+#~ msgstr "Flap a-stroll"
+
+#, fuzzy
+#~ msgid "Room"
+#~ msgstr "Webgaoz:"
+
+#~ msgid "Jabber ID:"
+#~ msgstr "ID Jabber:"
+
+#, fuzzy
+#~ msgid "Occupant Actions"
+#~ msgstr "_Galloudoù an darempred"
+
+#~ msgid "_Add to Roster"
+#~ msgstr "_Ouzhpennañ er roll"
+
+#, fuzzy
+#~ msgid "_Manage Room"
+#~ msgstr "Merañ ar sinedoù"
+
+#, fuzzy
+#~ msgid "Configure _Room..."
+#~ msgstr "Ke_fluniañ ar flap"
+
+#, fuzzy
+#~ msgid "_Destroy Room"
+#~ msgstr "Taolennadur: %s"
+
+#, fuzzy
+#~ msgid "Jabber ID"
+#~ msgstr "ID Jabber:"
+
+#, fuzzy
+#~ msgid "account"
+#~ msgstr "compte : "
+
+#, fuzzy
+#~ msgid "Roster"
+#~ msgstr "Diskouez ar _roll-darempredoù"
+
+#, fuzzy
+#~ msgid "Show only in roster"
+#~ msgstr "Diskouez er _roll hepken"
+
+#, fuzzy
+#~ msgid "in _roster"
+#~ msgstr "Ket er roll"
+
+#, fuzzy
+#~ msgid "Roster Appearance"
+#~ msgstr "<b>Furmad ul linenn</b>"
+
+#, fuzzy
+#~ msgid "Show chatstate in roster"
+#~ msgstr "Diskouez _skeudennigoù an darempredoù er roll"
+
+#, fuzzy
+#~ msgid "_Add to Roster..."
+#~ msgstr "_Ouzhpennañ er roll"
+
+#~ msgid "_Jabber ID:"
+#~ msgstr "ID _Jabber:"
+
+#, fuzzy
+#~ msgid "_Jabber ID"
+#~ msgstr "ID _Jabber:"
+
+#, fuzzy
+#~ msgid "JabberID"
+#~ msgstr "ID Jabber:"
+
+#, fuzzy
+#~ msgid "Show Roster"
+#~ msgstr "Diskouez ar _roll-darempredoù"
+
+#, fuzzy
+#~ msgid "MUC server"
+#~ msgstr "Sellerien"
+
+#~ msgid "Room Configuration"
+#~ msgstr "Kefluniañ ar webgaoz"
+
+#~ msgid "Join _Group Chat"
+#~ msgstr "Ebarzhiñ ur _webgaoz"
+
+#, fuzzy
+#~ msgid "Audio sessions are not available"
+#~ msgstr "N'eus ket tu da gevreañ"
+
+#~ msgid "Conference"
+#~ msgstr "Kendiviz"
+
+#, fuzzy
+#~ msgid "_Manage Bookmarks…"
+#~ msgstr "Merañ ar sinedoù"
+
+#, fuzzy
+#~ msgid "Hide _Roster"
+#~ msgstr "Ket er roll"
+
+#~ msgid "Show _Roster"
+#~ msgstr "Diskouez ar _roll-darempredoù"
+
+#, fuzzy
+#~ msgid "Invalid Room"
+#~ msgstr "Road direizh"
+
+#, fuzzy
+#~ msgid "Invalid room"
+#~ msgstr "Road direizh"
+
+#~ msgid "A GTK+ Jabber client"
+#~ msgstr "Ur flaperez Jabber e GTK+"
+
+#~ msgid "Changing Nickname"
+#~ msgstr "Cheñch lesanv"
+
+#~ msgid "Please specify the new nickname you want to use:"
+#~ msgstr "Skrivit al lesanv nevez a fell deoc'h implij:"
+
+#~ msgid "Bookmark already set"
+#~ msgstr "Sined lakaet dija"
+
+#, fuzzy
+#~ msgid "Group Chat '%s' is already in your bookmarks."
+#~ msgstr "Emañ ar flap \"%s\" en ho sinedoù dija."
+
+#~ msgid "Bookmark has been added successfully"
+#~ msgstr "Gant berzh eo bet ouzhpennet ar sined"
+
+#, fuzzy
+#~ msgid ""
+#~ "You can manage your bookmarks by clicking the Bookmarks menu item in your "
+#~ "contact list."
+#~ msgstr ""
+#~ "Bez e c'hellit merañ ho sinedoù dre ar meuziad Oberoù er roll-darempredoù."
+
+#, fuzzy
+#~ msgid "The nickname contains invalid characters."
+#~ msgstr "Bez ez eus arouezioù difennet en anv ar sal pe hini ar servijer."
+
+#, fuzzy
+#~ msgid "Bookmark Room"
+#~ msgstr "_Ouzhpennañ ar webgaoz d'ar sinedoù"
+
+#, fuzzy
+#~ msgid "_Join New Group Chat"
+#~ msgstr "Ebarzhiñ ur sal-flapiñ"
+
+#, fuzzy
+#~ msgid "_Create Group Chat"
+#~ msgstr "Flap a-stroll"
+
+#~ msgid "Name:"
+#~ msgstr "Anv:"
+
+#, fuzzy
+#~ msgid "Description:"
+#~ msgstr "Taolennadur: %s"
+
+#, fuzzy
+#~ msgid "Address:"
+#~ msgstr "_Chomlec'h:"
+
+#, fuzzy
+#~ msgid "You can not start a new conversation unless you are connected."
+#~ msgstr "N'hellit ket ebarzhiñ ur sal-flapiñ keit ha ma n'oc'h ket luget."
+
+#, fuzzy
+#~ msgid "Occupants"
+#~ msgstr "_Galloudoù an darempred"
+
+#, fuzzy
+#~ msgid "File transfer error"
+#~ msgstr "Fazi treuzkas"
+
+#, fuzzy
+#~ msgid "No Accounts available"
+#~ msgstr "Kont ebet hegerz"
+
+#~ msgid "_Modify Account..."
+#~ msgstr "_Kemmañ ar gont..."
+
+#, fuzzy
+#~ msgid "Integer"
+#~ msgstr "Er strollad"
+
+#~ msgid "Text"
+#~ msgstr "Texte"
+
+#~ msgid "Value"
+#~ msgstr "Talvoud"
+
+#~ msgid "Type"
+#~ msgstr "Doare"
+
+#~ msgid "(None)"
+#~ msgstr "(Hini ebet)"
+
+#~ msgid "Hidden"
+#~ msgstr "Elfennoù kuzh"
+
+#~ msgid "Manage Proxy Profiles"
+#~ msgstr "Merañ an aeladoù proksi"
+
+#, fuzzy
+#~ msgid "Properties"
+#~ msgstr "<b>Perzhioù</b>"
+
+#, fuzzy
+#~ msgid "Proxy _Host"
+#~ msgstr "Proksi:"
+
+#, fuzzy
+#~ msgid "Proxy _Port"
+#~ msgstr "_Porzh:"
+
+#, fuzzy
+#~ msgid "New Groupchat"
+#~ msgstr "Flap a-stroll"
+
+#, fuzzy
+#~ msgid "New Contact"
+#~ msgstr "Ouzhpennañ un darempred nevez"
+
 #~ msgid "%s GiB"
 #~ msgstr "%s Go"
 
@@ -11165,9 +11859,6 @@ msgstr "échec lors de la publication de votre vCard"
 #~ msgid "_Pause"
 #~ msgstr "_Ehan"
 
-#~ msgid "Clean _up"
-#~ msgstr "_Naetaat"
-
 #~ msgid "Remove file transfer from the list."
 #~ msgstr "Dilemel an treuzkas restroù diwar ar roll"
 
@@ -11651,10 +12342,6 @@ msgstr "échec lors de la publication de votre vCard"
 #~ msgid "Nick"
 #~ msgstr "Lesanv"
 
-#, fuzzy
-#~ msgid "Banning…"
-#~ msgstr "Oc'h argas..."
-
 #~ msgid ""
 #~ "<b>Whom do you want to ban?</b>\n"
 #~ "\n"
@@ -11722,13 +12409,6 @@ msgstr "échec lors de la publication de votre vCard"
 #~ msgstr "Sil:"
 
 #, fuzzy
-#~ msgid ""
-#~ "If checked, Gajim will display the mood of contacts in the roster window"
-#~ msgstr ""
-#~ "Si cette case est cochée, Gajim affichera l'avatar de chaque contact dans "
-#~ "la fenêtre principale et les salons"
-
-#, fuzzy
 #~ msgid "<b>Chat Appearance</b>"
 #~ msgstr "<b>Furmad ul linenn</b>"
 
@@ -11945,10 +12625,6 @@ msgstr "échec lors de la publication de votre vCard"
 #~ msgstr "_Titour-stad:"
 
 #, fuzzy
-#~ msgid "Group chat highlight"
-#~ msgstr "Message d'un Salon mis en Sur-brillance"
-
-#, fuzzy
 #~ msgid "Your nickname"
 #~ msgstr "_A-raok al lesanv:"
 
@@ -12113,9 +12789,6 @@ msgstr "échec lors de la publication de votre vCard"
 #~ msgid "The passwords typed in both fields must be identical."
 #~ msgstr "Rankout a ra an daou c'her-kuzh bezañ heñvel en daou dakad."
 
-#~ msgid "Enter new password:"
-#~ msgstr "Roit ur ger-kuzh nevez:"
-
 #~ msgid "Enter it again for confirmation:"
 #~ msgstr "Roit anezhañ en-dro evit kadarnaat:"
 
@@ -12218,10 +12891,6 @@ msgstr "échec lors de la publication de votre vCard"
 #~ msgstr "Gajim - %d gemennadenn nevez"
 
 #, fuzzy
-#~ msgid "AIM Address:"
-#~ msgstr "_Chomlec'h:"
-
-#, fuzzy
 #~ msgid "MSN Address:"
 #~ msgstr "_Chomlec'h:"
 
@@ -12420,9 +13089,6 @@ msgstr "échec lors de la publication de votre vCard"
 #~ msgid "Server:"
 #~ msgstr "Servijer:"
 
-#~ msgid "Password:"
-#~ msgstr "Ger-kuzh:"
-
 #, fuzzy
 #~ msgid "Join this room _automatically when I connect"
 #~ msgstr "Aozañ ma aelad pa lugan"
@@ -12440,10 +13106,6 @@ msgstr "échec lors de la publication de votre vCard"
 #~ msgstr "Merour an istoradur"
 
 #, fuzzy
-#~ msgid "This contact does not support file transfer."
-#~ msgstr "Ur roll eus an treuzkasoù oberiant, echu pe arsavet"
-
-#, fuzzy
 #~ msgid "Hides the buttons in chat windows."
 #~ msgstr "A guzha an nozelennoù er prenestroù webgaoz"
 
@@ -12655,9 +13317,6 @@ msgstr "échec lors de la publication de votre vCard"
 #~ msgid "_Edit Personal Information..."
 #~ msgstr "Kemmañ an titouroù hiniennel..."
 
-#~ msgid "Information about you, as stored in the server"
-#~ msgstr "Titouroù diwar ho penn, miret war ar servijer"
-
 #~ msgid "<b>Personal Information</b>"
 #~ msgstr "<b>Titouroù hiniennel</b>"
 
@@ -12687,13 +13346,6 @@ msgstr "échec lors de la publication de votre vCard"
 #~ msgid "Account Name Already Used"
 #~ msgstr "Anv-kont implijet dija"
 
-#~ msgid ""
-#~ "This name is already used by another of your accounts. Please choose "
-#~ "another name."
-#~ msgstr ""
-#~ "Implijet e vez an anv-mañ gant unan eus ho kontoù dija. Dibabit un anv "
-#~ "all marplij."
-
 #~ msgid "Invalid account name"
 #~ msgstr "Anv-kont direizh"
 
@@ -12725,10 +13377,6 @@ msgstr "échec lors de la publication de votre vCard"
 #~ msgid "Your server can't save your personal information."
 #~ msgstr "Rankout a rit krouiñ ho kont a-raok kemmañ an titouroù hiniennel."
 
-#, fuzzy
-#~ msgid "Account Local already exists."
-#~ msgstr "Anv-kont implijet dija"
-
 #~ msgid "THANKS:"
 #~ msgstr "TRUGAREZ DA:"
 
@@ -12786,10 +13434,6 @@ msgstr "échec lors de la publication de votre vCard"
 #~ msgstr "[Sifret eo ar gemennadenn-mañ]"
 
 #, fuzzy
-#~ msgid "Encryption used for this contact."
-#~ msgstr "N'eus ket tu da implij OpenPGP war an urzhiataer-mañ"
-
-#, fuzzy
 #~ msgid "OpenPGP encryption enabled"
 #~ msgstr "War enaou emañ ar sifrañ"
 
@@ -12842,10 +13486,6 @@ msgstr "échec lors de la publication de votre vCard"
 #~ msgstr "_Ouzhpennañ un darempred..."
 
 #, fuzzy
-#~ msgid "_Accounts"
-#~ msgstr "Kontoù"
-
-#, fuzzy
 #~ msgid "Profile, A_vatar"
 #~ msgstr "Aelad, Avatar"
 
@@ -13016,14 +13656,6 @@ msgstr "échec lors de la publication de votre vCard"
 #~ msgstr "Oberiant"
 
 #, fuzzy
-#~ msgid "Join _Group Chat..."
-#~ msgstr "Ebarzhiñ ur _webgaoz"
-
-#, fuzzy
-#~ msgid "_Modify Account"
-#~ msgstr "_Kemmañ ar gont..."
-
-#, fuzzy
 #~ msgid "Would you like to make Gajim the default Jabber client?"
 #~ msgstr "Voulez-vous l'écraser ?"
 
@@ -13351,10 +13983,6 @@ msgstr "échec lors de la publication de votre vCard"
 #~ msgstr "N'eus ket bet kavet al lesanv : %s"
 
 #, fuzzy
-#~ msgid "This group chat has no subject"
-#~ msgstr "N'eus sujed ebet gant ar webgaoz-mañ"
-
-#, fuzzy
 #~ msgid ""
 #~ "Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
 #~ "nickname of an occupant may be substituted, but not if it contains \"@\". "
@@ -13425,9 +14053,6 @@ msgstr "échec lors de la publication de votre vCard"
 #~ "messages."
 #~ msgstr "Usage : /%s <surnom>, change votre surnom dans ce salon."
 
-#~ msgid "_Host:"
-#~ msgstr "_Ostiz:"
-
 #, fuzzy
 #~ msgid "Modify Account"
 #~ msgstr "_Kemmañ ar gont..."
@@ -13492,9 +14117,6 @@ msgstr "échec lors de la publication de votre vCard"
 #~ msgid "<b>Interface Customization</b>"
 #~ msgstr "<b>Personelaat an etrefas</b>"
 
-#~ msgid "A_fter nickname:"
-#~ msgstr "Da _heul al lesanv:"
-
 #~ msgid "Also known as iChat style"
 #~ msgstr "Anvet ivez stil iChat"
 
@@ -13576,9 +14198,6 @@ msgstr "échec lors de la publication de votre vCard"
 #~ msgid "_Player:"
 #~ msgstr "_Soner:"
 
-#~ msgid "Address"
-#~ msgstr "Chomlec'h"
-
 #~ msgid "Role:"
 #~ msgstr "Perzh:"
 
@@ -13612,9 +14231,6 @@ msgstr "échec lors de la publication de votre vCard"
 #~ "Support du gestionnaire de sessions indisponible (module gnome.ui "
 #~ "manquant)"
 
-#~ msgid "Private Chat"
-#~ msgstr "Flap prevez"
-
 #~ msgid "%s is now %s"
 #~ msgstr "%s a zo bremañ %s"
 
@@ -13797,9 +14413,6 @@ msgstr "échec lors de la publication de votre vCard"
 #~ msgid "Timeout"
 #~ msgstr "Dépassement de temps"
 
-#~ msgid "account: "
-#~ msgstr "compte : "
-
 #~ msgid "Activate/Disable notification for when a file transfer is complete"
 #~ msgstr "Active/Désactive la notification de fin de transfert"
 
diff --git a/po/ca.po b/po/ca.po
index 3c9d174cb..f8f1fb430 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: 2019-07-02 02:06+0000\n"
+"POT-Creation-Date: 2019-08-11 02:05+0000\n"
 "PO-Revision-Date: 2017-08-01 14:04+0200\n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -18,65 +18,65 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Poedit 1.8.11\n"
 
-#: gajim/chat_control_base.py:550
+#: gajim/chat_control_base.py:557
 msgid "_Undo"
 msgstr ""
 
-#: gajim/chat_control_base.py:558 gajim/conversation_textview.py:529
+#: gajim/chat_control_base.py:565 gajim/conversation_textview.py:529
 msgid "_Clear"
 msgstr ""
 
-#: gajim/chat_control_base.py:563
+#: gajim/chat_control_base.py:570
 msgid "Paste as quote"
 msgstr ""
 
-#: gajim/chat_control_base.py:613
+#: gajim/chat_control_base.py:620
 msgid "Paste Image"
 msgstr ""
 
-#: gajim/chat_control_base.py:614
+#: gajim/chat_control_base.py:621
 msgid "You are trying to paste an image"
 msgstr ""
 
-#: gajim/chat_control_base.py:615
+#: gajim/chat_control_base.py:622
 msgid ""
 "Are you sure you want to paste your clipboard's image into the chat window?"
 msgstr ""
 
-#: gajim/chat_control_base.py:617 gajim/groupchat_control.py:2310
-#: gajim/roster_window.py:2848 gajim/roster_window.py:4167
-#: gajim/message_window.py:252 gajim/gtk/dialogs.py:418
+#: gajim/chat_control_base.py:624 gajim/groupchat_control.py:2218
+#: gajim/roster_window.py:2841 gajim/roster_window.py:4118
+#: gajim/message_window.py:359 gajim/gtk/dialogs.py:330
 msgid "_Do not ask me again"
 msgstr ""
 
-#: gajim/chat_control_base.py:620
+#: gajim/chat_control_base.py:627
 msgid "_Paste"
 msgstr ""
 
-#: gajim/chat_control_base.py:1162 gajim/gtk/accounts.py:351
+#: gajim/chat_control_base.py:1169 gajim/gtk/accounts.py:354
 msgid "Privacy"
 msgstr ""
 
-#: gajim/chat_control_base.py:1163
+#: gajim/chat_control_base.py:1170
 msgid "Warning"
 msgstr ""
 
-#: gajim/chat_control_base.py:1164
+#: gajim/chat_control_base.py:1171
 #, python-format
 msgid "If you send a file to <b>%s</b>, your real JID will be revealed."
 msgstr ""
 
-#: gajim/chat_control_base.py:1169
+#: gajim/chat_control_base.py:1176
 #, fuzzy
 msgid "Continue"
 msgstr "Con_tinua"
 
-#: gajim/gtkgui_helpers.py:163 gajim/gtk/filetransfer.py:393
+#: gajim/gtkgui_helpers.py:163 gajim/gtk/filetransfer.py:398
 #, python-format
 msgid "Cannot overwrite existing file '%s'"
 msgstr ""
 
-#: gajim/gtkgui_helpers.py:164 gajim/gtk/filetransfer.py:394
+#: gajim/gtkgui_helpers.py:164 gajim/gtk/filetransfer.py:399
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
@@ -155,369 +155,380 @@ msgstr ""
 msgid " resource with priority "
 msgstr ""
 
-#: gajim/gui_menu_builder.py:96
-msgid "_New Group Chat"
-msgstr ""
-
-#: gajim/gui_menu_builder.py:289 gajim/gui_menu_builder.py:380
-#: gajim/chat_control.py:303 gajim/roster_window.py:786
-#: gajim/roster_window.py:1719 gajim/roster_window.py:1721
-#: gajim/roster_window.py:2030 gajim/roster_window.py:3336
-#: gajim/roster_window.py:3369 gajim/gui_interface.py:413
-#: gajim/common/contacts.py:206 gajim/common/contacts.py:343
-#: gajim/common/helpers.py:83 gajim/common/helpers.py:311
-#: gajim/gtk/add_contact.py:319 gajim/gtk/subscription_request.py:70
-#: gajim/gtk/subscription_request.py:99 gajim/gtk/roster_item_exchange.py:112
-msgid "Not in Roster"
-msgstr ""
+#: gajim/gui_menu_builder.py:251 gajim/gui_menu_builder.py:342
+#: gajim/chat_control.py:305 gajim/roster_window.py:783
+#: gajim/roster_window.py:1716 gajim/roster_window.py:1718
+#: gajim/roster_window.py:2027 gajim/roster_window.py:3292
+#: gajim/roster_window.py:3325 gajim/gui_interface.py:396
+#: gajim/common/contacts.py:222 gajim/common/contacts.py:359
+#: gajim/common/contacts.py:471 gajim/common/helpers.py:86
+#: gajim/common/helpers.py:317 gajim/gtk/add_contact.py:319
+#: gajim/gtk/subscription_request.py:70 gajim/gtk/subscription_request.py:99
+#: gajim/gtk/roster_item_exchange.py:112
+#, fuzzy
+msgid "Not in contact list"
+msgstr "Mostra els contactes desconnectats"
 
-#: gajim/gui_menu_builder.py:393
-msgid "I would like to add you to my roster"
-msgstr ""
+#: gajim/gui_menu_builder.py:355
+#, 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:471
+#: gajim/gui_menu_builder.py:433
 msgid "Send Single _Message…"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:486
+#: gajim/gui_menu_builder.py:448
 msgid "E_xecute Command…"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:494
+#: gajim/gui_menu_builder.py:456
 msgid "_Manage Transport"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:500
+#: gajim/gui_menu_builder.py:462
 msgid "_Modify Transport"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:507 gajim/roster_window.py:5046
+#: gajim/gui_menu_builder.py:469 gajim/roster_window.py:4985
 msgid "_Rename…"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:518 gajim/roster_window.py:5062
-#: gajim/roster_window.py:5177 gajim/data/gui/blocked_contacts_window.ui:52
+#: gajim/gui_menu_builder.py:480 gajim/roster_window.py:5001
+#: gajim/roster_window.py:5116 gajim/data/gui/blocked_contacts_window.ui:52
 #: gajim/data/gui/gc_occupants_menu.ui:148
 #: gajim/data/gui/contact_context_menu.ui:143
 msgid "_Unblock"
 msgstr "_Desbloquejar"
 
-#: gajim/gui_menu_builder.py:521 gajim/roster_window.py:5067
-#: gajim/roster_window.py:5181 gajim/data/gui/gc_occupants_menu.ui:140
+#: gajim/gui_menu_builder.py:483 gajim/roster_window.py:5006
+#: gajim/roster_window.py:5120 gajim/data/gui/gc_occupants_menu.ui:140
 #: gajim/data/gui/contact_context_menu.ui:151
 msgid "_Block"
 msgstr "_Bloca"
 
-#: gajim/gui_menu_builder.py:529 gajim/roster_window.py:5074
+#: gajim/gui_menu_builder.py:491 gajim/roster_window.py:5013
 #: gajim/data/gui/contact_context_menu.ui:181
 msgid "Remo_ve"
 msgstr "Esborra"
 
-#: gajim/gui_menu_builder.py:539 gajim/data/gui/contact_context_menu.ui:198
+#: gajim/gui_menu_builder.py:501 gajim/data/gui/contact_context_menu.ui:198
 msgid "_Information"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:552
+#: gajim/gui_menu_builder.py:514
 msgid "Save _As"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:564 gajim/groupchat_control.py:501
-#: gajim/chat_control.py:340
+#: gajim/gui_menu_builder.py:526 gajim/groupchat_control.py:507
+#: gajim/chat_control.py:342
 #, fuzzy
 msgid "Send File…"
 msgstr "Envia _Fitxer"
 
-#: gajim/gui_menu_builder.py:565
+#: gajim/gui_menu_builder.py:527
 msgid "Upload File…"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:566
+#: gajim/gui_menu_builder.py:528
 msgid "Send File Directly…"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:568 gajim/gui_menu_builder.py:632
+#: gajim/gui_menu_builder.py:530 gajim/gui_menu_builder.py:596
 #, fuzzy
 msgid "Send Chatstate"
 msgstr "Inactiva"
 
-#: gajim/gui_menu_builder.py:569
+#: gajim/gui_menu_builder.py:531
 #, fuzzy
 msgid "Invite Contacts"
 msgstr "Convida _Contactes"
 
-#: gajim/gui_menu_builder.py:570
+#: gajim/gui_menu_builder.py:532
 #, fuzzy
-msgid "Add to Roster"
-msgstr "_Afegeix a llista de contactes"
+msgid "Add to Contact List"
+msgstr "_Afegeix Contacte..."
 
-#: gajim/gui_menu_builder.py:571
-msgid "Audio Session"
-msgstr ""
+#: gajim/gui_menu_builder.py:533
+#, fuzzy
+msgid "Voice Chat"
+msgstr "_Veu"
 
-#: gajim/gui_menu_builder.py:572
-msgid "Video Session"
-msgstr ""
+#: gajim/gui_menu_builder.py:534
+#, fuzzy
+msgid "Video Chat"
+msgstr "Disponible per parlar"
 
-#: gajim/gui_menu_builder.py:573
+#: gajim/gui_menu_builder.py:535 gajim/gui_menu_builder.py:582
 #, fuzzy
 msgid "Information"
 msgstr "Informació personal"
 
-#: gajim/gui_menu_builder.py:574 gajim/gui_menu_builder.py:639
+#: gajim/gui_menu_builder.py:536 gajim/gui_menu_builder.py:602
 #: gajim/data/gui/application_menu.ui:37
 msgid "History"
 msgstr "Historial"
 
-#: gajim/gui_menu_builder.py:580 gajim/gui_menu_builder.py:687
+#: gajim/gui_menu_builder.py:542 gajim/gui_menu_builder.py:650
 #: gajim/data/gui/preferences_window.ui:1823
 msgid "Disabled"
 msgstr "Inhabilitat"
 
-#: gajim/gui_menu_builder.py:581 gajim/gui_menu_builder.py:688
+#: gajim/gui_menu_builder.py:543 gajim/gui_menu_builder.py:651
 msgid "Composing only"
 msgstr "Component només"
 
-#: gajim/gui_menu_builder.py:582 gajim/gui_menu_builder.py:689
+#: gajim/gui_menu_builder.py:544 gajim/gui_menu_builder.py:652
 msgid "All chat states"
 msgstr "Tots els estats del xat"
 
-#: gajim/gui_menu_builder.py:620
+#: gajim/gui_menu_builder.py:583
 #, fuzzy
-msgid "Manage Room"
-msgstr "Gestiona Sala"
+msgid "Manage Group Chat"
+msgstr "Grups de xat"
 
-#: gajim/gui_menu_builder.py:621
+#: gajim/gui_menu_builder.py:584 gajim/data/gui/groupchat_control.ui:649
 #, fuzzy
 msgid "Change Subject"
 msgstr "Canvia Tema..."
 
-#: gajim/gui_menu_builder.py:622
+#: gajim/gui_menu_builder.py:585
 #, fuzzy
-msgid "Configure Room"
-msgstr "Configura Sala..."
+msgid "Configure Group Chat"
+msgstr "Grups de xat"
 
-#: gajim/gui_menu_builder.py:623
+#: gajim/gui_menu_builder.py:586
 msgid "Upload Avatar…"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:624
+#: gajim/gui_menu_builder.py:587
 #, fuzzy
-msgid "Destroy Room"
-msgstr "_Destrueix Sala"
+msgid "Destroy Group Chat"
+msgstr "Grups de xat"
 
-#: gajim/gui_menu_builder.py:626 gajim/data/gui/preferences_window.ui:790
+#: gajim/gui_menu_builder.py:589 gajim/data/gui/preferences_window.ui:790
 #, fuzzy
 msgid "Chat Settings"
 msgstr "Connectors"
 
-#: gajim/gui_menu_builder.py:627
+#: gajim/gui_menu_builder.py:590
 msgid "Show join/leave"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:628
+#: gajim/gui_menu_builder.py:591
 #, fuzzy
 msgid "Show status changes"
 msgstr "Mostra els canvis d'estat"
 
-#: gajim/gui_menu_builder.py:629 gajim/data/gui/gc_control_popup_menu.ui:72
+#: gajim/gui_menu_builder.py:592 gajim/data/gui/gc_control_popup_menu.ui:72
 msgid "Notify on all messages"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:630
+#: gajim/gui_menu_builder.py:593
 #, fuzzy
 msgid "Minimize on close"
 msgstr "_Minimitza en tancar"
 
-#: gajim/gui_menu_builder.py:631
+#: gajim/gui_menu_builder.py:595
 #, fuzzy
-msgid "Minimize on autojoin"
+msgid "Minimize when joining automatically"
 msgstr "Minimitza quan es connecta automàticament"
 
-#: gajim/gui_menu_builder.py:634
+#: gajim/gui_menu_builder.py:598
 msgid "Sync Threshold"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:635
+#: gajim/gui_menu_builder.py:599
 #, fuzzy
-msgid "Change Nick"
+msgid "Change Nickname"
 msgstr "Canvia _Nick..."
 
-#: gajim/gui_menu_builder.py:636
-#, fuzzy
-msgid "Bookmark Room"
-msgstr "Afegeix aquesta sala a les adreces d'interès"
-
-#: gajim/gui_menu_builder.py:637
+#: gajim/gui_menu_builder.py:600
 #, fuzzy
 msgid "Request Voice"
 msgstr "Sol.licita Veu"
 
-#: gajim/gui_menu_builder.py:638 gajim/roster_window.py:5246
+#: gajim/gui_menu_builder.py:601 gajim/roster_window.py:5185
 #, fuzzy
 msgid "Execute command"
 msgstr "_Executa Comanda...."
 
-#: gajim/gui_menu_builder.py:640
-#, fuzzy
-msgid "Disconnect"
-msgstr "_Desconnecta"
+#: gajim/gui_menu_builder.py:603
+msgid "Leave"
+msgstr ""
 
-#: gajim/gui_menu_builder.py:678 gajim/gtk/preferences.py:156
+#: gajim/gui_menu_builder.py:641 gajim/gtk/preferences.py:155
 msgid "No threshold"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:680 gajim/gtk/preferences.py:158
+#: gajim/gui_menu_builder.py:643 gajim/gtk/preferences.py:157
 #, python-format
 msgid "%i day"
 msgid_plural "%i days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: gajim/gui_menu_builder.py:709 gajim/gui_menu_builder.py:747
-#: gajim/gtk/join_groupchat.py:43
-msgid "Join Group Chat"
-msgstr "Uneix-te al xat en grup"
-
-#: gajim/gui_menu_builder.py:746
+#: gajim/gui_menu_builder.py:672
 #, fuzzy
 msgid "Add Contact…"
 msgstr "_Afegeix Contacte..."
 
-#: gajim/gui_menu_builder.py:748 gajim/gtk/profile.py:52
-#: gajim/gtk/accounts.py:770 gajim/gtk/accounts.py:808
+#: gajim/gui_menu_builder.py:673 gajim/gtk/profile.py:52
+#: gajim/gtk/accounts.py:773 gajim/gtk/accounts.py:811
 msgid "Profile"
 msgstr "Perfil"
 
-#: gajim/gui_menu_builder.py:749
+#: gajim/gui_menu_builder.py:674
+#, fuzzy
+msgid "Send Single Message…"
+msgstr "Envia un _Missatge únic..."
+
+#: gajim/gui_menu_builder.py:675
 msgid "Discover Services"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:750
+#: gajim/gui_menu_builder.py:676 gajim/gtk/server_info.py:36
 #, fuzzy
-msgid "Send Single Message…"
-msgstr "Envia un _Missatge únic..."
+msgid "Server Info"
+msgstr "Servidor:"
 
-#: gajim/gui_menu_builder.py:751 gajim/data/gui/preferences_window.ui:2741
+#: gajim/gui_menu_builder.py:677 gajim/data/gui/preferences_window.ui:2741
 msgid "Advanced"
 msgstr "Avançat"
 
-#: gajim/gui_menu_builder.py:752 gajim/gtk/mam_preferences.py:88
+#: gajim/gui_menu_builder.py:678 gajim/gtk/mam_preferences.py:88
 msgid "Archiving Preferences"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:753
+#: gajim/gui_menu_builder.py:679
 msgid "Blocking List"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:754 gajim/gtk/history_sync.py:108
+#: gajim/gui_menu_builder.py:680
+msgid "Bookmarks"
+msgstr "Adreces d'interès"
+
+#: gajim/gui_menu_builder.py:681
+#, fuzzy
+msgid "PEP Configuration"
+msgstr "Configuració de Sala"
+
+#: gajim/gui_menu_builder.py:682 gajim/gtk/history_sync.py:108
 #: gajim/gtk/history_sync.py:186
 #, fuzzy
 msgid "Synchronise History"
 msgstr "Sincronitza els contactes"
 
-#: gajim/gui_menu_builder.py:755 gajim/gtk/privacy_list.py:427
+#: gajim/gui_menu_builder.py:683 gajim/gtk/privacy_list.py:427
 msgid "Privacy Lists"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:756 gajim/gtk/server_info.py:36
-#, fuzzy
-msgid "Server Info"
-msgstr "Servidor:"
-
-#: gajim/gui_menu_builder.py:757 gajim/gui_menu_builder.py:768
+#: gajim/gui_menu_builder.py:685 gajim/gui_menu_builder.py:696
 #: gajim/data/gui/xml_console_window.ui:77
 msgid "XML Console"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:759 gajim/data/gui/groupchat_config.ui:36
+#: gajim/gui_menu_builder.py:687 gajim/data/gui/groupchat_config.ui:36
 #, fuzzy
 msgid "Admin"
 msgstr "_Administra"
 
-#: gajim/gui_menu_builder.py:760
+#: gajim/gui_menu_builder.py:688
 #, fuzzy
 msgid "Send Server Message…"
 msgstr "Envia Missatge Privat"
 
-#: gajim/gui_menu_builder.py:761
+#: gajim/gui_menu_builder.py:689
 msgid "Set MOTD…"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:762
+#: gajim/gui_menu_builder.py:690
 msgid "Update MOTD…"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:763
+#: gajim/gui_menu_builder.py:691
 #, fuzzy
 msgid "Delete MOTD…"
 msgstr "Suprimeix"
 
-#: gajim/gui_menu_builder.py:812
-msgid "No Accounts available"
-msgstr ""
+#: gajim/gui_menu_builder.py:736
+#, fuzzy
+msgid "_Add Account…"
+msgstr "_Afegeix Contacte..."
+
+#: gajim/gui_menu_builder.py:742
+#, fuzzy
+msgid "_Modify Accounts…"
+msgstr "_Modifica Compte..."
+
+#: gajim/gui_menu_builder.py:751 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:823 gajim/data/gui/application_menu.ui:5
-#: gajim/data/gui/application_menu.ui:71 gajim/data/gui/shortcuts_window.ui:182
-#: gajim/gtk/accounts.py:58
+#: gajim/gui_menu_builder.py:755 gajim/data/gui/application_menu.ui:5
+#: gajim/data/gui/shortcuts_window.ui:182 gajim/gtk/accounts.py:57
 msgid "Accounts"
 msgstr "Comptes"
 
-#: gajim/gui_menu_builder.py:881 gajim/gui_menu_builder.py:886
-msgid "Copy JID"
-msgstr ""
+#: gajim/gui_menu_builder.py:784 gajim/gui_menu_builder.py:789
+#, fuzzy
+msgid "Copy XMPP Address"
+msgstr "_Copia adreça JID/Email"
 
-#: gajim/gui_menu_builder.py:882 gajim/gui_menu_builder.py:914
+#: gajim/gui_menu_builder.py:785 gajim/gui_menu_builder.py:817
 #, fuzzy
 msgid "Join Groupchat"
 msgstr "Uneix-te al xat en grup"
 
-#: gajim/gui_menu_builder.py:887 gajim/gui_menu_builder.py:913
-#: gajim/data/gui/application_menu.ui:76
+#: gajim/gui_menu_builder.py:790 gajim/gui_menu_builder.py:816
+#: gajim/data/gui/application_menu.ui:71
 #: gajim/data/gui/subscription_request_window.ui:106
 msgid "Start Chat"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:888 gajim/gui_menu_builder.py:915
+#: gajim/gui_menu_builder.py:791 gajim/gui_menu_builder.py:818
 #, fuzzy
-msgid "Add to Roster…"
-msgstr "_Afegeix a llista de contactes"
+msgid "Add to Contact List…"
+msgstr "_Afegeix Contacte..."
 
-#: gajim/gui_menu_builder.py:893
+#: gajim/gui_menu_builder.py:796
 #, fuzzy
 msgid "Copy Link Location"
 msgstr "_Copia la ubicació de l'enllaç"
 
-#: gajim/gui_menu_builder.py:894
+#: gajim/gui_menu_builder.py:797
 #, fuzzy
 msgid "Open Link in Browser"
 msgstr "_Obri l'enllaç al navegador"
 
-#: gajim/gui_menu_builder.py:899
+#: gajim/gui_menu_builder.py:802
 #, fuzzy
 msgid "Copy Email Address"
 msgstr "_Copia adreça JID/Email"
 
-#: gajim/gui_menu_builder.py:900 gajim/gui_menu_builder.py:912
+#: gajim/gui_menu_builder.py:803 gajim/gui_menu_builder.py:815
 #, fuzzy
 msgid "Open Email Composer"
 msgstr "_Obre Editor de Correu"
 
-#: gajim/gui_menu_builder.py:905
+#: gajim/gui_menu_builder.py:808
 #, fuzzy
 msgid "Copy Location"
 msgstr "_Copia la ubicació de l'enllaç"
 
-#: gajim/gui_menu_builder.py:906
+#: gajim/gui_menu_builder.py:809
 #, fuzzy
 msgid "Show Location"
 msgstr "_Copia la ubicació de l'enllaç"
 
-#: gajim/gui_menu_builder.py:911
+#: gajim/gui_menu_builder.py:814
 #, fuzzy
-msgid "Copy JID/Email"
+msgid "Copy XMPP Address/Email"
 msgstr "_Copia adreça JID/Email"
 
-#: gajim/gui_menu_builder.py:945
+#: gajim/gui_menu_builder.py:852
 msgid "Copy"
 msgstr ""
 
@@ -537,44 +548,55 @@ msgstr ""
 msgid "Choose folder for logfile"
 msgstr ""
 
-#: gajim/history_manager.py:107
+#: gajim/history_manager.py:106
 msgid "Cannot find history logs database"
 msgstr ""
 
-#: gajim/history_manager.py:108
+#: gajim/history_manager.py:107
 #, python-format
 msgid "%s does not exist."
 msgstr ""
 
-#: gajim/history_manager.py:141 gajim/history_manager.py:195
-#: gajim/gtk/discovery.py:829 gajim/gtk/roster_item_exchange.py:80
-msgid "JID"
-msgstr ""
+#: gajim/history_manager.py:140 gajim/history_manager.py:194
+#: 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:30
+#: gajim/gtk/accounts.py:804
+#, fuzzy
+msgid "XMPP Address"
+msgstr "_Copia adreça JID/Email"
 
-#: gajim/history_manager.py:154 gajim/history_manager.py:202
+#: gajim/history_manager.py:153 gajim/history_manager.py:201
 #: gajim/data/gui/history_window.ui:89 gajim/gtk/history.py:108
 msgid "Date"
 msgstr ""
 
-#: gajim/history_manager.py:161 gajim/history_manager.py:225
+#: gajim/history_manager.py:160 gajim/history_manager.py:224
 #: gajim/data/gui/join_groupchat_window.ui:208
 #: gajim/data/gui/profile_window.ui:214
 #: gajim/data/gui/vcard_information_window.ui:443
+#: gajim/data/gui/bookmarks.ui:140
 msgid "Nickname"
 msgstr ""
 
-#: gajim/history_manager.py:172 gajim/history_manager.py:211
+#: gajim/history_manager.py:171 gajim/history_manager.py:210
 #: gajim/data/gui/preferences_window.ui:1344
 #: gajim/data/gui/single_message_window.ui:275 gajim/gtk/history.py:117
 msgid "Message"
 msgstr ""
 
-#: gajim/history_manager.py:180 gajim/history_manager.py:218
+#: gajim/history_manager.py:179 gajim/history_manager.py:217
 #: gajim/data/gui/groups_post_window.ui:49
 #: gajim/data/gui/single_message_window.ui:214
 msgid "Subject"
 msgstr ""
 
+#: gajim/history_manager.py:247
+msgid "Database Cleanup"
+msgstr ""
+
 #: gajim/history_manager.py:248
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
@@ -583,55 +605,53 @@ msgstr ""
 
 #: gajim/history_manager.py:250
 msgid ""
-"Normally allocated database size will not be freed, it will just become "
-"reusable. If you really want to reduce database filesize, click YES, else "
-"click NO.\n"
-"\n"
-"In case you click YES, please wait…"
+"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
-msgid "Database Cleanup"
-msgstr ""
+#, fuzzy
+msgid "_Cleanup"
+msgstr "Neteja"
 
-#: gajim/history_manager.py:519 gajim/gtk/filetransfer.py:238
-#: gajim/gtk/filetransfer.py:248
+#: gajim/history_manager.py:518 gajim/gtk/filetransfer.py:237
+#: gajim/gtk/filetransfer.py:247
 msgid "You"
 msgstr ""
 
-#: gajim/history_manager.py:531
+#: gajim/history_manager.py:530
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr ""
 
-#: gajim/history_manager.py:568 gajim/history_manager.py:607
-#: gajim/gtk/dialogs.py:58 gajim/gtk/themes.py:319
+#: gajim/history_manager.py:567 gajim/history_manager.py:606
+#: gajim/gtk/dialogs.py:57 gajim/gtk/themes.py:319
 #: gajim/gtk/roster_item_exchange.py:75 gajim/gtk/roster_item_exchange.py:185
 msgid "Delete"
 msgstr "Suprimeix"
 
-#: gajim/history_manager.py:569
+#: gajim/history_manager.py:568
 #, fuzzy
 msgid "Delete Conversation"
 msgid_plural "Delete Conversations"
 msgstr[0] "Històric de converses"
 msgstr[1] "Històric de converses"
 
-#: gajim/history_manager.py:570
+#: gajim/history_manager.py:569
 #, 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:608
+#: gajim/history_manager.py:607
 #, fuzzy
 msgid "Delete Message"
 msgid_plural "Delete Messages"
 msgstr[0] "Missatges preconfigurats:"
 msgstr[1] "Missatges preconfigurats:"
 
-#: gajim/history_manager.py:609
+#: gajim/history_manager.py:608
 msgid "Do you want to permanently delete this message"
 msgid_plural "Do you want to permanently delete these messages"
 msgstr[0] ""
@@ -644,14 +664,14 @@ msgstr ""
 
 #: gajim/dialogs.py:84
 #, python-format
-msgid "JID: <i>%s</i>"
+msgid "XMPP Address: <i>%s</i>"
 msgstr ""
 
-#: gajim/dialogs.py:115 gajim/dialogs.py:128 gajim/roster_window.py:2901
-#: gajim/roster_window.py:3833 gajim/roster_window.py:5084
-#: gajim/common/contacts.py:157 gajim/common/contacts.py:190
+#: gajim/dialogs.py:115 gajim/dialogs.py:128 gajim/roster_window.py:2894
+#: gajim/roster_window.py:3784 gajim/roster_window.py:5023
+#: gajim/common/contacts.py:157 gajim/common/contacts.py:206
 #: gajim/data/gui/preferences_window.ui:558
-#: gajim/data/gui/shortcuts_window.ui:177 gajim/gtk/accounts.py:349
+#: gajim/data/gui/shortcuts_window.ui:177 gajim/gtk/accounts.py:352
 msgid "General"
 msgstr "General"
 
@@ -695,7 +715,7 @@ msgstr ""
 msgid "Preset name is already in use. Do you want to overwrite this preset?"
 msgstr ""
 
-#: gajim/dialogs.py:703
+#: gajim/dialogs.py:703 gajim/plugins/gui.py:292
 msgid "_Overwrite"
 msgstr ""
 
@@ -707,9 +727,7 @@ msgstr ""
 msgid "Please type a name for this status message"
 msgstr ""
 
-#: gajim/dialogs.py:740 gajim/gui_interface.py:1441 gajim/dialog_messages.py:31
-#: gajim/gtk/discovery.py:518 gajim/gtk/profile.py:323
-#: gajim/gtk/join_groupchat.py:234
+#: gajim/dialogs.py:740 gajim/gtk/discovery.py:517 gajim/gtk/profile.py:323
 msgid "You are not connected to the server"
 msgstr ""
 
@@ -717,9 +735,11 @@ msgstr ""
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr ""
 
-#: gajim/dialogs.py:752 gajim/dialogs.py:823 gajim/gtk/discovery.py:822
-#: gajim/gtk/discovery.py:1648 gajim/gtk/discovery.py:1941
-#: gajim/gtk/history.py:99 gajim/gtk/roster_item_exchange.py:83
+#: gajim/dialogs.py:752 gajim/dialogs.py:823
+#: gajim/data/gui/groupchat_info_scrolled.ui:16 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/gtk/roster_item_exchange.py:83
 msgid "Name"
 msgstr ""
 
@@ -739,679 +759,637 @@ msgstr ""
 msgid "Synchronise"
 msgstr ""
 
-#: gajim/dialogs.py:1043
+#: gajim/dialogs.py:1042
 msgid "an audio and video"
 msgstr ""
 
-#: gajim/dialogs.py:1045
+#: gajim/dialogs.py:1044
 msgid "an audio"
 msgstr ""
 
-#: gajim/dialogs.py:1047
+#: gajim/dialogs.py:1046
 msgid "a video"
 msgstr ""
 
-#: gajim/dialogs.py:1051
+#: gajim/dialogs.py:1050
 #, python-format
 msgid ""
-"%(contact)s wants to start %(type)s session with you. Do you want to answer "
+"%(contact)s wants to start a %(type)s chat with you. Do you want to answer "
 "the call?"
 msgstr ""
 
-#: gajim/groupchat_control.py:505
+#: gajim/groupchat_control.py:511
 #, fuzzy, python-format
 msgid "Send File (max. %s MiB)…"
 msgstr "Envia _Fitxer"
 
-#: gajim/groupchat_control.py:507 gajim/chat_control.py:342
+#: gajim/groupchat_control.py:513 gajim/chat_control.py:344
 #, fuzzy
 msgid "No File Transfer available"
 msgstr "Transferència de Fitxers"
 
-#: gajim/groupchat_control.py:630 gajim/groupchat_control.py:2349
-msgid "Changing Subject"
-msgstr ""
-
-#: gajim/groupchat_control.py:631 gajim/groupchat_control.py:2350
-msgid "Please specify the new subject:"
-msgstr ""
-
-#: gajim/groupchat_control.py:638
-msgid "Changing Nickname"
-msgstr ""
-
-#: gajim/groupchat_control.py:639
-msgid "Please specify the new nickname you want to use:"
-msgstr ""
-
-#: gajim/groupchat_control.py:657
-msgid "Invalid group chat JID"
-msgstr ""
+#: gajim/groupchat_control.py:655
+#, fuzzy
+msgid "Invalid group chat XMPP Address"
+msgstr "Gestiona Sala"
 
-#: gajim/groupchat_control.py:658
-msgid "The group chat JID has not allowed characters."
+#: gajim/groupchat_control.py:656
+msgid "The group chat XMPP Address has not allowed characters."
 msgstr ""
 
-#: gajim/groupchat_control.py:758 gajim/gtk/profile.py:136
+#: gajim/groupchat_control.py:743 gajim/gtk/profile.py:136
 msgid "Could not load image"
 msgstr ""
 
-#: gajim/groupchat_control.py:888
+#: gajim/groupchat_control.py:873
 msgid "Insert Nickname"
 msgstr ""
 
-#: gajim/groupchat_control.py:1056 gajim/chat_control.py:824
+#: gajim/groupchat_control.py:1041 gajim/chat_control.py:848
 msgid "and authenticated"
 msgstr ""
 
-#: gajim/groupchat_control.py:1060 gajim/chat_control.py:828
+#: gajim/groupchat_control.py:1045 gajim/chat_control.py:852
 msgid "and NOT authenticated"
 msgstr ""
 
-#: gajim/groupchat_control.py:1064
+#: gajim/groupchat_control.py:1049
 #, python-format
 msgid "%(type)s encryption is active %(authenticated)s."
 msgstr ""
 
-#: gajim/groupchat_control.py:1111
+#: gajim/groupchat_control.py:1096
 msgid "Conversation with "
 msgstr ""
 
-#: gajim/groupchat_control.py:1113
+#: gajim/groupchat_control.py:1098
 msgid "Continued conversation"
 msgstr ""
 
-#: gajim/groupchat_control.py:1411
+#: gajim/groupchat_control.py:1357
 #, python-format
 msgid "%(nick)s has set the subject to %(subject)s"
 msgstr ""
 
-#: gajim/groupchat_control.py:1433
-msgid "Room now shows unavailable members"
+#: gajim/groupchat_control.py:1374
+msgid "Group chat now shows unavailable members"
 msgstr ""
 
-#: gajim/groupchat_control.py:1436
-msgid "Room now does not show unavailable members"
-msgstr ""
+#: gajim/groupchat_control.py:1377
+#, fuzzy
+msgid "Group chat now does not show unavailable members"
+msgstr "Grups de xat"
 
-#: gajim/groupchat_control.py:1439
+#: gajim/groupchat_control.py:1380
 msgid "A setting not related to privacy has been changed"
 msgstr ""
 
-#: gajim/groupchat_control.py:1446
-msgid "Room logging is now enabled"
-msgstr ""
+#: gajim/groupchat_control.py:1387 gajim/groupchat_control.py:1659
+#, fuzzy
+msgid "Conversations are stored on the server"
+msgstr "Informació sobre tu, tal i com està guardada al servidor"
 
-#: gajim/groupchat_control.py:1449
-msgid "Room logging is now disabled"
-msgstr ""
+#: gajim/groupchat_control.py:1390
+#, fuzzy
+msgid "Conversations are not stored on the server"
+msgstr "Informació sobre tu, tal i com està guardada al servidor"
 
-#: gajim/groupchat_control.py:1452
-msgid "Room is now non-anonymous"
-msgstr ""
+#: gajim/groupchat_control.py:1393
+#, fuzzy
+msgid "Group chat is now non-anonymous"
+msgstr "Grups de xat"
 
-#: gajim/groupchat_control.py:1456
-msgid "Room is now semi-anonymous"
-msgstr ""
+#: gajim/groupchat_control.py:1397
+#, fuzzy
+msgid "Group chat is now semi-anonymous"
+msgstr "Grups de xat"
 
-#: gajim/groupchat_control.py:1460
-msgid "Room is now fully anonymous"
-msgstr ""
+#: gajim/groupchat_control.py:1401
+#, fuzzy
+msgid "Group chat is now fully anonymous"
+msgstr "Grups de xat"
 
-#: gajim/groupchat_control.py:1500
+#: gajim/groupchat_control.py:1439
 #, python-format
 msgid "Ping? (%s)"
 msgstr ""
 
-#: gajim/groupchat_control.py:1503
+#: gajim/groupchat_control.py:1442
 #, python-format
 msgid "Pong! (%(nick)s %(delay)s s.)"
 msgstr ""
 
-#: gajim/groupchat_control.py:1506 gajim/chat_control.py:1213
+#: gajim/groupchat_control.py:1445 gajim/chat_control.py:1237
 msgid "Error."
 msgstr ""
 
-#: gajim/groupchat_control.py:1711
+#: gajim/groupchat_control.py:1650
 #, python-format
-msgid "You (%s) joined the room"
+msgid "You (%s) joined the group chat"
 msgstr ""
 
-#: gajim/groupchat_control.py:1717
-msgid "Any occupant is allowed to see your full JID"
+#: gajim/groupchat_control.py:1655
+#, fuzzy
+msgid "Any participant is allowed to see your full XMPP Address"
 msgstr "Qualsevol membre pot veure el teu JID"
 
-#: gajim/groupchat_control.py:1721
-msgid "Room logging is enabled"
+#: gajim/groupchat_control.py:1663
+msgid "The server has assigned or modified your nickname in this group chat"
 msgstr ""
 
-#: gajim/groupchat_control.py:1725
-msgid "The server has assigned or modified your roomnick"
+#: gajim/groupchat_control.py:1671
+msgid "A new group chat has been created"
 msgstr ""
 
-#: gajim/groupchat_control.py:1732
-msgid "A new room has been created"
-msgstr ""
-
-#: gajim/groupchat_control.py:1740 gajim/privatechat_control.py:112
+#: gajim/groupchat_control.py:1679 gajim/privatechat_control.py:115
 #, python-format
 msgid "You are now known as %s"
 msgstr ""
 
-#: gajim/groupchat_control.py:1742 gajim/privatechat_control.py:114
+#: gajim/groupchat_control.py:1681 gajim/privatechat_control.py:117
 #, python-brace-format
 msgid "{nick} is now known as {new_nick}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1767 gajim/privatechat_control.py:141
+#: gajim/groupchat_control.py:1706 gajim/privatechat_control.py:144
 #, python-brace-format
 msgid "You are now {show}{status}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1773 gajim/privatechat_control.py:147
+#: gajim/groupchat_control.py:1712 gajim/privatechat_control.py:150
 #, python-brace-format
 msgid "{nick} is now {show}{status}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1790 gajim/groupchat_control.py:1819
-#: gajim/groupchat_control.py:1849 gajim/groupchat_control.py:1909
+#: gajim/groupchat_control.py:1729 gajim/groupchat_control.py:1758
+#: gajim/groupchat_control.py:1788 gajim/groupchat_control.py:1848
 #, python-brace-format
 msgid " by {actor}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1793
+#: gajim/groupchat_control.py:1732
 #, python-brace-format
 msgid "** Your Affiliation has been set to {affiliation}{actor}{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1799
+#: gajim/groupchat_control.py:1738
 #, python-brace-format
 msgid "** Affiliation of {nick} has been set to {affiliation}{actor}{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1822
+#: gajim/groupchat_control.py:1761
 #, python-brace-format
 msgid "** Your Role has been set to {role}{actor}{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1827
+#: gajim/groupchat_control.py:1766
 #, python-brace-format
 msgid "** Role of {nick} has been set to {role}{actor}{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1852
+#: gajim/groupchat_control.py:1791
 #, python-brace-format
-msgid "You have been removed from the room{actor}{reason}"
+msgid "You have been removed from the group chat{actor}{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1857
+#: gajim/groupchat_control.py:1796
 #, python-brace-format
 msgid "You have left due to an error{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1863
+#: gajim/groupchat_control.py:1802
 #, python-brace-format
 msgid "You have been kicked{actor}{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1870
+#: gajim/groupchat_control.py:1809
 #, python-brace-format
 msgid "You have been banned{actor}{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1877 gajim/groupchat_control.py:1943
+#: gajim/groupchat_control.py:1816 gajim/groupchat_control.py:1882
 #, fuzzy
 msgid ": Affiliation changed"
 msgstr "_Accions"
 
-#: gajim/groupchat_control.py:1883 gajim/groupchat_control.py:1948
-msgid ": Room configuration changed to members-only"
+#: gajim/groupchat_control.py:1822 gajim/groupchat_control.py:1887
+msgid ": Group chat configuration changed to members-only"
 msgstr ""
 
-#: gajim/groupchat_control.py:1912
+#: gajim/groupchat_control.py:1851
 #, python-brace-format
-msgid "{nick} has been removed from the room{by}{reason}"
+msgid "{nick} has been removed from the group chat{by}{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1922
+#: gajim/groupchat_control.py:1861
 #, python-brace-format
 msgid "{nick} has left due to an error{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1928
+#: gajim/groupchat_control.py:1867
 #, python-brace-format
 msgid "{nick} has been kicked{actor}{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1936
+#: gajim/groupchat_control.py:1875
 #, python-brace-format
 msgid "{nick} has been banned{actor}{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1953
+#: gajim/groupchat_control.py:1892
 #, python-brace-format
 msgid "{nick} has left{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1970
+#: gajim/groupchat_control.py:1914
 #, python-format
 msgid "%s has joined the group chat"
 msgstr ""
 
-#: gajim/groupchat_control.py:1985 gajim/groupchat_control.py:1990
-#: gajim/groupchat_control.py:1995 gajim/groupchat_control.py:2000
-#: gajim/groupchat_control.py:2011
-msgid "Unable to join group chat"
-msgstr ""
+#: gajim/groupchat_control.py:1981
+#, fuzzy
+msgid "Group chat has been destroyed"
+msgstr "Grups de xat"
 
 #: gajim/groupchat_control.py:1986
 #, python-format
-msgid "You are banned from group chat <b>%s</b>."
-msgstr ""
-
-#: gajim/groupchat_control.py:1991
-#, python-format
-msgid "Remote server <b>%s</b> does not exist."
-msgstr ""
-
-#: gajim/groupchat_control.py:1996
-#, python-format
-msgid "Group chat <b>%s</b> does not exist."
-msgstr ""
-
-#: gajim/groupchat_control.py:2001
-msgid "Group chat creation is not permitted."
-msgstr ""
-
-#: gajim/groupchat_control.py:2005
-msgid "Unable to join groupchat"
-msgstr ""
-
-#: gajim/groupchat_control.py:2006
-#, python-format
-msgid "You must use your registered nickname in <b>%s</b>."
-msgstr ""
-
-#: gajim/groupchat_control.py:2012
-#, python-format
-msgid "You are not in the members list in groupchat %s."
-msgstr ""
-
-#: gajim/groupchat_control.py:2068
-msgid "Room has been destroyed"
-msgstr ""
-
-#: gajim/groupchat_control.py:2073
-#, python-format
-msgid "You can join this room instead: xmpp:%s?join"
+msgid "You can join this group chat instead: xmpp:%s?join"
 msgstr ""
 
-#: gajim/groupchat_control.py:2306
+#: gajim/groupchat_control.py:2214
 #, fuzzy
 msgid "Leave Group Chat"
 msgstr "Grups de xat"
 
-#: gajim/groupchat_control.py:2307
+#: gajim/groupchat_control.py:2215
 msgid "Are you sure you want to leave this group chat?"
 msgstr ""
 
-#: gajim/groupchat_control.py:2308
+#: gajim/groupchat_control.py:2216
 #, python-format
-msgid "If you close this window, you will be disconnected from '%s'."
+msgid "If you close this window, you will leave '%s'."
 msgstr ""
 
-#: gajim/groupchat_control.py:2314
+#: gajim/groupchat_control.py:2222 gajim/roster_window.py:5177
 msgid "_Leave"
 msgstr ""
 
-#: gajim/groupchat_control.py:2377
+#: gajim/groupchat_control.py:2280 gajim/roster_window.py:3008
 #, python-format
 msgid "%(jid)s has been invited to this group chat"
 msgstr ""
 
-#: gajim/groupchat_control.py:2527
+#: gajim/groupchat_control.py:2463
 #, python-format
 msgid "Kicking %s"
 msgstr ""
 
-#: gajim/groupchat_control.py:2528 gajim/groupchat_control.py:2829
+#: gajim/groupchat_control.py:2464 gajim/groupchat_control.py:2765
 msgid "You may specify a reason below:"
 msgstr ""
 
-#: gajim/groupchat_control.py:2828
+#: gajim/groupchat_control.py:2764
 #, python-format
 msgid "Banning %s"
 msgstr ""
 
-#: gajim/chat_control.py:408
+#: gajim/chat_control.py:432
 msgid "Show a list of formattings"
 msgstr "Mostra una llista de formats"
 
-#: gajim/chat_control.py:412
+#: gajim/chat_control.py:436
 msgid "This contact does not support HTML"
 msgstr ""
 
-#: gajim/chat_control.py:562
+#: gajim/chat_control.py:586
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr ""
 
-#: gajim/chat_control.py:686
+#: gajim/chat_control.py:710
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr ""
 
-#: gajim/chat_control.py:832
+#: gajim/chat_control.py:856
 #, python-format
 msgid "%(type)s encryption is active %(authenticated)s"
 msgstr ""
 
-#: gajim/chat_control.py:1160 gajim/chat_control.py:1168
+#: gajim/chat_control.py:1184 gajim/chat_control.py:1192
 msgid "Close"
 msgstr ""
 
-#: gajim/chat_control.py:1161
+#: gajim/chat_control.py:1185
 #, python-format
 msgid "You just received a new message from %s"
 msgstr ""
 
-#: gajim/chat_control.py:1163
+#: gajim/chat_control.py:1187
 msgid ""
 "If you close this tab while having chat history disabled, this message will "
 "be lost."
 msgstr ""
 
-#: gajim/chat_control.py:1208
+#: gajim/chat_control.py:1232
 msgid "Ping?"
 msgstr ""
 
-#: gajim/chat_control.py:1211
+#: gajim/chat_control.py:1235
 #, python-format
 msgid "Pong! (%s seconds)"
 msgstr ""
 
-#: gajim/chat_control.py:1308
+#: gajim/chat_control.py:1332
 #, python-format
 msgid ""
 "Subject: %(subject)s\n"
 "%(message)s"
 msgstr ""
 
-#: gajim/chat_control.py:1416
+#: gajim/chat_control.py:1440
 #, python-format
 msgid "%(name)s is now %(show)s %(status)s"
 msgstr ""
 
-#: gajim/chat_control.py:1476 gajim/data/gui/application_menu.ui:32
+#: gajim/chat_control.py:1500 gajim/data/gui/application_menu.ui:32
 #: gajim/gtk/http_upload_progress.py:35
 msgid "File Transfer"
 msgstr "Transferència de Fitxers"
 
-#: gajim/chat_control.py:1480
+#: gajim/chat_control.py:1504
 msgid "Size"
 msgstr ""
 
-#: gajim/chat_control.py:1482 gajim/chat_control.py:1546
+#: gajim/chat_control.py:1506 gajim/chat_control.py:1566
+#: gajim/gui_interface.py:190
 #: gajim/data/gui/groupchat_invitation_received.ui:77
-#: gajim/gtk/filetransfer.py:485
+#: gajim/gtk/filetransfer.py:490
 msgid "_Accept"
 msgstr ""
 
-#: gajim/chat_control.py:1484 gajim/chat_control.py:1548
+#: gajim/chat_control.py:1508 gajim/chat_control.py:1568
 #: gajim/data/gui/groupchat_invitation_received.ui:62
 #, fuzzy
 msgid "_Decline"
 msgstr "Desconnectat"
 
-#: gajim/chat_control.py:1506 gajim/gui_interface.py:791
-#: gajim/gui_interface.py:821 gajim/gui_interface.py:847
+#: gajim/chat_control.py:1530 gajim/gui_interface.py:777
+#: gajim/gui_interface.py:807 gajim/gui_interface.py:833
 #: gajim/gtk/notification.py:173 gajim/gtk/notification.py:278
 msgid "File Transfer Completed"
 msgstr ""
 
-#: gajim/chat_control.py:1510 gajim/gtk/filetransfer.py:259
+#: gajim/chat_control.py:1534 gajim/gtk/filetransfer.py:258
 #, fuzzy
 msgid "Open _Folder"
 msgstr "_Obre Carpeta Contenidora"
 
-#: gajim/chat_control.py:1512 gajim/chat_control.py:1521
+#: gajim/chat_control.py:1536 gajim/chat_control.py:1545
+#: gajim/data/gui/groupchat_control.ui:962
+#: gajim/data/gui/groupchat_control.ui:1049
+#: gajim/data/gui/groupchat_control.ui:1155
 msgid "_Close"
 msgstr ""
 
-#: gajim/chat_control.py:1543 gajim/gui_interface.py:484
+#: gajim/chat_control.py:1563 gajim/gui_interface.py:473
+#: gajim/data/gui/groupchat_invitation_received.ui:42
 #: gajim/gtk/notification.py:174 gajim/gtk/notification.py:195
 #: gajim/gtk/notification.py:281
-msgid "Groupchat Invitation"
-msgstr ""
+#, fuzzy
+msgid "Group Chat Invitation"
+msgstr "Configuració de Sala"
 
-#: gajim/chat_control.py:1568 gajim/roster_window.py:1954
+#: gajim/chat_control.py:1588 gajim/roster_window.py:1951
 msgid "Remote contact stopped transfer"
 msgstr ""
 
-#: gajim/chat_control.py:1570 gajim/roster_window.py:1956
+#: gajim/chat_control.py:1590 gajim/roster_window.py:1953
 msgid "Error opening file"
 msgstr ""
 
-#: gajim/chat_control.py:1572 gajim/gtk/filetransfer.py:297
+#: gajim/chat_control.py:1592 gajim/gtk/filetransfer.py:296
 msgid "File transfer stopped"
 msgstr ""
 
-#: gajim/chat_control.py:1575 gajim/gtk/filetransfer.py:275
-#: gajim/gtk/filetransfer.py:284
+#: gajim/chat_control.py:1595 gajim/gtk/filetransfer.py:274
+#: gajim/gtk/filetransfer.py:283
 msgid "File transfer cancelled"
 msgstr ""
 
-#: gajim/chat_control.py:1576
+#: gajim/chat_control.py:1596
 msgid "Connection with peer cannot be established."
 msgstr ""
 
-#: gajim/application.py:72
+#: gajim/application.py:75
 msgid "Show the application's version"
 msgstr ""
 
-#: gajim/application.py:79
+#: gajim/application.py:82
 msgid "Show only critical errors"
 msgstr ""
 
-#: gajim/application.py:86
+#: gajim/application.py:89
 msgid "Separate profile files completely (even history database and plugins)"
 msgstr ""
 
-#: gajim/application.py:94
+#: gajim/application.py:97
 msgid "Print XML stanzas and other debug information"
 msgstr ""
 
-#: gajim/application.py:101
+#: gajim/application.py:104
 msgid "Use defined profile in configuration directory"
 msgstr ""
 
-#: gajim/application.py:109
+#: gajim/application.py:112
 msgid "Set configuration directory"
 msgstr ""
 
-#: gajim/application.py:117
+#: gajim/application.py:120
 msgid "Configure logging system"
 msgstr ""
 
-#: gajim/application.py:125
+#: gajim/application.py:128
 msgid "Show all warnings"
 msgstr ""
 
-#: gajim/application.py:132
+#: gajim/application.py:135
 msgid "Open IPython shell"
 msgstr ""
 
-#: gajim/application.py:139
+#: gajim/application.py:142
 msgid "Pops up a window with the next pending event"
 msgstr ""
 
-#: gajim/application.py:145 gajim/data/gui/shortcuts_window.ui:203
+#: gajim/application.py:148 gajim/data/gui/shortcuts_window.ui:203
 #: data/org.gajim.Gajim.desktop.in:21
 msgid "Start a new chat"
 msgstr ""
 
-#: gajim/application.py:152
+#: gajim/application.py:155
 msgid "Simulate loss of connectivity"
 msgstr ""
 
-#: gajim/application.py:159
+#: gajim/application.py:162
 msgid "Simulate regaining connectivity"
 msgstr ""
 
-#: gajim/application.py:201 gajim/gui_interface.py:133
+#: gajim/application.py:204 gajim/gui_interface.py:133
 msgid "Database Error"
 msgstr ""
 
-#: gajim/roster_window.py:294 gajim/roster_window.py:1030
+#: gajim/roster_window.py:291 gajim/roster_window.py:1027
 msgid "Merged accounts"
 msgstr ""
 
-#: gajim/roster_window.py:853 gajim/roster_window.py:1631
-#: gajim/roster_window.py:1664 gajim/roster_window.py:1715
-#: gajim/roster_window.py:1717 gajim/roster_window.py:1872
-#: gajim/roster_window.py:2531 gajim/roster_window.py:5025
-#: gajim/common/contacts.py:188 gajim/common/contacts.py:447
-#: gajim/common/helpers.py:83 gajim/gtk/discovery.py:129
-#: gajim/gtk/discovery.py:130 gajim/gtk/discovery.py:1416
+#: gajim/roster_window.py:850 gajim/roster_window.py:1628
+#: gajim/roster_window.py:1661 gajim/roster_window.py:1712
+#: gajim/roster_window.py:1714 gajim/roster_window.py:1869
+#: gajim/roster_window.py:2528 gajim/roster_window.py:4331
+#: gajim/roster_window.py:4964 gajim/common/contacts.py:204
+#: gajim/common/contacts.py:463 gajim/common/helpers.py:86
+#: gajim/gtk/discovery.py:127 gajim/gtk/discovery.py:128
+#: gajim/gtk/discovery.py:1414
 msgid "Transports"
 msgstr ""
 
-#: gajim/roster_window.py:1723 gajim/roster_window.py:1725
-#: gajim/roster_window.py:4995 gajim/gui_interface.py:1613
-#: gajim/gui_interface.py:1639 gajim/common/contacts.py:186
-#: gajim/common/helpers.py:83 gajim/common/modules/adhoc_commands.py:245
-msgid "Groupchats"
+#: gajim/roster_window.py:1720 gajim/roster_window.py:1722
+#: gajim/roster_window.py:4331 gajim/roster_window.py:4934
+#: gajim/gui_interface.py:1527 gajim/common/contacts.py:202
+#: gajim/common/helpers.py:86 gajim/common/modules/adhoc_commands.py:245
+#, fuzzy
+msgid "Group chats"
 msgstr "Grups de xat"
 
-#: gajim/roster_window.py:2012
+#: gajim/roster_window.py:2009
 msgid "Authorization sent"
 msgstr ""
 
-#: gajim/roster_window.py:2013
+#: gajim/roster_window.py:2010
 #, python-format
 msgid "\"%s\" will now see your status."
 msgstr ""
 
-#: gajim/roster_window.py:2031
+#: gajim/roster_window.py:2028
 msgid "Subscription request has been sent"
 msgstr ""
 
-#: gajim/roster_window.py:2032
+#: gajim/roster_window.py:2029
 #, python-format
-msgid "If \"%s\" accepts this request you will know his or her status."
+msgid "If \"%s\" accepts this request you will know their status."
 msgstr ""
 
-#: gajim/roster_window.py:2046
+#: gajim/roster_window.py:2043
 msgid "Authorization removed"
 msgstr ""
 
-#: gajim/roster_window.py:2047
+#: gajim/roster_window.py:2044
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr ""
 
-#: gajim/roster_window.py:2250 gajim/roster_window.py:3504
+#: gajim/roster_window.py:2247 gajim/roster_window.py:3460
 msgid "Disconnect for Invisibility"
 msgstr ""
 
-#: gajim/roster_window.py:2251 gajim/roster_window.py:3505
+#: gajim/roster_window.py:2248 gajim/roster_window.py:3461
 msgid "You are participating in one or more group chats"
 msgstr ""
 
-#: gajim/roster_window.py:2252 gajim/roster_window.py:3506
+#: gajim/roster_window.py:2249 gajim/roster_window.py:3462
 msgid ""
-"Changing your status to invisible will result in disconnection from those "
-"group chats.\n"
+"Changing your status to invisible will result in you leaving those group "
+"chats.\n"
 "Are you sure you want to go invisible?"
 msgstr ""
 
-#: gajim/roster_window.py:2257 gajim/roster_window.py:3512
-#: gajim/roster_window.py:5238 gajim/data/gui/gc_control_popup_menu.ui:120
+#: gajim/roster_window.py:2254 gajim/roster_window.py:3468
+#: gajim/data/gui/gc_control_popup_menu.ui:120
 msgid "_Disconnect"
 msgstr "_Desconnecta"
 
-#: gajim/roster_window.py:2285
+#: gajim/roster_window.py:2282
 #, fuzzy
 msgid "desynced"
 msgstr "Avançat"
 
-#: gajim/roster_window.py:2353 gajim/data/gui/shortcuts_window.ui:224
+#: gajim/roster_window.py:2350 gajim/data/gui/shortcuts_window.ui:224
 msgid "Quit Gajim"
 msgstr ""
 
-#: gajim/roster_window.py:2354
+#: gajim/roster_window.py:2351
 msgid "You are about to quit Gajim"
 msgstr ""
 
-#: gajim/roster_window.py:2355
+#: gajim/roster_window.py:2352
 msgid "Are you sure you want to quit Gajim?"
 msgstr ""
 
-#: gajim/roster_window.py:2356
+#: gajim/roster_window.py:2353
 msgid "_Always quit when closing Gajim"
 msgstr ""
 
-#: gajim/roster_window.py:2359 gajim/roster_window.py:2455
-#: gajim/roster_window.py:2495 gajim/data/gui/systray_context_menu.ui:90
+#: gajim/roster_window.py:2356 gajim/roster_window.py:2452
+#: gajim/roster_window.py:2492 gajim/data/gui/systray_context_menu.ui:83
 #, fuzzy
 msgid "_Quit"
 msgstr "Surt"
 
-#: gajim/roster_window.py:2448
+#: gajim/roster_window.py:2445
 #, fuzzy
 msgid "Stop File Transfers"
 msgstr "Transferències de fitxers"
 
-#: gajim/roster_window.py:2449
+#: gajim/roster_window.py:2446
 msgid "You still have running file transfers"
 msgstr ""
 
-#: gajim/roster_window.py:2450
+#: gajim/roster_window.py:2447
 msgid ""
 "If you quit now, the file(s) being transferred will be lost.\n"
 "Do you still want to quit?"
 msgstr ""
 
-#: gajim/roster_window.py:2488
+#: gajim/roster_window.py:2485
 #, fuzzy
 msgid "Unread Messages"
 msgstr "_Canvia Missatge d'Estat"
 
-#: gajim/roster_window.py:2489
+#: gajim/roster_window.py:2486
 #, fuzzy
 msgid "You still have unread messages"
 msgstr "_Canvia Missatge d'Estat"
 
-#: gajim/roster_window.py:2490
+#: gajim/roster_window.py:2487
 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 ""
 
-#: gajim/roster_window.py:2760
+#: gajim/roster_window.py:2753
 msgid "You have unread messages"
 msgstr ""
 
-#: gajim/roster_window.py:2761
+#: gajim/roster_window.py:2754
 msgid "You must read them before removing this transport."
 msgstr ""
 
-#: gajim/roster_window.py:2764
+#: gajim/roster_window.py:2757
 #, python-format
 msgid "Transport '%s' will be removed"
 msgstr ""
 
-#: gajim/roster_window.py:2765
+#: gajim/roster_window.py:2758
 msgid ""
 "You will no longer be able to send and receive messages from and to contacts "
 "using this transport."
 msgstr ""
 
-#: gajim/roster_window.py:2768
+#: gajim/roster_window.py:2761
 msgid "Transports will be removed"
 msgstr ""
 
-#: gajim/roster_window.py:2773
+#: gajim/roster_window.py:2766
 #, python-format
 msgid ""
 "You will no longer be able to send and receive messages from and to contacts "
@@ -1419,102 +1397,97 @@ msgid ""
 "%s"
 msgstr ""
 
-#: gajim/roster_window.py:2777
+#: gajim/roster_window.py:2770
 #, fuzzy
 msgid "Remove Transport"
 msgstr "Mostra Transports"
 
-#: gajim/roster_window.py:2844
+#: gajim/roster_window.py:2837
 #, fuzzy
 msgid "Block Contact"
 msgstr "Contactes blocats"
 
-#: gajim/roster_window.py:2845
+#: gajim/roster_window.py:2838
 msgid "Really block this contact?"
 msgstr ""
 
-#: gajim/roster_window.py:2846
+#: gajim/roster_window.py:2839
 msgid ""
 "This contact will see you offline and you will not receive any messages sent "
 "to you by this contact."
 msgstr ""
 
-#: gajim/roster_window.py:2851
+#: gajim/roster_window.py:2844
 #, fuzzy
 msgid "_Block Contact"
 msgstr "Contactes blocats"
 
-#: gajim/roster_window.py:2896
+#: gajim/roster_window.py:2889
 msgid "Rename Contact"
 msgstr ""
 
-#: gajim/roster_window.py:2897
+#: gajim/roster_window.py:2890
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr ""
 
-#: gajim/roster_window.py:2904
+#: gajim/roster_window.py:2897
 msgid "Rename Group"
 msgstr ""
 
-#: gajim/roster_window.py:2905
+#: gajim/roster_window.py:2898
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr ""
 
-#: gajim/roster_window.py:2953 gajim/roster_window.py:2954
+#: gajim/roster_window.py:2946 gajim/roster_window.py:2947
 msgid "Remove Group"
 msgstr ""
 
-#: gajim/roster_window.py:2955
+#: gajim/roster_window.py:2948
 #, python-format
 msgid "Do you want to remove %s from the contact list?"
 msgstr ""
 
-#: gajim/roster_window.py:2956
+#: gajim/roster_window.py:2949
 msgid "_Also remove all contacts of this group from contact list"
 msgstr ""
 
-#: gajim/roster_window.py:3044
-#, python-format
-msgid "%(jid)s has been invited in this room"
-msgstr ""
-
-#: gajim/roster_window.py:3353
+#: gajim/roster_window.py:3309
 #, fuzzy
 msgid "Remove Contact"
 msgstr "Afegeix un contacte nou"
 
-#: gajim/roster_window.py:3354
+#: gajim/roster_window.py:3310
 #, fuzzy
 msgid "Remove contact from contact list"
 msgstr "Esborra transferència de fitxer de la llista."
 
-#: gajim/roster_window.py:3355
+#: gajim/roster_window.py:3311
 #, python-format
 msgid "You are about to remove '%(name)s' (%(jid)s) from your contact list.\n"
 msgstr ""
 
-#: gajim/roster_window.py:3364 gajim/roster_window.py:3384
+#: gajim/roster_window.py:3320 gajim/roster_window.py:3340
 msgid ""
 "By removing this contact you also remove authorization. This means the "
 "contact will see you as offline."
 msgstr ""
 
-#: gajim/roster_window.py:3375
+#: gajim/roster_window.py:3331
 msgid "Do you want to continue?"
 msgstr ""
 
-#: gajim/roster_window.py:3386
+#: gajim/roster_window.py:3342
 msgid "_I want this contact to know my status after removal"
 msgstr ""
 
-#: gajim/roster_window.py:3393
+#: gajim/roster_window.py:3349
 #, fuzzy
 msgid "Remove contacts from contact list"
 msgstr "Esborra transferència de fitxer de la llista."
 
-#: gajim/roster_window.py:3399
+#: gajim/roster_window.py:3355
 #, python-format
 msgid ""
 "By removing the following contacts, you will also remove authorization. This "
@@ -1523,154 +1496,146 @@ msgid ""
 "%s"
 msgstr ""
 
-#: gajim/roster_window.py:3403
+#: gajim/roster_window.py:3359
 #, fuzzy
 msgid "Remove Contacts"
 msgstr "Convida _Contactes"
 
-#: gajim/roster_window.py:3423
+#: gajim/roster_window.py:3379
 msgid "No account available"
 msgstr ""
 
-#: gajim/roster_window.py:3424
+#: gajim/roster_window.py:3380
 msgid "You must create an account before you can chat with other contacts."
 msgstr ""
 
-#: gajim/roster_window.py:4060
+#: gajim/roster_window.py:4011
 msgid "Metacontacts storage not supported by your server"
 msgstr ""
 
-#: gajim/roster_window.py:4062
+#: gajim/roster_window.py:4013
 msgid ""
 "Your server does not support storing metacontacts information. So this "
 "information will not be saved on next reconnection."
 msgstr ""
 
-#: gajim/roster_window.py:4159
+#: gajim/roster_window.py:4110
 msgid "You are about to create a metacontact"
 msgstr ""
 
-#: gajim/roster_window.py:4160
+#: gajim/roster_window.py:4111
 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:4164
+#: gajim/roster_window.py:4115
 #, fuzzy
 msgid "Create Metacontact"
 msgstr "Crea nou missatge"
 
-#: gajim/roster_window.py:4170
+#: gajim/roster_window.py:4121 gajim/data/gui/groupchat_creation.ui:317
 msgid "_Create"
 msgstr ""
 
-#: gajim/roster_window.py:4287
+#: gajim/roster_window.py:4238
 msgid "Invalid file URI:"
 msgstr ""
 
-#: gajim/roster_window.py:4298
+#: gajim/roster_window.py:4249
 #, fuzzy
 msgid "Send file?"
 msgstr "Envia _Fitxer"
 
-#: gajim/roster_window.py:4299
+#: gajim/roster_window.py:4250
 #, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
 msgstr[0] ""
 msgstr[1] ""
 
-#: gajim/roster_window.py:4451
+#: gajim/roster_window.py:4401
 #, python-format
 msgid "Send %(from)s to %(to)s"
 msgstr ""
 
-#: gajim/roster_window.py:4464
+#: gajim/roster_window.py:4414
 #, python-format
 msgid "Make %s first contact"
 msgstr ""
 
-#: gajim/roster_window.py:4469
+#: gajim/roster_window.py:4419
 #, python-format
 msgid "Make %(contact1)s and %(contact2)s metacontacts"
 msgstr ""
 
-#: gajim/roster_window.py:4825 gajim/roster_window.py:4923
+#: gajim/roster_window.py:4775 gajim/roster_window.py:4862
 msgid "_Change Status Message"
 msgstr "_Canvia Missatge d'Estat"
 
-#: gajim/roster_window.py:4845
+#: gajim/roster_window.py:4795
 msgid "Publish Tune"
 msgstr ""
 
-#: gajim/roster_window.py:4856
+#: gajim/roster_window.py:4806
 msgid "Publish Location"
 msgstr ""
 
-#: gajim/roster_window.py:4868
-msgid "Configure Services…"
-msgstr ""
-
-#: gajim/roster_window.py:4997
+#: gajim/roster_window.py:4936
 msgid "_Maximize All"
 msgstr ""
 
-#: gajim/roster_window.py:5004 gajim/roster_window.py:5146
+#: gajim/roster_window.py:4943 gajim/roster_window.py:5085
 msgid "Send Group M_essage"
 msgstr ""
 
-#: gajim/roster_window.py:5011
+#: gajim/roster_window.py:4950
 msgid "To all users"
 msgstr ""
 
-#: gajim/roster_window.py:5015
+#: gajim/roster_window.py:4954
 msgid "To all online users"
 msgstr ""
 
-#: gajim/roster_window.py:5027 gajim/roster_window.py:5152
+#: gajim/roster_window.py:4966 gajim/roster_window.py:5091
 #: gajim/data/gui/gc_occupants_menu.ui:110
 #: gajim/data/gui/contact_context_menu.ui:36
 msgid "In_vite to"
 msgstr "Con_vida a"
 
-#: gajim/roster_window.py:5162
+#: gajim/roster_window.py:5101
 msgid "_Manage Contacts"
 msgstr ""
 
-#: gajim/roster_window.py:5168
+#: gajim/roster_window.py:5107
 msgid "Edit _Groups…"
 msgstr ""
 
-#: gajim/roster_window.py:5189 gajim/data/gui/filetransfers.ui:12
+#: gajim/roster_window.py:5128 gajim/data/gui/filetransfers.ui:12
 #: gajim/data/gui/remove_account_window.ui:134
 msgid "_Remove"
 msgstr ""
 
-#: gajim/roster_window.py:5226
+#: gajim/roster_window.py:5165
 msgid "_Maximize"
 msgstr ""
 
-#: gajim/roster_window.py:5233
+#: gajim/roster_window.py:5172
 msgid "_Reconnect"
 msgstr ""
 
-#: gajim/roster_window.py:5254 gajim/data/gui/gc_occupants_menu.ui:170
+#: gajim/roster_window.py:5193 gajim/data/gui/gc_occupants_menu.ui:170
 #: gajim/data/gui/gc_control_popup_menu.ui:113
 #: gajim/data/gui/contact_context_menu.ui:205
 msgid "_History"
 msgstr "_Historial"
 
-#: gajim/roster_window.py:5335 gajim/data/gui/application_menu.ui:86
+#: gajim/roster_window.py:5274 gajim/data/gui/application_menu.ui:83
 #: gajim/data/gui/history_window.ui:57
 msgid "History Manager"
 msgstr "Gestor d'Històric"
 
-#: gajim/roster_window.py:5343
-msgid "_Join New Group Chat"
-msgstr ""
-
 #: gajim/dataforms_widget.py:585
 msgid "Unable to load image"
 msgstr ""
@@ -1788,265 +1753,281 @@ msgstr ""
 msgid "Write a message…"
 msgstr "Envia missatge"
 
-#: gajim/message_window.py:250
+#: gajim/message_window.py:356
+msgid "Close Tabs"
+msgstr ""
+
+#: gajim/message_window.py:357
 msgid "You are going to close several tabs"
 msgstr ""
 
-#: gajim/message_window.py:251
+#: gajim/message_window.py:358
 msgid "Do you really want to close them all?"
 msgstr ""
 
-#: gajim/message_window.py:539
+#: gajim/message_window.py:514
 msgid "?Noun:Chats"
 msgstr ""
 
-#: gajim/message_window.py:543
+#: gajim/message_window.py:518
 #, fuzzy
 msgid "Group Chats"
 msgstr "Grups de xat"
 
-#: gajim/message_window.py:547
+#: gajim/message_window.py:522
 msgid "Private Chats"
 msgstr ""
 
-#: gajim/message_window.py:553
+#: gajim/message_window.py:528
 msgid "Messages"
 msgstr ""
 
-#: gajim/gui_interface.py:173
-msgid "Do you accept this request?"
+#: gajim/gui_interface.py:170
+#, python-format
+msgid "HTTP (%(method)s) Authorization for %(url)s (ID: %(id)s)"
 msgstr ""
 
 #: gajim/gui_interface.py:175
-#, python-format
-msgid "Do you accept this request on account %s?"
+msgid "Do you accept this request?"
 msgstr ""
 
-#: gajim/gui_interface.py:178
+#: gajim/gui_interface.py:177
 #, python-format
-msgid "HTTP (%(method)s) Authorization for %(url)s (ID: %(id)s)"
+msgid "Do you accept this request (account: %s)?"
 msgstr ""
 
-#: gajim/gui_interface.py:194 gajim/gtk/notification.py:175
-#: gajim/gtk/notification.py:197
-msgid "Connection Failed"
-msgstr ""
+#: gajim/gui_interface.py:182
+#, fuzzy
+msgid "Authorization"
+msgstr "Autors:"
 
-#: gajim/gui_interface.py:279 gajim/gui_interface.py:529
-msgid "Password Required"
-msgstr ""
+#: gajim/gui_interface.py:186 gajim/gui_interface.py:420
+#: gajim/gtk/filetransfer.py:338
+#, fuzzy
+msgid "_No"
+msgstr "No"
 
-#: gajim/gui_interface.py:280
-#, python-format
-msgid "A Password is required to join the room %s. Please type it."
+#: gajim/gui_interface.py:205 gajim/gtk/notification.py:175
+#: gajim/gtk/notification.py:197
+msgid "Connection Failed"
 msgstr ""
 
-#: gajim/gui_interface.py:342 gajim/gui_interface.py:346
+#: gajim/gui_interface.py:325 gajim/gui_interface.py:329
 #, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr ""
 
-#: gajim/gui_interface.py:357 gajim/gui_interface.py:376
+#: gajim/gui_interface.py:340 gajim/gui_interface.py:359
 #: gajim/common/modules/message.py:122
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr ""
 
-#: gajim/gui_interface.py:401 gajim/gtk/notification.py:175
+#: gajim/gui_interface.py:384 gajim/gtk/notification.py:175
 msgid "Subscription request"
 msgstr ""
 
-#: gajim/gui_interface.py:413 gajim/common/contacts.py:184
-#: gajim/common/helpers.py:83
+#: gajim/gui_interface.py:396 gajim/common/contacts.py:200
+#: gajim/common/helpers.py:86
 msgid "Observers"
 msgstr ""
 
-#: gajim/gui_interface.py:422
+#: gajim/gui_interface.py:405
 msgid "Authorization accepted"
 msgstr ""
 
-#: gajim/gui_interface.py:423
+#: gajim/gui_interface.py:406
 #, python-format
 msgid "The contact \"%s\" has authorized you to see their status."
 msgstr ""
 
-#: gajim/gui_interface.py:431
+#: gajim/gui_interface.py:415
+#, fuzzy
+msgid "Subscription Removed"
+msgstr "_Subscripció"
+
+#: gajim/gui_interface.py:416
 #, python-format
-msgid "Contact \"%s\" removed subscription from you"
+msgid "Contact '%s' removed subscription from you"
 msgstr ""
 
-#: gajim/gui_interface.py:432
+#: gajim/gui_interface.py:417
 msgid ""
-"You will always see them as offline.\n"
+"You will always see this contact as offline.\n"
 "Do you want to remove them from your contact list?"
 msgstr ""
 
-#: gajim/gui_interface.py:453 gajim/gtk/notification.py:176
+#: gajim/gui_interface.py:442 gajim/gtk/notification.py:176
 msgid "Unsubscribed"
 msgstr ""
 
-#: gajim/gui_interface.py:465
+#: gajim/gui_interface.py:454
 #, python-format
 msgid "%(jid)s declined the invitation: %(reason)s"
 msgstr ""
 
-#: gajim/gui_interface.py:469
+#: gajim/gui_interface.py:458
 #, python-format
 msgid "%(jid)s declined the invitation"
 msgstr ""
 
-#: gajim/gui_interface.py:485
+#: gajim/gui_interface.py:474
 #, python-brace-format
 msgid "You are invited to {room} by {user}"
 msgstr ""
 
-#: gajim/gui_interface.py:506
+#: gajim/gui_interface.py:495
 msgid "Certificate Passphrase Required"
 msgstr ""
 
-#: gajim/gui_interface.py:507
+#: gajim/gui_interface.py:496
 #, python-format
 msgid "Enter the certificate passphrase for account %s"
 msgstr ""
 
-#: gajim/gui_interface.py:516 gajim/gtk/accounts.py:963
+#: gajim/gui_interface.py:505 gajim/gtk/accounts.py:966
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Escriu la teva contrasenya per al compte %s"
 
-#: gajim/gui_interface.py:529 gajim/gtk/accounts.py:964
+#: gajim/gui_interface.py:518
+msgid "Password Required"
+msgstr ""
+
+#: gajim/gui_interface.py:518 gajim/gtk/accounts.py:967
 msgid "Save password"
 msgstr "Desa la contrasenya"
 
-#: gajim/gui_interface.py:601 gajim/gui_interface.py:632
+#: gajim/gui_interface.py:587 gajim/gui_interface.py:618
+#: gajim/gtk/filetransfer.py:332 gajim/gtk/filetransfer.py:333
 #: gajim/gtk/notification.py:173 gajim/gtk/notification.py:276
 msgid "File Transfer Error"
 msgstr ""
 
-#: gajim/gui_interface.py:666
+#: gajim/gui_interface.py:652
 #, python-format
 msgid "%s wants to send you a file."
 msgstr ""
 
-#: gajim/gui_interface.py:668 gajim/gtk/filetransfer.py:479
+#: gajim/gui_interface.py:654 gajim/gtk/filetransfer.py:484
 #: gajim/gtk/notification.py:172 gajim/gtk/notification.py:274
 msgid "File Transfer Request"
 msgstr ""
 
-#: gajim/gui_interface.py:767
+#: gajim/gui_interface.py:753
 #, fuzzy
 msgid "Remote Contact Stopped Transfer"
 msgstr "Convida _Contactes"
 
-#: gajim/gui_interface.py:772
+#: gajim/gui_interface.py:758
 msgid "Error Opening File"
 msgstr ""
 
-#: gajim/gui_interface.py:782
+#: gajim/gui_interface.py:768
 #, fuzzy
 msgid "SSL Certificate Error"
 msgstr "Certificat de client"
 
-#: gajim/gui_interface.py:795 gajim/gui_interface.py:826
-#: gajim/gui_interface.py:853 gajim/gtk/notification.py:174
+#: gajim/gui_interface.py:781 gajim/gui_interface.py:812
+#: gajim/gui_interface.py:839 gajim/gtk/notification.py:174
 #: gajim/gtk/notification.py:279
 msgid "File Transfer Stopped"
 msgstr ""
 
-#: gajim/gui_interface.py:799
+#: gajim/gui_interface.py:785
 msgid "File Transfer Failed"
 msgstr ""
 
-#: gajim/gui_interface.py:822
+#: gajim/gui_interface.py:808
 #, python-format
 msgid "%(filename)s received from %(name)s."
 msgstr ""
 
-#: gajim/gui_interface.py:827
+#: gajim/gui_interface.py:813
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr ""
 
-#: gajim/gui_interface.py:833
+#: gajim/gui_interface.py:819
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s failed."
 msgstr ""
 
-#: gajim/gui_interface.py:848
+#: gajim/gui_interface.py:834
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr ""
 
-#: gajim/gui_interface.py:854
+#: gajim/gui_interface.py:840
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr ""
 
-#: gajim/gui_interface.py:860
+#: gajim/gui_interface.py:846
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s failed."
 msgstr ""
 
-#: gajim/gui_interface.py:971
+#: gajim/gui_interface.py:957
 msgid "Username Conflict"
 msgstr ""
 
-#: gajim/gui_interface.py:972
+#: gajim/gui_interface.py:958
 msgid "Please type a new username for your local account"
 msgstr ""
 
-#: gajim/gui_interface.py:995
+#: gajim/gui_interface.py:981
 msgid "Resource Conflict"
 msgstr ""
 
-#: gajim/gui_interface.py:996
+#: gajim/gui_interface.py:982
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
 msgstr ""
 
-#: gajim/gui_interface.py:1053
+#: gajim/gui_interface.py:1039
 #, python-format
 msgid "%s wants to start a voice chat."
 msgstr ""
 
-#: gajim/gui_interface.py:1055
+#: gajim/gui_interface.py:1041
 msgid "Voice Chat Request"
 msgstr ""
 
-#: gajim/gui_interface.py:1123 gajim/gtk/account_wizard.py:312
+#: gajim/gui_interface.py:1109 gajim/gtk/account_wizard.py:312
 msgid "Certificate Already in File"
 msgstr ""
 
-#: gajim/gui_interface.py:1124 gajim/gtk/account_wizard.py:313
+#: gajim/gui_interface.py:1110 gajim/gtk/account_wizard.py:313
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr ""
 
-#: gajim/gui_interface.py:1145
+#: gajim/gui_interface.py:1131
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid"
 msgstr ""
 
-#: gajim/gui_interface.py:1148
+#: gajim/gui_interface.py:1134
 #, python-format
 msgid ""
 "\n"
 "Unknown SSL error: %d"
 msgstr ""
 
-#: gajim/gui_interface.py:1150
+#: gajim/gui_interface.py:1136
 #, python-format
 msgid ""
 "\n"
 "SSL Error: <b>%s</b>"
 msgstr ""
 
-#: gajim/gui_interface.py:1155
+#: gajim/gui_interface.py:1141
 msgid "Error verifying SSL certificate"
 msgstr ""
 
-#: gajim/gui_interface.py:1156
+#: gajim/gui_interface.py:1142
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your XMPP server: "
@@ -2054,7 +2035,7 @@ msgid ""
 "Do you still want to connect to this server?"
 msgstr ""
 
-#: gajim/gui_interface.py:1160 gajim/gtk/account_wizard.py:412
+#: gajim/gui_interface.py:1146 gajim/gtk/account_wizard.py:413
 #, fuzzy, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -2066,254 +2047,241 @@ msgstr ""
 "Afegir aquest certificat a la llista de certificats confiables.\n"
 "Hash SHA1 del certificat:\n"
 
-#: gajim/gui_interface.py:1166
+#: gajim/gui_interface.py:1152
 msgid "Ignore this error for this certificate."
 msgstr ""
 
-#: gajim/gui_interface.py:1174
+#: gajim/gui_interface.py:1160
 #, python-format
 msgid "SSL Certificate Verification for %s"
 msgstr ""
 
-#: gajim/gui_interface.py:1442 gajim/gtk/join_groupchat.py:235
-msgid "You can not join a group chat unless you are connected."
-msgstr ""
-
-#: gajim/gui_interface.py:1448
-#, fuzzy
-msgid "JID is not a Groupchat"
-msgstr "Uneix-te al xat en grup"
-
-#: gajim/gui_interface.py:1579
-msgid "This is not a group chat"
-msgstr ""
-
-#: gajim/gui_interface.py:1580
-#, python-format
-msgid ""
-"%(room_jid)s is already in your roster. Please check if %(room_jid)s is a "
-"correct group chat name. If it is, delete it from your roster and try "
-"joining the group chat again."
-msgstr ""
-
-#: gajim/gui_interface.py:1604 gajim/dialog_messages.py:58
+#: gajim/gui_interface.py:1577
 msgid "You cannot join a group chat while you are invisible"
 msgstr ""
 
-#: gajim/gui_interface.py:2037
+#: gajim/gui_interface.py:1976
 msgid "Could not save your settings and preferences"
 msgstr ""
 
-#: gajim/gui_interface.py:2098
+#: gajim/gui_interface.py:2037
 msgid "Gajim: IPython Console"
 msgstr ""
 
-#: gajim/dialog_messages.py:32
-msgid "You can not start a new conversation unless you are connected."
-msgstr ""
-
-#: gajim/dialog_messages.py:36 gajim/dialog_messages.py:41
-#: gajim/gtk/single_message.py:305 gajim/gtk/join_groupchat.py:211
-#: gajim/gtk/account_wizard.py:229
-msgid "Invalid JID"
-msgstr ""
+#: gajim/dialog_messages.py:31 gajim/dialog_messages.py:36
+#: gajim/gtk/single_message.py:305 gajim/gtk/account_wizard.py:229
+#, fuzzy
+msgid "Invalid XMPP Address"
+msgstr "Gestiona Sala"
 
-#: gajim/dialog_messages.py:42 gajim/gtk/single_message.py:306
+#: gajim/dialog_messages.py:37
 #, python-format
-msgid "It is not possible to send a message to %s, this JID is not valid."
+msgid ""
+"It is not possible to send a message to %s. This XMPP Address is not valid."
 msgstr ""
 
-#: gajim/dialog_messages.py:47
-msgid "Unread events"
-msgstr ""
+#: gajim/dialog_messages.py:42
+#, fuzzy
+msgid "Unread Events"
+msgstr "_Canvia Missatge d'Estat"
 
-#: gajim/dialog_messages.py:48
-msgid "Read all pending events before removing this account."
+#: gajim/dialog_messages.py:43
+msgid "Read or acknowledge all pending events before removing this account."
 msgstr ""
 
-#: gajim/dialog_messages.py:52
+#: gajim/dialog_messages.py:48
 msgid "Invalid Form"
 msgstr ""
 
-#: gajim/dialog_messages.py:53
+#: gajim/dialog_messages.py:49
 msgid "The form is not filled correctly."
 msgstr ""
 
-#: gajim/dialog_messages.py:57 gajim/common/helpers.py:309
+#: gajim/dialog_messages.py:53 gajim/common/helpers.py:315
 msgid "Invisible"
 msgstr "Invisible"
 
-#: gajim/dialog_messages.py:62
-msgid "A connection is not available"
+#: gajim/dialog_messages.py:54
+msgid "You cannot join a group chat while being invisible."
 msgstr ""
 
-#: gajim/dialog_messages.py:63
+#: gajim/dialog_messages.py:58
+#, fuzzy
+msgid "No Connection Available"
+msgstr "_No Disponible"
+
+#: gajim/dialog_messages.py:59
 msgid "Your message can not be sent until you are connected."
 msgstr ""
 
-#: gajim/dialog_messages.py:67
-msgid "JID already in list"
+#: gajim/dialog_messages.py:63
+msgid "XMPP Address Already in List"
 msgstr ""
 
-#: gajim/dialog_messages.py:68
-msgid "The JID you entered is already in the list. Choose another one."
+#: gajim/dialog_messages.py:64
+msgid ""
+"The XMPP Address you entered is already in the list. Please choose another "
+"one."
 msgstr ""
 
-#: gajim/dialog_messages.py:72
-msgid "Invalid answer"
-msgstr ""
+#: gajim/dialog_messages.py:69
+#, fuzzy
+msgid "Invalid Answer"
+msgstr "Gestiona Sala"
 
-#: gajim/dialog_messages.py:73
+#: gajim/dialog_messages.py:70
 #, python-format
 msgid "Transport %(name)s answered wrongly to register request: %(error)s"
 msgstr ""
 
-#: gajim/dialog_messages.py:78
+#: gajim/dialog_messages.py:75
 msgid "Wrong Custom Hostname"
 msgstr ""
 
-#: gajim/dialog_messages.py:79
+#: gajim/dialog_messages.py:76
 #, python-format
-msgid "Wrong custom hostname \"%s\". Ignoring it."
+msgid "Custom hostname \"%s\" is wrong. It will be ignored."
 msgstr ""
 
-#: gajim/dialog_messages.py:83
-msgid "Error while removing privacy list"
+#: gajim/dialog_messages.py:80
+msgid "Error While Removing Privacy List"
 msgstr ""
 
-#: gajim/dialog_messages.py:84
+#: gajim/dialog_messages.py:81
 #, python-format
 msgid ""
-"Privacy list %s has not been removed. It is maybe active in one of your "
-"connected resources. Deactivate it and try again."
+"Privacy list %s has not been removed. It is probably active in one of your "
+"connected resources. Please deactivate it and try again."
 msgstr ""
 
-#: gajim/dialog_messages.py:90
-msgid "Invisibility not supported"
+#: gajim/dialog_messages.py:87
+msgid "Invisibility Not Supported"
 msgstr ""
 
-#: gajim/dialog_messages.py:91
+#: gajim/dialog_messages.py:88
 #, python-format
-msgid "Account %s doesn't support invisibility."
+msgid "This account %s doesn't support invisibility."
 msgstr ""
 
-#: gajim/dialog_messages.py:95
-msgid "Unregister failed"
+#: gajim/dialog_messages.py:92
+msgid "Unregister Failed"
 msgstr ""
 
-#: gajim/dialog_messages.py:96
+#: gajim/dialog_messages.py:93
 #, python-format
-msgid "Unregistration with server %(server)s failed: %(error)s"
+msgid "Unregistration on server %(server)s failed: %(error)s"
 msgstr ""
 
-#: gajim/dialog_messages.py:100
-msgid "Registration succeeded"
+#: gajim/dialog_messages.py:97
+msgid "Registration Succeeded"
 msgstr ""
 
-#: gajim/dialog_messages.py:101
+#: gajim/dialog_messages.py:98
 #, python-format
-msgid "Registration with agent %s succeeded"
+msgid "Registration with agent %s succeeded."
 msgstr ""
 
-#: gajim/dialog_messages.py:105 gajim/gtk/service_registration.py:215
-msgid "Registration failed"
+#: gajim/dialog_messages.py:102
+msgid "Registration Failed"
 msgstr ""
 
-#: gajim/dialog_messages.py:106
+#: gajim/dialog_messages.py:103
 #, python-format
 msgid ""
 "Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
 msgstr ""
 
-#: gajim/dialog_messages.py:111
+#: gajim/dialog_messages.py:108
 #, fuzzy
 msgid "Unable to Join Group Chat"
 msgstr "Uneix-te al xat en grup"
 
-#: gajim/dialog_messages.py:116
-msgid "GStreamer error"
+#: gajim/dialog_messages.py:113
+msgid "GStreamer Error"
 msgstr ""
 
-#: gajim/dialog_messages.py:117
+#: gajim/dialog_messages.py:114
 #, python-format
 msgid ""
 "Error: %(error)s\n"
 "Debug: %(debug)s"
 msgstr ""
 
-#: gajim/dialog_messages.py:121
-msgid "Wrong host"
-msgstr ""
+#: gajim/dialog_messages.py:118
+#, fuzzy
+msgid "Wrong Host"
+msgstr "Servidor intermediari:"
 
-#: gajim/dialog_messages.py:122
+#: gajim/dialog_messages.py:119
 msgid "Invalid local address? :-O"
 msgstr ""
 
-#: gajim/dialog_messages.py:126
-msgid "Avahi error"
+#: gajim/dialog_messages.py:123
+msgid "Avahi Error"
 msgstr ""
 
-#: gajim/dialog_messages.py:127
+#: gajim/dialog_messages.py:124
 #, python-format
 msgid ""
 "%s\n"
 "Link-local messaging might not work properly."
 msgstr ""
 
-#: gajim/dialog_messages.py:131 gajim/dialog_messages.py:136
-msgid "Could not request upload slot"
+#: gajim/dialog_messages.py:128 gajim/dialog_messages.py:133
+msgid "Could not request upload slot for HTTP File Upload"
 msgstr ""
 
-#: gajim/dialog_messages.py:137
-msgid "Got unexpected response from server (see log)"
+#: gajim/dialog_messages.py:134
+msgid "Got unexpected response from server (see log)."
 msgstr ""
 
-#: gajim/dialog_messages.py:141 gajim/dialog_messages.py:146
-msgid "Could not open file"
+#: gajim/dialog_messages.py:138 gajim/dialog_messages.py:143
+msgid "Could not Open File"
 msgstr ""
 
-#: gajim/dialog_messages.py:142
-msgid "Exception raised while opening file (see log)"
+#: gajim/dialog_messages.py:139
+msgid "Exception raised while trying to open file (see log)."
 msgstr ""
 
-#: gajim/dialog_messages.py:151
-msgid "Unsecure"
-msgstr ""
+#: gajim/dialog_messages.py:148
+#, fuzzy
+msgid "Not Secure"
+msgstr "Entrada següent"
 
-#: gajim/dialog_messages.py:152
-msgid "Server returned unsecure transport (HTTP)"
+#: gajim/dialog_messages.py:149
+msgid "The server returned an insecure transport (HTTP)."
 msgstr ""
 
-#: gajim/dialog_messages.py:156
-msgid "Could not upload file"
+#: gajim/dialog_messages.py:153
+msgid "Could not Upload File"
 msgstr ""
 
-#: gajim/dialog_messages.py:157
+#: gajim/dialog_messages.py:154
 #, python-format
 msgid "HTTP response code from server: %s"
 msgstr ""
 
-#: gajim/dialog_messages.py:161
+#: gajim/dialog_messages.py:158
 msgid "Upload Error"
 msgstr ""
 
-#: gajim/dialog_messages.py:166
+#: gajim/dialog_messages.py:163
 msgid "Encryption Error"
 msgstr ""
 
-#: gajim/dialog_messages.py:167
-msgid "For the chosen encryption there is no encryption method available"
+#: gajim/dialog_messages.py:164
+msgid "There is no encryption method available for the chosen encryption."
 msgstr ""
 
-#: gajim/dialog_messages.py:171
-msgid "Avatar upload failed"
+#: gajim/dialog_messages.py:169
+msgid "Avatar Upload Failed"
 msgstr ""
 
-#: gajim/privatechat_control.py:204
+#: gajim/privatechat_control.py:207
 msgid "Sending private message failed"
 msgstr ""
 
-#: gajim/privatechat_control.py:206
+#: gajim/privatechat_control.py:209
 #, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr ""
@@ -2335,7 +2303,7 @@ msgid "show help on command"
 msgstr ""
 
 #: gajim/gajim_remote.py:85
-msgid "Lists all contacts in roster, one for each line"
+msgid "Lists all contacts in the contact list, one for each line"
 msgstr ""
 
 #: gajim/gajim_remote.py:87 gajim/gajim_remote.py:102 gajim/gajim_remote.py:112
@@ -2405,11 +2373,12 @@ msgid ""
 msgstr ""
 
 #: gajim/gajim_remote.py:118
-msgid "Sends new chat message to a contact in the roster. Account is optional."
+msgid ""
+"Sends new chat message to a contact in the contact list. Account is optional."
 msgstr ""
 
 #: gajim/gajim_remote.py:120 gajim/gajim_remote.py:130
-msgid "JID of the contact that will receive the message"
+msgid "XMPP Address of the contact that will receive the message"
 msgstr ""
 
 #: gajim/gajim_remote.py:121 gajim/gajim_remote.py:132
@@ -2423,7 +2392,8 @@ msgid "if specified, the message will be sent using this account"
 msgstr ""
 
 #: gajim/gajim_remote.py:127
-msgid "Sends a chat message to someone on your roster. Account is optional."
+msgid ""
+"Sends a chat message to someone on your contact list. Account is optional."
 msgstr ""
 
 #: gajim/gajim_remote.py:131
@@ -2435,11 +2405,11 @@ msgid "message subject"
 msgstr ""
 
 #: gajim/gajim_remote.py:138
-msgid "Sends new message to a groupchat you've joined."
+msgid "Sends new message to a group chat you've joined."
 msgstr ""
 
 #: gajim/gajim_remote.py:140
-msgid "JID of the room that will receive the message"
+msgid "XMPP Address of the group chat that will receive the message"
 msgstr ""
 
 #: gajim/gajim_remote.py:147
@@ -2448,7 +2418,7 @@ msgstr ""
 
 #: gajim/gajim_remote.py:149 gajim/gajim_remote.py:162
 #: gajim/gajim_remote.py:192
-msgid "JID of the contact"
+msgid "XMPP Address of the contact"
 msgstr ""
 
 #: gajim/gajim_remote.py:153
@@ -2508,8 +2478,9 @@ msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr ""
 
 #: gajim/gajim_remote.py:190
-msgid "Removes contact from roster"
-msgstr ""
+#, fuzzy
+msgid "Removes contact from contact list"
+msgstr "Esborra transferència de fitxer de la llista."
 
 #: gajim/gajim_remote.py:193
 msgid "if specified, contact is taken from the contact list of this account"
@@ -2553,7 +2524,7 @@ msgstr ""
 #: gajim/gajim_remote.py:275
 #, python-format
 msgid ""
-"'%s' is not in your roster.\n"
+"'%s' is not in your contact list.\n"
 "Please specify account for sending the message."
 msgstr ""
 
@@ -2766,12 +2737,12 @@ msgstr ""
 msgid "Weekend!"
 msgstr ""
 
-#: gajim/common/logger.py:192 gajim/common/logger.py:197
+#: gajim/common/logger.py:189 gajim/common/logger.py:194
 #, python-format
 msgid "%s is a directory but should be a file"
 msgstr ""
 
-#: gajim/common/logger.py:217
+#: gajim/common/logger.py:214
 #, fuzzy, python-format
 msgid "Creating %s"
 msgstr "Crea nou missatge"
@@ -2845,34 +2816,33 @@ msgstr ""
 msgid "Contact Signed Out"
 msgstr ""
 
-#: gajim/common/contacts.py:455
-msgid "Not in roster"
-msgstr ""
-
 #: gajim/common/config.py:80
 msgid ""
 "Show desktop notification even when a chat window is opened for this contact "
-"and does not have focus"
+"and does not have focus."
 msgstr ""
 
 #: gajim/common/config.py:81
-msgid "Play sound when user is busy"
+msgid "Play sound even when being busy."
 msgstr ""
 
 #: gajim/common/config.py:83
-msgid "Show only online and free for chat contacts in roster."
-msgstr ""
+#, fuzzy
+msgid "Show only online and free for chat contacts in the contact list."
+msgstr "Voldria afegir-te a la meva llista de contactes."
 
 #: gajim/common/config.py:86
 msgid "Time in minutes, after which your status changes to away."
 msgstr ""
 
 #: gajim/common/config.py:87
-msgid "$S (Away as a result of being idle more than $T min)"
+msgid "$S (Away: Idle more than $T min)"
 msgstr ""
 
 #: gajim/common/config.py:87
-msgid "$S will be replaced by current status message, $T by autoawaytime."
+msgid ""
+"$S will be replaced by current status message, $T by the 'autoawaytime' "
+"value."
 msgstr ""
 
 #: gajim/common/config.py:89
@@ -2880,69 +2850,76 @@ msgid "Time in minutes, after which your status changes to not available."
 msgstr ""
 
 #: gajim/common/config.py:90
-msgid "$S (Not available as a result of being idle more than $T min)"
+msgid "$S (Not available: Idle more than $T min)"
 msgstr ""
 
 #: gajim/common/config.py:90
-msgid "$S will be replaced by current status message, $T by autoxatime."
+msgid ""
+"$S will be replaced by current status message, $T by the 'autoxatime' value."
 msgstr ""
 
 #: gajim/common/config.py:93
 msgid ""
-"When to show notification area icon. Can be 'never', 'on_event', 'always'."
+"When to show the notification area icon. Can be 'never', 'on_event', and "
+"'always'."
 msgstr ""
 
 #: gajim/common/config.py:94
-msgid "Allow to hide the roster window even if the tray icon is not shown."
+msgid ""
+"Allow to hide the contact list window even if the notification area icon is "
+"not shown."
 msgstr ""
 
 #: gajim/common/config.py:97
-msgid "Contact signed in notification color."
+msgid "Notification color for contacts signing in."
 msgstr ""
 
 #: gajim/common/config.py:98
-msgid "Contact signout notification color"
+msgid "Notification color for contacts signing out."
 msgstr ""
 
 #: gajim/common/config.py:99
-msgid "New message notification color."
+msgid "Notification color for new message notification."
 msgstr ""
 
 #: gajim/common/config.py:100
-msgid "File transfer request notification color."
-msgstr ""
+#, fuzzy
+msgid "Notification color for file transfer request."
+msgstr "_Notifica'm quan una transferència de fitxer ha acabat"
 
 #: gajim/common/config.py:101
-msgid "File transfer error notification color."
-msgstr ""
+#, fuzzy
+msgid "Notification color for file transfer errors."
+msgstr "_Notifica'm quan una transferència de fitxer ha acabat"
 
 #: gajim/common/config.py:102
-msgid "File transfer complete or stopped notification color."
+msgid "Notification color for stopped or completed file transfers."
 msgstr ""
 
 #: gajim/common/config.py:103
-msgid "Groupchat invitation notification color"
+msgid "Notification color for group chat invitations."
 msgstr ""
 
 #: gajim/common/config.py:104
-msgid "Background color of status changed notification"
+msgid "Notification background color for changed status."
 msgstr ""
 
 #: gajim/common/config.py:105
-msgid "Other dialogs color."
+msgid "Notification color for other dialogs."
 msgstr ""
 
 #: gajim/common/config.py:106
 msgid ""
-"List (space separated) of rows (accounts and groups) that are collapsed."
+"List of rows (accounts and groups) that are collapsed (space separated)."
 msgstr ""
 
 #: gajim/common/config.py:107
 msgid "default"
 msgstr ""
 
-#: gajim/common/config.py:113
-msgid "Language used by speller"
+#: gajim/common/config.py:113 gajim/common/config.py:424
+#: gajim/common/config.py:431
+msgid "Language used for spell checking."
 msgstr ""
 
 #: gajim/common/config.py:114
@@ -2955,8 +2932,8 @@ msgstr ""
 #: gajim/common/config.py:115
 msgid ""
 "Print time in chats using Fuzzy Clock. Value of fuzziness from 1 to 4, or 0 "
-"to disable fuzzyclock. 1 is the most precise clock, 4 the least precise one. "
-"This is used only if print_time is 'sometimes'."
+"to disable Fuzzy Clock. 1 is the most precise clock, 4 the least precise "
+"one. This is used only if 'print_time' is 'sometimes'."
 msgstr ""
 
 #: gajim/common/config.py:117
@@ -2969,770 +2946,783 @@ msgstr ""
 
 #: gajim/common/config.py:120
 msgid ""
-"If true, do not remove */_ . So *abc* will be bold but with * * not removed."
+"If enabled, do not remove */_ . So *abc* will be bold but with * * not "
+"removed."
 msgstr ""
 
 #: gajim/common/config.py:123
 msgid ""
-"Uses ReStructured text markup to send HTML, plus ascii formatting if "
-"selected. For syntax, see http://docutils.sourceforge.net/docs/ref/rst/"
-"restructuredtext.html (If you want to use this, install docutils)"
+"Uses ReStructured text markup to send HTML, plus ASCII formatting if "
+"selected. Needs docutils installed (for syntax, see http://docutils."
+"sourceforge.net/docs/ref/rst/restructuredtext.html)."
 msgstr ""
 
 #: gajim/common/config.py:132
 msgid ""
-"Character to add after nickname when using nick completion (tab) in group "
-"chat."
+"Character to add after nickname when using nickname completion (tab) in "
+"group chat."
 msgstr ""
 
 #: gajim/common/config.py:133
 msgid ""
-"Character to propose to add after desired nickname when desired nickname is "
-"used by someone else in group chat."
+"Character to propose to add after desired nickname when nickname is already "
+"used in group chat."
 msgstr ""
 
 #: gajim/common/config.py:155
 msgid ""
-"If true, Gajim will save roster position when hiding roster, and restore it "
-"when showing roster."
+"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:161
-msgid "Place the roster on the right in single window mode"
+msgid "Place the contact list on the right in single window mode"
 msgstr ""
 
 #: gajim/common/config.py:167
 msgid ""
-"This option let you customize timestamp that is printed in conversation. For "
-"example \"[%H:%M] \" will show \"[hour:minute] \". See python doc on "
-"strftime for full documentation: http://docs.python.org/lib/module-time.html"
+"This option lets you customize the timestamp that is printed in "
+"conversation. For example '[%H:%M] ' will show '[hour:minute] '. See python "
+"doc on strftime for full documentation (https://docs.python.org/3/library/"
+"time.html)."
 msgstr ""
 
 #: gajim/common/config.py:168
-msgid "Characters that are printed before the nickname in conversations"
+msgid "Characters that are printed before the nickname in conversations."
 msgstr ""
 
 #: gajim/common/config.py:169
-msgid "Characters that are printed after the nickname in conversations"
+msgid "Characters that are printed after the nickname in conversations."
 msgstr ""
 
 #: gajim/common/config.py:170
-msgid "Add * and [n] in roster title?"
+msgid "If enabled, Gajim will add * and [n] in contact list window title."
 msgstr ""
 
 #: gajim/common/config.py:171
 msgid ""
-"How many history messages should be restored when a chat tab/window is "
-"reopened?"
+"Number of messages from chat history to be restored when a chat tab/window "
+"is reopened."
 msgstr ""
 
 #: gajim/common/config.py:172
-msgid "How far back in time (minutes) history is restored. -1 means no limit."
+msgid ""
+"How far back in time (minutes) chat history is restored. -1 means no limit."
 msgstr ""
 
 #: gajim/common/config.py:173
 msgid ""
-"How many lines to request from server when entering a groupchat. -1 means no "
-"limit"
+"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:174
 msgid ""
-"Minutes of backlog to request when entering a groupchat. -1 means no limit"
+"Should automatic rejoin be activated when you were kicked from a group chat?"
 msgstr ""
 
 #: gajim/common/config.py:175
-msgid ""
-"How many seconds to wait before trying to autorejoin to a conference you are "
-"being disconnected from. Set to 0 to disable autorejoining."
-msgstr ""
-
-#: gajim/common/config.py:176
-msgid "Should autorejoin be activated when kicked from a conference?"
+msgid "Send message on Ctrl+Enter and make a new line with Enter."
 msgstr ""
 
 #: gajim/common/config.py:177
-msgid ""
-"Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
-"Client default behaviour)."
+msgid "How many lines to store for Ctrl+KeyUP (previously sent messages)."
 msgstr ""
 
-#: gajim/common/config.py:179
-msgid "How many lines to store for Ctrl+KeyUP."
-msgstr ""
-
-#: gajim/common/config.py:182
+#: gajim/common/config.py:180
 #, python-format
 msgid ""
-"Either custom URL with %%s in it where %%s is the word/phrase or "
-"'WIKTIONARY' which means use Wikitionary."
+"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:185
+#: gajim/common/config.py:183
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr ""
 
-#: gajim/common/config.py:187
+#: gajim/common/config.py:185
 msgid ""
-"When not printing time for every message (print_time==sometimes), print it "
+"When not printing time for every message ('print_time'==sometimes), print it "
 "every x minutes."
 msgstr ""
 
-#: gajim/common/config.py:188
+#: gajim/common/config.py:186
 msgid "Ask before pasting an image."
 msgstr ""
 
-#: gajim/common/config.py:189
+#: gajim/common/config.py:187
 msgid "Ask before closing a group chat tab/window."
 msgstr ""
 
-#: gajim/common/config.py:190
+#: gajim/common/config.py:188
 msgid ""
-"Always ask for confirmation before closing groupchats with any of the JIDs "
-"on this space separated list."
+"Always ask for confirmation before closing group chats with any of the XMPP "
+"Addresses on this list (space separated)."
 msgstr ""
 
-#: gajim/common/config.py:191
+#: gajim/common/config.py:189
 msgid ""
-"Never ask for confirmation before closing groupchats with any of the JIDs on "
-"this space separated list."
+"Never ask for confirmation before closing group chats with any of the XMPP "
+"Addresses on this list (space separated)."
 msgstr ""
 
-#: gajim/common/config.py:192
+#: gajim/common/config.py:190
 msgid ""
-"Ask before closing tabbed chat window if there are controls that can lose "
-"data (chat, private chat, groupchat that will not be minimized)"
+"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:195
+#: gajim/common/config.py:193
 msgid ""
-"Comma separated list of sent hosts, in addition of local interfaces, for "
-"File Transfer in case of address translation/port forwarding."
+"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:196
+#: gajim/common/config.py:194
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr ""
 
-#: gajim/common/config.py:198
+#: gajim/common/config.py:196
 msgid "Notify of events in the notification area."
 msgstr ""
 
-#: gajim/common/config.py:199
+#: gajim/common/config.py:197
 msgid ""
-"If False, Gajim will display a static event icon instead of the blinking "
-"status icon in the notification area when notifying on event."
+"If disabled, Gajim will display a static event icon instead of the blinking "
+"status icon in the notification area when notifying about an event."
 msgstr ""
 
-#: gajim/common/config.py:205
+#: gajim/common/config.py:203
 msgid "Show tab when only one conversation?"
 msgstr ""
 
-#: gajim/common/config.py:206
+#: gajim/common/config.py:204
 msgid "Show tabbed notebook border in chat windows?"
 msgstr ""
 
-#: gajim/common/config.py:207
+#: gajim/common/config.py:205
 msgid "Show close button in tab?"
 msgstr ""
 
-#: gajim/common/config.py:220
+#: gajim/common/config.py:218
 msgid "Preview new messages in notification popup?"
 msgstr ""
 
-#: gajim/common/config.py:223
+#: gajim/common/config.py:221
 msgid ""
-"A semicolon-separated list of words that will be highlighted in group chats."
+"A list of words (semicolon separated) that will be highlighted in group "
+"chats."
 msgstr ""
 
-#: gajim/common/config.py:224
+#: gajim/common/config.py:222
 msgid ""
-"If true, quits Gajim when X button of Window Manager is clicked. This "
-"setting is taken into account only if notification icon is used."
+"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:225
+#: gajim/common/config.py:223
 msgid ""
-"If true, Gajim hides the Roster window on pressing the X button instead of "
-"minimizing into the Dock."
+"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:226
+#: gajim/common/config.py:224
 msgid ""
-"If true, Gajim will display an icon on each tab containing unread messages. "
-"Depending on the theme, this icon may be animated."
+"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:227
+#: gajim/common/config.py:225
 msgid ""
-"If true, Gajim will display the status message, if not empty, for every "
-"contact under the contact name in roster window."
+"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:233
-msgid "Define the position of the avatar in roster. Can be left or right"
+#: gajim/common/config.py:231
+msgid ""
+"Define the position of avatars in the contact list. Can be 'left' or 'right'."
 msgstr ""
 
-#: gajim/common/config.py:234
+#: gajim/common/config.py:232
 msgid ""
-"If False, Gajim will no longer print status line in chats when a contact "
-"changes their status and/or their status message."
+"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:235
+#: gajim/common/config.py:233
 #, fuzzy
 msgid ""
 "Default Setting: Show a status message for every join or leave in a group "
-"chat"
+"chat."
 msgstr "Mostra els canvis d'estat"
 
-#: gajim/common/config.py:236
+#: gajim/common/config.py:234
+#, fuzzy
 msgid ""
-"Default Setting: Show a status message for all status (away, dnd, etc.) "
-"changes of users in a group chat"
-msgstr ""
+"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:238
-msgid "Log XHTML messages instead of plain text messages."
+#: gajim/common/config.py:236
+msgid "Store XHTML messages in chat history instead of plain text messages."
 msgstr ""
 
-#: gajim/common/config.py:239
+#: gajim/common/config.py:237
 msgid "Don't show avatar for the transport itself."
 msgstr ""
 
-#: gajim/common/config.py:240
-msgid "Don't show roster in the system taskbar."
+#: gajim/common/config.py:238
+msgid "Don't show contact list window in the system taskbar."
 msgstr ""
 
-#: gajim/common/config.py:241
+#: gajim/common/config.py:239
 msgid ""
-"If true, make the window flash (the default behaviour in most Window "
-"Managers) when holding pending events."
+"If enabled, Gajim makes the window flash (the default behaviour in most "
+"Window Managers) when holding pending events."
 msgstr ""
 
-#: gajim/common/config.py:245
+#: gajim/common/config.py:243
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
 "'always_with_roster' - Like 'always' but the messages are in a single window "
-"along with the roster.\n"
+"along with the contact list.\n"
 "'never' - All messages get their own window.\n"
 "'peracct' - Messages for each account are sent to a specific window.\n"
-"'pertype' - Each message type (e.g. chats vs. groupchats) is sent to a "
+"'pertype' - Each message type (e.g. chats vs. group chats) is sent to a "
 "specific window."
 msgstr ""
 
-#: gajim/common/config.py:246
+#: gajim/common/config.py:244
 msgid ""
-"Show roster on startup.\n"
-"'always' - Always show roster.\n"
-"'never' - Never show roster.\n"
-"'last_state' - Restore the last state roster."
+"Show contact list window on startup.\n"
+"'always' - Always show contact list window.\n"
+"'never' - Never show contact list window.\n"
+"'last_state' - Restore last state of the contact list window."
+msgstr ""
+
+#: gajim/common/config.py:245
+msgid "If enabled, Gajim displays the avatar in the chat window."
+msgstr ""
+
+#: gajim/common/config.py:246
+msgid "If enabled, pressing Esc closes a tab/window."
 msgstr ""
 
 #: gajim/common/config.py:247
-msgid "If False, you will no longer see the avatar in the chat window."
+msgid "Hides the banner in a group chat window."
 msgstr ""
 
 #: gajim/common/config.py:248
-msgid "If true, pressing the escape key closes a tab/window."
+msgid "Hides the banner in a 1:1 chat window."
 msgstr ""
 
 #: gajim/common/config.py:249
-msgid "Hides the banner in a group chat window"
+msgid "Hides the group chat participants list in a group chat window."
 msgstr ""
 
 #: gajim/common/config.py:250
-msgid "Hides the banner in two persons chat window"
+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:251
-msgid "Hides the group chat occupants list in group chat window."
+msgid "Indentation when using merge consecutive nickname."
 msgstr ""
 
 #: gajim/common/config.py:252
 msgid ""
-"In a chat, show the nickname at the beginning of a line only when it's not "
-"the same person talking than in previous message."
+"Ctrl+Tab switches to the next composing tab when there are no tabs with "
+"messages pending."
 msgstr ""
 
 #: gajim/common/config.py:253
-msgid "Indentation when using merge consecutive nickname."
+msgid ""
+"Show a confirmation dialog to create metacontacts? Empty string means never "
+"show the dialog."
 msgstr ""
 
 #: gajim/common/config.py:254
-msgid "Ctrl-Tab go to next composing tab when none is unread."
+msgid ""
+"Show a confirmation dialog to block a contact? Empty string means never show "
+"the dialog."
 msgstr ""
 
 #: gajim/common/config.py:255
 msgid ""
-"Show the confirm metacontacts creation dialog or not? Empty string means "
-"never show the dialog."
+"Show a confirmation dialog for a custom status? Empty string means never "
+"show the dialog."
 msgstr ""
 
 #: gajim/common/config.py:256
 msgid ""
-"Show the confirm block contact dialog or not? Empty string means never show "
-"the dialog."
+"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:257
 msgid ""
-"Show the confirm custom status dialog or not? Empty string means never show "
-"the dialog."
+"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:258
 msgid ""
-"If true, you will be able to set a negative priority to your account in "
-"account modification window. BE CAREFUL, when you are logged in with a "
-"negative priority, you will NOT receive any message from your server."
+"Can be empty, 'chat' or 'normal'. If not empty, all incoming messages are "
+"treated as if they were of this type."
 msgstr ""
 
 #: gajim/common/config.py:259
 msgid ""
-"If true, Gajim will show number of online and total contacts in account and "
-"group rows."
+"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:260
-msgid ""
-"Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
-"as if they were of this type"
+msgid "Time of inactivity needed before the change status window closes down."
 msgstr ""
 
 #: gajim/common/config.py:261
 msgid ""
-"If true, Gajim will scroll and select the contact who sent you the last "
-"message, if chat window is not already opened."
+"Maximum number of lines that are printed in conversations. Oldest lines are "
+"cleared."
 msgstr ""
 
 #: gajim/common/config.py:262
-msgid "Time of inactivity needed before the change status window closes down."
+msgid ""
+"If enabled, notification windows from notification-daemon will be attached "
+"to the notification area icon."
 msgstr ""
 
 #: gajim/common/config.py:263
-msgid ""
-"Maximum number of lines that are printed in conversations. Oldest lines are "
-"cleared."
+msgid "Choose interval between 2 checks of idleness."
 msgstr ""
 
 #: gajim/common/config.py:264
 msgid ""
-"If true, notification windows from notification-daemon will be attached to "
-"notification icon."
+"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:265
-msgid "Choose interval between 2 checks of idleness."
+msgid ""
+"If enabled, completion in group chats will be like a shell auto-completion."
 msgstr ""
 
-#: gajim/common/config.py:266
-msgid ""
-"Valid uri schemes. Only schemes in this list will be accepted as \"real\" "
-"uri. (mailto and xmpp are handled separately)"
+#: gajim/common/config.py:270
+msgid "Optionally fix Jingle output video framerate. Example: 10/1 or 25/2."
 msgstr ""
 
-#: gajim/common/config.py:267
-msgid "If true, completion in groupchats will be like a shell auto-completion"
+#: gajim/common/config.py:271
+msgid "Optionally resize Jingle output video. Example: 320x240."
 msgstr ""
 
 #: gajim/common/config.py:272
-msgid "Optionally fix jingle output video framerate. Example: 10/1 or 25/2"
+msgid "If enabled, you will see your webcam's video stream as well."
 msgstr ""
 
-#: gajim/common/config.py:273
-msgid "Optionally resize jingle output video. Example: 320x240"
+#: gajim/common/config.py:275
+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:274
-msgid "If true, You will also see your webcam"
+#: gajim/common/config.py:276
+msgid "STUN server to use when using Jingle"
 msgstr ""
 
 #: gajim/common/config.py:277
 msgid ""
-"If true, Gajim will try to use a STUN server when using Jingle. The one in "
-"\"stun_server\" option, or the one given by the XMPP server."
+"If enabled, Gajim will show affiliation of group chat participants by adding "
+"a colored square to the status icon."
 msgstr ""
 
 #: gajim/common/config.py:278
-msgid "STUN server to use when using Jingle"
+msgid ""
+"Proxy used for all outgoing connections if the account does not have a "
+"specific proxy configured."
 msgstr ""
 
 #: gajim/common/config.py:279
-msgid ""
-"If true, Gajim will show affiliation of groupchat occupants by adding a "
-"colored square to the status icon"
+msgid "If enabled, Gajim will ignore incoming attention requests ('wizz')."
 msgstr ""
 
 #: gajim/common/config.py:280
 msgid ""
-"Proxy used for all outgoing connections if the account does not have a "
-"specific proxy configured"
+"If enabled, Gajim will reopen chat windows that were opened last time Gajim "
+"was closed."
 msgstr ""
 
 #: gajim/common/config.py:281
-msgid "If true, Gajim will ignore incoming attention requests (\"wizz\")."
+msgid ""
+"If enabled, Gajim will display an icon to show that sent messages have been "
+"received by your contact."
 msgstr ""
 
 #: gajim/common/config.py:282
-msgid ""
-"If enabled, Gajim will reopen chat windows that were opened last time Gajim "
-"was closed."
+msgid "Show a mini avatar in chat window tabs and as the window's icon."
 msgstr ""
 
 #: gajim/common/config.py:283
 msgid ""
-"If enabled, Gajim will show an icon to show that sent message has been "
-"received by your contact"
+"If enabled, Gajim will use the System's Keyring to store account passwords."
 msgstr ""
 
 #: gajim/common/config.py:284
-msgid "Show a mini avatar in chat window tabs and in window icon"
+msgid "If enabled, Gajim will execute XEP-0146 Commands."
 msgstr ""
 
 #: gajim/common/config.py:285
-msgid "If true, Gajim will use the Systems Keyring to store account passwords."
+msgid "2: System, 1: Enabled, 0: Disabled"
 msgstr ""
 
 #: gajim/common/config.py:286
-msgid "If true, Gajim will execute XEP-0146 Commands."
+msgid "Options in days which can be chosen in the sync threshold menu"
 msgstr ""
 
 #: gajim/common/config.py:287
-msgid "2: System, 1: Enabled, 0: Disabled"
+msgid ""
+"Maximum history in days we request from a public group chat archive. 0: As "
+"much as possible."
 msgstr ""
 
 #: gajim/common/config.py:288
-msgid "Options in days which can be chosen in the sync threshold menu"
+msgid ""
+"Maximum history in days we request from a private group chat archive. 0: As "
+"much as possible."
 msgstr ""
 
 #: gajim/common/config.py:289
 msgid ""
-"Maximum history in days we request from a public room archive. 0: As much as "
-"possible"
+"If enabled, Gajim shows the group chat subject in the chat window when "
+"joining."
 msgstr ""
 
 #: gajim/common/config.py:290
 msgid ""
-"Maximum history in days we request from a private room archive. 0: As much "
-"as possible"
+"If enabled, the contact row is colored according to the current chat state "
+"of the contact."
 msgstr ""
 
 #: gajim/common/config.py:291
-msgid "If the room subject is shown in chat on join"
+msgid ""
+"If enabled, the tab is colored according to the current chat state of the "
+"contact."
 msgstr ""
 
 #: gajim/common/config.py:292
 msgid ""
-"If the contact row is colored according to the current chatstate of the "
-"contact"
+"Shows a text in the banner that describes the current chat state of the "
+"contact."
 msgstr ""
 
 #: gajim/common/config.py:293
-msgid "If the tab is colored according to the current chatstate of the contact"
-msgstr ""
-
-#: gajim/common/config.py:294
-msgid ""
-"Shows a text in the banner that describes the current chatstate of the "
-"contact"
-msgstr ""
-
-#: gajim/common/config.py:295 gajim/common/config.py:424
 msgid ""
 "Chat state notifications that are sent to contacts. Possible values: all, "
 "composing_only, disabled"
 msgstr ""
 
-#: gajim/common/config.py:296 gajim/common/config.py:438
+#: gajim/common/config.py:294
 msgid ""
 "Chat state notifications that are sent to the group chat. Possible values: "
-"all, composing_only, disabled"
+"'all', 'composing_only', 'disabled'"
 msgstr ""
 
-#: gajim/common/config.py:312
-msgid ""
-"Priority will change automatically according to your status. Priorities are "
-"defined in autopriority_* options."
+#: gajim/common/config.py:297
+msgid "API Preferences. Possible values: 'http', 'iq'"
 msgstr ""
 
-#: gajim/common/config.py:320
+#: gajim/common/config.py:313
+#, fuzzy
 msgid ""
-"Status used to autoconnect as. Can be online, chat, away, xa, dnd, "
-"invisible. NOTE: this option is used only if restore_last_status is disabled"
-msgstr ""
+"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:321
-msgid "If enabled, restore the last status that was used."
+msgid ""
+"Status to be used automatically when connecting. Can be 'online', 'chat', "
+"'away', 'xa', 'dnd' or 'invisible'. NOTE: This option is used only if "
+"'restore_last_status' is disabled."
 msgstr ""
 
 #: gajim/common/config.py:322
-msgid ""
-"If true, Contacts requesting authorization will be automatically accepted."
+msgid "If enabled, the last status will be restored."
 msgstr ""
 
 #: gajim/common/config.py:323
 msgid ""
-"If False, this account will be disabled and will not appear in roster window."
+"If enabled, Contacts requesting authorization will be accepted automatically."
 msgstr ""
 
-#: gajim/common/config.py:327
-msgid "Allow plaintext connections"
+#: gajim/common/config.py:324
+msgid ""
+"If disabled, this account will be disabled and will not appear in the "
+"contact list window."
 msgstr ""
 
-#: gajim/common/config.py:330
-msgid ""
-"List (space separated) of authentication mechanisms to try. Can contain "
-"ANONYMOUS, EXTERNAL, GSSAPI, SCRAM-SHA-1-PLUS, SCRAM-SHA-1, DIGEST-MD5, "
-"PLAIN, X-MESSENGER-OAUTH2 or XEP-0078"
+#: gajim/common/config.py:328
+msgid "Allow plaintext connections."
 msgstr ""
 
 #: gajim/common/config.py:331
 msgid ""
-"Show a warning dialog before sending password on an plaintext connection. "
-"Can be 'warn', 'connect', 'disconnect'"
+"List of authentication mechanisms to try (space separated). Can contain "
+"'ANONYMOUS', 'EXTERNAL', 'GSSAPI', 'SCRAM-SHA-1-PLUS', 'SCRAM-SHA-1', "
+"'DIGEST-MD5', 'PLAIN', 'X-MESSENGER-OAUTH2' or 'XEP-0078'."
 msgstr ""
 
 #: gajim/common/config.py:332
-msgid "Show a warning dialog before using standard SSL library."
+msgid ""
+"Show a warning dialog before sending password on an plaintext connection. "
+"Can be 'warn', 'connect' or 'disconnect'."
 msgstr ""
 
 #: gajim/common/config.py:333
-msgid ""
-"Show a warning dialog before sending PLAIN password over a plain connection."
+msgid "Show a warning dialog before using standard SSL library."
 msgstr ""
 
 #: gajim/common/config.py:334
-msgid "Space separated list of ssl errors to ignore."
+msgid ""
+"Show a warning dialog before sending PLAIN password over a plain connection."
 msgstr ""
 
-#: gajim/common/config.py:340
-msgid ""
-"Space separated list of JIDs for which you do not want to store logs. You "
-"can also add account name to log nothing for this account."
+#: gajim/common/config.py:335
+msgid "List of SSL errors to ignore (space separated)."
 msgstr ""
 
 #: gajim/common/config.py:341
 msgid ""
-"Space separated list of JIDs for which you accept to not log conversations "
-"if he does not want to."
+"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:343
-msgid "Whitespace sent after inactivity"
+#: gajim/common/config.py:342
+msgid ""
+"List of XMPP Addresses (space separated) for which you accept to not store "
+"chat history if your contact does not want to."
 msgstr ""
 
 #: gajim/common/config.py:344
-msgid "XMPP ping sent after inactivity"
+msgid "If enabled, a whitespace is sent after inactivity (keep alive)."
 msgstr ""
 
-#: gajim/common/config.py:348
-msgid ""
-"How many seconds to wait for the answer of ping alive packet before trying "
-"to reconnect?"
+#: gajim/common/config.py:345
+msgid "If enabled, an XMPP ping is sent after inactivity (ping alive)."
 msgstr ""
 
-#: gajim/common/config.py:352
-msgid "Jabberd2 workaround"
+#: gajim/common/config.py:349
+msgid ""
+"How many seconds to wait for the answer of a ping alive packet before trying "
+"to reconnect."
 msgstr ""
 
-#: gajim/common/config.py:355
-msgid ""
-"If checked, Gajim will use your IP and proxies defined in "
-"file_transfer_proxies option for file transfer."
+#: gajim/common/config.py:353
+msgid "Jabberd2 workaround."
 msgstr ""
 
 #: gajim/common/config.py:356
 msgid ""
-"If true, Gajim will test file transfer proxies on startup to be sure it "
-"works. Openfire's proxies are known to fail this test even if they work."
+"If enabled, Gajim will use your IP and proxies defined in "
+"'file_transfer_proxies' option for file transfers."
 msgstr ""
 
-#: gajim/common/config.py:369
-msgid "Answer to receipt requests"
+#: gajim/common/config.py:357
+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:370
-msgid "Sent receipt requests"
+msgid "If enabled, Gajim will answer to message receipt requests."
 msgstr ""
 
-#: gajim/common/config.py:379
-msgid ""
-"Allow Gajim to send information about the operating system you are running."
+#: gajim/common/config.py:371
+msgid "If enabled, Gajim will send message receipt requests."
 msgstr ""
 
 #: gajim/common/config.py:380
-msgid "Allow Gajim to send your local time."
+msgid ""
+"Allow Gajim to send information about the operating system you are running."
 msgstr ""
 
-#: gajim/common/config.py:383
-msgid "Message that is sent to contacts you want to add"
+#: gajim/common/config.py:381
+msgid "Allow Gajim to send your local time."
 msgstr ""
 
 #: gajim/common/config.py:384
-msgid ""
-"If enabled, Gajim will send your local IPs so your contact can connect to "
-"your machine to transfer files."
+msgid "Message that is sent to contacts you want to add."
 msgstr ""
 
 #: gajim/common/config.py:385
 msgid ""
-"Space separated list of JIDs for which chat window will be re-opened on next "
-"startup."
+"If enabled, Gajim will send your local IP so your contact can connect to "
+"your machine for file transfers."
 msgstr ""
 
-#: gajim/common/config.py:387
-msgid "HTTP Upload: Enable HTTPS Verification"
+#: gajim/common/config.py:386
+msgid ""
+"List of XMPP Addresses (space separated) for which the chat window will be "
+"re-opened on next startup."
 msgstr ""
 
 #: gajim/common/config.py:388
-msgid ""
-"Preferred file transfer mechanism for file drag&drop on chat window. Can be "
-"'httpupload' (default) or 'jingle'"
+msgid "HTTP File Upload: Enable HTTPS Verification."
 msgstr ""
 
 #: gajim/common/config.py:389
-msgid "Allow cert verification with POSH"
+msgid ""
+"Preferred file transfer mechanism for file drag&drop on a chat window. Can "
+"be 'httpupload' (default) or 'jingle'."
 msgstr ""
 
-#: gajim/common/config.py:423 gajim/common/config.py:430
-msgid "Language for which misspelled words will be checked"
+#: gajim/common/config.py:390
+msgid "Allow certificate verification with POSH."
 msgstr ""
 
-#: gajim/common/config.py:427
-msgid "The currently active encryption for that contact"
+#: gajim/common/config.py:425
+msgid ""
+"Chat state notifications that are sent to contacts. Possible values: 'all', "
+"'composing_only', 'disabled'"
 msgstr ""
 
-#: gajim/common/config.py:431
-msgid ""
-"How many lines to request from server when entering a groupchat. -1 means no "
-"limit, -2 means global value"
+#: gajim/common/config.py:428
+msgid "The currently active encryption for that contact."
 msgstr ""
 
 #: gajim/common/config.py:432
 msgid ""
-"Minutes of backlog to request when entering a groupchat. -1 means no limit, "
-"-2 means global value"
+"If enabled, a notification is created for every message in this group chat."
 msgstr ""
 
 #: gajim/common/config.py:433
-msgid "State whether a notification is created for every message in this room"
-msgstr ""
-
-#: gajim/common/config.py:434
+#, fuzzy
 msgid ""
-"Show a status message for all status (away, dnd, etc.) changes of users in a "
-"group chat"
-msgstr ""
+"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:435
+#: gajim/common/config.py:434
 #, fuzzy
-msgid "Show a status message for every join or leave in a group chat"
+msgid "Show a status message for every join or leave in a group chat."
 msgstr "Mostra els canvis d'estat"
 
+#: gajim/common/config.py:435
+msgid ""
+"If enabled, the group chat is minimized into the contact list when joining "
+"automatically."
+msgstr ""
+
 #: gajim/common/config.py:436
-msgid "If the group chat is minimized into the roster on autojoin"
+msgid ""
+"If enabled, the group chat is minimized into the contact list when closing "
+"it."
 msgstr ""
 
 #: gajim/common/config.py:437
-msgid "If the group chat is minimized into the roster on close"
+msgid ""
+"Chat state notifications that are sent to the group chat. Possible values: "
+"'all', 'composing_only' or 'disabled'."
 msgstr ""
 
-#: gajim/common/config.py:441
+#: gajim/common/config.py:440
 msgid ""
-"State whether plugins should be activated on startup (this is saved on Gajim "
-"exit). This option SHOULD NOT be used to (de)activate plug-ins. Use GUI "
-"instead."
+"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:446 gajim/common/const.py:281
+#: gajim/common/config.py:445 gajim/common/const.py:315
 msgid "Sleeping"
 msgstr ""
 
-#: gajim/common/config.py:447
+#: gajim/common/config.py:446
 msgid "Back soon"
 msgstr ""
 
-#: gajim/common/config.py:447
+#: gajim/common/config.py:446
 msgid "Back in some minutes."
 msgstr ""
 
-#: gajim/common/config.py:448 gajim/common/const.py:247
+#: gajim/common/config.py:447 gajim/common/const.py:281
 msgid "Eating"
 msgstr ""
 
-#: gajim/common/config.py:448
-msgid "I'm eating, so leave me a message."
+#: gajim/common/config.py:447
+msgid "I'm eating."
 msgstr ""
 
-#: gajim/common/config.py:449
+#: gajim/common/config.py:448
 msgid "Movie"
 msgstr ""
 
-#: gajim/common/config.py:449
+#: gajim/common/config.py:448
 msgid "I'm watching a movie."
 msgstr ""
 
-#: gajim/common/config.py:450 gajim/common/const.py:314
+#: gajim/common/config.py:449 gajim/common/const.py:348
 msgid "Working"
 msgstr ""
 
-#: gajim/common/config.py:450
+#: gajim/common/config.py:449
 msgid "I'm working."
 msgstr ""
 
-#: gajim/common/config.py:451
+#: gajim/common/config.py:450
 msgid "Phone"
 msgstr ""
 
-#: gajim/common/config.py:451
+#: gajim/common/config.py:450
 msgid "I'm on the phone."
 msgstr ""
 
-#: gajim/common/config.py:452
+#: gajim/common/config.py:451
 msgid "Out"
 msgstr ""
 
-#: gajim/common/config.py:452
+#: gajim/common/config.py:451
 msgid "I'm out enjoying life."
 msgstr ""
 
-#: gajim/common/config.py:463
+#: gajim/common/config.py:462
 msgid "I'm available."
 msgstr ""
 
-#: gajim/common/config.py:464
+#: gajim/common/config.py:463
 msgid "I'm free for chat."
 msgstr ""
 
-#: gajim/common/config.py:465 gajim/gtk/accounts.py:134
+#: gajim/common/config.py:464 gajim/gtk/accounts.py:133
 msgid "Be right back."
 msgstr ""
 
-#: gajim/common/config.py:466
+#: gajim/common/config.py:465
 msgid "I'm not available."
 msgstr ""
 
-#: gajim/common/config.py:467
+#: gajim/common/config.py:466
 msgid "Do not disturb."
 msgstr ""
 
-#: gajim/common/config.py:468 gajim/common/config.py:469
+#: gajim/common/config.py:467 gajim/common/config.py:468
 msgid "Bye!"
 msgstr ""
 
-#: gajim/common/config.py:480
+#: gajim/common/config.py:479
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
-"muc_highlight_words, or when a group chat message contains your nickname."
+"'muc_highlight_words' your nickname is mentioned."
 msgstr ""
 
-#: gajim/common/config.py:481
-msgid "Sound to play when any MUC message arrives."
+#: gajim/common/config.py:480
+msgid "Sound to play when any group chat message arrives."
 msgstr ""
 
-#: gajim/common/config.py:485
+#: gajim/common/config.py:484
 msgid "Tor"
 msgstr ""
 
@@ -3741,871 +3731,963 @@ msgstr ""
 msgid "Error: cannot open %s for reading"
 msgstr ""
 
-#: gajim/common/const.py:214
-msgid "This message was encrypted with OTR and could not be decrypted."
+#: gajim/common/const.py:216
+msgid "?Group chat name:Team"
 msgstr ""
 
 #: gajim/common/const.py:217
+msgid "?Group chat description:Project discussion"
+msgstr ""
+
+#: gajim/common/const.py:218
+#, fuzzy
+msgid "?Group chat address:team"
+msgstr "Grups de xat"
+
+#: gajim/common/const.py:219
+#, fuzzy
+msgid "?Group chat name:Family"
+msgstr "Grups de xat"
+
+#: gajim/common/const.py:220
+msgid "?Group chat description:Spring gathering"
+msgstr ""
+
+#: gajim/common/const.py:221
+msgid "?Group chat address:family"
+msgstr ""
+
+#: gajim/common/const.py:222
+#, fuzzy
+msgid "?Group chat name:Vacation"
+msgstr "Configuració de Sala"
+
+#: gajim/common/const.py:223
+msgid "?Group chat description:Trip planning"
+msgstr ""
+
+#: gajim/common/const.py:224
+#, fuzzy
+msgid "?Group chat address:vacation"
+msgstr "Configuració de Sala"
+
+#: gajim/common/const.py:225
+#, fuzzy
+msgid "?Group chat name:Repairs"
+msgstr "Grups de xat"
+
+#: gajim/common/const.py:226
+msgid "?Group chat description:Local help group"
+msgstr ""
+
+#: gajim/common/const.py:227
+#, fuzzy
+msgid "?Group chat address:repairs"
+msgstr "Grups de xat"
+
+#: gajim/common/const.py:228
+#, fuzzy
+msgid "?Group chat name:News"
+msgstr "Grups de xat"
+
+#: gajim/common/const.py:229
+msgid "?Group chat description:Local news and reports"
+msgstr ""
+
+#: gajim/common/const.py:230
+#, fuzzy
+msgid "?Group chat address:news"
+msgstr "Grups de xat"
+
+#: gajim/common/const.py:235
+msgid "Remote server not found"
+msgstr ""
+
+#: gajim/common/const.py:236
+msgid "Remote server timeout"
+msgstr ""
+
+#: gajim/common/const.py:237 gajim/common/const.py:238
+#: gajim/common/const.py:239
+msgid "Address does not belong to a group chat server"
+msgstr ""
+
+#: gajim/common/const.py:240
+#, fuzzy
+msgid "Group chat already exists"
+msgstr "Grups de xat"
+
+#: gajim/common/const.py:241
+#, fuzzy
+msgid "Group chat does not exist"
+msgstr "Grups de xat"
+
+#: gajim/common/const.py:247
+msgid "This message was encrypted with OTR and could not be decrypted."
+msgstr ""
+
+#: gajim/common/const.py:250
 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:221
+#: gajim/common/const.py:254
 msgid ""
-"This message was encrypted with OpenPGP for XMPP and could not be decrypted."
+"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:224
+#: gajim/common/const.py:258
 #, python-format
 msgid "This message was encrypted with %s and could not be decrypted."
 msgstr ""
 
-#: gajim/common/const.py:231
+#: gajim/common/const.py:265
 msgid "Doing Chores"
 msgstr ""
 
-#: gajim/common/const.py:232
+#: gajim/common/const.py:266
 msgid "Buying Groceries"
 msgstr ""
 
-#: gajim/common/const.py:233
+#: gajim/common/const.py:267
 msgid "Cleaning"
 msgstr ""
 
-#: gajim/common/const.py:234
+#: gajim/common/const.py:268
 msgid "Cooking"
 msgstr ""
 
-#: gajim/common/const.py:235
+#: gajim/common/const.py:269
 msgid "Doing Maintenance"
 msgstr ""
 
-#: gajim/common/const.py:236
+#: gajim/common/const.py:270
 msgid "Doing the Dishes"
 msgstr ""
 
-#: gajim/common/const.py:237
+#: gajim/common/const.py:271
 msgid "Doing the Laundry"
 msgstr ""
 
-#: gajim/common/const.py:238
+#: gajim/common/const.py:272
 msgid "Gardening"
 msgstr ""
 
-#: gajim/common/const.py:239
+#: gajim/common/const.py:273
 msgid "Running an Errand"
 msgstr ""
 
-#: gajim/common/const.py:240
+#: gajim/common/const.py:274
 msgid "Walking the Dog"
 msgstr ""
 
-#: gajim/common/const.py:242
+#: gajim/common/const.py:276
 msgid "Drinking"
 msgstr ""
 
-#: gajim/common/const.py:243
+#: gajim/common/const.py:277
 msgid "Having a Beer"
 msgstr ""
 
-#: gajim/common/const.py:244
+#: gajim/common/const.py:278
 msgid "Having Coffee"
 msgstr ""
 
-#: gajim/common/const.py:245
+#: gajim/common/const.py:279
 msgid "Having Tea"
 msgstr ""
 
-#: gajim/common/const.py:248
+#: gajim/common/const.py:282
 msgid "Having a Snack"
 msgstr ""
 
-#: gajim/common/const.py:249
+#: gajim/common/const.py:283
 msgid "Having Breakfast"
 msgstr ""
 
-#: gajim/common/const.py:250
+#: gajim/common/const.py:284
 msgid "Having Dinner"
 msgstr ""
 
-#: gajim/common/const.py:251
+#: gajim/common/const.py:285
 msgid "Having Lunch"
 msgstr ""
 
-#: gajim/common/const.py:253
+#: gajim/common/const.py:287
 msgid "Exercising"
 msgstr ""
 
-#: gajim/common/const.py:254 gajim/common/const.py:305
+#: gajim/common/const.py:288 gajim/common/const.py:339
 msgid "Cycling"
 msgstr ""
 
-#: gajim/common/const.py:255
+#: gajim/common/const.py:289
 msgid "Dancing"
 msgstr ""
 
-#: gajim/common/const.py:256
+#: gajim/common/const.py:290
 msgid "Hiking"
 msgstr ""
 
-#: gajim/common/const.py:257
+#: gajim/common/const.py:291
 msgid "Jogging"
 msgstr ""
 
-#: gajim/common/const.py:258
+#: gajim/common/const.py:292
 msgid "Playing Sports"
 msgstr ""
 
-#: gajim/common/const.py:259
+#: gajim/common/const.py:293
 msgid "Running"
 msgstr ""
 
-#: gajim/common/const.py:260
+#: gajim/common/const.py:294
 msgid "Skiing"
 msgstr ""
 
-#: gajim/common/const.py:261
+#: gajim/common/const.py:295
 msgid "Swimming"
 msgstr ""
 
-#: gajim/common/const.py:262
+#: gajim/common/const.py:296
 msgid "Working out"
 msgstr ""
 
-#: gajim/common/const.py:264
+#: gajim/common/const.py:298
 msgid "Grooming"
 msgstr ""
 
-#: gajim/common/const.py:265
+#: gajim/common/const.py:299
 msgid "At the Spa"
 msgstr ""
 
-#: gajim/common/const.py:266
+#: gajim/common/const.py:300
 msgid "Brushing Teeth"
 msgstr ""
 
-#: gajim/common/const.py:267
+#: gajim/common/const.py:301
 msgid "Getting a Haircut"
 msgstr ""
 
-#: gajim/common/const.py:268
+#: gajim/common/const.py:302
 msgid "Shaving"
 msgstr ""
 
-#: gajim/common/const.py:269
+#: gajim/common/const.py:303
 msgid "Taking a Bath"
 msgstr ""
 
-#: gajim/common/const.py:270
+#: gajim/common/const.py:304
 msgid "Taking a Shower"
 msgstr ""
 
-#: gajim/common/const.py:272
+#: gajim/common/const.py:306
 msgid "Having an Appointment"
 msgstr ""
 
-#: gajim/common/const.py:274
+#: gajim/common/const.py:308
 msgid "Inactive"
 msgstr "Inactiva"
 
-#: gajim/common/const.py:275
+#: gajim/common/const.py:309
 msgid "Day Off"
 msgstr ""
 
-#: gajim/common/const.py:276
+#: gajim/common/const.py:310
 msgid "Hanging out"
 msgstr ""
 
-#: gajim/common/const.py:277
+#: gajim/common/const.py:311
 msgid "Hiding"
 msgstr ""
 
-#: gajim/common/const.py:278
+#: gajim/common/const.py:312
 msgid "On Vacation"
 msgstr ""
 
-#: gajim/common/const.py:279
+#: gajim/common/const.py:313
 msgid "Praying"
 msgstr ""
 
-#: gajim/common/const.py:280
+#: gajim/common/const.py:314
 msgid "Scheduled Holiday"
 msgstr ""
 
-#: gajim/common/const.py:282
+#: gajim/common/const.py:316
 msgid "Thinking"
 msgstr ""
 
-#: gajim/common/const.py:284
+#: gajim/common/const.py:318
 msgid "Relaxing"
 msgstr ""
 
-#: gajim/common/const.py:285
+#: gajim/common/const.py:319
 msgid "Fishing"
 msgstr ""
 
-#: gajim/common/const.py:286
+#: gajim/common/const.py:320
 msgid "Gaming"
 msgstr ""
 
-#: gajim/common/const.py:287
+#: gajim/common/const.py:321
 msgid "Going out"
 msgstr ""
 
-#: gajim/common/const.py:288
+#: gajim/common/const.py:322
 msgid "Partying"
 msgstr ""
 
-#: gajim/common/const.py:289
+#: gajim/common/const.py:323
 msgid "Reading"
 msgstr ""
 
-#: gajim/common/const.py:290
+#: gajim/common/const.py:324
 msgid "Rehearsing"
 msgstr ""
 
-#: gajim/common/const.py:291
+#: gajim/common/const.py:325
 msgid "Shopping"
 msgstr ""
 
-#: gajim/common/const.py:292
+#: gajim/common/const.py:326
 msgid "Smoking"
 msgstr ""
 
-#: gajim/common/const.py:293
+#: gajim/common/const.py:327
 msgid "Socializing"
 msgstr ""
 
-#: gajim/common/const.py:294
+#: gajim/common/const.py:328
 msgid "Sunbathing"
 msgstr ""
 
-#: gajim/common/const.py:295
+#: gajim/common/const.py:329
 msgid "Watching TV"
 msgstr ""
 
-#: gajim/common/const.py:296
+#: gajim/common/const.py:330
 msgid "Watching a Movie"
 msgstr ""
 
-#: gajim/common/const.py:298
+#: gajim/common/const.py:332
 msgid "Talking"
 msgstr ""
 
-#: gajim/common/const.py:299
+#: gajim/common/const.py:333
 msgid "In Real Life"
 msgstr ""
 
-#: gajim/common/const.py:300
+#: gajim/common/const.py:334
 msgid "On the Phone"
 msgstr ""
 
-#: gajim/common/const.py:301
+#: gajim/common/const.py:335
 msgid "On Video Phone"
 msgstr ""
 
-#: gajim/common/const.py:303
+#: gajim/common/const.py:337
 msgid "Traveling"
 msgstr ""
 
-#: gajim/common/const.py:304
+#: gajim/common/const.py:338
 msgid "Commuting"
 msgstr ""
 
-#: gajim/common/const.py:306
+#: gajim/common/const.py:340
 msgid "Driving"
 msgstr ""
 
-#: gajim/common/const.py:307
+#: gajim/common/const.py:341
 msgid "In a Car"
 msgstr ""
 
-#: gajim/common/const.py:308
+#: gajim/common/const.py:342
 msgid "On a Bus"
 msgstr ""
 
-#: gajim/common/const.py:309
+#: gajim/common/const.py:343
 msgid "On a Plane"
 msgstr ""
 
-#: gajim/common/const.py:310
+#: gajim/common/const.py:344
 msgid "On a Train"
 msgstr ""
 
-#: gajim/common/const.py:311
+#: gajim/common/const.py:345
 msgid "On a Trip"
 msgstr ""
 
-#: gajim/common/const.py:312
+#: gajim/common/const.py:346
 msgid "Walking"
 msgstr ""
 
-#: gajim/common/const.py:315
+#: gajim/common/const.py:349
 msgid "Coding"
 msgstr ""
 
-#: gajim/common/const.py:316
+#: gajim/common/const.py:350
 msgid "In a Meeting"
 msgstr ""
 
-#: gajim/common/const.py:317
+#: gajim/common/const.py:351
 msgid "Studying"
 msgstr ""
 
-#: gajim/common/const.py:318
+#: gajim/common/const.py:352
 msgid "Writing"
 msgstr ""
 
-#: gajim/common/const.py:321
+#: gajim/common/const.py:355
 msgid "Afraid"
 msgstr ""
 
-#: gajim/common/const.py:322
+#: gajim/common/const.py:356
 msgid "Amazed"
 msgstr ""
 
-#: gajim/common/const.py:323
+#: gajim/common/const.py:357
 msgid "Amorous"
 msgstr ""
 
-#: gajim/common/const.py:324
+#: gajim/common/const.py:358
 msgid "Angry"
 msgstr ""
 
-#: gajim/common/const.py:325
+#: gajim/common/const.py:359
 msgid "Annoyed"
 msgstr ""
 
-#: gajim/common/const.py:326
+#: gajim/common/const.py:360
 msgid "Anxious"
 msgstr ""
 
-#: gajim/common/const.py:327
+#: gajim/common/const.py:361
 msgid "Aroused"
 msgstr ""
 
-#: gajim/common/const.py:328
+#: gajim/common/const.py:362
 msgid "Ashamed"
 msgstr ""
 
-#: gajim/common/const.py:329
+#: gajim/common/const.py:363
 msgid "Bored"
 msgstr ""
 
-#: gajim/common/const.py:330
+#: gajim/common/const.py:364
 msgid "Brave"
 msgstr ""
 
-#: gajim/common/const.py:331
+#: gajim/common/const.py:365
 msgid "Calm"
 msgstr ""
 
-#: gajim/common/const.py:332
+#: gajim/common/const.py:366
 msgid "Cautious"
 msgstr ""
 
-#: gajim/common/const.py:333
+#: gajim/common/const.py:367
 msgid "Cold"
 msgstr ""
 
-#: gajim/common/const.py:334
+#: gajim/common/const.py:368
 msgid "Confident"
 msgstr ""
 
-#: gajim/common/const.py:335
+#: gajim/common/const.py:369
 msgid "Confused"
 msgstr ""
 
-#: gajim/common/const.py:336
+#: gajim/common/const.py:370
 msgid "Contemplative"
 msgstr ""
 
-#: gajim/common/const.py:337
+#: gajim/common/const.py:371
 msgid "Contented"
 msgstr ""
 
-#: gajim/common/const.py:338
+#: gajim/common/const.py:372
 msgid "Cranky"
 msgstr ""
 
-#: gajim/common/const.py:339
+#: gajim/common/const.py:373
 msgid "Crazy"
 msgstr ""
 
-#: gajim/common/const.py:340
+#: gajim/common/const.py:374
 msgid "Creative"
 msgstr ""
 
-#: gajim/common/const.py:341
+#: gajim/common/const.py:375
 msgid "Curious"
 msgstr ""
 
-#: gajim/common/const.py:342
+#: gajim/common/const.py:376
 msgid "Dejected"
 msgstr ""
 
-#: gajim/common/const.py:343
+#: gajim/common/const.py:377
 msgid "Depressed"
 msgstr ""
 
-#: gajim/common/const.py:344
+#: gajim/common/const.py:378
 msgid "Disappointed"
 msgstr ""
 
-#: gajim/common/const.py:345
+#: gajim/common/const.py:379
 msgid "Disgusted"
 msgstr ""
 
-#: gajim/common/const.py:346
+#: gajim/common/const.py:380
 msgid "Dismayed"
 msgstr ""
 
-#: gajim/common/const.py:347
+#: gajim/common/const.py:381
 msgid "Distracted"
 msgstr ""
 
-#: gajim/common/const.py:348
+#: gajim/common/const.py:382
 msgid "Embarrassed"
 msgstr ""
 
-#: gajim/common/const.py:349
+#: gajim/common/const.py:383
 msgid "Envious"
 msgstr ""
 
-#: gajim/common/const.py:350
+#: gajim/common/const.py:384
 msgid "Excited"
 msgstr ""
 
-#: gajim/common/const.py:351
+#: gajim/common/const.py:385
 msgid "Flirtatious"
 msgstr ""
 
-#: gajim/common/const.py:352
+#: gajim/common/const.py:386
 msgid "Frustrated"
 msgstr ""
 
-#: gajim/common/const.py:353
+#: gajim/common/const.py:387
 msgid "Grateful"
 msgstr ""
 
-#: gajim/common/const.py:354
+#: gajim/common/const.py:388
 msgid "Grieving"
 msgstr ""
 
-#: gajim/common/const.py:355
+#: gajim/common/const.py:389
 msgid "Grumpy"
 msgstr ""
 
-#: gajim/common/const.py:356
+#: gajim/common/const.py:390
 msgid "Guilty"
 msgstr ""
 
-#: gajim/common/const.py:357
+#: gajim/common/const.py:391
 msgid "Happy"
 msgstr ""
 
-#: gajim/common/const.py:358
+#: gajim/common/const.py:392
 msgid "Hopeful"
 msgstr ""
 
-#: gajim/common/const.py:359
+#: gajim/common/const.py:393
 msgid "Hot"
 msgstr ""
 
-#: gajim/common/const.py:360
+#: gajim/common/const.py:394
 msgid "Humbled"
 msgstr ""
 
-#: gajim/common/const.py:361
+#: gajim/common/const.py:395
 msgid "Humiliated"
 msgstr ""
 
-#: gajim/common/const.py:362
+#: gajim/common/const.py:396
 msgid "Hungry"
 msgstr ""
 
-#: gajim/common/const.py:363
+#: gajim/common/const.py:397
 msgid "Hurt"
 msgstr ""
 
-#: gajim/common/const.py:364
+#: gajim/common/const.py:398
 msgid "Impressed"
 msgstr ""
 
-#: gajim/common/const.py:365
+#: gajim/common/const.py:399
 msgid "In Awe"
 msgstr ""
 
-#: gajim/common/const.py:366
+#: gajim/common/const.py:400
 msgid "In Love"
 msgstr ""
 
-#: gajim/common/const.py:367
+#: gajim/common/const.py:401
 msgid "Indignant"
 msgstr ""
 
-#: gajim/common/const.py:368
+#: gajim/common/const.py:402
 msgid "Interested"
 msgstr ""
 
-#: gajim/common/const.py:369
+#: gajim/common/const.py:403
 msgid "Intoxicated"
 msgstr ""
 
-#: gajim/common/const.py:370
+#: gajim/common/const.py:404
 msgid "Invincible"
 msgstr ""
 
-#: gajim/common/const.py:371
+#: gajim/common/const.py:405
 msgid "Jealous"
 msgstr ""
 
-#: gajim/common/const.py:372
+#: gajim/common/const.py:406
 msgid "Lonely"
 msgstr ""
 
-#: gajim/common/const.py:373
+#: gajim/common/const.py:407
 msgid "Lost"
 msgstr ""
 
-#: gajim/common/const.py:374
+#: gajim/common/const.py:408
 msgid "Lucky"
 msgstr ""
 
-#: gajim/common/const.py:375
+#: gajim/common/const.py:409
 msgid "Mean"
 msgstr ""
 
-#: gajim/common/const.py:376
+#: gajim/common/const.py:410
 msgid "Moody"
 msgstr ""
 
-#: gajim/common/const.py:377
+#: gajim/common/const.py:411
 msgid "Nervous"
 msgstr ""
 
-#: gajim/common/const.py:378
+#: gajim/common/const.py:412
 msgid "Neutral"
 msgstr ""
 
-#: gajim/common/const.py:379
+#: gajim/common/const.py:413
 msgid "Offended"
 msgstr ""
 
-#: gajim/common/const.py:380
+#: gajim/common/const.py:414
 msgid "Outraged"
 msgstr ""
 
-#: gajim/common/const.py:381
+#: gajim/common/const.py:415
 msgid "Playful"
 msgstr ""
 
-#: gajim/common/const.py:382
+#: gajim/common/const.py:416
 msgid "Proud"
 msgstr ""
 
-#: gajim/common/const.py:383
+#: gajim/common/const.py:417
 msgid "Relaxed"
 msgstr ""
 
-#: gajim/common/const.py:384
+#: gajim/common/const.py:418
 msgid "Relieved"
 msgstr ""
 
-#: gajim/common/const.py:385
+#: gajim/common/const.py:419
 msgid "Remorseful"
 msgstr ""
 
-#: gajim/common/const.py:386
+#: gajim/common/const.py:420
 msgid "Restless"
 msgstr ""
 
-#: gajim/common/const.py:387
+#: gajim/common/const.py:421
 msgid "Sad"
 msgstr ""
 
-#: gajim/common/const.py:388
+#: gajim/common/const.py:422
 msgid "Sarcastic"
 msgstr ""
 
-#: gajim/common/const.py:389
+#: gajim/common/const.py:423
 msgid "Satisfied"
 msgstr ""
 
-#: gajim/common/const.py:390
+#: gajim/common/const.py:424
 msgid "Serious"
 msgstr ""
 
-#: gajim/common/const.py:391
+#: gajim/common/const.py:425
 msgid "Shocked"
 msgstr ""
 
-#: gajim/common/const.py:392
+#: gajim/common/const.py:426
 msgid "Shy"
 msgstr ""
 
-#: gajim/common/const.py:393
+#: gajim/common/const.py:427
 msgid "Sick"
 msgstr ""
 
-#: gajim/common/const.py:394
+#: gajim/common/const.py:428
 msgid "Sleepy"
 msgstr ""
 
-#: gajim/common/const.py:395
+#: gajim/common/const.py:429
 msgid "Spontaneous"
 msgstr ""
 
-#: gajim/common/const.py:396
+#: gajim/common/const.py:430
 msgid "Stressed"
 msgstr ""
 
-#: gajim/common/const.py:397
+#: gajim/common/const.py:431
 msgid "Strong"
 msgstr ""
 
-#: gajim/common/const.py:398
+#: gajim/common/const.py:432
 msgid "Surprised"
 msgstr ""
 
-#: gajim/common/const.py:399
+#: gajim/common/const.py:433
 msgid "Thankful"
 msgstr ""
 
-#: gajim/common/const.py:400
+#: gajim/common/const.py:434
 msgid "Thirsty"
 msgstr ""
 
-#: gajim/common/const.py:401
+#: gajim/common/const.py:435
 msgid "Tired"
 msgstr ""
 
-#: gajim/common/const.py:402
+#: gajim/common/const.py:436
 msgid "Undefined"
 msgstr ""
 
-#: gajim/common/const.py:403
+#: gajim/common/const.py:437
 msgid "Weak"
 msgstr ""
 
-#: gajim/common/const.py:404
+#: gajim/common/const.py:438
 msgid "Worried"
 msgstr ""
 
-#: gajim/common/const.py:408
+#: gajim/common/const.py:442
 msgid "accuracy"
 msgstr ""
 
-#: gajim/common/const.py:409
+#: gajim/common/const.py:443
 msgid "alt"
 msgstr ""
 
-#: gajim/common/const.py:410
+#: gajim/common/const.py:444
 msgid "area"
 msgstr ""
 
-#: gajim/common/const.py:411
+#: gajim/common/const.py:445
 msgid "bearing"
 msgstr ""
 
-#: gajim/common/const.py:412
+#: gajim/common/const.py:446
 msgid "building"
 msgstr ""
 
-#: gajim/common/const.py:413
+#: gajim/common/const.py:447
 msgid "country"
 msgstr ""
 
-#: gajim/common/const.py:414
+#: gajim/common/const.py:448
 msgid "countrycode"
 msgstr ""
 
-#: gajim/common/const.py:415
+#: gajim/common/const.py:449
 msgid "datum"
 msgstr ""
 
-#: gajim/common/const.py:416
+#: gajim/common/const.py:450
 msgid "description"
 msgstr ""
 
-#: gajim/common/const.py:417
+#: gajim/common/const.py:451
 msgid "error"
 msgstr ""
 
-#: gajim/common/const.py:418
+#: gajim/common/const.py:452
 msgid "floor"
 msgstr ""
 
-#: gajim/common/const.py:419
+#: gajim/common/const.py:453
 msgid "lat"
 msgstr ""
 
-#: gajim/common/const.py:420
+#: gajim/common/const.py:454
 msgid "locality"
 msgstr ""
 
-#: gajim/common/const.py:421
+#: gajim/common/const.py:455
 msgid "lon"
 msgstr ""
 
-#: gajim/common/const.py:422
+#: gajim/common/const.py:456
 msgid "postalcode"
 msgstr ""
 
-#: gajim/common/const.py:423
+#: gajim/common/const.py:457
 msgid "region"
 msgstr ""
 
-#: gajim/common/const.py:424
+#: gajim/common/const.py:458
 msgid "room"
 msgstr ""
 
-#: gajim/common/const.py:425
+#: gajim/common/const.py:459
 msgid "speed"
 msgstr ""
 
-#: gajim/common/const.py:426
+#: gajim/common/const.py:460
 msgid "street"
 msgstr ""
 
-#: gajim/common/const.py:427
+#: gajim/common/const.py:461
 msgid "text"
 msgstr ""
 
-#: gajim/common/const.py:428
+#: gajim/common/const.py:462
 msgid "timestamp"
 msgstr ""
 
-#: gajim/common/const.py:429
+#: gajim/common/const.py:463
 msgid "URI"
 msgstr ""
 
-#: gajim/common/const.py:434
+#: gajim/common/const.py:468
 msgid "Unable to get issuer certificate"
 msgstr ""
 
-#: gajim/common/const.py:435
+#: gajim/common/const.py:469
 msgid "Unable to get certificate CRL"
 msgstr ""
 
-#: gajim/common/const.py:436
+#: gajim/common/const.py:470
 msgid "Unable to decrypt certificate's signature"
 msgstr ""
 
-#: gajim/common/const.py:437
+#: gajim/common/const.py:471
 msgid "Unable to decrypt CRL's signature"
 msgstr ""
 
-#: gajim/common/const.py:438
+#: gajim/common/const.py:472
 msgid "Unable to decode issuer public key"
 msgstr ""
 
-#: gajim/common/const.py:439
+#: gajim/common/const.py:473
 msgid "Certificate signature failure"
 msgstr ""
 
-#: gajim/common/const.py:440
+#: gajim/common/const.py:474
 msgid "CRL signature failure"
 msgstr ""
 
-#: gajim/common/const.py:441
+#: gajim/common/const.py:475
 msgid "Certificate is not yet valid"
 msgstr ""
 
-#: gajim/common/const.py:442
+#: gajim/common/const.py:476
 msgid "Certificate has expired"
 msgstr ""
 
-#: gajim/common/const.py:443
+#: gajim/common/const.py:477
 msgid "CRL is not yet valid"
 msgstr ""
 
-#: gajim/common/const.py:444
+#: gajim/common/const.py:478
 msgid "CRL has expired"
 msgstr ""
 
-#: gajim/common/const.py:445
+#: gajim/common/const.py:479
 msgid "Format error in certificate's notBefore field"
 msgstr ""
 
-#: gajim/common/const.py:446
+#: gajim/common/const.py:480
 msgid "Format error in certificate's notAfter field"
 msgstr ""
 
-#: gajim/common/const.py:447
+#: gajim/common/const.py:481
 msgid "Format error in CRL's lastUpdate field"
 msgstr ""
 
-#: gajim/common/const.py:448
+#: gajim/common/const.py:482
 msgid "Format error in CRL's nextUpdate field"
 msgstr ""
 
-#: gajim/common/const.py:449
+#: gajim/common/const.py:483
 msgid "Out of memory"
 msgstr ""
 
-#: gajim/common/const.py:450
+#: gajim/common/const.py:484
 msgid "Self signed certificate"
 msgstr ""
 
-#: gajim/common/const.py:451
+#: gajim/common/const.py:485
 msgid "Self signed certificate in certificate chain"
 msgstr ""
 
-#: gajim/common/const.py:452
+#: gajim/common/const.py:486
 msgid "Unable to get local issuer certificate"
 msgstr ""
 
-#: gajim/common/const.py:453
+#: gajim/common/const.py:487
 msgid "Unable to verify the first certificate"
 msgstr ""
 
-#: gajim/common/const.py:454
+#: gajim/common/const.py:488
 msgid "Certificate chain too long"
 msgstr ""
 
-#: gajim/common/const.py:455
+#: gajim/common/const.py:489
 msgid "Certificate revoked"
 msgstr ""
 
-#: gajim/common/const.py:456
+#: gajim/common/const.py:490
 msgid "Invalid CA certificate"
 msgstr ""
 
-#: gajim/common/const.py:457
+#: gajim/common/const.py:491
 msgid "Path length constraint exceeded"
 msgstr ""
 
-#: gajim/common/const.py:458
+#: gajim/common/const.py:492
 msgid "Unsupported certificate purpose"
 msgstr ""
 
-#: gajim/common/const.py:459
+#: gajim/common/const.py:493
 msgid "Certificate not trusted"
 msgstr ""
 
-#: gajim/common/const.py:460
+#: gajim/common/const.py:494
 msgid "Certificate rejected"
 msgstr ""
 
-#: gajim/common/const.py:461
+#: gajim/common/const.py:495
 msgid "Subject issuer mismatch"
 msgstr ""
 
-#: gajim/common/const.py:462
+#: gajim/common/const.py:496
 msgid "Authority and subject key identifier mismatch"
 msgstr ""
 
-#: gajim/common/const.py:463
+#: gajim/common/const.py:497
 msgid "Authority and issuer serial number mismatch"
 msgstr ""
 
-#: gajim/common/const.py:464
+#: gajim/common/const.py:498
 msgid "Key usage does not include certificate signing"
 msgstr ""
 
-#: gajim/common/const.py:465
+#: gajim/common/const.py:499
 msgid "Application verification failure"
 msgstr ""
 
@@ -4768,257 +4850,257 @@ msgstr ""
 msgid "video output"
 msgstr ""
 
-#: gajim/common/helpers.py:210
+#: gajim/common/helpers.py:216
 msgid "Server must be between 1 and 1023 bytes"
 msgstr ""
 
-#: gajim/common/helpers.py:214
+#: gajim/common/helpers.py:220
 msgid "Invalid character in hostname."
 msgstr ""
 
-#: gajim/common/helpers.py:216
+#: gajim/common/helpers.py:222
 msgid "Server address required."
 msgstr ""
 
-#: gajim/common/helpers.py:220
+#: gajim/common/helpers.py:226
 msgid "Username must be between 1 and 1023 bytes"
 msgstr ""
 
-#: gajim/common/helpers.py:224
+#: gajim/common/helpers.py:230
 msgid "Invalid character in username."
 msgstr ""
 
-#: gajim/common/helpers.py:230
+#: gajim/common/helpers.py:236
 msgid "Resource must be between 1 and 1023 bytes"
 msgstr ""
 
-#: gajim/common/helpers.py:234
+#: gajim/common/helpers.py:240
 msgid "Invalid character in resource."
 msgstr ""
 
-#: gajim/common/helpers.py:275
+#: gajim/common/helpers.py:281
 msgid "_Busy"
 msgstr "Ocupat"
 
-#: gajim/common/helpers.py:277 gajim/gtk/tooltips.py:647
+#: gajim/common/helpers.py:283 gajim/gtk/tooltips.py:647
 msgid "Busy"
 msgstr "Ocupat"
 
-#: gajim/common/helpers.py:280
+#: gajim/common/helpers.py:286
 msgid "_Not Available"
 msgstr "_No Disponible"
 
-#: gajim/common/helpers.py:282 gajim/gtk/tooltips.py:649
+#: gajim/common/helpers.py:288 gajim/gtk/tooltips.py:649
 msgid "Not Available"
 msgstr ""
 
-#: gajim/common/helpers.py:285
+#: gajim/common/helpers.py:291
 msgid "_Free for Chat"
 msgstr ""
 
-#: gajim/common/helpers.py:287 gajim/gtk/tooltips.py:643
+#: gajim/common/helpers.py:293 gajim/gtk/tooltips.py:643
 msgid "Free for Chat"
 msgstr "Disponible per parlar"
 
-#: gajim/common/helpers.py:290
+#: gajim/common/helpers.py:296
 msgid "?user status:_Available"
 msgstr "?user status:_Disponible"
 
-#: gajim/common/helpers.py:292 gajim/gtk/tooltips.py:641
+#: gajim/common/helpers.py:298 gajim/gtk/tooltips.py:641
 #, fuzzy
 msgid "?user status:Available"
 msgstr "?user status:_Disponible"
 
-#: gajim/common/helpers.py:294
+#: gajim/common/helpers.py:300
 msgid "Connecting"
 msgstr ""
 
-#: gajim/common/helpers.py:297 gajim/data/gui/preferences_window.ui:1251
+#: gajim/common/helpers.py:303 gajim/data/gui/preferences_window.ui:1251
 msgid "A_way"
 msgstr ""
 
-#: gajim/common/helpers.py:299 gajim/common/modules/adhoc_commands.py:120
-#: gajim/command_system/implementation/standard.py:139
+#: gajim/common/helpers.py:305 gajim/common/modules/adhoc_commands.py:120
+#: gajim/command_system/implementation/standard.py:141
 #: gajim/gtk/tooltips.py:645
 msgid "Away"
 msgstr "Absent"
 
-#: gajim/common/helpers.py:302
+#: gajim/common/helpers.py:308
 msgid "_Offline"
 msgstr "Desconnectat"
 
-#: gajim/common/helpers.py:304 gajim/gtk/tooltips.py:651
+#: gajim/common/helpers.py:310 gajim/gtk/tooltips.py:651
 msgid "Offline"
 msgstr "Desconnectat"
 
-#: gajim/common/helpers.py:307
+#: gajim/common/helpers.py:313
 msgid "_Invisible"
 msgstr "_Invisible"
 
-#: gajim/common/helpers.py:313
+#: gajim/common/helpers.py:319
 msgid "?contact has status:Unknown"
 msgstr ""
 
-#: gajim/common/helpers.py:315
+#: gajim/common/helpers.py:321
 msgid "?contact has status:Has errors"
 msgstr ""
 
-#: gajim/common/helpers.py:330
+#: gajim/common/helpers.py:336
 msgid "?Subscription we already have:None"
 msgstr ""
 
-#: gajim/common/helpers.py:332
+#: gajim/common/helpers.py:338
 msgid "To"
 msgstr ""
 
-#: gajim/common/helpers.py:334 gajim/data/gui/groups_post_window.ui:33
+#: gajim/common/helpers.py:340 gajim/data/gui/groups_post_window.ui:33
 msgid "From"
 msgstr ""
 
-#: gajim/common/helpers.py:336
+#: gajim/common/helpers.py:342
 msgid "Both"
 msgstr ""
 
-#: gajim/common/helpers.py:338 gajim/gtk/server_info.py:151
+#: gajim/common/helpers.py:344 gajim/gtk/server_info.py:151
 msgid "Unknown"
 msgstr ""
 
-#: gajim/common/helpers.py:344
+#: gajim/common/helpers.py:350
 msgid "?Ask (for Subscription):None"
 msgstr ""
 
-#: gajim/common/helpers.py:346
+#: gajim/common/helpers.py:352
 msgid "Subscribe"
 msgstr ""
 
-#: gajim/common/helpers.py:355
+#: gajim/common/helpers.py:361
 msgid "?Group Chat Contact Role:None"
 msgstr ""
 
-#: gajim/common/helpers.py:358
+#: gajim/common/helpers.py:364
 msgid "Moderators"
 msgstr "Moderadors"
 
-#: gajim/common/helpers.py:360
+#: gajim/common/helpers.py:366
 msgid "Moderator"
 msgstr ""
 
-#: gajim/common/helpers.py:363
+#: gajim/common/helpers.py:369 gajim/data/gui/groupchat_info_scrolled.ui:243
 msgid "Participants"
 msgstr ""
 
-#: gajim/common/helpers.py:365
+#: gajim/common/helpers.py:371
 msgid "Participant"
 msgstr ""
 
-#: gajim/common/helpers.py:368
+#: gajim/common/helpers.py:374
 msgid "Visitors"
 msgstr ""
 
-#: gajim/common/helpers.py:370
+#: gajim/common/helpers.py:376
 msgid "Visitor"
 msgstr ""
 
-#: gajim/common/helpers.py:376 gajim/gtk/tooltips.py:253
+#: gajim/common/helpers.py:382 gajim/gtk/tooltips.py:253
 msgid "?Group Chat Contact Affiliation:None"
 msgstr ""
 
-#: gajim/common/helpers.py:378 gajim/data/gui/groupchat_config.ui:32
+#: gajim/common/helpers.py:384 gajim/data/gui/groupchat_config.ui:32
 #: gajim/gtk/tooltips.py:259
 msgid "Owner"
 msgstr ""
 
-#: gajim/common/helpers.py:380 gajim/gtk/tooltips.py:257
+#: gajim/common/helpers.py:386 gajim/gtk/tooltips.py:257
 msgid "Administrator"
 msgstr ""
 
-#: gajim/common/helpers.py:382 gajim/data/gui/groupchat_config.ui:40
+#: gajim/common/helpers.py:388 gajim/data/gui/groupchat_config.ui:40
 #: gajim/gtk/tooltips.py:255 gajim/gtk/groupchat_config.py:105
 msgid "Member"
 msgstr ""
 
-#: gajim/common/helpers.py:421
+#: gajim/common/helpers.py:427
 msgid "is paying attention to the conversation"
 msgstr ""
 
-#: gajim/common/helpers.py:423
+#: gajim/common/helpers.py:429
 msgid "is doing something else"
 msgstr ""
 
-#: gajim/common/helpers.py:425
+#: gajim/common/helpers.py:431
 msgid "is composing a message…"
 msgstr ""
 
-#: gajim/common/helpers.py:428
+#: gajim/common/helpers.py:434
 msgid "paused composing a message"
 msgstr ""
 
-#: gajim/common/helpers.py:430
+#: gajim/common/helpers.py:436
 msgid "has closed the chat window or tab"
 msgstr ""
 
-#: gajim/common/helpers.py:936 gajim/common/helpers.py:943
+#: gajim/common/helpers.py:942 gajim/common/helpers.py:949
 #, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
 msgstr[0] ""
 msgstr[1] ""
 
-#: gajim/common/helpers.py:950
-#, python-format
-msgid "from room %s"
-msgstr ""
+#: gajim/common/helpers.py:956
+#, fuzzy, python-format
+msgid "from group chat %s"
+msgstr "Afegeix aquesta sala a les adreces d'interès"
 
-#: gajim/common/helpers.py:953 gajim/common/helpers.py:970
+#: gajim/common/helpers.py:959 gajim/common/helpers.py:976
 #, python-format
 msgid "from user %s"
 msgstr ""
 
-#: gajim/common/helpers.py:955
+#: gajim/common/helpers.py:961
 #, python-format
 msgid "from %s"
 msgstr ""
 
-#: gajim/common/helpers.py:962 gajim/common/helpers.py:968
+#: gajim/common/helpers.py:968 gajim/common/helpers.py:974
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
 msgstr[0] ""
 msgstr[1] ""
 
-#: gajim/common/helpers.py:986 gajim/common/helpers.py:998
+#: gajim/common/helpers.py:992 gajim/common/helpers.py:1004
 #: gajim/data/gui/roster_window.ui:85 data/org.gajim.Gajim.desktop.in:4
 #: data/org.gajim.Gajim.appdata.xml.in:9
 msgid "Gajim"
 msgstr "Gajim"
 
-#: gajim/common/helpers.py:1000
+#: gajim/common/helpers.py:1006
 #, python-format
 msgid "Gajim - %s"
 msgstr ""
 
-#: gajim/common/helpers.py:1109 gajim/data/gui/add_new_contact_window.ui:25
+#: gajim/common/helpers.py:1115 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:1111
+#: gajim/common/helpers.py:1117
 msgid "Hello, I am $name."
 msgstr ""
 
-#: gajim/common/helpers.py:1215 gajim/common/helpers.py:1224
-#: gajim/common/helpers.py:1282
+#: gajim/common/helpers.py:1221 gajim/common/helpers.py:1230
+#: gajim/common/helpers.py:1288
 msgid "Timeout loading image"
 msgstr ""
 
-#: gajim/common/helpers.py:1234 gajim/common/helpers.py:1280
+#: gajim/common/helpers.py:1240 gajim/common/helpers.py:1286
 msgid "Image is too big"
 msgstr ""
 
-#: gajim/common/helpers.py:1245
+#: gajim/common/helpers.py:1251
 msgid "PyCURL is not installed"
 msgstr ""
 
-#: gajim/common/helpers.py:1284
+#: gajim/common/helpers.py:1290
 msgid "Error loading image"
 msgstr ""
 
@@ -5187,8 +5269,9 @@ msgstr ""
 
 #: gajim/common/modules/adhoc_commands.py:202
 #: gajim/common/modules/adhoc_commands.py:239
-msgid "Leave Groupchats"
-msgstr ""
+#, fuzzy
+msgid "Leave Group Chats"
+msgstr "Grups de xat"
 
 #: gajim/common/modules/adhoc_commands.py:228
 #, python-format
@@ -5196,15 +5279,15 @@ msgid "%(nickname)s on %(room_jid)s"
 msgstr ""
 
 #: gajim/common/modules/adhoc_commands.py:232
-msgid "You have not joined a groupchat."
+msgid "You have not joined a group chat."
 msgstr ""
 
 #: gajim/common/modules/adhoc_commands.py:240
-msgid "Choose the groupchats you want to leave"
+msgid "Choose the group chats you want to leave"
 msgstr ""
 
 #: gajim/common/modules/adhoc_commands.py:289
-msgid "You left the following groupchats:"
+msgid "You left the following group chats:"
 msgstr ""
 
 #: gajim/common/modules/roster_item_exchange.py:102
@@ -5220,7 +5303,7 @@ msgstr ""
 msgid "Blocked Contacts"
 msgstr "Contactes blocats"
 
-#: gajim/data/gui/destroy_muc_dialog.ui:79 gajim/gtk/dialogs.py:736
+#: gajim/data/gui/destroy_muc_dialog.ui:79 gajim/gtk/dialogs.py:563
 msgid "Destroy this group chat permanently?"
 msgstr ""
 
@@ -5228,7 +5311,7 @@ msgstr ""
 msgid "Reason..."
 msgstr ""
 
-#: gajim/data/gui/destroy_muc_dialog.ui:124 gajim/gtk/dialogs.py:738
+#: gajim/data/gui/destroy_muc_dialog.ui:124 gajim/gtk/dialogs.py:565
 msgid "Where participants should go (optional)"
 msgstr ""
 
@@ -5240,34 +5323,6 @@ msgstr ""
 msgid "_Reason and alternate venue (optional)"
 msgstr ""
 
-#: gajim/data/gui/advanced_configuration_window.ui:7
-#: gajim/data/gui/preferences_window.ui:2723
-#, fuzzy
-msgid "Advanced Configuration Editor (ACE)"
-msgstr "Editor de Configuració Avançada"
-
-#: gajim/data/gui/advanced_configuration_window.ui:52
-#, fuzzy
-msgid "You should restart Gajim for some changes to take effect"
-msgstr ""
-"<b>NOTA:</b> Hauries de reiniciar Gajim per a que la configuració tingui "
-"efecte"
-
-#: gajim/data/gui/advanced_configuration_window.ui:84
-#, fuzzy
-msgid "_Filter"
-msgstr "Filtra:"
-
-#: gajim/data/gui/advanced_configuration_window.ui:153
-#: gajim/data/gui/filetransfers_send_file_dialog.ui:15
-#: gajim/gtk/discovery.py:1666
-msgid "Description"
-msgstr ""
-
-#: gajim/data/gui/advanced_configuration_window.ui:197
-msgid "_Reset to default"
-msgstr "_Reinicia a configuració per defecte"
-
 #: gajim/data/gui/join_groupchat_window.ui:56
 #: gajim/data/gui/chat_to_muc_window.ui:67
 #: gajim/data/gui/chat_to_muc_window.ui:78
@@ -5279,9 +5334,8 @@ msgid "Join group chat every time Gajim is started"
 msgstr ""
 
 #: gajim/data/gui/join_groupchat_window.ui:113
-#, fuzzy
-msgid "Auto Join"
-msgstr "Entra automàticament"
+msgid "Join Automatically"
+msgstr ""
 
 #: gajim/data/gui/join_groupchat_window.ui:131
 #: gajim/data/gui/profile_window.ui:233
@@ -5290,10 +5344,11 @@ msgstr "Compte"
 
 #: gajim/data/gui/join_groupchat_window.ui:147
 #, fuzzy
-msgid "Room"
-msgstr "Sala:"
+msgid "Group chat"
+msgstr "Grups de xat"
 
-#: gajim/data/gui/join_groupchat_window.ui:180 gajim/gtk/accounts.py:886
+#: gajim/data/gui/join_groupchat_window.ui:180 gajim/data/gui/bookmarks.ui:158
+#: gajim/gtk/accounts.py:889
 #, fuzzy
 msgid "Password"
 msgstr "Contrasenya:"
@@ -5316,89 +5371,10 @@ msgstr ""
 msgid "Search group chats on selected server"
 msgstr ""
 
-#: gajim/data/gui/join_groupchat_window.ui:437 gajim/gtk/discovery.py:1271
+#: gajim/data/gui/join_groupchat_window.ui:437 gajim/gtk/discovery.py:1270
 msgid "Join"
 msgstr ""
 
-#: gajim/data/gui/manage_proxies_window.ui:12
-msgid "HTTP Connect"
-msgstr "Connecta HTTP"
-
-#: gajim/data/gui/manage_proxies_window.ui:15
-msgid "SOCKS5"
-msgstr "SOCKS5"
-
-#: gajim/data/gui/manage_proxies_window.ui:18
-msgid "BOSH"
-msgstr "BOSH"
-
-#: gajim/data/gui/manage_proxies_window.ui:27
-msgid "Manage Proxy Profiles"
-msgstr "Gestió de perfils de proxy"
-
-#: gajim/data/gui/manage_proxies_window.ui:83
-#, fuzzy
-msgid "Add Proxy"
-msgstr "Prox_y:"
-
-#: gajim/data/gui/manage_proxies_window.ui:97
-#, fuzzy
-msgid "Remove Proxy"
-msgstr "Esborra"
-
-#: gajim/data/gui/manage_proxies_window.ui:141
-#, fuzzy
-msgid "Properties"
-msgstr "<b>Propietats</b>"
-
-#: gajim/data/gui/manage_proxies_window.ui:157
-#, fuzzy
-msgid "_Name"
-msgstr "_Nom:"
-
-#: gajim/data/gui/manage_proxies_window.ui:173
-#, fuzzy
-msgid "_Type"
-msgstr "_Tipus:"
-
-#: gajim/data/gui/manage_proxies_window.ui:236
-#, fuzzy
-msgid "_BOSH URL"
-msgstr "URL BOSH:"
-
-#: gajim/data/gui/manage_proxies_window.ui:261
-msgid "Use HTTP prox_y"
-msgstr "Utilitza un servidor intermediari d'HTTP"
-
-#: gajim/data/gui/manage_proxies_window.ui:280
-#, fuzzy
-msgid "Proxy _Host"
-msgstr "Servidor intermediari:"
-
-#: gajim/data/gui/manage_proxies_window.ui:307
-#, fuzzy
-msgid "Proxy _Port"
-msgstr "Port del servidor intermediari:"
-
-#: gajim/data/gui/manage_proxies_window.ui:334
-#, fuzzy
-msgid "_Username"
-msgstr "_Nom d'usuari:"
-
-#: gajim/data/gui/manage_proxies_window.ui:347
-msgid "Use proxy auth_entication"
-msgstr "Fa ús d'autenticació proxy"
-
-#: gajim/data/gui/manage_proxies_window.ui:377
-#, fuzzy
-msgid "Pass_word"
-msgstr "Contrasenya:"
-
-#: gajim/data/gui/manage_proxies_window.ui:405 gajim/gtk/adhoc.py:321
-#, fuzzy
-msgid "Settings"
-msgstr "Connectors"
-
 #: gajim/data/gui/change_password_dialog.ui:17
 #, fuzzy
 msgid "New Password"
@@ -5429,11 +5405,13 @@ msgid "Status:"
 msgstr ""
 
 #: gajim/data/gui/zeroconf_information_window.ui:89
-msgid "_Log conversation history"
+#, fuzzy
+msgid "_Store conversation history"
 msgstr "Registra _les converses"
 
 #: gajim/data/gui/zeroconf_information_window.ui:215
 #: gajim/data/gui/vcard_information_window.ui:390
+#: gajim/data/gui/groupchat_info_scrolled.ui:166
 msgid "Contact"
 msgstr ""
 
@@ -5446,8 +5424,9 @@ msgid "Last Name:"
 msgstr "Cognom:"
 
 #: gajim/data/gui/zeroconf_information_window.ui:260
-msgid "Jabber ID:"
-msgstr "ID de Jabber:"
+#, fuzzy
+msgid "XMPP Address:"
+msgstr "_Copia adreça JID/Email"
 
 #: gajim/data/gui/zeroconf_information_window.ui:273
 msgid "E-Mail:"
@@ -5467,7 +5446,8 @@ msgid "Send _File"
 msgstr "Envia _Fitxer"
 
 #: gajim/data/gui/gc_occupants_menu.ui:29
-msgid "Occupant Actions"
+#, fuzzy
+msgid "Participant Actions"
 msgstr "Accions Ocupant"
 
 #: gajim/data/gui/gc_occupants_menu.ui:38
@@ -5499,8 +5479,9 @@ msgid "_Ban"
 msgstr "_Bandeja"
 
 #: gajim/data/gui/gc_occupants_menu.ui:124
-msgid "_Add to Roster"
-msgstr "_Afegeix a llista de contactes"
+#, fuzzy
+msgid "_Add to Contact List"
+msgstr "_Afegeix Contacte..."
 
 #: gajim/data/gui/gc_occupants_menu.ui:132
 #, fuzzy
@@ -5536,11 +5517,6 @@ msgstr ""
 msgid "_Status"
 msgstr "Estat"
 
-#: gajim/data/gui/zeroconf_context_menu.ui:26
-#: gajim/data/gui/account_context_menu.ui:79
-msgid "_Modify Account..."
-msgstr "_Modifica Compte..."
-
 #: gajim/data/gui/certificate_dialog.ui:66
 #: gajim/data/gui/certificate_dialog.ui:178
 msgid "Common Name (CN)"
@@ -5622,13 +5598,19 @@ msgstr "Última modificació:"
 msgid "Next entry"
 msgstr "Entrada següent"
 
+#: gajim/data/gui/filetransfers_send_file_dialog.ui:15
+#: gajim/data/gui/advanced_configuration.ui:143
+#: gajim/data/gui/groupchat_info_scrolled.ui:48 gajim/gtk/discovery.py:1663
+msgid "Description"
+msgstr ""
+
 #: gajim/data/gui/filetransfers_send_file_dialog.ui:54
 #, fuzzy
 msgid "_Send Files"
 msgstr "Envia _Fitxer"
 
 #: gajim/data/gui/filetransfers_send_file_dialog.ui:58
-#: gajim/gtk/xml_console.py:90
+#: gajim/gtk/xml_console.py:87
 #, fuzzy
 msgid "Send"
 msgstr "Envia"
@@ -5652,20 +5634,23 @@ msgid "Change _Nickname..."
 msgstr "Canvia _Nick..."
 
 #: gajim/data/gui/gc_control_popup_menu.ui:20
-msgid "_Manage Room"
-msgstr "Gestiona Sala"
+#, fuzzy
+msgid "_Manage Group Chat"
+msgstr "Grups de xat"
 
 #: gajim/data/gui/gc_control_popup_menu.ui:31
 msgid "Change _Subject..."
 msgstr "Canvia Tema..."
 
 #: gajim/data/gui/gc_control_popup_menu.ui:38
-msgid "Configure _Room..."
+#, fuzzy
+msgid "Configure _Group Chat..."
 msgstr "Configura Sala..."
 
 #: gajim/data/gui/gc_control_popup_menu.ui:52
-msgid "_Destroy Room"
-msgstr "_Destrueix Sala"
+#, fuzzy
+msgid "_Destroy Group Chat"
+msgstr "Grups de xat"
 
 #: gajim/data/gui/gc_control_popup_menu.ui:64
 msgid "_Minimize on close"
@@ -5675,7 +5660,7 @@ msgstr "_Minimitza en tancar"
 msgid "_Request Voice"
 msgstr "Sol.licita Veu"
 
-#: gajim/data/gui/gc_control_popup_menu.ui:99 gajim/gtk/discovery.py:1704
+#: gajim/data/gui/gc_control_popup_menu.ui:99
 msgid "_Bookmark"
 msgstr "Adreça d'interès"
 
@@ -5724,13 +5709,6 @@ msgstr "Pàgina d'inici:"
 msgid "E-Mail"
 msgstr "Correu electrònic:"
 
-#: 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/blocking_list.ui:115 gajim/gtk/add_contact.py:30
-#: gajim/gtk/accounts.py:801
-msgid "Jabber ID"
-msgstr "ID de Jabber"
-
 #: gajim/data/gui/profile_window.ui:440
 msgid "Main"
 msgstr ""
@@ -5857,35 +5835,41 @@ msgstr ""
 msgid "About"
 msgstr "Sobre l'aplicació"
 
-#: gajim/data/gui/start_chat_dialog.ui:114 gajim/gtk/discovery.py:1658
-msgid "Users"
-msgstr ""
-
-#: gajim/data/gui/start_chat_dialog.ui:185
+#: gajim/data/gui/start_chat_dialog.ui:53
 #, fuzzy
-msgid "Name:"
-msgstr "_Nom:"
+msgid "Global Group Chat Search"
+msgstr "Uneix-te al xat en grup"
 
-#: gajim/data/gui/start_chat_dialog.ui:197
-msgid "Description:"
-msgstr "Descripció:"
+#: gajim/data/gui/start_chat_dialog.ui:189
+#: gajim/data/gui/start_chat_dialog.ui:229
+#: gajim/data/gui/start_chat_dialog.ui:364
+msgid "_Back"
+msgstr ""
 
-#: gajim/data/gui/start_chat_dialog.ui:209
+#: gajim/data/gui/start_chat_dialog.ui:245
+#: gajim/data/gui/groupchat_control.ui:796
+#: gajim/data/gui/groupchat_control.ui:888 gajim/gtk/discovery.py:1701
+#: gajim/gtk/groupchat_join.py:62
+msgid "_Join"
+msgstr "_Entra-hi"
+
+#: gajim/data/gui/start_chat_dialog.ui:289
 #, fuzzy
-msgid "Address:"
-msgstr "_Copia adreça JID/Email"
+msgid "Select Account"
+msgstr "Fusiona comptes"
 
-#: gajim/data/gui/start_chat_dialog.ui:246
-msgid ""
-"Semi-Anonymous\n"
-"<span size=\"small\">(Only moderators can see your XMPP-Address)</span>"
+#: gajim/data/gui/start_chat_dialog.ui:380
+msgid "_Select"
 msgstr ""
 
 #: gajim/data/gui/filetransfers.ui:21
 msgid "Pa_use/Resume"
 msgstr ""
 
-#: gajim/data/gui/filetransfers.ui:30 gajim/gtk/filechoosers.py:178
+#: gajim/data/gui/filetransfers.ui:30 gajim/data/gui/groupchat_control.ui:575
+#: gajim/data/gui/groupchat_control.ui:667
+#: gajim/data/gui/groupchat_control.ui:779
+#: gajim/data/gui/groupchat_control.ui:871 gajim/gtk/filechoosers.py:178
 msgid "_Cancel"
 msgstr "_Cancel·la"
 
@@ -5930,7 +5914,8 @@ msgstr ""
 "Cancel.la la transferència seleccionada i esborra els fitxers incomplets."
 
 #: gajim/data/gui/filetransfers.ui:207
-msgid "Shows a list of file transfers between you and others"
+#, fuzzy
+msgid "Shows a list of file transfers between you and your contacts"
 msgstr "Mostra una llista de transferències de fitxers entre tu i els altres"
 
 #: gajim/data/gui/groupchat_control.ui:13 gajim/data/gui/chat_control.ui:277
@@ -5950,7 +5935,6 @@ msgid "Strike"
 msgstr "Ratllat"
 
 #: gajim/data/gui/groupchat_control.ui:54 gajim/data/gui/chat_control.ui:318
-#: gajim/gtk/advanced_config.py:86
 msgid "Color"
 msgstr "Color"
 
@@ -5962,16 +5946,44 @@ msgstr "Tipus de lletra"
 msgid "Clear formatting"
 msgstr "Neteja el format"
 
-#: gajim/data/gui/groupchat_control.ui:290 gajim/data/gui/chat_control.ui:880
+#: gajim/data/gui/groupchat_control.ui:291 gajim/data/gui/chat_control.ui:880
 #, fuzzy
 msgid "Choose encryption"
 msgstr "Connexió"
 
-#: gajim/data/gui/groupchat_control.ui:336 gajim/data/gui/chat_control.ui:640
+#: gajim/data/gui/groupchat_control.ui:337 gajim/data/gui/chat_control.ui:640
 #, fuzzy
 msgid "Show a list of emojis (Alt+M)"
 msgstr "Mostra una llista d'emoticones (Alt+M)"
 
+#: gajim/data/gui/groupchat_control.ui:484
+msgid "Joining…"
+msgstr ""
+
+#: gajim/data/gui/groupchat_control.ui:496
+msgid "_Abort"
+msgstr ""
+
+#: gajim/data/gui/groupchat_control.ui:542
+#, fuzzy
+msgid "Enter new nickname"
+msgstr "Sobrenom:"
+
+#: gajim/data/gui/groupchat_control.ui:592
+#: gajim/data/gui/groupchat_control.ui:684
+#, fuzzy
+msgid "Ch_ange"
+msgstr "Canvia _Nick..."
+
+#: gajim/data/gui/groupchat_control.ui:761
+#, fuzzy
+msgid "Enter password"
+msgstr "Desa la contrasenya"
+
+#: gajim/data/gui/groupchat_control.ui:1067
+msgid "_Try again"
+msgstr ""
+
 #: gajim/data/gui/popup_notification_window.ui:42
 msgid "Event Type"
 msgstr "Tipus d'esdeveniment"
@@ -6039,8 +6051,9 @@ msgid "Always"
 msgstr "Sempre"
 
 #: gajim/data/gui/mam_preferences.ui:18
-msgid "Roster"
-msgstr "Llista"
+#, fuzzy
+msgid "Contact List"
+msgstr "El Contacte ha entrat"
 
 #: gajim/data/gui/mam_preferences.ui:22
 #: gajim/data/gui/preferences_window.ui:123
@@ -6063,12 +6076,12 @@ msgid "Add"
 msgstr "Afegeix"
 
 #: gajim/data/gui/mam_preferences.ui:194 gajim/data/gui/groupchat_config.ui:151
-#: gajim/gtk/dialogs.py:63 gajim/gtk/accounts.py:381
+#: gajim/gtk/dialogs.py:62 gajim/gtk/accounts.py:384
 #, fuzzy
 msgid "Remove"
 msgstr "Esborra"
 
-#: gajim/data/gui/vcard_information_window.ui:72 gajim/gtk/accounts.py:753
+#: gajim/data/gui/vcard_information_window.ui:72 gajim/gtk/accounts.py:756
 #, fuzzy
 msgid "Resource"
 msgstr "Recurs:"
@@ -6117,6 +6130,7 @@ msgstr "_Subscripció"
 #: gajim/data/gui/vcard_information_window.ui:974
 #: gajim/data/gui/vcard_information_window.ui:993
 #: gajim/data/gui/vcard_information_window.ui:1427
+#: gajim/data/gui/groupchat_info_scrolled.ui:222
 msgid "button"
 msgstr ""
 
@@ -6145,15 +6159,16 @@ msgid "Notify me about it"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:58
-msgid "Show only in roster"
-msgstr ""
+#, fuzzy
+msgid "Show only in contact list"
+msgstr "Mostra només contactes actius"
 
 #: gajim/data/gui/preferences_window.ui:69
-msgid "Detached roster with detached chats"
+msgid "Detached contact list with detached chats"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:72
-msgid "Detached roster with single chat"
+msgid "Detached contact list with single chat"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:75
@@ -6161,11 +6176,11 @@ msgid "Single window for everything"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:78
-msgid "Detached roster with chat grouped by account"
+msgid "Detached contact list with chat grouped by account"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:81
-msgid "Detached roster with chat grouped by type"
+msgid "Detached contact list with chat grouped by type"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:92
@@ -6212,7 +6227,7 @@ msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:296
 #, fuzzy
-msgid "_Show roster on startup"
+msgid "_Show contact list on startup"
 msgstr "C_onecta al servidor quan s'inicia"
 
 #: gajim/data/gui/preferences_window.ui:311
@@ -6228,12 +6243,12 @@ msgid "_Tabs placement"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:363
-msgid "_Quit Gajim when closing roster window"
+msgid "_Quit Gajim when closing contact list"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:367
 msgid ""
-"If enabled, Gajim will quit when closing the roster window instead of "
+"If enabled, Gajim will quit when closing the contact list window instead of "
 "minimizing to the system's notification area"
 msgstr ""
 
@@ -6242,33 +6257,36 @@ msgid "Behavior of Windows and Tabs"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:423
-msgid "Show a_vatars of contacts in roster"
-msgstr ""
+#, 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
 msgid ""
-"If checked, avatars of contacts will be shown in the roster window and in "
-"group chats"
+"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
-msgid "Show status _messages of contacts in roster"
-msgstr ""
+#, 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
 msgid ""
 "If checked, status messages of contacts will be shown under the contact's "
-"name, in the roster window, and in group chats"
+"name, in the contact list window, and in group chats"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:459
-msgid "Show e_xtra information of contacts in roster (mood, activity, ...)"
+msgid ""
+"Show e_xtra information of contacts in contact list (mood, activity, ...)"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:463
 msgid ""
-"If checked, additional info published by the contact will be shown in "
-"roster. Additional infos (published via PEP) may include e.g. mood, "
+"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 ""
 
@@ -6277,16 +6295,18 @@ msgid "Sort contacts by status"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:494
-msgid "in _roster"
-msgstr ""
+#, fuzzy
+msgid "in _contact list"
+msgstr "Convida _Contactes"
 
 #: gajim/data/gui/preferences_window.ui:511
 msgid "in _group chats"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:540
-msgid "Roster Appearance"
-msgstr ""
+#, fuzzy
+msgid "Contact List Appearance"
+msgstr "_Canvia Missatge d'Estat"
 
 #: gajim/data/gui/preferences_window.ui:585
 msgid "Enable spell _checking"
@@ -6337,7 +6357,7 @@ msgid "Show subject after _joining a group chat"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:660
-msgid "If checked, the room subject will be shown when joining a group chat"
+msgid "If checked, the subject will be shown when joining a group chat"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:682
@@ -6352,13 +6372,13 @@ msgstr ""
 #: gajim/data/gui/preferences_window.ui:701
 msgid ""
 "If join/leave status messages are shown in the group chat. This setting can "
-"be overridden in the groupchat menu."
+"be overridden in the group chat menu."
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:720
 msgid ""
 "The default sync threshold for new public group chats. This setting can be "
-"overridden in the groupchat menu."
+"overridden in the group chat menu."
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:722
@@ -6373,7 +6393,7 @@ msgstr "Mostra els canvis d'estat"
 #: gajim/data/gui/preferences_window.ui:768
 msgid ""
 "If status change messages are shown in the group chat. This setting can be "
-"overridden in the groupchat menu."
+"overridden in the group chat menu."
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:825
@@ -6388,8 +6408,9 @@ msgid ""
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:843
-msgid "Show chatstate in roster"
-msgstr ""
+#, fuzzy
+msgid "Show chatstate in contact list"
+msgstr "Mostra Contactes Actius"
 
 #: gajim/data/gui/preferences_window.ui:847
 msgid ""
@@ -6662,7 +6683,7 @@ msgstr ""
 msgid "Vi_ew own video source"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2281 gajim/gtk/accounts.py:352
+#: gajim/data/gui/preferences_window.ui:2281 gajim/gtk/accounts.py:355
 msgid "Connection"
 msgstr "Connexió"
 
@@ -6715,7 +6736,7 @@ msgid "_Manage..."
 msgstr "Administra..."
 
 #: gajim/data/gui/preferences_window.ui:2616
-msgid "_Log status changes of contacts"
+msgid "_Store status changes of contacts in history"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:2633
@@ -6740,9 +6761,14 @@ msgstr ""
 msgid "_Open..."
 msgstr ""
 
+#: gajim/data/gui/preferences_window.ui:2723 gajim/gtk/advanced_config.py:84
+#, fuzzy
+msgid "Advanced Configuration Editor (ACE)"
+msgstr "Editor de Configuració Avançada"
+
 #: gajim/data/gui/groupchat_config.ui:55
 msgid ""
-"<b>Jabber-ID</b>\n"
+"<b>XMPP Address</b>\n"
 "&lt;user@domain/resource&gt; (only that resource matches)\n"
 "&lt;user@domain&gt; (any resource matches)\n"
 "&lt;domain/resource&gt; (only that resource matches)\n"
@@ -6755,7 +6781,8 @@ msgstr ""
 msgid "Only Admins and Owners can modify the affiliation"
 msgstr ""
 
-#: gajim/data/gui/groupchat_config.ui:270 gajim/plugins/gui.py:312
+#: gajim/data/gui/groupchat_config.ui:270
+#: gajim/data/gui/groupchat_info_scrolled.ui:210 gajim/plugins/gui.py:324
 msgid "Configuration"
 msgstr ""
 
@@ -6786,7 +6813,7 @@ msgid "Start _Chat"
 msgstr "Comença Xat"
 
 #: gajim/data/gui/contact_context_menu.ui:20
-#: gajim/data/gui/systray_context_menu.ui:36
+#: gajim/data/gui/systray_context_menu.ui:29
 msgid "Send Single _Message..."
 msgstr "Envia un _Missatge únic..."
 
@@ -6843,17 +6870,45 @@ msgid "_Ignore"
 msgstr "_Ignora"
 
 #: gajim/data/gui/contact_context_menu.ui:174
-msgid "_Add to Roster..."
-msgstr "Afegeix a la llista de contactes..."
+#, fuzzy
+msgid "_Add to Contact List..."
+msgstr "_Afegeix Contacte..."
+
+#: gajim/data/gui/advanced_configuration.ui:39
+#, fuzzy
+msgid "You should restart Gajim for some changes to take effect"
+msgstr ""
+"<b>NOTA:</b> Hauries de reiniciar Gajim per a que la configuració tingui "
+"efecte"
+
+#: gajim/data/gui/advanced_configuration.ui:71
+#, fuzzy
+msgid "_Filter"
+msgstr "Filtra:"
+
+#: gajim/data/gui/advanced_configuration.ui:88
+msgid "Type to search for values..."
+msgstr ""
+
+#: gajim/data/gui/advanced_configuration.ui:180
+#, fuzzy
+msgid "_Reset Value"
+msgstr "_Reinicia a configuració per defecte"
+
+#: gajim/data/gui/advanced_configuration.ui:185
+#, fuzzy
+msgid "Resets value to default"
+msgstr "_Reinicia a configuració per defecte"
 
 #: gajim/data/gui/account_creation_wizard_window.ui:43
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gaim: Ajuda a Creació de Compte"
 
 #: gajim/data/gui/account_creation_wizard_window.ui:70
+#, fuzzy
 msgid ""
 "You need to have an account in order to connect\n"
-"to the Jabber network."
+"to the XMPP network."
 msgstr ""
 "Necessites un compte per a connectar-te\n"
 "a la xarxa Jabber."
@@ -6875,8 +6930,9 @@ msgid "<b>Please fill in the data for your existing account</b>"
 msgstr "<b>Si us plau ompli les dades del seu compte existent</b>"
 
 #: gajim/data/gui/account_creation_wizard_window.ui:187
-msgid "_Jabber ID:"
-msgstr "ID _Jabber:"
+#, fuzzy
+msgid "_XMPP Address:"
+msgstr "_Copia adreça JID/Email"
 
 #: gajim/data/gui/account_creation_wizard_window.ui:239
 #: gajim/data/gui/account_creation_wizard_window.ui:394
@@ -6963,6 +7019,7 @@ msgid "Privacy Lists:"
 msgstr ""
 
 #: gajim/data/gui/service_discovery_window.ui:111
+#: gajim/data/gui/groupchat_creation.ui:227
 #, fuzzy
 msgid "_Address"
 msgstr "_Copia adreça JID/Email"
@@ -6980,11 +7037,6 @@ msgstr ""
 msgid "Select the contacts you want to synchronise"
 msgstr ""
 
-#: gajim/data/gui/groupchat_invitation_received.ui:42
-#, fuzzy
-msgid "Group Chat Invitation"
-msgstr "Configuració de Sala"
-
 #: gajim/data/gui/groupchat_invitation_received.ui:111
 #, fuzzy
 msgid "Message..."
@@ -7035,11 +7087,10 @@ msgstr ""
 
 #: gajim/data/gui/add_new_contact_window.ui:84
 #, fuzzy
-msgid "_Jabber ID"
-msgstr "ID _Jabber:"
+msgid "_XMPP Address"
+msgstr "_Copia adreça JID/Email"
 
 #: gajim/data/gui/add_new_contact_window.ui:100
-#: gajim/data/gui/manage_bookmarks_window.ui:192
 #, fuzzy
 msgid "_Nickname"
 msgstr "Sobrenom:"
@@ -7115,7 +7166,7 @@ msgstr "<b>Estat d'ànim:</b>"
 msgid "<b>Message:</b>"
 msgstr "<b>Missatge:</b>"
 
-#: gajim/data/gui/plugins_window.ui:10 gajim/data/gui/application_menu.ui:90
+#: gajim/data/gui/plugins_window.ui:10 gajim/data/gui/application_menu.ui:87
 msgid "Plugins"
 msgstr "Connectors"
 
@@ -7223,10 +7274,6 @@ msgstr ""
 msgid "Deny"
 msgstr ""
 
-#: gajim/data/gui/privacy_list_window.ui:317
-msgid "JabberID"
-msgstr ""
-
 #: gajim/data/gui/privacy_list_window.ui:358
 msgid "all in the group"
 msgstr ""
@@ -7267,7 +7314,7 @@ msgstr ""
 msgid "Manage sounds"
 msgstr "Gestiona sons"
 
-#: gajim/data/gui/manage_sounds_window.ui:55 gajim/plugins/gui.py:100
+#: gajim/data/gui/manage_sounds_window.ui:55 gajim/plugins/gui.py:101
 msgid "Active"
 msgstr "Activa"
 
@@ -7304,30 +7351,121 @@ msgstr ""
 msgid "_Personal Events"
 msgstr "Events _Personals"
 
-#: gajim/data/gui/account_context_menu.ui:35
-#: gajim/data/gui/systray_context_menu.ui:28
-msgid "Join _Group Chat"
-msgstr "Inicia Xat de _Grup"
-
-#: gajim/data/gui/account_context_menu.ui:49
+#: gajim/data/gui/account_context_menu.ui:41
 msgid "_Add Contact..."
 msgstr "_Afegeix Contacte..."
 
-#: gajim/data/gui/account_context_menu.ui:57
+#: gajim/data/gui/account_context_menu.ui:49
 msgid "_Discover Services"
 msgstr "_Descobreix Serveis"
 
-#: gajim/data/gui/account_context_menu.ui:65
+#: gajim/data/gui/account_context_menu.ui:57
 msgid "_Execute Command..."
 msgstr "_Executa Comanda...."
 
+#: gajim/data/gui/account_context_menu.ui:65
+#, fuzzy
+msgid "_View Certificate"
+msgstr "Certificat de client"
+
+#: gajim/data/gui/manage_proxies.ui:12
+#, fuzzy
+msgctxt "proxy configuration"
+msgid "HTTP Connect"
+msgstr "Connecta HTTP"
+
+#: gajim/data/gui/manage_proxies.ui:15
+#, fuzzy
+msgctxt "proxy configuration"
+msgid "SOCKS5"
+msgstr "SOCKS5"
+
+#: gajim/data/gui/manage_proxies.ui:18
+#, fuzzy
+msgctxt "proxy configuration"
+msgid "BOSH"
+msgstr "BOSH"
+
+#: gajim/data/gui/manage_proxies.ui:68
+#, fuzzy
+msgid "Add Proxy"
+msgstr "Prox_y:"
+
+#: gajim/data/gui/manage_proxies.ui:82
+#, fuzzy
+msgid "Remove Proxy"
+msgstr "Esborra"
+
+#: gajim/data/gui/manage_proxies.ui:134
+#, fuzzy
+msgid "Pass_word"
+msgstr "Contrasenya:"
+
+#: gajim/data/gui/manage_proxies.ui:159
+msgid "Use proxy auth_entication"
+msgstr "Fa ús d'autenticació proxy"
+
+#: gajim/data/gui/manage_proxies.ui:179
+#, fuzzy
+msgid "_Username"
+msgstr "_Nom d'usuari:"
+
+#: gajim/data/gui/manage_proxies.ui:209
+#, fuzzy
+msgid "_Port"
+msgstr "_Port:"
+
+#: gajim/data/gui/manage_proxies.ui:226
+msgid "example.org"
+msgstr ""
+
+#: gajim/data/gui/manage_proxies.ui:240
+#, fuzzy
+msgid "_Host"
+msgstr "Nom del servidor:"
+
+#: gajim/data/gui/manage_proxies.ui:254
+msgid "Use HTTP prox_y"
+msgstr "Utilitza un servidor intermediari d'HTTP"
+
+#: gajim/data/gui/manage_proxies.ui:275
+msgid "https://example.org/http-bind/"
+msgstr ""
+
+#: gajim/data/gui/manage_proxies.ui:291
+#, fuzzy
+msgid "_BOSH URL"
+msgstr "URL BOSH:"
+
+#: gajim/data/gui/manage_proxies.ui:309 gajim/gtk/adhoc.py:322
+#, fuzzy
+msgid "Settings"
+msgstr "Connectors"
+
+#: gajim/data/gui/manage_proxies.ui:344
+#, fuzzy
+msgid "_Type"
+msgstr "_Tipus:"
+
+#: gajim/data/gui/manage_proxies.ui:361
+#: gajim/data/gui/groupchat_creation.ui:105
+#, fuzzy
+msgid "_Name"
+msgstr "_Nom:"
+
+#: gajim/data/gui/manage_proxies.ui:391 gajim/gtk/accounts.py:742
+#, fuzzy
+msgid "Proxy"
+msgstr "Prox_y:"
+
 #: gajim/data/gui/application_menu.ui:8
 msgid "View"
 msgstr "Veure"
 
 #: gajim/data/gui/application_menu.ui:11
-msgid "Show Roster"
-msgstr "Mostra Roster"
+#, fuzzy
+msgid "Show Contact List"
+msgstr "Mostra Contactes Actius"
 
 #: gajim/data/gui/application_menu.ui:16
 msgid "Show Offline Contacts"
@@ -7362,21 +7500,23 @@ msgstr "Dreceres de teclat"
 msgid "Features"
 msgstr "Característiques"
 
-#: gajim/data/gui/application_menu.ui:81
-msgid "Bookmarks"
-msgstr "Adreces d'interès"
+#: gajim/data/gui/application_menu.ui:77
+#: 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/application_menu.ui:94 gajim/data/gui/shortcuts_window.ui:189
-#: gajim/gtk/preferences.py:59
+#: gajim/data/gui/application_menu.ui:91 gajim/data/gui/shortcuts_window.ui:189
+#: gajim/gtk/preferences.py:58
 msgid "Preferences"
 msgstr "Preferències"
 
-#: gajim/data/gui/application_menu.ui:99
+#: gajim/data/gui/application_menu.ui:96
 msgid "Quit"
 msgstr "Surt"
 
 #: gajim/data/gui/httpupload_progress_dialog.ui:110
-#: gajim/gtk/filetransfer.py:121
+#: gajim/gtk/filetransfer.py:120
 msgid "Progress"
 msgstr ""
 
@@ -7393,53 +7533,33 @@ msgstr ""
 msgid "_Cancel Upload"
 msgstr "_Cancel·la"
 
-#: gajim/data/gui/manage_bookmarks_window.ui:13
-#, fuzzy
-msgid "Group Chat Bookmarks"
-msgstr "Grups de xat"
-
-#: gajim/data/gui/manage_bookmarks_window.ui:68
-#, fuzzy
-msgid "Add Bookmark"
-msgstr "Adreça d'interès"
-
-#: gajim/data/gui/manage_bookmarks_window.ui:82
-#, fuzzy
-msgid "Remove Bookmark"
-msgstr "Adreça d'interès"
-
-#: gajim/data/gui/manage_bookmarks_window.ui:126
-msgid "N_ame"
+#: gajim/data/gui/groupchat_creation.ui:27
+msgid "Public or Private?"
 msgstr ""
 
-#: gajim/data/gui/manage_bookmarks_window.ui:145
-#, fuzzy
-msgid "Bookmark Name"
-msgstr "Afegeix aquesta sala a les adreces d'interès"
+#: 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 ""
 
-#: gajim/data/gui/manage_bookmarks_window.ui:160
-#, fuzzy
-msgid "_Server"
-msgstr "_Servidor:"
+#: gajim/data/gui/groupchat_creation.ui:58
+msgid "<b>Public:</b> Anyone who knows the address can join."
+msgstr ""
 
-#: gajim/data/gui/manage_bookmarks_window.ui:223
+#: gajim/data/gui/groupchat_creation.ui:122
 #, fuzzy
-msgid "Roo_m"
-msgstr "Sala:"
+msgid "_Description"
+msgstr "Descripció:"
 
-#: gajim/data/gui/manage_bookmarks_window.ui:253
-#, fuzzy
-msgid "_Password"
-msgstr "_Contrasenya:"
+#: gajim/data/gui/groupchat_creation.ui:164
+msgid "_Public"
+msgstr ""
 
-#: gajim/data/gui/manage_bookmarks_window.ui:299
+#: gajim/data/gui/groupchat_creation.ui:278
 #, fuzzy
-msgid "Join chat when connected"
-msgstr "Entra a aquesta sala _automàticament quan em connecto"
-
-#: gajim/data/gui/manage_bookmarks_window.ui:307
-msgid "_Join Automatically"
-msgstr ""
+msgid "_Account"
+msgstr "Compte"
 
 #: gajim/data/gui/exception_dialog.ui:49
 msgid "Sorry, that should not have happened"
@@ -7479,6 +7599,29 @@ msgstr ""
 msgid "Presets"
 msgstr "Missatges preconfigurats:"
 
+#: gajim/data/gui/groupchat_info_scrolled.ui:32
+#, fuzzy
+msgid "Address"
+msgstr "_Copia adreça JID/Email"
+
+#: gajim/data/gui/groupchat_info_scrolled.ui:64
+msgid "Topic"
+msgstr ""
+
+#: gajim/data/gui/groupchat_info_scrolled.ui:80
+#, fuzzy
+msgid "Author"
+msgstr "Autors:"
+
+#: gajim/data/gui/groupchat_info_scrolled.ui:182
+msgid "Discussion Logs"
+msgstr ""
+
+#: gajim/data/gui/groupchat_info_scrolled.ui:260
+#, fuzzy
+msgid "Group Chat Language"
+msgstr "Configuració de Sala"
+
 #: gajim/data/gui/emoji_chooser.ui:98
 msgid "No Results Found"
 msgstr ""
@@ -7488,25 +7631,37 @@ msgid "Invite Friends!"
 msgstr "Convida Amics!"
 
 #: gajim/data/gui/chat_to_muc_window.ui:39
+#, fuzzy
 msgid ""
-"You are now entering a groupchat.\n"
+"You are now entering a group chat.\n"
 "Select the contacts you want to invite"
 msgstr ""
 "Estàs entrant a un xat de grup.\n"
 "Selecciona els contactes que vols convidar"
 
 #: gajim/data/gui/chat_to_muc_window.ui:112
-msgid "Please select a MUC server."
+#, fuzzy
+msgid "Please select a group chat server."
 msgstr "Si us plau selecciona un servidor MUC."
 
 #: gajim/data/gui/chat_to_muc_window.ui:141
-msgid "MUC server"
-msgstr "Servidor MUC"
+#, fuzzy
+msgid "Group chat server"
+msgstr "Grups de xat"
 
 #: gajim/data/gui/chat_to_muc_window.ui:176
 msgid "In_vite"
 msgstr "Con_vida"
 
+#: gajim/data/gui/bookmarks.ui:176
+#, fuzzy
+msgid "Autojoin"
+msgstr "Entra automàticament"
+
+#: gajim/data/gui/bookmarks.ui:211
+msgid "_Apply"
+msgstr ""
+
 #: gajim/data/gui/history_manager.ui:11
 msgid "_Export"
 msgstr "_Exporta"
@@ -7521,12 +7676,13 @@ msgid "Gajim History Logs Manager"
 msgstr "Gajim Gestor Històric Registres"
 
 #: gajim/data/gui/history_manager.ui:108
+#, fuzzy
 msgid ""
-"This log manager is not intended for log viewing. If you are looking for "
-"such functionality, use the history window instead.\n"
+"This history manager is not intended for viewing chat history. If you are "
+"looking for such functionality, please use the history window instead.\n"
 "\n"
-"Use this program to delete or export logs. You can select logs from the left "
-"and/or search database from below."
+"You can use this program to delete or export history. Either select logs "
+"from the left or search the database."
 msgstr ""
 "Aquest gestor de registres no està dissenyat com a visor. Si vols aquesta "
 "funcionalitat, fes ús de la finestra d'històric.\n"
@@ -7575,7 +7731,7 @@ msgid "Select an emoji"
 msgstr ""
 
 #: gajim/data/gui/shortcuts_window.ui:38
-msgid "Complete a command or a nick"
+msgid "Complete a command or a nickname"
 msgstr ""
 
 #: gajim/data/gui/shortcuts_window.ui:45
@@ -7611,7 +7767,7 @@ msgstr ""
 msgid "Scroll down"
 msgstr ""
 
-#: gajim/data/gui/shortcuts_window.ui:100 gajim/gtk/xml_console.py:72
+#: gajim/data/gui/shortcuts_window.ui:100 gajim/gtk/xml_console.py:69
 msgid "Clear"
 msgstr ""
 
@@ -7652,8 +7808,9 @@ msgid "Close chat"
 msgstr ""
 
 #: gajim/data/gui/shortcuts_window.ui:173
-msgid "Roster Shortcuts"
-msgstr ""
+#, fuzzy
+msgid "Contact List Shortcuts"
+msgstr "_Canvia Missatge d'Estat"
 
 #: gajim/data/gui/shortcuts_window.ui:196
 msgid "File transfers"
@@ -7680,7 +7837,7 @@ msgid "Show only active contacts"
 msgstr "Mostra només contactes actius"
 
 #: gajim/data/gui/shortcuts_window.ui:251
-msgid "Enable roster filtering"
+msgid "Enable contact list filtering"
 msgstr ""
 
 #: gajim/data/gui/shortcuts_window.ui:259
@@ -7722,12 +7879,12 @@ msgid "Search selected day only"
 msgstr "Nomes cerca al dia seleccionat"
 
 #: gajim/data/gui/history_window.ui:317
-msgid "Record history for this chat"
+msgid "Store history for this chat"
 msgstr ""
 
 #: gajim/data/gui/history_window.ui:332
 #, fuzzy
-msgid "Record History"
+msgid "Store History"
 msgstr "Historial"
 
 #: gajim/data/gui/history_window.ui:350
@@ -7748,8 +7905,9 @@ msgstr "Crea nou missatge"
 msgid "Fill in the form."
 msgstr "Omple el formulari."
 
-#: gajim/data/gui/data_form_window.ui:229
-msgid "Room Configuration"
+#: gajim/data/gui/data_form_window.ui:229 gajim/gtk/groupchat_config.py:41
+#, fuzzy
+msgid "Group Chat Configuration"
 msgstr "Configuració de Sala"
 
 #: gajim/data/gui/roster_item_exchange_window.ui:39
@@ -7770,15 +7928,15 @@ msgstr ""
 msgid "_Start Chat..."
 msgstr "Inicia Xat..."
 
-#: gajim/data/gui/systray_context_menu.ui:50
+#: gajim/data/gui/systray_context_menu.ui:43
 msgid "Show All Pending _Events"
 msgstr ""
 
-#: gajim/data/gui/systray_context_menu.ui:59
+#: gajim/data/gui/systray_context_menu.ui:52
 msgid "Mute Sounds"
 msgstr ""
 
-#: gajim/data/gui/systray_context_menu.ui:75
+#: gajim/data/gui/systray_context_menu.ui:68
 #, fuzzy
 msgid "_Preferences"
 msgstr "Preferències"
@@ -7867,33 +8025,33 @@ msgstr ""
 msgid "Execute expression inside a shell, send output"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:45
+#: gajim/command_system/implementation/standard.py:47
 msgid ""
 "Show help on a given command or a list of available commands if -a is given"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:73
+#: gajim/command_system/implementation/standard.py:75
 msgid "Send a message to the contact"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:78
+#: gajim/command_system/implementation/standard.py:80
 msgid "Send action (in the third person) to the current chat"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:83
+#: gajim/command_system/implementation/standard.py:85
 msgid "Show logged messages which mention given text"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:88
+#: gajim/command_system/implementation/standard.py:90
 #, python-format
 msgid "%s: Nothing found"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:94
+#: gajim/command_system/implementation/standard.py:96
 msgid "Limit must be an integer"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:118
+#: gajim/command_system/implementation/standard.py:120
 msgid ""
 "\n"
 "    Set the current status\n"
@@ -7903,115 +8061,117 @@ msgid ""
 "    "
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:136
+#: gajim/command_system/implementation/standard.py:138
 msgid "Set the current status to away"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:150
+#: gajim/command_system/implementation/standard.py:152
 msgid "Set the current status to online"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:153
+#: gajim/command_system/implementation/standard.py:155
 msgid "Available"
 msgstr "Disponible"
 
-#: gajim/command_system/implementation/standard.py:173
-#: gajim/command_system/implementation/standard.py:250
+#: gajim/command_system/implementation/standard.py:175
+#: gajim/command_system/implementation/standard.py:252
 msgid "Clear the text window"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:178
-#: gajim/command_system/implementation/standard.py:397
+#: gajim/command_system/implementation/standard.py:180
+#: gajim/command_system/implementation/standard.py:401
 msgid "Send a ping to the contact"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:181
-#: gajim/command_system/implementation/standard.py:400
+#: gajim/command_system/implementation/standard.py:183
+#: gajim/command_system/implementation/standard.py:404
 msgid "Command is not supported for zeroconf accounts"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:185
-msgid "Send DTMF sequence through an open audio session"
+#: gajim/command_system/implementation/standard.py:187
+msgid "Send DTMF sequence through an open voice chat"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:188
-msgid "No open audio sessions with the contact"
+#: gajim/command_system/implementation/standard.py:190
+msgid "No open voice chats with the contact"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:191
+#: gajim/command_system/implementation/standard.py:193
 #, python-format
 msgid "%s is not a valid tone"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:198
-msgid "Toggle audio session"
+#: gajim/command_system/implementation/standard.py:200
+msgid "Toggle Voice Chat"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:201
-msgid "Audio sessions are not available"
-msgstr ""
+#: gajim/command_system/implementation/standard.py:203
+#, fuzzy
+msgid "Voice chats are not available"
+msgstr "Transferència de Fitxers"
 
-#: gajim/command_system/implementation/standard.py:208
-msgid "Toggle video session"
+#: gajim/command_system/implementation/standard.py:210
+msgid "Toggle Video Chat"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:211
-msgid "Video sessions are not available"
-msgstr ""
+#: gajim/command_system/implementation/standard.py:213
+#, fuzzy
+msgid "Video chats are not available"
+msgstr "Transferència de Fitxers"
 
-#: gajim/command_system/implementation/standard.py:218
+#: gajim/command_system/implementation/standard.py:220
 msgid "Send a message to the contact that will attract their attention"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:255
+#: gajim/command_system/implementation/standard.py:257
 msgid "Change your nickname in a group chat"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:260 gajim/gtk/dialogs.py:674
-#: gajim/gtk/bookmarks.py:272
+#: gajim/command_system/implementation/standard.py:262
 msgid "Invalid nickname"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:267
-msgid "Open a private chat window with a specified occupant"
+#: gajim/command_system/implementation/standard.py:269
+msgid "Open a private chat window with a specified participant"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:273
-#: gajim/command_system/implementation/standard.py:282
-#: gajim/command_system/implementation/standard.py:332
-#: gajim/command_system/implementation/standard.py:345
-#: gajim/command_system/implementation/standard.py:357
+#: gajim/command_system/implementation/standard.py:275
+#: gajim/command_system/implementation/standard.py:284
+#: gajim/command_system/implementation/standard.py:336
+#: gajim/command_system/implementation/standard.py:349
+#: gajim/command_system/implementation/standard.py:361
 msgid "Nickname not found"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:276
+#: gajim/command_system/implementation/standard.py:278
 msgid ""
-"Open a private chat window with a specified occupant and send him a message"
+"Open a private chat window with a specified participant and send him a "
+"message"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:285
+#: gajim/command_system/implementation/standard.py:287
 msgid "Display or change a group chat topic"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:294
-msgid "Invite a user to a room for a reason"
+#: gajim/command_system/implementation/standard.py:296
+msgid "Invite a user to a group chat for a reason"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:297
+#: gajim/command_system/implementation/standard.py:299
 #, python-format
 msgid "Invited %(jid)s to %(room_jid)s"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:301
-msgid "Join a group chat given by a JID"
+#: gajim/command_system/implementation/standard.py:303
+msgid "Join a group chat given by an XMPP Address"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:309
+#: gajim/command_system/implementation/standard.py:313
 msgid ""
-"Leave the groupchat, optionally giving a reason, and close tab or window"
+"Leave the group chat, optionally giving a reason, and close tab or window"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:314
+#: gajim/command_system/implementation/standard.py:318
 msgid ""
 "\n"
 "    Ban user by a nick or a JID from a groupchat\n"
@@ -8020,42 +8180,42 @@ msgid ""
 "    "
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:329
-msgid "Kick user by a nick from a groupchat"
+#: gajim/command_system/implementation/standard.py:333
+msgid "Kick user by a nick from a group chat"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:338
+#: gajim/command_system/implementation/standard.py:342
 msgid ""
-"Set occupant role in group chat.\n"
+"Set participant role in group chat.\n"
 "    Role can be given as one of the following values:\n"
 "    moderator, participant, visitor, none"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:343
+#: gajim/command_system/implementation/standard.py:347
 msgid "Invalid role given"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:350
+#: gajim/command_system/implementation/standard.py:354
 msgid ""
-"Set occupant affiliation in group chat.\n"
+"Set participant affiliation in group chat.\n"
 "    Affiliation can be given as one of the following values:\n"
 "    owner, admin, member, outcast, none"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:355
+#: gajim/command_system/implementation/standard.py:359
 msgid "Invalid affiliation given"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:365
-msgid "Display names of all group chat occupants"
+#: gajim/command_system/implementation/standard.py:369
+msgid "Display names of all group chat participants"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:387
-msgid "Forbid an occupant to send you public or private messages"
+#: gajim/command_system/implementation/standard.py:391
+msgid "Forbid a participant to send you public or private messages"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:392
-msgid "Allow an occupant to send you public or private messages"
+#: gajim/command_system/implementation/standard.py:396
+msgid "Allow a participant to send you public or private messages"
 msgstr ""
 
 #: gajim/command_system/implementation/middleware.py:74
@@ -8066,324 +8226,428 @@ msgstr ""
 msgid "The same as using a doc-string, except it supports translation"
 msgstr ""
 
-#: gajim/gtk/filetransfer.py:91
+#: gajim/gtk/groupchat_info.py:36
+#, fuzzy
+msgid "?Group chat feature:Archiving"
+msgstr "Configuració de Sala"
+
+#: gajim/gtk/groupchat_info.py:37
+msgid "Messages are archived on the server"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:40
+#, fuzzy
+msgid "?Group chat feature:Persistent"
+msgstr "Grups de xat"
+
+#: gajim/gtk/groupchat_info.py:41
+msgid "This group chat persists even if there are no participants"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:45
+#, fuzzy
+msgid "?Group chat feature:Temporary"
+msgstr "Grups de xat"
+
+#: gajim/gtk/groupchat_info.py:46
+msgid "This group chat will be destroyed once the last participant left"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:50
+#, fuzzy
+msgid "?Group chat feature:Moderated"
+msgstr "Grups de xat"
+
+#: gajim/gtk/groupchat_info.py:51
+msgid ""
+"Participants entering this group chat need to request permission to send "
+"messages"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:55
+#, fuzzy
+msgid "?Group chat feature:Not Moderated"
+msgstr "Grups de xat"
+
+#: gajim/gtk/groupchat_info.py:56
+msgid "Participants entering this group chat are allowed to send messages"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:60
+#, fuzzy
+msgid "?Group chat feature:Open"
+msgstr "Grups de xat"
+
+#: gajim/gtk/groupchat_info.py:61
+msgid "Anyone can join this group chat"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:64
+#, fuzzy
+msgid "?Group chat feature:Members Only"
+msgstr "Grups de xat"
+
+#: gajim/gtk/groupchat_info.py:65
+msgid "This group chat is restricted to members only"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:69
+#, fuzzy
+msgid "?Group chat feature:Public"
+msgstr "Grups de xat"
+
+#: gajim/gtk/groupchat_info.py:70
+msgid "Group chat can be found via search"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:73
+#, fuzzy
+msgid "?Group chat feature:Hidden"
+msgstr "Grups de xat"
+
+#: gajim/gtk/groupchat_info.py:74
+msgid "This group chat can not be found via search"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:77
+#, fuzzy
+msgid "?Group chat feature:Not Anonymous"
+msgstr "Grups de xat"
+
+#: gajim/gtk/groupchat_info.py:78
+msgid "All other group chat participants can see your XMPP address"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:82
+#, fuzzy
+msgid "?Group chat feature:Semi-Anonymous"
+msgstr "Grups de xat"
+
+#: gajim/gtk/groupchat_info.py:83
+msgid "Only moderators can see your XMPP address"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:86
+#, fuzzy
+msgid "?Group chat feature:Password Required"
+msgstr "Grups de xat"
+
+#: gajim/gtk/groupchat_info.py:87
+msgid "This group chat does require a password upon entry"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:91
+#, fuzzy
+msgid "?Group chat feature:No Password Required"
+msgstr "Grups de xat"
+
+#: gajim/gtk/groupchat_info.py:92
+msgid "This group chat does not require a password upon entry"
+msgstr ""
+
+#: gajim/gtk/filetransfer.py:90
 msgid "File"
 msgstr ""
 
-#: gajim/gtk/filetransfer.py:108
+#: gajim/gtk/filetransfer.py:107
 msgid "Time"
 msgstr ""
 
-#: gajim/gtk/filetransfer.py:228
+#: gajim/gtk/filetransfer.py:227
 #, fuzzy, python-format
 msgid "File name: %s"
 msgstr "Nom de feed:"
 
-#: gajim/gtk/filetransfer.py:229 gajim/gtk/filetransfer.py:464
+#: gajim/gtk/filetransfer.py:228 gajim/gtk/filetransfer.py:469
 #, python-format
 msgid "Size: %s"
 msgstr ""
 
-#: gajim/gtk/filetransfer.py:239
+#: gajim/gtk/filetransfer.py:238
 #, python-format
 msgid "Sender: %s"
 msgstr ""
 
-#: gajim/gtk/filetransfer.py:240 gajim/gtk/filetransfer.py:744
+#: gajim/gtk/filetransfer.py:239 gajim/gtk/filetransfer.py:749
 #: gajim/gtk/tooltips.py:577
 msgid "Recipient: "
 msgstr ""
 
-#: gajim/gtk/filetransfer.py:251
+#: gajim/gtk/filetransfer.py:250
 #, python-format
 msgid "Saved in: %s"
 msgstr ""
 
-#: gajim/gtk/filetransfer.py:256
+#: gajim/gtk/filetransfer.py:255
 msgid "File transfer completed"
 msgstr ""
 
-#: gajim/gtk/filetransfer.py:276 gajim/gtk/filetransfer.py:285
+#: gajim/gtk/filetransfer.py:275 gajim/gtk/filetransfer.py:284
 msgid "Connection with peer could not be established."
 msgstr ""
 
-#: gajim/gtk/filetransfer.py:293
+#: gajim/gtk/filetransfer.py:292
 #, python-format
 msgid "Filename: %s"
 msgstr ""
 
-#: gajim/gtk/filetransfer.py:294
+#: gajim/gtk/filetransfer.py:293
 #, python-format
 msgid "Recipient: %s"
 msgstr ""
 
-#: gajim/gtk/filetransfer.py:296
+#: gajim/gtk/filetransfer.py:295
 #, python-format
 msgid "Error message: %s"
 msgstr ""
 
-#: gajim/gtk/filetransfer.py:333
-#, fuzzy
-msgid "File transfer error"
-msgstr "Transferència de Fitxers"
-
 #: gajim/gtk/filetransfer.py:334
 #, python-format
 msgid ""
-"The file %(file)s has been received, but it seems to have been damaged along "
-"the way.\n"
+"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 ""
 
-#: gajim/gtk/filetransfer.py:350
+#: gajim/gtk/filetransfer.py:340
+msgid "_Download Again"
+msgstr ""
+
+#: gajim/gtk/filetransfer.py:355
 msgid "Gajim can not read this file"
 msgstr ""
 
-#: gajim/gtk/filetransfer.py:351
+#: gajim/gtk/filetransfer.py:356
 msgid "Another process is using this file."
 msgstr ""
 
-#: gajim/gtk/filetransfer.py:418
+#: gajim/gtk/filetransfer.py:423
 #, fuzzy
 msgid "File Transfer Conflict"
 msgstr "Transferència de Fitxers"
 
-#: gajim/gtk/filetransfer.py:419
+#: gajim/gtk/filetransfer.py:424
 msgid "This file already exists"
 msgstr ""
 
-#: gajim/gtk/filetransfer.py:420
+#: gajim/gtk/filetransfer.py:425
 msgid "Resume download or replace file?"
 msgstr ""
 
-#: gajim/gtk/filetransfer.py:424
+#: gajim/gtk/filetransfer.py:429
 #, fuzzy
 msgid "Replace _File"
 msgstr "Fitxer de Certificat de Client:"
 
-#: gajim/gtk/filetransfer.py:427
+#: gajim/gtk/filetransfer.py:432
 msgid "Resume _Download"
 msgstr ""
 
-#: gajim/gtk/filetransfer.py:437
+#: gajim/gtk/filetransfer.py:442
 #, python-format
 msgid "Directory '%s' is not writable"
 msgstr ""
 
-#: gajim/gtk/filetransfer.py:438
+#: gajim/gtk/filetransfer.py:443
 msgid "You do not have permissions to create files in this directory."
 msgstr ""
 
-#: gajim/gtk/filetransfer.py:461
+#: gajim/gtk/filetransfer.py:466
 #, python-format
 msgid "File: %s"
 msgstr ""
 
-#: gajim/gtk/filetransfer.py:467
+#: gajim/gtk/filetransfer.py:472
 #, python-format
 msgid "Type: %s"
 msgstr ""
 
-#: gajim/gtk/filetransfer.py:469
+#: gajim/gtk/filetransfer.py:474
 #, python-format
 msgid "Description: %s"
 msgstr ""
 
-#: gajim/gtk/filetransfer.py:480
+#: gajim/gtk/filetransfer.py:485
 #, python-format
 msgid "%s wants to send you a file"
 msgstr ""
 
-#: gajim/gtk/filetransfer.py:509
+#: gajim/gtk/filetransfer.py:514
 msgid "Checking file…"
 msgstr ""
 
-#: gajim/gtk/filetransfer.py:524
+#: gajim/gtk/filetransfer.py:529
 msgid "File error"
 msgstr ""
 
-#: gajim/gtk/filetransfer.py:561
+#: gajim/gtk/filetransfer.py:566
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr ""
 
-#: gajim/gtk/filetransfer.py:658
+#: gajim/gtk/filetransfer.py:663
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr ""
 
-#: gajim/gtk/filetransfer.py:711 gajim/gtk/filetransfer.py:715
+#: gajim/gtk/filetransfer.py:716 gajim/gtk/filetransfer.py:720
 msgid "Invalid File"
 msgstr ""
 
-#: gajim/gtk/filetransfer.py:711
+#: gajim/gtk/filetransfer.py:716
 msgid "File: "
 msgstr ""
 
-#: gajim/gtk/filetransfer.py:716
+#: gajim/gtk/filetransfer.py:721
 msgid "It is not possible to send empty files"
 msgstr ""
 
-#: gajim/gtk/filetransfer.py:742 gajim/gtk/tooltips.py:571
+#: gajim/gtk/filetransfer.py:747 gajim/gtk/tooltips.py:571
 msgid "Sender: "
 msgstr ""
 
-#: gajim/gtk/filetransfer.py:1038
+#: gajim/gtk/filetransfer.py:1043
 msgid "Choose a File to Send…"
 msgstr ""
 
 #: gajim/gtk/start_chat.py:51
-msgid "Start new Conversation"
+#, fuzzy
+msgid "Start New Conversation"
+msgstr "Històric de converses"
+
+#: gajim/gtk/start_chat.py:260 gajim/gtk/start_chat.py:328
+msgid "You can not join a group chat unless you are connected."
 msgstr ""
 
-#: gajim/gtk/start_chat.py:424
-#, fuzzy
-msgid "New Groupchat"
-msgstr "Grups de xat"
+#: gajim/gtk/start_chat.py:603 gajim/gtk/groupchat_join.py:38
+msgid "Join Group Chat"
+msgstr "Uneix-te al xat en grup"
 
-#: gajim/gtk/start_chat.py:426
+#: gajim/gtk/start_chat.py:605 gajim/gtk/add_contact.py:40
 #, fuzzy
-msgid "New Contact"
-msgstr "Afegeix un contacte nou"
+msgid "Add Contact"
+msgstr "_Afegeix Contacte..."
 
-#: gajim/gtk/start_chat.py:588
+#: gajim/gtk/start_chat.py:746
 #, fuzzy, python-format
-msgid "%s Group chats found"
+msgid "%s group chats found"
 msgstr "Grups de xat"
 
-#: gajim/gtk/discovery.py:70
+#: gajim/gtk/discovery.py:69
 msgid "This service has not yet responded with detailed information"
 msgstr ""
 
-#: gajim/gtk/discovery.py:71
+#: gajim/gtk/discovery.py:70
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely a legacy service or broken."
 msgstr ""
 
-#: gajim/gtk/discovery.py:128
+#: gajim/gtk/discovery.py:126
 msgid "Others"
 msgstr ""
 
-#: gajim/gtk/discovery.py:131
-msgid "Conference"
-msgstr ""
+#: gajim/gtk/discovery.py:129
+#, fuzzy
+msgid "Group Chat"
+msgstr "Grups de xat"
 
-#: gajim/gtk/discovery.py:519
+#: gajim/gtk/discovery.py:518
 msgid "Without a connection, you can not browse available services"
 msgstr ""
 
-#: gajim/gtk/discovery.py:606
+#: gajim/gtk/discovery.py:605
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr ""
 
-#: gajim/gtk/discovery.py:608
+#: gajim/gtk/discovery.py:607
 msgid "Service Discovery"
 msgstr ""
 
-#: gajim/gtk/discovery.py:691
+#: gajim/gtk/discovery.py:690
 msgid "The service could not be found"
 msgstr ""
 
-#: gajim/gtk/discovery.py:692
+#: gajim/gtk/discovery.py:691
 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:699 gajim/gtk/discovery.py:1042
+#: gajim/gtk/discovery.py:698 gajim/gtk/discovery.py:1041
 msgid "The service is not browsable"
 msgstr ""
 
-#: gajim/gtk/discovery.py:700
+#: gajim/gtk/discovery.py:699
 msgid "This type of service does not contain any items to browse."
 msgstr ""
 
-#: gajim/gtk/discovery.py:738 gajim/gtk/discovery.py:747
+#: gajim/gtk/discovery.py:737 gajim/gtk/discovery.py:746
 msgid "Invalid Server Name"
 msgstr ""
 
-#: gajim/gtk/discovery.py:806
+#: gajim/gtk/discovery.py:805
 #, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr ""
 
-#: gajim/gtk/discovery.py:851
+#: gajim/gtk/discovery.py:850
 msgid "Browse"
 msgstr ""
 
-#: gajim/gtk/discovery.py:1043
+#: gajim/gtk/discovery.py:1042
 msgid "This service does not contain any items to browse."
 msgstr ""
 
-#: gajim/gtk/discovery.py:1255
+#: gajim/gtk/discovery.py:1254
 msgid "_Command"
 msgstr ""
 
-#: gajim/gtk/discovery.py:1264 gajim/gtk/discovery.py:1422
+#: gajim/gtk/discovery.py:1263 gajim/gtk/discovery.py:1420
 msgid "Re_gister"
 msgstr ""
 
-#: gajim/gtk/discovery.py:1277
+#: gajim/gtk/discovery.py:1276
 #, fuzzy
 msgid "_Search"
 msgstr "Cerca:"
 
-#: gajim/gtk/discovery.py:1420
+#: gajim/gtk/discovery.py:1418
 msgid "_Edit"
 msgstr "_Edita"
 
-#: gajim/gtk/discovery.py:1458
+#: gajim/gtk/discovery.py:1456
 #, python-format
 msgid "Scanning %(current)d / %(total)d ..."
 msgstr ""
 
-#: gajim/gtk/discovery.py:1674
-msgid "Id"
-msgstr ""
-
-#: gajim/gtk/discovery.py:1713
-msgid "_Join"
-msgstr "_Entra-hi"
-
-#: gajim/gtk/discovery.py:1736
-msgid "Bookmark already set"
-msgstr ""
-
-#: gajim/gtk/discovery.py:1737
-#, python-format
-msgid "Group Chat '%s' is already in your bookmarks."
-msgstr ""
-
-#: gajim/gtk/discovery.py:1748
-msgid "Bookmark has been added successfully"
+#: gajim/gtk/discovery.py:1655
+msgid "Users"
 msgstr ""
 
-#: gajim/gtk/discovery.py:1749
-msgid ""
-"You can manage your bookmarks by clicking the Bookmarks menu item in your "
-"contact list."
+#: gajim/gtk/discovery.py:1671
+msgid "Id"
 msgstr ""
 
-#: gajim/gtk/discovery.py:1950
+#: gajim/gtk/discovery.py:1900
 msgid "Subscribed"
 msgstr ""
 
-#: gajim/gtk/discovery.py:1959
+#: gajim/gtk/discovery.py:1909
 msgid "Node"
 msgstr ""
 
-#: gajim/gtk/discovery.py:2028
+#: gajim/gtk/discovery.py:1978
 #, fuzzy
 msgid "_New post"
 msgstr "Afegeix un contacte nou"
 
-#: gajim/gtk/discovery.py:2037
+#: gajim/gtk/discovery.py:1987
 msgid "_Subscribe"
 msgstr ""
 
-#: gajim/gtk/discovery.py:2045
+#: gajim/gtk/discovery.py:1995
 msgid "_Unsubscribe"
 msgstr ""
 
@@ -8431,7 +8695,7 @@ msgstr ""
 msgid "Characters typed: %s"
 msgstr ""
 
-#: gajim/gtk/single_message.py:274 gajim/gtk/xml_console.py:169
+#: gajim/gtk/single_message.py:274 gajim/gtk/xml_console.py:166
 msgid "Connection not available"
 msgstr ""
 
@@ -8440,6 +8704,12 @@ msgstr ""
 msgid "Please make sure you are connected with \"%s\"."
 msgstr ""
 
+#: gajim/gtk/single_message.py:306
+#, 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:330
 #, python-format
 msgid "RE: %s"
@@ -8450,28 +8720,28 @@ msgstr ""
 msgid "%s wrote:\n"
 msgstr ""
 
-#: gajim/gtk/pep_config.py:44
+#: gajim/gtk/pep_config.py:45
 #, fuzzy, python-format
 msgid "PEP Service Configuration (%s)"
 msgstr "Configuració Servei PEP:"
 
-#: gajim/gtk/pep_config.py:77
+#: gajim/gtk/pep_config.py:78
 #, fuzzy
 msgid "Service"
 msgstr "_Servidor:"
 
-#: gajim/gtk/pep_config.py:114
+#: gajim/gtk/pep_config.py:115
 msgid "PEP node was not removed"
 msgstr ""
 
-#: gajim/gtk/pep_config.py:115
+#: gajim/gtk/pep_config.py:116
 #, python-format
 msgid ""
 "PEP node %(node)s was not removed:\n"
 "%(message)s"
 msgstr ""
 
-#: gajim/gtk/pep_config.py:146
+#: gajim/gtk/pep_config.py:147
 #, python-format
 msgid "Configure %s"
 msgstr ""
@@ -8486,17 +8756,21 @@ msgstr "_Registra"
 msgid "Registration successful"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:54 gajim/gtk/dataform.py:659 gajim/gtk/adhoc.py:85
+#: gajim/gtk/service_registration.py:215
+msgid "Registration failed"
+msgstr ""
+
+#: gajim/gtk/dialogs.py:53 gajim/gtk/dataform.py:668 gajim/gtk/adhoc.py:86
 #, fuzzy
 msgid "Cancel"
 msgstr "_Cancel·la"
 
-#: gajim/gtk/dialogs.py:129
+#: gajim/gtk/dialogs.py:128
 #, python-format
 msgid "Dictionary for language \"%s\" not available"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:130
+#: gajim/gtk/dialogs.py:129
 #, python-format
 msgid ""
 "You have to install the dictionary \"%s\" to use spellchecking, or choose "
@@ -8505,11 +8779,11 @@ msgid ""
 "Highlighting misspelled words feature will not be used"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:410 gajim/gtk/dialogs.py:425
+#: gajim/gtk/dialogs.py:322 gajim/gtk/dialogs.py:337
 msgid "Insecure connection"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:411
+#: gajim/gtk/dialogs.py:323
 #, python-format
 msgid ""
 "You are about to connect to the account %(account)s (%(server)s) insecurely. "
@@ -8518,119 +8792,115 @@ msgid ""
 "Are you sure you want to do that?"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:416
+#: gajim/gtk/dialogs.py:328
 msgid "Yes, I really want to connect insecurely"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:417
+#: gajim/gtk/dialogs.py:329
 msgid "Gajim will NOT connect unless you check this box"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:675
-msgid "The nickname contains invalid characters."
-msgstr ""
-
-#: gajim/gtk/dialogs.py:734
+#: gajim/gtk/dialogs.py:561
 #, fuzzy, python-format
 msgid "Destroy %s"
 msgstr "_Destrueix Sala"
 
-#: gajim/gtk/dialogs.py:775
+#: gajim/gtk/dialogs.py:602
 #, fuzzy
 msgid "Certificate"
 msgstr "Certificat de client"
 
-#: gajim/gtk/dialogs.py:786
+#: gajim/gtk/dialogs.py:613
 #, fuzzy, python-format
 msgid ""
 "Certificate for account\n"
 "%s"
 msgstr "El Certificat està xifrat"
 
-#: gajim/gtk/dialogs.py:824
+#: gajim/gtk/dialogs.py:651
 msgid "Issued to\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:825 gajim/gtk/dialogs.py:830
+#: gajim/gtk/dialogs.py:652 gajim/gtk/dialogs.py:657
 msgid "Common Name (CN): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:826 gajim/gtk/dialogs.py:831
+#: gajim/gtk/dialogs.py:653 gajim/gtk/dialogs.py:658
 msgid "Organization (O): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:827 gajim/gtk/dialogs.py:832
+#: gajim/gtk/dialogs.py:654 gajim/gtk/dialogs.py:659
 msgid "Organizational Unit (OU): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:828
+#: gajim/gtk/dialogs.py:655
 msgid "Serial Number: "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:829
+#: gajim/gtk/dialogs.py:656
 msgid "Issued by\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:833
+#: gajim/gtk/dialogs.py:660
 msgid "Validity\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:834
+#: gajim/gtk/dialogs.py:661
 msgid "Issued on: "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:835
+#: gajim/gtk/dialogs.py:662
 #, fuzzy
 msgid "Expires on: "
 msgstr "expira"
 
-#: gajim/gtk/dialogs.py:836
+#: gajim/gtk/dialogs.py:663
 msgid "SHA-1:"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:838
+#: gajim/gtk/dialogs.py:665
 msgid "SHA-256:"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:852
+#: gajim/gtk/dialogs.py:679
 #, fuzzy
 msgid "View certificate…"
 msgstr "Certificat de client"
 
-#: gajim/gtk/dialogs.py:864 gajim/gtk/accounts.py:893
+#: gajim/gtk/dialogs.py:691 gajim/gtk/accounts.py:896
 msgid "Change Password"
 msgstr "Canviar contrasenya"
 
-#: gajim/gtk/dialogs.py:878
+#: gajim/gtk/dialogs.py:705
 msgid "_OK"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:891
+#: gajim/gtk/dialogs.py:718
 #, fuzzy
 msgid "You must enter a password"
 msgstr "Escriu nova contrasenya:"
 
-#: gajim/gtk/dialogs.py:895
+#: gajim/gtk/dialogs.py:722
 msgid "Passwords do not match"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:923
+#: gajim/gtk/dialogs.py:750
 #, fuzzy
 msgid "Group Chat Invitation "
 msgstr "Configuració de Sala"
 
-#: gajim/gtk/dialogs.py:948
+#: gajim/gtk/dialogs.py:775
 #, python-format
 msgid "<b>%s</b> has invited you to join a discussion"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:951
+#: gajim/gtk/dialogs.py:778
 #, python-format
 msgid ""
 "<b>%(contact)s</b> has invited you to the group chat <b>%(room_jid)s</b>"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:959
+#: gajim/gtk/dialogs.py:786
 #, python-format
 msgid "Comment: %s"
 msgstr ""
@@ -8643,11 +8913,6 @@ msgstr ""
 msgid "ICQ Number"
 msgstr ""
 
-#: gajim/gtk/add_contact.py:40
-#, fuzzy
-msgid "Add Contact"
-msgstr "_Afegeix Contacte..."
-
 #: gajim/gtk/add_contact.py:259
 #, python-format
 msgid "%s Missing"
@@ -8668,8 +8933,9 @@ msgid "The user ID must not contain a resource."
 msgstr ""
 
 #: gajim/gtk/add_contact.py:299
-msgid "You cannot add yourself to your roster."
-msgstr ""
+#, fuzzy
+msgid "You cannot add yourself to your contact list."
+msgstr "Voldria afegir-te a la meva llista de contactes."
 
 #: gajim/gtk/add_contact.py:304
 #, fuzzy
@@ -8681,12 +8947,14 @@ msgid "Your account must be online to add new contacts."
 msgstr ""
 
 #: gajim/gtk/add_contact.py:321
-msgid "Contact already in roster"
-msgstr ""
+#, fuzzy
+msgid "Contact Already in Contact List"
+msgstr "Esborra transferència de fitxer de la llista."
 
 #: gajim/gtk/add_contact.py:322
-msgid "This contact is already listed in your roster."
-msgstr ""
+#, fuzzy
+msgid "This contact is already in your contact list."
+msgstr "Esborra transferència de fitxer de la llista."
 
 #: gajim/gtk/add_contact.py:379 gajim/gtk/add_contact.py:417
 msgid "User ID:"
@@ -8724,14 +8992,14 @@ msgstr ""
 
 #: gajim/gtk/themes.py:52
 #, fuzzy
-msgid "MUC Tab New Directed Message"
+msgid "Group Chat Tab New Directed Message"
 msgstr ""
 "Missatges\n"
 "MUC Dirigits"
 
 #: gajim/gtk/themes.py:56
 #, fuzzy
-msgid "MUC Tab New Message"
+msgid "Group Chat Tab New Message"
 msgstr ""
 "Missatges\n"
 "MUC"
@@ -8937,13 +9205,13 @@ msgstr ""
 msgid "Clear File"
 msgstr "Fitxer de Certificat de Client:"
 
-#: gajim/gtk/settings.py:570
+#: gajim/gtk/settings.py:570 gajim/gtk/proxies.py:32
 #, fuzzy
 msgid "Manage Proxies"
 msgstr "Gestió de perfils de proxy"
 
-#: gajim/gtk/settings.py:591 gajim/gtk/preferences.py:971
-#: gajim/gtk/preferences.py:984 gajim/gtk/preferences.py:988
+#: gajim/gtk/settings.py:591 gajim/gtk/preferences.py:968
+#: gajim/gtk/preferences.py:982 gajim/gtk/preferences.py:986
 #, fuzzy
 msgid "No Proxy"
 msgstr "Prox_y:"
@@ -9022,13 +9290,14 @@ msgid ""
 "        "
 msgstr ""
 
-#: gajim/gtk/about.py:47 data/org.gajim.Gajim.appdata.xml.in:10
-msgid "A GTK+ XMPP client"
+#: gajim/gtk/about.py:47 data/org.gajim.Gajim.desktop.in:6
+#: data/org.gajim.Gajim.appdata.xml.in:10
+msgid "A GTK XMPP client"
 msgstr ""
 
 #: gajim/gtk/about.py:48
 #, fuzzy, python-format
-msgid "GTK+ Version: %s"
+msgid "GTK Version: %s"
 msgstr "Versió:"
 
 #: gajim/gtk/about.py:49
@@ -9193,6 +9462,24 @@ msgstr "?user status:_Disponible"
 msgid "?transfer status:Not started"
 msgstr "?user status:_Disponible"
 
+#: gajim/gtk/groupchat_creation.py:97 gajim/gtk/groupchat_creation.py:99
+msgid " (optional)..."
+msgstr ""
+
+#: gajim/gtk/groupchat_creation.py:134
+#, fuzzy
+msgid "Invalid Address"
+msgstr "Gestiona Sala"
+
+#: gajim/gtk/groupchat_creation.py:182
+#, fuzzy
+msgid "Not Connected"
+msgstr "Entrada següent"
+
+#: gajim/gtk/groupchat_creation.py:183
+msgid "You have to be connected to create a group chat."
+msgstr ""
+
 #: gajim/gtk/sounds.py:39
 msgid "Wav Sounds"
 msgstr ""
@@ -9233,46 +9520,43 @@ msgstr ""
 msgid "Group Chat Message Received"
 msgstr ""
 
-#: gajim/gtk/dataform.py:226 gajim/gtk/dataform.py:262
+#: gajim/gtk/dataform.py:232 gajim/gtk/dataform.py:268
 #, fuzzy
 msgid "Required"
 msgstr "requereix"
 
-#: gajim/gtk/dataform.py:286
+#: gajim/gtk/dataform.py:293
 msgid "Yes"
 msgstr "Sí"
 
-#: gajim/gtk/dataform.py:286
+#: gajim/gtk/dataform.py:293
 msgid "No"
 msgstr "No"
 
-#: gajim/gtk/dataform.py:661
+#: gajim/gtk/dataform.py:670
 msgid "Submit"
 msgstr ""
 
-#: gajim/gtk/statusicon.py:213
+#: gajim/gtk/statusicon.py:206
 msgid "_Change Status Message…"
 msgstr "_Canvia Missatge d'Estat..."
 
-#: gajim/gtk/statusicon.py:247 gajim/gtk/statusicon.py:292
-#: gajim/gtk/statusicon.py:299
+#: gajim/gtk/statusicon.py:258
 #, python-format
 msgid "using account %s"
 msgstr ""
 
-#: gajim/gtk/statusicon.py:309
-msgid "_Manage Bookmarks…"
-msgstr ""
-
-#: gajim/gtk/statusicon.py:325
-msgid "Hide _Roster"
-msgstr ""
+#: gajim/gtk/statusicon.py:269
+#, fuzzy
+msgid "Hide _Contact List"
+msgstr "Convida _Contactes"
 
-#: gajim/gtk/statusicon.py:329
-msgid "Show _Roster"
-msgstr ""
+#: gajim/gtk/statusicon.py:273
+#, fuzzy
+msgid "Show _Contact List"
+msgstr "Mostra Contactes Actius"
 
-#: gajim/gtk/statusicon.py:337
+#: gajim/gtk/statusicon.py:281
 msgid "Hide this menu"
 msgstr ""
 
@@ -9314,34 +9598,6 @@ msgid ""
 "later."
 msgstr ""
 
-#: gajim/gtk/join_groupchat.py:202
-#, fuzzy
-msgid "Invalid Room"
-msgstr "Gestiona Sala"
-
-#: gajim/gtk/join_groupchat.py:203
-msgid "Please choose a room"
-msgstr ""
-
-#: gajim/gtk/join_groupchat.py:222 gajim/gtk/join_groupchat.py:229
-msgid "Invalid Nickname"
-msgstr ""
-
-#: gajim/gtk/join_groupchat.py:223
-msgid "Please choose a nickname"
-msgstr ""
-
-#: gajim/gtk/join_groupchat.py:282 gajim/gtk/join_groupchat.py:288
-#: gajim/gtk/join_groupchat.py:293
-msgid "Wrong server"
-msgstr ""
-
-#: gajim/gtk/join_groupchat.py:283 gajim/gtk/join_groupchat.py:289
-#: gajim/gtk/join_groupchat.py:294
-#, python-format
-msgid "%s is not a groupchat server"
-msgstr ""
-
 #: gajim/gtk/mam_preferences.py:38
 #, python-format
 msgid "Archiving Preferences for %s"
@@ -9369,45 +9625,53 @@ msgstr ""
 msgid "Archiving Preferences Error"
 msgstr "Preferències"
 
-#: gajim/gtk/advanced_config.py:81
+#: gajim/gtk/advanced_config.py:95
 msgid "Activated"
 msgstr ""
 
-#: gajim/gtk/advanced_config.py:81
+#: gajim/gtk/advanced_config.py:95
 msgid "Deactivated"
 msgstr ""
 
-#: gajim/gtk/advanced_config.py:83
-msgid "Boolean"
+#: gajim/gtk/advanced_config.py:97
+msgid "?config type:Boolean"
 msgstr ""
 
-#: gajim/gtk/advanced_config.py:84
-msgid "Integer"
+#: gajim/gtk/advanced_config.py:98
+msgid "?config type:Integer"
 msgstr ""
 
-#: gajim/gtk/advanced_config.py:85
-msgid "Text"
+#: gajim/gtk/advanced_config.py:99
+msgid "?config type:Text"
 msgstr ""
 
-#: gajim/gtk/advanced_config.py:97
-msgid "Preference Name"
+#: gajim/gtk/advanced_config.py:100
+msgid "?config type:Color"
 msgstr ""
 
-#: gajim/gtk/advanced_config.py:104
-msgid "Value"
-msgstr ""
+#: gajim/gtk/advanced_config.py:112
+#, fuzzy
+msgid "?config:Preference Name"
+msgstr "Preferències"
 
-#: gajim/gtk/advanced_config.py:113
-msgid "Type"
-msgstr ""
+#: gajim/gtk/advanced_config.py:123
+#, fuzzy
+msgid "?config:Value"
+msgstr "_Configura"
 
-#: gajim/gtk/advanced_config.py:168
-msgid "(None)"
+#: gajim/gtk/advanced_config.py:132
+msgid "?config:Type"
 msgstr ""
 
-#: gajim/gtk/advanced_config.py:299
-msgid "Hidden"
-msgstr ""
+#: gajim/gtk/advanced_config.py:187
+#, fuzzy
+msgid "?config description:None"
+msgstr "Descripció:"
+
+#: gajim/gtk/advanced_config.py:322
+#, fuzzy
+msgid "?password:Hidden"
+msgstr "Contrasenya:"
 
 #: gajim/gtk/server_info.py:66
 #, fuzzy
@@ -9419,8 +9683,8 @@ msgstr "_Copia la ubicació de l'enllaç"
 msgid "%(days)s days, %(hours)s hours"
 msgstr ""
 
-#: gajim/gtk/server_info.py:218 gajim/gtk/accounts.py:749
-#: gajim/gtk/accounts.py:853
+#: gajim/gtk/server_info.py:218 gajim/gtk/accounts.py:752
+#: gajim/gtk/accounts.py:856
 #, fuzzy
 msgid "Hostname"
 msgstr "Nom del servidor:"
@@ -9595,11 +9859,6 @@ msgstr ""
 msgid "You must enter a name to create a privacy list."
 msgstr ""
 
-#: gajim/gtk/groupchat_config.py:41
-#, fuzzy
-msgid "Group Chat Configuration"
-msgstr "Configuració de Sala"
-
 #: gajim/gtk/groupchat_config.py:134
 msgid "A Group Chat needs at least one Owner"
 msgstr ""
@@ -9609,64 +9868,64 @@ msgid "You are not allowed to modify the affiliation of Admins and Owners"
 msgstr ""
 
 #: gajim/gtk/groupchat_config.py:399
-msgid "An entry with this Jabber-ID already exists"
+msgid "An entry with this XMPP Address already exists"
 msgstr ""
 
-#: gajim/gtk/adhoc.py:91
+#: gajim/gtk/adhoc.py:92
 #, fuzzy
 msgid "Finish"
 msgstr "Acaba"
 
-#: gajim/gtk/adhoc.py:97 gajim/gtk/adhoc.py:283
+#: gajim/gtk/adhoc.py:98 gajim/gtk/adhoc.py:284
 msgid "Commands"
 msgstr ""
 
-#: gajim/gtk/adhoc.py:103
+#: gajim/gtk/adhoc.py:104
 msgid "Next"
 msgstr ""
 
-#: gajim/gtk/adhoc.py:109
+#: gajim/gtk/adhoc.py:110
 msgid "Previous"
 msgstr ""
 
-#: gajim/gtk/adhoc.py:115
+#: gajim/gtk/adhoc.py:116
 #, fuzzy
 msgid "Execute"
 msgstr "_Executa Comanda...."
 
-#: gajim/gtk/adhoc.py:195
+#: gajim/gtk/adhoc.py:196
 #, fuzzy
 msgid "No commands available"
 msgstr "Transferència de Fitxers"
 
-#: gajim/gtk/adhoc.py:244
+#: gajim/gtk/adhoc.py:245
 #, fuzzy
 msgid "Request Command List"
 msgstr "Sol.licita Veu"
 
-#: gajim/gtk/adhoc.py:259
+#: gajim/gtk/adhoc.py:260
 msgid "Executing…"
 msgstr ""
 
-#: gajim/gtk/adhoc.py:266
+#: gajim/gtk/adhoc.py:267
 msgid "Command List"
 msgstr ""
 
-#: gajim/gtk/adhoc.py:384
+#: gajim/gtk/adhoc.py:385
 #, fuzzy
 msgid "Finished"
 msgstr "Acaba"
 
-#: gajim/gtk/adhoc.py:453
+#: gajim/gtk/adhoc.py:454
 msgid "Execution failed"
 msgstr ""
 
-#: gajim/gtk/blocking.py:37
+#: gajim/gtk/blocking.py:38
 #, python-format
 msgid "Blocking List for %s"
 msgstr ""
 
-#: gajim/gtk/blocking.py:71
+#: gajim/gtk/blocking.py:72
 msgid "Error!"
 msgstr ""
 
@@ -9713,8 +9972,7 @@ msgstr ""
 msgid "You must provide a username to configure this account."
 msgstr ""
 
-#: gajim/gtk/account_wizard.py:252 gajim/gtk/bookmarks.py:290
-#: gajim/gtk/bookmarks.py:303
+#: gajim/gtk/account_wizard.py:252
 msgid "Invalid server"
 msgstr ""
 
@@ -9730,7 +9988,7 @@ msgstr ""
 msgid "Custom port must be a port number."
 msgstr ""
 
-#: gajim/gtk/account_wizard.py:405
+#: gajim/gtk/account_wizard.py:406
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -9740,15 +9998,15 @@ msgid ""
 "Do you still want to connect to this server?"
 msgstr ""
 
-#: gajim/gtk/account_wizard.py:446 gajim/gtk/account_wizard.py:480
+#: gajim/gtk/account_wizard.py:447 gajim/gtk/account_wizard.py:481
 msgid "An error occurred during account creation"
 msgstr ""
 
-#: gajim/gtk/account_wizard.py:545
+#: gajim/gtk/account_wizard.py:546
 msgid "Account name is in use"
 msgstr ""
 
-#: gajim/gtk/account_wizard.py:546
+#: gajim/gtk/account_wizard.py:547
 msgid "You already have an account using this name."
 msgstr ""
 
@@ -9774,25 +10032,25 @@ msgstr ""
 msgid "%(minutes)s min %(seconds)s sec"
 msgstr ""
 
-#: gajim/gtk/xml_console.py:77
+#: gajim/gtk/xml_console.py:74
 #, fuzzy
 msgid "Filter"
 msgstr "Filtra:"
 
-#: gajim/gtk/xml_console.py:82
+#: gajim/gtk/xml_console.py:79
 msgid "XML Input"
 msgstr ""
 
-#: gajim/gtk/xml_console.py:86
+#: gajim/gtk/xml_console.py:83
 msgid "Paste Last Input"
 msgstr ""
 
-#: gajim/gtk/xml_console.py:170
+#: gajim/gtk/xml_console.py:167
 #, python-format
 msgid "Please make sure you are connected with '%s'."
 msgstr ""
 
-#: gajim/gtk/xml_console.py:182
+#: gajim/gtk/xml_console.py:177
 #, fuzzy
 msgid "Invalid Node"
 msgstr "Gestiona Sala"
@@ -9825,293 +10083,300 @@ msgstr "Cerca:"
 msgid "No results found"
 msgstr "Grups de xat"
 
-#: gajim/gtk/preferences.py:358 gajim/gtk/preferences.py:362
+#: gajim/gtk/preferences.py:357 gajim/gtk/preferences.py:361
 msgid "Default"
 msgstr ""
 
-#: gajim/gtk/preferences.py:801
+#: gajim/gtk/preferences.py:798
 msgid "status message title"
 msgstr ""
 
-#: gajim/gtk/preferences.py:802
+#: gajim/gtk/preferences.py:799
 msgid "status message text"
 msgstr ""
 
+#: gajim/gtk/accounts.py:137
+msgid "Re-Login"
+msgstr ""
+
 #: gajim/gtk/accounts.py:138
-msgid "Relogin now?"
+msgid "Re-Login now?"
 msgstr ""
 
 #: gajim/gtk/accounts.py:139
-msgid "If you want all the changes to apply instantly, you must relogin."
+msgid "To apply all changes instantly, you have to re-login."
 msgstr ""
 
-#: gajim/gtk/accounts.py:191 gajim/gtk/accounts.py:975
+#: gajim/gtk/accounts.py:141
+msgid "_Later"
+msgstr ""
+
+#: gajim/gtk/accounts.py:143
+msgid "_Re-Login"
+msgstr ""
+
+#: gajim/gtk/accounts.py:194 gajim/gtk/accounts.py:978
 #, fuzzy
 msgid "Remove Account"
 msgstr "Fusiona comptes"
 
-#: gajim/gtk/accounts.py:192
+#: gajim/gtk/accounts.py:195
 #, python-format
 msgid "You still have open chats in your account %s"
 msgstr ""
 
-#: gajim/gtk/accounts.py:193
+#: gajim/gtk/accounts.py:196
 msgid ""
 "All chat and group chat windows will be closed.\n"
 "Do you want to continue?"
 msgstr ""
 
-#: gajim/gtk/accounts.py:424
+#: gajim/gtk/accounts.py:427
 msgid "Back"
 msgstr ""
 
-#: gajim/gtk/accounts.py:530
+#: gajim/gtk/accounts.py:533
 msgid "Please check if Bonjour is installed."
 msgstr ""
 
-#: gajim/gtk/accounts.py:532
+#: gajim/gtk/accounts.py:535
 msgid "Please check if Avahi is installed."
 msgstr ""
 
-#: gajim/gtk/accounts.py:569
+#: gajim/gtk/accounts.py:572
 #, fuzzy
 msgid "Disable Account"
 msgstr "Compte"
 
-#: gajim/gtk/accounts.py:570
+#: gajim/gtk/accounts.py:573
 #, python-format
 msgid "Account %s is still connected"
 msgstr ""
 
-#: gajim/gtk/accounts.py:571
+#: gajim/gtk/accounts.py:574
 msgid ""
 "All chat and group chat windows will be closed. Do you want to continue?"
 msgstr ""
 
-#: gajim/gtk/accounts.py:576
+#: gajim/gtk/accounts.py:579
 #, fuzzy
 msgid "_Disable Account"
 msgstr "Compte"
 
-#: gajim/gtk/accounts.py:595
+#: gajim/gtk/accounts.py:598
 #, fuzzy
 msgid "Add Account"
 msgstr "_Afegeix Contacte..."
 
-#: gajim/gtk/accounts.py:663
+#: gajim/gtk/accounts.py:666
 msgid "Label"
 msgstr ""
 
-#: gajim/gtk/accounts.py:667
+#: gajim/gtk/accounts.py:670
 msgid "Login"
 msgstr ""
 
-#: gajim/gtk/accounts.py:670
+#: gajim/gtk/accounts.py:673
 #, fuzzy
 msgid "Import Contacts"
 msgstr "Convida _Contactes"
 
-#: gajim/gtk/accounts.py:674 gajim/gtk/accounts.py:870
+#: gajim/gtk/accounts.py:677 gajim/gtk/accounts.py:873
 #, fuzzy
 msgid "Client Certificate"
 msgstr "Certificat de client"
 
-#: gajim/gtk/accounts.py:677 gajim/gtk/accounts.py:774
+#: gajim/gtk/accounts.py:680 gajim/gtk/accounts.py:777
 #, fuzzy
 msgid "Connect on startup"
 msgstr "C_onecta al servidor quan s'inicia"
 
-#: gajim/gtk/accounts.py:681 gajim/gtk/accounts.py:779
+#: gajim/gtk/accounts.py:684 gajim/gtk/accounts.py:782
 #, fuzzy
 msgid "Save conversations for all contacts"
 msgstr "Guarda registre de les converses amb tots els contactes"
 
-#: gajim/gtk/accounts.py:683 gajim/gtk/accounts.py:781
+#: gajim/gtk/accounts.py:686 gajim/gtk/accounts.py:784
 msgid "Store conversations on the harddrive"
 msgstr ""
 
-#: gajim/gtk/accounts.py:685 gajim/gtk/accounts.py:783
+#: gajim/gtk/accounts.py:688 gajim/gtk/accounts.py:786
 #, fuzzy
 msgid "Global Status"
 msgstr "Estat"
 
-#: gajim/gtk/accounts.py:687
+#: gajim/gtk/accounts.py:690
 #, fuzzy
 msgid "Synchronise the status of all accounts"
 msgstr "Sincronit_za l'estat del compte amb l'estat global"
 
-#: gajim/gtk/accounts.py:689
+#: gajim/gtk/accounts.py:692
 msgid "Use file transfer proxies"
 msgstr "Fer ús de proxis per a transferència de fitxers"
 
-#: gajim/gtk/accounts.py:705
+#: gajim/gtk/accounts.py:708
 msgid "Idle Time"
 msgstr ""
 
-#: gajim/gtk/accounts.py:707
+#: gajim/gtk/accounts.py:710
 msgid "Disclose the time of your last activity"
 msgstr ""
 
-#: gajim/gtk/accounts.py:709
+#: gajim/gtk/accounts.py:712
 msgid "Local System Time"
 msgstr ""
 
-#: gajim/gtk/accounts.py:711
+#: gajim/gtk/accounts.py:714
 msgid "Disclose the local system time of the device Gajim runs on"
 msgstr ""
 
-#: gajim/gtk/accounts.py:714
+#: gajim/gtk/accounts.py:717
 #, fuzzy
 msgid "Client / Operating System"
 msgstr "Certificat de client"
 
-#: gajim/gtk/accounts.py:716
+#: gajim/gtk/accounts.py:719
 msgid ""
 "Disclose informations about the client and operating system you currently use"
 msgstr ""
 
-#: gajim/gtk/accounts.py:719
+#: gajim/gtk/accounts.py:722
 #, fuzzy
 msgid "Ignore Unknown Contacts"
 msgstr "Convida _Contactes"
 
-#: gajim/gtk/accounts.py:721
+#: gajim/gtk/accounts.py:724
 msgid "Ignore everything from contacts not in your Roster"
 msgstr ""
 
-#: gajim/gtk/accounts.py:737 gajim/gtk/accounts.py:776
+#: gajim/gtk/accounts.py:740 gajim/gtk/accounts.py:779
 #, fuzzy
 msgid "Use environment variable"
 msgstr "fa ús de la variable d'entorn HTTP__PROXY"
 
-#: gajim/gtk/accounts.py:739
-#, fuzzy
-msgid "Proxy"
-msgstr "Prox_y:"
-
-#: gajim/gtk/accounts.py:742
+#: gajim/gtk/accounts.py:745
 #, fuzzy
 msgid "Warn on insecure connection"
 msgstr "Avís abans d'una connexió insegura"
 
-#: gajim/gtk/accounts.py:746
+#: gajim/gtk/accounts.py:749
 #, fuzzy
 msgid "Send keep-alive packets"
 msgstr "Enviar paquets _keep-alive"
 
-#: gajim/gtk/accounts.py:750
+#: gajim/gtk/accounts.py:753
 msgid "Manually set the hostname for the server"
 msgstr ""
 
-#: gajim/gtk/accounts.py:756 gajim/gtk/accounts.py:826
-#: gajim/gtk/accounts.py:831
+#: gajim/gtk/accounts.py:759 gajim/gtk/accounts.py:829
+#: gajim/gtk/accounts.py:834
 #, fuzzy
 msgid "Priority"
 msgstr "Priori_tat:"
 
-#: gajim/gtk/accounts.py:785
+#: gajim/gtk/accounts.py:788
 #, fuzzy
 msgid "Synchronize the status of all accounts"
 msgstr "Sinc_ronitza l'estat del compte amb l'estat global"
 
-#: gajim/gtk/accounts.py:795
+#: gajim/gtk/accounts.py:798
 #, fuzzy
 msgid "First Name"
 msgstr "Nom:"
 
-#: gajim/gtk/accounts.py:798
+#: gajim/gtk/accounts.py:801
 #, fuzzy
 msgid "Last Name"
 msgstr "Cognom:"
 
-#: gajim/gtk/accounts.py:804
+#: gajim/gtk/accounts.py:807
 msgid "Email"
 msgstr ""
 
-#: gajim/gtk/accounts.py:822
+#: gajim/gtk/accounts.py:825
 #, fuzzy
 msgid "Adjust to status"
 msgstr "Ajustar a estat"
 
-#: gajim/gtk/accounts.py:849
+#: gajim/gtk/accounts.py:852
 msgid "Enable"
 msgstr ""
 
-#: gajim/gtk/accounts.py:857
+#: gajim/gtk/accounts.py:860
 #, fuzzy
 msgid "Port"
 msgstr "_Port:"
 
-#: gajim/gtk/accounts.py:862
+#: gajim/gtk/accounts.py:865
 #, fuzzy
 msgid "Connection Settings"
 msgstr "Connexió"
 
-#: gajim/gtk/accounts.py:872
+#: gajim/gtk/accounts.py:875
 msgid "PKCS12 Files"
 msgstr ""
 
-#: gajim/gtk/accounts.py:874
+#: gajim/gtk/accounts.py:877
 #, fuzzy
 msgid "Encrypted Certificate"
 msgstr "Certificat de client"
 
-#: gajim/gtk/accounts.py:878
+#: gajim/gtk/accounts.py:881
 #, fuzzy
 msgid "Certificate Settings"
 msgstr "El Certificat està xifrat"
 
-#: gajim/gtk/accounts.py:890
+#: gajim/gtk/accounts.py:893
 #, fuzzy
 msgid "Save Password"
 msgstr "Desa la contrasenya"
 
-#: gajim/gtk/accounts.py:898
+#: gajim/gtk/accounts.py:901
 #, fuzzy
 msgid "Login Settings"
 msgstr "Connectors"
 
-#: gajim/gtk/accounts.py:931
+#: gajim/gtk/accounts.py:934
 #, fuzzy, python-format
 msgid "Removing account %s"
 msgstr "Fusiona comptes"
 
-#: gajim/gtk/accounts.py:946
+#: gajim/gtk/accounts.py:949
 msgid "Account is disabled"
 msgstr ""
 
-#: gajim/gtk/accounts.py:947
+#: gajim/gtk/accounts.py:950
 msgid "To unregister from a server, the account must be enabled."
 msgstr ""
 
-#: gajim/gtk/accounts.py:962
+#: gajim/gtk/accounts.py:965
 #, fuzzy
 msgid "Password required"
 msgstr "Contrasenya:"
 
-#: gajim/gtk/accounts.py:976
+#: gajim/gtk/accounts.py:979
 #, python-format
 msgid "Account '%s' is still connected to the server"
 msgstr ""
 
-#: gajim/gtk/accounts.py:978
+#: gajim/gtk/accounts.py:981
 msgid "If you remove it, the connection will be lost."
 msgstr ""
 
-#: gajim/gtk/accounts.py:995
+#: gajim/gtk/accounts.py:998
 #, python-format
 msgid "Connection to server %s failed"
 msgstr ""
 
-#: gajim/gtk/accounts.py:996
+#: gajim/gtk/accounts.py:999
 msgid "What would you like to do?"
 msgstr ""
 
-#: gajim/gtk/accounts.py:997
+#: gajim/gtk/accounts.py:1000
 msgid "Remove only from Gajim"
 msgstr ""
 
-#: gajim/gtk/accounts.py:998
+#: gajim/gtk/accounts.py:1001
 msgid "Don't remove anything. I'll try again later"
 msgstr ""
 
@@ -10134,6 +10399,10 @@ msgstr "Voldria afegir-te a la meva llista de contactes."
 msgid "Modify"
 msgstr ""
 
+#: gajim/gtk/roster_item_exchange.py:80
+msgid "JID"
+msgstr ""
+
 #: gajim/gtk/roster_item_exchange.py:86
 msgid "Groups"
 msgstr ""
@@ -10157,46 +10426,29 @@ msgid_plural "Removed %d contacts"
 msgstr[0] ""
 msgstr[1] ""
 
-#: gajim/gtk/util.py:581
+#: gajim/gtk/util.py:583
 msgid "Unknown Artist"
 msgstr ""
 
-#: gajim/gtk/util.py:582
+#: gajim/gtk/util.py:584
 msgid "Unknown Title"
 msgstr ""
 
-#: gajim/gtk/util.py:583
+#: gajim/gtk/util.py:585
 msgid "Unknown Source"
 msgstr ""
 
-#: gajim/gtk/util.py:585
+#: gajim/gtk/util.py:587
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
 "from <i>%(source)s</i>"
 msgstr ""
 
-#: gajim/gtk/bookmarks.py:121
-msgid "New Group Chat"
-msgstr ""
-
-#: gajim/gtk/bookmarks.py:161
-msgid "This bookmark has invalid data"
-msgstr ""
-
-#: gajim/gtk/bookmarks.py:162
-msgid ""
-"Please be sure to fill out server and room fields or remove this bookmark."
-msgstr ""
-
-#: gajim/gtk/bookmarks.py:273 gajim/gtk/bookmarks.py:291
-#: gajim/gtk/bookmarks.py:304 gajim/gtk/bookmarks.py:335
-msgid "Character not allowed"
-msgstr ""
-
-#: gajim/gtk/bookmarks.py:334
-msgid "Invalid room"
-msgstr ""
+#: gajim/gtk/bookmarks.py:47
+#, fuzzy, python-format
+msgid "Bookmarks for %s"
+msgstr "Adreces d'interès"
 
 #: gajim/plugins/pluginmanager.py:736 gajim/plugins/pluginmanager.py:742
 msgid "Archive corrupted"
@@ -10207,46 +10459,46 @@ msgid "Archive empty"
 msgstr ""
 
 #: gajim/plugins/pluginmanager.py:750 gajim/plugins/pluginmanager.py:758
-#: gajim/plugins/gui.py:257
+#: gajim/plugins/gui.py:258
 msgid "Archive is malformed"
 msgstr ""
 
-#: gajim/plugins/pluginmanager.py:766 gajim/plugins/gui.py:281
-#: gajim/plugins/gui.py:289
+#: gajim/plugins/pluginmanager.py:766 gajim/plugins/gui.py:288
+#: gajim/plugins/gui.py:301
 msgid "Plugin already exists"
 msgstr ""
 
-#: gajim/plugins/gui.py:82
+#: gajim/plugins/gui.py:83
 msgid "Click to view Gajim's wiki page on how to install plugins in Flatpak."
 msgstr ""
 
-#: gajim/plugins/gui.py:89
+#: gajim/plugins/gui.py:90
 msgid "Plugin"
 msgstr ""
 
-#: gajim/plugins/gui.py:151
+#: gajim/plugins/gui.py:152
 #, python-format
 msgid "Warning: %s"
 msgstr ""
 
-#: gajim/plugins/gui.py:206
+#: gajim/plugins/gui.py:207
 msgid "Plugin failed"
 msgstr ""
 
-#: gajim/plugins/gui.py:245
+#: gajim/plugins/gui.py:246
 msgid "Unable to properly remove the plugin"
 msgstr ""
 
-#: gajim/plugins/gui.py:281
-msgid "Overwrite?"
+#: gajim/plugins/gui.py:287
+msgid "Overwrite Plugin?"
 msgstr ""
 
-#: data/org.gajim.Gajim.desktop.in:5
-msgid "Jabber IM Client"
+#: gajim/plugins/gui.py:289
+msgid "Do you want to overwrite the currently installed version?"
 msgstr ""
 
-#: data/org.gajim.Gajim.desktop.in:6
-msgid "A GTK+ Jabber client"
+#: data/org.gajim.Gajim.desktop.in:5
+msgid "XMPP IM Client"
 msgstr ""
 
 #: data/org.gajim.Gajim.desktop.in:8
@@ -10300,7 +10552,7 @@ msgid "Easily send pictures, videos or other files to friends and groups"
 msgstr ""
 
 #: data/org.gajim.Gajim.appdata.xml.in:27
-msgid "Chat securely with End-to-End encryption via OMEMO or PGP"
+msgid "Chat securely with End-to-End encryption via OMEMO or OpenPGP"
 msgstr ""
 
 #: data/org.gajim.Gajim.appdata.xml.in:28
@@ -10359,7 +10611,7 @@ msgid "Even more features via plugins"
 msgstr ""
 
 #: data/org.gajim.Gajim.appdata.xml.in:52
-msgid "Roster, list of contacts"
+msgid "Contact list, list of contacts"
 msgstr ""
 
 #: data/org.gajim.Gajim.appdata.xml.in:56
@@ -10380,15 +10632,183 @@ msgstr "Historial"
 msgid "Plugin manager"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Group Chat Bookmarks"
+#~ msgstr "Grups de xat"
+
+#, fuzzy
+#~ msgid "Add Bookmark"
+#~ msgstr "Adreça d'interès"
+
+#, fuzzy
+#~ msgid "Remove Bookmark"
+#~ msgstr "Adreça d'interès"
+
+#, fuzzy
+#~ msgid "Bookmark Name"
+#~ msgstr "Afegeix aquesta sala a les adreces d'interès"
+
+#, fuzzy
+#~ msgid "_Server"
+#~ msgstr "_Servidor:"
+
+#, fuzzy
+#~ msgid "Roo_m"
+#~ msgstr "Sala:"
+
+#, fuzzy
+#~ msgid "_Password"
+#~ msgstr "_Contrasenya:"
+
+#, fuzzy
+#~ msgid "Join chat when connected"
+#~ msgstr "Entra a aquesta sala _automàticament quan em connecto"
+
+#, fuzzy
+#~ msgid "Invalid Group Chat"
+#~ msgstr "Uneix-te al xat en grup"
+
+#, fuzzy
+#~ msgid "XMPP Address is not a group chat"
+#~ msgstr "Uneix-te al xat en grup"
+
+#, fuzzy
+#~ msgid "Please choose a group chat"
+#~ msgstr "Afegeix aquesta sala a les adreces d'interès"
+
+#, fuzzy
+#~ msgid "%s is not a group chat server"
+#~ msgstr "Uneix-te al xat en grup"
+
+#, fuzzy
+#~ msgid "Add to Roster"
+#~ msgstr "_Afegeix a llista de contactes"
+
+#, fuzzy
+#~ msgid "Manage Room"
+#~ msgstr "Gestiona Sala"
+
+#, fuzzy
+#~ msgid "Configure Room"
+#~ msgstr "Configura Sala..."
+
+#, fuzzy
+#~ msgid "Destroy Room"
+#~ msgstr "_Destrueix Sala"
+
+#, fuzzy
+#~ msgid "Change Nick"
+#~ msgstr "Canvia _Nick..."
+
+#, fuzzy
+#~ msgid "Disconnect"
+#~ msgstr "_Desconnecta"
+
+#, fuzzy
+#~ msgid "Add to Roster…"
+#~ msgstr "_Afegeix a llista de contactes"
+
+#, fuzzy
+#~ msgid "Copy JID/Email"
+#~ msgstr "_Copia adreça JID/Email"
+
+#, fuzzy
+#~ msgid "Auto Join"
+#~ msgstr "Entra automàticament"
+
+#, fuzzy
+#~ msgid "Room"
+#~ msgstr "Sala:"
+
+#~ msgid "Jabber ID:"
+#~ msgstr "ID de Jabber:"
+
+#~ msgid "_Add to Roster"
+#~ msgstr "_Afegeix a llista de contactes"
+
+#~ msgid "_Manage Room"
+#~ msgstr "Gestiona Sala"
+
+#~ msgid "_Destroy Room"
+#~ msgstr "_Destrueix Sala"
+
+#~ msgid "Jabber ID"
+#~ msgstr "ID de Jabber"
+
+#, fuzzy
+#~ msgid "account"
+#~ msgstr "Compte"
+
+#~ msgid "Roster"
+#~ msgstr "Llista"
+
+#~ msgid "_Add to Roster..."
+#~ msgstr "Afegeix a la llista de contactes..."
+
+#~ msgid "_Jabber ID:"
+#~ msgstr "ID _Jabber:"
+
+#, fuzzy
+#~ msgid "_Jabber ID"
+#~ msgstr "ID _Jabber:"
+
+#~ msgid "Show Roster"
+#~ msgstr "Mostra Roster"
+
+#~ msgid "MUC server"
+#~ msgstr "Servidor MUC"
+
+#~ msgid "Join _Group Chat"
+#~ msgstr "Inicia Xat de _Grup"
+
+#, fuzzy
+#~ msgid "Invalid Room"
+#~ msgstr "Gestiona Sala"
+
+#, fuzzy
+#~ msgid "Bookmark Room"
+#~ msgstr "Afegeix aquesta sala a les adreces d'interès"
+
+#, fuzzy
+#~ msgid "Name:"
+#~ msgstr "_Nom:"
+
+#~ msgid "Description:"
+#~ msgstr "Descripció:"
+
+#, fuzzy
+#~ msgid "Occupants"
+#~ msgstr "Accions Ocupant"
+
+#, fuzzy
+#~ msgid "File transfer error"
+#~ msgstr "Transferència de Fitxers"
+
+#~ msgid "Manage Proxy Profiles"
+#~ msgstr "Gestió de perfils de proxy"
+
+#, fuzzy
+#~ msgid "Properties"
+#~ msgstr "<b>Propietats</b>"
+
+#, fuzzy
+#~ msgid "Proxy _Port"
+#~ msgstr "Port del servidor intermediari:"
+
+#, fuzzy
+#~ msgid "New Groupchat"
+#~ msgstr "Grups de xat"
+
+#, fuzzy
+#~ msgid "New Contact"
+#~ msgstr "Afegeix un contacte nou"
+
 #~ msgid "Con_tinue"
 #~ msgstr "Con_tinua"
 
 #~ msgid "_Pause"
 #~ msgstr "_Pausa"
 
-#~ msgid "Clean _up"
-#~ msgstr "Neteja"
-
 #~ msgid ""
 #~ "This action removes single file transfer from the list. If the transfer "
 #~ "is active, it is first stopped and then removed"
@@ -10571,14 +10991,6 @@ msgstr ""
 #~ msgstr "El Contacte ha entrat"
 
 #, fuzzy
-#~ msgid "Group chat highlight"
-#~ msgstr "Grups de xat"
-
-#, fuzzy
-#~ msgid "Your nickname"
-#~ msgstr "Sobrenom:"
-
-#, fuzzy
 #~ msgid "Your message"
 #~ msgstr "missatge"
 
@@ -10588,10 +11000,6 @@ msgstr ""
 #~ msgid "Enter it again for confirmation:"
 #~ msgstr "Torna-ho a escriure per a confirmació:"
 
-#, fuzzy
-#~ msgid "Autojoin"
-#~ msgstr "Entra automàticament"
-
 #~ msgid "&lt;empty&gt;"
 #~ msgstr "&lt;buit&gt;"
 
@@ -10691,9 +11099,6 @@ msgstr ""
 #~ msgid "Server:"
 #~ msgstr "Servidor:"
 
-#~ msgid "Password:"
-#~ msgstr "Contrasenya:"
-
 #~ msgid "Bro_wse Rooms"
 #~ msgstr "Navega per les sales"
 
@@ -10746,9 +11151,6 @@ msgstr ""
 #~ "compte alhora amb recursos 'Casa' i 'Feina'. El recurs que tingui la "
 #~ "prioritat més alta rebrà els events. (veure a baix)"
 
-#~ msgid "Priority will change automatically according to your status."
-#~ msgstr "La prioritat canviarà automàticament d'acord amb l'estat."
-
 #~ msgid "Anonymous authentication"
 #~ msgstr "Autenticació Anònima."
 
@@ -10848,9 +11250,6 @@ msgstr ""
 #~ msgid "_Edit Personal Information..."
 #~ msgstr "_Edita Informació Personal..."
 
-#~ msgid "Information about you, as stored in the server"
-#~ msgstr "Informació sobre tu, tal i com està guardada al servidor"
-
 #~ msgid "<b>Personal Information</b>"
 #~ msgstr "<b>Informació Personal</b>"
 
diff --git a/po/cs.po b/po/cs.po
index 6d0158acb..d24e2e43b 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: 2019-07-02 02:06+0000\n"
+"POT-Creation-Date: 2019-08-11 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,71 +33,71 @@ msgstr ""
 "X-Poedit-Language: Czech\n"
 "X-Poedit-Country: CZECH REPUBLIC\n"
 
-#: gajim/chat_control_base.py:550
+#: gajim/chat_control_base.py:557
 msgid "_Undo"
 msgstr ""
 
-#: gajim/chat_control_base.py:558 gajim/conversation_textview.py:529
+#: gajim/chat_control_base.py:565 gajim/conversation_textview.py:529
 msgid "_Clear"
 msgstr ""
 
-#: gajim/chat_control_base.py:563
+#: gajim/chat_control_base.py:570
 msgid "Paste as quote"
 msgstr ""
 
-#: gajim/chat_control_base.py:613
+#: gajim/chat_control_base.py:620
 #, fuzzy
 msgid "Paste Image"
 msgstr "Vyberte obrázek"
 
-#: gajim/chat_control_base.py:614
+#: gajim/chat_control_base.py:621
 #, fuzzy
 msgid "You are trying to paste an image"
 msgstr "Chystáte se zavřít několik panelů"
 
-#: gajim/chat_control_base.py:615
+#: gajim/chat_control_base.py:622
 #, 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:617 gajim/groupchat_control.py:2310
-#: gajim/roster_window.py:2848 gajim/roster_window.py:4167
-#: gajim/message_window.py:252 gajim/gtk/dialogs.py:418
+#: gajim/chat_control_base.py:624 gajim/groupchat_control.py:2218
+#: gajim/roster_window.py:2841 gajim/roster_window.py:4118
+#: gajim/message_window.py:359 gajim/gtk/dialogs.py:330
 #, fuzzy
 msgid "_Do not ask me again"
 msgstr "Příště _nezobrazovat"
 
-#: gajim/chat_control_base.py:620
+#: gajim/chat_control_base.py:627
 msgid "_Paste"
 msgstr ""
 
-#: gajim/chat_control_base.py:1162 gajim/gtk/accounts.py:351
+#: gajim/chat_control_base.py:1169 gajim/gtk/accounts.py:354
 #, fuzzy
 msgid "Privacy"
 msgstr "Nastavení Soukromí"
 
-#: gajim/chat_control_base.py:1163
+#: gajim/chat_control_base.py:1170
 #, fuzzy
 msgid "Warning"
 msgstr "Zakazuji %s"
 
-#: gajim/chat_control_base.py:1164
+#: gajim/chat_control_base.py:1171
 #, fuzzy, python-format
 msgid "If you send a file to <b>%s</b>, your real JID will be revealed."
 msgstr "Pokud odešlete soubor %s, tak bude znát vaše skutečné Jabber ID."
 
-#: gajim/chat_control_base.py:1169
+#: gajim/chat_control_base.py:1176
 #, fuzzy
 msgid "Continue"
 msgstr "_Pokračovat"
 
-#: gajim/gtkgui_helpers.py:163 gajim/gtk/filetransfer.py:393
+#: gajim/gtkgui_helpers.py:163 gajim/gtk/filetransfer.py:398
 #, fuzzy, python-format
 msgid "Cannot overwrite existing file '%s'"
 msgstr "Nemohu přepsat existující soubor \"%s\""
 
-#: gajim/gtkgui_helpers.py:164 gajim/gtk/filetransfer.py:394
+#: gajim/gtkgui_helpers.py:164 gajim/gtk/filetransfer.py:399
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
@@ -183,231 +183,224 @@ msgstr "Není zde žádný nevyřízený požadavek."
 msgid " resource with priority "
 msgstr "zdroj s prioritou "
 
-#: gajim/gui_menu_builder.py:96
-msgid "_New Group Chat"
-msgstr "_Nová diskuze"
-
-#: gajim/gui_menu_builder.py:289 gajim/gui_menu_builder.py:380
-#: gajim/chat_control.py:303 gajim/roster_window.py:786
-#: gajim/roster_window.py:1719 gajim/roster_window.py:1721
-#: gajim/roster_window.py:2030 gajim/roster_window.py:3336
-#: gajim/roster_window.py:3369 gajim/gui_interface.py:413
-#: gajim/common/contacts.py:206 gajim/common/contacts.py:343
-#: gajim/common/helpers.py:83 gajim/common/helpers.py:311
-#: gajim/gtk/add_contact.py:319 gajim/gtk/subscription_request.py:70
-#: gajim/gtk/subscription_request.py:99 gajim/gtk/roster_item_exchange.py:112
-msgid "Not in Roster"
-msgstr "Není v Rosteru"
+#: gajim/gui_menu_builder.py:251 gajim/gui_menu_builder.py:342
+#: gajim/chat_control.py:305 gajim/roster_window.py:783
+#: gajim/roster_window.py:1716 gajim/roster_window.py:1718
+#: gajim/roster_window.py:2027 gajim/roster_window.py:3292
+#: gajim/roster_window.py:3325 gajim/gui_interface.py:396
+#: gajim/common/contacts.py:222 gajim/common/contacts.py:359
+#: gajim/common/contacts.py:471 gajim/common/helpers.py:86
+#: gajim/common/helpers.py:317 gajim/gtk/add_contact.py:319
+#: gajim/gtk/subscription_request.py:70 gajim/gtk/subscription_request.py:99
+#: gajim/gtk/roster_item_exchange.py:112
+#, fuzzy
+msgid "Not in contact list"
+msgstr "Zobrazit _odpojené kontakty"
 
-#: gajim/gui_menu_builder.py:393
-msgid "I would like to add you to my roster"
-msgstr "Rád bych si Vás přidal(a) do svého seznamu"
+#: gajim/gui_menu_builder.py:355
+#, 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:471
+#: gajim/gui_menu_builder.py:433
 #, fuzzy
 msgid "Send Single _Message…"
 msgstr "Odeslat jednoduchou _zprávu"
 
-#: gajim/gui_menu_builder.py:486
+#: gajim/gui_menu_builder.py:448
 #, fuzzy
 msgid "E_xecute Command…"
 msgstr "Spustit _příkaz..."
 
-#: gajim/gui_menu_builder.py:494
+#: gajim/gui_menu_builder.py:456
 msgid "_Manage Transport"
 msgstr "Transporty"
 
-#: gajim/gui_menu_builder.py:500
+#: gajim/gui_menu_builder.py:462
 msgid "_Modify Transport"
 msgstr "_Upravit transport"
 
-#: gajim/gui_menu_builder.py:507 gajim/roster_window.py:5046
+#: gajim/gui_menu_builder.py:469 gajim/roster_window.py:4985
 #, fuzzy
 msgid "_Rename…"
 msgstr "_Přejmenovat"
 
-#: gajim/gui_menu_builder.py:518 gajim/roster_window.py:5062
-#: gajim/roster_window.py:5177 gajim/data/gui/blocked_contacts_window.ui:52
+#: gajim/gui_menu_builder.py:480 gajim/roster_window.py:5001
+#: gajim/roster_window.py:5116 gajim/data/gui/blocked_contacts_window.ui:52
 #: gajim/data/gui/gc_occupants_menu.ui:148
 #: gajim/data/gui/contact_context_menu.ui:143
 msgid "_Unblock"
 msgstr "_Odblokovat"
 
-#: gajim/gui_menu_builder.py:521 gajim/roster_window.py:5067
-#: gajim/roster_window.py:5181 gajim/data/gui/gc_occupants_menu.ui:140
+#: gajim/gui_menu_builder.py:483 gajim/roster_window.py:5006
+#: gajim/roster_window.py:5120 gajim/data/gui/gc_occupants_menu.ui:140
 #: gajim/data/gui/contact_context_menu.ui:151
 msgid "_Block"
 msgstr "_Blokovat"
 
-#: gajim/gui_menu_builder.py:529 gajim/roster_window.py:5074
+#: gajim/gui_menu_builder.py:491 gajim/roster_window.py:5013
 #: gajim/data/gui/contact_context_menu.ui:181
 msgid "Remo_ve"
 msgstr "Odst_ranit"
 
-#: gajim/gui_menu_builder.py:539 gajim/data/gui/contact_context_menu.ui:198
+#: gajim/gui_menu_builder.py:501 gajim/data/gui/contact_context_menu.ui:198
 msgid "_Information"
 msgstr "Informace o kontaktu"
 
-#: gajim/gui_menu_builder.py:552
+#: gajim/gui_menu_builder.py:514
 #, fuzzy
 msgid "Save _As"
 msgstr "Má"
 
-#: gajim/gui_menu_builder.py:564 gajim/groupchat_control.py:501
-#: gajim/chat_control.py:340
+#: gajim/gui_menu_builder.py:526 gajim/groupchat_control.py:507
+#: gajim/chat_control.py:342
 #, fuzzy
 msgid "Send File…"
 msgstr "Odeslat _Soubor"
 
-#: gajim/gui_menu_builder.py:565
+#: gajim/gui_menu_builder.py:527
 #, fuzzy
 msgid "Upload File…"
 msgstr "Uložit jako..."
 
-#: gajim/gui_menu_builder.py:566
+#: gajim/gui_menu_builder.py:528
 #, fuzzy
 msgid "Send File Directly…"
 msgstr "Uložit jako..."
 
-#: gajim/gui_menu_builder.py:568 gajim/gui_menu_builder.py:632
+#: gajim/gui_menu_builder.py:530 gajim/gui_menu_builder.py:596
 #, fuzzy
 msgid "Send Chatstate"
 msgstr "Poslední stav: %s"
 
-#: gajim/gui_menu_builder.py:569
+#: gajim/gui_menu_builder.py:531
 #, fuzzy
 msgid "Invite Contacts"
 msgstr "Pozvat kontakt"
 
-#: gajim/gui_menu_builder.py:570
+#: gajim/gui_menu_builder.py:532
 #, fuzzy
-msgid "Add to Roster"
-msgstr "Přid_at do Seznamu"
+msgid "Add to Contact List"
+msgstr "Přid_at kontakt..."
 
-#: gajim/gui_menu_builder.py:571
+#: gajim/gui_menu_builder.py:533
 #, fuzzy
-msgid "Audio Session"
-msgstr "Audio / Video"
+msgid "Voice Chat"
+msgstr "Žádost o hlasový rozhovor"
 
-#: gajim/gui_menu_builder.py:572
+#: gajim/gui_menu_builder.py:534
 #, fuzzy
-msgid "Video Session"
+msgid "Video Chat"
 msgstr "Velikost videa"
 
-#: gajim/gui_menu_builder.py:573
+#: gajim/gui_menu_builder.py:535 gajim/gui_menu_builder.py:582
 #, fuzzy
 msgid "Information"
 msgstr "Informace o kontaktu"
 
-#: gajim/gui_menu_builder.py:574 gajim/gui_menu_builder.py:639
+#: gajim/gui_menu_builder.py:536 gajim/gui_menu_builder.py:602
 #: gajim/data/gui/application_menu.ui:37
 #, fuzzy
 msgid "History"
 msgstr "_Historie"
 
-#: gajim/gui_menu_builder.py:580 gajim/gui_menu_builder.py:687
+#: gajim/gui_menu_builder.py:542 gajim/gui_menu_builder.py:650
 #: gajim/data/gui/preferences_window.ui:1823
 msgid "Disabled"
 msgstr "Vypnuto"
 
-#: gajim/gui_menu_builder.py:581 gajim/gui_menu_builder.py:688
+#: gajim/gui_menu_builder.py:543 gajim/gui_menu_builder.py:651
 #, fuzzy
 msgid "Composing only"
 msgstr "Píšu zprávu"
 
-#: gajim/gui_menu_builder.py:582 gajim/gui_menu_builder.py:689
+#: gajim/gui_menu_builder.py:544 gajim/gui_menu_builder.py:652
 #, fuzzy
 msgid "All chat states"
 msgstr "Všechny stavy"
 
-#: gajim/gui_menu_builder.py:620
+#: gajim/gui_menu_builder.py:583
 #, fuzzy
-msgid "Manage Room"
-msgstr "Spravuj Místnost"
+msgid "Manage Group Chat"
+msgstr "Opustit diskuzi"
 
-#: gajim/gui_menu_builder.py:621
+#: gajim/gui_menu_builder.py:584 gajim/data/gui/groupchat_control.ui:649
 #, fuzzy
 msgid "Change Subject"
 msgstr "Změnit _předmět"
 
-#: gajim/gui_menu_builder.py:622
+#: gajim/gui_menu_builder.py:585
 #, fuzzy
-msgid "Configure Room"
-msgstr "Nastavit _místnost"
+msgid "Configure Group Chat"
+msgstr "Opustit diskuzi"
 
-#: gajim/gui_menu_builder.py:623
+#: gajim/gui_menu_builder.py:586
 #, fuzzy
 msgid "Upload Avatar…"
 msgstr "Vyberte obrázek"
 
-#: gajim/gui_menu_builder.py:624
+#: gajim/gui_menu_builder.py:587
 #, fuzzy
-msgid "Destroy Room"
-msgstr "_Zničit místnost"
+msgid "Destroy Group Chat"
+msgstr "Nová diskuze"
 
-#: gajim/gui_menu_builder.py:626 gajim/data/gui/preferences_window.ui:790
+#: gajim/gui_menu_builder.py:589 gajim/data/gui/preferences_window.ui:790
 #, fuzzy
 msgid "Chat Settings"
 msgstr "Registrace selhala"
 
-#: gajim/gui_menu_builder.py:627
+#: gajim/gui_menu_builder.py:590
 msgid "Show join/leave"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:628
+#: gajim/gui_menu_builder.py:591
 #, fuzzy
 msgid "Show status changes"
 msgstr "Zaznamenávat změny _stavu kontaktů"
 
-#: gajim/gui_menu_builder.py:629 gajim/data/gui/gc_control_popup_menu.ui:72
+#: gajim/gui_menu_builder.py:592 gajim/data/gui/gc_control_popup_menu.ui:72
 #, fuzzy
 msgid "Notify on all messages"
 msgstr "Uložené stavy:"
 
-#: gajim/gui_menu_builder.py:630
+#: gajim/gui_menu_builder.py:593
 #, fuzzy
 msgid "Minimize on close"
 msgstr "_Minimalizovat při zavření"
 
-#: gajim/gui_menu_builder.py:631
+#: gajim/gui_menu_builder.py:595
 #, fuzzy
-msgid "Minimize on autojoin"
+msgid "Minimize when joining automatically"
 msgstr "Minimalizovat po připojení"
 
-#: gajim/gui_menu_builder.py:634
+#: gajim/gui_menu_builder.py:598
 msgid "Sync Threshold"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:635
+#: gajim/gui_menu_builder.py:599
 #, fuzzy
-msgid "Change Nick"
+msgid "Change Nickname"
 msgstr "Změ_nit přezdívku"
 
-#: gajim/gui_menu_builder.py:636
-#, fuzzy
-msgid "Bookmark Room"
-msgstr "Přidat tuto místnost do záložek"
-
-#: gajim/gui_menu_builder.py:637
+#: gajim/gui_menu_builder.py:600
 #, fuzzy
 msgid "Request Voice"
 msgstr "_Hlas"
 
-#: gajim/gui_menu_builder.py:638 gajim/roster_window.py:5246
+#: gajim/gui_menu_builder.py:601 gajim/roster_window.py:5185
 #, fuzzy
 msgid "Execute command"
 msgstr "Spustit _příkaz..."
 
-#: gajim/gui_menu_builder.py:640
-#, fuzzy
-msgid "Disconnect"
-msgstr "_Odpojit"
+#: gajim/gui_menu_builder.py:603
+msgid "Leave"
+msgstr ""
 
-#: gajim/gui_menu_builder.py:678 gajim/gtk/preferences.py:156
+#: gajim/gui_menu_builder.py:641 gajim/gtk/preferences.py:155
 msgid "No threshold"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:680 gajim/gtk/preferences.py:158
+#: gajim/gui_menu_builder.py:643 gajim/gtk/preferences.py:157
 #, fuzzy, python-format
 msgid "%i day"
 msgid_plural "%i days"
@@ -415,160 +408,175 @@ msgstr[0] "před %i dny"
 msgstr[1] "před %i dny"
 msgstr[2] "před %i dny"
 
-#: gajim/gui_menu_builder.py:709 gajim/gui_menu_builder.py:747
-#: gajim/gtk/join_groupchat.py:43
-msgid "Join Group Chat"
-msgstr "Připojit se do diskuze"
-
-#: gajim/gui_menu_builder.py:746
+#: gajim/gui_menu_builder.py:672
 #, fuzzy
 msgid "Add Contact…"
 msgstr "Přid_at kontakt..."
 
-#: gajim/gui_menu_builder.py:748 gajim/gtk/profile.py:52
-#: gajim/gtk/accounts.py:770 gajim/gtk/accounts.py:808
+#: gajim/gui_menu_builder.py:673 gajim/gtk/profile.py:52
+#: gajim/gtk/accounts.py:773 gajim/gtk/accounts.py:811
 #, fuzzy
 msgid "Profile"
 msgstr "soubor"
 
+#: gajim/gui_menu_builder.py:674
+#, fuzzy
+msgid "Send Single Message…"
+msgstr "Odeslat jednoduchou _zprávu"
+
 # FIXME: chtelo by to cesky vyraz pro service discovery
-#: gajim/gui_menu_builder.py:749
+#: gajim/gui_menu_builder.py:675
 #, fuzzy
 msgid "Discover Services"
 msgstr "_Prohlížet služby"
 
-#: gajim/gui_menu_builder.py:750
+#: gajim/gui_menu_builder.py:676 gajim/gtk/server_info.py:36
 #, fuzzy
-msgid "Send Single Message…"
-msgstr "Odeslat jednoduchou _zprávu"
+msgid "Server Info"
+msgstr "Server"
 
-#: gajim/gui_menu_builder.py:751 gajim/data/gui/preferences_window.ui:2741
+#: gajim/gui_menu_builder.py:677 gajim/data/gui/preferences_window.ui:2741
 msgid "Advanced"
 msgstr "Rozšířené"
 
-#: gajim/gui_menu_builder.py:752 gajim/gtk/mam_preferences.py:88
+#: gajim/gui_menu_builder.py:678 gajim/gtk/mam_preferences.py:88
 #, fuzzy
 msgid "Archiving Preferences"
 msgstr "_Nastavení"
 
-#: gajim/gui_menu_builder.py:753
+#: gajim/gui_menu_builder.py:679
 #, fuzzy
 msgid "Blocking List"
 msgstr "Ban List"
 
-#: gajim/gui_menu_builder.py:754 gajim/gtk/history_sync.py:108
+#: gajim/gui_menu_builder.py:680
+#, fuzzy
+msgid "Bookmarks"
+msgstr "_Záložky"
+
+#: gajim/gui_menu_builder.py:681
+#, fuzzy
+msgid "PEP Configuration"
+msgstr "Nastavení místnosti"
+
+#: gajim/gui_menu_builder.py:682 gajim/gtk/history_sync.py:108
 #: gajim/gtk/history_sync.py:186
 #, fuzzy
 msgid "Synchronise History"
 msgstr "Synchronizovat"
 
-#: gajim/gui_menu_builder.py:755 gajim/gtk/privacy_list.py:427
+#: gajim/gui_menu_builder.py:683 gajim/gtk/privacy_list.py:427
 msgid "Privacy Lists"
 msgstr "Soukromý Seznam"
 
-#: gajim/gui_menu_builder.py:756 gajim/gtk/server_info.py:36
-#, fuzzy
-msgid "Server Info"
-msgstr "Server"
-
-#: gajim/gui_menu_builder.py:757 gajim/gui_menu_builder.py:768
+#: gajim/gui_menu_builder.py:685 gajim/gui_menu_builder.py:696
 #: gajim/data/gui/xml_console_window.ui:77
 msgid "XML Console"
 msgstr "XML Konzole"
 
-#: gajim/gui_menu_builder.py:759 gajim/data/gui/groupchat_config.ui:36
+#: gajim/gui_menu_builder.py:687 gajim/data/gui/groupchat_config.ui:36
 #, fuzzy
 msgid "Admin"
 msgstr "_Správce"
 
-#: gajim/gui_menu_builder.py:760
+#: gajim/gui_menu_builder.py:688
 #, fuzzy
 msgid "Send Server Message…"
 msgstr "Ode_slat zprávu serveru"
 
-#: gajim/gui_menu_builder.py:761
+#: gajim/gui_menu_builder.py:689
 #, fuzzy
 msgid "Set MOTD…"
 msgstr "Nastavit MOTD"
 
-#: gajim/gui_menu_builder.py:762
+#: gajim/gui_menu_builder.py:690
 #, fuzzy
 msgid "Update MOTD…"
 msgstr "Upravit MOTD"
 
-#: gajim/gui_menu_builder.py:763
+#: gajim/gui_menu_builder.py:691
 #, fuzzy
 msgid "Delete MOTD…"
 msgstr "Smazat MOTD"
 
-#: gajim/gui_menu_builder.py:812
+#: gajim/gui_menu_builder.py:736
 #, fuzzy
-msgid "No Accounts available"
-msgstr "Žádný účet není dostupný"
+msgid "_Add Account…"
+msgstr "Přid_at kontakt..."
 
-#: gajim/gui_menu_builder.py:823 gajim/data/gui/application_menu.ui:5
-#: gajim/data/gui/application_menu.ui:71 gajim/data/gui/shortcuts_window.ui:182
-#: gajim/gtk/accounts.py:58
+#: gajim/gui_menu_builder.py:742
+#, fuzzy
+msgid "_Modify Accounts…"
+msgstr "Upravit účet"
+
+#: gajim/gui_menu_builder.py:751 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:755 gajim/data/gui/application_menu.ui:5
+#: gajim/data/gui/shortcuts_window.ui:182 gajim/gtk/accounts.py:57
 msgid "Accounts"
 msgstr "Účty"
 
-#: gajim/gui_menu_builder.py:881 gajim/gui_menu_builder.py:886
+#: gajim/gui_menu_builder.py:784 gajim/gui_menu_builder.py:789
 #, fuzzy
-msgid "Copy JID"
-msgstr "JID Místnosti"
+msgid "Copy XMPP Address"
+msgstr "_Kopírovat JID/Emailovou adresu"
 
-#: gajim/gui_menu_builder.py:882 gajim/gui_menu_builder.py:914
+#: gajim/gui_menu_builder.py:785 gajim/gui_menu_builder.py:817
 #, fuzzy
 msgid "Join Groupchat"
 msgstr "Připojit se do diskuze"
 
-#: gajim/gui_menu_builder.py:887 gajim/gui_menu_builder.py:913
-#: gajim/data/gui/application_menu.ui:76
+#: gajim/gui_menu_builder.py:790 gajim/gui_menu_builder.py:816
+#: gajim/data/gui/application_menu.ui:71
 #: gajim/data/gui/subscription_request_window.ui:106
 msgid "Start Chat"
 msgstr "Začít rozhovor"
 
-#: gajim/gui_menu_builder.py:888 gajim/gui_menu_builder.py:915
+#: gajim/gui_menu_builder.py:791 gajim/gui_menu_builder.py:818
 #, fuzzy
-msgid "Add to Roster…"
-msgstr "Přid_at do Seznamu"
+msgid "Add to Contact List…"
+msgstr "Přid_at kontakt..."
 
-#: gajim/gui_menu_builder.py:893
+#: gajim/gui_menu_builder.py:796
 #, fuzzy
 msgid "Copy Link Location"
 msgstr "_Kopírovat odkaz"
 
-#: gajim/gui_menu_builder.py:894
+#: gajim/gui_menu_builder.py:797
 #, fuzzy
 msgid "Open Link in Browser"
 msgstr "_Otevřít v prohlížeči"
 
-#: gajim/gui_menu_builder.py:899
+#: gajim/gui_menu_builder.py:802
 #, fuzzy
 msgid "Copy Email Address"
 msgstr "_Kopírovat JID/Emailovou adresu"
 
-#: gajim/gui_menu_builder.py:900 gajim/gui_menu_builder.py:912
+#: gajim/gui_menu_builder.py:803 gajim/gui_menu_builder.py:815
 #, fuzzy
 msgid "Open Email Composer"
 msgstr "_Otevři Emailový editor"
 
-#: gajim/gui_menu_builder.py:905
+#: gajim/gui_menu_builder.py:808
 #, fuzzy
 msgid "Copy Location"
 msgstr "_Kopírovat odkaz"
 
-#: gajim/gui_menu_builder.py:906
+#: gajim/gui_menu_builder.py:809
 #, fuzzy
 msgid "Show Location"
 msgstr "Upozornění"
 
-#: gajim/gui_menu_builder.py:911
+#: gajim/gui_menu_builder.py:814
 #, fuzzy
-msgid "Copy JID/Email"
+msgid "Copy XMPP Address/Email"
 msgstr "_Kopírovat JID/Emailovou adresu"
 
-#: gajim/gui_menu_builder.py:945
+#: gajim/gui_menu_builder.py:852
 #, fuzzy
 msgid "Copy"
 msgstr "JID Místnosti"
@@ -591,44 +599,56 @@ msgstr ""
 msgid "Choose folder for logfile"
 msgstr ""
 
-#: gajim/history_manager.py:107
+#: gajim/history_manager.py:106
 msgid "Cannot find history logs database"
 msgstr "Nemůžu nalézt databázi s historií"
 
-#: gajim/history_manager.py:108
+#: gajim/history_manager.py:107
 #, fuzzy, python-format
 msgid "%s does not exist."
 msgstr "Soubor neexistuje"
 
-#: gajim/history_manager.py:141 gajim/history_manager.py:195
-#: gajim/gtk/discovery.py:829 gajim/gtk/roster_item_exchange.py:80
-msgid "JID"
-msgstr "JID"
+#: gajim/history_manager.py:140 gajim/history_manager.py:194
+#: 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:30
+#: gajim/gtk/accounts.py:804
+#, fuzzy
+msgid "XMPP Address"
+msgstr "AIM adresa:"
 
-#: gajim/history_manager.py:154 gajim/history_manager.py:202
+#: gajim/history_manager.py:153 gajim/history_manager.py:201
 #: gajim/data/gui/history_window.ui:89 gajim/gtk/history.py:108
 msgid "Date"
 msgstr "Datum"
 
-#: gajim/history_manager.py:161 gajim/history_manager.py:225
+#: gajim/history_manager.py:160 gajim/history_manager.py:224
 #: gajim/data/gui/join_groupchat_window.ui:208
 #: gajim/data/gui/profile_window.ui:214
 #: gajim/data/gui/vcard_information_window.ui:443
+#: gajim/data/gui/bookmarks.ui:140
 msgid "Nickname"
 msgstr "Přezdívka"
 
-#: gajim/history_manager.py:172 gajim/history_manager.py:211
+#: gajim/history_manager.py:171 gajim/history_manager.py:210
 #: gajim/data/gui/preferences_window.ui:1344
 #: gajim/data/gui/single_message_window.ui:275 gajim/gtk/history.py:117
 msgid "Message"
 msgstr "Zpráva"
 
-#: gajim/history_manager.py:180 gajim/history_manager.py:218
+#: gajim/history_manager.py:179 gajim/history_manager.py:217
 #: gajim/data/gui/groups_post_window.ui:49
 #: gajim/data/gui/single_message_window.ui:214
 msgid "Subject"
 msgstr "Předmět"
 
+#: gajim/history_manager.py:247
+#, fuzzy
+msgid "Database Cleanup"
+msgstr "Chyba Databáze"
+
 #: gajim/history_manager.py:248
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
@@ -638,11 +658,8 @@ msgstr "Chcete pročistit databázi? (VELICE NEDOPORUČUJEME POKUD GAJIM BĚŽÍ
 #: gajim/history_manager.py:250
 #, fuzzy
 msgid ""
-"Normally allocated database size will not be freed, it will just become "
-"reusable. If you really want to reduce database filesize, click YES, else "
-"click NO.\n"
-"\n"
-"In case you click YES, please wait…"
+"Normally, the allocated database size will not be freed, it will just become "
+"reusable. This operation may take a while."
 msgstr ""
 "Běžně se velikost alokovaná databází neuvolňuje, pouze se označí k novému "
 "použití. Pokud opravdu chcete snížit velikost databáze, klikněte ANO, jinak "
@@ -652,26 +669,26 @@ msgstr ""
 
 #: gajim/history_manager.py:255
 #, fuzzy
-msgid "Database Cleanup"
-msgstr "Chyba Databáze"
+msgid "_Cleanup"
+msgstr "_Vymazat"
 
-#: gajim/history_manager.py:519 gajim/gtk/filetransfer.py:238
-#: gajim/gtk/filetransfer.py:248
+#: gajim/history_manager.py:518 gajim/gtk/filetransfer.py:237
+#: gajim/gtk/filetransfer.py:247
 msgid "You"
 msgstr "Vy"
 
-#: gajim/history_manager.py:531
+#: gajim/history_manager.py:530
 #, 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:568 gajim/history_manager.py:607
-#: gajim/gtk/dialogs.py:58 gajim/gtk/themes.py:319
+#: gajim/history_manager.py:567 gajim/history_manager.py:606
+#: gajim/gtk/dialogs.py:57 gajim/gtk/themes.py:319
 #: gajim/gtk/roster_item_exchange.py:75 gajim/gtk/roster_item_exchange.py:185
 msgid "Delete"
 msgstr "Smazat"
 
-#: gajim/history_manager.py:569
+#: gajim/history_manager.py:568
 #, fuzzy
 msgid "Delete Conversation"
 msgid_plural "Delete Conversations"
@@ -679,7 +696,7 @@ msgstr[0] "Zrušit ověření"
 msgstr[1] "Zrušit ověření"
 msgstr[2] "Zrušit ověření"
 
-#: gajim/history_manager.py:570
+#: gajim/history_manager.py:569
 #, 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?"
@@ -687,7 +704,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:608
+#: gajim/history_manager.py:607
 #, fuzzy
 msgid "Delete Message"
 msgid_plural "Delete Messages"
@@ -695,7 +712,7 @@ msgstr[0] "Výchozí Zpráva"
 msgstr[1] "Výchozí Zpráva"
 msgstr[2] "Výchozí Zpráva"
 
-#: gajim/history_manager.py:609
+#: gajim/history_manager.py:608
 #, fuzzy
 msgid "Do you want to permanently delete this message"
 msgid_plural "Do you want to permanently delete these messages"
@@ -709,15 +726,15 @@ msgid "Contact name: <i>%s</i>"
 msgstr "Jméno kontaktu: <i>%s</i>"
 
 #: gajim/dialogs.py:84
-#, fuzzy, python-format
-msgid "JID: <i>%s</i>"
-msgstr "Jabber ID: <i>%s</i>"
+#, python-format
+msgid "XMPP Address: <i>%s</i>"
+msgstr ""
 
-#: gajim/dialogs.py:115 gajim/dialogs.py:128 gajim/roster_window.py:2901
-#: gajim/roster_window.py:3833 gajim/roster_window.py:5084
-#: gajim/common/contacts.py:157 gajim/common/contacts.py:190
+#: gajim/dialogs.py:115 gajim/dialogs.py:128 gajim/roster_window.py:2894
+#: gajim/roster_window.py:3784 gajim/roster_window.py:5023
+#: gajim/common/contacts.py:157 gajim/common/contacts.py:206
 #: gajim/data/gui/preferences_window.ui:558
-#: gajim/data/gui/shortcuts_window.ui:177 gajim/gtk/accounts.py:349
+#: gajim/data/gui/shortcuts_window.ui:177 gajim/gtk/accounts.py:352
 msgid "General"
 msgstr "Obecné"
 
@@ -762,7 +779,7 @@ msgstr "Přepsat Text stavu?"
 msgid "Preset 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:703
+#: gajim/dialogs.py:703 gajim/plugins/gui.py:292
 msgid "_Overwrite"
 msgstr ""
 
@@ -774,9 +791,7 @@ msgstr "Uložit jako přednastavený stav"
 msgid "Please type a name for this status message"
 msgstr "Napište jméno pro tento stav"
 
-#: gajim/dialogs.py:740 gajim/gui_interface.py:1441 gajim/dialog_messages.py:31
-#: gajim/gtk/discovery.py:518 gajim/gtk/profile.py:323
-#: gajim/gtk/join_groupchat.py:234
+#: gajim/dialogs.py:740 gajim/gtk/discovery.py:517 gajim/gtk/profile.py:323
 msgid "You are not connected to the server"
 msgstr "Nejste připojen(a) k serveru"
 
@@ -784,9 +799,11 @@ msgstr "Nejste připojen(a) k serveru"
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Nemůžete měnit heslo, pokud nejste připojen(a)."
 
-#: gajim/dialogs.py:752 gajim/dialogs.py:823 gajim/gtk/discovery.py:822
-#: gajim/gtk/discovery.py:1648 gajim/gtk/discovery.py:1941
-#: gajim/gtk/history.py:99 gajim/gtk/roster_item_exchange.py:83
+#: gajim/dialogs.py:752 gajim/dialogs.py:823
+#: gajim/data/gui/groupchat_info_scrolled.ui:16 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/gtk/roster_item_exchange.py:83
 msgid "Name"
 msgstr "Jméno"
 
@@ -806,399 +823,346 @@ msgstr "Nemůžete synchronyzovat účet pokud nění připojen."
 msgid "Synchronise"
 msgstr "Synchronizovat"
 
-#: gajim/dialogs.py:1043
+#: gajim/dialogs.py:1042
 msgid "an audio and video"
 msgstr "audio a video"
 
-#: gajim/dialogs.py:1045
+#: gajim/dialogs.py:1044
 msgid "an audio"
 msgstr "audio"
 
-#: gajim/dialogs.py:1047
+#: gajim/dialogs.py:1046
 msgid "a video"
 msgstr "video"
 
-#: gajim/dialogs.py:1051
-#, python-format
+#: gajim/dialogs.py:1050
+#, fuzzy, python-format
 msgid ""
-"%(contact)s wants to start %(type)s session with you. Do you want to answer "
+"%(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:505
+#: gajim/groupchat_control.py:511
 #, fuzzy, python-format
 msgid "Send File (max. %s MiB)…"
 msgstr "Uložit jako..."
 
-#: gajim/groupchat_control.py:507 gajim/chat_control.py:342
+#: gajim/groupchat_control.py:513 gajim/chat_control.py:344
 #, fuzzy
 msgid "No File Transfer available"
 msgstr "Přenos souboru dokončen"
 
-#: gajim/groupchat_control.py:630 gajim/groupchat_control.py:2349
-msgid "Changing Subject"
-msgstr "Měním Téma"
-
-#: gajim/groupchat_control.py:631 gajim/groupchat_control.py:2350
-msgid "Please specify the new subject:"
-msgstr "Prosím zadejte nové téma:"
-
-#: gajim/groupchat_control.py:638
-msgid "Changing Nickname"
-msgstr "Měním přezdívku"
-
-#: gajim/groupchat_control.py:639
-msgid "Please specify the new nickname you want to use:"
-msgstr "Prosím zadejte novou přezdívku, kterou chcete používat:"
-
-#: gajim/groupchat_control.py:657
+#: gajim/groupchat_control.py:655
 #, fuzzy
-msgid "Invalid group chat JID"
+msgid "Invalid group chat XMPP Address"
 msgstr "Neplatné Jabber ID diskuzní místnosti"
 
-#: gajim/groupchat_control.py:658
+#: gajim/groupchat_control.py:656
 #, fuzzy
-msgid "The group chat JID has not allowed characters."
+msgid "The group chat XMPP Address has not allowed characters."
 msgstr "Jabber ID diskuze obsahuje nepřijatelné znaky."
 
-#: gajim/groupchat_control.py:758 gajim/gtk/profile.py:136
+#: gajim/groupchat_control.py:743 gajim/gtk/profile.py:136
 msgid "Could not load image"
 msgstr "Nezdařilo se načtení obrázku"
 
-#: gajim/groupchat_control.py:888
+#: gajim/groupchat_control.py:873
 msgid "Insert Nickname"
 msgstr "Vložit přezdívku"
 
-#: gajim/groupchat_control.py:1056 gajim/chat_control.py:824
+#: gajim/groupchat_control.py:1041 gajim/chat_control.py:848
 msgid "and authenticated"
 msgstr "a autentizovaný"
 
-#: gajim/groupchat_control.py:1060 gajim/chat_control.py:828
+#: gajim/groupchat_control.py:1045 gajim/chat_control.py:852
 msgid "and NOT authenticated"
 msgstr "a NEautentizovaný"
 
-#: gajim/groupchat_control.py:1064
+#: gajim/groupchat_control.py:1049
 #, 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/groupchat_control.py:1111
+#: gajim/groupchat_control.py:1096
 msgid "Conversation with "
 msgstr "Rozhovor s"
 
-#: gajim/groupchat_control.py:1113
+#: gajim/groupchat_control.py:1098
 msgid "Continued conversation"
 msgstr "Pokračování v rozhovoru"
 
-#: gajim/groupchat_control.py:1411
+#: gajim/groupchat_control.py:1357
 #, 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:1433
+#: gajim/groupchat_control.py:1374
 #, fuzzy
-msgid "Room now shows unavailable members"
+msgid "Group chat now shows unavailable members"
 msgstr "Místnost nyní zobrazuje nedostupné členy"
 
-#: gajim/groupchat_control.py:1436
+#: gajim/groupchat_control.py:1377
 #, fuzzy
-msgid "Room now does not show unavailable members"
+msgid "Group chat now does not show unavailable members"
 msgstr "místnost nyní nezobrazuje nedostupné členy"
 
-#: gajim/groupchat_control.py:1439
+#: gajim/groupchat_control.py:1380
 msgid "A setting not related to privacy has been changed"
 msgstr ""
 
-#: gajim/groupchat_control.py:1446
-msgid "Room logging is now enabled"
-msgstr "Zaznamenávání historie je zapnuto"
+#: gajim/groupchat_control.py:1387 gajim/groupchat_control.py:1659
+#, fuzzy
+msgid "Conversations are stored on the server"
+msgstr "Sezení NEBUDE logováno"
 
-#: gajim/groupchat_control.py:1449
-msgid "Room logging is now disabled"
-msgstr "Zaznamenávání historie je vypnuto"
+#: gajim/groupchat_control.py:1390
+#, fuzzy
+msgid "Conversations are not stored on the server"
+msgstr "Informace o Vás, jak jsou uloženy na serveru"
 
-#: gajim/groupchat_control.py:1452
-msgid "Room is now non-anonymous"
+#: gajim/groupchat_control.py:1393
+#, fuzzy
+msgid "Group chat is now non-anonymous"
 msgstr "Místnost není anonymní"
 
-#: gajim/groupchat_control.py:1456
-msgid "Room is now semi-anonymous"
+#: gajim/groupchat_control.py:1397
+#, fuzzy
+msgid "Group chat is now semi-anonymous"
 msgstr "Místnost je částečně anonymní"
 
-#: gajim/groupchat_control.py:1460
+#: gajim/groupchat_control.py:1401
 #, fuzzy
-msgid "Room is now fully anonymous"
+msgid "Group chat is now fully anonymous"
 msgstr "Místnost je plně anonymní"
 
-#: gajim/groupchat_control.py:1500
+#: gajim/groupchat_control.py:1439
 #, fuzzy, python-format
 msgid "Ping? (%s)"
 msgstr "Pong! (%s s.)"
 
-#: gajim/groupchat_control.py:1503
+#: gajim/groupchat_control.py:1442
 #, fuzzy, python-format
 msgid "Pong! (%(nick)s %(delay)s s.)"
 msgstr "Pong! (%s s.)"
 
-#: gajim/groupchat_control.py:1506 gajim/chat_control.py:1213
+#: gajim/groupchat_control.py:1445 gajim/chat_control.py:1237
 msgid "Error."
 msgstr "Chyba."
 
-#: gajim/groupchat_control.py:1711
+#: gajim/groupchat_control.py:1650
 #, fuzzy, python-format
-msgid "You (%s) joined the room"
+msgid "You (%s) joined the group chat"
 msgstr "%s vstoupil do místnosti"
 
-#: gajim/groupchat_control.py:1717
-msgid "Any occupant is allowed to see your full JID"
+#: gajim/groupchat_control.py:1655
+#, fuzzy
+msgid "Any participant is allowed to see your full XMPP Address"
 msgstr "Každý návštěvník uvidí váš úplný JID"
 
-#: gajim/groupchat_control.py:1721
-msgid "Room logging is enabled"
-msgstr "Zaznamenávání historie je povoleno"
-
-#: gajim/groupchat_control.py:1725
-msgid "The server has assigned or modified your roomnick"
+#: gajim/groupchat_control.py:1663
+#, fuzzy
+msgid "The server has assigned or modified your nickname in this group chat"
 msgstr "Server přidělil nebo změnil název vaší místnosti"
 
-#: gajim/groupchat_control.py:1732
-msgid "A new room has been created"
+#: gajim/groupchat_control.py:1671
+#, fuzzy
+msgid "A new group chat has been created"
 msgstr "Nová místnost byla vytvořena"
 
-#: gajim/groupchat_control.py:1740 gajim/privatechat_control.py:112
+#: gajim/groupchat_control.py:1679 gajim/privatechat_control.py:115
 #, python-format
 msgid "You are now known as %s"
 msgstr "Jste nyní znám(a) jako %s"
 
-#: gajim/groupchat_control.py:1742 gajim/privatechat_control.py:114
+#: gajim/groupchat_control.py:1681 gajim/privatechat_control.py:117
 #, 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:1767 gajim/privatechat_control.py:141
+#: gajim/groupchat_control.py:1706 gajim/privatechat_control.py:144
 #, fuzzy, python-brace-format
 msgid "You are now {show}{status}"
 msgstr "Jste nyní znám(a) jako %s"
 
-#: gajim/groupchat_control.py:1773 gajim/privatechat_control.py:147
+#: gajim/groupchat_control.py:1712 gajim/privatechat_control.py:150
 #, fuzzy, python-brace-format
 msgid "{nick} is now {show}{status}"
 msgstr "%(nick)s je nyní %(status)s"
 
-#: gajim/groupchat_control.py:1790 gajim/groupchat_control.py:1819
-#: gajim/groupchat_control.py:1849 gajim/groupchat_control.py:1909
+#: gajim/groupchat_control.py:1729 gajim/groupchat_control.py:1758
+#: gajim/groupchat_control.py:1788 gajim/groupchat_control.py:1848
 #, python-brace-format
 msgid " by {actor}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1793
+#: gajim/groupchat_control.py:1732
 #, fuzzy, python-brace-format
 msgid "** Your Affiliation has been set to {affiliation}{actor}{reason}"
 msgstr "** %(actor)s nastavil(a) vztah %(nick)s na %(affiliation)s"
 
-#: gajim/groupchat_control.py:1799
+#: gajim/groupchat_control.py:1738
 #, fuzzy, python-brace-format
 msgid "** Affiliation of {nick} has been set to {affiliation}{actor}{reason}"
 msgstr "** Vztah %(nick)s byl nastaven na %(affiliation)s"
 
-#: gajim/groupchat_control.py:1822
+#: gajim/groupchat_control.py:1761
 #, fuzzy, python-brace-format
 msgid "** Your Role has been set to {role}{actor}{reason}"
 msgstr "** %(actor)s nastavil(a) postavení %(nick)s na %(role)s"
 
-#: gajim/groupchat_control.py:1827
+#: gajim/groupchat_control.py:1766
 #, fuzzy, python-brace-format
 msgid "** Role of {nick} has been set to {role}{actor}{reason}"
 msgstr "** %(actor)s nastavil(a) postavení %(nick)s na %(role)s"
 
-#: gajim/groupchat_control.py:1852
+#: gajim/groupchat_control.py:1791
 #, fuzzy, python-brace-format
-msgid "You have been removed from the room{actor}{reason}"
+msgid "You have been removed from the group chat{actor}{reason}"
 msgstr "%(nick)s byli vyhozeni z místnosti: %(reason)s"
 
-#: gajim/groupchat_control.py:1857
+#: gajim/groupchat_control.py:1796
 #, python-brace-format
 msgid "You have left due to an error{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1863
+#: gajim/groupchat_control.py:1802
 #, python-brace-format
 msgid "You have been kicked{actor}{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1870
+#: gajim/groupchat_control.py:1809
 #, python-brace-format
 msgid "You have been banned{actor}{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1877 gajim/groupchat_control.py:1943
+#: gajim/groupchat_control.py:1816 gajim/groupchat_control.py:1882
 #, fuzzy
 msgid ": Affiliation changed"
 msgstr "Příslušnost:"
 
-#: gajim/groupchat_control.py:1883 gajim/groupchat_control.py:1948
+#: gajim/groupchat_control.py:1822 gajim/groupchat_control.py:1887
 #, fuzzy
-msgid ": Room configuration changed to members-only"
+msgid ": Group chat configuration changed to members-only"
 msgstr "nastavení místnosti se změnilo na vstup pouze členům"
 
-#: gajim/groupchat_control.py:1912
+#: gajim/groupchat_control.py:1851
 #, fuzzy, python-brace-format
-msgid "{nick} has been removed from the room{by}{reason}"
+msgid "{nick} has been removed from the group chat{by}{reason}"
 msgstr "%(nick)s byli vyhozeni z místnosti: %(reason)s"
 
-#: gajim/groupchat_control.py:1922
+#: gajim/groupchat_control.py:1861
 #, python-brace-format
 msgid "{nick} has left due to an error{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1928
+#: gajim/groupchat_control.py:1867
 #, fuzzy, python-brace-format
 msgid "{nick} has been kicked{actor}{reason}"
 msgstr "%(nick)s byli vyhozeni: %(reason)s"
 
 # FIXME: preklad pro ban? zabanovani je hnusne
-#: gajim/groupchat_control.py:1936
+#: gajim/groupchat_control.py:1875
 #, fuzzy, python-brace-format
 msgid "{nick} has been banned{actor}{reason}"
 msgstr "%(nick)s byli zakázáni: %(reason)s"
 
-#: gajim/groupchat_control.py:1953
+#: gajim/groupchat_control.py:1892
 #, python-brace-format
 msgid "{nick} has left{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1970
+#: gajim/groupchat_control.py:1914
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s vstoupil do místnosti"
 
-#: gajim/groupchat_control.py:1985 gajim/groupchat_control.py:1990
-#: gajim/groupchat_control.py:1995 gajim/groupchat_control.py:2000
-#: gajim/groupchat_control.py:2011
-msgid "Unable to join group chat"
-msgstr "Nelze se připojit se do diskuze"
-
-#: gajim/groupchat_control.py:1986
-#, fuzzy, python-format
-msgid "You are banned from group chat <b>%s</b>."
-msgstr "Máš zakázán přístup do diskuze %s."
-
-#: gajim/groupchat_control.py:1991
-#, fuzzy, python-format
-msgid "Remote server <b>%s</b> does not exist."
-msgstr "Diskuze %s neexistuje."
-
-#: gajim/groupchat_control.py:1996
-#, fuzzy, python-format
-msgid "Group chat <b>%s</b> does not exist."
-msgstr "Diskuze %s neexistuje."
-
-#: gajim/groupchat_control.py:2001
-#, fuzzy
-msgid "Group chat creation is not permitted."
-msgstr "Vytváření místností není povoleno."
-
-#: gajim/groupchat_control.py:2005
+#: gajim/groupchat_control.py:1981
 #, fuzzy
-msgid "Unable to join groupchat"
-msgstr "Nelze se připojit se do diskuze"
-
-#: gajim/groupchat_control.py:2006
-#, fuzzy, python-format
-msgid "You must use your registered nickname in <b>%s</b>."
-msgstr "Musí být použita přezdívka, jež máte zaregistrovánu v diskuzi %s."
-
-#: gajim/groupchat_control.py:2012
-#, python-format
-msgid "You are not in the members list in groupchat %s."
-msgstr "Nejsi v seznamu členů diskuze %s."
-
-#: gajim/groupchat_control.py:2068
-msgid "Room has been destroyed"
+msgid "Group chat has been destroyed"
 msgstr "Místnost byla zničena"
 
-#: gajim/groupchat_control.py:2073
+#: gajim/groupchat_control.py:1986
 #, fuzzy, python-format
-msgid "You can join this room instead: xmpp:%s?join"
+msgid "You can join this group chat instead: xmpp:%s?join"
 msgstr "Můžete se připojit do této místnosti: %s"
 
-#: gajim/groupchat_control.py:2306
+#: gajim/groupchat_control.py:2214
 #, fuzzy
 msgid "Leave Group Chat"
 msgstr "Opustit diskuzi"
 
-#: gajim/groupchat_control.py:2307
+#: gajim/groupchat_control.py:2215
 #, fuzzy
 msgid "Are you sure you want to leave this group chat?"
 msgstr "Jste si jistý(á), že chcete opustit místnost \"%s\"?"
 
-#: gajim/groupchat_control.py:2308
+#: gajim/groupchat_control.py:2216
 #, fuzzy, python-format
-msgid "If you close this window, you will be disconnected from '%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:2314
+#: gajim/groupchat_control.py:2222 gajim/roster_window.py:5177
 msgid "_Leave"
 msgstr ""
 
-#: gajim/groupchat_control.py:2377
+#: gajim/groupchat_control.py:2280 gajim/roster_window.py:3008
 #, fuzzy, python-format
 msgid "%(jid)s has been invited to this group chat"
 msgstr "%(nick)s byli vyhozeni z místnosti: %(reason)s"
 
-#: gajim/groupchat_control.py:2527
+#: gajim/groupchat_control.py:2463
 #, python-format
 msgid "Kicking %s"
 msgstr "Vyhazuji %s"
 
-#: gajim/groupchat_control.py:2528 gajim/groupchat_control.py:2829
+#: gajim/groupchat_control.py:2464 gajim/groupchat_control.py:2765
 msgid "You may specify a reason below:"
 msgstr "Můžete uvést důvod níže:"
 
-#: gajim/groupchat_control.py:2828
+#: gajim/groupchat_control.py:2764
 #, python-format
 msgid "Banning %s"
 msgstr "Zakazuji %s"
 
-#: gajim/chat_control.py:408
+#: gajim/chat_control.py:432
 msgid "Show a list of formattings"
 msgstr "Zobrazit seznam formátování"
 
-#: gajim/chat_control.py:412
+#: gajim/chat_control.py:436
 #, fuzzy
 msgid "This contact does not support HTML"
 msgstr "Tento kontakt nepodporuje přenos souborů."
 
-#: gajim/chat_control.py:562
+#: gajim/chat_control.py:586
 #, 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:686
+#: gajim/chat_control.py:710
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s z diskuze %(room_name)s"
 
-#: gajim/chat_control.py:832
+#: gajim/chat_control.py:856
 #, 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.py:1160 gajim/chat_control.py:1168
+#: gajim/chat_control.py:1184 gajim/chat_control.py:1192
 #, fuzzy
 msgid "Close"
 msgstr "Ode_slat a zavřít"
 
-#: gajim/chat_control.py:1161
+#: gajim/chat_control.py:1185
 #, fuzzy, python-format
 msgid "You just received a new message from %s"
 msgstr "Právě jsi obdržela novou zprávu od \"%s\""
 
-#: gajim/chat_control.py:1163
+#: gajim/chat_control.py:1187
 #, fuzzy
 msgid ""
 "If you close this tab while having chat history disabled, this message will "
@@ -1206,16 +1170,16 @@ msgid ""
 msgstr ""
 "Pokud zavřete toto okno a historie je vypnutá, tato zpráva bude ztracena."
 
-#: gajim/chat_control.py:1208
+#: gajim/chat_control.py:1232
 msgid "Ping?"
 msgstr "Ping?"
 
-#: gajim/chat_control.py:1211
+#: gajim/chat_control.py:1235
 #, fuzzy, python-format
 msgid "Pong! (%s seconds)"
 msgstr "Pong! (%s s.)"
 
-#: gajim/chat_control.py:1308
+#: gajim/chat_control.py:1332
 #, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -1224,256 +1188,264 @@ msgstr ""
 "Předmět: %(subject)s\n"
 "%(message)s"
 
-#: gajim/chat_control.py:1416
+#: gajim/chat_control.py:1440
 #, fuzzy, python-format
 msgid "%(name)s is now %(show)s %(status)s"
 msgstr "%(name)s je nyní %(status)s"
 
-#: gajim/chat_control.py:1476 gajim/data/gui/application_menu.ui:32
+#: gajim/chat_control.py:1500 gajim/data/gui/application_menu.ui:32
 #: gajim/gtk/http_upload_progress.py:35
 #, fuzzy
 msgid "File Transfer"
 msgstr "Přenosy souborů"
 
-#: gajim/chat_control.py:1480
+#: gajim/chat_control.py:1504
 #, fuzzy
 msgid "Size"
 msgstr "Velikost: %s"
 
-#: gajim/chat_control.py:1482 gajim/chat_control.py:1546
+#: gajim/chat_control.py:1506 gajim/chat_control.py:1566
+#: gajim/gui_interface.py:190
 #: gajim/data/gui/groupchat_invitation_received.ui:77
-#: gajim/gtk/filetransfer.py:485
+#: gajim/gtk/filetransfer.py:490
 #, fuzzy
 msgid "_Accept"
 msgstr "Přijmi"
 
-#: gajim/chat_control.py:1484 gajim/chat_control.py:1548
+#: gajim/chat_control.py:1508 gajim/chat_control.py:1568
 #: gajim/data/gui/groupchat_invitation_received.ui:62
 #, fuzzy
 msgid "_Decline"
 msgstr "_Odpojen"
 
-#: gajim/chat_control.py:1506 gajim/gui_interface.py:791
-#: gajim/gui_interface.py:821 gajim/gui_interface.py:847
+#: gajim/chat_control.py:1530 gajim/gui_interface.py:777
+#: gajim/gui_interface.py:807 gajim/gui_interface.py:833
 #: gajim/gtk/notification.py:173 gajim/gtk/notification.py:278
 msgid "File Transfer Completed"
 msgstr "Přenos souboru dokončen"
 
-#: gajim/chat_control.py:1510 gajim/gtk/filetransfer.py:259
+#: gajim/chat_control.py:1534 gajim/gtk/filetransfer.py:258
 #, fuzzy
 msgid "Open _Folder"
 msgstr "_Otevřít obsahující složku"
 
-#: gajim/chat_control.py:1512 gajim/chat_control.py:1521
+#: gajim/chat_control.py:1536 gajim/chat_control.py:1545
+#: gajim/data/gui/groupchat_control.ui:962
+#: gajim/data/gui/groupchat_control.ui:1049
+#: gajim/data/gui/groupchat_control.ui:1155
 #, fuzzy
 msgid "_Close"
 msgstr "Ode_slat a zavřít"
 
-#: gajim/chat_control.py:1543 gajim/gui_interface.py:484
+#: gajim/chat_control.py:1563 gajim/gui_interface.py:473
+#: gajim/data/gui/groupchat_invitation_received.ui:42
 #: gajim/gtk/notification.py:174 gajim/gtk/notification.py:195
 #: gajim/gtk/notification.py:281
-msgid "Groupchat Invitation"
+#, fuzzy
+msgid "Group Chat Invitation"
 msgstr "Skupinová pozvánka"
 
-#: gajim/chat_control.py:1568 gajim/roster_window.py:1954
+#: gajim/chat_control.py:1588 gajim/roster_window.py:1951
 msgid "Remote contact stopped transfer"
 msgstr "Protějšek zastavil přenos"
 
-#: gajim/chat_control.py:1570 gajim/roster_window.py:1956
+#: gajim/chat_control.py:1590 gajim/roster_window.py:1953
 msgid "Error opening file"
 msgstr "Chyba při čtení souboru"
 
-#: gajim/chat_control.py:1572 gajim/gtk/filetransfer.py:297
+#: gajim/chat_control.py:1592 gajim/gtk/filetransfer.py:296
 msgid "File transfer stopped"
 msgstr "Přenos souboru zastaven"
 
-#: gajim/chat_control.py:1575 gajim/gtk/filetransfer.py:275
-#: gajim/gtk/filetransfer.py:284
+#: gajim/chat_control.py:1595 gajim/gtk/filetransfer.py:274
+#: gajim/gtk/filetransfer.py:283
 msgid "File transfer cancelled"
 msgstr "Přenos souboru zrušen"
 
-#: gajim/chat_control.py:1576
+#: gajim/chat_control.py:1596
 msgid "Connection with peer cannot be established."
 msgstr "Spojení s protistranou se nepodařilo navázat."
 
-#: gajim/application.py:72
+#: gajim/application.py:75
 #, fuzzy
 msgid "Show the application's version"
 msgstr "Notification-daemon"
 
-#: gajim/application.py:79
+#: gajim/application.py:82
 #, fuzzy
 msgid "Show only critical errors"
 msgstr "_Zobrazit událost v rosteru"
 
-#: gajim/application.py:86
+#: gajim/application.py:89
 msgid "Separate profile files completely (even history database and plugins)"
 msgstr ""
 
-#: gajim/application.py:94
+#: gajim/application.py:97
 msgid "Print XML stanzas and other debug information"
 msgstr ""
 
-#: gajim/application.py:101
+#: gajim/application.py:104
 #, fuzzy
 msgid "Use defined profile in configuration directory"
 msgstr "Editor rozšířeného nastavení"
 
-#: gajim/application.py:109
+#: gajim/application.py:112
 #, fuzzy
 msgid "Set configuration directory"
 msgstr "Nastavení místnosti"
 
-#: gajim/application.py:117
+#: gajim/application.py:120
 msgid "Configure logging system"
 msgstr ""
 
-#: gajim/application.py:125
+#: gajim/application.py:128
 #, fuzzy
 msgid "Show all warnings"
 msgstr "Zobrazit všechny čekající _události"
 
-#: gajim/application.py:132
+#: gajim/application.py:135
 msgid "Open IPython shell"
 msgstr ""
 
-#: gajim/application.py:139
+#: gajim/application.py:142
 msgid "Pops up a window with the next pending event"
 msgstr "Zobrazí okno s další nepřečtenou událostí"
 
-#: gajim/application.py:145 gajim/data/gui/shortcuts_window.ui:203
+#: gajim/application.py:148 gajim/data/gui/shortcuts_window.ui:203
 #: data/org.gajim.Gajim.desktop.in:21
 #, fuzzy
 msgid "Start a new chat"
 msgstr "Začít rozhovor"
 
-#: gajim/application.py:152
+#: gajim/application.py:155
 msgid "Simulate loss of connectivity"
 msgstr ""
 
-#: gajim/application.py:159
+#: gajim/application.py:162
 msgid "Simulate regaining connectivity"
 msgstr ""
 
-#: gajim/application.py:201 gajim/gui_interface.py:133
+#: gajim/application.py:204 gajim/gui_interface.py:133
 msgid "Database Error"
 msgstr "Chyba Databáze"
 
-#: gajim/roster_window.py:294 gajim/roster_window.py:1030
+#: gajim/roster_window.py:291 gajim/roster_window.py:1027
 msgid "Merged accounts"
 msgstr "Spojené účty"
 
-#: gajim/roster_window.py:853 gajim/roster_window.py:1631
-#: gajim/roster_window.py:1664 gajim/roster_window.py:1715
-#: gajim/roster_window.py:1717 gajim/roster_window.py:1872
-#: gajim/roster_window.py:2531 gajim/roster_window.py:5025
-#: gajim/common/contacts.py:188 gajim/common/contacts.py:447
-#: gajim/common/helpers.py:83 gajim/gtk/discovery.py:129
-#: gajim/gtk/discovery.py:130 gajim/gtk/discovery.py:1416
+#: gajim/roster_window.py:850 gajim/roster_window.py:1628
+#: gajim/roster_window.py:1661 gajim/roster_window.py:1712
+#: gajim/roster_window.py:1714 gajim/roster_window.py:1869
+#: gajim/roster_window.py:2528 gajim/roster_window.py:4331
+#: gajim/roster_window.py:4964 gajim/common/contacts.py:204
+#: gajim/common/contacts.py:463 gajim/common/helpers.py:86
+#: gajim/gtk/discovery.py:127 gajim/gtk/discovery.py:128
+#: gajim/gtk/discovery.py:1414
 msgid "Transports"
 msgstr "Transporty"
 
-#: gajim/roster_window.py:1723 gajim/roster_window.py:1725
-#: gajim/roster_window.py:4995 gajim/gui_interface.py:1613
-#: gajim/gui_interface.py:1639 gajim/common/contacts.py:186
-#: gajim/common/helpers.py:83 gajim/common/modules/adhoc_commands.py:245
-msgid "Groupchats"
+#: gajim/roster_window.py:1720 gajim/roster_window.py:1722
+#: gajim/roster_window.py:4331 gajim/roster_window.py:4934
+#: gajim/gui_interface.py:1527 gajim/common/contacts.py:202
+#: gajim/common/helpers.py:86 gajim/common/modules/adhoc_commands.py:245
+#, fuzzy
+msgid "Group chats"
 msgstr "Diskuze"
 
-#: gajim/roster_window.py:2012
+#: gajim/roster_window.py:2009
 #, fuzzy
 msgid "Authorization sent"
 msgstr "Autorizace byla odeslána"
 
-#: gajim/roster_window.py:2013
+#: gajim/roster_window.py:2010
 #, fuzzy, python-format
 msgid "\"%s\" will now see your status."
 msgstr "Nyní bude \"%s\" znát váš stav."
 
-#: gajim/roster_window.py:2031
+#: gajim/roster_window.py:2028
 msgid "Subscription request has been sent"
 msgstr "Žádost o autorizaci byla odeslána"
 
-#: gajim/roster_window.py:2032
-#, python-format
-msgid "If \"%s\" accepts this request you will know his or her status."
+#: gajim/roster_window.py:2029
+#, 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:2046
+#: gajim/roster_window.py:2043
 #, fuzzy
 msgid "Authorization removed"
 msgstr "Autorizace byla zrušena"
 
-#: gajim/roster_window.py:2047
+#: gajim/roster_window.py:2044
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Nyní Vás \"%s\" uvidí vždy jako odpojeného."
 
-#: gajim/roster_window.py:2250 gajim/roster_window.py:3504
+#: gajim/roster_window.py:2247 gajim/roster_window.py:3460
 msgid "Disconnect for Invisibility"
 msgstr ""
 
-#: gajim/roster_window.py:2251 gajim/roster_window.py:3505
+#: gajim/roster_window.py:2248 gajim/roster_window.py:3461
 msgid "You are participating in one or more group chats"
 msgstr "Účinkujete v jedné nebo více diskuzích"
 
-#: gajim/roster_window.py:2252 gajim/roster_window.py:3506
+#: gajim/roster_window.py:2249 gajim/roster_window.py:3462
 #, fuzzy
 msgid ""
-"Changing your status to invisible will result in disconnection from those "
-"group chats.\n"
+"Changing your status to invisible will result in you leaving those group "
+"chats.\n"
 "Are you sure you want to go invisible?"
 msgstr ""
 "Změna vašeho stavu na neviditelný způsobí odpojení od těchto diskuzí. Jste "
 "si jistý(á), že se chcete stát neviditelným(ou)?"
 
-#: gajim/roster_window.py:2257 gajim/roster_window.py:3512
-#: gajim/roster_window.py:5238 gajim/data/gui/gc_control_popup_menu.ui:120
+#: gajim/roster_window.py:2254 gajim/roster_window.py:3468
+#: gajim/data/gui/gc_control_popup_menu.ui:120
 msgid "_Disconnect"
 msgstr "_Odpojit"
 
 # FIXME: mozna nejak lepe? :/
-#: gajim/roster_window.py:2285
+#: gajim/roster_window.py:2282
 #, fuzzy
 msgid "desynced"
 msgstr "nesynchronizováno"
 
-#: gajim/roster_window.py:2353 gajim/data/gui/shortcuts_window.ui:224
+#: gajim/roster_window.py:2350 gajim/data/gui/shortcuts_window.ui:224
 #, fuzzy
 msgid "Quit Gajim"
 msgstr "Gajim"
 
-#: gajim/roster_window.py:2354
+#: gajim/roster_window.py:2351
 #, fuzzy
 msgid "You are about to quit Gajim"
 msgstr "Opravdu chcete ukončit Gajim?"
 
-#: gajim/roster_window.py:2355
+#: gajim/roster_window.py:2352
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Opravdu chcete ukončit Gajim?"
 
-#: gajim/roster_window.py:2356
+#: gajim/roster_window.py:2353
 #, fuzzy
 msgid "_Always quit when closing Gajim"
 msgstr "Vždy zavřít Gajim"
 
-#: gajim/roster_window.py:2359 gajim/roster_window.py:2455
-#: gajim/roster_window.py:2495 gajim/data/gui/systray_context_menu.ui:90
+#: gajim/roster_window.py:2356 gajim/roster_window.py:2452
+#: gajim/roster_window.py:2492 gajim/data/gui/systray_context_menu.ui:83
 #, fuzzy
 msgid "_Quit"
 msgstr "_Konec"
 
-#: gajim/roster_window.py:2448
+#: gajim/roster_window.py:2445
 #, fuzzy
 msgid "Stop File Transfers"
 msgstr "Přenosy souborů"
 
-#: gajim/roster_window.py:2449
+#: gajim/roster_window.py:2446
 #, fuzzy
 msgid "You still have running file transfers"
 msgstr "Zrušit přenos souboru"
 
-#: gajim/roster_window.py:2450
+#: gajim/roster_window.py:2447
 #, fuzzy
 msgid ""
 "If you quit now, the file(s) being transferred will be lost.\n"
@@ -1482,17 +1454,17 @@ msgstr ""
 "Pokud chcete teď odejít, veškeré právě probíhající přenosy budou zastaveny. "
 "Opravdu chcete odejít?"
 
-#: gajim/roster_window.py:2488
+#: gajim/roster_window.py:2485
 #, fuzzy
 msgid "Unread Messages"
 msgstr "Nepřečtené zprávy"
 
-#: gajim/roster_window.py:2489
+#: gajim/roster_window.py:2486
 #, fuzzy
 msgid "You still have unread messages"
 msgstr "Máte nepřečtené zprávy"
 
-#: gajim/roster_window.py:2490
+#: gajim/roster_window.py:2487
 #, fuzzy
 msgid ""
 "Messages will only be available for reading them later if storing chat "
@@ -1501,20 +1473,20 @@ msgstr ""
 "Zprávy bude možné číst později, pokud máte povolený záznam historie a "
 "kontakt je v rosteru."
 
-#: gajim/roster_window.py:2760
+#: gajim/roster_window.py:2753
 msgid "You have unread messages"
 msgstr "Máte nepřečtené zprávy"
 
-#: gajim/roster_window.py:2761
+#: gajim/roster_window.py:2754
 msgid "You must read them before removing this transport."
 msgstr "Musíš si je přečíst před smazáním transportu."
 
-#: gajim/roster_window.py:2764
+#: gajim/roster_window.py:2757
 #, fuzzy, python-format
 msgid "Transport '%s' will be removed"
 msgstr "Transport \"%s\" bude smazán"
 
-#: gajim/roster_window.py:2765
+#: gajim/roster_window.py:2758
 #, fuzzy
 msgid ""
 "You will no longer be able to send and receive messages from and to contacts "
@@ -1523,11 +1495,11 @@ msgstr ""
 "Už více nebudete moci posílat i přijímat zprávy od kontaktů z tohoto "
 "transportu."
 
-#: gajim/roster_window.py:2768
+#: gajim/roster_window.py:2761
 msgid "Transports will be removed"
 msgstr "Transport bude smazán"
 
-#: gajim/roster_window.py:2773
+#: gajim/roster_window.py:2766
 #, fuzzy, python-format
 msgid ""
 "You will no longer be able to send and receive messages from and to contacts "
@@ -1537,22 +1509,22 @@ msgstr ""
 "Už více nebudete moci posílat i přijímat zprávy od kontaktů z tohoto "
 "transportu."
 
-#: gajim/roster_window.py:2777
+#: gajim/roster_window.py:2770
 #, fuzzy
 msgid "Remove Transport"
 msgstr "Zobrazuj trans_porty"
 
-#: gajim/roster_window.py:2844
+#: gajim/roster_window.py:2837
 #, fuzzy
 msgid "Block Contact"
 msgstr "Blokované Kontakty"
 
-#: gajim/roster_window.py:2845
+#: gajim/roster_window.py:2838
 #, fuzzy
 msgid "Really block this contact?"
 msgstr "Je OpenPGP povoleno pro tento kontakt?"
 
-#: gajim/roster_window.py:2846
+#: gajim/roster_window.py:2839
 #, fuzzy
 msgid ""
 "This contact will see you offline and you will not receive any messages sent "
@@ -1561,64 +1533,59 @@ msgstr ""
 "Tento kontakt vás uvidí jako odpojeného a nebudete dostávat zprávy, které "
 "vám pošle."
 
-#: gajim/roster_window.py:2851
+#: gajim/roster_window.py:2844
 #, fuzzy
 msgid "_Block Contact"
 msgstr "Blokované Kontakty"
 
-#: gajim/roster_window.py:2896
+#: gajim/roster_window.py:2889
 msgid "Rename Contact"
 msgstr "Přejmenovat kontakt"
 
-#: gajim/roster_window.py:2897
+#: gajim/roster_window.py:2890
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Zadej novou přezdívku pro kontakt %s."
 
-#: gajim/roster_window.py:2904
+#: gajim/roster_window.py:2897
 msgid "Rename Group"
 msgstr "Přejmenovat skupinu"
 
-#: gajim/roster_window.py:2905
+#: gajim/roster_window.py:2898
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Zadej nové jméno pro skupinu %s."
 
-#: gajim/roster_window.py:2953 gajim/roster_window.py:2954
+#: gajim/roster_window.py:2946 gajim/roster_window.py:2947
 msgid "Remove Group"
 msgstr "Odstranit skupinu"
 
-#: gajim/roster_window.py:2955
+#: gajim/roster_window.py:2948
 #, fuzzy, python-format
 msgid "Do you want to remove %s from the contact list?"
 msgstr "Chceš smazat skupinu %s z rosteru?"
 
-#: gajim/roster_window.py:2956
+#: gajim/roster_window.py:2949
 #, fuzzy
 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:3044
-#, fuzzy, python-format
-msgid "%(jid)s has been invited in this room"
-msgstr "%(nick)s byli vyhozeni z místnosti: %(reason)s"
-
-#: gajim/roster_window.py:3353
+#: gajim/roster_window.py:3309
 #, fuzzy
 msgid "Remove Contact"
 msgstr "Přejmenovat kontakt"
 
-#: gajim/roster_window.py:3354
+#: gajim/roster_window.py:3310
 #, fuzzy
 msgid "Remove contact from contact list"
 msgstr "Odstraní kontakt ze Seznamu"
 
-#: gajim/roster_window.py:3355
+#: gajim/roster_window.py:3311
 #, 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:3364 gajim/roster_window.py:3384
+#: gajim/roster_window.py:3320 gajim/roster_window.py:3340
 #, fuzzy
 msgid ""
 "By removing this contact you also remove authorization. This means the "
@@ -1627,21 +1594,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:3375
+#: gajim/roster_window.py:3331
 msgid "Do you want to continue?"
 msgstr "Chcete pokračovat?"
 
-#: gajim/roster_window.py:3386
+#: gajim/roster_window.py:3342
 #, 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:3393
+#: gajim/roster_window.py:3349
 #, fuzzy
 msgid "Remove contacts from contact list"
 msgstr "Odstraní kontakt ze Seznamu"
 
-#: gajim/roster_window.py:3399
+#: gajim/roster_window.py:3355
 #, fuzzy, python-format
 msgid ""
 "By removing the following contacts, you will also remove authorization. This "
@@ -1652,25 +1619,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:3403
+#: gajim/roster_window.py:3359
 #, fuzzy
 msgid "Remove Contacts"
 msgstr "Přejmenovat kontakt"
 
-#: gajim/roster_window.py:3423
+#: gajim/roster_window.py:3379
 msgid "No account available"
 msgstr "Žádný účet není dostupný"
 
-#: gajim/roster_window.py:3424
+#: gajim/roster_window.py:3380
 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:4060
+#: gajim/roster_window.py:4011
 msgid "Metacontacts storage not supported by your server"
 msgstr "Uložení metakontaktů není podporováno serverem"
 
-#: gajim/roster_window.py:4062
+#: gajim/roster_window.py:4013
 #, fuzzy
 msgid ""
 "Your server does not support storing metacontacts information. So this "
@@ -1679,12 +1646,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:4159
+#: gajim/roster_window.py:4110
 #, 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:4160
+#: gajim/roster_window.py:4111
 #, fuzzy
 msgid ""
 "Metacontacts are a way to regroup several contacts in one single contact. "
@@ -1695,26 +1662,26 @@ 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:4164
+#: gajim/roster_window.py:4115
 #, fuzzy
 msgid "Create Metacontact"
 msgstr "Přejmenovat kontakt"
 
-#: gajim/roster_window.py:4170
+#: gajim/roster_window.py:4121 gajim/data/gui/groupchat_creation.ui:317
 #, fuzzy
 msgid "_Create"
 msgstr "Tvořivý"
 
-#: gajim/roster_window.py:4287
+#: gajim/roster_window.py:4238
 msgid "Invalid file URI:"
 msgstr "Neplatná cesta k souboru:"
 
-#: gajim/roster_window.py:4298
+#: gajim/roster_window.py:4249
 #, fuzzy
 msgid "Send file?"
 msgstr "Odeslat _Soubor"
 
-#: gajim/roster_window.py:4299
+#: gajim/roster_window.py:4250
 #, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
@@ -1722,98 +1689,89 @@ 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:4451
+#: gajim/roster_window.py:4401
 #, fuzzy, python-format
 msgid "Send %(from)s to %(to)s"
 msgstr "Odeslat %s %s"
 
-#: gajim/roster_window.py:4464
+#: gajim/roster_window.py:4414
 #, fuzzy, python-format
 msgid "Make %s first contact"
 msgstr "Udělej %s a %s metakontaktem"
 
-#: gajim/roster_window.py:4469
+#: gajim/roster_window.py:4419
 #, fuzzy, python-format
 msgid "Make %(contact1)s and %(contact2)s metacontacts"
 msgstr "Udělej %s a %s metakontaktem"
 
-#: gajim/roster_window.py:4825 gajim/roster_window.py:4923
+#: gajim/roster_window.py:4775 gajim/roster_window.py:4862
 msgid "_Change Status Message"
 msgstr "Z_měnit popis stavu"
 
-#: gajim/roster_window.py:4845
+#: gajim/roster_window.py:4795
 msgid "Publish Tune"
 msgstr "_Zveřejnit hudbu"
 
-#: gajim/roster_window.py:4856
+#: gajim/roster_window.py:4806
 #, fuzzy
 msgid "Publish Location"
 msgstr "_Zveřejnit hudbu"
 
-#: gajim/roster_window.py:4868
-#, fuzzy
-msgid "Configure Services…"
-msgstr "_Nastavit služby..."
-
-#: gajim/roster_window.py:4997
+#: gajim/roster_window.py:4936
 msgid "_Maximize All"
 msgstr "_Maximalizovat Vše"
 
-#: gajim/roster_window.py:5004 gajim/roster_window.py:5146
+#: gajim/roster_window.py:4943 gajim/roster_window.py:5085
 msgid "Send Group M_essage"
 msgstr "Ode_slat skupinovou zprávu"
 
-#: gajim/roster_window.py:5011
+#: gajim/roster_window.py:4950
 msgid "To all users"
 msgstr "Všem uživatelům"
 
-#: gajim/roster_window.py:5015
+#: gajim/roster_window.py:4954
 msgid "To all online users"
 msgstr "Všem dostupným uživatelům"
 
-#: gajim/roster_window.py:5027 gajim/roster_window.py:5152
+#: gajim/roster_window.py:4966 gajim/roster_window.py:5091
 #: gajim/data/gui/gc_occupants_menu.ui:110
 #: gajim/data/gui/contact_context_menu.ui:36
 msgid "In_vite to"
 msgstr "_Pozvat do"
 
-#: gajim/roster_window.py:5162
+#: gajim/roster_window.py:5101
 msgid "_Manage Contacts"
 msgstr "_Spravovat kontakty"
 
-#: gajim/roster_window.py:5168
+#: gajim/roster_window.py:5107
 #, fuzzy
 msgid "Edit _Groups…"
 msgstr "Upravit _skupiny"
 
-#: gajim/roster_window.py:5189 gajim/data/gui/filetransfers.ui:12
+#: gajim/roster_window.py:5128 gajim/data/gui/filetransfers.ui:12
 #: gajim/data/gui/remove_account_window.ui:134
 msgid "_Remove"
 msgstr "Odst_ranit"
 
-#: gajim/roster_window.py:5226
+#: gajim/roster_window.py:5165
 msgid "_Maximize"
 msgstr "_Maximalizovat"
 
-#: gajim/roster_window.py:5233
+#: gajim/roster_window.py:5172
 msgid "_Reconnect"
 msgstr "_Znovu připojit"
 
-#: gajim/roster_window.py:5254 gajim/data/gui/gc_occupants_menu.ui:170
+#: gajim/roster_window.py:5193 gajim/data/gui/gc_occupants_menu.ui:170
 #: gajim/data/gui/gc_control_popup_menu.ui:113
 #: gajim/data/gui/contact_context_menu.ui:205
 msgid "_History"
 msgstr "_Historie"
 
-#: gajim/roster_window.py:5335 gajim/data/gui/application_menu.ui:86
+#: gajim/roster_window.py:5274 gajim/data/gui/application_menu.ui:83
 #: gajim/data/gui/history_window.ui:57
 msgid "History Manager"
 msgstr "Správce historie"
 
-#: gajim/roster_window.py:5343
-msgid "_Join New Group Chat"
-msgstr "_Připojit se do diskuze"
-
 #: gajim/dataforms_widget.py:585
 #, fuzzy
 msgid "Unable to load image"
@@ -1938,254 +1896,271 @@ msgstr "Předmět: %s\n"
 msgid "Write a message…"
 msgstr "Nová soukromá zpráva"
 
-#: gajim/message_window.py:250
+#: gajim/message_window.py:356
+#, fuzzy
+msgid "Close Tabs"
+msgstr "Zavřít"
+
+#: gajim/message_window.py:357
 msgid "You are going to close several tabs"
 msgstr "Chystáte se zavřít několik panelů"
 
-#: gajim/message_window.py:251
+#: gajim/message_window.py:358
 msgid "Do you really want to close them all?"
 msgstr "Opravdu je chcete všechny zavřít?"
 
-#: gajim/message_window.py:539
+#: gajim/message_window.py:514
 #, fuzzy
 msgid "?Noun:Chats"
 msgstr "Diskuze"
 
-#: gajim/message_window.py:543
+#: gajim/message_window.py:518
 #, fuzzy
 msgid "Group Chats"
 msgstr "Diskuze"
 
-#: gajim/message_window.py:547
+#: gajim/message_window.py:522
 msgid "Private Chats"
 msgstr "Soukromé rozhovory"
 
-#: gajim/message_window.py:553
+#: gajim/message_window.py:528
 msgid "Messages"
 msgstr "Zprávy"
 
-#: gajim/gui_interface.py:173
+#: gajim/gui_interface.py:170
+#, 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:175
 msgid "Do you accept this request?"
 msgstr "Chcete přijmout tuto žádost?"
 
-#: gajim/gui_interface.py:175
-#, python-format
-msgid "Do you accept this request on account %s?"
+#: gajim/gui_interface.py:177
+#, fuzzy, python-format
+msgid "Do you accept this request (account: %s)?"
 msgstr "Chcete přijmout tuto žádost na účtě %s?"
 
-#: gajim/gui_interface.py:178
-#, 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:182
+#, fuzzy
+msgid "Authorization"
+msgstr "Autorizace byla odeslána"
 
-#: gajim/gui_interface.py:194 gajim/gtk/notification.py:175
+#: gajim/gui_interface.py:186 gajim/gui_interface.py:420
+#: gajim/gtk/filetransfer.py:338
+#, fuzzy
+msgid "_No"
+msgstr "Žádný"
+
+#: gajim/gui_interface.py:205 gajim/gtk/notification.py:175
 #: gajim/gtk/notification.py:197
 msgid "Connection Failed"
 msgstr "Spojení selhalo"
 
-#: gajim/gui_interface.py:279 gajim/gui_interface.py:529
-msgid "Password Required"
-msgstr "Vyžadováno heslo"
-
-#: gajim/gui_interface.py:280
-#, python-format
-msgid "A Password is required to join the room %s. Please type it."
-msgstr "Pro připojení do místnosti %s je vyžadováno heslo. Zadejte, prosím."
-
-#: gajim/gui_interface.py:342 gajim/gui_interface.py:346
+#: gajim/gui_interface.py:325 gajim/gui_interface.py:329
 #, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr "Chyba %(code)s: %(msg)s"
 
-#: gajim/gui_interface.py:357 gajim/gui_interface.py:376
+#: gajim/gui_interface.py:340 gajim/gui_interface.py:359
 #: gajim/common/modules/message.py:122
 #, fuzzy, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "chyba při odesílání %s ( %s )"
 
-#: gajim/gui_interface.py:401 gajim/gtk/notification.py:175
+#: gajim/gui_interface.py:384 gajim/gtk/notification.py:175
 msgid "Subscription request"
 msgstr "Žádost o autorizaci"
 
-#: gajim/gui_interface.py:413 gajim/common/contacts.py:184
-#: gajim/common/helpers.py:83
+#: gajim/gui_interface.py:396 gajim/common/contacts.py:200
+#: gajim/common/helpers.py:86
 msgid "Observers"
 msgstr "Přihlížející"
 
-#: gajim/gui_interface.py:422
+#: gajim/gui_interface.py:405
 msgid "Authorization accepted"
 msgstr "Autorizace přijata"
 
-#: gajim/gui_interface.py:423
+#: gajim/gui_interface.py:406
 #, 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:431
-#, python-format
-msgid "Contact \"%s\" removed subscription from you"
+#: gajim/gui_interface.py:415
+#, fuzzy
+msgid "Subscription Removed"
+msgstr "Žádost o autorizaci"
+
+#: gajim/gui_interface.py:416
+#, fuzzy, python-format
+msgid "Contact '%s' removed subscription from you"
 msgstr "Kontakt \"%s\" Vám odebral autorizaci"
 
-#: gajim/gui_interface.py:432
+#: gajim/gui_interface.py:417
 #, fuzzy
 msgid ""
-"You will always see them as offline.\n"
+"You will always see this contact as offline.\n"
 "Do you want to remove them from your contact list?"
 msgstr ""
 "Vždy uvidíte jeho nebo ji odpojeného/odpojenou.\n"
 "Opravdu jeho/ji chcete odstrani ze seznamu kontaktů?"
 
-#: gajim/gui_interface.py:453 gajim/gtk/notification.py:176
+#: gajim/gui_interface.py:442 gajim/gtk/notification.py:176
 msgid "Unsubscribed"
 msgstr "Autorizace zrušena"
 
-#: gajim/gui_interface.py:465
+#: gajim/gui_interface.py:454
 #, python-format
 msgid "%(jid)s declined the invitation: %(reason)s"
 msgstr ""
 
-#: gajim/gui_interface.py:469
+#: gajim/gui_interface.py:458
 #, python-format
 msgid "%(jid)s declined the invitation"
 msgstr ""
 
-#: gajim/gui_interface.py:485
+#: gajim/gui_interface.py:474
 #, fuzzy, python-brace-format
 msgid "You are invited to {room} by {user}"
 msgstr "Jste pozván do diskuze"
 
-#: gajim/gui_interface.py:506
+#: gajim/gui_interface.py:495
 #, fuzzy
 msgid "Certificate Passphrase Required"
 msgstr "Platnost certifikátu vypršela"
 
-#: gajim/gui_interface.py:507
+#: gajim/gui_interface.py:496
 #, 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:516 gajim/gtk/accounts.py:963
+#: gajim/gui_interface.py:505 gajim/gtk/accounts.py:966
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Zadejte heslo pro účet %s"
 
-#: gajim/gui_interface.py:529 gajim/gtk/accounts.py:964
+#: gajim/gui_interface.py:518
+msgid "Password Required"
+msgstr "Vyžadováno heslo"
+
+#: gajim/gui_interface.py:518 gajim/gtk/accounts.py:967
 msgid "Save password"
 msgstr "Uložit heslo"
 
-#: gajim/gui_interface.py:601 gajim/gui_interface.py:632
+#: gajim/gui_interface.py:587 gajim/gui_interface.py:618
+#: gajim/gtk/filetransfer.py:332 gajim/gtk/filetransfer.py:333
 #: gajim/gtk/notification.py:173 gajim/gtk/notification.py:276
 msgid "File Transfer Error"
 msgstr "Chyba přenosu souboru"
 
-#: gajim/gui_interface.py:666
+#: gajim/gui_interface.py:652
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s Vám chce poslat soubor."
 
-#: gajim/gui_interface.py:668 gajim/gtk/filetransfer.py:479
+#: gajim/gui_interface.py:654 gajim/gtk/filetransfer.py:484
 #: gajim/gtk/notification.py:172 gajim/gtk/notification.py:274
 msgid "File Transfer Request"
 msgstr "Žádost o přenos souboru"
 
-#: gajim/gui_interface.py:767
+#: gajim/gui_interface.py:753
 #, fuzzy
 msgid "Remote Contact Stopped Transfer"
 msgstr "Protějšek zastavil přenos"
 
-#: gajim/gui_interface.py:772
+#: gajim/gui_interface.py:758
 #, fuzzy
 msgid "Error Opening File"
 msgstr "Chyba při čtení souboru"
 
-#: gajim/gui_interface.py:782
+#: gajim/gui_interface.py:768
 #, fuzzy
 msgid "SSL Certificate Error"
 msgstr "Chyba SSL certifikátu"
 
-#: gajim/gui_interface.py:795 gajim/gui_interface.py:826
-#: gajim/gui_interface.py:853 gajim/gtk/notification.py:174
+#: gajim/gui_interface.py:781 gajim/gui_interface.py:812
+#: gajim/gui_interface.py:839 gajim/gtk/notification.py:174
 #: gajim/gtk/notification.py:279
 msgid "File Transfer Stopped"
 msgstr "Přenos souboru zastaven"
 
-#: gajim/gui_interface.py:799
+#: gajim/gui_interface.py:785
 #, fuzzy
 msgid "File Transfer Failed"
 msgstr "Přenos souboru dokončen"
 
-#: gajim/gui_interface.py:822
+#: gajim/gui_interface.py:808
 #, 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:827
+#: gajim/gui_interface.py:813
 #, 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:833
+#: gajim/gui_interface.py:819
 #, 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:848
+#: gajim/gui_interface.py:834
 #, 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:854
+#: gajim/gui_interface.py:840
 #, 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:860
+#: gajim/gui_interface.py:846
 #, 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:971
+#: gajim/gui_interface.py:957
 msgid "Username Conflict"
 msgstr "Konflikt uživatelských jmen"
 
-#: gajim/gui_interface.py:972
+#: gajim/gui_interface.py:958
 msgid "Please type a new username for your local account"
 msgstr "Prosím zadejte nové uživatelské jméno pro lokální účet"
 
-#: gajim/gui_interface.py:995
+#: gajim/gui_interface.py:981
 msgid "Resource Conflict"
 msgstr "Konflikt Zdrojů"
 
-#: gajim/gui_interface.py:996
+#: gajim/gui_interface.py:982
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
 msgstr "Už jsi připojen(a) k tomuto účtu se stejným zdrojem. Prosím zadej nový"
 
-#: gajim/gui_interface.py:1053
+#: gajim/gui_interface.py:1039
 #, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s chce zahájit hlasový rozhovor. "
 
-#: gajim/gui_interface.py:1055
+#: gajim/gui_interface.py:1041
 msgid "Voice Chat Request"
 msgstr "Žádost o hlasový rozhovor"
 
-#: gajim/gui_interface.py:1123 gajim/gtk/account_wizard.py:312
+#: gajim/gui_interface.py:1109 gajim/gtk/account_wizard.py:312
 msgid "Certificate Already in File"
 msgstr "Certifikát je již v souboru"
 
-#: gajim/gui_interface.py:1124 gajim/gtk/account_wizard.py:313
+#: gajim/gui_interface.py:1110 gajim/gtk/account_wizard.py:313
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr "Tento certifikát je již v souboru %s, takže nebude znova přidán."
 
-#: gajim/gui_interface.py:1145
+#: gajim/gui_interface.py:1131
 #, fuzzy, python-format
 msgid "The authenticity of the %s certificate could be invalid"
 msgstr "Autentizace certifikátu %s je neplatná."
 
-#: gajim/gui_interface.py:1148
+#: gajim/gui_interface.py:1134
 #, python-format
 msgid ""
 "\n"
@@ -2194,7 +2169,7 @@ msgstr ""
 "\n"
 "Neznámá SSL chyba: %d"
 
-#: gajim/gui_interface.py:1150
+#: gajim/gui_interface.py:1136
 #, python-format
 msgid ""
 "\n"
@@ -2203,11 +2178,11 @@ msgstr ""
 "\n"
 "SSL Error: <b>%s</b>"
 
-#: gajim/gui_interface.py:1155
+#: gajim/gui_interface.py:1141
 msgid "Error verifying SSL certificate"
 msgstr "Chyba ověřování SSL certifikátu"
 
-#: gajim/gui_interface.py:1156
+#: gajim/gui_interface.py:1142
 #, fuzzy, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your XMPP server: "
@@ -2217,7 +2192,7 @@ msgstr ""
 "Chyba při ověřování SSL vertifikátu na vašem jabber serveru: %(error)s\n"
 "Chcete se přesto připojit?"
 
-#: gajim/gui_interface.py:1160 gajim/gtk/account_wizard.py:412
+#: gajim/gui_interface.py:1146 gajim/gtk/account_wizard.py:413
 #, fuzzy, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -2230,204 +2205,197 @@ msgstr ""
 "SHA1 otisk certifikátu:\n"
 "%s"
 
-#: gajim/gui_interface.py:1166
+#: gajim/gui_interface.py:1152
 msgid "Ignore this error for this certificate."
 msgstr "Ignorovat tuto chybu certifikátu."
 
-#: gajim/gui_interface.py:1174
+#: gajim/gui_interface.py:1160
 #, fuzzy, python-format
 msgid "SSL Certificate Verification for %s"
 msgstr "Chyba SSL certifikátu"
 
-#: gajim/gui_interface.py:1442 gajim/gtk/join_groupchat.py:235
-msgid "You can not join a group chat unless you are connected."
-msgstr "Nemůžete vstoupit do diskuze pokud nejste připojen(a)."
-
-#: gajim/gui_interface.py:1448
-#, fuzzy
-msgid "JID is not a Groupchat"
-msgstr "Tohle není diskuze"
-
-#: gajim/gui_interface.py:1579
-msgid "This is not a group chat"
-msgstr "Tohle není diskuze"
-
-#: gajim/gui_interface.py:1580
-#, python-format
-msgid ""
-"%(room_jid)s is already in your roster. Please check if %(room_jid)s is a "
-"correct group chat name. If it is, delete it from your roster and try "
-"joining the group chat again."
-msgstr ""
-
-#: gajim/gui_interface.py:1604 gajim/dialog_messages.py:58
+#: gajim/gui_interface.py:1577
 msgid "You cannot join a group chat while you are invisible"
 msgstr "Nemůžete vstoupit do diskuze, pokud jste neviditelný(á)"
 
 # FIXME: jaky je rozdil mezi settings a preferences? - kdo vi :)
-#: gajim/gui_interface.py:2037
+#: gajim/gui_interface.py:1976
 msgid "Could not save your settings and preferences"
 msgstr "Nelze uložit Vaše nastavení"
 
-#: gajim/gui_interface.py:2098
+#: gajim/gui_interface.py:2037
 msgid "Gajim: IPython Console"
 msgstr ""
 
-#: gajim/dialog_messages.py:32
+#: gajim/dialog_messages.py:31 gajim/dialog_messages.py:36
+#: gajim/gtk/single_message.py:305 gajim/gtk/account_wizard.py:229
 #, fuzzy
-msgid "You can not start a new conversation unless you are connected."
-msgstr "Nemůžete vstoupit do diskuze pokud nejste připojen(a)."
-
-#: gajim/dialog_messages.py:36 gajim/dialog_messages.py:41
-#: gajim/gtk/single_message.py:305 gajim/gtk/join_groupchat.py:211
-#: gajim/gtk/account_wizard.py:229
-msgid "Invalid JID"
-msgstr "Neplatné JID"
+msgid "Invalid XMPP Address"
+msgstr "Neplatný soubor"
 
-#: gajim/dialog_messages.py:42 gajim/gtk/single_message.py:306
-#, python-format
-msgid "It is not possible to send a message to %s, this JID is not valid."
+#: gajim/dialog_messages.py:37
+#, 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/dialog_messages.py:47
-msgid "Unread events"
+#: gajim/dialog_messages.py:42
+#, fuzzy
+msgid "Unread Events"
 msgstr "Nepřečtené zprávy"
 
-#: gajim/dialog_messages.py:48
-msgid "Read all pending events before removing this account."
+#: gajim/dialog_messages.py:43
+#, fuzzy
+msgid "Read or acknowledge all pending events before removing this account."
 msgstr "Přečtěte si všechny čekající zprávy, než smažete tento účet."
 
-#: gajim/dialog_messages.py:52
+#: gajim/dialog_messages.py:48
 #, fuzzy
 msgid "Invalid Form"
 msgstr "Neplatná místnost"
 
-#: gajim/dialog_messages.py:53
+#: gajim/dialog_messages.py:49
 #, fuzzy
 msgid "The form is not filled correctly."
 msgstr "Jabber ID diskuze obsahuje nepřijatelné znaky."
 
-#: gajim/dialog_messages.py:57 gajim/common/helpers.py:309
+#: gajim/dialog_messages.py:53 gajim/common/helpers.py:315
 msgid "Invisible"
 msgstr "Neviditelný"
 
-#: gajim/dialog_messages.py:62
-msgid "A connection is not available"
+#: gajim/dialog_messages.py:54
+#, fuzzy
+msgid "You cannot join a group chat while being invisible."
+msgstr "Nemůžete vstoupit do diskuze, pokud jste neviditelný(á)"
+
+#: gajim/dialog_messages.py:58
+#, fuzzy
+msgid "No Connection Available"
 msgstr "Spojení není dostupné"
 
-#: gajim/dialog_messages.py:63
+#: gajim/dialog_messages.py:59
 msgid "Your message can not be sent until you are connected."
 msgstr "Va¹e zpráva nemù¾e být odeslána dokud se nepøipojíte."
 
-#: gajim/dialog_messages.py:67
-#, fuzzy
-msgid "JID already in list"
-msgstr "Jabber ID je již na seznamu"
+#: gajim/dialog_messages.py:63
+msgid "XMPP Address Already in List"
+msgstr ""
 
-#: gajim/dialog_messages.py:68
+#: gajim/dialog_messages.py:64
 #, fuzzy
-msgid "The JID you entered is already in the list. Choose another one."
+msgid ""
+"The XMPP Address you entered is already in the list. Please choose another "
+"one."
 msgstr "Jabber ID je již na seznamu. Vyberte jiné."
 
-#: gajim/dialog_messages.py:72
-msgid "Invalid answer"
+#: gajim/dialog_messages.py:69
+#, fuzzy
+msgid "Invalid Answer"
 msgstr "Neplatná odpověď"
 
-#: gajim/dialog_messages.py:73
+#: gajim/dialog_messages.py:70
 #, python-format
 msgid "Transport %(name)s answered wrongly to register request: %(error)s"
 msgstr "Transport %(name)s odpověděl chybně na požadavek registrace: %(error)s"
 
-#: gajim/dialog_messages.py:78
+#: gajim/dialog_messages.py:75
 #, fuzzy
 msgid "Wrong Custom Hostname"
 msgstr "Použít vlastní jméno počítače/port"
 
-#: gajim/dialog_messages.py:79
+#: gajim/dialog_messages.py:76
 #, fuzzy, python-format
-msgid "Wrong custom hostname \"%s\". Ignoring it."
+msgid "Custom hostname \"%s\" is wrong. It will be ignored."
 msgstr "Použít vlastní jméno počítače/port"
 
-#: gajim/dialog_messages.py:83
-msgid "Error while removing privacy list"
+#: gajim/dialog_messages.py:80
+#, fuzzy
+msgid "Error While Removing Privacy List"
 msgstr "Chyba při odebírání privacy listu"
 
-#: gajim/dialog_messages.py:84
-#, python-format
+#: gajim/dialog_messages.py:81
+#, fuzzy, python-format
 msgid ""
-"Privacy list %s has not been removed. It is maybe active in one of your "
-"connected resources. Deactivate it and try again."
+"Privacy list %s has not been removed. It is probably active in one of your "
+"connected resources. Please deactivate it and try again."
 msgstr ""
 "Privacy list %s nebyl odstraněn. Možná je aktivní v jednom z připojených "
 "zdrojů. Zruště jeho používání a zkuste znovu."
 
-#: gajim/dialog_messages.py:90
-msgid "Invisibility not supported"
+#: gajim/dialog_messages.py:87
+#, fuzzy
+msgid "Invisibility Not Supported"
 msgstr "Neviditelnost není podporována"
 
-#: gajim/dialog_messages.py:91
-#, python-format
-msgid "Account %s doesn't support invisibility."
+#: gajim/dialog_messages.py:88
+#, fuzzy, python-format
+msgid "This account %s doesn't support invisibility."
 msgstr "Účet %s nepodporuje neviditelnost."
 
-#: gajim/dialog_messages.py:95
-msgid "Unregister failed"
+#: gajim/dialog_messages.py:92
+#, fuzzy
+msgid "Unregister Failed"
 msgstr "Odregistrace selhala"
 
-#: gajim/dialog_messages.py:96
-#, python-format
-msgid "Unregistration with server %(server)s failed: %(error)s"
+#: gajim/dialog_messages.py:93
+#, fuzzy, python-format
+msgid "Unregistration on server %(server)s failed: %(error)s"
 msgstr "Zrušení registrace ze serveru %(server)s selhalo: %(error)s"
 
-#: gajim/dialog_messages.py:100
-msgid "Registration succeeded"
+#: gajim/dialog_messages.py:97
+#, fuzzy
+msgid "Registration Succeeded"
 msgstr "Registrace úspěšná"
 
-#: gajim/dialog_messages.py:101
-#, python-format
-msgid "Registration with agent %s succeeded"
+#: gajim/dialog_messages.py:98
+#, fuzzy, python-format
+msgid "Registration with agent %s succeeded."
 msgstr "Registrace k agentu %s uspěla"
 
-#: gajim/dialog_messages.py:105 gajim/gtk/service_registration.py:215
-msgid "Registration failed"
+#: gajim/dialog_messages.py:102
+#, fuzzy
+msgid "Registration Failed"
 msgstr "Registrace selhala"
 
-#: gajim/dialog_messages.py:106
+#: gajim/dialog_messages.py:103
 #, python-format
 msgid ""
 "Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
 msgstr ""
 "Registrace s agentem %(agent)s failed with error %(error)s: %(error_msg)s"
 
-#: gajim/dialog_messages.py:111
+#: gajim/dialog_messages.py:108
 #, fuzzy
 msgid "Unable to Join Group Chat"
 msgstr "Nelze se připojit se do diskuze"
 
-#: gajim/dialog_messages.py:116
-msgid "GStreamer error"
-msgstr ""
+#: gajim/dialog_messages.py:113
+#, fuzzy
+msgid "GStreamer Error"
+msgstr "Chyba Databáze"
 
-#: gajim/dialog_messages.py:117
+#: gajim/dialog_messages.py:114
 #, fuzzy, python-format
 msgid ""
 "Error: %(error)s\n"
 "Debug: %(debug)s"
 msgstr "Chybová zpráva: %s"
 
-#: gajim/dialog_messages.py:121
-msgid "Wrong host"
+#: gajim/dialog_messages.py:118
+#, fuzzy
+msgid "Wrong Host"
 msgstr "Nesprávné jméno počítače"
 
-#: gajim/dialog_messages.py:122
+#: gajim/dialog_messages.py:119
 msgid "Invalid local address? :-O"
 msgstr "Neplatná místní adresa? :-O"
 
-#: gajim/dialog_messages.py:126
-msgid "Avahi error"
+#: gajim/dialog_messages.py:123
+#, fuzzy
+msgid "Avahi Error"
 msgstr "Chyba Avahi"
 
-#: gajim/dialog_messages.py:127
+#: gajim/dialog_messages.py:124
 #, python-format
 msgid ""
 "%s\n"
@@ -2436,67 +2404,67 @@ msgstr ""
 "%s\n"
 "Zasílání lokálních zpráv nemusí fungovat správně."
 
-#: gajim/dialog_messages.py:131 gajim/dialog_messages.py:136
+#: gajim/dialog_messages.py:128 gajim/dialog_messages.py:133
 #, fuzzy
-msgid "Could not request upload slot"
+msgid "Could not request upload slot for HTTP File Upload"
 msgstr "Nepodařilo se spustit lokální službu"
 
-#: gajim/dialog_messages.py:137
-msgid "Got unexpected response from server (see log)"
+#: gajim/dialog_messages.py:134
+msgid "Got unexpected response from server (see log)."
 msgstr ""
 
-#: gajim/dialog_messages.py:141 gajim/dialog_messages.py:146
+#: gajim/dialog_messages.py:138 gajim/dialog_messages.py:143
 #, fuzzy
-msgid "Could not open file"
+msgid "Could not Open File"
 msgstr "Nezdařilo se načtení obrázku"
 
-#: gajim/dialog_messages.py:142
-msgid "Exception raised while opening file (see log)"
+#: gajim/dialog_messages.py:139
+msgid "Exception raised while trying to open file (see log)."
 msgstr ""
 
-#: gajim/dialog_messages.py:151
-msgid "Unsecure"
-msgstr ""
+#: gajim/dialog_messages.py:148
+#, fuzzy
+msgid "Not Secure"
+msgstr "Nespuštěno"
 
-#: gajim/dialog_messages.py:152
+#: gajim/dialog_messages.py:149
 #, fuzzy
-msgid "Server returned unsecure transport (HTTP)"
+msgid "The server returned an insecure transport (HTTP)."
 msgstr "Služba vrátila chybu."
 
-#: gajim/dialog_messages.py:156
+#: gajim/dialog_messages.py:153
 #, fuzzy
-msgid "Could not upload file"
+msgid "Could not Upload File"
 msgstr "Nezdařilo se načtení obrázku"
 
-#: gajim/dialog_messages.py:157
+#: gajim/dialog_messages.py:154
 #, python-format
 msgid "HTTP response code from server: %s"
 msgstr ""
 
-#: gajim/dialog_messages.py:161
+#: gajim/dialog_messages.py:158
 msgid "Upload Error"
 msgstr ""
 
-#: gajim/dialog_messages.py:166
+#: gajim/dialog_messages.py:163
 #, fuzzy
 msgid "Encryption Error"
 msgstr "E2E Šifrování vypnuto"
 
-#: gajim/dialog_messages.py:167
-#, fuzzy
-msgid "For the chosen encryption there is no encryption method available"
-msgstr "Spojení není dostupné"
+#: gajim/dialog_messages.py:164
+msgid "There is no encryption method available for the chosen encryption."
+msgstr ""
 
-#: gajim/dialog_messages.py:171
+#: gajim/dialog_messages.py:169
 #, fuzzy
-msgid "Avatar upload failed"
+msgid "Avatar Upload Failed"
 msgstr "publikování vizitky se nezdařilo"
 
-#: gajim/privatechat_control.py:204
+#: gajim/privatechat_control.py:207
 msgid "Sending private message failed"
 msgstr "Odesílání soukromé zprávy selhalo"
 
-#: gajim/privatechat_control.py:206
+#: gajim/privatechat_control.py:209
 #, 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)."
@@ -2519,7 +2487,7 @@ msgstr "zobraz nápovědu k příkazu"
 
 #: gajim/gajim_remote.py:85
 #, fuzzy
-msgid "Lists all contacts in roster, one for each line"
+msgid "Lists all contacts in the contact list, one for each line"
 msgstr ""
 "Vytiskne seznam všech kontaktů v rosteru. Každý kontakt se objeví na "
 "samostatném řádku"
@@ -2602,11 +2570,13 @@ msgstr ""
 
 #: gajim/gajim_remote.py:118
 #, fuzzy
-msgid "Sends new chat message to a contact in the roster. Account is optional."
+msgid ""
+"Sends new chat message to a contact in the contact list. Account is optional."
 msgstr "Použití: /%s, pošle zprávu kontaktu"
 
 #: gajim/gajim_remote.py:120 gajim/gajim_remote.py:130
-msgid "JID of the contact that will receive the message"
+#, fuzzy
+msgid "XMPP Address of the contact that will receive the message"
 msgstr "JID kontaktu, který obdrží zprávu"
 
 #: gajim/gajim_remote.py:121 gajim/gajim_remote.py:132
@@ -2620,8 +2590,10 @@ msgid "if specified, the message will be sent using this account"
 msgstr "pokud bude uvedeno, zpráva bude odeslána z tohoto účtu"
 
 #: gajim/gajim_remote.py:127
-msgid "Sends a chat message to someone on your roster. Account is optional."
-msgstr ""
+#, fuzzy
+msgid ""
+"Sends a chat message to someone on your contact list. Account is optional."
+msgstr "Použití: /%s, pošle zprávu kontaktu"
 
 #: gajim/gajim_remote.py:131
 msgid "subject"
@@ -2632,11 +2604,13 @@ msgid "message subject"
 msgstr "předmět zprávy"
 
 #: gajim/gajim_remote.py:138
-msgid "Sends new message to a groupchat you've joined."
+#, fuzzy
+msgid "Sends new message to a group chat you've joined."
 msgstr "Poslat novou zprávu do diskuze ke které jste připojeni."
 
 #: gajim/gajim_remote.py:140
-msgid "JID of the room that will receive the message"
+#, fuzzy
+msgid "XMPP Address of the group chat that will receive the message"
 msgstr "JID diskuze do které přijde zpráva"
 
 #: gajim/gajim_remote.py:147
@@ -2645,7 +2619,8 @@ msgstr "Získej detailní informace o kontaktu"
 
 #: gajim/gajim_remote.py:149 gajim/gajim_remote.py:162
 #: gajim/gajim_remote.py:192
-msgid "JID of the contact"
+#, fuzzy
+msgid "XMPP Address of the contact"
 msgstr "JID kontaktu"
 
 #: gajim/gajim_remote.py:153
@@ -2708,7 +2683,8 @@ msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Zapíše aktuální nastavení do souboru .config"
 
 #: gajim/gajim_remote.py:190
-msgid "Removes contact from roster"
+#, fuzzy
+msgid "Removes contact from contact list"
 msgstr "Odstraní kontakt ze Seznamu"
 
 #: gajim/gajim_remote.py:193
@@ -2754,9 +2730,9 @@ msgid "Missing argument \"contact_jid\""
 msgstr "Chybí parametry \"contact_jid\""
 
 #: gajim/gajim_remote.py:275
-#, python-format
+#, fuzzy, python-format
 msgid ""
-"'%s' is not in your roster.\n"
+"'%s' is not in your contact list.\n"
 "Please specify account for sending the message."
 msgstr ""
 "'%s' není ve vašem Seznamu.\n"
@@ -2979,12 +2955,12 @@ msgstr "Konec týdne"
 msgid "Weekend!"
 msgstr "Víkend!"
 
-#: gajim/common/logger.py:192 gajim/common/logger.py:197
+#: gajim/common/logger.py:189 gajim/common/logger.py:194
 #, 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:217
+#: gajim/common/logger.py:214
 #, fuzzy, python-format
 msgid "Creating %s"
 msgstr "Jím"
@@ -3059,22 +3035,22 @@ msgstr "%(nickname)s se odhlásil"
 msgid "Contact Signed Out"
 msgstr "Kontakt se odhlásil"
 
-#: gajim/common/contacts.py:455
-msgid "Not in roster"
-msgstr "Není v rosteru"
-
 #: gajim/common/config.py:80
+#, fuzzy
 msgid ""
 "Show desktop notification even when a chat window is opened for this contact "
-"and does not have focus"
+"and does not have focus."
 msgstr ""
+"Povolit popup/upozornění pokud jsem _pryč/nedostupný/nerušit/neviditelný"
 
 #: gajim/common/config.py:81
-msgid "Play sound when user is busy"
+#, fuzzy
+msgid "Play sound even when being busy."
 msgstr "Přehrávat zvuk, je-li uživatel zaneprázdněn"
 
 #: gajim/common/config.py:83
-msgid "Show only online and free for chat contacts in roster."
+#, fuzzy
+msgid "Show only online and free for chat contacts in the contact list."
 msgstr "Zobraz v rosteru pouze online kontakty nebo kontakty hledající pokec."
 
 #: gajim/common/config.py:86
@@ -3082,13 +3058,16 @@ msgid "Time in minutes, after which your status changes to away."
 msgstr "Čas v minutách, po kterém se Váš stav přepne na pryč."
 
 #: gajim/common/config.py:87
-msgid "$S (Away as a result of being idle more than $T min)"
+#, fuzzy
+msgid "$S (Away: Idle more than $T min)"
 msgstr "$S (Pryč z důvodu nečinosti po více než $T minut)"
 
 # FIXME: asi blbe
 #: gajim/common/config.py:87
 #, fuzzy
-msgid "$S will be replaced by current status message, $T by autoawaytime."
+msgid ""
+"$S will be replaced by current status message, $T by the 'autoawaytime' "
+"value."
 msgstr "$S bude změněn na aktuální stav, čas: $T"
 
 #: gajim/common/config.py:89
@@ -3096,74 +3075,78 @@ msgid "Time in minutes, after which your status changes to not available."
 msgstr "Čas v minutách, po kterém se Váš stav přepne na nedostupný."
 
 #: gajim/common/config.py:90
-msgid "$S (Not available as a result of being idle more than $T min)"
+#, fuzzy
+msgid "$S (Not available: Idle more than $T min)"
 msgstr "$S (Nedostupný z důvodu nečinosti po více než $T minut)"
 
 # FIXME: asi blbe
 #: gajim/common/config.py:90
 #, fuzzy
-msgid "$S will be replaced by current status message, $T by autoxatime."
+msgid ""
+"$S will be replaced by current status message, $T by the 'autoxatime' value."
 msgstr "$S bude změněn na aktuální stav, čas: $T"
 
 #: gajim/common/config.py:93
 #, fuzzy
 msgid ""
-"When to show notification area icon. Can be 'never', 'on_event', 'always'."
+"When to show the notification area icon. Can be 'never', 'on_event', and "
+"'always'."
 msgstr ""
 "Kdy zobrazit ikonu v oznamovací oblasti. Může být jedno z nikdy='never', při "
 "události='on_event', vždy='always'."
 
 #: gajim/common/config.py:94
-msgid "Allow to hide the roster window even if the tray icon is not shown."
+msgid ""
+"Allow to hide the contact list window even if the notification area icon is "
+"not shown."
 msgstr ""
 
 #: gajim/common/config.py:97
 #, fuzzy
-msgid "Contact signed in notification color."
-msgstr "_Zobrazit událost v rosteru"
+msgid "Notification color for contacts signing in."
+msgstr "Upozorni mě na kontakty které se přihlásí"
 
 #: gajim/common/config.py:98
 #, fuzzy
-msgid "Contact signout notification color"
-msgstr "_Zobrazit událost v rosteru"
+msgid "Notification color for contacts signing out."
+msgstr "Upozorni mě na kontakty které se odhlásí"
 
 #: gajim/common/config.py:99
 #, fuzzy
-msgid "New message notification color."
+msgid "Notification color for new message notification."
 msgstr "Zobrazit náhled nové zprávy ve vyskakovacím okně?"
 
 #: gajim/common/config.py:100
 #, fuzzy
-msgid "File transfer request notification color."
-msgstr "Požadavek přenosu souboru"
+msgid "Notification color for file transfer request."
+msgstr "_Upozornit mě po dokončení přenosu souboru"
 
 #: gajim/common/config.py:101
 #, fuzzy
-msgid "File transfer error notification color."
-msgstr "Přenos souboru zrušen"
+msgid "Notification color for file transfer errors."
+msgstr "_Upozornit mě po dokončení přenosu souboru"
 
 #: gajim/common/config.py:102
-#, fuzzy
-msgid "File transfer complete or stopped notification color."
-msgstr "Zobraz upozornění, až bude přenos souboru dokončen"
+msgid "Notification color for stopped or completed file transfers."
+msgstr ""
 
 #: gajim/common/config.py:103
-#, fuzzy
-msgid "Groupchat invitation notification color"
-msgstr "Skupinová pozvánka"
+msgid "Notification color for group chat invitations."
+msgstr ""
 
 #: gajim/common/config.py:104
 #, fuzzy
-msgid "Background color of status changed notification"
+msgid "Notification background color for changed status."
 msgstr "Barva pozadí kontaktů, jež se zrovna přihlásili."
 
 #: gajim/common/config.py:105
-msgid "Other dialogs color."
+msgid "Notification color for other dialogs."
 msgstr ""
 
 #: gajim/common/config.py:106
+#, fuzzy
 msgid ""
-"List (space separated) of rows (accounts and groups) that are collapsed."
+"List of rows (accounts and groups) that are collapsed (space separated)."
 msgstr ""
 "Seznam (oddělené mezerami) řádků (účtů a skupin), které budou \"zhroucené\"."
 
@@ -3171,8 +3154,10 @@ msgstr ""
 msgid "default"
 msgstr "výchozí"
 
-#: gajim/common/config.py:113
-msgid "Language used by speller"
+#: gajim/common/config.py:113 gajim/common/config.py:424
+#: gajim/common/config.py:431
+#, fuzzy
+msgid "Language used for spell checking."
 msgstr "Jazyk použitý kontrolou pravopisu"
 
 #: gajim/common/config.py:114
@@ -3186,10 +3171,11 @@ msgstr ""
 "'nikdy' - nevypisuj čas."
 
 #: gajim/common/config.py:115
+#, fuzzy
 msgid ""
 "Print time in chats using Fuzzy Clock. Value of fuzziness from 1 to 4, or 0 "
-"to disable fuzzyclock. 1 is the most precise clock, 4 the least precise one. "
-"This is used only if print_time is 'sometimes'."
+"to disable Fuzzy Clock. 1 is the most precise clock, 4 the least precise "
+"one. This is used only if 'print_time' is 'sometimes'."
 msgstr ""
 "Vypiš čas v rozhovorech s použitím Fuzzy Clock. Hodnota náhodnosti je od 1 "
 "to 4, nebo 0 pro vypnutí Fuzzy Clock. 1 je nejpřesnější čas, 4 nejméně "
@@ -3206,15 +3192,17 @@ msgstr "Ber * / _ páry jako možné formátovací znaky."
 #: gajim/common/config.py:120
 #, fuzzy
 msgid ""
-"If true, do not remove */_ . So *abc* will be bold but with * * not removed."
+"If enabled, do not remove */_ . So *abc* will be bold but with * * not "
+"removed."
 msgstr ""
 "Pokud zapnuto, nemažte */_ . Potom *abc* bude tučně ale s * * neodstraněnými."
 
 #: gajim/common/config.py:123
+#, fuzzy
 msgid ""
-"Uses ReStructured text markup to send HTML, plus ascii formatting if "
-"selected. For syntax, see http://docutils.sourceforge.net/docs/ref/rst/"
-"restructuredtext.html (If you want to use this, install docutils)"
+"Uses ReStructured text markup to send HTML, plus ASCII formatting if "
+"selected. Needs docutils installed (for syntax, see http://docutils."
+"sourceforge.net/docs/ref/rst/restructuredtext.html)."
 msgstr ""
 "Pokud je vybráno, použije ReStructured text markup k odeslání HTML, navíc s "
 "ascii formátování. Pro syntaxi navštivte http://docutils.sourceforge.net/"
@@ -3222,37 +3210,40 @@ msgstr ""
 "nainstalujte docutils)"
 
 #: gajim/common/config.py:132
+#, fuzzy
 msgid ""
-"Character to add after nickname when using nick completion (tab) in group "
-"chat."
+"Character to add after nickname when using nickname completion (tab) in "
+"group chat."
 msgstr ""
 "Znak, který se přidá za přezdívku po použití doplňování jména tabulátorem v "
 "diskuzi."
 
 #: gajim/common/config.py:133
+#, fuzzy
 msgid ""
-"Character to propose to add after desired nickname when desired nickname is "
-"used by someone else in group chat."
+"Character to propose to add after desired nickname when nickname is already "
+"used in group chat."
 msgstr ""
 "Znak navržený pro přidání za zamýšlenou přezdívku, pokud už ji používá někdo "
 "jiný v diskuzi."
 
 #: gajim/common/config.py:155
 msgid ""
-"If true, Gajim will save roster position when hiding roster, and restore it "
-"when showing roster."
+"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:161
-msgid "Place the roster on the right in single window mode"
+msgid "Place the contact list on the right in single window mode"
 msgstr ""
 
 #: gajim/common/config.py:167
 #, fuzzy
 msgid ""
-"This option let you customize timestamp that is printed in conversation. For "
-"example \"[%H:%M] \" will show \"[hour:minute] \". See python doc on "
-"strftime for full documentation: http://docs.python.org/lib/module-time.html"
+"This option lets you customize the timestamp that is printed in "
+"conversation. For example '[%H:%M] ' will show '[hour:minute] '. See python "
+"doc on strftime for full documentation (https://docs.python.org/3/library/"
+"time.html)."
 msgstr ""
 "Tato volba umožní vlastní formátování času, který je zobrazován v "
 "rozhovorech. Například \"[%H:%M]\" zobrazí \"[hodina:minuta]\". Pro víc "
@@ -3260,261 +3251,264 @@ msgstr ""
 "python.org/lib/module-time.html"
 
 #: gajim/common/config.py:168
-msgid "Characters that are printed before the nickname in conversations"
+#, 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:169
-msgid "Characters that are printed after the nickname in conversations"
+#, 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:170
-msgid "Add * and [n] in roster title?"
-msgstr "Přidat * a [n] k titulku Seznamu?"
+#, 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:171
 #, fuzzy
 msgid ""
-"How many history messages should be restored when a chat tab/window is "
-"reopened?"
+"Number of messages from chat history to be restored when a chat tab/window "
+"is reopened."
 msgstr ""
 "Jak moc řádků si pamatovat z předchozího rozhovoru, když je okno/záložka "
 "rozhovoru znovu otevřena."
 
 #: gajim/common/config.py:172
-msgid "How far back in time (minutes) history is restored. -1 means no limit."
+msgid ""
+"How far back in time (minutes) chat history is restored. -1 means no limit."
 msgstr ""
 
 #: gajim/common/config.py:173
 #, fuzzy
 msgid ""
-"How many lines to request from server when entering a groupchat. -1 means no "
-"limit"
-msgstr "Kolik řádek požadovat od serveru při připojení k diskuzi."
-
-#: gajim/common/config.py:174
-#, fuzzy
-msgid ""
-"Minutes of backlog to request when entering a groupchat. -1 means no limit"
-msgstr "Kolik minut zpátky do historie při připojení k diskuzi."
-
-#: gajim/common/config.py:175
-msgid ""
-"How many seconds to wait before trying to autorejoin to a conference you are "
-"being disconnected from. Set to 0 to disable autorejoining."
+"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 ""
 "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:176
-msgid "Should autorejoin be activated when kicked from a conference?"
+#: gajim/common/config.py:174
+msgid ""
+"Should automatic rejoin be activated when you were kicked from a group chat?"
 msgstr ""
 
-#: gajim/common/config.py:177
-msgid ""
-"Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
-"Client default behaviour)."
+#: gajim/common/config.py:175
+#, 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:179
-msgid "How many lines to store for Ctrl+KeyUP."
+#: gajim/common/config.py:177
+#, 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:182
+#: gajim/common/config.py:180
 #, fuzzy, python-format
 msgid ""
-"Either custom URL with %%s in it where %%s is the word/phrase or "
-"'WIKTIONARY' which means use Wikitionary."
+"Either a custom URL with %%s in it (where %%s is the word/phrase) or "
+"'WIKTIONARY' (which means use Wikitionary)."
 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:185
+#: gajim/common/config.py:183
 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:187
+#: gajim/common/config.py:185
+#, fuzzy
 msgid ""
-"When not printing time for every message (print_time==sometimes), print it "
+"When not printing time for every message ('print_time'==sometimes), print it "
 "every x minutes."
 msgstr ""
 "Když nevypisuji čas pro každou zprávu (print_time=='někdy'), vypisuj ji "
 "každých x minut."
 
-#: gajim/common/config.py:188
+#: gajim/common/config.py:186
 msgid "Ask before pasting an image."
 msgstr ""
 
-#: gajim/common/config.py:189
+#: gajim/common/config.py:187
 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:190
+#: gajim/common/config.py:188
 #, fuzzy
 msgid ""
-"Always ask for confirmation before closing groupchats with any of the JIDs "
-"on this space separated list."
+"Always ask for confirmation before closing group chats with any of the XMPP "
+"Addresses on this list (space separated)."
 msgstr ""
 "Vždy se ptát před zavřením oken/panelů diskuzí uvedených v tomto seznamu "
 "mezerami oddělením Jabber ID místností."
 
-#: gajim/common/config.py:191
+#: gajim/common/config.py:189
 #, fuzzy
 msgid ""
-"Never ask for confirmation before closing groupchats with any of the JIDs on "
-"this space separated list."
+"Never ask for confirmation before closing group chats with any of the XMPP "
+"Addresses on this list (space separated)."
 msgstr ""
 "Nikdy se neptát před zavřením oken/záložek diskuzí uvedených v tomto seznamu "
 "mezerami oddělenými Jabber ID místností."
 
-#: gajim/common/config.py:192
+#: gajim/common/config.py:190
 #, fuzzy
 msgid ""
-"Ask before closing tabbed chat window if there are controls that can lose "
-"data (chat, private chat, groupchat that will not be minimized)"
+"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 ""
 "Ptát se před zavřením okna s panely rozhovorů, jsou-li tam prvky, které "
 "mohou ztratit data (rozhovor, soukromý rozhovor, diskuze které nebudou "
 "minimalizovány)"
 
-#: gajim/common/config.py:195
+#: gajim/common/config.py:193
 #, fuzzy
 msgid ""
-"Comma separated list of sent hosts, in addition of local interfaces, for "
-"File Transfer in case of address translation/port forwarding."
+"List of send hosts (comma separated) in addition to local interfaces for "
+"file transfers (in case of address translation/port forwarding)."
 msgstr ""
 "Čárkami oddělený seznam počítačů kterým posíláme, navíc k lokálním síťovým "
 "rozhraním, pro přenos souborů v případě překladu adres nebo přesměrováním "
 "portů."
 
-#: gajim/common/config.py:196
+#: gajim/common/config.py:194
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "IEC standard říká KiB = 1024 bytů, KB = 1000 bytů."
 
-#: gajim/common/config.py:198
+#: gajim/common/config.py:196
 #, fuzzy
 msgid "Notify of events in the notification area."
 msgstr "Upozorni na události v systémovém trayi."
 
-#: gajim/common/config.py:199
+#: gajim/common/config.py:197
 msgid ""
-"If False, Gajim will display a static event icon instead of the blinking "
-"status icon in the notification area when notifying on event."
+"If disabled, Gajim will display a static event icon instead of the blinking "
+"status icon in the notification area when notifying about an event."
 msgstr ""
 
-#: gajim/common/config.py:205
+#: gajim/common/config.py:203
 msgid "Show tab when only one conversation?"
 msgstr "Zobrazit záložku při jediném rozhovoru?"
 
-#: gajim/common/config.py:206
+#: gajim/common/config.py:204
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "Zobrazit okraj panelu v oknech rozhovorů?"
 
-#: gajim/common/config.py:207
+#: gajim/common/config.py:205
 msgid "Show close button in tab?"
 msgstr "Zobrazit tlačitko zavřít v záložce?"
 
-#: gajim/common/config.py:220
+#: gajim/common/config.py:218
 msgid "Preview new messages in notification popup?"
 msgstr "Zobrazit náhled nové zprávy ve vyskakovacím okně?"
 
-#: gajim/common/config.py:223
+#: gajim/common/config.py:221
+#, fuzzy
 msgid ""
-"A semicolon-separated list of words that will be highlighted in group chats."
+"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:224
+#: gajim/common/config.py:222
 #, fuzzy
 msgid ""
-"If true, quits Gajim when X button of Window Manager is clicked. This "
-"setting is taken into account only if notification icon is used."
+"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 ""
 "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:225
+#: gajim/common/config.py:223
 msgid ""
-"If true, Gajim hides the Roster window on pressing the X button instead of "
-"minimizing into the Dock."
+"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:226
+#: gajim/common/config.py:224
 #, fuzzy
 msgid ""
-"If true, Gajim will display an icon on each tab containing unread messages. "
-"Depending on the theme, this icon may be animated."
+"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:227
+#: gajim/common/config.py:225
 #, fuzzy
 msgid ""
-"If true, Gajim will display the status message, if not empty, for every "
-"contact under the contact name in roster window."
+"If enabled, Gajim will display the status message (if not empty) underneath "
+"the contact name in the contact list window."
 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:233
-msgid "Define the position of the avatar in roster. Can be left or right"
+#: gajim/common/config.py:231
+#, 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:234
+#: gajim/common/config.py:232
 #, fuzzy
 msgid ""
-"If False, Gajim will no longer print status line in chats when a contact "
-"changes their status and/or their status message."
+"If disabled, Gajim will no longer print status messages in chats when a "
+"contact changes their status (and/or their status message)."
 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:235
+#: gajim/common/config.py:233
 #, fuzzy
 msgid ""
 "Default Setting: Show a status message for every join or leave in a group "
-"chat"
+"chat."
 msgstr "Nelze se připojit se do diskuze"
 
-#: gajim/common/config.py:236
+#: gajim/common/config.py:234
+#, fuzzy
 msgid ""
-"Default Setting: Show a status message for all status (away, dnd, etc.) "
-"changes of users in a group chat"
-msgstr ""
+"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:238
-msgid "Log XHTML messages instead of plain text messages."
+#: gajim/common/config.py:236
+msgid "Store XHTML messages in chat history instead of plain text messages."
 msgstr ""
 
-#: gajim/common/config.py:239
+#: gajim/common/config.py:237
 msgid "Don't show avatar for the transport itself."
 msgstr "Nezobrazuj avatara pro transport samotný."
 
-#: gajim/common/config.py:240
-msgid "Don't show roster in the system taskbar."
+#: gajim/common/config.py:238
+#, fuzzy
+msgid "Don't show contact list window in the system taskbar."
 msgstr "Nezobrazuj roster v liště úloh."
 
-#: gajim/common/config.py:241
+#: gajim/common/config.py:239
 #, fuzzy
 msgid ""
-"If true, make the window flash (the default behaviour in most Window "
-"Managers) when holding pending events."
+"If enabled, Gajim makes the window flash (the default behaviour in most "
+"Window Managers) when holding pending events."
 msgstr ""
 "Pokud je True a instalované GTK+ a PyGTK verze jsou alespoň 2.8, blikej "
 "oknem (výchozí chování ve většině Window Managerů) pokud čekají nové "
 "události."
 
-#: gajim/common/config.py:245
+#: gajim/common/config.py:243
 #, fuzzy
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
 "'always_with_roster' - Like 'always' but the messages are in a single window "
-"along with the roster.\n"
+"along with the contact list.\n"
 "'never' - All messages get their own window.\n"
 "'peracct' - Messages for each account are sent to a specific window.\n"
-"'pertype' - Each message type (e.g. chats vs. groupchats) is sent to a "
+"'pertype' - Each message type (e.g. chats vs. group chats) is sent to a "
 "specific window."
 msgstr ""
 "Řídí okno, kam budou doručeny nové zprávy.\n"
@@ -3525,121 +3519,130 @@ 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:246
+#: gajim/common/config.py:244
 msgid ""
-"Show roster on startup.\n"
-"'always' - Always show roster.\n"
-"'never' - Never show roster.\n"
-"'last_state' - Restore the last state roster."
+"Show contact list window on startup.\n"
+"'always' - Always show contact list window.\n"
+"'never' - Never show contact list window.\n"
+"'last_state' - Restore last state of the contact list window."
 msgstr ""
 
-#: gajim/common/config.py:247
-msgid "If False, you will no longer see the avatar in the chat window."
+#: gajim/common/config.py:245
+#, 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:248
+#: gajim/common/config.py:246
 #, fuzzy
-msgid "If true, pressing the escape key closes a tab/window."
+msgid "If enabled, pressing Esc closes a tab/window."
 msgstr "Pokud je True, stiskem escape zavřete panel nebo okno"
 
-#: gajim/common/config.py:249
-msgid "Hides the banner in a group chat window"
+#: gajim/common/config.py:247
+#, fuzzy
+msgid "Hides the banner in a group chat window."
 msgstr "Skryje nadpis v okně diskuze"
 
-#: gajim/common/config.py:250
-msgid "Hides the banner in two persons chat window"
-msgstr "Skryje nadpis v okně rozhovoru dvou lidí"
+#: gajim/common/config.py:248
+#, fuzzy
+msgid "Hides the banner in a 1:1 chat window."
+msgstr "Skryje nadpis v okně diskuze"
 
-#: gajim/common/config.py:251
-msgid "Hides the group chat occupants list in group chat window."
+#: gajim/common/config.py:249
+#, 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:252
+#: gajim/common/config.py:250
+#, fuzzy
 msgid ""
 "In a chat, show the nickname at the beginning of a line only when it's not "
-"the same person talking than in previous message."
+"the same person talking as in the previous message."
 msgstr ""
 "V rozhovoru zobraz přezdívku na začátku řádku pouze v případě, když to není "
 "stejný člověk, jako v předchozí zprávě."
 
 # FIXME: netusim co to je... najit
-#: gajim/common/config.py:253
+#: gajim/common/config.py:251
 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:254
-msgid "Ctrl-Tab go to next composing tab when none is unread."
+#: gajim/common/config.py:252
+#, 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:255
+#: gajim/common/config.py:253
 #, fuzzy
 msgid ""
-"Show the confirm metacontacts creation dialog or not? Empty string means "
-"never show the dialog."
+"Show a confirmation dialog to create metacontacts? Empty string means never "
+"show the dialog."
 msgstr ""
-"Mám zobrazit dialog vytvoření metakontaktu nebo ne? Prázdný řetezec znamená "
+"Mám zobrazit dialog potvrzení blokace, nebo ne? Prázdný řetezec znamená "
 "nikdy nezobrazovat dialog."
 
-#: gajim/common/config.py:256
+#: gajim/common/config.py:254
 #, fuzzy
 msgid ""
-"Show the confirm block contact dialog or not? Empty string means never show "
+"Show a confirmation dialog to block a contact? Empty string means never show "
 "the dialog."
 msgstr ""
 "Mám zobrazit dialog potvrzení blokace, nebo ne? Prázdný řetezec znamená "
 "nikdy nezobrazovat dialog."
 
-#: gajim/common/config.py:257
+#: gajim/common/config.py:255
 #, fuzzy
 msgid ""
-"Show the confirm custom status dialog or not? Empty string means never show "
-"the dialog."
+"Show a confirmation dialog for a custom status? Empty string means never "
+"show the dialog."
 msgstr ""
 "Mám zobrazit dialog vlastního stavu nebo ne? Prázdný řetezec znamená nikdy "
 "nezobrazovat dialog."
 
-#: gajim/common/config.py:258
+#: gajim/common/config.py:256
 #, fuzzy
 msgid ""
-"If true, you will be able to set a negative priority to your account in "
-"account modification window. BE CAREFUL, when you are logged in with a "
-"negative priority, you will NOT receive any message from your server."
+"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 ""
 "Je-li povoleno, bude možné použít zápornou prioritu účtu v okně úprava účtu. "
 "BUĎ OPATRNÝ, když jsi přihlášen se zápornou prioritou, nedostaneš od serveru "
 "žádnou zprávu."
 
-#: gajim/common/config.py:259
+#: gajim/common/config.py:257
 #, fuzzy
 msgid ""
-"If true, Gajim will show number of online and total contacts in account and "
-"group rows."
+"If enabled, Gajim will show both the number of online and total contacts in "
+"account rows as well as in group rows."
 msgstr ""
 "Je-li povoleno, Gajim zobrazí počet dostupných a všech kontaktů v účtu a u "
 "řádků skupin."
 
-#: gajim/common/config.py:260
+#: gajim/common/config.py:258
+#, fuzzy
 msgid ""
-"Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
-"as if they were of this type"
+"Can be empty, 'chat' or 'normal'. If not empty, all incoming messages are "
+"treated as if they were of this type."
 msgstr ""
 "Může být prázdný, 'chat' nebo 'message'. Není-lí prázdné, považuj všechny "
 "příchozí zprávy jako uvedený typ"
 
-#: gajim/common/config.py:261
+#: gajim/common/config.py:259
 #, fuzzy
 msgid ""
-"If true, Gajim will scroll and select the contact who sent you the last "
-"message, if chat window is not already opened."
+"If enabled, Gajim will scroll and select the contact who sent you the last "
+"message, if the chat window is not already opened."
 msgstr ""
 "Je-li povoleno, Gajim bude posune a vybere kontakt, který vám poslal "
 "poslední zprávu, pokud již okno rozhovoru není otevřené."
 
-#: gajim/common/config.py:262
+#: gajim/common/config.py:260
 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:263
+#: gajim/common/config.py:261
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
@@ -3647,141 +3650,151 @@ msgstr ""
 "Maximální počet řádků, které se vypíší v konverzacích. Nejstarší řádky jsou "
 "smazány."
 
-#: gajim/common/config.py:264
+#: gajim/common/config.py:262
 #, fuzzy
 msgid ""
-"If true, notification windows from notification-daemon will be attached to "
-"notification icon."
+"If enabled, notification windows from notification-daemon will be attached "
+"to the notification area icon."
 msgstr ""
 "Je-li povoleno, Upozorňovací démon přidá upozornění do systémové lišty."
 
-#: gajim/common/config.py:265
+#: gajim/common/config.py:263
 msgid "Choose interval between 2 checks of idleness."
 msgstr "Vyberte interval mezi dvěma stavy nečinnosti."
 
-#: gajim/common/config.py:266
+#: gajim/common/config.py:264
+#, fuzzy
 msgid ""
-"Valid uri schemes. Only schemes in this list will be accepted as \"real\" "
-"uri. (mailto and xmpp are handled separately)"
+"Valid URI schemes. Only schemes in this list will be accepted as 'real' URI "
+"(mailto and xmpp are handled separately)."
 msgstr ""
 "Platná uri schémata. Pouze schémata v tomto seznamu budou akceptována jako "
 "\"skutečné\" URI. (mailto a xmpp jsou obsluhovány zvlášť)"
 
-#: gajim/common/config.py:267
+#: gajim/common/config.py:265
 #, fuzzy
-msgid "If true, completion in groupchats will be like a shell auto-completion"
+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:272
-msgid "Optionally fix jingle output video framerate. Example: 10/1 or 25/2"
+#: gajim/common/config.py:270
+msgid "Optionally fix Jingle output video framerate. Example: 10/1 or 25/2."
 msgstr ""
 
-#: gajim/common/config.py:273
-msgid "Optionally resize jingle output video. Example: 320x240"
+#: gajim/common/config.py:271
+msgid "Optionally resize Jingle output video. Example: 320x240."
 msgstr ""
 
-#: gajim/common/config.py:274
-msgid "If true, You will also see your webcam"
+#: gajim/common/config.py:272
+msgid "If enabled, you will see your webcam's video stream as well."
 msgstr ""
 
-#: gajim/common/config.py:277
+#: gajim/common/config.py:275
 msgid ""
-"If true, Gajim will try to use a STUN server when using Jingle. The one in "
-"\"stun_server\" option, or the one given by the XMPP server."
+"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:278
+#: gajim/common/config.py:276
 msgid "STUN server to use when using Jingle"
 msgstr ""
 
-#: gajim/common/config.py:279
+#: gajim/common/config.py:277
 msgid ""
-"If true, Gajim will show affiliation of groupchat occupants by adding a "
-"colored square to the status icon"
+"If enabled, Gajim will show affiliation of group chat participants by adding "
+"a colored square to the status icon."
 msgstr ""
 
-#: gajim/common/config.py:280
+#: gajim/common/config.py:278
 msgid ""
 "Proxy used for all outgoing connections if the account does not have a "
-"specific proxy configured"
+"specific proxy configured."
 msgstr ""
 
-#: gajim/common/config.py:281
-msgid "If true, Gajim will ignore incoming attention requests (\"wizz\")."
+#: gajim/common/config.py:279
+msgid "If enabled, Gajim will ignore incoming attention requests ('wizz')."
 msgstr ""
 
-#: gajim/common/config.py:282
+#: gajim/common/config.py:280
 msgid ""
 "If enabled, Gajim will reopen chat windows that were opened last time Gajim "
 "was closed."
 msgstr ""
 
-#: gajim/common/config.py:283
+#: gajim/common/config.py:281
 #, fuzzy
 msgid ""
-"If enabled, Gajim will show an icon to show that sent message has been "
-"received by your contact"
+"If enabled, Gajim will display an icon to show that sent messages have been "
+"received by your contact."
 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:284
-msgid "Show a mini avatar in chat window tabs and in window icon"
+#: gajim/common/config.py:282
+msgid "Show a mini avatar in chat window tabs and as the window's icon."
 msgstr ""
 
-#: gajim/common/config.py:285
+#: gajim/common/config.py:283
 #, fuzzy
-msgid "If true, Gajim will use the Systems Keyring to store account passwords."
+msgid ""
+"If enabled, Gajim will use the System's Keyring to store account passwords."
 msgstr ""
 "Je-li povoleno, Gajim použije Gnome Keyring (je-li dostupný) k uložení hesel "
 "k účtům."
 
+#: gajim/common/config.py:284
+msgid "If enabled, Gajim will execute XEP-0146 Commands."
+msgstr ""
+
+#: gajim/common/config.py:285
+msgid "2: System, 1: Enabled, 0: Disabled"
+msgstr ""
+
 #: gajim/common/config.py:286
-msgid "If true, Gajim will execute XEP-0146 Commands."
+msgid "Options in days which can be chosen in the sync threshold menu"
 msgstr ""
 
 #: gajim/common/config.py:287
-msgid "2: System, 1: Enabled, 0: Disabled"
+msgid ""
+"Maximum history in days we request from a public group chat archive. 0: As "
+"much as possible."
 msgstr ""
 
 #: gajim/common/config.py:288
-msgid "Options in days which can be chosen in the sync threshold menu"
+msgid ""
+"Maximum history in days we request from a private group chat archive. 0: As "
+"much as possible."
 msgstr ""
 
 #: gajim/common/config.py:289
 msgid ""
-"Maximum history in days we request from a public room archive. 0: As much as "
-"possible"
+"If enabled, Gajim shows the group chat subject in the chat window when "
+"joining."
 msgstr ""
 
 #: gajim/common/config.py:290
+#, fuzzy
 msgid ""
-"Maximum history in days we request from a private room archive. 0: As much "
-"as possible"
-msgstr ""
+"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:291
-msgid "If the room subject is shown in chat on join"
-msgstr ""
+#, 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:292
+#, fuzzy
 msgid ""
-"If the contact row is colored according to the current chatstate of the "
-"contact"
-msgstr ""
+"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:293
-msgid "If the tab is colored according to the current chatstate of the contact"
-msgstr ""
-
-#: gajim/common/config.py:294
-msgid ""
-"Shows a text in the banner that describes the current chatstate of the "
-"contact"
-msgstr ""
-
-#: gajim/common/config.py:295 gajim/common/config.py:424
 #, fuzzy
 msgid ""
 "Chat state notifications that are sent to contacts. Possible values: all, "
@@ -3790,319 +3803,350 @@ msgstr ""
 "Odešílat události stavu rozhovoru. Může být pouze jediná, composing_only, "
 "vypnutá."
 
-#: gajim/common/config.py:296 gajim/common/config.py:438
+#: gajim/common/config.py:294
 #, fuzzy
 msgid ""
 "Chat state notifications that are sent to the group chat. Possible values: "
-"all, composing_only, disabled"
+"'all', 'composing_only', 'disabled'"
 msgstr ""
 "Odešílat události stavu rozhovoru. Může být pouze jediná, composing_only, "
 "vypnutá."
 
-#: gajim/common/config.py:312
+#: gajim/common/config.py:297
+msgid "API Preferences. Possible values: 'http', 'iq'"
+msgstr ""
+
+#: gajim/common/config.py:313
+#, fuzzy
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
-"defined in autopriority_* options."
+"defined in 'autopriority_*' options."
 msgstr ""
 "Priorita se změní automaticky podle tvého stavu. Priority jsou definovány v "
 "nastavení jako položky autopriority_*."
 
-#: gajim/common/config.py:320
+#: gajim/common/config.py:321
+#, fuzzy
 msgid ""
-"Status used to autoconnect as. Can be online, chat, away, xa, dnd, "
-"invisible. NOTE: this option is used only if restore_last_status is disabled"
+"Status to be used automatically when connecting. Can be 'online', 'chat', "
+"'away', 'xa', 'dnd' or 'invisible'. NOTE: This option is used only if "
+"'restore_last_status' is disabled."
 msgstr ""
 "Stav použitý při auto-připojení. Může být 'připojen', 'ukecaný', 'pryč', "
 "'nedostupný', 'nerušit', 'neviditelný'. POZNÁMKA: toto nastavení může být "
 "použito pouze pokud restore_last_status je vypnutý"
 
-#: gajim/common/config.py:321
-msgid "If enabled, restore the last status that was used."
+#: gajim/common/config.py:322
+#, 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:322
+#: gajim/common/config.py:323
 #, fuzzy
 msgid ""
-"If true, Contacts requesting authorization will be automatically accepted."
+"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:323
+#: gajim/common/config.py:324
+#, fuzzy
 msgid ""
-"If False, this account will be disabled and will not appear in roster window."
+"If disabled, this account will be disabled and will not appear in the "
+"contact list window."
 msgstr ""
 "Pokud je False, účet bude deaktivován a nebude zobrazen v okně rosteru."
 
-#: gajim/common/config.py:327
-msgid "Allow plaintext connections"
+#: gajim/common/config.py:328
+msgid "Allow plaintext connections."
 msgstr ""
 
-#: gajim/common/config.py:330
+#: gajim/common/config.py:331
 msgid ""
-"List (space separated) of authentication mechanisms to try. Can contain "
-"ANONYMOUS, EXTERNAL, GSSAPI, SCRAM-SHA-1-PLUS, SCRAM-SHA-1, DIGEST-MD5, "
-"PLAIN, X-MESSENGER-OAUTH2 or XEP-0078"
+"List of authentication mechanisms to try (space separated). Can contain "
+"'ANONYMOUS', 'EXTERNAL', 'GSSAPI', 'SCRAM-SHA-1-PLUS', 'SCRAM-SHA-1', "
+"'DIGEST-MD5', 'PLAIN', 'X-MESSENGER-OAUTH2' or 'XEP-0078'."
 msgstr ""
 
-#: gajim/common/config.py:331
+#: gajim/common/config.py:332
 #, fuzzy
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection. "
-"Can be 'warn', 'connect', 'disconnect'"
+"Can be 'warn', 'connect' or 'disconnect'."
 msgstr "Zobrazit varování před odesláním hesla přes nezabezpečené spojení."
 
-#: gajim/common/config.py:332
+#: gajim/common/config.py:333
 msgid "Show a warning dialog before using standard SSL library."
 msgstr "Zobrazit varování před použitím standartní SSL knihovny."
 
-#: gajim/common/config.py:333
+#: gajim/common/config.py:334
 #, fuzzy
 msgid ""
 "Show a warning dialog before sending PLAIN password over a plain connection."
 msgstr "Zobrazit varování před odesláním hesla přes nezabezpečené spojení."
 
-#: gajim/common/config.py:334
-msgid "Space separated list of ssl errors to ignore."
-msgstr "Mezerami oddělovaný seznam ssl chyb, které se mají ignorovat."
+#: gajim/common/config.py:335
+msgid "List of SSL errors to ignore (space separated)."
+msgstr ""
 
-#: gajim/common/config.py:340
+#: gajim/common/config.py:341
 msgid ""
-"Space separated list of JIDs for which you do not want to store logs. You "
-"can also add account name to log nothing for this account."
+"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:341
+#: gajim/common/config.py:342
 msgid ""
-"Space separated list of JIDs for which you accept to not log conversations "
-"if he does not want to."
+"List of XMPP Addresses (space separated) for which you accept to not store "
+"chat history if your contact does not want to."
 msgstr ""
 
-#: gajim/common/config.py:343
-msgid "Whitespace sent after inactivity"
+#: gajim/common/config.py:344
+#, fuzzy
+msgid "If enabled, a whitespace is sent after inactivity (keep alive)."
 msgstr "Při neaktivitě odeslán bílý znak"
 
-#: gajim/common/config.py:344
-msgid "XMPP ping sent after inactivity"
+#: gajim/common/config.py:345
+#, fuzzy
+msgid "If enabled, an XMPP ping is sent after inactivity (ping alive)."
 msgstr "XMPP ping zaslán při neaktivitě"
 
-#: gajim/common/config.py:348
+#: gajim/common/config.py:349
 #, fuzzy
 msgid ""
-"How many seconds to wait for the answer of ping alive packet before trying "
-"to reconnect?"
+"How many seconds to wait for the answer of a ping alive packet before trying "
+"to reconnect."
 msgstr ""
 "Kolik sekund se má čekat na odpověď pingu před tím, než se znovu pokusit o "
 "připojení."
 
-#: gajim/common/config.py:352
-msgid "Jabberd2 workaround"
+#: gajim/common/config.py:353
+#, fuzzy
+msgid "Jabberd2 workaround."
 msgstr "Jabberd2 workaround"
 
-#: gajim/common/config.py:355
+#: gajim/common/config.py:356
+#, fuzzy
 msgid ""
-"If checked, Gajim will use your IP and proxies defined in "
-"file_transfer_proxies option for file transfer."
+"If enabled, Gajim will use your IP and proxies defined in "
+"'file_transfer_proxies' option for file transfers."
 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:356
+#: gajim/common/config.py:357
 msgid ""
-"If true, Gajim will test file transfer proxies on startup to be sure it "
-"works. Openfire's proxies are known to fail this test even if they work."
+"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:369
-msgid "Answer to receipt requests"
-msgstr "Odpověď na doručení žádosti"
-
 #: gajim/common/config.py:370
-msgid "Sent receipt requests"
-msgstr "Poslat žádost"
+#, 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:379
+#: gajim/common/config.py:371
+msgid "If enabled, Gajim will send message receipt requests."
+msgstr ""
+
+#: gajim/common/config.py:380
 #, 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:380
+#: gajim/common/config.py:381
 #, fuzzy
 msgid "Allow Gajim to send your local time."
 msgstr "%s Vám chce poslat soubor."
 
-#: gajim/common/config.py:383
+#: gajim/common/config.py:384
 #, fuzzy
-msgid "Message that is sent to contacts you want to add"
+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:384
-msgid ""
-"If enabled, Gajim will send your local IPs so your contact can connect to "
-"your machine to transfer files."
-msgstr ""
-
 #: gajim/common/config.py:385
+#, fuzzy
 msgid ""
-"Space separated list of JIDs for which chat window will be re-opened on next "
-"startup."
+"If enabled, Gajim will send your local IP so your contact can connect to "
+"your machine for file transfers."
 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:387
-msgid "HTTP Upload: Enable HTTPS Verification"
+#: gajim/common/config.py:386
+msgid ""
+"List of XMPP Addresses (space separated) for which the chat window will be "
+"re-opened on next startup."
 msgstr ""
 
 #: gajim/common/config.py:388
-msgid ""
-"Preferred file transfer mechanism for file drag&drop on chat window. Can be "
-"'httpupload' (default) or 'jingle'"
+msgid "HTTP File Upload: Enable HTTPS Verification."
 msgstr ""
 
 #: gajim/common/config.py:389
-msgid "Allow cert verification with POSH"
+msgid ""
+"Preferred file transfer mechanism for file drag&drop on a chat window. Can "
+"be 'httpupload' (default) or 'jingle'."
 msgstr ""
 
-#: gajim/common/config.py:423 gajim/common/config.py:430
+#: gajim/common/config.py:390
 #, fuzzy
-msgid "Language for which misspelled words will be checked"
-msgstr "Jazyk, pro který chcete kontrolovat překlepy ve slovech"
+msgid "Allow certificate verification with POSH."
+msgstr "Chyba SSL certifikátu"
 
-#: gajim/common/config.py:427
-msgid "The currently active encryption for that contact"
+#: gajim/common/config.py:425
+#, fuzzy
+msgid ""
+"Chat state notifications that are sent to contacts. Possible values: 'all', "
+"'composing_only', 'disabled'"
 msgstr ""
+"Odešílat události stavu rozhovoru. Může být pouze jediná, composing_only, "
+"vypnutá."
 
-#: gajim/common/config.py:431
+#: gajim/common/config.py:428
 #, fuzzy
-msgid ""
-"How many lines to request from server when entering a groupchat. -1 means no "
-"limit, -2 means global value"
-msgstr "Kolik řádek požadovat od serveru při připojení k diskuzi."
+msgid "The currently active encryption for that contact."
+msgstr "Povolit ESessions šifrování pro tento účet."
 
 #: gajim/common/config.py:432
-#, fuzzy
 msgid ""
-"Minutes of backlog to request when entering a groupchat. -1 means no limit, "
-"-2 means global value"
-msgstr "Kolik minut zpátky do historie při připojení k diskuzi."
-
-#: gajim/common/config.py:433
-msgid "State whether a notification is created for every message in this room"
+"If enabled, a notification is created for every message in this group chat."
 msgstr ""
 
-#: gajim/common/config.py:434
+#: gajim/common/config.py:433
+#, fuzzy
 msgid ""
-"Show a status message for all status (away, dnd, etc.) changes of users in a "
-"group chat"
-msgstr ""
+"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:435
+#: gajim/common/config.py:434
 #, fuzzy
-msgid "Show a status message for every join or leave in a group chat"
+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:435
+msgid ""
+"If enabled, the group chat is minimized into the contact list when joining "
+"automatically."
+msgstr ""
+
 #: gajim/common/config.py:436
-msgid "If the group chat is minimized into the roster on autojoin"
+msgid ""
+"If enabled, the group chat is minimized into the contact list when closing "
+"it."
 msgstr ""
 
 #: gajim/common/config.py:437
-msgid "If the group chat is minimized into the roster on close"
+#, fuzzy
+msgid ""
+"Chat state notifications that are sent to the group chat. Possible values: "
+"'all', 'composing_only' or 'disabled'."
 msgstr ""
+"Odešílat události stavu rozhovoru. Může být pouze jediná, composing_only, "
+"vypnutá."
 
-#: gajim/common/config.py:441
+#: gajim/common/config.py:440
 msgid ""
-"State whether plugins should be activated on startup (this is saved on Gajim "
-"exit). This option SHOULD NOT be used to (de)activate plug-ins. Use GUI "
-"instead."
+"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:446 gajim/common/const.py:281
+#: gajim/common/config.py:445 gajim/common/const.py:315
 msgid "Sleeping"
 msgstr "Spím"
 
-#: gajim/common/config.py:447
+#: gajim/common/config.py:446
 msgid "Back soon"
 msgstr "Hned jsem zpět"
 
-#: gajim/common/config.py:447
+#: gajim/common/config.py:446
 msgid "Back in some minutes."
 msgstr "Jsem zpátky za pár minut."
 
-#: gajim/common/config.py:448 gajim/common/const.py:247
+#: gajim/common/config.py:447 gajim/common/const.py:281
 msgid "Eating"
 msgstr "Jím"
 
-#: gajim/common/config.py:448
-msgid "I'm eating, so leave me a message."
-msgstr "Právě jím, prosím zanechte mi zprávu."
+#: gajim/common/config.py:447
+#, fuzzy
+msgid "I'm eating."
+msgstr "Právě pracuji."
 
-#: gajim/common/config.py:449
+#: gajim/common/config.py:448
 msgid "Movie"
 msgstr "Film"
 
-#: gajim/common/config.py:449
+#: gajim/common/config.py:448
 msgid "I'm watching a movie."
 msgstr "Dívám se na film."
 
-#: gajim/common/config.py:450 gajim/common/const.py:314
+#: gajim/common/config.py:449 gajim/common/const.py:348
 msgid "Working"
 msgstr "Pracuji"
 
-#: gajim/common/config.py:450
+#: gajim/common/config.py:449
 msgid "I'm working."
 msgstr "Právě pracuji."
 
-#: gajim/common/config.py:451
+#: gajim/common/config.py:450
 msgid "Phone"
 msgstr "Telefon"
 
-#: gajim/common/config.py:451
+#: gajim/common/config.py:450
 msgid "I'm on the phone."
 msgstr "Zrovna telefonuji."
 
-#: gajim/common/config.py:452
+#: gajim/common/config.py:451
 msgid "Out"
 msgstr "Venku"
 
-#: gajim/common/config.py:452
+#: gajim/common/config.py:451
 msgid "I'm out enjoying life."
 msgstr "Užívám si života venku."
 
-#: gajim/common/config.py:463
+#: gajim/common/config.py:462
 msgid "I'm available."
 msgstr "Jsem dostupný."
 
-#: gajim/common/config.py:464
+#: gajim/common/config.py:463
 msgid "I'm free for chat."
 msgstr "Hledám někoho na pokec."
 
-#: gajim/common/config.py:465 gajim/gtk/accounts.py:134
+#: gajim/common/config.py:464 gajim/gtk/accounts.py:133
 msgid "Be right back."
 msgstr "Hned jsem zpět."
 
-#: gajim/common/config.py:466
+#: gajim/common/config.py:465
 msgid "I'm not available."
 msgstr "Nejsem dostupný."
 
-#: gajim/common/config.py:467
+#: gajim/common/config.py:466
 msgid "Do not disturb."
 msgstr "Nerušit."
 
-#: gajim/common/config.py:468 gajim/common/config.py:469
+#: gajim/common/config.py:467 gajim/common/config.py:468
 msgid "Bye!"
 msgstr "Zdar!"
 
-#: gajim/common/config.py:480
+#: gajim/common/config.py:479
+#, fuzzy
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
-"muc_highlight_words, or when a group chat message contains your nickname."
+"'muc_highlight_words' your nickname is mentioned."
 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:481
-msgid "Sound to play when any MUC message arrives."
+#: gajim/common/config.py:480
+#, 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:485
+#: gajim/common/config.py:484
 #, fuzzy
 msgid "Tor"
 msgstr "Příjemce"
@@ -4112,893 +4156,989 @@ msgstr "Příjemce"
 msgid "Error: cannot open %s for reading"
 msgstr "Chyba: nemůžu otevřít %s pro čtení"
 
-#: gajim/common/const.py:214
+#: gajim/common/const.py:216
+#, fuzzy
+msgid "?Group chat name:Team"
+msgstr "?Group Chat Contact Role:Žádná"
+
+#: gajim/common/const.py:217
+msgid "?Group chat description:Project discussion"
+msgstr ""
+
+#: gajim/common/const.py:218
+#, fuzzy
+msgid "?Group chat address:team"
+msgstr "Diskuze"
+
+#: gajim/common/const.py:219
+#, fuzzy
+msgid "?Group chat name:Family"
+msgstr "Zvýraznění zprávy v diskuzi"
+
+#: gajim/common/const.py:220
+msgid "?Group chat description:Spring gathering"
+msgstr ""
+
+#: gajim/common/const.py:221
+msgid "?Group chat address:family"
+msgstr ""
+
+#: gajim/common/const.py:222
+#, fuzzy
+msgid "?Group chat name:Vacation"
+msgstr "Skupinová pozvánka"
+
+#: gajim/common/const.py:223
+msgid "?Group chat description:Trip planning"
+msgstr ""
+
+#: gajim/common/const.py:224
+#, fuzzy
+msgid "?Group chat address:vacation"
+msgstr "Skupinová pozvánka"
+
+#: gajim/common/const.py:225
+#, fuzzy
+msgid "?Group chat name:Repairs"
+msgstr "_Diskuze"
+
+#: gajim/common/const.py:226
+msgid "?Group chat description:Local help group"
+msgstr ""
+
+#: gajim/common/const.py:227
+#, fuzzy
+msgid "?Group chat address:repairs"
+msgstr "Diskuze"
+
+#: gajim/common/const.py:228
+#, fuzzy
+msgid "?Group chat name:News"
+msgstr "?Group Chat Contact Role:Žádná"
+
+#: gajim/common/const.py:229
+#, fuzzy
+msgid "?Group chat description:Local news and reports"
+msgstr "Vytváření místností není povoleno."
+
+#: gajim/common/const.py:230
+#, fuzzy
+msgid "?Group chat address:news"
+msgstr "Nová diskuze"
+
+#: gajim/common/const.py:235
+#, fuzzy
+msgid "Remote server not found"
+msgstr "Tato služba nebyla nalezena"
+
+#: gajim/common/const.py:236
+msgid "Remote server timeout"
+msgstr ""
+
+#: gajim/common/const.py:237 gajim/common/const.py:238
+#: gajim/common/const.py:239
+#, fuzzy
+msgid "Address does not belong to a group chat server"
+msgstr "Tohle není diskuze"
+
+#: gajim/common/const.py:240
+#, fuzzy
+msgid "Group chat already exists"
+msgstr "Účet Local už existuje."
+
+#: gajim/common/const.py:241
+#, fuzzy
+msgid "Group chat does not exist"
+msgstr "Diskuze %s neexistuje."
+
+#: gajim/common/const.py:247
 msgid "This message was encrypted with OTR and could not be decrypted."
 msgstr ""
 
-#: gajim/common/const.py:217
+#: gajim/common/const.py:250
 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:221
+#: gajim/common/const.py:254
 msgid ""
-"This message was encrypted with OpenPGP for XMPP and could not be decrypted."
+"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:224
+#: gajim/common/const.py:258
 #, python-format
 msgid "This message was encrypted with %s and could not be decrypted."
 msgstr ""
 
-#: gajim/common/const.py:231
+#: gajim/common/const.py:265
 msgid "Doing Chores"
 msgstr "Domácí práce"
 
-#: gajim/common/const.py:232
+#: gajim/common/const.py:266
 msgid "Buying Groceries"
 msgstr "Nakupuji potraviny"
 
-#: gajim/common/const.py:233
+#: gajim/common/const.py:267
 msgid "Cleaning"
 msgstr "Uklízím"
 
-#: gajim/common/const.py:234
+#: gajim/common/const.py:268
 msgid "Cooking"
 msgstr "Vařím"
 
-#: gajim/common/const.py:235
+#: gajim/common/const.py:269
 msgid "Doing Maintenance"
 msgstr "Dělám údržbu"
 
-#: gajim/common/const.py:236
+#: gajim/common/const.py:270
 msgid "Doing the Dishes"
 msgstr "Umývám nádobí"
 
-#: gajim/common/const.py:237
+#: gajim/common/const.py:271
 msgid "Doing the Laundry"
 msgstr "Peru"
 
-#: gajim/common/const.py:238
+#: gajim/common/const.py:272
 msgid "Gardening"
 msgstr "Zahradničím"
 
-#: gajim/common/const.py:239
+#: gajim/common/const.py:273
 msgid "Running an Errand"
 msgstr "Vyřizuji"
 
-#: gajim/common/const.py:240
+#: gajim/common/const.py:274
 msgid "Walking the Dog"
 msgstr "Venčím psa"
 
-#: gajim/common/const.py:242
+#: gajim/common/const.py:276
 #, fuzzy
 msgid "Drinking"
 msgstr "Piju"
 
-#: gajim/common/const.py:243
+#: gajim/common/const.py:277
 msgid "Having a Beer"
 msgstr "Piju pivo"
 
-#: gajim/common/const.py:244
+#: gajim/common/const.py:278
 msgid "Having Coffee"
 msgstr "Na kávě"
 
-#: gajim/common/const.py:245
+#: gajim/common/const.py:279
 msgid "Having Tea"
 msgstr "Dávám si čaj"
 
-#: gajim/common/const.py:248
+#: gajim/common/const.py:282
 msgid "Having a Snack"
 msgstr "Svačím"
 
-#: gajim/common/const.py:249
+#: gajim/common/const.py:283
 #, fuzzy
 msgid "Having Breakfast"
 msgstr "Snídám"
 
-#: gajim/common/const.py:250
+#: gajim/common/const.py:284
 msgid "Having Dinner"
 msgstr "Večeřím"
 
-#: gajim/common/const.py:251
+#: gajim/common/const.py:285
 msgid "Having Lunch"
 msgstr "Obědvám"
 
-#: gajim/common/const.py:253
+#: gajim/common/const.py:287
 msgid "Exercising"
 msgstr "Cvičím"
 
-#: gajim/common/const.py:254 gajim/common/const.py:305
+#: gajim/common/const.py:288 gajim/common/const.py:339
 msgid "Cycling"
 msgstr "Jedu na kole"
 
-#: gajim/common/const.py:255
+#: gajim/common/const.py:289
 msgid "Dancing"
 msgstr "Tančím"
 
-#: gajim/common/const.py:256
+#: gajim/common/const.py:290
 msgid "Hiking"
 msgstr "Na výšlapu"
 
-#: gajim/common/const.py:257
+#: gajim/common/const.py:291
 msgid "Jogging"
 msgstr "Běhám"
 
-#: gajim/common/const.py:258
+#: gajim/common/const.py:292
 msgid "Playing Sports"
 msgstr "Sportuji"
 
-#: gajim/common/const.py:259
+#: gajim/common/const.py:293
 msgid "Running"
 msgstr "Běhám"
 
-#: gajim/common/const.py:260
+#: gajim/common/const.py:294
 msgid "Skiing"
 msgstr "Lyžuji"
 
-#: gajim/common/const.py:261
+#: gajim/common/const.py:295
 msgid "Swimming"
 msgstr "Plavu"
 
-#: gajim/common/const.py:262
+#: gajim/common/const.py:296
 msgid "Working out"
 msgstr "Posiluji"
 
-#: gajim/common/const.py:264
+#: gajim/common/const.py:298
 #, fuzzy
 msgid "Grooming"
 msgstr "Pečuji o sebe"
 
-#: gajim/common/const.py:265
+#: gajim/common/const.py:299
 msgid "At the Spa"
 msgstr "V lázních"
 
-#: gajim/common/const.py:266
+#: gajim/common/const.py:300
 msgid "Brushing Teeth"
 msgstr "Čistím si zuby"
 
-#: gajim/common/const.py:267
+#: gajim/common/const.py:301
 msgid "Getting a Haircut"
 msgstr "U holiče"
 
-#: gajim/common/const.py:268
+#: gajim/common/const.py:302
 msgid "Shaving"
 msgstr "Holím se"
 
-#: gajim/common/const.py:269
+#: gajim/common/const.py:303
 msgid "Taking a Bath"
 msgstr "Koupu se"
 
-#: gajim/common/const.py:270
+#: gajim/common/const.py:304
 msgid "Taking a Shower"
 msgstr "Sprchuji se"
 
-#: gajim/common/const.py:272
+#: gajim/common/const.py:306
 msgid "Having an Appointment"
 msgstr "Mám schůzku"
 
-#: gajim/common/const.py:274
+#: gajim/common/const.py:308
 msgid "Inactive"
 msgstr "Neaktivní"
 
-#: gajim/common/const.py:275
+#: gajim/common/const.py:309
 msgid "Day Off"
 msgstr "Den volna"
 
-#: gajim/common/const.py:276
+#: gajim/common/const.py:310
 #, fuzzy
 msgid "Hanging out"
 msgstr "Venku za zábavou"
 
-#: gajim/common/const.py:277
+#: gajim/common/const.py:311
 msgid "Hiding"
 msgstr "Skrývám se"
 
-#: gajim/common/const.py:278
+#: gajim/common/const.py:312
 msgid "On Vacation"
 msgstr "Na dovolené"
 
-#: gajim/common/const.py:279
+#: gajim/common/const.py:313
 msgid "Praying"
 msgstr "Modlím se"
 
-#: gajim/common/const.py:280
+#: gajim/common/const.py:314
 msgid "Scheduled Holiday"
 msgstr "Plánovaná dovolená"
 
-#: gajim/common/const.py:282
+#: gajim/common/const.py:316
 msgid "Thinking"
 msgstr "Přemýšlím"
 
-#: gajim/common/const.py:284
+#: gajim/common/const.py:318
 #, fuzzy
 msgid "Relaxing"
 msgstr "Relaxuji"
 
-#: gajim/common/const.py:285
+#: gajim/common/const.py:319
 msgid "Fishing"
 msgstr "Rybařím"
 
-#: gajim/common/const.py:286
+#: gajim/common/const.py:320
 msgid "Gaming"
 msgstr "Hraji hry"
 
-#: gajim/common/const.py:287
+#: gajim/common/const.py:321
 #, fuzzy
 msgid "Going out"
 msgstr "Venku"
 
-#: gajim/common/const.py:288
+#: gajim/common/const.py:322
 msgid "Partying"
 msgstr "Na párty"
 
-#: gajim/common/const.py:289
+#: gajim/common/const.py:323
 msgid "Reading"
 msgstr "Čtu si"
 
-#: gajim/common/const.py:290
+#: gajim/common/const.py:324
 #, fuzzy
 msgid "Rehearsing"
 msgstr "Nacvičuji"
 
-#: gajim/common/const.py:291
+#: gajim/common/const.py:325
 msgid "Shopping"
 msgstr "Nakupuji"
 
-#: gajim/common/const.py:292
+#: gajim/common/const.py:326
 msgid "Smoking"
 msgstr "Kouřím"
 
-#: gajim/common/const.py:293
+#: gajim/common/const.py:327
 msgid "Socializing"
 msgstr "Ve společnosti"
 
-#: gajim/common/const.py:294
+#: gajim/common/const.py:328
 msgid "Sunbathing"
 msgstr "Opaluji se"
 
-#: gajim/common/const.py:295
+#: gajim/common/const.py:329
 msgid "Watching TV"
 msgstr "Sleduji TV"
 
-#: gajim/common/const.py:296
+#: gajim/common/const.py:330
 msgid "Watching a Movie"
 msgstr "Dívám se na film"
 
-#: gajim/common/const.py:298
+#: gajim/common/const.py:332
 msgid "Talking"
 msgstr "Povídám si"
 
-#: gajim/common/const.py:299
+#: gajim/common/const.py:333
 msgid "In Real Life"
 msgstr "Ve skutečném světě"
 
-#: gajim/common/const.py:300
+#: gajim/common/const.py:334
 msgid "On the Phone"
 msgstr "Telefonuji"
 
-#: gajim/common/const.py:301
+#: gajim/common/const.py:335
 msgid "On Video Phone"
 msgstr "Mám videohovor"
 
-#: gajim/common/const.py:303
+#: gajim/common/const.py:337
 msgid "Traveling"
 msgstr "Cestuji"
 
-#: gajim/common/const.py:304
+#: gajim/common/const.py:338
 msgid "Commuting"
 msgstr "Dojíždím"
 
-#: gajim/common/const.py:306
+#: gajim/common/const.py:340
 msgid "Driving"
 msgstr "Řídím"
 
-#: gajim/common/const.py:307
+#: gajim/common/const.py:341
 msgid "In a Car"
 msgstr "V autě"
 
-#: gajim/common/const.py:308
+#: gajim/common/const.py:342
 msgid "On a Bus"
 msgstr "V autobuse"
 
-#: gajim/common/const.py:309
+#: gajim/common/const.py:343
 msgid "On a Plane"
 msgstr "V letadle"
 
-#: gajim/common/const.py:310
+#: gajim/common/const.py:344
 msgid "On a Train"
 msgstr "Ve vlaku"
 
-#: gajim/common/const.py:311
+#: gajim/common/const.py:345
 msgid "On a Trip"
 msgstr "Na výletě"
 
-#: gajim/common/const.py:312
+#: gajim/common/const.py:346
 msgid "Walking"
 msgstr "Na procházce"
 
-#: gajim/common/const.py:315
+#: gajim/common/const.py:349
 msgid "Coding"
 msgstr "Programuji"
 
-#: gajim/common/const.py:316
+#: gajim/common/const.py:350
 msgid "In a Meeting"
 msgstr "Na setkání"
 
-#: gajim/common/const.py:317
+#: gajim/common/const.py:351
 msgid "Studying"
 msgstr "Učím se"
 
-#: gajim/common/const.py:318
+#: gajim/common/const.py:352
 msgid "Writing"
 msgstr "Píši"
 
-#: gajim/common/const.py:321
+#: gajim/common/const.py:355
 msgid "Afraid"
 msgstr "Vylekaný"
 
-#: gajim/common/const.py:322
+#: gajim/common/const.py:356
 msgid "Amazed"
 msgstr "Užaslý"
 
-#: gajim/common/const.py:323
+#: gajim/common/const.py:357
 msgid "Amorous"
 msgstr "Milující"
 
-#: gajim/common/const.py:324
+#: gajim/common/const.py:358
 msgid "Angry"
 msgstr "Rozzlobený"
 
-#: gajim/common/const.py:325
+#: gajim/common/const.py:359
 msgid "Annoyed"
 msgstr "Mrzutý"
 
-#: gajim/common/const.py:326
+#: gajim/common/const.py:360
 msgid "Anxious"
 msgstr "Znepokojený"
 
-#: gajim/common/const.py:327
+#: gajim/common/const.py:361
 msgid "Aroused"
 msgstr "Vzrušený"
 
-#: gajim/common/const.py:328
+#: gajim/common/const.py:362
 msgid "Ashamed"
 msgstr "Zahanbený"
 
-#: gajim/common/const.py:329
+#: gajim/common/const.py:363
 msgid "Bored"
 msgstr "Znuděný"
 
-#: gajim/common/const.py:330
+#: gajim/common/const.py:364
 msgid "Brave"
 msgstr "Statečný"
 
-#: gajim/common/const.py:331
+#: gajim/common/const.py:365
 msgid "Calm"
 msgstr "Klidný"
 
-#: gajim/common/const.py:332
+#: gajim/common/const.py:366
 msgid "Cautious"
 msgstr "Opatrný"
 
-#: gajim/common/const.py:333
+#: gajim/common/const.py:367
 msgid "Cold"
 msgstr "Chladný"
 
-#: gajim/common/const.py:334
+#: gajim/common/const.py:368
 msgid "Confident"
 msgstr "Sebevědomý"
 
-#: gajim/common/const.py:335
+#: gajim/common/const.py:369
 msgid "Confused"
 msgstr "Zmatený"
 
-#: gajim/common/const.py:336
+#: gajim/common/const.py:370
 msgid "Contemplative"
 msgstr "Zamyšlený"
 
-#: gajim/common/const.py:337
+#: gajim/common/const.py:371
 msgid "Contented"
 msgstr "Spokojený"
 
-#: gajim/common/const.py:338
+#: gajim/common/const.py:372
 msgid "Cranky"
 msgstr "Potrhlý"
 
-#: gajim/common/const.py:339
+#: gajim/common/const.py:373
 msgid "Crazy"
 msgstr "Šílený"
 
-#: gajim/common/const.py:340
+#: gajim/common/const.py:374
 msgid "Creative"
 msgstr "Tvořivý"
 
-#: gajim/common/const.py:341
+#: gajim/common/const.py:375
 msgid "Curious"
 msgstr "Zvědavý"
 
-#: gajim/common/const.py:342
+#: gajim/common/const.py:376
 msgid "Dejected"
 msgstr "Odmítnutý"
 
-#: gajim/common/const.py:343
+#: gajim/common/const.py:377
 msgid "Depressed"
 msgstr "Deprimovaný"
 
-#: gajim/common/const.py:344
+#: gajim/common/const.py:378
 msgid "Disappointed"
 msgstr "Zklamaný"
 
-#: gajim/common/const.py:345
+#: gajim/common/const.py:379
 msgid "Disgusted"
 msgstr "Znechucený"
 
-#: gajim/common/const.py:346
+#: gajim/common/const.py:380
 msgid "Dismayed"
 msgstr "Zděšený"
 
-#: gajim/common/const.py:347
+#: gajim/common/const.py:381
 msgid "Distracted"
 msgstr "Roztržitý"
 
-#: gajim/common/const.py:348
+#: gajim/common/const.py:382
 #, fuzzy
 msgid "Embarrassed"
 msgstr "Rozpačitý"
 
-#: gajim/common/const.py:349
+#: gajim/common/const.py:383
 msgid "Envious"
 msgstr "Závidějící"
 
-#: gajim/common/const.py:350
+#: gajim/common/const.py:384
 msgid "Excited"
 msgstr "Nadšený"
 
-#: gajim/common/const.py:351
+#: gajim/common/const.py:385
 msgid "Flirtatious"
 msgstr "Záletný"
 
-#: gajim/common/const.py:352
+#: gajim/common/const.py:386
 #, fuzzy
 msgid "Frustrated"
 msgstr "Rozčarovaný"
 
-#: gajim/common/const.py:353
+#: gajim/common/const.py:387
 msgid "Grateful"
 msgstr "Vděčný"
 
-#: gajim/common/const.py:354
+#: gajim/common/const.py:388
 msgid "Grieving"
 msgstr "Truchlící"
 
-#: gajim/common/const.py:355
+#: gajim/common/const.py:389
 #, fuzzy
 msgid "Grumpy"
 msgstr "Nevrlý"
 
-#: gajim/common/const.py:356
+#: gajim/common/const.py:390
 msgid "Guilty"
 msgstr "Provinilý"
 
-#: gajim/common/const.py:357
+#: gajim/common/const.py:391
 msgid "Happy"
 msgstr "Šťastný"
 
-#: gajim/common/const.py:358
+#: gajim/common/const.py:392
 msgid "Hopeful"
 msgstr "Doufající"
 
-#: gajim/common/const.py:359
+#: gajim/common/const.py:393
 msgid "Hot"
 msgstr "Rozpálený"
 
-#: gajim/common/const.py:360
+#: gajim/common/const.py:394
 msgid "Humbled"
 msgstr "Pokorný"
 
-#: gajim/common/const.py:361
+#: gajim/common/const.py:395
 msgid "Humiliated"
 msgstr "Ponížený"
 
-#: gajim/common/const.py:362
+#: gajim/common/const.py:396
 msgid "Hungry"
 msgstr "Hladový"
 
-#: gajim/common/const.py:363
+#: gajim/common/const.py:397
 msgid "Hurt"
 msgstr "Raněný"
 
-#: gajim/common/const.py:364
+#: gajim/common/const.py:398
 #, fuzzy
 msgid "Impressed"
 msgstr "Ohromený"
 
-#: gajim/common/const.py:365
+#: gajim/common/const.py:399
 msgid "In Awe"
 msgstr "S respektem"
 
-#: gajim/common/const.py:366
+#: gajim/common/const.py:400
 msgid "In Love"
 msgstr "Zamilovaný"
 
-#: gajim/common/const.py:367
+#: gajim/common/const.py:401
 msgid "Indignant"
 msgstr "Rozhořčený"
 
-#: gajim/common/const.py:368
+#: gajim/common/const.py:402
 msgid "Interested"
 msgstr "Zaujatý"
 
-#: gajim/common/const.py:369
+#: gajim/common/const.py:403
 #, fuzzy
 msgid "Intoxicated"
 msgstr "Opilý/Zfetovaný"
 
-#: gajim/common/const.py:370
+#: gajim/common/const.py:404
 msgid "Invincible"
 msgstr "Nepřekonatelný"
 
-#: gajim/common/const.py:371
+#: gajim/common/const.py:405
 msgid "Jealous"
 msgstr "Žárlivý"
 
-#: gajim/common/const.py:372
+#: gajim/common/const.py:406
 msgid "Lonely"
 msgstr "Osamělý"
 
-#: gajim/common/const.py:373
+#: gajim/common/const.py:407
 msgid "Lost"
 msgstr "Ztracený"
 
-#: gajim/common/const.py:374
+#: gajim/common/const.py:408
 msgid "Lucky"
 msgstr "Šťastný"
 
-#: gajim/common/const.py:375
+#: gajim/common/const.py:409
 msgid "Mean"
 msgstr "Nízký"
 
-#: gajim/common/const.py:376
+#: gajim/common/const.py:410
 msgid "Moody"
 msgstr "Náladový"
 
-#: gajim/common/const.py:377
+#: gajim/common/const.py:411
 msgid "Nervous"
 msgstr "Nervózní"
 
-#: gajim/common/const.py:378
+#: gajim/common/const.py:412
 msgid "Neutral"
 msgstr "Bez emocí"
 
-#: gajim/common/const.py:379
+#: gajim/common/const.py:413
 msgid "Offended"
 msgstr "Uražený"
 
-#: gajim/common/const.py:380
+#: gajim/common/const.py:414
 msgid "Outraged"
 msgstr "Rozčílený"
 
-#: gajim/common/const.py:381
+#: gajim/common/const.py:415
 msgid "Playful"
 msgstr "Hravý"
 
-#: gajim/common/const.py:382
+#: gajim/common/const.py:416
 msgid "Proud"
 msgstr "Hrdý"
 
-#: gajim/common/const.py:383
+#: gajim/common/const.py:417
 #, fuzzy
 msgid "Relaxed"
 msgstr "Uvolněný"
 
-#: gajim/common/const.py:384
+#: gajim/common/const.py:418
 #, fuzzy
 msgid "Relieved"
 msgstr "Uvolněný"
 
-#: gajim/common/const.py:385
+#: gajim/common/const.py:419
 msgid "Remorseful"
 msgstr "Kajícný"
 
-#: gajim/common/const.py:386
+#: gajim/common/const.py:420
 msgid "Restless"
 msgstr "Netrpělivý"
 
-#: gajim/common/const.py:387
+#: gajim/common/const.py:421
 msgid "Sad"
 msgstr "Smutný"
 
-#: gajim/common/const.py:388
+#: gajim/common/const.py:422
 msgid "Sarcastic"
 msgstr "Jízlivý"
 
-#: gajim/common/const.py:389
+#: gajim/common/const.py:423
 msgid "Satisfied"
 msgstr "Spokojený"
 
-#: gajim/common/const.py:390
+#: gajim/common/const.py:424
 msgid "Serious"
 msgstr "Vážný"
 
-#: gajim/common/const.py:391
+#: gajim/common/const.py:425
 msgid "Shocked"
 msgstr "Šokovaný"
 
-#: gajim/common/const.py:392
+#: gajim/common/const.py:426
 msgid "Shy"
 msgstr "Plachý"
 
-#: gajim/common/const.py:393
+#: gajim/common/const.py:427
 msgid "Sick"
 msgstr "Nemocný"
 
-#: gajim/common/const.py:394
+#: gajim/common/const.py:428
 msgid "Sleepy"
 msgstr "Ospalý"
 
-#: gajim/common/const.py:395
+#: gajim/common/const.py:429
 msgid "Spontaneous"
 msgstr "Spontánní"
 
-#: gajim/common/const.py:396
+#: gajim/common/const.py:430
 msgid "Stressed"
 msgstr "Stresovaný"
 
-#: gajim/common/const.py:397
+#: gajim/common/const.py:431
 msgid "Strong"
 msgstr "Silný"
 
-#: gajim/common/const.py:398
+#: gajim/common/const.py:432
 msgid "Surprised"
 msgstr "Překvapený"
 
-#: gajim/common/const.py:399
+#: gajim/common/const.py:433
 msgid "Thankful"
 msgstr "Děkovný"
 
-#: gajim/common/const.py:400
+#: gajim/common/const.py:434
 msgid "Thirsty"
 msgstr "Žíznivý"
 
-#: gajim/common/const.py:401
+#: gajim/common/const.py:435
 msgid "Tired"
 msgstr "Unavený"
 
-#: gajim/common/const.py:402
+#: gajim/common/const.py:436
 msgid "Undefined"
 msgstr "Nedefinováno"
 
-#: gajim/common/const.py:403
+#: gajim/common/const.py:437
 msgid "Weak"
 msgstr "Slabý"
 
-#: gajim/common/const.py:404
+#: gajim/common/const.py:438
 msgid "Worried"
 msgstr "Ustaraný"
 
-#: gajim/common/const.py:408
+#: gajim/common/const.py:442
 msgid "accuracy"
 msgstr ""
 
-#: gajim/common/const.py:409
+#: gajim/common/const.py:443
 #, fuzzy
 msgid "alt"
 msgstr "výchozí"
 
-#: gajim/common/const.py:410
+#: gajim/common/const.py:444
 msgid "area"
 msgstr ""
 
-#: gajim/common/const.py:411
+#: gajim/common/const.py:445
 #, fuzzy
 msgid "bearing"
 msgstr "mariňák"
 
-#: gajim/common/const.py:412
+#: gajim/common/const.py:446
 #, fuzzy
 msgid "building"
 msgstr "Skrývám se"
 
-#: gajim/common/const.py:413
+#: gajim/common/const.py:447
 #, fuzzy
 msgid "country"
 msgstr "Země:"
 
-#: gajim/common/const.py:414
+#: gajim/common/const.py:448
 #, fuzzy
 msgid "countrycode"
 msgstr "Účet"
 
-#: gajim/common/const.py:415
+#: gajim/common/const.py:449
 msgid "datum"
 msgstr ""
 
-#: gajim/common/const.py:416
+#: gajim/common/const.py:450
 #, fuzzy
 msgid "description"
 msgstr "Popis"
 
-#: gajim/common/const.py:417
+#: gajim/common/const.py:451
 #, fuzzy
 msgid "error"
 msgstr "Chyba"
 
-#: gajim/common/const.py:418
+#: gajim/common/const.py:452
 msgid "floor"
 msgstr ""
 
-#: gajim/common/const.py:419
+#: gajim/common/const.py:453
 msgid "lat"
 msgstr ""
 
-#: gajim/common/const.py:420
+#: gajim/common/const.py:454
 msgid "locality"
 msgstr ""
 
-#: gajim/common/const.py:421
+#: gajim/common/const.py:455
 #, fuzzy
 msgid "lon"
 msgstr "jeden"
 
-#: gajim/common/const.py:422
+#: gajim/common/const.py:456
 msgid "postalcode"
 msgstr ""
 
-#: gajim/common/const.py:423
+#: gajim/common/const.py:457
 msgid "region"
 msgstr ""
 
-#: gajim/common/const.py:424
+#: gajim/common/const.py:458
 msgid "room"
 msgstr "místnost"
 
-#: gajim/common/const.py:425
+#: gajim/common/const.py:459
 msgid "speed"
 msgstr ""
 
-#: gajim/common/const.py:426
+#: gajim/common/const.py:460
 msgid "street"
 msgstr ""
 
-#: gajim/common/const.py:427
+#: gajim/common/const.py:461
 msgid "text"
 msgstr ""
 
-#: gajim/common/const.py:428
+#: gajim/common/const.py:462
 msgid "timestamp"
 msgstr ""
 
-#: gajim/common/const.py:429
+#: gajim/common/const.py:463
 msgid "URI"
 msgstr ""
 
-#: gajim/common/const.py:434
+#: gajim/common/const.py:468
 msgid "Unable to get issuer certificate"
 msgstr "Nepodařilo se získat certifikát vydavatele"
 
-#: gajim/common/const.py:435
+#: gajim/common/const.py:469
 msgid "Unable to get certificate CRL"
 msgstr "Nepodařilo se získat certifikát CRL"
 
-#: gajim/common/const.py:436
+#: gajim/common/const.py:470
 msgid "Unable to decrypt certificate's signature"
 msgstr "Nepodařilo se dešifrovat podpis certifikátu"
 
-#: gajim/common/const.py:437
+#: gajim/common/const.py:471
 msgid "Unable to decrypt CRL's signature"
 msgstr "Nepodařilo se dešifrovat podpis CRL certifikátu"
 
-#: gajim/common/const.py:438
+#: gajim/common/const.py:472
 msgid "Unable to decode issuer public key"
 msgstr "Nepodařilo se dešifrovat veřejný klíč vydavatele"
 
-#: gajim/common/const.py:439
+#: gajim/common/const.py:473
 msgid "Certificate signature failure"
 msgstr "Chyba podpisu certifikátu"
 
-#: gajim/common/const.py:440
+#: gajim/common/const.py:474
 msgid "CRL signature failure"
 msgstr "Chyba podpisu CRL certifikátu"
 
-#: gajim/common/const.py:441
+#: gajim/common/const.py:475
 msgid "Certificate is not yet valid"
 msgstr "Certifikát není správný"
 
-#: gajim/common/const.py:442
+#: gajim/common/const.py:476
 msgid "Certificate has expired"
 msgstr "Platnost certifikátu vypršela"
 
-#: gajim/common/const.py:443
+#: gajim/common/const.py:477
 msgid "CRL is not yet valid"
 msgstr "CRL certifikát není správný"
 
-#: gajim/common/const.py:444
+#: gajim/common/const.py:478
 msgid "CRL has expired"
 msgstr "Platnost CRL certifikátu vypršela"
 
-#: gajim/common/const.py:445
+#: gajim/common/const.py:479
 msgid "Format error in certificate's notBefore field"
 msgstr "Chyba certifikátu v poli: platnost před"
 
-#: gajim/common/const.py:446
+#: gajim/common/const.py:480
 msgid "Format error in certificate's notAfter field"
 msgstr "Chyba certifikátu v poli: platnost po"
 
-#: gajim/common/const.py:447
+#: gajim/common/const.py:481
 msgid "Format error in CRL's lastUpdate field"
 msgstr "Chyba CRL certifikátu v poli: poslední aktualizace"
 
-#: gajim/common/const.py:448
+#: gajim/common/const.py:482
 msgid "Format error in CRL's nextUpdate field"
 msgstr "Chyba CRL certifikátu v poli: příští aktualizace"
 
-#: gajim/common/const.py:449
+#: gajim/common/const.py:483
 msgid "Out of memory"
 msgstr "Nedostatek paměti"
 
-#: gajim/common/const.py:450
+#: gajim/common/const.py:484
 msgid "Self signed certificate"
 msgstr "Sám sebou podepsaný certifikát"
 
-#: gajim/common/const.py:451
+#: gajim/common/const.py:485
 msgid "Self signed certificate in certificate chain"
 msgstr "Sám sebou podepsaný certifikát v certifikačním řetězci "
 
-#: gajim/common/const.py:452
+#: gajim/common/const.py:486
 msgid "Unable to get local issuer certificate"
 msgstr "Nepodařilo se získat certifikát lokálního vydavatele"
 
-#: gajim/common/const.py:453
+#: gajim/common/const.py:487
 msgid "Unable to verify the first certificate"
 msgstr "Nepodařilo se ověřit první certifikát"
 
-#: gajim/common/const.py:454
+#: gajim/common/const.py:488
 msgid "Certificate chain too long"
 msgstr "Certifikační řetězec je přiliš dlouhý"
 
-#: gajim/common/const.py:455
+#: gajim/common/const.py:489
 msgid "Certificate revoked"
 msgstr "Certifikát je zrušený"
 
-#: gajim/common/const.py:456
+#: gajim/common/const.py:490
 msgid "Invalid CA certificate"
 msgstr "Neplatný CA certifikát"
 
-#: gajim/common/const.py:457
+#: gajim/common/const.py:491
 msgid "Path length constraint exceeded"
 msgstr "Překročena delká cesty"
 
-#: gajim/common/const.py:458
+#: gajim/common/const.py:492
 msgid "Unsupported certificate purpose"
 msgstr "Nepodporované osvědčení certifikátu"
 
-#: gajim/common/const.py:459
+#: gajim/common/const.py:493
 msgid "Certificate not trusted"
 msgstr "Certifikát je nedůvěryhodný"
 
-#: gajim/common/const.py:460
+#: gajim/common/const.py:494
 msgid "Certificate rejected"
 msgstr "Certifikát odmítnut"
 
-#: gajim/common/const.py:461
+#: gajim/common/const.py:495
 msgid "Subject issuer mismatch"
 msgstr "Neshoduje se název vydavatele"
 
-#: gajim/common/const.py:462
+#: gajim/common/const.py:496
 msgid "Authority and subject key identifier mismatch"
 msgstr "Název klíče se neshoduje s Autoritou"
 
-#: gajim/common/const.py:463
+#: gajim/common/const.py:497
 msgid "Authority and issuer serial number mismatch"
 msgstr "Vydavatelovo sériové číslo se neshoduje s Autoritou"
 
-#: gajim/common/const.py:464
+#: gajim/common/const.py:498
 msgid "Key usage does not include certificate signing"
 msgstr "Použítý klíč neobsahuje podpis certifikátu"
 
-#: gajim/common/const.py:465
+#: gajim/common/const.py:499
 msgid "Application verification failure"
 msgstr "Ověřování aplikace skončilo neúspěchem"
 
@@ -5169,199 +5309,199 @@ msgstr "video vstup"
 msgid "video output"
 msgstr "video výstup"
 
-#: gajim/common/helpers.py:210
+#: gajim/common/helpers.py:216
 msgid "Server must be between 1 and 1023 bytes"
 msgstr ""
 
-#: gajim/common/helpers.py:214
+#: gajim/common/helpers.py:220
 msgid "Invalid character in hostname."
 msgstr "Neplatný znak v hostname."
 
-#: gajim/common/helpers.py:216
+#: gajim/common/helpers.py:222
 msgid "Server address required."
 msgstr "Je potřeba adresa serveru."
 
-#: gajim/common/helpers.py:220
+#: gajim/common/helpers.py:226
 msgid "Username must be between 1 and 1023 bytes"
 msgstr ""
 
-#: gajim/common/helpers.py:224
+#: gajim/common/helpers.py:230
 msgid "Invalid character in username."
 msgstr "Neplatný znak v uživatelském jméně."
 
-#: gajim/common/helpers.py:230
+#: gajim/common/helpers.py:236
 msgid "Resource must be between 1 and 1023 bytes"
 msgstr ""
 
-#: gajim/common/helpers.py:234
+#: gajim/common/helpers.py:240
 msgid "Invalid character in resource."
 msgstr "Neplatný znak ve zdroji."
 
-#: gajim/common/helpers.py:275
+#: gajim/common/helpers.py:281
 msgid "_Busy"
 msgstr "_Nerušit"
 
-#: gajim/common/helpers.py:277 gajim/gtk/tooltips.py:647
+#: gajim/common/helpers.py:283 gajim/gtk/tooltips.py:647
 msgid "Busy"
 msgstr "Nerušit"
 
-#: gajim/common/helpers.py:280
+#: gajim/common/helpers.py:286
 msgid "_Not Available"
 msgstr "Ne_dostupný"
 
-#: gajim/common/helpers.py:282 gajim/gtk/tooltips.py:649
+#: gajim/common/helpers.py:288 gajim/gtk/tooltips.py:649
 msgid "Not Available"
 msgstr "Nedostupný"
 
-#: gajim/common/helpers.py:285
+#: gajim/common/helpers.py:291
 msgid "_Free for Chat"
 msgstr "_Ukecaný"
 
-#: gajim/common/helpers.py:287 gajim/gtk/tooltips.py:643
+#: gajim/common/helpers.py:293 gajim/gtk/tooltips.py:643
 msgid "Free for Chat"
 msgstr "Ukecaný"
 
-#: gajim/common/helpers.py:290
+#: gajim/common/helpers.py:296
 #, fuzzy
 msgid "?user status:_Available"
 msgstr "?transfer status:Pozastaveno"
 
-#: gajim/common/helpers.py:292 gajim/gtk/tooltips.py:641
+#: gajim/common/helpers.py:298 gajim/gtk/tooltips.py:641
 #, fuzzy
 msgid "?user status:Available"
 msgstr "?transfer status:Pozastaveno"
 
-#: gajim/common/helpers.py:294
+#: gajim/common/helpers.py:300
 msgid "Connecting"
 msgstr "Připojuji se"
 
-#: gajim/common/helpers.py:297 gajim/data/gui/preferences_window.ui:1251
+#: gajim/common/helpers.py:303 gajim/data/gui/preferences_window.ui:1251
 msgid "A_way"
 msgstr "_Pryč"
 
-#: gajim/common/helpers.py:299 gajim/common/modules/adhoc_commands.py:120
-#: gajim/command_system/implementation/standard.py:139
+#: gajim/common/helpers.py:305 gajim/common/modules/adhoc_commands.py:120
+#: gajim/command_system/implementation/standard.py:141
 #: gajim/gtk/tooltips.py:645
 msgid "Away"
 msgstr "Pryč"
 
-#: gajim/common/helpers.py:302
+#: gajim/common/helpers.py:308
 msgid "_Offline"
 msgstr "_Odpojen"
 
-#: gajim/common/helpers.py:304 gajim/gtk/tooltips.py:651
+#: gajim/common/helpers.py:310 gajim/gtk/tooltips.py:651
 msgid "Offline"
 msgstr "Odpojen"
 
-#: gajim/common/helpers.py:307
+#: gajim/common/helpers.py:313
 msgid "_Invisible"
 msgstr "Ne_viditelný"
 
-#: gajim/common/helpers.py:313
+#: gajim/common/helpers.py:319
 msgid "?contact has status:Unknown"
 msgstr "?contact has status:Neznámý"
 
-#: gajim/common/helpers.py:315
+#: gajim/common/helpers.py:321
 msgid "?contact has status:Has errors"
 msgstr "stav"
 
-#: gajim/common/helpers.py:330
+#: gajim/common/helpers.py:336
 msgid "?Subscription we already have:None"
 msgstr "?Subscription we already have:Žádná"
 
-#: gajim/common/helpers.py:332
+#: gajim/common/helpers.py:338
 msgid "To"
 msgstr "Příjemce"
 
-#: gajim/common/helpers.py:334 gajim/data/gui/groups_post_window.ui:33
+#: gajim/common/helpers.py:340 gajim/data/gui/groups_post_window.ui:33
 msgid "From"
 msgstr "Odesílatel"
 
-#: gajim/common/helpers.py:336
+#: gajim/common/helpers.py:342
 msgid "Both"
 msgstr "Oboustranná"
 
-#: gajim/common/helpers.py:338 gajim/gtk/server_info.py:151
+#: gajim/common/helpers.py:344 gajim/gtk/server_info.py:151
 #, fuzzy
 msgid "Unknown"
 msgstr "?OS:Neznámý"
 
-#: gajim/common/helpers.py:344
+#: gajim/common/helpers.py:350
 msgid "?Ask (for Subscription):None"
 msgstr "?Ask (for Subscription):Není"
 
-#: gajim/common/helpers.py:346
+#: gajim/common/helpers.py:352
 msgid "Subscribe"
 msgstr "Žádat autorizaci"
 
-#: gajim/common/helpers.py:355
+#: gajim/common/helpers.py:361
 msgid "?Group Chat Contact Role:None"
 msgstr "?Group Chat Contact Role:Žádná"
 
-#: gajim/common/helpers.py:358
+#: gajim/common/helpers.py:364
 msgid "Moderators"
 msgstr "Moderátoři"
 
-#: gajim/common/helpers.py:360
+#: gajim/common/helpers.py:366
 msgid "Moderator"
 msgstr "Moderátor"
 
-#: gajim/common/helpers.py:363
+#: gajim/common/helpers.py:369 gajim/data/gui/groupchat_info_scrolled.ui:243
 msgid "Participants"
 msgstr "Účastníci"
 
-#: gajim/common/helpers.py:365
+#: gajim/common/helpers.py:371
 msgid "Participant"
 msgstr "Účastník"
 
-#: gajim/common/helpers.py:368
+#: gajim/common/helpers.py:374
 msgid "Visitors"
 msgstr "Návštěvníci"
 
-#: gajim/common/helpers.py:370
+#: gajim/common/helpers.py:376
 msgid "Visitor"
 msgstr "Návštěvník"
 
-#: gajim/common/helpers.py:376 gajim/gtk/tooltips.py:253
+#: gajim/common/helpers.py:382 gajim/gtk/tooltips.py:253
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "?Group Chat Contact Affiliation:Žádná"
 
-#: gajim/common/helpers.py:378 gajim/data/gui/groupchat_config.ui:32
+#: gajim/common/helpers.py:384 gajim/data/gui/groupchat_config.ui:32
 #: gajim/gtk/tooltips.py:259
 msgid "Owner"
 msgstr "Vlastník"
 
-#: gajim/common/helpers.py:380 gajim/gtk/tooltips.py:257
+#: gajim/common/helpers.py:386 gajim/gtk/tooltips.py:257
 msgid "Administrator"
 msgstr "Správce"
 
-#: gajim/common/helpers.py:382 gajim/data/gui/groupchat_config.ui:40
+#: gajim/common/helpers.py:388 gajim/data/gui/groupchat_config.ui:40
 #: gajim/gtk/tooltips.py:255 gajim/gtk/groupchat_config.py:105
 msgid "Member"
 msgstr "Člen"
 
-#: gajim/common/helpers.py:421
+#: gajim/common/helpers.py:427
 msgid "is paying attention to the conversation"
 msgstr "věnuje pozornost rozhovoru"
 
-#: gajim/common/helpers.py:423
+#: gajim/common/helpers.py:429
 msgid "is doing something else"
 msgstr "dělá něco jiného"
 
-#: gajim/common/helpers.py:425
+#: gajim/common/helpers.py:431
 #, fuzzy
 msgid "is composing a message…"
 msgstr "píše zprávu..."
 
-#: gajim/common/helpers.py:428
+#: gajim/common/helpers.py:434
 msgid "paused composing a message"
 msgstr "pozastavil(a) psaní zprávy"
 
-#: gajim/common/helpers.py:430
+#: gajim/common/helpers.py:436
 msgid "has closed the chat window or tab"
 msgstr "zavřel(a) okno zprávy"
 
-#: gajim/common/helpers.py:936 gajim/common/helpers.py:943
+#: gajim/common/helpers.py:942 gajim/common/helpers.py:949
 #, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
@@ -5369,22 +5509,22 @@ msgstr[0] "Čeká %d zpráva"
 msgstr[1] "Čekají %d zprávy"
 msgstr[2] "Čeká %d zpráv"
 
-#: gajim/common/helpers.py:950
+#: gajim/common/helpers.py:956
 #, fuzzy, python-format
-msgid "from room %s"
-msgstr "z místností %s"
+msgid "from group chat %s"
+msgstr "v _diskuzích"
 
-#: gajim/common/helpers.py:953 gajim/common/helpers.py:970
+#: gajim/common/helpers.py:959 gajim/common/helpers.py:976
 #, fuzzy, python-format
 msgid "from user %s"
 msgstr "od uživatele %s"
 
-#: gajim/common/helpers.py:955
+#: gajim/common/helpers.py:961
 #, fuzzy, python-format
 msgid "from %s"
 msgstr "od %s"
 
-#: gajim/common/helpers.py:962 gajim/common/helpers.py:968
+#: gajim/common/helpers.py:968 gajim/common/helpers.py:974
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
@@ -5392,41 +5532,41 @@ msgstr[0] "Čeká %d událost"
 msgstr[1] "Čekají %d události"
 msgstr[2] "Čeká %d událostí"
 
-#: gajim/common/helpers.py:986 gajim/common/helpers.py:998
+#: gajim/common/helpers.py:992 gajim/common/helpers.py:1004
 #: gajim/data/gui/roster_window.ui:85 data/org.gajim.Gajim.desktop.in:4
 #: data/org.gajim.Gajim.appdata.xml.in:9
 msgid "Gajim"
 msgstr "Gajim"
 
-#: gajim/common/helpers.py:1000
+#: gajim/common/helpers.py:1006
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: gajim/common/helpers.py:1109 gajim/data/gui/add_new_contact_window.ui:25
+#: gajim/common/helpers.py:1115 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:1111
+#: gajim/common/helpers.py:1117
 #, fuzzy
 msgid "Hello, I am $name."
 msgstr "Ahoj, já jsem $name"
 
-#: gajim/common/helpers.py:1215 gajim/common/helpers.py:1224
-#: gajim/common/helpers.py:1282
+#: gajim/common/helpers.py:1221 gajim/common/helpers.py:1230
+#: gajim/common/helpers.py:1288
 msgid "Timeout loading image"
 msgstr "Nezdařilo se načtení obrázku"
 
-#: gajim/common/helpers.py:1234 gajim/common/helpers.py:1280
+#: gajim/common/helpers.py:1240 gajim/common/helpers.py:1286
 msgid "Image is too big"
 msgstr "Obrázek je příliš veliký"
 
-#: gajim/common/helpers.py:1245
+#: gajim/common/helpers.py:1251
 #, fuzzy
 msgid "PyCURL is not installed"
 msgstr "CRL certifikát není správný"
 
-#: gajim/common/helpers.py:1284
+#: gajim/common/helpers.py:1290
 #, fuzzy
 msgid "Error loading image"
 msgstr "Nezdařilo se načtení obrázku"
@@ -5603,7 +5743,8 @@ msgstr "Stav se změnil."
 
 #: gajim/common/modules/adhoc_commands.py:202
 #: gajim/common/modules/adhoc_commands.py:239
-msgid "Leave Groupchats"
+#, fuzzy
+msgid "Leave Group Chats"
 msgstr "Opustit diskuzi"
 
 #: gajim/common/modules/adhoc_commands.py:228
@@ -5612,15 +5753,18 @@ msgid "%(nickname)s on %(room_jid)s"
 msgstr "%(nickname)s v %(room_jid)s"
 
 #: gajim/common/modules/adhoc_commands.py:232
-msgid "You have not joined a groupchat."
+#, fuzzy
+msgid "You have not joined a group chat."
 msgstr "Nepřipojil jsi se k diskuzi."
 
 #: gajim/common/modules/adhoc_commands.py:240
-msgid "Choose the groupchats you want to leave"
+#, fuzzy
+msgid "Choose the group chats you want to leave"
 msgstr "Vyber diskuze, které chceš opustit"
 
 #: gajim/common/modules/adhoc_commands.py:289
-msgid "You left the following groupchats:"
+#, fuzzy
+msgid "You left the following group chats:"
 msgstr "Opustil(a) jste následující diskuze:"
 
 #: gajim/common/modules/roster_item_exchange.py:102
@@ -5636,7 +5780,7 @@ msgstr "Odeslány kontakty:"
 msgid "Blocked Contacts"
 msgstr "Blokované Kontakty"
 
-#: gajim/data/gui/destroy_muc_dialog.ui:79 gajim/gtk/dialogs.py:736
+#: gajim/data/gui/destroy_muc_dialog.ui:79 gajim/gtk/dialogs.py:563
 msgid "Destroy this group chat permanently?"
 msgstr ""
 
@@ -5645,7 +5789,7 @@ msgstr ""
 msgid "Reason..."
 msgstr "Důvod"
 
-#: gajim/data/gui/destroy_muc_dialog.ui:124 gajim/gtk/dialogs.py:738
+#: gajim/data/gui/destroy_muc_dialog.ui:124 gajim/gtk/dialogs.py:565
 msgid "Where participants should go (optional)"
 msgstr ""
 
@@ -5658,35 +5802,6 @@ msgstr ""
 msgid "_Reason and alternate venue (optional)"
 msgstr "Také můžete specifikovat náhradní místo:"
 
-#: gajim/data/gui/advanced_configuration_window.ui:7
-#: gajim/data/gui/preferences_window.ui:2723
-#, fuzzy
-msgid "Advanced Configuration Editor (ACE)"
-msgstr "Editor rozšířeného nastavení"
-
-#: gajim/data/gui/advanced_configuration_window.ui:52
-#, fuzzy
-msgid "You should restart Gajim for some changes to take effect"
-msgstr ""
-"<b>POZNÁMKA:</b> Měl(a) by jste restartovat gajim, aby se projevila všechna "
-"nastavení"
-
-#: gajim/data/gui/advanced_configuration_window.ui:84
-#, fuzzy
-msgid "_Filter"
-msgstr "Filtr:"
-
-#: gajim/data/gui/advanced_configuration_window.ui:153
-#: gajim/data/gui/filetransfers_send_file_dialog.ui:15
-#: gajim/gtk/discovery.py:1666
-msgid "Description"
-msgstr "Popis"
-
-#: gajim/data/gui/advanced_configuration_window.ui:197
-#, fuzzy
-msgid "_Reset to default"
-msgstr "_Vrátit k výchozím barvám"
-
 #: gajim/data/gui/join_groupchat_window.ui:56
 #: gajim/data/gui/chat_to_muc_window.ui:67
 #: gajim/data/gui/chat_to_muc_window.ui:78
@@ -5698,9 +5813,8 @@ msgid "Join group chat every time Gajim is started"
 msgstr ""
 
 #: gajim/data/gui/join_groupchat_window.ui:113
-#, fuzzy
-msgid "Auto Join"
-msgstr "Automaticky vstoupit"
+msgid "Join Automatically"
+msgstr ""
 
 #: gajim/data/gui/join_groupchat_window.ui:131
 #: gajim/data/gui/profile_window.ui:233
@@ -5709,10 +5823,11 @@ msgstr "Účet"
 
 #: gajim/data/gui/join_groupchat_window.ui:147
 #, fuzzy
-msgid "Room"
-msgstr "Místnost:"
+msgid "Group chat"
+msgstr "Diskuze"
 
-#: gajim/data/gui/join_groupchat_window.ui:180 gajim/gtk/accounts.py:886
+#: gajim/data/gui/join_groupchat_window.ui:180 gajim/data/gui/bookmarks.ui:158
+#: gajim/gtk/accounts.py:889
 #, fuzzy
 msgid "Password"
 msgstr "Heslo:"
@@ -5736,94 +5851,11 @@ msgstr "v _diskuzích"
 msgid "Search group chats on selected server"
 msgstr ""
 
-#: gajim/data/gui/join_groupchat_window.ui:437 gajim/gtk/discovery.py:1271
+#: gajim/data/gui/join_groupchat_window.ui:437 gajim/gtk/discovery.py:1270
 #, fuzzy
 msgid "Join"
 msgstr "_Vstoupit"
 
-#: gajim/data/gui/manage_proxies_window.ui:12
-#, fuzzy
-msgid "HTTP Connect"
-msgstr ""
-"HTTP Connect\n"
-"SOCKS5\n"
-"BOSH"
-
-#: gajim/data/gui/manage_proxies_window.ui:15
-msgid "SOCKS5"
-msgstr ""
-
-#: gajim/data/gui/manage_proxies_window.ui:18
-msgid "BOSH"
-msgstr ""
-
-#: gajim/data/gui/manage_proxies_window.ui:27
-msgid "Manage Proxy Profiles"
-msgstr "Spravovat profily Proxy"
-
-#: gajim/data/gui/manage_proxies_window.ui:83
-#, fuzzy
-msgid "Add Proxy"
-msgstr "Proxy:"
-
-#: gajim/data/gui/manage_proxies_window.ui:97
-#, fuzzy
-msgid "Remove Proxy"
-msgstr "Odstranit skupinu"
-
-#: gajim/data/gui/manage_proxies_window.ui:141
-#, fuzzy
-msgid "Properties"
-msgstr "<b>Vlastnosti</b>"
-
-#: gajim/data/gui/manage_proxies_window.ui:157
-#, fuzzy
-msgid "_Name"
-msgstr "_Jméno: "
-
-#: gajim/data/gui/manage_proxies_window.ui:173
-#, fuzzy
-msgid "_Type"
-msgstr "_Typ:"
-
-#: gajim/data/gui/manage_proxies_window.ui:236
-#, fuzzy
-msgid "_BOSH URL"
-msgstr "_BOSH URL:"
-
-#: gajim/data/gui/manage_proxies_window.ui:261
-msgid "Use HTTP prox_y"
-msgstr "Použij HTTP prox_y"
-
-#: gajim/data/gui/manage_proxies_window.ui:280
-#, fuzzy
-msgid "Proxy _Host"
-msgstr "P_očítač Proxy:"
-
-#: gajim/data/gui/manage_proxies_window.ui:307
-#, fuzzy
-msgid "Proxy _Port"
-msgstr "_Port Proxy:"
-
-#: gajim/data/gui/manage_proxies_window.ui:334
-#, fuzzy
-msgid "_Username"
-msgstr "_Uživatel:"
-
-#: gajim/data/gui/manage_proxies_window.ui:347
-msgid "Use proxy auth_entication"
-msgstr "Použít při_hlášení k proxy"
-
-#: gajim/data/gui/manage_proxies_window.ui:377
-#, fuzzy
-msgid "Pass_word"
-msgstr "He_slo:"
-
-#: gajim/data/gui/manage_proxies_window.ui:405 gajim/gtk/adhoc.py:321
-#, fuzzy
-msgid "Settings"
-msgstr "Registrace selhala"
-
 #: gajim/data/gui/change_password_dialog.ui:17
 #, fuzzy
 msgid "New Password"
@@ -5854,11 +5886,13 @@ msgid "Status:"
 msgstr "Stav:"
 
 #: gajim/data/gui/zeroconf_information_window.ui:89
-msgid "_Log conversation history"
+#, fuzzy
+msgid "_Store conversation history"
 msgstr "_Zaznamenat historii konverzace"
 
 #: gajim/data/gui/zeroconf_information_window.ui:215
 #: gajim/data/gui/vcard_information_window.ui:390
+#: gajim/data/gui/groupchat_info_scrolled.ui:166
 msgid "Contact"
 msgstr "Kontakt"
 
@@ -5871,8 +5905,9 @@ msgid "Last Name:"
 msgstr "Příjmení:"
 
 #: gajim/data/gui/zeroconf_information_window.ui:260
-msgid "Jabber ID:"
-msgstr "Jabber ID:"
+#, fuzzy
+msgid "XMPP Address:"
+msgstr "AIM adresa:"
 
 #: gajim/data/gui/zeroconf_information_window.ui:273
 msgid "E-Mail:"
@@ -5892,8 +5927,9 @@ msgid "Send _File"
 msgstr "Odeslat _Soubor"
 
 #: gajim/data/gui/gc_occupants_menu.ui:29
-msgid "Occupant Actions"
-msgstr "_Akce účastníků"
+#, fuzzy
+msgid "Participant Actions"
+msgstr "Účastníci"
 
 #: gajim/data/gui/gc_occupants_menu.ui:38
 msgid "_Voice"
@@ -5924,8 +5960,9 @@ msgid "_Ban"
 msgstr "_Zakázat"
 
 #: gajim/data/gui/gc_occupants_menu.ui:124
-msgid "_Add to Roster"
-msgstr "Přid_at do Seznamu"
+#, fuzzy
+msgid "_Add to Contact List"
+msgstr "Přid_at kontakt..."
 
 #: gajim/data/gui/gc_occupants_menu.ui:132
 #, fuzzy
@@ -5963,11 +6000,6 @@ msgstr "Autorizace: "
 msgid "_Status"
 msgstr "_Stav"
 
-#: gajim/data/gui/zeroconf_context_menu.ui:26
-#: gajim/data/gui/account_context_menu.ui:79
-msgid "_Modify Account..."
-msgstr "Upravit úč_et..."
-
 #: gajim/data/gui/certificate_dialog.ui:66
 #: gajim/data/gui/certificate_dialog.ui:178
 msgid "Common Name (CN)"
@@ -6049,13 +6081,19 @@ msgstr "Naposledy upraveno:"
 msgid "Next entry"
 msgstr ""
 
+#: gajim/data/gui/filetransfers_send_file_dialog.ui:15
+#: gajim/data/gui/advanced_configuration.ui:143
+#: gajim/data/gui/groupchat_info_scrolled.ui:48 gajim/gtk/discovery.py:1663
+msgid "Description"
+msgstr "Popis"
+
 #: gajim/data/gui/filetransfers_send_file_dialog.ui:54
 #, fuzzy
 msgid "_Send Files"
 msgstr "Odeslat _Soubor"
 
 #: gajim/data/gui/filetransfers_send_file_dialog.ui:58
-#: gajim/gtk/xml_console.py:90
+#: gajim/gtk/xml_console.py:87
 #, fuzzy
 msgid "Send"
 msgstr "Ode_slat"
@@ -6080,20 +6118,23 @@ msgid "Change _Nickname..."
 msgstr "Změ_nit přezdívku"
 
 #: gajim/data/gui/gc_control_popup_menu.ui:20
-msgid "_Manage Room"
-msgstr "Spravuj Místnost"
+#, fuzzy
+msgid "_Manage Group Chat"
+msgstr "_Nová diskuze"
 
 #: gajim/data/gui/gc_control_popup_menu.ui:31
 msgid "Change _Subject..."
 msgstr "Změnit _předmět"
 
 #: gajim/data/gui/gc_control_popup_menu.ui:38
-msgid "Configure _Room..."
-msgstr "Nastavit _místnost"
+#, fuzzy
+msgid "Configure _Group Chat..."
+msgstr "Vstoupit do _Diskuze"
 
 #: gajim/data/gui/gc_control_popup_menu.ui:52
-msgid "_Destroy Room"
-msgstr "_Zničit místnost"
+#, fuzzy
+msgid "_Destroy Group Chat"
+msgstr "_Nová diskuze"
 
 #: gajim/data/gui/gc_control_popup_menu.ui:64
 msgid "_Minimize on close"
@@ -6104,7 +6145,7 @@ msgstr "_Minimalizovat při zavření"
 msgid "_Request Voice"
 msgstr "_Hlas"
 
-#: gajim/data/gui/gc_control_popup_menu.ui:99 gajim/gtk/discovery.py:1704
+#: gajim/data/gui/gc_control_popup_menu.ui:99
 msgid "_Bookmark"
 msgstr "_Záložky"
 
@@ -6155,13 +6196,6 @@ msgstr "Dom. stránka:"
 msgid "E-Mail"
 msgstr "E-Mail:"
 
-#: 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/blocking_list.ui:115 gajim/gtk/add_contact.py:30
-#: gajim/gtk/accounts.py:801
-msgid "Jabber ID"
-msgstr "Jabber ID"
-
 #: gajim/data/gui/profile_window.ui:440
 msgid "Main"
 msgstr ""
@@ -6296,35 +6330,42 @@ msgstr "Práce"
 msgid "About"
 msgstr "Komentář"
 
-#: gajim/data/gui/start_chat_dialog.ui:114 gajim/gtk/discovery.py:1658
-msgid "Users"
-msgstr "Uživatelé"
-
-#: gajim/data/gui/start_chat_dialog.ui:185
-msgid "Name:"
-msgstr "Jméno:"
+#: gajim/data/gui/start_chat_dialog.ui:53
+#, fuzzy
+msgid "Global Group Chat Search"
+msgstr "Připojit se do diskuze"
 
-#: gajim/data/gui/start_chat_dialog.ui:197
+#: 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
-msgid "Description:"
-msgstr "Popis:"
+msgid "_Back"
+msgstr "Hned jsem zpět"
 
-#: gajim/data/gui/start_chat_dialog.ui:209
+#: gajim/data/gui/start_chat_dialog.ui:245
+#: gajim/data/gui/groupchat_control.ui:796
+#: gajim/data/gui/groupchat_control.ui:888 gajim/gtk/discovery.py:1701
+#: gajim/gtk/groupchat_join.py:62
+msgid "_Join"
+msgstr "_Vstoupit"
+
+#: gajim/data/gui/start_chat_dialog.ui:289
 #, fuzzy
-msgid "Address:"
-msgstr "_Adresa:"
+msgid "Select Account"
+msgstr "Odstraňuju účet %s"
 
-#: gajim/data/gui/start_chat_dialog.ui:246
-msgid ""
-"Semi-Anonymous\n"
-"<span size=\"small\">(Only moderators can see your XMPP-Address)</span>"
+#: gajim/data/gui/start_chat_dialog.ui:380
+msgid "_Select"
 msgstr ""
 
 #: gajim/data/gui/filetransfers.ui:21
 msgid "Pa_use/Resume"
 msgstr ""
 
-#: gajim/data/gui/filetransfers.ui:30 gajim/gtk/filechoosers.py:178
+#: gajim/data/gui/filetransfers.ui:30 gajim/data/gui/groupchat_control.ui:575
+#: gajim/data/gui/groupchat_control.ui:667
+#: gajim/data/gui/groupchat_control.ui:779
+#: gajim/data/gui/groupchat_control.ui:871 gajim/gtk/filechoosers.py:178
 msgid "_Cancel"
 msgstr "_Zrušit"
 
@@ -6366,7 +6407,8 @@ msgid "Cancel the selected file transfer and remove incomplete files"
 msgstr "Zruší vybraný přenos souboru a smaže nedokončený soubor"
 
 #: gajim/data/gui/filetransfers.ui:207
-msgid "Shows a list of file transfers between you and others"
+#, fuzzy
+msgid "Shows a list of file transfers between you and your contacts"
 msgstr "Zobrazí výpis přenosů souborů mezi Vámi a ostatními"
 
 #: gajim/data/gui/groupchat_control.ui:13 gajim/data/gui/chat_control.ui:277
@@ -6386,7 +6428,6 @@ msgid "Strike"
 msgstr "Přeškrtnout"
 
 #: gajim/data/gui/groupchat_control.ui:54 gajim/data/gui/chat_control.ui:318
-#: gajim/gtk/advanced_config.py:86
 msgid "Color"
 msgstr "Barva"
 
@@ -6399,16 +6440,46 @@ msgstr "Font"
 msgid "Clear formatting"
 msgstr "Smazat formátování"
 
-#: gajim/data/gui/groupchat_control.ui:290 gajim/data/gui/chat_control.ui:880
+#: gajim/data/gui/groupchat_control.ui:291 gajim/data/gui/chat_control.ui:880
 #, fuzzy
 msgid "Choose encryption"
 msgstr "Vyber soubor k odeslání..."
 
-#: gajim/data/gui/groupchat_control.ui:336 gajim/data/gui/chat_control.ui:640
+#: gajim/data/gui/groupchat_control.ui:337 gajim/data/gui/chat_control.ui:640
 #, fuzzy
 msgid "Show a list of emojis (Alt+M)"
 msgstr "Zobraz seznam smajlíků (Alt+M)"
 
+#: gajim/data/gui/groupchat_control.ui:484
+#, fuzzy
+msgid "Joining…"
+msgstr "Zakazuji..."
+
+#: gajim/data/gui/groupchat_control.ui:496
+msgid "_Abort"
+msgstr ""
+
+#: gajim/data/gui/groupchat_control.ui:542
+#, fuzzy
+msgid "Enter new nickname"
+msgstr "Zadej novou přezdívku pro kontakt %s."
+
+#: gajim/data/gui/groupchat_control.ui:592
+#: gajim/data/gui/groupchat_control.ui:684
+#, fuzzy
+msgid "Ch_ange"
+msgstr "Změ_nit přezdívku"
+
+#: gajim/data/gui/groupchat_control.ui:761
+#, fuzzy
+msgid "Enter password"
+msgstr "Zadejte heslo:"
+
+#: gajim/data/gui/groupchat_control.ui:1067
+#, fuzzy
+msgid "_Try again"
+msgstr "Ověřit znovu"
+
 #: gajim/data/gui/popup_notification_window.ui:42
 #, fuzzy
 msgid "Event Type"
@@ -6490,8 +6561,8 @@ msgstr "Pryč"
 
 #: gajim/data/gui/mam_preferences.ui:18
 #, fuzzy
-msgid "Roster"
-msgstr "Zobrazit _Seznam"
+msgid "Contact List"
+msgstr "Kontakty"
 
 #: gajim/data/gui/mam_preferences.ui:22
 #: gajim/data/gui/preferences_window.ui:123
@@ -6516,12 +6587,12 @@ msgid "Add"
 msgstr "Přidat"
 
 #: gajim/data/gui/mam_preferences.ui:194 gajim/data/gui/groupchat_config.ui:151
-#: gajim/gtk/dialogs.py:63 gajim/gtk/accounts.py:381
+#: gajim/gtk/dialogs.py:62 gajim/gtk/accounts.py:384
 #, fuzzy
 msgid "Remove"
 msgstr "Odst_ranit"
 
-#: gajim/data/gui/vcard_information_window.ui:72 gajim/gtk/accounts.py:753
+#: gajim/data/gui/vcard_information_window.ui:72 gajim/gtk/accounts.py:756
 #, fuzzy
 msgid "Resource"
 msgstr "Zdroj:"
@@ -6574,6 +6645,7 @@ msgstr "Autorizace: "
 #: gajim/data/gui/vcard_information_window.ui:974
 #: gajim/data/gui/vcard_information_window.ui:993
 #: gajim/data/gui/vcard_information_window.ui:1427
+#: gajim/data/gui/groupchat_info_scrolled.ui:222
 msgid "button"
 msgstr ""
 
@@ -6605,15 +6677,15 @@ msgstr "Upozorni mě na kontakty které se odhlásí"
 
 #: gajim/data/gui/preferences_window.ui:58
 #, fuzzy
-msgid "Show only in roster"
-msgstr "_Zobrazit událost v rosteru"
+msgid "Show only in contact list"
+msgstr "Zobrazit pouze _aktivní kontakty"
 
 #: gajim/data/gui/preferences_window.ui:69
-msgid "Detached roster with detached chats"
+msgid "Detached contact list with detached chats"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:72
-msgid "Detached roster with single chat"
+msgid "Detached contact list with single chat"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:75
@@ -6621,11 +6693,11 @@ msgid "Single window for everything"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:78
-msgid "Detached roster with chat grouped by account"
+msgid "Detached contact list with chat grouped by account"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:81
-msgid "Detached roster with chat grouped by type"
+msgid "Detached contact list with chat grouped by type"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:92
@@ -6681,7 +6753,7 @@ msgstr "Chování _okna"
 
 #: gajim/data/gui/preferences_window.ui:296
 #, fuzzy
-msgid "_Show roster on startup"
+msgid "_Show contact list on startup"
 msgstr "Zobrazit _Seznam"
 
 #: gajim/data/gui/preferences_window.ui:311
@@ -6697,12 +6769,12 @@ msgid "_Tabs placement"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:363
-msgid "_Quit Gajim when closing roster window"
+msgid "_Quit Gajim when closing contact list"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:367
 msgid ""
-"If enabled, Gajim will quit when closing the roster window instead of "
+"If enabled, Gajim will quit when closing the contact list window instead of "
 "minimizing to the system's notification area"
 msgstr ""
 
@@ -6712,41 +6784,42 @@ msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:423
 #, fuzzy
-msgid "Show a_vatars of contacts in roster"
+msgid "Show a_vatars of contacts in contact list"
 msgstr "Zobrazovat a_vatary kontaktů v seznamu"
 
 #: gajim/data/gui/preferences_window.ui:427
 #, fuzzy
 msgid ""
-"If checked, avatars of contacts will be shown in the roster window and in "
-"group chats"
+"If checked, avatars of contacts will be shown in the contact list window and "
+"in group chats"
 msgstr ""
 "Pokud zaškrtnuto, Gajim bude zobrazovat avatary kontaktů v okně Seznamu a v "
 "diskuzích"
 
 #: gajim/data/gui/preferences_window.ui:441
 #, fuzzy
-msgid "Show status _messages of contacts in roster"
+msgid "Show status _messages of contacts in contact list"
 msgstr "Zobrazovat p_opis stavu kontaktů v Seznamu"
 
 #: gajim/data/gui/preferences_window.ui:445
 #, fuzzy
 msgid ""
 "If checked, status messages of contacts will be shown under the contact's "
-"name, in the roster window, and in group chats"
+"name, in the contact list window, and in group chats"
 msgstr ""
 "Pokud zaškrtnuto, Gajim bude zobrazovat popisy stavů kontaktů pod jménem v "
 "okně Seznamu a v diskuzích"
 
 #: gajim/data/gui/preferences_window.ui:459
 #, fuzzy
-msgid "Show e_xtra information of contacts in roster (mood, activity, ...)"
+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
 msgid ""
-"If checked, additional info published by the contact will be shown in "
-"roster. Additional infos (published via PEP) may include e.g. mood, "
+"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 ""
 
@@ -6755,8 +6828,9 @@ msgid "Sort contacts by status"
 msgstr "Seřadit podle stavu"
 
 #: gajim/data/gui/preferences_window.ui:494
-msgid "in _roster"
-msgstr "v _rosteru"
+#, fuzzy
+msgid "in _contact list"
+msgstr "Odeslány kontakty:"
 
 #: gajim/data/gui/preferences_window.ui:511
 msgid "in _group chats"
@@ -6764,8 +6838,8 @@ msgstr "v _diskuzích"
 
 #: gajim/data/gui/preferences_window.ui:540
 #, fuzzy
-msgid "Roster Appearance"
-msgstr "<b>Vzhled Rosteru</b>"
+msgid "Contact List Appearance"
+msgstr "Výměna položky rosteru"
 
 #: gajim/data/gui/preferences_window.ui:585
 #, fuzzy
@@ -6831,7 +6905,7 @@ msgstr "Nelze se připojit se do diskuze"
 
 #: gajim/data/gui/preferences_window.ui:660
 #, fuzzy
-msgid "If checked, the room subject will be shown when joining a group chat"
+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:682
@@ -6846,13 +6920,13 @@ msgstr ""
 #: gajim/data/gui/preferences_window.ui:701
 msgid ""
 "If join/leave status messages are shown in the group chat. This setting can "
-"be overridden in the groupchat menu."
+"be overridden in the group chat menu."
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:720
 msgid ""
 "The default sync threshold for new public group chats. This setting can be "
-"overridden in the groupchat menu."
+"overridden in the group chat menu."
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:722
@@ -6867,7 +6941,7 @@ msgstr "Zaznamenávat změny _stavu kontaktů"
 #: gajim/data/gui/preferences_window.ui:768
 msgid ""
 "If status change messages are shown in the group chat. This setting can be "
-"overridden in the groupchat menu."
+"overridden in the group chat menu."
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:825
@@ -6884,8 +6958,8 @@ msgstr "Pokud je zaškrtnuto, Gajim se připojí do této místnosti při spušt
 
 #: gajim/data/gui/preferences_window.ui:843
 #, fuzzy
-msgid "Show chatstate in roster"
-msgstr "Zobrazovat a_vatary kontaktů v seznamu"
+msgid "Show chatstate in contact list"
+msgstr "Zobrazit tlačitko zavřít v záložce?"
 
 #: gajim/data/gui/preferences_window.ui:847
 msgid ""
@@ -7197,7 +7271,7 @@ msgstr "Velikost videa"
 msgid "Vi_ew own video source"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2281 gajim/gtk/accounts.py:352
+#: gajim/data/gui/preferences_window.ui:2281 gajim/gtk/accounts.py:355
 msgid "Connection"
 msgstr "Spojení"
 
@@ -7252,7 +7326,8 @@ msgid "_Manage..."
 msgstr "_Spravovat..."
 
 #: gajim/data/gui/preferences_window.ui:2616
-msgid "_Log status changes of contacts"
+#, fuzzy
+msgid "_Store status changes of contacts in history"
 msgstr "Zaznamenávat změny _stavu kontaktů"
 
 #: gajim/data/gui/preferences_window.ui:2633
@@ -7277,10 +7352,15 @@ msgstr ""
 msgid "_Open..."
 msgstr "_Otevřít..."
 
+#: gajim/data/gui/preferences_window.ui:2723 gajim/gtk/advanced_config.py:84
+#, fuzzy
+msgid "Advanced Configuration Editor (ACE)"
+msgstr "Editor rozšířeného nastavení"
+
 #: gajim/data/gui/groupchat_config.ui:55
 #, fuzzy
 msgid ""
-"<b>Jabber-ID</b>\n"
+"<b>XMPP Address</b>\n"
 "&lt;user@domain/resource&gt; (only that resource matches)\n"
 "&lt;user@domain&gt; (any resource matches)\n"
 "&lt;domain/resource&gt; (only that resource matches)\n"
@@ -7299,7 +7379,8 @@ msgstr ""
 msgid "Only Admins and Owners can modify the affiliation"
 msgstr ""
 
-#: gajim/data/gui/groupchat_config.ui:270 gajim/plugins/gui.py:312
+#: gajim/data/gui/groupchat_config.ui:270
+#: gajim/data/gui/groupchat_info_scrolled.ui:210 gajim/plugins/gui.py:324
 #, fuzzy
 msgid "Configuration"
 msgstr "Nastavení místnosti"
@@ -7332,7 +7413,7 @@ msgid "Start _Chat"
 msgstr "Začít _rozhovor"
 
 #: gajim/data/gui/contact_context_menu.ui:20
-#: gajim/data/gui/systray_context_menu.ui:36
+#: gajim/data/gui/systray_context_menu.ui:29
 msgid "Send Single _Message..."
 msgstr "Odeslat jednoduchou _zprávu..."
 
@@ -7393,17 +7474,45 @@ msgid "_Ignore"
 msgstr "_Ignorovat"
 
 #: gajim/data/gui/contact_context_menu.ui:174
-msgid "_Add to Roster..."
-msgstr "Přid_at do Seznamu"
+#, fuzzy
+msgid "_Add to Contact List..."
+msgstr "Přid_at kontakt..."
+
+#: gajim/data/gui/advanced_configuration.ui:39
+#, fuzzy
+msgid "You should restart Gajim for some changes to take effect"
+msgstr ""
+"<b>POZNÁMKA:</b> Měl(a) by jste restartovat gajim, aby se projevila všechna "
+"nastavení"
+
+#: gajim/data/gui/advanced_configuration.ui:71
+#, fuzzy
+msgid "_Filter"
+msgstr "Filtr:"
+
+#: gajim/data/gui/advanced_configuration.ui:88
+msgid "Type to search for values..."
+msgstr ""
+
+#: gajim/data/gui/advanced_configuration.ui:180
+#, fuzzy
+msgid "_Reset Value"
+msgstr "_Vrátit k výchozím barvám"
+
+#: gajim/data/gui/advanced_configuration.ui:185
+#, fuzzy
+msgid "Resets value to default"
+msgstr "_Vrátit k výchozím barvám"
 
 #: gajim/data/gui/account_creation_wizard_window.ui:43
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim: Průvodce vytváření účtu"
 
 #: gajim/data/gui/account_creation_wizard_window.ui:70
+#, fuzzy
 msgid ""
 "You need to have an account in order to connect\n"
-"to the Jabber network."
+"to the XMPP network."
 msgstr "Potřebujete mít účet pro připojení k síti Jabber."
 
 #: gajim/data/gui/account_creation_wizard_window.ui:95
@@ -7423,8 +7532,9 @@ msgid "<b>Please fill in the data for your existing account</b>"
 msgstr "<b>Prosím vyplňte údaje pro Váš nový účet</b>"
 
 #: gajim/data/gui/account_creation_wizard_window.ui:187
-msgid "_Jabber ID:"
-msgstr "_Jabber ID:"
+#, fuzzy
+msgid "_XMPP Address:"
+msgstr "AIM adresa:"
 
 #: gajim/data/gui/account_creation_wizard_window.ui:239
 #: gajim/data/gui/account_creation_wizard_window.ui:394
@@ -7511,6 +7621,7 @@ msgid "Privacy Lists:"
 msgstr "Nastavení Soukromí:"
 
 #: gajim/data/gui/service_discovery_window.ui:111
+#: gajim/data/gui/groupchat_creation.ui:227
 #, fuzzy
 msgid "_Address"
 msgstr "_Adresa:"
@@ -7528,11 +7639,6 @@ msgstr "Synchronizace: vybrat kontakty"
 msgid "Select the contacts you want to synchronise"
 msgstr "JID kontaktu, se kterým chcete komunikovat"
 
-#: gajim/data/gui/groupchat_invitation_received.ui:42
-#, fuzzy
-msgid "Group Chat Invitation"
-msgstr "Skupinová pozvánka"
-
 #: gajim/data/gui/groupchat_invitation_received.ui:111
 #, fuzzy
 msgid "Message..."
@@ -7583,11 +7689,10 @@ msgstr ""
 
 #: gajim/data/gui/add_new_contact_window.ui:84
 #, fuzzy
-msgid "_Jabber ID"
-msgstr "_Jabber ID:"
+msgid "_XMPP Address"
+msgstr "_Adresa:"
 
 #: gajim/data/gui/add_new_contact_window.ui:100
-#: gajim/data/gui/manage_bookmarks_window.ui:192
 #, fuzzy
 msgid "_Nickname"
 msgstr "_Přezdívka:"
@@ -7664,7 +7769,7 @@ msgstr "<b>Nálada:</b>"
 msgid "<b>Message:</b>"
 msgstr "<b>Zpráva:</b>"
 
-#: gajim/data/gui/plugins_window.ui:10 gajim/data/gui/application_menu.ui:90
+#: gajim/data/gui/plugins_window.ui:10 gajim/data/gui/application_menu.ui:87
 msgid "Plugins"
 msgstr ""
 
@@ -7773,10 +7878,6 @@ msgstr "Povolit"
 msgid "Deny"
 msgstr "Odmítnout"
 
-#: gajim/data/gui/privacy_list_window.ui:317
-msgid "JabberID"
-msgstr "Jabber ID"
-
 #: gajim/data/gui/privacy_list_window.ui:358
 msgid "all in the group"
 msgstr "všem ve skupině"
@@ -7818,7 +7919,7 @@ msgstr "Pořadí:"
 msgid "Manage sounds"
 msgstr "Spravovat účty"
 
-#: gajim/data/gui/manage_sounds_window.ui:55 gajim/plugins/gui.py:100
+#: gajim/data/gui/manage_sounds_window.ui:55 gajim/plugins/gui.py:101
 msgid "Active"
 msgstr "Aktivní"
 
@@ -7856,24 +7957,116 @@ msgstr "Odstranit účet z Gajimu i ze _serveru"
 msgid "_Personal Events"
 msgstr "Osobní údaje"
 
-#: gajim/data/gui/account_context_menu.ui:35
-#: gajim/data/gui/systray_context_menu.ui:28
-msgid "Join _Group Chat"
-msgstr "Vstoupit do _Diskuze"
-
-#: gajim/data/gui/account_context_menu.ui:49
+#: gajim/data/gui/account_context_menu.ui:41
 msgid "_Add Contact..."
 msgstr "Přid_at kontakt..."
 
 # FIXME: chtelo by to cesky vyraz pro service discovery
-#: gajim/data/gui/account_context_menu.ui:57
+#: gajim/data/gui/account_context_menu.ui:49
 msgid "_Discover Services"
 msgstr "_Prohlížet služby"
 
-#: gajim/data/gui/account_context_menu.ui:65
+#: gajim/data/gui/account_context_menu.ui:57
 msgid "_Execute Command..."
 msgstr "Provést příkaz..."
 
+#: gajim/data/gui/account_context_menu.ui:65
+#, fuzzy
+msgid "_View Certificate"
+msgstr "Sám sebou podepsaný certifikát"
+
+#: gajim/data/gui/manage_proxies.ui:12
+#, fuzzy
+msgctxt "proxy configuration"
+msgid "HTTP Connect"
+msgstr ""
+"HTTP Connect\n"
+"SOCKS5\n"
+"BOSH"
+
+#: gajim/data/gui/manage_proxies.ui:15
+msgctxt "proxy configuration"
+msgid "SOCKS5"
+msgstr ""
+
+#: gajim/data/gui/manage_proxies.ui:18
+#, fuzzy
+msgctxt "proxy configuration"
+msgid "BOSH"
+msgstr "_BOSH URL:"
+
+#: gajim/data/gui/manage_proxies.ui:68
+#, fuzzy
+msgid "Add Proxy"
+msgstr "Proxy:"
+
+#: gajim/data/gui/manage_proxies.ui:82
+#, fuzzy
+msgid "Remove Proxy"
+msgstr "Odstranit skupinu"
+
+#: gajim/data/gui/manage_proxies.ui:134
+#, fuzzy
+msgid "Pass_word"
+msgstr "He_slo:"
+
+#: gajim/data/gui/manage_proxies.ui:159
+msgid "Use proxy auth_entication"
+msgstr "Použít při_hlášení k proxy"
+
+#: gajim/data/gui/manage_proxies.ui:179
+#, fuzzy
+msgid "_Username"
+msgstr "_Uživatel:"
+
+#: gajim/data/gui/manage_proxies.ui:209
+#, fuzzy
+msgid "_Port"
+msgstr "_Port:"
+
+#: gajim/data/gui/manage_proxies.ui:226
+msgid "example.org"
+msgstr ""
+
+#: gajim/data/gui/manage_proxies.ui:240
+#, fuzzy
+msgid "_Host"
+msgstr "Počítač: "
+
+#: gajim/data/gui/manage_proxies.ui:254
+msgid "Use HTTP prox_y"
+msgstr "Použij HTTP prox_y"
+
+#: gajim/data/gui/manage_proxies.ui:275
+msgid "https://example.org/http-bind/"
+msgstr ""
+
+#: gajim/data/gui/manage_proxies.ui:291
+#, fuzzy
+msgid "_BOSH URL"
+msgstr "_BOSH URL:"
+
+#: gajim/data/gui/manage_proxies.ui:309 gajim/gtk/adhoc.py:322
+#, fuzzy
+msgid "Settings"
+msgstr "Registrace selhala"
+
+#: gajim/data/gui/manage_proxies.ui:344
+#, fuzzy
+msgid "_Type"
+msgstr "_Typ:"
+
+#: gajim/data/gui/manage_proxies.ui:361
+#: gajim/data/gui/groupchat_creation.ui:105
+#, fuzzy
+msgid "_Name"
+msgstr "_Jméno: "
+
+#: gajim/data/gui/manage_proxies.ui:391 gajim/gtk/accounts.py:742
+#, fuzzy
+msgid "Proxy"
+msgstr "Proxy:"
+
 #: gajim/data/gui/application_menu.ui:8
 #, fuzzy
 msgid "View"
@@ -7881,8 +8074,8 @@ msgstr "_Zobraz"
 
 #: gajim/data/gui/application_menu.ui:11
 #, fuzzy
-msgid "Show Roster"
-msgstr "Zobrazit _Seznam"
+msgid "Show Contact List"
+msgstr "Zobrazit pouze _aktivní kontakty"
 
 #: gajim/data/gui/application_menu.ui:16
 #, fuzzy
@@ -7923,23 +8116,24 @@ msgstr ""
 msgid "Features"
 msgstr "Vlastnosti serveru"
 
-#: gajim/data/gui/application_menu.ui:81
+#: gajim/data/gui/application_menu.ui:77
+#: gajim/data/gui/groupchat_creation.ui:81 gajim/gtk/groupchat_creation.py:45
 #, fuzzy
-msgid "Bookmarks"
-msgstr "_Záložky"
+msgid "Create Group Chat"
+msgstr "Opustit diskuzi"
 
-#: gajim/data/gui/application_menu.ui:94 gajim/data/gui/shortcuts_window.ui:189
-#: gajim/gtk/preferences.py:59
+#: gajim/data/gui/application_menu.ui:91 gajim/data/gui/shortcuts_window.ui:189
+#: gajim/gtk/preferences.py:58
 msgid "Preferences"
 msgstr "Nastavení"
 
-#: gajim/data/gui/application_menu.ui:99
+#: gajim/data/gui/application_menu.ui:96
 #, fuzzy
 msgid "Quit"
 msgstr "_Konec"
 
 #: gajim/data/gui/httpupload_progress_dialog.ui:110
-#: gajim/gtk/filetransfer.py:121
+#: gajim/gtk/filetransfer.py:120
 msgid "Progress"
 msgstr "Průběh"
 
@@ -7956,52 +8150,33 @@ msgstr ""
 msgid "_Cancel Upload"
 msgstr "_Zrušit"
 
-#: gajim/data/gui/manage_bookmarks_window.ui:13
-#, fuzzy
-msgid "Group Chat Bookmarks"
-msgstr "_Diskuze"
-
-#: gajim/data/gui/manage_bookmarks_window.ui:68
-#, fuzzy
-msgid "Add Bookmark"
-msgstr "_Záložky"
-
-#: gajim/data/gui/manage_bookmarks_window.ui:82
-#, fuzzy
-msgid "Remove Bookmark"
-msgstr "_Záložky"
+#: gajim/data/gui/groupchat_creation.ui:27
+msgid "Public or Private?"
+msgstr ""
 
-#: gajim/data/gui/manage_bookmarks_window.ui:126
-msgid "N_ame"
+#: 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 ""
 
-#: gajim/data/gui/manage_bookmarks_window.ui:145
-#, fuzzy
-msgid "Bookmark Name"
-msgstr "Přidat tuto místnost do záložek"
+#: gajim/data/gui/groupchat_creation.ui:58
+msgid "<b>Public:</b> Anyone who knows the address can join."
+msgstr ""
 
-#: gajim/data/gui/manage_bookmarks_window.ui:160
+#: gajim/data/gui/groupchat_creation.ui:122
 #, fuzzy
-msgid "_Server"
-msgstr "_Server:"
+msgid "_Description"
+msgstr "Popis"
 
-#: gajim/data/gui/manage_bookmarks_window.ui:223
-msgid "Roo_m"
+#: gajim/data/gui/groupchat_creation.ui:164
+msgid "_Public"
 msgstr ""
 
-#: gajim/data/gui/manage_bookmarks_window.ui:253
-#, fuzzy
-msgid "_Password"
-msgstr "_Heslo:"
-
-#: gajim/data/gui/manage_bookmarks_window.ui:299
+#: gajim/data/gui/groupchat_creation.ui:278
 #, fuzzy
-msgid "Join chat when connected"
-msgstr "Kontakt se odpojil"
-
-#: gajim/data/gui/manage_bookmarks_window.ui:307
-msgid "_Join Automatically"
-msgstr ""
+msgid "_Account"
+msgstr "Úč_ty"
 
 #: gajim/data/gui/exception_dialog.ui:49
 msgid "Sorry, that should not have happened"
@@ -8044,6 +8219,29 @@ msgstr "Autorizovat kontakt, aby věděl kdy jsi připojený(á)"
 msgid "Presets"
 msgstr "_Stav"
 
+#: gajim/data/gui/groupchat_info_scrolled.ui:32
+#, fuzzy
+msgid "Address"
+msgstr "_Adresa:"
+
+#: gajim/data/gui/groupchat_info_scrolled.ui:64
+msgid "Topic"
+msgstr ""
+
+#: gajim/data/gui/groupchat_info_scrolled.ui:80
+#, fuzzy
+msgid "Author"
+msgstr "Au_torizuj"
+
+#: gajim/data/gui/groupchat_info_scrolled.ui:182
+msgid "Discussion Logs"
+msgstr ""
+
+#: gajim/data/gui/groupchat_info_scrolled.ui:260
+#, fuzzy
+msgid "Group Chat Language"
+msgstr "Skupinová pozvánka"
+
 #: gajim/data/gui/emoji_chooser.ui:98
 #, fuzzy
 msgid "No Results Found"
@@ -8056,24 +8254,35 @@ msgstr "Pozvat přátele !"
 #: gajim/data/gui/chat_to_muc_window.ui:39
 #, fuzzy
 msgid ""
-"You are now entering a groupchat.\n"
+"You are now entering a group chat.\n"
 "Select the contacts you want to invite"
 msgstr ""
 "Začátek Více-uživatelského rozhovoru.\n"
 "Vyberte kontakty, které chcete pozvat"
 
 #: gajim/data/gui/chat_to_muc_window.ui:112
-msgid "Please select a MUC server."
+#, fuzzy
+msgid "Please select a group chat server."
 msgstr "Prosím, vyberte MUC server."
 
 #: gajim/data/gui/chat_to_muc_window.ui:141
-msgid "MUC server"
-msgstr "MUC server"
+#, fuzzy
+msgid "Group chat server"
+msgstr "Diskuze"
 
 #: gajim/data/gui/chat_to_muc_window.ui:176
 msgid "In_vite"
 msgstr "_Pozvat do"
 
+#: gajim/data/gui/bookmarks.ui:176
+#, fuzzy
+msgid "Autojoin"
+msgstr "Automaticky vstoupit"
+
+#: gajim/data/gui/bookmarks.ui:211
+msgid "_Apply"
+msgstr ""
+
 #: gajim/data/gui/history_manager.ui:11
 #, fuzzy
 msgid "_Export"
@@ -8089,12 +8298,13 @@ msgid "Gajim History Logs Manager"
 msgstr "Gajimův Správce Historie"
 
 #: gajim/data/gui/history_manager.ui:108
+#, fuzzy
 msgid ""
-"This log manager is not intended for log viewing. If you are looking for "
-"such functionality, use the history window instead.\n"
+"This history manager is not intended for viewing chat history. If you are "
+"looking for such functionality, please use the history window instead.\n"
 "\n"
-"Use this program to delete or export logs. You can select logs from the left "
-"and/or search database from below."
+"You can use this program to delete or export history. Either select logs "
+"from the left or search the database."
 msgstr ""
 "Tento správce logů není určený pro jejich prohlížení. Místo toho použijte "
 "okno s historií.\n"
@@ -8146,8 +8356,9 @@ msgid "Select an emoji"
 msgstr ""
 
 #: gajim/data/gui/shortcuts_window.ui:38
-msgid "Complete a command or a nick"
-msgstr ""
+#, fuzzy
+msgid "Complete a command or a nickname"
+msgstr "Vytvořte vaše nové téma."
 
 #: gajim/data/gui/shortcuts_window.ui:45
 #, fuzzy
@@ -8187,7 +8398,7 @@ msgstr ""
 msgid "Scroll down"
 msgstr ""
 
-#: gajim/data/gui/shortcuts_window.ui:100 gajim/gtk/xml_console.py:72
+#: gajim/data/gui/shortcuts_window.ui:100 gajim/gtk/xml_console.py:69
 #, fuzzy
 msgid "Clear"
 msgstr "Uklízím"
@@ -8230,8 +8441,9 @@ msgid "Close chat"
 msgstr "Zavřít"
 
 #: gajim/data/gui/shortcuts_window.ui:173
-msgid "Roster Shortcuts"
-msgstr ""
+#, fuzzy
+msgid "Contact List Shortcuts"
+msgstr "Výměna položky rosteru"
 
 #: gajim/data/gui/shortcuts_window.ui:196
 #, fuzzy
@@ -8264,7 +8476,7 @@ msgid "Show only active contacts"
 msgstr "Zobrazit pouze _aktivní kontakty"
 
 #: gajim/data/gui/shortcuts_window.ui:251
-msgid "Enable roster filtering"
+msgid "Enable contact list filtering"
 msgstr ""
 
 #: gajim/data/gui/shortcuts_window.ui:259
@@ -8311,12 +8523,12 @@ msgstr ""
 
 #: gajim/data/gui/history_window.ui:317
 #, fuzzy
-msgid "Record history for this chat"
+msgid "Store history for this chat"
 msgstr "Ignorovat tuto chybu certifikátu."
 
 #: gajim/data/gui/history_window.ui:332
 #, fuzzy
-msgid "Record History"
+msgid "Store History"
 msgstr "Nedávno:"
 
 #: gajim/data/gui/history_window.ui:350
@@ -8337,9 +8549,10 @@ msgstr "Vytvoř nový zápis"
 msgid "Fill in the form."
 msgstr "Vyplňte formulář."
 
-#: gajim/data/gui/data_form_window.ui:229
-msgid "Room Configuration"
-msgstr "Nastavení místnosti"
+#: gajim/data/gui/data_form_window.ui:229 gajim/gtk/groupchat_config.py:41
+#, fuzzy
+msgid "Group Chat Configuration"
+msgstr "Skupinová pozvánka"
 
 #: gajim/data/gui/roster_item_exchange_window.ui:39
 #: gajim/gtk/roster_item_exchange.py:35
@@ -8360,15 +8573,15 @@ msgstr "S_tav"
 msgid "_Start Chat..."
 msgstr "_Začít rozhovor"
 
-#: gajim/data/gui/systray_context_menu.ui:50
+#: gajim/data/gui/systray_context_menu.ui:43
 msgid "Show All Pending _Events"
 msgstr "Zobrazit všechny čekající _události"
 
-#: gajim/data/gui/systray_context_menu.ui:59
+#: gajim/data/gui/systray_context_menu.ui:52
 msgid "Mute Sounds"
 msgstr "Vypnout zvuky"
 
-#: gajim/data/gui/systray_context_menu.ui:75
+#: gajim/data/gui/systray_context_menu.ui:68
 #, fuzzy
 msgid "_Preferences"
 msgstr "Nastavení"
@@ -8460,34 +8673,34 @@ msgstr ""
 msgid "Execute expression inside a shell, send output"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:45
+#: gajim/command_system/implementation/standard.py:47
 msgid ""
 "Show help on a given command or a list of available commands if -a is given"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:73
+#: gajim/command_system/implementation/standard.py:75
 #, fuzzy
 msgid "Send a message to the contact"
 msgstr "Použití: /%s, pošle zprávu kontaktu"
 
-#: gajim/command_system/implementation/standard.py:78
+#: gajim/command_system/implementation/standard.py:80
 msgid "Send action (in the third person) to the current chat"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:83
+#: gajim/command_system/implementation/standard.py:85
 msgid "Show logged messages which mention given text"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:88
+#: gajim/command_system/implementation/standard.py:90
 #, fuzzy, python-format
 msgid "%s: Nothing found"
 msgstr "%s nebyl nalezen"
 
-#: gajim/command_system/implementation/standard.py:94
+#: gajim/command_system/implementation/standard.py:96
 msgid "Limit must be an integer"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:118
+#: gajim/command_system/implementation/standard.py:120
 msgid ""
 "\n"
 "    Set the current status\n"
@@ -8497,132 +8710,133 @@ msgid ""
 "    "
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:136
+#: gajim/command_system/implementation/standard.py:138
 msgid "Set the current status to away"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:150
+#: gajim/command_system/implementation/standard.py:152
 msgid "Set the current status to online"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:153
+#: gajim/command_system/implementation/standard.py:155
 #, fuzzy
 msgid "Available"
 msgstr "Přip_ojen"
 
-#: gajim/command_system/implementation/standard.py:173
-#: gajim/command_system/implementation/standard.py:250
+#: gajim/command_system/implementation/standard.py:175
+#: gajim/command_system/implementation/standard.py:252
 #, fuzzy
 msgid "Clear the text window"
 msgstr "Použití: /%s, smaže zprávy v okně."
 
-#: gajim/command_system/implementation/standard.py:178
-#: gajim/command_system/implementation/standard.py:397
+#: gajim/command_system/implementation/standard.py:180
+#: gajim/command_system/implementation/standard.py:401
 #, fuzzy
 msgid "Send a ping to the contact"
 msgstr "Použití: /%s, pošle ping kontaktu"
 
-#: gajim/command_system/implementation/standard.py:181
-#: gajim/command_system/implementation/standard.py:400
+#: gajim/command_system/implementation/standard.py:183
+#: gajim/command_system/implementation/standard.py:404
 #, fuzzy
 msgid "Command is not supported for zeroconf accounts"
 msgstr "Příkaz není podporován pro zeroconf účet."
 
-#: gajim/command_system/implementation/standard.py:185
-msgid "Send DTMF sequence through an open audio session"
+#: gajim/command_system/implementation/standard.py:187
+msgid "Send DTMF sequence through an open voice chat"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:188
+#: gajim/command_system/implementation/standard.py:190
 #, fuzzy
-msgid "No open audio sessions with the contact"
+msgid "No open voice chats with the contact"
 msgstr "Kliknutím zobraz staré rozhovory s tímto kontaktem"
 
-#: gajim/command_system/implementation/standard.py:191
+#: gajim/command_system/implementation/standard.py:193
 #, fuzzy, python-format
 msgid "%s is not a valid tone"
 msgstr "%s není platný loglevel"
 
-#: gajim/command_system/implementation/standard.py:198
-msgid "Toggle audio session"
-msgstr "Přepnout audio"
+#: gajim/command_system/implementation/standard.py:200
+msgid "Toggle Voice Chat"
+msgstr ""
 
-#: gajim/command_system/implementation/standard.py:201
+#: gajim/command_system/implementation/standard.py:203
 #, fuzzy
-msgid "Audio sessions are not available"
+msgid "Voice chats are not available"
 msgstr "Spojení není dostupné"
 
-#: gajim/command_system/implementation/standard.py:208
-msgid "Toggle video session"
+#: gajim/command_system/implementation/standard.py:210
+#, fuzzy
+msgid "Toggle Video Chat"
 msgstr "Přepnout video"
 
-#: gajim/command_system/implementation/standard.py:211
+#: gajim/command_system/implementation/standard.py:213
 #, fuzzy
-msgid "Video sessions are not available"
+msgid "Video chats are not available"
 msgstr "Spojení není dostupné"
 
-#: gajim/command_system/implementation/standard.py:218
+#: gajim/command_system/implementation/standard.py:220
 #, fuzzy
 msgid "Send a message to the contact that will attract their attention"
 msgstr "Použití: /%s, pošle zprávu kontaktu"
 
-#: gajim/command_system/implementation/standard.py:255
+#: gajim/command_system/implementation/standard.py:257
 #, fuzzy
 msgid "Change your nickname in a group chat"
 msgstr "Změ_nit přezdívku"
 
-#: gajim/command_system/implementation/standard.py:260 gajim/gtk/dialogs.py:674
-#: gajim/gtk/bookmarks.py:272
+#: gajim/command_system/implementation/standard.py:262
 msgid "Invalid nickname"
 msgstr "Neplatné uživatelské jméno"
 
-#: gajim/command_system/implementation/standard.py:267
+#: gajim/command_system/implementation/standard.py:269
 #, fuzzy
-msgid "Open a private chat window with a specified occupant"
+msgid "Open a private chat window with a specified participant"
 msgstr ""
 "Použití: /%s <přezdívka>, otevře okno soukromého rozhovoru uvedenému "
 "nájemníkovi."
 
-#: gajim/command_system/implementation/standard.py:273
-#: gajim/command_system/implementation/standard.py:282
-#: gajim/command_system/implementation/standard.py:332
-#: gajim/command_system/implementation/standard.py:345
-#: gajim/command_system/implementation/standard.py:357
+#: gajim/command_system/implementation/standard.py:275
+#: gajim/command_system/implementation/standard.py:284
+#: gajim/command_system/implementation/standard.py:336
+#: gajim/command_system/implementation/standard.py:349
+#: gajim/command_system/implementation/standard.py:361
 msgid "Nickname not found"
 msgstr "Přezdívka nenalezena: %s"
 
-#: gajim/command_system/implementation/standard.py:276
+#: gajim/command_system/implementation/standard.py:278
 #, fuzzy
 msgid ""
-"Open a private chat window with a specified occupant and send him a message"
+"Open a private chat window with a specified participant and send him a "
+"message"
 msgstr ""
 "Použití: /%s <přezdívka>, otevře okno soukromého rozhovoru uvedenému "
 "nájemníkovi."
 
-#: gajim/command_system/implementation/standard.py:285
+#: gajim/command_system/implementation/standard.py:287
 #, fuzzy
 msgid "Display or change a group chat topic"
 msgstr "Ptát se před zavřením oken/záložek diskuzí."
 
-#: gajim/command_system/implementation/standard.py:294
-msgid "Invite a user to a room for a reason"
+#: gajim/command_system/implementation/standard.py:296
+msgid "Invite a user to a group chat for a reason"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:297
+#: gajim/command_system/implementation/standard.py:299
 #, fuzzy, python-format
 msgid "Invited %(jid)s to %(room_jid)s"
 msgstr "Pozval(a) %(contact_jid)s do %(room_jid)s."
 
-#: gajim/command_system/implementation/standard.py:301
+#: gajim/command_system/implementation/standard.py:303
 #, fuzzy
-msgid "Join a group chat given by a JID"
+msgid "Join a group chat given by an XMPP Address"
 msgstr "v _diskuzích"
 
-#: gajim/command_system/implementation/standard.py:309
+#: gajim/command_system/implementation/standard.py:313
 msgid ""
-"Leave the groupchat, optionally giving a reason, and close tab or window"
+"Leave the group chat, optionally giving a reason, and close tab or window"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:314
+#: gajim/command_system/implementation/standard.py:318
 msgid ""
 "\n"
 "    Ban user by a nick or a JID from a groupchat\n"
@@ -8631,46 +8845,46 @@ msgid ""
 "    "
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:329
+#: gajim/command_system/implementation/standard.py:333
 #, fuzzy
-msgid "Kick user by a nick from a groupchat"
+msgid "Kick user by a nick from a group chat"
 msgstr "Jste pozván do diskuze"
 
-#: gajim/command_system/implementation/standard.py:338
+#: gajim/command_system/implementation/standard.py:342
 msgid ""
-"Set occupant role in group chat.\n"
+"Set participant role in group chat.\n"
 "    Role can be given as one of the following values:\n"
 "    moderator, participant, visitor, none"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:343
+#: gajim/command_system/implementation/standard.py:347
 #, fuzzy
 msgid "Invalid role given"
 msgstr "Neplatný server"
 
-#: gajim/command_system/implementation/standard.py:350
+#: gajim/command_system/implementation/standard.py:354
 msgid ""
-"Set occupant affiliation in group chat.\n"
+"Set participant affiliation in group chat.\n"
 "    Affiliation can be given as one of the following values:\n"
 "    owner, admin, member, outcast, none"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:355
+#: gajim/command_system/implementation/standard.py:359
 #, fuzzy
 msgid "Invalid affiliation given"
 msgstr "Příslušnost:"
 
-#: gajim/command_system/implementation/standard.py:365
+#: gajim/command_system/implementation/standard.py:369
 #, fuzzy
-msgid "Display names of all group chat occupants"
+msgid "Display names of all group chat participants"
 msgstr "Použití: /%s , zobrazí jména nájemníků v místnosti."
 
-#: gajim/command_system/implementation/standard.py:387
-msgid "Forbid an occupant to send you public or private messages"
+#: gajim/command_system/implementation/standard.py:391
+msgid "Forbid a participant to send you public or private messages"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:392
-msgid "Allow an occupant to send you public or private messages"
+#: gajim/command_system/implementation/standard.py:396
+msgid "Allow a participant to send you public or private messages"
 msgstr ""
 
 #: gajim/command_system/implementation/middleware.py:74
@@ -8681,204 +8895,329 @@ msgstr ""
 msgid "The same as using a doc-string, except it supports translation"
 msgstr ""
 
-#: gajim/gtk/filetransfer.py:91
+#: gajim/gtk/groupchat_info.py:36
+#, fuzzy
+msgid "?Group chat feature:Archiving"
+msgstr "Skupinová pozvánka"
+
+#: gajim/gtk/groupchat_info.py:37
+#, fuzzy
+msgid "Messages are archived on the server"
+msgstr "Sezení NEBUDE logováno"
+
+#: gajim/gtk/groupchat_info.py:40
+#, fuzzy
+msgid "?Group chat feature:Persistent"
+msgstr "Diskuze"
+
+#: gajim/gtk/groupchat_info.py:41
+msgid "This group chat persists even if there are no participants"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:45
+#, fuzzy
+msgid "?Group chat feature:Temporary"
+msgstr "?Group Chat Contact Role:Žádná"
+
+#: gajim/gtk/groupchat_info.py:46
+msgid "This group chat will be destroyed once the last participant left"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:50
+#, fuzzy
+msgid "?Group chat feature:Moderated"
+msgstr "?Group Chat Contact Role:Žádná"
+
+#: gajim/gtk/groupchat_info.py:51
+msgid ""
+"Participants entering this group chat need to request permission to send "
+"messages"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:55
+#, fuzzy
+msgid "?Group chat feature:Not Moderated"
+msgstr "Diskuze"
+
+#: gajim/gtk/groupchat_info.py:56
+msgid "Participants entering this group chat are allowed to send messages"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:60
+#, fuzzy
+msgid "?Group chat feature:Open"
+msgstr "?Group Chat Contact Role:Žádná"
+
+#: gajim/gtk/groupchat_info.py:61
+#, fuzzy
+msgid "Anyone can join this group chat"
+msgstr "%s vstoupil do místnosti"
+
+#: gajim/gtk/groupchat_info.py:64
+#, fuzzy
+msgid "?Group chat feature:Members Only"
+msgstr "Zvýraznění zprávy v diskuzi"
+
+#: gajim/gtk/groupchat_info.py:65
+msgid "This group chat is restricted to members only"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:69
+#, fuzzy
+msgid "?Group chat feature:Public"
+msgstr "Zvýraznění zprávy v diskuzi"
+
+#: gajim/gtk/groupchat_info.py:70
+msgid "Group chat can be found via search"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:73
+#, fuzzy
+msgid "?Group chat feature:Hidden"
+msgstr "?Group Chat Contact Role:Žádná"
+
+#: gajim/gtk/groupchat_info.py:74
+#, fuzzy
+msgid "This group chat can not be found via search"
+msgstr "Místnost nemá žádné téma"
+
+#: gajim/gtk/groupchat_info.py:77
+#, fuzzy
+msgid "?Group chat feature:Not Anonymous"
+msgstr "Diskuze"
+
+#: gajim/gtk/groupchat_info.py:78
+msgid "All other group chat participants can see your XMPP address"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:82
+#, fuzzy
+msgid "?Group chat feature:Semi-Anonymous"
+msgstr "Zvýraznění zprávy v diskuzi"
+
+#: gajim/gtk/groupchat_info.py:83
+msgid "Only moderators can see your XMPP address"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:86
+#, fuzzy
+msgid "?Group chat feature:Password Required"
+msgstr "Diskuze"
+
+#: gajim/gtk/groupchat_info.py:87
+msgid "This group chat does require a password upon entry"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:91
+#, fuzzy
+msgid "?Group chat feature:No Password Required"
+msgstr "Diskuze"
+
+#: gajim/gtk/groupchat_info.py:92
+msgid "This group chat does not require a password upon entry"
+msgstr ""
+
+#: gajim/gtk/filetransfer.py:90
 msgid "File"
 msgstr "Soubor"
 
-#: gajim/gtk/filetransfer.py:108
+#: gajim/gtk/filetransfer.py:107
 msgid "Time"
 msgstr "Čas"
 
-#: gajim/gtk/filetransfer.py:228
+#: gajim/gtk/filetransfer.py:227
 #, fuzzy, python-format
 msgid "File name: %s"
 msgstr "Soubor: %s"
 
-#: gajim/gtk/filetransfer.py:229 gajim/gtk/filetransfer.py:464
+#: gajim/gtk/filetransfer.py:228 gajim/gtk/filetransfer.py:469
 #, python-format
 msgid "Size: %s"
 msgstr "Velikost: %s"
 
-#: gajim/gtk/filetransfer.py:239
+#: gajim/gtk/filetransfer.py:238
 #, python-format
 msgid "Sender: %s"
 msgstr "Odesílatel: %s"
 
-#: gajim/gtk/filetransfer.py:240 gajim/gtk/filetransfer.py:744
+#: gajim/gtk/filetransfer.py:239 gajim/gtk/filetransfer.py:749
 #: gajim/gtk/tooltips.py:577
 msgid "Recipient: "
 msgstr "Příjemce: "
 
-#: gajim/gtk/filetransfer.py:251
+#: gajim/gtk/filetransfer.py:250
 #, python-format
 msgid "Saved in: %s"
 msgstr "Uloženo do: %s"
 
-#: gajim/gtk/filetransfer.py:256
+#: gajim/gtk/filetransfer.py:255
 msgid "File transfer completed"
 msgstr "Přenos soubor dokončen"
 
-#: gajim/gtk/filetransfer.py:276 gajim/gtk/filetransfer.py:285
+#: gajim/gtk/filetransfer.py:275 gajim/gtk/filetransfer.py:284
 #, fuzzy
 msgid "Connection with peer could not be established."
 msgstr "Spojení s protistranou se nepodařilo navázat."
 
-#: gajim/gtk/filetransfer.py:293
+#: gajim/gtk/filetransfer.py:292
 #, python-format
 msgid "Filename: %s"
 msgstr "Soubor: %s"
 
-#: gajim/gtk/filetransfer.py:294
+#: gajim/gtk/filetransfer.py:293
 #, python-format
 msgid "Recipient: %s"
 msgstr "Příjemce: %s"
 
-#: gajim/gtk/filetransfer.py:296
+#: gajim/gtk/filetransfer.py:295
 #, python-format
 msgid "Error message: %s"
 msgstr "Chybová zpráva: %s"
 
-#: gajim/gtk/filetransfer.py:333
-#, fuzzy
-msgid "File transfer error"
-msgstr "Chyba přenosu souboru"
-
 #: gajim/gtk/filetransfer.py:334
 #, python-format
 msgid ""
-"The file %(file)s has been received, but it seems to have been damaged along "
-"the way.\n"
+"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 ""
 
-#: gajim/gtk/filetransfer.py:350
+#: gajim/gtk/filetransfer.py:340
+#, fuzzy
+msgid "_Download Again"
+msgstr "Příště _nezobrazovat"
+
+#: gajim/gtk/filetransfer.py:355
 #, fuzzy
 msgid "Gajim can not read this file"
 msgstr "Gajim nemůže otevřít tento soubor"
 
-#: gajim/gtk/filetransfer.py:351
+#: gajim/gtk/filetransfer.py:356
 msgid "Another process is using this file."
 msgstr ""
 
-#: gajim/gtk/filetransfer.py:418
+#: gajim/gtk/filetransfer.py:423
 #, fuzzy
 msgid "File Transfer Conflict"
 msgstr "Přenos souboru dokončen"
 
-#: gajim/gtk/filetransfer.py:419
+#: gajim/gtk/filetransfer.py:424
 msgid "This file already exists"
 msgstr "Tento soubor už existuje"
 
-#: gajim/gtk/filetransfer.py:420
+#: gajim/gtk/filetransfer.py:425
 msgid "Resume download or replace file?"
 msgstr ""
 
-#: gajim/gtk/filetransfer.py:424
+#: gajim/gtk/filetransfer.py:429
 #, fuzzy
 msgid "Replace _File"
 msgstr "Uklízím"
 
-#: gajim/gtk/filetransfer.py:427
+#: gajim/gtk/filetransfer.py:432
 #, fuzzy
 msgid "Resume _Download"
 msgstr "Stáhnout"
 
-#: gajim/gtk/filetransfer.py:437
+#: gajim/gtk/filetransfer.py:442
 #, fuzzy, python-format
 msgid "Directory '%s' is not writable"
 msgstr "Adresář \"%s\" není zapisovatelný"
 
-#: gajim/gtk/filetransfer.py:438
+#: gajim/gtk/filetransfer.py:443
 #, fuzzy
 msgid "You do not have permissions to create files in this directory."
 msgstr "Nemáš oprávnění k vytváření souborů v tomto adresáři."
 
-#: gajim/gtk/filetransfer.py:461
+#: gajim/gtk/filetransfer.py:466
 #, python-format
 msgid "File: %s"
 msgstr "Soubor: %s"
 
-#: gajim/gtk/filetransfer.py:467
+#: gajim/gtk/filetransfer.py:472
 #, python-format
 msgid "Type: %s"
 msgstr "Typ: %s"
 
-#: gajim/gtk/filetransfer.py:469
+#: gajim/gtk/filetransfer.py:474
 #, python-format
 msgid "Description: %s"
 msgstr "Popis: %s"
 
-#: gajim/gtk/filetransfer.py:480
+#: gajim/gtk/filetransfer.py:485
 #, fuzzy, python-format
 msgid "%s wants to send you a file"
 msgstr "%s Vám chce poslat soubor."
 
-#: gajim/gtk/filetransfer.py:509
+#: gajim/gtk/filetransfer.py:514
 #, fuzzy
 msgid "Checking file…"
 msgstr "Odesílám profil..."
 
-#: gajim/gtk/filetransfer.py:524
+#: gajim/gtk/filetransfer.py:529
 #, fuzzy
 msgid "File error"
 msgstr "Chyba přenosu souboru"
 
-#: gajim/gtk/filetransfer.py:561
+#: gajim/gtk/filetransfer.py:566
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 
-#: gajim/gtk/filetransfer.py:658
+#: gajim/gtk/filetransfer.py:663
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/s)"
 
-#: gajim/gtk/filetransfer.py:711 gajim/gtk/filetransfer.py:715
+#: gajim/gtk/filetransfer.py:716 gajim/gtk/filetransfer.py:720
 msgid "Invalid File"
 msgstr "Neplatný soubor"
 
-#: gajim/gtk/filetransfer.py:711
+#: gajim/gtk/filetransfer.py:716
 msgid "File: "
 msgstr "Soubor: "
 
-#: gajim/gtk/filetransfer.py:716
+#: gajim/gtk/filetransfer.py:721
 msgid "It is not possible to send empty files"
 msgstr "Není možné posílat prázdné soubory"
 
-#: gajim/gtk/filetransfer.py:742 gajim/gtk/tooltips.py:571
+#: gajim/gtk/filetransfer.py:747 gajim/gtk/tooltips.py:571
 msgid "Sender: "
 msgstr "Odesílatel: "
 
-#: gajim/gtk/filetransfer.py:1038
+#: gajim/gtk/filetransfer.py:1043
 #, fuzzy
 msgid "Choose a File to Send…"
 msgstr "Vyber soubor k odeslání..."
 
 #: gajim/gtk/start_chat.py:51
 #, fuzzy
-msgid "Start new Conversation"
+msgid "Start New Conversation"
 msgstr "Pokračování v rozhovoru"
 
-#: gajim/gtk/start_chat.py:424
-#, fuzzy
-msgid "New Groupchat"
-msgstr "Nová diskuze"
+#: gajim/gtk/start_chat.py:260 gajim/gtk/start_chat.py:328
+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:603 gajim/gtk/groupchat_join.py:38
+msgid "Join Group Chat"
+msgstr "Připojit se do diskuze"
 
-#: gajim/gtk/start_chat.py:426
+#: gajim/gtk/start_chat.py:605 gajim/gtk/add_contact.py:40
 #, fuzzy
-msgid "New Contact"
-msgstr "Přidat nový kontakt"
+msgid "Add Contact"
+msgstr "Přid_at kontakt..."
 
-#: gajim/gtk/start_chat.py:588
+#: gajim/gtk/start_chat.py:746
 #, fuzzy, python-format
-msgid "%s Group chats found"
+msgid "%s group chats found"
 msgstr "%s nebyl nalezen"
 
-#: gajim/gtk/discovery.py:70
+#: gajim/gtk/discovery.py:69
 msgid "This service has not yet responded with detailed information"
 msgstr "Tato služba dosud neodpověděla s detaily"
 
-#: gajim/gtk/discovery.py:71
+#: gajim/gtk/discovery.py:70
 #, fuzzy
 msgid ""
 "This service could not respond with detailed information.\n"
@@ -8887,32 +9226,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:128
+#: gajim/gtk/discovery.py:126
 msgid "Others"
 msgstr "Ostatní"
 
-#: gajim/gtk/discovery.py:131
-msgid "Conference"
+#: gajim/gtk/discovery.py:129
+#, fuzzy
+msgid "Group Chat"
 msgstr "Diskuze"
 
-#: gajim/gtk/discovery.py:519
+#: gajim/gtk/discovery.py:518
 msgid "Without a connection, you can not browse available services"
 msgstr "Bez spojení nemůžete prohlížet dostupné služby"
 
-#: gajim/gtk/discovery.py:606
+#: gajim/gtk/discovery.py:605
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Procházení služeb s použitím účtu %s"
 
-#: gajim/gtk/discovery.py:608
+#: gajim/gtk/discovery.py:607
 msgid "Service Discovery"
 msgstr "Service Discovery"
 
-#: gajim/gtk/discovery.py:691
+#: gajim/gtk/discovery.py:690
 msgid "The service could not be found"
 msgstr "Tato služba nebyla nalezena"
 
-#: gajim/gtk/discovery.py:692
+#: gajim/gtk/discovery.py:691
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -8920,100 +9260,80 @@ msgstr ""
 "Služba na zadané adrese neexistuje, nebo neodpovídá. Zkontrolujte adresu a "
 "opakujte znovu."
 
-#: gajim/gtk/discovery.py:699 gajim/gtk/discovery.py:1042
+#: gajim/gtk/discovery.py:698 gajim/gtk/discovery.py:1041
 msgid "The service is not browsable"
 msgstr "Službu nelze prohlížet"
 
-#: gajim/gtk/discovery.py:700
+#: gajim/gtk/discovery.py:699
 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:738 gajim/gtk/discovery.py:747
+#: gajim/gtk/discovery.py:737 gajim/gtk/discovery.py:746
 msgid "Invalid Server Name"
 msgstr "Neplatné jméno serveru"
 
-#: gajim/gtk/discovery.py:806
+#: gajim/gtk/discovery.py:805
 #, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Procházím %(address)s pomocí účtu %(account)s"
 
-#: gajim/gtk/discovery.py:851
+#: gajim/gtk/discovery.py:850
 #, fuzzy
 msgid "Browse"
 msgstr "_Prohlížet"
 
-#: gajim/gtk/discovery.py:1043
+#: gajim/gtk/discovery.py:1042
 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:1255
+#: gajim/gtk/discovery.py:1254
 #, fuzzy
 msgid "_Command"
 msgstr "Příkazy: %s"
 
-#: gajim/gtk/discovery.py:1264 gajim/gtk/discovery.py:1422
+#: gajim/gtk/discovery.py:1263 gajim/gtk/discovery.py:1420
 msgid "Re_gister"
 msgstr "Re_gistrace"
 
-#: gajim/gtk/discovery.py:1277
+#: gajim/gtk/discovery.py:1276
 msgid "_Search"
 msgstr "_Najít"
 
-#: gajim/gtk/discovery.py:1420
+#: gajim/gtk/discovery.py:1418
 msgid "_Edit"
 msgstr "_Úpravy"
 
-#: gajim/gtk/discovery.py:1458
+#: gajim/gtk/discovery.py:1456
 #, fuzzy, python-format
 msgid "Scanning %(current)d / %(total)d ..."
 msgstr "Skenuji %(current)d / %(total)d.."
 
-#: gajim/gtk/discovery.py:1674
+#: gajim/gtk/discovery.py:1655
+msgid "Users"
+msgstr "Uživatelé"
+
+#: gajim/gtk/discovery.py:1671
 msgid "Id"
 msgstr "č."
 
-#: gajim/gtk/discovery.py:1713
-msgid "_Join"
-msgstr "_Vstoupit"
-
-#: gajim/gtk/discovery.py:1736
-msgid "Bookmark already set"
-msgstr "Záložka je už nastavena"
-
-#: gajim/gtk/discovery.py:1737
-#, fuzzy, python-format
-msgid "Group Chat '%s' is already in your bookmarks."
-msgstr "Diskuze \"%s\" už je ve Vašich záložkách."
-
-#: gajim/gtk/discovery.py:1748
-msgid "Bookmark has been added successfully"
-msgstr "Záložka byla úspěšně přidána"
-
-#: gajim/gtk/discovery.py:1749
-#, fuzzy
-msgid ""
-"You can manage your bookmarks by clicking the Bookmarks menu item in your "
-"contact list."
-msgstr "Můžete spravovat Vaše záložky přes menu Akce ve vašem Seznamu."
-
-#: gajim/gtk/discovery.py:1950
+#: gajim/gtk/discovery.py:1900
 msgid "Subscribed"
 msgstr "Autorizován"
 
-#: gajim/gtk/discovery.py:1959
+#: gajim/gtk/discovery.py:1909
 msgid "Node"
 msgstr "Uzel"
 
-#: gajim/gtk/discovery.py:2028
+#: gajim/gtk/discovery.py:1978
 #, fuzzy
 msgid "_New post"
 msgstr "Nový záznam"
 
-#: gajim/gtk/discovery.py:2037
+#: gajim/gtk/discovery.py:1987
 msgid "_Subscribe"
 msgstr "_Žádat autorizaci"
 
-#: gajim/gtk/discovery.py:2045
+#: gajim/gtk/discovery.py:1995
 msgid "_Unsubscribe"
 msgstr "_Zrušit autorizaci"
 
@@ -9060,7 +9380,7 @@ msgstr "Od %s"
 msgid "Characters typed: %s"
 msgstr "Znak nebyl povolen"
 
-#: gajim/gtk/single_message.py:274 gajim/gtk/xml_console.py:169
+#: gajim/gtk/single_message.py:274 gajim/gtk/xml_console.py:166
 msgid "Connection not available"
 msgstr "Spojení není dostupné"
 
@@ -9069,6 +9389,12 @@ msgstr "Spojení není dostupné"
 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:306
+#, 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:330
 #, python-format
 msgid "RE: %s"
@@ -9079,28 +9405,28 @@ msgstr "RE: %s"
 msgid "%s wrote:\n"
 msgstr "%s napsal(a):\n"
 
-#: gajim/gtk/pep_config.py:44
+#: gajim/gtk/pep_config.py:45
 #, fuzzy, python-format
 msgid "PEP Service Configuration (%s)"
 msgstr "Nastavení PEP služby"
 
-#: gajim/gtk/pep_config.py:77
+#: gajim/gtk/pep_config.py:78
 #, fuzzy
 msgid "Service"
 msgstr "_Služby"
 
-#: gajim/gtk/pep_config.py:114
+#: gajim/gtk/pep_config.py:115
 msgid "PEP node was not removed"
 msgstr "PEP uzel nebyl smazán"
 
-#: gajim/gtk/pep_config.py:115
+#: gajim/gtk/pep_config.py:116
 #, fuzzy, python-format
 msgid ""
 "PEP node %(node)s was not removed:\n"
 "%(message)s"
 msgstr "PEP uzel %(node)s se nepodařilo odstranit: %(message)s"
 
-#: gajim/gtk/pep_config.py:146
+#: gajim/gtk/pep_config.py:147
 #, fuzzy, python-format
 msgid "Configure %s"
 msgstr "_Nastavit"
@@ -9116,17 +9442,21 @@ msgstr "_Registrovat"
 msgid "Registration successful"
 msgstr "Registrace úspěšná"
 
-#: gajim/gtk/dialogs.py:54 gajim/gtk/dataform.py:659 gajim/gtk/adhoc.py:85
+#: gajim/gtk/service_registration.py:215
+msgid "Registration failed"
+msgstr "Registrace selhala"
+
+#: gajim/gtk/dialogs.py:53 gajim/gtk/dataform.py:668 gajim/gtk/adhoc.py:86
 #, fuzzy
 msgid "Cancel"
 msgstr "_Zrušit"
 
-#: gajim/gtk/dialogs.py:129
+#: gajim/gtk/dialogs.py:128
 #, fuzzy, python-format
 msgid "Dictionary for language \"%s\" not available"
 msgstr "Slovník pro jazyk %s není dostupný"
 
-#: gajim/gtk/dialogs.py:130
+#: gajim/gtk/dialogs.py:129
 #, fuzzy, python-format
 msgid ""
 "You have to install the dictionary \"%s\" to use spellchecking, or choose "
@@ -9137,11 +9467,11 @@ msgstr ""
 "Musíš nainstalovat %s slovník k použití kontroly pravopisu, nebo vybrat jiný "
 "jazyk nastavením volby speller_language."
 
-#: gajim/gtk/dialogs.py:410 gajim/gtk/dialogs.py:425
+#: gajim/gtk/dialogs.py:322 gajim/gtk/dialogs.py:337
 msgid "Insecure connection"
 msgstr "Nezabezpečené Spojení"
 
-#: gajim/gtk/dialogs.py:411
+#: gajim/gtk/dialogs.py:323
 #, fuzzy, python-format
 msgid ""
 "You are about to connect to the account %(account)s (%(server)s) insecurely. "
@@ -9152,120 +9482,115 @@ msgstr ""
 "Abyste nemuseli posílat heslo nezabezpečeným připojením nainstalujte si "
 "PyOpenSSL. Jste si jisti, že to chcete udělat?"
 
-#: gajim/gtk/dialogs.py:416
+#: gajim/gtk/dialogs.py:328
 msgid "Yes, I really want to connect insecurely"
 msgstr "Ano, chci se připojit nezabezpečeně"
 
-#: gajim/gtk/dialogs.py:417
+#: gajim/gtk/dialogs.py:329
 msgid "Gajim will NOT connect unless you check this box"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:675
-#, fuzzy
-msgid "The nickname contains invalid characters."
-msgstr "Jabber ID diskuze obsahuje nepřijatelné znaky."
-
-#: gajim/gtk/dialogs.py:734
+#: gajim/gtk/dialogs.py:561
 #, fuzzy, python-format
 msgid "Destroy %s"
 msgstr "Likviduji: %s"
 
-#: gajim/gtk/dialogs.py:775
+#: gajim/gtk/dialogs.py:602
 #, fuzzy
 msgid "Certificate"
 msgstr "Sám sebou podepsaný certifikát"
 
-#: gajim/gtk/dialogs.py:786
+#: gajim/gtk/dialogs.py:613
 #, fuzzy, python-format
 msgid ""
 "Certificate for account\n"
 "%s"
 msgstr "pro účet %s"
 
-#: gajim/gtk/dialogs.py:824
+#: gajim/gtk/dialogs.py:651
 msgid "Issued to\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:825 gajim/gtk/dialogs.py:830
+#: gajim/gtk/dialogs.py:652 gajim/gtk/dialogs.py:657
 msgid "Common Name (CN): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:826 gajim/gtk/dialogs.py:831
+#: gajim/gtk/dialogs.py:653 gajim/gtk/dialogs.py:658
 msgid "Organization (O): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:827 gajim/gtk/dialogs.py:832
+#: gajim/gtk/dialogs.py:654 gajim/gtk/dialogs.py:659
 msgid "Organizational Unit (OU): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:828
+#: gajim/gtk/dialogs.py:655
 #, fuzzy
 msgid "Serial Number: "
 msgstr "GG číslo: "
 
-#: gajim/gtk/dialogs.py:829
+#: gajim/gtk/dialogs.py:656
 msgid "Issued by\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:833
+#: gajim/gtk/dialogs.py:660
 msgid "Validity\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:834
+#: gajim/gtk/dialogs.py:661
 msgid "Issued on: "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:835
+#: gajim/gtk/dialogs.py:662
 msgid "Expires on: "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:836
+#: gajim/gtk/dialogs.py:663
 msgid "SHA-1:"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:838
+#: gajim/gtk/dialogs.py:665
 msgid "SHA-256:"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:852
+#: gajim/gtk/dialogs.py:679
 #, fuzzy
 msgid "View certificate…"
 msgstr "Sám sebou podepsaný certifikát"
 
-#: gajim/gtk/dialogs.py:864 gajim/gtk/accounts.py:893
+#: gajim/gtk/dialogs.py:691 gajim/gtk/accounts.py:896
 msgid "Change Password"
 msgstr "Změnit heslo"
 
-#: gajim/gtk/dialogs.py:878
+#: gajim/gtk/dialogs.py:705
 msgid "_OK"
 msgstr "_OK"
 
-#: gajim/gtk/dialogs.py:891
+#: gajim/gtk/dialogs.py:718
 #, fuzzy
 msgid "You must enter a password"
 msgstr "Musíte zadat heslo."
 
-#: gajim/gtk/dialogs.py:895
+#: gajim/gtk/dialogs.py:722
 msgid "Passwords do not match"
 msgstr "Hesla se neshodují"
 
-#: gajim/gtk/dialogs.py:923
+#: gajim/gtk/dialogs.py:750
 #, fuzzy
 msgid "Group Chat Invitation "
 msgstr "Skupinová pozvánka"
 
-#: gajim/gtk/dialogs.py:948
+#: gajim/gtk/dialogs.py:775
 #, fuzzy, python-format
 msgid "<b>%s</b> has invited you to join a discussion"
 msgstr "$Contact Vás pozval(a) do místnosti %(room_jid)s"
 
-#: gajim/gtk/dialogs.py:951
+#: gajim/gtk/dialogs.py:778
 #, 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:959
+#: gajim/gtk/dialogs.py:786
 #, python-format
 msgid "Comment: %s"
 msgstr "Komentář: %s"
@@ -9280,11 +9605,6 @@ msgstr "GG číslo: "
 msgid "ICQ Number"
 msgstr "ICQ číslo: "
 
-#: gajim/gtk/add_contact.py:40
-#, fuzzy
-msgid "Add Contact"
-msgstr "Přid_at kontakt..."
-
 #: gajim/gtk/add_contact.py:259
 #, fuzzy, python-format
 msgid "%s Missing"
@@ -9305,7 +9625,8 @@ msgid "The user ID must not contain a resource."
 msgstr "User ID nesmí obsahovat zdroj."
 
 #: gajim/gtk/add_contact.py:299
-msgid "You cannot add yourself to your roster."
+#, fuzzy
+msgid "You cannot add yourself to your contact list."
 msgstr "Rád(a) bych si tě přidal(a) do seznamu."
 
 #: gajim/gtk/add_contact.py:304
@@ -9318,11 +9639,13 @@ msgid "Your account must be online to add new contacts."
 msgstr ""
 
 #: gajim/gtk/add_contact.py:321
-msgid "Contact already in roster"
+#, fuzzy
+msgid "Contact Already in Contact List"
 msgstr "Kontakt už je v Seznamu"
 
 #: gajim/gtk/add_contact.py:322
-msgid "This contact is already listed in your roster."
+#, fuzzy
+msgid "This contact is already in your contact list."
 msgstr "Tento kontakt už je obsažen ve Vašem seznamu."
 
 #: gajim/gtk/add_contact.py:379 gajim/gtk/add_contact.py:417
@@ -9364,14 +9687,14 @@ msgstr "Změnit stav"
 # FIXME: I dont really know what this is and where it is
 #: gajim/gtk/themes.py:52
 #, fuzzy
-msgid "MUC Tab New Directed Message"
+msgid "Group Chat Tab New Directed Message"
 msgstr ""
 "MUC Directed\n"
 "Messages"
 
 #: gajim/gtk/themes.py:56
 #, fuzzy
-msgid "MUC Tab New Message"
+msgid "Group Chat Tab New Message"
 msgstr "Nová zpráva"
 
 #: gajim/gtk/themes.py:60
@@ -9588,13 +9911,13 @@ msgstr "Všechny soubory"
 msgid "Clear File"
 msgstr "Uklízím"
 
-#: gajim/gtk/settings.py:570
+#: gajim/gtk/settings.py:570 gajim/gtk/proxies.py:32
 #, fuzzy
 msgid "Manage Proxies"
 msgstr "Spravovat profily Proxy"
 
-#: gajim/gtk/settings.py:591 gajim/gtk/preferences.py:971
-#: gajim/gtk/preferences.py:984 gajim/gtk/preferences.py:988
+#: gajim/gtk/settings.py:591 gajim/gtk/preferences.py:968
+#: gajim/gtk/preferences.py:982 gajim/gtk/preferences.py:986
 #, fuzzy
 msgid "No Proxy"
 msgstr "Proxy:"
@@ -9674,14 +9997,15 @@ msgid ""
 "        "
 msgstr ""
 
-#: gajim/gtk/about.py:47 data/org.gajim.Gajim.appdata.xml.in:10
+#: gajim/gtk/about.py:47 data/org.gajim.Gajim.desktop.in:6
+#: data/org.gajim.Gajim.appdata.xml.in:10
 #, fuzzy
-msgid "A GTK+ XMPP client"
+msgid "A GTK XMPP client"
 msgstr "GTK+ Jabber klient"
 
 #: gajim/gtk/about.py:48
 #, fuzzy, python-format
-msgid "GTK+ Version: %s"
+msgid "GTK Version: %s"
 msgstr "GTK+ verze: "
 
 #: gajim/gtk/about.py:49
@@ -9863,6 +10187,25 @@ msgstr "?transfer status:Pozastaveno"
 msgid "?transfer status:Not started"
 msgstr "?transfer status:Pozastaveno"
 
+#: gajim/gtk/groupchat_creation.py:97 gajim/gtk/groupchat_creation.py:99
+msgid " (optional)..."
+msgstr ""
+
+#: gajim/gtk/groupchat_creation.py:134
+#, fuzzy
+msgid "Invalid Address"
+msgstr "Neplatný soubor"
+
+#: gajim/gtk/groupchat_creation.py:182
+#, fuzzy
+msgid "Not Connected"
+msgstr "Spojeno"
+
+#: gajim/gtk/groupchat_creation.py:183
+#, fuzzy
+msgid "You have to be connected to create a group chat."
+msgstr "Nepřipojil jsi se k diskuzi."
+
 #: gajim/gtk/sounds.py:39
 msgid "Wav Sounds"
 msgstr "Waw soubory"
@@ -9904,50 +10247,45 @@ msgstr "Zvýraznění zprávy v diskuzi"
 msgid "Group Chat Message Received"
 msgstr "Přijetí zprávy v diskuzi"
 
-#: gajim/gtk/dataform.py:226 gajim/gtk/dataform.py:262
+#: gajim/gtk/dataform.py:232 gajim/gtk/dataform.py:268
 #, fuzzy
 msgid "Required"
 msgstr "Vyžadováno heslo"
 
-#: gajim/gtk/dataform.py:286
+#: gajim/gtk/dataform.py:293
 msgid "Yes"
 msgstr "Ano"
 
-#: gajim/gtk/dataform.py:286
+#: gajim/gtk/dataform.py:293
 #, fuzzy
 msgid "No"
 msgstr "Žádný"
 
-#: gajim/gtk/dataform.py:661
+#: gajim/gtk/dataform.py:670
 msgid "Submit"
 msgstr ""
 
-#: gajim/gtk/statusicon.py:213
+#: gajim/gtk/statusicon.py:206
 #, fuzzy
 msgid "_Change Status Message…"
 msgstr "Z_měnit popis stavu"
 
-#: gajim/gtk/statusicon.py:247 gajim/gtk/statusicon.py:292
-#: gajim/gtk/statusicon.py:299
+#: gajim/gtk/statusicon.py:258
 #, python-format
 msgid "using account %s"
 msgstr "pomocí účtu %s"
 
-#: gajim/gtk/statusicon.py:309
+#: gajim/gtk/statusicon.py:269
 #, fuzzy
-msgid "_Manage Bookmarks…"
-msgstr "Spravovat záložky"
+msgid "Hide _Contact List"
+msgstr "Pozvat kontakt"
 
-#: gajim/gtk/statusicon.py:325
+#: gajim/gtk/statusicon.py:273
 #, fuzzy
-msgid "Hide _Roster"
-msgstr "v _rosteru"
-
-#: gajim/gtk/statusicon.py:329
-msgid "Show _Roster"
-msgstr "Zobrazit _Seznam"
+msgid "Show _Contact List"
+msgstr "Zobrazit pouze _aktivní kontakty"
 
-#: gajim/gtk/statusicon.py:337
+#: gajim/gtk/statusicon.py:281
 msgid "Hide this menu"
 msgstr "Skryje toto menu"
 
@@ -9995,36 +10333,6 @@ msgid ""
 msgstr ""
 "Nastala chyba při publikování Vašich osobních údajů, zkuste to později znovu."
 
-#: gajim/gtk/join_groupchat.py:202
-#, fuzzy
-msgid "Invalid Room"
-msgstr "Neplatná místnost"
-
-#: gajim/gtk/join_groupchat.py:203
-msgid "Please choose a room"
-msgstr ""
-
-#: gajim/gtk/join_groupchat.py:222 gajim/gtk/join_groupchat.py:229
-msgid "Invalid Nickname"
-msgstr "Neplatné uživatelské jméno"
-
-#: gajim/gtk/join_groupchat.py:223
-#, fuzzy
-msgid "Please choose a nickname"
-msgstr "Vytvořte vaše nové téma."
-
-#: gajim/gtk/join_groupchat.py:282 gajim/gtk/join_groupchat.py:288
-#: gajim/gtk/join_groupchat.py:293
-#, fuzzy
-msgid "Wrong server"
-msgstr "Nesprávné uri"
-
-#: gajim/gtk/join_groupchat.py:283 gajim/gtk/join_groupchat.py:289
-#: gajim/gtk/join_groupchat.py:294
-#, fuzzy, python-format
-msgid "%s is not a groupchat server"
-msgstr "Tohle není diskuze"
-
 #: gajim/gtk/mam_preferences.py:38
 #, python-format
 msgid "Archiving Preferences for %s"
@@ -10055,45 +10363,53 @@ msgstr "Chyba v příchozím datagramu"
 msgid "Archiving Preferences Error"
 msgstr "_Nastavení"
 
-#: gajim/gtk/advanced_config.py:81
+#: gajim/gtk/advanced_config.py:95
 msgid "Activated"
 msgstr "Aktivní"
 
-#: gajim/gtk/advanced_config.py:81
+#: gajim/gtk/advanced_config.py:95
 msgid "Deactivated"
 msgstr "Neaktivní"
 
-#: gajim/gtk/advanced_config.py:83
-msgid "Boolean"
-msgstr "Boolean"
+#: gajim/gtk/advanced_config.py:97
+msgid "?config type:Boolean"
+msgstr ""
+
+#: gajim/gtk/advanced_config.py:98
+msgid "?config type:Integer"
+msgstr ""
 
-#: gajim/gtk/advanced_config.py:84
-msgid "Integer"
-msgstr "Číslo"
+#: gajim/gtk/advanced_config.py:99
+msgid "?config type:Text"
+msgstr ""
 
-#: gajim/gtk/advanced_config.py:85
-msgid "Text"
-msgstr "Text"
+#: gajim/gtk/advanced_config.py:100
+msgid "?config type:Color"
+msgstr ""
 
-#: gajim/gtk/advanced_config.py:97
-msgid "Preference Name"
+#: gajim/gtk/advanced_config.py:112
+#, fuzzy
+msgid "?config:Preference Name"
 msgstr "Název volby"
 
-#: gajim/gtk/advanced_config.py:104
-msgid "Value"
-msgstr "Hodnota"
+#: gajim/gtk/advanced_config.py:123
+#, fuzzy
+msgid "?config:Value"
+msgstr "_Nastavit"
 
-#: gajim/gtk/advanced_config.py:113
-msgid "Type"
-msgstr "Typ"
+#: gajim/gtk/advanced_config.py:132
+msgid "?config:Type"
+msgstr ""
 
-#: gajim/gtk/advanced_config.py:168
-msgid "(None)"
-msgstr "(Žádný)"
+#: gajim/gtk/advanced_config.py:187
+#, fuzzy
+msgid "?config description:None"
+msgstr "?Ask (for Subscription):Není"
 
-#: gajim/gtk/advanced_config.py:299
-msgid "Hidden"
-msgstr "Skryté"
+#: gajim/gtk/advanced_config.py:322
+#, fuzzy
+msgid "?password:Hidden"
+msgstr "Heslo:"
 
 #: gajim/gtk/server_info.py:66
 #, fuzzy
@@ -10105,8 +10421,8 @@ msgstr "_Kopírovat odkaz"
 msgid "%(days)s days, %(hours)s hours"
 msgstr ""
 
-#: gajim/gtk/server_info.py:218 gajim/gtk/accounts.py:749
-#: gajim/gtk/accounts.py:853
+#: gajim/gtk/server_info.py:218 gajim/gtk/accounts.py:752
+#: gajim/gtk/accounts.py:856
 #, fuzzy
 msgid "Hostname"
 msgstr "Počítač: "
@@ -10295,11 +10611,6 @@ 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_config.py:41
-#, fuzzy
-msgid "Group Chat Configuration"
-msgstr "Skupinová pozvánka"
-
 #: gajim/gtk/groupchat_config.py:134
 #, fuzzy
 msgid "A Group Chat needs at least one Owner"
@@ -10310,69 +10621,69 @@ msgid "You are not allowed to modify the affiliation of Admins and Owners"
 msgstr ""
 
 #: gajim/gtk/groupchat_config.py:399
-msgid "An entry with this Jabber-ID already exists"
+msgid "An entry with this XMPP Address already exists"
 msgstr ""
 
-#: gajim/gtk/adhoc.py:91
+#: gajim/gtk/adhoc.py:92
 #, fuzzy
 msgid "Finish"
 msgstr "_Dokončit"
 
-#: gajim/gtk/adhoc.py:97 gajim/gtk/adhoc.py:283
+#: gajim/gtk/adhoc.py:98 gajim/gtk/adhoc.py:284
 #, fuzzy
 msgid "Commands"
 msgstr "Příkazy: %s"
 
-#: gajim/gtk/adhoc.py:103
+#: gajim/gtk/adhoc.py:104
 msgid "Next"
 msgstr ""
 
-#: gajim/gtk/adhoc.py:109
+#: gajim/gtk/adhoc.py:110
 #, fuzzy
 msgid "Previous"
 msgstr "Závidějící"
 
-#: gajim/gtk/adhoc.py:115
+#: gajim/gtk/adhoc.py:116
 #, fuzzy
 msgid "Execute"
 msgstr "Spustit _příkaz..."
 
-#: gajim/gtk/adhoc.py:195
+#: gajim/gtk/adhoc.py:196
 #, fuzzy
 msgid "No commands available"
 msgstr "Žádný účet není dostupný"
 
-#: gajim/gtk/adhoc.py:244
+#: gajim/gtk/adhoc.py:245
 #, fuzzy
 msgid "Request Command List"
 msgstr "Spustit _příkaz..."
 
-#: gajim/gtk/adhoc.py:259
+#: gajim/gtk/adhoc.py:260
 #, fuzzy
 msgid "Executing…"
 msgstr "Spustit _příkaz..."
 
-#: gajim/gtk/adhoc.py:266
+#: gajim/gtk/adhoc.py:267
 #, fuzzy
 msgid "Command List"
 msgstr "Příkazy: %s"
 
-#: gajim/gtk/adhoc.py:384
+#: gajim/gtk/adhoc.py:385
 #, fuzzy
 msgid "Finished"
 msgstr "_Dokončit"
 
-#: gajim/gtk/adhoc.py:453
+#: gajim/gtk/adhoc.py:454
 #, fuzzy
 msgid "Execution failed"
 msgstr "Spojení selhalo"
 
-#: gajim/gtk/blocking.py:37
+#: gajim/gtk/blocking.py:38
 #, fuzzy, python-format
 msgid "Blocking List for %s"
 msgstr "Soukromý seznam pro %s"
 
-#: gajim/gtk/blocking.py:71
+#: gajim/gtk/blocking.py:72
 #, fuzzy
 msgid "Error!"
 msgstr "Chyba"
@@ -10422,8 +10733,7 @@ msgstr "Neplatné uživatelské jméno"
 msgid "You must provide a username to configure this account."
 msgstr "Musíte zadat uživatelské jméno před nastavením tohoto účtu."
 
-#: gajim/gtk/account_wizard.py:252 gajim/gtk/bookmarks.py:290
-#: gajim/gtk/bookmarks.py:303
+#: gajim/gtk/account_wizard.py:252
 msgid "Invalid server"
 msgstr "Neplatný server"
 
@@ -10439,7 +10749,7 @@ msgstr "Neplatný záznam"
 msgid "Custom port must be a port number."
 msgstr "Vlastní port musí být číslo portu."
 
-#: gajim/gtk/account_wizard.py:405
+#: gajim/gtk/account_wizard.py:406
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -10454,15 +10764,15 @@ msgstr ""
 "SSL Chyba: %(error)s\n"
 "Přesto se chcete k serveru připojit?"
 
-#: gajim/gtk/account_wizard.py:446 gajim/gtk/account_wizard.py:480
+#: gajim/gtk/account_wizard.py:447 gajim/gtk/account_wizard.py:481
 msgid "An error occurred during account creation"
 msgstr "Nastala chyba při vytváření účtu"
 
-#: gajim/gtk/account_wizard.py:545
+#: gajim/gtk/account_wizard.py:546
 msgid "Account name is in use"
 msgstr "Jméno účtu se používá"
 
-#: gajim/gtk/account_wizard.py:546
+#: gajim/gtk/account_wizard.py:547
 msgid "You already have an account using this name."
 msgstr "Již máte účet s tímto jménem."
 
@@ -10489,26 +10799,26 @@ msgstr "Přenos souboru %(filename)s od %(name)s byl zastaven."
 msgid "%(minutes)s min %(seconds)s sec"
 msgstr ""
 
-#: gajim/gtk/xml_console.py:77
+#: gajim/gtk/xml_console.py:74
 #, fuzzy
 msgid "Filter"
 msgstr "Filtr:"
 
-#: gajim/gtk/xml_console.py:82
+#: gajim/gtk/xml_console.py:79
 #, fuzzy
 msgid "XML Input"
 msgstr "<b>Vstup XML</b>"
 
-#: gajim/gtk/xml_console.py:86
+#: gajim/gtk/xml_console.py:83
 msgid "Paste Last Input"
 msgstr ""
 
-#: gajim/gtk/xml_console.py:170
+#: gajim/gtk/xml_console.py:167
 #, fuzzy, 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/xml_console.py:182
+#: gajim/gtk/xml_console.py:177
 #, fuzzy
 msgid "Invalid Node"
 msgstr "Neplatný soubor"
@@ -10541,37 +10851,52 @@ msgstr "Najít"
 msgid "No results found"
 msgstr "Žádný výsledek"
 
-#: gajim/gtk/preferences.py:358 gajim/gtk/preferences.py:362
+#: gajim/gtk/preferences.py:357 gajim/gtk/preferences.py:361
 msgid "Default"
 msgstr "Výchozí"
 
-#: gajim/gtk/preferences.py:801
+#: gajim/gtk/preferences.py:798
 msgid "status message title"
 msgstr "titulek stavu"
 
-#: gajim/gtk/preferences.py:802
+#: gajim/gtk/preferences.py:799
 msgid "status message text"
 msgstr "text stavu"
 
+#: gajim/gtk/accounts.py:137
+#, fuzzy
+msgid "Re-Login"
+msgstr "Připojit se teď znovu?"
+
 #: gajim/gtk/accounts.py:138
-msgid "Relogin now?"
+#, fuzzy
+msgid "Re-Login now?"
 msgstr "Připojit se teď znovu?"
 
 #: gajim/gtk/accounts.py:139
-msgid "If you want all the changes to apply instantly, you must relogin."
+#, 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:191 gajim/gtk/accounts.py:975
+#: gajim/gtk/accounts.py:141
+msgid "_Later"
+msgstr ""
+
+#: gajim/gtk/accounts.py:143
+msgid "_Re-Login"
+msgstr ""
+
+#: gajim/gtk/accounts.py:194 gajim/gtk/accounts.py:978
 #, fuzzy
 msgid "Remove Account"
 msgstr "Odstraňuju účet %s"
 
-#: gajim/gtk/accounts.py:192
+#: gajim/gtk/accounts.py:195
 #, fuzzy, python-format
 msgid "You still have open chats in your account %s"
 msgstr "Otevřel(a) jsi rozhovor z účtu %s"
 
-#: gajim/gtk/accounts.py:193
+#: gajim/gtk/accounts.py:196
 #, fuzzy
 msgid ""
 "All chat and group chat windows will be closed.\n"
@@ -10579,270 +10904,265 @@ msgid ""
 msgstr ""
 "Všechna okna rozhovorů a diskuzí budou zavřena. Opravdu chceš pokračovat?"
 
-#: gajim/gtk/accounts.py:424
+#: gajim/gtk/accounts.py:427
 #, fuzzy
 msgid "Back"
 msgstr "Hned jsem zpět"
 
-#: gajim/gtk/accounts.py:530
+#: gajim/gtk/accounts.py:533
 #, fuzzy
 msgid "Please check if Bonjour is installed."
 msgstr "Zkontrolujte zda je Avahi nebo Bonjour nainstalováno."
 
-#: gajim/gtk/accounts.py:532
+#: gajim/gtk/accounts.py:535
 #, fuzzy
 msgid "Please check if Avahi is installed."
 msgstr "Zkontrolujte zda je Avahi nebo Bonjour nainstalováno."
 
-#: gajim/gtk/accounts.py:569
+#: gajim/gtk/accounts.py:572
 #, fuzzy
 msgid "Disable Account"
 msgstr "Neplatný účtu"
 
-#: gajim/gtk/accounts.py:570
+#: gajim/gtk/accounts.py:573
 #, fuzzy, python-format
 msgid "Account %s is still connected"
 msgstr "Účet \"%s\" se připojil k serveru"
 
-#: gajim/gtk/accounts.py:571
+#: gajim/gtk/accounts.py:574
 #, fuzzy
 msgid ""
 "All chat and group chat windows will be closed. Do you want to continue?"
 msgstr ""
 "Všechna okna rozhovorů a diskuzí budou zavřena. Opravdu chceš pokračovat?"
 
-#: gajim/gtk/accounts.py:576
+#: gajim/gtk/accounts.py:579
 #, fuzzy
 msgid "_Disable Account"
 msgstr "Neplatný účtu"
 
-#: gajim/gtk/accounts.py:595
+#: gajim/gtk/accounts.py:598
 #, fuzzy
 msgid "Add Account"
 msgstr "Přid_at kontakt..."
 
-#: gajim/gtk/accounts.py:663
+#: gajim/gtk/accounts.py:666
 #, fuzzy
 msgid "Label"
 msgstr "označit"
 
-#: gajim/gtk/accounts.py:667
+#: gajim/gtk/accounts.py:670
 msgid "Login"
 msgstr ""
 
-#: gajim/gtk/accounts.py:670
+#: gajim/gtk/accounts.py:673
 #, fuzzy
 msgid "Import Contacts"
 msgstr "Pozvat kontakt"
 
-#: gajim/gtk/accounts.py:674 gajim/gtk/accounts.py:870
+#: gajim/gtk/accounts.py:677 gajim/gtk/accounts.py:873
 #, fuzzy
 msgid "Client Certificate"
 msgstr "Sám sebou podepsaný certifikát"
 
-#: gajim/gtk/accounts.py:677 gajim/gtk/accounts.py:774
+#: gajim/gtk/accounts.py:680 gajim/gtk/accounts.py:777
 #, fuzzy
 msgid "Connect on startup"
 msgstr "_Připojit po startu Gajimu"
 
-#: gajim/gtk/accounts.py:681 gajim/gtk/accounts.py:779
+#: gajim/gtk/accounts.py:684 gajim/gtk/accounts.py:782
 #, fuzzy
 msgid "Save conversations for all contacts"
 msgstr "Uložit _historii pro všechny kontakty"
 
-#: gajim/gtk/accounts.py:683 gajim/gtk/accounts.py:781
+#: gajim/gtk/accounts.py:686 gajim/gtk/accounts.py:784
 msgid "Store conversations on the harddrive"
 msgstr ""
 
-#: gajim/gtk/accounts.py:685 gajim/gtk/accounts.py:783
+#: gajim/gtk/accounts.py:688 gajim/gtk/accounts.py:786
 #, fuzzy
 msgid "Global Status"
 msgstr "Všechny stavy"
 
-#: gajim/gtk/accounts.py:687
+#: gajim/gtk/accounts.py:690
 #, fuzzy
 msgid "Synchronise the status of all accounts"
 msgstr "Změní stav účtu nebo účtů"
 
-#: gajim/gtk/accounts.py:689
+#: gajim/gtk/accounts.py:692
 msgid "Use file transfer proxies"
 msgstr "Použij proxy při přenosu souborů"
 
-#: gajim/gtk/accounts.py:705
+#: gajim/gtk/accounts.py:708
 #, fuzzy
 msgid "Idle Time"
 msgstr " od %s"
 
-#: gajim/gtk/accounts.py:707
+#: gajim/gtk/accounts.py:710
 msgid "Disclose the time of your last activity"
 msgstr ""
 
-#: gajim/gtk/accounts.py:709
+#: gajim/gtk/accounts.py:712
 msgid "Local System Time"
 msgstr ""
 
-#: gajim/gtk/accounts.py:711
+#: gajim/gtk/accounts.py:714
 msgid "Disclose the local system time of the device Gajim runs on"
 msgstr ""
 
-#: gajim/gtk/accounts.py:714
+#: gajim/gtk/accounts.py:717
 #, fuzzy
 msgid "Client / Operating System"
 msgstr "Sám sebou podepsaný certifikát"
 
-#: gajim/gtk/accounts.py:716
+#: gajim/gtk/accounts.py:719
 #, fuzzy
 msgid ""
 "Disclose informations 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:719
+#: gajim/gtk/accounts.py:722
 #, fuzzy
 msgid "Ignore Unknown Contacts"
 msgstr "Pozvat kontakt"
 
-#: gajim/gtk/accounts.py:721
+#: gajim/gtk/accounts.py:724
 #, fuzzy
 msgid "Ignore everything from contacts not in your Roster"
 msgstr "_Ignorovat události od kontaktů mimo můj Seznam"
 
-#: gajim/gtk/accounts.py:737 gajim/gtk/accounts.py:776
+#: gajim/gtk/accounts.py:740 gajim/gtk/accounts.py:779
 #, fuzzy
 msgid "Use environment variable"
 msgstr "_použít proměnnou prostředí HTTP_PROXY"
 
-#: gajim/gtk/accounts.py:739
-#, fuzzy
-msgid "Proxy"
-msgstr "Proxy:"
-
-#: gajim/gtk/accounts.py:742
+#: gajim/gtk/accounts.py:745
 #, fuzzy
 msgid "Warn on insecure connection"
 msgstr "_Varovat před použitím nezabezpečeného spojení"
 
-#: gajim/gtk/accounts.py:746
+#: gajim/gtk/accounts.py:749
 msgid "Send keep-alive packets"
 msgstr "Odesílat keep-alive pakety"
 
-#: gajim/gtk/accounts.py:750
+#: gajim/gtk/accounts.py:753
 msgid "Manually set the hostname for the server"
 msgstr ""
 
-#: gajim/gtk/accounts.py:756 gajim/gtk/accounts.py:826
-#: gajim/gtk/accounts.py:831
+#: gajim/gtk/accounts.py:759 gajim/gtk/accounts.py:829
+#: gajim/gtk/accounts.py:834
 #, fuzzy
 msgid "Priority"
 msgstr "Priori_ta:"
 
-#: gajim/gtk/accounts.py:785
+#: gajim/gtk/accounts.py:788
 #, fuzzy
 msgid "Synchronize the status of all accounts"
 msgstr "Změní stav účtu nebo účtů"
 
-#: gajim/gtk/accounts.py:795
+#: gajim/gtk/accounts.py:798
 #, fuzzy
 msgid "First Name"
 msgstr "Křestní:"
 
-#: gajim/gtk/accounts.py:798
+#: gajim/gtk/accounts.py:801
 #, fuzzy
 msgid "Last Name"
 msgstr "Příjmení:"
 
-#: gajim/gtk/accounts.py:804
+#: gajim/gtk/accounts.py:807
 #, fuzzy
 msgid "Email"
 msgstr "Nový E-mail"
 
-#: gajim/gtk/accounts.py:822
+#: gajim/gtk/accounts.py:825
 #, fuzzy
 msgid "Adjust to status"
 msgstr "N_astavit podle stavu"
 
-#: gajim/gtk/accounts.py:849
+#: gajim/gtk/accounts.py:852
 msgid "Enable"
 msgstr "Povolit"
 
-#: gajim/gtk/accounts.py:857
+#: gajim/gtk/accounts.py:860
 #, fuzzy
 msgid "Port"
 msgstr "_Port:"
 
-#: gajim/gtk/accounts.py:862
+#: gajim/gtk/accounts.py:865
 #, fuzzy
 msgid "Connection Settings"
 msgstr "Spojení"
 
-#: gajim/gtk/accounts.py:872
+#: gajim/gtk/accounts.py:875
 msgid "PKCS12 Files"
 msgstr ""
 
-#: gajim/gtk/accounts.py:874
+#: gajim/gtk/accounts.py:877
 #, fuzzy
 msgid "Encrypted Certificate"
 msgstr "Sám sebou podepsaný certifikát"
 
-#: gajim/gtk/accounts.py:878
+#: gajim/gtk/accounts.py:881
 #, fuzzy
 msgid "Certificate Settings"
 msgstr "Sám sebou podepsaný certifikát"
 
-#: gajim/gtk/accounts.py:890
+#: gajim/gtk/accounts.py:893
 #, fuzzy
 msgid "Save Password"
 msgstr "Uložit heslo"
 
-#: gajim/gtk/accounts.py:898
+#: gajim/gtk/accounts.py:901
 #, fuzzy
 msgid "Login Settings"
 msgstr "Registrace selhala"
 
-#: gajim/gtk/accounts.py:931
+#: gajim/gtk/accounts.py:934
 #, fuzzy, python-format
 msgid "Removing account %s"
 msgstr "Odstraňuju účet %s"
 
-#: gajim/gtk/accounts.py:946
+#: gajim/gtk/accounts.py:949
 #, fuzzy
 msgid "Account is disabled"
 msgstr "Smajlíci byly vypnuty"
 
-#: gajim/gtk/accounts.py:947
+#: gajim/gtk/accounts.py:950
 #, fuzzy
 msgid "To unregister from a server, the account must be enabled."
 msgstr "Chcete-li deaktivovat účet, musíte se nejdříve odpojit."
 
-#: gajim/gtk/accounts.py:962
+#: gajim/gtk/accounts.py:965
 #, fuzzy
 msgid "Password required"
 msgstr "Vyžadováno heslo"
 
-#: gajim/gtk/accounts.py:976
+#: gajim/gtk/accounts.py:979
 #, fuzzy, python-format
 msgid "Account '%s' is still connected to the server"
 msgstr "Účet \"%s\" se připojil k serveru"
 
-#: gajim/gtk/accounts.py:978
+#: gajim/gtk/accounts.py:981
 msgid "If you remove it, the connection will be lost."
 msgstr "Pokud jej smažete, připojení bude ztraceno."
 
-#: gajim/gtk/accounts.py:995
+#: gajim/gtk/accounts.py:998
 #, fuzzy, python-format
 msgid "Connection to server %s failed"
 msgstr "Spojení s proxy selhalo"
 
-#: gajim/gtk/accounts.py:996
+#: gajim/gtk/accounts.py:999
 #, fuzzy
 msgid "What would you like to do?"
 msgstr "Co by jste rád(a) dělal(a)?"
 
-#: gajim/gtk/accounts.py:997
+#: gajim/gtk/accounts.py:1000
 #, fuzzy
 msgid "Remove only from Gajim"
 msgstr "Odstranit účet _pouze z Gajimu"
 
-#: gajim/gtk/accounts.py:998
+#: gajim/gtk/accounts.py:1001
 msgid "Don't remove anything. I'll try again later"
 msgstr ""
 
@@ -10869,6 +11189,10 @@ msgstr ""
 msgid "Modify"
 msgstr "Upravit"
 
+#: gajim/gtk/roster_item_exchange.py:80
+msgid "JID"
+msgstr "JID"
+
 #: gajim/gtk/roster_item_exchange.py:86
 msgid "Groups"
 msgstr "Skupiny"
@@ -10894,19 +11218,19 @@ msgstr[0] "Odstraněno %s kontaktů"
 msgstr[1] "Odstraněno %s kontaktů"
 msgstr[2] "Odstraněno %s kontaktů"
 
-#: gajim/gtk/util.py:581
+#: gajim/gtk/util.py:583
 msgid "Unknown Artist"
 msgstr "Neznámý Umělec"
 
-#: gajim/gtk/util.py:582
+#: gajim/gtk/util.py:584
 msgid "Unknown Title"
 msgstr "Neznámý Název"
 
-#: gajim/gtk/util.py:583
+#: gajim/gtk/util.py:585
 msgid "Unknown Source"
 msgstr "Neznámý Zdroj"
 
-#: gajim/gtk/util.py:585
+#: gajim/gtk/util.py:587
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
@@ -10915,29 +11239,10 @@ msgstr ""
 "<b>\"%(title)s\"</b> od <i>%(artist)s</i>\n"
 "z <i>%(source)s</i>"
 
-#: gajim/gtk/bookmarks.py:121
-msgid "New Group Chat"
-msgstr "Nová diskuze"
-
-#: gajim/gtk/bookmarks.py:161
-msgid "This bookmark has invalid data"
-msgstr "Tato záložka má neplatná data"
-
-#: gajim/gtk/bookmarks.py:162
-msgid ""
-"Please be sure to fill out server and room fields or remove this bookmark."
-msgstr ""
-"Prosím nezapomeňte vyplnit políčka server a místnost, nebo smažte tuto "
-"záložku."
-
-#: gajim/gtk/bookmarks.py:273 gajim/gtk/bookmarks.py:291
-#: gajim/gtk/bookmarks.py:304 gajim/gtk/bookmarks.py:335
-msgid "Character not allowed"
-msgstr "Znak nebyl povolen"
-
-#: gajim/gtk/bookmarks.py:334
-msgid "Invalid room"
-msgstr "Neplatná místnost"
+#: gajim/gtk/bookmarks.py:47
+#, fuzzy, python-format
+msgid "Bookmarks for %s"
+msgstr "_Záložky"
 
 #: gajim/plugins/pluginmanager.py:736 gajim/plugins/pluginmanager.py:742
 msgid "Archive corrupted"
@@ -10949,52 +11254,55 @@ msgid "Archive empty"
 msgstr "Soubor je prázdný"
 
 #: gajim/plugins/pluginmanager.py:750 gajim/plugins/pluginmanager.py:758
-#: gajim/plugins/gui.py:257
+#: gajim/plugins/gui.py:258
 #, fuzzy
 msgid "Archive is malformed"
 msgstr "Služba odeslala chybné data"
 
-#: gajim/plugins/pluginmanager.py:766 gajim/plugins/gui.py:281
-#: gajim/plugins/gui.py:289
+#: gajim/plugins/pluginmanager.py:766 gajim/plugins/gui.py:288
+#: gajim/plugins/gui.py:301
 #, fuzzy
 msgid "Plugin already exists"
 msgstr "Tento soubor už existuje"
 
-#: gajim/plugins/gui.py:82
+#: gajim/plugins/gui.py:83
 msgid "Click to view Gajim's wiki page on how to install plugins in Flatpak."
 msgstr ""
 
-#: gajim/plugins/gui.py:89
+#: gajim/plugins/gui.py:90
 #, fuzzy
 msgid "Plugin"
 msgstr "P_luginy"
 
-#: gajim/plugins/gui.py:151
+#: gajim/plugins/gui.py:152
 #, fuzzy, python-format
 msgid "Warning: %s"
 msgstr "Zakazuji %s"
 
-#: gajim/plugins/gui.py:206
+#: gajim/plugins/gui.py:207
 #, fuzzy
 msgid "Plugin failed"
 msgstr "Registrace selhala"
 
-#: gajim/plugins/gui.py:245
+#: gajim/plugins/gui.py:246
 msgid "Unable to properly remove the plugin"
 msgstr ""
 
-#: gajim/plugins/gui.py:281
-msgid "Overwrite?"
-msgstr ""
+#: gajim/plugins/gui.py:287
+#, fuzzy
+msgid "Overwrite Plugin?"
+msgstr "Přepsat Text stavu?"
+
+#: gajim/plugins/gui.py:289
+#, fuzzy
+msgid "Do you want to overwrite the currently installed version?"
+msgstr "Chcete přijmout pozvání?"
 
 #: data/org.gajim.Gajim.desktop.in:5
-msgid "Jabber IM Client"
+#, fuzzy
+msgid "XMPP IM Client"
 msgstr "Jabber IM klient"
 
-#: data/org.gajim.Gajim.desktop.in:6
-msgid "A GTK+ Jabber client"
-msgstr "GTK+ Jabber klient"
-
 #: data/org.gajim.Gajim.desktop.in:8
 msgid "chat;messaging;im;xmpp;bonjour;voip;"
 msgstr ""
@@ -11046,7 +11354,7 @@ msgid "Easily send pictures, videos or other files to friends and groups"
 msgstr ""
 
 #: data/org.gajim.Gajim.appdata.xml.in:27
-msgid "Chat securely with End-to-End encryption via OMEMO or PGP"
+msgid "Chat securely with End-to-End encryption via OMEMO or OpenPGP"
 msgstr ""
 
 #: data/org.gajim.Gajim.appdata.xml.in:28
@@ -11108,7 +11416,7 @@ msgstr ""
 
 #: data/org.gajim.Gajim.appdata.xml.in:52
 #, fuzzy
-msgid "Roster, list of contacts"
+msgid "Contact list, list of contacts"
 msgstr "Zaznamenávat změny _stavu kontaktů"
 
 #: data/org.gajim.Gajim.appdata.xml.in:56
@@ -11130,6 +11438,533 @@ msgstr "Nedávno:"
 msgid "Plugin manager"
 msgstr "Registrace selhala"
 
+#, fuzzy
+#~ msgid "Configure Services…"
+#~ msgstr "_Nastavit služby..."
+
+#, fuzzy
+#~ msgid "Group Chat Bookmarks"
+#~ msgstr "_Diskuze"
+
+#, fuzzy
+#~ msgid "Add Bookmark"
+#~ msgstr "_Záložky"
+
+#, fuzzy
+#~ msgid "Remove Bookmark"
+#~ msgstr "_Záložky"
+
+#, fuzzy
+#~ msgid "Bookmark Name"
+#~ msgstr "Přidat tuto místnost do záložek"
+
+#, fuzzy
+#~ msgid "_Server"
+#~ msgstr "_Server:"
+
+#, fuzzy
+#~ msgid "_Password"
+#~ msgstr "_Heslo:"
+
+#, fuzzy
+#~ msgid "Join chat when connected"
+#~ msgstr "Kontakt se odpojil"
+
+#~ msgid "New Group Chat"
+#~ msgstr "Nová diskuze"
+
+#~ msgid "This bookmark has invalid data"
+#~ msgstr "Tato záložka má neplatná data"
+
+#, fuzzy
+#~ msgid ""
+#~ "Please be sure to fill out server and group chat fields or remove this "
+#~ "bookmark."
+#~ msgstr ""
+#~ "Prosím nezapomeňte vyplnit políčka server a místnost, nebo smažte tuto "
+#~ "záložku."
+
+#~ msgid "Character not allowed"
+#~ msgstr "Znak nebyl povolen"
+
+#, fuzzy
+#~ msgid "Invalid Group Chat"
+#~ msgstr "Neplatné Jabber ID diskuzní místnosti"
+
+#~ msgid "Unable to join group chat"
+#~ msgstr "Nelze se připojit se do diskuze"
+
+#, fuzzy
+#~ msgid "You are banned from group chat <b>%s</b>."
+#~ msgstr "Máš zakázán přístup do diskuze %s."
+
+#, fuzzy
+#~ msgid "Remote server <b>%s</b> does not exist."
+#~ msgstr "Diskuze %s neexistuje."
+
+#, fuzzy
+#~ msgid "Group chat <b>%s</b> does not exist."
+#~ msgstr "Diskuze %s neexistuje."
+
+#, fuzzy
+#~ msgid "Group chat creation is not permitted."
+#~ msgstr "Vytváření místností není povoleno."
+
+#, fuzzy
+#~ msgid "You must use your registered nickname in <b>%s</b>."
+#~ msgstr "Musí být použita přezdívka, jež máte zaregistrovánu v diskuzi %s."
+
+#, fuzzy
+#~ msgid "You are not in the members list in group chat %s."
+#~ msgstr "Nejsi v seznamu členů diskuze %s."
+
+#, fuzzy
+#~ msgid "XMPP Address is not a group chat"
+#~ msgstr "Tohle není diskuze"
+
+#~ msgid "This is not a group chat"
+#~ msgstr "Tohle není diskuze"
+
+#, fuzzy
+#~ msgid "Please choose a group chat"
+#~ msgstr "Vytvořte vaše nové téma."
+
+#~ msgid "Invalid Nickname"
+#~ msgstr "Neplatné uživatelské jméno"
+
+#, fuzzy
+#~ msgid "Please choose a nickname"
+#~ msgstr "Vytvořte vaše nové téma."
+
+#, fuzzy
+#~ msgid "Wrong server"
+#~ msgstr "Nesprávné uri"
+
+#, fuzzy
+#~ msgid "%s is not a group chat server"
+#~ msgstr "Tohle není diskuze"
+
+#, fuzzy
+#~ msgid ""
+#~ "How many lines to request from server when entering a group chat. -1 "
+#~ "means no limit."
+#~ msgstr "Kolik řádek požadovat od serveru při připojení k diskuzi."
+
+#, fuzzy
+#~ msgid ""
+#~ "Minutes of backlog to request when entering a group chat. -1 means no "
+#~ "limit."
+#~ msgstr "Kolik minut zpátky do historie při připojení k diskuzi."
+
+#, fuzzy
+#~ msgid ""
+#~ "How many lines to request from server when entering a group chat. -1 "
+#~ "means no limit, -2 means global value."
+#~ msgstr "Kolik řádek požadovat od serveru při připojení k diskuzi."
+
+#, fuzzy
+#~ msgid ""
+#~ "Minutes of backlog to request when entering a group chat. -1 means no "
+#~ "limit, -2 means global value."
+#~ msgstr "Kolik minut zpátky do historie při připojení k diskuzi."
+
+#, fuzzy
+#~ msgid "A Password is required to join the group chat %s. Please type it."
+#~ msgstr "Pro připojení do místnosti %s je vyžadováno heslo. Zadejte, prosím."
+
+#~ msgid "Not in Roster"
+#~ msgstr "Není v Rosteru"
+
+#~ msgid "I would like to add you to my roster"
+#~ msgstr "Rád bych si Vás přidal(a) do svého seznamu"
+
+#, fuzzy
+#~ msgid "Add to Roster"
+#~ msgstr "Přid_at do Seznamu"
+
+#, fuzzy
+#~ msgid "Audio Session"
+#~ msgstr "Audio / Video"
+
+#, fuzzy
+#~ msgid "Video Session"
+#~ msgstr "Velikost videa"
+
+#, fuzzy
+#~ msgid "Manage Room"
+#~ msgstr "Spravuj Místnost"
+
+#, fuzzy
+#~ msgid "Configure Room"
+#~ msgstr "Nastavit _místnost"
+
+#, fuzzy
+#~ msgid "Destroy Room"
+#~ msgstr "_Zničit místnost"
+
+#, fuzzy
+#~ msgid "Change Nick"
+#~ msgstr "Změ_nit přezdívku"
+
+#, fuzzy
+#~ msgid "Disconnect"
+#~ msgstr "_Odpojit"
+
+#, fuzzy
+#~ msgid "Copy JID"
+#~ msgstr "JID Místnosti"
+
+#, fuzzy
+#~ msgid "Add to Roster…"
+#~ msgstr "Přid_at do Seznamu"
+
+#, fuzzy
+#~ msgid "Copy JID/Email"
+#~ msgstr "_Kopírovat JID/Emailovou adresu"
+
+#, fuzzy
+#~ msgid "JID: <i>%s</i>"
+#~ msgstr "Jabber ID: <i>%s</i>"
+
+#~ msgid "Changing Subject"
+#~ msgstr "Měním Téma"
+
+#~ msgid "Please specify the new subject:"
+#~ msgstr "Prosím zadejte nové téma:"
+
+#~ msgid "Room logging is now enabled"
+#~ msgstr "Zaznamenávání historie je zapnuto"
+
+#~ msgid "Room logging is now disabled"
+#~ msgstr "Zaznamenávání historie je vypnuto"
+
+#, fuzzy
+#~ msgid "You (%s) joined the room"
+#~ msgstr "%s vstoupil do místnosti"
+
+#~ msgid "Room logging is enabled"
+#~ msgstr "Zaznamenávání historie je povoleno"
+
+#, fuzzy
+#~ msgid "Unable to join groupchat"
+#~ msgstr "Nelze se připojit se do diskuze"
+
+#~ msgid "Groupchat Invitation"
+#~ msgstr "Skupinová pozvánka"
+
+#, fuzzy
+#~ msgid "%(jid)s has been invited in this room"
+#~ msgstr "%(nick)s byli vyhozeni z místnosti: %(reason)s"
+
+#, fuzzy
+#~ msgid "JID is not a Groupchat"
+#~ msgstr "Tohle není diskuze"
+
+#~ msgid "Invalid JID"
+#~ msgstr "Neplatné JID"
+
+#~ msgid "A connection is not available"
+#~ msgstr "Spojení není dostupné"
+
+#, fuzzy
+#~ msgid "JID already in list"
+#~ msgstr "Jabber ID je již na seznamu"
+
+#, fuzzy
+#~ msgid "For the chosen encryption there is no encryption method available"
+#~ msgstr "Spojení není dostupné"
+
+#~ msgid "Removes contact from roster"
+#~ msgstr "Odstraní kontakt ze Seznamu"
+
+#~ msgid "Not in roster"
+#~ msgstr "Není v rosteru"
+
+#, fuzzy
+#~ msgid "Contact signed in notification color."
+#~ msgstr "_Zobrazit událost v rosteru"
+
+#, fuzzy
+#~ msgid "Contact signout notification color"
+#~ msgstr "_Zobrazit událost v rosteru"
+
+#, fuzzy
+#~ msgid "File transfer request notification color."
+#~ msgstr "Požadavek přenosu souboru"
+
+#, fuzzy
+#~ msgid "File transfer error notification color."
+#~ msgstr "Přenos souboru zrušen"
+
+#, fuzzy
+#~ msgid "File transfer complete or stopped notification color."
+#~ msgstr "Zobraz upozornění, až bude přenos souboru dokončen"
+
+#, fuzzy
+#~ msgid "Groupchat invitation notification color"
+#~ msgstr "Skupinová pozvánka"
+
+#~ msgid "Add * and [n] in roster title?"
+#~ msgstr "Přidat * a [n] k titulku Seznamu?"
+
+#~ msgid "Hides the banner in two persons chat window"
+#~ msgstr "Skryje nadpis v okně rozhovoru dvou lidí"
+
+#, fuzzy
+#~ msgid ""
+#~ "Show the confirm metacontacts creation dialog or not? Empty string means "
+#~ "never show the dialog."
+#~ msgstr ""
+#~ "Mám zobrazit dialog vytvoření metakontaktu nebo ne? Prázdný řetezec "
+#~ "znamená nikdy nezobrazovat dialog."
+
+#~ msgid "Space separated list of ssl errors to ignore."
+#~ msgstr "Mezerami oddělovaný seznam ssl chyb, které se mají ignorovat."
+
+#~ msgid "Answer to receipt requests"
+#~ msgstr "Odpověď na doručení žádosti"
+
+#~ msgid "Sent receipt requests"
+#~ msgstr "Poslat žádost"
+
+#, fuzzy
+#~ msgid "Language for which misspelled words will be checked"
+#~ msgstr "Jazyk, pro který chcete kontrolovat překlepy ve slovech"
+
+#~ msgid "I'm eating, so leave me a message."
+#~ msgstr "Právě jím, prosím zanechte mi zprávu."
+
+#, fuzzy
+#~ msgid "from room %s"
+#~ msgstr "z místností %s"
+
+#~ msgid "Leave Groupchats"
+#~ msgstr "Opustit diskuzi"
+
+#, fuzzy
+#~ msgid "Auto Join"
+#~ msgstr "Automaticky vstoupit"
+
+#, fuzzy
+#~ msgid "Room"
+#~ msgstr "Místnost:"
+
+#~ msgid "Jabber ID:"
+#~ msgstr "Jabber ID:"
+
+#~ msgid "Occupant Actions"
+#~ msgstr "_Akce účastníků"
+
+#~ msgid "_Add to Roster"
+#~ msgstr "Přid_at do Seznamu"
+
+#~ msgid "_Manage Room"
+#~ msgstr "Spravuj Místnost"
+
+#~ msgid "Configure _Room..."
+#~ msgstr "Nastavit _místnost"
+
+#~ msgid "_Destroy Room"
+#~ msgstr "_Zničit místnost"
+
+#~ msgid "Jabber ID"
+#~ msgstr "Jabber ID"
+
+#, fuzzy
+#~ msgid "icon"
+#~ msgstr "Tray ikona"
+
+#, fuzzy
+#~ msgid "account"
+#~ msgstr "Účet"
+
+#, fuzzy
+#~ msgid "Roster"
+#~ msgstr "Zobrazit _Seznam"
+
+#, fuzzy
+#~ msgid "Show only in roster"
+#~ msgstr "_Zobrazit událost v rosteru"
+
+#~ msgid "in _roster"
+#~ msgstr "v _rosteru"
+
+#, fuzzy
+#~ msgid "Roster Appearance"
+#~ msgstr "<b>Vzhled Rosteru</b>"
+
+#, fuzzy
+#~ msgid "Show chatstate in roster"
+#~ msgstr "Zobrazovat a_vatary kontaktů v seznamu"
+
+#~ msgid "_Add to Roster..."
+#~ msgstr "Přid_at do Seznamu"
+
+#~ msgid "_Jabber ID:"
+#~ msgstr "_Jabber ID:"
+
+#, fuzzy
+#~ msgid "_Jabber ID"
+#~ msgstr "_Jabber ID:"
+
+#~ msgid "JabberID"
+#~ msgstr "Jabber ID"
+
+#, fuzzy
+#~ msgid "Show Roster"
+#~ msgstr "Zobrazit _Seznam"
+
+#~ msgid "MUC server"
+#~ msgstr "MUC server"
+
+#~ msgid "Room Configuration"
+#~ msgstr "Nastavení místnosti"
+
+#~ msgid "Join _Group Chat"
+#~ msgstr "Vstoupit do _Diskuze"
+
+#~ msgid "Toggle audio session"
+#~ msgstr "Přepnout audio"
+
+#, fuzzy
+#~ msgid "Audio sessions are not available"
+#~ msgstr "Spojení není dostupné"
+
+#~ msgid "Conference"
+#~ msgstr "Diskuze"
+
+#, fuzzy
+#~ msgid "_Manage Bookmarks…"
+#~ msgstr "Spravovat záložky"
+
+#, fuzzy
+#~ msgid "Hide _Roster"
+#~ msgstr "v _rosteru"
+
+#~ msgid "Show _Roster"
+#~ msgstr "Zobrazit _Seznam"
+
+#, fuzzy
+#~ msgid "Invalid Room"
+#~ msgstr "Neplatná místnost"
+
+#~ msgid "Invalid room"
+#~ msgstr "Neplatná místnost"
+
+#~ msgid "A GTK+ Jabber client"
+#~ msgstr "GTK+ Jabber klient"
+
+#~ msgid "Changing Nickname"
+#~ msgstr "Měním přezdívku"
+
+#~ msgid "Please specify the new nickname you want to use:"
+#~ msgstr "Prosím zadejte novou přezdívku, kterou chcete používat:"
+
+#~ msgid "Bookmark already set"
+#~ msgstr "Záložka je už nastavena"
+
+#, fuzzy
+#~ msgid "Group Chat '%s' is already in your bookmarks."
+#~ msgstr "Diskuze \"%s\" už je ve Vašich záložkách."
+
+#~ msgid "Bookmark has been added successfully"
+#~ msgstr "Záložka byla úspěšně přidána"
+
+#, fuzzy
+#~ msgid ""
+#~ "You can manage your bookmarks by clicking the Bookmarks menu item in your "
+#~ "contact list."
+#~ msgstr "Můžete spravovat Vaše záložky přes menu Akce ve vašem Seznamu."
+
+#, fuzzy
+#~ msgid "The nickname contains invalid characters."
+#~ msgstr "Jabber ID diskuze obsahuje nepřijatelné znaky."
+
+#, fuzzy
+#~ msgid "Bookmark Room"
+#~ msgstr "Přidat tuto místnost do záložek"
+
+#~ msgid "_Join New Group Chat"
+#~ msgstr "_Připojit se do diskuze"
+
+#, fuzzy
+#~ msgid "_Create Group Chat"
+#~ msgstr "Opustit diskuzi"
+
+#~ msgid "Name:"
+#~ msgstr "Jméno:"
+
+#, fuzzy
+#~ msgid "Description:"
+#~ msgstr "Popis:"
+
+#, fuzzy
+#~ msgid "Address:"
+#~ msgstr "_Adresa:"
+
+#, fuzzy
+#~ msgid "You can not start a new conversation unless you are connected."
+#~ msgstr "Nemůžete vstoupit do diskuze pokud nejste připojen(a)."
+
+#, fuzzy
+#~ msgid "Occupants"
+#~ msgstr "_Akce účastníků"
+
+#, fuzzy
+#~ msgid "File transfer error"
+#~ msgstr "Chyba přenosu souboru"
+
+#, fuzzy
+#~ msgid "No Accounts available"
+#~ msgstr "Žádný účet není dostupný"
+
+#~ msgid "_Modify Account..."
+#~ msgstr "Upravit úč_et..."
+
+#~ msgid "Boolean"
+#~ msgstr "Boolean"
+
+#~ msgid "Integer"
+#~ msgstr "Číslo"
+
+#~ msgid "Text"
+#~ msgstr "Text"
+
+#~ msgid "Value"
+#~ msgstr "Hodnota"
+
+#~ msgid "Type"
+#~ msgstr "Typ"
+
+#~ msgid "(None)"
+#~ msgstr "(Žádný)"
+
+#~ msgid "Hidden"
+#~ msgstr "Skryté"
+
+#~ msgid "Manage Proxy Profiles"
+#~ msgstr "Spravovat profily Proxy"
+
+#, fuzzy
+#~ msgid "Properties"
+#~ msgstr "<b>Vlastnosti</b>"
+
+#, fuzzy
+#~ msgid "Proxy _Host"
+#~ msgstr "P_očítač Proxy:"
+
+#, fuzzy
+#~ msgid "Proxy _Port"
+#~ msgstr "_Port Proxy:"
+
+#, fuzzy
+#~ msgid "New Groupchat"
+#~ msgstr "Nová diskuze"
+
+#, fuzzy
+#~ msgid "New Contact"
+#~ msgstr "Přidat nový kontakt"
+
 #~ msgid "%s GiB"
 #~ msgstr "%s GiB"
 
@@ -11210,9 +12045,6 @@ msgstr "Registrace selhala"
 #~ msgid "_Pause"
 #~ msgstr "_Pauza"
 
-#~ msgid "Clean _up"
-#~ msgstr "_Vymazat"
-
 #~ msgid "Remove file transfer from the list."
 #~ msgstr "Odstranit přenos souboru ze výpisu."
 
@@ -11658,9 +12490,6 @@ msgstr "Registrace selhala"
 #~ msgid "You are invited to a groupchat"
 #~ msgstr "Jste pozván do diskuze"
 
-#~ msgid "Do you want to accept the invitation?"
-#~ msgstr "Chcete přijmout pozvání?"
-
 #~ msgid "_Start Chat"
 #~ msgstr "_Začít rozhovor"
 
@@ -11875,10 +12704,6 @@ msgstr "Registrace selhala"
 #~ msgid "Nick"
 #~ msgstr "Přezdívka"
 
-#, fuzzy
-#~ msgid "Banning…"
-#~ msgstr "Zakazuji..."
-
 #~ msgid ""
 #~ "<b>Whom do you want to ban?</b>\n"
 #~ "\n"
@@ -11954,12 +12779,6 @@ msgstr "Registrace selhala"
 #~ msgid "Filter:"
 #~ msgstr "Filtr:"
 
-#~ msgid ""
-#~ "If checked, Gajim will display the mood of contacts in the roster window"
-#~ msgstr ""
-#~ "Pokud zaškrtnuto, Gajim bude zobrazovat avatary kontaktů v okně Seznamu a "
-#~ "v diskuzích"
-
 #~ msgid "<b>Chat Appearance</b>"
 #~ msgstr "<b>Vzhled diskuze</b>"
 
@@ -12228,10 +13047,6 @@ msgstr "Registrace selhala"
 #~ msgstr "_Stav:"
 
 #, fuzzy
-#~ msgid "Group chat highlight"
-#~ msgstr "Zvýraznění zprávy v diskuzi"
-
-#, fuzzy
 #~ msgid "Your nickname"
 #~ msgstr "Vaše přezdívka:"
 
@@ -12374,9 +13189,6 @@ msgstr "Registrace selhala"
 #~ msgid "The passwords typed in both fields must be identical."
 #~ msgstr "Hesla zadaná v obou políčkách musí být identická."
 
-#~ msgid "Enter new password:"
-#~ msgstr "Zadejte heslo:"
-
 #~ msgid "Enter it again for confirmation:"
 #~ msgstr "Zadejte znovu pro ověření:"
 
@@ -12390,10 +13202,6 @@ msgstr "Registrace selhala"
 #~ msgid "unsubscribe request from %s"
 #~ msgstr "Žádost o zrušení autorizace od %s"
 
-#, fuzzy
-#~ msgid "Autojoin"
-#~ msgstr "Automaticky vstoupit"
-
 #~ msgid "Homepage:"
 #~ msgstr "Dom. stránka:"
 
@@ -12506,9 +13314,6 @@ msgstr "Registrace selhala"
 #~ msgid "Forward unread message then disconnect"
 #~ msgstr "Přeposlat nepřečtené zprávy"
 
-#~ msgid "AIM Address:"
-#~ msgstr "AIM adresa:"
-
 #~ msgid "MSN Address:"
 #~ msgstr "MSN adresa:"
 
@@ -12558,10 +13363,6 @@ msgstr "Registrace selhala"
 #~ msgid "Session negotiation cancelled"
 #~ msgstr "Sezení bylo zrušeno"
 
-#, fuzzy
-#~ msgid "This session WILL NOT be archived on server"
-#~ msgstr "Sezení NEBUDE logováno"
-
 #~ msgid "This session is encrypted"
 #~ msgstr "Toto sezení je šifrované"
 
@@ -12874,9 +13675,6 @@ msgstr "Registrace selhala"
 #~ msgid "Server:"
 #~ msgstr "Server:"
 
-#~ msgid "Password:"
-#~ msgstr "Heslo:"
-
 #, fuzzy
 #~ msgid "Join this room _automatically when I connect"
 #~ msgstr "Připoj se do této místnosti automaticky po připojení"
@@ -13219,9 +14017,6 @@ msgstr "Registrace selhala"
 #~ msgid "_Edit Personal Information..."
 #~ msgstr "_Upravit osobní informace..."
 
-#~ msgid "Information about you, as stored in the server"
-#~ msgstr "Informace o Vás, jak jsou uloženy na serveru"
-
 #~ msgid "<b>Personal Information</b>"
 #~ msgstr "<b>Osobní údaje</b>"
 
@@ -13296,9 +14091,6 @@ msgstr "Registrace selhala"
 #~ msgid "Your server can't save your personal information."
 #~ msgstr "Váš server neumí uložit Vaše osobní informace."
 
-#~ msgid "Account Local already exists."
-#~ msgstr "Účet Local už existuje."
-
 #~ msgid "Please rename or remove it before enabling link-local messaging."
 #~ msgstr "Prosím přejmenujte nebo odstraňte před povolením lokálních zpráv."
 
@@ -13393,10 +14185,6 @@ msgstr "Registrace selhala"
 #~ msgid "The following message was NOT encrypted"
 #~ msgstr "Následující zpráva NEBYLA šifrovaná"
 
-#, fuzzy
-#~ msgid "Encryption used for this contact."
-#~ msgstr "Povolit ESessions šifrování pro tento účet."
-
 #~ msgid "Toggle Open_PGP Encryption"
 #~ msgstr "Přepnout Open_PGP šifrování"
 
@@ -13475,10 +14263,6 @@ msgstr "Registrace selhala"
 #~ msgid "Contact's identity verified"
 #~ msgstr "Identita kontaktu ověřena"
 
-#, fuzzy
-#~ msgid "Verify again…"
-#~ msgstr "Ověřit znovu"
-
 #~ msgid ""
 #~ "To be certain that <b>only</b> the expected person can read your messages "
 #~ "or send you messages, you need to verify their identity by clicking the "
@@ -13603,9 +14387,6 @@ msgstr "Registrace selhala"
 #~ msgid "Add _Contact..."
 #~ msgstr "Přid_at Kontakt..."
 
-#~ msgid "_Accounts"
-#~ msgstr "Úč_ty"
-
 #~ msgid "Profile, A_vatar"
 #~ msgstr "Profil, A_vatar"
 
@@ -13867,12 +14648,6 @@ msgstr "Registrace selhala"
 #~ msgid "Activity: "
 #~ msgstr "Činnost:"
 
-#~ msgid "Join _Group Chat..."
-#~ msgstr "Vstoupit do _Diskuze"
-
-#~ msgid "_Modify Account"
-#~ msgstr "Upravit účet"
-
 #~ msgid "Check on startup if Gajim is the _default Jabber client"
 #~ msgstr "Vždy při startu zkontroluj, zda je Gajim _výchozí Jabber klient"
 
@@ -14495,9 +15270,6 @@ msgstr "Registrace selhala"
 #~ msgid "[This message is encrypted]"
 #~ msgstr "[Tato zpráva je zašifrovaná]"
 
-#~ msgid "Trayicon"
-#~ msgstr "Tray ikona"
-
 #~ msgid "A icon in systemtray reflecting the current presence."
 #~ msgstr "Ikona v systémové liště zobrazující aktuální stav."
 
@@ -14533,9 +15305,6 @@ msgstr "Registrace selhala"
 #~ msgid "Nickname not found: %s"
 #~ msgstr "Přezdívka nenalezena: %s"
 
-#~ msgid "This group chat has no subject"
-#~ msgstr "Místnost nemá žádné téma"
-
 #~ msgid ""
 #~ "Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
 #~ "nickname of an occupant may be substituted, but not if it contains \"@\". "
diff --git a/po/da.po b/po/da.po
index 30d0c8d9c..4c01f3b4b 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: 2019-07-02 02:06+0000\n"
+"POT-Creation-Date: 2019-08-11 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,73 @@ 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:550
+#: gajim/chat_control_base.py:557
 msgid "_Undo"
 msgstr ""
 
-#: gajim/chat_control_base.py:558 gajim/conversation_textview.py:529
+#: gajim/chat_control_base.py:565 gajim/conversation_textview.py:529
 msgid "_Clear"
 msgstr ""
 
-#: gajim/chat_control_base.py:563
+#: gajim/chat_control_base.py:570
 msgid "Paste as quote"
 msgstr ""
 
-#: gajim/chat_control_base.py:613
+#: gajim/chat_control_base.py:620
 #, fuzzy
 msgid "Paste Image"
 msgstr "Vælg Billede"
 
-#: gajim/chat_control_base.py:614
+#: gajim/chat_control_base.py:621
 #, fuzzy
 msgid "You are trying to paste an image"
 msgstr "Du er ved at lukke flere faneblade"
 
-#: gajim/chat_control_base.py:615
+#: gajim/chat_control_base.py:622
 #, fuzzy
 msgid ""
 "Are you sure you want to paste your clipboard's image into the chat window?"
 msgstr "Er du sikker på du vil forlade gruppe samtalen \"%s\"?"
 
-#: gajim/chat_control_base.py:617 gajim/groupchat_control.py:2310
-#: gajim/roster_window.py:2848 gajim/roster_window.py:4167
-#: gajim/message_window.py:252 gajim/gtk/dialogs.py:418
+#: gajim/chat_control_base.py:624 gajim/groupchat_control.py:2218
+#: gajim/roster_window.py:2841 gajim/roster_window.py:4118
+#: gajim/message_window.py:359 gajim/gtk/dialogs.py:330
 #, fuzzy
 msgid "_Do not ask me again"
 msgstr "Ikke spørg mig ige_n"
 
-#: gajim/chat_control_base.py:620
+#: gajim/chat_control_base.py:627
 msgid "_Paste"
 msgstr ""
 
-#: gajim/chat_control_base.py:1162 gajim/gtk/accounts.py:351
+#: gajim/chat_control_base.py:1169 gajim/gtk/accounts.py:354
 #, fuzzy
 msgid "Privacy"
 msgstr "Privatlivs Liste"
 
-#: gajim/chat_control_base.py:1163
+#: gajim/chat_control_base.py:1170
 #, fuzzy
 msgid "Warning"
 msgstr "Udeluk %s"
 
-#: gajim/chat_control_base.py:1164
+#: gajim/chat_control_base.py:1171
 #, fuzzy, python-format
 msgid "If you send a file to <b>%s</b>, your real JID will be revealed."
 msgstr ""
 "Hvis du sender en fil til %s, vil han eller hun få at vide dit rigtige "
 "Jabber ID."
 
-#: gajim/chat_control_base.py:1169
+#: gajim/chat_control_base.py:1176
 #, fuzzy
 msgid "Continue"
 msgstr "_Fortsæt"
 
-#: gajim/gtkgui_helpers.py:163 gajim/gtk/filetransfer.py:393
+#: gajim/gtkgui_helpers.py:163 gajim/gtk/filetransfer.py:398
 #, fuzzy, python-format
 msgid "Cannot overwrite existing file '%s'"
 msgstr "Kan ikke overskrive den eksisterende fil \"%s\""
 
-#: gajim/gtkgui_helpers.py:164 gajim/gtk/filetransfer.py:394
+#: gajim/gtkgui_helpers.py:164 gajim/gtk/filetransfer.py:399
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
@@ -179,388 +179,398 @@ msgstr "Der er ikke nogen ventende abbonerings forespørgsler."
 msgid " resource with priority "
 msgstr " ressource med prioritet "
 
-#: gajim/gui_menu_builder.py:96
-msgid "_New Group Chat"
-msgstr "_Ny Gruppe Samtale"
-
-#: gajim/gui_menu_builder.py:289 gajim/gui_menu_builder.py:380
-#: gajim/chat_control.py:303 gajim/roster_window.py:786
-#: gajim/roster_window.py:1719 gajim/roster_window.py:1721
-#: gajim/roster_window.py:2030 gajim/roster_window.py:3336
-#: gajim/roster_window.py:3369 gajim/gui_interface.py:413
-#: gajim/common/contacts.py:206 gajim/common/contacts.py:343
-#: gajim/common/helpers.py:83 gajim/common/helpers.py:311
-#: gajim/gtk/add_contact.py:319 gajim/gtk/subscription_request.py:70
-#: gajim/gtk/subscription_request.py:99 gajim/gtk/roster_item_exchange.py:112
-msgid "Not in Roster"
-msgstr "Ikke i Kontaktvinduet"
+#: gajim/gui_menu_builder.py:251 gajim/gui_menu_builder.py:342
+#: gajim/chat_control.py:305 gajim/roster_window.py:783
+#: gajim/roster_window.py:1716 gajim/roster_window.py:1718
+#: gajim/roster_window.py:2027 gajim/roster_window.py:3292
+#: gajim/roster_window.py:3325 gajim/gui_interface.py:396
+#: gajim/common/contacts.py:222 gajim/common/contacts.py:359
+#: gajim/common/contacts.py:471 gajim/common/helpers.py:86
+#: gajim/common/helpers.py:317 gajim/gtk/add_contact.py:319
+#: gajim/gtk/subscription_request.py:70 gajim/gtk/subscription_request.py:99
+#: gajim/gtk/roster_item_exchange.py:112
+#, fuzzy
+msgid "Not in contact list"
+msgstr "Vis _Afkoblede Kontakter"
 
-#: gajim/gui_menu_builder.py:393
-msgid "I would like to add you to my roster"
-msgstr "Jeg vil gerne tilføje dig til mit kontaktvindue"
+#: gajim/gui_menu_builder.py:355
+#, 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:471
+#: gajim/gui_menu_builder.py:433
 #, fuzzy
 msgid "Send Single _Message…"
 msgstr "Send en Enkel _Besked"
 
-#: gajim/gui_menu_builder.py:486
+#: gajim/gui_menu_builder.py:448
 #, fuzzy
 msgid "E_xecute Command…"
 msgstr "_Kør Kommando"
 
-#: gajim/gui_menu_builder.py:494
+#: gajim/gui_menu_builder.py:456
 msgid "_Manage Transport"
 msgstr "Hå_ndter Transport"
 
-#: gajim/gui_menu_builder.py:500
+#: gajim/gui_menu_builder.py:462
 msgid "_Modify Transport"
 msgstr "_Modificer Transport"
 
-#: gajim/gui_menu_builder.py:507 gajim/roster_window.py:5046
+#: gajim/gui_menu_builder.py:469 gajim/roster_window.py:4985
 #, fuzzy
 msgid "_Rename…"
 msgstr "_Omdøb"
 
-#: gajim/gui_menu_builder.py:518 gajim/roster_window.py:5062
-#: gajim/roster_window.py:5177 gajim/data/gui/blocked_contacts_window.ui:52
+#: gajim/gui_menu_builder.py:480 gajim/roster_window.py:5001
+#: gajim/roster_window.py:5116 gajim/data/gui/blocked_contacts_window.ui:52
 #: gajim/data/gui/gc_occupants_menu.ui:148
 #: gajim/data/gui/contact_context_menu.ui:143
 msgid "_Unblock"
 msgstr "_Fjern blokering"
 
-#: gajim/gui_menu_builder.py:521 gajim/roster_window.py:5067
-#: gajim/roster_window.py:5181 gajim/data/gui/gc_occupants_menu.ui:140
+#: gajim/gui_menu_builder.py:483 gajim/roster_window.py:5006
+#: gajim/roster_window.py:5120 gajim/data/gui/gc_occupants_menu.ui:140
 #: gajim/data/gui/contact_context_menu.ui:151
 msgid "_Block"
 msgstr "_Bloker"
 
-#: gajim/gui_menu_builder.py:529 gajim/roster_window.py:5074
+#: gajim/gui_menu_builder.py:491 gajim/roster_window.py:5013
 #: gajim/data/gui/contact_context_menu.ui:181
 msgid "Remo_ve"
 msgstr "_Fjern"
 
-#: gajim/gui_menu_builder.py:539 gajim/data/gui/contact_context_menu.ui:198
+#: gajim/gui_menu_builder.py:501 gajim/data/gui/contact_context_menu.ui:198
 msgid "_Information"
 msgstr "_Information"
 
-#: gajim/gui_menu_builder.py:552
+#: gajim/gui_menu_builder.py:514
 #, fuzzy
 msgid "Save _As"
 msgstr "Har"
 
-#: gajim/gui_menu_builder.py:564 gajim/groupchat_control.py:501
-#: gajim/chat_control.py:340
+#: gajim/gui_menu_builder.py:526 gajim/groupchat_control.py:507
+#: gajim/chat_control.py:342
 #, fuzzy
 msgid "Send File…"
 msgstr "Send _Fil"
 
-#: gajim/gui_menu_builder.py:565
+#: gajim/gui_menu_builder.py:527
 #, fuzzy
 msgid "Upload File…"
 msgstr "Gem Fil som..."
 
-#: gajim/gui_menu_builder.py:566
+#: gajim/gui_menu_builder.py:528
 #, fuzzy
 msgid "Send File Directly…"
 msgstr "Gem Fil som..."
 
-#: gajim/gui_menu_builder.py:568 gajim/gui_menu_builder.py:632
+#: gajim/gui_menu_builder.py:530 gajim/gui_menu_builder.py:596
 #, fuzzy
 msgid "Send Chatstate"
 msgstr "Sidste status: %s"
 
-#: gajim/gui_menu_builder.py:569
+#: gajim/gui_menu_builder.py:531
 #, fuzzy
 msgid "Invite Contacts"
 msgstr "Inviter _Kontakter"
 
-#: gajim/gui_menu_builder.py:570
+#: gajim/gui_menu_builder.py:532
 #, fuzzy
-msgid "Add to Roster"
-msgstr "_Tilføj til Kontaktliste"
+msgid "Add to Contact List"
+msgstr "_Tilføj Kontakt..."
 
-#: gajim/gui_menu_builder.py:571
-msgid "Audio Session"
-msgstr ""
+#: gajim/gui_menu_builder.py:533
+#, fuzzy
+msgid "Voice Chat"
+msgstr "Filoverførsel Forespørgsel"
 
-#: gajim/gui_menu_builder.py:572
-msgid "Video Session"
-msgstr ""
+#: gajim/gui_menu_builder.py:534
+#, fuzzy
+msgid "Video Chat"
+msgstr "Lyd / Billede"
 
-#: gajim/gui_menu_builder.py:573
+#: gajim/gui_menu_builder.py:535 gajim/gui_menu_builder.py:582
 #, fuzzy
 msgid "Information"
 msgstr "_Information"
 
-#: gajim/gui_menu_builder.py:574 gajim/gui_menu_builder.py:639
+#: gajim/gui_menu_builder.py:536 gajim/gui_menu_builder.py:602
 #: gajim/data/gui/application_menu.ui:37
 #, fuzzy
 msgid "History"
 msgstr "_Historie"
 
-#: gajim/gui_menu_builder.py:580 gajim/gui_menu_builder.py:687
+#: gajim/gui_menu_builder.py:542 gajim/gui_menu_builder.py:650
 #: gajim/data/gui/preferences_window.ui:1823
 msgid "Disabled"
 msgstr "Ikke aktiveret"
 
-#: gajim/gui_menu_builder.py:581 gajim/gui_menu_builder.py:688
+#: gajim/gui_menu_builder.py:543 gajim/gui_menu_builder.py:651
 #, fuzzy
 msgid "Composing only"
 msgstr "Komponere"
 
-#: gajim/gui_menu_builder.py:582 gajim/gui_menu_builder.py:689
+#: gajim/gui_menu_builder.py:544 gajim/gui_menu_builder.py:652
 #, fuzzy
 msgid "All chat states"
 msgstr "Status For Alle"
 
-#: gajim/gui_menu_builder.py:620
+#: gajim/gui_menu_builder.py:583
 #, fuzzy
-msgid "Manage Room"
-msgstr "Håndter Ru_m"
+msgid "Manage Group Chat"
+msgstr "Forlad Gruppesamtaler"
 
-#: gajim/gui_menu_builder.py:621
+#: gajim/gui_menu_builder.py:584 gajim/data/gui/groupchat_control.ui:649
 #, fuzzy
 msgid "Change Subject"
 msgstr "Ændre _Emne..."
 
-#: gajim/gui_menu_builder.py:622
+#: gajim/gui_menu_builder.py:585
 #, fuzzy
-msgid "Configure Room"
-msgstr "Tilpas _Rum..."
+msgid "Configure Group Chat"
+msgstr "Forlad Gruppesamtaler"
 
-#: gajim/gui_menu_builder.py:623
+#: gajim/gui_menu_builder.py:586
 #, fuzzy
 msgid "Upload Avatar…"
 msgstr "Vælg Billede"
 
-#: gajim/gui_menu_builder.py:624
+#: gajim/gui_menu_builder.py:587
 #, fuzzy
-msgid "Destroy Room"
-msgstr "_Slet rum"
+msgid "Destroy Group Chat"
+msgstr "Ny Gruppe Samtale"
 
-#: gajim/gui_menu_builder.py:626 gajim/data/gui/preferences_window.ui:790
+#: gajim/gui_menu_builder.py:589 gajim/data/gui/preferences_window.ui:790
 #, fuzzy
 msgid "Chat Settings"
 msgstr "Tilslutning fejlede"
 
-#: gajim/gui_menu_builder.py:627
+#: gajim/gui_menu_builder.py:590
 msgid "Show join/leave"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:628
+#: gajim/gui_menu_builder.py:591
 #, fuzzy
 msgid "Show status changes"
 msgstr "_Log status ændringer hos kontakter"
 
-#: gajim/gui_menu_builder.py:629 gajim/data/gui/gc_control_popup_menu.ui:72
+#: gajim/gui_menu_builder.py:592 gajim/data/gui/gc_control_popup_menu.ui:72
 #, fuzzy
 msgid "Notify on all messages"
 msgstr "Forvalgte beskeder:"
 
-#: gajim/gui_menu_builder.py:630
+#: gajim/gui_menu_builder.py:593
 #, fuzzy
 msgid "Minimize on close"
 msgstr "_Minimer ved lukning"
 
-#: gajim/gui_menu_builder.py:631
+#: gajim/gui_menu_builder.py:595
 #, fuzzy
-msgid "Minimize on autojoin"
+msgid "Minimize when joining automatically"
 msgstr "Minimer ved Automatisk Deltagelse"
 
-#: gajim/gui_menu_builder.py:634
+#: gajim/gui_menu_builder.py:598
 msgid "Sync Threshold"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:635
+#: gajim/gui_menu_builder.py:599
 #, fuzzy
-msgid "Change Nick"
+msgid "Change Nickname"
 msgstr "Ændre _Kælenavn..."
 
-#: gajim/gui_menu_builder.py:636
-#, fuzzy
-msgid "Bookmark Room"
-msgstr "Bogmærk dette rom"
-
-#: gajim/gui_menu_builder.py:637
+#: gajim/gui_menu_builder.py:600
 #, fuzzy
 msgid "Request Voice"
 msgstr "_Stemme"
 
-#: gajim/gui_menu_builder.py:638 gajim/roster_window.py:5246
+#: gajim/gui_menu_builder.py:601 gajim/roster_window.py:5185
 #, fuzzy
 msgid "Execute command"
 msgstr "_Kør Kommando"
 
-#: gajim/gui_menu_builder.py:640
-#, fuzzy
-msgid "Disconnect"
-msgstr "Afbry_d tilslutningen"
+#: gajim/gui_menu_builder.py:603
+msgid "Leave"
+msgstr ""
 
-#: gajim/gui_menu_builder.py:678 gajim/gtk/preferences.py:156
+#: gajim/gui_menu_builder.py:641 gajim/gtk/preferences.py:155
 msgid "No threshold"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:680 gajim/gtk/preferences.py:158
+#: gajim/gui_menu_builder.py:643 gajim/gtk/preferences.py:157
 #, 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:709 gajim/gui_menu_builder.py:747
-#: gajim/gtk/join_groupchat.py:43
-msgid "Join Group Chat"
-msgstr "Bliv med i en Gruppe Samtale"
-
-#: gajim/gui_menu_builder.py:746
+#: gajim/gui_menu_builder.py:672
 #, fuzzy
 msgid "Add Contact…"
 msgstr "_Tilføj Kontakt..."
 
-#: gajim/gui_menu_builder.py:748 gajim/gtk/profile.py:52
-#: gajim/gtk/accounts.py:770 gajim/gtk/accounts.py:808
+#: gajim/gui_menu_builder.py:673 gajim/gtk/profile.py:52
+#: gajim/gtk/accounts.py:773 gajim/gtk/accounts.py:811
 #, fuzzy
 msgid "Profile"
 msgstr "fil"
 
-#: gajim/gui_menu_builder.py:749
+#: gajim/gui_menu_builder.py:674
+#, fuzzy
+msgid "Send Single Message…"
+msgstr "Send en Enkel _Besked"
+
+#: gajim/gui_menu_builder.py:675
 #, fuzzy
 msgid "Discover Services"
 msgstr "Op_dag Tjenester"
 
-#: gajim/gui_menu_builder.py:750
+#: gajim/gui_menu_builder.py:676 gajim/gtk/server_info.py:36
 #, fuzzy
-msgid "Send Single Message…"
-msgstr "Send en Enkel _Besked"
+msgid "Server Info"
+msgstr "Server"
 
-#: gajim/gui_menu_builder.py:751 gajim/data/gui/preferences_window.ui:2741
+#: gajim/gui_menu_builder.py:677 gajim/data/gui/preferences_window.ui:2741
 msgid "Advanced"
 msgstr "Avanceret"
 
-#: gajim/gui_menu_builder.py:752 gajim/gtk/mam_preferences.py:88
+#: gajim/gui_menu_builder.py:678 gajim/gtk/mam_preferences.py:88
 #, fuzzy
 msgid "Archiving Preferences"
 msgstr "_Indstillinger"
 
-#: gajim/gui_menu_builder.py:753
+#: gajim/gui_menu_builder.py:679
 #, fuzzy
 msgid "Blocking List"
 msgstr "Liste over bandlyste"
 
-#: gajim/gui_menu_builder.py:754 gajim/gtk/history_sync.py:108
+#: gajim/gui_menu_builder.py:680
+#, fuzzy
+msgid "Bookmarks"
+msgstr "_Bogmærke"
+
+#: gajim/gui_menu_builder.py:681
+#, fuzzy
+msgid "PEP Configuration"
+msgstr "Rum Konfigurering"
+
+#: gajim/gui_menu_builder.py:682 gajim/gtk/history_sync.py:108
 #: gajim/gtk/history_sync.py:186
 #, fuzzy
 msgid "Synchronise History"
 msgstr "Synkroniser"
 
-#: gajim/gui_menu_builder.py:755 gajim/gtk/privacy_list.py:427
+#: gajim/gui_menu_builder.py:683 gajim/gtk/privacy_list.py:427
 msgid "Privacy Lists"
 msgstr "Privatlivs lister"
 
-#: gajim/gui_menu_builder.py:756 gajim/gtk/server_info.py:36
-#, fuzzy
-msgid "Server Info"
-msgstr "Server"
-
-#: gajim/gui_menu_builder.py:757 gajim/gui_menu_builder.py:768
+#: gajim/gui_menu_builder.py:685 gajim/gui_menu_builder.py:696
 #: gajim/data/gui/xml_console_window.ui:77
 msgid "XML Console"
 msgstr "XML Konsol"
 
-#: gajim/gui_menu_builder.py:759 gajim/data/gui/groupchat_config.ui:36
+#: gajim/gui_menu_builder.py:687 gajim/data/gui/groupchat_config.ui:36
 #, fuzzy
 msgid "Admin"
 msgstr "_Administrator"
 
-#: gajim/gui_menu_builder.py:760
+#: gajim/gui_menu_builder.py:688
 #, fuzzy
 msgid "Send Server Message…"
 msgstr "_Send Server Besked..."
 
-#: gajim/gui_menu_builder.py:761
+#: gajim/gui_menu_builder.py:689
 #, fuzzy
 msgid "Set MOTD…"
 msgstr "Sæt MOTD..."
 
-#: gajim/gui_menu_builder.py:762
+#: gajim/gui_menu_builder.py:690
 #, fuzzy
 msgid "Update MOTD…"
 msgstr "Opdater MOTD..."
 
-#: gajim/gui_menu_builder.py:763
+#: gajim/gui_menu_builder.py:691
 #, fuzzy
 msgid "Delete MOTD…"
 msgstr "Slet MOTD"
 
-#: gajim/gui_menu_builder.py:812
+#: gajim/gui_menu_builder.py:736
 #, fuzzy
-msgid "No Accounts available"
-msgstr "Ingen konto tilgængelig"
+msgid "_Add Account…"
+msgstr "_Tilføj Kontakt..."
+
+#: gajim/gui_menu_builder.py:742
+#, fuzzy
+msgid "_Modify Accounts…"
+msgstr "_Ændre Konto"
 
-#: gajim/gui_menu_builder.py:823 gajim/data/gui/application_menu.ui:5
-#: gajim/data/gui/application_menu.ui:71 gajim/data/gui/shortcuts_window.ui:182
-#: gajim/gtk/accounts.py:58
+#: gajim/gui_menu_builder.py:751 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:755 gajim/data/gui/application_menu.ui:5
+#: gajim/data/gui/shortcuts_window.ui:182 gajim/gtk/accounts.py:57
 msgid "Accounts"
 msgstr "Konti"
 
-#: gajim/gui_menu_builder.py:881 gajim/gui_menu_builder.py:886
+#: gajim/gui_menu_builder.py:784 gajim/gui_menu_builder.py:789
 #, fuzzy
-msgid "Copy JID"
-msgstr "Rum JID"
+msgid "Copy XMPP Address"
+msgstr "_Kopier JID/E-post Adresse"
 
-#: gajim/gui_menu_builder.py:882 gajim/gui_menu_builder.py:914
+#: gajim/gui_menu_builder.py:785 gajim/gui_menu_builder.py:817
 #, fuzzy
 msgid "Join Groupchat"
 msgstr "Bliv med i en Gruppe Samtale"
 
-#: gajim/gui_menu_builder.py:887 gajim/gui_menu_builder.py:913
-#: gajim/data/gui/application_menu.ui:76
+#: gajim/gui_menu_builder.py:790 gajim/gui_menu_builder.py:816
+#: gajim/data/gui/application_menu.ui:71
 #: gajim/data/gui/subscription_request_window.ui:106
 msgid "Start Chat"
 msgstr "Start Samtale"
 
-#: gajim/gui_menu_builder.py:888 gajim/gui_menu_builder.py:915
+#: gajim/gui_menu_builder.py:791 gajim/gui_menu_builder.py:818
 #, fuzzy
-msgid "Add to Roster…"
-msgstr "_Tilføj til Kontaktliste"
+msgid "Add to Contact List…"
+msgstr "_Tilføj Kontakt..."
 
-#: gajim/gui_menu_builder.py:893
+#: gajim/gui_menu_builder.py:796
 #, fuzzy
 msgid "Copy Link Location"
 msgstr "_Kopier Henvisning"
 
-#: gajim/gui_menu_builder.py:894
+#: gajim/gui_menu_builder.py:797
 #, fuzzy
 msgid "Open Link in Browser"
 msgstr "_Åbn Henvisning i Netlæser"
 
-#: gajim/gui_menu_builder.py:899
+#: gajim/gui_menu_builder.py:802
 #, fuzzy
 msgid "Copy Email Address"
 msgstr "_Kopier JID/E-post Adresse"
 
-#: gajim/gui_menu_builder.py:900 gajim/gui_menu_builder.py:912
+#: gajim/gui_menu_builder.py:803 gajim/gui_menu_builder.py:815
 #, fuzzy
 msgid "Open Email Composer"
 msgstr "_Åbn E-post Program"
 
-#: gajim/gui_menu_builder.py:905
+#: gajim/gui_menu_builder.py:808
 #, fuzzy
 msgid "Copy Location"
 msgstr "_Kopier Henvisning"
 
-#: gajim/gui_menu_builder.py:906
+#: gajim/gui_menu_builder.py:809
 #, fuzzy
 msgid "Show Location"
 msgstr "Påmindelse"
 
-#: gajim/gui_menu_builder.py:911
+#: gajim/gui_menu_builder.py:814
 #, fuzzy
-msgid "Copy JID/Email"
+msgid "Copy XMPP Address/Email"
 msgstr "_Kopier JID/E-post Adresse"
 
-#: gajim/gui_menu_builder.py:945
+#: gajim/gui_menu_builder.py:852
 #, fuzzy
 msgid "Copy"
 msgstr "Rum JID"
@@ -583,44 +593,56 @@ msgstr ""
 msgid "Choose folder for logfile"
 msgstr ""
 
-#: gajim/history_manager.py:107
+#: gajim/history_manager.py:106
 msgid "Cannot find history logs database"
 msgstr "Kan ikke finde historik log databasen"
 
-#: gajim/history_manager.py:108
+#: gajim/history_manager.py:107
 #, fuzzy, python-format
 msgid "%s does not exist."
 msgstr "Filen eksisterer ikke"
 
-#: gajim/history_manager.py:141 gajim/history_manager.py:195
-#: gajim/gtk/discovery.py:829 gajim/gtk/roster_item_exchange.py:80
-msgid "JID"
-msgstr "JID"
+#: gajim/history_manager.py:140 gajim/history_manager.py:194
+#: 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:30
+#: gajim/gtk/accounts.py:804
+#, fuzzy
+msgid "XMPP Address"
+msgstr "AIM Adresse:"
 
-#: gajim/history_manager.py:154 gajim/history_manager.py:202
+#: gajim/history_manager.py:153 gajim/history_manager.py:201
 #: gajim/data/gui/history_window.ui:89 gajim/gtk/history.py:108
 msgid "Date"
 msgstr "Dato"
 
-#: gajim/history_manager.py:161 gajim/history_manager.py:225
+#: gajim/history_manager.py:160 gajim/history_manager.py:224
 #: gajim/data/gui/join_groupchat_window.ui:208
 #: gajim/data/gui/profile_window.ui:214
 #: gajim/data/gui/vcard_information_window.ui:443
+#: gajim/data/gui/bookmarks.ui:140
 msgid "Nickname"
 msgstr "Kælenavn"
 
-#: gajim/history_manager.py:172 gajim/history_manager.py:211
+#: gajim/history_manager.py:171 gajim/history_manager.py:210
 #: gajim/data/gui/preferences_window.ui:1344
 #: gajim/data/gui/single_message_window.ui:275 gajim/gtk/history.py:117
 msgid "Message"
 msgstr "Besked"
 
-#: gajim/history_manager.py:180 gajim/history_manager.py:218
+#: gajim/history_manager.py:179 gajim/history_manager.py:217
 #: gajim/data/gui/groups_post_window.ui:49
 #: gajim/data/gui/single_message_window.ui:214
 msgid "Subject"
 msgstr "Emne"
 
+#: gajim/history_manager.py:247
+#, fuzzy
+msgid "Database Cleanup"
+msgstr "Database Fejl"
+
 #: gajim/history_manager.py:248
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
@@ -631,11 +653,8 @@ msgstr ""
 #: gajim/history_manager.py:250
 #, fuzzy
 msgid ""
-"Normally allocated database size will not be freed, it will just become "
-"reusable. If you really want to reduce database filesize, click YES, else "
-"click NO.\n"
-"\n"
-"In case you click YES, please wait…"
+"Normally, the allocated database size will not be freed, it will just become "
+"reusable. This operation may take a while."
 msgstr ""
 "Normalt vil den allokerede database størrelse ikke blive frigjort, den vil "
 "bare kunne genbruges. Hvis du virkelig vil reducere database filstørrelsen, "
@@ -645,47 +664,47 @@ msgstr ""
 
 #: gajim/history_manager.py:255
 #, fuzzy
-msgid "Database Cleanup"
-msgstr "Database Fejl"
+msgid "_Cleanup"
+msgstr "Ryd _op"
 
-#: gajim/history_manager.py:519 gajim/gtk/filetransfer.py:238
-#: gajim/gtk/filetransfer.py:248
+#: gajim/history_manager.py:518 gajim/gtk/filetransfer.py:237
+#: gajim/gtk/filetransfer.py:247
 msgid "You"
 msgstr "Du"
 
-#: gajim/history_manager.py:531
+#: gajim/history_manager.py:530
 #, 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:568 gajim/history_manager.py:607
-#: gajim/gtk/dialogs.py:58 gajim/gtk/themes.py:319
+#: gajim/history_manager.py:567 gajim/history_manager.py:606
+#: gajim/gtk/dialogs.py:57 gajim/gtk/themes.py:319
 #: gajim/gtk/roster_item_exchange.py:75 gajim/gtk/roster_item_exchange.py:185
 msgid "Delete"
 msgstr "Slet"
 
-#: gajim/history_manager.py:569
+#: gajim/history_manager.py:568
 #, fuzzy
 msgid "Delete Conversation"
 msgid_plural "Delete Conversations"
 msgstr[0] "Annuller bekræftelse"
 msgstr[1] "Annuller bekræftelse"
 
-#: gajim/history_manager.py:570
+#: gajim/history_manager.py:569
 #, 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:608
+#: gajim/history_manager.py:607
 #, fuzzy
 msgid "Delete Message"
 msgid_plural "Delete Messages"
 msgstr[0] "Standard Besked"
 msgstr[1] "Standard Besked"
 
-#: gajim/history_manager.py:609
+#: gajim/history_manager.py:608
 #, fuzzy
 msgid "Do you want to permanently delete this message"
 msgid_plural "Do you want to permanently delete these messages"
@@ -698,15 +717,15 @@ msgid "Contact name: <i>%s</i>"
 msgstr "Kontakt navn: <i>%s</i>"
 
 #: gajim/dialogs.py:84
-#, fuzzy, python-format
-msgid "JID: <i>%s</i>"
-msgstr "Jabber ID: <i>%s</i>"
+#, python-format
+msgid "XMPP Address: <i>%s</i>"
+msgstr ""
 
-#: gajim/dialogs.py:115 gajim/dialogs.py:128 gajim/roster_window.py:2901
-#: gajim/roster_window.py:3833 gajim/roster_window.py:5084
-#: gajim/common/contacts.py:157 gajim/common/contacts.py:190
+#: gajim/dialogs.py:115 gajim/dialogs.py:128 gajim/roster_window.py:2894
+#: gajim/roster_window.py:3784 gajim/roster_window.py:5023
+#: gajim/common/contacts.py:157 gajim/common/contacts.py:206
 #: gajim/data/gui/preferences_window.ui:558
-#: gajim/data/gui/shortcuts_window.ui:177 gajim/gtk/accounts.py:349
+#: gajim/data/gui/shortcuts_window.ui:177 gajim/gtk/accounts.py:352
 msgid "General"
 msgstr "General"
 
@@ -751,7 +770,7 @@ msgstr "Overskriv Status Besked?"
 msgid "Preset 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:703
+#: gajim/dialogs.py:703 gajim/plugins/gui.py:292
 msgid "_Overwrite"
 msgstr ""
 
@@ -763,9 +782,7 @@ msgstr "Gem som Forvalgt Status Besked"
 msgid "Please type a name for this status message"
 msgstr "Skriv et navn for denne status besked"
 
-#: gajim/dialogs.py:740 gajim/gui_interface.py:1441 gajim/dialog_messages.py:31
-#: gajim/gtk/discovery.py:518 gajim/gtk/profile.py:323
-#: gajim/gtk/join_groupchat.py:234
+#: gajim/dialogs.py:740 gajim/gtk/discovery.py:517 gajim/gtk/profile.py:323
 msgid "You are not connected to the server"
 msgstr "Du er ikke tilsluttet til serveren"
 
@@ -773,9 +790,11 @@ msgstr "Du er ikke tilsluttet til serveren"
 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:752 gajim/dialogs.py:823 gajim/gtk/discovery.py:822
-#: gajim/gtk/discovery.py:1648 gajim/gtk/discovery.py:1941
-#: gajim/gtk/history.py:99 gajim/gtk/roster_item_exchange.py:83
+#: gajim/dialogs.py:752 gajim/dialogs.py:823
+#: gajim/data/gui/groupchat_info_scrolled.ui:16 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/gtk/roster_item_exchange.py:83
 msgid "Name"
 msgstr "Navn"
 
@@ -795,401 +814,348 @@ msgstr "Du kan kun synkronisere med en konto hvis du er tilsluttet."
 msgid "Synchronise"
 msgstr "Synkroniser"
 
-#: gajim/dialogs.py:1043
+#: gajim/dialogs.py:1042
 msgid "an audio and video"
 msgstr ""
 
-#: gajim/dialogs.py:1045
+#: gajim/dialogs.py:1044
 msgid "an audio"
 msgstr ""
 
-#: gajim/dialogs.py:1047
+#: gajim/dialogs.py:1046
 msgid "a video"
 msgstr ""
 
-#: gajim/dialogs.py:1051
+#: gajim/dialogs.py:1050
 #, python-format
 msgid ""
-"%(contact)s wants to start %(type)s session with you. Do you want to answer "
+"%(contact)s wants to start a %(type)s chat with you. Do you want to answer "
 "the call?"
 msgstr ""
 
-#: gajim/groupchat_control.py:505
+#: gajim/groupchat_control.py:511
 #, fuzzy, python-format
 msgid "Send File (max. %s MiB)…"
 msgstr "Gem fil som..."
 
-#: gajim/groupchat_control.py:507 gajim/chat_control.py:342
+#: gajim/groupchat_control.py:513 gajim/chat_control.py:344
 #, fuzzy
 msgid "No File Transfer available"
 msgstr "Filoverførsler"
 
-#: gajim/groupchat_control.py:630 gajim/groupchat_control.py:2349
-msgid "Changing Subject"
-msgstr "Ændre emne"
-
-#: gajim/groupchat_control.py:631 gajim/groupchat_control.py:2350
-msgid "Please specify the new subject:"
-msgstr "Anfør et nyt emne:"
-
-#: gajim/groupchat_control.py:638
-msgid "Changing Nickname"
-msgstr "Ændre kælenavn"
-
-#: gajim/groupchat_control.py:639
-msgid "Please specify the new nickname you want to use:"
-msgstr "Anfør dit nye kælenavn:"
-
-#: gajim/groupchat_control.py:657
+#: gajim/groupchat_control.py:655
 #, fuzzy
-msgid "Invalid group chat JID"
+msgid "Invalid group chat XMPP Address"
 msgstr "Ugyldig gruppe samtale Jabber ID"
 
-#: gajim/groupchat_control.py:658
+#: gajim/groupchat_control.py:656
 #, fuzzy
-msgid "The group chat JID has not allowed characters."
+msgid "The group chat XMPP Address has not allowed characters."
 msgstr "Gruppe samtale Jabber ID'en indeholder ikke tilladte tegn."
 
-#: gajim/groupchat_control.py:758 gajim/gtk/profile.py:136
+#: gajim/groupchat_control.py:743 gajim/gtk/profile.py:136
 msgid "Could not load image"
 msgstr "Kunne ikke laste billede"
 
-#: gajim/groupchat_control.py:888
+#: gajim/groupchat_control.py:873
 msgid "Insert Nickname"
 msgstr "Indsæt Kælenavn"
 
-#: gajim/groupchat_control.py:1056 gajim/chat_control.py:824
+#: gajim/groupchat_control.py:1041 gajim/chat_control.py:848
 msgid "and authenticated"
 msgstr "og godkendt"
 
-#: gajim/groupchat_control.py:1060 gajim/chat_control.py:828
+#: gajim/groupchat_control.py:1045 gajim/chat_control.py:852
 msgid "and NOT authenticated"
 msgstr "og IKKE godkendt"
 
-#: gajim/groupchat_control.py:1064
+#: gajim/groupchat_control.py:1049
 #, 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/groupchat_control.py:1111
+#: gajim/groupchat_control.py:1096
 msgid "Conversation with "
 msgstr "Samtale med "
 
-#: gajim/groupchat_control.py:1113
+#: gajim/groupchat_control.py:1098
 msgid "Continued conversation"
 msgstr "Fortsat samtale"
 
-#: gajim/groupchat_control.py:1411
+#: gajim/groupchat_control.py:1357
 #, fuzzy, python-format
 msgid "%(nick)s has set the subject to %(subject)s"
 msgstr "%(jid)s har sat emnet til %(subject)s"
 
-#: gajim/groupchat_control.py:1433
+#: gajim/groupchat_control.py:1374
 #, fuzzy
-msgid "Room now shows unavailable members"
+msgid "Group chat now shows unavailable members"
 msgstr "Rummet viser nu; ikke tilgængelige medlemmer"
 
-#: gajim/groupchat_control.py:1436
+#: gajim/groupchat_control.py:1377
 #, fuzzy
-msgid "Room now does not show unavailable members"
+msgid "Group chat now does not show unavailable members"
 msgstr "Rummet viser nu ikke; ikke tilgængelige medlemmer"
 
-#: gajim/groupchat_control.py:1439
+#: gajim/groupchat_control.py:1380
 msgid "A setting not related to privacy has been changed"
 msgstr ""
 
-#: gajim/groupchat_control.py:1446
-msgid "Room logging is now enabled"
-msgstr "Rum logging er nu aktiveret"
+#: gajim/groupchat_control.py:1387 gajim/groupchat_control.py:1659
+#, fuzzy
+msgid "Conversations are stored on the server"
+msgstr "Session VIL IKKE blive logget"
 
-#: gajim/groupchat_control.py:1449
-msgid "Room logging is now disabled"
-msgstr "Rum logging er nu deaktiveret"
+#: gajim/groupchat_control.py:1390
+#, fuzzy
+msgid "Conversations are not stored on the server"
+msgstr "Information om dig, som er gemt på serveren"
 
-#: gajim/groupchat_control.py:1452
-msgid "Room is now non-anonymous"
+#: gajim/groupchat_control.py:1393
+#, fuzzy
+msgid "Group chat is now non-anonymous"
 msgstr "Rummet er nu ikke-anonymt"
 
-#: gajim/groupchat_control.py:1456
-msgid "Room is now semi-anonymous"
+#: gajim/groupchat_control.py:1397
+#, fuzzy
+msgid "Group chat is now semi-anonymous"
 msgstr "Rummet er nu semi-anonymt"
 
-#: gajim/groupchat_control.py:1460
+#: gajim/groupchat_control.py:1401
 #, fuzzy
-msgid "Room is now fully anonymous"
+msgid "Group chat is now fully anonymous"
 msgstr "Rummet er nu helt anonymt"
 
-#: gajim/groupchat_control.py:1500
+#: gajim/groupchat_control.py:1439
 #, fuzzy, python-format
 msgid "Ping? (%s)"
 msgstr "Pong! (%s .s)"
 
-#: gajim/groupchat_control.py:1503
+#: gajim/groupchat_control.py:1442
 #, fuzzy, python-format
 msgid "Pong! (%(nick)s %(delay)s s.)"
 msgstr "Pong! (%s .s)"
 
-#: gajim/groupchat_control.py:1506 gajim/chat_control.py:1213
+#: gajim/groupchat_control.py:1445 gajim/chat_control.py:1237
 msgid "Error."
 msgstr "Fejl."
 
-#: gajim/groupchat_control.py:1711
+#: gajim/groupchat_control.py:1650
 #, fuzzy, python-format
-msgid "You (%s) joined the room"
+msgid "You (%s) joined the group chat"
 msgstr "%s deltager nu i gruppe samtalen"
 
-#: gajim/groupchat_control.py:1717
-msgid "Any occupant is allowed to see your full JID"
+#: gajim/groupchat_control.py:1655
+#, fuzzy
+msgid "Any participant is allowed to see your full XMPP Address"
 msgstr "En hvilken som helst deltager har lov til at se din fulde JID"
 
-#: gajim/groupchat_control.py:1721
-msgid "Room logging is enabled"
-msgstr "Rum logging er aktiveret"
-
-#: gajim/groupchat_control.py:1725
-msgid "The server has assigned or modified your roomnick"
+#: gajim/groupchat_control.py:1663
+#, fuzzy
+msgid "The server has assigned or modified your nickname in this group chat"
 msgstr "Serveren har fastsat eller ændret dit kælenavn for rummet"
 
-#: gajim/groupchat_control.py:1732
-msgid "A new room has been created"
+#: gajim/groupchat_control.py:1671
+#, fuzzy
+msgid "A new group chat has been created"
 msgstr "Et nyt rum er blevet oprettet"
 
-#: gajim/groupchat_control.py:1740 gajim/privatechat_control.py:112
+#: gajim/groupchat_control.py:1679 gajim/privatechat_control.py:115
 #, python-format
 msgid "You are now known as %s"
 msgstr "Du er nu kendt som %s"
 
-#: gajim/groupchat_control.py:1742 gajim/privatechat_control.py:114
+#: gajim/groupchat_control.py:1681 gajim/privatechat_control.py:117
 #, 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:1767 gajim/privatechat_control.py:141
+#: gajim/groupchat_control.py:1706 gajim/privatechat_control.py:144
 #, fuzzy, python-brace-format
 msgid "You are now {show}{status}"
 msgstr "Du er nu kendt som %s"
 
-#: gajim/groupchat_control.py:1773 gajim/privatechat_control.py:147
+#: gajim/groupchat_control.py:1712 gajim/privatechat_control.py:150
 #, fuzzy, python-brace-format
 msgid "{nick} is now {show}{status}"
 msgstr "%(nick)s er nu %(status)s"
 
-#: gajim/groupchat_control.py:1790 gajim/groupchat_control.py:1819
-#: gajim/groupchat_control.py:1849 gajim/groupchat_control.py:1909
+#: gajim/groupchat_control.py:1729 gajim/groupchat_control.py:1758
+#: gajim/groupchat_control.py:1788 gajim/groupchat_control.py:1848
 #, python-brace-format
 msgid " by {actor}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1793
+#: gajim/groupchat_control.py:1732
 #, fuzzy, python-brace-format
 msgid "** Your Affiliation has been set to {affiliation}{actor}{reason}"
 msgstr ""
 "** Tilhørsforholdet for %(nick)s er blevet sat til %(affiliation)s af "
 "%(actor)s"
 
-#: gajim/groupchat_control.py:1799
+#: gajim/groupchat_control.py:1738
 #, fuzzy, python-brace-format
 msgid "** Affiliation of {nick} has been set to {affiliation}{actor}{reason}"
 msgstr "** Tilhørsforholdet for %(nick)s er blevet sat til %(affiliation)s"
 
-#: gajim/groupchat_control.py:1822
+#: gajim/groupchat_control.py:1761
 #, fuzzy, python-brace-format
 msgid "** Your Role has been set to {role}{actor}{reason}"
 msgstr "** %(nick)s rolle er blevet sat til %(role)s af %(actor)s"
 
-#: gajim/groupchat_control.py:1827
+#: gajim/groupchat_control.py:1766
 #, fuzzy, python-brace-format
 msgid "** Role of {nick} has been set to {role}{actor}{reason}"
 msgstr "** %(nick)s rolle er blevet sat til %(role)s af %(actor)s"
 
-#: gajim/groupchat_control.py:1852
+#: gajim/groupchat_control.py:1791
 #, fuzzy, python-brace-format
-msgid "You have been removed from the room{actor}{reason}"
+msgid "You have been removed from the group chat{actor}{reason}"
 msgstr "%(nick)s er blevet fjernet fra rummet %(reason)s"
 
-#: gajim/groupchat_control.py:1857
+#: gajim/groupchat_control.py:1796
 #, python-brace-format
 msgid "You have left due to an error{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1863
+#: gajim/groupchat_control.py:1802
 #, python-brace-format
 msgid "You have been kicked{actor}{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1870
+#: gajim/groupchat_control.py:1809
 #, python-brace-format
 msgid "You have been banned{actor}{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1877 gajim/groupchat_control.py:1943
+#: gajim/groupchat_control.py:1816 gajim/groupchat_control.py:1882
 #, fuzzy
 msgid ": Affiliation changed"
 msgstr "tilknytning ændret"
 
-#: gajim/groupchat_control.py:1883 gajim/groupchat_control.py:1948
+#: gajim/groupchat_control.py:1822 gajim/groupchat_control.py:1887
 #, fuzzy
-msgid ": Room configuration changed to members-only"
+msgid ": Group chat configuration changed to members-only"
 msgstr "Rum konfiguration er blevet ændret til 'kun for medlemmer'"
 
-#: gajim/groupchat_control.py:1912
+#: gajim/groupchat_control.py:1851
 #, fuzzy, python-brace-format
-msgid "{nick} has been removed from the room{by}{reason}"
+msgid "{nick} has been removed from the group chat{by}{reason}"
 msgstr "%(nick)s er blevet fjernet fra rummet %(reason)s"
 
-#: gajim/groupchat_control.py:1922
+#: gajim/groupchat_control.py:1861
 #, python-brace-format
 msgid "{nick} has left due to an error{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1928
+#: gajim/groupchat_control.py:1867
 #, fuzzy, python-brace-format
 msgid "{nick} has been kicked{actor}{reason}"
 msgstr "%(nick)s er blevet udvist: %(reason)s"
 
-#: gajim/groupchat_control.py:1936
+#: gajim/groupchat_control.py:1875
 #, fuzzy, python-brace-format
 msgid "{nick} has been banned{actor}{reason}"
 msgstr "%(nick)s er blevet uønsket: %(reason)s"
 
-#: gajim/groupchat_control.py:1953
+#: gajim/groupchat_control.py:1892
 #, python-brace-format
 msgid "{nick} has left{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1970
+#: gajim/groupchat_control.py:1914
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s deltager nu i gruppe samtalen"
 
-#: gajim/groupchat_control.py:1985 gajim/groupchat_control.py:1990
-#: gajim/groupchat_control.py:1995 gajim/groupchat_control.py:2000
-#: gajim/groupchat_control.py:2011
-msgid "Unable to join group chat"
-msgstr "Ikke i stand til at deltage i gruppesamtale."
-
-#: gajim/groupchat_control.py:1986
-#, fuzzy, python-format
-msgid "You are banned from group chat <b>%s</b>."
-msgstr "Du er bandlyst fra gruppesamtalen %s."
-
-#: gajim/groupchat_control.py:1991
-#, fuzzy, python-format
-msgid "Remote server <b>%s</b> does not exist."
-msgstr "Gruppesamtalen %s eksisterer ikke."
-
-#: gajim/groupchat_control.py:1996
-#, fuzzy, python-format
-msgid "Group chat <b>%s</b> does not exist."
-msgstr "Gruppesamtalen %s eksisterer ikke."
-
-#: gajim/groupchat_control.py:2001
-#, fuzzy
-msgid "Group chat creation is not permitted."
-msgstr "Gruppesamtale oprettelse er begrænset."
-
-#: gajim/groupchat_control.py:2005
+#: gajim/groupchat_control.py:1981
 #, fuzzy
-msgid "Unable to join groupchat"
-msgstr "Ikke i stand til at deltage i gruppesamtale."
-
-#: gajim/groupchat_control.py:2006
-#, fuzzy, python-format
-msgid "You must use your registered nickname in <b>%s</b>."
-msgstr "Dit registrerede kælenavn skal bruges i gruppesamtalen %s."
-
-#: gajim/groupchat_control.py:2012
-#, python-format
-msgid "You are not in the members list in groupchat %s."
-msgstr "Du er ikke i medlemslisten for gruppesamtalen %s."
-
-#: gajim/groupchat_control.py:2068
-msgid "Room has been destroyed"
+msgid "Group chat has been destroyed"
 msgstr "Rummet er blevet ødelagt"
 
-#: gajim/groupchat_control.py:2073
+#: gajim/groupchat_control.py:1986
 #, fuzzy, python-format
-msgid "You can join this room instead: xmpp:%s?join"
+msgid "You can join this group chat instead: xmpp:%s?join"
 msgstr "Du kan deltage i dette rum i stedet: %s"
 
-#: gajim/groupchat_control.py:2306
+#: gajim/groupchat_control.py:2214
 #, fuzzy
 msgid "Leave Group Chat"
 msgstr "Forlad Gruppesamtaler"
 
-#: gajim/groupchat_control.py:2307
+#: gajim/groupchat_control.py:2215
 #, fuzzy
 msgid "Are you sure you want to leave this group chat?"
 msgstr "Er du sikker på du vil forlade gruppe samtalen \"%s\"?"
 
-#: gajim/groupchat_control.py:2308
+#: gajim/groupchat_control.py:2216
 #, fuzzy, python-format
-msgid "If you close this window, you will be disconnected from '%s'."
+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:2314
+#: gajim/groupchat_control.py:2222 gajim/roster_window.py:5177
 msgid "_Leave"
 msgstr ""
 
-#: gajim/groupchat_control.py:2377
+#: gajim/groupchat_control.py:2280 gajim/roster_window.py:3008
 #, fuzzy, python-format
 msgid "%(jid)s has been invited to this group chat"
 msgstr "%(nick)s er blevet fjernet fra rummet %(reason)s"
 
-#: gajim/groupchat_control.py:2527
+#: gajim/groupchat_control.py:2463
 #, python-format
 msgid "Kicking %s"
 msgstr "Sparker %s"
 
-#: gajim/groupchat_control.py:2528 gajim/groupchat_control.py:2829
+#: gajim/groupchat_control.py:2464 gajim/groupchat_control.py:2765
 msgid "You may specify a reason below:"
 msgstr "Du kan anføre en begrundelse under:"
 
-#: gajim/groupchat_control.py:2828
+#: gajim/groupchat_control.py:2764
 #, python-format
 msgid "Banning %s"
 msgstr "Udeluk %s"
 
-#: gajim/chat_control.py:408
+#: gajim/chat_control.py:432
 msgid "Show a list of formattings"
 msgstr "Hvis en liste over følelsesikoner"
 
-#: gajim/chat_control.py:412
+#: gajim/chat_control.py:436
 #, fuzzy
 msgid "This contact does not support HTML"
 msgstr "Denne kontakt understøtter ikke fil overførsler."
 
-#: gajim/chat_control.py:562
+#: gajim/chat_control.py:586
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr ""
 
-#: gajim/chat_control.py:686
+#: gajim/chat_control.py:710
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s fra gruppesamtale %(room_name)s"
 
-#: gajim/chat_control.py:832
+#: gajim/chat_control.py:856
 #, 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.py:1160 gajim/chat_control.py:1168
+#: gajim/chat_control.py:1184 gajim/chat_control.py:1192
 #, fuzzy
 msgid "Close"
 msgstr "_Send & Luk"
 
-#: gajim/chat_control.py:1161
+#: gajim/chat_control.py:1185
 #, fuzzy, python-format
 msgid "You just received a new message from %s"
 msgstr "Du har netop modtaget en besked fra \"%s\""
 
-#: gajim/chat_control.py:1163
+#: gajim/chat_control.py:1187
 #, fuzzy
 msgid ""
 "If you close this tab while having chat history disabled, this message will "
@@ -1198,16 +1164,16 @@ msgstr ""
 "Hvis du lukker dette faneblad og ikke har aktiveret historie loggen, vil du\n"
 "miste denne besked."
 
-#: gajim/chat_control.py:1208
+#: gajim/chat_control.py:1232
 msgid "Ping?"
 msgstr "Ping?"
 
-#: gajim/chat_control.py:1211
+#: gajim/chat_control.py:1235
 #, fuzzy, python-format
 msgid "Pong! (%s seconds)"
 msgstr "Pong! (%s .s)"
 
-#: gajim/chat_control.py:1308
+#: gajim/chat_control.py:1332
 #, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -1216,273 +1182,281 @@ msgstr ""
 "Emne: %(subject)s\n"
 "%(message)s"
 
-#: gajim/chat_control.py:1416
+#: gajim/chat_control.py:1440
 #, fuzzy, python-format
 msgid "%(name)s is now %(show)s %(status)s"
 msgstr "%(name)s er nu %(status)s"
 
-#: gajim/chat_control.py:1476 gajim/data/gui/application_menu.ui:32
+#: gajim/chat_control.py:1500 gajim/data/gui/application_menu.ui:32
 #: gajim/gtk/http_upload_progress.py:35
 #, fuzzy
 msgid "File Transfer"
 msgstr "Filoverførsler"
 
-#: gajim/chat_control.py:1480
+#: gajim/chat_control.py:1504
 #, fuzzy
 msgid "Size"
 msgstr "Størrelse: %s"
 
-#: gajim/chat_control.py:1482 gajim/chat_control.py:1546
+#: gajim/chat_control.py:1506 gajim/chat_control.py:1566
+#: gajim/gui_interface.py:190
 #: gajim/data/gui/groupchat_invitation_received.ui:77
-#: gajim/gtk/filetransfer.py:485
+#: gajim/gtk/filetransfer.py:490
 #, fuzzy
 msgid "_Accept"
 msgstr "K_ontoer"
 
-#: gajim/chat_control.py:1484 gajim/chat_control.py:1548
+#: gajim/chat_control.py:1508 gajim/chat_control.py:1568
 #: gajim/data/gui/groupchat_invitation_received.ui:62
 #, fuzzy
 msgid "_Decline"
 msgstr "_Afkoblet"
 
-#: gajim/chat_control.py:1506 gajim/gui_interface.py:791
-#: gajim/gui_interface.py:821 gajim/gui_interface.py:847
+#: gajim/chat_control.py:1530 gajim/gui_interface.py:777
+#: gajim/gui_interface.py:807 gajim/gui_interface.py:833
 #: gajim/gtk/notification.py:173 gajim/gtk/notification.py:278
 msgid "File Transfer Completed"
 msgstr "Filoverførsel er Fuldført"
 
-#: gajim/chat_control.py:1510 gajim/gtk/filetransfer.py:259
+#: gajim/chat_control.py:1534 gajim/gtk/filetransfer.py:258
 #, fuzzy
 msgid "Open _Folder"
 msgstr "_Åbn folderen med filen"
 
-#: gajim/chat_control.py:1512 gajim/chat_control.py:1521
+#: gajim/chat_control.py:1536 gajim/chat_control.py:1545
+#: gajim/data/gui/groupchat_control.ui:962
+#: gajim/data/gui/groupchat_control.ui:1049
+#: gajim/data/gui/groupchat_control.ui:1155
 #, fuzzy
 msgid "_Close"
 msgstr "_Send & Luk"
 
-#: gajim/chat_control.py:1543 gajim/gui_interface.py:484
+#: gajim/chat_control.py:1563 gajim/gui_interface.py:473
+#: gajim/data/gui/groupchat_invitation_received.ui:42
 #: gajim/gtk/notification.py:174 gajim/gtk/notification.py:195
 #: gajim/gtk/notification.py:281
-msgid "Groupchat Invitation"
+#, fuzzy
+msgid "Group Chat Invitation"
 msgstr "Gruppesamtale Invitation"
 
-#: gajim/chat_control.py:1568 gajim/roster_window.py:1954
+#: gajim/chat_control.py:1588 gajim/roster_window.py:1951
 msgid "Remote contact stopped transfer"
 msgstr "Den fjerne kontakt stoppede filoverførslen"
 
-#: gajim/chat_control.py:1570 gajim/roster_window.py:1956
+#: gajim/chat_control.py:1590 gajim/roster_window.py:1953
 msgid "Error opening file"
 msgstr "Fejl ved åbning af fil"
 
-#: gajim/chat_control.py:1572 gajim/gtk/filetransfer.py:297
+#: gajim/chat_control.py:1592 gajim/gtk/filetransfer.py:296
 msgid "File transfer stopped"
 msgstr "Filoverførsel stoppede"
 
-#: gajim/chat_control.py:1575 gajim/gtk/filetransfer.py:275
-#: gajim/gtk/filetransfer.py:284
+#: gajim/chat_control.py:1595 gajim/gtk/filetransfer.py:274
+#: gajim/gtk/filetransfer.py:283
 msgid "File transfer cancelled"
 msgstr "Filoverførsel er afbrudt"
 
-#: gajim/chat_control.py:1576
+#: gajim/chat_control.py:1596
 msgid "Connection with peer cannot be established."
 msgstr "Tilslutning til ligeværdige kan ikke oprettes."
 
-#: gajim/application.py:72
+#: gajim/application.py:75
 #, fuzzy
 msgid "Show the application's version"
 msgstr "Vis et faneblad når der kun er en samtale?"
 
-#: gajim/application.py:79
+#: gajim/application.py:82
 #, fuzzy
 msgid "Show only critical errors"
 msgstr "_Vis hændelse i kontaktvindue"
 
-#: gajim/application.py:86
+#: gajim/application.py:89
 msgid "Separate profile files completely (even history database and plugins)"
 msgstr ""
 
-#: gajim/application.py:94
+#: gajim/application.py:97
 msgid "Print XML stanzas and other debug information"
 msgstr ""
 
-#: gajim/application.py:101
+#: gajim/application.py:104
 #, fuzzy
 msgid "Use defined profile in configuration directory"
 msgstr "Avanceret Konfigurations Behandler"
 
-#: gajim/application.py:109
+#: gajim/application.py:112
 #, fuzzy
 msgid "Set configuration directory"
 msgstr "Rum Konfigurering"
 
-#: gajim/application.py:117
+#: gajim/application.py:120
 msgid "Configure logging system"
 msgstr ""
 
-#: gajim/application.py:125
+#: gajim/application.py:128
 #, fuzzy
 msgid "Show all warnings"
 msgstr "Vis Alle Ventende Hænd_elser"
 
-#: gajim/application.py:132
+#: gajim/application.py:135
 msgid "Open IPython shell"
 msgstr ""
 
-#: gajim/application.py:139
+#: gajim/application.py:142
 msgid "Pops up a window with the next pending event"
 msgstr "Popper op et vindue ved næste hændelse"
 
-#: gajim/application.py:145 gajim/data/gui/shortcuts_window.ui:203
+#: gajim/application.py:148 gajim/data/gui/shortcuts_window.ui:203
 #: data/org.gajim.Gajim.desktop.in:21
 #, fuzzy
 msgid "Start a new chat"
 msgstr "Start Samtale"
 
-#: gajim/application.py:152
+#: gajim/application.py:155
 msgid "Simulate loss of connectivity"
 msgstr ""
 
-#: gajim/application.py:159
+#: gajim/application.py:162
 msgid "Simulate regaining connectivity"
 msgstr ""
 
-#: gajim/application.py:201 gajim/gui_interface.py:133
+#: gajim/application.py:204 gajim/gui_interface.py:133
 msgid "Database Error"
 msgstr "Database Fejl"
 
-#: gajim/roster_window.py:294 gajim/roster_window.py:1030
+#: gajim/roster_window.py:291 gajim/roster_window.py:1027
 msgid "Merged accounts"
 msgstr "Flettede konti"
 
-#: gajim/roster_window.py:853 gajim/roster_window.py:1631
-#: gajim/roster_window.py:1664 gajim/roster_window.py:1715
-#: gajim/roster_window.py:1717 gajim/roster_window.py:1872
-#: gajim/roster_window.py:2531 gajim/roster_window.py:5025
-#: gajim/common/contacts.py:188 gajim/common/contacts.py:447
-#: gajim/common/helpers.py:83 gajim/gtk/discovery.py:129
-#: gajim/gtk/discovery.py:130 gajim/gtk/discovery.py:1416
+#: gajim/roster_window.py:850 gajim/roster_window.py:1628
+#: gajim/roster_window.py:1661 gajim/roster_window.py:1712
+#: gajim/roster_window.py:1714 gajim/roster_window.py:1869
+#: gajim/roster_window.py:2528 gajim/roster_window.py:4331
+#: gajim/roster_window.py:4964 gajim/common/contacts.py:204
+#: gajim/common/contacts.py:463 gajim/common/helpers.py:86
+#: gajim/gtk/discovery.py:127 gajim/gtk/discovery.py:128
+#: gajim/gtk/discovery.py:1414
 msgid "Transports"
 msgstr "Transporter"
 
-#: gajim/roster_window.py:1723 gajim/roster_window.py:1725
-#: gajim/roster_window.py:4995 gajim/gui_interface.py:1613
-#: gajim/gui_interface.py:1639 gajim/common/contacts.py:186
-#: gajim/common/helpers.py:83 gajim/common/modules/adhoc_commands.py:245
-msgid "Groupchats"
+#: gajim/roster_window.py:1720 gajim/roster_window.py:1722
+#: gajim/roster_window.py:4331 gajim/roster_window.py:4934
+#: gajim/gui_interface.py:1527 gajim/common/contacts.py:202
+#: gajim/common/helpers.py:86 gajim/common/modules/adhoc_commands.py:245
+#, fuzzy
+msgid "Group chats"
 msgstr "Gruppesamtaler"
 
-#: gajim/roster_window.py:2012
+#: gajim/roster_window.py:2009
 #, fuzzy
 msgid "Authorization sent"
 msgstr "Godkendelse er blevet sendt"
 
-#: gajim/roster_window.py:2013
+#: gajim/roster_window.py:2010
 #, fuzzy, python-format
 msgid "\"%s\" will now see your status."
 msgstr "Nu vil %s vide din status."
 
-#: gajim/roster_window.py:2031
+#: gajim/roster_window.py:2028
 msgid "Subscription request has been sent"
 msgstr "Forespørgsel på abonnering er blevet sendt"
 
-#: gajim/roster_window.py:2032
-#, python-format
-msgid "If \"%s\" accepts this request you will know his or her status."
+#: gajim/roster_window.py:2029
+#, 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:2046
+#: gajim/roster_window.py:2043
 #, fuzzy
 msgid "Authorization removed"
 msgstr "Godkendelse er blevet fjernet"
 
-#: gajim/roster_window.py:2047
+#: gajim/roster_window.py:2044
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Nu vil %s altid se dig som offline."
 
-#: gajim/roster_window.py:2250 gajim/roster_window.py:3504
+#: gajim/roster_window.py:2247 gajim/roster_window.py:3460
 msgid "Disconnect for Invisibility"
 msgstr ""
 
-#: gajim/roster_window.py:2251 gajim/roster_window.py:3505
+#: gajim/roster_window.py:2248 gajim/roster_window.py:3461
 msgid "You are participating in one or more group chats"
 msgstr "Du deltager i en eller flere gruppesamtaler"
 
-#: gajim/roster_window.py:2252 gajim/roster_window.py:3506
+#: gajim/roster_window.py:2249 gajim/roster_window.py:3462
 #, fuzzy
 msgid ""
-"Changing your status to invisible will result in disconnection from those "
-"group chats.\n"
+"Changing your status to invisible will result in you leaving those group "
+"chats.\n"
 "Are you sure you want to go invisible?"
 msgstr ""
 "Hvis du ændrer din status til usynlig vil det resultere i at du bliver "
 "frakoblet fra disse gruppesamtaler. Er du sikker på du vil gøre dig usynlig?"
 
-#: gajim/roster_window.py:2257 gajim/roster_window.py:3512
-#: gajim/roster_window.py:5238 gajim/data/gui/gc_control_popup_menu.ui:120
+#: gajim/roster_window.py:2254 gajim/roster_window.py:3468
+#: gajim/data/gui/gc_control_popup_menu.ui:120
 msgid "_Disconnect"
 msgstr "Afbry_d tilslutningen"
 
-#: gajim/roster_window.py:2285
+#: gajim/roster_window.py:2282
 #, fuzzy
 msgid "desynced"
 msgstr "ikke synkroniseret"
 
-#: gajim/roster_window.py:2353 gajim/data/gui/shortcuts_window.ui:224
+#: gajim/roster_window.py:2350 gajim/data/gui/shortcuts_window.ui:224
 #, fuzzy
 msgid "Quit Gajim"
 msgstr "Gajim"
 
-#: gajim/roster_window.py:2354
+#: gajim/roster_window.py:2351
 #, fuzzy
 msgid "You are about to quit Gajim"
 msgstr "Er du sikker på du vil afslutte Gajim?"
 
-#: gajim/roster_window.py:2355
+#: gajim/roster_window.py:2352
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Er du sikker på du vil afslutte Gajim?"
 
-#: gajim/roster_window.py:2356
+#: gajim/roster_window.py:2353
 #, fuzzy
 msgid "_Always quit when closing Gajim"
 msgstr "Altid afslut Gajim"
 
-#: gajim/roster_window.py:2359 gajim/roster_window.py:2455
-#: gajim/roster_window.py:2495 gajim/data/gui/systray_context_menu.ui:90
+#: gajim/roster_window.py:2356 gajim/roster_window.py:2452
+#: gajim/roster_window.py:2492 gajim/data/gui/systray_context_menu.ui:83
 #, fuzzy
 msgid "_Quit"
 msgstr "_Afslut"
 
-#: gajim/roster_window.py:2448
+#: gajim/roster_window.py:2445
 #, fuzzy
 msgid "Stop File Transfers"
 msgstr "Filoverførsler"
 
-#: gajim/roster_window.py:2449
+#: gajim/roster_window.py:2446
 #, fuzzy
 msgid "You still have running file transfers"
 msgstr "Annuller filoverførsel"
 
-#: gajim/roster_window.py:2450
+#: gajim/roster_window.py:2447
 msgid ""
 "If you quit now, the file(s) being transferred will be lost.\n"
 "Do you still want to quit?"
 msgstr ""
 
-#: gajim/roster_window.py:2488
+#: gajim/roster_window.py:2485
 #, fuzzy
 msgid "Unread Messages"
 msgstr "Ulæste hændelser"
 
-#: gajim/roster_window.py:2489
+#: gajim/roster_window.py:2486
 #, fuzzy
 msgid "You still have unread messages"
 msgstr "Du har ulæste beskeder"
 
-#: gajim/roster_window.py:2490
+#: gajim/roster_window.py:2487
 #, fuzzy
 msgid ""
 "Messages will only be available for reading them later if storing chat "
@@ -1491,20 +1465,20 @@ msgstr ""
 "Beskeder vil kun være tilgængelige for læsning senere hvis du har historik "
 "aktiveret og kontakten er i dit kontaktvindue."
 
-#: gajim/roster_window.py:2760
+#: gajim/roster_window.py:2753
 msgid "You have unread messages"
 msgstr "Du har ulæste beskeder"
 
-#: gajim/roster_window.py:2761
+#: gajim/roster_window.py:2754
 msgid "You must read them before removing this transport."
 msgstr "Du må læse dem før du fjerner denne transport."
 
-#: gajim/roster_window.py:2764
+#: gajim/roster_window.py:2757
 #, fuzzy, python-format
 msgid "Transport '%s' will be removed"
 msgstr "Transport \"%s\" vil blive fjernet"
 
-#: gajim/roster_window.py:2765
+#: gajim/roster_window.py:2758
 #, fuzzy
 msgid ""
 "You will no longer be able to send and receive messages from and to contacts "
@@ -1513,11 +1487,11 @@ msgstr ""
 "Du vil ikke længere være i stand til at sende og modtage beskeder fra "
 "kontakter som bruger denne transport."
 
-#: gajim/roster_window.py:2768
+#: gajim/roster_window.py:2761
 msgid "Transports will be removed"
 msgstr "Transporter vil blive fjernet"
 
-#: gajim/roster_window.py:2773
+#: gajim/roster_window.py:2766
 #, fuzzy, python-format
 msgid ""
 "You will no longer be able to send and receive messages from and to contacts "
@@ -1527,22 +1501,22 @@ msgstr ""
 "Du vil ikke længere være i stand til at sende og modtage beskeder fra "
 "kontakter som bruger denne transport."
 
-#: gajim/roster_window.py:2777
+#: gajim/roster_window.py:2770
 #, fuzzy
 msgid "Remove Transport"
 msgstr "Vis Trans_porter"
 
-#: gajim/roster_window.py:2844
+#: gajim/roster_window.py:2837
 #, fuzzy
 msgid "Block Contact"
 msgstr "Blokerede Kontakter"
 
-#: gajim/roster_window.py:2845
+#: gajim/roster_window.py:2838
 #, fuzzy
 msgid "Really block this contact?"
 msgstr "Er OpenPGP aktiveret for denne kontakt?"
 
-#: gajim/roster_window.py:2846
+#: gajim/roster_window.py:2839
 #, fuzzy
 msgid ""
 "This contact will see you offline and you will not receive any messages sent "
@@ -1551,64 +1525,59 @@ msgstr ""
 "Denne kontakt vil se dig offline og du vil ikke modtage beskeder han sender "
 "dig."
 
-#: gajim/roster_window.py:2851
+#: gajim/roster_window.py:2844
 #, fuzzy
 msgid "_Block Contact"
 msgstr "Blokerede Kontakter"
 
-#: gajim/roster_window.py:2896
+#: gajim/roster_window.py:2889
 msgid "Rename Contact"
 msgstr "Omdøb Kontakt"
 
-#: gajim/roster_window.py:2897
+#: gajim/roster_window.py:2890
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Indtast et nyt kælenavn for kontakt %s"
 
-#: gajim/roster_window.py:2904
+#: gajim/roster_window.py:2897
 msgid "Rename Group"
 msgstr "Omdøb Gruppe"
 
-#: gajim/roster_window.py:2905
+#: gajim/roster_window.py:2898
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Indtast et nyt navn for gruppen %s"
 
-#: gajim/roster_window.py:2953 gajim/roster_window.py:2954
+#: gajim/roster_window.py:2946 gajim/roster_window.py:2947
 msgid "Remove Group"
 msgstr "Fjern Gruppen"
 
-#: gajim/roster_window.py:2955
+#: gajim/roster_window.py:2948
 #, fuzzy, python-format
 msgid "Do you want to remove %s from the contact list?"
 msgstr "Vil du fjerne gruppen %s fra kontaktvinduet?"
 
-#: gajim/roster_window.py:2956
+#: gajim/roster_window.py:2949
 #, fuzzy
 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:3044
-#, fuzzy, python-format
-msgid "%(jid)s has been invited in this room"
-msgstr "%(nick)s er blevet fjernet fra rummet %(reason)s"
-
-#: gajim/roster_window.py:3353
+#: gajim/roster_window.py:3309
 #, fuzzy
 msgid "Remove Contact"
 msgstr "Omdøb Kontakt"
 
-#: gajim/roster_window.py:3354
+#: gajim/roster_window.py:3310
 #, fuzzy
 msgid "Remove contact from contact list"
 msgstr "Fjerner kontakt fra kontaktvinduet"
 
-#: gajim/roster_window.py:3355
+#: gajim/roster_window.py:3311
 #, 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:3364 gajim/roster_window.py:3384
+#: gajim/roster_window.py:3320 gajim/roster_window.py:3340
 #, fuzzy
 msgid ""
 "By removing this contact you also remove authorization. This means the "
@@ -1618,21 +1587,21 @@ msgstr ""
 "fjerner du også godkendelsen, hvilket medfører at de altid vil se dig som "
 "offline."
 
-#: gajim/roster_window.py:3375
+#: gajim/roster_window.py:3331
 msgid "Do you want to continue?"
 msgstr "Vil du fortsætte?"
 
-#: gajim/roster_window.py:3386
+#: gajim/roster_window.py:3342
 #, 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:3393
+#: gajim/roster_window.py:3349
 #, fuzzy
 msgid "Remove contacts from contact list"
 msgstr "Fjerner kontakt fra kontaktvinduet"
 
-#: gajim/roster_window.py:3399
+#: gajim/roster_window.py:3355
 #, fuzzy, python-format
 msgid ""
 "By removing the following contacts, you will also remove authorization. This "
@@ -1644,25 +1613,25 @@ msgstr ""
 "fjerner du også godkendelsen, hvilket medfører at de altid vil se dig som "
 "offline."
 
-#: gajim/roster_window.py:3403
+#: gajim/roster_window.py:3359
 #, fuzzy
 msgid "Remove Contacts"
 msgstr "Omdøb Kontakt"
 
-#: gajim/roster_window.py:3423
+#: gajim/roster_window.py:3379
 msgid "No account available"
 msgstr "Ingen konto tilgængelig"
 
-#: gajim/roster_window.py:3424
+#: gajim/roster_window.py:3380
 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:4060
+#: gajim/roster_window.py:4011
 msgid "Metacontacts storage not supported by your server"
 msgstr "Metakontakt lagring er ikke understøttet af din server"
 
-#: gajim/roster_window.py:4062
+#: gajim/roster_window.py:4013
 #, fuzzy
 msgid ""
 "Your server does not support storing metacontacts information. So this "
@@ -1672,12 +1641,12 @@ msgstr ""
 "information. Så denne information vil ikke blive gemt til næste gang du "
 "tilslutter dig."
 
-#: gajim/roster_window.py:4159
+#: gajim/roster_window.py:4110
 #, 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:4160
+#: gajim/roster_window.py:4111
 #, fuzzy
 msgid ""
 "Metacontacts are a way to regroup several contacts in one single contact. "
@@ -1687,124 +1656,115 @@ 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:4164
+#: gajim/roster_window.py:4115
 #, fuzzy
 msgid "Create Metacontact"
 msgstr "Omdøb Kontakt"
 
-#: gajim/roster_window.py:4170
+#: gajim/roster_window.py:4121 gajim/data/gui/groupchat_creation.ui:317
 #, fuzzy
 msgid "_Create"
 msgstr "Kreativ"
 
-#: gajim/roster_window.py:4287
+#: gajim/roster_window.py:4238
 msgid "Invalid file URI:"
 msgstr "Ugyldig Fil URI:"
 
-#: gajim/roster_window.py:4298
+#: gajim/roster_window.py:4249
 #, fuzzy
 msgid "Send file?"
 msgstr "Send _Fil"
 
-#: gajim/roster_window.py:4299
+#: gajim/roster_window.py:4250
 #, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
 msgstr[0] "Vil du sende denne fil til %s:"
 msgstr[1] "Vil du sende disse filer til %s:"
 
-#: gajim/roster_window.py:4451
+#: gajim/roster_window.py:4401
 #, fuzzy, python-format
 msgid "Send %(from)s to %(to)s"
 msgstr "Send %s til %s"
 
-#: gajim/roster_window.py:4464
+#: gajim/roster_window.py:4414
 #, fuzzy, python-format
 msgid "Make %s first contact"
 msgstr "Lav %s og %s til metakontakter"
 
-#: gajim/roster_window.py:4469
+#: gajim/roster_window.py:4419
 #, fuzzy, python-format
 msgid "Make %(contact1)s and %(contact2)s metacontacts"
 msgstr "Lav %s og %s til metakontakter"
 
-#: gajim/roster_window.py:4825 gajim/roster_window.py:4923
+#: gajim/roster_window.py:4775 gajim/roster_window.py:4862
 msgid "_Change Status Message"
 msgstr "_Ændre Status Besked"
 
-#: gajim/roster_window.py:4845
+#: gajim/roster_window.py:4795
 msgid "Publish Tune"
 msgstr "Publicer Melodi"
 
-#: gajim/roster_window.py:4856
+#: gajim/roster_window.py:4806
 #, fuzzy
 msgid "Publish Location"
 msgstr "Publicer Melodi"
 
-#: gajim/roster_window.py:4868
-#, fuzzy
-msgid "Configure Services…"
-msgstr "Tilpas Tjenester..."
-
-#: gajim/roster_window.py:4997
+#: gajim/roster_window.py:4936
 msgid "_Maximize All"
 msgstr "_Maksimer alt"
 
-#: gajim/roster_window.py:5004 gajim/roster_window.py:5146
+#: gajim/roster_window.py:4943 gajim/roster_window.py:5085
 msgid "Send Group M_essage"
 msgstr "Send Gruppeb_esked"
 
-#: gajim/roster_window.py:5011
+#: gajim/roster_window.py:4950
 msgid "To all users"
 msgstr "Til alle brugere"
 
-#: gajim/roster_window.py:5015
+#: gajim/roster_window.py:4954
 msgid "To all online users"
 msgstr "Til alle brugere på net"
 
-#: gajim/roster_window.py:5027 gajim/roster_window.py:5152
+#: gajim/roster_window.py:4966 gajim/roster_window.py:5091
 #: gajim/data/gui/gc_occupants_menu.ui:110
 #: gajim/data/gui/contact_context_menu.ui:36
 msgid "In_vite to"
 msgstr "In_viter til"
 
-#: gajim/roster_window.py:5162
+#: gajim/roster_window.py:5101
 msgid "_Manage Contacts"
 msgstr "_Håndter Kontakter"
 
-#: gajim/roster_window.py:5168
+#: gajim/roster_window.py:5107
 #, fuzzy
 msgid "Edit _Groups…"
 msgstr "Ændre _Grupper"
 
-#: gajim/roster_window.py:5189 gajim/data/gui/filetransfers.ui:12
+#: gajim/roster_window.py:5128 gajim/data/gui/filetransfers.ui:12
 #: gajim/data/gui/remove_account_window.ui:134
 msgid "_Remove"
 msgstr "_Kan fjernes"
 
-#: gajim/roster_window.py:5226
+#: gajim/roster_window.py:5165
 msgid "_Maximize"
 msgstr "_Maksimer"
 
-#: gajim/roster_window.py:5233
+#: gajim/roster_window.py:5172
 msgid "_Reconnect"
 msgstr "_Tilslut igen"
 
-#: gajim/roster_window.py:5254 gajim/data/gui/gc_occupants_menu.ui:170
+#: gajim/roster_window.py:5193 gajim/data/gui/gc_occupants_menu.ui:170
 #: gajim/data/gui/gc_control_popup_menu.ui:113
 #: gajim/data/gui/contact_context_menu.ui:205
 msgid "_History"
 msgstr "_Historie"
 
-#: gajim/roster_window.py:5335 gajim/data/gui/application_menu.ui:86
+#: gajim/roster_window.py:5274 gajim/data/gui/application_menu.ui:83
 #: gajim/data/gui/history_window.ui:57
 msgid "History Manager"
 msgstr "Historik Håndterer"
 
-#: gajim/roster_window.py:5343
-msgid "_Join New Group Chat"
-msgstr "_Deltag i Ny Gruppe Samtale"
-
 #: gajim/dataforms_widget.py:585
 #, fuzzy
 msgid "Unable to load image"
@@ -1927,226 +1887,242 @@ msgstr "Emne: %s\n"
 msgid "Write a message…"
 msgstr "Ny Privat Besked"
 
-#: gajim/message_window.py:250
+#: gajim/message_window.py:356
+#, fuzzy
+msgid "Close Tabs"
+msgstr "_Send & Luk"
+
+#: gajim/message_window.py:357
 msgid "You are going to close several tabs"
 msgstr "Du er ved at lukke flere faneblade"
 
-#: gajim/message_window.py:251
+#: gajim/message_window.py:358
 msgid "Do you really want to close them all?"
 msgstr "Vil du virkelig lukke dem alle?"
 
-#: gajim/message_window.py:539
+#: gajim/message_window.py:514
 #, fuzzy
 msgid "?Noun:Chats"
 msgstr "Gruppe Samtaler"
 
-#: gajim/message_window.py:543
+#: gajim/message_window.py:518
 #, fuzzy
 msgid "Group Chats"
 msgstr "Gruppesamtaler"
 
-#: gajim/message_window.py:547
+#: gajim/message_window.py:522
 msgid "Private Chats"
 msgstr "Private Samtaler"
 
-#: gajim/message_window.py:553
+#: gajim/message_window.py:528
 msgid "Messages"
 msgstr "Beskeder"
 
-#: gajim/gui_interface.py:173
+#: gajim/gui_interface.py:170
+#, 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:175
 msgid "Do you accept this request?"
 msgstr "Accepterer du denne forespørsel?"
 
-#: gajim/gui_interface.py:175
-#, python-format
-msgid "Do you accept this request on account %s?"
+#: gajim/gui_interface.py:177
+#, fuzzy, python-format
+msgid "Do you accept this request (account: %s)?"
 msgstr "Accepterer du denne forespørgsel for konto %s?"
 
-#: gajim/gui_interface.py:178
-#, 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:182
+#, fuzzy
+msgid "Authorization"
+msgstr "Godkendelse er blevet sendt"
+
+#: gajim/gui_interface.py:186 gajim/gui_interface.py:420
+#: gajim/gtk/filetransfer.py:338
+#, fuzzy
+msgid "_No"
+msgstr "Ingen"
 
-#: gajim/gui_interface.py:194 gajim/gtk/notification.py:175
+#: gajim/gui_interface.py:205 gajim/gtk/notification.py:175
 #: gajim/gtk/notification.py:197
 msgid "Connection Failed"
 msgstr "Tilslutning Fejlede"
 
-#: gajim/gui_interface.py:279 gajim/gui_interface.py:529
-msgid "Password Required"
-msgstr "Adgangskode er Påkrævet"
-
-#: gajim/gui_interface.py:280
-#, python-format
-msgid "A Password is required to join the room %s. Please type it."
-msgstr ""
-"En adgangskode er påkrævet for at deltage i rummet %s. Venligst skriv den."
-
-#: gajim/gui_interface.py:342 gajim/gui_interface.py:346
+#: gajim/gui_interface.py:325 gajim/gui_interface.py:329
 #, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr "Fejl %(code)s: %(msg)s"
 
-#: gajim/gui_interface.py:357 gajim/gui_interface.py:376
+#: gajim/gui_interface.py:340 gajim/gui_interface.py:359
 #: gajim/common/modules/message.py:122
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "fejl opstod under sending %(message)s ( %(error)s )"
 
-#: gajim/gui_interface.py:401 gajim/gtk/notification.py:175
+#: gajim/gui_interface.py:384 gajim/gtk/notification.py:175
 msgid "Subscription request"
 msgstr "Abonnement forespørgsel"
 
-#: gajim/gui_interface.py:413 gajim/common/contacts.py:184
-#: gajim/common/helpers.py:83
+#: gajim/gui_interface.py:396 gajim/common/contacts.py:200
+#: gajim/common/helpers.py:86
 msgid "Observers"
 msgstr "Iagttagere"
 
-#: gajim/gui_interface.py:422
+#: gajim/gui_interface.py:405
 msgid "Authorization accepted"
 msgstr "Autorisering accepteret"
 
-#: gajim/gui_interface.py:423
+#: gajim/gui_interface.py:406
 #, 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:431
-#, python-format
-msgid "Contact \"%s\" removed subscription from you"
+#: gajim/gui_interface.py:415
+#, fuzzy
+msgid "Subscription Removed"
+msgstr "Abonnement Forespørgsel"
+
+#: gajim/gui_interface.py:416
+#, fuzzy, python-format
+msgid "Contact '%s' removed subscription from you"
 msgstr "Kontakt \"%s\" har fjernet abonneringen på dig"
 
-#: gajim/gui_interface.py:432
+#: gajim/gui_interface.py:417
 #, fuzzy
 msgid ""
-"You will always see them as offline.\n"
+"You will always see this contact as offline.\n"
 "Do you want to remove them from your contact list?"
 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:453 gajim/gtk/notification.py:176
+#: gajim/gui_interface.py:442 gajim/gtk/notification.py:176
 msgid "Unsubscribed"
 msgstr "Frameldt abonnement"
 
-#: gajim/gui_interface.py:465
+#: gajim/gui_interface.py:454
 #, python-format
 msgid "%(jid)s declined the invitation: %(reason)s"
 msgstr ""
 
-#: gajim/gui_interface.py:469
+#: gajim/gui_interface.py:458
 #, python-format
 msgid "%(jid)s declined the invitation"
 msgstr ""
 
-#: gajim/gui_interface.py:485
+#: gajim/gui_interface.py:474
 #, fuzzy, python-brace-format
 msgid "You are invited to {room} by {user}"
 msgstr "Du er inviteret til en gruppesamtale."
 
-#: gajim/gui_interface.py:506
+#: gajim/gui_interface.py:495
 #, fuzzy
 msgid "Certificate Passphrase Required"
 msgstr "Certifikatet er udløbet"
 
-#: gajim/gui_interface.py:507
+#: gajim/gui_interface.py:496
 #, 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:516 gajim/gtk/accounts.py:963
+#: gajim/gui_interface.py:505 gajim/gtk/accounts.py:966
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Skriv din adgangskode for kontoen %s"
 
-#: gajim/gui_interface.py:529 gajim/gtk/accounts.py:964
+#: gajim/gui_interface.py:518
+msgid "Password Required"
+msgstr "Adgangskode er Påkrævet"
+
+#: gajim/gui_interface.py:518 gajim/gtk/accounts.py:967
 msgid "Save password"
 msgstr "Gem adgangskode"
 
-#: gajim/gui_interface.py:601 gajim/gui_interface.py:632
+#: gajim/gui_interface.py:587 gajim/gui_interface.py:618
+#: gajim/gtk/filetransfer.py:332 gajim/gtk/filetransfer.py:333
 #: gajim/gtk/notification.py:173 gajim/gtk/notification.py:276
 msgid "File Transfer Error"
 msgstr "Filoverførsel Fejl"
 
-#: gajim/gui_interface.py:666
+#: gajim/gui_interface.py:652
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s vil gerne sende dig en fil."
 
-#: gajim/gui_interface.py:668 gajim/gtk/filetransfer.py:479
+#: gajim/gui_interface.py:654 gajim/gtk/filetransfer.py:484
 #: gajim/gtk/notification.py:172 gajim/gtk/notification.py:274
 msgid "File Transfer Request"
 msgstr "Filoverførsel Forespørgsel"
 
-#: gajim/gui_interface.py:767
+#: gajim/gui_interface.py:753
 #, fuzzy
 msgid "Remote Contact Stopped Transfer"
 msgstr "Den fjerne kontakt stoppede filoverførslen"
 
-#: gajim/gui_interface.py:772
+#: gajim/gui_interface.py:758
 #, fuzzy
 msgid "Error Opening File"
 msgstr "Fejl ved åbning af fil"
 
-#: gajim/gui_interface.py:782
+#: gajim/gui_interface.py:768
 #, fuzzy
 msgid "SSL Certificate Error"
 msgstr "SSL certifikat fejl"
 
-#: gajim/gui_interface.py:795 gajim/gui_interface.py:826
-#: gajim/gui_interface.py:853 gajim/gtk/notification.py:174
+#: gajim/gui_interface.py:781 gajim/gui_interface.py:812
+#: gajim/gui_interface.py:839 gajim/gtk/notification.py:174
 #: gajim/gtk/notification.py:279
 msgid "File Transfer Stopped"
 msgstr "Filoverførsel Stoppede"
 
-#: gajim/gui_interface.py:799
+#: gajim/gui_interface.py:785
 #, fuzzy
 msgid "File Transfer Failed"
 msgstr "Filoverførsler"
 
-#: gajim/gui_interface.py:822
+#: gajim/gui_interface.py:808
 #, 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:827
+#: gajim/gui_interface.py:813
 #, 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:833
+#: gajim/gui_interface.py:819
 #, 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:848
+#: gajim/gui_interface.py:834
 #, 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:854
+#: gajim/gui_interface.py:840
 #, 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:860
+#: gajim/gui_interface.py:846
 #, 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:971
+#: gajim/gui_interface.py:957
 msgid "Username Conflict"
 msgstr "Brugernavns Konflikt"
 
-#: gajim/gui_interface.py:972
+#: gajim/gui_interface.py:958
 msgid "Please type a new username for your local account"
 msgstr "Skriv et nyt brugernavn for din lokale konto"
 
-#: gajim/gui_interface.py:995
+#: gajim/gui_interface.py:981
 msgid "Resource Conflict"
 msgstr "Ressource Konflikt"
 
-#: gajim/gui_interface.py:996
+#: gajim/gui_interface.py:982
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
@@ -2154,32 +2130,32 @@ msgstr ""
 "Du er allerede tilsluttet til denne konto med den samme ressource. Skriv "
 "venligst en ny"
 
-#: gajim/gui_interface.py:1053
+#: gajim/gui_interface.py:1039
 #, fuzzy, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s vil gerne sende dig en fil."
 
-#: gajim/gui_interface.py:1055
+#: gajim/gui_interface.py:1041
 #, fuzzy
 msgid "Voice Chat Request"
 msgstr "Filoverførsel Forespørgsel"
 
-#: gajim/gui_interface.py:1123 gajim/gtk/account_wizard.py:312
+#: gajim/gui_interface.py:1109 gajim/gtk/account_wizard.py:312
 msgid "Certificate Already in File"
 msgstr "Certifikatet er allerede i filen"
 
-#: gajim/gui_interface.py:1124 gajim/gtk/account_wizard.py:313
+#: gajim/gui_interface.py:1110 gajim/gtk/account_wizard.py:313
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr ""
 "Dette certifikat er allerede i filen %s, så det bliver ikke tilføjet igen."
 
-#: gajim/gui_interface.py:1145
+#: gajim/gui_interface.py:1131
 #, fuzzy, python-format
 msgid "The authenticity of the %s certificate could be invalid"
 msgstr "Ægtheden af %s certifikatet kan være ugyldig."
 
-#: gajim/gui_interface.py:1148
+#: gajim/gui_interface.py:1134
 #, python-format
 msgid ""
 "\n"
@@ -2188,7 +2164,7 @@ msgstr ""
 "\n"
 "Ukendt SSL fejl: %d"
 
-#: gajim/gui_interface.py:1150
+#: gajim/gui_interface.py:1136
 #, python-format
 msgid ""
 "\n"
@@ -2197,11 +2173,11 @@ msgstr ""
 "\n"
 "SSL Fejl: <b>%s</b>"
 
-#: gajim/gui_interface.py:1155
+#: gajim/gui_interface.py:1141
 msgid "Error verifying SSL certificate"
 msgstr "Fejl under verificering af SSL certifikat"
 
-#: gajim/gui_interface.py:1156
+#: gajim/gui_interface.py:1142
 #, fuzzy, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your XMPP server: "
@@ -2212,7 +2188,7 @@ msgstr ""
 "server: %(error)s\n"
 "Vil du stadig prøve på at forbinde til denne server?"
 
-#: gajim/gui_interface.py:1160 gajim/gtk/account_wizard.py:412
+#: gajim/gui_interface.py:1146 gajim/gtk/account_wizard.py:413
 #, fuzzy, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -2225,169 +2201,159 @@ msgstr ""
 "Certifikatets SHA1 fingeraftryk:\n"
 "%s"
 
-#: gajim/gui_interface.py:1166
+#: gajim/gui_interface.py:1152
 msgid "Ignore this error for this certificate."
 msgstr "Ignorer denne fejl for dette certifikat."
 
-#: gajim/gui_interface.py:1174
+#: gajim/gui_interface.py:1160
 #, fuzzy, python-format
 msgid "SSL Certificate Verification for %s"
 msgstr "SSL certifikat fejl"
 
-#: gajim/gui_interface.py:1442 gajim/gtk/join_groupchat.py:235
-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/gui_interface.py:1448
-#, fuzzy
-msgid "JID is not a Groupchat"
-msgstr "Dette er ikke en gruppe samtale"
-
-#: gajim/gui_interface.py:1579
-msgid "This is not a group chat"
-msgstr "Dette er ikke en gruppe samtale"
-
-#: gajim/gui_interface.py:1580
-#, python-format
-msgid ""
-"%(room_jid)s is already in your roster. Please check if %(room_jid)s is a "
-"correct group chat name. If it is, delete it from your roster and try "
-"joining the group chat again."
-msgstr ""
-
-#: gajim/gui_interface.py:1604 gajim/dialog_messages.py:58
+#: gajim/gui_interface.py:1577
 msgid "You cannot join a group chat while you are invisible"
 msgstr "Du kan ikke deltage i en gruppe samtale mens du er usynlig"
 
-#: gajim/gui_interface.py:2037
+#: gajim/gui_interface.py:1976
 msgid "Could not save your settings and preferences"
 msgstr "Kunne ikke gemme din opsætning og indstillinger"
 
-#: gajim/gui_interface.py:2098
+#: gajim/gui_interface.py:2037
 msgid "Gajim: IPython Console"
 msgstr ""
 
-#: gajim/dialog_messages.py:32
+#: gajim/dialog_messages.py:31 gajim/dialog_messages.py:36
+#: gajim/gtk/single_message.py:305 gajim/gtk/account_wizard.py:229
 #, fuzzy
-msgid "You can not start a new conversation unless you are connected."
-msgstr "Du kan kun deltage i en gruppe samtale hvis du er tilsluttet."
-
-#: gajim/dialog_messages.py:36 gajim/dialog_messages.py:41
-#: gajim/gtk/single_message.py:305 gajim/gtk/join_groupchat.py:211
-#: gajim/gtk/account_wizard.py:229
-msgid "Invalid JID"
-msgstr "Ugyldig JID"
+msgid "Invalid XMPP Address"
+msgstr "Ugyldig Fil"
 
-#: gajim/dialog_messages.py:42 gajim/gtk/single_message.py:306
-#, python-format
-msgid "It is not possible to send a message to %s, this JID is not valid."
+#: gajim/dialog_messages.py:37
+#, 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/dialog_messages.py:47
-msgid "Unread events"
+#: gajim/dialog_messages.py:42
+#, fuzzy
+msgid "Unread Events"
 msgstr "Ulæste hændelser"
 
-#: gajim/dialog_messages.py:48
-msgid "Read all pending events before removing this account."
+#: gajim/dialog_messages.py:43
+#, fuzzy
+msgid "Read or acknowledge all pending events before removing this account."
 msgstr "Læs alle ventende hændelser før denne konto fjernes."
 
-#: gajim/dialog_messages.py:52
+#: gajim/dialog_messages.py:48
 #, fuzzy
 msgid "Invalid Form"
 msgstr "Ugyldig rum"
 
-#: gajim/dialog_messages.py:53
+#: gajim/dialog_messages.py:49
 #, fuzzy
 msgid "The form is not filled correctly."
 msgstr "Kælenavnet har ikke tilladte tegn."
 
-#: gajim/dialog_messages.py:57 gajim/common/helpers.py:309
+#: gajim/dialog_messages.py:53 gajim/common/helpers.py:315
 msgid "Invisible"
 msgstr "Usynlig"
 
-#: gajim/dialog_messages.py:62
-msgid "A connection is not available"
-msgstr "En tilslutning er ikke tilgængelig"
+#: gajim/dialog_messages.py:54
+#, fuzzy
+msgid "You cannot join a group chat while being invisible."
+msgstr "Du kan ikke deltage i en gruppe samtale mens du er usynlig"
+
+#: gajim/dialog_messages.py:58
+#, fuzzy
+msgid "No Connection Available"
+msgstr "Tilslutning er ikke tilgængelig"
 
-#: gajim/dialog_messages.py:63
+#: gajim/dialog_messages.py:59
 msgid "Your message can not be sent until you are connected."
 msgstr "Din besked kan ikke blive sendt før du er tilsluttet."
 
-#: gajim/dialog_messages.py:67
-#, fuzzy
-msgid "JID already in list"
-msgstr "Jabber ID er allerede i listen"
+#: gajim/dialog_messages.py:63
+msgid "XMPP Address Already in List"
+msgstr ""
 
-#: gajim/dialog_messages.py:68
+#: gajim/dialog_messages.py:64
 #, fuzzy
-msgid "The JID you entered is already in the list. Choose another one."
+msgid ""
+"The XMPP Address you entered is already in the list. Please choose another "
+"one."
 msgstr "Den Jabber ID som de skrev er allerede i listen. Vælg en anden."
 
-#: gajim/dialog_messages.py:72
-msgid "Invalid answer"
+#: gajim/dialog_messages.py:69
+#, fuzzy
+msgid "Invalid Answer"
 msgstr "Forkert svar"
 
-#: gajim/dialog_messages.py:73
+#: gajim/dialog_messages.py:70
 #, python-format
 msgid "Transport %(name)s answered wrongly to register request: %(error)s"
 msgstr ""
 "Transport %(name)s svarede forkert på indskrivnings forespørgslen: %(error)s"
 
-#: gajim/dialog_messages.py:78
+#: gajim/dialog_messages.py:75
 #, fuzzy
 msgid "Wrong Custom Hostname"
 msgstr "Brug tilpasset værtsnavn/port"
 
-#: gajim/dialog_messages.py:79
+#: gajim/dialog_messages.py:76
 #, fuzzy, python-format
-msgid "Wrong custom hostname \"%s\". Ignoring it."
+msgid "Custom hostname \"%s\" is wrong. It will be ignored."
 msgstr "Brug tilpasset værtsnavn/port"
 
-#: gajim/dialog_messages.py:83
-msgid "Error while removing privacy list"
+#: gajim/dialog_messages.py:80
+#, fuzzy
+msgid "Error While Removing Privacy List"
 msgstr "Fejl under fjernelse af privatlivs liste"
 
-#: gajim/dialog_messages.py:84
-#, python-format
+#: gajim/dialog_messages.py:81
+#, fuzzy, python-format
 msgid ""
-"Privacy list %s has not been removed. It is maybe active in one of your "
-"connected resources. Deactivate it and try again."
+"Privacy list %s has not been removed. It is probably active in one of your "
+"connected resources. Please deactivate it and try again."
 msgstr ""
 "Privatlivs liste %s er ikke blevet fjernet. Den er måske aktiv i en af dine "
 "tilsluttede ressourcer. Deaktivér den og prøv igen."
 
-#: gajim/dialog_messages.py:90
-msgid "Invisibility not supported"
+#: gajim/dialog_messages.py:87
+#, fuzzy
+msgid "Invisibility Not Supported"
 msgstr "Usynlighed er ikke understøttet"
 
-#: gajim/dialog_messages.py:91
-#, python-format
-msgid "Account %s doesn't support invisibility."
+#: gajim/dialog_messages.py:88
+#, fuzzy, python-format
+msgid "This account %s doesn't support invisibility."
 msgstr "Konto %s understøtter ikke usynlighed."
 
-#: gajim/dialog_messages.py:95
-msgid "Unregister failed"
+#: gajim/dialog_messages.py:92
+#, fuzzy
+msgid "Unregister Failed"
 msgstr "Tilslutning fejlede"
 
-#: gajim/dialog_messages.py:96
-#, python-format
-msgid "Unregistration with server %(server)s failed: %(error)s"
+#: gajim/dialog_messages.py:93
+#, fuzzy, python-format
+msgid "Unregistration on server %(server)s failed: %(error)s"
 msgstr "Frakobling fra serveren %(server)s mislykkedes: %(error)s"
 
-#: gajim/dialog_messages.py:100
-msgid "Registration succeeded"
+#: gajim/dialog_messages.py:97
+#, fuzzy
+msgid "Registration Succeeded"
 msgstr "Tilslutning lykkedes"
 
-#: gajim/dialog_messages.py:101
-#, python-format
-msgid "Registration with agent %s succeeded"
+#: gajim/dialog_messages.py:98
+#, fuzzy, python-format
+msgid "Registration with agent %s succeeded."
 msgstr "Tilslutning med agenten %s lykkedes"
 
-#: gajim/dialog_messages.py:105 gajim/gtk/service_registration.py:215
-msgid "Registration failed"
+#: gajim/dialog_messages.py:102
+#, fuzzy
+msgid "Registration Failed"
 msgstr "Tilslutning fejlede"
 
-#: gajim/dialog_messages.py:106
+#: gajim/dialog_messages.py:103
 #, python-format
 msgid ""
 "Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
@@ -2395,35 +2361,38 @@ msgstr ""
 "Tilslutning med agenten %(agent)s mislykkedes med fejlen %(error)s: "
 "%(error_msg)s"
 
-#: gajim/dialog_messages.py:111
+#: gajim/dialog_messages.py:108
 #, fuzzy
 msgid "Unable to Join Group Chat"
 msgstr "Ikke i stand til at deltage i gruppesamtale."
 
-#: gajim/dialog_messages.py:116
-msgid "GStreamer error"
-msgstr ""
+#: gajim/dialog_messages.py:113
+#, fuzzy
+msgid "GStreamer Error"
+msgstr "Database Fejl"
 
-#: gajim/dialog_messages.py:117
+#: gajim/dialog_messages.py:114
 #, fuzzy, python-format
 msgid ""
 "Error: %(error)s\n"
 "Debug: %(debug)s"
 msgstr "Fejl besked: %s"
 
-#: gajim/dialog_messages.py:121
-msgid "Wrong host"
+#: gajim/dialog_messages.py:118
+#, fuzzy
+msgid "Wrong Host"
 msgstr "Forkert vært"
 
-#: gajim/dialog_messages.py:122
+#: gajim/dialog_messages.py:119
 msgid "Invalid local address? :-O"
 msgstr "Invalid local address? :-O"
 
-#: gajim/dialog_messages.py:126
-msgid "Avahi error"
+#: gajim/dialog_messages.py:123
+#, fuzzy
+msgid "Avahi Error"
 msgstr "Avahi fejl"
 
-#: gajim/dialog_messages.py:127
+#: gajim/dialog_messages.py:124
 #, python-format
 msgid ""
 "%s\n"
@@ -2432,66 +2401,66 @@ msgstr ""
 "%s\n"
 "Link-local beskeder vil sandsynligvis ikke virke ordentligt."
 
-#: gajim/dialog_messages.py:131 gajim/dialog_messages.py:136
+#: gajim/dialog_messages.py:128 gajim/dialog_messages.py:133
 #, fuzzy
-msgid "Could not request upload slot"
+msgid "Could not request upload slot for HTTP File Upload"
 msgstr "Kunne ikke starte lokal tjeneste"
 
-#: gajim/dialog_messages.py:137
-msgid "Got unexpected response from server (see log)"
+#: gajim/dialog_messages.py:134
+msgid "Got unexpected response from server (see log)."
 msgstr ""
 
-#: gajim/dialog_messages.py:141 gajim/dialog_messages.py:146
+#: gajim/dialog_messages.py:138 gajim/dialog_messages.py:143
 #, fuzzy
-msgid "Could not open file"
+msgid "Could not Open File"
 msgstr "Kunne ikke laste billede"
 
-#: gajim/dialog_messages.py:142
-msgid "Exception raised while opening file (see log)"
+#: gajim/dialog_messages.py:139
+msgid "Exception raised while trying to open file (see log)."
 msgstr ""
 
-#: gajim/dialog_messages.py:151
-msgid "Unsecure"
-msgstr ""
+#: gajim/dialog_messages.py:148
+#, fuzzy
+msgid "Not Secure"
+msgstr "Ikke startet"
 
-#: gajim/dialog_messages.py:152
+#: gajim/dialog_messages.py:149
 #, fuzzy
-msgid "Server returned unsecure transport (HTTP)"
+msgid "The server returned an insecure transport (HTTP)."
 msgstr "Tjeneste returnerede en fejl."
 
-#: gajim/dialog_messages.py:156
+#: gajim/dialog_messages.py:153
 #, fuzzy
-msgid "Could not upload file"
+msgid "Could not Upload File"
 msgstr "Kunne ikke laste billede"
 
-#: gajim/dialog_messages.py:157
+#: gajim/dialog_messages.py:154
 #, python-format
 msgid "HTTP response code from server: %s"
 msgstr ""
 
-#: gajim/dialog_messages.py:161
+#: gajim/dialog_messages.py:158
 msgid "Upload Error"
 msgstr ""
 
-#: gajim/dialog_messages.py:166
+#: gajim/dialog_messages.py:163
 msgid "Encryption Error"
 msgstr ""
 
-#: gajim/dialog_messages.py:167
-#, fuzzy
-msgid "For the chosen encryption there is no encryption method available"
-msgstr "En tilslutning er ikke tilgængelig"
+#: gajim/dialog_messages.py:164
+msgid "There is no encryption method available for the chosen encryption."
+msgstr ""
 
-#: gajim/dialog_messages.py:171
+#: gajim/dialog_messages.py:169
 #, fuzzy
-msgid "Avatar upload failed"
+msgid "Avatar Upload Failed"
 msgstr "vCard publicering fejlede"
 
-#: gajim/privatechat_control.py:204
+#: gajim/privatechat_control.py:207
 msgid "Sending private message failed"
 msgstr "Sending af privat besked fejlede"
 
-#: gajim/privatechat_control.py:206
+#: gajim/privatechat_control.py:209
 #, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr ""
@@ -2517,7 +2486,7 @@ msgstr "Vis hjælp for kommando"
 
 #: gajim/gajim_remote.py:85
 #, fuzzy
-msgid "Lists all contacts in roster, one for each line"
+msgid "Lists all contacts in the contact list, one for each line"
 msgstr ""
 "Udskriver en liste af alle kontakter i kontaktvinduet. Hver kontakt placeres "
 "på en separat linie"
@@ -2597,11 +2566,13 @@ msgstr ""
 
 #: gajim/gajim_remote.py:118
 #, fuzzy
-msgid "Sends new chat message to a contact in the roster. Account is optional."
+msgid ""
+"Sends new chat message to a contact in the contact list. Account is optional."
 msgstr "Send en fil til en kontakt"
 
 #: gajim/gajim_remote.py:120 gajim/gajim_remote.py:130
-msgid "JID of the contact that will receive the message"
+#, fuzzy
+msgid "XMPP Address of the contact that will receive the message"
 msgstr "JID på den kontakt som skal modtage beskeden"
 
 #: gajim/gajim_remote.py:121 gajim/gajim_remote.py:132
@@ -2615,8 +2586,10 @@ msgid "if specified, the message will be sent using this account"
 msgstr "hvis specificeret vil beskeden blive sendt med denne konto"
 
 #: gajim/gajim_remote.py:127
-msgid "Sends a chat message to someone on your roster. Account is optional."
-msgstr ""
+#, fuzzy
+msgid ""
+"Sends a chat message to someone on your contact list. Account is optional."
+msgstr "Send en fil til en kontakt"
 
 #: gajim/gajim_remote.py:131
 msgid "subject"
@@ -2627,11 +2600,13 @@ msgid "message subject"
 msgstr "emne på besked"
 
 #: gajim/gajim_remote.py:138
-msgid "Sends new message to a groupchat you've joined."
+#, fuzzy
+msgid "Sends new message to a group chat you've joined."
 msgstr "Send en ny besked til en gruppesamtale du deltager i."
 
 #: gajim/gajim_remote.py:140
-msgid "JID of the room that will receive the message"
+#, fuzzy
+msgid "XMPP Address of the group chat that will receive the message"
 msgstr "JID på den rum som skal modtage beskeden"
 
 #: gajim/gajim_remote.py:147
@@ -2640,7 +2615,8 @@ msgstr "Få detaljeret information om kontakten"
 
 #: gajim/gajim_remote.py:149 gajim/gajim_remote.py:162
 #: gajim/gajim_remote.py:192
-msgid "JID of the contact"
+#, fuzzy
+msgid "XMPP Address of the contact"
 msgstr "Kontaktens JID"
 
 #: gajim/gajim_remote.py:153
@@ -2703,7 +2679,8 @@ msgstr ""
 "Skriver den nuværende tilstand af Gajims indstillinger til .config filen"
 
 #: gajim/gajim_remote.py:190
-msgid "Removes contact from roster"
+#, fuzzy
+msgid "Removes contact from contact list"
 msgstr "Fjerner kontakt fra kontaktvinduet"
 
 #: gajim/gajim_remote.py:193
@@ -2753,9 +2730,9 @@ msgid "Missing argument \"contact_jid\""
 msgstr "Manglende argument \"contact_jid\""
 
 #: gajim/gajim_remote.py:275
-#, python-format
+#, fuzzy, python-format
 msgid ""
-"'%s' is not in your roster.\n"
+"'%s' is not in your contact list.\n"
 "Please specify account for sending the message."
 msgstr ""
 "'%s' er ikke i dit kontaktvindue.\n"
@@ -2978,12 +2955,12 @@ msgstr "Slutten af ugen"
 msgid "Weekend!"
 msgstr "Weekend!"
 
-#: gajim/common/logger.py:192 gajim/common/logger.py:197
+#: gajim/common/logger.py:189 gajim/common/logger.py:194
 #, 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:217
+#: gajim/common/logger.py:214
 #, fuzzy, python-format
 msgid "Creating %s"
 msgstr "Fjern %s"
@@ -3057,22 +3034,22 @@ msgstr "%(nickname)s Loggede Ud"
 msgid "Contact Signed Out"
 msgstr "Kontakt Loggede Ud"
 
-#: gajim/common/contacts.py:455
-msgid "Not in roster"
-msgstr "Ikke i kontaktvindue"
-
 #: gajim/common/config.py:80
+#, fuzzy
 msgid ""
 "Show desktop notification even when a chat window is opened for this contact "
-"and does not have focus"
+"and does not have focus."
 msgstr ""
+"Tillad pop op påmindelser når jeg er _borte/ikke tilgængelig/travel/usynlig"
 
 #: gajim/common/config.py:81
-msgid "Play sound when user is busy"
+#, fuzzy
+msgid "Play sound even when being busy."
 msgstr "Spil en lyd når brugeren er optaget"
 
 #: gajim/common/config.py:83
-msgid "Show only online and free for chat contacts in roster."
+#, fuzzy
+msgid "Show only online and free for chat contacts in the contact list."
 msgstr ""
 "Vis kun brugere på net og brugere klar for en samtale i kontaktvinduet."
 
@@ -3081,12 +3058,15 @@ msgid "Time in minutes, after which your status changes to away."
 msgstr "Tid i minutter før din status ændres til borte."
 
 #: gajim/common/config.py:87
-msgid "$S (Away as a result of being idle more than $T min)"
+#, fuzzy
+msgid "$S (Away: Idle more than $T min)"
 msgstr "$S (Væk som et resultat af at være inaktiv i mere end $T minutter)"
 
 #: gajim/common/config.py:87
 #, fuzzy
-msgid "$S will be replaced by current status message, $T by autoawaytime."
+msgid ""
+"$S will be replaced by current status message, $T by the 'autoawaytime' "
+"value."
 msgstr ""
 "$S vil blive ombyttet med den nuværende status besked, $T ved automatisk væk "
 "tid."
@@ -3096,14 +3076,16 @@ msgid "Time in minutes, after which your status changes to not available."
 msgstr "Tid i minutter før din status ændres til ikke tilgængelig."
 
 #: gajim/common/config.py:90
-msgid "$S (Not available as a result of being idle more than $T min)"
+#, fuzzy
+msgid "$S (Not available: Idle more than $T min)"
 msgstr ""
 "$S (Ikke tilgængelig som et resultat af at være inaktiv i mere end $T "
 "minutter)"
 
 #: gajim/common/config.py:90
 #, fuzzy
-msgid "$S will be replaced by current status message, $T by autoxatime."
+msgid ""
+"$S will be replaced by current status message, $T by the 'autoxatime' value."
 msgstr ""
 "$S vil blive erstattet med den nuværende status besked, $T ved ikke "
 "tilgængelig tid."
@@ -3111,61 +3093,63 @@ msgstr ""
 #: gajim/common/config.py:93
 #, fuzzy
 msgid ""
-"When to show notification area icon. Can be 'never', 'on_event', 'always'."
+"When to show the notification area icon. Can be 'never', 'on_event', and "
+"'always'."
 msgstr ""
 "Når skal systembakke ikonet vises? Kan være 'never', 'on_event', 'always'."
 
 #: gajim/common/config.py:94
-msgid "Allow to hide the roster window even if the tray icon is not shown."
+msgid ""
+"Allow to hide the contact list window even if the notification area icon is "
+"not shown."
 msgstr ""
 
 #: gajim/common/config.py:97
 #, fuzzy
-msgid "Contact signed in notification color."
-msgstr "_Vis hændelse i kontaktvindue"
+msgid "Notification color for contacts signing in."
+msgstr "Påmind mig om kontakter logger _ind"
 
 #: gajim/common/config.py:98
 #, fuzzy
-msgid "Contact signout notification color"
-msgstr "_Vis hændelse i kontaktvindue"
+msgid "Notification color for contacts signing out."
+msgstr "Påmind mig om kontakter som logger u_d"
 
 #: gajim/common/config.py:99
 #, fuzzy
-msgid "New message notification color."
+msgid "Notification color for new message notification."
 msgstr "Forhåndsvis nye beskeder i et påmindelses pop op vinduer?"
 
 #: gajim/common/config.py:100
 #, fuzzy
-msgid "File transfer request notification color."
-msgstr "Filoverførsel Forespørgsel"
+msgid "Notification color for file transfer request."
+msgstr "_Påmind mig når en filoverførsel er færdig"
 
 #: gajim/common/config.py:101
 #, fuzzy
-msgid "File transfer error notification color."
-msgstr "Filoverførsel er afbrudt"
+msgid "Notification color for file transfer errors."
+msgstr "_Påmind mig når en filoverførsel er færdig"
 
 #: gajim/common/config.py:102
-#, fuzzy
-msgid "File transfer complete or stopped notification color."
-msgstr "Når en filoverførsel er færdig, vis en pop op påmindelse"
+msgid "Notification color for stopped or completed file transfers."
+msgstr ""
 
 #: gajim/common/config.py:103
-#, fuzzy
-msgid "Groupchat invitation notification color"
-msgstr "Gruppesamtale Invitation"
+msgid "Notification color for group chat invitations."
+msgstr ""
 
 #: gajim/common/config.py:104
 #, fuzzy
-msgid "Background color of status changed notification"
+msgid "Notification background color for changed status."
 msgstr "Baggrundsfarve på kontakter når de netop har tilsluttet sig."
 
 #: gajim/common/config.py:105
-msgid "Other dialogs color."
+msgid "Notification color for other dialogs."
 msgstr ""
 
 #: gajim/common/config.py:106
+#, fuzzy
 msgid ""
-"List (space separated) of rows (accounts and groups) that are collapsed."
+"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."
@@ -3174,8 +3158,10 @@ msgstr ""
 msgid "default"
 msgstr "standard"
 
-#: gajim/common/config.py:113
-msgid "Language used by speller"
+#: gajim/common/config.py:113 gajim/common/config.py:424
+#: gajim/common/config.py:431
+#, fuzzy
+msgid "Language used for spell checking."
 msgstr "Sprog brugt af stavelseskontrollen"
 
 #: gajim/common/config.py:114
@@ -3189,10 +3175,11 @@ msgstr ""
 "'aldrig' - skriv aldrig tiden."
 
 #: gajim/common/config.py:115
+#, fuzzy
 msgid ""
 "Print time in chats using Fuzzy Clock. Value of fuzziness from 1 to 4, or 0 "
-"to disable fuzzyclock. 1 is the most precise clock, 4 the least precise one. "
-"This is used only if print_time is 'sometimes'."
+"to disable Fuzzy Clock. 1 is the most precise clock, 4 the least precise "
+"one. This is used only if 'print_time' is 'sometimes'."
 msgstr ""
 "Print tiden i samtaler med en upræcis klokke. Værdien for hvor upræcis "
 "klokken skal være kan rangere fra 1 til 4, eller 0 for at deaktivere den "
@@ -3210,53 +3197,58 @@ msgstr "Behandle * / _ par som mulige formaterings tegn."
 #: gajim/common/config.py:120
 #, fuzzy
 msgid ""
-"If true, do not remove */_ . So *abc* will be bold but with * * not removed."
+"If enabled, do not remove */_ . So *abc* will be bold but with * * not "
+"removed."
 msgstr ""
 "Hvis sandt, ikke fjern */_. Således at *abc* bliver skrevet med fed skrift "
 "men * * bliver ikke fjernet."
 
 #: gajim/common/config.py:123
+#, fuzzy
 msgid ""
-"Uses ReStructured text markup to send HTML, plus ascii formatting if "
-"selected. For syntax, see http://docutils.sourceforge.net/docs/ref/rst/"
-"restructuredtext.html (If you want to use this, install docutils)"
+"Uses ReStructured text markup to send HTML, plus ASCII formatting if "
+"selected. Needs docutils installed (for syntax, see http://docutils."
+"sourceforge.net/docs/ref/rst/restructuredtext.html)."
 msgstr ""
 "Bruger ReStruktureret tekst redigering til at sende HTML, plus ascii "
 "formatering hvis valgt. For syntaks, se http://docutils.sourceforge.net/docs/"
 "ref/rst/restructuredtext.html (Hvis du vil bruge dette, installer docutils)"
 
 #: gajim/common/config.py:132
+#, fuzzy
 msgid ""
-"Character to add after nickname when using nick completion (tab) in group "
-"chat."
+"Character to add after nickname when using nickname completion (tab) in "
+"group chat."
 msgstr ""
 "Tegn som tilføjes efter kælenavn når der bruges kælenavnsfuldførelse (tab) i "
 "en gruppesamtale."
 
 #: gajim/common/config.py:133
+#, fuzzy
 msgid ""
-"Character to propose to add after desired nickname when desired nickname is "
-"used by someone else in group chat."
+"Character to propose to add after desired nickname when nickname is already "
+"used in group chat."
 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:155
 msgid ""
-"If true, Gajim will save roster position when hiding roster, and restore it "
-"when showing roster."
+"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:161
-msgid "Place the roster on the right in single window mode"
+msgid "Place the contact list on the right in single window mode"
 msgstr ""
 
 #: gajim/common/config.py:167
 #, fuzzy
 msgid ""
-"This option let you customize timestamp that is printed in conversation. For "
-"example \"[%H:%M] \" will show \"[hour:minute] \". See python doc on "
-"strftime for full documentation: http://docs.python.org/lib/module-time.html"
+"This option lets you customize the timestamp that is printed in "
+"conversation. For example '[%H:%M] ' will show '[hour:minute] '. See python "
+"doc on strftime for full documentation (https://docs.python.org/3/library/"
+"time.html)."
 msgstr ""
 "Denne valgmulighed giver dig muligheden for at tilpasse hvordan "
 "klokkeslettet bliver skrevet i en samtale. For eksempel [%H:%M] vil vise "
@@ -3264,269 +3256,266 @@ msgstr ""
 "org/lib/module-time.html"
 
 #: gajim/common/config.py:168
-msgid "Characters that are printed before the nickname in conversations"
+#, 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:169
-msgid "Characters that are printed after the nickname in conversations"
+#, 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:170
-msgid "Add * and [n] in roster title?"
-msgstr "Tilføj * og [n] i tittelen på kontaktvinduet?"
+#, 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:171
 #, fuzzy
 msgid ""
-"How many history messages should be restored when a chat tab/window is "
-"reopened?"
+"Number of messages from chat history to be restored when a chat tab/window "
+"is reopened."
 msgstr ""
 "Hvor mange linjer skal huskes fra forrige samtale når et samtale vindue/"
 "faneblad genåbnes."
 
 #: gajim/common/config.py:172
-msgid "How far back in time (minutes) history is restored. -1 means no limit."
-msgstr ""
-
-#: gajim/common/config.py:173
-#, fuzzy
 msgid ""
-"How many lines to request from server when entering a groupchat. -1 means no "
-"limit"
+"How far back in time (minutes) chat history is restored. -1 means no limit."
 msgstr ""
-"Hvor mange linjer skal hentes fra serveren når man deltager i en "
-"gruppesamtale."
 
-#: gajim/common/config.py:174
+#: gajim/common/config.py:173
 #, fuzzy
 msgid ""
-"Minutes of backlog to request when entering a groupchat. -1 means no limit"
-msgstr ""
-"Hvor mange minutter tilbage skal der hentes log fra når man deltager i en "
-"gruppesamtale."
-
-#: gajim/common/config.py:175
-msgid ""
-"How many seconds to wait before trying to autorejoin to a conference you are "
-"being disconnected from. Set to 0 to disable autorejoining."
+"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 ""
 "Hvor mange sekunder skal der ventes før der prøves at oprette en ny "
 "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:176
-msgid "Should autorejoin be activated when kicked from a conference?"
+#: gajim/common/config.py:174
+msgid ""
+"Should automatic rejoin be activated when you were kicked from a group chat?"
 msgstr ""
 
-#: gajim/common/config.py:177
-msgid ""
-"Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
-"Client default behaviour)."
+#: gajim/common/config.py:175
+#, 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:179
-msgid "How many lines to store for Ctrl+KeyUP."
+#: gajim/common/config.py:177
+#, 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:182
+#: gajim/common/config.py:180
 #, fuzzy, python-format
 msgid ""
-"Either custom URL with %%s in it where %%s is the word/phrase or "
-"'WIKTIONARY' which means use Wikitionary."
+"Either a custom URL with %%s in it (where %%s is the word/phrase) or "
+"'WIKTIONARY' (which means use Wikitionary)."
 msgstr ""
 "Enten en tilpasset url som indeholder %s hvor %s er ordet/frasen, eller "
 "'WIKTIONARY' som betyder brug wiktionary."
 
-#: gajim/common/config.py:185
+#: gajim/common/config.py:183
 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:187
+#: gajim/common/config.py:185
+#, fuzzy
 msgid ""
-"When not printing time for every message (print_time==sometimes), print it "
+"When not printing time for every message ('print_time'==sometimes), print it "
 "every x minutes."
 msgstr ""
 "Når der ikke skrives tid for hver besked (print_time==sometimes), skriv "
 "tiden for hver x minutter."
 
-#: gajim/common/config.py:188
+#: gajim/common/config.py:186
 msgid "Ask before pasting an image."
 msgstr ""
 
-#: gajim/common/config.py:189
+#: gajim/common/config.py:187
 msgid "Ask before closing a group chat tab/window."
 msgstr "Spørg før et gruppesamtale vindue/faneblad lukkes."
 
-#: gajim/common/config.py:190
+#: gajim/common/config.py:188
 #, fuzzy
 msgid ""
-"Always ask for confirmation before closing groupchats with any of the JIDs "
-"on this space separated list."
+"Always ask for confirmation before closing group chats with any of the XMPP "
+"Addresses on this list (space separated)."
 msgstr ""
 "Altid spørg før et gruppesamtale vindue/faneblad lukkes, hvis den findes i "
 "denne mellemrums separerede liste af gruppesamtale jids."
 
-#: gajim/common/config.py:191
+#: gajim/common/config.py:189
 #, fuzzy
 msgid ""
-"Never ask for confirmation before closing groupchats with any of the JIDs on "
-"this space separated list."
+"Never ask for confirmation before closing group chats with any of the XMPP "
+"Addresses on this list (space separated)."
 msgstr ""
 "Aldrig spørg før et gruppesamtale vindue/faneblad lukkes, hvis den findes i "
 "denne mellemrums separerede liste af gruppesamtale jids."
 
-#: gajim/common/config.py:192
+#: gajim/common/config.py:190
 #, fuzzy
 msgid ""
-"Ask before closing tabbed chat window if there are controls that can lose "
-"data (chat, private chat, groupchat that will not be minimized)"
+"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 ""
 "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:195
+#: gajim/common/config.py:193
 #, fuzzy
 msgid ""
-"Comma separated list of sent hosts, in addition of local interfaces, for "
-"File Transfer in case of address translation/port forwarding."
+"List of send hosts (comma separated) in addition to local interfaces for "
+"file transfers (in case of address translation/port forwarding)."
 msgstr ""
 "Komma separeret liste af værter som vi sender, i tillæg til lokale "
 "grænseflader, for filoverførsler i tilfælde af adresse omskrivning/port "
 "videresending."
 
-#: gajim/common/config.py:196
+#: gajim/common/config.py:194
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "IEC standard siger KiB = 1024 byte, KB = 1000 byte."
 
-#: gajim/common/config.py:198
+#: gajim/common/config.py:196
 #, fuzzy
 msgid "Notify of events in the notification area."
 msgstr "Vis påmindelse af hændelser i statusfelt ikonet."
 
-#: gajim/common/config.py:199
+#: gajim/common/config.py:197
 msgid ""
-"If False, Gajim will display a static event icon instead of the blinking "
-"status icon in the notification area when notifying on event."
+"If disabled, Gajim will display a static event icon instead of the blinking "
+"status icon in the notification area when notifying about an event."
 msgstr ""
 
-#: gajim/common/config.py:205
+#: gajim/common/config.py:203
 msgid "Show tab when only one conversation?"
 msgstr "Vis et faneblad når der kun er en samtale?"
 
-#: gajim/common/config.py:206
+#: gajim/common/config.py:204
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "Vis faneblade i samtalevinduer?"
 
-#: gajim/common/config.py:207
+#: gajim/common/config.py:205
 msgid "Show close button in tab?"
 msgstr "Vis lukke knap i faneblad?"
 
-#: gajim/common/config.py:220
+#: gajim/common/config.py:218
 msgid "Preview new messages in notification popup?"
 msgstr "Forhåndsvis nye beskeder i et påmindelses pop op vinduer?"
 
-#: gajim/common/config.py:223
+#: gajim/common/config.py:221
+#, fuzzy
 msgid ""
-"A semicolon-separated list of words that will be highlighted in group chats."
+"A list of words (semicolon separated) that will be highlighted in group "
+"chats."
 msgstr ""
 "En semikolon-separeret liste af ord som vil blive fremhævet i gruppesamtaler."
 
-#: gajim/common/config.py:224
+#: gajim/common/config.py:222
 #, fuzzy
 msgid ""
-"If true, quits Gajim when X button of Window Manager is clicked. This "
-"setting is taken into account only if notification icon is used."
+"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 ""
 "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:225
+#: gajim/common/config.py:223
 msgid ""
-"If true, Gajim hides the Roster window on pressing the X button instead of "
-"minimizing into the Dock."
+"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:226
+#: gajim/common/config.py:224
 #, fuzzy
 msgid ""
-"If true, Gajim will display an icon on each tab containing unread messages. "
-"Depending on the theme, this icon may be animated."
+"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:227
+#: gajim/common/config.py:225
 #, fuzzy
 msgid ""
-"If true, Gajim will display the status message, if not empty, for every "
-"contact under the contact name in roster window."
+"If enabled, Gajim will display the status message (if not empty) underneath "
+"the contact name in the contact list window."
 msgstr ""
 "Hvis Sandt, vil Gajim vise status beskeder, hvis ikke tomme, for hver "
 "kontakt under kontaktnavnet i kontaktvinduet."
 
-#: gajim/common/config.py:233
-msgid "Define the position of the avatar in roster. Can be left or right"
+#: gajim/common/config.py:231
+#, 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:234
+#: gajim/common/config.py:232
 #, fuzzy
 msgid ""
-"If False, Gajim will no longer print status line in chats when a contact "
-"changes their status and/or their status message."
+"If disabled, Gajim will no longer print status messages in chats when a "
+"contact changes their status (and/or their status message)."
 msgstr ""
 "Hvis Falsk, vil Gajim ikke længere skrive statuslinjer i samtaler når en "
 "kontakt ændrer hans eller hendes status og/eller hans eller hendes status "
 "besked."
 
-#: gajim/common/config.py:235
+#: gajim/common/config.py:233
 #, fuzzy
 msgid ""
 "Default Setting: Show a status message for every join or leave in a group "
-"chat"
+"chat."
 msgstr "Ikke i stand til at deltage i gruppesamtale."
 
-#: gajim/common/config.py:236
+#: gajim/common/config.py:234
+#, fuzzy
 msgid ""
-"Default Setting: Show a status message for all status (away, dnd, etc.) "
-"changes of users in a group chat"
-msgstr ""
+"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:238
-msgid "Log XHTML messages instead of plain text messages."
+#: gajim/common/config.py:236
+msgid "Store XHTML messages in chat history instead of plain text messages."
 msgstr ""
 
-#: gajim/common/config.py:239
+#: gajim/common/config.py:237
 msgid "Don't show avatar for the transport itself."
 msgstr "Ikke vis en avatar for selve transporten."
 
-#: gajim/common/config.py:240
-msgid "Don't show roster in the system taskbar."
+#: gajim/common/config.py:238
+#, fuzzy
+msgid "Don't show contact list window in the system taskbar."
 msgstr "Ikke hvis kontaktvindue i vindueslisten."
 
-#: gajim/common/config.py:241
+#: gajim/common/config.py:239
 #, fuzzy
 msgid ""
-"If true, make the window flash (the default behaviour in most Window "
-"Managers) when holding pending events."
+"If enabled, Gajim makes the window flash (the default behaviour in most "
+"Window Managers) when holding pending events."
 msgstr ""
 "Hvis Sandt og GTK+ og PyGTK installerede versioner er mindst 2.8, blink med "
 "vinduet (standard adfærd i de fleste vindueshåndterere) når det indeholder "
 "ventende begivenheder."
 
-#: gajim/common/config.py:245
+#: gajim/common/config.py:243
 #, fuzzy
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
 "'always_with_roster' - Like 'always' but the messages are in a single window "
-"along with the roster.\n"
+"along with the contact list.\n"
 "'never' - All messages get their own window.\n"
 "'peracct' - Messages for each account are sent to a specific window.\n"
-"'pertype' - Each message type (e.g. chats vs. groupchats) is sent to a "
+"'pertype' - Each message type (e.g. chats vs. group chats) is sent to a "
 "specific window."
 msgstr ""
 "Kontrollerer vinduet hvor nye beskeder er placeret.\n"
@@ -3539,121 +3528,130 @@ msgstr ""
 "'pertype' - Hver besked type (for eks. samtaler versus gruppesamtaler) "
 "bliver sendt til et specifikt vindue."
 
-#: gajim/common/config.py:246
+#: gajim/common/config.py:244
 msgid ""
-"Show roster on startup.\n"
-"'always' - Always show roster.\n"
-"'never' - Never show roster.\n"
-"'last_state' - Restore the last state roster."
+"Show contact list window on startup.\n"
+"'always' - Always show contact list window.\n"
+"'never' - Never show contact list window.\n"
+"'last_state' - Restore last state of the contact list window."
 msgstr ""
 
-#: gajim/common/config.py:247
-msgid "If False, you will no longer see the avatar in the chat window."
+#: gajim/common/config.py:245
+#, 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:248
+#: gajim/common/config.py:246
 #, fuzzy
-msgid "If true, pressing the escape key closes a tab/window."
+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:249
-msgid "Hides the banner in a group chat window"
+#: gajim/common/config.py:247
+#, fuzzy
+msgid "Hides the banner in a group chat window."
 msgstr "Skjuler banneret i et gruppesamtale vindue"
 
-#: gajim/common/config.py:250
-msgid "Hides the banner in two persons chat window"
-msgstr "Skjuler banneret i et to personers samtalevindue"
+#: gajim/common/config.py:248
+#, fuzzy
+msgid "Hides the banner in a 1:1 chat window."
+msgstr "Skjuler banneret i et gruppesamtale vindue"
 
-#: gajim/common/config.py:251
-msgid "Hides the group chat occupants list in group chat window."
+#: gajim/common/config.py:249
+#, fuzzy
+msgid "Hides the group chat participants list in a group chat window."
 msgstr "Skjuler gruppesamtale deltagerlisten i gruppesamtale vinduer."
 
-#: gajim/common/config.py:252
+#: gajim/common/config.py:250
+#, fuzzy
 msgid ""
 "In a chat, show the nickname at the beginning of a line only when it's not "
-"the same person talking than in previous message."
+"the same person talking as in the previous message."
 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:253
+#: gajim/common/config.py:251
 msgid "Indentation when using merge consecutive nickname."
 msgstr "Indrykning når man fletter ens kælenavne."
 
-#: gajim/common/config.py:254
-msgid "Ctrl-Tab go to next composing tab when none is unread."
+#: gajim/common/config.py:252
+#, 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:255
+#: gajim/common/config.py:253
 #, fuzzy
 msgid ""
-"Show the confirm metacontacts creation dialog or not? Empty string means "
-"never show the dialog."
+"Show a confirmation dialog to create metacontacts? Empty string means never "
+"show the dialog."
 msgstr ""
-"Skal vi vise bekræftelses vinduet for oprettelse af metakontakter? Tom "
-"streng betyder at vi aldrig viser vinduet."
+"Skal vi vise bekræftelses vinduet for blokering af kontakter? Tom streng "
+"betyder at vi aldrig viser vinduet."
 
-#: gajim/common/config.py:256
+#: gajim/common/config.py:254
 #, fuzzy
 msgid ""
-"Show the confirm block contact dialog or not? Empty string means never show "
+"Show a confirmation dialog to block a contact? Empty string means never show "
 "the dialog."
 msgstr ""
 "Skal vi vise bekræftelses vinduet for blokering af kontakter? Tom streng "
 "betyder at vi aldrig viser vinduet."
 
-#: gajim/common/config.py:257
+#: gajim/common/config.py:255
 #, fuzzy
 msgid ""
-"Show the confirm custom status dialog or not? Empty string means never show "
-"the dialog."
+"Show a confirmation dialog for a custom status? Empty string means never "
+"show the dialog."
 msgstr ""
 "Skal vi vise bekræftelses vinduet for ændring af personlig status? Tom "
 "streng betyder at vi aldrig viser vinduet."
 
-#: gajim/common/config.py:258
+#: gajim/common/config.py:256
 #, fuzzy
 msgid ""
-"If true, you will be able to set a negative priority to your account in "
-"account modification window. BE CAREFUL, when you are logged in with a "
-"negative priority, you will NOT receive any message from your server."
+"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 ""
 "Hvis Sandt vil du være i stand til at sætte en negativ prioritet til din "
 "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:259
+#: gajim/common/config.py:257
 #, fuzzy
 msgid ""
-"If true, Gajim will show number of online and total contacts in account and "
-"group rows."
+"If enabled, Gajim will show both the number of online and total contacts in "
+"account rows as well as in group rows."
 msgstr ""
 "Hvis Sandt vil Gajim vise antallet af online og totale kontakter i konto og "
 "gruppe rækker."
 
-#: gajim/common/config.py:260
+#: gajim/common/config.py:258
+#, fuzzy
 msgid ""
-"Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
-"as if they were of this type"
+"Can be empty, 'chat' or 'normal'. If not empty, all incoming messages are "
+"treated as if they were of this type."
 msgstr ""
 "Kan være tom, 'chat' eller 'normal'. Hvis ikke tom, behandl alle indkommende "
 "beskeder som om de var af denne type"
 
-#: gajim/common/config.py:261
+#: gajim/common/config.py:259
 #, fuzzy
 msgid ""
-"If true, Gajim will scroll and select the contact who sent you the last "
-"message, if chat window is not already opened."
+"If enabled, Gajim will scroll and select the contact who sent you the last "
+"message, if the chat window is not already opened."
 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:262
+#: gajim/common/config.py:260
 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:263
+#: gajim/common/config.py:261
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
@@ -3661,143 +3659,156 @@ msgstr ""
 "Maksimum antal linjer som bliver skrevet i samtaler. De ældste linjer bliver "
 "slettet."
 
-#: gajim/common/config.py:264
+#: gajim/common/config.py:262
 #, fuzzy
 msgid ""
-"If true, notification windows from notification-daemon will be attached to "
-"notification icon."
+"If enabled, notification windows from notification-daemon will be attached "
+"to the notification area icon."
 msgstr ""
 "Hvis sandt vil påmindelses vinduer fra påmindelses dæmonen blive fæstet til "
 "ikonet i systembakken."
 
-#: gajim/common/config.py:265
+#: gajim/common/config.py:263
 msgid "Choose interval between 2 checks of idleness."
 msgstr "Vælg interval mellem 2 kontroller for ingen aktivitet."
 
-#: gajim/common/config.py:266
+#: gajim/common/config.py:264
+#, fuzzy
 msgid ""
-"Valid uri schemes. Only schemes in this list will be accepted as \"real\" "
-"uri. (mailto and xmpp are handled separately)"
+"Valid URI schemes. Only schemes in this list will be accepted as 'real' URI "
+"(mailto and xmpp are handled separately)."
 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:267
+#: gajim/common/config.py:265
 #, fuzzy
-msgid "If true, completion in groupchats will be like a shell auto-completion"
+msgid ""
+"If enabled, completion in group chats will be like a shell auto-completion."
 msgstr ""
 "Hvis sandt, vil færdiggørelse i gruppe samtaler fungere på samme måde som "
 "færdiggørelse i kommandolinjen"
 
-#: gajim/common/config.py:272
-msgid "Optionally fix jingle output video framerate. Example: 10/1 or 25/2"
+#: gajim/common/config.py:270
+msgid "Optionally fix Jingle output video framerate. Example: 10/1 or 25/2."
 msgstr ""
 
-#: gajim/common/config.py:273
-msgid "Optionally resize jingle output video. Example: 320x240"
+#: gajim/common/config.py:271
+msgid "Optionally resize Jingle output video. Example: 320x240."
 msgstr ""
 
-#: gajim/common/config.py:274
-msgid "If true, You will also see your webcam"
+#: gajim/common/config.py:272
+msgid "If enabled, you will see your webcam's video stream as well."
 msgstr ""
 
-#: gajim/common/config.py:277
+#: gajim/common/config.py:275
 msgid ""
-"If true, Gajim will try to use a STUN server when using Jingle. The one in "
-"\"stun_server\" option, or the one given by the XMPP server."
+"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:278
+#: gajim/common/config.py:276
 msgid "STUN server to use when using Jingle"
 msgstr ""
 
-#: gajim/common/config.py:279
+#: gajim/common/config.py:277
 msgid ""
-"If true, Gajim will show affiliation of groupchat occupants by adding a "
-"colored square to the status icon"
+"If enabled, Gajim will show affiliation of group chat participants by adding "
+"a colored square to the status icon."
 msgstr ""
 
-#: gajim/common/config.py:280
+#: gajim/common/config.py:278
 msgid ""
 "Proxy used for all outgoing connections if the account does not have a "
-"specific proxy configured"
+"specific proxy configured."
 msgstr ""
 
-#: gajim/common/config.py:281
-msgid "If true, Gajim will ignore incoming attention requests (\"wizz\")."
+#: gajim/common/config.py:279
+msgid "If enabled, Gajim will ignore incoming attention requests ('wizz')."
 msgstr ""
 
-#: gajim/common/config.py:282
+#: gajim/common/config.py:280
 msgid ""
 "If enabled, Gajim will reopen chat windows that were opened last time Gajim "
 "was closed."
 msgstr ""
 
-#: gajim/common/config.py:283
+#: gajim/common/config.py:281
 #, fuzzy
 msgid ""
-"If enabled, Gajim will show an icon to show that sent message has been "
-"received by your contact"
+"If enabled, Gajim will display an icon to show that sent messages have been "
+"received by your contact."
 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:284
-msgid "Show a mini avatar in chat window tabs and in window icon"
+#: gajim/common/config.py:282
+msgid "Show a mini avatar in chat window tabs and as the window's icon."
 msgstr ""
 
-#: gajim/common/config.py:285
+#: gajim/common/config.py:283
 #, fuzzy
-msgid "If true, Gajim will use the Systems Keyring to store account passwords."
+msgid ""
+"If enabled, Gajim will use the System's Keyring to store account passwords."
 msgstr ""
 "Hvis Sandt vil Gajim bruge Gnome Nøglering (hvis tilgængelig) til at gemme "
 "konto adgangskoder."
 
+#: gajim/common/config.py:284
+msgid "If enabled, Gajim will execute XEP-0146 Commands."
+msgstr ""
+
+#: gajim/common/config.py:285
+msgid "2: System, 1: Enabled, 0: Disabled"
+msgstr ""
+
 #: gajim/common/config.py:286
-msgid "If true, Gajim will execute XEP-0146 Commands."
+msgid "Options in days which can be chosen in the sync threshold menu"
 msgstr ""
 
 #: gajim/common/config.py:287
-msgid "2: System, 1: Enabled, 0: Disabled"
+msgid ""
+"Maximum history in days we request from a public group chat archive. 0: As "
+"much as possible."
 msgstr ""
 
 #: gajim/common/config.py:288
-msgid "Options in days which can be chosen in the sync threshold menu"
+msgid ""
+"Maximum history in days we request from a private group chat archive. 0: As "
+"much as possible."
 msgstr ""
 
 #: gajim/common/config.py:289
 msgid ""
-"Maximum history in days we request from a public room archive. 0: As much as "
-"possible"
+"If enabled, Gajim shows the group chat subject in the chat window when "
+"joining."
 msgstr ""
 
 #: gajim/common/config.py:290
+#, fuzzy
 msgid ""
-"Maximum history in days we request from a private room archive. 0: As much "
-"as possible"
+"If enabled, the contact row is colored according to the current chat state "
+"of the contact."
 msgstr ""
+"Hvis valgt vil Gajim tillade andre at kunne se det operativ system du bruger"
 
 #: gajim/common/config.py:291
-msgid "If the room subject is shown in chat on join"
+#, fuzzy
+msgid ""
+"If enabled, the tab is colored according to the current chat state of the "
+"contact."
 msgstr ""
+"Hvis valgt vil Gajim tillade andre at kunne se det operativ system du bruger"
 
 #: gajim/common/config.py:292
+#, fuzzy
 msgid ""
-"If the contact row is colored according to the current chatstate of the "
-"contact"
+"Shows a text in the banner that describes the current chat state of the "
+"contact."
 msgstr ""
+"Hvis valgt vil Gajim tillade andre at kunne se det operativ system du bruger"
 
 #: gajim/common/config.py:293
-msgid "If the tab is colored according to the current chatstate of the contact"
-msgstr ""
-
-#: gajim/common/config.py:294
-msgid ""
-"Shows a text in the banner that describes the current chatstate of the "
-"contact"
-msgstr ""
-
-#: gajim/common/config.py:295 gajim/common/config.py:424
 #, fuzzy
 msgid ""
 "Chat state notifications that are sent to contacts. Possible values: all, "
@@ -3806,76 +3817,86 @@ msgstr ""
 "Send samtale status påmindelser. Kan være en af disse: all, composing_only, "
 "disabled."
 
-#: gajim/common/config.py:296 gajim/common/config.py:438
+#: gajim/common/config.py:294
 #, fuzzy
 msgid ""
 "Chat state notifications that are sent to the group chat. Possible values: "
-"all, composing_only, disabled"
+"'all', 'composing_only', 'disabled'"
 msgstr ""
 "Send samtale status påmindelser. Kan være en af disse: all, composing_only, "
 "disabled."
 
-#: gajim/common/config.py:312
+#: gajim/common/config.py:297
+msgid "API Preferences. Possible values: 'http', 'iq'"
+msgstr ""
+
+#: gajim/common/config.py:313
+#, fuzzy
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
-"defined in autopriority_* options."
+"defined in 'autopriority_*' options."
 msgstr ""
 "Prioriteten vil ændres automatisk ifølge din status. Prioriteter er "
 "defineret i autopriority_* indstillingerne."
 
-#: gajim/common/config.py:320
+#: gajim/common/config.py:321
+#, fuzzy
 msgid ""
-"Status used to autoconnect as. Can be online, chat, away, xa, dnd, "
-"invisible. NOTE: this option is used only if restore_last_status is disabled"
+"Status to be used automatically when connecting. Can be 'online', 'chat', "
+"'away', 'xa', 'dnd' or 'invisible'. NOTE: This option is used only if "
+"'restore_last_status' is disabled."
 msgstr ""
 "Din status som bruges når du automatisk forbindes. Kan være online, samtale, "
 "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:321
-msgid "If enabled, restore the last status that was used."
+#: gajim/common/config.py:322
+#, fuzzy
+msgid "If enabled, the last status will be restored."
 msgstr "Hvis valgt, gendan den sidste status som var brugt."
 
-#: gajim/common/config.py:322
+#: gajim/common/config.py:323
 #, fuzzy
 msgid ""
-"If true, Contacts requesting authorization will be automatically accepted."
+"If enabled, Contacts requesting authorization will be accepted automatically."
 msgstr ""
 "Hvis sandt, kontakter som beder om autorisering vil automatisk blive "
 "accepteret."
 
-#: gajim/common/config.py:323
+#: gajim/common/config.py:324
+#, fuzzy
 msgid ""
-"If False, this account will be disabled and will not appear in roster window."
+"If disabled, this account will be disabled and will not appear in the "
+"contact list window."
 msgstr ""
 "Hvis Falsk vil denne konto blive deaktiveret og vil ikke vises i "
 "kontaktvinduet."
 
-#: gajim/common/config.py:327
-msgid "Allow plaintext connections"
+#: gajim/common/config.py:328
+msgid "Allow plaintext connections."
 msgstr ""
 
-#: gajim/common/config.py:330
+#: gajim/common/config.py:331
 msgid ""
-"List (space separated) of authentication mechanisms to try. Can contain "
-"ANONYMOUS, EXTERNAL, GSSAPI, SCRAM-SHA-1-PLUS, SCRAM-SHA-1, DIGEST-MD5, "
-"PLAIN, X-MESSENGER-OAUTH2 or XEP-0078"
+"List of authentication mechanisms to try (space separated). Can contain "
+"'ANONYMOUS', 'EXTERNAL', 'GSSAPI', 'SCRAM-SHA-1-PLUS', 'SCRAM-SHA-1', "
+"'DIGEST-MD5', 'PLAIN', 'X-MESSENGER-OAUTH2' or 'XEP-0078'."
 msgstr ""
 
-#: gajim/common/config.py:331
+#: gajim/common/config.py:332
 #, fuzzy
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection. "
-"Can be 'warn', 'connect', 'disconnect'"
+"Can be 'warn', 'connect' or 'disconnect'."
 msgstr ""
 "Hvis en advarsels dialog før en adgangskode sendes over en forbindelse i "
 "klar tekst."
 
-#: gajim/common/config.py:332
+#: gajim/common/config.py:333
 msgid "Show a warning dialog before using standard SSL library."
 msgstr "Hvis en advarsels dialog før brugen af standard SSL biblioteket."
 
-#: gajim/common/config.py:333
+#: gajim/common/config.py:334
 #, fuzzy
 msgid ""
 "Show a warning dialog before sending PLAIN password over a plain connection."
@@ -3883,255 +3904,272 @@ msgstr ""
 "Hvis en advarsels dialog før en adgangskode sendes over en forbindelse i "
 "klar tekst."
 
-#: gajim/common/config.py:334
-msgid "Space separated list of ssl errors to ignore."
-msgstr "Mellemrums adskilt liste af ssl fejl som skal ignoreres."
+#: gajim/common/config.py:335
+msgid "List of SSL errors to ignore (space separated)."
+msgstr ""
 
-#: gajim/common/config.py:340
+#: gajim/common/config.py:341
 msgid ""
-"Space separated list of JIDs for which you do not want to store logs. You "
-"can also add account name to log nothing for this account."
+"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:341
+#: gajim/common/config.py:342
 msgid ""
-"Space separated list of JIDs for which you accept to not log conversations "
-"if he does not want to."
+"List of XMPP Addresses (space separated) for which you accept to not store "
+"chat history if your contact does not want to."
 msgstr ""
 
-#: gajim/common/config.py:343
-msgid "Whitespace sent after inactivity"
+#: gajim/common/config.py:344
+#, fuzzy
+msgid "If enabled, a whitespace is sent after inactivity (keep alive)."
 msgstr "Mellemrum sendt efter inaktivitet"
 
-#: gajim/common/config.py:344
-msgid "XMPP ping sent after inactivity"
+#: gajim/common/config.py:345
+#, fuzzy
+msgid "If enabled, an XMPP ping is sent after inactivity (ping alive)."
 msgstr "XMPP ping sendt efter inaktivitet"
 
-#: gajim/common/config.py:348
+#: gajim/common/config.py:349
 #, fuzzy
 msgid ""
-"How many seconds to wait for the answer of ping alive packet before trying "
-"to reconnect?"
+"How many seconds to wait for the answer of a ping alive packet before trying "
+"to reconnect."
 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:352
-msgid "Jabberd2 workaround"
+#: gajim/common/config.py:353
+#, fuzzy
+msgid "Jabberd2 workaround."
 msgstr "Jabberd2 tilpasning"
 
-#: gajim/common/config.py:355
+#: gajim/common/config.py:356
+#, fuzzy
 msgid ""
-"If checked, Gajim will use your IP and proxies defined in "
-"file_transfer_proxies option for file transfer."
+"If enabled, Gajim will use your IP and proxies defined in "
+"'file_transfer_proxies' option for file transfers."
 msgstr ""
 "Hvis valgt vil Gajim bruge din IP og proxy defineret i file_transfer_proxies "
 "indstillingen for filoverførsler."
 
-#: gajim/common/config.py:356
+#: gajim/common/config.py:357
 msgid ""
-"If true, Gajim will test file transfer proxies on startup to be sure it "
-"works. Openfire's proxies are known to fail this test even if they work."
+"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:369
-msgid "Answer to receipt requests"
-msgstr "Svar til modtagelses forespørgsel"
-
 #: gajim/common/config.py:370
-msgid "Sent receipt requests"
-msgstr "Sendte modtagelses forespørgsler"
+#, 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:379
+#: gajim/common/config.py:371
+msgid "If enabled, Gajim will send message receipt requests."
+msgstr ""
+
+#: gajim/common/config.py:380
 #, 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:380
+#: gajim/common/config.py:381
 #, fuzzy
 msgid "Allow Gajim to send your local time."
 msgstr "%s vil gerne sende dig en fil."
 
-#: gajim/common/config.py:383
+#: gajim/common/config.py:384
 #, fuzzy
-msgid "Message that is sent to contacts you want to add"
+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:384
-msgid ""
-"If enabled, Gajim will send your local IPs so your contact can connect to "
-"your machine to transfer files."
-msgstr ""
-
 #: gajim/common/config.py:385
+#, fuzzy
 msgid ""
-"Space separated list of JIDs for which chat window will be re-opened on next "
-"startup."
+"If enabled, Gajim will send your local IP so your contact can connect to "
+"your machine for file transfers."
 msgstr ""
+"Hvis valgt vil Gajim bruge din IP og proxy defineret i file_transfer_proxies "
+"indstillingen for filoverførsler."
 
-#: gajim/common/config.py:387
-msgid "HTTP Upload: Enable HTTPS Verification"
+#: gajim/common/config.py:386
+msgid ""
+"List of XMPP Addresses (space separated) for which the chat window will be "
+"re-opened on next startup."
 msgstr ""
 
 #: gajim/common/config.py:388
-msgid ""
-"Preferred file transfer mechanism for file drag&drop on chat window. Can be "
-"'httpupload' (default) or 'jingle'"
+msgid "HTTP File Upload: Enable HTTPS Verification."
 msgstr ""
 
 #: gajim/common/config.py:389
-msgid "Allow cert verification with POSH"
+msgid ""
+"Preferred file transfer mechanism for file drag&drop on a chat window. Can "
+"be 'httpupload' (default) or 'jingle'."
 msgstr ""
 
-#: gajim/common/config.py:423 gajim/common/config.py:430
+#: gajim/common/config.py:390
 #, fuzzy
-msgid "Language for which misspelled words will be checked"
-msgstr "Sprog som vi vil bruge til at kontrollere for stavefejl"
-
-#: gajim/common/config.py:427
-msgid "The currently active encryption for that contact"
-msgstr ""
+msgid "Allow certificate verification with POSH."
+msgstr "SSL certifikat fejl"
 
-#: gajim/common/config.py:431
+#: gajim/common/config.py:425
 #, fuzzy
 msgid ""
-"How many lines to request from server when entering a groupchat. -1 means no "
-"limit, -2 means global value"
+"Chat state notifications that are sent to contacts. Possible values: 'all', "
+"'composing_only', 'disabled'"
 msgstr ""
-"Hvor mange linjer skal hentes fra serveren når man deltager i en "
-"gruppesamtale."
+"Send samtale status påmindelser. Kan være en af disse: all, composing_only, "
+"disabled."
 
-#: gajim/common/config.py:432
+#: gajim/common/config.py:428
 #, fuzzy
+msgid "The currently active encryption for that contact."
+msgstr "Aktiver ESessions kryptering for denne konto."
+
+#: gajim/common/config.py:432
 msgid ""
-"Minutes of backlog to request when entering a groupchat. -1 means no limit, "
-"-2 means global value"
+"If enabled, a notification is created for every message in this group chat."
 msgstr ""
-"Hvor mange minutter tilbage skal der hentes log fra når man deltager i en "
-"gruppesamtale."
 
 #: gajim/common/config.py:433
-msgid "State whether a notification is created for every message in this room"
-msgstr ""
-
-#: gajim/common/config.py:434
+#, fuzzy
 msgid ""
-"Show a status message for all status (away, dnd, etc.) changes of users in a "
-"group chat"
-msgstr ""
+"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:435
+#: gajim/common/config.py:434
 #, fuzzy
-msgid "Show a status message for every join or leave in a group chat"
+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:435
+msgid ""
+"If enabled, the group chat is minimized into the contact list when joining "
+"automatically."
+msgstr ""
+
 #: gajim/common/config.py:436
-msgid "If the group chat is minimized into the roster on autojoin"
+msgid ""
+"If enabled, the group chat is minimized into the contact list when closing "
+"it."
 msgstr ""
 
 #: gajim/common/config.py:437
-msgid "If the group chat is minimized into the roster on close"
+#, fuzzy
+msgid ""
+"Chat state notifications that are sent to the group chat. Possible values: "
+"'all', 'composing_only' or 'disabled'."
 msgstr ""
+"Send samtale status påmindelser. Kan være en af disse: all, composing_only, "
+"disabled."
 
-#: gajim/common/config.py:441
+#: gajim/common/config.py:440
 msgid ""
-"State whether plugins should be activated on startup (this is saved on Gajim "
-"exit). This option SHOULD NOT be used to (de)activate plug-ins. Use GUI "
-"instead."
+"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:446 gajim/common/const.py:281
+#: gajim/common/config.py:445 gajim/common/const.py:315
 msgid "Sleeping"
 msgstr "Sover"
 
-#: gajim/common/config.py:447
+#: gajim/common/config.py:446
 msgid "Back soon"
 msgstr "Snart tilbage"
 
-#: gajim/common/config.py:447
+#: gajim/common/config.py:446
 msgid "Back in some minutes."
 msgstr "Tilbage om få minutter."
 
-#: gajim/common/config.py:448 gajim/common/const.py:247
+#: gajim/common/config.py:447 gajim/common/const.py:281
 msgid "Eating"
 msgstr "Spiser"
 
-#: gajim/common/config.py:448
-msgid "I'm eating, so leave me a message."
-msgstr "Jeg spiser, så læg en besked."
+#: gajim/common/config.py:447
+#, fuzzy
+msgid "I'm eating."
+msgstr "Jeg arbejder."
 
-#: gajim/common/config.py:449
+#: gajim/common/config.py:448
 msgid "Movie"
 msgstr "Film"
 
-#: gajim/common/config.py:449
+#: gajim/common/config.py:448
 msgid "I'm watching a movie."
 msgstr "Jeg ser en film."
 
-#: gajim/common/config.py:450 gajim/common/const.py:314
+#: gajim/common/config.py:449 gajim/common/const.py:348
 msgid "Working"
 msgstr "Arbejder"
 
-#: gajim/common/config.py:450
+#: gajim/common/config.py:449
 msgid "I'm working."
 msgstr "Jeg arbejder."
 
-#: gajim/common/config.py:451
+#: gajim/common/config.py:450
 msgid "Phone"
 msgstr "Telefon"
 
-#: gajim/common/config.py:451
+#: gajim/common/config.py:450
 msgid "I'm on the phone."
 msgstr "Jeg snakker i telefon."
 
-#: gajim/common/config.py:452
+#: gajim/common/config.py:451
 msgid "Out"
 msgstr "Ude"
 
-#: gajim/common/config.py:452
+#: gajim/common/config.py:451
 msgid "I'm out enjoying life."
 msgstr "Jeg er ude og nyder livet."
 
-#: gajim/common/config.py:463
+#: gajim/common/config.py:462
 msgid "I'm available."
 msgstr "Jeg er tilgængelig."
 
-#: gajim/common/config.py:464
+#: gajim/common/config.py:463
 msgid "I'm free for chat."
 msgstr "Jeg er tilgængelig for en samtale."
 
-#: gajim/common/config.py:465 gajim/gtk/accounts.py:134
+#: gajim/common/config.py:464 gajim/gtk/accounts.py:133
 msgid "Be right back."
 msgstr "Er straks tilbage."
 
-#: gajim/common/config.py:466
+#: gajim/common/config.py:465
 msgid "I'm not available."
 msgstr "Jeg er ikke tilgængelig."
 
-#: gajim/common/config.py:467
+#: gajim/common/config.py:466
 msgid "Do not disturb."
 msgstr "Ikke forstyr."
 
-#: gajim/common/config.py:468 gajim/common/config.py:469
+#: gajim/common/config.py:467 gajim/common/config.py:468
 msgid "Bye!"
 msgstr "Farvel!"
 
-#: gajim/common/config.py:480
+#: gajim/common/config.py:479
+#, fuzzy
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
-"muc_highlight_words, or when a group chat message contains your nickname."
+"'muc_highlight_words' your nickname is mentioned."
 msgstr ""
 "Lyd som spilles når en gruppesamtale besked indeholder en af følgende ord i "
 "muc_highlight_words, eller når en gruppesamtale besked indeholder dit "
 "kælenavn."
 
-#: gajim/common/config.py:481
-msgid "Sound to play when any MUC message arrives."
+#: gajim/common/config.py:480
+#, 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:485
+#: gajim/common/config.py:484
 #, fuzzy
 msgid "Tor"
 msgstr "Til"
@@ -4141,879 +4179,975 @@ msgstr "Til"
 msgid "Error: cannot open %s for reading"
 msgstr "Fejl: kan ikke åbne %s for læsning"
 
-#: gajim/common/const.py:214
+#: gajim/common/const.py:216
+#, fuzzy
+msgid "?Group chat name:Team"
+msgstr "?Group Chat Contact Role:Ingen"
+
+#: gajim/common/const.py:217
+msgid "?Group chat description:Project discussion"
+msgstr ""
+
+#: gajim/common/const.py:218
+#, fuzzy
+msgid "?Group chat address:team"
+msgstr "Gruppesamtaler"
+
+#: gajim/common/const.py:219
+#, fuzzy
+msgid "?Group chat name:Family"
+msgstr "Gruppe Samtale Besked Fremhævning"
+
+#: gajim/common/const.py:220
+msgid "?Group chat description:Spring gathering"
+msgstr ""
+
+#: gajim/common/const.py:221
+msgid "?Group chat address:family"
+msgstr ""
+
+#: gajim/common/const.py:222
+#, fuzzy
+msgid "?Group chat name:Vacation"
+msgstr "Gruppesamtale Invitation"
+
+#: gajim/common/const.py:223
+msgid "?Group chat description:Trip planning"
+msgstr ""
+
+#: gajim/common/const.py:224
+#, fuzzy
+msgid "?Group chat address:vacation"
+msgstr "Gruppesamtale Invitation"
+
+#: gajim/common/const.py:225
+#, fuzzy
+msgid "?Group chat name:Repairs"
+msgstr "_Gruppe Chat"
+
+#: gajim/common/const.py:226
+msgid "?Group chat description:Local help group"
+msgstr ""
+
+#: gajim/common/const.py:227
+#, fuzzy
+msgid "?Group chat address:repairs"
+msgstr "Gruppesamtaler"
+
+#: gajim/common/const.py:228
+#, fuzzy
+msgid "?Group chat name:News"
+msgstr "?Group Chat Contact Role:Ingen"
+
+#: gajim/common/const.py:229
+#, fuzzy
+msgid "?Group chat description:Local news and reports"
+msgstr "Gruppesamtale oprettelse er begrænset."
+
+#: gajim/common/const.py:230
+#, fuzzy
+msgid "?Group chat address:news"
+msgstr "Ny Gruppe Samtale"
+
+#: gajim/common/const.py:235
+#, fuzzy
+msgid "Remote server not found"
+msgstr "Tjenesten findes ikke"
+
+#: gajim/common/const.py:236
+msgid "Remote server timeout"
+msgstr ""
+
+#: gajim/common/const.py:237 gajim/common/const.py:238
+#: gajim/common/const.py:239
+#, fuzzy
+msgid "Address does not belong to a group chat server"
+msgstr "Dette er ikke en gruppe samtale"
+
+#: gajim/common/const.py:240
+#, fuzzy
+msgid "Group chat already exists"
+msgstr "Den Lokale Konto eksisterer allerede."
+
+#: gajim/common/const.py:241
+#, fuzzy
+msgid "Group chat does not exist"
+msgstr "Gruppesamtalen %s eksisterer ikke."
+
+#: gajim/common/const.py:247
 msgid "This message was encrypted with OTR and could not be decrypted."
 msgstr ""
 
-#: gajim/common/const.py:217
+#: gajim/common/const.py:250
 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:221
+#: gajim/common/const.py:254
 msgid ""
-"This message was encrypted with OpenPGP for XMPP and could not be decrypted."
+"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:224
+#: gajim/common/const.py:258
 #, python-format
 msgid "This message was encrypted with %s and could not be decrypted."
 msgstr ""
 
-#: gajim/common/const.py:231
+#: gajim/common/const.py:265
 msgid "Doing Chores"
 msgstr "Laver Husarbejde"
 
-#: gajim/common/const.py:232
+#: gajim/common/const.py:266
 msgid "Buying Groceries"
 msgstr "Køber ind"
 
-#: gajim/common/const.py:233
+#: gajim/common/const.py:267
 msgid "Cleaning"
 msgstr "Gør Rent"
 
-#: gajim/common/const.py:234
+#: gajim/common/const.py:268
 msgid "Cooking"
 msgstr "Laver Mad"
 
-#: gajim/common/const.py:235
+#: gajim/common/const.py:269
 msgid "Doing Maintenance"
 msgstr "Gør Vedligeholdsarbejde"
 
-#: gajim/common/const.py:236
+#: gajim/common/const.py:270
 msgid "Doing the Dishes"
 msgstr "Vasker op"
 
-#: gajim/common/const.py:237
+#: gajim/common/const.py:271
 msgid "Doing the Laundry"
 msgstr "Vasker Tøj"
 
-#: gajim/common/const.py:238
+#: gajim/common/const.py:272
 msgid "Gardening"
 msgstr "Laver Havearbejde"
 
-#: gajim/common/const.py:239
+#: gajim/common/const.py:273
 msgid "Running an Errand"
 msgstr "Løber et Ærinde"
 
-#: gajim/common/const.py:240
+#: gajim/common/const.py:274
 msgid "Walking the Dog"
 msgstr "Går tur med hunden"
 
-#: gajim/common/const.py:242
+#: gajim/common/const.py:276
 msgid "Drinking"
 msgstr "Drikker"
 
-#: gajim/common/const.py:243
+#: gajim/common/const.py:277
 msgid "Having a Beer"
 msgstr "Drikker en Øl"
 
-#: gajim/common/const.py:244
+#: gajim/common/const.py:278
 msgid "Having Coffee"
 msgstr "Drikke Kaffe"
 
-#: gajim/common/const.py:245
+#: gajim/common/const.py:279
 msgid "Having Tea"
 msgstr "Drikker Te"
 
-#: gajim/common/const.py:248
+#: gajim/common/const.py:282
 msgid "Having a Snack"
 msgstr "Spiser et lille Mellemmåltid"
 
-#: gajim/common/const.py:249
+#: gajim/common/const.py:283
 msgid "Having Breakfast"
 msgstr "Spiser Morgenmad"
 
-#: gajim/common/const.py:250
+#: gajim/common/const.py:284
 msgid "Having Dinner"
 msgstr "Spiser Middag"
 
-#: gajim/common/const.py:251
+#: gajim/common/const.py:285
 msgid "Having Lunch"
 msgstr "Spiser Frokost"
 
-#: gajim/common/const.py:253
+#: gajim/common/const.py:287
 msgid "Exercising"
 msgstr "Træner"
 
-#: gajim/common/const.py:254 gajim/common/const.py:305
+#: gajim/common/const.py:288 gajim/common/const.py:339
 msgid "Cycling"
 msgstr "Cykler"
 
-#: gajim/common/const.py:255
+#: gajim/common/const.py:289
 msgid "Dancing"
 msgstr "Danser"
 
-#: gajim/common/const.py:256
+#: gajim/common/const.py:290
 msgid "Hiking"
 msgstr "Vandrer"
 
-#: gajim/common/const.py:257
+#: gajim/common/const.py:291
 msgid "Jogging"
 msgstr "Jogger"
 
-#: gajim/common/const.py:258
+#: gajim/common/const.py:292
 msgid "Playing Sports"
 msgstr "Dyrker Sport"
 
-#: gajim/common/const.py:259
+#: gajim/common/const.py:293
 msgid "Running"
 msgstr "Løber"
 
-#: gajim/common/const.py:260
+#: gajim/common/const.py:294
 msgid "Skiing"
 msgstr "Står på ski"
 
-#: gajim/common/const.py:261
+#: gajim/common/const.py:295
 msgid "Swimming"
 msgstr "Svømmer"
 
-#: gajim/common/const.py:262
+#: gajim/common/const.py:296
 msgid "Working out"
 msgstr "Træner"
 
-#: gajim/common/const.py:264
+#: gajim/common/const.py:298
 msgid "Grooming"
 msgstr "Plejer"
 
-#: gajim/common/const.py:265
+#: gajim/common/const.py:299
 msgid "At the Spa"
 msgstr "I Spabad"
 
-#: gajim/common/const.py:266
+#: gajim/common/const.py:300
 msgid "Brushing Teeth"
 msgstr "Børster Tænder"
 
-#: gajim/common/const.py:267
+#: gajim/common/const.py:301
 msgid "Getting a Haircut"
 msgstr "Bliver Klippet"
 
-#: gajim/common/const.py:268
+#: gajim/common/const.py:302
 msgid "Shaving"
 msgstr "Barberer"
 
-#: gajim/common/const.py:269
+#: gajim/common/const.py:303
 msgid "Taking a Bath"
 msgstr "Tager et Bad"
 
-#: gajim/common/const.py:270
+#: gajim/common/const.py:304
 msgid "Taking a Shower"
 msgstr "Tager et Brusebad"
 
-#: gajim/common/const.py:272
+#: gajim/common/const.py:306
 msgid "Having an Appointment"
 msgstr "Har en Aftale"
 
-#: gajim/common/const.py:274
+#: gajim/common/const.py:308
 msgid "Inactive"
 msgstr "Ikke aktiv"
 
-#: gajim/common/const.py:275
+#: gajim/common/const.py:309
 msgid "Day Off"
 msgstr "Fridag"
 
-#: gajim/common/const.py:276
+#: gajim/common/const.py:310
 msgid "Hanging out"
 msgstr "Hænge ud"
 
-#: gajim/common/const.py:277
+#: gajim/common/const.py:311
 msgid "Hiding"
 msgstr "Skjult"
 
-#: gajim/common/const.py:278
+#: gajim/common/const.py:312
 msgid "On Vacation"
 msgstr "Få Ferie"
 
-#: gajim/common/const.py:279
+#: gajim/common/const.py:313
 msgid "Praying"
 msgstr "Ber"
 
-#: gajim/common/const.py:280
+#: gajim/common/const.py:314
 msgid "Scheduled Holiday"
 msgstr "Planlagt Ferie"
 
-#: gajim/common/const.py:282
+#: gajim/common/const.py:316
 msgid "Thinking"
 msgstr "Tænker"
 
-#: gajim/common/const.py:284
+#: gajim/common/const.py:318
 msgid "Relaxing"
 msgstr "Slapper af"
 
-#: gajim/common/const.py:285
+#: gajim/common/const.py:319
 msgid "Fishing"
 msgstr "Fisker"
 
-#: gajim/common/const.py:286
+#: gajim/common/const.py:320
 msgid "Gaming"
 msgstr "Spiller"
 
-#: gajim/common/const.py:287
+#: gajim/common/const.py:321
 msgid "Going out"
 msgstr "Går ud"
 
-#: gajim/common/const.py:288
+#: gajim/common/const.py:322
 msgid "Partying"
 msgstr "Fester"
 
-#: gajim/common/const.py:289
+#: gajim/common/const.py:323
 msgid "Reading"
 msgstr "Læser"
 
-#: gajim/common/const.py:290
+#: gajim/common/const.py:324
 msgid "Rehearsing"
 msgstr "Øver"
 
-#: gajim/common/const.py:291
+#: gajim/common/const.py:325
 msgid "Shopping"
 msgstr "Køber ind"
 
-#: gajim/common/const.py:292
+#: gajim/common/const.py:326
 msgid "Smoking"
 msgstr "Ryger"
 
-#: gajim/common/const.py:293
+#: gajim/common/const.py:327
 msgid "Socializing"
 msgstr "Socialiserer"
 
-#: gajim/common/const.py:294
+#: gajim/common/const.py:328
 msgid "Sunbathing"
 msgstr "Solbader"
 
-#: gajim/common/const.py:295
+#: gajim/common/const.py:329
 msgid "Watching TV"
 msgstr "Ser TV"
 
-#: gajim/common/const.py:296
+#: gajim/common/const.py:330
 msgid "Watching a Movie"
 msgstr "Ser en film."
 
-#: gajim/common/const.py:298
+#: gajim/common/const.py:332
 msgid "Talking"
 msgstr "Taler"
 
-#: gajim/common/const.py:299
+#: gajim/common/const.py:333
 msgid "In Real Life"
 msgstr "I det virkelige liv"
 
-#: gajim/common/const.py:300
+#: gajim/common/const.py:334
 msgid "On the Phone"
 msgstr "Snakker i telefon."
 
-#: gajim/common/const.py:301
+#: gajim/common/const.py:335
 msgid "On Video Phone"
 msgstr "Taler i Video Telefon"
 
-#: gajim/common/const.py:303
+#: gajim/common/const.py:337
 msgid "Traveling"
 msgstr "Rejser"
 
-#: gajim/common/const.py:304
+#: gajim/common/const.py:338
 msgid "Commuting"
 msgstr "Pendler"
 
-#: gajim/common/const.py:306
+#: gajim/common/const.py:340
 msgid "Driving"
 msgstr "Kører"
 
-#: gajim/common/const.py:307
+#: gajim/common/const.py:341
 msgid "In a Car"
 msgstr "I en Bil"
 
-#: gajim/common/const.py:308
+#: gajim/common/const.py:342
 msgid "On a Bus"
 msgstr "På en Bus"
 
-#: gajim/common/const.py:309
+#: gajim/common/const.py:343
 msgid "On a Plane"
 msgstr "Flyver"
 
-#: gajim/common/const.py:310
+#: gajim/common/const.py:344
 msgid "On a Train"
 msgstr "Kører i tog"
 
-#: gajim/common/const.py:311
+#: gajim/common/const.py:345
 msgid "On a Trip"
 msgstr "På Rejse"
 
-#: gajim/common/const.py:312
+#: gajim/common/const.py:346
 msgid "Walking"
 msgstr "Går"
 
-#: gajim/common/const.py:315
+#: gajim/common/const.py:349
 msgid "Coding"
 msgstr "Koder"
 
-#: gajim/common/const.py:316
+#: gajim/common/const.py:350
 msgid "In a Meeting"
 msgstr "I et Møde"
 
-#: gajim/common/const.py:317
+#: gajim/common/const.py:351
 msgid "Studying"
 msgstr "Studerer"
 
-#: gajim/common/const.py:318
+#: gajim/common/const.py:352
 msgid "Writing"
 msgstr "Skriver"
 
-#: gajim/common/const.py:321
+#: gajim/common/const.py:355
 msgid "Afraid"
 msgstr "Bange for"
 
-#: gajim/common/const.py:322
+#: gajim/common/const.py:356
 msgid "Amazed"
 msgstr "Forbavset"
 
-#: gajim/common/const.py:323
+#: gajim/common/const.py:357
 msgid "Amorous"
 msgstr "Erotisk"
 
-#: gajim/common/const.py:324
+#: gajim/common/const.py:358
 msgid "Angry"
 msgstr "Gal"
 
-#: gajim/common/const.py:325
+#: gajim/common/const.py:359
 msgid "Annoyed"
 msgstr "Misfornøjet"
 
-#: gajim/common/const.py:326
+#: gajim/common/const.py:360
 msgid "Anxious"
 msgstr "Ængstelig"
 
-#: gajim/common/const.py:327
+#: gajim/common/const.py:361
 msgid "Aroused"
 msgstr "Vækket"
 
-#: gajim/common/const.py:328
+#: gajim/common/const.py:362
 msgid "Ashamed"
 msgstr "Skamfuld"
 
-#: gajim/common/const.py:329
+#: gajim/common/const.py:363
 msgid "Bored"
 msgstr "Keder mig"
 
-#: gajim/common/const.py:330
+#: gajim/common/const.py:364
 msgid "Brave"
 msgstr "Modig"
 
-#: gajim/common/const.py:331
+#: gajim/common/const.py:365
 msgid "Calm"
 msgstr "Rolig"
 
-#: gajim/common/const.py:332
+#: gajim/common/const.py:366
 msgid "Cautious"
 msgstr "Forsigtig"
 
-#: gajim/common/const.py:333
+#: gajim/common/const.py:367
 msgid "Cold"
 msgstr "Fryser"
 
-#: gajim/common/const.py:334
+#: gajim/common/const.py:368
 msgid "Confident"
 msgstr "Sikker"
 
-#: gajim/common/const.py:335
+#: gajim/common/const.py:369
 msgid "Confused"
 msgstr "Forvirret"
 
-#: gajim/common/const.py:336
+#: gajim/common/const.py:370
 msgid "Contemplative"
 msgstr "Dybsindig"
 
-#: gajim/common/const.py:337
+#: gajim/common/const.py:371
 msgid "Contented"
 msgstr "Tilfreds"
 
-#: gajim/common/const.py:338
+#: gajim/common/const.py:372
 msgid "Cranky"
 msgstr "Forskruet"
 
-#: gajim/common/const.py:339
+#: gajim/common/const.py:373
 msgid "Crazy"
 msgstr "Vanvittig"
 
-#: gajim/common/const.py:340
+#: gajim/common/const.py:374
 msgid "Creative"
 msgstr "Kreativ"
 
-#: gajim/common/const.py:341
+#: gajim/common/const.py:375
 msgid "Curious"
 msgstr "Nysgerrig"
 
-#: gajim/common/const.py:342
+#: gajim/common/const.py:376
 msgid "Dejected"
 msgstr "Nedslået"
 
-#: gajim/common/const.py:343
+#: gajim/common/const.py:377
 msgid "Depressed"
 msgstr "Deprimeret"
 
-#: gajim/common/const.py:344
+#: gajim/common/const.py:378
 msgid "Disappointed"
 msgstr "Skuffet"
 
-#: gajim/common/const.py:345
+#: gajim/common/const.py:379
 msgid "Disgusted"
 msgstr "Væmmes"
 
-#: gajim/common/const.py:346
+#: gajim/common/const.py:380
 msgid "Dismayed"
 msgstr "Forfærdet"
 
-#: gajim/common/const.py:347
+#: gajim/common/const.py:381
 msgid "Distracted"
 msgstr "Forstyrret"
 
-#: gajim/common/const.py:348
+#: gajim/common/const.py:382
 msgid "Embarrassed"
 msgstr "Forlegen"
 
-#: gajim/common/const.py:349
+#: gajim/common/const.py:383
 msgid "Envious"
 msgstr "Misundelig"
 
-#: gajim/common/const.py:350
+#: gajim/common/const.py:384
 msgid "Excited"
 msgstr "Spændt"
 
-#: gajim/common/const.py:351
+#: gajim/common/const.py:385
 msgid "Flirtatious"
 msgstr "Flirtende"
 
-#: gajim/common/const.py:352
+#: gajim/common/const.py:386
 msgid "Frustrated"
 msgstr "Frustreret"
 
-#: gajim/common/const.py:353
+#: gajim/common/const.py:387
 msgid "Grateful"
 msgstr "Taknemlig"
 
-#: gajim/common/const.py:354
+#: gajim/common/const.py:388
 msgid "Grieving"
 msgstr "Sørge"
 
-#: gajim/common/const.py:355
+#: gajim/common/const.py:389
 msgid "Grumpy"
 msgstr "Gnaven"
 
-#: gajim/common/const.py:356
+#: gajim/common/const.py:390
 msgid "Guilty"
 msgstr "Skyldig"
 
-#: gajim/common/const.py:357
+#: gajim/common/const.py:391
 msgid "Happy"
 msgstr "Glad"
 
-#: gajim/common/const.py:358
+#: gajim/common/const.py:392
 msgid "Hopeful"
 msgstr "Håbefuld"
 
-#: gajim/common/const.py:359
+#: gajim/common/const.py:393
 msgid "Hot"
 msgstr "Varm"
 
-#: gajim/common/const.py:360
+#: gajim/common/const.py:394
 msgid "Humbled"
 msgstr "Ydmyg"
 
-#: gajim/common/const.py:361
+#: gajim/common/const.py:395
 msgid "Humiliated"
 msgstr "Ydmyget"
 
-#: gajim/common/const.py:362
+#: gajim/common/const.py:396
 msgid "Hungry"
 msgstr "Sulten"
 
-#: gajim/common/const.py:363
+#: gajim/common/const.py:397
 msgid "Hurt"
 msgstr "Såret"
 
-#: gajim/common/const.py:364
+#: gajim/common/const.py:398
 msgid "Impressed"
 msgstr "Imponeret"
 
-#: gajim/common/const.py:365
+#: gajim/common/const.py:399
 msgid "In Awe"
 msgstr "Ærefrygt"
 
-#: gajim/common/const.py:366
+#: gajim/common/const.py:400
 msgid "In Love"
 msgstr "Forelsket"
 
-#: gajim/common/const.py:367
+#: gajim/common/const.py:401
 msgid "Indignant"
 msgstr "Indigneret"
 
-#: gajim/common/const.py:368
+#: gajim/common/const.py:402
 msgid "Interested"
 msgstr "Interesseret"
 
-#: gajim/common/const.py:369
+#: gajim/common/const.py:403
 msgid "Intoxicated"
 msgstr "Beruset"
 
-#: gajim/common/const.py:370
+#: gajim/common/const.py:404
 msgid "Invincible"
 msgstr "Uovervindelig"
 
-#: gajim/common/const.py:371
+#: gajim/common/const.py:405
 msgid "Jealous"
 msgstr "Jaloux"
 
-#: gajim/common/const.py:372
+#: gajim/common/const.py:406
 msgid "Lonely"
 msgstr "Ensom"
 
-#: gajim/common/const.py:373
+#: gajim/common/const.py:407
 msgid "Lost"
 msgstr "Tabt"
 
-#: gajim/common/const.py:374
+#: gajim/common/const.py:408
 msgid "Lucky"
 msgstr "Heldig"
 
-#: gajim/common/const.py:375
+#: gajim/common/const.py:409
 msgid "Mean"
 msgstr "Ondskabsfuld"
 
-#: gajim/common/const.py:376
+#: gajim/common/const.py:410
 msgid "Moody"
 msgstr "Gnaven"
 
-#: gajim/common/const.py:377
+#: gajim/common/const.py:411
 msgid "Nervous"
 msgstr "Nervøs"
 
-#: gajim/common/const.py:378
+#: gajim/common/const.py:412
 msgid "Neutral"
 msgstr "Neutral"
 
-#: gajim/common/const.py:379
+#: gajim/common/const.py:413
 msgid "Offended"
 msgstr "Fornærmet"
 
-#: gajim/common/const.py:380
+#: gajim/common/const.py:414
 msgid "Outraged"
 msgstr "Oprørt"
 
-#: gajim/common/const.py:381
+#: gajim/common/const.py:415
 msgid "Playful"
 msgstr "Spøgefuld"
 
-#: gajim/common/const.py:382
+#: gajim/common/const.py:416
 msgid "Proud"
 msgstr "Stolt"
 
-#: gajim/common/const.py:383
+#: gajim/common/const.py:417
 msgid "Relaxed"
 msgstr "Afslappet"
 
-#: gajim/common/const.py:384
+#: gajim/common/const.py:418
 msgid "Relieved"
 msgstr "Lettet"
 
-#: gajim/common/const.py:385
+#: gajim/common/const.py:419
 msgid "Remorseful"
 msgstr "Angrende"
 
-#: gajim/common/const.py:386
+#: gajim/common/const.py:420
 msgid "Restless"
 msgstr "Hvileløs"
 
-#: gajim/common/const.py:387
+#: gajim/common/const.py:421
 msgid "Sad"
 msgstr "Trist"
 
-#: gajim/common/const.py:388
+#: gajim/common/const.py:422
 msgid "Sarcastic"
 msgstr "Sarkastisk"
 
-#: gajim/common/const.py:389
+#: gajim/common/const.py:423
 msgid "Satisfied"
 msgstr "Tilfreds"
 
-#: gajim/common/const.py:390
+#: gajim/common/const.py:424
 msgid "Serious"
 msgstr "Seriøs"
 
-#: gajim/common/const.py:391
+#: gajim/common/const.py:425
 msgid "Shocked"
 msgstr "Sjokeret"
 
-#: gajim/common/const.py:392
+#: gajim/common/const.py:426
 msgid "Shy"
 msgstr "Genert"
 
-#: gajim/common/const.py:393
+#: gajim/common/const.py:427
 msgid "Sick"
 msgstr "Syg"
 
-#: gajim/common/const.py:394
+#: gajim/common/const.py:428
 msgid "Sleepy"
 msgstr "Søvnig"
 
-#: gajim/common/const.py:395
+#: gajim/common/const.py:429
 msgid "Spontaneous"
 msgstr "Spontan"
 
-#: gajim/common/const.py:396
+#: gajim/common/const.py:430
 msgid "Stressed"
 msgstr "Stresset"
 
-#: gajim/common/const.py:397
+#: gajim/common/const.py:431
 msgid "Strong"
 msgstr "Stærk"
 
-#: gajim/common/const.py:398
+#: gajim/common/const.py:432
 msgid "Surprised"
 msgstr "Overrasket"
 
-#: gajim/common/const.py:399
+#: gajim/common/const.py:433
 msgid "Thankful"
 msgstr "Taknemlig"
 
-#: gajim/common/const.py:400
+#: gajim/common/const.py:434
 msgid "Thirsty"
 msgstr "Tørstig"
 
-#: gajim/common/const.py:401
+#: gajim/common/const.py:435
 msgid "Tired"
 msgstr "Træt"
 
-#: gajim/common/const.py:402
+#: gajim/common/const.py:436
 msgid "Undefined"
 msgstr "Uforklaret"
 
-#: gajim/common/const.py:403
+#: gajim/common/const.py:437
 msgid "Weak"
 msgstr "Svag"
 
-#: gajim/common/const.py:404
+#: gajim/common/const.py:438
 msgid "Worried"
 msgstr "Bekymret"
 
-#: gajim/common/const.py:408
+#: gajim/common/const.py:442
 msgid "accuracy"
 msgstr ""
 
-#: gajim/common/const.py:409
+#: gajim/common/const.py:443
 #, fuzzy
 msgid "alt"
 msgstr "standard"
 
-#: gajim/common/const.py:410
+#: gajim/common/const.py:444
 msgid "area"
 msgstr ""
 
-#: gajim/common/const.py:411
+#: gajim/common/const.py:445
 #, fuzzy
 msgid "bearing"
 msgstr "marint"
 
-#: gajim/common/const.py:412
+#: gajim/common/const.py:446
 #, fuzzy
 msgid "building"
 msgstr "Skjult"
 
-#: gajim/common/const.py:413
+#: gajim/common/const.py:447
 #, fuzzy
 msgid "country"
 msgstr "Konto"
 
-#: gajim/common/const.py:414
+#: gajim/common/const.py:448
 #, fuzzy
 msgid "countrycode"
 msgstr "Konto"
 
-#: gajim/common/const.py:415
+#: gajim/common/const.py:449
 msgid "datum"
 msgstr ""
 
-#: gajim/common/const.py:416
+#: gajim/common/const.py:450
 #, fuzzy
 msgid "description"
 msgstr "Beskrivelse"
 
-#: gajim/common/const.py:417
+#: gajim/common/const.py:451
 #, fuzzy
 msgid "error"
 msgstr "Fejl"
 
-#: gajim/common/const.py:418
+#: gajim/common/const.py:452
 msgid "floor"
 msgstr ""
 
-#: gajim/common/const.py:419
+#: gajim/common/const.py:453
 msgid "lat"
 msgstr ""
 
-#: gajim/common/const.py:420
+#: gajim/common/const.py:454
 msgid "locality"
 msgstr ""
 
-#: gajim/common/const.py:421
+#: gajim/common/const.py:455
 #, fuzzy
 msgid "lon"
 msgstr "en"
 
-#: gajim/common/const.py:422
+#: gajim/common/const.py:456
 msgid "postalcode"
 msgstr ""
 
-#: gajim/common/const.py:423
+#: gajim/common/const.py:457
 msgid "region"
 msgstr ""
 
-#: gajim/common/const.py:424
+#: gajim/common/const.py:458
 msgid "room"
 msgstr "rum"
 
-#: gajim/common/const.py:425
+#: gajim/common/const.py:459
 msgid "speed"
 msgstr ""
 
-#: gajim/common/const.py:426
+#: gajim/common/const.py:460
 msgid "street"
 msgstr ""
 
-#: gajim/common/const.py:427
+#: gajim/common/const.py:461
 msgid "text"
 msgstr ""
 
-#: gajim/common/const.py:428
+#: gajim/common/const.py:462
 msgid "timestamp"
 msgstr ""
 
-#: gajim/common/const.py:429
+#: gajim/common/const.py:463
 msgid "URI"
 msgstr ""
 
-#: gajim/common/const.py:434
+#: gajim/common/const.py:468
 msgid "Unable to get issuer certificate"
 msgstr "Ikke i stand til at skaffer udstedelses certifikat"
 
-#: gajim/common/const.py:435
+#: gajim/common/const.py:469
 msgid "Unable to get certificate CRL"
 msgstr "Ikke i stand til at skaffe certifikat CRL"
 
-#: gajim/common/const.py:436
+#: gajim/common/const.py:470
 msgid "Unable to decrypt certificate's signature"
 msgstr "Ikke i stand til at dekryptere certifikatets signatur"
 
-#: gajim/common/const.py:437
+#: gajim/common/const.py:471
 msgid "Unable to decrypt CRL's signature"
 msgstr "Ikke i stand til at dekryptere CRL's signatur"
 
-#: gajim/common/const.py:438
+#: gajim/common/const.py:472
 msgid "Unable to decode issuer public key"
 msgstr "Ikke i stand til at dekode udstederens offentlige nøgle"
 
-#: gajim/common/const.py:439
+#: gajim/common/const.py:473
 msgid "Certificate signature failure"
 msgstr "Certifikat signaturen fejlede"
 
-#: gajim/common/const.py:440
+#: gajim/common/const.py:474
 msgid "CRL signature failure"
 msgstr "CRL signatur fejl"
 
-#: gajim/common/const.py:441
+#: gajim/common/const.py:475
 msgid "Certificate is not yet valid"
 msgstr "Certifikatet er ikke gyldigt endnu"
 
-#: gajim/common/const.py:442
+#: gajim/common/const.py:476
 msgid "Certificate has expired"
 msgstr "Certifikatet er udløbet"
 
-#: gajim/common/const.py:443
+#: gajim/common/const.py:477
 msgid "CRL is not yet valid"
 msgstr "CRL er endnu ikke gyldigt"
 
-#: gajim/common/const.py:444
+#: gajim/common/const.py:478
 msgid "CRL has expired"
 msgstr "CRL er udløbet"
 
-#: gajim/common/const.py:445
+#: gajim/common/const.py:479
 msgid "Format error in certificate's notBefore field"
 msgstr "Formateringsfejl i certifikatets notBefore felt"
 
-#: gajim/common/const.py:446
+#: gajim/common/const.py:480
 msgid "Format error in certificate's notAfter field"
 msgstr "Formateringsfejl i certifikatets notAfter felt"
 
-#: gajim/common/const.py:447
+#: gajim/common/const.py:481
 msgid "Format error in CRL's lastUpdate field"
 msgstr "Formateringsfejl i CRL's lastUpdate felt"
 
-#: gajim/common/const.py:448
+#: gajim/common/const.py:482
 msgid "Format error in CRL's nextUpdate field"
 msgstr "Formateringsfejl i CRL's nextUpdate felt"
 
-#: gajim/common/const.py:449
+#: gajim/common/const.py:483
 msgid "Out of memory"
 msgstr "Ikke mere hukommelse"
 
-#: gajim/common/const.py:450
+#: gajim/common/const.py:484
 msgid "Self signed certificate"
 msgstr "Selvsigneret certifikat"
 
-#: gajim/common/const.py:451
+#: gajim/common/const.py:485
 msgid "Self signed certificate in certificate chain"
 msgstr "Selvsigneret certifikat i certifikats kæden"
 
-#: gajim/common/const.py:452
+#: gajim/common/const.py:486
 msgid "Unable to get local issuer certificate"
 msgstr "Ikke i stand til at skaffe lokalt udstedelses certifikat"
 
-#: gajim/common/const.py:453
+#: gajim/common/const.py:487
 msgid "Unable to verify the first certificate"
 msgstr "Ikke i stand til at verificere det første certifikat"
 
-#: gajim/common/const.py:454
+#: gajim/common/const.py:488
 msgid "Certificate chain too long"
 msgstr "Certifikat kæde er for lang"
 
-#: gajim/common/const.py:455
+#: gajim/common/const.py:489
 msgid "Certificate revoked"
 msgstr "Certifikat tilbagekaldt"
 
-#: gajim/common/const.py:456
+#: gajim/common/const.py:490
 msgid "Invalid CA certificate"
 msgstr "Ugyldig CA certifikat"
 
-#: gajim/common/const.py:457
+#: gajim/common/const.py:491
 msgid "Path length constraint exceeded"
 msgstr "Sti længde begrænsning overskredet"
 
-#: gajim/common/const.py:458
+#: gajim/common/const.py:492
 msgid "Unsupported certificate purpose"
 msgstr "Ikke understøttet formål for certifikatet"
 
-#: gajim/common/const.py:459
+#: gajim/common/const.py:493
 msgid "Certificate not trusted"
 msgstr "Certifikatet er ikke til at stole på"
 
-#: gajim/common/const.py:460
+#: gajim/common/const.py:494
 msgid "Certificate rejected"
 msgstr "Certifikatet afvist"
 
-#: gajim/common/const.py:461
+#: gajim/common/const.py:495
 msgid "Subject issuer mismatch"
 msgstr "Emne udsteder uoverensstemmelse"
 
-#: gajim/common/const.py:462
+#: gajim/common/const.py:496
 msgid "Authority and subject key identifier mismatch"
 msgstr "Autoritet og emne nøgle identifikations uoverensstemmelse"
 
-#: gajim/common/const.py:463
+#: gajim/common/const.py:497
 msgid "Authority and issuer serial number mismatch"
 msgstr "Autoritet og udstedelses serie nummer uoverensstemmelse"
 
-#: gajim/common/const.py:464
+#: gajim/common/const.py:498
 msgid "Key usage does not include certificate signing"
 msgstr "Nøglebrug indeholder ikke certifikat signering"
 
-#: gajim/common/const.py:465
+#: gajim/common/const.py:499
 msgid "Application verification failure"
 msgstr "Kunne ikke verificere programmet"
 
@@ -5180,261 +5314,261 @@ msgstr ""
 msgid "video output"
 msgstr ""
 
-#: gajim/common/helpers.py:210
+#: gajim/common/helpers.py:216
 msgid "Server must be between 1 and 1023 bytes"
 msgstr ""
 
-#: gajim/common/helpers.py:214
+#: gajim/common/helpers.py:220
 msgid "Invalid character in hostname."
 msgstr "Ugyldig karakter i værtsnavn."
 
-#: gajim/common/helpers.py:216
+#: gajim/common/helpers.py:222
 msgid "Server address required."
 msgstr "Server adresse påkrævet."
 
-#: gajim/common/helpers.py:220
+#: gajim/common/helpers.py:226
 msgid "Username must be between 1 and 1023 bytes"
 msgstr ""
 
-#: gajim/common/helpers.py:224
+#: gajim/common/helpers.py:230
 msgid "Invalid character in username."
 msgstr "Ugyldig karakter i brugernavn."
 
-#: gajim/common/helpers.py:230
+#: gajim/common/helpers.py:236
 msgid "Resource must be between 1 and 1023 bytes"
 msgstr ""
 
-#: gajim/common/helpers.py:234
+#: gajim/common/helpers.py:240
 msgid "Invalid character in resource."
 msgstr "Ugyldig karakter i ressource."
 
-#: gajim/common/helpers.py:275
+#: gajim/common/helpers.py:281
 msgid "_Busy"
 msgstr "_Travlt"
 
-#: gajim/common/helpers.py:277 gajim/gtk/tooltips.py:647
+#: gajim/common/helpers.py:283 gajim/gtk/tooltips.py:647
 msgid "Busy"
 msgstr "Travlt"
 
-#: gajim/common/helpers.py:280
+#: gajim/common/helpers.py:286
 msgid "_Not Available"
 msgstr "_Ikke tilgængelig"
 
-#: gajim/common/helpers.py:282 gajim/gtk/tooltips.py:649
+#: gajim/common/helpers.py:288 gajim/gtk/tooltips.py:649
 msgid "Not Available"
 msgstr "Ikke Tilgængelig"
 
-#: gajim/common/helpers.py:285
+#: gajim/common/helpers.py:291
 msgid "_Free for Chat"
 msgstr "_Tilgængelig for samtale"
 
-#: gajim/common/helpers.py:287 gajim/gtk/tooltips.py:643
+#: gajim/common/helpers.py:293 gajim/gtk/tooltips.py:643
 msgid "Free for Chat"
 msgstr "Tilgængelig for samtale"
 
-#: gajim/common/helpers.py:290
+#: gajim/common/helpers.py:296
 #, fuzzy
 msgid "?user status:_Available"
 msgstr "?transfer status:Midlertidig stoppet"
 
-#: gajim/common/helpers.py:292 gajim/gtk/tooltips.py:641
+#: gajim/common/helpers.py:298 gajim/gtk/tooltips.py:641
 #, fuzzy
 msgid "?user status:Available"
 msgstr "?transfer status:Midlertidig stoppet"
 
-#: gajim/common/helpers.py:294
+#: gajim/common/helpers.py:300
 msgid "Connecting"
 msgstr "Tilslutter"
 
-#: gajim/common/helpers.py:297 gajim/data/gui/preferences_window.ui:1251
+#: gajim/common/helpers.py:303 gajim/data/gui/preferences_window.ui:1251
 msgid "A_way"
 msgstr "_Væk"
 
-#: gajim/common/helpers.py:299 gajim/common/modules/adhoc_commands.py:120
-#: gajim/command_system/implementation/standard.py:139
+#: gajim/common/helpers.py:305 gajim/common/modules/adhoc_commands.py:120
+#: gajim/command_system/implementation/standard.py:141
 #: gajim/gtk/tooltips.py:645
 msgid "Away"
 msgstr "Borte"
 
-#: gajim/common/helpers.py:302
+#: gajim/common/helpers.py:308
 msgid "_Offline"
 msgstr "_Afkoblet"
 
-#: gajim/common/helpers.py:304 gajim/gtk/tooltips.py:651
+#: gajim/common/helpers.py:310 gajim/gtk/tooltips.py:651
 msgid "Offline"
 msgstr "Afkoblet"
 
-#: gajim/common/helpers.py:307
+#: gajim/common/helpers.py:313
 msgid "_Invisible"
 msgstr "_Usynlig"
 
-#: gajim/common/helpers.py:313
+#: gajim/common/helpers.py:319
 msgid "?contact has status:Unknown"
 msgstr "?contact has status:Ukendt"
 
-#: gajim/common/helpers.py:315
+#: gajim/common/helpers.py:321
 msgid "?contact has status:Has errors"
 msgstr "?contact has status:Har fejl"
 
-#: gajim/common/helpers.py:330
+#: gajim/common/helpers.py:336
 msgid "?Subscription we already have:None"
 msgstr "?Subscription we already have:Intet"
 
-#: gajim/common/helpers.py:332
+#: gajim/common/helpers.py:338
 msgid "To"
 msgstr "Til"
 
-#: gajim/common/helpers.py:334 gajim/data/gui/groups_post_window.ui:33
+#: gajim/common/helpers.py:340 gajim/data/gui/groups_post_window.ui:33
 msgid "From"
 msgstr "Fra"
 
-#: gajim/common/helpers.py:336
+#: gajim/common/helpers.py:342
 msgid "Both"
 msgstr "Begge"
 
-#: gajim/common/helpers.py:338 gajim/gtk/server_info.py:151
+#: gajim/common/helpers.py:344 gajim/gtk/server_info.py:151
 #, fuzzy
 msgid "Unknown"
 msgstr "?OS:Ukendt"
 
-#: gajim/common/helpers.py:344
+#: gajim/common/helpers.py:350
 msgid "?Ask (for Subscription):None"
 msgstr "?Ask (for Subscription):Intet"
 
-#: gajim/common/helpers.py:346
+#: gajim/common/helpers.py:352
 msgid "Subscribe"
 msgstr "Abonner"
 
-#: gajim/common/helpers.py:355
+#: gajim/common/helpers.py:361
 msgid "?Group Chat Contact Role:None"
 msgstr "?Group Chat Contact Role:Ingen"
 
-#: gajim/common/helpers.py:358
+#: gajim/common/helpers.py:364
 msgid "Moderators"
 msgstr "Moderatorer"
 
-#: gajim/common/helpers.py:360
+#: gajim/common/helpers.py:366
 msgid "Moderator"
 msgstr "Moderator"
 
-#: gajim/common/helpers.py:363
+#: gajim/common/helpers.py:369 gajim/data/gui/groupchat_info_scrolled.ui:243
 msgid "Participants"
 msgstr "Deltagere"
 
-#: gajim/common/helpers.py:365
+#: gajim/common/helpers.py:371
 msgid "Participant"
 msgstr "Deltager"
 
-#: gajim/common/helpers.py:368
+#: gajim/common/helpers.py:374
 msgid "Visitors"
 msgstr "Besøgende"
 
-#: gajim/common/helpers.py:370
+#: gajim/common/helpers.py:376
 msgid "Visitor"
 msgstr "Besøgende"
 
-#: gajim/common/helpers.py:376 gajim/gtk/tooltips.py:253
+#: gajim/common/helpers.py:382 gajim/gtk/tooltips.py:253
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "?Group Chat Contact Affiliation:Ingen"
 
-#: gajim/common/helpers.py:378 gajim/data/gui/groupchat_config.ui:32
+#: gajim/common/helpers.py:384 gajim/data/gui/groupchat_config.ui:32
 #: gajim/gtk/tooltips.py:259
 msgid "Owner"
 msgstr "Ejer"
 
-#: gajim/common/helpers.py:380 gajim/gtk/tooltips.py:257
+#: gajim/common/helpers.py:386 gajim/gtk/tooltips.py:257
 msgid "Administrator"
 msgstr "Administrator"
 
-#: gajim/common/helpers.py:382 gajim/data/gui/groupchat_config.ui:40
+#: gajim/common/helpers.py:388 gajim/data/gui/groupchat_config.ui:40
 #: gajim/gtk/tooltips.py:255 gajim/gtk/groupchat_config.py:105
 msgid "Member"
 msgstr "Medlem"
 
-#: gajim/common/helpers.py:421
+#: gajim/common/helpers.py:427
 msgid "is paying attention to the conversation"
 msgstr "er opmærksom på samtalen"
 
-#: gajim/common/helpers.py:423
+#: gajim/common/helpers.py:429
 msgid "is doing something else"
 msgstr "gør noget andet"
 
-#: gajim/common/helpers.py:425
+#: gajim/common/helpers.py:431
 #, fuzzy
 msgid "is composing a message…"
 msgstr "komponerer en besked..."
 
-#: gajim/common/helpers.py:428
+#: gajim/common/helpers.py:434
 msgid "paused composing a message"
 msgstr "holder pause med at komponere en besked"
 
-#: gajim/common/helpers.py:430
+#: gajim/common/helpers.py:436
 msgid "has closed the chat window or tab"
 msgstr "har lukket samtalevinduet eller fanebladet"
 
-#: gajim/common/helpers.py:936 gajim/common/helpers.py:943
+#: gajim/common/helpers.py:942 gajim/common/helpers.py:949
 #, 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:950
+#: gajim/common/helpers.py:956
 #, fuzzy, python-format
-msgid "from room %s"
-msgstr "fra rum %s"
+msgid "from group chat %s"
+msgstr "i _gruppe samtaler"
 
-#: gajim/common/helpers.py:953 gajim/common/helpers.py:970
+#: gajim/common/helpers.py:959 gajim/common/helpers.py:976
 #, fuzzy, python-format
 msgid "from user %s"
 msgstr "fra bruger %s"
 
-#: gajim/common/helpers.py:955
+#: gajim/common/helpers.py:961
 #, fuzzy, python-format
 msgid "from %s"
 msgstr " fra %s"
 
-#: gajim/common/helpers.py:962 gajim/common/helpers.py:968
+#: gajim/common/helpers.py:968 gajim/common/helpers.py:974
 #, 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:986 gajim/common/helpers.py:998
+#: gajim/common/helpers.py:992 gajim/common/helpers.py:1004
 #: gajim/data/gui/roster_window.ui:85 data/org.gajim.Gajim.desktop.in:4
 #: data/org.gajim.Gajim.appdata.xml.in:9
 msgid "Gajim"
 msgstr "Gajim"
 
-#: gajim/common/helpers.py:1000
+#: gajim/common/helpers.py:1006
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: gajim/common/helpers.py:1109 gajim/data/gui/add_new_contact_window.ui:25
+#: gajim/common/helpers.py:1115 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:1111
+#: gajim/common/helpers.py:1117
 msgid "Hello, I am $name."
 msgstr ""
 
-#: gajim/common/helpers.py:1215 gajim/common/helpers.py:1224
-#: gajim/common/helpers.py:1282
+#: gajim/common/helpers.py:1221 gajim/common/helpers.py:1230
+#: gajim/common/helpers.py:1288
 msgid "Timeout loading image"
 msgstr "Tidsudløb nået for at laste billede"
 
-#: gajim/common/helpers.py:1234 gajim/common/helpers.py:1280
+#: gajim/common/helpers.py:1240 gajim/common/helpers.py:1286
 msgid "Image is too big"
 msgstr "Billede er for stort"
 
-#: gajim/common/helpers.py:1245
+#: gajim/common/helpers.py:1251
 #, fuzzy
 msgid "PyCURL is not installed"
 msgstr "CRL er endnu ikke gyldigt"
 
-#: gajim/common/helpers.py:1284
+#: gajim/common/helpers.py:1290
 #, fuzzy
 msgid "Error loading image"
 msgstr "Tidsudløb nået for at laste billede"
@@ -5614,7 +5748,8 @@ msgstr "Din status er blevet ændret."
 
 #: gajim/common/modules/adhoc_commands.py:202
 #: gajim/common/modules/adhoc_commands.py:239
-msgid "Leave Groupchats"
+#, fuzzy
+msgid "Leave Group Chats"
 msgstr "Forlad Gruppesamtaler"
 
 #: gajim/common/modules/adhoc_commands.py:228
@@ -5623,15 +5758,18 @@ msgid "%(nickname)s on %(room_jid)s"
 msgstr "%(nickname)s i %(room_jid)s"
 
 #: gajim/common/modules/adhoc_commands.py:232
-msgid "You have not joined a groupchat."
+#, fuzzy
+msgid "You have not joined a group chat."
 msgstr "Du detlager ikke i en gruppesamtale."
 
 #: gajim/common/modules/adhoc_commands.py:240
-msgid "Choose the groupchats you want to leave"
+#, fuzzy
+msgid "Choose the group chats you want to leave"
 msgstr "Vælg de gruppesamtaler du vil forlade"
 
 #: gajim/common/modules/adhoc_commands.py:289
-msgid "You left the following groupchats:"
+#, fuzzy
+msgid "You left the following group chats:"
 msgstr "Du forlod de følgende gruppesamtaler:"
 
 #: gajim/common/modules/roster_item_exchange.py:102
@@ -5647,7 +5785,7 @@ msgstr "Sendte kontakter:"
 msgid "Blocked Contacts"
 msgstr "Blokerede Kontakter"
 
-#: gajim/data/gui/destroy_muc_dialog.ui:79 gajim/gtk/dialogs.py:736
+#: gajim/data/gui/destroy_muc_dialog.ui:79 gajim/gtk/dialogs.py:563
 msgid "Destroy this group chat permanently?"
 msgstr ""
 
@@ -5656,7 +5794,7 @@ msgstr ""
 msgid "Reason..."
 msgstr "Grund"
 
-#: gajim/data/gui/destroy_muc_dialog.ui:124 gajim/gtk/dialogs.py:738
+#: gajim/data/gui/destroy_muc_dialog.ui:124 gajim/gtk/dialogs.py:565
 msgid "Where participants should go (optional)"
 msgstr ""
 
@@ -5669,35 +5807,6 @@ msgstr ""
 msgid "_Reason and alternate venue (optional)"
 msgstr "Du kan også indtaste et alternativt mødested:"
 
-#: gajim/data/gui/advanced_configuration_window.ui:7
-#: gajim/data/gui/preferences_window.ui:2723
-#, fuzzy
-msgid "Advanced Configuration Editor (ACE)"
-msgstr "Avanceret Konfigurations Behandler"
-
-#: gajim/data/gui/advanced_configuration_window.ui:52
-#, fuzzy
-msgid "You should restart Gajim for some changes to take effect"
-msgstr ""
-"<b>NOTE:</b> Du skal genstarte Gajim for at nogle af ændringerne kan træde i "
-"kraft"
-
-#: gajim/data/gui/advanced_configuration_window.ui:84
-#, fuzzy
-msgid "_Filter"
-msgstr "Filter:"
-
-#: gajim/data/gui/advanced_configuration_window.ui:153
-#: gajim/data/gui/filetransfers_send_file_dialog.ui:15
-#: gajim/gtk/discovery.py:1666
-msgid "Description"
-msgstr "Beskrivelse"
-
-#: gajim/data/gui/advanced_configuration_window.ui:197
-#, fuzzy
-msgid "_Reset to default"
-msgstr "_Nulstil til Standard Farver"
-
 #: gajim/data/gui/join_groupchat_window.ui:56
 #: gajim/data/gui/chat_to_muc_window.ui:67
 #: gajim/data/gui/chat_to_muc_window.ui:78
@@ -5709,9 +5818,8 @@ msgid "Join group chat every time Gajim is started"
 msgstr ""
 
 #: gajim/data/gui/join_groupchat_window.ui:113
-#, fuzzy
-msgid "Auto Join"
-msgstr "Bliv automatisk med"
+msgid "Join Automatically"
+msgstr ""
 
 #: gajim/data/gui/join_groupchat_window.ui:131
 #: gajim/data/gui/profile_window.ui:233
@@ -5720,10 +5828,11 @@ msgstr "Konto"
 
 #: gajim/data/gui/join_groupchat_window.ui:147
 #, fuzzy
-msgid "Room"
-msgstr "Rum:"
+msgid "Group chat"
+msgstr "Gruppesamtaler"
 
-#: gajim/data/gui/join_groupchat_window.ui:180 gajim/gtk/accounts.py:886
+#: gajim/data/gui/join_groupchat_window.ui:180 gajim/data/gui/bookmarks.ui:158
+#: gajim/gtk/accounts.py:889
 #, fuzzy
 msgid "Password"
 msgstr "Adgangskode:"
@@ -5747,94 +5856,11 @@ msgstr "i _gruppe samtaler"
 msgid "Search group chats on selected server"
 msgstr ""
 
-#: gajim/data/gui/join_groupchat_window.ui:437 gajim/gtk/discovery.py:1271
+#: gajim/data/gui/join_groupchat_window.ui:437 gajim/gtk/discovery.py:1270
 #, fuzzy
 msgid "Join"
 msgstr "_Bliv med:"
 
-#: gajim/data/gui/manage_proxies_window.ui:12
-#, fuzzy
-msgid "HTTP Connect"
-msgstr ""
-"HTTP Tilslutning\n"
-"SOCKS5\n"
-"BOSH"
-
-#: gajim/data/gui/manage_proxies_window.ui:15
-msgid "SOCKS5"
-msgstr ""
-
-#: gajim/data/gui/manage_proxies_window.ui:18
-msgid "BOSH"
-msgstr ""
-
-#: gajim/data/gui/manage_proxies_window.ui:27
-msgid "Manage Proxy Profiles"
-msgstr "Håndter Proxy Profiler"
-
-#: gajim/data/gui/manage_proxies_window.ui:83
-#, fuzzy
-msgid "Add Proxy"
-msgstr "Proxy:"
-
-#: gajim/data/gui/manage_proxies_window.ui:97
-#, fuzzy
-msgid "Remove Proxy"
-msgstr "Fjern Gruppen"
-
-#: gajim/data/gui/manage_proxies_window.ui:141
-#, fuzzy
-msgid "Properties"
-msgstr "<b>Egenskaber</b>"
-
-#: gajim/data/gui/manage_proxies_window.ui:157
-#, fuzzy
-msgid "_Name"
-msgstr "_Navn:"
-
-#: gajim/data/gui/manage_proxies_window.ui:173
-#, fuzzy
-msgid "_Type"
-msgstr "_Type:"
-
-#: gajim/data/gui/manage_proxies_window.ui:236
-#, fuzzy
-msgid "_BOSH URL"
-msgstr "_BOSH URL:"
-
-#: gajim/data/gui/manage_proxies_window.ui:261
-msgid "Use HTTP prox_y"
-msgstr "Brug HTTP prox_y"
-
-#: gajim/data/gui/manage_proxies_window.ui:280
-#, fuzzy
-msgid "Proxy _Host"
-msgstr "Proxy _vært:"
-
-#: gajim/data/gui/manage_proxies_window.ui:307
-#, fuzzy
-msgid "Proxy _Port"
-msgstr "Proxy _Port:"
-
-#: gajim/data/gui/manage_proxies_window.ui:334
-#, fuzzy
-msgid "_Username"
-msgstr "_Brugernavn:"
-
-#: gajim/data/gui/manage_proxies_window.ui:347
-msgid "Use proxy auth_entication"
-msgstr "Brug proxy godkendelse"
-
-#: gajim/data/gui/manage_proxies_window.ui:377
-#, fuzzy
-msgid "Pass_word"
-msgstr "Adgangs_kode"
-
-#: gajim/data/gui/manage_proxies_window.ui:405 gajim/gtk/adhoc.py:321
-#, fuzzy
-msgid "Settings"
-msgstr "Tilslutning fejlede"
-
 #: gajim/data/gui/change_password_dialog.ui:17
 #, fuzzy
 msgid "New Password"
@@ -5865,11 +5891,13 @@ msgid "Status:"
 msgstr "Status:"
 
 #: gajim/data/gui/zeroconf_information_window.ui:89
-msgid "_Log conversation history"
+#, fuzzy
+msgid "_Store conversation history"
 msgstr "_Log samtale historie"
 
 #: gajim/data/gui/zeroconf_information_window.ui:215
 #: gajim/data/gui/vcard_information_window.ui:390
+#: gajim/data/gui/groupchat_info_scrolled.ui:166
 msgid "Contact"
 msgstr "Kontakt"
 
@@ -5882,8 +5910,9 @@ msgid "Last Name:"
 msgstr "Efternavn:"
 
 #: gajim/data/gui/zeroconf_information_window.ui:260
-msgid "Jabber ID:"
-msgstr "Jabber ID:"
+#, fuzzy
+msgid "XMPP Address:"
+msgstr "AIM Adresse:"
 
 #: gajim/data/gui/zeroconf_information_window.ui:273
 msgid "E-Mail:"
@@ -5903,8 +5932,9 @@ msgid "Send _File"
 msgstr "Send _Fil"
 
 #: gajim/data/gui/gc_occupants_menu.ui:29
-msgid "Occupant Actions"
-msgstr "Beboer Handlinger"
+#, fuzzy
+msgid "Participant Actions"
+msgstr "Deltagere"
 
 #: gajim/data/gui/gc_occupants_menu.ui:38
 msgid "_Voice"
@@ -5935,8 +5965,9 @@ msgid "_Ban"
 msgstr "_Udvis"
 
 #: gajim/data/gui/gc_occupants_menu.ui:124
-msgid "_Add to Roster"
-msgstr "_Tilføj til Kontaktliste"
+#, fuzzy
+msgid "_Add to Contact List"
+msgstr "_Tilføj Kontakt..."
 
 #: gajim/data/gui/gc_occupants_menu.ui:132
 #, fuzzy
@@ -5976,11 +6007,6 @@ msgstr "Abonnering: "
 msgid "_Status"
 msgstr "_Status"
 
-#: gajim/data/gui/zeroconf_context_menu.ui:26
-#: gajim/data/gui/account_context_menu.ui:79
-msgid "_Modify Account..."
-msgstr "_Ændre Konto"
-
 #: gajim/data/gui/certificate_dialog.ui:66
 #: gajim/data/gui/certificate_dialog.ui:178
 msgid "Common Name (CN)"
@@ -6062,13 +6088,19 @@ msgstr "Sidst ændret:"
 msgid "Next entry"
 msgstr ""
 
+#: gajim/data/gui/filetransfers_send_file_dialog.ui:15
+#: gajim/data/gui/advanced_configuration.ui:143
+#: gajim/data/gui/groupchat_info_scrolled.ui:48 gajim/gtk/discovery.py:1663
+msgid "Description"
+msgstr "Beskrivelse"
+
 #: gajim/data/gui/filetransfers_send_file_dialog.ui:54
 #, fuzzy
 msgid "_Send Files"
 msgstr "Send _Fil"
 
 #: gajim/data/gui/filetransfers_send_file_dialog.ui:58
-#: gajim/gtk/xml_console.py:90
+#: gajim/gtk/xml_console.py:87
 #, fuzzy
 msgid "Send"
 msgstr "_Send"
@@ -6093,20 +6125,23 @@ msgid "Change _Nickname..."
 msgstr "Ændre _Kælenavn..."
 
 #: gajim/data/gui/gc_control_popup_menu.ui:20
-msgid "_Manage Room"
-msgstr "Håndter Ru_m"
+#, fuzzy
+msgid "_Manage Group Chat"
+msgstr "_Ny Gruppe Samtale"
 
 #: gajim/data/gui/gc_control_popup_menu.ui:31
 msgid "Change _Subject..."
 msgstr "Ændre _Emne..."
 
 #: gajim/data/gui/gc_control_popup_menu.ui:38
-msgid "Configure _Room..."
-msgstr "Tilpas _Rum..."
+#, fuzzy
+msgid "Configure _Group Chat..."
+msgstr "Deltag i en _Gruppe Samtale..."
 
 #: gajim/data/gui/gc_control_popup_menu.ui:52
-msgid "_Destroy Room"
-msgstr "_Slet rum"
+#, fuzzy
+msgid "_Destroy Group Chat"
+msgstr "_Ny Gruppe Samtale"
 
 #: gajim/data/gui/gc_control_popup_menu.ui:64
 msgid "_Minimize on close"
@@ -6117,7 +6152,7 @@ msgstr "_Minimer ved lukning"
 msgid "_Request Voice"
 msgstr "_Stemme"
 
-#: gajim/data/gui/gc_control_popup_menu.ui:99 gajim/gtk/discovery.py:1704
+#: gajim/data/gui/gc_control_popup_menu.ui:99
 msgid "_Bookmark"
 msgstr "_Bogmærke"
 
@@ -6169,13 +6204,6 @@ msgstr "<b>Hjemmeside:</b>"
 msgid "E-Mail"
 msgstr "Epost:"
 
-#: 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/blocking_list.ui:115 gajim/gtk/add_contact.py:30
-#: gajim/gtk/accounts.py:801
-msgid "Jabber ID"
-msgstr "Jabber ID"
-
 #: gajim/data/gui/profile_window.ui:440
 msgid "Main"
 msgstr ""
@@ -6308,36 +6336,42 @@ msgstr "Arbejde"
 msgid "About"
 msgstr "Om"
 
-#: gajim/data/gui/start_chat_dialog.ui:114 gajim/gtk/discovery.py:1658
-msgid "Users"
-msgstr "Brugere"
-
-#: gajim/data/gui/start_chat_dialog.ui:185
+#: gajim/data/gui/start_chat_dialog.ui:53
 #, fuzzy
-msgid "Name:"
-msgstr "Navn: "
+msgid "Global Group Chat Search"
+msgstr "Bliv med i en Gruppe Samtale"
 
-#: gajim/data/gui/start_chat_dialog.ui:197
+#: 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
-msgid "Description:"
-msgstr "Beskrivelse: "
+msgid "_Back"
+msgstr "Snart tilbage"
+
+#: gajim/data/gui/start_chat_dialog.ui:245
+#: gajim/data/gui/groupchat_control.ui:796
+#: gajim/data/gui/groupchat_control.ui:888 gajim/gtk/discovery.py:1701
+#: gajim/gtk/groupchat_join.py:62
+msgid "_Join"
+msgstr "_Bliv med:"
 
-#: gajim/data/gui/start_chat_dialog.ui:209
+#: gajim/data/gui/start_chat_dialog.ui:289
 #, fuzzy
-msgid "Address:"
-msgstr "_Adresse:"
+msgid "Select Account"
+msgstr "Fjerne kontoen med navnet %s"
 
-#: gajim/data/gui/start_chat_dialog.ui:246
-msgid ""
-"Semi-Anonymous\n"
-"<span size=\"small\">(Only moderators can see your XMPP-Address)</span>"
+#: gajim/data/gui/start_chat_dialog.ui:380
+msgid "_Select"
 msgstr ""
 
 #: gajim/data/gui/filetransfers.ui:21
 msgid "Pa_use/Resume"
 msgstr ""
 
-#: gajim/data/gui/filetransfers.ui:30 gajim/gtk/filechoosers.py:178
+#: gajim/data/gui/filetransfers.ui:30 gajim/data/gui/groupchat_control.ui:575
+#: gajim/data/gui/groupchat_control.ui:667
+#: gajim/data/gui/groupchat_control.ui:779
+#: gajim/data/gui/groupchat_control.ui:871 gajim/gtk/filechoosers.py:178
 msgid "_Cancel"
 msgstr "_Afbryd"
 
@@ -6379,7 +6413,8 @@ msgid "Cancel the selected file transfer and remove incomplete files"
 msgstr "Annullerer den valgte filoverførsel og fjerner den ikke fuldførte fil"
 
 #: gajim/data/gui/filetransfers.ui:207
-msgid "Shows a list of file transfers between you and others"
+#, fuzzy
+msgid "Shows a list of file transfers between you and your contacts"
 msgstr "Viser en liste over filoverførsler mellem dig og andre"
 
 #: gajim/data/gui/groupchat_control.ui:13 gajim/data/gui/chat_control.ui:277
@@ -6399,7 +6434,6 @@ msgid "Strike"
 msgstr "Streg"
 
 #: gajim/data/gui/groupchat_control.ui:54 gajim/data/gui/chat_control.ui:318
-#: gajim/gtk/advanced_config.py:86
 msgid "Color"
 msgstr "Farve"
 
@@ -6412,16 +6446,46 @@ msgstr "Font"
 msgid "Clear formatting"
 msgstr "Fjern formatering"
 
-#: gajim/data/gui/groupchat_control.ui:290 gajim/data/gui/chat_control.ui:880
+#: gajim/data/gui/groupchat_control.ui:291 gajim/data/gui/chat_control.ui:880
 #, fuzzy
 msgid "Choose encryption"
 msgstr "Vælg en Fil at Sende..."
 
-#: gajim/data/gui/groupchat_control.ui:336 gajim/data/gui/chat_control.ui:640
+#: gajim/data/gui/groupchat_control.ui:337 gajim/data/gui/chat_control.ui:640
 #, fuzzy
 msgid "Show a list of emojis (Alt+M)"
 msgstr "Hvis en liste over følelsesikoner (Alt+M)"
 
+#: gajim/data/gui/groupchat_control.ui:484
+#, fuzzy
+msgid "Joining…"
+msgstr "Bandlysning..."
+
+#: gajim/data/gui/groupchat_control.ui:496
+msgid "_Abort"
+msgstr ""
+
+#: gajim/data/gui/groupchat_control.ui:542
+#, fuzzy
+msgid "Enter new nickname"
+msgstr "Indtast et nyt kælenavn for kontakt %s"
+
+#: gajim/data/gui/groupchat_control.ui:592
+#: gajim/data/gui/groupchat_control.ui:684
+#, fuzzy
+msgid "Ch_ange"
+msgstr "Ændre _Kælenavn..."
+
+#: gajim/data/gui/groupchat_control.ui:761
+#, fuzzy
+msgid "Enter password"
+msgstr "Skriv en ny adgangskode:"
+
+#: gajim/data/gui/groupchat_control.ui:1067
+#, fuzzy
+msgid "_Try again"
+msgstr "Verificer igen..."
+
 #: gajim/data/gui/popup_notification_window.ui:42
 #, fuzzy
 msgid "Event Type"
@@ -6503,8 +6567,8 @@ msgstr "Borte"
 
 #: gajim/data/gui/mam_preferences.ui:18
 #, fuzzy
-msgid "Roster"
-msgstr "Vis _Kontaktvindue"
+msgid "Contact List"
+msgstr "Kontakter"
 
 #: gajim/data/gui/mam_preferences.ui:22
 #: gajim/data/gui/preferences_window.ui:123
@@ -6529,12 +6593,12 @@ msgid "Add"
 msgstr "Tilføj"
 
 #: gajim/data/gui/mam_preferences.ui:194 gajim/data/gui/groupchat_config.ui:151
-#: gajim/gtk/dialogs.py:63 gajim/gtk/accounts.py:381
+#: gajim/gtk/dialogs.py:62 gajim/gtk/accounts.py:384
 #, fuzzy
 msgid "Remove"
 msgstr "_Kan fjernes"
 
-#: gajim/data/gui/vcard_information_window.ui:72 gajim/gtk/accounts.py:753
+#: gajim/data/gui/vcard_information_window.ui:72 gajim/gtk/accounts.py:756
 #, fuzzy
 msgid "Resource"
 msgstr "Resource:"
@@ -6586,6 +6650,7 @@ msgstr "Abonnering: "
 #: gajim/data/gui/vcard_information_window.ui:974
 #: gajim/data/gui/vcard_information_window.ui:993
 #: gajim/data/gui/vcard_information_window.ui:1427
+#: gajim/data/gui/groupchat_info_scrolled.ui:222
 msgid "button"
 msgstr ""
 
@@ -6617,15 +6682,15 @@ msgstr "Påmind mig om kontakter som logger u_d"
 
 #: gajim/data/gui/preferences_window.ui:58
 #, fuzzy
-msgid "Show only in roster"
-msgstr "_Vis hændelse i kontaktvindue"
+msgid "Show only in contact list"
+msgstr "Vis Kun _Aktive Kontakter"
 
 #: gajim/data/gui/preferences_window.ui:69
-msgid "Detached roster with detached chats"
+msgid "Detached contact list with detached chats"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:72
-msgid "Detached roster with single chat"
+msgid "Detached contact list with single chat"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:75
@@ -6633,11 +6698,11 @@ msgid "Single window for everything"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:78
-msgid "Detached roster with chat grouped by account"
+msgid "Detached contact list with chat grouped by account"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:81
-msgid "Detached roster with chat grouped by type"
+msgid "Detached contact list with chat grouped by type"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:92
@@ -6693,7 +6758,7 @@ msgstr "_Vinduets adfærd:"
 
 #: gajim/data/gui/preferences_window.ui:296
 #, fuzzy
-msgid "_Show roster on startup"
+msgid "_Show contact list on startup"
 msgstr "T_ilslut når Gajim startes"
 
 #: gajim/data/gui/preferences_window.ui:311
@@ -6709,12 +6774,12 @@ msgid "_Tabs placement"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:363
-msgid "_Quit Gajim when closing roster window"
+msgid "_Quit Gajim when closing contact list"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:367
 msgid ""
-"If enabled, Gajim will quit when closing the roster window instead of "
+"If enabled, Gajim will quit when closing the contact list window instead of "
 "minimizing to the system's notification area"
 msgstr ""
 
@@ -6724,41 +6789,42 @@ msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:423
 #, fuzzy
-msgid "Show a_vatars of contacts in roster"
+msgid "Show a_vatars of contacts in contact list"
 msgstr "Vis kontakternes a_vatarer i kontaktvinduet"
 
 #: gajim/data/gui/preferences_window.ui:427
 #, fuzzy
 msgid ""
-"If checked, avatars of contacts will be shown in the roster window and in "
-"group chats"
+"If checked, avatars of contacts will be shown in the contact list window and "
+"in group chats"
 msgstr ""
 "Hvis valgt vil Gajim vise avatarer af kontakter i kontaktvinduet og i gruppe "
 "samtaler"
 
 #: gajim/data/gui/preferences_window.ui:441
 #, fuzzy
-msgid "Show status _messages of contacts in roster"
+msgid "Show status _messages of contacts in contact list"
 msgstr "Vis status _beskeder for kontakter i kontaktvinduet"
 
 #: gajim/data/gui/preferences_window.ui:445
 #, fuzzy
 msgid ""
 "If checked, status messages of contacts will be shown under the contact's "
-"name, in the roster window, and in group chats"
+"name, in the contact list window, and in group chats"
 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
 #, fuzzy
-msgid "Show e_xtra information of contacts in roster (mood, activity, ...)"
+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
 msgid ""
-"If checked, additional info published by the contact will be shown in "
-"roster. Additional infos (published via PEP) may include e.g. mood, "
+"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 ""
 
@@ -6767,8 +6833,9 @@ msgid "Sort contacts by status"
 msgstr "Sorter kontakter efter status"
 
 #: gajim/data/gui/preferences_window.ui:494
-msgid "in _roster"
-msgstr "i _kontaktvinduet"
+#, fuzzy
+msgid "in _contact list"
+msgstr "Sendte kontakter:"
 
 #: gajim/data/gui/preferences_window.ui:511
 msgid "in _group chats"
@@ -6776,8 +6843,8 @@ msgstr "i _gruppe samtaler"
 
 #: gajim/data/gui/preferences_window.ui:540
 #, fuzzy
-msgid "Roster Appearance"
-msgstr "<b>Kontaktvinduets Udseende</b>"
+msgid "Contact List Appearance"
+msgstr "Bytte af punkt i kontaktvinduet"
 
 #: gajim/data/gui/preferences_window.ui:585
 #, fuzzy
@@ -6845,7 +6912,7 @@ msgstr "Ikke i stand til at deltage i gruppesamtale."
 
 #: gajim/data/gui/preferences_window.ui:660
 #, fuzzy
-msgid "If checked, the room subject will be shown when joining a group chat"
+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:682
@@ -6860,13 +6927,13 @@ msgstr ""
 #: gajim/data/gui/preferences_window.ui:701
 msgid ""
 "If join/leave status messages are shown in the group chat. This setting can "
-"be overridden in the groupchat menu."
+"be overridden in the group chat menu."
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:720
 msgid ""
 "The default sync threshold for new public group chats. This setting can be "
-"overridden in the groupchat menu."
+"overridden in the group chat menu."
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:722
@@ -6881,7 +6948,7 @@ msgstr "_Log status ændringer hos kontakter"
 #: gajim/data/gui/preferences_window.ui:768
 msgid ""
 "If status change messages are shown in the group chat. This setting can be "
-"overridden in the groupchat menu."
+"overridden in the group chat menu."
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:825
@@ -6899,8 +6966,8 @@ msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:843
 #, fuzzy
-msgid "Show chatstate in roster"
-msgstr "Vis kontakternes a_vatarer i kontaktvinduet"
+msgid "Show chatstate in contact list"
+msgstr "Vis lukke knap i faneblad?"
 
 #: gajim/data/gui/preferences_window.ui:847
 msgid ""
@@ -7208,7 +7275,7 @@ msgstr ""
 msgid "Vi_ew own video source"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2281 gajim/gtk/accounts.py:352
+#: gajim/data/gui/preferences_window.ui:2281 gajim/gtk/accounts.py:355
 msgid "Connection"
 msgstr "Tilslutning"
 
@@ -7262,7 +7329,8 @@ msgid "_Manage..."
 msgstr "Hå_ndter..."
 
 #: gajim/data/gui/preferences_window.ui:2616
-msgid "_Log status changes of contacts"
+#, fuzzy
+msgid "_Store status changes of contacts in history"
 msgstr "_Log status ændringer hos kontakter"
 
 #: gajim/data/gui/preferences_window.ui:2633
@@ -7287,10 +7355,15 @@ msgstr ""
 msgid "_Open..."
 msgstr "_Åbn..."
 
+#: gajim/data/gui/preferences_window.ui:2723 gajim/gtk/advanced_config.py:84
+#, fuzzy
+msgid "Advanced Configuration Editor (ACE)"
+msgstr "Avanceret Konfigurations Behandler"
+
 #: gajim/data/gui/groupchat_config.ui:55
 #, fuzzy
 msgid ""
-"<b>Jabber-ID</b>\n"
+"<b>XMPP Address</b>\n"
 "&lt;user@domain/resource&gt; (only that resource matches)\n"
 "&lt;user@domain&gt; (any resource matches)\n"
 "&lt;domain/resource&gt; (only that resource matches)\n"
@@ -7309,7 +7382,8 @@ msgstr ""
 msgid "Only Admins and Owners can modify the affiliation"
 msgstr ""
 
-#: gajim/data/gui/groupchat_config.ui:270 gajim/plugins/gui.py:312
+#: gajim/data/gui/groupchat_config.ui:270
+#: gajim/data/gui/groupchat_info_scrolled.ui:210 gajim/plugins/gui.py:324
 #, fuzzy
 msgid "Configuration"
 msgstr "Rum Konfigurering"
@@ -7342,7 +7416,7 @@ msgid "Start _Chat"
 msgstr "Start _samtale"
 
 #: gajim/data/gui/contact_context_menu.ui:20
-#: gajim/data/gui/systray_context_menu.ui:36
+#: gajim/data/gui/systray_context_menu.ui:29
 msgid "Send Single _Message..."
 msgstr "Send en Enkel _Besked"
 
@@ -7403,17 +7477,45 @@ msgid "_Ignore"
 msgstr "_Ignorer"
 
 #: gajim/data/gui/contact_context_menu.ui:174
-msgid "_Add to Roster..."
-msgstr "_Tilføj til Kontaktliste..."
+#, fuzzy
+msgid "_Add to Contact List..."
+msgstr "_Tilføj Kontakt..."
+
+#: gajim/data/gui/advanced_configuration.ui:39
+#, fuzzy
+msgid "You should restart Gajim for some changes to take effect"
+msgstr ""
+"<b>NOTE:</b> Du skal genstarte Gajim for at nogle af ændringerne kan træde i "
+"kraft"
+
+#: gajim/data/gui/advanced_configuration.ui:71
+#, fuzzy
+msgid "_Filter"
+msgstr "Filter:"
+
+#: gajim/data/gui/advanced_configuration.ui:88
+msgid "Type to search for values..."
+msgstr ""
+
+#: gajim/data/gui/advanced_configuration.ui:180
+#, fuzzy
+msgid "_Reset Value"
+msgstr "_Nulstil til Standard Farver"
+
+#: gajim/data/gui/advanced_configuration.ui:185
+#, fuzzy
+msgid "Resets value to default"
+msgstr "_Nulstil til Standard Farver"
 
 #: gajim/data/gui/account_creation_wizard_window.ui:43
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim: Konto Oprettelses Guide"
 
 #: gajim/data/gui/account_creation_wizard_window.ui:70
+#, fuzzy
 msgid ""
 "You need to have an account in order to connect\n"
-"to the Jabber network."
+"to the XMPP network."
 msgstr ""
 "Du behøver en konto for at tilslutte dig\n"
 "til Jabber netværket"
@@ -7435,8 +7537,9 @@ msgid "<b>Please fill in the data for your existing account</b>"
 msgstr "<b>Fyld ind data for din eksisterende konto</b>"
 
 #: gajim/data/gui/account_creation_wizard_window.ui:187
-msgid "_Jabber ID:"
-msgstr "_Jabber ID:"
+#, fuzzy
+msgid "_XMPP Address:"
+msgstr "AIM Adresse:"
 
 #: gajim/data/gui/account_creation_wizard_window.ui:239
 #: gajim/data/gui/account_creation_wizard_window.ui:394
@@ -7523,6 +7626,7 @@ msgid "Privacy Lists:"
 msgstr "Privatlivs Lister:"
 
 #: gajim/data/gui/service_discovery_window.ui:111
+#: gajim/data/gui/groupchat_creation.ui:227
 #, fuzzy
 msgid "_Address"
 msgstr "_Adresse:"
@@ -7540,11 +7644,6 @@ msgstr "Synkronisering : vælg kontakter"
 msgid "Select the contacts you want to synchronise"
 msgstr "Vælg de kontakter som du vil synkronisere"
 
-#: gajim/data/gui/groupchat_invitation_received.ui:42
-#, fuzzy
-msgid "Group Chat Invitation"
-msgstr "Gruppesamtale Invitation"
-
 #: gajim/data/gui/groupchat_invitation_received.ui:111
 #, fuzzy
 msgid "Message..."
@@ -7595,11 +7694,10 @@ msgstr ""
 
 #: gajim/data/gui/add_new_contact_window.ui:84
 #, fuzzy
-msgid "_Jabber ID"
-msgstr "_Jabber ID:"
+msgid "_XMPP Address"
+msgstr "_Adresse:"
 
 #: gajim/data/gui/add_new_contact_window.ui:100
-#: gajim/data/gui/manage_bookmarks_window.ui:192
 #, fuzzy
 msgid "_Nickname"
 msgstr "_Kælenavn:"
@@ -7677,7 +7775,7 @@ msgstr "<b>Humør:</b>"
 msgid "<b>Message:</b>"
 msgstr "<b>Besked:</b>"
 
-#: gajim/data/gui/plugins_window.ui:10 gajim/data/gui/application_menu.ui:90
+#: gajim/data/gui/plugins_window.ui:10 gajim/data/gui/application_menu.ui:87
 msgid "Plugins"
 msgstr ""
 
@@ -7786,10 +7884,6 @@ msgstr "Tillad"
 msgid "Deny"
 msgstr "Nægt"
 
-#: gajim/data/gui/privacy_list_window.ui:317
-msgid "JabberID"
-msgstr "Jabber ID"
-
 #: gajim/data/gui/privacy_list_window.ui:358
 msgid "all in the group"
 msgstr "Alle i gruppen"
@@ -7830,7 +7924,7 @@ msgstr "Bestil:"
 msgid "Manage sounds"
 msgstr "Håndter lyde"
 
-#: gajim/data/gui/manage_sounds_window.ui:55 gajim/plugins/gui.py:100
+#: gajim/data/gui/manage_sounds_window.ui:55 gajim/plugins/gui.py:101
 msgid "Active"
 msgstr "Aktiv"
 
@@ -7868,23 +7962,115 @@ msgstr "Fjern konto fra Gajim og fra _serveren"
 msgid "_Personal Events"
 msgstr "_Personlige hændelser"
 
-#: gajim/data/gui/account_context_menu.ui:35
-#: gajim/data/gui/systray_context_menu.ui:28
-msgid "Join _Group Chat"
-msgstr "Bliv med i en _Gruppe Samtale"
-
-#: gajim/data/gui/account_context_menu.ui:49
+#: gajim/data/gui/account_context_menu.ui:41
 msgid "_Add Contact..."
 msgstr "_Tilføj Kontakt..."
 
-#: gajim/data/gui/account_context_menu.ui:57
+#: gajim/data/gui/account_context_menu.ui:49
 msgid "_Discover Services"
 msgstr "Op_dag Tjenester"
 
-#: gajim/data/gui/account_context_menu.ui:65
+#: gajim/data/gui/account_context_menu.ui:57
 msgid "_Execute Command..."
 msgstr "_Udfør Kommando..."
 
+#: gajim/data/gui/account_context_menu.ui:65
+#, fuzzy
+msgid "_View Certificate"
+msgstr "Selvsigneret certifikat"
+
+#: gajim/data/gui/manage_proxies.ui:12
+#, fuzzy
+msgctxt "proxy configuration"
+msgid "HTTP Connect"
+msgstr ""
+"HTTP Tilslutning\n"
+"SOCKS5\n"
+"BOSH"
+
+#: gajim/data/gui/manage_proxies.ui:15
+msgctxt "proxy configuration"
+msgid "SOCKS5"
+msgstr ""
+
+#: gajim/data/gui/manage_proxies.ui:18
+#, fuzzy
+msgctxt "proxy configuration"
+msgid "BOSH"
+msgstr "_BOSH URL:"
+
+#: gajim/data/gui/manage_proxies.ui:68
+#, fuzzy
+msgid "Add Proxy"
+msgstr "Proxy:"
+
+#: gajim/data/gui/manage_proxies.ui:82
+#, fuzzy
+msgid "Remove Proxy"
+msgstr "Fjern Gruppen"
+
+#: gajim/data/gui/manage_proxies.ui:134
+#, fuzzy
+msgid "Pass_word"
+msgstr "Adgangs_kode"
+
+#: gajim/data/gui/manage_proxies.ui:159
+msgid "Use proxy auth_entication"
+msgstr "Brug proxy godkendelse"
+
+#: gajim/data/gui/manage_proxies.ui:179
+#, fuzzy
+msgid "_Username"
+msgstr "_Brugernavn:"
+
+#: gajim/data/gui/manage_proxies.ui:209
+#, fuzzy
+msgid "_Port"
+msgstr "_Port:"
+
+#: gajim/data/gui/manage_proxies.ui:226
+msgid "example.org"
+msgstr ""
+
+#: gajim/data/gui/manage_proxies.ui:240
+#, fuzzy
+msgid "_Host"
+msgstr "_Værtsnavn:"
+
+#: gajim/data/gui/manage_proxies.ui:254
+msgid "Use HTTP prox_y"
+msgstr "Brug HTTP prox_y"
+
+#: gajim/data/gui/manage_proxies.ui:275
+msgid "https://example.org/http-bind/"
+msgstr ""
+
+#: gajim/data/gui/manage_proxies.ui:291
+#, fuzzy
+msgid "_BOSH URL"
+msgstr "_BOSH URL:"
+
+#: gajim/data/gui/manage_proxies.ui:309 gajim/gtk/adhoc.py:322
+#, fuzzy
+msgid "Settings"
+msgstr "Tilslutning fejlede"
+
+#: gajim/data/gui/manage_proxies.ui:344
+#, fuzzy
+msgid "_Type"
+msgstr "_Type:"
+
+#: gajim/data/gui/manage_proxies.ui:361
+#: gajim/data/gui/groupchat_creation.ui:105
+#, fuzzy
+msgid "_Name"
+msgstr "_Navn:"
+
+#: gajim/data/gui/manage_proxies.ui:391 gajim/gtk/accounts.py:742
+#, fuzzy
+msgid "Proxy"
+msgstr "Proxy:"
+
 #: gajim/data/gui/application_menu.ui:8
 #, fuzzy
 msgid "View"
@@ -7892,8 +8078,8 @@ msgstr "_Vis"
 
 #: gajim/data/gui/application_menu.ui:11
 #, fuzzy
-msgid "Show Roster"
-msgstr "Vis _Kontaktvindue"
+msgid "Show Contact List"
+msgstr "Vis Kun _Aktive Kontakter"
 
 #: gajim/data/gui/application_menu.ui:16
 #, fuzzy
@@ -7934,23 +8120,24 @@ msgstr ""
 msgid "Features"
 msgstr "Egenskaber"
 
-#: gajim/data/gui/application_menu.ui:81
+#: gajim/data/gui/application_menu.ui:77
+#: gajim/data/gui/groupchat_creation.ui:81 gajim/gtk/groupchat_creation.py:45
 #, fuzzy
-msgid "Bookmarks"
-msgstr "_Bogmærke"
+msgid "Create Group Chat"
+msgstr "Forlad Gruppesamtaler"
 
-#: gajim/data/gui/application_menu.ui:94 gajim/data/gui/shortcuts_window.ui:189
-#: gajim/gtk/preferences.py:59
+#: gajim/data/gui/application_menu.ui:91 gajim/data/gui/shortcuts_window.ui:189
+#: gajim/gtk/preferences.py:58
 msgid "Preferences"
 msgstr "Indstillinger"
 
-#: gajim/data/gui/application_menu.ui:99
+#: gajim/data/gui/application_menu.ui:96
 #, fuzzy
 msgid "Quit"
 msgstr "_Afslut"
 
 #: gajim/data/gui/httpupload_progress_dialog.ui:110
-#: gajim/gtk/filetransfer.py:121
+#: gajim/gtk/filetransfer.py:120
 msgid "Progress"
 msgstr "Fremgang"
 
@@ -7967,52 +8154,33 @@ msgstr ""
 msgid "_Cancel Upload"
 msgstr "_Afbryd"
 
-#: gajim/data/gui/manage_bookmarks_window.ui:13
-#, fuzzy
-msgid "Group Chat Bookmarks"
-msgstr "_Gruppe Chat"
-
-#: gajim/data/gui/manage_bookmarks_window.ui:68
-#, fuzzy
-msgid "Add Bookmark"
-msgstr "_Bogmærke"
-
-#: gajim/data/gui/manage_bookmarks_window.ui:82
-#, fuzzy
-msgid "Remove Bookmark"
-msgstr "_Bogmærke"
+#: gajim/data/gui/groupchat_creation.ui:27
+msgid "Public or Private?"
+msgstr ""
 
-#: gajim/data/gui/manage_bookmarks_window.ui:126
-msgid "N_ame"
+#: 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 ""
 
-#: gajim/data/gui/manage_bookmarks_window.ui:145
-#, fuzzy
-msgid "Bookmark Name"
-msgstr "Bogmærk dette rom"
+#: gajim/data/gui/groupchat_creation.ui:58
+msgid "<b>Public:</b> Anyone who knows the address can join."
+msgstr ""
 
-#: gajim/data/gui/manage_bookmarks_window.ui:160
+#: gajim/data/gui/groupchat_creation.ui:122
 #, fuzzy
-msgid "_Server"
-msgstr "_Server:"
+msgid "_Description"
+msgstr "Beskrivelse"
 
-#: gajim/data/gui/manage_bookmarks_window.ui:223
-msgid "Roo_m"
+#: gajim/data/gui/groupchat_creation.ui:164
+msgid "_Public"
 msgstr ""
 
-#: gajim/data/gui/manage_bookmarks_window.ui:253
+#: gajim/data/gui/groupchat_creation.ui:278
 #, fuzzy
-msgid "_Password"
-msgstr "_Adgangskode"
-
-#: gajim/data/gui/manage_bookmarks_window.ui:299
-#, fuzzy
-msgid "Join chat when connected"
-msgstr "Kontakt er ikke Tilsluttet"
-
-#: gajim/data/gui/manage_bookmarks_window.ui:307
-msgid "_Join Automatically"
-msgstr ""
+msgid "_Account"
+msgstr "K_ontoer"
 
 #: gajim/data/gui/exception_dialog.ui:49
 msgid "Sorry, that should not have happened"
@@ -8059,6 +8227,29 @@ msgstr ""
 msgid "Presets"
 msgstr "_Tilstedeværelse"
 
+#: gajim/data/gui/groupchat_info_scrolled.ui:32
+#, fuzzy
+msgid "Address"
+msgstr "_Adresse:"
+
+#: gajim/data/gui/groupchat_info_scrolled.ui:64
+msgid "Topic"
+msgstr ""
+
+#: gajim/data/gui/groupchat_info_scrolled.ui:80
+#, fuzzy
+msgid "Author"
+msgstr "Au_torisere"
+
+#: gajim/data/gui/groupchat_info_scrolled.ui:182
+msgid "Discussion Logs"
+msgstr ""
+
+#: gajim/data/gui/groupchat_info_scrolled.ui:260
+#, fuzzy
+msgid "Group Chat Language"
+msgstr "Gruppesamtale Invitation"
+
 #: gajim/data/gui/emoji_chooser.ui:98
 #, fuzzy
 msgid "No Results Found"
@@ -8071,24 +8262,35 @@ msgstr "Inviter Venner!"
 #: gajim/data/gui/chat_to_muc_window.ui:39
 #, fuzzy
 msgid ""
-"You are now entering a groupchat.\n"
+"You are now entering a group chat.\n"
 "Select the contacts you want to invite"
 msgstr ""
 "Du er ved at begynde en Multibruger samtale.\n"
 "Vælg de kontakter du vil invitere"
 
 #: gajim/data/gui/chat_to_muc_window.ui:112
-msgid "Please select a MUC server."
+#, fuzzy
+msgid "Please select a group chat server."
 msgstr "Vælg en MUC server."
 
 #: gajim/data/gui/chat_to_muc_window.ui:141
-msgid "MUC server"
-msgstr "MUC server"
+#, fuzzy
+msgid "Group chat server"
+msgstr "Gruppesamtaler"
 
 #: gajim/data/gui/chat_to_muc_window.ui:176
 msgid "In_vite"
 msgstr "In_viter"
 
+#: gajim/data/gui/bookmarks.ui:176
+#, fuzzy
+msgid "Autojoin"
+msgstr "Bliv automatisk med"
+
+#: gajim/data/gui/bookmarks.ui:211
+msgid "_Apply"
+msgstr ""
+
 #: gajim/data/gui/history_manager.ui:11
 #, fuzzy
 msgid "_Export"
@@ -8104,12 +8306,13 @@ msgid "Gajim History Logs Manager"
 msgstr "Gajim Loghistorie Håndterer"
 
 #: gajim/data/gui/history_manager.ui:108
+#, fuzzy
 msgid ""
-"This log manager is not intended for log viewing. If you are looking for "
-"such functionality, use the history window instead.\n"
+"This history manager is not intended for viewing chat history. If you are "
+"looking for such functionality, please use the history window instead.\n"
 "\n"
-"Use this program to delete or export logs. You can select logs from the left "
-"and/or search database from below."
+"You can use this program to delete or export history. Either select logs "
+"from the left or search the database."
 msgstr ""
 "Denne loghåndterer er ikke ment til at gennemse loggene. Hvis du leder efter "
 "den funktionalitet, brug historik vinduet i stedet.\n"
@@ -8162,8 +8365,9 @@ msgid "Select an emoji"
 msgstr ""
 
 #: gajim/data/gui/shortcuts_window.ui:38
-msgid "Complete a command or a nick"
-msgstr ""
+#, fuzzy
+msgid "Complete a command or a nickname"
+msgstr "Opret et nyt tema med dit ønskede navn."
 
 #: gajim/data/gui/shortcuts_window.ui:45
 #, fuzzy
@@ -8203,7 +8407,7 @@ msgstr ""
 msgid "Scroll down"
 msgstr ""
 
-#: gajim/data/gui/shortcuts_window.ui:100 gajim/gtk/xml_console.py:72
+#: gajim/data/gui/shortcuts_window.ui:100 gajim/gtk/xml_console.py:69
 #, fuzzy
 msgid "Clear"
 msgstr "Gør Rent"
@@ -8245,8 +8449,9 @@ msgid "Close chat"
 msgstr ""
 
 #: gajim/data/gui/shortcuts_window.ui:173
-msgid "Roster Shortcuts"
-msgstr ""
+#, fuzzy
+msgid "Contact List Shortcuts"
+msgstr "Bytte af punkt i kontaktvinduet"
 
 #: gajim/data/gui/shortcuts_window.ui:196
 #, fuzzy
@@ -8279,7 +8484,7 @@ msgid "Show only active contacts"
 msgstr "Vis Kun _Aktive Kontakter"
 
 #: gajim/data/gui/shortcuts_window.ui:251
-msgid "Enable roster filtering"
+msgid "Enable contact list filtering"
 msgstr ""
 
 #: gajim/data/gui/shortcuts_window.ui:259
@@ -8326,12 +8531,12 @@ msgstr ""
 
 #: gajim/data/gui/history_window.ui:317
 #, fuzzy
-msgid "Record history for this chat"
+msgid "Store history for this chat"
 msgstr "Ignorer denne fejl for dette certifikat."
 
 #: gajim/data/gui/history_window.ui:332
 #, fuzzy
-msgid "Record History"
+msgid "Store History"
 msgstr "For nylig:"
 
 #: gajim/data/gui/history_window.ui:350
@@ -8352,9 +8557,10 @@ msgstr "Lav en ny post"
 msgid "Fill in the form."
 msgstr "Udfyld formen."
 
-#: gajim/data/gui/data_form_window.ui:229
-msgid "Room Configuration"
-msgstr "Rum Konfigurering"
+#: gajim/data/gui/data_form_window.ui:229 gajim/gtk/groupchat_config.py:41
+#, fuzzy
+msgid "Group Chat Configuration"
+msgstr "Gruppesamtale Invitation"
 
 #: gajim/data/gui/roster_item_exchange_window.ui:39
 #: gajim/gtk/roster_item_exchange.py:35
@@ -8375,15 +8581,15 @@ msgstr "Sta_tus"
 msgid "_Start Chat..."
 msgstr "_Start Samtale..."
 
-#: gajim/data/gui/systray_context_menu.ui:50
+#: gajim/data/gui/systray_context_menu.ui:43
 msgid "Show All Pending _Events"
 msgstr "Vis Alle Ventende Hænd_elser"
 
-#: gajim/data/gui/systray_context_menu.ui:59
+#: gajim/data/gui/systray_context_menu.ui:52
 msgid "Mute Sounds"
 msgstr "Slå lyden af"
 
-#: gajim/data/gui/systray_context_menu.ui:75
+#: gajim/data/gui/systray_context_menu.ui:68
 #, fuzzy
 msgid "_Preferences"
 msgstr "Indstillinger"
@@ -8475,34 +8681,34 @@ msgstr ""
 msgid "Execute expression inside a shell, send output"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:45
+#: gajim/command_system/implementation/standard.py:47
 msgid ""
 "Show help on a given command or a list of available commands if -a is given"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:73
+#: gajim/command_system/implementation/standard.py:75
 #, fuzzy
 msgid "Send a message to the contact"
 msgstr "Send en fil til en kontakt"
 
-#: gajim/command_system/implementation/standard.py:78
+#: gajim/command_system/implementation/standard.py:80
 msgid "Send action (in the third person) to the current chat"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:83
+#: gajim/command_system/implementation/standard.py:85
 msgid "Show logged messages which mention given text"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:88
+#: gajim/command_system/implementation/standard.py:90
 #, fuzzy, python-format
 msgid "%s: Nothing found"
 msgstr "%s ikke fundet"
 
-#: gajim/command_system/implementation/standard.py:94
+#: gajim/command_system/implementation/standard.py:96
 msgid "Limit must be an integer"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:118
+#: gajim/command_system/implementation/standard.py:120
 msgid ""
 "\n"
 "    Set the current status\n"
@@ -8512,126 +8718,128 @@ msgid ""
 "    "
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:136
+#: gajim/command_system/implementation/standard.py:138
 msgid "Set the current status to away"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:150
+#: gajim/command_system/implementation/standard.py:152
 msgid "Set the current status to online"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:153
+#: gajim/command_system/implementation/standard.py:155
 #, fuzzy
 msgid "Available"
 msgstr "Ti_lgængelig"
 
-#: gajim/command_system/implementation/standard.py:173
-#: gajim/command_system/implementation/standard.py:250
+#: gajim/command_system/implementation/standard.py:175
+#: gajim/command_system/implementation/standard.py:252
 #, fuzzy
 msgid "Clear the text window"
 msgstr "Skjuler vinduet"
 
-#: gajim/command_system/implementation/standard.py:178
-#: gajim/command_system/implementation/standard.py:397
+#: gajim/command_system/implementation/standard.py:180
+#: gajim/command_system/implementation/standard.py:401
 #, fuzzy
 msgid "Send a ping to the contact"
 msgstr "Send en fil til en kontakt"
 
-#: gajim/command_system/implementation/standard.py:181
-#: gajim/command_system/implementation/standard.py:400
+#: gajim/command_system/implementation/standard.py:183
+#: gajim/command_system/implementation/standard.py:404
 msgid "Command is not supported for zeroconf accounts"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:185
-msgid "Send DTMF sequence through an open audio session"
+#: gajim/command_system/implementation/standard.py:187
+msgid "Send DTMF sequence through an open voice chat"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:188
-msgid "No open audio sessions with the contact"
-msgstr ""
+#: gajim/command_system/implementation/standard.py:190
+#, fuzzy
+msgid "No open voice chats with the contact"
+msgstr "et vindue/faneblad åbnede med denne kontakt "
 
-#: gajim/command_system/implementation/standard.py:191
+#: gajim/command_system/implementation/standard.py:193
 #, fuzzy, python-format
 msgid "%s is not a valid tone"
 msgstr "%s er ikke et gyldigt logniveau"
 
-#: gajim/command_system/implementation/standard.py:198
-msgid "Toggle audio session"
+#: gajim/command_system/implementation/standard.py:200
+msgid "Toggle Voice Chat"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:201
+#: gajim/command_system/implementation/standard.py:203
 #, fuzzy
-msgid "Audio sessions are not available"
-msgstr "En tilslutning er ikke tilgængelig"
+msgid "Voice chats are not available"
+msgstr "Tilslutning er ikke tilgængelig"
 
-#: gajim/command_system/implementation/standard.py:208
-msgid "Toggle video session"
+#: gajim/command_system/implementation/standard.py:210
+msgid "Toggle Video Chat"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:211
+#: gajim/command_system/implementation/standard.py:213
 #, fuzzy
-msgid "Video sessions are not available"
+msgid "Video chats are not available"
 msgstr "Tilslutning er ikke tilgængelig"
 
-#: gajim/command_system/implementation/standard.py:218
+#: gajim/command_system/implementation/standard.py:220
 #, fuzzy
 msgid "Send a message to the contact that will attract their attention"
 msgstr "Send en fil til en kontakt"
 
-#: gajim/command_system/implementation/standard.py:255
+#: gajim/command_system/implementation/standard.py:257
 #, fuzzy
 msgid "Change your nickname in a group chat"
 msgstr "Ændre dit kælenavn (Ctrl+N)"
 
-#: gajim/command_system/implementation/standard.py:260 gajim/gtk/dialogs.py:674
-#: gajim/gtk/bookmarks.py:272
+#: gajim/command_system/implementation/standard.py:262
 msgid "Invalid nickname"
 msgstr "Ugyldigt kælenavn"
 
-#: gajim/command_system/implementation/standard.py:267
+#: gajim/command_system/implementation/standard.py:269
 #, fuzzy
-msgid "Open a private chat window with a specified occupant"
+msgid "Open a private chat window with a specified participant"
 msgstr "_Åbn samtale vindue med bruger"
 
-#: gajim/command_system/implementation/standard.py:273
-#: gajim/command_system/implementation/standard.py:282
-#: gajim/command_system/implementation/standard.py:332
-#: gajim/command_system/implementation/standard.py:345
-#: gajim/command_system/implementation/standard.py:357
+#: gajim/command_system/implementation/standard.py:275
+#: gajim/command_system/implementation/standard.py:284
+#: gajim/command_system/implementation/standard.py:336
+#: gajim/command_system/implementation/standard.py:349
+#: gajim/command_system/implementation/standard.py:361
 #, fuzzy
 msgid "Nickname not found"
 msgstr "Kælenavn som skal bruges"
 
-#: gajim/command_system/implementation/standard.py:276
+#: gajim/command_system/implementation/standard.py:278
+#, fuzzy
 msgid ""
-"Open a private chat window with a specified occupant and send him a message"
-msgstr ""
+"Open a private chat window with a specified participant and send him a "
+"message"
+msgstr "_Åbn samtale vindue med bruger"
 
-#: gajim/command_system/implementation/standard.py:285
+#: gajim/command_system/implementation/standard.py:287
 #, fuzzy
 msgid "Display or change a group chat topic"
 msgstr "Spørg før et gruppesamtale vindue/faneblad lukkes."
 
-#: gajim/command_system/implementation/standard.py:294
-msgid "Invite a user to a room for a reason"
+#: gajim/command_system/implementation/standard.py:296
+msgid "Invite a user to a group chat for a reason"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:297
+#: gajim/command_system/implementation/standard.py:299
 #, fuzzy, python-format
 msgid "Invited %(jid)s to %(room_jid)s"
 msgstr "Send %s til %s"
 
-#: gajim/command_system/implementation/standard.py:301
+#: gajim/command_system/implementation/standard.py:303
 #, fuzzy
-msgid "Join a group chat given by a JID"
+msgid "Join a group chat given by an XMPP Address"
 msgstr "i _gruppe samtaler"
 
-#: gajim/command_system/implementation/standard.py:309
+#: gajim/command_system/implementation/standard.py:313
 msgid ""
-"Leave the groupchat, optionally giving a reason, and close tab or window"
+"Leave the group chat, optionally giving a reason, and close tab or window"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:314
+#: gajim/command_system/implementation/standard.py:318
 msgid ""
 "\n"
 "    Ban user by a nick or a JID from a groupchat\n"
@@ -8640,46 +8848,46 @@ msgid ""
 "    "
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:329
+#: gajim/command_system/implementation/standard.py:333
 #, fuzzy
-msgid "Kick user by a nick from a groupchat"
+msgid "Kick user by a nick from a group chat"
 msgstr "Du er inviteret til en gruppesamtale."
 
-#: gajim/command_system/implementation/standard.py:338
+#: gajim/command_system/implementation/standard.py:342
 msgid ""
-"Set occupant role in group chat.\n"
+"Set participant role in group chat.\n"
 "    Role can be given as one of the following values:\n"
 "    moderator, participant, visitor, none"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:343
+#: gajim/command_system/implementation/standard.py:347
 #, fuzzy
 msgid "Invalid role given"
 msgstr "Ugyldigt server"
 
-#: gajim/command_system/implementation/standard.py:350
+#: gajim/command_system/implementation/standard.py:354
 msgid ""
-"Set occupant affiliation in group chat.\n"
+"Set participant affiliation in group chat.\n"
 "    Affiliation can be given as one of the following values:\n"
 "    owner, admin, member, outcast, none"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:355
+#: gajim/command_system/implementation/standard.py:359
 #, fuzzy
 msgid "Invalid affiliation given"
 msgstr "tilknytning ændret"
 
-#: gajim/command_system/implementation/standard.py:365
+#: gajim/command_system/implementation/standard.py:369
 #, fuzzy
-msgid "Display names of all group chat occupants"
+msgid "Display names of all group chat participants"
 msgstr "%s er ikke navnet på en gruppe samtale."
 
-#: gajim/command_system/implementation/standard.py:387
-msgid "Forbid an occupant to send you public or private messages"
+#: gajim/command_system/implementation/standard.py:391
+msgid "Forbid a participant to send you public or private messages"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:392
-msgid "Allow an occupant to send you public or private messages"
+#: gajim/command_system/implementation/standard.py:396
+msgid "Allow a participant to send you public or private messages"
 msgstr ""
 
 #: gajim/command_system/implementation/middleware.py:74
@@ -8690,201 +8898,326 @@ msgstr ""
 msgid "The same as using a doc-string, except it supports translation"
 msgstr ""
 
-#: gajim/gtk/filetransfer.py:91
+#: gajim/gtk/groupchat_info.py:36
+#, fuzzy
+msgid "?Group chat feature:Archiving"
+msgstr "Gruppesamtale Invitation"
+
+#: gajim/gtk/groupchat_info.py:37
+#, fuzzy
+msgid "Messages are archived on the server"
+msgstr "Session VIL IKKE blive logget"
+
+#: gajim/gtk/groupchat_info.py:40
+#, fuzzy
+msgid "?Group chat feature:Persistent"
+msgstr "Gruppesamtaler"
+
+#: gajim/gtk/groupchat_info.py:41
+msgid "This group chat persists even if there are no participants"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:45
+#, fuzzy
+msgid "?Group chat feature:Temporary"
+msgstr "?Group Chat Contact Role:Ingen"
+
+#: gajim/gtk/groupchat_info.py:46
+msgid "This group chat will be destroyed once the last participant left"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:50
+#, fuzzy
+msgid "?Group chat feature:Moderated"
+msgstr "?Group Chat Contact Role:Ingen"
+
+#: gajim/gtk/groupchat_info.py:51
+msgid ""
+"Participants entering this group chat need to request permission to send "
+"messages"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:55
+#, fuzzy
+msgid "?Group chat feature:Not Moderated"
+msgstr "Gruppesamtaler"
+
+#: gajim/gtk/groupchat_info.py:56
+msgid "Participants entering this group chat are allowed to send messages"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:60
+#, fuzzy
+msgid "?Group chat feature:Open"
+msgstr "?Group Chat Contact Role:Ingen"
+
+#: gajim/gtk/groupchat_info.py:61
+#, fuzzy
+msgid "Anyone can join this group chat"
+msgstr "%s deltager nu i gruppe samtalen"
+
+#: gajim/gtk/groupchat_info.py:64
+#, fuzzy
+msgid "?Group chat feature:Members Only"
+msgstr "Gruppe Samtale Besked Fremhævning"
+
+#: gajim/gtk/groupchat_info.py:65
+msgid "This group chat is restricted to members only"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:69
+#, fuzzy
+msgid "?Group chat feature:Public"
+msgstr "Gruppe Samtale Besked Fremhævning"
+
+#: gajim/gtk/groupchat_info.py:70
+msgid "Group chat can be found via search"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:73
+#, fuzzy
+msgid "?Group chat feature:Hidden"
+msgstr "?Group Chat Contact Role:Ingen"
+
+#: gajim/gtk/groupchat_info.py:74
+#, fuzzy
+msgid "This group chat can not be found via search"
+msgstr "Tjenesten findes ikke"
+
+#: gajim/gtk/groupchat_info.py:77
+#, fuzzy
+msgid "?Group chat feature:Not Anonymous"
+msgstr "Gruppesamtaler"
+
+#: gajim/gtk/groupchat_info.py:78
+msgid "All other group chat participants can see your XMPP address"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:82
+#, fuzzy
+msgid "?Group chat feature:Semi-Anonymous"
+msgstr "Gruppe Samtale Besked Fremhævning"
+
+#: gajim/gtk/groupchat_info.py:83
+msgid "Only moderators can see your XMPP address"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:86
+#, fuzzy
+msgid "?Group chat feature:Password Required"
+msgstr "Gruppesamtaler"
+
+#: gajim/gtk/groupchat_info.py:87
+msgid "This group chat does require a password upon entry"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:91
+#, fuzzy
+msgid "?Group chat feature:No Password Required"
+msgstr "Gruppesamtaler"
+
+#: gajim/gtk/groupchat_info.py:92
+msgid "This group chat does not require a password upon entry"
+msgstr ""
+
+#: gajim/gtk/filetransfer.py:90
 msgid "File"
 msgstr "Fil"
 
-#: gajim/gtk/filetransfer.py:108
+#: gajim/gtk/filetransfer.py:107
 msgid "Time"
 msgstr "Tid"
 
-#: gajim/gtk/filetransfer.py:228
+#: gajim/gtk/filetransfer.py:227
 #, fuzzy, python-format
 msgid "File name: %s"
 msgstr "Filnavn: %s"
 
-#: gajim/gtk/filetransfer.py:229 gajim/gtk/filetransfer.py:464
+#: gajim/gtk/filetransfer.py:228 gajim/gtk/filetransfer.py:469
 #, python-format
 msgid "Size: %s"
 msgstr "Størrelse: %s"
 
-#: gajim/gtk/filetransfer.py:239
+#: gajim/gtk/filetransfer.py:238
 #, python-format
 msgid "Sender: %s"
 msgstr "Afsender: %s"
 
-#: gajim/gtk/filetransfer.py:240 gajim/gtk/filetransfer.py:744
+#: gajim/gtk/filetransfer.py:239 gajim/gtk/filetransfer.py:749
 #: gajim/gtk/tooltips.py:577
 msgid "Recipient: "
 msgstr "Modtager: "
 
-#: gajim/gtk/filetransfer.py:251
+#: gajim/gtk/filetransfer.py:250
 #, python-format
 msgid "Saved in: %s"
 msgstr "Gemt i: %s"
 
-#: gajim/gtk/filetransfer.py:256
+#: gajim/gtk/filetransfer.py:255
 msgid "File transfer completed"
 msgstr "Filoverførsel er fuldført"
 
-#: gajim/gtk/filetransfer.py:276 gajim/gtk/filetransfer.py:285
+#: gajim/gtk/filetransfer.py:275 gajim/gtk/filetransfer.py:284
 #, fuzzy
 msgid "Connection with peer could not be established."
 msgstr "Tilslutning til ligeværdige kan ikke oprettes."
 
-#: gajim/gtk/filetransfer.py:293
+#: gajim/gtk/filetransfer.py:292
 #, python-format
 msgid "Filename: %s"
 msgstr "Filnavn: %s"
 
-#: gajim/gtk/filetransfer.py:294
+#: gajim/gtk/filetransfer.py:293
 #, python-format
 msgid "Recipient: %s"
 msgstr "Modtager: %s"
 
-#: gajim/gtk/filetransfer.py:296
+#: gajim/gtk/filetransfer.py:295
 #, python-format
 msgid "Error message: %s"
 msgstr "Fejl besked: %s"
 
-#: gajim/gtk/filetransfer.py:333
-#, fuzzy
-msgid "File transfer error"
-msgstr "Filoverførsel Fejl"
-
 #: gajim/gtk/filetransfer.py:334
 #, python-format
 msgid ""
-"The file %(file)s has been received, but it seems to have been damaged along "
-"the way.\n"
+"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 ""
 
-#: gajim/gtk/filetransfer.py:350
+#: gajim/gtk/filetransfer.py:340
+#, fuzzy
+msgid "_Download Again"
+msgstr "Ikke spørg mig ige_n"
+
+#: gajim/gtk/filetransfer.py:355
 msgid "Gajim can not read this file"
 msgstr "Gajim kan ikke læse denne fil"
 
-#: gajim/gtk/filetransfer.py:351
+#: gajim/gtk/filetransfer.py:356
 msgid "Another process is using this file."
 msgstr "En anden process bruger denne fil."
 
-#: gajim/gtk/filetransfer.py:418
+#: gajim/gtk/filetransfer.py:423
 #, fuzzy
 msgid "File Transfer Conflict"
 msgstr "Filoverførsel er Fuldført"
 
-#: gajim/gtk/filetransfer.py:419
+#: gajim/gtk/filetransfer.py:424
 msgid "This file already exists"
 msgstr "Denne fil eksisterer allerede"
 
-#: gajim/gtk/filetransfer.py:420
+#: gajim/gtk/filetransfer.py:425
 msgid "Resume download or replace file?"
 msgstr ""
 
-#: gajim/gtk/filetransfer.py:424
+#: gajim/gtk/filetransfer.py:429
 #, fuzzy
 msgid "Replace _File"
 msgstr "Gør Rent"
 
-#: gajim/gtk/filetransfer.py:427
+#: gajim/gtk/filetransfer.py:432
 #, fuzzy
 msgid "Resume _Download"
 msgstr "Hent"
 
-#: gajim/gtk/filetransfer.py:437
+#: gajim/gtk/filetransfer.py:442
 #, fuzzy, python-format
 msgid "Directory '%s' is not writable"
 msgstr "Kataloget \"%s\" er ikke skrivbart"
 
-#: gajim/gtk/filetransfer.py:438
+#: gajim/gtk/filetransfer.py:443
 #, fuzzy
 msgid "You do not have permissions to create files in this directory."
 msgstr "Du har ikke rettigheder til at oprette filer i dette katalog."
 
-#: gajim/gtk/filetransfer.py:461
+#: gajim/gtk/filetransfer.py:466
 #, python-format
 msgid "File: %s"
 msgstr "Fil: %s"
 
-#: gajim/gtk/filetransfer.py:467
+#: gajim/gtk/filetransfer.py:472
 #, python-format
 msgid "Type: %s"
 msgstr "Type: %s"
 
-#: gajim/gtk/filetransfer.py:469
+#: gajim/gtk/filetransfer.py:474
 #, python-format
 msgid "Description: %s"
 msgstr "Beskrivelse: %s"
 
-#: gajim/gtk/filetransfer.py:480
+#: gajim/gtk/filetransfer.py:485
 #, fuzzy, python-format
 msgid "%s wants to send you a file"
 msgstr "%s vil gerne sende dig en fil."
 
-#: gajim/gtk/filetransfer.py:509
+#: gajim/gtk/filetransfer.py:514
 msgid "Checking file…"
 msgstr "Tjekker fil..."
 
-#: gajim/gtk/filetransfer.py:524
+#: gajim/gtk/filetransfer.py:529
 msgid "File error"
 msgstr "Fejl i filen"
 
-#: gajim/gtk/filetransfer.py:561
+#: gajim/gtk/filetransfer.py:566
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 
-#: gajim/gtk/filetransfer.py:658
+#: gajim/gtk/filetransfer.py:663
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/s)"
 
-#: gajim/gtk/filetransfer.py:711 gajim/gtk/filetransfer.py:715
+#: gajim/gtk/filetransfer.py:716 gajim/gtk/filetransfer.py:720
 msgid "Invalid File"
 msgstr "Ugyldig Fil"
 
-#: gajim/gtk/filetransfer.py:711
+#: gajim/gtk/filetransfer.py:716
 msgid "File: "
 msgstr "Fil: "
 
-#: gajim/gtk/filetransfer.py:716
+#: gajim/gtk/filetransfer.py:721
 msgid "It is not possible to send empty files"
 msgstr "Det er ikke mulig at sende tomme filer"
 
-#: gajim/gtk/filetransfer.py:742 gajim/gtk/tooltips.py:571
+#: gajim/gtk/filetransfer.py:747 gajim/gtk/tooltips.py:571
 msgid "Sender: "
 msgstr "Afsender: "
 
-#: gajim/gtk/filetransfer.py:1038
+#: gajim/gtk/filetransfer.py:1043
 #, fuzzy
 msgid "Choose a File to Send…"
 msgstr "Vælg en fil at sende..."
 
 #: gajim/gtk/start_chat.py:51
 #, fuzzy
-msgid "Start new Conversation"
+msgid "Start New Conversation"
 msgstr "Fortsat samtale"
 
-#: gajim/gtk/start_chat.py:424
-#, fuzzy
-msgid "New Groupchat"
-msgstr "Ny Gruppe Samtale"
+#: gajim/gtk/start_chat.py:260 gajim/gtk/start_chat.py:328
+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:426
+#: gajim/gtk/start_chat.py:603 gajim/gtk/groupchat_join.py:38
+msgid "Join Group Chat"
+msgstr "Bliv med i en Gruppe Samtale"
+
+#: gajim/gtk/start_chat.py:605 gajim/gtk/add_contact.py:40
 #, fuzzy
-msgid "New Contact"
-msgstr "Tilføj Ny Kontakt"
+msgid "Add Contact"
+msgstr "_Tilføj Kontakt..."
 
-#: gajim/gtk/start_chat.py:588
+#: gajim/gtk/start_chat.py:746
 #, fuzzy, python-format
-msgid "%s Group chats found"
+msgid "%s group chats found"
 msgstr "%s ikke fundet"
 
-#: gajim/gtk/discovery.py:70
+#: gajim/gtk/discovery.py:69
 msgid "This service has not yet responded with detailed information"
 msgstr "Denne tjeneste har endnu ikke svaret med detaljeret information"
 
-#: gajim/gtk/discovery.py:71
+#: gajim/gtk/discovery.py:70
 #, fuzzy
 msgid ""
 "This service could not respond with detailed information.\n"
@@ -8893,32 +9226,33 @@ msgstr ""
 "Denne tjeneste kunne ikke svare med detaljeret information.\n"
 "Den er højst sandsynlig ikke fungerende"
 
-#: gajim/gtk/discovery.py:128
+#: gajim/gtk/discovery.py:126
 msgid "Others"
 msgstr "Andre"
 
-#: gajim/gtk/discovery.py:131
-msgid "Conference"
-msgstr "Konference"
+#: gajim/gtk/discovery.py:129
+#, fuzzy
+msgid "Group Chat"
+msgstr "Gruppesamtaler"
 
-#: gajim/gtk/discovery.py:519
+#: gajim/gtk/discovery.py:518
 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:606
+#: gajim/gtk/discovery.py:605
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Opdag Tjenester med kontoen %s"
 
-#: gajim/gtk/discovery.py:608
+#: gajim/gtk/discovery.py:607
 msgid "Service Discovery"
 msgstr "Opdag Tjenester"
 
-#: gajim/gtk/discovery.py:691
+#: gajim/gtk/discovery.py:690
 msgid "The service could not be found"
 msgstr "Tjenesten findes ikke"
 
-#: gajim/gtk/discovery.py:692
+#: gajim/gtk/discovery.py:691
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -8926,101 +9260,80 @@ 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:699 gajim/gtk/discovery.py:1042
+#: gajim/gtk/discovery.py:698 gajim/gtk/discovery.py:1041
 msgid "The service is not browsable"
 msgstr "Det er ikke mulig at gennemse denne tjeneste"
 
-#: gajim/gtk/discovery.py:700
+#: gajim/gtk/discovery.py:699
 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:738 gajim/gtk/discovery.py:747
+#: gajim/gtk/discovery.py:737 gajim/gtk/discovery.py:746
 msgid "Invalid Server Name"
 msgstr "Ikke gyldigt server navn"
 
-#: gajim/gtk/discovery.py:806
+#: gajim/gtk/discovery.py:805
 #, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Gennemse %(address)s med konto %(account)s"
 
-#: gajim/gtk/discovery.py:851
+#: gajim/gtk/discovery.py:850
 #, fuzzy
 msgid "Browse"
 msgstr "_Gennemse"
 
-#: gajim/gtk/discovery.py:1043
+#: gajim/gtk/discovery.py:1042
 msgid "This service does not contain any items to browse."
 msgstr "Denne tjeneste har ingen elementer som kan gennemses."
 
-#: gajim/gtk/discovery.py:1255
+#: gajim/gtk/discovery.py:1254
 #, fuzzy
 msgid "_Command"
 msgstr "Kommando"
 
-#: gajim/gtk/discovery.py:1264 gajim/gtk/discovery.py:1422
+#: gajim/gtk/discovery.py:1263 gajim/gtk/discovery.py:1420
 msgid "Re_gister"
 msgstr "Re_gistrer"
 
-#: gajim/gtk/discovery.py:1277
+#: gajim/gtk/discovery.py:1276
 msgid "_Search"
 msgstr "_Søg"
 
-#: gajim/gtk/discovery.py:1420
+#: gajim/gtk/discovery.py:1418
 msgid "_Edit"
 msgstr "R_ediger"
 
-#: gajim/gtk/discovery.py:1458
+#: gajim/gtk/discovery.py:1456
 #, fuzzy, python-format
 msgid "Scanning %(current)d / %(total)d ..."
 msgstr "Skanner %(current)d / %(total)d.."
 
-#: gajim/gtk/discovery.py:1674
+#: gajim/gtk/discovery.py:1655
+msgid "Users"
+msgstr "Brugere"
+
+#: gajim/gtk/discovery.py:1671
 msgid "Id"
 msgstr "Id"
 
-#: gajim/gtk/discovery.py:1713
-msgid "_Join"
-msgstr "_Bliv med:"
-
-#: gajim/gtk/discovery.py:1736
-msgid "Bookmark already set"
-msgstr "Bogmærke er allerede sat"
-
-#: gajim/gtk/discovery.py:1737
-#, fuzzy, python-format
-msgid "Group Chat '%s' is already in your bookmarks."
-msgstr "Gruppe samtale \"%s\" er allerede i dine bogmærker."
-
-#: gajim/gtk/discovery.py:1748
-msgid "Bookmark has been added successfully"
-msgstr "Bogmærket er blevet tilføjet succesfuldt"
-
-#: gajim/gtk/discovery.py:1749
-#, fuzzy
-msgid ""
-"You can manage your bookmarks by clicking the Bookmarks menu item in your "
-"contact list."
-msgstr ""
-"De kan håndtere dine bogmærker via Handlings menuen i dit kontaktvindue."
-
-#: gajim/gtk/discovery.py:1950
+#: gajim/gtk/discovery.py:1900
 msgid "Subscribed"
 msgstr "Abonnerede"
 
-#: gajim/gtk/discovery.py:1959
+#: gajim/gtk/discovery.py:1909
 msgid "Node"
 msgstr "Knude"
 
-#: gajim/gtk/discovery.py:2028
+#: gajim/gtk/discovery.py:1978
 #, fuzzy
 msgid "_New post"
 msgstr "Ny post"
 
-#: gajim/gtk/discovery.py:2037
+#: gajim/gtk/discovery.py:1987
 msgid "_Subscribe"
 msgstr "_Abonner"
 
-#: gajim/gtk/discovery.py:2045
+#: gajim/gtk/discovery.py:1995
 msgid "_Unsubscribe"
 msgstr "_Frameld abonnement"
 
@@ -9067,7 +9380,7 @@ msgstr "Formular %s"
 msgid "Characters typed: %s"
 msgstr "Tegn ikke tilladt: %s"
 
-#: gajim/gtk/single_message.py:274 gajim/gtk/xml_console.py:169
+#: gajim/gtk/single_message.py:274 gajim/gtk/xml_console.py:166
 msgid "Connection not available"
 msgstr "Tilslutning er ikke tilgængelig"
 
@@ -9076,6 +9389,12 @@ msgstr "Tilslutning er ikke tilgængelig"
 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:306
+#, 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:330
 #, python-format
 msgid "RE: %s"
@@ -9086,28 +9405,28 @@ msgstr "SV: %s"
 msgid "%s wrote:\n"
 msgstr "%s skrev:\n"
 
-#: gajim/gtk/pep_config.py:44
+#: gajim/gtk/pep_config.py:45
 #, fuzzy, python-format
 msgid "PEP Service Configuration (%s)"
 msgstr "PEP Tjeneste Konfigurering"
 
-#: gajim/gtk/pep_config.py:77
+#: gajim/gtk/pep_config.py:78
 #, fuzzy
 msgid "Service"
 msgstr "Server"
 
-#: gajim/gtk/pep_config.py:114
+#: gajim/gtk/pep_config.py:115
 msgid "PEP node was not removed"
 msgstr "PEP knude blev ikke fjernet"
 
-#: gajim/gtk/pep_config.py:115
+#: gajim/gtk/pep_config.py:116
 #, fuzzy, python-format
 msgid ""
 "PEP node %(node)s was not removed:\n"
 "%(message)s"
 msgstr "PEP knude %(node)s blev ikke fjernet: %(message)s"
 
-#: gajim/gtk/pep_config.py:146
+#: gajim/gtk/pep_config.py:147
 #, fuzzy, python-format
 msgid "Configure %s"
 msgstr "_Konfigurere"
@@ -9123,17 +9442,21 @@ msgstr "Kan _registreres"
 msgid "Registration successful"
 msgstr "Tilslutning lykkedes"
 
-#: gajim/gtk/dialogs.py:54 gajim/gtk/dataform.py:659 gajim/gtk/adhoc.py:85
+#: gajim/gtk/service_registration.py:215
+msgid "Registration failed"
+msgstr "Tilslutning fejlede"
+
+#: gajim/gtk/dialogs.py:53 gajim/gtk/dataform.py:668 gajim/gtk/adhoc.py:86
 #, fuzzy
 msgid "Cancel"
 msgstr "_Afbryd"
 
-#: gajim/gtk/dialogs.py:129
+#: gajim/gtk/dialogs.py:128
 #, fuzzy, python-format
 msgid "Dictionary for language \"%s\" not available"
 msgstr "Ordbog for sproget %s er ikke tilgængelig"
 
-#: gajim/gtk/dialogs.py:130
+#: gajim/gtk/dialogs.py:129
 #, fuzzy, python-format
 msgid ""
 "You have to install the dictionary \"%s\" to use spellchecking, or choose "
@@ -9146,11 +9469,11 @@ msgstr ""
 "\n"
 "Egenskaben med at fremhæve stavefejl vil ikke blive brugt"
 
-#: gajim/gtk/dialogs.py:410 gajim/gtk/dialogs.py:425
+#: gajim/gtk/dialogs.py:322 gajim/gtk/dialogs.py:337
 msgid "Insecure connection"
 msgstr "Ikke sikker forbindelse"
 
-#: gajim/gtk/dialogs.py:411
+#: gajim/gtk/dialogs.py:323
 #, fuzzy, python-format
 msgid ""
 "You are about to connect to the account %(account)s (%(server)s) insecurely. "
@@ -9162,121 +9485,116 @@ msgstr ""
 "installere PyOpenSSL for at forhindre dette. Er du sikker på du vil gøre "
 "dette?"
 
-#: gajim/gtk/dialogs.py:416
+#: gajim/gtk/dialogs.py:328
 msgid "Yes, I really want to connect insecurely"
 msgstr "Ja, jeg vil virkelig gerne tilslutte mig uden sikkerhed"
 
-#: gajim/gtk/dialogs.py:417
+#: gajim/gtk/dialogs.py:329
 msgid "Gajim will NOT connect unless you check this box"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:675
-#, fuzzy
-msgid "The nickname contains invalid characters."
-msgstr "Kælenavnet har ikke tilladte tegn."
-
-#: gajim/gtk/dialogs.py:734
+#: gajim/gtk/dialogs.py:561
 #, fuzzy, python-format
 msgid "Destroy %s"
 msgstr "Fjern %s"
 
-#: gajim/gtk/dialogs.py:775
+#: gajim/gtk/dialogs.py:602
 #, fuzzy
 msgid "Certificate"
 msgstr "Selvsigneret certifikat"
 
-#: gajim/gtk/dialogs.py:786
+#: gajim/gtk/dialogs.py:613
 #, fuzzy, python-format
 msgid ""
 "Certificate for account\n"
 "%s"
 msgstr "for konto %s"
 
-#: gajim/gtk/dialogs.py:824
+#: gajim/gtk/dialogs.py:651
 msgid "Issued to\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:825 gajim/gtk/dialogs.py:830
+#: gajim/gtk/dialogs.py:652 gajim/gtk/dialogs.py:657
 msgid "Common Name (CN): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:826 gajim/gtk/dialogs.py:831
+#: gajim/gtk/dialogs.py:653 gajim/gtk/dialogs.py:658
 msgid "Organization (O): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:827 gajim/gtk/dialogs.py:832
+#: gajim/gtk/dialogs.py:654 gajim/gtk/dialogs.py:659
 msgid "Organizational Unit (OU): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:828
+#: gajim/gtk/dialogs.py:655
 #, fuzzy
 msgid "Serial Number: "
 msgstr "GG Nummer:"
 
-#: gajim/gtk/dialogs.py:829
+#: gajim/gtk/dialogs.py:656
 msgid "Issued by\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:833
+#: gajim/gtk/dialogs.py:660
 msgid "Validity\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:834
+#: gajim/gtk/dialogs.py:661
 msgid "Issued on: "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:835
+#: gajim/gtk/dialogs.py:662
 msgid "Expires on: "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:836
+#: gajim/gtk/dialogs.py:663
 msgid "SHA-1:"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:838
+#: gajim/gtk/dialogs.py:665
 msgid "SHA-256:"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:852
+#: gajim/gtk/dialogs.py:679
 #, fuzzy
 msgid "View certificate…"
 msgstr "Selvsigneret certifikat"
 
-#: gajim/gtk/dialogs.py:864 gajim/gtk/accounts.py:893
+#: gajim/gtk/dialogs.py:691 gajim/gtk/accounts.py:896
 msgid "Change Password"
 msgstr "Ændre Adgangskode"
 
-#: gajim/gtk/dialogs.py:878
+#: gajim/gtk/dialogs.py:705
 msgid "_OK"
 msgstr "_OK"
 
-#: gajim/gtk/dialogs.py:891
+#: gajim/gtk/dialogs.py:718
 #, fuzzy
 msgid "You must enter a password"
 msgstr "Du må indtaste en adgangskode."
 
-#: gajim/gtk/dialogs.py:895
+#: gajim/gtk/dialogs.py:722
 msgid "Passwords do not match"
 msgstr "Adgangskoderne er ikke ens"
 
-#: gajim/gtk/dialogs.py:923
+#: gajim/gtk/dialogs.py:750
 #, fuzzy
 msgid "Group Chat Invitation "
 msgstr "Gruppesamtale Invitation"
 
-#: gajim/gtk/dialogs.py:948
+#: gajim/gtk/dialogs.py:775
 #, fuzzy, python-format
 msgid "<b>%s</b> has invited you to join a discussion"
 msgstr "$Contact har inviteret dig til at deltage i en diskussion"
 
-#: gajim/gtk/dialogs.py:951
+#: gajim/gtk/dialogs.py:778
 #, 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:959
+#: gajim/gtk/dialogs.py:786
 #, python-format
 msgid "Comment: %s"
 msgstr "Kommentar: %s"
@@ -9291,11 +9609,6 @@ msgstr "GG Nummer:"
 msgid "ICQ Number"
 msgstr "ICQ Nummer:"
 
-#: gajim/gtk/add_contact.py:40
-#, fuzzy
-msgid "Add Contact"
-msgstr "_Tilføj Kontakt..."
-
 #: gajim/gtk/add_contact.py:259
 #, fuzzy, python-format
 msgid "%s Missing"
@@ -9316,7 +9629,8 @@ msgid "The user ID must not contain a resource."
 msgstr "Bruger ID'en må ikke indeholde en resource."
 
 #: gajim/gtk/add_contact.py:299
-msgid "You cannot add yourself to your roster."
+#, fuzzy
+msgid "You cannot add yourself to your contact list."
 msgstr "Du kan ikke tilføje dig selv til kontaktvinduet."
 
 #: gajim/gtk/add_contact.py:304
@@ -9329,11 +9643,13 @@ msgid "Your account must be online to add new contacts."
 msgstr ""
 
 #: gajim/gtk/add_contact.py:321
-msgid "Contact already in roster"
+#, fuzzy
+msgid "Contact Already in Contact List"
 msgstr "Kontakten er allerede i kontaktvinduet"
 
 #: gajim/gtk/add_contact.py:322
-msgid "This contact is already listed in your roster."
+#, fuzzy
+msgid "This contact is already in your contact list."
 msgstr "Denne kontakt er allered i dit kontaktvindue"
 
 #: gajim/gtk/add_contact.py:379 gajim/gtk/add_contact.py:417
@@ -9374,14 +9690,14 @@ msgstr "Ændre status"
 
 #: gajim/gtk/themes.py:52
 #, fuzzy
-msgid "MUC Tab New Directed Message"
+msgid "Group Chat Tab New Directed Message"
 msgstr ""
 "MUC Sendte\n"
 "Meldinger"
 
 #: gajim/gtk/themes.py:56
 #, fuzzy
-msgid "MUC Tab New Message"
+msgid "Group Chat Tab New Message"
 msgstr "Ny Besked"
 
 #: gajim/gtk/themes.py:60
@@ -9598,13 +9914,13 @@ msgstr "Alle filer"
 msgid "Clear File"
 msgstr "Gør Rent"
 
-#: gajim/gtk/settings.py:570
+#: gajim/gtk/settings.py:570 gajim/gtk/proxies.py:32
 #, fuzzy
 msgid "Manage Proxies"
 msgstr "Håndter Proxy Profiler"
 
-#: gajim/gtk/settings.py:591 gajim/gtk/preferences.py:971
-#: gajim/gtk/preferences.py:984 gajim/gtk/preferences.py:988
+#: gajim/gtk/settings.py:591 gajim/gtk/preferences.py:968
+#: gajim/gtk/preferences.py:982 gajim/gtk/preferences.py:986
 #, fuzzy
 msgid "No Proxy"
 msgstr "Proxy:"
@@ -9684,14 +10000,15 @@ msgid ""
 "        "
 msgstr ""
 
-#: gajim/gtk/about.py:47 data/org.gajim.Gajim.appdata.xml.in:10
+#: gajim/gtk/about.py:47 data/org.gajim.Gajim.desktop.in:6
+#: data/org.gajim.Gajim.appdata.xml.in:10
 #, fuzzy
-msgid "A GTK+ XMPP client"
+msgid "A GTK XMPP client"
 msgstr "En GTK+ Jabber klient"
 
 #: gajim/gtk/about.py:48
 #, fuzzy, python-format
-msgid "GTK+ Version: %s"
+msgid "GTK Version: %s"
 msgstr "GTK+ Version:"
 
 #: gajim/gtk/about.py:49
@@ -9867,6 +10184,25 @@ msgstr "?transfer status:Midlertidig stoppet"
 msgid "?transfer status:Not started"
 msgstr "?transfer status:Midlertidig stoppet"
 
+#: gajim/gtk/groupchat_creation.py:97 gajim/gtk/groupchat_creation.py:99
+msgid " (optional)..."
+msgstr ""
+
+#: gajim/gtk/groupchat_creation.py:134
+#, fuzzy
+msgid "Invalid Address"
+msgstr "Ugyldig Fil"
+
+#: gajim/gtk/groupchat_creation.py:182
+#, fuzzy
+msgid "Not Connected"
+msgstr "Tilsluttet"
+
+#: gajim/gtk/groupchat_creation.py:183
+#, fuzzy
+msgid "You have to be connected to create a group chat."
+msgstr "Du detlager ikke i en gruppesamtale."
+
 #: gajim/gtk/sounds.py:39
 msgid "Wav Sounds"
 msgstr "Wav Lyde"
@@ -9908,50 +10244,45 @@ msgstr "Gruppe Samtale Besked Fremhævning"
 msgid "Group Chat Message Received"
 msgstr "Gruppe Samtale Besked Modtaget"
 
-#: gajim/gtk/dataform.py:226 gajim/gtk/dataform.py:262
+#: gajim/gtk/dataform.py:232 gajim/gtk/dataform.py:268
 #, fuzzy
 msgid "Required"
 msgstr "Adgangskode er Påkrævet"
 
-#: gajim/gtk/dataform.py:286
+#: gajim/gtk/dataform.py:293
 msgid "Yes"
 msgstr ""
 
-#: gajim/gtk/dataform.py:286
+#: gajim/gtk/dataform.py:293
 #, fuzzy
 msgid "No"
 msgstr "Ingen"
 
-#: gajim/gtk/dataform.py:661
+#: gajim/gtk/dataform.py:670
 msgid "Submit"
 msgstr ""
 
-#: gajim/gtk/statusicon.py:213
+#: gajim/gtk/statusicon.py:206
 #, fuzzy
 msgid "_Change Status Message…"
 msgstr "_Ændre Status Besked"
 
-#: gajim/gtk/statusicon.py:247 gajim/gtk/statusicon.py:292
-#: gajim/gtk/statusicon.py:299
+#: gajim/gtk/statusicon.py:258
 #, python-format
 msgid "using account %s"
 msgstr "med konto %s"
 
-#: gajim/gtk/statusicon.py:309
+#: gajim/gtk/statusicon.py:269
 #, fuzzy
-msgid "_Manage Bookmarks…"
-msgstr "Håndter Bogmærker"
+msgid "Hide _Contact List"
+msgstr "Inviter _Kontakter"
 
-#: gajim/gtk/statusicon.py:325
+#: gajim/gtk/statusicon.py:273
 #, fuzzy
-msgid "Hide _Roster"
-msgstr "i _kontaktvinduet"
-
-#: gajim/gtk/statusicon.py:329
-msgid "Show _Roster"
-msgstr "Vis _Kontaktvindue"
+msgid "Show _Contact List"
+msgstr "Vis Kun _Aktive Kontakter"
 
-#: gajim/gtk/statusicon.py:337
+#: gajim/gtk/statusicon.py:281
 msgid "Hide this menu"
 msgstr "Skjul denne menu"
 
@@ -10000,36 +10331,6 @@ msgstr ""
 "Der var en fejl under publicering af din personlige information, prøv igen "
 "senere."
 
-#: gajim/gtk/join_groupchat.py:202
-#, fuzzy
-msgid "Invalid Room"
-msgstr "Ugyldig rum"
-
-#: gajim/gtk/join_groupchat.py:203
-msgid "Please choose a room"
-msgstr ""
-
-#: gajim/gtk/join_groupchat.py:222 gajim/gtk/join_groupchat.py:229
-msgid "Invalid Nickname"
-msgstr "Ugyldig Kælenavn"
-
-#: gajim/gtk/join_groupchat.py:223
-#, fuzzy
-msgid "Please choose a nickname"
-msgstr "Opret et nyt tema med dit ønskede navn."
-
-#: gajim/gtk/join_groupchat.py:282 gajim/gtk/join_groupchat.py:288
-#: gajim/gtk/join_groupchat.py:293
-#, fuzzy
-msgid "Wrong server"
-msgstr "Forkert uri"
-
-#: gajim/gtk/join_groupchat.py:283 gajim/gtk/join_groupchat.py:289
-#: gajim/gtk/join_groupchat.py:294
-#, fuzzy, python-format
-msgid "%s is not a groupchat server"
-msgstr "Dette er ikke en gruppe samtale"
-
 #: gajim/gtk/mam_preferences.py:38
 #, python-format
 msgid "Archiving Preferences for %s"
@@ -10060,45 +10361,53 @@ msgstr "Fejl i modtaget dataform"
 msgid "Archiving Preferences Error"
 msgstr "_Indstillinger"
 
-#: gajim/gtk/advanced_config.py:81
+#: gajim/gtk/advanced_config.py:95
 msgid "Activated"
 msgstr "Aktiveret"
 
-#: gajim/gtk/advanced_config.py:81
+#: gajim/gtk/advanced_config.py:95
 msgid "Deactivated"
 msgstr "Ikke aktiveret"
 
-#: gajim/gtk/advanced_config.py:83
-msgid "Boolean"
-msgstr "Boolean"
+#: gajim/gtk/advanced_config.py:97
+msgid "?config type:Boolean"
+msgstr ""
 
-#: gajim/gtk/advanced_config.py:84
-msgid "Integer"
-msgstr "Heltal"
+#: gajim/gtk/advanced_config.py:98
+msgid "?config type:Integer"
+msgstr ""
 
-#: gajim/gtk/advanced_config.py:85
-msgid "Text"
-msgstr "Tekst"
+#: gajim/gtk/advanced_config.py:99
+msgid "?config type:Text"
+msgstr ""
 
-#: gajim/gtk/advanced_config.py:97
-msgid "Preference Name"
+#: gajim/gtk/advanced_config.py:100
+msgid "?config type:Color"
+msgstr ""
+
+#: gajim/gtk/advanced_config.py:112
+#, fuzzy
+msgid "?config:Preference Name"
 msgstr "Foretrukket Navn"
 
-#: gajim/gtk/advanced_config.py:104
-msgid "Value"
-msgstr "Værdi"
+#: gajim/gtk/advanced_config.py:123
+#, fuzzy
+msgid "?config:Value"
+msgstr "_Konfigurere"
 
-#: gajim/gtk/advanced_config.py:113
-msgid "Type"
-msgstr "Type"
+#: gajim/gtk/advanced_config.py:132
+msgid "?config:Type"
+msgstr ""
 
-#: gajim/gtk/advanced_config.py:168
-msgid "(None)"
-msgstr "(Ingen)"
+#: gajim/gtk/advanced_config.py:187
+#, fuzzy
+msgid "?config description:None"
+msgstr "?Ask (for Subscription):Intet"
 
-#: gajim/gtk/advanced_config.py:299
-msgid "Hidden"
-msgstr "Skjult"
+#: gajim/gtk/advanced_config.py:322
+#, fuzzy
+msgid "?password:Hidden"
+msgstr "Adgangskode:"
 
 #: gajim/gtk/server_info.py:66
 #, fuzzy
@@ -10110,8 +10419,8 @@ msgstr "_Kopier Henvisning"
 msgid "%(days)s days, %(hours)s hours"
 msgstr ""
 
-#: gajim/gtk/server_info.py:218 gajim/gtk/accounts.py:749
-#: gajim/gtk/accounts.py:853
+#: gajim/gtk/server_info.py:218 gajim/gtk/accounts.py:752
+#: gajim/gtk/accounts.py:856
 #, fuzzy
 msgid "Hostname"
 msgstr "_Værtsnavn:"
@@ -10302,11 +10611,6 @@ 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_config.py:41
-#, fuzzy
-msgid "Group Chat Configuration"
-msgstr "Gruppesamtale Invitation"
-
 #: gajim/gtk/groupchat_config.py:134
 #, fuzzy
 msgid "A Group Chat needs at least one Owner"
@@ -10317,69 +10621,69 @@ msgid "You are not allowed to modify the affiliation of Admins and Owners"
 msgstr ""
 
 #: gajim/gtk/groupchat_config.py:399
-msgid "An entry with this Jabber-ID already exists"
+msgid "An entry with this XMPP Address already exists"
 msgstr ""
 
-#: gajim/gtk/adhoc.py:91
+#: gajim/gtk/adhoc.py:92
 #, fuzzy
 msgid "Finish"
 msgstr "_Færdig"
 
-#: gajim/gtk/adhoc.py:97 gajim/gtk/adhoc.py:283
+#: gajim/gtk/adhoc.py:98 gajim/gtk/adhoc.py:284
 #, fuzzy
 msgid "Commands"
 msgstr "Kommando"
 
-#: gajim/gtk/adhoc.py:103
+#: gajim/gtk/adhoc.py:104
 msgid "Next"
 msgstr ""
 
-#: gajim/gtk/adhoc.py:109
+#: gajim/gtk/adhoc.py:110
 #, fuzzy
 msgid "Previous"
 msgstr "Misundelig"
 
-#: gajim/gtk/adhoc.py:115
+#: gajim/gtk/adhoc.py:116
 #, fuzzy
 msgid "Execute"
 msgstr "_Kør Kommando"
 
-#: gajim/gtk/adhoc.py:195
+#: gajim/gtk/adhoc.py:196
 #, fuzzy
 msgid "No commands available"
 msgstr "Ingen konto tilgængelig"
 
-#: gajim/gtk/adhoc.py:244
+#: gajim/gtk/adhoc.py:245
 #, fuzzy
 msgid "Request Command List"
 msgstr "_Kør Kommando"
 
-#: gajim/gtk/adhoc.py:259
+#: gajim/gtk/adhoc.py:260
 #, fuzzy
 msgid "Executing…"
 msgstr "_Kør Kommando"
 
-#: gajim/gtk/adhoc.py:266
+#: gajim/gtk/adhoc.py:267
 #, fuzzy
 msgid "Command List"
 msgstr "Liste over bandlyste"
 
-#: gajim/gtk/adhoc.py:384
+#: gajim/gtk/adhoc.py:385
 #, fuzzy
 msgid "Finished"
 msgstr "_Færdig"
 
-#: gajim/gtk/adhoc.py:453
+#: gajim/gtk/adhoc.py:454
 #, fuzzy
 msgid "Execution failed"
 msgstr "Tilslutning Fejlede"
 
-#: gajim/gtk/blocking.py:37
+#: gajim/gtk/blocking.py:38
 #, fuzzy, python-format
 msgid "Blocking List for %s"
 msgstr "Privatlivs Liste for %s"
 
-#: gajim/gtk/blocking.py:71
+#: gajim/gtk/blocking.py:72
 #, fuzzy
 msgid "Error!"
 msgstr "Fejl"
@@ -10429,8 +10733,7 @@ msgstr "Ugyldigt brugernavn"
 msgid "You must provide a username to configure this account."
 msgstr "Du må give et brugernavn for at konfigurere denne konto."
 
-#: gajim/gtk/account_wizard.py:252 gajim/gtk/bookmarks.py:290
-#: gajim/gtk/bookmarks.py:303
+#: gajim/gtk/account_wizard.py:252
 msgid "Invalid server"
 msgstr "Ugyldigt server"
 
@@ -10446,7 +10749,7 @@ msgstr "Ugyldig indgang"
 msgid "Custom port must be a port number."
 msgstr "Personlig port må være et port nummer."
 
-#: gajim/gtk/account_wizard.py:405
+#: gajim/gtk/account_wizard.py:406
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -10461,15 +10764,15 @@ msgstr ""
 "SSL Fejl: %(error)s\n"
 "Vil du stadig prøve at forbinde til denne server?"
 
-#: gajim/gtk/account_wizard.py:446 gajim/gtk/account_wizard.py:480
+#: gajim/gtk/account_wizard.py:447 gajim/gtk/account_wizard.py:481
 msgid "An error occurred during account creation"
 msgstr "Under oprettelsen af kontoen opstod der en fejl"
 
-#: gajim/gtk/account_wizard.py:545
+#: gajim/gtk/account_wizard.py:546
 msgid "Account name is in use"
 msgstr "Kontonavnet er i brug"
 
-#: gajim/gtk/account_wizard.py:546
+#: gajim/gtk/account_wizard.py:547
 msgid "You already have an account using this name."
 msgstr "Du har allered en konto med dette navn."
 
@@ -10496,26 +10799,26 @@ msgstr "Filoverførsel af %(filename)s fra %(name)s er stoppet."
 msgid "%(minutes)s min %(seconds)s sec"
 msgstr ""
 
-#: gajim/gtk/xml_console.py:77
+#: gajim/gtk/xml_console.py:74
 #, fuzzy
 msgid "Filter"
 msgstr "Filter:"
 
-#: gajim/gtk/xml_console.py:82
+#: gajim/gtk/xml_console.py:79
 #, fuzzy
 msgid "XML Input"
 msgstr "<b>XML Inddata</b>"
 
-#: gajim/gtk/xml_console.py:86
+#: gajim/gtk/xml_console.py:83
 msgid "Paste Last Input"
 msgstr ""
 
-#: gajim/gtk/xml_console.py:170
+#: gajim/gtk/xml_console.py:167
 #, fuzzy, 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/xml_console.py:182
+#: gajim/gtk/xml_console.py:177
 #, fuzzy
 msgid "Invalid Node"
 msgstr "Ugyldig Fil"
@@ -10548,38 +10851,53 @@ msgstr "Søg"
 msgid "No results found"
 msgstr "Intet resultat"
 
-#: gajim/gtk/preferences.py:358 gajim/gtk/preferences.py:362
+#: gajim/gtk/preferences.py:357 gajim/gtk/preferences.py:361
 msgid "Default"
 msgstr "Standard"
 
-#: gajim/gtk/preferences.py:801
+#: gajim/gtk/preferences.py:798
 msgid "status message title"
 msgstr "status besked Titel"
 
-#: gajim/gtk/preferences.py:802
+#: gajim/gtk/preferences.py:799
 msgid "status message text"
 msgstr "status besked tekst"
 
+#: gajim/gtk/accounts.py:137
+#, fuzzy
+msgid "Re-Login"
+msgstr "Log ind igen nu?"
+
 #: gajim/gtk/accounts.py:138
-msgid "Relogin now?"
+#, fuzzy
+msgid "Re-Login now?"
 msgstr "Log ind igen nu?"
 
 #: gajim/gtk/accounts.py:139
-msgid "If you want all the changes to apply instantly, you must relogin."
+#, 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:191 gajim/gtk/accounts.py:975
+#: gajim/gtk/accounts.py:141
+msgid "_Later"
+msgstr ""
+
+#: gajim/gtk/accounts.py:143
+msgid "_Re-Login"
+msgstr ""
+
+#: gajim/gtk/accounts.py:194 gajim/gtk/accounts.py:978
 #, fuzzy
 msgid "Remove Account"
 msgstr "Fjerne kontoen med navnet %s"
 
-#: gajim/gtk/accounts.py:192
+#: gajim/gtk/accounts.py:195
 #, fuzzy, python-format
 msgid "You still have open chats in your account %s"
 msgstr "Du har en åben samtale med kontonavnet %s"
 
-#: gajim/gtk/accounts.py:193
+#: gajim/gtk/accounts.py:196
 #, fuzzy
 msgid ""
 "All chat and group chat windows will be closed.\n"
@@ -10587,270 +10905,265 @@ msgid ""
 msgstr ""
 "Alle samtale og gruppesamtale vinduer vil blive lukket. Vil du fortsætte?"
 
-#: gajim/gtk/accounts.py:424
+#: gajim/gtk/accounts.py:427
 #, fuzzy
 msgid "Back"
 msgstr "Snart tilbage"
 
-#: gajim/gtk/accounts.py:530
+#: gajim/gtk/accounts.py:533
 #, fuzzy
 msgid "Please check if Bonjour is installed."
 msgstr "Kontroller venligst om Avahi eller Bonjour er installeret."
 
-#: gajim/gtk/accounts.py:532
+#: gajim/gtk/accounts.py:535
 #, fuzzy
 msgid "Please check if Avahi is installed."
 msgstr "Kontroller venligst om Avahi eller Bonjour er installeret."
 
-#: gajim/gtk/accounts.py:569
+#: gajim/gtk/accounts.py:572
 #, fuzzy
 msgid "Disable Account"
 msgstr "Ugyldig Konto"
 
-#: gajim/gtk/accounts.py:570
+#: gajim/gtk/accounts.py:573
 #, fuzzy, python-format
 msgid "Account %s is still connected"
 msgstr "Kontoen \"%s\" er tilsluttet til serveren"
 
-#: gajim/gtk/accounts.py:571
+#: gajim/gtk/accounts.py:574
 #, fuzzy
 msgid ""
 "All chat and group chat windows will be closed. Do you want to continue?"
 msgstr ""
 "Alle samtale og gruppesamtale vinduer vil blive lukket. Vil du fortsætte?"
 
-#: gajim/gtk/accounts.py:576
+#: gajim/gtk/accounts.py:579
 #, fuzzy
 msgid "_Disable Account"
 msgstr "Ugyldig Konto"
 
-#: gajim/gtk/accounts.py:595
+#: gajim/gtk/accounts.py:598
 #, fuzzy
 msgid "Add Account"
 msgstr "_Tilføj Kontakt..."
 
-#: gajim/gtk/accounts.py:663
+#: gajim/gtk/accounts.py:666
 msgid "Label"
 msgstr ""
 
-#: gajim/gtk/accounts.py:667
+#: gajim/gtk/accounts.py:670
 msgid "Login"
 msgstr ""
 
-#: gajim/gtk/accounts.py:670
+#: gajim/gtk/accounts.py:673
 #, fuzzy
 msgid "Import Contacts"
 msgstr "Inviter _Kontakter"
 
-#: gajim/gtk/accounts.py:674 gajim/gtk/accounts.py:870
+#: gajim/gtk/accounts.py:677 gajim/gtk/accounts.py:873
 #, fuzzy
 msgid "Client Certificate"
 msgstr "Selvsigneret certifikat"
 
-#: gajim/gtk/accounts.py:677 gajim/gtk/accounts.py:774
+#: gajim/gtk/accounts.py:680 gajim/gtk/accounts.py:777
 #, fuzzy
 msgid "Connect on startup"
 msgstr "T_ilslut når Gajim startes"
 
-#: gajim/gtk/accounts.py:681 gajim/gtk/accounts.py:779
+#: gajim/gtk/accounts.py:684 gajim/gtk/accounts.py:782
 #, fuzzy
 msgid "Save conversations for all contacts"
 msgstr "Gem konversations _logger for alle kontakter"
 
-#: gajim/gtk/accounts.py:683 gajim/gtk/accounts.py:781
+#: gajim/gtk/accounts.py:686 gajim/gtk/accounts.py:784
 msgid "Store conversations on the harddrive"
 msgstr ""
 
-#: gajim/gtk/accounts.py:685 gajim/gtk/accounts.py:783
+#: gajim/gtk/accounts.py:688 gajim/gtk/accounts.py:786
 #, fuzzy
 msgid "Global Status"
 msgstr "Status For Alle"
 
-#: gajim/gtk/accounts.py:687
+#: gajim/gtk/accounts.py:690
 #, fuzzy
 msgid "Synchronise the status of all accounts"
 msgstr "Ændrer status for kontoen eller konti"
 
-#: gajim/gtk/accounts.py:689
+#: gajim/gtk/accounts.py:692
 msgid "Use file transfer proxies"
 msgstr "Brug fil transport proxy"
 
-#: gajim/gtk/accounts.py:705
+#: gajim/gtk/accounts.py:708
 #, fuzzy
 msgid "Idle Time"
 msgstr " siden %s"
 
-#: gajim/gtk/accounts.py:707
+#: gajim/gtk/accounts.py:710
 msgid "Disclose the time of your last activity"
 msgstr ""
 
-#: gajim/gtk/accounts.py:709
+#: gajim/gtk/accounts.py:712
 msgid "Local System Time"
 msgstr ""
 
-#: gajim/gtk/accounts.py:711
+#: gajim/gtk/accounts.py:714
 msgid "Disclose the local system time of the device Gajim runs on"
 msgstr ""
 
-#: gajim/gtk/accounts.py:714
+#: gajim/gtk/accounts.py:717
 #, fuzzy
 msgid "Client / Operating System"
 msgstr "Selvsigneret certifikat"
 
-#: gajim/gtk/accounts.py:716
+#: gajim/gtk/accounts.py:719
 #, fuzzy
 msgid ""
 "Disclose informations 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:719
+#: gajim/gtk/accounts.py:722
 #, fuzzy
 msgid "Ignore Unknown Contacts"
 msgstr "Inviter _Kontakter"
 
-#: gajim/gtk/accounts.py:721
+#: gajim/gtk/accounts.py:724
 #, 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:737 gajim/gtk/accounts.py:776
+#: gajim/gtk/accounts.py:740 gajim/gtk/accounts.py:779
 #, fuzzy
 msgid "Use environment variable"
 msgstr "br_ug HTTP__PROXY miljøvariablen"
 
-#: gajim/gtk/accounts.py:739
-#, fuzzy
-msgid "Proxy"
-msgstr "Proxy:"
-
-#: gajim/gtk/accounts.py:742
+#: gajim/gtk/accounts.py:745
 #, fuzzy
 msgid "Warn on insecure connection"
 msgstr "Ad_var mig før jeg bruger en usikker forbindelse"
 
-#: gajim/gtk/accounts.py:746
+#: gajim/gtk/accounts.py:749
 msgid "Send keep-alive packets"
 msgstr "Send hold-i-live pakker"
 
-#: gajim/gtk/accounts.py:750
+#: gajim/gtk/accounts.py:753
 msgid "Manually set the hostname for the server"
 msgstr ""
 
-#: gajim/gtk/accounts.py:756 gajim/gtk/accounts.py:826
-#: gajim/gtk/accounts.py:831
+#: gajim/gtk/accounts.py:759 gajim/gtk/accounts.py:829
+#: gajim/gtk/accounts.py:834
 #, fuzzy
 msgid "Priority"
 msgstr "Priori_tet:"
 
-#: gajim/gtk/accounts.py:785
+#: gajim/gtk/accounts.py:788
 #, fuzzy
 msgid "Synchronize the status of all accounts"
 msgstr "Ændrer status for kontoen eller konti"
 
-#: gajim/gtk/accounts.py:795
+#: gajim/gtk/accounts.py:798
 #, fuzzy
 msgid "First Name"
 msgstr "Fornavn:"
 
-#: gajim/gtk/accounts.py:798
+#: gajim/gtk/accounts.py:801
 #, fuzzy
 msgid "Last Name"
 msgstr "Efternavn:"
 
-#: gajim/gtk/accounts.py:804
+#: gajim/gtk/accounts.py:807
 #, fuzzy
 msgid "Email"
 msgstr "Ny E-post"
 
-#: gajim/gtk/accounts.py:822
+#: gajim/gtk/accounts.py:825
 #, fuzzy
 msgid "Adjust to status"
 msgstr "_Tilpas til status"
 
-#: gajim/gtk/accounts.py:849
+#: gajim/gtk/accounts.py:852
 msgid "Enable"
 msgstr "Aktiver"
 
-#: gajim/gtk/accounts.py:857
+#: gajim/gtk/accounts.py:860
 #, fuzzy
 msgid "Port"
 msgstr "_Port:"
 
-#: gajim/gtk/accounts.py:862
+#: gajim/gtk/accounts.py:865
 #, fuzzy
 msgid "Connection Settings"
 msgstr "Tilslutning"
 
-#: gajim/gtk/accounts.py:872
+#: gajim/gtk/accounts.py:875
 msgid "PKCS12 Files"
 msgstr ""
 
-#: gajim/gtk/accounts.py:874
+#: gajim/gtk/accounts.py:877
 #, fuzzy
 msgid "Encrypted Certificate"
 msgstr "Selvsigneret certifikat"
 
-#: gajim/gtk/accounts.py:878
+#: gajim/gtk/accounts.py:881
 #, fuzzy
 msgid "Certificate Settings"
 msgstr "Selvsigneret certifikat"
 
-#: gajim/gtk/accounts.py:890
+#: gajim/gtk/accounts.py:893
 #, fuzzy
 msgid "Save Password"
 msgstr "Gem adgangskode"
 
-#: gajim/gtk/accounts.py:898
+#: gajim/gtk/accounts.py:901
 #, fuzzy
 msgid "Login Settings"
 msgstr "Tilslutning fejlede"
 
-#: gajim/gtk/accounts.py:931
+#: gajim/gtk/accounts.py:934
 #, fuzzy, python-format
 msgid "Removing account %s"
 msgstr "Fjerne kontoen med navnet %s"
 
-#: gajim/gtk/accounts.py:946
+#: gajim/gtk/accounts.py:949
 #, fuzzy
 msgid "Account is disabled"
 msgstr "Følelsesikoner er ikke aktiveret"
 
-#: gajim/gtk/accounts.py:947
+#: gajim/gtk/accounts.py:950
 #, fuzzy
 msgid "To unregister from a server, the account must be enabled."
 msgstr "For at deaktivere din konto må du afbryde din tilslutning."
 
-#: gajim/gtk/accounts.py:962
+#: gajim/gtk/accounts.py:965
 #, fuzzy
 msgid "Password required"
 msgstr "Adgangskode er Påkrævet"
 
-#: gajim/gtk/accounts.py:976
+#: gajim/gtk/accounts.py:979
 #, fuzzy, python-format
 msgid "Account '%s' is still connected to the server"
 msgstr "Kontoen \"%s\" er tilsluttet til serveren"
 
-#: gajim/gtk/accounts.py:978
+#: gajim/gtk/accounts.py:981
 msgid "If you remove it, the connection will be lost."
 msgstr "Hvis du fjerne den vil tilslutningen tabes."
 
-#: gajim/gtk/accounts.py:995
+#: gajim/gtk/accounts.py:998
 #, fuzzy, python-format
 msgid "Connection to server %s failed"
 msgstr "Tilslutning til proxy fejlede"
 
-#: gajim/gtk/accounts.py:996
+#: gajim/gtk/accounts.py:999
 #, fuzzy
 msgid "What would you like to do?"
 msgstr "Hvad vil du gøre?"
 
-#: gajim/gtk/accounts.py:997
+#: gajim/gtk/accounts.py:1000
 #, fuzzy
 msgid "Remove only from Gajim"
 msgstr "Fjern kun k_ontoen fra Gajim"
 
-#: gajim/gtk/accounts.py:998
+#: gajim/gtk/accounts.py:1001
 msgid "Don't remove anything. I'll try again later"
 msgstr ""
 
@@ -10875,6 +11188,10 @@ msgstr ""
 msgid "Modify"
 msgstr "Ændre"
 
+#: gajim/gtk/roster_item_exchange.py:80
+msgid "JID"
+msgstr "JID"
+
 #: gajim/gtk/roster_item_exchange.py:86
 msgid "Groups"
 msgstr "Grupper"
@@ -10898,19 +11215,19 @@ msgid_plural "Removed %d contacts"
 msgstr[0] "Fjerner kontakt fra kontaktvinduet"
 msgstr[1] "Fjerner kontakt fra kontaktvinduet"
 
-#: gajim/gtk/util.py:581
+#: gajim/gtk/util.py:583
 msgid "Unknown Artist"
 msgstr "Ukendt Artist"
 
-#: gajim/gtk/util.py:582
+#: gajim/gtk/util.py:584
 msgid "Unknown Title"
 msgstr "Ukendt Titel"
 
-#: gajim/gtk/util.py:583
+#: gajim/gtk/util.py:585
 msgid "Unknown Source"
 msgstr "Ukendt Kilde"
 
-#: gajim/gtk/util.py:585
+#: gajim/gtk/util.py:587
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
@@ -10919,28 +11236,10 @@ msgstr ""
 "<b>\"%(title)s\"</b> af <i>%(artist)s</i>\n"
 "fra <i>%(source)s</i>"
 
-#: gajim/gtk/bookmarks.py:121
-msgid "New Group Chat"
-msgstr "Ny Gruppe Samtale"
-
-#: gajim/gtk/bookmarks.py:161
-msgid "This bookmark has invalid data"
-msgstr "Dette bogmærke er ugyldigt"
-
-#: gajim/gtk/bookmarks.py:162
-msgid ""
-"Please be sure to fill out server and room fields or remove this bookmark."
-msgstr ""
-"Fyld ud server og rum tekstindtastningsfelterne eller fjern dette bogmærke."
-
-#: gajim/gtk/bookmarks.py:273 gajim/gtk/bookmarks.py:291
-#: gajim/gtk/bookmarks.py:304 gajim/gtk/bookmarks.py:335
-msgid "Character not allowed"
-msgstr "Tegn ikke tilladt: %s"
-
-#: gajim/gtk/bookmarks.py:334
-msgid "Invalid room"
-msgstr "Ugyldig rum"
+#: gajim/gtk/bookmarks.py:47
+#, fuzzy, python-format
+msgid "Bookmarks for %s"
+msgstr "_Bogmærke"
 
 #: gajim/plugins/pluginmanager.py:736 gajim/plugins/pluginmanager.py:742
 msgid "Archive corrupted"
@@ -10952,51 +11251,54 @@ msgid "Archive empty"
 msgstr "Filen er tom"
 
 #: gajim/plugins/pluginmanager.py:750 gajim/plugins/pluginmanager.py:758
-#: gajim/plugins/gui.py:257
+#: gajim/plugins/gui.py:258
 #, fuzzy
 msgid "Archive is malformed"
 msgstr "Tjeneste sendte malformeret data"
 
-#: gajim/plugins/pluginmanager.py:766 gajim/plugins/gui.py:281
-#: gajim/plugins/gui.py:289
+#: gajim/plugins/pluginmanager.py:766 gajim/plugins/gui.py:288
+#: gajim/plugins/gui.py:301
 #, fuzzy
 msgid "Plugin already exists"
 msgstr "Denne fil eksisterer allerede"
 
-#: gajim/plugins/gui.py:82
+#: gajim/plugins/gui.py:83
 msgid "Click to view Gajim's wiki page on how to install plugins in Flatpak."
 msgstr ""
 
-#: gajim/plugins/gui.py:89
+#: gajim/plugins/gui.py:90
 msgid "Plugin"
 msgstr ""
 
-#: gajim/plugins/gui.py:151
+#: gajim/plugins/gui.py:152
 #, fuzzy, python-format
 msgid "Warning: %s"
 msgstr "Udeluk %s"
 
-#: gajim/plugins/gui.py:206
+#: gajim/plugins/gui.py:207
 #, fuzzy
 msgid "Plugin failed"
 msgstr "Tilslutning fejlede"
 
-#: gajim/plugins/gui.py:245
+#: gajim/plugins/gui.py:246
 msgid "Unable to properly remove the plugin"
 msgstr ""
 
-#: gajim/plugins/gui.py:281
-msgid "Overwrite?"
-msgstr ""
+#: gajim/plugins/gui.py:287
+#, fuzzy
+msgid "Overwrite Plugin?"
+msgstr "Overskriv Status Besked?"
+
+#: gajim/plugins/gui.py:289
+#, fuzzy
+msgid "Do you want to overwrite the currently installed version?"
+msgstr "Vil du acceptere denne invitation?"
 
 #: data/org.gajim.Gajim.desktop.in:5
-msgid "Jabber IM Client"
+#, fuzzy
+msgid "XMPP IM Client"
 msgstr "Jabber IM Klient"
 
-#: data/org.gajim.Gajim.desktop.in:6
-msgid "A GTK+ Jabber client"
-msgstr "En GTK+ Jabber klient"
-
 #: data/org.gajim.Gajim.desktop.in:8
 msgid "chat;messaging;im;xmpp;bonjour;voip;"
 msgstr ""
@@ -11048,7 +11350,7 @@ msgid "Easily send pictures, videos or other files to friends and groups"
 msgstr ""
 
 #: data/org.gajim.Gajim.appdata.xml.in:27
-msgid "Chat securely with End-to-End encryption via OMEMO or PGP"
+msgid "Chat securely with End-to-End encryption via OMEMO or OpenPGP"
 msgstr ""
 
 #: data/org.gajim.Gajim.appdata.xml.in:28
@@ -11110,7 +11412,7 @@ msgstr ""
 
 #: data/org.gajim.Gajim.appdata.xml.in:52
 #, fuzzy
-msgid "Roster, list of contacts"
+msgid "Contact list, list of contacts"
 msgstr "_Log status ændringer hos kontakter"
 
 #: data/org.gajim.Gajim.appdata.xml.in:56
@@ -11132,6 +11434,533 @@ msgstr "For nylig:"
 msgid "Plugin manager"
 msgstr "Tilslutning fejlede"
 
+#, fuzzy
+#~ msgid "Configure Services…"
+#~ msgstr "Tilpas Tjenester..."
+
+#, fuzzy
+#~ msgid "Group Chat Bookmarks"
+#~ msgstr "_Gruppe Chat"
+
+#, fuzzy
+#~ msgid "Add Bookmark"
+#~ msgstr "_Bogmærke"
+
+#, fuzzy
+#~ msgid "Remove Bookmark"
+#~ msgstr "_Bogmærke"
+
+#, fuzzy
+#~ msgid "Bookmark Name"
+#~ msgstr "Bogmærk dette rom"
+
+#, fuzzy
+#~ msgid "_Server"
+#~ msgstr "_Server:"
+
+#, fuzzy
+#~ msgid "_Password"
+#~ msgstr "_Adgangskode"
+
+#, fuzzy
+#~ msgid "Join chat when connected"
+#~ msgstr "Kontakt er ikke Tilsluttet"
+
+#~ msgid "New Group Chat"
+#~ msgstr "Ny Gruppe Samtale"
+
+#~ msgid "This bookmark has invalid data"
+#~ msgstr "Dette bogmærke er ugyldigt"
+
+#, fuzzy
+#~ msgid ""
+#~ "Please be sure to fill out server and group chat fields or remove this "
+#~ "bookmark."
+#~ msgstr ""
+#~ "Fyld ud server og rum tekstindtastningsfelterne eller fjern dette "
+#~ "bogmærke."
+
+#~ msgid "Character not allowed"
+#~ msgstr "Tegn ikke tilladt: %s"
+
+#, fuzzy
+#~ msgid "Invalid Group Chat"
+#~ msgstr "Ugyldig gruppe samtale Jabber ID"
+
+#~ msgid "Unable to join group chat"
+#~ msgstr "Ikke i stand til at deltage i gruppesamtale."
+
+#, fuzzy
+#~ msgid "You are banned from group chat <b>%s</b>."
+#~ msgstr "Du er bandlyst fra gruppesamtalen %s."
+
+#, fuzzy
+#~ msgid "Remote server <b>%s</b> does not exist."
+#~ msgstr "Gruppesamtalen %s eksisterer ikke."
+
+#, fuzzy
+#~ msgid "Group chat <b>%s</b> does not exist."
+#~ msgstr "Gruppesamtalen %s eksisterer ikke."
+
+#, fuzzy
+#~ msgid "Group chat creation is not permitted."
+#~ msgstr "Gruppesamtale oprettelse er begrænset."
+
+#, fuzzy
+#~ msgid "You must use your registered nickname in <b>%s</b>."
+#~ msgstr "Dit registrerede kælenavn skal bruges i gruppesamtalen %s."
+
+#, fuzzy
+#~ msgid "You are not in the members list in group chat %s."
+#~ msgstr "Du er ikke i medlemslisten for gruppesamtalen %s."
+
+#, fuzzy
+#~ msgid "XMPP Address is not a group chat"
+#~ msgstr "Dette er ikke en gruppe samtale"
+
+#~ msgid "This is not a group chat"
+#~ msgstr "Dette er ikke en gruppe samtale"
+
+#, fuzzy
+#~ msgid "Please choose a group chat"
+#~ msgstr "Opret et nyt tema med dit ønskede navn."
+
+#~ msgid "Invalid Nickname"
+#~ msgstr "Ugyldig Kælenavn"
+
+#, fuzzy
+#~ msgid "Please choose a nickname"
+#~ msgstr "Opret et nyt tema med dit ønskede navn."
+
+#, fuzzy
+#~ msgid "Wrong server"
+#~ msgstr "Forkert uri"
+
+#, fuzzy
+#~ msgid "%s is not a group chat server"
+#~ msgstr "Dette er ikke en gruppe samtale"
+
+#, fuzzy
+#~ msgid ""
+#~ "How many lines to request from server when entering a group chat. -1 "
+#~ "means no limit."
+#~ msgstr ""
+#~ "Hvor mange linjer skal hentes fra serveren når man deltager i en "
+#~ "gruppesamtale."
+
+#, fuzzy
+#~ msgid ""
+#~ "Minutes of backlog to request when entering a group chat. -1 means no "
+#~ "limit."
+#~ msgstr ""
+#~ "Hvor mange minutter tilbage skal der hentes log fra når man deltager i en "
+#~ "gruppesamtale."
+
+#, fuzzy
+#~ msgid ""
+#~ "How many lines to request from server when entering a group chat. -1 "
+#~ "means no limit, -2 means global value."
+#~ msgstr ""
+#~ "Hvor mange linjer skal hentes fra serveren når man deltager i en "
+#~ "gruppesamtale."
+
+#, fuzzy
+#~ msgid ""
+#~ "Minutes of backlog to request when entering a group chat. -1 means no "
+#~ "limit, -2 means global value."
+#~ msgstr ""
+#~ "Hvor mange minutter tilbage skal der hentes log fra når man deltager i en "
+#~ "gruppesamtale."
+
+#, fuzzy
+#~ msgid "A Password is required to join the group chat %s. Please type it."
+#~ msgstr ""
+#~ "En adgangskode er påkrævet for at deltage i rummet %s. Venligst skriv den."
+
+#~ msgid "Not in Roster"
+#~ msgstr "Ikke i Kontaktvinduet"
+
+#~ msgid "I would like to add you to my roster"
+#~ msgstr "Jeg vil gerne tilføje dig til mit kontaktvindue"
+
+#, fuzzy
+#~ msgid "Add to Roster"
+#~ msgstr "_Tilføj til Kontaktliste"
+
+#, fuzzy
+#~ msgid "Manage Room"
+#~ msgstr "Håndter Ru_m"
+
+#, fuzzy
+#~ msgid "Configure Room"
+#~ msgstr "Tilpas _Rum..."
+
+#, fuzzy
+#~ msgid "Destroy Room"
+#~ msgstr "_Slet rum"
+
+#, fuzzy
+#~ msgid "Change Nick"
+#~ msgstr "Ændre _Kælenavn..."
+
+#, fuzzy
+#~ msgid "Disconnect"
+#~ msgstr "Afbry_d tilslutningen"
+
+#, fuzzy
+#~ msgid "Copy JID"
+#~ msgstr "Rum JID"
+
+#, fuzzy
+#~ msgid "Add to Roster…"
+#~ msgstr "_Tilføj til Kontaktliste"
+
+#, fuzzy
+#~ msgid "Copy JID/Email"
+#~ msgstr "_Kopier JID/E-post Adresse"
+
+#, fuzzy
+#~ msgid "JID: <i>%s</i>"
+#~ msgstr "Jabber ID: <i>%s</i>"
+
+#~ msgid "Changing Subject"
+#~ msgstr "Ændre emne"
+
+#~ msgid "Please specify the new subject:"
+#~ msgstr "Anfør et nyt emne:"
+
+#~ msgid "Room logging is now enabled"
+#~ msgstr "Rum logging er nu aktiveret"
+
+#~ msgid "Room logging is now disabled"
+#~ msgstr "Rum logging er nu deaktiveret"
+
+#, fuzzy
+#~ msgid "You (%s) joined the room"
+#~ msgstr "%s deltager nu i gruppe samtalen"
+
+#~ msgid "Room logging is enabled"
+#~ msgstr "Rum logging er aktiveret"
+
+#, fuzzy
+#~ msgid "Unable to join groupchat"
+#~ msgstr "Ikke i stand til at deltage i gruppesamtale."
+
+#~ msgid "Groupchat Invitation"
+#~ msgstr "Gruppesamtale Invitation"
+
+#, fuzzy
+#~ msgid "%(jid)s has been invited in this room"
+#~ msgstr "%(nick)s er blevet fjernet fra rummet %(reason)s"
+
+#, fuzzy
+#~ msgid "JID is not a Groupchat"
+#~ msgstr "Dette er ikke en gruppe samtale"
+
+#~ msgid "Invalid JID"
+#~ msgstr "Ugyldig JID"
+
+#~ msgid "A connection is not available"
+#~ msgstr "En tilslutning er ikke tilgængelig"
+
+#, fuzzy
+#~ msgid "JID already in list"
+#~ msgstr "Jabber ID er allerede i listen"
+
+#, fuzzy
+#~ msgid "For the chosen encryption there is no encryption method available"
+#~ msgstr "En tilslutning er ikke tilgængelig"
+
+#~ msgid "Removes contact from roster"
+#~ msgstr "Fjerner kontakt fra kontaktvinduet"
+
+#~ msgid "Not in roster"
+#~ msgstr "Ikke i kontaktvindue"
+
+#, fuzzy
+#~ msgid "Contact signed in notification color."
+#~ msgstr "_Vis hændelse i kontaktvindue"
+
+#, fuzzy
+#~ msgid "Contact signout notification color"
+#~ msgstr "_Vis hændelse i kontaktvindue"
+
+#, fuzzy
+#~ msgid "File transfer request notification color."
+#~ msgstr "Filoverførsel Forespørgsel"
+
+#, fuzzy
+#~ msgid "File transfer error notification color."
+#~ msgstr "Filoverførsel er afbrudt"
+
+#, fuzzy
+#~ msgid "File transfer complete or stopped notification color."
+#~ msgstr "Når en filoverførsel er færdig, vis en pop op påmindelse"
+
+#, fuzzy
+#~ msgid "Groupchat invitation notification color"
+#~ msgstr "Gruppesamtale Invitation"
+
+#~ msgid "Add * and [n] in roster title?"
+#~ msgstr "Tilføj * og [n] i tittelen på kontaktvinduet?"
+
+#~ msgid "Hides the banner in two persons chat window"
+#~ msgstr "Skjuler banneret i et to personers samtalevindue"
+
+#, fuzzy
+#~ msgid ""
+#~ "Show the confirm metacontacts creation dialog or not? Empty string means "
+#~ "never show the dialog."
+#~ msgstr ""
+#~ "Skal vi vise bekræftelses vinduet for oprettelse af metakontakter? Tom "
+#~ "streng betyder at vi aldrig viser vinduet."
+
+#~ msgid "Space separated list of ssl errors to ignore."
+#~ msgstr "Mellemrums adskilt liste af ssl fejl som skal ignoreres."
+
+#~ msgid "Answer to receipt requests"
+#~ msgstr "Svar til modtagelses forespørgsel"
+
+#~ msgid "Sent receipt requests"
+#~ msgstr "Sendte modtagelses forespørgsler"
+
+#, fuzzy
+#~ msgid "Language for which misspelled words will be checked"
+#~ msgstr "Sprog som vi vil bruge til at kontrollere for stavefejl"
+
+#~ msgid "I'm eating, so leave me a message."
+#~ msgstr "Jeg spiser, så læg en besked."
+
+#, fuzzy
+#~ msgid "from room %s"
+#~ msgstr "fra rum %s"
+
+#~ msgid "Leave Groupchats"
+#~ msgstr "Forlad Gruppesamtaler"
+
+#, fuzzy
+#~ msgid "Auto Join"
+#~ msgstr "Bliv automatisk med"
+
+#, fuzzy
+#~ msgid "Room"
+#~ msgstr "Rum:"
+
+#~ msgid "Jabber ID:"
+#~ msgstr "Jabber ID:"
+
+#~ msgid "Occupant Actions"
+#~ msgstr "Beboer Handlinger"
+
+#~ msgid "_Add to Roster"
+#~ msgstr "_Tilføj til Kontaktliste"
+
+#~ msgid "_Manage Room"
+#~ msgstr "Håndter Ru_m"
+
+#~ msgid "Configure _Room..."
+#~ msgstr "Tilpas _Rum..."
+
+#~ msgid "_Destroy Room"
+#~ msgstr "_Slet rum"
+
+#~ msgid "Jabber ID"
+#~ msgstr "Jabber ID"
+
+#, fuzzy
+#~ msgid "icon"
+#~ msgstr "Statusikon"
+
+#, fuzzy
+#~ msgid "account"
+#~ msgstr "Konto"
+
+#, fuzzy
+#~ msgid "Roster"
+#~ msgstr "Vis _Kontaktvindue"
+
+#, fuzzy
+#~ msgid "Show only in roster"
+#~ msgstr "_Vis hændelse i kontaktvindue"
+
+#~ msgid "in _roster"
+#~ msgstr "i _kontaktvinduet"
+
+#, fuzzy
+#~ msgid "Roster Appearance"
+#~ msgstr "<b>Kontaktvinduets Udseende</b>"
+
+#, fuzzy
+#~ msgid "Show chatstate in roster"
+#~ msgstr "Vis kontakternes a_vatarer i kontaktvinduet"
+
+#~ msgid "_Add to Roster..."
+#~ msgstr "_Tilføj til Kontaktliste..."
+
+#~ msgid "_Jabber ID:"
+#~ msgstr "_Jabber ID:"
+
+#, fuzzy
+#~ msgid "_Jabber ID"
+#~ msgstr "_Jabber ID:"
+
+#~ msgid "JabberID"
+#~ msgstr "Jabber ID"
+
+#, fuzzy
+#~ msgid "Show Roster"
+#~ msgstr "Vis _Kontaktvindue"
+
+#~ msgid "MUC server"
+#~ msgstr "MUC server"
+
+#~ msgid "Room Configuration"
+#~ msgstr "Rum Konfigurering"
+
+#~ msgid "Join _Group Chat"
+#~ msgstr "Bliv med i en _Gruppe Samtale"
+
+#, fuzzy
+#~ msgid "Audio sessions are not available"
+#~ msgstr "En tilslutning er ikke tilgængelig"
+
+#~ msgid "Conference"
+#~ msgstr "Konference"
+
+#, fuzzy
+#~ msgid "_Manage Bookmarks…"
+#~ msgstr "Håndter Bogmærker"
+
+#, fuzzy
+#~ msgid "Hide _Roster"
+#~ msgstr "i _kontaktvinduet"
+
+#~ msgid "Show _Roster"
+#~ msgstr "Vis _Kontaktvindue"
+
+#, fuzzy
+#~ msgid "Invalid Room"
+#~ msgstr "Ugyldig rum"
+
+#~ msgid "Invalid room"
+#~ msgstr "Ugyldig rum"
+
+#~ msgid "A GTK+ Jabber client"
+#~ msgstr "En GTK+ Jabber klient"
+
+#~ msgid "Changing Nickname"
+#~ msgstr "Ændre kælenavn"
+
+#~ msgid "Please specify the new nickname you want to use:"
+#~ msgstr "Anfør dit nye kælenavn:"
+
+#~ msgid "Bookmark already set"
+#~ msgstr "Bogmærke er allerede sat"
+
+#, fuzzy
+#~ msgid "Group Chat '%s' is already in your bookmarks."
+#~ msgstr "Gruppe samtale \"%s\" er allerede i dine bogmærker."
+
+#~ msgid "Bookmark has been added successfully"
+#~ msgstr "Bogmærket er blevet tilføjet succesfuldt"
+
+#, fuzzy
+#~ msgid ""
+#~ "You can manage your bookmarks by clicking the Bookmarks menu item in your "
+#~ "contact list."
+#~ msgstr ""
+#~ "De kan håndtere dine bogmærker via Handlings menuen i dit kontaktvindue."
+
+#, fuzzy
+#~ msgid "The nickname contains invalid characters."
+#~ msgstr "Kælenavnet har ikke tilladte tegn."
+
+#, fuzzy
+#~ msgid "Bookmark Room"
+#~ msgstr "Bogmærk dette rom"
+
+#~ msgid "_Join New Group Chat"
+#~ msgstr "_Deltag i Ny Gruppe Samtale"
+
+#, fuzzy
+#~ msgid "_Create Group Chat"
+#~ msgstr "Forlad Gruppesamtaler"
+
+#, fuzzy
+#~ msgid "Name:"
+#~ msgstr "Navn: "
+
+#, fuzzy
+#~ msgid "Description:"
+#~ msgstr "Beskrivelse: "
+
+#, fuzzy
+#~ msgid "Address:"
+#~ msgstr "_Adresse:"
+
+#, fuzzy
+#~ msgid "You can not start a new conversation unless you are connected."
+#~ msgstr "Du kan kun deltage i en gruppe samtale hvis du er tilsluttet."
+
+#, fuzzy
+#~ msgid "Occupants"
+#~ msgstr "Beboer Handlinger"
+
+#, fuzzy
+#~ msgid "File transfer error"
+#~ msgstr "Filoverførsel Fejl"
+
+#, fuzzy
+#~ msgid "No Accounts available"
+#~ msgstr "Ingen konto tilgængelig"
+
+#~ msgid "_Modify Account..."
+#~ msgstr "_Ændre Konto"
+
+#~ msgid "Boolean"
+#~ msgstr "Boolean"
+
+#~ msgid "Integer"
+#~ msgstr "Heltal"
+
+#~ msgid "Text"
+#~ msgstr "Tekst"
+
+#~ msgid "Value"
+#~ msgstr "Værdi"
+
+#~ msgid "Type"
+#~ msgstr "Type"
+
+#~ msgid "(None)"
+#~ msgstr "(Ingen)"
+
+#~ msgid "Hidden"
+#~ msgstr "Skjult"
+
+#~ msgid "Manage Proxy Profiles"
+#~ msgstr "Håndter Proxy Profiler"
+
+#, fuzzy
+#~ msgid "Properties"
+#~ msgstr "<b>Egenskaber</b>"
+
+#, fuzzy
+#~ msgid "Proxy _Host"
+#~ msgstr "Proxy _vært:"
+
+#, fuzzy
+#~ msgid "Proxy _Port"
+#~ msgstr "Proxy _Port:"
+
+#, fuzzy
+#~ msgid "New Groupchat"
+#~ msgstr "Ny Gruppe Samtale"
+
+#, fuzzy
+#~ msgid "New Contact"
+#~ msgstr "Tilføj Ny Kontakt"
+
 #~ msgid "%s GiB"
 #~ msgstr "%s GiB"
 
@@ -11213,9 +12042,6 @@ msgstr "Tilslutning fejlede"
 #~ msgid "_Pause"
 #~ msgstr "_Pause"
 
-#~ msgid "Clean _up"
-#~ msgstr "Ryd _op"
-
 #~ msgid "Remove file transfer from the list."
 #~ msgstr "Fjern filoverførsler fra listen."
 
@@ -11663,9 +12489,6 @@ msgstr "Tilslutning fejlede"
 #~ msgid "You are invited to a groupchat"
 #~ msgstr "Du er inviteret til en gruppesamtale."
 
-#~ msgid "Do you want to accept the invitation?"
-#~ msgstr "Vil du acceptere denne invitation?"
-
 #~ msgid "_Start Chat"
 #~ msgstr "_Start Samtale"
 
@@ -11693,10 +12516,6 @@ msgstr "Tilslutning fejlede"
 #~ msgid "Do you wish to delete all correspondence with the selected contacts?"
 #~ msgstr "Vil du virkelig slette loggen for den valgte kontakt?"
 
-#, fuzzy
-#~ msgid "This can not be undone."
-#~ msgstr "Tjenesten findes ikke"
-
 #~ msgid "<b>What do you want to do?</b>"
 #~ msgstr "<b>Hvad vil du gøre?</b>"
 
@@ -11880,10 +12699,6 @@ msgstr "Tilslutning fejlede"
 #~ msgid "Nick"
 #~ msgstr "Kælenavne"
 
-#, fuzzy
-#~ msgid "Banning…"
-#~ msgstr "Bandlysning..."
-
 #~ msgid ""
 #~ "<b>Whom do you want to ban?</b>\n"
 #~ "\n"
@@ -11968,10 +12783,6 @@ msgstr "Tilslutning fejlede"
 #~ msgid "Filter:"
 #~ msgstr "Filter:"
 
-#~ msgid ""
-#~ "If checked, Gajim will display the mood of contacts in the roster window"
-#~ msgstr "Hvis valgt vil Gajim vise kontakternes humør i kontaktvinduet"
-
 #~ msgid "<b>Chat Appearance</b>"
 #~ msgstr "<b>Samtale udseende</b>"
 
@@ -12229,10 +13040,6 @@ msgstr "Tilslutning fejlede"
 #~ msgstr "_Status besked:"
 
 #, fuzzy
-#~ msgid "Group chat highlight"
-#~ msgstr "Gruppe Samtale Besked Fremhævning"
-
-#, fuzzy
 #~ msgid "Your nickname"
 #~ msgstr "Kælenavn:"
 
@@ -12372,9 +13179,6 @@ msgstr "Tilslutning fejlede"
 #~ msgid "The passwords typed in both fields must be identical."
 #~ msgstr "Adgangskoderene i de to tekstindtastningsfelter må være identiske."
 
-#~ msgid "Enter new password:"
-#~ msgstr "Skriv en ny adgangskode:"
-
 #~ msgid "Enter it again for confirmation:"
 #~ msgstr "Skriv adgangskoden igen for at bekræfte:"
 
@@ -12390,10 +13194,6 @@ msgstr "Tilslutning fejlede"
 #~ msgstr "forespørsel om ophør på abonnement fra %s"
 
 #, fuzzy
-#~ msgid "Autojoin"
-#~ msgstr "Bliv automatisk med"
-
-#, fuzzy
 #~ msgid "Homepage:"
 #~ msgstr "<b>Hjemmeside:</b>"
 
@@ -12502,9 +13302,6 @@ msgstr "Tilslutning fejlede"
 #~ msgid "Forward unread message then disconnect"
 #~ msgstr "Videresend ulæste beskeder"
 
-#~ msgid "AIM Address:"
-#~ msgstr "AIM Adresse:"
-
 #~ msgid "MSN Address:"
 #~ msgstr "MSN Adresse:"
 
@@ -12554,10 +13351,6 @@ msgstr "Tilslutning fejlede"
 #~ msgid "Session negotiation cancelled"
 #~ msgstr "Session forhandling annulleret"
 
-#, fuzzy
-#~ msgid "This session WILL NOT be archived on server"
-#~ msgstr "Session VIL IKKE blive logget"
-
 #~ msgid "This session is encrypted"
 #~ msgstr "Denne session er krypteret"
 
@@ -12872,9 +13665,6 @@ msgstr "Tilslutning fejlede"
 #~ msgid "Server:"
 #~ msgstr "Server:"
 
-#~ msgid "Password:"
-#~ msgstr "Adgangskode:"
-
 #, fuzzy
 #~ msgid "Join this room _automatically when I connect"
 #~ msgstr "Bliv med i dette rum automatisk når jeg tilsutter"
@@ -13213,9 +14003,6 @@ msgstr "Tilslutning fejlede"
 #~ msgid "_Edit Personal Information..."
 #~ msgstr "R_ediger Personlig Information..."
 
-#~ msgid "Information about you, as stored in the server"
-#~ msgstr "Information om dig, som er gemt på serveren"
-
 #~ msgid "<b>Personal Information</b>"
 #~ msgstr "<b>Personlig Information</b>"
 
@@ -13295,9 +14082,6 @@ msgstr "Tilslutning fejlede"
 #~ msgid "Your server can't save your personal information."
 #~ msgstr "Din server kan ikke gemme din personlige information."
 
-#~ msgid "Account Local already exists."
-#~ msgstr "Den Lokale Konto eksisterer allerede."
-
 #~ msgid "Please rename or remove it before enabling link-local messaging."
 #~ msgstr "Omdøb eller fjern den før du aktiverer link-local beskeder."
 
@@ -13387,10 +14171,6 @@ msgstr "Tilslutning fejlede"
 #~ msgid "The following message was NOT encrypted"
 #~ msgstr "Den følgende besked var IKKE krypteret"
 
-#, fuzzy
-#~ msgid "Encryption used for this contact."
-#~ msgstr "Aktiver ESessions kryptering for denne konto."
-
 #~ msgid "Toggle Open_PGP Encryption"
 #~ msgstr "Slå til/fra Open_PGP Kryptering"
 
@@ -13470,10 +14250,6 @@ msgstr "Tilslutning fejlede"
 #~ msgid "Contact's identity verified"
 #~ msgstr "Kontaktens identitet er verificeret"
 
-#, fuzzy
-#~ msgid "Verify again…"
-#~ msgstr "Verificer igen..."
-
 #~ msgid ""
 #~ "To be certain that <b>only</b> the expected person can read your messages "
 #~ "or send you messages, you need to verify their identity by clicking the "
@@ -13602,9 +14378,6 @@ msgstr "Tilslutning fejlede"
 #~ msgid "Add _Contact..."
 #~ msgstr "_Tilføj Kontakt..."
 
-#~ msgid "_Accounts"
-#~ msgstr "K_ontoer"
-
 #~ msgid "Profile, A_vatar"
 #~ msgstr "Profil, A_vatar"
 
@@ -13834,12 +14607,6 @@ msgstr "Tilslutning fejlede"
 #~ msgid "Activity: "
 #~ msgstr "Aktivitet:"
 
-#~ msgid "Join _Group Chat..."
-#~ msgstr "Deltag i en _Gruppe Samtale..."
-
-#~ msgid "_Modify Account"
-#~ msgstr "_Ændre Konto"
-
 #~ msgid "Check on startup if Gajim is the _default Jabber client"
 #~ msgstr "Alti_d kontroller om Gajim er standard Jabber klient ved start"
 
@@ -13862,9 +14629,6 @@ msgstr "Tilslutning fejlede"
 #~ msgid "Execute Command..."
 #~ msgstr "Kør Kommando..."
 
-#~ msgid " a window/tab opened with that contact "
-#~ msgstr "et vindue/faneblad åbnede med denne kontakt "
-
 #~ msgid "<b>Actions</b>"
 #~ msgstr "<b>Handlinger</b>"
 
@@ -14444,9 +15208,6 @@ msgstr "Tilslutning fejlede"
 #~ msgid "[This message is encrypted]"
 #~ msgstr "[Denne besked er krypteret]"
 
-#~ msgid "Trayicon"
-#~ msgstr "Statusikon"
-
 #~ msgid "A icon in systemtray reflecting the current presence."
 #~ msgstr "Et ikon i statusfeltet som viser din nuværende tilstedeværelse."
 
diff --git a/po/de.po b/po/de.po
index d43a8554b..f6a73f6a3 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: 2019-07-02 02:06+0000\n"
+"POT-Creation-Date: 2019-08-11 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,67 +23,67 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Poedit 1.8.7.1\n"
 
-#: gajim/chat_control_base.py:550
+#: gajim/chat_control_base.py:557
 msgid "_Undo"
 msgstr "Rü_ckgängig"
 
-#: gajim/chat_control_base.py:558 gajim/conversation_textview.py:529
+#: gajim/chat_control_base.py:565 gajim/conversation_textview.py:529
 msgid "_Clear"
 msgstr "_Zurücksetzen"
 
-#: gajim/chat_control_base.py:563
+#: gajim/chat_control_base.py:570
 msgid "Paste as quote"
 msgstr "Als Zitat einfügen"
 
-#: gajim/chat_control_base.py:613
+#: gajim/chat_control_base.py:620
 msgid "Paste Image"
 msgstr "Bild einfügen"
 
-#: gajim/chat_control_base.py:614
+#: gajim/chat_control_base.py:621
 msgid "You are trying to paste an image"
 msgstr "Sie sind dabei ein Bild einzufügen"
 
-#: gajim/chat_control_base.py:615
+#: gajim/chat_control_base.py:622
 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?"
 
-#: gajim/chat_control_base.py:617 gajim/groupchat_control.py:2310
-#: gajim/roster_window.py:2848 gajim/roster_window.py:4167
-#: gajim/message_window.py:252 gajim/gtk/dialogs.py:418
+#: gajim/chat_control_base.py:624 gajim/groupchat_control.py:2218
+#: gajim/roster_window.py:2841 gajim/roster_window.py:4118
+#: gajim/message_window.py:359 gajim/gtk/dialogs.py:330
 msgid "_Do not ask me again"
 msgstr "_Nicht noch einmal fragen"
 
-#: gajim/chat_control_base.py:620
+#: gajim/chat_control_base.py:627
 msgid "_Paste"
 msgstr "_Einfügen"
 
-#: gajim/chat_control_base.py:1162 gajim/gtk/accounts.py:351
+#: gajim/chat_control_base.py:1169 gajim/gtk/accounts.py:354
 msgid "Privacy"
 msgstr "Privatsphäre"
 
-#: gajim/chat_control_base.py:1163
+#: gajim/chat_control_base.py:1170
 msgid "Warning"
 msgstr "Warnung"
 
-#: gajim/chat_control_base.py:1164
+#: gajim/chat_control_base.py:1171
 #, python-format
 msgid "If you send a file to <b>%s</b>, your real JID will be revealed."
 msgstr ""
 "Wenn Sie eine Datei an <b>%s</b> senden, werden Sie dem Kontakt Ihre echte "
 "JID offenbaren."
 
-#: gajim/chat_control_base.py:1169
+#: gajim/chat_control_base.py:1176
 msgid "Continue"
 msgstr "Fortsetzen"
 
-#: gajim/gtkgui_helpers.py:163 gajim/gtk/filetransfer.py:393
+#: gajim/gtkgui_helpers.py:163 gajim/gtk/filetransfer.py:398
 #, python-format
 msgid "Cannot overwrite existing file '%s'"
 msgstr "Kann bereits existierende Datei \"%s\" nicht überschreiben"
 
-#: gajim/gtkgui_helpers.py:164 gajim/gtk/filetransfer.py:394
+#: gajim/gtkgui_helpers.py:164 gajim/gtk/filetransfer.py:399
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
@@ -169,335 +169,339 @@ msgstr "Es gibt keine offenen Kontaktanfragen."
 msgid " resource with priority "
 msgstr " Resource mit Priorität "
 
-#: gajim/gui_menu_builder.py:96
-msgid "_New Group Chat"
-msgstr "_Neuer Gruppenchat"
-
-#: gajim/gui_menu_builder.py:289 gajim/gui_menu_builder.py:380
-#: gajim/chat_control.py:303 gajim/roster_window.py:786
-#: gajim/roster_window.py:1719 gajim/roster_window.py:1721
-#: gajim/roster_window.py:2030 gajim/roster_window.py:3336
-#: gajim/roster_window.py:3369 gajim/gui_interface.py:413
-#: gajim/common/contacts.py:206 gajim/common/contacts.py:343
-#: gajim/common/helpers.py:83 gajim/common/helpers.py:311
-#: gajim/gtk/add_contact.py:319 gajim/gtk/subscription_request.py:70
-#: gajim/gtk/subscription_request.py:99 gajim/gtk/roster_item_exchange.py:112
-msgid "Not in Roster"
-msgstr "Nicht in der Kontaktliste"
-
-#: gajim/gui_menu_builder.py:393
-msgid "I would like to add you to my roster"
+#: gajim/gui_menu_builder.py:251 gajim/gui_menu_builder.py:342
+#: gajim/chat_control.py:305 gajim/roster_window.py:783
+#: gajim/roster_window.py:1716 gajim/roster_window.py:1718
+#: gajim/roster_window.py:2027 gajim/roster_window.py:3292
+#: gajim/roster_window.py:3325 gajim/gui_interface.py:396
+#: gajim/common/contacts.py:222 gajim/common/contacts.py:359
+#: gajim/common/contacts.py:471 gajim/common/helpers.py:86
+#: gajim/common/helpers.py:317 gajim/gtk/add_contact.py:319
+#: gajim/gtk/subscription_request.py:70 gajim/gtk/subscription_request.py:99
+#: gajim/gtk/roster_item_exchange.py:112
+msgid "Not in contact list"
+msgstr "Nicht in Kontaktliste"
+
+#: gajim/gui_menu_builder.py:355
+msgid "I would like to add you to my contact list"
 msgstr "Ich würde Sie gerne zu meiner Kontaktliste hinzufügen"
 
-#: gajim/gui_menu_builder.py:471
+#: gajim/gui_menu_builder.py:433
 msgid "Send Single _Message…"
 msgstr "Einzelne Nachricht _senden…"
 
-#: gajim/gui_menu_builder.py:486
+#: gajim/gui_menu_builder.py:448
 msgid "E_xecute Command…"
 msgstr "Befehl ausführen…"
 
-#: gajim/gui_menu_builder.py:494
+#: gajim/gui_menu_builder.py:456
 msgid "_Manage Transport"
 msgstr "_Transport verwalten"
 
-#: gajim/gui_menu_builder.py:500
+#: gajim/gui_menu_builder.py:462
 msgid "_Modify Transport"
 msgstr "_Transport ändern"
 
-#: gajim/gui_menu_builder.py:507 gajim/roster_window.py:5046
+#: gajim/gui_menu_builder.py:469 gajim/roster_window.py:4985
 msgid "_Rename…"
 msgstr "_Umbenennen…"
 
-#: gajim/gui_menu_builder.py:518 gajim/roster_window.py:5062
-#: gajim/roster_window.py:5177 gajim/data/gui/blocked_contacts_window.ui:52
+#: gajim/gui_menu_builder.py:480 gajim/roster_window.py:5001
+#: gajim/roster_window.py:5116 gajim/data/gui/blocked_contacts_window.ui:52
 #: gajim/data/gui/gc_occupants_menu.ui:148
 #: gajim/data/gui/contact_context_menu.ui:143
 msgid "_Unblock"
 msgstr "_Sperrung aufheben"
 
-#: gajim/gui_menu_builder.py:521 gajim/roster_window.py:5067
-#: gajim/roster_window.py:5181 gajim/data/gui/gc_occupants_menu.ui:140
+#: gajim/gui_menu_builder.py:483 gajim/roster_window.py:5006
+#: gajim/roster_window.py:5120 gajim/data/gui/gc_occupants_menu.ui:140
 #: gajim/data/gui/contact_context_menu.ui:151
 msgid "_Block"
 msgstr "_Sperren"
 
-#: gajim/gui_menu_builder.py:529 gajim/roster_window.py:5074
+#: gajim/gui_menu_builder.py:491 gajim/roster_window.py:5013
 #: gajim/data/gui/contact_context_menu.ui:181
 msgid "Remo_ve"
 msgstr "Ent_fernen"
 
-#: gajim/gui_menu_builder.py:539 gajim/data/gui/contact_context_menu.ui:198
+#: gajim/gui_menu_builder.py:501 gajim/data/gui/contact_context_menu.ui:198
 msgid "_Information"
 msgstr "_Informationen"
 
-#: gajim/gui_menu_builder.py:552
+#: gajim/gui_menu_builder.py:514
 msgid "Save _As"
 msgstr "Speichern _unter"
 
-#: gajim/gui_menu_builder.py:564 gajim/groupchat_control.py:501
-#: gajim/chat_control.py:340
+#: gajim/gui_menu_builder.py:526 gajim/groupchat_control.py:507
+#: gajim/chat_control.py:342
 msgid "Send File…"
 msgstr "Datei senden…"
 
-#: gajim/gui_menu_builder.py:565
+#: gajim/gui_menu_builder.py:527
 msgid "Upload File…"
 msgstr "Datei hochladen…"
 
-#: gajim/gui_menu_builder.py:566
+#: gajim/gui_menu_builder.py:528
 msgid "Send File Directly…"
 msgstr "Datei direkt senden…"
 
-#: gajim/gui_menu_builder.py:568 gajim/gui_menu_builder.py:632
+#: gajim/gui_menu_builder.py:530 gajim/gui_menu_builder.py:596
 msgid "Send Chatstate"
 msgstr "Chatstatus senden"
 
-#: gajim/gui_menu_builder.py:569
+#: gajim/gui_menu_builder.py:531
 msgid "Invite Contacts"
 msgstr "Kontakte einladen"
 
-#: gajim/gui_menu_builder.py:570
-msgid "Add to Roster"
-msgstr "Zur Kontaktliste hinzufügen"
+#: gajim/gui_menu_builder.py:532
+msgid "Add to Contact List"
+msgstr "Kontakt hinzufügen"
 
-#: gajim/gui_menu_builder.py:571
-msgid "Audio Session"
-msgstr "Audiositzung"
+#: gajim/gui_menu_builder.py:533
+msgid "Voice Chat"
+msgstr "Sprachanruf"
 
-#: gajim/gui_menu_builder.py:572
-msgid "Video Session"
-msgstr "Videositzung"
+#: gajim/gui_menu_builder.py:534
+msgid "Video Chat"
+msgstr "Videoanruf"
 
-#: gajim/gui_menu_builder.py:573
+#: gajim/gui_menu_builder.py:535 gajim/gui_menu_builder.py:582
 msgid "Information"
 msgstr "Informationen"
 
-#: gajim/gui_menu_builder.py:574 gajim/gui_menu_builder.py:639
+#: gajim/gui_menu_builder.py:536 gajim/gui_menu_builder.py:602
 #: gajim/data/gui/application_menu.ui:37
 msgid "History"
 msgstr "Unterhaltungsverlauf"
 
-#: gajim/gui_menu_builder.py:580 gajim/gui_menu_builder.py:687
+#: gajim/gui_menu_builder.py:542 gajim/gui_menu_builder.py:650
 #: gajim/data/gui/preferences_window.ui:1823
 msgid "Disabled"
 msgstr "Deaktiviert"
 
-#: gajim/gui_menu_builder.py:581 gajim/gui_menu_builder.py:688
+#: gajim/gui_menu_builder.py:543 gajim/gui_menu_builder.py:651
 msgid "Composing only"
 msgstr "Nur Schreibbenachrichtigung"
 
-#: gajim/gui_menu_builder.py:582 gajim/gui_menu_builder.py:689
+#: gajim/gui_menu_builder.py:544 gajim/gui_menu_builder.py:652
 msgid "All chat states"
 msgstr "Jeden Chatstatus"
 
-#: gajim/gui_menu_builder.py:620
-msgid "Manage Room"
+#: gajim/gui_menu_builder.py:583
+msgid "Manage Group Chat"
 msgstr "Gruppenchat verwalten"
 
-#: gajim/gui_menu_builder.py:621
+#: gajim/gui_menu_builder.py:584 gajim/data/gui/groupchat_control.ui:649
 msgid "Change Subject"
 msgstr "Thema ändern"
 
-#: gajim/gui_menu_builder.py:622
-msgid "Configure Room"
+#: gajim/gui_menu_builder.py:585
+msgid "Configure Group Chat"
 msgstr "Gruppenchat konfigurieren"
 
-#: gajim/gui_menu_builder.py:623
+#: gajim/gui_menu_builder.py:586
 msgid "Upload Avatar…"
 msgstr "Kontaktbild hochladen…"
 
-#: gajim/gui_menu_builder.py:624
-msgid "Destroy Room"
+#: gajim/gui_menu_builder.py:587
+msgid "Destroy Group Chat"
 msgstr "Gruppenchat auflösen"
 
-#: gajim/gui_menu_builder.py:626 gajim/data/gui/preferences_window.ui:790
+#: gajim/gui_menu_builder.py:589 gajim/data/gui/preferences_window.ui:790
 msgid "Chat Settings"
 msgstr "Chat-Einstellungen"
 
-#: gajim/gui_menu_builder.py:627
+#: gajim/gui_menu_builder.py:590
 msgid "Show join/leave"
 msgstr "Beitreten/Verlassen anzeigen"
 
-#: gajim/gui_menu_builder.py:628
+#: gajim/gui_menu_builder.py:591
 msgid "Show status changes"
 msgstr "Statusänderungen anzeigen"
 
-#: gajim/gui_menu_builder.py:629 gajim/data/gui/gc_control_popup_menu.ui:72
+#: gajim/gui_menu_builder.py:592 gajim/data/gui/gc_control_popup_menu.ui:72
 msgid "Notify on all messages"
 msgstr "Benachrichtigung bei allen Meldungen"
 
-#: gajim/gui_menu_builder.py:630
+#: gajim/gui_menu_builder.py:593
 msgid "Minimize on close"
 msgstr "Beim Schließen minimieren"
 
-#: gajim/gui_menu_builder.py:631
-msgid "Minimize on autojoin"
+#: gajim/gui_menu_builder.py:595
+msgid "Minimize when joining automatically"
 msgstr "Bei automatischem Beitritt minimieren"
 
-#: gajim/gui_menu_builder.py:634
+#: gajim/gui_menu_builder.py:598
 msgid "Sync Threshold"
 msgstr "Sync-Schwellenwert"
 
-#: gajim/gui_menu_builder.py:635
-msgid "Change Nick"
-msgstr "Spitz_namen ändern"
-
-#: gajim/gui_menu_builder.py:636
-msgid "Bookmark Room"
-msgstr "Gruppenchat speichern"
+#: gajim/gui_menu_builder.py:599
+msgid "Change Nickname"
+msgstr "Spitznamen ändern"
 
-#: gajim/gui_menu_builder.py:637
+#: gajim/gui_menu_builder.py:600
 msgid "Request Voice"
 msgstr "Stimme anfordern"
 
-#: gajim/gui_menu_builder.py:638 gajim/roster_window.py:5246
+#: gajim/gui_menu_builder.py:601 gajim/roster_window.py:5185
 msgid "Execute command"
 msgstr "Befehl ausführen"
 
-#: gajim/gui_menu_builder.py:640
-msgid "Disconnect"
-msgstr "Verbindung trennen"
+#: gajim/gui_menu_builder.py:603
+msgid "Leave"
+msgstr "Verlassen"
 
-#: gajim/gui_menu_builder.py:678 gajim/gtk/preferences.py:156
+#: gajim/gui_menu_builder.py:641 gajim/gtk/preferences.py:155
 msgid "No threshold"
 msgstr "Kein Schwellenwert"
 
-#: gajim/gui_menu_builder.py:680 gajim/gtk/preferences.py:158
+#: gajim/gui_menu_builder.py:643 gajim/gtk/preferences.py:157
 #, python-format
 msgid "%i day"
 msgid_plural "%i days"
 msgstr[0] "%i Tag"
 msgstr[1] "%i Tage"
 
-#: gajim/gui_menu_builder.py:709 gajim/gui_menu_builder.py:747
-#: gajim/gtk/join_groupchat.py:43
-msgid "Join Group Chat"
-msgstr "Gruppenchat beitreten"
-
-#: gajim/gui_menu_builder.py:746
+#: gajim/gui_menu_builder.py:672
 msgid "Add Contact…"
 msgstr "Kontakt hinzufügen…"
 
-#: gajim/gui_menu_builder.py:748 gajim/gtk/profile.py:52
-#: gajim/gtk/accounts.py:770 gajim/gtk/accounts.py:808
+#: gajim/gui_menu_builder.py:673 gajim/gtk/profile.py:52
+#: gajim/gtk/accounts.py:773 gajim/gtk/accounts.py:811
 msgid "Profile"
 msgstr "Profil"
 
-#: gajim/gui_menu_builder.py:749
+#: gajim/gui_menu_builder.py:674
+msgid "Send Single Message…"
+msgstr "Einzelne Nachricht senden…"
+
+#: gajim/gui_menu_builder.py:675
 msgid "Discover Services"
 msgstr "Dienste durchsuchen"
 
-#: gajim/gui_menu_builder.py:750
-msgid "Send Single Message…"
-msgstr "Einzelne Nachricht senden…"
+#: gajim/gui_menu_builder.py:676 gajim/gtk/server_info.py:36
+msgid "Server Info"
+msgstr "Server-Informationen"
 
-#: gajim/gui_menu_builder.py:751 gajim/data/gui/preferences_window.ui:2741
+#: gajim/gui_menu_builder.py:677 gajim/data/gui/preferences_window.ui:2741
 msgid "Advanced"
 msgstr "Erweitert"
 
-#: gajim/gui_menu_builder.py:752 gajim/gtk/mam_preferences.py:88
+#: gajim/gui_menu_builder.py:678 gajim/gtk/mam_preferences.py:88
 msgid "Archiving Preferences"
 msgstr "Archiveinstellungen bearbeiten"
 
-#: gajim/gui_menu_builder.py:753
+#: gajim/gui_menu_builder.py:679
 msgid "Blocking List"
 msgstr "Sperrliste"
 
-#: gajim/gui_menu_builder.py:754 gajim/gtk/history_sync.py:108
+#: gajim/gui_menu_builder.py:680
+msgid "Bookmarks"
+msgstr "Gruppenchats verwalten"
+
+#: gajim/gui_menu_builder.py:681
+msgid "PEP Configuration"
+msgstr "PEP-Konfiguration"
+
+#: gajim/gui_menu_builder.py:682 gajim/gtk/history_sync.py:108
 #: gajim/gtk/history_sync.py:186
 msgid "Synchronise History"
 msgstr "Unterhaltungsverlauf synchronisieren"
 
-#: gajim/gui_menu_builder.py:755 gajim/gtk/privacy_list.py:427
+#: gajim/gui_menu_builder.py:683 gajim/gtk/privacy_list.py:427
 msgid "Privacy Lists"
 msgstr "Privatsphären-Listen"
 
-#: gajim/gui_menu_builder.py:756 gajim/gtk/server_info.py:36
-msgid "Server Info"
-msgstr "Server-Informationen"
-
-#: gajim/gui_menu_builder.py:757 gajim/gui_menu_builder.py:768
+#: gajim/gui_menu_builder.py:685 gajim/gui_menu_builder.py:696
 #: gajim/data/gui/xml_console_window.ui:77
 msgid "XML Console"
 msgstr "XML-Konsole"
 
-#: gajim/gui_menu_builder.py:759 gajim/data/gui/groupchat_config.ui:36
+#: gajim/gui_menu_builder.py:687 gajim/data/gui/groupchat_config.ui:36
 msgid "Admin"
 msgstr "Admin"
 
-#: gajim/gui_menu_builder.py:760
+#: gajim/gui_menu_builder.py:688
 msgid "Send Server Message…"
 msgstr "Servernachricht senden…"
 
-#: gajim/gui_menu_builder.py:761
+#: gajim/gui_menu_builder.py:689
 msgid "Set MOTD…"
 msgstr "Nachricht des Tages (MOTD) festlegen…"
 
-#: gajim/gui_menu_builder.py:762
+#: gajim/gui_menu_builder.py:690
 msgid "Update MOTD…"
 msgstr "Nachricht des Tages (MOTD) aktualisieren…"
 
-#: gajim/gui_menu_builder.py:763
+#: gajim/gui_menu_builder.py:691
 msgid "Delete MOTD…"
 msgstr "Nachricht des Tages (MOTD) löschen…"
 
-#: gajim/gui_menu_builder.py:812
-msgid "No Accounts available"
-msgstr "Keine Konten eingerichtet"
+#: gajim/gui_menu_builder.py:736
+msgid "_Add Account…"
+msgstr "Konto _hinzufügen…"
+
+#: gajim/gui_menu_builder.py:742
+msgid "_Modify Accounts…"
+msgstr "Konten _bearbeiten…"
+
+#: gajim/gui_menu_builder.py:751 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:823 gajim/data/gui/application_menu.ui:5
-#: gajim/data/gui/application_menu.ui:71 gajim/data/gui/shortcuts_window.ui:182
-#: gajim/gtk/accounts.py:58
+#: gajim/gui_menu_builder.py:755 gajim/data/gui/application_menu.ui:5
+#: gajim/data/gui/shortcuts_window.ui:182 gajim/gtk/accounts.py:57
 msgid "Accounts"
 msgstr "Konten"
 
-#: gajim/gui_menu_builder.py:881 gajim/gui_menu_builder.py:886
-msgid "Copy JID"
-msgstr "JID kopieren"
+#: gajim/gui_menu_builder.py:784 gajim/gui_menu_builder.py:789
+msgid "Copy XMPP Address"
+msgstr "XMPP-Adresse kopieren"
 
-#: gajim/gui_menu_builder.py:882 gajim/gui_menu_builder.py:914
+#: gajim/gui_menu_builder.py:785 gajim/gui_menu_builder.py:817
 msgid "Join Groupchat"
 msgstr "Gruppenchat beitreten"
 
-#: gajim/gui_menu_builder.py:887 gajim/gui_menu_builder.py:913
-#: gajim/data/gui/application_menu.ui:76
+#: gajim/gui_menu_builder.py:790 gajim/gui_menu_builder.py:816
+#: gajim/data/gui/application_menu.ui:71
 #: gajim/data/gui/subscription_request_window.ui:106
 msgid "Start Chat"
 msgstr "Chat starten"
 
-#: gajim/gui_menu_builder.py:888 gajim/gui_menu_builder.py:915
-msgid "Add to Roster…"
-msgstr "Zur Kontaktliste hinzufügen…"
+#: gajim/gui_menu_builder.py:791 gajim/gui_menu_builder.py:818
+msgid "Add to Contact List…"
+msgstr "Kontakt hinzufügen…"
 
-#: gajim/gui_menu_builder.py:893
+#: gajim/gui_menu_builder.py:796
 msgid "Copy Link Location"
 msgstr "Link-Adresse kopieren"
 
-#: gajim/gui_menu_builder.py:894
+#: gajim/gui_menu_builder.py:797
 msgid "Open Link in Browser"
 msgstr "Link im Webbrowser öffnen"
 
-#: gajim/gui_menu_builder.py:899
+#: gajim/gui_menu_builder.py:802
 msgid "Copy Email Address"
 msgstr "E-Mail-Adresse kopieren"
 
-#: gajim/gui_menu_builder.py:900 gajim/gui_menu_builder.py:912
+#: gajim/gui_menu_builder.py:803 gajim/gui_menu_builder.py:815
 msgid "Open Email Composer"
 msgstr "Im E-Mail-Programm öffnen"
 
-#: gajim/gui_menu_builder.py:905
+#: gajim/gui_menu_builder.py:808
 msgid "Copy Location"
 msgstr "Link-Adresse kopieren"
 
-#: gajim/gui_menu_builder.py:906
+#: gajim/gui_menu_builder.py:809
 msgid "Show Location"
 msgstr "Standort anzeigen"
 
-#: gajim/gui_menu_builder.py:911
-msgid "Copy JID/Email"
-msgstr "JID/E-Mail-Adresse kopieren"
+#: gajim/gui_menu_builder.py:814
+msgid "Copy XMPP Address/Email"
+msgstr "XMPP-/E-Mail-Adresse kopieren"
 
-#: gajim/gui_menu_builder.py:945
+#: gajim/gui_menu_builder.py:852
 msgid "Copy"
 msgstr "Kopieren"
 
@@ -517,44 +521,54 @@ msgstr "Diese Nachricht anzeigen und beenden"
 msgid "Choose folder for logfile"
 msgstr "Verzeichnis für Log-Datei auswählen"
 
-#: gajim/history_manager.py:107
+#: gajim/history_manager.py:106
 msgid "Cannot find history logs database"
 msgstr "Kann die Datenbank mit den Unterhaltungsverläufen nicht finden"
 
-#: gajim/history_manager.py:108
+#: gajim/history_manager.py:107
 #, python-format
 msgid "%s does not exist."
 msgstr "%s existiert nicht."
 
-#: gajim/history_manager.py:141 gajim/history_manager.py:195
-#: gajim/gtk/discovery.py:829 gajim/gtk/roster_item_exchange.py:80
-msgid "JID"
-msgstr "JID"
+#: gajim/history_manager.py:140 gajim/history_manager.py:194
+#: 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:30
+#: gajim/gtk/accounts.py:804
+msgid "XMPP Address"
+msgstr "XMPP-Adresse"
 
-#: gajim/history_manager.py:154 gajim/history_manager.py:202
+#: gajim/history_manager.py:153 gajim/history_manager.py:201
 #: gajim/data/gui/history_window.ui:89 gajim/gtk/history.py:108
 msgid "Date"
 msgstr "Datum"
 
-#: gajim/history_manager.py:161 gajim/history_manager.py:225
+#: gajim/history_manager.py:160 gajim/history_manager.py:224
 #: gajim/data/gui/join_groupchat_window.ui:208
 #: gajim/data/gui/profile_window.ui:214
 #: gajim/data/gui/vcard_information_window.ui:443
+#: gajim/data/gui/bookmarks.ui:140
 msgid "Nickname"
 msgstr "Spitzname"
 
-#: gajim/history_manager.py:172 gajim/history_manager.py:211
+#: gajim/history_manager.py:171 gajim/history_manager.py:210
 #: gajim/data/gui/preferences_window.ui:1344
 #: gajim/data/gui/single_message_window.ui:275 gajim/gtk/history.py:117
 msgid "Message"
 msgstr "Nachricht"
 
-#: gajim/history_manager.py:180 gajim/history_manager.py:218
+#: gajim/history_manager.py:179 gajim/history_manager.py:217
 #: gajim/data/gui/groups_post_window.ui:49
 #: gajim/data/gui/single_message_window.ui:214
 msgid "Subject"
 msgstr "Thema"
 
+#: gajim/history_manager.py:247
+msgid "Database Cleanup"
+msgstr "Datenbank aufräumen"
+
 #: gajim/history_manager.py:248
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
@@ -565,58 +579,52 @@ msgstr ""
 
 #: gajim/history_manager.py:250
 msgid ""
-"Normally allocated database size will not be freed, it will just become "
-"reusable. If you really want to reduce database filesize, click YES, else "
-"click NO.\n"
-"\n"
-"In case you click YES, please wait…"
+"Normally, the allocated database size will not be freed, it will just become "
+"reusable. This operation may take a while."
 msgstr ""
-"Der reservierte Datenbankspeicherplatz wird nicht freigegeben, er wird nur "
-"wiederverwendbar. Wenn Sie den Speicherplatz wirklich reduzieren möchten, "
-"klicken Sie JA, ansonsten NEIN.\n"
-"\n"
-"Falls Sie JA klicken, warten Sie danach bitte einen Augenblick…"
+"Normalerweise wird der reservierte Datenbankspeicherplatz nicht freigegeben, "
+"er wird nur wiederverwendbar. Dieser Vorgang kann eine Weile dauern."
 
 #: gajim/history_manager.py:255
-msgid "Database Cleanup"
-msgstr "Datenbank aufräumen"
+msgid "_Cleanup"
+msgstr "_Aufräumen"
 
-#: gajim/history_manager.py:519 gajim/gtk/filetransfer.py:238
-#: gajim/gtk/filetransfer.py:248
+#: gajim/history_manager.py:518 gajim/gtk/filetransfer.py:237
+#: gajim/gtk/filetransfer.py:247
 msgid "You"
 msgstr "Sie"
 
-#: gajim/history_manager.py:531
+#: gajim/history_manager.py:530
 #, 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:568 gajim/history_manager.py:607
-#: gajim/gtk/dialogs.py:58 gajim/gtk/themes.py:319
+#: gajim/history_manager.py:567 gajim/history_manager.py:606
+#: gajim/gtk/dialogs.py:57 gajim/gtk/themes.py:319
 #: gajim/gtk/roster_item_exchange.py:75 gajim/gtk/roster_item_exchange.py:185
 msgid "Delete"
 msgstr "Löschen"
 
-#: gajim/history_manager.py:569
+#: gajim/history_manager.py:568
 msgid "Delete Conversation"
 msgid_plural "Delete Conversations"
 msgstr[0] "Unterhaltung löschen"
 msgstr[1] "Unterhaltungen löschen"
 
-#: gajim/history_manager.py:570
+#: gajim/history_manager.py:569
 #, 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?"
 
-#: gajim/history_manager.py:608
+#: gajim/history_manager.py:607
 msgid "Delete Message"
 msgid_plural "Delete Messages"
 msgstr[0] "Nachricht löschen"
 msgstr[1] "Nachrichten löschen"
 
-#: gajim/history_manager.py:609
+#: gajim/history_manager.py:608
 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?"
@@ -629,14 +637,14 @@ msgstr "Kontaktname: <i>%s</i>"
 
 #: gajim/dialogs.py:84
 #, python-format
-msgid "JID: <i>%s</i>"
-msgstr "JID: <i>%s</i>"
+msgid "XMPP Address: <i>%s</i>"
+msgstr "XMPP-Adresse: <i>%s</i>"
 
-#: gajim/dialogs.py:115 gajim/dialogs.py:128 gajim/roster_window.py:2901
-#: gajim/roster_window.py:3833 gajim/roster_window.py:5084
-#: gajim/common/contacts.py:157 gajim/common/contacts.py:190
+#: gajim/dialogs.py:115 gajim/dialogs.py:128 gajim/roster_window.py:2894
+#: gajim/roster_window.py:3784 gajim/roster_window.py:5023
+#: gajim/common/contacts.py:157 gajim/common/contacts.py:206
 #: gajim/data/gui/preferences_window.ui:558
-#: gajim/data/gui/shortcuts_window.ui:177 gajim/gtk/accounts.py:349
+#: gajim/data/gui/shortcuts_window.ui:177 gajim/gtk/accounts.py:352
 msgid "General"
 msgstr "Allgemein"
 
@@ -682,7 +690,7 @@ msgstr ""
 "Dieser Name wird bereits verwendet. Möchten Sie die Statusnachricht "
 "überschreiben?"
 
-#: gajim/dialogs.py:703
+#: gajim/dialogs.py:703 gajim/plugins/gui.py:292
 msgid "_Overwrite"
 msgstr "Über_schreiben"
 
@@ -694,9 +702,7 @@ msgstr "Als Vorlage für Statusnachrichten speichern"
 msgid "Please type a name for this status message"
 msgstr "Bitte geben Sie einen Namen für diese Statusnachricht ein"
 
-#: gajim/dialogs.py:740 gajim/gui_interface.py:1441 gajim/dialog_messages.py:31
-#: gajim/gtk/discovery.py:518 gajim/gtk/profile.py:323
-#: gajim/gtk/join_groupchat.py:234
+#: gajim/dialogs.py:740 gajim/gtk/discovery.py:517 gajim/gtk/profile.py:323
 msgid "You are not connected to the server"
 msgstr "Sie sind nicht mit dem Server verbunden"
 
@@ -704,9 +710,11 @@ msgstr "Sie sind nicht mit dem Server verbunden"
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Sie müssen verbunden sein, um Ihre Kontakte synchronisieren zu können."
 
-#: gajim/dialogs.py:752 gajim/dialogs.py:823 gajim/gtk/discovery.py:822
-#: gajim/gtk/discovery.py:1648 gajim/gtk/discovery.py:1941
-#: gajim/gtk/history.py:99 gajim/gtk/roster_item_exchange.py:83
+#: gajim/dialogs.py:752 gajim/dialogs.py:823
+#: gajim/data/gui/groupchat_info_scrolled.ui:16 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/gtk/roster_item_exchange.py:83
 msgid "Name"
 msgstr "Name"
 
@@ -727,390 +735,331 @@ msgstr ""
 msgid "Synchronise"
 msgstr "Synchronisieren"
 
-#: gajim/dialogs.py:1043
+#: gajim/dialogs.py:1042
 msgid "an audio and video"
 msgstr "eine Audio und Video"
 
-#: gajim/dialogs.py:1045
+#: gajim/dialogs.py:1044
 msgid "an audio"
 msgstr "eine Audio"
 
-#: gajim/dialogs.py:1047
+#: gajim/dialogs.py:1046
 msgid "a video"
 msgstr "eine Video"
 
-#: gajim/dialogs.py:1051
+#: gajim/dialogs.py:1050
 #, python-format
 msgid ""
-"%(contact)s wants to start %(type)s session with you. Do you want to answer "
+"%(contact)s wants to start a %(type)s chat with you. Do you want to answer "
 "the call?"
 msgstr ""
-"%(contact)s möchte eine %(type)s-Sitzung mit Ihnen starten. Möchten Sie den "
+"%(contact)s möchte einen %(type)s-Anruf mit Ihnen starten. Möchten Sie den "
 "Anruf annehmen?"
 
-#: gajim/groupchat_control.py:505
+#: gajim/groupchat_control.py:511
 #, python-format
 msgid "Send File (max. %s MiB)…"
 msgstr "Datei senden (max. %s MiB)…"
 
-#: gajim/groupchat_control.py:507 gajim/chat_control.py:342
+#: gajim/groupchat_control.py:513 gajim/chat_control.py:344
 msgid "No File Transfer available"
 msgstr "Keine Dateiübertragung vorhanden"
 
-#: gajim/groupchat_control.py:630 gajim/groupchat_control.py:2349
-msgid "Changing Subject"
-msgstr "Thema ändern"
-
-#: gajim/groupchat_control.py:631 gajim/groupchat_control.py:2350
-msgid "Please specify the new subject:"
-msgstr "Bitte wählen Sie ein neues Thema:"
-
-#: gajim/groupchat_control.py:638
-msgid "Changing Nickname"
-msgstr "Spitznamen ändern"
-
-#: gajim/groupchat_control.py:639
-msgid "Please specify the new nickname you want to use:"
-msgstr "Bitte geben Sie an, welchen Spitznamen Sie verwenden möchten:"
-
-#: gajim/groupchat_control.py:657
-msgid "Invalid group chat JID"
-msgstr "Ungültige JID für den Gruppenchat"
+#: gajim/groupchat_control.py:655
+msgid "Invalid group chat XMPP Address"
+msgstr "Ungültige XMPP-Adresse für den Gruppenchat"
 
-#: gajim/groupchat_control.py:658
-msgid "The group chat JID has not allowed characters."
-msgstr "Die JID des Gruppenchats enthält ungültige Zeichen."
+#: gajim/groupchat_control.py:656
+msgid "The group chat XMPP Address has not allowed characters."
+msgstr "Die XMPP-Adresse des Gruppenchats enthält ungültige Zeichen."
 
-#: gajim/groupchat_control.py:758 gajim/gtk/profile.py:136
+#: gajim/groupchat_control.py:743 gajim/gtk/profile.py:136
 msgid "Could not load image"
 msgstr "Bild konnte nicht geladen werden"
 
-#: gajim/groupchat_control.py:888
+#: gajim/groupchat_control.py:873
 msgid "Insert Nickname"
 msgstr "Spitznamen einfügen"
 
-#: gajim/groupchat_control.py:1056 gajim/chat_control.py:824
+#: gajim/groupchat_control.py:1041 gajim/chat_control.py:848
 msgid "and authenticated"
 msgstr "und authentifiziert"
 
-#: gajim/groupchat_control.py:1060 gajim/chat_control.py:828
+#: gajim/groupchat_control.py:1045 gajim/chat_control.py:852
 msgid "and NOT authenticated"
 msgstr "und NICHT authentifiziert"
 
-#: gajim/groupchat_control.py:1064
+#: gajim/groupchat_control.py:1049
 #, python-format
 msgid "%(type)s encryption is active %(authenticated)s."
 msgstr "%(type)s Verschlüsselung aktiv %(authenticated)s."
 
-#: gajim/groupchat_control.py:1111
+#: gajim/groupchat_control.py:1096
 msgid "Conversation with "
 msgstr "Unterhaltung mit "
 
-#: gajim/groupchat_control.py:1113
+#: gajim/groupchat_control.py:1098
 msgid "Continued conversation"
 msgstr "Unterhaltung fortsetzen"
 
-#: gajim/groupchat_control.py:1411
+#: gajim/groupchat_control.py:1357
 #, python-format
 msgid "%(nick)s has set the subject to %(subject)s"
 msgstr "%(nick)s hat das Thema in %(subject)s geändert"
 
-#: gajim/groupchat_control.py:1433
-msgid "Room now shows unavailable members"
+#: gajim/groupchat_control.py:1374
+msgid "Group chat now shows unavailable members"
 msgstr "Der Gruppenchat zeigt nun abwesende Teilnehmer an"
 
-#: gajim/groupchat_control.py:1436
-msgid "Room now does not show unavailable members"
+#: gajim/groupchat_control.py:1377
+msgid "Group chat now does not show unavailable members"
 msgstr "Der Gruppenchat zeigt nun abwesende Teilnehmer nicht mehr an"
 
-#: gajim/groupchat_control.py:1439
+#: gajim/groupchat_control.py:1380
 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:1446
-msgid "Room logging is now enabled"
-msgstr "Die Gruppenchat-Aufzeichnung ist jetzt aktiviert"
+#: gajim/groupchat_control.py:1387 gajim/groupchat_control.py:1659
+msgid "Conversations are stored on the server"
+msgstr "Unterhaltungsverlauf wird auf dem Server gespeichert"
 
-#: gajim/groupchat_control.py:1449
-msgid "Room logging is now disabled"
-msgstr "Die Gruppenchat-Aufzeichnung ist jetzt deaktiviert"
+#: gajim/groupchat_control.py:1390
+msgid "Conversations are not stored on the server"
+msgstr "Unterhaltungsverlauf wird nicht auf dem Server gespeichert"
 
-#: gajim/groupchat_control.py:1452
-msgid "Room is now non-anonymous"
-msgstr "Der Gruppenchat ist jetzt de-anonymisiert"
+#: gajim/groupchat_control.py:1393
+msgid "Group chat is now non-anonymous"
+msgstr "Der Gruppenchat ist jetzt nicht anonym"
 
-#: gajim/groupchat_control.py:1456
-msgid "Room is now semi-anonymous"
-msgstr "Der Gruppenchat ist jetzt semi-anonym"
+#: gajim/groupchat_control.py:1397
+msgid "Group chat is now semi-anonymous"
+msgstr "Der Gruppenchat ist jetzt halbanonym"
 
-#: gajim/groupchat_control.py:1460
-msgid "Room is now fully anonymous"
+#: gajim/groupchat_control.py:1401
+msgid "Group chat is now fully anonymous"
 msgstr "Der Gruppenchat ist jetzt vollständig anonym"
 
-#: gajim/groupchat_control.py:1500
+#: gajim/groupchat_control.py:1439
 #, python-format
 msgid "Ping? (%s)"
 msgstr "Ping? (%s)"
 
-#: gajim/groupchat_control.py:1503
+#: gajim/groupchat_control.py:1442
 #, python-format
 msgid "Pong! (%(nick)s %(delay)s s.)"
 msgstr "Pong! (%(nick)s %(delay)s s.)"
 
-#: gajim/groupchat_control.py:1506 gajim/chat_control.py:1213
+#: gajim/groupchat_control.py:1445 gajim/chat_control.py:1237
 msgid "Error."
 msgstr "Fehler."
 
-#: gajim/groupchat_control.py:1711
+#: gajim/groupchat_control.py:1650
 #, python-format
-msgid "You (%s) joined the room"
+msgid "You (%s) joined the group chat"
 msgstr "Sie (%s) sind dem Gruppenchat beigetreten"
 
-#: gajim/groupchat_control.py:1717
-msgid "Any occupant is allowed to see your full JID"
-msgstr "Jeder Teilnehmer darf Ihre vollständige JID sehen (de-anonymisiert)"
-
-#: gajim/groupchat_control.py:1721
-msgid "Room logging is enabled"
-msgstr "Gruppenchat-Aufzeichnung ist aktiviert"
+#: gajim/groupchat_control.py:1655
+msgid "Any participant is allowed to see your full XMPP Address"
+msgstr "Jeder Teilnehmer darf Ihre vollständige XMPP-Adresse sehen"
 
-#: gajim/groupchat_control.py:1725
-msgid "The server has assigned or modified your roomnick"
-msgstr "Der Server hat Ihren Gruppenchat-Spitznamen zugewiesen oder verändert"
+#: gajim/groupchat_control.py:1663
+msgid "The server has assigned or modified your nickname in this group chat"
+msgstr ""
+"Der Server hat Ihnen in diesem Gruppenchat einen Spitznamen zugewiesen oder "
+"ihn verändert"
 
-#: gajim/groupchat_control.py:1732
-msgid "A new room has been created"
+#: gajim/groupchat_control.py:1671
+msgid "A new group chat has been created"
 msgstr "Ein neuer Gruppenchat wurde erstellt"
 
-#: gajim/groupchat_control.py:1740 gajim/privatechat_control.py:112
+#: gajim/groupchat_control.py:1679 gajim/privatechat_control.py:115
 #, python-format
 msgid "You are now known as %s"
 msgstr "Sie heißen nun %s"
 
-#: gajim/groupchat_control.py:1742 gajim/privatechat_control.py:114
+#: gajim/groupchat_control.py:1681 gajim/privatechat_control.py:117
 #, python-brace-format
 msgid "{nick} is now known as {new_nick}"
 msgstr "{nick} heißt jetzt {new_nick}"
 
-#: gajim/groupchat_control.py:1767 gajim/privatechat_control.py:141
+#: gajim/groupchat_control.py:1706 gajim/privatechat_control.py:144
 #, python-brace-format
 msgid "You are now {show}{status}"
 msgstr "Sie sind nun {show}{status}"
 
-#: gajim/groupchat_control.py:1773 gajim/privatechat_control.py:147
+#: gajim/groupchat_control.py:1712 gajim/privatechat_control.py:150
 #, python-brace-format
 msgid "{nick} is now {show}{status}"
 msgstr "{nick} ist jetzt {show}{status}"
 
-#: gajim/groupchat_control.py:1790 gajim/groupchat_control.py:1819
-#: gajim/groupchat_control.py:1849 gajim/groupchat_control.py:1909
+#: gajim/groupchat_control.py:1729 gajim/groupchat_control.py:1758
+#: gajim/groupchat_control.py:1788 gajim/groupchat_control.py:1848
 #, python-brace-format
 msgid " by {actor}"
 msgstr " durch {actor}"
 
-#: gajim/groupchat_control.py:1793
+#: gajim/groupchat_control.py:1732
 #, python-brace-format
 msgid "** Your Affiliation has been set to {affiliation}{actor}{reason}"
 msgstr ""
 "** Ihre Gruppenzugehörigkeit wurde festgelegt auf {affiliation}{actor}"
 "{reason}"
 
-#: gajim/groupchat_control.py:1799
+#: gajim/groupchat_control.py:1738
 #, python-brace-format
 msgid "** Affiliation of {nick} has been set to {affiliation}{actor}{reason}"
 msgstr ""
 "** Gruppenzugehörigkeit von {nick} wurde festgelegt auf {affiliation}{actor}"
 "{reason}"
 
-#: gajim/groupchat_control.py:1822
+#: gajim/groupchat_control.py:1761
 #, python-brace-format
 msgid "** Your Role has been set to {role}{actor}{reason}"
 msgstr "** Ihre Rolle wurde festgelegt auf {role}{actor}{reason}"
 
-#: gajim/groupchat_control.py:1827
+#: gajim/groupchat_control.py:1766
 #, python-brace-format
 msgid "** Role of {nick} has been set to {role}{actor}{reason}"
 msgstr "** Die Rolle von {nick} wurde festgelegt auf {role}{actor}{reason}"
 
-#: gajim/groupchat_control.py:1852
+#: gajim/groupchat_control.py:1791
 #, python-brace-format
-msgid "You have been removed from the room{actor}{reason}"
+msgid "You have been removed from the group chat{actor}{reason}"
 msgstr "Sie wurden aus dem Gruppenchat entfernt{actor}{reason}"
 
-#: gajim/groupchat_control.py:1857
+#: gajim/groupchat_control.py:1796
 #, python-brace-format
 msgid "You have left due to an error{reason}"
 msgstr "Sie haben den Gruppenchat bedingt durch einen Fehler verlassen{reason}"
 
-#: gajim/groupchat_control.py:1863
+#: gajim/groupchat_control.py:1802
 #, python-brace-format
 msgid "You have been kicked{actor}{reason}"
 msgstr "Sie wurden aus dem Gruppenchat geworfen{actor}{reason}"
 
-#: gajim/groupchat_control.py:1870
+#: gajim/groupchat_control.py:1809
 #, python-brace-format
 msgid "You have been banned{actor}{reason}"
 msgstr "Sie wurden gesperrt{actor}{reason}"
 
-#: gajim/groupchat_control.py:1877 gajim/groupchat_control.py:1943
+#: gajim/groupchat_control.py:1816 gajim/groupchat_control.py:1882
 msgid ": Affiliation changed"
 msgstr ": Gruppenzugehörigkeit geändert"
 
-#: gajim/groupchat_control.py:1883 gajim/groupchat_control.py:1948
-msgid ": Room configuration changed to members-only"
+#: gajim/groupchat_control.py:1822 gajim/groupchat_control.py:1887
+msgid ": Group chat configuration changed to members-only"
 msgstr ": Gruppenchat-Konfiguration wurde auf \"nur für Mitglieder\" geändert"
 
-#: gajim/groupchat_control.py:1912
+#: gajim/groupchat_control.py:1851
 #, python-brace-format
-msgid "{nick} has been removed from the room{by}{reason}"
+msgid "{nick} has been removed from the group chat{by}{reason}"
 msgstr "{nick} wurde aus dem Gruppenchat entfernt{by}{reason}"
 
-#: gajim/groupchat_control.py:1922
+#: gajim/groupchat_control.py:1861
 #, python-brace-format
 msgid "{nick} has left due to an error{reason}"
 msgstr ""
 "{nick} hat den Gruppenchat bedingt durch einen Fehler verlassen{reason}"
 
-#: gajim/groupchat_control.py:1928
+#: gajim/groupchat_control.py:1867
 #, python-brace-format
 msgid "{nick} has been kicked{actor}{reason}"
 msgstr "{nick} wurde aus dem Gruppenchat geworfen{actor}{reason}"
 
-#: gajim/groupchat_control.py:1936
+#: gajim/groupchat_control.py:1875
 #, python-brace-format
 msgid "{nick} has been banned{actor}{reason}"
 msgstr "{nick} wurde gesperrt{actor}{reason}"
 
-#: gajim/groupchat_control.py:1953
+#: gajim/groupchat_control.py:1892
 #, python-brace-format
 msgid "{nick} has left{reason}"
 msgstr "{nick} ist gegangen{reason}"
 
-#: gajim/groupchat_control.py:1970
+#: gajim/groupchat_control.py:1914
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s ist dem Gruppenchat beigetreten"
 
-#: gajim/groupchat_control.py:1985 gajim/groupchat_control.py:1990
-#: gajim/groupchat_control.py:1995 gajim/groupchat_control.py:2000
-#: gajim/groupchat_control.py:2011
-msgid "Unable to join group chat"
-msgstr "Konnte dem Gruppenchat nicht beitreten"
+#: gajim/groupchat_control.py:1981
+msgid "Group chat has been destroyed"
+msgstr "Gruppenchat wurde aufgelöst"
 
 #: gajim/groupchat_control.py:1986
 #, python-format
-msgid "You are banned from group chat <b>%s</b>."
-msgstr "Sie wurden im Gruppenchat <b>%s</b> gesperrt."
-
-#: gajim/groupchat_control.py:1991
-#, python-format
-msgid "Remote server <b>%s</b> does not exist."
-msgstr "Der Server <b>%s</b> existiert nicht."
-
-#: gajim/groupchat_control.py:1996
-#, python-format
-msgid "Group chat <b>%s</b> does not exist."
-msgstr "Der Gruppenchat <b>%s</b> existiert nicht."
-
-#: gajim/groupchat_control.py:2001
-msgid "Group chat creation is not permitted."
-msgstr "Das Erstellen von Gruppenchats ist nicht erlaubt."
-
-#: gajim/groupchat_control.py:2005
-msgid "Unable to join groupchat"
-msgstr "Konnte dem Gruppenchat nicht beitreten"
-
-#: gajim/groupchat_control.py:2006
-#, python-format
-msgid "You must use your registered nickname in <b>%s</b>."
-msgstr ""
-"Sie müssen Ihren registrierten Spitznamen im Gruppenchat <b>%s</b> verwenden."
-
-#: gajim/groupchat_control.py:2012
-#, python-format
-msgid "You are not in the members list in groupchat %s."
-msgstr "Sie stehen nicht in der Mitgliederliste des Gruppenchats %s."
-
-#: gajim/groupchat_control.py:2068
-msgid "Room has been destroyed"
-msgstr "Der Gruppenchat wurde aufgelöst"
-
-#: gajim/groupchat_control.py:2073
-#, python-format
-msgid "You can join this room instead: xmpp:%s?join"
+msgid "You can join this group chat instead: xmpp:%s?join"
 msgstr "Sie können stattdessen diesem Gruppenchat beitreten: xmpp:%s?join"
 
-#: gajim/groupchat_control.py:2306
+#: gajim/groupchat_control.py:2214
 msgid "Leave Group Chat"
 msgstr "Gruppenchat verlassen"
 
-#: gajim/groupchat_control.py:2307
+#: gajim/groupchat_control.py:2215
 msgid "Are you sure you want to leave this group chat?"
 msgstr "Möchten Sie den Gruppenchat wirklich verlassen?"
 
-#: gajim/groupchat_control.py:2308
+#: gajim/groupchat_control.py:2216
 #, python-format
-msgid "If you close this window, you will be disconnected from '%s'."
-msgstr ""
-"Wenn Sie dieses Fenster schließen wird die Verbindung zu \"%s\" getrennt."
+msgid "If you close this window, you will leave '%s'."
+msgstr "Wenn Sie dieses Fenster schließen, werden Sie \"%s\" verlassen."
 
-#: gajim/groupchat_control.py:2314
+#: gajim/groupchat_control.py:2222 gajim/roster_window.py:5177
 msgid "_Leave"
 msgstr "_Verlassen"
 
-#: gajim/groupchat_control.py:2377
+#: gajim/groupchat_control.py:2280 gajim/roster_window.py:3008
 #, python-format
 msgid "%(jid)s has been invited to this group chat"
 msgstr "%(jid)s wurde in diesen Gruppenchat eingeladen"
 
-#: gajim/groupchat_control.py:2527
+#: gajim/groupchat_control.py:2463
 #, python-format
 msgid "Kicking %s"
 msgstr "%s wird rausgeworfen"
 
-#: gajim/groupchat_control.py:2528 gajim/groupchat_control.py:2829
+#: gajim/groupchat_control.py:2464 gajim/groupchat_control.py:2765
 msgid "You may specify a reason below:"
 msgstr "Sie können eine Begründung angeben:"
 
-#: gajim/groupchat_control.py:2828
+#: gajim/groupchat_control.py:2764
 #, python-format
 msgid "Banning %s"
 msgstr "%s wird gesperrt"
 
-#: gajim/chat_control.py:408
+#: gajim/chat_control.py:432
 msgid "Show a list of formattings"
 msgstr "Schriftformatierungen anzeigen"
 
-#: gajim/chat_control.py:412
+#: gajim/chat_control.py:436
 msgid "This contact does not support HTML"
 msgstr "Der Kontakt unterstützt keine HTML"
 
-#: gajim/chat_control.py:562
+#: gajim/chat_control.py:586
 #, 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:686
+#: gajim/chat_control.py:710
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s aus dem Gruppenchat %(room_name)s"
 
-#: gajim/chat_control.py:832
+#: gajim/chat_control.py:856
 #, python-format
 msgid "%(type)s encryption is active %(authenticated)s"
 msgstr "%(type)s Verschlüsselung aktiv %(authenticated)s"
 
-#: gajim/chat_control.py:1160 gajim/chat_control.py:1168
+#: gajim/chat_control.py:1184 gajim/chat_control.py:1192
 msgid "Close"
 msgstr "Schließen"
 
-#: gajim/chat_control.py:1161
+#: gajim/chat_control.py:1185
 #, python-format
 msgid "You just received a new message from %s"
 msgstr "Sie haben gerade eben eine neue Nachricht von %s erhalten"
 
-#: gajim/chat_control.py:1163
+#: gajim/chat_control.py:1187
 msgid ""
 "If you close this tab while having chat history disabled, this message will "
 "be lost."
@@ -1118,16 +1067,16 @@ msgstr ""
 "Wenn Sie den Tab schließen und der Unterhaltungsverlauf abgeschaltet ist, "
 "geht diese Nachricht verloren."
 
-#: gajim/chat_control.py:1208
+#: gajim/chat_control.py:1232
 msgid "Ping?"
 msgstr "Ping?"
 
-#: gajim/chat_control.py:1211
+#: gajim/chat_control.py:1235
 #, python-format
 msgid "Pong! (%s seconds)"
 msgstr "Pong! (%s Sekunden)"
 
-#: gajim/chat_control.py:1308
+#: gajim/chat_control.py:1332
 #, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -1136,236 +1085,242 @@ msgstr ""
 "Thema: %(subject)s\n"
 "%(message)s"
 
-#: gajim/chat_control.py:1416
+#: gajim/chat_control.py:1440
 #, python-format
 msgid "%(name)s is now %(show)s %(status)s"
 msgstr "%(name)s ist jetzt %(show)s %(status)s"
 
-#: gajim/chat_control.py:1476 gajim/data/gui/application_menu.ui:32
+#: gajim/chat_control.py:1500 gajim/data/gui/application_menu.ui:32
 #: gajim/gtk/http_upload_progress.py:35
 msgid "File Transfer"
 msgstr "Dateiübertragung"
 
-#: gajim/chat_control.py:1480
+#: gajim/chat_control.py:1504
 msgid "Size"
 msgstr "Größe"
 
-#: gajim/chat_control.py:1482 gajim/chat_control.py:1546
+#: gajim/chat_control.py:1506 gajim/chat_control.py:1566
+#: gajim/gui_interface.py:190
 #: gajim/data/gui/groupchat_invitation_received.ui:77
-#: gajim/gtk/filetransfer.py:485
+#: gajim/gtk/filetransfer.py:490
 msgid "_Accept"
 msgstr "_Annehmen"
 
-#: gajim/chat_control.py:1484 gajim/chat_control.py:1548
+#: gajim/chat_control.py:1508 gajim/chat_control.py:1568
 #: gajim/data/gui/groupchat_invitation_received.ui:62
 msgid "_Decline"
 msgstr "A_blehnen"
 
-#: gajim/chat_control.py:1506 gajim/gui_interface.py:791
-#: gajim/gui_interface.py:821 gajim/gui_interface.py:847
+#: gajim/chat_control.py:1530 gajim/gui_interface.py:777
+#: gajim/gui_interface.py:807 gajim/gui_interface.py:833
 #: gajim/gtk/notification.py:173 gajim/gtk/notification.py:278
 msgid "File Transfer Completed"
 msgstr "Dateiübertragung abgeschlossen"
 
-#: gajim/chat_control.py:1510 gajim/gtk/filetransfer.py:259
+#: gajim/chat_control.py:1534 gajim/gtk/filetransfer.py:258
 msgid "Open _Folder"
 msgstr "_Ordner öffnen"
 
-#: gajim/chat_control.py:1512 gajim/chat_control.py:1521
+#: gajim/chat_control.py:1536 gajim/chat_control.py:1545
+#: gajim/data/gui/groupchat_control.ui:962
+#: gajim/data/gui/groupchat_control.ui:1049
+#: gajim/data/gui/groupchat_control.ui:1155
 msgid "_Close"
 msgstr "_Schließen"
 
-#: gajim/chat_control.py:1543 gajim/gui_interface.py:484
+#: gajim/chat_control.py:1563 gajim/gui_interface.py:473
+#: gajim/data/gui/groupchat_invitation_received.ui:42
 #: gajim/gtk/notification.py:174 gajim/gtk/notification.py:195
 #: gajim/gtk/notification.py:281
-msgid "Groupchat Invitation"
+msgid "Group Chat Invitation"
 msgstr "Gruppenchat-Einladung"
 
-#: gajim/chat_control.py:1568 gajim/roster_window.py:1954
+#: gajim/chat_control.py:1588 gajim/roster_window.py:1951
 msgid "Remote contact stopped transfer"
 msgstr "Ihr Kontakt hat die Dateiübertragung gestoppt"
 
-#: gajim/chat_control.py:1570 gajim/roster_window.py:1956
+#: gajim/chat_control.py:1590 gajim/roster_window.py:1953
 msgid "Error opening file"
 msgstr "Fehler beim Öffnen der Datei"
 
-#: gajim/chat_control.py:1572 gajim/gtk/filetransfer.py:297
+#: gajim/chat_control.py:1592 gajim/gtk/filetransfer.py:296
 msgid "File transfer stopped"
 msgstr "Dateiübertragung gestoppt"
 
-#: gajim/chat_control.py:1575 gajim/gtk/filetransfer.py:275
-#: gajim/gtk/filetransfer.py:284
+#: gajim/chat_control.py:1595 gajim/gtk/filetransfer.py:274
+#: gajim/gtk/filetransfer.py:283
 msgid "File transfer cancelled"
 msgstr "Dateiübertragung abgebrochen"
 
-#: gajim/chat_control.py:1576
+#: gajim/chat_control.py:1596
 msgid "Connection with peer cannot be established."
 msgstr "Verbindung zum Kontakt kann nicht hergestellt werden."
 
-#: gajim/application.py:72
+#: gajim/application.py:75
 msgid "Show the application's version"
 msgstr "Version des Programms anzeigen"
 
-#: gajim/application.py:79
+#: gajim/application.py:82
 msgid "Show only critical errors"
 msgstr "Nur kritische Fehler anzeigen"
 
-#: gajim/application.py:86
+#: gajim/application.py:89
 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:94
+#: gajim/application.py:97
 msgid "Print XML stanzas and other debug information"
 msgstr "XML-Stanzas und andere Debuginformationen anzeigen"
 
-#: gajim/application.py:101
+#: gajim/application.py:104
 msgid "Use defined profile in configuration directory"
 msgstr "Verwende im Konfigurationsverzeichnis festgelegtes Profil"
 
-#: gajim/application.py:109
+#: gajim/application.py:112
 msgid "Set configuration directory"
 msgstr "Konfigurationsverzeichnis festlegen"
 
-#: gajim/application.py:117
+#: gajim/application.py:120
 msgid "Configure logging system"
 msgstr "Logging-System konfigurieren"
 
-#: gajim/application.py:125
+#: gajim/application.py:128
 msgid "Show all warnings"
 msgstr "Zeige alle Warnungen"
 
-#: gajim/application.py:132
+#: gajim/application.py:135
 msgid "Open IPython shell"
 msgstr "Öffne iPython-Shell"
 
-#: gajim/application.py:139
+#: gajim/application.py:142
 msgid "Pops up a window with the next pending event"
 msgstr "Öffnet ein Fenster mit dem nächsten ungelesenen Ereignis"
 
-#: gajim/application.py:145 gajim/data/gui/shortcuts_window.ui:203
+#: gajim/application.py:148 gajim/data/gui/shortcuts_window.ui:203
 #: data/org.gajim.Gajim.desktop.in:21
 msgid "Start a new chat"
 msgstr "Neuen Chat starten"
 
-#: gajim/application.py:152
+#: gajim/application.py:155
 msgid "Simulate loss of connectivity"
 msgstr "Simuliere Verbindungsverlust im Netzwerk"
 
-#: gajim/application.py:159
+#: gajim/application.py:162
 msgid "Simulate regaining connectivity"
 msgstr "Simuliere die Wiederherstellung der Netzwerkverbindung"
 
-#: gajim/application.py:201 gajim/gui_interface.py:133
+#: gajim/application.py:204 gajim/gui_interface.py:133
 msgid "Database Error"
 msgstr "Datenbankfehler"
 
-#: gajim/roster_window.py:294 gajim/roster_window.py:1030
+#: gajim/roster_window.py:291 gajim/roster_window.py:1027
 msgid "Merged accounts"
 msgstr "Zusammengeführte Konten"
 
-#: gajim/roster_window.py:853 gajim/roster_window.py:1631
-#: gajim/roster_window.py:1664 gajim/roster_window.py:1715
-#: gajim/roster_window.py:1717 gajim/roster_window.py:1872
-#: gajim/roster_window.py:2531 gajim/roster_window.py:5025
-#: gajim/common/contacts.py:188 gajim/common/contacts.py:447
-#: gajim/common/helpers.py:83 gajim/gtk/discovery.py:129
-#: gajim/gtk/discovery.py:130 gajim/gtk/discovery.py:1416
+#: gajim/roster_window.py:850 gajim/roster_window.py:1628
+#: gajim/roster_window.py:1661 gajim/roster_window.py:1712
+#: gajim/roster_window.py:1714 gajim/roster_window.py:1869
+#: gajim/roster_window.py:2528 gajim/roster_window.py:4331
+#: gajim/roster_window.py:4964 gajim/common/contacts.py:204
+#: gajim/common/contacts.py:463 gajim/common/helpers.py:86
+#: gajim/gtk/discovery.py:127 gajim/gtk/discovery.py:128
+#: gajim/gtk/discovery.py:1414
 msgid "Transports"
 msgstr "Transporte"
 
-#: gajim/roster_window.py:1723 gajim/roster_window.py:1725
-#: gajim/roster_window.py:4995 gajim/gui_interface.py:1613
-#: gajim/gui_interface.py:1639 gajim/common/contacts.py:186
-#: gajim/common/helpers.py:83 gajim/common/modules/adhoc_commands.py:245
-msgid "Groupchats"
+#: gajim/roster_window.py:1720 gajim/roster_window.py:1722
+#: gajim/roster_window.py:4331 gajim/roster_window.py:4934
+#: gajim/gui_interface.py:1527 gajim/common/contacts.py:202
+#: gajim/common/helpers.py:86 gajim/common/modules/adhoc_commands.py:245
+msgid "Group chats"
 msgstr "Gruppenchats"
 
-#: gajim/roster_window.py:2012
+#: gajim/roster_window.py:2009
 msgid "Authorization sent"
 msgstr "Autorisierung wurde erneut gesendet"
 
-#: gajim/roster_window.py:2013
+#: gajim/roster_window.py:2010
 #, python-format
 msgid "\"%s\" will now see your status."
 msgstr "\"%s\" sieht jetzt Ihren Status."
 
-#: gajim/roster_window.py:2031
+#: gajim/roster_window.py:2028
 msgid "Subscription request has been sent"
 msgstr "Kontaktanfrage wurde gesendet"
 
-#: gajim/roster_window.py:2032
+#: gajim/roster_window.py:2029
 #, python-format
-msgid "If \"%s\" accepts this request you will know his or her status."
+msgid "If \"%s\" accepts this request you will know their status."
 msgstr "Wenn \"%s\" diese Anfrage akzeptiert, können Sie den Status sehen."
 
-#: gajim/roster_window.py:2046
+#: gajim/roster_window.py:2043
 msgid "Authorization removed"
 msgstr "Autorisierung wurde entfernt"
 
-#: gajim/roster_window.py:2047
+#: gajim/roster_window.py:2044
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "\"%s\" wird Sie nun immer als offline sehen."
 
-#: gajim/roster_window.py:2250 gajim/roster_window.py:3504
+#: gajim/roster_window.py:2247 gajim/roster_window.py:3460
 msgid "Disconnect for Invisibility"
 msgstr "Verbindung trennen für Unsichtbarkeit"
 
-#: gajim/roster_window.py:2251 gajim/roster_window.py:3505
+#: gajim/roster_window.py:2248 gajim/roster_window.py:3461
 msgid "You are participating in one or more group chats"
 msgstr "Sie nehmen an einem oder mehreren Gruppenchats teil"
 
-#: gajim/roster_window.py:2252 gajim/roster_window.py:3506
+#: gajim/roster_window.py:2249 gajim/roster_window.py:3462
 msgid ""
-"Changing your status to invisible will result in disconnection from those "
-"group chats.\n"
+"Changing your status to invisible will result in you leaving those group "
+"chats.\n"
 "Are you sure you want to go invisible?"
 msgstr ""
-"Wenn Sie Ihren Status auf unsichtbar setzen werden Sie von diesen "
-"Gruppenchats getrennt.\n"
+"Wenn Sie Ihren Status auf unsichtbar setzen, werden Sie diese Gruppenchats "
+"verlassen.\n"
 "Sind Sie sicher, dass Sie unsichtbar werden möchten?"
 
-#: gajim/roster_window.py:2257 gajim/roster_window.py:3512
-#: gajim/roster_window.py:5238 gajim/data/gui/gc_control_popup_menu.ui:120
+#: gajim/roster_window.py:2254 gajim/roster_window.py:3468
+#: gajim/data/gui/gc_control_popup_menu.ui:120
 msgid "_Disconnect"
 msgstr "_Verbindung trennen"
 
-#: gajim/roster_window.py:2285
+#: gajim/roster_window.py:2282
 msgid "desynced"
 msgstr "Nicht synchronisiert"
 
-#: gajim/roster_window.py:2353 gajim/data/gui/shortcuts_window.ui:224
+#: gajim/roster_window.py:2350 gajim/data/gui/shortcuts_window.ui:224
 msgid "Quit Gajim"
 msgstr "Gajim beenden"
 
-#: gajim/roster_window.py:2354
+#: gajim/roster_window.py:2351
 msgid "You are about to quit Gajim"
 msgstr "Sie sind dabei Gajim zu beenden"
 
-#: gajim/roster_window.py:2355
+#: gajim/roster_window.py:2352
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Möchten Sie Gajim wirklich beenden?"
 
-#: gajim/roster_window.py:2356
+#: gajim/roster_window.py:2353
 msgid "_Always quit when closing Gajim"
 msgstr "_Immer beenden wenn Gajim geschlossen wird"
 
-#: gajim/roster_window.py:2359 gajim/roster_window.py:2455
-#: gajim/roster_window.py:2495 gajim/data/gui/systray_context_menu.ui:90
+#: gajim/roster_window.py:2356 gajim/roster_window.py:2452
+#: gajim/roster_window.py:2492 gajim/data/gui/systray_context_menu.ui:83
 msgid "_Quit"
 msgstr "_Beenden"
 
-#: gajim/roster_window.py:2448
+#: gajim/roster_window.py:2445
 msgid "Stop File Transfers"
 msgstr "Dateiübertragungen stoppen"
 
-#: gajim/roster_window.py:2449
+#: gajim/roster_window.py:2446
 msgid "You still have running file transfers"
 msgstr "Sie haben noch laufende Dateiübertragungen"
 
-#: gajim/roster_window.py:2450
+#: gajim/roster_window.py:2447
 msgid ""
 "If you quit now, the file(s) being transferred will be lost.\n"
 "Do you still want to quit?"
@@ -1374,15 +1329,15 @@ msgstr ""
 "abgebrochen.\n"
 "Möchten Sie dennoch beenden?"
 
-#: gajim/roster_window.py:2488
+#: gajim/roster_window.py:2485
 msgid "Unread Messages"
 msgstr "Ungelesene Nachrichten"
 
-#: gajim/roster_window.py:2489
+#: gajim/roster_window.py:2486
 msgid "You still have unread messages"
 msgstr "Sie haben noch ungelesene Nachrichten"
 
-#: gajim/roster_window.py:2490
+#: gajim/roster_window.py:2487
 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."
@@ -1391,20 +1346,20 @@ msgstr ""
 "Unterhaltungsverlauf aktiviert wurde und der Kontakt sich in der "
 "Kontaktliste befindet."
 
-#: gajim/roster_window.py:2760
+#: gajim/roster_window.py:2753
 msgid "You have unread messages"
 msgstr "Sie haben ungelesene Nachrichten"
 
-#: gajim/roster_window.py:2761
+#: gajim/roster_window.py:2754
 msgid "You must read them before removing this transport."
 msgstr "Sie müssen sie lesen, bevor der Transport entfernt wird."
 
-#: gajim/roster_window.py:2764
+#: gajim/roster_window.py:2757
 #, python-format
 msgid "Transport '%s' will be removed"
 msgstr "Der Transport \"%s\" wird entfernt"
 
-#: gajim/roster_window.py:2765
+#: gajim/roster_window.py:2758
 msgid ""
 "You will no longer be able to send and receive messages from and to contacts "
 "using this transport."
@@ -1412,11 +1367,11 @@ msgstr ""
 "Sie werden keine Nachrichten mehr mit Kontakten austauschen können, die "
 "diesen Transport nutzen."
 
-#: gajim/roster_window.py:2768
+#: gajim/roster_window.py:2761
 msgid "Transports will be removed"
 msgstr "Transporte werden entfernt"
 
-#: gajim/roster_window.py:2773
+#: gajim/roster_window.py:2766
 #, python-format
 msgid ""
 "You will no longer be able to send and receive messages from and to contacts "
@@ -1427,19 +1382,19 @@ msgstr ""
 "diesen Transport nutzen:\n"
 "%s"
 
-#: gajim/roster_window.py:2777
+#: gajim/roster_window.py:2770
 msgid "Remove Transport"
 msgstr "Transport entfernen"
 
-#: gajim/roster_window.py:2844
+#: gajim/roster_window.py:2837
 msgid "Block Contact"
 msgstr "Kontakt sperren"
 
-#: gajim/roster_window.py:2845
+#: gajim/roster_window.py:2838
 msgid "Really block this contact?"
 msgstr "Diesen Kontakt wirklich sperren?"
 
-#: gajim/roster_window.py:2846
+#: gajim/roster_window.py:2839
 msgid ""
 "This contact will see you offline and you will not receive any messages sent "
 "to you by this contact."
@@ -1447,61 +1402,56 @@ msgstr ""
 "Der Kontakt wird Sie als offline sehen und Sie werden von dem Kontakt keine "
 "Nachrichten mehr empfangen."
 
-#: gajim/roster_window.py:2851
+#: gajim/roster_window.py:2844
 msgid "_Block Contact"
 msgstr "Kontakt _sperren"
 
-#: gajim/roster_window.py:2896
+#: gajim/roster_window.py:2889
 msgid "Rename Contact"
 msgstr "Kontakt umbenennen"
 
-#: gajim/roster_window.py:2897
+#: gajim/roster_window.py:2890
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Geben Sie einen neuen Spitznamen für den Kontakt %s ein"
 
-#: gajim/roster_window.py:2904
+#: gajim/roster_window.py:2897
 msgid "Rename Group"
 msgstr "Gruppe umbenennen"
 
-#: gajim/roster_window.py:2905
+#: gajim/roster_window.py:2898
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Geben Sie einen neuen Namen für die Gruppe %s ein"
 
-#: gajim/roster_window.py:2953 gajim/roster_window.py:2954
+#: gajim/roster_window.py:2946 gajim/roster_window.py:2947
 msgid "Remove Group"
 msgstr "Gruppe entfernen"
 
-#: gajim/roster_window.py:2955
+#: gajim/roster_window.py:2948
 #, python-format
 msgid "Do you want to remove %s from the contact list?"
 msgstr "Möchten Sie %s von Ihrer Kontaktliste entfernen?"
 
-#: gajim/roster_window.py:2956
+#: gajim/roster_window.py:2949
 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:3044
-#, python-format
-msgid "%(jid)s has been invited in this room"
-msgstr "%(jid)s wurde in diesen Gruppenchat eingeladen"
-
-#: gajim/roster_window.py:3353
+#: gajim/roster_window.py:3309
 msgid "Remove Contact"
 msgstr "Kontakt entfernen"
 
-#: gajim/roster_window.py:3354
+#: gajim/roster_window.py:3310
 msgid "Remove contact from contact list"
 msgstr "Kontakt aus der Kontaktliste entfernen"
 
-#: gajim/roster_window.py:3355
+#: gajim/roster_window.py:3311
 #, 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"
 
-#: gajim/roster_window.py:3364 gajim/roster_window.py:3384
+#: gajim/roster_window.py:3320 gajim/roster_window.py:3340
 msgid ""
 "By removing this contact you also remove authorization. This means the "
 "contact will see you as offline."
@@ -1509,20 +1459,20 @@ 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."
 
-#: gajim/roster_window.py:3375
+#: gajim/roster_window.py:3331
 msgid "Do you want to continue?"
 msgstr "Möchten Sie fortfahren?"
 
-#: gajim/roster_window.py:3386
+#: gajim/roster_window.py:3342
 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:3393
+#: gajim/roster_window.py:3349
 msgid "Remove contacts from contact list"
 msgstr "Kontakte aus der Kontaktliste entfernen"
 
-#: gajim/roster_window.py:3399
+#: gajim/roster_window.py:3355
 #, python-format
 msgid ""
 "By removing the following contacts, you will also remove authorization. This "
@@ -1536,26 +1486,26 @@ msgstr ""
 "\n"
 "%s"
 
-#: gajim/roster_window.py:3403
+#: gajim/roster_window.py:3359
 msgid "Remove Contacts"
 msgstr "Kontakte entfernen"
 
-#: gajim/roster_window.py:3423
+#: gajim/roster_window.py:3379
 msgid "No account available"
 msgstr "Kein Konto eingerichtet"
 
-#: gajim/roster_window.py:3424
+#: gajim/roster_window.py:3380
 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."
 
-#: gajim/roster_window.py:4060
+#: gajim/roster_window.py:4011
 msgid "Metacontacts storage not supported by your server"
 msgstr ""
 "Das Speichern von Metakontakten wird von Ihrem Server nicht unterstützt"
 
-#: gajim/roster_window.py:4062
+#: gajim/roster_window.py:4013
 msgid ""
 "Your server does not support storing metacontacts information. So this "
 "information will not be saved on next reconnection."
@@ -1564,11 +1514,11 @@ msgstr ""
 "Daher werden diese Informationen bei der nächsten Neuverbindung nicht "
 "gespeichert."
 
-#: gajim/roster_window.py:4159
+#: gajim/roster_window.py:4110
 msgid "You are about to create a metacontact"
 msgstr "Sie sind dabei, einen Metakontakt zu erstellen"
 
-#: gajim/roster_window.py:4160
+#: gajim/roster_window.py:4111
 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-"
@@ -1578,118 +1528,110 @@ msgstr ""
 "Kontakt zu gruppieren. Metakontakte werden normalerweise dann verwendet, "
 "wenn dieselbe Person mehrere XMPP- oder Transport-Konten hat."
 
-#: gajim/roster_window.py:4164
+#: gajim/roster_window.py:4115
 msgid "Create Metacontact"
 msgstr "Metakontakt erstellen"
 
-#: gajim/roster_window.py:4170
+#: gajim/roster_window.py:4121 gajim/data/gui/groupchat_creation.ui:317
 msgid "_Create"
 msgstr "_Erstellen"
 
-#: gajim/roster_window.py:4287
+#: gajim/roster_window.py:4238
 msgid "Invalid file URI:"
 msgstr "Ungültiger Datei-URI:"
 
-#: gajim/roster_window.py:4298
+#: gajim/roster_window.py:4249
 msgid "Send file?"
 msgstr "Datei senden?"
 
-#: gajim/roster_window.py:4299
+#: gajim/roster_window.py:4250
 #, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
 msgstr[0] "Wollen Sie die Datei an %s senden:"
 msgstr[1] "Wollen Sie die Dateien an %s senden:"
 
-#: gajim/roster_window.py:4451
+#: gajim/roster_window.py:4401
 #, python-format
 msgid "Send %(from)s to %(to)s"
 msgstr "Sende %(from)s an %(to)s"
 
-#: gajim/roster_window.py:4464
+#: gajim/roster_window.py:4414
 #, python-format
 msgid "Make %s first contact"
 msgstr "%s zum ersten Kontakt machen"
 
-#: gajim/roster_window.py:4469
+#: gajim/roster_window.py:4419
 #, 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:4825 gajim/roster_window.py:4923
+#: gajim/roster_window.py:4775 gajim/roster_window.py:4862
 msgid "_Change Status Message"
 msgstr "_Statusnachricht ändern"
 
-#: gajim/roster_window.py:4845
+#: gajim/roster_window.py:4795
 msgid "Publish Tune"
 msgstr "Musiktitel veröffentlichen"
 
-#: gajim/roster_window.py:4856
+#: gajim/roster_window.py:4806
 msgid "Publish Location"
 msgstr "Standort veröffentlichen"
 
-#: gajim/roster_window.py:4868
-msgid "Configure Services…"
-msgstr "Dienste konfigurieren…"
-
-#: gajim/roster_window.py:4997
+#: gajim/roster_window.py:4936
 msgid "_Maximize All"
 msgstr "Alle _maximieren"
 
-#: gajim/roster_window.py:5004 gajim/roster_window.py:5146
+#: gajim/roster_window.py:4943 gajim/roster_window.py:5085
 msgid "Send Group M_essage"
 msgstr "Nachricht an die Gruppe _senden"
 
-#: gajim/roster_window.py:5011
+#: gajim/roster_window.py:4950
 msgid "To all users"
 msgstr "An alle Benutzer"
 
-#: gajim/roster_window.py:5015
+#: gajim/roster_window.py:4954
 msgid "To all online users"
 msgstr "An alle angemeldeten Benutzer"
 
-#: gajim/roster_window.py:5027 gajim/roster_window.py:5152
+#: gajim/roster_window.py:4966 gajim/roster_window.py:5091
 #: gajim/data/gui/gc_occupants_menu.ui:110
 #: gajim/data/gui/contact_context_menu.ui:36
 msgid "In_vite to"
 msgstr "_Einladen zu"
 
-#: gajim/roster_window.py:5162
+#: gajim/roster_window.py:5101
 msgid "_Manage Contacts"
 msgstr "Kontakte ver_walten"
 
-#: gajim/roster_window.py:5168
+#: gajim/roster_window.py:5107
 msgid "Edit _Groups…"
 msgstr "_Gruppen bearbeiten…"
 
-#: gajim/roster_window.py:5189 gajim/data/gui/filetransfers.ui:12
+#: gajim/roster_window.py:5128 gajim/data/gui/filetransfers.ui:12
 #: gajim/data/gui/remove_account_window.ui:134
 msgid "_Remove"
 msgstr "_Entfernen"
 
-#: gajim/roster_window.py:5226
+#: gajim/roster_window.py:5165
 msgid "_Maximize"
 msgstr "_Maximieren"
 
-#: gajim/roster_window.py:5233
+#: gajim/roster_window.py:5172
 msgid "_Reconnect"
 msgstr "Wieder ve_rbinden"
 
-#: gajim/roster_window.py:5254 gajim/data/gui/gc_occupants_menu.ui:170
+#: gajim/roster_window.py:5193 gajim/data/gui/gc_occupants_menu.ui:170
 #: gajim/data/gui/gc_control_popup_menu.ui:113
 #: gajim/data/gui/contact_context_menu.ui:205
 msgid "_History"
 msgstr "Unter_haltungsverlauf"
 
-#: gajim/roster_window.py:5335 gajim/data/gui/application_menu.ui:86
+#: gajim/roster_window.py:5274 gajim/data/gui/application_menu.ui:83
 #: gajim/data/gui/history_window.ui:57
 msgid "History Manager"
 msgstr "Unterhaltungsverläufe verwalten"
 
-#: gajim/roster_window.py:5343
-msgid "_Join New Group Chat"
-msgstr "_Neuem Gruppenchat beitreten"
-
 #: gajim/dataforms_widget.py:585
 msgid "Unable to load image"
 msgstr "Konnte Bild nicht laden"
@@ -1808,220 +1750,231 @@ msgstr "Thema: %s\n"
 msgid "Write a message…"
 msgstr "Eine Nachricht schreiben…"
 
-#: gajim/message_window.py:250
+#: gajim/message_window.py:356
+msgid "Close Tabs"
+msgstr "Tabs schließen"
+
+#: gajim/message_window.py:357
 msgid "You are going to close several tabs"
 msgstr "Sie sind dabei mehrere Tabs zu schließen"
 
-#: gajim/message_window.py:251
+#: gajim/message_window.py:358
 msgid "Do you really want to close them all?"
 msgstr "Möchten Sie wirklich alle schließen?"
 
-#: gajim/message_window.py:539
+#: gajim/message_window.py:514
 msgid "?Noun:Chats"
 msgstr "Chats"
 
-#: gajim/message_window.py:543
+#: gajim/message_window.py:518
 msgid "Group Chats"
 msgstr "Gruppenchats"
 
-#: gajim/message_window.py:547
+#: gajim/message_window.py:522
 msgid "Private Chats"
 msgstr "Private Chats"
 
-#: gajim/message_window.py:553
+#: gajim/message_window.py:528
 msgid "Messages"
 msgstr "Nachrichten"
 
-#: gajim/gui_interface.py:173
+#: gajim/gui_interface.py:170
+#, 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:175
 msgid "Do you accept this request?"
 msgstr "Akzeptieren Sie diese Anfrage?"
 
-#: gajim/gui_interface.py:175
+#: gajim/gui_interface.py:177
 #, python-format
-msgid "Do you accept this request on account %s?"
-msgstr "Akzeptieren Sie diese Anfrage für das Konto %s?"
+msgid "Do you accept this request (account: %s)?"
+msgstr "Akzeptieren Sie diese Anfrage (Konto: %s)?"
 
-#: gajim/gui_interface.py:178
-#, 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:182
+msgid "Authorization"
+msgstr "Autorisierung"
+
+#: gajim/gui_interface.py:186 gajim/gui_interface.py:420
+#: gajim/gtk/filetransfer.py:338
+msgid "_No"
+msgstr "_Nein"
 
-#: gajim/gui_interface.py:194 gajim/gtk/notification.py:175
+#: gajim/gui_interface.py:205 gajim/gtk/notification.py:175
 #: gajim/gtk/notification.py:197
 msgid "Connection Failed"
 msgstr "Verbindung fehlgeschlagen"
 
-#: gajim/gui_interface.py:279 gajim/gui_interface.py:529
-msgid "Password Required"
-msgstr "Passwort benötigt"
-
-#: gajim/gui_interface.py:280
-#, python-format
-msgid "A Password is required to join the room %s. Please type it."
-msgstr ""
-"Um dem Gruppenchat %s beizutreten wird ein Passwort benötigt. Bitte geben "
-"Sie das Passwort ein."
-
-#: gajim/gui_interface.py:342 gajim/gui_interface.py:346
+#: gajim/gui_interface.py:325 gajim/gui_interface.py:329
 #, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr "Fehler %(code)s: %(msg)s"
 
-#: gajim/gui_interface.py:357 gajim/gui_interface.py:376
+#: gajim/gui_interface.py:340 gajim/gui_interface.py:359
 #: gajim/common/modules/message.py:122
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "Fehler beim Senden von %(message)s ( %(error)s )"
 
-#: gajim/gui_interface.py:401 gajim/gtk/notification.py:175
+#: gajim/gui_interface.py:384 gajim/gtk/notification.py:175
 msgid "Subscription request"
 msgstr "Kontaktanfrage"
 
-#: gajim/gui_interface.py:413 gajim/common/contacts.py:184
-#: gajim/common/helpers.py:83
+#: gajim/gui_interface.py:396 gajim/common/contacts.py:200
+#: gajim/common/helpers.py:86
 msgid "Observers"
 msgstr "Beobachter"
 
-#: gajim/gui_interface.py:422
+#: gajim/gui_interface.py:405
 msgid "Authorization accepted"
 msgstr "Autorisierung akzeptiert"
 
-#: gajim/gui_interface.py:423
+#: gajim/gui_interface.py:406
 #, python-format
 msgid "The contact \"%s\" has authorized you to see their status."
 msgstr "Der Kontakt \"%s\" hat Sie autorisiert, seinen Status zu sehen."
 
-#: gajim/gui_interface.py:431
+#: gajim/gui_interface.py:415
+msgid "Subscription Removed"
+msgstr "Abonnement entfernt"
+
+#: gajim/gui_interface.py:416
 #, python-format
-msgid "Contact \"%s\" removed subscription from you"
-msgstr "Der Kontakt \"%s\" hat Ihnen die Kontaktanfrage verweigert"
+msgid "Contact '%s' removed subscription from you"
+msgstr "Der Kontakt \"%s\" hat das Abonnement zurückgezogen"
 
-#: gajim/gui_interface.py:432
+#: gajim/gui_interface.py:417
 msgid ""
-"You will always see them as offline.\n"
+"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?"
 
-#: gajim/gui_interface.py:453 gajim/gtk/notification.py:176
+#: gajim/gui_interface.py:442 gajim/gtk/notification.py:176
 msgid "Unsubscribed"
 msgstr "Abbestellt"
 
-#: gajim/gui_interface.py:465
+#: gajim/gui_interface.py:454
 #, python-format
 msgid "%(jid)s declined the invitation: %(reason)s"
 msgstr "%(jid)s hat die Einladung abgelehnt: %(reason)s"
 
-#: gajim/gui_interface.py:469
+#: gajim/gui_interface.py:458
 #, python-format
 msgid "%(jid)s declined the invitation"
 msgstr "%(jid)s hat die Einladung abgelehnt"
 
-#: gajim/gui_interface.py:485
+#: gajim/gui_interface.py:474
 #, python-brace-format
 msgid "You are invited to {room} by {user}"
 msgstr "Sie wurden von {user} zu {room} eingeladen"
 
-#: gajim/gui_interface.py:506
+#: gajim/gui_interface.py:495
 msgid "Certificate Passphrase Required"
 msgstr "Zertifikats-Passwort benötigt"
 
-#: gajim/gui_interface.py:507
+#: gajim/gui_interface.py:496
 #, python-format
 msgid "Enter the certificate passphrase for account %s"
 msgstr "Geben Sie das Passwort für das Zertifikat des Kontos %s ein"
 
-#: gajim/gui_interface.py:516 gajim/gtk/accounts.py:963
+#: gajim/gui_interface.py:505 gajim/gtk/accounts.py:966
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Bitte geben Sie Ihr Passwort für das Konto %s ein"
 
-#: gajim/gui_interface.py:529 gajim/gtk/accounts.py:964
+#: gajim/gui_interface.py:518
+msgid "Password Required"
+msgstr "Passwort benötigt"
+
+#: gajim/gui_interface.py:518 gajim/gtk/accounts.py:967
 msgid "Save password"
 msgstr "Passwort speichern"
 
-#: gajim/gui_interface.py:601 gajim/gui_interface.py:632
+#: gajim/gui_interface.py:587 gajim/gui_interface.py:618
+#: gajim/gtk/filetransfer.py:332 gajim/gtk/filetransfer.py:333
 #: gajim/gtk/notification.py:173 gajim/gtk/notification.py:276
 msgid "File Transfer Error"
 msgstr "Fehler bei der Dateiübertragung"
 
-#: gajim/gui_interface.py:666
+#: gajim/gui_interface.py:652
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s möchte Ihnen eine Datei senden."
 
-#: gajim/gui_interface.py:668 gajim/gtk/filetransfer.py:479
+#: gajim/gui_interface.py:654 gajim/gtk/filetransfer.py:484
 #: gajim/gtk/notification.py:172 gajim/gtk/notification.py:274
 msgid "File Transfer Request"
 msgstr "Anfrage zur Dateiübertragung"
 
-#: gajim/gui_interface.py:767
+#: gajim/gui_interface.py:753
 msgid "Remote Contact Stopped Transfer"
 msgstr "Kontakt hat die Dateiübertragung gestoppt"
 
-#: gajim/gui_interface.py:772
+#: gajim/gui_interface.py:758
 msgid "Error Opening File"
 msgstr "Fehler beim Öffnen der Datei"
 
-#: gajim/gui_interface.py:782
+#: gajim/gui_interface.py:768
 msgid "SSL Certificate Error"
 msgstr "SSL-Zertifikatfehler"
 
-#: gajim/gui_interface.py:795 gajim/gui_interface.py:826
-#: gajim/gui_interface.py:853 gajim/gtk/notification.py:174
+#: gajim/gui_interface.py:781 gajim/gui_interface.py:812
+#: gajim/gui_interface.py:839 gajim/gtk/notification.py:174
 #: gajim/gtk/notification.py:279
 msgid "File Transfer Stopped"
 msgstr "Dateiübertragung gestoppt"
 
-#: gajim/gui_interface.py:799
+#: gajim/gui_interface.py:785
 msgid "File Transfer Failed"
 msgstr "Dateiübertragung fehlgeschlagen"
 
-#: gajim/gui_interface.py:822
+#: gajim/gui_interface.py:808
 #, python-format
 msgid "%(filename)s received from %(name)s."
 msgstr "%(filename)s von %(name)s wurde empfangen."
 
-#: gajim/gui_interface.py:827
+#: gajim/gui_interface.py:813
 #, 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:833
+#: gajim/gui_interface.py:819
 #, 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:848
+#: gajim/gui_interface.py:834
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Sie haben die Datei %(filename)s erfolgreich an %(name)s gesendet."
 
-#: gajim/gui_interface.py:854
+#: gajim/gui_interface.py:840
 #, 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:860
+#: gajim/gui_interface.py:846
 #, 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:971
+#: gajim/gui_interface.py:957
 msgid "Username Conflict"
 msgstr "Benutzernamenkonflikt"
 
-#: gajim/gui_interface.py:972
+#: gajim/gui_interface.py:958
 msgid "Please type a new username for your local account"
 msgstr "Bitte geben Sie einen neuen Benutzernamen für Ihr lokales Konto ein"
 
-#: gajim/gui_interface.py:995
+#: gajim/gui_interface.py:981
 msgid "Resource Conflict"
 msgstr "Konflikt mit der XMPP-Ressource"
 
-#: gajim/gui_interface.py:996
+#: gajim/gui_interface.py:982
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
@@ -2029,32 +1982,32 @@ msgstr ""
 "Sie sind mit diesem Konto bereits mit derselben XMPP-Ressource verbunden. "
 "Bitte geben Sie eine neue XMPP-Ressource ein"
 
-#: gajim/gui_interface.py:1053
+#: gajim/gui_interface.py:1039
 #, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s möchte einen Sprachchat beginnen."
 
-#: gajim/gui_interface.py:1055
+#: gajim/gui_interface.py:1041
 msgid "Voice Chat Request"
 msgstr "Anfrage für Sprachchat"
 
-#: gajim/gui_interface.py:1123 gajim/gtk/account_wizard.py:312
+#: gajim/gui_interface.py:1109 gajim/gtk/account_wizard.py:312
 msgid "Certificate Already in File"
 msgstr "Zertifikat bereits in der Datei"
 
-#: gajim/gui_interface.py:1124 gajim/gtk/account_wizard.py:313
+#: gajim/gui_interface.py:1110 gajim/gtk/account_wizard.py:313
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr ""
 "Dieses Zertifikat wird nicht erneut hinzugefügt, da es sich bereit in der "
 "Datei %s befindet."
 
-#: gajim/gui_interface.py:1145
+#: gajim/gui_interface.py:1131
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid"
 msgstr "Die Authentizität des %s Zertifikats könnte ungültig sein"
 
-#: gajim/gui_interface.py:1148
+#: gajim/gui_interface.py:1134
 #, python-format
 msgid ""
 "\n"
@@ -2063,7 +2016,7 @@ msgstr ""
 "\n"
 "Unbekannter SSL-Fehler: %d"
 
-#: gajim/gui_interface.py:1150
+#: gajim/gui_interface.py:1136
 #, python-format
 msgid ""
 "\n"
@@ -2072,11 +2025,11 @@ msgstr ""
 "\n"
 "SSL-Fehler: <b>%s</b>"
 
-#: gajim/gui_interface.py:1155
+#: gajim/gui_interface.py:1141
 msgid "Error verifying SSL certificate"
 msgstr "Fehler bei der Überprüfung des SSL-Zertifikats"
 
-#: gajim/gui_interface.py:1156
+#: gajim/gui_interface.py:1142
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your XMPP server: "
@@ -2087,7 +2040,7 @@ msgstr ""
 "Servers auf: %(error)s\n"
 "Möchten Sie sich dennoch zum Server verbinden?"
 
-#: gajim/gui_interface.py:1160 gajim/gtk/account_wizard.py:412
+#: gajim/gui_interface.py:1146 gajim/gtk/account_wizard.py:413
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -2102,176 +2055,157 @@ msgstr ""
 "SHA-256-Fingerabdruck des Zertifikates:\n"
 "%(sha256)s"
 
-#: gajim/gui_interface.py:1166
+#: gajim/gui_interface.py:1152
 msgid "Ignore this error for this certificate."
 msgstr "Ignoriere den Fehler für dieses Zertifikat."
 
-#: gajim/gui_interface.py:1174
+#: gajim/gui_interface.py:1160
 #, python-format
 msgid "SSL Certificate Verification for %s"
 msgstr "SSL-Zertifikatüberprüfung für %s"
 
-#: gajim/gui_interface.py:1442 gajim/gtk/join_groupchat.py:235
-msgid "You can not join a group chat unless you are connected."
-msgstr "Sie können einem Gruppenchat erst beitreten, wenn Sie verbunden sind."
-
-#: gajim/gui_interface.py:1448
-msgid "JID is not a Groupchat"
-msgstr "Die JID ist kein Gruppenchat"
-
-#: gajim/gui_interface.py:1579
-msgid "This is not a group chat"
-msgstr "Dies ist kein Gruppenchat"
-
-#: gajim/gui_interface.py:1580
-#, python-format
-msgid ""
-"%(room_jid)s is already in your roster. Please check if %(room_jid)s is a "
-"correct group chat name. If it is, delete it from your roster and try "
-"joining the group chat again."
-msgstr ""
-"%(room_jid)s ist bereits in Ihrer Kontaktliste. Bitte prüfen Sie, ob "
-"%(room_jid)s ein gültiger Gruppenchatname ist. Falls ja, löschen Sie ihn von "
-"Ihrer Kontaktliste und versuchen Sie erneut beizutreten."
-
-#: gajim/gui_interface.py:1604 gajim/dialog_messages.py:58
+#: gajim/gui_interface.py:1577
 msgid "You cannot join a group chat while you are invisible"
 msgstr "Sie können einem Gruppenchat nicht beitreten, wenn Sie unsichtbar sind"
 
-#: gajim/gui_interface.py:2037
+#: gajim/gui_interface.py:1976
 msgid "Could not save your settings and preferences"
 msgstr "Konnte Einstellungen nicht speichern"
 
-#: gajim/gui_interface.py:2098
+#: gajim/gui_interface.py:2037
 msgid "Gajim: IPython Console"
 msgstr "Gajim: IPython Konsole"
 
-#: gajim/dialog_messages.py:32
-msgid "You can not start a new conversation unless you are connected."
-msgstr ""
-"Sie können keine neue Unterhaltung beginnen, solange Sie nicht verbunden "
-"sind."
-
-#: gajim/dialog_messages.py:36 gajim/dialog_messages.py:41
-#: gajim/gtk/single_message.py:305 gajim/gtk/join_groupchat.py:211
-#: gajim/gtk/account_wizard.py:229
-msgid "Invalid JID"
-msgstr "Ungültige JID"
+#: gajim/dialog_messages.py:31 gajim/dialog_messages.py:36
+#: gajim/gtk/single_message.py:305 gajim/gtk/account_wizard.py:229
+msgid "Invalid XMPP Address"
+msgstr "Ungültige XMPP-Adresse"
 
-#: gajim/dialog_messages.py:42 gajim/gtk/single_message.py:306
+#: gajim/dialog_messages.py:37
 #, python-format
-msgid "It is not possible to send a message to %s, this JID is not valid."
-msgstr "Die Nachricht kann nicht an %s gesendet werden, die JID ist ungültig."
+msgid ""
+"It is not possible to send a message to %s. This XMPP Address is not valid."
+msgstr ""
+"Es ist nicht möglich, eine Nachricht an %s zu senden. Die XMPP-Adresse ist "
+"ungültig."
 
-#: gajim/dialog_messages.py:47
-msgid "Unread events"
+#: gajim/dialog_messages.py:42
+msgid "Unread Events"
 msgstr "Ungelesene Ereignisse"
 
-#: gajim/dialog_messages.py:48
-msgid "Read all pending events before removing this account."
+#: gajim/dialog_messages.py:43
+msgid "Read or acknowledge all pending events before removing this account."
 msgstr "Alle ungelesenen Ereignisse anzeigen, bevor das Konto entfernt wird."
 
-#: gajim/dialog_messages.py:52
+#: gajim/dialog_messages.py:48
 msgid "Invalid Form"
 msgstr "Ungültiges Formular"
 
-#: gajim/dialog_messages.py:53
+#: gajim/dialog_messages.py:49
 msgid "The form is not filled correctly."
 msgstr "Das Formular wurde nicht korrekt ausgefüllt."
 
-#: gajim/dialog_messages.py:57 gajim/common/helpers.py:309
+#: gajim/dialog_messages.py:53 gajim/common/helpers.py:315
 msgid "Invisible"
 msgstr "Unsichtbar"
 
-#: gajim/dialog_messages.py:62
-msgid "A connection is not available"
+#: gajim/dialog_messages.py:54
+msgid "You cannot join a group chat while being invisible."
+msgstr ""
+"Sie können einem Gruppenchat nicht beitreten während Sie unsichtbar sind."
+
+#: gajim/dialog_messages.py:58
+msgid "No Connection Available"
 msgstr "Keine Verbindung verfügbar"
 
-#: gajim/dialog_messages.py:63
+#: gajim/dialog_messages.py:59
 msgid "Your message can not be sent until you are connected."
 msgstr "Ihre Nachricht kann erst gesendet werden, wenn Sie verbunden sind."
 
-#: gajim/dialog_messages.py:67
-msgid "JID already in list"
-msgstr "Die JID ist bereits in der Liste"
+#: gajim/dialog_messages.py:63
+msgid "XMPP Address Already in List"
+msgstr "XMPP-Adresse ist bereits in der Liste"
 
-#: gajim/dialog_messages.py:68
-msgid "The JID you entered is already in the list. Choose another one."
+#: gajim/dialog_messages.py:64
+msgid ""
+"The XMPP Address you entered is already in the list. Please choose another "
+"one."
 msgstr ""
-"Die eingegebene JID ist bereits in der Liste. Wählen Sie bitte eine andere."
+"Die eingegebene XMPP-Adresse ist bereits in der Liste. Wählen Sie bitte eine "
+"andere."
 
-#: gajim/dialog_messages.py:72
-msgid "Invalid answer"
+#: gajim/dialog_messages.py:69
+msgid "Invalid Answer"
 msgstr "Ungültige Antwort"
 
-#: gajim/dialog_messages.py:73
+#: gajim/dialog_messages.py:70
 #, python-format
 msgid "Transport %(name)s answered wrongly to register request: %(error)s"
 msgstr ""
 "Der Transport %(name)s beantwortete die Registrierungsanfrage nicht korrekt: "
 "%(error)s"
 
-#: gajim/dialog_messages.py:78
+#: gajim/dialog_messages.py:75
 msgid "Wrong Custom Hostname"
 msgstr "Falscher benutzerdefinierter Hostname"
 
-#: gajim/dialog_messages.py:79
+#: gajim/dialog_messages.py:76
 #, python-format
-msgid "Wrong custom hostname \"%s\". Ignoring it."
+msgid "Custom hostname \"%s\" is wrong. It will be ignored."
 msgstr "Falscher benutzerdefinierter Hostname \"%s\". Wird ignoriert."
 
-#: gajim/dialog_messages.py:83
-msgid "Error while removing privacy list"
+#: gajim/dialog_messages.py:80
+msgid "Error While Removing Privacy List"
 msgstr "Fehler beim Entfernen der Privatsphären-Liste"
 
-#: gajim/dialog_messages.py:84
+#: gajim/dialog_messages.py:81
 #, python-format
 msgid ""
-"Privacy list %s has not been removed. It is maybe active in one of your "
-"connected resources. Deactivate it and try again."
+"Privacy list %s has not been removed. It is probably active in one of your "
+"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."
 
-#: gajim/dialog_messages.py:90
-msgid "Invisibility not supported"
+#: gajim/dialog_messages.py:87
+msgid "Invisibility Not Supported"
 msgstr "Unsichtbarkeit wird nicht unterstützt"
 
-#: gajim/dialog_messages.py:91
+#: gajim/dialog_messages.py:88
 #, python-format
-msgid "Account %s doesn't support invisibility."
+msgid "This account %s doesn't support invisibility."
 msgstr "Das Konto %s unterstützt keine Unsichtbarkeit."
 
-#: gajim/dialog_messages.py:95
-msgid "Unregister failed"
-msgstr "De-Registrierung fehlgeschlagen"
+#: gajim/dialog_messages.py:92
+msgid "Unregister Failed"
+msgstr "Deregistrierung fehlgeschlagen"
 
-#: gajim/dialog_messages.py:96
+#: gajim/dialog_messages.py:93
 #, python-format
-msgid "Unregistration with server %(server)s failed: %(error)s"
-msgstr "De-Registrierung mit Server %(server)s fehlgeschlagen: %(error)s"
+msgid "Unregistration on server %(server)s failed: %(error)s"
+msgstr "Deregistrierung auf Server %(server)s fehlgeschlagen: %(error)s"
 
-#: gajim/dialog_messages.py:100
-msgid "Registration succeeded"
+#: gajim/dialog_messages.py:97
+msgid "Registration Succeeded"
 msgstr "Registrierung war erfolgreich"
 
 # FIXME: Type in original string. Should be
 # Registration with agent %s succeeded
 # FIXME: Check English: should be consistently called "transport"
-#: gajim/dialog_messages.py:101
+#: gajim/dialog_messages.py:98
 #, python-format
-msgid "Registration with agent %s succeeded"
-msgstr "Registrierung mit Agent %s war erfolgreich"
+msgid "Registration with agent %s succeeded."
+msgstr "Registrierung auf Transport %s war erfolgreich."
 
-#: gajim/dialog_messages.py:105 gajim/gtk/service_registration.py:215
-msgid "Registration failed"
-msgstr "Registrierung ist fehlgeschlagen"
+#: gajim/dialog_messages.py:102
+msgid "Registration Failed"
+msgstr "Registrierung fehlgeschlagen"
 
 # FIXME: Type in original string. Should be
 # Registration with agent ...
 # FIXME: Check English: should be consistently called "transport"
-#: gajim/dialog_messages.py:106
+#: gajim/dialog_messages.py:103
 #, python-format
 msgid ""
 "Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
@@ -2279,15 +2213,15 @@ msgstr ""
 "Registrierung mit Agent %(agent)s ist mit Fehler %(error)s fehlgeschlagen: "
 "%(error_msg)s"
 
-#: gajim/dialog_messages.py:111
+#: gajim/dialog_messages.py:108
 msgid "Unable to Join Group Chat"
 msgstr "Konnte dem Gruppenchat nicht beitreten"
 
-#: gajim/dialog_messages.py:116
-msgid "GStreamer error"
-msgstr "Fehler mit GStreamer"
+#: gajim/dialog_messages.py:113
+msgid "GStreamer Error"
+msgstr "Fehler in GStreamer"
 
-#: gajim/dialog_messages.py:117
+#: gajim/dialog_messages.py:114
 #, python-format
 msgid ""
 "Error: %(error)s\n"
@@ -2296,19 +2230,19 @@ msgstr ""
 "Fehler: %(error)s\n"
 "Debug: %(debug)s"
 
-#: gajim/dialog_messages.py:121
-msgid "Wrong host"
-msgstr "Falscher Server"
+#: gajim/dialog_messages.py:118
+msgid "Wrong Host"
+msgstr "Falscher Host"
 
-#: gajim/dialog_messages.py:122
+#: gajim/dialog_messages.py:119
 msgid "Invalid local address? :-O"
 msgstr "Ungültige lokale Adresse? :-O"
 
-#: gajim/dialog_messages.py:126
-msgid "Avahi error"
+#: gajim/dialog_messages.py:123
+msgid "Avahi Error"
 msgstr "Avahi-Fehler"
 
-#: gajim/dialog_messages.py:127
+#: gajim/dialog_messages.py:124
 #, python-format
 msgid ""
 "%s\n"
@@ -2317,63 +2251,63 @@ msgstr ""
 "%s\n"
 "Lokaler Nachrichtenversand funktioniert eventuell nicht richtig."
 
-#: gajim/dialog_messages.py:131 gajim/dialog_messages.py:136
-msgid "Could not request upload slot"
-msgstr "Konnte keinen Upload-Slot anfordern"
+#: gajim/dialog_messages.py:128 gajim/dialog_messages.py:133
+msgid "Could not request upload slot for HTTP File Upload"
+msgstr "Konnte keinen Upload-Slot für HTTP-Dateiupload anfordern"
 
-#: gajim/dialog_messages.py:137
-msgid "Got unexpected response from server (see log)"
+#: gajim/dialog_messages.py:134
+msgid "Got unexpected response from server (see log)."
 msgstr "Unerwartete Antwort vom Server bekommen (siehe Log)"
 
-#: gajim/dialog_messages.py:141 gajim/dialog_messages.py:146
-msgid "Could not open file"
+#: gajim/dialog_messages.py:138 gajim/dialog_messages.py:143
+msgid "Could not Open File"
 msgstr "Datei konnte nicht geöffnet werden"
 
-#: gajim/dialog_messages.py:142
-msgid "Exception raised while opening file (see log)"
-msgstr "Fehler beim Öffnen der Datei (siehe Log)"
+#: gajim/dialog_messages.py:139
+msgid "Exception raised while trying to open file (see log)."
+msgstr "Fehler beim Öffnen der Datei (siehe Log)."
 
-#: gajim/dialog_messages.py:151
-msgid "Unsecure"
-msgstr "Unsicher"
+#: gajim/dialog_messages.py:148
+msgid "Not Secure"
+msgstr "Nicht sicher"
 
-#: gajim/dialog_messages.py:152
-msgid "Server returned unsecure transport (HTTP)"
+#: gajim/dialog_messages.py:149
+msgid "The server returned an insecure transport (HTTP)."
 msgstr ""
 "Der Server schlägt einen ungesicherten Transportweg ohne "
-"Transportverschlüsselung vor (HTTP)"
+"Transportverschlüsselung vor (HTTP)."
 
-#: gajim/dialog_messages.py:156
-msgid "Could not upload file"
+#: gajim/dialog_messages.py:153
+msgid "Could not Upload File"
 msgstr "Datei konnte nicht hochgeladen werden"
 
-#: gajim/dialog_messages.py:157
+#: gajim/dialog_messages.py:154
 #, python-format
 msgid "HTTP response code from server: %s"
 msgstr "HTTP Antwort-Code des Servers: %s"
 
-#: gajim/dialog_messages.py:161
+#: gajim/dialog_messages.py:158
 msgid "Upload Error"
 msgstr "Fehler beim Hochladen"
 
-#: gajim/dialog_messages.py:166
+#: gajim/dialog_messages.py:163
 msgid "Encryption Error"
 msgstr "Verschlüsselungsfehler"
 
-#: gajim/dialog_messages.py:167
-msgid "For the chosen encryption there is no encryption method available"
+#: gajim/dialog_messages.py:164
+msgid "There is no encryption method available for the chosen encryption."
 msgstr ""
-"Für die gewählte Verschlüsselung ist keine Verschlüsselungsmethode verfügbar"
+"Für die gewählte Verschlüsselung ist keine Verschlüsselungsmethode verfügbar."
 
-#: gajim/dialog_messages.py:171
-msgid "Avatar upload failed"
+#: gajim/dialog_messages.py:169
+msgid "Avatar Upload Failed"
 msgstr "Hochladen des Kontaktbildes fehlgeschlagen"
 
-#: gajim/privatechat_control.py:204
+#: gajim/privatechat_control.py:207
 msgid "Sending private message failed"
 msgstr "Senden privater Nachricht fehlgeschlagen"
 
-#: gajim/privatechat_control.py:206
+#: gajim/privatechat_control.py:209
 #, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr ""
@@ -2398,10 +2332,10 @@ msgid "show help on command"
 msgstr "zeige Hilfe für Befehl"
 
 #: gajim/gajim_remote.py:85
-msgid "Lists all contacts in roster, one for each line"
+msgid "Lists all contacts in the contact list, one for each line"
 msgstr ""
-"Gibt eine Liste aller in der Kontaktliste enthaltenen Kontakte aus und "
-"verwendet dabei eine Zeile je Kontakt"
+"Gibt eine Liste aller in der Kontaktliste enthaltenen Kontakte aus, eine "
+"Zeile je Kontakt"
 
 #: 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
@@ -2475,14 +2409,15 @@ msgstr ""
 "synchronisieren\" aktiviert ist"
 
 #: gajim/gajim_remote.py:118
-msgid "Sends new chat message to a contact in the roster. Account is optional."
+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."
 
 #: gajim/gajim_remote.py:120 gajim/gajim_remote.py:130
-msgid "JID of the contact that will receive the message"
-msgstr "JID des Kontakts, der die Nachricht empfangen soll"
+msgid "XMPP Address of the contact that will receive the message"
+msgstr "XMPP-Adresse des Kontakts, der die Nachricht empfangen soll"
 
 #: gajim/gajim_remote.py:121 gajim/gajim_remote.py:132
 #: gajim/gajim_remote.py:141
@@ -2495,10 +2430,10 @@ msgid "if specified, the message will be sent using this account"
 msgstr "falls angegeben, wird die Nachricht über dieses Konto gesendet"
 
 #: gajim/gajim_remote.py:127
-msgid "Sends a chat message to someone on your roster. Account is optional."
+msgid ""
+"Sends a chat message to someone on your contact list. Account is optional."
 msgstr ""
-"Sendet eine neue Nachricht an jemanden in ihrer Kontaktliste. Konto ist "
-"optional."
+"Sendet eine Nachricht an jemanden in ihrer Kontaktliste. Konto ist optional."
 
 #: gajim/gajim_remote.py:131
 msgid "subject"
@@ -2509,13 +2444,13 @@ msgid "message subject"
 msgstr "Nachrichtenbetreff"
 
 #: gajim/gajim_remote.py:138
-msgid "Sends new message to a groupchat you've joined."
+msgid "Sends new message to a group chat you've joined."
 msgstr ""
 "Sendet eine neue Nachricht an einen Gruppenchat, dem Sie beigetreten sind."
 
 #: gajim/gajim_remote.py:140
-msgid "JID of the room that will receive the message"
-msgstr "JID des Gruppenchats, der die Nachricht empfangen soll"
+msgid "XMPP Address of the group chat that will receive the message"
+msgstr "XMPP-Adresse des Gruppenchats, der die Nachricht empfangen soll"
 
 #: gajim/gajim_remote.py:147
 msgid "Gets detailed info on a contact"
@@ -2523,8 +2458,8 @@ msgstr "Zeige detaillierte Informationen über einen Kontakt"
 
 #: gajim/gajim_remote.py:149 gajim/gajim_remote.py:162
 #: gajim/gajim_remote.py:192
-msgid "JID of the contact"
-msgstr "JID des Kontakts"
+msgid "XMPP Address of the contact"
+msgstr "XMPP-Adresse des Kontakts"
 
 #: gajim/gajim_remote.py:153
 msgid "Gets detailed info on a account"
@@ -2585,7 +2520,7 @@ msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Schreibt die aktuellen Gajim-Einstellungen in die Konfigurationsdatei"
 
 #: gajim/gajim_remote.py:190
-msgid "Removes contact from roster"
+msgid "Removes contact from contact list"
 msgstr "Entfernt Kontakt aus der Kontaktliste"
 
 #: gajim/gajim_remote.py:193
@@ -2636,10 +2571,10 @@ msgstr "Fehlendes Argument \"contact_jid\""
 #: gajim/gajim_remote.py:275
 #, python-format
 msgid ""
-"'%s' is not in your roster.\n"
+"'%s' is not in your contact list.\n"
 "Please specify account for sending the message."
 msgstr ""
-"'%s' ist nicht in Ihrer Kontaktliste.\n"
+"\"%s\" ist nicht in Ihrer Kontaktliste.\n"
 "Bitte geben Sie ein Konto zum Senden der Nachricht an."
 
 #: gajim/gajim_remote.py:278
@@ -2864,12 +2799,12 @@ msgstr "Ende der Woche"
 msgid "Weekend!"
 msgstr "Wochenende!"
 
-#: gajim/common/logger.py:192 gajim/common/logger.py:197
+#: gajim/common/logger.py:189 gajim/common/logger.py:194
 #, 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:217
+#: gajim/common/logger.py:214
 #, python-format
 msgid "Creating %s"
 msgstr "Erstelle %s"
@@ -2942,38 +2877,36 @@ msgstr "%(nickname)s hat sich abgemeldet"
 msgid "Contact Signed Out"
 msgstr "Kontakt hat sich abgemeldet"
 
-#: gajim/common/contacts.py:455
-msgid "Not in roster"
-msgstr "Nicht in der Kontaktliste"
-
 #: gajim/common/config.py:80
 msgid ""
 "Show desktop notification even when a chat window is opened for this contact "
-"and does not have focus"
+"and does not have focus."
 msgstr ""
 "Desktop-Benachrichtigungen auch dann anzeigen, wenn für diesen Kontakt ein "
-"Chatfenster offen ist, das nicht den Fokus hat"
+"Chatfenster offen ist, das nicht den Fokus hat."
 
 #: gajim/common/config.py:81
-msgid "Play sound when user is busy"
-msgstr "Klang abspielen, wenn der Benutzer beschäftigt ist"
+msgid "Play sound even when being busy."
+msgstr "Klang abspielen, auch wenn der Benutzer beschäftigt ist."
 
 #: gajim/common/config.py:83
-msgid "Show only online and free for chat contacts in roster."
+msgid "Show only online and free for chat contacts in the contact list."
 msgstr ""
-"Zeige nur die Kontakte, die Verfügbar oder Frei zum Chatten sind in der "
-"Kontaktliste an."
+"Zeige nur die Kontakte in der Kontaktliste an, die verfügbar oder frei zum "
+"Chatten sind."
 
 #: gajim/common/config.py:86
 msgid "Time in minutes, after which your status changes to away."
 msgstr "Zeit in Minuten, nach der Ihr Status auf Abwesend gesetzt wird."
 
 #: gajim/common/config.py:87
-msgid "$S (Away as a result of being idle more than $T min)"
-msgstr "$S (Abwesend wegen Untätigkeit für mehr als $T Minuten)"
+msgid "$S (Away: Idle more than $T min)"
+msgstr "$S (Abwesend: Untätig seit mehr als $T Minuten)"
 
 #: gajim/common/config.py:87
-msgid "$S will be replaced by current status message, $T by autoawaytime."
+msgid ""
+"$S will be replaced by current status message, $T by the 'autoawaytime' "
+"value."
 msgstr ""
 "$S wird mit dem aktuellen Status ersetzt, $T durch die Abwesenheitszeit."
 
@@ -2982,70 +2915,73 @@ 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."
 
 #: gajim/common/config.py:90
-msgid "$S (Not available as a result of being idle more than $T min)"
-msgstr "$S (Nicht verfügbar wegen Untätigkeit seit mehr als $T Minuten)"
+msgid "$S (Not available: Idle more than $T min)"
+msgstr "$S (Nicht verfügbar: Untätig seit mehr als $T Minuten)"
 
 #: gajim/common/config.py:90
-msgid "$S will be replaced by current status message, $T by autoxatime."
+msgid ""
+"$S will be replaced by current status message, $T by the 'autoxatime' value."
 msgstr ""
 "$S wird mit der aktuellen Statusnachricht ersetzt, $T durch die Nicht-"
 "Verfügbar-Zeit."
 
-# FIXME: Check English
 #: gajim/common/config.py:93
 msgid ""
-"When to show notification area icon. Can be 'never', 'on_event', 'always'."
+"When to show the notification area icon. Can be 'never', 'on_event', and "
+"'always'."
 msgstr ""
 "Legt fest, wann das Benachrichtigungssymbol angezeigt wird. Mögliche Werte: "
-"'never', 'on_event', 'always'."
+"'never', 'on_event' und 'always'."
 
 #: gajim/common/config.py:94
-msgid "Allow to hide the roster window even if the tray icon is not shown."
+msgid ""
+"Allow to hide the contact list window even if the notification area icon is "
+"not shown."
 msgstr ""
-"Erlauben, die Kontaktliste zu verstecken, auch wenn das "
+"Erlaubt die Kontaktliste zu verstecken, auch wenn das "
 "Benachrichtigungssymbol nicht angezeigt wird."
 
 #: gajim/common/config.py:97
-msgid "Contact signed in notification color."
-msgstr "Farbe der Benachrichtigung bei Anmeldung eines Kontaktes."
+msgid "Notification color for contacts signing in."
+msgstr "Farbe der Benachrichtigung, wenn sich ein Kontakt anmeldet."
 
 #: gajim/common/config.py:98
-msgid "Contact signout notification color"
-msgstr "Farbe der Benachrichtigung bei Anmeldung von Kontakten"
+msgid "Notification color for contacts signing out."
+msgstr "Farbe der Benachrichtigung, wenn sich ein Kontakt abmeldet."
 
 #: gajim/common/config.py:99
-msgid "New message notification color."
+msgid "Notification color for new message notification."
 msgstr "Farbe der Benachrichtigung bei neuen Nachrichten."
 
 #: gajim/common/config.py:100
-msgid "File transfer request notification color."
-msgstr "Farbe der Benachrichtigung bei Dateiübertragungsanfragen."
+msgid "Notification color for file transfer request."
+msgstr "Farbe der Benachrichtigung bei Anfragen zu Dateiübertragungen."
 
 #: gajim/common/config.py:101
-msgid "File transfer error notification color."
-msgstr "Farbe der Benachrichtigung bei Dateiübertragungsfehlern."
+msgid "Notification color for file transfer errors."
+msgstr "Farbe der Benachrichtigung bei Fehlern in der Dateiübertragung."
 
 #: gajim/common/config.py:102
-msgid "File transfer complete or stopped notification color."
+msgid "Notification color for stopped or completed file transfers."
 msgstr ""
-"Farbe der Benachrichtigung bei vollständigen oder gestoppten "
+"Farbe der Benachrichtigung bei angehaltenen oder fertiggestellten "
 "Dateiübertragungen."
 
 #: gajim/common/config.py:103
-msgid "Groupchat invitation notification color"
-msgstr "Farbe der Benachrichtigung bei Einladung zu einem Gruppenchat"
+msgid "Notification color for group chat invitations."
+msgstr "Farbe der Benachrichtigung für Einladungen zu Gruppenchats."
 
 #: gajim/common/config.py:104
-msgid "Background color of status changed notification"
-msgstr "Hintergrundfarbe der Benachrichtigung über Statusänderungen"
+msgid "Notification background color for changed status."
+msgstr "Hintergrundfarbe der Benachrichtigung bei Statusänderungen."
 
 #: gajim/common/config.py:105
-msgid "Other dialogs color."
-msgstr "Andere Dialogfarben."
+msgid "Notification color for other dialogs."
+msgstr "Farbe der Benachrichtigung bei anderen Nachrichten."
 
 #: gajim/common/config.py:106
 msgid ""
-"List (space separated) of rows (accounts and groups) that are collapsed."
+"List of rows (accounts and groups) that are collapsed (space separated)."
 msgstr ""
 "Liste (getrennt durch Leerzeichen) von Ebenen (Konten und Gruppen), die "
 "eingeklappt sind."
@@ -3054,9 +2990,10 @@ msgstr ""
 msgid "default"
 msgstr "Standard"
 
-#: gajim/common/config.py:113
-msgid "Language used by speller"
-msgstr "Sprache der Rechtschreibprüfung"
+#: gajim/common/config.py:113 gajim/common/config.py:424
+#: gajim/common/config.py:431
+msgid "Language used for spell checking."
+msgstr "Sprache der Rechtschreibprüfung."
 
 #: gajim/common/config.py:114
 msgid ""
@@ -3071,13 +3008,13 @@ msgstr ""
 #: gajim/common/config.py:115
 msgid ""
 "Print time in chats using Fuzzy Clock. Value of fuzziness from 1 to 4, or 0 "
-"to disable fuzzyclock. 1 is the most precise clock, 4 the least precise one. "
-"This is used only if print_time is 'sometimes'."
+"to disable Fuzzy Clock. 1 is the most precise clock, 4 the least precise "
+"one. This is used only if 'print_time' is 'sometimes'."
 msgstr ""
 "Zeige die Zeit in Chats mittels ungenauer Uhr an. Werte für die "
 "Ungenauigkeit sind 1 bis 4, je höher, desto ungenauer. 0 deaktiviert die "
-"ungenaue Uhr. Die ungenaue Uhr wird nur verwendet, wenn print_time auf "
-"'sometimes' gesetzt ist."
+"ungenaue Uhr. Die ungenaue Uhr wird nur verwendet, wenn \"print_time\" auf "
+"\"sometimes\" gesetzt ist."
 
 #: gajim/common/config.py:117
 msgid "When enabled, ASCII emojis will be converted to graphical emojis."
@@ -3089,458 +3026,453 @@ msgstr "Behandle * / _ Paare als mögliche Formatierungszeichen."
 
 #: gajim/common/config.py:120
 msgid ""
-"If true, do not remove */_ . So *abc* will be bold but with * * not removed."
+"If enabled, do not remove */_ . So *abc* will be bold but with * * not "
+"removed."
 msgstr ""
-"Falls aktiviert, wird */_ nicht entfernt. Dadurch wird *abc* fett "
-"dargestellt, aber * * nicht entfernt."
+"Falls aktiviert, wird */_ nicht entfernt. Dadurch wird bspw. *abc* fett "
+"dargestellt, aber die * * werden nicht entfernt."
 
 #: gajim/common/config.py:123
 msgid ""
-"Uses ReStructured text markup to send HTML, plus ascii formatting if "
-"selected. For syntax, see http://docutils.sourceforge.net/docs/ref/rst/"
-"restructuredtext.html (If you want to use this, install docutils)"
+"Uses ReStructured text markup to send HTML, plus ASCII formatting if "
+"selected. Needs docutils installed (for syntax, see http://docutils."
+"sourceforge.net/docs/ref/rst/restructuredtext.html)."
 msgstr ""
 "Verwendet ReStructuredText als Text-Markup für HTML und ASCII-Formatierung, "
-"falls aktiviert. Informationen zur Syntax finden Sie unter http://docutils."
-"sourceforge.net/docs/ref/rst/restructuredtext.html (Englisch). (Falls Sie "
-"dieses Feature benutzen möchten, installieren Sie docutils.)"
+"falls aktiviert. Falls Sie dieses Feature benutzen möchten, installieren Sie "
+"docutils (Informationen zur Syntax finden Sie unter http://docutils."
+"sourceforge.net/docs/ref/rst/restructuredtext.html (Englisch))."
 
 #: gajim/common/config.py:132
 msgid ""
-"Character to add after nickname when using nick completion (tab) in group "
-"chat."
+"Character to add after nickname when using nickname completion (tab) in "
+"group chat."
 msgstr ""
-"Nach einem Spitznamen anzufügendes Zeichen, wenn Spitznamen-"
-"Vervollständigung (Tablator) in einem Gruppenchat verwendet wird."
+"Nach dem Spitznamen anzufügendes Zeichen, wenn die Spitznamen-"
+"Vervollständigung (Tab) im Gruppenchat genutzt wird."
 
 #: gajim/common/config.py:133
 msgid ""
-"Character to propose to add after desired nickname when desired nickname is "
-"used by someone else in group chat."
+"Character to propose to add after desired nickname when nickname is already "
+"used in group chat."
 msgstr ""
 "Zeichen, das dem gewünschten Spitznamen angehängt wird, falls dieser im "
 "Gruppenchat bereits vergeben ist."
 
 #: gajim/common/config.py:155
 msgid ""
-"If true, Gajim will save roster position when hiding roster, and restore it "
-"when showing roster."
+"If enabled, Gajim will save the contact list window position when hiding it, "
+"and restore it when showing the contact list window again."
 msgstr ""
-"Wenn aktiviert, wird Gajim die Position der Kontaktliste beim Verstecken "
-"speichern und die Position wiederherstellen, wenn die Kontaktliste wieder "
+"Falls aktiviert, wird Gajim die Position der Kontaktliste beim Verstecken "
+"speichern und die Position wiederherstellen, sobald die Kontaktliste wieder "
 "angezeigt wird."
 
 #: gajim/common/config.py:161
-msgid "Place the roster on the right in single window mode"
+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:167
 msgid ""
-"This option let you customize timestamp that is printed in conversation. For "
-"example \"[%H:%M] \" will show \"[hour:minute] \". See python doc on "
-"strftime for full documentation: http://docs.python.org/lib/module-time.html"
+"This option lets you customize the timestamp that is printed in "
+"conversation. For example '[%H:%M] ' will show '[hour:minute] '. See python "
+"doc on strftime for full documentation (https://docs.python.org/3/library/"
+"time.html)."
 msgstr ""
-"Hiermit lässt sich der Zeitstempel anpassen, der in den Unterhaltungen "
+"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\" "
-"unter: http://docs.python.org/lib/module-time.html (Englisch)"
+"unter: https://docs.python.org/3/library/time.html (Englisch)."
 
 #: gajim/common/config.py:168
-msgid "Characters that are printed before the nickname in conversations"
-msgstr "Zeichen, die in Unterhaltungen vor dem Spitznamen dargestellt werden"
+msgid "Characters that are printed before the nickname in conversations."
+msgstr "Zeichen, die in Unterhaltungen vor dem Spitznamen angezeigt werden."
 
 #: gajim/common/config.py:169
-msgid "Characters that are printed after the nickname in conversations"
-msgstr "Zeichen, die in Unterhaltungen nach dem Spitznamen dargestellt werden"
+msgid "Characters that are printed after the nickname in conversations."
+msgstr "Zeichen, die in Unterhaltungen nach dem Spitznamen angezeigt werden."
 
 #: gajim/common/config.py:170
-msgid "Add * and [n] in roster title?"
-msgstr "Sollen * und [n] in den Titel der Kontaktliste eingefügt werden?"
+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:171
 msgid ""
-"How many history messages should be restored when a chat tab/window is "
-"reopened?"
+"Number of messages from chat history to be restored when a chat tab/window "
+"is reopened."
 msgstr ""
-"Wie viele Nachrichten der vorherigen Unterhaltung sollen angezeigt werden, "
-"wenn ein Tab/Fenster erneut geöffnet wird?"
+"Anzahl der Nachrichten aus dem Unterhaltungsverlauf, die wiederhergestellt "
+"werden soll wenn ein Tab/Fenster erneut geöffnet wird."
 
 #: gajim/common/config.py:172
-msgid "How far back in time (minutes) history is restored. -1 means no limit."
+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:173
 msgid ""
-"How many lines to request from server when entering a groupchat. -1 means no "
-"limit"
+"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 der letzten Nachrichten sollen beim Beitreten eines Gruppenchats "
-"abgefragt werden? -1 bedeutet kein Limit"
+"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."
 
 #: gajim/common/config.py:174
 msgid ""
-"Minutes of backlog to request when entering a groupchat. -1 means no limit"
+"Should automatic rejoin be activated when you were kicked from a group chat?"
 msgstr ""
-"Wie viele Minuten zurück sollen Nachrichten beim Beitreten eines "
-"Gruppenchats abgefragt werden? -1 bedeutet kein Limit"
+"Soll einem Gruppenchat nachdem Sie rausgeworfen worden sind automatisch "
+"wieder beigetreten werden?"
 
 #: gajim/common/config.py:175
-msgid ""
-"How many seconds to wait before trying to autorejoin to a conference you are "
-"being disconnected from. Set to 0 to disable autorejoining."
+msgid "Send message on Ctrl+Enter and make a new line with Enter."
 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 Beitreten zu deaktivieren."
-
-#: gajim/common/config.py:176
-msgid "Should autorejoin be activated when kicked from a conference?"
-msgstr ""
-"Soll nach der Trennung von einem Gruppenchat automatisch wieder beigetreten "
-"werden?"
+"Sende Nachricht mit Strg+Enter und füge mit Enter einen Zeilenumbruch ein."
 
 #: gajim/common/config.py:177
-msgid ""
-"Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
-"Client default behaviour)."
+msgid "How many lines to store for Ctrl+KeyUP (previously sent messages)."
 msgstr ""
-"Sende Nachricht mit Strg+Enter und füge mit Enter einen Zeilenumbruch ein "
-"(Standardeinstellung im ICQ-Client)."
+"Wie viele Zeilen für den Befehl Strg+BildAuf (zuvor gesendete Nachrichten) "
+"gespeichert werden."
 
-#: gajim/common/config.py:179
-msgid "How many lines to store for Ctrl+KeyUP."
-msgstr "Wie viele Zeilen für den Befehl Strg+BildAuf gespeichert werden."
-
-#: gajim/common/config.py:182
+#: gajim/common/config.py:180
 #, python-format
 msgid ""
-"Either custom URL with %%s in it where %%s is the word/phrase or "
-"'WIKTIONARY' which means use Wikitionary."
+"Either a custom URL with %%s in it (where %%s is the word/phrase) or "
+"'WIKTIONARY' (which means use Wikitionary)."
 msgstr ""
-"Entweder eine benutzerdefinierte URL die %%s enthält, wobei %%s das Wort "
-"oder der Satz ist oder 'WIKTIONARY', was bedeutet, dass das Wörterbuch "
-"Wiktionary verwendet werden soll."
+"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:185
+#: gajim/common/config.py:183
 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:187
+#: gajim/common/config.py:185
 msgid ""
-"When not printing time for every message (print_time==sometimes), print it "
+"When not printing time for every message ('print_time'==sometimes), print it "
 "every x minutes."
 msgstr ""
-"Wenn die Uhrzeit nicht für jede Nachricht angezeigt werden soll "
-"(print_time==sometimes), wird sie alle x Minuten angezeigt."
+"Wenn die Uhrzeit nicht für jede Nachricht angezeigt werden soll (\"print_time"
+"\"==sometimes), wird sie alle x Minuten angezeigt."
 
-#: gajim/common/config.py:188
+#: gajim/common/config.py:186
 msgid "Ask before pasting an image."
 msgstr "Fragen, bevor ein Bild aus der Zwischenablage eingefügt wird."
 
-#: gajim/common/config.py:189
+#: gajim/common/config.py:187
 msgid "Ask before closing a group chat tab/window."
 msgstr "Fragen, bevor ein Gruppenchat-Tab/Fenster geschlossen wird."
 
-#: gajim/common/config.py:190
+#: gajim/common/config.py:188
 msgid ""
-"Always ask for confirmation before closing groupchats with any of the JIDs "
-"on this space separated list."
+"Always ask for confirmation before closing group chats with any of the XMPP "
+"Addresses on this list (space separated)."
 msgstr ""
-"Immer fragen, bevor Gruppenchats aus dieser Liste von Gruppchat-JIDs "
-"geschlossen werden (JIDs getrennt durch Leerzeichen)."
+"Immer fragen, bevor Gruppenchats aus dieser Liste von XMPP-Adressen "
+"(getrennt durch Leerzeichen) geschlossen werden."
 
-#: gajim/common/config.py:191
+#: gajim/common/config.py:189
 msgid ""
-"Never ask for confirmation before closing groupchats with any of the JIDs on "
-"this space separated list."
+"Never ask for confirmation before closing group chats with any of the XMPP "
+"Addresses on this list (space separated)."
 msgstr ""
-"Niemals fragen, bevor Gruppenchats aus dieser Liste von Gruppchat-JIDs "
-"geschlossen werden (JIDs getrennt durch Leerzeichen)."
+"Niemals fragen, bevor Gruppenchats aus dieser Liste von XMPP-Adressen "
+"(getrennt durch Leerzeichen) geschlossen werden."
 
-#: gajim/common/config.py:192
+#: gajim/common/config.py:190
 msgid ""
-"Ask before closing tabbed chat window if there are controls that can lose "
-"data (chat, private chat, groupchat that will not be minimized)"
+"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 ""
 "Fragen, bevor ein Chatfenster mit mehreren Tabs geschlossen wird, wenn "
 "dadurch Daten verloren gehen würden (Chat, Privatchat, nicht minimierter "
-"Gruppenchat)"
+"Gruppenchat)."
 
-#: gajim/common/config.py:195
+#: gajim/common/config.py:193
 msgid ""
-"Comma separated list of sent hosts, in addition of local interfaces, for "
-"File Transfer in case of address translation/port forwarding."
+"List of send hosts (comma separated) in addition to local interfaces for "
+"file transfers (in case of address translation/port forwarding)."
 msgstr ""
-"Kommagetrennte Liste von vollständigen Hostnamen oder IP-Adressen, die bei "
+"Liste von vollständigen Hostnamen oder IP-Adressen (kommagetrennt), die bei "
 "Dateiübertragung mit NAT/Port-Freigabe zusätzlich zum lokalen Hostnamen "
 "gesendet werden."
 
-#: gajim/common/config.py:196
+#: gajim/common/config.py:194
 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:198
+#: gajim/common/config.py:196
 msgid "Notify of events in the notification area."
 msgstr "Neue Ereignisse per Benachrichtigungssymbol anzeigen."
 
-#: gajim/common/config.py:199
+#: gajim/common/config.py:197
 msgid ""
-"If False, Gajim will display a static event icon instead of the blinking "
-"status icon in the notification area when notifying on event."
+"If disabled, Gajim will display a static event icon instead of the blinking "
+"status icon in the notification area when notifying about an event."
 msgstr ""
-"Falls deaktiviert, zeigt Gajim ein statisches Icon anstatt des blinkenden "
-"Status-Icons im Benachrichtigungsbereich an."
+"Falls deaktiviert, zeigt Gajim bei neuen Ereignissen ein statisches Icon "
+"anstatt des blinkenden Icons im Benachrichtigungsbereich an."
 
-#: gajim/common/config.py:205
+#: gajim/common/config.py:203
 msgid "Show tab when only one conversation?"
 msgstr "Tab-Leiste bei einzelner Unterhaltung anzeigen?"
 
-#: gajim/common/config.py:206
+#: gajim/common/config.py:204
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "Tab-Grenzen im Chatfenster anzeigen?"
 
-#: gajim/common/config.py:207
+#: gajim/common/config.py:205
 msgid "Show close button in tab?"
 msgstr "Schließen-Schaltflächen in Tabs anzeigen?"
 
-#: gajim/common/config.py:220
+#: gajim/common/config.py:218
 msgid "Preview new messages in notification popup?"
 msgstr "Vorschau neuer Nachrichten in der Benachrichtigung anzeigen?"
 
-#: gajim/common/config.py:223
+#: gajim/common/config.py:221
 msgid ""
-"A semicolon-separated list of words that will be highlighted in group chats."
+"A list of words (semicolon separated) that will be highlighted in group "
+"chats."
 msgstr ""
 "Eine durch Semikola getrennte Liste von Worten, die in einem Gruppenchat "
 "hervorgehoben werden sollen."
 
-#: gajim/common/config.py:224
+#: gajim/common/config.py:222
 msgid ""
-"If true, quits Gajim when X button of Window Manager is clicked. This "
-"setting is taken into account only if notification icon is used."
+"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 ""
-"Falls aktiviert, wird Gajim beendet, wenn die X-Schaltfläche des Fensters "
-"geklickt wird. Diese Option funktioniert nur, wenn das "
+"Falls aktiviert, wird Gajim beendet, wenn die Schließen-Schaltfläche des "
+"Fensters geklickt wird. Diese Option funktioniert nur, wenn das "
 "Benachrichtigungssymbol verwendet wird."
 
-#: gajim/common/config.py:225
+#: gajim/common/config.py:223
 msgid ""
-"If true, Gajim hides the Roster window on pressing the X button instead of "
-"minimizing into the Dock."
+"If enabled, Gajim hides the contact list window when pressing the X button "
+"instead of minimizing into the notification area."
 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:226
+#: gajim/common/config.py:224
 msgid ""
-"If true, Gajim will display an icon on each tab containing unread messages. "
-"Depending on the theme, this icon may be animated."
+"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:227
+#: gajim/common/config.py:225
 msgid ""
-"If true, Gajim will display the status message, if not empty, for every "
-"contact under the contact name in roster window."
+"If enabled, Gajim will display the status message (if not empty) underneath "
+"the contact name in the contact list window."
 msgstr ""
 "Falls aktiviert, wird in der Kontaktliste unter dem Namen eines jeden "
 "Kontaktes dessen Statusnachricht angezeigt, sofern dieser eine festgelegt "
 "hat."
 
-#: gajim/common/config.py:233
-msgid "Define the position of the avatar in roster. Can be left or right"
+#: gajim/common/config.py:231
+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. \"left"
-"\" (links) oder \"right\" (rechts) sind mögliche Optionen"
+"Legt die Position des Kontaktbildes in der Kontaktliste fest. Mögliche "
+"Optionem sind \"left\" (links) oder \"right\" (rechts)."
 
-#: gajim/common/config.py:234
+#: gajim/common/config.py:232
 msgid ""
-"If False, Gajim will no longer print status line in chats when a contact "
-"changes their status and/or their status message."
+"If disabled, Gajim will no longer print status messages in chats when a "
+"contact changes their status (and/or their status message)."
 msgstr ""
 "Falls deaktiviert, wird Gajim keine Statusnachricht im Chat anzeigen, wenn "
 "ein Kontakt den Status oder die Statusnachricht ändert."
 
-#: gajim/common/config.py:235
+#: gajim/common/config.py:233
 msgid ""
 "Default Setting: Show a status message for every join or leave in a group "
-"chat"
+"chat."
 msgstr ""
 "Standardeinstellung: Status-Benachrichtigung für jedes Beitreten oder "
-"Verlassen in einem Gruppenchat anzeigen"
+"Verlassen in einem Gruppenchat anzeigen."
 
-#: gajim/common/config.py:236
+#: gajim/common/config.py:234
 msgid ""
-"Default Setting: Show a status message for all status (away, dnd, etc.) "
-"changes of users in a group chat"
+"Default Setting: Show a status message for all status changes (away, dnd, "
+"etc.) of users in a group chat."
 msgstr ""
-"Standardeinstellung: Statusnachricht für jede Statusänderung (Abwesend, "
-"Nicht stören, etc.) von Nutzern in einem Gruppenchat"
+"Standardeinstellung: Statusnachricht für jede Statusänderung (abwesend, "
+"nicht stören, etc.) von Teilnehmern eines Gruppenchats anzeigen."
 
-#: gajim/common/config.py:238
-msgid "Log XHTML messages instead of plain text messages."
-msgstr "XHTML-Nachrichten anstelle von reinen Textnachrichten speichern."
+#: gajim/common/config.py:236
+msgid "Store XHTML messages in chat history instead of plain text messages."
+msgstr ""
+"XHTML-Nachrichten anstelle von reinen Textnachrichten im "
+"Unterhaltungsverlauf speichern."
 
-#: gajim/common/config.py:239
+#: gajim/common/config.py:237
 msgid "Don't show avatar for the transport itself."
 msgstr "Zeige kein Kontaktbild für den Transport an sich an."
 
-#: gajim/common/config.py:240
-msgid "Don't show roster in the system taskbar."
+#: gajim/common/config.py:238
+msgid "Don't show contact list window in the system taskbar."
 msgstr "Kontaktliste nicht in der Taskleiste anzeigen."
 
-#: gajim/common/config.py:241
+#: gajim/common/config.py:239
 msgid ""
-"If true, make the window flash (the default behaviour in most Window "
-"Managers) when holding pending events."
+"If enabled, Gajim makes the window flash (the default behaviour in most "
+"Window Managers) when holding pending events."
 msgstr ""
 "Falls aktiviert, blinkt das Fenster bei neuen Ereignissen (Standardverhalten "
 "der meisten Fenster-Manager)."
 
-#: gajim/common/config.py:245
+#: gajim/common/config.py:243
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
 "'always_with_roster' - Like 'always' but the messages are in a single window "
-"along with the roster.\n"
+"along with the contact list.\n"
 "'never' - All messages get their own window.\n"
 "'peracct' - Messages for each account are sent to a specific window.\n"
-"'pertype' - Each message type (e.g. chats vs. groupchats) is sent to a "
+"'pertype' - Each message type (e.g. chats vs. group chats) is sent to a "
 "specific window."
 msgstr ""
 "Entscheidet in welchem Fenster neue Nachrichten angezeigt werden.\n"
-"'Immer' - Alle Nachrichten landen in einem einzigen Fenster.\n"
-"'Immer in der Kontaktliste' - Wie 'Immer', die Nachrichten teilen sich "
-"jedoch ein Fenster mit der Kontaktliste.\n"
-"'Niemals' - Alle Nachrichten werden in eigenen Fenstern angezeigt.\n"
-"'Pro Konto' - Jedes Konto besitzt ein eigenes Fenster, in dem die "
+"\"always\" - Alle Nachrichten landen in einem einzigen Fenster.\n"
+"\"always_with_roster\" - Wie 'Immer', die Nachrichten teilen sich jedoch ein "
+"Fenster mit der Kontaktliste.\n"
+"\"never\" - Alle Nachrichten werden in eigenen Fenstern angezeigt.\n"
+"\"peracct\" - Jedes Konto besitzt ein eigenes Fenster, in dem die "
 "Nachrichten angezeigt werden.\n"
-"'Pro Typ' - Jeder Nachrichtentyp (z.B. Chat oder Gruppenchat) landet in "
+"\"pertype\" - Jeder Nachrichtentyp (z.B. Chat oder Gruppenchat) landet in "
 "einem eigenen Fenster."
 
-#: gajim/common/config.py:246
+#: gajim/common/config.py:244
 msgid ""
-"Show roster on startup.\n"
-"'always' - Always show roster.\n"
-"'never' - Never show roster.\n"
-"'last_state' - Restore the last state roster."
+"Show contact list window on startup.\n"
+"'always' - Always show contact list window.\n"
+"'never' - Never show contact list window.\n"
+"'last_state' - Restore last state of the contact list window."
 msgstr ""
 "Kontaktliste beim Starten anzeigen.\n"
-"'always' - Kontaktliste immer anzeigen.\n"
-"'never' - Kontaktliste nie anzeigen.\n"
-"'last_state' - Letzten Zustand wiederherstellen."
+"\"always\" - Kontaktliste immer anzeigen.\n"
+"\"never\" - Kontaktliste nie anzeigen.\n"
+"\"last_state\" - Letzten Zustand wiederherstellen."
 
-#: gajim/common/config.py:247
-msgid "If False, you will no longer see the avatar in the chat window."
-msgstr ""
-"Falls deaktiviert, wird das Kontaktbild nicht mehr im Chatfenster angezeigt."
+#: gajim/common/config.py:245
+msgid "If enabled, Gajim displays the avatar in the chat window."
+msgstr "Falls aktiviert, wird das Kontaktbild im Chatfenster angezeigt."
 
-#: gajim/common/config.py:248
-msgid "If true, pressing the escape key closes a tab/window."
+#: gajim/common/config.py:246
+msgid "If enabled, pressing Esc closes a tab/window."
 msgstr "Falls aktiviert, schließt die Escape-Taste aktive Tabs/Fenster."
 
-#: gajim/common/config.py:249
-msgid "Hides the banner in a group chat window"
-msgstr "Versteckt den Banner im Gruppenchat-Fenster"
+#: gajim/common/config.py:247
+msgid "Hides the banner in a group chat window."
+msgstr "Versteckt den Banner im Gruppenchat-Fenster."
 
-#: gajim/common/config.py:250
-msgid "Hides the banner in two persons chat window"
-msgstr "Versteckt den Banner im Einzelnachrichtenfenster"
+#: gajim/common/config.py:248
+msgid "Hides the banner in a 1:1 chat window."
+msgstr "Versteckt den Banner im Einzelchat-Fenster."
 
-#: gajim/common/config.py:251
-msgid "Hides the group chat occupants list in group chat window."
+#: gajim/common/config.py:249
+msgid "Hides the group chat participants list in a group chat window."
 msgstr "Versteckt die Teilnehmerliste im Gruppenchat-Fenster."
 
-#: gajim/common/config.py:252
+#: gajim/common/config.py:250
 msgid ""
 "In a chat, show the nickname at the beginning of a line only when it's not "
-"the same person talking than in previous message."
+"the same person talking as in the previous message."
 msgstr ""
 "Der Spitzname wird im Chat nur dann vor einer Nachricht angezeigt, wenn sie "
 "nicht von der Person stammt, die schon die letzte Nachricht geschrieben hat."
 
-#: gajim/common/config.py:253
+#: gajim/common/config.py:251
 msgid "Indentation when using merge consecutive nickname."
 msgstr ""
 "Einrückung einfügen, wenn das Zusammenführen nachfolgender Spitznamen "
 "verwendet wird."
 
-#: gajim/common/config.py:254
-msgid "Ctrl-Tab go to next composing tab when none is unread."
+#: gajim/common/config.py:252
+msgid ""
+"Ctrl+Tab switches to the next composing tab when there are no tabs with "
+"messages pending."
 msgstr ""
-"Strg+Tab, um zum nächsten Tab zu wechseln, wenn kein anderer Tab ungelesene "
+"Strg+Tab wechselt zum nächsten Tab, wenn kein anderer Tab ungelesene "
 "Nachrichten enthält."
 
-#: gajim/common/config.py:255
+#: gajim/common/config.py:253
 msgid ""
-"Show the confirm metacontacts creation dialog or not? Empty string means "
-"never show the dialog."
+"Show a confirmation dialog to create metacontacts? Empty string means never "
+"show the dialog."
 msgstr ""
-"Soll der Bestätigungsdialog beim Erstellen von Metakontakten angezeigt "
+"Soll ein Bestätigungsdialog zum Erstellen von Metakontakten angezeigt "
 "werden? Bei einer leeren Zeichenfolge wird der Dialog niemals gezeigt."
 
-#: gajim/common/config.py:256
+#: gajim/common/config.py:254
 msgid ""
-"Show the confirm block contact dialog or not? Empty string means never show "
+"Show a confirmation dialog to block a contact? Empty string means never show "
 "the dialog."
 msgstr ""
-"Soll der Bestätigungsdialog zum Sperren von Benutzern angezeigt werden? Bei "
+"Soll ein Bestätigungsdialog zum Sperren von Kontakten angezeigt werden? Bei "
 "einer leeren Zeichenfolge wird der Dialog niemals gezeigt."
 
-#: gajim/common/config.py:257
+#: gajim/common/config.py:255
 msgid ""
-"Show the confirm custom status dialog or not? Empty string means never show "
-"the dialog."
+"Show a confirmation dialog for a custom status? Empty string means never "
+"show the dialog."
 msgstr ""
-"Soll der Bestätigungsdialog für den benutzerdefinierten Chatstatus angezeigt "
+"Soll ein Bestätigungsdialog für den benutzerdefinierten Status angezeigt "
 "werden? Bei einer leeren Zeichenfolge wird der Dialog niemals gezeigt."
 
-#: gajim/common/config.py:258
+#: gajim/common/config.py:256
 msgid ""
-"If true, you will be able to set a negative priority to your account in "
-"account modification window. BE CAREFUL, when you are logged in with a "
-"negative priority, you will NOT receive any message from your server."
+"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."
 
-#: gajim/common/config.py:259
+#: gajim/common/config.py:257
 msgid ""
-"If true, Gajim will show number of online and total contacts in account and "
-"group rows."
+"If enabled, Gajim will show both the number of online and total contacts in "
+"account rows as well as in group rows."
 msgstr ""
-"Falls aktiviert, wird die Anzahl der angemeldeten und Gesamtanzahl der "
+"Falls aktiviert, werden die Anzahl angemeldeter und die Gesamtanzahl der "
 "Kontakte auf Konto- und Gruppenebene angezeigt."
 
-#: gajim/common/config.py:260
+#: gajim/common/config.py:258
 msgid ""
-"Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
-"as if they were of this type"
+"Can be empty, 'chat' or 'normal'. If not empty, all incoming messages are "
+"treated as if they were of this type."
 msgstr ""
-"Kann leer, 'chat' oder 'normal' sein. Wenn nicht leer, werden alle "
-"eingehenden Nachrichten so behandelt, als wären sie vom gewählten Typ"
+"Kann leer, \"chat\" oder \"normal\" sein. Wenn nicht leer, werden alle "
+"eingehenden Nachrichten so behandelt, als wären sie vom gewählten Typ."
 
-#: gajim/common/config.py:261
+#: gajim/common/config.py:259
 msgid ""
-"If true, Gajim will scroll and select the contact who sent you the last "
-"message, if chat window is not already opened."
+"If enabled, Gajim will scroll and select the contact who sent you the last "
+"message, if the chat window is not already opened."
 msgstr ""
 "Falls aktiviert, wird Gajim automatisch zu dem Kontakt springen und diesen "
 "auswählen, welcher die letzte Nachricht geschickt hat, falls das Chatfenster "
 "nicht bereits geöffnet ist."
 
-#: gajim/common/config.py:262
+#: gajim/common/config.py:260
 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:263
+#: gajim/common/config.py:261
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
@@ -3548,82 +3480,85 @@ msgstr ""
 "Maximale Anzahl von Zeilen, die in einem Gespräch dargestellt werden. Die "
 "ältesten Zeilen werden ausgeblendet."
 
-#: gajim/common/config.py:264
+#: gajim/common/config.py:262
 msgid ""
-"If true, notification windows from notification-daemon will be attached to "
-"notification icon."
+"If enabled, notification windows from notification-daemon will be attached "
+"to the notification area icon."
 msgstr ""
-"Falls aktiviert, werden Benachrichtigungsfenster vom Benachrichtigungsdienst "
-"an das Benachrichtigungssymbol angehängt."
+"Falls aktiviert, werden Benachrichtigungsfenster des notofication-daemon an "
+"das Benachrichtigungssymbol angehängt."
 
-#: gajim/common/config.py:265
+#: gajim/common/config.py:263
 msgid "Choose interval between 2 checks of idleness."
 msgstr "Legen Sie den Zeitabstand zwischen zwei Leerlaufüberprüfungen fest."
 
-#: gajim/common/config.py:266
+#: gajim/common/config.py:264
 msgid ""
-"Valid uri schemes. Only schemes in this list will be accepted as \"real\" "
-"uri. (mailto and xmpp are handled separately)"
+"Valid URI schemes. Only schemes in this list will be accepted as 'real' URI "
+"(mailto and xmpp are handled separately)."
 msgstr ""
 "Gültige URI-Schemata. Nur Schemata in dieser Liste werden als \"wirkliche\" "
 "URIs akzeptiert. (mailto und xmpp werden separat behandelt)"
 
-#: gajim/common/config.py:267
-msgid "If true, completion in groupchats will be like a shell auto-completion"
+#: gajim/common/config.py:265
+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"
+"der Autovervollständigung in einer Kommandozeile verhalten."
 
-#: gajim/common/config.py:272
-msgid "Optionally fix jingle output video framerate. Example: 10/1 or 25/2"
+#: gajim/common/config.py:270
+msgid "Optionally fix Jingle output video framerate. Example: 10/1 or 25/2."
 msgstr ""
-"Jingle Videoausgabe-Framerate optional korrigieren. Beispiel: 10/1 oder 25/2"
+"Bildwiederholrate der Jingle-Videoausgabe optional korrigieren. Beispiel: "
+"10/1 oder 25/2"
 
-#: gajim/common/config.py:273
-msgid "Optionally resize jingle output video. Example: 320x240"
-msgstr "Jingle Videoausgabegröße optional ändern. Beispiel: 320x240"
+#: gajim/common/config.py:271
+msgid "Optionally resize Jingle output video. Example: 320x240."
+msgstr "Jingle-Videoausgabegröße optional ändern. Beispiel: 320x240."
 
-#: gajim/common/config.py:274
-msgid "If true, You will also see your webcam"
-msgstr "Falls aktiviert, wird auch Ihre Webcam angezeigt"
+#: gajim/common/config.py:272
+msgid "If enabled, you will see your webcam's video stream as well."
+msgstr ""
+"Falls aktiviert, werden Sie den Videostream Ihrer Webcam ebenfalls sehen."
 
-#: gajim/common/config.py:277
+#: gajim/common/config.py:275
 msgid ""
-"If true, Gajim will try to use a STUN server when using Jingle. The one in "
-"\"stun_server\" option, or the one given by the XMPP server."
+"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 ""
 "Falls aktiviert, wird Gajim versuchen einen STUN-Server für Jingle zu "
 "verwenden. Entweder jenen in der \"stun_server\"-Option oder einen vom XMPP-"
 "Server vorgegebenen Server."
 
-#: gajim/common/config.py:278
+#: gajim/common/config.py:276
 msgid "STUN server to use when using Jingle"
 msgstr "Für Jingle zu benutzender STUN-Server"
 
-#: gajim/common/config.py:279
+#: gajim/common/config.py:277
 msgid ""
-"If true, Gajim will show affiliation of groupchat occupants by adding a "
-"colored square to the status icon"
+"If enabled, Gajim will show affiliation of group chat participants by adding "
+"a colored square to the status icon."
 msgstr ""
 "Falls aktiviert, wird Gajim die Gruppenzugehörigkeit der Teilnehmer im "
 "Gruppenchat anzeigen, indem ein farbiges Quadrat zum Status-Icon hinzugefügt "
-"wird"
+"wird."
 
-#: gajim/common/config.py:280
+#: gajim/common/config.py:278
 msgid ""
 "Proxy used for all outgoing connections if the account does not have a "
-"specific proxy configured"
+"specific proxy configured."
 msgstr ""
 "Proxy, der für alle ausgehenden Verbindungen verwendet wird, wenn das Konto "
-"keine eigene Proxy-Konfiguration hat"
+"keine eigene Proxy-Konfiguration hat."
 
-#: gajim/common/config.py:281
-msgid "If true, Gajim will ignore incoming attention requests (\"wizz\")."
+#: gajim/common/config.py:279
+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 Ihre "
 "Aufmerksamkeit zu erregen (\"wizz\")."
 
-#: gajim/common/config.py:282
+#: gajim/common/config.py:280
 msgid ""
 "If enabled, Gajim will reopen chat windows that were opened last time Gajim "
 "was closed."
@@ -3631,435 +3566,454 @@ msgstr ""
 "Falls aktiviert, wird Gajim Fenster die beim letzten Beenden geöffnet waren "
 "wieder öffnen."
 
-#: gajim/common/config.py:283
+#: gajim/common/config.py:281
 msgid ""
-"If enabled, Gajim will show an icon to show that sent message has been "
-"received by your contact"
+"If enabled, Gajim will display an icon to show that sent messages have been "
+"received by your contact."
 msgstr ""
 "Falls aktiviert, zeigt Gajim eine Empfangsbestätigung an, wenn die Nachricht "
-"vom Gegenüber empfangen wurde"
+"vom Gegenüber empfangen wurde."
 
-#: gajim/common/config.py:284
-msgid "Show a mini avatar in chat window tabs and in window icon"
-msgstr "Kleines Kontaktbild in Chatfenster-Tabs und im Fenstersymbol anzeigen"
+#: gajim/common/config.py:282
+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:285
-msgid "If true, Gajim will use the Systems Keyring to store account passwords."
+#: gajim/common/config.py:283
+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:286
-msgid "If true, Gajim will execute XEP-0146 Commands."
+#: gajim/common/config.py:284
+msgid "If enabled, Gajim will execute XEP-0146 Commands."
 msgstr "Falls aktiviert, wird Gajim XEP-0146-Befehle ausführen."
 
-#: gajim/common/config.py:287
+#: gajim/common/config.py:285
 msgid "2: System, 1: Enabled, 0: Disabled"
 msgstr "2: System, 1: Aktiviert, 0: Deaktiviert"
 
-#: gajim/common/config.py:288
+#: gajim/common/config.py:286
 msgid "Options in days which can be chosen in the sync threshold menu"
 msgstr "Wert in Tagen, der im Sync-Schwellenwert-Menü gewählt werden kann"
 
-#: gajim/common/config.py:289
+#: gajim/common/config.py:287
 msgid ""
-"Maximum history in days we request from a public room archive. 0: As much as "
-"possible"
+"Maximum history in days we request from a public group chat archive. 0: As "
+"much as possible."
 msgstr ""
 "Maximaler Unterhaltungsverlauf in Tagen, der aus dem Archiv eines "
-"öffentlichen Raums angefordert wird. 0: So viel wie möglich"
+"öffentlichen Gruppenchats angefordert wird. 0: So viel wie möglich."
 
-#: gajim/common/config.py:290
+#: gajim/common/config.py:288
 msgid ""
-"Maximum history in days we request from a private room archive. 0: As much "
-"as possible"
+"Maximum history in days we request from a private group chat archive. 0: As "
+"much as possible."
 msgstr ""
 "Maximaler Unterhaltungsverlauf in Tagen, der aus dem Archiv eines privaten "
-"Raums angefordert wird. 0: So viel wie möglich"
+"Gruppenchats angefordert wird. 0: So viel wie möglich."
 
-#: gajim/common/config.py:291
-msgid "If the room subject is shown in chat on join"
-msgstr "Ob beim Beitreten des Gruppenchats das Thema angezeigt werden soll"
+#: gajim/common/config.py:289
+msgid ""
+"If enabled, Gajim shows the group chat subject in the chat window when "
+"joining."
+msgstr ""
+"Falls aktiviert, wird Gajim das Thema des Gruppenchats beim Beitreten im "
+"Chatfenster anzeigen."
 
-#: gajim/common/config.py:292
+#: gajim/common/config.py:290
 msgid ""
-"If the contact row is colored according to the current chatstate of the "
-"contact"
+"If enabled, the contact row is colored according to the current chat state "
+"of the contact."
 msgstr ""
-"Ob die Kontakt-Ebene dem Chatstatus des Kontakts entsprechend gefärbt werden "
-"soll"
+"Falls aktiviert, wird die Kontakt-Ebene dem Chatstatus des Kontakts "
+"entsprechend gefärbt."
 
-#: gajim/common/config.py:293
-msgid "If the tab is colored according to the current chatstate of the contact"
+#: gajim/common/config.py:291
+msgid ""
+"If enabled, the tab is colored according to the current chat state of the "
+"contact."
 msgstr ""
-"Ob der Tab dem Chatstatus des Kontakts entsprechend gefärbt werden soll"
+"Falls aktiviert, wird der Tab dem Chatstatus des Kontakts entsprechend "
+"gefärbt."
 
-#: gajim/common/config.py:294
+#: gajim/common/config.py:292
 msgid ""
-"Shows a text in the banner that describes the current chatstate of the "
-"contact"
+"Shows a text in the banner that describes the current chat state of the "
+"contact."
 msgstr ""
 "Zeigt einen Text im Banner, der den aktuellen Chatstatus des Kontakts "
-"beschreibt"
+"beschreibt."
 
-#: gajim/common/config.py:295 gajim/common/config.py:424
+#: gajim/common/config.py:293
 msgid ""
 "Chat state notifications that are sent to contacts. Possible values: all, "
 "composing_only, disabled"
 msgstr ""
-"Chatstatus-Benachrichtigungen, die an Kontakte gesendet werden. Kann auf "
-"\"all\", \"composing_only\" oder \"disabled\" festgelegt werden"
+"Chatstatus-Benachrichtigungen, die an Kontakte gesendet werden. Mögliche "
+"Optionen sind \"all\", \"composing_only\" oder \"disabled\"."
 
-#: gajim/common/config.py:296 gajim/common/config.py:438
+#: gajim/common/config.py:294
 msgid ""
 "Chat state notifications that are sent to the group chat. Possible values: "
-"all, composing_only, disabled"
+"'all', 'composing_only', 'disabled'"
 msgstr ""
 "Chatstatus-Benachrichtigungen, die an den Gruppenchat gesendet werden "
-"sollen. Kann auf \"all\", \"composing_only\" oder \"disabled\" festgelegt "
-"werden"
+"sollen. Mögliche Optionen sind \"all\", \"composing_only\" oder \"disabled\"."
+
+#: gajim/common/config.py:297
+msgid "API Preferences. Possible values: 'http', 'iq'"
+msgstr "API-Einstellungen. Mögliche Werte: \"http\", \"iq\""
 
-#: gajim/common/config.py:312
+#: gajim/common/config.py:313
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
-"defined in autopriority_* options."
+"defined in 'autopriority_*' options."
 msgstr ""
 "Die Priorität ändert sich automatisch gemäß Ihrem Status. Die Prioritäten "
 "werden in den \"autopriority_*\"-Optionen festgelegt."
 
-#: gajim/common/config.py:320
-msgid ""
-"Status used to autoconnect as. Can be online, chat, away, xa, dnd, "
-"invisible. NOTE: this option is used only if restore_last_status is disabled"
-msgstr ""
-"Status bei automatischer Verbindung. Mögliche Werte: online, chat, away, xa, "
-"dnd, invisible. HINWEIS: Diese Option kann nur verwendet werden, wenn "
-"restore_last_status deaktiviert ist"
-
 #: gajim/common/config.py:321
-msgid "If enabled, restore the last status that was used."
+msgid ""
+"Status to be used automatically when connecting. Can be 'online', 'chat', "
+"'away', 'xa', 'dnd' or 'invisible'. NOTE: This option is used only if "
+"'restore_last_status' is disabled."
 msgstr ""
-"Falls aktiviert, wird die zuletzt verwendete Statusnachricht verwendet."
+"Status bei automatischer Verbindung. Mögliche Werte: \"online\", \"chat\", "
+"\"away\", \"xa\", \"dnd\", oder \"invisible\". HINWEIS: Diese Option kann "
+"nur verwendet werden, wenn \"restore_last_status\" deaktiviert ist."
 
 #: gajim/common/config.py:322
+msgid "If enabled, the last status will be restored."
+msgstr "Falls aktiviert, wird er zuletzt verwendete Status wiederhergestellt."
+
+#: gajim/common/config.py:323
 msgid ""
-"If true, Contacts requesting authorization will be automatically accepted."
+"If enabled, Contacts requesting authorization will be accepted automatically."
 msgstr ""
 "Falls aktiviert, werden Autorisierungsanfragen von Kontakten automatisch "
 "akzeptiert."
 
-#: gajim/common/config.py:323
+#: gajim/common/config.py:324
 msgid ""
-"If False, this account will be disabled and will not appear in roster window."
+"If disabled, this account will be disabled and will not appear in the "
+"contact list window."
 msgstr ""
-"Falls deaktiviert, wird das Konto deaktiviert und erscheint nicht in der "
-"Kontaktliste."
+"Falls deaktiviert, wird das Konto deaktiviert und nicht in der Kontaktliste "
+"erscheinen."
 
-#: gajim/common/config.py:327
-msgid "Allow plaintext connections"
-msgstr "Erlaube unverschlüsselte Verbindungen"
+#: gajim/common/config.py:328
+msgid "Allow plaintext connections."
+msgstr "Erlaube unverschlüsselte Verbindungen."
 
-#: gajim/common/config.py:330
+#: gajim/common/config.py:331
 msgid ""
-"List (space separated) of authentication mechanisms to try. Can contain "
-"ANONYMOUS, EXTERNAL, GSSAPI, SCRAM-SHA-1-PLUS, SCRAM-SHA-1, DIGEST-MD5, "
-"PLAIN, X-MESSENGER-OAUTH2 or XEP-0078"
+"List of authentication mechanisms to try (space separated). Can contain "
+"'ANONYMOUS', 'EXTERNAL', 'GSSAPI', 'SCRAM-SHA-1-PLUS', 'SCRAM-SHA-1', "
+"'DIGEST-MD5', 'PLAIN', 'X-MESSENGER-OAUTH2' or 'XEP-0078'."
 msgstr ""
-"Durch Leerzeichen getrennte Liste der zu versuchenden "
-"Authentifizierungsmechanismen. Mögliche Werte ANONYMOUS, EXTERNAL, GSSAPI, "
-"SCRAM-SHA-1-PLUS, SCRAM-SHA-1, DIGEST-MD5, PLAIN, X-MESSENGER-OAUTH2 or "
-"XEP-0078"
+"Durch Leerzeichen getrennte Liste der zu anzuwendenden "
+"Authentifizierungsmechanismen. Mögliche Werte sind \"ANONYMOUS\", \"EXTERNAL"
+"\", \"GSSAPI\", \"SCRAM-SHA-1-PLUS\", \"SCRAM-SHA-1\", \"DIGEST-MD5\", "
+"\"PLAIN\", \"X-MESSENGER-OAUTH2\" oder \"XEP-0078\"."
 
-#: gajim/common/config.py:331
+#: gajim/common/config.py:332
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection. "
-"Can be 'warn', 'connect', 'disconnect'"
+"Can be 'warn', 'connect' or 'disconnect'."
 msgstr ""
 "Warnmeldung anzeigen, bevor das Passwort über eine unverschlüsselte "
-"Verbindung übertragen wird. Mögliche Optionen sind 'warn', 'connect', "
-"'disconnect'"
+"Verbindung übertragen wird. Mögliche Optionen sind \"warn\", \"connect\" "
+"oder \"disconnect\"."
 
-#: gajim/common/config.py:332
+#: gajim/common/config.py:333
 msgid "Show a warning dialog before using standard SSL library."
 msgstr ""
 "Warnmeldung anzeigen, bevor die Standard-SSL-Bibliothek verwendet wird."
 
-#: gajim/common/config.py:333
+#: gajim/common/config.py:334
 msgid ""
 "Show a warning dialog before sending PLAIN password over a plain connection."
 msgstr ""
 "Warnmeldung anzeigen, bevor das UNVERSCHLÜSSELTE Passwort über eine "
 "unsichere Verbindung übertragen wird."
 
-#: gajim/common/config.py:334
-msgid "Space separated list of ssl errors to ignore."
-msgstr ""
-"Durch Leerzeichen getrennte Liste der SSL-Fehler, die zu ignorieren sind."
+#: gajim/common/config.py:335
+msgid "List of SSL errors to ignore (space separated)."
+msgstr "Liste der zu ignorierenden SSL-Fehler (getrennt durch Leerzeichen)."
 
-#: gajim/common/config.py:340
+#: gajim/common/config.py:341
 msgid ""
-"Space separated list of JIDs for which you do not want to store logs. You "
-"can also add account name to log nothing for this account."
+"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 JIDs, für die keine Logs gespeichert "
-"werden. Sie können auch einen Kontonamen verwenden, um für das gesamte Konto "
-"nichts zu speichern."
+"Durch Leerzeichen getrennte Liste von XMPP-Adressen, für die kein "
+"Unterhaltungsverlauf gespeichert werden soll. Sie können auch einen "
+"Kontonamen verwenden, um für das gesamte Konto nichts zu speichern."
 
-#: gajim/common/config.py:341
+#: gajim/common/config.py:342
 msgid ""
-"Space separated list of JIDs for which you accept to not log conversations "
-"if he does not want to."
+"List of XMPP Addresses (space separated) for which you accept to not store "
+"chat history if your contact does not want to."
 msgstr ""
-"Durch Leerzeichen getrennte Liste von JIDs, für welche keine Logs "
-"gespeichert werden, falls der Benutzer dies wünscht."
-
-#: gajim/common/config.py:343
-msgid "Whitespace sent after inactivity"
-msgstr "Leerzeichen nach Untätigkeit senden"
+"Durch Leerzeichen getrennte Liste von XMPP-Adressen, für welche kein "
+"Unterhaltungsverlauf gespeichert werden soll, falls der Kontakt dies wünscht."
 
 #: gajim/common/config.py:344
-msgid "XMPP ping sent after inactivity"
-msgstr "XMPP-Ping nach Untätigkeit senden"
+msgid "If enabled, a whitespace is sent after inactivity (keep alive)."
+msgstr ""
+"Falls aktiviert, wird Gajim ein Leerzeichen nach Untätigkeit (keep alive) "
+"senden."
 
-#: gajim/common/config.py:348
+#: gajim/common/config.py:345
+msgid "If enabled, an XMPP ping is sent after inactivity (ping alive)."
+msgstr ""
+"Falls aktiviert, wird Gajim ein XMPP-Ping nach Untätigkeit (ping alive) "
+"senden."
+
+#: gajim/common/config.py:349
 msgid ""
-"How many seconds to wait for the answer of ping alive packet before trying "
-"to reconnect?"
+"How many seconds to wait for the answer of a ping alive packet before trying "
+"to reconnect."
 msgstr ""
-"Wie viele Sekunden soll auf eine Ping-Antwort gewartet werden, bevor ein "
-"neuer Verbindungsversuch gestartet wird?"
+"Wie viele Sekunden auf eine Ping-Antwort gewartet werden soll, bevor ein "
+"neuer Verbindungsversuch gestartet wird."
 
-#: gajim/common/config.py:352
-msgid "Jabberd2 workaround"
-msgstr "Jabberd2-Workaround"
+#: gajim/common/config.py:353
+msgid "Jabberd2 workaround."
+msgstr "Jabberd2-Workaround."
 
-#: gajim/common/config.py:355
+#: gajim/common/config.py:356
 msgid ""
-"If checked, Gajim will use your IP and proxies defined in "
-"file_transfer_proxies option for file transfer."
+"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 "
-"file_transfer_proxies Option definierten Proxys für den Dateitransfer "
+"\"file_transfer_proxies\"-Option definierten Proxies für den Dateitransfer "
 "verwenden."
 
-#: gajim/common/config.py:356
+#: gajim/common/config.py:357
 msgid ""
-"If true, Gajim will test file transfer proxies on startup to be sure it "
-"works. Openfire's proxies are known to fail this test even if they work."
+"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 ""
 "Falls aktiviert, wird Gajim die Proxies für Dateiübertragungen beim Starten "
 "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:369
-msgid "Answer to receipt requests"
-msgstr "Beantworte Anfragen zu Empfangsbestätigungen"
+"bei Openfire-Proxies immer fehlschlägt, auch wenn sie funktionieren."
 
 #: gajim/common/config.py:370
-msgid "Sent receipt requests"
-msgstr "Empfangsbestätigungen anfordern"
+msgid "If enabled, Gajim will answer to message receipt requests."
+msgstr ""
+"Falls aktiviert, wird Gajim Anfragen zur Empfangsbestätigung beantworten."
+
+#: gajim/common/config.py:371
+msgid "If enabled, Gajim will send message receipt requests."
+msgstr ""
+"Falls aktiviert, wird Gajim Anfragen zu Empfangsbestätigungen versenden."
 
-#: gajim/common/config.py:379
+#: gajim/common/config.py:380
 msgid ""
 "Allow Gajim to send information about the operating system you are running."
 msgstr "Erlaubt Gajim, Informationen über Ihr Betriebssystem zu übermitteln."
 
-#: gajim/common/config.py:380
+#: gajim/common/config.py:381
 msgid "Allow Gajim to send your local time."
 msgstr "Erlaubt Gajim, Ihre lokale Zeit zu übermitteln."
 
-#: gajim/common/config.py:383
-msgid "Message that is sent to contacts you want to add"
-msgstr "Nachricht, die an Kontakte gesendet wird, die Sie hinzufügen wollen"
-
 #: gajim/common/config.py:384
+msgid "Message that is sent to contacts you want to add."
+msgstr "Nachricht, die an Kontakte gesendet wird, die Sie hinzufügen wollen."
+
+#: gajim/common/config.py:385
 msgid ""
-"If enabled, Gajim will send your local IPs so your contact can connect to "
-"your machine to transfer files."
+"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 ihre lokale IP an Kontakte schicken, um "
 "Dateiübertragungen zu ermöglichen."
 
-#: gajim/common/config.py:385
+#: gajim/common/config.py:386
 msgid ""
-"Space separated list of JIDs for which chat window will be re-opened on next "
-"startup."
+"List of XMPP Addresses (space separated) for which the chat window will be "
+"re-opened on next startup."
 msgstr ""
-"Durch Leerzeichen getrennte Liste von JIDs, für welche das Chatfenster beim "
-"nächsten Start wieder geöffnet werden soll."
-
-#: gajim/common/config.py:387
-msgid "HTTP Upload: Enable HTTPS Verification"
-msgstr "HTTP Datei-Upload: HTTPS Zertifikat verifizieren"
+"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:388
+msgid "HTTP File Upload: Enable HTTPS Verification."
+msgstr "HTTP Datei-Upload: HTTPS-Zertifikat verifizieren."
+
+#: gajim/common/config.py:389
 msgid ""
-"Preferred file transfer mechanism for file drag&drop on chat window. Can be "
-"'httpupload' (default) or 'jingle'"
+"Preferred file transfer mechanism for file drag&drop on a chat window. Can "
+"be 'httpupload' (default) or 'jingle'."
 msgstr ""
 "Bevorzugte Methode für Dateiübertragungen per Ziehen und Ablegen auf das "
-"Chatfenster. Zur Verfügung stehen 'httpupload' (Standard) oder 'jingle'"
+"Chatfenster. Zur Verfügung stehen \"httpupload\" (Standard) oder \"jingle\"."
 
-#: gajim/common/config.py:389
-msgid "Allow cert verification with POSH"
-msgstr "Erlaube Zertifikatsvalidierung mit POSH"
-
-#: gajim/common/config.py:423 gajim/common/config.py:430
-msgid "Language for which misspelled words will be checked"
-msgstr "Sprache, die für die Rechtschreibprüfung verwendet werden soll"
-
-#: gajim/common/config.py:427
-msgid "The currently active encryption for that contact"
-msgstr "Die derzeit aktive Verschlüsselung für diesen Kontakt"
+#: gajim/common/config.py:390
+msgid "Allow certificate verification with POSH."
+msgstr "Erlaube Zertifikatsverifizierung mittels POSH."
 
-#: gajim/common/config.py:431
+#: gajim/common/config.py:425
 msgid ""
-"How many lines to request from server when entering a groupchat. -1 means no "
-"limit, -2 means global value"
+"Chat state notifications that are sent to contacts. Possible values: 'all', "
+"'composing_only', 'disabled'"
 msgstr ""
-"Wie viele der letzten Nachrichten sollen beim Beitreten eines Gruppenchats "
-"abgefragt werden? -1 bedeutet kein Limit, -2 bedeutet globale Einstellung"
+"Chatstatus-Benachrichtigungen, die an Kontakte gesendet werden. Mögliche "
+"Optionen sind \"all\", \"composing_only\" oder \"disabled\"."
+
+#: gajim/common/config.py:428
+msgid "The currently active encryption for that contact."
+msgstr "Die derzeit aktive Verschlüsselung für diesen Kontakt."
 
 #: gajim/common/config.py:432
 msgid ""
-"Minutes of backlog to request when entering a groupchat. -1 means no limit, "
-"-2 means global value"
+"If enabled, a notification is created for every message in this group chat."
 msgstr ""
-"Wie viele Minuten zurück sollen Nachrichten beim Beitreten eines "
-"Gruppenchats abgefragt werden? -1 bedeutet kein Limit, -2 bedeutet globale "
-"Einstellung"
+"Falls aktiviert, wird für jede Nachricht in diesem Gruppenchat eine "
+"Benachrichtigung angezeigt."
 
 #: gajim/common/config.py:433
-msgid "State whether a notification is created for every message in this room"
+msgid ""
+"Show a status message for all status changes (away, dnd, etc.) of users in a "
+"group chat."
 msgstr ""
-"Geben Sie an, ob für jede Nachricht in diesem Gruppenchat eine "
-"Benachrichtigung angezeigt werden soll"
+"Statusnachricht für jede Statusänderung (abwesend, nicht stören, etc.) von "
+"Nutzern in einem Gruppenchat anzeigen."
 
 #: gajim/common/config.py:434
-msgid ""
-"Show a status message for all status (away, dnd, etc.) changes of users in a "
-"group chat"
+msgid "Show a status message for every join or leave in a group chat."
 msgstr ""
-"Statusnachricht für jede Statusänderung (Abwesend, Nicht stören, etc.) von "
-"Nutzern in einem Gruppenchat anzeigen"
+"Status-Benachrichtigung für jedes Beitreten oder Verlassen in einem "
+"Gruppenchat anzeigen."
 
 #: gajim/common/config.py:435
-msgid "Show a status message for every join or leave in a group chat"
+msgid ""
+"If enabled, the group chat is minimized into the contact list when joining "
+"automatically."
 msgstr ""
-"Status-Benachrichtigung für jedes Beitreten oder Verlassen in einem "
-"Gruppenchat anzeigen"
+"Falls aktiviert, wird der Gruppenchat beim automatischen Beitreten in die "
+"Kontaktliste minimiert."
 
 #: gajim/common/config.py:436
-msgid "If the group chat is minimized into the roster on autojoin"
+msgid ""
+"If enabled, the group chat is minimized into the contact list when closing "
+"it."
 msgstr ""
-"Ob der Gruppenchat beim automatischen Beitreten in die Kontaktliste "
-"minimiert werden soll"
+"Falls aktiviert, wird der Gruppenchat beim Schließen in die Kontaktliste "
+"minimiert."
 
 #: gajim/common/config.py:437
-msgid "If the group chat is minimized into the roster on close"
+msgid ""
+"Chat state notifications that are sent to the group chat. Possible values: "
+"'all', 'composing_only' or 'disabled'."
 msgstr ""
-"Ob der Gruppenchat beim Schließen in die Kontaktliste minimiert werden soll"
+"Chatstatus-Benachrichtigungen, die an den Gruppenchat gesendet werden "
+"sollen. Mögliche Optionen sind \"all\", \"composing_only\" oder \"disabled\"."
 
-#: gajim/common/config.py:441
+#: gajim/common/config.py:440
 msgid ""
-"State whether plugins should be activated on startup (this is saved on Gajim "
-"exit). This option SHOULD NOT be used to (de)activate plug-ins. Use GUI "
-"instead."
+"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 ""
-"Gibt an, ob Plugins beim Starten aktiviert werden sollen (wird beim Beenden "
+"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 statttdessen die GUI."
+"zu (de-)aktivieren. Benutzen Sie dafür stattdessen die GUI."
 
-#: gajim/common/config.py:446 gajim/common/const.py:281
+#: gajim/common/config.py:445 gajim/common/const.py:315
 msgid "Sleeping"
 msgstr "Schlafen"
 
-#: gajim/common/config.py:447
+#: gajim/common/config.py:446
 msgid "Back soon"
 msgstr "Bin gleich wieder da"
 
-#: gajim/common/config.py:447
+#: gajim/common/config.py:446
 msgid "Back in some minutes."
 msgstr "Bin in ein paar Minuten zurück."
 
-#: gajim/common/config.py:448 gajim/common/const.py:247
+#: gajim/common/config.py:447 gajim/common/const.py:281
 msgid "Eating"
 msgstr "Essen"
 
-#: gajim/common/config.py:448
-msgid "I'm eating, so leave me a message."
-msgstr "Ich esse gerade, bitte hinterlasse eine Nachricht."
+#: gajim/common/config.py:447
+msgid "I'm eating."
+msgstr "Ich esse gerade."
 
-#: gajim/common/config.py:449
+#: gajim/common/config.py:448
 msgid "Movie"
 msgstr "Film"
 
-#: gajim/common/config.py:449
+#: gajim/common/config.py:448
 msgid "I'm watching a movie."
 msgstr "Ich sehe mir einen Film an."
 
-#: gajim/common/config.py:450 gajim/common/const.py:314
+#: gajim/common/config.py:449 gajim/common/const.py:348
 msgid "Working"
 msgstr "Arbeiten"
 
-#: gajim/common/config.py:450
+#: gajim/common/config.py:449
 msgid "I'm working."
 msgstr "Ich arbeite."
 
-#: gajim/common/config.py:451
+#: gajim/common/config.py:450
 msgid "Phone"
 msgstr "Telefon"
 
-#: gajim/common/config.py:451
+#: gajim/common/config.py:450
 msgid "I'm on the phone."
 msgstr "Ich telefoniere gerade."
 
-#: gajim/common/config.py:452
+#: gajim/common/config.py:451
 msgid "Out"
 msgstr "Draußen"
 
-#: gajim/common/config.py:452
+#: gajim/common/config.py:451
 msgid "I'm out enjoying life."
 msgstr "Ich bin draußen und genieße das Leben."
 
-#: gajim/common/config.py:463
+#: gajim/common/config.py:462
 msgid "I'm available."
 msgstr "Ich bin angemeldet."
 
-#: gajim/common/config.py:464
+#: gajim/common/config.py:463
 msgid "I'm free for chat."
 msgstr "Ich bin frei zum Chatten."
 
-#: gajim/common/config.py:465 gajim/gtk/accounts.py:134
+#: gajim/common/config.py:464 gajim/gtk/accounts.py:133
 msgid "Be right back."
 msgstr "Bin gleich zurück."
 
-#: gajim/common/config.py:466
+#: gajim/common/config.py:465
 msgid "I'm not available."
 msgstr "Ich bin nicht verfügbar."
 
-#: gajim/common/config.py:467
+#: gajim/common/config.py:466
 msgid "Do not disturb."
 msgstr "Bitte nicht stören."
 
-#: gajim/common/config.py:468 gajim/common/config.py:469
+#: gajim/common/config.py:467 gajim/common/config.py:468
 msgid "Bye!"
 msgstr "Auf Wiedersehen!"
 
-#: gajim/common/config.py:480
+#: gajim/common/config.py:479
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
-"muc_highlight_words, or when a group chat message contains your nickname."
+"'muc_highlight_words' 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 Ihren Spitznamen enthält."
 
-#: gajim/common/config.py:481
-msgid "Sound to play when any MUC message arrives."
+#: gajim/common/config.py:480
+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:485
+#: gajim/common/config.py:484
 msgid "Tor"
 msgstr "Tor"
 
@@ -4068,13 +4022,94 @@ msgstr "Tor"
 msgid "Error: cannot open %s for reading"
 msgstr "Fehler: Kann %s kann nicht zum Lesen öffnen"
 
-#: gajim/common/const.py:214
+#: gajim/common/const.py:216
+msgid "?Group chat name:Team"
+msgstr "Team"
+
+#: gajim/common/const.py:217
+msgid "?Group chat description:Project discussion"
+msgstr "Projektdiskussion"
+
+#: gajim/common/const.py:218
+msgid "?Group chat address:team"
+msgstr "team"
+
+#: gajim/common/const.py:219
+msgid "?Group chat name:Family"
+msgstr "Familie"
+
+#: gajim/common/const.py:220
+msgid "?Group chat description:Spring gathering"
+msgstr "Treffen im Frühjahr"
+
+#: gajim/common/const.py:221
+msgid "?Group chat address:family"
+msgstr "familie"
+
+#: gajim/common/const.py:222
+msgid "?Group chat name:Vacation"
+msgstr "Urlaub"
+
+#: gajim/common/const.py:223
+msgid "?Group chat description:Trip planning"
+msgstr "Reiseplanung"
+
+#: gajim/common/const.py:224
+msgid "?Group chat address:vacation"
+msgstr "urlaub"
+
+#: gajim/common/const.py:225
+msgid "?Group chat name:Repairs"
+msgstr "Reparaturen"
+
+#: gajim/common/const.py:226
+msgid "?Group chat description:Local help group"
+msgstr "Lokale Selbsthilfegruppe"
+
+#: gajim/common/const.py:227
+msgid "?Group chat address:repairs"
+msgstr "reparaturen"
+
+#: gajim/common/const.py:228
+msgid "?Group chat name:News"
+msgstr "Nachrichten"
+
+#: gajim/common/const.py:229
+msgid "?Group chat description:Local news and reports"
+msgstr "Lokale Nachrichten und Berichte"
+
+#: gajim/common/const.py:230
+msgid "?Group chat address:news"
+msgstr "nachrichten"
+
+#: gajim/common/const.py:235
+msgid "Remote server not found"
+msgstr "Server nicht gefunden"
+
+#: gajim/common/const.py:236
+msgid "Remote server timeout"
+msgstr "Server Zeitüberschreitung"
+
+#: gajim/common/const.py:237 gajim/common/const.py:238
+#: gajim/common/const.py:239
+msgid "Address does not belong to a group chat server"
+msgstr "Unter dieser Adresse befindet sich kein Gruppenchat-Server"
+
+#: gajim/common/const.py:240
+msgid "Group chat already exists"
+msgstr "Gruppenchat ist bereits vorhanden"
+
+#: gajim/common/const.py:241
+msgid "Group chat does not exist"
+msgstr "Gruppenchat existiert nicht"
+
+#: gajim/common/const.py:247
 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:217
+#: gajim/common/const.py:250
 msgid ""
 "This message was encrypted with Legacy OpenPGP and could not be decrypted. "
 "You can install the PGP plugin to handle those messages."
@@ -4083,868 +4118,870 @@ msgstr ""
 "entschlüsselt werden. Sie können das PGP-Plugin installieren, das solche "
 "Nachrichten verarbeiten kann."
 
-#: gajim/common/const.py:221
+#: gajim/common/const.py:254
 msgid ""
-"This message was encrypted with OpenPGP for XMPP and could not be decrypted."
+"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."
+"entschlüsselt werden. Sie können das OpemPGP-Plugin installieren, das solche "
+"Nachrichten verarbeiten kann."
 
-#: gajim/common/const.py:224
+#: gajim/common/const.py:258
 #, 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:231
+#: gajim/common/const.py:265
 msgid "Doing Chores"
 msgstr "Haushalt erledigen"
 
-#: gajim/common/const.py:232
+#: gajim/common/const.py:266
 msgid "Buying Groceries"
 msgstr "Lebensmittel einkaufen"
 
-#: gajim/common/const.py:233
+#: gajim/common/const.py:267
 msgid "Cleaning"
 msgstr "Putzen"
 
-#: gajim/common/const.py:234
+#: gajim/common/const.py:268
 msgid "Cooking"
 msgstr "Kochen"
 
-#: gajim/common/const.py:235
+#: gajim/common/const.py:269
 msgid "Doing Maintenance"
 msgstr "Instandhaltung"
 
-#: gajim/common/const.py:236
+#: gajim/common/const.py:270
 msgid "Doing the Dishes"
 msgstr "Geschirrspülen"
 
-#: gajim/common/const.py:237
+#: gajim/common/const.py:271
 msgid "Doing the Laundry"
 msgstr "Wäschewaschen"
 
-#: gajim/common/const.py:238
+#: gajim/common/const.py:272
 msgid "Gardening"
 msgstr "Gartenarbeit"
 
-#: gajim/common/const.py:239
+#: gajim/common/const.py:273
 msgid "Running an Errand"
 msgstr "Besorgungen machen"
 
-#: gajim/common/const.py:240
+#: gajim/common/const.py:274
 msgid "Walking the Dog"
 msgstr "Mit dem Hund draußen"
 
-#: gajim/common/const.py:242
+#: gajim/common/const.py:276
 msgid "Drinking"
 msgstr "Etwas trinken"
 
-#: gajim/common/const.py:243
+#: gajim/common/const.py:277
 msgid "Having a Beer"
 msgstr "Bier trinken"
 
-#: gajim/common/const.py:244
+#: gajim/common/const.py:278
 msgid "Having Coffee"
 msgstr "Kaffee trinken"
 
-#: gajim/common/const.py:245
+#: gajim/common/const.py:279
 msgid "Having Tea"
 msgstr "Tee trinken"
 
-#: gajim/common/const.py:248
+#: gajim/common/const.py:282
 msgid "Having a Snack"
 msgstr "Zwischenmahlzeit"
 
-#: gajim/common/const.py:249
+#: gajim/common/const.py:283
 msgid "Having Breakfast"
 msgstr "Frühstücken"
 
-#: gajim/common/const.py:250
+#: gajim/common/const.py:284
 msgid "Having Dinner"
 msgstr "Abendessen"
 
-#: gajim/common/const.py:251
+#: gajim/common/const.py:285
 msgid "Having Lunch"
 msgstr "Mittagessen"
 
-#: gajim/common/const.py:253
+#: gajim/common/const.py:287
 msgid "Exercising"
 msgstr "Sport machen"
 
-#: gajim/common/const.py:254 gajim/common/const.py:305
+#: gajim/common/const.py:288 gajim/common/const.py:339
 msgid "Cycling"
 msgstr "Radfahren"
 
-#: gajim/common/const.py:255
+#: gajim/common/const.py:289
 msgid "Dancing"
 msgstr "Tanzen"
 
-#: gajim/common/const.py:256
+#: gajim/common/const.py:290
 msgid "Hiking"
 msgstr "Wandern"
 
-#: gajim/common/const.py:257
+#: gajim/common/const.py:291
 msgid "Jogging"
 msgstr "Joggen"
 
-#: gajim/common/const.py:258
+#: gajim/common/const.py:292
 msgid "Playing Sports"
 msgstr "Beim Sport"
 
-#: gajim/common/const.py:259
+#: gajim/common/const.py:293
 msgid "Running"
 msgstr "Laufen"
 
-#: gajim/common/const.py:260
+#: gajim/common/const.py:294
 msgid "Skiing"
 msgstr "Skifahren"
 
-#: gajim/common/const.py:261
+#: gajim/common/const.py:295
 msgid "Swimming"
 msgstr "Schwimmen"
 
-#: gajim/common/const.py:262
+#: gajim/common/const.py:296
 msgid "Working out"
 msgstr "Trainieren"
 
-#: gajim/common/const.py:264
+#: gajim/common/const.py:298
 msgid "Grooming"
 msgstr "Körperpflege"
 
-#: gajim/common/const.py:265
+#: gajim/common/const.py:299
 msgid "At the Spa"
 msgstr "Im Bad"
 
-#: gajim/common/const.py:266
+#: gajim/common/const.py:300
 msgid "Brushing Teeth"
 msgstr "Zähneputzen"
 
-#: gajim/common/const.py:267
+#: gajim/common/const.py:301
 msgid "Getting a Haircut"
 msgstr "Beim Frisör"
 
-#: gajim/common/const.py:268
+#: gajim/common/const.py:302
 msgid "Shaving"
 msgstr "Rasieren"
 
-#: gajim/common/const.py:269
+#: gajim/common/const.py:303
 msgid "Taking a Bath"
 msgstr "Ein Bad nehmen"
 
-#: gajim/common/const.py:270
+#: gajim/common/const.py:304
 msgid "Taking a Shower"
 msgstr "Unter der Dusche"
 
-#: gajim/common/const.py:272
+#: gajim/common/const.py:306
 msgid "Having an Appointment"
 msgstr "Termin"
 
-#: gajim/common/const.py:274
+#: gajim/common/const.py:308
 msgid "Inactive"
 msgstr "Inaktiv"
 
-#: gajim/common/const.py:275
+#: gajim/common/const.py:309
 msgid "Day Off"
 msgstr "Freier Tag"
 
-#: gajim/common/const.py:276
+#: gajim/common/const.py:310
 msgid "Hanging out"
 msgstr "Rumhängen"
 
-#: gajim/common/const.py:277
+#: gajim/common/const.py:311
 msgid "Hiding"
 msgstr "Verstecken"
 
-#: gajim/common/const.py:278
+#: gajim/common/const.py:312
 msgid "On Vacation"
 msgstr "Im Urlaub"
 
-#: gajim/common/const.py:279
+#: gajim/common/const.py:313
 msgid "Praying"
 msgstr "Beten"
 
-#: gajim/common/const.py:280
+#: gajim/common/const.py:314
 msgid "Scheduled Holiday"
 msgstr "Geplanter Urlaub"
 
-#: gajim/common/const.py:282
+#: gajim/common/const.py:316
 msgid "Thinking"
 msgstr "Nachdenken"
 
-#: gajim/common/const.py:284
+#: gajim/common/const.py:318
 msgid "Relaxing"
 msgstr "Entspannen"
 
-#: gajim/common/const.py:285
+#: gajim/common/const.py:319
 msgid "Fishing"
 msgstr "Angeln"
 
-#: gajim/common/const.py:286
+#: gajim/common/const.py:320
 msgid "Gaming"
 msgstr "Spielen"
 
-#: gajim/common/const.py:287
+#: gajim/common/const.py:321
 msgid "Going out"
 msgstr "Ausgehen"
 
-#: gajim/common/const.py:288
+#: gajim/common/const.py:322
 msgid "Partying"
 msgstr "Feiern"
 
-#: gajim/common/const.py:289
+#: gajim/common/const.py:323
 msgid "Reading"
 msgstr "Lesen"
 
-#: gajim/common/const.py:290
+#: gajim/common/const.py:324
 msgid "Rehearsing"
 msgstr "Studieren"
 
-#: gajim/common/const.py:291
+#: gajim/common/const.py:325
 msgid "Shopping"
 msgstr "Shoppen"
 
-#: gajim/common/const.py:292
+#: gajim/common/const.py:326
 msgid "Smoking"
 msgstr "Rauchen"
 
-#: gajim/common/const.py:293
+#: gajim/common/const.py:327
 msgid "Socializing"
 msgstr "Unter Leuten"
 
-#: gajim/common/const.py:294
+#: gajim/common/const.py:328
 msgid "Sunbathing"
 msgstr "Sonnenbaden"
 
-#: gajim/common/const.py:295
+#: gajim/common/const.py:329
 msgid "Watching TV"
 msgstr "Fernsehen"
 
-#: gajim/common/const.py:296
+#: gajim/common/const.py:330
 msgid "Watching a Movie"
 msgstr "Film schauen"
 
-#: gajim/common/const.py:298
+#: gajim/common/const.py:332
 msgid "Talking"
 msgstr "Im Gespräch"
 
-#: gajim/common/const.py:299
+#: gajim/common/const.py:333
 msgid "In Real Life"
 msgstr "Im echten Leben"
 
-#: gajim/common/const.py:300
+#: gajim/common/const.py:334
 msgid "On the Phone"
 msgstr "Am Telefon"
 
-#: gajim/common/const.py:301
+#: gajim/common/const.py:335
 msgid "On Video Phone"
 msgstr "Am Videotelefon"
 
-#: gajim/common/const.py:303
+#: gajim/common/const.py:337
 msgid "Traveling"
 msgstr "Reisen"
 
-#: gajim/common/const.py:304
+#: gajim/common/const.py:338
 msgid "Commuting"
 msgstr "Pendeln"
 
-#: gajim/common/const.py:306
+#: gajim/common/const.py:340
 msgid "Driving"
 msgstr "Fahren"
 
-#: gajim/common/const.py:307
+#: gajim/common/const.py:341
 msgid "In a Car"
 msgstr "Im Auto"
 
-#: gajim/common/const.py:308
+#: gajim/common/const.py:342
 msgid "On a Bus"
 msgstr "Im Bus"
 
-#: gajim/common/const.py:309
+#: gajim/common/const.py:343
 msgid "On a Plane"
 msgstr "Im Flugzeug"
 
-#: gajim/common/const.py:310
+#: gajim/common/const.py:344
 msgid "On a Train"
 msgstr "Im Zug"
 
-#: gajim/common/const.py:311
+#: gajim/common/const.py:345
 msgid "On a Trip"
 msgstr "Auf einer Reise"
 
-#: gajim/common/const.py:312
+#: gajim/common/const.py:346
 msgid "Walking"
 msgstr "Spazierengehen"
 
-#: gajim/common/const.py:315
+#: gajim/common/const.py:349
 msgid "Coding"
 msgstr "Programmieren"
 
-#: gajim/common/const.py:316
+#: gajim/common/const.py:350
 msgid "In a Meeting"
 msgstr "In einer Besprechung"
 
-#: gajim/common/const.py:317
+#: gajim/common/const.py:351
 msgid "Studying"
 msgstr "Lernen"
 
-#: gajim/common/const.py:318
+#: gajim/common/const.py:352
 msgid "Writing"
 msgstr "Schreiben"
 
-#: gajim/common/const.py:321
+#: gajim/common/const.py:355
 msgid "Afraid"
 msgstr "Verängstigt"
 
-#: gajim/common/const.py:322
+#: gajim/common/const.py:356
 msgid "Amazed"
 msgstr "Verblüfft"
 
-#: gajim/common/const.py:323
+#: gajim/common/const.py:357
 msgid "Amorous"
 msgstr "Verliebt"
 
-#: gajim/common/const.py:324
+#: gajim/common/const.py:358
 msgid "Angry"
 msgstr "Wütend"
 
-#: gajim/common/const.py:325
+#: gajim/common/const.py:359
 msgid "Annoyed"
 msgstr "Ärgerlich"
 
-#: gajim/common/const.py:326
+#: gajim/common/const.py:360
 msgid "Anxious"
 msgstr "Ängstlich"
 
-#: gajim/common/const.py:327
+#: gajim/common/const.py:361
 msgid "Aroused"
 msgstr "Erregt"
 
-#: gajim/common/const.py:328
+#: gajim/common/const.py:362
 msgid "Ashamed"
 msgstr "Beschämt"
 
-#: gajim/common/const.py:329
+#: gajim/common/const.py:363
 msgid "Bored"
 msgstr "Gelangweilt"
 
-#: gajim/common/const.py:330
+#: gajim/common/const.py:364
 msgid "Brave"
 msgstr "Tapfer"
 
-#: gajim/common/const.py:331
+#: gajim/common/const.py:365
 msgid "Calm"
 msgstr "Gelassen"
 
-#: gajim/common/const.py:332
+#: gajim/common/const.py:366
 msgid "Cautious"
 msgstr "Vorsichtig"
 
-#: gajim/common/const.py:333
+#: gajim/common/const.py:367
 msgid "Cold"
 msgstr "Kalt"
 
-#: gajim/common/const.py:334
+#: gajim/common/const.py:368
 msgid "Confident"
 msgstr "Zuversichtlich"
 
-#: gajim/common/const.py:335
+#: gajim/common/const.py:369
 msgid "Confused"
 msgstr "Verwirrt"
 
-#: gajim/common/const.py:336
+#: gajim/common/const.py:370
 msgid "Contemplative"
 msgstr "Nachdenklich"
 
-#: gajim/common/const.py:337
+#: gajim/common/const.py:371
 msgid "Contented"
 msgstr "Zufrieden"
 
-#: gajim/common/const.py:338
+#: gajim/common/const.py:372
 msgid "Cranky"
 msgstr "Reizbar"
 
-#: gajim/common/const.py:339
+#: gajim/common/const.py:373
 msgid "Crazy"
 msgstr "Verrückt"
 
-#: gajim/common/const.py:340
+#: gajim/common/const.py:374
 msgid "Creative"
 msgstr "Kreativ"
 
-#: gajim/common/const.py:341
+#: gajim/common/const.py:375
 msgid "Curious"
 msgstr "Neugierig"
 
-#: gajim/common/const.py:342
+#: gajim/common/const.py:376
 msgid "Dejected"
 msgstr "Niedergeschlagen"
 
-#: gajim/common/const.py:343
+#: gajim/common/const.py:377
 msgid "Depressed"
 msgstr "Deprimiert"
 
-#: gajim/common/const.py:344
+#: gajim/common/const.py:378
 msgid "Disappointed"
 msgstr "Enttäuscht"
 
-#: gajim/common/const.py:345
+#: gajim/common/const.py:379
 msgid "Disgusted"
 msgstr "Angewidert"
 
-#: gajim/common/const.py:346
+#: gajim/common/const.py:380
 msgid "Dismayed"
 msgstr "Betroffen"
 
-#: gajim/common/const.py:347
+#: gajim/common/const.py:381
 msgid "Distracted"
 msgstr "Abgelenkt"
 
-#: gajim/common/const.py:348
+#: gajim/common/const.py:382
 msgid "Embarrassed"
 msgstr "Verlegen"
 
-#: gajim/common/const.py:349
+#: gajim/common/const.py:383
 msgid "Envious"
 msgstr "Neidisch"
 
-#: gajim/common/const.py:350
+#: gajim/common/const.py:384
 msgid "Excited"
 msgstr "Aufgeregt"
 
-#: gajim/common/const.py:351
+#: gajim/common/const.py:385
 msgid "Flirtatious"
 msgstr "Kokett"
 
-#: gajim/common/const.py:352
+#: gajim/common/const.py:386
 msgid "Frustrated"
 msgstr "Frustriert"
 
-#: gajim/common/const.py:353
+#: gajim/common/const.py:387
 msgid "Grateful"
 msgstr "Dankbar"
 
-#: gajim/common/const.py:354
+#: gajim/common/const.py:388
 msgid "Grieving"
 msgstr "Bekümmert"
 
-#: gajim/common/const.py:355
+#: gajim/common/const.py:389
 msgid "Grumpy"
 msgstr "Mürrisch"
 
-#: gajim/common/const.py:356
+#: gajim/common/const.py:390
 msgid "Guilty"
 msgstr "Schuldbewusst"
 
-#: gajim/common/const.py:357
+#: gajim/common/const.py:391
 msgid "Happy"
 msgstr "Fröhlich"
 
-#: gajim/common/const.py:358
+#: gajim/common/const.py:392
 msgid "Hopeful"
 msgstr "Hoffnungsvoll"
 
-#: gajim/common/const.py:359
+#: gajim/common/const.py:393
 msgid "Hot"
 msgstr "Heiß"
 
-#: gajim/common/const.py:360
+#: gajim/common/const.py:394
 msgid "Humbled"
 msgstr "Demütig"
 
-#: gajim/common/const.py:361
+#: gajim/common/const.py:395
 msgid "Humiliated"
 msgstr "Gedemütigt"
 
-#: gajim/common/const.py:362
+#: gajim/common/const.py:396
 msgid "Hungry"
 msgstr "Hungrig"
 
-#: gajim/common/const.py:363
+#: gajim/common/const.py:397
 msgid "Hurt"
 msgstr "Verletzt"
 
-#: gajim/common/const.py:364
+#: gajim/common/const.py:398
 msgid "Impressed"
 msgstr "Beeindruckt"
 
-#: gajim/common/const.py:365
+#: gajim/common/const.py:399
 msgid "In Awe"
 msgstr "Bewundernd"
 
-#: gajim/common/const.py:366
+#: gajim/common/const.py:400
 msgid "In Love"
 msgstr "Verliebt"
 
-#: gajim/common/const.py:367
+#: gajim/common/const.py:401
 msgid "Indignant"
 msgstr "Entrüstet"
 
-#: gajim/common/const.py:368
+#: gajim/common/const.py:402
 msgid "Interested"
 msgstr "Interessiert"
 
-#: gajim/common/const.py:369
+#: gajim/common/const.py:403
 msgid "Intoxicated"
 msgstr "Berauscht"
 
-#: gajim/common/const.py:370
+#: gajim/common/const.py:404
 msgid "Invincible"
 msgstr "Unbesiegbar"
 
-#: gajim/common/const.py:371
+#: gajim/common/const.py:405
 msgid "Jealous"
 msgstr "Neidisch"
 
-#: gajim/common/const.py:372
+#: gajim/common/const.py:406
 msgid "Lonely"
 msgstr "Einsam"
 
-#: gajim/common/const.py:373
+#: gajim/common/const.py:407
 msgid "Lost"
 msgstr "Verloren"
 
-#: gajim/common/const.py:374
+#: gajim/common/const.py:408
 msgid "Lucky"
 msgstr "Glücklich"
 
-#: gajim/common/const.py:375
+#: gajim/common/const.py:409
 msgid "Mean"
 msgstr "Gemein"
 
-#: gajim/common/const.py:376
+#: gajim/common/const.py:410
 msgid "Moody"
 msgstr "Launisch"
 
-#: gajim/common/const.py:377
+#: gajim/common/const.py:411
 msgid "Nervous"
 msgstr "Nervös"
 
-#: gajim/common/const.py:378
+#: gajim/common/const.py:412
 msgid "Neutral"
 msgstr "Neutral"
 
-#: gajim/common/const.py:379
+#: gajim/common/const.py:413
 msgid "Offended"
 msgstr "Beleidigt"
 
-#: gajim/common/const.py:380
+#: gajim/common/const.py:414
 msgid "Outraged"
 msgstr "Empört"
 
-#: gajim/common/const.py:381
+#: gajim/common/const.py:415
 msgid "Playful"
 msgstr "Scherzhaft"
 
-#: gajim/common/const.py:382
+#: gajim/common/const.py:416
 msgid "Proud"
 msgstr "Stolz"
 
-#: gajim/common/const.py:383
+#: gajim/common/const.py:417
 msgid "Relaxed"
 msgstr "Entspannt"
 
-#: gajim/common/const.py:384
+#: gajim/common/const.py:418
 msgid "Relieved"
 msgstr "Erleichtert"
 
-#: gajim/common/const.py:385
+#: gajim/common/const.py:419
 msgid "Remorseful"
 msgstr "Reuevoll"
 
-#: gajim/common/const.py:386
+#: gajim/common/const.py:420
 msgid "Restless"
 msgstr "Ruhelos"
 
-#: gajim/common/const.py:387
+#: gajim/common/const.py:421
 msgid "Sad"
 msgstr "Traurig"
 
-#: gajim/common/const.py:388
+#: gajim/common/const.py:422
 msgid "Sarcastic"
 msgstr "Sarkastisch"
 
-#: gajim/common/const.py:389
+#: gajim/common/const.py:423
 msgid "Satisfied"
 msgstr "Zufrieden"
 
-#: gajim/common/const.py:390
+#: gajim/common/const.py:424
 msgid "Serious"
 msgstr "Ernst"
 
-#: gajim/common/const.py:391
+#: gajim/common/const.py:425
 msgid "Shocked"
 msgstr "Geschockt"
 
-#: gajim/common/const.py:392
+#: gajim/common/const.py:426
 msgid "Shy"
 msgstr "Schüchtern"
 
-#: gajim/common/const.py:393
+#: gajim/common/const.py:427
 msgid "Sick"
 msgstr "Krank"
 
-#: gajim/common/const.py:394
+#: gajim/common/const.py:428
 msgid "Sleepy"
 msgstr "Müde"
 
-#: gajim/common/const.py:395
+#: gajim/common/const.py:429
 msgid "Spontaneous"
 msgstr "Spontan"
 
-#: gajim/common/const.py:396
+#: gajim/common/const.py:430
 msgid "Stressed"
 msgstr "Gestresst"
 
-#: gajim/common/const.py:397
+#: gajim/common/const.py:431
 msgid "Strong"
 msgstr "Stark"
 
-#: gajim/common/const.py:398
+#: gajim/common/const.py:432
 msgid "Surprised"
 msgstr "Überrascht"
 
-#: gajim/common/const.py:399
+#: gajim/common/const.py:433
 msgid "Thankful"
 msgstr "Dankbar"
 
-#: gajim/common/const.py:400
+#: gajim/common/const.py:434
 msgid "Thirsty"
 msgstr "Durstig"
 
-#: gajim/common/const.py:401
+#: gajim/common/const.py:435
 msgid "Tired"
 msgstr "Müde"
 
-#: gajim/common/const.py:402
+#: gajim/common/const.py:436
 msgid "Undefined"
 msgstr "Undefiniert"
 
-#: gajim/common/const.py:403
+#: gajim/common/const.py:437
 msgid "Weak"
 msgstr "Schwach"
 
-#: gajim/common/const.py:404
+#: gajim/common/const.py:438
 msgid "Worried"
 msgstr "Besorgt"
 
-#: gajim/common/const.py:408
+#: gajim/common/const.py:442
 msgid "accuracy"
 msgstr "Genauigkeit"
 
-#: gajim/common/const.py:409
+#: gajim/common/const.py:443
 msgid "alt"
 msgstr "Höhe"
 
-#: gajim/common/const.py:410
+#: gajim/common/const.py:444
 msgid "area"
 msgstr "Gebiet"
 
-#: gajim/common/const.py:411
+#: gajim/common/const.py:445
 msgid "bearing"
 msgstr "Peilung"
 
-#: gajim/common/const.py:412
+#: gajim/common/const.py:446
 msgid "building"
 msgstr "Gebäude"
 
-#: gajim/common/const.py:413
+#: gajim/common/const.py:447
 msgid "country"
 msgstr "Land"
 
-#: gajim/common/const.py:414
+#: gajim/common/const.py:448
 msgid "countrycode"
 msgstr "Landeskürzel"
 
-#: gajim/common/const.py:415
+#: gajim/common/const.py:449
 msgid "datum"
 msgstr "Datum"
 
-#: gajim/common/const.py:416
+#: gajim/common/const.py:450
 msgid "description"
 msgstr "Beschreibung"
 
-#: gajim/common/const.py:417
+#: gajim/common/const.py:451
 msgid "error"
 msgstr "Fehler"
 
-#: gajim/common/const.py:418
+#: gajim/common/const.py:452
 msgid "floor"
 msgstr "Etage"
 
-#: gajim/common/const.py:419
+#: gajim/common/const.py:453
 msgid "lat"
 msgstr "Breitengrad"
 
-#: gajim/common/const.py:420
+#: gajim/common/const.py:454
 msgid "locality"
 msgstr "Ortschaft"
 
-#: gajim/common/const.py:421
+#: gajim/common/const.py:455
 msgid "lon"
 msgstr "Länge"
 
-#: gajim/common/const.py:422
+#: gajim/common/const.py:456
 msgid "postalcode"
 msgstr "Postleitzahl"
 
-#: gajim/common/const.py:423
+#: gajim/common/const.py:457
 msgid "region"
 msgstr "Region"
 
-#: gajim/common/const.py:424
+#: gajim/common/const.py:458
 msgid "room"
 msgstr "Raum"
 
-#: gajim/common/const.py:425
+#: gajim/common/const.py:459
 msgid "speed"
 msgstr "Geschwindigkeit"
 
-#: gajim/common/const.py:426
+#: gajim/common/const.py:460
 msgid "street"
 msgstr "Straße"
 
-#: gajim/common/const.py:427
+#: gajim/common/const.py:461
 msgid "text"
 msgstr "Text"
 
-#: gajim/common/const.py:428
+#: gajim/common/const.py:462
 msgid "timestamp"
 msgstr "Zeitstempel"
 
-#: gajim/common/const.py:429
+#: gajim/common/const.py:463
 msgid "URI"
 msgstr "URI"
 
-#: gajim/common/const.py:434
+#: gajim/common/const.py:468
 msgid "Unable to get issuer certificate"
 msgstr "Das Zertifikat des Ausstellers ist nicht verfügbar"
 
-#: gajim/common/const.py:435
+#: gajim/common/const.py:469
 msgid "Unable to get certificate CRL"
 msgstr "Die Zertifikats-CRL ist nicht verfügbar"
 
-#: gajim/common/const.py:436
+#: gajim/common/const.py:470
 msgid "Unable to decrypt certificate's signature"
 msgstr "Die Signatur des Zertifikats konnte nicht entschlüsselt werden"
 
-#: gajim/common/const.py:437
+#: gajim/common/const.py:471
 msgid "Unable to decrypt CRL's signature"
 msgstr "Die CRL-Unterschrift konnte nicht entschlüsselt werden"
 
-#: gajim/common/const.py:438
+#: gajim/common/const.py:472
 msgid "Unable to decode issuer public key"
 msgstr ""
 "Der öffentliche Schlüssel des Ausstellers konnte nicht decodiert werden"
 
-#: gajim/common/const.py:439
+#: gajim/common/const.py:473
 msgid "Certificate signature failure"
 msgstr "Fehler in der Zertifikat-Unterschrift"
 
-#: gajim/common/const.py:440
+#: gajim/common/const.py:474
 msgid "CRL signature failure"
 msgstr "Fehler bei der CRL-Unterschrift"
 
-#: gajim/common/const.py:441
+#: gajim/common/const.py:475
 msgid "Certificate is not yet valid"
 msgstr "Zertifikat ist noch nicht gültig"
 
-#: gajim/common/const.py:442
+#: gajim/common/const.py:476
 msgid "Certificate has expired"
 msgstr "Zertifikat ist abgelaufen"
 
-#: gajim/common/const.py:443
+#: gajim/common/const.py:477
 msgid "CRL is not yet valid"
 msgstr "CRL ist nocht nicht gültig"
 
-#: gajim/common/const.py:444
+#: gajim/common/const.py:478
 msgid "CRL has expired"
 msgstr "CRL ist abgelaufen"
 
-#: gajim/common/const.py:445
+#: gajim/common/const.py:479
 msgid "Format error in certificate's notBefore field"
 msgstr "Formatfehler im \"notBefore\"-Feld des Zertifikats"
 
-#: gajim/common/const.py:446
+#: gajim/common/const.py:480
 msgid "Format error in certificate's notAfter field"
 msgstr "Formatfehler im \"notAfter\"-Feld des Zertifikats"
 
-#: gajim/common/const.py:447
+#: gajim/common/const.py:481
 msgid "Format error in CRL's lastUpdate field"
 msgstr "Formatfehler im \"lastUpdate\"-Feld der CRL"
 
-#: gajim/common/const.py:448
+#: gajim/common/const.py:482
 msgid "Format error in CRL's nextUpdate field"
 msgstr "Formatfehler im \"nextUpdate\"-Feld der CRL"
 
-#: gajim/common/const.py:449
+#: gajim/common/const.py:483
 msgid "Out of memory"
 msgstr "Zu wenig Speicher"
 
-#: gajim/common/const.py:450
+#: gajim/common/const.py:484
 msgid "Self signed certificate"
 msgstr "Selbstsigniertes Zertifikat"
 
-#: gajim/common/const.py:451
+#: gajim/common/const.py:485
 msgid "Self signed certificate in certificate chain"
 msgstr "Selbstsigniertes Zertifikat in der Zertifikatskette"
 
-#: gajim/common/const.py:452
+#: gajim/common/const.py:486
 msgid "Unable to get local issuer certificate"
 msgstr "Das Zertifikat des lokalen Ausstellers ist nicht verfügbar"
 
-#: gajim/common/const.py:453
+#: gajim/common/const.py:487
 msgid "Unable to verify the first certificate"
 msgstr "Das erste Zertifikat konnte nicht überprüft werden"
 
-#: gajim/common/const.py:454
+#: gajim/common/const.py:488
 msgid "Certificate chain too long"
 msgstr "Zertifikatskette zu lang"
 
-#: gajim/common/const.py:455
+#: gajim/common/const.py:489
 msgid "Certificate revoked"
 msgstr "Zertifikat wurde widerrufen"
 
-#: gajim/common/const.py:456
+#: gajim/common/const.py:490
 msgid "Invalid CA certificate"
 msgstr "Ungültiges CA-Zertifikat"
 
-#: gajim/common/const.py:457
+#: gajim/common/const.py:491
 msgid "Path length constraint exceeded"
 msgstr "Pfadlängenbeschränkung überschritten"
 
-#: gajim/common/const.py:458
+#: gajim/common/const.py:492
 msgid "Unsupported certificate purpose"
 msgstr "Nicht unterstützter Verwendungszweck für das Zertifikat"
 
-#: gajim/common/const.py:459
+#: gajim/common/const.py:493
 msgid "Certificate not trusted"
 msgstr "Zertifikat nicht vertrauenswürdig"
 
-#: gajim/common/const.py:460
+#: gajim/common/const.py:494
 msgid "Certificate rejected"
 msgstr "Zertifikat abgelehnt"
 
-#: gajim/common/const.py:461
+#: gajim/common/const.py:495
 msgid "Subject issuer mismatch"
 msgstr "Themenaussteller unpassend"
 
-#: gajim/common/const.py:462
+#: gajim/common/const.py:496
 msgid "Authority and subject key identifier mismatch"
 msgstr "Zertifizierungsstelle und Betreffsschlüssel unpassend"
 
-#: gajim/common/const.py:463
+#: gajim/common/const.py:497
 msgid "Authority and issuer serial number mismatch"
 msgstr "Zertifizierungsstelle und Aussteller-Seriennummer unpassend"
 
-#: gajim/common/const.py:464
+#: gajim/common/const.py:498
 msgid "Key usage does not include certificate signing"
 msgstr ""
 "Die Verwendung des Schlüssels beinhaltet nicht das Unterschreiben des "
 "Zertifikats"
 
-#: gajim/common/const.py:465
+#: gajim/common/const.py:499
 msgid "Application verification failure"
 msgstr "Fehler beim Überprüfen des Programms"
 
@@ -5120,256 +5157,256 @@ msgstr "Video-Aufnahmegerät"
 msgid "video output"
 msgstr "Video-Ausgabegerät"
 
-#: gajim/common/helpers.py:210
+#: gajim/common/helpers.py:216
 msgid "Server must be between 1 and 1023 bytes"
 msgstr "Der Servername muss zwischen 1 und 1023 Zeichen lang sein"
 
-#: gajim/common/helpers.py:214
+#: gajim/common/helpers.py:220
 msgid "Invalid character in hostname."
 msgstr "Ungültiges Zeichen im Hostname."
 
-#: gajim/common/helpers.py:216
+#: gajim/common/helpers.py:222
 msgid "Server address required."
 msgstr "Server-Adresse benötigt."
 
-#: gajim/common/helpers.py:220
+#: gajim/common/helpers.py:226
 msgid "Username must be between 1 and 1023 bytes"
 msgstr "Der Benutzername muss zwischen 1 und 1023 Zeichen lang sein"
 
-#: gajim/common/helpers.py:224
+#: gajim/common/helpers.py:230
 msgid "Invalid character in username."
 msgstr "Ungültiges Zeichen im Benutzernamen."
 
-#: gajim/common/helpers.py:230
+#: gajim/common/helpers.py:236
 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:234
+#: gajim/common/helpers.py:240
 msgid "Invalid character in resource."
 msgstr "Ungültiges Zeichen in der XMPP-Ressource."
 
-#: gajim/common/helpers.py:275
+#: gajim/common/helpers.py:281
 msgid "_Busy"
 msgstr "_Beschäftigt"
 
-#: gajim/common/helpers.py:277 gajim/gtk/tooltips.py:647
+#: gajim/common/helpers.py:283 gajim/gtk/tooltips.py:647
 msgid "Busy"
 msgstr "Beschäftigt"
 
-#: gajim/common/helpers.py:280
+#: gajim/common/helpers.py:286
 msgid "_Not Available"
 msgstr "_Nicht verfügbar"
 
-#: gajim/common/helpers.py:282 gajim/gtk/tooltips.py:649
+#: gajim/common/helpers.py:288 gajim/gtk/tooltips.py:649
 msgid "Not Available"
 msgstr "Nicht verfügbar"
 
-#: gajim/common/helpers.py:285
+#: gajim/common/helpers.py:291
 msgid "_Free for Chat"
 msgstr "_Frei zum Chatten"
 
-#: gajim/common/helpers.py:287 gajim/gtk/tooltips.py:643
+#: gajim/common/helpers.py:293 gajim/gtk/tooltips.py:643
 msgid "Free for Chat"
 msgstr "Frei zum Chatten"
 
-#: gajim/common/helpers.py:290
+#: gajim/common/helpers.py:296
 msgid "?user status:_Available"
 msgstr "Verfügb_ar"
 
-#: gajim/common/helpers.py:292 gajim/gtk/tooltips.py:641
+#: gajim/common/helpers.py:298 gajim/gtk/tooltips.py:641
 msgid "?user status:Available"
 msgstr "Verfügbar"
 
-#: gajim/common/helpers.py:294
+#: gajim/common/helpers.py:300
 msgid "Connecting"
 msgstr "Verbindung wird hergestellt"
 
-#: gajim/common/helpers.py:297 gajim/data/gui/preferences_window.ui:1251
+#: gajim/common/helpers.py:303 gajim/data/gui/preferences_window.ui:1251
 msgid "A_way"
 msgstr "Ab_wesend"
 
-#: gajim/common/helpers.py:299 gajim/common/modules/adhoc_commands.py:120
-#: gajim/command_system/implementation/standard.py:139
+#: gajim/common/helpers.py:305 gajim/common/modules/adhoc_commands.py:120
+#: gajim/command_system/implementation/standard.py:141
 #: gajim/gtk/tooltips.py:645
 msgid "Away"
 msgstr "Abwesend"
 
-#: gajim/common/helpers.py:302
+#: gajim/common/helpers.py:308
 msgid "_Offline"
 msgstr "A_bgemeldet"
 
-#: gajim/common/helpers.py:304 gajim/gtk/tooltips.py:651
+#: gajim/common/helpers.py:310 gajim/gtk/tooltips.py:651
 msgid "Offline"
 msgstr "Abgemeldet"
 
-#: gajim/common/helpers.py:307
+#: gajim/common/helpers.py:313
 msgid "_Invisible"
 msgstr "_Unsichtbar"
 
-#: gajim/common/helpers.py:313
+#: gajim/common/helpers.py:319
 msgid "?contact has status:Unknown"
 msgstr "Unbekannt"
 
-#: gajim/common/helpers.py:315
+#: gajim/common/helpers.py:321
 msgid "?contact has status:Has errors"
 msgstr "Hat Fehler"
 
-#: gajim/common/helpers.py:330
+#: gajim/common/helpers.py:336
 msgid "?Subscription we already have:None"
 msgstr "Keines"
 
-#: gajim/common/helpers.py:332
+#: gajim/common/helpers.py:338
 msgid "To"
 msgstr "An"
 
-#: gajim/common/helpers.py:334 gajim/data/gui/groups_post_window.ui:33
+#: gajim/common/helpers.py:340 gajim/data/gui/groups_post_window.ui:33
 msgid "From"
 msgstr "Von"
 
-#: gajim/common/helpers.py:336
+#: gajim/common/helpers.py:342
 msgid "Both"
 msgstr "Beide"
 
-#: gajim/common/helpers.py:338 gajim/gtk/server_info.py:151
+#: gajim/common/helpers.py:344 gajim/gtk/server_info.py:151
 msgid "Unknown"
 msgstr "Unbekannt"
 
-#: gajim/common/helpers.py:344
+#: gajim/common/helpers.py:350
 msgid "?Ask (for Subscription):None"
 msgstr "Keine Kontaktanfrage"
 
-#: gajim/common/helpers.py:346
+#: gajim/common/helpers.py:352
 msgid "Subscribe"
 msgstr "Kontaktanfrage"
 
-#: gajim/common/helpers.py:355
+#: gajim/common/helpers.py:361
 msgid "?Group Chat Contact Role:None"
 msgstr "Keine"
 
-#: gajim/common/helpers.py:358
+#: gajim/common/helpers.py:364
 msgid "Moderators"
 msgstr "Moderatoren"
 
-#: gajim/common/helpers.py:360
+#: gajim/common/helpers.py:366
 msgid "Moderator"
 msgstr "Moderator"
 
-#: gajim/common/helpers.py:363
+#: gajim/common/helpers.py:369 gajim/data/gui/groupchat_info_scrolled.ui:243
 msgid "Participants"
 msgstr "Teilnehmer"
 
-#: gajim/common/helpers.py:365
+#: gajim/common/helpers.py:371
 msgid "Participant"
 msgstr "Teilnehmer"
 
-#: gajim/common/helpers.py:368
+#: gajim/common/helpers.py:374
 msgid "Visitors"
 msgstr "Besucher"
 
-#: gajim/common/helpers.py:370
+#: gajim/common/helpers.py:376
 msgid "Visitor"
 msgstr "Besucher"
 
-#: gajim/common/helpers.py:376 gajim/gtk/tooltips.py:253
+#: gajim/common/helpers.py:382 gajim/gtk/tooltips.py:253
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "Keine"
 
-#: gajim/common/helpers.py:378 gajim/data/gui/groupchat_config.ui:32
+#: gajim/common/helpers.py:384 gajim/data/gui/groupchat_config.ui:32
 #: gajim/gtk/tooltips.py:259
 msgid "Owner"
 msgstr "Besitzer"
 
-#: gajim/common/helpers.py:380 gajim/gtk/tooltips.py:257
+#: gajim/common/helpers.py:386 gajim/gtk/tooltips.py:257
 msgid "Administrator"
 msgstr "Administrator"
 
-#: gajim/common/helpers.py:382 gajim/data/gui/groupchat_config.ui:40
+#: gajim/common/helpers.py:388 gajim/data/gui/groupchat_config.ui:40
 #: gajim/gtk/tooltips.py:255 gajim/gtk/groupchat_config.py:105
 msgid "Member"
 msgstr "Mitglied"
 
-#: gajim/common/helpers.py:421
+#: gajim/common/helpers.py:427
 msgid "is paying attention to the conversation"
 msgstr "beobachtet diese Unterhaltung"
 
-#: gajim/common/helpers.py:423
+#: gajim/common/helpers.py:429
 msgid "is doing something else"
 msgstr "tut etwas anderes"
 
-#: gajim/common/helpers.py:425
+#: gajim/common/helpers.py:431
 msgid "is composing a message…"
 msgstr "schreibt…"
 
-#: gajim/common/helpers.py:428
+#: gajim/common/helpers.py:434
 msgid "paused composing a message"
 msgstr "schreibt nicht mehr"
 
-#: gajim/common/helpers.py:430
+#: gajim/common/helpers.py:436
 msgid "has closed the chat window or tab"
 msgstr "hat das Chatfenster geschlossen"
 
-#: gajim/common/helpers.py:936 gajim/common/helpers.py:943
+#: gajim/common/helpers.py:942 gajim/common/helpers.py:949
 #, 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:950
+#: gajim/common/helpers.py:956
 #, python-format
-msgid "from room %s"
-msgstr "von Gruppenchat %s"
+msgid "from group chat %s"
+msgstr "aus dem Gruppenchat %s"
 
-#: gajim/common/helpers.py:953 gajim/common/helpers.py:970
+#: gajim/common/helpers.py:959 gajim/common/helpers.py:976
 #, python-format
 msgid "from user %s"
 msgstr "vom Benutzer %s"
 
-#: gajim/common/helpers.py:955
+#: gajim/common/helpers.py:961
 #, python-format
 msgid "from %s"
 msgstr "von %s"
 
-#: gajim/common/helpers.py:962 gajim/common/helpers.py:968
+#: gajim/common/helpers.py:968 gajim/common/helpers.py:974
 #, 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:986 gajim/common/helpers.py:998
+#: gajim/common/helpers.py:992 gajim/common/helpers.py:1004
 #: gajim/data/gui/roster_window.ui:85 data/org.gajim.Gajim.desktop.in:4
 #: data/org.gajim.Gajim.appdata.xml.in:9
 msgid "Gajim"
 msgstr "Gajim"
 
-#: gajim/common/helpers.py:1000
+#: gajim/common/helpers.py:1006
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: gajim/common/helpers.py:1109 gajim/data/gui/add_new_contact_window.ui:25
+#: gajim/common/helpers.py:1115 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."
 
-#: gajim/common/helpers.py:1111
+#: gajim/common/helpers.py:1117
 msgid "Hello, I am $name."
 msgstr "Hallo, Ich bin $name."
 
-#: gajim/common/helpers.py:1215 gajim/common/helpers.py:1224
-#: gajim/common/helpers.py:1282
+#: gajim/common/helpers.py:1221 gajim/common/helpers.py:1230
+#: gajim/common/helpers.py:1288
 msgid "Timeout loading image"
 msgstr "Konnte Bild nicht laden"
 
-#: gajim/common/helpers.py:1234 gajim/common/helpers.py:1280
+#: gajim/common/helpers.py:1240 gajim/common/helpers.py:1286
 msgid "Image is too big"
 msgstr "Das Bild ist zu groß"
 
-#: gajim/common/helpers.py:1245
+#: gajim/common/helpers.py:1251
 msgid "PyCURL is not installed"
 msgstr "PyCURL ist nicht installiert"
 
-#: gajim/common/helpers.py:1284
+#: gajim/common/helpers.py:1290
 msgid "Error loading image"
 msgstr "Fehler beim Laden des Bildes"
 
@@ -5549,8 +5586,8 @@ msgstr "Der Status hat sich verändert."
 
 #: gajim/common/modules/adhoc_commands.py:202
 #: gajim/common/modules/adhoc_commands.py:239
-msgid "Leave Groupchats"
-msgstr "Verlasse Gruppenchats"
+msgid "Leave Group Chats"
+msgstr "Gruppenchats verlassen"
 
 #: gajim/common/modules/adhoc_commands.py:228
 #, python-format
@@ -5558,15 +5595,15 @@ msgid "%(nickname)s on %(room_jid)s"
 msgstr "%(nickname)s aus dem Gruppenchat %(room_jid)s"
 
 #: gajim/common/modules/adhoc_commands.py:232
-msgid "You have not joined a groupchat."
-msgstr "Sie sind derzeit in keinem Gruppenchat."
+msgid "You have not joined a group chat."
+msgstr "Sie sind derzeit keinem Gruppenchat beigetreten."
 
 #: gajim/common/modules/adhoc_commands.py:240
-msgid "Choose the groupchats you want to leave"
+msgid "Choose the group chats you want to leave"
 msgstr "Wählen Sie die Gruppenchats, die Sie verlassen möchten"
 
 #: gajim/common/modules/adhoc_commands.py:289
-msgid "You left the following groupchats:"
+msgid "You left the following group chats:"
 msgstr "Sie haben folgende Gruppenchats verlassen:"
 
 #: gajim/common/modules/roster_item_exchange.py:102
@@ -5582,7 +5619,7 @@ msgstr "Gesendete Kontakte:"
 msgid "Blocked Contacts"
 msgstr "Gesperrte Kontakte"
 
-#: gajim/data/gui/destroy_muc_dialog.ui:79 gajim/gtk/dialogs.py:736
+#: gajim/data/gui/destroy_muc_dialog.ui:79 gajim/gtk/dialogs.py:563
 msgid "Destroy this group chat permanently?"
 msgstr "Diesen Gruppenchat dauerhaft auflösen?"
 
@@ -5590,7 +5627,7 @@ msgstr "Diesen Gruppenchat dauerhaft auflösen?"
 msgid "Reason..."
 msgstr "Begründung..."
 
-#: gajim/data/gui/destroy_muc_dialog.ui:124 gajim/gtk/dialogs.py:738
+#: gajim/data/gui/destroy_muc_dialog.ui:124 gajim/gtk/dialogs.py:565
 msgid "Where participants should go (optional)"
 msgstr "Eine Alternative für die Teilnehmer vorschlagen (optional)"
 
@@ -5602,29 +5639,6 @@ msgstr "Ausweichort..."
 msgid "_Reason and alternate venue (optional)"
 msgstr "Beg_ründung und Ausweichort (optional)"
 
-#: gajim/data/gui/advanced_configuration_window.ui:7
-#: gajim/data/gui/preferences_window.ui:2723
-msgid "Advanced Configuration Editor (ACE)"
-msgstr "Erweiterter Konfigurationseditor (ACE)"
-
-#: gajim/data/gui/advanced_configuration_window.ui:52
-msgid "You should restart Gajim for some changes to take effect"
-msgstr "Sie sollten Gajim neustarten, damit alle Änderungen in Kraft treten"
-
-#: gajim/data/gui/advanced_configuration_window.ui:84
-msgid "_Filter"
-msgstr "_Filter"
-
-#: gajim/data/gui/advanced_configuration_window.ui:153
-#: gajim/data/gui/filetransfers_send_file_dialog.ui:15
-#: gajim/gtk/discovery.py:1666
-msgid "Description"
-msgstr "Beschreibung"
-
-#: gajim/data/gui/advanced_configuration_window.ui:197
-msgid "_Reset to default"
-msgstr "Auf Standard zu_rücksetzen"
-
 #: gajim/data/gui/join_groupchat_window.ui:56
 #: gajim/data/gui/chat_to_muc_window.ui:67
 #: gajim/data/gui/chat_to_muc_window.ui:78
@@ -5636,7 +5650,7 @@ msgid "Join group chat every time Gajim is started"
 msgstr "Diesem Gruppenchat beim Starten von Gajim beitreten"
 
 #: gajim/data/gui/join_groupchat_window.ui:113
-msgid "Auto Join"
+msgid "Join Automatically"
 msgstr "Automatisch beitreten"
 
 #: gajim/data/gui/join_groupchat_window.ui:131
@@ -5645,10 +5659,11 @@ msgid "Account"
 msgstr "Konto"
 
 #: gajim/data/gui/join_groupchat_window.ui:147
-msgid "Room"
+msgid "Group chat"
 msgstr "Gruppenchat"
 
-#: gajim/data/gui/join_groupchat_window.ui:180 gajim/gtk/accounts.py:886
+#: gajim/data/gui/join_groupchat_window.ui:180 gajim/data/gui/bookmarks.ui:158
+#: gajim/gtk/accounts.py:889
 msgid "Password"
 msgstr "Passwort"
 
@@ -5668,78 +5683,10 @@ 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:1271
+#: gajim/data/gui/join_groupchat_window.ui:437 gajim/gtk/discovery.py:1270
 msgid "Join"
 msgstr "Beitreten"
 
-#: gajim/data/gui/manage_proxies_window.ui:12
-msgid "HTTP Connect"
-msgstr "HTTP-Verbindung"
-
-#: gajim/data/gui/manage_proxies_window.ui:15
-msgid "SOCKS5"
-msgstr "SOCKS5"
-
-#: gajim/data/gui/manage_proxies_window.ui:18
-msgid "BOSH"
-msgstr "BOSH"
-
-#: gajim/data/gui/manage_proxies_window.ui:27
-msgid "Manage Proxy Profiles"
-msgstr "Verwaltung der Proxy-Profile"
-
-#: gajim/data/gui/manage_proxies_window.ui:83
-msgid "Add Proxy"
-msgstr "Proxy hinzufügen"
-
-#: gajim/data/gui/manage_proxies_window.ui:97
-msgid "Remove Proxy"
-msgstr "Proxy entfernen"
-
-#: gajim/data/gui/manage_proxies_window.ui:141
-msgid "Properties"
-msgstr "Eigenschaften"
-
-#: gajim/data/gui/manage_proxies_window.ui:157
-msgid "_Name"
-msgstr "_Name"
-
-#: gajim/data/gui/manage_proxies_window.ui:173
-msgid "_Type"
-msgstr "_Typ"
-
-#: gajim/data/gui/manage_proxies_window.ui:236
-msgid "_BOSH URL"
-msgstr "_BOSH-URL"
-
-#: gajim/data/gui/manage_proxies_window.ui:261
-msgid "Use HTTP prox_y"
-msgstr "HTTP-Prox_y verwenden"
-
-#: gajim/data/gui/manage_proxies_window.ui:280
-msgid "Proxy _Host"
-msgstr "Proxy-_Host"
-
-#: gajim/data/gui/manage_proxies_window.ui:307
-msgid "Proxy _Port"
-msgstr "Proxy-_Port"
-
-#: gajim/data/gui/manage_proxies_window.ui:334
-msgid "_Username"
-msgstr "_Benutzername"
-
-#: gajim/data/gui/manage_proxies_window.ui:347
-msgid "Use proxy auth_entication"
-msgstr "Authentifizierung _verwenden"
-
-#: gajim/data/gui/manage_proxies_window.ui:377
-msgid "Pass_word"
-msgstr "Pass_wort"
-
-#: gajim/data/gui/manage_proxies_window.ui:405 gajim/gtk/adhoc.py:321
-msgid "Settings"
-msgstr "Einstellungen"
-
 #: gajim/data/gui/change_password_dialog.ui:17
 msgid "New Password"
 msgstr "Neues Passwort"
@@ -5768,11 +5715,12 @@ msgid "Status:"
 msgstr "Status:"
 
 #: gajim/data/gui/zeroconf_information_window.ui:89
-msgid "_Log conversation history"
-msgstr "Unterhaltungsver_lauf speichern"
+msgid "_Store conversation history"
+msgstr "Unterhaltung_sverlauf speichern"
 
 #: gajim/data/gui/zeroconf_information_window.ui:215
 #: gajim/data/gui/vcard_information_window.ui:390
+#: gajim/data/gui/groupchat_info_scrolled.ui:166
 msgid "Contact"
 msgstr "Kontakt"
 
@@ -5785,8 +5733,8 @@ msgid "Last Name:"
 msgstr "Nachname:"
 
 #: gajim/data/gui/zeroconf_information_window.ui:260
-msgid "Jabber ID:"
-msgstr "Jabber-ID:"
+msgid "XMPP Address:"
+msgstr "XMPP-Adresse:"
 
 #: gajim/data/gui/zeroconf_information_window.ui:273
 msgid "E-Mail:"
@@ -5806,8 +5754,8 @@ msgid "Send _File"
 msgstr "_Datei senden"
 
 #: gajim/data/gui/gc_occupants_menu.ui:29
-msgid "Occupant Actions"
-msgstr "Teilnehmer-Aktionen"
+msgid "Participant Actions"
+msgstr "Teilnehmeraktionen"
 
 #: gajim/data/gui/gc_occupants_menu.ui:38
 msgid "_Voice"
@@ -5838,8 +5786,8 @@ msgid "_Ban"
 msgstr "S_perren"
 
 #: gajim/data/gui/gc_occupants_menu.ui:124
-msgid "_Add to Roster"
-msgstr "Zur Kont_aktliste hinzufügen"
+msgid "_Add to Contact List"
+msgstr "Kontakt _hinzufügen"
 
 #: gajim/data/gui/gc_occupants_menu.ui:132
 msgid "_Execute command"
@@ -5874,11 +5822,6 @@ msgstr "Abonnement:"
 msgid "_Status"
 msgstr "_Status"
 
-#: gajim/data/gui/zeroconf_context_menu.ui:26
-#: gajim/data/gui/account_context_menu.ui:79
-msgid "_Modify Account..."
-msgstr "_Konto bearbeiten..."
-
 #: gajim/data/gui/certificate_dialog.ui:66
 #: gajim/data/gui/certificate_dialog.ui:178
 msgid "Common Name (CN)"
@@ -5958,12 +5901,18 @@ msgstr "Zuletzt geändert:"
 msgid "Next entry"
 msgstr "Nächster Eintrag"
 
+#: gajim/data/gui/filetransfers_send_file_dialog.ui:15
+#: gajim/data/gui/advanced_configuration.ui:143
+#: gajim/data/gui/groupchat_info_scrolled.ui:48 gajim/gtk/discovery.py:1663
+msgid "Description"
+msgstr "Beschreibung"
+
 #: gajim/data/gui/filetransfers_send_file_dialog.ui:54
 msgid "_Send Files"
 msgstr "_Dateien senden"
 
 #: gajim/data/gui/filetransfers_send_file_dialog.ui:58
-#: gajim/gtk/xml_console.py:90
+#: gajim/gtk/xml_console.py:87
 msgid "Send"
 msgstr "Senden"
 
@@ -5984,7 +5933,7 @@ msgid "Change _Nickname..."
 msgstr "Spitz_namen ändern..."
 
 #: gajim/data/gui/gc_control_popup_menu.ui:20
-msgid "_Manage Room"
+msgid "_Manage Group Chat"
 msgstr "Gruppenchat _verwalten"
 
 #: gajim/data/gui/gc_control_popup_menu.ui:31
@@ -5992,12 +5941,12 @@ msgid "Change _Subject..."
 msgstr "_Thema ändern..."
 
 #: gajim/data/gui/gc_control_popup_menu.ui:38
-msgid "Configure _Room..."
-msgstr "G_ruppenchat konfigurieren..."
+msgid "Configure _Group Chat..."
+msgstr "Gruppenchat _konfigurieren..."
 
 #: gajim/data/gui/gc_control_popup_menu.ui:52
-msgid "_Destroy Room"
-msgstr "_Gruppenchat auflösen"
+msgid "_Destroy Group Chat"
+msgstr "Gruppenchat _auflösen"
 
 #: gajim/data/gui/gc_control_popup_menu.ui:64
 msgid "_Minimize on close"
@@ -6007,7 +5956,7 @@ msgstr "Beim Schließen _minimieren"
 msgid "_Request Voice"
 msgstr "Stimme anfo_rdern"
 
-#: gajim/data/gui/gc_control_popup_menu.ui:99 gajim/gtk/discovery.py:1704
+#: gajim/data/gui/gc_control_popup_menu.ui:99
 msgid "_Bookmark"
 msgstr "_Gruppenchat speichern"
 
@@ -6052,13 +6001,6 @@ msgstr "Website"
 msgid "E-Mail"
 msgstr "E-Mail"
 
-#: 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/blocking_list.ui:115 gajim/gtk/add_contact.py:30
-#: gajim/gtk/accounts.py:801
-msgid "Jabber ID"
-msgstr "Jabber-ID"
-
 #: gajim/data/gui/profile_window.ui:440
 msgid "Main"
 msgstr "Allgemein"
@@ -6177,35 +6119,39 @@ msgstr "Arbeit"
 msgid "About"
 msgstr "Über"
 
-#: gajim/data/gui/start_chat_dialog.ui:114 gajim/gtk/discovery.py:1658
-msgid "Users"
-msgstr "Benutzer"
+#: gajim/data/gui/start_chat_dialog.ui:53
+msgid "Global Group Chat Search"
+msgstr "Globale Suche nach Gruppenchats"
 
-#: gajim/data/gui/start_chat_dialog.ui:185
-msgid "Name:"
-msgstr "Name:"
+#: gajim/data/gui/start_chat_dialog.ui:189
+#: gajim/data/gui/start_chat_dialog.ui:229
+#: gajim/data/gui/start_chat_dialog.ui:364
+msgid "_Back"
+msgstr "_Zurück"
 
-#: gajim/data/gui/start_chat_dialog.ui:197
-msgid "Description:"
-msgstr "Beschreibung:"
+#: gajim/data/gui/start_chat_dialog.ui:245
+#: gajim/data/gui/groupchat_control.ui:796
+#: gajim/data/gui/groupchat_control.ui:888 gajim/gtk/discovery.py:1701
+#: gajim/gtk/groupchat_join.py:62
+msgid "_Join"
+msgstr "_Beitreten"
 
-#: gajim/data/gui/start_chat_dialog.ui:209
-msgid "Address:"
-msgstr "Adresse:"
+#: gajim/data/gui/start_chat_dialog.ui:289
+msgid "Select Account"
+msgstr "Konto auswählen"
 
-#: gajim/data/gui/start_chat_dialog.ui:246
-msgid ""
-"Semi-Anonymous\n"
-"<span size=\"small\">(Only moderators can see your XMPP-Address)</span>"
-msgstr ""
-"Semi-anonym\n"
-"<span size=\"small\">(Nur Moderatoren können Ihre XMPP-Adresse sehen)</span>"
+#: gajim/data/gui/start_chat_dialog.ui:380
+msgid "_Select"
+msgstr "_Auswählen"
 
 #: gajim/data/gui/filetransfers.ui:21
 msgid "Pa_use/Resume"
 msgstr "Pause/Fo_rtsetzen"
 
-#: gajim/data/gui/filetransfers.ui:30 gajim/gtk/filechoosers.py:178
+#: gajim/data/gui/filetransfers.ui:30 gajim/data/gui/groupchat_control.ui:575
+#: gajim/data/gui/groupchat_control.ui:667
+#: gajim/data/gui/groupchat_control.ui:779
+#: gajim/data/gui/groupchat_control.ui:871 gajim/gtk/filechoosers.py:178
 msgid "_Cancel"
 msgstr "Abbre_chen"
 
@@ -6247,9 +6193,9 @@ msgstr ""
 "Dateien"
 
 #: gajim/data/gui/filetransfers.ui:207
-msgid "Shows a list of file transfers between you and others"
+msgid "Shows a list of file transfers between you and your contacts"
 msgstr ""
-"Zeigt eine Liste der Dateiübertragungen zwischen Ihnen und Ihren Kontakten an"
+"Zeigt eine Liste der Dateiübertragungen zwischen Ihnen und Ihren Kontakten"
 
 #: gajim/data/gui/groupchat_control.ui:13 gajim/data/gui/chat_control.ui:277
 msgid "Bold"
@@ -6268,7 +6214,6 @@ msgid "Strike"
 msgstr "Durchgestrichen"
 
 #: gajim/data/gui/groupchat_control.ui:54 gajim/data/gui/chat_control.ui:318
-#: gajim/gtk/advanced_config.py:86
 msgid "Color"
 msgstr "Farbe"
 
@@ -6280,14 +6225,39 @@ msgstr "Schriftart"
 msgid "Clear formatting"
 msgstr "Formatierung löschen"
 
-#: gajim/data/gui/groupchat_control.ui:290 gajim/data/gui/chat_control.ui:880
+#: gajim/data/gui/groupchat_control.ui:291 gajim/data/gui/chat_control.ui:880
 msgid "Choose encryption"
 msgstr "Verschlüsselung auswählen"
 
-#: gajim/data/gui/groupchat_control.ui:336 gajim/data/gui/chat_control.ui:640
+#: gajim/data/gui/groupchat_control.ui:337 gajim/data/gui/chat_control.ui:640
 msgid "Show a list of emojis (Alt+M)"
 msgstr "Zeigt eine Übersicht der Emojis (Alt+M)"
 
+#: gajim/data/gui/groupchat_control.ui:484
+msgid "Joining…"
+msgstr "Trete bei…"
+
+#: gajim/data/gui/groupchat_control.ui:496
+msgid "_Abort"
+msgstr "_Abbruch"
+
+#: gajim/data/gui/groupchat_control.ui:542
+msgid "Enter new nickname"
+msgstr "Neuen Spitznamen eingeben"
+
+#: gajim/data/gui/groupchat_control.ui:592
+#: gajim/data/gui/groupchat_control.ui:684
+msgid "Ch_ange"
+msgstr "Ä_ndern"
+
+#: gajim/data/gui/groupchat_control.ui:761
+msgid "Enter password"
+msgstr "Passwort eingeben"
+
+#: gajim/data/gui/groupchat_control.ui:1067
+msgid "_Try again"
+msgstr "_Erneut versuchen"
+
 #: gajim/data/gui/popup_notification_window.ui:42
 msgid "Event Type"
 msgstr "Ereignisarten"
@@ -6355,7 +6325,7 @@ msgid "Always"
 msgstr "Immer"
 
 #: gajim/data/gui/mam_preferences.ui:18
-msgid "Roster"
+msgid "Contact List"
 msgstr "Kontaktliste"
 
 #: gajim/data/gui/mam_preferences.ui:22
@@ -6378,11 +6348,11 @@ msgid "Add"
 msgstr "Hinzufügen"
 
 #: gajim/data/gui/mam_preferences.ui:194 gajim/data/gui/groupchat_config.ui:151
-#: gajim/gtk/dialogs.py:63 gajim/gtk/accounts.py:381
+#: gajim/gtk/dialogs.py:62 gajim/gtk/accounts.py:384
 msgid "Remove"
 msgstr "Entfernen"
 
-#: gajim/data/gui/vcard_information_window.ui:72 gajim/gtk/accounts.py:753
+#: gajim/data/gui/vcard_information_window.ui:72 gajim/gtk/accounts.py:756
 msgid "Resource"
 msgstr "XMPP-Ressource"
 
@@ -6427,6 +6397,7 @@ msgstr "Abonnement"
 #: gajim/data/gui/vcard_information_window.ui:974
 #: gajim/data/gui/vcard_information_window.ui:993
 #: gajim/data/gui/vcard_information_window.ui:1427
+#: gajim/data/gui/groupchat_info_scrolled.ui:222
 msgid "button"
 msgstr "Schaltfläche"
 
@@ -6455,15 +6426,15 @@ msgid "Notify me about it"
 msgstr "Benachrichtige mich darüber"
 
 #: gajim/data/gui/preferences_window.ui:58
-msgid "Show only in roster"
-msgstr "Nur in der Kontaktliste zeigen"
+msgid "Show only in contact list"
+msgstr "Nur in Kontaktliste anzeigen"
 
 #: gajim/data/gui/preferences_window.ui:69
-msgid "Detached roster with detached chats"
+msgid "Detached contact list with detached chats"
 msgstr "Losgelöste Kontaktliste mit losgelösten Chatfenstern"
 
 #: gajim/data/gui/preferences_window.ui:72
-msgid "Detached roster with single chat"
+msgid "Detached contact list with single chat"
 msgstr "Losgelöste Kontaktliste mit einem einzelnen Chatfenster"
 
 #: gajim/data/gui/preferences_window.ui:75
@@ -6471,11 +6442,11 @@ msgid "Single window for everything"
 msgstr "Ein Fenster für alles"
 
 #: gajim/data/gui/preferences_window.ui:78
-msgid "Detached roster with chat grouped by account"
+msgid "Detached contact list with chat grouped by account"
 msgstr "Losgelöste Kontaktliste mit Chatfenstern gruppiert nach Konto"
 
 #: gajim/data/gui/preferences_window.ui:81
-msgid "Detached roster with chat grouped by type"
+msgid "Detached contact list with chat grouped by type"
 msgstr "Losgelöste Kontaktliste mit Chatfenstern gruppiert nach Typ"
 
 #: gajim/data/gui/preferences_window.ui:92
@@ -6519,7 +6490,7 @@ msgid "_Window behavior"
 msgstr "_Fensterverhalten"
 
 #: gajim/data/gui/preferences_window.ui:296
-msgid "_Show roster on startup"
+msgid "_Show contact list on startup"
 msgstr "Kontaktli_ste beim Start anzeigen"
 
 #: gajim/data/gui/preferences_window.ui:311
@@ -6535,12 +6506,12 @@ msgid "_Tabs placement"
 msgstr "Position der _Tableiste"
 
 #: gajim/data/gui/preferences_window.ui:363
-msgid "_Quit Gajim when closing roster window"
+msgid "_Quit Gajim when closing contact list"
 msgstr "_Gajim beenden, wenn die Kontaktliste geschlossen wird"
 
 #: gajim/data/gui/preferences_window.ui:367
 msgid ""
-"If enabled, Gajim will quit when closing the roster window instead of "
+"If enabled, Gajim will quit when closing the contact list window instead of "
 "minimizing to the system's notification area"
 msgstr ""
 "Fall aktiviert, wird Gajim beendet statt sich in den "
@@ -6551,51 +6522,52 @@ msgid "Behavior of Windows and Tabs"
 msgstr "Verhalten der Fenster und Tabs"
 
 #: gajim/data/gui/preferences_window.ui:423
-msgid "Show a_vatars of contacts in roster"
+msgid "Show a_vatars of contacts in contact list"
 msgstr "_Kontaktbilder in der Kontaktliste anzeigen"
 
 #: gajim/data/gui/preferences_window.ui:427
 msgid ""
-"If checked, avatars of contacts will be shown in the roster window and in "
-"group chats"
+"If checked, avatars of contacts will be shown in the contact list window and "
+"in group chats"
 msgstr ""
 "Falls aktiviert, werden die Kontaktbilder in der Kontaktliste und in "
 "Gruppenchats angezeigt"
 
 #: gajim/data/gui/preferences_window.ui:441
-msgid "Show status _messages of contacts in roster"
+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
 msgid ""
 "If checked, status messages of contacts will be shown under the contact's "
-"name, in the roster window, and in group chats"
+"name, in the contact list window, and in group chats"
 msgstr ""
-"Falls aktiviert, wird unter dem Namen jeden Kontaktes in der Kontaktliste "
-"und in Gruppenchats die Statusnachricht angezeigt"
+"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
-msgid "Show e_xtra information of contacts in roster (mood, activity, ...)"
+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
 msgid ""
-"If checked, additional info published by the contact will be shown in "
-"roster. Additional infos (published via PEP) may include e.g. mood, "
+"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 ""
 "Falls aktiviert, werden zusätzliche vom Kontakt freigegebene Informationen "
 "in der Kontaktliste angezeigt. Zusätzliche (über PEP veröffentlichte) "
-"Informationen können z.B. Stimmung, Aktivität, Standort, ... umfassen"
+"Informationen können z.B. Stimmung, Aktivität, Standort, usw. umfassen."
 
 #: gajim/data/gui/preferences_window.ui:484
 msgid "Sort contacts by status"
 msgstr "Kontakte nach Status sortieren"
 
 #: gajim/data/gui/preferences_window.ui:494
-msgid "in _roster"
+msgid "in _contact list"
 msgstr "in der _Kontaktliste"
 
 #: gajim/data/gui/preferences_window.ui:511
@@ -6603,7 +6575,7 @@ msgid "in _group chats"
 msgstr "in _Gruppenchats"
 
 #: gajim/data/gui/preferences_window.ui:540
-msgid "Roster Appearance"
+msgid "Contact List Appearance"
 msgstr "Erscheinungsbild der Kontaktliste"
 
 #: gajim/data/gui/preferences_window.ui:585
@@ -6667,7 +6639,7 @@ msgid "Show subject after _joining a group chat"
 msgstr "_Zeige das Thema nach dem Beitreten eines Gruppenchats"
 
 #: gajim/data/gui/preferences_window.ui:660
-msgid "If checked, the room subject will be shown when joining a group chat"
+msgid "If checked, the subject will be shown when joining a group chat"
 msgstr ""
 "Falls aktiviert, wird beim Beitreten des Gruppenchats das Thema angezeigt"
 
@@ -6682,7 +6654,7 @@ msgstr "Beitreten/Verlassen anzeigen (Standard)"
 #: gajim/data/gui/preferences_window.ui:701
 msgid ""
 "If join/leave status messages are shown in the group chat. This setting can "
-"be overridden in the groupchat menu."
+"be overridden in the group chat menu."
 msgstr ""
 "Ob Beitreten/Verlassen als Status-Benachrichtigung in Gruppenchats angezeigt "
 "werden sollen. Diese Einstellung kann im Gruppenchatmenü überschrieben "
@@ -6691,7 +6663,7 @@ msgstr ""
 #: gajim/data/gui/preferences_window.ui:720
 msgid ""
 "The default sync threshold for new public group chats. This setting can be "
-"overridden in the groupchat menu."
+"overridden in the group chat menu."
 msgstr ""
 "Der standardmäßig eingestellte Sync-Schwellenwert für neue öffentliche "
 "Gruppenchats. Diese Einstellung kann im Gruppenchatmenü überschrieben werden."
@@ -6707,7 +6679,7 @@ msgstr "Statusänderungen anzeigen (Standard)"
 #: gajim/data/gui/preferences_window.ui:768
 msgid ""
 "If status change messages are shown in the group chat. This setting can be "
-"overridden in the groupchat menu."
+"overridden in the group chat menu."
 msgstr ""
 "Ob Nachrichten zu Statusänderungen in Gruppenchats angezeigt werden sollen. "
 "Diese Einstellung kann im Gruppenchatmenü überschrieben werden."
@@ -6725,8 +6697,8 @@ msgstr ""
 "Kontakts gefärbt"
 
 #: gajim/data/gui/preferences_window.ui:843
-msgid "Show chatstate in roster"
-msgstr "Zeige Chatstatus in der Kontaktliste"
+msgid "Show chatstate in contact list"
+msgstr "Chatstatus in Kontaktliste anzeigen"
 
 #: gajim/data/gui/preferences_window.ui:847
 msgid ""
@@ -7022,7 +6994,7 @@ msgstr "Video_größe"
 msgid "Vi_ew own video source"
 msgstr "_Eigene Videoquelle anzeigen"
 
-#: gajim/data/gui/preferences_window.ui:2281 gajim/gtk/accounts.py:352
+#: gajim/data/gui/preferences_window.ui:2281 gajim/gtk/accounts.py:355
 msgid "Connection"
 msgstr "Verbindung"
 
@@ -7072,8 +7044,8 @@ msgid "_Manage..."
 msgstr "_Verwalten..."
 
 #: gajim/data/gui/preferences_window.ui:2616
-msgid "_Log status changes of contacts"
-msgstr "_Speichere die Statusänderungen von Kontakten"
+msgid "_Store status changes of contacts in history"
+msgstr "_Speichere die Statusänderungen von Kontakten im Unterhaltungsverlauf"
 
 #: gajim/data/gui/preferences_window.ui:2633
 msgid "Enable _debug logging"
@@ -7097,16 +7069,20 @@ msgstr "Achtung: Bitte nutzen Sie diese Einstellungen mit Vorsicht!"
 msgid "_Open..."
 msgstr "Ö_ffnen..."
 
+#: gajim/data/gui/preferences_window.ui:2723 gajim/gtk/advanced_config.py:84
+msgid "Advanced Configuration Editor (ACE)"
+msgstr "Erweiterter Konfigurationseditor (ACE)"
+
 #: gajim/data/gui/groupchat_config.ui:55
 msgid ""
-"<b>Jabber-ID</b>\n"
+"<b>XMPP Address</b>\n"
 "&lt;user@domain/resource&gt; (only that resource matches)\n"
 "&lt;user@domain&gt; (any resource matches)\n"
 "&lt;domain/resource&gt; (only that resource matches)\n"
 "&lt;domain&gt; (the domain itself matches, as does any user@domain or domain/"
 "resource)\n"
 msgstr ""
-"<b>Jabber-ID</b>\n"
+"<b>XMPP-Adresse</b>\n"
 "&lt;benutzer@domain/ressource&gt; (nur diese XMPP-Ressource stimmt überein)\n"
 "&lt;benutzer@domain&gt; (jede XMPP-Ressource stimmt überein)\n"
 "&lt;domain/ressource&gt; (nur diese XMPP-Ressource stimmt überein)\n"
@@ -7119,7 +7095,8 @@ msgid "Only Admins and Owners can modify the affiliation"
 msgstr ""
 "Nur Administratoren und Besitzer können die Gruppenzugehörigkeit ändern"
 
-#: gajim/data/gui/groupchat_config.ui:270 gajim/plugins/gui.py:312
+#: gajim/data/gui/groupchat_config.ui:270
+#: gajim/data/gui/groupchat_info_scrolled.ui:210 gajim/plugins/gui.py:324
 msgid "Configuration"
 msgstr "Konfiguration"
 
@@ -7148,7 +7125,7 @@ msgid "Start _Chat"
 msgstr "_Chat starten"
 
 #: gajim/data/gui/contact_context_menu.ui:20
-#: gajim/data/gui/systray_context_menu.ui:36
+#: gajim/data/gui/systray_context_menu.ui:29
 msgid "Send Single _Message..."
 msgstr "Einzelne _Nachricht senden..."
 
@@ -7205,8 +7182,28 @@ msgid "_Ignore"
 msgstr "_Sperren"
 
 #: gajim/data/gui/contact_context_menu.ui:174
-msgid "_Add to Roster..."
-msgstr "Zur Kont_aktliste hinzufügen..."
+msgid "_Add to Contact List..."
+msgstr "Kontakt _hinzufügen..."
+
+#: 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"
+
+#: gajim/data/gui/advanced_configuration.ui:71
+msgid "_Filter"
+msgstr "_Filter"
+
+#: gajim/data/gui/advanced_configuration.ui:88
+msgid "Type to search for values..."
+msgstr "Tippen, um nach Einstellungen zu suchen"
+
+#: gajim/data/gui/advanced_configuration.ui:180
+msgid "_Reset Value"
+msgstr "_Zurücksetzen"
+
+#: gajim/data/gui/advanced_configuration.ui:185
+msgid "Resets value to default"
+msgstr "Setzt die Einstellung auf den Standardwert zurück"
 
 #: gajim/data/gui/account_creation_wizard_window.ui:43
 msgid "Gajim: Account Creation Wizard"
@@ -7215,7 +7212,7 @@ msgstr "Assistent zum Einrichten eines neuen Kontos"
 #: gajim/data/gui/account_creation_wizard_window.ui:70
 msgid ""
 "You need to have an account in order to connect\n"
-"to the Jabber network."
+"to the XMPP network."
 msgstr ""
 "Sie müssen ein Konto haben, um sich zum\n"
 "XMPP-Netzwerk verbinden zu können."
@@ -7237,8 +7234,8 @@ msgid "<b>Please fill in the data for your existing account</b>"
 msgstr "<b>Bitte tragen Sie die Daten für Ihr bestehendes Konto ein</b>"
 
 #: gajim/data/gui/account_creation_wizard_window.ui:187
-msgid "_Jabber ID:"
-msgstr "_Jabber-ID:"
+msgid "_XMPP Address:"
+msgstr "_XMPP-Adresse:"
 
 #: gajim/data/gui/account_creation_wizard_window.ui:239
 #: gajim/data/gui/account_creation_wizard_window.ui:394
@@ -7325,6 +7322,7 @@ msgid "Privacy Lists:"
 msgstr "Privatsphären-Listen:"
 
 #: gajim/data/gui/service_discovery_window.ui:111
+#: gajim/data/gui/groupchat_creation.ui:227
 msgid "_Address"
 msgstr "_Adresse"
 
@@ -7340,10 +7338,6 @@ msgstr "Synchronisieren: Kontakte auswählen"
 msgid "Select the contacts you want to synchronise"
 msgstr "Kontakte auswählen, die Sie synchronisieren möchten"
 
-#: gajim/data/gui/groupchat_invitation_received.ui:42
-msgid "Group Chat Invitation"
-msgstr "Gruppenchat-Einladung"
-
 #: gajim/data/gui/groupchat_invitation_received.ui:111
 msgid "Message..."
 msgstr "Nachricht..."
@@ -7389,11 +7383,10 @@ msgid "<b><big>Incoming call</big></b>"
 msgstr "<b><big>Eingehender Anruf</big></b>"
 
 #: gajim/data/gui/add_new_contact_window.ui:84
-msgid "_Jabber ID"
-msgstr "_Jabber-ID"
+msgid "_XMPP Address"
+msgstr "_XMPP-Adresse"
 
 #: gajim/data/gui/add_new_contact_window.ui:100
-#: gajim/data/gui/manage_bookmarks_window.ui:192
 msgid "_Nickname"
 msgstr "Spitz_name"
 
@@ -7462,7 +7455,7 @@ msgstr "<b>Stimmung:</b>"
 msgid "<b>Message:</b>"
 msgstr "<b>Nachricht:</b>"
 
-#: gajim/data/gui/plugins_window.ui:10 gajim/data/gui/application_menu.ui:90
+#: gajim/data/gui/plugins_window.ui:10 gajim/data/gui/application_menu.ui:87
 msgid "Plugins"
 msgstr "Plugins"
 
@@ -7564,10 +7557,6 @@ msgstr "Erlaube"
 msgid "Deny"
 msgstr "Verbiete"
 
-#: gajim/data/gui/privacy_list_window.ui:317
-msgid "JabberID"
-msgstr "Jabber-ID"
-
 #: gajim/data/gui/privacy_list_window.ui:358
 msgid "all in the group"
 msgstr "allen in der Gruppe"
@@ -7608,7 +7597,7 @@ msgstr "Reihenfolge:"
 msgid "Manage sounds"
 msgstr "Klänge verwalten"
 
-#: gajim/data/gui/manage_sounds_window.ui:55 gajim/plugins/gui.py:100
+#: gajim/data/gui/manage_sounds_window.ui:55 gajim/plugins/gui.py:101
 msgid "Active"
 msgstr "Aktiv"
 
@@ -7644,29 +7633,104 @@ msgstr "Konto entfernen (in Gajim und auf dem _Server)"
 msgid "_Personal Events"
 msgstr "_Persönliche Ereignisse"
 
-#: gajim/data/gui/account_context_menu.ui:35
-#: gajim/data/gui/systray_context_menu.ui:28
-msgid "Join _Group Chat"
-msgstr "_Gruppenchat beitreten"
-
-#: gajim/data/gui/account_context_menu.ui:49
+#: gajim/data/gui/account_context_menu.ui:41
 msgid "_Add Contact..."
 msgstr "Kont_akt hinzufügen..."
 
-#: gajim/data/gui/account_context_menu.ui:57
+#: gajim/data/gui/account_context_menu.ui:49
 msgid "_Discover Services"
 msgstr "_Dienste durchsuchen"
 
-#: gajim/data/gui/account_context_menu.ui:65
+#: gajim/data/gui/account_context_menu.ui:57
 msgid "_Execute Command..."
 msgstr "B_efehl ausführen..."
 
+#: gajim/data/gui/account_context_menu.ui:65
+msgid "_View Certificate"
+msgstr "Zertifikat _anzeigen"
+
+#: gajim/data/gui/manage_proxies.ui:12
+msgctxt "proxy configuration"
+msgid "HTTP Connect"
+msgstr "HTTP-Connect"
+
+#: gajim/data/gui/manage_proxies.ui:15
+msgctxt "proxy configuration"
+msgid "SOCKS5"
+msgstr "SOCKS5"
+
+#: gajim/data/gui/manage_proxies.ui:18
+msgctxt "proxy configuration"
+msgid "BOSH"
+msgstr "BOSH"
+
+#: gajim/data/gui/manage_proxies.ui:68
+msgid "Add Proxy"
+msgstr "Proxy hinzufügen"
+
+#: gajim/data/gui/manage_proxies.ui:82
+msgid "Remove Proxy"
+msgstr "Proxy entfernen"
+
+#: gajim/data/gui/manage_proxies.ui:134
+msgid "Pass_word"
+msgstr "Pass_wort"
+
+#: gajim/data/gui/manage_proxies.ui:159
+msgid "Use proxy auth_entication"
+msgstr "Authentifizierung _verwenden"
+
+#: gajim/data/gui/manage_proxies.ui:179
+msgid "_Username"
+msgstr "_Benutzername"
+
+#: gajim/data/gui/manage_proxies.ui:209
+msgid "_Port"
+msgstr "_Port"
+
+#: gajim/data/gui/manage_proxies.ui:226
+msgid "example.org"
+msgstr "beispiel.org"
+
+#: gajim/data/gui/manage_proxies.ui:240
+msgid "_Host"
+msgstr "_Host"
+
+#: gajim/data/gui/manage_proxies.ui:254
+msgid "Use HTTP prox_y"
+msgstr "HTTP-Prox_y verwenden"
+
+#: gajim/data/gui/manage_proxies.ui:275
+msgid "https://example.org/http-bind/"
+msgstr "https://beispiel.org/http-bind/"
+
+#: gajim/data/gui/manage_proxies.ui:291
+msgid "_BOSH URL"
+msgstr "_BOSH-URL"
+
+#: gajim/data/gui/manage_proxies.ui:309 gajim/gtk/adhoc.py:322
+msgid "Settings"
+msgstr "Einstellungen"
+
+#: gajim/data/gui/manage_proxies.ui:344
+msgid "_Type"
+msgstr "_Typ"
+
+#: gajim/data/gui/manage_proxies.ui:361
+#: gajim/data/gui/groupchat_creation.ui:105
+msgid "_Name"
+msgstr "_Name"
+
+#: gajim/data/gui/manage_proxies.ui:391 gajim/gtk/accounts.py:742
+msgid "Proxy"
+msgstr "Proxy"
+
 #: gajim/data/gui/application_menu.ui:8
 msgid "View"
 msgstr "Ansicht"
 
 #: gajim/data/gui/application_menu.ui:11
-msgid "Show Roster"
+msgid "Show Contact List"
 msgstr "Kontaktliste anzeigen"
 
 #: gajim/data/gui/application_menu.ui:16
@@ -7702,21 +7766,22 @@ msgstr "Tastenkürzel"
 msgid "Features"
 msgstr "Features"
 
-#: gajim/data/gui/application_menu.ui:81
-msgid "Bookmarks"
-msgstr "Gruppenchats verwalten"
+#: gajim/data/gui/application_menu.ui:77
+#: gajim/data/gui/groupchat_creation.ui:81 gajim/gtk/groupchat_creation.py:45
+msgid "Create Group Chat"
+msgstr "Gruppenchat erstellen"
 
-#: gajim/data/gui/application_menu.ui:94 gajim/data/gui/shortcuts_window.ui:189
-#: gajim/gtk/preferences.py:59
+#: gajim/data/gui/application_menu.ui:91 gajim/data/gui/shortcuts_window.ui:189
+#: gajim/gtk/preferences.py:58
 msgid "Preferences"
 msgstr "Einstellungen"
 
-#: gajim/data/gui/application_menu.ui:99
+#: gajim/data/gui/application_menu.ui:96
 msgid "Quit"
 msgstr "Beenden"
 
 #: gajim/data/gui/httpupload_progress_dialog.ui:110
-#: gajim/gtk/filetransfer.py:121
+#: gajim/gtk/filetransfer.py:120
 msgid "Progress"
 msgstr "Fortschritt"
 
@@ -7732,45 +7797,34 @@ msgstr "Verbleibende Zeit"
 msgid "_Cancel Upload"
 msgstr "Hochladen _abbrechen"
 
-#: gajim/data/gui/manage_bookmarks_window.ui:13
-msgid "Group Chat Bookmarks"
-msgstr "Gruppenchats verwalten"
-
-#: gajim/data/gui/manage_bookmarks_window.ui:68
-msgid "Add Bookmark"
-msgstr "Gruppenchat hinzufügen"
+#: gajim/data/gui/groupchat_creation.ui:27
+msgid "Public or Private?"
+msgstr "Öffentlich oder Privat?"
 
-#: gajim/data/gui/manage_bookmarks_window.ui:82
-msgid "Remove Bookmark"
-msgstr "Gespeicherten Gruppenchat entfernen"
-
-#: gajim/data/gui/manage_bookmarks_window.ui:126
-msgid "N_ame"
-msgstr "_Name"
-
-#: gajim/data/gui/manage_bookmarks_window.ui:145
-msgid "Bookmark Name"
-msgstr "Name des Gruppenchats"
-
-#: gajim/data/gui/manage_bookmarks_window.ui:160
-msgid "_Server"
-msgstr "_Server"
+#: 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>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."
 
-#: gajim/data/gui/manage_bookmarks_window.ui:223
-msgid "Roo_m"
-msgstr "G_ruppenchat"
+#: 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/manage_bookmarks_window.ui:253
-msgid "_Password"
-msgstr "_Passwort"
+#: gajim/data/gui/groupchat_creation.ui:122
+msgid "_Description"
+msgstr "_Beschreibung"
 
-#: gajim/data/gui/manage_bookmarks_window.ui:299
-msgid "Join chat when connected"
-msgstr "Chat beitreten, sobald eine Verbindung besteht"
+#: gajim/data/gui/groupchat_creation.ui:164
+msgid "_Public"
+msgstr "Ö_ffentlich"
 
-#: gajim/data/gui/manage_bookmarks_window.ui:307
-msgid "_Join Automatically"
-msgstr "A_utomatisch beitreten"
+#: gajim/data/gui/groupchat_creation.ui:278
+msgid "_Account"
+msgstr "K_onto"
 
 #: gajim/data/gui/exception_dialog.ui:49
 msgid "Sorry, that should not have happened"
@@ -7814,6 +7868,26 @@ msgstr "Kontakt autorisieren, sodass er Ihren Status sehen kann"
 msgid "Presets"
 msgstr "Voreinstellungen"
 
+#: gajim/data/gui/groupchat_info_scrolled.ui:32
+msgid "Address"
+msgstr "Adresse"
+
+#: gajim/data/gui/groupchat_info_scrolled.ui:64
+msgid "Topic"
+msgstr "Thema"
+
+#: gajim/data/gui/groupchat_info_scrolled.ui:80
+msgid "Author"
+msgstr "Autor"
+
+#: gajim/data/gui/groupchat_info_scrolled.ui:182
+msgid "Discussion Logs"
+msgstr "Unterhaltungsverlauf"
+
+#: gajim/data/gui/groupchat_info_scrolled.ui:260
+msgid "Group Chat Language"
+msgstr "Sprache des Gruppenchats"
+
 #: gajim/data/gui/emoji_chooser.ui:98
 msgid "No Results Found"
 msgstr "Keine Ergebnisse"
@@ -7824,24 +7898,32 @@ msgstr "Freunde einladen!"
 
 #: gajim/data/gui/chat_to_muc_window.ui:39
 msgid ""
-"You are now entering a groupchat.\n"
+"You are now entering a group chat.\n"
 "Select the contacts you want to invite"
 msgstr ""
 "Sie treten nun einem Gruppenchat bei.\n"
-"Bitte wählen Sie die Kontakte, die Sie einladen wollen"
+"Wählen Sie die Kontakte, die Sie einladen wollen"
 
 #: gajim/data/gui/chat_to_muc_window.ui:112
-msgid "Please select a MUC server."
+msgid "Please select a group chat server."
 msgstr "Bitte wählen Sie einen Gruppenchat-Server aus."
 
 #: gajim/data/gui/chat_to_muc_window.ui:141
-msgid "MUC server"
+msgid "Group chat server"
 msgstr "Gruppenchat-Server"
 
 #: gajim/data/gui/chat_to_muc_window.ui:176
 msgid "In_vite"
 msgstr "_Einladen zu"
 
+#: gajim/data/gui/bookmarks.ui:176
+msgid "Autojoin"
+msgstr "Automatisch verbinden"
+
+#: gajim/data/gui/bookmarks.ui:211
+msgid "_Apply"
+msgstr "Ü_bernehmen"
+
 #: gajim/data/gui/history_manager.ui:11
 msgid "_Export"
 msgstr "_Exportieren"
@@ -7856,18 +7938,18 @@ msgstr "Gajim-Verlaufsmanager"
 
 #: gajim/data/gui/history_manager.ui:108
 msgid ""
-"This log manager is not intended for log viewing. If you are looking for "
-"such functionality, use the history window instead.\n"
+"This history manager is not intended for viewing chat history. If you are "
+"looking for such functionality, please use the history window instead.\n"
 "\n"
-"Use this program to delete or export logs. You can select logs from the left "
-"and/or search database from below."
+"You can use this program to delete or export history. Either select logs "
+"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 "
+"gedacht. Wenn Sie nach einer solchen Funktion suchen, benutzen Sie bitte "
 "stattdessen 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 und unten die Datenbank "
+"exportieren. Sie können links Einträge auswählen oder unten die Datenbank "
 "durchsuchen."
 
 #: gajim/data/gui/history_manager.ui:124
@@ -7910,8 +7992,8 @@ msgid "Select an emoji"
 msgstr "Ein Emoji auswählen"
 
 #: gajim/data/gui/shortcuts_window.ui:38
-msgid "Complete a command or a nick"
-msgstr "Einen Befehl oder einen Nicknamen vervollständigen"
+msgid "Complete a command or a nickname"
+msgstr "Einen Befehl oder einen Spitznamen vervollständigen"
 
 #: gajim/data/gui/shortcuts_window.ui:45
 msgid "Previously sent message"
@@ -7945,7 +8027,7 @@ msgstr "Nach oben scrollen"
 msgid "Scroll down"
 msgstr "Nach unten scrollen"
 
-#: gajim/data/gui/shortcuts_window.ui:100 gajim/gtk/xml_console.py:72
+#: gajim/data/gui/shortcuts_window.ui:100 gajim/gtk/xml_console.py:69
 msgid "Clear"
 msgstr "Leeren"
 
@@ -7986,7 +8068,7 @@ msgid "Close chat"
 msgstr "Chat schließen"
 
 #: gajim/data/gui/shortcuts_window.ui:173
-msgid "Roster Shortcuts"
+msgid "Contact List Shortcuts"
 msgstr "Tastenkürzel für die Kontaktliste"
 
 #: gajim/data/gui/shortcuts_window.ui:196
@@ -8014,7 +8096,7 @@ msgid "Show only active contacts"
 msgstr "Nur aktive Kontakte anzeigen"
 
 #: gajim/data/gui/shortcuts_window.ui:251
-msgid "Enable roster filtering"
+msgid "Enable contact list filtering"
 msgstr "Aktiviere Filterung in der Kontaktliste"
 
 #: gajim/data/gui/shortcuts_window.ui:259
@@ -8054,12 +8136,12 @@ msgid "Search selected day only"
 msgstr "Suche nur im gewählten Tag"
 
 #: gajim/data/gui/history_window.ui:317
-msgid "Record history for this chat"
-msgstr "Verlauf dieses Chats speichern"
+msgid "Store history for this chat"
+msgstr "Unterhaltungsverlauf dieses Chats speichern"
 
 #: gajim/data/gui/history_window.ui:332
-msgid "Record History"
-msgstr "Verlauf speichern"
+msgid "Store History"
+msgstr "Unterhaltungsverlauf speichern"
 
 # TODO: Typo
 #: gajim/data/gui/history_window.ui:350
@@ -8078,9 +8160,9 @@ msgstr "Neuen Beitrag erstellen"
 msgid "Fill in the form."
 msgstr "Bitte füllen Sie das Formular aus."
 
-#: gajim/data/gui/data_form_window.ui:229
-msgid "Room Configuration"
-msgstr "Verwaltung des Gruppenchats"
+#: gajim/data/gui/data_form_window.ui:229 gajim/gtk/groupchat_config.py:41
+msgid "Group Chat Configuration"
+msgstr "Gruppenchat-Konfiguration"
 
 #: gajim/data/gui/roster_item_exchange_window.ui:39
 #: gajim/gtk/roster_item_exchange.py:35
@@ -8099,15 +8181,15 @@ msgstr "Sta_tus"
 msgid "_Start Chat..."
 msgstr "Chat _starten..."
 
-#: gajim/data/gui/systray_context_menu.ui:50
+#: gajim/data/gui/systray_context_menu.ui:43
 msgid "Show All Pending _Events"
 msgstr "Zeige alle neuen _Ereignisse"
 
-#: gajim/data/gui/systray_context_menu.ui:59
+#: gajim/data/gui/systray_context_menu.ui:52
 msgid "Mute Sounds"
 msgstr "Klänge stummschalten"
 
-#: gajim/data/gui/systray_context_menu.ui:75
+#: gajim/data/gui/systray_context_menu.ui:68
 msgid "_Preferences"
 msgstr "_Einstellungen"
 
@@ -8192,35 +8274,35 @@ msgstr "Befehl in einer Shell ausführen, Ausgabe anzeigen"
 msgid "Execute expression inside a shell, send output"
 msgstr "Befehl in einer Shell ausführen, Ausgabe senden"
 
-#: gajim/command_system/implementation/standard.py:45
+#: gajim/command_system/implementation/standard.py:47
 msgid ""
 "Show help on a given command or a list of available commands if -a is given"
 msgstr ""
 "Hilfe für einen bestimmten Befehl oder mit -a Liste der verfügbaren Befehle "
 "anzeigen"
 
-#: gajim/command_system/implementation/standard.py:73
+#: gajim/command_system/implementation/standard.py:75
 msgid "Send a message to the contact"
 msgstr "Dem Kontakt eine Nachricht schicken"
 
-#: gajim/command_system/implementation/standard.py:78
+#: gajim/command_system/implementation/standard.py:80
 msgid "Send action (in the third person) to the current chat"
 msgstr "Aktion (in dritter Person) an aktuellen Chat senden"
 
-#: gajim/command_system/implementation/standard.py:83
+#: gajim/command_system/implementation/standard.py:85
 msgid "Show logged messages which mention given text"
 msgstr "Gespeicherte Nachrichten anzeigen, die den angegeben Text enthalten"
 
-#: gajim/command_system/implementation/standard.py:88
+#: gajim/command_system/implementation/standard.py:90
 #, python-format
 msgid "%s: Nothing found"
 msgstr "%s: Nichts gefunden"
 
-#: gajim/command_system/implementation/standard.py:94
+#: gajim/command_system/implementation/standard.py:96
 msgid "Limit must be an integer"
 msgstr "Grenze muss eine ganze Zahl sein"
 
-#: gajim/command_system/implementation/standard.py:118
+#: gajim/command_system/implementation/standard.py:120
 msgid ""
 "\n"
 "    Set the current status\n"
@@ -8236,119 +8318,119 @@ msgstr ""
 "    online, away, chat, xa, dnd.\n"
 "    "
 
-#: gajim/command_system/implementation/standard.py:136
+#: gajim/command_system/implementation/standard.py:138
 msgid "Set the current status to away"
 msgstr "Aktuellen Status festlegen auf Away"
 
-#: gajim/command_system/implementation/standard.py:150
+#: gajim/command_system/implementation/standard.py:152
 msgid "Set the current status to online"
 msgstr "Aktuellen Status festlegen auf Online"
 
-#: gajim/command_system/implementation/standard.py:153
+#: gajim/command_system/implementation/standard.py:155
 msgid "Available"
 msgstr "Verfügbar"
 
-#: gajim/command_system/implementation/standard.py:173
-#: gajim/command_system/implementation/standard.py:250
+#: gajim/command_system/implementation/standard.py:175
+#: gajim/command_system/implementation/standard.py:252
 msgid "Clear the text window"
 msgstr "Textfenster leeren"
 
-#: gajim/command_system/implementation/standard.py:178
-#: gajim/command_system/implementation/standard.py:397
+#: gajim/command_system/implementation/standard.py:180
+#: gajim/command_system/implementation/standard.py:401
 msgid "Send a ping to the contact"
 msgstr "Ping an Kontakt senden"
 
-#: gajim/command_system/implementation/standard.py:181
-#: gajim/command_system/implementation/standard.py:400
+#: gajim/command_system/implementation/standard.py:183
+#: gajim/command_system/implementation/standard.py:404
 msgid "Command is not supported for zeroconf accounts"
 msgstr "Dieser Befehl wird für Zeroconf-Konten nicht unterstützt"
 
-#: gajim/command_system/implementation/standard.py:185
-msgid "Send DTMF sequence through an open audio session"
-msgstr "DTMF-Sequenz durch offene Audiositzung schicken"
+#: gajim/command_system/implementation/standard.py:187
+msgid "Send DTMF sequence through an open voice chat"
+msgstr "Sende DTMF-Sequenz durch offenen Sprachanruf"
 
-#: gajim/command_system/implementation/standard.py:188
-msgid "No open audio sessions with the contact"
-msgstr "Keine offene Audiositzung mit diesem Kontakt"
+#: gajim/command_system/implementation/standard.py:190
+msgid "No open voice chats with the contact"
+msgstr "Kein aktiver Sprachanruf mit diesem Kontakt"
 
-#: gajim/command_system/implementation/standard.py:191
+#: gajim/command_system/implementation/standard.py:193
 #, python-format
 msgid "%s is not a valid tone"
 msgstr "%s ist kein gültiger Ton"
 
-#: gajim/command_system/implementation/standard.py:198
-msgid "Toggle audio session"
-msgstr "Zwischen Audio-Sitzung umschalten"
+#: gajim/command_system/implementation/standard.py:200
+msgid "Toggle Voice Chat"
+msgstr "Sprachanruf starten"
 
-#: gajim/command_system/implementation/standard.py:201
-msgid "Audio sessions are not available"
-msgstr "Keine Audiositzungen verfügbar"
+#: gajim/command_system/implementation/standard.py:203
+msgid "Voice chats are not available"
+msgstr "Sprachanrufe sind nicht verfügbar"
 
-#: gajim/command_system/implementation/standard.py:208
-msgid "Toggle video session"
-msgstr "Zwischen Video-Sitzung umschalten"
+#: gajim/command_system/implementation/standard.py:210
+msgid "Toggle Video Chat"
+msgstr "Videoanruf starten"
 
-#: gajim/command_system/implementation/standard.py:211
-msgid "Video sessions are not available"
-msgstr "Keine Videositzungen verfügbar"
+#: gajim/command_system/implementation/standard.py:213
+msgid "Video chats are not available"
+msgstr "Videoanrufe sind nicht verfügbar"
 
-#: gajim/command_system/implementation/standard.py:218
+#: gajim/command_system/implementation/standard.py:220
 msgid "Send a message to the contact that will attract their attention"
 msgstr "Eine Nachricht senden, um die Aufmerksamkeit des Kontakts zu bekommen"
 
-#: gajim/command_system/implementation/standard.py:255
+#: gajim/command_system/implementation/standard.py:257
 msgid "Change your nickname in a group chat"
 msgstr "Spitznamen in einem Gruppenchat ändern"
 
-#: gajim/command_system/implementation/standard.py:260 gajim/gtk/dialogs.py:674
-#: gajim/gtk/bookmarks.py:272
+#: gajim/command_system/implementation/standard.py:262
 msgid "Invalid nickname"
 msgstr "Ungültiger Spitzname"
 
-#: gajim/command_system/implementation/standard.py:267
-msgid "Open a private chat window with a specified occupant"
+#: gajim/command_system/implementation/standard.py:269
+msgid "Open a private chat window with a specified participant"
 msgstr "Öffnet ein privates Chatfenster mit dem angegebenen Teilnehmer"
 
-#: gajim/command_system/implementation/standard.py:273
-#: gajim/command_system/implementation/standard.py:282
-#: gajim/command_system/implementation/standard.py:332
-#: gajim/command_system/implementation/standard.py:345
-#: gajim/command_system/implementation/standard.py:357
+#: gajim/command_system/implementation/standard.py:275
+#: gajim/command_system/implementation/standard.py:284
+#: gajim/command_system/implementation/standard.py:336
+#: gajim/command_system/implementation/standard.py:349
+#: gajim/command_system/implementation/standard.py:361
 msgid "Nickname not found"
 msgstr "Spitzname nicht gefunden"
 
-#: gajim/command_system/implementation/standard.py:276
+#: gajim/command_system/implementation/standard.py:278
 msgid ""
-"Open a private chat window with a specified occupant and send him a message"
+"Open a private chat window with a specified participant and send him a "
+"message"
 msgstr ""
 "Öffne ein privates Chatfenster mit dem angegebenen Teilnehmer und schicke "
 "ihm eine Nachricht"
 
-#: gajim/command_system/implementation/standard.py:285
+#: gajim/command_system/implementation/standard.py:287
 msgid "Display or change a group chat topic"
 msgstr "Thema des Gruppenchats anzeigen oder ändern"
 
-#: gajim/command_system/implementation/standard.py:294
-msgid "Invite a user to a room for a reason"
+#: gajim/command_system/implementation/standard.py:296
+msgid "Invite a user to a group chat for a reason"
 msgstr "Benutzer mit Begründung in einen Gruppenchat einladen"
 
-#: gajim/command_system/implementation/standard.py:297
+#: gajim/command_system/implementation/standard.py:299
 #, python-format
 msgid "Invited %(jid)s to %(room_jid)s"
 msgstr "Es wurde(n) %(jid)s in %(room_jid)s eingeladen"
 
-#: gajim/command_system/implementation/standard.py:301
-msgid "Join a group chat given by a JID"
-msgstr "Gruppenchat über eine JID beitreten"
+#: gajim/command_system/implementation/standard.py:303
+msgid "Join a group chat given by an XMPP Address"
+msgstr "Gruppenchat über die angegebene XMPP-Adresse beitreten"
 
-#: gajim/command_system/implementation/standard.py:309
+#: gajim/command_system/implementation/standard.py:313
 msgid ""
-"Leave the groupchat, optionally giving a reason, and close tab or window"
+"Leave the group chat, optionally giving a reason, and close tab or window"
 msgstr ""
 "Gruppenchat verlassen (optional mit Begründung) und Tab oder Fenster "
 "schließen"
 
-#: gajim/command_system/implementation/standard.py:314
+#: gajim/command_system/implementation/standard.py:318
 msgid ""
 "\n"
 "    Ban user by a nick or a JID from a groupchat\n"
@@ -8363,49 +8445,49 @@ msgstr ""
 "interpretiert.\n"
 "    "
 
-#: gajim/command_system/implementation/standard.py:329
-msgid "Kick user by a nick from a groupchat"
-msgstr "Teilnehmer aus Gruppenchat werfen"
+#: gajim/command_system/implementation/standard.py:333
+msgid "Kick user by a nick from a group chat"
+msgstr "Teilnehmer per Spitzname aus Gruppenchat werfen"
 
-#: gajim/command_system/implementation/standard.py:338
+#: gajim/command_system/implementation/standard.py:342
 msgid ""
-"Set occupant role in group chat.\n"
+"Set participant role in group chat.\n"
 "    Role can be given as one of the following values:\n"
 "    moderator, participant, visitor, none"
 msgstr ""
-"Rolle des Teilnehmers in diesem Gruppenchat festlegen.\n"
-"    Die Rolle kann einer der folgenden Werte sein:\n"
+"Rolle eines Teilnehmers in einem Gruppenchat festlegen.\n"
+"    Die Rolle kann einen der folgenden Werte annehmen:\n"
 "    moderator, participant, visitor, none"
 
-#: gajim/command_system/implementation/standard.py:343
+#: gajim/command_system/implementation/standard.py:347
 msgid "Invalid role given"
 msgstr "Ungültige Rolle angegeben"
 
-#: gajim/command_system/implementation/standard.py:350
+#: gajim/command_system/implementation/standard.py:354
 msgid ""
-"Set occupant affiliation in group chat.\n"
+"Set participant affiliation in group chat.\n"
 "    Affiliation can be given as one of the following values:\n"
 "    owner, admin, member, outcast, none"
 msgstr ""
-"Gruppenzugehörigkeit eines Teilnehmers in diesem Gruppenchat festlegen.\n"
+"Gruppenzugehörigkeit eines Teilnehmers in einem Gruppenchat festlegen.\n"
 "    Die Gruppenzugehörigkeit kann einen der folgenden Werte annehmen:\n"
 "    owner, admin, member, outcast, none"
 
-#: gajim/command_system/implementation/standard.py:355
+#: gajim/command_system/implementation/standard.py:359
 msgid "Invalid affiliation given"
 msgstr "Ungültige Gruppenzugehörigkeit angegeben"
 
-#: gajim/command_system/implementation/standard.py:365
-msgid "Display names of all group chat occupants"
-msgstr "Namen aller Teilnehmer im Gruppenchat anzeigen"
+#: gajim/command_system/implementation/standard.py:369
+msgid "Display names of all group chat participants"
+msgstr "Namen aller Teilnehmer des Gruppenchats anzeigen"
 
-#: gajim/command_system/implementation/standard.py:387
-msgid "Forbid an occupant to send you public or private messages"
+#: gajim/command_system/implementation/standard.py:391
+msgid "Forbid a participant to send you public or private messages"
 msgstr ""
 "Einem Teilnehmer verbieten öffentliche oder private Nachrichten zu senden"
 
-#: gajim/command_system/implementation/standard.py:392
-msgid "Allow an occupant to send you public or private messages"
+#: gajim/command_system/implementation/standard.py:396
+msgid "Allow a participant to send you public or private messages"
 msgstr ""
 "Einem Teilnehmer erlauben öffentliche oder private Nachrichten zu senden"
 
@@ -8417,197 +8499,314 @@ msgstr "Fehler bei der Ausführung des Befehls!"
 msgid "The same as using a doc-string, except it supports translation"
 msgstr "Das gleiche wie ein doc-string, aber mit Übersetzungsunterstützung"
 
-#: gajim/gtk/filetransfer.py:91
+#: gajim/gtk/groupchat_info.py:36
+msgid "?Group chat feature:Archiving"
+msgstr "Nachrichtenspeicherung"
+
+#: gajim/gtk/groupchat_info.py:37
+msgid "Messages are archived on the server"
+msgstr "Nachrichten werden auf dem Server gespeichert"
+
+#: gajim/gtk/groupchat_info.py:40
+msgid "?Group chat feature:Persistent"
+msgstr "Beständig"
+
+#: gajim/gtk/groupchat_info.py:41
+msgid "This group chat persists even if there are no participants"
+msgstr ""
+"Dieser Gruppenchat bleibt bestehen, auch wenn keine Teilnehmer beigetreten "
+"sind"
+
+#: gajim/gtk/groupchat_info.py:45
+msgid "?Group chat feature:Temporary"
+msgstr "Vorübergehend"
+
+#: gajim/gtk/groupchat_info.py:46
+msgid "This group chat will be destroyed once the last participant left"
+msgstr ""
+"Dieser Gruppenchat wird aufgelöst, sobald der letzte Teilnehmer ihn "
+"verlassen hat"
+
+#: gajim/gtk/groupchat_info.py:50
+msgid "?Group chat feature:Moderated"
+msgstr "Moderiert"
+
+#: gajim/gtk/groupchat_info.py:51
+msgid ""
+"Participants entering this group chat need to request permission to send "
+"messages"
+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:55
+msgid "?Group chat feature:Not Moderated"
+msgstr "Unmoderiert"
+
+#: gajim/gtk/groupchat_info.py:56
+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:60
+msgid "?Group chat feature:Open"
+msgstr "Offen"
+
+#: gajim/gtk/groupchat_info.py:61
+msgid "Anyone can join this group chat"
+msgstr "Jeder kann dem Gruppenchat beitreten"
+
+#: gajim/gtk/groupchat_info.py:64
+msgid "?Group chat feature:Members Only"
+msgstr "Nur für Mitglieder"
+
+#: gajim/gtk/groupchat_info.py:65
+msgid "This group chat is restricted to members only"
+msgstr "Dieser Gruppenchat ist nur für Mitglieder"
+
+#: gajim/gtk/groupchat_info.py:69
+msgid "?Group chat feature:Public"
+msgstr "Öffentlich"
+
+#: gajim/gtk/groupchat_info.py:70
+msgid "Group chat can be found via search"
+msgstr "Dieser Gruppenchat kann mithilfe einer Suche gefunden werden"
+
+#: gajim/gtk/groupchat_info.py:73
+msgid "?Group chat feature:Hidden"
+msgstr "Versteckt"
+
+#: gajim/gtk/groupchat_info.py:74
+msgid "This group chat can not be found via search"
+msgstr "Dieser Gruppenchat kann nicht durch eine Suche gefunden werden"
+
+#: gajim/gtk/groupchat_info.py:77
+msgid "?Group chat feature:Not Anonymous"
+msgstr "Nicht anonym"
+
+#: gajim/gtk/groupchat_info.py:78
+msgid "All other group chat participants can see your XMPP address"
+msgstr "Alle Teilnehmer des Gruppenchats können Ihre XMPP-Adresse sehen"
+
+#: gajim/gtk/groupchat_info.py:82
+msgid "?Group chat feature:Semi-Anonymous"
+msgstr "Halbanonym"
+
+#: gajim/gtk/groupchat_info.py:83
+msgid "Only moderators can see your XMPP address"
+msgstr "Nur Moderatoren können Ihre XMPP-Adresse sehen"
+
+#: gajim/gtk/groupchat_info.py:86
+msgid "?Group chat feature:Password Required"
+msgstr "Passwort benötigt"
+
+#: gajim/gtk/groupchat_info.py:87
+msgid "This group chat does require a password upon entry"
+msgstr "Dieser Gruppenchat benötigt ein Passwort um beizutreten"
+
+#: gajim/gtk/groupchat_info.py:91
+msgid "?Group chat feature:No Password Required"
+msgstr "Kein Passwort benötigt"
+
+#: gajim/gtk/groupchat_info.py:92
+msgid "This group chat does not require a password upon entry"
+msgstr "Dieser Gruppenchat benötigt kein Passwort um beizutreten"
+
+#: gajim/gtk/filetransfer.py:90
 msgid "File"
 msgstr "Datei"
 
-#: gajim/gtk/filetransfer.py:108
+#: gajim/gtk/filetransfer.py:107
 msgid "Time"
 msgstr "Zeit"
 
-#: gajim/gtk/filetransfer.py:228
+#: gajim/gtk/filetransfer.py:227
 #, python-format
 msgid "File name: %s"
 msgstr "Dateiname: %s"
 
-#: gajim/gtk/filetransfer.py:229 gajim/gtk/filetransfer.py:464
+#: gajim/gtk/filetransfer.py:228 gajim/gtk/filetransfer.py:469
 #, python-format
 msgid "Size: %s"
 msgstr "Größe: %s"
 
-#: gajim/gtk/filetransfer.py:239
+#: gajim/gtk/filetransfer.py:238
 #, python-format
 msgid "Sender: %s"
 msgstr "Absender: %s"
 
-#: gajim/gtk/filetransfer.py:240 gajim/gtk/filetransfer.py:744
+#: gajim/gtk/filetransfer.py:239 gajim/gtk/filetransfer.py:749
 #: gajim/gtk/tooltips.py:577
 msgid "Recipient: "
 msgstr "Empfänger: "
 
-#: gajim/gtk/filetransfer.py:251
+#: gajim/gtk/filetransfer.py:250
 #, python-format
 msgid "Saved in: %s"
 msgstr "Gespeichert in: %s"
 
-#: gajim/gtk/filetransfer.py:256
+#: gajim/gtk/filetransfer.py:255
 msgid "File transfer completed"
 msgstr "Dateiübertragung abgeschlossen"
 
-#: gajim/gtk/filetransfer.py:276 gajim/gtk/filetransfer.py:285
+#: gajim/gtk/filetransfer.py:275 gajim/gtk/filetransfer.py:284
 msgid "Connection with peer could not be established."
 msgstr "Verbindung zum Kontakt konnte nicht hergestellt werden."
 
-#: gajim/gtk/filetransfer.py:293
+#: gajim/gtk/filetransfer.py:292
 #, python-format
 msgid "Filename: %s"
 msgstr "Dateiname: %s"
 
-#: gajim/gtk/filetransfer.py:294
+#: gajim/gtk/filetransfer.py:293
 #, python-format
 msgid "Recipient: %s"
 msgstr "Empfänger: %s"
 
-#: gajim/gtk/filetransfer.py:296
+#: gajim/gtk/filetransfer.py:295
 #, python-format
 msgid "Error message: %s"
 msgstr "Fehlermeldung: %s"
 
-#: gajim/gtk/filetransfer.py:333
-msgid "File transfer error"
-msgstr "Fehler bei der Dateiübertragung"
-
 #: gajim/gtk/filetransfer.py:334
 #, python-format
 msgid ""
-"The file %(file)s has been received, but it seems to have been damaged along "
-"the way.\n"
+"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 ""
-"Die Datei %(file)s wurde empfangen, scheinbar wurde sie jedoch bei der "
+"Die Datei %s wurde empfangen, anscheinend wurde sie jedoch bei der "
 "Übertragung beschädigt.\n"
-"Wollen Sie die Datei erneut übertragen?"
+"Wollen Sie die Datei erneut herunterladen?"
+
+#: gajim/gtk/filetransfer.py:340
+msgid "_Download Again"
+msgstr "_Erneut herunterladen"
 
-#: gajim/gtk/filetransfer.py:350
+#: gajim/gtk/filetransfer.py:355
 msgid "Gajim can not read this file"
 msgstr "Gajim kann auf diese Datei nicht zugreifen"
 
-#: gajim/gtk/filetransfer.py:351
+#: gajim/gtk/filetransfer.py:356
 msgid "Another process is using this file."
 msgstr "Die Datei wird bereits von einem anderen Programm verwendet."
 
-#: gajim/gtk/filetransfer.py:418
+#: gajim/gtk/filetransfer.py:423
 msgid "File Transfer Conflict"
 msgstr "Konflikt bei der Dateiübertragung"
 
-#: gajim/gtk/filetransfer.py:419
+#: gajim/gtk/filetransfer.py:424
 msgid "This file already exists"
 msgstr "Diese Datei existiert bereits"
 
-#: gajim/gtk/filetransfer.py:420
+#: gajim/gtk/filetransfer.py:425
 msgid "Resume download or replace file?"
 msgstr "Download fortsetzen oder Datei ersetzen?"
 
-#: gajim/gtk/filetransfer.py:424
+#: gajim/gtk/filetransfer.py:429
 msgid "Replace _File"
 msgstr "Er_setzen"
 
-#: gajim/gtk/filetransfer.py:427
+#: gajim/gtk/filetransfer.py:432
 msgid "Resume _Download"
 msgstr "_Fortsetzen"
 
-#: gajim/gtk/filetransfer.py:437
+#: gajim/gtk/filetransfer.py:442
 #, python-format
 msgid "Directory '%s' is not writable"
 msgstr "Kein Schreibzugriff auf Verzeichnis \"%s\""
 
-#: gajim/gtk/filetransfer.py:438
+#: gajim/gtk/filetransfer.py:443
 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 "
 "Dateien zu erstellen."
 
-#: gajim/gtk/filetransfer.py:461
+#: gajim/gtk/filetransfer.py:466
 #, python-format
 msgid "File: %s"
 msgstr "Datei: %s"
 
-#: gajim/gtk/filetransfer.py:467
+#: gajim/gtk/filetransfer.py:472
 #, python-format
 msgid "Type: %s"
 msgstr "Typ: %s"
 
-#: gajim/gtk/filetransfer.py:469
+#: gajim/gtk/filetransfer.py:474
 #, python-format
 msgid "Description: %s"
 msgstr "Beschreibung: %s"
 
-#: gajim/gtk/filetransfer.py:480
+#: gajim/gtk/filetransfer.py:485
 #, python-format
 msgid "%s wants to send you a file"
 msgstr "%s möchte Ihnen eine Datei senden"
 
-#: gajim/gtk/filetransfer.py:509
+#: gajim/gtk/filetransfer.py:514
 msgid "Checking file…"
 msgstr "Überprüfe Datei…"
 
-#: gajim/gtk/filetransfer.py:524
+#: gajim/gtk/filetransfer.py:529
 msgid "File error"
 msgstr "Dateifehler"
 
-#: gajim/gtk/filetransfer.py:561
+#: gajim/gtk/filetransfer.py:566
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 
-#: gajim/gtk/filetransfer.py:658
+#: gajim/gtk/filetransfer.py:663
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/s)"
 
-#: gajim/gtk/filetransfer.py:711 gajim/gtk/filetransfer.py:715
+#: gajim/gtk/filetransfer.py:716 gajim/gtk/filetransfer.py:720
 msgid "Invalid File"
 msgstr "Ungültige Datei"
 
-#: gajim/gtk/filetransfer.py:711
+#: gajim/gtk/filetransfer.py:716
 msgid "File: "
 msgstr "Datei: "
 
-#: gajim/gtk/filetransfer.py:716
+#: gajim/gtk/filetransfer.py:721
 msgid "It is not possible to send empty files"
 msgstr "Es nicht möglich, leere Dateien zu versenden"
 
-#: gajim/gtk/filetransfer.py:742 gajim/gtk/tooltips.py:571
+#: gajim/gtk/filetransfer.py:747 gajim/gtk/tooltips.py:571
 msgid "Sender: "
 msgstr "Absender: "
 
-#: gajim/gtk/filetransfer.py:1038
+#: gajim/gtk/filetransfer.py:1043
 msgid "Choose a File to Send…"
 msgstr "Datei auswählen…"
 
 #: gajim/gtk/start_chat.py:51
-msgid "Start new Conversation"
+msgid "Start New Conversation"
 msgstr "Neue Unterhaltung starten"
 
-#: gajim/gtk/start_chat.py:424
-msgid "New Groupchat"
-msgstr "Neuer Gruppenchat"
+#: gajim/gtk/start_chat.py:260 gajim/gtk/start_chat.py:328
+msgid "You can not join a group chat unless you are connected."
+msgstr "Sie können einem Gruppenchat erst beitreten, wenn Sie verbunden sind."
 
-#: gajim/gtk/start_chat.py:426
-msgid "New Contact"
-msgstr "Neuer Kontakt"
+#: gajim/gtk/start_chat.py:603 gajim/gtk/groupchat_join.py:38
+msgid "Join Group Chat"
+msgstr "Gruppenchat beitreten"
 
-#: gajim/gtk/start_chat.py:588
+#: gajim/gtk/start_chat.py:605 gajim/gtk/add_contact.py:40
+msgid "Add Contact"
+msgstr "Kontakt hinzufügen"
+
+#: gajim/gtk/start_chat.py:746
 #, python-format
-msgid "%s Group chats found"
+msgid "%s group chats found"
 msgstr "%s Gruppenchats gefunden"
 
-#: gajim/gtk/discovery.py:70
+#: gajim/gtk/discovery.py:69
 msgid "This service has not yet responded with detailed information"
 msgstr ""
 "Dieser Dienst hat noch nicht mit detaillierten Informationen geantwortet"
 
-#: gajim/gtk/discovery.py:71
+#: gajim/gtk/discovery.py:70
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely a legacy service or broken."
@@ -8615,32 +8814,32 @@ msgstr ""
 "Dieser Dienst konnte nicht mit detaillierten Informationen antworten.\n"
 "Er ist wahrscheinlich veraltet oder kaputt"
 
-#: gajim/gtk/discovery.py:128
+#: gajim/gtk/discovery.py:126
 msgid "Others"
 msgstr "Andere"
 
-#: gajim/gtk/discovery.py:131
-msgid "Conference"
-msgstr "Gruppenchat"
+#: gajim/gtk/discovery.py:129
+msgid "Group Chat"
+msgstr "Gruppenchats"
 
-#: gajim/gtk/discovery.py:519
+#: gajim/gtk/discovery.py:518
 msgid "Without a connection, you can not browse available services"
 msgstr "Sie müssen angemeldet sein, um die Dienste durchsuchen zu können"
 
-#: gajim/gtk/discovery.py:606
+#: gajim/gtk/discovery.py:605
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Dienste des Kontos %s durchsuchen"
 
-#: gajim/gtk/discovery.py:608
+#: gajim/gtk/discovery.py:607
 msgid "Service Discovery"
 msgstr "Dienste durchsuchen"
 
-#: gajim/gtk/discovery.py:691
+#: gajim/gtk/discovery.py:690
 msgid "The service could not be found"
 msgstr "Der Dienst konnte nicht gefunden werden"
 
-#: gajim/gtk/discovery.py:692
+#: gajim/gtk/discovery.py:691
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -8649,99 +8848,78 @@ msgstr ""
 "Dienst antwortet nicht. Überprüfen Sie die Adresse und versuchen Sie es "
 "erneut."
 
-#: gajim/gtk/discovery.py:699 gajim/gtk/discovery.py:1042
+#: gajim/gtk/discovery.py:698 gajim/gtk/discovery.py:1041
 msgid "The service is not browsable"
 msgstr "Der Dienst ist nicht durchsuchbar"
 
-#: gajim/gtk/discovery.py:700
+#: gajim/gtk/discovery.py:699
 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:738 gajim/gtk/discovery.py:747
+#: gajim/gtk/discovery.py:737 gajim/gtk/discovery.py:746
 msgid "Invalid Server Name"
 msgstr "Ungültiger Servername"
 
-#: gajim/gtk/discovery.py:806
+#: gajim/gtk/discovery.py:805
 #, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Durchsuche %(address)s über das Konto %(account)s"
 
-#: gajim/gtk/discovery.py:851
+#: gajim/gtk/discovery.py:850
 msgid "Browse"
 msgstr "Durchsuchen"
 
-#: gajim/gtk/discovery.py:1043
+#: gajim/gtk/discovery.py:1042
 msgid "This service does not contain any items to browse."
 msgstr "Dieser Dienst enthält keine durchsuchbaren Objekte."
 
-#: gajim/gtk/discovery.py:1255
+#: gajim/gtk/discovery.py:1254
 msgid "_Command"
 msgstr "_Befehl"
 
-#: gajim/gtk/discovery.py:1264 gajim/gtk/discovery.py:1422
+#: gajim/gtk/discovery.py:1263 gajim/gtk/discovery.py:1420
 msgid "Re_gister"
 msgstr "Re_gistrieren"
 
-#: gajim/gtk/discovery.py:1277
+#: gajim/gtk/discovery.py:1276
 msgid "_Search"
 msgstr "_Suche"
 
-#: gajim/gtk/discovery.py:1420
+#: gajim/gtk/discovery.py:1418
 msgid "_Edit"
 msgstr "Änd_ern"
 
-#: gajim/gtk/discovery.py:1458
+#: gajim/gtk/discovery.py:1456
 #, python-format
 msgid "Scanning %(current)d / %(total)d ..."
 msgstr "Durchsuche %(current)d / %(total)d ..."
 
-#: gajim/gtk/discovery.py:1674
+#: gajim/gtk/discovery.py:1655
+msgid "Users"
+msgstr "Benutzer"
+
+#: gajim/gtk/discovery.py:1671
 msgid "Id"
 msgstr "ID"
 
-#: gajim/gtk/discovery.py:1713
-msgid "_Join"
-msgstr "_Beitreten"
-
-#: gajim/gtk/discovery.py:1736
-msgid "Bookmark already set"
-msgstr "Gruppenchat ist bereits gespeichert"
-
-#: gajim/gtk/discovery.py:1737
-#, python-format
-msgid "Group Chat '%s' is already in your bookmarks."
-msgstr "Gruppenchat \"%s\" wurde bereits gespeichert."
-
-#: gajim/gtk/discovery.py:1748
-msgid "Bookmark has been added successfully"
-msgstr "Gruppenchat wurde erfolgreich gespeichert"
-
-#: gajim/gtk/discovery.py:1749
-msgid ""
-"You can manage your bookmarks by clicking the Bookmarks menu item in your "
-"contact list."
-msgstr ""
-"Sie können Ihre Gruppenchats über den Menüpunkt Gespeicherte Gruppenchats in "
-"der Kontaktliste verwalten."
-
-#: gajim/gtk/discovery.py:1950
+#: gajim/gtk/discovery.py:1900
 msgid "Subscribed"
 msgstr "Abonniert"
 
-#: gajim/gtk/discovery.py:1959
+#: gajim/gtk/discovery.py:1909
 msgid "Node"
 msgstr "Node"
 
-#: gajim/gtk/discovery.py:2028
+#: gajim/gtk/discovery.py:1978
 msgid "_New post"
 msgstr "_Neuer Beitrag"
 
-#: gajim/gtk/discovery.py:2037
+#: gajim/gtk/discovery.py:1987
 msgid "_Subscribe"
 msgstr "_Abonnieren"
 
-#: gajim/gtk/discovery.py:2045
+#: gajim/gtk/discovery.py:1995
 msgid "_Unsubscribe"
 msgstr "_Abbestellen"
 
@@ -8787,7 +8965,7 @@ msgstr "Formular: %s"
 msgid "Characters typed: %s"
 msgstr "Zeichen: %s"
 
-#: gajim/gtk/single_message.py:274 gajim/gtk/xml_console.py:169
+#: gajim/gtk/single_message.py:274 gajim/gtk/xml_console.py:166
 msgid "Connection not available"
 msgstr "Verbindung nicht verfügbar"
 
@@ -8796,6 +8974,14 @@ msgstr "Verbindung nicht verfügbar"
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Vergewissern Sie sich, dass Sie mit \"%s\" verbunden sind."
 
+#: gajim/gtk/single_message.py:306
+#, python-format
+msgid ""
+"It is not possible to send a message to %s, this XMPP Address is not valid."
+msgstr ""
+"Es ist nicht möglich, eine Nachricht an %s zu senden, die XMPP-Adresse ist "
+"ungültig."
+
 #: gajim/gtk/single_message.py:330
 #, python-format
 msgid "RE: %s"
@@ -8806,20 +8992,20 @@ msgstr "RE: %s"
 msgid "%s wrote:\n"
 msgstr "%s schrieb:\n"
 
-#: gajim/gtk/pep_config.py:44
+#: gajim/gtk/pep_config.py:45
 #, python-format
 msgid "PEP Service Configuration (%s)"
 msgstr "Konfiguration des PEP-Dienstes (%s)"
 
-#: gajim/gtk/pep_config.py:77
+#: gajim/gtk/pep_config.py:78
 msgid "Service"
 msgstr "Dienst"
 
-#: gajim/gtk/pep_config.py:114
+#: gajim/gtk/pep_config.py:115
 msgid "PEP node was not removed"
 msgstr "PEP-Node wurde nicht entfernt"
 
-#: gajim/gtk/pep_config.py:115
+#: gajim/gtk/pep_config.py:116
 #, python-format
 msgid ""
 "PEP node %(node)s was not removed:\n"
@@ -8828,7 +9014,7 @@ msgstr ""
 "Der PEP-Node %(node)s wurde nicht entfernt:\n"
 "%(message)s"
 
-#: gajim/gtk/pep_config.py:146
+#: gajim/gtk/pep_config.py:147
 #, python-format
 msgid "Configure %s"
 msgstr "%s konfigurieren"
@@ -8842,16 +9028,20 @@ msgstr "Registrieren"
 msgid "Registration successful"
 msgstr "Registrierung erfolgreich"
 
-#: gajim/gtk/dialogs.py:54 gajim/gtk/dataform.py:659 gajim/gtk/adhoc.py:85
+#: gajim/gtk/service_registration.py:215
+msgid "Registration failed"
+msgstr "Registrierung ist fehlgeschlagen"
+
+#: gajim/gtk/dialogs.py:53 gajim/gtk/dataform.py:668 gajim/gtk/adhoc.py:86
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: gajim/gtk/dialogs.py:129
+#: gajim/gtk/dialogs.py:128
 #, python-format
 msgid "Dictionary for language \"%s\" not available"
 msgstr "Kein Wörterbuch für die Sprache \"%s\" verfügbar"
 
-#: gajim/gtk/dialogs.py:130
+#: gajim/gtk/dialogs.py:129
 #, python-format
 msgid ""
 "You have to install the dictionary \"%s\" to use spellchecking, or choose "
@@ -8865,11 +9055,11 @@ msgstr ""
 "\n"
 "Die Hervorhebung falsch geschriebener Wörter wird nicht funktionieren"
 
-#: gajim/gtk/dialogs.py:410 gajim/gtk/dialogs.py:425
+#: gajim/gtk/dialogs.py:322 gajim/gtk/dialogs.py:337
 msgid "Insecure connection"
 msgstr "Unsichere Verbindung"
 
-#: gajim/gtk/dialogs.py:411
+#: gajim/gtk/dialogs.py:323
 #, python-format
 msgid ""
 "You are about to connect to the account %(account)s (%(server)s) insecurely. "
@@ -8882,29 +9072,25 @@ msgstr ""
 "unverschlüsselt übertragen werden, wovon dringend abgeraten wird.\n"
 "Sind Sie sicher, dass Sie fortwahren wollen?"
 
-#: gajim/gtk/dialogs.py:416
+#: gajim/gtk/dialogs.py:328
 msgid "Yes, I really want to connect insecurely"
 msgstr "Ja, ich möchte eine unsichere Verbindung herstellen"
 
-#: gajim/gtk/dialogs.py:417
+#: gajim/gtk/dialogs.py:329
 msgid "Gajim will NOT connect unless you check this box"
 msgstr ""
 "Gajim wird sich NICHT verbinden, wenn Sie diese Option nicht aktivieren"
 
-#: gajim/gtk/dialogs.py:675
-msgid "The nickname contains invalid characters."
-msgstr "Der Spitzname enthält ungültige Zeichen."
-
-#: gajim/gtk/dialogs.py:734
+#: gajim/gtk/dialogs.py:561
 #, python-format
 msgid "Destroy %s"
 msgstr "%s auflösen"
 
-#: gajim/gtk/dialogs.py:775
+#: gajim/gtk/dialogs.py:602
 msgid "Certificate"
 msgstr "Zertifikat"
 
-#: gajim/gtk/dialogs.py:786
+#: gajim/gtk/dialogs.py:613
 #, python-format
 msgid ""
 "Certificate for account\n"
@@ -8913,87 +9099,87 @@ msgstr ""
 "Zertifikat für das Konto\n"
 "%s"
 
-#: gajim/gtk/dialogs.py:824
+#: gajim/gtk/dialogs.py:651
 msgid "Issued to\n"
 msgstr "Ausgestellt für\n"
 
-#: gajim/gtk/dialogs.py:825 gajim/gtk/dialogs.py:830
+#: gajim/gtk/dialogs.py:652 gajim/gtk/dialogs.py:657
 msgid "Common Name (CN): "
 msgstr "Allgemeiner Name (CN): "
 
-#: gajim/gtk/dialogs.py:826 gajim/gtk/dialogs.py:831
+#: gajim/gtk/dialogs.py:653 gajim/gtk/dialogs.py:658
 msgid "Organization (O): "
 msgstr "Organisation (O): "
 
-#: gajim/gtk/dialogs.py:827 gajim/gtk/dialogs.py:832
+#: gajim/gtk/dialogs.py:654 gajim/gtk/dialogs.py:659
 msgid "Organizational Unit (OU): "
 msgstr "Organizationseinheit (OU): "
 
-#: gajim/gtk/dialogs.py:828
+#: gajim/gtk/dialogs.py:655
 msgid "Serial Number: "
 msgstr "Seriennummer: "
 
-#: gajim/gtk/dialogs.py:829
+#: gajim/gtk/dialogs.py:656
 msgid "Issued by\n"
 msgstr "Ausgestellt von\n"
 
-#: gajim/gtk/dialogs.py:833
+#: gajim/gtk/dialogs.py:660
 msgid "Validity\n"
 msgstr "Gültigkeit\n"
 
-#: gajim/gtk/dialogs.py:834
+#: gajim/gtk/dialogs.py:661
 msgid "Issued on: "
 msgstr "Ausgestellt am: "
 
-#: gajim/gtk/dialogs.py:835
+#: gajim/gtk/dialogs.py:662
 msgid "Expires on: "
 msgstr "Läuft ab am: "
 
-#: gajim/gtk/dialogs.py:836
+#: gajim/gtk/dialogs.py:663
 msgid "SHA-1:"
 msgstr "SHA-1:"
 
-#: gajim/gtk/dialogs.py:838
+#: gajim/gtk/dialogs.py:665
 msgid "SHA-256:"
 msgstr "SHA-256:"
 
-#: gajim/gtk/dialogs.py:852
+#: gajim/gtk/dialogs.py:679
 msgid "View certificate…"
 msgstr "Zertifikat anzeigen…"
 
-#: gajim/gtk/dialogs.py:864 gajim/gtk/accounts.py:893
+#: gajim/gtk/dialogs.py:691 gajim/gtk/accounts.py:896
 msgid "Change Password"
 msgstr "Passwort ändern"
 
-#: gajim/gtk/dialogs.py:878
+#: gajim/gtk/dialogs.py:705
 msgid "_OK"
 msgstr "_OK"
 
-#: gajim/gtk/dialogs.py:891
+#: gajim/gtk/dialogs.py:718
 msgid "You must enter a password"
 msgstr "Sie müssen ein Passwort eingeben"
 
-#: gajim/gtk/dialogs.py:895
+#: gajim/gtk/dialogs.py:722
 msgid "Passwords do not match"
 msgstr "Die Passwörter stimmen nicht überein"
 
-#: gajim/gtk/dialogs.py:923
+#: gajim/gtk/dialogs.py:750
 msgid "Group Chat Invitation "
 msgstr "Gruppenchat-Einladung "
 
-#: gajim/gtk/dialogs.py:948
+#: gajim/gtk/dialogs.py:775
 #, python-format
 msgid "<b>%s</b> has invited you to join a discussion"
 msgstr "<b>%s</b> hat Sie in einen Gruppenchat eingeladen"
 
-#: gajim/gtk/dialogs.py:951
+#: gajim/gtk/dialogs.py:778
 #, 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"
 
-#: gajim/gtk/dialogs.py:959
+#: gajim/gtk/dialogs.py:786
 #, python-format
 msgid "Comment: %s"
 msgstr "Kommentar: %s"
@@ -9006,10 +9192,6 @@ msgstr "GG-Nummer"
 msgid "ICQ Number"
 msgstr "ICQ-Nummer"
 
-#: gajim/gtk/add_contact.py:40
-msgid "Add Contact"
-msgstr "Kontakt hinzufügen"
-
 #: gajim/gtk/add_contact.py:259
 #, python-format
 msgid "%s Missing"
@@ -9030,7 +9212,7 @@ msgid "The user ID must not contain a resource."
 msgstr "Die Benutzer-ID darf keine XMPP-Ressource enthalten."
 
 #: gajim/gtk/add_contact.py:299
-msgid "You cannot add yourself to your roster."
+msgid "You cannot add yourself to your contact list."
 msgstr "Sie können sich nicht selbst zu Ihrer Kontaktliste hinzuzufügen."
 
 #: gajim/gtk/add_contact.py:304
@@ -9042,11 +9224,11 @@ msgid "Your account must be online to add new contacts."
 msgstr "Ihr Konto muss online sein, um neue Kontakte hinzufügen zu können."
 
 #: gajim/gtk/add_contact.py:321
-msgid "Contact already in roster"
-msgstr "Kontakt bereits in der Kontaktliste"
+msgid "Contact Already in Contact List"
+msgstr "Kontakt ist bereits in der Kontaktliste"
 
 #: gajim/gtk/add_contact.py:322
-msgid "This contact is already listed in your roster."
+msgid "This contact is already in your contact list."
 msgstr "Der angegebene Kontakt befindet sich bereits in Ihrer Kontaktliste."
 
 #: gajim/gtk/add_contact.py:379 gajim/gtk/add_contact.py:417
@@ -9086,11 +9268,11 @@ msgid "Chatstate Paused"
 msgstr "Chatstatus Pausiert"
 
 #: gajim/gtk/themes.py:52
-msgid "MUC Tab New Directed Message"
+msgid "Group Chat Tab New Directed Message"
 msgstr "Gruppenchat-Tab Neue an Sie gerichtete Nachricht"
 
 #: gajim/gtk/themes.py:56
-msgid "MUC Tab New Message"
+msgid "Group Chat Tab New Message"
 msgstr "Gruppenchat-Tab Neue Nachricht"
 
 #: gajim/gtk/themes.py:60
@@ -9285,12 +9467,12 @@ msgstr "Alle Dateien"
 msgid "Clear File"
 msgstr "Auswahl löschen"
 
-#: gajim/gtk/settings.py:570
+#: gajim/gtk/settings.py:570 gajim/gtk/proxies.py:32
 msgid "Manage Proxies"
 msgstr "Proxies verwalten"
 
-#: gajim/gtk/settings.py:591 gajim/gtk/preferences.py:971
-#: gajim/gtk/preferences.py:984 gajim/gtk/preferences.py:988
+#: gajim/gtk/settings.py:591 gajim/gtk/preferences.py:968
+#: gajim/gtk/preferences.py:982 gajim/gtk/preferences.py:986
 msgid "No Proxy"
 msgstr "Kein Proxy"
 
@@ -9377,14 +9559,15 @@ msgstr ""
 "        statt. Bitte versuchen sie es später.\n"
 "        "
 
-#: gajim/gtk/about.py:47 data/org.gajim.Gajim.appdata.xml.in:10
-msgid "A GTK+ XMPP client"
-msgstr "Ein XMPP-Client in GTK+"
+#: gajim/gtk/about.py:47 data/org.gajim.Gajim.desktop.in:6
+#: data/org.gajim.Gajim.appdata.xml.in:10
+msgid "A GTK XMPP client"
+msgstr "Ein XMPP-Client in GTK"
 
 #: gajim/gtk/about.py:48
 #, python-format
-msgid "GTK+ Version: %s"
-msgstr "GTK+-Version: %s"
+msgid "GTK Version: %s"
+msgstr "GTK-Version: %s"
 
 #: gajim/gtk/about.py:49
 #, python-format
@@ -9494,7 +9677,7 @@ msgstr "Nicht verbunden"
 
 #: gajim/gtk/tooltips.py:567
 msgid "File Name: "
-msgstr "Dateiname:"
+msgstr "Dateiname: "
 
 #: gajim/gtk/tooltips.py:570
 msgid "?Noun:Download"
@@ -9544,6 +9727,22 @@ msgstr "Übertragung"
 msgid "?transfer status:Not started"
 msgstr "Nicht gestartet"
 
+#: gajim/gtk/groupchat_creation.py:97 gajim/gtk/groupchat_creation.py:99
+msgid " (optional)..."
+msgstr " (optional)..."
+
+#: gajim/gtk/groupchat_creation.py:134
+msgid "Invalid Address"
+msgstr "Ungültige Adresse"
+
+#: gajim/gtk/groupchat_creation.py:182
+msgid "Not Connected"
+msgstr "Nicht verbunden"
+
+#: gajim/gtk/groupchat_creation.py:183
+msgid "You have to be connected to create a group chat."
+msgstr "Sie müssen verbunden sein, um einen Gruppenchat erstellen zu können."
+
 #: gajim/gtk/sounds.py:39
 msgid "Wav Sounds"
 msgstr "Wav-Dateien"
@@ -9584,45 +9783,40 @@ msgstr "Hervorhebung von Gruppenchat-Nachrichten"
 msgid "Group Chat Message Received"
 msgstr "Gruppenchat-Nachricht empfangen"
 
-#: gajim/gtk/dataform.py:226 gajim/gtk/dataform.py:262
+#: gajim/gtk/dataform.py:232 gajim/gtk/dataform.py:268
 msgid "Required"
 msgstr "Benötigt"
 
-#: gajim/gtk/dataform.py:286
+#: gajim/gtk/dataform.py:293
 msgid "Yes"
 msgstr "Ja"
 
-#: gajim/gtk/dataform.py:286
+#: gajim/gtk/dataform.py:293
 msgid "No"
 msgstr "Nein"
 
-#: gajim/gtk/dataform.py:661
+#: gajim/gtk/dataform.py:670
 msgid "Submit"
 msgstr "Abschicken"
 
-#: gajim/gtk/statusicon.py:213
+#: gajim/gtk/statusicon.py:206
 msgid "_Change Status Message…"
 msgstr "_Statusnachricht ändern…"
 
-#: gajim/gtk/statusicon.py:247 gajim/gtk/statusicon.py:292
-#: gajim/gtk/statusicon.py:299
+#: gajim/gtk/statusicon.py:258
 #, python-format
 msgid "using account %s"
 msgstr "über das Konto %s"
 
-#: gajim/gtk/statusicon.py:309
-msgid "_Manage Bookmarks…"
-msgstr "Gruppenchats verwalte_n…"
-
-#: gajim/gtk/statusicon.py:325
-msgid "Hide _Roster"
-msgstr "Kontaktliste ve_rstecken"
+#: gajim/gtk/statusicon.py:269
+msgid "Hide _Contact List"
+msgstr "_Kontaktliste ausblenden"
 
-#: gajim/gtk/statusicon.py:329
-msgid "Show _Roster"
-msgstr "_Kontaktliste anzeigen"
+#: gajim/gtk/statusicon.py:273
+msgid "Show _Contact List"
+msgstr "Kontaktliste _anzeigen"
 
-#: gajim/gtk/statusicon.py:337
+#: gajim/gtk/statusicon.py:281
 msgid "Hide this menu"
 msgstr "Dieses Menü ausblenden"
 
@@ -9667,33 +9861,6 @@ msgstr ""
 "Bei der Veröffentlichung Ihrer persönlichen Informationen ist ein Fehler "
 "aufgetreten, versuchen Sie es später erneut."
 
-#: gajim/gtk/join_groupchat.py:202
-msgid "Invalid Room"
-msgstr "Ungültiger Gruppenchat"
-
-#: gajim/gtk/join_groupchat.py:203
-msgid "Please choose a room"
-msgstr "Bitte wählen sie einen Gruppenchat aus"
-
-#: gajim/gtk/join_groupchat.py:222 gajim/gtk/join_groupchat.py:229
-msgid "Invalid Nickname"
-msgstr "Ungültiger Spitzname"
-
-#: gajim/gtk/join_groupchat.py:223
-msgid "Please choose a nickname"
-msgstr "Bitte wählen Sie einen Spitznamen"
-
-#: gajim/gtk/join_groupchat.py:282 gajim/gtk/join_groupchat.py:288
-#: gajim/gtk/join_groupchat.py:293
-msgid "Wrong server"
-msgstr "Falscher Server"
-
-#: gajim/gtk/join_groupchat.py:283 gajim/gtk/join_groupchat.py:289
-#: gajim/gtk/join_groupchat.py:294
-#, python-format
-msgid "%s is not a groupchat server"
-msgstr "%s ist kein Gruppenchat-Server"
-
 #: gajim/gtk/mam_preferences.py:38
 #, python-format
 msgid "Archiving Preferences for %s"
@@ -9719,45 +9886,49 @@ msgstr "Fehler festgestellt: {}"
 msgid "Archiving Preferences Error"
 msgstr "Fehler beim Festlegen der Archiveinstellungen"
 
-#: gajim/gtk/advanced_config.py:81
+#: gajim/gtk/advanced_config.py:95
 msgid "Activated"
 msgstr "Aktiviert"
 
-#: gajim/gtk/advanced_config.py:81
+#: gajim/gtk/advanced_config.py:95
 msgid "Deactivated"
 msgstr "Deaktiviert"
 
-#: gajim/gtk/advanced_config.py:83
-msgid "Boolean"
+#: gajim/gtk/advanced_config.py:97
+msgid "?config type:Boolean"
 msgstr "Boolesch"
 
-#: gajim/gtk/advanced_config.py:84
-msgid "Integer"
+#: gajim/gtk/advanced_config.py:98
+msgid "?config type:Integer"
 msgstr "Ganzzahl"
 
-#: gajim/gtk/advanced_config.py:85
-msgid "Text"
+#: gajim/gtk/advanced_config.py:99
+msgid "?config type:Text"
 msgstr "Text"
 
-#: gajim/gtk/advanced_config.py:97
-msgid "Preference Name"
+#: gajim/gtk/advanced_config.py:100
+msgid "?config type:Color"
+msgstr "Farbe"
+
+#: gajim/gtk/advanced_config.py:112
+msgid "?config:Preference Name"
 msgstr "Name der Einstellung"
 
-#: gajim/gtk/advanced_config.py:104
-msgid "Value"
+#: gajim/gtk/advanced_config.py:123
+msgid "?config:Value"
 msgstr "Wert"
 
-#: gajim/gtk/advanced_config.py:113
-msgid "Type"
+#: gajim/gtk/advanced_config.py:132
+msgid "?config:Type"
 msgstr "Typ"
 
-#: gajim/gtk/advanced_config.py:168
-msgid "(None)"
-msgstr "(Keine)"
+#: gajim/gtk/advanced_config.py:187
+msgid "?config description:None"
+msgstr "Keine Beschreibung vorhanden"
 
-#: gajim/gtk/advanced_config.py:299
-msgid "Hidden"
-msgstr "Versteckt"
+#: gajim/gtk/advanced_config.py:322
+msgid "?password:Hidden"
+msgstr "Ausgeblendet"
 
 #: gajim/gtk/server_info.py:66
 msgid "Copy info to clipboard"
@@ -9768,8 +9939,8 @@ msgstr "Infos in die Zwischenablage kopieren"
 msgid "%(days)s days, %(hours)s hours"
 msgstr "%(days)s Tage, %(hours)s Stunden"
 
-#: gajim/gtk/server_info.py:218 gajim/gtk/accounts.py:749
-#: gajim/gtk/accounts.py:853
+#: gajim/gtk/server_info.py:218 gajim/gtk/accounts.py:752
+#: gajim/gtk/accounts.py:856
 msgid "Hostname"
 msgstr "Hostname"
 
@@ -9961,10 +10132,6 @@ msgstr ""
 "Sie müssen einen Namen eingeben, um eine Privatsphären-Liste erstellen zu "
 "können."
 
-#: gajim/gtk/groupchat_config.py:41
-msgid "Group Chat Configuration"
-msgstr "Gruppenchat-Konfiguration"
-
 #: gajim/gtk/groupchat_config.py:134
 msgid "A Group Chat needs at least one Owner"
 msgstr "Ein Gruppenchat benötigt mindestens einen Besitzer"
@@ -9976,59 +10143,59 @@ msgstr ""
 "ändern"
 
 #: gajim/gtk/groupchat_config.py:399
-msgid "An entry with this Jabber-ID already exists"
-msgstr "Ein Eintrag mit dieser Jabber-ID existiert bereits"
+msgid "An entry with this XMPP Address already exists"
+msgstr "Ein Eintrag mit dieser XMPP-Adresse existiert bereits"
 
-#: gajim/gtk/adhoc.py:91
+#: gajim/gtk/adhoc.py:92
 msgid "Finish"
 msgstr "Abschließen"
 
-#: gajim/gtk/adhoc.py:97 gajim/gtk/adhoc.py:283
+#: gajim/gtk/adhoc.py:98 gajim/gtk/adhoc.py:284
 msgid "Commands"
 msgstr "Befehle"
 
-#: gajim/gtk/adhoc.py:103
+#: gajim/gtk/adhoc.py:104
 msgid "Next"
 msgstr "Weiter"
 
-#: gajim/gtk/adhoc.py:109
+#: gajim/gtk/adhoc.py:110
 msgid "Previous"
 msgstr "Zurück"
 
-#: gajim/gtk/adhoc.py:115
+#: gajim/gtk/adhoc.py:116
 msgid "Execute"
 msgstr "Ausführen"
 
-#: gajim/gtk/adhoc.py:195
+#: gajim/gtk/adhoc.py:196
 msgid "No commands available"
 msgstr "Keine Befehle verfügbar"
 
-#: gajim/gtk/adhoc.py:244
+#: gajim/gtk/adhoc.py:245
 msgid "Request Command List"
 msgstr "Liste der Befehle abrufen"
 
-#: gajim/gtk/adhoc.py:259
+#: gajim/gtk/adhoc.py:260
 msgid "Executing…"
 msgstr "Führe Befehl aus…"
 
-#: gajim/gtk/adhoc.py:266
+#: gajim/gtk/adhoc.py:267
 msgid "Command List"
 msgstr "Liste der Befehle"
 
-#: gajim/gtk/adhoc.py:384
+#: gajim/gtk/adhoc.py:385
 msgid "Finished"
 msgstr "Abgeschlossen"
 
-#: gajim/gtk/adhoc.py:453
+#: gajim/gtk/adhoc.py:454
 msgid "Execution failed"
 msgstr "Ausführung fehlgeschlagen"
 
-#: gajim/gtk/blocking.py:37
+#: gajim/gtk/blocking.py:38
 #, python-format
 msgid "Blocking List for %s"
 msgstr "Sperrliste für %s"
 
-#: gajim/gtk/blocking.py:71
+#: gajim/gtk/blocking.py:72
 msgid "Error!"
 msgstr "Fehler!"
 
@@ -10077,8 +10244,7 @@ msgid "You must provide a username to configure this account."
 msgstr ""
 "Sie müssen einen Benutzernamen angeben, um dieses Konto zu konfigurieren."
 
-#: gajim/gtk/account_wizard.py:252 gajim/gtk/bookmarks.py:290
-#: gajim/gtk/bookmarks.py:303
+#: gajim/gtk/account_wizard.py:252
 msgid "Invalid server"
 msgstr "Ungültiger Server"
 
@@ -10094,7 +10260,7 @@ msgstr "Ungültiger Eintrag"
 msgid "Custom port must be a port number."
 msgstr "Der Proxy-Port muss eine gültige Portnummer sein."
 
-#: gajim/gtk/account_wizard.py:405
+#: gajim/gtk/account_wizard.py:406
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -10109,15 +10275,15 @@ msgstr ""
 "SSL-Fehler: %(error)s\n"
 "Möchten Sie sich dennoch zum Server verbinden?"
 
-#: gajim/gtk/account_wizard.py:446 gajim/gtk/account_wizard.py:480
+#: gajim/gtk/account_wizard.py:447 gajim/gtk/account_wizard.py:481
 msgid "An error occurred during account creation"
 msgstr "Während der Konto-Erstellung ist ein Fehler aufgetreten"
 
-#: gajim/gtk/account_wizard.py:545
+#: gajim/gtk/account_wizard.py:546
 msgid "Account name is in use"
 msgstr "Der Kontoname ist bereits vergeben"
 
-#: gajim/gtk/account_wizard.py:546
+#: gajim/gtk/account_wizard.py:547
 msgid "You already have an account using this name."
 msgstr "Sie haben bereits ein Konto mit diesem Namen."
 
@@ -10143,24 +10309,24 @@ msgstr "%(progress)s von %(total)s"
 msgid "%(minutes)s min %(seconds)s sec"
 msgstr "%(minutes)s min %(seconds)s sek"
 
-#: gajim/gtk/xml_console.py:77
+#: gajim/gtk/xml_console.py:74
 msgid "Filter"
 msgstr "Filter"
 
-#: gajim/gtk/xml_console.py:82
+#: gajim/gtk/xml_console.py:79
 msgid "XML Input"
 msgstr "XML-Direkteingabe"
 
-#: gajim/gtk/xml_console.py:86
+#: gajim/gtk/xml_console.py:83
 msgid "Paste Last Input"
 msgstr "Zuletzt gemachte Eingabe einfügen"
 
-#: gajim/gtk/xml_console.py:170
+#: gajim/gtk/xml_console.py:167
 #, python-format
 msgid "Please make sure you are connected with '%s'."
 msgstr "Bitte vergewissern Sie sich, dass Sie mit \"%s\" verbunden sind."
 
-#: gajim/gtk/xml_console.py:182
+#: gajim/gtk/xml_console.py:177
 msgid "Invalid Node"
 msgstr "Ungültiger Node"
 
@@ -10188,38 +10354,50 @@ msgstr "Suchergebnis"
 msgid "No results found"
 msgstr "Keine Ergebnisse"
 
-#: gajim/gtk/preferences.py:358 gajim/gtk/preferences.py:362
+#: gajim/gtk/preferences.py:357 gajim/gtk/preferences.py:361
 msgid "Default"
 msgstr "Standard"
 
-#: gajim/gtk/preferences.py:801
+#: gajim/gtk/preferences.py:798
 msgid "status message title"
 msgstr "Statusbetreff"
 
-#: gajim/gtk/preferences.py:802
+#: gajim/gtk/preferences.py:799
 msgid "status message text"
 msgstr "Statusnachricht"
 
+#: gajim/gtk/accounts.py:137
+msgid "Re-Login"
+msgstr "Erneut anmelden"
+
 #: gajim/gtk/accounts.py:138
-msgid "Relogin now?"
+msgid "Re-Login now?"
 msgstr "Jetzt erneut anmelden?"
 
 #: gajim/gtk/accounts.py:139
-msgid "If you want all the changes to apply instantly, you must relogin."
+msgid "To apply all changes instantly, you have to re-login."
 msgstr ""
 "Wenn die Änderungen sofort übernommen werden sollen, müssen Sie sich erneut "
 "anmelden."
 
-#: gajim/gtk/accounts.py:191 gajim/gtk/accounts.py:975
+#: gajim/gtk/accounts.py:141
+msgid "_Later"
+msgstr "S_päter"
+
+#: gajim/gtk/accounts.py:143
+msgid "_Re-Login"
+msgstr "_Erneut anmelden"
+
+#: gajim/gtk/accounts.py:194 gajim/gtk/accounts.py:978
 msgid "Remove Account"
 msgstr "Konto entfernen"
 
-#: gajim/gtk/accounts.py:192
+#: gajim/gtk/accounts.py:195
 #, python-format
 msgid "You still have open chats in your account %s"
 msgstr "Sie haben mit dem Konto %s Chats geöffnet"
 
-#: gajim/gtk/accounts.py:193
+#: gajim/gtk/accounts.py:196
 msgid ""
 "All chat and group chat windows will be closed.\n"
 "Do you want to continue?"
@@ -10227,231 +10405,227 @@ msgstr ""
 "Alle Chat- und Gruppenchatfenster werden geschlossen.\n"
 "Wollen Sie fortfahren?"
 
-#: gajim/gtk/accounts.py:424
+#: gajim/gtk/accounts.py:427
 msgid "Back"
 msgstr "Zurück"
 
-#: gajim/gtk/accounts.py:530
+#: gajim/gtk/accounts.py:533
 msgid "Please check if Bonjour is installed."
 msgstr "Bitte überprüfen Sie, ob Bonjour installiert ist."
 
-#: gajim/gtk/accounts.py:532
+#: gajim/gtk/accounts.py:535
 msgid "Please check if Avahi is installed."
 msgstr "Bitte überprüfen Sie, ob Avahi installiert ist."
 
-#: gajim/gtk/accounts.py:569
+#: gajim/gtk/accounts.py:572
 msgid "Disable Account"
 msgstr "Konto deaktivieren"
 
-#: gajim/gtk/accounts.py:570
+#: gajim/gtk/accounts.py:573
 #, python-format
 msgid "Account %s is still connected"
 msgstr "Das Konto %s ist gerade mit dem Server verbunden"
 
-#: gajim/gtk/accounts.py:571
+#: gajim/gtk/accounts.py:574
 msgid ""
 "All chat and group chat windows will be closed. Do you want to continue?"
 msgstr ""
 "Alle Chatfenster und Gruppenchats werden geschlossen. Wollen Sie fortfahren?"
 
-#: gajim/gtk/accounts.py:576
+#: gajim/gtk/accounts.py:579
 msgid "_Disable Account"
 msgstr "Konto _deaktivieren"
 
-#: gajim/gtk/accounts.py:595
+#: gajim/gtk/accounts.py:598
 msgid "Add Account"
-msgstr "Konto _hinzufügen"
+msgstr "Konto hinzufügen"
 
-#: gajim/gtk/accounts.py:663
+#: gajim/gtk/accounts.py:666
 msgid "Label"
 msgstr "Bezeichnung"
 
-#: gajim/gtk/accounts.py:667
+#: gajim/gtk/accounts.py:670
 msgid "Login"
 msgstr "Zugangsdaten"
 
-#: gajim/gtk/accounts.py:670
+#: gajim/gtk/accounts.py:673
 msgid "Import Contacts"
 msgstr "Kontakte importieren"
 
-#: gajim/gtk/accounts.py:674 gajim/gtk/accounts.py:870
+#: gajim/gtk/accounts.py:677 gajim/gtk/accounts.py:873
 msgid "Client Certificate"
 msgstr "Client-Zertifikat"
 
-#: gajim/gtk/accounts.py:677 gajim/gtk/accounts.py:774
+#: gajim/gtk/accounts.py:680 gajim/gtk/accounts.py:777
 msgid "Connect on startup"
 msgstr "Beim Start verbinden"
 
-#: gajim/gtk/accounts.py:681 gajim/gtk/accounts.py:779
+#: gajim/gtk/accounts.py:684 gajim/gtk/accounts.py:782
 msgid "Save conversations for all contacts"
 msgstr "Unterhaltungsverlauf für alle Kontakte dieses Kontos speichern"
 
-#: gajim/gtk/accounts.py:683 gajim/gtk/accounts.py:781
+#: gajim/gtk/accounts.py:686 gajim/gtk/accounts.py:784
 msgid "Store conversations on the harddrive"
 msgstr "Speichere Unterhaltungsverlauf auf der Festplatte"
 
-#: gajim/gtk/accounts.py:685 gajim/gtk/accounts.py:783
+#: gajim/gtk/accounts.py:688 gajim/gtk/accounts.py:786
 msgid "Global Status"
 msgstr "Globaler Status"
 
-#: gajim/gtk/accounts.py:687
+#: gajim/gtk/accounts.py:690
 msgid "Synchronise the status of all accounts"
 msgstr "Synchronisiere den Status aller Konten"
 
-#: gajim/gtk/accounts.py:689
+#: gajim/gtk/accounts.py:692
 msgid "Use file transfer proxies"
 msgstr "Proxies für Dateiübertragungen verwenden"
 
-#: gajim/gtk/accounts.py:705
+#: gajim/gtk/accounts.py:708
 msgid "Idle Time"
 msgstr "Untätigkeit"
 
-#: gajim/gtk/accounts.py:707
+#: gajim/gtk/accounts.py:710
 msgid "Disclose the time of your last activity"
 msgstr "Veröffentlicht die Zeit ihrer letzten Aktivität"
 
-#: gajim/gtk/accounts.py:709
+#: gajim/gtk/accounts.py:712
 msgid "Local System Time"
 msgstr "Lokale Systemzeit"
 
-#: gajim/gtk/accounts.py:711
+#: gajim/gtk/accounts.py:714
 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:714
+#: gajim/gtk/accounts.py:717
 msgid "Client / Operating System"
 msgstr "Client / Betriebssystem"
 
-#: gajim/gtk/accounts.py:716
+#: gajim/gtk/accounts.py:719
 msgid ""
 "Disclose informations about the client and operating system you currently use"
 msgstr "Veröffentlicht Informationen über ihren Client und ihr Betriebssystem"
 
-#: gajim/gtk/accounts.py:719
+#: gajim/gtk/accounts.py:722
 msgid "Ignore Unknown Contacts"
 msgstr "Unbekannte Kontakte blockieren"
 
-#: gajim/gtk/accounts.py:721
+#: gajim/gtk/accounts.py:724
 msgid "Ignore everything from contacts not in your Roster"
 msgstr "Kontakte blockieren, die nicht in der Kontaktliste sind"
 
-#: gajim/gtk/accounts.py:737 gajim/gtk/accounts.py:776
+#: gajim/gtk/accounts.py:740 gajim/gtk/accounts.py:779
 msgid "Use environment variable"
 msgstr "Umgebungsvariable verwenden"
 
-#: gajim/gtk/accounts.py:739
-msgid "Proxy"
-msgstr "Proxy"
-
-#: gajim/gtk/accounts.py:742
+#: gajim/gtk/accounts.py:745
 msgid "Warn on insecure connection"
 msgstr "Warnen, bevor eine unsichere Verbindung verwendet wird"
 
-#: gajim/gtk/accounts.py:746
+#: gajim/gtk/accounts.py:749
 msgid "Send keep-alive packets"
 msgstr "Keepalive-Pakete senden"
 
-#: gajim/gtk/accounts.py:750
+#: gajim/gtk/accounts.py:753
 msgid "Manually set the hostname for the server"
 msgstr "Den Hostnamen für den Server manuell festlegen"
 
-#: gajim/gtk/accounts.py:756 gajim/gtk/accounts.py:826
-#: gajim/gtk/accounts.py:831
+#: gajim/gtk/accounts.py:759 gajim/gtk/accounts.py:829
+#: gajim/gtk/accounts.py:834
 msgid "Priority"
 msgstr "Priorität"
 
-#: gajim/gtk/accounts.py:785
+#: gajim/gtk/accounts.py:788
 msgid "Synchronize the status of all accounts"
 msgstr "Synchronisiere den Status aller Konten"
 
-#: gajim/gtk/accounts.py:795
+#: gajim/gtk/accounts.py:798
 msgid "First Name"
 msgstr "Vorname"
 
-#: gajim/gtk/accounts.py:798
+#: gajim/gtk/accounts.py:801
 msgid "Last Name"
 msgstr "Nachname"
 
-#: gajim/gtk/accounts.py:804
+#: gajim/gtk/accounts.py:807
 msgid "Email"
 msgstr "E-Mail"
 
-#: gajim/gtk/accounts.py:822
+#: gajim/gtk/accounts.py:825
 msgid "Adjust to status"
 msgstr "An Status anpassen"
 
-#: gajim/gtk/accounts.py:849
+#: gajim/gtk/accounts.py:852
 msgid "Enable"
 msgstr "Aktivieren"
 
-#: gajim/gtk/accounts.py:857
+#: gajim/gtk/accounts.py:860
 msgid "Port"
 msgstr "Port"
 
-#: gajim/gtk/accounts.py:862
+#: gajim/gtk/accounts.py:865
 msgid "Connection Settings"
 msgstr "Verbindungseinstellungen"
 
-#: gajim/gtk/accounts.py:872
+#: gajim/gtk/accounts.py:875
 msgid "PKCS12 Files"
 msgstr "PKCS12-Dateien"
 
-#: gajim/gtk/accounts.py:874
+#: gajim/gtk/accounts.py:877
 msgid "Encrypted Certificate"
 msgstr "Verschlüsseltes Zertifikat"
 
-#: gajim/gtk/accounts.py:878
+#: gajim/gtk/accounts.py:881
 msgid "Certificate Settings"
 msgstr "Zertifikatseinstellungen"
 
-#: gajim/gtk/accounts.py:890
+#: gajim/gtk/accounts.py:893
 msgid "Save Password"
 msgstr "Passwort speichern"
 
-#: gajim/gtk/accounts.py:898
+#: gajim/gtk/accounts.py:901
 msgid "Login Settings"
 msgstr "Login-Einstellungen"
 
-#: gajim/gtk/accounts.py:931
+#: gajim/gtk/accounts.py:934
 #, python-format
 msgid "Removing account %s"
 msgstr "Entferne Konto %s"
 
-#: gajim/gtk/accounts.py:946
+#: gajim/gtk/accounts.py:949
 msgid "Account is disabled"
 msgstr "Konto ist deaktiviert"
 
-#: gajim/gtk/accounts.py:947
+#: gajim/gtk/accounts.py:950
 msgid "To unregister from a server, the account must be enabled."
 msgstr "Um sich vom Server abzumelden, muss das Konto aktiviert sein."
 
-#: gajim/gtk/accounts.py:962
+#: gajim/gtk/accounts.py:965
 msgid "Password required"
 msgstr "Passwort benötigt"
 
-#: gajim/gtk/accounts.py:976
+#: gajim/gtk/accounts.py:979
 #, python-format
 msgid "Account '%s' is still connected to the server"
 msgstr "Das Konto \"%s\" ist noch mit dem Server verbunden"
 
-#: gajim/gtk/accounts.py:978
+#: gajim/gtk/accounts.py:981
 msgid "If you remove it, the connection will be lost."
 msgstr "Wenn Sie das Konto entfernen, wird die Verbindung unterbrochen."
 
-#: gajim/gtk/accounts.py:995
+#: gajim/gtk/accounts.py:998
 #, python-format
 msgid "Connection to server %s failed"
 msgstr "Verbindung zu Server %s fehlgeschlagen"
 
-#: gajim/gtk/accounts.py:996
+#: gajim/gtk/accounts.py:999
 msgid "What would you like to do?"
 msgstr "Was möchten Sie tun?"
 
-#: gajim/gtk/accounts.py:997
+#: gajim/gtk/accounts.py:1000
 msgid "Remove only from Gajim"
 msgstr "Konto nur aus Gajim entfernen"
 
-#: gajim/gtk/accounts.py:998
+#: gajim/gtk/accounts.py:1001
 msgid "Don't remove anything. I'll try again later"
 msgstr "Bitte nichts entfernen. Ich versuche es später noch einmal"
 
@@ -10476,6 +10650,10 @@ msgstr ""
 msgid "Modify"
 msgstr "Verändern"
 
+#: gajim/gtk/roster_item_exchange.py:80
+msgid "JID"
+msgstr "JID"
+
 #: gajim/gtk/roster_item_exchange.py:86
 msgid "Groups"
 msgstr "Gruppen"
@@ -10499,19 +10677,19 @@ msgid_plural "Removed %d contacts"
 msgstr[0] "%d Kontakt entfernt"
 msgstr[1] "%d Kontakte entfernt"
 
-#: gajim/gtk/util.py:581
+#: gajim/gtk/util.py:583
 msgid "Unknown Artist"
 msgstr "Unbekannter Künstler"
 
-#: gajim/gtk/util.py:582
+#: gajim/gtk/util.py:584
 msgid "Unknown Title"
 msgstr "Unbekannter Titel"
 
-#: gajim/gtk/util.py:583
+#: gajim/gtk/util.py:585
 msgid "Unknown Source"
 msgstr "Unbekannte Quelle"
 
-#: gajim/gtk/util.py:585
+#: gajim/gtk/util.py:587
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
@@ -10520,29 +10698,10 @@ msgstr ""
 "<b>\"%(title)s\"</b> von <i>%(artist)s</i>\n"
 "aus <i>%(source)s</i>"
 
-#: gajim/gtk/bookmarks.py:121
-msgid "New Group Chat"
-msgstr "Neuer Gruppenchat"
-
-#: gajim/gtk/bookmarks.py:161
-msgid "This bookmark has invalid data"
-msgstr "Dieser gespeicherte Gruppenchat beinhaltet ungültige Daten"
-
-#: gajim/gtk/bookmarks.py:162
-msgid ""
-"Please be sure to fill out server and room fields or remove this bookmark."
-msgstr ""
-"Bitte füllen Sie die Server- und Gruppenchat-Felder aus oder löschen Sie den "
-"gespeicherten Gruppenchat."
-
-#: gajim/gtk/bookmarks.py:273 gajim/gtk/bookmarks.py:291
-#: gajim/gtk/bookmarks.py:304 gajim/gtk/bookmarks.py:335
-msgid "Character not allowed"
-msgstr "Zeichen nicht erlaubt"
-
-#: gajim/gtk/bookmarks.py:334
-msgid "Invalid room"
-msgstr "Ungültiger Gruppenchat"
+#: gajim/gtk/bookmarks.py:47
+#, python-format
+msgid "Bookmarks for %s"
+msgstr "Gespeicherte Gruppenchats für %s"
 
 #: gajim/plugins/pluginmanager.py:736 gajim/plugins/pluginmanager.py:742
 msgid "Archive corrupted"
@@ -10553,48 +10712,48 @@ msgid "Archive empty"
 msgstr "Archiv ist leer"
 
 #: gajim/plugins/pluginmanager.py:750 gajim/plugins/pluginmanager.py:758
-#: gajim/plugins/gui.py:257
+#: gajim/plugins/gui.py:258
 msgid "Archive is malformed"
 msgstr "Das Archiv beinhaltet Fehler"
 
-#: gajim/plugins/pluginmanager.py:766 gajim/plugins/gui.py:281
-#: gajim/plugins/gui.py:289
+#: gajim/plugins/pluginmanager.py:766 gajim/plugins/gui.py:288
+#: gajim/plugins/gui.py:301
 msgid "Plugin already exists"
 msgstr "Plugin existiert bereits"
 
-#: gajim/plugins/gui.py:82
+#: gajim/plugins/gui.py:83
 msgid "Click to view Gajim's wiki page on how to install plugins in Flatpak."
 msgstr "Öffnet Gajims Wiki: Plugins installieren unter Flatpak."
 
-#: gajim/plugins/gui.py:89
+#: gajim/plugins/gui.py:90
 msgid "Plugin"
 msgstr "Plugin"
 
-#: gajim/plugins/gui.py:151
+#: gajim/plugins/gui.py:152
 #, python-format
 msgid "Warning: %s"
 msgstr "Warnung: %s"
 
-#: gajim/plugins/gui.py:206
+#: gajim/plugins/gui.py:207
 msgid "Plugin failed"
 msgstr "Plugin fehlgeschlagen"
 
-#: gajim/plugins/gui.py:245
+#: gajim/plugins/gui.py:246
 msgid "Unable to properly remove the plugin"
 msgstr "Kann das Plugin nicht korrekt entfernen"
 
-#: gajim/plugins/gui.py:281
-msgid "Overwrite?"
-msgstr "Überschreiben?"
+#: gajim/plugins/gui.py:287
+msgid "Overwrite Plugin?"
+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?"
 
 #: data/org.gajim.Gajim.desktop.in:5
-msgid "Jabber IM Client"
+msgid "XMPP IM Client"
 msgstr "XMPP IM-Client"
 
-#: data/org.gajim.Gajim.desktop.in:6
-msgid "A GTK+ Jabber client"
-msgstr "Ein XMPP-Client in GTK"
-
 # TODO mark as do not translate?
 # TODO look up if there are other keywords like this in German
 #: data/org.gajim.Gajim.desktop.in:8
@@ -10656,10 +10815,10 @@ msgstr ""
 "Gruppen"
 
 #: data/org.gajim.Gajim.appdata.xml.in:27
-msgid "Chat securely with End-to-End encryption via OMEMO or PGP"
+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 PGP"
+"oder OpenPGP"
 
 #: data/org.gajim.Gajim.appdata.xml.in:28
 msgid "Use your favorite emoticons, set your own profile picture"
@@ -10724,7 +10883,7 @@ msgid "Even more features via plugins"
 msgstr "Erweiterbarer Funktionsumfang durch Plugins"
 
 #: data/org.gajim.Gajim.appdata.xml.in:52
-msgid "Roster, list of contacts"
+msgid "Contact list, list of contacts"
 msgstr "Kontaktliste, Liste von Kontakten"
 
 #: data/org.gajim.Gajim.appdata.xml.in:56
@@ -10743,6 +10902,530 @@ msgstr "Unterhaltungsverlauf"
 msgid "Plugin manager"
 msgstr "Plugin-Verwaltung"
 
+#~ msgid "Configure Services…"
+#~ msgstr "Dienste konfigurieren…"
+
+#~ msgid "Group Chat Bookmarks"
+#~ msgstr "Gruppenchats verwalten"
+
+#~ msgid "Add Bookmark"
+#~ msgstr "Gruppenchat hinzufügen"
+
+#~ msgid "Remove Bookmark"
+#~ msgstr "Gespeicherten Gruppenchat entfernen"
+
+#~ msgid "N_ame"
+#~ msgstr "_Name"
+
+#~ msgid "Bookmark Name"
+#~ msgstr "Name des Gruppenchats"
+
+#~ msgid "_Server"
+#~ msgstr "_Server"
+
+#~ msgid "Roo_m"
+#~ msgstr "G_ruppenchat"
+
+#~ msgid "_Password"
+#~ msgstr "_Passwort"
+
+#~ msgid "Join chat when connected"
+#~ msgstr "Chat beitreten, sobald eine Verbindung besteht"
+
+#~ msgid "_Join Automatically"
+#~ msgstr "A_utomatisch beitreten"
+
+#~ msgid "New Group Chat"
+#~ msgstr "Neuer Gruppenchat"
+
+#~ msgid "This bookmark has invalid data"
+#~ msgstr "Dieser gespeicherte Gruppenchat beinhaltet ungültige Daten"
+
+#~ msgid ""
+#~ "Please be sure to fill out server and group chat fields or remove this "
+#~ "bookmark."
+#~ msgstr ""
+#~ "Bitte füllen Sie die Server- und Gruppenchat-Felder aus oder löschen Sie "
+#~ "den gespeicherten Gruppenchat."
+
+#~ msgid "Character not allowed"
+#~ msgstr "Zeichen nicht erlaubt"
+
+#~ msgid "Invalid Group Chat"
+#~ msgstr "Ungültiger Gruppenchat"
+
+#~ msgid "Unable to join group chat"
+#~ msgstr "Konnte dem Gruppenchat nicht beitreten"
+
+#~ msgid "You are banned from group chat <b>%s</b>."
+#~ msgstr "Sie wurden im Gruppenchat <b>%s</b> gesperrt."
+
+#~ msgid "Remote server <b>%s</b> does not exist."
+#~ msgstr "Der Server <b>%s</b> existiert nicht."
+
+#~ msgid "Group chat <b>%s</b> does not exist."
+#~ msgstr "Der Gruppenchat <b>%s</b> existiert nicht."
+
+#~ msgid "Group chat creation is not permitted."
+#~ msgstr "Das Erstellen von Gruppenchats ist nicht erlaubt."
+
+#~ msgid "You must use your registered nickname in <b>%s</b>."
+#~ msgstr ""
+#~ "Sie müssen Ihren registrierten Spitznamen im Gruppenchat <b>%s</b> "
+#~ "verwenden."
+
+#~ msgid "You are not in the members list in group chat %s."
+#~ msgstr "Sie sind nicht auf der Mitgliederliste des Gruppenchats %s."
+
+#~ msgid "XMPP Address is not a group chat"
+#~ msgstr "XMPP-Adresse ist kein Gruppenchat"
+
+#~ msgid "This is not a group chat"
+#~ msgstr "Dies ist kein Gruppenchat"
+
+#~ msgid ""
+#~ "%(room_jid)s is already in your contact list. Please check if "
+#~ "%(room_jid)s is a correct group chat name. If it is, delete it from your "
+#~ "contact list and try joining the group chat again."
+#~ msgstr ""
+#~ "%(room_jid)s ist bereits in Ihrer Kontaktliste. Bitte prüfen Sie, ob "
+#~ "%(room_jid)s ein gültiger Gruppenchatname ist. Falls ja, löschen Sie ihn "
+#~ "von Ihrer Kontaktliste und versuchen Sie erneut beizutreten."
+
+#~ msgid "Please choose a group chat"
+#~ msgstr "Bitte wählen sie einen Gruppenchat"
+
+#~ msgid "Invalid Nickname"
+#~ msgstr "Ungültiger Spitzname"
+
+#~ msgid "Please choose a nickname"
+#~ msgstr "Bitte wählen Sie einen Spitznamen"
+
+#~ msgid "Wrong server"
+#~ msgstr "Falscher Server"
+
+#~ msgid "%s is not a group chat server"
+#~ msgstr "%s ist kein Gruppenchat-Server"
+
+#~ msgid ""
+#~ "How many lines to request from server when entering a group chat. -1 "
+#~ "means no limit."
+#~ msgstr ""
+#~ "Wie viele der letzten Nachrichten sollen beim Beitreten eines "
+#~ "Gruppenchats abgefragt werden? -1 bedeutet kein Limit."
+
+#~ msgid ""
+#~ "Minutes of backlog to request when entering a group chat. -1 means no "
+#~ "limit."
+#~ msgstr ""
+#~ "Wie viele Minuten zurück sollen Nachrichten beim Beitreten eines "
+#~ "Gruppenchats abgefragt werden? -1 bedeutet kein Limit."
+
+#~ msgid ""
+#~ "How many lines to request from server when entering a group chat. -1 "
+#~ "means no limit, -2 means global value."
+#~ msgstr ""
+#~ "Wie viele der letzten Nachrichten beim Beitreten eines Gruppenchats "
+#~ "abgefragt werden sollen. -1 bedeutet kein Limit, -2 bedeutet globale "
+#~ "Einstellung."
+
+#~ msgid ""
+#~ "Minutes of backlog to request when entering a group chat. -1 means no "
+#~ "limit, -2 means global value."
+#~ msgstr ""
+#~ "Wie viele Minuten zurück Nachrichten beim Beitreten eines Gruppenchats "
+#~ "abgefragt werden sollen. -1 bedeutet kein Limit, -2 bedeutet globale "
+#~ "Einstellung."
+
+#~ msgid "A Password is required to join the group chat %s. Please type it."
+#~ msgstr ""
+#~ "Um dem Gruppenchat %s beizutreten wird ein Passwort benötigt. Bitte geben "
+#~ "Sie das Passwort ein."
+
+#~ msgid "Not in Roster"
+#~ msgstr "Nicht in der Kontaktliste"
+
+#~ msgid "I would like to add you to my roster"
+#~ msgstr "Ich würde Sie gerne zu meiner Kontaktliste hinzufügen"
+
+#~ msgid "Add to Roster"
+#~ msgstr "Zur Kontaktliste hinzufügen"
+
+#~ msgid "Audio Session"
+#~ msgstr "Audiositzung"
+
+#~ msgid "Video Session"
+#~ msgstr "Videositzung"
+
+#~ msgid "Manage Room"
+#~ msgstr "Gruppenchat verwalten"
+
+#~ msgid "Configure Room"
+#~ msgstr "Gruppenchat konfigurieren"
+
+#~ msgid "Destroy Room"
+#~ msgstr "Gruppenchat auflösen"
+
+#~ msgid "Change Nick"
+#~ msgstr "Spitz_namen ändern"
+
+#~ msgid "Disconnect"
+#~ msgstr "Verbindung trennen"
+
+#~ msgid "Copy JID"
+#~ msgstr "JID kopieren"
+
+#~ msgid "Add to Roster…"
+#~ msgstr "Zur Kontaktliste hinzufügen…"
+
+#~ msgid "Copy JID/Email"
+#~ msgstr "JID/E-Mail-Adresse kopieren"
+
+#~ msgid "JID: <i>%s</i>"
+#~ msgstr "JID: <i>%s</i>"
+
+#~ msgid "Changing Subject"
+#~ msgstr "Thema ändern"
+
+#~ msgid "Please specify the new subject:"
+#~ msgstr "Bitte wählen Sie ein neues Thema:"
+
+#~ msgid "Room logging is now enabled"
+#~ msgstr "Die Gruppenchat-Aufzeichnung ist jetzt aktiviert"
+
+#~ msgid "Room logging is now disabled"
+#~ msgstr "Die Gruppenchat-Aufzeichnung ist jetzt deaktiviert"
+
+#~ msgid "You (%s) joined the room"
+#~ msgstr "Sie (%s) sind dem Gruppenchat beigetreten"
+
+#~ msgid "Room logging is enabled"
+#~ msgstr "Gruppenchat-Aufzeichnung ist aktiviert"
+
+#~ msgid "Unable to join groupchat"
+#~ msgstr "Konnte dem Gruppenchat nicht beitreten"
+
+#~ msgid "Groupchat Invitation"
+#~ msgstr "Gruppenchat-Einladung"
+
+#~ msgid "%(jid)s has been invited in this room"
+#~ msgstr "%(jid)s wurde in diesen Gruppenchat eingeladen"
+
+#~ msgid "JID is not a Groupchat"
+#~ msgstr "Die JID ist kein Gruppenchat"
+
+#~ msgid "Invalid JID"
+#~ msgstr "Ungültige JID"
+
+#~ msgid "A connection is not available"
+#~ msgstr "Keine Verbindung verfügbar"
+
+#~ msgid "JID already in list"
+#~ msgstr "Die JID ist bereits in der Liste"
+
+#~ msgid "Unsecure"
+#~ msgstr "Unsicher"
+
+#~ msgid "For the chosen encryption there is no encryption method available"
+#~ msgstr ""
+#~ "Für die gewählte Verschlüsselung ist keine Verschlüsselungsmethode "
+#~ "verfügbar"
+
+#~ msgid "Removes contact from roster"
+#~ msgstr "Entfernt Kontakt aus der Kontaktliste"
+
+#~ msgid "Not in roster"
+#~ msgstr "Nicht in der Kontaktliste"
+
+#~ msgid "Contact signed in notification color."
+#~ msgstr "Farbe der Benachrichtigung bei Anmeldung eines Kontaktes."
+
+#~ msgid "Contact signout notification color"
+#~ msgstr "Farbe der Benachrichtigung bei Anmeldung von Kontakten"
+
+#~ msgid "File transfer request notification color."
+#~ msgstr "Farbe der Benachrichtigung bei Dateiübertragungsanfragen."
+
+#~ msgid "File transfer error notification color."
+#~ msgstr "Farbe der Benachrichtigung bei Dateiübertragungsfehlern."
+
+#~ msgid "File transfer complete or stopped notification color."
+#~ msgstr ""
+#~ "Farbe der Benachrichtigung bei vollständigen oder gestoppten "
+#~ "Dateiübertragungen."
+
+#~ msgid "Groupchat invitation notification color"
+#~ msgstr "Farbe der Benachrichtigung bei Einladung zu einem Gruppenchat"
+
+#~ msgid "Other dialogs color."
+#~ msgstr "Andere Dialogfarben."
+
+#~ msgid "Add * and [n] in roster title?"
+#~ msgstr "Sollen * und [n] in den Titel der Kontaktliste eingefügt werden?"
+
+#~ msgid "Hides the banner in two persons chat window"
+#~ msgstr "Versteckt den Banner im Einzelnachrichtenfenster"
+
+#~ msgid ""
+#~ "Show the confirm metacontacts creation dialog or not? Empty string means "
+#~ "never show the dialog."
+#~ msgstr ""
+#~ "Soll der Bestätigungsdialog beim Erstellen von Metakontakten angezeigt "
+#~ "werden? Bei einer leeren Zeichenfolge wird der Dialog niemals gezeigt."
+
+#~ msgid "If true, You will also see your webcam"
+#~ msgstr "Falls aktiviert, wird auch Ihre Webcam angezeigt"
+
+#~ msgid "If the room subject is shown in chat on join"
+#~ msgstr "Ob beim Beitreten des Gruppenchats das Thema angezeigt werden soll"
+
+#~ msgid "Space separated list of ssl errors to ignore."
+#~ msgstr ""
+#~ "Durch Leerzeichen getrennte Liste der SSL-Fehler, die zu ignorieren sind."
+
+#~ msgid "Answer to receipt requests"
+#~ msgstr "Beantworte Anfragen zu Empfangsbestätigungen"
+
+#~ msgid "Sent receipt requests"
+#~ msgstr "Empfangsbestätigungen anfordern"
+
+#~ msgid "Language for which misspelled words will be checked"
+#~ msgstr "Sprache, die für die Rechtschreibprüfung verwendet werden soll"
+
+#~ msgid "I'm eating, so leave me a message."
+#~ msgstr "Ich esse gerade, bitte hinterlasse eine Nachricht."
+
+#~ msgid ""
+#~ "This message was encrypted with OpenPGP for XMPP and could not be "
+#~ "decrypted."
+#~ msgstr ""
+#~ "Diese Nachricht wurde mit OpenPGP für XMPP verschlüsselt und konnte nicht "
+#~ "entschlüsselt werden."
+
+#~ msgid "from room %s"
+#~ msgstr "von Gruppenchat %s"
+
+#~ msgid "Leave Groupchats"
+#~ msgstr "Verlasse Gruppenchats"
+
+#~ msgid "Auto Join"
+#~ msgstr "Automatisch beitreten"
+
+#~ msgid "Room"
+#~ msgstr "Gruppenchat"
+
+#~ msgid "Jabber ID:"
+#~ msgstr "Jabber-ID:"
+
+#~ msgid "Occupant Actions"
+#~ msgstr "Teilnehmer-Aktionen"
+
+#~ msgid "_Add to Roster"
+#~ msgstr "Zur Kont_aktliste hinzufügen"
+
+#~ msgid "_Manage Room"
+#~ msgstr "Gruppenchat _verwalten"
+
+#~ msgid "Configure _Room..."
+#~ msgstr "G_ruppenchat konfigurieren..."
+
+#~ msgid "_Destroy Room"
+#~ msgstr "_Gruppenchat auflösen"
+
+#~ msgid "Jabber ID"
+#~ msgstr "Jabber-ID"
+
+#, fuzzy
+#~ msgid "icon"
+#~ msgstr "Tray-Symbol"
+
+#, fuzzy
+#~ msgid "account"
+#~ msgstr "Konto"
+
+#~ msgid "Roster"
+#~ msgstr "Kontaktliste"
+
+#~ msgid "Show only in roster"
+#~ msgstr "Nur in der Kontaktliste zeigen"
+
+#~ msgid "in _roster"
+#~ msgstr "in der _Kontaktliste"
+
+#~ msgid "Roster Appearance"
+#~ msgstr "Erscheinungsbild der Kontaktliste"
+
+#~ msgid "Show chatstate in roster"
+#~ msgstr "Zeige Chatstatus in der Kontaktliste"
+
+#~ msgid "_Add to Roster..."
+#~ msgstr "Zur Kont_aktliste hinzufügen..."
+
+#~ msgid "_Jabber ID:"
+#~ msgstr "_Jabber-ID:"
+
+#~ msgid "_Jabber ID"
+#~ msgstr "_Jabber-ID"
+
+#~ msgid "JabberID"
+#~ msgstr "Jabber-ID"
+
+#~ msgid "Show Roster"
+#~ msgstr "Kontaktliste anzeigen"
+
+#~ msgid "MUC server"
+#~ msgstr "Gruppenchat-Server"
+
+#~ msgid "Roster Shortcuts"
+#~ msgstr "Tastenkürzel für die Kontaktliste"
+
+#~ msgid "Room Configuration"
+#~ msgstr "Verwaltung des Gruppenchats"
+
+#~ msgid "Join _Group Chat"
+#~ msgstr "_Gruppenchat beitreten"
+
+#~ msgid "Toggle audio session"
+#~ msgstr "Zwischen Audio-Sitzung umschalten"
+
+#~ msgid "Audio sessions are not available"
+#~ msgstr "Keine Audiositzungen verfügbar"
+
+#~ msgid "Conference"
+#~ msgstr "Gruppenchat"
+
+#~ msgid "_Manage Bookmarks…"
+#~ msgstr "Gruppenchats verwalte_n…"
+
+#~ msgid "Hide _Roster"
+#~ msgstr "Kontaktliste ve_rstecken"
+
+#~ msgid "Show _Roster"
+#~ msgstr "_Kontaktliste anzeigen"
+
+#~ msgid "Invalid Room"
+#~ msgstr "Ungültiger Gruppenchat"
+
+#~ msgid "Invalid room"
+#~ msgstr "Ungültiger Gruppenchat"
+
+#~ msgid "A GTK+ Jabber client"
+#~ msgstr "Ein XMPP-Client in GTK"
+
+#~ msgid "Changing Nickname"
+#~ msgstr "Spitznamen ändern"
+
+#~ msgid "Please specify the new nickname you want to use:"
+#~ msgstr "Bitte geben Sie an, welchen Spitznamen Sie verwenden möchten:"
+
+#~ msgid "Bookmark already set"
+#~ msgstr "Gruppenchat ist bereits gespeichert"
+
+#~ msgid "Group Chat '%s' is already in your bookmarks."
+#~ msgstr "Gruppenchat \"%s\" wurde bereits gespeichert."
+
+#~ msgid "Bookmark has been added successfully"
+#~ msgstr "Gruppenchat wurde erfolgreich gespeichert"
+
+#~ msgid ""
+#~ "You can manage your bookmarks by clicking the Bookmarks menu item in your "
+#~ "contact list."
+#~ msgstr ""
+#~ "Sie können Ihre Gruppenchats über den Menüpunkt Gespeicherte Gruppenchats "
+#~ "in der Kontaktliste verwalten."
+
+#~ msgid "The nickname contains invalid characters."
+#~ msgstr "Der Spitzname enthält ungültige Zeichen."
+
+#~ msgid "Bookmark Room"
+#~ msgstr "Gruppenchat speichern"
+
+#~ msgid "_Join New Group Chat"
+#~ msgstr "_Neuem Gruppenchat beitreten"
+
+#~ msgid "_Create Group Chat"
+#~ msgstr "Gruppenchat _erstellen"
+
+#~ msgid "Name:"
+#~ msgstr "Name:"
+
+#~ msgid "Description:"
+#~ msgstr "Beschreibung:"
+
+#~ msgid "Address:"
+#~ msgstr "Adresse:"
+
+#~ msgid ""
+#~ "Semi-Anonymous\n"
+#~ "<span size=\"small\">(Only moderators can see your XMPP-Address)</span>"
+#~ msgstr ""
+#~ "Semi-anonym\n"
+#~ "<span size=\"small\">(Nur Moderatoren können Ihre XMPP-Adresse sehen)</"
+#~ "span>"
+
+#~ msgid "You can not start a new conversation unless you are connected."
+#~ msgstr ""
+#~ "Sie können keine neue Unterhaltung beginnen, solange Sie nicht verbunden "
+#~ "sind."
+
+#~ msgid "Occupants"
+#~ msgstr "Teilnehmer"
+
+#~ msgid ""
+#~ "Participants entering this group chat can write messages to all "
+#~ "participants"
+#~ msgstr ""
+#~ "Teilnehmer, die diesem Gruppenchat beitreten können allen anderen "
+#~ "Teilnehmern schreiben"
+
+#~ msgid "File transfer error"
+#~ msgstr "Fehler bei der Dateiübertragung"
+
+#~ msgid "No Accounts available"
+#~ msgstr "Keine Konten eingerichtet"
+
+#~ msgid "_Modify Account..."
+#~ msgstr "_Konto bearbeiten..."
+
+#~ msgid "Boolean"
+#~ msgstr "Boolesch"
+
+#~ msgid "Integer"
+#~ msgstr "Ganzzahl"
+
+#~ msgid "Text"
+#~ msgstr "Text"
+
+#~ msgid "Value"
+#~ msgstr "Wert"
+
+#~ msgid "Type"
+#~ msgstr "Typ"
+
+#~ msgid "(None)"
+#~ msgstr "(Keine)"
+
+#~ msgid "Hidden"
+#~ msgstr "Versteckt"
+
+#~ msgid "Manage Proxy Profiles"
+#~ msgstr "Verwaltung der Proxy-Profile"
+
+#~ msgid "Properties"
+#~ msgstr "Eigenschaften"
+
+#~ msgid "Proxy _Host"
+#~ msgstr "Proxy-_Host"
+
+#~ msgid "Proxy _Port"
+#~ msgstr "Proxy-_Port"
+
+#~ msgid "New Groupchat"
+#~ msgstr "Neuer Gruppenchat"
+
+#~ msgid "New Contact"
+#~ msgstr "Neuer Kontakt"
+
 #~ msgid "%s GiB"
 #~ msgstr "%s GiB"
 
@@ -10825,9 +11508,6 @@ msgstr "Plugin-Verwaltung"
 #~ msgid "_Pause"
 #~ msgstr "_Pause"
 
-#~ msgid "Clean _up"
-#~ msgstr "Liste _leeren"
-
 #~ msgid "Remove file transfer from the list."
 #~ msgstr "Entferne Dateiübertragung aus der Liste."
 
@@ -10848,9 +11528,6 @@ msgstr "Plugin-Verwaltung"
 #~ msgstr ""
 #~ "Zeige eine Benachrichtigung, wenn die Datei vollständig übertragen wurde"
 
-#~ msgid "Select Files"
-#~ msgstr "Dateien auswählen"
-
 #~ msgid "From:"
 #~ msgstr "Von:"
 
@@ -10881,9 +11558,6 @@ msgstr "Plugin-Verwaltung"
 #~ msgid "Status: "
 #~ msgstr "Status: "
 
-#~ msgid "Aborted"
-#~ msgstr "Abgebrochen"
-
 #~ msgid "Completed"
 #~ msgstr "Abgeschlossen"
 
@@ -11311,9 +11985,6 @@ msgstr "Plugin-Verwaltung"
 #~ msgid "You are invited to a groupchat"
 #~ msgstr "Sie wurden in einen Gruppenchat eingeladen"
 
-#~ msgid "Do you want to accept the invitation?"
-#~ msgstr "Möchten Sie die Einladung annehmen?"
-
 #~ msgid ""
 #~ "<b>Issued to:</b>\n"
 #~ "Common Name (CN): %(scn)s\n"
@@ -11589,9 +12260,6 @@ msgstr "Plugin-Verwaltung"
 #~ msgid "Nick"
 #~ msgstr "Spitzname"
 
-#~ msgid "Banning…"
-#~ msgstr "Verbannen…"
-
 #~ msgid ""
 #~ "<b>Whom do you want to ban?</b>\n"
 #~ "\n"
@@ -11677,12 +12345,6 @@ msgstr "Plugin-Verwaltung"
 #~ msgid "Filter:"
 #~ msgstr "Filter:"
 
-#~ msgid ""
-#~ "If checked, Gajim will display the mood of contacts in the roster window"
-#~ msgstr ""
-#~ "Falls aktiviert, wird die Stimmung der Kontakte in der Kontaktliste "
-#~ "angezeigt."
-
 #~ msgid "Spell _checker"
 #~ msgstr "Re_chtschreibprüfung aktivieren"
 
@@ -12004,9 +12666,6 @@ msgstr "Plugin-Verwaltung"
 #~ msgid "_Status message"
 #~ msgstr "_Statusnachricht"
 
-#~ msgid "Group chat highlight"
-#~ msgstr "Hervorhebung in Gruppenchats"
-
 #~ msgid "Your nickname"
 #~ msgstr "Ihr Spitzname"
 
@@ -12151,9 +12810,6 @@ msgstr "Plugin-Verwaltung"
 #~ msgid "The passwords typed in both fields must be identical."
 #~ msgstr "Die Passwörter in beiden Feldern müssen identisch sein."
 
-#~ msgid "Enter new password:"
-#~ msgstr "Neues Passwort eingeben:"
-
 #~ msgid "Enter it again for confirmation:"
 #~ msgstr "Zur Bestätigung erneut eingeben:"
 
@@ -12168,9 +12824,6 @@ msgstr "Plugin-Verwaltung"
 #~ msgid "unsubscribe request from %s"
 #~ msgstr "Anfrage zur Beendigung des Abonnements von %s"
 
-#~ msgid "Autojoin"
-#~ msgstr "Automatisch verbinden"
-
 #~ msgid "&lt;empty&gt;"
 #~ msgstr "&lt;leer&gt;"
 
@@ -12281,9 +12934,6 @@ msgstr "Plugin-Verwaltung"
 #~ msgid "Forward unread message then disconnect"
 #~ msgstr "Ungelesene Nachrichten weiterleiten, dann Verbindung trennen"
 
-#~ msgid "AIM Address:"
-#~ msgstr "AIM-Adresse:"
-
 #~ msgid "MSN Address:"
 #~ msgstr "MSN-Adresse:"
 
@@ -12331,9 +12981,6 @@ msgstr "Plugin-Verwaltung"
 #~ msgid "Session negotiation cancelled"
 #~ msgstr "Sitzungsaushandlung abgebrochen"
 
-#~ msgid "This session WILL be archived on server"
-#~ msgstr "Diese Sitzung WIRD auf dem Server archiviert"
-
 #~ msgid "This session WILL NOT be archived on server"
 #~ msgstr "Diese Sitzung WIRD NICHT auf dem Server archiviert"
 
@@ -12724,9 +13371,6 @@ msgstr "Plugin-Verwaltung"
 #~ msgid "Server:"
 #~ msgstr "Server:"
 
-#~ msgid "Password:"
-#~ msgstr "Passwort:"
-
 #~ msgid "Join this room _automatically when I connect"
 #~ msgstr "Betrete diesen Chatraum _automatisch, wenn ich mich verbinde"
 
@@ -13101,9 +13745,6 @@ msgstr "Plugin-Verwaltung"
 #~ msgid "_Edit Personal Information..."
 #~ msgstr "Persönliche Informationen b_earbeiten …"
 
-#~ msgid "Information about you, as stored in the server"
-#~ msgstr "Informationen über Sie, die auf dem Server gespeichert sind"
-
 #~ msgid "<b>Personal Information</b>"
 #~ msgstr "<b>Persönliche Informationen</b>"
 
@@ -13190,9 +13831,6 @@ msgstr "Plugin-Verwaltung"
 #~ msgid "Your server can't save your personal information."
 #~ msgstr "Ihr Server kann keine persönlichen Informationen speichern."
 
-#~ msgid "Account Local already exists."
-#~ msgstr "Ein Konto mit dem Namen 'Local' ist bereits vorhanden."
-
 #~ msgid "Please rename or remove it before enabling link-local messaging."
 #~ msgstr ""
 #~ "Bitte benennen Sie es um oder entfernen es, bevor Sie LAN-Kontakte "
@@ -13435,10 +14073,6 @@ msgstr "Plugin-Verwaltung"
 #~ msgid "Contact's identity verified"
 #~ msgstr "Kontaktidentität wurde überprüft"
 
-#, fuzzy
-#~ msgid "Verify again…"
-#~ msgstr "Erneut überprüfen …"
-
 #~ msgid ""
 #~ "To be certain that <b>only</b> the expected person can read your messages "
 #~ "or send you messages, you need to verify their identity by clicking the "
@@ -13575,9 +14209,6 @@ msgstr "Plugin-Verwaltung"
 #~ msgid "Add _Contact..."
 #~ msgstr "_Kontakt hinzufügen …"
 
-#~ msgid "_Accounts"
-#~ msgstr "_Konten"
-
 #~ msgid "Profile, A_vatar"
 #~ msgstr "Profil und A_vatar"
 
@@ -14049,12 +14680,6 @@ msgstr "Plugin-Verwaltung"
 #~ msgstr ""
 #~ "Immer beim Programmstart prüfen, ob Gajim der Standard-Jabber-Client ist"
 
-#~ msgid "Join _Group Chat..."
-#~ msgstr "_Gruppenchat betreten …"
-
-#~ msgid "_Modify Account"
-#~ msgstr "Konto _bearbeiten"
-
 #~ msgid "The path to the client certificate and key in PKCS#12 format"
 #~ msgstr "Pfad zum Clientzertifikat und Schlüssel im PKCS#12 Format"
 
@@ -14636,9 +15261,6 @@ msgstr "Plugin-Verwaltung"
 #~ msgid "[This message is encrypted]"
 #~ msgstr "[Diese Nachricht ist verschlüsselt]"
 
-#~ msgid "Trayicon"
-#~ msgstr "Tray-Symbol"
-
 #~ msgid "A icon in systemtray reflecting the current presence."
 #~ msgstr "Ein Symbol im Systemtray, das den Status widerspiegelt."
 
@@ -14676,9 +15298,6 @@ msgstr "Plugin-Verwaltung"
 #~ msgid "Nickname not found: %s"
 #~ msgstr "Spitzname nicht gefunden: %s"
 
-#~ msgid "This group chat has no subject"
-#~ msgstr "Dieser Chatraum hat kein Thema"
-
 #, fuzzy
 #~ msgid ""
 #~ "Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
diff --git a/po/el.po b/po/el.po
index a43f4afc8..d95914baa 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: 2019-07-02 02:06+0000\n"
+"POT-Creation-Date: 2019-08-11 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,71 +25,71 @@ 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:550
+#: gajim/chat_control_base.py:557
 msgid "_Undo"
 msgstr ""
 
-#: gajim/chat_control_base.py:558 gajim/conversation_textview.py:529
+#: gajim/chat_control_base.py:565 gajim/conversation_textview.py:529
 msgid "_Clear"
 msgstr ""
 
-#: gajim/chat_control_base.py:563
+#: gajim/chat_control_base.py:570
 msgid "Paste as quote"
 msgstr ""
 
-#: gajim/chat_control_base.py:613
+#: gajim/chat_control_base.py:620
 #, fuzzy
 msgid "Paste Image"
 msgstr "Επιλογή εικόνας"
 
-#: gajim/chat_control_base.py:614
+#: gajim/chat_control_base.py:621
 #, fuzzy
 msgid "You are trying to paste an image"
 msgstr "Δεν είστε συνδεδεμένος στο διακομιστή"
 
-#: gajim/chat_control_base.py:615
+#: gajim/chat_control_base.py:622
 #, fuzzy
 msgid ""
 "Are you sure you want to paste your clipboard's image into the chat window?"
 msgstr "Είστε σίγουροι ότι θέλετε να φύγετε από το δωμάτιο \"%s\";"
 
-#: gajim/chat_control_base.py:617 gajim/groupchat_control.py:2310
-#: gajim/roster_window.py:2848 gajim/roster_window.py:4167
-#: gajim/message_window.py:252 gajim/gtk/dialogs.py:418
+#: gajim/chat_control_base.py:624 gajim/groupchat_control.py:2218
+#: gajim/roster_window.py:2841 gajim/roster_window.py:4118
+#: gajim/message_window.py:359 gajim/gtk/dialogs.py:330
 #, fuzzy
 msgid "_Do not ask me again"
 msgstr "Μη_ν με ξαναρωτήσεις"
 
-#: gajim/chat_control_base.py:620
+#: gajim/chat_control_base.py:627
 msgid "_Paste"
 msgstr ""
 
-#: gajim/chat_control_base.py:1162 gajim/gtk/accounts.py:351
+#: gajim/chat_control_base.py:1169 gajim/gtk/accounts.py:354
 #, fuzzy
 msgid "Privacy"
 msgstr "Προσωπικές συζητήσεις"
 
-#: gajim/chat_control_base.py:1163
+#: gajim/chat_control_base.py:1170
 #, fuzzy
 msgid "Warning"
 msgstr "Απαγορεύοντας την πρόσβαση στον %s"
 
-#: gajim/chat_control_base.py:1164
+#: gajim/chat_control_base.py:1171
 #, python-format
 msgid "If you send a file to <b>%s</b>, your real JID will be revealed."
 msgstr ""
 
-#: gajim/chat_control_base.py:1169
+#: gajim/chat_control_base.py:1176
 #, fuzzy
 msgid "Continue"
 msgstr "_Συνέχεια"
 
-#: gajim/gtkgui_helpers.py:163 gajim/gtk/filetransfer.py:393
+#: gajim/gtkgui_helpers.py:163 gajim/gtk/filetransfer.py:398
 #, fuzzy, python-format
 msgid "Cannot overwrite existing file '%s'"
 msgstr "Δεν είναι δυνατή η αντικατάσταση του υπάρχοντος αρχείου \"%s\""
 
-#: gajim/gtkgui_helpers.py:164 gajim/gtk/filetransfer.py:394
+#: gajim/gtkgui_helpers.py:164 gajim/gtk/filetransfer.py:399
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
@@ -184,392 +184,401 @@ msgstr ""
 msgid " resource with priority "
 msgstr " πόρος με προτεραιότητα"
 
-#: gajim/gui_menu_builder.py:96
-#, fuzzy
-msgid "_New Group Chat"
-msgstr "Αρχηγός ομάδας παραθύρων"
-
-#: gajim/gui_menu_builder.py:289 gajim/gui_menu_builder.py:380
-#: gajim/chat_control.py:303 gajim/roster_window.py:786
-#: gajim/roster_window.py:1719 gajim/roster_window.py:1721
-#: gajim/roster_window.py:2030 gajim/roster_window.py:3336
-#: gajim/roster_window.py:3369 gajim/gui_interface.py:413
-#: gajim/common/contacts.py:206 gajim/common/contacts.py:343
-#: gajim/common/helpers.py:83 gajim/common/helpers.py:311
-#: gajim/gtk/add_contact.py:319 gajim/gtk/subscription_request.py:70
-#: gajim/gtk/subscription_request.py:99 gajim/gtk/roster_item_exchange.py:112
-msgid "Not in Roster"
-msgstr "εκτός λίστας επαφών"
+#: gajim/gui_menu_builder.py:251 gajim/gui_menu_builder.py:342
+#: gajim/chat_control.py:305 gajim/roster_window.py:783
+#: gajim/roster_window.py:1716 gajim/roster_window.py:1718
+#: gajim/roster_window.py:2027 gajim/roster_window.py:3292
+#: gajim/roster_window.py:3325 gajim/gui_interface.py:396
+#: gajim/common/contacts.py:222 gajim/common/contacts.py:359
+#: gajim/common/contacts.py:471 gajim/common/helpers.py:86
+#: gajim/common/helpers.py:317 gajim/gtk/add_contact.py:319
+#: gajim/gtk/subscription_request.py:70 gajim/gtk/subscription_request.py:99
+#: gajim/gtk/roster_item_exchange.py:112
+#, fuzzy
+msgid "Not in contact list"
+msgstr "Εμφάνιση _αποσυνδεδεμένων χρηστών"
 
-#: gajim/gui_menu_builder.py:393
-msgid "I would like to add you to my roster"
-msgstr "Θα ήθελα να σε προσθέσω στην λίστα επαφών μου"
+#: gajim/gui_menu_builder.py:355
+#, fuzzy
+msgid "I would like to add you to my contact list"
+msgstr "Θα ήθελα να σε προσθέσω στην λίστα επαφών μου."
 
-#: gajim/gui_menu_builder.py:471
+#: gajim/gui_menu_builder.py:433
 #, fuzzy
 msgid "Send Single _Message…"
 msgstr "Αποστολή ενός _μηνύματος"
 
-#: gajim/gui_menu_builder.py:486
+#: gajim/gui_menu_builder.py:448
 #, fuzzy
 msgid "E_xecute Command…"
 msgstr "_Εκτέλεση εντολής..."
 
-#: gajim/gui_menu_builder.py:494
+#: gajim/gui_menu_builder.py:456
 #, fuzzy
 msgid "_Manage Transport"
 msgstr "Μεταφορές"
 
-#: gajim/gui_menu_builder.py:500
+#: gajim/gui_menu_builder.py:462
 #, fuzzy
 msgid "_Modify Transport"
 msgstr "Προβολή ιδιοτήτων εκτυπωτή"
 
-#: gajim/gui_menu_builder.py:507 gajim/roster_window.py:5046
+#: gajim/gui_menu_builder.py:469 gajim/roster_window.py:4985
 #, fuzzy
 msgid "_Rename…"
 msgstr "_Μετονομασία"
 
-#: gajim/gui_menu_builder.py:518 gajim/roster_window.py:5062
-#: gajim/roster_window.py:5177 gajim/data/gui/blocked_contacts_window.ui:52
+#: gajim/gui_menu_builder.py:480 gajim/roster_window.py:5001
+#: gajim/roster_window.py:5116 gajim/data/gui/blocked_contacts_window.ui:52
 #: gajim/data/gui/gc_occupants_menu.ui:148
 #: gajim/data/gui/contact_context_menu.ui:143
 msgid "_Unblock"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:521 gajim/roster_window.py:5067
-#: gajim/roster_window.py:5181 gajim/data/gui/gc_occupants_menu.ui:140
+#: gajim/gui_menu_builder.py:483 gajim/roster_window.py:5006
+#: gajim/roster_window.py:5120 gajim/data/gui/gc_occupants_menu.ui:140
 #: gajim/data/gui/contact_context_menu.ui:151
 msgid "_Block"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:529 gajim/roster_window.py:5074
+#: gajim/gui_menu_builder.py:491 gajim/roster_window.py:5013
 #: gajim/data/gui/contact_context_menu.ui:181
 #, fuzzy
 msgid "Remo_ve"
 msgstr "_Αφαίρεση"
 
-#: gajim/gui_menu_builder.py:539 gajim/data/gui/contact_context_menu.ui:198
+#: gajim/gui_menu_builder.py:501 gajim/data/gui/contact_context_menu.ui:198
 #, fuzzy
 msgid "_Information"
 msgstr "Πληροφορίες επαφής"
 
-#: gajim/gui_menu_builder.py:552
+#: gajim/gui_menu_builder.py:514
 #, fuzzy
 msgid "Save _As"
 msgstr "Έχει"
 
-#: gajim/gui_menu_builder.py:564 gajim/groupchat_control.py:501
-#: gajim/chat_control.py:340
+#: gajim/gui_menu_builder.py:526 gajim/groupchat_control.py:507
+#: gajim/chat_control.py:342
 #, fuzzy
 msgid "Send File…"
 msgstr "Αποστολή _αρχείου"
 
-#: gajim/gui_menu_builder.py:565
+#: gajim/gui_menu_builder.py:527
 #, fuzzy
 msgid "Upload File…"
 msgstr "Αποθήκευση αρχείου ως..."
 
-#: gajim/gui_menu_builder.py:566
+#: gajim/gui_menu_builder.py:528
 #, fuzzy
 msgid "Send File Directly…"
 msgstr "Αποθήκευση αρχείου ως..."
 
-#: gajim/gui_menu_builder.py:568 gajim/gui_menu_builder.py:632
+#: gajim/gui_menu_builder.py:530 gajim/gui_menu_builder.py:596
 #, fuzzy
 msgid "Send Chatstate"
 msgstr "Τελευταία κατάσταση: %s"
 
-#: gajim/gui_menu_builder.py:569
+#: gajim/gui_menu_builder.py:531
 #, fuzzy
 msgid "Invite Contacts"
 msgstr "Επαφές"
 
-#: gajim/gui_menu_builder.py:570
+#: gajim/gui_menu_builder.py:532
 #, fuzzy
-msgid "Add to Roster"
-msgstr "_Προσθήκη στη λίστα επαφών"
+msgid "Add to Contact List"
+msgstr "_Προσθήκη επαφής..."
 
-#: gajim/gui_menu_builder.py:571
-msgid "Audio Session"
-msgstr ""
+#: gajim/gui_menu_builder.py:533
+#, fuzzy
+msgid "Voice Chat"
+msgstr "Αίτηση μεταφοράς αρχείου"
 
-#: gajim/gui_menu_builder.py:572
-msgid "Video Session"
-msgstr ""
+#: gajim/gui_menu_builder.py:534
+#, fuzzy
+msgid "Video Chat"
+msgstr "Προσωπική συζήτηση"
 
-#: gajim/gui_menu_builder.py:573
+#: gajim/gui_menu_builder.py:535 gajim/gui_menu_builder.py:582
 #, fuzzy
 msgid "Information"
 msgstr "Πληροφορίες επαφής"
 
-#: gajim/gui_menu_builder.py:574 gajim/gui_menu_builder.py:639
+#: gajim/gui_menu_builder.py:536 gajim/gui_menu_builder.py:602
 #: gajim/data/gui/application_menu.ui:37
 #, fuzzy
 msgid "History"
 msgstr "_Ιστορικό"
 
-#: gajim/gui_menu_builder.py:580 gajim/gui_menu_builder.py:687
+#: gajim/gui_menu_builder.py:542 gajim/gui_menu_builder.py:650
 #: gajim/data/gui/preferences_window.ui:1823
 msgid "Disabled"
 msgstr "Απενεργοποιημένο"
 
-#: gajim/gui_menu_builder.py:581 gajim/gui_menu_builder.py:688
+#: gajim/gui_menu_builder.py:543 gajim/gui_menu_builder.py:651
 #, fuzzy
 msgid "Composing only"
 msgstr "Σύνθεση"
 
-#: gajim/gui_menu_builder.py:582 gajim/gui_menu_builder.py:689
+#: gajim/gui_menu_builder.py:544 gajim/gui_menu_builder.py:652
 #, fuzzy
 msgid "All chat states"
 msgstr "Όλες οι καταστάσεις"
 
-#: gajim/gui_menu_builder.py:620
+#: gajim/gui_menu_builder.py:583
 #, fuzzy
-msgid "Manage Room"
-msgstr "Διαχείριση σελιδοδεικτών"
+msgid "Manage Group Chat"
+msgstr "Ομαδικές συζητήσεις"
 
-#: gajim/gui_menu_builder.py:621
+#: gajim/gui_menu_builder.py:584 gajim/data/gui/groupchat_control.ui:649
 #, fuzzy
 msgid "Change Subject"
 msgstr "Αλλαγή _θέματος"
 
-#: gajim/gui_menu_builder.py:622
+#: gajim/gui_menu_builder.py:585
 #, fuzzy
-msgid "Configure Room"
-msgstr "Ρύθμιση _δωματίου"
+msgid "Configure Group Chat"
+msgstr "Ομαδικές συζητήσεις"
 
-#: gajim/gui_menu_builder.py:623
+#: gajim/gui_menu_builder.py:586
 #, fuzzy
 msgid "Upload Avatar…"
 msgstr "Επιλογή εικόνας"
 
-#: gajim/gui_menu_builder.py:624
+#: gajim/gui_menu_builder.py:587
 #, fuzzy
-msgid "Destroy Room"
-msgstr "Περιγραφή: %s"
+msgid "Destroy Group Chat"
+msgstr "Αρχηγός ομάδας παραθύρων"
 
-#: gajim/gui_menu_builder.py:626 gajim/data/gui/preferences_window.ui:790
+#: gajim/gui_menu_builder.py:589 gajim/data/gui/preferences_window.ui:790
 #, fuzzy
 msgid "Chat Settings"
 msgstr "Η δημοσιοποίηση της vCard απέτυχε"
 
-#: gajim/gui_menu_builder.py:627
+#: gajim/gui_menu_builder.py:590
 msgid "Show join/leave"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:628
+#: gajim/gui_menu_builder.py:591
 #, fuzzy
 msgid "Show status changes"
 msgstr "Καταγραφή α_λλαγών κατάστασης των επαφών"
 
-#: gajim/gui_menu_builder.py:629 gajim/data/gui/gc_control_popup_menu.ui:72
+#: gajim/gui_menu_builder.py:592 gajim/data/gui/gc_control_popup_menu.ui:72
 #, fuzzy
 msgid "Notify on all messages"
 msgstr "Προκαθορισμένα μηνύματα:"
 
-#: gajim/gui_menu_builder.py:630
+#: gajim/gui_menu_builder.py:593
 msgid "Minimize on close"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:631
-msgid "Minimize on autojoin"
+#: gajim/gui_menu_builder.py:595
+msgid "Minimize when joining automatically"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:634
+#: gajim/gui_menu_builder.py:598
 msgid "Sync Threshold"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:635
+#: gajim/gui_menu_builder.py:599
 #, fuzzy
-msgid "Change Nick"
+msgid "Change Nickname"
 msgstr "Αλλαγή _ψευδώνυμου"
 
-#: gajim/gui_menu_builder.py:636
-#, fuzzy
-msgid "Bookmark Room"
-msgstr "_Τοποθέτηση σελιδοδείκτη για αυτό το δωμάτιο"
-
-#: gajim/gui_menu_builder.py:637
+#: gajim/gui_menu_builder.py:600
 #, fuzzy
 msgid "Request Voice"
 msgstr "_Φωνή"
 
-#: gajim/gui_menu_builder.py:638 gajim/roster_window.py:5246
+#: gajim/gui_menu_builder.py:601 gajim/roster_window.py:5185
 #, fuzzy
 msgid "Execute command"
 msgstr "_Εκτέλεση εντολής..."
 
-#: gajim/gui_menu_builder.py:640
-#, fuzzy
-msgid "Disconnect"
-msgstr "Αποσύνδεση επαφής"
+#: gajim/gui_menu_builder.py:603
+msgid "Leave"
+msgstr ""
 
-#: gajim/gui_menu_builder.py:678 gajim/gtk/preferences.py:156
+#: gajim/gui_menu_builder.py:641 gajim/gtk/preferences.py:155
 msgid "No threshold"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:680 gajim/gtk/preferences.py:158
+#: gajim/gui_menu_builder.py:643 gajim/gtk/preferences.py:157
 #, fuzzy, python-format
 msgid "%i day"
 msgid_plural "%i days"
 msgstr[0] "πριν από %i μέρες"
 msgstr[1] "πριν από %i μέρες"
 
-#: gajim/gui_menu_builder.py:709 gajim/gui_menu_builder.py:747
-#: gajim/gtk/join_groupchat.py:43
-msgid "Join Group Chat"
-msgstr "Συμμετοχή σε ομαδική κουβέντα"
-
-#: gajim/gui_menu_builder.py:746
+#: gajim/gui_menu_builder.py:672
 #, fuzzy
 msgid "Add Contact…"
 msgstr "_Προσθήκη επαφής..."
 
-#: gajim/gui_menu_builder.py:748 gajim/gtk/profile.py:52
-#: gajim/gtk/accounts.py:770 gajim/gtk/accounts.py:808
+#: gajim/gui_menu_builder.py:673 gajim/gtk/profile.py:52
+#: gajim/gtk/accounts.py:773 gajim/gtk/accounts.py:811
 #, fuzzy
 msgid "Profile"
 msgstr "αρχείο"
 
-#: gajim/gui_menu_builder.py:749
+#: gajim/gui_menu_builder.py:674
+#, fuzzy
+msgid "Send Single Message…"
+msgstr "Αποστολή ενός _μηνύματος"
+
+#: gajim/gui_menu_builder.py:675
 #, fuzzy
 msgid "Discover Services"
 msgstr "Εύρεση _υπηρεσιών"
 
-#: gajim/gui_menu_builder.py:750
+#: gajim/gui_menu_builder.py:676 gajim/gtk/server_info.py:36
 #, fuzzy
-msgid "Send Single Message…"
-msgstr "Αποστολή ενός _μηνύματος"
+msgid "Server Info"
+msgstr "Εξυπηρετητής"
 
-#: gajim/gui_menu_builder.py:751 gajim/data/gui/preferences_window.ui:2741
+#: gajim/gui_menu_builder.py:677 gajim/data/gui/preferences_window.ui:2741
 msgid "Advanced"
 msgstr "Προχωρημένοι"
 
-#: gajim/gui_menu_builder.py:752 gajim/gtk/mam_preferences.py:88
+#: gajim/gui_menu_builder.py:678 gajim/gtk/mam_preferences.py:88
 #, fuzzy
 msgid "Archiving Preferences"
 msgstr "_Προτιμήσεις"
 
-#: gajim/gui_menu_builder.py:753
+#: gajim/gui_menu_builder.py:679
 #, fuzzy
 msgid "Blocking List"
 msgstr "Λίστα Ban"
 
-#: gajim/gui_menu_builder.py:754 gajim/gtk/history_sync.py:108
+#: gajim/gui_menu_builder.py:680
+#, fuzzy
+msgid "Bookmarks"
+msgstr "_Τοποθέτηση σελιδοδείκτη για αυτό το δωμάτιο"
+
+#: gajim/gui_menu_builder.py:681
+#, fuzzy
+msgid "PEP Configuration"
+msgstr "Ρυθμίσεις δωματίου"
+
+#: gajim/gui_menu_builder.py:682 gajim/gtk/history_sync.py:108
 #: gajim/gtk/history_sync.py:186
 #, fuzzy
 msgid "Synchronise History"
 msgstr "Εμφάνιση _αποσυνδεδεμένων χρηστών"
 
-#: gajim/gui_menu_builder.py:755 gajim/gtk/privacy_list.py:427
+#: gajim/gui_menu_builder.py:683 gajim/gtk/privacy_list.py:427
 #, fuzzy
 msgid "Privacy Lists"
 msgstr "Προσωπικές συζητήσεις"
 
-#: gajim/gui_menu_builder.py:756 gajim/gtk/server_info.py:36
-#, fuzzy
-msgid "Server Info"
-msgstr "Εξυπηρετητής"
-
-#: gajim/gui_menu_builder.py:757 gajim/gui_menu_builder.py:768
+#: gajim/gui_menu_builder.py:685 gajim/gui_menu_builder.py:696
 #: gajim/data/gui/xml_console_window.ui:77
 msgid "XML Console"
 msgstr "XML Κονσόλα"
 
-#: gajim/gui_menu_builder.py:759 gajim/data/gui/groupchat_config.ui:36
+#: gajim/gui_menu_builder.py:687 gajim/data/gui/groupchat_config.ui:36
 #, fuzzy
 msgid "Admin"
 msgstr "_Διαχειριστής"
 
-#: gajim/gui_menu_builder.py:760
+#: gajim/gui_menu_builder.py:688
 #, fuzzy
 msgid "Send Server Message…"
 msgstr "_Αποστολή μηνύματος διακομιστή"
 
-#: gajim/gui_menu_builder.py:761
+#: gajim/gui_menu_builder.py:689
 #, fuzzy
 msgid "Set MOTD…"
 msgstr "Ορισμός MOTD"
 
-#: gajim/gui_menu_builder.py:762
+#: gajim/gui_menu_builder.py:690
 #, fuzzy
 msgid "Update MOTD…"
 msgstr "Ενημέρωση MOTD"
 
-#: gajim/gui_menu_builder.py:763
+#: gajim/gui_menu_builder.py:691
 #, fuzzy
 msgid "Delete MOTD…"
 msgstr "Διαγραφή MOTD"
 
-#: gajim/gui_menu_builder.py:812
+#: gajim/gui_menu_builder.py:736
 #, fuzzy
-msgid "No Accounts available"
-msgstr "Κανένας λογαριασμός δεν είναι διαθέσιμος"
+msgid "_Add Account…"
+msgstr "_Προσθήκη επαφής..."
+
+#: gajim/gui_menu_builder.py:742
+#, fuzzy
+msgid "_Modify Accounts…"
+msgstr "Επεξεργασία λογαριασμού"
+
+#: gajim/gui_menu_builder.py:751 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:823 gajim/data/gui/application_menu.ui:5
-#: gajim/data/gui/application_menu.ui:71 gajim/data/gui/shortcuts_window.ui:182
-#: gajim/gtk/accounts.py:58
+#: gajim/gui_menu_builder.py:755 gajim/data/gui/application_menu.ui:5
+#: gajim/data/gui/shortcuts_window.ui:182 gajim/gtk/accounts.py:57
 msgid "Accounts"
 msgstr "Λογαριασμοί"
 
-#: gajim/gui_menu_builder.py:881 gajim/gui_menu_builder.py:886
+#: gajim/gui_menu_builder.py:784 gajim/gui_menu_builder.py:789
 #, fuzzy
-msgid "Copy JID"
-msgstr "Δωμάτιο:"
+msgid "Copy XMPP Address"
+msgstr "Α_ντιγραφή JID/Email διεύθυνσης"
 
-#: gajim/gui_menu_builder.py:882 gajim/gui_menu_builder.py:914
+#: gajim/gui_menu_builder.py:785 gajim/gui_menu_builder.py:817
 #, fuzzy
 msgid "Join Groupchat"
 msgstr "Συμμετοχή σε ομαδική κουβέντα"
 
-#: gajim/gui_menu_builder.py:887 gajim/gui_menu_builder.py:913
-#: gajim/data/gui/application_menu.ui:76
+#: gajim/gui_menu_builder.py:790 gajim/gui_menu_builder.py:816
+#: gajim/data/gui/application_menu.ui:71
 #: gajim/data/gui/subscription_request_window.ui:106
 msgid "Start Chat"
 msgstr "Έναρξη κουβέντας"
 
-#: gajim/gui_menu_builder.py:888 gajim/gui_menu_builder.py:915
+#: gajim/gui_menu_builder.py:791 gajim/gui_menu_builder.py:818
 #, fuzzy
-msgid "Add to Roster…"
-msgstr "_Προσθήκη στη λίστα επαφών"
+msgid "Add to Contact List…"
+msgstr "_Προσθήκη επαφής..."
 
-#: gajim/gui_menu_builder.py:893
+#: gajim/gui_menu_builder.py:796
 #, fuzzy
 msgid "Copy Link Location"
 msgstr "_Αντιγραφή τοποθεσίας δεσμού"
 
-#: gajim/gui_menu_builder.py:894
+#: gajim/gui_menu_builder.py:797
 #, fuzzy
 msgid "Open Link in Browser"
 msgstr "_Άνοιγμα δεσμού στον περιηγητή"
 
-#: gajim/gui_menu_builder.py:899
+#: gajim/gui_menu_builder.py:802
 #, fuzzy
 msgid "Copy Email Address"
 msgstr "Α_ντιγραφή JID/Email διεύθυνσης"
 
-#: gajim/gui_menu_builder.py:900 gajim/gui_menu_builder.py:912
+#: gajim/gui_menu_builder.py:803 gajim/gui_menu_builder.py:815
 #, fuzzy
 msgid "Open Email Composer"
 msgstr "_Άνοιγμα προγράμματος αλληλογραφίας"
 
-#: gajim/gui_menu_builder.py:905
+#: gajim/gui_menu_builder.py:808
 #, fuzzy
 msgid "Copy Location"
 msgstr "_Αντιγραφή τοποθεσίας δεσμού"
 
-#: gajim/gui_menu_builder.py:906
+#: gajim/gui_menu_builder.py:809
 #, fuzzy
 msgid "Show Location"
 msgstr "Τροποποίηση λογαριασμού"
 
-#: gajim/gui_menu_builder.py:911
+#: gajim/gui_menu_builder.py:814
 #, fuzzy
-msgid "Copy JID/Email"
+msgid "Copy XMPP Address/Email"
 msgstr "Α_ντιγραφή JID/Email διεύθυνσης"
 
-#: gajim/gui_menu_builder.py:945
+#: gajim/gui_menu_builder.py:852
 #, fuzzy
 msgid "Copy"
 msgstr "Δωμάτιο:"
@@ -592,44 +601,55 @@ msgstr ""
 msgid "Choose folder for logfile"
 msgstr ""
 
-#: gajim/history_manager.py:107
+#: gajim/history_manager.py:106
 msgid "Cannot find history logs database"
 msgstr "Δεν ήταν δυνατή η εύρεση της βάσης δεδομένων ιστορικού"
 
-#: gajim/history_manager.py:108
+#: gajim/history_manager.py:107
 #, fuzzy, python-format
 msgid "%s does not exist."
 msgstr "Δεν υπάρχει τέτοια συζήτηση."
 
-#: gajim/history_manager.py:141 gajim/history_manager.py:195
-#: gajim/gtk/discovery.py:829 gajim/gtk/roster_item_exchange.py:80
-msgid "JID"
-msgstr "JID"
+#: gajim/history_manager.py:140 gajim/history_manager.py:194
+#: 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:30
+#: gajim/gtk/accounts.py:804
+#, fuzzy
+msgid "XMPP Address"
+msgstr "Αντιγραφή διεύθυνσης email"
 
-#: gajim/history_manager.py:154 gajim/history_manager.py:202
+#: gajim/history_manager.py:153 gajim/history_manager.py:201
 #: gajim/data/gui/history_window.ui:89 gajim/gtk/history.py:108
 msgid "Date"
 msgstr "Ημερομηνία"
 
-#: gajim/history_manager.py:161 gajim/history_manager.py:225
+#: gajim/history_manager.py:160 gajim/history_manager.py:224
 #: gajim/data/gui/join_groupchat_window.ui:208
 #: gajim/data/gui/profile_window.ui:214
 #: gajim/data/gui/vcard_information_window.ui:443
+#: gajim/data/gui/bookmarks.ui:140
 msgid "Nickname"
 msgstr "Όνομα χρήστη"
 
-#: gajim/history_manager.py:172 gajim/history_manager.py:211
+#: gajim/history_manager.py:171 gajim/history_manager.py:210
 #: gajim/data/gui/preferences_window.ui:1344
 #: gajim/data/gui/single_message_window.ui:275 gajim/gtk/history.py:117
 msgid "Message"
 msgstr "Μήνυμα"
 
-#: gajim/history_manager.py:180 gajim/history_manager.py:218
+#: gajim/history_manager.py:179 gajim/history_manager.py:217
 #: gajim/data/gui/groups_post_window.ui:49
 #: gajim/data/gui/single_message_window.ui:214
 msgid "Subject"
 msgstr "Θέμα"
 
+#: gajim/history_manager.py:247
+msgid "Database Cleanup"
+msgstr ""
+
 #: gajim/history_manager.py:248
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
@@ -641,11 +661,8 @@ msgstr ""
 #: gajim/history_manager.py:250
 #, fuzzy
 msgid ""
-"Normally allocated database size will not be freed, it will just become "
-"reusable. If you really want to reduce database filesize, click YES, else "
-"click NO.\n"
-"\n"
-"In case you click YES, please wait…"
+"Normally, the allocated database size will not be freed, it will just become "
+"reusable. This operation may take a while."
 msgstr ""
 "Ο κατανεμημένος στη βάση δεδομένων χώρος δεν θα ελευθερωθεί, αλλά θα γίνει "
 "αξιοποιήσιμος πάλι. Αν πράγματι θέλετε να μειώσετε το μέγεθος της βάσης "
@@ -654,47 +671,48 @@ msgstr ""
 "Σε περίπτωση που επιλέξατε ΝΑΙ, παρακαλώ περιμένετε..."
 
 #: gajim/history_manager.py:255
-msgid "Database Cleanup"
-msgstr ""
+#, fuzzy
+msgid "_Cleanup"
+msgstr "Εκκα_θάριση"
 
-#: gajim/history_manager.py:519 gajim/gtk/filetransfer.py:238
-#: gajim/gtk/filetransfer.py:248
+#: gajim/history_manager.py:518 gajim/gtk/filetransfer.py:237
+#: gajim/gtk/filetransfer.py:247
 msgid "You"
 msgstr "You"
 
-#: gajim/history_manager.py:531
+#: gajim/history_manager.py:530
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "Ο %(who)s είπε στις %(time)s: %(message)s\n"
 
-#: gajim/history_manager.py:568 gajim/history_manager.py:607
-#: gajim/gtk/dialogs.py:58 gajim/gtk/themes.py:319
+#: gajim/history_manager.py:567 gajim/history_manager.py:606
+#: gajim/gtk/dialogs.py:57 gajim/gtk/themes.py:319
 #: gajim/gtk/roster_item_exchange.py:75 gajim/gtk/roster_item_exchange.py:185
 msgid "Delete"
 msgstr "Διαγραφή"
 
-#: gajim/history_manager.py:569
+#: gajim/history_manager.py:568
 #, fuzzy
 msgid "Delete Conversation"
 msgid_plural "Delete Conversations"
 msgstr[0] "Πληροφορίες επαφής"
 msgstr[1] "Πληροφορίες επαφής"
 
-#: gajim/history_manager.py:570
+#: gajim/history_manager.py:569
 #, 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:608
+#: gajim/history_manager.py:607
 #, fuzzy
 msgid "Delete Message"
 msgid_plural "Delete Messages"
 msgstr[0] "Προεπιλεγμένα μηνύματα κατάστασης"
 msgstr[1] "Προεπιλεγμένα μηνύματα κατάστασης"
 
-#: gajim/history_manager.py:609
+#: gajim/history_manager.py:608
 #, fuzzy
 msgid "Do you want to permanently delete this message"
 msgid_plural "Do you want to permanently delete these messages"
@@ -707,15 +725,15 @@ msgid "Contact name: <i>%s</i>"
 msgstr "Όνομα εικονιδίου"
 
 #: gajim/dialogs.py:84
-#, fuzzy, python-format
-msgid "JID: <i>%s</i>"
-msgstr "ID συστήματος:"
+#, python-format
+msgid "XMPP Address: <i>%s</i>"
+msgstr ""
 
-#: gajim/dialogs.py:115 gajim/dialogs.py:128 gajim/roster_window.py:2901
-#: gajim/roster_window.py:3833 gajim/roster_window.py:5084
-#: gajim/common/contacts.py:157 gajim/common/contacts.py:190
+#: gajim/dialogs.py:115 gajim/dialogs.py:128 gajim/roster_window.py:2894
+#: gajim/roster_window.py:3784 gajim/roster_window.py:5023
+#: gajim/common/contacts.py:157 gajim/common/contacts.py:206
 #: gajim/data/gui/preferences_window.ui:558
-#: gajim/data/gui/shortcuts_window.ui:177 gajim/gtk/accounts.py:349
+#: gajim/data/gui/shortcuts_window.ui:177 gajim/gtk/accounts.py:352
 msgid "General"
 msgstr "Γενικά"
 
@@ -764,7 +782,7 @@ msgstr ""
 "Αυτό το όνομα χρησιμοποιείται ήδη από κάποιον άλλον από τους λογαριασμούς "
 "σας. Παρακαλώ, επιλέξτε άλλο όνομα."
 
-#: gajim/dialogs.py:703
+#: gajim/dialogs.py:703 gajim/plugins/gui.py:292
 msgid "_Overwrite"
 msgstr ""
 
@@ -776,9 +794,7 @@ msgstr "Αποθήκευση ως προκαθορισμένο μήνυμα κα
 msgid "Please type a name for this status message"
 msgstr "Εισάγετε ένα όνομα για αυτό το μήνυμα κατάστασης"
 
-#: gajim/dialogs.py:740 gajim/gui_interface.py:1441 gajim/dialog_messages.py:31
-#: gajim/gtk/discovery.py:518 gajim/gtk/profile.py:323
-#: gajim/gtk/join_groupchat.py:234
+#: gajim/dialogs.py:740 gajim/gtk/discovery.py:517 gajim/gtk/profile.py:323
 msgid "You are not connected to the server"
 msgstr "Δεν είστε συνδεδεμένος στο διακομιστή"
 
@@ -787,9 +803,11 @@ msgstr "Δεν είστε συνδεδεμένος στο διακομιστή"
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Πρέπει να είστε συνδεδεμένος για να αλλάξετε τον κωδικό σας."
 
-#: gajim/dialogs.py:752 gajim/dialogs.py:823 gajim/gtk/discovery.py:822
-#: gajim/gtk/discovery.py:1648 gajim/gtk/discovery.py:1941
-#: gajim/gtk/history.py:99 gajim/gtk/roster_item_exchange.py:83
+#: gajim/dialogs.py:752 gajim/dialogs.py:823
+#: gajim/data/gui/groupchat_info_scrolled.ui:16 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/gtk/roster_item_exchange.py:83
 msgid "Name"
 msgstr "Όνομα"
 
@@ -813,399 +831,345 @@ msgstr ""
 msgid "Synchronise"
 msgstr ""
 
-#: gajim/dialogs.py:1043
+#: gajim/dialogs.py:1042
 msgid "an audio and video"
 msgstr ""
 
-#: gajim/dialogs.py:1045
+#: gajim/dialogs.py:1044
 msgid "an audio"
 msgstr ""
 
-#: gajim/dialogs.py:1047
+#: gajim/dialogs.py:1046
 msgid "a video"
 msgstr ""
 
-#: gajim/dialogs.py:1051
+#: gajim/dialogs.py:1050
 #, python-format
 msgid ""
-"%(contact)s wants to start %(type)s session with you. Do you want to answer "
+"%(contact)s wants to start a %(type)s chat with you. Do you want to answer "
 "the call?"
 msgstr ""
 
-#: gajim/groupchat_control.py:505
+#: gajim/groupchat_control.py:511
 #, fuzzy, python-format
 msgid "Send File (max. %s MiB)…"
 msgstr "Αποθήκευση αρχείου ως..."
 
-#: gajim/groupchat_control.py:507 gajim/chat_control.py:342
+#: gajim/groupchat_control.py:513 gajim/chat_control.py:344
 #, fuzzy
 msgid "No File Transfer available"
 msgstr "Μεταφορές αρχείων"
 
-#: gajim/groupchat_control.py:630 gajim/groupchat_control.py:2349
-msgid "Changing Subject"
-msgstr "Αλλαγή θέματος"
-
-#: gajim/groupchat_control.py:631 gajim/groupchat_control.py:2350
-msgid "Please specify the new subject:"
-msgstr "Παρακαλώ καθορίστε το νέο θέμα:"
-
-#: gajim/groupchat_control.py:638
-msgid "Changing Nickname"
-msgstr "Αλλαγή ψευδωνύμου"
-
-#: gajim/groupchat_control.py:639
-msgid "Please specify the new nickname you want to use:"
-msgstr "Παρακαλώ καθορίστε το νέο ψευδώνυμο που θέλετε να χρησιμοποιείτε:"
-
-#: gajim/groupchat_control.py:657
+#: gajim/groupchat_control.py:655
 #, fuzzy
-msgid "Invalid group chat JID"
+msgid "Invalid group chat XMPP Address"
 msgstr "Μη έγκυρο Jabber ID"
 
-#: gajim/groupchat_control.py:658
+#: gajim/groupchat_control.py:656
 #, fuzzy
-msgid "The group chat JID has not allowed characters."
+msgid "The group chat XMPP Address has not allowed characters."
 msgstr ""
 "Το όνομα του δωματίου ή του διακομιστή περιέχει μη επιτρεπόμενους χαρακτήρες."
 
-#: gajim/groupchat_control.py:758 gajim/gtk/profile.py:136
+#: gajim/groupchat_control.py:743 gajim/gtk/profile.py:136
 msgid "Could not load image"
 msgstr "Δεν ήταν δυνατό το φόρτωμα της εικόνας"
 
-#: gajim/groupchat_control.py:888
+#: gajim/groupchat_control.py:873
 msgid "Insert Nickname"
 msgstr "Εισάγετε ψευδώνυμο"
 
-#: gajim/groupchat_control.py:1056 gajim/chat_control.py:824
+#: gajim/groupchat_control.py:1041 gajim/chat_control.py:848
 #, fuzzy
 msgid "and authenticated"
 msgstr "Χρήση πιστοποίησης"
 
-#: gajim/groupchat_control.py:1060 gajim/chat_control.py:828
+#: gajim/groupchat_control.py:1045 gajim/chat_control.py:852
 #, fuzzy
 msgid "and NOT authenticated"
 msgstr "Χρήση πιστοποίησης"
 
-#: gajim/groupchat_control.py:1064
+#: gajim/groupchat_control.py:1049
 #, python-format
 msgid "%(type)s encryption is active %(authenticated)s."
 msgstr ""
 
-#: gajim/groupchat_control.py:1111
+#: gajim/groupchat_control.py:1096
 #, fuzzy
 msgid "Conversation with "
 msgstr "Ιστορικό συζητήσεων"
 
-#: gajim/groupchat_control.py:1113
+#: gajim/groupchat_control.py:1098
 #, fuzzy
 msgid "Continued conversation"
 msgstr "Σύνδεση"
 
-#: gajim/groupchat_control.py:1411
+#: gajim/groupchat_control.py:1357
 #, fuzzy, python-format
 msgid "%(nick)s has set the subject to %(subject)s"
 msgstr "Ο %(nick)s πετάχτηκε έξω: %(reason)s"
 
-#: gajim/groupchat_control.py:1433
-msgid "Room now shows unavailable members"
+#: gajim/groupchat_control.py:1374
+msgid "Group chat now shows unavailable members"
 msgstr ""
 
-#: gajim/groupchat_control.py:1436
-msgid "Room now does not show unavailable members"
-msgstr ""
+#: gajim/groupchat_control.py:1377
+#, fuzzy
+msgid "Group chat now does not show unavailable members"
+msgstr "Δεν υπάρχει τέτοια συζήτηση."
 
-#: gajim/groupchat_control.py:1439
+#: gajim/groupchat_control.py:1380
 msgid "A setting not related to privacy has been changed"
 msgstr ""
 
-#: gajim/groupchat_control.py:1446
-msgid "Room logging is now enabled"
-msgstr ""
+#: gajim/groupchat_control.py:1387 gajim/groupchat_control.py:1659
+#, fuzzy
+msgid "Conversations are stored on the server"
+msgstr "Δεν είστε συνδεδεμένος στο διακομιστή"
 
-#: gajim/groupchat_control.py:1449
-msgid "Room logging is now disabled"
-msgstr ""
+#: gajim/groupchat_control.py:1390
+#, fuzzy
+msgid "Conversations are not stored on the server"
+msgstr "Οι πληροφορίες για εσάς, όπως αποθηκεύονται στο διακομιστή"
 
-#: gajim/groupchat_control.py:1452
-msgid "Room is now non-anonymous"
-msgstr ""
+#: gajim/groupchat_control.py:1393
+#, fuzzy
+msgid "Group chat is now non-anonymous"
+msgstr "Ομαδικές συζητήσεις"
 
-#: gajim/groupchat_control.py:1456
-msgid "Room is now semi-anonymous"
-msgstr ""
+#: gajim/groupchat_control.py:1397
+#, fuzzy
+msgid "Group chat is now semi-anonymous"
+msgstr "Επισήμανση "
 
-#: gajim/groupchat_control.py:1460
-msgid "Room is now fully anonymous"
-msgstr ""
+#: gajim/groupchat_control.py:1401
+#, fuzzy
+msgid "Group chat is now fully anonymous"
+msgstr "Ομαδικές συζητήσεις"
 
-#: gajim/groupchat_control.py:1500
+#: gajim/groupchat_control.py:1439
 #, python-format
 msgid "Ping? (%s)"
 msgstr ""
 
-#: gajim/groupchat_control.py:1503
+#: gajim/groupchat_control.py:1442
 #, python-format
 msgid "Pong! (%(nick)s %(delay)s s.)"
 msgstr ""
 
-#: gajim/groupchat_control.py:1506 gajim/chat_control.py:1213
+#: gajim/groupchat_control.py:1445 gajim/chat_control.py:1237
 #, fuzzy
 msgid "Error."
 msgstr "Σφάλμα:"
 
-#: gajim/groupchat_control.py:1711
+#: gajim/groupchat_control.py:1650
 #, fuzzy, python-format
-msgid "You (%s) joined the room"
+msgid "You (%s) joined the group chat"
 msgstr "Ο/Η %s μπήκε στο δωμάτιο"
 
-#: gajim/groupchat_control.py:1717
-msgid "Any occupant is allowed to see your full JID"
+#: gajim/groupchat_control.py:1655
+msgid "Any participant is allowed to see your full XMPP Address"
 msgstr ""
 
-#: gajim/groupchat_control.py:1721
-msgid "Room logging is enabled"
-msgstr ""
-
-#: gajim/groupchat_control.py:1725
-msgid "The server has assigned or modified your roomnick"
-msgstr ""
+#: gajim/groupchat_control.py:1663
+#, fuzzy
+msgid "The server has assigned or modified your nickname in this group chat"
+msgstr "Αλλαγή _ψευδώνυμου"
 
-#: gajim/groupchat_control.py:1732
+#: gajim/groupchat_control.py:1671
 #, fuzzy
-msgid "A new room has been created"
+msgid "A new group chat has been created"
 msgstr "Ο νέος σας λογαριασμός δημιουργήθηκε με επιτυχία"
 
-#: gajim/groupchat_control.py:1740 gajim/privatechat_control.py:112
+#: gajim/groupchat_control.py:1679 gajim/privatechat_control.py:115
 #, python-format
 msgid "You are now known as %s"
 msgstr "Είστε τώρα γνωστός ως %s"
 
-#: gajim/groupchat_control.py:1742 gajim/privatechat_control.py:114
+#: gajim/groupchat_control.py:1681 gajim/privatechat_control.py:117
 #, fuzzy, python-brace-format
 msgid "{nick} is now known as {new_nick}"
 msgstr "Ο %s είναι τώρα γνωστός ως %s"
 
-#: gajim/groupchat_control.py:1767 gajim/privatechat_control.py:141
+#: gajim/groupchat_control.py:1706 gajim/privatechat_control.py:144
 #, fuzzy, python-brace-format
 msgid "You are now {show}{status}"
 msgstr "Είστε τώρα γνωστός ως %s"
 
-#: gajim/groupchat_control.py:1773 gajim/privatechat_control.py:147
+#: gajim/groupchat_control.py:1712 gajim/privatechat_control.py:150
 #, fuzzy, python-brace-format
 msgid "{nick} is now {show}{status}"
 msgstr "Ο %(nick)s είναι τώρα %(status)s"
 
-#: gajim/groupchat_control.py:1790 gajim/groupchat_control.py:1819
-#: gajim/groupchat_control.py:1849 gajim/groupchat_control.py:1909
+#: gajim/groupchat_control.py:1729 gajim/groupchat_control.py:1758
+#: gajim/groupchat_control.py:1788 gajim/groupchat_control.py:1848
 #, python-brace-format
 msgid " by {actor}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1793
+#: gajim/groupchat_control.py:1732
 #, python-brace-format
 msgid "** Your Affiliation has been set to {affiliation}{actor}{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1799
+#: gajim/groupchat_control.py:1738
 #, python-brace-format
 msgid "** Affiliation of {nick} has been set to {affiliation}{actor}{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1822
+#: gajim/groupchat_control.py:1761
 #, fuzzy, python-brace-format
 msgid "** Your Role has been set to {role}{actor}{reason}"
 msgstr "Ο %(nick)s πετάχτηκε έξω από τον %(who)s: %(reason)s"
 
-#: gajim/groupchat_control.py:1827
+#: gajim/groupchat_control.py:1766
 #, fuzzy, python-brace-format
 msgid "** Role of {nick} has been set to {role}{actor}{reason}"
 msgstr "Ο %(nick)s πετάχτηκε έξω από τον %(who)s: %(reason)s"
 
-#: gajim/groupchat_control.py:1852
+#: gajim/groupchat_control.py:1791
 #, fuzzy, python-brace-format
-msgid "You have been removed from the room{actor}{reason}"
+msgid "You have been removed from the group chat{actor}{reason}"
 msgstr "Ο %(nick)s πετάχτηκε έξω από τον %(who)s: %(reason)s"
 
-#: gajim/groupchat_control.py:1857
+#: gajim/groupchat_control.py:1796
 #, python-brace-format
 msgid "You have left due to an error{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1863
+#: gajim/groupchat_control.py:1802
 #, python-brace-format
 msgid "You have been kicked{actor}{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1870
+#: gajim/groupchat_control.py:1809
 #, python-brace-format
 msgid "You have been banned{actor}{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1877 gajim/groupchat_control.py:1943
+#: gajim/groupchat_control.py:1816 gajim/groupchat_control.py:1882
 #, fuzzy
 msgid ": Affiliation changed"
 msgstr "Συσχέτιση: "
 
-#: gajim/groupchat_control.py:1883 gajim/groupchat_control.py:1948
-msgid ": Room configuration changed to members-only"
+#: gajim/groupchat_control.py:1822 gajim/groupchat_control.py:1887
+msgid ": Group chat configuration changed to members-only"
 msgstr ""
 
-#: gajim/groupchat_control.py:1912
+#: gajim/groupchat_control.py:1851
 #, fuzzy, python-brace-format
-msgid "{nick} has been removed from the room{by}{reason}"
+msgid "{nick} has been removed from the group chat{by}{reason}"
 msgstr "Ο %(nick)s πετάχτηκε έξω από τον %(who)s: %(reason)s"
 
-#: gajim/groupchat_control.py:1922
+#: gajim/groupchat_control.py:1861
 #, python-brace-format
 msgid "{nick} has left due to an error{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1928
+#: gajim/groupchat_control.py:1867
 #, fuzzy, python-brace-format
 msgid "{nick} has been kicked{actor}{reason}"
 msgstr "Ο %(nick)s πετάχτηκε έξω: %(reason)s"
 
-#: gajim/groupchat_control.py:1936
+#: gajim/groupchat_control.py:1875
 #, fuzzy, python-brace-format
 msgid "{nick} has been banned{actor}{reason}"
 msgstr "Ο %(nick)s έχει απαγορευτεί: %(reason)s"
 
-#: gajim/groupchat_control.py:1953
+#: gajim/groupchat_control.py:1892
 #, python-brace-format
 msgid "{nick} has left{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1970
+#: gajim/groupchat_control.py:1914
 #, fuzzy, python-format
 msgid "%s has joined the group chat"
 msgstr "Ο/Η %s μπήκε στο δωμάτιο"
 
-#: gajim/groupchat_control.py:1985 gajim/groupchat_control.py:1990
-#: gajim/groupchat_control.py:1995 gajim/groupchat_control.py:2000
-#: gajim/groupchat_control.py:2011
-msgid "Unable to join group chat"
-msgstr "Δεν ήταν δυνατή η σύνδεση στην ομαδική συζήτηση"
-
-#: gajim/groupchat_control.py:1986
-#, fuzzy, python-format
-msgid "You are banned from group chat <b>%s</b>."
-msgstr "Σας έχει απαγορευτεί η είσοδος σε αυτή την ομαδική συζήτηση."
-
-#: gajim/groupchat_control.py:1991
-#, fuzzy, python-format
-msgid "Remote server <b>%s</b> does not exist."
-msgstr "Δεν υπάρχει τέτοια συζήτηση."
-
-#: gajim/groupchat_control.py:1996
-#, fuzzy, python-format
-msgid "Group chat <b>%s</b> does not exist."
-msgstr "Δεν υπάρχει τέτοια συζήτηση."
-
-#: gajim/groupchat_control.py:2001
-#, fuzzy
-msgid "Group chat creation is not permitted."
-msgstr "Δεν επιτρέπεται η δημιουργία ομαδικών συζητήσεων."
-
-#: gajim/groupchat_control.py:2005
+#: gajim/groupchat_control.py:1981
 #, fuzzy
-msgid "Unable to join groupchat"
-msgstr "Δεν ήταν δυνατή η σύνδεση στην ομαδική συζήτηση"
-
-#: gajim/groupchat_control.py:2006
-#, fuzzy, python-format
-msgid "You must use your registered nickname in <b>%s</b>."
-msgstr "Πρέπει να χρησιμοποιηθεί το καταχωρημένο σας ψευδώνυμο."
-
-#: gajim/groupchat_control.py:2012
-#, fuzzy, python-format
-msgid "You are not in the members list in groupchat %s."
-msgstr "Δεν είστε στη λίστα μελών."
-
-#: gajim/groupchat_control.py:2068
-#, fuzzy
-msgid "Room has been destroyed"
+msgid "Group chat has been destroyed"
 msgstr "Η εξουσιοδότηση έχει αφαιρεθεί"
 
-#: gajim/groupchat_control.py:2073
-#, python-format
-msgid "You can join this room instead: xmpp:%s?join"
-msgstr ""
+#: gajim/groupchat_control.py:1986
+#, fuzzy, python-format
+msgid "You can join this group chat instead: xmpp:%s?join"
+msgstr "Ο/Η %s μπήκε στο δωμάτιο"
 
-#: gajim/groupchat_control.py:2306
+#: gajim/groupchat_control.py:2214
 #, fuzzy
 msgid "Leave Group Chat"
 msgstr "Ομαδικές συζητήσεις"
 
-#: gajim/groupchat_control.py:2307
+#: gajim/groupchat_control.py:2215
 #, fuzzy
 msgid "Are you sure you want to leave this group chat?"
 msgstr "Είστε σίγουροι ότι θέλετε να φύγετε από το δωμάτιο \"%s\";"
 
-#: gajim/groupchat_control.py:2308
+#: gajim/groupchat_control.py:2216
 #, fuzzy, python-format
-msgid "If you close this window, you will be disconnected from '%s'."
+msgid "If you close this window, you will leave '%s'."
 msgstr "Αν κλείσετε αυτό το παράθυρο, θα αποσυνδεθείτε από αυτά το δωμάτια."
 
-#: gajim/groupchat_control.py:2314
+#: gajim/groupchat_control.py:2222 gajim/roster_window.py:5177
 msgid "_Leave"
 msgstr ""
 
-#: gajim/groupchat_control.py:2377
+#: gajim/groupchat_control.py:2280 gajim/roster_window.py:3008
 #, fuzzy, python-format
 msgid "%(jid)s has been invited to this group chat"
 msgstr "Ο %(nick)s πετάχτηκε έξω από τον %(who)s: %(reason)s"
 
-#: gajim/groupchat_control.py:2527
+#: gajim/groupchat_control.py:2463
 #, python-format
 msgid "Kicking %s"
 msgstr "Διώχνοντας τον %s"
 
-#: gajim/groupchat_control.py:2528 gajim/groupchat_control.py:2829
+#: gajim/groupchat_control.py:2464 gajim/groupchat_control.py:2765
 msgid "You may specify a reason below:"
 msgstr "Μπορείτε να προσδιορίσετε ένα λόγο παρακάτω:"
 
-#: gajim/groupchat_control.py:2828
+#: gajim/groupchat_control.py:2764
 #, python-format
 msgid "Banning %s"
 msgstr "Απαγορεύοντας την πρόσβαση στον %s"
 
-#: gajim/chat_control.py:408
+#: gajim/chat_control.py:432
 #, fuzzy
 msgid "Show a list of formattings"
 msgstr "Κάντε κλικ για να εισάγετε φατσούλα (Alt+M)"
 
-#: gajim/chat_control.py:412
+#: gajim/chat_control.py:436
 #, fuzzy
 msgid "This contact does not support HTML"
 msgstr "Λίστα ενεργών, ολοκληρωμένων και σταματημένων μεταφορών αρχείων"
 
-#: gajim/chat_control.py:562
+#: gajim/chat_control.py:586
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr ""
 
-#: gajim/chat_control.py:686
+#: gajim/chat_control.py:710
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr ""
 
-#: gajim/chat_control.py:832
+#: gajim/chat_control.py:856
 #, python-format
 msgid "%(type)s encryption is active %(authenticated)s"
 msgstr ""
 
-#: gajim/chat_control.py:1160 gajim/chat_control.py:1168
+#: gajim/chat_control.py:1184 gajim/chat_control.py:1192
 #, fuzzy
 msgid "Close"
 msgstr "_Αποστολή & κλείσιμο"
 
-#: gajim/chat_control.py:1161
+#: gajim/chat_control.py:1185
 #, fuzzy, python-format
 msgid "You just received a new message from %s"
 msgstr "Mόλις λάβατε ένα μήνυμα από \"%s\""
 
-#: gajim/chat_control.py:1163
+#: gajim/chat_control.py:1187
 #, fuzzy
 msgid ""
 "If you close this tab while having chat history disabled, this message will "
@@ -1214,16 +1178,16 @@ msgstr ""
 "Εάν κλείσετε αυτήν την καρτέλα και έχετε απενεργοποιημένο το ιστορικό, το "
 "μήνυμα θα χαθεί."
 
-#: gajim/chat_control.py:1208
+#: gajim/chat_control.py:1232
 msgid "Ping?"
 msgstr ""
 
-#: gajim/chat_control.py:1211
+#: gajim/chat_control.py:1235
 #, python-format
 msgid "Pong! (%s seconds)"
 msgstr ""
 
-#: gajim/chat_control.py:1308
+#: gajim/chat_control.py:1332
 #, fuzzy, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -1232,279 +1196,286 @@ msgstr ""
 "Θέμα: %s\n"
 "%s"
 
-#: gajim/chat_control.py:1416
+#: gajim/chat_control.py:1440
 #, fuzzy, python-format
 msgid "%(name)s is now %(show)s %(status)s"
 msgstr "Ο %(nick)s είναι τώρα %(status)s"
 
-#: gajim/chat_control.py:1476 gajim/data/gui/application_menu.ui:32
+#: gajim/chat_control.py:1500 gajim/data/gui/application_menu.ui:32
 #: gajim/gtk/http_upload_progress.py:35
 #, fuzzy
 msgid "File Transfer"
 msgstr "Μεταφορές αρχείων"
 
-#: gajim/chat_control.py:1480
+#: gajim/chat_control.py:1504
 #, fuzzy
 msgid "Size"
 msgstr "Mέγεθος: "
 
-#: gajim/chat_control.py:1482 gajim/chat_control.py:1546
+#: gajim/chat_control.py:1506 gajim/chat_control.py:1566
+#: gajim/gui_interface.py:190
 #: gajim/data/gui/groupchat_invitation_received.ui:77
-#: gajim/gtk/filetransfer.py:485
+#: gajim/gtk/filetransfer.py:490
 #, fuzzy
 msgid "_Accept"
 msgstr "Αποδοχή"
 
-#: gajim/chat_control.py:1484 gajim/chat_control.py:1548
+#: gajim/chat_control.py:1508 gajim/chat_control.py:1568
 #: gajim/data/gui/groupchat_invitation_received.ui:62
 #, fuzzy
 msgid "_Decline"
 msgstr "Απ_οσυνδεδεμένος"
 
-#: gajim/chat_control.py:1506 gajim/gui_interface.py:791
-#: gajim/gui_interface.py:821 gajim/gui_interface.py:847
+#: gajim/chat_control.py:1530 gajim/gui_interface.py:777
+#: gajim/gui_interface.py:807 gajim/gui_interface.py:833
 #: gajim/gtk/notification.py:173 gajim/gtk/notification.py:278
 msgid "File Transfer Completed"
 msgstr "Η μεταφορά αρχείου ολοκληρώθηκε"
 
-#: gajim/chat_control.py:1510 gajim/gtk/filetransfer.py:259
+#: gajim/chat_control.py:1534 gajim/gtk/filetransfer.py:258
 #, fuzzy
 msgid "Open _Folder"
 msgstr "_Άνοιγμα του περιέχοντος φακέλου"
 
-#: gajim/chat_control.py:1512 gajim/chat_control.py:1521
+#: gajim/chat_control.py:1536 gajim/chat_control.py:1545
+#: gajim/data/gui/groupchat_control.ui:962
+#: gajim/data/gui/groupchat_control.ui:1049
+#: gajim/data/gui/groupchat_control.ui:1155
 #, fuzzy
 msgid "_Close"
 msgstr "_Αποστολή & κλείσιμο"
 
-#: gajim/chat_control.py:1543 gajim/gui_interface.py:484
+#: gajim/chat_control.py:1563 gajim/gui_interface.py:473
+#: gajim/data/gui/groupchat_invitation_received.ui:42
 #: gajim/gtk/notification.py:174 gajim/gtk/notification.py:195
 #: gajim/gtk/notification.py:281
-msgid "Groupchat Invitation"
+#, fuzzy
+msgid "Group Chat Invitation"
 msgstr "Πρόσκληση ομαδικής κουβέντας"
 
-#: gajim/chat_control.py:1568 gajim/roster_window.py:1954
+#: gajim/chat_control.py:1588 gajim/roster_window.py:1951
 #, fuzzy
 msgid "Remote contact stopped transfer"
 msgstr "Αφαιρεί μια επαφή από τη λίστα επαφών"
 
-#: gajim/chat_control.py:1570 gajim/roster_window.py:1956
+#: gajim/chat_control.py:1590 gajim/roster_window.py:1953
 #, fuzzy
 msgid "Error opening file"
 msgstr "Σφάλμα κατά την ανάγνωση του αρχείου:"
 
-#: gajim/chat_control.py:1572 gajim/gtk/filetransfer.py:297
+#: gajim/chat_control.py:1592 gajim/gtk/filetransfer.py:296
 #, fuzzy
 msgid "File transfer stopped"
 msgstr "Η μεταφορά αρχείου διακόπηκε"
 
-#: gajim/chat_control.py:1575 gajim/gtk/filetransfer.py:275
-#: gajim/gtk/filetransfer.py:284
+#: gajim/chat_control.py:1595 gajim/gtk/filetransfer.py:274
+#: gajim/gtk/filetransfer.py:283
 #, fuzzy
 msgid "File transfer cancelled"
 msgstr "Άνοιγμα αρχείου μενού"
 
-#: gajim/chat_control.py:1576
+#: gajim/chat_control.py:1596
 msgid "Connection with peer cannot be established."
 msgstr "Η σύνδεση με τον απομακρυσμένο ομότιμο δεν ήταν εφικτή."
 
-#: gajim/application.py:72
+#: gajim/application.py:75
 #, fuzzy
 msgid "Show the application's version"
 msgstr "_Εικονίδιο στην περιοχή γνωστοποίησης"
 
-#: gajim/application.py:79
+#: gajim/application.py:82
 #, fuzzy
 msgid "Show only critical errors"
 msgstr "Εμφά_νιση το μόνο στο κύριο παράθυρο"
 
-#: gajim/application.py:86
+#: gajim/application.py:89
 msgid "Separate profile files completely (even history database and plugins)"
 msgstr ""
 
-#: gajim/application.py:94
+#: gajim/application.py:97
 msgid "Print XML stanzas and other debug information"
 msgstr ""
 
-#: gajim/application.py:101
+#: gajim/application.py:104
 #, fuzzy
 msgid "Use defined profile in configuration directory"
 msgstr "Επεξεργασία ρυθμίσεων για προχωρημένους"
 
-#: gajim/application.py:109
+#: gajim/application.py:112
 #, fuzzy
 msgid "Set configuration directory"
 msgstr "Ρυθμίσεις δωματίου"
 
-#: gajim/application.py:117
+#: gajim/application.py:120
 msgid "Configure logging system"
 msgstr ""
 
-#: gajim/application.py:125
+#: gajim/application.py:128
 #, fuzzy
 msgid "Show all warnings"
 msgstr "Εμφάνιση όλων των γεγονότων που εκκρεμούν"
 
-#: gajim/application.py:132
+#: gajim/application.py:135
 msgid "Open IPython shell"
 msgstr ""
 
-#: gajim/application.py:139
+#: gajim/application.py:142
 #, fuzzy
 msgid "Pops up a window with the next pending event"
 msgstr "Εμφάνιση ενός παραθύρου με το επόμενο αδιάβαστο μήνυμα"
 
-#: gajim/application.py:145 gajim/data/gui/shortcuts_window.ui:203
+#: gajim/application.py:148 gajim/data/gui/shortcuts_window.ui:203
 #: data/org.gajim.Gajim.desktop.in:21
 #, fuzzy
 msgid "Start a new chat"
 msgstr "Έναρξη κουβέντας"
 
-#: gajim/application.py:152
+#: gajim/application.py:155
 msgid "Simulate loss of connectivity"
 msgstr ""
 
-#: gajim/application.py:159
+#: gajim/application.py:162
 msgid "Simulate regaining connectivity"
 msgstr ""
 
-#: gajim/application.py:201 gajim/gui_interface.py:133
+#: gajim/application.py:204 gajim/gui_interface.py:133
 msgid "Database Error"
 msgstr ""
 
-#: gajim/roster_window.py:294 gajim/roster_window.py:1030
+#: gajim/roster_window.py:291 gajim/roster_window.py:1027
 msgid "Merged accounts"
 msgstr "Συνενωμένοι λογαριασμοί"
 
-#: gajim/roster_window.py:853 gajim/roster_window.py:1631
-#: gajim/roster_window.py:1664 gajim/roster_window.py:1715
-#: gajim/roster_window.py:1717 gajim/roster_window.py:1872
-#: gajim/roster_window.py:2531 gajim/roster_window.py:5025
-#: gajim/common/contacts.py:188 gajim/common/contacts.py:447
-#: gajim/common/helpers.py:83 gajim/gtk/discovery.py:129
-#: gajim/gtk/discovery.py:130 gajim/gtk/discovery.py:1416
+#: gajim/roster_window.py:850 gajim/roster_window.py:1628
+#: gajim/roster_window.py:1661 gajim/roster_window.py:1712
+#: gajim/roster_window.py:1714 gajim/roster_window.py:1869
+#: gajim/roster_window.py:2528 gajim/roster_window.py:4331
+#: gajim/roster_window.py:4964 gajim/common/contacts.py:204
+#: gajim/common/contacts.py:463 gajim/common/helpers.py:86
+#: gajim/gtk/discovery.py:127 gajim/gtk/discovery.py:128
+#: gajim/gtk/discovery.py:1414
 msgid "Transports"
 msgstr "Μεταφορές"
 
-#: gajim/roster_window.py:1723 gajim/roster_window.py:1725
-#: gajim/roster_window.py:4995 gajim/gui_interface.py:1613
-#: gajim/gui_interface.py:1639 gajim/common/contacts.py:186
-#: gajim/common/helpers.py:83 gajim/common/modules/adhoc_commands.py:245
+#: gajim/roster_window.py:1720 gajim/roster_window.py:1722
+#: gajim/roster_window.py:4331 gajim/roster_window.py:4934
+#: gajim/gui_interface.py:1527 gajim/common/contacts.py:202
+#: gajim/common/helpers.py:86 gajim/common/modules/adhoc_commands.py:245
 #, fuzzy
-msgid "Groupchats"
+msgid "Group chats"
 msgstr "Ομαδικές συζητήσεις"
 
-#: gajim/roster_window.py:2012
+#: gajim/roster_window.py:2009
 #, fuzzy
 msgid "Authorization sent"
 msgstr "Η εξουσιοδότηση έχει σταλεί"
 
-#: gajim/roster_window.py:2013
+#: gajim/roster_window.py:2010
 #, fuzzy, python-format
 msgid "\"%s\" will now see your status."
 msgstr "Τώρα ο/η \"%s\" θα γνωρίζει την κατάσταση σας."
 
-#: gajim/roster_window.py:2031
+#: gajim/roster_window.py:2028
 msgid "Subscription request has been sent"
 msgstr "Η αίτηση εγγραφής έχει σταλεί"
 
-#: gajim/roster_window.py:2032
-#, python-format
-msgid "If \"%s\" accepts this request you will know his or her status."
+#: gajim/roster_window.py:2029
+#, fuzzy, python-format
+msgid "If \"%s\" accepts this request you will know their status."
 msgstr ""
 "Εάν ο/η \"%s\" αποδεχθεί αυτή την αίτηση, θα γνωρίζετε την κατάσταση του/της."
 
-#: gajim/roster_window.py:2046
+#: gajim/roster_window.py:2043
 #, fuzzy
 msgid "Authorization removed"
 msgstr "Η εξουσιοδότηση έχει αφαιρεθεί"
 
-#: gajim/roster_window.py:2047
+#: gajim/roster_window.py:2044
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Τώρα ο/η \"%s\" θα σας βλέπει πάντα ως αποσυνδεδεμένο/η."
 
-#: gajim/roster_window.py:2250 gajim/roster_window.py:3504
+#: gajim/roster_window.py:2247 gajim/roster_window.py:3460
 msgid "Disconnect for Invisibility"
 msgstr ""
 
-#: gajim/roster_window.py:2251 gajim/roster_window.py:3505
+#: gajim/roster_window.py:2248 gajim/roster_window.py:3461
 msgid "You are participating in one or more group chats"
 msgstr "Συμμετέχετε σε μία ή περισσότερες ομαδικές κουβέντες"
 
-#: gajim/roster_window.py:2252 gajim/roster_window.py:3506
+#: gajim/roster_window.py:2249 gajim/roster_window.py:3462
 #, fuzzy
 msgid ""
-"Changing your status to invisible will result in disconnection from those "
-"group chats.\n"
+"Changing your status to invisible will result in you leaving those group "
+"chats.\n"
 "Are you sure you want to go invisible?"
 msgstr ""
 "Εάν αλλάξετε την κατάστασή σας σε αόρατη, θα αποσυνδεθείτε από αυτές τις "
 "ομαδικές συζητήσεις. Είστε σίγουρος/η ότι θέλετε να γίνεται αόρατος/η;"
 
-#: gajim/roster_window.py:2257 gajim/roster_window.py:3512
-#: gajim/roster_window.py:5238 gajim/data/gui/gc_control_popup_menu.ui:120
+#: gajim/roster_window.py:2254 gajim/roster_window.py:3468
+#: gajim/data/gui/gc_control_popup_menu.ui:120
 #, fuzzy
 msgid "_Disconnect"
 msgstr "Αποσύνδεση επαφής"
 
-#: gajim/roster_window.py:2285
+#: gajim/roster_window.py:2282
 #, fuzzy
 msgid "desynced"
 msgstr "Προχωρημένοι"
 
-#: gajim/roster_window.py:2353 gajim/data/gui/shortcuts_window.ui:224
+#: gajim/roster_window.py:2350 gajim/data/gui/shortcuts_window.ui:224
 #, fuzzy
 msgid "Quit Gajim"
 msgstr "Gajim"
 
-#: gajim/roster_window.py:2354
+#: gajim/roster_window.py:2351
 #, fuzzy
 msgid "You are about to quit Gajim"
 msgstr "Είστε σίγουροι ότι θέλετε να φύγετε από τα δωμάτια \"%s\";"
 
-#: gajim/roster_window.py:2355
+#: gajim/roster_window.py:2352
 #, fuzzy
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Είστε σίγουροι ότι θέλετε να φύγετε από τα δωμάτια \"%s\";"
 
-#: gajim/roster_window.py:2356
+#: gajim/roster_window.py:2353
 msgid "_Always quit when closing Gajim"
 msgstr ""
 
-#: gajim/roster_window.py:2359 gajim/roster_window.py:2455
-#: gajim/roster_window.py:2495 gajim/data/gui/systray_context_menu.ui:90
+#: gajim/roster_window.py:2356 gajim/roster_window.py:2452
+#: gajim/roster_window.py:2492 gajim/data/gui/systray_context_menu.ui:83
 #, fuzzy
 msgid "_Quit"
 msgstr "_Έξοδος"
 
-#: gajim/roster_window.py:2448
+#: gajim/roster_window.py:2445
 #, fuzzy
 msgid "Stop File Transfers"
 msgstr "Μεταφορές αρχείων"
 
-#: gajim/roster_window.py:2449
+#: gajim/roster_window.py:2446
 #, fuzzy
 msgid "You still have running file transfers"
 msgstr "Ακύρωση μεταφοράς αρχείου"
 
-#: gajim/roster_window.py:2450
+#: gajim/roster_window.py:2447
 msgid ""
 "If you quit now, the file(s) being transferred will be lost.\n"
 "Do you still want to quit?"
 msgstr ""
 
-#: gajim/roster_window.py:2488
+#: gajim/roster_window.py:2485
 #, fuzzy
 msgid "Unread Messages"
 msgstr "Αδιάβαστα γεγονότα"
 
-#: gajim/roster_window.py:2489
+#: gajim/roster_window.py:2486
 #, fuzzy
 msgid "You still have unread messages"
 msgstr "Έχετε μη-αναγνωσμένα μηνύματα"
 
-#: gajim/roster_window.py:2490
+#: gajim/roster_window.py:2487
 #, fuzzy
 msgid ""
 "Messages will only be available for reading them later if storing chat "
@@ -1513,23 +1484,23 @@ msgstr ""
 "Τα μηνύματα θα είναι διαθέσιμα για ανάγνωση αργότερα μόνο αν έχετε "
 "ενεργοποιημένο το ιστορικό."
 
-#: gajim/roster_window.py:2760
+#: gajim/roster_window.py:2753
 msgid "You have unread messages"
 msgstr "Έχετε μη-αναγνωσμένα μηνύματα"
 
-#: gajim/roster_window.py:2761
+#: gajim/roster_window.py:2754
 #, fuzzy
 msgid "You must read them before removing this transport."
 msgstr ""
 "Ανάγνωση όλων των γεγονότων που εκκρεμούν, πριν την αφαίρεση αυτού του "
 "λογαριασμού."
 
-#: gajim/roster_window.py:2764
+#: gajim/roster_window.py:2757
 #, fuzzy, python-format
 msgid "Transport '%s' will be removed"
 msgstr "Η μεταφορά \"%s\" θα αφαιρεθεί"
 
-#: gajim/roster_window.py:2765
+#: gajim/roster_window.py:2758
 #, fuzzy
 msgid ""
 "You will no longer be able to send and receive messages from and to contacts "
@@ -1538,12 +1509,12 @@ msgstr ""
 "Δε θα μπορείτε να στείλετε και να λάβετε μηνύματα στις επαφές από αυτή τη "
 "μεταφορά."
 
-#: gajim/roster_window.py:2768
+#: gajim/roster_window.py:2761
 #, fuzzy
 msgid "Transports will be removed"
 msgstr "Αυτό το ραντεβού θα απομακρυνθεί οριστικά."
 
-#: gajim/roster_window.py:2773
+#: gajim/roster_window.py:2766
 #, fuzzy, python-format
 msgid ""
 "You will no longer be able to send and receive messages from and to contacts "
@@ -1553,87 +1524,82 @@ msgstr ""
 "Δε θα μπορείτε να στείλετε και να λάβετε μηνύματα στις επαφές από αυτή τη "
 "μεταφορά."
 
-#: gajim/roster_window.py:2777
+#: gajim/roster_window.py:2770
 #, fuzzy
 msgid "Remove Transport"
 msgstr "Προβολή ιδιοτήτων εκτυπωτή"
 
-#: gajim/roster_window.py:2844
+#: gajim/roster_window.py:2837
 #, fuzzy
 msgid "Block Contact"
 msgstr "Επαφές"
 
-#: gajim/roster_window.py:2845
+#: gajim/roster_window.py:2838
 #, fuzzy
 msgid "Really block this contact?"
 msgstr "Το OpenPGP δεν είναι διαθέσιμο σε αυτόν τον Η/Υ"
 
-#: gajim/roster_window.py:2846
+#: gajim/roster_window.py:2839
 msgid ""
 "This contact will see you offline and you will not receive any messages sent "
 "to you by this contact."
 msgstr ""
 
-#: gajim/roster_window.py:2851
+#: gajim/roster_window.py:2844
 #, fuzzy
 msgid "_Block Contact"
 msgstr "Επαφές"
 
-#: gajim/roster_window.py:2896
+#: gajim/roster_window.py:2889
 #, fuzzy
 msgid "Rename Contact"
 msgstr "_Μετονομασία αρχείων"
 
-#: gajim/roster_window.py:2897
+#: gajim/roster_window.py:2890
 #, fuzzy, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Πληκτρολογήστε τη φράση πρόσβασης GPG για το λογαριασμό %s"
 
-#: gajim/roster_window.py:2904
+#: gajim/roster_window.py:2897
 #, fuzzy
 msgid "Rename Group"
 msgstr "Ιδιοκτήτης / Ομάδα"
 
-#: gajim/roster_window.py:2905
+#: gajim/roster_window.py:2898
 #, fuzzy, python-format
 msgid "Enter a new name for group %s"
 msgstr "Επιλέξτε ένα όνομα για τη νέα συνεδρία:"
 
-#: gajim/roster_window.py:2953 gajim/roster_window.py:2954
+#: gajim/roster_window.py:2946 gajim/roster_window.py:2947
 msgid "Remove Group"
 msgstr "Διαγραφή ομάδας"
 
-#: gajim/roster_window.py:2955
+#: gajim/roster_window.py:2948
 #, fuzzy, python-format
 msgid "Do you want to remove %s from the contact list?"
 msgstr "_Επιλέξτε εάν επιθυμείτε να καταχωρήσετε νέο jabber λογαριασμό"
 
-#: gajim/roster_window.py:2956
+#: gajim/roster_window.py:2949
 #, fuzzy
 msgid "_Also remove all contacts of this group from contact list"
 msgstr "Αφαιρεί μια επαφή από τη λίστα επαφών"
 
-#: gajim/roster_window.py:3044
-#, fuzzy, python-format
-msgid "%(jid)s has been invited in this room"
-msgstr "Ο %(nick)s πετάχτηκε έξω από τον %(who)s: %(reason)s"
-
-#: gajim/roster_window.py:3353
+#: gajim/roster_window.py:3309
 #, fuzzy
 msgid "Remove Contact"
 msgstr "_Μετονομασία αρχείων"
 
-#: gajim/roster_window.py:3354
+#: gajim/roster_window.py:3310
 #, fuzzy
 msgid "Remove contact from contact list"
 msgstr "Αφαιρεί μια επαφή από τη λίστα επαφών"
 
-#: gajim/roster_window.py:3355
+#: gajim/roster_window.py:3311
 #, python-format
 msgid "You are about to remove '%(name)s' (%(jid)s) from your contact list.\n"
 msgstr ""
 
-#: gajim/roster_window.py:3364 gajim/roster_window.py:3384
+#: gajim/roster_window.py:3320 gajim/roster_window.py:3340
 #, fuzzy
 msgid ""
 "By removing this contact you also remove authorization. This means the "
@@ -1642,22 +1608,22 @@ msgstr ""
 "Αφαιρώντας αυτή την επαφή αφαιρείται επίσης και την εξουσιοδότηση, με "
 "συνέπεια να σας βλέπει πάντα αποσυνδεδεμένο/η."
 
-#: gajim/roster_window.py:3375
+#: gajim/roster_window.py:3331
 #, fuzzy
 msgid "Do you want to continue?"
 msgstr "Τι θέλετε να κάνετε;"
 
-#: gajim/roster_window.py:3386
+#: gajim/roster_window.py:3342
 #, fuzzy
 msgid "_I want this contact to know my status after removal"
 msgstr "Επιθυμώ αυτή η επαφή να γνωρίζει την κατάστασή μου μετά την αφαίρεση"
 
-#: gajim/roster_window.py:3393
+#: gajim/roster_window.py:3349
 #, fuzzy
 msgid "Remove contacts from contact list"
 msgstr "Αφαιρεί μια επαφή από τη λίστα επαφών"
 
-#: gajim/roster_window.py:3399
+#: gajim/roster_window.py:3355
 #, fuzzy, python-format
 msgid ""
 "By removing the following contacts, you will also remove authorization. This "
@@ -1668,168 +1634,158 @@ msgstr ""
 "Αφαιρώντας αυτή την επαφή αφαιρείται επίσης και την εξουσιοδότηση, με "
 "συνέπεια να σας βλέπει πάντα αποσυνδεδεμένο/η."
 
-#: gajim/roster_window.py:3403
+#: gajim/roster_window.py:3359
 #, fuzzy
 msgid "Remove Contacts"
 msgstr "_Μετονομασία αρχείων"
 
-#: gajim/roster_window.py:3423
+#: gajim/roster_window.py:3379
 msgid "No account available"
 msgstr "Κανένας λογαριασμός δεν είναι διαθέσιμος"
 
-#: gajim/roster_window.py:3424
+#: gajim/roster_window.py:3380
 msgid "You must create an account before you can chat with other contacts."
 msgstr ""
 "Πρέπει να δημιουργήσετε ένα λογαριασμό για να μπορέσετε να συνομιλείτε με "
 "άλλες επαφές."
 
-#: gajim/roster_window.py:4060
+#: gajim/roster_window.py:4011
 msgid "Metacontacts storage not supported by your server"
 msgstr ""
 
-#: gajim/roster_window.py:4062
+#: gajim/roster_window.py:4013
 msgid ""
 "Your server does not support storing metacontacts information. So this "
 "information will not be saved on next reconnection."
 msgstr ""
 
-#: gajim/roster_window.py:4159
+#: gajim/roster_window.py:4110
 #, fuzzy
 msgid "You are about to create a metacontact"
 msgstr ""
 "Πρέπει να δημιουργήσετε ένα λογαριασμό για να μπορέσετε να συνομιλείτε με "
 "άλλες επαφές."
 
-#: gajim/roster_window.py:4160
+#: gajim/roster_window.py:4111
 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:4164
+#: gajim/roster_window.py:4115
 #, fuzzy
 msgid "Create Metacontact"
 msgstr "_Μετονομασία αρχείων"
 
-#: gajim/roster_window.py:4170
+#: gajim/roster_window.py:4121 gajim/data/gui/groupchat_creation.ui:317
 #, fuzzy
 msgid "_Create"
 msgstr "Ανενεργό"
 
-#: gajim/roster_window.py:4287
+#: gajim/roster_window.py:4238
 #, fuzzy
 msgid "Invalid file URI:"
 msgstr "Μη έγκυρο αρχείο"
 
-#: gajim/roster_window.py:4298
+#: gajim/roster_window.py:4249
 #, fuzzy
 msgid "Send file?"
 msgstr "Αποστολή _αρχείου"
 
-#: gajim/roster_window.py:4299
+#: gajim/roster_window.py:4250
 #, fuzzy, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
 msgstr[0] "O %s επιθυμεί να σας στείλει ένα αρχείο:"
 msgstr[1] "O %s επιθυμεί να σας στείλει ένα αρχείο:"
 
-#: gajim/roster_window.py:4451
+#: gajim/roster_window.py:4401
 #, fuzzy, python-format
 msgid "Send %(from)s to %(to)s"
 msgstr "Αποστολή %s"
 
-#: gajim/roster_window.py:4464
+#: gajim/roster_window.py:4414
 #, fuzzy, python-format
 msgid "Make %s first contact"
 msgstr "Μετατροπή των %s και %s σε μεταεπαφές"
 
-#: gajim/roster_window.py:4469
+#: gajim/roster_window.py:4419
 #, fuzzy, python-format
 msgid "Make %(contact1)s and %(contact2)s metacontacts"
 msgstr "Μετατροπή των %s και %s σε μεταεπαφές"
 
-#: gajim/roster_window.py:4825 gajim/roster_window.py:4923
+#: gajim/roster_window.py:4775 gajim/roster_window.py:4862
 msgid "_Change Status Message"
 msgstr "Α_λλαγή μηνύματος κατάστασης"
 
-#: gajim/roster_window.py:4845
+#: gajim/roster_window.py:4795
 msgid "Publish Tune"
 msgstr ""
 
-#: gajim/roster_window.py:4856
+#: gajim/roster_window.py:4806
 msgid "Publish Location"
 msgstr ""
 
-#: gajim/roster_window.py:4868
-#, fuzzy
-msgid "Configure Services…"
-msgstr "Εύρεση _υπηρεσιών..."
-
-#: gajim/roster_window.py:4997
+#: gajim/roster_window.py:4936
 msgid "_Maximize All"
 msgstr ""
 
-#: gajim/roster_window.py:5004 gajim/roster_window.py:5146
+#: gajim/roster_window.py:4943 gajim/roster_window.py:5085
 #, fuzzy
 msgid "Send Group M_essage"
 msgstr "Αρχηγός ομάδας παραθύρων"
 
-#: gajim/roster_window.py:5011
+#: gajim/roster_window.py:4950
 msgid "To all users"
 msgstr "Σε όλους τους χρήστες"
 
-#: gajim/roster_window.py:5015
+#: gajim/roster_window.py:4954
 msgid "To all online users"
 msgstr "Σε όλους τους συνδεδεμένους χρήστες"
 
-#: gajim/roster_window.py:5027 gajim/roster_window.py:5152
+#: gajim/roster_window.py:4966 gajim/roster_window.py:5091
 #: gajim/data/gui/gc_occupants_menu.ui:110
 #: gajim/data/gui/contact_context_menu.ui:36
 #, fuzzy
 msgid "In_vite to"
 msgstr "Αδυναμία φόρτωσης"
 
-#: gajim/roster_window.py:5162
+#: gajim/roster_window.py:5101
 #, fuzzy
 msgid "_Manage Contacts"
 msgstr "_Μετονομασία αρχείων"
 
-#: gajim/roster_window.py:5168
+#: gajim/roster_window.py:5107
 #, fuzzy
 msgid "Edit _Groups…"
 msgstr "Επεξεργασία _ομάδων"
 
-#: gajim/roster_window.py:5189 gajim/data/gui/filetransfers.ui:12
+#: gajim/roster_window.py:5128 gajim/data/gui/filetransfers.ui:12
 #: gajim/data/gui/remove_account_window.ui:134
 msgid "_Remove"
 msgstr "_Αφαίρεση"
 
-#: gajim/roster_window.py:5226
+#: gajim/roster_window.py:5165
 msgid "_Maximize"
 msgstr ""
 
-#: gajim/roster_window.py:5233
+#: gajim/roster_window.py:5172
 #, fuzzy
 msgid "_Reconnect"
 msgstr "Αποσύνδεση επαφής"
 
-#: gajim/roster_window.py:5254 gajim/data/gui/gc_occupants_menu.ui:170
+#: gajim/roster_window.py:5193 gajim/data/gui/gc_occupants_menu.ui:170
 #: gajim/data/gui/gc_control_popup_menu.ui:113
 #: gajim/data/gui/contact_context_menu.ui:205
 msgid "_History"
 msgstr "_Ιστορικό"
 
-#: gajim/roster_window.py:5335 gajim/data/gui/application_menu.ui:86
+#: gajim/roster_window.py:5274 gajim/data/gui/application_menu.ui:83
 #: gajim/data/gui/history_window.ui:57
 msgid "History Manager"
 msgstr "Διαχειριστής ιστορικού"
 
-#: gajim/roster_window.py:5343
-#, fuzzy
-msgid "_Join New Group Chat"
-msgstr "_Είσοδος σε Ομαδική Συζήτηση"
-
 #: gajim/dataforms_widget.py:585
 #, fuzzy
 msgid "Unable to load image"
@@ -1954,278 +1910,295 @@ msgstr "Θέμα: %s\n"
 msgid "Write a message…"
 msgstr "Νέο προσωπικό μήνυμα"
 
-#: gajim/message_window.py:250
+#: gajim/message_window.py:356
+#, fuzzy
+msgid "Close Tabs"
+msgstr "_Αποστολή & κλείσιμο"
+
+#: gajim/message_window.py:357
 #, fuzzy
 msgid "You are going to close several tabs"
 msgstr "Δεν είστε συνδεδεμένος στο διακομιστή"
 
-#: gajim/message_window.py:251
+#: gajim/message_window.py:358
 #, fuzzy
 msgid "Do you really want to close them all?"
 msgstr "Θέλετε σίγουρα να διαγράψετε το επιλεγμένο μήνυμα;"
 
-#: gajim/message_window.py:539
+#: gajim/message_window.py:514
 #, fuzzy
 msgid "?Noun:Chats"
 msgstr "Ομαδικές συζητήσεις"
 
-#: gajim/message_window.py:543
+#: gajim/message_window.py:518
 #, fuzzy
 msgid "Group Chats"
 msgstr "_Ομαδική συζήτηση"
 
-#: gajim/message_window.py:547
+#: gajim/message_window.py:522
 msgid "Private Chats"
 msgstr "Προσωπικές συζητήσεις"
 
-#: gajim/message_window.py:553
+#: gajim/message_window.py:528
 msgid "Messages"
 msgstr "Μηνύματα"
 
-#: gajim/gui_interface.py:173
+#: gajim/gui_interface.py:170
+#, fuzzy, python-format
+msgid "HTTP (%(method)s) Authorization for %(url)s (ID: %(id)s)"
+msgstr "HTTP (%s) Εξουσιοδότηση για %s (id: %s)"
+
+#: gajim/gui_interface.py:175
 msgid "Do you accept this request?"
 msgstr "Δέχεστε αυτό το αίτημα;"
 
-#: gajim/gui_interface.py:175
+#: gajim/gui_interface.py:177
 #, fuzzy, python-format
-msgid "Do you accept this request on account %s?"
+msgid "Do you accept this request (account: %s)?"
 msgstr "Δέχεστε αυτό το αίτημα;"
 
-#: gajim/gui_interface.py:178
-#, fuzzy, python-format
-msgid "HTTP (%(method)s) Authorization for %(url)s (ID: %(id)s)"
-msgstr "HTTP (%s) Εξουσιοδότηση για %s (id: %s)"
+#: gajim/gui_interface.py:182
+#, fuzzy
+msgid "Authorization"
+msgstr "Η εξουσιοδότηση έχει σταλεί"
+
+#: gajim/gui_interface.py:186 gajim/gui_interface.py:420
+#: gajim/gtk/filetransfer.py:338
+#, fuzzy
+msgid "_No"
+msgstr "Κανένα"
 
-#: gajim/gui_interface.py:194 gajim/gtk/notification.py:175
+#: gajim/gui_interface.py:205 gajim/gtk/notification.py:175
 #: gajim/gtk/notification.py:197
 msgid "Connection Failed"
 msgstr "Η σύνδεση απέτυχε"
 
-#: gajim/gui_interface.py:279 gajim/gui_interface.py:529
-msgid "Password Required"
-msgstr "Απαιτείται κωδικός"
-
-#: gajim/gui_interface.py:280
-#, fuzzy, python-format
-msgid "A Password is required to join the room %s. Please type it."
-msgstr "Απαιτείται συνθηματικό για τη είσοδο σας σε αυτή την ομαδική συζήτηση."
-
-#: gajim/gui_interface.py:342 gajim/gui_interface.py:346
+#: gajim/gui_interface.py:325 gajim/gui_interface.py:329
 #, fuzzy, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr "%(nickname)s: %(message)s"
 
-#: gajim/gui_interface.py:357 gajim/gui_interface.py:376
+#: gajim/gui_interface.py:340 gajim/gui_interface.py:359
 #: gajim/common/modules/message.py:122
 #, fuzzy, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "σφάλμα κατά την αποστολή του %s ( %s )"
 
-#: gajim/gui_interface.py:401 gajim/gtk/notification.py:175
+#: gajim/gui_interface.py:384 gajim/gtk/notification.py:175
 #, fuzzy
 msgid "Subscription request"
 msgstr "Αίτηση εγγραφής"
 
-#: gajim/gui_interface.py:413 gajim/common/contacts.py:184
-#: gajim/common/helpers.py:83
+#: gajim/gui_interface.py:396 gajim/common/contacts.py:200
+#: gajim/common/helpers.py:86
 msgid "Observers"
 msgstr "Παρατηρητές"
 
-#: gajim/gui_interface.py:422
+#: gajim/gui_interface.py:405
 msgid "Authorization accepted"
 msgstr "Λήψη εξουσιοδότησης"
 
-#: gajim/gui_interface.py:423
+#: gajim/gui_interface.py:406
 #, fuzzy, python-format
 msgid "The contact \"%s\" has authorized you to see their status."
 msgstr "Η επαφή \"%s\" σας εξουσιοδότησε να βλέπετε την κατάστασή της."
 
-#: gajim/gui_interface.py:431
-#, python-format
-msgid "Contact \"%s\" removed subscription from you"
+#: gajim/gui_interface.py:415
+#, fuzzy
+msgid "Subscription Removed"
+msgstr "Αίτηση εγγραφής"
+
+#: gajim/gui_interface.py:416
+#, fuzzy, python-format
+msgid "Contact '%s' removed subscription from you"
 msgstr "Η επαφή \"%s\" αφαίρεσαι την εγγραφή από εσάς"
 
-#: gajim/gui_interface.py:432
+#: gajim/gui_interface.py:417
 msgid ""
-"You will always see them as offline.\n"
+"You will always see this contact as offline.\n"
 "Do you want to remove them from your contact list?"
 msgstr ""
 
-#: gajim/gui_interface.py:453 gajim/gtk/notification.py:176
+#: gajim/gui_interface.py:442 gajim/gtk/notification.py:176
 #, fuzzy
 msgid "Unsubscribed"
 msgstr "_Εγγραφή"
 
-#: gajim/gui_interface.py:465
+#: gajim/gui_interface.py:454
 #, python-format
 msgid "%(jid)s declined the invitation: %(reason)s"
 msgstr ""
 
-#: gajim/gui_interface.py:469
+#: gajim/gui_interface.py:458
 #, python-format
 msgid "%(jid)s declined the invitation"
 msgstr ""
 
-#: gajim/gui_interface.py:485
+#: gajim/gui_interface.py:474
 #, fuzzy, python-brace-format
 msgid "You are invited to {room} by {user}"
 msgstr "Ο/Η %s μπήκε στο δωμάτιο"
 
-#: gajim/gui_interface.py:506
+#: gajim/gui_interface.py:495
 #, fuzzy
 msgid "Certificate Passphrase Required"
 msgstr "Απαιτείται φράση πρόσβασης"
 
-#: gajim/gui_interface.py:507
+#: gajim/gui_interface.py:496
 #, fuzzy, python-format
 msgid "Enter the certificate passphrase for account %s"
 msgstr "Πληκτρολογήστε τη φράση πρόσβασης GPG για το λογαριασμό %s"
 
-#: gajim/gui_interface.py:516 gajim/gtk/accounts.py:963
+#: gajim/gui_interface.py:505 gajim/gtk/accounts.py:966
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Πληκτρολογήστε τον κωδικό σας για το λογαριασμό %s"
 
-#: gajim/gui_interface.py:529 gajim/gtk/accounts.py:964
+#: gajim/gui_interface.py:518
+msgid "Password Required"
+msgstr "Απαιτείται κωδικός"
+
+#: gajim/gui_interface.py:518 gajim/gtk/accounts.py:967
 msgid "Save password"
 msgstr "Αποθήκευση κωδικού"
 
-#: gajim/gui_interface.py:601 gajim/gui_interface.py:632
+#: gajim/gui_interface.py:587 gajim/gui_interface.py:618
+#: gajim/gtk/filetransfer.py:332 gajim/gtk/filetransfer.py:333
 #: gajim/gtk/notification.py:173 gajim/gtk/notification.py:276
 msgid "File Transfer Error"
 msgstr "Σφάλμα μεταφοράς αρχείου"
 
-#: gajim/gui_interface.py:666
+#: gajim/gui_interface.py:652
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "O/Η %s επιθυμεί να σας στείλει ένα αρχείο."
 
-#: gajim/gui_interface.py:668 gajim/gtk/filetransfer.py:479
+#: gajim/gui_interface.py:654 gajim/gtk/filetransfer.py:484
 #: gajim/gtk/notification.py:172 gajim/gtk/notification.py:274
 msgid "File Transfer Request"
 msgstr "Αίτηση μεταφοράς αρχείου"
 
-#: gajim/gui_interface.py:767
+#: gajim/gui_interface.py:753
 #, fuzzy
 msgid "Remote Contact Stopped Transfer"
 msgstr "Αφαιρεί μια επαφή από τη λίστα επαφών"
 
-#: gajim/gui_interface.py:772
+#: gajim/gui_interface.py:758
 #, fuzzy
 msgid "Error Opening File"
 msgstr "Σφάλμα κατά την ανάγνωση του αρχείου:"
 
-#: gajim/gui_interface.py:782
+#: gajim/gui_interface.py:768
 #, fuzzy
 msgid "SSL Certificate Error"
 msgstr "Μη έγκυρο όνομα χρήστη"
 
-#: gajim/gui_interface.py:795 gajim/gui_interface.py:826
-#: gajim/gui_interface.py:853 gajim/gtk/notification.py:174
+#: gajim/gui_interface.py:781 gajim/gui_interface.py:812
+#: gajim/gui_interface.py:839 gajim/gtk/notification.py:174
 #: gajim/gtk/notification.py:279
 msgid "File Transfer Stopped"
 msgstr "Η μεταφορά αρχείου διακόπηκε"
 
-#: gajim/gui_interface.py:799
+#: gajim/gui_interface.py:785
 #, fuzzy
 msgid "File Transfer Failed"
 msgstr "Μεταφορές αρχείων"
 
-#: gajim/gui_interface.py:822
+#: gajim/gui_interface.py:808
 #, fuzzy, python-format
 msgid "%(filename)s received from %(name)s."
 msgstr "Η μεταφορά του αρχείου %(filename)s από τον/την %(name)s σταμάτησε."
 
-#: gajim/gui_interface.py:827
+#: gajim/gui_interface.py:813
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Η μεταφορά του αρχείου %(filename)s από τον/την %(name)s σταμάτησε."
 
-#: gajim/gui_interface.py:833
+#: gajim/gui_interface.py:819
 #, fuzzy, python-format
 msgid "File transfer of %(filename)s from %(name)s failed."
 msgstr "Η μεταφορά του αρχείου %(filename)s από τον/την %(name)s σταμάτησε."
 
-#: gajim/gui_interface.py:848
+#: gajim/gui_interface.py:834
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Έχετε στείλει με επιτυχία το %(filename)s στον/ους %(name)s."
 
-#: gajim/gui_interface.py:854
+#: gajim/gui_interface.py:840
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Η μεταφορά του αρχείου %(filename)s στον/ους %(name)s σταμάτησε."
 
-#: gajim/gui_interface.py:860
+#: gajim/gui_interface.py:846
 #, fuzzy, python-format
 msgid "File transfer of %(filename)s to %(name)s failed."
 msgstr "Η μεταφορά του αρχείου %(filename)s στον/ους %(name)s σταμάτησε."
 
-#: gajim/gui_interface.py:971
+#: gajim/gui_interface.py:957
 #, fuzzy
 msgid "Username Conflict"
 msgstr "Θα πρέπει να προσδιορίσετε ένα όνομα χρήστη !"
 
-#: gajim/gui_interface.py:972
+#: gajim/gui_interface.py:958
 #, fuzzy
 msgid "Please type a new username for your local account"
 msgstr "<b>Παρακαλώ συμπληρώστε τα δεδομένα για το νέο λογαριασμό σας</b>"
 
-#: gajim/gui_interface.py:995
+#: gajim/gui_interface.py:981
 #, fuzzy
 msgid "Resource Conflict"
 msgstr "Θα πρέπει να προσδιορίσετε ένα όνομα χρήστη !"
 
-#: gajim/gui_interface.py:996
+#: gajim/gui_interface.py:982
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
 msgstr ""
 
-#: gajim/gui_interface.py:1053
+#: gajim/gui_interface.py:1039
 #, fuzzy, python-format
 msgid "%s wants to start a voice chat."
 msgstr "O/Η %s επιθυμεί να σας στείλει ένα αρχείο."
 
-#: gajim/gui_interface.py:1055
+#: gajim/gui_interface.py:1041
 #, fuzzy
 msgid "Voice Chat Request"
 msgstr "Αίτηση μεταφοράς αρχείου"
 
-#: gajim/gui_interface.py:1123 gajim/gtk/account_wizard.py:312
+#: gajim/gui_interface.py:1109 gajim/gtk/account_wizard.py:312
 #, fuzzy
 msgid "Certificate Already in File"
 msgstr "Επαφή ήδη στη λίστα επαφών"
 
-#: gajim/gui_interface.py:1124 gajim/gtk/account_wizard.py:313
+#: gajim/gui_interface.py:1110 gajim/gtk/account_wizard.py:313
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr ""
 
-#: gajim/gui_interface.py:1145
+#: gajim/gui_interface.py:1131
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid"
 msgstr ""
 
-#: gajim/gui_interface.py:1148
+#: gajim/gui_interface.py:1134
 #, fuzzy, python-format
 msgid ""
 "\n"
 "Unknown SSL error: %d"
 msgstr "Άγνωστη έκδοση του D-Bus: %s"
 
-#: gajim/gui_interface.py:1150
+#: gajim/gui_interface.py:1136
 #, python-format
 msgid ""
 "\n"
 "SSL Error: <b>%s</b>"
 msgstr ""
 
-#: gajim/gui_interface.py:1155
+#: gajim/gui_interface.py:1141
 msgid "Error verifying SSL certificate"
 msgstr ""
 
-#: gajim/gui_interface.py:1156
+#: gajim/gui_interface.py:1142
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your XMPP server: "
@@ -2233,7 +2206,7 @@ msgid ""
 "Do you still want to connect to this server?"
 msgstr ""
 
-#: gajim/gui_interface.py:1160 gajim/gtk/account_wizard.py:412
+#: gajim/gui_interface.py:1146 gajim/gtk/account_wizard.py:413
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -2243,279 +2216,264 @@ msgid ""
 "%(sha256)s"
 msgstr ""
 
-#: gajim/gui_interface.py:1166
+#: gajim/gui_interface.py:1152
 msgid "Ignore this error for this certificate."
 msgstr ""
 
-#: gajim/gui_interface.py:1174
+#: gajim/gui_interface.py:1160
 #, fuzzy, python-format
 msgid "SSL Certificate Verification for %s"
 msgstr "Προσθήκη ειδικής ειδοποίησης για το %s"
 
-#: gajim/gui_interface.py:1442 gajim/gtk/join_groupchat.py:235
-msgid "You can not join a group chat unless you are connected."
-msgstr ""
-"Δε μπορείτε να συμμετάσχετε σε μια ομαδική συζήτηση εκτός αν είστε "
-"συνδεδεμένος."
-
-#: gajim/gui_interface.py:1448
-#, fuzzy
-msgid "JID is not a Groupchat"
-msgstr "Αυτή η μορφή συμπίεσης δεν υποστηρίζεται:"
-
-#: gajim/gui_interface.py:1579
-#, fuzzy
-msgid "This is not a group chat"
-msgstr "Αυτή η μορφή συμπίεσης δεν υποστηρίζεται:"
-
-#: gajim/gui_interface.py:1580
-#, python-format
-msgid ""
-"%(room_jid)s is already in your roster. Please check if %(room_jid)s is a "
-"correct group chat name. If it is, delete it from your roster and try "
-"joining the group chat again."
-msgstr ""
-
-#: gajim/gui_interface.py:1604 gajim/dialog_messages.py:58
+#: gajim/gui_interface.py:1577
 #, fuzzy
 msgid "You cannot join a group chat while you are invisible"
 msgstr "Δε μπορείτε να συμμετάσχετε σε μια ομαδική συζήτηση εάν είστε αόρατος"
 
-#: gajim/gui_interface.py:2037
+#: gajim/gui_interface.py:1976
 msgid "Could not save your settings and preferences"
 msgstr "Δεν ήταν δυνατή η αποθήκευση των προτιμήσεων σας"
 
-#: gajim/gui_interface.py:2098
+#: gajim/gui_interface.py:2037
 msgid "Gajim: IPython Console"
 msgstr ""
 
-#: gajim/dialog_messages.py:32
+#: gajim/dialog_messages.py:31 gajim/dialog_messages.py:36
+#: gajim/gtk/single_message.py:305 gajim/gtk/account_wizard.py:229
 #, fuzzy
-msgid "You can not start a new conversation unless you are connected."
-msgstr ""
-"Δε μπορείτε να συμμετάσχετε σε μια ομαδική συζήτηση εκτός αν είστε "
-"συνδεδεμένος."
-
-#: gajim/dialog_messages.py:36 gajim/dialog_messages.py:41
-#: gajim/gtk/single_message.py:305 gajim/gtk/join_groupchat.py:211
-#: gajim/gtk/account_wizard.py:229
-msgid "Invalid JID"
-msgstr "Μη έγκυρο JID"
+msgid "Invalid XMPP Address"
+msgstr "Μη έγκυρο αρχείο"
 
-#: gajim/dialog_messages.py:42 gajim/gtk/single_message.py:306
+#: gajim/dialog_messages.py:37
 #, fuzzy, python-format
-msgid "It is not possible to send a message to %s, this JID is not valid."
+msgid ""
+"It is not possible to send a message to %s. This XMPP Address is not valid."
 msgstr "Δεν είναι δυνατό να στείλετε άδεια αρχεία"
 
-#: gajim/dialog_messages.py:47
-msgid "Unread events"
+#: gajim/dialog_messages.py:42
+#, fuzzy
+msgid "Unread Events"
 msgstr "Αδιάβαστα γεγονότα"
 
-#: gajim/dialog_messages.py:48
-msgid "Read all pending events before removing this account."
+#: gajim/dialog_messages.py:43
+#, fuzzy
+msgid "Read or acknowledge all pending events before removing this account."
 msgstr ""
 "Ανάγνωση όλων των γεγονότων που εκκρεμούν, πριν την αφαίρεση αυτού του "
 "λογαριασμού."
 
-#: gajim/dialog_messages.py:52
+#: gajim/dialog_messages.py:48
 #, fuzzy
 msgid "Invalid Form"
 msgstr "Μη έγκυρη εγγραφή"
 
-#: gajim/dialog_messages.py:53
+#: gajim/dialog_messages.py:49
 #, fuzzy
 msgid "The form is not filled correctly."
 msgstr ""
 "Το όνομα του δωματίου ή του διακομιστή περιέχει μη επιτρεπόμενους χαρακτήρες."
 
-#: gajim/dialog_messages.py:57 gajim/common/helpers.py:309
+#: gajim/dialog_messages.py:53 gajim/common/helpers.py:315
 msgid "Invisible"
 msgstr "Αφανής"
 
-#: gajim/dialog_messages.py:62
-msgid "A connection is not available"
-msgstr "Δεν υπάρχει διαθέσιμη σύνδεση"
+#: gajim/dialog_messages.py:54
+#, fuzzy
+msgid "You cannot join a group chat while being invisible."
+msgstr "Δε μπορείτε να συμμετάσχετε σε μια ομαδική συζήτηση εάν είστε αόρατος"
 
-#: gajim/dialog_messages.py:63
+#: gajim/dialog_messages.py:58
+#, fuzzy
+msgid "No Connection Available"
+msgstr "Σύνδεση μη διαθέσιμη"
+
+#: gajim/dialog_messages.py:59
 msgid "Your message can not be sent until you are connected."
 msgstr "Δε μπορεί να σταλεί το μήνυμα σας εκτός αν είστε συνδεδεμένος."
 
-#: gajim/dialog_messages.py:67
-#, fuzzy
-msgid "JID already in list"
-msgstr "Ένα πρόγραμμα για το Jabber"
+#: gajim/dialog_messages.py:63
+msgid "XMPP Address Already in List"
+msgstr ""
 
-#: gajim/dialog_messages.py:68
-msgid "The JID you entered is already in the list. Choose another one."
+#: gajim/dialog_messages.py:64
+#, fuzzy
+msgid ""
+"The XMPP Address you entered is already in the list. Please choose another "
+"one."
 msgstr ""
+"Αυτό το όνομα χρησιμοποιείται ήδη από κάποιον άλλον από τους λογαριασμούς "
+"σας. Παρακαλώ, επιλέξτε άλλο όνομα."
 
-#: gajim/dialog_messages.py:72
-msgid "Invalid answer"
+#: gajim/dialog_messages.py:69
+#, fuzzy
+msgid "Invalid Answer"
 msgstr "Μη έγκυρη απόκριση"
 
-#: gajim/dialog_messages.py:73
+#: gajim/dialog_messages.py:70
 #, fuzzy, python-format
 msgid "Transport %(name)s answered wrongly to register request: %(error)s"
 msgstr "Η μεταφορά %s αποκρίθηκε εσφαλμένα στην αίτηση εγγραφής."
 
-#: gajim/dialog_messages.py:78
+#: gajim/dialog_messages.py:75
 #, fuzzy
 msgid "Wrong Custom Hostname"
 msgstr "Χρήση προσαρμοσμένου διακομιστή/θύρας"
 
-#: gajim/dialog_messages.py:79
+#: gajim/dialog_messages.py:76
 #, fuzzy, python-format
-msgid "Wrong custom hostname \"%s\". Ignoring it."
+msgid "Custom hostname \"%s\" is wrong. It will be ignored."
 msgstr "Χρήση προσαρμοσμένου διακομιστή/θύρας"
 
-#: gajim/dialog_messages.py:83
+#: gajim/dialog_messages.py:80
 #, fuzzy
-msgid "Error while removing privacy list"
+msgid "Error While Removing Privacy List"
 msgstr "Δημιουργήθηκε σφάλμα κατά την αφαίρεση της εργασίας !"
 
-#: gajim/dialog_messages.py:84
+#: gajim/dialog_messages.py:81
 #, python-format
 msgid ""
-"Privacy list %s has not been removed. It is maybe active in one of your "
-"connected resources. Deactivate it and try again."
+"Privacy list %s has not been removed. It is probably active in one of your "
+"connected resources. Please deactivate it and try again."
 msgstr ""
 
-#: gajim/dialog_messages.py:90
+#: gajim/dialog_messages.py:87
 #, fuzzy
-msgid "Invisibility not supported"
+msgid "Invisibility Not Supported"
 msgstr "Η επέκταση δεν υποστηρίζεται"
 
-#: gajim/dialog_messages.py:91
-#, python-format
-msgid "Account %s doesn't support invisibility."
-msgstr ""
+#: gajim/dialog_messages.py:88
+#, fuzzy, python-format
+msgid "This account %s doesn't support invisibility."
+msgstr "Λίστα ενεργών, ολοκληρωμένων και σταματημένων μεταφορών αρχείων"
 
-#: gajim/dialog_messages.py:95
+#: gajim/dialog_messages.py:92
 #, fuzzy
-msgid "Unregister failed"
+msgid "Unregister Failed"
 msgstr "Η δημοσιοποίηση της vCard απέτυχε"
 
-#: gajim/dialog_messages.py:96
-#, python-format
-msgid "Unregistration with server %(server)s failed: %(error)s"
-msgstr ""
+#: gajim/dialog_messages.py:93
+#, fuzzy, python-format
+msgid "Unregistration on server %(server)s failed: %(error)s"
+msgstr "Η σύνδεση απέτυχε"
 
-#: gajim/dialog_messages.py:100
+#: gajim/dialog_messages.py:97
 #, fuzzy
-msgid "Registration succeeded"
+msgid "Registration Succeeded"
 msgstr "Η δημοσιοποίηση της vCard έγινε επιτυχώς"
 
-#: gajim/dialog_messages.py:101
-#, python-format
-msgid "Registration with agent %s succeeded"
-msgstr ""
+#: gajim/dialog_messages.py:98
+#, fuzzy, python-format
+msgid "Registration with agent %s succeeded."
+msgstr "Η δημοσιοποίηση της vCard έγινε επιτυχώς"
 
-#: gajim/dialog_messages.py:105 gajim/gtk/service_registration.py:215
+#: gajim/dialog_messages.py:102
 #, fuzzy
-msgid "Registration failed"
+msgid "Registration Failed"
 msgstr "Η δημοσιοποίηση της vCard απέτυχε"
 
-#: gajim/dialog_messages.py:106
+#: gajim/dialog_messages.py:103
 #, python-format
 msgid ""
 "Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
 msgstr ""
 
-#: gajim/dialog_messages.py:111
+#: gajim/dialog_messages.py:108
 #, fuzzy
 msgid "Unable to Join Group Chat"
 msgstr "Δεν ήταν δυνατή η σύνδεση στην ομαδική συζήτηση"
 
-#: gajim/dialog_messages.py:116
-msgid "GStreamer error"
+#: gajim/dialog_messages.py:113
+msgid "GStreamer Error"
 msgstr ""
 
-#: gajim/dialog_messages.py:117
+#: gajim/dialog_messages.py:114
 #, fuzzy, python-format
 msgid ""
 "Error: %(error)s\n"
 "Debug: %(debug)s"
 msgstr "Μήνυμα σφάλματος: %s"
 
-#: gajim/dialog_messages.py:121
-msgid "Wrong host"
+#: gajim/dialog_messages.py:118
+#, fuzzy
+msgid "Wrong Host"
 msgstr "Λάθος διακομιστής"
 
-#: gajim/dialog_messages.py:122
+#: gajim/dialog_messages.py:119
 msgid "Invalid local address? :-O"
 msgstr ""
 
-#: gajim/dialog_messages.py:126
-msgid "Avahi error"
+#: gajim/dialog_messages.py:123
+#, fuzzy
+msgid "Avahi Error"
 msgstr "Σφάλμα avahi"
 
-#: gajim/dialog_messages.py:127
+#: gajim/dialog_messages.py:124
 #, python-format
 msgid ""
 "%s\n"
 "Link-local messaging might not work properly."
 msgstr ""
 
-#: gajim/dialog_messages.py:131 gajim/dialog_messages.py:136
+#: gajim/dialog_messages.py:128 gajim/dialog_messages.py:133
 #, fuzzy
-msgid "Could not request upload slot"
+msgid "Could not request upload slot for HTTP File Upload"
 msgstr "Δεν ήταν δυνατή η εκκίνηση της τοπικής υπηρεσίας"
 
-#: gajim/dialog_messages.py:137
-msgid "Got unexpected response from server (see log)"
+#: gajim/dialog_messages.py:134
+msgid "Got unexpected response from server (see log)."
 msgstr ""
 
-#: gajim/dialog_messages.py:141 gajim/dialog_messages.py:146
+#: gajim/dialog_messages.py:138 gajim/dialog_messages.py:143
 #, fuzzy
-msgid "Could not open file"
+msgid "Could not Open File"
 msgstr "Δεν ήταν δυνατό το φόρτωμα της εικόνας"
 
-#: gajim/dialog_messages.py:142
-msgid "Exception raised while opening file (see log)"
+#: gajim/dialog_messages.py:139
+msgid "Exception raised while trying to open file (see log)."
 msgstr ""
 
-#: gajim/dialog_messages.py:151
-msgid "Unsecure"
-msgstr ""
+#: gajim/dialog_messages.py:148
+#, fuzzy
+msgid "Not Secure"
+msgstr "Δεν έχει ξεκινήσει"
 
-#: gajim/dialog_messages.py:152
-msgid "Server returned unsecure transport (HTTP)"
+#: gajim/dialog_messages.py:149
+msgid "The server returned an insecure transport (HTTP)."
 msgstr ""
 
-#: gajim/dialog_messages.py:156
+#: gajim/dialog_messages.py:153
 #, fuzzy
-msgid "Could not upload file"
+msgid "Could not Upload File"
 msgstr "Δεν ήταν δυνατό το φόρτωμα της εικόνας"
 
-#: gajim/dialog_messages.py:157
+#: gajim/dialog_messages.py:154
 #, python-format
 msgid "HTTP response code from server: %s"
 msgstr ""
 
-#: gajim/dialog_messages.py:161
+#: gajim/dialog_messages.py:158
 msgid "Upload Error"
 msgstr ""
 
-#: gajim/dialog_messages.py:166
+#: gajim/dialog_messages.py:163
 #, fuzzy
 msgid "Encryption Error"
 msgstr "Ενεργοποιήθηκε η κρυπτογράφηση"
 
-#: gajim/dialog_messages.py:167
-#, fuzzy
-msgid "For the chosen encryption there is no encryption method available"
-msgstr "Δεν υπάρχει διαθέσιμη σύνδεση"
+#: gajim/dialog_messages.py:164
+msgid "There is no encryption method available for the chosen encryption."
+msgstr ""
 
-#: gajim/dialog_messages.py:171
+#: gajim/dialog_messages.py:169
 #, fuzzy
-msgid "Avatar upload failed"
+msgid "Avatar Upload Failed"
 msgstr "Η δημοσιοποίηση της vCard απέτυχε"
 
-#: gajim/privatechat_control.py:204
+#: gajim/privatechat_control.py:207
 msgid "Sending private message failed"
 msgstr "Αποτυχία αποστολής προσωπικού μηνύματος"
 
-#: gajim/privatechat_control.py:206
+#: gajim/privatechat_control.py:209
 #, fuzzy, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr "Δεν είστε πια στο δωμάτιο \"%s\" ή ο/η \"%s\" έφυγε."
@@ -2541,7 +2499,7 @@ msgstr "εμφάνιση βοήθειας στην εντολή"
 
 #: gajim/gajim_remote.py:85
 #, fuzzy
-msgid "Lists all contacts in roster, one for each line"
+msgid "Lists all contacts in the contact list, one for each line"
 msgstr ""
 "Εμφανίζει όλες τις επαφές στη λίστα επαφών. Κάθε επαφή εμφανίζεται σε μια "
 "ξεχωριστή γραμμή"
@@ -2628,11 +2586,13 @@ msgstr ""
 
 #: gajim/gajim_remote.py:118
 #, fuzzy
-msgid "Sends new chat message to a contact in the roster. Account is optional."
+msgid ""
+"Sends new chat message to a contact in the contact list. Account is optional."
 msgstr "Χρήση: /%s, αποκρύπτει τα κουμπιά της κουβέντας."
 
 #: gajim/gajim_remote.py:120 gajim/gajim_remote.py:130
-msgid "JID of the contact that will receive the message"
+#, fuzzy
+msgid "XMPP Address of the contact that will receive the message"
 msgstr "το JID της επαφής που θα λάβει το μήνυμα"
 
 #: gajim/gajim_remote.py:121 gajim/gajim_remote.py:132
@@ -2646,8 +2606,10 @@ msgid "if specified, the message will be sent using this account"
 msgstr "εάν οριστεί, το μήνυμα θα σταλεί χρησιμοποιώντας αυτόν το λογαριασμό"
 
 #: gajim/gajim_remote.py:127
-msgid "Sends a chat message to someone on your roster. Account is optional."
-msgstr ""
+#, fuzzy
+msgid ""
+"Sends a chat message to someone on your contact list. Account is optional."
+msgstr "Χρήση: /%s, αποκρύπτει τα κουμπιά της κουβέντας."
 
 #: gajim/gajim_remote.py:131
 msgid "subject"
@@ -2658,12 +2620,12 @@ msgid "message subject"
 msgstr "θέμα μηνύματος"
 
 #: gajim/gajim_remote.py:138
-msgid "Sends new message to a groupchat you've joined."
+msgid "Sends new message to a group chat you've joined."
 msgstr ""
 
 #: gajim/gajim_remote.py:140
 #, fuzzy
-msgid "JID of the room that will receive the message"
+msgid "XMPP Address of the group chat that will receive the message"
 msgstr "το JID της επαφής που θα λάβει το μήνυμα"
 
 #: gajim/gajim_remote.py:147
@@ -2672,7 +2634,8 @@ msgstr "Λήψη αναλυτικών πληροφοριών για μία επ�
 
 #: gajim/gajim_remote.py:149 gajim/gajim_remote.py:162
 #: gajim/gajim_remote.py:192
-msgid "JID of the contact"
+#, fuzzy
+msgid "XMPP Address of the contact"
 msgstr "το JID της επαφής"
 
 #: gajim/gajim_remote.py:153
@@ -2736,7 +2699,8 @@ msgstr ""
 "Γράφει την τρέχουσα κατάσταση των προτιμήσεων του Gajim στο .config αρχείο"
 
 #: gajim/gajim_remote.py:190
-msgid "Removes contact from roster"
+#, fuzzy
+msgid "Removes contact from contact list"
 msgstr "Αφαιρεί μια επαφή από τη λίστα επαφών"
 
 #: gajim/gajim_remote.py:193
@@ -2789,9 +2753,9 @@ msgid "Missing argument \"contact_jid\""
 msgstr "Λείπει το όρισμα \"contact_jid\""
 
 #: gajim/gajim_remote.py:275
-#, python-format
+#, fuzzy, python-format
 msgid ""
-"'%s' is not in your roster.\n"
+"'%s' is not in your contact list.\n"
 "Please specify account for sending the message."
 msgstr ""
 "Η επαφή '%s' δεν είναι στη λίστα σας.\n"
@@ -3012,12 +2976,12 @@ msgstr "Τέλος εβδομάδας"
 msgid "Weekend!"
 msgstr "Σαββατοκύριακο!"
 
-#: gajim/common/logger.py:192 gajim/common/logger.py:197
+#: gajim/common/logger.py:189 gajim/common/logger.py:194
 #, fuzzy, python-format
 msgid "%s is a directory but should be a file"
 msgstr "Το %s είναι κατάλογος αλλά θα έπρεπε να είναι αρχείο"
 
-#: gajim/common/logger.py:217
+#: gajim/common/logger.py:214
 #, fuzzy, python-format
 msgid "Creating %s"
 msgstr "Περιγραφή: %s"
@@ -3091,24 +3055,23 @@ msgstr "Αποσύνδεση %(nickname)s"
 msgid "Contact Signed Out"
 msgstr "Αποσύνδεση επαφής"
 
-#: gajim/common/contacts.py:455
-#, fuzzy
-msgid "Not in roster"
-msgstr "Εκτέλεση στο Τερματικό"
-
 #: gajim/common/config.py:80
+#, fuzzy
 msgid ""
 "Show desktop notification even when a chat window is opened for this contact "
-"and does not have focus"
+"and does not have focus."
 msgstr ""
+"Να επιτρέπονται οι εμφανίσεις/γνωστοποιήσεις όταν είμαι _απομακρ./μη διαθ./"
+"απασχολ./αφανής"
 
 #: gajim/common/config.py:81
-msgid "Play sound when user is busy"
+msgid "Play sound even when being busy."
 msgstr ""
 
 #: gajim/common/config.py:83
-msgid "Show only online and free for chat contacts in roster."
-msgstr ""
+#, fuzzy
+msgid "Show only online and free for chat contacts in the contact list."
+msgstr "Θα ήθελα να σε προσθέσω στην λίστα επαφών μου."
 
 #: gajim/common/config.py:86
 msgid "Time in minutes, after which your status changes to away."
@@ -3118,11 +3081,13 @@ msgstr ""
 
 #: gajim/common/config.py:87
 #, fuzzy
-msgid "$S (Away as a result of being idle more than $T min)"
+msgid "$S (Away: Idle more than $T min)"
 msgstr "Απομακρυσμένος λόγω αδράνειας"
 
 #: gajim/common/config.py:87
-msgid "$S will be replaced by current status message, $T by autoawaytime."
+msgid ""
+"$S will be replaced by current status message, $T by the 'autoawaytime' "
+"value."
 msgstr ""
 
 #: gajim/common/config.py:89
@@ -3133,69 +3098,71 @@ msgstr ""
 
 #: gajim/common/config.py:90
 #, fuzzy
-msgid "$S (Not available as a result of being idle more than $T min)"
+msgid "$S (Not available: Idle more than $T min)"
 msgstr "Μη διαθέσιμος λόγω αδράνειας"
 
 #: gajim/common/config.py:90
-msgid "$S will be replaced by current status message, $T by autoxatime."
+msgid ""
+"$S will be replaced by current status message, $T by the 'autoxatime' value."
 msgstr ""
 
 #: gajim/common/config.py:93
 msgid ""
-"When to show notification area icon. Can be 'never', 'on_event', 'always'."
+"When to show the notification area icon. Can be 'never', 'on_event', and "
+"'always'."
 msgstr ""
 
 #: gajim/common/config.py:94
-msgid "Allow to hide the roster window even if the tray icon is not shown."
+msgid ""
+"Allow to hide the contact list window even if the notification area icon is "
+"not shown."
 msgstr ""
 
 #: gajim/common/config.py:97
 #, fuzzy
-msgid "Contact signed in notification color."
-msgstr "_Προβολή τίτλου στο κουμπί"
+msgid "Notification color for contacts signing in."
+msgstr "Ειδοποίηση όταν μια επαφή:"
 
 #: gajim/common/config.py:98
 #, fuzzy
-msgid "Contact signout notification color"
-msgstr "_Προβολή τίτλου στο κουμπί"
+msgid "Notification color for contacts signing out."
+msgstr "Ειδοποίηση όταν μια επαφή:"
 
 #: gajim/common/config.py:99
 #, fuzzy
-msgid "New message notification color."
+msgid "Notification color for new message notification."
 msgstr "Ειδοπ_οιήσεις για κατάσταση κουβέντας:"
 
 #: gajim/common/config.py:100
 #, fuzzy
-msgid "File transfer request notification color."
-msgstr "Αίτηση μεταφοράς αρχείου"
+msgid "Notification color for file transfer request."
+msgstr "_Ειδοποίησε με όταν έχει ολοκληρωθεί μια μεταφορά αρχείου"
 
 #: gajim/common/config.py:101
 #, fuzzy
-msgid "File transfer error notification color."
-msgstr "Άνοιγμα αρχείου μενού"
+msgid "Notification color for file transfer errors."
+msgstr "_Ειδοποίησε με όταν έχει ολοκληρωθεί μια μεταφορά αρχείου"
 
 #: gajim/common/config.py:102
-#, fuzzy
-msgid "File transfer complete or stopped notification color."
-msgstr "Ειδοποίηση όταν έχει ολοκληρωθεί μια μεταφορά αρχείου"
+msgid "Notification color for stopped or completed file transfers."
+msgstr ""
 
 #: gajim/common/config.py:103
-#, fuzzy
-msgid "Groupchat invitation notification color"
-msgstr "Πρόσκληση ομαδικής κουβέντας"
+msgid "Notification color for group chat invitations."
+msgstr ""
 
 #: gajim/common/config.py:104
-msgid "Background color of status changed notification"
+msgid "Notification background color for changed status."
 msgstr ""
 
 #: gajim/common/config.py:105
-msgid "Other dialogs color."
+msgid "Notification color for other dialogs."
 msgstr ""
 
 #: gajim/common/config.py:106
 #, fuzzy
 msgid ""
-"List (space separated) of rows (accounts and groups) that are collapsed."
+"List of rows (accounts and groups) that are collapsed (space separated)."
 msgstr ""
 "Λίστα (χωρισμένη με κενά) των γραμμών (λογαριασμοί και ομάδες) που έχουν "
 "συμπτυχθεί"
@@ -3205,8 +3172,9 @@ msgstr ""
 msgid "default"
 msgstr "Προεπιλογή"
 
-#: gajim/common/config.py:113
-msgid "Language used by speller"
+#: gajim/common/config.py:113 gajim/common/config.py:424
+#: gajim/common/config.py:431
+msgid "Language used for spell checking."
 msgstr ""
 
 #: gajim/common/config.py:114
@@ -3219,8 +3187,8 @@ msgstr ""
 #: gajim/common/config.py:115
 msgid ""
 "Print time in chats using Fuzzy Clock. Value of fuzziness from 1 to 4, or 0 "
-"to disable fuzzyclock. 1 is the most precise clock, 4 the least precise one. "
-"This is used only if print_time is 'sometimes'."
+"to disable Fuzzy Clock. 1 is the most precise clock, 4 the least precise "
+"one. This is used only if 'print_time' is 'sometimes'."
 msgstr ""
 
 #: gajim/common/config.py:117
@@ -3234,299 +3202,299 @@ msgstr "Τα ζεύγη * / _ είναι χαρακτήρες μορφοποίη
 #: gajim/common/config.py:120
 #, fuzzy
 msgid ""
-"If true, do not remove */_ . So *abc* will be bold but with * * not removed."
+"If enabled, do not remove */_ . So *abc* will be bold but with * * not "
+"removed."
 msgstr ""
 "Αν είναι αληθές, μην αφαιρείς */_. Έτσι το *αβγ* θα είναι μεν έντονο αλλά τα "
 "* * δεν θα αφαιρεθούν."
 
 #: gajim/common/config.py:123
 msgid ""
-"Uses ReStructured text markup to send HTML, plus ascii formatting if "
-"selected. For syntax, see http://docutils.sourceforge.net/docs/ref/rst/"
-"restructuredtext.html (If you want to use this, install docutils)"
+"Uses ReStructured text markup to send HTML, plus ASCII formatting if "
+"selected. Needs docutils installed (for syntax, see http://docutils."
+"sourceforge.net/docs/ref/rst/restructuredtext.html)."
 msgstr ""
 
 #: gajim/common/config.py:132
 msgid ""
-"Character to add after nickname when using nick completion (tab) in group "
-"chat."
+"Character to add after nickname when using nickname completion (tab) in "
+"group chat."
 msgstr ""
 
 #: gajim/common/config.py:133
 msgid ""
-"Character to propose to add after desired nickname when desired nickname is "
-"used by someone else in group chat."
+"Character to propose to add after desired nickname when nickname is already "
+"used in group chat."
 msgstr ""
 
 #: gajim/common/config.py:155
 msgid ""
-"If true, Gajim will save roster position when hiding roster, and restore it "
-"when showing roster."
+"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:161
-msgid "Place the roster on the right in single window mode"
+msgid "Place the contact list on the right in single window mode"
 msgstr ""
 
 #: gajim/common/config.py:167
 msgid ""
-"This option let you customize timestamp that is printed in conversation. For "
-"example \"[%H:%M] \" will show \"[hour:minute] \". See python doc on "
-"strftime for full documentation: http://docs.python.org/lib/module-time.html"
+"This option lets you customize the timestamp that is printed in "
+"conversation. For example '[%H:%M] ' will show '[hour:minute] '. See python "
+"doc on strftime for full documentation (https://docs.python.org/3/library/"
+"time.html)."
 msgstr ""
 
 #: gajim/common/config.py:168
-msgid "Characters that are printed before the nickname in conversations"
+msgid "Characters that are printed before the nickname in conversations."
 msgstr ""
 
 #: gajim/common/config.py:169
-msgid "Characters that are printed after the nickname in conversations"
+msgid "Characters that are printed after the nickname in conversations."
 msgstr ""
 
 #: gajim/common/config.py:170
-msgid "Add * and [n] in roster title?"
-msgstr "Να προστεθεί * και [n] στον τίτλο της λίστας επαφών;"
+#, fuzzy
+msgid "If enabled, Gajim will add * and [n] in contact list window title."
+msgstr ""
+"Αν επιλεγεί, το Gajim θα εμφανίζει τα άβαταρ των επαφών στην λίστα επαφών "
+"και στις ομαδικές κουβέντες"
 
 #: gajim/common/config.py:171
 #, fuzzy
 msgid ""
-"How many history messages should be restored when a chat tab/window is "
-"reopened?"
+"Number of messages from chat history to be restored when a chat tab/window "
+"is reopened."
 msgstr ""
 "Πόσες γραμμές από την προηγούμενη συζήτηση θα εμφανίζονται όταν θα "
 "ξανανοίξει μια καρτέλα/παράθυρο κουβέντας."
 
 #: gajim/common/config.py:172
-msgid "How far back in time (minutes) history is restored. -1 means no limit."
+msgid ""
+"How far back in time (minutes) chat history is restored. -1 means no limit."
 msgstr ""
 
 #: gajim/common/config.py:173
 msgid ""
-"How many lines to request from server when entering a groupchat. -1 means no "
-"limit"
+"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:174
 msgid ""
-"Minutes of backlog to request when entering a groupchat. -1 means no limit"
+"Should automatic rejoin be activated when you were kicked from a group chat?"
 msgstr ""
 
 #: gajim/common/config.py:175
-msgid ""
-"How many seconds to wait before trying to autorejoin to a conference you are "
-"being disconnected from. Set to 0 to disable autorejoining."
-msgstr ""
-
-#: gajim/common/config.py:176
-msgid "Should autorejoin be activated when kicked from a conference?"
-msgstr ""
-
-#: gajim/common/config.py:177
-msgid ""
-"Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
-"Client default behaviour)."
+#, fuzzy
+msgid "Send message on Ctrl+Enter and make a new line with Enter."
 msgstr ""
 "Αποστολή μηνύματος με Ctrl+Enter και εισαγωγή νέας γραμμής με το Enter (Εξ "
 "ορισμού συμπεριφορά του πελάτη ICQ της Mirabilis)."
 
-#: gajim/common/config.py:179
-msgid "How many lines to store for Ctrl+KeyUP."
+#: gajim/common/config.py:177
+#, fuzzy
+msgid "How many lines to store for Ctrl+KeyUP (previously sent messages)."
 msgstr "Πόσες γραμμές να αποθηκευτούν για το Ctrl+KeyUP."
 
-#: gajim/common/config.py:182
+#: gajim/common/config.py:180
 #, fuzzy, python-format
 msgid ""
-"Either custom URL with %%s in it where %%s is the word/phrase or "
-"'WIKTIONARY' which means use Wikitionary."
+"Either a custom URL with %%s in it (where %%s is the word/phrase) or "
+"'WIKTIONARY' (which means use Wikitionary)."
 msgstr ""
 "Είτε δικό σας url με ένα %s σε αυτό όπου %s είναι η λέξη/φρράση ή "
 "'WIKTIONARY' που σημαίνει να γίνεται χρήση του wiktionary."
 
-#: gajim/common/config.py:185
+#: gajim/common/config.py:183
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr ""
 "Εαν είναι επιλεγμένο, το Gajim μπορεί να ελεγχθεί από μακριά χρησιμοποιόντας "
 "το gajim-remote."
 
-#: gajim/common/config.py:187
+#: gajim/common/config.py:185
 msgid ""
-"When not printing time for every message (print_time==sometimes), print it "
+"When not printing time for every message ('print_time'==sometimes), print it "
 "every x minutes."
 msgstr ""
 
-#: gajim/common/config.py:188
+#: gajim/common/config.py:186
 msgid "Ask before pasting an image."
 msgstr ""
 
-#: gajim/common/config.py:189
+#: gajim/common/config.py:187
 msgid "Ask before closing a group chat tab/window."
 msgstr "Ερώτηση πριν το κλείσιμο καρτέλας/παραθύρου ομαδικής κουβέντας."
 
-#: gajim/common/config.py:190
+#: gajim/common/config.py:188
 #, fuzzy
 msgid ""
-"Always ask for confirmation before closing groupchats with any of the JIDs "
-"on this space separated list."
+"Always ask for confirmation before closing group chats with any of the XMPP "
+"Addresses on this list (space separated)."
 msgstr ""
 "Να γίνεται πάντα ερώτηση πριν το κλείσιμο καρτέλας/παραθύρου ομαδικής "
 "κουβέντας για αυτά τα δωμάτια (jids χωρισμένα με κενά)."
 
-#: gajim/common/config.py:191
+#: gajim/common/config.py:189
 #, fuzzy
 msgid ""
-"Never ask for confirmation before closing groupchats with any of the JIDs on "
-"this space separated list."
+"Never ask for confirmation before closing group chats with any of the XMPP "
+"Addresses on this list (space separated)."
 msgstr ""
 "Να μην γίνεται ερώτηση πριν το κλείσιμο καρτέλας/παραθύρου ομαδικής "
 "κουβέντας για αυτά τα δωμάτια (jids χωρισμένα με κενά)."
 
-#: gajim/common/config.py:192
+#: gajim/common/config.py:190
 msgid ""
-"Ask before closing tabbed chat window if there are controls that can lose "
-"data (chat, private chat, groupchat that will not be minimized)"
+"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:195
+#: gajim/common/config.py:193
 #, fuzzy
 msgid ""
-"Comma separated list of sent hosts, in addition of local interfaces, for "
-"File Transfer in case of address translation/port forwarding."
+"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:196
+#: gajim/common/config.py:194
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "Το IEC standard υπαγορεύει ότι ΚιΒ = 1024 bytes, KB = 1000 bytes."
 
-#: gajim/common/config.py:198
+#: gajim/common/config.py:196
 msgid "Notify of events in the notification area."
 msgstr ""
 
-#: gajim/common/config.py:199
+#: gajim/common/config.py:197
 msgid ""
-"If False, Gajim will display a static event icon instead of the blinking "
-"status icon in the notification area when notifying on event."
+"If disabled, Gajim will display a static event icon instead of the blinking "
+"status icon in the notification area when notifying about an event."
 msgstr ""
 
-#: gajim/common/config.py:205
+#: gajim/common/config.py:203
 msgid "Show tab when only one conversation?"
 msgstr "Να εμφανίζεται καρτέλα όταν υπάρχει μόνο μια κουβέντα;"
 
-#: gajim/common/config.py:206
+#: gajim/common/config.py:204
 #, fuzzy
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "Να εμφανίζεται καρτέλα εάν υπάρχει μόνο μια κουβέντα;"
 
-#: gajim/common/config.py:207
+#: gajim/common/config.py:205
 msgid "Show close button in tab?"
 msgstr "Προβολή κουμπιού κλεισίματος στην καρτέλα;"
 
-#: gajim/common/config.py:220
+#: gajim/common/config.py:218
 #, fuzzy
 msgid "Preview new messages in notification popup?"
 msgstr "Ειδοπ_οιήσεις για κατάσταση κουβέντας:"
 
-#: gajim/common/config.py:223
+#: gajim/common/config.py:221
 #, fuzzy
 msgid ""
-"A semicolon-separated list of words that will be highlighted in group chats."
+"A list of words (semicolon separated) that will be highlighted in group "
+"chats."
 msgstr ""
 "Μία λίστα με λέξεις χωρισμένες με ερωτηματικά, οι οποίες θα επισημαίνονται."
 
-#: gajim/common/config.py:224
+#: gajim/common/config.py:222
 #, fuzzy
 msgid ""
-"If true, quits Gajim when X button of Window Manager is clicked. This "
-"setting is taken into account only if notification icon is used."
+"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 κλείνει όταν πατιέται το κουμπί Χ του διαχειριστή "
 "παραθύρων. Αυτή η ρύθμιση έχει νόημα μόνο εφόσον γίνεται χρήση εικονιδίου "
 "στην μπάρα ειδοποιήσεων."
 
-#: gajim/common/config.py:225
+#: gajim/common/config.py:223
 msgid ""
-"If true, Gajim hides the Roster window on pressing the X button instead of "
-"minimizing into the Dock."
+"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:226
+#: gajim/common/config.py:224
 #, fuzzy
 msgid ""
-"If true, Gajim will display an icon on each tab containing unread messages. "
-"Depending on the theme, this icon may be animated."
+"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:227
+#: gajim/common/config.py:225
 #, fuzzy
 msgid ""
-"If true, Gajim will display the status message, if not empty, for every "
-"contact under the contact name in roster window."
+"If enabled, Gajim will display the status message (if not empty) underneath "
+"the contact name in the contact list window."
 msgstr ""
 "Αν είναι αληθές, το Gajim θα εμφανίζει το μήνυμα κατάστασης, εφόσον δεν "
 "είναι άδειο, για κάθε επαφή κάτω από το όνομα επαφής στην λίστα επαφών"
 
-#: gajim/common/config.py:233
-msgid "Define the position of the avatar in roster. Can be left or right"
+#: gajim/common/config.py:231
+msgid ""
+"Define the position of avatars in the contact list. Can be 'left' or 'right'."
 msgstr ""
 
-#: gajim/common/config.py:234
+#: gajim/common/config.py:232
 #, fuzzy
 msgid ""
-"If False, Gajim will no longer print status line in chats when a contact "
-"changes their status and/or their status message."
+"If disabled, Gajim will no longer print status messages in chats when a "
+"contact changes their status (and/or their status message)."
 msgstr ""
 "Αν είναι ψευδές, το Gajim δε θα τυπώνει γραμμή σχετική με την κατάσταση στα "
 "παράθυρα συζητήσεων όταν η επαφή αλλάζει την κατάσταση και/ή τo μήνυμα "
 "κατάστασης."
 
-#: gajim/common/config.py:235
+#: gajim/common/config.py:233
 #, fuzzy
 msgid ""
 "Default Setting: Show a status message for every join or leave in a group "
-"chat"
+"chat."
 msgstr "Δεν ήταν δυνατή η σύνδεση στην ομαδική συζήτηση"
 
-#: gajim/common/config.py:236
+#: gajim/common/config.py:234
+#, fuzzy
 msgid ""
-"Default Setting: Show a status message for all status (away, dnd, etc.) "
-"changes of users in a group chat"
-msgstr ""
+"Default Setting: Show a status message for all status changes (away, dnd, "
+"etc.) of users in a group chat."
+msgstr "Δεν ήταν δυνατή η σύνδεση στην ομαδική συζήτηση"
 
-#: gajim/common/config.py:238
-msgid "Log XHTML messages instead of plain text messages."
+#: gajim/common/config.py:236
+msgid "Store XHTML messages in chat history instead of plain text messages."
 msgstr ""
 
-#: gajim/common/config.py:239
+#: gajim/common/config.py:237
 msgid "Don't show avatar for the transport itself."
 msgstr ""
 
-#: gajim/common/config.py:240
-msgid "Don't show roster in the system taskbar."
+#: gajim/common/config.py:238
+msgid "Don't show contact list window in the system taskbar."
 msgstr ""
 
-#: gajim/common/config.py:241
+#: gajim/common/config.py:239
 #, fuzzy
 msgid ""
-"If true, make the window flash (the default behaviour in most Window "
-"Managers) when holding pending events."
+"If enabled, Gajim makes the window flash (the default behaviour in most "
+"Window Managers) when holding pending events."
 msgstr ""
 "Αν είναι ενεργοποιημένο, και τα GTK+ και PyGTK είναι έκδοσης 2.8 και πάνω, "
 "να αναβοσβήνει το παράθυρο όταν υπάρχουν εκκρεμή γεγονότα."
 
-#: gajim/common/config.py:245
+#: gajim/common/config.py:243
 #, fuzzy
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
 "'always_with_roster' - Like 'always' but the messages are in a single window "
-"along with the roster.\n"
+"along with the contact list.\n"
 "'never' - All messages get their own window.\n"
 "'peracct' - Messages for each account are sent to a specific window.\n"
-"'pertype' - Each message type (e.g. chats vs. groupchats) is sent to a "
+"'pertype' - Each message type (e.g. chats vs. group chats) is sent to a "
 "specific window."
 msgstr ""
 "Καθορίζει σε ποιο παράθυρο θα εμφανίζονται τα νέα μηνύματα.\n"
@@ -3536,350 +3504,378 @@ msgstr ""
 "'pertype' - Κάθε τύπος μηνύματος έχει το δικό του παράθυρο. Αυτή η επιλογή "
 "απαιτεί επανεκκίνηση του gajim για να εφαρμοστεί."
 
-#: gajim/common/config.py:246
+#: gajim/common/config.py:244
 msgid ""
-"Show roster on startup.\n"
-"'always' - Always show roster.\n"
-"'never' - Never show roster.\n"
-"'last_state' - Restore the last state roster."
+"Show contact list window on startup.\n"
+"'always' - Always show contact list window.\n"
+"'never' - Never show contact list window.\n"
+"'last_state' - Restore last state of the contact list window."
 msgstr ""
 
-#: gajim/common/config.py:247
+#: gajim/common/config.py:245
 #, fuzzy
-msgid "If False, you will no longer see the avatar in the chat window."
+msgid "If enabled, Gajim displays the avatar in the chat window."
 msgstr "Αν Ψευδέςν, δε θα εμφανίζεται πλέον το άβαταρ στο παράθυρο κουβέντας"
 
-#: gajim/common/config.py:248
+#: gajim/common/config.py:246
 #, fuzzy
-msgid "If true, pressing the escape key closes a tab/window."
+msgid "If enabled, pressing Esc closes a tab/window."
 msgstr ""
 "Αν Αληθές, πατώντας το πλήκτρο διαφυγής, κλείνει η καρτέλα/το παράθυρο."
 
-#: gajim/common/config.py:249
-msgid "Hides the banner in a group chat window"
+#: gajim/common/config.py:247
+#, fuzzy
+msgid "Hides the banner in a group chat window."
 msgstr "Ερώτηση πριν το κλείσιμο καρτέλας/ παραθύρου ομαδικής κουβέντας."
 
-#: gajim/common/config.py:250
-msgid "Hides the banner in two persons chat window"
-msgstr "Αποκρύπτει την κεφαλίδα στο παράθυρο προσωπικής κουβέντας"
+#: gajim/common/config.py:248
+#, fuzzy
+msgid "Hides the banner in a 1:1 chat window."
+msgstr "Ερώτηση πριν το κλείσιμο καρτέλας/ παραθύρου ομαδικής κουβέντας."
 
-#: gajim/common/config.py:251
+#: gajim/common/config.py:249
 #, fuzzy
-msgid "Hides the group chat occupants list in group chat window."
+msgid "Hides the group chat participants list in a group chat window."
 msgstr "Αποκρύπτει τη λίστα συμμετεχόντων στο παράθυρο ομαδικής κουβέντας"
 
-#: gajim/common/config.py:252
+#: gajim/common/config.py:250
 msgid ""
 "In a chat, show the nickname at the beginning of a line only when it's not "
-"the same person talking than in previous message."
+"the same person talking as in the previous message."
 msgstr ""
 
-#: gajim/common/config.py:253
+#: gajim/common/config.py:251
 msgid "Indentation when using merge consecutive nickname."
 msgstr ""
 
+#: gajim/common/config.py:252
+msgid ""
+"Ctrl+Tab switches to the next composing tab when there are no tabs with "
+"messages pending."
+msgstr ""
+
+#: gajim/common/config.py:253
+msgid ""
+"Show a confirmation dialog to create metacontacts? Empty string means never "
+"show the dialog."
+msgstr ""
+
 #: gajim/common/config.py:254
-msgid "Ctrl-Tab go to next composing tab when none is unread."
+msgid ""
+"Show a confirmation dialog to block a contact? Empty string means never show "
+"the dialog."
 msgstr ""
 
 #: gajim/common/config.py:255
 msgid ""
-"Show the confirm metacontacts creation dialog or not? Empty string means "
-"never show the dialog."
+"Show a confirmation dialog for a custom status? Empty string means never "
+"show the dialog."
 msgstr ""
 
 #: gajim/common/config.py:256
 msgid ""
-"Show the confirm block contact dialog or not? Empty string means never show "
-"the dialog."
+"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:257
 msgid ""
-"Show the confirm custom status dialog or not? Empty string means never show "
-"the dialog."
+"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:258
 msgid ""
-"If true, you will be able to set a negative priority to your account in "
-"account modification window. BE CAREFUL, when you are logged in with a "
-"negative priority, you will NOT receive any message from your server."
+"Can be empty, 'chat' or 'normal'. If not empty, all incoming messages are "
+"treated as if they were of this type."
 msgstr ""
 
 #: gajim/common/config.py:259
 msgid ""
-"If true, Gajim will show number of online and total contacts in account and "
-"group rows."
+"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:260
-msgid ""
-"Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
-"as if they were of this type"
+msgid "Time of inactivity needed before the change status window closes down."
 msgstr ""
 
 #: gajim/common/config.py:261
 msgid ""
-"If true, Gajim will scroll and select the contact who sent you the last "
-"message, if chat window is not already opened."
+"Maximum number of lines that are printed in conversations. Oldest lines are "
+"cleared."
 msgstr ""
 
 #: gajim/common/config.py:262
-msgid "Time of inactivity needed before the change status window closes down."
+msgid ""
+"If enabled, notification windows from notification-daemon will be attached "
+"to the notification area icon."
 msgstr ""
 
 #: gajim/common/config.py:263
-msgid ""
-"Maximum number of lines that are printed in conversations. Oldest lines are "
-"cleared."
+msgid "Choose interval between 2 checks of idleness."
 msgstr ""
 
 #: gajim/common/config.py:264
 msgid ""
-"If true, notification windows from notification-daemon will be attached to "
-"notification icon."
+"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:265
-msgid "Choose interval between 2 checks of idleness."
+msgid ""
+"If enabled, completion in group chats will be like a shell auto-completion."
 msgstr ""
 
-#: gajim/common/config.py:266
-msgid ""
-"Valid uri schemes. Only schemes in this list will be accepted as \"real\" "
-"uri. (mailto and xmpp are handled separately)"
+#: gajim/common/config.py:270
+msgid "Optionally fix Jingle output video framerate. Example: 10/1 or 25/2."
 msgstr ""
 
-#: gajim/common/config.py:267
-msgid "If true, completion in groupchats will be like a shell auto-completion"
+#: gajim/common/config.py:271
+msgid "Optionally resize Jingle output video. Example: 320x240."
 msgstr ""
 
 #: gajim/common/config.py:272
-msgid "Optionally fix jingle output video framerate. Example: 10/1 or 25/2"
+msgid "If enabled, you will see your webcam's video stream as well."
 msgstr ""
 
-#: gajim/common/config.py:273
-msgid "Optionally resize jingle output video. Example: 320x240"
+#: gajim/common/config.py:275
+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:274
-msgid "If true, You will also see your webcam"
+#: gajim/common/config.py:276
+msgid "STUN server to use when using Jingle"
 msgstr ""
 
 #: gajim/common/config.py:277
 msgid ""
-"If true, Gajim will try to use a STUN server when using Jingle. The one in "
-"\"stun_server\" option, or the one given by the XMPP server."
+"If enabled, Gajim will show affiliation of group chat participants by adding "
+"a colored square to the status icon."
 msgstr ""
 
 #: gajim/common/config.py:278
-msgid "STUN server to use when using Jingle"
+msgid ""
+"Proxy used for all outgoing connections if the account does not have a "
+"specific proxy configured."
 msgstr ""
 
 #: gajim/common/config.py:279
-msgid ""
-"If true, Gajim will show affiliation of groupchat occupants by adding a "
-"colored square to the status icon"
+msgid "If enabled, Gajim will ignore incoming attention requests ('wizz')."
 msgstr ""
 
 #: gajim/common/config.py:280
 msgid ""
-"Proxy used for all outgoing connections if the account does not have a "
-"specific proxy configured"
+"If enabled, Gajim will reopen chat windows that were opened last time Gajim "
+"was closed."
 msgstr ""
 
 #: gajim/common/config.py:281
-msgid "If true, Gajim will ignore incoming attention requests (\"wizz\")."
+msgid ""
+"If enabled, Gajim will display an icon to show that sent messages have been "
+"received by your contact."
 msgstr ""
 
 #: gajim/common/config.py:282
-msgid ""
-"If enabled, Gajim will reopen chat windows that were opened last time Gajim "
-"was closed."
+msgid "Show a mini avatar in chat window tabs and as the window's icon."
 msgstr ""
 
 #: gajim/common/config.py:283
 msgid ""
-"If enabled, Gajim will show an icon to show that sent message has been "
-"received by your contact"
+"If enabled, Gajim will use the System's Keyring to store account passwords."
 msgstr ""
 
 #: gajim/common/config.py:284
-msgid "Show a mini avatar in chat window tabs and in window icon"
+msgid "If enabled, Gajim will execute XEP-0146 Commands."
 msgstr ""
 
 #: gajim/common/config.py:285
-msgid "If true, Gajim will use the Systems Keyring to store account passwords."
+msgid "2: System, 1: Enabled, 0: Disabled"
 msgstr ""
 
 #: gajim/common/config.py:286
-msgid "If true, Gajim will execute XEP-0146 Commands."
+msgid "Options in days which can be chosen in the sync threshold menu"
 msgstr ""
 
 #: gajim/common/config.py:287
-msgid "2: System, 1: Enabled, 0: Disabled"
+msgid ""
+"Maximum history in days we request from a public group chat archive. 0: As "
+"much as possible."
 msgstr ""
 
 #: gajim/common/config.py:288
-msgid "Options in days which can be chosen in the sync threshold menu"
+msgid ""
+"Maximum history in days we request from a private group chat archive. 0: As "
+"much as possible."
 msgstr ""
 
 #: gajim/common/config.py:289
 msgid ""
-"Maximum history in days we request from a public room archive. 0: As much as "
-"possible"
+"If enabled, Gajim shows the group chat subject in the chat window when "
+"joining."
 msgstr ""
 
 #: gajim/common/config.py:290
+#, fuzzy
 msgid ""
-"Maximum history in days we request from a private room archive. 0: As much "
-"as possible"
+"If enabled, the contact row is colored according to the current chat state "
+"of the contact."
 msgstr ""
+"Αν επιλεγεί, το Gajim θα σας συνδέει αυτόματα σε αυτό το δωμάτιο κατά την "
+"εκκίνηση"
 
 #: gajim/common/config.py:291
-msgid "If the room subject is shown in chat on join"
+#, fuzzy
+msgid ""
+"If enabled, the tab is colored according to the current chat state of the "
+"contact."
 msgstr ""
+"Αν επιλεγεί, το Gajim θα σας συνδέει αυτόματα σε αυτό το δωμάτιο κατά την "
+"εκκίνηση"
 
 #: gajim/common/config.py:292
+#, fuzzy
 msgid ""
-"If the contact row is colored according to the current chatstate of the "
-"contact"
+"Shows a text in the banner that describes the current chat state of the "
+"contact."
 msgstr ""
+"Αν επιλεγεί, το Gajim θα σας συνδέει αυτόματα σε αυτό το δωμάτιο κατά την "
+"εκκίνηση"
 
 #: gajim/common/config.py:293
-msgid "If the tab is colored according to the current chatstate of the contact"
-msgstr ""
-
-#: gajim/common/config.py:294
-msgid ""
-"Shows a text in the banner that describes the current chatstate of the "
-"contact"
-msgstr ""
-
-#: gajim/common/config.py:295 gajim/common/config.py:424
 msgid ""
 "Chat state notifications that are sent to contacts. Possible values: all, "
 "composing_only, disabled"
 msgstr ""
 
-#: gajim/common/config.py:296 gajim/common/config.py:438
+#: gajim/common/config.py:294
 msgid ""
 "Chat state notifications that are sent to the group chat. Possible values: "
-"all, composing_only, disabled"
+"'all', 'composing_only', 'disabled'"
 msgstr ""
 
-#: gajim/common/config.py:312
-msgid ""
-"Priority will change automatically according to your status. Priorities are "
-"defined in autopriority_* options."
+#: gajim/common/config.py:297
+msgid "API Preferences. Possible values: 'http', 'iq'"
 msgstr ""
 
-#: gajim/common/config.py:320
+#: gajim/common/config.py:313
 msgid ""
-"Status used to autoconnect as. Can be online, chat, away, xa, dnd, "
-"invisible. NOTE: this option is used only if restore_last_status is disabled"
+"Priority will change automatically according to your status. Priorities are "
+"defined in 'autopriority_*' options."
 msgstr ""
 
 #: gajim/common/config.py:321
-msgid "If enabled, restore the last status that was used."
+msgid ""
+"Status to be used automatically when connecting. Can be 'online', 'chat', "
+"'away', 'xa', 'dnd' or 'invisible'. NOTE: This option is used only if "
+"'restore_last_status' is disabled."
 msgstr ""
 
 #: gajim/common/config.py:322
-msgid ""
-"If true, Contacts requesting authorization will be automatically accepted."
+msgid "If enabled, the last status will be restored."
 msgstr ""
 
 #: gajim/common/config.py:323
+msgid ""
+"If enabled, Contacts requesting authorization will be accepted automatically."
+msgstr ""
+
+#: gajim/common/config.py:324
 #, fuzzy
 msgid ""
-"If False, this account will be disabled and will not appear in roster window."
+"If disabled, this account will be disabled and will not appear in the "
+"contact list window."
 msgstr "Αν Ψευδέςν, δε θα εμφανίζεται πλέον το άβαταρ στο παράθυρο κουβέντας"
 
-#: gajim/common/config.py:327
-msgid "Allow plaintext connections"
+#: gajim/common/config.py:328
+msgid "Allow plaintext connections."
 msgstr ""
 
-#: gajim/common/config.py:330
+#: gajim/common/config.py:331
 msgid ""
-"List (space separated) of authentication mechanisms to try. Can contain "
-"ANONYMOUS, EXTERNAL, GSSAPI, SCRAM-SHA-1-PLUS, SCRAM-SHA-1, DIGEST-MD5, "
-"PLAIN, X-MESSENGER-OAUTH2 or XEP-0078"
+"List of authentication mechanisms to try (space separated). Can contain "
+"'ANONYMOUS', 'EXTERNAL', 'GSSAPI', 'SCRAM-SHA-1-PLUS', 'SCRAM-SHA-1', "
+"'DIGEST-MD5', 'PLAIN', 'X-MESSENGER-OAUTH2' or 'XEP-0078'."
 msgstr ""
 
-#: gajim/common/config.py:331
+#: gajim/common/config.py:332
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection. "
-"Can be 'warn', 'connect', 'disconnect'"
+"Can be 'warn', 'connect' or 'disconnect'."
 msgstr ""
 
-#: gajim/common/config.py:332
+#: gajim/common/config.py:333
 msgid "Show a warning dialog before using standard SSL library."
 msgstr ""
 
-#: gajim/common/config.py:333
+#: gajim/common/config.py:334
 msgid ""
 "Show a warning dialog before sending PLAIN password over a plain connection."
 msgstr ""
 
-#: gajim/common/config.py:334
-msgid "Space separated list of ssl errors to ignore."
+#: gajim/common/config.py:335
+msgid "List of SSL errors to ignore (space separated)."
 msgstr ""
 
-#: gajim/common/config.py:340
+#: gajim/common/config.py:341
 msgid ""
-"Space separated list of JIDs for which you do not want to store logs. You "
-"can also add account name to log nothing for this account."
+"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:341
+#: gajim/common/config.py:342
 msgid ""
-"Space separated list of JIDs for which you accept to not log conversations "
-"if he does not want to."
+"List of XMPP Addresses (space separated) for which you accept to not store "
+"chat history if your contact does not want to."
 msgstr ""
 
-#: gajim/common/config.py:343
-msgid "Whitespace sent after inactivity"
+#: gajim/common/config.py:344
+msgid "If enabled, a whitespace is sent after inactivity (keep alive)."
 msgstr ""
 
-#: gajim/common/config.py:344
-msgid "XMPP ping sent after inactivity"
+#: gajim/common/config.py:345
+msgid "If enabled, an XMPP ping is sent after inactivity (ping alive)."
 msgstr ""
 
-#: gajim/common/config.py:348
+#: gajim/common/config.py:349
 msgid ""
-"How many seconds to wait for the answer of ping alive packet before trying "
-"to reconnect?"
+"How many seconds to wait for the answer of a ping alive packet before trying "
+"to reconnect."
 msgstr ""
 
-#: gajim/common/config.py:352
-msgid "Jabberd2 workaround"
+#: gajim/common/config.py:353
+#, fuzzy
+msgid "Jabberd2 workaround."
 msgstr "Ειδική παράκαμψη για το jabberd2"
 
-#: gajim/common/config.py:355
+#: gajim/common/config.py:356
+#, fuzzy
 msgid ""
-"If checked, Gajim will use your IP and proxies defined in "
-"file_transfer_proxies option for file transfer."
+"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/common/config.py:356
+#: gajim/common/config.py:357
 msgid ""
-"If true, Gajim will test file transfer proxies on startup to be sure it "
-"works. Openfire's proxies are known to fail this test even if they work."
+"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:369
-msgid "Answer to receipt requests"
+#: gajim/common/config.py:370
+msgid "If enabled, Gajim will answer to message receipt requests."
 msgstr ""
 
-#: gajim/common/config.py:370
-msgid "Sent receipt requests"
+#: gajim/common/config.py:371
+msgid "If enabled, Gajim will send message receipt requests."
 msgstr ""
 
-#: gajim/common/config.py:379
+#: gajim/common/config.py:380
 #, fuzzy
 msgid ""
 "Allow Gajim to send information about the operating system you are running."
@@ -3887,182 +3883,191 @@ msgstr ""
 "Αν επιλεγεί, το Gajim θα σας συνδέει αυτόματα σε αυτό το δωμάτιο κατά την "
 "εκκίνηση"
 
-#: gajim/common/config.py:380
+#: gajim/common/config.py:381
 #, fuzzy
 msgid "Allow Gajim to send your local time."
 msgstr "O/Η %s επιθυμεί να σας στείλει ένα αρχείο."
 
-#: gajim/common/config.py:383
+#: gajim/common/config.py:384
 #, fuzzy
-msgid "Message that is sent to contacts you want to add"
+msgid "Message that is sent to contacts you want to add."
 msgstr "Παρακαλώ συμπληρώστε τα στοιχεία της επαφής που θέλετε να προσθέσετε"
 
-#: gajim/common/config.py:384
-msgid ""
-"If enabled, Gajim will send your local IPs so your contact can connect to "
-"your machine to transfer files."
-msgstr ""
-
 #: gajim/common/config.py:385
+#, fuzzy
 msgid ""
-"Space separated list of JIDs for which chat window will be re-opened on next "
-"startup."
+"If enabled, Gajim will send your local IP so your contact can connect to "
+"your machine for file transfers."
 msgstr ""
+"Αν ενεργοποιηθεί, το Gajim θα χρησιμοποιήσει την IP και τους ενδιάμεσους "
+"διακομιστές που ορίστηκαν στην επιλογή file_transfer_proxies για τη μεταφορά "
+"αρχείων."
 
-#: gajim/common/config.py:387
-msgid "HTTP Upload: Enable HTTPS Verification"
+#: gajim/common/config.py:386
+msgid ""
+"List of XMPP Addresses (space separated) for which the chat window will be "
+"re-opened on next startup."
 msgstr ""
 
 #: gajim/common/config.py:388
-msgid ""
-"Preferred file transfer mechanism for file drag&drop on chat window. Can be "
-"'httpupload' (default) or 'jingle'"
+msgid "HTTP File Upload: Enable HTTPS Verification."
 msgstr ""
 
 #: gajim/common/config.py:389
-msgid "Allow cert verification with POSH"
-msgstr ""
-
-#: gajim/common/config.py:423 gajim/common/config.py:430
-msgid "Language for which misspelled words will be checked"
+msgid ""
+"Preferred file transfer mechanism for file drag&drop on a chat window. Can "
+"be 'httpupload' (default) or 'jingle'."
 msgstr ""
 
-#: gajim/common/config.py:427
-msgid "The currently active encryption for that contact"
-msgstr ""
+#: gajim/common/config.py:390
+#, fuzzy
+msgid "Allow certificate verification with POSH."
+msgstr "Προσθήκη ειδικής ειδοποίησης για το %s"
 
-#: gajim/common/config.py:431
+#: gajim/common/config.py:425
 msgid ""
-"How many lines to request from server when entering a groupchat. -1 means no "
-"limit, -2 means global value"
+"Chat state notifications that are sent to contacts. Possible values: 'all', "
+"'composing_only', 'disabled'"
 msgstr ""
 
+#: gajim/common/config.py:428
+#, fuzzy
+msgid "The currently active encryption for that contact."
+msgstr "Το OpenPGP δεν είναι διαθέσιμο σε αυτόν τον Η/Υ"
+
 #: gajim/common/config.py:432
 msgid ""
-"Minutes of backlog to request when entering a groupchat. -1 means no limit, "
-"-2 means global value"
+"If enabled, a notification is created for every message in this group chat."
 msgstr ""
 
 #: gajim/common/config.py:433
-msgid "State whether a notification is created for every message in this room"
-msgstr ""
-
-#: gajim/common/config.py:434
+#, fuzzy
 msgid ""
-"Show a status message for all status (away, dnd, etc.) changes of users in a "
-"group chat"
-msgstr ""
+"Show a status message for all status changes (away, dnd, etc.) of users in a "
+"group chat."
+msgstr "Δεν ήταν δυνατή η σύνδεση στην ομαδική συζήτηση"
 
-#: gajim/common/config.py:435
+#: gajim/common/config.py:434
 #, fuzzy
-msgid "Show a status message for every join or leave in a group chat"
+msgid "Show a status message for every join or leave in a group chat."
 msgstr "Δεν ήταν δυνατή η σύνδεση στην ομαδική συζήτηση"
 
+#: gajim/common/config.py:435
+msgid ""
+"If enabled, the group chat is minimized into the contact list when joining "
+"automatically."
+msgstr ""
+
 #: gajim/common/config.py:436
-msgid "If the group chat is minimized into the roster on autojoin"
+msgid ""
+"If enabled, the group chat is minimized into the contact list when closing "
+"it."
 msgstr ""
 
 #: gajim/common/config.py:437
-msgid "If the group chat is minimized into the roster on close"
+msgid ""
+"Chat state notifications that are sent to the group chat. Possible values: "
+"'all', 'composing_only' or 'disabled'."
 msgstr ""
 
-#: gajim/common/config.py:441
+#: gajim/common/config.py:440
 msgid ""
-"State whether plugins should be activated on startup (this is saved on Gajim "
-"exit). This option SHOULD NOT be used to (de)activate plug-ins. Use GUI "
-"instead."
+"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:446 gajim/common/const.py:281
+#: gajim/common/config.py:445 gajim/common/const.py:315
 msgid "Sleeping"
 msgstr "Κοιμάμαι"
 
-#: gajim/common/config.py:447
+#: gajim/common/config.py:446
 msgid "Back soon"
 msgstr "Πίσω σύντομα"
 
-#: gajim/common/config.py:447
+#: gajim/common/config.py:446
 msgid "Back in some minutes."
 msgstr "Πίσω σε λίγα λεπτά."
 
-#: gajim/common/config.py:448 gajim/common/const.py:247
+#: gajim/common/config.py:447 gajim/common/const.py:281
 msgid "Eating"
 msgstr "Τρώω"
 
-#: gajim/common/config.py:448
-msgid "I'm eating, so leave me a message."
-msgstr "Τώρα τρώω, οπότε αφήστε μήνυμα."
+#: gajim/common/config.py:447
+#, fuzzy
+msgid "I'm eating."
+msgstr "Δουλεύω."
 
-#: gajim/common/config.py:449
+#: gajim/common/config.py:448
 msgid "Movie"
 msgstr "Ταινία"
 
-#: gajim/common/config.py:449
+#: gajim/common/config.py:448
 msgid "I'm watching a movie."
 msgstr "Βλέπω μια ταινία."
 
-#: gajim/common/config.py:450 gajim/common/const.py:314
+#: gajim/common/config.py:449 gajim/common/const.py:348
 msgid "Working"
 msgstr "Δουλειά"
 
-#: gajim/common/config.py:450
+#: gajim/common/config.py:449
 msgid "I'm working."
 msgstr "Δουλεύω."
 
-#: gajim/common/config.py:451
+#: gajim/common/config.py:450
 msgid "Phone"
 msgstr "Τηλέφωνο"
 
-#: gajim/common/config.py:451
+#: gajim/common/config.py:450
 msgid "I'm on the phone."
 msgstr "Είμαι στο τηλέφωνο."
 
-#: gajim/common/config.py:452
+#: gajim/common/config.py:451
 msgid "Out"
 msgstr "Έξω"
 
-#: gajim/common/config.py:452
+#: gajim/common/config.py:451
 msgid "I'm out enjoying life."
 msgstr "Είμαι έξω απολαμβάνοντας την πραγματική ζωή."
 
-#: gajim/common/config.py:463
+#: gajim/common/config.py:462
 msgid "I'm available."
 msgstr "Είμαι διαθέσιμος."
 
-#: gajim/common/config.py:464
+#: gajim/common/config.py:463
 msgid "I'm free for chat."
 msgstr "Είμαι ελεύθερος για κουβέντα."
 
-#: gajim/common/config.py:465 gajim/gtk/accounts.py:134
+#: gajim/common/config.py:464 gajim/gtk/accounts.py:133
 msgid "Be right back."
 msgstr "Επιστρέφω αμέσως."
 
-#: gajim/common/config.py:466
+#: gajim/common/config.py:465
 msgid "I'm not available."
 msgstr "Δεν είμαι διαθέσιμος."
 
-#: gajim/common/config.py:467
+#: gajim/common/config.py:466
 msgid "Do not disturb."
 msgstr "Μην ενοχλείτε."
 
-#: gajim/common/config.py:468 gajim/common/config.py:469
+#: gajim/common/config.py:467 gajim/common/config.py:468
 msgid "Bye!"
 msgstr "Γεια χαρά!"
 
-#: gajim/common/config.py:480
+#: gajim/common/config.py:479
 #, fuzzy
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
-"muc_highlight_words, or when a group chat message contains your nickname."
+"'muc_highlight_words' your nickname is mentioned."
 msgstr ""
 "Ο ήχος που θα παιχθεί όταν ληφθεί ένα μήνυμα MUC που περιέχει κάποια λέξη "
 "από αυτές που έχουν οριστεί στο muc_highlight_words, ή στο ψευδώνυμό σας."
 
-#: gajim/common/config.py:481
-msgid "Sound to play when any MUC message arrives."
+#: gajim/common/config.py:480
+msgid "Sound to play when any group chat message arrives."
 msgstr ""
 
-#: gajim/common/config.py:485
+#: gajim/common/config.py:484
 #, fuzzy
 msgid "Tor"
 msgstr "Προς"
@@ -4072,957 +4077,1053 @@ msgstr "Προς"
 msgid "Error: cannot open %s for reading"
 msgstr "Σφάλμα: το αρχείο %s δε μπορεί να ανοιχθεί για ανάγνωση"
 
-#: gajim/common/const.py:214
+#: gajim/common/const.py:216
+#, fuzzy
+msgid "?Group chat name:Team"
+msgstr "Κανένας"
+
+#: gajim/common/const.py:217
+msgid "?Group chat description:Project discussion"
+msgstr ""
+
+#: gajim/common/const.py:218
+#, fuzzy
+msgid "?Group chat address:team"
+msgstr "Ομαδικές συζητήσεις"
+
+#: gajim/common/const.py:219
+#, fuzzy
+msgid "?Group chat name:Family"
+msgstr "Επισήμανση "
+
+#: gajim/common/const.py:220
+msgid "?Group chat description:Spring gathering"
+msgstr ""
+
+#: gajim/common/const.py:221
+msgid "?Group chat address:family"
+msgstr ""
+
+#: gajim/common/const.py:222
+#, fuzzy
+msgid "?Group chat name:Vacation"
+msgstr "Πρόσκληση ομαδικής κουβέντας"
+
+#: gajim/common/const.py:223
+msgid "?Group chat description:Trip planning"
+msgstr ""
+
+#: gajim/common/const.py:224
+#, fuzzy
+msgid "?Group chat address:vacation"
+msgstr "Πρόσκληση ομαδικής κουβέντας"
+
+#: gajim/common/const.py:225
+#, fuzzy
+msgid "?Group chat name:Repairs"
+msgstr "Ομαδική συζήτηση"
+
+#: gajim/common/const.py:226
+msgid "?Group chat description:Local help group"
+msgstr ""
+
+#: gajim/common/const.py:227
+#, fuzzy
+msgid "?Group chat address:repairs"
+msgstr "Ομαδικές συζητήσεις"
+
+#: gajim/common/const.py:228
+#, fuzzy
+msgid "?Group chat name:News"
+msgstr "Κανένας"
+
+#: gajim/common/const.py:229
+#, fuzzy
+msgid "?Group chat description:Local news and reports"
+msgstr "Δεν επιτρέπεται η δημιουργία ομαδικών συζητήσεων."
+
+#: gajim/common/const.py:230
+#, fuzzy
+msgid "?Group chat address:news"
+msgstr "Αρχηγός ομάδας παραθύρων"
+
+#: gajim/common/const.py:235
+#, fuzzy
+msgid "Remote server not found"
+msgstr "Η υπηρεσία δεν ήταν δυνατό να βρεθεί"
+
+#: gajim/common/const.py:236
+msgid "Remote server timeout"
+msgstr ""
+
+#: gajim/common/const.py:237 gajim/common/const.py:238
+#: gajim/common/const.py:239
+#, fuzzy
+msgid "Address does not belong to a group chat server"
+msgstr "Αυτή η μορφή συμπίεσης δεν υποστηρίζεται:"
+
+#: gajim/common/const.py:240
+#, fuzzy
+msgid "Group chat already exists"
+msgstr "Υπάρχει ήδη τοπικό προφίλ με αυτό το όνομα"
+
+#: gajim/common/const.py:241
+#, fuzzy
+msgid "Group chat does not exist"
+msgstr "Δεν υπάρχει τέτοια συζήτηση."
+
+#: gajim/common/const.py:247
 msgid "This message was encrypted with OTR and could not be decrypted."
 msgstr ""
 
-#: gajim/common/const.py:217
+#: gajim/common/const.py:250
 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:221
+#: gajim/common/const.py:254
 msgid ""
-"This message was encrypted with OpenPGP for XMPP and could not be decrypted."
+"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:224
+#: gajim/common/const.py:258
 #, python-format
 msgid "This message was encrypted with %s and could not be decrypted."
 msgstr ""
 
-#: gajim/common/const.py:231
+#: gajim/common/const.py:265
 #, fuzzy
 msgid "Doing Chores"
 msgstr "Λάθος διακομιστής"
 
-#: gajim/common/const.py:232
+#: gajim/common/const.py:266
 msgid "Buying Groceries"
 msgstr ""
 
-#: gajim/common/const.py:233
+#: gajim/common/const.py:267
 #, fuzzy
 msgid "Cleaning"
 msgstr "Απόγευμα"
 
-#: gajim/common/const.py:234
+#: gajim/common/const.py:268
 #, fuzzy
 msgid "Cooking"
 msgstr "Σύνθεση"
 
-#: gajim/common/const.py:235
+#: gajim/common/const.py:269
 msgid "Doing Maintenance"
 msgstr ""
 
-#: gajim/common/const.py:236
+#: gajim/common/const.py:270
 msgid "Doing the Dishes"
 msgstr ""
 
-#: gajim/common/const.py:237
+#: gajim/common/const.py:271
 msgid "Doing the Laundry"
 msgstr ""
 
-#: gajim/common/const.py:238
+#: gajim/common/const.py:272
 #, fuzzy
 msgid "Gardening"
 msgstr "Πρωί"
 
-#: gajim/common/const.py:239
+#: gajim/common/const.py:273
 msgid "Running an Errand"
 msgstr ""
 
-#: gajim/common/const.py:240
+#: gajim/common/const.py:274
 #, fuzzy
 msgid "Walking the Dog"
 msgstr "όλους στην ομάδα"
 
-#: gajim/common/const.py:242
+#: gajim/common/const.py:276
 #, fuzzy
 msgid "Drinking"
 msgstr "Δουλειά"
 
-#: gajim/common/const.py:243
+#: gajim/common/const.py:277
 msgid "Having a Beer"
 msgstr ""
 
-#: gajim/common/const.py:244
+#: gajim/common/const.py:278
 msgid "Having Coffee"
 msgstr ""
 
-#: gajim/common/const.py:245
+#: gajim/common/const.py:279
 msgid "Having Tea"
 msgstr ""
 
-#: gajim/common/const.py:248
+#: gajim/common/const.py:282
 msgid "Having a Snack"
 msgstr ""
 
-#: gajim/common/const.py:249
+#: gajim/common/const.py:283
 msgid "Having Breakfast"
 msgstr ""
 
-#: gajim/common/const.py:250
+#: gajim/common/const.py:284
 msgid "Having Dinner"
 msgstr ""
 
-#: gajim/common/const.py:251
+#: gajim/common/const.py:285
 msgid "Having Lunch"
 msgstr ""
 
-#: gajim/common/const.py:253
+#: gajim/common/const.py:287
 msgid "Exercising"
 msgstr ""
 
-#: gajim/common/const.py:254 gajim/common/const.py:305
+#: gajim/common/const.py:288 gajim/common/const.py:339
 msgid "Cycling"
 msgstr ""
 
-#: gajim/common/const.py:255
+#: gajim/common/const.py:289
 #, fuzzy
 msgid "Dancing"
 msgstr "Απόγευμα"
 
-#: gajim/common/const.py:256
+#: gajim/common/const.py:290
 #, fuzzy
 msgid "Hiking"
 msgstr "Διώχνοντας τον %s"
 
-#: gajim/common/const.py:257
+#: gajim/common/const.py:291
 #, fuzzy
 msgid "Jogging"
 msgstr "_Συμμετοχή"
 
-#: gajim/common/const.py:258
+#: gajim/common/const.py:292
 msgid "Playing Sports"
 msgstr ""
 
-#: gajim/common/const.py:259
+#: gajim/common/const.py:293
 msgid "Running"
 msgstr ""
 
-#: gajim/common/const.py:260
+#: gajim/common/const.py:294
 #, fuzzy
 msgid "Skiing"
 msgstr "Δουλειά"
 
-#: gajim/common/const.py:261
+#: gajim/common/const.py:295
 msgid "Swimming"
 msgstr ""
 
-#: gajim/common/const.py:262
+#: gajim/common/const.py:296
 #, fuzzy
 msgid "Working out"
 msgstr "Δουλειά"
 
-#: gajim/common/const.py:264
+#: gajim/common/const.py:298
 #, fuzzy
 msgid "Grooming"
 msgstr "Από"
 
-#: gajim/common/const.py:265
+#: gajim/common/const.py:299
 msgid "At the Spa"
 msgstr ""
 
-#: gajim/common/const.py:266
+#: gajim/common/const.py:300
 msgid "Brushing Teeth"
 msgstr ""
 
-#: gajim/common/const.py:267
+#: gajim/common/const.py:301
 msgid "Getting a Haircut"
 msgstr ""
 
-#: gajim/common/const.py:268
+#: gajim/common/const.py:302
 #, fuzzy
 msgid "Shaving"
 msgstr "Τρώω"
 
-#: gajim/common/const.py:269
+#: gajim/common/const.py:303
 msgid "Taking a Bath"
 msgstr ""
 
-#: gajim/common/const.py:270
+#: gajim/common/const.py:304
 msgid "Taking a Shower"
 msgstr ""
 
-#: gajim/common/const.py:272
+#: gajim/common/const.py:306
 msgid "Having an Appointment"
 msgstr ""
 
-#: gajim/common/const.py:274
+#: gajim/common/const.py:308
 msgid "Inactive"
 msgstr "Ανενεργό"
 
-#: gajim/common/const.py:275
+#: gajim/common/const.py:309
 msgid "Day Off"
 msgstr ""
 
-#: gajim/common/const.py:276
+#: gajim/common/const.py:310
 #, fuzzy
 msgid "Hanging out"
 msgstr "Αλλαγή θέματος"
 
-#: gajim/common/const.py:277
+#: gajim/common/const.py:311
 #, fuzzy
 msgid "Hiding"
 msgstr "Διώχνοντας τον %s"
 
-#: gajim/common/const.py:278
+#: gajim/common/const.py:312
 msgid "On Vacation"
 msgstr ""
 
-#: gajim/common/const.py:279
+#: gajim/common/const.py:313
 #, fuzzy
 msgid "Praying"
 msgstr "Τρώω"
 
-#: gajim/common/const.py:280
+#: gajim/common/const.py:314
 msgid "Scheduled Holiday"
 msgstr ""
 
-#: gajim/common/const.py:282
+#: gajim/common/const.py:316
 #, fuzzy
 msgid "Thinking"
 msgstr "Δουλειά"
 
-#: gajim/common/const.py:284
+#: gajim/common/const.py:318
 #, fuzzy
 msgid "Relaxing"
 msgstr "λιτό"
 
-#: gajim/common/const.py:285
+#: gajim/common/const.py:319
 #, fuzzy
 msgid "Fishing"
 msgstr "Διώχνοντας τον %s"
 
-#: gajim/common/const.py:286
+#: gajim/common/const.py:320
 #, fuzzy
 msgid "Gaming"
 msgstr "Τρώω"
 
-#: gajim/common/const.py:287
+#: gajim/common/const.py:321
 #, fuzzy
 msgid "Going out"
 msgstr "Αποσ_ύνδεση"
 
-#: gajim/common/const.py:288
+#: gajim/common/const.py:322
 #, fuzzy
 msgid "Partying"
 msgstr "Τρώω"
 
-#: gajim/common/const.py:289
+#: gajim/common/const.py:323
 #, fuzzy
 msgid "Reading"
 msgstr "Αιτία"
 
-#: gajim/common/const.py:290
+#: gajim/common/const.py:324
 #, fuzzy
 msgid "Rehearsing"
 msgstr "Αιτία"
 
-#: gajim/common/const.py:291
+#: gajim/common/const.py:325
 #, fuzzy
 msgid "Shopping"
 msgstr "Κοιμάμαι"
 
-#: gajim/common/const.py:292
+#: gajim/common/const.py:326
 #, fuzzy
 msgid "Smoking"
 msgstr "Δουλειά"
 
-#: gajim/common/const.py:293
+#: gajim/common/const.py:327
 msgid "Socializing"
 msgstr ""
 
-#: gajim/common/const.py:294
+#: gajim/common/const.py:328
 #, fuzzy
 msgid "Sunbathing"
 msgstr "Τρώω"
 
-#: gajim/common/const.py:295
+#: gajim/common/const.py:329
 msgid "Watching TV"
 msgstr ""
 
-#: gajim/common/const.py:296
+#: gajim/common/const.py:330
 #, fuzzy
 msgid "Watching a Movie"
 msgstr "Βλέπω μια ταινία."
 
-#: gajim/common/const.py:298
+#: gajim/common/const.py:332
 #, fuzzy
 msgid "Talking"
 msgstr "Τρώω"
 
-#: gajim/common/const.py:299
+#: gajim/common/const.py:333
 msgid "In Real Life"
 msgstr ""
 
-#: gajim/common/const.py:300
+#: gajim/common/const.py:334
 #, fuzzy
 msgid "On the Phone"
 msgstr "Είμαι στο τηλέφωνο."
 
-#: gajim/common/const.py:301
+#: gajim/common/const.py:335
 msgid "On Video Phone"
 msgstr ""
 
-#: gajim/common/const.py:303
+#: gajim/common/const.py:337
 #, fuzzy
 msgid "Traveling"
 msgstr "Μεταφέρεται"
 
-#: gajim/common/const.py:304
+#: gajim/common/const.py:338
 #, fuzzy
 msgid "Commuting"
 msgstr "Σύνθεση"
 
-#: gajim/common/const.py:306
+#: gajim/common/const.py:340
 msgid "Driving"
 msgstr ""
 
-#: gajim/common/const.py:307
+#: gajim/common/const.py:341
 msgid "In a Car"
 msgstr ""
 
-#: gajim/common/const.py:308
+#: gajim/common/const.py:342
 msgid "On a Bus"
 msgstr ""
 
-#: gajim/common/const.py:309
+#: gajim/common/const.py:343
 #, fuzzy
 msgid "On a Plane"
 msgstr "Συνδεδεμένος"
 
-#: gajim/common/const.py:310
+#: gajim/common/const.py:344
 #, fuzzy
 msgid "On a Train"
 msgstr "Το άνοιγμα του συνδέσμου απέτυχε"
 
-#: gajim/common/const.py:311
+#: gajim/common/const.py:345
 msgid "On a Trip"
 msgstr ""
 
-#: gajim/common/const.py:312
+#: gajim/common/const.py:346
 #, fuzzy
 msgid "Walking"
 msgstr "Δουλειά"
 
-#: gajim/common/const.py:315
+#: gajim/common/const.py:349
 #, fuzzy
 msgid "Coding"
 msgstr "Σύνθεση"
 
-#: gajim/common/const.py:316
+#: gajim/common/const.py:350
 msgid "In a Meeting"
 msgstr ""
 
-#: gajim/common/const.py:317
+#: gajim/common/const.py:351
 msgid "Studying"
 msgstr ""
 
-#: gajim/common/const.py:318
+#: gajim/common/const.py:352
 #, fuzzy
 msgid "Writing"
 msgstr "Δουλειά"
 
-#: gajim/common/const.py:321
+#: gajim/common/const.py:355
 msgid "Afraid"
 msgstr ""
 
-#: gajim/common/const.py:322
+#: gajim/common/const.py:356
 msgid "Amazed"
 msgstr ""
 
-#: gajim/common/const.py:323
+#: gajim/common/const.py:357
 msgid "Amorous"
 msgstr ""
 
-#: gajim/common/const.py:324
+#: gajim/common/const.py:358
 msgid "Angry"
 msgstr ""
 
-#: gajim/common/const.py:325
+#: gajim/common/const.py:359
 msgid "Annoyed"
 msgstr ""
 
-#: gajim/common/const.py:326
+#: gajim/common/const.py:360
 msgid "Anxious"
 msgstr ""
 
-#: gajim/common/const.py:327
+#: gajim/common/const.py:361
 #, fuzzy
 msgid "Aroused"
 msgstr "Παύση"
 
-#: gajim/common/const.py:328
+#: gajim/common/const.py:362
 msgid "Ashamed"
 msgstr ""
 
-#: gajim/common/const.py:329
+#: gajim/common/const.py:363
 #, fuzzy
 msgid "Bored"
 msgstr "Έντονα"
 
-#: gajim/common/const.py:330
+#: gajim/common/const.py:364
 #, fuzzy
 msgid "Brave"
 msgstr "Έχει"
 
-#: gajim/common/const.py:331
+#: gajim/common/const.py:365
 msgid "Calm"
 msgstr ""
 
-#: gajim/common/const.py:332
+#: gajim/common/const.py:366
 #, fuzzy
 msgid "Cautious"
 msgstr "Συζητήσεις"
 
-#: gajim/common/const.py:333
+#: gajim/common/const.py:367
 #, fuzzy
 msgid "Cold"
 msgstr "Έντονα"
 
-#: gajim/common/const.py:334
+#: gajim/common/const.py:368
 #, fuzzy
 msgid "Confident"
 msgstr "_Περιεχόμενα"
 
-#: gajim/common/const.py:335
+#: gajim/common/const.py:369
 msgid "Confused"
 msgstr ""
 
-#: gajim/common/const.py:336
+#: gajim/common/const.py:370
 #, fuzzy
 msgid "Contemplative"
 msgstr "Ολοκληρώθηκε"
 
-#: gajim/common/const.py:337
+#: gajim/common/const.py:371
 #, fuzzy
 msgid "Contented"
 msgstr "_Περιεχόμενα"
 
-#: gajim/common/const.py:338
+#: gajim/common/const.py:372
 msgid "Cranky"
 msgstr ""
 
-#: gajim/common/const.py:339
+#: gajim/common/const.py:373
 msgid "Crazy"
 msgstr ""
 
-#: gajim/common/const.py:340
+#: gajim/common/const.py:374
 #, fuzzy
 msgid "Creative"
 msgstr "Ανενεργό"
 
-#: gajim/common/const.py:341
+#: gajim/common/const.py:375
 #, fuzzy
 msgid "Curious"
 msgstr "_Πίσω"
 
-#: gajim/common/const.py:342
+#: gajim/common/const.py:376
 #, fuzzy
 msgid "Dejected"
 msgstr "Διαγραφή"
 
-#: gajim/common/const.py:343
+#: gajim/common/const.py:377
 msgid "Depressed"
 msgstr ""
 
-#: gajim/common/const.py:344
+#: gajim/common/const.py:378
 #, fuzzy
 msgid "Disappointed"
 msgstr "Απενεργοποιημένο"
 
-#: gajim/common/const.py:345
+#: gajim/common/const.py:379
 msgid "Disgusted"
 msgstr ""
 
-#: gajim/common/const.py:346
+#: gajim/common/const.py:380
 #, fuzzy
 msgid "Dismayed"
 msgstr "Απενεργοποιημένο"
 
-#: gajim/common/const.py:347
+#: gajim/common/const.py:381
 #, fuzzy
 msgid "Distracted"
 msgstr "Απενεργοποιημένο"
 
-#: gajim/common/const.py:348
+#: gajim/common/const.py:382
 msgid "Embarrassed"
 msgstr ""
 
-#: gajim/common/const.py:349
+#: gajim/common/const.py:383
 #, fuzzy
 msgid "Envious"
 msgstr "_Πίσω"
 
-#: gajim/common/const.py:350
+#: gajim/common/const.py:384
 #, fuzzy
 msgid "Excited"
 msgstr "Ενεργό"
 
-#: gajim/common/const.py:351
+#: gajim/common/const.py:385
 msgid "Flirtatious"
 msgstr ""
 
-#: gajim/common/const.py:352
+#: gajim/common/const.py:386
 msgid "Frustrated"
 msgstr ""
 
-#: gajim/common/const.py:353
+#: gajim/common/const.py:387
 msgid "Grateful"
 msgstr ""
 
-#: gajim/common/const.py:354
+#: gajim/common/const.py:388
 msgid "Grieving"
 msgstr ""
 
-#: gajim/common/const.py:355
+#: gajim/common/const.py:389
 #, fuzzy
 msgid "Grumpy"
 msgstr "Ομάδα"
 
-#: gajim/common/const.py:356
+#: gajim/common/const.py:390
 msgid "Guilty"
 msgstr ""
 
-#: gajim/common/const.py:357
+#: gajim/common/const.py:391
 msgid "Happy"
 msgstr ""
 
-#: gajim/common/const.py:358
+#: gajim/common/const.py:392
 msgid "Hopeful"
 msgstr ""
 
-#: gajim/common/const.py:359
+#: gajim/common/const.py:393
 #, fuzzy
 msgid "Hot"
 msgstr "Ε_ξυπηρετητής:"
 
-#: gajim/common/const.py:360
+#: gajim/common/const.py:394
 msgid "Humbled"
 msgstr ""
 
-#: gajim/common/const.py:361
+#: gajim/common/const.py:395
 msgid "Humiliated"
 msgstr ""
 
-#: gajim/common/const.py:362
+#: gajim/common/const.py:396
 msgid "Hungry"
 msgstr ""
 
-#: gajim/common/const.py:363
+#: gajim/common/const.py:397
 msgid "Hurt"
 msgstr ""
 
-#: gajim/common/const.py:364
+#: gajim/common/const.py:398
 #, fuzzy
 msgid "Impressed"
 msgstr "μήνυμα"
 
-#: gajim/common/const.py:365
+#: gajim/common/const.py:399
 msgid "In Awe"
 msgstr ""
 
-#: gajim/common/const.py:366
+#: gajim/common/const.py:400
 msgid "In Love"
 msgstr ""
 
-#: gajim/common/const.py:367
+#: gajim/common/const.py:401
 msgid "Indignant"
 msgstr ""
 
-#: gajim/common/const.py:368
+#: gajim/common/const.py:402
 msgid "Interested"
 msgstr ""
 
-#: gajim/common/const.py:369
+#: gajim/common/const.py:403
 #, fuzzy
 msgid "Intoxicated"
 msgstr "Ενεργό"
 
-#: gajim/common/const.py:370
+#: gajim/common/const.py:404
 #, fuzzy
 msgid "Invincible"
 msgstr "Αφανής"
 
-#: gajim/common/const.py:371
+#: gajim/common/const.py:405
 msgid "Jealous"
 msgstr ""
 
-#: gajim/common/const.py:372
+#: gajim/common/const.py:406
 #, fuzzy
 msgid "Lonely"
 msgstr "ένα"
 
-#: gajim/common/const.py:373
+#: gajim/common/const.py:407
 #, fuzzy
 msgid "Lost"
 msgstr "Ε_ξυπηρετητής:"
 
-#: gajim/common/const.py:374
+#: gajim/common/const.py:408
 msgid "Lucky"
 msgstr ""
 
-#: gajim/common/const.py:375
+#: gajim/common/const.py:409
 #, fuzzy
 msgid "Mean"
 msgstr "Γερμανικά"
 
-#: gajim/common/const.py:376
+#: gajim/common/const.py:410
 #, fuzzy
 msgid "Moody"
 msgstr "_Τροποποίηση"
 
-#: gajim/common/const.py:377
+#: gajim/common/const.py:411
 #, fuzzy
 msgid "Nervous"
 msgstr "_Πίσω"
 
-#: gajim/common/const.py:378
+#: gajim/common/const.py:412
 msgid "Neutral"
 msgstr ""
 
-#: gajim/common/const.py:379
+#: gajim/common/const.py:413
 #, fuzzy
 msgid "Offended"
 msgstr "Αποσυνδεδεμένος"
 
-#: gajim/common/const.py:380
+#: gajim/common/const.py:414
 msgid "Outraged"
 msgstr ""
 
-#: gajim/common/const.py:381
+#: gajim/common/const.py:415
 msgid "Playful"
 msgstr ""
 
-#: gajim/common/const.py:382
+#: gajim/common/const.py:416
 #, fuzzy
 msgid "Proud"
 msgstr "Ομάδα"
 
-#: gajim/common/const.py:383
+#: gajim/common/const.py:417
 msgid "Relaxed"
 msgstr ""
 
-#: gajim/common/const.py:384
+#: gajim/common/const.py:418
 #, fuzzy
 msgid "Relieved"
 msgstr "έντεκα"
 
-#: gajim/common/const.py:385
+#: gajim/common/const.py:419
 msgid "Remorseful"
 msgstr ""
 
-#: gajim/common/const.py:386
+#: gajim/common/const.py:420
 msgid "Restless"
 msgstr ""
 
-#: gajim/common/const.py:387
+#: gajim/common/const.py:421
 #, fuzzy
 msgid "Sad"
 msgstr "Πάγωσε"
 
-#: gajim/common/const.py:388
+#: gajim/common/const.py:422
 msgid "Sarcastic"
 msgstr ""
 
-#: gajim/common/const.py:389
+#: gajim/common/const.py:423
 #, fuzzy
 msgid "Satisfied"
 msgstr "Τελευταία τροποποίηση:"
 
-#: gajim/common/const.py:390
+#: gajim/common/const.py:424
 #, fuzzy
 msgid "Serious"
 msgstr "_Πίσω"
 
-#: gajim/common/const.py:391
+#: gajim/common/const.py:425
 msgid "Shocked"
 msgstr ""
 
-#: gajim/common/const.py:392
+#: gajim/common/const.py:426
 msgid "Shy"
 msgstr ""
 
-#: gajim/common/const.py:393
+#: gajim/common/const.py:427
 #, fuzzy
 msgid "Sick"
 msgstr "Ψευδώνυμο"
 
-#: gajim/common/const.py:394
+#: gajim/common/const.py:428
 #, fuzzy
 msgid "Sleepy"
 msgstr "Κοιμάμαι"
 
-#: gajim/common/const.py:395
+#: gajim/common/const.py:429
 msgid "Spontaneous"
 msgstr ""
 
-#: gajim/common/const.py:396
+#: gajim/common/const.py:430
 #, fuzzy
 msgid "Stressed"
 msgstr "Οδός:"
 
-#: gajim/common/const.py:397
+#: gajim/common/const.py:431
 msgid "Strong"
 msgstr ""
 
-#: gajim/common/const.py:398
+#: gajim/common/const.py:432
 #, fuzzy
 msgid "Surprised"
 msgstr "Εγγεγραμμένος"
 
-#: gajim/common/const.py:399
+#: gajim/common/const.py:433
 msgid "Thankful"
 msgstr ""
 
-#: gajim/common/const.py:400
+#: gajim/common/const.py:434
 msgid "Thirsty"
 msgstr ""
 
-#: gajim/common/const.py:401
+#: gajim/common/const.py:435
 #, fuzzy
 msgid "Tired"
 msgstr "Χρόνος"
 
-#: gajim/common/const.py:402
+#: gajim/common/const.py:436
 #, fuzzy
 msgid "Undefined"
 msgstr "Υπογράμμιση"
 
-#: gajim/common/const.py:403
+#: gajim/common/const.py:437
 msgid "Weak"
 msgstr ""
 
-#: gajim/common/const.py:404
+#: gajim/common/const.py:438
 msgid "Worried"
 msgstr ""
 
-#: gajim/common/const.py:408
+#: gajim/common/const.py:442
 msgid "accuracy"
 msgstr ""
 
-#: gajim/common/const.py:409
+#: gajim/common/const.py:443
 #, fuzzy
 msgid "alt"
 msgstr "Προεπιλογή"
 
-#: gajim/common/const.py:410
+#: gajim/common/const.py:444
 msgid "area"
 msgstr ""
 
-#: gajim/common/const.py:411
+#: gajim/common/const.py:445
 #, fuzzy
 msgid "bearing"
 msgstr "θαλασσί"
 
-#: gajim/common/const.py:412
+#: gajim/common/const.py:446
 #, fuzzy
 msgid "building"
 msgstr "Διώχνοντας τον %s"
 
-#: gajim/common/const.py:413
+#: gajim/common/const.py:447
 #, fuzzy
 msgid "country"
 msgstr "Χώρα:"
 
-#: gajim/common/const.py:414
+#: gajim/common/const.py:448
 #, fuzzy
 msgid "countrycode"
 msgstr "Λογαριασμός"
 
-#: gajim/common/const.py:415
+#: gajim/common/const.py:449
 msgid "datum"
 msgstr ""
 
-#: gajim/common/const.py:416
+#: gajim/common/const.py:450
 #, fuzzy
 msgid "description"
 msgstr "Περιγραφή"
 
-#: gajim/common/const.py:417
+#: gajim/common/const.py:451
 #, fuzzy
 msgid "error"
 msgstr "Σφάλμα:"
 
-#: gajim/common/const.py:418
+#: gajim/common/const.py:452
 msgid "floor"
 msgstr ""
 
-#: gajim/common/const.py:419
+#: gajim/common/const.py:453
 msgid "lat"
 msgstr ""
 
-#: gajim/common/const.py:420
+#: gajim/common/const.py:454
 msgid "locality"
 msgstr ""
 
-#: gajim/common/const.py:421
+#: gajim/common/const.py:455
 #, fuzzy
 msgid "lon"
 msgstr "ένα"
 
-#: gajim/common/const.py:422
+#: gajim/common/const.py:456
 #, fuzzy
 msgid "postalcode"
 msgstr "Τ.Κ.:"
 
-#: gajim/common/const.py:423
+#: gajim/common/const.py:457
 msgid "region"
 msgstr ""
 
-#: gajim/common/const.py:424
+#: gajim/common/const.py:458
 #, fuzzy
 msgid "room"
 msgstr "Από"
 
-#: gajim/common/const.py:425
+#: gajim/common/const.py:459
 msgid "speed"
 msgstr ""
 
-#: gajim/common/const.py:426
+#: gajim/common/const.py:460
 msgid "street"
 msgstr ""
 
-#: gajim/common/const.py:427
+#: gajim/common/const.py:461
 msgid "text"
 msgstr ""
 
-#: gajim/common/const.py:428
+#: gajim/common/const.py:462
 msgid "timestamp"
 msgstr ""
 
-#: gajim/common/const.py:429
+#: gajim/common/const.py:463
 msgid "URI"
 msgstr ""
 
-#: gajim/common/const.py:434
+#: gajim/common/const.py:468
 msgid "Unable to get issuer certificate"
 msgstr ""
 
-#: gajim/common/const.py:435
+#: gajim/common/const.py:469
 msgid "Unable to get certificate CRL"
 msgstr ""
 
-#: gajim/common/const.py:436
+#: gajim/common/const.py:470
 msgid "Unable to decrypt certificate's signature"
 msgstr ""
 
-#: gajim/common/const.py:437
+#: gajim/common/const.py:471
 msgid "Unable to decrypt CRL's signature"
 msgstr ""
 
-#: gajim/common/const.py:438
+#: gajim/common/const.py:472
 msgid "Unable to decode issuer public key"
 msgstr ""
 
-#: gajim/common/const.py:439
+#: gajim/common/const.py:473
 msgid "Certificate signature failure"
 msgstr ""
 
-#: gajim/common/const.py:440
+#: gajim/common/const.py:474
 msgid "CRL signature failure"
 msgstr ""
 
-#: gajim/common/const.py:441
+#: gajim/common/const.py:475
 msgid "Certificate is not yet valid"
 msgstr ""
 
-#: gajim/common/const.py:442
+#: gajim/common/const.py:476
 msgid "Certificate has expired"
 msgstr ""
 
-#: gajim/common/const.py:443
+#: gajim/common/const.py:477
 msgid "CRL is not yet valid"
 msgstr ""
 
-#: gajim/common/const.py:444
+#: gajim/common/const.py:478
 msgid "CRL has expired"
 msgstr ""
 
-#: gajim/common/const.py:445
+#: gajim/common/const.py:479
 msgid "Format error in certificate's notBefore field"
 msgstr ""
 
-#: gajim/common/const.py:446
+#: gajim/common/const.py:480
 msgid "Format error in certificate's notAfter field"
 msgstr ""
 
-#: gajim/common/const.py:447
+#: gajim/common/const.py:481
 msgid "Format error in CRL's lastUpdate field"
 msgstr ""
 
-#: gajim/common/const.py:448
+#: gajim/common/const.py:482
 msgid "Format error in CRL's nextUpdate field"
 msgstr ""
 
-#: gajim/common/const.py:449
+#: gajim/common/const.py:483
 msgid "Out of memory"
 msgstr ""
 
-#: gajim/common/const.py:450
+#: gajim/common/const.py:484
 msgid "Self signed certificate"
 msgstr ""
 
-#: gajim/common/const.py:451
+#: gajim/common/const.py:485
 msgid "Self signed certificate in certificate chain"
 msgstr ""
 
-#: gajim/common/const.py:452
+#: gajim/common/const.py:486
 msgid "Unable to get local issuer certificate"
 msgstr ""
 
-#: gajim/common/const.py:453
+#: gajim/common/const.py:487
 msgid "Unable to verify the first certificate"
 msgstr ""
 
-#: gajim/common/const.py:454
+#: gajim/common/const.py:488
 msgid "Certificate chain too long"
 msgstr ""
 
-#: gajim/common/const.py:455
+#: gajim/common/const.py:489
 msgid "Certificate revoked"
 msgstr ""
 
-#: gajim/common/const.py:456
+#: gajim/common/const.py:490
 #, fuzzy
 msgid "Invalid CA certificate"
 msgstr "Μη έγκυρο όνομα χρήστη"
 
-#: gajim/common/const.py:457
+#: gajim/common/const.py:491
 msgid "Path length constraint exceeded"
 msgstr ""
 
-#: gajim/common/const.py:458
+#: gajim/common/const.py:492
 msgid "Unsupported certificate purpose"
 msgstr ""
 
-#: gajim/common/const.py:459
+#: gajim/common/const.py:493
 msgid "Certificate not trusted"
 msgstr ""
 
-#: gajim/common/const.py:460
+#: gajim/common/const.py:494
 msgid "Certificate rejected"
 msgstr ""
 
-#: gajim/common/const.py:461
+#: gajim/common/const.py:495
 msgid "Subject issuer mismatch"
 msgstr ""
 
-#: gajim/common/const.py:462
+#: gajim/common/const.py:496
 msgid "Authority and subject key identifier mismatch"
 msgstr ""
 
-#: gajim/common/const.py:463
+#: gajim/common/const.py:497
 msgid "Authority and issuer serial number mismatch"
 msgstr ""
 
-#: gajim/common/const.py:464
+#: gajim/common/const.py:498
 msgid "Key usage does not include certificate signing"
 msgstr ""
 
-#: gajim/common/const.py:465
+#: gajim/common/const.py:499
 msgid "Application verification failure"
 msgstr ""
 
@@ -5188,262 +5289,262 @@ msgstr ""
 msgid "video output"
 msgstr ""
 
-#: gajim/common/helpers.py:210
+#: gajim/common/helpers.py:216
 msgid "Server must be between 1 and 1023 bytes"
 msgstr ""
 
-#: gajim/common/helpers.py:214
+#: gajim/common/helpers.py:220
 msgid "Invalid character in hostname."
 msgstr "Μη έγκυρος χαρακτήρας στο όνομα του διακομιστή."
 
-#: gajim/common/helpers.py:216
+#: gajim/common/helpers.py:222
 msgid "Server address required."
 msgstr "Απαιτείται η διεύθυνση του διακομιστή."
 
-#: gajim/common/helpers.py:220
+#: gajim/common/helpers.py:226
 msgid "Username must be between 1 and 1023 bytes"
 msgstr ""
 
-#: gajim/common/helpers.py:224
+#: gajim/common/helpers.py:230
 msgid "Invalid character in username."
 msgstr "Μη έγκυρος χαρακτήρας στο όνομα του χρήστη."
 
-#: gajim/common/helpers.py:230
+#: gajim/common/helpers.py:236
 msgid "Resource must be between 1 and 1023 bytes"
 msgstr ""
 
-#: gajim/common/helpers.py:234
+#: gajim/common/helpers.py:240
 msgid "Invalid character in resource."
 msgstr "Μη έγκυρος χαρακτήρας στον πόρο."
 
-#: gajim/common/helpers.py:275
+#: gajim/common/helpers.py:281
 msgid "_Busy"
 msgstr "Απα_σχολημένος"
 
-#: gajim/common/helpers.py:277 gajim/gtk/tooltips.py:647
+#: gajim/common/helpers.py:283 gajim/gtk/tooltips.py:647
 msgid "Busy"
 msgstr "Απασχολημένος"
 
-#: gajim/common/helpers.py:280
+#: gajim/common/helpers.py:286
 msgid "_Not Available"
 msgstr "_Μη διαθέσιμος"
 
-#: gajim/common/helpers.py:282 gajim/gtk/tooltips.py:649
+#: gajim/common/helpers.py:288 gajim/gtk/tooltips.py:649
 msgid "Not Available"
 msgstr "Μη διαθέσιμος"
 
-#: gajim/common/helpers.py:285
+#: gajim/common/helpers.py:291
 msgid "_Free for Chat"
 msgstr "Διαθέσιμος για _κουβέντα"
 
-#: gajim/common/helpers.py:287 gajim/gtk/tooltips.py:643
+#: gajim/common/helpers.py:293 gajim/gtk/tooltips.py:643
 msgid "Free for Chat"
 msgstr "Διαθέσιμος για κουβέντα"
 
-#: gajim/common/helpers.py:290
+#: gajim/common/helpers.py:296
 #, fuzzy
 msgid "?user status:_Available"
 msgstr "_Διαθέσιμος"
 
-#: gajim/common/helpers.py:292 gajim/gtk/tooltips.py:641
+#: gajim/common/helpers.py:298 gajim/gtk/tooltips.py:641
 #, fuzzy
 msgid "?user status:Available"
 msgstr "Εκτύπωση όλων των σελίδων"
 
-#: gajim/common/helpers.py:294
+#: gajim/common/helpers.py:300
 msgid "Connecting"
 msgstr "Συνδέεται"
 
-#: gajim/common/helpers.py:297 gajim/data/gui/preferences_window.ui:1251
+#: gajim/common/helpers.py:303 gajim/data/gui/preferences_window.ui:1251
 msgid "A_way"
 msgstr "Α_πομακρυσμένος"
 
-#: gajim/common/helpers.py:299 gajim/common/modules/adhoc_commands.py:120
-#: gajim/command_system/implementation/standard.py:139
+#: gajim/common/helpers.py:305 gajim/common/modules/adhoc_commands.py:120
+#: gajim/command_system/implementation/standard.py:141
 #: gajim/gtk/tooltips.py:645
 msgid "Away"
 msgstr "Απομακρυσμένος"
 
-#: gajim/common/helpers.py:302
+#: gajim/common/helpers.py:308
 msgid "_Offline"
 msgstr "Απ_οσυνδεδεμένος"
 
-#: gajim/common/helpers.py:304 gajim/gtk/tooltips.py:651
+#: gajim/common/helpers.py:310 gajim/gtk/tooltips.py:651
 msgid "Offline"
 msgstr "Αποσυνδεδεμένος"
 
-#: gajim/common/helpers.py:307
+#: gajim/common/helpers.py:313
 msgid "_Invisible"
 msgstr "Αόρατ_ος"
 
-#: gajim/common/helpers.py:313
+#: gajim/common/helpers.py:319
 msgid "?contact has status:Unknown"
 msgstr "?κατάσταση επαφής: Άγνωστη"
 
-#: gajim/common/helpers.py:315
+#: gajim/common/helpers.py:321
 msgid "?contact has status:Has errors"
 msgstr "?κατάσταση επαφής: Υπάρχουν σφάλματα"
 
-#: gajim/common/helpers.py:330
+#: gajim/common/helpers.py:336
 msgid "?Subscription we already have:None"
 msgstr "Καμία"
 
-#: gajim/common/helpers.py:332
+#: gajim/common/helpers.py:338
 msgid "To"
 msgstr "Προς"
 
-#: gajim/common/helpers.py:334 gajim/data/gui/groups_post_window.ui:33
+#: gajim/common/helpers.py:340 gajim/data/gui/groups_post_window.ui:33
 msgid "From"
 msgstr "Από"
 
-#: gajim/common/helpers.py:336
+#: gajim/common/helpers.py:342
 msgid "Both"
 msgstr "Και τα δυο"
 
-#: gajim/common/helpers.py:338 gajim/gtk/server_info.py:151
+#: gajim/common/helpers.py:344 gajim/gtk/server_info.py:151
 #, fuzzy
 msgid "Unknown"
 msgstr "?Λειτ. Σύστημα: Άγνωστο"
 
-#: gajim/common/helpers.py:344
+#: gajim/common/helpers.py:350
 msgid "?Ask (for Subscription):None"
 msgstr "Τίποτα"
 
-#: gajim/common/helpers.py:346
+#: gajim/common/helpers.py:352
 msgid "Subscribe"
 msgstr "Εγγραφή"
 
-#: gajim/common/helpers.py:355
+#: gajim/common/helpers.py:361
 msgid "?Group Chat Contact Role:None"
 msgstr "Κανένας"
 
-#: gajim/common/helpers.py:358
+#: gajim/common/helpers.py:364
 msgid "Moderators"
 msgstr "Διαχειριστές"
 
-#: gajim/common/helpers.py:360
+#: gajim/common/helpers.py:366
 msgid "Moderator"
 msgstr "Διαχειριστής"
 
-#: gajim/common/helpers.py:363
+#: gajim/common/helpers.py:369 gajim/data/gui/groupchat_info_scrolled.ui:243
 msgid "Participants"
 msgstr "Συμμετέχοντες"
 
-#: gajim/common/helpers.py:365
+#: gajim/common/helpers.py:371
 msgid "Participant"
 msgstr "Συμμετέχων"
 
-#: gajim/common/helpers.py:368
+#: gajim/common/helpers.py:374
 msgid "Visitors"
 msgstr "Επισκέπτες"
 
-#: gajim/common/helpers.py:370
+#: gajim/common/helpers.py:376
 msgid "Visitor"
 msgstr "Επισκέπτης"
 
-#: gajim/common/helpers.py:376 gajim/gtk/tooltips.py:253
+#: gajim/common/helpers.py:382 gajim/gtk/tooltips.py:253
 #, fuzzy
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "Κανένας"
 
-#: gajim/common/helpers.py:378 gajim/data/gui/groupchat_config.ui:32
+#: gajim/common/helpers.py:384 gajim/data/gui/groupchat_config.ui:32
 #: gajim/gtk/tooltips.py:259
 msgid "Owner"
 msgstr "Ιδιοκτήτης"
 
-#: gajim/common/helpers.py:380 gajim/gtk/tooltips.py:257
+#: gajim/common/helpers.py:386 gajim/gtk/tooltips.py:257
 msgid "Administrator"
 msgstr "Διαχειριστής"
 
-#: gajim/common/helpers.py:382 gajim/data/gui/groupchat_config.ui:40
+#: gajim/common/helpers.py:388 gajim/data/gui/groupchat_config.ui:40
 #: gajim/gtk/tooltips.py:255 gajim/gtk/groupchat_config.py:105
 msgid "Member"
 msgstr "Μέλος"
 
-#: gajim/common/helpers.py:421
+#: gajim/common/helpers.py:427
 msgid "is paying attention to the conversation"
 msgstr "έχει την προσοχή του στην κουβέντα"
 
-#: gajim/common/helpers.py:423
+#: gajim/common/helpers.py:429
 msgid "is doing something else"
 msgstr "κάνει κάτι άλλο"
 
-#: gajim/common/helpers.py:425
+#: gajim/common/helpers.py:431
 #, fuzzy
 msgid "is composing a message…"
 msgstr "γράφει ένα μήνυμα..."
 
-#: gajim/common/helpers.py:428
+#: gajim/common/helpers.py:434
 msgid "paused composing a message"
 msgstr "σταμάτησε για λίγο να γράφει ένα μήνυμα"
 
-#: gajim/common/helpers.py:430
+#: gajim/common/helpers.py:436
 msgid "has closed the chat window or tab"
 msgstr "έκλεισε το παράθυρο ή την καρτέλα"
 
-#: gajim/common/helpers.py:936 gajim/common/helpers.py:943
+#: gajim/common/helpers.py:942 gajim/common/helpers.py:949
 #, fuzzy, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
 msgstr[0] "Αποστολή μηνύματος"
 msgstr[1] "Αποστολή μηνύματος"
 
-#: gajim/common/helpers.py:950
+#: gajim/common/helpers.py:956
 #, fuzzy, python-format
-msgid "from room %s"
-msgstr "Από %s"
+msgid "from group chat %s"
+msgstr "Συμμετοχή σε _ομαδική συζήτηση"
 
-#: gajim/common/helpers.py:953 gajim/common/helpers.py:970
+#: gajim/common/helpers.py:959 gajim/common/helpers.py:976
 #, fuzzy, python-format
 msgid "from user %s"
 msgstr "Από %s"
 
-#: gajim/common/helpers.py:955
+#: gajim/common/helpers.py:961
 #, fuzzy, python-format
 msgid "from %s"
 msgstr "Από %s"
 
-#: gajim/common/helpers.py:962 gajim/common/helpers.py:968
+#: gajim/common/helpers.py:968 gajim/common/helpers.py:974
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
 msgstr[0] ""
 msgstr[1] ""
 
-#: gajim/common/helpers.py:986 gajim/common/helpers.py:998
+#: gajim/common/helpers.py:992 gajim/common/helpers.py:1004
 #: gajim/data/gui/roster_window.ui:85 data/org.gajim.Gajim.desktop.in:4
 #: data/org.gajim.Gajim.appdata.xml.in:9
 msgid "Gajim"
 msgstr "Gajim"
 
-#: gajim/common/helpers.py:1000
+#: gajim/common/helpers.py:1006
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: gajim/common/helpers.py:1109 gajim/data/gui/add_new_contact_window.ui:25
+#: gajim/common/helpers.py:1115 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:1111
+#: gajim/common/helpers.py:1117
 msgid "Hello, I am $name."
 msgstr ""
 
-#: gajim/common/helpers.py:1215 gajim/common/helpers.py:1224
-#: gajim/common/helpers.py:1282
+#: gajim/common/helpers.py:1221 gajim/common/helpers.py:1230
+#: gajim/common/helpers.py:1288
 #, fuzzy
 msgid "Timeout loading image"
 msgstr "Δεν ήταν δυνατό το φόρτωμα της εικόνας"
 
-#: gajim/common/helpers.py:1234 gajim/common/helpers.py:1280
+#: gajim/common/helpers.py:1240 gajim/common/helpers.py:1286
 msgid "Image is too big"
 msgstr "Η εικόνα είναι πολύ μεγάλη"
 
-#: gajim/common/helpers.py:1245
+#: gajim/common/helpers.py:1251
 msgid "PyCURL is not installed"
 msgstr ""
 
-#: gajim/common/helpers.py:1284
+#: gajim/common/helpers.py:1290
 #, fuzzy
 msgid "Error loading image"
 msgstr "Δεν ήταν δυνατό το φόρτωμα της εικόνας"
@@ -5620,7 +5721,7 @@ msgstr "Η κατάσταση άλλαξε."
 #: gajim/common/modules/adhoc_commands.py:202
 #: gajim/common/modules/adhoc_commands.py:239
 #, fuzzy
-msgid "Leave Groupchats"
+msgid "Leave Group Chats"
 msgstr "Ομαδικές συζητήσεις"
 
 #: gajim/common/modules/adhoc_commands.py:228
@@ -5630,16 +5731,17 @@ msgstr "%(nickname)s: %(message)s"
 
 #: gajim/common/modules/adhoc_commands.py:232
 #, fuzzy
-msgid "You have not joined a groupchat."
+msgid "You have not joined a group chat."
 msgstr "Ο/Η %s μπήκε στο δωμάτιο"
 
 #: gajim/common/modules/adhoc_commands.py:240
-msgid "Choose the groupchats you want to leave"
-msgstr ""
+#, fuzzy
+msgid "Choose the group chats you want to leave"
+msgstr "Παρακαλώ συμπληρώστε τα στοιχεία της επαφής που θέλετε να προσθέσετε"
 
 #: gajim/common/modules/adhoc_commands.py:289
 #, fuzzy
-msgid "You left the following groupchats:"
+msgid "You left the following group chats:"
 msgstr "Βρίσκεστε ήδη στο δωμάτιο %s"
 
 #: gajim/common/modules/roster_item_exchange.py:102
@@ -5657,7 +5759,7 @@ msgstr "Επαφές"
 msgid "Blocked Contacts"
 msgstr "Επαφές"
 
-#: gajim/data/gui/destroy_muc_dialog.ui:79 gajim/gtk/dialogs.py:736
+#: gajim/data/gui/destroy_muc_dialog.ui:79 gajim/gtk/dialogs.py:563
 msgid "Destroy this group chat permanently?"
 msgstr ""
 
@@ -5666,7 +5768,7 @@ msgstr ""
 msgid "Reason..."
 msgstr "Αιτία"
 
-#: gajim/data/gui/destroy_muc_dialog.ui:124 gajim/gtk/dialogs.py:738
+#: gajim/data/gui/destroy_muc_dialog.ui:124 gajim/gtk/dialogs.py:565
 msgid "Where participants should go (optional)"
 msgstr ""
 
@@ -5678,35 +5780,6 @@ msgstr ""
 msgid "_Reason and alternate venue (optional)"
 msgstr ""
 
-#: gajim/data/gui/advanced_configuration_window.ui:7
-#: gajim/data/gui/preferences_window.ui:2723
-#, fuzzy
-msgid "Advanced Configuration Editor (ACE)"
-msgstr "Επεξεργασία ρυθμίσεων για προχωρημένους"
-
-#: gajim/data/gui/advanced_configuration_window.ui:52
-#, fuzzy
-msgid "You should restart Gajim for some changes to take effect"
-msgstr ""
-"<b>ΣΗΜΕΙΩΣΗ:</b> Θα πρέπει να επανεκκινήσετε το gajim για να εφαρμοστούν "
-"μερικές ρυθμίσεις"
-
-#: gajim/data/gui/advanced_configuration_window.ui:84
-#, fuzzy
-msgid "_Filter"
-msgstr "_Φιλτράρισμα:"
-
-#: gajim/data/gui/advanced_configuration_window.ui:153
-#: gajim/data/gui/filetransfers_send_file_dialog.ui:15
-#: gajim/gtk/discovery.py:1666
-msgid "Description"
-msgstr "Περιγραφή"
-
-#: gajim/data/gui/advanced_configuration_window.ui:197
-#, fuzzy
-msgid "_Reset to default"
-msgstr "Επανα_φορά προεπιλεγμένων χρωμάτων"
-
 #: gajim/data/gui/join_groupchat_window.ui:56
 #: gajim/data/gui/chat_to_muc_window.ui:67
 #: gajim/data/gui/chat_to_muc_window.ui:78
@@ -5718,9 +5791,8 @@ msgid "Join group chat every time Gajim is started"
 msgstr ""
 
 #: gajim/data/gui/join_groupchat_window.ui:113
-#, fuzzy
-msgid "Auto Join"
-msgstr "Αυτόματη είσοδος"
+msgid "Join Automatically"
+msgstr ""
 
 #: gajim/data/gui/join_groupchat_window.ui:131
 #: gajim/data/gui/profile_window.ui:233
@@ -5729,10 +5801,11 @@ msgstr "Λογαριασμός"
 
 #: gajim/data/gui/join_groupchat_window.ui:147
 #, fuzzy
-msgid "Room"
-msgstr "Δωμάτιο:"
+msgid "Group chat"
+msgstr "Ομαδικές συζητήσεις"
 
-#: gajim/data/gui/join_groupchat_window.ui:180 gajim/gtk/accounts.py:886
+#: gajim/data/gui/join_groupchat_window.ui:180 gajim/data/gui/bookmarks.ui:158
+#: gajim/gtk/accounts.py:889
 #, fuzzy
 msgid "Password"
 msgstr "Κωδικός πρόσβασης:"
@@ -5756,93 +5829,11 @@ msgstr "Συμμετοχή σε _ομαδική συζήτηση"
 msgid "Search group chats on selected server"
 msgstr ""
 
-#: gajim/data/gui/join_groupchat_window.ui:437 gajim/gtk/discovery.py:1271
+#: gajim/data/gui/join_groupchat_window.ui:437 gajim/gtk/discovery.py:1270
 #, fuzzy
 msgid "Join"
 msgstr "_Συμμετοχή"
 
-#: gajim/data/gui/manage_proxies_window.ui:12
-#, fuzzy
-msgid "HTTP Connect"
-msgstr "Σύνδεση HTTP"
-
-#: gajim/data/gui/manage_proxies_window.ui:15
-msgid "SOCKS5"
-msgstr ""
-
-#: gajim/data/gui/manage_proxies_window.ui:18
-msgid "BOSH"
-msgstr ""
-
-#: gajim/data/gui/manage_proxies_window.ui:27
-msgid "Manage Proxy Profiles"
-msgstr "Διαχείριση προφίλ μεσολαβητή"
-
-#: gajim/data/gui/manage_proxies_window.ui:83
-#, fuzzy
-msgid "Add Proxy"
-msgstr "Μεσολαβητής:"
-
-#: gajim/data/gui/manage_proxies_window.ui:97
-#, fuzzy
-msgid "Remove Proxy"
-msgstr "Διαγραφή ομάδας"
-
-#: gajim/data/gui/manage_proxies_window.ui:141
-#, fuzzy
-msgid "Properties"
-msgstr "<b>Ιδιότητες</b>"
-
-#: gajim/data/gui/manage_proxies_window.ui:157
-#, fuzzy
-msgid "_Name"
-msgstr "_Όνομα:"
-
-#: gajim/data/gui/manage_proxies_window.ui:173
-#, fuzzy
-msgid "_Type"
-msgstr "Τύπος:"
-
-#: gajim/data/gui/manage_proxies_window.ui:236
-#, fuzzy
-msgid "_BOSH URL"
-msgstr "Διεύ_θυνση:"
-
-#: gajim/data/gui/manage_proxies_window.ui:261
-#, fuzzy
-msgid "Use HTTP prox_y"
-msgstr "_Χρήση μεσολαβητή"
-
-#: gajim/data/gui/manage_proxies_window.ui:280
-#, fuzzy
-msgid "Proxy _Host"
-msgstr "Μεσολαβητής:"
-
-#: gajim/data/gui/manage_proxies_window.ui:307
-#, fuzzy
-msgid "Proxy _Port"
-msgstr "_Θύρα:"
-
-#: gajim/data/gui/manage_proxies_window.ui:334
-#, fuzzy
-msgid "_Username"
-msgstr "Όν_ομα χρήστη:"
-
-#: gajim/data/gui/manage_proxies_window.ui:347
-#, fuzzy
-msgid "Use proxy auth_entication"
-msgstr "Χρήση πιστοποίησης"
-
-#: gajim/data/gui/manage_proxies_window.ui:377
-#, fuzzy
-msgid "Pass_word"
-msgstr "_Κωδικός πρόσβασης:"
-
-#: gajim/data/gui/manage_proxies_window.ui:405 gajim/gtk/adhoc.py:321
-#, fuzzy
-msgid "Settings"
-msgstr "Η δημοσιοποίηση της vCard απέτυχε"
-
 #: gajim/data/gui/change_password_dialog.ui:17
 #, fuzzy
 msgid "New Password"
@@ -5873,11 +5864,13 @@ msgid "Status:"
 msgstr "Κατάσταση:"
 
 #: gajim/data/gui/zeroconf_information_window.ui:89
-msgid "_Log conversation history"
+#, fuzzy
+msgid "_Store conversation history"
 msgstr "_Καταγραφή ιστορικού συζητήσεων"
 
 #: gajim/data/gui/zeroconf_information_window.ui:215
 #: gajim/data/gui/vcard_information_window.ui:390
+#: gajim/data/gui/groupchat_info_scrolled.ui:166
 msgid "Contact"
 msgstr "Επικοινωνία"
 
@@ -5890,8 +5883,9 @@ msgid "Last Name:"
 msgstr "Επώνυμο:"
 
 #: gajim/data/gui/zeroconf_information_window.ui:260
-msgid "Jabber ID:"
-msgstr "Jabber ID:"
+#, fuzzy
+msgid "XMPP Address:"
+msgstr "Αντιγραφή διεύθυνσης email"
 
 #: gajim/data/gui/zeroconf_information_window.ui:273
 msgid "E-Mail:"
@@ -5912,8 +5906,8 @@ msgstr "Αποστολή _αρχείου"
 
 #: gajim/data/gui/gc_occupants_menu.ui:29
 #, fuzzy
-msgid "Occupant Actions"
-msgstr "_Ενέργειες για τους συμμετέχοντες"
+msgid "Participant Actions"
+msgstr "Συμμετέχοντες"
 
 #: gajim/data/gui/gc_occupants_menu.ui:38
 msgid "_Voice"
@@ -5944,8 +5938,9 @@ msgid "_Ban"
 msgstr "_Απαγόρευση πρόσβασης"
 
 #: gajim/data/gui/gc_occupants_menu.ui:124
-msgid "_Add to Roster"
-msgstr "_Προσθήκη στη λίστα επαφών"
+#, fuzzy
+msgid "_Add to Contact List"
+msgstr "_Προσθήκη επαφής..."
 
 #: gajim/data/gui/gc_occupants_menu.ui:132
 #, fuzzy
@@ -5986,11 +5981,6 @@ msgstr "Εγγραφή:"
 msgid "_Status"
 msgstr "_Κατάσταση"
 
-#: gajim/data/gui/zeroconf_context_menu.ui:26
-#: gajim/data/gui/account_context_menu.ui:79
-msgid "_Modify Account..."
-msgstr "_Επεξεργασία λογαριασμού..."
-
 #: gajim/data/gui/certificate_dialog.ui:66
 #: gajim/data/gui/certificate_dialog.ui:178
 msgid "Common Name (CN)"
@@ -6075,13 +6065,19 @@ msgstr "Τελευταία τροποποίηση:"
 msgid "Next entry"
 msgstr ""
 
+#: gajim/data/gui/filetransfers_send_file_dialog.ui:15
+#: gajim/data/gui/advanced_configuration.ui:143
+#: gajim/data/gui/groupchat_info_scrolled.ui:48 gajim/gtk/discovery.py:1663
+msgid "Description"
+msgstr "Περιγραφή"
+
 #: gajim/data/gui/filetransfers_send_file_dialog.ui:54
 #, fuzzy
 msgid "_Send Files"
 msgstr "Αποστολή _αρχείου"
 
 #: gajim/data/gui/filetransfers_send_file_dialog.ui:58
-#: gajim/gtk/xml_console.py:90
+#: gajim/gtk/xml_console.py:87
 msgid "Send"
 msgstr "Αποστολή"
 
@@ -6107,8 +6103,8 @@ msgstr "Αλλαγή _ψευδώνυμου"
 
 #: gajim/data/gui/gc_control_popup_menu.ui:20
 #, fuzzy
-msgid "_Manage Room"
-msgstr "Διαχείριση σελιδοδεικτών"
+msgid "_Manage Group Chat"
+msgstr "Αρχηγός ομάδας παραθύρων"
 
 #: gajim/data/gui/gc_control_popup_menu.ui:31
 #, fuzzy
@@ -6117,13 +6113,13 @@ msgstr "Αλλαγή _θέματος"
 
 #: gajim/data/gui/gc_control_popup_menu.ui:38
 #, fuzzy
-msgid "Configure _Room..."
-msgstr "Ρύθμιση _δωματίου"
+msgid "Configure _Group Chat..."
+msgstr "Συμμετοχή σε _Ομαδική Συζήτηση..."
 
 #: gajim/data/gui/gc_control_popup_menu.ui:52
 #, fuzzy
-msgid "_Destroy Room"
-msgstr "Περιγραφή: %s"
+msgid "_Destroy Group Chat"
+msgstr "Αρχηγός ομάδας παραθύρων"
 
 #: gajim/data/gui/gc_control_popup_menu.ui:64
 msgid "_Minimize on close"
@@ -6134,7 +6130,7 @@ msgstr ""
 msgid "_Request Voice"
 msgstr "_Φωνή"
 
-#: gajim/data/gui/gc_control_popup_menu.ui:99 gajim/gtk/discovery.py:1704
+#: gajim/data/gui/gc_control_popup_menu.ui:99
 #, fuzzy
 msgid "_Bookmark"
 msgstr "_Τοποθέτηση σελιδοδείκτη για αυτό το δωμάτιο"
@@ -6187,14 +6183,6 @@ msgstr "Προσωπ. σελίδα:"
 msgid "E-Mail"
 msgstr "Ε-Mail:"
 
-#: 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/blocking_list.ui:115 gajim/gtk/add_contact.py:30
-#: gajim/gtk/accounts.py:801
-#, fuzzy
-msgid "Jabber ID"
-msgstr "Jabber ID:"
-
 #: gajim/data/gui/profile_window.ui:440
 msgid "Main"
 msgstr ""
@@ -6330,35 +6318,42 @@ msgstr "Δουλειά"
 msgid "About"
 msgstr "Περί"
 
-#: gajim/data/gui/start_chat_dialog.ui:114 gajim/gtk/discovery.py:1658
-msgid "Users"
-msgstr "Χρήστες"
-
-#: gajim/data/gui/start_chat_dialog.ui:185
-msgid "Name:"
-msgstr "Όνομα:"
+#: gajim/data/gui/start_chat_dialog.ui:53
+#, fuzzy
+msgid "Global Group Chat Search"
+msgstr "Συμμετοχή σε ομαδική κουβέντα"
 
-#: gajim/data/gui/start_chat_dialog.ui:197
+#: 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
-msgid "Description:"
-msgstr "Περιγραφή: %s"
+msgid "_Back"
+msgstr "Πίσω σύντομα"
 
-#: gajim/data/gui/start_chat_dialog.ui:209
+#: gajim/data/gui/start_chat_dialog.ui:245
+#: gajim/data/gui/groupchat_control.ui:796
+#: gajim/data/gui/groupchat_control.ui:888 gajim/gtk/discovery.py:1701
+#: gajim/gtk/groupchat_join.py:62
+msgid "_Join"
+msgstr "_Συμμετοχή"
+
+#: gajim/data/gui/start_chat_dialog.ui:289
 #, fuzzy
-msgid "Address:"
-msgstr "_Διεύθυνση:"
+msgid "Select Account"
+msgstr "Aφαίρεση του λογαριασμού %s"
 
-#: gajim/data/gui/start_chat_dialog.ui:246
-msgid ""
-"Semi-Anonymous\n"
-"<span size=\"small\">(Only moderators can see your XMPP-Address)</span>"
+#: gajim/data/gui/start_chat_dialog.ui:380
+msgid "_Select"
 msgstr ""
 
 #: gajim/data/gui/filetransfers.ui:21
 msgid "Pa_use/Resume"
 msgstr ""
 
-#: gajim/data/gui/filetransfers.ui:30 gajim/gtk/filechoosers.py:178
+#: gajim/data/gui/filetransfers.ui:30 gajim/data/gui/groupchat_control.ui:575
+#: gajim/data/gui/groupchat_control.ui:667
+#: gajim/data/gui/groupchat_control.ui:779
+#: gajim/data/gui/groupchat_control.ui:871 gajim/gtk/filechoosers.py:178
 msgid "_Cancel"
 msgstr "_Άκυρο"
 
@@ -6403,7 +6398,7 @@ msgstr ""
 
 #: gajim/data/gui/filetransfers.ui:207
 #, fuzzy
-msgid "Shows a list of file transfers between you and others"
+msgid "Shows a list of file transfers between you and your contacts"
 msgstr "Δείχνει τη λίστα μεταφορών αρχείων μεταξύ εσάς και άλλων"
 
 #: gajim/data/gui/groupchat_control.ui:13 gajim/data/gui/chat_control.ui:277
@@ -6425,7 +6420,6 @@ msgid "Strike"
 msgstr "Ψευδώνυμο"
 
 #: gajim/data/gui/groupchat_control.ui:54 gajim/data/gui/chat_control.ui:318
-#: gajim/gtk/advanced_config.py:86
 msgid "Color"
 msgstr "Χρώμα"
 
@@ -6439,16 +6433,45 @@ msgstr "_Γραμματοσειρά:"
 msgid "Clear formatting"
 msgstr "Πληροφορίες επαφής"
 
-#: gajim/data/gui/groupchat_control.ui:290 gajim/data/gui/chat_control.ui:880
+#: gajim/data/gui/groupchat_control.ui:291 gajim/data/gui/chat_control.ui:880
 #, fuzzy
 msgid "Choose encryption"
 msgstr "Επιλέξτε το αρχείο που θα σταλεί..."
 
-#: gajim/data/gui/groupchat_control.ui:336 gajim/data/gui/chat_control.ui:640
+#: gajim/data/gui/groupchat_control.ui:337 gajim/data/gui/chat_control.ui:640
 #, fuzzy
 msgid "Show a list of emojis (Alt+M)"
 msgstr "Κάντε κλικ για να εισάγετε φατσούλα (Alt+M)"
 
+#: gajim/data/gui/groupchat_control.ui:484
+#, fuzzy
+msgid "Joining…"
+msgstr "Απαγορεύεται η πρόσβαση..."
+
+#: gajim/data/gui/groupchat_control.ui:496
+msgid "_Abort"
+msgstr ""
+
+#: gajim/data/gui/groupchat_control.ui:542
+#, fuzzy
+msgid "Enter new nickname"
+msgstr "Με_τά από ψευδώνυμο:"
+
+#: gajim/data/gui/groupchat_control.ui:592
+#: gajim/data/gui/groupchat_control.ui:684
+#, fuzzy
+msgid "Ch_ange"
+msgstr "Αλλαγή _ψευδώνυμου"
+
+#: gajim/data/gui/groupchat_control.ui:761
+#, fuzzy
+msgid "Enter password"
+msgstr "Εισάγετε νέο κωδικό πρόσβασης:"
+
+#: gajim/data/gui/groupchat_control.ui:1067
+msgid "_Try again"
+msgstr ""
+
 #: gajim/data/gui/popup_notification_window.ui:42
 #, fuzzy
 msgid "Event Type"
@@ -6530,8 +6553,8 @@ msgstr "Απομακρυσμένος"
 
 #: gajim/data/gui/mam_preferences.ui:18
 #, fuzzy
-msgid "Roster"
-msgstr "Εμφάνιση _λίστας επαφών"
+msgid "Contact List"
+msgstr "Επαφές"
 
 #: gajim/data/gui/mam_preferences.ui:22
 #: gajim/data/gui/preferences_window.ui:123
@@ -6556,12 +6579,12 @@ msgid "Add"
 msgstr "Προσθήκη"
 
 #: gajim/data/gui/mam_preferences.ui:194 gajim/data/gui/groupchat_config.ui:151
-#: gajim/gtk/dialogs.py:63 gajim/gtk/accounts.py:381
+#: gajim/gtk/dialogs.py:62 gajim/gtk/accounts.py:384
 #, fuzzy
 msgid "Remove"
 msgstr "_Αφαίρεση"
 
-#: gajim/data/gui/vcard_information_window.ui:72 gajim/gtk/accounts.py:753
+#: gajim/data/gui/vcard_information_window.ui:72 gajim/gtk/accounts.py:756
 #, fuzzy
 msgid "Resource"
 msgstr "Πόρος:"
@@ -6614,6 +6637,7 @@ msgstr "Εγγραφή:"
 #: gajim/data/gui/vcard_information_window.ui:974
 #: gajim/data/gui/vcard_information_window.ui:993
 #: gajim/data/gui/vcard_information_window.ui:1427
+#: gajim/data/gui/groupchat_info_scrolled.ui:222
 msgid "button"
 msgstr ""
 
@@ -6646,15 +6670,15 @@ msgstr "_Ειδοποίησε με για αυτό"
 
 #: gajim/data/gui/preferences_window.ui:58
 #, fuzzy
-msgid "Show only in roster"
-msgstr "Εμφά_νιση το μόνο στο κύριο παράθυρο"
+msgid "Show only in contact list"
+msgstr "Εμφάνιση _αποσυνδεδεμένων χρηστών"
 
 #: gajim/data/gui/preferences_window.ui:69
-msgid "Detached roster with detached chats"
+msgid "Detached contact list with detached chats"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:72
-msgid "Detached roster with single chat"
+msgid "Detached contact list with single chat"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:75
@@ -6662,11 +6686,11 @@ msgid "Single window for everything"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:78
-msgid "Detached roster with chat grouped by account"
+msgid "Detached contact list with chat grouped by account"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:81
-msgid "Detached roster with chat grouped by type"
+msgid "Detached contact list with chat grouped by type"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:92
@@ -6717,7 +6741,7 @@ msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:296
 #, fuzzy
-msgid "_Show roster on startup"
+msgid "_Show contact list on startup"
 msgstr "Εμφάνιση του κεντρικού παραθύρου κατά την εκκίνηση του Gajim"
 
 #: gajim/data/gui/preferences_window.ui:311
@@ -6733,12 +6757,12 @@ msgid "_Tabs placement"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:363
-msgid "_Quit Gajim when closing roster window"
+msgid "_Quit Gajim when closing contact list"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:367
 msgid ""
-"If enabled, Gajim will quit when closing the roster window instead of "
+"If enabled, Gajim will quit when closing the contact list window instead of "
 "minimizing to the system's notification area"
 msgstr ""
 
@@ -6748,41 +6772,42 @@ msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:423
 #, fuzzy
-msgid "Show a_vatars of contacts in roster"
+msgid "Show a_vatars of contacts in contact list"
 msgstr "Εμφάνιση των ά_βαταρ των επαφών στη λίστα επαφών"
 
 #: gajim/data/gui/preferences_window.ui:427
 #, fuzzy
 msgid ""
-"If checked, avatars of contacts will be shown in the roster window and in "
-"group chats"
+"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
 #, fuzzy
-msgid "Show status _messages of contacts in roster"
+msgid "Show status _messages of contacts in contact list"
 msgstr "Εμφάνιση των _μηνυμάτων κατάστασης στη λίστα επαφών"
 
 #: gajim/data/gui/preferences_window.ui:445
 #, fuzzy
 msgid ""
 "If checked, status messages of contacts will be shown under the contact's "
-"name, in the roster window, and in group chats"
+"name, in the contact list window, and in group chats"
 msgstr ""
 "Αν επιλεγεί, το Gajim θα εμφανίζει τα μηνύματα κατάστασης των επαφών σας "
 "κάτω από τα ονόματα τους στη λίστα επαφών και στις ομαδικές κουβέντες"
 
 #: gajim/data/gui/preferences_window.ui:459
 #, fuzzy
-msgid "Show e_xtra information of contacts in roster (mood, activity, ...)"
+msgid ""
+"Show e_xtra information of contacts in contact list (mood, activity, ...)"
 msgstr "Εμφάνιση των ά_βαταρ των επαφών στη λίστα επαφών"
 
 #: gajim/data/gui/preferences_window.ui:463
 msgid ""
-"If checked, additional info published by the contact will be shown in "
-"roster. Additional infos (published via PEP) may include e.g. mood, "
+"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 ""
 
@@ -6793,8 +6818,8 @@ msgstr "Τα_ξινόμηση επαφών βάσει κατάστασης"
 
 #: gajim/data/gui/preferences_window.ui:494
 #, fuzzy
-msgid "in _roster"
-msgstr "Εκτέλεση στο Τερματικό"
+msgid "in _contact list"
+msgstr "Επαφές"
 
 #: gajim/data/gui/preferences_window.ui:511
 #, fuzzy
@@ -6803,8 +6828,8 @@ msgstr "Συμμετοχή σε _ομαδική συζήτηση"
 
 #: gajim/data/gui/preferences_window.ui:540
 #, fuzzy
-msgid "Roster Appearance"
-msgstr "<b>Επεξεργασία κανόνα</b>"
+msgid "Contact List Appearance"
+msgstr "Αποσύνδεση επαφής"
 
 #: gajim/data/gui/preferences_window.ui:585
 msgid "Enable spell _checking"
@@ -6863,7 +6888,7 @@ msgstr "Δεν ήταν δυνατή η σύνδεση στην ομαδική �
 
 #: gajim/data/gui/preferences_window.ui:660
 #, fuzzy
-msgid "If checked, the room subject will be shown when joining a group chat"
+msgid "If checked, the subject will be shown when joining a group chat"
 msgstr "Δεν ήταν δυνατή η σύνδεση στην ομαδική συζήτηση"
 
 #: gajim/data/gui/preferences_window.ui:682
@@ -6878,13 +6903,13 @@ msgstr ""
 #: gajim/data/gui/preferences_window.ui:701
 msgid ""
 "If join/leave status messages are shown in the group chat. This setting can "
-"be overridden in the groupchat menu."
+"be overridden in the group chat menu."
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:720
 msgid ""
 "The default sync threshold for new public group chats. This setting can be "
-"overridden in the groupchat menu."
+"overridden in the group chat menu."
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:722
@@ -6899,7 +6924,7 @@ msgstr "Καταγραφή α_λλαγών κατάστασης των επαφ�
 #: gajim/data/gui/preferences_window.ui:768
 msgid ""
 "If status change messages are shown in the group chat. This setting can be "
-"overridden in the groupchat menu."
+"overridden in the group chat menu."
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:825
@@ -6918,8 +6943,8 @@ msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:843
 #, fuzzy
-msgid "Show chatstate in roster"
-msgstr "Εμφάνιση των ά_βαταρ των επαφών στη λίστα επαφών"
+msgid "Show chatstate in contact list"
+msgstr "Προβολή κουμπιού κλεισίματος στην καρτέλα;"
 
 #: gajim/data/gui/preferences_window.ui:847
 msgid ""
@@ -7221,7 +7246,7 @@ msgstr ""
 msgid "Vi_ew own video source"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2281 gajim/gtk/accounts.py:352
+#: gajim/data/gui/preferences_window.ui:2281 gajim/gtk/accounts.py:355
 msgid "Connection"
 msgstr "Σύνδεση"
 
@@ -7275,7 +7300,8 @@ msgid "_Manage..."
 msgstr "Διαχείριση..."
 
 #: gajim/data/gui/preferences_window.ui:2616
-msgid "_Log status changes of contacts"
+#, fuzzy
+msgid "_Store status changes of contacts in history"
 msgstr "Καταγραφή α_λλαγών κατάστασης των επαφών"
 
 #: gajim/data/gui/preferences_window.ui:2633
@@ -7300,10 +7326,15 @@ msgstr ""
 msgid "_Open..."
 msgstr "_Άνοιγμα..."
 
+#: gajim/data/gui/preferences_window.ui:2723 gajim/gtk/advanced_config.py:84
+#, fuzzy
+msgid "Advanced Configuration Editor (ACE)"
+msgstr "Επεξεργασία ρυθμίσεων για προχωρημένους"
+
 #: gajim/data/gui/groupchat_config.ui:55
 #, fuzzy
 msgid ""
-"<b>Jabber-ID</b>\n"
+"<b>XMPP Address</b>\n"
 "&lt;user@domain/resource&gt; (only that resource matches)\n"
 "&lt;user@domain&gt; (any resource matches)\n"
 "&lt;domain/resource&gt; (only that resource matches)\n"
@@ -7322,7 +7353,8 @@ msgstr ""
 msgid "Only Admins and Owners can modify the affiliation"
 msgstr ""
 
-#: gajim/data/gui/groupchat_config.ui:270 gajim/plugins/gui.py:312
+#: gajim/data/gui/groupchat_config.ui:270
+#: gajim/data/gui/groupchat_info_scrolled.ui:210 gajim/plugins/gui.py:324
 #, fuzzy
 msgid "Configuration"
 msgstr "Ρυθμίσεις δωματίου"
@@ -7355,7 +7387,7 @@ msgid "Start _Chat"
 msgstr "Έναρξη _συζήτησης"
 
 #: gajim/data/gui/contact_context_menu.ui:20
-#: gajim/data/gui/systray_context_menu.ui:36
+#: gajim/data/gui/systray_context_menu.ui:29
 msgid "Send Single _Message..."
 msgstr "Αποστολή μονού _μηνύματος"
 
@@ -7424,17 +7456,44 @@ msgstr ""
 
 #: gajim/data/gui/contact_context_menu.ui:174
 #, fuzzy
-msgid "_Add to Roster..."
-msgstr "_Προσθήκη στη λίστα επαφών"
+msgid "_Add to Contact List..."
+msgstr "_Προσθήκη επαφής..."
+
+#: gajim/data/gui/advanced_configuration.ui:39
+#, fuzzy
+msgid "You should restart Gajim for some changes to take effect"
+msgstr ""
+"<b>ΣΗΜΕΙΩΣΗ:</b> Θα πρέπει να επανεκκινήσετε το gajim για να εφαρμοστούν "
+"μερικές ρυθμίσεις"
+
+#: gajim/data/gui/advanced_configuration.ui:71
+#, fuzzy
+msgid "_Filter"
+msgstr "_Φιλτράρισμα:"
+
+#: gajim/data/gui/advanced_configuration.ui:88
+msgid "Type to search for values..."
+msgstr ""
+
+#: gajim/data/gui/advanced_configuration.ui:180
+#, fuzzy
+msgid "_Reset Value"
+msgstr "Επανα_φορά προεπιλεγμένων χρωμάτων"
+
+#: gajim/data/gui/advanced_configuration.ui:185
+#, fuzzy
+msgid "Resets value to default"
+msgstr "Επανα_φορά προεπιλεγμένων χρωμάτων"
 
 #: gajim/data/gui/account_creation_wizard_window.ui:43
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim: Οδηγός δημιουργίας λογαριασμού"
 
 #: gajim/data/gui/account_creation_wizard_window.ui:70
+#, fuzzy
 msgid ""
 "You need to have an account in order to connect\n"
-"to the Jabber network."
+"to the XMPP network."
 msgstr ""
 "Πρέπει να δημιουργήσετε ένα λογαριασμό προτού μπορέσετε\n"
 "να συνδεθείτε στο Jabber."
@@ -7458,8 +7517,9 @@ msgid "<b>Please fill in the data for your existing account</b>"
 msgstr "Παρακαλώ συμπληρώστε τα δεδομένα για τον υπάρχων λογαριασμό σας"
 
 #: gajim/data/gui/account_creation_wizard_window.ui:187
-msgid "_Jabber ID:"
-msgstr "_Jabber ID:"
+#, fuzzy
+msgid "_XMPP Address:"
+msgstr "Αντιγραφή διεύθυνσης email"
 
 #: gajim/data/gui/account_creation_wizard_window.ui:239
 #: gajim/data/gui/account_creation_wizard_window.ui:394
@@ -7549,6 +7609,7 @@ msgid "Privacy Lists:"
 msgstr "Προσωπικές συζητήσεις"
 
 #: gajim/data/gui/service_discovery_window.ui:111
+#: gajim/data/gui/groupchat_creation.ui:227
 #, fuzzy
 msgid "_Address"
 msgstr "_Διεύθυνση:"
@@ -7567,11 +7628,6 @@ msgstr ""
 msgid "Select the contacts you want to synchronise"
 msgstr "το JID της επαφής με την οποία θέλετε να συνομιλήσετε"
 
-#: gajim/data/gui/groupchat_invitation_received.ui:42
-#, fuzzy
-msgid "Group Chat Invitation"
-msgstr "Πρόσκληση ομαδικής κουβέντας"
-
 #: gajim/data/gui/groupchat_invitation_received.ui:111
 #, fuzzy
 msgid "Message..."
@@ -7623,11 +7679,10 @@ msgstr ""
 
 #: gajim/data/gui/add_new_contact_window.ui:84
 #, fuzzy
-msgid "_Jabber ID"
-msgstr "_Jabber ID:"
+msgid "_XMPP Address"
+msgstr "_Διεύθυνση:"
 
 #: gajim/data/gui/add_new_contact_window.ui:100
-#: gajim/data/gui/manage_bookmarks_window.ui:192
 #, fuzzy
 msgid "_Nickname"
 msgstr "_Όνομα χρήστη:"
@@ -7700,7 +7755,7 @@ msgstr "<b>Ιστορικό</b>"
 msgid "<b>Message:</b>"
 msgstr "<b>Προκαθορισμένα μηνύματα κατάστασης</b>"
 
-#: gajim/data/gui/plugins_window.ui:10 gajim/data/gui/application_menu.ui:90
+#: gajim/data/gui/plugins_window.ui:10 gajim/data/gui/application_menu.ui:87
 msgid "Plugins"
 msgstr ""
 
@@ -7813,10 +7868,6 @@ msgstr "Επέτρεψε"
 msgid "Deny"
 msgstr "Άρνηση"
 
-#: gajim/data/gui/privacy_list_window.ui:317
-msgid "JabberID"
-msgstr "JabberID"
-
 #: gajim/data/gui/privacy_list_window.ui:358
 msgid "all in the group"
 msgstr "όλους στην ομάδα"
@@ -7863,7 +7914,7 @@ msgstr "Σειρά:"
 msgid "Manage sounds"
 msgstr "Διαχείριση λογαριασμών"
 
-#: gajim/data/gui/manage_sounds_window.ui:55 gajim/plugins/gui.py:100
+#: gajim/data/gui/manage_sounds_window.ui:55 gajim/plugins/gui.py:101
 msgid "Active"
 msgstr "Ενεργό"
 
@@ -7902,23 +7953,114 @@ msgstr "Αφαίρεση λογαριασμού από το Gajim και από
 msgid "_Personal Events"
 msgstr "Προσωπικές πληροφορίες"
 
-#: gajim/data/gui/account_context_menu.ui:35
-#: gajim/data/gui/systray_context_menu.ui:28
-msgid "Join _Group Chat"
-msgstr "Συμμετοχή σε _ομαδική συζήτηση"
-
-#: gajim/data/gui/account_context_menu.ui:49
+#: gajim/data/gui/account_context_menu.ui:41
 msgid "_Add Contact..."
 msgstr "_Προσθήκη επαφής..."
 
-#: gajim/data/gui/account_context_menu.ui:57
+#: gajim/data/gui/account_context_menu.ui:49
 msgid "_Discover Services"
 msgstr "Εύρεση _υπηρεσιών"
 
-#: gajim/data/gui/account_context_menu.ui:65
+#: gajim/data/gui/account_context_menu.ui:57
 msgid "_Execute Command..."
 msgstr "_Εκτέλεση εντολής..."
 
+#: gajim/data/gui/account_context_menu.ui:65
+#, fuzzy
+msgid "_View Certificate"
+msgstr "Μη έγκυρο όνομα χρήστη"
+
+#: gajim/data/gui/manage_proxies.ui:12
+#, fuzzy
+msgctxt "proxy configuration"
+msgid "HTTP Connect"
+msgstr "Σύνδεση HTTP"
+
+#: gajim/data/gui/manage_proxies.ui:15
+msgctxt "proxy configuration"
+msgid "SOCKS5"
+msgstr ""
+
+#: gajim/data/gui/manage_proxies.ui:18
+#, fuzzy
+msgctxt "proxy configuration"
+msgid "BOSH"
+msgstr "Διεύ_θυνση:"
+
+#: gajim/data/gui/manage_proxies.ui:68
+#, fuzzy
+msgid "Add Proxy"
+msgstr "Μεσολαβητής:"
+
+#: gajim/data/gui/manage_proxies.ui:82
+#, fuzzy
+msgid "Remove Proxy"
+msgstr "Διαγραφή ομάδας"
+
+#: gajim/data/gui/manage_proxies.ui:134
+#, fuzzy
+msgid "Pass_word"
+msgstr "_Κωδικός πρόσβασης:"
+
+#: gajim/data/gui/manage_proxies.ui:159
+#, fuzzy
+msgid "Use proxy auth_entication"
+msgstr "Χρήση πιστοποίησης"
+
+#: gajim/data/gui/manage_proxies.ui:179
+#, fuzzy
+msgid "_Username"
+msgstr "Όν_ομα χρήστη:"
+
+#: gajim/data/gui/manage_proxies.ui:209
+#, fuzzy
+msgid "_Port"
+msgstr "_Θύρα:"
+
+#: gajim/data/gui/manage_proxies.ui:226
+msgid "example.org"
+msgstr ""
+
+#: gajim/data/gui/manage_proxies.ui:240
+#, fuzzy
+msgid "_Host"
+msgstr "Ε_ξυπηρετητής:"
+
+#: gajim/data/gui/manage_proxies.ui:254
+#, fuzzy
+msgid "Use HTTP prox_y"
+msgstr "_Χρήση μεσολαβητή"
+
+#: gajim/data/gui/manage_proxies.ui:275
+msgid "https://example.org/http-bind/"
+msgstr ""
+
+#: gajim/data/gui/manage_proxies.ui:291
+#, fuzzy
+msgid "_BOSH URL"
+msgstr "Διεύ_θυνση:"
+
+#: gajim/data/gui/manage_proxies.ui:309 gajim/gtk/adhoc.py:322
+#, fuzzy
+msgid "Settings"
+msgstr "Η δημοσιοποίηση της vCard απέτυχε"
+
+#: gajim/data/gui/manage_proxies.ui:344
+#, fuzzy
+msgid "_Type"
+msgstr "Τύπος:"
+
+#: gajim/data/gui/manage_proxies.ui:361
+#: gajim/data/gui/groupchat_creation.ui:105
+#, fuzzy
+msgid "_Name"
+msgstr "_Όνομα:"
+
+#: gajim/data/gui/manage_proxies.ui:391 gajim/gtk/accounts.py:742
+#, fuzzy
+msgid "Proxy"
+msgstr "Μεσολαβητής:"
+
 #: gajim/data/gui/application_menu.ui:8
 #, fuzzy
 msgid "View"
@@ -7926,8 +8068,8 @@ msgstr "_Προβολή"
 
 #: gajim/data/gui/application_menu.ui:11
 #, fuzzy
-msgid "Show Roster"
-msgstr "Εμφάνιση _λίστας επαφών"
+msgid "Show Contact List"
+msgstr "Εμφάνιση _αποσυνδεδεμένων χρηστών"
 
 #: gajim/data/gui/application_menu.ui:16
 #, fuzzy
@@ -7969,23 +8111,24 @@ msgstr ""
 msgid "Features"
 msgstr "Χαρακτηριστικά διακομιστή"
 
-#: gajim/data/gui/application_menu.ui:81
+#: gajim/data/gui/application_menu.ui:77
+#: gajim/data/gui/groupchat_creation.ui:81 gajim/gtk/groupchat_creation.py:45
 #, fuzzy
-msgid "Bookmarks"
-msgstr "_Τοποθέτηση σελιδοδείκτη για αυτό το δωμάτιο"
+msgid "Create Group Chat"
+msgstr "Ομαδικές συζητήσεις"
 
-#: gajim/data/gui/application_menu.ui:94 gajim/data/gui/shortcuts_window.ui:189
-#: gajim/gtk/preferences.py:59
+#: gajim/data/gui/application_menu.ui:91 gajim/data/gui/shortcuts_window.ui:189
+#: gajim/gtk/preferences.py:58
 msgid "Preferences"
 msgstr "Προτιμήσεις"
 
-#: gajim/data/gui/application_menu.ui:99
+#: gajim/data/gui/application_menu.ui:96
 #, fuzzy
 msgid "Quit"
 msgstr "_Έξοδος"
 
 #: gajim/data/gui/httpupload_progress_dialog.ui:110
-#: gajim/gtk/filetransfer.py:121
+#: gajim/gtk/filetransfer.py:120
 msgid "Progress"
 msgstr "Πρόοδος"
 
@@ -8002,52 +8145,33 @@ msgstr ""
 msgid "_Cancel Upload"
 msgstr "_Άκυρο"
 
-#: gajim/data/gui/manage_bookmarks_window.ui:13
-#, fuzzy
-msgid "Group Chat Bookmarks"
-msgstr "Ομαδική συζήτηση"
-
-#: gajim/data/gui/manage_bookmarks_window.ui:68
-#, fuzzy
-msgid "Add Bookmark"
-msgstr "_Τοποθέτηση σελιδοδείκτη για αυτό το δωμάτιο"
-
-#: gajim/data/gui/manage_bookmarks_window.ui:82
-#, fuzzy
-msgid "Remove Bookmark"
-msgstr "_Τοποθέτηση σελιδοδείκτη για αυτό το δωμάτιο"
+#: gajim/data/gui/groupchat_creation.ui:27
+msgid "Public or Private?"
+msgstr ""
 
-#: gajim/data/gui/manage_bookmarks_window.ui:126
-msgid "N_ame"
+#: 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 ""
 
-#: gajim/data/gui/manage_bookmarks_window.ui:145
-#, fuzzy
-msgid "Bookmark Name"
-msgstr "_Τοποθέτηση σελιδοδείκτη για αυτό το δωμάτιο"
+#: gajim/data/gui/groupchat_creation.ui:58
+msgid "<b>Public:</b> Anyone who knows the address can join."
+msgstr ""
 
-#: gajim/data/gui/manage_bookmarks_window.ui:160
+#: gajim/data/gui/groupchat_creation.ui:122
 #, fuzzy
-msgid "_Server"
-msgstr "_Εξυπηρετητής:"
+msgid "_Description"
+msgstr "Περιγραφή"
 
-#: gajim/data/gui/manage_bookmarks_window.ui:223
-msgid "Roo_m"
+#: gajim/data/gui/groupchat_creation.ui:164
+msgid "_Public"
 msgstr ""
 
-#: gajim/data/gui/manage_bookmarks_window.ui:253
-#, fuzzy
-msgid "_Password"
-msgstr "_Κωδικός πρόσβασης:"
-
-#: gajim/data/gui/manage_bookmarks_window.ui:299
+#: gajim/data/gui/groupchat_creation.ui:278
 #, fuzzy
-msgid "Join chat when connected"
-msgstr "Αποσύνδεση επαφής"
-
-#: gajim/data/gui/manage_bookmarks_window.ui:307
-msgid "_Join Automatically"
-msgstr ""
+msgid "_Account"
+msgstr "Λογαριασμοί"
 
 #: gajim/data/gui/exception_dialog.ui:49
 msgid "Sorry, that should not have happened"
@@ -8093,6 +8217,28 @@ msgstr ""
 msgid "Presets"
 msgstr "_Παρουσία"
 
+#: gajim/data/gui/groupchat_info_scrolled.ui:32
+msgid "Address"
+msgstr "Διεύθυνση"
+
+#: gajim/data/gui/groupchat_info_scrolled.ui:64
+msgid "Topic"
+msgstr ""
+
+#: gajim/data/gui/groupchat_info_scrolled.ui:80
+#, fuzzy
+msgid "Author"
+msgstr "Αμερική/Πορτ-Ο-Πρενς"
+
+#: gajim/data/gui/groupchat_info_scrolled.ui:182
+msgid "Discussion Logs"
+msgstr ""
+
+#: gajim/data/gui/groupchat_info_scrolled.ui:260
+#, fuzzy
+msgid "Group Chat Language"
+msgstr "Πρόσκληση ομαδικής κουβέντας"
+
 #: gajim/data/gui/emoji_chooser.ui:98
 msgid "No Results Found"
 msgstr ""
@@ -8104,24 +8250,34 @@ msgstr ""
 #: gajim/data/gui/chat_to_muc_window.ui:39
 #, fuzzy
 msgid ""
-"You are now entering a groupchat.\n"
+"You are now entering a group chat.\n"
 "Select the contacts you want to invite"
 msgstr "το JID της επαφής με την οποία θέλετε να συνομιλήσετε"
 
 #: gajim/data/gui/chat_to_muc_window.ui:112
-msgid "Please select a MUC server."
-msgstr ""
+#, fuzzy
+msgid "Please select a group chat server."
+msgstr "Αυτή η μορφή συμπίεσης δεν υποστηρίζεται:"
 
 #: gajim/data/gui/chat_to_muc_window.ui:141
 #, fuzzy
-msgid "MUC server"
-msgstr "Παρατηρητές"
+msgid "Group chat server"
+msgstr "Ομαδικές συζητήσεις"
 
 #: gajim/data/gui/chat_to_muc_window.ui:176
 #, fuzzy
 msgid "In_vite"
 msgstr "Αδυναμία φόρτωσης"
 
+#: gajim/data/gui/bookmarks.ui:176
+#, fuzzy
+msgid "Autojoin"
+msgstr "Αυτόματη είσοδος"
+
+#: gajim/data/gui/bookmarks.ui:211
+msgid "_Apply"
+msgstr ""
+
 #: gajim/data/gui/history_manager.ui:11
 #, fuzzy
 msgid "_Export"
@@ -8138,11 +8294,11 @@ msgstr "Διαχειριστής βάσης δεδομένων ιστορικο�
 
 #: gajim/data/gui/history_manager.ui:108
 msgid ""
-"This log manager is not intended for log viewing. If you are looking for "
-"such functionality, use the history window instead.\n"
+"This history manager is not intended for viewing chat history. If you are "
+"looking for such functionality, please use the history window instead.\n"
 "\n"
-"Use this program to delete or export logs. You can select logs from the left "
-"and/or search database from below."
+"You can use this program to delete or export history. Either select logs "
+"from the left or search the database."
 msgstr ""
 
 #: gajim/data/gui/history_manager.ui:124
@@ -8197,8 +8353,9 @@ msgid "Select an emoji"
 msgstr "_Χρήση συμβόλων"
 
 #: gajim/data/gui/shortcuts_window.ui:38
-msgid "Complete a command or a nick"
-msgstr ""
+#, fuzzy
+msgid "Complete a command or a nickname"
+msgstr "Δημιουργία νέου προφίλ"
 
 #: gajim/data/gui/shortcuts_window.ui:45
 #, fuzzy
@@ -8238,7 +8395,7 @@ msgstr ""
 msgid "Scroll down"
 msgstr ""
 
-#: gajim/data/gui/shortcuts_window.ui:100 gajim/gtk/xml_console.py:72
+#: gajim/data/gui/shortcuts_window.ui:100 gajim/gtk/xml_console.py:69
 #, fuzzy
 msgid "Clear"
 msgstr "Απόγευμα"
@@ -8280,8 +8437,9 @@ msgid "Close chat"
 msgstr ""
 
 #: gajim/data/gui/shortcuts_window.ui:173
-msgid "Roster Shortcuts"
-msgstr ""
+#, fuzzy
+msgid "Contact List Shortcuts"
+msgstr "Αποσύνδεση επαφής"
 
 #: gajim/data/gui/shortcuts_window.ui:196
 #, fuzzy
@@ -8314,7 +8472,7 @@ msgid "Show only active contacts"
 msgstr "Εμφάνιση _αποσυνδεδεμένων χρηστών"
 
 #: gajim/data/gui/shortcuts_window.ui:251
-msgid "Enable roster filtering"
+msgid "Enable contact list filtering"
 msgstr ""
 
 #: gajim/data/gui/shortcuts_window.ui:259
@@ -8360,12 +8518,12 @@ msgid "Search selected day only"
 msgstr ""
 
 #: gajim/data/gui/history_window.ui:317
-msgid "Record history for this chat"
+msgid "Store history for this chat"
 msgstr ""
 
 #: gajim/data/gui/history_window.ui:332
 #, fuzzy
-msgid "Record History"
+msgid "Store History"
 msgstr "Καταγραφή ιστορικού"
 
 #: gajim/data/gui/history_window.ui:350
@@ -8388,9 +8546,10 @@ msgstr "Δημιουργία νέου προφίλ"
 msgid "Fill in the form."
 msgstr "Εκτέλεση στο Τερματικό"
 
-#: gajim/data/gui/data_form_window.ui:229
-msgid "Room Configuration"
-msgstr "Ρυθμίσεις δωματίου"
+#: gajim/data/gui/data_form_window.ui:229 gajim/gtk/groupchat_config.py:41
+#, fuzzy
+msgid "Group Chat Configuration"
+msgstr "Πρόσκληση ομαδικής κουβέντας"
 
 #: gajim/data/gui/roster_item_exchange_window.ui:39
 #: gajim/gtk/roster_item_exchange.py:35
@@ -8412,15 +8571,15 @@ msgstr "Κατάσ_ταση"
 msgid "_Start Chat..."
 msgstr "_Έναρξη συζήτησης"
 
-#: gajim/data/gui/systray_context_menu.ui:50
+#: gajim/data/gui/systray_context_menu.ui:43
 msgid "Show All Pending _Events"
 msgstr "Εμφάνιση όλων των γεγονότων που εκκρεμούν"
 
-#: gajim/data/gui/systray_context_menu.ui:59
+#: gajim/data/gui/systray_context_menu.ui:52
 msgid "Mute Sounds"
 msgstr "Σίγαση ήχων"
 
-#: gajim/data/gui/systray_context_menu.ui:75
+#: gajim/data/gui/systray_context_menu.ui:68
 #, fuzzy
 msgid "_Preferences"
 msgstr "Προτιμήσεις"
@@ -8513,34 +8672,34 @@ msgstr ""
 msgid "Execute expression inside a shell, send output"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:45
+#: gajim/command_system/implementation/standard.py:47
 msgid ""
 "Show help on a given command or a list of available commands if -a is given"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:73
+#: gajim/command_system/implementation/standard.py:75
 #, fuzzy
 msgid "Send a message to the contact"
 msgstr "Χρήση: /%s, αποκρύπτει τα κουμπιά της κουβέντας."
 
-#: gajim/command_system/implementation/standard.py:78
+#: gajim/command_system/implementation/standard.py:80
 msgid "Send action (in the third person) to the current chat"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:83
+#: gajim/command_system/implementation/standard.py:85
 msgid "Show logged messages which mention given text"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:88
+#: gajim/command_system/implementation/standard.py:90
 #, fuzzy, python-format
 msgid "%s: Nothing found"
 msgstr "μη υπαρκτό %s"
 
-#: gajim/command_system/implementation/standard.py:94
+#: gajim/command_system/implementation/standard.py:96
 msgid "Limit must be an integer"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:118
+#: gajim/command_system/implementation/standard.py:120
 msgid ""
 "\n"
 "    Set the current status\n"
@@ -8550,134 +8709,134 @@ msgid ""
 "    "
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:136
+#: gajim/command_system/implementation/standard.py:138
 msgid "Set the current status to away"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:150
+#: gajim/command_system/implementation/standard.py:152
 msgid "Set the current status to online"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:153
+#: gajim/command_system/implementation/standard.py:155
 #, fuzzy
 msgid "Available"
 msgstr "Μη διαθέσιμος"
 
-#: gajim/command_system/implementation/standard.py:173
-#: gajim/command_system/implementation/standard.py:250
+#: gajim/command_system/implementation/standard.py:175
+#: gajim/command_system/implementation/standard.py:252
 #, fuzzy
 msgid "Clear the text window"
 msgstr "Χρήση: /%s, καθαρίζει το παράθυρο από το κείμενο."
 
-#: gajim/command_system/implementation/standard.py:178
-#: gajim/command_system/implementation/standard.py:397
+#: gajim/command_system/implementation/standard.py:180
+#: gajim/command_system/implementation/standard.py:401
 #, fuzzy
 msgid "Send a ping to the contact"
 msgstr ""
 "Χρήση: /%s, θέτει το παράθυρο της ομαδικής κουβέντας σε συμπαγή κατάσταση."
 
-#: gajim/command_system/implementation/standard.py:181
-#: gajim/command_system/implementation/standard.py:400
+#: gajim/command_system/implementation/standard.py:183
+#: gajim/command_system/implementation/standard.py:404
 msgid "Command is not supported for zeroconf accounts"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:185
-msgid "Send DTMF sequence through an open audio session"
+#: gajim/command_system/implementation/standard.py:187
+msgid "Send DTMF sequence through an open voice chat"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:188
+#: gajim/command_system/implementation/standard.py:190
 #, fuzzy
-msgid "No open audio sessions with the contact"
+msgid "No open voice chats with the contact"
 msgstr "Πατήστε για να δείτε παλιότερες συζητήσεις με αυτή την επαφή"
 
-#: gajim/command_system/implementation/standard.py:191
+#: gajim/command_system/implementation/standard.py:193
 #, python-format
 msgid "%s is not a valid tone"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:198
-msgid "Toggle audio session"
+#: gajim/command_system/implementation/standard.py:200
+msgid "Toggle Voice Chat"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:201
+#: gajim/command_system/implementation/standard.py:203
 #, fuzzy
-msgid "Audio sessions are not available"
+msgid "Voice chats are not available"
 msgstr "To Session bus δεν είναι διαθέσιμο"
 
-#: gajim/command_system/implementation/standard.py:208
-msgid "Toggle video session"
+#: gajim/command_system/implementation/standard.py:210
+msgid "Toggle Video Chat"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:211
+#: gajim/command_system/implementation/standard.py:213
 #, fuzzy
-msgid "Video sessions are not available"
+msgid "Video chats are not available"
 msgstr "To Session bus δεν είναι διαθέσιμο"
 
-#: gajim/command_system/implementation/standard.py:218
+#: gajim/command_system/implementation/standard.py:220
 #, fuzzy
 msgid "Send a message to the contact that will attract their attention"
 msgstr "Χρήση: /%s, αποκρύπτει τα κουμπιά της κουβέντας."
 
-#: gajim/command_system/implementation/standard.py:255
+#: gajim/command_system/implementation/standard.py:257
 #, fuzzy
 msgid "Change your nickname in a group chat"
 msgstr "Αλλαγή _ψευδώνυμου"
 
-#: gajim/command_system/implementation/standard.py:260 gajim/gtk/dialogs.py:674
-#: gajim/gtk/bookmarks.py:272
+#: gajim/command_system/implementation/standard.py:262
 #, fuzzy
 msgid "Invalid nickname"
 msgstr "Μη έγκυρο όνομα χρήστη"
 
-#: gajim/command_system/implementation/standard.py:267
+#: gajim/command_system/implementation/standard.py:269
 #, fuzzy
-msgid "Open a private chat window with a specified occupant"
+msgid "Open a private chat window with a specified participant"
 msgstr ""
 "Χρήση: /%s <ψευδώνυμο>, ανοίγει ένα παράθυρο προσωπικής κουβέντας με το "
 "συγκεκριμένο χρήστη."
 
-#: gajim/command_system/implementation/standard.py:273
-#: gajim/command_system/implementation/standard.py:282
-#: gajim/command_system/implementation/standard.py:332
-#: gajim/command_system/implementation/standard.py:345
-#: gajim/command_system/implementation/standard.py:357
+#: gajim/command_system/implementation/standard.py:275
+#: gajim/command_system/implementation/standard.py:284
+#: gajim/command_system/implementation/standard.py:336
+#: gajim/command_system/implementation/standard.py:349
+#: gajim/command_system/implementation/standard.py:361
 #, fuzzy
 msgid "Nickname not found"
 msgstr "Δεν βρέθηκε το ψευδώνυμο: %s"
 
-#: gajim/command_system/implementation/standard.py:276
+#: gajim/command_system/implementation/standard.py:278
 #, fuzzy
 msgid ""
-"Open a private chat window with a specified occupant and send him a message"
+"Open a private chat window with a specified participant and send him a "
+"message"
 msgstr ""
 "Χρήση: /%s <ψευδώνυμο>, ανοίγει ένα παράθυρο προσωπικής κουβέντας με το "
 "συγκεκριμένο χρήστη."
 
-#: gajim/command_system/implementation/standard.py:285
+#: gajim/command_system/implementation/standard.py:287
 #, fuzzy
 msgid "Display or change a group chat topic"
 msgstr "Ερώτηση πριν το κλείσιμο καρτέλας/παραθύρου ομαδικής κουβέντας."
 
-#: gajim/command_system/implementation/standard.py:294
-msgid "Invite a user to a room for a reason"
+#: gajim/command_system/implementation/standard.py:296
+msgid "Invite a user to a group chat for a reason"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:297
+#: gajim/command_system/implementation/standard.py:299
 #, fuzzy, python-format
 msgid "Invited %(jid)s to %(room_jid)s"
 msgstr "Προσκαλέσατε τον/την %(contact_jid)s στο %(room_jid)s."
 
-#: gajim/command_system/implementation/standard.py:301
+#: gajim/command_system/implementation/standard.py:303
 #, fuzzy
-msgid "Join a group chat given by a JID"
+msgid "Join a group chat given by an XMPP Address"
 msgstr "Συμμετοχή σε _ομαδική συζήτηση"
 
-#: gajim/command_system/implementation/standard.py:309
+#: gajim/command_system/implementation/standard.py:313
 msgid ""
-"Leave the groupchat, optionally giving a reason, and close tab or window"
+"Leave the group chat, optionally giving a reason, and close tab or window"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:314
+#: gajim/command_system/implementation/standard.py:318
 msgid ""
 "\n"
 "    Ban user by a nick or a JID from a groupchat\n"
@@ -8686,46 +8845,46 @@ msgid ""
 "    "
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:329
+#: gajim/command_system/implementation/standard.py:333
 #, fuzzy
-msgid "Kick user by a nick from a groupchat"
+msgid "Kick user by a nick from a group chat"
 msgstr "Ο/Η %s μπήκε στο δωμάτιο"
 
-#: gajim/command_system/implementation/standard.py:338
+#: gajim/command_system/implementation/standard.py:342
 msgid ""
-"Set occupant role in group chat.\n"
+"Set participant role in group chat.\n"
 "    Role can be given as one of the following values:\n"
 "    moderator, participant, visitor, none"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:343
+#: gajim/command_system/implementation/standard.py:347
 #, fuzzy
 msgid "Invalid role given"
 msgstr "Μη έγκυρο όνομα χρήστη"
 
-#: gajim/command_system/implementation/standard.py:350
+#: gajim/command_system/implementation/standard.py:354
 msgid ""
-"Set occupant affiliation in group chat.\n"
+"Set participant affiliation in group chat.\n"
 "    Affiliation can be given as one of the following values:\n"
 "    owner, admin, member, outcast, none"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:355
+#: gajim/command_system/implementation/standard.py:359
 #, fuzzy
 msgid "Invalid affiliation given"
 msgstr "Συσχέτιση: "
 
-#: gajim/command_system/implementation/standard.py:365
+#: gajim/command_system/implementation/standard.py:369
 #, fuzzy
-msgid "Display names of all group chat occupants"
+msgid "Display names of all group chat participants"
 msgstr "Χρήση: /%s [θέμα], εμφανίζει ή αλλάζει το θέμα στο τρέχον δωμάτιο."
 
-#: gajim/command_system/implementation/standard.py:387
-msgid "Forbid an occupant to send you public or private messages"
+#: gajim/command_system/implementation/standard.py:391
+msgid "Forbid a participant to send you public or private messages"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:392
-msgid "Allow an occupant to send you public or private messages"
+#: gajim/command_system/implementation/standard.py:396
+msgid "Allow a participant to send you public or private messages"
 msgstr ""
 
 #: gajim/command_system/implementation/middleware.py:74
@@ -8736,204 +8895,331 @@ msgstr ""
 msgid "The same as using a doc-string, except it supports translation"
 msgstr ""
 
-#: gajim/gtk/filetransfer.py:91
+#: gajim/gtk/groupchat_info.py:36
+#, fuzzy
+msgid "?Group chat feature:Archiving"
+msgstr "Πρόσκληση ομαδικής κουβέντας"
+
+#: gajim/gtk/groupchat_info.py:37
+#, fuzzy
+msgid "Messages are archived on the server"
+msgstr "Δεν είστε συνδεδεμένος στο διακομιστή"
+
+#: gajim/gtk/groupchat_info.py:40
+#, fuzzy
+msgid "?Group chat feature:Persistent"
+msgstr "Ομαδικές συζητήσεις"
+
+#: gajim/gtk/groupchat_info.py:41
+msgid "This group chat persists even if there are no participants"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:45
+#, fuzzy
+msgid "?Group chat feature:Temporary"
+msgstr "Κανένας"
+
+#: gajim/gtk/groupchat_info.py:46
+msgid "This group chat will be destroyed once the last participant left"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:50
+#, fuzzy
+msgid "?Group chat feature:Moderated"
+msgstr "Κανένας"
+
+#: gajim/gtk/groupchat_info.py:51
+msgid ""
+"Participants entering this group chat need to request permission to send "
+"messages"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:55
+#, fuzzy
+msgid "?Group chat feature:Not Moderated"
+msgstr "Ομαδικές συζητήσεις"
+
+#: gajim/gtk/groupchat_info.py:56
+msgid "Participants entering this group chat are allowed to send messages"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:60
+#, fuzzy
+msgid "?Group chat feature:Open"
+msgstr "Κανένας"
+
+#: gajim/gtk/groupchat_info.py:61
+#, fuzzy
+msgid "Anyone can join this group chat"
+msgstr "Ο/Η %s μπήκε στο δωμάτιο"
+
+#: gajim/gtk/groupchat_info.py:64
+#, fuzzy
+msgid "?Group chat feature:Members Only"
+msgstr "Επισήμανση "
+
+#: gajim/gtk/groupchat_info.py:65
+msgid "This group chat is restricted to members only"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:69
+#, fuzzy
+msgid "?Group chat feature:Public"
+msgstr "Επισήμανση "
+
+#: gajim/gtk/groupchat_info.py:70
+msgid "Group chat can be found via search"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:73
+#, fuzzy
+msgid "?Group chat feature:Hidden"
+msgstr "Κανένας"
+
+#: gajim/gtk/groupchat_info.py:74
+#, fuzzy
+msgid "This group chat can not be found via search"
+msgstr "Αυτό το δωμάτιο δεν έχει θέμα"
+
+#: gajim/gtk/groupchat_info.py:77
+#, fuzzy
+msgid "?Group chat feature:Not Anonymous"
+msgstr "Ομαδικές συζητήσεις"
+
+#: gajim/gtk/groupchat_info.py:78
+msgid "All other group chat participants can see your XMPP address"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:82
+#, fuzzy
+msgid "?Group chat feature:Semi-Anonymous"
+msgstr "Επισήμανση "
+
+#: gajim/gtk/groupchat_info.py:83
+msgid "Only moderators can see your XMPP address"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:86
+#, fuzzy
+msgid "?Group chat feature:Password Required"
+msgstr "Ομαδικές συζητήσεις"
+
+#: gajim/gtk/groupchat_info.py:87
+msgid "This group chat does require a password upon entry"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:91
+#, fuzzy
+msgid "?Group chat feature:No Password Required"
+msgstr "Ομαδικές συζητήσεις"
+
+#: gajim/gtk/groupchat_info.py:92
+msgid "This group chat does not require a password upon entry"
+msgstr ""
+
+#: gajim/gtk/filetransfer.py:90
 msgid "File"
 msgstr "Αρχείο"
 
-#: gajim/gtk/filetransfer.py:108
+#: gajim/gtk/filetransfer.py:107
 msgid "Time"
 msgstr "Χρόνος"
 
-#: gajim/gtk/filetransfer.py:228
+#: gajim/gtk/filetransfer.py:227
 #, fuzzy, python-format
 msgid "File name: %s"
 msgstr "Όνομα αρχείου: %s"
 
-#: gajim/gtk/filetransfer.py:229 gajim/gtk/filetransfer.py:464
+#: gajim/gtk/filetransfer.py:228 gajim/gtk/filetransfer.py:469
 #, python-format
 msgid "Size: %s"
 msgstr "Mέγεθος: %s"
 
-#: gajim/gtk/filetransfer.py:239
+#: gajim/gtk/filetransfer.py:238
 #, python-format
 msgid "Sender: %s"
 msgstr "Αποστολέας: %s"
 
-#: gajim/gtk/filetransfer.py:240 gajim/gtk/filetransfer.py:744
+#: gajim/gtk/filetransfer.py:239 gajim/gtk/filetransfer.py:749
 #: gajim/gtk/tooltips.py:577
 msgid "Recipient: "
 msgstr "Παραλήπτης: "
 
-#: gajim/gtk/filetransfer.py:251
+#: gajim/gtk/filetransfer.py:250
 #, python-format
 msgid "Saved in: %s"
 msgstr "Αποθηκεύτηκε στο: %s"
 
-#: gajim/gtk/filetransfer.py:256
+#: gajim/gtk/filetransfer.py:255
 msgid "File transfer completed"
 msgstr "Η μεταφορά αρχείου ολοκληρώθηκε"
 
-#: gajim/gtk/filetransfer.py:276 gajim/gtk/filetransfer.py:285
+#: gajim/gtk/filetransfer.py:275 gajim/gtk/filetransfer.py:284
 #, fuzzy
 msgid "Connection with peer could not be established."
 msgstr "Η σύνδεση με τον απομακρυσμένο ομότιμο δεν ήταν εφικτή."
 
-#: gajim/gtk/filetransfer.py:293
+#: gajim/gtk/filetransfer.py:292
 #, python-format
 msgid "Filename: %s"
 msgstr "Όνομα αρχείου: %s"
 
-#: gajim/gtk/filetransfer.py:294
+#: gajim/gtk/filetransfer.py:293
 #, python-format
 msgid "Recipient: %s"
 msgstr "Παραλήπτης: %s"
 
-#: gajim/gtk/filetransfer.py:296
+#: gajim/gtk/filetransfer.py:295
 #, python-format
 msgid "Error message: %s"
 msgstr "Μήνυμα σφάλματος: %s"
 
-#: gajim/gtk/filetransfer.py:333
-#, fuzzy
-msgid "File transfer error"
-msgstr "Σφάλμα μεταφοράς αρχείου"
-
 #: gajim/gtk/filetransfer.py:334
 #, python-format
 msgid ""
-"The file %(file)s has been received, but it seems to have been damaged along "
-"the way.\n"
+"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 ""
 
-#: gajim/gtk/filetransfer.py:350
+#: gajim/gtk/filetransfer.py:340
+#, fuzzy
+msgid "_Download Again"
+msgstr "Μη_ν με ξαναρωτήσεις"
+
+#: gajim/gtk/filetransfer.py:355
 #, fuzzy
 msgid "Gajim can not read this file"
 msgstr "Το Gajim δεν έχει πρόσβαση σε αυτό το αρχείο"
 
-#: gajim/gtk/filetransfer.py:351
+#: gajim/gtk/filetransfer.py:356
 msgid "Another process is using this file."
 msgstr ""
 
-#: gajim/gtk/filetransfer.py:418
+#: gajim/gtk/filetransfer.py:423
 #, fuzzy
 msgid "File Transfer Conflict"
 msgstr "Η μεταφορά αρχείου ολοκληρώθηκε"
 
-#: gajim/gtk/filetransfer.py:419
+#: gajim/gtk/filetransfer.py:424
 msgid "This file already exists"
 msgstr "Αυτό το αρχείο υπάρχει ήδη"
 
-#: gajim/gtk/filetransfer.py:420
+#: gajim/gtk/filetransfer.py:425
 msgid "Resume download or replace file?"
 msgstr ""
 
-#: gajim/gtk/filetransfer.py:424
+#: gajim/gtk/filetransfer.py:429
 #, fuzzy
 msgid "Replace _File"
 msgstr "Απόγευμα"
 
-#: gajim/gtk/filetransfer.py:427
+#: gajim/gtk/filetransfer.py:432
 #, fuzzy
 msgid "Resume _Download"
 msgstr "Λήψη"
 
-#: gajim/gtk/filetransfer.py:437
+#: gajim/gtk/filetransfer.py:442
 #, fuzzy, python-format
 msgid "Directory '%s' is not writable"
 msgstr "Δεν είναι δυνατή η εγγραφή στον κατάλογο \"%s\""
 
-#: gajim/gtk/filetransfer.py:438
+#: gajim/gtk/filetransfer.py:443
 #, fuzzy
 msgid "You do not have permissions to create files in this directory."
 msgstr "Δε μπορείτε να δημιουργήσετε αρχεία σε αυτό τον κατάλογο."
 
-#: gajim/gtk/filetransfer.py:461
+#: gajim/gtk/filetransfer.py:466
 #, python-format
 msgid "File: %s"
 msgstr "Αρχείο: %s"
 
-#: gajim/gtk/filetransfer.py:467
+#: gajim/gtk/filetransfer.py:472
 #, python-format
 msgid "Type: %s"
 msgstr "Τύπος: %s"
 
-#: gajim/gtk/filetransfer.py:469
+#: gajim/gtk/filetransfer.py:474
 #, python-format
 msgid "Description: %s"
 msgstr "Περιγραφή: %s"
 
-#: gajim/gtk/filetransfer.py:480
+#: gajim/gtk/filetransfer.py:485
 #, fuzzy, python-format
 msgid "%s wants to send you a file"
 msgstr "O/Η %s επιθυμεί να σας στείλει ένα αρχείο."
 
-#: gajim/gtk/filetransfer.py:509
+#: gajim/gtk/filetransfer.py:514
 #, fuzzy
 msgid "Checking file…"
 msgstr "Όνομα προφίλ:"
 
-#: gajim/gtk/filetransfer.py:524
+#: gajim/gtk/filetransfer.py:529
 #, fuzzy
 msgid "File error"
 msgstr "Σφάλμα μεταφοράς αρχείου"
 
-#: gajim/gtk/filetransfer.py:561
+#: gajim/gtk/filetransfer.py:566
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 
-#: gajim/gtk/filetransfer.py:658
+#: gajim/gtk/filetransfer.py:663
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/δεπτ)"
 
-#: gajim/gtk/filetransfer.py:711 gajim/gtk/filetransfer.py:715
+#: gajim/gtk/filetransfer.py:716 gajim/gtk/filetransfer.py:720
 msgid "Invalid File"
 msgstr "Μη έγκυρο αρχείο"
 
-#: gajim/gtk/filetransfer.py:711
+#: gajim/gtk/filetransfer.py:716
 msgid "File: "
 msgstr "Αρχείο:"
 
-#: gajim/gtk/filetransfer.py:716
+#: gajim/gtk/filetransfer.py:721
 msgid "It is not possible to send empty files"
 msgstr "Δεν είναι δυνατό να στείλετε άδεια αρχεία"
 
-#: gajim/gtk/filetransfer.py:742 gajim/gtk/tooltips.py:571
+#: gajim/gtk/filetransfer.py:747 gajim/gtk/tooltips.py:571
 msgid "Sender: "
 msgstr "Αποστολέας: "
 
-#: gajim/gtk/filetransfer.py:1038
+#: gajim/gtk/filetransfer.py:1043
 #, fuzzy
 msgid "Choose a File to Send…"
 msgstr "Επιλέξτε το αρχείο που θα σταλεί..."
 
 #: gajim/gtk/start_chat.py:51
 #, fuzzy
-msgid "Start new Conversation"
+msgid "Start New Conversation"
 msgstr "Σύνδεση"
 
-#: gajim/gtk/start_chat.py:424
-#, fuzzy
-msgid "New Groupchat"
-msgstr "Αρχηγός ομάδας παραθύρων"
+#: gajim/gtk/start_chat.py:260 gajim/gtk/start_chat.py:328
+msgid "You can not join a group chat unless you are connected."
+msgstr ""
+"Δε μπορείτε να συμμετάσχετε σε μια ομαδική συζήτηση εκτός αν είστε "
+"συνδεδεμένος."
+
+#: gajim/gtk/start_chat.py:603 gajim/gtk/groupchat_join.py:38
+msgid "Join Group Chat"
+msgstr "Συμμετοχή σε ομαδική κουβέντα"
 
-#: gajim/gtk/start_chat.py:426
+#: gajim/gtk/start_chat.py:605 gajim/gtk/add_contact.py:40
 #, fuzzy
-msgid "New Contact"
-msgstr "Προσθήκη νέας επαφής"
+msgid "Add Contact"
+msgstr "_Προσθήκη επαφής..."
 
-#: gajim/gtk/start_chat.py:588
+#: gajim/gtk/start_chat.py:746
 #, fuzzy, python-format
-msgid "%s Group chats found"
+msgid "%s group chats found"
 msgstr "μη υπαρκτό %s"
 
-#: gajim/gtk/discovery.py:70
+#: gajim/gtk/discovery.py:69
 msgid "This service has not yet responded with detailed information"
 msgstr "Αυτή η υπηρεσία δεν έχει απαντήσει ακόμα με λεπτομερείς πληροφορίες"
 
-#: gajim/gtk/discovery.py:71
+#: gajim/gtk/discovery.py:70
 #, fuzzy
 msgid ""
 "This service could not respond with detailed information.\n"
@@ -8942,32 +9228,33 @@ msgstr ""
 "Αυτή η υπηρεσία δεν μπόρεσε να απαντήσει με λεπτομερείς πληροφορίες.\n"
 "Είναι είτε χαλασμένη είτε πεπαλαιωμένη."
 
-#: gajim/gtk/discovery.py:128
+#: gajim/gtk/discovery.py:126
 msgid "Others"
 msgstr "Άλλα"
 
-#: gajim/gtk/discovery.py:131
-msgid "Conference"
-msgstr "Ομαδικές συζητήσεις"
+#: gajim/gtk/discovery.py:129
+#, fuzzy
+msgid "Group Chat"
+msgstr "_Ομαδική συζήτηση"
 
-#: gajim/gtk/discovery.py:519
+#: gajim/gtk/discovery.py:518
 msgid "Without a connection, you can not browse available services"
 msgstr "Πρέπει να συνδεθείτε για να περιηγηθείτε στις υπηρεσίες"
 
-#: gajim/gtk/discovery.py:606
+#: gajim/gtk/discovery.py:605
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Ανακάλυψη υπηρεσιών χρησιμοποιώντας το λογαριασμό %s"
 
-#: gajim/gtk/discovery.py:608
+#: gajim/gtk/discovery.py:607
 msgid "Service Discovery"
 msgstr "Ανακάλυψη υπηρεσιών"
 
-#: gajim/gtk/discovery.py:691
+#: gajim/gtk/discovery.py:690
 msgid "The service could not be found"
 msgstr "Η υπηρεσία δεν ήταν δυνατό να βρεθεί"
 
-#: gajim/gtk/discovery.py:692
+#: gajim/gtk/discovery.py:691
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -8975,104 +9262,82 @@ msgstr ""
 "Δεν υπάρχει υπηρεσία στη διεύθυνση που εισάγατε, ή δεν ανταποκρίνεται. "
 "Ελέγξτε τη διεύθυνση και προσπαθήστε ξανά."
 
-#: gajim/gtk/discovery.py:699 gajim/gtk/discovery.py:1042
+#: gajim/gtk/discovery.py:698 gajim/gtk/discovery.py:1041
 msgid "The service is not browsable"
 msgstr "Η υπηρεσία δεν είναι περιηγήσιμη"
 
-#: gajim/gtk/discovery.py:700
+#: gajim/gtk/discovery.py:699
 msgid "This type of service does not contain any items to browse."
 msgstr "Αυτού του είδους η υπηρεσία δεν περιέχει άλλα αντικείμενα."
 
-#: gajim/gtk/discovery.py:738 gajim/gtk/discovery.py:747
+#: gajim/gtk/discovery.py:737 gajim/gtk/discovery.py:746
 #, fuzzy
 msgid "Invalid Server Name"
 msgstr "Μη έγκυρο όνομα χρήστη"
 
-#: gajim/gtk/discovery.py:806
+#: gajim/gtk/discovery.py:805
 #, fuzzy, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Περιήγηση %s χρησιμοποιώντας το λογαριασμό %s"
 
-#: gajim/gtk/discovery.py:851
+#: gajim/gtk/discovery.py:850
 #, fuzzy
 msgid "Browse"
 msgstr "_Περιήγηση"
 
-#: gajim/gtk/discovery.py:1043
+#: gajim/gtk/discovery.py:1042
 msgid "This service does not contain any items to browse."
 msgstr "Αυτή η υπηρεσία δεν περιέχει άλλα αντικείμενα."
 
-#: gajim/gtk/discovery.py:1255
+#: gajim/gtk/discovery.py:1254
 #, fuzzy
 msgid "_Command"
 msgstr "Εντολές: %s"
 
-#: gajim/gtk/discovery.py:1264 gajim/gtk/discovery.py:1422
+#: gajim/gtk/discovery.py:1263 gajim/gtk/discovery.py:1420
 msgid "Re_gister"
 msgstr "_Εγγραφή"
 
-#: gajim/gtk/discovery.py:1277
+#: gajim/gtk/discovery.py:1276
 msgid "_Search"
 msgstr "_Αναζήτηση"
 
-#: gajim/gtk/discovery.py:1420
+#: gajim/gtk/discovery.py:1418
 msgid "_Edit"
 msgstr "Ε_πεξεργασία"
 
-#: gajim/gtk/discovery.py:1458
+#: gajim/gtk/discovery.py:1456
 #, fuzzy, python-format
 msgid "Scanning %(current)d / %(total)d ..."
 msgstr "Σάρωση %d / %d.."
 
-#: gajim/gtk/discovery.py:1674
+#: gajim/gtk/discovery.py:1655
+msgid "Users"
+msgstr "Χρήστες"
+
+#: gajim/gtk/discovery.py:1671
 #, fuzzy
 msgid "Id"
 msgstr "Id"
 
-#: gajim/gtk/discovery.py:1713
-msgid "_Join"
-msgstr "_Συμμετοχή"
-
-#: gajim/gtk/discovery.py:1736
-msgid "Bookmark already set"
-msgstr "Ο σελιδοδείκτης έχει οριστεί ήδη"
-
-#: gajim/gtk/discovery.py:1737
-#, fuzzy, python-format
-msgid "Group Chat '%s' is already in your bookmarks."
-msgstr "Το δωμάτιο \"%s\" υπάρχει ήδη στους σελιδοδείκτες σας."
-
-#: gajim/gtk/discovery.py:1748
-msgid "Bookmark has been added successfully"
-msgstr "Ο σελιδοδείκτης προστέθηκε με επιτυχία"
-
-#: gajim/gtk/discovery.py:1749
-#, fuzzy
-msgid ""
-"You can manage your bookmarks by clicking the Bookmarks menu item in your "
-"contact list."
-msgstr ""
-"Μπορείτε να διαχειριστείτε τους σελιδοδείκτες από το μενού Ενέργειας στο "
-"κεντρικό παράθυρο."
-
-#: gajim/gtk/discovery.py:1950
+#: gajim/gtk/discovery.py:1900
 msgid "Subscribed"
 msgstr "Εγγεγραμμένος"
 
-#: gajim/gtk/discovery.py:1959
+#: gajim/gtk/discovery.py:1909
 msgid "Node"
 msgstr "Κόμβος"
 
-#: gajim/gtk/discovery.py:2028
+#: gajim/gtk/discovery.py:1978
 #, fuzzy
 msgid "_New post"
 msgstr "_Νέα λίστα..."
 
-#: gajim/gtk/discovery.py:2037
+#: gajim/gtk/discovery.py:1987
 msgid "_Subscribe"
 msgstr "_Εγγραφή"
 
-#: gajim/gtk/discovery.py:2045
+#: gajim/gtk/discovery.py:1995
 #, fuzzy
 msgid "_Unsubscribe"
 msgstr "_Εγγραφή"
@@ -9121,7 +9386,7 @@ msgstr "Από %s"
 msgid "Characters typed: %s"
 msgstr "Δεν επιτρέπεται το ψευδώνυμο: %s"
 
-#: gajim/gtk/single_message.py:274 gajim/gtk/xml_console.py:169
+#: gajim/gtk/single_message.py:274 gajim/gtk/xml_console.py:166
 msgid "Connection not available"
 msgstr "Σύνδεση μη διαθέσιμη"
 
@@ -9130,6 +9395,12 @@ msgstr "Σύνδεση μη διαθέσιμη"
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Παρακαλώ βεβαιωθείτε ότι είστε συνδεδεμένοι με το \"%s\"."
 
+#: gajim/gtk/single_message.py:306
+#, 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:330
 #, python-format
 msgid "RE: %s"
@@ -9140,28 +9411,28 @@ msgstr "RE: %s"
 msgid "%s wrote:\n"
 msgstr "Ο/Η %s έγραψε:\n"
 
-#: gajim/gtk/pep_config.py:44
+#: gajim/gtk/pep_config.py:45
 #, fuzzy, python-format
 msgid "PEP Service Configuration (%s)"
 msgstr "Ρυθμίσεις δωματίου"
 
-#: gajim/gtk/pep_config.py:77
+#: gajim/gtk/pep_config.py:78
 #, fuzzy
 msgid "Service"
 msgstr "Εξυπηρετητής"
 
-#: gajim/gtk/pep_config.py:114
+#: gajim/gtk/pep_config.py:115
 msgid "PEP node was not removed"
 msgstr ""
 
-#: gajim/gtk/pep_config.py:115
+#: gajim/gtk/pep_config.py:116
 #, python-format
 msgid ""
 "PEP node %(node)s was not removed:\n"
 "%(message)s"
 msgstr ""
 
-#: gajim/gtk/pep_config.py:146
+#: gajim/gtk/pep_config.py:147
 #, fuzzy, python-format
 msgid "Configure %s"
 msgstr "_Συνέχεια"
@@ -9177,17 +9448,22 @@ msgstr "_Εγγραφή"
 msgid "Registration successful"
 msgstr "Επιτυχής καταχώρηση λογαριασμού"
 
-#: gajim/gtk/dialogs.py:54 gajim/gtk/dataform.py:659 gajim/gtk/adhoc.py:85
+#: gajim/gtk/service_registration.py:215
+#, fuzzy
+msgid "Registration failed"
+msgstr "Η δημοσιοποίηση της vCard απέτυχε"
+
+#: gajim/gtk/dialogs.py:53 gajim/gtk/dataform.py:668 gajim/gtk/adhoc.py:86
 #, fuzzy
 msgid "Cancel"
 msgstr "_Άκυρο"
 
-#: gajim/gtk/dialogs.py:129
+#: gajim/gtk/dialogs.py:128
 #, fuzzy, python-format
 msgid "Dictionary for language \"%s\" not available"
 msgstr "Δεν υπάρχει διαθέσιμο λεξικό για τη γλώσσα %s"
 
-#: gajim/gtk/dialogs.py:130
+#: gajim/gtk/dialogs.py:129
 #, python-format
 msgid ""
 "You have to install the dictionary \"%s\" to use spellchecking, or choose "
@@ -9196,12 +9472,12 @@ msgid ""
 "Highlighting misspelled words feature will not be used"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:410 gajim/gtk/dialogs.py:425
+#: gajim/gtk/dialogs.py:322 gajim/gtk/dialogs.py:337
 #, fuzzy
 msgid "Insecure connection"
 msgstr "Σύνδεση"
 
-#: gajim/gtk/dialogs.py:411
+#: gajim/gtk/dialogs.py:323
 #, fuzzy, python-format
 msgid ""
 "You are about to connect to the account %(account)s (%(server)s) insecurely. "
@@ -9212,121 +9488,115 @@ msgstr ""
 "Πρέπει να δημιουργήσετε ένα λογαριασμό για να μπορέσετε να συνομιλείτε με "
 "άλλες επαφές."
 
-#: gajim/gtk/dialogs.py:416
+#: gajim/gtk/dialogs.py:328
 msgid "Yes, I really want to connect insecurely"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:417
+#: gajim/gtk/dialogs.py:329
 msgid "Gajim will NOT connect unless you check this box"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:675
-#, fuzzy
-msgid "The nickname contains invalid characters."
-msgstr ""
-"Το όνομα του δωματίου ή του διακομιστή περιέχει μη επιτρεπόμενους χαρακτήρες."
-
-#: gajim/gtk/dialogs.py:734
+#: gajim/gtk/dialogs.py:561
 #, fuzzy, python-format
 msgid "Destroy %s"
 msgstr "Περιγραφή: %s"
 
-#: gajim/gtk/dialogs.py:775
+#: gajim/gtk/dialogs.py:602
 #, fuzzy
 msgid "Certificate"
 msgstr "Μη έγκυρο όνομα χρήστη"
 
-#: gajim/gtk/dialogs.py:786
+#: gajim/gtk/dialogs.py:613
 #, fuzzy, python-format
 msgid ""
 "Certificate for account\n"
 "%s"
 msgstr "για το λογαριασμό %s"
 
-#: gajim/gtk/dialogs.py:824
+#: gajim/gtk/dialogs.py:651
 msgid "Issued to\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:825 gajim/gtk/dialogs.py:830
+#: gajim/gtk/dialogs.py:652 gajim/gtk/dialogs.py:657
 msgid "Common Name (CN): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:826 gajim/gtk/dialogs.py:831
+#: gajim/gtk/dialogs.py:653 gajim/gtk/dialogs.py:658
 msgid "Organization (O): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:827 gajim/gtk/dialogs.py:832
+#: gajim/gtk/dialogs.py:654 gajim/gtk/dialogs.py:659
 msgid "Organizational Unit (OU): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:828
+#: gajim/gtk/dialogs.py:655
 #, fuzzy
 msgid "Serial Number: "
 msgstr "Αριθμός χώρων εργασίας:"
 
-#: gajim/gtk/dialogs.py:829
+#: gajim/gtk/dialogs.py:656
 msgid "Issued by\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:833
+#: gajim/gtk/dialogs.py:660
 msgid "Validity\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:834
+#: gajim/gtk/dialogs.py:661
 msgid "Issued on: "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:835
+#: gajim/gtk/dialogs.py:662
 msgid "Expires on: "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:836
+#: gajim/gtk/dialogs.py:663
 msgid "SHA-1:"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:838
+#: gajim/gtk/dialogs.py:665
 msgid "SHA-256:"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:852
+#: gajim/gtk/dialogs.py:679
 #, fuzzy
 msgid "View certificate…"
 msgstr "Μη έγκυρο όνομα χρήστη"
 
-#: gajim/gtk/dialogs.py:864 gajim/gtk/accounts.py:893
+#: gajim/gtk/dialogs.py:691 gajim/gtk/accounts.py:896
 msgid "Change Password"
 msgstr "Αλλαγή κωδικού πρόσβασης"
 
-#: gajim/gtk/dialogs.py:878
+#: gajim/gtk/dialogs.py:705
 msgid "_OK"
 msgstr "_Εντάξει"
 
-#: gajim/gtk/dialogs.py:891
+#: gajim/gtk/dialogs.py:718
 #, fuzzy
 msgid "You must enter a password"
 msgstr "Πρέπει να πληκτρολογήσετε ένα κωδικό."
 
-#: gajim/gtk/dialogs.py:895
+#: gajim/gtk/dialogs.py:722
 msgid "Passwords do not match"
 msgstr "Οι κωδικοί δεν ταιριάζουν"
 
-#: gajim/gtk/dialogs.py:923
+#: gajim/gtk/dialogs.py:750
 #, fuzzy
 msgid "Group Chat Invitation "
 msgstr "Πρόσκληση ομαδικής κουβέντας"
 
-#: gajim/gtk/dialogs.py:948
+#: gajim/gtk/dialogs.py:775
 #, fuzzy, python-format
 msgid "<b>%s</b> has invited you to join a discussion"
 msgstr "Ο/Η %(contact_jid)s σας προσκάλεσε στο %(room_jid)s"
 
-#: gajim/gtk/dialogs.py:951
+#: gajim/gtk/dialogs.py:778
 #, 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:959
+#: gajim/gtk/dialogs.py:786
 #, python-format
 msgid "Comment: %s"
 msgstr "Σχόλιο: %s"
@@ -9341,11 +9611,6 @@ msgstr "Αριθμός χώρων εργασίας:"
 msgid "ICQ Number"
 msgstr "Αριθμός χώρων εργασίας:"
 
-#: gajim/gtk/add_contact.py:40
-#, fuzzy
-msgid "Add Contact"
-msgstr "_Προσθήκη επαφής..."
-
 #: gajim/gtk/add_contact.py:259
 #, fuzzy, python-format
 msgid "%s Missing"
@@ -9367,7 +9632,7 @@ msgstr "Το αναγνωριστικό χρήστη δεν πρέπει να π
 
 #: gajim/gtk/add_contact.py:299
 #, fuzzy
-msgid "You cannot add yourself to your roster."
+msgid "You cannot add yourself to your contact list."
 msgstr "Επιθυμώ να σε προσθέσω στη λίστα επαφών μου."
 
 #: gajim/gtk/add_contact.py:304
@@ -9380,11 +9645,13 @@ msgid "Your account must be online to add new contacts."
 msgstr ""
 
 #: gajim/gtk/add_contact.py:321
-msgid "Contact already in roster"
+#, fuzzy
+msgid "Contact Already in Contact List"
 msgstr "Επαφή ήδη στη λίστα επαφών"
 
 #: gajim/gtk/add_contact.py:322
-msgid "This contact is already listed in your roster."
+#, fuzzy
+msgid "This contact is already in your contact list."
 msgstr "Αυτή η επαφή υπάρχει ήδη στη λίστα επαφών σας."
 
 #: gajim/gtk/add_contact.py:379 gajim/gtk/add_contact.py:417
@@ -9426,14 +9693,14 @@ msgstr "Αλλαγή κατάστασης"
 
 #: gajim/gtk/themes.py:52
 #, fuzzy
-msgid "MUC Tab New Directed Message"
+msgid "Group Chat Tab New Directed Message"
 msgstr ""
 "Μηνύματα προς\n"
 "ομαδικές κουβέντες"
 
 #: gajim/gtk/themes.py:56
 #, fuzzy
-msgid "MUC Tab New Message"
+msgid "Group Chat Tab New Message"
 msgstr "Νέο μήνυμα"
 
 #: gajim/gtk/themes.py:60
@@ -9652,13 +9919,13 @@ msgstr "Όλα τα αρχεία"
 msgid "Clear File"
 msgstr "Απόγευμα"
 
-#: gajim/gtk/settings.py:570
+#: gajim/gtk/settings.py:570 gajim/gtk/proxies.py:32
 #, fuzzy
 msgid "Manage Proxies"
 msgstr "Διαχείριση προφίλ μεσολαβητή"
 
-#: gajim/gtk/settings.py:591 gajim/gtk/preferences.py:971
-#: gajim/gtk/preferences.py:984 gajim/gtk/preferences.py:988
+#: gajim/gtk/settings.py:591 gajim/gtk/preferences.py:968
+#: gajim/gtk/preferences.py:982 gajim/gtk/preferences.py:986
 #, fuzzy
 msgid "No Proxy"
 msgstr "Μεσολαβητής:"
@@ -9738,14 +10005,15 @@ msgid ""
 "        "
 msgstr ""
 
-#: gajim/gtk/about.py:47 data/org.gajim.Gajim.appdata.xml.in:10
+#: gajim/gtk/about.py:47 data/org.gajim.Gajim.desktop.in:6
+#: data/org.gajim.Gajim.appdata.xml.in:10
 #, fuzzy
-msgid "A GTK+ XMPP client"
+msgid "A GTK XMPP client"
 msgstr "Ένα πρόγραμμα για το Jabber γραμμένο σε GTK+"
 
 #: gajim/gtk/about.py:48
 #, fuzzy, python-format
-msgid "GTK+ Version: %s"
+msgid "GTK Version: %s"
 msgstr "Έκδοση GTK+:"
 
 #: gajim/gtk/about.py:49
@@ -9930,6 +10198,25 @@ msgstr "Εκτύπωση όλων των σελίδων"
 msgid "?transfer status:Not started"
 msgstr "Εκτύπωση όλων των σελίδων"
 
+#: gajim/gtk/groupchat_creation.py:97 gajim/gtk/groupchat_creation.py:99
+msgid " (optional)..."
+msgstr ""
+
+#: gajim/gtk/groupchat_creation.py:134
+#, fuzzy
+msgid "Invalid Address"
+msgstr "Μη έγκυρο αρχείο"
+
+#: gajim/gtk/groupchat_creation.py:182
+#, fuzzy
+msgid "Not Connected"
+msgstr "Σύνδεση"
+
+#: gajim/gtk/groupchat_creation.py:183
+#, fuzzy
+msgid "You have to be connected to create a group chat."
+msgstr "Ο/Η %s μπήκε στο δωμάτιο"
+
 #: gajim/gtk/sounds.py:39
 msgid "Wav Sounds"
 msgstr "Αρχεία ήχου Wav"
@@ -9973,50 +10260,45 @@ msgstr "Επισήμανση "
 msgid "Group Chat Message Received"
 msgstr "Λήφθηκε μήνυμα ομαδικής συζήτησης"
 
-#: gajim/gtk/dataform.py:226 gajim/gtk/dataform.py:262
+#: gajim/gtk/dataform.py:232 gajim/gtk/dataform.py:268
 #, fuzzy
 msgid "Required"
 msgstr "Απαιτείται κωδικός"
 
-#: gajim/gtk/dataform.py:286
+#: gajim/gtk/dataform.py:293
 msgid "Yes"
 msgstr ""
 
-#: gajim/gtk/dataform.py:286
+#: gajim/gtk/dataform.py:293
 #, fuzzy
 msgid "No"
 msgstr "Κανένα"
 
-#: gajim/gtk/dataform.py:661
+#: gajim/gtk/dataform.py:670
 msgid "Submit"
 msgstr ""
 
-#: gajim/gtk/statusicon.py:213
+#: gajim/gtk/statusicon.py:206
 #, fuzzy
 msgid "_Change Status Message…"
 msgstr "Α_λλαγή μηνύματος κατάστασης"
 
-#: gajim/gtk/statusicon.py:247 gajim/gtk/statusicon.py:292
-#: gajim/gtk/statusicon.py:299
+#: gajim/gtk/statusicon.py:258
 #, python-format
 msgid "using account %s"
 msgstr "με χρήση του λογαριασμού %s"
 
-#: gajim/gtk/statusicon.py:309
+#: gajim/gtk/statusicon.py:269
 #, fuzzy
-msgid "_Manage Bookmarks…"
-msgstr "Διαχείριση σελιδοδεικτών"
+msgid "Hide _Contact List"
+msgstr "Επαφές"
 
-#: gajim/gtk/statusicon.py:325
+#: gajim/gtk/statusicon.py:273
 #, fuzzy
-msgid "Hide _Roster"
-msgstr "Εκτέλεση στο Τερματικό"
-
-#: gajim/gtk/statusicon.py:329
-msgid "Show _Roster"
-msgstr "Εμφάνιση _λίστας επαφών"
+msgid "Show _Contact List"
+msgstr "Εμφάνιση _αποσυνδεδεμένων χρηστών"
 
-#: gajim/gtk/statusicon.py:337
+#: gajim/gtk/statusicon.py:281
 msgid "Hide this menu"
 msgstr "Απόκρυψη αυτού του μενού"
 
@@ -10069,37 +10351,6 @@ msgstr ""
 "Υπήρξε ένα σφάλμα κατά τη δημοσιοποίηση των προσωπικών πληροφοριών σας, "
 "δοκιμάστε αργότερα."
 
-#: gajim/gtk/join_groupchat.py:202
-#, fuzzy
-msgid "Invalid Room"
-msgstr "Μη έγκυρη εγγραφή"
-
-#: gajim/gtk/join_groupchat.py:203
-msgid "Please choose a room"
-msgstr ""
-
-#: gajim/gtk/join_groupchat.py:222 gajim/gtk/join_groupchat.py:229
-#, fuzzy
-msgid "Invalid Nickname"
-msgstr "Μη έγκυρο όνομα χρήστη"
-
-#: gajim/gtk/join_groupchat.py:223
-#, fuzzy
-msgid "Please choose a nickname"
-msgstr "Δημιουργία νέου προφίλ"
-
-#: gajim/gtk/join_groupchat.py:282 gajim/gtk/join_groupchat.py:288
-#: gajim/gtk/join_groupchat.py:293
-#, fuzzy
-msgid "Wrong server"
-msgstr "Το URI \"%s\" δεν είναι έγκυρο."
-
-#: gajim/gtk/join_groupchat.py:283 gajim/gtk/join_groupchat.py:289
-#: gajim/gtk/join_groupchat.py:294
-#, fuzzy, python-format
-msgid "%s is not a groupchat server"
-msgstr "Αυτή η μορφή συμπίεσης δεν υποστηρίζεται:"
-
 #: gajim/gtk/mam_preferences.py:38
 #, python-format
 msgid "Archiving Preferences for %s"
@@ -10130,45 +10381,53 @@ msgstr "Προσθήκη νέας εγγραφής στο μενού"
 msgid "Archiving Preferences Error"
 msgstr "_Προτιμήσεις"
 
-#: gajim/gtk/advanced_config.py:81
+#: gajim/gtk/advanced_config.py:95
 msgid "Activated"
 msgstr "Ενεργό"
 
-#: gajim/gtk/advanced_config.py:81
+#: gajim/gtk/advanced_config.py:95
 msgid "Deactivated"
 msgstr "Ανενεργό"
 
-#: gajim/gtk/advanced_config.py:83
-msgid "Boolean"
+#: gajim/gtk/advanced_config.py:97
+msgid "?config type:Boolean"
 msgstr ""
 
-#: gajim/gtk/advanced_config.py:84
-msgid "Integer"
-msgstr "Ακέραιος"
+#: gajim/gtk/advanced_config.py:98
+msgid "?config type:Integer"
+msgstr ""
 
-#: gajim/gtk/advanced_config.py:85
-msgid "Text"
-msgstr "Κείμενο"
+#: gajim/gtk/advanced_config.py:99
+msgid "?config type:Text"
+msgstr ""
 
-#: gajim/gtk/advanced_config.py:97
-msgid "Preference Name"
+#: gajim/gtk/advanced_config.py:100
+msgid "?config type:Color"
+msgstr ""
+
+#: gajim/gtk/advanced_config.py:112
+#, fuzzy
+msgid "?config:Preference Name"
 msgstr "Όνομα προτίμησης"
 
-#: gajim/gtk/advanced_config.py:104
-msgid "Value"
-msgstr "Τιμή"
+#: gajim/gtk/advanced_config.py:123
+#, fuzzy
+msgid "?config:Value"
+msgstr "_Συνέχεια"
 
-#: gajim/gtk/advanced_config.py:113
-msgid "Type"
-msgstr "Είδος"
+#: gajim/gtk/advanced_config.py:132
+msgid "?config:Type"
+msgstr ""
 
-#: gajim/gtk/advanced_config.py:168
-msgid "(None)"
-msgstr "(Κενή)"
+#: gajim/gtk/advanced_config.py:187
+#, fuzzy
+msgid "?config description:None"
+msgstr "Τίποτα"
 
-#: gajim/gtk/advanced_config.py:299
-msgid "Hidden"
-msgstr "Μυστικό"
+#: gajim/gtk/advanced_config.py:322
+#, fuzzy
+msgid "?password:Hidden"
+msgstr "Κωδικός πρόσβασης:"
 
 #: gajim/gtk/server_info.py:66
 #, fuzzy
@@ -10180,8 +10439,8 @@ msgstr "_Αντιγραφή τοποθεσίας δεσμού"
 msgid "%(days)s days, %(hours)s hours"
 msgstr ""
 
-#: gajim/gtk/server_info.py:218 gajim/gtk/accounts.py:749
-#: gajim/gtk/accounts.py:853
+#: gajim/gtk/server_info.py:218 gajim/gtk/accounts.py:752
+#: gajim/gtk/accounts.py:856
 #, fuzzy
 msgid "Hostname"
 msgstr "Εξυπηρετητής:"
@@ -10361,11 +10620,6 @@ msgstr "Μη έγκυρο όνομα αρχείου"
 msgid "You must enter a name to create a privacy list."
 msgstr "Πρέπει να δώσετε έναν κωδικό για το νέο λογαριασμό."
 
-#: gajim/gtk/groupchat_config.py:41
-#, fuzzy
-msgid "Group Chat Configuration"
-msgstr "Πρόσκληση ομαδικής κουβέντας"
-
 #: gajim/gtk/groupchat_config.py:134
 #, fuzzy
 msgid "A Group Chat needs at least one Owner"
@@ -10376,69 +10630,69 @@ msgid "You are not allowed to modify the affiliation of Admins and Owners"
 msgstr ""
 
 #: gajim/gtk/groupchat_config.py:399
-msgid "An entry with this Jabber-ID already exists"
+msgid "An entry with this XMPP Address already exists"
 msgstr ""
 
-#: gajim/gtk/adhoc.py:91
+#: gajim/gtk/adhoc.py:92
 #, fuzzy
 msgid "Finish"
 msgstr "_Τέλος"
 
-#: gajim/gtk/adhoc.py:97 gajim/gtk/adhoc.py:283
+#: gajim/gtk/adhoc.py:98 gajim/gtk/adhoc.py:284
 #, fuzzy
 msgid "Commands"
 msgstr "Εντολές: %s"
 
-#: gajim/gtk/adhoc.py:103
+#: gajim/gtk/adhoc.py:104
 msgid "Next"
 msgstr ""
 
-#: gajim/gtk/adhoc.py:109
+#: gajim/gtk/adhoc.py:110
 #, fuzzy
 msgid "Previous"
 msgstr "_Πίσω"
 
-#: gajim/gtk/adhoc.py:115
+#: gajim/gtk/adhoc.py:116
 #, fuzzy
 msgid "Execute"
 msgstr "_Εκτέλεση εντολής..."
 
-#: gajim/gtk/adhoc.py:195
+#: gajim/gtk/adhoc.py:196
 #, fuzzy
 msgid "No commands available"
 msgstr "Κανένας λογαριασμός δεν είναι διαθέσιμος"
 
-#: gajim/gtk/adhoc.py:244
+#: gajim/gtk/adhoc.py:245
 #, fuzzy
 msgid "Request Command List"
 msgstr "_Εκτέλεση εντολής..."
 
-#: gajim/gtk/adhoc.py:259
+#: gajim/gtk/adhoc.py:260
 #, fuzzy
 msgid "Executing…"
 msgstr "_Εκτέλεση εντολής..."
 
-#: gajim/gtk/adhoc.py:266
+#: gajim/gtk/adhoc.py:267
 #, fuzzy
 msgid "Command List"
 msgstr "Εντολές: %s"
 
-#: gajim/gtk/adhoc.py:384
+#: gajim/gtk/adhoc.py:385
 #, fuzzy
 msgid "Finished"
 msgstr "_Τέλος"
 
-#: gajim/gtk/adhoc.py:453
+#: gajim/gtk/adhoc.py:454
 #, fuzzy
 msgid "Execution failed"
 msgstr "Η σύνδεση απέτυχε"
 
-#: gajim/gtk/blocking.py:37
+#: gajim/gtk/blocking.py:38
 #, fuzzy, python-format
 msgid "Blocking List for %s"
 msgstr "Σύνταξη συντόμευσης για :"
 
-#: gajim/gtk/blocking.py:71
+#: gajim/gtk/blocking.py:72
 #, fuzzy
 msgid "Error!"
 msgstr "Σφάλμα:"
@@ -10491,8 +10745,7 @@ msgstr ""
 "Πρέπει να δώσετε ένα όνομα χρήστη για την παραμετροποίηση του συγκεκριμένου "
 "λογαριασμού."
 
-#: gajim/gtk/account_wizard.py:252 gajim/gtk/bookmarks.py:290
-#: gajim/gtk/bookmarks.py:303
+#: gajim/gtk/account_wizard.py:252
 #, fuzzy
 msgid "Invalid server"
 msgstr "Μη έγκυρο όνομα χρήστη"
@@ -10510,7 +10763,7 @@ msgstr "Μη έγκυρη εγγραφή"
 msgid "Custom port must be a port number."
 msgstr "Ο προσαρμοσμένος αριθμός θύρας του μεσολαβητή πρέπει να είναι αριθμός."
 
-#: gajim/gtk/account_wizard.py:405
+#: gajim/gtk/account_wizard.py:406
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -10520,16 +10773,16 @@ msgid ""
 "Do you still want to connect to this server?"
 msgstr ""
 
-#: gajim/gtk/account_wizard.py:446 gajim/gtk/account_wizard.py:480
+#: gajim/gtk/account_wizard.py:447 gajim/gtk/account_wizard.py:481
 #, fuzzy
 msgid "An error occurred during account creation"
 msgstr "Σφάλμα κατά τη διάρκεια δημιουργίας λογαριασμού"
 
-#: gajim/gtk/account_wizard.py:545
+#: gajim/gtk/account_wizard.py:546
 msgid "Account name is in use"
 msgstr "Το όνομα λογαριασμού είναι ήδη σε χρήση"
 
-#: gajim/gtk/account_wizard.py:546
+#: gajim/gtk/account_wizard.py:547
 msgid "You already have an account using this name."
 msgstr "Έχετε ήδη ένα λογαριασμό με αυτό το όνομα."
 
@@ -10556,26 +10809,26 @@ msgstr "Η μεταφορά του αρχείου %(filename)s από τον/τ�
 msgid "%(minutes)s min %(seconds)s sec"
 msgstr ""
 
-#: gajim/gtk/xml_console.py:77
+#: gajim/gtk/xml_console.py:74
 #, fuzzy
 msgid "Filter"
 msgstr "Φιλτράρισμα:"
 
-#: gajim/gtk/xml_console.py:82
+#: gajim/gtk/xml_console.py:79
 #, fuzzy
 msgid "XML Input"
 msgstr "<b>Είσοδος δεδομένων XML</b>"
 
-#: gajim/gtk/xml_console.py:86
+#: gajim/gtk/xml_console.py:83
 msgid "Paste Last Input"
 msgstr ""
 
-#: gajim/gtk/xml_console.py:170
+#: gajim/gtk/xml_console.py:167
 #, fuzzy, python-format
 msgid "Please make sure you are connected with '%s'."
 msgstr "Παρακαλώ βεβαιωθείτε ότι είστε συνδεδεμένοι με το \"%s\"."
 
-#: gajim/gtk/xml_console.py:182
+#: gajim/gtk/xml_console.py:177
 #, fuzzy
 msgid "Invalid Node"
 msgstr "Μη έγκυρο αρχείο"
@@ -10608,153 +10861,169 @@ msgstr "Αναζήτηση"
 msgid "No results found"
 msgstr "μη υπαρκτό %s"
 
-#: gajim/gtk/preferences.py:358 gajim/gtk/preferences.py:362
+#: gajim/gtk/preferences.py:357 gajim/gtk/preferences.py:361
 msgid "Default"
 msgstr "Προεπιλογή"
 
-#: gajim/gtk/preferences.py:801
+#: gajim/gtk/preferences.py:798
 msgid "status message title"
 msgstr "τίτλος μηνύματος κατάστασης"
 
-#: gajim/gtk/preferences.py:802
+#: gajim/gtk/preferences.py:799
 msgid "status message text"
 msgstr "κείμενο μηνύματος κατάστασης"
 
+#: gajim/gtk/accounts.py:137
+#, fuzzy
+msgid "Re-Login"
+msgstr "Νέα είσοδος τώρα;"
+
 #: gajim/gtk/accounts.py:138
-msgid "Relogin now?"
+#, fuzzy
+msgid "Re-Login now?"
 msgstr "Νέα είσοδος τώρα;"
 
 #: gajim/gtk/accounts.py:139
-msgid "If you want all the changes to apply instantly, you must relogin."
+#, fuzzy
+msgid "To apply all changes instantly, you have to re-login."
 msgstr ""
 "Αν θέλετε να εφαρμόσετε άμεσα τις αλλαγές, θα πρέπει να αποσυνδεθείτε και να "
 "συνδεθείτε ξανά."
 
-#: gajim/gtk/accounts.py:191 gajim/gtk/accounts.py:975
+#: gajim/gtk/accounts.py:141
+#, fuzzy
+msgid "_Later"
+msgstr "_Τέλος"
+
+#: gajim/gtk/accounts.py:143
+msgid "_Re-Login"
+msgstr ""
+
+#: gajim/gtk/accounts.py:194 gajim/gtk/accounts.py:978
 #, fuzzy
 msgid "Remove Account"
 msgstr "Aφαίρεση του λογαριασμού %s"
 
-#: gajim/gtk/accounts.py:192
+#: gajim/gtk/accounts.py:195
 #, fuzzy, python-format
 msgid "You still have open chats in your account %s"
 msgstr "Δεν έχετε κανέναν ενεργό λογαριασμό"
 
-#: gajim/gtk/accounts.py:193
+#: gajim/gtk/accounts.py:196
 msgid ""
 "All chat and group chat windows will be closed.\n"
 "Do you want to continue?"
 msgstr ""
 
-#: gajim/gtk/accounts.py:424
+#: gajim/gtk/accounts.py:427
 #, fuzzy
 msgid "Back"
 msgstr "Πίσω σύντομα"
 
-#: gajim/gtk/accounts.py:530
+#: gajim/gtk/accounts.py:533
 #, fuzzy
 msgid "Please check if Bonjour is installed."
 msgstr "Το Gajim εκτελείται ήδη"
 
-#: gajim/gtk/accounts.py:532
+#: gajim/gtk/accounts.py:535
 #, fuzzy
 msgid "Please check if Avahi is installed."
 msgstr "Το Gajim εκτελείται ήδη"
 
-#: gajim/gtk/accounts.py:569
+#: gajim/gtk/accounts.py:572
 #, fuzzy
 msgid "Disable Account"
 msgstr "Μη έγκυρο όνομα λογαριασμού"
 
-#: gajim/gtk/accounts.py:570
+#: gajim/gtk/accounts.py:573
 #, fuzzy, python-format
 msgid "Account %s is still connected"
 msgstr "Ο λογαριασμός \"%s\" είναι συνδεδεμένος με το διακομιστή"
 
-#: gajim/gtk/accounts.py:571
+#: gajim/gtk/accounts.py:574
 msgid ""
 "All chat and group chat windows will be closed. Do you want to continue?"
 msgstr ""
 
-#: gajim/gtk/accounts.py:576
+#: gajim/gtk/accounts.py:579
 #, fuzzy
 msgid "_Disable Account"
 msgstr "Μη έγκυρο όνομα λογαριασμού"
 
-#: gajim/gtk/accounts.py:595
+#: gajim/gtk/accounts.py:598
 #, fuzzy
 msgid "Add Account"
 msgstr "_Προσθήκη επαφής..."
 
-#: gajim/gtk/accounts.py:663
+#: gajim/gtk/accounts.py:666
 msgid "Label"
 msgstr ""
 
-#: gajim/gtk/accounts.py:667
+#: gajim/gtk/accounts.py:670
 msgid "Login"
 msgstr ""
 
-#: gajim/gtk/accounts.py:670
+#: gajim/gtk/accounts.py:673
 #, fuzzy
 msgid "Import Contacts"
 msgstr "Επαφές"
 
-#: gajim/gtk/accounts.py:674 gajim/gtk/accounts.py:870
+#: gajim/gtk/accounts.py:677 gajim/gtk/accounts.py:873
 #, fuzzy
 msgid "Client Certificate"
 msgstr "Μη έγκυρο όνομα χρήστη"
 
-#: gajim/gtk/accounts.py:677 gajim/gtk/accounts.py:774
+#: gajim/gtk/accounts.py:680 gajim/gtk/accounts.py:777
 #, fuzzy
 msgid "Connect on startup"
 msgstr "Σύνδεση κατά την ε_κκίνηση του Gajim"
 
-#: gajim/gtk/accounts.py:681 gajim/gtk/accounts.py:779
+#: gajim/gtk/accounts.py:684 gajim/gtk/accounts.py:782
 #, fuzzy
 msgid "Save conversations for all contacts"
 msgstr "Αποθήκευση ιστορι_κού συνομιλιών για όλες τις επαφές"
 
-#: gajim/gtk/accounts.py:683 gajim/gtk/accounts.py:781
+#: gajim/gtk/accounts.py:686 gajim/gtk/accounts.py:784
 msgid "Store conversations on the harddrive"
 msgstr ""
 
-#: gajim/gtk/accounts.py:685 gajim/gtk/accounts.py:783
+#: gajim/gtk/accounts.py:688 gajim/gtk/accounts.py:786
 #, fuzzy
 msgid "Global Status"
 msgstr "Όλες οι καταστάσεις"
 
-#: gajim/gtk/accounts.py:687
+#: gajim/gtk/accounts.py:690
 #, fuzzy
 msgid "Synchronise the status of all accounts"
 msgstr "Αλλάζει την κατάσταση ενός ή πολλών λογαριασμών"
 
-#: gajim/gtk/accounts.py:689
+#: gajim/gtk/accounts.py:692
 msgid "Use file transfer proxies"
 msgstr "Χρήση μεσολαβητών μεταφοράς αρχείων"
 
-#: gajim/gtk/accounts.py:705
+#: gajim/gtk/accounts.py:708
 #, fuzzy
 msgid "Idle Time"
 msgstr "από τις %s"
 
-#: gajim/gtk/accounts.py:707
+#: gajim/gtk/accounts.py:710
 msgid "Disclose the time of your last activity"
 msgstr ""
 
-#: gajim/gtk/accounts.py:709
+#: gajim/gtk/accounts.py:712
 msgid "Local System Time"
 msgstr ""
 
-#: gajim/gtk/accounts.py:711
+#: gajim/gtk/accounts.py:714
 msgid "Disclose the local system time of the device Gajim runs on"
 msgstr ""
 
-#: gajim/gtk/accounts.py:714
+#: gajim/gtk/accounts.py:717
 #, fuzzy
 msgid "Client / Operating System"
 msgstr "Μη έγκυρο όνομα χρήστη"
 
-#: gajim/gtk/accounts.py:716
+#: gajim/gtk/accounts.py:719
 #, fuzzy
 msgid ""
 "Disclose informations about the client and operating system you currently use"
@@ -10762,153 +11031,148 @@ msgstr ""
 "Αν επιλεγεί, το Gajim θα σας συνδέει αυτόματα σε αυτό το δωμάτιο κατά την "
 "εκκίνηση"
 
-#: gajim/gtk/accounts.py:719
+#: gajim/gtk/accounts.py:722
 #, fuzzy
 msgid "Ignore Unknown Contacts"
 msgstr "Επαφές"
 
-#: gajim/gtk/accounts.py:721
+#: gajim/gtk/accounts.py:724
 #, fuzzy
 msgid "Ignore everything from contacts not in your Roster"
 msgstr "Να _αγνοούνται γεγονότα από επαφές που δεν είναι στη λίστα επαφών"
 
-#: gajim/gtk/accounts.py:737 gajim/gtk/accounts.py:776
+#: gajim/gtk/accounts.py:740 gajim/gtk/accounts.py:779
 #, fuzzy
 msgid "Use environment variable"
 msgstr "To Session bus δεν είναι διαθέσιμο"
 
-#: gajim/gtk/accounts.py:739
-#, fuzzy
-msgid "Proxy"
-msgstr "Μεσολαβητής:"
-
-#: gajim/gtk/accounts.py:742
+#: gajim/gtk/accounts.py:745
 #, fuzzy
 msgid "Warn on insecure connection"
 msgstr "Σύνδεση"
 
-#: gajim/gtk/accounts.py:746
+#: gajim/gtk/accounts.py:749
 msgid "Send keep-alive packets"
 msgstr "Αποστολή πακέτων keep-alive"
 
-#: gajim/gtk/accounts.py:750
+#: gajim/gtk/accounts.py:753
 msgid "Manually set the hostname for the server"
 msgstr ""
 
-#: gajim/gtk/accounts.py:756 gajim/gtk/accounts.py:826
-#: gajim/gtk/accounts.py:831
+#: gajim/gtk/accounts.py:759 gajim/gtk/accounts.py:829
+#: gajim/gtk/accounts.py:834
 #, fuzzy
 msgid "Priority"
 msgstr "Π_ροτεραιότητα:"
 
-#: gajim/gtk/accounts.py:785
+#: gajim/gtk/accounts.py:788
 #, fuzzy
 msgid "Synchronize the status of all accounts"
 msgstr "Αλλάζει την κατάσταση ενός ή πολλών λογαριασμών"
 
-#: gajim/gtk/accounts.py:795
+#: gajim/gtk/accounts.py:798
 #, fuzzy
 msgid "First Name"
 msgstr "Όνομα:"
 
-#: gajim/gtk/accounts.py:798
+#: gajim/gtk/accounts.py:801
 #, fuzzy
 msgid "Last Name"
 msgstr "Επώνυμο:"
 
-#: gajim/gtk/accounts.py:804
+#: gajim/gtk/accounts.py:807
 #, fuzzy
 msgid "Email"
 msgstr "Νέο E-Mail"
 
-#: gajim/gtk/accounts.py:822
+#: gajim/gtk/accounts.py:825
 #, fuzzy
 msgid "Adjust to status"
 msgstr "Αδυναμία φόρτωσης"
 
-#: gajim/gtk/accounts.py:849
+#: gajim/gtk/accounts.py:852
 msgid "Enable"
 msgstr "Ενεργοποίηση"
 
-#: gajim/gtk/accounts.py:857
+#: gajim/gtk/accounts.py:860
 #, fuzzy
 msgid "Port"
 msgstr "_Θύρα:"
 
-#: gajim/gtk/accounts.py:862
+#: gajim/gtk/accounts.py:865
 #, fuzzy
 msgid "Connection Settings"
 msgstr "Σύνδεση"
 
-#: gajim/gtk/accounts.py:872
+#: gajim/gtk/accounts.py:875
 msgid "PKCS12 Files"
 msgstr ""
 
-#: gajim/gtk/accounts.py:874
+#: gajim/gtk/accounts.py:877
 #, fuzzy
 msgid "Encrypted Certificate"
 msgstr "Μη έγκυρο όνομα χρήστη"
 
-#: gajim/gtk/accounts.py:878
+#: gajim/gtk/accounts.py:881
 #, fuzzy
 msgid "Certificate Settings"
 msgstr "Μη έγκυρο όνομα χρήστη"
 
-#: gajim/gtk/accounts.py:890
+#: gajim/gtk/accounts.py:893
 #, fuzzy
 msgid "Save Password"
 msgstr "Αποθήκευση κωδικού"
 
-#: gajim/gtk/accounts.py:898
+#: gajim/gtk/accounts.py:901
 #, fuzzy
 msgid "Login Settings"
 msgstr "Η δημοσιοποίηση της vCard απέτυχε"
 
-#: gajim/gtk/accounts.py:931
+#: gajim/gtk/accounts.py:934
 #, fuzzy, python-format
 msgid "Removing account %s"
 msgstr "Aφαίρεση του λογαριασμού %s"
 
-#: gajim/gtk/accounts.py:946
+#: gajim/gtk/accounts.py:949
 #, fuzzy
 msgid "Account is disabled"
 msgstr "Απενεργοποιήθηκε η κρυπτογράφηση"
 
-#: gajim/gtk/accounts.py:947
+#: gajim/gtk/accounts.py:950
 #, fuzzy
 msgid "To unregister from a server, the account must be enabled."
 msgstr "Για να αλλάξετε το όνομα λογαριασμού, πρέπει να αποσυνδεθείτε."
 
-#: gajim/gtk/accounts.py:962
+#: gajim/gtk/accounts.py:965
 #, fuzzy
 msgid "Password required"
 msgstr "Απαιτείται κωδικός"
 
-#: gajim/gtk/accounts.py:976
+#: gajim/gtk/accounts.py:979
 #, fuzzy, python-format
 msgid "Account '%s' is still connected to the server"
 msgstr "Ο λογαριασμός \"%s\" είναι συνδεδεμένος με το διακομιστή"
 
-#: gajim/gtk/accounts.py:978
+#: gajim/gtk/accounts.py:981
 msgid "If you remove it, the connection will be lost."
 msgstr "Αν αφαιρεθεί, η σύνδεση θα χαθεί."
 
-#: gajim/gtk/accounts.py:995
+#: gajim/gtk/accounts.py:998
 #, fuzzy, python-format
 msgid "Connection to server %s failed"
 msgstr "Η σύνδεση απέτυχε"
 
-#: gajim/gtk/accounts.py:996
+#: gajim/gtk/accounts.py:999
 #, fuzzy
 msgid "What would you like to do?"
 msgstr "Τι θέλετε να κάνετε;"
 
-#: gajim/gtk/accounts.py:997
+#: gajim/gtk/accounts.py:1000
 #, fuzzy
 msgid "Remove only from Gajim"
 msgstr "Αφαίρεση λογαριασμού μόν_ο από το Gajim"
 
-#: gajim/gtk/accounts.py:998
+#: gajim/gtk/accounts.py:1001
 msgid "Don't remove anything. I'll try again later"
 msgstr ""
 
@@ -10932,6 +11196,10 @@ msgstr "Θα ήθελα να σε προσθέσω στην λίστα επαφ�
 msgid "Modify"
 msgstr "_Τροποποίηση"
 
+#: gajim/gtk/roster_item_exchange.py:80
+msgid "JID"
+msgstr "JID"
+
 #: gajim/gtk/roster_item_exchange.py:86
 #, fuzzy
 msgid "Groups"
@@ -10956,54 +11224,32 @@ msgid_plural "Removed %d contacts"
 msgstr[0] "Αφαιρεί μια επαφή από τη λίστα επαφών"
 msgstr[1] "Αφαιρεί μια επαφή από τη λίστα επαφών"
 
-#: gajim/gtk/util.py:581
+#: gajim/gtk/util.py:583
 #, fuzzy
 msgid "Unknown Artist"
 msgstr "Άγνωστος τύπος %s "
 
-#: gajim/gtk/util.py:582
+#: gajim/gtk/util.py:584
 #, fuzzy
 msgid "Unknown Title"
 msgstr "Άγνωστος τύπος %s "
 
-#: gajim/gtk/util.py:583
+#: gajim/gtk/util.py:585
 #, fuzzy
 msgid "Unknown Source"
 msgstr "Άγνωστος τύπος %s "
 
-#: gajim/gtk/util.py:585
+#: gajim/gtk/util.py:587
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
 "from <i>%(source)s</i>"
 msgstr ""
 
-#: gajim/gtk/bookmarks.py:121
-#, fuzzy
-msgid "New Group Chat"
-msgstr "Αρχηγός ομάδας παραθύρων"
-
-#: gajim/gtk/bookmarks.py:161
-msgid "This bookmark has invalid data"
-msgstr "Αυτός ο σελιδοδείκτης έχει μη έγκυρα δεδομένα"
-
-#: gajim/gtk/bookmarks.py:162
-msgid ""
-"Please be sure to fill out server and room fields or remove this bookmark."
-msgstr ""
-"Παρακαλώ συμπληρώστε τα πεδία του διακομιστή και του δωματίου ή διαφορετικά "
-"αφαιρέστε το σελιδοδείκτη."
-
-#: gajim/gtk/bookmarks.py:273 gajim/gtk/bookmarks.py:291
-#: gajim/gtk/bookmarks.py:304 gajim/gtk/bookmarks.py:335
-#, fuzzy
-msgid "Character not allowed"
-msgstr "Δεν επιτρέπεται το ψευδώνυμο: %s"
-
-#: gajim/gtk/bookmarks.py:334
-#, fuzzy
-msgid "Invalid room"
-msgstr "Μη έγκυρη εγγραφή"
+#: gajim/gtk/bookmarks.py:47
+#, fuzzy, python-format
+msgid "Bookmarks for %s"
+msgstr "_Τοποθέτηση σελιδοδείκτη για αυτό το δωμάτιο"
 
 #: gajim/plugins/pluginmanager.py:736 gajim/plugins/pluginmanager.py:742
 msgid "Archive corrupted"
@@ -11015,50 +11261,53 @@ msgid "Archive empty"
 msgstr "Διαδρομή αρχείου"
 
 #: gajim/plugins/pluginmanager.py:750 gajim/plugins/pluginmanager.py:758
-#: gajim/plugins/gui.py:257
+#: gajim/plugins/gui.py:258
 msgid "Archive is malformed"
 msgstr ""
 
-#: gajim/plugins/pluginmanager.py:766 gajim/plugins/gui.py:281
-#: gajim/plugins/gui.py:289
+#: gajim/plugins/pluginmanager.py:766 gajim/plugins/gui.py:288
+#: gajim/plugins/gui.py:301
 #, fuzzy
 msgid "Plugin already exists"
 msgstr "Αυτό το αρχείο υπάρχει ήδη"
 
-#: gajim/plugins/gui.py:82
+#: gajim/plugins/gui.py:83
 msgid "Click to view Gajim's wiki page on how to install plugins in Flatpak."
 msgstr ""
 
-#: gajim/plugins/gui.py:89
+#: gajim/plugins/gui.py:90
 msgid "Plugin"
 msgstr ""
 
-#: gajim/plugins/gui.py:151
+#: gajim/plugins/gui.py:152
 #, fuzzy, python-format
 msgid "Warning: %s"
 msgstr "Απαγορεύοντας την πρόσβαση στον %s"
 
-#: gajim/plugins/gui.py:206
+#: gajim/plugins/gui.py:207
 #, fuzzy
 msgid "Plugin failed"
 msgstr "Η δημοσιοποίηση της vCard απέτυχε"
 
-#: gajim/plugins/gui.py:245
+#: gajim/plugins/gui.py:246
 msgid "Unable to properly remove the plugin"
 msgstr ""
 
-#: gajim/plugins/gui.py:281
-msgid "Overwrite?"
-msgstr ""
+#: gajim/plugins/gui.py:287
+#, fuzzy
+msgid "Overwrite Plugin?"
+msgstr "Μήνυμα κατάστασης"
+
+#: gajim/plugins/gui.py:289
+#, fuzzy
+msgid "Do you want to overwrite the currently installed version?"
+msgstr "_Επιλέξτε εάν επιθυμείτε να καταχωρήσετε νέο jabber λογαριασμό"
 
 #: data/org.gajim.Gajim.desktop.in:5
-msgid "Jabber IM Client"
+#, fuzzy
+msgid "XMPP IM Client"
 msgstr "Ένα πρόγραμμα για το Jabber"
 
-#: data/org.gajim.Gajim.desktop.in:6
-msgid "A GTK+ Jabber client"
-msgstr "Ένα πρόγραμμα για το Jabber γραμμένο σε GTK+"
-
 #: data/org.gajim.Gajim.desktop.in:8
 msgid "chat;messaging;im;xmpp;bonjour;voip;"
 msgstr ""
@@ -11110,7 +11359,7 @@ msgid "Easily send pictures, videos or other files to friends and groups"
 msgstr ""
 
 #: data/org.gajim.Gajim.appdata.xml.in:27
-msgid "Chat securely with End-to-End encryption via OMEMO or PGP"
+msgid "Chat securely with End-to-End encryption via OMEMO or OpenPGP"
 msgstr ""
 
 #: data/org.gajim.Gajim.appdata.xml.in:28
@@ -11171,7 +11420,7 @@ msgstr ""
 
 #: data/org.gajim.Gajim.appdata.xml.in:52
 #, fuzzy
-msgid "Roster, list of contacts"
+msgid "Contact list, list of contacts"
 msgstr "Καταγραφή α_λλαγών κατάστασης των επαφών"
 
 #: data/org.gajim.Gajim.appdata.xml.in:56
@@ -11193,6 +11442,484 @@ msgstr "Καταγραφή ιστορικού"
 msgid "Plugin manager"
 msgstr "Η δημοσιοποίηση της vCard απέτυχε"
 
+#, fuzzy
+#~ msgid "Configure Services…"
+#~ msgstr "Εύρεση _υπηρεσιών..."
+
+#, fuzzy
+#~ msgid "Group Chat Bookmarks"
+#~ msgstr "Ομαδική συζήτηση"
+
+#, fuzzy
+#~ msgid "Add Bookmark"
+#~ msgstr "_Τοποθέτηση σελιδοδείκτη για αυτό το δωμάτιο"
+
+#, fuzzy
+#~ msgid "Remove Bookmark"
+#~ msgstr "_Τοποθέτηση σελιδοδείκτη για αυτό το δωμάτιο"
+
+#, fuzzy
+#~ msgid "Bookmark Name"
+#~ msgstr "_Τοποθέτηση σελιδοδείκτη για αυτό το δωμάτιο"
+
+#, fuzzy
+#~ msgid "_Server"
+#~ msgstr "_Εξυπηρετητής:"
+
+#, fuzzy
+#~ msgid "_Password"
+#~ msgstr "_Κωδικός πρόσβασης:"
+
+#, fuzzy
+#~ msgid "Join chat when connected"
+#~ msgstr "Αποσύνδεση επαφής"
+
+#, fuzzy
+#~ msgid "New Group Chat"
+#~ msgstr "Αρχηγός ομάδας παραθύρων"
+
+#~ msgid "This bookmark has invalid data"
+#~ msgstr "Αυτός ο σελιδοδείκτης έχει μη έγκυρα δεδομένα"
+
+#, fuzzy
+#~ msgid ""
+#~ "Please be sure to fill out server and group chat fields or remove this "
+#~ "bookmark."
+#~ msgstr ""
+#~ "Παρακαλώ συμπληρώστε τα πεδία του διακομιστή και του δωματίου ή "
+#~ "διαφορετικά αφαιρέστε το σελιδοδείκτη."
+
+#, fuzzy
+#~ msgid "Character not allowed"
+#~ msgstr "Δεν επιτρέπεται το ψευδώνυμο: %s"
+
+#, fuzzy
+#~ msgid "Invalid Group Chat"
+#~ msgstr "Μη έγκυρο Jabber ID"
+
+#~ msgid "Unable to join group chat"
+#~ msgstr "Δεν ήταν δυνατή η σύνδεση στην ομαδική συζήτηση"
+
+#, fuzzy
+#~ msgid "You are banned from group chat <b>%s</b>."
+#~ msgstr "Σας έχει απαγορευτεί η είσοδος σε αυτή την ομαδική συζήτηση."
+
+#, fuzzy
+#~ msgid "Remote server <b>%s</b> does not exist."
+#~ msgstr "Δεν υπάρχει τέτοια συζήτηση."
+
+#, fuzzy
+#~ msgid "Group chat <b>%s</b> does not exist."
+#~ msgstr "Δεν υπάρχει τέτοια συζήτηση."
+
+#, fuzzy
+#~ msgid "Group chat creation is not permitted."
+#~ msgstr "Δεν επιτρέπεται η δημιουργία ομαδικών συζητήσεων."
+
+#, fuzzy
+#~ msgid "You must use your registered nickname in <b>%s</b>."
+#~ msgstr "Πρέπει να χρησιμοποιηθεί το καταχωρημένο σας ψευδώνυμο."
+
+#, fuzzy
+#~ msgid "You are not in the members list in group chat %s."
+#~ msgstr "Δεν είστε στη λίστα μελών."
+
+#, fuzzy
+#~ msgid "XMPP Address is not a group chat"
+#~ msgstr "Αυτή η μορφή συμπίεσης δεν υποστηρίζεται:"
+
+#, fuzzy
+#~ msgid "This is not a group chat"
+#~ msgstr "Αυτή η μορφή συμπίεσης δεν υποστηρίζεται:"
+
+#, fuzzy
+#~ msgid "Please choose a group chat"
+#~ msgstr "Δημιουργία νέου προφίλ"
+
+#, fuzzy
+#~ msgid "Invalid Nickname"
+#~ msgstr "Μη έγκυρο όνομα χρήστη"
+
+#, fuzzy
+#~ msgid "Please choose a nickname"
+#~ msgstr "Δημιουργία νέου προφίλ"
+
+#, fuzzy
+#~ msgid "Wrong server"
+#~ msgstr "Το URI \"%s\" δεν είναι έγκυρο."
+
+#, fuzzy
+#~ msgid "%s is not a group chat server"
+#~ msgstr "Αυτή η μορφή συμπίεσης δεν υποστηρίζεται:"
+
+#, fuzzy
+#~ msgid "A Password is required to join the group chat %s. Please type it."
+#~ msgstr ""
+#~ "Απαιτείται συνθηματικό για τη είσοδο σας σε αυτή την ομαδική συζήτηση."
+
+#~ msgid "Not in Roster"
+#~ msgstr "εκτός λίστας επαφών"
+
+#~ msgid "I would like to add you to my roster"
+#~ msgstr "Θα ήθελα να σε προσθέσω στην λίστα επαφών μου"
+
+#, fuzzy
+#~ msgid "Add to Roster"
+#~ msgstr "_Προσθήκη στη λίστα επαφών"
+
+#, fuzzy
+#~ msgid "Manage Room"
+#~ msgstr "Διαχείριση σελιδοδεικτών"
+
+#, fuzzy
+#~ msgid "Configure Room"
+#~ msgstr "Ρύθμιση _δωματίου"
+
+#, fuzzy
+#~ msgid "Destroy Room"
+#~ msgstr "Περιγραφή: %s"
+
+#, fuzzy
+#~ msgid "Change Nick"
+#~ msgstr "Αλλαγή _ψευδώνυμου"
+
+#, fuzzy
+#~ msgid "Disconnect"
+#~ msgstr "Αποσύνδεση επαφής"
+
+#, fuzzy
+#~ msgid "Copy JID"
+#~ msgstr "Δωμάτιο:"
+
+#, fuzzy
+#~ msgid "Add to Roster…"
+#~ msgstr "_Προσθήκη στη λίστα επαφών"
+
+#, fuzzy
+#~ msgid "Copy JID/Email"
+#~ msgstr "Α_ντιγραφή JID/Email διεύθυνσης"
+
+#, fuzzy
+#~ msgid "JID: <i>%s</i>"
+#~ msgstr "ID συστήματος:"
+
+#~ msgid "Changing Subject"
+#~ msgstr "Αλλαγή θέματος"
+
+#~ msgid "Please specify the new subject:"
+#~ msgstr "Παρακαλώ καθορίστε το νέο θέμα:"
+
+#, fuzzy
+#~ msgid "You (%s) joined the room"
+#~ msgstr "Ο/Η %s μπήκε στο δωμάτιο"
+
+#, fuzzy
+#~ msgid "Unable to join groupchat"
+#~ msgstr "Δεν ήταν δυνατή η σύνδεση στην ομαδική συζήτηση"
+
+#~ msgid "Groupchat Invitation"
+#~ msgstr "Πρόσκληση ομαδικής κουβέντας"
+
+#, fuzzy
+#~ msgid "%(jid)s has been invited in this room"
+#~ msgstr "Ο %(nick)s πετάχτηκε έξω από τον %(who)s: %(reason)s"
+
+#, fuzzy
+#~ msgid "JID is not a Groupchat"
+#~ msgstr "Αυτή η μορφή συμπίεσης δεν υποστηρίζεται:"
+
+#~ msgid "Invalid JID"
+#~ msgstr "Μη έγκυρο JID"
+
+#~ msgid "A connection is not available"
+#~ msgstr "Δεν υπάρχει διαθέσιμη σύνδεση"
+
+#, fuzzy
+#~ msgid "JID already in list"
+#~ msgstr "Ένα πρόγραμμα για το Jabber"
+
+#, fuzzy
+#~ msgid "For the chosen encryption there is no encryption method available"
+#~ msgstr "Δεν υπάρχει διαθέσιμη σύνδεση"
+
+#~ msgid "Removes contact from roster"
+#~ msgstr "Αφαιρεί μια επαφή από τη λίστα επαφών"
+
+#, fuzzy
+#~ msgid "Not in roster"
+#~ msgstr "Εκτέλεση στο Τερματικό"
+
+#, fuzzy
+#~ msgid "Contact signed in notification color."
+#~ msgstr "_Προβολή τίτλου στο κουμπί"
+
+#, fuzzy
+#~ msgid "Contact signout notification color"
+#~ msgstr "_Προβολή τίτλου στο κουμπί"
+
+#, fuzzy
+#~ msgid "File transfer request notification color."
+#~ msgstr "Αίτηση μεταφοράς αρχείου"
+
+#, fuzzy
+#~ msgid "File transfer error notification color."
+#~ msgstr "Άνοιγμα αρχείου μενού"
+
+#, fuzzy
+#~ msgid "File transfer complete or stopped notification color."
+#~ msgstr "Ειδοποίηση όταν έχει ολοκληρωθεί μια μεταφορά αρχείου"
+
+#, fuzzy
+#~ msgid "Groupchat invitation notification color"
+#~ msgstr "Πρόσκληση ομαδικής κουβέντας"
+
+#~ msgid "Add * and [n] in roster title?"
+#~ msgstr "Να προστεθεί * και [n] στον τίτλο της λίστας επαφών;"
+
+#~ msgid "Hides the banner in two persons chat window"
+#~ msgstr "Αποκρύπτει την κεφαλίδα στο παράθυρο προσωπικής κουβέντας"
+
+#~ msgid "I'm eating, so leave me a message."
+#~ msgstr "Τώρα τρώω, οπότε αφήστε μήνυμα."
+
+#, fuzzy
+#~ msgid "from room %s"
+#~ msgstr "Από %s"
+
+#, fuzzy
+#~ msgid "Leave Groupchats"
+#~ msgstr "Ομαδικές συζητήσεις"
+
+#, fuzzy
+#~ msgid "Auto Join"
+#~ msgstr "Αυτόματη είσοδος"
+
+#, fuzzy
+#~ msgid "Room"
+#~ msgstr "Δωμάτιο:"
+
+#~ msgid "Jabber ID:"
+#~ msgstr "Jabber ID:"
+
+#, fuzzy
+#~ msgid "Occupant Actions"
+#~ msgstr "_Ενέργειες για τους συμμετέχοντες"
+
+#~ msgid "_Add to Roster"
+#~ msgstr "_Προσθήκη στη λίστα επαφών"
+
+#, fuzzy
+#~ msgid "_Manage Room"
+#~ msgstr "Διαχείριση σελιδοδεικτών"
+
+#, fuzzy
+#~ msgid "Configure _Room..."
+#~ msgstr "Ρύθμιση _δωματίου"
+
+#, fuzzy
+#~ msgid "_Destroy Room"
+#~ msgstr "Περιγραφή: %s"
+
+#, fuzzy
+#~ msgid "Jabber ID"
+#~ msgstr "Jabber ID:"
+
+#, fuzzy
+#~ msgid "account"
+#~ msgstr "λογαριασμός: "
+
+#, fuzzy
+#~ msgid "Roster"
+#~ msgstr "Εμφάνιση _λίστας επαφών"
+
+#, fuzzy
+#~ msgid "Show only in roster"
+#~ msgstr "Εμφά_νιση το μόνο στο κύριο παράθυρο"
+
+#, fuzzy
+#~ msgid "in _roster"
+#~ msgstr "Εκτέλεση στο Τερματικό"
+
+#, fuzzy
+#~ msgid "Roster Appearance"
+#~ msgstr "<b>Επεξεργασία κανόνα</b>"
+
+#, fuzzy
+#~ msgid "Show chatstate in roster"
+#~ msgstr "Εμφάνιση των ά_βαταρ των επαφών στη λίστα επαφών"
+
+#, fuzzy
+#~ msgid "_Add to Roster..."
+#~ msgstr "_Προσθήκη στη λίστα επαφών"
+
+#~ msgid "_Jabber ID:"
+#~ msgstr "_Jabber ID:"
+
+#, fuzzy
+#~ msgid "_Jabber ID"
+#~ msgstr "_Jabber ID:"
+
+#~ msgid "JabberID"
+#~ msgstr "JabberID"
+
+#, fuzzy
+#~ msgid "Show Roster"
+#~ msgstr "Εμφάνιση _λίστας επαφών"
+
+#, fuzzy
+#~ msgid "MUC server"
+#~ msgstr "Παρατηρητές"
+
+#~ msgid "Room Configuration"
+#~ msgstr "Ρυθμίσεις δωματίου"
+
+#~ msgid "Join _Group Chat"
+#~ msgstr "Συμμετοχή σε _ομαδική συζήτηση"
+
+#, fuzzy
+#~ msgid "Audio sessions are not available"
+#~ msgstr "To Session bus δεν είναι διαθέσιμο"
+
+#~ msgid "Conference"
+#~ msgstr "Ομαδικές συζητήσεις"
+
+#, fuzzy
+#~ msgid "_Manage Bookmarks…"
+#~ msgstr "Διαχείριση σελιδοδεικτών"
+
+#, fuzzy
+#~ msgid "Hide _Roster"
+#~ msgstr "Εκτέλεση στο Τερματικό"
+
+#~ msgid "Show _Roster"
+#~ msgstr "Εμφάνιση _λίστας επαφών"
+
+#, fuzzy
+#~ msgid "Invalid Room"
+#~ msgstr "Μη έγκυρη εγγραφή"
+
+#, fuzzy
+#~ msgid "Invalid room"
+#~ msgstr "Μη έγκυρη εγγραφή"
+
+#~ msgid "A GTK+ Jabber client"
+#~ msgstr "Ένα πρόγραμμα για το Jabber γραμμένο σε GTK+"
+
+#~ msgid "Changing Nickname"
+#~ msgstr "Αλλαγή ψευδωνύμου"
+
+#~ msgid "Please specify the new nickname you want to use:"
+#~ msgstr "Παρακαλώ καθορίστε το νέο ψευδώνυμο που θέλετε να χρησιμοποιείτε:"
+
+#~ msgid "Bookmark already set"
+#~ msgstr "Ο σελιδοδείκτης έχει οριστεί ήδη"
+
+#, fuzzy
+#~ msgid "Group Chat '%s' is already in your bookmarks."
+#~ msgstr "Το δωμάτιο \"%s\" υπάρχει ήδη στους σελιδοδείκτες σας."
+
+#~ msgid "Bookmark has been added successfully"
+#~ msgstr "Ο σελιδοδείκτης προστέθηκε με επιτυχία"
+
+#, fuzzy
+#~ msgid ""
+#~ "You can manage your bookmarks by clicking the Bookmarks menu item in your "
+#~ "contact list."
+#~ msgstr ""
+#~ "Μπορείτε να διαχειριστείτε τους σελιδοδείκτες από το μενού Ενέργειας στο "
+#~ "κεντρικό παράθυρο."
+
+#, fuzzy
+#~ msgid "The nickname contains invalid characters."
+#~ msgstr ""
+#~ "Το όνομα του δωματίου ή του διακομιστή περιέχει μη επιτρεπόμενους "
+#~ "χαρακτήρες."
+
+#, fuzzy
+#~ msgid "Bookmark Room"
+#~ msgstr "_Τοποθέτηση σελιδοδείκτη για αυτό το δωμάτιο"
+
+#, fuzzy
+#~ msgid "_Join New Group Chat"
+#~ msgstr "_Είσοδος σε Ομαδική Συζήτηση"
+
+#, fuzzy
+#~ msgid "_Create Group Chat"
+#~ msgstr "Ομαδικές συζητήσεις"
+
+#~ msgid "Name:"
+#~ msgstr "Όνομα:"
+
+#, fuzzy
+#~ msgid "Description:"
+#~ msgstr "Περιγραφή: %s"
+
+#, fuzzy
+#~ msgid "Address:"
+#~ msgstr "_Διεύθυνση:"
+
+#, fuzzy
+#~ msgid "You can not start a new conversation unless you are connected."
+#~ msgstr ""
+#~ "Δε μπορείτε να συμμετάσχετε σε μια ομαδική συζήτηση εκτός αν είστε "
+#~ "συνδεδεμένος."
+
+#, fuzzy
+#~ msgid "Occupants"
+#~ msgstr "_Ενέργειες για τους συμμετέχοντες"
+
+#, fuzzy
+#~ msgid "File transfer error"
+#~ msgstr "Σφάλμα μεταφοράς αρχείου"
+
+#, fuzzy
+#~ msgid "No Accounts available"
+#~ msgstr "Κανένας λογαριασμός δεν είναι διαθέσιμος"
+
+#~ msgid "_Modify Account..."
+#~ msgstr "_Επεξεργασία λογαριασμού..."
+
+#~ msgid "Integer"
+#~ msgstr "Ακέραιος"
+
+#~ msgid "Text"
+#~ msgstr "Κείμενο"
+
+#~ msgid "Value"
+#~ msgstr "Τιμή"
+
+#~ msgid "Type"
+#~ msgstr "Είδος"
+
+#~ msgid "(None)"
+#~ msgstr "(Κενή)"
+
+#~ msgid "Hidden"
+#~ msgstr "Μυστικό"
+
+#~ msgid "Manage Proxy Profiles"
+#~ msgstr "Διαχείριση προφίλ μεσολαβητή"
+
+#, fuzzy
+#~ msgid "Properties"
+#~ msgstr "<b>Ιδιότητες</b>"
+
+#, fuzzy
+#~ msgid "Proxy _Host"
+#~ msgstr "Μεσολαβητής:"
+
+#, fuzzy
+#~ msgid "Proxy _Port"
+#~ msgstr "_Θύρα:"
+
+#, fuzzy
+#~ msgid "New Groupchat"
+#~ msgstr "Αρχηγός ομάδας παραθύρων"
+
+#, fuzzy
+#~ msgid "New Contact"
+#~ msgstr "Προσθήκη νέας επαφής"
+
 #~ msgid "%s GiB"
 #~ msgstr "%s GiB"
 
@@ -11278,9 +12005,6 @@ msgstr "Η δημοσιοποίηση της vCard απέτυχε"
 #~ msgid "_Pause"
 #~ msgstr "_Παύση"
 
-#~ msgid "Clean _up"
-#~ msgstr "Εκκα_θάριση"
-
 #~ msgid "Remove file transfer from the list."
 #~ msgstr "Αφαίρεση της μεταφοράς αρχείου από τη λίστα."
 
@@ -11818,10 +12542,6 @@ msgstr "Η δημοσιοποίηση της vCard απέτυχε"
 #~ msgid "Nick"
 #~ msgstr "Ψευδώνυμο"
 
-#, fuzzy
-#~ msgid "Banning…"
-#~ msgstr "Απαγορεύεται η πρόσβαση..."
-
 #~ msgid ""
 #~ "<b>Whom do you want to ban?</b>\n"
 #~ "\n"
@@ -11892,13 +12612,6 @@ msgstr "Η δημοσιοποίηση της vCard απέτυχε"
 #~ msgstr "Φιλτράρισμα:"
 
 #, fuzzy
-#~ msgid ""
-#~ "If checked, Gajim will display the mood of contacts in the roster window"
-#~ msgstr ""
-#~ "Αν επιλεγεί, το Gajim θα εμφανίζει τα άβαταρ των επαφών στην λίστα επαφών "
-#~ "και στις ομαδικές κουβέντες"
-
-#, fuzzy
 #~ msgid "<b>Chat Appearance</b>"
 #~ msgstr "<b>Επεξεργασία κανόνα</b>"
 
@@ -12136,10 +12849,6 @@ msgstr "Η δημοσιοποίηση της vCard απέτυχε"
 #~ msgstr "Μήνυμα κατά_στασης:"
 
 #, fuzzy
-#~ msgid "Group chat highlight"
-#~ msgstr "Επισήμανση "
-
-#, fuzzy
 #~ msgid "Your nickname"
 #~ msgstr "Π_ριν το ψευδώνυμο:"
 
@@ -12304,9 +13013,6 @@ msgstr "Η δημοσιοποίηση της vCard απέτυχε"
 #~ msgid "The passwords typed in both fields must be identical."
 #~ msgstr "Οι κωδικοί των δυο πεδίων πρέπει να είναι ίδιοι."
 
-#~ msgid "Enter new password:"
-#~ msgstr "Εισάγετε νέο κωδικό πρόσβασης:"
-
 #~ msgid "Enter it again for confirmation:"
 #~ msgstr "Εισάγετε τον ξανά για επιβεβαίωση:"
 
@@ -12321,10 +13027,6 @@ msgstr "Η δημοσιοποίηση της vCard απέτυχε"
 #~ msgid "unsubscribe request from %s"
 #~ msgstr "αίτηση αφαίρεσης εξουσιοδότησης από %s"
 
-#, fuzzy
-#~ msgid "Autojoin"
-#~ msgstr "Αυτόματη είσοδος"
-
 #~ msgid "Homepage:"
 #~ msgstr "Προσωπ. σελίδα:"
 
@@ -12420,10 +13122,6 @@ msgstr "Η δημοσιοποίηση της vCard απέτυχε"
 #~ msgstr "%d μη αναγνωσμένο μήνυμα"
 
 #, fuzzy
-#~ msgid "AIM Address:"
-#~ msgstr "Αντιγραφή διεύθυνσης email"
-
-#, fuzzy
 #~ msgid "MSN Address:"
 #~ msgstr "Αντιγραφή διεύθυνσης email"
 
@@ -12658,9 +13356,6 @@ msgstr "Η δημοσιοποίηση της vCard απέτυχε"
 #~ msgid "Server:"
 #~ msgstr "Εξυπηρετητής:"
 
-#~ msgid "Password:"
-#~ msgstr "Κωδικός πρόσβασης:"
-
 #, fuzzy
 #~ msgid "Join this room _automatically when I connect"
 #~ msgstr "Καθορισμός του προφίλ μου κατά τη σύνδεση"
@@ -12678,10 +13373,6 @@ msgstr "Η δημοσιοποίηση της vCard απέτυχε"
 #~ msgstr "Διαχειριστής ιστορικού"
 
 #, fuzzy
-#~ msgid "This contact does not support file transfer."
-#~ msgstr "Λίστα ενεργών, ολοκληρωμένων και σταματημένων μεταφορών αρχείων"
-
-#, fuzzy
 #~ msgid "Hides the buttons in chat windows."
 #~ msgstr "Αποκρύπτει τα κουμπιά σε παράθυρο ομαδικής κουβέντας"
 
@@ -12935,9 +13626,6 @@ msgstr "Η δημοσιοποίηση της vCard απέτυχε"
 #~ msgid "_Edit Personal Information..."
 #~ msgstr "Τροποποίηση προσωπικών πληροφοριών..."
 
-#~ msgid "Information about you, as stored in the server"
-#~ msgstr "Οι πληροφορίες για εσάς, όπως αποθηκεύονται στο διακομιστή"
-
 #~ msgid "<b>Personal Information</b>"
 #~ msgstr "<b>Προσωπικές πληροφορίες</b>"
 
@@ -12971,13 +13659,6 @@ msgstr "Η δημοσιοποίηση της vCard απέτυχε"
 #~ msgid "Account Name Already Used"
 #~ msgstr "Το όνομα λογαριασμού είναι ήδη σε χρήση"
 
-#~ msgid ""
-#~ "This name is already used by another of your accounts. Please choose "
-#~ "another name."
-#~ msgstr ""
-#~ "Αυτό το όνομα χρησιμοποιείται ήδη από κάποιον άλλον από τους λογαριασμούς "
-#~ "σας. Παρακαλώ, επιλέξτε άλλο όνομα."
-
 #~ msgid "Invalid account name"
 #~ msgstr "Μη έγκυρο όνομα λογαριασμού"
 
@@ -13017,9 +13698,6 @@ msgstr "Η δημοσιοποίηση της vCard απέτυχε"
 #~ "Πρέπει πρώτα να δημιουργήσετε το λογαριασμό σας προτού ξεκινήσετε να "
 #~ "τροποποιείτε τις προσωπικές σας πληροφορίες."
 
-#~ msgid "Account Local already exists."
-#~ msgstr "Υπάρχει ήδη τοπικό προφίλ με αυτό το όνομα"
-
 #~ msgid "THANKS:"
 #~ msgstr "ΕΥΧΑΡΙΣΤΙΕΣ:"
 
@@ -13092,10 +13770,6 @@ msgstr "Η δημοσιοποίηση της vCard απέτυχε"
 #~ msgid "The following message was NOT encrypted"
 #~ msgstr "[Aυτό το μήνυμα είναι κρυπτογραφημένο]"
 
-#, fuzzy
-#~ msgid "Encryption used for this contact."
-#~ msgstr "Το OpenPGP δεν είναι διαθέσιμο σε αυτόν τον Η/Υ"
-
 #~ msgid "Toggle Open_PGP Encryption"
 #~ msgstr "Εν/Απενεργοποίηση _κρυπτογράφησης OpenPGP"
 
@@ -13157,10 +13831,6 @@ msgstr "Η δημοσιοποίηση της vCard απέτυχε"
 #~ msgstr "_Προσθήκη επαφής..."
 
 #, fuzzy
-#~ msgid "_Accounts"
-#~ msgstr "Λογαριασμοί"
-
-#, fuzzy
 #~ msgid "Profile, A_vatar"
 #~ msgstr "Όνομα προφίλ:"
 
@@ -13344,13 +14014,6 @@ msgstr "Η δημοσιοποίηση της vCard απέτυχε"
 #~ msgid "Activity: "
 #~ msgstr "Ενεργό"
 
-#~ msgid "Join _Group Chat..."
-#~ msgstr "Συμμετοχή σε _Ομαδική Συζήτηση..."
-
-#, fuzzy
-#~ msgid "_Modify Account"
-#~ msgstr "Επεξεργασία λογαριασμού"
-
 #, fuzzy
 #~ msgid "Check on startup if Gajim is the _default Jabber client"
 #~ msgstr "Gajim - ένα πρόγραμμα για το Jabber γραμμένο σε GTK+"
@@ -13814,10 +14477,6 @@ msgstr "Η δημοσιοποίηση της vCard απέτυχε"
 #~ msgstr "Δεν βρέθηκε το ψευδώνυμο: %s"
 
 #, fuzzy
-#~ msgid "This group chat has no subject"
-#~ msgstr "Αυτό το δωμάτιο δεν έχει θέμα"
-
-#, fuzzy
 #~ msgid ""
 #~ "Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
 #~ "nickname of an occupant may be substituted, but not if it contains \"@\". "
@@ -13894,9 +14553,6 @@ msgstr "Η δημοσιοποίηση της vCard απέτυχε"
 #~ "Πατήστε για να δείτε τα χαρακτηριστικά (όπως μεταφορές MSN, ICQ) των "
 #~ "διακομιστών του jabber"
 
-#~ msgid "_Host:"
-#~ msgstr "Ε_ξυπηρετητής:"
-
 #, fuzzy
 #~ msgid "Show _roster"
 #~ msgstr "Εμφάνιση _λίστας επαφών"
@@ -14060,9 +14716,6 @@ msgstr "Η δημοσιοποίηση της vCard απέτυχε"
 #~ msgid "_Player:"
 #~ msgstr "_Αναπαραγωγέας:"
 
-#~ msgid "Address"
-#~ msgstr "Διεύθυνση"
-
 #~ msgid "Role:"
 #~ msgstr "Ρόλος:"
 
@@ -14118,9 +14771,6 @@ msgstr "Η δημοσιοποίηση της vCard απέτυχε"
 #~ "Η υποστήριξη για Διαχείριση συνόδων δεν είναι διαθέσιμη (δεν υπάρχει το "
 #~ "άρθρωμα του gnome.ui)"
 
-#~ msgid "Private Chat"
-#~ msgstr "Προσωπική συζήτηση"
-
 #~ msgid "%s does not appear to be a valid JID"
 #~ msgstr "Το %s δεν φαίνεται να είναι έγκυρο JID"
 
@@ -14177,9 +14827,6 @@ msgstr "Η δημοσιοποίηση της vCard απέτυχε"
 #~ msgid "Connection to host could not be established"
 #~ msgstr "Η σύνδεση με το διακομιστή δεν ήταν εφικτή."
 
-#~ msgid "A_fter nickname:"
-#~ msgstr "Με_τά από ψευδώνυμο:"
-
 #~ msgid "_After time:"
 #~ msgstr "Μετά α_πό χρόνο:"
 
@@ -14362,9 +15009,6 @@ msgstr "Η δημοσιοποίηση της vCard απέτυχε"
 #~ msgid "Timeout"
 #~ msgstr "Λήξη χρονικού ορίου"
 
-#~ msgid "account: "
-#~ msgstr "λογαριασμός: "
-
 #~ msgid "Activate/Disable notification for when a file transfer is complete"
 #~ msgstr ""
 #~ "Ενεργοποίηση/Απενεργοποίηση ειδοποίησης για όταν ολοκληρωθεί μια μεταφορά "
@@ -14474,9 +15118,6 @@ msgstr "Η δημοσιοποίηση της vCard απέτυχε"
 #~ msgid "_Earliest"
 #~ msgstr "_Αρχή"
 
-#~ msgid "_Latest"
-#~ msgstr "_Τέλος"
-
 #~ msgid "%s is now %s: %s"
 #~ msgstr "Ο %s είναι τώρα %s: %s"
 
diff --git a/po/en_GB.po b/po/en_GB.po
index 25446a1a9..1f04033db 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: 2019-07-02 02:06+0000\n"
+"POT-Creation-Date: 2019-08-11 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,71 +17,71 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: gajim/chat_control_base.py:550
+#: gajim/chat_control_base.py:557
 msgid "_Undo"
 msgstr ""
 
-#: gajim/chat_control_base.py:558 gajim/conversation_textview.py:529
+#: gajim/chat_control_base.py:565 gajim/conversation_textview.py:529
 msgid "_Clear"
 msgstr ""
 
-#: gajim/chat_control_base.py:563
+#: gajim/chat_control_base.py:570
 msgid "Paste as quote"
 msgstr ""
 
-#: gajim/chat_control_base.py:613
+#: gajim/chat_control_base.py:620
 #, fuzzy
 msgid "Paste Image"
 msgstr "Choose Image"
 
-#: gajim/chat_control_base.py:614
+#: gajim/chat_control_base.py:621
 #, fuzzy
 msgid "You are trying to paste an image"
 msgstr "You are going to close several tabs"
 
-#: gajim/chat_control_base.py:615
+#: gajim/chat_control_base.py:622
 #, 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:617 gajim/groupchat_control.py:2310
-#: gajim/roster_window.py:2848 gajim/roster_window.py:4167
-#: gajim/message_window.py:252 gajim/gtk/dialogs.py:418
+#: gajim/chat_control_base.py:624 gajim/groupchat_control.py:2218
+#: gajim/roster_window.py:2841 gajim/roster_window.py:4118
+#: gajim/message_window.py:359 gajim/gtk/dialogs.py:330
 #, fuzzy
 msgid "_Do not ask me again"
 msgstr "Do _not ask me again"
 
-#: gajim/chat_control_base.py:620
+#: gajim/chat_control_base.py:627
 msgid "_Paste"
 msgstr ""
 
-#: gajim/chat_control_base.py:1162 gajim/gtk/accounts.py:351
+#: gajim/chat_control_base.py:1169 gajim/gtk/accounts.py:354
 #, fuzzy
 msgid "Privacy"
 msgstr "Privacy List"
 
-#: gajim/chat_control_base.py:1163
+#: gajim/chat_control_base.py:1170
 #, fuzzy
 msgid "Warning"
 msgstr "Banning %s"
 
-#: gajim/chat_control_base.py:1164
+#: gajim/chat_control_base.py:1171
 #, fuzzy, python-format
 msgid "If you send a file to <b>%s</b>, your real JID will be revealed."
 msgstr "If you send a file to %s, he/she will know your real Jabber ID."
 
-#: gajim/chat_control_base.py:1169
+#: gajim/chat_control_base.py:1176
 #, fuzzy
 msgid "Continue"
 msgstr "_Continue"
 
-#: gajim/gtkgui_helpers.py:163 gajim/gtk/filetransfer.py:393
+#: gajim/gtkgui_helpers.py:163 gajim/gtk/filetransfer.py:398
 #, fuzzy, python-format
 msgid "Cannot overwrite existing file '%s'"
 msgstr "Cannot overwrite existing file \"%s\""
 
-#: gajim/gtkgui_helpers.py:164 gajim/gtk/filetransfer.py:394
+#: gajim/gtkgui_helpers.py:164 gajim/gtk/filetransfer.py:399
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
@@ -174,388 +174,398 @@ msgstr "There is no pending subscription request."
 msgid " resource with priority "
 msgstr " resource with priority "
 
-#: gajim/gui_menu_builder.py:96
-msgid "_New Group Chat"
-msgstr "_New Group Chat"
-
-#: gajim/gui_menu_builder.py:289 gajim/gui_menu_builder.py:380
-#: gajim/chat_control.py:303 gajim/roster_window.py:786
-#: gajim/roster_window.py:1719 gajim/roster_window.py:1721
-#: gajim/roster_window.py:2030 gajim/roster_window.py:3336
-#: gajim/roster_window.py:3369 gajim/gui_interface.py:413
-#: gajim/common/contacts.py:206 gajim/common/contacts.py:343
-#: gajim/common/helpers.py:83 gajim/common/helpers.py:311
-#: gajim/gtk/add_contact.py:319 gajim/gtk/subscription_request.py:70
-#: gajim/gtk/subscription_request.py:99 gajim/gtk/roster_item_exchange.py:112
-msgid "Not in Roster"
-msgstr "Not in Roster"
+#: gajim/gui_menu_builder.py:251 gajim/gui_menu_builder.py:342
+#: gajim/chat_control.py:305 gajim/roster_window.py:783
+#: gajim/roster_window.py:1716 gajim/roster_window.py:1718
+#: gajim/roster_window.py:2027 gajim/roster_window.py:3292
+#: gajim/roster_window.py:3325 gajim/gui_interface.py:396
+#: gajim/common/contacts.py:222 gajim/common/contacts.py:359
+#: gajim/common/contacts.py:471 gajim/common/helpers.py:86
+#: gajim/common/helpers.py:317 gajim/gtk/add_contact.py:319
+#: gajim/gtk/subscription_request.py:70 gajim/gtk/subscription_request.py:99
+#: gajim/gtk/roster_item_exchange.py:112
+#, fuzzy
+msgid "Not in contact list"
+msgstr "Show _Offline Contacts"
 
-#: gajim/gui_menu_builder.py:393
-msgid "I would like to add you to my roster"
-msgstr "I would like to add you to my roster"
+#: gajim/gui_menu_builder.py:355
+#, 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:471
+#: gajim/gui_menu_builder.py:433
 #, fuzzy
 msgid "Send Single _Message…"
 msgstr "Send Single _Message"
 
-#: gajim/gui_menu_builder.py:486
+#: gajim/gui_menu_builder.py:448
 #, fuzzy
 msgid "E_xecute Command…"
 msgstr "_Execute Command"
 
-#: gajim/gui_menu_builder.py:494
+#: gajim/gui_menu_builder.py:456
 msgid "_Manage Transport"
 msgstr "_Manage Transport"
 
-#: gajim/gui_menu_builder.py:500
+#: gajim/gui_menu_builder.py:462
 msgid "_Modify Transport"
 msgstr "_Modify Transport"
 
-#: gajim/gui_menu_builder.py:507 gajim/roster_window.py:5046
+#: gajim/gui_menu_builder.py:469 gajim/roster_window.py:4985
 #, fuzzy
 msgid "_Rename…"
 msgstr "_Rename"
 
-#: gajim/gui_menu_builder.py:518 gajim/roster_window.py:5062
-#: gajim/roster_window.py:5177 gajim/data/gui/blocked_contacts_window.ui:52
+#: gajim/gui_menu_builder.py:480 gajim/roster_window.py:5001
+#: gajim/roster_window.py:5116 gajim/data/gui/blocked_contacts_window.ui:52
 #: gajim/data/gui/gc_occupants_menu.ui:148
 #: gajim/data/gui/contact_context_menu.ui:143
 msgid "_Unblock"
 msgstr "_Unblock"
 
-#: gajim/gui_menu_builder.py:521 gajim/roster_window.py:5067
-#: gajim/roster_window.py:5181 gajim/data/gui/gc_occupants_menu.ui:140
+#: gajim/gui_menu_builder.py:483 gajim/roster_window.py:5006
+#: gajim/roster_window.py:5120 gajim/data/gui/gc_occupants_menu.ui:140
 #: gajim/data/gui/contact_context_menu.ui:151
 msgid "_Block"
 msgstr "_Block"
 
-#: gajim/gui_menu_builder.py:529 gajim/roster_window.py:5074
+#: gajim/gui_menu_builder.py:491 gajim/roster_window.py:5013
 #: gajim/data/gui/contact_context_menu.ui:181
 msgid "Remo_ve"
 msgstr "Remo_ve"
 
-#: gajim/gui_menu_builder.py:539 gajim/data/gui/contact_context_menu.ui:198
+#: gajim/gui_menu_builder.py:501 gajim/data/gui/contact_context_menu.ui:198
 msgid "_Information"
 msgstr "_Information"
 
-#: gajim/gui_menu_builder.py:552
+#: gajim/gui_menu_builder.py:514
 #, fuzzy
 msgid "Save _As"
 msgstr "Have "
 
-#: gajim/gui_menu_builder.py:564 gajim/groupchat_control.py:501
-#: gajim/chat_control.py:340
+#: gajim/gui_menu_builder.py:526 gajim/groupchat_control.py:507
+#: gajim/chat_control.py:342
 #, fuzzy
 msgid "Send File…"
 msgstr "Send _File"
 
-#: gajim/gui_menu_builder.py:565
+#: gajim/gui_menu_builder.py:527
 #, fuzzy
 msgid "Upload File…"
 msgstr "Save File as..."
 
-#: gajim/gui_menu_builder.py:566
+#: gajim/gui_menu_builder.py:528
 #, fuzzy
 msgid "Send File Directly…"
 msgstr "Save File as..."
 
-#: gajim/gui_menu_builder.py:568 gajim/gui_menu_builder.py:632
+#: gajim/gui_menu_builder.py:530 gajim/gui_menu_builder.py:596
 #, fuzzy
 msgid "Send Chatstate"
 msgstr "Last state"
 
-#: gajim/gui_menu_builder.py:569
+#: gajim/gui_menu_builder.py:531
 #, fuzzy
 msgid "Invite Contacts"
 msgstr "Invite _Contacts"
 
-#: gajim/gui_menu_builder.py:570
+#: gajim/gui_menu_builder.py:532
 #, fuzzy
-msgid "Add to Roster"
-msgstr "_Add to Roster"
+msgid "Add to Contact List"
+msgstr "_Add Contact..."
 
-#: gajim/gui_menu_builder.py:571
-msgid "Audio Session"
-msgstr ""
+#: gajim/gui_menu_builder.py:533
+#, fuzzy
+msgid "Voice Chat"
+msgstr "File Transfer Request"
 
-#: gajim/gui_menu_builder.py:572
-msgid "Video Session"
-msgstr ""
+#: gajim/gui_menu_builder.py:534
+#, fuzzy
+msgid "Video Chat"
+msgstr "Private Chat"
 
-#: gajim/gui_menu_builder.py:573
+#: gajim/gui_menu_builder.py:535 gajim/gui_menu_builder.py:582
 #, fuzzy
 msgid "Information"
 msgstr "_Information"
 
-#: gajim/gui_menu_builder.py:574 gajim/gui_menu_builder.py:639
+#: gajim/gui_menu_builder.py:536 gajim/gui_menu_builder.py:602
 #: gajim/data/gui/application_menu.ui:37
 #, fuzzy
 msgid "History"
 msgstr "_History"
 
-#: gajim/gui_menu_builder.py:580 gajim/gui_menu_builder.py:687
+#: gajim/gui_menu_builder.py:542 gajim/gui_menu_builder.py:650
 #: gajim/data/gui/preferences_window.ui:1823
 msgid "Disabled"
 msgstr "Disabled"
 
-#: gajim/gui_menu_builder.py:581 gajim/gui_menu_builder.py:688
+#: gajim/gui_menu_builder.py:543 gajim/gui_menu_builder.py:651
 #, fuzzy
 msgid "Composing only"
 msgstr "Composing"
 
-#: gajim/gui_menu_builder.py:582 gajim/gui_menu_builder.py:689
+#: gajim/gui_menu_builder.py:544 gajim/gui_menu_builder.py:652
 #, fuzzy
 msgid "All chat states"
 msgstr "All statuses"
 
-#: gajim/gui_menu_builder.py:620
+#: gajim/gui_menu_builder.py:583
 #, fuzzy
-msgid "Manage Room"
-msgstr "_Manage Room"
+msgid "Manage Group Chat"
+msgstr "Leave Groupchats"
 
-#: gajim/gui_menu_builder.py:621
+#: gajim/gui_menu_builder.py:584 gajim/data/gui/groupchat_control.ui:649
 #, fuzzy
 msgid "Change Subject"
 msgstr "Change _Subject..."
 
-#: gajim/gui_menu_builder.py:622
+#: gajim/gui_menu_builder.py:585
 #, fuzzy
-msgid "Configure Room"
-msgstr "Configure _Room..."
+msgid "Configure Group Chat"
+msgstr "Leave Groupchats"
 
-#: gajim/gui_menu_builder.py:623
+#: gajim/gui_menu_builder.py:586
 #, fuzzy
 msgid "Upload Avatar…"
 msgstr "Choose Image"
 
-#: gajim/gui_menu_builder.py:624
+#: gajim/gui_menu_builder.py:587
 #, fuzzy
-msgid "Destroy Room"
-msgstr "_Destroy Room"
+msgid "Destroy Group Chat"
+msgstr "New Group Chat"
 
-#: gajim/gui_menu_builder.py:626 gajim/data/gui/preferences_window.ui:790
+#: gajim/gui_menu_builder.py:589 gajim/data/gui/preferences_window.ui:790
 #, fuzzy
 msgid "Chat Settings"
 msgstr "Registration failed"
 
-#: gajim/gui_menu_builder.py:627
+#: gajim/gui_menu_builder.py:590
 msgid "Show join/leave"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:628
+#: gajim/gui_menu_builder.py:591
 #, fuzzy
 msgid "Show status changes"
 msgstr "_Log status changes of contacts"
 
-#: gajim/gui_menu_builder.py:629 gajim/data/gui/gc_control_popup_menu.ui:72
+#: gajim/gui_menu_builder.py:592 gajim/data/gui/gc_control_popup_menu.ui:72
 #, fuzzy
 msgid "Notify on all messages"
 msgstr "Preset messages:"
 
-#: gajim/gui_menu_builder.py:630
+#: gajim/gui_menu_builder.py:593
 #, fuzzy
 msgid "Minimize on close"
 msgstr "_Minimise on close"
 
-#: gajim/gui_menu_builder.py:631
+#: gajim/gui_menu_builder.py:595
 #, fuzzy
-msgid "Minimize on autojoin"
+msgid "Minimize when joining automatically"
 msgstr "Minimise on Auto Join"
 
-#: gajim/gui_menu_builder.py:634
+#: gajim/gui_menu_builder.py:598
 msgid "Sync Threshold"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:635
+#: gajim/gui_menu_builder.py:599
 #, fuzzy
-msgid "Change Nick"
+msgid "Change Nickname"
 msgstr "Change _Nickname..."
 
-#: gajim/gui_menu_builder.py:636
-#, fuzzy
-msgid "Bookmark Room"
-msgstr "Bookmark this room"
-
-#: gajim/gui_menu_builder.py:637
+#: gajim/gui_menu_builder.py:600
 #, fuzzy
 msgid "Request Voice"
 msgstr "_Voice"
 
-#: gajim/gui_menu_builder.py:638 gajim/roster_window.py:5246
+#: gajim/gui_menu_builder.py:601 gajim/roster_window.py:5185
 #, fuzzy
 msgid "Execute command"
 msgstr "_Execute Command"
 
-#: gajim/gui_menu_builder.py:640
-#, fuzzy
-msgid "Disconnect"
-msgstr "_Disconnect"
+#: gajim/gui_menu_builder.py:603
+msgid "Leave"
+msgstr ""
 
-#: gajim/gui_menu_builder.py:678 gajim/gtk/preferences.py:156
+#: gajim/gui_menu_builder.py:641 gajim/gtk/preferences.py:155
 msgid "No threshold"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:680 gajim/gtk/preferences.py:158
+#: gajim/gui_menu_builder.py:643 gajim/gtk/preferences.py:157
 #, 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:709 gajim/gui_menu_builder.py:747
-#: gajim/gtk/join_groupchat.py:43
-msgid "Join Group Chat"
-msgstr "Join Group Chat"
-
-#: gajim/gui_menu_builder.py:746
+#: gajim/gui_menu_builder.py:672
 #, fuzzy
 msgid "Add Contact…"
 msgstr "_Add Contact..."
 
-#: gajim/gui_menu_builder.py:748 gajim/gtk/profile.py:52
-#: gajim/gtk/accounts.py:770 gajim/gtk/accounts.py:808
+#: gajim/gui_menu_builder.py:673 gajim/gtk/profile.py:52
+#: gajim/gtk/accounts.py:773 gajim/gtk/accounts.py:811
 #, fuzzy
 msgid "Profile"
 msgstr "file"
 
-#: gajim/gui_menu_builder.py:749
+#: gajim/gui_menu_builder.py:674
+#, fuzzy
+msgid "Send Single Message…"
+msgstr "Send Single _Message"
+
+#: gajim/gui_menu_builder.py:675
 #, fuzzy
 msgid "Discover Services"
 msgstr "_Discover Services"
 
-#: gajim/gui_menu_builder.py:750
+#: gajim/gui_menu_builder.py:676 gajim/gtk/server_info.py:36
 #, fuzzy
-msgid "Send Single Message…"
-msgstr "Send Single _Message"
+msgid "Server Info"
+msgstr "Server"
 
-#: gajim/gui_menu_builder.py:751 gajim/data/gui/preferences_window.ui:2741
+#: gajim/gui_menu_builder.py:677 gajim/data/gui/preferences_window.ui:2741
 msgid "Advanced"
 msgstr "Advanced"
 
-#: gajim/gui_menu_builder.py:752 gajim/gtk/mam_preferences.py:88
+#: gajim/gui_menu_builder.py:678 gajim/gtk/mam_preferences.py:88
 #, fuzzy
 msgid "Archiving Preferences"
 msgstr "_Preferences"
 
-#: gajim/gui_menu_builder.py:753
+#: gajim/gui_menu_builder.py:679
 #, fuzzy
 msgid "Blocking List"
 msgstr "Ban List"
 
-#: gajim/gui_menu_builder.py:754 gajim/gtk/history_sync.py:108
+#: gajim/gui_menu_builder.py:680
+#, fuzzy
+msgid "Bookmarks"
+msgstr "_Bookmark"
+
+#: gajim/gui_menu_builder.py:681
+#, fuzzy
+msgid "PEP Configuration"
+msgstr "Room Configuration"
+
+#: gajim/gui_menu_builder.py:682 gajim/gtk/history_sync.py:108
 #: gajim/gtk/history_sync.py:186
 #, fuzzy
 msgid "Synchronise History"
 msgstr "Synchronise"
 
-#: gajim/gui_menu_builder.py:755 gajim/gtk/privacy_list.py:427
+#: gajim/gui_menu_builder.py:683 gajim/gtk/privacy_list.py:427
 msgid "Privacy Lists"
 msgstr "Privacy Lists"
 
-#: gajim/gui_menu_builder.py:756 gajim/gtk/server_info.py:36
-#, fuzzy
-msgid "Server Info"
-msgstr "Server"
-
-#: gajim/gui_menu_builder.py:757 gajim/gui_menu_builder.py:768
+#: gajim/gui_menu_builder.py:685 gajim/gui_menu_builder.py:696
 #: gajim/data/gui/xml_console_window.ui:77
 msgid "XML Console"
 msgstr "XML Console"
 
-#: gajim/gui_menu_builder.py:759 gajim/data/gui/groupchat_config.ui:36
+#: gajim/gui_menu_builder.py:687 gajim/data/gui/groupchat_config.ui:36
 #, fuzzy
 msgid "Admin"
 msgstr "_Admin"
 
-#: gajim/gui_menu_builder.py:760
+#: gajim/gui_menu_builder.py:688
 #, fuzzy
 msgid "Send Server Message…"
 msgstr "_Send Server Message..."
 
-#: gajim/gui_menu_builder.py:761
+#: gajim/gui_menu_builder.py:689
 #, fuzzy
 msgid "Set MOTD…"
 msgstr "Set MOTD..."
 
-#: gajim/gui_menu_builder.py:762
+#: gajim/gui_menu_builder.py:690
 #, fuzzy
 msgid "Update MOTD…"
 msgstr "Update MOTD..."
 
-#: gajim/gui_menu_builder.py:763
+#: gajim/gui_menu_builder.py:691
 #, fuzzy
 msgid "Delete MOTD…"
 msgstr "Delete MOTD"
 
-#: gajim/gui_menu_builder.py:812
+#: gajim/gui_menu_builder.py:736
 #, fuzzy
-msgid "No Accounts available"
-msgstr "No account available"
+msgid "_Add Account…"
+msgstr "_Add Contact..."
+
+#: gajim/gui_menu_builder.py:742
+#, fuzzy
+msgid "_Modify Accounts…"
+msgstr "_Modify Account"
+
+#: gajim/gui_menu_builder.py:751 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:823 gajim/data/gui/application_menu.ui:5
-#: gajim/data/gui/application_menu.ui:71 gajim/data/gui/shortcuts_window.ui:182
-#: gajim/gtk/accounts.py:58
+#: gajim/gui_menu_builder.py:755 gajim/data/gui/application_menu.ui:5
+#: gajim/data/gui/shortcuts_window.ui:182 gajim/gtk/accounts.py:57
 msgid "Accounts"
 msgstr "Accounts"
 
-#: gajim/gui_menu_builder.py:881 gajim/gui_menu_builder.py:886
+#: gajim/gui_menu_builder.py:784 gajim/gui_menu_builder.py:789
 #, fuzzy
-msgid "Copy JID"
-msgstr "Room JID"
+msgid "Copy XMPP Address"
+msgstr "_Copy JID/E-mail Address"
 
-#: gajim/gui_menu_builder.py:882 gajim/gui_menu_builder.py:914
+#: gajim/gui_menu_builder.py:785 gajim/gui_menu_builder.py:817
 #, fuzzy
 msgid "Join Groupchat"
 msgstr "Join Group Chat"
 
-#: gajim/gui_menu_builder.py:887 gajim/gui_menu_builder.py:913
-#: gajim/data/gui/application_menu.ui:76
+#: gajim/gui_menu_builder.py:790 gajim/gui_menu_builder.py:816
+#: gajim/data/gui/application_menu.ui:71
 #: gajim/data/gui/subscription_request_window.ui:106
 msgid "Start Chat"
 msgstr "Start Chat"
 
-#: gajim/gui_menu_builder.py:888 gajim/gui_menu_builder.py:915
+#: gajim/gui_menu_builder.py:791 gajim/gui_menu_builder.py:818
 #, fuzzy
-msgid "Add to Roster…"
-msgstr "_Add to Roster"
+msgid "Add to Contact List…"
+msgstr "_Add Contact..."
 
-#: gajim/gui_menu_builder.py:893
+#: gajim/gui_menu_builder.py:796
 #, fuzzy
 msgid "Copy Link Location"
 msgstr "_Copy Link Location"
 
-#: gajim/gui_menu_builder.py:894
+#: gajim/gui_menu_builder.py:797
 #, fuzzy
 msgid "Open Link in Browser"
 msgstr "_Open Link in Browser"
 
-#: gajim/gui_menu_builder.py:899
+#: gajim/gui_menu_builder.py:802
 #, fuzzy
 msgid "Copy Email Address"
 msgstr "_Copy JID/E-mail Address"
 
-#: gajim/gui_menu_builder.py:900 gajim/gui_menu_builder.py:912
+#: gajim/gui_menu_builder.py:803 gajim/gui_menu_builder.py:815
 #, fuzzy
 msgid "Open Email Composer"
 msgstr "_Open E-mail Composer"
 
-#: gajim/gui_menu_builder.py:905
+#: gajim/gui_menu_builder.py:808
 #, fuzzy
 msgid "Copy Location"
 msgstr "_Copy Link Location"
 
-#: gajim/gui_menu_builder.py:906
+#: gajim/gui_menu_builder.py:809
 #, fuzzy
 msgid "Show Location"
 msgstr "Notification"
 
-#: gajim/gui_menu_builder.py:911
+#: gajim/gui_menu_builder.py:814
 #, fuzzy
-msgid "Copy JID/Email"
+msgid "Copy XMPP Address/Email"
 msgstr "_Copy JID/E-mail Address"
 
-#: gajim/gui_menu_builder.py:945
+#: gajim/gui_menu_builder.py:852
 #, fuzzy
 msgid "Copy"
 msgstr "Room JID"
@@ -578,44 +588,56 @@ msgstr ""
 msgid "Choose folder for logfile"
 msgstr ""
 
-#: gajim/history_manager.py:107
+#: gajim/history_manager.py:106
 msgid "Cannot find history logs database"
 msgstr "Cannot find history logs database"
 
-#: gajim/history_manager.py:108
+#: gajim/history_manager.py:107
 #, fuzzy, python-format
 msgid "%s does not exist."
 msgstr "File does not exist"
 
-#: gajim/history_manager.py:141 gajim/history_manager.py:195
-#: gajim/gtk/discovery.py:829 gajim/gtk/roster_item_exchange.py:80
-msgid "JID"
-msgstr "JID"
+#: gajim/history_manager.py:140 gajim/history_manager.py:194
+#: 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:30
+#: gajim/gtk/accounts.py:804
+#, fuzzy
+msgid "XMPP Address"
+msgstr "AIM Address:"
 
-#: gajim/history_manager.py:154 gajim/history_manager.py:202
+#: gajim/history_manager.py:153 gajim/history_manager.py:201
 #: gajim/data/gui/history_window.ui:89 gajim/gtk/history.py:108
 msgid "Date"
 msgstr "Date"
 
-#: gajim/history_manager.py:161 gajim/history_manager.py:225
+#: gajim/history_manager.py:160 gajim/history_manager.py:224
 #: gajim/data/gui/join_groupchat_window.ui:208
 #: gajim/data/gui/profile_window.ui:214
 #: gajim/data/gui/vcard_information_window.ui:443
+#: gajim/data/gui/bookmarks.ui:140
 msgid "Nickname"
 msgstr "Nickname"
 
-#: gajim/history_manager.py:172 gajim/history_manager.py:211
+#: gajim/history_manager.py:171 gajim/history_manager.py:210
 #: gajim/data/gui/preferences_window.ui:1344
 #: gajim/data/gui/single_message_window.ui:275 gajim/gtk/history.py:117
 msgid "Message"
 msgstr "Message"
 
-#: gajim/history_manager.py:180 gajim/history_manager.py:218
+#: gajim/history_manager.py:179 gajim/history_manager.py:217
 #: gajim/data/gui/groups_post_window.ui:49
 #: gajim/data/gui/single_message_window.ui:214
 msgid "Subject"
 msgstr "Subject"
 
+#: gajim/history_manager.py:247
+#, fuzzy
+msgid "Database Cleanup"
+msgstr "Database Error"
+
 #: gajim/history_manager.py:248
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
@@ -627,11 +649,8 @@ msgstr ""
 #: gajim/history_manager.py:250
 #, fuzzy
 msgid ""
-"Normally allocated database size will not be freed, it will just become "
-"reusable. If you really want to reduce database filesize, click YES, else "
-"click NO.\n"
-"\n"
-"In case you click YES, please wait…"
+"Normally, the allocated database size will not be freed, it will just become "
+"reusable. This operation may take a while."
 msgstr ""
 "Normally allocated database size will not be freed, it will just become "
 "reusable. If you really want to reduce database filesize, click YES, "
@@ -641,47 +660,47 @@ msgstr ""
 
 #: gajim/history_manager.py:255
 #, fuzzy
-msgid "Database Cleanup"
-msgstr "Database Error"
+msgid "_Cleanup"
+msgstr "Clean _up"
 
-#: gajim/history_manager.py:519 gajim/gtk/filetransfer.py:238
-#: gajim/gtk/filetransfer.py:248
+#: gajim/history_manager.py:518 gajim/gtk/filetransfer.py:237
+#: gajim/gtk/filetransfer.py:247
 msgid "You"
 msgstr "You"
 
-#: gajim/history_manager.py:531
+#: gajim/history_manager.py:530
 #, 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:568 gajim/history_manager.py:607
-#: gajim/gtk/dialogs.py:58 gajim/gtk/themes.py:319
+#: gajim/history_manager.py:567 gajim/history_manager.py:606
+#: gajim/gtk/dialogs.py:57 gajim/gtk/themes.py:319
 #: gajim/gtk/roster_item_exchange.py:75 gajim/gtk/roster_item_exchange.py:185
 msgid "Delete"
 msgstr "Delete"
 
-#: gajim/history_manager.py:569
+#: gajim/history_manager.py:568
 #, fuzzy
 msgid "Delete Conversation"
 msgid_plural "Delete Conversations"
 msgstr[0] "Cancel confirmation"
 msgstr[1] "Cancel confirmation"
 
-#: gajim/history_manager.py:570
+#: gajim/history_manager.py:569
 #, 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:608
+#: gajim/history_manager.py:607
 #, fuzzy
 msgid "Delete Message"
 msgid_plural "Delete Messages"
 msgstr[0] "Default Message"
 msgstr[1] "Default Message"
 
-#: gajim/history_manager.py:609
+#: gajim/history_manager.py:608
 #, fuzzy
 msgid "Do you want to permanently delete this message"
 msgid_plural "Do you want to permanently delete these messages"
@@ -694,15 +713,15 @@ msgid "Contact name: <i>%s</i>"
 msgstr "Contact name: <i>%s</i>"
 
 #: gajim/dialogs.py:84
-#, fuzzy, python-format
-msgid "JID: <i>%s</i>"
-msgstr "Jabber ID: <i>%s</i>"
+#, python-format
+msgid "XMPP Address: <i>%s</i>"
+msgstr ""
 
-#: gajim/dialogs.py:115 gajim/dialogs.py:128 gajim/roster_window.py:2901
-#: gajim/roster_window.py:3833 gajim/roster_window.py:5084
-#: gajim/common/contacts.py:157 gajim/common/contacts.py:190
+#: gajim/dialogs.py:115 gajim/dialogs.py:128 gajim/roster_window.py:2894
+#: gajim/roster_window.py:3784 gajim/roster_window.py:5023
+#: gajim/common/contacts.py:157 gajim/common/contacts.py:206
 #: gajim/data/gui/preferences_window.ui:558
-#: gajim/data/gui/shortcuts_window.ui:177 gajim/gtk/accounts.py:349
+#: gajim/data/gui/shortcuts_window.ui:177 gajim/gtk/accounts.py:352
 msgid "General"
 msgstr "General"
 
@@ -748,7 +767,7 @@ msgid "Preset 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:703
+#: gajim/dialogs.py:703 gajim/plugins/gui.py:292
 msgid "_Overwrite"
 msgstr ""
 
@@ -760,9 +779,7 @@ msgstr "Save as Preset Status Message"
 msgid "Please type a name for this status message"
 msgstr "Please type a name for this status message"
 
-#: gajim/dialogs.py:740 gajim/gui_interface.py:1441 gajim/dialog_messages.py:31
-#: gajim/gtk/discovery.py:518 gajim/gtk/profile.py:323
-#: gajim/gtk/join_groupchat.py:234
+#: gajim/dialogs.py:740 gajim/gtk/discovery.py:517 gajim/gtk/profile.py:323
 msgid "You are not connected to the server"
 msgstr "You are not connected to the server"
 
@@ -770,9 +787,11 @@ msgstr "You are not connected to the server"
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Without a connection, you can not synchronise your contacts."
 
-#: gajim/dialogs.py:752 gajim/dialogs.py:823 gajim/gtk/discovery.py:822
-#: gajim/gtk/discovery.py:1648 gajim/gtk/discovery.py:1941
-#: gajim/gtk/history.py:99 gajim/gtk/roster_item_exchange.py:83
+#: gajim/dialogs.py:752 gajim/dialogs.py:823
+#: gajim/data/gui/groupchat_info_scrolled.ui:16 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/gtk/roster_item_exchange.py:83
 msgid "Name"
 msgstr "Name"
 
@@ -792,396 +811,343 @@ msgstr "You cannot synchronise with an account unless it is connected."
 msgid "Synchronise"
 msgstr "Synchronise"
 
-#: gajim/dialogs.py:1043
+#: gajim/dialogs.py:1042
 msgid "an audio and video"
 msgstr ""
 
-#: gajim/dialogs.py:1045
+#: gajim/dialogs.py:1044
 msgid "an audio"
 msgstr ""
 
-#: gajim/dialogs.py:1047
+#: gajim/dialogs.py:1046
 msgid "a video"
 msgstr ""
 
-#: gajim/dialogs.py:1051
+#: gajim/dialogs.py:1050
 #, python-format
 msgid ""
-"%(contact)s wants to start %(type)s session with you. Do you want to answer "
+"%(contact)s wants to start a %(type)s chat with you. Do you want to answer "
 "the call?"
 msgstr ""
 
-#: gajim/groupchat_control.py:505
+#: gajim/groupchat_control.py:511
 #, fuzzy, python-format
 msgid "Send File (max. %s MiB)…"
 msgstr "Save File as..."
 
-#: gajim/groupchat_control.py:507 gajim/chat_control.py:342
+#: gajim/groupchat_control.py:513 gajim/chat_control.py:344
 #, fuzzy
 msgid "No File Transfer available"
 msgstr "File Transfers"
 
-#: gajim/groupchat_control.py:630 gajim/groupchat_control.py:2349
-msgid "Changing Subject"
-msgstr "Changing Subject"
-
-#: gajim/groupchat_control.py:631 gajim/groupchat_control.py:2350
-msgid "Please specify the new subject:"
-msgstr "Please specify the new subject:"
-
-#: gajim/groupchat_control.py:638
-msgid "Changing Nickname"
-msgstr "Changing Nickname"
-
-#: gajim/groupchat_control.py:639
-msgid "Please specify the new nickname you want to use:"
-msgstr "Please specify the new nickname you want to use:"
-
-#: gajim/groupchat_control.py:657
+#: gajim/groupchat_control.py:655
 #, fuzzy
-msgid "Invalid group chat JID"
+msgid "Invalid group chat XMPP Address"
 msgstr "Invalid group chat Jabber ID"
 
-#: gajim/groupchat_control.py:658
+#: gajim/groupchat_control.py:656
 #, fuzzy
-msgid "The group chat JID has not allowed characters."
+msgid "The group chat XMPP Address has not allowed characters."
 msgstr "The group chat Jabber ID has invalid characters."
 
-#: gajim/groupchat_control.py:758 gajim/gtk/profile.py:136
+#: gajim/groupchat_control.py:743 gajim/gtk/profile.py:136
 msgid "Could not load image"
 msgstr "Could not load image"
 
-#: gajim/groupchat_control.py:888
+#: gajim/groupchat_control.py:873
 msgid "Insert Nickname"
 msgstr "Insert Nickname"
 
-#: gajim/groupchat_control.py:1056 gajim/chat_control.py:824
+#: gajim/groupchat_control.py:1041 gajim/chat_control.py:848
 msgid "and authenticated"
 msgstr "and authenticated"
 
-#: gajim/groupchat_control.py:1060 gajim/chat_control.py:828
+#: gajim/groupchat_control.py:1045 gajim/chat_control.py:852
 msgid "and NOT authenticated"
 msgstr "and NOT authenticated"
 
-#: gajim/groupchat_control.py:1064
+#: gajim/groupchat_control.py:1049
 #, python-format
 msgid "%(type)s encryption is active %(authenticated)s."
 msgstr "%(type)s encryption is active %(authenticated)s."
 
-#: gajim/groupchat_control.py:1111
+#: gajim/groupchat_control.py:1096
 msgid "Conversation with "
 msgstr "Conversation with "
 
-#: gajim/groupchat_control.py:1113
+#: gajim/groupchat_control.py:1098
 msgid "Continued conversation"
 msgstr "Continued conversation"
 
-#: gajim/groupchat_control.py:1411
+#: gajim/groupchat_control.py:1357
 #, 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:1433
+#: gajim/groupchat_control.py:1374
 #, fuzzy
-msgid "Room now shows unavailable members"
+msgid "Group chat now shows unavailable members"
 msgstr "Room now shows unavailable member"
 
-#: gajim/groupchat_control.py:1436
+#: gajim/groupchat_control.py:1377
 #, fuzzy
-msgid "Room now does not show unavailable members"
+msgid "Group chat now does not show unavailable members"
 msgstr "room now does not show unavailable members"
 
-#: gajim/groupchat_control.py:1439
+#: gajim/groupchat_control.py:1380
 msgid "A setting not related to privacy has been changed"
 msgstr ""
 
-#: gajim/groupchat_control.py:1446
-msgid "Room logging is now enabled"
-msgstr "Room logging is now enabled"
+#: gajim/groupchat_control.py:1387 gajim/groupchat_control.py:1659
+#, fuzzy
+msgid "Conversations are stored on the server"
+msgstr "Session WILL NOT be logged"
 
-#: gajim/groupchat_control.py:1449
-msgid "Room logging is now disabled"
-msgstr "Room logging is now disabled"
+#: gajim/groupchat_control.py:1390
+#, fuzzy
+msgid "Conversations are not stored on the server"
+msgstr "Information about you, as stored in the server"
 
-#: gajim/groupchat_control.py:1452
-msgid "Room is now non-anonymous"
+#: gajim/groupchat_control.py:1393
+#, fuzzy
+msgid "Group chat is now non-anonymous"
 msgstr "Room is now non-anonymous"
 
-#: gajim/groupchat_control.py:1456
-msgid "Room is now semi-anonymous"
+#: gajim/groupchat_control.py:1397
+#, fuzzy
+msgid "Group chat is now semi-anonymous"
 msgstr "Room is now semi-anonymous"
 
-#: gajim/groupchat_control.py:1460
+#: gajim/groupchat_control.py:1401
 #, fuzzy
-msgid "Room is now fully anonymous"
+msgid "Group chat is now fully anonymous"
 msgstr "Room is now fully-anonymous"
 
-#: gajim/groupchat_control.py:1500
+#: gajim/groupchat_control.py:1439
 #, fuzzy, python-format
 msgid "Ping? (%s)"
 msgstr "Pong! (%s s.)"
 
-#: gajim/groupchat_control.py:1503
+#: gajim/groupchat_control.py:1442
 #, fuzzy, python-format
 msgid "Pong! (%(nick)s %(delay)s s.)"
 msgstr "Pong! (%s s.)"
 
-#: gajim/groupchat_control.py:1506 gajim/chat_control.py:1213
+#: gajim/groupchat_control.py:1445 gajim/chat_control.py:1237
 msgid "Error."
 msgstr "Error."
 
-#: gajim/groupchat_control.py:1711
+#: gajim/groupchat_control.py:1650
 #, fuzzy, python-format
-msgid "You (%s) joined the room"
+msgid "You (%s) joined the group chat"
 msgstr "%s has joined the group chat"
 
-#: gajim/groupchat_control.py:1717
-msgid "Any occupant is allowed to see your full JID"
+#: gajim/groupchat_control.py:1655
+#, fuzzy
+msgid "Any participant is allowed to see your full XMPP Address"
 msgstr "Any occupant is allowed to see your full JID"
 
-#: gajim/groupchat_control.py:1721
-msgid "Room logging is enabled"
-msgstr "Room logging is enabled"
-
-#: gajim/groupchat_control.py:1725
-msgid "The server has assigned or modified your roomnick"
+#: gajim/groupchat_control.py:1663
+#, fuzzy
+msgid "The server has assigned or modified your nickname in this group chat"
 msgstr "The server has assigned or modified your roomnick"
 
-#: gajim/groupchat_control.py:1732
-msgid "A new room has been created"
+#: gajim/groupchat_control.py:1671
+#, fuzzy
+msgid "A new group chat has been created"
 msgstr "A new room has been created"
 
-#: gajim/groupchat_control.py:1740 gajim/privatechat_control.py:112
+#: gajim/groupchat_control.py:1679 gajim/privatechat_control.py:115
 #, python-format
 msgid "You are now known as %s"
 msgstr "You are now known as %s"
 
-#: gajim/groupchat_control.py:1742 gajim/privatechat_control.py:114
+#: gajim/groupchat_control.py:1681 gajim/privatechat_control.py:117
 #, 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:1767 gajim/privatechat_control.py:141
+#: gajim/groupchat_control.py:1706 gajim/privatechat_control.py:144
 #, fuzzy, python-brace-format
 msgid "You are now {show}{status}"
 msgstr "You are now known as %s"
 
-#: gajim/groupchat_control.py:1773 gajim/privatechat_control.py:147
+#: gajim/groupchat_control.py:1712 gajim/privatechat_control.py:150
 #, fuzzy, python-brace-format
 msgid "{nick} is now {show}{status}"
 msgstr "%(nick)s is now %(status)s"
 
-#: gajim/groupchat_control.py:1790 gajim/groupchat_control.py:1819
-#: gajim/groupchat_control.py:1849 gajim/groupchat_control.py:1909
+#: gajim/groupchat_control.py:1729 gajim/groupchat_control.py:1758
+#: gajim/groupchat_control.py:1788 gajim/groupchat_control.py:1848
 #, python-brace-format
 msgid " by {actor}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1793
+#: gajim/groupchat_control.py:1732
 #, fuzzy, python-brace-format
 msgid "** Your Affiliation has been set to {affiliation}{actor}{reason}"
 msgstr ""
 "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
 
-#: gajim/groupchat_control.py:1799
+#: gajim/groupchat_control.py:1738
 #, fuzzy, python-brace-format
 msgid "** Affiliation of {nick} has been set to {affiliation}{actor}{reason}"
 msgstr "** Affiliation of %(nick)s has been set to %(affiliation)s"
 
-#: gajim/groupchat_control.py:1822
+#: gajim/groupchat_control.py:1761
 #, fuzzy, python-brace-format
 msgid "** Your Role has been set to {role}{actor}{reason}"
 msgstr "** Role of %(nick)s has been set to %(role)s by %(actor)s"
 
-#: gajim/groupchat_control.py:1827
+#: gajim/groupchat_control.py:1766
 #, fuzzy, python-brace-format
 msgid "** Role of {nick} has been set to {role}{actor}{reason}"
 msgstr "** Role of %(nick)s has been set to %(role)s by %(actor)s"
 
-#: gajim/groupchat_control.py:1852
+#: gajim/groupchat_control.py:1791
 #, fuzzy, python-brace-format
-msgid "You have been removed from the room{actor}{reason}"
+msgid "You have been removed from the group chat{actor}{reason}"
 msgstr "%(nick)s has been removed from the room (%(reason)s)"
 
-#: gajim/groupchat_control.py:1857
+#: gajim/groupchat_control.py:1796
 #, python-brace-format
 msgid "You have left due to an error{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1863
+#: gajim/groupchat_control.py:1802
 #, python-brace-format
 msgid "You have been kicked{actor}{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1870
+#: gajim/groupchat_control.py:1809
 #, python-brace-format
 msgid "You have been banned{actor}{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1877 gajim/groupchat_control.py:1943
+#: gajim/groupchat_control.py:1816 gajim/groupchat_control.py:1882
 #, fuzzy
 msgid ": Affiliation changed"
 msgstr "affiliation changed"
 
-#: gajim/groupchat_control.py:1883 gajim/groupchat_control.py:1948
+#: gajim/groupchat_control.py:1822 gajim/groupchat_control.py:1887
 #, fuzzy
-msgid ": Room configuration changed to members-only"
+msgid ": Group chat configuration changed to members-only"
 msgstr "room configuration changed to members-only"
 
-#: gajim/groupchat_control.py:1912
+#: gajim/groupchat_control.py:1851
 #, fuzzy, python-brace-format
-msgid "{nick} has been removed from the room{by}{reason}"
+msgid "{nick} has been removed from the group chat{by}{reason}"
 msgstr "%(nick)s has been removed from the room (%(reason)s)"
 
-#: gajim/groupchat_control.py:1922
+#: gajim/groupchat_control.py:1861
 #, python-brace-format
 msgid "{nick} has left due to an error{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1928
+#: gajim/groupchat_control.py:1867
 #, fuzzy, python-brace-format
 msgid "{nick} has been kicked{actor}{reason}"
 msgstr "%(nick)s has been kicked: %(reason)s"
 
-#: gajim/groupchat_control.py:1936
+#: gajim/groupchat_control.py:1875
 #, fuzzy, python-brace-format
 msgid "{nick} has been banned{actor}{reason}"
 msgstr "%(nick)s has been banned: %(reason)s"
 
-#: gajim/groupchat_control.py:1953
+#: gajim/groupchat_control.py:1892
 #, python-brace-format
 msgid "{nick} has left{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1970
+#: gajim/groupchat_control.py:1914
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s has joined the group chat"
 
-#: gajim/groupchat_control.py:1985 gajim/groupchat_control.py:1990
-#: gajim/groupchat_control.py:1995 gajim/groupchat_control.py:2000
-#: gajim/groupchat_control.py:2011
-msgid "Unable to join group chat"
-msgstr "Unable to join group chat"
-
-#: gajim/groupchat_control.py:1986
-#, fuzzy, python-format
-msgid "You are banned from group chat <b>%s</b>."
-msgstr "You are banned from group chat %s."
-
-#: gajim/groupchat_control.py:1991
-#, fuzzy, python-format
-msgid "Remote server <b>%s</b> does not exist."
-msgstr "Group chat %s does not exist."
-
-#: gajim/groupchat_control.py:1996
-#, fuzzy, python-format
-msgid "Group chat <b>%s</b> does not exist."
-msgstr "Group chat %s does not exist."
-
-#: gajim/groupchat_control.py:2001
-#, fuzzy
-msgid "Group chat creation is not permitted."
-msgstr "Group chat creation is restricted."
-
-#: gajim/groupchat_control.py:2005
+#: gajim/groupchat_control.py:1981
 #, fuzzy
-msgid "Unable to join groupchat"
-msgstr "Unable to join group chat"
-
-#: gajim/groupchat_control.py:2006
-#, fuzzy, python-format
-msgid "You must use your registered nickname in <b>%s</b>."
-msgstr "Your registered nickname must be used in group chat %s."
-
-#: gajim/groupchat_control.py:2012
-#, python-format
-msgid "You are not in the members list in groupchat %s."
-msgstr "You are not in the members list in groupchat %s."
-
-#: gajim/groupchat_control.py:2068
-msgid "Room has been destroyed"
+msgid "Group chat has been destroyed"
 msgstr "Room has been destroyed"
 
-#: gajim/groupchat_control.py:2073
+#: gajim/groupchat_control.py:1986
 #, fuzzy, python-format
-msgid "You can join this room instead: xmpp:%s?join"
+msgid "You can join this group chat instead: xmpp:%s?join"
 msgstr "You can join this room instead: %s"
 
-#: gajim/groupchat_control.py:2306
+#: gajim/groupchat_control.py:2214
 #, fuzzy
 msgid "Leave Group Chat"
 msgstr "Leave Groupchats"
 
-#: gajim/groupchat_control.py:2307
+#: gajim/groupchat_control.py:2215
 #, fuzzy
 msgid "Are you sure you want to leave this group chat?"
 msgstr "Are you sure you want to leave group chat \"%s\"?"
 
-#: gajim/groupchat_control.py:2308
+#: gajim/groupchat_control.py:2216
 #, fuzzy, python-format
-msgid "If you close this window, you will be disconnected from '%s'."
+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:2314
+#: gajim/groupchat_control.py:2222 gajim/roster_window.py:5177
 msgid "_Leave"
 msgstr ""
 
-#: gajim/groupchat_control.py:2377
+#: gajim/groupchat_control.py:2280 gajim/roster_window.py:3008
 #, 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/groupchat_control.py:2527
+#: gajim/groupchat_control.py:2463
 #, python-format
 msgid "Kicking %s"
 msgstr "Kicking %s"
 
-#: gajim/groupchat_control.py:2528 gajim/groupchat_control.py:2829
+#: gajim/groupchat_control.py:2464 gajim/groupchat_control.py:2765
 msgid "You may specify a reason below:"
 msgstr "You may specify a reason below:"
 
-#: gajim/groupchat_control.py:2828
+#: gajim/groupchat_control.py:2764
 #, python-format
 msgid "Banning %s"
 msgstr "Banning %s"
 
-#: gajim/chat_control.py:408
+#: gajim/chat_control.py:432
 msgid "Show a list of formattings"
 msgstr "Show a list of formattings"
 
-#: gajim/chat_control.py:412
+#: gajim/chat_control.py:436
 #, fuzzy
 msgid "This contact does not support HTML"
 msgstr "This contact does not support file transfer."
 
-#: gajim/chat_control.py:562
+#: gajim/chat_control.py:586
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr ""
 
-#: gajim/chat_control.py:686
+#: gajim/chat_control.py:710
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s from group chat %(room_name)s"
 
-#: gajim/chat_control.py:832
+#: gajim/chat_control.py:856
 #, fuzzy, python-format
 msgid "%(type)s encryption is active %(authenticated)s"
 msgstr "%(type)s encryption is active %(authenticated)s."
 
-#: gajim/chat_control.py:1160 gajim/chat_control.py:1168
+#: gajim/chat_control.py:1184 gajim/chat_control.py:1192
 #, fuzzy
 msgid "Close"
 msgstr "_Send & Close"
 
-#: gajim/chat_control.py:1161
+#: gajim/chat_control.py:1185
 #, fuzzy, python-format
 msgid "You just received a new message from %s"
 msgstr "You just received a new message from \"%s\""
 
-#: gajim/chat_control.py:1163
+#: gajim/chat_control.py:1187
 #, fuzzy
 msgid ""
 "If you close this tab while having chat history disabled, this message will "
@@ -1190,16 +1156,16 @@ msgstr ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
 
-#: gajim/chat_control.py:1208
+#: gajim/chat_control.py:1232
 msgid "Ping?"
 msgstr "Ping?"
 
-#: gajim/chat_control.py:1211
+#: gajim/chat_control.py:1235
 #, fuzzy, python-format
 msgid "Pong! (%s seconds)"
 msgstr "Pong! (%s s.)"
 
-#: gajim/chat_control.py:1308
+#: gajim/chat_control.py:1332
 #, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -1208,270 +1174,278 @@ msgstr ""
 "Subject: %(subject)s\n"
 "%(message)s"
 
-#: gajim/chat_control.py:1416
+#: gajim/chat_control.py:1440
 #, fuzzy, python-format
 msgid "%(name)s is now %(show)s %(status)s"
 msgstr "%(name)s is now %(status)s"
 
-#: gajim/chat_control.py:1476 gajim/data/gui/application_menu.ui:32
+#: gajim/chat_control.py:1500 gajim/data/gui/application_menu.ui:32
 #: gajim/gtk/http_upload_progress.py:35
 #, fuzzy
 msgid "File Transfer"
 msgstr "File Transfers"
 
-#: gajim/chat_control.py:1480
+#: gajim/chat_control.py:1504
 msgid "Size"
 msgstr "Size"
 
-#: gajim/chat_control.py:1482 gajim/chat_control.py:1546
+#: gajim/chat_control.py:1506 gajim/chat_control.py:1566
+#: gajim/gui_interface.py:190
 #: gajim/data/gui/groupchat_invitation_received.ui:77
-#: gajim/gtk/filetransfer.py:485
+#: gajim/gtk/filetransfer.py:490
 #, fuzzy
 msgid "_Accept"
 msgstr "Accept"
 
-#: gajim/chat_control.py:1484 gajim/chat_control.py:1548
+#: gajim/chat_control.py:1508 gajim/chat_control.py:1568
 #: gajim/data/gui/groupchat_invitation_received.ui:62
 #, fuzzy
 msgid "_Decline"
 msgstr "_Offline"
 
-#: gajim/chat_control.py:1506 gajim/gui_interface.py:791
-#: gajim/gui_interface.py:821 gajim/gui_interface.py:847
+#: gajim/chat_control.py:1530 gajim/gui_interface.py:777
+#: gajim/gui_interface.py:807 gajim/gui_interface.py:833
 #: gajim/gtk/notification.py:173 gajim/gtk/notification.py:278
 msgid "File Transfer Completed"
 msgstr "File Transfer Completed"
 
-#: gajim/chat_control.py:1510 gajim/gtk/filetransfer.py:259
+#: gajim/chat_control.py:1534 gajim/gtk/filetransfer.py:258
 #, fuzzy
 msgid "Open _Folder"
 msgstr "_Open Containing Folder"
 
-#: gajim/chat_control.py:1512 gajim/chat_control.py:1521
+#: gajim/chat_control.py:1536 gajim/chat_control.py:1545
+#: gajim/data/gui/groupchat_control.ui:962
+#: gajim/data/gui/groupchat_control.ui:1049
+#: gajim/data/gui/groupchat_control.ui:1155
 #, fuzzy
 msgid "_Close"
 msgstr "_Send & Close"
 
-#: gajim/chat_control.py:1543 gajim/gui_interface.py:484
+#: gajim/chat_control.py:1563 gajim/gui_interface.py:473
+#: gajim/data/gui/groupchat_invitation_received.ui:42
 #: gajim/gtk/notification.py:174 gajim/gtk/notification.py:195
 #: gajim/gtk/notification.py:281
-msgid "Groupchat Invitation"
+#, fuzzy
+msgid "Group Chat Invitation"
 msgstr "Groupchat Invitation"
 
-#: gajim/chat_control.py:1568 gajim/roster_window.py:1954
+#: gajim/chat_control.py:1588 gajim/roster_window.py:1951
 msgid "Remote contact stopped transfer"
 msgstr "Remote contact stopped transfer"
 
-#: gajim/chat_control.py:1570 gajim/roster_window.py:1956
+#: gajim/chat_control.py:1590 gajim/roster_window.py:1953
 msgid "Error opening file"
 msgstr "Error opening file"
 
-#: gajim/chat_control.py:1572 gajim/gtk/filetransfer.py:297
+#: gajim/chat_control.py:1592 gajim/gtk/filetransfer.py:296
 msgid "File transfer stopped"
 msgstr "File transfer stopped"
 
-#: gajim/chat_control.py:1575 gajim/gtk/filetransfer.py:275
-#: gajim/gtk/filetransfer.py:284
+#: gajim/chat_control.py:1595 gajim/gtk/filetransfer.py:274
+#: gajim/gtk/filetransfer.py:283
 msgid "File transfer cancelled"
 msgstr "File transfer cancelled"
 
-#: gajim/chat_control.py:1576
+#: gajim/chat_control.py:1596
 msgid "Connection with peer cannot be established."
 msgstr "Connection with peer cannot be established."
 
-#: gajim/application.py:72
+#: gajim/application.py:75
 #, fuzzy
 msgid "Show the application's version"
 msgstr "Use t_rayicon (aka. notification area icon)"
 
-#: gajim/application.py:79
+#: gajim/application.py:82
 #, fuzzy
 msgid "Show only critical errors"
 msgstr "Show only in _roster"
 
-#: gajim/application.py:86
+#: gajim/application.py:89
 msgid "Separate profile files completely (even history database and plugins)"
 msgstr ""
 
-#: gajim/application.py:94
+#: gajim/application.py:97
 msgid "Print XML stanzas and other debug information"
 msgstr ""
 
-#: gajim/application.py:101
+#: gajim/application.py:104
 #, fuzzy
 msgid "Use defined profile in configuration directory"
 msgstr "Advanced Configuration Editor"
 
-#: gajim/application.py:109
+#: gajim/application.py:112
 #, fuzzy
 msgid "Set configuration directory"
 msgstr "Room Configuration"
 
-#: gajim/application.py:117
+#: gajim/application.py:120
 msgid "Configure logging system"
 msgstr ""
 
-#: gajim/application.py:125
+#: gajim/application.py:128
 #, fuzzy
 msgid "Show all warnings"
 msgstr "Show All Pending _Events"
 
-#: gajim/application.py:132
+#: gajim/application.py:135
 msgid "Open IPython shell"
 msgstr ""
 
-#: gajim/application.py:139
+#: gajim/application.py:142
 msgid "Pops up a window with the next pending event"
 msgstr "Pops up a window with the next pending event"
 
-#: gajim/application.py:145 gajim/data/gui/shortcuts_window.ui:203
+#: gajim/application.py:148 gajim/data/gui/shortcuts_window.ui:203
 #: data/org.gajim.Gajim.desktop.in:21
 #, fuzzy
 msgid "Start a new chat"
 msgstr "Start Chat"
 
-#: gajim/application.py:152
+#: gajim/application.py:155
 msgid "Simulate loss of connectivity"
 msgstr ""
 
-#: gajim/application.py:159
+#: gajim/application.py:162
 msgid "Simulate regaining connectivity"
 msgstr ""
 
-#: gajim/application.py:201 gajim/gui_interface.py:133
+#: gajim/application.py:204 gajim/gui_interface.py:133
 msgid "Database Error"
 msgstr "Database Error"
 
-#: gajim/roster_window.py:294 gajim/roster_window.py:1030
+#: gajim/roster_window.py:291 gajim/roster_window.py:1027
 msgid "Merged accounts"
 msgstr "Merged accounts"
 
-#: gajim/roster_window.py:853 gajim/roster_window.py:1631
-#: gajim/roster_window.py:1664 gajim/roster_window.py:1715
-#: gajim/roster_window.py:1717 gajim/roster_window.py:1872
-#: gajim/roster_window.py:2531 gajim/roster_window.py:5025
-#: gajim/common/contacts.py:188 gajim/common/contacts.py:447
-#: gajim/common/helpers.py:83 gajim/gtk/discovery.py:129
-#: gajim/gtk/discovery.py:130 gajim/gtk/discovery.py:1416
+#: gajim/roster_window.py:850 gajim/roster_window.py:1628
+#: gajim/roster_window.py:1661 gajim/roster_window.py:1712
+#: gajim/roster_window.py:1714 gajim/roster_window.py:1869
+#: gajim/roster_window.py:2528 gajim/roster_window.py:4331
+#: gajim/roster_window.py:4964 gajim/common/contacts.py:204
+#: gajim/common/contacts.py:463 gajim/common/helpers.py:86
+#: gajim/gtk/discovery.py:127 gajim/gtk/discovery.py:128
+#: gajim/gtk/discovery.py:1414
 msgid "Transports"
 msgstr "Transports"
 
-#: gajim/roster_window.py:1723 gajim/roster_window.py:1725
-#: gajim/roster_window.py:4995 gajim/gui_interface.py:1613
-#: gajim/gui_interface.py:1639 gajim/common/contacts.py:186
-#: gajim/common/helpers.py:83 gajim/common/modules/adhoc_commands.py:245
-msgid "Groupchats"
+#: gajim/roster_window.py:1720 gajim/roster_window.py:1722
+#: gajim/roster_window.py:4331 gajim/roster_window.py:4934
+#: gajim/gui_interface.py:1527 gajim/common/contacts.py:202
+#: gajim/common/helpers.py:86 gajim/common/modules/adhoc_commands.py:245
+#, fuzzy
+msgid "Group chats"
 msgstr "Groupchats"
 
-#: gajim/roster_window.py:2012
+#: gajim/roster_window.py:2009
 #, fuzzy
 msgid "Authorization sent"
 msgstr "Authorisation has been sent"
 
-#: gajim/roster_window.py:2013
+#: gajim/roster_window.py:2010
 #, fuzzy, python-format
 msgid "\"%s\" will now see your status."
 msgstr "Now \"%s\" will know your status."
 
-#: gajim/roster_window.py:2031
+#: gajim/roster_window.py:2028
 msgid "Subscription request has been sent"
 msgstr "Subscription request has been sent"
 
-#: gajim/roster_window.py:2032
-#, python-format
-msgid "If \"%s\" accepts this request you will know his or her status."
+#: gajim/roster_window.py:2029
+#, 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:2046
+#: gajim/roster_window.py:2043
 #, fuzzy
 msgid "Authorization removed"
 msgstr "Authorisation has been removed"
 
-#: gajim/roster_window.py:2047
+#: gajim/roster_window.py:2044
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Now \"%s\" will always see you as offline."
 
-#: gajim/roster_window.py:2250 gajim/roster_window.py:3504
+#: gajim/roster_window.py:2247 gajim/roster_window.py:3460
 msgid "Disconnect for Invisibility"
 msgstr ""
 
-#: gajim/roster_window.py:2251 gajim/roster_window.py:3505
+#: gajim/roster_window.py:2248 gajim/roster_window.py:3461
 msgid "You are participating in one or more group chats"
 msgstr "You are participating in one or more group chats"
 
-#: gajim/roster_window.py:2252 gajim/roster_window.py:3506
+#: gajim/roster_window.py:2249 gajim/roster_window.py:3462
 #, fuzzy
 msgid ""
-"Changing your status to invisible will result in disconnection from those "
-"group chats.\n"
+"Changing your status to invisible will result in you leaving those group "
+"chats.\n"
 "Are you sure you want to go invisible?"
 msgstr ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
 
-#: gajim/roster_window.py:2257 gajim/roster_window.py:3512
-#: gajim/roster_window.py:5238 gajim/data/gui/gc_control_popup_menu.ui:120
+#: gajim/roster_window.py:2254 gajim/roster_window.py:3468
+#: gajim/data/gui/gc_control_popup_menu.ui:120
 msgid "_Disconnect"
 msgstr "_Disconnect"
 
-#: gajim/roster_window.py:2285
+#: gajim/roster_window.py:2282
 #, fuzzy
 msgid "desynced"
 msgstr "desync'ed"
 
-#: gajim/roster_window.py:2353 gajim/data/gui/shortcuts_window.ui:224
+#: gajim/roster_window.py:2350 gajim/data/gui/shortcuts_window.ui:224
 #, fuzzy
 msgid "Quit Gajim"
 msgstr "Gajim"
 
-#: gajim/roster_window.py:2354
+#: gajim/roster_window.py:2351
 #, fuzzy
 msgid "You are about to quit Gajim"
 msgstr "Are you sure you want to quit Gajim?"
 
-#: gajim/roster_window.py:2355
+#: gajim/roster_window.py:2352
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Are you sure you want to quit Gajim?"
 
-#: gajim/roster_window.py:2356
+#: gajim/roster_window.py:2353
 #, fuzzy
 msgid "_Always quit when closing Gajim"
 msgstr "Always close Gajim"
 
-#: gajim/roster_window.py:2359 gajim/roster_window.py:2455
-#: gajim/roster_window.py:2495 gajim/data/gui/systray_context_menu.ui:90
+#: gajim/roster_window.py:2356 gajim/roster_window.py:2452
+#: gajim/roster_window.py:2492 gajim/data/gui/systray_context_menu.ui:83
 #, fuzzy
 msgid "_Quit"
 msgstr "_Quit"
 
-#: gajim/roster_window.py:2448
+#: gajim/roster_window.py:2445
 #, fuzzy
 msgid "Stop File Transfers"
 msgstr "File Transfers"
 
-#: gajim/roster_window.py:2449
+#: gajim/roster_window.py:2446
 #, fuzzy
 msgid "You still have running file transfers"
 msgstr "Cancel file transfer"
 
-#: gajim/roster_window.py:2450
+#: gajim/roster_window.py:2447
 msgid ""
 "If you quit now, the file(s) being transferred will be lost.\n"
 "Do you still want to quit?"
 msgstr ""
 
-#: gajim/roster_window.py:2488
+#: gajim/roster_window.py:2485
 #, fuzzy
 msgid "Unread Messages"
 msgstr "Unread events"
 
-#: gajim/roster_window.py:2489
+#: gajim/roster_window.py:2486
 #, fuzzy
 msgid "You still have unread messages"
 msgstr "You have unread messages"
 
-#: gajim/roster_window.py:2490
+#: gajim/roster_window.py:2487
 #, fuzzy
 msgid ""
 "Messages will only be available for reading them later if storing chat "
@@ -1480,20 +1454,20 @@ msgstr ""
 "Messages will only be available for reading them later if you have history "
 "enabled and contact is in your roster."
 
-#: gajim/roster_window.py:2760
+#: gajim/roster_window.py:2753
 msgid "You have unread messages"
 msgstr "You have unread messages"
 
-#: gajim/roster_window.py:2761
+#: gajim/roster_window.py:2754
 msgid "You must read them before removing this transport."
 msgstr "You must read them before removing this transport."
 
-#: gajim/roster_window.py:2764
+#: gajim/roster_window.py:2757
 #, fuzzy, python-format
 msgid "Transport '%s' will be removed"
 msgstr "Transport \"%s\" will be removed"
 
-#: gajim/roster_window.py:2765
+#: gajim/roster_window.py:2758
 #, fuzzy
 msgid ""
 "You will no longer be able to send and receive messages from and to contacts "
@@ -1502,11 +1476,11 @@ msgstr ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
 
-#: gajim/roster_window.py:2768
+#: gajim/roster_window.py:2761
 msgid "Transports will be removed"
 msgstr "Transports will be removed"
 
-#: gajim/roster_window.py:2773
+#: gajim/roster_window.py:2766
 #, fuzzy, python-format
 msgid ""
 "You will no longer be able to send and receive messages from and to contacts "
@@ -1516,22 +1490,22 @@ msgstr ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
 
-#: gajim/roster_window.py:2777
+#: gajim/roster_window.py:2770
 #, fuzzy
 msgid "Remove Transport"
 msgstr "Show Trans_ports"
 
-#: gajim/roster_window.py:2844
+#: gajim/roster_window.py:2837
 #, fuzzy
 msgid "Block Contact"
 msgstr "Blocked Contacts"
 
-#: gajim/roster_window.py:2845
+#: gajim/roster_window.py:2838
 #, fuzzy
 msgid "Really block this contact?"
 msgstr "Is OpenPGP enabled for this contact?"
 
-#: gajim/roster_window.py:2846
+#: gajim/roster_window.py:2839
 #, fuzzy
 msgid ""
 "This contact will see you offline and you will not receive any messages sent "
@@ -1540,64 +1514,59 @@ msgstr ""
 "This contact will see you offline and you will not receive messages he will "
 "send you."
 
-#: gajim/roster_window.py:2851
+#: gajim/roster_window.py:2844
 #, fuzzy
 msgid "_Block Contact"
 msgstr "Blocked Contacts"
 
-#: gajim/roster_window.py:2896
+#: gajim/roster_window.py:2889
 msgid "Rename Contact"
 msgstr "Rename Contact"
 
-#: gajim/roster_window.py:2897
+#: gajim/roster_window.py:2890
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Enter a new nickname for contact %s"
 
-#: gajim/roster_window.py:2904
+#: gajim/roster_window.py:2897
 msgid "Rename Group"
 msgstr "Rename Group"
 
-#: gajim/roster_window.py:2905
+#: gajim/roster_window.py:2898
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Enter a new name for group %s"
 
-#: gajim/roster_window.py:2953 gajim/roster_window.py:2954
+#: gajim/roster_window.py:2946 gajim/roster_window.py:2947
 msgid "Remove Group"
 msgstr "Remove Group"
 
-#: gajim/roster_window.py:2955
+#: gajim/roster_window.py:2948
 #, fuzzy, python-format
 msgid "Do you want to remove %s from the contact list?"
 msgstr "Do you want to remove group %s from the roster?"
 
-#: gajim/roster_window.py:2956
+#: gajim/roster_window.py:2949
 #, fuzzy
 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:3044
-#, fuzzy, python-format
-msgid "%(jid)s has been invited in this room"
-msgstr "%(nick)s has been removed from the room (%(reason)s)"
-
-#: gajim/roster_window.py:3353
+#: gajim/roster_window.py:3309
 #, fuzzy
 msgid "Remove Contact"
 msgstr "Rename Contact"
 
-#: gajim/roster_window.py:3354
+#: gajim/roster_window.py:3310
 #, fuzzy
 msgid "Remove contact from contact list"
 msgstr "Removes contact from roster"
 
-#: gajim/roster_window.py:3355
+#: gajim/roster_window.py:3311
 #, 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:3364 gajim/roster_window.py:3384
+#: gajim/roster_window.py:3320 gajim/roster_window.py:3340
 #, fuzzy
 msgid ""
 "By removing this contact you also remove authorization. This means the "
@@ -1606,21 +1575,21 @@ msgstr ""
 "By removing these contacts:%s\n"
 "you also remove authorisation resulting in them always seeing you as offline."
 
-#: gajim/roster_window.py:3375
+#: gajim/roster_window.py:3331
 msgid "Do you want to continue?"
 msgstr "Do you want to continue?"
 
-#: gajim/roster_window.py:3386
+#: gajim/roster_window.py:3342
 #, 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:3393
+#: gajim/roster_window.py:3349
 #, fuzzy
 msgid "Remove contacts from contact list"
 msgstr "Removes contact from roster"
 
-#: gajim/roster_window.py:3399
+#: gajim/roster_window.py:3355
 #, fuzzy, python-format
 msgid ""
 "By removing the following contacts, you will also remove authorization. This "
@@ -1631,24 +1600,24 @@ msgstr ""
 "By removing these contacts:%s\n"
 "you also remove authorisation resulting in them always seeing you as offline."
 
-#: gajim/roster_window.py:3403
+#: gajim/roster_window.py:3359
 #, fuzzy
 msgid "Remove Contacts"
 msgstr "Rename Contact"
 
-#: gajim/roster_window.py:3423
+#: gajim/roster_window.py:3379
 msgid "No account available"
 msgstr "No account available"
 
-#: gajim/roster_window.py:3424
+#: gajim/roster_window.py:3380
 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:4060
+#: gajim/roster_window.py:4011
 msgid "Metacontacts storage not supported by your server"
 msgstr "Metacontacts storage not supported by your server"
 
-#: gajim/roster_window.py:4062
+#: gajim/roster_window.py:4013
 #, fuzzy
 msgid ""
 "Your server does not support storing metacontacts information. So this "
@@ -1657,13 +1626,13 @@ msgstr ""
 "Your server does not support storing metacontacts information. So those "
 "information will not be saved on next reconnection."
 
-#: gajim/roster_window.py:4159
+#: gajim/roster_window.py:4110
 #, 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:4160
+#: gajim/roster_window.py:4111
 #, fuzzy
 msgid ""
 "Metacontacts are a way to regroup several contacts in one single contact. "
@@ -1674,124 +1643,115 @@ msgstr ""
 "is used when the same person has several Jabber accounts or transport "
 "accounts."
 
-#: gajim/roster_window.py:4164
+#: gajim/roster_window.py:4115
 #, fuzzy
 msgid "Create Metacontact"
 msgstr "Rename Contact"
 
-#: gajim/roster_window.py:4170
+#: gajim/roster_window.py:4121 gajim/data/gui/groupchat_creation.ui:317
 #, fuzzy
 msgid "_Create"
 msgstr "Creative"
 
-#: gajim/roster_window.py:4287
+#: gajim/roster_window.py:4238
 msgid "Invalid file URI:"
 msgstr "Invalid file URI:"
 
-#: gajim/roster_window.py:4298
+#: gajim/roster_window.py:4249
 #, fuzzy
 msgid "Send file?"
 msgstr "Send _File"
 
-#: gajim/roster_window.py:4299
+#: gajim/roster_window.py:4250
 #, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
 msgstr[0] "Do you want to send this file to %s:"
 msgstr[1] "Do you want to send these files to %s:"
 
-#: gajim/roster_window.py:4451
+#: gajim/roster_window.py:4401
 #, fuzzy, python-format
 msgid "Send %(from)s to %(to)s"
 msgstr "Send %s to %s"
 
-#: gajim/roster_window.py:4464
+#: gajim/roster_window.py:4414
 #, fuzzy, python-format
 msgid "Make %s first contact"
 msgstr "Make %s and %s metacontacts"
 
-#: gajim/roster_window.py:4469
+#: gajim/roster_window.py:4419
 #, fuzzy, python-format
 msgid "Make %(contact1)s and %(contact2)s metacontacts"
 msgstr "Make %s and %s metacontacts"
 
-#: gajim/roster_window.py:4825 gajim/roster_window.py:4923
+#: gajim/roster_window.py:4775 gajim/roster_window.py:4862
 msgid "_Change Status Message"
 msgstr "_Change Status Message"
 
-#: gajim/roster_window.py:4845
+#: gajim/roster_window.py:4795
 msgid "Publish Tune"
 msgstr "Publish Tune"
 
-#: gajim/roster_window.py:4856
+#: gajim/roster_window.py:4806
 #, fuzzy
 msgid "Publish Location"
 msgstr "Publish Tune"
 
-#: gajim/roster_window.py:4868
-#, fuzzy
-msgid "Configure Services…"
-msgstr "Configure Services..."
-
-#: gajim/roster_window.py:4997
+#: gajim/roster_window.py:4936
 msgid "_Maximize All"
 msgstr "_Maximise All"
 
-#: gajim/roster_window.py:5004 gajim/roster_window.py:5146
+#: gajim/roster_window.py:4943 gajim/roster_window.py:5085
 msgid "Send Group M_essage"
 msgstr "Send Group M_essage"
 
-#: gajim/roster_window.py:5011
+#: gajim/roster_window.py:4950
 msgid "To all users"
 msgstr "To all users"
 
-#: gajim/roster_window.py:5015
+#: gajim/roster_window.py:4954
 msgid "To all online users"
 msgstr "To all online users"
 
-#: gajim/roster_window.py:5027 gajim/roster_window.py:5152
+#: gajim/roster_window.py:4966 gajim/roster_window.py:5091
 #: gajim/data/gui/gc_occupants_menu.ui:110
 #: gajim/data/gui/contact_context_menu.ui:36
 msgid "In_vite to"
 msgstr "In_vite to"
 
-#: gajim/roster_window.py:5162
+#: gajim/roster_window.py:5101
 msgid "_Manage Contacts"
 msgstr "_Manage Contacts"
 
-#: gajim/roster_window.py:5168
+#: gajim/roster_window.py:5107
 #, fuzzy
 msgid "Edit _Groups…"
 msgstr "Edit _Groups"
 
-#: gajim/roster_window.py:5189 gajim/data/gui/filetransfers.ui:12
+#: gajim/roster_window.py:5128 gajim/data/gui/filetransfers.ui:12
 #: gajim/data/gui/remove_account_window.ui:134
 msgid "_Remove"
 msgstr "_Remove"
 
-#: gajim/roster_window.py:5226
+#: gajim/roster_window.py:5165
 msgid "_Maximize"
 msgstr "_Maximise"
 
-#: gajim/roster_window.py:5233
+#: gajim/roster_window.py:5172
 msgid "_Reconnect"
 msgstr "_Reconnect"
 
-#: gajim/roster_window.py:5254 gajim/data/gui/gc_occupants_menu.ui:170
+#: gajim/roster_window.py:5193 gajim/data/gui/gc_occupants_menu.ui:170
 #: gajim/data/gui/gc_control_popup_menu.ui:113
 #: gajim/data/gui/contact_context_menu.ui:205
 msgid "_History"
 msgstr "_History"
 
-#: gajim/roster_window.py:5335 gajim/data/gui/application_menu.ui:86
+#: gajim/roster_window.py:5274 gajim/data/gui/application_menu.ui:83
 #: gajim/data/gui/history_window.ui:57
 msgid "History Manager"
 msgstr "History Manager"
 
-#: gajim/roster_window.py:5343
-msgid "_Join New Group Chat"
-msgstr "_Join New Group Chat"
-
 #: gajim/dataforms_widget.py:585
 #, fuzzy
 msgid "Unable to load image"
@@ -1914,225 +1874,242 @@ msgstr "Subject: %s\n"
 msgid "Write a message…"
 msgstr "New Private Message"
 
-#: gajim/message_window.py:250
+#: gajim/message_window.py:356
+#, fuzzy
+msgid "Close Tabs"
+msgstr "_Send & Close"
+
+#: gajim/message_window.py:357
 msgid "You are going to close several tabs"
 msgstr "You are going to close several tabs"
 
-#: gajim/message_window.py:251
+#: gajim/message_window.py:358
 msgid "Do you really want to close them all?"
 msgstr "Do you really want to close them all?"
 
-#: gajim/message_window.py:539
+#: gajim/message_window.py:514
 #, fuzzy
 msgid "?Noun:Chats"
 msgstr "Group Chats"
 
-#: gajim/message_window.py:543
+#: gajim/message_window.py:518
 #, fuzzy
 msgid "Group Chats"
 msgstr "_Group Chat"
 
-#: gajim/message_window.py:547
+#: gajim/message_window.py:522
 msgid "Private Chats"
 msgstr "Private Chats"
 
-#: gajim/message_window.py:553
+#: gajim/message_window.py:528
 msgid "Messages"
 msgstr "Messages"
 
-#: gajim/gui_interface.py:173
+#: gajim/gui_interface.py:170
+#, 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:175
 msgid "Do you accept this request?"
 msgstr "Do you accept this request?"
 
-#: gajim/gui_interface.py:175
-#, python-format
-msgid "Do you accept this request on account %s?"
+#: gajim/gui_interface.py:177
+#, fuzzy, python-format
+msgid "Do you accept this request (account: %s)?"
 msgstr "Do you accept this request on account %s?"
 
-#: gajim/gui_interface.py:178
-#, 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:182
+#, fuzzy
+msgid "Authorization"
+msgstr "Authorisation has been sent"
 
-#: gajim/gui_interface.py:194 gajim/gtk/notification.py:175
+#: gajim/gui_interface.py:186 gajim/gui_interface.py:420
+#: gajim/gtk/filetransfer.py:338
+#, fuzzy
+msgid "_No"
+msgstr "None"
+
+#: gajim/gui_interface.py:205 gajim/gtk/notification.py:175
 #: gajim/gtk/notification.py:197
 msgid "Connection Failed"
 msgstr "Connection Failed"
 
-#: gajim/gui_interface.py:279 gajim/gui_interface.py:529
-msgid "Password Required"
-msgstr "Password Required"
-
-#: gajim/gui_interface.py:280
-#, python-format
-msgid "A Password is required to join the room %s. Please type it."
-msgstr "A Password is required to join the room %s. Please type it."
-
-#: gajim/gui_interface.py:342 gajim/gui_interface.py:346
+#: gajim/gui_interface.py:325 gajim/gui_interface.py:329
 #, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr "Error %(code)s: %(msg)s"
 
-#: gajim/gui_interface.py:357 gajim/gui_interface.py:376
+#: gajim/gui_interface.py:340 gajim/gui_interface.py:359
 #: gajim/common/modules/message.py:122
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "error while sending %(message)s ( %(error)s )"
 
-#: gajim/gui_interface.py:401 gajim/gtk/notification.py:175
+#: gajim/gui_interface.py:384 gajim/gtk/notification.py:175
 msgid "Subscription request"
 msgstr "Subscription request"
 
-#: gajim/gui_interface.py:413 gajim/common/contacts.py:184
-#: gajim/common/helpers.py:83
+#: gajim/gui_interface.py:396 gajim/common/contacts.py:200
+#: gajim/common/helpers.py:86
 msgid "Observers"
 msgstr "Observers"
 
-#: gajim/gui_interface.py:422
+#: gajim/gui_interface.py:405
 msgid "Authorization accepted"
 msgstr "Authorisation accepted"
 
-#: gajim/gui_interface.py:423
+#: gajim/gui_interface.py:406
 #, 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:431
-#, python-format
-msgid "Contact \"%s\" removed subscription from you"
+#: gajim/gui_interface.py:415
+#, fuzzy
+msgid "Subscription Removed"
+msgstr "Subscription Request"
+
+#: gajim/gui_interface.py:416
+#, fuzzy, python-format
+msgid "Contact '%s' removed subscription from you"
 msgstr "Contact \"%s\" removed subscription from you"
 
-#: gajim/gui_interface.py:432
+#: gajim/gui_interface.py:417
 #, fuzzy
 msgid ""
-"You will always see them as offline.\n"
+"You will always see this contact as offline.\n"
 "Do you want to remove them from your contact list?"
 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:453 gajim/gtk/notification.py:176
+#: gajim/gui_interface.py:442 gajim/gtk/notification.py:176
 msgid "Unsubscribed"
 msgstr "Unsubscribed"
 
-#: gajim/gui_interface.py:465
+#: gajim/gui_interface.py:454
 #, python-format
 msgid "%(jid)s declined the invitation: %(reason)s"
 msgstr ""
 
-#: gajim/gui_interface.py:469
+#: gajim/gui_interface.py:458
 #, python-format
 msgid "%(jid)s declined the invitation"
 msgstr ""
 
-#: gajim/gui_interface.py:485
+#: gajim/gui_interface.py:474
 #, fuzzy, python-brace-format
 msgid "You are invited to {room} by {user}"
 msgstr "You are invited to a groupchat"
 
-#: gajim/gui_interface.py:506
+#: gajim/gui_interface.py:495
 #, fuzzy
 msgid "Certificate Passphrase Required"
 msgstr "Certificate has expired"
 
-#: gajim/gui_interface.py:507
+#: gajim/gui_interface.py:496
 #, 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:516 gajim/gtk/accounts.py:963
+#: gajim/gui_interface.py:505 gajim/gtk/accounts.py:966
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Enter your password for account %s"
 
-#: gajim/gui_interface.py:529 gajim/gtk/accounts.py:964
+#: gajim/gui_interface.py:518
+msgid "Password Required"
+msgstr "Password Required"
+
+#: gajim/gui_interface.py:518 gajim/gtk/accounts.py:967
 msgid "Save password"
 msgstr "Save password"
 
-#: gajim/gui_interface.py:601 gajim/gui_interface.py:632
+#: gajim/gui_interface.py:587 gajim/gui_interface.py:618
+#: gajim/gtk/filetransfer.py:332 gajim/gtk/filetransfer.py:333
 #: gajim/gtk/notification.py:173 gajim/gtk/notification.py:276
 msgid "File Transfer Error"
 msgstr "File Transfer Error"
 
-#: gajim/gui_interface.py:666
+#: gajim/gui_interface.py:652
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s wants to send you a file."
 
-#: gajim/gui_interface.py:668 gajim/gtk/filetransfer.py:479
+#: gajim/gui_interface.py:654 gajim/gtk/filetransfer.py:484
 #: gajim/gtk/notification.py:172 gajim/gtk/notification.py:274
 msgid "File Transfer Request"
 msgstr "File Transfer Request"
 
-#: gajim/gui_interface.py:767
+#: gajim/gui_interface.py:753
 #, fuzzy
 msgid "Remote Contact Stopped Transfer"
 msgstr "Remote contact stopped transfer"
 
-#: gajim/gui_interface.py:772
+#: gajim/gui_interface.py:758
 #, fuzzy
 msgid "Error Opening File"
 msgstr "Error opening file"
 
-#: gajim/gui_interface.py:782
+#: gajim/gui_interface.py:768
 #, fuzzy
 msgid "SSL Certificate Error"
 msgstr "SSL certificate error"
 
-#: gajim/gui_interface.py:795 gajim/gui_interface.py:826
-#: gajim/gui_interface.py:853 gajim/gtk/notification.py:174
+#: gajim/gui_interface.py:781 gajim/gui_interface.py:812
+#: gajim/gui_interface.py:839 gajim/gtk/notification.py:174
 #: gajim/gtk/notification.py:279
 msgid "File Transfer Stopped"
 msgstr "File Transfer Stopped"
 
-#: gajim/gui_interface.py:799
+#: gajim/gui_interface.py:785
 #, fuzzy
 msgid "File Transfer Failed"
 msgstr "File Transfers"
 
-#: gajim/gui_interface.py:822
+#: gajim/gui_interface.py:808
 #, fuzzy, python-format
 msgid "%(filename)s received from %(name)s."
 msgstr "File transfer of %(filename)s from %(name)s stopped."
 
-#: gajim/gui_interface.py:827
+#: gajim/gui_interface.py:813
 #, 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:833
+#: gajim/gui_interface.py:819
 #, 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:848
+#: gajim/gui_interface.py:834
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "You successfully sent %(filename)s to %(name)s."
 
-#: gajim/gui_interface.py:854
+#: gajim/gui_interface.py:840
 #, 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:860
+#: gajim/gui_interface.py:846
 #, 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:971
+#: gajim/gui_interface.py:957
 msgid "Username Conflict"
 msgstr "Username Conflict"
 
-#: gajim/gui_interface.py:972
+#: gajim/gui_interface.py:958
 msgid "Please type a new username for your local account"
 msgstr "Please type a new username for your local account"
 
-#: gajim/gui_interface.py:995
+#: gajim/gui_interface.py:981
 msgid "Resource Conflict"
 msgstr "Resource Conflict"
 
-#: gajim/gui_interface.py:996
+#: gajim/gui_interface.py:982
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
@@ -2140,31 +2117,31 @@ msgstr ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
 
-#: gajim/gui_interface.py:1053
+#: gajim/gui_interface.py:1039
 #, fuzzy, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s wants to send you a file."
 
-#: gajim/gui_interface.py:1055
+#: gajim/gui_interface.py:1041
 #, fuzzy
 msgid "Voice Chat Request"
 msgstr "File Transfer Request"
 
-#: gajim/gui_interface.py:1123 gajim/gtk/account_wizard.py:312
+#: gajim/gui_interface.py:1109 gajim/gtk/account_wizard.py:312
 msgid "Certificate Already in File"
 msgstr "Certificate Already in File"
 
-#: gajim/gui_interface.py:1124 gajim/gtk/account_wizard.py:313
+#: gajim/gui_interface.py:1110 gajim/gtk/account_wizard.py:313
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr "This certificate is already in file %s, so it's not added again."
 
-#: gajim/gui_interface.py:1145
+#: gajim/gui_interface.py:1131
 #, fuzzy, python-format
 msgid "The authenticity of the %s certificate could be invalid"
 msgstr "The authenticity of the %s certificate could be invalid."
 
-#: gajim/gui_interface.py:1148
+#: gajim/gui_interface.py:1134
 #, python-format
 msgid ""
 "\n"
@@ -2173,7 +2150,7 @@ msgstr ""
 "\n"
 "Unknown SSL error: %d"
 
-#: gajim/gui_interface.py:1150
+#: gajim/gui_interface.py:1136
 #, python-format
 msgid ""
 "\n"
@@ -2182,11 +2159,11 @@ msgstr ""
 "\n"
 "SSL Error: <b>%s</b>"
 
-#: gajim/gui_interface.py:1155
+#: gajim/gui_interface.py:1141
 msgid "Error verifying SSL certificate"
 msgstr "Error verifying SSL certificate"
 
-#: gajim/gui_interface.py:1156
+#: gajim/gui_interface.py:1142
 #, fuzzy, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your XMPP server: "
@@ -2197,7 +2174,7 @@ msgstr ""
 "%(error)s\n"
 "Do you still want to connect to this server?"
 
-#: gajim/gui_interface.py:1160 gajim/gtk/account_wizard.py:412
+#: gajim/gui_interface.py:1146 gajim/gtk/account_wizard.py:413
 #, fuzzy, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -2210,203 +2187,196 @@ msgstr ""
 "SHA1 fingerprint of the certificate:\n"
 "%s"
 
-#: gajim/gui_interface.py:1166
+#: gajim/gui_interface.py:1152
 msgid "Ignore this error for this certificate."
 msgstr "Ignore this error for this certificate."
 
-#: gajim/gui_interface.py:1174
+#: gajim/gui_interface.py:1160
 #, fuzzy, python-format
 msgid "SSL Certificate Verification for %s"
 msgstr "SSL certificate error"
 
-#: gajim/gui_interface.py:1442 gajim/gtk/join_groupchat.py:235
-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/gui_interface.py:1448
-#, fuzzy
-msgid "JID is not a Groupchat"
-msgstr "This is not a group chat"
-
-#: gajim/gui_interface.py:1579
-msgid "This is not a group chat"
-msgstr "This is not a group chat"
-
-#: gajim/gui_interface.py:1580
-#, python-format
-msgid ""
-"%(room_jid)s is already in your roster. Please check if %(room_jid)s is a "
-"correct group chat name. If it is, delete it from your roster and try "
-"joining the group chat again."
-msgstr ""
-
-#: gajim/gui_interface.py:1604 gajim/dialog_messages.py:58
+#: gajim/gui_interface.py:1577
 msgid "You cannot join a group chat while you are invisible"
 msgstr "You cannot join a group chat while you are invisible"
 
-#: gajim/gui_interface.py:2037
+#: gajim/gui_interface.py:1976
 msgid "Could not save your settings and preferences"
 msgstr "Could not save your settings and preferences"
 
-#: gajim/gui_interface.py:2098
+#: gajim/gui_interface.py:2037
 msgid "Gajim: IPython Console"
 msgstr ""
 
-#: gajim/dialog_messages.py:32
+#: gajim/dialog_messages.py:31 gajim/dialog_messages.py:36
+#: gajim/gtk/single_message.py:305 gajim/gtk/account_wizard.py:229
 #, fuzzy
-msgid "You can not start a new conversation unless you are connected."
-msgstr "You can not join a group chat unless you are connected."
-
-#: gajim/dialog_messages.py:36 gajim/dialog_messages.py:41
-#: gajim/gtk/single_message.py:305 gajim/gtk/join_groupchat.py:211
-#: gajim/gtk/account_wizard.py:229
-msgid "Invalid JID"
-msgstr "Invalid JID"
+msgid "Invalid XMPP Address"
+msgstr "Invalid File"
 
-#: gajim/dialog_messages.py:42 gajim/gtk/single_message.py:306
-#, python-format
-msgid "It is not possible to send a message to %s, this JID is not valid."
+#: gajim/dialog_messages.py:37
+#, 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/dialog_messages.py:47
-msgid "Unread events"
+#: gajim/dialog_messages.py:42
+#, fuzzy
+msgid "Unread Events"
 msgstr "Unread events"
 
-#: gajim/dialog_messages.py:48
-msgid "Read all pending events before removing this account."
+#: gajim/dialog_messages.py:43
+#, fuzzy
+msgid "Read or acknowledge all pending events before removing this account."
 msgstr "Read all pending events before removing this account."
 
-#: gajim/dialog_messages.py:52
+#: gajim/dialog_messages.py:48
 #, fuzzy
 msgid "Invalid Form"
 msgstr "Invalid room"
 
-#: gajim/dialog_messages.py:53
+#: gajim/dialog_messages.py:49
 #, fuzzy
 msgid "The form is not filled correctly."
 msgstr "The nickname has not allowed characters."
 
-#: gajim/dialog_messages.py:57 gajim/common/helpers.py:309
+#: gajim/dialog_messages.py:53 gajim/common/helpers.py:315
 msgid "Invisible"
 msgstr "Invisible"
 
-#: gajim/dialog_messages.py:62
-msgid "A connection is not available"
-msgstr "A connection is not available"
+#: gajim/dialog_messages.py:54
+#, fuzzy
+msgid "You cannot join a group chat while being invisible."
+msgstr "You cannot join a group chat while you are invisible"
 
-#: gajim/dialog_messages.py:63
+#: gajim/dialog_messages.py:58
+#, fuzzy
+msgid "No Connection Available"
+msgstr "Connection not available"
+
+#: gajim/dialog_messages.py:59
 msgid "Your message can not be sent until you are connected."
 msgstr "Your message can not be sent until you are connected."
 
-#: gajim/dialog_messages.py:67
-#, fuzzy
-msgid "JID already in list"
-msgstr "Jabber ID already in list"
+#: gajim/dialog_messages.py:63
+msgid "XMPP Address Already in List"
+msgstr ""
 
-#: gajim/dialog_messages.py:68
+#: gajim/dialog_messages.py:64
 #, fuzzy
-msgid "The JID you entered is already in the list. Choose another one."
+msgid ""
+"The XMPP Address you entered is already in the list. Please choose another "
+"one."
 msgstr "The Jabber ID you entered is already in the list. Choose another one."
 
-#: gajim/dialog_messages.py:72
-msgid "Invalid answer"
+#: gajim/dialog_messages.py:69
+#, fuzzy
+msgid "Invalid Answer"
 msgstr "Invalid answer"
 
-#: gajim/dialog_messages.py:73
+#: gajim/dialog_messages.py:70
 #, python-format
 msgid "Transport %(name)s answered wrongly to register request: %(error)s"
 msgstr "Transport %(name)s answered wrongly to register request: %(error)s"
 
-#: gajim/dialog_messages.py:78
+#: gajim/dialog_messages.py:75
 #, fuzzy
 msgid "Wrong Custom Hostname"
 msgstr "Use custom hostname/port"
 
-#: gajim/dialog_messages.py:79
+#: gajim/dialog_messages.py:76
 #, fuzzy, python-format
-msgid "Wrong custom hostname \"%s\". Ignoring it."
+msgid "Custom hostname \"%s\" is wrong. It will be ignored."
 msgstr "Use custom hostname/port"
 
-#: gajim/dialog_messages.py:83
-msgid "Error while removing privacy list"
+#: gajim/dialog_messages.py:80
+#, fuzzy
+msgid "Error While Removing Privacy List"
 msgstr "Error while removing privacy list"
 
-#: gajim/dialog_messages.py:84
-#, python-format
+#: gajim/dialog_messages.py:81
+#, fuzzy, python-format
 msgid ""
-"Privacy list %s has not been removed. It is maybe active in one of your "
-"connected resources. Deactivate it and try again."
+"Privacy list %s has not been removed. It is probably active in one of your "
+"connected resources. Please deactivate it and try again."
 msgstr ""
 "Privacy list %s has not been removed. It is maybe active in one of your "
 "connected resources. Deactivate it and try again."
 
-#: gajim/dialog_messages.py:90
-msgid "Invisibility not supported"
+#: gajim/dialog_messages.py:87
+#, fuzzy
+msgid "Invisibility Not Supported"
 msgstr "Invisibility not supported"
 
-#: gajim/dialog_messages.py:91
-#, python-format
-msgid "Account %s doesn't support invisibility."
+#: gajim/dialog_messages.py:88
+#, fuzzy, python-format
+msgid "This account %s doesn't support invisibility."
 msgstr "Account %s doesn't support invisibility."
 
-#: gajim/dialog_messages.py:95
-msgid "Unregister failed"
+#: gajim/dialog_messages.py:92
+#, fuzzy
+msgid "Unregister Failed"
 msgstr "Unregister failed"
 
-#: gajim/dialog_messages.py:96
-#, python-format
-msgid "Unregistration with server %(server)s failed: %(error)s"
+#: gajim/dialog_messages.py:93
+#, fuzzy, python-format
+msgid "Unregistration on server %(server)s failed: %(error)s"
 msgstr "Unregistration with server %(server)s failed: %(error)s"
 
-#: gajim/dialog_messages.py:100
-msgid "Registration succeeded"
+#: gajim/dialog_messages.py:97
+#, fuzzy
+msgid "Registration Succeeded"
 msgstr "Registration succeeded"
 
-#: gajim/dialog_messages.py:101
-#, python-format
-msgid "Registration with agent %s succeeded"
+#: gajim/dialog_messages.py:98
+#, fuzzy, python-format
+msgid "Registration with agent %s succeeded."
 msgstr "Registration with agent %s succeeded"
 
-#: gajim/dialog_messages.py:105 gajim/gtk/service_registration.py:215
-msgid "Registration failed"
+#: gajim/dialog_messages.py:102
+#, fuzzy
+msgid "Registration Failed"
 msgstr "Registration failed"
 
-#: gajim/dialog_messages.py:106
+#: gajim/dialog_messages.py:103
 #, python-format
 msgid ""
 "Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
 msgstr ""
 "Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
 
-#: gajim/dialog_messages.py:111
+#: gajim/dialog_messages.py:108
 #, fuzzy
 msgid "Unable to Join Group Chat"
 msgstr "Unable to join group chat"
 
-#: gajim/dialog_messages.py:116
-msgid "GStreamer error"
-msgstr ""
+#: gajim/dialog_messages.py:113
+#, fuzzy
+msgid "GStreamer Error"
+msgstr "Database Error"
 
-#: gajim/dialog_messages.py:117
+#: gajim/dialog_messages.py:114
 #, fuzzy, python-format
 msgid ""
 "Error: %(error)s\n"
 "Debug: %(debug)s"
 msgstr "Error message: %s"
 
-#: gajim/dialog_messages.py:121
-msgid "Wrong host"
+#: gajim/dialog_messages.py:118
+#, fuzzy
+msgid "Wrong Host"
 msgstr "Wrong host"
 
-#: gajim/dialog_messages.py:122
+#: gajim/dialog_messages.py:119
 msgid "Invalid local address? :-O"
 msgstr "Invalid local address? :-O"
 
-#: gajim/dialog_messages.py:126
-msgid "Avahi error"
+#: gajim/dialog_messages.py:123
+#, fuzzy
+msgid "Avahi Error"
 msgstr "Avahi error"
 
-#: gajim/dialog_messages.py:127
+#: gajim/dialog_messages.py:124
 #, python-format
 msgid ""
 "%s\n"
@@ -2415,67 +2385,67 @@ msgstr ""
 "%s\n"
 "Link-local messaging might not work properly."
 
-#: gajim/dialog_messages.py:131 gajim/dialog_messages.py:136
+#: gajim/dialog_messages.py:128 gajim/dialog_messages.py:133
 #, fuzzy
-msgid "Could not request upload slot"
+msgid "Could not request upload slot for HTTP File Upload"
 msgstr "Could not start local service"
 
-#: gajim/dialog_messages.py:137
-msgid "Got unexpected response from server (see log)"
+#: gajim/dialog_messages.py:134
+msgid "Got unexpected response from server (see log)."
 msgstr ""
 
-#: gajim/dialog_messages.py:141 gajim/dialog_messages.py:146
+#: gajim/dialog_messages.py:138 gajim/dialog_messages.py:143
 #, fuzzy
-msgid "Could not open file"
+msgid "Could not Open File"
 msgstr "Could not load image"
 
-#: gajim/dialog_messages.py:142
-msgid "Exception raised while opening file (see log)"
+#: gajim/dialog_messages.py:139
+msgid "Exception raised while trying to open file (see log)."
 msgstr ""
 
-#: gajim/dialog_messages.py:151
-msgid "Unsecure"
-msgstr ""
+#: gajim/dialog_messages.py:148
+#, fuzzy
+msgid "Not Secure"
+msgstr "Not started"
 
-#: gajim/dialog_messages.py:152
+#: gajim/dialog_messages.py:149
 #, fuzzy
-msgid "Server returned unsecure transport (HTTP)"
+msgid "The server returned an insecure transport (HTTP)."
 msgstr "Service returned an error."
 
-#: gajim/dialog_messages.py:156
+#: gajim/dialog_messages.py:153
 #, fuzzy
-msgid "Could not upload file"
+msgid "Could not Upload File"
 msgstr "Could not load image"
 
-#: gajim/dialog_messages.py:157
+#: gajim/dialog_messages.py:154
 #, python-format
 msgid "HTTP response code from server: %s"
 msgstr ""
 
-#: gajim/dialog_messages.py:161
+#: gajim/dialog_messages.py:158
 msgid "Upload Error"
 msgstr ""
 
-#: gajim/dialog_messages.py:166
+#: gajim/dialog_messages.py:163
 #, fuzzy
 msgid "Encryption Error"
 msgstr "E2E encryption enabled"
 
-#: gajim/dialog_messages.py:167
-#, fuzzy
-msgid "For the chosen encryption there is no encryption method available"
-msgstr "A connection is not available"
+#: gajim/dialog_messages.py:164
+msgid "There is no encryption method available for the chosen encryption."
+msgstr ""
 
-#: gajim/dialog_messages.py:171
+#: gajim/dialog_messages.py:169
 #, fuzzy
-msgid "Avatar upload failed"
+msgid "Avatar Upload Failed"
 msgstr "vCard publication failed"
 
-#: gajim/privatechat_control.py:204
+#: gajim/privatechat_control.py:207
 msgid "Sending private message failed"
 msgstr "Sending private message failed"
 
-#: gajim/privatechat_control.py:206
+#: gajim/privatechat_control.py:209
 #, 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."
@@ -2498,7 +2468,7 @@ msgstr "show help on command"
 
 #: gajim/gajim_remote.py:85
 #, fuzzy
-msgid "Lists all contacts in roster, one for each line"
+msgid "Lists all contacts in the contact list, one for each line"
 msgstr ""
 "Prints a list of all contacts in the roster. Each contact appears on a "
 "separate line"
@@ -2579,11 +2549,13 @@ msgstr ""
 
 #: gajim/gajim_remote.py:118
 #, fuzzy
-msgid "Sends new chat message to a contact in the roster. Account is optional."
+msgid ""
+"Sends new chat message to a contact in the contact list. Account is optional."
 msgstr "Send a message to the contact"
 
 #: gajim/gajim_remote.py:120 gajim/gajim_remote.py:130
-msgid "JID of the contact that will receive the message"
+#, fuzzy
+msgid "XMPP Address of the contact that will receive the message"
 msgstr "JID of the contact that will receive the message"
 
 #: gajim/gajim_remote.py:121 gajim/gajim_remote.py:132
@@ -2597,8 +2569,10 @@ msgid "if specified, the message will be sent using this account"
 msgstr "if specified, the message will be sent using this account"
 
 #: gajim/gajim_remote.py:127
-msgid "Sends a chat message to someone on your roster. Account is optional."
-msgstr ""
+#, fuzzy
+msgid ""
+"Sends a chat message to someone on your contact list. Account is optional."
+msgstr "Send a message to the contact"
 
 #: gajim/gajim_remote.py:131
 msgid "subject"
@@ -2609,11 +2583,13 @@ msgid "message subject"
 msgstr "message subject"
 
 #: gajim/gajim_remote.py:138
-msgid "Sends new message to a groupchat you've joined."
+#, fuzzy
+msgid "Sends new message to a group chat you've joined."
 msgstr "Sends new message to a groupchat you've joined."
 
 #: gajim/gajim_remote.py:140
-msgid "JID of the room that will receive the message"
+#, fuzzy
+msgid "XMPP Address of the group chat that will receive the message"
 msgstr "JID of the room that will receive the message"
 
 #: gajim/gajim_remote.py:147
@@ -2622,7 +2598,8 @@ msgstr "Gets detailed info on a contact"
 
 #: gajim/gajim_remote.py:149 gajim/gajim_remote.py:162
 #: gajim/gajim_remote.py:192
-msgid "JID of the contact"
+#, fuzzy
+msgid "XMPP Address of the contact"
 msgstr "JID of the contact"
 
 #: gajim/gajim_remote.py:153
@@ -2683,7 +2660,8 @@ msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Writes the current state of Gajim preferences to the .config file"
 
 #: gajim/gajim_remote.py:190
-msgid "Removes contact from roster"
+#, fuzzy
+msgid "Removes contact from contact list"
 msgstr "Removes contact from roster"
 
 #: gajim/gajim_remote.py:193
@@ -2730,9 +2708,9 @@ msgid "Missing argument \"contact_jid\""
 msgstr "Missing argument \"contact_jid\""
 
 #: gajim/gajim_remote.py:275
-#, python-format
+#, fuzzy, python-format
 msgid ""
-"'%s' is not in your roster.\n"
+"'%s' is not in your contact list.\n"
 "Please specify account for sending the message."
 msgstr ""
 "'%s' is not in your roster.\n"
@@ -2955,12 +2933,12 @@ msgstr "End of week"
 msgid "Weekend!"
 msgstr "Weekend!"
 
-#: gajim/common/logger.py:192 gajim/common/logger.py:197
+#: gajim/common/logger.py:189 gajim/common/logger.py:194
 #, 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:217
+#: gajim/common/logger.py:214
 #, fuzzy, python-format
 msgid "Creating %s"
 msgstr "Destroying %s"
@@ -3034,22 +3012,21 @@ msgstr "%(nickname)s Signed Out"
 msgid "Contact Signed Out"
 msgstr "Contact Signed Out"
 
-#: gajim/common/contacts.py:455
-msgid "Not in roster"
-msgstr "Not in roster"
-
 #: gajim/common/config.py:80
+#, fuzzy
 msgid ""
 "Show desktop notification even when a chat window is opened for this contact "
-"and does not have focus"
-msgstr ""
+"and does not have focus."
+msgstr "Allow pop-up/notifications when I'm _away/na/busy/invisible"
 
 #: gajim/common/config.py:81
-msgid "Play sound when user is busy"
+#, fuzzy
+msgid "Play sound even when being busy."
 msgstr "Play sound when user is busy"
 
 #: gajim/common/config.py:83
-msgid "Show only online and free for chat contacts in roster."
+#, fuzzy
+msgid "Show only online and free for chat contacts in the contact list."
 msgstr "Show only online and free for chat contacts in roster."
 
 #: gajim/common/config.py:86
@@ -3057,12 +3034,15 @@ msgid "Time in minutes, after which your status changes to away."
 msgstr "Time in minutes, after which your status changes to away."
 
 #: gajim/common/config.py:87
-msgid "$S (Away as a result of being idle more than $T min)"
+#, fuzzy
+msgid "$S (Away: Idle more than $T min)"
 msgstr "$S (Away as a result of being idle more than $T min)"
 
 #: gajim/common/config.py:87
 #, fuzzy
-msgid "$S will be replaced by current status message, $T by autoawaytime."
+msgid ""
+"$S will be replaced by current status message, $T by the 'autoawaytime' "
+"value."
 msgstr "$S will be replaced by current status message, $T by autoaway time."
 
 #: gajim/common/config.py:89
@@ -3070,71 +3050,75 @@ msgid "Time in minutes, after which your status changes to not available."
 msgstr "Time in minutes, after which your status changes to not available."
 
 #: gajim/common/config.py:90
-msgid "$S (Not available as a result of being idle more than $T min)"
+#, fuzzy
+msgid "$S (Not available: Idle more than $T min)"
 msgstr "$S (Not available as a result of being idle more than $T min)"
 
 #: gajim/common/config.py:90
 #, fuzzy
-msgid "$S will be replaced by current status message, $T by autoxatime."
+msgid ""
+"$S will be replaced by current status message, $T by the 'autoxatime' value."
 msgstr "$S will be replaced by current status message, $T by autoxa time."
 
 #: gajim/common/config.py:93
 #, fuzzy
 msgid ""
-"When to show notification area icon. Can be 'never', 'on_event', 'always'."
+"When to show the notification area icon. Can be 'never', 'on_event', and "
+"'always'."
 msgstr "When to show systray icon. Can be 'never', 'on_event', 'always'."
 
 #: gajim/common/config.py:94
-msgid "Allow to hide the roster window even if the tray icon is not shown."
+msgid ""
+"Allow to hide the contact list window even if the notification area icon is "
+"not shown."
 msgstr ""
 
 #: gajim/common/config.py:97
 #, fuzzy
-msgid "Contact signed in notification color."
-msgstr "_Show event in roster"
+msgid "Notification color for contacts signing in."
+msgstr "Notify me about contacts that sign _in"
 
 #: gajim/common/config.py:98
 #, fuzzy
-msgid "Contact signout notification color"
-msgstr "_Show event in roster"
+msgid "Notification color for contacts signing out."
+msgstr "Notify me about contacts that sign _out"
 
 #: gajim/common/config.py:99
 #, fuzzy
-msgid "New message notification color."
+msgid "Notification color for new message notification."
 msgstr "Preview new messages in notification popup?"
 
 #: gajim/common/config.py:100
 #, fuzzy
-msgid "File transfer request notification color."
-msgstr "File Transfer Request"
+msgid "Notification color for file transfer request."
+msgstr "_Notify me when a file transfer is complete"
 
 #: gajim/common/config.py:101
 #, fuzzy
-msgid "File transfer error notification color."
-msgstr "File transfer cancelled"
+msgid "Notification color for file transfer errors."
+msgstr "_Notify me when a file transfer is complete"
 
 #: gajim/common/config.py:102
-#, fuzzy
-msgid "File transfer complete or stopped notification color."
-msgstr "Show a pop-up notification when a file transfer is complete "
+msgid "Notification color for stopped or completed file transfers."
+msgstr ""
 
 #: gajim/common/config.py:103
-#, fuzzy
-msgid "Groupchat invitation notification color"
-msgstr "Groupchat Invitation"
+msgid "Notification color for group chat invitations."
+msgstr ""
 
 #: gajim/common/config.py:104
 #, fuzzy
-msgid "Background color of status changed notification"
+msgid "Notification background color for changed status."
 msgstr "Background colour of contacts when they just signed in."
 
 #: gajim/common/config.py:105
-msgid "Other dialogs color."
+msgid "Notification color for other dialogs."
 msgstr ""
 
 #: gajim/common/config.py:106
+#, fuzzy
 msgid ""
-"List (space separated) of rows (accounts and groups) that are collapsed."
+"List of rows (accounts and groups) that are collapsed (space separated)."
 msgstr ""
 "List (space separated) of rows (accounts and groups) that are collapsed."
 
@@ -3142,8 +3126,10 @@ msgstr ""
 msgid "default"
 msgstr "default"
 
-#: gajim/common/config.py:113
-msgid "Language used by speller"
+#: gajim/common/config.py:113 gajim/common/config.py:424
+#: gajim/common/config.py:431
+#, fuzzy
+msgid "Language used for spell checking."
 msgstr "Language used by speller"
 
 #: gajim/common/config.py:114
@@ -3157,10 +3143,11 @@ msgstr ""
 "'never' - never print time."
 
 #: gajim/common/config.py:115
+#, fuzzy
 msgid ""
 "Print time in chats using Fuzzy Clock. Value of fuzziness from 1 to 4, or 0 "
-"to disable fuzzyclock. 1 is the most precise clock, 4 the least precise one. "
-"This is used only if print_time is 'sometimes'."
+"to disable Fuzzy Clock. 1 is the most precise clock, 4 the least precise "
+"one. This is used only if 'print_time' is 'sometimes'."
 msgstr ""
 "Print time in chats using Fuzzy Clock. Value of fuzziness from 1 to 4, or 0 "
 "to disable fuzzyclock. 1 is the most precise clock, 4 the least precise one. "
@@ -3177,312 +3164,319 @@ msgstr "Treat * / _ pairs as possible formatting characters."
 #: gajim/common/config.py:120
 #, fuzzy
 msgid ""
-"If true, do not remove */_ . So *abc* will be bold but with * * not removed."
+"If enabled, do not remove */_ . So *abc* will be bold but with * * not "
+"removed."
 msgstr ""
 "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
 
 #: gajim/common/config.py:123
+#, fuzzy
 msgid ""
-"Uses ReStructured text markup to send HTML, plus ascii formatting if "
-"selected. For syntax, see http://docutils.sourceforge.net/docs/ref/rst/"
-"restructuredtext.html (If you want to use this, install docutils)"
+"Uses ReStructured text markup to send HTML, plus ASCII formatting if "
+"selected. Needs docutils installed (for syntax, see http://docutils."
+"sourceforge.net/docs/ref/rst/restructuredtext.html)."
 msgstr ""
 "Uses ReStructured text markup to send HTML, plus ascii formatting if "
 "selected. For syntax, see http://docutils.sourceforge.net/docs/ref/rst/"
 "restructuredtext.html (If you want to use this, install docutils)"
 
 #: gajim/common/config.py:132
+#, fuzzy
 msgid ""
-"Character to add after nickname when using nick completion (tab) in group "
-"chat."
+"Character to add after nickname when using nickname completion (tab) in "
+"group chat."
 msgstr ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
 
 #: gajim/common/config.py:133
+#, fuzzy
 msgid ""
-"Character to propose to add after desired nickname when desired nickname is "
-"used by someone else in group chat."
+"Character to propose to add after desired nickname when nickname is already "
+"used in group chat."
 msgstr ""
 "Character to propose to add after desired nickname when desired nickname is "
 "used by someone else in group chat."
 
 #: gajim/common/config.py:155
 msgid ""
-"If true, Gajim will save roster position when hiding roster, and restore it "
-"when showing roster."
+"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:161
-msgid "Place the roster on the right in single window mode"
+msgid "Place the contact list on the right in single window mode"
 msgstr ""
 
 #: gajim/common/config.py:167
 #, fuzzy
 msgid ""
-"This option let you customize timestamp that is printed in conversation. For "
-"example \"[%H:%M] \" will show \"[hour:minute] \". See python doc on "
-"strftime for full documentation: http://docs.python.org/lib/module-time.html"
+"This option lets you customize the timestamp that is printed in "
+"conversation. For example '[%H:%M] ' will show '[hour:minute] '. See python "
+"doc on strftime for full documentation (https://docs.python.org/3/library/"
+"time.html)."
 msgstr ""
 "This option let you customize timestamp that is printed in conversation. For "
 "exemple \"[%H:%M] \" will show \"[hour:minute] \". See python doc on "
 "strftime for full documentation: http://docs.python.org/lib/module-time.html"
 
 #: gajim/common/config.py:168
-msgid "Characters that are printed before the nickname in conversations"
+#, 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:169
-msgid "Characters that are printed after the nickname in conversations"
+#, 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:170
-msgid "Add * and [n] in roster title?"
-msgstr "Add * and [n] in roster title?"
+#, 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:171
 #, fuzzy
 msgid ""
-"How many history messages should be restored when a chat tab/window is "
-"reopened?"
+"Number of messages from chat history to be restored when a chat tab/window "
+"is reopened."
 msgstr ""
 "How many lines to remember from previous conversation when a chat tab/window "
 "is reopened."
 
 #: gajim/common/config.py:172
-msgid "How far back in time (minutes) history is restored. -1 means no limit."
+msgid ""
+"How far back in time (minutes) chat history is restored. -1 means no limit."
 msgstr ""
 
 #: gajim/common/config.py:173
 #, fuzzy
 msgid ""
-"How many lines to request from server when entering a groupchat. -1 means no "
-"limit"
-msgstr "How many lines to request to server when entering a groupchat."
-
-#: gajim/common/config.py:174
-#, fuzzy
-msgid ""
-"Minutes of backlog to request when entering a groupchat. -1 means no limit"
-msgstr "How many minutes back to request logs when a entering a groupchat."
-
-#: gajim/common/config.py:175
-msgid ""
-"How many seconds to wait before trying to autorejoin to a conference you are "
-"being disconnected from. Set to 0 to disable autorejoining."
+"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 ""
 "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:176
-msgid "Should autorejoin be activated when kicked from a conference?"
+#: gajim/common/config.py:174
+msgid ""
+"Should automatic rejoin be activated when you were kicked from a group chat?"
 msgstr ""
 
-#: gajim/common/config.py:177
-msgid ""
-"Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
-"Client default behaviour)."
+#: gajim/common/config.py:175
+#, 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:179
-msgid "How many lines to store for Ctrl+KeyUP."
+#: gajim/common/config.py:177
+#, 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:182
+#: gajim/common/config.py:180
 #, fuzzy, python-format
 msgid ""
-"Either custom URL with %%s in it where %%s is the word/phrase or "
-"'WIKTIONARY' which means use Wikitionary."
+"Either a custom URL with %%s in it (where %%s is the word/phrase) or "
+"'WIKTIONARY' (which means use Wikitionary)."
 msgstr ""
 "Either custom URL with %s in it where %s is the word/phrase or 'WIKTIONARY' "
 "which means use wiktionary."
 
-#: gajim/common/config.py:185
+#: gajim/common/config.py:183
 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:187
+#: gajim/common/config.py:185
+#, fuzzy
 msgid ""
-"When not printing time for every message (print_time==sometimes), print it "
+"When not printing time for every message ('print_time'==sometimes), print it "
 "every x minutes."
 msgstr ""
 "When not printing time for every message (print_time==sometimes), print it "
 "every x minutes."
 
-#: gajim/common/config.py:188
+#: gajim/common/config.py:186
 msgid "Ask before pasting an image."
 msgstr ""
 
-#: gajim/common/config.py:189
+#: gajim/common/config.py:187
 msgid "Ask before closing a group chat tab/window."
 msgstr "Ask before closing a group chat tab/window."
 
-#: gajim/common/config.py:190
+#: gajim/common/config.py:188
 #, fuzzy
 msgid ""
-"Always ask for confirmation before closing groupchats with any of the JIDs "
-"on this space separated list."
+"Always ask for confirmation before closing group chats with any of the XMPP "
+"Addresses on this list (space separated)."
 msgstr ""
 "Always ask before closing group chat tab/window in this space separated list "
 "of group chat jids."
 
-#: gajim/common/config.py:191
+#: gajim/common/config.py:189
 #, fuzzy
 msgid ""
-"Never ask for confirmation before closing groupchats with any of the JIDs on "
-"this space separated list."
+"Never ask for confirmation before closing group chats with any of the XMPP "
+"Addresses on this list (space separated)."
 msgstr ""
 "Never ask before closing group chat tab/window in this space separated list "
 "of group chat jids."
 
-#: gajim/common/config.py:192
+#: gajim/common/config.py:190
 #, fuzzy
 msgid ""
-"Ask before closing tabbed chat window if there are controls that can lose "
-"data (chat, private chat, groupchat that will not be minimized)"
+"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 ""
 "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:195
+#: gajim/common/config.py:193
 #, fuzzy
 msgid ""
-"Comma separated list of sent hosts, in addition of local interfaces, for "
-"File Transfer in case of address translation/port forwarding."
+"List of send hosts (comma separated) in addition to local interfaces for "
+"file transfers (in case of address translation/port forwarding)."
 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:196
+#: gajim/common/config.py:194
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 
-#: gajim/common/config.py:198
+#: gajim/common/config.py:196
 #, fuzzy
 msgid "Notify of events in the notification area."
 msgstr "Notify of events in the system trayicon."
 
-#: gajim/common/config.py:199
+#: gajim/common/config.py:197
 msgid ""
-"If False, Gajim will display a static event icon instead of the blinking "
-"status icon in the notification area when notifying on event."
+"If disabled, Gajim will display a static event icon instead of the blinking "
+"status icon in the notification area when notifying about an event."
 msgstr ""
 
-#: gajim/common/config.py:205
+#: gajim/common/config.py:203
 msgid "Show tab when only one conversation?"
 msgstr "Show tab when only one conversation?"
 
-#: gajim/common/config.py:206
+#: gajim/common/config.py:204
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "Show tabbed notebook border in chat windows?"
 
-#: gajim/common/config.py:207
+#: gajim/common/config.py:205
 msgid "Show close button in tab?"
 msgstr "Show close button in tab?"
 
-#: gajim/common/config.py:220
+#: gajim/common/config.py:218
 msgid "Preview new messages in notification popup?"
 msgstr "Preview new messages in notification popup?"
 
-#: gajim/common/config.py:223
+#: gajim/common/config.py:221
+#, fuzzy
 msgid ""
-"A semicolon-separated list of words that will be highlighted in group chats."
+"A list of words (semicolon separated) that will be highlighted in group "
+"chats."
 msgstr ""
 "A semicolon-separated list of words that will be highlighted in group chats."
 
-#: gajim/common/config.py:224
+#: gajim/common/config.py:222
 #, fuzzy
 msgid ""
-"If true, quits Gajim when X button of Window Manager is clicked. This "
-"setting is taken into account only if notification icon is used."
+"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 ""
 "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:225
+#: gajim/common/config.py:223
 msgid ""
-"If true, Gajim hides the Roster window on pressing the X button instead of "
-"minimizing into the Dock."
+"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:226
+#: gajim/common/config.py:224
 #, fuzzy
 msgid ""
-"If true, Gajim will display an icon on each tab containing unread messages. "
-"Depending on the theme, this icon may be animated."
+"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:227
+#: gajim/common/config.py:225
 #, fuzzy
 msgid ""
-"If true, Gajim will display the status message, if not empty, for every "
-"contact under the contact name in roster window."
+"If enabled, Gajim will display the status message (if not empty) underneath "
+"the contact name in the contact list window."
 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:233
-msgid "Define the position of the avatar in roster. Can be left or right"
+#: gajim/common/config.py:231
+#, 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:234
+#: gajim/common/config.py:232
 #, fuzzy
 msgid ""
-"If False, Gajim will no longer print status line in chats when a contact "
-"changes their status and/or their status message."
+"If disabled, Gajim will no longer print status messages in chats when a "
+"contact changes their status (and/or their status message)."
 msgstr ""
 "If False, Gajim will no longer print status line in chats when a contact "
 "changes his or her status and/or status message."
 
-#: gajim/common/config.py:235
+#: gajim/common/config.py:233
 #, fuzzy
 msgid ""
 "Default Setting: Show a status message for every join or leave in a group "
-"chat"
+"chat."
 msgstr "Unable to join group chat"
 
-#: gajim/common/config.py:236
+#: gajim/common/config.py:234
+#, fuzzy
 msgid ""
-"Default Setting: Show a status message for all status (away, dnd, etc.) "
-"changes of users in a group chat"
-msgstr ""
+"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:238
-msgid "Log XHTML messages instead of plain text messages."
+#: gajim/common/config.py:236
+msgid "Store XHTML messages in chat history instead of plain text messages."
 msgstr ""
 
-#: gajim/common/config.py:239
+#: gajim/common/config.py:237
 msgid "Don't show avatar for the transport itself."
 msgstr "Don't show avatar for the transport itself."
 
-#: gajim/common/config.py:240
-msgid "Don't show roster in the system taskbar."
+#: gajim/common/config.py:238
+#, 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:241
+#: gajim/common/config.py:239
 #, fuzzy
 msgid ""
-"If true, make the window flash (the default behaviour in most Window "
-"Managers) when holding pending events."
+"If enabled, Gajim makes the window flash (the default behaviour in most "
+"Window Managers) when holding pending events."
 msgstr ""
 "If True and installed GTK+ and PyGTK versions are at least 2.8, make the "
 "window flash (the default behaviour in most Window Managers) when holding "
 "pending events."
 
-#: gajim/common/config.py:245
+#: gajim/common/config.py:243
 #, fuzzy
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
 "'always_with_roster' - Like 'always' but the messages are in a single window "
-"along with the roster.\n"
+"along with the contact list.\n"
 "'never' - All messages get their own window.\n"
 "'peracct' - Messages for each account are sent to a specific window.\n"
-"'pertype' - Each message type (e.g. chats vs. groupchats) is sent to a "
+"'pertype' - Each message type (e.g. chats vs. group chats) is sent to a "
 "specific window."
 msgstr ""
 "Controls the window where new messages are placed.\n"
@@ -3494,120 +3488,129 @@ msgstr ""
 "'pertype' - Each message type (e.g., chats vs. groupchats) are sent to a "
 "specific window."
 
-#: gajim/common/config.py:246
+#: gajim/common/config.py:244
 msgid ""
-"Show roster on startup.\n"
-"'always' - Always show roster.\n"
-"'never' - Never show roster.\n"
-"'last_state' - Restore the last state roster."
+"Show contact list window on startup.\n"
+"'always' - Always show contact list window.\n"
+"'never' - Never show contact list window.\n"
+"'last_state' - Restore last state of the contact list window."
 msgstr ""
 
-#: gajim/common/config.py:247
-msgid "If False, you will no longer see the avatar in the chat window."
+#: gajim/common/config.py:245
+#, 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:248
+#: gajim/common/config.py:246
 #, fuzzy
-msgid "If true, pressing the escape key closes a tab/window."
+msgid "If enabled, pressing Esc closes a tab/window."
 msgstr "If True, pressing the escape key closes a tab/window."
 
-#: gajim/common/config.py:249
-msgid "Hides the banner in a group chat window"
+#: gajim/common/config.py:247
+#, fuzzy
+msgid "Hides the banner in a group chat window."
 msgstr "Hides the banner in a group chat window"
 
-#: gajim/common/config.py:250
-msgid "Hides the banner in two persons chat window"
-msgstr "Hides the banner in two persons chat window"
+#: gajim/common/config.py:248
+#, fuzzy
+msgid "Hides the banner in a 1:1 chat window."
+msgstr "Hides the banner in a group chat window"
 
-#: gajim/common/config.py:251
-msgid "Hides the group chat occupants list in group chat window."
+#: gajim/common/config.py:249
+#, 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:252
+#: gajim/common/config.py:250
+#, fuzzy
 msgid ""
 "In a chat, show the nickname at the beginning of a line only when it's not "
-"the same person talking than in previous message."
+"the same person talking as in the previous message."
 msgstr ""
 "In a chat, show the nickname at the beginning of a line only when it's not "
 "the same person talking than in previous message."
 
-#: gajim/common/config.py:253
+#: gajim/common/config.py:251
 msgid "Indentation when using merge consecutive nickname."
 msgstr "Indentation when using merge consecutive nickname."
 
-#: gajim/common/config.py:254
-msgid "Ctrl-Tab go to next composing tab when none is unread."
+#: gajim/common/config.py:252
+#, 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:255
+#: gajim/common/config.py:253
 #, fuzzy
 msgid ""
-"Show the confirm metacontacts creation dialog or not? Empty string means "
-"never show the dialog."
+"Show a confirmation dialog to create metacontacts? Empty string means never "
+"show the dialog."
 msgstr ""
-"Should we show the confirm metacontacts creation dialogue or not? Empty "
-"string means we never show the dialogue."
+"Should we show the confirm block contact dialogue or not? Empty string means "
+"we never show the dialogue."
 
-#: gajim/common/config.py:256
+#: gajim/common/config.py:254
 #, fuzzy
 msgid ""
-"Show the confirm block contact dialog or not? Empty string means never show "
+"Show a confirmation dialog to block a contact? Empty string means never show "
 "the dialog."
 msgstr ""
 "Should we show the confirm block contact dialogue or not? Empty string means "
 "we never show the dialogue."
 
-#: gajim/common/config.py:257
+#: gajim/common/config.py:255
 #, fuzzy
 msgid ""
-"Show the confirm custom status dialog or not? Empty string means never show "
-"the dialog."
+"Show a confirmation dialog for a custom status? Empty string means never "
+"show the dialog."
 msgstr ""
 "Should we show the confirm custom status dialogue or not? Empty string means "
 "we never show the dialogue."
 
-#: gajim/common/config.py:258
+#: gajim/common/config.py:256
 #, fuzzy
 msgid ""
-"If true, you will be able to set a negative priority to your account in "
-"account modification window. BE CAREFUL, when you are logged in with a "
-"negative priority, you will NOT receive any message from your server."
+"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 ""
 "If True, you will be able to set a negative priority to your account in "
 "account modification window. BE CAREFUL, when you are logged in with a "
 "negative priority, you will NOT receive any message from your server."
 
-#: gajim/common/config.py:259
+#: gajim/common/config.py:257
 #, fuzzy
 msgid ""
-"If true, Gajim will show number of online and total contacts in account and "
-"group rows."
+"If enabled, Gajim will show both the number of online and total contacts in "
+"account rows as well as in group rows."
 msgstr ""
 "If True, Gajim will show number of online and total contacts in account and "
 "group rows."
 
-#: gajim/common/config.py:260
+#: gajim/common/config.py:258
+#, fuzzy
 msgid ""
-"Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
-"as if they were of this type"
+"Can be empty, 'chat' or 'normal'. If not empty, all incoming messages are "
+"treated as if they were of this type."
 msgstr ""
 "Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
 "as if they were of this type"
 
-#: gajim/common/config.py:261
+#: gajim/common/config.py:259
 #, fuzzy
 msgid ""
-"If true, Gajim will scroll and select the contact who sent you the last "
-"message, if chat window is not already opened."
+"If enabled, Gajim will scroll and select the contact who sent you the last "
+"message, if the chat window is not already opened."
 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:262
+#: gajim/common/config.py:260
 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:263
+#: gajim/common/config.py:261
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
@@ -3615,141 +3618,157 @@ msgstr ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
 
-#: gajim/common/config.py:264
+#: gajim/common/config.py:262
 #, fuzzy
 msgid ""
-"If true, notification windows from notification-daemon will be attached to "
-"notification icon."
+"If enabled, notification windows from notification-daemon will be attached "
+"to the notification area icon."
 msgstr ""
 "If True, notification windows from notification-daemon will be attached to "
 "systray icon."
 
-#: gajim/common/config.py:265
+#: gajim/common/config.py:263
 msgid "Choose interval between 2 checks of idleness."
 msgstr "Choose interval between 2 checks of idleness."
 
-#: gajim/common/config.py:266
+#: gajim/common/config.py:264
+#, fuzzy
 msgid ""
-"Valid uri schemes. Only schemes in this list will be accepted as \"real\" "
-"uri. (mailto and xmpp are handled separately)"
+"Valid URI schemes. Only schemes in this list will be accepted as 'real' URI "
+"(mailto and xmpp are handled separately)."
 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:267
+#: gajim/common/config.py:265
 #, fuzzy
-msgid "If true, completion in groupchats will be like a shell auto-completion"
+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:272
-msgid "Optionally fix jingle output video framerate. Example: 10/1 or 25/2"
+#: gajim/common/config.py:270
+msgid "Optionally fix Jingle output video framerate. Example: 10/1 or 25/2."
 msgstr ""
 
-#: gajim/common/config.py:273
-msgid "Optionally resize jingle output video. Example: 320x240"
+#: gajim/common/config.py:271
+msgid "Optionally resize Jingle output video. Example: 320x240."
 msgstr ""
 
-#: gajim/common/config.py:274
-msgid "If true, You will also see your webcam"
+#: gajim/common/config.py:272
+msgid "If enabled, you will see your webcam's video stream as well."
 msgstr ""
 
-#: gajim/common/config.py:277
+#: gajim/common/config.py:275
 msgid ""
-"If true, Gajim will try to use a STUN server when using Jingle. The one in "
-"\"stun_server\" option, or the one given by the XMPP server."
+"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:278
+#: gajim/common/config.py:276
 msgid "STUN server to use when using Jingle"
 msgstr ""
 
-#: gajim/common/config.py:279
+#: gajim/common/config.py:277
 msgid ""
-"If true, Gajim will show affiliation of groupchat occupants by adding a "
-"colored square to the status icon"
+"If enabled, Gajim will show affiliation of group chat participants by adding "
+"a colored square to the status icon."
 msgstr ""
 
-#: gajim/common/config.py:280
+#: gajim/common/config.py:278
 msgid ""
 "Proxy used for all outgoing connections if the account does not have a "
-"specific proxy configured"
+"specific proxy configured."
 msgstr ""
 
-#: gajim/common/config.py:281
-msgid "If true, Gajim will ignore incoming attention requests (\"wizz\")."
+#: gajim/common/config.py:279
+msgid "If enabled, Gajim will ignore incoming attention requests ('wizz')."
 msgstr ""
 
-#: gajim/common/config.py:282
+#: gajim/common/config.py:280
 msgid ""
 "If enabled, Gajim will reopen chat windows that were opened last time Gajim "
 "was closed."
 msgstr ""
 
-#: gajim/common/config.py:283
+#: gajim/common/config.py:281
 #, fuzzy
 msgid ""
-"If enabled, Gajim will show an icon to show that sent message has been "
-"received by your contact"
+"If enabled, Gajim will display an icon to show that sent messages have been "
+"received by your contact."
 msgstr ""
 "If enabled, Gajim will not ask for a status message. The specified default "
 "message will be used instead."
 
-#: gajim/common/config.py:284
-msgid "Show a mini avatar in chat window tabs and in window icon"
+#: gajim/common/config.py:282
+msgid "Show a mini avatar in chat window tabs and as the window's icon."
 msgstr ""
 
-#: gajim/common/config.py:285
+#: gajim/common/config.py:283
 #, fuzzy
-msgid "If true, Gajim will use the Systems Keyring to store account passwords."
+msgid ""
+"If enabled, Gajim will use the System's Keyring to store account passwords."
 msgstr ""
 "If True, Gajim will use Gnome Keyring (if available) to store account "
 "passwords."
 
+#: gajim/common/config.py:284
+msgid "If enabled, Gajim will execute XEP-0146 Commands."
+msgstr ""
+
+#: gajim/common/config.py:285
+msgid "2: System, 1: Enabled, 0: Disabled"
+msgstr ""
+
 #: gajim/common/config.py:286
-msgid "If true, Gajim will execute XEP-0146 Commands."
+msgid "Options in days which can be chosen in the sync threshold menu"
 msgstr ""
 
 #: gajim/common/config.py:287
-msgid "2: System, 1: Enabled, 0: Disabled"
+msgid ""
+"Maximum history in days we request from a public group chat archive. 0: As "
+"much as possible."
 msgstr ""
 
 #: gajim/common/config.py:288
-msgid "Options in days which can be chosen in the sync threshold menu"
+msgid ""
+"Maximum history in days we request from a private group chat archive. 0: As "
+"much as possible."
 msgstr ""
 
 #: gajim/common/config.py:289
 msgid ""
-"Maximum history in days we request from a public room archive. 0: As much as "
-"possible"
+"If enabled, Gajim shows the group chat subject in the chat window when "
+"joining."
 msgstr ""
 
 #: gajim/common/config.py:290
+#, fuzzy
 msgid ""
-"Maximum history in days we request from a private room archive. 0: As much "
-"as possible"
+"If enabled, the contact row is colored according to the current chat state "
+"of the contact."
 msgstr ""
+"If ticked, Gajim will allow others to detect the operation system you are "
+"using"
 
 #: gajim/common/config.py:291
-msgid "If the room subject is shown in chat on join"
+#, fuzzy
+msgid ""
+"If enabled, the tab is colored according to the current chat state of the "
+"contact."
 msgstr ""
+"If ticked, Gajim will allow others to detect the operation system you are "
+"using"
 
 #: gajim/common/config.py:292
+#, fuzzy
 msgid ""
-"If the contact row is colored according to the current chatstate of the "
-"contact"
+"Shows a text in the banner that describes the current chat state of the "
+"contact."
 msgstr ""
+"If ticked, Gajim will allow others to detect the operation system you are "
+"using"
 
 #: gajim/common/config.py:293
-msgid "If the tab is colored according to the current chatstate of the contact"
-msgstr ""
-
-#: gajim/common/config.py:294
-msgid ""
-"Shows a text in the banner that describes the current chatstate of the "
-"contact"
-msgstr ""
-
-#: gajim/common/config.py:295 gajim/common/config.py:424
 #, fuzzy
 msgid ""
 "Chat state notifications that are sent to contacts. Possible values: all, "
@@ -3757,137 +3776,155 @@ msgid ""
 msgstr ""
 "Sent chat state notifications. Can be one of all, composing_only, disabled."
 
-#: gajim/common/config.py:296 gajim/common/config.py:438
+#: gajim/common/config.py:294
 #, fuzzy
 msgid ""
 "Chat state notifications that are sent to the group chat. Possible values: "
-"all, composing_only, disabled"
+"'all', 'composing_only', 'disabled'"
 msgstr ""
 "Sent chat state notifications. Can be one of all, composing_only, disabled."
 
-#: gajim/common/config.py:312
+#: gajim/common/config.py:297
+msgid "API Preferences. Possible values: 'http', 'iq'"
+msgstr ""
+
+#: gajim/common/config.py:313
+#, fuzzy
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
-"defined in autopriority_* options."
+"defined in 'autopriority_*' options."
 msgstr ""
 "Priority will change automatically according to your status. Priorities are "
 "defined in autopriority_* options."
 
-#: gajim/common/config.py:320
+#: gajim/common/config.py:321
+#, fuzzy
 msgid ""
-"Status used to autoconnect as. Can be online, chat, away, xa, dnd, "
-"invisible. NOTE: this option is used only if restore_last_status is disabled"
+"Status to be used automatically when connecting. Can be 'online', 'chat', "
+"'away', 'xa', 'dnd' or 'invisible'. NOTE: This option is used only if "
+"'restore_last_status' is disabled."
 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:321
-msgid "If enabled, restore the last status that was used."
+#: gajim/common/config.py:322
+#, fuzzy
+msgid "If enabled, the last status will be restored."
 msgstr "If enabled, restore the last status that was used."
 
-#: gajim/common/config.py:322
+#: gajim/common/config.py:323
 #, fuzzy
 msgid ""
-"If true, Contacts requesting authorization will be automatically accepted."
+"If enabled, Contacts requesting authorization will be accepted automatically."
 msgstr ""
 "If True, Contacts requesting authorisation will be automatically accepted."
 
-#: gajim/common/config.py:323
+#: gajim/common/config.py:324
+#, fuzzy
 msgid ""
-"If False, this account will be disabled and will not appear in roster window."
+"If disabled, this account will be disabled and will not appear in the "
+"contact list window."
 msgstr ""
 "If False, this account will be disabled and will not appear in roster window."
 
-#: gajim/common/config.py:327
-msgid "Allow plaintext connections"
+#: gajim/common/config.py:328
+msgid "Allow plaintext connections."
 msgstr ""
 
-#: gajim/common/config.py:330
+#: gajim/common/config.py:331
 msgid ""
-"List (space separated) of authentication mechanisms to try. Can contain "
-"ANONYMOUS, EXTERNAL, GSSAPI, SCRAM-SHA-1-PLUS, SCRAM-SHA-1, DIGEST-MD5, "
-"PLAIN, X-MESSENGER-OAUTH2 or XEP-0078"
+"List of authentication mechanisms to try (space separated). Can contain "
+"'ANONYMOUS', 'EXTERNAL', 'GSSAPI', 'SCRAM-SHA-1-PLUS', 'SCRAM-SHA-1', "
+"'DIGEST-MD5', 'PLAIN', 'X-MESSENGER-OAUTH2' or 'XEP-0078'."
 msgstr ""
 
-#: gajim/common/config.py:331
+#: gajim/common/config.py:332
 #, fuzzy
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection. "
-"Can be 'warn', 'connect', 'disconnect'"
+"Can be 'warn', 'connect' or 'disconnect'."
 msgstr ""
 "Show a warning dialogue before sending password on an plaintext connection."
 
-#: gajim/common/config.py:332
+#: gajim/common/config.py:333
 msgid "Show a warning dialog before using standard SSL library."
 msgstr "Show a warning dialogue before using standard SSL library."
 
-#: gajim/common/config.py:333
+#: gajim/common/config.py:334
 #, fuzzy
 msgid ""
 "Show a warning dialog before sending PLAIN password over a plain connection."
 msgstr ""
 "Show a warning dialogue before sending password on an plaintext connection."
 
-#: gajim/common/config.py:334
-msgid "Space separated list of ssl errors to ignore."
-msgstr "Space separated list of SSL errors to ignore."
+#: gajim/common/config.py:335
+msgid "List of SSL errors to ignore (space separated)."
+msgstr ""
 
-#: gajim/common/config.py:340
+#: gajim/common/config.py:341
 msgid ""
-"Space separated list of JIDs for which you do not want to store logs. You "
-"can also add account name to log nothing for this account."
+"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:341
+#: gajim/common/config.py:342
 msgid ""
-"Space separated list of JIDs for which you accept to not log conversations "
-"if he does not want to."
+"List of XMPP Addresses (space separated) for which you accept to not store "
+"chat history if your contact does not want to."
 msgstr ""
 
-#: gajim/common/config.py:343
-msgid "Whitespace sent after inactivity"
+#: gajim/common/config.py:344
+#, fuzzy
+msgid "If enabled, a whitespace is sent after inactivity (keep alive)."
 msgstr "Whitespace sent after inactivity"
 
-#: gajim/common/config.py:344
-msgid "XMPP ping sent after inactivity"
+#: gajim/common/config.py:345
+#, fuzzy
+msgid "If enabled, an XMPP ping is sent after inactivity (ping alive)."
 msgstr "XMPP ping sent after inactivity"
 
-#: gajim/common/config.py:348
+#: gajim/common/config.py:349
 #, fuzzy
 msgid ""
-"How many seconds to wait for the answer of ping alive packet before trying "
-"to reconnect?"
+"How many seconds to wait for the answer of a ping alive packet before trying "
+"to reconnect."
 msgstr ""
 "How many seconds to wait for the answer of ping alive packet before we try "
 "to reconnect."
 
-#: gajim/common/config.py:352
-msgid "Jabberd2 workaround"
+#: gajim/common/config.py:353
+#, fuzzy
+msgid "Jabberd2 workaround."
 msgstr "Jabberd2 workaround"
 
-#: gajim/common/config.py:355
+#: gajim/common/config.py:356
+#, fuzzy
 msgid ""
-"If checked, Gajim will use your IP and proxies defined in "
-"file_transfer_proxies option for file transfer."
+"If enabled, Gajim will use your IP and proxies defined in "
+"'file_transfer_proxies' option for file transfers."
 msgstr ""
 "If ticked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
 
-#: gajim/common/config.py:356
+#: gajim/common/config.py:357
 msgid ""
-"If true, Gajim will test file transfer proxies on startup to be sure it "
-"works. Openfire's proxies are known to fail this test even if they work."
+"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:369
-msgid "Answer to receipt requests"
-msgstr "Answer to receipt requests"
-
 #: gajim/common/config.py:370
-msgid "Sent receipt requests"
-msgstr "Sent receipt requests"
+#, 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:371
+msgid "If enabled, Gajim will send message receipt requests."
+msgstr ""
 
-#: gajim/common/config.py:379
+#: gajim/common/config.py:380
 #, fuzzy
 msgid ""
 "Allow Gajim to send information about the operating system you are running."
@@ -3895,184 +3932,195 @@ msgstr ""
 "If ticked, Gajim will allow others to detect the operation system you are "
 "using"
 
-#: gajim/common/config.py:380
+#: gajim/common/config.py:381
 #, fuzzy
 msgid "Allow Gajim to send your local time."
 msgstr "%s wants to send you a file."
 
-#: gajim/common/config.py:383
+#: gajim/common/config.py:384
 #, fuzzy
-msgid "Message that is sent to contacts you want to add"
+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:384
-msgid ""
-"If enabled, Gajim will send your local IPs so your contact can connect to "
-"your machine to transfer files."
-msgstr ""
-
 #: gajim/common/config.py:385
+#, fuzzy
 msgid ""
-"Space separated list of JIDs for which chat window will be re-opened on next "
-"startup."
+"If enabled, Gajim will send your local IP so your contact can connect to "
+"your machine for file transfers."
 msgstr ""
+"If ticked, Gajim will use your IP and proxies defined in "
+"file_transfer_proxies option for file transfer."
 
-#: gajim/common/config.py:387
-msgid "HTTP Upload: Enable HTTPS Verification"
+#: gajim/common/config.py:386
+msgid ""
+"List of XMPP Addresses (space separated) for which the chat window will be "
+"re-opened on next startup."
 msgstr ""
 
 #: gajim/common/config.py:388
-msgid ""
-"Preferred file transfer mechanism for file drag&drop on chat window. Can be "
-"'httpupload' (default) or 'jingle'"
+msgid "HTTP File Upload: Enable HTTPS Verification."
 msgstr ""
 
 #: gajim/common/config.py:389
-msgid "Allow cert verification with POSH"
+msgid ""
+"Preferred file transfer mechanism for file drag&drop on a chat window. Can "
+"be 'httpupload' (default) or 'jingle'."
 msgstr ""
 
-#: gajim/common/config.py:423 gajim/common/config.py:430
+#: gajim/common/config.py:390
 #, fuzzy
-msgid "Language for which misspelled words will be checked"
-msgstr "Language for which we want to check misspelt words"
+msgid "Allow certificate verification with POSH."
+msgstr "SSL certificate error"
 
-#: gajim/common/config.py:427
-msgid "The currently active encryption for that contact"
+#: gajim/common/config.py:425
+#, fuzzy
+msgid ""
+"Chat state notifications that are sent to contacts. Possible values: 'all', "
+"'composing_only', 'disabled'"
 msgstr ""
+"Sent chat state notifications. Can be one of all, composing_only, disabled."
 
-#: gajim/common/config.py:431
+#: gajim/common/config.py:428
 #, fuzzy
-msgid ""
-"How many lines to request from server when entering a groupchat. -1 means no "
-"limit, -2 means global value"
-msgstr "How many lines to request to server when entering a groupchat."
+msgid "The currently active encryption for that contact."
+msgstr "Enable ESessions encryption for this account."
 
 #: gajim/common/config.py:432
-#, fuzzy
 msgid ""
-"Minutes of backlog to request when entering a groupchat. -1 means no limit, "
-"-2 means global value"
-msgstr "How many minutes back to request logs when a entering a groupchat."
-
-#: gajim/common/config.py:433
-msgid "State whether a notification is created for every message in this room"
+"If enabled, a notification is created for every message in this group chat."
 msgstr ""
 
-#: gajim/common/config.py:434
+#: gajim/common/config.py:433
+#, fuzzy
 msgid ""
-"Show a status message for all status (away, dnd, etc.) changes of users in a "
-"group chat"
-msgstr ""
+"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:435
+#: gajim/common/config.py:434
 #, fuzzy
-msgid "Show a status message for every join or leave in a group chat"
+msgid "Show a status message for every join or leave in a group chat."
 msgstr "Unable to join group chat"
 
+#: gajim/common/config.py:435
+msgid ""
+"If enabled, the group chat is minimized into the contact list when joining "
+"automatically."
+msgstr ""
+
 #: gajim/common/config.py:436
-msgid "If the group chat is minimized into the roster on autojoin"
+msgid ""
+"If enabled, the group chat is minimized into the contact list when closing "
+"it."
 msgstr ""
 
 #: gajim/common/config.py:437
-msgid "If the group chat is minimized into the roster on close"
+#, fuzzy
+msgid ""
+"Chat state notifications that are sent to the group chat. Possible values: "
+"'all', 'composing_only' or 'disabled'."
 msgstr ""
+"Sent chat state notifications. Can be one of all, composing_only, disabled."
 
-#: gajim/common/config.py:441
+#: gajim/common/config.py:440
 msgid ""
-"State whether plugins should be activated on startup (this is saved on Gajim "
-"exit). This option SHOULD NOT be used to (de)activate plug-ins. Use GUI "
-"instead."
+"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:446 gajim/common/const.py:281
+#: gajim/common/config.py:445 gajim/common/const.py:315
 msgid "Sleeping"
 msgstr "Sleeping"
 
-#: gajim/common/config.py:447
+#: gajim/common/config.py:446
 msgid "Back soon"
 msgstr "Back soon"
 
-#: gajim/common/config.py:447
+#: gajim/common/config.py:446
 msgid "Back in some minutes."
 msgstr "Back in some minutes."
 
-#: gajim/common/config.py:448 gajim/common/const.py:247
+#: gajim/common/config.py:447 gajim/common/const.py:281
 msgid "Eating"
 msgstr "Eating"
 
-#: gajim/common/config.py:448
-msgid "I'm eating, so leave me a message."
-msgstr "I'm eating, so leave me a message."
+#: gajim/common/config.py:447
+#, fuzzy
+msgid "I'm eating."
+msgstr "I'm working."
 
-#: gajim/common/config.py:449
+#: gajim/common/config.py:448
 msgid "Movie"
 msgstr "Movie"
 
-#: gajim/common/config.py:449
+#: gajim/common/config.py:448
 msgid "I'm watching a movie."
 msgstr "I'm watching a movie."
 
-#: gajim/common/config.py:450 gajim/common/const.py:314
+#: gajim/common/config.py:449 gajim/common/const.py:348
 msgid "Working"
 msgstr "Working"
 
-#: gajim/common/config.py:450
+#: gajim/common/config.py:449
 msgid "I'm working."
 msgstr "I'm working."
 
-#: gajim/common/config.py:451
+#: gajim/common/config.py:450
 msgid "Phone"
 msgstr "Phone"
 
-#: gajim/common/config.py:451
+#: gajim/common/config.py:450
 msgid "I'm on the phone."
 msgstr "I'm on the phone."
 
-#: gajim/common/config.py:452
+#: gajim/common/config.py:451
 msgid "Out"
 msgstr "Out"
 
-#: gajim/common/config.py:452
+#: gajim/common/config.py:451
 msgid "I'm out enjoying life."
 msgstr "I'm out enjoying life."
 
-#: gajim/common/config.py:463
+#: gajim/common/config.py:462
 msgid "I'm available."
 msgstr "I'm available."
 
-#: gajim/common/config.py:464
+#: gajim/common/config.py:463
 msgid "I'm free for chat."
 msgstr "I'm free for chat."
 
-#: gajim/common/config.py:465 gajim/gtk/accounts.py:134
+#: gajim/common/config.py:464 gajim/gtk/accounts.py:133
 msgid "Be right back."
 msgstr "Be right back."
 
-#: gajim/common/config.py:466
+#: gajim/common/config.py:465
 msgid "I'm not available."
 msgstr "I'm not available."
 
-#: gajim/common/config.py:467
+#: gajim/common/config.py:466
 msgid "Do not disturb."
 msgstr "Do not disturb."
 
-#: gajim/common/config.py:468 gajim/common/config.py:469
+#: gajim/common/config.py:467 gajim/common/config.py:468
 msgid "Bye!"
 msgstr "Bye!"
 
-#: gajim/common/config.py:480
+#: gajim/common/config.py:479
+#, fuzzy
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
-"muc_highlight_words, or when a group chat message contains your nickname."
+"'muc_highlight_words' your nickname is mentioned."
 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:481
-msgid "Sound to play when any MUC message arrives."
+#: gajim/common/config.py:480
+#, fuzzy
+msgid "Sound to play when any group chat message arrives."
 msgstr "Sound to play when any MUC message arrives."
 
-#: gajim/common/config.py:485
+#: gajim/common/config.py:484
 #, fuzzy
 msgid "Tor"
 msgstr "To"
@@ -4082,879 +4130,975 @@ msgstr "To"
 msgid "Error: cannot open %s for reading"
 msgstr "Error: cannot open %s for reading"
 
-#: gajim/common/const.py:214
+#: gajim/common/const.py:216
+#, fuzzy
+msgid "?Group chat name:Team"
+msgstr "None"
+
+#: gajim/common/const.py:217
+msgid "?Group chat description:Project discussion"
+msgstr ""
+
+#: gajim/common/const.py:218
+#, fuzzy
+msgid "?Group chat address:team"
+msgstr "Groupchats"
+
+#: gajim/common/const.py:219
+#, fuzzy
+msgid "?Group chat name:Family"
+msgstr "Group Chat Message Highlight"
+
+#: gajim/common/const.py:220
+msgid "?Group chat description:Spring gathering"
+msgstr ""
+
+#: gajim/common/const.py:221
+msgid "?Group chat address:family"
+msgstr ""
+
+#: gajim/common/const.py:222
+#, fuzzy
+msgid "?Group chat name:Vacation"
+msgstr "Groupchat Invitation"
+
+#: gajim/common/const.py:223
+msgid "?Group chat description:Trip planning"
+msgstr ""
+
+#: gajim/common/const.py:224
+#, fuzzy
+msgid "?Group chat address:vacation"
+msgstr "Groupchat Invitation"
+
+#: gajim/common/const.py:225
+#, fuzzy
+msgid "?Group chat name:Repairs"
+msgstr "Group Chat"
+
+#: gajim/common/const.py:226
+msgid "?Group chat description:Local help group"
+msgstr ""
+
+#: gajim/common/const.py:227
+#, fuzzy
+msgid "?Group chat address:repairs"
+msgstr "Groupchats"
+
+#: gajim/common/const.py:228
+#, fuzzy
+msgid "?Group chat name:News"
+msgstr "None"
+
+#: gajim/common/const.py:229
+#, fuzzy
+msgid "?Group chat description:Local news and reports"
+msgstr "Group chat creation is restricted."
+
+#: gajim/common/const.py:230
+#, fuzzy
+msgid "?Group chat address:news"
+msgstr "New Group Chat"
+
+#: gajim/common/const.py:235
+#, fuzzy
+msgid "Remote server not found"
+msgstr "The service could not be found"
+
+#: gajim/common/const.py:236
+msgid "Remote server timeout"
+msgstr ""
+
+#: gajim/common/const.py:237 gajim/common/const.py:238
+#: gajim/common/const.py:239
+#, fuzzy
+msgid "Address does not belong to a group chat server"
+msgstr "This is not a group chat"
+
+#: gajim/common/const.py:240
+#, fuzzy
+msgid "Group chat already exists"
+msgstr "Account Local already exists."
+
+#: gajim/common/const.py:241
+#, fuzzy
+msgid "Group chat does not exist"
+msgstr "Group chat %s does not exist."
+
+#: gajim/common/const.py:247
 msgid "This message was encrypted with OTR and could not be decrypted."
 msgstr ""
 
-#: gajim/common/const.py:217
+#: gajim/common/const.py:250
 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:221
+#: gajim/common/const.py:254
 msgid ""
-"This message was encrypted with OpenPGP for XMPP and could not be decrypted."
+"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:224
+#: gajim/common/const.py:258
 #, python-format
 msgid "This message was encrypted with %s and could not be decrypted."
 msgstr ""
 
-#: gajim/common/const.py:231
+#: gajim/common/const.py:265
 msgid "Doing Chores"
 msgstr "Doing Chores"
 
-#: gajim/common/const.py:232
+#: gajim/common/const.py:266
 msgid "Buying Groceries"
 msgstr "Buying Groceries"
 
-#: gajim/common/const.py:233
+#: gajim/common/const.py:267
 msgid "Cleaning"
 msgstr "Cleaning"
 
-#: gajim/common/const.py:234
+#: gajim/common/const.py:268
 msgid "Cooking"
 msgstr "Cooking"
 
-#: gajim/common/const.py:235
+#: gajim/common/const.py:269
 msgid "Doing Maintenance"
 msgstr "Doing Maintenance"
 
-#: gajim/common/const.py:236
+#: gajim/common/const.py:270
 msgid "Doing the Dishes"
 msgstr "Doing the Dishes"
 
-#: gajim/common/const.py:237
+#: gajim/common/const.py:271
 msgid "Doing the Laundry"
 msgstr "Doing the Laundry"
 
-#: gajim/common/const.py:238
+#: gajim/common/const.py:272
 msgid "Gardening"
 msgstr "Gardening"
 
-#: gajim/common/const.py:239
+#: gajim/common/const.py:273
 msgid "Running an Errand"
 msgstr "Running an Errand"
 
-#: gajim/common/const.py:240
+#: gajim/common/const.py:274
 msgid "Walking the Dog"
 msgstr "Walking the Dog"
 
-#: gajim/common/const.py:242
+#: gajim/common/const.py:276
 msgid "Drinking"
 msgstr "Drinking"
 
-#: gajim/common/const.py:243
+#: gajim/common/const.py:277
 msgid "Having a Beer"
 msgstr "Having a Beer"
 
-#: gajim/common/const.py:244
+#: gajim/common/const.py:278
 msgid "Having Coffee"
 msgstr "Having Coffee"
 
-#: gajim/common/const.py:245
+#: gajim/common/const.py:279
 msgid "Having Tea"
 msgstr "Having Tea"
 
-#: gajim/common/const.py:248
+#: gajim/common/const.py:282
 msgid "Having a Snack"
 msgstr "Having a Snack"
 
-#: gajim/common/const.py:249
+#: gajim/common/const.py:283
 msgid "Having Breakfast"
 msgstr "Having Breakfast"
 
-#: gajim/common/const.py:250
+#: gajim/common/const.py:284
 msgid "Having Dinner"
 msgstr "Having Dinner"
 
-#: gajim/common/const.py:251
+#: gajim/common/const.py:285
 msgid "Having Lunch"
 msgstr "Having Lunch"
 
-#: gajim/common/const.py:253
+#: gajim/common/const.py:287
 msgid "Exercising"
 msgstr "Exercising"
 
-#: gajim/common/const.py:254 gajim/common/const.py:305
+#: gajim/common/const.py:288 gajim/common/const.py:339
 msgid "Cycling"
 msgstr "Cycling"
 
-#: gajim/common/const.py:255
+#: gajim/common/const.py:289
 msgid "Dancing"
 msgstr "Dancing"
 
-#: gajim/common/const.py:256
+#: gajim/common/const.py:290
 msgid "Hiking"
 msgstr "Hiking"
 
-#: gajim/common/const.py:257
+#: gajim/common/const.py:291
 msgid "Jogging"
 msgstr "Jogging"
 
-#: gajim/common/const.py:258
+#: gajim/common/const.py:292
 msgid "Playing Sports"
 msgstr "Playing Sports"
 
-#: gajim/common/const.py:259
+#: gajim/common/const.py:293
 msgid "Running"
 msgstr "Running"
 
-#: gajim/common/const.py:260
+#: gajim/common/const.py:294
 msgid "Skiing"
 msgstr "Skiing"
 
-#: gajim/common/const.py:261
+#: gajim/common/const.py:295
 msgid "Swimming"
 msgstr "Swimming"
 
-#: gajim/common/const.py:262
+#: gajim/common/const.py:296
 msgid "Working out"
 msgstr "Working out"
 
-#: gajim/common/const.py:264
+#: gajim/common/const.py:298
 msgid "Grooming"
 msgstr "Grooming"
 
-#: gajim/common/const.py:265
+#: gajim/common/const.py:299
 msgid "At the Spa"
 msgstr "At the Spa"
 
-#: gajim/common/const.py:266
+#: gajim/common/const.py:300
 msgid "Brushing Teeth"
 msgstr "Brushing Teeth"
 
-#: gajim/common/const.py:267
+#: gajim/common/const.py:301
 msgid "Getting a Haircut"
 msgstr "Getting a Haircut"
 
-#: gajim/common/const.py:268
+#: gajim/common/const.py:302
 msgid "Shaving"
 msgstr "Shaving"
 
-#: gajim/common/const.py:269
+#: gajim/common/const.py:303
 msgid "Taking a Bath"
 msgstr "Taking a Bath"
 
-#: gajim/common/const.py:270
+#: gajim/common/const.py:304
 msgid "Taking a Shower"
 msgstr "Taking a Shower"
 
-#: gajim/common/const.py:272
+#: gajim/common/const.py:306
 msgid "Having an Appointment"
 msgstr "Having an Appointment"
 
-#: gajim/common/const.py:274
+#: gajim/common/const.py:308
 msgid "Inactive"
 msgstr "Inactive"
 
-#: gajim/common/const.py:275
+#: gajim/common/const.py:309
 msgid "Day Off"
 msgstr "Day Off"
 
-#: gajim/common/const.py:276
+#: gajim/common/const.py:310
 msgid "Hanging out"
 msgstr "Hanging out"
 
-#: gajim/common/const.py:277
+#: gajim/common/const.py:311
 msgid "Hiding"
 msgstr "Hiding"
 
-#: gajim/common/const.py:278
+#: gajim/common/const.py:312
 msgid "On Vacation"
 msgstr "On Vacation"
 
-#: gajim/common/const.py:279
+#: gajim/common/const.py:313
 msgid "Praying"
 msgstr "Praying"
 
-#: gajim/common/const.py:280
+#: gajim/common/const.py:314
 msgid "Scheduled Holiday"
 msgstr "Scheduled Holiday"
 
-#: gajim/common/const.py:282
+#: gajim/common/const.py:316
 msgid "Thinking"
 msgstr "Thinking"
 
-#: gajim/common/const.py:284
+#: gajim/common/const.py:318
 msgid "Relaxing"
 msgstr "Relaxing"
 
-#: gajim/common/const.py:285
+#: gajim/common/const.py:319
 msgid "Fishing"
 msgstr "Fishing"
 
-#: gajim/common/const.py:286
+#: gajim/common/const.py:320
 msgid "Gaming"
 msgstr "Gaming"
 
-#: gajim/common/const.py:287
+#: gajim/common/const.py:321
 msgid "Going out"
 msgstr "Going out"
 
-#: gajim/common/const.py:288
+#: gajim/common/const.py:322
 msgid "Partying"
 msgstr "Partying"
 
-#: gajim/common/const.py:289
+#: gajim/common/const.py:323
 msgid "Reading"
 msgstr "Reading"
 
-#: gajim/common/const.py:290
+#: gajim/common/const.py:324
 msgid "Rehearsing"
 msgstr "Rehearsing"
 
-#: gajim/common/const.py:291
+#: gajim/common/const.py:325
 msgid "Shopping"
 msgstr "Shopping"
 
-#: gajim/common/const.py:292
+#: gajim/common/const.py:326
 msgid "Smoking"
 msgstr "Smoking"
 
-#: gajim/common/const.py:293
+#: gajim/common/const.py:327
 msgid "Socializing"
 msgstr "Socialising"
 
-#: gajim/common/const.py:294
+#: gajim/common/const.py:328
 msgid "Sunbathing"
 msgstr "Sunbathing"
 
-#: gajim/common/const.py:295
+#: gajim/common/const.py:329
 msgid "Watching TV"
 msgstr "Watching TV"
 
-#: gajim/common/const.py:296
+#: gajim/common/const.py:330
 msgid "Watching a Movie"
 msgstr "Watching a Movie"
 
-#: gajim/common/const.py:298
+#: gajim/common/const.py:332
 msgid "Talking"
 msgstr "Talking"
 
-#: gajim/common/const.py:299
+#: gajim/common/const.py:333
 msgid "In Real Life"
 msgstr "In Real Life"
 
-#: gajim/common/const.py:300
+#: gajim/common/const.py:334
 msgid "On the Phone"
 msgstr "On the Phone"
 
-#: gajim/common/const.py:301
+#: gajim/common/const.py:335
 msgid "On Video Phone"
 msgstr "On Video Phone"
 
-#: gajim/common/const.py:303
+#: gajim/common/const.py:337
 msgid "Traveling"
 msgstr "Travelling"
 
-#: gajim/common/const.py:304
+#: gajim/common/const.py:338
 msgid "Commuting"
 msgstr "Commuting"
 
-#: gajim/common/const.py:306
+#: gajim/common/const.py:340
 msgid "Driving"
 msgstr "Driving"
 
-#: gajim/common/const.py:307
+#: gajim/common/const.py:341
 msgid "In a Car"
 msgstr "In a Car"
 
-#: gajim/common/const.py:308
+#: gajim/common/const.py:342
 msgid "On a Bus"
 msgstr "On a Bus"
 
-#: gajim/common/const.py:309
+#: gajim/common/const.py:343
 msgid "On a Plane"
 msgstr "On a Plane"
 
-#: gajim/common/const.py:310
+#: gajim/common/const.py:344
 msgid "On a Train"
 msgstr "On a Train"
 
-#: gajim/common/const.py:311
+#: gajim/common/const.py:345
 msgid "On a Trip"
 msgstr "On a Trip"
 
-#: gajim/common/const.py:312
+#: gajim/common/const.py:346
 msgid "Walking"
 msgstr "Walking"
 
-#: gajim/common/const.py:315
+#: gajim/common/const.py:349
 msgid "Coding"
 msgstr "Coding"
 
-#: gajim/common/const.py:316
+#: gajim/common/const.py:350
 msgid "In a Meeting"
 msgstr "In a Meeting"
 
-#: gajim/common/const.py:317
+#: gajim/common/const.py:351
 msgid "Studying"
 msgstr "Studying"
 
-#: gajim/common/const.py:318
+#: gajim/common/const.py:352
 msgid "Writing"
 msgstr "Writing"
 
-#: gajim/common/const.py:321
+#: gajim/common/const.py:355
 msgid "Afraid"
 msgstr "Afraid"
 
-#: gajim/common/const.py:322
+#: gajim/common/const.py:356
 msgid "Amazed"
 msgstr "Amazed"
 
-#: gajim/common/const.py:323
+#: gajim/common/const.py:357
 msgid "Amorous"
 msgstr "Amorous"
 
-#: gajim/common/const.py:324
+#: gajim/common/const.py:358
 msgid "Angry"
 msgstr "Angry"
 
-#: gajim/common/const.py:325
+#: gajim/common/const.py:359
 msgid "Annoyed"
 msgstr "Annoyed"
 
-#: gajim/common/const.py:326
+#: gajim/common/const.py:360
 msgid "Anxious"
 msgstr "Anxious"
 
-#: gajim/common/const.py:327
+#: gajim/common/const.py:361
 msgid "Aroused"
 msgstr "Aroused"
 
-#: gajim/common/const.py:328
+#: gajim/common/const.py:362
 msgid "Ashamed"
 msgstr "Ashamed"
 
-#: gajim/common/const.py:329
+#: gajim/common/const.py:363
 msgid "Bored"
 msgstr "Bored"
 
-#: gajim/common/const.py:330
+#: gajim/common/const.py:364
 msgid "Brave"
 msgstr "Brave"
 
-#: gajim/common/const.py:331
+#: gajim/common/const.py:365
 msgid "Calm"
 msgstr "Calm"
 
-#: gajim/common/const.py:332
+#: gajim/common/const.py:366
 msgid "Cautious"
 msgstr "Cautious"
 
-#: gajim/common/const.py:333
+#: gajim/common/const.py:367
 msgid "Cold"
 msgstr "Cold"
 
-#: gajim/common/const.py:334
+#: gajim/common/const.py:368
 msgid "Confident"
 msgstr "Confident"
 
-#: gajim/common/const.py:335
+#: gajim/common/const.py:369
 msgid "Confused"
 msgstr "Confused"
 
-#: gajim/common/const.py:336
+#: gajim/common/const.py:370
 msgid "Contemplative"
 msgstr "Contemplative"
 
-#: gajim/common/const.py:337
+#: gajim/common/const.py:371
 msgid "Contented"
 msgstr "Contented"
 
-#: gajim/common/const.py:338
+#: gajim/common/const.py:372
 msgid "Cranky"
 msgstr "Cranky"
 
-#: gajim/common/const.py:339
+#: gajim/common/const.py:373
 msgid "Crazy"
 msgstr "Crazy"
 
-#: gajim/common/const.py:340
+#: gajim/common/const.py:374
 msgid "Creative"
 msgstr "Creative"
 
-#: gajim/common/const.py:341
+#: gajim/common/const.py:375
 msgid "Curious"
 msgstr "Curious"
 
-#: gajim/common/const.py:342
+#: gajim/common/const.py:376
 msgid "Dejected"
 msgstr "Dejected"
 
-#: gajim/common/const.py:343
+#: gajim/common/const.py:377
 msgid "Depressed"
 msgstr "Depressed"
 
-#: gajim/common/const.py:344
+#: gajim/common/const.py:378
 msgid "Disappointed"
 msgstr "Disappointed"
 
-#: gajim/common/const.py:345
+#: gajim/common/const.py:379
 msgid "Disgusted"
 msgstr "Disgusted"
 
-#: gajim/common/const.py:346
+#: gajim/common/const.py:380
 msgid "Dismayed"
 msgstr "Dismayed"
 
-#: gajim/common/const.py:347
+#: gajim/common/const.py:381
 msgid "Distracted"
 msgstr "Distracted"
 
-#: gajim/common/const.py:348
+#: gajim/common/const.py:382
 msgid "Embarrassed"
 msgstr "Embarrassed"
 
-#: gajim/common/const.py:349
+#: gajim/common/const.py:383
 msgid "Envious"
 msgstr "Envious"
 
-#: gajim/common/const.py:350
+#: gajim/common/const.py:384
 msgid "Excited"
 msgstr "Excited"
 
-#: gajim/common/const.py:351
+#: gajim/common/const.py:385
 msgid "Flirtatious"
 msgstr "Flirtatious"
 
-#: gajim/common/const.py:352
+#: gajim/common/const.py:386
 msgid "Frustrated"
 msgstr "Frustrated"
 
-#: gajim/common/const.py:353
+#: gajim/common/const.py:387
 msgid "Grateful"
 msgstr "Grateful"
 
-#: gajim/common/const.py:354
+#: gajim/common/const.py:388
 msgid "Grieving"
 msgstr "Grieving"
 
-#: gajim/common/const.py:355
+#: gajim/common/const.py:389
 msgid "Grumpy"
 msgstr "Grumpy"
 
-#: gajim/common/const.py:356
+#: gajim/common/const.py:390
 msgid "Guilty"
 msgstr "Guilty"
 
-#: gajim/common/const.py:357
+#: gajim/common/const.py:391
 msgid "Happy"
 msgstr "Happy"
 
-#: gajim/common/const.py:358
+#: gajim/common/const.py:392
 msgid "Hopeful"
 msgstr "Hopeful"
 
-#: gajim/common/const.py:359
+#: gajim/common/const.py:393
 msgid "Hot"
 msgstr "Hot"
 
-#: gajim/common/const.py:360
+#: gajim/common/const.py:394
 msgid "Humbled"
 msgstr "Humbled"
 
-#: gajim/common/const.py:361
+#: gajim/common/const.py:395
 msgid "Humiliated"
 msgstr "Humiliated"
 
-#: gajim/common/const.py:362
+#: gajim/common/const.py:396
 msgid "Hungry"
 msgstr "Hungry"
 
-#: gajim/common/const.py:363
+#: gajim/common/const.py:397
 msgid "Hurt"
 msgstr "Hurt"
 
-#: gajim/common/const.py:364
+#: gajim/common/const.py:398
 msgid "Impressed"
 msgstr "Impressed"
 
-#: gajim/common/const.py:365
+#: gajim/common/const.py:399
 msgid "In Awe"
 msgstr "In Awe"
 
-#: gajim/common/const.py:366
+#: gajim/common/const.py:400
 msgid "In Love"
 msgstr "In Love"
 
-#: gajim/common/const.py:367
+#: gajim/common/const.py:401
 msgid "Indignant"
 msgstr "Indignant"
 
-#: gajim/common/const.py:368
+#: gajim/common/const.py:402
 msgid "Interested"
 msgstr "Interested"
 
-#: gajim/common/const.py:369
+#: gajim/common/const.py:403
 msgid "Intoxicated"
 msgstr "Intoxicated"
 
-#: gajim/common/const.py:370
+#: gajim/common/const.py:404
 msgid "Invincible"
 msgstr "Invincible"
 
-#: gajim/common/const.py:371
+#: gajim/common/const.py:405
 msgid "Jealous"
 msgstr "Jealous"
 
-#: gajim/common/const.py:372
+#: gajim/common/const.py:406
 msgid "Lonely"
 msgstr "Lonely"
 
-#: gajim/common/const.py:373
+#: gajim/common/const.py:407
 msgid "Lost"
 msgstr "Lost"
 
-#: gajim/common/const.py:374
+#: gajim/common/const.py:408
 msgid "Lucky"
 msgstr "Lucky"
 
-#: gajim/common/const.py:375
+#: gajim/common/const.py:409
 msgid "Mean"
 msgstr "Mean"
 
-#: gajim/common/const.py:376
+#: gajim/common/const.py:410
 msgid "Moody"
 msgstr "Moody"
 
-#: gajim/common/const.py:377
+#: gajim/common/const.py:411
 msgid "Nervous"
 msgstr "Nervous"
 
-#: gajim/common/const.py:378
+#: gajim/common/const.py:412
 msgid "Neutral"
 msgstr "Neutral"
 
-#: gajim/common/const.py:379
+#: gajim/common/const.py:413
 msgid "Offended"
 msgstr "Offended"
 
-#: gajim/common/const.py:380
+#: gajim/common/const.py:414
 msgid "Outraged"
 msgstr "Outraged"
 
-#: gajim/common/const.py:381
+#: gajim/common/const.py:415
 msgid "Playful"
 msgstr "Playful"
 
-#: gajim/common/const.py:382
+#: gajim/common/const.py:416
 msgid "Proud"
 msgstr "Proud"
 
-#: gajim/common/const.py:383
+#: gajim/common/const.py:417
 msgid "Relaxed"
 msgstr "Relaxed"
 
-#: gajim/common/const.py:384
+#: gajim/common/const.py:418
 msgid "Relieved"
 msgstr "Relieved"
 
-#: gajim/common/const.py:385
+#: gajim/common/const.py:419
 msgid "Remorseful"
 msgstr "Remorseful"
 
-#: gajim/common/const.py:386
+#: gajim/common/const.py:420
 msgid "Restless"
 msgstr "Restless"
 
-#: gajim/common/const.py:387
+#: gajim/common/const.py:421
 msgid "Sad"
 msgstr "Sad"
 
-#: gajim/common/const.py:388
+#: gajim/common/const.py:422
 msgid "Sarcastic"
 msgstr "Sarcastic"
 
-#: gajim/common/const.py:389
+#: gajim/common/const.py:423
 msgid "Satisfied"
 msgstr "Satisfied"
 
-#: gajim/common/const.py:390
+#: gajim/common/const.py:424
 msgid "Serious"
 msgstr "Serious"
 
-#: gajim/common/const.py:391
+#: gajim/common/const.py:425
 msgid "Shocked"
 msgstr "Shocked"
 
-#: gajim/common/const.py:392
+#: gajim/common/const.py:426
 msgid "Shy"
 msgstr "Shy"
 
-#: gajim/common/const.py:393
+#: gajim/common/const.py:427
 msgid "Sick"
 msgstr "Sick"
 
-#: gajim/common/const.py:394
+#: gajim/common/const.py:428
 msgid "Sleepy"
 msgstr "Sleepy"
 
-#: gajim/common/const.py:395
+#: gajim/common/const.py:429
 msgid "Spontaneous"
 msgstr "Spontaneous"
 
-#: gajim/common/const.py:396
+#: gajim/common/const.py:430
 msgid "Stressed"
 msgstr "Stressed"
 
-#: gajim/common/const.py:397
+#: gajim/common/const.py:431
 msgid "Strong"
 msgstr "Strong"
 
-#: gajim/common/const.py:398
+#: gajim/common/const.py:432
 msgid "Surprised"
 msgstr "Surprised"
 
-#: gajim/common/const.py:399
+#: gajim/common/const.py:433
 msgid "Thankful"
 msgstr "Thankful"
 
-#: gajim/common/const.py:400
+#: gajim/common/const.py:434
 msgid "Thirsty"
 msgstr "Thirsty"
 
-#: gajim/common/const.py:401
+#: gajim/common/const.py:435
 msgid "Tired"
 msgstr "Tired"
 
-#: gajim/common/const.py:402
+#: gajim/common/const.py:436
 msgid "Undefined"
 msgstr "Undefined"
 
-#: gajim/common/const.py:403
+#: gajim/common/const.py:437
 msgid "Weak"
 msgstr "Weak"
 
-#: gajim/common/const.py:404
+#: gajim/common/const.py:438
 msgid "Worried"
 msgstr "Worried"
 
-#: gajim/common/const.py:408
+#: gajim/common/const.py:442
 msgid "accuracy"
 msgstr ""
 
-#: gajim/common/const.py:409
+#: gajim/common/const.py:443
 #, fuzzy
 msgid "alt"
 msgstr "default"
 
-#: gajim/common/const.py:410
+#: gajim/common/const.py:444
 msgid "area"
 msgstr ""
 
-#: gajim/common/const.py:411
+#: gajim/common/const.py:445
 #, fuzzy
 msgid "bearing"
 msgstr "marine"
 
-#: gajim/common/const.py:412
+#: gajim/common/const.py:446
 #, fuzzy
 msgid "building"
 msgstr "Hiding"
 
-#: gajim/common/const.py:413
+#: gajim/common/const.py:447
 #, fuzzy
 msgid "country"
 msgstr "Country:"
 
-#: gajim/common/const.py:414
+#: gajim/common/const.py:448
 #, fuzzy
 msgid "countrycode"
 msgstr "Account"
 
-#: gajim/common/const.py:415
+#: gajim/common/const.py:449
 msgid "datum"
 msgstr ""
 
-#: gajim/common/const.py:416
+#: gajim/common/const.py:450
 #, fuzzy
 msgid "description"
 msgstr "Description"
 
-#: gajim/common/const.py:417
+#: gajim/common/const.py:451
 #, fuzzy
 msgid "error"
 msgstr "Error"
 
-#: gajim/common/const.py:418
+#: gajim/common/const.py:452
 msgid "floor"
 msgstr ""
 
-#: gajim/common/const.py:419
+#: gajim/common/const.py:453
 msgid "lat"
 msgstr ""
 
-#: gajim/common/const.py:420
+#: gajim/common/const.py:454
 msgid "locality"
 msgstr ""
 
-#: gajim/common/const.py:421
+#: gajim/common/const.py:455
 #, fuzzy
 msgid "lon"
 msgstr "one"
 
-#: gajim/common/const.py:422
+#: gajim/common/const.py:456
 msgid "postalcode"
 msgstr ""
 
-#: gajim/common/const.py:423
+#: gajim/common/const.py:457
 msgid "region"
 msgstr ""
 
-#: gajim/common/const.py:424
+#: gajim/common/const.py:458
 msgid "room"
 msgstr "room"
 
-#: gajim/common/const.py:425
+#: gajim/common/const.py:459
 msgid "speed"
 msgstr ""
 
-#: gajim/common/const.py:426
+#: gajim/common/const.py:460
 msgid "street"
 msgstr ""
 
-#: gajim/common/const.py:427
+#: gajim/common/const.py:461
 msgid "text"
 msgstr ""
 
-#: gajim/common/const.py:428
+#: gajim/common/const.py:462
 msgid "timestamp"
 msgstr ""
 
-#: gajim/common/const.py:429
+#: gajim/common/const.py:463
 msgid "URI"
 msgstr ""
 
-#: gajim/common/const.py:434
+#: gajim/common/const.py:468
 msgid "Unable to get issuer certificate"
 msgstr "Unable to get issuer certificate"
 
-#: gajim/common/const.py:435
+#: gajim/common/const.py:469
 msgid "Unable to get certificate CRL"
 msgstr "Unable to get certificate CRL"
 
-#: gajim/common/const.py:436
+#: gajim/common/const.py:470
 msgid "Unable to decrypt certificate's signature"
 msgstr "Unable to decrypt certificate's signature"
 
-#: gajim/common/const.py:437
+#: gajim/common/const.py:471
 msgid "Unable to decrypt CRL's signature"
 msgstr "Unable to decrypt CRL's signature"
 
-#: gajim/common/const.py:438
+#: gajim/common/const.py:472
 msgid "Unable to decode issuer public key"
 msgstr "Unable to decode issuer public key"
 
-#: gajim/common/const.py:439
+#: gajim/common/const.py:473
 msgid "Certificate signature failure"
 msgstr "Certificate signature failure"
 
-#: gajim/common/const.py:440
+#: gajim/common/const.py:474
 msgid "CRL signature failure"
 msgstr "CRL signature failure"
 
-#: gajim/common/const.py:441
+#: gajim/common/const.py:475
 msgid "Certificate is not yet valid"
 msgstr "Certificate is not yet valid"
 
-#: gajim/common/const.py:442
+#: gajim/common/const.py:476
 msgid "Certificate has expired"
 msgstr "Certificate has expired"
 
-#: gajim/common/const.py:443
+#: gajim/common/const.py:477
 msgid "CRL is not yet valid"
 msgstr "CRL is not yet valid"
 
-#: gajim/common/const.py:444
+#: gajim/common/const.py:478
 msgid "CRL has expired"
 msgstr "CRL has expired"
 
-#: gajim/common/const.py:445
+#: gajim/common/const.py:479
 msgid "Format error in certificate's notBefore field"
 msgstr "Format error in certificate's notBefore field"
 
-#: gajim/common/const.py:446
+#: gajim/common/const.py:480
 msgid "Format error in certificate's notAfter field"
 msgstr "Format error in certificate's notAfter field"
 
-#: gajim/common/const.py:447
+#: gajim/common/const.py:481
 msgid "Format error in CRL's lastUpdate field"
 msgstr "Format error in CRL's lastUpdate field"
 
-#: gajim/common/const.py:448
+#: gajim/common/const.py:482
 msgid "Format error in CRL's nextUpdate field"
 msgstr "Format error in CRL's nextUpdate field"
 
-#: gajim/common/const.py:449
+#: gajim/common/const.py:483
 msgid "Out of memory"
 msgstr "Out of memory"
 
-#: gajim/common/const.py:450
+#: gajim/common/const.py:484
 msgid "Self signed certificate"
 msgstr "Self signed certificate"
 
-#: gajim/common/const.py:451
+#: gajim/common/const.py:485
 msgid "Self signed certificate in certificate chain"
 msgstr "Self signed certificate in certificate chain"
 
-#: gajim/common/const.py:452
+#: gajim/common/const.py:486
 msgid "Unable to get local issuer certificate"
 msgstr "Unable to get local issuer certificate"
 
-#: gajim/common/const.py:453
+#: gajim/common/const.py:487
 msgid "Unable to verify the first certificate"
 msgstr "Unable to verify the first certificate"
 
-#: gajim/common/const.py:454
+#: gajim/common/const.py:488
 msgid "Certificate chain too long"
 msgstr "Certificate chain too long"
 
-#: gajim/common/const.py:455
+#: gajim/common/const.py:489
 msgid "Certificate revoked"
 msgstr "Certificate revoked"
 
-#: gajim/common/const.py:456
+#: gajim/common/const.py:490
 msgid "Invalid CA certificate"
 msgstr "Invalid CA certificate"
 
-#: gajim/common/const.py:457
+#: gajim/common/const.py:491
 msgid "Path length constraint exceeded"
 msgstr "Path length constraint exceeded"
 
-#: gajim/common/const.py:458
+#: gajim/common/const.py:492
 msgid "Unsupported certificate purpose"
 msgstr "Unsupported certificate purpose"
 
-#: gajim/common/const.py:459
+#: gajim/common/const.py:493
 msgid "Certificate not trusted"
 msgstr "Certificate not trusted"
 
-#: gajim/common/const.py:460
+#: gajim/common/const.py:494
 msgid "Certificate rejected"
 msgstr "Certificate rejected"
 
-#: gajim/common/const.py:461
+#: gajim/common/const.py:495
 msgid "Subject issuer mismatch"
 msgstr "Subject issuer mismatch"
 
-#: gajim/common/const.py:462
+#: gajim/common/const.py:496
 msgid "Authority and subject key identifier mismatch"
 msgstr "Authority and subject key identifier mismatch"
 
-#: gajim/common/const.py:463
+#: gajim/common/const.py:497
 msgid "Authority and issuer serial number mismatch"
 msgstr "Authority and issuer serial number mismatch"
 
-#: gajim/common/const.py:464
+#: gajim/common/const.py:498
 msgid "Key usage does not include certificate signing"
 msgstr "Key usage does not include certificate signing"
 
-#: gajim/common/const.py:465
+#: gajim/common/const.py:499
 msgid "Application verification failure"
 msgstr "Application verification failure"
 
@@ -5119,261 +5263,261 @@ msgstr ""
 msgid "video output"
 msgstr ""
 
-#: gajim/common/helpers.py:210
+#: gajim/common/helpers.py:216
 msgid "Server must be between 1 and 1023 bytes"
 msgstr ""
 
-#: gajim/common/helpers.py:214
+#: gajim/common/helpers.py:220
 msgid "Invalid character in hostname."
 msgstr "Invalid character in hostname."
 
-#: gajim/common/helpers.py:216
+#: gajim/common/helpers.py:222
 msgid "Server address required."
 msgstr "Server address required."
 
-#: gajim/common/helpers.py:220
+#: gajim/common/helpers.py:226
 msgid "Username must be between 1 and 1023 bytes"
 msgstr ""
 
-#: gajim/common/helpers.py:224
+#: gajim/common/helpers.py:230
 msgid "Invalid character in username."
 msgstr "Invalid character in username."
 
-#: gajim/common/helpers.py:230
+#: gajim/common/helpers.py:236
 msgid "Resource must be between 1 and 1023 bytes"
 msgstr ""
 
-#: gajim/common/helpers.py:234
+#: gajim/common/helpers.py:240
 msgid "Invalid character in resource."
 msgstr "Invalid character in resource."
 
-#: gajim/common/helpers.py:275
+#: gajim/common/helpers.py:281
 msgid "_Busy"
 msgstr "_Busy"
 
-#: gajim/common/helpers.py:277 gajim/gtk/tooltips.py:647
+#: gajim/common/helpers.py:283 gajim/gtk/tooltips.py:647
 msgid "Busy"
 msgstr "Busy"
 
-#: gajim/common/helpers.py:280
+#: gajim/common/helpers.py:286
 msgid "_Not Available"
 msgstr "_Not Available"
 
-#: gajim/common/helpers.py:282 gajim/gtk/tooltips.py:649
+#: gajim/common/helpers.py:288 gajim/gtk/tooltips.py:649
 msgid "Not Available"
 msgstr "Not Available"
 
-#: gajim/common/helpers.py:285
+#: gajim/common/helpers.py:291
 msgid "_Free for Chat"
 msgstr "_Free for Chat"
 
-#: gajim/common/helpers.py:287 gajim/gtk/tooltips.py:643
+#: gajim/common/helpers.py:293 gajim/gtk/tooltips.py:643
 msgid "Free for Chat"
 msgstr "Free for Chat"
 
-#: gajim/common/helpers.py:290
+#: gajim/common/helpers.py:296
 #, fuzzy
 msgid "?user status:_Available"
 msgstr "Paused"
 
-#: gajim/common/helpers.py:292 gajim/gtk/tooltips.py:641
+#: gajim/common/helpers.py:298 gajim/gtk/tooltips.py:641
 #, fuzzy
 msgid "?user status:Available"
 msgstr "Paused"
 
-#: gajim/common/helpers.py:294
+#: gajim/common/helpers.py:300
 msgid "Connecting"
 msgstr "Connecting"
 
-#: gajim/common/helpers.py:297 gajim/data/gui/preferences_window.ui:1251
+#: gajim/common/helpers.py:303 gajim/data/gui/preferences_window.ui:1251
 msgid "A_way"
 msgstr "A_way"
 
-#: gajim/common/helpers.py:299 gajim/common/modules/adhoc_commands.py:120
-#: gajim/command_system/implementation/standard.py:139
+#: gajim/common/helpers.py:305 gajim/common/modules/adhoc_commands.py:120
+#: gajim/command_system/implementation/standard.py:141
 #: gajim/gtk/tooltips.py:645
 msgid "Away"
 msgstr "Away"
 
-#: gajim/common/helpers.py:302
+#: gajim/common/helpers.py:308
 msgid "_Offline"
 msgstr "_Offline"
 
-#: gajim/common/helpers.py:304 gajim/gtk/tooltips.py:651
+#: gajim/common/helpers.py:310 gajim/gtk/tooltips.py:651
 msgid "Offline"
 msgstr "Offline"
 
-#: gajim/common/helpers.py:307
+#: gajim/common/helpers.py:313
 msgid "_Invisible"
 msgstr "_Invisible"
 
-#: gajim/common/helpers.py:313
+#: gajim/common/helpers.py:319
 msgid "?contact has status:Unknown"
 msgstr "Unknown"
 
-#: gajim/common/helpers.py:315
+#: gajim/common/helpers.py:321
 msgid "?contact has status:Has errors"
 msgstr "Has errors"
 
-#: gajim/common/helpers.py:330
+#: gajim/common/helpers.py:336
 msgid "?Subscription we already have:None"
 msgstr "None"
 
-#: gajim/common/helpers.py:332
+#: gajim/common/helpers.py:338
 msgid "To"
 msgstr "To"
 
-#: gajim/common/helpers.py:334 gajim/data/gui/groups_post_window.ui:33
+#: gajim/common/helpers.py:340 gajim/data/gui/groups_post_window.ui:33
 msgid "From"
 msgstr "From"
 
-#: gajim/common/helpers.py:336
+#: gajim/common/helpers.py:342
 msgid "Both"
 msgstr "Both"
 
-#: gajim/common/helpers.py:338 gajim/gtk/server_info.py:151
+#: gajim/common/helpers.py:344 gajim/gtk/server_info.py:151
 #, fuzzy
 msgid "Unknown"
 msgstr "Unknown"
 
-#: gajim/common/helpers.py:344
+#: gajim/common/helpers.py:350
 msgid "?Ask (for Subscription):None"
 msgstr "None"
 
-#: gajim/common/helpers.py:346
+#: gajim/common/helpers.py:352
 msgid "Subscribe"
 msgstr "Subscribe"
 
-#: gajim/common/helpers.py:355
+#: gajim/common/helpers.py:361
 msgid "?Group Chat Contact Role:None"
 msgstr "None"
 
-#: gajim/common/helpers.py:358
+#: gajim/common/helpers.py:364
 msgid "Moderators"
 msgstr "Moderators"
 
-#: gajim/common/helpers.py:360
+#: gajim/common/helpers.py:366
 msgid "Moderator"
 msgstr "Moderator"
 
-#: gajim/common/helpers.py:363
+#: gajim/common/helpers.py:369 gajim/data/gui/groupchat_info_scrolled.ui:243
 msgid "Participants"
 msgstr "Participants"
 
-#: gajim/common/helpers.py:365
+#: gajim/common/helpers.py:371
 msgid "Participant"
 msgstr "Participant"
 
-#: gajim/common/helpers.py:368
+#: gajim/common/helpers.py:374
 msgid "Visitors"
 msgstr "Visitors"
 
-#: gajim/common/helpers.py:370
+#: gajim/common/helpers.py:376
 msgid "Visitor"
 msgstr "Visitor"
 
-#: gajim/common/helpers.py:376 gajim/gtk/tooltips.py:253
+#: gajim/common/helpers.py:382 gajim/gtk/tooltips.py:253
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "None"
 
-#: gajim/common/helpers.py:378 gajim/data/gui/groupchat_config.ui:32
+#: gajim/common/helpers.py:384 gajim/data/gui/groupchat_config.ui:32
 #: gajim/gtk/tooltips.py:259
 msgid "Owner"
 msgstr "Owner"
 
-#: gajim/common/helpers.py:380 gajim/gtk/tooltips.py:257
+#: gajim/common/helpers.py:386 gajim/gtk/tooltips.py:257
 msgid "Administrator"
 msgstr "Administrator"
 
-#: gajim/common/helpers.py:382 gajim/data/gui/groupchat_config.ui:40
+#: gajim/common/helpers.py:388 gajim/data/gui/groupchat_config.ui:40
 #: gajim/gtk/tooltips.py:255 gajim/gtk/groupchat_config.py:105
 msgid "Member"
 msgstr "Member"
 
-#: gajim/common/helpers.py:421
+#: gajim/common/helpers.py:427
 msgid "is paying attention to the conversation"
 msgstr "is paying attention to the conversation"
 
-#: gajim/common/helpers.py:423
+#: gajim/common/helpers.py:429
 msgid "is doing something else"
 msgstr "is doing something else"
 
-#: gajim/common/helpers.py:425
+#: gajim/common/helpers.py:431
 #, fuzzy
 msgid "is composing a message…"
 msgstr "is composing a message..."
 
-#: gajim/common/helpers.py:428
+#: gajim/common/helpers.py:434
 msgid "paused composing a message"
 msgstr "paused composing a message"
 
-#: gajim/common/helpers.py:430
+#: gajim/common/helpers.py:436
 msgid "has closed the chat window or tab"
 msgstr "has closed the chat window or tab"
 
-#: gajim/common/helpers.py:936 gajim/common/helpers.py:943
+#: gajim/common/helpers.py:942 gajim/common/helpers.py:949
 #, 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:950
+#: gajim/common/helpers.py:956
 #, fuzzy, python-format
-msgid "from room %s"
-msgstr " from room %s"
+msgid "from group chat %s"
+msgstr "in _group chats"
 
-#: gajim/common/helpers.py:953 gajim/common/helpers.py:970
+#: gajim/common/helpers.py:959 gajim/common/helpers.py:976
 #, fuzzy, python-format
 msgid "from user %s"
 msgstr " from user %s"
 
-#: gajim/common/helpers.py:955
+#: gajim/common/helpers.py:961
 #, fuzzy, python-format
 msgid "from %s"
 msgstr " from %s"
 
-#: gajim/common/helpers.py:962 gajim/common/helpers.py:968
+#: gajim/common/helpers.py:968 gajim/common/helpers.py:974
 #, 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:986 gajim/common/helpers.py:998
+#: gajim/common/helpers.py:992 gajim/common/helpers.py:1004
 #: gajim/data/gui/roster_window.ui:85 data/org.gajim.Gajim.desktop.in:4
 #: data/org.gajim.Gajim.appdata.xml.in:9
 msgid "Gajim"
 msgstr "Gajim"
 
-#: gajim/common/helpers.py:1000
+#: gajim/common/helpers.py:1006
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: gajim/common/helpers.py:1109 gajim/data/gui/add_new_contact_window.ui:25
+#: gajim/common/helpers.py:1115 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:1111
+#: gajim/common/helpers.py:1117
 msgid "Hello, I am $name."
 msgstr ""
 
-#: gajim/common/helpers.py:1215 gajim/common/helpers.py:1224
-#: gajim/common/helpers.py:1282
+#: gajim/common/helpers.py:1221 gajim/common/helpers.py:1230
+#: gajim/common/helpers.py:1288
 msgid "Timeout loading image"
 msgstr "Timeout loading image"
 
-#: gajim/common/helpers.py:1234 gajim/common/helpers.py:1280
+#: gajim/common/helpers.py:1240 gajim/common/helpers.py:1286
 msgid "Image is too big"
 msgstr "Image is too big"
 
-#: gajim/common/helpers.py:1245
+#: gajim/common/helpers.py:1251
 #, fuzzy
 msgid "PyCURL is not installed"
 msgstr "CRL is not yet valid"
 
-#: gajim/common/helpers.py:1284
+#: gajim/common/helpers.py:1290
 #, fuzzy
 msgid "Error loading image"
 msgstr "Timeout loading image"
@@ -5552,7 +5696,8 @@ msgstr "The status has been changed."
 
 #: gajim/common/modules/adhoc_commands.py:202
 #: gajim/common/modules/adhoc_commands.py:239
-msgid "Leave Groupchats"
+#, fuzzy
+msgid "Leave Group Chats"
 msgstr "Leave Groupchats"
 
 #: gajim/common/modules/adhoc_commands.py:228
@@ -5561,15 +5706,18 @@ msgid "%(nickname)s on %(room_jid)s"
 msgstr "%(nickname)s on %(room_jid)s"
 
 #: gajim/common/modules/adhoc_commands.py:232
-msgid "You have not joined a groupchat."
+#, fuzzy
+msgid "You have not joined a group chat."
 msgstr "You have not joined a groupchat."
 
 #: gajim/common/modules/adhoc_commands.py:240
-msgid "Choose the groupchats you want to leave"
+#, fuzzy
+msgid "Choose the group chats you want to leave"
 msgstr "Choose the groupchats you want to leave"
 
 #: gajim/common/modules/adhoc_commands.py:289
-msgid "You left the following groupchats:"
+#, fuzzy
+msgid "You left the following group chats:"
 msgstr "You left the following groupchats:"
 
 #: gajim/common/modules/roster_item_exchange.py:102
@@ -5585,7 +5733,7 @@ msgstr "Sent contacts:"
 msgid "Blocked Contacts"
 msgstr "Blocked Contacts"
 
-#: gajim/data/gui/destroy_muc_dialog.ui:79 gajim/gtk/dialogs.py:736
+#: gajim/data/gui/destroy_muc_dialog.ui:79 gajim/gtk/dialogs.py:563
 msgid "Destroy this group chat permanently?"
 msgstr ""
 
@@ -5594,7 +5742,7 @@ msgstr ""
 msgid "Reason..."
 msgstr "Reason"
 
-#: gajim/data/gui/destroy_muc_dialog.ui:124 gajim/gtk/dialogs.py:738
+#: gajim/data/gui/destroy_muc_dialog.ui:124 gajim/gtk/dialogs.py:565
 msgid "Where participants should go (optional)"
 msgstr ""
 
@@ -5607,33 +5755,6 @@ msgstr ""
 msgid "_Reason and alternate venue (optional)"
 msgstr "You may also enter an alternate venue:"
 
-#: gajim/data/gui/advanced_configuration_window.ui:7
-#: gajim/data/gui/preferences_window.ui:2723
-#, fuzzy
-msgid "Advanced Configuration Editor (ACE)"
-msgstr "Advanced Configuration Editor"
-
-#: gajim/data/gui/advanced_configuration_window.ui:52
-#, fuzzy
-msgid "You should restart Gajim for some changes to take effect"
-msgstr "<b>NOTE:</b> You should restart Gajim for some settings to take effect"
-
-#: gajim/data/gui/advanced_configuration_window.ui:84
-#, fuzzy
-msgid "_Filter"
-msgstr "_Filter:"
-
-#: gajim/data/gui/advanced_configuration_window.ui:153
-#: gajim/data/gui/filetransfers_send_file_dialog.ui:15
-#: gajim/gtk/discovery.py:1666
-msgid "Description"
-msgstr "Description"
-
-#: gajim/data/gui/advanced_configuration_window.ui:197
-#, fuzzy
-msgid "_Reset to default"
-msgstr "_Reset to Default Colours"
-
 #: gajim/data/gui/join_groupchat_window.ui:56
 #: gajim/data/gui/chat_to_muc_window.ui:67
 #: gajim/data/gui/chat_to_muc_window.ui:78
@@ -5645,9 +5766,8 @@ msgid "Join group chat every time Gajim is started"
 msgstr ""
 
 #: gajim/data/gui/join_groupchat_window.ui:113
-#, fuzzy
-msgid "Auto Join"
-msgstr "Auto join"
+msgid "Join Automatically"
+msgstr ""
 
 #: gajim/data/gui/join_groupchat_window.ui:131
 #: gajim/data/gui/profile_window.ui:233
@@ -5656,10 +5776,11 @@ msgstr "Account"
 
 #: gajim/data/gui/join_groupchat_window.ui:147
 #, fuzzy
-msgid "Room"
-msgstr "Room:"
+msgid "Group chat"
+msgstr "Groupchats"
 
-#: gajim/data/gui/join_groupchat_window.ui:180 gajim/gtk/accounts.py:886
+#: gajim/data/gui/join_groupchat_window.ui:180 gajim/data/gui/bookmarks.ui:158
+#: gajim/gtk/accounts.py:889
 #, fuzzy
 msgid "Password"
 msgstr "Password:"
@@ -5683,90 +5804,11 @@ msgstr "in _group chats"
 msgid "Search group chats on selected server"
 msgstr ""
 
-#: gajim/data/gui/join_groupchat_window.ui:437 gajim/gtk/discovery.py:1271
+#: gajim/data/gui/join_groupchat_window.ui:437 gajim/gtk/discovery.py:1270
 #, fuzzy
 msgid "Join"
 msgstr "_Join"
 
-#: gajim/data/gui/manage_proxies_window.ui:12
-msgid "HTTP Connect"
-msgstr "HTTP Connect"
-
-#: gajim/data/gui/manage_proxies_window.ui:15
-msgid "SOCKS5"
-msgstr ""
-
-#: gajim/data/gui/manage_proxies_window.ui:18
-msgid "BOSH"
-msgstr ""
-
-#: gajim/data/gui/manage_proxies_window.ui:27
-msgid "Manage Proxy Profiles"
-msgstr "Manage Proxy Profiles"
-
-#: gajim/data/gui/manage_proxies_window.ui:83
-#, fuzzy
-msgid "Add Proxy"
-msgstr "Proxy:"
-
-#: gajim/data/gui/manage_proxies_window.ui:97
-#, fuzzy
-msgid "Remove Proxy"
-msgstr "Remove Group"
-
-#: gajim/data/gui/manage_proxies_window.ui:141
-#, fuzzy
-msgid "Properties"
-msgstr "<b>Properties</b>"
-
-#: gajim/data/gui/manage_proxies_window.ui:157
-#, fuzzy
-msgid "_Name"
-msgstr "_Name:"
-
-#: gajim/data/gui/manage_proxies_window.ui:173
-#, fuzzy
-msgid "_Type"
-msgstr "_Type:"
-
-#: gajim/data/gui/manage_proxies_window.ui:236
-#, fuzzy
-msgid "_BOSH URL"
-msgstr "_BOSH URL:"
-
-#: gajim/data/gui/manage_proxies_window.ui:261
-msgid "Use HTTP prox_y"
-msgstr "Use HTTP prox_y"
-
-#: gajim/data/gui/manage_proxies_window.ui:280
-#, fuzzy
-msgid "Proxy _Host"
-msgstr "Proxy _Host:"
-
-#: gajim/data/gui/manage_proxies_window.ui:307
-#, fuzzy
-msgid "Proxy _Port"
-msgstr "Proxy _Port:"
-
-#: gajim/data/gui/manage_proxies_window.ui:334
-#, fuzzy
-msgid "_Username"
-msgstr "_Username:"
-
-#: gajim/data/gui/manage_proxies_window.ui:347
-msgid "Use proxy auth_entication"
-msgstr "Use proxy auth_entication"
-
-#: gajim/data/gui/manage_proxies_window.ui:377
-#, fuzzy
-msgid "Pass_word"
-msgstr "Pass_word:"
-
-#: gajim/data/gui/manage_proxies_window.ui:405 gajim/gtk/adhoc.py:321
-#, fuzzy
-msgid "Settings"
-msgstr "Registration failed"
-
 #: gajim/data/gui/change_password_dialog.ui:17
 #, fuzzy
 msgid "New Password"
@@ -5797,11 +5839,13 @@ msgid "Status:"
 msgstr "Status:"
 
 #: gajim/data/gui/zeroconf_information_window.ui:89
-msgid "_Log conversation history"
+#, fuzzy
+msgid "_Store conversation history"
 msgstr "_Log conversation history"
 
 #: gajim/data/gui/zeroconf_information_window.ui:215
 #: gajim/data/gui/vcard_information_window.ui:390
+#: gajim/data/gui/groupchat_info_scrolled.ui:166
 msgid "Contact"
 msgstr "Contact"
 
@@ -5814,8 +5858,9 @@ msgid "Last Name:"
 msgstr "Surname:"
 
 #: gajim/data/gui/zeroconf_information_window.ui:260
-msgid "Jabber ID:"
-msgstr "Jabber ID:"
+#, fuzzy
+msgid "XMPP Address:"
+msgstr "AIM Address:"
 
 #: gajim/data/gui/zeroconf_information_window.ui:273
 msgid "E-Mail:"
@@ -5835,8 +5880,9 @@ msgid "Send _File"
 msgstr "Send _File"
 
 #: gajim/data/gui/gc_occupants_menu.ui:29
-msgid "Occupant Actions"
-msgstr "Occupant Actions"
+#, fuzzy
+msgid "Participant Actions"
+msgstr "Participants"
 
 #: gajim/data/gui/gc_occupants_menu.ui:38
 msgid "_Voice"
@@ -5867,8 +5913,9 @@ msgid "_Ban"
 msgstr "_Ban"
 
 #: gajim/data/gui/gc_occupants_menu.ui:124
-msgid "_Add to Roster"
-msgstr "_Add to Roster"
+#, fuzzy
+msgid "_Add to Contact List"
+msgstr "_Add Contact..."
 
 #: gajim/data/gui/gc_occupants_menu.ui:132
 #, fuzzy
@@ -5906,11 +5953,6 @@ msgstr "Subscription:"
 msgid "_Status"
 msgstr "_Status"
 
-#: gajim/data/gui/zeroconf_context_menu.ui:26
-#: gajim/data/gui/account_context_menu.ui:79
-msgid "_Modify Account..."
-msgstr "_Modify Account..."
-
 #: gajim/data/gui/certificate_dialog.ui:66
 #: gajim/data/gui/certificate_dialog.ui:178
 msgid "Common Name (CN)"
@@ -5992,13 +6034,19 @@ msgstr "Last modified:"
 msgid "Next entry"
 msgstr ""
 
+#: gajim/data/gui/filetransfers_send_file_dialog.ui:15
+#: gajim/data/gui/advanced_configuration.ui:143
+#: gajim/data/gui/groupchat_info_scrolled.ui:48 gajim/gtk/discovery.py:1663
+msgid "Description"
+msgstr "Description"
+
 #: gajim/data/gui/filetransfers_send_file_dialog.ui:54
 #, fuzzy
 msgid "_Send Files"
 msgstr "Send _File"
 
 #: gajim/data/gui/filetransfers_send_file_dialog.ui:58
-#: gajim/gtk/xml_console.py:90
+#: gajim/gtk/xml_console.py:87
 #, fuzzy
 msgid "Send"
 msgstr "_Send"
@@ -6023,20 +6071,23 @@ msgid "Change _Nickname..."
 msgstr "Change _Nickname..."
 
 #: gajim/data/gui/gc_control_popup_menu.ui:20
-msgid "_Manage Room"
-msgstr "_Manage Room"
+#, fuzzy
+msgid "_Manage Group Chat"
+msgstr "_New Group Chat"
 
 #: gajim/data/gui/gc_control_popup_menu.ui:31
 msgid "Change _Subject..."
 msgstr "Change _Subject..."
 
 #: gajim/data/gui/gc_control_popup_menu.ui:38
-msgid "Configure _Room..."
-msgstr "Configure _Room..."
+#, fuzzy
+msgid "Configure _Group Chat..."
+msgstr "Join _Group Chat..."
 
 #: gajim/data/gui/gc_control_popup_menu.ui:52
-msgid "_Destroy Room"
-msgstr "_Destroy Room"
+#, fuzzy
+msgid "_Destroy Group Chat"
+msgstr "_New Group Chat"
 
 #: gajim/data/gui/gc_control_popup_menu.ui:64
 msgid "_Minimize on close"
@@ -6047,7 +6098,7 @@ msgstr "_Minimise on close"
 msgid "_Request Voice"
 msgstr "_Voice"
 
-#: gajim/data/gui/gc_control_popup_menu.ui:99 gajim/gtk/discovery.py:1704
+#: gajim/data/gui/gc_control_popup_menu.ui:99
 msgid "_Bookmark"
 msgstr "_Bookmark"
 
@@ -6099,13 +6150,6 @@ msgstr "Homepage:"
 msgid "E-Mail"
 msgstr "E-Mail:"
 
-#: 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/blocking_list.ui:115 gajim/gtk/add_contact.py:30
-#: gajim/gtk/accounts.py:801
-msgid "Jabber ID"
-msgstr "Jabber ID"
-
 #: gajim/data/gui/profile_window.ui:440
 msgid "Main"
 msgstr ""
@@ -6240,35 +6284,42 @@ msgstr "Work"
 msgid "About"
 msgstr "About"
 
-#: gajim/data/gui/start_chat_dialog.ui:114 gajim/gtk/discovery.py:1658
-msgid "Users"
-msgstr "Users"
-
-#: gajim/data/gui/start_chat_dialog.ui:185
-msgid "Name:"
-msgstr "Name:"
+#: gajim/data/gui/start_chat_dialog.ui:53
+#, fuzzy
+msgid "Global Group Chat Search"
+msgstr "Join Group Chat"
 
-#: gajim/data/gui/start_chat_dialog.ui:197
+#: 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
-msgid "Description:"
-msgstr "Description: "
+msgid "_Back"
+msgstr "Back soon"
 
-#: gajim/data/gui/start_chat_dialog.ui:209
+#: gajim/data/gui/start_chat_dialog.ui:245
+#: gajim/data/gui/groupchat_control.ui:796
+#: gajim/data/gui/groupchat_control.ui:888 gajim/gtk/discovery.py:1701
+#: gajim/gtk/groupchat_join.py:62
+msgid "_Join"
+msgstr "_Join"
+
+#: gajim/data/gui/start_chat_dialog.ui:289
 #, fuzzy
-msgid "Address:"
-msgstr "_Address:"
+msgid "Select Account"
+msgstr "Removing %s account"
 
-#: gajim/data/gui/start_chat_dialog.ui:246
-msgid ""
-"Semi-Anonymous\n"
-"<span size=\"small\">(Only moderators can see your XMPP-Address)</span>"
+#: gajim/data/gui/start_chat_dialog.ui:380
+msgid "_Select"
 msgstr ""
 
 #: gajim/data/gui/filetransfers.ui:21
 msgid "Pa_use/Resume"
 msgstr ""
 
-#: gajim/data/gui/filetransfers.ui:30 gajim/gtk/filechoosers.py:178
+#: gajim/data/gui/filetransfers.ui:30 gajim/data/gui/groupchat_control.ui:575
+#: gajim/data/gui/groupchat_control.ui:667
+#: gajim/data/gui/groupchat_control.ui:779
+#: gajim/data/gui/groupchat_control.ui:871 gajim/gtk/filechoosers.py:178
 msgid "_Cancel"
 msgstr "_Cancel"
 
@@ -6310,7 +6361,8 @@ msgid "Cancel the selected file transfer and remove incomplete files"
 msgstr "Cancels the selected file transfer and removes incomplete file"
 
 #: gajim/data/gui/filetransfers.ui:207
-msgid "Shows a list of file transfers between you and others"
+#, fuzzy
+msgid "Shows a list of file transfers between you and your contacts"
 msgstr "Shows a list of file transfers between you and others"
 
 #: gajim/data/gui/groupchat_control.ui:13 gajim/data/gui/chat_control.ui:277
@@ -6330,7 +6382,6 @@ msgid "Strike"
 msgstr "Strike"
 
 #: gajim/data/gui/groupchat_control.ui:54 gajim/data/gui/chat_control.ui:318
-#: gajim/gtk/advanced_config.py:86
 msgid "Color"
 msgstr "Colour"
 
@@ -6343,16 +6394,46 @@ msgstr "Font"
 msgid "Clear formatting"
 msgstr "Clear formating"
 
-#: gajim/data/gui/groupchat_control.ui:290 gajim/data/gui/chat_control.ui:880
+#: gajim/data/gui/groupchat_control.ui:291 gajim/data/gui/chat_control.ui:880
 #, fuzzy
 msgid "Choose encryption"
 msgstr "Choose File to Send..."
 
-#: gajim/data/gui/groupchat_control.ui:336 gajim/data/gui/chat_control.ui:640
+#: gajim/data/gui/groupchat_control.ui:337 gajim/data/gui/chat_control.ui:640
 #, fuzzy
 msgid "Show a list of emojis (Alt+M)"
 msgstr "Show a list of emoticons (Alt+M)"
 
+#: gajim/data/gui/groupchat_control.ui:484
+#, fuzzy
+msgid "Joining…"
+msgstr "Banning..."
+
+#: gajim/data/gui/groupchat_control.ui:496
+msgid "_Abort"
+msgstr ""
+
+#: gajim/data/gui/groupchat_control.ui:542
+#, fuzzy
+msgid "Enter new nickname"
+msgstr "A_fter nickname:"
+
+#: gajim/data/gui/groupchat_control.ui:592
+#: gajim/data/gui/groupchat_control.ui:684
+#, fuzzy
+msgid "Ch_ange"
+msgstr "Change _Nickname..."
+
+#: gajim/data/gui/groupchat_control.ui:761
+#, fuzzy
+msgid "Enter password"
+msgstr "Enter new password:"
+
+#: gajim/data/gui/groupchat_control.ui:1067
+#, fuzzy
+msgid "_Try again"
+msgstr "Verify again..."
+
 #: gajim/data/gui/popup_notification_window.ui:42
 #, fuzzy
 msgid "Event Type"
@@ -6434,8 +6515,8 @@ msgstr "Away"
 
 #: gajim/data/gui/mam_preferences.ui:18
 #, fuzzy
-msgid "Roster"
-msgstr "Show _Roster"
+msgid "Contact List"
+msgstr "Contacts"
 
 #: gajim/data/gui/mam_preferences.ui:22
 #: gajim/data/gui/preferences_window.ui:123
@@ -6460,12 +6541,12 @@ msgid "Add"
 msgstr "Add"
 
 #: gajim/data/gui/mam_preferences.ui:194 gajim/data/gui/groupchat_config.ui:151
-#: gajim/gtk/dialogs.py:63 gajim/gtk/accounts.py:381
+#: gajim/gtk/dialogs.py:62 gajim/gtk/accounts.py:384
 #, fuzzy
 msgid "Remove"
 msgstr "_Remove"
 
-#: gajim/data/gui/vcard_information_window.ui:72 gajim/gtk/accounts.py:753
+#: gajim/data/gui/vcard_information_window.ui:72 gajim/gtk/accounts.py:756
 #, fuzzy
 msgid "Resource"
 msgstr "Resource:"
@@ -6518,6 +6599,7 @@ msgstr "Subscription:"
 #: gajim/data/gui/vcard_information_window.ui:974
 #: gajim/data/gui/vcard_information_window.ui:993
 #: gajim/data/gui/vcard_information_window.ui:1427
+#: gajim/data/gui/groupchat_info_scrolled.ui:222
 msgid "button"
 msgstr ""
 
@@ -6550,15 +6632,15 @@ msgstr "_Notify me about it"
 
 #: gajim/data/gui/preferences_window.ui:58
 #, fuzzy
-msgid "Show only in roster"
-msgstr "Show only in _roster"
+msgid "Show only in contact list"
+msgstr "Show Only _Active Contacts"
 
 #: gajim/data/gui/preferences_window.ui:69
-msgid "Detached roster with detached chats"
+msgid "Detached contact list with detached chats"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:72
-msgid "Detached roster with single chat"
+msgid "Detached contact list with single chat"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:75
@@ -6566,11 +6648,11 @@ msgid "Single window for everything"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:78
-msgid "Detached roster with chat grouped by account"
+msgid "Detached contact list with chat grouped by account"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:81
-msgid "Detached roster with chat grouped by type"
+msgid "Detached contact list with chat grouped by type"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:92
@@ -6621,7 +6703,7 @@ msgstr "_Window behaviour:"
 
 #: gajim/data/gui/preferences_window.ui:296
 #, fuzzy
-msgid "_Show roster on startup"
+msgid "_Show contact list on startup"
 msgstr "Show _roster"
 
 #: gajim/data/gui/preferences_window.ui:311
@@ -6637,12 +6719,12 @@ msgid "_Tabs placement"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:363
-msgid "_Quit Gajim when closing roster window"
+msgid "_Quit Gajim when closing contact list"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:367
 msgid ""
-"If enabled, Gajim will quit when closing the roster window instead of "
+"If enabled, Gajim will quit when closing the contact list window instead of "
 "minimizing to the system's notification area"
 msgstr ""
 
@@ -6652,41 +6734,42 @@ msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:423
 #, fuzzy
-msgid "Show a_vatars of contacts in roster"
+msgid "Show a_vatars of contacts in contact list"
 msgstr "Display a_vatars of contacts in roster"
 
 #: gajim/data/gui/preferences_window.ui:427
 #, fuzzy
 msgid ""
-"If checked, avatars of contacts will be shown in the roster window and in "
-"group chats"
+"If checked, avatars of contacts will be shown in the contact list window and "
+"in group chats"
 msgstr ""
 "If ticked, Gajim will display avatars of contacts in roster window and in "
 "group chats"
 
 #: gajim/data/gui/preferences_window.ui:441
 #, fuzzy
-msgid "Show status _messages of contacts in roster"
+msgid "Show status _messages of contacts in contact list"
 msgstr "Display status _messages of contacts in roster"
 
 #: gajim/data/gui/preferences_window.ui:445
 #, fuzzy
 msgid ""
 "If checked, status messages of contacts will be shown under the contact's "
-"name, in the roster window, and in group chats"
+"name, in the contact list window, and in group chats"
 msgstr ""
 "If ticked, Gajim will display status messages of contacts under the contact "
 "name in roster window and in group chats"
 
 #: gajim/data/gui/preferences_window.ui:459
 #, fuzzy
-msgid "Show e_xtra information of contacts in roster (mood, activity, ...)"
+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
 msgid ""
-"If checked, additional info published by the contact will be shown in "
-"roster. Additional infos (published via PEP) may include e.g. mood, "
+"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 ""
 
@@ -6695,8 +6778,9 @@ msgid "Sort contacts by status"
 msgstr "Sort contacts by status"
 
 #: gajim/data/gui/preferences_window.ui:494
-msgid "in _roster"
-msgstr "in _roster"
+#, fuzzy
+msgid "in _contact list"
+msgstr "Sent contacts:"
 
 #: gajim/data/gui/preferences_window.ui:511
 msgid "in _group chats"
@@ -6704,8 +6788,8 @@ msgstr "in _group chats"
 
 #: gajim/data/gui/preferences_window.ui:540
 #, fuzzy
-msgid "Roster Appearance"
-msgstr "<b>Roster Appearance</b>"
+msgid "Contact List Appearance"
+msgstr "Roster Item Exchange"
 
 #: gajim/data/gui/preferences_window.ui:585
 #, fuzzy
@@ -6771,7 +6855,7 @@ msgstr "Unable to join group chat"
 
 #: gajim/data/gui/preferences_window.ui:660
 #, fuzzy
-msgid "If checked, the room subject will be shown when joining a group chat"
+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:682
@@ -6786,13 +6870,13 @@ msgstr ""
 #: gajim/data/gui/preferences_window.ui:701
 msgid ""
 "If join/leave status messages are shown in the group chat. This setting can "
-"be overridden in the groupchat menu."
+"be overridden in the group chat menu."
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:720
 msgid ""
 "The default sync threshold for new public group chats. This setting can be "
-"overridden in the groupchat menu."
+"overridden in the group chat menu."
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:722
@@ -6807,7 +6891,7 @@ msgstr "_Log status changes of contacts"
 #: gajim/data/gui/preferences_window.ui:768
 msgid ""
 "If status change messages are shown in the group chat. This setting can be "
-"overridden in the groupchat menu."
+"overridden in the group chat menu."
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:825
@@ -6826,8 +6910,8 @@ msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:843
 #, fuzzy
-msgid "Show chatstate in roster"
-msgstr "Display a_vatars of contacts in roster"
+msgid "Show chatstate in contact list"
+msgstr "Show close button in tab?"
 
 #: gajim/data/gui/preferences_window.ui:847
 msgid ""
@@ -7133,7 +7217,7 @@ msgstr ""
 msgid "Vi_ew own video source"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2281 gajim/gtk/accounts.py:352
+#: gajim/data/gui/preferences_window.ui:2281 gajim/gtk/accounts.py:355
 msgid "Connection"
 msgstr "Connection"
 
@@ -7187,7 +7271,8 @@ msgid "_Manage..."
 msgstr "_Manage..."
 
 #: gajim/data/gui/preferences_window.ui:2616
-msgid "_Log status changes of contacts"
+#, fuzzy
+msgid "_Store status changes of contacts in history"
 msgstr "_Log status changes of contacts"
 
 #: gajim/data/gui/preferences_window.ui:2633
@@ -7212,10 +7297,15 @@ msgstr ""
 msgid "_Open..."
 msgstr "_Open..."
 
+#: gajim/data/gui/preferences_window.ui:2723 gajim/gtk/advanced_config.py:84
+#, fuzzy
+msgid "Advanced Configuration Editor (ACE)"
+msgstr "Advanced Configuration Editor"
+
 #: gajim/data/gui/groupchat_config.ui:55
 #, fuzzy
 msgid ""
-"<b>Jabber-ID</b>\n"
+"<b>XMPP Address</b>\n"
 "&lt;user@domain/resource&gt; (only that resource matches)\n"
 "&lt;user@domain&gt; (any resource matches)\n"
 "&lt;domain/resource&gt; (only that resource matches)\n"
@@ -7234,7 +7324,8 @@ msgstr ""
 msgid "Only Admins and Owners can modify the affiliation"
 msgstr ""
 
-#: gajim/data/gui/groupchat_config.ui:270 gajim/plugins/gui.py:312
+#: gajim/data/gui/groupchat_config.ui:270
+#: gajim/data/gui/groupchat_info_scrolled.ui:210 gajim/plugins/gui.py:324
 #, fuzzy
 msgid "Configuration"
 msgstr "Room Configuration"
@@ -7267,7 +7358,7 @@ msgid "Start _Chat"
 msgstr "Start _Chat"
 
 #: gajim/data/gui/contact_context_menu.ui:20
-#: gajim/data/gui/systray_context_menu.ui:36
+#: gajim/data/gui/systray_context_menu.ui:29
 msgid "Send Single _Message..."
 msgstr "Send Single _Message..."
 
@@ -7328,17 +7419,43 @@ msgid "_Ignore"
 msgstr "_Ignore"
 
 #: gajim/data/gui/contact_context_menu.ui:174
-msgid "_Add to Roster..."
-msgstr "_Add to Roster..."
+#, fuzzy
+msgid "_Add to Contact List..."
+msgstr "_Add Contact..."
+
+#: gajim/data/gui/advanced_configuration.ui:39
+#, fuzzy
+msgid "You should restart Gajim for some changes to take effect"
+msgstr "<b>NOTE:</b> You should restart Gajim for some settings to take effect"
+
+#: gajim/data/gui/advanced_configuration.ui:71
+#, fuzzy
+msgid "_Filter"
+msgstr "_Filter:"
+
+#: gajim/data/gui/advanced_configuration.ui:88
+msgid "Type to search for values..."
+msgstr ""
+
+#: gajim/data/gui/advanced_configuration.ui:180
+#, fuzzy
+msgid "_Reset Value"
+msgstr "_Reset to Default Colours"
+
+#: gajim/data/gui/advanced_configuration.ui:185
+#, fuzzy
+msgid "Resets value to default"
+msgstr "_Reset to Default Colours"
 
 #: gajim/data/gui/account_creation_wizard_window.ui:43
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim: Account Creation Wizard"
 
 #: gajim/data/gui/account_creation_wizard_window.ui:70
+#, fuzzy
 msgid ""
 "You need to have an account in order to connect\n"
-"to the Jabber network."
+"to the XMPP network."
 msgstr ""
 "You need to have an account in order to connect\n"
 "to the Jabber network."
@@ -7360,8 +7477,9 @@ msgid "<b>Please fill in the data for your existing account</b>"
 msgstr "<b>Please fill in the data for your existing account</b>"
 
 #: gajim/data/gui/account_creation_wizard_window.ui:187
-msgid "_Jabber ID:"
-msgstr "_Jabber ID:"
+#, fuzzy
+msgid "_XMPP Address:"
+msgstr "AIM Address:"
 
 #: gajim/data/gui/account_creation_wizard_window.ui:239
 #: gajim/data/gui/account_creation_wizard_window.ui:394
@@ -7448,6 +7566,7 @@ msgid "Privacy Lists:"
 msgstr "Privacy Lists:"
 
 #: gajim/data/gui/service_discovery_window.ui:111
+#: gajim/data/gui/groupchat_creation.ui:227
 #, fuzzy
 msgid "_Address"
 msgstr "_Address:"
@@ -7465,11 +7584,6 @@ msgstr "Synchronise : select contacts"
 msgid "Select the contacts you want to synchronise"
 msgstr "Select the contacts you want to synchronise"
 
-#: gajim/data/gui/groupchat_invitation_received.ui:42
-#, fuzzy
-msgid "Group Chat Invitation"
-msgstr "Groupchat Invitation"
-
 #: gajim/data/gui/groupchat_invitation_received.ui:111
 #, fuzzy
 msgid "Message..."
@@ -7520,11 +7634,10 @@ msgstr ""
 
 #: gajim/data/gui/add_new_contact_window.ui:84
 #, fuzzy
-msgid "_Jabber ID"
-msgstr "_Jabber ID:"
+msgid "_XMPP Address"
+msgstr "_Address:"
 
 #: gajim/data/gui/add_new_contact_window.ui:100
-#: gajim/data/gui/manage_bookmarks_window.ui:192
 #, fuzzy
 msgid "_Nickname"
 msgstr "_Nickname:"
@@ -7602,7 +7715,7 @@ msgstr "<b>Mood:</b>"
 msgid "<b>Message:</b>"
 msgstr "<b>Message:</b>"
 
-#: gajim/data/gui/plugins_window.ui:10 gajim/data/gui/application_menu.ui:90
+#: gajim/data/gui/plugins_window.ui:10 gajim/data/gui/application_menu.ui:87
 msgid "Plugins"
 msgstr ""
 
@@ -7711,10 +7824,6 @@ msgstr "Allow"
 msgid "Deny"
 msgstr "Deny"
 
-#: gajim/data/gui/privacy_list_window.ui:317
-msgid "JabberID"
-msgstr "JabberID"
-
 #: gajim/data/gui/privacy_list_window.ui:358
 msgid "all in the group"
 msgstr "all in the group"
@@ -7756,7 +7865,7 @@ msgstr "Order:"
 msgid "Manage sounds"
 msgstr "Manage Accounts"
 
-#: gajim/data/gui/manage_sounds_window.ui:55 gajim/plugins/gui.py:100
+#: gajim/data/gui/manage_sounds_window.ui:55 gajim/plugins/gui.py:101
 msgid "Active"
 msgstr "Active"
 
@@ -7794,23 +7903,112 @@ msgstr "Remove account from Gajim and from _server"
 msgid "_Personal Events"
 msgstr "_Personal Events"
 
-#: gajim/data/gui/account_context_menu.ui:35
-#: gajim/data/gui/systray_context_menu.ui:28
-msgid "Join _Group Chat"
-msgstr "Join _Group Chat"
-
-#: gajim/data/gui/account_context_menu.ui:49
+#: gajim/data/gui/account_context_menu.ui:41
 msgid "_Add Contact..."
 msgstr "_Add Contact..."
 
-#: gajim/data/gui/account_context_menu.ui:57
+#: gajim/data/gui/account_context_menu.ui:49
 msgid "_Discover Services"
 msgstr "_Discover Services"
 
-#: gajim/data/gui/account_context_menu.ui:65
+#: gajim/data/gui/account_context_menu.ui:57
 msgid "_Execute Command..."
 msgstr "_Execute Command..."
 
+#: gajim/data/gui/account_context_menu.ui:65
+#, fuzzy
+msgid "_View Certificate"
+msgstr "Self signed certificate"
+
+#: gajim/data/gui/manage_proxies.ui:12
+#, fuzzy
+msgctxt "proxy configuration"
+msgid "HTTP Connect"
+msgstr "HTTP Connect"
+
+#: gajim/data/gui/manage_proxies.ui:15
+msgctxt "proxy configuration"
+msgid "SOCKS5"
+msgstr ""
+
+#: gajim/data/gui/manage_proxies.ui:18
+#, fuzzy
+msgctxt "proxy configuration"
+msgid "BOSH"
+msgstr "_BOSH URL:"
+
+#: gajim/data/gui/manage_proxies.ui:68
+#, fuzzy
+msgid "Add Proxy"
+msgstr "Proxy:"
+
+#: gajim/data/gui/manage_proxies.ui:82
+#, fuzzy
+msgid "Remove Proxy"
+msgstr "Remove Group"
+
+#: gajim/data/gui/manage_proxies.ui:134
+#, fuzzy
+msgid "Pass_word"
+msgstr "Pass_word:"
+
+#: gajim/data/gui/manage_proxies.ui:159
+msgid "Use proxy auth_entication"
+msgstr "Use proxy auth_entication"
+
+#: gajim/data/gui/manage_proxies.ui:179
+#, fuzzy
+msgid "_Username"
+msgstr "_Username:"
+
+#: gajim/data/gui/manage_proxies.ui:209
+#, fuzzy
+msgid "_Port"
+msgstr "_Port:"
+
+#: gajim/data/gui/manage_proxies.ui:226
+msgid "example.org"
+msgstr ""
+
+#: gajim/data/gui/manage_proxies.ui:240
+#, fuzzy
+msgid "_Host"
+msgstr "_Host:"
+
+#: gajim/data/gui/manage_proxies.ui:254
+msgid "Use HTTP prox_y"
+msgstr "Use HTTP prox_y"
+
+#: gajim/data/gui/manage_proxies.ui:275
+msgid "https://example.org/http-bind/"
+msgstr ""
+
+#: gajim/data/gui/manage_proxies.ui:291
+#, fuzzy
+msgid "_BOSH URL"
+msgstr "_BOSH URL:"
+
+#: gajim/data/gui/manage_proxies.ui:309 gajim/gtk/adhoc.py:322
+#, fuzzy
+msgid "Settings"
+msgstr "Registration failed"
+
+#: gajim/data/gui/manage_proxies.ui:344
+#, fuzzy
+msgid "_Type"
+msgstr "_Type:"
+
+#: gajim/data/gui/manage_proxies.ui:361
+#: gajim/data/gui/groupchat_creation.ui:105
+#, fuzzy
+msgid "_Name"
+msgstr "_Name:"
+
+#: gajim/data/gui/manage_proxies.ui:391 gajim/gtk/accounts.py:742
+#, fuzzy
+msgid "Proxy"
+msgstr "Proxy:"
+
 #: gajim/data/gui/application_menu.ui:8
 #, fuzzy
 msgid "View"
@@ -7818,8 +8016,8 @@ msgstr "_View"
 
 #: gajim/data/gui/application_menu.ui:11
 #, fuzzy
-msgid "Show Roster"
-msgstr "Show _Roster"
+msgid "Show Contact List"
+msgstr "Show Only _Active Contacts"
 
 #: gajim/data/gui/application_menu.ui:16
 #, fuzzy
@@ -7860,23 +8058,24 @@ msgstr ""
 msgid "Features"
 msgstr "Features"
 
-#: gajim/data/gui/application_menu.ui:81
+#: gajim/data/gui/application_menu.ui:77
+#: gajim/data/gui/groupchat_creation.ui:81 gajim/gtk/groupchat_creation.py:45
 #, fuzzy
-msgid "Bookmarks"
-msgstr "_Bookmark"
+msgid "Create Group Chat"
+msgstr "Leave Groupchats"
 
-#: gajim/data/gui/application_menu.ui:94 gajim/data/gui/shortcuts_window.ui:189
-#: gajim/gtk/preferences.py:59
+#: gajim/data/gui/application_menu.ui:91 gajim/data/gui/shortcuts_window.ui:189
+#: gajim/gtk/preferences.py:58
 msgid "Preferences"
 msgstr "Preferences"
 
-#: gajim/data/gui/application_menu.ui:99
+#: gajim/data/gui/application_menu.ui:96
 #, fuzzy
 msgid "Quit"
 msgstr "_Quit"
 
 #: gajim/data/gui/httpupload_progress_dialog.ui:110
-#: gajim/gtk/filetransfer.py:121
+#: gajim/gtk/filetransfer.py:120
 msgid "Progress"
 msgstr "Progress"
 
@@ -7893,52 +8092,33 @@ msgstr ""
 msgid "_Cancel Upload"
 msgstr "_Cancel"
 
-#: gajim/data/gui/manage_bookmarks_window.ui:13
-#, fuzzy
-msgid "Group Chat Bookmarks"
-msgstr "Group Chat"
-
-#: gajim/data/gui/manage_bookmarks_window.ui:68
-#, fuzzy
-msgid "Add Bookmark"
-msgstr "_Bookmark"
-
-#: gajim/data/gui/manage_bookmarks_window.ui:82
-#, fuzzy
-msgid "Remove Bookmark"
-msgstr "_Bookmark"
+#: gajim/data/gui/groupchat_creation.ui:27
+msgid "Public or Private?"
+msgstr ""
 
-#: gajim/data/gui/manage_bookmarks_window.ui:126
-msgid "N_ame"
+#: 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 ""
 
-#: gajim/data/gui/manage_bookmarks_window.ui:145
-#, fuzzy
-msgid "Bookmark Name"
-msgstr "Bookmark this room"
+#: gajim/data/gui/groupchat_creation.ui:58
+msgid "<b>Public:</b> Anyone who knows the address can join."
+msgstr ""
 
-#: gajim/data/gui/manage_bookmarks_window.ui:160
+#: gajim/data/gui/groupchat_creation.ui:122
 #, fuzzy
-msgid "_Server"
-msgstr "_Server:"
+msgid "_Description"
+msgstr "Description"
 
-#: gajim/data/gui/manage_bookmarks_window.ui:223
-msgid "Roo_m"
+#: gajim/data/gui/groupchat_creation.ui:164
+msgid "_Public"
 msgstr ""
 
-#: gajim/data/gui/manage_bookmarks_window.ui:253
-#, fuzzy
-msgid "_Password"
-msgstr "_Password:"
-
-#: gajim/data/gui/manage_bookmarks_window.ui:299
+#: gajim/data/gui/groupchat_creation.ui:278
 #, fuzzy
-msgid "Join chat when connected"
-msgstr "Contact Disconnected"
-
-#: gajim/data/gui/manage_bookmarks_window.ui:307
-msgid "_Join Automatically"
-msgstr ""
+msgid "_Account"
+msgstr "_Accounts"
 
 #: gajim/data/gui/exception_dialog.ui:49
 msgid "Sorry, that should not have happened"
@@ -7983,6 +8163,29 @@ msgstr "Authorise contact so he or she can know when you're connected"
 msgid "Presets"
 msgstr "_Presence"
 
+#: gajim/data/gui/groupchat_info_scrolled.ui:32
+#, fuzzy
+msgid "Address"
+msgstr "_Address:"
+
+#: gajim/data/gui/groupchat_info_scrolled.ui:64
+msgid "Topic"
+msgstr ""
+
+#: gajim/data/gui/groupchat_info_scrolled.ui:80
+#, fuzzy
+msgid "Author"
+msgstr "Au_thorise"
+
+#: gajim/data/gui/groupchat_info_scrolled.ui:182
+msgid "Discussion Logs"
+msgstr ""
+
+#: gajim/data/gui/groupchat_info_scrolled.ui:260
+#, fuzzy
+msgid "Group Chat Language"
+msgstr "Groupchat Invitation"
+
 #: gajim/data/gui/emoji_chooser.ui:98
 #, fuzzy
 msgid "No Results Found"
@@ -7995,24 +8198,35 @@ msgstr "Invite Friends!"
 #: gajim/data/gui/chat_to_muc_window.ui:39
 #, fuzzy
 msgid ""
-"You are now entering a groupchat.\n"
+"You are now entering a group chat.\n"
 "Select the contacts you want to invite"
 msgstr ""
 "You are going to begin a Multi-User Chat.\n"
 "Select the contacts you want to invite"
 
 #: gajim/data/gui/chat_to_muc_window.ui:112
-msgid "Please select a MUC server."
+#, fuzzy
+msgid "Please select a group chat server."
 msgstr "Please select a MUC server."
 
 #: gajim/data/gui/chat_to_muc_window.ui:141
-msgid "MUC server"
-msgstr "MUC server"
+#, fuzzy
+msgid "Group chat server"
+msgstr "Groupchats"
 
 #: gajim/data/gui/chat_to_muc_window.ui:176
 msgid "In_vite"
 msgstr "In_vite"
 
+#: gajim/data/gui/bookmarks.ui:176
+#, fuzzy
+msgid "Autojoin"
+msgstr "Auto join"
+
+#: gajim/data/gui/bookmarks.ui:211
+msgid "_Apply"
+msgstr ""
+
 #: gajim/data/gui/history_manager.ui:11
 #, fuzzy
 msgid "_Export"
@@ -8028,12 +8242,13 @@ msgid "Gajim History Logs Manager"
 msgstr "Gajim History Logs Manager"
 
 #: gajim/data/gui/history_manager.ui:108
+#, fuzzy
 msgid ""
-"This log manager is not intended for log viewing. If you are looking for "
-"such functionality, use the history window instead.\n"
+"This history manager is not intended for viewing chat history. If you are "
+"looking for such functionality, please use the history window instead.\n"
 "\n"
-"Use this program to delete or export logs. You can select logs from the left "
-"and/or search database from below."
+"You can use this program to delete or export history. Either select logs "
+"from the left or search the database."
 msgstr ""
 "This log manager is not intended for log viewing. If you are looking for "
 "such functionality, use the history window instead.\n"
@@ -8085,8 +8300,9 @@ msgid "Select an emoji"
 msgstr ""
 
 #: gajim/data/gui/shortcuts_window.ui:38
-msgid "Complete a command or a nick"
-msgstr ""
+#, fuzzy
+msgid "Complete a command or a nickname"
+msgstr "Please create a clean new theme with your desired name."
 
 #: gajim/data/gui/shortcuts_window.ui:45
 #, fuzzy
@@ -8126,7 +8342,7 @@ msgstr ""
 msgid "Scroll down"
 msgstr ""
 
-#: gajim/data/gui/shortcuts_window.ui:100 gajim/gtk/xml_console.py:72
+#: gajim/data/gui/shortcuts_window.ui:100 gajim/gtk/xml_console.py:69
 #, fuzzy
 msgid "Clear"
 msgstr "Cleaning"
@@ -8168,8 +8384,9 @@ msgid "Close chat"
 msgstr ""
 
 #: gajim/data/gui/shortcuts_window.ui:173
-msgid "Roster Shortcuts"
-msgstr ""
+#, fuzzy
+msgid "Contact List Shortcuts"
+msgstr "Roster Item Exchange"
 
 #: gajim/data/gui/shortcuts_window.ui:196
 #, fuzzy
@@ -8201,7 +8418,7 @@ msgid "Show only active contacts"
 msgstr "Show Only _Active Contacts"
 
 #: gajim/data/gui/shortcuts_window.ui:251
-msgid "Enable roster filtering"
+msgid "Enable contact list filtering"
 msgstr ""
 
 #: gajim/data/gui/shortcuts_window.ui:259
@@ -8248,12 +8465,12 @@ msgstr ""
 
 #: gajim/data/gui/history_window.ui:317
 #, fuzzy
-msgid "Record history for this chat"
+msgid "Store history for this chat"
 msgstr "Ignore this error for this certificate."
 
 #: gajim/data/gui/history_window.ui:332
 #, fuzzy
-msgid "Record History"
+msgid "Store History"
 msgstr "Recently:"
 
 #: gajim/data/gui/history_window.ui:350
@@ -8274,9 +8491,10 @@ msgstr "Create new post"
 msgid "Fill in the form."
 msgstr "Fill in the form."
 
-#: gajim/data/gui/data_form_window.ui:229
-msgid "Room Configuration"
-msgstr "Room Configuration"
+#: gajim/data/gui/data_form_window.ui:229 gajim/gtk/groupchat_config.py:41
+#, fuzzy
+msgid "Group Chat Configuration"
+msgstr "Groupchat Invitation"
 
 #: gajim/data/gui/roster_item_exchange_window.ui:39
 #: gajim/gtk/roster_item_exchange.py:35
@@ -8297,15 +8515,15 @@ msgstr "Sta_tus"
 msgid "_Start Chat..."
 msgstr "_Start Chat..."
 
-#: gajim/data/gui/systray_context_menu.ui:50
+#: gajim/data/gui/systray_context_menu.ui:43
 msgid "Show All Pending _Events"
 msgstr "Show All Pending _Events"
 
-#: gajim/data/gui/systray_context_menu.ui:59
+#: gajim/data/gui/systray_context_menu.ui:52
 msgid "Mute Sounds"
 msgstr "Mute Sounds"
 
-#: gajim/data/gui/systray_context_menu.ui:75
+#: gajim/data/gui/systray_context_menu.ui:68
 #, fuzzy
 msgid "_Preferences"
 msgstr "Preferences"
@@ -8397,33 +8615,33 @@ msgstr ""
 msgid "Execute expression inside a shell, send output"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:45
+#: gajim/command_system/implementation/standard.py:47
 msgid ""
 "Show help on a given command or a list of available commands if -a is given"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:73
+#: gajim/command_system/implementation/standard.py:75
 msgid "Send a message to the contact"
 msgstr "Send a message to the contact"
 
-#: gajim/command_system/implementation/standard.py:78
+#: gajim/command_system/implementation/standard.py:80
 msgid "Send action (in the third person) to the current chat"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:83
+#: gajim/command_system/implementation/standard.py:85
 msgid "Show logged messages which mention given text"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:88
+#: gajim/command_system/implementation/standard.py:90
 #, fuzzy, python-format
 msgid "%s: Nothing found"
 msgstr "%s not found"
 
-#: gajim/command_system/implementation/standard.py:94
+#: gajim/command_system/implementation/standard.py:96
 msgid "Limit must be an integer"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:118
+#: gajim/command_system/implementation/standard.py:120
 msgid ""
 "\n"
 "    Set the current status\n"
@@ -8433,132 +8651,132 @@ msgid ""
 "    "
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:136
+#: gajim/command_system/implementation/standard.py:138
 msgid "Set the current status to away"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:150
+#: gajim/command_system/implementation/standard.py:152
 msgid "Set the current status to online"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:153
+#: gajim/command_system/implementation/standard.py:155
 #, fuzzy
 msgid "Available"
 msgstr "_Available"
 
-#: gajim/command_system/implementation/standard.py:173
-#: gajim/command_system/implementation/standard.py:250
+#: gajim/command_system/implementation/standard.py:175
+#: gajim/command_system/implementation/standard.py:252
 #, fuzzy
 msgid "Clear the text window"
 msgstr "Usage: /%s, clears the text window."
 
-#: gajim/command_system/implementation/standard.py:178
-#: gajim/command_system/implementation/standard.py:397
+#: gajim/command_system/implementation/standard.py:180
+#: gajim/command_system/implementation/standard.py:401
 #, fuzzy
 msgid "Send a ping to the contact"
 msgstr "Usage: /%s, sends a ping to the contact"
 
-#: gajim/command_system/implementation/standard.py:181
-#: gajim/command_system/implementation/standard.py:400
+#: gajim/command_system/implementation/standard.py:183
+#: gajim/command_system/implementation/standard.py:404
 #, fuzzy
 msgid "Command is not supported for zeroconf accounts"
 msgstr "Command not supported for zeroconf account."
 
-#: gajim/command_system/implementation/standard.py:185
-msgid "Send DTMF sequence through an open audio session"
+#: gajim/command_system/implementation/standard.py:187
+msgid "Send DTMF sequence through an open voice chat"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:188
+#: gajim/command_system/implementation/standard.py:190
 #, fuzzy
-msgid "No open audio sessions with the contact"
+msgid "No open voice chats with the contact"
 msgstr "Click to see past conversations with this contact"
 
-#: gajim/command_system/implementation/standard.py:191
+#: gajim/command_system/implementation/standard.py:193
 #, fuzzy, python-format
 msgid "%s is not a valid tone"
 msgstr "%s is not a valid loglevel"
 
-#: gajim/command_system/implementation/standard.py:198
-msgid "Toggle audio session"
+#: gajim/command_system/implementation/standard.py:200
+msgid "Toggle Voice Chat"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:201
+#: gajim/command_system/implementation/standard.py:203
 #, fuzzy
-msgid "Audio sessions are not available"
-msgstr "A connection is not available"
+msgid "Voice chats are not available"
+msgstr "Connection not available"
 
-#: gajim/command_system/implementation/standard.py:208
-msgid "Toggle video session"
+#: gajim/command_system/implementation/standard.py:210
+msgid "Toggle Video Chat"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:211
+#: gajim/command_system/implementation/standard.py:213
 #, fuzzy
-msgid "Video sessions are not available"
+msgid "Video chats are not available"
 msgstr "Connection not available"
 
-#: gajim/command_system/implementation/standard.py:218
+#: gajim/command_system/implementation/standard.py:220
 #, fuzzy
 msgid "Send a message to the contact that will attract their attention"
 msgstr "Send a message to the contact"
 
-#: gajim/command_system/implementation/standard.py:255
+#: gajim/command_system/implementation/standard.py:257
 #, fuzzy
 msgid "Change your nickname in a group chat"
 msgstr "Change your nickname (Ctrl+N)"
 
-#: gajim/command_system/implementation/standard.py:260 gajim/gtk/dialogs.py:674
-#: gajim/gtk/bookmarks.py:272
+#: gajim/command_system/implementation/standard.py:262
 msgid "Invalid nickname"
 msgstr "Invalid nickname"
 
-#: gajim/command_system/implementation/standard.py:267
+#: gajim/command_system/implementation/standard.py:269
 #, fuzzy
-msgid "Open a private chat window with a specified occupant"
+msgid "Open a private chat window with a specified participant"
 msgstr ""
 "Usage: /%s <nickname>, opens a private chat window with the specified "
 "occupant."
 
-#: gajim/command_system/implementation/standard.py:273
-#: gajim/command_system/implementation/standard.py:282
-#: gajim/command_system/implementation/standard.py:332
-#: gajim/command_system/implementation/standard.py:345
-#: gajim/command_system/implementation/standard.py:357
+#: gajim/command_system/implementation/standard.py:275
+#: gajim/command_system/implementation/standard.py:284
+#: gajim/command_system/implementation/standard.py:336
+#: gajim/command_system/implementation/standard.py:349
+#: gajim/command_system/implementation/standard.py:361
 msgid "Nickname not found"
 msgstr "Nickname not found"
 
-#: gajim/command_system/implementation/standard.py:276
+#: gajim/command_system/implementation/standard.py:278
 #, fuzzy
 msgid ""
-"Open a private chat window with a specified occupant and send him a message"
+"Open a private chat window with a specified participant and send him a "
+"message"
 msgstr ""
 "Usage: /%s <nickname>, opens a private chat window with the specified "
 "occupant."
 
-#: gajim/command_system/implementation/standard.py:285
+#: gajim/command_system/implementation/standard.py:287
 #, fuzzy
 msgid "Display or change a group chat topic"
 msgstr "Ask before closing a group chat tab/window."
 
-#: gajim/command_system/implementation/standard.py:294
-msgid "Invite a user to a room for a reason"
+#: gajim/command_system/implementation/standard.py:296
+msgid "Invite a user to a group chat for a reason"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:297
+#: gajim/command_system/implementation/standard.py:299
 #, fuzzy, python-format
 msgid "Invited %(jid)s to %(room_jid)s"
 msgstr "Invited %(contact_jid)s to %(room_jid)s."
 
-#: gajim/command_system/implementation/standard.py:301
+#: gajim/command_system/implementation/standard.py:303
 #, fuzzy
-msgid "Join a group chat given by a JID"
+msgid "Join a group chat given by an XMPP Address"
 msgstr "in _group chats"
 
-#: gajim/command_system/implementation/standard.py:309
+#: gajim/command_system/implementation/standard.py:313
 msgid ""
-"Leave the groupchat, optionally giving a reason, and close tab or window"
+"Leave the group chat, optionally giving a reason, and close tab or window"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:314
+#: gajim/command_system/implementation/standard.py:318
 msgid ""
 "\n"
 "    Ban user by a nick or a JID from a groupchat\n"
@@ -8567,46 +8785,46 @@ msgid ""
 "    "
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:329
+#: gajim/command_system/implementation/standard.py:333
 #, fuzzy
-msgid "Kick user by a nick from a groupchat"
+msgid "Kick user by a nick from a group chat"
 msgstr "You are invited to a groupchat"
 
-#: gajim/command_system/implementation/standard.py:338
+#: gajim/command_system/implementation/standard.py:342
 msgid ""
-"Set occupant role in group chat.\n"
+"Set participant role in group chat.\n"
 "    Role can be given as one of the following values:\n"
 "    moderator, participant, visitor, none"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:343
+#: gajim/command_system/implementation/standard.py:347
 #, fuzzy
 msgid "Invalid role given"
 msgstr "Invalid server"
 
-#: gajim/command_system/implementation/standard.py:350
+#: gajim/command_system/implementation/standard.py:354
 msgid ""
-"Set occupant affiliation in group chat.\n"
+"Set participant affiliation in group chat.\n"
 "    Affiliation can be given as one of the following values:\n"
 "    owner, admin, member, outcast, none"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:355
+#: gajim/command_system/implementation/standard.py:359
 #, fuzzy
 msgid "Invalid affiliation given"
 msgstr "affiliation changed"
 
-#: gajim/command_system/implementation/standard.py:365
+#: gajim/command_system/implementation/standard.py:369
 #, fuzzy
-msgid "Display names of all group chat occupants"
+msgid "Display names of all group chat participants"
 msgstr "Usage: /%s , display the names of group chat occupants."
 
-#: gajim/command_system/implementation/standard.py:387
-msgid "Forbid an occupant to send you public or private messages"
+#: gajim/command_system/implementation/standard.py:391
+msgid "Forbid a participant to send you public or private messages"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:392
-msgid "Allow an occupant to send you public or private messages"
+#: gajim/command_system/implementation/standard.py:396
+msgid "Allow a participant to send you public or private messages"
 msgstr ""
 
 #: gajim/command_system/implementation/middleware.py:74
@@ -8617,204 +8835,329 @@ msgstr ""
 msgid "The same as using a doc-string, except it supports translation"
 msgstr ""
 
-#: gajim/gtk/filetransfer.py:91
+#: gajim/gtk/groupchat_info.py:36
+#, fuzzy
+msgid "?Group chat feature:Archiving"
+msgstr "Groupchat Invitation"
+
+#: gajim/gtk/groupchat_info.py:37
+#, fuzzy
+msgid "Messages are archived on the server"
+msgstr "Session WILL NOT be logged"
+
+#: gajim/gtk/groupchat_info.py:40
+#, fuzzy
+msgid "?Group chat feature:Persistent"
+msgstr "Groupchats"
+
+#: gajim/gtk/groupchat_info.py:41
+msgid "This group chat persists even if there are no participants"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:45
+#, fuzzy
+msgid "?Group chat feature:Temporary"
+msgstr "None"
+
+#: gajim/gtk/groupchat_info.py:46
+msgid "This group chat will be destroyed once the last participant left"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:50
+#, fuzzy
+msgid "?Group chat feature:Moderated"
+msgstr "None"
+
+#: gajim/gtk/groupchat_info.py:51
+msgid ""
+"Participants entering this group chat need to request permission to send "
+"messages"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:55
+#, fuzzy
+msgid "?Group chat feature:Not Moderated"
+msgstr "Groupchats"
+
+#: gajim/gtk/groupchat_info.py:56
+msgid "Participants entering this group chat are allowed to send messages"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:60
+#, fuzzy
+msgid "?Group chat feature:Open"
+msgstr "None"
+
+#: gajim/gtk/groupchat_info.py:61
+#, fuzzy
+msgid "Anyone can join this group chat"
+msgstr "%s has joined the group chat"
+
+#: gajim/gtk/groupchat_info.py:64
+#, fuzzy
+msgid "?Group chat feature:Members Only"
+msgstr "Group Chat Message Highlight"
+
+#: gajim/gtk/groupchat_info.py:65
+msgid "This group chat is restricted to members only"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:69
+#, fuzzy
+msgid "?Group chat feature:Public"
+msgstr "Group Chat Message Highlight"
+
+#: gajim/gtk/groupchat_info.py:70
+msgid "Group chat can be found via search"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:73
+#, fuzzy
+msgid "?Group chat feature:Hidden"
+msgstr "None"
+
+#: gajim/gtk/groupchat_info.py:74
+#, fuzzy
+msgid "This group chat can not be found via search"
+msgstr "This group chat has no subject"
+
+#: gajim/gtk/groupchat_info.py:77
+#, fuzzy
+msgid "?Group chat feature:Not Anonymous"
+msgstr "Groupchats"
+
+#: gajim/gtk/groupchat_info.py:78
+msgid "All other group chat participants can see your XMPP address"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:82
+#, fuzzy
+msgid "?Group chat feature:Semi-Anonymous"
+msgstr "Group Chat Message Highlight"
+
+#: gajim/gtk/groupchat_info.py:83
+msgid "Only moderators can see your XMPP address"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:86
+#, fuzzy
+msgid "?Group chat feature:Password Required"
+msgstr "Groupchats"
+
+#: gajim/gtk/groupchat_info.py:87
+msgid "This group chat does require a password upon entry"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:91
+#, fuzzy
+msgid "?Group chat feature:No Password Required"
+msgstr "Groupchats"
+
+#: gajim/gtk/groupchat_info.py:92
+msgid "This group chat does not require a password upon entry"
+msgstr ""
+
+#: gajim/gtk/filetransfer.py:90
 msgid "File"
 msgstr "File"
 
-#: gajim/gtk/filetransfer.py:108
+#: gajim/gtk/filetransfer.py:107
 msgid "Time"
 msgstr "Time"
 
-#: gajim/gtk/filetransfer.py:228
+#: gajim/gtk/filetransfer.py:227
 #, fuzzy, python-format
 msgid "File name: %s"
 msgstr "Filename: %s"
 
-#: gajim/gtk/filetransfer.py:229 gajim/gtk/filetransfer.py:464
+#: gajim/gtk/filetransfer.py:228 gajim/gtk/filetransfer.py:469
 #, python-format
 msgid "Size: %s"
 msgstr "Size: %s"
 
-#: gajim/gtk/filetransfer.py:239
+#: gajim/gtk/filetransfer.py:238
 #, python-format
 msgid "Sender: %s"
 msgstr "Sender: %s"
 
-#: gajim/gtk/filetransfer.py:240 gajim/gtk/filetransfer.py:744
+#: gajim/gtk/filetransfer.py:239 gajim/gtk/filetransfer.py:749
 #: gajim/gtk/tooltips.py:577
 msgid "Recipient: "
 msgstr "Recipient: "
 
-#: gajim/gtk/filetransfer.py:251
+#: gajim/gtk/filetransfer.py:250
 #, python-format
 msgid "Saved in: %s"
 msgstr "Saved in: %s"
 
-#: gajim/gtk/filetransfer.py:256
+#: gajim/gtk/filetransfer.py:255
 msgid "File transfer completed"
 msgstr "File transfer completed"
 
-#: gajim/gtk/filetransfer.py:276 gajim/gtk/filetransfer.py:285
+#: gajim/gtk/filetransfer.py:275 gajim/gtk/filetransfer.py:284
 #, fuzzy
 msgid "Connection with peer could not be established."
 msgstr "Connection with peer cannot be established."
 
-#: gajim/gtk/filetransfer.py:293
+#: gajim/gtk/filetransfer.py:292
 #, python-format
 msgid "Filename: %s"
 msgstr "Filename: %s"
 
-#: gajim/gtk/filetransfer.py:294
+#: gajim/gtk/filetransfer.py:293
 #, python-format
 msgid "Recipient: %s"
 msgstr "Recipient: %s"
 
-#: gajim/gtk/filetransfer.py:296
+#: gajim/gtk/filetransfer.py:295
 #, python-format
 msgid "Error message: %s"
 msgstr "Error message: %s"
 
-#: gajim/gtk/filetransfer.py:333
-#, fuzzy
-msgid "File transfer error"
-msgstr "File Transfer Error"
-
 #: gajim/gtk/filetransfer.py:334
 #, python-format
 msgid ""
-"The file %(file)s has been received, but it seems to have been damaged along "
-"the way.\n"
+"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 ""
 
-#: gajim/gtk/filetransfer.py:350
+#: gajim/gtk/filetransfer.py:340
+#, fuzzy
+msgid "_Download Again"
+msgstr "Do _not ask me again"
+
+#: gajim/gtk/filetransfer.py:355
 #, fuzzy
 msgid "Gajim can not read this file"
 msgstr "Gajim cannot access this file"
 
-#: gajim/gtk/filetransfer.py:351
+#: gajim/gtk/filetransfer.py:356
 msgid "Another process is using this file."
 msgstr ""
 
-#: gajim/gtk/filetransfer.py:418
+#: gajim/gtk/filetransfer.py:423
 #, fuzzy
 msgid "File Transfer Conflict"
 msgstr "File Transfer Completed"
 
-#: gajim/gtk/filetransfer.py:419
+#: gajim/gtk/filetransfer.py:424
 msgid "This file already exists"
 msgstr "This file already exists"
 
-#: gajim/gtk/filetransfer.py:420
+#: gajim/gtk/filetransfer.py:425
 msgid "Resume download or replace file?"
 msgstr ""
 
-#: gajim/gtk/filetransfer.py:424
+#: gajim/gtk/filetransfer.py:429
 #, fuzzy
 msgid "Replace _File"
 msgstr "Cleaning"
 
-#: gajim/gtk/filetransfer.py:427
+#: gajim/gtk/filetransfer.py:432
 #, fuzzy
 msgid "Resume _Download"
 msgstr "Download"
 
-#: gajim/gtk/filetransfer.py:437
+#: gajim/gtk/filetransfer.py:442
 #, fuzzy, python-format
 msgid "Directory '%s' is not writable"
 msgstr "Directory \"%s\" is not writable"
 
-#: gajim/gtk/filetransfer.py:438
+#: gajim/gtk/filetransfer.py:443
 #, fuzzy
 msgid "You do not have permissions to create files in this directory."
 msgstr "You do not have permission to create files in this directory."
 
-#: gajim/gtk/filetransfer.py:461
+#: gajim/gtk/filetransfer.py:466
 #, python-format
 msgid "File: %s"
 msgstr "File: %s"
 
-#: gajim/gtk/filetransfer.py:467
+#: gajim/gtk/filetransfer.py:472
 #, python-format
 msgid "Type: %s"
 msgstr "Type: %s"
 
-#: gajim/gtk/filetransfer.py:469
+#: gajim/gtk/filetransfer.py:474
 #, python-format
 msgid "Description: %s"
 msgstr "Description: %s"
 
-#: gajim/gtk/filetransfer.py:480
+#: gajim/gtk/filetransfer.py:485
 #, fuzzy, python-format
 msgid "%s wants to send you a file"
 msgstr "%s wants to send you a file."
 
-#: gajim/gtk/filetransfer.py:509
+#: gajim/gtk/filetransfer.py:514
 #, fuzzy
 msgid "Checking file…"
 msgstr "Sending profile..."
 
-#: gajim/gtk/filetransfer.py:524
+#: gajim/gtk/filetransfer.py:529
 #, fuzzy
 msgid "File error"
 msgstr "File Transfer Error"
 
-#: gajim/gtk/filetransfer.py:561
+#: gajim/gtk/filetransfer.py:566
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 
-#: gajim/gtk/filetransfer.py:658
+#: gajim/gtk/filetransfer.py:663
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/s)"
 
-#: gajim/gtk/filetransfer.py:711 gajim/gtk/filetransfer.py:715
+#: gajim/gtk/filetransfer.py:716 gajim/gtk/filetransfer.py:720
 msgid "Invalid File"
 msgstr "Invalid File"
 
-#: gajim/gtk/filetransfer.py:711
+#: gajim/gtk/filetransfer.py:716
 msgid "File: "
 msgstr "File: "
 
-#: gajim/gtk/filetransfer.py:716
+#: gajim/gtk/filetransfer.py:721
 msgid "It is not possible to send empty files"
 msgstr "It is not possible to send empty files"
 
-#: gajim/gtk/filetransfer.py:742 gajim/gtk/tooltips.py:571
+#: gajim/gtk/filetransfer.py:747 gajim/gtk/tooltips.py:571
 msgid "Sender: "
 msgstr "Sender: "
 
-#: gajim/gtk/filetransfer.py:1038
+#: gajim/gtk/filetransfer.py:1043
 #, fuzzy
 msgid "Choose a File to Send…"
 msgstr "Choose File to Send..."
 
 #: gajim/gtk/start_chat.py:51
 #, fuzzy
-msgid "Start new Conversation"
+msgid "Start New Conversation"
 msgstr "Continued conversation"
 
-#: gajim/gtk/start_chat.py:424
-#, fuzzy
-msgid "New Groupchat"
-msgstr "New Group Chat"
+#: gajim/gtk/start_chat.py:260 gajim/gtk/start_chat.py:328
+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:603 gajim/gtk/groupchat_join.py:38
+msgid "Join Group Chat"
+msgstr "Join Group Chat"
 
-#: gajim/gtk/start_chat.py:426
+#: gajim/gtk/start_chat.py:605 gajim/gtk/add_contact.py:40
 #, fuzzy
-msgid "New Contact"
-msgstr "Add New Contact"
+msgid "Add Contact"
+msgstr "_Add Contact..."
 
-#: gajim/gtk/start_chat.py:588
+#: gajim/gtk/start_chat.py:746
 #, fuzzy, python-format
-msgid "%s Group chats found"
+msgid "%s group chats found"
 msgstr "%s not found"
 
-#: gajim/gtk/discovery.py:70
+#: gajim/gtk/discovery.py:69
 msgid "This service has not yet responded with detailed information"
 msgstr "This service has not yet responded with detailed information"
 
-#: gajim/gtk/discovery.py:71
+#: gajim/gtk/discovery.py:70
 #, fuzzy
 msgid ""
 "This service could not respond with detailed information.\n"
@@ -8823,32 +9166,33 @@ msgstr ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
 
-#: gajim/gtk/discovery.py:128
+#: gajim/gtk/discovery.py:126
 msgid "Others"
 msgstr "Others"
 
-#: gajim/gtk/discovery.py:131
-msgid "Conference"
-msgstr "Conference"
+#: gajim/gtk/discovery.py:129
+#, fuzzy
+msgid "Group Chat"
+msgstr "_Group Chat"
 
-#: gajim/gtk/discovery.py:519
+#: gajim/gtk/discovery.py:518
 msgid "Without a connection, you can not browse available services"
 msgstr "Without a connection, you can not browse available services"
 
-#: gajim/gtk/discovery.py:606
+#: gajim/gtk/discovery.py:605
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Service Discovery using account %s"
 
-#: gajim/gtk/discovery.py:608
+#: gajim/gtk/discovery.py:607
 msgid "Service Discovery"
 msgstr "Service Discovery"
 
-#: gajim/gtk/discovery.py:691
+#: gajim/gtk/discovery.py:690
 msgid "The service could not be found"
 msgstr "The service could not be found"
 
-#: gajim/gtk/discovery.py:692
+#: gajim/gtk/discovery.py:691
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -8856,100 +9200,80 @@ 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:699 gajim/gtk/discovery.py:1042
+#: gajim/gtk/discovery.py:698 gajim/gtk/discovery.py:1041
 msgid "The service is not browsable"
 msgstr "The service is not browsable"
 
-#: gajim/gtk/discovery.py:700
+#: gajim/gtk/discovery.py:699
 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:738 gajim/gtk/discovery.py:747
+#: gajim/gtk/discovery.py:737 gajim/gtk/discovery.py:746
 msgid "Invalid Server Name"
 msgstr "Invalid Server Name"
 
-#: gajim/gtk/discovery.py:806
+#: gajim/gtk/discovery.py:805
 #, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Browsing %(address)s using account %(account)s"
 
-#: gajim/gtk/discovery.py:851
+#: gajim/gtk/discovery.py:850
 #, fuzzy
 msgid "Browse"
 msgstr "_Browse"
 
-#: gajim/gtk/discovery.py:1043
+#: gajim/gtk/discovery.py:1042
 msgid "This service does not contain any items to browse."
 msgstr "This service does not contain any items to browse."
 
-#: gajim/gtk/discovery.py:1255
+#: gajim/gtk/discovery.py:1254
 #, fuzzy
 msgid "_Command"
 msgstr "Commands: %s"
 
-#: gajim/gtk/discovery.py:1264 gajim/gtk/discovery.py:1422
+#: gajim/gtk/discovery.py:1263 gajim/gtk/discovery.py:1420
 msgid "Re_gister"
 msgstr "Re_gister"
 
-#: gajim/gtk/discovery.py:1277
+#: gajim/gtk/discovery.py:1276
 msgid "_Search"
 msgstr "_Search"
 
-#: gajim/gtk/discovery.py:1420
+#: gajim/gtk/discovery.py:1418
 msgid "_Edit"
 msgstr "_Edit"
 
-#: gajim/gtk/discovery.py:1458
+#: gajim/gtk/discovery.py:1456
 #, fuzzy, python-format
 msgid "Scanning %(current)d / %(total)d ..."
 msgstr "Scanning %(current)d / %(total)d.."
 
-#: gajim/gtk/discovery.py:1674
+#: gajim/gtk/discovery.py:1655
+msgid "Users"
+msgstr "Users"
+
+#: gajim/gtk/discovery.py:1671
 msgid "Id"
 msgstr "Id"
 
-#: gajim/gtk/discovery.py:1713
-msgid "_Join"
-msgstr "_Join"
-
-#: gajim/gtk/discovery.py:1736
-msgid "Bookmark already set"
-msgstr "Bookmark already set"
-
-#: gajim/gtk/discovery.py:1737
-#, fuzzy, python-format
-msgid "Group Chat '%s' is already in your bookmarks."
-msgstr "Group Chat \"%s\" is already in your bookmarks."
-
-#: gajim/gtk/discovery.py:1748
-msgid "Bookmark has been added successfully"
-msgstr "Bookmark has been added successfully"
-
-#: gajim/gtk/discovery.py:1749
-#, fuzzy
-msgid ""
-"You can manage your bookmarks by clicking the Bookmarks menu item in your "
-"contact list."
-msgstr "You can manage your bookmarks via Actions menu in your roster."
-
-#: gajim/gtk/discovery.py:1950
+#: gajim/gtk/discovery.py:1900
 msgid "Subscribed"
 msgstr "Subscribed"
 
-#: gajim/gtk/discovery.py:1959
+#: gajim/gtk/discovery.py:1909
 msgid "Node"
 msgstr "Node"
 
-#: gajim/gtk/discovery.py:2028
+#: gajim/gtk/discovery.py:1978
 #, fuzzy
 msgid "_New post"
 msgstr "New post"
 
-#: gajim/gtk/discovery.py:2037
+#: gajim/gtk/discovery.py:1987
 msgid "_Subscribe"
 msgstr "_Subscribe"
 
-#: gajim/gtk/discovery.py:2045
+#: gajim/gtk/discovery.py:1995
 msgid "_Unsubscribe"
 msgstr "_Unsubscribe"
 
@@ -8996,7 +9320,7 @@ msgstr "Form %s"
 msgid "Characters typed: %s"
 msgstr "Character not allowed"
 
-#: gajim/gtk/single_message.py:274 gajim/gtk/xml_console.py:169
+#: gajim/gtk/single_message.py:274 gajim/gtk/xml_console.py:166
 msgid "Connection not available"
 msgstr "Connection not available"
 
@@ -9005,6 +9329,12 @@ msgstr "Connection not available"
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Please make sure you are connected with \"%s\"."
 
+#: gajim/gtk/single_message.py:306
+#, 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:330
 #, python-format
 msgid "RE: %s"
@@ -9015,28 +9345,28 @@ msgstr "RE: %s"
 msgid "%s wrote:\n"
 msgstr "%s wrote:\n"
 
-#: gajim/gtk/pep_config.py:44
+#: gajim/gtk/pep_config.py:45
 #, fuzzy, python-format
 msgid "PEP Service Configuration (%s)"
 msgstr "PEP Service Configuration"
 
-#: gajim/gtk/pep_config.py:77
+#: gajim/gtk/pep_config.py:78
 #, fuzzy
 msgid "Service"
 msgstr "Server"
 
-#: gajim/gtk/pep_config.py:114
+#: gajim/gtk/pep_config.py:115
 msgid "PEP node was not removed"
 msgstr "PEP node was not removed"
 
-#: gajim/gtk/pep_config.py:115
+#: gajim/gtk/pep_config.py:116
 #, fuzzy, python-format
 msgid ""
 "PEP node %(node)s was not removed:\n"
 "%(message)s"
 msgstr "PEP node %(node)s was not removed: %(message)s"
 
-#: gajim/gtk/pep_config.py:146
+#: gajim/gtk/pep_config.py:147
 #, fuzzy, python-format
 msgid "Configure %s"
 msgstr "_Configure"
@@ -9052,17 +9382,21 @@ msgstr "_Register"
 msgid "Registration successful"
 msgstr "Registration succeeded"
 
-#: gajim/gtk/dialogs.py:54 gajim/gtk/dataform.py:659 gajim/gtk/adhoc.py:85
+#: gajim/gtk/service_registration.py:215
+msgid "Registration failed"
+msgstr "Registration failed"
+
+#: gajim/gtk/dialogs.py:53 gajim/gtk/dataform.py:668 gajim/gtk/adhoc.py:86
 #, fuzzy
 msgid "Cancel"
 msgstr "_Cancel"
 
-#: gajim/gtk/dialogs.py:129
+#: gajim/gtk/dialogs.py:128
 #, fuzzy, python-format
 msgid "Dictionary for language \"%s\" not available"
 msgstr "Dictionary for lang %s not available"
 
-#: gajim/gtk/dialogs.py:130
+#: gajim/gtk/dialogs.py:129
 #, fuzzy, python-format
 msgid ""
 "You have to install the dictionary \"%s\" to use spellchecking, or choose "
@@ -9075,11 +9409,11 @@ msgstr ""
 "\n"
 "Highlighting misspelt words feature will not be used"
 
-#: gajim/gtk/dialogs.py:410 gajim/gtk/dialogs.py:425
+#: gajim/gtk/dialogs.py:322 gajim/gtk/dialogs.py:337
 msgid "Insecure connection"
 msgstr "Insecure connection"
 
-#: gajim/gtk/dialogs.py:411
+#: gajim/gtk/dialogs.py:323
 #, fuzzy, python-format
 msgid ""
 "You are about to connect to the account %(account)s (%(server)s) insecurely. "
@@ -9090,120 +9424,115 @@ 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/gtk/dialogs.py:416
+#: gajim/gtk/dialogs.py:328
 msgid "Yes, I really want to connect insecurely"
 msgstr "Yes, I really want to connect insecurely"
 
-#: gajim/gtk/dialogs.py:417
+#: gajim/gtk/dialogs.py:329
 msgid "Gajim will NOT connect unless you check this box"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:675
-#, fuzzy
-msgid "The nickname contains invalid characters."
-msgstr "The nickname has not allowed characters."
-
-#: gajim/gtk/dialogs.py:734
+#: gajim/gtk/dialogs.py:561
 #, fuzzy, python-format
 msgid "Destroy %s"
 msgstr "Destroying %s"
 
-#: gajim/gtk/dialogs.py:775
+#: gajim/gtk/dialogs.py:602
 #, fuzzy
 msgid "Certificate"
 msgstr "Self signed certificate"
 
-#: gajim/gtk/dialogs.py:786
+#: gajim/gtk/dialogs.py:613
 #, fuzzy, python-format
 msgid ""
 "Certificate for account\n"
 "%s"
 msgstr "for account %s"
 
-#: gajim/gtk/dialogs.py:824
+#: gajim/gtk/dialogs.py:651
 msgid "Issued to\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:825 gajim/gtk/dialogs.py:830
+#: gajim/gtk/dialogs.py:652 gajim/gtk/dialogs.py:657
 msgid "Common Name (CN): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:826 gajim/gtk/dialogs.py:831
+#: gajim/gtk/dialogs.py:653 gajim/gtk/dialogs.py:658
 msgid "Organization (O): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:827 gajim/gtk/dialogs.py:832
+#: gajim/gtk/dialogs.py:654 gajim/gtk/dialogs.py:659
 msgid "Organizational Unit (OU): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:828
+#: gajim/gtk/dialogs.py:655
 #, fuzzy
 msgid "Serial Number: "
 msgstr "GG Number:"
 
-#: gajim/gtk/dialogs.py:829
+#: gajim/gtk/dialogs.py:656
 msgid "Issued by\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:833
+#: gajim/gtk/dialogs.py:660
 msgid "Validity\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:834
+#: gajim/gtk/dialogs.py:661
 msgid "Issued on: "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:835
+#: gajim/gtk/dialogs.py:662
 msgid "Expires on: "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:836
+#: gajim/gtk/dialogs.py:663
 msgid "SHA-1:"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:838
+#: gajim/gtk/dialogs.py:665
 msgid "SHA-256:"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:852
+#: gajim/gtk/dialogs.py:679
 #, fuzzy
 msgid "View certificate…"
 msgstr "Self signed certificate"
 
-#: gajim/gtk/dialogs.py:864 gajim/gtk/accounts.py:893
+#: gajim/gtk/dialogs.py:691 gajim/gtk/accounts.py:896
 msgid "Change Password"
 msgstr "Change Password"
 
-#: gajim/gtk/dialogs.py:878
+#: gajim/gtk/dialogs.py:705
 msgid "_OK"
 msgstr "_OK"
 
-#: gajim/gtk/dialogs.py:891
+#: gajim/gtk/dialogs.py:718
 #, fuzzy
 msgid "You must enter a password"
 msgstr "You must enter a password."
 
-#: gajim/gtk/dialogs.py:895
+#: gajim/gtk/dialogs.py:722
 msgid "Passwords do not match"
 msgstr "Passwords do not match"
 
-#: gajim/gtk/dialogs.py:923
+#: gajim/gtk/dialogs.py:750
 #, fuzzy
 msgid "Group Chat Invitation "
 msgstr "Groupchat Invitation"
 
-#: gajim/gtk/dialogs.py:948
+#: gajim/gtk/dialogs.py:775
 #, fuzzy, python-format
 msgid "<b>%s</b> has invited you to join a discussion"
 msgstr "$Contact has invited you to join a discussion"
 
-#: gajim/gtk/dialogs.py:951
+#: gajim/gtk/dialogs.py:778
 #, 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:959
+#: gajim/gtk/dialogs.py:786
 #, python-format
 msgid "Comment: %s"
 msgstr "Comment: %s"
@@ -9218,11 +9547,6 @@ msgstr "GG Number:"
 msgid "ICQ Number"
 msgstr "ICQ Number:"
 
-#: gajim/gtk/add_contact.py:40
-#, fuzzy
-msgid "Add Contact"
-msgstr "_Add Contact..."
-
 #: gajim/gtk/add_contact.py:259
 #, fuzzy, python-format
 msgid "%s Missing"
@@ -9243,7 +9567,8 @@ msgid "The user ID must not contain a resource."
 msgstr "The user ID must not contain a resource."
 
 #: gajim/gtk/add_contact.py:299
-msgid "You cannot add yourself to your roster."
+#, fuzzy
+msgid "You cannot add yourself to your contact list."
 msgstr "You cannot add yourself to your roster."
 
 #: gajim/gtk/add_contact.py:304
@@ -9256,11 +9581,13 @@ msgid "Your account must be online to add new contacts."
 msgstr ""
 
 #: gajim/gtk/add_contact.py:321
-msgid "Contact already in roster"
+#, fuzzy
+msgid "Contact Already in Contact List"
 msgstr "Contact already in roster"
 
 #: gajim/gtk/add_contact.py:322
-msgid "This contact is already listed in your roster."
+#, fuzzy
+msgid "This contact is already in your contact list."
 msgstr "This contact is already listed in your roster."
 
 #: gajim/gtk/add_contact.py:379 gajim/gtk/add_contact.py:417
@@ -9301,14 +9628,14 @@ msgstr "Change status"
 
 #: gajim/gtk/themes.py:52
 #, fuzzy
-msgid "MUC Tab New Directed Message"
+msgid "Group Chat Tab New Directed Message"
 msgstr ""
 "MUC Directed\n"
 "Messages"
 
 #: gajim/gtk/themes.py:56
 #, fuzzy
-msgid "MUC Tab New Message"
+msgid "Group Chat Tab New Message"
 msgstr "New Message"
 
 #: gajim/gtk/themes.py:60
@@ -9525,13 +9852,13 @@ msgstr "All files"
 msgid "Clear File"
 msgstr "Cleaning"
 
-#: gajim/gtk/settings.py:570
+#: gajim/gtk/settings.py:570 gajim/gtk/proxies.py:32
 #, fuzzy
 msgid "Manage Proxies"
 msgstr "Manage Proxy Profiles"
 
-#: gajim/gtk/settings.py:591 gajim/gtk/preferences.py:971
-#: gajim/gtk/preferences.py:984 gajim/gtk/preferences.py:988
+#: gajim/gtk/settings.py:591 gajim/gtk/preferences.py:968
+#: gajim/gtk/preferences.py:982 gajim/gtk/preferences.py:986
 #, fuzzy
 msgid "No Proxy"
 msgstr "Proxy:"
@@ -9611,14 +9938,15 @@ msgid ""
 "        "
 msgstr ""
 
-#: gajim/gtk/about.py:47 data/org.gajim.Gajim.appdata.xml.in:10
+#: gajim/gtk/about.py:47 data/org.gajim.Gajim.desktop.in:6
+#: data/org.gajim.Gajim.appdata.xml.in:10
 #, fuzzy
-msgid "A GTK+ XMPP client"
+msgid "A GTK XMPP client"
 msgstr "A GTK+ Jabber client"
 
 #: gajim/gtk/about.py:48
 #, fuzzy, python-format
-msgid "GTK+ Version: %s"
+msgid "GTK Version: %s"
 msgstr "GTK+ Version:"
 
 #: gajim/gtk/about.py:49
@@ -9797,6 +10125,25 @@ msgstr "Paused"
 msgid "?transfer status:Not started"
 msgstr "Paused"
 
+#: gajim/gtk/groupchat_creation.py:97 gajim/gtk/groupchat_creation.py:99
+msgid " (optional)..."
+msgstr ""
+
+#: gajim/gtk/groupchat_creation.py:134
+#, fuzzy
+msgid "Invalid Address"
+msgstr "Invalid File"
+
+#: gajim/gtk/groupchat_creation.py:182
+#, fuzzy
+msgid "Not Connected"
+msgstr "Connected"
+
+#: gajim/gtk/groupchat_creation.py:183
+#, fuzzy
+msgid "You have to be connected to create a group chat."
+msgstr "You have not joined a groupchat."
+
 #: gajim/gtk/sounds.py:39
 msgid "Wav Sounds"
 msgstr "Wav Sounds"
@@ -9838,50 +10185,45 @@ msgstr "Group Chat Message Highlight"
 msgid "Group Chat Message Received"
 msgstr "Group Chat Message Received"
 
-#: gajim/gtk/dataform.py:226 gajim/gtk/dataform.py:262
+#: gajim/gtk/dataform.py:232 gajim/gtk/dataform.py:268
 #, fuzzy
 msgid "Required"
 msgstr "Password Required"
 
-#: gajim/gtk/dataform.py:286
+#: gajim/gtk/dataform.py:293
 msgid "Yes"
 msgstr ""
 
-#: gajim/gtk/dataform.py:286
+#: gajim/gtk/dataform.py:293
 #, fuzzy
 msgid "No"
 msgstr "None"
 
-#: gajim/gtk/dataform.py:661
+#: gajim/gtk/dataform.py:670
 msgid "Submit"
 msgstr ""
 
-#: gajim/gtk/statusicon.py:213
+#: gajim/gtk/statusicon.py:206
 #, fuzzy
 msgid "_Change Status Message…"
 msgstr "_Change Status Message"
 
-#: gajim/gtk/statusicon.py:247 gajim/gtk/statusicon.py:292
-#: gajim/gtk/statusicon.py:299
+#: gajim/gtk/statusicon.py:258
 #, python-format
 msgid "using account %s"
 msgstr "using account %s"
 
-#: gajim/gtk/statusicon.py:309
+#: gajim/gtk/statusicon.py:269
 #, fuzzy
-msgid "_Manage Bookmarks…"
-msgstr "Manage Bookmarks"
+msgid "Hide _Contact List"
+msgstr "Invite _Contacts"
 
-#: gajim/gtk/statusicon.py:325
+#: gajim/gtk/statusicon.py:273
 #, fuzzy
-msgid "Hide _Roster"
-msgstr "in _roster"
-
-#: gajim/gtk/statusicon.py:329
-msgid "Show _Roster"
-msgstr "Show _Roster"
+msgid "Show _Contact List"
+msgstr "Show Only _Active Contacts"
 
-#: gajim/gtk/statusicon.py:337
+#: gajim/gtk/statusicon.py:281
 msgid "Hide this menu"
 msgstr "Hide this menu"
 
@@ -9930,36 +10272,6 @@ msgstr ""
 "There was an error while publishing your personal information, try again "
 "later."
 
-#: gajim/gtk/join_groupchat.py:202
-#, fuzzy
-msgid "Invalid Room"
-msgstr "Invalid room"
-
-#: gajim/gtk/join_groupchat.py:203
-msgid "Please choose a room"
-msgstr ""
-
-#: gajim/gtk/join_groupchat.py:222 gajim/gtk/join_groupchat.py:229
-msgid "Invalid Nickname"
-msgstr "Invalid Nickname"
-
-#: gajim/gtk/join_groupchat.py:223
-#, fuzzy
-msgid "Please choose a nickname"
-msgstr "Please create a clean new theme with your desired name."
-
-#: gajim/gtk/join_groupchat.py:282 gajim/gtk/join_groupchat.py:288
-#: gajim/gtk/join_groupchat.py:293
-#, fuzzy
-msgid "Wrong server"
-msgstr "Wrong uri"
-
-#: gajim/gtk/join_groupchat.py:283 gajim/gtk/join_groupchat.py:289
-#: gajim/gtk/join_groupchat.py:294
-#, fuzzy, python-format
-msgid "%s is not a groupchat server"
-msgstr "This is not a group chat"
-
 #: gajim/gtk/mam_preferences.py:38
 #, python-format
 msgid "Archiving Preferences for %s"
@@ -9990,45 +10302,53 @@ msgstr "Error in received dataform"
 msgid "Archiving Preferences Error"
 msgstr "_Preferences"
 
-#: gajim/gtk/advanced_config.py:81
+#: gajim/gtk/advanced_config.py:95
 msgid "Activated"
 msgstr "Activated"
 
-#: gajim/gtk/advanced_config.py:81
+#: gajim/gtk/advanced_config.py:95
 msgid "Deactivated"
 msgstr "Deactivated"
 
-#: gajim/gtk/advanced_config.py:83
-msgid "Boolean"
-msgstr "Boolean"
+#: gajim/gtk/advanced_config.py:97
+msgid "?config type:Boolean"
+msgstr ""
 
-#: gajim/gtk/advanced_config.py:84
-msgid "Integer"
-msgstr "Integer"
+#: gajim/gtk/advanced_config.py:98
+msgid "?config type:Integer"
+msgstr ""
 
-#: gajim/gtk/advanced_config.py:85
-msgid "Text"
-msgstr "Text"
+#: gajim/gtk/advanced_config.py:99
+msgid "?config type:Text"
+msgstr ""
 
-#: gajim/gtk/advanced_config.py:97
-msgid "Preference Name"
+#: gajim/gtk/advanced_config.py:100
+msgid "?config type:Color"
+msgstr ""
+
+#: gajim/gtk/advanced_config.py:112
+#, fuzzy
+msgid "?config:Preference Name"
 msgstr "Preference Name"
 
-#: gajim/gtk/advanced_config.py:104
-msgid "Value"
-msgstr "Value"
+#: gajim/gtk/advanced_config.py:123
+#, fuzzy
+msgid "?config:Value"
+msgstr "_Configure"
 
-#: gajim/gtk/advanced_config.py:113
-msgid "Type"
-msgstr "Type"
+#: gajim/gtk/advanced_config.py:132
+msgid "?config:Type"
+msgstr ""
 
-#: gajim/gtk/advanced_config.py:168
-msgid "(None)"
-msgstr "(None)"
+#: gajim/gtk/advanced_config.py:187
+#, fuzzy
+msgid "?config description:None"
+msgstr "None"
 
-#: gajim/gtk/advanced_config.py:299
-msgid "Hidden"
-msgstr "Hidden"
+#: gajim/gtk/advanced_config.py:322
+#, fuzzy
+msgid "?password:Hidden"
+msgstr "Password:"
 
 #: gajim/gtk/server_info.py:66
 #, fuzzy
@@ -10040,8 +10360,8 @@ msgstr "_Copy Link Location"
 msgid "%(days)s days, %(hours)s hours"
 msgstr ""
 
-#: gajim/gtk/server_info.py:218 gajim/gtk/accounts.py:749
-#: gajim/gtk/accounts.py:853
+#: gajim/gtk/server_info.py:218 gajim/gtk/accounts.py:752
+#: gajim/gtk/accounts.py:856
 #, fuzzy
 msgid "Hostname"
 msgstr "_Hostname:"
@@ -10228,11 +10548,6 @@ 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_config.py:41
-#, fuzzy
-msgid "Group Chat Configuration"
-msgstr "Groupchat Invitation"
-
 #: gajim/gtk/groupchat_config.py:134
 #, fuzzy
 msgid "A Group Chat needs at least one Owner"
@@ -10243,69 +10558,69 @@ msgid "You are not allowed to modify the affiliation of Admins and Owners"
 msgstr ""
 
 #: gajim/gtk/groupchat_config.py:399
-msgid "An entry with this Jabber-ID already exists"
+msgid "An entry with this XMPP Address already exists"
 msgstr ""
 
-#: gajim/gtk/adhoc.py:91
+#: gajim/gtk/adhoc.py:92
 #, fuzzy
 msgid "Finish"
 msgstr "_Finish"
 
-#: gajim/gtk/adhoc.py:97 gajim/gtk/adhoc.py:283
+#: gajim/gtk/adhoc.py:98 gajim/gtk/adhoc.py:284
 #, fuzzy
 msgid "Commands"
 msgstr "Commands: %s"
 
-#: gajim/gtk/adhoc.py:103
+#: gajim/gtk/adhoc.py:104
 msgid "Next"
 msgstr ""
 
-#: gajim/gtk/adhoc.py:109
+#: gajim/gtk/adhoc.py:110
 #, fuzzy
 msgid "Previous"
 msgstr "Envious"
 
-#: gajim/gtk/adhoc.py:115
+#: gajim/gtk/adhoc.py:116
 #, fuzzy
 msgid "Execute"
 msgstr "_Execute Command"
 
-#: gajim/gtk/adhoc.py:195
+#: gajim/gtk/adhoc.py:196
 #, fuzzy
 msgid "No commands available"
 msgstr "No account available"
 
-#: gajim/gtk/adhoc.py:244
+#: gajim/gtk/adhoc.py:245
 #, fuzzy
 msgid "Request Command List"
 msgstr "_Execute Command"
 
-#: gajim/gtk/adhoc.py:259
+#: gajim/gtk/adhoc.py:260
 #, fuzzy
 msgid "Executing…"
 msgstr "_Execute Command"
 
-#: gajim/gtk/adhoc.py:266
+#: gajim/gtk/adhoc.py:267
 #, fuzzy
 msgid "Command List"
 msgstr "Commands: %s"
 
-#: gajim/gtk/adhoc.py:384
+#: gajim/gtk/adhoc.py:385
 #, fuzzy
 msgid "Finished"
 msgstr "_Finish"
 
-#: gajim/gtk/adhoc.py:453
+#: gajim/gtk/adhoc.py:454
 #, fuzzy
 msgid "Execution failed"
 msgstr "Connection Failed"
 
-#: gajim/gtk/blocking.py:37
+#: gajim/gtk/blocking.py:38
 #, fuzzy, python-format
 msgid "Blocking List for %s"
 msgstr "Privacy List for %s"
 
-#: gajim/gtk/blocking.py:71
+#: gajim/gtk/blocking.py:72
 #, fuzzy
 msgid "Error!"
 msgstr "Error"
@@ -10355,8 +10670,7 @@ msgstr "Invalid username"
 msgid "You must provide a username to configure this account."
 msgstr "You must provide a username to configure this account."
 
-#: gajim/gtk/account_wizard.py:252 gajim/gtk/bookmarks.py:290
-#: gajim/gtk/bookmarks.py:303
+#: gajim/gtk/account_wizard.py:252
 msgid "Invalid server"
 msgstr "Invalid server"
 
@@ -10372,7 +10686,7 @@ msgstr "Invalid entry"
 msgid "Custom port must be a port number."
 msgstr "Custom port must be a port number."
 
-#: gajim/gtk/account_wizard.py:405
+#: gajim/gtk/account_wizard.py:406
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -10387,15 +10701,15 @@ msgstr ""
 "SSL Error: %(error)s\n"
 "Do you still want to connect to this server?"
 
-#: gajim/gtk/account_wizard.py:446 gajim/gtk/account_wizard.py:480
+#: gajim/gtk/account_wizard.py:447 gajim/gtk/account_wizard.py:481
 msgid "An error occurred during account creation"
 msgstr "An error occurred during account creation"
 
-#: gajim/gtk/account_wizard.py:545
+#: gajim/gtk/account_wizard.py:546
 msgid "Account name is in use"
 msgstr "Account name is in use"
 
-#: gajim/gtk/account_wizard.py:546
+#: gajim/gtk/account_wizard.py:547
 msgid "You already have an account using this name."
 msgstr "You already have an account using this name."
 
@@ -10422,26 +10736,26 @@ msgstr "File transfer of %(filename)s from %(name)s stopped."
 msgid "%(minutes)s min %(seconds)s sec"
 msgstr ""
 
-#: gajim/gtk/xml_console.py:77
+#: gajim/gtk/xml_console.py:74
 #, fuzzy
 msgid "Filter"
 msgstr "Filter:"
 
-#: gajim/gtk/xml_console.py:82
+#: gajim/gtk/xml_console.py:79
 #, fuzzy
 msgid "XML Input"
 msgstr "<b>XML Input</b>"
 
-#: gajim/gtk/xml_console.py:86
+#: gajim/gtk/xml_console.py:83
 msgid "Paste Last Input"
 msgstr ""
 
-#: gajim/gtk/xml_console.py:170
+#: gajim/gtk/xml_console.py:167
 #, fuzzy, python-format
 msgid "Please make sure you are connected with '%s'."
 msgstr "Please make sure you are connected with \"%s\"."
 
-#: gajim/gtk/xml_console.py:182
+#: gajim/gtk/xml_console.py:177
 #, fuzzy
 msgid "Invalid Node"
 msgstr "Invalid File"
@@ -10474,37 +10788,52 @@ msgstr "Search"
 msgid "No results found"
 msgstr "No result"
 
-#: gajim/gtk/preferences.py:358 gajim/gtk/preferences.py:362
+#: gajim/gtk/preferences.py:357 gajim/gtk/preferences.py:361
 msgid "Default"
 msgstr "Default"
 
-#: gajim/gtk/preferences.py:801
+#: gajim/gtk/preferences.py:798
 msgid "status message title"
 msgstr "status message title"
 
-#: gajim/gtk/preferences.py:802
+#: gajim/gtk/preferences.py:799
 msgid "status message text"
 msgstr "status message text"
 
+#: gajim/gtk/accounts.py:137
+#, fuzzy
+msgid "Re-Login"
+msgstr "Relogin now?"
+
 #: gajim/gtk/accounts.py:138
-msgid "Relogin now?"
+#, fuzzy
+msgid "Re-Login now?"
 msgstr "Relogin now?"
 
 #: gajim/gtk/accounts.py:139
-msgid "If you want all the changes to apply instantly, you must relogin."
+#, 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:191 gajim/gtk/accounts.py:975
+#: gajim/gtk/accounts.py:141
+msgid "_Later"
+msgstr ""
+
+#: gajim/gtk/accounts.py:143
+msgid "_Re-Login"
+msgstr ""
+
+#: gajim/gtk/accounts.py:194 gajim/gtk/accounts.py:978
 #, fuzzy
 msgid "Remove Account"
 msgstr "Removing %s account"
 
-#: gajim/gtk/accounts.py:192
+#: gajim/gtk/accounts.py:195
 #, fuzzy, python-format
 msgid "You still have open chats in your account %s"
 msgstr "You have opened chat in account %s"
 
-#: gajim/gtk/accounts.py:193
+#: gajim/gtk/accounts.py:196
 #, fuzzy
 msgid ""
 "All chat and group chat windows will be closed.\n"
@@ -10512,117 +10841,117 @@ msgid ""
 msgstr ""
 "All chat and groupchat windows will be closed. Do you want to continue?"
 
-#: gajim/gtk/accounts.py:424
+#: gajim/gtk/accounts.py:427
 #, fuzzy
 msgid "Back"
 msgstr "Back soon"
 
-#: gajim/gtk/accounts.py:530
+#: gajim/gtk/accounts.py:533
 #, fuzzy
 msgid "Please check if Bonjour is installed."
 msgstr "Please check if Avahi or Bonjour is installed."
 
-#: gajim/gtk/accounts.py:532
+#: gajim/gtk/accounts.py:535
 #, fuzzy
 msgid "Please check if Avahi is installed."
 msgstr "Please check if Avahi or Bonjour is installed."
 
-#: gajim/gtk/accounts.py:569
+#: gajim/gtk/accounts.py:572
 #, fuzzy
 msgid "Disable Account"
 msgstr "Invalid Account"
 
-#: gajim/gtk/accounts.py:570
+#: gajim/gtk/accounts.py:573
 #, fuzzy, python-format
 msgid "Account %s is still connected"
 msgstr "Account \"%s\" is connected to the server"
 
-#: gajim/gtk/accounts.py:571
+#: gajim/gtk/accounts.py:574
 #, fuzzy
 msgid ""
 "All chat and group chat windows will be closed. Do you want to continue?"
 msgstr ""
 "All chat and groupchat windows will be closed. Do you want to continue?"
 
-#: gajim/gtk/accounts.py:576
+#: gajim/gtk/accounts.py:579
 #, fuzzy
 msgid "_Disable Account"
 msgstr "Invalid Account"
 
-#: gajim/gtk/accounts.py:595
+#: gajim/gtk/accounts.py:598
 #, fuzzy
 msgid "Add Account"
 msgstr "_Add Contact..."
 
-#: gajim/gtk/accounts.py:663
+#: gajim/gtk/accounts.py:666
 msgid "Label"
 msgstr ""
 
-#: gajim/gtk/accounts.py:667
+#: gajim/gtk/accounts.py:670
 msgid "Login"
 msgstr ""
 
-#: gajim/gtk/accounts.py:670
+#: gajim/gtk/accounts.py:673
 #, fuzzy
 msgid "Import Contacts"
 msgstr "Invite _Contacts"
 
-#: gajim/gtk/accounts.py:674 gajim/gtk/accounts.py:870
+#: gajim/gtk/accounts.py:677 gajim/gtk/accounts.py:873
 #, fuzzy
 msgid "Client Certificate"
 msgstr "Self signed certificate"
 
-#: gajim/gtk/accounts.py:677 gajim/gtk/accounts.py:774
+#: gajim/gtk/accounts.py:680 gajim/gtk/accounts.py:777
 #, fuzzy
 msgid "Connect on startup"
 msgstr "C_onnect on Gajim startup"
 
-#: gajim/gtk/accounts.py:681 gajim/gtk/accounts.py:779
+#: gajim/gtk/accounts.py:684 gajim/gtk/accounts.py:782
 #, fuzzy
 msgid "Save conversations for all contacts"
 msgstr "Save conversation _logs for all contacts"
 
-#: gajim/gtk/accounts.py:683 gajim/gtk/accounts.py:781
+#: gajim/gtk/accounts.py:686 gajim/gtk/accounts.py:784
 msgid "Store conversations on the harddrive"
 msgstr ""
 
-#: gajim/gtk/accounts.py:685 gajim/gtk/accounts.py:783
+#: gajim/gtk/accounts.py:688 gajim/gtk/accounts.py:786
 #, fuzzy
 msgid "Global Status"
 msgstr "All statuses"
 
-#: gajim/gtk/accounts.py:687
+#: gajim/gtk/accounts.py:690
 #, fuzzy
 msgid "Synchronise the status of all accounts"
 msgstr "Changes the status of account or accounts"
 
-#: gajim/gtk/accounts.py:689
+#: gajim/gtk/accounts.py:692
 msgid "Use file transfer proxies"
 msgstr "Use file transfer proxies"
 
-#: gajim/gtk/accounts.py:705
+#: gajim/gtk/accounts.py:708
 #, fuzzy
 msgid "Idle Time"
 msgstr "Idle since:"
 
-#: gajim/gtk/accounts.py:707
+#: gajim/gtk/accounts.py:710
 msgid "Disclose the time of your last activity"
 msgstr ""
 
-#: gajim/gtk/accounts.py:709
+#: gajim/gtk/accounts.py:712
 msgid "Local System Time"
 msgstr ""
 
-#: gajim/gtk/accounts.py:711
+#: gajim/gtk/accounts.py:714
 msgid "Disclose the local system time of the device Gajim runs on"
 msgstr ""
 
-#: gajim/gtk/accounts.py:714
+#: gajim/gtk/accounts.py:717
 #, fuzzy
 msgid "Client / Operating System"
 msgstr "Self signed certificate"
 
-#: gajim/gtk/accounts.py:716
+#: gajim/gtk/accounts.py:719
 #, fuzzy
 msgid ""
 "Disclose informations about the client and operating system you currently use"
@@ -10630,153 +10959,148 @@ msgstr ""
 "If ticked, Gajim will allow others to detect the operation system you are "
 "using"
 
-#: gajim/gtk/accounts.py:719
+#: gajim/gtk/accounts.py:722
 #, fuzzy
 msgid "Ignore Unknown Contacts"
 msgstr "Invite _Contacts"
 
-#: gajim/gtk/accounts.py:721
+#: gajim/gtk/accounts.py:724
 #, fuzzy
 msgid "Ignore everything from contacts not in your Roster"
 msgstr "_Ignore events from contacts not in the roster"
 
-#: gajim/gtk/accounts.py:737 gajim/gtk/accounts.py:776
+#: gajim/gtk/accounts.py:740 gajim/gtk/accounts.py:779
 #, fuzzy
 msgid "Use environment variable"
 msgstr "_use HTTP__PROXY environment variable"
 
-#: gajim/gtk/accounts.py:739
-#, fuzzy
-msgid "Proxy"
-msgstr "Proxy:"
-
-#: gajim/gtk/accounts.py:742
+#: gajim/gtk/accounts.py:745
 #, fuzzy
 msgid "Warn on insecure connection"
 msgstr "_Warn before using an insecure connection"
 
-#: gajim/gtk/accounts.py:746
+#: gajim/gtk/accounts.py:749
 msgid "Send keep-alive packets"
 msgstr "Send keep-alive packets"
 
-#: gajim/gtk/accounts.py:750
+#: gajim/gtk/accounts.py:753
 msgid "Manually set the hostname for the server"
 msgstr ""
 
-#: gajim/gtk/accounts.py:756 gajim/gtk/accounts.py:826
-#: gajim/gtk/accounts.py:831
+#: gajim/gtk/accounts.py:759 gajim/gtk/accounts.py:829
+#: gajim/gtk/accounts.py:834
 #, fuzzy
 msgid "Priority"
 msgstr "Priori_ty:"
 
-#: gajim/gtk/accounts.py:785
+#: gajim/gtk/accounts.py:788
 #, fuzzy
 msgid "Synchronize the status of all accounts"
 msgstr "Changes the status of account or accounts"
 
-#: gajim/gtk/accounts.py:795
+#: gajim/gtk/accounts.py:798
 #, fuzzy
 msgid "First Name"
 msgstr "First Name:"
 
-#: gajim/gtk/accounts.py:798
+#: gajim/gtk/accounts.py:801
 #, fuzzy
 msgid "Last Name"
 msgstr "Surname:"
 
-#: gajim/gtk/accounts.py:804
+#: gajim/gtk/accounts.py:807
 #, fuzzy
 msgid "Email"
 msgstr "New E-mail"
 
-#: gajim/gtk/accounts.py:822
+#: gajim/gtk/accounts.py:825
 #, fuzzy
 msgid "Adjust to status"
 msgstr "_Adjust to status"
 
-#: gajim/gtk/accounts.py:849
+#: gajim/gtk/accounts.py:852
 msgid "Enable"
 msgstr "Enable"
 
-#: gajim/gtk/accounts.py:857
+#: gajim/gtk/accounts.py:860
 #, fuzzy
 msgid "Port"
 msgstr "_Port:"
 
-#: gajim/gtk/accounts.py:862
+#: gajim/gtk/accounts.py:865
 #, fuzzy
 msgid "Connection Settings"
 msgstr "Connection"
 
-#: gajim/gtk/accounts.py:872
+#: gajim/gtk/accounts.py:875
 msgid "PKCS12 Files"
 msgstr ""
 
-#: gajim/gtk/accounts.py:874
+#: gajim/gtk/accounts.py:877
 #, fuzzy
 msgid "Encrypted Certificate"
 msgstr "Self signed certificate"
 
-#: gajim/gtk/accounts.py:878
+#: gajim/gtk/accounts.py:881
 #, fuzzy
 msgid "Certificate Settings"
 msgstr "Self signed certificate"
 
-#: gajim/gtk/accounts.py:890
+#: gajim/gtk/accounts.py:893
 #, fuzzy
 msgid "Save Password"
 msgstr "Save password"
 
-#: gajim/gtk/accounts.py:898
+#: gajim/gtk/accounts.py:901
 #, fuzzy
 msgid "Login Settings"
 msgstr "Registration failed"
 
-#: gajim/gtk/accounts.py:931
+#: gajim/gtk/accounts.py:934
 #, fuzzy, python-format
 msgid "Removing account %s"
 msgstr "Removing %s account"
 
-#: gajim/gtk/accounts.py:946
+#: gajim/gtk/accounts.py:949
 #, fuzzy
 msgid "Account is disabled"
 msgstr "Emoticons disabled"
 
-#: gajim/gtk/accounts.py:947
+#: gajim/gtk/accounts.py:950
 #, fuzzy
 msgid "To unregister from a server, the account must be enabled."
 msgstr "To disable the account, you must be disconnected."
 
-#: gajim/gtk/accounts.py:962
+#: gajim/gtk/accounts.py:965
 #, fuzzy
 msgid "Password required"
 msgstr "Password Required"
 
-#: gajim/gtk/accounts.py:976
+#: gajim/gtk/accounts.py:979
 #, fuzzy, python-format
 msgid "Account '%s' is still connected to the server"
 msgstr "Account \"%s\" is connected to the server"
 
-#: gajim/gtk/accounts.py:978
+#: gajim/gtk/accounts.py:981
 msgid "If you remove it, the connection will be lost."
 msgstr "If you remove it, the connection will be lost."
 
-#: gajim/gtk/accounts.py:995
+#: gajim/gtk/accounts.py:998
 #, fuzzy, python-format
 msgid "Connection to server %s failed"
 msgstr "Connection to proxy failed"
 
-#: gajim/gtk/accounts.py:996
+#: gajim/gtk/accounts.py:999
 #, fuzzy
 msgid "What would you like to do?"
 msgstr "What do you want to do?"
 
-#: gajim/gtk/accounts.py:997
+#: gajim/gtk/accounts.py:1000
 #, fuzzy
 msgid "Remove only from Gajim"
 msgstr "Remove account _only from Gajim"
 
-#: gajim/gtk/accounts.py:998
+#: gajim/gtk/accounts.py:1001
 msgid "Don't remove anything. I'll try again later"
 msgstr ""
 
@@ -10799,6 +11123,10 @@ msgstr "<b>%s</b> would like you to <b>%s</b> some contacts in your roster."
 msgid "Modify"
 msgstr "Modify"
 
+#: gajim/gtk/roster_item_exchange.py:80
+msgid "JID"
+msgstr "JID"
+
 #: gajim/gtk/roster_item_exchange.py:86
 msgid "Groups"
 msgstr "Groups"
@@ -10822,19 +11150,19 @@ msgid_plural "Removed %d contacts"
 msgstr[0] "Removes contact from roster"
 msgstr[1] "Removes contact from roster"
 
-#: gajim/gtk/util.py:581
+#: gajim/gtk/util.py:583
 msgid "Unknown Artist"
 msgstr "Unknown Artist"
 
-#: gajim/gtk/util.py:582
+#: gajim/gtk/util.py:584
 msgid "Unknown Title"
 msgstr "Unknown Title"
 
-#: gajim/gtk/util.py:583
+#: gajim/gtk/util.py:585
 msgid "Unknown Source"
 msgstr "Unknown Source"
 
-#: gajim/gtk/util.py:585
+#: gajim/gtk/util.py:587
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
@@ -10843,28 +11171,10 @@ msgstr ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
 "from <i>%(source)s</i>"
 
-#: gajim/gtk/bookmarks.py:121
-msgid "New Group Chat"
-msgstr "New Group Chat"
-
-#: gajim/gtk/bookmarks.py:161
-msgid "This bookmark has invalid data"
-msgstr "This bookmark has invalid data"
-
-#: gajim/gtk/bookmarks.py:162
-msgid ""
-"Please be sure to fill out server and room fields or remove this bookmark."
-msgstr ""
-"Please be sure to fill out server and room fields or remove this bookmark."
-
-#: gajim/gtk/bookmarks.py:273 gajim/gtk/bookmarks.py:291
-#: gajim/gtk/bookmarks.py:304 gajim/gtk/bookmarks.py:335
-msgid "Character not allowed"
-msgstr "Character not allowed"
-
-#: gajim/gtk/bookmarks.py:334
-msgid "Invalid room"
-msgstr "Invalid room"
+#: gajim/gtk/bookmarks.py:47
+#, fuzzy, python-format
+msgid "Bookmarks for %s"
+msgstr "_Bookmark"
 
 #: gajim/plugins/pluginmanager.py:736 gajim/plugins/pluginmanager.py:742
 msgid "Archive corrupted"
@@ -10876,51 +11186,54 @@ msgid "Archive empty"
 msgstr "File is empty"
 
 #: gajim/plugins/pluginmanager.py:750 gajim/plugins/pluginmanager.py:758
-#: gajim/plugins/gui.py:257
+#: gajim/plugins/gui.py:258
 #, fuzzy
 msgid "Archive is malformed"
 msgstr "Service sent malformed data"
 
-#: gajim/plugins/pluginmanager.py:766 gajim/plugins/gui.py:281
-#: gajim/plugins/gui.py:289
+#: gajim/plugins/pluginmanager.py:766 gajim/plugins/gui.py:288
+#: gajim/plugins/gui.py:301
 #, fuzzy
 msgid "Plugin already exists"
 msgstr "This file already exists"
 
-#: gajim/plugins/gui.py:82
+#: gajim/plugins/gui.py:83
 msgid "Click to view Gajim's wiki page on how to install plugins in Flatpak."
 msgstr ""
 
-#: gajim/plugins/gui.py:89
+#: gajim/plugins/gui.py:90
 msgid "Plugin"
 msgstr ""
 
-#: gajim/plugins/gui.py:151
+#: gajim/plugins/gui.py:152
 #, fuzzy, python-format
 msgid "Warning: %s"
 msgstr "Banning %s"
 
-#: gajim/plugins/gui.py:206
+#: gajim/plugins/gui.py:207
 #, fuzzy
 msgid "Plugin failed"
 msgstr "Registration failed"
 
-#: gajim/plugins/gui.py:245
+#: gajim/plugins/gui.py:246
 msgid "Unable to properly remove the plugin"
 msgstr ""
 
-#: gajim/plugins/gui.py:281
-msgid "Overwrite?"
-msgstr ""
+#: gajim/plugins/gui.py:287
+#, fuzzy
+msgid "Overwrite Plugin?"
+msgstr "Overwrite Status Message?"
+
+#: gajim/plugins/gui.py:289
+#, fuzzy
+msgid "Do you want to overwrite the currently installed version?"
+msgstr "Do you want to accept the invitation?"
 
 #: data/org.gajim.Gajim.desktop.in:5
-msgid "Jabber IM Client"
+#, fuzzy
+msgid "XMPP IM Client"
 msgstr "Jabber IM Client"
 
-#: data/org.gajim.Gajim.desktop.in:6
-msgid "A GTK+ Jabber client"
-msgstr "A GTK+ Jabber client"
-
 #: data/org.gajim.Gajim.desktop.in:8
 msgid "chat;messaging;im;xmpp;bonjour;voip;"
 msgstr ""
@@ -10972,7 +11285,7 @@ msgid "Easily send pictures, videos or other files to friends and groups"
 msgstr ""
 
 #: data/org.gajim.Gajim.appdata.xml.in:27
-msgid "Chat securely with End-to-End encryption via OMEMO or PGP"
+msgid "Chat securely with End-to-End encryption via OMEMO or OpenPGP"
 msgstr ""
 
 #: data/org.gajim.Gajim.appdata.xml.in:28
@@ -11034,7 +11347,7 @@ msgstr ""
 
 #: data/org.gajim.Gajim.appdata.xml.in:52
 #, fuzzy
-msgid "Roster, list of contacts"
+msgid "Contact list, list of contacts"
 msgstr "_Log status changes of contacts"
 
 #: data/org.gajim.Gajim.appdata.xml.in:56
@@ -11056,6 +11369,521 @@ msgstr "Recently:"
 msgid "Plugin manager"
 msgstr "Registration failed"
 
+#, fuzzy
+#~ msgid "Configure Services…"
+#~ msgstr "Configure Services..."
+
+#, fuzzy
+#~ msgid "Group Chat Bookmarks"
+#~ msgstr "Group Chat"
+
+#, fuzzy
+#~ msgid "Add Bookmark"
+#~ msgstr "_Bookmark"
+
+#, fuzzy
+#~ msgid "Remove Bookmark"
+#~ msgstr "_Bookmark"
+
+#, fuzzy
+#~ msgid "Bookmark Name"
+#~ msgstr "Bookmark this room"
+
+#, fuzzy
+#~ msgid "_Server"
+#~ msgstr "_Server:"
+
+#, fuzzy
+#~ msgid "_Password"
+#~ msgstr "_Password:"
+
+#, fuzzy
+#~ msgid "Join chat when connected"
+#~ msgstr "Contact Disconnected"
+
+#~ msgid "New Group Chat"
+#~ msgstr "New Group Chat"
+
+#~ msgid "This bookmark has invalid data"
+#~ msgstr "This bookmark has invalid data"
+
+#, fuzzy
+#~ msgid ""
+#~ "Please be sure to fill out server and group chat fields or remove this "
+#~ "bookmark."
+#~ msgstr ""
+#~ "Please be sure to fill out server and room fields or remove this bookmark."
+
+#~ msgid "Character not allowed"
+#~ msgstr "Character not allowed"
+
+#, fuzzy
+#~ msgid "Invalid Group Chat"
+#~ msgstr "Invalid group chat Jabber ID"
+
+#~ msgid "Unable to join group chat"
+#~ msgstr "Unable to join group chat"
+
+#, fuzzy
+#~ msgid "You are banned from group chat <b>%s</b>."
+#~ msgstr "You are banned from group chat %s."
+
+#, fuzzy
+#~ msgid "Remote server <b>%s</b> does not exist."
+#~ msgstr "Group chat %s does not exist."
+
+#, fuzzy
+#~ msgid "Group chat <b>%s</b> does not exist."
+#~ msgstr "Group chat %s does not exist."
+
+#, fuzzy
+#~ msgid "Group chat creation is not permitted."
+#~ msgstr "Group chat creation is restricted."
+
+#, fuzzy
+#~ msgid "You must use your registered nickname in <b>%s</b>."
+#~ msgstr "Your registered nickname must be used in group chat %s."
+
+#, fuzzy
+#~ msgid "You are not in the members list in group chat %s."
+#~ msgstr "You are not in the members list in groupchat %s."
+
+#, fuzzy
+#~ msgid "XMPP Address is not a group chat"
+#~ msgstr "This is not a group chat"
+
+#~ msgid "This is not a group chat"
+#~ msgstr "This is not a group chat"
+
+#, fuzzy
+#~ msgid "Please choose a group chat"
+#~ msgstr "Please create a clean new theme with your desired name."
+
+#~ msgid "Invalid Nickname"
+#~ msgstr "Invalid Nickname"
+
+#, fuzzy
+#~ msgid "Please choose a nickname"
+#~ msgstr "Please create a clean new theme with your desired name."
+
+#, fuzzy
+#~ msgid "Wrong server"
+#~ msgstr "Wrong uri"
+
+#, fuzzy
+#~ msgid "%s is not a group chat server"
+#~ msgstr "This is not a group chat"
+
+#, fuzzy
+#~ msgid ""
+#~ "How many lines to request from server when entering a group chat. -1 "
+#~ "means no limit."
+#~ msgstr "How many lines to request to server when entering a groupchat."
+
+#, fuzzy
+#~ msgid ""
+#~ "Minutes of backlog to request when entering a group chat. -1 means no "
+#~ "limit."
+#~ msgstr "How many minutes back to request logs when a entering a groupchat."
+
+#, fuzzy
+#~ msgid ""
+#~ "How many lines to request from server when entering a group chat. -1 "
+#~ "means no limit, -2 means global value."
+#~ msgstr "How many lines to request to server when entering a groupchat."
+
+#, fuzzy
+#~ msgid ""
+#~ "Minutes of backlog to request when entering a group chat. -1 means no "
+#~ "limit, -2 means global value."
+#~ msgstr "How many minutes back to request logs when a entering a groupchat."
+
+#, fuzzy
+#~ msgid "A Password is required to join the group chat %s. Please type it."
+#~ msgstr "A Password is required to join the room %s. Please type it."
+
+#~ msgid "Not in Roster"
+#~ msgstr "Not in Roster"
+
+#~ msgid "I would like to add you to my roster"
+#~ msgstr "I would like to add you to my roster"
+
+#, fuzzy
+#~ msgid "Add to Roster"
+#~ msgstr "_Add to Roster"
+
+#, fuzzy
+#~ msgid "Manage Room"
+#~ msgstr "_Manage Room"
+
+#, fuzzy
+#~ msgid "Configure Room"
+#~ msgstr "Configure _Room..."
+
+#, fuzzy
+#~ msgid "Destroy Room"
+#~ msgstr "_Destroy Room"
+
+#, fuzzy
+#~ msgid "Change Nick"
+#~ msgstr "Change _Nickname..."
+
+#, fuzzy
+#~ msgid "Disconnect"
+#~ msgstr "_Disconnect"
+
+#, fuzzy
+#~ msgid "Copy JID"
+#~ msgstr "Room JID"
+
+#, fuzzy
+#~ msgid "Add to Roster…"
+#~ msgstr "_Add to Roster"
+
+#, fuzzy
+#~ msgid "Copy JID/Email"
+#~ msgstr "_Copy JID/E-mail Address"
+
+#, fuzzy
+#~ msgid "JID: <i>%s</i>"
+#~ msgstr "Jabber ID: <i>%s</i>"
+
+#~ msgid "Changing Subject"
+#~ msgstr "Changing Subject"
+
+#~ msgid "Please specify the new subject:"
+#~ msgstr "Please specify the new subject:"
+
+#~ msgid "Room logging is now enabled"
+#~ msgstr "Room logging is now enabled"
+
+#~ msgid "Room logging is now disabled"
+#~ msgstr "Room logging is now disabled"
+
+#, fuzzy
+#~ msgid "You (%s) joined the room"
+#~ msgstr "%s has joined the group chat"
+
+#~ msgid "Room logging is enabled"
+#~ msgstr "Room logging is enabled"
+
+#, fuzzy
+#~ msgid "Unable to join groupchat"
+#~ msgstr "Unable to join group chat"
+
+#~ msgid "Groupchat Invitation"
+#~ msgstr "Groupchat Invitation"
+
+#, fuzzy
+#~ msgid "%(jid)s has been invited in this room"
+#~ msgstr "%(nick)s has been removed from the room (%(reason)s)"
+
+#, fuzzy
+#~ msgid "JID is not a Groupchat"
+#~ msgstr "This is not a group chat"
+
+#~ msgid "Invalid JID"
+#~ msgstr "Invalid JID"
+
+#~ msgid "A connection is not available"
+#~ msgstr "A connection is not available"
+
+#, fuzzy
+#~ msgid "JID already in list"
+#~ msgstr "Jabber ID already in list"
+
+#, fuzzy
+#~ msgid "For the chosen encryption there is no encryption method available"
+#~ msgstr "A connection is not available"
+
+#~ msgid "Removes contact from roster"
+#~ msgstr "Removes contact from roster"
+
+#~ msgid "Not in roster"
+#~ msgstr "Not in roster"
+
+#, fuzzy
+#~ msgid "Contact signed in notification color."
+#~ msgstr "_Show event in roster"
+
+#, fuzzy
+#~ msgid "Contact signout notification color"
+#~ msgstr "_Show event in roster"
+
+#, fuzzy
+#~ msgid "File transfer request notification color."
+#~ msgstr "File Transfer Request"
+
+#, fuzzy
+#~ msgid "File transfer error notification color."
+#~ msgstr "File transfer cancelled"
+
+#, fuzzy
+#~ msgid "File transfer complete or stopped notification color."
+#~ msgstr "Show a pop-up notification when a file transfer is complete "
+
+#, fuzzy
+#~ msgid "Groupchat invitation notification color"
+#~ msgstr "Groupchat Invitation"
+
+#~ msgid "Add * and [n] in roster title?"
+#~ msgstr "Add * and [n] in roster title?"
+
+#~ msgid "Hides the banner in two persons chat window"
+#~ msgstr "Hides the banner in two persons chat window"
+
+#, fuzzy
+#~ msgid ""
+#~ "Show the confirm metacontacts creation dialog or not? Empty string means "
+#~ "never show the dialog."
+#~ msgstr ""
+#~ "Should we show the confirm metacontacts creation dialogue or not? Empty "
+#~ "string means we never show the dialogue."
+
+#~ msgid "Space separated list of ssl errors to ignore."
+#~ msgstr "Space separated list of SSL errors to ignore."
+
+#~ msgid "Answer to receipt requests"
+#~ msgstr "Answer to receipt requests"
+
+#~ msgid "Sent receipt requests"
+#~ msgstr "Sent receipt requests"
+
+#, fuzzy
+#~ msgid "Language for which misspelled words will be checked"
+#~ msgstr "Language for which we want to check misspelt words"
+
+#~ msgid "I'm eating, so leave me a message."
+#~ msgstr "I'm eating, so leave me a message."
+
+#, fuzzy
+#~ msgid "from room %s"
+#~ msgstr " from room %s"
+
+#~ msgid "Leave Groupchats"
+#~ msgstr "Leave Groupchats"
+
+#, fuzzy
+#~ msgid "Auto Join"
+#~ msgstr "Auto join"
+
+#, fuzzy
+#~ msgid "Room"
+#~ msgstr "Room:"
+
+#~ msgid "Jabber ID:"
+#~ msgstr "Jabber ID:"
+
+#~ msgid "Occupant Actions"
+#~ msgstr "Occupant Actions"
+
+#~ msgid "_Add to Roster"
+#~ msgstr "_Add to Roster"
+
+#~ msgid "_Manage Room"
+#~ msgstr "_Manage Room"
+
+#~ msgid "Configure _Room..."
+#~ msgstr "Configure _Room..."
+
+#~ msgid "_Destroy Room"
+#~ msgstr "_Destroy Room"
+
+#~ msgid "Jabber ID"
+#~ msgstr "Jabber ID"
+
+#, fuzzy
+#~ msgid "icon"
+#~ msgstr "Trayicon"
+
+#, fuzzy
+#~ msgid "account"
+#~ msgstr "Account"
+
+#, fuzzy
+#~ msgid "Roster"
+#~ msgstr "Show _Roster"
+
+#, fuzzy
+#~ msgid "Show only in roster"
+#~ msgstr "Show only in _roster"
+
+#~ msgid "in _roster"
+#~ msgstr "in _roster"
+
+#, fuzzy
+#~ msgid "Roster Appearance"
+#~ msgstr "<b>Roster Appearance</b>"
+
+#, fuzzy
+#~ msgid "Show chatstate in roster"
+#~ msgstr "Display a_vatars of contacts in roster"
+
+#~ msgid "_Add to Roster..."
+#~ msgstr "_Add to Roster..."
+
+#~ msgid "_Jabber ID:"
+#~ msgstr "_Jabber ID:"
+
+#, fuzzy
+#~ msgid "_Jabber ID"
+#~ msgstr "_Jabber ID:"
+
+#~ msgid "JabberID"
+#~ msgstr "JabberID"
+
+#, fuzzy
+#~ msgid "Show Roster"
+#~ msgstr "Show _Roster"
+
+#~ msgid "MUC server"
+#~ msgstr "MUC server"
+
+#~ msgid "Room Configuration"
+#~ msgstr "Room Configuration"
+
+#~ msgid "Join _Group Chat"
+#~ msgstr "Join _Group Chat"
+
+#, fuzzy
+#~ msgid "Audio sessions are not available"
+#~ msgstr "A connection is not available"
+
+#~ msgid "Conference"
+#~ msgstr "Conference"
+
+#, fuzzy
+#~ msgid "_Manage Bookmarks…"
+#~ msgstr "Manage Bookmarks"
+
+#, fuzzy
+#~ msgid "Hide _Roster"
+#~ msgstr "in _roster"
+
+#~ msgid "Show _Roster"
+#~ msgstr "Show _Roster"
+
+#, fuzzy
+#~ msgid "Invalid Room"
+#~ msgstr "Invalid room"
+
+#~ msgid "Invalid room"
+#~ msgstr "Invalid room"
+
+#~ msgid "A GTK+ Jabber client"
+#~ msgstr "A GTK+ Jabber client"
+
+#~ msgid "Changing Nickname"
+#~ msgstr "Changing Nickname"
+
+#~ msgid "Please specify the new nickname you want to use:"
+#~ msgstr "Please specify the new nickname you want to use:"
+
+#~ msgid "Bookmark already set"
+#~ msgstr "Bookmark already set"
+
+#, fuzzy
+#~ msgid "Group Chat '%s' is already in your bookmarks."
+#~ msgstr "Group Chat \"%s\" is already in your bookmarks."
+
+#~ msgid "Bookmark has been added successfully"
+#~ msgstr "Bookmark has been added successfully"
+
+#, fuzzy
+#~ msgid ""
+#~ "You can manage your bookmarks by clicking the Bookmarks menu item in your "
+#~ "contact list."
+#~ msgstr "You can manage your bookmarks via Actions menu in your roster."
+
+#, fuzzy
+#~ msgid "The nickname contains invalid characters."
+#~ msgstr "The nickname has not allowed characters."
+
+#, fuzzy
+#~ msgid "Bookmark Room"
+#~ msgstr "Bookmark this room"
+
+#~ msgid "_Join New Group Chat"
+#~ msgstr "_Join New Group Chat"
+
+#, fuzzy
+#~ msgid "_Create Group Chat"
+#~ msgstr "Leave Groupchats"
+
+#~ msgid "Name:"
+#~ msgstr "Name:"
+
+#, fuzzy
+#~ msgid "Description:"
+#~ msgstr "Description: "
+
+#, fuzzy
+#~ msgid "Address:"
+#~ msgstr "_Address:"
+
+#, fuzzy
+#~ msgid "You can not start a new conversation unless you are connected."
+#~ msgstr "You can not join a group chat unless you are connected."
+
+#, fuzzy
+#~ msgid "Occupants"
+#~ msgstr "Occupant Actions"
+
+#, fuzzy
+#~ msgid "File transfer error"
+#~ msgstr "File Transfer Error"
+
+#, fuzzy
+#~ msgid "No Accounts available"
+#~ msgstr "No account available"
+
+#~ msgid "_Modify Account..."
+#~ msgstr "_Modify Account..."
+
+#~ msgid "Boolean"
+#~ msgstr "Boolean"
+
+#~ msgid "Integer"
+#~ msgstr "Integer"
+
+#~ msgid "Text"
+#~ msgstr "Text"
+
+#~ msgid "Value"
+#~ msgstr "Value"
+
+#~ msgid "Type"
+#~ msgstr "Type"
+
+#~ msgid "(None)"
+#~ msgstr "(None)"
+
+#~ msgid "Hidden"
+#~ msgstr "Hidden"
+
+#~ msgid "Manage Proxy Profiles"
+#~ msgstr "Manage Proxy Profiles"
+
+#, fuzzy
+#~ msgid "Properties"
+#~ msgstr "<b>Properties</b>"
+
+#, fuzzy
+#~ msgid "Proxy _Host"
+#~ msgstr "Proxy _Host:"
+
+#, fuzzy
+#~ msgid "Proxy _Port"
+#~ msgstr "Proxy _Port:"
+
+#, fuzzy
+#~ msgid "New Groupchat"
+#~ msgstr "New Group Chat"
+
+#, fuzzy
+#~ msgid "New Contact"
+#~ msgstr "Add New Contact"
+
 #~ msgid "%s GiB"
 #~ msgstr "%s GiB"
 
@@ -11137,9 +11965,6 @@ msgstr "Registration failed"
 #~ msgid "_Pause"
 #~ msgstr "_Pause"
 
-#~ msgid "Clean _up"
-#~ msgstr "Clean _up"
-
 #~ msgid "Remove file transfer from the list."
 #~ msgstr "Remove file transfer from the list."
 
@@ -11586,9 +12411,6 @@ msgstr "Registration failed"
 #~ msgid "You are invited to a groupchat"
 #~ msgstr "You are invited to a groupchat"
 
-#~ msgid "Do you want to accept the invitation?"
-#~ msgstr "Do you want to accept the invitation?"
-
 #~ msgid "_Start Chat"
 #~ msgstr "_Start Chat"
 
@@ -11802,10 +12624,6 @@ msgstr "Registration failed"
 #~ msgid "Nick"
 #~ msgstr "Nick"
 
-#, fuzzy
-#~ msgid "Banning…"
-#~ msgstr "Banning..."
-
 #~ msgid ""
 #~ "<b>Whom do you want to ban?</b>\n"
 #~ "\n"
@@ -11887,11 +12705,6 @@ msgstr "Registration failed"
 #~ msgid "Filter:"
 #~ msgstr "Filter:"
 
-#~ msgid ""
-#~ "If checked, Gajim will display the mood of contacts in the roster window"
-#~ msgstr ""
-#~ "If ticked, Gajim will display the mood of contacts in the roster window"
-
 #~ msgid "<b>Chat Appearance</b>"
 #~ msgstr "<b>Chat Appearance</b>"
 
@@ -12150,10 +12963,6 @@ msgstr "Registration failed"
 #~ msgstr "_Status message:"
 
 #, fuzzy
-#~ msgid "Group chat highlight"
-#~ msgstr "Group Chat Message Highlight"
-
-#, fuzzy
 #~ msgid "Your nickname"
 #~ msgstr "B_efore nickname:"
 
@@ -12295,9 +13104,6 @@ msgstr "Registration failed"
 #~ msgid "The passwords typed in both fields must be identical."
 #~ msgstr "The passwords typed in both fields must be identical."
 
-#~ msgid "Enter new password:"
-#~ msgstr "Enter new password:"
-
 #~ msgid "Enter it again for confirmation:"
 #~ msgstr "Enter it again for confirmation:"
 
@@ -12311,10 +13117,6 @@ msgstr "Registration failed"
 #~ msgid "unsubscribe request from %s"
 #~ msgstr "unsubscribe request from %s"
 
-#, fuzzy
-#~ msgid "Autojoin"
-#~ msgstr "Auto join"
-
 #~ msgid "Homepage:"
 #~ msgstr "Homepage:"
 
@@ -12427,9 +13229,6 @@ msgstr "Registration failed"
 #~ msgid "Forward unread message then disconnect"
 #~ msgstr "Forward unread messages"
 
-#~ msgid "AIM Address:"
-#~ msgstr "AIM Address:"
-
 #~ msgid "MSN Address:"
 #~ msgstr "MSN Address:"
 
@@ -12479,10 +13278,6 @@ msgstr "Registration failed"
 #~ msgid "Session negotiation cancelled"
 #~ msgstr "Session negotiation cancelled"
 
-#, fuzzy
-#~ msgid "This session WILL NOT be archived on server"
-#~ msgstr "Session WILL NOT be logged"
-
 #~ msgid "This session is encrypted"
 #~ msgstr "This session is encrypted"
 
@@ -12797,9 +13592,6 @@ msgstr "Registration failed"
 #~ msgid "Server:"
 #~ msgstr "Server:"
 
-#~ msgid "Password:"
-#~ msgstr "Password:"
-
 #, fuzzy
 #~ msgid "Join this room _automatically when I connect"
 #~ msgstr "Join this room automatically when I connect"
@@ -13140,9 +13932,6 @@ msgstr "Registration failed"
 #~ msgid "_Edit Personal Information..."
 #~ msgstr "_Edit Personal Information..."
 
-#~ msgid "Information about you, as stored in the server"
-#~ msgstr "Information about you, as stored in the server"
-
 #~ msgid "<b>Personal Information</b>"
 #~ msgstr "<b>Personal Information</b>"
 
@@ -13220,9 +14009,6 @@ msgstr "Registration failed"
 #~ msgid "Your server can't save your personal information."
 #~ msgstr "Your server can't save your personal information."
 
-#~ msgid "Account Local already exists."
-#~ msgstr "Account Local already exists."
-
 #~ msgid "Please rename or remove it before enabling link-local messaging."
 #~ msgstr "Please rename or remove it before enabling link-local messaging."
 
@@ -13312,10 +14098,6 @@ msgstr "Registration failed"
 #~ msgid "The following message was NOT encrypted"
 #~ msgstr "The following message was NOT encrypted"
 
-#, fuzzy
-#~ msgid "Encryption used for this contact."
-#~ msgstr "Enable ESessions encryption for this account."
-
 #~ msgid "Toggle Open_PGP Encryption"
 #~ msgstr "Toggle Open_PGP Encryption"
 
@@ -13394,10 +14176,6 @@ msgstr "Registration failed"
 #~ msgid "Contact's identity verified"
 #~ msgstr "Contact's identity verified"
 
-#, fuzzy
-#~ msgid "Verify again…"
-#~ msgstr "Verify again..."
-
 #~ msgid ""
 #~ "To be certain that <b>only</b> the expected person can read your messages "
 #~ "or send you messages, you need to verify their identity by clicking the "
@@ -13523,9 +14301,6 @@ msgstr "Registration failed"
 #~ msgid "Add _Contact..."
 #~ msgstr "Add _Contact..."
 
-#~ msgid "_Accounts"
-#~ msgstr "_Accounts"
-
 #~ msgid "Profile, A_vatar"
 #~ msgstr "Profile, A_vatar"
 
@@ -13760,12 +14535,6 @@ msgstr "Registration failed"
 #~ msgid "Activity: "
 #~ msgstr "Activity:"
 
-#~ msgid "Join _Group Chat..."
-#~ msgstr "Join _Group Chat..."
-
-#~ msgid "_Modify Account"
-#~ msgstr "_Modify Account"
-
 #~ msgid "Check on startup if Gajim is the _default Jabber client"
 #~ msgstr "Check on startup if Gajim is the _default Jabber client"
 
@@ -14390,9 +15159,6 @@ msgstr "Registration failed"
 #~ msgid "[This message is encrypted]"
 #~ msgstr "[This message is encrypted]"
 
-#~ msgid "Trayicon"
-#~ msgstr "Trayicon"
-
 #~ msgid "A icon in systemtray reflecting the current presence."
 #~ msgstr "A icon in systemtray reflecting the current presence."
 
@@ -14431,9 +15197,6 @@ msgstr "Registration failed"
 #~ msgid "Nickname not found: %s"
 #~ msgstr "Nickname not found: %s"
 
-#~ msgid "This group chat has no subject"
-#~ msgstr "This group chat has no subject"
-
 #~ msgid ""
 #~ "There is an ambiguity: %d nicks match.\n"
 #~ " Please use graphical interface "
@@ -14522,9 +15285,6 @@ msgstr "Registration failed"
 #~ msgid "Click to see features (like MSN, ICQ transports) of jabber servers"
 #~ msgstr "Click to see features (like MSN, ICQ transports) of jabber servers"
 
-#~ msgid "_Host:"
-#~ msgstr "_Host:"
-
 #~ msgid "Select the account with which to synchronise"
 #~ msgstr "Select the account with which to synchronise"
 
@@ -14823,9 +15583,6 @@ msgstr "Registration failed"
 #~ "\n"
 #~ "From: %(from_address)s"
 
-#~ msgid "Private Chat"
-#~ msgstr "Private Chat"
-
 #~ msgid "%s does not appear to be a valid JID"
 #~ msgstr "%s does not appear to be a valid JID"
 
@@ -14885,9 +15642,6 @@ msgstr "Registration failed"
 #~ msgid "Connection to host could not be established"
 #~ msgstr "Connection to host could not be established"
 
-#~ msgid "A_fter nickname:"
-#~ msgstr "A_fter nickname:"
-
 #~ msgid "_After time:"
 #~ msgstr "_After time:"
 
diff --git a/po/eo.po b/po/eo.po
index 40bbf87a5..70c5c6348 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: 2019-07-02 02:06+0000\n"
+"POT-Creation-Date: 2019-08-11 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,71 +18,71 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: gajim/chat_control_base.py:550
+#: gajim/chat_control_base.py:557
 msgid "_Undo"
 msgstr ""
 
-#: gajim/chat_control_base.py:558 gajim/conversation_textview.py:529
+#: gajim/chat_control_base.py:565 gajim/conversation_textview.py:529
 msgid "_Clear"
 msgstr ""
 
-#: gajim/chat_control_base.py:563
+#: gajim/chat_control_base.py:570
 msgid "Paste as quote"
 msgstr ""
 
-#: gajim/chat_control_base.py:613
+#: gajim/chat_control_base.py:620
 #, fuzzy
 msgid "Paste Image"
 msgstr "Elektu bildon"
 
-#: gajim/chat_control_base.py:614
+#: gajim/chat_control_base.py:621
 #, fuzzy
 msgid "You are trying to paste an image"
 msgstr "Vi nekonektitas al la servilo"
 
-#: gajim/chat_control_base.py:615
+#: gajim/chat_control_base.py:622
 #, 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:617 gajim/groupchat_control.py:2310
-#: gajim/roster_window.py:2848 gajim/roster_window.py:4167
-#: gajim/message_window.py:252 gajim/gtk/dialogs.py:418
+#: gajim/chat_control_base.py:624 gajim/groupchat_control.py:2218
+#: gajim/roster_window.py:2841 gajim/roster_window.py:4118
+#: gajim/message_window.py:359 gajim/gtk/dialogs.py:330
 #, fuzzy
 msgid "_Do not ask me again"
 msgstr "_Ne plu demandi"
 
-#: gajim/chat_control_base.py:620
+#: gajim/chat_control_base.py:627
 msgid "_Paste"
 msgstr ""
 
-#: gajim/chat_control_base.py:1162 gajim/gtk/accounts.py:351
+#: gajim/chat_control_base.py:1169 gajim/gtk/accounts.py:354
 #, fuzzy
 msgid "Privacy"
 msgstr "Privata listo"
 
-#: gajim/chat_control_base.py:1163
+#: gajim/chat_control_base.py:1170
 #, fuzzy
 msgid "Warning"
 msgstr "Malpermesas %s"
 
-#: gajim/chat_control_base.py:1164
+#: gajim/chat_control_base.py:1171
 #, python-format
 msgid "If you send a file to <b>%s</b>, your real JID will be revealed."
 msgstr ""
 
-#: gajim/chat_control_base.py:1169
+#: gajim/chat_control_base.py:1176
 #, fuzzy
 msgid "Continue"
 msgstr "_Daŭrigi"
 
-#: gajim/gtkgui_helpers.py:163 gajim/gtk/filetransfer.py:393
+#: gajim/gtkgui_helpers.py:163 gajim/gtk/filetransfer.py:398
 #, fuzzy, python-format
 msgid "Cannot overwrite existing file '%s'"
 msgstr "Ne povas reskribi ekzistan dosieron \"%s\""
 
-#: gajim/gtkgui_helpers.py:164 gajim/gtk/filetransfer.py:394
+#: gajim/gtkgui_helpers.py:164 gajim/gtk/filetransfer.py:399
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
@@ -174,391 +174,400 @@ msgstr ""
 msgid " resource with priority "
 msgstr " risurco kun prioritato "
 
-#: gajim/gui_menu_builder.py:96
-#, fuzzy
-msgid "_New Group Chat"
-msgstr "Nova babilejo"
-
-#: gajim/gui_menu_builder.py:289 gajim/gui_menu_builder.py:380
-#: gajim/chat_control.py:303 gajim/roster_window.py:786
-#: gajim/roster_window.py:1719 gajim/roster_window.py:1721
-#: gajim/roster_window.py:2030 gajim/roster_window.py:3336
-#: gajim/roster_window.py:3369 gajim/gui_interface.py:413
-#: gajim/common/contacts.py:206 gajim/common/contacts.py:343
-#: gajim/common/helpers.py:83 gajim/common/helpers.py:311
-#: gajim/gtk/add_contact.py:319 gajim/gtk/subscription_request.py:70
-#: gajim/gtk/subscription_request.py:99 gajim/gtk/roster_item_exchange.py:112
-msgid "Not in Roster"
-msgstr "Mankas en kontaktlisto"
+#: gajim/gui_menu_builder.py:251 gajim/gui_menu_builder.py:342
+#: gajim/chat_control.py:305 gajim/roster_window.py:783
+#: gajim/roster_window.py:1716 gajim/roster_window.py:1718
+#: gajim/roster_window.py:2027 gajim/roster_window.py:3292
+#: gajim/roster_window.py:3325 gajim/gui_interface.py:396
+#: gajim/common/contacts.py:222 gajim/common/contacts.py:359
+#: gajim/common/contacts.py:471 gajim/common/helpers.py:86
+#: gajim/common/helpers.py:317 gajim/gtk/add_contact.py:319
+#: gajim/gtk/subscription_request.py:70 gajim/gtk/subscription_request.py:99
+#: gajim/gtk/roster_item_exchange.py:112
+#, fuzzy
+msgid "Not in contact list"
+msgstr "Montri _senkonektajn kontaktojn"
 
-#: gajim/gui_menu_builder.py:393
-msgid "I would like to add you to my roster"
-msgstr "Mi volus aldoni vin en mian kontaktliston"
+#: gajim/gui_menu_builder.py:355
+#, 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:471
+#: gajim/gui_menu_builder.py:433
 #, fuzzy
 msgid "Send Single _Message…"
 msgstr "Sendi unuopan _mesaĝon"
 
-#: gajim/gui_menu_builder.py:486
+#: gajim/gui_menu_builder.py:448
 #, fuzzy
 msgid "E_xecute Command…"
 msgstr "_Plenumi komandon..."
 
-#: gajim/gui_menu_builder.py:494
+#: gajim/gui_menu_builder.py:456
 #, fuzzy
 msgid "_Manage Transport"
 msgstr "Transportiloj"
 
-#: gajim/gui_menu_builder.py:500
+#: gajim/gui_menu_builder.py:462
 #, fuzzy
 msgid "_Modify Transport"
 msgstr "Montri Trans_portilojn"
 
-#: gajim/gui_menu_builder.py:507 gajim/roster_window.py:5046
+#: gajim/gui_menu_builder.py:469 gajim/roster_window.py:4985
 #, fuzzy
 msgid "_Rename…"
 msgstr "_Renomigi"
 
-#: gajim/gui_menu_builder.py:518 gajim/roster_window.py:5062
-#: gajim/roster_window.py:5177 gajim/data/gui/blocked_contacts_window.ui:52
+#: gajim/gui_menu_builder.py:480 gajim/roster_window.py:5001
+#: gajim/roster_window.py:5116 gajim/data/gui/blocked_contacts_window.ui:52
 #: gajim/data/gui/gc_occupants_menu.ui:148
 #: gajim/data/gui/contact_context_menu.ui:143
 msgid "_Unblock"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:521 gajim/roster_window.py:5067
-#: gajim/roster_window.py:5181 gajim/data/gui/gc_occupants_menu.ui:140
+#: gajim/gui_menu_builder.py:483 gajim/roster_window.py:5006
+#: gajim/roster_window.py:5120 gajim/data/gui/gc_occupants_menu.ui:140
 #: gajim/data/gui/contact_context_menu.ui:151
 msgid "_Block"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:529 gajim/roster_window.py:5074
+#: gajim/gui_menu_builder.py:491 gajim/roster_window.py:5013
 #: gajim/data/gui/contact_context_menu.ui:181
 #, fuzzy
 msgid "Remo_ve"
 msgstr "_Forigi"
 
-#: gajim/gui_menu_builder.py:539 gajim/data/gui/contact_context_menu.ui:198
+#: gajim/gui_menu_builder.py:501 gajim/data/gui/contact_context_menu.ui:198
 #, fuzzy
 msgid "_Information"
 msgstr "Kontakta informo"
 
-#: gajim/gui_menu_builder.py:552
+#: gajim/gui_menu_builder.py:514
 #, fuzzy
 msgid "Save _As"
 msgstr "Havas "
 
-#: gajim/gui_menu_builder.py:564 gajim/groupchat_control.py:501
-#: gajim/chat_control.py:340
+#: gajim/gui_menu_builder.py:526 gajim/groupchat_control.py:507
+#: gajim/chat_control.py:342
 #, fuzzy
 msgid "Send File…"
 msgstr "Sendi _dosieron"
 
-#: gajim/gui_menu_builder.py:565
+#: gajim/gui_menu_builder.py:527
 #, fuzzy
 msgid "Upload File…"
 msgstr "Konservi dosieron kiel..."
 
-#: gajim/gui_menu_builder.py:566
+#: gajim/gui_menu_builder.py:528
 #, fuzzy
 msgid "Send File Directly…"
 msgstr "Konservi dosieron kiel..."
 
-#: gajim/gui_menu_builder.py:568 gajim/gui_menu_builder.py:632
+#: gajim/gui_menu_builder.py:530 gajim/gui_menu_builder.py:596
 #, fuzzy
 msgid "Send Chatstate"
 msgstr "Lasta stato: %s"
 
-#: gajim/gui_menu_builder.py:569
+#: gajim/gui_menu_builder.py:531
 #, fuzzy
 msgid "Invite Contacts"
 msgstr "Kontaktoj"
 
-#: gajim/gui_menu_builder.py:570
+#: gajim/gui_menu_builder.py:532
 #, fuzzy
-msgid "Add to Roster"
-msgstr "_Aldoni al kontaktlisto"
+msgid "Add to Contact List"
+msgstr "_Aldoni kontakton..."
 
-#: gajim/gui_menu_builder.py:571
-msgid "Audio Session"
-msgstr ""
+#: gajim/gui_menu_builder.py:533
+#, fuzzy
+msgid "Voice Chat"
+msgstr "Mendo de dosiera transmeto"
 
-#: gajim/gui_menu_builder.py:572
-msgid "Video Session"
-msgstr ""
+#: gajim/gui_menu_builder.py:534
+#, fuzzy
+msgid "Video Chat"
+msgstr "Privata interparolo"
 
-#: gajim/gui_menu_builder.py:573
+#: gajim/gui_menu_builder.py:535 gajim/gui_menu_builder.py:582
 #, fuzzy
 msgid "Information"
 msgstr "Kontakta informo"
 
-#: gajim/gui_menu_builder.py:574 gajim/gui_menu_builder.py:639
+#: gajim/gui_menu_builder.py:536 gajim/gui_menu_builder.py:602
 #: gajim/data/gui/application_menu.ui:37
 #, fuzzy
 msgid "History"
 msgstr "_Historio"
 
-#: gajim/gui_menu_builder.py:580 gajim/gui_menu_builder.py:687
+#: gajim/gui_menu_builder.py:542 gajim/gui_menu_builder.py:650
 #: gajim/data/gui/preferences_window.ui:1823
 msgid "Disabled"
 msgstr "malŝaltitaj"
 
-#: gajim/gui_menu_builder.py:581 gajim/gui_menu_builder.py:688
+#: gajim/gui_menu_builder.py:543 gajim/gui_menu_builder.py:651
 #, fuzzy
 msgid "Composing only"
 msgstr "Tajpas mesaĝon"
 
-#: gajim/gui_menu_builder.py:582 gajim/gui_menu_builder.py:689
+#: gajim/gui_menu_builder.py:544 gajim/gui_menu_builder.py:652
 #, fuzzy
 msgid "All chat states"
 msgstr "ia ajn stato"
 
-#: gajim/gui_menu_builder.py:620
+#: gajim/gui_menu_builder.py:583
 #, fuzzy
-msgid "Manage Room"
-msgstr "Aranĝi legosignojn"
+msgid "Manage Group Chat"
+msgstr "Nova babilejo"
 
-#: gajim/gui_menu_builder.py:621
+#: gajim/gui_menu_builder.py:584 gajim/data/gui/groupchat_control.ui:649
 #, fuzzy
 msgid "Change Subject"
 msgstr "Ŝanĝi _temon"
 
-#: gajim/gui_menu_builder.py:622
+#: gajim/gui_menu_builder.py:585
 #, fuzzy
-msgid "Configure Room"
-msgstr "Administri _babilejon"
+msgid "Configure Group Chat"
+msgstr "Nova babilejo"
 
-#: gajim/gui_menu_builder.py:623
+#: gajim/gui_menu_builder.py:586
 #, fuzzy
 msgid "Upload Avatar…"
 msgstr "Elektu bildon"
 
-#: gajim/gui_menu_builder.py:624
+#: gajim/gui_menu_builder.py:587
 #, fuzzy
-msgid "Destroy Room"
-msgstr "Priskribo: %s"
+msgid "Destroy Group Chat"
+msgstr "Nova babilejo"
 
-#: gajim/gui_menu_builder.py:626 gajim/data/gui/preferences_window.ui:790
+#: gajim/gui_menu_builder.py:589 gajim/data/gui/preferences_window.ui:790
 #, fuzzy
 msgid "Chat Settings"
 msgstr "Konektado malsukcesis"
 
-#: gajim/gui_menu_builder.py:627
+#: gajim/gui_menu_builder.py:590
 msgid "Show join/leave"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:628
+#: gajim/gui_menu_builder.py:591
 #, fuzzy
 msgid "Show status changes"
 msgstr "_Protokoli statŝanĝojn de kontaktoj"
 
-#: gajim/gui_menu_builder.py:629 gajim/data/gui/gc_control_popup_menu.ui:72
+#: gajim/gui_menu_builder.py:592 gajim/data/gui/gc_control_popup_menu.ui:72
 #, fuzzy
 msgid "Notify on all messages"
 msgstr "Antaŭpreparitaj mesaĝoj:"
 
-#: gajim/gui_menu_builder.py:630
+#: gajim/gui_menu_builder.py:593
 msgid "Minimize on close"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:631
-msgid "Minimize on autojoin"
+#: gajim/gui_menu_builder.py:595
+msgid "Minimize when joining automatically"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:634
+#: gajim/gui_menu_builder.py:598
 msgid "Sync Threshold"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:635
+#: gajim/gui_menu_builder.py:599
 #, fuzzy
-msgid "Change Nick"
+msgid "Change Nickname"
 msgstr "Ŝanĝi kaŝ_nomon"
 
-#: gajim/gui_menu_builder.py:636
-#, fuzzy
-msgid "Bookmark Room"
-msgstr "Starigi legosignon por tiu babilejo"
-
-#: gajim/gui_menu_builder.py:637
+#: gajim/gui_menu_builder.py:600
 #, fuzzy
 msgid "Request Voice"
 msgstr "_Voĉo"
 
-#: gajim/gui_menu_builder.py:638 gajim/roster_window.py:5246
+#: gajim/gui_menu_builder.py:601 gajim/roster_window.py:5185
 #, fuzzy
 msgid "Execute command"
 msgstr "_Plenumi komandon..."
 
-#: gajim/gui_menu_builder.py:640
-#, fuzzy
-msgid "Disconnect"
-msgstr "Kontakto malkonektita"
+#: gajim/gui_menu_builder.py:603
+msgid "Leave"
+msgstr ""
 
-#: gajim/gui_menu_builder.py:678 gajim/gtk/preferences.py:156
+#: gajim/gui_menu_builder.py:641 gajim/gtk/preferences.py:155
 msgid "No threshold"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:680 gajim/gtk/preferences.py:158
+#: gajim/gui_menu_builder.py:643 gajim/gtk/preferences.py:157
 #, 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:709 gajim/gui_menu_builder.py:747
-#: gajim/gtk/join_groupchat.py:43
-msgid "Join Group Chat"
-msgstr "Eniri babilejen"
-
-#: gajim/gui_menu_builder.py:746
+#: gajim/gui_menu_builder.py:672
 #, fuzzy
 msgid "Add Contact…"
 msgstr "_Aldoni kontakton..."
 
-#: gajim/gui_menu_builder.py:748 gajim/gtk/profile.py:52
-#: gajim/gtk/accounts.py:770 gajim/gtk/accounts.py:808
+#: gajim/gui_menu_builder.py:673 gajim/gtk/profile.py:52
+#: gajim/gtk/accounts.py:773 gajim/gtk/accounts.py:811
 #, fuzzy
 msgid "Profile"
 msgstr "dosiero"
 
-#: gajim/gui_menu_builder.py:749
+#: gajim/gui_menu_builder.py:674
+#, fuzzy
+msgid "Send Single Message…"
+msgstr "Sendi unuopan _mesaĝon"
+
+#: gajim/gui_menu_builder.py:675
 #, fuzzy
 msgid "Discover Services"
 msgstr "_Serĉi servojn"
 
-#: gajim/gui_menu_builder.py:750
+#: gajim/gui_menu_builder.py:676 gajim/gtk/server_info.py:36
 #, fuzzy
-msgid "Send Single Message…"
-msgstr "Sendi unuopan _mesaĝon"
+msgid "Server Info"
+msgstr "Servilo"
 
-#: gajim/gui_menu_builder.py:751 gajim/data/gui/preferences_window.ui:2741
+#: gajim/gui_menu_builder.py:677 gajim/data/gui/preferences_window.ui:2741
 msgid "Advanced"
 msgstr "Krome"
 
-#: gajim/gui_menu_builder.py:752 gajim/gtk/mam_preferences.py:88
+#: gajim/gui_menu_builder.py:678 gajim/gtk/mam_preferences.py:88
 #, fuzzy
 msgid "Archiving Preferences"
 msgstr "_Agordo"
 
-#: gajim/gui_menu_builder.py:753
+#: gajim/gui_menu_builder.py:679
 #, fuzzy
 msgid "Blocking List"
 msgstr "Listo de malpermesoj"
 
-#: gajim/gui_menu_builder.py:754 gajim/gtk/history_sync.py:108
+#: gajim/gui_menu_builder.py:680
+#, fuzzy
+msgid "Bookmarks"
+msgstr "Starigi legosignon por tiu babilejo"
+
+#: gajim/gui_menu_builder.py:681
+#, fuzzy
+msgid "PEP Configuration"
+msgstr "Agordo de babilejo"
+
+#: gajim/gui_menu_builder.py:682 gajim/gtk/history_sync.py:108
 #: gajim/gtk/history_sync.py:186
 #, fuzzy
 msgid "Synchronise History"
 msgstr "Montri _senkonektajn kontaktojn"
 
-#: gajim/gui_menu_builder.py:755 gajim/gtk/privacy_list.py:427
+#: gajim/gui_menu_builder.py:683 gajim/gtk/privacy_list.py:427
 msgid "Privacy Lists"
 msgstr "Privataj listoj"
 
-#: gajim/gui_menu_builder.py:756 gajim/gtk/server_info.py:36
-#, fuzzy
-msgid "Server Info"
-msgstr "Servilo"
-
-#: gajim/gui_menu_builder.py:757 gajim/gui_menu_builder.py:768
+#: gajim/gui_menu_builder.py:685 gajim/gui_menu_builder.py:696
 #: gajim/data/gui/xml_console_window.ui:77
 msgid "XML Console"
 msgstr "XML-konzolo"
 
-#: gajim/gui_menu_builder.py:759 gajim/data/gui/groupchat_config.ui:36
+#: gajim/gui_menu_builder.py:687 gajim/data/gui/groupchat_config.ui:36
 #, fuzzy
 msgid "Admin"
 msgstr "_Estro"
 
-#: gajim/gui_menu_builder.py:760
+#: gajim/gui_menu_builder.py:688
 #, fuzzy
 msgid "Send Server Message…"
 msgstr "_Sendi servilan mesaĝon"
 
-#: gajim/gui_menu_builder.py:761
+#: gajim/gui_menu_builder.py:689
 #, fuzzy
 msgid "Set MOTD…"
 msgstr "Enigi tagmesaĝon"
 
-#: gajim/gui_menu_builder.py:762
+#: gajim/gui_menu_builder.py:690
 #, fuzzy
 msgid "Update MOTD…"
 msgstr "Renovigi tagmesaĝon"
 
-#: gajim/gui_menu_builder.py:763
+#: gajim/gui_menu_builder.py:691
 #, fuzzy
 msgid "Delete MOTD…"
 msgstr "Forigi tagmesaĝon"
 
-#: gajim/gui_menu_builder.py:812
+#: gajim/gui_menu_builder.py:736
 #, fuzzy
-msgid "No Accounts available"
-msgstr "Neniu konto disponeblas"
+msgid "_Add Account…"
+msgstr "_Aldoni kontakton..."
+
+#: gajim/gui_menu_builder.py:742
+#, fuzzy
+msgid "_Modify Accounts…"
+msgstr "Korekti konton"
+
+#: gajim/gui_menu_builder.py:751 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:823 gajim/data/gui/application_menu.ui:5
-#: gajim/data/gui/application_menu.ui:71 gajim/data/gui/shortcuts_window.ui:182
-#: gajim/gtk/accounts.py:58
+#: gajim/gui_menu_builder.py:755 gajim/data/gui/application_menu.ui:5
+#: gajim/data/gui/shortcuts_window.ui:182 gajim/gtk/accounts.py:57
 msgid "Accounts"
 msgstr "Kontoj"
 
-#: gajim/gui_menu_builder.py:881 gajim/gui_menu_builder.py:886
+#: gajim/gui_menu_builder.py:784 gajim/gui_menu_builder.py:789
 #, fuzzy
-msgid "Copy JID"
-msgstr "Babilejo:"
+msgid "Copy XMPP Address"
+msgstr "_Kopii JID/retpoŝtan adreson"
 
-#: gajim/gui_menu_builder.py:882 gajim/gui_menu_builder.py:914
+#: gajim/gui_menu_builder.py:785 gajim/gui_menu_builder.py:817
 #, fuzzy
 msgid "Join Groupchat"
 msgstr "Eniri babilejen"
 
-#: gajim/gui_menu_builder.py:887 gajim/gui_menu_builder.py:913
-#: gajim/data/gui/application_menu.ui:76
+#: gajim/gui_menu_builder.py:790 gajim/gui_menu_builder.py:816
+#: gajim/data/gui/application_menu.ui:71
 #: gajim/data/gui/subscription_request_window.ui:106
 msgid "Start Chat"
 msgstr "Babili"
 
-#: gajim/gui_menu_builder.py:888 gajim/gui_menu_builder.py:915
+#: gajim/gui_menu_builder.py:791 gajim/gui_menu_builder.py:818
 #, fuzzy
-msgid "Add to Roster…"
-msgstr "_Aldoni al kontaktlisto"
+msgid "Add to Contact List…"
+msgstr "_Aldoni kontakton..."
 
-#: gajim/gui_menu_builder.py:893
+#: gajim/gui_menu_builder.py:796
 #, fuzzy
 msgid "Copy Link Location"
 msgstr "_Kopii ligilan lokon"
 
-#: gajim/gui_menu_builder.py:894
+#: gajim/gui_menu_builder.py:797
 #, fuzzy
 msgid "Open Link in Browser"
 msgstr "_Malfermi ligilon per retrigardilo"
 
-#: gajim/gui_menu_builder.py:899
+#: gajim/gui_menu_builder.py:802
 #, fuzzy
 msgid "Copy Email Address"
 msgstr "_Kopii JID/retpoŝtan adreson"
 
-#: gajim/gui_menu_builder.py:900 gajim/gui_menu_builder.py:912
+#: gajim/gui_menu_builder.py:803 gajim/gui_menu_builder.py:815
 #, fuzzy
 msgid "Open Email Composer"
 msgstr "_Malfermi retpoŝtredaktilon"
 
-#: gajim/gui_menu_builder.py:905
+#: gajim/gui_menu_builder.py:808
 #, fuzzy
 msgid "Copy Location"
 msgstr "_Kopii ligilan lokon"
 
-#: gajim/gui_menu_builder.py:906
+#: gajim/gui_menu_builder.py:809
 #, fuzzy
 msgid "Show Location"
 msgstr "Konta korektado"
 
-#: gajim/gui_menu_builder.py:911
+#: gajim/gui_menu_builder.py:814
 #, fuzzy
-msgid "Copy JID/Email"
+msgid "Copy XMPP Address/Email"
 msgstr "_Kopii JID/retpoŝtan adreson"
 
-#: gajim/gui_menu_builder.py:945
+#: gajim/gui_menu_builder.py:852
 #, fuzzy
 msgid "Copy"
 msgstr "Babilejo:"
@@ -581,44 +590,55 @@ msgstr ""
 msgid "Choose folder for logfile"
 msgstr ""
 
-#: gajim/history_manager.py:107
+#: gajim/history_manager.py:106
 msgid "Cannot find history logs database"
 msgstr "Ne povas trovi datumbazon de protokoloj"
 
-#: gajim/history_manager.py:108
+#: gajim/history_manager.py:107
 #, fuzzy, python-format
 msgid "%s does not exist."
 msgstr "Tiu babilejo ne ekzistas."
 
-#: gajim/history_manager.py:141 gajim/history_manager.py:195
-#: gajim/gtk/discovery.py:829 gajim/gtk/roster_item_exchange.py:80
-msgid "JID"
-msgstr "JID"
+#: gajim/history_manager.py:140 gajim/history_manager.py:194
+#: 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:30
+#: gajim/gtk/accounts.py:804
+#, fuzzy
+msgid "XMPP Address"
+msgstr "AIM-adreso:"
 
-#: gajim/history_manager.py:154 gajim/history_manager.py:202
+#: gajim/history_manager.py:153 gajim/history_manager.py:201
 #: gajim/data/gui/history_window.ui:89 gajim/gtk/history.py:108
 msgid "Date"
 msgstr "Dato"
 
-#: gajim/history_manager.py:161 gajim/history_manager.py:225
+#: gajim/history_manager.py:160 gajim/history_manager.py:224
 #: gajim/data/gui/join_groupchat_window.ui:208
 #: gajim/data/gui/profile_window.ui:214
 #: gajim/data/gui/vcard_information_window.ui:443
+#: gajim/data/gui/bookmarks.ui:140
 msgid "Nickname"
 msgstr "Kaŝnomo"
 
-#: gajim/history_manager.py:172 gajim/history_manager.py:211
+#: gajim/history_manager.py:171 gajim/history_manager.py:210
 #: gajim/data/gui/preferences_window.ui:1344
 #: gajim/data/gui/single_message_window.ui:275 gajim/gtk/history.py:117
 msgid "Message"
 msgstr "Mesaĝo"
 
-#: gajim/history_manager.py:180 gajim/history_manager.py:218
+#: gajim/history_manager.py:179 gajim/history_manager.py:217
 #: gajim/data/gui/groups_post_window.ui:49
 #: gajim/data/gui/single_message_window.ui:214
 msgid "Subject"
 msgstr "Temo"
 
+#: gajim/history_manager.py:247
+msgid "Database Cleanup"
+msgstr ""
+
 #: gajim/history_manager.py:248
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
@@ -629,11 +649,8 @@ msgstr ""
 #: gajim/history_manager.py:250
 #, fuzzy
 msgid ""
-"Normally allocated database size will not be freed, it will just become "
-"reusable. If you really want to reduce database filesize, click YES, else "
-"click NO.\n"
-"\n"
-"In case you click YES, please wait…"
+"Normally, the allocated database size will not be freed, it will just become "
+"reusable. This operation may take a while."
 msgstr ""
 "Kutime dosierspaco de datumbazo ne liberigatas, ĝi nur iĝas reuzebla. Se vi "
 "vere volas malgrandigi datumbazan dosierspacon, alklaku JES, alie alklaku "
@@ -642,47 +659,48 @@ msgstr ""
 "Se vi alklakos JES, bonvolu atendi..."
 
 #: gajim/history_manager.py:255
-msgid "Database Cleanup"
-msgstr ""
+#, fuzzy
+msgid "_Cleanup"
+msgstr "Malplenigi"
 
-#: gajim/history_manager.py:519 gajim/gtk/filetransfer.py:238
-#: gajim/gtk/filetransfer.py:248
+#: gajim/history_manager.py:518 gajim/gtk/filetransfer.py:237
+#: gajim/gtk/filetransfer.py:247
 msgid "You"
 msgstr "Vi"
 
-#: gajim/history_manager.py:531
+#: gajim/history_manager.py:530
 #, 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:568 gajim/history_manager.py:607
-#: gajim/gtk/dialogs.py:58 gajim/gtk/themes.py:319
+#: gajim/history_manager.py:567 gajim/history_manager.py:606
+#: gajim/gtk/dialogs.py:57 gajim/gtk/themes.py:319
 #: gajim/gtk/roster_item_exchange.py:75 gajim/gtk/roster_item_exchange.py:185
 msgid "Delete"
 msgstr "Forigi"
 
-#: gajim/history_manager.py:569
+#: gajim/history_manager.py:568
 #, fuzzy
 msgid "Delete Conversation"
 msgid_plural "Delete Conversations"
 msgstr[0] "Kontakta informo"
 msgstr[1] "Kontakta informo"
 
-#: gajim/history_manager.py:570
+#: gajim/history_manager.py:569
 #, 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:608
+#: gajim/history_manager.py:607
 #, fuzzy
 msgid "Delete Message"
 msgid_plural "Delete Messages"
 msgstr[0] "Defaŭlta statmesaĝo"
 msgstr[1] "Defaŭlta statmesaĝo"
 
-#: gajim/history_manager.py:609
+#: gajim/history_manager.py:608
 #, fuzzy
 msgid "Do you want to permanently delete this message"
 msgid_plural "Do you want to permanently delete these messages"
@@ -695,15 +713,15 @@ msgid "Contact name: <i>%s</i>"
 msgstr "Kontaktnomo: <i>%s</i>"
 
 #: gajim/dialogs.py:84
-#, fuzzy, python-format
-msgid "JID: <i>%s</i>"
-msgstr "Jabber-ID: <i>%s</i>"
+#, python-format
+msgid "XMPP Address: <i>%s</i>"
+msgstr ""
 
-#: gajim/dialogs.py:115 gajim/dialogs.py:128 gajim/roster_window.py:2901
-#: gajim/roster_window.py:3833 gajim/roster_window.py:5084
-#: gajim/common/contacts.py:157 gajim/common/contacts.py:190
+#: gajim/dialogs.py:115 gajim/dialogs.py:128 gajim/roster_window.py:2894
+#: gajim/roster_window.py:3784 gajim/roster_window.py:5023
+#: gajim/common/contacts.py:157 gajim/common/contacts.py:206
 #: gajim/data/gui/preferences_window.ui:558
-#: gajim/data/gui/shortcuts_window.ui:177 gajim/gtk/accounts.py:349
+#: gajim/data/gui/shortcuts_window.ui:177 gajim/gtk/accounts.py:352
 msgid "General"
 msgstr "Ĝenerala"
 
@@ -751,7 +769,7 @@ msgid "Preset 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:703
+#: gajim/dialogs.py:703 gajim/plugins/gui.py:292
 msgid "_Overwrite"
 msgstr ""
 
@@ -763,9 +781,7 @@ msgstr "Konservi kiel antaŭpreparita statmesaĝo"
 msgid "Please type a name for this status message"
 msgstr "Bonvolu tajpi nomon de tiu statmesaĝo"
 
-#: gajim/dialogs.py:740 gajim/gui_interface.py:1441 gajim/dialog_messages.py:31
-#: gajim/gtk/discovery.py:518 gajim/gtk/profile.py:323
-#: gajim/gtk/join_groupchat.py:234
+#: gajim/dialogs.py:740 gajim/gtk/discovery.py:517 gajim/gtk/profile.py:323
 msgid "You are not connected to the server"
 msgstr "Vi nekonektitas al la servilo"
 
@@ -774,9 +790,11 @@ msgstr "Vi nekonektitas al la servilo"
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Senkonekta vi ne povas ŝanĝi vian pasvorton."
 
-#: gajim/dialogs.py:752 gajim/dialogs.py:823 gajim/gtk/discovery.py:822
-#: gajim/gtk/discovery.py:1648 gajim/gtk/discovery.py:1941
-#: gajim/gtk/history.py:99 gajim/gtk/roster_item_exchange.py:83
+#: gajim/dialogs.py:752 gajim/dialogs.py:823
+#: gajim/data/gui/groupchat_info_scrolled.ui:16 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/gtk/roster_item_exchange.py:83
 msgid "Name"
 msgstr "Nomo"
 
@@ -798,398 +816,344 @@ msgstr "Vi ne povas aliĝi al babilejo dum vi estas senkonekta."
 msgid "Synchronise"
 msgstr ""
 
-#: gajim/dialogs.py:1043
+#: gajim/dialogs.py:1042
 msgid "an audio and video"
 msgstr ""
 
-#: gajim/dialogs.py:1045
+#: gajim/dialogs.py:1044
 msgid "an audio"
 msgstr ""
 
-#: gajim/dialogs.py:1047
+#: gajim/dialogs.py:1046
 msgid "a video"
 msgstr ""
 
-#: gajim/dialogs.py:1051
+#: gajim/dialogs.py:1050
 #, python-format
 msgid ""
-"%(contact)s wants to start %(type)s session with you. Do you want to answer "
+"%(contact)s wants to start a %(type)s chat with you. Do you want to answer "
 "the call?"
 msgstr ""
 
-#: gajim/groupchat_control.py:505
+#: gajim/groupchat_control.py:511
 #, fuzzy, python-format
 msgid "Send File (max. %s MiB)…"
 msgstr "Konservi dosieron kiel..."
 
-#: gajim/groupchat_control.py:507 gajim/chat_control.py:342
+#: gajim/groupchat_control.py:513 gajim/chat_control.py:344
 #, fuzzy
 msgid "No File Transfer available"
 msgstr "Dosieraj transmetoj"
 
-#: gajim/groupchat_control.py:630 gajim/groupchat_control.py:2349
-msgid "Changing Subject"
-msgstr "Korektas temon"
-
-#: gajim/groupchat_control.py:631 gajim/groupchat_control.py:2350
-msgid "Please specify the new subject:"
-msgstr "Bonvolu enigi novan temon:"
-
-#: gajim/groupchat_control.py:638
-msgid "Changing Nickname"
-msgstr "Ŝanĝas kaŝnomon"
-
-#: gajim/groupchat_control.py:639
-msgid "Please specify the new nickname you want to use:"
-msgstr "Bonvolu enigi la novan kaŝnomon, kiun vi volas uzi:"
-
-#: gajim/groupchat_control.py:657
+#: gajim/groupchat_control.py:655
 #, fuzzy
-msgid "Invalid group chat JID"
+msgid "Invalid group chat XMPP Address"
 msgstr "Malkorekta babileja jabber-ID"
 
-#: gajim/groupchat_control.py:658
+#: gajim/groupchat_control.py:656
 #, fuzzy
-msgid "The group chat JID has not allowed characters."
+msgid "The group chat XMPP Address has not allowed characters."
 msgstr "La babileja jabber-ID enhavas nepermesajn signojn."
 
-#: gajim/groupchat_control.py:758 gajim/gtk/profile.py:136
+#: gajim/groupchat_control.py:743 gajim/gtk/profile.py:136
 msgid "Could not load image"
 msgstr "Ne povas alŝuti bildon"
 
-#: gajim/groupchat_control.py:888
+#: gajim/groupchat_control.py:873
 msgid "Insert Nickname"
 msgstr "Enmeti kaŝnomon"
 
-#: gajim/groupchat_control.py:1056 gajim/chat_control.py:824
+#: gajim/groupchat_control.py:1041 gajim/chat_control.py:848
 #, fuzzy
 msgid "and authenticated"
 msgstr "Uzi aŭtentokontrolon"
 
-#: gajim/groupchat_control.py:1060 gajim/chat_control.py:828
+#: gajim/groupchat_control.py:1045 gajim/chat_control.py:852
 #, fuzzy
 msgid "and NOT authenticated"
 msgstr "Uzi aŭtentokontrolon"
 
-#: gajim/groupchat_control.py:1064
+#: gajim/groupchat_control.py:1049
 #, python-format
 msgid "%(type)s encryption is active %(authenticated)s."
 msgstr ""
 
-#: gajim/groupchat_control.py:1111
+#: gajim/groupchat_control.py:1096
 #, fuzzy
 msgid "Conversation with "
 msgstr "Historio de interparoloj"
 
-#: gajim/groupchat_control.py:1113
+#: gajim/groupchat_control.py:1098
 #, fuzzy
 msgid "Continued conversation"
 msgstr "Konekto"
 
-#: gajim/groupchat_control.py:1411
+#: gajim/groupchat_control.py:1357
 #, fuzzy, python-format
 msgid "%(nick)s has set the subject to %(subject)s"
 msgstr "%(nick)s estas elpelita: %(reason)s"
 
-#: gajim/groupchat_control.py:1433
-msgid "Room now shows unavailable members"
+#: gajim/groupchat_control.py:1374
+msgid "Group chat now shows unavailable members"
 msgstr ""
 
-#: gajim/groupchat_control.py:1436
-msgid "Room now does not show unavailable members"
-msgstr ""
+#: gajim/groupchat_control.py:1377
+#, fuzzy
+msgid "Group chat now does not show unavailable members"
+msgstr "Tiu babilejo ne ekzistas."
 
-#: gajim/groupchat_control.py:1439
+#: gajim/groupchat_control.py:1380
 msgid "A setting not related to privacy has been changed"
 msgstr ""
 
-#: gajim/groupchat_control.py:1446
-msgid "Room logging is now enabled"
-msgstr ""
+#: gajim/groupchat_control.py:1387 gajim/groupchat_control.py:1659
+#, fuzzy
+msgid "Conversations are stored on the server"
+msgstr "Vi nekonektitas al la servilo"
 
-#: gajim/groupchat_control.py:1449
-msgid "Room logging is now disabled"
-msgstr ""
+#: gajim/groupchat_control.py:1390
+#, fuzzy
+msgid "Conversations are not stored on the server"
+msgstr "Informo pri vi, kiel estas en la servilo"
 
-#: gajim/groupchat_control.py:1452
-msgid "Room is now non-anonymous"
-msgstr ""
+#: gajim/groupchat_control.py:1393
+#, fuzzy
+msgid "Group chat is now non-anonymous"
+msgstr "Babilejoj"
 
-#: gajim/groupchat_control.py:1456
-msgid "Room is now semi-anonymous"
-msgstr ""
+#: gajim/groupchat_control.py:1397
+#, fuzzy
+msgid "Group chat is now semi-anonymous"
+msgstr "Emfazado de mesaĝoj en babilejo"
 
-#: gajim/groupchat_control.py:1460
-msgid "Room is now fully anonymous"
-msgstr ""
+#: gajim/groupchat_control.py:1401
+#, fuzzy
+msgid "Group chat is now fully anonymous"
+msgstr "Babilejoj"
 
-#: gajim/groupchat_control.py:1500
+#: gajim/groupchat_control.py:1439
 #, python-format
 msgid "Ping? (%s)"
 msgstr ""
 
-#: gajim/groupchat_control.py:1503
+#: gajim/groupchat_control.py:1442
 #, python-format
 msgid "Pong! (%(nick)s %(delay)s s.)"
 msgstr ""
 
-#: gajim/groupchat_control.py:1506 gajim/chat_control.py:1213
+#: gajim/groupchat_control.py:1445 gajim/chat_control.py:1237
 #, fuzzy
 msgid "Error."
 msgstr "Eraro de Avahi"
 
-#: gajim/groupchat_control.py:1711
+#: gajim/groupchat_control.py:1650
 #, fuzzy, python-format
-msgid "You (%s) joined the room"
+msgid "You (%s) joined the group chat"
 msgstr "%s aliĝis al la babilejo"
 
-#: gajim/groupchat_control.py:1717
-msgid "Any occupant is allowed to see your full JID"
-msgstr ""
-
-#: gajim/groupchat_control.py:1721
-msgid "Room logging is enabled"
+#: gajim/groupchat_control.py:1655
+msgid "Any participant is allowed to see your full XMPP Address"
 msgstr ""
 
-#: gajim/groupchat_control.py:1725
-msgid "The server has assigned or modified your roomnick"
-msgstr ""
+#: gajim/groupchat_control.py:1663
+#, fuzzy
+msgid "The server has assigned or modified your nickname in this group chat"
+msgstr "Ŝanĝi kaŝ_nomon"
 
-#: gajim/groupchat_control.py:1732
+#: gajim/groupchat_control.py:1671
 #, fuzzy
-msgid "A new room has been created"
+msgid "A new group chat has been created"
 msgstr "Via nova konto estas sukcese kreita"
 
-#: gajim/groupchat_control.py:1740 gajim/privatechat_control.py:112
+#: gajim/groupchat_control.py:1679 gajim/privatechat_control.py:115
 #, python-format
 msgid "You are now known as %s"
 msgstr "Vi nomiĝas %s"
 
-#: gajim/groupchat_control.py:1742 gajim/privatechat_control.py:114
+#: gajim/groupchat_control.py:1681 gajim/privatechat_control.py:117
 #, fuzzy, python-brace-format
 msgid "{nick} is now known as {new_nick}"
 msgstr "%s nomiĝas %s"
 
-#: gajim/groupchat_control.py:1767 gajim/privatechat_control.py:141
+#: gajim/groupchat_control.py:1706 gajim/privatechat_control.py:144
 #, fuzzy, python-brace-format
 msgid "You are now {show}{status}"
 msgstr "Vi nomiĝas %s"
 
-#: gajim/groupchat_control.py:1773 gajim/privatechat_control.py:147
+#: gajim/groupchat_control.py:1712 gajim/privatechat_control.py:150
 #, fuzzy, python-brace-format
 msgid "{nick} is now {show}{status}"
 msgstr "%(nick)s nun estas %(status)s"
 
-#: gajim/groupchat_control.py:1790 gajim/groupchat_control.py:1819
-#: gajim/groupchat_control.py:1849 gajim/groupchat_control.py:1909
+#: gajim/groupchat_control.py:1729 gajim/groupchat_control.py:1758
+#: gajim/groupchat_control.py:1788 gajim/groupchat_control.py:1848
 #, python-brace-format
 msgid " by {actor}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1793
+#: gajim/groupchat_control.py:1732
 #, python-brace-format
 msgid "** Your Affiliation has been set to {affiliation}{actor}{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1799
+#: gajim/groupchat_control.py:1738
 #, python-brace-format
 msgid "** Affiliation of {nick} has been set to {affiliation}{actor}{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1822
+#: gajim/groupchat_control.py:1761
 #, fuzzy, python-brace-format
 msgid "** Your Role has been set to {role}{actor}{reason}"
 msgstr "%(nick)s estas elpelita de %(who)s: %(reason)s"
 
-#: gajim/groupchat_control.py:1827
+#: gajim/groupchat_control.py:1766
 #, fuzzy, python-brace-format
 msgid "** Role of {nick} has been set to {role}{actor}{reason}"
 msgstr "%(nick)s estas elpelita de %(who)s: %(reason)s"
 
-#: gajim/groupchat_control.py:1852
+#: gajim/groupchat_control.py:1791
 #, fuzzy, python-brace-format
-msgid "You have been removed from the room{actor}{reason}"
+msgid "You have been removed from the group chat{actor}{reason}"
 msgstr "%(nick)s estas elpelita de %(who)s: %(reason)s"
 
-#: gajim/groupchat_control.py:1857
+#: gajim/groupchat_control.py:1796
 #, python-brace-format
 msgid "You have left due to an error{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1863
+#: gajim/groupchat_control.py:1802
 #, python-brace-format
 msgid "You have been kicked{actor}{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1870
+#: gajim/groupchat_control.py:1809
 #, python-brace-format
 msgid "You have been banned{actor}{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1877 gajim/groupchat_control.py:1943
+#: gajim/groupchat_control.py:1816 gajim/groupchat_control.py:1882
 #, fuzzy
 msgid ": Affiliation changed"
 msgstr "Aparteneco:"
 
-#: gajim/groupchat_control.py:1883 gajim/groupchat_control.py:1948
-msgid ": Room configuration changed to members-only"
+#: gajim/groupchat_control.py:1822 gajim/groupchat_control.py:1887
+msgid ": Group chat configuration changed to members-only"
 msgstr ""
 
-#: gajim/groupchat_control.py:1912
+#: gajim/groupchat_control.py:1851
 #, fuzzy, python-brace-format
-msgid "{nick} has been removed from the room{by}{reason}"
+msgid "{nick} has been removed from the group chat{by}{reason}"
 msgstr "%(nick)s estas elpelita de %(who)s: %(reason)s"
 
-#: gajim/groupchat_control.py:1922
+#: gajim/groupchat_control.py:1861
 #, python-brace-format
 msgid "{nick} has left due to an error{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1928
+#: gajim/groupchat_control.py:1867
 #, fuzzy, python-brace-format
 msgid "{nick} has been kicked{actor}{reason}"
 msgstr "%(nick)s estas elpelita: %(reason)s"
 
-#: gajim/groupchat_control.py:1936
+#: gajim/groupchat_control.py:1875
 #, fuzzy, python-brace-format
 msgid "{nick} has been banned{actor}{reason}"
 msgstr "Aliĝo de %(nick)s nun estas malpermesa: %(reason)s"
 
-#: gajim/groupchat_control.py:1953
+#: gajim/groupchat_control.py:1892
 #, python-brace-format
 msgid "{nick} has left{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1970
+#: gajim/groupchat_control.py:1914
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s aliĝis al la babilejo"
 
-#: gajim/groupchat_control.py:1985 gajim/groupchat_control.py:1990
-#: gajim/groupchat_control.py:1995 gajim/groupchat_control.py:2000
-#: gajim/groupchat_control.py:2011
-msgid "Unable to join group chat"
-msgstr "Neeblas aliĝi al babilejo"
-
-#: gajim/groupchat_control.py:1986
-#, fuzzy, python-format
-msgid "You are banned from group chat <b>%s</b>."
-msgstr "Al vi oni malpermesis esti en la babilejo."
-
-#: gajim/groupchat_control.py:1991
-#, fuzzy, python-format
-msgid "Remote server <b>%s</b> does not exist."
-msgstr "Tiu babilejo ne ekzistas."
-
-#: gajim/groupchat_control.py:1996
-#, fuzzy, python-format
-msgid "Group chat <b>%s</b> does not exist."
-msgstr "Tiu babilejo ne ekzistas."
-
-#: gajim/groupchat_control.py:2001
+#: gajim/groupchat_control.py:1981
 #, fuzzy
-msgid "Group chat creation is not permitted."
-msgstr "Babileja kreado limigitas."
-
-#: gajim/groupchat_control.py:2005
-#, fuzzy
-msgid "Unable to join groupchat"
-msgstr "Neeblas aliĝi al babilejo"
-
-#: gajim/groupchat_control.py:2006
-#, fuzzy, python-format
-msgid "You must use your registered nickname in <b>%s</b>."
-msgstr "Vi devas uzi vian registritan kaŝnomon."
-
-#: gajim/groupchat_control.py:2012
-#, fuzzy, python-format
-msgid "You are not in the members list in groupchat %s."
-msgstr "Vi ne ĉeestas en membrolisto."
-
-#: gajim/groupchat_control.py:2068
-#, fuzzy
-msgid "Room has been destroyed"
+msgid "Group chat has been destroyed"
 msgstr "Permeso estas forigita"
 
-#: gajim/groupchat_control.py:2073
-#, python-format
-msgid "You can join this room instead: xmpp:%s?join"
-msgstr ""
+#: gajim/groupchat_control.py:1986
+#, fuzzy, python-format
+msgid "You can join this group chat instead: xmpp:%s?join"
+msgstr "%s aliĝis al la babilejo"
 
-#: gajim/groupchat_control.py:2306
+#: gajim/groupchat_control.py:2214
 #, fuzzy
 msgid "Leave Group Chat"
 msgstr "Nova babilejo"
 
-#: gajim/groupchat_control.py:2307
+#: gajim/groupchat_control.py:2215
 #, fuzzy
 msgid "Are you sure you want to leave this group chat?"
 msgstr "Ĉu vi certe volas foriri el babilejo \"%s\"?"
 
-#: gajim/groupchat_control.py:2308
+#: gajim/groupchat_control.py:2216
 #, fuzzy, python-format
-msgid "If you close this window, you will be disconnected from '%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:2314
+#: gajim/groupchat_control.py:2222 gajim/roster_window.py:5177
 msgid "_Leave"
 msgstr ""
 
-#: gajim/groupchat_control.py:2377
+#: gajim/groupchat_control.py:2280 gajim/roster_window.py:3008
 #, fuzzy, python-format
 msgid "%(jid)s has been invited to this group chat"
 msgstr "%(nick)s estas elpelita de %(who)s: %(reason)s"
 
-#: gajim/groupchat_control.py:2527
+#: gajim/groupchat_control.py:2463
 #, python-format
 msgid "Kicking %s"
 msgstr "Elpelatas %s"
 
-#: gajim/groupchat_control.py:2528 gajim/groupchat_control.py:2829
+#: gajim/groupchat_control.py:2464 gajim/groupchat_control.py:2765
 msgid "You may specify a reason below:"
 msgstr "Vi povas specifi kialon sube:"
 
-#: gajim/groupchat_control.py:2828
+#: gajim/groupchat_control.py:2764
 #, python-format
 msgid "Banning %s"
 msgstr "Malpermesas %s"
 
-#: gajim/chat_control.py:408
+#: gajim/chat_control.py:432
 #, fuzzy
 msgid "Show a list of formattings"
 msgstr "Klaku por enigi mienon (Alt+M)"
 
-#: gajim/chat_control.py:412
+#: gajim/chat_control.py:436
 #, fuzzy
 msgid "This contact does not support HTML"
 msgstr "Listo de aktivaj, plenumitaj kaj haltitaj dosiertransmetoj"
 
-#: gajim/chat_control.py:562
+#: gajim/chat_control.py:586
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr ""
 
-#: gajim/chat_control.py:686
+#: gajim/chat_control.py:710
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s de babilejo %(room_name)s"
 
-#: gajim/chat_control.py:832
+#: gajim/chat_control.py:856
 #, python-format
 msgid "%(type)s encryption is active %(authenticated)s"
 msgstr ""
 
-#: gajim/chat_control.py:1160 gajim/chat_control.py:1168
+#: gajim/chat_control.py:1184 gajim/chat_control.py:1192
 #, fuzzy
 msgid "Close"
 msgstr "_Sendi kaj fermi"
 
-#: gajim/chat_control.py:1161
+#: gajim/chat_control.py:1185
 #, fuzzy, python-format
 msgid "You just received a new message from %s"
 msgstr "Vi ĵus ricevis novan mesaĝon de \"%s\""
 
-#: gajim/chat_control.py:1163
+#: gajim/chat_control.py:1187
 #, fuzzy
 msgid ""
 "If you close this tab while having chat history disabled, this message will "
@@ -1198,16 +1162,16 @@ msgstr ""
 "Se vi fermos tiun ĉi slipon kaj la historio estas malŝalta, tiu ĉi mesaĝo "
 "perdiĝos."
 
-#: gajim/chat_control.py:1208
+#: gajim/chat_control.py:1232
 msgid "Ping?"
 msgstr ""
 
-#: gajim/chat_control.py:1211
+#: gajim/chat_control.py:1235
 #, python-format
 msgid "Pong! (%s seconds)"
 msgstr ""
 
-#: gajim/chat_control.py:1308
+#: gajim/chat_control.py:1332
 #, fuzzy, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -1216,296 +1180,303 @@ msgstr ""
 "Temo: %s\n"
 "%s"
 
-#: gajim/chat_control.py:1416
+#: gajim/chat_control.py:1440
 #, fuzzy, python-format
 msgid "%(name)s is now %(show)s %(status)s"
 msgstr "%(nick)s nun estas %(status)s"
 
-#: gajim/chat_control.py:1476 gajim/data/gui/application_menu.ui:32
+#: gajim/chat_control.py:1500 gajim/data/gui/application_menu.ui:32
 #: gajim/gtk/http_upload_progress.py:35
 #, fuzzy
 msgid "File Transfer"
 msgstr "Dosieraj transmetoj"
 
-#: gajim/chat_control.py:1480
+#: gajim/chat_control.py:1504
 #, fuzzy
 msgid "Size"
 msgstr "Longo: %s"
 
-#: gajim/chat_control.py:1482 gajim/chat_control.py:1546
+#: gajim/chat_control.py:1506 gajim/chat_control.py:1566
+#: gajim/gui_interface.py:190
 #: gajim/data/gui/groupchat_invitation_received.ui:77
-#: gajim/gtk/filetransfer.py:485
+#: gajim/gtk/filetransfer.py:490
 #, fuzzy
 msgid "_Accept"
 msgstr "Akcepti"
 
-#: gajim/chat_control.py:1484 gajim/chat_control.py:1548
+#: gajim/chat_control.py:1508 gajim/chat_control.py:1568
 #: gajim/data/gui/groupchat_invitation_received.ui:62
 #, fuzzy
 msgid "_Decline"
 msgstr "_Senkonekta"
 
-#: gajim/chat_control.py:1506 gajim/gui_interface.py:791
-#: gajim/gui_interface.py:821 gajim/gui_interface.py:847
+#: gajim/chat_control.py:1530 gajim/gui_interface.py:777
+#: gajim/gui_interface.py:807 gajim/gui_interface.py:833
 #: gajim/gtk/notification.py:173 gajim/gtk/notification.py:278
 msgid "File Transfer Completed"
 msgstr "Dosiera transmeto plenumis"
 
-#: gajim/chat_control.py:1510 gajim/gtk/filetransfer.py:259
+#: gajim/chat_control.py:1534 gajim/gtk/filetransfer.py:258
 #, fuzzy
 msgid "Open _Folder"
 msgstr "_Malfermi enhavantan dosierujon"
 
-#: gajim/chat_control.py:1512 gajim/chat_control.py:1521
+#: gajim/chat_control.py:1536 gajim/chat_control.py:1545
+#: gajim/data/gui/groupchat_control.ui:962
+#: gajim/data/gui/groupchat_control.ui:1049
+#: gajim/data/gui/groupchat_control.ui:1155
 #, fuzzy
 msgid "_Close"
 msgstr "_Sendi kaj fermi"
 
-#: gajim/chat_control.py:1543 gajim/gui_interface.py:484
+#: gajim/chat_control.py:1563 gajim/gui_interface.py:473
+#: gajim/data/gui/groupchat_invitation_received.ui:42
 #: gajim/gtk/notification.py:174 gajim/gtk/notification.py:195
 #: gajim/gtk/notification.py:281
-msgid "Groupchat Invitation"
+#, fuzzy
+msgid "Group Chat Invitation"
 msgstr "Babileja invitilo"
 
-#: gajim/chat_control.py:1568 gajim/roster_window.py:1954
+#: gajim/chat_control.py:1588 gajim/roster_window.py:1951
 #, fuzzy
 msgid "Remote contact stopped transfer"
 msgstr "Forigas kontakton el kontaktlisto"
 
-#: gajim/chat_control.py:1570 gajim/roster_window.py:1956
+#: gajim/chat_control.py:1590 gajim/roster_window.py:1953
 #, fuzzy
 msgid "Error opening file"
 msgstr "Eraro dum legado de dosiero:"
 
-#: gajim/chat_control.py:1572 gajim/gtk/filetransfer.py:297
+#: gajim/chat_control.py:1592 gajim/gtk/filetransfer.py:296
 #, fuzzy
 msgid "File transfer stopped"
 msgstr "Dosiera transmeto haltitas"
 
-#: gajim/chat_control.py:1575 gajim/gtk/filetransfer.py:275
-#: gajim/gtk/filetransfer.py:284
+#: gajim/chat_control.py:1595 gajim/gtk/filetransfer.py:274
+#: gajim/gtk/filetransfer.py:283
 msgid "File transfer cancelled"
 msgstr "Dosiera transmeto nuligitas"
 
-#: gajim/chat_control.py:1576
+#: gajim/chat_control.py:1596
 msgid "Connection with peer cannot be established."
 msgstr "Konekto kun punkto neestableblas."
 
-#: gajim/application.py:72
+#: gajim/application.py:75
 #, fuzzy
 msgid "Show the application's version"
 msgstr "Uzi pletpiktogramon"
 
-#: gajim/application.py:79
+#: gajim/application.py:82
 #, fuzzy
 msgid "Show only critical errors"
 msgstr "Montri nur en _kontaktlisto"
 
-#: gajim/application.py:86
+#: gajim/application.py:89
 msgid "Separate profile files completely (even history database and plugins)"
 msgstr ""
 
-#: gajim/application.py:94
+#: gajim/application.py:97
 msgid "Print XML stanzas and other debug information"
 msgstr ""
 
-#: gajim/application.py:101
+#: gajim/application.py:104
 #, fuzzy
 msgid "Use defined profile in configuration directory"
 msgstr "Detala agorda administrilo"
 
-#: gajim/application.py:109
+#: gajim/application.py:112
 #, fuzzy
 msgid "Set configuration directory"
 msgstr "Agordo de babilejo"
 
-#: gajim/application.py:117
+#: gajim/application.py:120
 msgid "Configure logging system"
 msgstr ""
 
-#: gajim/application.py:125
+#: gajim/application.py:128
 #, fuzzy
 msgid "Show all warnings"
 msgstr "Montri ĉiujn nelegitajn _eventojn"
 
-#: gajim/application.py:132
+#: gajim/application.py:135
 msgid "Open IPython shell"
 msgstr ""
 
-#: gajim/application.py:139
+#: gajim/application.py:142
 msgid "Pops up a window with the next pending event"
 msgstr "Antaŭigas fenestron kun la sekva atendanta evento"
 
-#: gajim/application.py:145 gajim/data/gui/shortcuts_window.ui:203
+#: gajim/application.py:148 gajim/data/gui/shortcuts_window.ui:203
 #: data/org.gajim.Gajim.desktop.in:21
 #, fuzzy
 msgid "Start a new chat"
 msgstr "Babili"
 
-#: gajim/application.py:152
+#: gajim/application.py:155
 msgid "Simulate loss of connectivity"
 msgstr ""
 
-#: gajim/application.py:159
+#: gajim/application.py:162
 msgid "Simulate regaining connectivity"
 msgstr ""
 
-#: gajim/application.py:201 gajim/gui_interface.py:133
+#: gajim/application.py:204 gajim/gui_interface.py:133
 msgid "Database Error"
 msgstr ""
 
-#: gajim/roster_window.py:294 gajim/roster_window.py:1030
+#: gajim/roster_window.py:291 gajim/roster_window.py:1027
 msgid "Merged accounts"
 msgstr "Unuigaj kontoj"
 
-#: gajim/roster_window.py:853 gajim/roster_window.py:1631
-#: gajim/roster_window.py:1664 gajim/roster_window.py:1715
-#: gajim/roster_window.py:1717 gajim/roster_window.py:1872
-#: gajim/roster_window.py:2531 gajim/roster_window.py:5025
-#: gajim/common/contacts.py:188 gajim/common/contacts.py:447
-#: gajim/common/helpers.py:83 gajim/gtk/discovery.py:129
-#: gajim/gtk/discovery.py:130 gajim/gtk/discovery.py:1416
+#: gajim/roster_window.py:850 gajim/roster_window.py:1628
+#: gajim/roster_window.py:1661 gajim/roster_window.py:1712
+#: gajim/roster_window.py:1714 gajim/roster_window.py:1869
+#: gajim/roster_window.py:2528 gajim/roster_window.py:4331
+#: gajim/roster_window.py:4964 gajim/common/contacts.py:204
+#: gajim/common/contacts.py:463 gajim/common/helpers.py:86
+#: gajim/gtk/discovery.py:127 gajim/gtk/discovery.py:128
+#: gajim/gtk/discovery.py:1414
 msgid "Transports"
 msgstr "Transportiloj"
 
-#: gajim/roster_window.py:1723 gajim/roster_window.py:1725
-#: gajim/roster_window.py:4995 gajim/gui_interface.py:1613
-#: gajim/gui_interface.py:1639 gajim/common/contacts.py:186
-#: gajim/common/helpers.py:83 gajim/common/modules/adhoc_commands.py:245
+#: gajim/roster_window.py:1720 gajim/roster_window.py:1722
+#: gajim/roster_window.py:4331 gajim/roster_window.py:4934
+#: gajim/gui_interface.py:1527 gajim/common/contacts.py:202
+#: gajim/common/helpers.py:86 gajim/common/modules/adhoc_commands.py:245
 #, fuzzy
-msgid "Groupchats"
+msgid "Group chats"
 msgstr "Babilejoj"
 
-#: gajim/roster_window.py:2012
+#: gajim/roster_window.py:2009
 #, fuzzy
 msgid "Authorization sent"
 msgstr "Permeso estas sendita"
 
-#: gajim/roster_window.py:2013
+#: gajim/roster_window.py:2010
 #, fuzzy, python-format
 msgid "\"%s\" will now see your status."
 msgstr "Ekde nun \"%s\" konos vian staton."
 
-#: gajim/roster_window.py:2031
+#: gajim/roster_window.py:2028
 msgid "Subscription request has been sent"
 msgstr "Demando pri abono estas sendita"
 
-#: gajim/roster_window.py:2032
-#, python-format
-msgid "If \"%s\" accepts this request you will know his or her status."
+#: gajim/roster_window.py:2029
+#, 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:2046
+#: gajim/roster_window.py:2043
 #, fuzzy
 msgid "Authorization removed"
 msgstr "Permeso estas forigita"
 
-#: gajim/roster_window.py:2047
+#: gajim/roster_window.py:2044
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Ekde nun \"%s\" ĉiam vidos vin kiel senkonekta."
 
-#: gajim/roster_window.py:2250 gajim/roster_window.py:3504
+#: gajim/roster_window.py:2247 gajim/roster_window.py:3460
 msgid "Disconnect for Invisibility"
 msgstr ""
 
-#: gajim/roster_window.py:2251 gajim/roster_window.py:3505
+#: gajim/roster_window.py:2248 gajim/roster_window.py:3461
 msgid "You are participating in one or more group chats"
 msgstr "Vi partoprenas en unu aŭ kelkaj babilejoj"
 
-#: gajim/roster_window.py:2252 gajim/roster_window.py:3506
+#: gajim/roster_window.py:2249 gajim/roster_window.py:3462
 #, fuzzy
 msgid ""
-"Changing your status to invisible will result in disconnection from those "
-"group chats.\n"
+"Changing your status to invisible will result in you leaving those group "
+"chats.\n"
 "Are you sure you want to go invisible?"
 msgstr ""
 "Ŝanĝo de via stato per nevidebla okazigos diskonektadon de tiuj babilejoj. "
 "Ĉu vi certas ke vi volas iĝi nevidebla?"
 
-#: gajim/roster_window.py:2257 gajim/roster_window.py:3512
-#: gajim/roster_window.py:5238 gajim/data/gui/gc_control_popup_menu.ui:120
+#: gajim/roster_window.py:2254 gajim/roster_window.py:3468
+#: gajim/data/gui/gc_control_popup_menu.ui:120
 #, fuzzy
 msgid "_Disconnect"
 msgstr "Kontakto malkonektita"
 
-#: gajim/roster_window.py:2285
+#: gajim/roster_window.py:2282
 #, fuzzy
 msgid "desynced"
 msgstr "Krome"
 
-#: gajim/roster_window.py:2353 gajim/data/gui/shortcuts_window.ui:224
+#: gajim/roster_window.py:2350 gajim/data/gui/shortcuts_window.ui:224
 #, fuzzy
 msgid "Quit Gajim"
 msgstr "Gajim"
 
-#: gajim/roster_window.py:2354
+#: gajim/roster_window.py:2351
 #, fuzzy
 msgid "You are about to quit Gajim"
 msgstr "Ĉu vi certe volas foriri el babilejo \"%s\"?"
 
-#: gajim/roster_window.py:2355
+#: gajim/roster_window.py:2352
 #, fuzzy
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Ĉu vi certe volas foriri el babilejo \"%s\"?"
 
-#: gajim/roster_window.py:2356
+#: gajim/roster_window.py:2353
 msgid "_Always quit when closing Gajim"
 msgstr ""
 
-#: gajim/roster_window.py:2359 gajim/roster_window.py:2455
-#: gajim/roster_window.py:2495 gajim/data/gui/systray_context_menu.ui:90
+#: gajim/roster_window.py:2356 gajim/roster_window.py:2452
+#: gajim/roster_window.py:2492 gajim/data/gui/systray_context_menu.ui:83
 #, fuzzy
 msgid "_Quit"
 msgstr "_Eliri"
 
-#: gajim/roster_window.py:2448
+#: gajim/roster_window.py:2445
 #, fuzzy
 msgid "Stop File Transfers"
 msgstr "Dosieraj transmetoj"
 
-#: gajim/roster_window.py:2449
+#: gajim/roster_window.py:2446
 #, fuzzy
 msgid "You still have running file transfers"
 msgstr "Nuligi dosiertransmeton"
 
-#: gajim/roster_window.py:2450
+#: gajim/roster_window.py:2447
 msgid ""
 "If you quit now, the file(s) being transferred will be lost.\n"
 "Do you still want to quit?"
 msgstr ""
 
-#: gajim/roster_window.py:2488
+#: gajim/roster_window.py:2485
 #, fuzzy
 msgid "Unread Messages"
 msgstr "Nelegitaj eventoj"
 
-#: gajim/roster_window.py:2489
+#: gajim/roster_window.py:2486
 #, fuzzy
 msgid "You still have unread messages"
 msgstr "Vi havas nelegitajn mesaĝojn"
 
-#: gajim/roster_window.py:2490
+#: gajim/roster_window.py:2487
 #, 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 "Mesaĝoj disponeblos por legi ĝin poste nur se vi ŝaltis historion."
 
-#: gajim/roster_window.py:2760
+#: gajim/roster_window.py:2753
 msgid "You have unread messages"
 msgstr "Vi havas nelegitajn mesaĝojn"
 
-#: gajim/roster_window.py:2761
+#: gajim/roster_window.py:2754
 msgid "You must read them before removing this transport."
 msgstr "Legu ilin antaŭ forigi tiun transportilon."
 
-#: gajim/roster_window.py:2764
+#: gajim/roster_window.py:2757
 #, fuzzy, python-format
 msgid "Transport '%s' will be removed"
 msgstr "Transportilo \"%s\" estos forigita"
 
-#: gajim/roster_window.py:2765
+#: gajim/roster_window.py:2758
 #, fuzzy
 msgid ""
 "You will no longer be able to send and receive messages from and to contacts "
@@ -1514,11 +1485,11 @@ msgstr ""
 "Vi ne plu eblos sendi kaj ricevi mesaĝojn kun kontaktoj el tiu ĉi "
 "transportilo."
 
-#: gajim/roster_window.py:2768
+#: gajim/roster_window.py:2761
 msgid "Transports will be removed"
 msgstr "Transportiloj estos forigita"
 
-#: gajim/roster_window.py:2773
+#: gajim/roster_window.py:2766
 #, fuzzy, python-format
 msgid ""
 "You will no longer be able to send and receive messages from and to contacts "
@@ -1528,85 +1499,80 @@ msgstr ""
 "Vi ne plu eblos sendi kaj ricevi mesaĝojn kun kontaktoj el tiu ĉi "
 "transportilo."
 
-#: gajim/roster_window.py:2777
+#: gajim/roster_window.py:2770
 #, fuzzy
 msgid "Remove Transport"
 msgstr "Montri Trans_portilojn"
 
-#: gajim/roster_window.py:2844
+#: gajim/roster_window.py:2837
 #, fuzzy
 msgid "Block Contact"
 msgstr "Kontaktoj"
 
-#: gajim/roster_window.py:2845
+#: gajim/roster_window.py:2838
 #, fuzzy
 msgid "Really block this contact?"
 msgstr "Ĉu OpenPGP estas ŝaltita por tiu ĉi kontakto?"
 
-#: gajim/roster_window.py:2846
+#: gajim/roster_window.py:2839
 msgid ""
 "This contact will see you offline and you will not receive any messages sent "
 "to you by this contact."
 msgstr ""
 
-#: gajim/roster_window.py:2851
+#: gajim/roster_window.py:2844
 #, fuzzy
 msgid "_Block Contact"
 msgstr "Kontaktoj"
 
-#: gajim/roster_window.py:2896
+#: gajim/roster_window.py:2889
 msgid "Rename Contact"
 msgstr "Renomigado de kontakto"
 
-#: gajim/roster_window.py:2897
+#: gajim/roster_window.py:2890
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Enigu novan kaŝnomon por kontakto %s"
 
-#: gajim/roster_window.py:2904
+#: gajim/roster_window.py:2897
 msgid "Rename Group"
 msgstr "Renomigi grupon"
 
-#: gajim/roster_window.py:2905
+#: gajim/roster_window.py:2898
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Enigu novan nomon por la grupo %s"
 
-#: gajim/roster_window.py:2953 gajim/roster_window.py:2954
+#: gajim/roster_window.py:2946 gajim/roster_window.py:2947
 msgid "Remove Group"
 msgstr "Forigi grupon"
 
-#: gajim/roster_window.py:2955
+#: gajim/roster_window.py:2948
 #, fuzzy, python-format
 msgid "Do you want to remove %s from the contact list?"
 msgstr "Ĉu vi volas forigi la grupon %s de la kontaktlisto?"
 
-#: gajim/roster_window.py:2956
+#: gajim/roster_window.py:2949
 #, fuzzy
 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:3044
-#, fuzzy, python-format
-msgid "%(jid)s has been invited in this room"
-msgstr "%(nick)s estas elpelita de %(who)s: %(reason)s"
-
-#: gajim/roster_window.py:3353
+#: gajim/roster_window.py:3309
 #, fuzzy
 msgid "Remove Contact"
 msgstr "Renomigado de kontakto"
 
-#: gajim/roster_window.py:3354
+#: gajim/roster_window.py:3310
 #, fuzzy
 msgid "Remove contact from contact list"
 msgstr "Forigas kontakton el kontaktlisto"
 
-#: gajim/roster_window.py:3355
+#: gajim/roster_window.py:3311
 #, python-format
 msgid "You are about to remove '%(name)s' (%(jid)s) from your contact list.\n"
 msgstr ""
 
-#: gajim/roster_window.py:3364 gajim/roster_window.py:3384
+#: gajim/roster_window.py:3320 gajim/roster_window.py:3340
 #, fuzzy
 msgid ""
 "By removing this contact you also remove authorization. This means the "
@@ -1615,22 +1581,22 @@ msgstr ""
 "Forigante tiujn kontaktojn: %s\n"
 "vi forigas ankaŭ permesojn, rezulte ili ĉiam vidos vin kiel senkonekta."
 
-#: gajim/roster_window.py:3375
+#: gajim/roster_window.py:3331
 #, fuzzy
 msgid "Do you want to continue?"
 msgstr "Kion vi volas fari?"
 
-#: gajim/roster_window.py:3386
+#: gajim/roster_window.py:3342
 #, 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:3393
+#: gajim/roster_window.py:3349
 #, fuzzy
 msgid "Remove contacts from contact list"
 msgstr "Forigas kontakton el kontaktlisto"
 
-#: gajim/roster_window.py:3399
+#: gajim/roster_window.py:3355
 #, fuzzy, python-format
 msgid ""
 "By removing the following contacts, you will also remove authorization. This "
@@ -1641,24 +1607,24 @@ msgstr ""
 "Forigante tiujn kontaktojn: %s\n"
 "vi forigas ankaŭ permesojn, rezulte ili ĉiam vidos vin kiel senkonekta."
 
-#: gajim/roster_window.py:3403
+#: gajim/roster_window.py:3359
 #, fuzzy
 msgid "Remove Contacts"
 msgstr "Renomigado de kontakto"
 
-#: gajim/roster_window.py:3423
+#: gajim/roster_window.py:3379
 msgid "No account available"
 msgstr "Neniu konto disponeblas"
 
-#: gajim/roster_window.py:3424
+#: gajim/roster_window.py:3380
 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:4060
+#: gajim/roster_window.py:4011
 msgid "Metacontacts storage not supported by your server"
 msgstr "Metakontakta tenejo ne estas subtenata de via servilo"
 
-#: gajim/roster_window.py:4062
+#: gajim/roster_window.py:4013
 #, fuzzy
 msgid ""
 "Your server does not support storing metacontacts information. So this "
@@ -1667,12 +1633,12 @@ msgstr ""
 "Via servilo ne subtenas konservadon de metakontakta informo. Do tia informo "
 "ne estas konservota dum sekva rekonekto."
 
-#: gajim/roster_window.py:4159
+#: gajim/roster_window.py:4110
 #, 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:4160
+#: gajim/roster_window.py:4111
 #, fuzzy
 msgid ""
 "Metacontacts are a way to regroup several contacts in one single contact. "
@@ -1683,128 +1649,119 @@ msgstr ""
 "Ĝenerale ĝi estas uzata kiam unu persono havas kelkajn jabber-kontojn aŭ "
 "transportajn kontojn."
 
-#: gajim/roster_window.py:4164
+#: gajim/roster_window.py:4115
 #, fuzzy
 msgid "Create Metacontact"
 msgstr "Renomigado de kontakto"
 
-#: gajim/roster_window.py:4170
+#: gajim/roster_window.py:4121 gajim/data/gui/groupchat_creation.ui:317
 #, fuzzy
 msgid "_Create"
 msgstr "Malŝaltita"
 
-#: gajim/roster_window.py:4287
+#: gajim/roster_window.py:4238
 #, fuzzy
 msgid "Invalid file URI:"
 msgstr "Malkorekta dosiero"
 
-#: gajim/roster_window.py:4298
+#: gajim/roster_window.py:4249
 #, fuzzy
 msgid "Send file?"
 msgstr "Sendi _dosieron"
 
-#: gajim/roster_window.py:4299
+#: gajim/roster_window.py:4250
 #, fuzzy, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
 msgstr[0] "%s volas sendi al vi dosieron:"
 msgstr[1] "%s volas sendi al vi dosieron:"
 
-#: gajim/roster_window.py:4451
+#: gajim/roster_window.py:4401
 #, fuzzy, python-format
 msgid "Send %(from)s to %(to)s"
 msgstr "Sendi %s"
 
-#: gajim/roster_window.py:4464
+#: gajim/roster_window.py:4414
 #, fuzzy, python-format
 msgid "Make %s first contact"
 msgstr "Igi %s kaj %s metakontaktoj"
 
-#: gajim/roster_window.py:4469
+#: gajim/roster_window.py:4419
 #, fuzzy, python-format
 msgid "Make %(contact1)s and %(contact2)s metacontacts"
 msgstr "Igi %s kaj %s metakontaktoj"
 
-#: gajim/roster_window.py:4825 gajim/roster_window.py:4923
+#: gajim/roster_window.py:4775 gajim/roster_window.py:4862
 msgid "_Change Status Message"
 msgstr "Ŝanĝi stat_mesaĝon"
 
-#: gajim/roster_window.py:4845
+#: gajim/roster_window.py:4795
 #, fuzzy
 msgid "Publish Tune"
 msgstr "_Publici"
 
-#: gajim/roster_window.py:4856
+#: gajim/roster_window.py:4806
 #, fuzzy
 msgid "Publish Location"
 msgstr "_Publici"
 
-#: gajim/roster_window.py:4868
-#, fuzzy
-msgid "Configure Services…"
-msgstr "_Serĉi servojn..."
-
-#: gajim/roster_window.py:4997
+#: gajim/roster_window.py:4936
 msgid "_Maximize All"
 msgstr ""
 
-#: gajim/roster_window.py:5004 gajim/roster_window.py:5146
+#: gajim/roster_window.py:4943 gajim/roster_window.py:5085
 msgid "Send Group M_essage"
 msgstr "Sendi _grupan mesaĝon"
 
-#: gajim/roster_window.py:5011
+#: gajim/roster_window.py:4950
 msgid "To all users"
 msgstr "Al ĉiuj uzantoj"
 
-#: gajim/roster_window.py:5015
+#: gajim/roster_window.py:4954
 msgid "To all online users"
 msgstr "Al ĉiuj konektitaj uzantoj"
 
-#: gajim/roster_window.py:5027 gajim/roster_window.py:5152
+#: gajim/roster_window.py:4966 gajim/roster_window.py:5091
 #: gajim/data/gui/gc_occupants_menu.ui:110
 #: gajim/data/gui/contact_context_menu.ui:36
 msgid "In_vite to"
 msgstr "In_viti al"
 
-#: gajim/roster_window.py:5162
+#: gajim/roster_window.py:5101
 #, fuzzy
 msgid "_Manage Contacts"
 msgstr "Renomigado de kontakto"
 
-#: gajim/roster_window.py:5168
+#: gajim/roster_window.py:5107
 #, fuzzy
 msgid "Edit _Groups…"
 msgstr "Aranĝi _Grupojn"
 
-#: gajim/roster_window.py:5189 gajim/data/gui/filetransfers.ui:12
+#: gajim/roster_window.py:5128 gajim/data/gui/filetransfers.ui:12
 #: gajim/data/gui/remove_account_window.ui:134
 msgid "_Remove"
 msgstr "_Forigi"
 
-#: gajim/roster_window.py:5226
+#: gajim/roster_window.py:5165
 msgid "_Maximize"
 msgstr ""
 
-#: gajim/roster_window.py:5233
+#: gajim/roster_window.py:5172
 #, fuzzy
 msgid "_Reconnect"
 msgstr "Kontakto malkonektita"
 
-#: gajim/roster_window.py:5254 gajim/data/gui/gc_occupants_menu.ui:170
+#: gajim/roster_window.py:5193 gajim/data/gui/gc_occupants_menu.ui:170
 #: gajim/data/gui/gc_control_popup_menu.ui:113
 #: gajim/data/gui/contact_context_menu.ui:205
 msgid "_History"
 msgstr "_Historio"
 
-#: gajim/roster_window.py:5335 gajim/data/gui/application_menu.ui:86
+#: gajim/roster_window.py:5274 gajim/data/gui/application_menu.ui:83
 #: gajim/data/gui/history_window.ui:57
 msgid "History Manager"
 msgstr "Historia administrilo"
 
-#: gajim/roster_window.py:5343
-msgid "_Join New Group Chat"
-msgstr "_Eniri babilejen"
-
 #: gajim/dataforms_widget.py:585
 #, fuzzy
 msgid "Unable to load image"
@@ -1928,276 +1885,293 @@ msgstr "Temo: %s\n"
 msgid "Write a message…"
 msgstr "Nova privata mesaĝo"
 
-#: gajim/message_window.py:250
+#: gajim/message_window.py:356
+#, fuzzy
+msgid "Close Tabs"
+msgstr "_Sendi kaj fermi"
+
+#: gajim/message_window.py:357
 #, fuzzy
 msgid "You are going to close several tabs"
 msgstr "Vi nekonektitas al la servilo"
 
-#: gajim/message_window.py:251
+#: gajim/message_window.py:358
 #, fuzzy
 msgid "Do you really want to close them all?"
 msgstr "Ĉu vi efektive volas forigi la elektitan mesaĝon?"
 
-#: gajim/message_window.py:539
+#: gajim/message_window.py:514
 #, fuzzy
 msgid "?Noun:Chats"
 msgstr "Babilejoj"
 
-#: gajim/message_window.py:543
+#: gajim/message_window.py:518
 #, fuzzy
 msgid "Group Chats"
 msgstr "_Babilejo"
 
-#: gajim/message_window.py:547
+#: gajim/message_window.py:522
 msgid "Private Chats"
 msgstr "Privataj interparoloj"
 
-#: gajim/message_window.py:553
+#: gajim/message_window.py:528
 msgid "Messages"
 msgstr "Mesaĝoj"
 
-#: gajim/gui_interface.py:173
+#: gajim/gui_interface.py:170
+#, 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:175
 msgid "Do you accept this request?"
 msgstr "Ĉu vi akceptas tiun peton?"
 
-#: gajim/gui_interface.py:175
+#: gajim/gui_interface.py:177
 #, fuzzy, python-format
-msgid "Do you accept this request on account %s?"
+msgid "Do you accept this request (account: %s)?"
 msgstr "Ĉu vi akceptas tiun peton?"
 
-#: gajim/gui_interface.py:178
-#, 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:182
+#, fuzzy
+msgid "Authorization"
+msgstr "Permeso estas sendita"
 
-#: gajim/gui_interface.py:194 gajim/gtk/notification.py:175
+#: gajim/gui_interface.py:186 gajim/gui_interface.py:420
+#: gajim/gtk/filetransfer.py:338
+#, fuzzy
+msgid "_No"
+msgstr "Neniu"
+
+#: gajim/gui_interface.py:205 gajim/gtk/notification.py:175
 #: gajim/gtk/notification.py:197
 msgid "Connection Failed"
 msgstr "Konektado malsukcesis"
 
-#: gajim/gui_interface.py:279 gajim/gui_interface.py:529
-msgid "Password Required"
-msgstr "Pasvorto necesas"
-
-#: gajim/gui_interface.py:280
-#, fuzzy, python-format
-msgid "A Password is required to join the room %s. Please type it."
-msgstr "Necesas pasvorto por aliĝi al la babilejo."
-
-#: gajim/gui_interface.py:342 gajim/gui_interface.py:346
+#: gajim/gui_interface.py:325 gajim/gui_interface.py:329
 #, fuzzy, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr "%(nickname)s: %(message)s"
 
-#: gajim/gui_interface.py:357 gajim/gui_interface.py:376
+#: gajim/gui_interface.py:340 gajim/gui_interface.py:359
 #: gajim/common/modules/message.py:122
 #, fuzzy, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "eraro dum sendado %s ( %s )"
 
-#: gajim/gui_interface.py:401 gajim/gtk/notification.py:175
+#: gajim/gui_interface.py:384 gajim/gtk/notification.py:175
 #, fuzzy
 msgid "Subscription request"
 msgstr "Mendo de abono"
 
-#: gajim/gui_interface.py:413 gajim/common/contacts.py:184
-#: gajim/common/helpers.py:83
+#: gajim/gui_interface.py:396 gajim/common/contacts.py:200
+#: gajim/common/helpers.py:86
 msgid "Observers"
 msgstr "Rigardiloj"
 
-#: gajim/gui_interface.py:422
+#: gajim/gui_interface.py:405
 msgid "Authorization accepted"
 msgstr "Permespeto akceptitas"
 
-#: gajim/gui_interface.py:423
+#: gajim/gui_interface.py:406
 #, 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:431
-#, python-format
-msgid "Contact \"%s\" removed subscription from you"
+#: gajim/gui_interface.py:415
+#, fuzzy
+msgid "Subscription Removed"
+msgstr "Mendo de abono"
+
+#: gajim/gui_interface.py:416
+#, fuzzy, python-format
+msgid "Contact '%s' removed subscription from you"
 msgstr "Kontakto \"%s\" nuligis abonon de vi"
 
-#: gajim/gui_interface.py:432
+#: gajim/gui_interface.py:417
 msgid ""
-"You will always see them as offline.\n"
+"You will always see this contact as offline.\n"
 "Do you want to remove them from your contact list?"
 msgstr ""
 
-#: gajim/gui_interface.py:453 gajim/gtk/notification.py:176
+#: gajim/gui_interface.py:442 gajim/gtk/notification.py:176
 #, fuzzy
 msgid "Unsubscribed"
 msgstr "_Malaboni"
 
-#: gajim/gui_interface.py:465
+#: gajim/gui_interface.py:454
 #, python-format
 msgid "%(jid)s declined the invitation: %(reason)s"
 msgstr ""
 
-#: gajim/gui_interface.py:469
+#: gajim/gui_interface.py:458
 #, python-format
 msgid "%(jid)s declined the invitation"
 msgstr ""
 
-#: gajim/gui_interface.py:485
+#: gajim/gui_interface.py:474
 #, 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:506
+#: gajim/gui_interface.py:495
 #, fuzzy
 msgid "Certificate Passphrase Required"
 msgstr "Pasfrazo necesas"
 
-#: gajim/gui_interface.py:507
+#: gajim/gui_interface.py:496
 #, fuzzy, python-format
 msgid "Enter the certificate passphrase for account %s"
 msgstr "Enigi GPG-ŝlosilan pasfrazon por konto %s."
 
-#: gajim/gui_interface.py:516 gajim/gtk/accounts.py:963
+#: gajim/gui_interface.py:505 gajim/gtk/accounts.py:966
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Enigi vian pasvorton por konto %s"
 
-#: gajim/gui_interface.py:529 gajim/gtk/accounts.py:964
+#: gajim/gui_interface.py:518
+msgid "Password Required"
+msgstr "Pasvorto necesas"
+
+#: gajim/gui_interface.py:518 gajim/gtk/accounts.py:967
 msgid "Save password"
 msgstr "Konservi pasvorton"
 
-#: gajim/gui_interface.py:601 gajim/gui_interface.py:632
+#: gajim/gui_interface.py:587 gajim/gui_interface.py:618
+#: gajim/gtk/filetransfer.py:332 gajim/gtk/filetransfer.py:333
 #: gajim/gtk/notification.py:173 gajim/gtk/notification.py:276
 msgid "File Transfer Error"
 msgstr "Dosiertransmeta eraro"
 
-#: gajim/gui_interface.py:666
+#: gajim/gui_interface.py:652
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s volas sendi dosieron al vi."
 
-#: gajim/gui_interface.py:668 gajim/gtk/filetransfer.py:479
+#: gajim/gui_interface.py:654 gajim/gtk/filetransfer.py:484
 #: gajim/gtk/notification.py:172 gajim/gtk/notification.py:274
 msgid "File Transfer Request"
 msgstr "Mendo de dosiera transmeto"
 
-#: gajim/gui_interface.py:767
+#: gajim/gui_interface.py:753
 #, fuzzy
 msgid "Remote Contact Stopped Transfer"
 msgstr "Forigas kontakton el kontaktlisto"
 
-#: gajim/gui_interface.py:772
+#: gajim/gui_interface.py:758
 #, fuzzy
 msgid "Error Opening File"
 msgstr "Eraro dum legado de dosiero:"
 
-#: gajim/gui_interface.py:782
+#: gajim/gui_interface.py:768
 #, fuzzy
 msgid "SSL Certificate Error"
 msgstr "Malkorekta salutnomo"
 
-#: gajim/gui_interface.py:795 gajim/gui_interface.py:826
-#: gajim/gui_interface.py:853 gajim/gtk/notification.py:174
+#: gajim/gui_interface.py:781 gajim/gui_interface.py:812
+#: gajim/gui_interface.py:839 gajim/gtk/notification.py:174
 #: gajim/gtk/notification.py:279
 msgid "File Transfer Stopped"
 msgstr "Dosiera transmeto haltitas"
 
-#: gajim/gui_interface.py:799
+#: gajim/gui_interface.py:785
 #, fuzzy
 msgid "File Transfer Failed"
 msgstr "Dosieraj transmetoj"
 
-#: gajim/gui_interface.py:822
+#: gajim/gui_interface.py:808
 #, fuzzy, python-format
 msgid "%(filename)s received from %(name)s."
 msgstr "Transmeto de dosiero %(filename)s de %(name)s haltitas."
 
-#: gajim/gui_interface.py:827
+#: gajim/gui_interface.py:813
 #, 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:833
+#: gajim/gui_interface.py:819
 #, 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:848
+#: gajim/gui_interface.py:834
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Vi sukcese sendis %(filename)s al %(name)s."
 
-#: gajim/gui_interface.py:854
+#: gajim/gui_interface.py:840
 #, 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:860
+#: gajim/gui_interface.py:846
 #, 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:971
+#: gajim/gui_interface.py:957
 msgid "Username Conflict"
 msgstr "Konflikto de salutnomoj"
 
-#: gajim/gui_interface.py:972
+#: gajim/gui_interface.py:958
 msgid "Please type a new username for your local account"
 msgstr "Bonvolu enigi novan salutnomon por via loka konto"
 
-#: gajim/gui_interface.py:995
+#: gajim/gui_interface.py:981
 #, fuzzy
 msgid "Resource Conflict"
 msgstr "Konflikto de salutnomoj"
 
-#: gajim/gui_interface.py:996
+#: gajim/gui_interface.py:982
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
 msgstr ""
 
-#: gajim/gui_interface.py:1053
+#: gajim/gui_interface.py:1039
 #, fuzzy, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s volas sendi dosieron al vi."
 
-#: gajim/gui_interface.py:1055
+#: gajim/gui_interface.py:1041
 #, fuzzy
 msgid "Voice Chat Request"
 msgstr "Mendo de dosiera transmeto"
 
-#: gajim/gui_interface.py:1123 gajim/gtk/account_wizard.py:312
+#: gajim/gui_interface.py:1109 gajim/gtk/account_wizard.py:312
 #, fuzzy
 msgid "Certificate Already in File"
 msgstr "Kontakto jam estas en kontaktlisto"
 
-#: gajim/gui_interface.py:1124 gajim/gtk/account_wizard.py:313
+#: gajim/gui_interface.py:1110 gajim/gtk/account_wizard.py:313
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr ""
 
-#: gajim/gui_interface.py:1145
+#: gajim/gui_interface.py:1131
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid"
 msgstr ""
 
-#: gajim/gui_interface.py:1148
+#: gajim/gui_interface.py:1134
 #, fuzzy, python-format
 msgid ""
 "\n"
 "Unknown SSL error: %d"
 msgstr "Nekonata versio de D-BUS: %s"
 
-#: gajim/gui_interface.py:1150
+#: gajim/gui_interface.py:1136
 #, python-format
 msgid ""
 "\n"
 "SSL Error: <b>%s</b>"
 msgstr ""
 
-#: gajim/gui_interface.py:1155
+#: gajim/gui_interface.py:1141
 msgid "Error verifying SSL certificate"
 msgstr ""
 
-#: gajim/gui_interface.py:1156
+#: gajim/gui_interface.py:1142
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your XMPP server: "
@@ -2205,7 +2179,7 @@ msgid ""
 "Do you still want to connect to this server?"
 msgstr ""
 
-#: gajim/gui_interface.py:1160 gajim/gtk/account_wizard.py:412
+#: gajim/gui_interface.py:1146 gajim/gtk/account_wizard.py:413
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -2215,205 +2189,195 @@ msgid ""
 "%(sha256)s"
 msgstr ""
 
-#: gajim/gui_interface.py:1166
+#: gajim/gui_interface.py:1152
 msgid "Ignore this error for this certificate."
 msgstr ""
 
-#: gajim/gui_interface.py:1174
+#: gajim/gui_interface.py:1160
 #, fuzzy, python-format
 msgid "SSL Certificate Verification for %s"
 msgstr "Aligado de speciala avizo por %s"
 
-#: gajim/gui_interface.py:1442 gajim/gtk/join_groupchat.py:235
-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/gui_interface.py:1448
-#, fuzzy
-msgid "JID is not a Groupchat"
-msgstr "Tio ne estas babilejo"
-
-#: gajim/gui_interface.py:1579
-msgid "This is not a group chat"
-msgstr "Tio ne estas babilejo"
-
-#: gajim/gui_interface.py:1580
-#, python-format
-msgid ""
-"%(room_jid)s is already in your roster. Please check if %(room_jid)s is a "
-"correct group chat name. If it is, delete it from your roster and try "
-"joining the group chat again."
-msgstr ""
-
-#: gajim/gui_interface.py:1604 gajim/dialog_messages.py:58
+#: gajim/gui_interface.py:1577
 msgid "You cannot join a group chat while you are invisible"
 msgstr "Vi ne povas aliĝi al babilejo dum vi estas nevidebla"
 
-#: gajim/gui_interface.py:2037
+#: gajim/gui_interface.py:1976
 msgid "Could not save your settings and preferences"
 msgstr "Ne povis konservi vian agordon"
 
-#: gajim/gui_interface.py:2098
+#: gajim/gui_interface.py:2037
 msgid "Gajim: IPython Console"
 msgstr ""
 
-#: gajim/dialog_messages.py:32
+#: gajim/dialog_messages.py:31 gajim/dialog_messages.py:36
+#: gajim/gtk/single_message.py:305 gajim/gtk/account_wizard.py:229
 #, fuzzy
-msgid "You can not start a new conversation unless you are connected."
-msgstr "Vi ne povas aliĝi al babilejo dum vi estas senkonekta."
-
-#: gajim/dialog_messages.py:36 gajim/dialog_messages.py:41
-#: gajim/gtk/single_message.py:305 gajim/gtk/join_groupchat.py:211
-#: gajim/gtk/account_wizard.py:229
-msgid "Invalid JID"
-msgstr "Malkorekta jabber-ID"
+msgid "Invalid XMPP Address"
+msgstr "Malkorekta dosiero"
 
-#: gajim/dialog_messages.py:42 gajim/gtk/single_message.py:306
+#: gajim/dialog_messages.py:37
 #, fuzzy, python-format
-msgid "It is not possible to send a message to %s, this JID is not valid."
+msgid ""
+"It is not possible to send a message to %s. This XMPP Address is not valid."
 msgstr "Neeblas sendi senenhavajn dosierojn"
 
-#: gajim/dialog_messages.py:47
-msgid "Unread events"
+#: gajim/dialog_messages.py:42
+#, fuzzy
+msgid "Unread Events"
 msgstr "Nelegitaj eventoj"
 
-#: gajim/dialog_messages.py:48
-msgid "Read all pending events before removing this account."
+#: gajim/dialog_messages.py:43
+#, fuzzy
+msgid "Read or acknowledge all pending events before removing this account."
 msgstr "Legu ĉiujn atendantajn eventojn antaŭ forigi tiun konton."
 
-#: gajim/dialog_messages.py:52
+#: gajim/dialog_messages.py:48
 #, fuzzy
 msgid "Invalid Form"
 msgstr "Malkorekta rikordo"
 
-#: gajim/dialog_messages.py:53
+#: gajim/dialog_messages.py:49
 #, fuzzy
 msgid "The form is not filled correctly."
 msgstr "La babileja jabber-ID enhavas nepermesajn signojn."
 
-#: gajim/dialog_messages.py:57 gajim/common/helpers.py:309
+#: gajim/dialog_messages.py:53 gajim/common/helpers.py:315
 msgid "Invisible"
 msgstr "Nevidebla"
 
-#: gajim/dialog_messages.py:62
-msgid "A connection is not available"
+#: gajim/dialog_messages.py:54
+#, fuzzy
+msgid "You cannot join a group chat while being invisible."
+msgstr "Vi ne povas aliĝi al babilejo dum vi estas nevidebla"
+
+#: gajim/dialog_messages.py:58
+#, fuzzy
+msgid "No Connection Available"
 msgstr "Konekto mankas"
 
-#: gajim/dialog_messages.py:63
+#: gajim/dialog_messages.py:59
 msgid "Your message can not be sent until you are connected."
 msgstr "Via mesaĝo ne povas esti sendita dum vi senkonektas."
 
-#: gajim/dialog_messages.py:67
-#, fuzzy
-msgid "JID already in list"
-msgstr "Jabber-tujmesaĝilo"
+#: gajim/dialog_messages.py:63
+msgid "XMPP Address Already in List"
+msgstr ""
 
-#: gajim/dialog_messages.py:68
-msgid "The JID you entered is already in the list. Choose another one."
+#: gajim/dialog_messages.py:64
+#, fuzzy
+msgid ""
+"The XMPP Address you entered is already in the list. Please choose another "
+"one."
 msgstr ""
+"Tiu nomo jam estas uzata de alia el viaj kontoj. Bonvolu elekti alian nomon."
 
-#: gajim/dialog_messages.py:72
-msgid "Invalid answer"
+#: gajim/dialog_messages.py:69
+#, fuzzy
+msgid "Invalid Answer"
 msgstr "Nekorekta respondo"
 
-#: gajim/dialog_messages.py:73
+#: gajim/dialog_messages.py:70
 #, fuzzy, python-format
 msgid "Transport %(name)s answered wrongly to register request: %(error)s"
 msgstr "Transportilo %s respondis malprave al registra peto: %s"
 
-#: gajim/dialog_messages.py:78
+#: gajim/dialog_messages.py:75
 #, fuzzy
 msgid "Wrong Custom Hostname"
 msgstr "Uzi propran servilnomon/pordon"
 
-#: gajim/dialog_messages.py:79
+#: gajim/dialog_messages.py:76
 #, fuzzy, python-format
-msgid "Wrong custom hostname \"%s\". Ignoring it."
+msgid "Custom hostname \"%s\" is wrong. It will be ignored."
 msgstr "Uzi propran servilnomon/pordon"
 
-#: gajim/dialog_messages.py:83
-msgid "Error while removing privacy list"
+#: gajim/dialog_messages.py:80
+#, fuzzy
+msgid "Error While Removing Privacy List"
 msgstr "Eraro dum forigado de privata listo"
 
-#: gajim/dialog_messages.py:84
-#, python-format
+#: gajim/dialog_messages.py:81
+#, fuzzy, python-format
 msgid ""
-"Privacy list %s has not been removed. It is maybe active in one of your "
-"connected resources. Deactivate it and try again."
+"Privacy list %s has not been removed. It is probably active in one of your "
+"connected resources. Please deactivate it and try again."
 msgstr ""
 "Privata listo %s ne forigitis. Ĝi eble estas aktiva en unu el viaj "
 "konektitaj risurcoj. Malaktivigu ĝin kaj provu denove."
 
-#: gajim/dialog_messages.py:90
+#: gajim/dialog_messages.py:87
 #, fuzzy
-msgid "Invisibility not supported"
+msgid "Invisibility Not Supported"
 msgstr "Kromaĵo ne subtenatas"
 
-#: gajim/dialog_messages.py:91
-#, python-format
-msgid "Account %s doesn't support invisibility."
-msgstr ""
+#: gajim/dialog_messages.py:88
+#, fuzzy, python-format
+msgid "This account %s doesn't support invisibility."
+msgstr "Listo de aktivaj, plenumitaj kaj haltitaj dosiertransmetoj"
 
-#: gajim/dialog_messages.py:95
+#: gajim/dialog_messages.py:92
 #, fuzzy
-msgid "Unregister failed"
+msgid "Unregister Failed"
 msgstr "Konektado malsukcesis"
 
-#: gajim/dialog_messages.py:96
-#, python-format
-msgid "Unregistration with server %(server)s failed: %(error)s"
-msgstr ""
+#: gajim/dialog_messages.py:93
+#, fuzzy, python-format
+msgid "Unregistration on server %(server)s failed: %(error)s"
+msgstr "Konektado malsukcesis"
 
-#: gajim/dialog_messages.py:100
+#: gajim/dialog_messages.py:97
 #, fuzzy
-msgid "Registration succeeded"
+msgid "Registration Succeeded"
 msgstr "Vizitkarto estas sukcese publicita"
 
-#: gajim/dialog_messages.py:101
-#, python-format
-msgid "Registration with agent %s succeeded"
-msgstr ""
+#: gajim/dialog_messages.py:98
+#, fuzzy, python-format
+msgid "Registration with agent %s succeeded."
+msgstr "Vizitkarto estas sukcese publicita"
 
-#: gajim/dialog_messages.py:105 gajim/gtk/service_registration.py:215
+#: gajim/dialog_messages.py:102
 #, fuzzy
-msgid "Registration failed"
+msgid "Registration Failed"
 msgstr "Konektado malsukcesis"
 
-#: gajim/dialog_messages.py:106
+#: gajim/dialog_messages.py:103
 #, python-format
 msgid ""
 "Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
 msgstr ""
 
-#: gajim/dialog_messages.py:111
+#: gajim/dialog_messages.py:108
 #, fuzzy
 msgid "Unable to Join Group Chat"
 msgstr "Neeblas aliĝi al babilejo"
 
-#: gajim/dialog_messages.py:116
-msgid "GStreamer error"
+#: gajim/dialog_messages.py:113
+msgid "GStreamer Error"
 msgstr ""
 
-#: gajim/dialog_messages.py:117
+#: gajim/dialog_messages.py:114
 #, fuzzy, python-format
 msgid ""
 "Error: %(error)s\n"
 "Debug: %(debug)s"
 msgstr "Erara mesaĝo: %s"
 
-#: gajim/dialog_messages.py:121
-msgid "Wrong host"
+#: gajim/dialog_messages.py:118
+#, fuzzy
+msgid "Wrong Host"
 msgstr "Malprava servilnomo"
 
-#: gajim/dialog_messages.py:122
+#: gajim/dialog_messages.py:119
 msgid "Invalid local address? :-O"
 msgstr ""
 
-#: gajim/dialog_messages.py:126
-msgid "Avahi error"
+#: gajim/dialog_messages.py:123
+#, fuzzy
+msgid "Avahi Error"
 msgstr "Eraro de Avahi"
 
-#: gajim/dialog_messages.py:127
+#: gajim/dialog_messages.py:124
 #, python-format
 msgid ""
 "%s\n"
@@ -2422,66 +2386,66 @@ msgstr ""
 "%s\n"
 "Lig-loka komunikado ne povas funkcii korekte."
 
-#: gajim/dialog_messages.py:131 gajim/dialog_messages.py:136
+#: gajim/dialog_messages.py:128 gajim/dialog_messages.py:133
 #, fuzzy
-msgid "Could not request upload slot"
+msgid "Could not request upload slot for HTTP File Upload"
 msgstr "Ne povas lanĉi lokan servon"
 
-#: gajim/dialog_messages.py:137
-msgid "Got unexpected response from server (see log)"
+#: gajim/dialog_messages.py:134
+msgid "Got unexpected response from server (see log)."
 msgstr ""
 
-#: gajim/dialog_messages.py:141 gajim/dialog_messages.py:146
+#: gajim/dialog_messages.py:138 gajim/dialog_messages.py:143
 #, fuzzy
-msgid "Could not open file"
+msgid "Could not Open File"
 msgstr "Ne povas alŝuti bildon"
 
-#: gajim/dialog_messages.py:142
-msgid "Exception raised while opening file (see log)"
+#: gajim/dialog_messages.py:139
+msgid "Exception raised while trying to open file (see log)."
 msgstr ""
 
-#: gajim/dialog_messages.py:151
-msgid "Unsecure"
-msgstr ""
+#: gajim/dialog_messages.py:148
+#, fuzzy
+msgid "Not Secure"
+msgstr "Ne lanĉitas"
 
-#: gajim/dialog_messages.py:152
-msgid "Server returned unsecure transport (HTTP)"
+#: gajim/dialog_messages.py:149
+msgid "The server returned an insecure transport (HTTP)."
 msgstr ""
 
-#: gajim/dialog_messages.py:156
+#: gajim/dialog_messages.py:153
 #, fuzzy
-msgid "Could not upload file"
+msgid "Could not Upload File"
 msgstr "Ne povas alŝuti bildon"
 
-#: gajim/dialog_messages.py:157
+#: gajim/dialog_messages.py:154
 #, python-format
 msgid "HTTP response code from server: %s"
 msgstr ""
 
-#: gajim/dialog_messages.py:161
+#: gajim/dialog_messages.py:158
 msgid "Upload Error"
 msgstr ""
 
-#: gajim/dialog_messages.py:166
+#: gajim/dialog_messages.py:163
 #, fuzzy
 msgid "Encryption Error"
 msgstr "Ĉifrado ebligata"
 
-#: gajim/dialog_messages.py:167
-#, fuzzy
-msgid "For the chosen encryption there is no encryption method available"
-msgstr "Konekto mankas"
+#: gajim/dialog_messages.py:164
+msgid "There is no encryption method available for the chosen encryption."
+msgstr ""
 
-#: gajim/dialog_messages.py:171
+#: gajim/dialog_messages.py:169
 #, fuzzy
-msgid "Avatar upload failed"
+msgid "Avatar Upload Failed"
 msgstr "Publicado de vizitkarto malsukcesis"
 
-#: gajim/privatechat_control.py:204
+#: gajim/privatechat_control.py:207
 msgid "Sending private message failed"
 msgstr "Sendado de privata mesaĝo malsukcesis"
 
-#: gajim/privatechat_control.py:206
+#: gajim/privatechat_control.py:209
 #, 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."
@@ -2504,7 +2468,7 @@ msgstr "montri helpon pri komando"
 
 #: gajim/gajim_remote.py:85
 #, fuzzy
-msgid "Lists all contacts in roster, one for each line"
+msgid "Lists all contacts in the contact list, one for each line"
 msgstr ""
 "Eligas liston de ĉiuj kontaktoj de kontaktlisto. Ĉiu kontakto aperas en "
 "separata lineo"
@@ -2590,11 +2554,13 @@ msgstr ""
 
 #: gajim/gajim_remote.py:118
 #, fuzzy
-msgid "Sends new chat message to a contact in the roster. Account is optional."
+msgid ""
+"Sends new chat message to a contact in the contact list. Account is optional."
 msgstr "Uzado: /%s, - kaŝas la babiladajn butonojn."
 
 #: gajim/gajim_remote.py:120 gajim/gajim_remote.py:130
-msgid "JID of the contact that will receive the message"
+#, fuzzy
+msgid "XMPP Address of the contact that will receive the message"
 msgstr "JID de kontakto, kiu ricevos la mesaĝon"
 
 #: gajim/gajim_remote.py:121 gajim/gajim_remote.py:132
@@ -2608,8 +2574,10 @@ msgid "if specified, the message will be sent using this account"
 msgstr "Se specifita, la mesaĝo estos sendita per tiu ĉi konto"
 
 #: gajim/gajim_remote.py:127
-msgid "Sends a chat message to someone on your roster. Account is optional."
-msgstr ""
+#, fuzzy
+msgid ""
+"Sends a chat message to someone on your contact list. Account is optional."
+msgstr "Uzado: /%s, - kaŝas la babiladajn butonojn."
 
 #: gajim/gajim_remote.py:131
 msgid "subject"
@@ -2620,12 +2588,12 @@ msgid "message subject"
 msgstr "temo de mesaĝo"
 
 #: gajim/gajim_remote.py:138
-msgid "Sends new message to a groupchat you've joined."
+msgid "Sends new message to a group chat you've joined."
 msgstr ""
 
 #: gajim/gajim_remote.py:140
 #, fuzzy
-msgid "JID of the room that will receive the message"
+msgid "XMPP Address of the group chat that will receive the message"
 msgstr "JID de kontakto, kiu ricevos la mesaĝon"
 
 #: gajim/gajim_remote.py:147
@@ -2634,7 +2602,8 @@ msgstr "Ricevas detalan informon pri kontakto"
 
 #: gajim/gajim_remote.py:149 gajim/gajim_remote.py:162
 #: gajim/gajim_remote.py:192
-msgid "JID of the contact"
+#, fuzzy
+msgid "XMPP Address of the contact"
 msgstr "JID de la kontakto"
 
 #: gajim/gajim_remote.py:153
@@ -2695,7 +2664,8 @@ msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Skribas la aktualan agordon de Gajim en la dosieron \".config\""
 
 #: gajim/gajim_remote.py:190
-msgid "Removes contact from roster"
+#, fuzzy
+msgid "Removes contact from contact list"
 msgstr "Forigas kontakton el kontaktlisto"
 
 #: gajim/gajim_remote.py:193
@@ -2742,9 +2712,9 @@ msgid "Missing argument \"contact_jid\""
 msgstr "Mankas argumento \"kontakt-jid\""
 
 #: gajim/gajim_remote.py:275
-#, python-format
+#, fuzzy, python-format
 msgid ""
-"'%s' is not in your roster.\n"
+"'%s' is not in your contact list.\n"
 "Please specify account for sending the message."
 msgstr ""
 "%s mankas en via kontaktlisto\n"
@@ -2965,12 +2935,12 @@ msgstr "Fino de semajno"
 msgid "Weekend!"
 msgstr "Semajnofino!"
 
-#: gajim/common/logger.py:192 gajim/common/logger.py:197
+#: gajim/common/logger.py:189 gajim/common/logger.py:194
 #, python-format
 msgid "%s is a directory but should be a file"
 msgstr "%s estas dosierujo sed devas esti dosiero"
 
-#: gajim/common/logger.py:217
+#: gajim/common/logger.py:214
 #, fuzzy, python-format
 msgid "Creating %s"
 msgstr "Priskribo: %s"
@@ -3044,23 +3014,21 @@ msgstr "%(nickname)s elsalutis"
 msgid "Contact Signed Out"
 msgstr "Kontakto elsalutis"
 
-#: gajim/common/contacts.py:455
-msgid "Not in roster"
-msgstr "Mankas en kontaktlisto"
-
 #: gajim/common/config.py:80
+#, fuzzy
 msgid ""
 "Show desktop notification even when a chat window is opened for this contact "
-"and does not have focus"
-msgstr ""
+"and does not have focus."
+msgstr "Ebligi avizadon dum stato fora/nedisponebla/okupata/nevidebla"
 
 #: gajim/common/config.py:81
-msgid "Play sound when user is busy"
+msgid "Play sound even when being busy."
 msgstr ""
 
 #: gajim/common/config.py:83
-msgid "Show only online and free for chat contacts in roster."
-msgstr ""
+#, fuzzy
+msgid "Show only online and free for chat contacts in the contact list."
+msgstr "Mi petas vin permesi aldoni vin en mian kontaktliston."
 
 #: gajim/common/config.py:86
 msgid "Time in minutes, after which your status changes to away."
@@ -3068,11 +3036,13 @@ msgstr "Tempo en minutoj, post kiu via stato ŝanĝos al fora."
 
 #: gajim/common/config.py:87
 #, fuzzy
-msgid "$S (Away as a result of being idle more than $T min)"
+msgid "$S (Away: Idle more than $T min)"
 msgstr "Aŭtomate fora"
 
 #: gajim/common/config.py:87
-msgid "$S will be replaced by current status message, $T by autoawaytime."
+msgid ""
+"$S will be replaced by current status message, $T by the 'autoawaytime' "
+"value."
 msgstr ""
 
 #: gajim/common/config.py:89
@@ -3081,69 +3051,72 @@ msgstr "Tempo en minutoj, post kiu via stato ŝanĝos al nedisponebla."
 
 #: gajim/common/config.py:90
 #, fuzzy
-msgid "$S (Not available as a result of being idle more than $T min)"
+msgid "$S (Not available: Idle more than $T min)"
 msgstr "Nedisponebla pro longa senfarado"
 
 #: gajim/common/config.py:90
-msgid "$S will be replaced by current status message, $T by autoxatime."
+msgid ""
+"$S will be replaced by current status message, $T by the 'autoxatime' value."
 msgstr ""
 
 #: gajim/common/config.py:93
 msgid ""
-"When to show notification area icon. Can be 'never', 'on_event', 'always'."
+"When to show the notification area icon. Can be 'never', 'on_event', and "
+"'always'."
 msgstr ""
 
 #: gajim/common/config.py:94
-msgid "Allow to hide the roster window even if the tray icon is not shown."
+msgid ""
+"Allow to hide the contact list window even if the notification area icon is "
+"not shown."
 msgstr ""
 
 #: gajim/common/config.py:97
 #, fuzzy
-msgid "Contact signed in notification color."
-msgstr "Montri eventon en _kontaktlisto"
+msgid "Notification color for contacts signing in."
+msgstr "Avizi min pri kontaktoj kiuj: "
 
 #: gajim/common/config.py:98
 #, fuzzy
-msgid "Contact signout notification color"
-msgstr "Montri eventon en _kontaktlisto"
+msgid "Notification color for contacts signing out."
+msgstr "Avizi min pri kontaktoj kiuj: "
 
 #: gajim/common/config.py:99
 #, fuzzy
-msgid "New message notification color."
+msgid "Notification color for new message notification."
 msgstr "Montri eventon en _kontaktlisto"
 
 #: gajim/common/config.py:100
 #, fuzzy
-msgid "File transfer request notification color."
-msgstr "Mendo de dosiera transmeto"
+msgid "Notification color for file transfer request."
+msgstr "_Avizi min kiam dosiero estas transdonita"
 
 #: gajim/common/config.py:101
 #, fuzzy
-msgid "File transfer error notification color."
-msgstr "Dosiera transmeto nuligitas"
+msgid "Notification color for file transfer errors."
+msgstr "_Avizi min kiam dosiero estas transdonita"
 
 #: gajim/common/config.py:102
-#, fuzzy
-msgid "File transfer complete or stopped notification color."
-msgstr "Kiam dosiertransmeto estos plenumita, montri ŝprucfenestron kun avizo"
+msgid "Notification color for stopped or completed file transfers."
+msgstr ""
 
 #: gajim/common/config.py:103
-#, fuzzy
-msgid "Groupchat invitation notification color"
-msgstr "Babileja invitilo"
+msgid "Notification color for group chat invitations."
+msgstr ""
 
 #: gajim/common/config.py:104
 #, fuzzy
-msgid "Background color of status changed notification"
+msgid "Notification background color for changed status."
 msgstr "Fona koloro de kontaktoj kiam ili jus ensalutis."
 
 #: gajim/common/config.py:105
-msgid "Other dialogs color."
+msgid "Notification color for other dialogs."
 msgstr ""
 
 #: gajim/common/config.py:106
+#, fuzzy
 msgid ""
-"List (space separated) of rows (accounts and groups) that are collapsed."
+"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:107
@@ -3151,8 +3124,10 @@ msgstr "Listo (spacetseparita) de lineoj (kontoj kaj grupoj) kiuj rulitas."
 msgid "default"
 msgstr "Defaŭlte"
 
-#: gajim/common/config.py:113
-msgid "Language used by speller"
+#: gajim/common/config.py:113 gajim/common/config.py:424
+#: gajim/common/config.py:431
+#, fuzzy
+msgid "Language used for spell checking."
 msgstr "Lingvo uzata de literumilo"
 
 #: gajim/common/config.py:114
@@ -3166,10 +3141,11 @@ msgstr ""
 "'never' - neniam eligi tempon."
 
 #: gajim/common/config.py:115
+#, fuzzy
 msgid ""
 "Print time in chats using Fuzzy Clock. Value of fuzziness from 1 to 4, or 0 "
-"to disable fuzzyclock. 1 is the most precise clock, 4 the least precise one. "
-"This is used only if print_time is 'sometimes'."
+"to disable Fuzzy Clock. 1 is the most precise clock, 4 the least precise "
+"one. This is used only if 'print_time' is 'sometimes'."
 msgstr ""
 "Eligi tempon en konversacioj per malpreciza horloĝo. Nivelo de malprecizeco "
 "de 1 ĝis 4 aŭ 0 por malŝalti malprecizan horloĝon. 1 estas por la plej "
@@ -3187,53 +3163,58 @@ msgstr "Trakti parojn * / _ kiel stiligajn signojn."
 #: gajim/common/config.py:120
 #, fuzzy
 msgid ""
-"If true, do not remove */_ . So *abc* will be bold but with * * not removed."
+"If enabled, do not remove */_ . So *abc* will be bold but with * * not "
+"removed."
 msgstr ""
 "Se \"True\", ne forigos */_ . Do *abc* estos dika sed restos kun neforigitaj "
 "* *."
 
 #: gajim/common/config.py:123
+#, fuzzy
 msgid ""
-"Uses ReStructured text markup to send HTML, plus ascii formatting if "
-"selected. For syntax, see http://docutils.sourceforge.net/docs/ref/rst/"
-"restructuredtext.html (If you want to use this, install docutils)"
+"Uses ReStructured text markup to send HTML, plus ASCII formatting if "
+"selected. Needs docutils installed (for syntax, see http://docutils."
+"sourceforge.net/docs/ref/rst/restructuredtext.html)."
 msgstr ""
 "Uzas restrukturitan tekstan markadon por HTML, kaj ASCII-formatadon, se "
 "elektitas. Pri sintakso vidu http://docutils.sourceforge.net/docs/ref/rst/"
 "restructuredtext.html (Se vi volas uzi tion, instalu docutils)"
 
 #: gajim/common/config.py:132
+#, fuzzy
 msgid ""
-"Character to add after nickname when using nick completion (tab) in group "
-"chat."
+"Character to add after nickname when using nickname completion (tab) in "
+"group chat."
 msgstr ""
 "Signo kiu aligatos post kaŝnomo dum uzado de plenumigoklavo (Tab) en "
 "babilejo."
 
 #: gajim/common/config.py:133
+#, fuzzy
 msgid ""
-"Character to propose to add after desired nickname when desired nickname is "
-"used by someone else in group chat."
+"Character to propose to add after desired nickname when nickname is already "
+"used in group chat."
 msgstr ""
 "Signo por aligi post dezirata kaŝnomo kiam iu alia en babilejo jam okupis "
 "tiun kaŝnomon."
 
 #: gajim/common/config.py:155
 msgid ""
-"If true, Gajim will save roster position when hiding roster, and restore it "
-"when showing roster."
+"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:161
-msgid "Place the roster on the right in single window mode"
+msgid "Place the contact list on the right in single window mode"
 msgstr ""
 
 #: gajim/common/config.py:167
 #, fuzzy
 msgid ""
-"This option let you customize timestamp that is printed in conversation. For "
-"example \"[%H:%M] \" will show \"[hour:minute] \". See python doc on "
-"strftime for full documentation: http://docs.python.org/lib/module-time.html"
+"This option lets you customize the timestamp that is printed in "
+"conversation. For example '[%H:%M] ' will show '[hour:minute] '. See python "
+"doc on strftime for full documentation (https://docs.python.org/3/library/"
+"time.html)."
 msgstr ""
 "Ĉi tiu opcio ebligas agordi formon de tempo kiu eligitos ĉe konversacio. "
 "Ekzemple \"[%H:%M] \" montros tempon kiel \"[horo:minuto] \". Pli detale "
@@ -3241,253 +3222,256 @@ msgstr ""
 "org/lib/module-time.html"
 
 #: gajim/common/config.py:168
-msgid "Characters that are printed before the nickname in conversations"
+#, fuzzy
+msgid "Characters that are printed before the nickname in conversations."
 msgstr "Signoj kiuj eligotas antaŭ kaŝnomo en konversacioj"
 
 #: gajim/common/config.py:169
-msgid "Characters that are printed after the nickname in conversations"
+#, fuzzy
+msgid "Characters that are printed after the nickname in conversations."
 msgstr "Signoj kiuj eligotas post kaŝnomo en konversacioj"
 
 #: gajim/common/config.py:170
-msgid "Add * and [n] in roster title?"
-msgstr "Ĉu aligi * kaj [n] al kontaktlisto titolo?"
+#, 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:171
 #, fuzzy
 msgid ""
-"How many history messages should be restored when a chat tab/window is "
-"reopened?"
+"Number of messages from chat history to be restored when a chat tab/window "
+"is reopened."
 msgstr ""
 "Kiom da lineoj memori de antaŭa komunikado kiam interparola slipo/fenestro "
 "malfermas denove."
 
 #: gajim/common/config.py:172
-msgid "How far back in time (minutes) history is restored. -1 means no limit."
+msgid ""
+"How far back in time (minutes) chat history is restored. -1 means no limit."
 msgstr ""
 
 #: gajim/common/config.py:173
 msgid ""
-"How many lines to request from server when entering a groupchat. -1 means no "
-"limit"
+"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:174
 msgid ""
-"Minutes of backlog to request when entering a groupchat. -1 means no limit"
+"Should automatic rejoin be activated when you were kicked from a group chat?"
 msgstr ""
 
 #: gajim/common/config.py:175
-msgid ""
-"How many seconds to wait before trying to autorejoin to a conference you are "
-"being disconnected from. Set to 0 to disable autorejoining."
-msgstr ""
-
-#: gajim/common/config.py:176
-msgid "Should autorejoin be activated when kicked from a conference?"
-msgstr ""
-
-#: gajim/common/config.py:177
-msgid ""
-"Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
-"Client default behaviour)."
+#, 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:179
-msgid "How many lines to store for Ctrl+KeyUP."
+#: gajim/common/config.py:177
+#, fuzzy
+msgid "How many lines to store for Ctrl+KeyUP (previously sent messages)."
 msgstr "Kiom lineojn memori por Ctrl+Supren."
 
-#: gajim/common/config.py:182
+#: gajim/common/config.py:180
 #, fuzzy, python-format
 msgid ""
-"Either custom URL with %%s in it where %%s is the word/phrase or "
-"'WIKTIONARY' which means use Wikitionary."
+"Either a custom URL with %%s in it (where %%s is the word/phrase) or "
+"'WIKTIONARY' (which means use Wikitionary)."
 msgstr ""
 "Enigi propran URL kun %s en ĝi, kie %s estos la vorto/frazo, aŭ \"WIKTIONARY"
 "\" kio signifas uzi wiktionary."
 
-#: gajim/common/config.py:185
+#: gajim/common/config.py:183
 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:187
+#: gajim/common/config.py:185
+#, fuzzy
 msgid ""
-"When not printing time for every message (print_time==sometimes), print it "
+"When not printing time for every message ('print_time'==sometimes), print it "
 "every x minutes."
 msgstr ""
 "Kiam ne eligas tempon por ĉiu mesaĝo (print_time==sometimes), eligi ĝin "
 "ĉiujn x minutojn."
 
-#: gajim/common/config.py:188
+#: gajim/common/config.py:186
 msgid "Ask before pasting an image."
 msgstr ""
 
-#: gajim/common/config.py:189
+#: gajim/common/config.py:187
 msgid "Ask before closing a group chat tab/window."
 msgstr "Demandi antaŭ fermi babilejan fenestron/slipon."
 
-#: gajim/common/config.py:190
+#: gajim/common/config.py:188
 #, fuzzy
 msgid ""
-"Always ask for confirmation before closing groupchats with any of the JIDs "
-"on this space separated list."
+"Always ask for confirmation before closing group chats with any of the XMPP "
+"Addresses on this list (space separated)."
 msgstr ""
 "Ĉiam demandi antaŭ fermi slipon/fenestron de babilejo el tiu cpacetdisigita "
 "listo de babilejaj JID."
 
-#: gajim/common/config.py:191
+#: gajim/common/config.py:189
 #, fuzzy
 msgid ""
-"Never ask for confirmation before closing groupchats with any of the JIDs on "
-"this space separated list."
+"Never ask for confirmation before closing group chats with any of the XMPP "
+"Addresses on this list (space separated)."
 msgstr ""
 "Neniam demandi antaŭ fermi babilejan slipon/fenestron el tiu ĉi listo de "
 "babilejaj JID separataj per spacetoj."
 
-#: gajim/common/config.py:192
+#: gajim/common/config.py:190
 msgid ""
-"Ask before closing tabbed chat window if there are controls that can lose "
-"data (chat, private chat, groupchat that will not be minimized)"
+"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:195
+#: gajim/common/config.py:193
 #, fuzzy
 msgid ""
-"Comma separated list of sent hosts, in addition of local interfaces, for "
-"File Transfer in case of address translation/port forwarding."
+"List of send hosts (comma separated) in addition to local interfaces for "
+"file transfers (in case of address translation/port forwarding)."
 msgstr ""
 "Redifinas la retadreson, kiun ni sendas por dosiertransmeto okaze de "
 "adrestradukado."
 
-#: gajim/common/config.py:196
+#: gajim/common/config.py:194
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "IEC normo diras: KiB = 1024 bajtoj, KB = 1000 bajtoj."
 
-#: gajim/common/config.py:198
+#: gajim/common/config.py:196
 #, fuzzy
 msgid "Notify of events in the notification area."
 msgstr "Avizi eventojn en la sistema taskopleta bildeto."
 
-#: gajim/common/config.py:199
+#: gajim/common/config.py:197
 msgid ""
-"If False, Gajim will display a static event icon instead of the blinking "
-"status icon in the notification area when notifying on event."
+"If disabled, Gajim will display a static event icon instead of the blinking "
+"status icon in the notification area when notifying about an event."
 msgstr ""
 
-#: gajim/common/config.py:205
+#: gajim/common/config.py:203
 msgid "Show tab when only one conversation?"
 msgstr "Ĉu montri langeton kiam estas nur unu konversacio?"
 
-#: gajim/common/config.py:206
+#: gajim/common/config.py:204
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "Ĉu montri langetan framon en interparolajn fenestrojn?"
 
-#: gajim/common/config.py:207
+#: gajim/common/config.py:205
 msgid "Show close button in tab?"
 msgstr "Ĉu montri fermontan butonon en sliplangeto?"
 
-#: gajim/common/config.py:220
+#: gajim/common/config.py:218
 msgid "Preview new messages in notification popup?"
 msgstr ""
 
-#: gajim/common/config.py:223
+#: gajim/common/config.py:221
+#, fuzzy
 msgid ""
-"A semicolon-separated list of words that will be highlighted in group chats."
+"A list of words (semicolon separated) that will be highlighted in group "
+"chats."
 msgstr ""
 "Listo de punktokome separataj vortoj, kiuj estos emfazataj en babilejo."
 
-#: gajim/common/config.py:224
+#: gajim/common/config.py:222
 #, fuzzy
 msgid ""
-"If true, quits Gajim when X button of Window Manager is clicked. This "
-"setting is taken into account only if notification icon is used."
+"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 ""
 "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:225
+#: gajim/common/config.py:223
 msgid ""
-"If true, Gajim hides the Roster window on pressing the X button instead of "
-"minimizing into the Dock."
+"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:226
+#: gajim/common/config.py:224
 #, fuzzy
 msgid ""
-"If true, Gajim will display an icon on each tab containing unread messages. "
-"Depending on the theme, this icon may be animated."
+"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:227
+#: gajim/common/config.py:225
 #, fuzzy
 msgid ""
-"If true, Gajim will display the status message, if not empty, for every "
-"contact under the contact name in roster window."
+"If enabled, Gajim will display the status message (if not empty) underneath "
+"the contact name in the contact list window."
 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:233
-msgid "Define the position of the avatar in roster. Can be left or right"
+#: gajim/common/config.py:231
+msgid ""
+"Define the position of avatars in the contact list. Can be 'left' or 'right'."
 msgstr ""
 
-#: gajim/common/config.py:234
+#: gajim/common/config.py:232
 #, fuzzy
 msgid ""
-"If False, Gajim will no longer print status line in chats when a contact "
-"changes their status and/or their status message."
+"If disabled, Gajim will no longer print status messages in chats when a "
+"contact changes their status (and/or their status message)."
 msgstr ""
 "Se \"False\", Gajim ne plu eligos statlineon en interparolaj fenestroj kiam "
 "kontakto ŝanĝas lian aŭ ŝian staton kaj/aŭ statmesaĝon."
 
-#: gajim/common/config.py:235
+#: gajim/common/config.py:233
 #, fuzzy
 msgid ""
 "Default Setting: Show a status message for every join or leave in a group "
-"chat"
+"chat."
 msgstr "Neeblas aliĝi al babilejo"
 
-#: gajim/common/config.py:236
+#: gajim/common/config.py:234
+#, fuzzy
 msgid ""
-"Default Setting: Show a status message for all status (away, dnd, etc.) "
-"changes of users in a group chat"
-msgstr ""
+"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:238
-msgid "Log XHTML messages instead of plain text messages."
+#: gajim/common/config.py:236
+msgid "Store XHTML messages in chat history instead of plain text messages."
 msgstr ""
 
-#: gajim/common/config.py:239
+#: gajim/common/config.py:237
 msgid "Don't show avatar for the transport itself."
 msgstr "Ne montri kaŝbildeton por transportilo mem."
 
-#: gajim/common/config.py:240
-msgid "Don't show roster in the system taskbar."
+#: gajim/common/config.py:238
+#, fuzzy
+msgid "Don't show contact list window in the system taskbar."
 msgstr "Ne montri kontaktliston en la sistema taskostrio."
 
-#: gajim/common/config.py:241
+#: gajim/common/config.py:239
 #, fuzzy
 msgid ""
-"If true, make the window flash (the default behaviour in most Window "
-"Managers) when holding pending events."
+"If enabled, Gajim makes the window flash (the default behaviour in most "
+"Window Managers) when holding pending events."
 msgstr ""
 "Se \"True\" kaj instalitas GTK+ kaj PyGTK versioj almenaŭ 2.8, fari la "
 "fenestran briladon (la defaŭlta konduto de plimulto da fenestragordiloj) "
 "kiam estas atendantaj eventoj."
 
-#: gajim/common/config.py:245
+#: gajim/common/config.py:243
 #, fuzzy
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
 "'always_with_roster' - Like 'always' but the messages are in a single window "
-"along with the roster.\n"
+"along with the contact list.\n"
 "'never' - All messages get their own window.\n"
 "'peracct' - Messages for each account are sent to a specific window.\n"
-"'pertype' - Each message type (e.g. chats vs. groupchats) is sent to a "
+"'pertype' - Each message type (e.g. chats vs. group chats) is sent to a "
 "specific window."
 msgstr ""
 "Administras fenestron kien novaj mesaĝoj metitas:\n"
@@ -3498,248 +3482,266 @@ msgstr ""
 "apartan fenestron. Rimarku, ŝanĝo de tiu opcio bezonas relanĉon de Gajim "
 "antaŭ la ŝanĝo efikos."
 
-#: gajim/common/config.py:246
+#: gajim/common/config.py:244
 msgid ""
-"Show roster on startup.\n"
-"'always' - Always show roster.\n"
-"'never' - Never show roster.\n"
-"'last_state' - Restore the last state roster."
+"Show contact list window on startup.\n"
+"'always' - Always show contact list window.\n"
+"'never' - Never show contact list window.\n"
+"'last_state' - Restore last state of the contact list window."
 msgstr ""
 
-#: gajim/common/config.py:247
-msgid "If False, you will no longer see the avatar in the chat window."
+#: gajim/common/config.py:245
+#, 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:248
+#: gajim/common/config.py:246
 #, fuzzy
-msgid "If true, pressing the escape key closes a tab/window."
+msgid "If enabled, pressing Esc closes a tab/window."
 msgstr "Se \"True\", premo de la klavo \"Escape\" fermas slipon/fenestron."
 
-#: gajim/common/config.py:249
-msgid "Hides the banner in a group chat window"
+#: gajim/common/config.py:247
+#, fuzzy
+msgid "Hides the banner in a group chat window."
 msgstr "Kaŝas rubandon en babileja fenestro"
 
-#: gajim/common/config.py:250
-msgid "Hides the banner in two persons chat window"
-msgstr "Kaŝas rubandon en dupersona interparola fenestro"
+#: gajim/common/config.py:248
+#, fuzzy
+msgid "Hides the banner in a 1:1 chat window."
+msgstr "Kaŝas rubandon en babileja fenestro"
 
-#: gajim/common/config.py:251
-msgid "Hides the group chat occupants list in group chat window."
+#: gajim/common/config.py:249
+#, 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:252
+#: gajim/common/config.py:250
+#, fuzzy
 msgid ""
 "In a chat, show the nickname at the beginning of a line only when it's not "
-"the same person talking than in previous message."
+"the same person talking as in the previous message."
 msgstr ""
 "En konversacio, montri la kaŝnomon komence de linio nur kiam tiu ne estas la "
 "sama persono dirinta ĉi-antaŭan mesaĝon."
 
-#: gajim/common/config.py:253
+#: gajim/common/config.py:251
 msgid "Indentation when using merge consecutive nickname."
 msgstr "Alineo kiam uzatas unuigo de ripetaj kaŝnomoj."
 
-#: gajim/common/config.py:254
-msgid "Ctrl-Tab go to next composing tab when none is unread."
+#: gajim/common/config.py:252
+#, 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:255
+#: gajim/common/config.py:253
 #, fuzzy
 msgid ""
-"Show the confirm metacontacts creation dialog or not? Empty string means "
-"never show the dialog."
+"Show a confirmation dialog to create metacontacts? Empty string means never "
+"show the dialog."
 msgstr ""
 "Ĉu ni montru la certigan dialogujon pri kreado de metakontaktoj aŭ ne? "
 "Malplena linio signifas ke ni neniam monru la dialogujon."
 
-#: gajim/common/config.py:256
+#: gajim/common/config.py:254
 #, fuzzy
 msgid ""
-"Show the confirm block contact dialog or not? Empty string means never show "
+"Show a confirmation dialog to block a contact? Empty string means never show "
 "the dialog."
 msgstr ""
 "Ĉu ni montru la certigan dialogujon pri kreado de metakontaktoj aŭ ne? "
 "Malplena linio signifas ke ni neniam monru la dialogujon."
 
-#: gajim/common/config.py:257
+#: gajim/common/config.py:255
 #, fuzzy
 msgid ""
-"Show the confirm custom status dialog or not? Empty string means never show "
-"the dialog."
+"Show a confirmation dialog for a custom status? Empty string means never "
+"show the dialog."
 msgstr ""
 "Ĉu ni montru la certigan dialogujon pri kreado de metakontaktoj aŭ ne? "
 "Malplena linio signifas ke ni neniam monru la dialogujon."
 
-#: gajim/common/config.py:258
+#: gajim/common/config.py:256
 #, fuzzy
 msgid ""
-"If true, you will be able to set a negative priority to your account in "
-"account modification window. BE CAREFUL, when you are logged in with a "
-"negative priority, you will NOT receive any message from your server."
+"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 ""
 "Se \"True\", vi povos valorigi prioritaton de via konto per negativaj "
 "nombroj en la konta korekdada fenestro. GARDU VIN, se vi ensalutis kun "
 "negativa prioritato, vi ricevos neniujn mesaĝojn de via servilo."
 
-#: gajim/common/config.py:259
+#: gajim/common/config.py:257
 #, fuzzy
 msgid ""
-"If true, Gajim will show number of online and total contacts in account and "
-"group rows."
+"If enabled, Gajim will show both the number of online and total contacts in "
+"account rows as well as in group rows."
 msgstr ""
 "Se \"True\", Gajim montros kvantojn de konektitaj kaj ĉiuj kontaktoj en "
 "kontaj kaj grupaj linioj."
 
-#: gajim/common/config.py:260
+#: gajim/common/config.py:258
+#, fuzzy
 msgid ""
-"Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
-"as if they were of this type"
+"Can be empty, 'chat' or 'normal'. If not empty, all incoming messages are "
+"treated as if they were of this type."
 msgstr ""
 "Povas esti malplena, 'chat' aŭ 'normal'. Se ne malplena, rigardi ĉiujn "
 "venantajn mesaĝojn kiel ili estas de ĉi tiu tipo"
 
-#: gajim/common/config.py:261
+#: gajim/common/config.py:259
 msgid ""
-"If true, Gajim will scroll and select the contact who sent you the last "
-"message, if chat window is not already opened."
+"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:262
+#: gajim/common/config.py:260
 msgid "Time of inactivity needed before the change status window closes down."
 msgstr ""
 
-#: gajim/common/config.py:263
+#: gajim/common/config.py:261
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
 msgstr ""
 
-#: gajim/common/config.py:264
+#: gajim/common/config.py:262
 msgid ""
-"If true, notification windows from notification-daemon will be attached to "
-"notification icon."
+"If enabled, notification windows from notification-daemon will be attached "
+"to the notification area icon."
 msgstr ""
 
-#: gajim/common/config.py:265
+#: gajim/common/config.py:263
 msgid "Choose interval between 2 checks of idleness."
 msgstr ""
 
-#: gajim/common/config.py:266
+#: gajim/common/config.py:264
 msgid ""
-"Valid uri schemes. Only schemes in this list will be accepted as \"real\" "
-"uri. (mailto and xmpp are handled separately)"
+"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:267
-msgid "If true, completion in groupchats will be like a shell auto-completion"
+#: gajim/common/config.py:265
+msgid ""
+"If enabled, completion in group chats will be like a shell auto-completion."
+msgstr ""
+
+#: gajim/common/config.py:270
+msgid "Optionally fix Jingle output video framerate. Example: 10/1 or 25/2."
+msgstr ""
+
+#: gajim/common/config.py:271
+msgid "Optionally resize Jingle output video. Example: 320x240."
 msgstr ""
 
 #: gajim/common/config.py:272
-msgid "Optionally fix jingle output video framerate. Example: 10/1 or 25/2"
+msgid "If enabled, you will see your webcam's video stream as well."
 msgstr ""
 
-#: gajim/common/config.py:273
-msgid "Optionally resize jingle output video. Example: 320x240"
+#: gajim/common/config.py:275
+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:274
-msgid "If true, You will also see your webcam"
+#: gajim/common/config.py:276
+msgid "STUN server to use when using Jingle"
 msgstr ""
 
 #: gajim/common/config.py:277
 msgid ""
-"If true, Gajim will try to use a STUN server when using Jingle. The one in "
-"\"stun_server\" option, or the one given by the XMPP server."
+"If enabled, Gajim will show affiliation of group chat participants by adding "
+"a colored square to the status icon."
 msgstr ""
 
 #: gajim/common/config.py:278
-msgid "STUN server to use when using Jingle"
+msgid ""
+"Proxy used for all outgoing connections if the account does not have a "
+"specific proxy configured."
 msgstr ""
 
 #: gajim/common/config.py:279
-msgid ""
-"If true, Gajim will show affiliation of groupchat occupants by adding a "
-"colored square to the status icon"
+msgid "If enabled, Gajim will ignore incoming attention requests ('wizz')."
 msgstr ""
 
 #: gajim/common/config.py:280
 msgid ""
-"Proxy used for all outgoing connections if the account does not have a "
-"specific proxy configured"
+"If enabled, Gajim will reopen chat windows that were opened last time Gajim "
+"was closed."
 msgstr ""
 
 #: gajim/common/config.py:281
-msgid "If true, Gajim will ignore incoming attention requests (\"wizz\")."
+msgid ""
+"If enabled, Gajim will display an icon to show that sent messages have been "
+"received by your contact."
 msgstr ""
 
 #: gajim/common/config.py:282
-msgid ""
-"If enabled, Gajim will reopen chat windows that were opened last time Gajim "
-"was closed."
+msgid "Show a mini avatar in chat window tabs and as the window's icon."
 msgstr ""
 
 #: gajim/common/config.py:283
+#, fuzzy
 msgid ""
-"If enabled, Gajim will show an icon to show that sent message has been "
-"received by your contact"
+"If enabled, Gajim will use the System's Keyring to store account passwords."
 msgstr ""
+"Se \"True\", Gajim uzos Gnoman ŝlosilaron (se disponeblas) por konservu "
+"pasvortojn."
 
 #: gajim/common/config.py:284
-msgid "Show a mini avatar in chat window tabs and in window icon"
+msgid "If enabled, Gajim will execute XEP-0146 Commands."
 msgstr ""
 
 #: gajim/common/config.py:285
-#, fuzzy
-msgid "If true, Gajim will use the Systems Keyring to store account passwords."
+msgid "2: System, 1: Enabled, 0: Disabled"
 msgstr ""
-"Se \"True\", Gajim uzos Gnoman ŝlosilaron (se disponeblas) por konservu "
-"pasvortojn."
 
 #: gajim/common/config.py:286
-msgid "If true, Gajim will execute XEP-0146 Commands."
+msgid "Options in days which can be chosen in the sync threshold menu"
 msgstr ""
 
 #: gajim/common/config.py:287
-msgid "2: System, 1: Enabled, 0: Disabled"
+msgid ""
+"Maximum history in days we request from a public group chat archive. 0: As "
+"much as possible."
 msgstr ""
 
 #: gajim/common/config.py:288
-msgid "Options in days which can be chosen in the sync threshold menu"
+msgid ""
+"Maximum history in days we request from a private group chat archive. 0: As "
+"much as possible."
 msgstr ""
 
 #: gajim/common/config.py:289
 msgid ""
-"Maximum history in days we request from a public room archive. 0: As much as "
-"possible"
+"If enabled, Gajim shows the group chat subject in the chat window when "
+"joining."
 msgstr ""
 
 #: gajim/common/config.py:290
+#, fuzzy
 msgid ""
-"Maximum history in days we request from a private room archive. 0: As much "
-"as possible"
-msgstr ""
+"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:291
-msgid "If the room subject is shown in chat on join"
-msgstr ""
+#, 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:292
+#, fuzzy
 msgid ""
-"If the contact row is colored according to the current chatstate of the "
-"contact"
-msgstr ""
+"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:293
-msgid "If the tab is colored according to the current chatstate of the contact"
-msgstr ""
-
-#: gajim/common/config.py:294
-msgid ""
-"Shows a text in the banner that describes the current chatstate of the "
-"contact"
-msgstr ""
-
-#: gajim/common/config.py:295 gajim/common/config.py:424
 #, fuzzy
 msgid ""
 "Chat state notifications that are sent to contacts. Possible values: all, "
@@ -3748,308 +3750,333 @@ msgstr ""
 "Sendataj babilstataj avizoj en interparolaj fenestroj. Povas esti unu el "
 "\"all\", \"composing_only\", aŭ \"disabled\"."
 
-#: gajim/common/config.py:296 gajim/common/config.py:438
+#: gajim/common/config.py:294
 #, fuzzy
 msgid ""
 "Chat state notifications that are sent to the group chat. Possible values: "
-"all, composing_only, disabled"
+"'all', 'composing_only', 'disabled'"
 msgstr ""
 "Sendataj babilstataj avizoj en interparolaj fenestroj. Povas esti unu el "
 "\"all\", \"composing_only\", aŭ \"disabled\"."
 
-#: gajim/common/config.py:312
+#: gajim/common/config.py:297
+msgid "API Preferences. Possible values: 'http', 'iq'"
+msgstr ""
+
+#: gajim/common/config.py:313
+#, fuzzy
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
-"defined in autopriority_* options."
+"defined in 'autopriority_*' options."
 msgstr ""
 "Prioritato ŝanĝiĝos aŭtomate laŭ via stato. Prioritatoj specifatas en la "
 "agorderoj \"autopriority_*\"."
 
-#: gajim/common/config.py:320
+#: gajim/common/config.py:321
 msgid ""
-"Status used to autoconnect as. Can be online, chat, away, xa, dnd, "
-"invisible. NOTE: this option is used only if restore_last_status is disabled"
+"Status to be used automatically when connecting. Can be 'online', 'chat', "
+"'away', 'xa', 'dnd' or 'invisible'. NOTE: This option is used only if "
+"'restore_last_status' is disabled."
 msgstr ""
 
-#: gajim/common/config.py:321
-msgid "If enabled, restore the last status that was used."
+#: gajim/common/config.py:322
+msgid "If enabled, the last status will be restored."
 msgstr ""
 
-#: gajim/common/config.py:322
+#: gajim/common/config.py:323
 msgid ""
-"If true, Contacts requesting authorization will be automatically accepted."
+"If enabled, Contacts requesting authorization will be accepted automatically."
 msgstr ""
 
-#: gajim/common/config.py:323
+#: gajim/common/config.py:324
 #, fuzzy
 msgid ""
-"If False, this account will be disabled and will not appear in roster window."
+"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:327
-msgid "Allow plaintext connections"
+#: gajim/common/config.py:328
+msgid "Allow plaintext connections."
 msgstr ""
 
-#: gajim/common/config.py:330
+#: gajim/common/config.py:331
 msgid ""
-"List (space separated) of authentication mechanisms to try. Can contain "
-"ANONYMOUS, EXTERNAL, GSSAPI, SCRAM-SHA-1-PLUS, SCRAM-SHA-1, DIGEST-MD5, "
-"PLAIN, X-MESSENGER-OAUTH2 or XEP-0078"
+"List of authentication mechanisms to try (space separated). Can contain "
+"'ANONYMOUS', 'EXTERNAL', 'GSSAPI', 'SCRAM-SHA-1-PLUS', 'SCRAM-SHA-1', "
+"'DIGEST-MD5', 'PLAIN', 'X-MESSENGER-OAUTH2' or 'XEP-0078'."
 msgstr ""
 
-#: gajim/common/config.py:331
+#: gajim/common/config.py:332
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection. "
-"Can be 'warn', 'connect', 'disconnect'"
+"Can be 'warn', 'connect' or 'disconnect'."
 msgstr ""
 
-#: gajim/common/config.py:332
+#: gajim/common/config.py:333
 msgid "Show a warning dialog before using standard SSL library."
 msgstr ""
 
-#: gajim/common/config.py:333
+#: gajim/common/config.py:334
 msgid ""
 "Show a warning dialog before sending PLAIN password over a plain connection."
 msgstr ""
 
-#: gajim/common/config.py:334
-msgid "Space separated list of ssl errors to ignore."
+#: gajim/common/config.py:335
+msgid "List of SSL errors to ignore (space separated)."
 msgstr ""
 
-#: gajim/common/config.py:340
+#: gajim/common/config.py:341
 msgid ""
-"Space separated list of JIDs for which you do not want to store logs. You "
-"can also add account name to log nothing for this account."
+"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:341
+#: gajim/common/config.py:342
 msgid ""
-"Space separated list of JIDs for which you accept to not log conversations "
-"if he does not want to."
+"List of XMPP Addresses (space separated) for which you accept to not store "
+"chat history if your contact does not want to."
 msgstr ""
 
-#: gajim/common/config.py:343
-msgid "Whitespace sent after inactivity"
+#: gajim/common/config.py:344
+msgid "If enabled, a whitespace is sent after inactivity (keep alive)."
 msgstr ""
 
-#: gajim/common/config.py:344
-msgid "XMPP ping sent after inactivity"
+#: gajim/common/config.py:345
+msgid "If enabled, an XMPP ping is sent after inactivity (ping alive)."
 msgstr ""
 
-#: gajim/common/config.py:348
+#: gajim/common/config.py:349
 msgid ""
-"How many seconds to wait for the answer of ping alive packet before trying "
-"to reconnect?"
+"How many seconds to wait for the answer of a ping alive packet before trying "
+"to reconnect."
 msgstr ""
 
-#: gajim/common/config.py:352
-msgid "Jabberd2 workaround"
+#: gajim/common/config.py:353
+#, fuzzy
+msgid "Jabberd2 workaround."
 msgstr "Jabberd2 ĉirkaŭiro"
 
-#: gajim/common/config.py:355
+#: gajim/common/config.py:356
+#, fuzzy
 msgid ""
-"If checked, Gajim will use your IP and proxies defined in "
-"file_transfer_proxies option for file transfer."
+"If enabled, Gajim will use your IP and proxies defined in "
+"'file_transfer_proxies' option for file transfers."
 msgstr ""
 "Se markitas, Gajim uzos vian IP kaj prokurservilojn difinitajn en la opcio "
 "file_transfer_proxies por dosiertransmeto."
 
-#: gajim/common/config.py:356
+#: gajim/common/config.py:357
 msgid ""
-"If true, Gajim will test file transfer proxies on startup to be sure it "
-"works. Openfire's proxies are known to fail this test even if they work."
+"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:369
-msgid "Answer to receipt requests"
+#: gajim/common/config.py:370
+msgid "If enabled, Gajim will answer to message receipt requests."
 msgstr ""
 
-#: gajim/common/config.py:370
-msgid "Sent receipt requests"
+#: gajim/common/config.py:371
+msgid "If enabled, Gajim will send message receipt requests."
 msgstr ""
 
-#: gajim/common/config.py:379
+#: gajim/common/config.py:380
 #, 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:380
+#: gajim/common/config.py:381
 #, fuzzy
 msgid "Allow Gajim to send your local time."
 msgstr "%s volas sendi dosieron al vi."
 
-#: gajim/common/config.py:383
+#: gajim/common/config.py:384
 #, fuzzy
-msgid "Message that is sent to contacts you want to add"
+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:384
-msgid ""
-"If enabled, Gajim will send your local IPs so your contact can connect to "
-"your machine to transfer files."
-msgstr ""
-
 #: gajim/common/config.py:385
+#, fuzzy
 msgid ""
-"Space separated list of JIDs for which chat window will be re-opened on next "
-"startup."
+"If enabled, Gajim will send your local IP so your contact can connect to "
+"your machine for file transfers."
 msgstr ""
+"Se markitas, Gajim uzos vian IP kaj prokurservilojn difinitajn en la opcio "
+"file_transfer_proxies por dosiertransmeto."
 
-#: gajim/common/config.py:387
-msgid "HTTP Upload: Enable HTTPS Verification"
+#: gajim/common/config.py:386
+msgid ""
+"List of XMPP Addresses (space separated) for which the chat window will be "
+"re-opened on next startup."
 msgstr ""
 
 #: gajim/common/config.py:388
-msgid ""
-"Preferred file transfer mechanism for file drag&drop on chat window. Can be "
-"'httpupload' (default) or 'jingle'"
+msgid "HTTP File Upload: Enable HTTPS Verification."
 msgstr ""
 
 #: gajim/common/config.py:389
-msgid "Allow cert verification with POSH"
+msgid ""
+"Preferred file transfer mechanism for file drag&drop on a chat window. Can "
+"be 'httpupload' (default) or 'jingle'."
 msgstr ""
 
-#: gajim/common/config.py:423 gajim/common/config.py:430
+#: gajim/common/config.py:390
 #, fuzzy
-msgid "Language for which misspelled words will be checked"
-msgstr "Lingvo por kiu ni volas kontroli mistajpajn vortojn"
-
-#: gajim/common/config.py:427
-msgid "The currently active encryption for that contact"
-msgstr ""
+msgid "Allow certificate verification with POSH."
+msgstr "Aligado de speciala avizo por %s"
 
-#: gajim/common/config.py:431
+#: gajim/common/config.py:425
+#, fuzzy
 msgid ""
-"How many lines to request from server when entering a groupchat. -1 means no "
-"limit, -2 means global value"
+"Chat state notifications that are sent to contacts. Possible values: 'all', "
+"'composing_only', 'disabled'"
 msgstr ""
+"Sendataj babilstataj avizoj en interparolaj fenestroj. Povas esti unu el "
+"\"all\", \"composing_only\", aŭ \"disabled\"."
+
+#: gajim/common/config.py:428
+#, fuzzy
+msgid "The currently active encryption for that contact."
+msgstr "Ĉu OpenPGP estas ŝaltita por tiu ĉi kontakto?"
 
 #: gajim/common/config.py:432
 msgid ""
-"Minutes of backlog to request when entering a groupchat. -1 means no limit, "
-"-2 means global value"
+"If enabled, a notification is created for every message in this group chat."
 msgstr ""
 
 #: gajim/common/config.py:433
-msgid "State whether a notification is created for every message in this room"
-msgstr ""
-
-#: gajim/common/config.py:434
+#, fuzzy
 msgid ""
-"Show a status message for all status (away, dnd, etc.) changes of users in a "
-"group chat"
-msgstr ""
+"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:435
+#: gajim/common/config.py:434
 #, fuzzy
-msgid "Show a status message for every join or leave in a group chat"
+msgid "Show a status message for every join or leave in a group chat."
 msgstr "Neeblas aliĝi al babilejo"
 
+#: gajim/common/config.py:435
+msgid ""
+"If enabled, the group chat is minimized into the contact list when joining "
+"automatically."
+msgstr ""
+
 #: gajim/common/config.py:436
-msgid "If the group chat is minimized into the roster on autojoin"
+msgid ""
+"If enabled, the group chat is minimized into the contact list when closing "
+"it."
 msgstr ""
 
 #: gajim/common/config.py:437
-msgid "If the group chat is minimized into the roster on close"
+#, fuzzy
+msgid ""
+"Chat state notifications that are sent to the group chat. Possible values: "
+"'all', 'composing_only' or 'disabled'."
 msgstr ""
+"Sendataj babilstataj avizoj en interparolaj fenestroj. Povas esti unu el "
+"\"all\", \"composing_only\", aŭ \"disabled\"."
 
-#: gajim/common/config.py:441
+#: gajim/common/config.py:440
 msgid ""
-"State whether plugins should be activated on startup (this is saved on Gajim "
-"exit). This option SHOULD NOT be used to (de)activate plug-ins. Use GUI "
-"instead."
+"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:446 gajim/common/const.py:281
+#: gajim/common/config.py:445 gajim/common/const.py:315
 msgid "Sleeping"
 msgstr "Dormas"
 
-#: gajim/common/config.py:447
+#: gajim/common/config.py:446
 msgid "Back soon"
 msgstr "Revenos baldaŭ"
 
-#: gajim/common/config.py:447
+#: gajim/common/config.py:446
 msgid "Back in some minutes."
 msgstr "Revenos post kelkaj minutoj."
 
-#: gajim/common/config.py:448 gajim/common/const.py:247
+#: gajim/common/config.py:447 gajim/common/const.py:281
 msgid "Eating"
 msgstr "Manĝas"
 
-#: gajim/common/config.py:448
-msgid "I'm eating, so leave me a message."
-msgstr "Mi manĝas, do restigu mesaĝon por mi."
+#: gajim/common/config.py:447
+#, fuzzy
+msgid "I'm eating."
+msgstr "Mi laboras."
 
-#: gajim/common/config.py:449
+#: gajim/common/config.py:448
 msgid "Movie"
 msgstr "Kino"
 
-#: gajim/common/config.py:449
+#: gajim/common/config.py:448
 msgid "I'm watching a movie."
 msgstr "Mi spektas filmon."
 
-#: gajim/common/config.py:450 gajim/common/const.py:314
+#: gajim/common/config.py:449 gajim/common/const.py:348
 msgid "Working"
 msgstr "Laboras"
 
-#: gajim/common/config.py:450
+#: gajim/common/config.py:449
 msgid "I'm working."
 msgstr "Mi laboras."
 
-#: gajim/common/config.py:451
+#: gajim/common/config.py:450
 msgid "Phone"
 msgstr "Telefonado"
 
-#: gajim/common/config.py:451
+#: gajim/common/config.py:450
 msgid "I'm on the phone."
 msgstr "Mi telefonas."
 
-#: gajim/common/config.py:452
+#: gajim/common/config.py:451
 msgid "Out"
 msgstr "Eliris"
 
-#: gajim/common/config.py:452
+#: gajim/common/config.py:451
 msgid "I'm out enjoying life."
 msgstr "Mi eliris por amuziĝi."
 
-#: gajim/common/config.py:463
+#: gajim/common/config.py:462
 msgid "I'm available."
 msgstr "Mi disponeblas."
 
-#: gajim/common/config.py:464
+#: gajim/common/config.py:463
 msgid "I'm free for chat."
 msgstr "Mi babilemas."
 
-#: gajim/common/config.py:465 gajim/gtk/accounts.py:134
+#: gajim/common/config.py:464 gajim/gtk/accounts.py:133
 msgid "Be right back."
 msgstr "Revenos baldaŭ."
 
-#: gajim/common/config.py:466
+#: gajim/common/config.py:465
 msgid "I'm not available."
 msgstr "Mi ne disponeblas."
 
-#: gajim/common/config.py:467
+#: gajim/common/config.py:466
 msgid "Do not disturb."
 msgstr "Ne malhelpu."
 
-#: gajim/common/config.py:468 gajim/common/config.py:469
+#: gajim/common/config.py:467 gajim/common/config.py:468
 msgid "Bye!"
 msgstr "Ĝis!"
 
-#: gajim/common/config.py:480
+#: gajim/common/config.py:479
+#, fuzzy
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
-"muc_highlight_words, or when a group chat message contains your nickname."
+"'muc_highlight_words' your nickname is mentioned."
 msgstr ""
 "Sono por ludi kiam babileja mesaĝo enhavas vorton, listitan en "
 "muc_highlight_words, aŭ vian kaŝnomon."
 
-#: gajim/common/config.py:481
-msgid "Sound to play when any MUC message arrives."
+#: gajim/common/config.py:480
+#, fuzzy
+msgid "Sound to play when any group chat message arrives."
 msgstr "Sono ludota kiam ĉiu babileja mesaĝo venas."
 
-#: gajim/common/config.py:485
+#: gajim/common/config.py:484
 #, fuzzy
 msgid "Tor"
 msgstr "Al"
@@ -4059,951 +4086,1047 @@ msgstr "Al"
 msgid "Error: cannot open %s for reading"
 msgstr "Eraro: ne povas malfermi %s por legi"
 
-#: gajim/common/const.py:214
+#: gajim/common/const.py:216
+#, fuzzy
+msgid "?Group chat name:Team"
+msgstr "Neniu"
+
+#: gajim/common/const.py:217
+msgid "?Group chat description:Project discussion"
+msgstr ""
+
+#: gajim/common/const.py:218
+#, fuzzy
+msgid "?Group chat address:team"
+msgstr "Babilejoj"
+
+#: gajim/common/const.py:219
+#, fuzzy
+msgid "?Group chat name:Family"
+msgstr "Emfazado de mesaĝoj en babilejo"
+
+#: gajim/common/const.py:220
+msgid "?Group chat description:Spring gathering"
+msgstr ""
+
+#: gajim/common/const.py:221
+msgid "?Group chat address:family"
+msgstr ""
+
+#: gajim/common/const.py:222
+#, fuzzy
+msgid "?Group chat name:Vacation"
+msgstr "Babileja invitilo"
+
+#: gajim/common/const.py:223
+msgid "?Group chat description:Trip planning"
+msgstr ""
+
+#: gajim/common/const.py:224
+#, fuzzy
+msgid "?Group chat address:vacation"
+msgstr "Babileja invitilo"
+
+#: gajim/common/const.py:225
+#, fuzzy
+msgid "?Group chat name:Repairs"
+msgstr "Babilejo"
+
+#: gajim/common/const.py:226
+msgid "?Group chat description:Local help group"
+msgstr ""
+
+#: gajim/common/const.py:227
+#, fuzzy
+msgid "?Group chat address:repairs"
+msgstr "Babilejoj"
+
+#: gajim/common/const.py:228
+#, fuzzy
+msgid "?Group chat name:News"
+msgstr "Neniu"
+
+#: gajim/common/const.py:229
+#, fuzzy
+msgid "?Group chat description:Local news and reports"
+msgstr "Babileja kreado limigitas."
+
+#: gajim/common/const.py:230
+#, fuzzy
+msgid "?Group chat address:news"
+msgstr "Nova babilejo"
+
+#: gajim/common/const.py:235
+#, fuzzy
+msgid "Remote server not found"
+msgstr "Neniu servo estas trovita"
+
+#: gajim/common/const.py:236
+msgid "Remote server timeout"
+msgstr ""
+
+#: gajim/common/const.py:237 gajim/common/const.py:238
+#: gajim/common/const.py:239
+#, fuzzy
+msgid "Address does not belong to a group chat server"
+msgstr "Tio ne estas babilejo"
+
+#: gajim/common/const.py:240
+#, fuzzy
+msgid "Group chat already exists"
+msgstr "Loka konto jam ekzistas."
+
+#: gajim/common/const.py:241
+#, fuzzy
+msgid "Group chat does not exist"
+msgstr "Tiu babilejo ne ekzistas."
+
+#: gajim/common/const.py:247
 msgid "This message was encrypted with OTR and could not be decrypted."
 msgstr ""
 
-#: gajim/common/const.py:217
+#: gajim/common/const.py:250
 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:221
+#: gajim/common/const.py:254
 msgid ""
-"This message was encrypted with OpenPGP for XMPP and could not be decrypted."
+"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:224
+#: gajim/common/const.py:258
 #, python-format
 msgid "This message was encrypted with %s and could not be decrypted."
 msgstr ""
 
-#: gajim/common/const.py:231
+#: gajim/common/const.py:265
 #, fuzzy
 msgid "Doing Chores"
 msgstr "Malprava servilnomo"
 
-#: gajim/common/const.py:232
+#: gajim/common/const.py:266
 msgid "Buying Groceries"
 msgstr ""
 
-#: gajim/common/const.py:233
+#: gajim/common/const.py:267
 #, fuzzy
 msgid "Cleaning"
 msgstr "Vespero"
 
-#: gajim/common/const.py:234
+#: gajim/common/const.py:268
 #, fuzzy
 msgid "Cooking"
 msgstr "Tajpas mesaĝon"
 
-#: gajim/common/const.py:235
+#: gajim/common/const.py:269
 msgid "Doing Maintenance"
 msgstr ""
 
-#: gajim/common/const.py:236
+#: gajim/common/const.py:270
 msgid "Doing the Dishes"
 msgstr ""
 
-#: gajim/common/const.py:237
+#: gajim/common/const.py:271
 msgid "Doing the Laundry"
 msgstr ""
 
-#: gajim/common/const.py:238
+#: gajim/common/const.py:272
 #, fuzzy
 msgid "Gardening"
 msgstr "Mateno"
 
-#: gajim/common/const.py:239
+#: gajim/common/const.py:273
 msgid "Running an Errand"
 msgstr ""
 
-#: gajim/common/const.py:240
+#: gajim/common/const.py:274
 #, fuzzy
 msgid "Walking the Dog"
 msgstr "ĉiuj en la grupo"
 
-#: gajim/common/const.py:242
+#: gajim/common/const.py:276
 #, fuzzy
 msgid "Drinking"
 msgstr "Laboras"
 
-#: gajim/common/const.py:243
+#: gajim/common/const.py:277
 msgid "Having a Beer"
 msgstr ""
 
-#: gajim/common/const.py:244
+#: gajim/common/const.py:278
 msgid "Having Coffee"
 msgstr ""
 
-#: gajim/common/const.py:245
+#: gajim/common/const.py:279
 msgid "Having Tea"
 msgstr ""
 
-#: gajim/common/const.py:248
+#: gajim/common/const.py:282
 msgid "Having a Snack"
 msgstr ""
 
-#: gajim/common/const.py:249
+#: gajim/common/const.py:283
 msgid "Having Breakfast"
 msgstr ""
 
-#: gajim/common/const.py:250
+#: gajim/common/const.py:284
 msgid "Having Dinner"
 msgstr ""
 
-#: gajim/common/const.py:251
+#: gajim/common/const.py:285
 msgid "Having Lunch"
 msgstr ""
 
-#: gajim/common/const.py:253
+#: gajim/common/const.py:287
 msgid "Exercising"
 msgstr ""
 
-#: gajim/common/const.py:254 gajim/common/const.py:305
+#: gajim/common/const.py:288 gajim/common/const.py:339
 msgid "Cycling"
 msgstr ""
 
-#: gajim/common/const.py:255
+#: gajim/common/const.py:289
 #, fuzzy
 msgid "Dancing"
 msgstr "Vespero"
 
-#: gajim/common/const.py:256
+#: gajim/common/const.py:290
 #, fuzzy
 msgid "Hiking"
 msgstr "Elpelatas %s"
 
-#: gajim/common/const.py:257
+#: gajim/common/const.py:291
 #, fuzzy
 msgid "Jogging"
 msgstr "_Aliĝi"
 
-#: gajim/common/const.py:258
+#: gajim/common/const.py:292
 msgid "Playing Sports"
 msgstr ""
 
-#: gajim/common/const.py:259
+#: gajim/common/const.py:293
 msgid "Running"
 msgstr ""
 
-#: gajim/common/const.py:260
+#: gajim/common/const.py:294
 #, fuzzy
 msgid "Skiing"
 msgstr "Laboras"
 
-#: gajim/common/const.py:261
+#: gajim/common/const.py:295
 msgid "Swimming"
 msgstr ""
 
-#: gajim/common/const.py:262
+#: gajim/common/const.py:296
 #, fuzzy
 msgid "Working out"
 msgstr "Laboras"
 
-#: gajim/common/const.py:264
+#: gajim/common/const.py:298
 #, fuzzy
 msgid "Grooming"
 msgstr "babilejo"
 
-#: gajim/common/const.py:265
+#: gajim/common/const.py:299
 msgid "At the Spa"
 msgstr ""
 
-#: gajim/common/const.py:266
+#: gajim/common/const.py:300
 msgid "Brushing Teeth"
 msgstr ""
 
-#: gajim/common/const.py:267
+#: gajim/common/const.py:301
 msgid "Getting a Haircut"
 msgstr ""
 
-#: gajim/common/const.py:268
+#: gajim/common/const.py:302
 #, fuzzy
 msgid "Shaving"
 msgstr "Manĝas"
 
-#: gajim/common/const.py:269
+#: gajim/common/const.py:303
 msgid "Taking a Bath"
 msgstr ""
 
-#: gajim/common/const.py:270
+#: gajim/common/const.py:304
 msgid "Taking a Shower"
 msgstr ""
 
-#: gajim/common/const.py:272
+#: gajim/common/const.py:306
 msgid "Having an Appointment"
 msgstr ""
 
-#: gajim/common/const.py:274
+#: gajim/common/const.py:308
 msgid "Inactive"
 msgstr "Neaktiva"
 
-#: gajim/common/const.py:275
+#: gajim/common/const.py:309
 msgid "Day Off"
 msgstr ""
 
-#: gajim/common/const.py:276
+#: gajim/common/const.py:310
 #, fuzzy
 msgid "Hanging out"
 msgstr "Korektas temon"
 
-#: gajim/common/const.py:277
+#: gajim/common/const.py:311
 #, fuzzy
 msgid "Hiding"
 msgstr "Elpelatas %s"
 
-#: gajim/common/const.py:278
+#: gajim/common/const.py:312
 msgid "On Vacation"
 msgstr ""
 
-#: gajim/common/const.py:279
+#: gajim/common/const.py:313
 #, fuzzy
 msgid "Praying"
 msgstr "Manĝas"
 
-#: gajim/common/const.py:280
+#: gajim/common/const.py:314
 msgid "Scheduled Holiday"
 msgstr ""
 
-#: gajim/common/const.py:282
+#: gajim/common/const.py:316
 #, fuzzy
 msgid "Thinking"
 msgstr "Laboras"
 
-#: gajim/common/const.py:284
+#: gajim/common/const.py:318
 msgid "Relaxing"
 msgstr ""
 
-#: gajim/common/const.py:285
+#: gajim/common/const.py:319
 #, fuzzy
 msgid "Fishing"
 msgstr "Elpelatas %s"
 
-#: gajim/common/const.py:286
+#: gajim/common/const.py:320
 #, fuzzy
 msgid "Gaming"
 msgstr "Manĝas"
 
-#: gajim/common/const.py:287
+#: gajim/common/const.py:321
 #, fuzzy
 msgid "Going out"
 msgstr "E_lsalutas"
 
-#: gajim/common/const.py:288
+#: gajim/common/const.py:322
 #, fuzzy
 msgid "Partying"
 msgstr "Manĝas"
 
-#: gajim/common/const.py:289
+#: gajim/common/const.py:323
 #, fuzzy
 msgid "Reading"
 msgstr "Kialo"
 
-#: gajim/common/const.py:290
+#: gajim/common/const.py:324
 #, fuzzy
 msgid "Rehearsing"
 msgstr "Kialo"
 
-#: gajim/common/const.py:291
+#: gajim/common/const.py:325
 #, fuzzy
 msgid "Shopping"
 msgstr "Dormas"
 
-#: gajim/common/const.py:292
+#: gajim/common/const.py:326
 #, fuzzy
 msgid "Smoking"
 msgstr "Laboras"
 
-#: gajim/common/const.py:293
+#: gajim/common/const.py:327
 msgid "Socializing"
 msgstr ""
 
-#: gajim/common/const.py:294
+#: gajim/common/const.py:328
 #, fuzzy
 msgid "Sunbathing"
 msgstr "Manĝas"
 
-#: gajim/common/const.py:295
+#: gajim/common/const.py:329
 msgid "Watching TV"
 msgstr ""
 
-#: gajim/common/const.py:296
+#: gajim/common/const.py:330
 #, fuzzy
 msgid "Watching a Movie"
 msgstr "Mi spektas filmon."
 
-#: gajim/common/const.py:298
+#: gajim/common/const.py:332
 #, fuzzy
 msgid "Talking"
 msgstr "Manĝas"
 
-#: gajim/common/const.py:299
+#: gajim/common/const.py:333
 msgid "In Real Life"
 msgstr ""
 
-#: gajim/common/const.py:300
+#: gajim/common/const.py:334
 #, fuzzy
 msgid "On the Phone"
 msgstr "Mi telefonas."
 
-#: gajim/common/const.py:301
+#: gajim/common/const.py:335
 msgid "On Video Phone"
 msgstr ""
 
-#: gajim/common/const.py:303
+#: gajim/common/const.py:337
 #, fuzzy
 msgid "Traveling"
 msgstr "Transdonas"
 
-#: gajim/common/const.py:304
+#: gajim/common/const.py:338
 #, fuzzy
 msgid "Commuting"
 msgstr "Tajpas mesaĝon"
 
-#: gajim/common/const.py:306
+#: gajim/common/const.py:340
 msgid "Driving"
 msgstr ""
 
-#: gajim/common/const.py:307
+#: gajim/common/const.py:341
 msgid "In a Car"
 msgstr ""
 
-#: gajim/common/const.py:308
+#: gajim/common/const.py:342
 msgid "On a Bus"
 msgstr ""
 
-#: gajim/common/const.py:309
+#: gajim/common/const.py:343
 msgid "On a Plane"
 msgstr ""
 
-#: gajim/common/const.py:310
+#: gajim/common/const.py:344
 #, fuzzy
 msgid "On a Train"
 msgstr "Malfermi  kiel _ligilon"
 
-#: gajim/common/const.py:311
+#: gajim/common/const.py:345
 msgid "On a Trip"
 msgstr ""
 
-#: gajim/common/const.py:312
+#: gajim/common/const.py:346
 #, fuzzy
 msgid "Walking"
 msgstr "Laboras"
 
-#: gajim/common/const.py:315
+#: gajim/common/const.py:349
 #, fuzzy
 msgid "Coding"
 msgstr "Tajpas mesaĝon"
 
-#: gajim/common/const.py:316
+#: gajim/common/const.py:350
 msgid "In a Meeting"
 msgstr ""
 
-#: gajim/common/const.py:317
+#: gajim/common/const.py:351
 msgid "Studying"
 msgstr ""
 
-#: gajim/common/const.py:318
+#: gajim/common/const.py:352
 #, fuzzy
 msgid "Writing"
 msgstr "Laboras"
 
-#: gajim/common/const.py:321
+#: gajim/common/const.py:355
 msgid "Afraid"
 msgstr ""
 
-#: gajim/common/const.py:322
+#: gajim/common/const.py:356
 msgid "Amazed"
 msgstr ""
 
-#: gajim/common/const.py:323
+#: gajim/common/const.py:357
 msgid "Amorous"
 msgstr ""
 
-#: gajim/common/const.py:324
+#: gajim/common/const.py:358
 msgid "Angry"
 msgstr ""
 
-#: gajim/common/const.py:325
+#: gajim/common/const.py:359
 msgid "Annoyed"
 msgstr ""
 
-#: gajim/common/const.py:326
+#: gajim/common/const.py:360
 msgid "Anxious"
 msgstr ""
 
-#: gajim/common/const.py:327
+#: gajim/common/const.py:361
 #, fuzzy
 msgid "Aroused"
 msgstr "Paŭzas"
 
-#: gajim/common/const.py:328
+#: gajim/common/const.py:362
 msgid "Ashamed"
 msgstr ""
 
-#: gajim/common/const.py:329
+#: gajim/common/const.py:363
 #, fuzzy
 msgid "Bored"
 msgstr "Dika"
 
-#: gajim/common/const.py:330
+#: gajim/common/const.py:364
 #, fuzzy
 msgid "Brave"
 msgstr "Havas "
 
-#: gajim/common/const.py:331
+#: gajim/common/const.py:365
 msgid "Calm"
 msgstr ""
 
-#: gajim/common/const.py:332
+#: gajim/common/const.py:366
 #, fuzzy
 msgid "Cautious"
 msgstr "Babilejoj"
 
-#: gajim/common/const.py:333
+#: gajim/common/const.py:367
 #, fuzzy
 msgid "Cold"
 msgstr "Dika"
 
-#: gajim/common/const.py:334
+#: gajim/common/const.py:368
 #, fuzzy
 msgid "Confident"
 msgstr "_Enhavo"
 
-#: gajim/common/const.py:335
+#: gajim/common/const.py:369
 msgid "Confused"
 msgstr ""
 
-#: gajim/common/const.py:336
+#: gajim/common/const.py:370
 #, fuzzy
 msgid "Contemplative"
 msgstr "Plenumita"
 
-#: gajim/common/const.py:337
+#: gajim/common/const.py:371
 #, fuzzy
 msgid "Contented"
 msgstr "_Enhavo"
 
-#: gajim/common/const.py:338
+#: gajim/common/const.py:372
 msgid "Cranky"
 msgstr ""
 
-#: gajim/common/const.py:339
+#: gajim/common/const.py:373
 msgid "Crazy"
 msgstr ""
 
-#: gajim/common/const.py:340
+#: gajim/common/const.py:374
 #, fuzzy
 msgid "Creative"
 msgstr "Malŝaltita"
 
-#: gajim/common/const.py:341
+#: gajim/common/const.py:375
 #, fuzzy
 msgid "Curious"
 msgstr "uri"
 
-#: gajim/common/const.py:342
+#: gajim/common/const.py:376
 #, fuzzy
 msgid "Dejected"
 msgstr "Forigi"
 
-#: gajim/common/const.py:343
+#: gajim/common/const.py:377
 msgid "Depressed"
 msgstr ""
 
-#: gajim/common/const.py:344
+#: gajim/common/const.py:378
 #, fuzzy
 msgid "Disappointed"
 msgstr "malŝaltitaj"
 
-#: gajim/common/const.py:345
+#: gajim/common/const.py:379
 msgid "Disgusted"
 msgstr ""
 
-#: gajim/common/const.py:346
+#: gajim/common/const.py:380
 #, fuzzy
 msgid "Dismayed"
 msgstr "malŝaltitaj"
 
-#: gajim/common/const.py:347
+#: gajim/common/const.py:381
 #, fuzzy
 msgid "Distracted"
 msgstr "malŝaltitaj"
 
-#: gajim/common/const.py:348
+#: gajim/common/const.py:382
 msgid "Embarrassed"
 msgstr ""
 
-#: gajim/common/const.py:349
+#: gajim/common/const.py:383
 msgid "Envious"
 msgstr ""
 
-#: gajim/common/const.py:350
+#: gajim/common/const.py:384
 #, fuzzy
 msgid "Excited"
 msgstr "Ŝaltita"
 
-#: gajim/common/const.py:351
+#: gajim/common/const.py:385
 msgid "Flirtatious"
 msgstr ""
 
-#: gajim/common/const.py:352
+#: gajim/common/const.py:386
 msgid "Frustrated"
 msgstr ""
 
-#: gajim/common/const.py:353
+#: gajim/common/const.py:387
 msgid "Grateful"
 msgstr ""
 
-#: gajim/common/const.py:354
+#: gajim/common/const.py:388
 msgid "Grieving"
 msgstr ""
 
-#: gajim/common/const.py:355
+#: gajim/common/const.py:389
 #, fuzzy
 msgid "Grumpy"
 msgstr "Grupo"
 
-#: gajim/common/const.py:356
+#: gajim/common/const.py:390
 msgid "Guilty"
 msgstr ""
 
-#: gajim/common/const.py:357
+#: gajim/common/const.py:391
 msgid "Happy"
 msgstr ""
 
-#: gajim/common/const.py:358
+#: gajim/common/const.py:392
 msgid "Hopeful"
 msgstr ""
 
-#: gajim/common/const.py:359
+#: gajim/common/const.py:393
 #, fuzzy
 msgid "Hot"
 msgstr "_Retnodo:"
 
-#: gajim/common/const.py:360
+#: gajim/common/const.py:394
 msgid "Humbled"
 msgstr ""
 
-#: gajim/common/const.py:361
+#: gajim/common/const.py:395
 msgid "Humiliated"
 msgstr ""
 
-#: gajim/common/const.py:362
+#: gajim/common/const.py:396
 msgid "Hungry"
 msgstr ""
 
-#: gajim/common/const.py:363
+#: gajim/common/const.py:397
 msgid "Hurt"
 msgstr ""
 
-#: gajim/common/const.py:364
+#: gajim/common/const.py:398
 #, fuzzy
 msgid "Impressed"
 msgstr "mesaĝo"
 
-#: gajim/common/const.py:365
+#: gajim/common/const.py:399
 msgid "In Awe"
 msgstr ""
 
-#: gajim/common/const.py:366
+#: gajim/common/const.py:400
 msgid "In Love"
 msgstr ""
 
-#: gajim/common/const.py:367
+#: gajim/common/const.py:401
 msgid "Indignant"
 msgstr ""
 
-#: gajim/common/const.py:368
+#: gajim/common/const.py:402
 msgid "Interested"
 msgstr ""
 
-#: gajim/common/const.py:369
+#: gajim/common/const.py:403
 #, fuzzy
 msgid "Intoxicated"
 msgstr "Ŝaltita"
 
-#: gajim/common/const.py:370
+#: gajim/common/const.py:404
 #, fuzzy
 msgid "Invincible"
 msgstr "Nevidebla"
 
-#: gajim/common/const.py:371
+#: gajim/common/const.py:405
 msgid "Jealous"
 msgstr ""
 
-#: gajim/common/const.py:372
+#: gajim/common/const.py:406
 #, fuzzy
 msgid "Lonely"
 msgstr "unu"
 
-#: gajim/common/const.py:373
+#: gajim/common/const.py:407
 #, fuzzy
 msgid "Lost"
 msgstr "_Retnodo:"
 
-#: gajim/common/const.py:374
+#: gajim/common/const.py:408
 msgid "Lucky"
 msgstr ""
 
-#: gajim/common/const.py:375
+#: gajim/common/const.py:409
 #, fuzzy
 msgid "Mean"
 msgstr "Germana"
 
-#: gajim/common/const.py:376
+#: gajim/common/const.py:410
 #, fuzzy
 msgid "Moody"
 msgstr "_Korekti"
 
-#: gajim/common/const.py:377
+#: gajim/common/const.py:411
 msgid "Nervous"
 msgstr ""
 
-#: gajim/common/const.py:378
+#: gajim/common/const.py:412
 msgid "Neutral"
 msgstr ""
 
-#: gajim/common/const.py:379
+#: gajim/common/const.py:413
 #, fuzzy
 msgid "Offended"
 msgstr "Senkonekta"
 
-#: gajim/common/const.py:380
+#: gajim/common/const.py:414
 msgid "Outraged"
 msgstr ""
 
-#: gajim/common/const.py:381
+#: gajim/common/const.py:415
 msgid "Playful"
 msgstr ""
 
-#: gajim/common/const.py:382
+#: gajim/common/const.py:416
 #, fuzzy
 msgid "Proud"
 msgstr "Grupo"
 
-#: gajim/common/const.py:383
+#: gajim/common/const.py:417
 msgid "Relaxed"
 msgstr ""
 
-#: gajim/common/const.py:384
+#: gajim/common/const.py:418
 #, fuzzy
 msgid "Relieved"
 msgstr "dekunu"
 
-#: gajim/common/const.py:385
+#: gajim/common/const.py:419
 msgid "Remorseful"
 msgstr ""
 
-#: gajim/common/const.py:386
+#: gajim/common/const.py:420
 msgid "Restless"
 msgstr ""
 
-#: gajim/common/const.py:387
+#: gajim/common/const.py:421
 #, fuzzy
 msgid "Sad"
 msgstr "Malrapidas"
 
-#: gajim/common/const.py:388
+#: gajim/common/const.py:422
 msgid "Sarcastic"
 msgstr ""
 
-#: gajim/common/const.py:389
+#: gajim/common/const.py:423
 msgid "Satisfied"
 msgstr ""
 
-#: gajim/common/const.py:390
+#: gajim/common/const.py:424
 msgid "Serious"
 msgstr ""
 
-#: gajim/common/const.py:391
+#: gajim/common/const.py:425
 msgid "Shocked"
 msgstr ""
 
-#: gajim/common/const.py:392
+#: gajim/common/const.py:426
 msgid "Shy"
 msgstr ""
 
-#: gajim/common/const.py:393
+#: gajim/common/const.py:427
 #, fuzzy
 msgid "Sick"
 msgstr "Kaŝnomo"
 
-#: gajim/common/const.py:394
+#: gajim/common/const.py:428
 #, fuzzy
 msgid "Sleepy"
 msgstr "Dormas"
 
-#: gajim/common/const.py:395
+#: gajim/common/const.py:429
 msgid "Spontaneous"
 msgstr ""
 
-#: gajim/common/const.py:396
+#: gajim/common/const.py:430
 #, fuzzy
 msgid "Stressed"
 msgstr "Strato:"
 
-#: gajim/common/const.py:397
+#: gajim/common/const.py:431
 msgid "Strong"
 msgstr ""
 
-#: gajim/common/const.py:398
+#: gajim/common/const.py:432
 #, fuzzy
 msgid "Surprised"
 msgstr "Abonita"
 
-#: gajim/common/const.py:399
+#: gajim/common/const.py:433
 msgid "Thankful"
 msgstr ""
 
-#: gajim/common/const.py:400
+#: gajim/common/const.py:434
 msgid "Thirsty"
 msgstr ""
 
-#: gajim/common/const.py:401
+#: gajim/common/const.py:435
 #, fuzzy
 msgid "Tired"
 msgstr "Tempo"
 
-#: gajim/common/const.py:402
+#: gajim/common/const.py:436
 #, fuzzy
 msgid "Undefined"
 msgstr "Substreko"
 
-#: gajim/common/const.py:403
+#: gajim/common/const.py:437
 msgid "Weak"
 msgstr ""
 
-#: gajim/common/const.py:404
+#: gajim/common/const.py:438
 msgid "Worried"
 msgstr ""
 
-#: gajim/common/const.py:408
+#: gajim/common/const.py:442
 msgid "accuracy"
 msgstr ""
 
-#: gajim/common/const.py:409
+#: gajim/common/const.py:443
 #, fuzzy
 msgid "alt"
 msgstr "Defaŭlte"
 
-#: gajim/common/const.py:410
+#: gajim/common/const.py:444
 msgid "area"
 msgstr ""
 
-#: gajim/common/const.py:411
+#: gajim/common/const.py:445
 #, fuzzy
 msgid "bearing"
 msgstr "mara"
 
-#: gajim/common/const.py:412
+#: gajim/common/const.py:446
 #, fuzzy
 msgid "building"
 msgstr "Elpelatas %s"
 
-#: gajim/common/const.py:413
+#: gajim/common/const.py:447
 #, fuzzy
 msgid "country"
 msgstr "Konto"
 
-#: gajim/common/const.py:414
+#: gajim/common/const.py:448
 #, fuzzy
 msgid "countrycode"
 msgstr "Konto"
 
-#: gajim/common/const.py:415
+#: gajim/common/const.py:449
 msgid "datum"
 msgstr ""
 
-#: gajim/common/const.py:416
+#: gajim/common/const.py:450
 #, fuzzy
 msgid "description"
 msgstr "Priskribo"
 
-#: gajim/common/const.py:417
+#: gajim/common/const.py:451
 #, fuzzy
 msgid "error"
 msgstr "Eraro de Avahi"
 
-#: gajim/common/const.py:418
+#: gajim/common/const.py:452
 msgid "floor"
 msgstr ""
 
-#: gajim/common/const.py:419
+#: gajim/common/const.py:453
 msgid "lat"
 msgstr ""
 
-#: gajim/common/const.py:420
+#: gajim/common/const.py:454
 msgid "locality"
 msgstr ""
 
-#: gajim/common/const.py:421
+#: gajim/common/const.py:455
 #, fuzzy
 msgid "lon"
 msgstr "unu"
 
-#: gajim/common/const.py:422
+#: gajim/common/const.py:456
 msgid "postalcode"
 msgstr ""
 
-#: gajim/common/const.py:423
+#: gajim/common/const.py:457
 msgid "region"
 msgstr ""
 
-#: gajim/common/const.py:424
+#: gajim/common/const.py:458
 msgid "room"
 msgstr "babilejo"
 
-#: gajim/common/const.py:425
+#: gajim/common/const.py:459
 msgid "speed"
 msgstr ""
 
-#: gajim/common/const.py:426
+#: gajim/common/const.py:460
 msgid "street"
 msgstr ""
 
-#: gajim/common/const.py:427
+#: gajim/common/const.py:461
 msgid "text"
 msgstr ""
 
-#: gajim/common/const.py:428
+#: gajim/common/const.py:462
 msgid "timestamp"
 msgstr ""
 
-#: gajim/common/const.py:429
+#: gajim/common/const.py:463
 msgid "URI"
 msgstr ""
 
-#: gajim/common/const.py:434
+#: gajim/common/const.py:468
 msgid "Unable to get issuer certificate"
 msgstr ""
 
-#: gajim/common/const.py:435
+#: gajim/common/const.py:469
 msgid "Unable to get certificate CRL"
 msgstr ""
 
-#: gajim/common/const.py:436
+#: gajim/common/const.py:470
 msgid "Unable to decrypt certificate's signature"
 msgstr ""
 
-#: gajim/common/const.py:437
+#: gajim/common/const.py:471
 msgid "Unable to decrypt CRL's signature"
 msgstr ""
 
-#: gajim/common/const.py:438
+#: gajim/common/const.py:472
 #, fuzzy
 msgid "Unable to decode issuer public key"
 msgstr "Neeblas ŝargi senfaran modulon"
 
-#: gajim/common/const.py:439
+#: gajim/common/const.py:473
 msgid "Certificate signature failure"
 msgstr ""
 
-#: gajim/common/const.py:440
+#: gajim/common/const.py:474
 msgid "CRL signature failure"
 msgstr ""
 
-#: gajim/common/const.py:441
+#: gajim/common/const.py:475
 msgid "Certificate is not yet valid"
 msgstr ""
 
-#: gajim/common/const.py:442
+#: gajim/common/const.py:476
 msgid "Certificate has expired"
 msgstr ""
 
-#: gajim/common/const.py:443
+#: gajim/common/const.py:477
 #, fuzzy
 msgid "CRL is not yet valid"
 msgstr "%s ne estas valida protokola detalnivelo"
 
-#: gajim/common/const.py:444
+#: gajim/common/const.py:478
 msgid "CRL has expired"
 msgstr ""
 
-#: gajim/common/const.py:445
+#: gajim/common/const.py:479
 msgid "Format error in certificate's notBefore field"
 msgstr ""
 
-#: gajim/common/const.py:446
+#: gajim/common/const.py:480
 msgid "Format error in certificate's notAfter field"
 msgstr ""
 
-#: gajim/common/const.py:447
+#: gajim/common/const.py:481
 msgid "Format error in CRL's lastUpdate field"
 msgstr ""
 
-#: gajim/common/const.py:448
+#: gajim/common/const.py:482
 msgid "Format error in CRL's nextUpdate field"
 msgstr ""
 
-#: gajim/common/const.py:449
+#: gajim/common/const.py:483
 msgid "Out of memory"
 msgstr ""
 
-#: gajim/common/const.py:450
+#: gajim/common/const.py:484
 msgid "Self signed certificate"
 msgstr ""
 
-#: gajim/common/const.py:451
+#: gajim/common/const.py:485
 msgid "Self signed certificate in certificate chain"
 msgstr ""
 
-#: gajim/common/const.py:452
+#: gajim/common/const.py:486
 msgid "Unable to get local issuer certificate"
 msgstr ""
 
-#: gajim/common/const.py:453
+#: gajim/common/const.py:487
 msgid "Unable to verify the first certificate"
 msgstr ""
 
-#: gajim/common/const.py:454
+#: gajim/common/const.py:488
 msgid "Certificate chain too long"
 msgstr ""
 
-#: gajim/common/const.py:455
+#: gajim/common/const.py:489
 msgid "Certificate revoked"
 msgstr ""
 
-#: gajim/common/const.py:456
+#: gajim/common/const.py:490
 #, fuzzy
 msgid "Invalid CA certificate"
 msgstr "Malkorekta salutnomo"
 
-#: gajim/common/const.py:457
+#: gajim/common/const.py:491
 msgid "Path length constraint exceeded"
 msgstr ""
 
-#: gajim/common/const.py:458
+#: gajim/common/const.py:492
 msgid "Unsupported certificate purpose"
 msgstr ""
 
-#: gajim/common/const.py:459
+#: gajim/common/const.py:493
 msgid "Certificate not trusted"
 msgstr ""
 
-#: gajim/common/const.py:460
+#: gajim/common/const.py:494
 msgid "Certificate rejected"
 msgstr ""
 
-#: gajim/common/const.py:461
+#: gajim/common/const.py:495
 msgid "Subject issuer mismatch"
 msgstr ""
 
-#: gajim/common/const.py:462
+#: gajim/common/const.py:496
 msgid "Authority and subject key identifier mismatch"
 msgstr ""
 
-#: gajim/common/const.py:463
+#: gajim/common/const.py:497
 msgid "Authority and issuer serial number mismatch"
 msgstr ""
 
-#: gajim/common/const.py:464
+#: gajim/common/const.py:498
 msgid "Key usage does not include certificate signing"
 msgstr ""
 
-#: gajim/common/const.py:465
+#: gajim/common/const.py:499
 msgid "Application verification failure"
 msgstr ""
 
@@ -5169,262 +5292,262 @@ msgstr ""
 msgid "video output"
 msgstr ""
 
-#: gajim/common/helpers.py:210
+#: gajim/common/helpers.py:216
 msgid "Server must be between 1 and 1023 bytes"
 msgstr ""
 
-#: gajim/common/helpers.py:214
+#: gajim/common/helpers.py:220
 msgid "Invalid character in hostname."
 msgstr "Malkorekta signo en servilnomo."
 
-#: gajim/common/helpers.py:216
+#: gajim/common/helpers.py:222
 msgid "Server address required."
 msgstr "Necesas adreso de servilo."
 
-#: gajim/common/helpers.py:220
+#: gajim/common/helpers.py:226
 msgid "Username must be between 1 and 1023 bytes"
 msgstr ""
 
-#: gajim/common/helpers.py:224
+#: gajim/common/helpers.py:230
 msgid "Invalid character in username."
 msgstr "Malkorekta signo en salutnomo."
 
-#: gajim/common/helpers.py:230
+#: gajim/common/helpers.py:236
 msgid "Resource must be between 1 and 1023 bytes"
 msgstr ""
 
-#: gajim/common/helpers.py:234
+#: gajim/common/helpers.py:240
 msgid "Invalid character in resource."
 msgstr "Malkorekta signo en risurcnomo."
 
-#: gajim/common/helpers.py:275
+#: gajim/common/helpers.py:281
 msgid "_Busy"
 msgstr "_Okupata"
 
-#: gajim/common/helpers.py:277 gajim/gtk/tooltips.py:647
+#: gajim/common/helpers.py:283 gajim/gtk/tooltips.py:647
 msgid "Busy"
 msgstr "Okupata"
 
-#: gajim/common/helpers.py:280
+#: gajim/common/helpers.py:286
 msgid "_Not Available"
 msgstr "_Nedisponebla"
 
-#: gajim/common/helpers.py:282 gajim/gtk/tooltips.py:649
+#: gajim/common/helpers.py:288 gajim/gtk/tooltips.py:649
 msgid "Not Available"
 msgstr "Nedisponebla"
 
-#: gajim/common/helpers.py:285
+#: gajim/common/helpers.py:291
 msgid "_Free for Chat"
 msgstr "_Babilema"
 
-#: gajim/common/helpers.py:287 gajim/gtk/tooltips.py:643
+#: gajim/common/helpers.py:293 gajim/gtk/tooltips.py:643
 msgid "Free for Chat"
 msgstr "Babilema"
 
-#: gajim/common/helpers.py:290
+#: gajim/common/helpers.py:296
 #, fuzzy
 msgid "?user status:_Available"
 msgstr "Paŭzas"
 
-#: gajim/common/helpers.py:292 gajim/gtk/tooltips.py:641
+#: gajim/common/helpers.py:298 gajim/gtk/tooltips.py:641
 #, fuzzy
 msgid "?user status:Available"
 msgstr "Paŭzas"
 
-#: gajim/common/helpers.py:294
+#: gajim/common/helpers.py:300
 msgid "Connecting"
 msgstr "Konektas"
 
-#: gajim/common/helpers.py:297 gajim/data/gui/preferences_window.ui:1251
+#: gajim/common/helpers.py:303 gajim/data/gui/preferences_window.ui:1251
 msgid "A_way"
 msgstr "_Fora"
 
-#: gajim/common/helpers.py:299 gajim/common/modules/adhoc_commands.py:120
-#: gajim/command_system/implementation/standard.py:139
+#: gajim/common/helpers.py:305 gajim/common/modules/adhoc_commands.py:120
+#: gajim/command_system/implementation/standard.py:141
 #: gajim/gtk/tooltips.py:645
 msgid "Away"
 msgstr "Fora"
 
-#: gajim/common/helpers.py:302
+#: gajim/common/helpers.py:308
 msgid "_Offline"
 msgstr "_Senkonekta"
 
-#: gajim/common/helpers.py:304 gajim/gtk/tooltips.py:651
+#: gajim/common/helpers.py:310 gajim/gtk/tooltips.py:651
 msgid "Offline"
 msgstr "Senkonekta"
 
-#: gajim/common/helpers.py:307
+#: gajim/common/helpers.py:313
 msgid "_Invisible"
 msgstr "Ne_videbla"
 
-#: gajim/common/helpers.py:313
+#: gajim/common/helpers.py:319
 msgid "?contact has status:Unknown"
 msgstr "Nekonata"
 
-#: gajim/common/helpers.py:315
+#: gajim/common/helpers.py:321
 msgid "?contact has status:Has errors"
 msgstr "Eraroj"
 
-#: gajim/common/helpers.py:330
+#: gajim/common/helpers.py:336
 msgid "?Subscription we already have:None"
 msgstr "Neniu"
 
-#: gajim/common/helpers.py:332
+#: gajim/common/helpers.py:338
 msgid "To"
 msgstr "Al"
 
-#: gajim/common/helpers.py:334 gajim/data/gui/groups_post_window.ui:33
+#: gajim/common/helpers.py:340 gajim/data/gui/groups_post_window.ui:33
 msgid "From"
 msgstr "De"
 
-#: gajim/common/helpers.py:336
+#: gajim/common/helpers.py:342
 msgid "Both"
 msgstr "Ambaŭ"
 
-#: gajim/common/helpers.py:338 gajim/gtk/server_info.py:151
+#: gajim/common/helpers.py:344 gajim/gtk/server_info.py:151
 #, fuzzy
 msgid "Unknown"
 msgstr "Nekonata"
 
-#: gajim/common/helpers.py:344
+#: gajim/common/helpers.py:350
 msgid "?Ask (for Subscription):None"
 msgstr "Nenion"
 
-#: gajim/common/helpers.py:346
+#: gajim/common/helpers.py:352
 msgid "Subscribe"
 msgstr "Aboni"
 
-#: gajim/common/helpers.py:355
+#: gajim/common/helpers.py:361
 msgid "?Group Chat Contact Role:None"
 msgstr "Neniu"
 
-#: gajim/common/helpers.py:358
+#: gajim/common/helpers.py:364
 msgid "Moderators"
 msgstr "Moderigantoj"
 
-#: gajim/common/helpers.py:360
+#: gajim/common/helpers.py:366
 msgid "Moderator"
 msgstr "Moderiganto"
 
-#: gajim/common/helpers.py:363
+#: gajim/common/helpers.py:369 gajim/data/gui/groupchat_info_scrolled.ui:243
 msgid "Participants"
 msgstr "Partoprenantoj"
 
-#: gajim/common/helpers.py:365
+#: gajim/common/helpers.py:371
 msgid "Participant"
 msgstr "Partoprenanto"
 
-#: gajim/common/helpers.py:368
+#: gajim/common/helpers.py:374
 msgid "Visitors"
 msgstr "Vizitantoj"
 
-#: gajim/common/helpers.py:370
+#: gajim/common/helpers.py:376
 msgid "Visitor"
 msgstr "Vizitanto"
 
-#: gajim/common/helpers.py:376 gajim/gtk/tooltips.py:253
+#: gajim/common/helpers.py:382 gajim/gtk/tooltips.py:253
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "Neniu"
 
-#: gajim/common/helpers.py:378 gajim/data/gui/groupchat_config.ui:32
+#: gajim/common/helpers.py:384 gajim/data/gui/groupchat_config.ui:32
 #: gajim/gtk/tooltips.py:259
 msgid "Owner"
 msgstr "Mastro"
 
-#: gajim/common/helpers.py:380 gajim/gtk/tooltips.py:257
+#: gajim/common/helpers.py:386 gajim/gtk/tooltips.py:257
 msgid "Administrator"
 msgstr "Administristo"
 
-#: gajim/common/helpers.py:382 gajim/data/gui/groupchat_config.ui:40
+#: gajim/common/helpers.py:388 gajim/data/gui/groupchat_config.ui:40
 #: gajim/gtk/tooltips.py:255 gajim/gtk/groupchat_config.py:105
 msgid "Member"
 msgstr "Membro"
 
-#: gajim/common/helpers.py:421
+#: gajim/common/helpers.py:427
 msgid "is paying attention to the conversation"
 msgstr "atentas al la komunikado"
 
-#: gajim/common/helpers.py:423
+#: gajim/common/helpers.py:429
 msgid "is doing something else"
 msgstr "faras ion alian"
 
-#: gajim/common/helpers.py:425
+#: gajim/common/helpers.py:431
 #, fuzzy
 msgid "is composing a message…"
 msgstr "tajpas mesaĝon..."
 
-#: gajim/common/helpers.py:428
+#: gajim/common/helpers.py:434
 msgid "paused composing a message"
 msgstr "paŭzas tajpi mesaĝon"
 
-#: gajim/common/helpers.py:430
+#: gajim/common/helpers.py:436
 msgid "has closed the chat window or tab"
 msgstr "fermis la interparolan fenestron aŭ slipon"
 
-#: gajim/common/helpers.py:936 gajim/common/helpers.py:943
+#: gajim/common/helpers.py:942 gajim/common/helpers.py:949
 #, 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:950
+#: gajim/common/helpers.py:956
 #, fuzzy, python-format
-msgid "from room %s"
-msgstr "Mi estas %s"
+msgid "from group chat %s"
+msgstr "Eniri en babilejon"
 
-#: gajim/common/helpers.py:953 gajim/common/helpers.py:970
+#: gajim/common/helpers.py:959 gajim/common/helpers.py:976
 #, python-format
 msgid "from user %s"
 msgstr ""
 
-#: gajim/common/helpers.py:955
+#: gajim/common/helpers.py:961
 #, fuzzy, python-format
 msgid "from %s"
 msgstr "De"
 
-#: gajim/common/helpers.py:962 gajim/common/helpers.py:968
+#: gajim/common/helpers.py:968 gajim/common/helpers.py:974
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
 msgstr[0] ""
 msgstr[1] ""
 
-#: gajim/common/helpers.py:986 gajim/common/helpers.py:998
+#: gajim/common/helpers.py:992 gajim/common/helpers.py:1004
 #: gajim/data/gui/roster_window.ui:85 data/org.gajim.Gajim.desktop.in:4
 #: data/org.gajim.Gajim.appdata.xml.in:9
 msgid "Gajim"
 msgstr "Gajim"
 
-#: gajim/common/helpers.py:1000
+#: gajim/common/helpers.py:1006
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: gajim/common/helpers.py:1109 gajim/data/gui/add_new_contact_window.ui:25
+#: gajim/common/helpers.py:1115 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:1111
+#: gajim/common/helpers.py:1117
 msgid "Hello, I am $name."
 msgstr ""
 
-#: gajim/common/helpers.py:1215 gajim/common/helpers.py:1224
-#: gajim/common/helpers.py:1282
+#: gajim/common/helpers.py:1221 gajim/common/helpers.py:1230
+#: gajim/common/helpers.py:1288
 #, fuzzy
 msgid "Timeout loading image"
 msgstr "Ne povas alŝuti bildon"
 
-#: gajim/common/helpers.py:1234 gajim/common/helpers.py:1280
+#: gajim/common/helpers.py:1240 gajim/common/helpers.py:1286
 msgid "Image is too big"
 msgstr ""
 
-#: gajim/common/helpers.py:1245
+#: gajim/common/helpers.py:1251
 #, fuzzy
 msgid "PyCURL is not installed"
 msgstr "%s ne estas valida protokola detalnivelo"
 
-#: gajim/common/helpers.py:1284
+#: gajim/common/helpers.py:1290
 #, fuzzy
 msgid "Error loading image"
 msgstr "Ne povas alŝuti bildon"
@@ -5611,7 +5734,7 @@ msgstr ""
 #: gajim/common/modules/adhoc_commands.py:202
 #: gajim/common/modules/adhoc_commands.py:239
 #, fuzzy
-msgid "Leave Groupchats"
+msgid "Leave Group Chats"
 msgstr "Nova babilejo"
 
 #: gajim/common/modules/adhoc_commands.py:228
@@ -5621,16 +5744,17 @@ msgstr "%(nickname)s de babilejo %(room_name)s"
 
 #: gajim/common/modules/adhoc_commands.py:232
 #, fuzzy
-msgid "You have not joined a groupchat."
+msgid "You have not joined a group chat."
 msgstr "%s aliĝis al la babilejo"
 
 #: gajim/common/modules/adhoc_commands.py:240
-msgid "Choose the groupchats you want to leave"
-msgstr ""
+#, fuzzy
+msgid "Choose the group chats you want to leave"
+msgstr "Bonvolu pleni la datumon pri kontakto, kiun vi volas aldoni"
 
 #: gajim/common/modules/adhoc_commands.py:289
 #, fuzzy
-msgid "You left the following groupchats:"
+msgid "You left the following group chats:"
 msgstr "Vi jam estas en babilejo %s"
 
 #: gajim/common/modules/roster_item_exchange.py:102
@@ -5648,7 +5772,7 @@ msgstr "Kontaktoj"
 msgid "Blocked Contacts"
 msgstr "Kontaktoj"
 
-#: gajim/data/gui/destroy_muc_dialog.ui:79 gajim/gtk/dialogs.py:736
+#: gajim/data/gui/destroy_muc_dialog.ui:79 gajim/gtk/dialogs.py:563
 msgid "Destroy this group chat permanently?"
 msgstr ""
 
@@ -5657,7 +5781,7 @@ msgstr ""
 msgid "Reason..."
 msgstr "Kialo"
 
-#: gajim/data/gui/destroy_muc_dialog.ui:124 gajim/gtk/dialogs.py:738
+#: gajim/data/gui/destroy_muc_dialog.ui:124 gajim/gtk/dialogs.py:565
 msgid "Where participants should go (optional)"
 msgstr ""
 
@@ -5669,34 +5793,6 @@ msgstr ""
 msgid "_Reason and alternate venue (optional)"
 msgstr ""
 
-#: gajim/data/gui/advanced_configuration_window.ui:7
-#: gajim/data/gui/preferences_window.ui:2723
-#, fuzzy
-msgid "Advanced Configuration Editor (ACE)"
-msgstr "Detala agorda administrilo"
-
-#: gajim/data/gui/advanced_configuration_window.ui:52
-#, fuzzy
-msgid "You should restart Gajim for some changes to take effect"
-msgstr ""
-"<b>RIMARKU:</b> Vi devas relanĉi gajim por efektigi kelkajn parametrojn"
-
-#: gajim/data/gui/advanced_configuration_window.ui:84
-#, fuzzy
-msgid "_Filter"
-msgstr "_Filtrilo:"
-
-#: gajim/data/gui/advanced_configuration_window.ui:153
-#: gajim/data/gui/filetransfers_send_file_dialog.ui:15
-#: gajim/gtk/discovery.py:1666
-msgid "Description"
-msgstr "Priskribo"
-
-#: gajim/data/gui/advanced_configuration_window.ui:197
-#, fuzzy
-msgid "_Reset to default"
-msgstr "_Reŝargi kolorojn per defaŭlto"
-
 #: gajim/data/gui/join_groupchat_window.ui:56
 #: gajim/data/gui/chat_to_muc_window.ui:67
 #: gajim/data/gui/chat_to_muc_window.ui:78
@@ -5708,9 +5804,8 @@ msgid "Join group chat every time Gajim is started"
 msgstr ""
 
 #: gajim/data/gui/join_groupchat_window.ui:113
-#, fuzzy
-msgid "Auto Join"
-msgstr "Aŭtomate aliĝi"
+msgid "Join Automatically"
+msgstr ""
 
 #: gajim/data/gui/join_groupchat_window.ui:131
 #: gajim/data/gui/profile_window.ui:233
@@ -5719,10 +5814,11 @@ msgstr "Konto"
 
 #: gajim/data/gui/join_groupchat_window.ui:147
 #, fuzzy
-msgid "Room"
-msgstr "Babilejo:"
+msgid "Group chat"
+msgstr "Babilejoj"
 
-#: gajim/data/gui/join_groupchat_window.ui:180 gajim/gtk/accounts.py:886
+#: gajim/data/gui/join_groupchat_window.ui:180 gajim/data/gui/bookmarks.ui:158
+#: gajim/gtk/accounts.py:889
 #, fuzzy
 msgid "Password"
 msgstr "Pasvorto:"
@@ -5746,95 +5842,11 @@ msgstr "Eniri en babilejon"
 msgid "Search group chats on selected server"
 msgstr ""
 
-#: gajim/data/gui/join_groupchat_window.ui:437 gajim/gtk/discovery.py:1271
+#: gajim/data/gui/join_groupchat_window.ui:437 gajim/gtk/discovery.py:1270
 #, fuzzy
 msgid "Join"
 msgstr "_Aliĝi"
 
-#: gajim/data/gui/manage_proxies_window.ui:12
-#, fuzzy
-msgid "HTTP Connect"
-msgstr ""
-"HTTP Connect\n"
-"SOCKS5"
-
-#: gajim/data/gui/manage_proxies_window.ui:15
-msgid "SOCKS5"
-msgstr ""
-
-#: gajim/data/gui/manage_proxies_window.ui:18
-msgid "BOSH"
-msgstr ""
-
-#: gajim/data/gui/manage_proxies_window.ui:27
-msgid "Manage Proxy Profiles"
-msgstr "Administri prokurservilajn agordojn"
-
-#: gajim/data/gui/manage_proxies_window.ui:83
-#, fuzzy
-msgid "Add Proxy"
-msgstr "Prokura servilo:"
-
-#: gajim/data/gui/manage_proxies_window.ui:97
-#, fuzzy
-msgid "Remove Proxy"
-msgstr "Forigi grupon"
-
-#: gajim/data/gui/manage_proxies_window.ui:141
-#, fuzzy
-msgid "Properties"
-msgstr "<b>Agordo</b>"
-
-#: gajim/data/gui/manage_proxies_window.ui:157
-#, fuzzy
-msgid "_Name"
-msgstr "_Nomo:"
-
-#: gajim/data/gui/manage_proxies_window.ui:173
-#, fuzzy
-msgid "_Type"
-msgstr "Tipo:"
-
-#: gajim/data/gui/manage_proxies_window.ui:236
-#, fuzzy
-msgid "_BOSH URL"
-msgstr "_URL:"
-
-#: gajim/data/gui/manage_proxies_window.ui:261
-#, fuzzy
-msgid "Use HTTP prox_y"
-msgstr "_Uzi prokuran servilon"
-
-#: gajim/data/gui/manage_proxies_window.ui:280
-#, fuzzy
-msgid "Proxy _Host"
-msgstr "Prokura servilo:"
-
-#: gajim/data/gui/manage_proxies_window.ui:307
-#, fuzzy
-msgid "Proxy _Port"
-msgstr "_Pordo:"
-
-#: gajim/data/gui/manage_proxies_window.ui:334
-#, fuzzy
-msgid "_Username"
-msgstr "_Salutnomo:"
-
-#: gajim/data/gui/manage_proxies_window.ui:347
-#, fuzzy
-msgid "Use proxy auth_entication"
-msgstr "Uzi aŭtentokontrolon"
-
-#: gajim/data/gui/manage_proxies_window.ui:377
-#, fuzzy
-msgid "Pass_word"
-msgstr "Pas_vorto:"
-
-#: gajim/data/gui/manage_proxies_window.ui:405 gajim/gtk/adhoc.py:321
-#, fuzzy
-msgid "Settings"
-msgstr "Konektado malsukcesis"
-
 #: gajim/data/gui/change_password_dialog.ui:17
 #, fuzzy
 msgid "New Password"
@@ -5865,11 +5877,13 @@ msgid "Status:"
 msgstr "Stato:"
 
 #: gajim/data/gui/zeroconf_information_window.ui:89
-msgid "_Log conversation history"
+#, fuzzy
+msgid "_Store conversation history"
 msgstr "_Protokoli komunikadan historion"
 
 #: gajim/data/gui/zeroconf_information_window.ui:215
 #: gajim/data/gui/vcard_information_window.ui:390
+#: gajim/data/gui/groupchat_info_scrolled.ui:166
 msgid "Contact"
 msgstr "Kontakto"
 
@@ -5882,8 +5896,9 @@ msgid "Last Name:"
 msgstr "Familia nomo:"
 
 #: gajim/data/gui/zeroconf_information_window.ui:260
-msgid "Jabber ID:"
-msgstr "Jabber-ID:"
+#, fuzzy
+msgid "XMPP Address:"
+msgstr "AIM-adreso:"
 
 #: gajim/data/gui/zeroconf_information_window.ui:273
 msgid "E-Mail:"
@@ -5904,8 +5919,8 @@ msgstr "Sendi _dosieron"
 
 #: gajim/data/gui/gc_occupants_menu.ui:29
 #, fuzzy
-msgid "Occupant Actions"
-msgstr "_Agoj por babilanto"
+msgid "Participant Actions"
+msgstr "Partoprenantoj"
 
 #: gajim/data/gui/gc_occupants_menu.ui:38
 msgid "_Voice"
@@ -5936,8 +5951,9 @@ msgid "_Ban"
 msgstr "_Malpermesi"
 
 #: gajim/data/gui/gc_occupants_menu.ui:124
-msgid "_Add to Roster"
-msgstr "_Aldoni al kontaktlisto"
+#, fuzzy
+msgid "_Add to Contact List"
+msgstr "_Aldoni kontakton..."
 
 #: gajim/data/gui/gc_occupants_menu.ui:132
 #, fuzzy
@@ -5978,11 +5994,6 @@ msgstr "Abono:"
 msgid "_Status"
 msgstr "_Stato"
 
-#: gajim/data/gui/zeroconf_context_menu.ui:26
-#: gajim/data/gui/account_context_menu.ui:79
-msgid "_Modify Account..."
-msgstr "_Korekti konton..."
-
 #: gajim/data/gui/certificate_dialog.ui:66
 #: gajim/data/gui/certificate_dialog.ui:178
 msgid "Common Name (CN)"
@@ -6068,13 +6079,19 @@ msgstr "Familia nomo:"
 msgid "Next entry"
 msgstr ""
 
+#: gajim/data/gui/filetransfers_send_file_dialog.ui:15
+#: gajim/data/gui/advanced_configuration.ui:143
+#: gajim/data/gui/groupchat_info_scrolled.ui:48 gajim/gtk/discovery.py:1663
+msgid "Description"
+msgstr "Priskribo"
+
 #: gajim/data/gui/filetransfers_send_file_dialog.ui:54
 #, fuzzy
 msgid "_Send Files"
 msgstr "Sendi _dosieron"
 
 #: gajim/data/gui/filetransfers_send_file_dialog.ui:58
-#: gajim/gtk/xml_console.py:90
+#: gajim/gtk/xml_console.py:87
 #, fuzzy
 msgid "Send"
 msgstr "_Sendi"
@@ -6101,8 +6118,8 @@ msgstr "Ŝanĝi kaŝ_nomon"
 
 #: gajim/data/gui/gc_control_popup_menu.ui:20
 #, fuzzy
-msgid "_Manage Room"
-msgstr "Aranĝi legosignojn"
+msgid "_Manage Group Chat"
+msgstr "Nova babilejo"
 
 #: gajim/data/gui/gc_control_popup_menu.ui:31
 #, fuzzy
@@ -6111,13 +6128,13 @@ msgstr "Ŝanĝi _temon"
 
 #: gajim/data/gui/gc_control_popup_menu.ui:38
 #, fuzzy
-msgid "Configure _Room..."
-msgstr "Administri _babilejon"
+msgid "Configure _Group Chat..."
+msgstr "Eniri en babilejon"
 
 #: gajim/data/gui/gc_control_popup_menu.ui:52
 #, fuzzy
-msgid "_Destroy Room"
-msgstr "Priskribo: %s"
+msgid "_Destroy Group Chat"
+msgstr "Nova babilejo"
 
 #: gajim/data/gui/gc_control_popup_menu.ui:64
 msgid "_Minimize on close"
@@ -6128,7 +6145,7 @@ msgstr ""
 msgid "_Request Voice"
 msgstr "_Voĉo"
 
-#: gajim/data/gui/gc_control_popup_menu.ui:99 gajim/gtk/discovery.py:1704
+#: gajim/data/gui/gc_control_popup_menu.ui:99
 #, fuzzy
 msgid "_Bookmark"
 msgstr "Starigi legosignon por tiu babilejo"
@@ -6181,14 +6198,6 @@ msgstr "Hejmpaĝo:"
 msgid "E-Mail"
 msgstr "Retpoŝtadreso:"
 
-#: 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/blocking_list.ui:115 gajim/gtk/add_contact.py:30
-#: gajim/gtk/accounts.py:801
-#, fuzzy
-msgid "Jabber ID"
-msgstr "Jabber-ID:"
-
 #: gajim/data/gui/profile_window.ui:440
 msgid "Main"
 msgstr ""
@@ -6324,35 +6333,42 @@ msgstr "Laboro"
 msgid "About"
 msgstr "Pri si"
 
-#: gajim/data/gui/start_chat_dialog.ui:114 gajim/gtk/discovery.py:1658
-msgid "Users"
-msgstr "Uzuloj"
-
-#: gajim/data/gui/start_chat_dialog.ui:185
-msgid "Name:"
-msgstr "Nomo:"
+#: gajim/data/gui/start_chat_dialog.ui:53
+#, fuzzy
+msgid "Global Group Chat Search"
+msgstr "Eniri babilejen"
 
-#: gajim/data/gui/start_chat_dialog.ui:197
+#: 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
-msgid "Description:"
-msgstr "Priskribo: %s"
+msgid "_Back"
+msgstr "Revenos baldaŭ"
+
+#: gajim/data/gui/start_chat_dialog.ui:245
+#: gajim/data/gui/groupchat_control.ui:796
+#: gajim/data/gui/groupchat_control.ui:888 gajim/gtk/discovery.py:1701
+#: gajim/gtk/groupchat_join.py:62
+msgid "_Join"
+msgstr "_Aliĝi"
 
-#: gajim/data/gui/start_chat_dialog.ui:209
+#: gajim/data/gui/start_chat_dialog.ui:289
 #, fuzzy
-msgid "Address:"
-msgstr "_Adreso:"
+msgid "Select Account"
+msgstr "Forigado de konto %s"
 
-#: gajim/data/gui/start_chat_dialog.ui:246
-msgid ""
-"Semi-Anonymous\n"
-"<span size=\"small\">(Only moderators can see your XMPP-Address)</span>"
+#: gajim/data/gui/start_chat_dialog.ui:380
+msgid "_Select"
 msgstr ""
 
 #: gajim/data/gui/filetransfers.ui:21
 msgid "Pa_use/Resume"
 msgstr ""
 
-#: gajim/data/gui/filetransfers.ui:30 gajim/gtk/filechoosers.py:178
+#: gajim/data/gui/filetransfers.ui:30 gajim/data/gui/groupchat_control.ui:575
+#: gajim/data/gui/groupchat_control.ui:667
+#: gajim/data/gui/groupchat_control.ui:779
+#: gajim/data/gui/groupchat_control.ui:871 gajim/gtk/filechoosers.py:178
 msgid "_Cancel"
 msgstr "_Nuligi"
 
@@ -6396,7 +6412,8 @@ msgid "Cancel the selected file transfer and remove incomplete files"
 msgstr "Nuligas la indikitan dosiertransmeton kaj forigas neplenan dosieron"
 
 #: gajim/data/gui/filetransfers.ui:207
-msgid "Shows a list of file transfers between you and others"
+#, fuzzy
+msgid "Shows a list of file transfers between you and your contacts"
 msgstr "Montras liston de dosiertransmetojn inter vi kaj aliaj"
 
 #: gajim/data/gui/groupchat_control.ui:13 gajim/data/gui/chat_control.ui:277
@@ -6418,7 +6435,6 @@ msgid "Strike"
 msgstr "Kaŝnomo"
 
 #: gajim/data/gui/groupchat_control.ui:54 gajim/data/gui/chat_control.ui:318
-#: gajim/gtk/advanced_config.py:86
 msgid "Color"
 msgstr "Koloro"
 
@@ -6432,16 +6448,45 @@ msgstr "_Tiparo:"
 msgid "Clear formatting"
 msgstr "Kontakta informo"
 
-#: gajim/data/gui/groupchat_control.ui:290 gajim/data/gui/chat_control.ui:880
+#: gajim/data/gui/groupchat_control.ui:291 gajim/data/gui/chat_control.ui:880
 #, fuzzy
 msgid "Choose encryption"
 msgstr "Elektu dosieron por sendi..."
 
-#: gajim/data/gui/groupchat_control.ui:336 gajim/data/gui/chat_control.ui:640
+#: gajim/data/gui/groupchat_control.ui:337 gajim/data/gui/chat_control.ui:640
 #, fuzzy
 msgid "Show a list of emojis (Alt+M)"
 msgstr "Klaku por enigi mienon (Alt+M)"
 
+#: gajim/data/gui/groupchat_control.ui:484
+#, fuzzy
+msgid "Joining…"
+msgstr "Malpermesas..."
+
+#: gajim/data/gui/groupchat_control.ui:496
+msgid "_Abort"
+msgstr ""
+
+#: gajim/data/gui/groupchat_control.ui:542
+#, fuzzy
+msgid "Enter new nickname"
+msgstr "Post kaŝnomo:"
+
+#: gajim/data/gui/groupchat_control.ui:592
+#: gajim/data/gui/groupchat_control.ui:684
+#, fuzzy
+msgid "Ch_ange"
+msgstr "Ŝanĝi kaŝ_nomon"
+
+#: gajim/data/gui/groupchat_control.ui:761
+#, fuzzy
+msgid "Enter password"
+msgstr "Enigu novan pasvorton:"
+
+#: gajim/data/gui/groupchat_control.ui:1067
+msgid "_Try again"
+msgstr ""
+
 #: gajim/data/gui/popup_notification_window.ui:42
 #, fuzzy
 msgid "Event Type"
@@ -6523,8 +6568,8 @@ msgstr "Fora"
 
 #: gajim/data/gui/mam_preferences.ui:18
 #, fuzzy
-msgid "Roster"
-msgstr "Montri _kontaktliston"
+msgid "Contact List"
+msgstr "Kontaktoj"
 
 #: gajim/data/gui/mam_preferences.ui:22
 #: gajim/data/gui/preferences_window.ui:123
@@ -6549,12 +6594,12 @@ msgid "Add"
 msgstr "Aldoni"
 
 #: gajim/data/gui/mam_preferences.ui:194 gajim/data/gui/groupchat_config.ui:151
-#: gajim/gtk/dialogs.py:63 gajim/gtk/accounts.py:381
+#: gajim/gtk/dialogs.py:62 gajim/gtk/accounts.py:384
 #, fuzzy
 msgid "Remove"
 msgstr "_Forigi"
 
-#: gajim/data/gui/vcard_information_window.ui:72 gajim/gtk/accounts.py:753
+#: gajim/data/gui/vcard_information_window.ui:72 gajim/gtk/accounts.py:756
 #, fuzzy
 msgid "Resource"
 msgstr "Risurco:"
@@ -6607,6 +6652,7 @@ msgstr "Abono:"
 #: gajim/data/gui/vcard_information_window.ui:974
 #: gajim/data/gui/vcard_information_window.ui:993
 #: gajim/data/gui/vcard_information_window.ui:1427
+#: gajim/data/gui/groupchat_info_scrolled.ui:222
 msgid "button"
 msgstr ""
 
@@ -6639,15 +6685,15 @@ msgstr "_Avizi min pri tio"
 
 #: gajim/data/gui/preferences_window.ui:58
 #, fuzzy
-msgid "Show only in roster"
-msgstr "Montri nur en _kontaktlisto"
+msgid "Show only in contact list"
+msgstr "Montri _senkonektajn kontaktojn"
 
 #: gajim/data/gui/preferences_window.ui:69
-msgid "Detached roster with detached chats"
+msgid "Detached contact list with detached chats"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:72
-msgid "Detached roster with single chat"
+msgid "Detached contact list with single chat"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:75
@@ -6655,11 +6701,11 @@ msgid "Single window for everything"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:78
-msgid "Detached roster with chat grouped by account"
+msgid "Detached contact list with chat grouped by account"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:81
-msgid "Detached roster with chat grouped by type"
+msgid "Detached contact list with chat grouped by type"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:92
@@ -6710,7 +6756,7 @@ msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:296
 #, fuzzy
-msgid "_Show roster on startup"
+msgid "_Show contact list on startup"
 msgstr "Montri _kontaktliston"
 
 #: gajim/data/gui/preferences_window.ui:311
@@ -6726,12 +6772,12 @@ msgid "_Tabs placement"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:363
-msgid "_Quit Gajim when closing roster window"
+msgid "_Quit Gajim when closing contact list"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:367
 msgid ""
-"If enabled, Gajim will quit when closing the roster window instead of "
+"If enabled, Gajim will quit when closing the contact list window instead of "
 "minimizing to the system's notification area"
 msgstr ""
 
@@ -6741,41 +6787,42 @@ msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:423
 #, fuzzy
-msgid "Show a_vatars of contacts in roster"
+msgid "Show a_vatars of contacts in contact list"
 msgstr "Montri kaŝ_bildetojn de kontaktojn en kontaktlisto"
 
 #: gajim/data/gui/preferences_window.ui:427
 #, fuzzy
 msgid ""
-"If checked, avatars of contacts will be shown in the roster window and in "
-"group chats"
+"If checked, avatars of contacts will be shown in the contact list window and "
+"in group chats"
 msgstr ""
 "Se markitas, Gajim montros kaŝbildetojn de kontaktoj en kontaktlista "
 "fenestro kaj en babilejoj"
 
 #: gajim/data/gui/preferences_window.ui:441
 #, fuzzy
-msgid "Show status _messages of contacts in roster"
+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
 #, fuzzy
 msgid ""
 "If checked, status messages of contacts will be shown under the contact's "
-"name, in the roster window, and in group chats"
+"name, in the contact list window, and in group chats"
 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
 #, fuzzy
-msgid "Show e_xtra information of contacts in roster (mood, activity, ...)"
+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
 msgid ""
-"If checked, additional info published by the contact will be shown in "
-"roster. Additional infos (published via PEP) may include e.g. mood, "
+"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 ""
 
@@ -6786,8 +6833,8 @@ msgstr "_Ordigi kontaktojn per stato"
 
 #: gajim/data/gui/preferences_window.ui:494
 #, fuzzy
-msgid "in _roster"
-msgstr "Mankas en kontaktlisto"
+msgid "in _contact list"
+msgstr "Kontaktoj"
 
 #: gajim/data/gui/preferences_window.ui:511
 #, fuzzy
@@ -6796,8 +6843,8 @@ msgstr "Eniri en babilejon"
 
 #: gajim/data/gui/preferences_window.ui:540
 #, fuzzy
-msgid "Roster Appearance"
-msgstr "<b>Redakti regulon</b>"
+msgid "Contact List Appearance"
+msgstr "Kontakto malkonektita"
 
 #: gajim/data/gui/preferences_window.ui:585
 msgid "Enable spell _checking"
@@ -6858,7 +6905,7 @@ msgstr "Neeblas aliĝi al babilejo"
 
 #: gajim/data/gui/preferences_window.ui:660
 #, fuzzy
-msgid "If checked, the room subject will be shown when joining a group chat"
+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:682
@@ -6873,13 +6920,13 @@ msgstr ""
 #: gajim/data/gui/preferences_window.ui:701
 msgid ""
 "If join/leave status messages are shown in the group chat. This setting can "
-"be overridden in the groupchat menu."
+"be overridden in the group chat menu."
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:720
 msgid ""
 "The default sync threshold for new public group chats. This setting can be "
-"overridden in the groupchat menu."
+"overridden in the group chat menu."
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:722
@@ -6894,7 +6941,7 @@ msgstr "_Protokoli statŝanĝojn de kontaktoj"
 #: gajim/data/gui/preferences_window.ui:768
 msgid ""
 "If status change messages are shown in the group chat. This setting can be "
-"overridden in the groupchat menu."
+"overridden in the group chat menu."
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:825
@@ -6911,8 +6958,8 @@ msgstr "Se markitas, Gajim aliĝos al tiu ĉi babilejo dum lanĉo"
 
 #: gajim/data/gui/preferences_window.ui:843
 #, fuzzy
-msgid "Show chatstate in roster"
-msgstr "Montri kaŝ_bildetojn de kontaktojn en kontaktlisto"
+msgid "Show chatstate in contact list"
+msgstr "Ĉu montri fermontan butonon en sliplangeto?"
 
 #: gajim/data/gui/preferences_window.ui:847
 msgid ""
@@ -7205,7 +7252,7 @@ msgstr ""
 msgid "Vi_ew own video source"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2281 gajim/gtk/accounts.py:352
+#: gajim/data/gui/preferences_window.ui:2281 gajim/gtk/accounts.py:355
 msgid "Connection"
 msgstr "Konekto"
 
@@ -7259,7 +7306,8 @@ msgid "_Manage..."
 msgstr "Administri..."
 
 #: gajim/data/gui/preferences_window.ui:2616
-msgid "_Log status changes of contacts"
+#, fuzzy
+msgid "_Store status changes of contacts in history"
 msgstr "_Protokoli statŝanĝojn de kontaktoj"
 
 #: gajim/data/gui/preferences_window.ui:2633
@@ -7284,10 +7332,15 @@ msgstr ""
 msgid "_Open..."
 msgstr "_Malfermi..."
 
+#: gajim/data/gui/preferences_window.ui:2723 gajim/gtk/advanced_config.py:84
+#, fuzzy
+msgid "Advanced Configuration Editor (ACE)"
+msgstr "Detala agorda administrilo"
+
 #: gajim/data/gui/groupchat_config.ui:55
 #, fuzzy
 msgid ""
-"<b>Jabber-ID</b>\n"
+"<b>XMPP Address</b>\n"
 "&lt;user@domain/resource&gt; (only that resource matches)\n"
 "&lt;user@domain&gt; (any resource matches)\n"
 "&lt;domain/resource&gt; (only that resource matches)\n"
@@ -7306,7 +7359,8 @@ msgstr ""
 msgid "Only Admins and Owners can modify the affiliation"
 msgstr ""
 
-#: gajim/data/gui/groupchat_config.ui:270 gajim/plugins/gui.py:312
+#: gajim/data/gui/groupchat_config.ui:270
+#: gajim/data/gui/groupchat_info_scrolled.ui:210 gajim/plugins/gui.py:324
 #, fuzzy
 msgid "Configuration"
 msgstr "Agordo de babilejo"
@@ -7339,7 +7393,7 @@ msgid "Start _Chat"
 msgstr "Ekparoli"
 
 #: gajim/data/gui/contact_context_menu.ui:20
-#: gajim/data/gui/systray_context_menu.ui:36
+#: gajim/data/gui/systray_context_menu.ui:29
 msgid "Send Single _Message..."
 msgstr "Sendi unuopan _mesaĝon..."
 
@@ -7408,17 +7462,43 @@ msgstr ""
 
 #: gajim/data/gui/contact_context_menu.ui:174
 #, fuzzy
-msgid "_Add to Roster..."
-msgstr "_Aldoni al kontaktlisto"
+msgid "_Add to Contact List..."
+msgstr "_Aldoni kontakton..."
+
+#: gajim/data/gui/advanced_configuration.ui:39
+#, fuzzy
+msgid "You should restart Gajim for some changes to take effect"
+msgstr ""
+"<b>RIMARKU:</b> Vi devas relanĉi gajim por efektigi kelkajn parametrojn"
+
+#: gajim/data/gui/advanced_configuration.ui:71
+#, fuzzy
+msgid "_Filter"
+msgstr "_Filtrilo:"
+
+#: gajim/data/gui/advanced_configuration.ui:88
+msgid "Type to search for values..."
+msgstr ""
+
+#: gajim/data/gui/advanced_configuration.ui:180
+#, fuzzy
+msgid "_Reset Value"
+msgstr "_Reŝargi kolorojn per defaŭlto"
+
+#: gajim/data/gui/advanced_configuration.ui:185
+#, fuzzy
+msgid "Resets value to default"
+msgstr "_Reŝargi kolorojn per defaŭlto"
 
 #: gajim/data/gui/account_creation_wizard_window.ui:43
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim: Kontkreilo"
 
 #: gajim/data/gui/account_creation_wizard_window.ui:70
+#, fuzzy
 msgid ""
 "You need to have an account in order to connect\n"
-"to the Jabber network."
+"to the XMPP network."
 msgstr ""
 "Vi bezonas havi konton por ke konekti\n"
 "al la jaber-reto."
@@ -7442,8 +7522,9 @@ msgid "<b>Please fill in the data for your existing account</b>"
 msgstr "<b>Bonvolu plenigi datumon por via nova konto</b>"
 
 #: gajim/data/gui/account_creation_wizard_window.ui:187
-msgid "_Jabber ID:"
-msgstr "_Jabber-ID:"
+#, fuzzy
+msgid "_XMPP Address:"
+msgstr "AIM-adreso:"
 
 #: gajim/data/gui/account_creation_wizard_window.ui:239
 #: gajim/data/gui/account_creation_wizard_window.ui:394
@@ -7532,6 +7613,7 @@ msgid "Privacy Lists:"
 msgstr "Privataj listoj:"
 
 #: gajim/data/gui/service_discovery_window.ui:111
+#: gajim/data/gui/groupchat_creation.ui:227
 #, fuzzy
 msgid "_Address"
 msgstr "_Adreso:"
@@ -7550,11 +7632,6 @@ msgstr ""
 msgid "Select the contacts you want to synchronise"
 msgstr "JID de kontakto, kun kiu vi volas interparoli"
 
-#: gajim/data/gui/groupchat_invitation_received.ui:42
-#, fuzzy
-msgid "Group Chat Invitation"
-msgstr "Babileja invitilo"
-
 #: gajim/data/gui/groupchat_invitation_received.ui:111
 #, fuzzy
 msgid "Message..."
@@ -7606,11 +7683,10 @@ msgstr ""
 
 #: gajim/data/gui/add_new_contact_window.ui:84
 #, fuzzy
-msgid "_Jabber ID"
-msgstr "_Jabber-ID:"
+msgid "_XMPP Address"
+msgstr "_Adreso:"
 
 #: gajim/data/gui/add_new_contact_window.ui:100
-#: gajim/data/gui/manage_bookmarks_window.ui:192
 #, fuzzy
 msgid "_Nickname"
 msgstr "Kaŝ_nomo:"
@@ -7690,7 +7766,7 @@ msgstr "<b>Sonoj</b>"
 msgid "<b>Message:</b>"
 msgstr "<b>Antaŭpreparitaj statmesaĝoj</b>"
 
-#: gajim/data/gui/plugins_window.ui:10 gajim/data/gui/application_menu.ui:90
+#: gajim/data/gui/plugins_window.ui:10 gajim/data/gui/application_menu.ui:87
 msgid "Plugins"
 msgstr ""
 
@@ -7799,10 +7875,6 @@ msgstr "Permesi"
 msgid "Deny"
 msgstr "Rifuzi"
 
-#: gajim/data/gui/privacy_list_window.ui:317
-msgid "JabberID"
-msgstr "Jabber-ID"
-
 #: gajim/data/gui/privacy_list_window.ui:358
 msgid "all in the group"
 msgstr "ĉiuj en la grupo"
@@ -7845,7 +7917,7 @@ msgstr "Ordnumero:"
 msgid "Manage sounds"
 msgstr "Administri kontojn"
 
-#: gajim/data/gui/manage_sounds_window.ui:55 gajim/plugins/gui.py:100
+#: gajim/data/gui/manage_sounds_window.ui:55 gajim/plugins/gui.py:101
 msgid "Active"
 msgstr "Aktiva"
 
@@ -7884,23 +7956,116 @@ msgstr "Forigi konton el Gajim kaj el _servilo"
 msgid "_Personal Events"
 msgstr "Persona detalaĵoj"
 
-#: gajim/data/gui/account_context_menu.ui:35
-#: gajim/data/gui/systray_context_menu.ui:28
-msgid "Join _Group Chat"
-msgstr "Eniri en babilejon"
-
-#: gajim/data/gui/account_context_menu.ui:49
+#: gajim/data/gui/account_context_menu.ui:41
 msgid "_Add Contact..."
 msgstr "_Aldoni kontakton..."
 
-#: gajim/data/gui/account_context_menu.ui:57
+#: gajim/data/gui/account_context_menu.ui:49
 msgid "_Discover Services"
 msgstr "_Serĉi servojn"
 
-#: gajim/data/gui/account_context_menu.ui:65
+#: gajim/data/gui/account_context_menu.ui:57
 msgid "_Execute Command..."
 msgstr "_Plenumi komandon..."
 
+#: gajim/data/gui/account_context_menu.ui:65
+#, fuzzy
+msgid "_View Certificate"
+msgstr "Malkorekta salutnomo"
+
+#: gajim/data/gui/manage_proxies.ui:12
+#, fuzzy
+msgctxt "proxy configuration"
+msgid "HTTP Connect"
+msgstr ""
+"HTTP Connect\n"
+"SOCKS5"
+
+#: gajim/data/gui/manage_proxies.ui:15
+msgctxt "proxy configuration"
+msgid "SOCKS5"
+msgstr ""
+
+#: gajim/data/gui/manage_proxies.ui:18
+#, fuzzy
+msgctxt "proxy configuration"
+msgid "BOSH"
+msgstr "_URL:"
+
+#: gajim/data/gui/manage_proxies.ui:68
+#, fuzzy
+msgid "Add Proxy"
+msgstr "Prokura servilo:"
+
+#: gajim/data/gui/manage_proxies.ui:82
+#, fuzzy
+msgid "Remove Proxy"
+msgstr "Forigi grupon"
+
+#: gajim/data/gui/manage_proxies.ui:134
+#, fuzzy
+msgid "Pass_word"
+msgstr "Pas_vorto:"
+
+#: gajim/data/gui/manage_proxies.ui:159
+#, fuzzy
+msgid "Use proxy auth_entication"
+msgstr "Uzi aŭtentokontrolon"
+
+#: gajim/data/gui/manage_proxies.ui:179
+#, fuzzy
+msgid "_Username"
+msgstr "_Salutnomo:"
+
+#: gajim/data/gui/manage_proxies.ui:209
+#, fuzzy
+msgid "_Port"
+msgstr "_Pordo:"
+
+#: gajim/data/gui/manage_proxies.ui:226
+msgid "example.org"
+msgstr ""
+
+#: gajim/data/gui/manage_proxies.ui:240
+#, fuzzy
+msgid "_Host"
+msgstr "_Retnodo:"
+
+#: gajim/data/gui/manage_proxies.ui:254
+#, fuzzy
+msgid "Use HTTP prox_y"
+msgstr "_Uzi prokuran servilon"
+
+#: gajim/data/gui/manage_proxies.ui:275
+msgid "https://example.org/http-bind/"
+msgstr ""
+
+#: gajim/data/gui/manage_proxies.ui:291
+#, fuzzy
+msgid "_BOSH URL"
+msgstr "_URL:"
+
+#: gajim/data/gui/manage_proxies.ui:309 gajim/gtk/adhoc.py:322
+#, fuzzy
+msgid "Settings"
+msgstr "Konektado malsukcesis"
+
+#: gajim/data/gui/manage_proxies.ui:344
+#, fuzzy
+msgid "_Type"
+msgstr "Tipo:"
+
+#: gajim/data/gui/manage_proxies.ui:361
+#: gajim/data/gui/groupchat_creation.ui:105
+#, fuzzy
+msgid "_Name"
+msgstr "_Nomo:"
+
+#: gajim/data/gui/manage_proxies.ui:391 gajim/gtk/accounts.py:742
+#, fuzzy
+msgid "Proxy"
+msgstr "Prokura servilo:"
+
 #: gajim/data/gui/application_menu.ui:8
 #, fuzzy
 msgid "View"
@@ -7908,8 +8073,8 @@ msgstr "_Vido"
 
 #: gajim/data/gui/application_menu.ui:11
 #, fuzzy
-msgid "Show Roster"
-msgstr "Montri _kontaktliston"
+msgid "Show Contact List"
+msgstr "Montri _senkonektajn kontaktojn"
 
 #: gajim/data/gui/application_menu.ui:16
 #, fuzzy
@@ -7951,23 +8116,24 @@ msgstr ""
 msgid "Features"
 msgstr "Servilaj trajtoj"
 
-#: gajim/data/gui/application_menu.ui:81
+#: gajim/data/gui/application_menu.ui:77
+#: gajim/data/gui/groupchat_creation.ui:81 gajim/gtk/groupchat_creation.py:45
 #, fuzzy
-msgid "Bookmarks"
-msgstr "Starigi legosignon por tiu babilejo"
+msgid "Create Group Chat"
+msgstr "Nova babilejo"
 
-#: gajim/data/gui/application_menu.ui:94 gajim/data/gui/shortcuts_window.ui:189
-#: gajim/gtk/preferences.py:59
+#: gajim/data/gui/application_menu.ui:91 gajim/data/gui/shortcuts_window.ui:189
+#: gajim/gtk/preferences.py:58
 msgid "Preferences"
 msgstr "Agordo"
 
-#: gajim/data/gui/application_menu.ui:99
+#: gajim/data/gui/application_menu.ui:96
 #, fuzzy
 msgid "Quit"
 msgstr "_Eliri"
 
 #: gajim/data/gui/httpupload_progress_dialog.ui:110
-#: gajim/gtk/filetransfer.py:121
+#: gajim/gtk/filetransfer.py:120
 msgid "Progress"
 msgstr "Progreso"
 
@@ -7984,52 +8150,33 @@ msgstr ""
 msgid "_Cancel Upload"
 msgstr "_Nuligi"
 
-#: gajim/data/gui/manage_bookmarks_window.ui:13
-#, fuzzy
-msgid "Group Chat Bookmarks"
-msgstr "Babilejo"
-
-#: gajim/data/gui/manage_bookmarks_window.ui:68
-#, fuzzy
-msgid "Add Bookmark"
-msgstr "Starigi legosignon por tiu babilejo"
-
-#: gajim/data/gui/manage_bookmarks_window.ui:82
-#, fuzzy
-msgid "Remove Bookmark"
-msgstr "Starigi legosignon por tiu babilejo"
+#: gajim/data/gui/groupchat_creation.ui:27
+msgid "Public or Private?"
+msgstr ""
 
-#: gajim/data/gui/manage_bookmarks_window.ui:126
-msgid "N_ame"
+#: 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 ""
 
-#: gajim/data/gui/manage_bookmarks_window.ui:145
-#, fuzzy
-msgid "Bookmark Name"
-msgstr "Starigi legosignon por tiu babilejo"
+#: gajim/data/gui/groupchat_creation.ui:58
+msgid "<b>Public:</b> Anyone who knows the address can join."
+msgstr ""
 
-#: gajim/data/gui/manage_bookmarks_window.ui:160
+#: gajim/data/gui/groupchat_creation.ui:122
 #, fuzzy
-msgid "_Server"
-msgstr "_Servilo:"
+msgid "_Description"
+msgstr "Priskribo"
 
-#: gajim/data/gui/manage_bookmarks_window.ui:223
-msgid "Roo_m"
+#: gajim/data/gui/groupchat_creation.ui:164
+msgid "_Public"
 msgstr ""
 
-#: gajim/data/gui/manage_bookmarks_window.ui:253
+#: gajim/data/gui/groupchat_creation.ui:278
 #, fuzzy
-msgid "_Password"
-msgstr "_Pasvorto:"
-
-#: gajim/data/gui/manage_bookmarks_window.ui:299
-#, fuzzy
-msgid "Join chat when connected"
-msgstr "Kontakto malkonektita"
-
-#: gajim/data/gui/manage_bookmarks_window.ui:307
-msgid "_Join Automatically"
-msgstr ""
+msgid "_Account"
+msgstr "Kontoj"
 
 #: gajim/data/gui/exception_dialog.ui:49
 msgid "Sorry, that should not have happened"
@@ -8073,6 +8220,28 @@ msgstr "Permesi al kontakto koni kiam vi konektas"
 msgid "Presets"
 msgstr "_Ĉeesto"
 
+#: gajim/data/gui/groupchat_info_scrolled.ui:32
+msgid "Address"
+msgstr "Adreso"
+
+#: gajim/data/gui/groupchat_info_scrolled.ui:64
+msgid "Topic"
+msgstr ""
+
+#: gajim/data/gui/groupchat_info_scrolled.ui:80
+#, fuzzy
+msgid "Author"
+msgstr "_Permesi"
+
+#: gajim/data/gui/groupchat_info_scrolled.ui:182
+msgid "Discussion Logs"
+msgstr ""
+
+#: gajim/data/gui/groupchat_info_scrolled.ui:260
+#, fuzzy
+msgid "Group Chat Language"
+msgstr "Babileja invitilo"
+
 #: gajim/data/gui/emoji_chooser.ui:98
 msgid "No Results Found"
 msgstr ""
@@ -8084,24 +8253,34 @@ msgstr ""
 #: gajim/data/gui/chat_to_muc_window.ui:39
 #, fuzzy
 msgid ""
-"You are now entering a groupchat.\n"
+"You are now entering a group chat.\n"
 "Select the contacts you want to invite"
 msgstr "JID de kontakto, kun kiu vi volas interparoli"
 
 #: gajim/data/gui/chat_to_muc_window.ui:112
-msgid "Please select a MUC server."
-msgstr ""
+#, fuzzy
+msgid "Please select a group chat server."
+msgstr "Tio ne estas babilejo"
 
 #: gajim/data/gui/chat_to_muc_window.ui:141
 #, fuzzy
-msgid "MUC server"
-msgstr "Rigardiloj"
+msgid "Group chat server"
+msgstr "Babilejoj"
 
 #: gajim/data/gui/chat_to_muc_window.ui:176
 #, fuzzy
 msgid "In_vite"
 msgstr "In_viti al"
 
+#: gajim/data/gui/bookmarks.ui:176
+#, fuzzy
+msgid "Autojoin"
+msgstr "Aŭtomate aliĝi"
+
+#: gajim/data/gui/bookmarks.ui:211
+msgid "_Apply"
+msgstr ""
+
 #: gajim/data/gui/history_manager.ui:11
 #, fuzzy
 msgid "_Export"
@@ -8118,11 +8297,11 @@ msgstr "Gajim administrilo de protokoloj"
 
 #: gajim/data/gui/history_manager.ui:108
 msgid ""
-"This log manager is not intended for log viewing. If you are looking for "
-"such functionality, use the history window instead.\n"
+"This history manager is not intended for viewing chat history. If you are "
+"looking for such functionality, please use the history window instead.\n"
 "\n"
-"Use this program to delete or export logs. You can select logs from the left "
-"and/or search database from below."
+"You can use this program to delete or export history. Either select logs "
+"from the left or search the database."
 msgstr ""
 
 #: gajim/data/gui/history_manager.ui:124
@@ -8175,8 +8354,9 @@ msgid "Select an emoji"
 msgstr ""
 
 #: gajim/data/gui/shortcuts_window.ui:38
-msgid "Complete a command or a nick"
-msgstr ""
+#, fuzzy
+msgid "Complete a command or a nickname"
+msgstr "Nova mesaĝo"
 
 #: gajim/data/gui/shortcuts_window.ui:45
 #, fuzzy
@@ -8216,7 +8396,7 @@ msgstr ""
 msgid "Scroll down"
 msgstr ""
 
-#: gajim/data/gui/shortcuts_window.ui:100 gajim/gtk/xml_console.py:72
+#: gajim/data/gui/shortcuts_window.ui:100 gajim/gtk/xml_console.py:69
 #, fuzzy
 msgid "Clear"
 msgstr "Vespero"
@@ -8258,8 +8438,9 @@ msgid "Close chat"
 msgstr ""
 
 #: gajim/data/gui/shortcuts_window.ui:173
-msgid "Roster Shortcuts"
-msgstr ""
+#, fuzzy
+msgid "Contact List Shortcuts"
+msgstr "Kontakto malkonektita"
 
 #: gajim/data/gui/shortcuts_window.ui:196
 #, fuzzy
@@ -8292,7 +8473,7 @@ msgid "Show only active contacts"
 msgstr "Montri _senkonektajn kontaktojn"
 
 #: gajim/data/gui/shortcuts_window.ui:251
-msgid "Enable roster filtering"
+msgid "Enable contact list filtering"
 msgstr ""
 
 #: gajim/data/gui/shortcuts_window.ui:259
@@ -8338,12 +8519,12 @@ msgid "Search selected day only"
 msgstr ""
 
 #: gajim/data/gui/history_window.ui:317
-msgid "Record history for this chat"
+msgid "Store history for this chat"
 msgstr ""
 
 #: gajim/data/gui/history_window.ui:332
 #, fuzzy
-msgid "Record History"
+msgid "Store History"
 msgstr "Antaŭ nelonge:"
 
 #: gajim/data/gui/history_window.ui:350
@@ -8365,9 +8546,10 @@ msgstr "Nova mesaĝo"
 msgid "Fill in the form."
 msgstr "Plenigu la formon."
 
-#: gajim/data/gui/data_form_window.ui:229
-msgid "Room Configuration"
-msgstr "Agordo de babilejo"
+#: gajim/data/gui/data_form_window.ui:229 gajim/gtk/groupchat_config.py:41
+#, fuzzy
+msgid "Group Chat Configuration"
+msgstr "Babileja invitilo"
 
 #: gajim/data/gui/roster_item_exchange_window.ui:39
 #: gajim/gtk/roster_item_exchange.py:35
@@ -8389,15 +8571,15 @@ msgstr "Sta_to"
 msgid "_Start Chat..."
 msgstr "_Ekparoli"
 
-#: gajim/data/gui/systray_context_menu.ui:50
+#: gajim/data/gui/systray_context_menu.ui:43
 msgid "Show All Pending _Events"
 msgstr "Montri ĉiujn nelegitajn _eventojn"
 
-#: gajim/data/gui/systray_context_menu.ui:59
+#: gajim/data/gui/systray_context_menu.ui:52
 msgid "Mute Sounds"
 msgstr "Silentigi sonojn"
 
-#: gajim/data/gui/systray_context_menu.ui:75
+#: gajim/data/gui/systray_context_menu.ui:68
 #, fuzzy
 msgid "_Preferences"
 msgstr "Agordo"
@@ -8490,34 +8672,34 @@ msgstr ""
 msgid "Execute expression inside a shell, send output"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:45
+#: gajim/command_system/implementation/standard.py:47
 msgid ""
 "Show help on a given command or a list of available commands if -a is given"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:73
+#: gajim/command_system/implementation/standard.py:75
 #, fuzzy
 msgid "Send a message to the contact"
 msgstr "Uzado: /%s, - kaŝas la babiladajn butonojn."
 
-#: gajim/command_system/implementation/standard.py:78
+#: gajim/command_system/implementation/standard.py:80
 msgid "Send action (in the third person) to the current chat"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:83
+#: gajim/command_system/implementation/standard.py:85
 msgid "Show logged messages which mention given text"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:88
+#: gajim/command_system/implementation/standard.py:90
 #, fuzzy, python-format
 msgid "%s: Nothing found"
 msgstr "%s ne trovitas"
 
-#: gajim/command_system/implementation/standard.py:94
+#: gajim/command_system/implementation/standard.py:96
 msgid "Limit must be an integer"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:118
+#: gajim/command_system/implementation/standard.py:120
 msgid ""
 "\n"
 "    Set the current status\n"
@@ -8527,133 +8709,133 @@ msgid ""
 "    "
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:136
+#: gajim/command_system/implementation/standard.py:138
 msgid "Set the current status to away"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:150
+#: gajim/command_system/implementation/standard.py:152
 msgid "Set the current status to online"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:153
+#: gajim/command_system/implementation/standard.py:155
 #, fuzzy
 msgid "Available"
 msgstr "_Enrete"
 
-#: gajim/command_system/implementation/standard.py:173
-#: gajim/command_system/implementation/standard.py:250
+#: gajim/command_system/implementation/standard.py:175
+#: gajim/command_system/implementation/standard.py:252
 #, fuzzy
 msgid "Clear the text window"
 msgstr "Uzado: /%s, - malplenigas la tekstan fenestron."
 
-#: gajim/command_system/implementation/standard.py:178
-#: gajim/command_system/implementation/standard.py:397
+#: gajim/command_system/implementation/standard.py:180
+#: gajim/command_system/implementation/standard.py:401
 #, fuzzy
 msgid "Send a ping to the contact"
 msgstr "Sendi dosieron al kontakto"
 
-#: gajim/command_system/implementation/standard.py:181
-#: gajim/command_system/implementation/standard.py:400
+#: gajim/command_system/implementation/standard.py:183
+#: gajim/command_system/implementation/standard.py:404
 msgid "Command is not supported for zeroconf accounts"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:185
-msgid "Send DTMF sequence through an open audio session"
+#: gajim/command_system/implementation/standard.py:187
+msgid "Send DTMF sequence through an open voice chat"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:188
+#: gajim/command_system/implementation/standard.py:190
 #, fuzzy
-msgid "No open audio sessions with the contact"
+msgid "No open voice chats with the contact"
 msgstr "Klaku por vidi pasintajn interparolojn kun tiu ĉi kontakto"
 
-#: gajim/command_system/implementation/standard.py:191
+#: gajim/command_system/implementation/standard.py:193
 #, fuzzy, python-format
 msgid "%s is not a valid tone"
 msgstr "%s ne estas valida protokola detalnivelo"
 
-#: gajim/command_system/implementation/standard.py:198
-msgid "Toggle audio session"
+#: gajim/command_system/implementation/standard.py:200
+msgid "Toggle Voice Chat"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:201
+#: gajim/command_system/implementation/standard.py:203
 #, fuzzy
-msgid "Audio sessions are not available"
+msgid "Voice chats are not available"
 msgstr "Konekto mankas"
 
-#: gajim/command_system/implementation/standard.py:208
-msgid "Toggle video session"
+#: gajim/command_system/implementation/standard.py:210
+msgid "Toggle Video Chat"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:211
+#: gajim/command_system/implementation/standard.py:213
 #, fuzzy
-msgid "Video sessions are not available"
+msgid "Video chats are not available"
 msgstr "Konekto mankas"
 
-#: gajim/command_system/implementation/standard.py:218
+#: gajim/command_system/implementation/standard.py:220
 #, fuzzy
 msgid "Send a message to the contact that will attract their attention"
 msgstr "Uzado: /%s, - kaŝas la babiladajn butonojn."
 
-#: gajim/command_system/implementation/standard.py:255
+#: gajim/command_system/implementation/standard.py:257
 #, fuzzy
 msgid "Change your nickname in a group chat"
 msgstr "Ŝanĝi kaŝ_nomon"
 
-#: gajim/command_system/implementation/standard.py:260 gajim/gtk/dialogs.py:674
-#: gajim/gtk/bookmarks.py:272
+#: gajim/command_system/implementation/standard.py:262
 #, fuzzy
 msgid "Invalid nickname"
 msgstr "Malkorekta salutnomo"
 
-#: gajim/command_system/implementation/standard.py:267
+#: gajim/command_system/implementation/standard.py:269
 #, fuzzy
-msgid "Open a private chat window with a specified occupant"
+msgid "Open a private chat window with a specified participant"
 msgstr ""
 "Uzado: /%s <kaŝnomo>, - malfermas privatan interparolan fenestron por "
 "specifita persono."
 
-#: gajim/command_system/implementation/standard.py:273
-#: gajim/command_system/implementation/standard.py:282
-#: gajim/command_system/implementation/standard.py:332
-#: gajim/command_system/implementation/standard.py:345
-#: gajim/command_system/implementation/standard.py:357
+#: gajim/command_system/implementation/standard.py:275
+#: gajim/command_system/implementation/standard.py:284
+#: gajim/command_system/implementation/standard.py:336
+#: gajim/command_system/implementation/standard.py:349
+#: gajim/command_system/implementation/standard.py:361
 #, fuzzy
 msgid "Nickname not found"
 msgstr "Kaŝnomo ne trovitas: %s"
 
-#: gajim/command_system/implementation/standard.py:276
+#: gajim/command_system/implementation/standard.py:278
 #, fuzzy
 msgid ""
-"Open a private chat window with a specified occupant and send him a message"
+"Open a private chat window with a specified participant and send him a "
+"message"
 msgstr ""
 "Uzado: /%s <kaŝnomo>, - malfermas privatan interparolan fenestron por "
 "specifita persono."
 
-#: gajim/command_system/implementation/standard.py:285
+#: gajim/command_system/implementation/standard.py:287
 #, fuzzy
 msgid "Display or change a group chat topic"
 msgstr "Demandi antaŭ fermi babilejan fenestron/slipon."
 
-#: gajim/command_system/implementation/standard.py:294
-msgid "Invite a user to a room for a reason"
+#: gajim/command_system/implementation/standard.py:296
+msgid "Invite a user to a group chat for a reason"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:297
+#: gajim/command_system/implementation/standard.py:299
 #, fuzzy, python-format
 msgid "Invited %(jid)s to %(room_jid)s"
 msgstr "%(contact_jid)s invititas al %(room_jid)s."
 
-#: gajim/command_system/implementation/standard.py:301
+#: gajim/command_system/implementation/standard.py:303
 #, fuzzy
-msgid "Join a group chat given by a JID"
+msgid "Join a group chat given by an XMPP Address"
 msgstr "Eniri en babilejon"
 
-#: gajim/command_system/implementation/standard.py:309
+#: gajim/command_system/implementation/standard.py:313
 msgid ""
-"Leave the groupchat, optionally giving a reason, and close tab or window"
+"Leave the group chat, optionally giving a reason, and close tab or window"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:314
+#: gajim/command_system/implementation/standard.py:318
 msgid ""
 "\n"
 "    Ban user by a nick or a JID from a groupchat\n"
@@ -8662,46 +8844,46 @@ msgid ""
 "    "
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:329
+#: gajim/command_system/implementation/standard.py:333
 #, fuzzy
-msgid "Kick user by a nick from a groupchat"
+msgid "Kick user by a nick from a group chat"
 msgstr "Al vi oni malpermesis esti en la babilejo."
 
-#: gajim/command_system/implementation/standard.py:338
+#: gajim/command_system/implementation/standard.py:342
 msgid ""
-"Set occupant role in group chat.\n"
+"Set participant role in group chat.\n"
 "    Role can be given as one of the following values:\n"
 "    moderator, participant, visitor, none"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:343
+#: gajim/command_system/implementation/standard.py:347
 #, fuzzy
 msgid "Invalid role given"
 msgstr "Malkorekta salutnomo"
 
-#: gajim/command_system/implementation/standard.py:350
+#: gajim/command_system/implementation/standard.py:354
 msgid ""
-"Set occupant affiliation in group chat.\n"
+"Set participant affiliation in group chat.\n"
 "    Affiliation can be given as one of the following values:\n"
 "    owner, admin, member, outcast, none"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:355
+#: gajim/command_system/implementation/standard.py:359
 #, fuzzy
 msgid "Invalid affiliation given"
 msgstr "Aparteneco:"
 
-#: gajim/command_system/implementation/standard.py:365
+#: gajim/command_system/implementation/standard.py:369
 #, fuzzy
-msgid "Display names of all group chat occupants"
+msgid "Display names of all group chat participants"
 msgstr "Uzado: /%s , - eligas la nomoj de babilejaj ĉeestantoj."
 
-#: gajim/command_system/implementation/standard.py:387
-msgid "Forbid an occupant to send you public or private messages"
+#: gajim/command_system/implementation/standard.py:391
+msgid "Forbid a participant to send you public or private messages"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:392
-msgid "Allow an occupant to send you public or private messages"
+#: gajim/command_system/implementation/standard.py:396
+msgid "Allow a participant to send you public or private messages"
 msgstr ""
 
 #: gajim/command_system/implementation/middleware.py:74
@@ -8712,204 +8894,329 @@ msgstr ""
 msgid "The same as using a doc-string, except it supports translation"
 msgstr ""
 
-#: gajim/gtk/filetransfer.py:91
+#: gajim/gtk/groupchat_info.py:36
+#, fuzzy
+msgid "?Group chat feature:Archiving"
+msgstr "Babileja invitilo"
+
+#: gajim/gtk/groupchat_info.py:37
+#, fuzzy
+msgid "Messages are archived on the server"
+msgstr "Vi nekonektitas al la servilo"
+
+#: gajim/gtk/groupchat_info.py:40
+#, fuzzy
+msgid "?Group chat feature:Persistent"
+msgstr "Babilejoj"
+
+#: gajim/gtk/groupchat_info.py:41
+msgid "This group chat persists even if there are no participants"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:45
+#, fuzzy
+msgid "?Group chat feature:Temporary"
+msgstr "Neniu"
+
+#: gajim/gtk/groupchat_info.py:46
+msgid "This group chat will be destroyed once the last participant left"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:50
+#, fuzzy
+msgid "?Group chat feature:Moderated"
+msgstr "Neniu"
+
+#: gajim/gtk/groupchat_info.py:51
+msgid ""
+"Participants entering this group chat need to request permission to send "
+"messages"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:55
+#, fuzzy
+msgid "?Group chat feature:Not Moderated"
+msgstr "Babilejoj"
+
+#: gajim/gtk/groupchat_info.py:56
+msgid "Participants entering this group chat are allowed to send messages"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:60
+#, fuzzy
+msgid "?Group chat feature:Open"
+msgstr "Neniu"
+
+#: gajim/gtk/groupchat_info.py:61
+#, fuzzy
+msgid "Anyone can join this group chat"
+msgstr "%s aliĝis al la babilejo"
+
+#: gajim/gtk/groupchat_info.py:64
+#, fuzzy
+msgid "?Group chat feature:Members Only"
+msgstr "Emfazado de mesaĝoj en babilejo"
+
+#: gajim/gtk/groupchat_info.py:65
+msgid "This group chat is restricted to members only"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:69
+#, fuzzy
+msgid "?Group chat feature:Public"
+msgstr "Emfazado de mesaĝoj en babilejo"
+
+#: gajim/gtk/groupchat_info.py:70
+msgid "Group chat can be found via search"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:73
+#, fuzzy
+msgid "?Group chat feature:Hidden"
+msgstr "Neniu"
+
+#: gajim/gtk/groupchat_info.py:74
+#, fuzzy
+msgid "This group chat can not be found via search"
+msgstr "Tiu ĉi babilejo ne havas temon"
+
+#: gajim/gtk/groupchat_info.py:77
+#, fuzzy
+msgid "?Group chat feature:Not Anonymous"
+msgstr "Babilejoj"
+
+#: gajim/gtk/groupchat_info.py:78
+msgid "All other group chat participants can see your XMPP address"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:82
+#, fuzzy
+msgid "?Group chat feature:Semi-Anonymous"
+msgstr "Emfazado de mesaĝoj en babilejo"
+
+#: gajim/gtk/groupchat_info.py:83
+msgid "Only moderators can see your XMPP address"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:86
+#, fuzzy
+msgid "?Group chat feature:Password Required"
+msgstr "Babilejoj"
+
+#: gajim/gtk/groupchat_info.py:87
+msgid "This group chat does require a password upon entry"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:91
+#, fuzzy
+msgid "?Group chat feature:No Password Required"
+msgstr "Babilejoj"
+
+#: gajim/gtk/groupchat_info.py:92
+msgid "This group chat does not require a password upon entry"
+msgstr ""
+
+#: gajim/gtk/filetransfer.py:90
 msgid "File"
 msgstr "Dosiero"
 
-#: gajim/gtk/filetransfer.py:108
+#: gajim/gtk/filetransfer.py:107
 msgid "Time"
 msgstr "Tempo"
 
-#: gajim/gtk/filetransfer.py:228
+#: gajim/gtk/filetransfer.py:227
 #, fuzzy, python-format
 msgid "File name: %s"
 msgstr "Dosiernomo: %s"
 
-#: gajim/gtk/filetransfer.py:229 gajim/gtk/filetransfer.py:464
+#: gajim/gtk/filetransfer.py:228 gajim/gtk/filetransfer.py:469
 #, python-format
 msgid "Size: %s"
 msgstr "Longo: %s"
 
-#: gajim/gtk/filetransfer.py:239
+#: gajim/gtk/filetransfer.py:238
 #, python-format
 msgid "Sender: %s"
 msgstr "Sendanto: %s"
 
-#: gajim/gtk/filetransfer.py:240 gajim/gtk/filetransfer.py:744
+#: gajim/gtk/filetransfer.py:239 gajim/gtk/filetransfer.py:749
 #: gajim/gtk/tooltips.py:577
 msgid "Recipient: "
 msgstr "Ricevanto: "
 
-#: gajim/gtk/filetransfer.py:251
+#: gajim/gtk/filetransfer.py:250
 #, python-format
 msgid "Saved in: %s"
 msgstr "Konservita kiel: %s"
 
-#: gajim/gtk/filetransfer.py:256
+#: gajim/gtk/filetransfer.py:255
 msgid "File transfer completed"
 msgstr "Dosiertransmeto plenumitas"
 
-#: gajim/gtk/filetransfer.py:276 gajim/gtk/filetransfer.py:285
+#: gajim/gtk/filetransfer.py:275 gajim/gtk/filetransfer.py:284
 #, fuzzy
 msgid "Connection with peer could not be established."
 msgstr "Konekto kun punkto neestableblas."
 
-#: gajim/gtk/filetransfer.py:293
+#: gajim/gtk/filetransfer.py:292
 #, python-format
 msgid "Filename: %s"
 msgstr "Dosiernomo: %s"
 
-#: gajim/gtk/filetransfer.py:294
+#: gajim/gtk/filetransfer.py:293
 #, python-format
 msgid "Recipient: %s"
 msgstr "Ricevanto: %s"
 
-#: gajim/gtk/filetransfer.py:296
+#: gajim/gtk/filetransfer.py:295
 #, python-format
 msgid "Error message: %s"
 msgstr "Erara mesaĝo: %s"
 
-#: gajim/gtk/filetransfer.py:333
-#, fuzzy
-msgid "File transfer error"
-msgstr "Dosiertransmeta eraro"
-
 #: gajim/gtk/filetransfer.py:334
 #, python-format
 msgid ""
-"The file %(file)s has been received, but it seems to have been damaged along "
-"the way.\n"
+"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 ""
 
-#: gajim/gtk/filetransfer.py:350
+#: gajim/gtk/filetransfer.py:340
+#, fuzzy
+msgid "_Download Again"
+msgstr "_Ne plu demandi"
+
+#: gajim/gtk/filetransfer.py:355
 #, fuzzy
 msgid "Gajim can not read this file"
 msgstr "Gajim ne povas atingi tiun dosieron"
 
-#: gajim/gtk/filetransfer.py:351
+#: gajim/gtk/filetransfer.py:356
 msgid "Another process is using this file."
 msgstr ""
 
-#: gajim/gtk/filetransfer.py:418
+#: gajim/gtk/filetransfer.py:423
 #, fuzzy
 msgid "File Transfer Conflict"
 msgstr "Dosiera transmeto plenumis"
 
-#: gajim/gtk/filetransfer.py:419
+#: gajim/gtk/filetransfer.py:424
 msgid "This file already exists"
 msgstr "Tiu dosiero jam ekzistas"
 
-#: gajim/gtk/filetransfer.py:420
+#: gajim/gtk/filetransfer.py:425
 msgid "Resume download or replace file?"
 msgstr ""
 
-#: gajim/gtk/filetransfer.py:424
+#: gajim/gtk/filetransfer.py:429
 #, fuzzy
 msgid "Replace _File"
 msgstr "Vespero"
 
-#: gajim/gtk/filetransfer.py:427
+#: gajim/gtk/filetransfer.py:432
 #, fuzzy
 msgid "Resume _Download"
 msgstr "Elŝuti"
 
-#: gajim/gtk/filetransfer.py:437
+#: gajim/gtk/filetransfer.py:442
 #, fuzzy, python-format
 msgid "Directory '%s' is not writable"
 msgstr "Dosierujo \"%s\" ne skribeblas"
 
-#: gajim/gtk/filetransfer.py:438
+#: gajim/gtk/filetransfer.py:443
 #, fuzzy
 msgid "You do not have permissions to create files in this directory."
 msgstr "Vi ne havas permeson krei dosierojn en ĉi tiu dosierujo."
 
-#: gajim/gtk/filetransfer.py:461
+#: gajim/gtk/filetransfer.py:466
 #, python-format
 msgid "File: %s"
 msgstr "Dosiero: %s"
 
-#: gajim/gtk/filetransfer.py:467
+#: gajim/gtk/filetransfer.py:472
 #, python-format
 msgid "Type: %s"
 msgstr "Tipo: %s"
 
-#: gajim/gtk/filetransfer.py:469
+#: gajim/gtk/filetransfer.py:474
 #, python-format
 msgid "Description: %s"
 msgstr "Priskribo: %s"
 
-#: gajim/gtk/filetransfer.py:480
+#: gajim/gtk/filetransfer.py:485
 #, fuzzy, python-format
 msgid "%s wants to send you a file"
 msgstr "%s volas sendi dosieron al vi."
 
-#: gajim/gtk/filetransfer.py:509
+#: gajim/gtk/filetransfer.py:514
 #, fuzzy
 msgid "Checking file…"
 msgstr "Publicas vizitkarton..."
 
-#: gajim/gtk/filetransfer.py:524
+#: gajim/gtk/filetransfer.py:529
 #, fuzzy
 msgid "File error"
 msgstr "Dosiertransmeta eraro"
 
-#: gajim/gtk/filetransfer.py:561
+#: gajim/gtk/filetransfer.py:566
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 
-#: gajim/gtk/filetransfer.py:658
+#: gajim/gtk/filetransfer.py:663
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/s)"
 
-#: gajim/gtk/filetransfer.py:711 gajim/gtk/filetransfer.py:715
+#: gajim/gtk/filetransfer.py:716 gajim/gtk/filetransfer.py:720
 msgid "Invalid File"
 msgstr "Malkorekta dosiero"
 
-#: gajim/gtk/filetransfer.py:711
+#: gajim/gtk/filetransfer.py:716
 msgid "File: "
 msgstr "Dosiero: "
 
-#: gajim/gtk/filetransfer.py:716
+#: gajim/gtk/filetransfer.py:721
 msgid "It is not possible to send empty files"
 msgstr "Neeblas sendi senenhavajn dosierojn"
 
-#: gajim/gtk/filetransfer.py:742 gajim/gtk/tooltips.py:571
+#: gajim/gtk/filetransfer.py:747 gajim/gtk/tooltips.py:571
 msgid "Sender: "
 msgstr "Sendanto: "
 
-#: gajim/gtk/filetransfer.py:1038
+#: gajim/gtk/filetransfer.py:1043
 #, fuzzy
 msgid "Choose a File to Send…"
 msgstr "Elektu dosieron por sendi..."
 
 #: gajim/gtk/start_chat.py:51
 #, fuzzy
-msgid "Start new Conversation"
+msgid "Start New Conversation"
 msgstr "Konekto"
 
-#: gajim/gtk/start_chat.py:424
-#, fuzzy
-msgid "New Groupchat"
-msgstr "Nova babilejo"
+#: gajim/gtk/start_chat.py:260 gajim/gtk/start_chat.py:328
+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:603 gajim/gtk/groupchat_join.py:38
+msgid "Join Group Chat"
+msgstr "Eniri babilejen"
 
-#: gajim/gtk/start_chat.py:426
+#: gajim/gtk/start_chat.py:605 gajim/gtk/add_contact.py:40
 #, fuzzy
-msgid "New Contact"
-msgstr "Aldoni novan kontakton"
+msgid "Add Contact"
+msgstr "_Aldoni kontakton..."
 
-#: gajim/gtk/start_chat.py:588
+#: gajim/gtk/start_chat.py:746
 #, fuzzy, python-format
-msgid "%s Group chats found"
+msgid "%s group chats found"
 msgstr "%s ne trovitas"
 
-#: gajim/gtk/discovery.py:70
+#: gajim/gtk/discovery.py:69
 msgid "This service has not yet responded with detailed information"
 msgstr "Tiu ĉi servo ankoraŭ ne respondis kun detala informo"
 
-#: gajim/gtk/discovery.py:71
+#: gajim/gtk/discovery.py:70
 #, fuzzy
 msgid ""
 "This service could not respond with detailed information.\n"
@@ -8918,32 +9225,33 @@ msgstr ""
 "Tiu ĉi servo ne povis respondi per detala informo.\n"
 "Ĝi verŝajne estas malnova aŭ rompita"
 
-#: gajim/gtk/discovery.py:128
+#: gajim/gtk/discovery.py:126
 msgid "Others"
 msgstr "Aliaj"
 
-#: gajim/gtk/discovery.py:131
-msgid "Conference"
-msgstr "Babilejoj"
+#: gajim/gtk/discovery.py:129
+#, fuzzy
+msgid "Group Chat"
+msgstr "_Babilejo"
 
-#: gajim/gtk/discovery.py:519
+#: gajim/gtk/discovery.py:518
 msgid "Without a connection, you can not browse available services"
 msgstr "Senkonekta vi ne povas rigardi disponeblajn servojn"
 
-#: gajim/gtk/discovery.py:606
+#: gajim/gtk/discovery.py:605
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Serĉado de servoj per konto %s"
 
-#: gajim/gtk/discovery.py:608
+#: gajim/gtk/discovery.py:607
 msgid "Service Discovery"
 msgstr "Serĉado de servoj"
 
-#: gajim/gtk/discovery.py:691
+#: gajim/gtk/discovery.py:690
 msgid "The service could not be found"
 msgstr "Neniu servo estas trovita"
 
-#: gajim/gtk/discovery.py:692
+#: gajim/gtk/discovery.py:691
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -8951,103 +9259,82 @@ msgstr ""
 "Servo mankas ĉe la adreso, kiun vi enigis, aŭ ĝi ne respondas. Kontrolu la "
 "adreson kaj provu denove."
 
-#: gajim/gtk/discovery.py:699 gajim/gtk/discovery.py:1042
+#: gajim/gtk/discovery.py:698 gajim/gtk/discovery.py:1041
 msgid "The service is not browsable"
 msgstr "Tiu ĉi servo ne rigardeblas"
 
-#: gajim/gtk/discovery.py:700
+#: gajim/gtk/discovery.py:699
 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:738 gajim/gtk/discovery.py:747
+#: gajim/gtk/discovery.py:737 gajim/gtk/discovery.py:746
 #, fuzzy
 msgid "Invalid Server Name"
 msgstr "Malkorekta salutnomo"
 
-#: gajim/gtk/discovery.py:806
+#: gajim/gtk/discovery.py:805
 #, fuzzy, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Rigardado %s per konto %s"
 
-#: gajim/gtk/discovery.py:851
+#: gajim/gtk/discovery.py:850
 #, fuzzy
 msgid "Browse"
 msgstr "_Rigardi"
 
-#: gajim/gtk/discovery.py:1043
+#: gajim/gtk/discovery.py:1042
 msgid "This service does not contain any items to browse."
 msgstr "Tiu ĉi servo ne havas erojn por rigardi."
 
-#: gajim/gtk/discovery.py:1255
+#: gajim/gtk/discovery.py:1254
 #, fuzzy
 msgid "_Command"
 msgstr "Komandoj: %s"
 
-#: gajim/gtk/discovery.py:1264 gajim/gtk/discovery.py:1422
+#: gajim/gtk/discovery.py:1263 gajim/gtk/discovery.py:1420
 msgid "Re_gister"
 msgstr "Re_gistri"
 
-#: gajim/gtk/discovery.py:1277
+#: gajim/gtk/discovery.py:1276
 msgid "_Search"
 msgstr "_Serĉi"
 
-#: gajim/gtk/discovery.py:1420
+#: gajim/gtk/discovery.py:1418
 msgid "_Edit"
 msgstr "A_dministri"
 
-#: gajim/gtk/discovery.py:1458
+#: gajim/gtk/discovery.py:1456
 #, fuzzy, python-format
 msgid "Scanning %(current)d / %(total)d ..."
 msgstr "Skanas %d / %d.."
 
-#: gajim/gtk/discovery.py:1674
+#: gajim/gtk/discovery.py:1655
+msgid "Users"
+msgstr "Uzuloj"
+
+#: gajim/gtk/discovery.py:1671
 msgid "Id"
 msgstr "Id"
 
-#: gajim/gtk/discovery.py:1713
-msgid "_Join"
-msgstr "_Aliĝi"
-
-#: gajim/gtk/discovery.py:1736
-msgid "Bookmark already set"
-msgstr "Legosigno jam estas metita"
-
-#: gajim/gtk/discovery.py:1737
-#, fuzzy, python-format
-msgid "Group Chat '%s' is already in your bookmarks."
-msgstr "Babilejo \"%s\" jam estas en viajn legosignojn."
-
-#: gajim/gtk/discovery.py:1748
-msgid "Bookmark has been added successfully"
-msgstr "Legosigno sukcese aldonitas"
-
-#: gajim/gtk/discovery.py:1749
-#, fuzzy
-msgid ""
-"You can manage your bookmarks by clicking the Bookmarks menu item in your "
-"contact list."
-msgstr ""
-"Vi povas aranĝi viajn legosignojn per menuero \"Agoj\" en la kontaktlisto."
-
-#: gajim/gtk/discovery.py:1950
+#: gajim/gtk/discovery.py:1900
 msgid "Subscribed"
 msgstr "Abonita"
 
-#: gajim/gtk/discovery.py:1959
+#: gajim/gtk/discovery.py:1909
 #, fuzzy
 msgid "Node"
 msgstr "Neniu"
 
-#: gajim/gtk/discovery.py:2028
+#: gajim/gtk/discovery.py:1978
 #, fuzzy
 msgid "_New post"
 msgstr "Nova mesaĝo"
 
-#: gajim/gtk/discovery.py:2037
+#: gajim/gtk/discovery.py:1987
 msgid "_Subscribe"
 msgstr "_Aboni"
 
-#: gajim/gtk/discovery.py:2045
+#: gajim/gtk/discovery.py:1995
 msgid "_Unsubscribe"
 msgstr "_Malaboni"
 
@@ -9095,7 +9382,7 @@ msgstr "Mi estas %s"
 msgid "Characters typed: %s"
 msgstr "Kaŝnomo malpermesita: %s"
 
-#: gajim/gtk/single_message.py:274 gajim/gtk/xml_console.py:169
+#: gajim/gtk/single_message.py:274 gajim/gtk/xml_console.py:166
 msgid "Connection not available"
 msgstr "Konekto mankas"
 
@@ -9104,6 +9391,12 @@ msgstr "Konekto mankas"
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Bonvolu konvinkiĝi, ke vi estas konektita kun \"%s\"."
 
+#: gajim/gtk/single_message.py:306
+#, 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:330
 #, python-format
 msgid "RE: %s"
@@ -9114,28 +9407,28 @@ msgstr "RE: %s"
 msgid "%s wrote:\n"
 msgstr "%s skribis:\n"
 
-#: gajim/gtk/pep_config.py:44
+#: gajim/gtk/pep_config.py:45
 #, fuzzy, python-format
 msgid "PEP Service Configuration (%s)"
 msgstr "Agordo de babilejo"
 
-#: gajim/gtk/pep_config.py:77
+#: gajim/gtk/pep_config.py:78
 #, fuzzy
 msgid "Service"
 msgstr "Servilo"
 
-#: gajim/gtk/pep_config.py:114
+#: gajim/gtk/pep_config.py:115
 msgid "PEP node was not removed"
 msgstr ""
 
-#: gajim/gtk/pep_config.py:115
+#: gajim/gtk/pep_config.py:116
 #, python-format
 msgid ""
 "PEP node %(node)s was not removed:\n"
 "%(message)s"
 msgstr ""
 
-#: gajim/gtk/pep_config.py:146
+#: gajim/gtk/pep_config.py:147
 #, fuzzy, python-format
 msgid "Configure %s"
 msgstr "_Daŭrigi"
@@ -9151,17 +9444,22 @@ msgstr "Re_gistri"
 msgid "Registration successful"
 msgstr "Vizitkarto estas sukcese publicita"
 
-#: gajim/gtk/dialogs.py:54 gajim/gtk/dataform.py:659 gajim/gtk/adhoc.py:85
+#: gajim/gtk/service_registration.py:215
+#, fuzzy
+msgid "Registration failed"
+msgstr "Konektado malsukcesis"
+
+#: gajim/gtk/dialogs.py:53 gajim/gtk/dataform.py:668 gajim/gtk/adhoc.py:86
 #, fuzzy
 msgid "Cancel"
 msgstr "_Nuligi"
 
-#: gajim/gtk/dialogs.py:129
+#: gajim/gtk/dialogs.py:128
 #, fuzzy, python-format
 msgid "Dictionary for language \"%s\" not available"
 msgstr "Vortaro mankas por %s lingvo"
 
-#: gajim/gtk/dialogs.py:130
+#: gajim/gtk/dialogs.py:129
 #, fuzzy, python-format
 msgid ""
 "You have to install the dictionary \"%s\" to use spellchecking, or choose "
@@ -9172,12 +9470,12 @@ msgstr ""
 "Vi bezonas Instali la vortaron %s por uzi literumadon, aŭ elekti alian "
 "lingvon ĉe la agordero \"speller_language\"."
 
-#: gajim/gtk/dialogs.py:410 gajim/gtk/dialogs.py:425
+#: gajim/gtk/dialogs.py:322 gajim/gtk/dialogs.py:337
 #, fuzzy
 msgid "Insecure connection"
 msgstr "Konekto"
 
-#: gajim/gtk/dialogs.py:411
+#: gajim/gtk/dialogs.py:323
 #, fuzzy, python-format
 msgid ""
 "You are about to connect to the account %(account)s (%(server)s) insecurely. "
@@ -9186,120 +9484,115 @@ msgid ""
 "Are you sure you want to do that?"
 msgstr "Pri kreado de metakontakto. Ĉu vi certas ke vi volas daŭrigi?"
 
-#: gajim/gtk/dialogs.py:416
+#: gajim/gtk/dialogs.py:328
 msgid "Yes, I really want to connect insecurely"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:417
+#: gajim/gtk/dialogs.py:329
 msgid "Gajim will NOT connect unless you check this box"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:675
-#, fuzzy
-msgid "The nickname contains invalid characters."
-msgstr "La babileja jabber-ID enhavas nepermesajn signojn."
-
-#: gajim/gtk/dialogs.py:734
+#: gajim/gtk/dialogs.py:561
 #, fuzzy, python-format
 msgid "Destroy %s"
 msgstr "Priskribo: %s"
 
-#: gajim/gtk/dialogs.py:775
+#: gajim/gtk/dialogs.py:602
 #, fuzzy
 msgid "Certificate"
 msgstr "Malkorekta salutnomo"
 
-#: gajim/gtk/dialogs.py:786
+#: gajim/gtk/dialogs.py:613
 #, fuzzy, python-format
 msgid ""
 "Certificate for account\n"
 "%s"
 msgstr "por konto %s"
 
-#: gajim/gtk/dialogs.py:824
+#: gajim/gtk/dialogs.py:651
 msgid "Issued to\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:825 gajim/gtk/dialogs.py:830
+#: gajim/gtk/dialogs.py:652 gajim/gtk/dialogs.py:657
 msgid "Common Name (CN): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:826 gajim/gtk/dialogs.py:831
+#: gajim/gtk/dialogs.py:653 gajim/gtk/dialogs.py:658
 msgid "Organization (O): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:827 gajim/gtk/dialogs.py:832
+#: gajim/gtk/dialogs.py:654 gajim/gtk/dialogs.py:659
 msgid "Organizational Unit (OU): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:828
+#: gajim/gtk/dialogs.py:655
 #, fuzzy
 msgid "Serial Number: "
 msgstr "GG numero:"
 
-#: gajim/gtk/dialogs.py:829
+#: gajim/gtk/dialogs.py:656
 msgid "Issued by\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:833
+#: gajim/gtk/dialogs.py:660
 msgid "Validity\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:834
+#: gajim/gtk/dialogs.py:661
 msgid "Issued on: "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:835
+#: gajim/gtk/dialogs.py:662
 msgid "Expires on: "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:836
+#: gajim/gtk/dialogs.py:663
 msgid "SHA-1:"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:838
+#: gajim/gtk/dialogs.py:665
 msgid "SHA-256:"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:852
+#: gajim/gtk/dialogs.py:679
 #, fuzzy
 msgid "View certificate…"
 msgstr "Malkorekta salutnomo"
 
-#: gajim/gtk/dialogs.py:864 gajim/gtk/accounts.py:893
+#: gajim/gtk/dialogs.py:691 gajim/gtk/accounts.py:896
 msgid "Change Password"
 msgstr "Ŝanĝi pasvorton"
 
-#: gajim/gtk/dialogs.py:878
+#: gajim/gtk/dialogs.py:705
 msgid "_OK"
 msgstr "_O kej"
 
-#: gajim/gtk/dialogs.py:891
+#: gajim/gtk/dialogs.py:718
 #, fuzzy
 msgid "You must enter a password"
 msgstr "Vi devas enigi pasvorton."
 
-#: gajim/gtk/dialogs.py:895
+#: gajim/gtk/dialogs.py:722
 msgid "Passwords do not match"
 msgstr "Pasvortoj diversas"
 
-#: gajim/gtk/dialogs.py:923
+#: gajim/gtk/dialogs.py:750
 #, fuzzy
 msgid "Group Chat Invitation "
 msgstr "Babileja invitilo"
 
-#: gajim/gtk/dialogs.py:948
+#: gajim/gtk/dialogs.py:775
 #, fuzzy, python-format
 msgid "<b>%s</b> has invited you to join a discussion"
 msgstr "$Contact invitas vin al la babilejo %(room_jid)s"
 
-#: gajim/gtk/dialogs.py:951
+#: gajim/gtk/dialogs.py:778
 #, 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:959
+#: gajim/gtk/dialogs.py:786
 #, python-format
 msgid "Comment: %s"
 msgstr "Komento: %s"
@@ -9314,11 +9607,6 @@ msgstr "GG numero:"
 msgid "ICQ Number"
 msgstr "ICQ numero:"
 
-#: gajim/gtk/add_contact.py:40
-#, fuzzy
-msgid "Add Contact"
-msgstr "_Aldoni kontakton..."
-
 #: gajim/gtk/add_contact.py:259
 #, fuzzy, python-format
 msgid "%s Missing"
@@ -9340,7 +9628,7 @@ msgstr "La uzula ID devas ne enteni risurcon."
 
 #: gajim/gtk/add_contact.py:299
 #, fuzzy
-msgid "You cannot add yourself to your roster."
+msgid "You cannot add yourself to your contact list."
 msgstr "Mi volus aldoni vin al mia kontaktlisto."
 
 #: gajim/gtk/add_contact.py:304
@@ -9353,11 +9641,13 @@ msgid "Your account must be online to add new contacts."
 msgstr ""
 
 #: gajim/gtk/add_contact.py:321
-msgid "Contact already in roster"
+#, fuzzy
+msgid "Contact Already in Contact List"
 msgstr "Kontakto jam estas en kontaktlisto"
 
 #: gajim/gtk/add_contact.py:322
-msgid "This contact is already listed in your roster."
+#, fuzzy
+msgid "This contact is already in your contact list."
 msgstr "Tiu kontakto jam ĉeestas en via kontaktlisto."
 
 #: gajim/gtk/add_contact.py:379 gajim/gtk/add_contact.py:417
@@ -9398,14 +9688,14 @@ msgstr "Kontakto ŝanĝis sian staton"
 
 #: gajim/gtk/themes.py:52
 #, fuzzy
-msgid "MUC Tab New Directed Message"
+msgid "Group Chat Tab New Directed Message"
 msgstr ""
 "Babilejaj\n"
 "mesaĝoj al vi"
 
 #: gajim/gtk/themes.py:56
 #, fuzzy
-msgid "MUC Tab New Message"
+msgid "Group Chat Tab New Message"
 msgstr "Nova mesaĝo"
 
 #: gajim/gtk/themes.py:60
@@ -9622,13 +9912,13 @@ msgstr "Ĉiuj dosieroj"
 msgid "Clear File"
 msgstr "Vespero"
 
-#: gajim/gtk/settings.py:570
+#: gajim/gtk/settings.py:570 gajim/gtk/proxies.py:32
 #, fuzzy
 msgid "Manage Proxies"
 msgstr "Administri prokurservilajn agordojn"
 
-#: gajim/gtk/settings.py:591 gajim/gtk/preferences.py:971
-#: gajim/gtk/preferences.py:984 gajim/gtk/preferences.py:988
+#: gajim/gtk/settings.py:591 gajim/gtk/preferences.py:968
+#: gajim/gtk/preferences.py:982 gajim/gtk/preferences.py:986
 #, fuzzy
 msgid "No Proxy"
 msgstr "Prokura servilo:"
@@ -9708,14 +9998,15 @@ msgid ""
 "        "
 msgstr ""
 
-#: gajim/gtk/about.py:47 data/org.gajim.Gajim.appdata.xml.in:10
+#: gajim/gtk/about.py:47 data/org.gajim.Gajim.desktop.in:6
+#: data/org.gajim.Gajim.appdata.xml.in:10
 #, fuzzy
-msgid "A GTK+ XMPP client"
+msgid "A GTK XMPP client"
 msgstr "GTK+bazita jabber-kliento"
 
 #: gajim/gtk/about.py:48
 #, fuzzy, python-format
-msgid "GTK+ Version: %s"
+msgid "GTK Version: %s"
 msgstr "Versio de GTK+:"
 
 #: gajim/gtk/about.py:49
@@ -9895,6 +10186,25 @@ msgstr "Paŭzas"
 msgid "?transfer status:Not started"
 msgstr "Paŭzas"
 
+#: gajim/gtk/groupchat_creation.py:97 gajim/gtk/groupchat_creation.py:99
+msgid " (optional)..."
+msgstr ""
+
+#: gajim/gtk/groupchat_creation.py:134
+#, fuzzy
+msgid "Invalid Address"
+msgstr "Malkorekta dosiero"
+
+#: gajim/gtk/groupchat_creation.py:182
+#, fuzzy
+msgid "Not Connected"
+msgstr "Konekto"
+
+#: gajim/gtk/groupchat_creation.py:183
+#, fuzzy
+msgid "You have to be connected to create a group chat."
+msgstr "%s aliĝis al la babilejo"
+
 #: gajim/gtk/sounds.py:39
 msgid "Wav Sounds"
 msgstr "Wav-sonoj"
@@ -9938,50 +10248,45 @@ msgstr "Emfazado de mesaĝoj en babilejo"
 msgid "Group Chat Message Received"
 msgstr "Ricevitas mesaĝo en babilejo"
 
-#: gajim/gtk/dataform.py:226 gajim/gtk/dataform.py:262
+#: gajim/gtk/dataform.py:232 gajim/gtk/dataform.py:268
 #, fuzzy
 msgid "Required"
 msgstr "Pasvorto necesas"
 
-#: gajim/gtk/dataform.py:286
+#: gajim/gtk/dataform.py:293
 msgid "Yes"
 msgstr ""
 
-#: gajim/gtk/dataform.py:286
+#: gajim/gtk/dataform.py:293
 #, fuzzy
 msgid "No"
 msgstr "Neniu"
 
-#: gajim/gtk/dataform.py:661
+#: gajim/gtk/dataform.py:670
 msgid "Submit"
 msgstr ""
 
-#: gajim/gtk/statusicon.py:213
+#: gajim/gtk/statusicon.py:206
 #, fuzzy
 msgid "_Change Status Message…"
 msgstr "Ŝanĝi stat_mesaĝon"
 
-#: gajim/gtk/statusicon.py:247 gajim/gtk/statusicon.py:292
-#: gajim/gtk/statusicon.py:299
+#: gajim/gtk/statusicon.py:258
 #, python-format
 msgid "using account %s"
 msgstr "per konto %s"
 
-#: gajim/gtk/statusicon.py:309
+#: gajim/gtk/statusicon.py:269
 #, fuzzy
-msgid "_Manage Bookmarks…"
-msgstr "Aranĝi legosignojn"
+msgid "Hide _Contact List"
+msgstr "Kontaktoj"
 
-#: gajim/gtk/statusicon.py:325
+#: gajim/gtk/statusicon.py:273
 #, fuzzy
-msgid "Hide _Roster"
-msgstr "Mankas en kontaktlisto"
-
-#: gajim/gtk/statusicon.py:329
-msgid "Show _Roster"
-msgstr "Montri _kontaktliston"
+msgid "Show _Contact List"
+msgstr "Montri _senkonektajn kontaktojn"
 
-#: gajim/gtk/statusicon.py:337
+#: gajim/gtk/statusicon.py:281
 msgid "Hide this menu"
 msgstr "Kaŝi tiun ĉi menuon"
 
@@ -10028,37 +10333,6 @@ msgid ""
 "later."
 msgstr "Estis eraro dum publicado de persona informo, provu denove pli poste."
 
-#: gajim/gtk/join_groupchat.py:202
-#, fuzzy
-msgid "Invalid Room"
-msgstr "Malkorekta rikordo"
-
-#: gajim/gtk/join_groupchat.py:203
-msgid "Please choose a room"
-msgstr ""
-
-#: gajim/gtk/join_groupchat.py:222 gajim/gtk/join_groupchat.py:229
-#, fuzzy
-msgid "Invalid Nickname"
-msgstr "Malkorekta salutnomo"
-
-#: gajim/gtk/join_groupchat.py:223
-#, fuzzy
-msgid "Please choose a nickname"
-msgstr "Nova mesaĝo"
-
-#: gajim/gtk/join_groupchat.py:282 gajim/gtk/join_groupchat.py:288
-#: gajim/gtk/join_groupchat.py:293
-#, fuzzy
-msgid "Wrong server"
-msgstr "Malprava uri"
-
-#: gajim/gtk/join_groupchat.py:283 gajim/gtk/join_groupchat.py:289
-#: gajim/gtk/join_groupchat.py:294
-#, fuzzy, python-format
-msgid "%s is not a groupchat server"
-msgstr "Tio ne estas babilejo"
-
 #: gajim/gtk/mam_preferences.py:38
 #, python-format
 msgid "Archiving Preferences for %s"
@@ -10088,45 +10362,53 @@ msgstr ""
 msgid "Archiving Preferences Error"
 msgstr "_Agordo"
 
-#: gajim/gtk/advanced_config.py:81
+#: gajim/gtk/advanced_config.py:95
 msgid "Activated"
 msgstr "Ŝaltita"
 
-#: gajim/gtk/advanced_config.py:81
+#: gajim/gtk/advanced_config.py:95
 msgid "Deactivated"
 msgstr "Malŝaltita"
 
-#: gajim/gtk/advanced_config.py:83
-msgid "Boolean"
-msgstr "Bulea"
+#: gajim/gtk/advanced_config.py:97
+msgid "?config type:Boolean"
+msgstr ""
 
-#: gajim/gtk/advanced_config.py:84
-msgid "Integer"
-msgstr "Entjera"
+#: gajim/gtk/advanced_config.py:98
+msgid "?config type:Integer"
+msgstr ""
 
-#: gajim/gtk/advanced_config.py:85
-msgid "Text"
-msgstr "Teksto"
+#: gajim/gtk/advanced_config.py:99
+msgid "?config type:Text"
+msgstr ""
 
-#: gajim/gtk/advanced_config.py:97
-msgid "Preference Name"
+#: gajim/gtk/advanced_config.py:100
+msgid "?config type:Color"
+msgstr ""
+
+#: gajim/gtk/advanced_config.py:112
+#, fuzzy
+msgid "?config:Preference Name"
 msgstr "Parametra nomo"
 
-#: gajim/gtk/advanced_config.py:104
-msgid "Value"
-msgstr "Valoro"
+#: gajim/gtk/advanced_config.py:123
+#, fuzzy
+msgid "?config:Value"
+msgstr "_Daŭrigi"
 
-#: gajim/gtk/advanced_config.py:113
-msgid "Type"
-msgstr "Datumtipo"
+#: gajim/gtk/advanced_config.py:132
+msgid "?config:Type"
+msgstr ""
 
-#: gajim/gtk/advanced_config.py:168
-msgid "(None)"
-msgstr "(Mankas)"
+#: gajim/gtk/advanced_config.py:187
+#, fuzzy
+msgid "?config description:None"
+msgstr "Nenion"
 
-#: gajim/gtk/advanced_config.py:299
-msgid "Hidden"
-msgstr "Kaŝita"
+#: gajim/gtk/advanced_config.py:322
+#, fuzzy
+msgid "?password:Hidden"
+msgstr "Pasvorto:"
 
 #: gajim/gtk/server_info.py:66
 #, fuzzy
@@ -10138,8 +10420,8 @@ msgstr "_Kopii ligilan lokon"
 msgid "%(days)s days, %(hours)s hours"
 msgstr ""
 
-#: gajim/gtk/server_info.py:218 gajim/gtk/accounts.py:749
-#: gajim/gtk/accounts.py:853
+#: gajim/gtk/server_info.py:218 gajim/gtk/accounts.py:752
+#: gajim/gtk/accounts.py:856
 #, fuzzy
 msgid "Hostname"
 msgstr "Servilnomo: "
@@ -10317,11 +10599,6 @@ 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_config.py:41
-#, fuzzy
-msgid "Group Chat Configuration"
-msgstr "Babileja invitilo"
-
 #: gajim/gtk/groupchat_config.py:134
 #, fuzzy
 msgid "A Group Chat needs at least one Owner"
@@ -10332,69 +10609,69 @@ msgid "You are not allowed to modify the affiliation of Admins and Owners"
 msgstr ""
 
 #: gajim/gtk/groupchat_config.py:399
-msgid "An entry with this Jabber-ID already exists"
+msgid "An entry with this XMPP Address already exists"
 msgstr ""
 
-#: gajim/gtk/adhoc.py:91
+#: gajim/gtk/adhoc.py:92
 #, fuzzy
 msgid "Finish"
 msgstr "_Finigi"
 
-#: gajim/gtk/adhoc.py:97 gajim/gtk/adhoc.py:283
+#: gajim/gtk/adhoc.py:98 gajim/gtk/adhoc.py:284
 #, fuzzy
 msgid "Commands"
 msgstr "Komandoj: %s"
 
-#: gajim/gtk/adhoc.py:103
+#: gajim/gtk/adhoc.py:104
 msgid "Next"
 msgstr ""
 
-#: gajim/gtk/adhoc.py:109
+#: gajim/gtk/adhoc.py:110
 #, fuzzy
 msgid "Previous"
 msgstr "uri"
 
-#: gajim/gtk/adhoc.py:115
+#: gajim/gtk/adhoc.py:116
 #, fuzzy
 msgid "Execute"
 msgstr "_Plenumi komandon..."
 
-#: gajim/gtk/adhoc.py:195
+#: gajim/gtk/adhoc.py:196
 #, fuzzy
 msgid "No commands available"
 msgstr "Neniu konto disponeblas"
 
-#: gajim/gtk/adhoc.py:244
+#: gajim/gtk/adhoc.py:245
 #, fuzzy
 msgid "Request Command List"
 msgstr "_Plenumi komandon..."
 
-#: gajim/gtk/adhoc.py:259
+#: gajim/gtk/adhoc.py:260
 #, fuzzy
 msgid "Executing…"
 msgstr "_Plenumi komandon..."
 
-#: gajim/gtk/adhoc.py:266
+#: gajim/gtk/adhoc.py:267
 #, fuzzy
 msgid "Command List"
 msgstr "Komandoj: %s"
 
-#: gajim/gtk/adhoc.py:384
+#: gajim/gtk/adhoc.py:385
 #, fuzzy
 msgid "Finished"
 msgstr "_Finigi"
 
-#: gajim/gtk/adhoc.py:453
+#: gajim/gtk/adhoc.py:454
 #, fuzzy
 msgid "Execution failed"
 msgstr "Konektado malsukcesis"
 
-#: gajim/gtk/blocking.py:37
+#: gajim/gtk/blocking.py:38
 #, fuzzy, python-format
 msgid "Blocking List for %s"
 msgstr "Privata listo por %s"
 
-#: gajim/gtk/blocking.py:71
+#: gajim/gtk/blocking.py:72
 #, fuzzy
 msgid "Error!"
 msgstr "Eraro de Avahi"
@@ -10444,8 +10721,7 @@ msgstr "Malkorekta salutnomo"
 msgid "You must provide a username to configure this account."
 msgstr "Vi devas enigi salutnomon por administri tiun ĉi konton."
 
-#: gajim/gtk/account_wizard.py:252 gajim/gtk/bookmarks.py:290
-#: gajim/gtk/bookmarks.py:303
+#: gajim/gtk/account_wizard.py:252
 #, fuzzy
 msgid "Invalid server"
 msgstr "Malkorekta salutnomo"
@@ -10463,7 +10739,7 @@ msgstr "Malkorekta rikordo"
 msgid "Custom port must be a port number."
 msgstr "La pordo devas esti nombro."
 
-#: gajim/gtk/account_wizard.py:405
+#: gajim/gtk/account_wizard.py:406
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -10473,15 +10749,15 @@ msgid ""
 "Do you still want to connect to this server?"
 msgstr ""
 
-#: gajim/gtk/account_wizard.py:446 gajim/gtk/account_wizard.py:480
+#: gajim/gtk/account_wizard.py:447 gajim/gtk/account_wizard.py:481
 msgid "An error occurred during account creation"
 msgstr "Eraro okazis dum kreado de konto"
 
-#: gajim/gtk/account_wizard.py:545
+#: gajim/gtk/account_wizard.py:546
 msgid "Account name is in use"
 msgstr "Kontnomo estas uzata"
 
-#: gajim/gtk/account_wizard.py:546
+#: gajim/gtk/account_wizard.py:547
 msgid "You already have an account using this name."
 msgstr "Vi jam havas konto kun tiu nomo."
 
@@ -10508,26 +10784,26 @@ msgstr "Transmeto de dosiero %(filename)s de %(name)s haltitas."
 msgid "%(minutes)s min %(seconds)s sec"
 msgstr ""
 
-#: gajim/gtk/xml_console.py:77
+#: gajim/gtk/xml_console.py:74
 #, fuzzy
 msgid "Filter"
 msgstr "Filtrilo:"
 
-#: gajim/gtk/xml_console.py:82
+#: gajim/gtk/xml_console.py:79
 #, fuzzy
 msgid "XML Input"
 msgstr "<b>XML enigo</b>"
 
-#: gajim/gtk/xml_console.py:86
+#: gajim/gtk/xml_console.py:83
 msgid "Paste Last Input"
 msgstr ""
 
-#: gajim/gtk/xml_console.py:170
+#: gajim/gtk/xml_console.py:167
 #, fuzzy, python-format
 msgid "Please make sure you are connected with '%s'."
 msgstr "Bonvolu konvinkiĝi, ke vi estas konektita kun \"%s\"."
 
-#: gajim/gtk/xml_console.py:182
+#: gajim/gtk/xml_console.py:177
 #, fuzzy
 msgid "Invalid Node"
 msgstr "Malkorekta dosiero"
@@ -10560,305 +10836,315 @@ msgstr "Serĉi"
 msgid "No results found"
 msgstr "%s ne trovitas"
 
-#: gajim/gtk/preferences.py:358 gajim/gtk/preferences.py:362
+#: gajim/gtk/preferences.py:357 gajim/gtk/preferences.py:361
 msgid "Default"
 msgstr "Defaŭlte"
 
-#: gajim/gtk/preferences.py:801
+#: gajim/gtk/preferences.py:798
 msgid "status message title"
 msgstr "statmesaĝa titolo"
 
-#: gajim/gtk/preferences.py:802
+#: gajim/gtk/preferences.py:799
 msgid "status message text"
 msgstr "statmesaĝa teksto"
 
+#: gajim/gtk/accounts.py:137
+#, fuzzy
+msgid "Re-Login"
+msgstr "Ĉu rekonektu nun?"
+
 #: gajim/gtk/accounts.py:138
-msgid "Relogin now?"
+#, fuzzy
+msgid "Re-Login now?"
 msgstr "Ĉu rekonektu nun?"
 
 #: gajim/gtk/accounts.py:139
-msgid "If you want all the changes to apply instantly, you must relogin."
+#, 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:191 gajim/gtk/accounts.py:975
+#: gajim/gtk/accounts.py:141
+msgid "_Later"
+msgstr ""
+
+#: gajim/gtk/accounts.py:143
+msgid "_Re-Login"
+msgstr ""
+
+#: gajim/gtk/accounts.py:194 gajim/gtk/accounts.py:978
 #, fuzzy
 msgid "Remove Account"
 msgstr "Forigado de konto %s"
 
-#: gajim/gtk/accounts.py:192
+#: gajim/gtk/accounts.py:195
 #, fuzzy, python-format
 msgid "You still have open chats in your account %s"
 msgstr "Vi havas aktivan konversacion ĉe konto %s"
 
-#: gajim/gtk/accounts.py:193
+#: gajim/gtk/accounts.py:196
 #, fuzzy
 msgid ""
 "All chat and group chat windows will be closed.\n"
 "Do you want to continue?"
 msgstr "Ĉiuj konversaciajn fenestrojn fermitos. Ĉu daŭrigu?"
 
-#: gajim/gtk/accounts.py:424
+#: gajim/gtk/accounts.py:427
 #, fuzzy
 msgid "Back"
 msgstr "Revenos baldaŭ"
 
-#: gajim/gtk/accounts.py:530
+#: gajim/gtk/accounts.py:533
 #, fuzzy
 msgid "Please check if Bonjour is installed."
 msgstr "Bonvolu certiĝi ke Avahi estas instalita."
 
-#: gajim/gtk/accounts.py:532
+#: gajim/gtk/accounts.py:535
 #, fuzzy
 msgid "Please check if Avahi is installed."
 msgstr "Bonvolu certiĝi ke Avahi estas instalita."
 
-#: gajim/gtk/accounts.py:569
+#: gajim/gtk/accounts.py:572
 #, fuzzy
 msgid "Disable Account"
 msgstr "Malkorekta kontnomo"
 
-#: gajim/gtk/accounts.py:570
+#: gajim/gtk/accounts.py:573
 #, fuzzy, python-format
 msgid "Account %s is still connected"
 msgstr "Konto \"%s\" estas konektita al la servilo"
 
-#: gajim/gtk/accounts.py:571
+#: gajim/gtk/accounts.py:574
 #, fuzzy
 msgid ""
 "All chat and group chat windows will be closed. Do you want to continue?"
 msgstr "Ĉiuj konversaciajn fenestrojn fermitos. Ĉu daŭrigu?"
 
-#: gajim/gtk/accounts.py:576
+#: gajim/gtk/accounts.py:579
 #, fuzzy
 msgid "_Disable Account"
 msgstr "Malkorekta kontnomo"
 
-#: gajim/gtk/accounts.py:595
+#: gajim/gtk/accounts.py:598
 #, fuzzy
 msgid "Add Account"
 msgstr "_Aldoni kontakton..."
 
-#: gajim/gtk/accounts.py:663
+#: gajim/gtk/accounts.py:666
 msgid "Label"
 msgstr ""
 
-#: gajim/gtk/accounts.py:667
+#: gajim/gtk/accounts.py:670
 msgid "Login"
 msgstr ""
 
-#: gajim/gtk/accounts.py:670
+#: gajim/gtk/accounts.py:673
 #, fuzzy
 msgid "Import Contacts"
 msgstr "Kontaktoj"
 
-#: gajim/gtk/accounts.py:674 gajim/gtk/accounts.py:870
+#: gajim/gtk/accounts.py:677 gajim/gtk/accounts.py:873
 #, fuzzy
 msgid "Client Certificate"
 msgstr "Malkorekta salutnomo"
 
-#: gajim/gtk/accounts.py:677 gajim/gtk/accounts.py:774
+#: gajim/gtk/accounts.py:680 gajim/gtk/accounts.py:777
 #, fuzzy
 msgid "Connect on startup"
 msgstr "K_onekti dum lanĉo de Gajim"
 
-#: gajim/gtk/accounts.py:681 gajim/gtk/accounts.py:779
+#: gajim/gtk/accounts.py:684 gajim/gtk/accounts.py:782
 #, fuzzy
 msgid "Save conversations for all contacts"
 msgstr "Konservi komunikadajn _protokolojn por ĉiuj kontaktoj"
 
-#: gajim/gtk/accounts.py:683 gajim/gtk/accounts.py:781
+#: gajim/gtk/accounts.py:686 gajim/gtk/accounts.py:784
 msgid "Store conversations on the harddrive"
 msgstr ""
 
-#: gajim/gtk/accounts.py:685 gajim/gtk/accounts.py:783
+#: gajim/gtk/accounts.py:688 gajim/gtk/accounts.py:786
 #, fuzzy
 msgid "Global Status"
 msgstr "ia ajn stato"
 
-#: gajim/gtk/accounts.py:687
+#: gajim/gtk/accounts.py:690
 #, fuzzy
 msgid "Synchronise the status of all accounts"
 msgstr "Ŝanĝas staton de konto aŭ kontoj"
 
-#: gajim/gtk/accounts.py:689
+#: gajim/gtk/accounts.py:692
 msgid "Use file transfer proxies"
 msgstr "Uzi dosiertransmetan prokuran servilon"
 
-#: gajim/gtk/accounts.py:705
+#: gajim/gtk/accounts.py:708
 #, fuzzy
 msgid "Idle Time"
 msgstr " ekde %s"
 
-#: gajim/gtk/accounts.py:707
+#: gajim/gtk/accounts.py:710
 msgid "Disclose the time of your last activity"
 msgstr ""
 
-#: gajim/gtk/accounts.py:709
+#: gajim/gtk/accounts.py:712
 msgid "Local System Time"
 msgstr ""
 
-#: gajim/gtk/accounts.py:711
+#: gajim/gtk/accounts.py:714
 msgid "Disclose the local system time of the device Gajim runs on"
 msgstr ""
 
-#: gajim/gtk/accounts.py:714
+#: gajim/gtk/accounts.py:717
 #, fuzzy
 msgid "Client / Operating System"
 msgstr "Malkorekta salutnomo"
 
-#: gajim/gtk/accounts.py:716
+#: gajim/gtk/accounts.py:719
 #, fuzzy
 msgid ""
 "Disclose informations 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:719
+#: gajim/gtk/accounts.py:722
 #, fuzzy
 msgid "Ignore Unknown Contacts"
 msgstr "Kontaktoj"
 
-#: gajim/gtk/accounts.py:721
+#: gajim/gtk/accounts.py:724
 #, fuzzy
 msgid "Ignore everything from contacts not in your Roster"
 msgstr "_Ignori eventojn de kontaktoj kiuj mankas en kontaktlisto"
 
-#: gajim/gtk/accounts.py:737 gajim/gtk/accounts.py:776
+#: gajim/gtk/accounts.py:740 gajim/gtk/accounts.py:779
 #, fuzzy
 msgid "Use environment variable"
 msgstr "Konekto mankas"
 
-#: gajim/gtk/accounts.py:739
-#, fuzzy
-msgid "Proxy"
-msgstr "Prokura servilo:"
-
-#: gajim/gtk/accounts.py:742
+#: gajim/gtk/accounts.py:745
 #, fuzzy
 msgid "Warn on insecure connection"
 msgstr "Konekto"
 
-#: gajim/gtk/accounts.py:746
+#: gajim/gtk/accounts.py:749
 msgid "Send keep-alive packets"
 msgstr "Sendi vivkontrolajn pakaĵojn"
 
-#: gajim/gtk/accounts.py:750
+#: gajim/gtk/accounts.py:753
 msgid "Manually set the hostname for the server"
 msgstr ""
 
-#: gajim/gtk/accounts.py:756 gajim/gtk/accounts.py:826
-#: gajim/gtk/accounts.py:831
+#: gajim/gtk/accounts.py:759 gajim/gtk/accounts.py:829
+#: gajim/gtk/accounts.py:834
 #, fuzzy
 msgid "Priority"
 msgstr "Priori_tato:"
 
-#: gajim/gtk/accounts.py:785
+#: gajim/gtk/accounts.py:788
 #, fuzzy
 msgid "Synchronize the status of all accounts"
 msgstr "Ŝanĝas staton de konto aŭ kontoj"
 
-#: gajim/gtk/accounts.py:795
+#: gajim/gtk/accounts.py:798
 #, fuzzy
 msgid "First Name"
 msgstr "Nomo:"
 
-#: gajim/gtk/accounts.py:798
+#: gajim/gtk/accounts.py:801
 #, fuzzy
 msgid "Last Name"
 msgstr "Familia nomo:"
 
-#: gajim/gtk/accounts.py:804
+#: gajim/gtk/accounts.py:807
 #, fuzzy
 msgid "Email"
 msgstr "Nova retletero"
 
-#: gajim/gtk/accounts.py:822
+#: gajim/gtk/accounts.py:825
 #, fuzzy
 msgid "Adjust to status"
 msgstr "_Alĝustigi laŭ stato"
 
-#: gajim/gtk/accounts.py:849
+#: gajim/gtk/accounts.py:852
 msgid "Enable"
 msgstr "Ebligi"
 
-#: gajim/gtk/accounts.py:857
+#: gajim/gtk/accounts.py:860
 #, fuzzy
 msgid "Port"
 msgstr "_Pordo:"
 
-#: gajim/gtk/accounts.py:862
+#: gajim/gtk/accounts.py:865
 #, fuzzy
 msgid "Connection Settings"
 msgstr "Konekto"
 
-#: gajim/gtk/accounts.py:872
+#: gajim/gtk/accounts.py:875
 msgid "PKCS12 Files"
 msgstr ""
 
-#: gajim/gtk/accounts.py:874
+#: gajim/gtk/accounts.py:877
 #, fuzzy
 msgid "Encrypted Certificate"
 msgstr "Malkorekta salutnomo"
 
-#: gajim/gtk/accounts.py:878
+#: gajim/gtk/accounts.py:881
 #, fuzzy
 msgid "Certificate Settings"
 msgstr "Malkorekta salutnomo"
 
-#: gajim/gtk/accounts.py:890
+#: gajim/gtk/accounts.py:893
 #, fuzzy
 msgid "Save Password"
 msgstr "Konservi pasvorton"
 
-#: gajim/gtk/accounts.py:898
+#: gajim/gtk/accounts.py:901
 #, fuzzy
 msgid "Login Settings"
 msgstr "Konektado malsukcesis"
 
-#: gajim/gtk/accounts.py:931
+#: gajim/gtk/accounts.py:934
 #, fuzzy, python-format
 msgid "Removing account %s"
 msgstr "Forigado de konto %s"
 
-#: gajim/gtk/accounts.py:946
+#: gajim/gtk/accounts.py:949
 #, fuzzy
 msgid "Account is disabled"
 msgstr "Ĉifrado malebligata"
 
-#: gajim/gtk/accounts.py:947
+#: gajim/gtk/accounts.py:950
 #, fuzzy
 msgid "To unregister from a server, the account must be enabled."
 msgstr "Por ke ŝanĝi kontnomon, vi devas esti senkonekta."
 
-#: gajim/gtk/accounts.py:962
+#: gajim/gtk/accounts.py:965
 #, fuzzy
 msgid "Password required"
 msgstr "Pasvorto necesas"
 
-#: gajim/gtk/accounts.py:976
+#: gajim/gtk/accounts.py:979
 #, fuzzy, python-format
 msgid "Account '%s' is still connected to the server"
 msgstr "Konto \"%s\" estas konektita al la servilo"
 
-#: gajim/gtk/accounts.py:978
+#: gajim/gtk/accounts.py:981
 msgid "If you remove it, the connection will be lost."
 msgstr "Se vi forigos ĝin, la konekto disiĝos."
 
-#: gajim/gtk/accounts.py:995
+#: gajim/gtk/accounts.py:998
 #, fuzzy, python-format
 msgid "Connection to server %s failed"
 msgstr "Konektado malsukcesis"
 
-#: gajim/gtk/accounts.py:996
+#: gajim/gtk/accounts.py:999
 #, fuzzy
 msgid "What would you like to do?"
 msgstr "Kion vi volas fari?"
 
-#: gajim/gtk/accounts.py:997
+#: gajim/gtk/accounts.py:1000
 #, fuzzy
 msgid "Remove only from Gajim"
 msgstr "Forigi konton _nur el Gajim"
 
-#: gajim/gtk/accounts.py:998
+#: gajim/gtk/accounts.py:1001
 msgid "Don't remove anything. I'll try again later"
 msgstr ""
 
@@ -10882,6 +11168,10 @@ msgstr "Mi petas vin permesi aldoni vin en mian kontaktliston."
 msgid "Modify"
 msgstr "_Korekti"
 
+#: gajim/gtk/roster_item_exchange.py:80
+msgid "JID"
+msgstr "JID"
+
 #: gajim/gtk/roster_item_exchange.py:86
 #, fuzzy
 msgid "Groups"
@@ -10906,50 +11196,29 @@ msgid_plural "Removed %d contacts"
 msgstr[0] "Forigas kontakton el kontaktlisto"
 msgstr[1] "Forigas kontakton el kontaktlisto"
 
-#: gajim/gtk/util.py:581
+#: gajim/gtk/util.py:583
 msgid "Unknown Artist"
 msgstr ""
 
-#: gajim/gtk/util.py:582
+#: gajim/gtk/util.py:584
 msgid "Unknown Title"
 msgstr ""
 
-#: gajim/gtk/util.py:583
+#: gajim/gtk/util.py:585
 msgid "Unknown Source"
 msgstr ""
 
-#: gajim/gtk/util.py:585
+#: gajim/gtk/util.py:587
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
 "from <i>%(source)s</i>"
 msgstr ""
 
-#: gajim/gtk/bookmarks.py:121
-msgid "New Group Chat"
-msgstr "Nova babilejo"
-
-#: gajim/gtk/bookmarks.py:161
-msgid "This bookmark has invalid data"
-msgstr "Tiu ĉi legosigno havas malkorektan datumon"
-
-#: gajim/gtk/bookmarks.py:162
-msgid ""
-"Please be sure to fill out server and room fields or remove this bookmark."
-msgstr ""
-"Bonvolu konvinkiĝi, ke kampoj Servilo kaj Babilejo estas plenitaj aŭ forigi "
-"tiun ĉi legosignon."
-
-#: gajim/gtk/bookmarks.py:273 gajim/gtk/bookmarks.py:291
-#: gajim/gtk/bookmarks.py:304 gajim/gtk/bookmarks.py:335
-#, fuzzy
-msgid "Character not allowed"
-msgstr "Kaŝnomo malpermesita: %s"
-
-#: gajim/gtk/bookmarks.py:334
-#, fuzzy
-msgid "Invalid room"
-msgstr "Malkorekta rikordo"
+#: gajim/gtk/bookmarks.py:47
+#, fuzzy, python-format
+msgid "Bookmarks for %s"
+msgstr "Starigi legosignon por tiu babilejo"
 
 #: gajim/plugins/pluginmanager.py:736 gajim/plugins/pluginmanager.py:742
 msgid "Archive corrupted"
@@ -10961,50 +11230,53 @@ msgid "Archive empty"
 msgstr "Dosierindiko"
 
 #: gajim/plugins/pluginmanager.py:750 gajim/plugins/pluginmanager.py:758
-#: gajim/plugins/gui.py:257
+#: gajim/plugins/gui.py:258
 msgid "Archive is malformed"
 msgstr ""
 
-#: gajim/plugins/pluginmanager.py:766 gajim/plugins/gui.py:281
-#: gajim/plugins/gui.py:289
+#: gajim/plugins/pluginmanager.py:766 gajim/plugins/gui.py:288
+#: gajim/plugins/gui.py:301
 #, fuzzy
 msgid "Plugin already exists"
 msgstr "Tiu dosiero jam ekzistas"
 
-#: gajim/plugins/gui.py:82
+#: gajim/plugins/gui.py:83
 msgid "Click to view Gajim's wiki page on how to install plugins in Flatpak."
 msgstr ""
 
-#: gajim/plugins/gui.py:89
+#: gajim/plugins/gui.py:90
 msgid "Plugin"
 msgstr ""
 
-#: gajim/plugins/gui.py:151
+#: gajim/plugins/gui.py:152
 #, fuzzy, python-format
 msgid "Warning: %s"
 msgstr "Malpermesas %s"
 
-#: gajim/plugins/gui.py:206
+#: gajim/plugins/gui.py:207
 #, fuzzy
 msgid "Plugin failed"
 msgstr "Konektado malsukcesis"
 
-#: gajim/plugins/gui.py:245
+#: gajim/plugins/gui.py:246
 msgid "Unable to properly remove the plugin"
 msgstr ""
 
-#: gajim/plugins/gui.py:281
-msgid "Overwrite?"
-msgstr ""
+#: gajim/plugins/gui.py:287
+#, fuzzy
+msgid "Overwrite Plugin?"
+msgstr "Statmesaĝo"
+
+#: gajim/plugins/gui.py:289
+#, fuzzy
+msgid "Do you want to overwrite the currently installed version?"
+msgstr "Ĉu vi volas forigi la grupon %s de la kontaktlisto?"
 
 #: data/org.gajim.Gajim.desktop.in:5
-msgid "Jabber IM Client"
+#, fuzzy
+msgid "XMPP IM Client"
 msgstr "Jabber-tujmesaĝilo"
 
-#: data/org.gajim.Gajim.desktop.in:6
-msgid "A GTK+ Jabber client"
-msgstr "GTK+bazita jabber-kliento"
-
 #: data/org.gajim.Gajim.desktop.in:8
 msgid "chat;messaging;im;xmpp;bonjour;voip;"
 msgstr ""
@@ -11056,7 +11328,7 @@ msgid "Easily send pictures, videos or other files to friends and groups"
 msgstr ""
 
 #: data/org.gajim.Gajim.appdata.xml.in:27
-msgid "Chat securely with End-to-End encryption via OMEMO or PGP"
+msgid "Chat securely with End-to-End encryption via OMEMO or OpenPGP"
 msgstr ""
 
 #: data/org.gajim.Gajim.appdata.xml.in:28
@@ -11117,7 +11389,7 @@ msgstr ""
 
 #: data/org.gajim.Gajim.appdata.xml.in:52
 #, fuzzy
-msgid "Roster, list of contacts"
+msgid "Contact list, list of contacts"
 msgstr "_Protokoli statŝanĝojn de kontaktoj"
 
 #: data/org.gajim.Gajim.appdata.xml.in:56
@@ -11139,6 +11411,490 @@ msgstr "Antaŭ nelonge:"
 msgid "Plugin manager"
 msgstr "Konektado malsukcesis"
 
+#, fuzzy
+#~ msgid "Configure Services…"
+#~ msgstr "_Serĉi servojn..."
+
+#, fuzzy
+#~ msgid "Group Chat Bookmarks"
+#~ msgstr "Babilejo"
+
+#, fuzzy
+#~ msgid "Add Bookmark"
+#~ msgstr "Starigi legosignon por tiu babilejo"
+
+#, fuzzy
+#~ msgid "Remove Bookmark"
+#~ msgstr "Starigi legosignon por tiu babilejo"
+
+#, fuzzy
+#~ msgid "Bookmark Name"
+#~ msgstr "Starigi legosignon por tiu babilejo"
+
+#, fuzzy
+#~ msgid "_Server"
+#~ msgstr "_Servilo:"
+
+#, fuzzy
+#~ msgid "_Password"
+#~ msgstr "_Pasvorto:"
+
+#, fuzzy
+#~ msgid "Join chat when connected"
+#~ msgstr "Kontakto malkonektita"
+
+#~ msgid "New Group Chat"
+#~ msgstr "Nova babilejo"
+
+#~ msgid "This bookmark has invalid data"
+#~ msgstr "Tiu ĉi legosigno havas malkorektan datumon"
+
+#, fuzzy
+#~ msgid ""
+#~ "Please be sure to fill out server and group chat fields or remove this "
+#~ "bookmark."
+#~ msgstr ""
+#~ "Bonvolu konvinkiĝi, ke kampoj Servilo kaj Babilejo estas plenitaj aŭ "
+#~ "forigi tiun ĉi legosignon."
+
+#, fuzzy
+#~ msgid "Character not allowed"
+#~ msgstr "Kaŝnomo malpermesita: %s"
+
+#, fuzzy
+#~ msgid "Invalid Group Chat"
+#~ msgstr "Malkorekta babileja jabber-ID"
+
+#~ msgid "Unable to join group chat"
+#~ msgstr "Neeblas aliĝi al babilejo"
+
+#, fuzzy
+#~ msgid "You are banned from group chat <b>%s</b>."
+#~ msgstr "Al vi oni malpermesis esti en la babilejo."
+
+#, fuzzy
+#~ msgid "Remote server <b>%s</b> does not exist."
+#~ msgstr "Tiu babilejo ne ekzistas."
+
+#, fuzzy
+#~ msgid "Group chat <b>%s</b> does not exist."
+#~ msgstr "Tiu babilejo ne ekzistas."
+
+#, fuzzy
+#~ msgid "Group chat creation is not permitted."
+#~ msgstr "Babileja kreado limigitas."
+
+#, fuzzy
+#~ msgid "You must use your registered nickname in <b>%s</b>."
+#~ msgstr "Vi devas uzi vian registritan kaŝnomon."
+
+#, fuzzy
+#~ msgid "You are not in the members list in group chat %s."
+#~ msgstr "Vi ne ĉeestas en membrolisto."
+
+#, fuzzy
+#~ msgid "XMPP Address is not a group chat"
+#~ msgstr "Tio ne estas babilejo"
+
+#~ msgid "This is not a group chat"
+#~ msgstr "Tio ne estas babilejo"
+
+#, fuzzy
+#~ msgid "Please choose a group chat"
+#~ msgstr "Nova mesaĝo"
+
+#, fuzzy
+#~ msgid "Invalid Nickname"
+#~ msgstr "Malkorekta salutnomo"
+
+#, fuzzy
+#~ msgid "Please choose a nickname"
+#~ msgstr "Nova mesaĝo"
+
+#, fuzzy
+#~ msgid "Wrong server"
+#~ msgstr "Malprava uri"
+
+#, fuzzy
+#~ msgid "%s is not a group chat server"
+#~ msgstr "Tio ne estas babilejo"
+
+#, fuzzy
+#~ msgid "A Password is required to join the group chat %s. Please type it."
+#~ msgstr "Necesas pasvorto por aliĝi al la babilejo."
+
+#~ msgid "Not in Roster"
+#~ msgstr "Mankas en kontaktlisto"
+
+#~ msgid "I would like to add you to my roster"
+#~ msgstr "Mi volus aldoni vin en mian kontaktliston"
+
+#, fuzzy
+#~ msgid "Add to Roster"
+#~ msgstr "_Aldoni al kontaktlisto"
+
+#, fuzzy
+#~ msgid "Manage Room"
+#~ msgstr "Aranĝi legosignojn"
+
+#, fuzzy
+#~ msgid "Configure Room"
+#~ msgstr "Administri _babilejon"
+
+#, fuzzy
+#~ msgid "Destroy Room"
+#~ msgstr "Priskribo: %s"
+
+#, fuzzy
+#~ msgid "Change Nick"
+#~ msgstr "Ŝanĝi kaŝ_nomon"
+
+#, fuzzy
+#~ msgid "Disconnect"
+#~ msgstr "Kontakto malkonektita"
+
+#, fuzzy
+#~ msgid "Copy JID"
+#~ msgstr "Babilejo:"
+
+#, fuzzy
+#~ msgid "Add to Roster…"
+#~ msgstr "_Aldoni al kontaktlisto"
+
+#, fuzzy
+#~ msgid "Copy JID/Email"
+#~ msgstr "_Kopii JID/retpoŝtan adreson"
+
+#, fuzzy
+#~ msgid "JID: <i>%s</i>"
+#~ msgstr "Jabber-ID: <i>%s</i>"
+
+#~ msgid "Changing Subject"
+#~ msgstr "Korektas temon"
+
+#~ msgid "Please specify the new subject:"
+#~ msgstr "Bonvolu enigi novan temon:"
+
+#, fuzzy
+#~ msgid "You (%s) joined the room"
+#~ msgstr "%s aliĝis al la babilejo"
+
+#, fuzzy
+#~ msgid "Unable to join groupchat"
+#~ msgstr "Neeblas aliĝi al babilejo"
+
+#~ msgid "Groupchat Invitation"
+#~ msgstr "Babileja invitilo"
+
+#, fuzzy
+#~ msgid "%(jid)s has been invited in this room"
+#~ msgstr "%(nick)s estas elpelita de %(who)s: %(reason)s"
+
+#, fuzzy
+#~ msgid "JID is not a Groupchat"
+#~ msgstr "Tio ne estas babilejo"
+
+#~ msgid "Invalid JID"
+#~ msgstr "Malkorekta jabber-ID"
+
+#~ msgid "A connection is not available"
+#~ msgstr "Konekto mankas"
+
+#, fuzzy
+#~ msgid "JID already in list"
+#~ msgstr "Jabber-tujmesaĝilo"
+
+#, fuzzy
+#~ msgid "For the chosen encryption there is no encryption method available"
+#~ msgstr "Konekto mankas"
+
+#~ msgid "Removes contact from roster"
+#~ msgstr "Forigas kontakton el kontaktlisto"
+
+#~ msgid "Not in roster"
+#~ msgstr "Mankas en kontaktlisto"
+
+#, fuzzy
+#~ msgid "Contact signed in notification color."
+#~ msgstr "Montri eventon en _kontaktlisto"
+
+#, fuzzy
+#~ msgid "Contact signout notification color"
+#~ msgstr "Montri eventon en _kontaktlisto"
+
+#, fuzzy
+#~ msgid "File transfer request notification color."
+#~ msgstr "Mendo de dosiera transmeto"
+
+#, fuzzy
+#~ msgid "File transfer error notification color."
+#~ msgstr "Dosiera transmeto nuligitas"
+
+#, fuzzy
+#~ msgid "File transfer complete or stopped notification color."
+#~ msgstr ""
+#~ "Kiam dosiertransmeto estos plenumita, montri ŝprucfenestron kun avizo"
+
+#, fuzzy
+#~ msgid "Groupchat invitation notification color"
+#~ msgstr "Babileja invitilo"
+
+#~ msgid "Add * and [n] in roster title?"
+#~ msgstr "Ĉu aligi * kaj [n] al kontaktlisto titolo?"
+
+#~ msgid "Hides the banner in two persons chat window"
+#~ msgstr "Kaŝas rubandon en dupersona interparola fenestro"
+
+#, fuzzy
+#~ msgid ""
+#~ "Show the confirm metacontacts creation dialog or not? Empty string means "
+#~ "never show the dialog."
+#~ msgstr ""
+#~ "Ĉu ni montru la certigan dialogujon pri kreado de metakontaktoj aŭ ne? "
+#~ "Malplena linio signifas ke ni neniam monru la dialogujon."
+
+#, fuzzy
+#~ msgid "Language for which misspelled words will be checked"
+#~ msgstr "Lingvo por kiu ni volas kontroli mistajpajn vortojn"
+
+#~ msgid "I'm eating, so leave me a message."
+#~ msgstr "Mi manĝas, do restigu mesaĝon por mi."
+
+#, fuzzy
+#~ msgid "from room %s"
+#~ msgstr "Mi estas %s"
+
+#, fuzzy
+#~ msgid "Leave Groupchats"
+#~ msgstr "Nova babilejo"
+
+#, fuzzy
+#~ msgid "Auto Join"
+#~ msgstr "Aŭtomate aliĝi"
+
+#, fuzzy
+#~ msgid "Room"
+#~ msgstr "Babilejo:"
+
+#~ msgid "Jabber ID:"
+#~ msgstr "Jabber-ID:"
+
+#, fuzzy
+#~ msgid "Occupant Actions"
+#~ msgstr "_Agoj por babilanto"
+
+#~ msgid "_Add to Roster"
+#~ msgstr "_Aldoni al kontaktlisto"
+
+#, fuzzy
+#~ msgid "_Manage Room"
+#~ msgstr "Aranĝi legosignojn"
+
+#, fuzzy
+#~ msgid "Configure _Room..."
+#~ msgstr "Administri _babilejon"
+
+#, fuzzy
+#~ msgid "_Destroy Room"
+#~ msgstr "Priskribo: %s"
+
+#, fuzzy
+#~ msgid "Jabber ID"
+#~ msgstr "Jabber-ID:"
+
+#, fuzzy
+#~ msgid "account"
+#~ msgstr "Konto"
+
+#, fuzzy
+#~ msgid "Roster"
+#~ msgstr "Montri _kontaktliston"
+
+#, fuzzy
+#~ msgid "Show only in roster"
+#~ msgstr "Montri nur en _kontaktlisto"
+
+#, fuzzy
+#~ msgid "in _roster"
+#~ msgstr "Mankas en kontaktlisto"
+
+#, fuzzy
+#~ msgid "Roster Appearance"
+#~ msgstr "<b>Redakti regulon</b>"
+
+#, fuzzy
+#~ msgid "Show chatstate in roster"
+#~ msgstr "Montri kaŝ_bildetojn de kontaktojn en kontaktlisto"
+
+#, fuzzy
+#~ msgid "_Add to Roster..."
+#~ msgstr "_Aldoni al kontaktlisto"
+
+#~ msgid "_Jabber ID:"
+#~ msgstr "_Jabber-ID:"
+
+#, fuzzy
+#~ msgid "_Jabber ID"
+#~ msgstr "_Jabber-ID:"
+
+#~ msgid "JabberID"
+#~ msgstr "Jabber-ID"
+
+#, fuzzy
+#~ msgid "Show Roster"
+#~ msgstr "Montri _kontaktliston"
+
+#, fuzzy
+#~ msgid "MUC server"
+#~ msgstr "Rigardiloj"
+
+#~ msgid "Room Configuration"
+#~ msgstr "Agordo de babilejo"
+
+#~ msgid "Join _Group Chat"
+#~ msgstr "Eniri en babilejon"
+
+#, fuzzy
+#~ msgid "Audio sessions are not available"
+#~ msgstr "Konekto mankas"
+
+#~ msgid "Conference"
+#~ msgstr "Babilejoj"
+
+#, fuzzy
+#~ msgid "_Manage Bookmarks…"
+#~ msgstr "Aranĝi legosignojn"
+
+#, fuzzy
+#~ msgid "Hide _Roster"
+#~ msgstr "Mankas en kontaktlisto"
+
+#~ msgid "Show _Roster"
+#~ msgstr "Montri _kontaktliston"
+
+#, fuzzy
+#~ msgid "Invalid Room"
+#~ msgstr "Malkorekta rikordo"
+
+#, fuzzy
+#~ msgid "Invalid room"
+#~ msgstr "Malkorekta rikordo"
+
+#~ msgid "A GTK+ Jabber client"
+#~ msgstr "GTK+bazita jabber-kliento"
+
+#~ msgid "Changing Nickname"
+#~ msgstr "Ŝanĝas kaŝnomon"
+
+#~ msgid "Please specify the new nickname you want to use:"
+#~ msgstr "Bonvolu enigi la novan kaŝnomon, kiun vi volas uzi:"
+
+#~ msgid "Bookmark already set"
+#~ msgstr "Legosigno jam estas metita"
+
+#, fuzzy
+#~ msgid "Group Chat '%s' is already in your bookmarks."
+#~ msgstr "Babilejo \"%s\" jam estas en viajn legosignojn."
+
+#~ msgid "Bookmark has been added successfully"
+#~ msgstr "Legosigno sukcese aldonitas"
+
+#, fuzzy
+#~ msgid ""
+#~ "You can manage your bookmarks by clicking the Bookmarks menu item in your "
+#~ "contact list."
+#~ msgstr ""
+#~ "Vi povas aranĝi viajn legosignojn per menuero \"Agoj\" en la kontaktlisto."
+
+#, fuzzy
+#~ msgid "The nickname contains invalid characters."
+#~ msgstr "La babileja jabber-ID enhavas nepermesajn signojn."
+
+#, fuzzy
+#~ msgid "Bookmark Room"
+#~ msgstr "Starigi legosignon por tiu babilejo"
+
+#~ msgid "_Join New Group Chat"
+#~ msgstr "_Eniri babilejen"
+
+#, fuzzy
+#~ msgid "_Create Group Chat"
+#~ msgstr "Nova babilejo"
+
+#~ msgid "Name:"
+#~ msgstr "Nomo:"
+
+#, fuzzy
+#~ msgid "Description:"
+#~ msgstr "Priskribo: %s"
+
+#, fuzzy
+#~ msgid "Address:"
+#~ msgstr "_Adreso:"
+
+#, fuzzy
+#~ msgid "You can not start a new conversation unless you are connected."
+#~ msgstr "Vi ne povas aliĝi al babilejo dum vi estas senkonekta."
+
+#, fuzzy
+#~ msgid "Occupants"
+#~ msgstr "_Agoj por babilanto"
+
+#, fuzzy
+#~ msgid "File transfer error"
+#~ msgstr "Dosiertransmeta eraro"
+
+#, fuzzy
+#~ msgid "No Accounts available"
+#~ msgstr "Neniu konto disponeblas"
+
+#~ msgid "_Modify Account..."
+#~ msgstr "_Korekti konton..."
+
+#~ msgid "Boolean"
+#~ msgstr "Bulea"
+
+#~ msgid "Integer"
+#~ msgstr "Entjera"
+
+#~ msgid "Text"
+#~ msgstr "Teksto"
+
+#~ msgid "Value"
+#~ msgstr "Valoro"
+
+#~ msgid "Type"
+#~ msgstr "Datumtipo"
+
+#~ msgid "(None)"
+#~ msgstr "(Mankas)"
+
+#~ msgid "Hidden"
+#~ msgstr "Kaŝita"
+
+#~ msgid "Manage Proxy Profiles"
+#~ msgstr "Administri prokurservilajn agordojn"
+
+#, fuzzy
+#~ msgid "Properties"
+#~ msgstr "<b>Agordo</b>"
+
+#, fuzzy
+#~ msgid "Proxy _Host"
+#~ msgstr "Prokura servilo:"
+
+#, fuzzy
+#~ msgid "Proxy _Port"
+#~ msgstr "_Pordo:"
+
+#, fuzzy
+#~ msgid "New Groupchat"
+#~ msgstr "Nova babilejo"
+
+#, fuzzy
+#~ msgid "New Contact"
+#~ msgstr "Aldoni novan kontakton"
+
 #~ msgid "%s GiB"
 #~ msgstr "%s GiB"
 
@@ -11217,9 +11973,6 @@ msgstr "Konektado malsukcesis"
 #~ msgid "_Pause"
 #~ msgstr "_Paŭzi"
 
-#~ msgid "Clean _up"
-#~ msgstr "Malplenigi"
-
 #~ msgid "Remove file transfer from the list."
 #~ msgstr "Forigi dosiertransmeton el la listo."
 
@@ -11740,10 +12493,6 @@ msgstr "Konektado malsukcesis"
 #~ msgid "Nick"
 #~ msgstr "Kaŝnomo"
 
-#, fuzzy
-#~ msgid "Banning…"
-#~ msgstr "Malpermesas..."
-
 #~ msgid ""
 #~ "<b>Whom do you want to ban?</b>\n"
 #~ "\n"
@@ -11813,13 +12562,6 @@ msgstr "Konektado malsukcesis"
 #~ msgstr "Filtrilo:"
 
 #, fuzzy
-#~ msgid ""
-#~ "If checked, Gajim will display the mood of contacts in the roster window"
-#~ msgstr ""
-#~ "Se markitas, Gajim montros kaŝbildetojn de kontaktoj en kontaktlista "
-#~ "fenestro kaj en babilejoj"
-
-#, fuzzy
 #~ msgid "<b>Chat Appearance</b>"
 #~ msgstr "<b>Redakti regulon</b>"
 
@@ -12060,10 +12802,6 @@ msgstr "Konektado malsukcesis"
 #~ msgstr "_Statmesaĝo:"
 
 #, fuzzy
-#~ msgid "Group chat highlight"
-#~ msgstr "Emfazado de mesaĝoj en babilejo"
-
-#, fuzzy
 #~ msgid "Your nickname"
 #~ msgstr "Antaŭ kaŝnomo:"
 
@@ -12226,9 +12964,6 @@ msgstr "Konektado malsukcesis"
 #~ msgid "The passwords typed in both fields must be identical."
 #~ msgstr "En ambaŭ kampoj la pasvortoj devas esti identaj."
 
-#~ msgid "Enter new password:"
-#~ msgstr "Enigu novan pasvorton:"
-
 #~ msgid "Enter it again for confirmation:"
 #~ msgstr "Enigi ĝin denove por konfirmi:"
 
@@ -12244,10 +12979,6 @@ msgstr "Konektado malsukcesis"
 #~ msgstr "ordono pri abona fino de %s"
 
 #, fuzzy
-#~ msgid "Autojoin"
-#~ msgstr "Aŭtomate aliĝi"
-
-#, fuzzy
 #~ msgid "Homepage:"
 #~ msgstr "Hejmpaĝo:"
 
@@ -12336,9 +13067,6 @@ msgstr "Konektado malsukcesis"
 #~ msgid "Forward unread message then disconnect"
 #~ msgstr " %d nelegita mesaĝo"
 
-#~ msgid "AIM Address:"
-#~ msgstr "AIM-adreso:"
-
 #~ msgid "MSN Address:"
 #~ msgstr "MSN-adreso:"
 
@@ -12568,9 +13296,6 @@ msgstr "Konektado malsukcesis"
 #~ msgid "Server:"
 #~ msgstr "Servilo:"
 
-#~ msgid "Password:"
-#~ msgstr "Pasvorto:"
-
 #, fuzzy
 #~ msgid "Join this room _automatically when I connect"
 #~ msgstr "Aŭtomate aliĝi al ĉi tiu babilejo kiam vi konektitos"
@@ -12587,10 +13312,6 @@ msgstr "Konektado malsukcesis"
 #~ msgid "Requires gnome-network-manager"
 #~ msgstr "Historia administrilo"
 
-#, fuzzy
-#~ msgid "This contact does not support file transfer."
-#~ msgstr "Listo de aktivaj, plenumitaj kaj haltitaj dosiertransmetoj"
-
 #~ msgid ""
 #~ "You have to install %s dictionary to use spellchecking, or choose another "
 #~ "language by setting the speller_language option."
@@ -12852,9 +13573,6 @@ msgstr "Konektado malsukcesis"
 #~ msgid "_Edit Personal Information..."
 #~ msgstr "Korekti personan informon..."
 
-#~ msgid "Information about you, as stored in the server"
-#~ msgstr "Informo pri vi, kiel estas en la servilo"
-
 #~ msgid "<b>Personal Information</b>"
 #~ msgstr "<b>Persona informo</b>"
 
@@ -12895,13 +13613,6 @@ msgstr "Konektado malsukcesis"
 #~ msgid "Account Name Already Used"
 #~ msgstr "Kontnomo jam estas uzata"
 
-#~ msgid ""
-#~ "This name is already used by another of your accounts. Please choose "
-#~ "another name."
-#~ msgstr ""
-#~ "Tiu nomo jam estas uzata de alia el viaj kontoj. Bonvolu elekti alian "
-#~ "nomon."
-
 #~ msgid "Invalid account name"
 #~ msgstr "Malkorekta kontnomo"
 
@@ -12936,9 +13647,6 @@ msgstr "Konektado malsukcesis"
 #~ msgid "Your server can't save your personal information."
 #~ msgstr "Via servilo ne povas konservi vian personan informon."
 
-#~ msgid "Account Local already exists."
-#~ msgstr "Loka konto jam ekzistas."
-
 #~ msgid "Please rename or remove it before enabling link-local messaging."
 #~ msgstr "Bonvolu renomigi aŭ forigi ĝin antaŭ ebligi lig-lokan komunikadon."
 
@@ -13010,10 +13718,6 @@ msgstr "Konektado malsukcesis"
 #~ msgid "The following message was NOT encrypted"
 #~ msgstr "[Tiu ĉi mesaĝo estas ĉifrita]"
 
-#, fuzzy
-#~ msgid "Encryption used for this contact."
-#~ msgstr "Ĉu OpenPGP estas ŝaltita por tiu ĉi kontakto?"
-
 #~ msgid "Toggle Open_PGP Encryption"
 #~ msgstr "Baskuli Open_PGP-ĉifradon"
 
@@ -13082,10 +13786,6 @@ msgstr "Konektado malsukcesis"
 #~ msgid "Add _Contact..."
 #~ msgstr "_Aldoni kontakton..."
 
-#, fuzzy
-#~ msgid "_Accounts"
-#~ msgstr "Kontoj"
-
 #~ msgid "Profile, A_vatar"
 #~ msgstr "_Vizitkarto"
 
@@ -13282,14 +13982,6 @@ msgstr "Konektado malsukcesis"
 #~ msgstr "Ŝaltita"
 
 #, fuzzy
-#~ msgid "Join _Group Chat..."
-#~ msgstr "Eniri en babilejon"
-
-#, fuzzy
-#~ msgid "_Modify Account"
-#~ msgstr "Korekti konton"
-
-#, fuzzy
 #~ msgid "Check on startup if Gajim is the _default Jabber client"
 #~ msgstr "Ĉiam kontroli ĉu Gajim estas _defaŭlta jabber-kliento dum lanĉo"
 
@@ -13829,9 +14521,6 @@ msgstr "Konektado malsukcesis"
 #~ msgid "Nickname not found: %s"
 #~ msgstr "Kaŝnomo ne trovitas: %s"
 
-#~ msgid "This group chat has no subject"
-#~ msgstr "Tiu ĉi babilejo ne havas temon"
-
 #, fuzzy
 #~ msgid ""
 #~ "Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
@@ -13905,9 +14594,6 @@ msgstr "Konektado malsukcesis"
 #~ msgid "Your JID:"
 #~ msgstr "Via JID:"
 
-#~ msgid "_Host:"
-#~ msgstr "_Retnodo:"
-
 #~ msgid "Modify Account"
 #~ msgstr "Korekti konton"
 
@@ -14099,9 +14785,6 @@ msgstr "Konektado malsukcesis"
 #~ msgid "_Player:"
 #~ msgstr "_Ludilo:"
 
-#~ msgid "Address"
-#~ msgstr "Adreso"
-
 #~ msgid "Role:"
 #~ msgstr "Rolo:"
 
@@ -14154,9 +14837,6 @@ msgstr "Konektado malsukcesis"
 #~ msgid "Session Management support not available (missing gnome.ui module)"
 #~ msgstr "Subteno de seancagordo nedisponeblas (mankas modulo gnome.ui)"
 
-#~ msgid "Private Chat"
-#~ msgstr "Privata interparolo"
-
 #~ msgid "%s does not appear to be a valid JID"
 #~ msgstr "Tio ne estas valida JID: %s"
 
@@ -14227,9 +14907,6 @@ msgstr "Konektado malsukcesis"
 #~ msgid "Connection to host could not be established"
 #~ msgstr "Konekto kun retnodo neestableblas."
 
-#~ msgid "A_fter nickname:"
-#~ msgstr "Post kaŝnomo:"
-
 #~ msgid "_After time:"
 #~ msgstr "_Post tempo:"
 
diff --git a/po/es.po b/po/es.po
index e8600461f..207f6846b 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: 2019-07-02 02:06+0000\n"
+"POT-Creation-Date: 2019-08-11 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,70 +18,66 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: gajim/chat_control_base.py:550
+#: gajim/chat_control_base.py:557
 msgid "_Undo"
 msgstr "_Deshacer"
 
-#: gajim/chat_control_base.py:558 gajim/conversation_textview.py:529
+#: gajim/chat_control_base.py:565 gajim/conversation_textview.py:529
 msgid "_Clear"
 msgstr "_Limpiar"
 
-#: gajim/chat_control_base.py:563
+#: gajim/chat_control_base.py:570
 msgid "Paste as quote"
 msgstr ""
 
-#: gajim/chat_control_base.py:613
-#, fuzzy
+#: gajim/chat_control_base.py:620
 msgid "Paste Image"
-msgstr "Elegir Imagen"
+msgstr "Pegar Imagen"
 
-#: gajim/chat_control_base.py:614
-#, fuzzy
+#: gajim/chat_control_base.py:621
 msgid "You are trying to paste an image"
-msgstr "Estás a punto de cerrar varias pestañas"
+msgstr "Estás intentando pegar una imagen"
 
-#: gajim/chat_control_base.py:615
+#: gajim/chat_control_base.py:622
 #, fuzzy
 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:617 gajim/groupchat_control.py:2310
-#: gajim/roster_window.py:2848 gajim/roster_window.py:4167
-#: gajim/message_window.py:252 gajim/gtk/dialogs.py:418
+#: gajim/chat_control_base.py:624 gajim/groupchat_control.py:2218
+#: gajim/roster_window.py:2841 gajim/roster_window.py:4118
+#: gajim/message_window.py:359 gajim/gtk/dialogs.py:330
 #, fuzzy
 msgid "_Do not ask me again"
 msgstr "_No preguntarme otra vez"
 
-#: gajim/chat_control_base.py:620
+#: gajim/chat_control_base.py:627
 msgid "_Paste"
-msgstr ""
+msgstr "_Pegar"
 
-#: gajim/chat_control_base.py:1162 gajim/gtk/accounts.py:351
-#, fuzzy
+#: gajim/chat_control_base.py:1169 gajim/gtk/accounts.py:354
 msgid "Privacy"
-msgstr "Lista de privacidad"
+msgstr "Privacidad"
 
-#: gajim/chat_control_base.py:1163
+#: gajim/chat_control_base.py:1170
 msgid "Warning"
 msgstr "Advertencia"
 
-#: gajim/chat_control_base.py:1164
+#: gajim/chat_control_base.py:1171
 #, python-format
 msgid "If you send a file to <b>%s</b>, your real JID will be revealed."
 msgstr "Si envía un archivo a <b>%s</b>, se sabrá su JID real."
 
-#: gajim/chat_control_base.py:1169
-#, fuzzy
+#: gajim/chat_control_base.py:1176
 msgid "Continue"
-msgstr "_Continuar"
+msgstr "Continuar"
 
-#: gajim/gtkgui_helpers.py:163 gajim/gtk/filetransfer.py:393
+#: gajim/gtkgui_helpers.py:163 gajim/gtk/filetransfer.py:398
 #, fuzzy, python-format
 msgid "Cannot overwrite existing file '%s'"
 msgstr "No se puede sobreescribir el archivo existente \"%s\""
 
-#: gajim/gtkgui_helpers.py:164 gajim/gtk/filetransfer.py:394
+#: gajim/gtkgui_helpers.py:164 gajim/gtk/filetransfer.py:399
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
@@ -107,9 +103,8 @@ msgstr ""
 "¿Guardar como %(new_filename)s?"
 
 #: gajim/gtkgui_helpers.py:204
-#, fuzzy
 msgid "_Save"
-msgstr "Guardar _Como"
+msgstr "_Guardar"
 
 #: gajim/vcard.py:278
 msgid "?Client:Unknown"
@@ -178,379 +173,378 @@ msgstr "No hay ninguna suscripción pendiente."
 msgid " resource with priority "
 msgstr " recurso con prioridad "
 
-#: gajim/gui_menu_builder.py:96
-msgid "_New Group Chat"
-msgstr "_Nuevo grupo de charla"
+#: gajim/gui_menu_builder.py:251 gajim/gui_menu_builder.py:342
+#: gajim/chat_control.py:305 gajim/roster_window.py:783
+#: gajim/roster_window.py:1716 gajim/roster_window.py:1718
+#: gajim/roster_window.py:2027 gajim/roster_window.py:3292
+#: gajim/roster_window.py:3325 gajim/gui_interface.py:396
+#: gajim/common/contacts.py:222 gajim/common/contacts.py:359
+#: gajim/common/contacts.py:471 gajim/common/helpers.py:86
+#: gajim/common/helpers.py:317 gajim/gtk/add_contact.py:319
+#: gajim/gtk/subscription_request.py:70 gajim/gtk/subscription_request.py:99
+#: gajim/gtk/roster_item_exchange.py:112
+#, fuzzy
+msgid "Not in contact list"
+msgstr "Mostrar contactos desconectados"
 
-#: gajim/gui_menu_builder.py:289 gajim/gui_menu_builder.py:380
-#: gajim/chat_control.py:303 gajim/roster_window.py:786
-#: gajim/roster_window.py:1719 gajim/roster_window.py:1721
-#: gajim/roster_window.py:2030 gajim/roster_window.py:3336
-#: gajim/roster_window.py:3369 gajim/gui_interface.py:413
-#: gajim/common/contacts.py:206 gajim/common/contacts.py:343
-#: gajim/common/helpers.py:83 gajim/common/helpers.py:311
-#: gajim/gtk/add_contact.py:319 gajim/gtk/subscription_request.py:70
-#: gajim/gtk/subscription_request.py:99 gajim/gtk/roster_item_exchange.py:112
-msgid "Not in Roster"
-msgstr "no está en el roster"
-
-#: gajim/gui_menu_builder.py:393
-msgid "I would like to add you to my roster"
-msgstr "Me gustaría añadirte a mi lista de contactos"
+#: gajim/gui_menu_builder.py:355
+#, fuzzy
+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:471
+#: gajim/gui_menu_builder.py:433
 #, fuzzy
 msgid "Send Single _Message…"
 msgstr "Enviar mensaje"
 
-#: gajim/gui_menu_builder.py:486
+#: gajim/gui_menu_builder.py:448
 #, fuzzy
 msgid "E_xecute Command…"
 msgstr "_Ejecutar comando"
 
-#: gajim/gui_menu_builder.py:494
+#: gajim/gui_menu_builder.py:456
 msgid "_Manage Transport"
 msgstr "_Gestionar transporte"
 
-#: gajim/gui_menu_builder.py:500
+#: gajim/gui_menu_builder.py:462
 msgid "_Modify Transport"
 msgstr "_Modificar transporte"
 
-#: gajim/gui_menu_builder.py:507 gajim/roster_window.py:5046
-#, fuzzy
+#: gajim/gui_menu_builder.py:469 gajim/roster_window.py:4985
 msgid "_Rename…"
-msgstr "Renombrar"
+msgstr "_Renombrar…"
 
-#: gajim/gui_menu_builder.py:518 gajim/roster_window.py:5062
-#: gajim/roster_window.py:5177 gajim/data/gui/blocked_contacts_window.ui:52
+#: gajim/gui_menu_builder.py:480 gajim/roster_window.py:5001
+#: gajim/roster_window.py:5116 gajim/data/gui/blocked_contacts_window.ui:52
 #: gajim/data/gui/gc_occupants_menu.ui:148
 #: gajim/data/gui/contact_context_menu.ui:143
 msgid "_Unblock"
 msgstr "_Desbloquear"
 
-#: gajim/gui_menu_builder.py:521 gajim/roster_window.py:5067
-#: gajim/roster_window.py:5181 gajim/data/gui/gc_occupants_menu.ui:140
+#: gajim/gui_menu_builder.py:483 gajim/roster_window.py:5006
+#: gajim/roster_window.py:5120 gajim/data/gui/gc_occupants_menu.ui:140
 #: gajim/data/gui/contact_context_menu.ui:151
 msgid "_Block"
 msgstr "_Bloquear"
 
-#: gajim/gui_menu_builder.py:529 gajim/roster_window.py:5074
+#: gajim/gui_menu_builder.py:491 gajim/roster_window.py:5013
 #: gajim/data/gui/contact_context_menu.ui:181
 msgid "Remo_ve"
 msgstr "_Eliminar"
 
-#: gajim/gui_menu_builder.py:539 gajim/data/gui/contact_context_menu.ui:198
+#: gajim/gui_menu_builder.py:501 gajim/data/gui/contact_context_menu.ui:198
 msgid "_Information"
 msgstr "_Información"
 
-#: gajim/gui_menu_builder.py:552
+#: gajim/gui_menu_builder.py:514
 msgid "Save _As"
 msgstr "Guardar _Como"
 
-#: gajim/gui_menu_builder.py:564 gajim/groupchat_control.py:501
-#: gajim/chat_control.py:340
-#, fuzzy
+#: gajim/gui_menu_builder.py:526 gajim/groupchat_control.py:507
+#: gajim/chat_control.py:342
 msgid "Send File…"
-msgstr "Enviar archivo"
+msgstr "Enviar archivo…"
 
-#: gajim/gui_menu_builder.py:565
+#: gajim/gui_menu_builder.py:527
 msgid "Upload File…"
 msgstr "Subir archivo..."
 
-#: gajim/gui_menu_builder.py:566
-#, fuzzy
+#: gajim/gui_menu_builder.py:528
 msgid "Send File Directly…"
-msgstr "Guardar archivo como..."
+msgstr "Enviar archivo directamente..."
 
-#: gajim/gui_menu_builder.py:568 gajim/gui_menu_builder.py:632
+#: gajim/gui_menu_builder.py:530 gajim/gui_menu_builder.py:596
 #, fuzzy
 msgid "Send Chatstate"
 msgstr "Último estado"
 
-#: gajim/gui_menu_builder.py:569
+#: gajim/gui_menu_builder.py:531
 #, fuzzy
 msgid "Invite Contacts"
 msgstr "Invitar _Contactos"
 
-#: gajim/gui_menu_builder.py:570
+#: gajim/gui_menu_builder.py:532
 #, fuzzy
-msgid "Add to Roster"
-msgstr "_Añadir a la lista de contactos"
-
-#: gajim/gui_menu_builder.py:571
-msgid "Audio Session"
-msgstr ""
+msgid "Add to Contact List"
+msgstr "_Añadir contacto..."
 
-#: gajim/gui_menu_builder.py:572
-msgid "Video Session"
-msgstr ""
+#: gajim/gui_menu_builder.py:533
+#, fuzzy
+msgid "Voice Chat"
+msgstr "Petición de transferencia de archivo"
 
-#: gajim/gui_menu_builder.py:573
+#: gajim/gui_menu_builder.py:534
 #, fuzzy
+msgid "Video Chat"
+msgstr "Tamaño del vídeo"
+
+#: gajim/gui_menu_builder.py:535 gajim/gui_menu_builder.py:582
 msgid "Information"
-msgstr "_Información"
+msgstr "Información"
 
-#: gajim/gui_menu_builder.py:574 gajim/gui_menu_builder.py:639
+#: gajim/gui_menu_builder.py:536 gajim/gui_menu_builder.py:602
 #: gajim/data/gui/application_menu.ui:37
-#, fuzzy
 msgid "History"
-msgstr "_Histórico"
+msgstr "Historial"
 
-#: gajim/gui_menu_builder.py:580 gajim/gui_menu_builder.py:687
+#: gajim/gui_menu_builder.py:542 gajim/gui_menu_builder.py:650
 #: gajim/data/gui/preferences_window.ui:1823
 msgid "Disabled"
 msgstr "Deshabilitado"
 
-#: gajim/gui_menu_builder.py:581 gajim/gui_menu_builder.py:688
+#: gajim/gui_menu_builder.py:543 gajim/gui_menu_builder.py:651
 #, fuzzy
 msgid "Composing only"
 msgstr "Componiendo"
 
-#: gajim/gui_menu_builder.py:582 gajim/gui_menu_builder.py:689
+#: gajim/gui_menu_builder.py:544 gajim/gui_menu_builder.py:652
 #, fuzzy
 msgid "All chat states"
 msgstr "Todos los estados"
 
-#: gajim/gui_menu_builder.py:620
+#: gajim/gui_menu_builder.py:583
 #, fuzzy
-msgid "Manage Room"
-msgstr "_Gestionar salón"
+msgid "Manage Group Chat"
+msgstr "Abandonar grupos de charla"
 
-#: gajim/gui_menu_builder.py:621
+#: gajim/gui_menu_builder.py:584 gajim/data/gui/groupchat_control.ui:649
 #, fuzzy
 msgid "Change Subject"
 msgstr "Cambiar el _tema"
 
-#: gajim/gui_menu_builder.py:622
+#: gajim/gui_menu_builder.py:585
 #, fuzzy
-msgid "Configure Room"
-msgstr "Configurar el salón"
+msgid "Configure Group Chat"
+msgstr "Abandonar grupos de charla"
 
-#: gajim/gui_menu_builder.py:623
+#: gajim/gui_menu_builder.py:586
 #, fuzzy
 msgid "Upload Avatar…"
 msgstr "Elegir Imagen"
 
-#: gajim/gui_menu_builder.py:624
+#: gajim/gui_menu_builder.py:587
 #, fuzzy
-msgid "Destroy Room"
-msgstr "_Desmantelar salón"
+msgid "Destroy Group Chat"
+msgstr "Nuevo grupo de charla"
 
-#: gajim/gui_menu_builder.py:626 gajim/data/gui/preferences_window.ui:790
-#, fuzzy
+#: gajim/gui_menu_builder.py:589 gajim/data/gui/preferences_window.ui:790
 msgid "Chat Settings"
-msgstr "Atajos de conversaciones"
+msgstr "Preferencias de conversación"
 
-#: gajim/gui_menu_builder.py:627
+#: gajim/gui_menu_builder.py:590
 msgid "Show join/leave"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:628
+#: gajim/gui_menu_builder.py:591
 #, fuzzy
 msgid "Show status changes"
 msgstr "_Registrar cambios de estado de los contactos"
 
-#: gajim/gui_menu_builder.py:629 gajim/data/gui/gc_control_popup_menu.ui:72
+#: gajim/gui_menu_builder.py:592 gajim/data/gui/gc_control_popup_menu.ui:72
 #, fuzzy
 msgid "Notify on all messages"
 msgstr "Mensajes predefinidos:"
 
-#: gajim/gui_menu_builder.py:630
+#: gajim/gui_menu_builder.py:593
 #, fuzzy
 msgid "Minimize on close"
 msgstr "_Minimizar al cerrar"
 
-#: gajim/gui_menu_builder.py:631
+#: gajim/gui_menu_builder.py:595
 #, fuzzy
-msgid "Minimize on autojoin"
+msgid "Minimize when joining automatically"
 msgstr "Minimizar al ingresar automáticamente"
 
-#: gajim/gui_menu_builder.py:634
+#: gajim/gui_menu_builder.py:598
 msgid "Sync Threshold"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:635
-#, fuzzy
-msgid "Change Nick"
-msgstr "Cambiar _Alias"
+#: gajim/gui_menu_builder.py:599
+msgid "Change Nickname"
+msgstr "Cambiar alias"
 
-#: gajim/gui_menu_builder.py:636
-#, fuzzy
-msgid "Bookmark Room"
-msgstr "Añadir este salón a marcadores (Ctrl+B)"
-
-#: gajim/gui_menu_builder.py:637
+#: gajim/gui_menu_builder.py:600
 #, fuzzy
 msgid "Request Voice"
 msgstr "_Voz"
 
-#: gajim/gui_menu_builder.py:638 gajim/roster_window.py:5246
+#: gajim/gui_menu_builder.py:601 gajim/roster_window.py:5185
 #, fuzzy
 msgid "Execute command"
 msgstr "_Ejecutar comando"
 
-#: gajim/gui_menu_builder.py:640
-#, fuzzy
-msgid "Disconnect"
-msgstr "_Desconectar"
+#: gajim/gui_menu_builder.py:603
+msgid "Leave"
+msgstr "Abandonar"
 
-#: gajim/gui_menu_builder.py:678 gajim/gtk/preferences.py:156
+#: gajim/gui_menu_builder.py:641 gajim/gtk/preferences.py:155
 msgid "No threshold"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:680 gajim/gtk/preferences.py:158
+#: gajim/gui_menu_builder.py:643 gajim/gtk/preferences.py:157
 #, python-format
 msgid "%i day"
 msgid_plural "%i days"
-msgstr[0] "%i día"
-msgstr[1] "%i días"
-
-#: gajim/gui_menu_builder.py:709 gajim/gui_menu_builder.py:747
-#: gajim/gtk/join_groupchat.py:43
-msgid "Join Group Chat"
-msgstr "Entrar a un salón de chat"
+msgstr[0] "hace %i día"
+msgstr[1] "hace %i días"
 
-#: gajim/gui_menu_builder.py:746
-#, fuzzy
+#: gajim/gui_menu_builder.py:672
 msgid "Add Contact…"
-msgstr "_Añadir contacto..."
+msgstr "Añadir contacto..."
 
-#: gajim/gui_menu_builder.py:748 gajim/gtk/profile.py:52
-#: gajim/gtk/accounts.py:770 gajim/gtk/accounts.py:808
+#: gajim/gui_menu_builder.py:673 gajim/gtk/profile.py:52
+#: gajim/gtk/accounts.py:773 gajim/gtk/accounts.py:811
 msgid "Profile"
 msgstr "Perfil"
 
-#: gajim/gui_menu_builder.py:749
-#, fuzzy
-msgid "Discover Services"
-msgstr "_Descubrir servicios"
-
-#: gajim/gui_menu_builder.py:750
+#: gajim/gui_menu_builder.py:674
 #, fuzzy
 msgid "Send Single Message…"
 msgstr "Enviar mensaje"
 
-#: gajim/gui_menu_builder.py:751 gajim/data/gui/preferences_window.ui:2741
+#: gajim/gui_menu_builder.py:675
+msgid "Discover Services"
+msgstr "Descubrir servicios"
+
+#: gajim/gui_menu_builder.py:676 gajim/gtk/server_info.py:36
+msgid "Server Info"
+msgstr "Información del Servidor"
+
+#: gajim/gui_menu_builder.py:677 gajim/data/gui/preferences_window.ui:2741
 msgid "Advanced"
 msgstr "Avanzado"
 
-#: gajim/gui_menu_builder.py:752 gajim/gtk/mam_preferences.py:88
+#: gajim/gui_menu_builder.py:678 gajim/gtk/mam_preferences.py:88
 #, fuzzy
 msgid "Archiving Preferences"
 msgstr "_Preferencias"
 
-#: gajim/gui_menu_builder.py:753
+#: gajim/gui_menu_builder.py:679
 #, fuzzy
 msgid "Blocking List"
 msgstr "Lista de expulsión"
 
-#: gajim/gui_menu_builder.py:754 gajim/gtk/history_sync.py:108
+#: gajim/gui_menu_builder.py:680
+#, fuzzy
+msgid "Bookmarks"
+msgstr "_Marcador"
+
+#: gajim/gui_menu_builder.py:681
+#, fuzzy
+msgid "PEP Configuration"
+msgstr "Configuración del salón"
+
+#: gajim/gui_menu_builder.py:682 gajim/gtk/history_sync.py:108
 #: gajim/gtk/history_sync.py:186
 #, fuzzy
 msgid "Synchronise History"
 msgstr "Sincronizar"
 
-#: gajim/gui_menu_builder.py:755 gajim/gtk/privacy_list.py:427
+#: gajim/gui_menu_builder.py:683 gajim/gtk/privacy_list.py:427
 msgid "Privacy Lists"
 msgstr "Listas de privacidad"
 
-#: gajim/gui_menu_builder.py:756 gajim/gtk/server_info.py:36
-msgid "Server Info"
-msgstr "Información del Servidor"
-
-#: gajim/gui_menu_builder.py:757 gajim/gui_menu_builder.py:768
+#: gajim/gui_menu_builder.py:685 gajim/gui_menu_builder.py:696
 #: gajim/data/gui/xml_console_window.ui:77
 msgid "XML Console"
 msgstr "Consola XML"
 
-#: gajim/gui_menu_builder.py:759 gajim/data/gui/groupchat_config.ui:36
+#: gajim/gui_menu_builder.py:687 gajim/data/gui/groupchat_config.ui:36
 #, fuzzy
 msgid "Admin"
 msgstr "_Administrar"
 
-#: gajim/gui_menu_builder.py:760
+#: gajim/gui_menu_builder.py:688
 #, fuzzy
 msgid "Send Server Message…"
 msgstr "_Enviar mensaje de servidor"
 
-#: gajim/gui_menu_builder.py:761
+#: gajim/gui_menu_builder.py:689
 #, fuzzy
 msgid "Set MOTD…"
 msgstr "Definir MOTD..."
 
-#: gajim/gui_menu_builder.py:762
+#: gajim/gui_menu_builder.py:690
 #, fuzzy
 msgid "Update MOTD…"
 msgstr "Actualizar MOTD..."
 
-#: gajim/gui_menu_builder.py:763
+#: gajim/gui_menu_builder.py:691
 #, fuzzy
 msgid "Delete MOTD…"
 msgstr "Eliminar MOTD"
 
-#: gajim/gui_menu_builder.py:812
+#: gajim/gui_menu_builder.py:736
 #, fuzzy
-msgid "No Accounts available"
-msgstr "Cuenta no disponible"
+msgid "_Add Account…"
+msgstr "_Añadir contacto..."
+
+#: gajim/gui_menu_builder.py:742
+msgid "_Modify Accounts…"
+msgstr "_Modificar cuentas…"
 
-#: gajim/gui_menu_builder.py:823 gajim/data/gui/application_menu.ui:5
-#: gajim/data/gui/application_menu.ui:71 gajim/data/gui/shortcuts_window.ui:182
-#: gajim/gtk/accounts.py:58
+#: gajim/gui_menu_builder.py:751 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:755 gajim/data/gui/application_menu.ui:5
+#: gajim/data/gui/shortcuts_window.ui:182 gajim/gtk/accounts.py:57
 msgid "Accounts"
 msgstr "Cuentas"
 
-#: gajim/gui_menu_builder.py:881 gajim/gui_menu_builder.py:886
-msgid "Copy JID"
-msgstr "Copiar JID"
+#: gajim/gui_menu_builder.py:784 gajim/gui_menu_builder.py:789
+#, fuzzy
+msgid "Copy XMPP Address"
+msgstr "_Copiar la dirección de correo/ID de Jabber"
 
-#: gajim/gui_menu_builder.py:882 gajim/gui_menu_builder.py:914
+#: gajim/gui_menu_builder.py:785 gajim/gui_menu_builder.py:817
 msgid "Join Groupchat"
 msgstr "Unirse al grupo de charla"
 
-#: gajim/gui_menu_builder.py:887 gajim/gui_menu_builder.py:913
-#: gajim/data/gui/application_menu.ui:76
+#: gajim/gui_menu_builder.py:790 gajim/gui_menu_builder.py:816
+#: gajim/data/gui/application_menu.ui:71
 #: gajim/data/gui/subscription_request_window.ui:106
 msgid "Start Chat"
 msgstr "Iniciar conversación"
 
-#: gajim/gui_menu_builder.py:888 gajim/gui_menu_builder.py:915
+#: gajim/gui_menu_builder.py:791 gajim/gui_menu_builder.py:818
 #, fuzzy
-msgid "Add to Roster…"
-msgstr "_Añadir a la lista de contactos"
+msgid "Add to Contact List…"
+msgstr "_Añadir contacto..."
 
-#: gajim/gui_menu_builder.py:893
+#: gajim/gui_menu_builder.py:796
 msgid "Copy Link Location"
 msgstr "Copiar la dirección del enlace"
 
-#: gajim/gui_menu_builder.py:894
+#: gajim/gui_menu_builder.py:797
 msgid "Open Link in Browser"
 msgstr "Abrir enlace en navegador"
 
-#: gajim/gui_menu_builder.py:899
+#: gajim/gui_menu_builder.py:802
 #, fuzzy
 msgid "Copy Email Address"
 msgstr "_Copiar la dirección de correo/ID de Jabber"
 
-#: gajim/gui_menu_builder.py:900 gajim/gui_menu_builder.py:912
+#: gajim/gui_menu_builder.py:803 gajim/gui_menu_builder.py:815
 #, fuzzy
 msgid "Open Email Composer"
 msgstr "_Abrir el compositor de correo"
 
-#: gajim/gui_menu_builder.py:905
-#, fuzzy
+#: gajim/gui_menu_builder.py:808
 msgid "Copy Location"
-msgstr "Copiar la dirección del enlace"
+msgstr "Copiar ubicación"
 
-#: gajim/gui_menu_builder.py:906
-#, fuzzy
+#: gajim/gui_menu_builder.py:809
 msgid "Show Location"
-msgstr "Notificaciones"
+msgstr "Mostrar la ubicación"
 
-#: gajim/gui_menu_builder.py:911
-msgid "Copy JID/Email"
-msgstr "Copiar JID/dirección de correo"
+#: gajim/gui_menu_builder.py:814
+#, fuzzy
+msgid "Copy XMPP Address/Email"
+msgstr "_Copiar la dirección de correo/ID de Jabber"
 
-#: gajim/gui_menu_builder.py:945
+#: gajim/gui_menu_builder.py:852
 #, fuzzy
 msgid "Copy"
 msgstr "Copiar JID"
@@ -561,9 +555,8 @@ msgid "Usage:"
 msgstr "mensaje"
 
 #: gajim/history_manager.py:72
-#, fuzzy
 msgid "Options:"
-msgstr "_Emoticonos:"
+msgstr "Opciones:"
 
 #: gajim/history_manager.py:74
 msgid "Show this help message and exit"
@@ -573,44 +566,56 @@ msgstr "Mostrar este mensaje de ayuda y salir"
 msgid "Choose folder for logfile"
 msgstr ""
 
-#: gajim/history_manager.py:107
+#: gajim/history_manager.py:106
 msgid "Cannot find history logs database"
 msgstr "No se puede encontrar la base de datos del historial"
 
-#: gajim/history_manager.py:108
+#: gajim/history_manager.py:107
 #, python-format
 msgid "%s does not exist."
 msgstr "%s no existe."
 
-#: gajim/history_manager.py:141 gajim/history_manager.py:195
-#: gajim/gtk/discovery.py:829 gajim/gtk/roster_item_exchange.py:80
-msgid "JID"
-msgstr "JID"
+#: gajim/history_manager.py:140 gajim/history_manager.py:194
+#: 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:30
+#: gajim/gtk/accounts.py:804
+#, fuzzy
+msgid "XMPP Address"
+msgstr "Dirección AIM:"
 
-#: gajim/history_manager.py:154 gajim/history_manager.py:202
+#: gajim/history_manager.py:153 gajim/history_manager.py:201
 #: gajim/data/gui/history_window.ui:89 gajim/gtk/history.py:108
 msgid "Date"
 msgstr "Fecha"
 
-#: gajim/history_manager.py:161 gajim/history_manager.py:225
+#: gajim/history_manager.py:160 gajim/history_manager.py:224
 #: gajim/data/gui/join_groupchat_window.ui:208
 #: gajim/data/gui/profile_window.ui:214
 #: gajim/data/gui/vcard_information_window.ui:443
+#: gajim/data/gui/bookmarks.ui:140
 msgid "Nickname"
 msgstr "Alias"
 
-#: gajim/history_manager.py:172 gajim/history_manager.py:211
+#: gajim/history_manager.py:171 gajim/history_manager.py:210
 #: gajim/data/gui/preferences_window.ui:1344
 #: gajim/data/gui/single_message_window.ui:275 gajim/gtk/history.py:117
 msgid "Message"
 msgstr "Mensaje"
 
-#: gajim/history_manager.py:180 gajim/history_manager.py:218
+#: gajim/history_manager.py:179 gajim/history_manager.py:217
 #: gajim/data/gui/groups_post_window.ui:49
 #: gajim/data/gui/single_message_window.ui:214
 msgid "Subject"
 msgstr "Tema"
 
+#: gajim/history_manager.py:247
+#, fuzzy
+msgid "Database Cleanup"
+msgstr "Error en la base de datos"
+
 #: gajim/history_manager.py:248
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
@@ -621,61 +626,54 @@ msgstr ""
 
 #: gajim/history_manager.py:250
 msgid ""
-"Normally allocated database size will not be freed, it will just become "
-"reusable. If you really want to reduce database filesize, click YES, else "
-"click NO.\n"
-"\n"
-"In case you click YES, please wait…"
+"Normally, the allocated database size will not be freed, it will just become "
+"reusable. This operation may take a while."
 msgstr ""
 "Normalmente el tamaño asignado a la base de datos no es liberado, "
-"simplemente vuelve a ser reutilizable. Si realmente quieres reducir el "
-"tamaño de la base de datos, elige SÍ, en caso contrario, elige NO.\n"
-"\n"
-"En caso de elegir SÍ, por favor, espera…"
+"simplemente vuelve a ser reutilizable. Esta operación puede tardar un poco."
 
 #: gajim/history_manager.py:255
-#, fuzzy
-msgid "Database Cleanup"
-msgstr "Error en la base de datos"
+msgid "_Cleanup"
+msgstr "Limpieza"
 
-#: gajim/history_manager.py:519 gajim/gtk/filetransfer.py:238
-#: gajim/gtk/filetransfer.py:248
+#: gajim/history_manager.py:518 gajim/gtk/filetransfer.py:237
+#: gajim/gtk/filetransfer.py:247
 msgid "You"
 msgstr "Tú"
 
-#: gajim/history_manager.py:531
+#: gajim/history_manager.py:530
 #, 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:568 gajim/history_manager.py:607
-#: gajim/gtk/dialogs.py:58 gajim/gtk/themes.py:319
+#: gajim/history_manager.py:567 gajim/history_manager.py:606
+#: gajim/gtk/dialogs.py:57 gajim/gtk/themes.py:319
 #: gajim/gtk/roster_item_exchange.py:75 gajim/gtk/roster_item_exchange.py:185
 msgid "Delete"
 msgstr "Eliminar"
 
-#: gajim/history_manager.py:569
+#: gajim/history_manager.py:568
 #, fuzzy
 msgid "Delete Conversation"
 msgid_plural "Delete Conversations"
 msgstr[0] "Cancelar información"
 msgstr[1] "Cancelar información"
 
-#: gajim/history_manager.py:570
+#: gajim/history_manager.py:569
 #, 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 eliminar permanentemente esta conversación con <b>%s</b>?"
 msgstr[1] "¿Quieres eliminar permanentemente estas conversaciones?"
 
-#: gajim/history_manager.py:608
+#: gajim/history_manager.py:607
 #, fuzzy
 msgid "Delete Message"
 msgid_plural "Delete Messages"
 msgstr[0] "Mensajes por defecto"
 msgstr[1] "Mensajes por defecto"
 
-#: gajim/history_manager.py:609
+#: gajim/history_manager.py:608
 #, fuzzy
 msgid "Do you want to permanently delete this message"
 msgid_plural "Do you want to permanently delete these messages"
@@ -688,15 +686,15 @@ msgid "Contact name: <i>%s</i>"
 msgstr "Nombre del contacto : <i>%s</i>"
 
 #: gajim/dialogs.py:84
-#, fuzzy, python-format
-msgid "JID: <i>%s</i>"
-msgstr "ID de Jabber : <i>%s</i>"
+#, python-format
+msgid "XMPP Address: <i>%s</i>"
+msgstr ""
 
-#: gajim/dialogs.py:115 gajim/dialogs.py:128 gajim/roster_window.py:2901
-#: gajim/roster_window.py:3833 gajim/roster_window.py:5084
-#: gajim/common/contacts.py:157 gajim/common/contacts.py:190
+#: gajim/dialogs.py:115 gajim/dialogs.py:128 gajim/roster_window.py:2894
+#: gajim/roster_window.py:3784 gajim/roster_window.py:5023
+#: gajim/common/contacts.py:157 gajim/common/contacts.py:206
 #: gajim/data/gui/preferences_window.ui:558
-#: gajim/data/gui/shortcuts_window.ui:177 gajim/gtk/accounts.py:349
+#: gajim/data/gui/shortcuts_window.ui:177 gajim/gtk/accounts.py:352
 msgid "General"
 msgstr "General"
 
@@ -729,9 +727,8 @@ msgid "Status Message"
 msgstr "Mensaje de estado"
 
 #: gajim/dialogs.py:697
-#, fuzzy
 msgid "Overwrite"
-msgstr "¿Sobreescribir?"
+msgstr "Sobrescribir"
 
 #: gajim/dialogs.py:698
 msgid "Overwrite Status Message?"
@@ -742,7 +739,7 @@ msgstr "¿Sobreescribir mensaje de estado?"
 msgid "Preset name is already in use. Do you want to overwrite this preset?"
 msgstr "Este nombre ya se usa. ¿Quieres sobreescribir este mensaje de estado?."
 
-#: gajim/dialogs.py:703
+#: gajim/dialogs.py:703 gajim/plugins/gui.py:292
 #, fuzzy
 msgid "_Overwrite"
 msgstr "¿Sobreescribir?"
@@ -755,9 +752,7 @@ msgstr "Guardar como mensaje de estado predefinido"
 msgid "Please type a name for this status message"
 msgstr "Escribe un nombre para este mensaje de estado"
 
-#: gajim/dialogs.py:740 gajim/gui_interface.py:1441 gajim/dialog_messages.py:31
-#: gajim/gtk/discovery.py:518 gajim/gtk/profile.py:323
-#: gajim/gtk/join_groupchat.py:234
+#: gajim/dialogs.py:740 gajim/gtk/discovery.py:517 gajim/gtk/profile.py:323
 msgid "You are not connected to the server"
 msgstr "No estás conectado al servidor"
 
@@ -765,9 +760,11 @@ msgstr "No estás conectado al servidor"
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Sin una conexión, no puedes sincronizar tus contactos."
 
-#: gajim/dialogs.py:752 gajim/dialogs.py:823 gajim/gtk/discovery.py:822
-#: gajim/gtk/discovery.py:1648 gajim/gtk/discovery.py:1941
-#: gajim/gtk/history.py:99 gajim/gtk/roster_item_exchange.py:83
+#: gajim/dialogs.py:752 gajim/dialogs.py:823
+#: gajim/data/gui/groupchat_info_scrolled.ui:16 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/gtk/roster_item_exchange.py:83
 msgid "Name"
 msgstr "Nombre"
 
@@ -787,395 +784,342 @@ msgstr "No puedes sincronizar con una cuenta hasta que no te hayas conectado."
 msgid "Synchronise"
 msgstr "Sincronizar"
 
-#: gajim/dialogs.py:1043
+#: gajim/dialogs.py:1042
 msgid "an audio and video"
 msgstr "un audio con vídeo"
 
-#: gajim/dialogs.py:1045
+#: gajim/dialogs.py:1044
 msgid "an audio"
 msgstr "un audio"
 
-#: gajim/dialogs.py:1047
+#: gajim/dialogs.py:1046
 msgid "a video"
 msgstr "un vídeo"
 
-#: gajim/dialogs.py:1051
+#: gajim/dialogs.py:1050
 #, python-format
 msgid ""
-"%(contact)s wants to start %(type)s session with you. Do you want to answer "
+"%(contact)s wants to start a %(type)s chat with you. Do you want to answer "
 "the call?"
 msgstr ""
 
-#: gajim/groupchat_control.py:505
+#: gajim/groupchat_control.py:511
 #, python-format
 msgid "Send File (max. %s MiB)…"
 msgstr "Enviar archivo (max. %s MiB)…"
 
-#: gajim/groupchat_control.py:507 gajim/chat_control.py:342
+#: gajim/groupchat_control.py:513 gajim/chat_control.py:344
 #, fuzzy
 msgid "No File Transfer available"
 msgstr "Transferencias"
 
-#: gajim/groupchat_control.py:630 gajim/groupchat_control.py:2349
-msgid "Changing Subject"
-msgstr "Cambiando el tema"
-
-#: gajim/groupchat_control.py:631 gajim/groupchat_control.py:2350
-msgid "Please specify the new subject:"
-msgstr "Especifica el nuevo tema:"
-
-#: gajim/groupchat_control.py:638
-msgid "Changing Nickname"
-msgstr "Cambiando alias"
-
-#: gajim/groupchat_control.py:639
-msgid "Please specify the new nickname you want to use:"
-msgstr "Especifica el nuevo alias que quieres usar:"
-
-#: gajim/groupchat_control.py:657
+#: gajim/groupchat_control.py:655
 #, fuzzy
-msgid "Invalid group chat JID"
+msgid "Invalid group chat XMPP Address"
 msgstr "ID de Jabber no válida para el grupo de charla"
 
-#: gajim/groupchat_control.py:658
+#: gajim/groupchat_control.py:656
 #, fuzzy
-msgid "The group chat JID has not allowed characters."
+msgid "The group chat XMPP Address has not allowed characters."
 msgstr ""
 "La ID de Jabber para el grupo de charla tiene caracteres no permitidos."
 
-#: gajim/groupchat_control.py:758 gajim/gtk/profile.py:136
+#: gajim/groupchat_control.py:743 gajim/gtk/profile.py:136
 msgid "Could not load image"
 msgstr "No se pudo cargar la imagen"
 
-#: gajim/groupchat_control.py:888
+#: gajim/groupchat_control.py:873
 msgid "Insert Nickname"
 msgstr "Insertar alias"
 
-#: gajim/groupchat_control.py:1056 gajim/chat_control.py:824
+#: gajim/groupchat_control.py:1041 gajim/chat_control.py:848
 msgid "and authenticated"
 msgstr "y autentificado"
 
-#: gajim/groupchat_control.py:1060 gajim/chat_control.py:828
+#: gajim/groupchat_control.py:1045 gajim/chat_control.py:852
 msgid "and NOT authenticated"
 msgstr "y NO autenticado"
 
-#: gajim/groupchat_control.py:1064
+#: gajim/groupchat_control.py:1049
 #, python-format
 msgid "%(type)s encryption is active %(authenticated)s."
 msgstr "El cifrado %(type)s está activo %(authenticated)s."
 
-#: gajim/groupchat_control.py:1111
+#: gajim/groupchat_control.py:1096
 msgid "Conversation with "
 msgstr "Conversación con "
 
-#: gajim/groupchat_control.py:1113
+#: gajim/groupchat_control.py:1098
 msgid "Continued conversation"
 msgstr "Conversación continuada"
 
-#: gajim/groupchat_control.py:1411
+#: gajim/groupchat_control.py:1357
 #, 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:1433
+#: gajim/groupchat_control.py:1374
 #, fuzzy
-msgid "Room now shows unavailable members"
+msgid "Group chat now shows unavailable members"
 msgstr "El salón ahora muestra miembros no disponibles"
 
-#: gajim/groupchat_control.py:1436
+#: gajim/groupchat_control.py:1377
 #, fuzzy
-msgid "Room now does not show unavailable members"
+msgid "Group chat now does not show unavailable members"
 msgstr "el salón ahora no muestra miembros no disponibles"
 
-#: gajim/groupchat_control.py:1439
+#: gajim/groupchat_control.py:1380
 msgid "A setting not related to privacy has been changed"
 msgstr ""
 
-#: gajim/groupchat_control.py:1446
-msgid "Room logging is now enabled"
-msgstr "Ha sido activado el registro del salón"
+#: gajim/groupchat_control.py:1387 gajim/groupchat_control.py:1659
+#, fuzzy
+msgid "Conversations are stored on the server"
+msgstr "La NO SERÁ registrada"
 
-#: gajim/groupchat_control.py:1449
-msgid "Room logging is now disabled"
-msgstr "El salón está ahora deshabilitado"
+#: gajim/groupchat_control.py:1390
+#, fuzzy
+msgid "Conversations are not stored on the server"
+msgstr "Información acerca de tí a guardar en el servidor"
 
-#: gajim/groupchat_control.py:1452
-msgid "Room is now non-anonymous"
+#: gajim/groupchat_control.py:1393
+#, fuzzy
+msgid "Group chat is now non-anonymous"
 msgstr "El salón es ahora no-anónimo"
 
-#: gajim/groupchat_control.py:1456
-msgid "Room is now semi-anonymous"
+#: gajim/groupchat_control.py:1397
+#, fuzzy
+msgid "Group chat is now semi-anonymous"
 msgstr "El salón es ahora semi-anónimo"
 
-#: gajim/groupchat_control.py:1460
+#: gajim/groupchat_control.py:1401
 #, fuzzy
-msgid "Room is now fully anonymous"
+msgid "Group chat is now fully anonymous"
 msgstr "El salón es ahora completamente anónimo"
 
-#: gajim/groupchat_control.py:1500
+#: gajim/groupchat_control.py:1439
 #, fuzzy, python-format
 msgid "Ping? (%s)"
 msgstr "Pong! (%s s.)"
 
-#: gajim/groupchat_control.py:1503
+#: gajim/groupchat_control.py:1442
 #, python-format
 msgid "Pong! (%(nick)s %(delay)s s.)"
 msgstr "¡Pong! (%(nick)s %(delay)s s.)"
 
-#: gajim/groupchat_control.py:1506 gajim/chat_control.py:1213
+#: gajim/groupchat_control.py:1445 gajim/chat_control.py:1237
 msgid "Error."
 msgstr "Error."
 
-#: gajim/groupchat_control.py:1711
+#: gajim/groupchat_control.py:1650
 #, fuzzy, python-format
-msgid "You (%s) joined the room"
+msgid "You (%s) joined the group chat"
 msgstr "%s ha entrado en el grupo de charla"
 
-#: gajim/groupchat_control.py:1717
-msgid "Any occupant is allowed to see your full JID"
+#: gajim/groupchat_control.py:1655
+#, fuzzy
+msgid "Any participant is allowed to see your full XMPP Address"
 msgstr "Cualquier ocupante puede ver tu JID completo"
 
-#: gajim/groupchat_control.py:1721
-msgid "Room logging is enabled"
-msgstr "Registro del salón activado"
-
-#: gajim/groupchat_control.py:1725
-msgid "The server has assigned or modified your roomnick"
+#: gajim/groupchat_control.py:1663
+#, fuzzy
+msgid "The server has assigned or modified your nickname in this group chat"
 msgstr "El servidor ha asignado o modificado tu alias en el salón"
 
-#: gajim/groupchat_control.py:1732
-msgid "A new room has been created"
+#: gajim/groupchat_control.py:1671
+#, fuzzy
+msgid "A new group chat has been created"
 msgstr "Se ha creado un nuevo salón"
 
-#: gajim/groupchat_control.py:1740 gajim/privatechat_control.py:112
+#: gajim/groupchat_control.py:1679 gajim/privatechat_control.py:115
 #, python-format
 msgid "You are now known as %s"
 msgstr "Eres ahora conocido como %s"
 
-#: gajim/groupchat_control.py:1742 gajim/privatechat_control.py:114
+#: gajim/groupchat_control.py:1681 gajim/privatechat_control.py:117
 #, python-brace-format
 msgid "{nick} is now known as {new_nick}"
 msgstr "{nick} es ahora conocido como {new_nick}"
 
-#: gajim/groupchat_control.py:1767 gajim/privatechat_control.py:141
+#: gajim/groupchat_control.py:1706 gajim/privatechat_control.py:144
 #, python-brace-format
 msgid "You are now {show}{status}"
 msgstr "Ahora eres {show}{status}"
 
-#: gajim/groupchat_control.py:1773 gajim/privatechat_control.py:147
+#: gajim/groupchat_control.py:1712 gajim/privatechat_control.py:150
 #, python-brace-format
 msgid "{nick} is now {show}{status}"
 msgstr "{nick} es ahora {show}{status}"
 
-#: gajim/groupchat_control.py:1790 gajim/groupchat_control.py:1819
-#: gajim/groupchat_control.py:1849 gajim/groupchat_control.py:1909
+#: gajim/groupchat_control.py:1729 gajim/groupchat_control.py:1758
+#: gajim/groupchat_control.py:1788 gajim/groupchat_control.py:1848
 #, python-brace-format
 msgid " by {actor}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1793
+#: gajim/groupchat_control.py:1732
 #, python-brace-format
 msgid "** Your Affiliation has been set to {affiliation}{actor}{reason}"
 msgstr "** Tu afiliación ha sido establecida a {affiliation}{actor}{reason}"
 
-#: gajim/groupchat_control.py:1799
+#: gajim/groupchat_control.py:1738
 #, python-brace-format
 msgid "** Affiliation of {nick} has been set to {affiliation}{actor}{reason}"
 msgstr ""
 "** La afiliación de {nick} ha sido establecida a {affiliation}{actor}{reason}"
 
-#: gajim/groupchat_control.py:1822
+#: gajim/groupchat_control.py:1761
 #, python-brace-format
 msgid "** Your Role has been set to {role}{actor}{reason}"
 msgstr "** Tu rol de ha sido establecido a {role}{actor}{reason}"
 
-#: gajim/groupchat_control.py:1827
+#: gajim/groupchat_control.py:1766
 #, python-brace-format
 msgid "** Role of {nick} has been set to {role}{actor}{reason}"
 msgstr "** El rol de {nick} ha sido establecido a {role}{actor}{reason}"
 
-#: gajim/groupchat_control.py:1852
-#, python-brace-format
-msgid "You have been removed from the room{actor}{reason}"
+#: gajim/groupchat_control.py:1791
+#, fuzzy, python-brace-format
+msgid "You have been removed from the group chat{actor}{reason}"
 msgstr "Has sido eliminado de la sala {actor}{reason}"
 
-#: gajim/groupchat_control.py:1857
+#: gajim/groupchat_control.py:1796
 #, python-brace-format
 msgid "You have left due to an error{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1863
+#: gajim/groupchat_control.py:1802
 #, python-brace-format
 msgid "You have been kicked{actor}{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1870
+#: gajim/groupchat_control.py:1809
 #, python-brace-format
 msgid "You have been banned{actor}{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1877 gajim/groupchat_control.py:1943
+#: gajim/groupchat_control.py:1816 gajim/groupchat_control.py:1882
 #, fuzzy
 msgid ": Affiliation changed"
 msgstr "cambió la afiliación"
 
-#: gajim/groupchat_control.py:1883 gajim/groupchat_control.py:1948
+#: gajim/groupchat_control.py:1822 gajim/groupchat_control.py:1887
 #, fuzzy
-msgid ": Room configuration changed to members-only"
+msgid ": Group chat configuration changed to members-only"
 msgstr "la configuración del salón cambió a sólo miembros"
 
-#: gajim/groupchat_control.py:1912
-#, python-brace-format
-msgid "{nick} has been removed from the room{by}{reason}"
+#: gajim/groupchat_control.py:1851
+#, fuzzy, python-brace-format
+msgid "{nick} has been removed from the group chat{by}{reason}"
 msgstr "{nick} ha sido eliminado de la sala {by}{reason}"
 
-#: gajim/groupchat_control.py:1922
+#: gajim/groupchat_control.py:1861
 #, python-brace-format
 msgid "{nick} has left due to an error{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1928
+#: gajim/groupchat_control.py:1867
 #, python-brace-format
 msgid "{nick} has been kicked{actor}{reason}"
 msgstr "{nick} ha sido expulsado {actor}{reason}"
 
-#: gajim/groupchat_control.py:1936
+#: gajim/groupchat_control.py:1875
 #, python-brace-format
 msgid "{nick} has been banned{actor}{reason}"
 msgstr "{nick} ha sido vetado {actor}{reason}"
 
-#: gajim/groupchat_control.py:1953
+#: gajim/groupchat_control.py:1892
 #, python-brace-format
 msgid "{nick} has left{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1970
+#: gajim/groupchat_control.py:1914
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s ha entrado en el grupo de charla"
 
-#: gajim/groupchat_control.py:1985 gajim/groupchat_control.py:1990
-#: gajim/groupchat_control.py:1995 gajim/groupchat_control.py:2000
-#: gajim/groupchat_control.py:2011
-msgid "Unable to join group chat"
-msgstr "No se pudo entrar al grupo de charla"
-
-#: gajim/groupchat_control.py:1986
-#, python-format
-msgid "You are banned from group chat <b>%s</b>."
-msgstr "Estás baneado del grupo de charla <b>%s</b>-"
-
-#: gajim/groupchat_control.py:1991
-#, python-format
-msgid "Remote server <b>%s</b> does not exist."
-msgstr "El servidor remoto <b>%s</b> no existe."
-
-#: gajim/groupchat_control.py:1996
-#, python-format
-msgid "Group chat <b>%s</b> does not exist."
-msgstr "El grupo de charla <b>%s</b> no existe."
-
-#: gajim/groupchat_control.py:2001
+#: gajim/groupchat_control.py:1981
 #, fuzzy
-msgid "Group chat creation is not permitted."
-msgstr "La creación de grupos de charla está restringida."
-
-#: gajim/groupchat_control.py:2005
-#, fuzzy
-msgid "Unable to join groupchat"
-msgstr "No se pudo entrar al grupo de charla"
-
-#: gajim/groupchat_control.py:2006
-#, python-format
-msgid "You must use your registered nickname in <b>%s</b>."
-msgstr "Debe usar su alias registrado en <b>%s</b>."
-
-#: gajim/groupchat_control.py:2012
-#, python-format
-msgid "You are not in the members list in groupchat %s."
-msgstr "No estás en la lista de miembros del grupo de charla %s."
-
-#: gajim/groupchat_control.py:2068
-msgid "Room has been destroyed"
+msgid "Group chat has been destroyed"
 msgstr "El salón ha sido destruido"
 
-#: gajim/groupchat_control.py:2073
+#: gajim/groupchat_control.py:1986
 #, fuzzy, python-format
-msgid "You can join this room instead: xmpp:%s?join"
+msgid "You can join this group chat instead: xmpp:%s?join"
 msgstr "Puedes unirte a este salón en su lugar: %s"
 
-#: gajim/groupchat_control.py:2306
+#: gajim/groupchat_control.py:2214
 #, fuzzy
 msgid "Leave Group Chat"
 msgstr "Abandonar grupos de charla"
 
-#: gajim/groupchat_control.py:2307
+#: gajim/groupchat_control.py:2215
 msgid "Are you sure you want to leave this group chat?"
 msgstr "¿Estás seguro de querer abandonar este grupo?"
 
-#: gajim/groupchat_control.py:2308
-#, python-format
-msgid "If you close this window, you will be disconnected from '%s'."
+#: gajim/groupchat_control.py:2216
+#, fuzzy, python-format
+msgid "If you close this window, you will leave '%s'."
 msgstr "Si cierras esta ventana, serás desconectado de '%s'."
 
-#: gajim/groupchat_control.py:2314
+#: gajim/groupchat_control.py:2222 gajim/roster_window.py:5177
 msgid "_Leave"
 msgstr ""
 
-#: gajim/groupchat_control.py:2377
+#: gajim/groupchat_control.py:2280 gajim/roster_window.py:3008
 #, fuzzy, python-format
 msgid "%(jid)s has been invited to this group chat"
 msgstr "%(jid)s ha sido invitado en esta sala"
 
-#: gajim/groupchat_control.py:2527
+#: gajim/groupchat_control.py:2463
 #, python-format
 msgid "Kicking %s"
 msgstr "Expulsando a %s"
 
-#: gajim/groupchat_control.py:2528 gajim/groupchat_control.py:2829
+#: gajim/groupchat_control.py:2464 gajim/groupchat_control.py:2765
 msgid "You may specify a reason below:"
 msgstr "Debes especificar un motivo debajo:"
 
-#: gajim/groupchat_control.py:2828
+#: gajim/groupchat_control.py:2764
 #, python-format
 msgid "Banning %s"
 msgstr "Expulsando a %s"
 
-#: gajim/chat_control.py:408
+#: gajim/chat_control.py:432
 msgid "Show a list of formattings"
 msgstr "Mostrar una lista de formateos"
 
-#: gajim/chat_control.py:412
+#: gajim/chat_control.py:436
 #, fuzzy
 msgid "This contact does not support HTML"
 msgstr "Este contacto no soporta transferencia de archivos"
 
-#: gajim/chat_control.py:562
+#: gajim/chat_control.py:586
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr ""
 
-#: gajim/chat_control.py:686
+#: gajim/chat_control.py:710
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s del salón %(room_name)s"
 
-#: gajim/chat_control.py:832
+#: gajim/chat_control.py:856
 #, fuzzy, python-format
 msgid "%(type)s encryption is active %(authenticated)s"
 msgstr "El cifrado %(type)s está activo %(authenticated)s."
 
-#: gajim/chat_control.py:1160 gajim/chat_control.py:1168
+#: gajim/chat_control.py:1184 gajim/chat_control.py:1192
 #, fuzzy
 msgid "Close"
 msgstr "_Enviar y Cerrar"
 
-#: gajim/chat_control.py:1161
+#: gajim/chat_control.py:1185
 #, fuzzy, python-format
 msgid "You just received a new message from %s"
 msgstr "Acabas de recibir un nuevo mensaje de \"%s\""
 
-#: gajim/chat_control.py:1163
+#: gajim/chat_control.py:1187
 #, fuzzy
 msgid ""
 "If you close this tab while having chat history disabled, this message will "
@@ -1184,16 +1128,16 @@ msgstr ""
 "Si cierras esta pestaña y tienes el regstro desactivado, este mensaje se "
 "perderá."
 
-#: gajim/chat_control.py:1208
+#: gajim/chat_control.py:1232
 msgid "Ping?"
 msgstr "Ping?"
 
-#: gajim/chat_control.py:1211
+#: gajim/chat_control.py:1235
 #, fuzzy, python-format
 msgid "Pong! (%s seconds)"
 msgstr "Pong! (%s s.)"
 
-#: gajim/chat_control.py:1308
+#: gajim/chat_control.py:1332
 #, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -1202,271 +1146,279 @@ msgstr ""
 "Tema: %(subject)s\n"
 "%(message)s"
 
-#: gajim/chat_control.py:1416
+#: gajim/chat_control.py:1440
 #, python-format
 msgid "%(name)s is now %(show)s %(status)s"
 msgstr "%(name)s está ahora %(show)s %(status)s"
 
-#: gajim/chat_control.py:1476 gajim/data/gui/application_menu.ui:32
+#: gajim/chat_control.py:1500 gajim/data/gui/application_menu.ui:32
 #: gajim/gtk/http_upload_progress.py:35
 #, fuzzy
 msgid "File Transfer"
 msgstr "Transferencias"
 
-#: gajim/chat_control.py:1480
+#: gajim/chat_control.py:1504
 #, fuzzy
 msgid "Size"
 msgstr "Tamaño: "
 
-#: gajim/chat_control.py:1482 gajim/chat_control.py:1546
+#: gajim/chat_control.py:1506 gajim/chat_control.py:1566
+#: gajim/gui_interface.py:190
 #: gajim/data/gui/groupchat_invitation_received.ui:77
-#: gajim/gtk/filetransfer.py:485
+#: gajim/gtk/filetransfer.py:490
 #, fuzzy
 msgid "_Accept"
 msgstr "Aceptar"
 
-#: gajim/chat_control.py:1484 gajim/chat_control.py:1548
+#: gajim/chat_control.py:1508 gajim/chat_control.py:1568
 #: gajim/data/gui/groupchat_invitation_received.ui:62
 #, fuzzy
 msgid "_Decline"
 msgstr "D_esconectado"
 
-#: gajim/chat_control.py:1506 gajim/gui_interface.py:791
-#: gajim/gui_interface.py:821 gajim/gui_interface.py:847
+#: gajim/chat_control.py:1530 gajim/gui_interface.py:777
+#: gajim/gui_interface.py:807 gajim/gui_interface.py:833
 #: gajim/gtk/notification.py:173 gajim/gtk/notification.py:278
 msgid "File Transfer Completed"
 msgstr "Transferencia del archivo finalizada"
 
-#: gajim/chat_control.py:1510 gajim/gtk/filetransfer.py:259
+#: gajim/chat_control.py:1534 gajim/gtk/filetransfer.py:258
 #, fuzzy
 msgid "Open _Folder"
 msgstr "Abrir la _carpeta contenedora"
 
-#: gajim/chat_control.py:1512 gajim/chat_control.py:1521
+#: gajim/chat_control.py:1536 gajim/chat_control.py:1545
+#: gajim/data/gui/groupchat_control.ui:962
+#: gajim/data/gui/groupchat_control.ui:1049
+#: gajim/data/gui/groupchat_control.ui:1155
 #, fuzzy
 msgid "_Close"
 msgstr "_Enviar y Cerrar"
 
-#: gajim/chat_control.py:1543 gajim/gui_interface.py:484
+#: gajim/chat_control.py:1563 gajim/gui_interface.py:473
+#: gajim/data/gui/groupchat_invitation_received.ui:42
 #: gajim/gtk/notification.py:174 gajim/gtk/notification.py:195
 #: gajim/gtk/notification.py:281
-msgid "Groupchat Invitation"
+#, fuzzy
+msgid "Group Chat Invitation"
 msgstr "Invitación a grupo de charla"
 
-#: gajim/chat_control.py:1568 gajim/roster_window.py:1954
+#: gajim/chat_control.py:1588 gajim/roster_window.py:1951
 msgid "Remote contact stopped transfer"
 msgstr "El contacto remoto detuvo la transferencia"
 
-#: gajim/chat_control.py:1570 gajim/roster_window.py:1956
+#: gajim/chat_control.py:1590 gajim/roster_window.py:1953
 msgid "Error opening file"
 msgstr "Error abriendo el archivo:"
 
-#: gajim/chat_control.py:1572 gajim/gtk/filetransfer.py:297
+#: gajim/chat_control.py:1592 gajim/gtk/filetransfer.py:296
 msgid "File transfer stopped"
 msgstr "Transferencia del archivo detenida"
 
-#: gajim/chat_control.py:1575 gajim/gtk/filetransfer.py:275
-#: gajim/gtk/filetransfer.py:284
+#: gajim/chat_control.py:1595 gajim/gtk/filetransfer.py:274
+#: gajim/gtk/filetransfer.py:283
 msgid "File transfer cancelled"
 msgstr "Transferencia de archivo cancelada"
 
-#: gajim/chat_control.py:1576
+#: gajim/chat_control.py:1596
 msgid "Connection with peer cannot be established."
 msgstr "La conexión con el cliente no se pudo establecer."
 
-#: gajim/application.py:72
+#: gajim/application.py:75
 #, fuzzy
 msgid "Show the application's version"
 msgstr "Usar icono en el á_rea de notificación"
 
-#: gajim/application.py:79
+#: gajim/application.py:82
 #, fuzzy
 msgid "Show only critical errors"
 msgstr "Sólo mostrar en la _lista de contactos"
 
-#: gajim/application.py:86
+#: gajim/application.py:89
 msgid "Separate profile files completely (even history database and plugins)"
 msgstr ""
 
-#: gajim/application.py:94
+#: gajim/application.py:97
 msgid "Print XML stanzas and other debug information"
 msgstr ""
 
-#: gajim/application.py:101
+#: gajim/application.py:104
 #, fuzzy
 msgid "Use defined profile in configuration directory"
 msgstr "Editor avanzado de configurción"
 
-#: gajim/application.py:109
+#: gajim/application.py:112
 #, fuzzy
 msgid "Set configuration directory"
 msgstr "Configuración del salón"
 
-#: gajim/application.py:117
+#: gajim/application.py:120
 msgid "Configure logging system"
 msgstr ""
 
-#: gajim/application.py:125
+#: gajim/application.py:128
 #, fuzzy
 msgid "Show all warnings"
 msgstr "Mostrar todos los _eventos pendientes"
 
-#: gajim/application.py:132
+#: gajim/application.py:135
 msgid "Open IPython shell"
 msgstr ""
 
-#: gajim/application.py:139
+#: gajim/application.py:142
 msgid "Pops up a window with the next pending event"
 msgstr "Levanta una venana con el siguiente evento pendiente"
 
-#: gajim/application.py:145 gajim/data/gui/shortcuts_window.ui:203
+#: gajim/application.py:148 gajim/data/gui/shortcuts_window.ui:203
 #: data/org.gajim.Gajim.desktop.in:21
 #, fuzzy
 msgid "Start a new chat"
 msgstr "Iniciar conversación"
 
-#: gajim/application.py:152
+#: gajim/application.py:155
 msgid "Simulate loss of connectivity"
 msgstr ""
 
-#: gajim/application.py:159
+#: gajim/application.py:162
 msgid "Simulate regaining connectivity"
 msgstr ""
 
-#: gajim/application.py:201 gajim/gui_interface.py:133
+#: gajim/application.py:204 gajim/gui_interface.py:133
 msgid "Database Error"
 msgstr "Error en la base de datos"
 
-#: gajim/roster_window.py:294 gajim/roster_window.py:1030
+#: gajim/roster_window.py:291 gajim/roster_window.py:1027
 msgid "Merged accounts"
 msgstr "Cuentas combinadas"
 
-#: gajim/roster_window.py:853 gajim/roster_window.py:1631
-#: gajim/roster_window.py:1664 gajim/roster_window.py:1715
-#: gajim/roster_window.py:1717 gajim/roster_window.py:1872
-#: gajim/roster_window.py:2531 gajim/roster_window.py:5025
-#: gajim/common/contacts.py:188 gajim/common/contacts.py:447
-#: gajim/common/helpers.py:83 gajim/gtk/discovery.py:129
-#: gajim/gtk/discovery.py:130 gajim/gtk/discovery.py:1416
+#: gajim/roster_window.py:850 gajim/roster_window.py:1628
+#: gajim/roster_window.py:1661 gajim/roster_window.py:1712
+#: gajim/roster_window.py:1714 gajim/roster_window.py:1869
+#: gajim/roster_window.py:2528 gajim/roster_window.py:4331
+#: gajim/roster_window.py:4964 gajim/common/contacts.py:204
+#: gajim/common/contacts.py:463 gajim/common/helpers.py:86
+#: gajim/gtk/discovery.py:127 gajim/gtk/discovery.py:128
+#: gajim/gtk/discovery.py:1414
 msgid "Transports"
 msgstr "Transportes"
 
-#: gajim/roster_window.py:1723 gajim/roster_window.py:1725
-#: gajim/roster_window.py:4995 gajim/gui_interface.py:1613
-#: gajim/gui_interface.py:1639 gajim/common/contacts.py:186
-#: gajim/common/helpers.py:83 gajim/common/modules/adhoc_commands.py:245
-msgid "Groupchats"
+#: gajim/roster_window.py:1720 gajim/roster_window.py:1722
+#: gajim/roster_window.py:4331 gajim/roster_window.py:4934
+#: gajim/gui_interface.py:1527 gajim/common/contacts.py:202
+#: gajim/common/helpers.py:86 gajim/common/modules/adhoc_commands.py:245
+#, fuzzy
+msgid "Group chats"
 msgstr "Grupos de charla"
 
-#: gajim/roster_window.py:2012
+#: gajim/roster_window.py:2009
 #, fuzzy
 msgid "Authorization sent"
 msgstr "La autorización ha sido enviada"
 
-#: gajim/roster_window.py:2013
+#: gajim/roster_window.py:2010
 #, fuzzy, python-format
 msgid "\"%s\" will now see your status."
 msgstr "Ahora \"%s\" podrá saber tu estado."
 
-#: gajim/roster_window.py:2031
+#: gajim/roster_window.py:2028
 msgid "Subscription request has been sent"
 msgstr "La petición de subscripción ha sido enviada"
 
-#: gajim/roster_window.py:2032
-#, python-format
-msgid "If \"%s\" accepts this request you will know his or her status."
+#: gajim/roster_window.py:2029
+#, fuzzy, python-format
+msgid "If \"%s\" accepts this request you will know their status."
 msgstr "Si \"%s\" acepta esta petición podrás saber su estado."
 
-#: gajim/roster_window.py:2046
+#: gajim/roster_window.py:2043
 #, fuzzy
 msgid "Authorization removed"
 msgstr "La autorización ha sido eliminada"
 
-#: gajim/roster_window.py:2047
+#: gajim/roster_window.py:2044
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Ahora \"%s\" siempre te verá desconectado."
 
-#: gajim/roster_window.py:2250 gajim/roster_window.py:3504
+#: gajim/roster_window.py:2247 gajim/roster_window.py:3460
 msgid "Disconnect for Invisibility"
 msgstr ""
 
-#: gajim/roster_window.py:2251 gajim/roster_window.py:3505
+#: gajim/roster_window.py:2248 gajim/roster_window.py:3461
 msgid "You are participating in one or more group chats"
 msgstr "Estás participando en uno o más grupos de charla"
 
-#: gajim/roster_window.py:2252 gajim/roster_window.py:3506
+#: gajim/roster_window.py:2249 gajim/roster_window.py:3462
+#, fuzzy
 msgid ""
-"Changing your status to invisible will result in disconnection from those "
-"group chats.\n"
+"Changing your status to invisible will result in you leaving those group "
+"chats.\n"
 "Are you sure you want to go invisible?"
 msgstr ""
 "Cambiar tu estado a invisible provocará tu desconexión de los grupos de "
 "charla.\n"
 "¿Estás seguro de querer ser invisible?"
 
-#: gajim/roster_window.py:2257 gajim/roster_window.py:3512
-#: gajim/roster_window.py:5238 gajim/data/gui/gc_control_popup_menu.ui:120
+#: gajim/roster_window.py:2254 gajim/roster_window.py:3468
+#: gajim/data/gui/gc_control_popup_menu.ui:120
 msgid "_Disconnect"
 msgstr "_Desconectar"
 
-#: gajim/roster_window.py:2285
+#: gajim/roster_window.py:2282
 #, fuzzy
 msgid "desynced"
 msgstr "desincronizado"
 
-#: gajim/roster_window.py:2353 gajim/data/gui/shortcuts_window.ui:224
-#, fuzzy
+#: gajim/roster_window.py:2350 gajim/data/gui/shortcuts_window.ui:224
 msgid "Quit Gajim"
-msgstr "Gajim"
+msgstr "Salir de Gajim"
 
-#: gajim/roster_window.py:2354
+#: gajim/roster_window.py:2351
 #, fuzzy
 msgid "You are about to quit Gajim"
 msgstr "¿Estás seguro de que quieres cerrar Gajim?"
 
-#: gajim/roster_window.py:2355
+#: gajim/roster_window.py:2352
 msgid "Are you sure you want to quit Gajim?"
 msgstr "¿Estás seguro de que quieres cerrar Gajim?"
 
-#: gajim/roster_window.py:2356
+#: gajim/roster_window.py:2353
 #, fuzzy
 msgid "_Always quit when closing Gajim"
 msgstr "Siempre cerrar Gajim"
 
-#: gajim/roster_window.py:2359 gajim/roster_window.py:2455
-#: gajim/roster_window.py:2495 gajim/data/gui/systray_context_menu.ui:90
+#: gajim/roster_window.py:2356 gajim/roster_window.py:2452
+#: gajim/roster_window.py:2492 gajim/data/gui/systray_context_menu.ui:83
 #, fuzzy
 msgid "_Quit"
 msgstr "_Salir"
 
-#: gajim/roster_window.py:2448
+#: gajim/roster_window.py:2445
 #, fuzzy
 msgid "Stop File Transfers"
 msgstr "Detener la transferencia"
 
-#: gajim/roster_window.py:2449
+#: gajim/roster_window.py:2446
 #, fuzzy
 msgid "You still have running file transfers"
 msgstr "Cancela la transferencia"
 
-#: gajim/roster_window.py:2450
+#: gajim/roster_window.py:2447
 msgid ""
 "If you quit now, the file(s) being transferred will be lost.\n"
 "Do you still want to quit?"
 msgstr ""
 
-#: gajim/roster_window.py:2488
+#: gajim/roster_window.py:2485
 #, fuzzy
 msgid "Unread Messages"
 msgstr "Eventos sin leer"
 
-#: gajim/roster_window.py:2489
+#: gajim/roster_window.py:2486
 #, fuzzy
 msgid "You still have unread messages"
 msgstr "Tienes mensajes sin leer"
 
-#: gajim/roster_window.py:2490
+#: gajim/roster_window.py:2487
 #, fuzzy
 msgid ""
 "Messages will only be available for reading them later if storing chat "
@@ -1475,20 +1427,20 @@ msgstr ""
 "Los mensajes sólo estarán disponibles para lectura posterior si tienes el "
 "histórico activado y el contacto está en tu roster."
 
-#: gajim/roster_window.py:2760
+#: gajim/roster_window.py:2753
 msgid "You have unread messages"
 msgstr "Tienes mensajes sin leer"
 
-#: gajim/roster_window.py:2761
+#: gajim/roster_window.py:2754
 msgid "You must read them before removing this transport."
 msgstr "Debes leerlos antes de eliminar este transporte."
 
-#: gajim/roster_window.py:2764
+#: gajim/roster_window.py:2757
 #, fuzzy, python-format
 msgid "Transport '%s' will be removed"
 msgstr "El transporte \"%s\" será eliminado"
 
-#: gajim/roster_window.py:2765
+#: gajim/roster_window.py:2758
 #, fuzzy
 msgid ""
 "You will no longer be able to send and receive messages from and to contacts "
@@ -1496,11 +1448,11 @@ msgid ""
 msgstr ""
 "Ya no podrás enviar y recibir mensajes de contactos que usen este transporte"
 
-#: gajim/roster_window.py:2768
+#: gajim/roster_window.py:2761
 msgid "Transports will be removed"
 msgstr "Los transportes serán eliminados"
 
-#: gajim/roster_window.py:2773
+#: gajim/roster_window.py:2766
 #, python-format
 msgid ""
 "You will no longer be able to send and receive messages from and to contacts "
@@ -1511,85 +1463,80 @@ msgstr ""
 "transportes:\n"
 "%s"
 
-#: gajim/roster_window.py:2777
+#: gajim/roster_window.py:2770
 #, fuzzy
 msgid "Remove Transport"
 msgstr "Mostrar Trans_portes"
 
-#: gajim/roster_window.py:2844
+#: gajim/roster_window.py:2837
 #, fuzzy
 msgid "Block Contact"
 msgstr "Contactos bloqueados"
 
-#: gajim/roster_window.py:2845
+#: gajim/roster_window.py:2838
 #, fuzzy
 msgid "Really block this contact?"
 msgstr "¿Está OpenPGP activado para este contacto?"
 
-#: gajim/roster_window.py:2846
+#: gajim/roster_window.py:2839
 msgid ""
 "This contact will see you offline and you will not receive any messages sent "
 "to you by this contact."
 msgstr ""
 
-#: gajim/roster_window.py:2851
+#: gajim/roster_window.py:2844
 #, fuzzy
 msgid "_Block Contact"
 msgstr "Contactos bloqueados"
 
-#: gajim/roster_window.py:2896
+#: gajim/roster_window.py:2889
 msgid "Rename Contact"
 msgstr "Renombrar contacto"
 
-#: gajim/roster_window.py:2897
+#: gajim/roster_window.py:2890
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Introduce un nuevo alias para el contacto %s"
 
-#: gajim/roster_window.py:2904
+#: gajim/roster_window.py:2897
 msgid "Rename Group"
 msgstr "Renombrar grupo"
 
-#: gajim/roster_window.py:2905
+#: gajim/roster_window.py:2898
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Introduce un nuevo nombre para el grupo %s"
 
-#: gajim/roster_window.py:2953 gajim/roster_window.py:2954
+#: gajim/roster_window.py:2946 gajim/roster_window.py:2947
 msgid "Remove Group"
 msgstr "Eliminar grupo"
 
-#: gajim/roster_window.py:2955
+#: gajim/roster_window.py:2948
 #, fuzzy, python-format
 msgid "Do you want to remove %s from the contact list?"
 msgstr "¿Quieres eliminar el grupo %s del roster?"
 
-#: gajim/roster_window.py:2956
+#: gajim/roster_window.py:2949
 #, fuzzy
 msgid "_Also remove all contacts of this group from contact list"
 msgstr "Eliminar del roster también a todos los contactos dentro del grupo"
 
-#: gajim/roster_window.py:3044
-#, python-format
-msgid "%(jid)s has been invited in this room"
-msgstr "%(jid)s ha sido invitado en esta sala"
-
-#: gajim/roster_window.py:3353
+#: gajim/roster_window.py:3309
 #, fuzzy
 msgid "Remove Contact"
 msgstr "Renombrar contacto"
 
-#: gajim/roster_window.py:3354
+#: gajim/roster_window.py:3310
 #, fuzzy
 msgid "Remove contact from contact list"
 msgstr "Elimina contacto del roster"
 
-#: gajim/roster_window.py:3355
+#: gajim/roster_window.py:3311
 #, fuzzy, 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:3364 gajim/roster_window.py:3384
+#: gajim/roster_window.py:3320 gajim/roster_window.py:3340
 #, fuzzy
 msgid ""
 "By removing this contact you also remove authorization. This means the "
@@ -1598,21 +1545,21 @@ msgstr ""
 "Al eliminar este contacto, también elimina la autorización, lo que provoca "
 "que siempre lo vean como desconectado."
 
-#: gajim/roster_window.py:3375
+#: gajim/roster_window.py:3331
 msgid "Do you want to continue?"
 msgstr "¿Quieres continuar?"
 
-#: gajim/roster_window.py:3386
+#: gajim/roster_window.py:3342
 #, fuzzy
 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:3393
+#: gajim/roster_window.py:3349
 #, fuzzy
 msgid "Remove contacts from contact list"
 msgstr "Elimina contacto del roster"
 
-#: gajim/roster_window.py:3399
+#: gajim/roster_window.py:3355
 #, python-format
 msgid ""
 "By removing the following contacts, you will also remove authorization. This "
@@ -1625,24 +1572,24 @@ msgstr ""
 "\n"
 "%s"
 
-#: gajim/roster_window.py:3403
+#: gajim/roster_window.py:3359
 #, fuzzy
 msgid "Remove Contacts"
 msgstr "Renombrar contacto"
 
-#: gajim/roster_window.py:3423
+#: gajim/roster_window.py:3379
 msgid "No account available"
 msgstr "Cuenta no disponible"
 
-#: gajim/roster_window.py:3424
+#: gajim/roster_window.py:3380
 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:4060
+#: gajim/roster_window.py:4011
 msgid "Metacontacts storage not supported by your server"
 msgstr "Tu servidor no soporta almacenamiento de metacontactos"
 
-#: gajim/roster_window.py:4062
+#: gajim/roster_window.py:4013
 #, fuzzy
 msgid ""
 "Your server does not support storing metacontacts information. So this "
@@ -1651,12 +1598,12 @@ msgstr ""
 "Tu servidor no soporta almacenar información de metacontactos. Luego toda la "
 "información referente no se guardará en la próxima reconexión."
 
-#: gajim/roster_window.py:4159
+#: gajim/roster_window.py:4110
 #, fuzzy
 msgid "You are about to create a metacontact"
 msgstr "Vas a crear un metacontacto. ¿Estás seguro de continuar?"
 
-#: gajim/roster_window.py:4160
+#: gajim/roster_window.py:4111
 #, fuzzy
 msgid ""
 "Metacontacts are a way to regroup several contacts in one single contact. "
@@ -1667,124 +1614,115 @@ msgstr ""
 "Generalmente se usan cuando la misma persona tiene varias cuentas de Jabber "
 "o cuentas de transportes."
 
-#: gajim/roster_window.py:4164
+#: gajim/roster_window.py:4115
 #, fuzzy
 msgid "Create Metacontact"
 msgstr "Renombrar contacto"
 
-#: gajim/roster_window.py:4170
+#: gajim/roster_window.py:4121 gajim/data/gui/groupchat_creation.ui:317
 #, fuzzy
 msgid "_Create"
 msgstr "Creativo"
 
-#: gajim/roster_window.py:4287
+#: gajim/roster_window.py:4238
 msgid "Invalid file URI:"
 msgstr "URI de archivo no válido:"
 
-#: gajim/roster_window.py:4298
+#: gajim/roster_window.py:4249
 #, fuzzy
 msgid "Send file?"
 msgstr "Enviar archivo"
 
-#: gajim/roster_window.py:4299
+#: gajim/roster_window.py:4250
 #, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
 msgstr[0] "Quieres enviar este archivo a %s:"
 msgstr[1] "Quieres enviar estos archivos a %s:"
 
-#: gajim/roster_window.py:4451
+#: gajim/roster_window.py:4401
 #, python-format
 msgid "Send %(from)s to %(to)s"
 msgstr "Enviar de %(from)s a %(to)s"
 
-#: gajim/roster_window.py:4464
+#: gajim/roster_window.py:4414
 #, python-format
 msgid "Make %s first contact"
 msgstr "Crear %s primer contacto"
 
-#: gajim/roster_window.py:4469
+#: gajim/roster_window.py:4419
 #, fuzzy, python-format
 msgid "Make %(contact1)s and %(contact2)s metacontacts"
 msgstr "Hacer %s y %s metacontactos"
 
-#: gajim/roster_window.py:4825 gajim/roster_window.py:4923
+#: gajim/roster_window.py:4775 gajim/roster_window.py:4862
 msgid "_Change Status Message"
 msgstr "_Cambiar mensaje de estado"
 
-#: gajim/roster_window.py:4845
+#: gajim/roster_window.py:4795
 msgid "Publish Tune"
 msgstr "Hora de publicación"
 
-#: gajim/roster_window.py:4856
+#: gajim/roster_window.py:4806
 msgid "Publish Location"
 msgstr "Publicar localización"
 
-#: gajim/roster_window.py:4868
-#, fuzzy
-msgid "Configure Services…"
-msgstr "Configurar servicios..."
-
-#: gajim/roster_window.py:4997
+#: gajim/roster_window.py:4936
 msgid "_Maximize All"
 msgstr "_Maximizar todo"
 
-#: gajim/roster_window.py:5004 gajim/roster_window.py:5146
+#: gajim/roster_window.py:4943 gajim/roster_window.py:5085
 msgid "Send Group M_essage"
 msgstr "Enviar mensaje a grupo"
 
-#: gajim/roster_window.py:5011
+#: gajim/roster_window.py:4950
 msgid "To all users"
 msgstr "A todos los usuarios"
 
-#: gajim/roster_window.py:5015
+#: gajim/roster_window.py:4954
 msgid "To all online users"
 msgstr "A todos los usuarios en línea"
 
-#: gajim/roster_window.py:5027 gajim/roster_window.py:5152
+#: gajim/roster_window.py:4966 gajim/roster_window.py:5091
 #: gajim/data/gui/gc_occupants_menu.ui:110
 #: gajim/data/gui/contact_context_menu.ui:36
 msgid "In_vite to"
 msgstr "In_vitar a"
 
-#: gajim/roster_window.py:5162
+#: gajim/roster_window.py:5101
 msgid "_Manage Contacts"
 msgstr "_Gestionar contactos"
 
-#: gajim/roster_window.py:5168
+#: gajim/roster_window.py:5107
 #, fuzzy
 msgid "Edit _Groups…"
 msgstr "Editar grupos"
 
-#: gajim/roster_window.py:5189 gajim/data/gui/filetransfers.ui:12
+#: gajim/roster_window.py:5128 gajim/data/gui/filetransfers.ui:12
 #: gajim/data/gui/remove_account_window.ui:134
 msgid "_Remove"
 msgstr "_Eliminar"
 
-#: gajim/roster_window.py:5226
+#: gajim/roster_window.py:5165
 msgid "_Maximize"
 msgstr "_Maximizar"
 
-#: gajim/roster_window.py:5233
+#: gajim/roster_window.py:5172
 #, fuzzy
 msgid "_Reconnect"
 msgstr "_Desconectar"
 
-#: gajim/roster_window.py:5254 gajim/data/gui/gc_occupants_menu.ui:170
+#: gajim/roster_window.py:5193 gajim/data/gui/gc_occupants_menu.ui:170
 #: gajim/data/gui/gc_control_popup_menu.ui:113
 #: gajim/data/gui/contact_context_menu.ui:205
 msgid "_History"
 msgstr "_Histórico"
 
-#: gajim/roster_window.py:5335 gajim/data/gui/application_menu.ui:86
+#: gajim/roster_window.py:5274 gajim/data/gui/application_menu.ui:83
 #: gajim/data/gui/history_window.ui:57
 msgid "History Manager"
 msgstr "Histórico"
 
-#: gajim/roster_window.py:5343
-msgid "_Join New Group Chat"
-msgstr "_Entrar en nuevo grupo de charla"
-
 #: gajim/dataforms_widget.py:585
 #, fuzzy
 msgid "Unable to load image"
@@ -1903,227 +1841,244 @@ msgstr "Tema: %s\n"
 
 #: gajim/message_textview.py:45
 msgid "Write a message…"
-msgstr "Escribir un mensaje…"
+msgstr "Escribir un mensaje"
+
+#: gajim/message_window.py:356
+#, fuzzy
+msgid "Close Tabs"
+msgstr "_Enviar y Cerrar"
 
-#: gajim/message_window.py:250
+#: gajim/message_window.py:357
 msgid "You are going to close several tabs"
 msgstr "Estás a punto de cerrar varias pestañas"
 
-#: gajim/message_window.py:251
+#: gajim/message_window.py:358
 msgid "Do you really want to close them all?"
 msgstr "¿Realmente quieres cerrarlas todas?"
 
-#: gajim/message_window.py:539
+#: gajim/message_window.py:514
 #, fuzzy
 msgid "?Noun:Chats"
 msgstr "Grupos de charla"
 
-#: gajim/message_window.py:543
+#: gajim/message_window.py:518
 #, fuzzy
 msgid "Group Chats"
 msgstr "_Grupos de charla"
 
-#: gajim/message_window.py:547
+#: gajim/message_window.py:522
 msgid "Private Chats"
 msgstr "Conversaciones privadas"
 
-#: gajim/message_window.py:553
+#: gajim/message_window.py:528
 msgid "Messages"
 msgstr "Mensajes"
 
-#: gajim/gui_interface.py:173
+#: gajim/gui_interface.py:170
+#, fuzzy, 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:175
 msgid "Do you accept this request?"
 msgstr "¿Aceptas esta petición?"
 
-#: gajim/gui_interface.py:175
-#, python-format
-msgid "Do you accept this request on account %s?"
+#: gajim/gui_interface.py:177
+#, fuzzy, python-format
+msgid "Do you accept this request (account: %s)?"
 msgstr "¿Aceptas esta petición en la cuenta %s?"
 
-#: gajim/gui_interface.py:178
-#, fuzzy, 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:182
+#, fuzzy
+msgid "Authorization"
+msgstr "La autorización ha sido enviada"
 
-#: gajim/gui_interface.py:194 gajim/gtk/notification.py:175
+#: gajim/gui_interface.py:186 gajim/gui_interface.py:420
+#: gajim/gtk/filetransfer.py:338
+#, fuzzy
+msgid "_No"
+msgstr "Ninguno"
+
+#: gajim/gui_interface.py:205 gajim/gtk/notification.py:175
 #: gajim/gtk/notification.py:197
 msgid "Connection Failed"
 msgstr "Falló la conexión"
 
-#: gajim/gui_interface.py:279 gajim/gui_interface.py:529
-msgid "Password Required"
-msgstr "Contraseña requerida"
-
-#: gajim/gui_interface.py:280
-#, python-format
-msgid "A Password is required to join the room %s. Please type it."
-msgstr "Se requiere una contraseña para entrar al salón %s. Introdúcela."
-
-#: gajim/gui_interface.py:342 gajim/gui_interface.py:346
+#: gajim/gui_interface.py:325 gajim/gui_interface.py:329
 #, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr "Error %(code)s: %(msg)s"
 
-#: gajim/gui_interface.py:357 gajim/gui_interface.py:376
+#: gajim/gui_interface.py:340 gajim/gui_interface.py:359
 #: gajim/common/modules/message.py:122
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "error mientras se enviaba %(message)s ( %(error)s )"
 
-#: gajim/gui_interface.py:401 gajim/gtk/notification.py:175
+#: gajim/gui_interface.py:384 gajim/gtk/notification.py:175
 msgid "Subscription request"
 msgstr "Petición de adición"
 
-#: gajim/gui_interface.py:413 gajim/common/contacts.py:184
-#: gajim/common/helpers.py:83
+#: gajim/gui_interface.py:396 gajim/common/contacts.py:200
+#: gajim/common/helpers.py:86
 msgid "Observers"
 msgstr "Observadores"
 
-#: gajim/gui_interface.py:422
+#: gajim/gui_interface.py:405
 msgid "Authorization accepted"
 msgstr "Autorización aceptada"
 
-#: gajim/gui_interface.py:423
+#: gajim/gui_interface.py:406
 #, fuzzy, 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:431
-#, python-format
-msgid "Contact \"%s\" removed subscription from you"
+#: gajim/gui_interface.py:415
+#, fuzzy
+msgid "Subscription Removed"
+msgstr "Petición de adición"
+
+#: gajim/gui_interface.py:416
+#, fuzzy, python-format
+msgid "Contact '%s' removed subscription from you"
 msgstr "El contacto \"%s\" eliminó su subscripción de tí"
 
-#: gajim/gui_interface.py:432
+#: gajim/gui_interface.py:417
 #, fuzzy
 msgid ""
-"You will always see them as offline.\n"
+"You will always see this contact as offline.\n"
 "Do you want to remove them from your contact list?"
 msgstr ""
 "Siempre le verás desconectado.\n"
 "¿Le quieres eliminar de tu lista de contactos?"
 
-#: gajim/gui_interface.py:453 gajim/gtk/notification.py:176
+#: gajim/gui_interface.py:442 gajim/gtk/notification.py:176
 msgid "Unsubscribed"
 msgstr "Eliminado"
 
-#: gajim/gui_interface.py:465
+#: gajim/gui_interface.py:454
 #, python-format
 msgid "%(jid)s declined the invitation: %(reason)s"
 msgstr ""
 
-#: gajim/gui_interface.py:469
+#: gajim/gui_interface.py:458
 #, python-format
 msgid "%(jid)s declined the invitation"
 msgstr ""
 
-#: gajim/gui_interface.py:485
+#: gajim/gui_interface.py:474
 #, python-brace-format
 msgid "You are invited to {room} by {user}"
 msgstr "{user} te ha invitado a la sala de charla {room}"
 
-#: gajim/gui_interface.py:506
+#: gajim/gui_interface.py:495
 #, fuzzy
 msgid "Certificate Passphrase Required"
 msgstr "El certificado ha expirado"
 
-#: gajim/gui_interface.py:507
+#: gajim/gui_interface.py:496
 #, 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:516 gajim/gtk/accounts.py:963
+#: gajim/gui_interface.py:505 gajim/gtk/accounts.py:966
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Introduce contraseña para la cuenta %s"
 
-#: gajim/gui_interface.py:529 gajim/gtk/accounts.py:964
+#: gajim/gui_interface.py:518
+msgid "Password Required"
+msgstr "Contraseña requerida"
+
+#: gajim/gui_interface.py:518 gajim/gtk/accounts.py:967
 msgid "Save password"
 msgstr "Guardar contraseña"
 
-#: gajim/gui_interface.py:601 gajim/gui_interface.py:632
+#: gajim/gui_interface.py:587 gajim/gui_interface.py:618
+#: gajim/gtk/filetransfer.py:332 gajim/gtk/filetransfer.py:333
 #: gajim/gtk/notification.py:173 gajim/gtk/notification.py:276
 msgid "File Transfer Error"
 msgstr "Error en la transferencia del archivo"
 
-#: gajim/gui_interface.py:666
+#: gajim/gui_interface.py:652
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s quiere enviarte un archivo."
 
-#: gajim/gui_interface.py:668 gajim/gtk/filetransfer.py:479
+#: gajim/gui_interface.py:654 gajim/gtk/filetransfer.py:484
 #: gajim/gtk/notification.py:172 gajim/gtk/notification.py:274
 msgid "File Transfer Request"
 msgstr "Petición de transferencia de archivo"
 
-#: gajim/gui_interface.py:767
+#: gajim/gui_interface.py:753
 #, fuzzy
 msgid "Remote Contact Stopped Transfer"
 msgstr "El contacto remoto detuvo la transferencia"
 
-#: gajim/gui_interface.py:772
+#: gajim/gui_interface.py:758
 #, fuzzy
 msgid "Error Opening File"
 msgstr "Error abriendo el archivo:"
 
-#: gajim/gui_interface.py:782
+#: gajim/gui_interface.py:768
 #, fuzzy
 msgid "SSL Certificate Error"
 msgstr "Error del certificado SSL"
 
-#: gajim/gui_interface.py:795 gajim/gui_interface.py:826
-#: gajim/gui_interface.py:853 gajim/gtk/notification.py:174
+#: gajim/gui_interface.py:781 gajim/gui_interface.py:812
+#: gajim/gui_interface.py:839 gajim/gtk/notification.py:174
 #: gajim/gtk/notification.py:279
 msgid "File Transfer Stopped"
 msgstr "Transferencia del archivo detenida"
 
-#: gajim/gui_interface.py:799
+#: gajim/gui_interface.py:785
 #, fuzzy
 msgid "File Transfer Failed"
 msgstr "Transferencias"
 
-#: gajim/gui_interface.py:822
+#: gajim/gui_interface.py:808
 #, fuzzy, python-format
 msgid "%(filename)s received from %(name)s."
 msgstr "Transferencia del archivo %(filename)s de %(name)s detenida."
 
-#: gajim/gui_interface.py:827
+#: gajim/gui_interface.py:813
 #, 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:833
+#: gajim/gui_interface.py:819
 #, fuzzy, python-format
 msgid "File transfer of %(filename)s from %(name)s failed."
 msgstr "Transferencia del archivo %(filename)s de %(name)s detenida."
 
-#: gajim/gui_interface.py:848
+#: gajim/gui_interface.py:834
 #, 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:854
+#: gajim/gui_interface.py:840
 #, 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:860
+#: gajim/gui_interface.py:846
 #, fuzzy, python-format
 msgid "File transfer of %(filename)s to %(name)s failed."
 msgstr "Transferencia de %(filename)s a %(name)s detenida."
 
-#: gajim/gui_interface.py:971
+#: gajim/gui_interface.py:957
 msgid "Username Conflict"
 msgstr "Conflicto con nombre de usuario"
 
-#: gajim/gui_interface.py:972
+#: gajim/gui_interface.py:958
 msgid "Please type a new username for your local account"
 msgstr "Por favor, escribe un nuevo nombre de usuario para tu cuenta local"
 
-#: gajim/gui_interface.py:995
+#: gajim/gui_interface.py:981
 msgid "Resource Conflict"
 msgstr "Conflicto en el recurso"
 
-#: gajim/gui_interface.py:996
+#: gajim/gui_interface.py:982
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
@@ -2131,31 +2086,31 @@ msgstr ""
 "Ya estás conectado a esta cuenta con el mismo recurso. Por favor escribe uno "
 "nuevo"
 
-#: gajim/gui_interface.py:1053
+#: gajim/gui_interface.py:1039
 #, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s quiere empezar un chat de voz."
 
-#: gajim/gui_interface.py:1055
+#: gajim/gui_interface.py:1041
 #, fuzzy
 msgid "Voice Chat Request"
 msgstr "Petición de transferencia de archivo"
 
-#: gajim/gui_interface.py:1123 gajim/gtk/account_wizard.py:312
+#: gajim/gui_interface.py:1109 gajim/gtk/account_wizard.py:312
 msgid "Certificate Already in File"
 msgstr "El certificado ya está en el archivo"
 
-#: gajim/gui_interface.py:1124 gajim/gtk/account_wizard.py:313
+#: gajim/gui_interface.py:1110 gajim/gtk/account_wizard.py:313
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr "Este certificado ya está en el archivo %s, no fue añadido de nuevo."
 
-#: gajim/gui_interface.py:1145
+#: gajim/gui_interface.py:1131
 #, fuzzy, python-format
 msgid "The authenticity of the %s certificate could be invalid"
 msgstr "La autenticidad del certificado %s podría no ser válida."
 
-#: gajim/gui_interface.py:1148
+#: gajim/gui_interface.py:1134
 #, python-format
 msgid ""
 "\n"
@@ -2164,7 +2119,7 @@ msgstr ""
 "\n"
 "Error SSL desconocido: %d"
 
-#: gajim/gui_interface.py:1150
+#: gajim/gui_interface.py:1136
 #, python-format
 msgid ""
 "\n"
@@ -2173,11 +2128,11 @@ msgstr ""
 "\n"
 "Error SSL: <b>%s</b>"
 
-#: gajim/gui_interface.py:1155
+#: gajim/gui_interface.py:1141
 msgid "Error verifying SSL certificate"
 msgstr "Error verificando el certificado SSL"
 
-#: gajim/gui_interface.py:1156
+#: gajim/gui_interface.py:1142
 #, fuzzy, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your XMPP server: "
@@ -2188,7 +2143,7 @@ msgstr ""
 "%(error)s\n"
 "¿Aún quieres conectarte a este servidor?"
 
-#: gajim/gui_interface.py:1160 gajim/gtk/account_wizard.py:412
+#: gajim/gui_interface.py:1146 gajim/gtk/account_wizard.py:413
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -2203,171 +2158,160 @@ msgstr ""
 "Huella digital SHA256 del certificado:\n"
 "%(sha256)s"
 
-#: gajim/gui_interface.py:1166
+#: gajim/gui_interface.py:1152
 msgid "Ignore this error for this certificate."
 msgstr "Ignorar este error para este certificado"
 
-#: gajim/gui_interface.py:1174
+#: gajim/gui_interface.py:1160
 #, python-format
 msgid "SSL Certificate Verification for %s"
 msgstr "Verificación de certificado SSL para %s"
 
-#: gajim/gui_interface.py:1442 gajim/gtk/join_groupchat.py:235
-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/gui_interface.py:1448
-#, fuzzy
-msgid "JID is not a Groupchat"
-msgstr "Esto no es un grupo de charla"
-
-#: gajim/gui_interface.py:1579
-msgid "This is not a group chat"
-msgstr "Esto no es un grupo de charla"
-
-#: gajim/gui_interface.py:1580
-#, python-format
-msgid ""
-"%(room_jid)s is already in your roster. Please check if %(room_jid)s is a "
-"correct group chat name. If it is, delete it from your roster and try "
-"joining the group chat again."
-msgstr ""
-
-#: gajim/gui_interface.py:1604 gajim/dialog_messages.py:58
+#: gajim/gui_interface.py:1577
 msgid "You cannot join a group chat while you are invisible"
 msgstr "No puedes entrar a un grupo de charla estando invisible"
 
-#: gajim/gui_interface.py:2037
+#: gajim/gui_interface.py:1976
 msgid "Could not save your settings and preferences"
 msgstr "No se pueden guardar las preferencias"
 
-#: gajim/gui_interface.py:2098
+#: gajim/gui_interface.py:2037
 msgid "Gajim: IPython Console"
 msgstr ""
 
-#: gajim/dialog_messages.py:32
+#: gajim/dialog_messages.py:31 gajim/dialog_messages.py:36
+#: gajim/gtk/single_message.py:305 gajim/gtk/account_wizard.py:229
 #, fuzzy
-msgid "You can not start a new conversation unless you are connected."
-msgstr "No puedes entrar a un salón de chat hasta que no estés conectado."
-
-#: gajim/dialog_messages.py:36 gajim/dialog_messages.py:41
-#: gajim/gtk/single_message.py:305 gajim/gtk/join_groupchat.py:211
-#: gajim/gtk/account_wizard.py:229
-msgid "Invalid JID"
-msgstr "ID de Jabber no válida"
+msgid "Invalid XMPP Address"
+msgstr "Archivo no válido"
 
-#: gajim/dialog_messages.py:42 gajim/gtk/single_message.py:306
-#, python-format
-msgid "It is not possible to send a message to %s, this JID is not valid."
+#: gajim/dialog_messages.py:37
+#, fuzzy, 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."
 
-#: gajim/dialog_messages.py:47
-msgid "Unread events"
+#: gajim/dialog_messages.py:42
+#, fuzzy
+msgid "Unread Events"
 msgstr "Eventos sin leer"
 
-#: gajim/dialog_messages.py:48
-msgid "Read all pending events before removing this account."
+#: 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."
 
-#: gajim/dialog_messages.py:52
+#: gajim/dialog_messages.py:48
 #, fuzzy
 msgid "Invalid Form"
 msgstr "Salón no válido"
 
-#: gajim/dialog_messages.py:53
+#: gajim/dialog_messages.py:49
 #, fuzzy
 msgid "The form is not filled correctly."
 msgstr "El alias tiene caracteres no permitidos."
 
-#: gajim/dialog_messages.py:57 gajim/common/helpers.py:309
+#: gajim/dialog_messages.py:53 gajim/common/helpers.py:315
 msgid "Invisible"
 msgstr "Invisible"
 
-#: gajim/dialog_messages.py:62
-msgid "A connection is not available"
-msgstr "No hay disponible una conexión"
+#: gajim/dialog_messages.py:54
+#, fuzzy
+msgid "You cannot join a group chat while being invisible."
+msgstr "No puedes entrar a un grupo de charla estando invisible"
 
-#: gajim/dialog_messages.py:63
+#: gajim/dialog_messages.py:58
+#, fuzzy
+msgid "No Connection Available"
+msgstr "Conexión no disponible"
+
+#: gajim/dialog_messages.py:59
 msgid "Your message can not be sent until you are connected."
 msgstr "Tu mensaje no será enviado mientras no estés conectado."
 
-#: gajim/dialog_messages.py:67
-#, fuzzy
-msgid "JID already in list"
-msgstr "La ID de Jabber ya está en la lista"
+#: gajim/dialog_messages.py:63
+msgid "XMPP Address Already in List"
+msgstr ""
 
-#: gajim/dialog_messages.py:68
+#: gajim/dialog_messages.py:64
 #, fuzzy
-msgid "The JID you entered is already in the list. Choose another one."
+msgid ""
+"The XMPP Address you entered is already in the list. Please choose another "
+"one."
 msgstr "La ID de Jabber que introdujiste ya está en la lista. Elige otra."
 
-#: gajim/dialog_messages.py:72
-msgid "Invalid answer"
+#: gajim/dialog_messages.py:69
+#, fuzzy
+msgid "Invalid Answer"
 msgstr "Respuesta no válida"
 
-#: gajim/dialog_messages.py:73
+#: gajim/dialog_messages.py:70
 #, python-format
 msgid "Transport %(name)s answered wrongly to register request: %(error)s"
 msgstr ""
 "El transporte %(name)s respondió incorrectamente a la petición de registro: "
 "%(error)s"
 
-#: gajim/dialog_messages.py:78
+#: gajim/dialog_messages.py:75
 #, fuzzy
 msgid "Wrong Custom Hostname"
 msgstr "Usar nombre de host y puerto personalizados"
 
-#: gajim/dialog_messages.py:79
-#, python-format
-msgid "Wrong custom hostname \"%s\". Ignoring it."
+#: gajim/dialog_messages.py:76
+#, fuzzy, python-format
+msgid "Custom hostname \"%s\" is wrong. It will be ignored."
 msgstr "Nombre de host personalizado incorrecto \"%s\". Ignorando esto."
 
-#: gajim/dialog_messages.py:83
-msgid "Error while removing privacy list"
+#: gajim/dialog_messages.py:80
+#, fuzzy
+msgid "Error While Removing Privacy List"
 msgstr "Error eliminando la lista de privacidad"
 
-#: gajim/dialog_messages.py:84
-#, python-format
+#: gajim/dialog_messages.py:81
+#, fuzzy, python-format
 msgid ""
-"Privacy list %s has not been removed. It is maybe active in one of your "
-"connected resources. Deactivate it and try again."
+"Privacy list %s has not been removed. It is probably active in one of your "
+"connected resources. Please deactivate it and try again."
 msgstr ""
 "La lista de privacidad %s no se ha eliminado. Podría estar activa en uno de "
 "tus recursos conectados. Desactívalo y prueba de nuevo."
 
-#: gajim/dialog_messages.py:90
-msgid "Invisibility not supported"
+#: gajim/dialog_messages.py:87
+#, fuzzy
+msgid "Invisibility Not Supported"
 msgstr "Invisibilidad no soportada"
 
-#: gajim/dialog_messages.py:91
-#, python-format
-msgid "Account %s doesn't support invisibility."
+#: gajim/dialog_messages.py:88
+#, fuzzy, python-format
+msgid "This account %s doesn't support invisibility."
 msgstr "La cuenta %s no soporta invisibilidad."
 
-#: gajim/dialog_messages.py:95
+#: gajim/dialog_messages.py:92
 #, fuzzy
-msgid "Unregister failed"
+msgid "Unregister Failed"
 msgstr "Falló el registro"
 
-#: gajim/dialog_messages.py:96
-#, python-format
-msgid "Unregistration with server %(server)s failed: %(error)s"
+#: gajim/dialog_messages.py:93
+#, fuzzy, python-format
+msgid "Unregistration on server %(server)s failed: %(error)s"
 msgstr "No se pudo cancelar el registro con el servidor %(server)s: %(error)s"
 
-#: gajim/dialog_messages.py:100
-msgid "Registration succeeded"
+#: gajim/dialog_messages.py:97
+#, fuzzy
+msgid "Registration Succeeded"
 msgstr "Registro realizado con éxito"
 
-#: gajim/dialog_messages.py:101
-#, python-format
-msgid "Registration with agent %s succeeded"
+#: gajim/dialog_messages.py:98
+#, fuzzy, python-format
+msgid "Registration with agent %s succeeded."
 msgstr "Registro con el agente %s realizado con éxito"
 
-#: gajim/dialog_messages.py:105 gajim/gtk/service_registration.py:215
-msgid "Registration failed"
+#: gajim/dialog_messages.py:102
+#, fuzzy
+msgid "Registration Failed"
 msgstr "Falló el registro"
 
-#: gajim/dialog_messages.py:106
+#: gajim/dialog_messages.py:103
 #, python-format
 msgid ""
 "Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
@@ -2375,16 +2319,17 @@ msgstr ""
 "El registro con el agente %(agent)s falló con el error %(error)s: "
 "%(error_msg)s"
 
-#: gajim/dialog_messages.py:111
+#: gajim/dialog_messages.py:108
 #, fuzzy
 msgid "Unable to Join Group Chat"
 msgstr "No se pudo entrar al grupo de charla"
 
-#: gajim/dialog_messages.py:116
-msgid "GStreamer error"
-msgstr ""
+#: gajim/dialog_messages.py:113
+#, fuzzy
+msgid "GStreamer Error"
+msgstr "Error en la base de datos"
 
-#: gajim/dialog_messages.py:117
+#: gajim/dialog_messages.py:114
 #, python-format
 msgid ""
 "Error: %(error)s\n"
@@ -2393,19 +2338,21 @@ msgstr ""
 "Error: %(error)s\n"
 "Depurar: %(debug)s"
 
-#: gajim/dialog_messages.py:121
-msgid "Wrong host"
+#: gajim/dialog_messages.py:118
+#, fuzzy
+msgid "Wrong Host"
 msgstr "Host erróneo"
 
-#: gajim/dialog_messages.py:122
+#: gajim/dialog_messages.py:119
 msgid "Invalid local address? :-O"
 msgstr "¿Dirección local no válida? :-O"
 
-#: gajim/dialog_messages.py:126
-msgid "Avahi error"
+#: gajim/dialog_messages.py:123
+#, fuzzy
+msgid "Avahi Error"
 msgstr "Error de Avahi"
 
-#: gajim/dialog_messages.py:127
+#: gajim/dialog_messages.py:124
 #, python-format
 msgid ""
 "%s\n"
@@ -2414,67 +2361,67 @@ msgstr ""
 "%s\n"
 "La mensajería de enlace local podría no funcionar correctamente."
 
-#: gajim/dialog_messages.py:131 gajim/dialog_messages.py:136
+#: gajim/dialog_messages.py:128 gajim/dialog_messages.py:133
 #, fuzzy
-msgid "Could not request upload slot"
+msgid "Could not request upload slot for HTTP File Upload"
 msgstr "No se pudo iniciar servicio local"
 
-#: gajim/dialog_messages.py:137
-msgid "Got unexpected response from server (see log)"
+#: gajim/dialog_messages.py:134
+msgid "Got unexpected response from server (see log)."
 msgstr ""
 
-#: gajim/dialog_messages.py:141 gajim/dialog_messages.py:146
+#: gajim/dialog_messages.py:138 gajim/dialog_messages.py:143
 #, fuzzy
-msgid "Could not open file"
+msgid "Could not Open File"
 msgstr "No se pudo cargar la imagen"
 
-#: gajim/dialog_messages.py:142
-msgid "Exception raised while opening file (see log)"
+#: gajim/dialog_messages.py:139
+msgid "Exception raised while trying to open file (see log)."
 msgstr ""
 
-#: gajim/dialog_messages.py:151
-msgid "Unsecure"
-msgstr "Inseguro"
+#: gajim/dialog_messages.py:148
+#, fuzzy
+msgid "Not Secure"
+msgstr "No cifrado"
 
-#: gajim/dialog_messages.py:152
+#: gajim/dialog_messages.py:149
 #, fuzzy
-msgid "Server returned unsecure transport (HTTP)"
+msgid "The server returned an insecure transport (HTTP)."
 msgstr "El servicio devolvió un error"
 
-#: gajim/dialog_messages.py:156
+#: gajim/dialog_messages.py:153
 #, fuzzy
-msgid "Could not upload file"
+msgid "Could not Upload File"
 msgstr "No se pudo cargar la imagen"
 
-#: gajim/dialog_messages.py:157
+#: gajim/dialog_messages.py:154
 #, python-format
 msgid "HTTP response code from server: %s"
 msgstr ""
 
-#: gajim/dialog_messages.py:161
+#: gajim/dialog_messages.py:158
 msgid "Upload Error"
 msgstr ""
 
-#: gajim/dialog_messages.py:166
+#: gajim/dialog_messages.py:163
 #, fuzzy
 msgid "Encryption Error"
 msgstr "Encriptación activada"
 
-#: gajim/dialog_messages.py:167
-#, fuzzy
-msgid "For the chosen encryption there is no encryption method available"
-msgstr "No hay disponible una conexión"
+#: gajim/dialog_messages.py:164
+msgid "There is no encryption method available for the chosen encryption."
+msgstr ""
 
-#: gajim/dialog_messages.py:171
+#: gajim/dialog_messages.py:169
 #, fuzzy
-msgid "Avatar upload failed"
+msgid "Avatar Upload Failed"
 msgstr "falló la publicación de la vCard"
 
-#: gajim/privatechat_control.py:204
+#: gajim/privatechat_control.py:207
 msgid "Sending private message failed"
 msgstr "Falló el envío del mensaje privado"
 
-#: gajim/privatechat_control.py:206
+#: gajim/privatechat_control.py:209
 #, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr ""
@@ -2498,7 +2445,7 @@ msgstr "mostrar ayuda sobre un comando"
 
 #: gajim/gajim_remote.py:85
 #, fuzzy
-msgid "Lists all contacts in roster, one for each line"
+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"
@@ -2585,11 +2532,13 @@ msgstr ""
 
 #: gajim/gajim_remote.py:118
 #, fuzzy
-msgid "Sends new chat message to a contact in the roster. Account is optional."
+msgid ""
+"Sends new chat message to a contact in the contact list. Account is optional."
 msgstr "Enviar un mensaje al contacto"
 
 #: gajim/gajim_remote.py:120 gajim/gajim_remote.py:130
-msgid "JID of the contact that will receive the message"
+#, fuzzy
+msgid "XMPP Address of the contact that will receive the message"
 msgstr "la JID del contacto que recibirá el mensaje"
 
 #: gajim/gajim_remote.py:121 gajim/gajim_remote.py:132
@@ -2603,8 +2552,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
-msgid "Sends a chat message to someone on your roster. Account is optional."
-msgstr ""
+#, fuzzy
+msgid ""
+"Sends a chat message to someone on your contact list. Account is optional."
+msgstr "Enviar un mensaje al contacto"
 
 #: gajim/gajim_remote.py:131
 msgid "subject"
@@ -2615,11 +2566,13 @@ msgid "message subject"
 msgstr "tema del mensaje"
 
 #: gajim/gajim_remote.py:138
-msgid "Sends new message to a groupchat you've joined."
+#, 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"
 
 #: gajim/gajim_remote.py:140
-msgid "JID of the room that will receive the message"
+#, fuzzy
+msgid "XMPP Address of the group chat that will receive the message"
 msgstr "La JID del salón que recibirá el mensaje"
 
 #: gajim/gajim_remote.py:147
@@ -2628,7 +2581,8 @@ msgstr "Obtener información detallada de un contacto"
 
 #: gajim/gajim_remote.py:149 gajim/gajim_remote.py:162
 #: gajim/gajim_remote.py:192
-msgid "JID of the contact"
+#, fuzzy
+msgid "XMPP Address of the contact"
 msgstr "JID del contacto"
 
 #: gajim/gajim_remote.py:153
@@ -2692,7 +2646,8 @@ msgstr ""
 "configuración"
 
 #: gajim/gajim_remote.py:190
-msgid "Removes contact from roster"
+#, fuzzy
+msgid "Removes contact from contact list"
 msgstr "Elimina contacto del roster"
 
 #: gajim/gajim_remote.py:193
@@ -2740,9 +2695,9 @@ msgid "Missing argument \"contact_jid\""
 msgstr "No se encuentra el argumento \"contact_jid\""
 
 #: gajim/gajim_remote.py:275
-#, python-format
+#, fuzzy, python-format
 msgid ""
-"'%s' is not in your roster.\n"
+"'%s' is not in your contact list.\n"
 "Please specify account for sending the message."
 msgstr ""
 "'%s' no está en tu lista de contactos.\n"
@@ -2967,12 +2922,12 @@ msgstr "Final de semana"
 msgid "Weekend!"
 msgstr "¡Fin de semana!"
 
-#: gajim/common/logger.py:192 gajim/common/logger.py:197
+#: gajim/common/logger.py:189 gajim/common/logger.py:194
 #, 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:217
+#: gajim/common/logger.py:214
 #, python-format
 msgid "Creating %s"
 msgstr "Creando %s"
@@ -3046,22 +3001,23 @@ msgstr "%(nickname)s se ha desconectado"
 msgid "Contact Signed Out"
 msgstr "Contacto desconectado"
 
-#: gajim/common/contacts.py:455
-msgid "Not in roster"
-msgstr "No está en el roster"
-
 #: gajim/common/config.py:80
+#, fuzzy
 msgid ""
 "Show desktop notification even when a chat window is opened for this contact "
-"and does not have focus"
+"and does not have focus."
 msgstr ""
+"Permitir notificaciones emergentes cuando estoy _ausente, no disponible, "
+"ocupado o invisible."
 
 #: gajim/common/config.py:81
-msgid "Play sound when user is busy"
+#, fuzzy
+msgid "Play sound even when being busy."
 msgstr "Reproducir sonido cuando el usuario esté ocupado"
 
 #: gajim/common/config.py:83
-msgid "Show only online and free for chat contacts in roster."
+#, 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"
 
@@ -3070,12 +3026,15 @@ 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:87
-msgid "$S (Away as a result of being idle more than $T min)"
+#, fuzzy
+msgid "$S (Away: Idle more than $T min)"
 msgstr "$S (Ausente por estar inactivo más de $T minutos)"
 
 #: gajim/common/config.py:87
 #, fuzzy
-msgid "$S will be replaced by current status message, $T by autoawaytime."
+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"
@@ -3085,12 +3044,14 @@ msgid "Time in minutes, after which your status changes to not available."
 msgstr "Tiempo en minutos, después de haber cambiado a no disponible"
 
 #: gajim/common/config.py:90
-msgid "$S (Not available as a result of being idle more than $T min)"
+#, fuzzy
+msgid "$S (Not available: Idle more than $T min)"
 msgstr "$S (No disponible por estar inactivo más de $T minutos)"
 
 #: gajim/common/config.py:90
 #, fuzzy
-msgid "$S will be replaced by current status message, $T by autoxatime."
+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"
@@ -3098,63 +3059,64 @@ msgstr ""
 #: gajim/common/config.py:93
 #, fuzzy
 msgid ""
-"When to show notification area icon. Can be 'never', 'on_event', 'always'."
+"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'."
 
 #: gajim/common/config.py:94
-msgid "Allow to hide the roster window even if the tray icon is not shown."
+msgid ""
+"Allow to hide the contact list window even if the notification area icon is "
+"not shown."
 msgstr ""
 
 #: gajim/common/config.py:97
 #, fuzzy
-msgid "Contact signed in notification color."
-msgstr "_Mostrar evento en roster"
+msgid "Notification color for contacts signing in."
+msgstr "Notif_icarme de los contactos que se conecten"
 
 #: gajim/common/config.py:98
 #, fuzzy
-msgid "Contact signout notification color"
-msgstr "_Mostrar evento en roster"
+msgid "Notification color for contacts signing out."
+msgstr "Notificar cuand un contacto: "
 
 #: gajim/common/config.py:99
 #, fuzzy
-msgid "New message notification color."
+msgid "Notification color for new message notification."
 msgstr "¿Previsualizar nuevos mensajes en un mensaje emergente?"
 
 #: gajim/common/config.py:100
 #, fuzzy
-msgid "File transfer request notification color."
-msgstr "Petición de transferencia de archivo"
+msgid "Notification color for file transfer request."
+msgstr "_Notificarme cuando una transferencia finalice"
 
 #: gajim/common/config.py:101
 #, fuzzy
-msgid "File transfer error notification color."
-msgstr "Transferencia de archivo cancelada"
+msgid "Notification color for file transfer errors."
+msgstr "_Notificarme cuando una transferencia finalice"
 
 #: gajim/common/config.py:102
-#, fuzzy
-msgid "File transfer complete or stopped notification color."
+msgid "Notification color for stopped or completed file transfers."
 msgstr ""
-"Cuando una transferencia se completa, muestra una notificación emergente"
 
 #: gajim/common/config.py:103
-#, fuzzy
-msgid "Groupchat invitation notification color"
-msgstr "Invitación a grupo de charla"
+msgid "Notification color for group chat invitations."
+msgstr ""
 
 #: gajim/common/config.py:104
 #, fuzzy
-msgid "Background color of status changed notification"
+msgid "Notification background color for changed status."
 msgstr "Color de fondo para los contactos que acaban de conectar."
 
 #: gajim/common/config.py:105
-msgid "Other dialogs color."
+msgid "Notification color for other dialogs."
 msgstr ""
 
 # duda sobre collapsed
 #: gajim/common/config.py:106
+#, fuzzy
 msgid ""
-"List (space separated) of rows (accounts and groups) that are collapsed."
+"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."
 
@@ -3162,8 +3124,10 @@ msgstr ""
 msgid "default"
 msgstr "por defecto"
 
-#: gajim/common/config.py:113
-msgid "Language used by speller"
+#: gajim/common/config.py:113 gajim/common/config.py:424
+#: gajim/common/config.py:431
+#, fuzzy
+msgid "Language used for spell checking."
 msgstr "Lenguaje usado por el corrector"
 
 #: gajim/common/config.py:114
@@ -3177,10 +3141,11 @@ msgstr ""
 "'nunca' - nunca muestra la hora."
 
 #: gajim/common/config.py:115
+#, fuzzy
 msgid ""
 "Print time in chats using Fuzzy Clock. Value of fuzziness from 1 to 4, or 0 "
-"to disable fuzzyclock. 1 is the most precise clock, 4 the least precise one. "
-"This is used only if print_time is 'sometimes'."
+"to disable Fuzzy Clock. 1 is the most precise clock, 4 the least precise "
+"one. This is used only if 'print_time' is 'sometimes'."
 msgstr ""
 "Imprime la hora en las conversaciones usando reloj hablado. El valor va de 1 "
 "a 4, o 0 para deshabilitar el reloj hablado. 1 es el reloj más preciso, 4 el "
@@ -3199,16 +3164,18 @@ msgstr "Tratar los pares de * / _ como posibles caracteres de formateo."
 #: gajim/common/config.py:120
 #, fuzzy
 msgid ""
-"If true, do not remove */_ . So *abc* will be bold but with * * not removed."
+"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 "
 "* *"
 
 #: gajim/common/config.py:123
+#, fuzzy
 msgid ""
-"Uses ReStructured text markup to send HTML, plus ascii formatting if "
-"selected. For syntax, see http://docutils.sourceforge.net/docs/ref/rst/"
-"restructuredtext.html (If you want to use this, install docutils)"
+"Uses ReStructured text markup to send HTML, plus ASCII formatting if "
+"selected. Needs docutils installed (for syntax, see http://docutils."
+"sourceforge.net/docs/ref/rst/restructuredtext.html)."
 msgstr ""
 "Usa marcado de texto ReStructured para enviar HTML, mas formateado ascii si "
 "está seleccionado. Para la sintaxis, mira http://docutils.sourceforge.net/"
@@ -3216,37 +3183,40 @@ msgstr ""
 "docutils)"
 
 #: gajim/common/config.py:132
+#, fuzzy
 msgid ""
-"Character to add after nickname when using nick completion (tab) in group "
-"chat."
+"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."
 
 #: gajim/common/config.py:133
+#, fuzzy
 msgid ""
-"Character to propose to add after desired nickname when desired nickname is "
-"used by someone else in group chat."
+"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."
 
 #: gajim/common/config.py:155
 msgid ""
-"If true, Gajim will save roster position when hiding roster, and restore it "
-"when showing roster."
+"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:161
-msgid "Place the roster on the right in single window mode"
+msgid "Place the contact list on the right in single window mode"
 msgstr ""
 
 #: gajim/common/config.py:167
 #, fuzzy
 msgid ""
-"This option let you customize timestamp that is printed in conversation. For "
-"example \"[%H:%M] \" will show \"[hour:minute] \". See python doc on "
-"strftime for full documentation: http://docs.python.org/lib/module-time.html"
+"This option lets you customize the timestamp that is printed in "
+"conversation. For example '[%H:%M] ' will show '[hour:minute] '. See python "
+"doc on strftime for full documentation (https://docs.python.org/3/library/"
+"time.html)."
 msgstr ""
 "Esta opción te permite personalizar la marca horaria de las conversaciones. "
 "Por ejemplo \"[%H:%M] \" mostrará \"[hour:minute] \". Mira la documentación "
@@ -3254,262 +3224,266 @@ msgstr ""
 "module-time.html"
 
 #: gajim/common/config.py:168
-msgid "Characters that are printed before the nickname in conversations"
+#, fuzzy
+msgid "Characters that are printed before the nickname in conversations."
 msgstr "Los caracteres que se imprimen antes del alias en las conversaciones"
 
 #: gajim/common/config.py:169
-msgid "Characters that are printed after the nickname in conversations"
+#, fuzzy
+msgid "Characters that are printed after the nickname in conversations."
 msgstr "Los caracteres que se imprimen después del alias en las conversaciones"
 
 #: gajim/common/config.py:170
-msgid "Add * and [n] in roster title?"
-msgstr "¿Añadir * y [n] en el título del roster?"
+#, fuzzy
+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"
 
 #: gajim/common/config.py:171
 #, fuzzy
 msgid ""
-"How many history messages should be restored when a chat tab/window is "
-"reopened?"
+"Number of messages from chat history to be restored when a chat tab/window "
+"is reopened."
 msgstr ""
 "Cuántas líneas recordar de la última conversación cuando se vuelve a abrir "
 "una pestaña/ventana de conversación"
 
 #: gajim/common/config.py:172
-msgid "How far back in time (minutes) history is restored. -1 means no limit."
+msgid ""
+"How far back in time (minutes) chat history is restored. -1 means no limit."
 msgstr ""
 
 #: gajim/common/config.py:173
 msgid ""
-"How many lines to request from server when entering a groupchat. -1 means no "
-"limit"
+"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:174
 msgid ""
-"Minutes of backlog to request when entering a groupchat. -1 means no limit"
+"Should automatic rejoin be activated when you were kicked from a group chat?"
 msgstr ""
 
 #: gajim/common/config.py:175
-msgid ""
-"How many seconds to wait before trying to autorejoin to a conference you are "
-"being disconnected from. Set to 0 to disable autorejoining."
-msgstr ""
-
-#: gajim/common/config.py:176
-msgid "Should autorejoin be activated when kicked from a conference?"
-msgstr ""
-
-#: gajim/common/config.py:177
-msgid ""
-"Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
-"Client default behaviour)."
+#, fuzzy
+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)"
 
-#: gajim/common/config.py:179
-msgid "How many lines to store for Ctrl+KeyUP."
+#: gajim/common/config.py:177
+#, fuzzy
+msgid "How many lines to store for Ctrl+KeyUP (previously sent messages)."
 msgstr "Cuántas líneas almacenar para Ctrl+Arriba."
 
-#: gajim/common/config.py:182
+#: gajim/common/config.py:180
 #, fuzzy, python-format
 msgid ""
-"Either custom URL with %%s in it where %%s is the word/phrase or "
-"'WIKTIONARY' which means use Wikitionary."
+"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"
 
-#: gajim/common/config.py:185
+#: gajim/common/config.py:183
 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:187
+#: gajim/common/config.py:185
+#, fuzzy
 msgid ""
-"When not printing time for every message (print_time==sometimes), print it "
+"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."
 
-#: gajim/common/config.py:188
+#: gajim/common/config.py:186
 msgid "Ask before pasting an image."
 msgstr ""
 
-#: gajim/common/config.py:189
+#: gajim/common/config.py:187
 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:190
+#: gajim/common/config.py:188
 #, fuzzy
 msgid ""
-"Always ask for confirmation before closing groupchats with any of the JIDs "
-"on this space separated list."
+"Always ask for confirmation before closing group chats with any of the XMPP "
+"Addresses on this list (space separated)."
 msgstr ""
 "Preguntar siempre antes de cerrar la ventana/pestaña de un grupo de charla "
 "en esta lista (separada por espacios) de ID de Jabber de grupos de charla."
 
-#: gajim/common/config.py:191
+#: gajim/common/config.py:189
 #, fuzzy
 msgid ""
-"Never ask for confirmation before closing groupchats with any of the JIDs on "
-"this space separated list."
+"Never ask for confirmation before closing group chats with any of the XMPP "
+"Addresses on this list (space separated)."
 msgstr ""
 "Nunca preguntar antes de cerrar la ventana/pestaña de un grupo de "
 "conversación en esta lista (separada por espacios) de ID de Jabber de grupos "
 "de charla."
 
-#: gajim/common/config.py:192
+#: gajim/common/config.py:190
 #, fuzzy
 msgid ""
-"Ask before closing tabbed chat window if there are controls that can lose "
-"data (chat, private chat, groupchat that will not be minimized)"
+"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)"
 
-#: gajim/common/config.py:195
+#: gajim/common/config.py:193
 #, fuzzy
 msgid ""
-"Comma separated list of sent hosts, in addition of local interfaces, for "
-"File Transfer in case of address translation/port forwarding."
+"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."
 
-#: gajim/common/config.py:196
+#: gajim/common/config.py:194
 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:198
+#: gajim/common/config.py:196
 #, fuzzy
 msgid "Notify of events in the notification area."
 msgstr "Notifica eventos en el área de notificación."
 
-#: gajim/common/config.py:199
+#: gajim/common/config.py:197
 msgid ""
-"If False, Gajim will display a static event icon instead of the blinking "
-"status icon in the notification area when notifying on event."
+"If disabled, Gajim will display a static event icon instead of the blinking "
+"status icon in the notification area when notifying about an event."
 msgstr ""
 
-#: gajim/common/config.py:205
+#: gajim/common/config.py:203
 msgid "Show tab when only one conversation?"
 msgstr "¿Mostrar pestaña cuando sólo hay una conversación?"
 
-#: gajim/common/config.py:206
+#: gajim/common/config.py:204
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "¿Mostrar borde solapado de archivador en las ventanas de conversación?"
 
-#: gajim/common/config.py:207
+#: gajim/common/config.py:205
 msgid "Show close button in tab?"
 msgstr "¿Mostrar botón de cerrar en la pestaña?"
 
-#: gajim/common/config.py:220
+#: gajim/common/config.py:218
 msgid "Preview new messages in notification popup?"
 msgstr "¿Previsualizar nuevos mensajes en un mensaje emergente?"
 
-#: gajim/common/config.py:223
+#: gajim/common/config.py:221
+#, fuzzy
 msgid ""
-"A semicolon-separated list of words that will be highlighted in group chats."
+"A list of words (semicolon separated) that will be highlighted in group "
+"chats."
 msgstr ""
 "Una lista de palabras separadas por ';' que serán resaltadas en los grupos "
 "de charla."
 
-#: gajim/common/config.py:224
+#: gajim/common/config.py:222
 #, fuzzy
 msgid ""
-"If true, quits Gajim when X button of Window Manager is clicked. This "
-"setting is taken into account only if notification icon is used."
+"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. "
 
-#: gajim/common/config.py:225
+#: gajim/common/config.py:223
 msgid ""
-"If true, Gajim hides the Roster window on pressing the X button instead of "
-"minimizing into the Dock."
+"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:226
+#: gajim/common/config.py:224
 #, fuzzy
 msgid ""
-"If true, Gajim will display an icon on each tab containing unread messages. "
-"Depending on the theme, this icon may be animated."
+"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:227
+#: gajim/common/config.py:225
 #, fuzzy
 msgid ""
-"If true, Gajim will display the status message, if not empty, for every "
-"contact under the contact name in roster window."
+"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."
 
-#: gajim/common/config.py:233
-msgid "Define the position of the avatar in roster. Can be left or right"
+#: gajim/common/config.py:231
+#, fuzzy
+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:234
+#: gajim/common/config.py:232
 #, fuzzy
 msgid ""
-"If False, Gajim will no longer print status line in chats when a contact "
-"changes their status and/or their status message."
+"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"
 
-#: gajim/common/config.py:235
+#: gajim/common/config.py:233
 #, fuzzy
 msgid ""
 "Default Setting: Show a status message for every join or leave in a group "
-"chat"
+"chat."
 msgstr "No se pudo entrar al grupo de charla"
 
-#: gajim/common/config.py:236
+#: gajim/common/config.py:234
+#, fuzzy
 msgid ""
-"Default Setting: Show a status message for all status (away, dnd, etc.) "
-"changes of users in a group chat"
-msgstr ""
+"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"
 
-#: gajim/common/config.py:238
-msgid "Log XHTML messages instead of plain text messages."
+#: gajim/common/config.py:236
+msgid "Store XHTML messages in chat history instead of plain text messages."
 msgstr ""
 
-#: gajim/common/config.py:239
+#: gajim/common/config.py:237
 msgid "Don't show avatar for the transport itself."
 msgstr "No mostrar avatar para el transporte en sí mismo"
 
-#: gajim/common/config.py:240
-msgid "Don't show roster in the system taskbar."
+#: gajim/common/config.py:238
+#, fuzzy
+msgid "Don't show contact list window in the system taskbar."
 msgstr "No mostrar roster en la barra de tareas."
 
-#: gajim/common/config.py:241
+#: gajim/common/config.py:239
 #, fuzzy
 msgid ""
-"If true, make the window flash (the default behaviour in most Window "
-"Managers) when holding pending events."
+"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."
 
-#: gajim/common/config.py:245
+#: gajim/common/config.py:243
 #, fuzzy
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
 "'always_with_roster' - Like 'always' but the messages are in a single window "
-"along with the roster.\n"
+"along with the contact list.\n"
 "'never' - All messages get their own window.\n"
 "'peracct' - Messages for each account are sent to a specific window.\n"
-"'pertype' - Each message type (e.g. chats vs. groupchats) is sent to a "
+"'pertype' - Each message type (e.g. chats vs. group chats) is sent to a "
 "specific window."
 msgstr ""
 "Controla la ventana donde se depositan los nuevos mensajes.\n"
@@ -3521,126 +3495,136 @@ msgstr ""
 "'pertype' - Cada tipo de mensaje (p.ej. conversaciones vs. grupos de charla) "
 "se envian a una ventana específica."
 
-#: gajim/common/config.py:246
+#: gajim/common/config.py:244
+#, fuzzy
 msgid ""
-"Show roster on startup.\n"
-"'always' - Always show roster.\n"
-"'never' - Never show roster.\n"
-"'last_state' - Restore the last state roster."
+"Show contact list window on startup.\n"
+"'always' - Always show contact list window.\n"
+"'never' - Never show contact list window.\n"
+"'last_state' - Restore last state of the contact list window."
 msgstr ""
 "Mostrar lista de contactos en el arranque.\n"
 "'always' - Mostrar siempre la lista.\n"
 "'never' - No mostrar nunca la lista.\n"
 "'last_state' - Restaurar el último estado de la lista."
 
-#: gajim/common/config.py:247
-msgid "If False, you will no longer see the avatar in the chat window."
+#: gajim/common/config.py:245
+#, fuzzy
+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."
 
-#: gajim/common/config.py:248
+#: gajim/common/config.py:246
 #, fuzzy
-msgid "If true, pressing the escape key closes a tab/window."
+msgid "If enabled, pressing Esc closes a tab/window."
 msgstr "Si es True, presionar la tecla escape cierra una ventana/pestaña."
 
-#: gajim/common/config.py:249
-msgid "Hides the banner in a group chat window"
+#: gajim/common/config.py:247
+#, fuzzy
+msgid "Hides the banner in a group chat window."
 msgstr "Oculta el banner en una ventana de grupo de charla"
 
-#: gajim/common/config.py:250
-msgid "Hides the banner in two persons chat window"
-msgstr "Oculta el banner en una ventana de conversación de dos personas."
+#: gajim/common/config.py:248
+#, fuzzy
+msgid "Hides the banner in a 1:1 chat window."
+msgstr "Oculta el banner en una ventana de grupo de charla"
 
-#: gajim/common/config.py:251
-msgid "Hides the group chat occupants list in group chat window."
+#: gajim/common/config.py:249
+#, fuzzy
+msgid "Hides the group chat participants list in a group chat window."
 msgstr "Oculta los ocupantes en las ventans de grupo de charla."
 
-#: gajim/common/config.py:252
+#: gajim/common/config.py:250
+#, fuzzy
 msgid ""
 "In a chat, show the nickname at the beginning of a line only when it's not "
-"the same person talking than in previous message."
+"the same person talking as in the previous message."
 msgstr ""
 "En una conversación, muestra el alias al principio de una línea sólo cuando "
 "no es la misma persona que envió el último mensaje."
 
-#: gajim/common/config.py:253
+#: gajim/common/config.py:251
 msgid "Indentation when using merge consecutive nickname."
 msgstr "Indentar cuando se use una combinación de alias consecutivos."
 
-#: gajim/common/config.py:254
-msgid "Ctrl-Tab go to next composing tab when none is unread."
+#: gajim/common/config.py:252
+#, fuzzy
+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."
 
-#: gajim/common/config.py:255
+#: gajim/common/config.py:253
 #, fuzzy
 msgid ""
-"Show the confirm metacontacts creation dialog or not? Empty string means "
-"never show the dialog."
+"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á."
 
-#: gajim/common/config.py:256
+#: gajim/common/config.py:254
 #, fuzzy
 msgid ""
-"Show the confirm block contact dialog or not? Empty string means never show "
+"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á."
 
-#: gajim/common/config.py:257
+#: gajim/common/config.py:255
 #, fuzzy
 msgid ""
-"Show the confirm custom status dialog or not? Empty string means never show "
-"the dialog."
+"Show a confirmation dialog for a custom status? 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á."
 
-#: gajim/common/config.py:258
+#: gajim/common/config.py:256
 #, fuzzy
 msgid ""
-"If true, you will be able to set a negative priority to your account in "
-"account modification window. BE CAREFUL, when you are logged in with a "
-"negative priority, you will NOT receive any message from your server."
+"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."
 
-#: gajim/common/config.py:259
+#: gajim/common/config.py:257
 #, fuzzy
 msgid ""
-"If true, Gajim will show number of online and total contacts in account and "
-"group rows."
+"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."
 
-#: gajim/common/config.py:260
+#: gajim/common/config.py:258
+#, fuzzy
 msgid ""
-"Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
-"as if they were of this type"
+"Can be empty, 'chat' or 'normal'. If not empty, all incoming messages are "
+"treated as if they were of this type."
 msgstr ""
 "Puede estar vacío, 'chat' o 'normal. Si no está vacío, tratará todos los "
 "mensajes entrantes como si fueran de este tipo"
 
-#: gajim/common/config.py:261
+#: gajim/common/config.py:259
 #, fuzzy
 msgid ""
-"If true, Gajim will scroll and select the contact who sent you the last "
-"message, if chat window is not already opened."
+"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."
 
-#: gajim/common/config.py:262
+#: gajim/common/config.py:260
 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:263
+#: gajim/common/config.py:261
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
@@ -3648,140 +3632,156 @@ msgstr ""
 "Número máximo de líneas mostradas en las conversaciones. Las más antiguas "
 "serán limpiadas."
 
-#: gajim/common/config.py:264
+#: gajim/common/config.py:262
 #, fuzzy
 msgid ""
-"If true, notification windows from notification-daemon will be attached to "
-"notification icon."
+"If enabled, notification windows from notification-daemon will be attached "
+"to the notification area icon."
 msgstr ""
 "Si es True, las ventanas de notificación del deminio notificador serán "
 "adjuntadas al área de notificación."
 
-#: gajim/common/config.py:265
+#: gajim/common/config.py:263
 msgid "Choose interval between 2 checks of idleness."
 msgstr "Elige intervalo entre 2 comprobaciones de inactividad."
 
-#: gajim/common/config.py:266
+#: gajim/common/config.py:264
+#, fuzzy
 msgid ""
-"Valid uri schemes. Only schemes in this list will be accepted as \"real\" "
-"uri. (mailto and xmpp are handled separately)"
+"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\"."
 
-#: gajim/common/config.py:267
-msgid "If true, completion in groupchats will be like a shell auto-completion"
+#: gajim/common/config.py:265
+msgid ""
+"If enabled, completion in group chats will be like a shell auto-completion."
 msgstr ""
 
-#: gajim/common/config.py:272
-msgid "Optionally fix jingle output video framerate. Example: 10/1 or 25/2"
+#: gajim/common/config.py:270
+msgid "Optionally fix Jingle output video framerate. Example: 10/1 or 25/2."
 msgstr ""
 
-#: gajim/common/config.py:273
-msgid "Optionally resize jingle output video. Example: 320x240"
+#: gajim/common/config.py:271
+msgid "Optionally resize Jingle output video. Example: 320x240."
 msgstr ""
 
-#: gajim/common/config.py:274
-msgid "If true, You will also see your webcam"
+#: gajim/common/config.py:272
+msgid "If enabled, you will see your webcam's video stream as well."
 msgstr ""
 
-#: gajim/common/config.py:277
+#: gajim/common/config.py:275
 msgid ""
-"If true, Gajim will try to use a STUN server when using Jingle. The one in "
-"\"stun_server\" option, or the one given by the XMPP server."
+"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:278
+#: gajim/common/config.py:276
 msgid "STUN server to use when using Jingle"
-msgstr ""
+msgstr "Servidor STUN cuando se use Jingle"
 
-#: gajim/common/config.py:279
+#: gajim/common/config.py:277
 msgid ""
-"If true, Gajim will show affiliation of groupchat occupants by adding a "
-"colored square to the status icon"
+"If enabled, Gajim will show affiliation of group chat participants by adding "
+"a colored square to the status icon."
 msgstr ""
 
-#: gajim/common/config.py:280
+#: gajim/common/config.py:278
 msgid ""
 "Proxy used for all outgoing connections if the account does not have a "
-"specific proxy configured"
+"specific proxy configured."
 msgstr ""
 
-#: gajim/common/config.py:281
-msgid "If true, Gajim will ignore incoming attention requests (\"wizz\")."
+#: gajim/common/config.py:279
+msgid "If enabled, Gajim will ignore incoming attention requests ('wizz')."
 msgstr ""
 
-#: gajim/common/config.py:282
+#: gajim/common/config.py:280
 msgid ""
 "If enabled, Gajim will reopen chat windows that were opened last time Gajim "
 "was closed."
 msgstr ""
 
-#: gajim/common/config.py:283
+#: gajim/common/config.py:281
 #, fuzzy
 msgid ""
-"If enabled, Gajim will show an icon to show that sent message has been "
-"received by your contact"
+"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:284
-msgid "Show a mini avatar in chat window tabs and in window icon"
+#: gajim/common/config.py:282
+msgid "Show a mini avatar in chat window tabs and as the window's icon."
 msgstr ""
 
-#: gajim/common/config.py:285
+#: gajim/common/config.py:283
 #, fuzzy
-msgid "If true, Gajim will use the Systems Keyring to store account passwords."
+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."
 
+#: gajim/common/config.py:284
+msgid "If enabled, Gajim will execute XEP-0146 Commands."
+msgstr ""
+
+#: gajim/common/config.py:285
+msgid "2: System, 1: Enabled, 0: Disabled"
+msgstr ""
+
 #: gajim/common/config.py:286
-msgid "If true, Gajim will execute XEP-0146 Commands."
+msgid "Options in days which can be chosen in the sync threshold menu"
 msgstr ""
 
 #: gajim/common/config.py:287
-msgid "2: System, 1: Enabled, 0: Disabled"
+msgid ""
+"Maximum history in days we request from a public group chat archive. 0: As "
+"much as possible."
 msgstr ""
 
 #: gajim/common/config.py:288
-msgid "Options in days which can be chosen in the sync threshold menu"
+msgid ""
+"Maximum history in days we request from a private group chat archive. 0: As "
+"much as possible."
 msgstr ""
 
 #: gajim/common/config.py:289
 msgid ""
-"Maximum history in days we request from a public room archive. 0: As much as "
-"possible"
+"If enabled, Gajim shows the group chat subject in the chat window when "
+"joining."
 msgstr ""
 
 #: gajim/common/config.py:290
+#, fuzzy
 msgid ""
-"Maximum history in days we request from a private room archive. 0: As much "
-"as possible"
+"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"
 
 #: gajim/common/config.py:291
-msgid "If the room subject is shown in chat on join"
+#, fuzzy
+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"
 
 #: gajim/common/config.py:292
+#, fuzzy
 msgid ""
-"If the contact row is colored according to the current chatstate of the "
-"contact"
+"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"
 
 #: gajim/common/config.py:293
-msgid "If the tab is colored according to the current chatstate of the contact"
-msgstr ""
-
-#: gajim/common/config.py:294
-msgid ""
-"Shows a text in the banner that describes the current chatstate of the "
-"contact"
-msgstr ""
-
-#: gajim/common/config.py:295 gajim/common/config.py:424
 #, fuzzy
 msgid ""
 "Chat state notifications that are sent to contacts. Possible values: all, "
@@ -3789,71 +3789,80 @@ msgid ""
 msgstr ""
 "Notificaciones de estado enviadas. Puede ser all, composing_only o disabled."
 
-#: gajim/common/config.py:296 gajim/common/config.py:438
+#: gajim/common/config.py:294
 #, fuzzy
 msgid ""
 "Chat state notifications that are sent to the group chat. Possible values: "
-"all, composing_only, disabled"
+"'all', 'composing_only', 'disabled'"
 msgstr ""
 "Notificaciones de estado enviadas. Puede ser all, composing_only o disabled."
 
-#: gajim/common/config.py:312
+#: gajim/common/config.py:297
+msgid "API Preferences. Possible values: 'http', 'iq'"
+msgstr ""
+
+#: gajim/common/config.py:313
+#, fuzzy
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
-"defined in autopriority_* options."
+"defined in 'autopriority_*' options."
 msgstr ""
 "La prioridad cambiará automáticamente acorde a tu estado. Las prioridades "
 "están definidas en las opciones de autoprioridad_*"
 
-#: gajim/common/config.py:320
+#: gajim/common/config.py:321
+#, fuzzy
 msgid ""
-"Status used to autoconnect as. Can be online, chat, away, xa, dnd, "
-"invisible. NOTE: this option is used only if restore_last_status is disabled"
+"Status to be used automatically when connecting. Can be 'online', 'chat', "
+"'away', 'xa', 'dnd' or 'invisible'. 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"
 
-#: gajim/common/config.py:321
-msgid "If enabled, restore the last status that was used."
+#: gajim/common/config.py:322
+#, fuzzy
+msgid "If enabled, the last status will be restored."
 msgstr "Si está activado, restaurar el último estado que fue usado"
 
-#: gajim/common/config.py:322
+#: gajim/common/config.py:323
 msgid ""
-"If true, Contacts requesting authorization will be automatically accepted."
+"If enabled, Contacts requesting authorization will be accepted automatically."
 msgstr ""
 
-#: gajim/common/config.py:323
+#: gajim/common/config.py:324
 #, fuzzy
 msgid ""
-"If False, this account will be disabled and will not appear in roster window."
+"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."
 
-#: gajim/common/config.py:327
-msgid "Allow plaintext connections"
+#: gajim/common/config.py:328
+msgid "Allow plaintext connections."
 msgstr ""
 
-#: gajim/common/config.py:330
+#: gajim/common/config.py:331
 msgid ""
-"List (space separated) of authentication mechanisms to try. Can contain "
-"ANONYMOUS, EXTERNAL, GSSAPI, SCRAM-SHA-1-PLUS, SCRAM-SHA-1, DIGEST-MD5, "
-"PLAIN, X-MESSENGER-OAUTH2 or XEP-0078"
+"List of authentication mechanisms to try (space separated). Can contain "
+"'ANONYMOUS', 'EXTERNAL', 'GSSAPI', 'SCRAM-SHA-1-PLUS', 'SCRAM-SHA-1', "
+"'DIGEST-MD5', 'PLAIN', 'X-MESSENGER-OAUTH2' or 'XEP-0078'."
 msgstr ""
 
-#: gajim/common/config.py:331
+#: gajim/common/config.py:332
 #, fuzzy
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection. "
-"Can be 'warn', 'connect', 'disconnect'"
+"Can be 'warn', 'connect' or 'disconnect'."
 msgstr ""
 "Muestra un aviso antes de enviar la contraseña a través de una conexión de "
 "texto plano."
 
-#: gajim/common/config.py:332
+#: gajim/common/config.py:333
 msgid "Show a warning dialog before using standard SSL library."
 msgstr "Muestra un aviso antes de usar la librería SSL estándar"
 
-#: gajim/common/config.py:333
+#: gajim/common/config.py:334
 #, fuzzy
 msgid ""
 "Show a warning dialog before sending PLAIN password over a plain connection."
@@ -3861,66 +3870,74 @@ msgstr ""
 "Muestra un aviso antes de enviar la contraseña a través de una conexión de "
 "texto plano."
 
-#: gajim/common/config.py:334
-msgid "Space separated list of ssl errors to ignore."
-msgstr "Lista separada por espacios de errores ssl a ignorar."
+#: gajim/common/config.py:335
+msgid "List of SSL errors to ignore (space separated)."
+msgstr ""
 
-#: gajim/common/config.py:340
+#: gajim/common/config.py:341
 msgid ""
-"Space separated list of JIDs for which you do not want to store logs. You "
-"can also add account name to log nothing for this account."
+"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:341
+#: gajim/common/config.py:342
 msgid ""
-"Space separated list of JIDs for which you accept to not log conversations "
-"if he does not want to."
+"List of XMPP Addresses (space separated) for which you accept to not store "
+"chat history if your contact does not want to."
 msgstr ""
 
-#: gajim/common/config.py:343
-msgid "Whitespace sent after inactivity"
+#: gajim/common/config.py:344
+#, fuzzy
+msgid "If enabled, a whitespace is sent after inactivity (keep alive)."
 msgstr "Espacio en blanco enviado tras inactividad"
 
-#: gajim/common/config.py:344
-msgid "XMPP ping sent after inactivity"
+#: gajim/common/config.py:345
+#, fuzzy
+msgid "If enabled, an XMPP ping is sent after inactivity (ping alive)."
 msgstr "Ping XMPP enviado tras inactividad"
 
-#: gajim/common/config.py:348
+#: gajim/common/config.py:349
 #, fuzzy
 msgid ""
-"How many seconds to wait for the answer of ping alive packet before trying "
-"to reconnect?"
+"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."
 
-#: gajim/common/config.py:352
-msgid "Jabberd2 workaround"
+#: gajim/common/config.py:353
+#, fuzzy
+msgid "Jabberd2 workaround."
 msgstr "Corrección Jabberd2"
 
-#: gajim/common/config.py:355
+#: gajim/common/config.py:356
+#, fuzzy
 msgid ""
-"If checked, Gajim will use your IP and proxies defined in "
-"file_transfer_proxies option for file transfer."
+"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."
 
-#: gajim/common/config.py:356
+#: gajim/common/config.py:357
 msgid ""
-"If true, Gajim will test file transfer proxies on startup to be sure it "
-"works. Openfire's proxies are known to fail this test even if they work."
+"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:369
-msgid "Answer to receipt requests"
-msgstr "Contestar peticiones recibidas"
-
 #: gajim/common/config.py:370
-msgid "Sent receipt requests"
-msgstr "Enviar peticiones recibidas"
+#, fuzzy
+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."
 
-#: gajim/common/config.py:379
+#: gajim/common/config.py:371
+msgid "If enabled, Gajim will send message receipt requests."
+msgstr ""
+
+#: gajim/common/config.py:380
 #, fuzzy
 msgid ""
 "Allow Gajim to send information about the operating system you are running."
@@ -3928,182 +3945,194 @@ msgstr ""
 "Si está marcado, Gajim permitirá a otros detectar el sistema operativo que "
 "estás usando"
 
-#: gajim/common/config.py:380
+#: gajim/common/config.py:381
 msgid "Allow Gajim to send your local time."
 msgstr "Permita que Gajim envíe su hora local."
 
-#: gajim/common/config.py:383
+#: gajim/common/config.py:384
 #, fuzzy
-msgid "Message that is sent to contacts you want to add"
+msgid "Message that is sent to contacts you want to add."
 msgstr "Por favor, rellena la información del contacto que quieres añadir"
 
-#: gajim/common/config.py:384
-msgid ""
-"If enabled, Gajim will send your local IPs so your contact can connect to "
-"your machine to transfer files."
-msgstr ""
-
 #: gajim/common/config.py:385
+#, fuzzy
 msgid ""
-"Space separated list of JIDs for which chat window will be re-opened on next "
-"startup."
+"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."
 
-#: gajim/common/config.py:387
-msgid "HTTP Upload: Enable HTTPS Verification"
+#: gajim/common/config.py:386
+msgid ""
+"List of XMPP Addresses (space separated) for which the chat window will be "
+"re-opened on next startup."
 msgstr ""
 
 #: gajim/common/config.py:388
-msgid ""
-"Preferred file transfer mechanism for file drag&drop on chat window. Can be "
-"'httpupload' (default) or 'jingle'"
+msgid "HTTP File Upload: Enable HTTPS Verification."
 msgstr ""
 
 #: gajim/common/config.py:389
-msgid "Allow cert verification with POSH"
+msgid ""
+"Preferred file transfer mechanism for file drag&drop on a chat window. Can "
+"be 'httpupload' (default) or 'jingle'."
 msgstr ""
 
-#: gajim/common/config.py:423 gajim/common/config.py:430
-#, fuzzy
-msgid "Language for which misspelled words will be checked"
-msgstr "Lenguaje en el que queremos comprobar errores ortográficos"
-
-#: gajim/common/config.py:427
-msgid "The currently active encryption for that contact"
-msgstr "Cifrado actual activo para este contacto"
+#: gajim/common/config.py:390
+msgid "Allow certificate verification with POSH."
+msgstr "Permitir verificación de certificado con POSH."
 
-#: gajim/common/config.py:431
+#: gajim/common/config.py:425
+#, fuzzy
 msgid ""
-"How many lines to request from server when entering a groupchat. -1 means no "
-"limit, -2 means global value"
+"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."
+
+#: gajim/common/config.py:428
+#, fuzzy
+msgid "The currently active encryption for that contact."
+msgstr "Cifrado actual activo para este contacto"
 
 #: gajim/common/config.py:432
 msgid ""
-"Minutes of backlog to request when entering a groupchat. -1 means no limit, "
-"-2 means global value"
+"If enabled, a notification is created for every message in this group chat."
 msgstr ""
 
 #: gajim/common/config.py:433
-msgid "State whether a notification is created for every message in this room"
-msgstr ""
-
-#: gajim/common/config.py:434
+#, fuzzy
 msgid ""
-"Show a status message for all status (away, dnd, etc.) changes of users in a "
-"group chat"
-msgstr ""
+"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"
 
-#: gajim/common/config.py:435
+#: gajim/common/config.py:434
 #, fuzzy
-msgid "Show a status message for every join or leave in a group chat"
+msgid "Show a status message for every join or leave in a group chat."
 msgstr "No se pudo entrar al grupo de charla"
 
+#: gajim/common/config.py:435
+msgid ""
+"If enabled, the group chat is minimized into the contact list when joining "
+"automatically."
+msgstr ""
+
 #: gajim/common/config.py:436
-msgid "If the group chat is minimized into the roster on autojoin"
+msgid ""
+"If enabled, the group chat is minimized into the contact list when closing "
+"it."
 msgstr ""
 
 #: gajim/common/config.py:437
-msgid "If the group chat is minimized into the roster on close"
+#, fuzzy
+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."
 
-#: gajim/common/config.py:441
+#: gajim/common/config.py:440
 msgid ""
-"State whether plugins should be activated on startup (this is saved on Gajim "
-"exit). This option SHOULD NOT be used to (de)activate plug-ins. Use GUI "
-"instead."
+"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:446 gajim/common/const.py:281
+#: gajim/common/config.py:445 gajim/common/const.py:315
 msgid "Sleeping"
 msgstr "Durmiendo"
 
-#: gajim/common/config.py:447
+#: gajim/common/config.py:446
 msgid "Back soon"
 msgstr "Vuelvo pronto"
 
-#: gajim/common/config.py:447
+#: gajim/common/config.py:446
 msgid "Back in some minutes."
 msgstr "Vuelvo en unos minutos."
 
-#: gajim/common/config.py:448 gajim/common/const.py:247
+#: gajim/common/config.py:447 gajim/common/const.py:281
 msgid "Eating"
 msgstr "Comiendo"
 
-#: gajim/common/config.py:448
-msgid "I'm eating, so leave me a message."
-msgstr "Estoy comiendo, déjame un mensaje."
+#: gajim/common/config.py:447
+#, fuzzy
+msgid "I'm eating."
+msgstr "Estoy trabajando."
 
-#: gajim/common/config.py:449
+#: gajim/common/config.py:448
 msgid "Movie"
 msgstr "Película"
 
-#: gajim/common/config.py:449
+#: gajim/common/config.py:448
 msgid "I'm watching a movie."
 msgstr "Estoy viendo una película."
 
-#: gajim/common/config.py:450 gajim/common/const.py:314
+#: gajim/common/config.py:449 gajim/common/const.py:348
 msgid "Working"
 msgstr "Trabajando"
 
-#: gajim/common/config.py:450
+#: gajim/common/config.py:449
 msgid "I'm working."
 msgstr "Estoy trabajando."
 
-#: gajim/common/config.py:451
+#: gajim/common/config.py:450
 msgid "Phone"
 msgstr "Teléfono"
 
-#: gajim/common/config.py:451
+#: gajim/common/config.py:450
 msgid "I'm on the phone."
 msgstr "Estoy al teléfono."
 
-#: gajim/common/config.py:452
+#: gajim/common/config.py:451
 msgid "Out"
 msgstr "Fuera"
 
-#: gajim/common/config.py:452
+#: gajim/common/config.py:451
 msgid "I'm out enjoying life."
 msgstr "Estoy fuera disfrutando la vida"
 
-#: gajim/common/config.py:463
+#: gajim/common/config.py:462
 msgid "I'm available."
 msgstr "Estoy disponible"
 
-#: gajim/common/config.py:464
+#: gajim/common/config.py:463
 msgid "I'm free for chat."
 msgstr "Estoy libre para hablar"
 
-#: gajim/common/config.py:465 gajim/gtk/accounts.py:134
+#: gajim/common/config.py:464 gajim/gtk/accounts.py:133
 msgid "Be right back."
 msgstr "Vuelvo pronto"
 
-#: gajim/common/config.py:466
+#: gajim/common/config.py:465
 msgid "I'm not available."
 msgstr "No estoy disponible."
 
-#: gajim/common/config.py:467
+#: gajim/common/config.py:466
 msgid "Do not disturb."
 msgstr "No molestar."
 
-#: gajim/common/config.py:468 gajim/common/config.py:469
+#: gajim/common/config.py:467 gajim/common/config.py:468
 msgid "Bye!"
 msgstr "¡Adiós!"
 
-#: gajim/common/config.py:480
+#: gajim/common/config.py:479
+#, fuzzy
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
-"muc_highlight_words, or when a group chat message contains your nickname."
+"'muc_highlight_words' 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."
 
-#: gajim/common/config.py:481
-msgid "Sound to play when any MUC message arrives."
+#: gajim/common/config.py:480
+#, fuzzy
+msgid "Sound to play when any group chat message arrives."
 msgstr "Sonido a reproducir cuando llega cualquier mensaje MUC"
 
-#: gajim/common/config.py:485
+#: gajim/common/config.py:484
 #, fuzzy
 msgid "Tor"
 msgstr "A"
@@ -4113,879 +4142,973 @@ msgstr "A"
 msgid "Error: cannot open %s for reading"
 msgstr "Error: no se puede abrir %s para lectura"
 
-#: gajim/common/const.py:214
-msgid "This message was encrypted with OTR and could not be decrypted."
-msgstr ""
+#: gajim/common/const.py:216
+#, fuzzy
+msgid "?Group chat name:Team"
+msgstr "Ninguno"
 
 #: gajim/common/const.py:217
+msgid "?Group chat description:Project discussion"
+msgstr ""
+
+#: gajim/common/const.py:218
+#, fuzzy
+msgid "?Group chat address:team"
+msgstr "Grupos de charla"
+
+#: gajim/common/const.py:219
+#, fuzzy
+msgid "?Group chat name:Family"
+msgstr "Resaltado de mensaje de grupo de charla"
+
+#: gajim/common/const.py:220
+msgid "?Group chat description:Spring gathering"
+msgstr ""
+
+#: gajim/common/const.py:221
+msgid "?Group chat address:family"
+msgstr ""
+
+#: gajim/common/const.py:222
+#, fuzzy
+msgid "?Group chat name:Vacation"
+msgstr "Invitación a grupo de charla"
+
+#: gajim/common/const.py:223
+msgid "?Group chat description:Trip planning"
+msgstr ""
+
+#: gajim/common/const.py:224
+#, fuzzy
+msgid "?Group chat address:vacation"
+msgstr "Invitación a grupo de charla"
+
+#: gajim/common/const.py:225
+#, fuzzy
+msgid "?Group chat name:Repairs"
+msgstr "Grupos de charla"
+
+#: gajim/common/const.py:226
+msgid "?Group chat description:Local help group"
+msgstr ""
+
+#: gajim/common/const.py:227
+#, fuzzy
+msgid "?Group chat address:repairs"
+msgstr "Grupos de charla"
+
+#: gajim/common/const.py:228
+#, fuzzy
+msgid "?Group chat name:News"
+msgstr "Ninguno"
+
+#: gajim/common/const.py:229
+#, fuzzy
+msgid "?Group chat description:Local news and reports"
+msgstr "La creación de grupos de charla está restringida."
+
+#: gajim/common/const.py:230
+#, fuzzy
+msgid "?Group chat address:news"
+msgstr "Nuevo grupo de charla"
+
+#: gajim/common/const.py:235
+#, fuzzy
+msgid "Remote server not found"
+msgstr "El servicio no fue encontrado"
+
+#: gajim/common/const.py:236
+msgid "Remote server timeout"
+msgstr ""
+
+#: gajim/common/const.py:237 gajim/common/const.py:238
+#: gajim/common/const.py:239
+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:240
+#, fuzzy
+msgid "Group chat already exists"
+msgstr "La cuenta local ya existe."
+
+#: gajim/common/const.py:241
+msgid "Group chat does not exist"
+msgstr "El grupo de charla no existe"
+
+#: gajim/common/const.py:247
+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:250
 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:221
+#: gajim/common/const.py:254
 msgid ""
-"This message was encrypted with OpenPGP for XMPP and could not be decrypted."
+"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:224
+#: gajim/common/const.py:258
 #, python-format
 msgid "This message was encrypted with %s and could not be decrypted."
-msgstr ""
+msgstr "Este mensaje fue cifrado con %s y no se pudo descifrar."
 
-#: gajim/common/const.py:231
+#: gajim/common/const.py:265
 msgid "Doing Chores"
 msgstr "Haciendo tareas"
 
-#: gajim/common/const.py:232
+#: gajim/common/const.py:266
 msgid "Buying Groceries"
 msgstr "Haciendo la compra"
 
-#: gajim/common/const.py:233
+#: gajim/common/const.py:267
 msgid "Cleaning"
 msgstr "Limpiando"
 
-#: gajim/common/const.py:234
+#: gajim/common/const.py:268
 msgid "Cooking"
 msgstr "Cocinando"
 
-#: gajim/common/const.py:235
+#: gajim/common/const.py:269
 msgid "Doing Maintenance"
 msgstr "Tareas de mantenimiento"
 
-#: gajim/common/const.py:236
+#: gajim/common/const.py:270
 msgid "Doing the Dishes"
 msgstr "Fregando los platos"
 
-#: gajim/common/const.py:237
+#: gajim/common/const.py:271
 msgid "Doing the Laundry"
 msgstr "Haciendo la colada"
 
-#: gajim/common/const.py:238
+#: gajim/common/const.py:272
 msgid "Gardening"
 msgstr "Arreglando el jardín"
 
-#: gajim/common/const.py:239
+#: gajim/common/const.py:273
 msgid "Running an Errand"
 msgstr "Haciendo un recado"
 
-#: gajim/common/const.py:240
+#: gajim/common/const.py:274
 msgid "Walking the Dog"
 msgstr "Paseando al perro"
 
-#: gajim/common/const.py:242
+#: gajim/common/const.py:276
 msgid "Drinking"
 msgstr "Bebiendo"
 
-#: gajim/common/const.py:243
+#: gajim/common/const.py:277
 msgid "Having a Beer"
 msgstr "Tomando una cerveza"
 
-#: gajim/common/const.py:244
+#: gajim/common/const.py:278
 msgid "Having Coffee"
 msgstr "Tomando café"
 
-#: gajim/common/const.py:245
+#: gajim/common/const.py:279
 msgid "Having Tea"
 msgstr "Tomando té"
 
-#: gajim/common/const.py:248
+#: gajim/common/const.py:282
 msgid "Having a Snack"
 msgstr "Tomando un tentempié"
 
-#: gajim/common/const.py:249
+#: gajim/common/const.py:283
 msgid "Having Breakfast"
 msgstr "Desayunando"
 
-#: gajim/common/const.py:250
+#: gajim/common/const.py:284
 msgid "Having Dinner"
 msgstr "Cenando"
 
-#: gajim/common/const.py:251
+#: gajim/common/const.py:285
 msgid "Having Lunch"
 msgstr "Almorzando"
 
-#: gajim/common/const.py:253
+#: gajim/common/const.py:287
 msgid "Exercising"
 msgstr "Haciendo ejercicio"
 
-#: gajim/common/const.py:254 gajim/common/const.py:305
+#: gajim/common/const.py:288 gajim/common/const.py:339
 msgid "Cycling"
 msgstr "Montando en bici"
 
-#: gajim/common/const.py:255
+#: gajim/common/const.py:289
 msgid "Dancing"
 msgstr "Bailando"
 
-#: gajim/common/const.py:256
+#: gajim/common/const.py:290
 msgid "Hiking"
 msgstr "Paseando"
 
-#: gajim/common/const.py:257
+#: gajim/common/const.py:291
 msgid "Jogging"
 msgstr "Corriendo"
 
-#: gajim/common/const.py:258
+#: gajim/common/const.py:292
 msgid "Playing Sports"
 msgstr "Haciendo deporte"
 
-#: gajim/common/const.py:259
+#: gajim/common/const.py:293
 msgid "Running"
 msgstr "Corriendo"
 
-#: gajim/common/const.py:260
+#: gajim/common/const.py:294
 msgid "Skiing"
 msgstr "Esquiando"
 
-#: gajim/common/const.py:261
+#: gajim/common/const.py:295
 msgid "Swimming"
 msgstr "Nadando"
 
-#: gajim/common/const.py:262
+#: gajim/common/const.py:296
 msgid "Working out"
 msgstr "Trabajando"
 
-#: gajim/common/const.py:264
+#: gajim/common/const.py:298
 msgid "Grooming"
 msgstr "Lavando"
 
-#: gajim/common/const.py:265
+#: gajim/common/const.py:299
 msgid "At the Spa"
 msgstr "En el spa"
 
-#: gajim/common/const.py:266
+#: gajim/common/const.py:300
 msgid "Brushing Teeth"
 msgstr "Lavando los dientes"
 
-#: gajim/common/const.py:267
+#: gajim/common/const.py:301
 msgid "Getting a Haircut"
 msgstr "Cortando el pelo"
 
-#: gajim/common/const.py:268
+#: gajim/common/const.py:302
 msgid "Shaving"
 msgstr "Afeitándome"
 
-#: gajim/common/const.py:269
+#: gajim/common/const.py:303
 msgid "Taking a Bath"
 msgstr "Tomando un baño"
 
-#: gajim/common/const.py:270
+#: gajim/common/const.py:304
 msgid "Taking a Shower"
 msgstr "Duchándome"
 
-#: gajim/common/const.py:272
+#: gajim/common/const.py:306
 msgid "Having an Appointment"
 msgstr "En una cita"
 
-#: gajim/common/const.py:274
+#: gajim/common/const.py:308
 msgid "Inactive"
 msgstr "Inactivo"
 
-#: gajim/common/const.py:275
+#: gajim/common/const.py:309
 msgid "Day Off"
 msgstr "Fin del día"
 
-#: gajim/common/const.py:276
+#: gajim/common/const.py:310
 msgid "Hanging out"
 msgstr "Saliendo por ahi"
 
-#: gajim/common/const.py:277
+#: gajim/common/const.py:311
 msgid "Hiding"
 msgstr "Escondiéndome"
 
-#: gajim/common/const.py:278
+#: gajim/common/const.py:312
 msgid "On Vacation"
 msgstr "De vacaciones"
 
-#: gajim/common/const.py:279
+#: gajim/common/const.py:313
 msgid "Praying"
 msgstr "Rezando"
 
-#: gajim/common/const.py:280
+#: gajim/common/const.py:314
 msgid "Scheduled Holiday"
 msgstr "Vacaciones planificadas"
 
-#: gajim/common/const.py:282
+#: gajim/common/const.py:316
 msgid "Thinking"
 msgstr "Pensando"
 
-#: gajim/common/const.py:284
+#: gajim/common/const.py:318
 msgid "Relaxing"
 msgstr "Relajándome"
 
-#: gajim/common/const.py:285
+#: gajim/common/const.py:319
 msgid "Fishing"
 msgstr "Pescando"
 
-#: gajim/common/const.py:286
+#: gajim/common/const.py:320
 msgid "Gaming"
 msgstr "Jugando"
 
-#: gajim/common/const.py:287
+#: gajim/common/const.py:321
 msgid "Going out"
 msgstr "Saliendo"
 
-#: gajim/common/const.py:288
+#: gajim/common/const.py:322
 msgid "Partying"
 msgstr "De fiesta"
 
-#: gajim/common/const.py:289
+#: gajim/common/const.py:323
 msgid "Reading"
 msgstr "Leyendo"
 
-#: gajim/common/const.py:290
+#: gajim/common/const.py:324
 msgid "Rehearsing"
 msgstr "Ensayando"
 
-#: gajim/common/const.py:291
+#: gajim/common/const.py:325
 msgid "Shopping"
 msgstr "Comprando"
 
-#: gajim/common/const.py:292
+#: gajim/common/const.py:326
 msgid "Smoking"
 msgstr "Fumando"
 
-#: gajim/common/const.py:293
+#: gajim/common/const.py:327
 msgid "Socializing"
 msgstr "Socializándome"
 
-#: gajim/common/const.py:294
+#: gajim/common/const.py:328
 msgid "Sunbathing"
 msgstr "En el solarium"
 
-#: gajim/common/const.py:295
+#: gajim/common/const.py:329
 msgid "Watching TV"
 msgstr "Viendo la TV"
 
-#: gajim/common/const.py:296
+#: gajim/common/const.py:330
 msgid "Watching a Movie"
 msgstr "Viendo una película"
 
-#: gajim/common/const.py:298
+#: gajim/common/const.py:332
 msgid "Talking"
 msgstr "Hablando"
 
-#: gajim/common/const.py:299
+#: gajim/common/const.py:333
 msgid "In Real Life"
 msgstr "En la vida real"
 
-#: gajim/common/const.py:300
+#: gajim/common/const.py:334
 msgid "On the Phone"
 msgstr "Al teléfono"
 
-#: gajim/common/const.py:301
+#: gajim/common/const.py:335
 msgid "On Video Phone"
 msgstr "Al videoteléfono"
 
-#: gajim/common/const.py:303
+#: gajim/common/const.py:337
 msgid "Traveling"
 msgstr "Viajando"
 
-#: gajim/common/const.py:304
+#: gajim/common/const.py:338
 msgid "Commuting"
 msgstr "Conmutar"
 
-#: gajim/common/const.py:306
+#: gajim/common/const.py:340
 msgid "Driving"
 msgstr "Conduciendo"
 
-#: gajim/common/const.py:307
+#: gajim/common/const.py:341
 msgid "In a Car"
 msgstr "En el coche"
 
-#: gajim/common/const.py:308
+#: gajim/common/const.py:342
 msgid "On a Bus"
 msgstr "En el bus"
 
-#: gajim/common/const.py:309
+#: gajim/common/const.py:343
 msgid "On a Plane"
 msgstr "En el avión"
 
-#: gajim/common/const.py:310
+#: gajim/common/const.py:344
 msgid "On a Train"
 msgstr "En el tren"
 
-#: gajim/common/const.py:311
+#: gajim/common/const.py:345
 msgid "On a Trip"
 msgstr "En un viaje"
 
-#: gajim/common/const.py:312
+#: gajim/common/const.py:346
 msgid "Walking"
 msgstr "Caminando"
 
-#: gajim/common/const.py:315
+#: gajim/common/const.py:349
 msgid "Coding"
 msgstr "Programando"
 
-#: gajim/common/const.py:316
+#: gajim/common/const.py:350
 msgid "In a Meeting"
 msgstr "En un encuentro"
 
-#: gajim/common/const.py:317
+#: gajim/common/const.py:351
 msgid "Studying"
 msgstr "Estudiando"
 
-#: gajim/common/const.py:318
+#: gajim/common/const.py:352
 msgid "Writing"
 msgstr "Escribiendo"
 
-#: gajim/common/const.py:321
+#: gajim/common/const.py:355
 msgid "Afraid"
 msgstr "Miedoso"
 
-#: gajim/common/const.py:322
+#: gajim/common/const.py:356
 msgid "Amazed"
 msgstr "Impresionado"
 
-#: gajim/common/const.py:323
+#: gajim/common/const.py:357
 msgid "Amorous"
 msgstr "Amoroso"
 
-#: gajim/common/const.py:324
+#: gajim/common/const.py:358
 msgid "Angry"
 msgstr "Enfadado"
 
-#: gajim/common/const.py:325
+#: gajim/common/const.py:359
 msgid "Annoyed"
 msgstr "Molesto"
 
-#: gajim/common/const.py:326
+#: gajim/common/const.py:360
 msgid "Anxious"
 msgstr "Ansioso"
 
-#: gajim/common/const.py:327
+#: gajim/common/const.py:361
 msgid "Aroused"
 msgstr "Despierto"
 
-#: gajim/common/const.py:328
+#: gajim/common/const.py:362
 msgid "Ashamed"
 msgstr "Avergonzado"
 
-#: gajim/common/const.py:329
+#: gajim/common/const.py:363
 msgid "Bored"
 msgstr "Aburrido"
 
-#: gajim/common/const.py:330
+#: gajim/common/const.py:364
 msgid "Brave"
 msgstr "Animado"
 
-#: gajim/common/const.py:331
+#: gajim/common/const.py:365
 msgid "Calm"
 msgstr "Calmado"
 
-#: gajim/common/const.py:332
+#: gajim/common/const.py:366
 msgid "Cautious"
 msgstr "Cauto"
 
-#: gajim/common/const.py:333
+#: gajim/common/const.py:367
 msgid "Cold"
 msgstr "Frío"
 
-#: gajim/common/const.py:334
+#: gajim/common/const.py:368
 msgid "Confident"
 msgstr "Confiado"
 
-#: gajim/common/const.py:335
+#: gajim/common/const.py:369
 msgid "Confused"
 msgstr "Confuso"
 
-#: gajim/common/const.py:336
+#: gajim/common/const.py:370
 msgid "Contemplative"
 msgstr "Contemplativo"
 
-#: gajim/common/const.py:337
+#: gajim/common/const.py:371
 msgid "Contented"
 msgstr "Contento"
 
-#: gajim/common/const.py:338
+#: gajim/common/const.py:372
 msgid "Cranky"
 msgstr "Irritable"
 
-#: gajim/common/const.py:339
+#: gajim/common/const.py:373
 msgid "Crazy"
 msgstr "Alocado"
 
-#: gajim/common/const.py:340
+#: gajim/common/const.py:374
 msgid "Creative"
 msgstr "Creativo"
 
-#: gajim/common/const.py:341
+#: gajim/common/const.py:375
 msgid "Curious"
 msgstr "Curioso"
 
-#: gajim/common/const.py:342
+#: gajim/common/const.py:376
 msgid "Dejected"
 msgstr "Desanimado"
 
-#: gajim/common/const.py:343
+#: gajim/common/const.py:377
 msgid "Depressed"
 msgstr "Deprimido"
 
-#: gajim/common/const.py:344
+#: gajim/common/const.py:378
 msgid "Disappointed"
 msgstr "Decepcionado"
 
-#: gajim/common/const.py:345
+#: gajim/common/const.py:379
 msgid "Disgusted"
 msgstr "Disgustado"
 
-#: gajim/common/const.py:346
+#: gajim/common/const.py:380
 msgid "Dismayed"
 msgstr "Consternado"
 
-#: gajim/common/const.py:347
+#: gajim/common/const.py:381
 msgid "Distracted"
 msgstr "Distraído"
 
-#: gajim/common/const.py:348
+#: gajim/common/const.py:382
 msgid "Embarrassed"
 msgstr "Vergonzoso"
 
-#: gajim/common/const.py:349
+#: gajim/common/const.py:383
 msgid "Envious"
 msgstr "Envidioso"
 
-#: gajim/common/const.py:350
+#: gajim/common/const.py:384
 msgid "Excited"
 msgstr "Excitado"
 
-#: gajim/common/const.py:351
+#: gajim/common/const.py:385
 msgid "Flirtatious"
 msgstr "Flirteador"
 
-#: gajim/common/const.py:352
+#: gajim/common/const.py:386
 msgid "Frustrated"
 msgstr "Frustrado"
 
-#: gajim/common/const.py:353
+#: gajim/common/const.py:387
 msgid "Grateful"
 msgstr "Agradecido"
 
-#: gajim/common/const.py:354
+#: gajim/common/const.py:388
 msgid "Grieving"
 msgstr "Dolido"
 
-#: gajim/common/const.py:355
+#: gajim/common/const.py:389
 msgid "Grumpy"
 msgstr "Malhumorado"
 
-#: gajim/common/const.py:356
+#: gajim/common/const.py:390
 msgid "Guilty"
 msgstr "Culpable"
 
-#: gajim/common/const.py:357
+#: gajim/common/const.py:391
 msgid "Happy"
 msgstr "Feliz"
 
-#: gajim/common/const.py:358
+#: gajim/common/const.py:392
 msgid "Hopeful"
 msgstr "Deseoso"
 
-#: gajim/common/const.py:359
+#: gajim/common/const.py:393
 msgid "Hot"
 msgstr "Caliente"
 
-#: gajim/common/const.py:360
+#: gajim/common/const.py:394
 msgid "Humbled"
 msgstr "Humilde"
 
-#: gajim/common/const.py:361
+#: gajim/common/const.py:395
 msgid "Humiliated"
 msgstr "Humillado"
 
-#: gajim/common/const.py:362
+#: gajim/common/const.py:396
 msgid "Hungry"
 msgstr "Hambriento"
 
-#: gajim/common/const.py:363
+#: gajim/common/const.py:397
 msgid "Hurt"
 msgstr "Dolido"
 
-#: gajim/common/const.py:364
+#: gajim/common/const.py:398
 msgid "Impressed"
 msgstr "Impresionado"
 
-#: gajim/common/const.py:365
+#: gajim/common/const.py:399
 msgid "In Awe"
 msgstr "Atemorizado"
 
-#: gajim/common/const.py:366
+#: gajim/common/const.py:400
 msgid "In Love"
 msgstr "Enamorado"
 
-#: gajim/common/const.py:367
+#: gajim/common/const.py:401
 msgid "Indignant"
 msgstr "Indignado"
 
-#: gajim/common/const.py:368
+#: gajim/common/const.py:402
 msgid "Interested"
 msgstr "Curioso"
 
-#: gajim/common/const.py:369
+#: gajim/common/const.py:403
 msgid "Intoxicated"
 msgstr "Intoxicado"
 
-#: gajim/common/const.py:370
+#: gajim/common/const.py:404
 msgid "Invincible"
 msgstr "Invencible"
 
-#: gajim/common/const.py:371
+#: gajim/common/const.py:405
 msgid "Jealous"
 msgstr "Celoso"
 
-#: gajim/common/const.py:372
+#: gajim/common/const.py:406
 msgid "Lonely"
 msgstr "Solitario"
 
-#: gajim/common/const.py:373
+#: gajim/common/const.py:407
 msgid "Lost"
 msgstr "Perdido"
 
-#: gajim/common/const.py:374
+#: gajim/common/const.py:408
 msgid "Lucky"
 msgstr "Afortunado"
 
-#: gajim/common/const.py:375
+#: gajim/common/const.py:409
 msgid "Mean"
 msgstr "Significante"
 
-#: gajim/common/const.py:376
+#: gajim/common/const.py:410
 msgid "Moody"
 msgstr "Malhumorado"
 
-#: gajim/common/const.py:377
+#: gajim/common/const.py:411
 msgid "Nervous"
 msgstr "Nervioso"
 
-#: gajim/common/const.py:378
+#: gajim/common/const.py:412
 msgid "Neutral"
 msgstr "Neutral"
 
-#: gajim/common/const.py:379
+#: gajim/common/const.py:413
 msgid "Offended"
 msgstr "Ofendido"
 
-#: gajim/common/const.py:380
+#: gajim/common/const.py:414
 msgid "Outraged"
 msgstr "Escandalizado"
 
-#: gajim/common/const.py:381
+#: gajim/common/const.py:415
 msgid "Playful"
 msgstr "Juguetón"
 
-#: gajim/common/const.py:382
+#: gajim/common/const.py:416
 msgid "Proud"
 msgstr "Orgulloso"
 
-#: gajim/common/const.py:383
+#: gajim/common/const.py:417
 msgid "Relaxed"
 msgstr "Relajado"
 
-#: gajim/common/const.py:384
+#: gajim/common/const.py:418
 msgid "Relieved"
 msgstr "Aliviado"
 
-#: gajim/common/const.py:385
+#: gajim/common/const.py:419
 msgid "Remorseful"
 msgstr "Arrepentido"
 
-#: gajim/common/const.py:386
+#: gajim/common/const.py:420
 msgid "Restless"
 msgstr "Inquieto"
 
-#: gajim/common/const.py:387
+#: gajim/common/const.py:421
 msgid "Sad"
 msgstr "Triste"
 
-#: gajim/common/const.py:388
+#: gajim/common/const.py:422
 msgid "Sarcastic"
 msgstr "Sarcástico"
 
-#: gajim/common/const.py:389
+#: gajim/common/const.py:423
 msgid "Satisfied"
 msgstr "Satisfecho"
 
-#: gajim/common/const.py:390
+#: gajim/common/const.py:424
 msgid "Serious"
 msgstr "Serio"
 
-#: gajim/common/const.py:391
+#: gajim/common/const.py:425
 msgid "Shocked"
 msgstr "Horrorizado"
 
-#: gajim/common/const.py:392
+#: gajim/common/const.py:426
 msgid "Shy"
 msgstr "Tímido"
 
-#: gajim/common/const.py:393
+#: gajim/common/const.py:427
 msgid "Sick"
 msgstr "Enfermo"
 
-#: gajim/common/const.py:394
+#: gajim/common/const.py:428
 msgid "Sleepy"
 msgstr "Adormilado"
 
-#: gajim/common/const.py:395
+#: gajim/common/const.py:429
 msgid "Spontaneous"
 msgstr "Espontáneo"
 
-#: gajim/common/const.py:396
+#: gajim/common/const.py:430
 msgid "Stressed"
 msgstr "Estresado"
 
-#: gajim/common/const.py:397
+#: gajim/common/const.py:431
 msgid "Strong"
 msgstr "Fuerte"
 
-#: gajim/common/const.py:398
+#: gajim/common/const.py:432
 msgid "Surprised"
 msgstr "Sorprendido"
 
-#: gajim/common/const.py:399
+#: gajim/common/const.py:433
 msgid "Thankful"
 msgstr "Agradecido"
 
-#: gajim/common/const.py:400
+#: gajim/common/const.py:434
 msgid "Thirsty"
 msgstr "Sediento"
 
-#: gajim/common/const.py:401
+#: gajim/common/const.py:435
 msgid "Tired"
 msgstr "Cansado"
 
-#: gajim/common/const.py:402
+#: gajim/common/const.py:436
 msgid "Undefined"
 msgstr "Indefinido"
 
-#: gajim/common/const.py:403
+#: gajim/common/const.py:437
 msgid "Weak"
 msgstr "Débil"
 
-#: gajim/common/const.py:404
+#: gajim/common/const.py:438
 msgid "Worried"
 msgstr "Preocupado"
 
-#: gajim/common/const.py:408
+#: gajim/common/const.py:442
 msgid "accuracy"
-msgstr ""
+msgstr "precisión"
 
-#: gajim/common/const.py:409
+#: gajim/common/const.py:443
 #, fuzzy
 msgid "alt"
 msgstr "por defecto"
 
-#: gajim/common/const.py:410
+#: gajim/common/const.py:444
 msgid "area"
 msgstr ""
 
-#: gajim/common/const.py:411
+#: gajim/common/const.py:445
 #, fuzzy
 msgid "bearing"
 msgstr "marino"
 
-#: gajim/common/const.py:412
+#: gajim/common/const.py:446
 #, fuzzy
 msgid "building"
 msgstr "Escondiéndome"
 
-#: gajim/common/const.py:413
+#: gajim/common/const.py:447
 #, fuzzy
 msgid "country"
 msgstr "País:"
 
-#: gajim/common/const.py:414
+#: gajim/common/const.py:448
 #, fuzzy
 msgid "countrycode"
 msgstr "Cuenta"
 
-#: gajim/common/const.py:415
+#: gajim/common/const.py:449
 msgid "datum"
 msgstr ""
 
-#: gajim/common/const.py:416
+#: gajim/common/const.py:450
 #, fuzzy
 msgid "description"
 msgstr "Descripción"
 
-#: gajim/common/const.py:417
+#: gajim/common/const.py:451
 #, fuzzy
 msgid "error"
 msgstr "Error."
 
-#: gajim/common/const.py:418
+#: gajim/common/const.py:452
 msgid "floor"
 msgstr ""
 
-#: gajim/common/const.py:419
+#: gajim/common/const.py:453
 msgid "lat"
 msgstr ""
 
-#: gajim/common/const.py:420
+#: gajim/common/const.py:454
 msgid "locality"
 msgstr ""
 
-#: gajim/common/const.py:421
+#: gajim/common/const.py:455
 #, fuzzy
 msgid "lon"
 msgstr "uno"
 
-#: gajim/common/const.py:422
+#: gajim/common/const.py:456
 msgid "postalcode"
 msgstr ""
 
-#: gajim/common/const.py:423
+#: gajim/common/const.py:457
 msgid "region"
 msgstr ""
 
-#: gajim/common/const.py:424
+#: gajim/common/const.py:458
 msgid "room"
 msgstr "salón"
 
-#: gajim/common/const.py:425
+#: gajim/common/const.py:459
 msgid "speed"
 msgstr ""
 
-#: gajim/common/const.py:426
+#: gajim/common/const.py:460
 msgid "street"
 msgstr ""
 
-#: gajim/common/const.py:427
+#: gajim/common/const.py:461
 msgid "text"
 msgstr ""
 
-#: gajim/common/const.py:428
+#: gajim/common/const.py:462
 msgid "timestamp"
 msgstr ""
 
-#: gajim/common/const.py:429
+#: gajim/common/const.py:463
 msgid "URI"
 msgstr ""
 
-#: gajim/common/const.py:434
+#: gajim/common/const.py:468
 msgid "Unable to get issuer certificate"
 msgstr "No se puede obtener el certificado del emisor"
 
-#: gajim/common/const.py:435
+#: gajim/common/const.py:469
 msgid "Unable to get certificate CRL"
 msgstr "No se puede obtener el certificado CRL"
 
-#: gajim/common/const.py:436
+#: gajim/common/const.py:470
 msgid "Unable to decrypt certificate's signature"
 msgstr "No se puede descifrar la firma del certificado"
 
-#: gajim/common/const.py:437
+#: gajim/common/const.py:471
 msgid "Unable to decrypt CRL's signature"
 msgstr "No se puede descifrar la firma del CRL"
 
-#: gajim/common/const.py:438
+#: gajim/common/const.py:472
 msgid "Unable to decode issuer public key"
 msgstr "No se puede decodificar la clave pública del emisor"
 
-#: gajim/common/const.py:439
+#: gajim/common/const.py:473
 msgid "Certificate signature failure"
 msgstr "Fallo en la firma del certificado"
 
-#: gajim/common/const.py:440
+#: gajim/common/const.py:474
 msgid "CRL signature failure"
 msgstr "Fallo en la firma CRL"
 
-#: gajim/common/const.py:441
+#: gajim/common/const.py:475
 msgid "Certificate is not yet valid"
 msgstr "El certificado todavía no es válido"
 
-#: gajim/common/const.py:442
+#: gajim/common/const.py:476
 msgid "Certificate has expired"
 msgstr "El certificado ha expirado"
 
-#: gajim/common/const.py:443
+#: gajim/common/const.py:477
 msgid "CRL is not yet valid"
 msgstr "El CRL todavía no es válido"
 
-#: gajim/common/const.py:444
+#: gajim/common/const.py:478
 msgid "CRL has expired"
 msgstr "El CRL ha expirado"
 
-#: gajim/common/const.py:445
+#: gajim/common/const.py:479
 msgid "Format error in certificate's notBefore field"
 msgstr "Error de formato en el campo notBefore del certificado"
 
-#: gajim/common/const.py:446
+#: gajim/common/const.py:480
 msgid "Format error in certificate's notAfter field"
 msgstr "Error de formato en el campo notAfter del certificado"
 
-#: gajim/common/const.py:447
+#: gajim/common/const.py:481
 msgid "Format error in CRL's lastUpdate field"
 msgstr "Error de formato en el campo lastUpdate del CRL"
 
-#: gajim/common/const.py:448
+#: gajim/common/const.py:482
 msgid "Format error in CRL's nextUpdate field"
 msgstr "Error de formato en el campo nextUpdate del CRL"
 
-#: gajim/common/const.py:449
+#: gajim/common/const.py:483
 msgid "Out of memory"
 msgstr "Memoria llena"
 
-#: gajim/common/const.py:450
+#: gajim/common/const.py:484
 msgid "Self signed certificate"
 msgstr "Certificado autofirmado"
 
-#: gajim/common/const.py:451
+#: gajim/common/const.py:485
 msgid "Self signed certificate in certificate chain"
 msgstr "Certificado autofirmado en la cadena del certificado"
 
-#: gajim/common/const.py:452
+#: gajim/common/const.py:486
 msgid "Unable to get local issuer certificate"
 msgstr "No se puede obtener el certificado del emisor local"
 
-#: gajim/common/const.py:453
+#: gajim/common/const.py:487
 msgid "Unable to verify the first certificate"
 msgstr "No se puede verificar el primer certificado"
 
-#: gajim/common/const.py:454
+#: gajim/common/const.py:488
 msgid "Certificate chain too long"
 msgstr "La cadena del certificado es demasiado larga"
 
-#: gajim/common/const.py:455
+#: gajim/common/const.py:489
 msgid "Certificate revoked"
 msgstr "Certificado revocado"
 
-#: gajim/common/const.py:456
+#: gajim/common/const.py:490
 msgid "Invalid CA certificate"
 msgstr "Certificado CA no válido"
 
-#: gajim/common/const.py:457
+#: gajim/common/const.py:491
 msgid "Path length constraint exceeded"
 msgstr "La longitud de la ruta excedió el límite"
 
-#: gajim/common/const.py:458
+#: gajim/common/const.py:492
 msgid "Unsupported certificate purpose"
 msgstr "Propósito de certificado no soportado"
 
-#: gajim/common/const.py:459
+#: gajim/common/const.py:493
 msgid "Certificate not trusted"
 msgstr "El certificado no es de confianza"
 
-#: gajim/common/const.py:460
+#: gajim/common/const.py:494
 msgid "Certificate rejected"
 msgstr "Certificado rechazado"
 
-#: gajim/common/const.py:461
+#: gajim/common/const.py:495
 msgid "Subject issuer mismatch"
 msgstr "El emisor del asunto no coincide"
 
-#: gajim/common/const.py:462
+#: gajim/common/const.py:496
 msgid "Authority and subject key identifier mismatch"
 msgstr "La autoridad y el asunto de la clave identificadora no coinciden"
 
-#: gajim/common/const.py:463
+#: gajim/common/const.py:497
 msgid "Authority and issuer serial number mismatch"
 msgstr "La autoridad y el número de serie del emisor no coinciden"
 
-#: gajim/common/const.py:464
+#: gajim/common/const.py:498
 msgid "Key usage does not include certificate signing"
 msgstr "El uso de la clave no incluye la firma de certificados"
 
-#: gajim/common/const.py:465
+#: gajim/common/const.py:499
 msgid "Application verification failure"
 msgstr "Falló la verificación de la aplicación"
 
@@ -5084,9 +5207,9 @@ msgid "ALSA: %s"
 msgstr "Tamaño: %s"
 
 #: gajim/common/multimedia_helpers.py:78 gajim/common/multimedia_helpers.py:92
-#, fuzzy, python-format
+#, python-format
 msgid "Pulse: %s"
-msgstr "Archivo: %s"
+msgstr "Pulse: %s"
 
 #: gajim/common/multimedia_helpers.py:86
 msgid "Fake audio output"
@@ -5151,261 +5274,260 @@ msgstr ""
 msgid "video output"
 msgstr ""
 
-#: gajim/common/helpers.py:210
+#: gajim/common/helpers.py:216
 msgid "Server must be between 1 and 1023 bytes"
 msgstr ""
 
-#: gajim/common/helpers.py:214
+#: gajim/common/helpers.py:220
 msgid "Invalid character in hostname."
 msgstr "Carácter no válido en el nombre del host."
 
-#: gajim/common/helpers.py:216
+#: gajim/common/helpers.py:222
 msgid "Server address required."
 msgstr "Se requiere la dirección del servidor."
 
-#: gajim/common/helpers.py:220
+#: gajim/common/helpers.py:226
 msgid "Username must be between 1 and 1023 bytes"
 msgstr ""
 
-#: gajim/common/helpers.py:224
+#: gajim/common/helpers.py:230
 msgid "Invalid character in username."
 msgstr "Caracter no válido en el nombre de usuario."
 
-#: gajim/common/helpers.py:230
+#: gajim/common/helpers.py:236
 msgid "Resource must be between 1 and 1023 bytes"
 msgstr ""
 
-#: gajim/common/helpers.py:234
+#: gajim/common/helpers.py:240
 msgid "Invalid character in resource."
 msgstr "Carácter no válido en el recurso."
 
-#: gajim/common/helpers.py:275
+#: gajim/common/helpers.py:281
 msgid "_Busy"
 msgstr "_Ocupado"
 
-#: gajim/common/helpers.py:277 gajim/gtk/tooltips.py:647
+#: gajim/common/helpers.py:283 gajim/gtk/tooltips.py:647
 msgid "Busy"
 msgstr "Ocupado"
 
-#: gajim/common/helpers.py:280
+#: gajim/common/helpers.py:286
 msgid "_Not Available"
 msgstr "_No Disponible"
 
-#: gajim/common/helpers.py:282 gajim/gtk/tooltips.py:649
+#: gajim/common/helpers.py:288 gajim/gtk/tooltips.py:649
 msgid "Not Available"
 msgstr "No disponible"
 
-#: gajim/common/helpers.py:285
+#: gajim/common/helpers.py:291
 msgid "_Free for Chat"
 msgstr "_Libre para hablar"
 
-#: gajim/common/helpers.py:287 gajim/gtk/tooltips.py:643
+#: gajim/common/helpers.py:293 gajim/gtk/tooltips.py:643
 msgid "Free for Chat"
 msgstr "Libre para hablar"
 
-#: gajim/common/helpers.py:290
+#: gajim/common/helpers.py:296
 #, fuzzy
 msgid "?user status:_Available"
 msgstr "Pausada"
 
-#: gajim/common/helpers.py:292 gajim/gtk/tooltips.py:641
+#: gajim/common/helpers.py:298 gajim/gtk/tooltips.py:641
 #, fuzzy
 msgid "?user status:Available"
 msgstr "Pausada"
 
-#: gajim/common/helpers.py:294
+#: gajim/common/helpers.py:300
 msgid "Connecting"
 msgstr "Conectando"
 
-#: gajim/common/helpers.py:297 gajim/data/gui/preferences_window.ui:1251
+#: gajim/common/helpers.py:303 gajim/data/gui/preferences_window.ui:1251
 msgid "A_way"
 msgstr "A_usente"
 
-#: gajim/common/helpers.py:299 gajim/common/modules/adhoc_commands.py:120
-#: gajim/command_system/implementation/standard.py:139
+#: gajim/common/helpers.py:305 gajim/common/modules/adhoc_commands.py:120
+#: gajim/command_system/implementation/standard.py:141
 #: gajim/gtk/tooltips.py:645
 msgid "Away"
 msgstr "Ausente"
 
-#: gajim/common/helpers.py:302
+#: gajim/common/helpers.py:308
 msgid "_Offline"
 msgstr "D_esconectado"
 
-#: gajim/common/helpers.py:304 gajim/gtk/tooltips.py:651
+#: gajim/common/helpers.py:310 gajim/gtk/tooltips.py:651
 msgid "Offline"
 msgstr "Desconectado"
 
-#: gajim/common/helpers.py:307
+#: gajim/common/helpers.py:313
 msgid "_Invisible"
 msgstr "_Invisible"
 
-#: gajim/common/helpers.py:313
+#: gajim/common/helpers.py:319
 msgid "?contact has status:Unknown"
 msgstr "Desconocido"
 
-#: gajim/common/helpers.py:315
+#: gajim/common/helpers.py:321
 msgid "?contact has status:Has errors"
 msgstr "Tiene errores"
 
-#: gajim/common/helpers.py:330
+#: gajim/common/helpers.py:336
 msgid "?Subscription we already have:None"
 msgstr "Ninguna"
 
-#: gajim/common/helpers.py:332
+#: gajim/common/helpers.py:338
 msgid "To"
 msgstr "A"
 
-#: gajim/common/helpers.py:334 gajim/data/gui/groups_post_window.ui:33
+#: gajim/common/helpers.py:340 gajim/data/gui/groups_post_window.ui:33
 msgid "From"
 msgstr "De"
 
-#: gajim/common/helpers.py:336
+#: gajim/common/helpers.py:342
 msgid "Both"
 msgstr "Ambos"
 
-#: gajim/common/helpers.py:338 gajim/gtk/server_info.py:151
+#: gajim/common/helpers.py:344 gajim/gtk/server_info.py:151
 #, fuzzy
 msgid "Unknown"
 msgstr "Desconocido"
 
-#: gajim/common/helpers.py:344
+#: gajim/common/helpers.py:350
 msgid "?Ask (for Subscription):None"
 msgstr "Ninguna"
 
-#: gajim/common/helpers.py:346
+#: gajim/common/helpers.py:352
 msgid "Subscribe"
 msgstr "_Añadir"
 
-#: gajim/common/helpers.py:355
+#: gajim/common/helpers.py:361
 msgid "?Group Chat Contact Role:None"
 msgstr "Ninguno"
 
-#: gajim/common/helpers.py:358
+#: gajim/common/helpers.py:364
 msgid "Moderators"
 msgstr "Moderadores"
 
-#: gajim/common/helpers.py:360
+#: gajim/common/helpers.py:366
 msgid "Moderator"
 msgstr "Moderador"
 
-#: gajim/common/helpers.py:363
+#: gajim/common/helpers.py:369 gajim/data/gui/groupchat_info_scrolled.ui:243
 msgid "Participants"
 msgstr "Participantes"
 
-#: gajim/common/helpers.py:365
+#: gajim/common/helpers.py:371
 msgid "Participant"
 msgstr "Participante"
 
-#: gajim/common/helpers.py:368
+#: gajim/common/helpers.py:374
 msgid "Visitors"
 msgstr "Visitantes"
 
-#: gajim/common/helpers.py:370
+#: gajim/common/helpers.py:376
 msgid "Visitor"
 msgstr "Visitante"
 
-#: gajim/common/helpers.py:376 gajim/gtk/tooltips.py:253
+#: gajim/common/helpers.py:382 gajim/gtk/tooltips.py:253
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "Ninguno"
 
-#: gajim/common/helpers.py:378 gajim/data/gui/groupchat_config.ui:32
+#: gajim/common/helpers.py:384 gajim/data/gui/groupchat_config.ui:32
 #: gajim/gtk/tooltips.py:259
 msgid "Owner"
 msgstr "Propietario"
 
-#: gajim/common/helpers.py:380 gajim/gtk/tooltips.py:257
+#: gajim/common/helpers.py:386 gajim/gtk/tooltips.py:257
 msgid "Administrator"
 msgstr "Administrador"
 
-#: gajim/common/helpers.py:382 gajim/data/gui/groupchat_config.ui:40
+#: gajim/common/helpers.py:388 gajim/data/gui/groupchat_config.ui:40
 #: gajim/gtk/tooltips.py:255 gajim/gtk/groupchat_config.py:105
 msgid "Member"
 msgstr "Miembro"
 
-#: gajim/common/helpers.py:421
+#: gajim/common/helpers.py:427
 msgid "is paying attention to the conversation"
 msgstr "está prestando atención a la conversación"
 
-#: gajim/common/helpers.py:423
+#: gajim/common/helpers.py:429
 msgid "is doing something else"
 msgstr "está haciendo algo más"
 
-#: gajim/common/helpers.py:425
+#: gajim/common/helpers.py:431
 #, fuzzy
 msgid "is composing a message…"
 msgstr "está escribiendo..."
 
-#: gajim/common/helpers.py:428
+#: gajim/common/helpers.py:434
 msgid "paused composing a message"
 msgstr "ha parado de escribir"
 
-#: gajim/common/helpers.py:430
+#: gajim/common/helpers.py:436
 msgid "has closed the chat window or tab"
 msgstr "ha cerrado la ventana de chat"
 
-#: gajim/common/helpers.py:936 gajim/common/helpers.py:943
+#: gajim/common/helpers.py:942 gajim/common/helpers.py:949
 #, 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:950
-#, fuzzy, python-format
-msgid "from room %s"
-msgstr " del salón %s"
+#: gajim/common/helpers.py:956
+#, python-format
+msgid "from group chat %s"
+msgstr "desde el grupo de charla %s"
 
-#: gajim/common/helpers.py:953 gajim/common/helpers.py:970
+#: gajim/common/helpers.py:959 gajim/common/helpers.py:976
 #, fuzzy, python-format
 msgid "from user %s"
 msgstr " del usuario %s"
 
-#: gajim/common/helpers.py:955
+#: gajim/common/helpers.py:961
 #, fuzzy, python-format
 msgid "from %s"
 msgstr " de %s"
 
-#: gajim/common/helpers.py:962 gajim/common/helpers.py:968
+#: gajim/common/helpers.py:968 gajim/common/helpers.py:974
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d evento pendiente"
+msgstr[1] "%d eventos pendientes"
 
-#: gajim/common/helpers.py:986 gajim/common/helpers.py:998
+#: gajim/common/helpers.py:992 gajim/common/helpers.py:1004
 #: gajim/data/gui/roster_window.ui:85 data/org.gajim.Gajim.desktop.in:4
 #: data/org.gajim.Gajim.appdata.xml.in:9
 msgid "Gajim"
 msgstr "Gajim"
 
-#: gajim/common/helpers.py:1000
+#: gajim/common/helpers.py:1006
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: gajim/common/helpers.py:1109 gajim/data/gui/add_new_contact_window.ui:25
+#: gajim/common/helpers.py:1115 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:1111
+#: gajim/common/helpers.py:1117
 msgid "Hello, I am $name."
 msgstr "Hola, soy $name."
 
-#: gajim/common/helpers.py:1215 gajim/common/helpers.py:1224
-#: gajim/common/helpers.py:1282
+#: gajim/common/helpers.py:1221 gajim/common/helpers.py:1230
+#: gajim/common/helpers.py:1288
 msgid "Timeout loading image"
 msgstr "Expiró el tiempo para cargar la imagen"
 
-#: gajim/common/helpers.py:1234 gajim/common/helpers.py:1280
+#: gajim/common/helpers.py:1240 gajim/common/helpers.py:1286
 msgid "Image is too big"
 msgstr "La imagen es demasiado grande"
 
-#: gajim/common/helpers.py:1245
-#, fuzzy
+#: gajim/common/helpers.py:1251
 msgid "PyCURL is not installed"
-msgstr "El CRL todavía no es válido"
+msgstr "PyCURL no está instalado"
 
-#: gajim/common/helpers.py:1284
+#: gajim/common/helpers.py:1290
 #, fuzzy
 msgid "Error loading image"
 msgstr "Expiró el tiempo para cargar la imagen"
@@ -5542,7 +5664,7 @@ msgstr "El archivo no existe"
 #: gajim/common/modules/httpupload.py:209
 #, python-format
 msgid "File is too large, maximum allowed file size is: %s"
-msgstr ""
+msgstr "El fichero es demasiado grande, el tamaño máximo permitido es: %s"
 
 #: gajim/common/modules/adhoc_commands.py:86
 msgid "Change status information"
@@ -5586,7 +5708,8 @@ msgstr "Se ha cambiado el estado."
 
 #: gajim/common/modules/adhoc_commands.py:202
 #: gajim/common/modules/adhoc_commands.py:239
-msgid "Leave Groupchats"
+#, fuzzy
+msgid "Leave Group Chats"
 msgstr "Abandonar grupos de charla"
 
 #: gajim/common/modules/adhoc_commands.py:228
@@ -5595,15 +5718,18 @@ msgid "%(nickname)s on %(room_jid)s"
 msgstr "%(nickname)s en %(room_jid)s"
 
 #: gajim/common/modules/adhoc_commands.py:232
-msgid "You have not joined a groupchat."
+#, fuzzy
+msgid "You have not joined a group chat."
 msgstr "No has entrado al grupo de charla"
 
 #: gajim/common/modules/adhoc_commands.py:240
-msgid "Choose the groupchats you want to leave"
+#, fuzzy
+msgid "Choose the group chats you want to leave"
 msgstr "Elige los grupos de conversación que quieres abandonar"
 
 #: gajim/common/modules/adhoc_commands.py:289
-msgid "You left the following groupchats:"
+#, fuzzy
+msgid "You left the following group chats:"
 msgstr "Abandonaste los siguientes grupos de charla:"
 
 #: gajim/common/modules/roster_item_exchange.py:102
@@ -5619,7 +5745,7 @@ msgstr "Contactos enviados:"
 msgid "Blocked Contacts"
 msgstr "Contactos bloqueados"
 
-#: gajim/data/gui/destroy_muc_dialog.ui:79 gajim/gtk/dialogs.py:736
+#: gajim/data/gui/destroy_muc_dialog.ui:79 gajim/gtk/dialogs.py:563
 msgid "Destroy this group chat permanently?"
 msgstr ""
 
@@ -5628,7 +5754,7 @@ msgstr ""
 msgid "Reason..."
 msgstr "Motivo"
 
-#: gajim/data/gui/destroy_muc_dialog.ui:124 gajim/gtk/dialogs.py:738
+#: gajim/data/gui/destroy_muc_dialog.ui:124 gajim/gtk/dialogs.py:565
 msgid "Where participants should go (optional)"
 msgstr ""
 
@@ -5641,46 +5767,19 @@ msgstr ""
 msgid "_Reason and alternate venue (optional)"
 msgstr "También puedes introducir un lugar alternativo:"
 
-#: gajim/data/gui/advanced_configuration_window.ui:7
-#: gajim/data/gui/preferences_window.ui:2723
-#, fuzzy
-msgid "Advanced Configuration Editor (ACE)"
-msgstr "Editor avanzado de configurción"
-
-#: gajim/data/gui/advanced_configuration_window.ui:52
-msgid "You should restart Gajim for some changes to take effect"
-msgstr "Deberías reiniciar Gajim para que se hagan efectivos algunos cambios"
-
-#: gajim/data/gui/advanced_configuration_window.ui:84
-#, fuzzy
-msgid "_Filter"
-msgstr "_Filtro:"
-
-#: gajim/data/gui/advanced_configuration_window.ui:153
-#: gajim/data/gui/filetransfers_send_file_dialog.ui:15
-#: gajim/gtk/discovery.py:1666
-msgid "Description"
-msgstr "Descripción"
-
-#: gajim/data/gui/advanced_configuration_window.ui:197
-#, fuzzy
-msgid "_Reset to default"
-msgstr "_Restablecer colores por defecto"
-
 #: gajim/data/gui/join_groupchat_window.ui:56
 #: gajim/data/gui/chat_to_muc_window.ui:67
 #: gajim/data/gui/chat_to_muc_window.ui:78
 msgid "column"
-msgstr ""
+msgstr "columna"
 
 #: gajim/data/gui/join_groupchat_window.ui:97
 msgid "Join group chat every time Gajim is started"
 msgstr ""
 
 #: gajim/data/gui/join_groupchat_window.ui:113
-#, fuzzy
-msgid "Auto Join"
-msgstr "Auto conectar"
+msgid "Join Automatically"
+msgstr ""
 
 #: gajim/data/gui/join_groupchat_window.ui:131
 #: gajim/data/gui/profile_window.ui:233
@@ -5689,10 +5788,11 @@ msgstr "Cuenta"
 
 #: gajim/data/gui/join_groupchat_window.ui:147
 #, fuzzy
-msgid "Room"
-msgstr "Salón:"
+msgid "Group chat"
+msgstr "Grupos de charla"
 
-#: gajim/data/gui/join_groupchat_window.ui:180 gajim/gtk/accounts.py:886
+#: gajim/data/gui/join_groupchat_window.ui:180 gajim/data/gui/bookmarks.ui:158
+#: gajim/gtk/accounts.py:889
 #, fuzzy
 msgid "Password"
 msgstr "Contraseña: "
@@ -5716,98 +5816,18 @@ msgstr "en _grupos de charla"
 msgid "Search group chats on selected server"
 msgstr ""
 
-#: gajim/data/gui/join_groupchat_window.ui:437 gajim/gtk/discovery.py:1271
+#: gajim/data/gui/join_groupchat_window.ui:437 gajim/gtk/discovery.py:1270
 #, fuzzy
 msgid "Join"
 msgstr "_Entrar"
 
-#: gajim/data/gui/manage_proxies_window.ui:12
-msgid "HTTP Connect"
-msgstr "Conectar HTTP"
-
-#: gajim/data/gui/manage_proxies_window.ui:15
-msgid "SOCKS5"
-msgstr ""
-
-#: gajim/data/gui/manage_proxies_window.ui:18
-msgid "BOSH"
-msgstr ""
-
-#: gajim/data/gui/manage_proxies_window.ui:27
-msgid "Manage Proxy Profiles"
-msgstr "Gestionar perfiles del Proxy"
-
-#: gajim/data/gui/manage_proxies_window.ui:83
-#, fuzzy
-msgid "Add Proxy"
-msgstr "Proxy"
-
-#: gajim/data/gui/manage_proxies_window.ui:97
-#, fuzzy
-msgid "Remove Proxy"
-msgstr "Eliminar grupo"
-
-#: gajim/data/gui/manage_proxies_window.ui:141
-msgid "Properties"
-msgstr "Propiedades"
-
-#: gajim/data/gui/manage_proxies_window.ui:157
-#, fuzzy
-msgid "_Name"
-msgstr "_Nombre: "
-
-#: gajim/data/gui/manage_proxies_window.ui:173
-#, fuzzy
-msgid "_Type"
-msgstr "_Tipo:"
-
-#: gajim/data/gui/manage_proxies_window.ui:236
-#, fuzzy
-msgid "_BOSH URL"
-msgstr "URL _BOSH:"
-
-#: gajim/data/gui/manage_proxies_window.ui:261
-msgid "Use HTTP prox_y"
-msgstr "Usar prox_y HTTP"
-
-#: gajim/data/gui/manage_proxies_window.ui:280
-#, fuzzy
-msgid "Proxy _Host"
-msgstr "_Host del Proxy:"
-
-#: gajim/data/gui/manage_proxies_window.ui:307
-#, fuzzy
-msgid "Proxy _Port"
-msgstr "_Puerto del Proxy:"
-
-#: gajim/data/gui/manage_proxies_window.ui:334
-#, fuzzy
-msgid "_Username"
-msgstr "_Nombre"
-
-#: gajim/data/gui/manage_proxies_window.ui:347
-msgid "Use proxy auth_entication"
-msgstr "Usar aut_entificación del proxy"
-
-#: gajim/data/gui/manage_proxies_window.ui:377
-#, fuzzy
-msgid "Pass_word"
-msgstr "_Contraseña: "
-
-#: gajim/data/gui/manage_proxies_window.ui:405 gajim/gtk/adhoc.py:321
-#, fuzzy
-msgid "Settings"
-msgstr "Atajos de conversaciones"
-
 #: gajim/data/gui/change_password_dialog.ui:17
-#, fuzzy
 msgid "New Password"
-msgstr "Guardar contraseña"
+msgstr "Nueva contraseña"
 
 #: gajim/data/gui/change_password_dialog.ui:31
-#, fuzzy
 msgid "Confirm New Password"
-msgstr "Cambiar contraseña"
+msgstr "Confirmar nueva contraseña"
 
 #: gajim/data/gui/zeroconf_information_window.ui:8
 #: gajim/data/gui/vcard_information_window.ui:8
@@ -5829,11 +5849,13 @@ msgid "Status:"
 msgstr "Estado:"
 
 #: gajim/data/gui/zeroconf_information_window.ui:89
-msgid "_Log conversation history"
+#, fuzzy
+msgid "_Store conversation history"
 msgstr "Histórico de conversaciones"
 
 #: gajim/data/gui/zeroconf_information_window.ui:215
 #: gajim/data/gui/vcard_information_window.ui:390
+#: gajim/data/gui/groupchat_info_scrolled.ui:166
 msgid "Contact"
 msgstr "Contacto"
 
@@ -5846,8 +5868,9 @@ msgid "Last Name:"
 msgstr "Apellido(s):"
 
 #: gajim/data/gui/zeroconf_information_window.ui:260
-msgid "Jabber ID:"
-msgstr "ID de Jabber:"
+#, fuzzy
+msgid "XMPP Address:"
+msgstr "Dirección AIM:"
 
 #: gajim/data/gui/zeroconf_information_window.ui:273
 msgid "E-Mail:"
@@ -5867,8 +5890,9 @@ msgid "Send _File"
 msgstr "Enviar archivo"
 
 #: gajim/data/gui/gc_occupants_menu.ui:29
-msgid "Occupant Actions"
-msgstr "Acciones de ocupante"
+#, fuzzy
+msgid "Participant Actions"
+msgstr "Participantes"
 
 #: gajim/data/gui/gc_occupants_menu.ui:38
 msgid "_Voice"
@@ -5899,8 +5923,9 @@ msgid "_Ban"
 msgstr "_Banear"
 
 #: gajim/data/gui/gc_occupants_menu.ui:124
-msgid "_Add to Roster"
-msgstr "_Añadir a la lista de contactos"
+#, fuzzy
+msgid "_Add to Contact List"
+msgstr "_Añadir contacto..."
 
 #: gajim/data/gui/gc_occupants_menu.ui:132
 #, fuzzy
@@ -5938,11 +5963,6 @@ msgstr "Subscripción:"
 msgid "_Status"
 msgstr "_Estado"
 
-#: gajim/data/gui/zeroconf_context_menu.ui:26
-#: gajim/data/gui/account_context_menu.ui:79
-msgid "_Modify Account..."
-msgstr "_Modificar cuenta..."
-
 #: gajim/data/gui/certificate_dialog.ui:66
 #: gajim/data/gui/certificate_dialog.ui:178
 msgid "Common Name (CN)"
@@ -6024,13 +6044,19 @@ msgstr "Última modificación:"
 msgid "Next entry"
 msgstr "Siguiente entrada"
 
+#: gajim/data/gui/filetransfers_send_file_dialog.ui:15
+#: gajim/data/gui/advanced_configuration.ui:143
+#: gajim/data/gui/groupchat_info_scrolled.ui:48 gajim/gtk/discovery.py:1663
+msgid "Description"
+msgstr "Descripción"
+
 #: gajim/data/gui/filetransfers_send_file_dialog.ui:54
 #, fuzzy
 msgid "_Send Files"
 msgstr "Enviar archivo"
 
 #: gajim/data/gui/filetransfers_send_file_dialog.ui:58
-#: gajim/gtk/xml_console.py:90
+#: gajim/gtk/xml_console.py:87
 msgid "Send"
 msgstr "Enviar"
 
@@ -6054,20 +6080,23 @@ msgid "Change _Nickname..."
 msgstr "Cambiar _Alias"
 
 #: gajim/data/gui/gc_control_popup_menu.ui:20
-msgid "_Manage Room"
-msgstr "_Gestionar salón"
+#, fuzzy
+msgid "_Manage Group Chat"
+msgstr "_Nuevo grupo de charla"
 
 #: gajim/data/gui/gc_control_popup_menu.ui:31
 msgid "Change _Subject..."
 msgstr "Cambiar el _tema"
 
 #: gajim/data/gui/gc_control_popup_menu.ui:38
-msgid "Configure _Room..."
-msgstr "Configurar el salón"
+#, fuzzy
+msgid "Configure _Group Chat..."
+msgstr "Entrar a un grupo de charla"
 
 #: gajim/data/gui/gc_control_popup_menu.ui:52
-msgid "_Destroy Room"
-msgstr "_Desmantelar salón"
+#, fuzzy
+msgid "_Destroy Group Chat"
+msgstr "_Nuevo grupo de charla"
 
 #: gajim/data/gui/gc_control_popup_menu.ui:64
 msgid "_Minimize on close"
@@ -6078,7 +6107,7 @@ msgstr "_Minimizar al cerrar"
 msgid "_Request Voice"
 msgstr "_Voz"
 
-#: gajim/data/gui/gc_control_popup_menu.ui:99 gajim/gtk/discovery.py:1704
+#: gajim/data/gui/gc_control_popup_menu.ui:99
 msgid "_Bookmark"
 msgstr "_Marcador"
 
@@ -6128,13 +6157,6 @@ msgstr "Página web:"
 msgid "E-Mail"
 msgstr "Correo-e:"
 
-#: 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/blocking_list.ui:115 gajim/gtk/add_contact.py:30
-#: gajim/gtk/accounts.py:801
-msgid "Jabber ID"
-msgstr "ID de Jabber:"
-
 #: gajim/data/gui/profile_window.ui:440
 msgid "Main"
 msgstr ""
@@ -6176,9 +6198,8 @@ msgstr "Sufijo:"
 #: gajim/data/gui/profile_window.ui:596 gajim/data/gui/profile_window.ui:1031
 #: gajim/data/gui/vcard_information_window.ui:490
 #: gajim/data/gui/vcard_information_window.ui:1180
-#, fuzzy
 msgid "Street"
-msgstr "Estresado"
+msgstr "Calle"
 
 #: gajim/data/gui/profile_window.ui:624 gajim/data/gui/profile_window.ui:1058
 #: gajim/data/gui/vcard_information_window.ui:580
@@ -6265,35 +6286,42 @@ msgstr "Trabajo"
 msgid "About"
 msgstr "Acerca de"
 
-#: gajim/data/gui/start_chat_dialog.ui:114 gajim/gtk/discovery.py:1658
-msgid "Users"
-msgstr "Usuarios"
-
-#: gajim/data/gui/start_chat_dialog.ui:185
-msgid "Name:"
-msgstr "Nombre:"
+#: gajim/data/gui/start_chat_dialog.ui:53
+#, fuzzy
+msgid "Global Group Chat Search"
+msgstr "Entrar a un salón de chat"
 
-#: gajim/data/gui/start_chat_dialog.ui:197
+#: 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
-msgid "Description:"
-msgstr "Descripción: "
+msgid "_Back"
+msgstr "Vuelvo pronto"
+
+#: gajim/data/gui/start_chat_dialog.ui:245
+#: gajim/data/gui/groupchat_control.ui:796
+#: gajim/data/gui/groupchat_control.ui:888 gajim/gtk/discovery.py:1701
+#: gajim/gtk/groupchat_join.py:62
+msgid "_Join"
+msgstr "_Entrar"
 
-#: gajim/data/gui/start_chat_dialog.ui:209
+#: gajim/data/gui/start_chat_dialog.ui:289
 #, fuzzy
-msgid "Address:"
-msgstr "_Dirección:"
+msgid "Select Account"
+msgstr "Eliminar cuenta"
 
-#: gajim/data/gui/start_chat_dialog.ui:246
-msgid ""
-"Semi-Anonymous\n"
-"<span size=\"small\">(Only moderators can see your XMPP-Address)</span>"
+#: gajim/data/gui/start_chat_dialog.ui:380
+msgid "_Select"
 msgstr ""
 
 #: gajim/data/gui/filetransfers.ui:21
 msgid "Pa_use/Resume"
 msgstr ""
 
-#: gajim/data/gui/filetransfers.ui:30 gajim/gtk/filechoosers.py:178
+#: gajim/data/gui/filetransfers.ui:30 gajim/data/gui/groupchat_control.ui:575
+#: gajim/data/gui/groupchat_control.ui:667
+#: gajim/data/gui/groupchat_control.ui:779
+#: gajim/data/gui/groupchat_control.ui:871 gajim/gtk/filechoosers.py:178
 msgid "_Cancel"
 msgstr "_Cancelar"
 
@@ -6338,7 +6366,8 @@ msgstr ""
 "incompleto"
 
 #: gajim/data/gui/filetransfers.ui:207
-msgid "Shows a list of file transfers between you and others"
+#, fuzzy
+msgid "Shows a list of file transfers between you and your contacts"
 msgstr "Muestra una lista de transferencias entre tú y otros"
 
 #: gajim/data/gui/groupchat_control.ui:13 gajim/data/gui/chat_control.ui:277
@@ -6358,7 +6387,6 @@ msgid "Strike"
 msgstr "Tachado"
 
 #: gajim/data/gui/groupchat_control.ui:54 gajim/data/gui/chat_control.ui:318
-#: gajim/gtk/advanced_config.py:86
 msgid "Color"
 msgstr "Color"
 
@@ -6371,16 +6399,46 @@ msgstr "Fuente"
 msgid "Clear formatting"
 msgstr "Limpiar formato"
 
-#: gajim/data/gui/groupchat_control.ui:290 gajim/data/gui/chat_control.ui:880
-#, fuzzy
+#: gajim/data/gui/groupchat_control.ui:291 gajim/data/gui/chat_control.ui:880
 msgid "Choose encryption"
-msgstr "Elige archivo a enviar..."
+msgstr "Elegir cifrado"
 
-#: gajim/data/gui/groupchat_control.ui:336 gajim/data/gui/chat_control.ui:640
+#: gajim/data/gui/groupchat_control.ui:337 gajim/data/gui/chat_control.ui:640
 #, fuzzy
 msgid "Show a list of emojis (Alt+M)"
 msgstr "Mostrar una lista de emoticonos (Alt+M)"
 
+#: gajim/data/gui/groupchat_control.ui:484
+#, fuzzy
+msgid "Joining…"
+msgstr "Expulsando..."
+
+#: gajim/data/gui/groupchat_control.ui:496
+#, fuzzy
+msgid "_Abort"
+msgstr "_Acerca de"
+
+#: gajim/data/gui/groupchat_control.ui:542
+#, fuzzy
+msgid "Enter new nickname"
+msgstr "Después del alias:"
+
+#: gajim/data/gui/groupchat_control.ui:592
+#: gajim/data/gui/groupchat_control.ui:684
+#, fuzzy
+msgid "Ch_ange"
+msgstr "Cambiar _Alias"
+
+#: gajim/data/gui/groupchat_control.ui:761
+#, fuzzy
+msgid "Enter password"
+msgstr "Introduce nueva contraseña:"
+
+#: gajim/data/gui/groupchat_control.ui:1067
+#, fuzzy
+msgid "_Try again"
+msgstr "Verificar de nuevo..."
+
 #: gajim/data/gui/popup_notification_window.ui:42
 #, fuzzy
 msgid "Event Type"
@@ -6446,14 +6504,13 @@ msgstr ""
 #: gajim/data/gui/mam_preferences.ui:14
 #: gajim/data/gui/preferences_window.ui:120
 #: gajim/data/gui/preferences_window.ui:169
-#, fuzzy
 msgid "Always"
-msgstr "Ausente"
+msgstr "Siempre"
 
 #: gajim/data/gui/mam_preferences.ui:18
 #, fuzzy
-msgid "Roster"
-msgstr "Mostrar _roster"
+msgid "Contact List"
+msgstr "Contactos"
 
 #: gajim/data/gui/mam_preferences.ui:22
 #: gajim/data/gui/preferences_window.ui:123
@@ -6478,12 +6535,12 @@ msgid "Add"
 msgstr "Dirección"
 
 #: gajim/data/gui/mam_preferences.ui:194 gajim/data/gui/groupchat_config.ui:151
-#: gajim/gtk/dialogs.py:63 gajim/gtk/accounts.py:381
+#: gajim/gtk/dialogs.py:62 gajim/gtk/accounts.py:384
 #, fuzzy
 msgid "Remove"
 msgstr "_Eliminar"
 
-#: gajim/data/gui/vcard_information_window.ui:72 gajim/gtk/accounts.py:753
+#: gajim/data/gui/vcard_information_window.ui:72 gajim/gtk/accounts.py:756
 #, fuzzy
 msgid "Resource"
 msgstr "Recurso:"
@@ -6526,13 +6583,13 @@ msgstr "Pregunta:"
 
 #. Family Name
 #: gajim/data/gui/vcard_information_window.ui:304
-#, fuzzy
 msgid "Subscription"
-msgstr "Subscripción:"
+msgstr "Suscripción:"
 
 #: gajim/data/gui/vcard_information_window.ui:974
 #: gajim/data/gui/vcard_information_window.ui:993
 #: gajim/data/gui/vcard_information_window.ui:1427
+#: gajim/data/gui/groupchat_info_scrolled.ui:222
 msgid "button"
 msgstr "botón"
 
@@ -6565,15 +6622,17 @@ msgstr "_Notificarme"
 
 #: gajim/data/gui/preferences_window.ui:58
 #, fuzzy
-msgid "Show only in roster"
-msgstr "Sólo mostrar en la _lista de contactos"
+msgid "Show only in contact list"
+msgstr "Mostrar sólo contactos _activos"
 
 #: gajim/data/gui/preferences_window.ui:69
-msgid "Detached roster with detached chats"
+#, fuzzy
+msgid "Detached contact list with detached chats"
 msgstr "Lista separada con chats separados"
 
 #: gajim/data/gui/preferences_window.ui:72
-msgid "Detached roster with single chat"
+#, fuzzy
+msgid "Detached contact list with single chat"
 msgstr "Lista separada con una sola charla"
 
 #: gajim/data/gui/preferences_window.ui:75
@@ -6581,11 +6640,13 @@ msgid "Single window for everything"
 msgstr "Ventana única para todo"
 
 #: gajim/data/gui/preferences_window.ui:78
-msgid "Detached roster with chat grouped by account"
+#, fuzzy
+msgid "Detached contact list with chat grouped by account"
 msgstr "Lista separada con chat agrupado por cuenta"
 
 #: gajim/data/gui/preferences_window.ui:81
-msgid "Detached roster with chat grouped by type"
+#, fuzzy
+msgid "Detached contact list with chat grouped by type"
 msgstr "Lista separada con chat agrupado por tipo"
 
 #: gajim/data/gui/preferences_window.ui:92
@@ -6612,22 +6673,20 @@ msgid "Only when pending events"
 msgstr "Solo cuando hay eventos pendientes"
 
 #: gajim/data/gui/preferences_window.ui:180
-#, fuzzy
 msgid "Top"
-msgstr "A"
+msgstr "Arriba"
 
 #: gajim/data/gui/preferences_window.ui:183
 msgid "Bottom"
-msgstr ""
+msgstr "Abajo"
 
 #: gajim/data/gui/preferences_window.ui:186
 msgid "Left"
-msgstr ""
+msgstr "Izquierda"
 
 #: gajim/data/gui/preferences_window.ui:189
-#, fuzzy
 msgid "Right"
-msgstr "ocho"
+msgstr "Derecha"
 
 #: gajim/data/gui/preferences_window.ui:241
 #, fuzzy
@@ -6636,7 +6695,7 @@ msgstr "_Comportamiento de la ventana:"
 
 #: gajim/data/gui/preferences_window.ui:296
 #, fuzzy
-msgid "_Show roster on startup"
+msgid "_Show contact list on startup"
 msgstr "Mostrar la lista de contactos al inicio de Gajim"
 
 #: gajim/data/gui/preferences_window.ui:311
@@ -6653,12 +6712,12 @@ msgid "_Tabs placement"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:363
-msgid "_Quit Gajim when closing roster window"
+msgid "_Quit Gajim when closing contact list"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:367
 msgid ""
-"If enabled, Gajim will quit when closing the roster window instead of "
+"If enabled, Gajim will quit when closing the contact list window instead of "
 "minimizing to the system's notification area"
 msgstr ""
 
@@ -6668,41 +6727,42 @@ msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:423
 #, fuzzy
-msgid "Show a_vatars of contacts in roster"
+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
 msgid ""
-"If checked, avatars of contacts will be shown in the roster window and in "
-"group chats"
+"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"
 
 #: gajim/data/gui/preferences_window.ui:441
 #, fuzzy
-msgid "Show status _messages of contacts in roster"
+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
 msgid ""
 "If checked, status messages of contacts will be shown under the contact's "
-"name, in the roster window, and in group chats"
+"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"
 
 #: gajim/data/gui/preferences_window.ui:459
 #, fuzzy
-msgid "Show e_xtra information of contacts in roster (mood, activity, ...)"
+msgid ""
+"Show e_xtra information of contacts in contact list (mood, activity, ...)"
 msgstr "Mostrar estad_o de ánimo de los contactos en el roster"
 
 #: gajim/data/gui/preferences_window.ui:463
 msgid ""
-"If checked, additional info published by the contact will be shown in "
-"roster. Additional infos (published via PEP) may include e.g. mood, "
+"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 ""
 
@@ -6711,21 +6771,22 @@ msgid "Sort contacts by status"
 msgstr "Ordenar contactos por estado"
 
 #: gajim/data/gui/preferences_window.ui:494
-msgid "in _roster"
-msgstr "en _roster"
+#, fuzzy
+msgid "in _contact list"
+msgstr "Contactos enviados:"
 
 #: gajim/data/gui/preferences_window.ui:511
 msgid "in _group chats"
 msgstr "en _grupos de charla"
 
 #: gajim/data/gui/preferences_window.ui:540
-msgid "Roster Appearance"
-msgstr "Aspecto del Roster"
+#, fuzzy
+msgid "Contact List Appearance"
+msgstr "Intercambio de elementos del roster"
 
 #: gajim/data/gui/preferences_window.ui:585
-#, fuzzy
 msgid "Enable spell _checking"
-msgstr "Corrector ortográfico"
+msgstr "Habilitar corrector ortográfico"
 
 #: gajim/data/gui/preferences_window.ui:588
 #, fuzzy
@@ -6786,7 +6847,7 @@ msgstr "No se pudo entrar al grupo de charla"
 
 #: gajim/data/gui/preferences_window.ui:660
 #, fuzzy
-msgid "If checked, the room subject will be shown when joining a group chat"
+msgid "If checked, the subject will be shown when joining a group chat"
 msgstr "No se pudo entrar al grupo de charla"
 
 #: gajim/data/gui/preferences_window.ui:682
@@ -6801,13 +6862,13 @@ msgstr ""
 #: gajim/data/gui/preferences_window.ui:701
 msgid ""
 "If join/leave status messages are shown in the group chat. This setting can "
-"be overridden in the groupchat menu."
+"be overridden in the group chat menu."
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:720
 msgid ""
 "The default sync threshold for new public group chats. This setting can be "
-"overridden in the groupchat menu."
+"overridden in the group chat menu."
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:722
@@ -6822,7 +6883,7 @@ msgstr "_Registrar cambios de estado de los contactos"
 #: gajim/data/gui/preferences_window.ui:768
 msgid ""
 "If status change messages are shown in the group chat. This setting can be "
-"overridden in the groupchat menu."
+"overridden in the group chat menu."
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:825
@@ -6841,8 +6902,8 @@ msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:843
 #, fuzzy
-msgid "Show chatstate in roster"
-msgstr "Mostrar en el roster los a_vatares de los contactos"
+msgid "Show chatstate in contact list"
+msgstr "¿Mostrar botón de cerrar en la pestaña?"
 
 #: gajim/data/gui/preferences_window.ui:847
 msgid ""
@@ -6937,9 +6998,8 @@ msgid "Allow playing sounds when I'm _busy"
 msgstr "Permitir sonido cuando estoy ocupado"
 
 #: gajim/data/gui/preferences_window.ui:1189
-#, fuzzy
 msgid "Sounds"
-msgstr "Sonido"
+msgstr "Sonidos"
 
 #: gajim/data/gui/preferences_window.ui:1207
 msgid "Notifications"
@@ -7157,7 +7217,7 @@ msgstr "Tamaño del vídeo"
 msgid "Vi_ew own video source"
 msgstr "Ver fuente de vídeo"
 
-#: gajim/data/gui/preferences_window.ui:2281 gajim/gtk/accounts.py:352
+#: gajim/data/gui/preferences_window.ui:2281 gajim/gtk/accounts.py:355
 msgid "Connection"
 msgstr "Conexión"
 
@@ -7215,7 +7275,8 @@ msgid "_Manage..."
 msgstr "_Gestionar..."
 
 #: gajim/data/gui/preferences_window.ui:2616
-msgid "_Log status changes of contacts"
+#, fuzzy
+msgid "_Store status changes of contacts in history"
 msgstr "_Registrar cambios de estado de los contactos"
 
 #: gajim/data/gui/preferences_window.ui:2633
@@ -7233,15 +7294,21 @@ msgstr "Miscelánea"
 
 #: gajim/data/gui/preferences_window.ui:2688
 msgid "Attention: Please use these options with caution!"
-msgstr ""
+msgstr "¡Atención: Por favor, use estas opciones con precaución!"
 
 #: gajim/data/gui/preferences_window.ui:2701
 msgid "_Open..."
 msgstr "_Abrir..."
 
+#: gajim/data/gui/preferences_window.ui:2723 gajim/gtk/advanced_config.py:84
+#, fuzzy
+msgid "Advanced Configuration Editor (ACE)"
+msgstr "Editor avanzado de configurción"
+
 #: gajim/data/gui/groupchat_config.ui:55
+#, fuzzy
 msgid ""
-"<b>Jabber-ID</b>\n"
+"<b>XMPP Address</b>\n"
 "&lt;user@domain/resource&gt; (only that resource matches)\n"
 "&lt;user@domain&gt; (any resource matches)\n"
 "&lt;domain/resource&gt; (only that resource matches)\n"
@@ -7260,7 +7327,8 @@ msgstr ""
 msgid "Only Admins and Owners can modify the affiliation"
 msgstr ""
 
-#: gajim/data/gui/groupchat_config.ui:270 gajim/plugins/gui.py:312
+#: gajim/data/gui/groupchat_config.ui:270
+#: gajim/data/gui/groupchat_info_scrolled.ui:210 gajim/plugins/gui.py:324
 #, fuzzy
 msgid "Configuration"
 msgstr "Configuración del salón"
@@ -7293,7 +7361,7 @@ msgid "Start _Chat"
 msgstr "Iniciar conversación"
 
 #: gajim/data/gui/contact_context_menu.ui:20
-#: gajim/data/gui/systray_context_menu.ui:36
+#: gajim/data/gui/systray_context_menu.ui:29
 msgid "Send Single _Message..."
 msgstr "Enviar mensaje..."
 
@@ -7355,17 +7423,42 @@ msgid "_Ignore"
 msgstr "_Ignorar"
 
 #: gajim/data/gui/contact_context_menu.ui:174
-msgid "_Add to Roster..."
-msgstr "_Añadir al roster"
+#, fuzzy
+msgid "_Add to Contact List..."
+msgstr "_Añadir contacto..."
+
+#: gajim/data/gui/advanced_configuration.ui:39
+msgid "You should restart Gajim for some changes to take effect"
+msgstr "Deberías reiniciar Gajim para que se hagan efectivos algunos cambios"
+
+#: gajim/data/gui/advanced_configuration.ui:71
+#, fuzzy
+msgid "_Filter"
+msgstr "_Filtro:"
+
+#: gajim/data/gui/advanced_configuration.ui:88
+msgid "Type to search for values..."
+msgstr ""
+
+#: gajim/data/gui/advanced_configuration.ui:180
+#, fuzzy
+msgid "_Reset Value"
+msgstr "_Restablecer colores por defecto"
+
+#: gajim/data/gui/advanced_configuration.ui:185
+#, fuzzy
+msgid "Resets value to default"
+msgstr "_Restablecer colores por defecto"
 
 #: gajim/data/gui/account_creation_wizard_window.ui:43
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim: Asistente para crear una cuenta"
 
 #: gajim/data/gui/account_creation_wizard_window.ui:70
+#, fuzzy
 msgid ""
 "You need to have an account in order to connect\n"
-"to the Jabber network."
+"to the XMPP network."
 msgstr ""
 "Necesitas tener una cuenta para conectarte\n"
 "a la red Jabber."
@@ -7387,8 +7480,9 @@ msgid "<b>Please fill in the data for your existing account</b>"
 msgstr "<b>Por favor, introduce los datos de tu cuenta actual</b>"
 
 #: gajim/data/gui/account_creation_wizard_window.ui:187
-msgid "_Jabber ID:"
-msgstr "ID de _Jabber: "
+#, fuzzy
+msgid "_XMPP Address:"
+msgstr "Dirección AIM:"
 
 #: gajim/data/gui/account_creation_wizard_window.ui:239
 #: gajim/data/gui/account_creation_wizard_window.ui:394
@@ -7475,6 +7569,7 @@ msgid "Privacy Lists:"
 msgstr "Listas de privacidad:"
 
 #: gajim/data/gui/service_discovery_window.ui:111
+#: gajim/data/gui/groupchat_creation.ui:227
 #, fuzzy
 msgid "_Address"
 msgstr "_Dirección:"
@@ -7492,11 +7587,6 @@ msgstr "Sincronizar: seleccionar contactos"
 msgid "Select the contacts you want to synchronise"
 msgstr "Selecciona los contactos que quieres sincronizar"
 
-#: gajim/data/gui/groupchat_invitation_received.ui:42
-#, fuzzy
-msgid "Group Chat Invitation"
-msgstr "Invitación a grupo de charla"
-
 #: gajim/data/gui/groupchat_invitation_received.ui:111
 #, fuzzy
 msgid "Message..."
@@ -7546,11 +7636,10 @@ msgstr ""
 
 #: gajim/data/gui/add_new_contact_window.ui:84
 #, fuzzy
-msgid "_Jabber ID"
-msgstr "ID de _Jabber: "
+msgid "_XMPP Address"
+msgstr "_Dirección:"
 
 #: gajim/data/gui/add_new_contact_window.ui:100
-#: gajim/data/gui/manage_bookmarks_window.ui:192
 #, fuzzy
 msgid "_Nickname"
 msgstr "_Alias:"
@@ -7629,7 +7718,7 @@ msgstr "<b>Estado de ánimo</b>"
 msgid "<b>Message:</b>"
 msgstr "<b>Mensaje:</b>"
 
-#: gajim/data/gui/plugins_window.ui:10 gajim/data/gui/application_menu.ui:90
+#: gajim/data/gui/plugins_window.ui:10 gajim/data/gui/application_menu.ui:87
 msgid "Plugins"
 msgstr "Extensiones"
 
@@ -7676,9 +7765,8 @@ msgid "<empty>"
 msgstr ""
 
 #: gajim/data/gui/plugins_window.ui:364
-#, fuzzy
 msgid "Installed"
-msgstr "Atascado"
+msgstr "Instalado"
 
 #: gajim/data/gui/plugins_window.ui:380
 msgid ""
@@ -7689,9 +7777,8 @@ msgstr ""
 "mientras se inicia PluginsWindow."
 
 #: gajim/data/gui/privacy_list_window.ui:18
-#, fuzzy
 msgid "none"
-msgstr "uno"
+msgstr "ninguno"
 
 #: gajim/data/gui/privacy_list_window.ui:21
 #, fuzzy
@@ -7704,9 +7791,8 @@ msgid "from"
 msgstr "De"
 
 #: gajim/data/gui/privacy_list_window.ui:27
-#, fuzzy
 msgid "to"
-msgstr "dos"
+msgstr "a"
 
 #: gajim/data/gui/privacy_list_window.ui:47 gajim/gtk/privacy_list.py:76
 msgid "Privacy List"
@@ -7740,10 +7826,6 @@ msgstr "Permitir"
 msgid "Deny"
 msgstr "Denegar"
 
-#: gajim/data/gui/privacy_list_window.ui:317
-msgid "JabberID"
-msgstr "ID de Jabber:"
-
 #: gajim/data/gui/privacy_list_window.ui:358
 msgid "all in the group"
 msgstr "todos en el grupo"
@@ -7782,11 +7864,10 @@ msgid "Order:"
 msgstr "Orden:"
 
 #: gajim/data/gui/manage_sounds_window.ui:23
-#, fuzzy
 msgid "Manage sounds"
-msgstr "Gestionar cuentas"
+msgstr "Gestionar sonidos"
 
-#: gajim/data/gui/manage_sounds_window.ui:55 gajim/plugins/gui.py:100
+#: gajim/data/gui/manage_sounds_window.ui:55 gajim/plugins/gui.py:101
 msgid "Active"
 msgstr "Activo"
 
@@ -7824,23 +7905,112 @@ msgstr "Eliminar la cuenta de Gajim y del _servidor"
 msgid "_Personal Events"
 msgstr "Eventos _personales"
 
-#: gajim/data/gui/account_context_menu.ui:35
-#: gajim/data/gui/systray_context_menu.ui:28
-msgid "Join _Group Chat"
-msgstr "Entrar a un grupo de charla"
-
-#: gajim/data/gui/account_context_menu.ui:49
+#: gajim/data/gui/account_context_menu.ui:41
 msgid "_Add Contact..."
 msgstr "_Añadir contacto..."
 
-#: gajim/data/gui/account_context_menu.ui:57
+#: gajim/data/gui/account_context_menu.ui:49
 msgid "_Discover Services"
 msgstr "_Descubrir servicios"
 
-#: gajim/data/gui/account_context_menu.ui:65
+#: gajim/data/gui/account_context_menu.ui:57
 msgid "_Execute Command..."
 msgstr "_Ejecutar comando..."
 
+#: gajim/data/gui/account_context_menu.ui:65
+#, fuzzy
+msgid "_View Certificate"
+msgstr "Certificado autofirmado"
+
+#: gajim/data/gui/manage_proxies.ui:12
+#, fuzzy
+msgctxt "proxy configuration"
+msgid "HTTP Connect"
+msgstr "Conectar HTTP"
+
+#: gajim/data/gui/manage_proxies.ui:15
+msgctxt "proxy configuration"
+msgid "SOCKS5"
+msgstr ""
+
+#: gajim/data/gui/manage_proxies.ui:18
+#, fuzzy
+msgctxt "proxy configuration"
+msgid "BOSH"
+msgstr "URL _BOSH:"
+
+#: gajim/data/gui/manage_proxies.ui:68
+#, fuzzy
+msgid "Add Proxy"
+msgstr "Proxy"
+
+#: gajim/data/gui/manage_proxies.ui:82
+#, fuzzy
+msgid "Remove Proxy"
+msgstr "Eliminar grupo"
+
+#: gajim/data/gui/manage_proxies.ui:134
+#, fuzzy
+msgid "Pass_word"
+msgstr "_Contraseña: "
+
+#: gajim/data/gui/manage_proxies.ui:159
+msgid "Use proxy auth_entication"
+msgstr "Usar aut_entificación del proxy"
+
+#: gajim/data/gui/manage_proxies.ui:179
+#, fuzzy
+msgid "_Username"
+msgstr "_Nombre"
+
+#: gajim/data/gui/manage_proxies.ui:209
+#, fuzzy
+msgid "_Port"
+msgstr "_Puerto:"
+
+#: gajim/data/gui/manage_proxies.ui:226
+msgid "example.org"
+msgstr ""
+
+#: gajim/data/gui/manage_proxies.ui:240
+#, fuzzy
+msgid "_Host"
+msgstr "_Servidor"
+
+#: gajim/data/gui/manage_proxies.ui:254
+msgid "Use HTTP prox_y"
+msgstr "Usar prox_y HTTP"
+
+#: gajim/data/gui/manage_proxies.ui:275
+msgid "https://example.org/http-bind/"
+msgstr ""
+
+#: gajim/data/gui/manage_proxies.ui:291
+#, fuzzy
+msgid "_BOSH URL"
+msgstr "URL _BOSH:"
+
+#: gajim/data/gui/manage_proxies.ui:309 gajim/gtk/adhoc.py:322
+#, fuzzy
+msgid "Settings"
+msgstr "Atajos de conversaciones"
+
+#: gajim/data/gui/manage_proxies.ui:344
+#, fuzzy
+msgid "_Type"
+msgstr "_Tipo:"
+
+#: gajim/data/gui/manage_proxies.ui:361
+#: gajim/data/gui/groupchat_creation.ui:105
+#, fuzzy
+msgid "_Name"
+msgstr "_Nombre: "
+
+#: gajim/data/gui/manage_proxies.ui:391 gajim/gtk/accounts.py:742
+#, fuzzy
+msgid "Proxy"
+msgstr "Proxy"
+
 #: gajim/data/gui/application_menu.ui:8
 #, fuzzy
 msgid "View"
@@ -7848,8 +8018,8 @@ msgstr "_Ver"
 
 #: gajim/data/gui/application_menu.ui:11
 #, fuzzy
-msgid "Show Roster"
-msgstr "Mostrar _roster"
+msgid "Show Contact List"
+msgstr "Mostrar sólo contactos _activos"
 
 #: gajim/data/gui/application_menu.ui:16
 #, fuzzy
@@ -7890,23 +8060,24 @@ msgstr "Atajos de teclado"
 msgid "Features"
 msgstr "Características"
 
-#: gajim/data/gui/application_menu.ui:81
+#: gajim/data/gui/application_menu.ui:77
+#: gajim/data/gui/groupchat_creation.ui:81 gajim/gtk/groupchat_creation.py:45
 #, fuzzy
-msgid "Bookmarks"
-msgstr "_Marcador"
+msgid "Create Group Chat"
+msgstr "Abandonar grupos de charla"
 
-#: gajim/data/gui/application_menu.ui:94 gajim/data/gui/shortcuts_window.ui:189
-#: gajim/gtk/preferences.py:59
+#: gajim/data/gui/application_menu.ui:91 gajim/data/gui/shortcuts_window.ui:189
+#: gajim/gtk/preferences.py:58
 msgid "Preferences"
 msgstr "Preferencias"
 
-#: gajim/data/gui/application_menu.ui:99
+#: gajim/data/gui/application_menu.ui:96
 #, fuzzy
 msgid "Quit"
 msgstr "_Salir"
 
 #: gajim/data/gui/httpupload_progress_dialog.ui:110
-#: gajim/gtk/filetransfer.py:121
+#: gajim/gtk/filetransfer.py:120
 msgid "Progress"
 msgstr "Progreso"
 
@@ -7923,52 +8094,33 @@ msgstr ""
 msgid "_Cancel Upload"
 msgstr "_Cancelar"
 
-#: gajim/data/gui/manage_bookmarks_window.ui:13
-#, fuzzy
-msgid "Group Chat Bookmarks"
-msgstr "Grupos de charla"
-
-#: gajim/data/gui/manage_bookmarks_window.ui:68
-#, fuzzy
-msgid "Add Bookmark"
-msgstr "_Marcador"
-
-#: gajim/data/gui/manage_bookmarks_window.ui:82
-#, fuzzy
-msgid "Remove Bookmark"
-msgstr "_Marcador"
+#: gajim/data/gui/groupchat_creation.ui:27
+msgid "Public or Private?"
+msgstr ""
 
-#: gajim/data/gui/manage_bookmarks_window.ui:126
-msgid "N_ame"
+#: 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 ""
 
-#: gajim/data/gui/manage_bookmarks_window.ui:145
-#, fuzzy
-msgid "Bookmark Name"
-msgstr "Añadir este salón a marcadores (Ctrl+B)"
+#: gajim/data/gui/groupchat_creation.ui:58
+msgid "<b>Public:</b> Anyone who knows the address can join."
+msgstr ""
 
-#: gajim/data/gui/manage_bookmarks_window.ui:160
+#: gajim/data/gui/groupchat_creation.ui:122
 #, fuzzy
-msgid "_Server"
-msgstr "_Servidor:"
+msgid "_Description"
+msgstr "Descripción"
 
-#: gajim/data/gui/manage_bookmarks_window.ui:223
-msgid "Roo_m"
+#: gajim/data/gui/groupchat_creation.ui:164
+msgid "_Public"
 msgstr ""
 
-#: gajim/data/gui/manage_bookmarks_window.ui:253
+#: gajim/data/gui/groupchat_creation.ui:278
 #, fuzzy
-msgid "_Password"
-msgstr "C_ontraseña:"
-
-#: gajim/data/gui/manage_bookmarks_window.ui:299
-#, fuzzy
-msgid "Join chat when connected"
-msgstr "Contacto desconectado"
-
-#: gajim/data/gui/manage_bookmarks_window.ui:307
-msgid "_Join Automatically"
-msgstr ""
+msgid "_Account"
+msgstr "_Cuentas"
 
 #: gajim/data/gui/exception_dialog.ui:49
 msgid "Sorry, that should not have happened"
@@ -8013,6 +8165,28 @@ msgstr "Autorizar contacto para que pueda saber cuándo estás conectado"
 msgid "Presets"
 msgstr "_Presencia"
 
+#: gajim/data/gui/groupchat_info_scrolled.ui:32
+msgid "Address"
+msgstr "Dirección"
+
+#: gajim/data/gui/groupchat_info_scrolled.ui:64
+msgid "Topic"
+msgstr ""
+
+#: gajim/data/gui/groupchat_info_scrolled.ui:80
+#, fuzzy
+msgid "Author"
+msgstr "Au_torizar"
+
+#: gajim/data/gui/groupchat_info_scrolled.ui:182
+msgid "Discussion Logs"
+msgstr ""
+
+#: gajim/data/gui/groupchat_info_scrolled.ui:260
+#, fuzzy
+msgid "Group Chat Language"
+msgstr "Invitación a grupo de charla"
+
 #: gajim/data/gui/emoji_chooser.ui:98
 #, fuzzy
 msgid "No Results Found"
@@ -8025,24 +8199,35 @@ msgstr "¡Invitar amigos!"
 #: gajim/data/gui/chat_to_muc_window.ui:39
 #, fuzzy
 msgid ""
-"You are now entering a groupchat.\n"
+"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"
 
 #: gajim/data/gui/chat_to_muc_window.ui:112
-msgid "Please select a MUC server."
+#, fuzzy
+msgid "Please select a group chat server."
 msgstr "Por favor selecciona un servidor MUC."
 
 #: gajim/data/gui/chat_to_muc_window.ui:141
-msgid "MUC server"
-msgstr "Servidor MUC"
+#, fuzzy
+msgid "Group chat server"
+msgstr "Grupos de charla"
 
 #: 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"
+
+#: gajim/data/gui/bookmarks.ui:211
+msgid "_Apply"
+msgstr ""
+
 #: gajim/data/gui/history_manager.ui:11
 #, fuzzy
 msgid "_Export"
@@ -8058,12 +8243,13 @@ msgid "Gajim History Logs Manager"
 msgstr "Gestor de Histórico de Gajim"
 
 #: gajim/data/gui/history_manager.ui:108
+#, fuzzy
 msgid ""
-"This log manager is not intended for log viewing. If you are looking for "
-"such functionality, use the history window instead.\n"
+"This history manager is not intended for viewing chat history. If you are "
+"looking for such functionality, please use the history window instead.\n"
 "\n"
-"Use this program to delete or export logs. You can select logs from the left "
-"and/or search database from below."
+"You can use this program to delete or export history. Either select logs "
+"from the left or search the database."
 msgstr ""
 "Este gestor de registros no está pensado para ver registros. Si quieres "
 "dicha funcionalidad usa la ventana del histórico en su lugar.\n"
@@ -8117,8 +8303,9 @@ msgid "Select an emoji"
 msgstr "Usar _emoticonos"
 
 #: gajim/data/gui/shortcuts_window.ui:38
-msgid "Complete a command or a nick"
-msgstr ""
+#, fuzzy
+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
@@ -8158,7 +8345,7 @@ msgstr ""
 msgid "Scroll down"
 msgstr ""
 
-#: gajim/data/gui/shortcuts_window.ui:100 gajim/gtk/xml_console.py:72
+#: gajim/data/gui/shortcuts_window.ui:100 gajim/gtk/xml_console.py:69
 #, fuzzy
 msgid "Clear"
 msgstr "Limpiando"
@@ -8200,8 +8387,9 @@ msgid "Close chat"
 msgstr ""
 
 #: gajim/data/gui/shortcuts_window.ui:173
-msgid "Roster Shortcuts"
-msgstr ""
+#, fuzzy
+msgid "Contact List Shortcuts"
+msgstr "Atajos de conversaciones"
 
 #: gajim/data/gui/shortcuts_window.ui:196
 #, fuzzy
@@ -8214,9 +8402,8 @@ msgid "Join a group chat"
 msgstr "en _grupos de charla"
 
 #: gajim/data/gui/shortcuts_window.ui:217
-#, fuzzy
 msgid "Set the status message"
-msgstr "ensaje de estado"
+msgstr "Establecer el mensaje de estado"
 
 #: gajim/data/gui/shortcuts_window.ui:232
 msgid "Appearance"
@@ -8233,7 +8420,7 @@ msgid "Show only active contacts"
 msgstr "Mostrar sólo contactos _activos"
 
 #: gajim/data/gui/shortcuts_window.ui:251
-msgid "Enable roster filtering"
+msgid "Enable contact list filtering"
 msgstr ""
 
 #: gajim/data/gui/shortcuts_window.ui:259
@@ -8281,12 +8468,12 @@ msgstr "Buscando solo en el día seleccionado"
 
 #: gajim/data/gui/history_window.ui:317
 #, fuzzy
-msgid "Record history for this chat"
+msgid "Store history for this chat"
 msgstr "Ignorar este error para este certificado"
 
 #: gajim/data/gui/history_window.ui:332
 #, fuzzy
-msgid "Record History"
+msgid "Store History"
 msgstr "Histórico"
 
 #: gajim/data/gui/history_window.ui:350
@@ -8307,9 +8494,10 @@ msgstr "Crear nuevo post"
 msgid "Fill in the form."
 msgstr "Rellenar el formulario."
 
-#: gajim/data/gui/data_form_window.ui:229
-msgid "Room Configuration"
-msgstr "Configuración del salón"
+#: gajim/data/gui/data_form_window.ui:229 gajim/gtk/groupchat_config.py:41
+#, fuzzy
+msgid "Group Chat Configuration"
+msgstr "Invitación a grupo de charla"
 
 #: gajim/data/gui/roster_item_exchange_window.ui:39
 #: gajim/gtk/roster_item_exchange.py:35
@@ -8330,15 +8518,15 @@ msgstr "Es_tado"
 msgid "_Start Chat..."
 msgstr "Iniciar conver_sación"
 
-#: gajim/data/gui/systray_context_menu.ui:50
+#: gajim/data/gui/systray_context_menu.ui:43
 msgid "Show All Pending _Events"
 msgstr "Mostrar todos los _eventos pendientes"
 
-#: gajim/data/gui/systray_context_menu.ui:59
+#: gajim/data/gui/systray_context_menu.ui:52
 msgid "Mute Sounds"
 msgstr "Silenciar sonidos"
 
-#: gajim/data/gui/systray_context_menu.ui:75
+#: gajim/data/gui/systray_context_menu.ui:68
 #, fuzzy
 msgid "_Preferences"
 msgstr "Preferencias"
@@ -8418,9 +8606,8 @@ msgid "Missing arguments"
 msgstr "No se encuentra el argumento \"contact_jid\""
 
 #: gajim/command_system/mapping.py:263
-#, fuzzy
 msgid "Too many arguments"
-msgstr "No se encuentra el argumento \"contact_jid\""
+msgstr "Demasiados argumentos"
 
 #: gajim/command_system/implementation/execute.py:54
 msgid "Execute expression inside a shell, show output"
@@ -8430,33 +8617,33 @@ msgstr ""
 msgid "Execute expression inside a shell, send output"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:45
+#: gajim/command_system/implementation/standard.py:47
 msgid ""
 "Show help on a given command or a list of available commands if -a is given"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:73
+#: gajim/command_system/implementation/standard.py:75
 msgid "Send a message to the contact"
 msgstr "Enviar un mensaje al contacto"
 
-#: gajim/command_system/implementation/standard.py:78
+#: gajim/command_system/implementation/standard.py:80
 msgid "Send action (in the third person) to the current chat"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:83
+#: gajim/command_system/implementation/standard.py:85
 msgid "Show logged messages which mention given text"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:88
+#: gajim/command_system/implementation/standard.py:90
 #, fuzzy, python-format
 msgid "%s: Nothing found"
 msgstr "%s no encontrado"
 
-#: gajim/command_system/implementation/standard.py:94
+#: gajim/command_system/implementation/standard.py:96
 msgid "Limit must be an integer"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:118
+#: gajim/command_system/implementation/standard.py:120
 msgid ""
 "\n"
 "    Set the current status\n"
@@ -8466,126 +8653,127 @@ msgid ""
 "    "
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:136
+#: gajim/command_system/implementation/standard.py:138
 msgid "Set the current status to away"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:150
+#: gajim/command_system/implementation/standard.py:152
 msgid "Set the current status to online"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:153
+#: gajim/command_system/implementation/standard.py:155
 #, fuzzy
 msgid "Available"
 msgstr "En líne_a"
 
-#: gajim/command_system/implementation/standard.py:173
-#: gajim/command_system/implementation/standard.py:250
+#: gajim/command_system/implementation/standard.py:175
+#: gajim/command_system/implementation/standard.py:252
 msgid "Clear the text window"
 msgstr "Limpiar ventana de texto"
 
-#: gajim/command_system/implementation/standard.py:178
-#: gajim/command_system/implementation/standard.py:397
+#: gajim/command_system/implementation/standard.py:180
+#: gajim/command_system/implementation/standard.py:401
 msgid "Send a ping to the contact"
 msgstr "Hacer un ping al contacto"
 
-#: gajim/command_system/implementation/standard.py:181
-#: gajim/command_system/implementation/standard.py:400
+#: gajim/command_system/implementation/standard.py:183
+#: gajim/command_system/implementation/standard.py:404
 #, fuzzy
 msgid "Command is not supported for zeroconf accounts"
 msgstr "Comando no soportado por la cuenta zeroconf."
 
-#: gajim/command_system/implementation/standard.py:185
-msgid "Send DTMF sequence through an open audio session"
+#: gajim/command_system/implementation/standard.py:187
+msgid "Send DTMF sequence through an open voice chat"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:188
+#: gajim/command_system/implementation/standard.py:190
 #, fuzzy
-msgid "No open audio sessions with the contact"
+msgid "No open voice chats with the contact"
 msgstr "Click para ver anteriores conversaciones con este contacto"
 
-#: gajim/command_system/implementation/standard.py:191
+#: gajim/command_system/implementation/standard.py:193
 #, fuzzy, python-format
 msgid "%s is not a valid tone"
 msgstr "%s no es un nivel de registro válido"
 
-#: gajim/command_system/implementation/standard.py:198
-msgid "Toggle audio session"
+#: gajim/command_system/implementation/standard.py:200
+msgid "Toggle Voice Chat"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:201
+#: gajim/command_system/implementation/standard.py:203
 #, fuzzy
-msgid "Audio sessions are not available"
+msgid "Voice chats are not available"
 msgstr "El bus de la sesión no está disponible"
 
-#: gajim/command_system/implementation/standard.py:208
-msgid "Toggle video session"
+#: gajim/command_system/implementation/standard.py:210
+msgid "Toggle Video Chat"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:211
+#: gajim/command_system/implementation/standard.py:213
 #, fuzzy
-msgid "Video sessions are not available"
+msgid "Video chats are not available"
 msgstr "El bus de la sesión no está disponible"
 
-#: gajim/command_system/implementation/standard.py:218
+#: gajim/command_system/implementation/standard.py:220
 #, fuzzy
 msgid "Send a message to the contact that will attract their attention"
 msgstr "Enviar un mensaje al contacto"
 
-#: gajim/command_system/implementation/standard.py:255
+#: gajim/command_system/implementation/standard.py:257
 #, fuzzy
 msgid "Change your nickname in a group chat"
 msgstr "Cambiar tu _alias (Ctrl+N)"
 
-#: gajim/command_system/implementation/standard.py:260 gajim/gtk/dialogs.py:674
-#: gajim/gtk/bookmarks.py:272
+#: gajim/command_system/implementation/standard.py:262
 msgid "Invalid nickname"
 msgstr "Alias no válido"
 
-#: gajim/command_system/implementation/standard.py:267
-msgid "Open a private chat window with a specified occupant"
+#: gajim/command_system/implementation/standard.py:269
+#, fuzzy
+msgid "Open a private chat window with a specified participant"
 msgstr "Abra una ventana de chat privada con un ocupante especificado"
 
-#: gajim/command_system/implementation/standard.py:273
-#: gajim/command_system/implementation/standard.py:282
-#: gajim/command_system/implementation/standard.py:332
-#: gajim/command_system/implementation/standard.py:345
-#: gajim/command_system/implementation/standard.py:357
+#: gajim/command_system/implementation/standard.py:275
+#: gajim/command_system/implementation/standard.py:284
+#: gajim/command_system/implementation/standard.py:336
+#: gajim/command_system/implementation/standard.py:349
+#: gajim/command_system/implementation/standard.py:361
 msgid "Nickname not found"
 msgstr "Alias no encontrado"
 
-#: gajim/command_system/implementation/standard.py:276
+#: gajim/command_system/implementation/standard.py:278
+#, fuzzy
 msgid ""
-"Open a private chat window with a specified occupant and send him a message"
+"Open a private chat window with a specified participant and send him a "
+"message"
 msgstr ""
 "Abra una ventana de chat privada con un ocupante especificado y envíele un "
 "mensaje"
 
-#: gajim/command_system/implementation/standard.py:285
-#, fuzzy
+#: gajim/command_system/implementation/standard.py:287
 msgid "Display or change a group chat topic"
-msgstr "Preguntar antes de cerrar una ventana/petaña de salón de charla."
+msgstr "Mostrar o cambiar el tema de una sala de conversación"
 
-#: gajim/command_system/implementation/standard.py:294
-msgid "Invite a user to a room for a reason"
+#: gajim/command_system/implementation/standard.py:296
+msgid "Invite a user to a group chat for a reason"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:297
+#: gajim/command_system/implementation/standard.py:299
 #, python-format
 msgid "Invited %(jid)s to %(room_jid)s"
 msgstr "%(jid)s invitado a %(room_jid)s"
 
-#: gajim/command_system/implementation/standard.py:301
+#: gajim/command_system/implementation/standard.py:303
 #, fuzzy
-msgid "Join a group chat given by a JID"
+msgid "Join a group chat given by an XMPP Address"
 msgstr "en _grupos de charla"
 
-#: gajim/command_system/implementation/standard.py:309
+#: gajim/command_system/implementation/standard.py:313
 msgid ""
-"Leave the groupchat, optionally giving a reason, and close tab or window"
+"Leave the group chat, optionally giving a reason, and close tab or window"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:314
+#: gajim/command_system/implementation/standard.py:318
 msgid ""
 "\n"
 "    Ban user by a nick or a JID from a groupchat\n"
@@ -8594,45 +8782,46 @@ msgid ""
 "    "
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:329
+#: gajim/command_system/implementation/standard.py:333
 #, fuzzy
-msgid "Kick user by a nick from a groupchat"
+msgid "Kick user by a nick from a group chat"
 msgstr "Has sido invitado a un grupo de charla"
 
-#: gajim/command_system/implementation/standard.py:338
+#: gajim/command_system/implementation/standard.py:342
 msgid ""
-"Set occupant role in group chat.\n"
+"Set participant role in group chat.\n"
 "    Role can be given as one of the following values:\n"
 "    moderator, participant, visitor, none"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:343
+#: gajim/command_system/implementation/standard.py:347
 #, fuzzy
 msgid "Invalid role given"
 msgstr "Servidor no válido"
 
-#: gajim/command_system/implementation/standard.py:350
+#: gajim/command_system/implementation/standard.py:354
 msgid ""
-"Set occupant affiliation in group chat.\n"
+"Set participant affiliation in group chat.\n"
 "    Affiliation can be given as one of the following values:\n"
 "    owner, admin, member, outcast, none"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:355
+#: gajim/command_system/implementation/standard.py:359
 #, fuzzy
 msgid "Invalid affiliation given"
 msgstr "cambió la afiliación"
 
-#: gajim/command_system/implementation/standard.py:365
-msgid "Display names of all group chat occupants"
+#: gajim/command_system/implementation/standard.py:369
+#, fuzzy
+msgid "Display names of all group chat participants"
 msgstr "Muestra los nombres de los ocupantes del grupo de charla."
 
-#: gajim/command_system/implementation/standard.py:387
-msgid "Forbid an occupant to send you public or private messages"
+#: gajim/command_system/implementation/standard.py:391
+msgid "Forbid a participant to send you public or private messages"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:392
-msgid "Allow an occupant to send you public or private messages"
+#: gajim/command_system/implementation/standard.py:396
+msgid "Allow a participant to send you public or private messages"
 msgstr ""
 
 #: gajim/command_system/implementation/middleware.py:74
@@ -8643,203 +8832,326 @@ msgstr "¡Error durante la ejecución del comando!"
 msgid "The same as using a doc-string, except it supports translation"
 msgstr ""
 
-#: gajim/gtk/filetransfer.py:91
+#: gajim/gtk/groupchat_info.py:36
+#, fuzzy
+msgid "?Group chat feature:Archiving"
+msgstr "Invitación a grupo de charla"
+
+#: gajim/gtk/groupchat_info.py:37
+#, fuzzy
+msgid "Messages are archived on the server"
+msgstr "La NO SERÁ registrada"
+
+#: gajim/gtk/groupchat_info.py:40
+#, fuzzy
+msgid "?Group chat feature:Persistent"
+msgstr "Grupos de charla"
+
+#: gajim/gtk/groupchat_info.py:41
+msgid "This group chat persists even if there are no participants"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:45
+#, fuzzy
+msgid "?Group chat feature:Temporary"
+msgstr "Ninguno"
+
+#: gajim/gtk/groupchat_info.py:46
+msgid "This group chat will be destroyed once the last participant left"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:50
+#, fuzzy
+msgid "?Group chat feature:Moderated"
+msgstr "Ninguno"
+
+#: gajim/gtk/groupchat_info.py:51
+msgid ""
+"Participants entering this group chat need to request permission to send "
+"messages"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:55
+#, fuzzy
+msgid "?Group chat feature:Not Moderated"
+msgstr "Grupos de charla"
+
+#: gajim/gtk/groupchat_info.py:56
+msgid "Participants entering this group chat are allowed to send messages"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:60
+#, fuzzy
+msgid "?Group chat feature:Open"
+msgstr "Ninguno"
+
+#: gajim/gtk/groupchat_info.py:61
+msgid "Anyone can join this group chat"
+msgstr "Cualquiera se puede unir a este grupo de charla"
+
+#: gajim/gtk/groupchat_info.py:64
+#, fuzzy
+msgid "?Group chat feature:Members Only"
+msgstr "Resaltado de mensaje de grupo de charla"
+
+#: gajim/gtk/groupchat_info.py:65
+msgid "This group chat is restricted to members only"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:69
+#, fuzzy
+msgid "?Group chat feature:Public"
+msgstr "Resaltado de mensaje de grupo de charla"
+
+#: gajim/gtk/groupchat_info.py:70
+msgid "Group chat can be found via search"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:73
+#, fuzzy
+msgid "?Group chat feature:Hidden"
+msgstr "Ninguno"
+
+#: gajim/gtk/groupchat_info.py:74
+#, fuzzy
+msgid "This group chat can not be found via search"
+msgstr "Este grupo de charla no tiene tema"
+
+#: gajim/gtk/groupchat_info.py:77
+#, fuzzy
+msgid "?Group chat feature:Not Anonymous"
+msgstr "Grupos de charla"
+
+#: gajim/gtk/groupchat_info.py:78
+msgid "All other group chat participants can see your XMPP address"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:82
+#, fuzzy
+msgid "?Group chat feature:Semi-Anonymous"
+msgstr "Resaltado de mensaje de grupo de charla"
+
+#: gajim/gtk/groupchat_info.py:83
+msgid "Only moderators can see your XMPP address"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:86
+#, fuzzy
+msgid "?Group chat feature:Password Required"
+msgstr "Grupos de charla"
+
+#: gajim/gtk/groupchat_info.py:87
+msgid "This group chat does require a password upon entry"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:91
+#, fuzzy
+msgid "?Group chat feature:No Password Required"
+msgstr "Grupos de charla"
+
+#: gajim/gtk/groupchat_info.py:92
+msgid "This group chat does not require a password upon entry"
+msgstr ""
+
+#: gajim/gtk/filetransfer.py:90
 msgid "File"
 msgstr "Archivo"
 
-#: gajim/gtk/filetransfer.py:108
+#: gajim/gtk/filetransfer.py:107
 msgid "Time"
 msgstr "Hora"
 
-#: gajim/gtk/filetransfer.py:228
+#: gajim/gtk/filetransfer.py:227
 #, fuzzy, python-format
 msgid "File name: %s"
 msgstr "Nombre de archivo: %s"
 
-#: gajim/gtk/filetransfer.py:229 gajim/gtk/filetransfer.py:464
+#: gajim/gtk/filetransfer.py:228 gajim/gtk/filetransfer.py:469
 #, python-format
 msgid "Size: %s"
 msgstr "Tamaño: %s"
 
-#: gajim/gtk/filetransfer.py:239
+#: gajim/gtk/filetransfer.py:238
 #, python-format
 msgid "Sender: %s"
 msgstr "Sender: %s"
 
-#: gajim/gtk/filetransfer.py:240 gajim/gtk/filetransfer.py:744
+#: gajim/gtk/filetransfer.py:239 gajim/gtk/filetransfer.py:749
 #: gajim/gtk/tooltips.py:577
 msgid "Recipient: "
 msgstr "Recipiente: "
 
-#: gajim/gtk/filetransfer.py:251
+#: gajim/gtk/filetransfer.py:250
 #, python-format
 msgid "Saved in: %s"
 msgstr "Guardado en: %s"
 
-#: gajim/gtk/filetransfer.py:256
+#: gajim/gtk/filetransfer.py:255
 msgid "File transfer completed"
 msgstr "Transferencia de archivo finalizada"
 
-#: gajim/gtk/filetransfer.py:276 gajim/gtk/filetransfer.py:285
+#: gajim/gtk/filetransfer.py:275 gajim/gtk/filetransfer.py:284
 #, fuzzy
 msgid "Connection with peer could not be established."
 msgstr "La conexión con el cliente no se pudo establecer."
 
-#: gajim/gtk/filetransfer.py:293
+#: gajim/gtk/filetransfer.py:292
 #, python-format
 msgid "Filename: %s"
 msgstr "Nombre de archivo: %s"
 
-#: gajim/gtk/filetransfer.py:294
+#: gajim/gtk/filetransfer.py:293
 #, python-format
 msgid "Recipient: %s"
 msgstr "Recipiente: %s"
 
-#: gajim/gtk/filetransfer.py:296
+#: gajim/gtk/filetransfer.py:295
 #, python-format
 msgid "Error message: %s"
 msgstr "Mensaje de error: %s"
 
-#: gajim/gtk/filetransfer.py:333
-#, fuzzy
-msgid "File transfer error"
-msgstr "Error en la transferencia del archivo"
-
 #: gajim/gtk/filetransfer.py:334
 #, python-format
 msgid ""
-"The file %(file)s has been received, but it seems to have been damaged along "
-"the way.\n"
+"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 ""
-"Se ha recibido el archivo %(file)s, pero parece haber sido dañado en el "
-"camino.\n"
+"Se ha recibido el archivo %s, pero parece haber sido dañado en el camino.\n"
 "¿Quieres descargarlo de nuevo?"
 
-#: gajim/gtk/filetransfer.py:350
+#: gajim/gtk/filetransfer.py:340
+#, fuzzy
+msgid "_Download Again"
+msgstr "_No preguntarme otra vez"
+
+#: gajim/gtk/filetransfer.py:355
 msgid "Gajim can not read this file"
 msgstr "Gajim no puede leer este archivo"
 
-#: gajim/gtk/filetransfer.py:351
+#: gajim/gtk/filetransfer.py:356
 msgid "Another process is using this file."
 msgstr "Otro proceso es usar este archivo."
 
-#: gajim/gtk/filetransfer.py:418
+#: gajim/gtk/filetransfer.py:423
 #, fuzzy
 msgid "File Transfer Conflict"
 msgstr "Transferencia del archivo finalizada"
 
-#: gajim/gtk/filetransfer.py:419
+#: gajim/gtk/filetransfer.py:424
 msgid "This file already exists"
 msgstr "Este archivo ya existe"
 
-#: gajim/gtk/filetransfer.py:420
+#: gajim/gtk/filetransfer.py:425
 msgid "Resume download or replace file?"
 msgstr ""
 
-#: gajim/gtk/filetransfer.py:424
+#: gajim/gtk/filetransfer.py:429
 #, fuzzy
 msgid "Replace _File"
 msgstr "Limpiando"
 
-#: gajim/gtk/filetransfer.py:427
+#: gajim/gtk/filetransfer.py:432
 #, fuzzy
 msgid "Resume _Download"
 msgstr "Descarga"
 
-#: gajim/gtk/filetransfer.py:437
+#: gajim/gtk/filetransfer.py:442
 #, fuzzy, python-format
 msgid "Directory '%s' is not writable"
 msgstr "No se puede escribir en el directorio \"%s\""
 
-#: gajim/gtk/filetransfer.py:438
+#: gajim/gtk/filetransfer.py:443
 #, fuzzy
 msgid "You do not have permissions to create files in this directory."
 msgstr "No tienes permisos para crear archivos en este directorio."
 
-#: gajim/gtk/filetransfer.py:461
+#: gajim/gtk/filetransfer.py:466
 #, python-format
 msgid "File: %s"
 msgstr "Archivo: %s"
 
-#: gajim/gtk/filetransfer.py:467
+#: gajim/gtk/filetransfer.py:472
 #, python-format
 msgid "Type: %s"
 msgstr "Tipo: %s"
 
-#: gajim/gtk/filetransfer.py:469
+#: gajim/gtk/filetransfer.py:474
 #, python-format
 msgid "Description: %s"
 msgstr "Descripción: %s"
 
-#: gajim/gtk/filetransfer.py:480
+#: gajim/gtk/filetransfer.py:485
 #, fuzzy, python-format
 msgid "%s wants to send you a file"
 msgstr "%s quiere enviarte un archivo."
 
-#: gajim/gtk/filetransfer.py:509
+#: gajim/gtk/filetransfer.py:514
 msgid "Checking file…"
 msgstr "Comprobando archivo…"
 
-#: gajim/gtk/filetransfer.py:524
+#: gajim/gtk/filetransfer.py:529
 msgid "File error"
 msgstr "Error de archivo"
 
-#: gajim/gtk/filetransfer.py:561
+#: gajim/gtk/filetransfer.py:566
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 
-#: gajim/gtk/filetransfer.py:658
+#: gajim/gtk/filetransfer.py:663
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/s)"
 
-#: gajim/gtk/filetransfer.py:711 gajim/gtk/filetransfer.py:715
+#: gajim/gtk/filetransfer.py:716 gajim/gtk/filetransfer.py:720
 msgid "Invalid File"
 msgstr "Archivo no válido"
 
-#: gajim/gtk/filetransfer.py:711
+#: gajim/gtk/filetransfer.py:716
 msgid "File: "
 msgstr "Archivo: "
 
-#: gajim/gtk/filetransfer.py:716
+#: gajim/gtk/filetransfer.py:721
 msgid "It is not possible to send empty files"
 msgstr "No es posible enviar archivos vacíos"
 
-#: gajim/gtk/filetransfer.py:742 gajim/gtk/tooltips.py:571
+#: gajim/gtk/filetransfer.py:747 gajim/gtk/tooltips.py:571
 msgid "Sender: "
 msgstr "Remitente: "
 
-#: gajim/gtk/filetransfer.py:1038
+#: gajim/gtk/filetransfer.py:1043
 msgid "Choose a File to Send…"
 msgstr "Elija un archivo para enviar…"
 
 #: gajim/gtk/start_chat.py:51
 #, fuzzy
-msgid "Start new Conversation"
+msgid "Start New Conversation"
 msgstr "Conversación continuada"
 
-#: gajim/gtk/start_chat.py:424
-#, fuzzy
-msgid "New Groupchat"
-msgstr "Nuevo grupo de charla"
+#: gajim/gtk/start_chat.py:260 gajim/gtk/start_chat.py:328
+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:603 gajim/gtk/groupchat_join.py:38
+msgid "Join Group Chat"
+msgstr "Entrar a un salón de chat"
 
-#: gajim/gtk/start_chat.py:426
+#: gajim/gtk/start_chat.py:605 gajim/gtk/add_contact.py:40
 #, fuzzy
-msgid "New Contact"
-msgstr "Añadir un contacto"
+msgid "Add Contact"
+msgstr "_Añadir contacto..."
 
-#: gajim/gtk/start_chat.py:588
+#: gajim/gtk/start_chat.py:746
 #, fuzzy, python-format
-msgid "%s Group chats found"
+msgid "%s group chats found"
 msgstr "%s no encontrado"
 
-#: gajim/gtk/discovery.py:70
+#: gajim/gtk/discovery.py:69
 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:71
+#: gajim/gtk/discovery.py:70
 #, fuzzy
 msgid ""
 "This service could not respond with detailed information.\n"
@@ -8848,32 +9160,33 @@ msgstr ""
 "Este servicio podría no responder con información detallada.\n"
 "Posiblemente es antiguo o está roto"
 
-#: gajim/gtk/discovery.py:128
+#: gajim/gtk/discovery.py:126
 msgid "Others"
 msgstr "Others"
 
-#: gajim/gtk/discovery.py:131
-msgid "Conference"
-msgstr "Conferencia"
+#: gajim/gtk/discovery.py:129
+#, fuzzy
+msgid "Group Chat"
+msgstr "_Grupos de charla"
 
-#: gajim/gtk/discovery.py:519
+#: gajim/gtk/discovery.py:518
 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:606
+#: gajim/gtk/discovery.py:605
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Gestión de servicios usando la cuenta %s"
 
-#: gajim/gtk/discovery.py:608
+#: gajim/gtk/discovery.py:607
 msgid "Service Discovery"
 msgstr "Gestión de servicios"
 
-#: gajim/gtk/discovery.py:691
+#: gajim/gtk/discovery.py:690
 msgid "The service could not be found"
 msgstr "El servicio no fue encontrado"
 
-#: gajim/gtk/discovery.py:692
+#: gajim/gtk/discovery.py:691
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -8881,100 +9194,80 @@ 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:699 gajim/gtk/discovery.py:1042
+#: gajim/gtk/discovery.py:698 gajim/gtk/discovery.py:1041
 msgid "The service is not browsable"
 msgstr "El servicio no es navegable"
 
-#: gajim/gtk/discovery.py:700
+#: gajim/gtk/discovery.py:699
 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:738 gajim/gtk/discovery.py:747
+#: gajim/gtk/discovery.py:737 gajim/gtk/discovery.py:746
 msgid "Invalid Server Name"
 msgstr "Nombre de servidor no válido"
 
-#: gajim/gtk/discovery.py:806
+#: gajim/gtk/discovery.py:805
 #, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Navegar por %(address)s usando la cuenta %(account)s"
 
-#: gajim/gtk/discovery.py:851
+#: gajim/gtk/discovery.py:850
 #, fuzzy
 msgid "Browse"
 msgstr "_Navegar"
 
-#: gajim/gtk/discovery.py:1043
+#: gajim/gtk/discovery.py:1042
 msgid "This service does not contain any items to browse."
 msgstr "Este servicio no contiene elementos para navegar."
 
-#: gajim/gtk/discovery.py:1255
+#: gajim/gtk/discovery.py:1254
 #, fuzzy
 msgid "_Command"
 msgstr "Comandos"
 
-#: gajim/gtk/discovery.py:1264 gajim/gtk/discovery.py:1422
+#: gajim/gtk/discovery.py:1263 gajim/gtk/discovery.py:1420
 msgid "Re_gister"
 msgstr "_Suscribir"
 
-#: gajim/gtk/discovery.py:1277
+#: gajim/gtk/discovery.py:1276
 msgid "_Search"
 msgstr "_Buscar"
 
-#: gajim/gtk/discovery.py:1420
+#: gajim/gtk/discovery.py:1418
 msgid "_Edit"
 msgstr "_Editar"
 
-#: gajim/gtk/discovery.py:1458
+#: gajim/gtk/discovery.py:1456
 #, fuzzy, python-format
 msgid "Scanning %(current)d / %(total)d ..."
 msgstr "Escaneando %(current)d / %(total)d.."
 
-#: gajim/gtk/discovery.py:1674
+#: gajim/gtk/discovery.py:1655
+msgid "Users"
+msgstr "Usuarios"
+
+#: gajim/gtk/discovery.py:1671
 msgid "Id"
 msgstr "Id"
 
-#: gajim/gtk/discovery.py:1713
-msgid "_Join"
-msgstr "_Entrar"
-
-#: gajim/gtk/discovery.py:1736
-msgid "Bookmark already set"
-msgstr "Marcador ya definido"
-
-#: gajim/gtk/discovery.py:1737
-#, fuzzy, python-format
-msgid "Group Chat '%s' is already in your bookmarks."
-msgstr "El salón \"%s\" ya se encuentra en tus marcadores."
-
-#: gajim/gtk/discovery.py:1748
-msgid "Bookmark has been added successfully"
-msgstr "Marcador añadido con éxito"
-
-#: gajim/gtk/discovery.py:1749
-#, fuzzy
-msgid ""
-"You can manage your bookmarks by clicking the Bookmarks menu item in your "
-"contact list."
-msgstr "Puedes gestionar tus marcadores mediante el menú Acciones de tu roster"
-
-#: gajim/gtk/discovery.py:1950
+#: gajim/gtk/discovery.py:1900
 msgid "Subscribed"
 msgstr "Añadido"
 
-#: gajim/gtk/discovery.py:1959
+#: gajim/gtk/discovery.py:1909
 msgid "Node"
 msgstr "Nodo"
 
-#: gajim/gtk/discovery.py:2028
+#: gajim/gtk/discovery.py:1978
 #, fuzzy
 msgid "_New post"
 msgstr "Nuevo post"
 
-#: gajim/gtk/discovery.py:2037
+#: gajim/gtk/discovery.py:1987
 msgid "_Subscribe"
 msgstr "_Añadir"
 
-#: gajim/gtk/discovery.py:2045
+#: gajim/gtk/discovery.py:1995
 msgid "_Unsubscribe"
 msgstr "_Eliminar"
 
@@ -9021,7 +9314,7 @@ msgstr "De %s"
 msgid "Characters typed: %s"
 msgstr "Caracteres tecleados: %s"
 
-#: gajim/gtk/single_message.py:274 gajim/gtk/xml_console.py:169
+#: gajim/gtk/single_message.py:274 gajim/gtk/xml_console.py:166
 msgid "Connection not available"
 msgstr "Conexión no disponible"
 
@@ -9030,6 +9323,12 @@ msgstr "Conexión no disponible"
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Por favor, asegúrate de estar conectado con \"%s\"."
 
+#: gajim/gtk/single_message.py:306
+#, fuzzy, 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."
+
 #: gajim/gtk/single_message.py:330
 #, python-format
 msgid "RE: %s"
@@ -9040,21 +9339,21 @@ msgstr "RE: %s"
 msgid "%s wrote:\n"
 msgstr "%s escribió:\n"
 
-#: gajim/gtk/pep_config.py:44
+#: gajim/gtk/pep_config.py:45
 #, python-format
 msgid "PEP Service Configuration (%s)"
 msgstr "Configuración del servicio PEP (%s)"
 
-#: gajim/gtk/pep_config.py:77
+#: gajim/gtk/pep_config.py:78
 #, fuzzy
 msgid "Service"
 msgstr "Servidor"
 
-#: gajim/gtk/pep_config.py:114
+#: gajim/gtk/pep_config.py:115
 msgid "PEP node was not removed"
 msgstr "El nodo PEP no fue eliminado"
 
-#: gajim/gtk/pep_config.py:115
+#: gajim/gtk/pep_config.py:116
 #, python-format
 msgid ""
 "PEP node %(node)s was not removed:\n"
@@ -9063,7 +9362,7 @@ msgstr ""
 "El nodo PEP %(node)s no fue eliminado:\n"
 "%(message)s"
 
-#: gajim/gtk/pep_config.py:146
+#: gajim/gtk/pep_config.py:147
 #, python-format
 msgid "Configure %s"
 msgstr "Configurar %s"
@@ -9079,17 +9378,21 @@ msgstr "_Registrar"
 msgid "Registration successful"
 msgstr "La cuenta ha sido registrada con éxito"
 
-#: gajim/gtk/dialogs.py:54 gajim/gtk/dataform.py:659 gajim/gtk/adhoc.py:85
+#: gajim/gtk/service_registration.py:215
+msgid "Registration failed"
+msgstr "Falló el registro"
+
+#: gajim/gtk/dialogs.py:53 gajim/gtk/dataform.py:668 gajim/gtk/adhoc.py:86
 #, fuzzy
 msgid "Cancel"
 msgstr "_Cancelar"
 
-#: gajim/gtk/dialogs.py:129
+#: gajim/gtk/dialogs.py:128
 #, fuzzy, python-format
 msgid "Dictionary for language \"%s\" not available"
 msgstr "No está disponible el diccionario para el idioma %s"
 
-#: gajim/gtk/dialogs.py:130
+#: gajim/gtk/dialogs.py:129
 #, fuzzy, python-format
 msgid ""
 "You have to install the dictionary \"%s\" to use spellchecking, or choose "
@@ -9102,11 +9405,11 @@ msgstr ""
 "\n"
 "No se usará el resaltado de los errores de escritura"
 
-#: gajim/gtk/dialogs.py:410 gajim/gtk/dialogs.py:425
+#: gajim/gtk/dialogs.py:322 gajim/gtk/dialogs.py:337
 msgid "Insecure connection"
 msgstr "Conexión no segura"
 
-#: gajim/gtk/dialogs.py:411
+#: gajim/gtk/dialogs.py:323
 #, python-format
 msgid ""
 "You are about to connect to the account %(account)s (%(server)s) insecurely. "
@@ -9119,30 +9422,25 @@ msgstr ""
 "desaconseja fuertemente.\n"
 "¿Estás seguro de que quieres hacer eso?"
 
-#: gajim/gtk/dialogs.py:416
+#: gajim/gtk/dialogs.py:328
 msgid "Yes, I really want to connect insecurely"
 msgstr "Sí, quiero conectarme de forma no segura"
 
-#: gajim/gtk/dialogs.py:417
+#: gajim/gtk/dialogs.py:329
 msgid "Gajim will NOT connect unless you check this box"
 msgstr "Gajim NO conectará si no está marcada esta caja"
 
-#: gajim/gtk/dialogs.py:675
-#, fuzzy
-msgid "The nickname contains invalid characters."
-msgstr "El alias tiene caracteres no permitidos."
-
-#: gajim/gtk/dialogs.py:734
+#: gajim/gtk/dialogs.py:561
 #, fuzzy, python-format
 msgid "Destroy %s"
 msgstr "Destruyendo %s"
 
-#: gajim/gtk/dialogs.py:775
+#: gajim/gtk/dialogs.py:602
 #, fuzzy
 msgid "Certificate"
 msgstr "Certificado autofirmado"
 
-#: gajim/gtk/dialogs.py:786
+#: gajim/gtk/dialogs.py:613
 #, python-format
 msgid ""
 "Certificate for account\n"
@@ -9151,91 +9449,91 @@ msgstr ""
 "Certificado para la cuenta\n"
 "%s"
 
-#: gajim/gtk/dialogs.py:824
+#: gajim/gtk/dialogs.py:651
 msgid "Issued to\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:825 gajim/gtk/dialogs.py:830
+#: gajim/gtk/dialogs.py:652 gajim/gtk/dialogs.py:657
 msgid "Common Name (CN): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:826 gajim/gtk/dialogs.py:831
+#: gajim/gtk/dialogs.py:653 gajim/gtk/dialogs.py:658
 msgid "Organization (O): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:827 gajim/gtk/dialogs.py:832
+#: gajim/gtk/dialogs.py:654 gajim/gtk/dialogs.py:659
 msgid "Organizational Unit (OU): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:828
+#: gajim/gtk/dialogs.py:655
 #, fuzzy
 msgid "Serial Number: "
 msgstr "Número GG:"
 
-#: gajim/gtk/dialogs.py:829
+#: gajim/gtk/dialogs.py:656
 msgid "Issued by\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:833
+#: gajim/gtk/dialogs.py:660
 msgid "Validity\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:834
+#: gajim/gtk/dialogs.py:661
 msgid "Issued on: "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:835
+#: gajim/gtk/dialogs.py:662
 msgid "Expires on: "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:836
+#: gajim/gtk/dialogs.py:663
 msgid "SHA-1:"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:838
+#: gajim/gtk/dialogs.py:665
 msgid "SHA-256:"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:852
+#: gajim/gtk/dialogs.py:679
 #, fuzzy
 msgid "View certificate…"
 msgstr "Certificado autofirmado"
 
-#: gajim/gtk/dialogs.py:864 gajim/gtk/accounts.py:893
+#: gajim/gtk/dialogs.py:691 gajim/gtk/accounts.py:896
 msgid "Change Password"
 msgstr "Cambiar contraseña"
 
-#: gajim/gtk/dialogs.py:878
+#: gajim/gtk/dialogs.py:705
 msgid "_OK"
 msgstr "_OK"
 
-#: gajim/gtk/dialogs.py:891
+#: gajim/gtk/dialogs.py:718
 #, fuzzy
 msgid "You must enter a password"
 msgstr "Debes introducir una contraseña."
 
-#: gajim/gtk/dialogs.py:895
+#: gajim/gtk/dialogs.py:722
 msgid "Passwords do not match"
 msgstr "Las contraseñas no coinciden"
 
-#: gajim/gtk/dialogs.py:923
+#: gajim/gtk/dialogs.py:750
 #, fuzzy
 msgid "Group Chat Invitation "
 msgstr "Invitación a grupo de charla"
 
-#: gajim/gtk/dialogs.py:948
+#: gajim/gtk/dialogs.py:775
 #, python-format
 msgid "<b>%s</b> has invited you to join a discussion"
 msgstr "<b>%s</b> te ha invitado a entrar en una discusión"
 
-#: gajim/gtk/dialogs.py:951
+#: gajim/gtk/dialogs.py:778
 #, 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:959
+#: gajim/gtk/dialogs.py:786
 #, python-format
 msgid "Comment: %s"
 msgstr "Comentario: %s"
@@ -9250,11 +9548,6 @@ msgstr "Número GG:"
 msgid "ICQ Number"
 msgstr "Número ICQ:"
 
-#: gajim/gtk/add_contact.py:40
-#, fuzzy
-msgid "Add Contact"
-msgstr "_Añadir contacto..."
-
 #: gajim/gtk/add_contact.py:259
 #, python-format
 msgid "%s Missing"
@@ -9275,7 +9568,8 @@ msgid "The user ID must not contain a resource."
 msgstr "Esta ID de usuario no contiene un recurso."
 
 #: gajim/gtk/add_contact.py:299
-msgid "You cannot add yourself to your roster."
+#, fuzzy
+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:304
@@ -9288,11 +9582,13 @@ msgid "Your account must be online to add new contacts."
 msgstr "Tu cuenta debe estar en línea para añadir nuevos contactos."
 
 #: gajim/gtk/add_contact.py:321
-msgid "Contact already in roster"
+#, fuzzy
+msgid "Contact Already in Contact List"
 msgstr "Contacto ya presente en el roster"
 
 #: gajim/gtk/add_contact.py:322
-msgid "This contact is already listed in your roster."
+#, fuzzy
+msgid "This contact is already in your contact list."
 msgstr "Este contacto ya está listado en tu roster."
 
 #: gajim/gtk/add_contact.py:379 gajim/gtk/add_contact.py:417
@@ -9331,12 +9627,13 @@ msgid "Chatstate Paused"
 msgstr "Cambiar estado"
 
 #: gajim/gtk/themes.py:52
-msgid "MUC Tab New Directed Message"
+#, fuzzy
+msgid "Group Chat Tab New Directed Message"
 msgstr "Nuevo Mensaje Directo en Pestaña MUC"
 
 #: gajim/gtk/themes.py:56
 #, fuzzy
-msgid "MUC Tab New Message"
+msgid "Group Chat Tab New Message"
 msgstr "Nuevo mensaje"
 
 #: gajim/gtk/themes.py:60
@@ -9553,13 +9850,13 @@ msgstr "Todos los archivos"
 msgid "Clear File"
 msgstr "Limpiando"
 
-#: gajim/gtk/settings.py:570
+#: gajim/gtk/settings.py:570 gajim/gtk/proxies.py:32
 #, fuzzy
 msgid "Manage Proxies"
 msgstr "Gestionar perfiles del Proxy"
 
-#: gajim/gtk/settings.py:591 gajim/gtk/preferences.py:971
-#: gajim/gtk/preferences.py:984 gajim/gtk/preferences.py:988
+#: gajim/gtk/settings.py:591 gajim/gtk/preferences.py:968
+#: gajim/gtk/preferences.py:982 gajim/gtk/preferences.py:986
 #, fuzzy
 msgid "No Proxy"
 msgstr "Proxy"
@@ -9639,14 +9936,15 @@ msgid ""
 "        "
 msgstr ""
 
-#: gajim/gtk/about.py:47 data/org.gajim.Gajim.appdata.xml.in:10
+#: gajim/gtk/about.py:47 data/org.gajim.Gajim.desktop.in:6
+#: data/org.gajim.Gajim.appdata.xml.in:10
 #, fuzzy
-msgid "A GTK+ XMPP client"
+msgid "A GTK XMPP client"
 msgstr "Un cliente de Jabber en GTK"
 
 #: gajim/gtk/about.py:48
-#, python-format
-msgid "GTK+ Version: %s"
+#, fuzzy, python-format
+msgid "GTK Version: %s"
 msgstr "GTK+ Version: %s"
 
 #: gajim/gtk/about.py:49
@@ -9704,33 +10002,28 @@ msgid "Choose Avatar…"
 msgstr "Elegir Imagen"
 
 #: gajim/gtk/filechoosers.py:97
-#, fuzzy
 msgid "PNG files"
-msgstr "Todos los archivos"
+msgstr "Archivos PNG"
 
 #: gajim/gtk/filechoosers.py:98
-#, fuzzy
 msgid "JPEG files"
-msgstr "Todos los archivos"
+msgstr "Archivos JPEG"
 
 #: gajim/gtk/filechoosers.py:99
-#, fuzzy
 msgid "SVG files"
-msgstr "Enviar archivo"
+msgstr "Archivos SVG"
 
 #: gajim/gtk/filechoosers.py:101 gajim/gtk/filechoosers.py:150
 msgid "Images"
 msgstr "Imágenes"
 
 #: gajim/gtk/filechoosers.py:135
-#, fuzzy
 msgid "Choose Archive"
-msgstr "Elegir Imagen"
+msgstr "Elegir Archivo"
 
 #: gajim/gtk/filechoosers.py:137
-#, fuzzy
 msgid "ZIP files"
-msgstr "Todos los archivos"
+msgstr "Archivos ZIP"
 
 #: gajim/gtk/filechoosers.py:142
 #, fuzzy
@@ -9825,6 +10118,25 @@ msgstr "Pausada"
 msgid "?transfer status:Not started"
 msgstr "Pausada"
 
+#: gajim/gtk/groupchat_creation.py:97 gajim/gtk/groupchat_creation.py:99
+msgid " (optional)..."
+msgstr ""
+
+#: gajim/gtk/groupchat_creation.py:134
+#, fuzzy
+msgid "Invalid Address"
+msgstr "Archivo no válido"
+
+#: gajim/gtk/groupchat_creation.py:182
+#, fuzzy
+msgid "Not Connected"
+msgstr "Conectado"
+
+#: gajim/gtk/groupchat_creation.py:183
+#, fuzzy
+msgid "You have to be connected to create a group chat."
+msgstr "No has entrado al grupo de charla"
+
 #: gajim/gtk/sounds.py:39
 msgid "Wav Sounds"
 msgstr "Sonidos Wav"
@@ -9866,51 +10178,46 @@ msgstr "Resaltado de mensaje de grupo de charla"
 msgid "Group Chat Message Received"
 msgstr "Mensaje de grupo de charla recibido"
 
-#: gajim/gtk/dataform.py:226 gajim/gtk/dataform.py:262
+#: gajim/gtk/dataform.py:232 gajim/gtk/dataform.py:268
 #, fuzzy
 msgid "Required"
 msgstr "Contraseña requerida"
 
-#: gajim/gtk/dataform.py:286
+#: gajim/gtk/dataform.py:293
 #, fuzzy
 msgid "Yes"
 msgstr "español"
 
-#: gajim/gtk/dataform.py:286
+#: gajim/gtk/dataform.py:293
 #, fuzzy
 msgid "No"
 msgstr "Ninguno"
 
-#: gajim/gtk/dataform.py:661
+#: gajim/gtk/dataform.py:670
 msgid "Submit"
 msgstr ""
 
-#: gajim/gtk/statusicon.py:213
+#: gajim/gtk/statusicon.py:206
 #, fuzzy
 msgid "_Change Status Message…"
 msgstr "_Cambiar mensaje de estado"
 
-#: gajim/gtk/statusicon.py:247 gajim/gtk/statusicon.py:292
-#: gajim/gtk/statusicon.py:299
+#: gajim/gtk/statusicon.py:258
 #, python-format
 msgid "using account %s"
 msgstr "usando la cuenta %s"
 
-#: gajim/gtk/statusicon.py:309
+#: gajim/gtk/statusicon.py:269
 #, fuzzy
-msgid "_Manage Bookmarks…"
-msgstr "Gestionar marcadores"
+msgid "Hide _Contact List"
+msgstr "Invitar _Contactos"
 
-#: gajim/gtk/statusicon.py:325
+#: gajim/gtk/statusicon.py:273
 #, fuzzy
-msgid "Hide _Roster"
-msgstr "en _roster"
-
-#: gajim/gtk/statusicon.py:329
-msgid "Show _Roster"
-msgstr "Mostrar _roster"
+msgid "Show _Contact List"
+msgstr "Mostrar sólo contactos _activos"
 
-#: gajim/gtk/statusicon.py:337
+#: gajim/gtk/statusicon.py:281
 msgid "Hide this menu"
 msgstr "Oculta este menú"
 
@@ -9920,14 +10227,12 @@ msgid "Retrieving profile…"
 msgstr "Recuperando perfil..."
 
 #: gajim/gtk/profile.py:178
-#, fuzzy
 msgid "Wrong date format"
-msgstr "Información"
+msgstr "Formato de fecha incorrecto"
 
 #: gajim/gtk/profile.py:181
-#, fuzzy
 msgid "Format of the date must be YYYY-MM-DD"
-msgstr "Formato: AAAA-MM-DD"
+msgstr "El formato de fecha debe ser: AAAA-MM-DD"
 
 #: gajim/gtk/profile.py:248
 msgid "Information received"
@@ -9959,36 +10264,6 @@ msgstr ""
 "Ocurrió un error mientras se publicaba tu información personal, inténtalo de "
 "nuevo más tarde."
 
-#: gajim/gtk/join_groupchat.py:202
-#, fuzzy
-msgid "Invalid Room"
-msgstr "Salón no válido"
-
-#: gajim/gtk/join_groupchat.py:203
-msgid "Please choose a room"
-msgstr ""
-
-#: gajim/gtk/join_groupchat.py:222 gajim/gtk/join_groupchat.py:229
-msgid "Invalid Nickname"
-msgstr "Alias no válido"
-
-#: gajim/gtk/join_groupchat.py:223
-#, fuzzy
-msgid "Please choose a nickname"
-msgstr "Por favor crea un nuevo tema desde cero con el nombre deseado."
-
-#: gajim/gtk/join_groupchat.py:282 gajim/gtk/join_groupchat.py:288
-#: gajim/gtk/join_groupchat.py:293
-#, fuzzy
-msgid "Wrong server"
-msgstr "Uri incorrecta"
-
-#: gajim/gtk/join_groupchat.py:283 gajim/gtk/join_groupchat.py:289
-#: gajim/gtk/join_groupchat.py:294
-#, python-format
-msgid "%s is not a groupchat server"
-msgstr "%s no es un servidor de grupo de charla"
-
 #: gajim/gtk/mam_preferences.py:38
 #, python-format
 msgid "Archiving Preferences for %s"
@@ -10018,45 +10293,53 @@ msgstr "Error recibido: {}"
 msgid "Archiving Preferences Error"
 msgstr "_Preferencias"
 
-#: gajim/gtk/advanced_config.py:81
+#: gajim/gtk/advanced_config.py:95
 msgid "Activated"
 msgstr "Activado"
 
-#: gajim/gtk/advanced_config.py:81
+#: gajim/gtk/advanced_config.py:95
 msgid "Deactivated"
 msgstr "Desactivado"
 
-#: gajim/gtk/advanced_config.py:83
-msgid "Boolean"
-msgstr "Booleano"
+#: gajim/gtk/advanced_config.py:97
+msgid "?config type:Boolean"
+msgstr ""
 
-#: gajim/gtk/advanced_config.py:84
-msgid "Integer"
-msgstr "Entero"
+#: gajim/gtk/advanced_config.py:98
+msgid "?config type:Integer"
+msgstr ""
 
-#: gajim/gtk/advanced_config.py:85
-msgid "Text"
-msgstr "Texto"
+#: gajim/gtk/advanced_config.py:99
+msgid "?config type:Text"
+msgstr ""
 
-#: gajim/gtk/advanced_config.py:97
-msgid "Preference Name"
+#: gajim/gtk/advanced_config.py:100
+msgid "?config type:Color"
+msgstr ""
+
+#: gajim/gtk/advanced_config.py:112
+#, fuzzy
+msgid "?config:Preference Name"
 msgstr "Nombre de la opción"
 
-#: gajim/gtk/advanced_config.py:104
-msgid "Value"
-msgstr "Valor"
+#: gajim/gtk/advanced_config.py:123
+#, fuzzy
+msgid "?config:Value"
+msgstr "_Configurar"
 
-#: gajim/gtk/advanced_config.py:113
-msgid "Type"
-msgstr "Tipo"
+#: gajim/gtk/advanced_config.py:132
+msgid "?config:Type"
+msgstr ""
 
-#: gajim/gtk/advanced_config.py:168
-msgid "(None)"
-msgstr "(Ninguno)"
+#: gajim/gtk/advanced_config.py:187
+#, fuzzy
+msgid "?config description:None"
+msgstr "Ninguna"
 
-#: gajim/gtk/advanced_config.py:299
-msgid "Hidden"
-msgstr "Oculta"
+#: gajim/gtk/advanced_config.py:322
+#, fuzzy
+msgid "?password:Hidden"
+msgstr "Contraseña: "
 
 #: gajim/gtk/server_info.py:66
 #, fuzzy
@@ -10068,8 +10351,8 @@ msgstr "_Copiar la dirección del enlace"
 msgid "%(days)s days, %(hours)s hours"
 msgstr "%(days)s días, %(hours)s horas"
 
-#: gajim/gtk/server_info.py:218 gajim/gtk/accounts.py:749
-#: gajim/gtk/accounts.py:853
+#: gajim/gtk/server_info.py:218 gajim/gtk/accounts.py:752
+#: gajim/gtk/accounts.py:856
 #, fuzzy
 msgid "Hostname"
 msgstr "Nombre del host:"
@@ -10088,6 +10371,8 @@ msgid ""
 "\n"
 "Disabled in config"
 msgstr ""
+"\n"
+"Deshabilitado en la configuración"
 
 #: gajim/gtk/features.py:93
 msgid "Audio / Video"
@@ -10266,11 +10551,6 @@ 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_config.py:41
-#, fuzzy
-msgid "Group Chat Configuration"
-msgstr "Invitación a grupo de charla"
-
 #: gajim/gtk/groupchat_config.py:134
 #, fuzzy
 msgid "A Group Chat needs at least one Owner"
@@ -10283,67 +10563,67 @@ msgstr ""
 "Propietarios"
 
 #: gajim/gtk/groupchat_config.py:399
-msgid "An entry with this Jabber-ID already exists"
+msgid "An entry with this XMPP Address already exists"
 msgstr ""
 
-#: gajim/gtk/adhoc.py:91
+#: gajim/gtk/adhoc.py:92
 #, fuzzy
 msgid "Finish"
 msgstr "_Finalizar"
 
-#: gajim/gtk/adhoc.py:97 gajim/gtk/adhoc.py:283
+#: gajim/gtk/adhoc.py:98 gajim/gtk/adhoc.py:284
 msgid "Commands"
 msgstr "Comandos"
 
-#: gajim/gtk/adhoc.py:103
+#: gajim/gtk/adhoc.py:104
 msgid "Next"
 msgstr ""
 
-#: gajim/gtk/adhoc.py:109
+#: gajim/gtk/adhoc.py:110
 #, fuzzy
 msgid "Previous"
 msgstr "Envidioso"
 
-#: gajim/gtk/adhoc.py:115
+#: gajim/gtk/adhoc.py:116
 #, fuzzy
 msgid "Execute"
 msgstr "_Ejecutar comando"
 
-#: gajim/gtk/adhoc.py:195
+#: gajim/gtk/adhoc.py:196
 #, fuzzy
 msgid "No commands available"
 msgstr "Cuenta no disponible"
 
-#: gajim/gtk/adhoc.py:244
+#: gajim/gtk/adhoc.py:245
 #, fuzzy
 msgid "Request Command List"
 msgstr "_Ejecutar comando"
 
-#: gajim/gtk/adhoc.py:259
+#: gajim/gtk/adhoc.py:260
 #, fuzzy
 msgid "Executing…"
 msgstr "_Ejecutar comando"
 
-#: gajim/gtk/adhoc.py:266
+#: gajim/gtk/adhoc.py:267
 msgid "Command List"
 msgstr "Lista de Comandos"
 
-#: gajim/gtk/adhoc.py:384
+#: gajim/gtk/adhoc.py:385
 #, fuzzy
 msgid "Finished"
 msgstr "_Finalizar"
 
-#: gajim/gtk/adhoc.py:453
+#: gajim/gtk/adhoc.py:454
 #, fuzzy
 msgid "Execution failed"
 msgstr "Falló la conexión"
 
-#: gajim/gtk/blocking.py:37
+#: gajim/gtk/blocking.py:38
 #, fuzzy, python-format
 msgid "Blocking List for %s"
 msgstr "Lista de privacidad para %s"
 
-#: gajim/gtk/blocking.py:71
+#: gajim/gtk/blocking.py:72
 #, fuzzy
 msgid "Error!"
 msgstr "Error."
@@ -10363,9 +10643,8 @@ msgid "Subscription request from %s"
 msgstr "Petición de adición de %s"
 
 #: gajim/gtk/htmltextview.py:543
-#, fuzzy
 msgid "Loading"
-msgstr "Programando"
+msgstr "Cargando"
 
 #: gajim/gtk/account_wizard.py:165
 msgid "Account has been added successfully"
@@ -10394,8 +10673,7 @@ msgstr "Nombre de usuario no válido"
 msgid "You must provide a username to configure this account."
 msgstr "Debes proporcionar un nombre para configurar esta cuenta."
 
-#: gajim/gtk/account_wizard.py:252 gajim/gtk/bookmarks.py:290
-#: gajim/gtk/bookmarks.py:303
+#: gajim/gtk/account_wizard.py:252
 msgid "Invalid server"
 msgstr "Servidor no válido"
 
@@ -10411,7 +10689,7 @@ msgstr "Entrada no válida"
 msgid "Custom port must be a port number."
 msgstr "El puerto personalizado debe ser un número de puerto"
 
-#: gajim/gtk/account_wizard.py:405
+#: gajim/gtk/account_wizard.py:406
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -10426,15 +10704,15 @@ msgstr ""
 "Error SSL: %(error)s\n"
 "¿Aún quieres conectar a este servidor?"
 
-#: gajim/gtk/account_wizard.py:446 gajim/gtk/account_wizard.py:480
+#: gajim/gtk/account_wizard.py:447 gajim/gtk/account_wizard.py:481
 msgid "An error occurred during account creation"
 msgstr "Ha ocurrido un error durante la creación de la cuenta"
 
-#: gajim/gtk/account_wizard.py:545
+#: gajim/gtk/account_wizard.py:546
 msgid "Account name is in use"
 msgstr "El nombre de la cuenta está en uso"
 
-#: gajim/gtk/account_wizard.py:546
+#: gajim/gtk/account_wizard.py:547
 msgid "You already have an account using this name."
 msgstr "Ya tienes una cuenta usando este nombre"
 
@@ -10461,25 +10739,25 @@ msgstr "%(progress)s de %(total)s"
 msgid "%(minutes)s min %(seconds)s sec"
 msgstr ""
 
-#: gajim/gtk/xml_console.py:77
+#: gajim/gtk/xml_console.py:74
 #, fuzzy
 msgid "Filter"
 msgstr "Filtro:"
 
-#: gajim/gtk/xml_console.py:82
+#: gajim/gtk/xml_console.py:79
 msgid "XML Input"
 msgstr "Entrada de XML"
 
-#: gajim/gtk/xml_console.py:86
+#: gajim/gtk/xml_console.py:83
 msgid "Paste Last Input"
 msgstr ""
 
-#: gajim/gtk/xml_console.py:170
+#: gajim/gtk/xml_console.py:167
 #, fuzzy, python-format
 msgid "Please make sure you are connected with '%s'."
 msgstr "Por favor, asegúrate de estar conectado con \"%s\"."
 
-#: gajim/gtk/xml_console.py:182
+#: gajim/gtk/xml_console.py:177
 #, fuzzy
 msgid "Invalid Node"
 msgstr "Archivo no válido"
@@ -10512,38 +10790,54 @@ msgstr "Buscar"
 msgid "No results found"
 msgstr "Sin resultados"
 
-#: gajim/gtk/preferences.py:358 gajim/gtk/preferences.py:362
+#: gajim/gtk/preferences.py:357 gajim/gtk/preferences.py:361
 msgid "Default"
 msgstr "Por defecto"
 
-#: gajim/gtk/preferences.py:801
+#: gajim/gtk/preferences.py:798
 msgid "status message title"
 msgstr "título del mensaje de estado"
 
-#: gajim/gtk/preferences.py:802
+#: gajim/gtk/preferences.py:799
 msgid "status message text"
 msgstr "texto del mensaje de estado"
 
+#: gajim/gtk/accounts.py:137
+#, fuzzy
+msgid "Re-Login"
+msgstr "¿Reconectar ahora?"
+
 #: gajim/gtk/accounts.py:138
-msgid "Relogin now?"
+#, fuzzy
+msgid "Re-Login now?"
 msgstr "¿Reconectar ahora?"
 
 #: gajim/gtk/accounts.py:139
-msgid "If you want all the changes to apply instantly, you must relogin."
+#, 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:191 gajim/gtk/accounts.py:975
+#: gajim/gtk/accounts.py:141
+#, fuzzy
+msgid "_Later"
+msgstr "_Últimos"
+
+#: gajim/gtk/accounts.py:143
+msgid "_Re-Login"
+msgstr ""
+
+#: gajim/gtk/accounts.py:194 gajim/gtk/accounts.py:978
 msgid "Remove Account"
 msgstr "Eliminar cuenta"
 
-#: gajim/gtk/accounts.py:192
+#: gajim/gtk/accounts.py:195
 #, fuzzy, python-format
 msgid "You still have open chats in your account %s"
 msgstr "Has abierto una conversación con la cuenta %s"
 
-#: gajim/gtk/accounts.py:193
+#: gajim/gtk/accounts.py:196
 msgid ""
 "All chat and group chat windows will be closed.\n"
 "Do you want to continue?"
@@ -10551,32 +10845,32 @@ msgstr ""
 "Todas las ventanas de conversaciones y grupos de charla serán cerrados.\n"
 "¿Deseas continuar?"
 
-#: gajim/gtk/accounts.py:424
+#: gajim/gtk/accounts.py:427
 #, fuzzy
 msgid "Back"
 msgstr "Vuelvo pronto"
 
-#: gajim/gtk/accounts.py:530
+#: gajim/gtk/accounts.py:533
 #, fuzzy
 msgid "Please check if Bonjour is installed."
 msgstr "Por favor, comprueba si Avahi o Bonjour están instalados."
 
-#: gajim/gtk/accounts.py:532
+#: gajim/gtk/accounts.py:535
 #, fuzzy
 msgid "Please check if Avahi is installed."
 msgstr "Por favor, comprueba si Avahi o Bonjour están instalados."
 
-#: gajim/gtk/accounts.py:569
+#: gajim/gtk/accounts.py:572
 #, fuzzy
 msgid "Disable Account"
 msgstr "Nombre de cuenta no válido"
 
-#: gajim/gtk/accounts.py:570
+#: gajim/gtk/accounts.py:573
 #, fuzzy, python-format
 msgid "Account %s is still connected"
 msgstr "La cuenta \"%s\" está conectada al servidor"
 
-#: gajim/gtk/accounts.py:571
+#: gajim/gtk/accounts.py:574
 #, fuzzy
 msgid ""
 "All chat and group chat windows will be closed. Do you want to continue?"
@@ -10584,85 +10878,85 @@ msgstr ""
 "Todas las conversaciones y grupos de charla serán cerrados. ¿Deseas "
 "continuar?"
 
-#: gajim/gtk/accounts.py:576
+#: gajim/gtk/accounts.py:579
 #, fuzzy
 msgid "_Disable Account"
 msgstr "Nombre de cuenta no válido"
 
-#: gajim/gtk/accounts.py:595
+#: gajim/gtk/accounts.py:598
 #, fuzzy
 msgid "Add Account"
 msgstr "_Añadir contacto..."
 
-#: gajim/gtk/accounts.py:663
+#: gajim/gtk/accounts.py:666
 msgid "Label"
 msgstr ""
 
-#: gajim/gtk/accounts.py:667
+#: gajim/gtk/accounts.py:670
 msgid "Login"
 msgstr ""
 
-#: gajim/gtk/accounts.py:670
+#: gajim/gtk/accounts.py:673
 #, fuzzy
 msgid "Import Contacts"
 msgstr "Invitar _Contactos"
 
-#: gajim/gtk/accounts.py:674 gajim/gtk/accounts.py:870
+#: gajim/gtk/accounts.py:677 gajim/gtk/accounts.py:873
 #, fuzzy
 msgid "Client Certificate"
 msgstr "Certificado autofirmado"
 
-#: gajim/gtk/accounts.py:677 gajim/gtk/accounts.py:774
+#: gajim/gtk/accounts.py:680 gajim/gtk/accounts.py:777
 #, fuzzy
 msgid "Connect on startup"
 msgstr "C_onectar al inicio de Gajim"
 
-#: gajim/gtk/accounts.py:681 gajim/gtk/accounts.py:779
+#: gajim/gtk/accounts.py:684 gajim/gtk/accounts.py:782
 #, fuzzy
 msgid "Save conversations for all contacts"
 msgstr "Grabar conversaciones para todos los contactos"
 
-#: gajim/gtk/accounts.py:683 gajim/gtk/accounts.py:781
+#: gajim/gtk/accounts.py:686 gajim/gtk/accounts.py:784
 msgid "Store conversations on the harddrive"
 msgstr ""
 
-#: gajim/gtk/accounts.py:685 gajim/gtk/accounts.py:783
+#: gajim/gtk/accounts.py:688 gajim/gtk/accounts.py:786
 #, fuzzy
 msgid "Global Status"
 msgstr "Todos los estados"
 
-#: gajim/gtk/accounts.py:687
+#: gajim/gtk/accounts.py:690
 #, fuzzy
 msgid "Synchronise the status of all accounts"
 msgstr "Cambia el estado de una o varias cuentas"
 
-#: gajim/gtk/accounts.py:689
+#: gajim/gtk/accounts.py:692
 msgid "Use file transfer proxies"
 msgstr "Usar proxies para las transferencias de archivo"
 
-#: gajim/gtk/accounts.py:705
+#: gajim/gtk/accounts.py:708
 #, fuzzy
 msgid "Idle Time"
 msgstr "Inactivo desde:"
 
-#: gajim/gtk/accounts.py:707
+#: gajim/gtk/accounts.py:710
 msgid "Disclose the time of your last activity"
 msgstr ""
 
-#: gajim/gtk/accounts.py:709
+#: gajim/gtk/accounts.py:712
 msgid "Local System Time"
 msgstr ""
 
-#: gajim/gtk/accounts.py:711
+#: gajim/gtk/accounts.py:714
 msgid "Disclose the local system time of the device Gajim runs on"
 msgstr ""
 
-#: gajim/gtk/accounts.py:714
+#: gajim/gtk/accounts.py:717
 #, fuzzy
 msgid "Client / Operating System"
 msgstr "Certificado autofirmado"
 
-#: gajim/gtk/accounts.py:716
+#: gajim/gtk/accounts.py:719
 #, fuzzy
 msgid ""
 "Disclose informations about the client and operating system you currently use"
@@ -10670,152 +10964,147 @@ msgstr ""
 "Si está marcado, Gajim permitirá a otros detectar el sistema operativo que "
 "estás usando"
 
-#: gajim/gtk/accounts.py:719
+#: gajim/gtk/accounts.py:722
 #, fuzzy
 msgid "Ignore Unknown Contacts"
 msgstr "Invitar _Contactos"
 
-#: gajim/gtk/accounts.py:721
+#: gajim/gtk/accounts.py:724
 #, 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:737 gajim/gtk/accounts.py:776
+#: gajim/gtk/accounts.py:740 gajim/gtk/accounts.py:779
 #, fuzzy
 msgid "Use environment variable"
 msgstr "_usar variable de entorno HTTP__PROXY"
 
-#: gajim/gtk/accounts.py:739
-#, fuzzy
-msgid "Proxy"
-msgstr "Proxy"
-
-#: gajim/gtk/accounts.py:742
+#: gajim/gtk/accounts.py:745
 #, fuzzy
 msgid "Warn on insecure connection"
 msgstr "_Advertir antes de usar una conexión no segura"
 
-#: gajim/gtk/accounts.py:746
+#: gajim/gtk/accounts.py:749
 msgid "Send keep-alive packets"
 msgstr "Enviar paquetes de mantenimiento de actividad"
 
-#: gajim/gtk/accounts.py:750
+#: gajim/gtk/accounts.py:753
 msgid "Manually set the hostname for the server"
 msgstr ""
 
-#: gajim/gtk/accounts.py:756 gajim/gtk/accounts.py:826
-#: gajim/gtk/accounts.py:831
+#: gajim/gtk/accounts.py:759 gajim/gtk/accounts.py:829
+#: gajim/gtk/accounts.py:834
 #, fuzzy
 msgid "Priority"
 msgstr "Pr_ioridad:"
 
-#: gajim/gtk/accounts.py:785
+#: gajim/gtk/accounts.py:788
 #, fuzzy
 msgid "Synchronize the status of all accounts"
 msgstr "Cambia el estado de una o varias cuentas"
 
-#: gajim/gtk/accounts.py:795
+#: gajim/gtk/accounts.py:798
 #, fuzzy
 msgid "First Name"
 msgstr "Nombre:"
 
-#: gajim/gtk/accounts.py:798
+#: gajim/gtk/accounts.py:801
 #, fuzzy
 msgid "Last Name"
 msgstr "Apellido(s):"
 
-#: gajim/gtk/accounts.py:804
+#: gajim/gtk/accounts.py:807
 #, fuzzy
 msgid "Email"
 msgstr "Nuevo correo-e"
 
-#: gajim/gtk/accounts.py:822
+#: gajim/gtk/accounts.py:825
 #, fuzzy
 msgid "Adjust to status"
 msgstr "_Ajustar al estado"
 
-#: gajim/gtk/accounts.py:849
+#: gajim/gtk/accounts.py:852
 msgid "Enable"
 msgstr "Activar"
 
-#: gajim/gtk/accounts.py:857
+#: gajim/gtk/accounts.py:860
 #, fuzzy
 msgid "Port"
 msgstr "_Puerto:"
 
-#: gajim/gtk/accounts.py:862
+#: gajim/gtk/accounts.py:865
 #, fuzzy
 msgid "Connection Settings"
 msgstr "Conexión"
 
-#: gajim/gtk/accounts.py:872
+#: gajim/gtk/accounts.py:875
 msgid "PKCS12 Files"
 msgstr ""
 
-#: gajim/gtk/accounts.py:874
+#: gajim/gtk/accounts.py:877
 #, fuzzy
 msgid "Encrypted Certificate"
 msgstr "Certificado autofirmado"
 
-#: gajim/gtk/accounts.py:878
+#: gajim/gtk/accounts.py:881
 #, fuzzy
 msgid "Certificate Settings"
 msgstr "Notificaciones"
 
-#: gajim/gtk/accounts.py:890
+#: gajim/gtk/accounts.py:893
 #, fuzzy
 msgid "Save Password"
 msgstr "Guardar contraseña"
 
-#: gajim/gtk/accounts.py:898
+#: gajim/gtk/accounts.py:901
 #, fuzzy
 msgid "Login Settings"
 msgstr "Extensiones"
 
-#: gajim/gtk/accounts.py:931
+#: gajim/gtk/accounts.py:934
 #, fuzzy, python-format
 msgid "Removing account %s"
 msgstr "Eliminando la cuenta %s"
 
-#: gajim/gtk/accounts.py:946
+#: gajim/gtk/accounts.py:949
 msgid "Account is disabled"
 msgstr "La cuenta está deshabilitada"
 
-#: gajim/gtk/accounts.py:947
+#: gajim/gtk/accounts.py:950
 #, fuzzy
 msgid "To unregister from a server, the account must be enabled."
 msgstr "Para cambiar el nombre de la cuenta, debes estar desconectado"
 
-#: gajim/gtk/accounts.py:962
+#: gajim/gtk/accounts.py:965
 #, fuzzy
 msgid "Password required"
 msgstr "Contraseña requerida"
 
-#: gajim/gtk/accounts.py:976
+#: gajim/gtk/accounts.py:979
 #, fuzzy, python-format
 msgid "Account '%s' is still connected to the server"
 msgstr "La cuenta \"%s\" está conectada al servidor"
 
-#: gajim/gtk/accounts.py:978
+#: gajim/gtk/accounts.py:981
 msgid "If you remove it, the connection will be lost."
 msgstr "Si la eliminas, se perderá la conexión con el servidor"
 
-#: gajim/gtk/accounts.py:995
+#: gajim/gtk/accounts.py:998
 #, python-format
 msgid "Connection to server %s failed"
 msgstr "La conexión al servidor %s ha fallado."
 
-#: gajim/gtk/accounts.py:996
+#: gajim/gtk/accounts.py:999
 #, fuzzy
 msgid "What would you like to do?"
 msgstr "¿Qué quieres hacer?"
 
-#: gajim/gtk/accounts.py:997
+#: gajim/gtk/accounts.py:1000
 #, fuzzy
 msgid "Remove only from Gajim"
 msgstr "Eliminar la _cuenta únicamente de Gajim"
 
-#: gajim/gtk/accounts.py:998
+#: gajim/gtk/accounts.py:1001
 msgid "Don't remove anything. I'll try again later"
 msgstr ""
 
@@ -10841,6 +11130,10 @@ msgstr ""
 msgid "Modify"
 msgstr "Modificar"
 
+#: gajim/gtk/roster_item_exchange.py:80
+msgid "JID"
+msgstr "JID"
+
 #: gajim/gtk/roster_item_exchange.py:86
 msgid "Groups"
 msgstr "Grupos"
@@ -10864,19 +11157,19 @@ msgid_plural "Removed %d contacts"
 msgstr[0] "Se eliminó %d contacto"
 msgstr[1] "Se eliminó %d contactos"
 
-#: gajim/gtk/util.py:581
+#: gajim/gtk/util.py:583
 msgid "Unknown Artist"
 msgstr "Artista desconocido"
 
-#: gajim/gtk/util.py:582
+#: gajim/gtk/util.py:584
 msgid "Unknown Title"
 msgstr "Título desconocido"
 
-#: gajim/gtk/util.py:583
+#: gajim/gtk/util.py:585
 msgid "Unknown Source"
 msgstr "Recurso desconocido"
 
-#: gajim/gtk/util.py:585
+#: gajim/gtk/util.py:587
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
@@ -10885,29 +11178,10 @@ msgstr ""
 "<b>\"%(title)s\"</b> por <i>%(artist)s</i>\n"
 "de <i>%(source)s</i>"
 
-#: gajim/gtk/bookmarks.py:121
-msgid "New Group Chat"
-msgstr "Nuevo grupo de charla"
-
-#: gajim/gtk/bookmarks.py:161
-msgid "This bookmark has invalid data"
-msgstr "Este marcador tiene información no válida"
-
-#: gajim/gtk/bookmarks.py:162
-msgid ""
-"Please be sure to fill out server and room fields or remove this bookmark."
-msgstr ""
-"Por favor, asegúrate de rellenar los campos de servidor y salón o elimina "
-"este marcador."
-
-#: gajim/gtk/bookmarks.py:273 gajim/gtk/bookmarks.py:291
-#: gajim/gtk/bookmarks.py:304 gajim/gtk/bookmarks.py:335
-msgid "Character not allowed"
-msgstr "Carácter no permitido"
-
-#: gajim/gtk/bookmarks.py:334
-msgid "Invalid room"
-msgstr "Salón no válido"
+#: gajim/gtk/bookmarks.py:47
+#, fuzzy, python-format
+msgid "Bookmarks for %s"
+msgstr "_Marcador"
 
 #: gajim/plugins/pluginmanager.py:736 gajim/plugins/pluginmanager.py:742
 msgid "Archive corrupted"
@@ -10919,49 +11193,52 @@ msgid "Archive empty"
 msgstr "El archivo está vacío"
 
 #: gajim/plugins/pluginmanager.py:750 gajim/plugins/pluginmanager.py:758
-#: gajim/plugins/gui.py:257
+#: gajim/plugins/gui.py:258
 #, fuzzy
 msgid "Archive is malformed"
 msgstr "El servicio envió información malformada"
 
-#: gajim/plugins/pluginmanager.py:766 gajim/plugins/gui.py:281
-#: gajim/plugins/gui.py:289
+#: gajim/plugins/pluginmanager.py:766 gajim/plugins/gui.py:288
+#: gajim/plugins/gui.py:301
 msgid "Plugin already exists"
 msgstr "La extensión ya existe"
 
-#: gajim/plugins/gui.py:82
+#: gajim/plugins/gui.py:83
 msgid "Click to view Gajim's wiki page on how to install plugins in Flatpak."
 msgstr ""
 
-#: gajim/plugins/gui.py:89
+#: gajim/plugins/gui.py:90
 msgid "Plugin"
 msgstr ""
 
-#: gajim/plugins/gui.py:151
+#: gajim/plugins/gui.py:152
 #, fuzzy, python-format
 msgid "Warning: %s"
 msgstr "Expulsando a %s"
 
-#: gajim/plugins/gui.py:206
+#: gajim/plugins/gui.py:207
 msgid "Plugin failed"
 msgstr "La extensión falló"
 
-#: gajim/plugins/gui.py:245
+#: gajim/plugins/gui.py:246
 msgid "Unable to properly remove the plugin"
 msgstr "No se puede eliminar correctamente el complemento"
 
-#: gajim/plugins/gui.py:281
-msgid "Overwrite?"
+#: gajim/plugins/gui.py:287
+#, fuzzy
+msgid "Overwrite Plugin?"
 msgstr "¿Sobreescribir?"
 
+#: gajim/plugins/gui.py:289
+#, fuzzy
+msgid "Do you want to overwrite the currently installed version?"
+msgstr "¿Quieres aceptar la invitación?"
+
 #: data/org.gajim.Gajim.desktop.in:5
-msgid "Jabber IM Client"
+#, fuzzy
+msgid "XMPP IM Client"
 msgstr "Cliente de IM Jabber"
 
-#: data/org.gajim.Gajim.desktop.in:6
-msgid "A GTK+ Jabber client"
-msgstr "Un cliente de Jabber en GTK"
-
 #: data/org.gajim.Gajim.desktop.in:8
 msgid "chat;messaging;im;xmpp;bonjour;voip;"
 msgstr ""
@@ -11013,7 +11290,7 @@ msgid "Easily send pictures, videos or other files to friends and groups"
 msgstr ""
 
 #: data/org.gajim.Gajim.appdata.xml.in:27
-msgid "Chat securely with End-to-End encryption via OMEMO or PGP"
+msgid "Chat securely with End-to-End encryption via OMEMO or OpenPGP"
 msgstr ""
 
 #: data/org.gajim.Gajim.appdata.xml.in:28
@@ -11076,7 +11353,7 @@ msgstr "Otras características a través de extensiones"
 
 #: data/org.gajim.Gajim.appdata.xml.in:52
 #, fuzzy
-msgid "Roster, list of contacts"
+msgid "Contact list, list of contacts"
 msgstr "_Registrar cambios de estado de los contactos"
 
 #: data/org.gajim.Gajim.appdata.xml.in:56
@@ -11098,6 +11375,494 @@ msgid "Plugin manager"
 msgstr "Administrador de extensiones"
 
 #, fuzzy
+#~ msgid "Configure Services…"
+#~ msgstr "Configurar servicios..."
+
+#, fuzzy
+#~ msgid "Group Chat Bookmarks"
+#~ msgstr "Grupos de charla"
+
+#, fuzzy
+#~ msgid "Add Bookmark"
+#~ msgstr "_Marcador"
+
+#, fuzzy
+#~ msgid "Remove Bookmark"
+#~ msgstr "_Marcador"
+
+#, fuzzy
+#~ msgid "Bookmark Name"
+#~ msgstr "Añadir este salón a marcadores (Ctrl+B)"
+
+#, fuzzy
+#~ msgid "_Server"
+#~ msgstr "_Servidor:"
+
+#, fuzzy
+#~ msgid "_Password"
+#~ msgstr "C_ontraseña:"
+
+#, fuzzy
+#~ msgid "Join chat when connected"
+#~ msgstr "Contacto desconectado"
+
+#~ msgid "New Group Chat"
+#~ msgstr "Nuevo grupo de charla"
+
+#~ msgid "This bookmark has invalid data"
+#~ msgstr "Este marcador tiene información no válida"
+
+#, fuzzy
+#~ msgid ""
+#~ "Please be sure to fill out server and group chat fields or remove this "
+#~ "bookmark."
+#~ msgstr ""
+#~ "Por favor, asegúrate de rellenar los campos de servidor y salón o elimina "
+#~ "este marcador."
+
+#~ msgid "Character not allowed"
+#~ msgstr "Carácter no permitido"
+
+#, fuzzy
+#~ msgid "Invalid Group Chat"
+#~ msgstr "ID de Jabber no válida para el grupo de charla"
+
+#~ msgid "Unable to join group chat"
+#~ msgstr "No se pudo entrar al grupo de charla"
+
+#~ msgid "You are banned from group chat <b>%s</b>."
+#~ msgstr "Estás baneado del grupo de charla <b>%s</b>-"
+
+#~ msgid "Remote server <b>%s</b> does not exist."
+#~ msgstr "El servidor remoto <b>%s</b> no existe."
+
+#~ msgid "Group chat <b>%s</b> does not exist."
+#~ msgstr "El grupo de charla <b>%s</b> no existe."
+
+#, fuzzy
+#~ msgid "Group chat creation is not permitted."
+#~ msgstr "La creación de grupos de charla está restringida."
+
+#~ msgid "You must use your registered nickname in <b>%s</b>."
+#~ msgstr "Debe usar su alias registrado en <b>%s</b>."
+
+#, fuzzy
+#~ msgid "You are not in the members list in group chat %s."
+#~ msgstr "No estás en la lista de miembros del grupo de charla %s."
+
+#, fuzzy
+#~ msgid "XMPP Address is not a group chat"
+#~ msgstr "Esto no es un grupo de charla"
+
+#~ msgid "This is not a group chat"
+#~ msgstr "Esto no es un grupo de charla"
+
+#, fuzzy
+#~ msgid "Please choose a group chat"
+#~ msgstr "Por favor crea un nuevo tema desde cero con el nombre deseado."
+
+#~ msgid "Invalid Nickname"
+#~ msgstr "Alias no válido"
+
+#, fuzzy
+#~ msgid "Please choose a nickname"
+#~ msgstr "Por favor crea un nuevo tema desde cero con el nombre deseado."
+
+#, fuzzy
+#~ msgid "Wrong server"
+#~ msgstr "Uri incorrecta"
+
+#, fuzzy
+#~ msgid "%s is not a group chat server"
+#~ msgstr "%s no es un servidor de grupo de charla"
+
+#, fuzzy
+#~ msgid "A Password is required to join the group chat %s. Please type it."
+#~ msgstr "Se requiere una contraseña para entrar al salón %s. Introdúcela."
+
+#~ msgid "Not in Roster"
+#~ msgstr "no está en el roster"
+
+#~ msgid "I would like to add you to my roster"
+#~ msgstr "Me gustaría añadirte a mi lista de contactos"
+
+#, fuzzy
+#~ msgid "Add to Roster"
+#~ msgstr "_Añadir a la lista de contactos"
+
+#, fuzzy
+#~ msgid "Manage Room"
+#~ msgstr "_Gestionar salón"
+
+#, fuzzy
+#~ msgid "Configure Room"
+#~ msgstr "Configurar el salón"
+
+#, fuzzy
+#~ msgid "Destroy Room"
+#~ msgstr "_Desmantelar salón"
+
+#, fuzzy
+#~ msgid "Change Nick"
+#~ msgstr "Cambiar _Alias"
+
+#, fuzzy
+#~ msgid "Disconnect"
+#~ msgstr "_Desconectar"
+
+#~ msgid "Copy JID"
+#~ msgstr "Copiar JID"
+
+#, fuzzy
+#~ msgid "Add to Roster…"
+#~ msgstr "_Añadir a la lista de contactos"
+
+#~ msgid "Copy JID/Email"
+#~ msgstr "Copiar JID/dirección de correo"
+
+#, fuzzy
+#~ msgid "JID: <i>%s</i>"
+#~ msgstr "ID de Jabber : <i>%s</i>"
+
+#~ msgid "Changing Subject"
+#~ msgstr "Cambiando el tema"
+
+#~ msgid "Please specify the new subject:"
+#~ msgstr "Especifica el nuevo tema:"
+
+#~ msgid "Room logging is now enabled"
+#~ msgstr "Ha sido activado el registro del salón"
+
+#~ msgid "Room logging is now disabled"
+#~ msgstr "El salón está ahora deshabilitado"
+
+#, fuzzy
+#~ msgid "You (%s) joined the room"
+#~ msgstr "%s ha entrado en el grupo de charla"
+
+#~ msgid "Room logging is enabled"
+#~ msgstr "Registro del salón activado"
+
+#, fuzzy
+#~ msgid "Unable to join groupchat"
+#~ msgstr "No se pudo entrar al grupo de charla"
+
+#~ msgid "Groupchat Invitation"
+#~ msgstr "Invitación a grupo de charla"
+
+#~ msgid "%(jid)s has been invited in this room"
+#~ msgstr "%(jid)s ha sido invitado en esta sala"
+
+#, fuzzy
+#~ msgid "JID is not a Groupchat"
+#~ msgstr "Esto no es un grupo de charla"
+
+#~ msgid "Invalid JID"
+#~ msgstr "ID de Jabber no válida"
+
+#~ msgid "A connection is not available"
+#~ msgstr "No hay disponible una conexión"
+
+#, fuzzy
+#~ msgid "JID already in list"
+#~ msgstr "La ID de Jabber ya está en la lista"
+
+#~ msgid "Unsecure"
+#~ msgstr "Inseguro"
+
+#, fuzzy
+#~ msgid "For the chosen encryption there is no encryption method available"
+#~ msgstr "No hay disponible una conexión"
+
+#~ msgid "Removes contact from roster"
+#~ msgstr "Elimina contacto del roster"
+
+#~ msgid "Not in roster"
+#~ msgstr "No está en el roster"
+
+#, fuzzy
+#~ msgid "Contact signed in notification color."
+#~ msgstr "_Mostrar evento en roster"
+
+#, fuzzy
+#~ msgid "Contact signout notification color"
+#~ msgstr "_Mostrar evento en roster"
+
+#, fuzzy
+#~ msgid "File transfer request notification color."
+#~ msgstr "Petición de transferencia de archivo"
+
+#, fuzzy
+#~ msgid "File transfer error notification color."
+#~ msgstr "Transferencia de archivo cancelada"
+
+#, fuzzy
+#~ msgid "File transfer complete or stopped notification color."
+#~ msgstr ""
+#~ "Cuando una transferencia se completa, muestra una notificación emergente"
+
+#, fuzzy
+#~ msgid "Groupchat invitation notification color"
+#~ msgstr "Invitación a grupo de charla"
+
+#~ msgid "Add * and [n] in roster title?"
+#~ msgstr "¿Añadir * y [n] en el título del roster?"
+
+#~ msgid "Hides the banner in two persons chat window"
+#~ msgstr "Oculta el banner en una ventana de conversación de dos personas."
+
+#, fuzzy
+#~ msgid ""
+#~ "Show the confirm metacontacts creation dialog or not? 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á."
+
+#~ msgid "Space separated list of ssl errors to ignore."
+#~ msgstr "Lista separada por espacios de errores ssl a ignorar."
+
+#~ msgid "Answer to receipt requests"
+#~ msgstr "Contestar peticiones recibidas"
+
+#~ msgid "Sent receipt requests"
+#~ msgstr "Enviar peticiones recibidas"
+
+#, fuzzy
+#~ msgid "Language for which misspelled words will be checked"
+#~ msgstr "Lenguaje en el que queremos comprobar errores ortográficos"
+
+#~ msgid "I'm eating, so leave me a message."
+#~ msgstr "Estoy comiendo, déjame un mensaje."
+
+#, fuzzy
+#~ msgid "from room %s"
+#~ msgstr " del salón %s"
+
+#~ msgid "Leave Groupchats"
+#~ msgstr "Abandonar grupos de charla"
+
+#, fuzzy
+#~ msgid "Auto Join"
+#~ msgstr "Auto conectar"
+
+#, fuzzy
+#~ msgid "Room"
+#~ msgstr "Salón:"
+
+#~ msgid "Jabber ID:"
+#~ msgstr "ID de Jabber:"
+
+#~ msgid "Occupant Actions"
+#~ msgstr "Acciones de ocupante"
+
+#~ msgid "_Add to Roster"
+#~ msgstr "_Añadir a la lista de contactos"
+
+#~ msgid "_Manage Room"
+#~ msgstr "_Gestionar salón"
+
+#~ msgid "Configure _Room..."
+#~ msgstr "Configurar el salón"
+
+#~ msgid "_Destroy Room"
+#~ msgstr "_Desmantelar salón"
+
+#~ msgid "Jabber ID"
+#~ msgstr "ID de Jabber:"
+
+#, fuzzy
+#~ msgid "icon"
+#~ msgstr "Icono del área de notificación"
+
+#, fuzzy
+#~ msgid "account"
+#~ msgstr "cuenta: "
+
+#, fuzzy
+#~ msgid "Roster"
+#~ msgstr "Mostrar _roster"
+
+#, fuzzy
+#~ msgid "Show only in roster"
+#~ msgstr "Sólo mostrar en la _lista de contactos"
+
+#~ msgid "in _roster"
+#~ msgstr "en _roster"
+
+#~ msgid "Roster Appearance"
+#~ msgstr "Aspecto del Roster"
+
+#, fuzzy
+#~ msgid "Show chatstate in roster"
+#~ msgstr "Mostrar en el roster los a_vatares de los contactos"
+
+#~ msgid "_Add to Roster..."
+#~ msgstr "_Añadir al roster"
+
+#~ msgid "_Jabber ID:"
+#~ msgstr "ID de _Jabber: "
+
+#, fuzzy
+#~ msgid "_Jabber ID"
+#~ msgstr "ID de _Jabber: "
+
+#~ msgid "JabberID"
+#~ msgstr "ID de Jabber:"
+
+#, fuzzy
+#~ msgid "Show Roster"
+#~ msgstr "Mostrar _roster"
+
+#~ msgid "MUC server"
+#~ msgstr "Servidor MUC"
+
+#~ msgid "Room Configuration"
+#~ msgstr "Configuración del salón"
+
+#~ msgid "Join _Group Chat"
+#~ msgstr "Entrar a un grupo de charla"
+
+#, fuzzy
+#~ msgid "Audio sessions are not available"
+#~ msgstr "El bus de la sesión no está disponible"
+
+#~ msgid "Conference"
+#~ msgstr "Conferencia"
+
+#, fuzzy
+#~ msgid "_Manage Bookmarks…"
+#~ msgstr "Gestionar marcadores"
+
+#, fuzzy
+#~ msgid "Hide _Roster"
+#~ msgstr "en _roster"
+
+#~ msgid "Show _Roster"
+#~ msgstr "Mostrar _roster"
+
+#, fuzzy
+#~ msgid "Invalid Room"
+#~ msgstr "Salón no válido"
+
+#~ msgid "Invalid room"
+#~ msgstr "Salón no válido"
+
+#~ msgid "A GTK+ Jabber client"
+#~ msgstr "Un cliente de Jabber en GTK"
+
+#~ msgid "Changing Nickname"
+#~ msgstr "Cambiando alias"
+
+#~ msgid "Please specify the new nickname you want to use:"
+#~ msgstr "Especifica el nuevo alias que quieres usar:"
+
+#~ msgid "Bookmark already set"
+#~ msgstr "Marcador ya definido"
+
+#, fuzzy
+#~ msgid "Group Chat '%s' is already in your bookmarks."
+#~ msgstr "El salón \"%s\" ya se encuentra en tus marcadores."
+
+#~ msgid "Bookmark has been added successfully"
+#~ msgstr "Marcador añadido con éxito"
+
+#, fuzzy
+#~ msgid ""
+#~ "You can manage your bookmarks by clicking the Bookmarks menu item in your "
+#~ "contact list."
+#~ msgstr ""
+#~ "Puedes gestionar tus marcadores mediante el menú Acciones de tu roster"
+
+#, fuzzy
+#~ msgid "The nickname contains invalid characters."
+#~ msgstr "El alias tiene caracteres no permitidos."
+
+#, fuzzy
+#~ msgid "Bookmark Room"
+#~ msgstr "Añadir este salón a marcadores (Ctrl+B)"
+
+#~ msgid "_Join New Group Chat"
+#~ msgstr "_Entrar en nuevo grupo de charla"
+
+#, fuzzy
+#~ msgid "_Create Group Chat"
+#~ msgstr "Abandonar grupos de charla"
+
+#~ msgid "Name:"
+#~ msgstr "Nombre:"
+
+#, fuzzy
+#~ msgid "Description:"
+#~ msgstr "Descripción: "
+
+#, fuzzy
+#~ msgid "Address:"
+#~ msgstr "_Dirección:"
+
+#, fuzzy
+#~ msgid "You can not start a new conversation unless you are connected."
+#~ msgstr "No puedes entrar a un salón de chat hasta que no estés conectado."
+
+#, fuzzy
+#~ msgid "Occupants"
+#~ msgstr "Acciones de ocupante"
+
+#, fuzzy
+#~ msgid "File transfer error"
+#~ msgstr "Error en la transferencia del archivo"
+
+#, fuzzy
+#~ msgid "No Accounts available"
+#~ msgstr "Cuenta no disponible"
+
+#~ msgid "_Modify Account..."
+#~ msgstr "_Modificar cuenta..."
+
+#~ msgid "Boolean"
+#~ msgstr "Booleano"
+
+#~ msgid "Integer"
+#~ msgstr "Entero"
+
+#~ msgid "Text"
+#~ msgstr "Texto"
+
+#~ msgid "Value"
+#~ msgstr "Valor"
+
+#~ msgid "Type"
+#~ msgstr "Tipo"
+
+#~ msgid "(None)"
+#~ msgstr "(Ninguno)"
+
+#~ msgid "Hidden"
+#~ msgstr "Oculta"
+
+#~ msgid "Manage Proxy Profiles"
+#~ msgstr "Gestionar perfiles del Proxy"
+
+#~ msgid "Properties"
+#~ msgstr "Propiedades"
+
+#, fuzzy
+#~ msgid "Proxy _Host"
+#~ msgstr "_Host del Proxy:"
+
+#, fuzzy
+#~ msgid "Proxy _Port"
+#~ msgstr "_Puerto del Proxy:"
+
+#, fuzzy
+#~ msgid "New Groupchat"
+#~ msgstr "Nuevo grupo de charla"
+
+#, fuzzy
+#~ msgid "New Contact"
+#~ msgstr "Añadir un contacto"
+
+#, fuzzy
 #~ msgid "File transfer"
 #~ msgstr "Transferencias"
 
@@ -11161,9 +11926,6 @@ msgstr "Administrador de extensiones"
 #~ msgid "_Pause"
 #~ msgstr "_Pausa"
 
-#~ msgid "Clean _up"
-#~ msgstr "Limpiar"
-
 #~ msgid "Remove file transfer from the list."
 #~ msgstr "Eliminar transferencias de la lista"
 
@@ -11611,9 +12373,6 @@ msgstr "Administrador de extensiones"
 #~ msgid "You are invited to a groupchat"
 #~ msgstr "Has sido invitado a un grupo de charla"
 
-#~ msgid "Do you want to accept the invitation?"
-#~ msgstr "¿Quieres aceptar la invitación?"
-
 #~ msgid "_Start Chat"
 #~ msgstr "Iniciar conversación"
 
@@ -11819,10 +12578,6 @@ msgstr "Administrador de extensiones"
 #~ msgid "Nick"
 #~ msgstr "Alias"
 
-#, fuzzy
-#~ msgid "Banning…"
-#~ msgstr "Expulsando..."
-
 #~ msgid ""
 #~ "<b>Whom do you want to ban?</b>\n"
 #~ "\n"
@@ -11909,12 +12664,6 @@ msgstr "Administrador de extensiones"
 #~ msgid "Filter:"
 #~ msgstr "Filtro:"
 
-#~ msgid ""
-#~ "If checked, Gajim will display the mood of contacts in the roster window"
-#~ msgstr ""
-#~ "Si está marcado, Gajim mostrará el estado de ánimo de los contactos en el "
-#~ "roster"
-
 #~ msgid "<b>Chat Appearance</b>"
 #~ msgstr "<b>Apariencia de la conversación</b>"
 
@@ -12179,10 +12928,6 @@ msgstr "Administrador de extensiones"
 #~ msgstr "Men_saje de estado:"
 
 #, fuzzy
-#~ msgid "Group chat highlight"
-#~ msgstr "Resaltado de mensaje de grupo de charla"
-
-#, fuzzy
 #~ msgid "Your nickname"
 #~ msgstr "Ant_es del alias:"
 
@@ -12327,9 +13072,6 @@ msgstr "Administrador de extensiones"
 #~ msgid "The passwords typed in both fields must be identical."
 #~ msgstr "Las contraseñas escritas en ambos campos deben ser idénticas."
 
-#~ msgid "Enter new password:"
-#~ msgstr "Introduce nueva contraseña:"
-
 #~ msgid "Enter it again for confirmation:"
 #~ msgstr "Introdúcela de nuevo para confirmar:"
 
@@ -12344,10 +13086,6 @@ msgstr "Administrador de extensiones"
 #~ msgid "unsubscribe request from %s"
 #~ msgstr "petición de eliminación de suscripción de %s"
 
-#, fuzzy
-#~ msgid "Autojoin"
-#~ msgstr "Auto conectar"
-
 #~ msgid "&lt;empty&gt;"
 #~ msgstr "&lt;vacío&gt;"
 
@@ -12463,9 +13201,6 @@ msgstr "Administrador de extensiones"
 #~ msgid "Forward unread message then disconnect"
 #~ msgstr "Reenviar mensajes sin leer"
 
-#~ msgid "AIM Address:"
-#~ msgstr "Dirección AIM:"
-
 #~ msgid "MSN Address:"
 #~ msgstr "Dirección MSN:"
 
@@ -12513,10 +13248,6 @@ msgstr "Administrador de extensiones"
 #~ msgid "Session negotiation cancelled"
 #~ msgstr "La negociación de la sesión ha sido cancelada"
 
-#, fuzzy
-#~ msgid "This session WILL NOT be archived on server"
-#~ msgstr "La NO SERÁ registrada"
-
 #~ msgid "This session is encrypted"
 #~ msgstr "Esta sesión está cifrada"
 
@@ -12841,9 +13572,6 @@ msgstr "Administrador de extensiones"
 #~ msgid "Server:"
 #~ msgstr "Servidor:"
 
-#~ msgid "Password:"
-#~ msgstr "Contraseña: "
-
 #, fuzzy
 #~ msgid "Join this room _automatically when I connect"
 #~ msgstr "Entrar en este salón automáticamente al conectarme"
@@ -13184,9 +13912,6 @@ msgstr "Administrador de extensiones"
 #~ msgid "_Edit Personal Information..."
 #~ msgstr "_Editar información personal..."
 
-#~ msgid "Information about you, as stored in the server"
-#~ msgstr "Información acerca de tí a guardar en el servidor"
-
 #~ msgid "<b>Personal Information</b>"
 #~ msgstr "<b>Información personal</b>"
 
@@ -13266,9 +13991,6 @@ msgstr "Administrador de extensiones"
 #~ msgid "Your server can't save your personal information."
 #~ msgstr "Tu servidor no puede guardar tu información personal."
 
-#~ msgid "Account Local already exists."
-#~ msgstr "La cuenta local ya existe."
-
 #~ msgid "Please rename or remove it before enabling link-local messaging."
 #~ msgstr ""
 #~ "Por favor, renómbralo o elimínalo antes de habilitar la mensajería de "
@@ -13447,10 +14169,6 @@ msgstr "Administrador de extensiones"
 #~ msgid "Contact's identity verified"
 #~ msgstr "Identidad del contacto verificada"
 
-#, fuzzy
-#~ msgid "Verify again…"
-#~ msgstr "Verificar de nuevo..."
-
 #~ msgid ""
 #~ "To be certain that <b>only</b> the expected person can read your messages "
 #~ "or send you messages, you need to verify their identity by clicking the "
@@ -13579,9 +14297,6 @@ msgstr "Administrador de extensiones"
 #~ msgid "Add _Contact..."
 #~ msgstr "_Añadir contacto..."
 
-#~ msgid "_Accounts"
-#~ msgstr "_Cuentas"
-
 #~ msgid "Profile, A_vatar"
 #~ msgstr "Perfil, A_vatar"
 
@@ -13717,12 +14432,6 @@ msgstr "Administrador de extensiones"
 #~ "Otra instancia de Gajim parece estar ya en ejecución\n"
 #~ "¿Ejecutar otra?"
 
-#~ msgid "Join _Group Chat..."
-#~ msgstr "Entrar a un grupo de charla"
-
-#~ msgid "_Modify Account"
-#~ msgstr "_Modificar cuenta"
-
 #~ msgid "Error description..."
 #~ msgstr "Descripción del error..."
 
@@ -14413,9 +15122,6 @@ msgstr "Administrador de extensiones"
 #~ msgid "[This message is encrypted]"
 #~ msgstr "[Este mensaje está cifrado]"
 
-#~ msgid "Trayicon"
-#~ msgstr "Icono del área de notificación"
-
 #~ msgid "A icon in systemtray reflecting the current presence."
 #~ msgstr "Un icono en el área de notificación reflejando la presencia actual."
 
@@ -14451,9 +15157,6 @@ msgstr "Administrador de extensiones"
 #~ msgid "Nickname not found: %s"
 #~ msgstr "Alias no encontrado: %s"
 
-#~ msgid "This group chat has no subject"
-#~ msgstr "Este grupo de charla no tiene tema"
-
 #~ msgid ""
 #~ "Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
 #~ "nickname of an occupant may be substituted, but not if it contains \"@\". "
@@ -14577,9 +15280,6 @@ msgstr "Administrador de extensiones"
 #~ msgid "Mood"
 #~ msgstr "Estado de ánimo"
 
-#~ msgid "_Host:"
-#~ msgstr "_Servidor"
-
 #~ msgid "Requires compilation of the idle module from Gajim sources."
 #~ msgstr ""
 #~ "Requiere la compilación del módulo de inactividad en las fuentes de Gajim."
@@ -14659,9 +15359,6 @@ msgstr "Administrador de extensiones"
 #~ msgid "<b>Interface Customization</b>"
 #~ msgstr "<b>Personalización de la interfaz</b>"
 
-#~ msgid "A_fter nickname:"
-#~ msgstr "Después del alias:"
-
 #~ msgid "Also known as iChat style"
 #~ msgstr "También conocido como estilo iChat"
 
@@ -14766,9 +15463,6 @@ msgstr "Administrador de extensiones"
 #~ msgid "_Player:"
 #~ msgstr "_Reproductor:"
 
-#~ msgid "Address"
-#~ msgstr "Dirección"
-
 #~ msgid "Role:"
 #~ msgstr "Puesto:"
 
@@ -15075,9 +15769,6 @@ msgstr "Administrador de extensiones"
 #~ msgid "Timeout"
 #~ msgstr "Fuera de tiempo"
 
-#~ msgid "account: "
-#~ msgstr "cuenta: "
-
 #~ msgid "Activate/Disable notification for when a file transfer is complete"
 #~ msgstr "Activa/Desactiva la notificación de archivo transferido"
 
@@ -15176,9 +15867,6 @@ msgstr "Administrador de extensiones"
 #~ msgid "_Earliest"
 #~ msgstr "_Recientes"
 
-#~ msgid "_Latest"
-#~ msgstr "_Últimos"
-
 #~ msgid "%s is now %s: %s"
 #~ msgstr "%s está ahora %s: %s"
 
@@ -15321,8 +16009,5 @@ msgstr "Administrador de extensiones"
 #~ msgid "If you close the window, this message will be lost."
 #~ msgstr "Si cierras la ventana, este mensaje se perderá."
 
-#~ msgid "_About"
-#~ msgstr "_Acerca de"
-
 #~ msgid "paused"
 #~ msgstr "pausado"
diff --git a/po/eu.po b/po/eu.po
index 7ab588b14..c60bd1e34 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: 2019-07-02 02:06+0000\n"
+"POT-Creation-Date: 2019-08-11 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,71 +19,71 @@ msgstr ""
 "X-Rosetta-Version: 0.1\n"
 "Plural-Forms: nplurals=2; plural=n != 1\n"
 
-#: gajim/chat_control_base.py:550
+#: gajim/chat_control_base.py:557
 msgid "_Undo"
 msgstr ""
 
-#: gajim/chat_control_base.py:558 gajim/conversation_textview.py:529
+#: gajim/chat_control_base.py:565 gajim/conversation_textview.py:529
 msgid "_Clear"
 msgstr ""
 
-#: gajim/chat_control_base.py:563
+#: gajim/chat_control_base.py:570
 msgid "Paste as quote"
 msgstr ""
 
-#: gajim/chat_control_base.py:613
+#: gajim/chat_control_base.py:620
 #, fuzzy
 msgid "Paste Image"
 msgstr "Aukeratu Irudia"
 
-#: gajim/chat_control_base.py:614
+#: gajim/chat_control_base.py:621
 #, fuzzy
 msgid "You are trying to paste an image"
 msgstr "Ez zaude zerbitzarira konektatuta"
 
-#: gajim/chat_control_base.py:615
+#: gajim/chat_control_base.py:622
 #, 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:617 gajim/groupchat_control.py:2310
-#: gajim/roster_window.py:2848 gajim/roster_window.py:4167
-#: gajim/message_window.py:252 gajim/gtk/dialogs.py:418
+#: gajim/chat_control_base.py:624 gajim/groupchat_control.py:2218
+#: gajim/roster_window.py:2841 gajim/roster_window.py:4118
+#: gajim/message_window.py:359 gajim/gtk/dialogs.py:330
 #, fuzzy
 msgid "_Do not ask me again"
 msgstr "E_z galdetu berriro  "
 
-#: gajim/chat_control_base.py:620
+#: gajim/chat_control_base.py:627
 msgid "_Paste"
 msgstr ""
 
-#: gajim/chat_control_base.py:1162 gajim/gtk/accounts.py:351
+#: gajim/chat_control_base.py:1169 gajim/gtk/accounts.py:354
 #, fuzzy
 msgid "Privacy"
 msgstr "Debekatze Zerrenda"
 
-#: gajim/chat_control_base.py:1163
+#: gajim/chat_control_base.py:1170
 #, fuzzy
 msgid "Warning"
 msgstr "Debekatzen %s"
 
-#: gajim/chat_control_base.py:1164
+#: gajim/chat_control_base.py:1171
 #, python-format
 msgid "If you send a file to <b>%s</b>, your real JID will be revealed."
 msgstr ""
 
-#: gajim/chat_control_base.py:1169
+#: gajim/chat_control_base.py:1176
 #, fuzzy
 msgid "Continue"
 msgstr "_Jarraitu"
 
-#: gajim/gtkgui_helpers.py:163 gajim/gtk/filetransfer.py:393
+#: gajim/gtkgui_helpers.py:163 gajim/gtk/filetransfer.py:398
 #, fuzzy, python-format
 msgid "Cannot overwrite existing file '%s'"
 msgstr "Ezin izan da gainarazi \"%s\" fitxeroa"
 
-#: gajim/gtkgui_helpers.py:164 gajim/gtk/filetransfer.py:394
+#: gajim/gtkgui_helpers.py:164 gajim/gtk/filetransfer.py:399
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
@@ -177,391 +177,400 @@ msgstr ""
 msgid " resource with priority "
 msgstr "baliabidea lehentasunarekin: "
 
-#: gajim/gui_menu_builder.py:96
-#, fuzzy
-msgid "_New Group Chat"
-msgstr "Txat Taldea Berria"
-
-#: gajim/gui_menu_builder.py:289 gajim/gui_menu_builder.py:380
-#: gajim/chat_control.py:303 gajim/roster_window.py:786
-#: gajim/roster_window.py:1719 gajim/roster_window.py:1721
-#: gajim/roster_window.py:2030 gajim/roster_window.py:3336
-#: gajim/roster_window.py:3369 gajim/gui_interface.py:413
-#: gajim/common/contacts.py:206 gajim/common/contacts.py:343
-#: gajim/common/helpers.py:83 gajim/common/helpers.py:311
-#: gajim/gtk/add_contact.py:319 gajim/gtk/subscription_request.py:70
-#: gajim/gtk/subscription_request.py:99 gajim/gtk/roster_item_exchange.py:112
-msgid "Not in Roster"
-msgstr "Ez dago zerrendan"
+#: gajim/gui_menu_builder.py:251 gajim/gui_menu_builder.py:342
+#: gajim/chat_control.py:305 gajim/roster_window.py:783
+#: gajim/roster_window.py:1716 gajim/roster_window.py:1718
+#: gajim/roster_window.py:2027 gajim/roster_window.py:3292
+#: gajim/roster_window.py:3325 gajim/gui_interface.py:396
+#: gajim/common/contacts.py:222 gajim/common/contacts.py:359
+#: gajim/common/contacts.py:471 gajim/common/helpers.py:86
+#: gajim/common/helpers.py:317 gajim/gtk/add_contact.py:319
+#: gajim/gtk/subscription_request.py:70 gajim/gtk/subscription_request.py:99
+#: gajim/gtk/roster_item_exchange.py:112
+#, fuzzy
+msgid "Not in contact list"
+msgstr "Ikusi _Deskonektatutako Kontaktuak"
 
-#: gajim/gui_menu_builder.py:393
-msgid "I would like to add you to my roster"
-msgstr "Nire zerrendara nahi nizuke sartu"
+#: gajim/gui_menu_builder.py:355
+#, fuzzy
+msgid "I would like to add you to my contact list"
+msgstr "Nire kontaktu zerrendara nahi zaitut sartu."
 
-#: gajim/gui_menu_builder.py:471
+#: gajim/gui_menu_builder.py:433
 #, fuzzy
 msgid "Send Single _Message…"
 msgstr "Bidali _Mezu Bakarra"
 
-#: gajim/gui_menu_builder.py:486
+#: gajim/gui_menu_builder.py:448
 #, fuzzy
 msgid "E_xecute Command…"
 msgstr "_Komandoa Exekutatu..."
 
-#: gajim/gui_menu_builder.py:494
+#: gajim/gui_menu_builder.py:456
 #, fuzzy
 msgid "_Manage Transport"
 msgstr "Transportea"
 
-#: gajim/gui_menu_builder.py:500
+#: gajim/gui_menu_builder.py:462
 #, fuzzy
 msgid "_Modify Transport"
 msgstr "Trans_porteak Erakutsi"
 
-#: gajim/gui_menu_builder.py:507 gajim/roster_window.py:5046
+#: gajim/gui_menu_builder.py:469 gajim/roster_window.py:4985
 #, fuzzy
 msgid "_Rename…"
 msgstr "_Berrrizenpetu"
 
-#: gajim/gui_menu_builder.py:518 gajim/roster_window.py:5062
-#: gajim/roster_window.py:5177 gajim/data/gui/blocked_contacts_window.ui:52
+#: gajim/gui_menu_builder.py:480 gajim/roster_window.py:5001
+#: gajim/roster_window.py:5116 gajim/data/gui/blocked_contacts_window.ui:52
 #: gajim/data/gui/gc_occupants_menu.ui:148
 #: gajim/data/gui/contact_context_menu.ui:143
 msgid "_Unblock"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:521 gajim/roster_window.py:5067
-#: gajim/roster_window.py:5181 gajim/data/gui/gc_occupants_menu.ui:140
+#: gajim/gui_menu_builder.py:483 gajim/roster_window.py:5006
+#: gajim/roster_window.py:5120 gajim/data/gui/gc_occupants_menu.ui:140
 #: gajim/data/gui/contact_context_menu.ui:151
 msgid "_Block"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:529 gajim/roster_window.py:5074
+#: gajim/gui_menu_builder.py:491 gajim/roster_window.py:5013
 #: gajim/data/gui/contact_context_menu.ui:181
 #, fuzzy
 msgid "Remo_ve"
 msgstr "_Ezabatu"
 
-#: gajim/gui_menu_builder.py:539 gajim/data/gui/contact_context_menu.ui:198
+#: gajim/gui_menu_builder.py:501 gajim/data/gui/contact_context_menu.ui:198
 #, fuzzy
 msgid "_Information"
 msgstr "Kontaktuaren Informazioa"
 
-#: gajim/gui_menu_builder.py:552
+#: gajim/gui_menu_builder.py:514
 #, fuzzy
 msgid "Save _As"
 msgstr "daukadanean"
 
-#: gajim/gui_menu_builder.py:564 gajim/groupchat_control.py:501
-#: gajim/chat_control.py:340
+#: gajim/gui_menu_builder.py:526 gajim/groupchat_control.py:507
+#: gajim/chat_control.py:342
 #, fuzzy
 msgid "Send File…"
 msgstr "Bidali _Fitxeroa"
 
-#: gajim/gui_menu_builder.py:565
+#: gajim/gui_menu_builder.py:527
 #, fuzzy
 msgid "Upload File…"
 msgstr "Gorde Bezala..."
 
-#: gajim/gui_menu_builder.py:566
+#: gajim/gui_menu_builder.py:528
 #, fuzzy
 msgid "Send File Directly…"
 msgstr "Gorde Bezala..."
 
-#: gajim/gui_menu_builder.py:568 gajim/gui_menu_builder.py:632
+#: gajim/gui_menu_builder.py:530 gajim/gui_menu_builder.py:596
 #, fuzzy
 msgid "Send Chatstate"
 msgstr "Azken egoera: %s"
 
-#: gajim/gui_menu_builder.py:569
+#: gajim/gui_menu_builder.py:531
 #, fuzzy
 msgid "Invite Contacts"
 msgstr "Kontaktua"
 
-#: gajim/gui_menu_builder.py:570
+#: gajim/gui_menu_builder.py:532
 #, fuzzy
-msgid "Add to Roster"
-msgstr "_Zerrendara Sartu"
+msgid "Add to Contact List"
+msgstr "_Kontaktua Gehitu..."
 
-#: gajim/gui_menu_builder.py:571
-msgid "Audio Session"
-msgstr ""
+#: gajim/gui_menu_builder.py:533
+#, fuzzy
+msgid "Voice Chat"
+msgstr "Fitxeroa Transferitzeko Baimena"
 
-#: gajim/gui_menu_builder.py:572
-msgid "Video Session"
-msgstr ""
+#: gajim/gui_menu_builder.py:534
+#, fuzzy
+msgid "Video Chat"
+msgstr "Txat Pribatua"
 
-#: gajim/gui_menu_builder.py:573
+#: gajim/gui_menu_builder.py:535 gajim/gui_menu_builder.py:582
 #, fuzzy
 msgid "Information"
 msgstr "Kontaktuaren Informazioa"
 
-#: gajim/gui_menu_builder.py:574 gajim/gui_menu_builder.py:639
+#: gajim/gui_menu_builder.py:536 gajim/gui_menu_builder.py:602
 #: gajim/data/gui/application_menu.ui:37
 #, fuzzy
 msgid "History"
 msgstr "_Historiala"
 
-#: gajim/gui_menu_builder.py:580 gajim/gui_menu_builder.py:687
+#: gajim/gui_menu_builder.py:542 gajim/gui_menu_builder.py:650
 #: gajim/data/gui/preferences_window.ui:1823
 msgid "Disabled"
 msgstr "Ezindu"
 
-#: gajim/gui_menu_builder.py:581 gajim/gui_menu_builder.py:688
+#: gajim/gui_menu_builder.py:543 gajim/gui_menu_builder.py:651
 #, fuzzy
 msgid "Composing only"
 msgstr "Sortzen"
 
-#: gajim/gui_menu_builder.py:582 gajim/gui_menu_builder.py:689
+#: gajim/gui_menu_builder.py:544 gajim/gui_menu_builder.py:652
 #, fuzzy
 msgid "All chat states"
 msgstr "Egoera Guztiak"
 
-#: gajim/gui_menu_builder.py:620
+#: gajim/gui_menu_builder.py:583
 #, fuzzy
-msgid "Manage Room"
-msgstr "Talde Agenda Moldatu"
+msgid "Manage Group Chat"
+msgstr "Txat Taldea Berria"
 
-#: gajim/gui_menu_builder.py:621
+#: gajim/gui_menu_builder.py:584 gajim/data/gui/groupchat_control.ui:649
 #, fuzzy
 msgid "Change Subject"
 msgstr "Aldatu _Gaia"
 
-#: gajim/gui_menu_builder.py:622
+#: gajim/gui_menu_builder.py:585
 #, fuzzy
-msgid "Configure Room"
-msgstr "Gela Konfigu_ratu"
+msgid "Configure Group Chat"
+msgstr "Txat Taldea Berria"
 
-#: gajim/gui_menu_builder.py:623
+#: gajim/gui_menu_builder.py:586
 #, fuzzy
 msgid "Upload Avatar…"
 msgstr "Aukeratu Irudia"
 
-#: gajim/gui_menu_builder.py:624
+#: gajim/gui_menu_builder.py:587
 #, fuzzy
-msgid "Destroy Room"
-msgstr "Deskribapena: %s"
+msgid "Destroy Group Chat"
+msgstr "Txat Taldea Berria"
 
-#: gajim/gui_menu_builder.py:626 gajim/data/gui/preferences_window.ui:790
+#: gajim/gui_menu_builder.py:589 gajim/data/gui/preferences_window.ui:790
 #, fuzzy
 msgid "Chat Settings"
 msgstr "Konexioak huts egin du"
 
-#: gajim/gui_menu_builder.py:627
+#: gajim/gui_menu_builder.py:590
 msgid "Show join/leave"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:628
+#: gajim/gui_menu_builder.py:591
 #, fuzzy
 msgid "Show status changes"
 msgstr "Kontaktuen egoera aldaketak gorde"
 
-#: gajim/gui_menu_builder.py:629 gajim/data/gui/gc_control_popup_menu.ui:72
+#: gajim/gui_menu_builder.py:592 gajim/data/gui/gc_control_popup_menu.ui:72
 #, fuzzy
 msgid "Notify on all messages"
 msgstr "Ezarritako egoerak:"
 
-#: gajim/gui_menu_builder.py:630
+#: gajim/gui_menu_builder.py:593
 msgid "Minimize on close"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:631
-msgid "Minimize on autojoin"
+#: gajim/gui_menu_builder.py:595
+msgid "Minimize when joining automatically"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:634
+#: gajim/gui_menu_builder.py:598
 msgid "Sync Threshold"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:635
+#: gajim/gui_menu_builder.py:599
 #, fuzzy
-msgid "Change Nick"
+msgid "Change Nickname"
 msgstr "Aldatu _Izengoitia"
 
-#: gajim/gui_menu_builder.py:636
-#, fuzzy
-msgid "Bookmark Room"
-msgstr "_Talde Agendan Sartu Gela hau"
-
-#: gajim/gui_menu_builder.py:637
+#: gajim/gui_menu_builder.py:600
 #, fuzzy
 msgid "Request Voice"
 msgstr "_Ahotsa"
 
-#: gajim/gui_menu_builder.py:638 gajim/roster_window.py:5246
+#: gajim/gui_menu_builder.py:601 gajim/roster_window.py:5185
 #, fuzzy
 msgid "Execute command"
 msgstr "_Komandoa Exekutatu..."
 
-#: gajim/gui_menu_builder.py:640
-#, fuzzy
-msgid "Disconnect"
-msgstr "Kontaktua Deskonektatuta"
+#: gajim/gui_menu_builder.py:603
+msgid "Leave"
+msgstr ""
 
-#: gajim/gui_menu_builder.py:678 gajim/gtk/preferences.py:156
+#: gajim/gui_menu_builder.py:641 gajim/gtk/preferences.py:155
 msgid "No threshold"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:680 gajim/gtk/preferences.py:158
+#: gajim/gui_menu_builder.py:643 gajim/gtk/preferences.py:157
 #, 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:709 gajim/gui_menu_builder.py:747
-#: gajim/gtk/join_groupchat.py:43
-msgid "Join Group Chat"
-msgstr "Txat Taldean Sartu"
-
-#: gajim/gui_menu_builder.py:746
+#: gajim/gui_menu_builder.py:672
 #, fuzzy
 msgid "Add Contact…"
 msgstr "_Kontaktua Gehitu..."
 
-#: gajim/gui_menu_builder.py:748 gajim/gtk/profile.py:52
-#: gajim/gtk/accounts.py:770 gajim/gtk/accounts.py:808
+#: gajim/gui_menu_builder.py:673 gajim/gtk/profile.py:52
+#: gajim/gtk/accounts.py:773 gajim/gtk/accounts.py:811
 #, fuzzy
 msgid "Profile"
 msgstr "fitxeroa"
 
-#: gajim/gui_menu_builder.py:749
+#: gajim/gui_menu_builder.py:674
+#, fuzzy
+msgid "Send Single Message…"
+msgstr "Bidali _Mezu Bakarra"
+
+#: gajim/gui_menu_builder.py:675
 #, fuzzy
 msgid "Discover Services"
 msgstr "_Zerbitzuak Aurkitu"
 
-#: gajim/gui_menu_builder.py:750
+#: gajim/gui_menu_builder.py:676 gajim/gtk/server_info.py:36
 #, fuzzy
-msgid "Send Single Message…"
-msgstr "Bidali _Mezu Bakarra"
+msgid "Server Info"
+msgstr "Zerbitzaria"
 
-#: gajim/gui_menu_builder.py:751 gajim/data/gui/preferences_window.ui:2741
+#: gajim/gui_menu_builder.py:677 gajim/data/gui/preferences_window.ui:2741
 msgid "Advanced"
 msgstr "Aurreratua"
 
-#: gajim/gui_menu_builder.py:752 gajim/gtk/mam_preferences.py:88
+#: gajim/gui_menu_builder.py:678 gajim/gtk/mam_preferences.py:88
 #, fuzzy
 msgid "Archiving Preferences"
 msgstr "_Hobespenak"
 
-#: gajim/gui_menu_builder.py:753
+#: gajim/gui_menu_builder.py:679
 #, fuzzy
 msgid "Blocking List"
 msgstr "Debekatutako Zerrenda"
 
-#: gajim/gui_menu_builder.py:754 gajim/gtk/history_sync.py:108
+#: gajim/gui_menu_builder.py:680
+#, fuzzy
+msgid "Bookmarks"
+msgstr "_Talde Agendan Sartu Gela hau"
+
+#: gajim/gui_menu_builder.py:681
+#, fuzzy
+msgid "PEP Configuration"
+msgstr "Gelaren Konfigurazioa"
+
+#: gajim/gui_menu_builder.py:682 gajim/gtk/history_sync.py:108
 #: gajim/gtk/history_sync.py:186
 #, fuzzy
 msgid "Synchronise History"
 msgstr "Ikusi _Deskonektatutako Kontaktuak"
 
-#: gajim/gui_menu_builder.py:755 gajim/gtk/privacy_list.py:427
+#: gajim/gui_menu_builder.py:683 gajim/gtk/privacy_list.py:427
 msgid "Privacy Lists"
 msgstr "Debekatze Zerrenda"
 
-#: gajim/gui_menu_builder.py:756 gajim/gtk/server_info.py:36
-#, fuzzy
-msgid "Server Info"
-msgstr "Zerbitzaria"
-
-#: gajim/gui_menu_builder.py:757 gajim/gui_menu_builder.py:768
+#: gajim/gui_menu_builder.py:685 gajim/gui_menu_builder.py:696
 #: gajim/data/gui/xml_console_window.ui:77
 msgid "XML Console"
 msgstr " XML Konsola"
 
-#: gajim/gui_menu_builder.py:759 gajim/data/gui/groupchat_config.ui:36
+#: gajim/gui_menu_builder.py:687 gajim/data/gui/groupchat_config.ui:36
 #, fuzzy
 msgid "Admin"
 msgstr "_Admin"
 
-#: gajim/gui_menu_builder.py:760
+#: gajim/gui_menu_builder.py:688
 #, fuzzy
 msgid "Send Server Message…"
 msgstr "_Bidali Zerbitzarira Mezua"
 
-#: gajim/gui_menu_builder.py:761
+#: gajim/gui_menu_builder.py:689
 #, fuzzy
 msgid "Set MOTD…"
 msgstr "Ezarri MOTD"
 
-#: gajim/gui_menu_builder.py:762
+#: gajim/gui_menu_builder.py:690
 #, fuzzy
 msgid "Update MOTD…"
 msgstr "MOTD Gaurkotu"
 
-#: gajim/gui_menu_builder.py:763
+#: gajim/gui_menu_builder.py:691
 #, fuzzy
 msgid "Delete MOTD…"
 msgstr "Ezabatu MOTD"
 
-#: gajim/gui_menu_builder.py:812
+#: gajim/gui_menu_builder.py:736
 #, fuzzy
-msgid "No Accounts available"
-msgstr "Ez dago konturik erabilgarri"
+msgid "_Add Account…"
+msgstr "_Kontaktua Gehitu..."
+
+#: gajim/gui_menu_builder.py:742
+#, fuzzy
+msgid "_Modify Accounts…"
+msgstr "Kontua E_raldatu"
+
+#: gajim/gui_menu_builder.py:751 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:823 gajim/data/gui/application_menu.ui:5
-#: gajim/data/gui/application_menu.ui:71 gajim/data/gui/shortcuts_window.ui:182
-#: gajim/gtk/accounts.py:58
+#: gajim/gui_menu_builder.py:755 gajim/data/gui/application_menu.ui:5
+#: gajim/data/gui/shortcuts_window.ui:182 gajim/gtk/accounts.py:57
 msgid "Accounts"
 msgstr "Kontuak"
 
-#: gajim/gui_menu_builder.py:881 gajim/gui_menu_builder.py:886
+#: gajim/gui_menu_builder.py:784 gajim/gui_menu_builder.py:789
 #, fuzzy
-msgid "Copy JID"
-msgstr "Gela:"
+msgid "Copy XMPP Address"
+msgstr "_Kopiatu JID/Email-a"
 
-#: gajim/gui_menu_builder.py:882 gajim/gui_menu_builder.py:914
+#: gajim/gui_menu_builder.py:785 gajim/gui_menu_builder.py:817
 #, fuzzy
 msgid "Join Groupchat"
 msgstr "Txat Taldean Sartu"
 
-#: gajim/gui_menu_builder.py:887 gajim/gui_menu_builder.py:913
-#: gajim/data/gui/application_menu.ui:76
+#: gajim/gui_menu_builder.py:790 gajim/gui_menu_builder.py:816
+#: gajim/data/gui/application_menu.ui:71
 #: gajim/data/gui/subscription_request_window.ui:106
 msgid "Start Chat"
 msgstr "Elkarrizketa Hasi"
 
-#: gajim/gui_menu_builder.py:888 gajim/gui_menu_builder.py:915
+#: gajim/gui_menu_builder.py:791 gajim/gui_menu_builder.py:818
 #, fuzzy
-msgid "Add to Roster…"
-msgstr "_Zerrendara Sartu"
+msgid "Add to Contact List…"
+msgstr "_Kontaktua Gehitu..."
 
-#: gajim/gui_menu_builder.py:893
+#: gajim/gui_menu_builder.py:796
 #, fuzzy
 msgid "Copy Link Location"
 msgstr "_Lotura kokapena kopiatu"
 
-#: gajim/gui_menu_builder.py:894
+#: gajim/gui_menu_builder.py:797
 #, fuzzy
 msgid "Open Link in Browser"
 msgstr "Web-ean _Ireki Lotura"
 
-#: gajim/gui_menu_builder.py:899
+#: gajim/gui_menu_builder.py:802
 #, fuzzy
 msgid "Copy Email Address"
 msgstr "_Kopiatu JID/Email-a"
 
-#: gajim/gui_menu_builder.py:900 gajim/gui_menu_builder.py:912
+#: gajim/gui_menu_builder.py:803 gajim/gui_menu_builder.py:815
 #, fuzzy
 msgid "Open Email Composer"
 msgstr "_Ireki E-posta Konposatzailea"
 
-#: gajim/gui_menu_builder.py:905
+#: gajim/gui_menu_builder.py:808
 #, fuzzy
 msgid "Copy Location"
 msgstr "_Lotura kokapena kopiatu"
 
-#: gajim/gui_menu_builder.py:906
+#: gajim/gui_menu_builder.py:809
 #, fuzzy
 msgid "Show Location"
 msgstr "Kontu Eraldaketa"
 
-#: gajim/gui_menu_builder.py:911
+#: gajim/gui_menu_builder.py:814
 #, fuzzy
-msgid "Copy JID/Email"
+msgid "Copy XMPP Address/Email"
 msgstr "_Kopiatu JID/Email-a"
 
-#: gajim/gui_menu_builder.py:945
+#: gajim/gui_menu_builder.py:852
 #, fuzzy
 msgid "Copy"
 msgstr "Gela:"
@@ -584,44 +593,55 @@ msgstr ""
 msgid "Choose folder for logfile"
 msgstr ""
 
-#: gajim/history_manager.py:107
+#: gajim/history_manager.py:106
 msgid "Cannot find history logs database"
 msgstr "Ezin izan da aurkitu log-en datu basea"
 
-#: gajim/history_manager.py:108
+#: gajim/history_manager.py:107
 #, fuzzy, python-format
 msgid "%s does not exist."
 msgstr "Honako gela honek ez du existitzen."
 
-#: gajim/history_manager.py:141 gajim/history_manager.py:195
-#: gajim/gtk/discovery.py:829 gajim/gtk/roster_item_exchange.py:80
-msgid "JID"
-msgstr "JID"
+#: gajim/history_manager.py:140 gajim/history_manager.py:194
+#: 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:30
+#: gajim/gtk/accounts.py:804
+#, fuzzy
+msgid "XMPP Address"
+msgstr "AIM Hebidea:"
 
-#: gajim/history_manager.py:154 gajim/history_manager.py:202
+#: gajim/history_manager.py:153 gajim/history_manager.py:201
 #: gajim/data/gui/history_window.ui:89 gajim/gtk/history.py:108
 msgid "Date"
 msgstr "Data"
 
-#: gajim/history_manager.py:161 gajim/history_manager.py:225
+#: gajim/history_manager.py:160 gajim/history_manager.py:224
 #: gajim/data/gui/join_groupchat_window.ui:208
 #: gajim/data/gui/profile_window.ui:214
 #: gajim/data/gui/vcard_information_window.ui:443
+#: gajim/data/gui/bookmarks.ui:140
 msgid "Nickname"
 msgstr "Izengoitia"
 
-#: gajim/history_manager.py:172 gajim/history_manager.py:211
+#: gajim/history_manager.py:171 gajim/history_manager.py:210
 #: gajim/data/gui/preferences_window.ui:1344
 #: gajim/data/gui/single_message_window.ui:275 gajim/gtk/history.py:117
 msgid "Message"
 msgstr "Mezua"
 
-#: gajim/history_manager.py:180 gajim/history_manager.py:218
+#: gajim/history_manager.py:179 gajim/history_manager.py:217
 #: gajim/data/gui/groups_post_window.ui:49
 #: gajim/data/gui/single_message_window.ui:214
 msgid "Subject"
 msgstr "Gaia"
 
+#: gajim/history_manager.py:247
+msgid "Database Cleanup"
+msgstr ""
+
 #: gajim/history_manager.py:248
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
@@ -632,11 +652,8 @@ msgstr ""
 #: gajim/history_manager.py:250
 #, fuzzy
 msgid ""
-"Normally allocated database size will not be freed, it will just become "
-"reusable. If you really want to reduce database filesize, click YES, else "
-"click NO.\n"
-"\n"
-"In case you click YES, please wait…"
+"Normally, the allocated database size will not be freed, it will just become "
+"reusable. This operation may take a while."
 msgstr ""
 "Normalean hautaturiko datu basearen tamaina ez da libratuko, ezta ere "
 "berrerabilgarri bihurtuko. Datu basearen tamaina gutxitu nahi baduzu, BAI "
@@ -645,47 +662,48 @@ msgstr ""
 "BAI sakatu baduzu, mesedez itxoin..."
 
 #: gajim/history_manager.py:255
-msgid "Database Cleanup"
-msgstr ""
+#, fuzzy
+msgid "_Cleanup"
+msgstr "_Garbitu"
 
-#: gajim/history_manager.py:519 gajim/gtk/filetransfer.py:238
-#: gajim/gtk/filetransfer.py:248
+#: gajim/history_manager.py:518 gajim/gtk/filetransfer.py:237
+#: gajim/gtk/filetransfer.py:247
 msgid "You"
 msgstr "Zu"
 
-#: gajim/history_manager.py:531
+#: gajim/history_manager.py:530
 #, 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:568 gajim/history_manager.py:607
-#: gajim/gtk/dialogs.py:58 gajim/gtk/themes.py:319
+#: gajim/history_manager.py:567 gajim/history_manager.py:606
+#: gajim/gtk/dialogs.py:57 gajim/gtk/themes.py:319
 #: gajim/gtk/roster_item_exchange.py:75 gajim/gtk/roster_item_exchange.py:185
 msgid "Delete"
 msgstr "Ezabatu"
 
-#: gajim/history_manager.py:569
+#: gajim/history_manager.py:568
 #, fuzzy
 msgid "Delete Conversation"
 msgid_plural "Delete Conversations"
 msgstr[0] "Kontaktuaren Informazioa"
 msgstr[1] "Kontaktuaren Informazioa"
 
-#: gajim/history_manager.py:570
+#: gajim/history_manager.py:569
 #, 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:608
+#: gajim/history_manager.py:607
 #, fuzzy
 msgid "Delete Message"
 msgid_plural "Delete Messages"
 msgstr[0] "Berezko Egoera Mezuak"
 msgstr[1] "Berezko Egoera Mezuak"
 
-#: gajim/history_manager.py:609
+#: gajim/history_manager.py:608
 #, fuzzy
 msgid "Do you want to permanently delete this message"
 msgid_plural "Do you want to permanently delete these messages"
@@ -698,15 +716,15 @@ msgid "Contact name: <i>%s</i>"
 msgstr "Kontaktuaren izena: <i>%s</i>"
 
 #: gajim/dialogs.py:84
-#, fuzzy, python-format
-msgid "JID: <i>%s</i>"
-msgstr "Jabber ID: <i>%s</i>"
+#, python-format
+msgid "XMPP Address: <i>%s</i>"
+msgstr ""
 
-#: gajim/dialogs.py:115 gajim/dialogs.py:128 gajim/roster_window.py:2901
-#: gajim/roster_window.py:3833 gajim/roster_window.py:5084
-#: gajim/common/contacts.py:157 gajim/common/contacts.py:190
+#: gajim/dialogs.py:115 gajim/dialogs.py:128 gajim/roster_window.py:2894
+#: gajim/roster_window.py:3784 gajim/roster_window.py:5023
+#: gajim/common/contacts.py:157 gajim/common/contacts.py:206
 #: gajim/data/gui/preferences_window.ui:558
-#: gajim/data/gui/shortcuts_window.ui:177 gajim/gtk/accounts.py:349
+#: gajim/data/gui/shortcuts_window.ui:177 gajim/gtk/accounts.py:352
 msgid "General"
 msgstr "Orokorra"
 
@@ -755,7 +773,7 @@ msgstr ""
 "Izen hau jadanik zure kontaktu batengatik erabilita dago. Mesedez aukeratu "
 "beste izen bat."
 
-#: gajim/dialogs.py:703
+#: gajim/dialogs.py:703 gajim/plugins/gui.py:292
 msgid "_Overwrite"
 msgstr ""
 
@@ -767,9 +785,7 @@ msgstr "Aurrez Ezarritako Mezua Jarri"
 msgid "Please type a name for this status message"
 msgstr "Mesedez ezarri izen bat egoera mezu honetarako"
 
-#: gajim/dialogs.py:740 gajim/gui_interface.py:1441 gajim/dialog_messages.py:31
-#: gajim/gtk/discovery.py:518 gajim/gtk/profile.py:323
-#: gajim/gtk/join_groupchat.py:234
+#: gajim/dialogs.py:740 gajim/gtk/discovery.py:517 gajim/gtk/profile.py:323
 msgid "You are not connected to the server"
 msgstr "Ez zaude zerbitzarira konektatuta"
 
@@ -778,9 +794,11 @@ msgstr "Ez zaude zerbitzarira konektatuta"
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Konexiorik gabe, ezin duzu zure pasahitza aldatu."
 
-#: gajim/dialogs.py:752 gajim/dialogs.py:823 gajim/gtk/discovery.py:822
-#: gajim/gtk/discovery.py:1648 gajim/gtk/discovery.py:1941
-#: gajim/gtk/history.py:99 gajim/gtk/roster_item_exchange.py:83
+#: gajim/dialogs.py:752 gajim/dialogs.py:823
+#: gajim/data/gui/groupchat_info_scrolled.ui:16 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/gtk/roster_item_exchange.py:83
 msgid "Name"
 msgstr "Izena"
 
@@ -802,398 +820,344 @@ msgstr "Ezin duzu txat talde batera sartu konektatuta ez zauden bitartean."
 msgid "Synchronise"
 msgstr ""
 
-#: gajim/dialogs.py:1043
+#: gajim/dialogs.py:1042
 msgid "an audio and video"
 msgstr ""
 
-#: gajim/dialogs.py:1045
+#: gajim/dialogs.py:1044
 msgid "an audio"
 msgstr ""
 
-#: gajim/dialogs.py:1047
+#: gajim/dialogs.py:1046
 msgid "a video"
 msgstr ""
 
-#: gajim/dialogs.py:1051
+#: gajim/dialogs.py:1050
 #, python-format
 msgid ""
-"%(contact)s wants to start %(type)s session with you. Do you want to answer "
+"%(contact)s wants to start a %(type)s chat with you. Do you want to answer "
 "the call?"
 msgstr ""
 
-#: gajim/groupchat_control.py:505
+#: gajim/groupchat_control.py:511
 #, fuzzy, python-format
 msgid "Send File (max. %s MiB)…"
 msgstr "Gorde Bezala..."
 
-#: gajim/groupchat_control.py:507 gajim/chat_control.py:342
+#: gajim/groupchat_control.py:513 gajim/chat_control.py:344
 #, fuzzy
 msgid "No File Transfer available"
 msgstr "Fitxero Transferentzia"
 
-#: gajim/groupchat_control.py:630 gajim/groupchat_control.py:2349
-msgid "Changing Subject"
-msgstr "Gaia Aldatu"
-
-#: gajim/groupchat_control.py:631 gajim/groupchat_control.py:2350
-msgid "Please specify the new subject:"
-msgstr "Gai berria zehaztu:"
-
-#: gajim/groupchat_control.py:638
-msgid "Changing Nickname"
-msgstr "Izengoitia Aldatu"
-
-#: gajim/groupchat_control.py:639
-msgid "Please specify the new nickname you want to use:"
-msgstr "Mesedez zehaztu ezazu erabili nahi duzun izengoiti berria:"
-
-#: gajim/groupchat_control.py:657
+#: gajim/groupchat_control.py:655
 #, fuzzy
-msgid "Invalid group chat JID"
+msgid "Invalid group chat XMPP Address"
 msgstr "Jabber ID gela baliogabea"
 
-#: gajim/groupchat_control.py:658
+#: gajim/groupchat_control.py:656
 #, fuzzy
-msgid "The group chat JID has not allowed characters."
+msgid "The group chat XMPP Address has not allowed characters."
 msgstr "ID Jabber gelak ez du onartzen karaktererik."
 
-#: gajim/groupchat_control.py:758 gajim/gtk/profile.py:136
+#: gajim/groupchat_control.py:743 gajim/gtk/profile.py:136
 msgid "Could not load image"
 msgstr "Ezin izan da irudia kargatu"
 
-#: gajim/groupchat_control.py:888
+#: gajim/groupchat_control.py:873
 msgid "Insert Nickname"
 msgstr "Sartu Izengoitia"
 
-#: gajim/groupchat_control.py:1056 gajim/chat_control.py:824
+#: gajim/groupchat_control.py:1041 gajim/chat_control.py:848
 #, fuzzy
 msgid "and authenticated"
 msgstr "Erabili autentifikazioa"
 
-#: gajim/groupchat_control.py:1060 gajim/chat_control.py:828
+#: gajim/groupchat_control.py:1045 gajim/chat_control.py:852
 #, fuzzy
 msgid "and NOT authenticated"
 msgstr "Erabili autentifikazioa"
 
-#: gajim/groupchat_control.py:1064
+#: gajim/groupchat_control.py:1049
 #, python-format
 msgid "%(type)s encryption is active %(authenticated)s."
 msgstr ""
 
-#: gajim/groupchat_control.py:1111
+#: gajim/groupchat_control.py:1096
 #, fuzzy
 msgid "Conversation with "
 msgstr "Elkarrizketaren Historiala"
 
-#: gajim/groupchat_control.py:1113
+#: gajim/groupchat_control.py:1098
 #, fuzzy
 msgid "Continued conversation"
 msgstr "Konektatu"
 
-#: gajim/groupchat_control.py:1411
+#: gajim/groupchat_control.py:1357
 #, 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:1433
-msgid "Room now shows unavailable members"
+#: gajim/groupchat_control.py:1374
+msgid "Group chat now shows unavailable members"
 msgstr ""
 
-#: gajim/groupchat_control.py:1436
-msgid "Room now does not show unavailable members"
-msgstr ""
+#: gajim/groupchat_control.py:1377
+#, fuzzy
+msgid "Group chat now does not show unavailable members"
+msgstr "Honako gela honek ez du existitzen."
 
-#: gajim/groupchat_control.py:1439
+#: gajim/groupchat_control.py:1380
 msgid "A setting not related to privacy has been changed"
 msgstr ""
 
-#: gajim/groupchat_control.py:1446
-msgid "Room logging is now enabled"
-msgstr ""
+#: gajim/groupchat_control.py:1387 gajim/groupchat_control.py:1659
+#, fuzzy
+msgid "Conversations are stored on the server"
+msgstr "Ez zaude zerbitzarira konektatuta"
 
-#: gajim/groupchat_control.py:1449
-msgid "Room logging is now disabled"
-msgstr ""
+#: gajim/groupchat_control.py:1390
+#, fuzzy
+msgid "Conversations are not stored on the server"
+msgstr "Zuri buzuzko informazioa zerbitzarian gordea izango da"
 
-#: gajim/groupchat_control.py:1452
-msgid "Room is now non-anonymous"
-msgstr ""
+#: gajim/groupchat_control.py:1393
+#, fuzzy
+msgid "Group chat is now non-anonymous"
+msgstr "Txat Taldeak"
 
-#: gajim/groupchat_control.py:1456
-msgid "Room is now semi-anonymous"
-msgstr ""
+#: gajim/groupchat_control.py:1397
+#, fuzzy
+msgid "Group chat is now semi-anonymous"
+msgstr "Txat Taldeko Mezu Nabarmendua"
 
-#: gajim/groupchat_control.py:1460
-msgid "Room is now fully anonymous"
-msgstr ""
+#: gajim/groupchat_control.py:1401
+#, fuzzy
+msgid "Group chat is now fully anonymous"
+msgstr "Txat Taldeak"
 
-#: gajim/groupchat_control.py:1500
+#: gajim/groupchat_control.py:1439
 #, python-format
 msgid "Ping? (%s)"
 msgstr ""
 
-#: gajim/groupchat_control.py:1503
+#: gajim/groupchat_control.py:1442
 #, python-format
 msgid "Pong! (%(nick)s %(delay)s s.)"
 msgstr ""
 
-#: gajim/groupchat_control.py:1506 gajim/chat_control.py:1213
+#: gajim/groupchat_control.py:1445 gajim/chat_control.py:1237
 #, fuzzy
 msgid "Error."
 msgstr "Avahi error"
 
-#: gajim/groupchat_control.py:1711
+#: gajim/groupchat_control.py:1650
 #, fuzzy, python-format
-msgid "You (%s) joined the room"
+msgid "You (%s) joined the group chat"
 msgstr "%s gelan sartu da"
 
-#: gajim/groupchat_control.py:1717
-msgid "Any occupant is allowed to see your full JID"
+#: gajim/groupchat_control.py:1655
+msgid "Any participant is allowed to see your full XMPP Address"
 msgstr ""
 
-#: gajim/groupchat_control.py:1721
-msgid "Room logging is enabled"
-msgstr ""
-
-#: gajim/groupchat_control.py:1725
-msgid "The server has assigned or modified your roomnick"
-msgstr ""
+#: gajim/groupchat_control.py:1663
+#, fuzzy
+msgid "The server has assigned or modified your nickname in this group chat"
+msgstr "Aldatu _Izengoitia"
 
-#: gajim/groupchat_control.py:1732
+#: gajim/groupchat_control.py:1671
 #, fuzzy
-msgid "A new room has been created"
+msgid "A new group chat has been created"
 msgstr "Zure kontu berria egoki sortua izan da."
 
-#: gajim/groupchat_control.py:1740 gajim/privatechat_control.py:112
+#: gajim/groupchat_control.py:1679 gajim/privatechat_control.py:115
 #, python-format
 msgid "You are now known as %s"
 msgstr "Orain %s bezala ezaguna zara"
 
-#: gajim/groupchat_control.py:1742 gajim/privatechat_control.py:114
+#: gajim/groupchat_control.py:1681 gajim/privatechat_control.py:117
 #, fuzzy, python-brace-format
 msgid "{nick} is now known as {new_nick}"
 msgstr "%s orain %s bezala ezaguna da"
 
-#: gajim/groupchat_control.py:1767 gajim/privatechat_control.py:141
+#: gajim/groupchat_control.py:1706 gajim/privatechat_control.py:144
 #, fuzzy, python-brace-format
 msgid "You are now {show}{status}"
 msgstr "Orain %s bezala ezaguna zara"
 
-#: gajim/groupchat_control.py:1773 gajim/privatechat_control.py:147
+#: gajim/groupchat_control.py:1712 gajim/privatechat_control.py:150
 #, fuzzy, python-brace-format
 msgid "{nick} is now {show}{status}"
 msgstr "%(nick)s orain dago %(status)s"
 
-#: gajim/groupchat_control.py:1790 gajim/groupchat_control.py:1819
-#: gajim/groupchat_control.py:1849 gajim/groupchat_control.py:1909
+#: gajim/groupchat_control.py:1729 gajim/groupchat_control.py:1758
+#: gajim/groupchat_control.py:1788 gajim/groupchat_control.py:1848
 #, python-brace-format
 msgid " by {actor}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1793
+#: gajim/groupchat_control.py:1732
 #, python-brace-format
 msgid "** Your Affiliation has been set to {affiliation}{actor}{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1799
+#: gajim/groupchat_control.py:1738
 #, python-brace-format
 msgid "** Affiliation of {nick} has been set to {affiliation}{actor}{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1822
+#: gajim/groupchat_control.py:1761
 #, fuzzy, python-brace-format
 msgid "** Your Role has been set to {role}{actor}{reason}"
 msgstr "%(nick)s botata izan da %(who)s -engatik: %(reason)s"
 
-#: gajim/groupchat_control.py:1827
+#: gajim/groupchat_control.py:1766
 #, fuzzy, python-brace-format
 msgid "** Role of {nick} has been set to {role}{actor}{reason}"
 msgstr "%(nick)s botata izan da %(who)s -engatik: %(reason)s"
 
-#: gajim/groupchat_control.py:1852
+#: gajim/groupchat_control.py:1791
 #, fuzzy, python-brace-format
-msgid "You have been removed from the room{actor}{reason}"
+msgid "You have been removed from the group chat{actor}{reason}"
 msgstr "%(nick)s botata izan da %(who)s -engatik: %(reason)s"
 
-#: gajim/groupchat_control.py:1857
+#: gajim/groupchat_control.py:1796
 #, python-brace-format
 msgid "You have left due to an error{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1863
+#: gajim/groupchat_control.py:1802
 #, python-brace-format
 msgid "You have been kicked{actor}{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1870
+#: gajim/groupchat_control.py:1809
 #, python-brace-format
 msgid "You have been banned{actor}{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1877 gajim/groupchat_control.py:1943
+#: gajim/groupchat_control.py:1816 gajim/groupchat_control.py:1882
 #, fuzzy
 msgid ": Affiliation changed"
 msgstr "Afizioak: "
 
-#: gajim/groupchat_control.py:1883 gajim/groupchat_control.py:1948
-msgid ": Room configuration changed to members-only"
+#: gajim/groupchat_control.py:1822 gajim/groupchat_control.py:1887
+msgid ": Group chat configuration changed to members-only"
 msgstr ""
 
-#: gajim/groupchat_control.py:1912
+#: gajim/groupchat_control.py:1851
 #, fuzzy, python-brace-format
-msgid "{nick} has been removed from the room{by}{reason}"
+msgid "{nick} has been removed from the group chat{by}{reason}"
 msgstr "%(nick)s botata izan da %(who)s -engatik: %(reason)s"
 
-#: gajim/groupchat_control.py:1922
+#: gajim/groupchat_control.py:1861
 #, python-brace-format
 msgid "{nick} has left due to an error{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1928
+#: gajim/groupchat_control.py:1867
 #, fuzzy, python-brace-format
 msgid "{nick} has been kicked{actor}{reason}"
 msgstr "%(nick)s botata izan da%(reason)s -engatik: "
 
-#: gajim/groupchat_control.py:1936
+#: gajim/groupchat_control.py:1875
 #, fuzzy, python-brace-format
 msgid "{nick} has been banned{actor}{reason}"
 msgstr "%(nick)s debekatu da %(reason)s -engatik:"
 
-#: gajim/groupchat_control.py:1953
+#: gajim/groupchat_control.py:1892
 #, python-brace-format
 msgid "{nick} has left{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1970
+#: gajim/groupchat_control.py:1914
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s gelan sartu da"
 
-#: gajim/groupchat_control.py:1985 gajim/groupchat_control.py:1990
-#: gajim/groupchat_control.py:1995 gajim/groupchat_control.py:2000
-#: gajim/groupchat_control.py:2011
-msgid "Unable to join group chat"
-msgstr "Ezin da gela honetara sartu"
-
-#: gajim/groupchat_control.py:1986
-#, fuzzy, python-format
-msgid "You are banned from group chat <b>%s</b>."
-msgstr "Gela honetan ukatua izan zara."
-
-#: gajim/groupchat_control.py:1991
-#, fuzzy, python-format
-msgid "Remote server <b>%s</b> does not exist."
-msgstr "Honako gela honek ez du existitzen."
-
-#: gajim/groupchat_control.py:1996
-#, fuzzy, python-format
-msgid "Group chat <b>%s</b> does not exist."
-msgstr "Honako gela honek ez du existitzen."
-
-#: gajim/groupchat_control.py:2001
-#, fuzzy
-msgid "Group chat creation is not permitted."
-msgstr "Gela sortzea mugatua dago."
-
-#: gajim/groupchat_control.py:2005
+#: gajim/groupchat_control.py:1981
 #, fuzzy
-msgid "Unable to join groupchat"
-msgstr "Ezin da gela honetara sartu"
-
-#: gajim/groupchat_control.py:2006
-#, fuzzy, python-format
-msgid "You must use your registered nickname in <b>%s</b>."
-msgstr "Erregistratutako izengoitia erabilia izan behar da."
-
-#: gajim/groupchat_control.py:2012
-#, fuzzy, python-format
-msgid "You are not in the members list in groupchat %s."
-msgstr "Ez zaude kideen zerrendan."
-
-#: gajim/groupchat_control.py:2068
-#, fuzzy
-msgid "Room has been destroyed"
+msgid "Group chat has been destroyed"
 msgstr "Autorizazioa ezabatua izan da."
 
-#: gajim/groupchat_control.py:2073
-#, python-format
-msgid "You can join this room instead: xmpp:%s?join"
-msgstr ""
+#: gajim/groupchat_control.py:1986
+#, fuzzy, python-format
+msgid "You can join this group chat instead: xmpp:%s?join"
+msgstr "%s gelan sartu da"
 
-#: gajim/groupchat_control.py:2306
+#: gajim/groupchat_control.py:2214
 #, fuzzy
 msgid "Leave Group Chat"
 msgstr "Txat Taldea Berria"
 
-#: gajim/groupchat_control.py:2307
+#: gajim/groupchat_control.py:2215
 #, fuzzy
 msgid "Are you sure you want to leave this group chat?"
 msgstr "Ziur al zaude \"%s\" gelatik atera nahi duzula?"
 
-#: gajim/groupchat_control.py:2308
+#: gajim/groupchat_control.py:2216
 #, fuzzy, python-format
-msgid "If you close this window, you will be disconnected from '%s'."
+msgid "If you close this window, you will leave '%s'."
 msgstr "Leiho hau isten baduzu, gela honetatik deskonektatuko zara."
 
-#: gajim/groupchat_control.py:2314
+#: gajim/groupchat_control.py:2222 gajim/roster_window.py:5177
 msgid "_Leave"
 msgstr ""
 
-#: gajim/groupchat_control.py:2377
+#: gajim/groupchat_control.py:2280 gajim/roster_window.py:3008
 #, 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/groupchat_control.py:2527
+#: gajim/groupchat_control.py:2463
 #, python-format
 msgid "Kicking %s"
 msgstr "Botatzen %s"
 
-#: gajim/groupchat_control.py:2528 gajim/groupchat_control.py:2829
+#: gajim/groupchat_control.py:2464 gajim/groupchat_control.py:2765
 msgid "You may specify a reason below:"
 msgstr "Arrazoia zehaztu behar duzu behean:"
 
-#: gajim/groupchat_control.py:2828
+#: gajim/groupchat_control.py:2764
 #, python-format
 msgid "Banning %s"
 msgstr "Debekatzen %s"
 
-#: gajim/chat_control.py:408
+#: gajim/chat_control.py:432
 #, fuzzy
 msgid "Show a list of formattings"
 msgstr "Sakatu emoticon bat ezartzeko (Alt+M)"
 
-#: gajim/chat_control.py:412
+#: gajim/chat_control.py:436
 #, fuzzy
 msgid "This contact does not support HTML"
 msgstr "Fitxategi tranferentzia aktiboen, bukatutakoen eta gelditutakoen lista"
 
-#: gajim/chat_control.py:562
+#: gajim/chat_control.py:586
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr ""
 
-#: gajim/chat_control.py:686
+#: gajim/chat_control.py:710
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s  %(room_name)s gelatik"
 
-#: gajim/chat_control.py:832
+#: gajim/chat_control.py:856
 #, python-format
 msgid "%(type)s encryption is active %(authenticated)s"
 msgstr ""
 
-#: gajim/chat_control.py:1160 gajim/chat_control.py:1168
+#: gajim/chat_control.py:1184 gajim/chat_control.py:1192
 #, fuzzy
 msgid "Close"
 msgstr "_Bidali eta Itxi"
 
-#: gajim/chat_control.py:1161
+#: gajim/chat_control.py:1185
 #, fuzzy, python-format
 msgid "You just received a new message from %s"
 msgstr "\"%s\" -tik mezu berri bat jaso duzu"
 
-#: gajim/chat_control.py:1163
+#: gajim/chat_control.py:1187
 #, fuzzy
 msgid ""
 "If you close this tab while having chat history disabled, this message will "
@@ -1202,16 +1166,16 @@ msgstr ""
 "Leiho hau isten baduzu eta ez baduzu historiala aktibatua mezu hau galduko "
 "duzu."
 
-#: gajim/chat_control.py:1208
+#: gajim/chat_control.py:1232
 msgid "Ping?"
 msgstr ""
 
-#: gajim/chat_control.py:1211
+#: gajim/chat_control.py:1235
 #, python-format
 msgid "Pong! (%s seconds)"
 msgstr ""
 
-#: gajim/chat_control.py:1308
+#: gajim/chat_control.py:1332
 #, fuzzy, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -1220,298 +1184,305 @@ msgstr ""
 "Gaia: %s\n"
 "%s"
 
-#: gajim/chat_control.py:1416
+#: gajim/chat_control.py:1440
 #, fuzzy, python-format
 msgid "%(name)s is now %(show)s %(status)s"
 msgstr "%(nick)s orain dago %(status)s"
 
-#: gajim/chat_control.py:1476 gajim/data/gui/application_menu.ui:32
+#: gajim/chat_control.py:1500 gajim/data/gui/application_menu.ui:32
 #: gajim/gtk/http_upload_progress.py:35
 #, fuzzy
 msgid "File Transfer"
 msgstr "Fitxero Transferentzia"
 
-#: gajim/chat_control.py:1480
+#: gajim/chat_control.py:1504
 #, fuzzy
 msgid "Size"
 msgstr "Tamaina: %s"
 
-#: gajim/chat_control.py:1482 gajim/chat_control.py:1546
+#: gajim/chat_control.py:1506 gajim/chat_control.py:1566
+#: gajim/gui_interface.py:190
 #: gajim/data/gui/groupchat_invitation_received.ui:77
-#: gajim/gtk/filetransfer.py:485
+#: gajim/gtk/filetransfer.py:490
 #, fuzzy
 msgid "_Accept"
 msgstr "Onartu"
 
-#: gajim/chat_control.py:1484 gajim/chat_control.py:1548
+#: gajim/chat_control.py:1508 gajim/chat_control.py:1568
 #: gajim/data/gui/groupchat_invitation_received.ui:62
 #, fuzzy
 msgid "_Decline"
 msgstr "_Deskonektatuta"
 
-#: gajim/chat_control.py:1506 gajim/gui_interface.py:791
-#: gajim/gui_interface.py:821 gajim/gui_interface.py:847
+#: gajim/chat_control.py:1530 gajim/gui_interface.py:777
+#: gajim/gui_interface.py:807 gajim/gui_interface.py:833
 #: gajim/gtk/notification.py:173 gajim/gtk/notification.py:278
 msgid "File Transfer Completed"
 msgstr "Fitxero Transferitzea Egina"
 
-#: gajim/chat_control.py:1510 gajim/gtk/filetransfer.py:259
+#: gajim/chat_control.py:1534 gajim/gtk/filetransfer.py:258
 #, fuzzy
 msgid "Open _Folder"
 msgstr "_Ireki Fitxeroaren Edukia"
 
-#: gajim/chat_control.py:1512 gajim/chat_control.py:1521
+#: gajim/chat_control.py:1536 gajim/chat_control.py:1545
+#: gajim/data/gui/groupchat_control.ui:962
+#: gajim/data/gui/groupchat_control.ui:1049
+#: gajim/data/gui/groupchat_control.ui:1155
 #, fuzzy
 msgid "_Close"
 msgstr "_Bidali eta Itxi"
 
-#: gajim/chat_control.py:1543 gajim/gui_interface.py:484
+#: gajim/chat_control.py:1563 gajim/gui_interface.py:473
+#: gajim/data/gui/groupchat_invitation_received.ui:42
 #: gajim/gtk/notification.py:174 gajim/gtk/notification.py:195
 #: gajim/gtk/notification.py:281
-msgid "Groupchat Invitation"
+#, fuzzy
+msgid "Group Chat Invitation"
 msgstr "Txat Taldeko Gonbidapena"
 
-#: gajim/chat_control.py:1568 gajim/roster_window.py:1954
+#: gajim/chat_control.py:1588 gajim/roster_window.py:1951
 #, fuzzy
 msgid "Remote contact stopped transfer"
 msgstr "Zerrendatik kontaktua ezabatu"
 
-#: gajim/chat_control.py:1570 gajim/roster_window.py:1956
+#: gajim/chat_control.py:1590 gajim/roster_window.py:1953
 #, fuzzy
 msgid "Error opening file"
 msgstr "Errorea fitxeroa irakurtzean:"
 
-#: gajim/chat_control.py:1572 gajim/gtk/filetransfer.py:297
+#: gajim/chat_control.py:1592 gajim/gtk/filetransfer.py:296
 #, fuzzy
 msgid "File transfer stopped"
 msgstr "Fitxero Transferentzia Gelditua"
 
-#: gajim/chat_control.py:1575 gajim/gtk/filetransfer.py:275
-#: gajim/gtk/filetransfer.py:284
+#: gajim/chat_control.py:1595 gajim/gtk/filetransfer.py:274
+#: gajim/gtk/filetransfer.py:283
 #, fuzzy
 msgid "File transfer cancelled"
 msgstr "Fitxero transferentzia ezeztatua"
 
-#: gajim/chat_control.py:1576
+#: gajim/chat_control.py:1596
 msgid "Connection with peer cannot be established."
 msgstr "Connection with peer cannot be established."
 
-#: gajim/application.py:72
+#: gajim/application.py:75
 #, fuzzy
 msgid "Show the application's version"
 msgstr "E_rabili ikonifikazioa (aka. notification area)"
 
-#: gajim/application.py:79
+#: gajim/application.py:82
 #, fuzzy
 msgid "Show only critical errors"
 msgstr "Ikusi _zerrendan bakarrik"
 
-#: gajim/application.py:86
+#: gajim/application.py:89
 msgid "Separate profile files completely (even history database and plugins)"
 msgstr ""
 
-#: gajim/application.py:94
+#: gajim/application.py:97
 msgid "Print XML stanzas and other debug information"
 msgstr ""
 
-#: gajim/application.py:101
+#: gajim/application.py:104
 #, fuzzy
 msgid "Use defined profile in configuration directory"
 msgstr "Konfigurazio Aurreratuaren Editorea"
 
-#: gajim/application.py:109
+#: gajim/application.py:112
 #, fuzzy
 msgid "Set configuration directory"
 msgstr "Gelaren Konfigurazioa"
 
-#: gajim/application.py:117
+#: gajim/application.py:120
 msgid "Configure logging system"
 msgstr ""
 
-#: gajim/application.py:125
+#: gajim/application.py:128
 #, fuzzy
 msgid "Show all warnings"
 msgstr "Ikusi Gabeko _Gertaerak"
 
-#: gajim/application.py:132
+#: gajim/application.py:135
 msgid "Open IPython shell"
 msgstr ""
 
-#: gajim/application.py:139
+#: gajim/application.py:142
 #, fuzzy
 msgid "Pops up a window with the next pending event"
 msgstr "Agertarazi leiho bat hurrengo irakurri gabeko gertaerarekin"
 
-#: gajim/application.py:145 gajim/data/gui/shortcuts_window.ui:203
+#: gajim/application.py:148 gajim/data/gui/shortcuts_window.ui:203
 #: data/org.gajim.Gajim.desktop.in:21
 #, fuzzy
 msgid "Start a new chat"
 msgstr "Elkarrizketa Hasi"
 
-#: gajim/application.py:152
+#: gajim/application.py:155
 msgid "Simulate loss of connectivity"
 msgstr ""
 
-#: gajim/application.py:159
+#: gajim/application.py:162
 msgid "Simulate regaining connectivity"
 msgstr ""
 
-#: gajim/application.py:201 gajim/gui_interface.py:133
+#: gajim/application.py:204 gajim/gui_interface.py:133
 msgid "Database Error"
 msgstr ""
 
-#: gajim/roster_window.py:294 gajim/roster_window.py:1030
+#: gajim/roster_window.py:291 gajim/roster_window.py:1027
 msgid "Merged accounts"
 msgstr "Batu kontuak"
 
-#: gajim/roster_window.py:853 gajim/roster_window.py:1631
-#: gajim/roster_window.py:1664 gajim/roster_window.py:1715
-#: gajim/roster_window.py:1717 gajim/roster_window.py:1872
-#: gajim/roster_window.py:2531 gajim/roster_window.py:5025
-#: gajim/common/contacts.py:188 gajim/common/contacts.py:447
-#: gajim/common/helpers.py:83 gajim/gtk/discovery.py:129
-#: gajim/gtk/discovery.py:130 gajim/gtk/discovery.py:1416
+#: gajim/roster_window.py:850 gajim/roster_window.py:1628
+#: gajim/roster_window.py:1661 gajim/roster_window.py:1712
+#: gajim/roster_window.py:1714 gajim/roster_window.py:1869
+#: gajim/roster_window.py:2528 gajim/roster_window.py:4331
+#: gajim/roster_window.py:4964 gajim/common/contacts.py:204
+#: gajim/common/contacts.py:463 gajim/common/helpers.py:86
+#: gajim/gtk/discovery.py:127 gajim/gtk/discovery.py:128
+#: gajim/gtk/discovery.py:1414
 msgid "Transports"
 msgstr "Transportea"
 
-#: gajim/roster_window.py:1723 gajim/roster_window.py:1725
-#: gajim/roster_window.py:4995 gajim/gui_interface.py:1613
-#: gajim/gui_interface.py:1639 gajim/common/contacts.py:186
-#: gajim/common/helpers.py:83 gajim/common/modules/adhoc_commands.py:245
+#: gajim/roster_window.py:1720 gajim/roster_window.py:1722
+#: gajim/roster_window.py:4331 gajim/roster_window.py:4934
+#: gajim/gui_interface.py:1527 gajim/common/contacts.py:202
+#: gajim/common/helpers.py:86 gajim/common/modules/adhoc_commands.py:245
 #, fuzzy
-msgid "Groupchats"
+msgid "Group chats"
 msgstr "Txat Taldeak"
 
-#: gajim/roster_window.py:2012
+#: gajim/roster_window.py:2009
 #, fuzzy
 msgid "Authorization sent"
 msgstr "Autorizazioa bidalia izan da"
 
-#: gajim/roster_window.py:2013
+#: gajim/roster_window.py:2010
 #, fuzzy, python-format
 msgid "\"%s\" will now see your status."
 msgstr "Orain \"%s\"-ak jakingo du zure egoera."
 
-#: gajim/roster_window.py:2031
+#: gajim/roster_window.py:2028
 msgid "Subscription request has been sent"
 msgstr "Harpidetza eskaria bidalia izan da"
 
-#: gajim/roster_window.py:2032
-#, python-format
-msgid "If \"%s\" accepts this request you will know his or her status."
+#: gajim/roster_window.py:2029
+#, 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:2046
+#: gajim/roster_window.py:2043
 #, fuzzy
 msgid "Authorization removed"
 msgstr "Autorizazioa ezabatua izan da."
 
-#: gajim/roster_window.py:2047
+#: gajim/roster_window.py:2044
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Orain \"%s\" deskonektatuta ikusiko zaitu beti."
 
-#: gajim/roster_window.py:2250 gajim/roster_window.py:3504
+#: gajim/roster_window.py:2247 gajim/roster_window.py:3460
 msgid "Disconnect for Invisibility"
 msgstr ""
 
-#: gajim/roster_window.py:2251 gajim/roster_window.py:3505
+#: gajim/roster_window.py:2248 gajim/roster_window.py:3461
 msgid "You are participating in one or more group chats"
 msgstr "Txat talde bat baino gehiegotan parte hartzen ari zara."
 
-#: gajim/roster_window.py:2252 gajim/roster_window.py:3506
+#: gajim/roster_window.py:2249 gajim/roster_window.py:3462
 #, fuzzy
 msgid ""
-"Changing your status to invisible will result in disconnection from those "
-"group chats.\n"
+"Changing your status to invisible will result in you leaving those group "
+"chats.\n"
 "Are you sure you want to go invisible?"
 msgstr ""
 "Zure egoera ikusezinera pasatzen baduzu deskonektatu egingo zara txat talde "
 "honetatik. Ziur al zaude ikusezin jarri nahi duzula?"
 
-#: gajim/roster_window.py:2257 gajim/roster_window.py:3512
-#: gajim/roster_window.py:5238 gajim/data/gui/gc_control_popup_menu.ui:120
+#: gajim/roster_window.py:2254 gajim/roster_window.py:3468
+#: gajim/data/gui/gc_control_popup_menu.ui:120
 #, fuzzy
 msgid "_Disconnect"
 msgstr "Kontaktua Deskonektatuta"
 
-#: gajim/roster_window.py:2285
+#: gajim/roster_window.py:2282
 #, fuzzy
 msgid "desynced"
 msgstr "Aurreratua"
 
-#: gajim/roster_window.py:2353 gajim/data/gui/shortcuts_window.ui:224
+#: gajim/roster_window.py:2350 gajim/data/gui/shortcuts_window.ui:224
 #, fuzzy
 msgid "Quit Gajim"
 msgstr "Gajim"
 
-#: gajim/roster_window.py:2354
+#: gajim/roster_window.py:2351
 #, fuzzy
 msgid "You are about to quit Gajim"
 msgstr "Ziur al zaude \"%s\" gelatik atera nahi duzula?"
 
-#: gajim/roster_window.py:2355
+#: gajim/roster_window.py:2352
 #, fuzzy
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Ziur al zaude \"%s\" gelatik atera nahi duzula?"
 
-#: gajim/roster_window.py:2356
+#: gajim/roster_window.py:2353
 msgid "_Always quit when closing Gajim"
 msgstr ""
 
-#: gajim/roster_window.py:2359 gajim/roster_window.py:2455
-#: gajim/roster_window.py:2495 gajim/data/gui/systray_context_menu.ui:90
+#: gajim/roster_window.py:2356 gajim/roster_window.py:2452
+#: gajim/roster_window.py:2492 gajim/data/gui/systray_context_menu.ui:83
 #, fuzzy
 msgid "_Quit"
 msgstr "At_era"
 
-#: gajim/roster_window.py:2448
+#: gajim/roster_window.py:2445
 #, fuzzy
 msgid "Stop File Transfers"
 msgstr "Fitxero Transferentzia"
 
-#: gajim/roster_window.py:2449
+#: gajim/roster_window.py:2446
 #, fuzzy
 msgid "You still have running file transfers"
 msgstr "Fitxategi transferentzia kantzelatu"
 
-#: gajim/roster_window.py:2450
+#: gajim/roster_window.py:2447
 msgid ""
 "If you quit now, the file(s) being transferred will be lost.\n"
 "Do you still want to quit?"
 msgstr ""
 
-#: gajim/roster_window.py:2488
+#: gajim/roster_window.py:2485
 #, fuzzy
 msgid "Unread Messages"
 msgstr "Irakurri gabeko gertaerak"
 
-#: gajim/roster_window.py:2489
+#: gajim/roster_window.py:2486
 #, fuzzy
 msgid "You still have unread messages"
 msgstr "Irakurri gabeko mezu bat duzu"
 
-#: gajim/roster_window.py:2490
+#: gajim/roster_window.py:2487
 #, 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 "Mezuak gero irakurri ahalko dira historiala aktibatua baduzu."
 
-#: gajim/roster_window.py:2760
+#: gajim/roster_window.py:2753
 msgid "You have unread messages"
 msgstr "Irakurri gabeko mezu bat duzu"
 
-#: gajim/roster_window.py:2761
+#: gajim/roster_window.py:2754
 msgid "You must read them before removing this transport."
 msgstr "Irakurri behar dituzu transporte hau ezabatu baino lehen."
 
-#: gajim/roster_window.py:2764
+#: gajim/roster_window.py:2757
 #, fuzzy, python-format
 msgid "Transport '%s' will be removed"
 msgstr "\"%s\" transportea ezabatu da"
 
-#: gajim/roster_window.py:2765
+#: gajim/roster_window.py:2758
 #, fuzzy
 msgid ""
 "You will no longer be able to send and receive messages from and to contacts "
@@ -1520,11 +1491,11 @@ msgstr ""
 "You will no longer be able to send and receive messages to contacts from "
 "this transport."
 
-#: gajim/roster_window.py:2768
+#: gajim/roster_window.py:2761
 msgid "Transports will be removed"
 msgstr "Transporteak ezabatuko dira"
 
-#: gajim/roster_window.py:2773
+#: gajim/roster_window.py:2766
 #, fuzzy, python-format
 msgid ""
 "You will no longer be able to send and receive messages from and to contacts "
@@ -1534,85 +1505,80 @@ msgstr ""
 "You will no longer be able to send and receive messages to contacts from "
 "this transport."
 
-#: gajim/roster_window.py:2777
+#: gajim/roster_window.py:2770
 #, fuzzy
 msgid "Remove Transport"
 msgstr "Trans_porteak Erakutsi"
 
-#: gajim/roster_window.py:2844
+#: gajim/roster_window.py:2837
 #, fuzzy
 msgid "Block Contact"
 msgstr "Kontaktua"
 
-#: gajim/roster_window.py:2845
+#: gajim/roster_window.py:2838
 #, fuzzy
 msgid "Really block this contact?"
 msgstr "OpenPGP aktibatu al dago kontu honetarako?"
 
-#: gajim/roster_window.py:2846
+#: gajim/roster_window.py:2839
 msgid ""
 "This contact will see you offline and you will not receive any messages sent "
 "to you by this contact."
 msgstr ""
 
-#: gajim/roster_window.py:2851
+#: gajim/roster_window.py:2844
 #, fuzzy
 msgid "_Block Contact"
 msgstr "Kontaktua"
 
-#: gajim/roster_window.py:2896
+#: gajim/roster_window.py:2889
 msgid "Rename Contact"
 msgstr "Berridatzi Kontaktua"
 
-#: gajim/roster_window.py:2897
+#: gajim/roster_window.py:2890
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Sartu %s kontaktuarentzat nick berri bat"
 
-#: gajim/roster_window.py:2904
+#: gajim/roster_window.py:2897
 msgid "Rename Group"
 msgstr "Berrrizenpetu Taldea"
 
-#: gajim/roster_window.py:2905
+#: gajim/roster_window.py:2898
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Sartu %s taldearentzat izen berri bat"
 
-#: gajim/roster_window.py:2953 gajim/roster_window.py:2954
+#: gajim/roster_window.py:2946 gajim/roster_window.py:2947
 msgid "Remove Group"
 msgstr "Ezabatu Taldea"
 
-#: gajim/roster_window.py:2955
+#: gajim/roster_window.py:2948
 #, fuzzy, python-format
 msgid "Do you want to remove %s from the contact list?"
 msgstr "Ezabatu nahi al duzu %s taldea zerrendatik?"
 
-#: gajim/roster_window.py:2956
+#: gajim/roster_window.py:2949
 #, fuzzy
 msgid "_Also remove all contacts of this group from contact list"
 msgstr "Zerrendatik talde honetako kontaktu guztiak ere ezabatu"
 
-#: gajim/roster_window.py:3044
-#, fuzzy, python-format
-msgid "%(jid)s has been invited in this room"
-msgstr "%(nick)s botata izan da %(who)s -engatik: %(reason)s"
-
-#: gajim/roster_window.py:3353
+#: gajim/roster_window.py:3309
 #, fuzzy
 msgid "Remove Contact"
 msgstr "Berridatzi Kontaktua"
 
-#: gajim/roster_window.py:3354
+#: gajim/roster_window.py:3310
 #, fuzzy
 msgid "Remove contact from contact list"
 msgstr "Zerrendatik kontaktua ezabatu"
 
-#: gajim/roster_window.py:3355
+#: gajim/roster_window.py:3311
 #, python-format
 msgid "You are about to remove '%(name)s' (%(jid)s) from your contact list.\n"
 msgstr ""
 
-#: gajim/roster_window.py:3364 gajim/roster_window.py:3384
+#: gajim/roster_window.py:3320 gajim/roster_window.py:3340
 #, fuzzy
 msgid ""
 "By removing this contact you also remove authorization. This means the "
@@ -1622,22 +1588,22 @@ msgstr ""
 " bere autorizazioa ere ezabatzen duzu. Beraz, kontaktuak deskonektatuta "
 "ikusiko zaitu beti."
 
-#: gajim/roster_window.py:3375
+#: gajim/roster_window.py:3331
 #, fuzzy
 msgid "Do you want to continue?"
 msgstr "Zer nahi duzu egitea?"
 
-#: gajim/roster_window.py:3386
+#: gajim/roster_window.py:3342
 #, 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:3393
+#: gajim/roster_window.py:3349
 #, fuzzy
 msgid "Remove contacts from contact list"
 msgstr "Zerrendatik kontaktua ezabatu"
 
-#: gajim/roster_window.py:3399
+#: gajim/roster_window.py:3355
 #, fuzzy, python-format
 msgid ""
 "By removing the following contacts, you will also remove authorization. This "
@@ -1649,25 +1615,25 @@ msgstr ""
 " bere autorizazioa ere ezabatzen duzu. Beraz, kontaktuak deskonektatuta "
 "ikusiko zaitu beti."
 
-#: gajim/roster_window.py:3403
+#: gajim/roster_window.py:3359
 #, fuzzy
 msgid "Remove Contacts"
 msgstr "Berridatzi Kontaktua"
 
-#: gajim/roster_window.py:3423
+#: gajim/roster_window.py:3379
 msgid "No account available"
 msgstr "Ez dago konturik erabilgarri"
 
-#: gajim/roster_window.py:3424
+#: gajim/roster_window.py:3380
 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:4060
+#: gajim/roster_window.py:4011
 msgid "Metacontacts storage not supported by your server"
 msgstr "Metacontacts storage not supported by your server"
 
-#: gajim/roster_window.py:4062
+#: gajim/roster_window.py:4013
 #, fuzzy
 msgid ""
 "Your server does not support storing metacontacts information. So this "
@@ -1676,12 +1642,12 @@ msgstr ""
 "Your server does not support storing metacontacts information. So those "
 "information will not be save on next reconnection."
 
-#: gajim/roster_window.py:4159
+#: gajim/roster_window.py:4110
 #, fuzzy
 msgid "You are about to create a metacontact"
 msgstr "Metakontaktu bat sortuko duzu. Jarraitu nahi al duzu?"
 
-#: gajim/roster_window.py:4160
+#: gajim/roster_window.py:4111
 #, fuzzy
 msgid ""
 "Metacontacts are a way to regroup several contacts in one single contact. "
@@ -1692,128 +1658,119 @@ msgstr ""
 "kontaktuak jabber kontu bat baino gehiago duenean edo transporteetan "
 "harpidetuta dagonean erabiltzen da. "
 
-#: gajim/roster_window.py:4164
+#: gajim/roster_window.py:4115
 #, fuzzy
 msgid "Create Metacontact"
 msgstr "Berridatzi Kontaktua"
 
-#: gajim/roster_window.py:4170
+#: gajim/roster_window.py:4121 gajim/data/gui/groupchat_creation.ui:317
 #, fuzzy
 msgid "_Create"
 msgstr "Inaktiboa"
 
-#: gajim/roster_window.py:4287
+#: gajim/roster_window.py:4238
 #, fuzzy
 msgid "Invalid file URI:"
 msgstr "Fitxero Baliogabea"
 
-#: gajim/roster_window.py:4298
+#: gajim/roster_window.py:4249
 #, fuzzy
 msgid "Send file?"
 msgstr "Bidali _Fitxeroa"
 
-#: gajim/roster_window.py:4299
+#: gajim/roster_window.py:4250
 #, fuzzy, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
 msgstr[0] "%s fitxero bat bidali nahi dizu:"
 msgstr[1] "%s fitxero bat bidali nahi dizu:"
 
-#: gajim/roster_window.py:4451
+#: gajim/roster_window.py:4401
 #, fuzzy, python-format
 msgid "Send %(from)s to %(to)s"
 msgstr "Bidali %s"
 
-#: gajim/roster_window.py:4464
+#: gajim/roster_window.py:4414
 #, fuzzy, python-format
 msgid "Make %s first contact"
 msgstr "Egin %s eta %s metacontacts"
 
-#: gajim/roster_window.py:4469
+#: gajim/roster_window.py:4419
 #, fuzzy, python-format
 msgid "Make %(contact1)s and %(contact2)s metacontacts"
 msgstr "Egin %s eta %s metacontacts"
 
-#: gajim/roster_window.py:4825 gajim/roster_window.py:4923
+#: gajim/roster_window.py:4775 gajim/roster_window.py:4862
 msgid "_Change Status Message"
 msgstr "_Egoera Mezua aldatu"
 
-#: gajim/roster_window.py:4845
+#: gajim/roster_window.py:4795
 #, fuzzy
 msgid "Publish Tune"
 msgstr "_Argitaratu"
 
-#: gajim/roster_window.py:4856
+#: gajim/roster_window.py:4806
 #, fuzzy
 msgid "Publish Location"
 msgstr "_Argitaratu"
 
-#: gajim/roster_window.py:4868
-#, fuzzy
-msgid "Configure Services…"
-msgstr "_Zerbitzuak Aurkitu..."
-
-#: gajim/roster_window.py:4997
+#: gajim/roster_window.py:4936
 msgid "_Maximize All"
 msgstr ""
 
-#: gajim/roster_window.py:5004 gajim/roster_window.py:5146
+#: gajim/roster_window.py:4943 gajim/roster_window.py:5085
 msgid "Send Group M_essage"
 msgstr "_Bidali Taldeari Mezua"
 
-#: gajim/roster_window.py:5011
+#: gajim/roster_window.py:4950
 msgid "To all users"
 msgstr "Kontaktu guztiei"
 
-#: gajim/roster_window.py:5015
+#: gajim/roster_window.py:4954
 msgid "To all online users"
 msgstr "Konektatutako kontaktu guztiei"
 
-#: gajim/roster_window.py:5027 gajim/roster_window.py:5152
+#: gajim/roster_window.py:4966 gajim/roster_window.py:5091
 #: gajim/data/gui/gc_occupants_menu.ui:110
 #: gajim/data/gui/contact_context_menu.ui:36
 msgid "In_vite to"
 msgstr "Honera gonbidatu"
 
-#: gajim/roster_window.py:5162
+#: gajim/roster_window.py:5101
 #, fuzzy
 msgid "_Manage Contacts"
 msgstr "Berridatzi Kontaktua"
 
-#: gajim/roster_window.py:5168
+#: gajim/roster_window.py:5107
 #, fuzzy
 msgid "Edit _Groups…"
 msgstr "Editatu _Taldeak"
 
-#: gajim/roster_window.py:5189 gajim/data/gui/filetransfers.ui:12
+#: gajim/roster_window.py:5128 gajim/data/gui/filetransfers.ui:12
 #: gajim/data/gui/remove_account_window.ui:134
 msgid "_Remove"
 msgstr "_Ezabatu"
 
-#: gajim/roster_window.py:5226
+#: gajim/roster_window.py:5165
 msgid "_Maximize"
 msgstr ""
 
-#: gajim/roster_window.py:5233
+#: gajim/roster_window.py:5172
 #, fuzzy
 msgid "_Reconnect"
 msgstr "Kontaktua Deskonektatuta"
 
-#: gajim/roster_window.py:5254 gajim/data/gui/gc_occupants_menu.ui:170
+#: gajim/roster_window.py:5193 gajim/data/gui/gc_occupants_menu.ui:170
 #: gajim/data/gui/gc_control_popup_menu.ui:113
 #: gajim/data/gui/contact_context_menu.ui:205
 msgid "_History"
 msgstr "_Historiala"
 
-#: gajim/roster_window.py:5335 gajim/data/gui/application_menu.ui:86
+#: gajim/roster_window.py:5274 gajim/data/gui/application_menu.ui:83
 #: gajim/data/gui/history_window.ui:57
 msgid "History Manager"
 msgstr "Historial Administratzailea"
 
-#: gajim/roster_window.py:5343
-msgid "_Join New Group Chat"
-msgstr "T_xat Talde Berrian Sartu"
-
 #: gajim/dataforms_widget.py:585
 #, fuzzy
 msgid "Unable to load image"
@@ -1935,279 +1892,296 @@ msgstr "Gaia: %s\n"
 msgid "Write a message…"
 msgstr "Mezu Pribatu Berri Bat"
 
-#: gajim/message_window.py:250
+#: gajim/message_window.py:356
+#, fuzzy
+msgid "Close Tabs"
+msgstr "_Bidali eta Itxi"
+
+#: gajim/message_window.py:357
 #, fuzzy
 msgid "You are going to close several tabs"
 msgstr "Ez zaude zerbitzarira konektatuta"
 
-#: gajim/message_window.py:251
+#: gajim/message_window.py:358
 #, fuzzy
 msgid "Do you really want to close them all?"
 msgstr "Ziur al zaude hautaturiko mezua ezabatu nahi duzula?"
 
-#: gajim/message_window.py:539
+#: gajim/message_window.py:514
 #, fuzzy
 msgid "?Noun:Chats"
 msgstr "Txat Taldeak"
 
-#: gajim/message_window.py:543
+#: gajim/message_window.py:518
 #, fuzzy
 msgid "Group Chats"
 msgstr "Txat _Taldea"
 
-#: gajim/message_window.py:547
+#: gajim/message_window.py:522
 msgid "Private Chats"
 msgstr "Txat Pribatuak"
 
-#: gajim/message_window.py:553
+#: gajim/message_window.py:528
 msgid "Messages"
 msgstr "Mezuak"
 
-#: gajim/gui_interface.py:173
+#: gajim/gui_interface.py:170
+#, 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:175
 msgid "Do you accept this request?"
 msgstr "Baimen hau onartzen al duzu?"
 
-#: gajim/gui_interface.py:175
+#: gajim/gui_interface.py:177
 #, fuzzy, python-format
-msgid "Do you accept this request on account %s?"
+msgid "Do you accept this request (account: %s)?"
 msgstr "Baimen hau onartzen al duzu?"
 
-#: gajim/gui_interface.py:178
-#, 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:182
+#, fuzzy
+msgid "Authorization"
+msgstr "Autorizazioa bidalia izan da"
+
+#: gajim/gui_interface.py:186 gajim/gui_interface.py:420
+#: gajim/gtk/filetransfer.py:338
+#, fuzzy
+msgid "_No"
+msgstr "Ezer ez"
 
-#: gajim/gui_interface.py:194 gajim/gtk/notification.py:175
+#: gajim/gui_interface.py:205 gajim/gtk/notification.py:175
 #: gajim/gtk/notification.py:197
 msgid "Connection Failed"
 msgstr "Konexioak huts egin du"
 
-#: gajim/gui_interface.py:279 gajim/gui_interface.py:529
-msgid "Password Required"
-msgstr "Pasahitza behar da"
-
-#: gajim/gui_interface.py:280
-#, fuzzy, python-format
-msgid "A Password is required to join the room %s. Please type it."
-msgstr "Pasahitza behar da gela honetan sartzeko."
-
-#: gajim/gui_interface.py:342 gajim/gui_interface.py:346
+#: gajim/gui_interface.py:325 gajim/gui_interface.py:329
 #, fuzzy, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr "%(nickname)s: %(message)s"
 
-#: gajim/gui_interface.py:357 gajim/gui_interface.py:376
+#: gajim/gui_interface.py:340 gajim/gui_interface.py:359
 #: gajim/common/modules/message.py:122
 #, fuzzy, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "errorea bidaltzen zen bitartean %s ( %s )"
 
-#: gajim/gui_interface.py:401 gajim/gtk/notification.py:175
+#: gajim/gui_interface.py:384 gajim/gtk/notification.py:175
 #, fuzzy
 msgid "Subscription request"
 msgstr "Harpidetza Eskaria"
 
-#: gajim/gui_interface.py:413 gajim/common/contacts.py:184
-#: gajim/common/helpers.py:83
+#: gajim/gui_interface.py:396 gajim/common/contacts.py:200
+#: gajim/common/helpers.py:86
 msgid "Observers"
 msgstr "Begiratzaileak"
 
-#: gajim/gui_interface.py:422
+#: gajim/gui_interface.py:405
 msgid "Authorization accepted"
 msgstr "Autorizazioa baimendua"
 
-#: gajim/gui_interface.py:423
+#: gajim/gui_interface.py:406
 #, 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:431
-#, python-format
-msgid "Contact \"%s\" removed subscription from you"
+#: gajim/gui_interface.py:415
+#, fuzzy
+msgid "Subscription Removed"
+msgstr "Harpidetza Eskaria"
+
+#: gajim/gui_interface.py:416
+#, fuzzy, python-format
+msgid "Contact '%s' removed subscription from you"
 msgstr "\"%s\" kontaktuak harpidetza ezabatu dizu"
 
-#: gajim/gui_interface.py:432
+#: gajim/gui_interface.py:417
 msgid ""
-"You will always see them as offline.\n"
+"You will always see this contact as offline.\n"
 "Do you want to remove them from your contact list?"
 msgstr ""
 
-#: gajim/gui_interface.py:453 gajim/gtk/notification.py:176
+#: gajim/gui_interface.py:442 gajim/gtk/notification.py:176
 #, fuzzy
 msgid "Unsubscribed"
 msgstr "Harpidetza ezabat_u"
 
-#: gajim/gui_interface.py:465
+#: gajim/gui_interface.py:454
 #, python-format
 msgid "%(jid)s declined the invitation: %(reason)s"
 msgstr ""
 
-#: gajim/gui_interface.py:469
+#: gajim/gui_interface.py:458
 #, python-format
 msgid "%(jid)s declined the invitation"
 msgstr ""
 
-#: gajim/gui_interface.py:485
+#: gajim/gui_interface.py:474
 #, fuzzy, python-brace-format
 msgid "You are invited to {room} by {user}"
 msgstr "Gela honetan ukatua izan zara."
 
-#: gajim/gui_interface.py:506
+#: gajim/gui_interface.py:495
 #, fuzzy
 msgid "Certificate Passphrase Required"
 msgstr "Pasa-esaldia Behar da"
 
-#: gajim/gui_interface.py:507
+#: gajim/gui_interface.py:496
 #, fuzzy, python-format
 msgid "Enter the certificate passphrase for account %s"
 msgstr "Sartu GPG kodearen pasa-esaldia %s konturako."
 
-#: gajim/gui_interface.py:516 gajim/gtk/accounts.py:963
+#: gajim/gui_interface.py:505 gajim/gtk/accounts.py:966
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "%s kontuaren pasahitza sartu"
 
-#: gajim/gui_interface.py:529 gajim/gtk/accounts.py:964
+#: gajim/gui_interface.py:518
+msgid "Password Required"
+msgstr "Pasahitza behar da"
+
+#: gajim/gui_interface.py:518 gajim/gtk/accounts.py:967
 msgid "Save password"
 msgstr "Gorde pasahitza"
 
-#: gajim/gui_interface.py:601 gajim/gui_interface.py:632
+#: gajim/gui_interface.py:587 gajim/gui_interface.py:618
+#: gajim/gtk/filetransfer.py:332 gajim/gtk/filetransfer.py:333
 #: gajim/gtk/notification.py:173 gajim/gtk/notification.py:276
 msgid "File Transfer Error"
 msgstr "Fitxero Transferitze Errorea"
 
-#: gajim/gui_interface.py:666
+#: gajim/gui_interface.py:652
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s fitxero bat bidali nahi dizu"
 
-#: gajim/gui_interface.py:668 gajim/gtk/filetransfer.py:479
+#: gajim/gui_interface.py:654 gajim/gtk/filetransfer.py:484
 #: gajim/gtk/notification.py:172 gajim/gtk/notification.py:274
 msgid "File Transfer Request"
 msgstr "Fitxeroa Transferitzeko Baimena"
 
-#: gajim/gui_interface.py:767
+#: gajim/gui_interface.py:753
 #, fuzzy
 msgid "Remote Contact Stopped Transfer"
 msgstr "Zerrendatik kontaktua ezabatu"
 
-#: gajim/gui_interface.py:772
+#: gajim/gui_interface.py:758
 #, fuzzy
 msgid "Error Opening File"
 msgstr "Errorea fitxeroa irakurtzean:"
 
-#: gajim/gui_interface.py:782
+#: gajim/gui_interface.py:768
 #, fuzzy
 msgid "SSL Certificate Error"
 msgstr "Baliogabeko izena"
 
-#: gajim/gui_interface.py:795 gajim/gui_interface.py:826
-#: gajim/gui_interface.py:853 gajim/gtk/notification.py:174
+#: gajim/gui_interface.py:781 gajim/gui_interface.py:812
+#: gajim/gui_interface.py:839 gajim/gtk/notification.py:174
 #: gajim/gtk/notification.py:279
 msgid "File Transfer Stopped"
 msgstr "Fitxero Transferentzia Gelditua"
 
-#: gajim/gui_interface.py:799
+#: gajim/gui_interface.py:785
 #, fuzzy
 msgid "File Transfer Failed"
 msgstr "Fitxero Transferentzia"
 
-#: gajim/gui_interface.py:822
+#: gajim/gui_interface.py:808
 #, 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:827
+#: gajim/gui_interface.py:813
 #, 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:833
+#: gajim/gui_interface.py:819
 #, 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:848
+#: gajim/gui_interface.py:834
 #, 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:854
+#: gajim/gui_interface.py:840
 #, 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:860
+#: gajim/gui_interface.py:846
 #, 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:971
+#: gajim/gui_interface.py:957
 msgid "Username Conflict"
 msgstr "Erabiltze izenarekin gatazka"
 
-#: gajim/gui_interface.py:972
+#: gajim/gui_interface.py:958
 msgid "Please type a new username for your local account"
 msgstr "Mesedez ezarri erabiltzaile izen berri bat kontu lokalerako"
 
-#: gajim/gui_interface.py:995
+#: gajim/gui_interface.py:981
 #, fuzzy
 msgid "Resource Conflict"
 msgstr "Erabiltze izenarekin gatazka"
 
-#: gajim/gui_interface.py:996
+#: gajim/gui_interface.py:982
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
 msgstr ""
 
-#: gajim/gui_interface.py:1053
+#: gajim/gui_interface.py:1039
 #, fuzzy, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s fitxero bat bidali nahi dizu"
 
-#: gajim/gui_interface.py:1055
+#: gajim/gui_interface.py:1041
 #, fuzzy
 msgid "Voice Chat Request"
 msgstr "Fitxeroa Transferitzeko Baimena"
 
-#: gajim/gui_interface.py:1123 gajim/gtk/account_wizard.py:312
+#: gajim/gui_interface.py:1109 gajim/gtk/account_wizard.py:312
 #, fuzzy
 msgid "Certificate Already in File"
 msgstr "Kontaktua jadanik badago zerrendan"
 
-#: gajim/gui_interface.py:1124 gajim/gtk/account_wizard.py:313
+#: gajim/gui_interface.py:1110 gajim/gtk/account_wizard.py:313
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr ""
 
-#: gajim/gui_interface.py:1145
+#: gajim/gui_interface.py:1131
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid"
 msgstr ""
 
-#: gajim/gui_interface.py:1148
+#: gajim/gui_interface.py:1134
 #, fuzzy, python-format
 msgid ""
 "\n"
 "Unknown SSL error: %d"
 msgstr "D-Bus bertsioa aurkitugabea: %s"
 
-#: gajim/gui_interface.py:1150
+#: gajim/gui_interface.py:1136
 #, python-format
 msgid ""
 "\n"
 "SSL Error: <b>%s</b>"
 msgstr ""
 
-#: gajim/gui_interface.py:1155
+#: gajim/gui_interface.py:1141
 msgid "Error verifying SSL certificate"
 msgstr ""
 
-#: gajim/gui_interface.py:1156
+#: gajim/gui_interface.py:1142
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your XMPP server: "
@@ -2215,7 +2189,7 @@ msgid ""
 "Do you still want to connect to this server?"
 msgstr ""
 
-#: gajim/gui_interface.py:1160 gajim/gtk/account_wizard.py:412
+#: gajim/gui_interface.py:1146 gajim/gtk/account_wizard.py:413
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -2225,205 +2199,195 @@ msgid ""
 "%(sha256)s"
 msgstr ""
 
-#: gajim/gui_interface.py:1166
+#: gajim/gui_interface.py:1152
 msgid "Ignore this error for this certificate."
 msgstr ""
 
-#: gajim/gui_interface.py:1174
+#: gajim/gui_interface.py:1160
 #, fuzzy, python-format
 msgid "SSL Certificate Verification for %s"
 msgstr "Jakinarazketa Berezia Gehitzen %s-entzat"
 
-#: gajim/gui_interface.py:1442 gajim/gtk/join_groupchat.py:235
-msgid "You can not join a group chat unless you are connected."
-msgstr "Ezin duzu txat talde batera sartu konektatuta ez zauden bitartean."
-
-#: gajim/gui_interface.py:1448
-#, fuzzy
-msgid "JID is not a Groupchat"
-msgstr "Hau ez da txat talde bat"
-
-#: gajim/gui_interface.py:1579
-msgid "This is not a group chat"
-msgstr "Hau ez da txat talde bat"
-
-#: gajim/gui_interface.py:1580
-#, python-format
-msgid ""
-"%(room_jid)s is already in your roster. Please check if %(room_jid)s is a "
-"correct group chat name. If it is, delete it from your roster and try "
-"joining the group chat again."
-msgstr ""
-
-#: gajim/gui_interface.py:1604 gajim/dialog_messages.py:58
+#: gajim/gui_interface.py:1577
 msgid "You cannot join a group chat while you are invisible"
 msgstr "Ezin duzu txat talde batera sartu ikusezin zauden bitartean"
 
-#: gajim/gui_interface.py:2037
+#: gajim/gui_interface.py:1976
 msgid "Could not save your settings and preferences"
 msgstr "Ezin izan dira zure aldaketak eta hobespenak gorde"
 
-#: gajim/gui_interface.py:2098
+#: gajim/gui_interface.py:2037
 msgid "Gajim: IPython Console"
 msgstr ""
 
-#: gajim/dialog_messages.py:32
+#: gajim/dialog_messages.py:31 gajim/dialog_messages.py:36
+#: gajim/gtk/single_message.py:305 gajim/gtk/account_wizard.py:229
 #, fuzzy
-msgid "You can not start a new conversation unless you are connected."
-msgstr "Ezin duzu txat talde batera sartu konektatuta ez zauden bitartean."
-
-#: gajim/dialog_messages.py:36 gajim/dialog_messages.py:41
-#: gajim/gtk/single_message.py:305 gajim/gtk/join_groupchat.py:211
-#: gajim/gtk/account_wizard.py:229
-msgid "Invalid JID"
-msgstr "JID Baliogabea"
+msgid "Invalid XMPP Address"
+msgstr "Fitxero Baliogabea"
 
-#: gajim/dialog_messages.py:42 gajim/gtk/single_message.py:306
+#: gajim/dialog_messages.py:37
 #, fuzzy, python-format
-msgid "It is not possible to send a message to %s, this JID is not valid."
+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/dialog_messages.py:47
-msgid "Unread events"
+#: gajim/dialog_messages.py:42
+#, fuzzy
+msgid "Unread Events"
 msgstr "Irakurri gabeko gertaerak"
 
-#: gajim/dialog_messages.py:48
-msgid "Read all pending events before removing this account."
+#: gajim/dialog_messages.py:43
+#, fuzzy
+msgid "Read or acknowledge all pending events before removing this account."
 msgstr ""
 "Irakurri pendiente dituzun gertaera guztiak kontu hau ezabatu baino lehen. "
 
-#: gajim/dialog_messages.py:52
+#: gajim/dialog_messages.py:48
 #, fuzzy
 msgid "Invalid Form"
 msgstr "Sarrera baliogabea"
 
-#: gajim/dialog_messages.py:53
+#: gajim/dialog_messages.py:49
 #, fuzzy
 msgid "The form is not filled correctly."
 msgstr "ID Jabber gelak ez du onartzen karaktererik."
 
-#: gajim/dialog_messages.py:57 gajim/common/helpers.py:309
+#: gajim/dialog_messages.py:53 gajim/common/helpers.py:315
 msgid "Invisible"
 msgstr "Ikusezin"
 
-#: gajim/dialog_messages.py:62
-msgid "A connection is not available"
-msgstr "Konexioa ez dago erabilgarri"
+#: gajim/dialog_messages.py:54
+#, fuzzy
+msgid "You cannot join a group chat while being invisible."
+msgstr "Ezin duzu txat talde batera sartu ikusezin zauden bitartean"
 
-#: gajim/dialog_messages.py:63
+#: gajim/dialog_messages.py:58
+#, fuzzy
+msgid "No Connection Available"
+msgstr "Konexioa ez erablgarri"
+
+#: gajim/dialog_messages.py:59
 msgid "Your message can not be sent until you are connected."
 msgstr "Zure mezua ezin da bidali konektatu harte"
 
-#: gajim/dialog_messages.py:67
-#, fuzzy
-msgid "JID already in list"
-msgstr "IM Jabber Bezeroa"
+#: gajim/dialog_messages.py:63
+msgid "XMPP Address Already in List"
+msgstr ""
 
-#: gajim/dialog_messages.py:68
-msgid "The JID you entered is already in the list. Choose another one."
+#: gajim/dialog_messages.py:64
+#, fuzzy
+msgid ""
+"The XMPP Address you entered is already in the list. Please choose another "
+"one."
 msgstr ""
+"Izen hau jadanik zure kontaktu batengatik erabilita dago. Mesedez aukeratu "
+"beste izen bat."
 
-#: gajim/dialog_messages.py:72
-msgid "Invalid answer"
+#: gajim/dialog_messages.py:69
+#, fuzzy
+msgid "Invalid Answer"
 msgstr "Erantzun baliogabea"
 
-#: gajim/dialog_messages.py:73
+#: gajim/dialog_messages.py:70
 #, fuzzy, python-format
 msgid "Transport %(name)s answered wrongly to register request: %(error)s"
 msgstr "%s transporteak harpidetza baimenari errore batez erantzun dio: %s"
 
-#: gajim/dialog_messages.py:78
+#: gajim/dialog_messages.py:75
 #, fuzzy
 msgid "Wrong Custom Hostname"
 msgstr "Erabili bezeroaren hostname/portua"
 
-#: gajim/dialog_messages.py:79
+#: gajim/dialog_messages.py:76
 #, fuzzy, python-format
-msgid "Wrong custom hostname \"%s\". Ignoring it."
+msgid "Custom hostname \"%s\" is wrong. It will be ignored."
 msgstr "Erabili bezeroaren hostname/portua"
 
-#: gajim/dialog_messages.py:83
+#: gajim/dialog_messages.py:80
 #, fuzzy
-msgid "Error while removing privacy list"
+msgid "Error While Removing Privacy List"
 msgstr "Errorea zerbitzarian sartzean.%s"
 
-#: gajim/dialog_messages.py:84
+#: gajim/dialog_messages.py:81
 #, python-format
 msgid ""
-"Privacy list %s has not been removed. It is maybe active in one of your "
-"connected resources. Deactivate it and try again."
+"Privacy list %s has not been removed. It is probably active in one of your "
+"connected resources. Please deactivate it and try again."
 msgstr ""
 
-#: gajim/dialog_messages.py:90
+#: gajim/dialog_messages.py:87
 #, fuzzy
-msgid "Invisibility not supported"
+msgid "Invisibility Not Supported"
 msgstr "Gehigarriak ez eskuragarri"
 
-#: gajim/dialog_messages.py:91
-#, python-format
-msgid "Account %s doesn't support invisibility."
-msgstr ""
+#: gajim/dialog_messages.py:88
+#, fuzzy, python-format
+msgid "This account %s doesn't support invisibility."
+msgstr "Fitxategi tranferentzia aktiboen, bukatutakoen eta gelditutakoen lista"
 
-#: gajim/dialog_messages.py:95
+#: gajim/dialog_messages.py:92
 #, fuzzy
-msgid "Unregister failed"
+msgid "Unregister Failed"
 msgstr "Konexioak huts egin du"
 
-#: gajim/dialog_messages.py:96
-#, python-format
-msgid "Unregistration with server %(server)s failed: %(error)s"
-msgstr ""
+#: gajim/dialog_messages.py:93
+#, fuzzy, python-format
+msgid "Unregistration on server %(server)s failed: %(error)s"
+msgstr "Konexioak huts egin du"
 
-#: gajim/dialog_messages.py:100
+#: gajim/dialog_messages.py:97
 #, fuzzy
-msgid "Registration succeeded"
+msgid "Registration Succeeded"
 msgstr "vCard argitarapena egina"
 
-#: gajim/dialog_messages.py:101
-#, python-format
-msgid "Registration with agent %s succeeded"
-msgstr ""
+#: gajim/dialog_messages.py:98
+#, fuzzy, python-format
+msgid "Registration with agent %s succeeded."
+msgstr "vCard argitarapena egina"
 
-#: gajim/dialog_messages.py:105 gajim/gtk/service_registration.py:215
+#: gajim/dialog_messages.py:102
 #, fuzzy
-msgid "Registration failed"
+msgid "Registration Failed"
 msgstr "Konexioak huts egin du"
 
-#: gajim/dialog_messages.py:106
+#: gajim/dialog_messages.py:103
 #, python-format
 msgid ""
 "Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
 msgstr ""
 
-#: gajim/dialog_messages.py:111
+#: gajim/dialog_messages.py:108
 #, fuzzy
 msgid "Unable to Join Group Chat"
 msgstr "Ezin da gela honetara sartu"
 
-#: gajim/dialog_messages.py:116
-msgid "GStreamer error"
+#: gajim/dialog_messages.py:113
+msgid "GStreamer Error"
 msgstr ""
 
-#: gajim/dialog_messages.py:117
+#: gajim/dialog_messages.py:114
 #, fuzzy, python-format
 msgid ""
 "Error: %(error)s\n"
 "Debug: %(debug)s"
 msgstr "Errore mezua: %s"
 
-#: gajim/dialog_messages.py:121
-msgid "Wrong host"
+#: gajim/dialog_messages.py:118
+#, fuzzy
+msgid "Wrong Host"
 msgstr "Host okerra"
 
-#: gajim/dialog_messages.py:122
+#: gajim/dialog_messages.py:119
 msgid "Invalid local address? :-O"
 msgstr ""
 
-#: gajim/dialog_messages.py:126
-msgid "Avahi error"
+#: gajim/dialog_messages.py:123
+#, fuzzy
+msgid "Avahi Error"
 msgstr "Avahi error"
 
-#: gajim/dialog_messages.py:127
+#: gajim/dialog_messages.py:124
 #, python-format
 msgid ""
 "%s\n"
@@ -2432,66 +2396,66 @@ msgstr ""
 "%s\n"
 "Link-local messaging might not work properly."
 
-#: gajim/dialog_messages.py:131 gajim/dialog_messages.py:136
+#: gajim/dialog_messages.py:128 gajim/dialog_messages.py:133
 #, fuzzy
-msgid "Could not request upload slot"
+msgid "Could not request upload slot for HTTP File Upload"
 msgstr "Ezin izan da zerbitzu lokalak hasi"
 
-#: gajim/dialog_messages.py:137
-msgid "Got unexpected response from server (see log)"
+#: gajim/dialog_messages.py:134
+msgid "Got unexpected response from server (see log)."
 msgstr ""
 
-#: gajim/dialog_messages.py:141 gajim/dialog_messages.py:146
+#: gajim/dialog_messages.py:138 gajim/dialog_messages.py:143
 #, fuzzy
-msgid "Could not open file"
+msgid "Could not Open File"
 msgstr "Ezin izan da irudia kargatu"
 
-#: gajim/dialog_messages.py:142
-msgid "Exception raised while opening file (see log)"
+#: gajim/dialog_messages.py:139
+msgid "Exception raised while trying to open file (see log)."
 msgstr ""
 
-#: gajim/dialog_messages.py:151
-msgid "Unsecure"
-msgstr ""
+#: gajim/dialog_messages.py:148
+#, fuzzy
+msgid "Not Secure"
+msgstr "Hasigabea"
 
-#: gajim/dialog_messages.py:152
-msgid "Server returned unsecure transport (HTTP)"
+#: gajim/dialog_messages.py:149
+msgid "The server returned an insecure transport (HTTP)."
 msgstr ""
 
-#: gajim/dialog_messages.py:156
+#: gajim/dialog_messages.py:153
 #, fuzzy
-msgid "Could not upload file"
+msgid "Could not Upload File"
 msgstr "Ezin izan da irudia kargatu"
 
-#: gajim/dialog_messages.py:157
+#: gajim/dialog_messages.py:154
 #, python-format
 msgid "HTTP response code from server: %s"
 msgstr ""
 
-#: gajim/dialog_messages.py:161
+#: gajim/dialog_messages.py:158
 msgid "Upload Error"
 msgstr ""
 
-#: gajim/dialog_messages.py:166
+#: gajim/dialog_messages.py:163
 #, fuzzy
 msgid "Encryption Error"
 msgstr "Enkriptazioa aktibatuta"
 
-#: gajim/dialog_messages.py:167
-#, fuzzy
-msgid "For the chosen encryption there is no encryption method available"
-msgstr "Konexioa ez dago erabilgarri"
+#: gajim/dialog_messages.py:164
+msgid "There is no encryption method available for the chosen encryption."
+msgstr ""
 
-#: gajim/dialog_messages.py:171
+#: gajim/dialog_messages.py:169
 #, fuzzy
-msgid "Avatar upload failed"
+msgid "Avatar Upload Failed"
 msgstr "vCard argitarapenak hust egin du"
 
-#: gajim/privatechat_control.py:204
+#: gajim/privatechat_control.py:207
 msgid "Sending private message failed"
 msgstr "Mezu pribatua bidaltzeak huts egin du"
 
-#: gajim/privatechat_control.py:206
+#: gajim/privatechat_control.py:209
 #, 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."
@@ -2515,7 +2479,7 @@ msgstr "show help on command"
 
 #: gajim/gajim_remote.py:85
 #, fuzzy
-msgid "Lists all contacts in roster, one for each line"
+msgid "Lists all contacts in the contact list, one for each line"
 msgstr ""
 "Zerrendan inprimatu kontaktu guztien lista. Kontaktu horiek hainbat lerrotan "
 "agertuko dira."
@@ -2600,11 +2564,13 @@ msgstr ""
 
 #: gajim/gajim_remote.py:118
 #, fuzzy
-msgid "Sends new chat message to a contact in the roster. Account is optional."
+msgid ""
+"Sends new chat message to a contact in the contact list. Account is optional."
 msgstr "Erabilera:/%s, ezkutatu txat-eko botoilak."
 
 #: gajim/gajim_remote.py:120 gajim/gajim_remote.py:130
-msgid "JID of the contact that will receive the message"
+#, fuzzy
+msgid "XMPP Address of the contact that will receive the message"
 msgstr "Mezua jaso dugun kontuaren JID-a"
 
 #: gajim/gajim_remote.py:121 gajim/gajim_remote.py:132
@@ -2618,8 +2584,10 @@ msgid "if specified, the message will be sent using this account"
 msgstr "hautatua badago, mezua kontu hau erabiliz bidaliko da"
 
 #: gajim/gajim_remote.py:127
-msgid "Sends a chat message to someone on your roster. Account is optional."
-msgstr ""
+#, fuzzy
+msgid ""
+"Sends a chat message to someone on your contact list. Account is optional."
+msgstr "Erabilera:/%s, ezkutatu txat-eko botoilak."
 
 #: gajim/gajim_remote.py:131
 msgid "subject"
@@ -2630,12 +2598,12 @@ msgid "message subject"
 msgstr "mezuaren gaia"
 
 #: gajim/gajim_remote.py:138
-msgid "Sends new message to a groupchat you've joined."
+msgid "Sends new message to a group chat you've joined."
 msgstr ""
 
 #: gajim/gajim_remote.py:140
 #, fuzzy
-msgid "JID of the room that will receive the message"
+msgid "XMPP Address of the group chat that will receive the message"
 msgstr "Mezua jaso dugun kontuaren JID-a"
 
 #: gajim/gajim_remote.py:147
@@ -2644,7 +2612,8 @@ msgstr "Kontaktu baten informazioa lortu"
 
 #: gajim/gajim_remote.py:149 gajim/gajim_remote.py:162
 #: gajim/gajim_remote.py:192
-msgid "JID of the contact"
+#, fuzzy
+msgid "XMPP Address of the contact"
 msgstr "Kontaktuaren JID-a"
 
 #: gajim/gajim_remote.py:153
@@ -2705,7 +2674,8 @@ msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Gajim-en berezko preferentzien egoera .config fitxategian idatzi"
 
 #: gajim/gajim_remote.py:190
-msgid "Removes contact from roster"
+#, fuzzy
+msgid "Removes contact from contact list"
 msgstr "Zerrendatik kontaktua ezabatu"
 
 #: gajim/gajim_remote.py:193
@@ -2753,9 +2723,9 @@ msgid "Missing argument \"contact_jid\""
 msgstr "Galdutako argumentua  \"contact_jid\""
 
 #: gajim/gajim_remote.py:275
-#, python-format
+#, fuzzy, python-format
 msgid ""
-"'%s' is not in your roster.\n"
+"'%s' is not in your contact list.\n"
 "Please specify account for sending the message."
 msgstr ""
 "'%s'  ez dago zure zerrendan.\n"
@@ -2976,12 +2946,12 @@ msgstr "Aste bukaera"
 msgid "Weekend!"
 msgstr "Asteburua!"
 
-#: gajim/common/logger.py:192 gajim/common/logger.py:197
+#: gajim/common/logger.py:189 gajim/common/logger.py:194
 #, 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:217
+#: gajim/common/logger.py:214
 #, fuzzy, python-format
 msgid "Creating %s"
 msgstr "Deskribapena: %s"
@@ -3055,24 +3025,23 @@ msgstr "%(nickname)s Deskonektatuta"
 msgid "Contact Signed Out"
 msgstr "Kontaktua deskonektatuta"
 
-#: gajim/common/contacts.py:455
-#, fuzzy
-msgid "Not in roster"
-msgstr "Ez dago zerrendan"
-
 #: gajim/common/config.py:80
+#, fuzzy
 msgid ""
 "Show desktop notification even when a chat window is opened for this contact "
-"and does not have focus"
+"and does not have focus."
 msgstr ""
+"Baimendu Popup/Jakinarazteak nagoenean:  Kanpoan/Ez Erabilgarri/Lanpetuta/"
+"Ikusezin"
 
 #: gajim/common/config.py:81
-msgid "Play sound when user is busy"
+msgid "Play sound even when being busy."
 msgstr ""
 
 #: gajim/common/config.py:83
-msgid "Show only online and free for chat contacts in roster."
-msgstr ""
+#, fuzzy
+msgid "Show only online and free for chat contacts in the contact list."
+msgstr "Nire kontaktu zerrendara nahi zaitut sartu."
 
 #: gajim/common/config.py:86
 msgid "Time in minutes, after which your status changes to away."
@@ -3080,11 +3049,13 @@ msgstr "Ordua minutuetan, zure egoera kanpoan aldatu ondoren."
 
 #: gajim/common/config.py:87
 #, fuzzy
-msgid "$S (Away as a result of being idle more than $T min)"
+msgid "$S (Away: Idle more than $T min)"
 msgstr "Kanpoan beste zerbaitetan egoteagatik"
 
 #: gajim/common/config.py:87
-msgid "$S will be replaced by current status message, $T by autoawaytime."
+msgid ""
+"$S will be replaced by current status message, $T by the 'autoawaytime' "
+"value."
 msgstr ""
 
 #: gajim/common/config.py:89
@@ -3093,69 +3064,72 @@ msgstr "Ordua minutuetan, zure egoera ez erabilgarri aldatu ondoren."
 
 #: gajim/common/config.py:90
 #, fuzzy
-msgid "$S (Not available as a result of being idle more than $T min)"
+msgid "$S (Not available: Idle more than $T min)"
 msgstr "Ez erabilgarri beste zerbaitetan egoteagatik"
 
 #: gajim/common/config.py:90
-msgid "$S will be replaced by current status message, $T by autoxatime."
+msgid ""
+"$S will be replaced by current status message, $T by the 'autoxatime' value."
 msgstr ""
 
 #: gajim/common/config.py:93
 msgid ""
-"When to show notification area icon. Can be 'never', 'on_event', 'always'."
+"When to show the notification area icon. Can be 'never', 'on_event', and "
+"'always'."
 msgstr ""
 
 #: gajim/common/config.py:94
-msgid "Allow to hide the roster window even if the tray icon is not shown."
+msgid ""
+"Allow to hide the contact list window even if the notification area icon is "
+"not shown."
 msgstr ""
 
 #: gajim/common/config.py:97
 #, fuzzy
-msgid "Contact signed in notification color."
-msgstr "_Ikusarazi gertaera zerrendan"
+msgid "Notification color for contacts signing in."
+msgstr "Jakinarazi kontaktuek hau egitean: "
 
 #: gajim/common/config.py:98
 #, fuzzy
-msgid "Contact signout notification color"
-msgstr "_Ikusarazi gertaera zerrendan"
+msgid "Notification color for contacts signing out."
+msgstr "Jakinarazi kontaktuek hau egitean: "
 
 #: gajim/common/config.py:99
 #, fuzzy
-msgid "New message notification color."
+msgid "Notification color for new message notification."
 msgstr "_Ikusarazi gertaera zerrendan"
 
 #: gajim/common/config.py:100
 #, fuzzy
-msgid "File transfer request notification color."
-msgstr "Fitxeroa Transferitzeko Baimena"
+msgid "Notification color for file transfer request."
+msgstr "_Jakinarazi  fitxeroa transferitu denean"
 
 #: gajim/common/config.py:101
 #, fuzzy
-msgid "File transfer error notification color."
-msgstr "Fitxero transferentzia ezeztatua"
+msgid "Notification color for file transfer errors."
+msgstr "_Jakinarazi  fitxeroa transferitu denean"
 
 #: gajim/common/config.py:102
-#, fuzzy
-msgid "File transfer complete or stopped notification color."
-msgstr "Fitxero transferentzia bukatzean erakutsi popup jakinarazte bat"
+msgid "Notification color for stopped or completed file transfers."
+msgstr ""
 
 #: gajim/common/config.py:103
-#, fuzzy
-msgid "Groupchat invitation notification color"
-msgstr "Txat Taldeko Gonbidapena"
+msgid "Notification color for group chat invitations."
+msgstr ""
 
 #: gajim/common/config.py:104
 #, fuzzy
-msgid "Background color of status changed notification"
+msgid "Notification background color for changed status."
 msgstr "Kontaktuen atzealdeko kolorea momentuan konektatzen direnean."
 
 #: gajim/common/config.py:105
-msgid "Other dialogs color."
+msgid "Notification color for other dialogs."
 msgstr ""
 
 #: gajim/common/config.py:106
+#, fuzzy
 msgid ""
-"List (space separated) of rows (accounts and groups) that are collapsed."
+"List of rows (accounts and groups) that are collapsed (space separated)."
 msgstr ""
 "List (space separated) of rows (accounts and groups) that are collapsed."
 
@@ -3164,8 +3138,10 @@ msgstr ""
 msgid "default"
 msgstr "Berezkoa"
 
-#: gajim/common/config.py:113
-msgid "Language used by speller"
+#: gajim/common/config.py:113 gajim/common/config.py:424
+#: gajim/common/config.py:431
+#, fuzzy
+msgid "Language used for spell checking."
 msgstr "Zuzentzaileak erabiltzen duen hizkuntza"
 
 #: gajim/common/config.py:114
@@ -3182,8 +3158,8 @@ msgstr ""
 #, fuzzy
 msgid ""
 "Print time in chats using Fuzzy Clock. Value of fuzziness from 1 to 4, or 0 "
-"to disable fuzzyclock. 1 is the most precise clock, 4 the least precise one. "
-"This is used only if print_time is 'sometimes'."
+"to disable Fuzzy Clock. 1 is the most precise clock, 4 the least precise "
+"one. This is used only if 'print_time' is 'sometimes'."
 msgstr ""
 "Imprimatu ordua Fuzzy Clock erabiliz. 1-tik 4-rako baloreak eman  "
 "fuzzyclocks-ri eta 0 fuzzyclock ezintzeko. 1 ordu zehatzena da, 4 berriz, "
@@ -3200,299 +3176,304 @@ msgstr "Treat * / _ pairs as possible formatting characters."
 #: gajim/common/config.py:120
 #, fuzzy
 msgid ""
-"If true, do not remove */_ . So *abc* will be bold but with * * not removed."
+"If enabled, do not remove */_ . So *abc* will be bold but with * * not "
+"removed."
 msgstr ""
 "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
 
 #: gajim/common/config.py:123
 #, fuzzy
 msgid ""
-"Uses ReStructured text markup to send HTML, plus ascii formatting if "
-"selected. For syntax, see http://docutils.sourceforge.net/docs/ref/rst/"
-"restructuredtext.html (If you want to use this, install docutils)"
+"Uses ReStructured text markup to send HTML, plus ASCII formatting if "
+"selected. Needs docutils installed (for syntax, see http://docutils."
+"sourceforge.net/docs/ref/rst/restructuredtext.html)."
 msgstr ""
 "Uses ReStructured text markup for HTML, plus ascii formatting if selected. "
 "(If you want to use this, install docutils)"
 
 #: gajim/common/config.py:132
+#, fuzzy
 msgid ""
-"Character to add after nickname when using nick completion (tab) in group "
-"chat."
+"Character to add after nickname when using nickname completion (tab) in "
+"group chat."
 msgstr ""
 "Izengoitiaren ondoren ezartzeko karakterea txat talde batean tab-a "
 "erabiltzen bada."
 
 #: gajim/common/config.py:133
+#, fuzzy
 msgid ""
-"Character to propose to add after desired nickname when desired nickname is "
-"used by someone else in group chat."
+"Character to propose to add after desired nickname when nickname is already "
+"used in group chat."
 msgstr ""
 "Izengoitiaren ondoren jartzeko proposatzen den karakterea, txat taldean "
 "beste pertsona batek izengoiti berbera badu."
 
 #: gajim/common/config.py:155
 msgid ""
-"If true, Gajim will save roster position when hiding roster, and restore it "
-"when showing roster."
+"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:161
-msgid "Place the roster on the right in single window mode"
+msgid "Place the contact list on the right in single window mode"
 msgstr ""
 
 #: gajim/common/config.py:167
 msgid ""
-"This option let you customize timestamp that is printed in conversation. For "
-"example \"[%H:%M] \" will show \"[hour:minute] \". See python doc on "
-"strftime for full documentation: http://docs.python.org/lib/module-time.html"
+"This option lets you customize the timestamp that is printed in "
+"conversation. For example '[%H:%M] ' will show '[hour:minute] '. See python "
+"doc on strftime for full documentation (https://docs.python.org/3/library/"
+"time.html)."
 msgstr ""
 
 #: gajim/common/config.py:168
-msgid "Characters that are printed before the nickname in conversations"
+msgid "Characters that are printed before the nickname in conversations."
 msgstr ""
 
 #: gajim/common/config.py:169
-msgid "Characters that are printed after the nickname in conversations"
+msgid "Characters that are printed after the nickname in conversations."
 msgstr ""
 
 #: gajim/common/config.py:170
-msgid "Add * and [n] in roster title?"
-msgstr "Sartu * eta [n] zerrendako izenburuan?"
+#, 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:171
 #, fuzzy
 msgid ""
-"How many history messages should be restored when a chat tab/window is "
-"reopened?"
+"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:172
-msgid "How far back in time (minutes) history is restored. -1 means no limit."
+msgid ""
+"How far back in time (minutes) chat history is restored. -1 means no limit."
 msgstr ""
 
 #: gajim/common/config.py:173
 msgid ""
-"How many lines to request from server when entering a groupchat. -1 means no "
-"limit"
+"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:174
 msgid ""
-"Minutes of backlog to request when entering a groupchat. -1 means no limit"
+"Should automatic rejoin be activated when you were kicked from a group chat?"
 msgstr ""
 
 #: gajim/common/config.py:175
-msgid ""
-"How many seconds to wait before trying to autorejoin to a conference you are "
-"being disconnected from. Set to 0 to disable autorejoining."
-msgstr ""
-
-#: gajim/common/config.py:176
-msgid "Should autorejoin be activated when kicked from a conference?"
-msgstr ""
-
-#: gajim/common/config.py:177
-msgid ""
-"Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
-"Client default behaviour)."
+#, 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:179
-msgid "How many lines to store for Ctrl+KeyUP."
+#: gajim/common/config.py:177
+#, 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:182
+#: gajim/common/config.py:180
 #, fuzzy, python-format
 msgid ""
-"Either custom URL with %%s in it where %%s is the word/phrase or "
-"'WIKTIONARY' which means use Wikitionary."
+"Either a custom URL with %%s in it (where %%s is the word/phrase) or "
+"'WIKTIONARY' (which means use Wikitionary)."
 msgstr ""
 "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
 "which means use wiktionary."
 
-#: gajim/common/config.py:185
+#: gajim/common/config.py:183
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr "Hautatua badago, Gajim gajim-remote erabiliz kontrolatu daiteke."
 
-#: gajim/common/config.py:187
+#: gajim/common/config.py:185
+#, fuzzy
 msgid ""
-"When not printing time for every message (print_time==sometimes), print it "
+"When not printing time for every message ('print_time'==sometimes), print it "
 "every x minutes."
 msgstr ""
 "Ez denean ordua mezu bakoitzeko inprimatzen (print_time==sometimes), "
 "imprimatu x minuturo."
 
-#: gajim/common/config.py:188
+#: gajim/common/config.py:186
 msgid "Ask before pasting an image."
 msgstr ""
 
-#: gajim/common/config.py:189
+#: gajim/common/config.py:187
 msgid "Ask before closing a group chat tab/window."
 msgstr "Galdetu leiho bat itxi baino lehen."
 
-#: gajim/common/config.py:190
+#: gajim/common/config.py:188
 #, fuzzy
 msgid ""
-"Always ask for confirmation before closing groupchats with any of the JIDs "
-"on this space separated list."
+"Always ask for confirmation before closing group chats with any of the XMPP "
+"Addresses on this list (space separated)."
 msgstr ""
 "Always ask before closing group chat tab/window in this space separated list "
 "of group chat jids."
 
-#: gajim/common/config.py:191
+#: gajim/common/config.py:189
 #, fuzzy
 msgid ""
-"Never ask for confirmation before closing groupchats with any of the JIDs on "
-"this space separated list."
+"Never ask for confirmation before closing group chats with any of the XMPP "
+"Addresses on this list (space separated)."
 msgstr ""
 "Never ask before closing group chat tab/window in this space separated list "
 "of group chat jids."
 
-#: gajim/common/config.py:192
+#: gajim/common/config.py:190
 msgid ""
-"Ask before closing tabbed chat window if there are controls that can lose "
-"data (chat, private chat, groupchat that will not be minimized)"
+"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:195
+#: gajim/common/config.py:193
 #, fuzzy
 msgid ""
-"Comma separated list of sent hosts, in addition of local interfaces, for "
-"File Transfer in case of address translation/port forwarding."
+"List of send hosts (comma separated) in addition to local interfaces for "
+"file transfers (in case of address translation/port forwarding)."
 msgstr ""
 "Overrides the host we send for File Transfer in case of address translation/"
 "port forwarding."
 
-#: gajim/common/config.py:196
+#: gajim/common/config.py:194
 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:198
+#: gajim/common/config.py:196
 #, fuzzy
 msgid "Notify of events in the notification area."
 msgstr "Jakin arazi gertaerak system trayicon-ean."
 
-#: gajim/common/config.py:199
+#: gajim/common/config.py:197
 msgid ""
-"If False, Gajim will display a static event icon instead of the blinking "
-"status icon in the notification area when notifying on event."
+"If disabled, Gajim will display a static event icon instead of the blinking "
+"status icon in the notification area when notifying about an event."
 msgstr ""
 
-#: gajim/common/config.py:205
+#: gajim/common/config.py:203
 msgid "Show tab when only one conversation?"
 msgstr "Erakutsi tab-a bakarrik elkarrizketa bat dagoenean?"
 
-#: gajim/common/config.py:206
+#: gajim/common/config.py:204
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "Show tabbed notebook border in chat windows?"
 
-#: gajim/common/config.py:207
+#: gajim/common/config.py:205
 msgid "Show close button in tab?"
 msgstr "Isteko botoila erakutsi tab-ean?"
 
-#: gajim/common/config.py:220
+#: gajim/common/config.py:218
 msgid "Preview new messages in notification popup?"
 msgstr ""
 
-#: gajim/common/config.py:223
+#: gajim/common/config.py:221
+#, fuzzy
 msgid ""
-"A semicolon-separated list of words that will be highlighted in group chats."
+"A list of words (semicolon separated) that will be highlighted in group "
+"chats."
 msgstr ""
 "A semicolon-separated list of words that will be highlighted in group chats."
 
-#: gajim/common/config.py:224
+#: gajim/common/config.py:222
 #, fuzzy
 msgid ""
-"If true, quits Gajim when X button of Window Manager is clicked. This "
-"setting is taken into account only if notification icon is used."
+"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 ""
 "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:225
+#: gajim/common/config.py:223
 msgid ""
-"If true, Gajim hides the Roster window on pressing the X button instead of "
-"minimizing into the Dock."
+"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:226
+#: gajim/common/config.py:224
 #, fuzzy
 msgid ""
-"If true, Gajim will display an icon on each tab containing unread messages. "
-"Depending on the theme, this icon may be animated."
+"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:227
+#: gajim/common/config.py:225
 #, fuzzy
 msgid ""
-"If true, Gajim will display the status message, if not empty, for every "
-"contact under the contact name in roster window."
+"If enabled, Gajim will display the status message (if not empty) underneath "
+"the contact name in the contact list window."
 msgstr ""
 "Egia bada, Gajim-ek egoera mezua azalaraziko du, hutsik ez badago, zerrendan "
 "kontaktuaren izenaren azpian azalduko dira."
 
-#: gajim/common/config.py:233
-msgid "Define the position of the avatar in roster. Can be left or right"
+#: gajim/common/config.py:231
+msgid ""
+"Define the position of avatars in the contact list. Can be 'left' or 'right'."
 msgstr ""
 
-#: gajim/common/config.py:234
+#: gajim/common/config.py:232
 #, fuzzy
 msgid ""
-"If False, Gajim will no longer print status line in chats when a contact "
-"changes their status and/or their status message."
+"If disabled, Gajim will no longer print status messages in chats when a "
+"contact changes their status (and/or their status message)."
 msgstr ""
 "Gezurra bada, ez da egoera lerroa inprimatuko kontaktu batek bere egoera "
 "aldaketa egiten duenean edo/eta bere egoera mezua."
 
-#: gajim/common/config.py:235
+#: gajim/common/config.py:233
 #, fuzzy
 msgid ""
 "Default Setting: Show a status message for every join or leave in a group "
-"chat"
+"chat."
 msgstr "Ezin da gela honetara sartu"
 
-#: gajim/common/config.py:236
+#: gajim/common/config.py:234
+#, fuzzy
 msgid ""
-"Default Setting: Show a status message for all status (away, dnd, etc.) "
-"changes of users in a group chat"
-msgstr ""
+"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:238
-msgid "Log XHTML messages instead of plain text messages."
+#: gajim/common/config.py:236
+msgid "Store XHTML messages in chat history instead of plain text messages."
 msgstr ""
 
-#: gajim/common/config.py:239
+#: gajim/common/config.py:237
 msgid "Don't show avatar for the transport itself."
 msgstr "Ez erakutsarazi transporteen ikurrak."
 
-#: gajim/common/config.py:240
-msgid "Don't show roster in the system taskbar."
+#: gajim/common/config.py:238
+#, fuzzy
+msgid "Don't show contact list window in the system taskbar."
 msgstr "ez erakutsi zerrenda sistemako zeregin barran."
 
-#: gajim/common/config.py:241
+#: gajim/common/config.py:239
 #, fuzzy
 msgid ""
-"If true, make the window flash (the default behaviour in most Window "
-"Managers) when holding pending events."
+"If enabled, Gajim makes the window flash (the default behaviour in most "
+"Window Managers) when holding pending events."
 msgstr ""
 "Hautatu badago eta GTK+ eta PyGTK bertsioak gutxienez 2.8 bertsiokoak "
 "badira, make the window flash (the default behaviour in most Window "
 "Managers) when holding pending events."
 
-#: gajim/common/config.py:245
+#: gajim/common/config.py:243
 #, fuzzy
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
 "'always_with_roster' - Like 'always' but the messages are in a single window "
-"along with the roster.\n"
+"along with the contact list.\n"
 "'never' - All messages get their own window.\n"
 "'peracct' - Messages for each account are sent to a specific window.\n"
-"'pertype' - Each message type (e.g. chats vs. groupchats) is sent to a "
+"'pertype' - Each message type (e.g. chats vs. group chats) is sent to a "
 "specific window."
 msgstr ""
 "Kontrolatu leihoa mezu berri bat dagoenean.\n"
@@ -3503,241 +3484,258 @@ msgstr ""
 "konkretu batera bidaliko dira. Kontuz, funtziona dezan Gajim berriarazi "
 "behar da."
 
-#: gajim/common/config.py:246
+#: gajim/common/config.py:244
 msgid ""
-"Show roster on startup.\n"
-"'always' - Always show roster.\n"
-"'never' - Never show roster.\n"
-"'last_state' - Restore the last state roster."
+"Show contact list window on startup.\n"
+"'always' - Always show contact list window.\n"
+"'never' - Never show contact list window.\n"
+"'last_state' - Restore last state of the contact list window."
 msgstr ""
 
-#: gajim/common/config.py:247
-msgid "If False, you will no longer see the avatar in the chat window."
+#: gajim/common/config.py:245
+#, 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:248
+#: gajim/common/config.py:246
 #, fuzzy
-msgid "If true, pressing the escape key closes a tab/window."
+msgid "If enabled, pressing Esc closes a tab/window."
 msgstr "Egia bada, ateratzeko botoila sakatzean tab/leihoa itxiko da."
 
-#: gajim/common/config.py:249
-msgid "Hides the banner in a group chat window"
+#: gajim/common/config.py:247
+#, fuzzy
+msgid "Hides the banner in a group chat window."
 msgstr "Ezkutatu banner-a txat talde leihoan"
 
-#: gajim/common/config.py:250
-msgid "Hides the banner in two persons chat window"
-msgstr "Ezkutatu banner-a bi pertsonen txat leihoan "
+#: gajim/common/config.py:248
+#, fuzzy
+msgid "Hides the banner in a 1:1 chat window."
+msgstr "Ezkutatu banner-a txat talde leihoan"
 
-#: gajim/common/config.py:251
-msgid "Hides the group chat occupants list in group chat window."
+#: gajim/common/config.py:249
+#, 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:252
+#: gajim/common/config.py:250
+#, fuzzy
 msgid ""
 "In a chat, show the nickname at the beginning of a line only when it's not "
-"the same person talking than in previous message."
+"the same person talking as in the previous message."
 msgstr ""
 "Elkarrizketa batean, bakarrik lerroaren hasieran izengoitia erakutsi  ez "
 "denean lehengo mezuan hitz egiten ari zinen pertsona bera. "
 
-#: gajim/common/config.py:253
+#: gajim/common/config.py:251
 #, fuzzy
 msgid "Indentation when using merge consecutive nickname."
 msgstr "Indentation when using merge consecutive nickame."
 
-#: gajim/common/config.py:254
-msgid "Ctrl-Tab go to next composing tab when none is unread."
+#: gajim/common/config.py:252
+#, 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:255
+#: gajim/common/config.py:253
 #, fuzzy
 msgid ""
-"Show the confirm metacontacts creation dialog or not? Empty string means "
-"never show the dialog."
+"Show a confirmation dialog to create metacontacts? Empty string means never "
+"show the dialog."
 msgstr ""
 "Ikusi beharko da metakontaktuen baieztatze leihoa?  Empty string means we "
 "never show the dialog."
 
-#: gajim/common/config.py:256
+#: gajim/common/config.py:254
 #, fuzzy
 msgid ""
-"Show the confirm block contact dialog or not? Empty string means never show "
+"Show a confirmation dialog to block a contact? Empty string means never show "
 "the dialog."
 msgstr ""
 "Ikusi beharko da metakontaktuen baieztatze leihoa?  Empty string means we "
 "never show the dialog."
 
-#: gajim/common/config.py:257
+#: gajim/common/config.py:255
 #, fuzzy
 msgid ""
-"Show the confirm custom status dialog or not? Empty string means never show "
-"the dialog."
+"Show a confirmation dialog for a custom status? Empty string means never "
+"show the dialog."
 msgstr ""
 "Ikusi beharko da metakontaktuen baieztatze leihoa?  Empty string means we "
 "never show the dialog."
 
-#: gajim/common/config.py:258
+#: gajim/common/config.py:256
 #, fuzzy
 msgid ""
-"If true, you will be able to set a negative priority to your account in "
-"account modification window. BE CAREFUL, when you are logged in with a "
-"negative priority, you will NOT receive any message from your server."
+"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 ""
 "Egia bada, lehentasuna negatiboa izateko aukera izango duzu. KONTUZ, "
 "lehentasun negatiboarekin konektatzean, EZ duzu mezurik jasoko "
 "zerbitzariarengandik. "
 
-#: gajim/common/config.py:259
+#: gajim/common/config.py:257
 msgid ""
-"If true, Gajim will show number of online and total contacts in account and "
-"group rows."
+"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:260
+#: gajim/common/config.py:258
 msgid ""
-"Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
-"as if they were of this type"
+"Can be empty, 'chat' or 'normal'. If not empty, all incoming messages are "
+"treated as if they were of this type."
 msgstr ""
 
-#: gajim/common/config.py:261
+#: gajim/common/config.py:259
 msgid ""
-"If true, Gajim will scroll and select the contact who sent you the last "
-"message, if chat window is not already opened."
+"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:262
+#: gajim/common/config.py:260
 msgid "Time of inactivity needed before the change status window closes down."
 msgstr ""
 
-#: gajim/common/config.py:263
+#: gajim/common/config.py:261
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
 msgstr ""
 
-#: gajim/common/config.py:264
+#: gajim/common/config.py:262
 msgid ""
-"If true, notification windows from notification-daemon will be attached to "
-"notification icon."
+"If enabled, notification windows from notification-daemon will be attached "
+"to the notification area icon."
 msgstr ""
 
-#: gajim/common/config.py:265
+#: gajim/common/config.py:263
 msgid "Choose interval between 2 checks of idleness."
 msgstr ""
 
-#: gajim/common/config.py:266
+#: gajim/common/config.py:264
+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:265
 msgid ""
-"Valid uri schemes. Only schemes in this list will be accepted as \"real\" "
-"uri. (mailto and xmpp are handled separately)"
+"If enabled, completion in group chats will be like a shell auto-completion."
 msgstr ""
 
-#: gajim/common/config.py:267
-msgid "If true, completion in groupchats will be like a shell auto-completion"
+#: gajim/common/config.py:270
+msgid "Optionally fix Jingle output video framerate. Example: 10/1 or 25/2."
+msgstr ""
+
+#: gajim/common/config.py:271
+msgid "Optionally resize Jingle output video. Example: 320x240."
 msgstr ""
 
 #: gajim/common/config.py:272
-msgid "Optionally fix jingle output video framerate. Example: 10/1 or 25/2"
+msgid "If enabled, you will see your webcam's video stream as well."
 msgstr ""
 
-#: gajim/common/config.py:273
-msgid "Optionally resize jingle output video. Example: 320x240"
+#: gajim/common/config.py:275
+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:274
-msgid "If true, You will also see your webcam"
+#: gajim/common/config.py:276
+msgid "STUN server to use when using Jingle"
 msgstr ""
 
 #: gajim/common/config.py:277
 msgid ""
-"If true, Gajim will try to use a STUN server when using Jingle. The one in "
-"\"stun_server\" option, or the one given by the XMPP server."
+"If enabled, Gajim will show affiliation of group chat participants by adding "
+"a colored square to the status icon."
 msgstr ""
 
 #: gajim/common/config.py:278
-msgid "STUN server to use when using Jingle"
+msgid ""
+"Proxy used for all outgoing connections if the account does not have a "
+"specific proxy configured."
 msgstr ""
 
 #: gajim/common/config.py:279
-msgid ""
-"If true, Gajim will show affiliation of groupchat occupants by adding a "
-"colored square to the status icon"
+msgid "If enabled, Gajim will ignore incoming attention requests ('wizz')."
 msgstr ""
 
 #: gajim/common/config.py:280
 msgid ""
-"Proxy used for all outgoing connections if the account does not have a "
-"specific proxy configured"
+"If enabled, Gajim will reopen chat windows that were opened last time Gajim "
+"was closed."
 msgstr ""
 
 #: gajim/common/config.py:281
-msgid "If true, Gajim will ignore incoming attention requests (\"wizz\")."
+msgid ""
+"If enabled, Gajim will display an icon to show that sent messages have been "
+"received by your contact."
 msgstr ""
 
 #: gajim/common/config.py:282
-msgid ""
-"If enabled, Gajim will reopen chat windows that were opened last time Gajim "
-"was closed."
+msgid "Show a mini avatar in chat window tabs and as the window's icon."
 msgstr ""
 
 #: gajim/common/config.py:283
 msgid ""
-"If enabled, Gajim will show an icon to show that sent message has been "
-"received by your contact"
+"If enabled, Gajim will use the System's Keyring to store account passwords."
 msgstr ""
 
 #: gajim/common/config.py:284
-msgid "Show a mini avatar in chat window tabs and in window icon"
+msgid "If enabled, Gajim will execute XEP-0146 Commands."
 msgstr ""
 
 #: gajim/common/config.py:285
-msgid "If true, Gajim will use the Systems Keyring to store account passwords."
+msgid "2: System, 1: Enabled, 0: Disabled"
 msgstr ""
 
 #: gajim/common/config.py:286
-msgid "If true, Gajim will execute XEP-0146 Commands."
+msgid "Options in days which can be chosen in the sync threshold menu"
 msgstr ""
 
 #: gajim/common/config.py:287
-msgid "2: System, 1: Enabled, 0: Disabled"
+msgid ""
+"Maximum history in days we request from a public group chat archive. 0: As "
+"much as possible."
 msgstr ""
 
 #: gajim/common/config.py:288
-msgid "Options in days which can be chosen in the sync threshold menu"
+msgid ""
+"Maximum history in days we request from a private group chat archive. 0: As "
+"much as possible."
 msgstr ""
 
 #: gajim/common/config.py:289
 msgid ""
-"Maximum history in days we request from a public room archive. 0: As much as "
-"possible"
+"If enabled, Gajim shows the group chat subject in the chat window when "
+"joining."
 msgstr ""
 
 #: gajim/common/config.py:290
+#, fuzzy
 msgid ""
-"Maximum history in days we request from a private room archive. 0: As much "
-"as possible"
-msgstr ""
+"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:291
-msgid "If the room subject is shown in chat on join"
-msgstr ""
+#, 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:292
+#, fuzzy
 msgid ""
-"If the contact row is colored according to the current chatstate of the "
-"contact"
-msgstr ""
+"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:293
-msgid "If the tab is colored according to the current chatstate of the contact"
-msgstr ""
-
-#: gajim/common/config.py:294
-msgid ""
-"Shows a text in the banner that describes the current chatstate of the "
-"contact"
-msgstr ""
-
-#: gajim/common/config.py:295 gajim/common/config.py:424
 #, fuzzy
 msgid ""
 "Chat state notifications that are sent to contacts. Possible values: all, "
@@ -3746,308 +3744,333 @@ msgstr ""
 "Bidali txat elkarrizketaren egoera. All, composing_only edo disabled izan "
 "daiteke. "
 
-#: gajim/common/config.py:296 gajim/common/config.py:438
+#: gajim/common/config.py:294
 #, fuzzy
 msgid ""
 "Chat state notifications that are sent to the group chat. Possible values: "
-"all, composing_only, disabled"
+"'all', 'composing_only', 'disabled'"
 msgstr ""
 "Bidali txat elkarrizketaren egoera. All, composing_only edo disabled izan "
 "daiteke. "
 
-#: gajim/common/config.py:312
+#: gajim/common/config.py:297
+msgid "API Preferences. Possible values: 'http', 'iq'"
+msgstr ""
+
+#: gajim/common/config.py:313
+#, fuzzy
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
-"defined in autopriority_* options."
+"defined in 'autopriority_*' options."
 msgstr ""
 "Lehentasuna zure egoeraren arabera aldatuko da. Lehentasunak autopriority_* "
 "aukeran ezarriak daude."
 
-#: gajim/common/config.py:320
+#: gajim/common/config.py:321
 msgid ""
-"Status used to autoconnect as. Can be online, chat, away, xa, dnd, "
-"invisible. NOTE: this option is used only if restore_last_status is disabled"
+"Status to be used automatically when connecting. Can be 'online', 'chat', "
+"'away', 'xa', 'dnd' or 'invisible'. NOTE: This option is used only if "
+"'restore_last_status' is disabled."
 msgstr ""
 
-#: gajim/common/config.py:321
-msgid "If enabled, restore the last status that was used."
+#: gajim/common/config.py:322
+msgid "If enabled, the last status will be restored."
 msgstr ""
 
-#: gajim/common/config.py:322
+#: gajim/common/config.py:323
 msgid ""
-"If true, Contacts requesting authorization will be automatically accepted."
+"If enabled, Contacts requesting authorization will be accepted automatically."
 msgstr ""
 
-#: gajim/common/config.py:323
+#: gajim/common/config.py:324
 #, fuzzy
 msgid ""
-"If False, this account will be disabled and will not appear in roster window."
+"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:327
-msgid "Allow plaintext connections"
+#: gajim/common/config.py:328
+msgid "Allow plaintext connections."
 msgstr ""
 
-#: gajim/common/config.py:330
+#: gajim/common/config.py:331
 msgid ""
-"List (space separated) of authentication mechanisms to try. Can contain "
-"ANONYMOUS, EXTERNAL, GSSAPI, SCRAM-SHA-1-PLUS, SCRAM-SHA-1, DIGEST-MD5, "
-"PLAIN, X-MESSENGER-OAUTH2 or XEP-0078"
+"List of authentication mechanisms to try (space separated). Can contain "
+"'ANONYMOUS', 'EXTERNAL', 'GSSAPI', 'SCRAM-SHA-1-PLUS', 'SCRAM-SHA-1', "
+"'DIGEST-MD5', 'PLAIN', 'X-MESSENGER-OAUTH2' or 'XEP-0078'."
 msgstr ""
 
-#: gajim/common/config.py:331
+#: gajim/common/config.py:332
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection. "
-"Can be 'warn', 'connect', 'disconnect'"
+"Can be 'warn', 'connect' or 'disconnect'."
 msgstr ""
 
-#: gajim/common/config.py:332
+#: gajim/common/config.py:333
 msgid "Show a warning dialog before using standard SSL library."
 msgstr ""
 
-#: gajim/common/config.py:333
+#: gajim/common/config.py:334
 msgid ""
 "Show a warning dialog before sending PLAIN password over a plain connection."
 msgstr ""
 
-#: gajim/common/config.py:334
-msgid "Space separated list of ssl errors to ignore."
+#: gajim/common/config.py:335
+msgid "List of SSL errors to ignore (space separated)."
 msgstr ""
 
-#: gajim/common/config.py:340
+#: gajim/common/config.py:341
 msgid ""
-"Space separated list of JIDs for which you do not want to store logs. You "
-"can also add account name to log nothing for this account."
+"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:341
+#: gajim/common/config.py:342
 msgid ""
-"Space separated list of JIDs for which you accept to not log conversations "
-"if he does not want to."
+"List of XMPP Addresses (space separated) for which you accept to not store "
+"chat history if your contact does not want to."
 msgstr ""
 
-#: gajim/common/config.py:343
-msgid "Whitespace sent after inactivity"
+#: gajim/common/config.py:344
+msgid "If enabled, a whitespace is sent after inactivity (keep alive)."
 msgstr ""
 
-#: gajim/common/config.py:344
-msgid "XMPP ping sent after inactivity"
+#: gajim/common/config.py:345
+msgid "If enabled, an XMPP ping is sent after inactivity (ping alive)."
 msgstr ""
 
-#: gajim/common/config.py:348
+#: gajim/common/config.py:349
 msgid ""
-"How many seconds to wait for the answer of ping alive packet before trying "
-"to reconnect?"
+"How many seconds to wait for the answer of a ping alive packet before trying "
+"to reconnect."
 msgstr ""
 
-#: gajim/common/config.py:352
-msgid "Jabberd2 workaround"
+#: gajim/common/config.py:353
+#, fuzzy
+msgid "Jabberd2 workaround."
 msgstr "Jabberd2 workaround"
 
-#: gajim/common/config.py:355
+#: gajim/common/config.py:356
+#, fuzzy
 msgid ""
-"If checked, Gajim will use your IP and proxies defined in "
-"file_transfer_proxies option for file transfer."
+"If enabled, Gajim will use your IP and proxies defined in "
+"'file_transfer_proxies' option for file transfers."
 msgstr ""
 "Hautatuta badago, Gajim-ek zure IP eta definituriko proxy-ak erabiliko ditu "
 "file_transfer_proxies-en  fitxero transferentziarako."
 
-#: gajim/common/config.py:356
+#: gajim/common/config.py:357
 msgid ""
-"If true, Gajim will test file transfer proxies on startup to be sure it "
-"works. Openfire's proxies are known to fail this test even if they work."
+"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:369
-msgid "Answer to receipt requests"
+#: gajim/common/config.py:370
+msgid "If enabled, Gajim will answer to message receipt requests."
 msgstr ""
 
-#: gajim/common/config.py:370
-msgid "Sent receipt requests"
+#: gajim/common/config.py:371
+msgid "If enabled, Gajim will send message receipt requests."
 msgstr ""
 
-#: gajim/common/config.py:379
+#: gajim/common/config.py:380
 #, 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:380
+#: gajim/common/config.py:381
 #, fuzzy
 msgid "Allow Gajim to send your local time."
 msgstr "%s fitxero bat bidali nahi dizu"
 
-#: gajim/common/config.py:383
+#: gajim/common/config.py:384
 #, fuzzy
-msgid "Message that is sent to contacts you want to add"
+msgid "Message that is sent to contacts you want to add."
 msgstr "Mesedez bete sartu nahi duzun kontaktuaren informazioa"
 
-#: gajim/common/config.py:384
-msgid ""
-"If enabled, Gajim will send your local IPs so your contact can connect to "
-"your machine to transfer files."
-msgstr ""
-
 #: gajim/common/config.py:385
+#, fuzzy
 msgid ""
-"Space separated list of JIDs for which chat window will be re-opened on next "
-"startup."
+"If enabled, Gajim will send your local IP so your contact can connect to "
+"your machine for file transfers."
 msgstr ""
+"Hautatuta badago, Gajim-ek zure IP eta definituriko proxy-ak erabiliko ditu "
+"file_transfer_proxies-en  fitxero transferentziarako."
 
-#: gajim/common/config.py:387
-msgid "HTTP Upload: Enable HTTPS Verification"
+#: gajim/common/config.py:386
+msgid ""
+"List of XMPP Addresses (space separated) for which the chat window will be "
+"re-opened on next startup."
 msgstr ""
 
 #: gajim/common/config.py:388
-msgid ""
-"Preferred file transfer mechanism for file drag&drop on chat window. Can be "
-"'httpupload' (default) or 'jingle'"
+msgid "HTTP File Upload: Enable HTTPS Verification."
 msgstr ""
 
 #: gajim/common/config.py:389
-msgid "Allow cert verification with POSH"
+msgid ""
+"Preferred file transfer mechanism for file drag&drop on a chat window. Can "
+"be 'httpupload' (default) or 'jingle'."
 msgstr ""
 
-#: gajim/common/config.py:423 gajim/common/config.py:430
+#: gajim/common/config.py:390
 #, fuzzy
-msgid "Language for which misspelled words will be checked"
-msgstr "Zuzentzeko erabili nahi dugun hizkuntza"
-
-#: gajim/common/config.py:427
-msgid "The currently active encryption for that contact"
-msgstr ""
+msgid "Allow certificate verification with POSH."
+msgstr "Jakinarazketa Berezia Gehitzen %s-entzat"
 
-#: gajim/common/config.py:431
+#: gajim/common/config.py:425
+#, fuzzy
 msgid ""
-"How many lines to request from server when entering a groupchat. -1 means no "
-"limit, -2 means global value"
+"Chat state notifications that are sent to contacts. Possible values: 'all', "
+"'composing_only', 'disabled'"
 msgstr ""
+"Bidali txat elkarrizketaren egoera. All, composing_only edo disabled izan "
+"daiteke. "
+
+#: gajim/common/config.py:428
+#, fuzzy
+msgid "The currently active encryption for that contact."
+msgstr "OpenPGP aktibatu al dago kontu honetarako?"
 
 #: gajim/common/config.py:432
 msgid ""
-"Minutes of backlog to request when entering a groupchat. -1 means no limit, "
-"-2 means global value"
+"If enabled, a notification is created for every message in this group chat."
 msgstr ""
 
 #: gajim/common/config.py:433
-msgid "State whether a notification is created for every message in this room"
-msgstr ""
-
-#: gajim/common/config.py:434
+#, fuzzy
 msgid ""
-"Show a status message for all status (away, dnd, etc.) changes of users in a "
-"group chat"
-msgstr ""
+"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:435
+#: gajim/common/config.py:434
 #, fuzzy
-msgid "Show a status message for every join or leave in a group chat"
+msgid "Show a status message for every join or leave in a group chat."
 msgstr "Ezin da gela honetara sartu"
 
+#: gajim/common/config.py:435
+msgid ""
+"If enabled, the group chat is minimized into the contact list when joining "
+"automatically."
+msgstr ""
+
 #: gajim/common/config.py:436
-msgid "If the group chat is minimized into the roster on autojoin"
+msgid ""
+"If enabled, the group chat is minimized into the contact list when closing "
+"it."
 msgstr ""
 
 #: gajim/common/config.py:437
-msgid "If the group chat is minimized into the roster on close"
+#, fuzzy
+msgid ""
+"Chat state notifications that are sent to the group chat. Possible values: "
+"'all', 'composing_only' or 'disabled'."
 msgstr ""
+"Bidali txat elkarrizketaren egoera. All, composing_only edo disabled izan "
+"daiteke. "
 
-#: gajim/common/config.py:441
+#: gajim/common/config.py:440
 msgid ""
-"State whether plugins should be activated on startup (this is saved on Gajim "
-"exit). This option SHOULD NOT be used to (de)activate plug-ins. Use GUI "
-"instead."
+"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:446 gajim/common/const.py:281
+#: gajim/common/config.py:445 gajim/common/const.py:315
 msgid "Sleeping"
 msgstr "Lotan"
 
-#: gajim/common/config.py:447
+#: gajim/common/config.py:446
 msgid "Back soon"
 msgstr "Laster etorriko naiz"
 
-#: gajim/common/config.py:447
+#: gajim/common/config.py:446
 msgid "Back in some minutes."
 msgstr "Minutu batzuk barru berriro hemen."
 
-#: gajim/common/config.py:448 gajim/common/const.py:247
+#: gajim/common/config.py:447 gajim/common/const.py:281
 msgid "Eating"
 msgstr "Jaten"
 
-#: gajim/common/config.py:448
-msgid "I'm eating, so leave me a message."
-msgstr "Jaten ari naiz, utzi mezu bat beraz."
+#: gajim/common/config.py:447
+#, fuzzy
+msgid "I'm eating."
+msgstr "Lanean ari naiz."
 
-#: gajim/common/config.py:449
+#: gajim/common/config.py:448
 msgid "Movie"
 msgstr "Filmea"
 
-#: gajim/common/config.py:449
+#: gajim/common/config.py:448
 msgid "I'm watching a movie."
 msgstr "Filma bat ikustean ari naiz."
 
-#: gajim/common/config.py:450 gajim/common/const.py:314
+#: gajim/common/config.py:449 gajim/common/const.py:348
 msgid "Working"
 msgstr "Lanean"
 
-#: gajim/common/config.py:450
+#: gajim/common/config.py:449
 msgid "I'm working."
 msgstr "Lanean ari naiz."
 
-#: gajim/common/config.py:451
+#: gajim/common/config.py:450
 msgid "Phone"
 msgstr "Telefonoa"
 
-#: gajim/common/config.py:451
+#: gajim/common/config.py:450
 msgid "I'm on the phone."
 msgstr "Telefonoan nago."
 
-#: gajim/common/config.py:452
+#: gajim/common/config.py:451
 msgid "Out"
 msgstr "kanpoan"
 
-#: gajim/common/config.py:452
+#: gajim/common/config.py:451
 msgid "I'm out enjoying life."
 msgstr "Kanpoan naiz bizitza disfrutatzen."
 
-#: gajim/common/config.py:463
+#: gajim/common/config.py:462
 msgid "I'm available."
 msgstr "Libre."
 
-#: gajim/common/config.py:464
+#: gajim/common/config.py:463
 msgid "I'm free for chat."
 msgstr "Libre Hitz Egiteko."
 
-#: gajim/common/config.py:465 gajim/gtk/accounts.py:134
+#: gajim/common/config.py:464 gajim/gtk/accounts.py:133
 msgid "Be right back."
 msgstr "Be right back."
 
-#: gajim/common/config.py:466
+#: gajim/common/config.py:465
 msgid "I'm not available."
 msgstr "Ez Erabilgarri."
 
-#: gajim/common/config.py:467
+#: gajim/common/config.py:466
 msgid "Do not disturb."
 msgstr "Ez nahasi."
 
-#: gajim/common/config.py:468 gajim/common/config.py:469
+#: gajim/common/config.py:467 gajim/common/config.py:468
 msgid "Bye!"
 msgstr "Agur!"
 
-#: gajim/common/config.py:480
+#: gajim/common/config.py:479
+#, fuzzy
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
-"muc_highlight_words, or when a group chat message contains your nickname."
+"'muc_highlight_words' your nickname is mentioned."
 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:481
-msgid "Sound to play when any MUC message arrives."
+#: gajim/common/config.py:480
+#, fuzzy
+msgid "Sound to play when any group chat message arrives."
 msgstr "Soinu bat ezarri MUC-eko edozein mezu iristean."
 
-#: gajim/common/config.py:485
+#: gajim/common/config.py:484
 #, fuzzy
 msgid "Tor"
 msgstr "Norentzat"
@@ -4057,948 +4080,1044 @@ msgstr "Norentzat"
 msgid "Error: cannot open %s for reading"
 msgstr "Errorea: ezin da %s ireki irakurtzeko"
 
-#: gajim/common/const.py:214
+#: gajim/common/const.py:216
+#, fuzzy
+msgid "?Group chat name:Team"
+msgstr "Inor ez"
+
+#: gajim/common/const.py:217
+msgid "?Group chat description:Project discussion"
+msgstr ""
+
+#: gajim/common/const.py:218
+#, fuzzy
+msgid "?Group chat address:team"
+msgstr "Txat Taldeak"
+
+#: gajim/common/const.py:219
+#, fuzzy
+msgid "?Group chat name:Family"
+msgstr "Txat Taldeko Mezu Nabarmendua"
+
+#: gajim/common/const.py:220
+msgid "?Group chat description:Spring gathering"
+msgstr ""
+
+#: gajim/common/const.py:221
+msgid "?Group chat address:family"
+msgstr ""
+
+#: gajim/common/const.py:222
+#, fuzzy
+msgid "?Group chat name:Vacation"
+msgstr "Txat Taldeko Gonbidapena"
+
+#: gajim/common/const.py:223
+msgid "?Group chat description:Trip planning"
+msgstr ""
+
+#: gajim/common/const.py:224
+#, fuzzy
+msgid "?Group chat address:vacation"
+msgstr "Txat Taldeko Gonbidapena"
+
+#: gajim/common/const.py:225
+#, fuzzy
+msgid "?Group chat name:Repairs"
+msgstr "Txat Taldea"
+
+#: gajim/common/const.py:226
+msgid "?Group chat description:Local help group"
+msgstr ""
+
+#: gajim/common/const.py:227
+#, fuzzy
+msgid "?Group chat address:repairs"
+msgstr "Txat Taldeak"
+
+#: gajim/common/const.py:228
+#, fuzzy
+msgid "?Group chat name:News"
+msgstr "Inor ez"
+
+#: gajim/common/const.py:229
+#, fuzzy
+msgid "?Group chat description:Local news and reports"
+msgstr "Gela sortzea mugatua dago."
+
+#: gajim/common/const.py:230
+#, fuzzy
+msgid "?Group chat address:news"
+msgstr "Txat Taldea Berria"
+
+#: gajim/common/const.py:235
+#, fuzzy
+msgid "Remote server not found"
+msgstr "Zerbitzua ezin izan da aurkitu"
+
+#: gajim/common/const.py:236
+msgid "Remote server timeout"
+msgstr ""
+
+#: gajim/common/const.py:237 gajim/common/const.py:238
+#: gajim/common/const.py:239
+#, fuzzy
+msgid "Address does not belong to a group chat server"
+msgstr "Hau ez da txat talde bat"
+
+#: gajim/common/const.py:240
+#, fuzzy
+msgid "Group chat already exists"
+msgstr "Kontu izena jadanik badago"
+
+#: gajim/common/const.py:241
+#, fuzzy
+msgid "Group chat does not exist"
+msgstr "Honako gela honek ez du existitzen."
+
+#: gajim/common/const.py:247
 msgid "This message was encrypted with OTR and could not be decrypted."
 msgstr ""
 
-#: gajim/common/const.py:217
+#: gajim/common/const.py:250
 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:221
+#: gajim/common/const.py:254
 msgid ""
-"This message was encrypted with OpenPGP for XMPP and could not be decrypted."
+"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:224
+#: gajim/common/const.py:258
 #, python-format
 msgid "This message was encrypted with %s and could not be decrypted."
 msgstr ""
 
-#: gajim/common/const.py:231
+#: gajim/common/const.py:265
 #, fuzzy
 msgid "Doing Chores"
 msgstr "Host okerra"
 
-#: gajim/common/const.py:232
+#: gajim/common/const.py:266
 msgid "Buying Groceries"
 msgstr ""
 
-#: gajim/common/const.py:233
+#: gajim/common/const.py:267
 #, fuzzy
 msgid "Cleaning"
 msgstr "Arratsaldea"
 
-#: gajim/common/const.py:234
+#: gajim/common/const.py:268
 #, fuzzy
 msgid "Cooking"
 msgstr "Sortzen"
 
-#: gajim/common/const.py:235
+#: gajim/common/const.py:269
 msgid "Doing Maintenance"
 msgstr ""
 
-#: gajim/common/const.py:236
+#: gajim/common/const.py:270
 msgid "Doing the Dishes"
 msgstr ""
 
-#: gajim/common/const.py:237
+#: gajim/common/const.py:271
 msgid "Doing the Laundry"
 msgstr ""
 
-#: gajim/common/const.py:238
+#: gajim/common/const.py:272
 #, fuzzy
 msgid "Gardening"
 msgstr "Goiza"
 
-#: gajim/common/const.py:239
+#: gajim/common/const.py:273
 msgid "Running an Errand"
 msgstr ""
 
-#: gajim/common/const.py:240
+#: gajim/common/const.py:274
 #, fuzzy
 msgid "Walking the Dog"
 msgstr "talde hontakoak"
 
-#: gajim/common/const.py:242
+#: gajim/common/const.py:276
 #, fuzzy
 msgid "Drinking"
 msgstr "Lanean"
 
-#: gajim/common/const.py:243
+#: gajim/common/const.py:277
 msgid "Having a Beer"
 msgstr ""
 
-#: gajim/common/const.py:244
+#: gajim/common/const.py:278
 msgid "Having Coffee"
 msgstr ""
 
-#: gajim/common/const.py:245
+#: gajim/common/const.py:279
 msgid "Having Tea"
 msgstr ""
 
-#: gajim/common/const.py:248
+#: gajim/common/const.py:282
 msgid "Having a Snack"
 msgstr ""
 
-#: gajim/common/const.py:249
+#: gajim/common/const.py:283
 msgid "Having Breakfast"
 msgstr ""
 
-#: gajim/common/const.py:250
+#: gajim/common/const.py:284
 msgid "Having Dinner"
 msgstr ""
 
-#: gajim/common/const.py:251
+#: gajim/common/const.py:285
 msgid "Having Lunch"
 msgstr ""
 
-#: gajim/common/const.py:253
+#: gajim/common/const.py:287
 msgid "Exercising"
 msgstr ""
 
-#: gajim/common/const.py:254 gajim/common/const.py:305
+#: gajim/common/const.py:288 gajim/common/const.py:339
 msgid "Cycling"
 msgstr ""
 
-#: gajim/common/const.py:255
+#: gajim/common/const.py:289
 #, fuzzy
 msgid "Dancing"
 msgstr "Arratsaldea"
 
-#: gajim/common/const.py:256
+#: gajim/common/const.py:290
 #, fuzzy
 msgid "Hiking"
 msgstr "Botatzen %s"
 
-#: gajim/common/const.py:257
+#: gajim/common/const.py:291
 #, fuzzy
 msgid "Jogging"
 msgstr "_Sartu"
 
-#: gajim/common/const.py:258
+#: gajim/common/const.py:292
 msgid "Playing Sports"
 msgstr ""
 
-#: gajim/common/const.py:259
+#: gajim/common/const.py:293
 msgid "Running"
 msgstr ""
 
-#: gajim/common/const.py:260
+#: gajim/common/const.py:294
 #, fuzzy
 msgid "Skiing"
 msgstr "Lanean"
 
-#: gajim/common/const.py:261
+#: gajim/common/const.py:295
 msgid "Swimming"
 msgstr ""
 
-#: gajim/common/const.py:262
+#: gajim/common/const.py:296
 #, fuzzy
 msgid "Working out"
 msgstr "Lanean"
 
-#: gajim/common/const.py:264
+#: gajim/common/const.py:298
 msgid "Grooming"
 msgstr ""
 
-#: gajim/common/const.py:265
+#: gajim/common/const.py:299
 msgid "At the Spa"
 msgstr ""
 
-#: gajim/common/const.py:266
+#: gajim/common/const.py:300
 msgid "Brushing Teeth"
 msgstr ""
 
-#: gajim/common/const.py:267
+#: gajim/common/const.py:301
 msgid "Getting a Haircut"
 msgstr ""
 
-#: gajim/common/const.py:268
+#: gajim/common/const.py:302
 #, fuzzy
 msgid "Shaving"
 msgstr "Jaten"
 
-#: gajim/common/const.py:269
+#: gajim/common/const.py:303
 msgid "Taking a Bath"
 msgstr ""
 
-#: gajim/common/const.py:270
+#: gajim/common/const.py:304
 msgid "Taking a Shower"
 msgstr ""
 
-#: gajim/common/const.py:272
+#: gajim/common/const.py:306
 msgid "Having an Appointment"
 msgstr ""
 
-#: gajim/common/const.py:274
+#: gajim/common/const.py:308
 msgid "Inactive"
 msgstr "Inaktiboa"
 
-#: gajim/common/const.py:275
+#: gajim/common/const.py:309
 msgid "Day Off"
 msgstr ""
 
-#: gajim/common/const.py:276
+#: gajim/common/const.py:310
 #, fuzzy
 msgid "Hanging out"
 msgstr "Gaia Aldatu"
 
-#: gajim/common/const.py:277
+#: gajim/common/const.py:311
 #, fuzzy
 msgid "Hiding"
 msgstr "Botatzen %s"
 
-#: gajim/common/const.py:278
+#: gajim/common/const.py:312
 msgid "On Vacation"
 msgstr ""
 
-#: gajim/common/const.py:279
+#: gajim/common/const.py:313
 #, fuzzy
 msgid "Praying"
 msgstr "Jaten"
 
-#: gajim/common/const.py:280
+#: gajim/common/const.py:314
 msgid "Scheduled Holiday"
 msgstr ""
 
-#: gajim/common/const.py:282
+#: gajim/common/const.py:316
 #, fuzzy
 msgid "Thinking"
 msgstr "Lanean"
 
-#: gajim/common/const.py:284
+#: gajim/common/const.py:318
 msgid "Relaxing"
 msgstr ""
 
-#: gajim/common/const.py:285
+#: gajim/common/const.py:319
 #, fuzzy
 msgid "Fishing"
 msgstr "Botatzen %s"
 
-#: gajim/common/const.py:286
+#: gajim/common/const.py:320
 #, fuzzy
 msgid "Gaming"
 msgstr "Jaten"
 
-#: gajim/common/const.py:287
+#: gajim/common/const.py:321
 #, fuzzy
 msgid "Going out"
 msgstr "_Deskonektatuta"
 
-#: gajim/common/const.py:288
+#: gajim/common/const.py:322
 #, fuzzy
 msgid "Partying"
 msgstr "Jaten"
 
-#: gajim/common/const.py:289
+#: gajim/common/const.py:323
 #, fuzzy
 msgid "Reading"
 msgstr "Arrazoia"
 
-#: gajim/common/const.py:290
+#: gajim/common/const.py:324
 #, fuzzy
 msgid "Rehearsing"
 msgstr "Arrazoia"
 
-#: gajim/common/const.py:291
+#: gajim/common/const.py:325
 #, fuzzy
 msgid "Shopping"
 msgstr "Lotan"
 
-#: gajim/common/const.py:292
+#: gajim/common/const.py:326
 #, fuzzy
 msgid "Smoking"
 msgstr "Lanean"
 
-#: gajim/common/const.py:293
+#: gajim/common/const.py:327
 msgid "Socializing"
 msgstr ""
 
-#: gajim/common/const.py:294
+#: gajim/common/const.py:328
 #, fuzzy
 msgid "Sunbathing"
 msgstr "Jaten"
 
-#: gajim/common/const.py:295
+#: gajim/common/const.py:329
 msgid "Watching TV"
 msgstr ""
 
-#: gajim/common/const.py:296
+#: gajim/common/const.py:330
 #, fuzzy
 msgid "Watching a Movie"
 msgstr "Filma bat ikustean ari naiz."
 
-#: gajim/common/const.py:298
+#: gajim/common/const.py:332
 #, fuzzy
 msgid "Talking"
 msgstr "Jaten"
 
-#: gajim/common/const.py:299
+#: gajim/common/const.py:333
 msgid "In Real Life"
 msgstr ""
 
-#: gajim/common/const.py:300
+#: gajim/common/const.py:334
 #, fuzzy
 msgid "On the Phone"
 msgstr "Telefonoan nago."
 
-#: gajim/common/const.py:301
+#: gajim/common/const.py:335
 msgid "On Video Phone"
 msgstr ""
 
-#: gajim/common/const.py:303
+#: gajim/common/const.py:337
 #, fuzzy
 msgid "Traveling"
 msgstr "Tranferitzen"
 
-#: gajim/common/const.py:304
+#: gajim/common/const.py:338
 #, fuzzy
 msgid "Commuting"
 msgstr "Sortzen"
 
-#: gajim/common/const.py:306
+#: gajim/common/const.py:340
 msgid "Driving"
 msgstr ""
 
-#: gajim/common/const.py:307
+#: gajim/common/const.py:341
 msgid "In a Car"
 msgstr ""
 
-#: gajim/common/const.py:308
+#: gajim/common/const.py:342
 msgid "On a Bus"
 msgstr ""
 
-#: gajim/common/const.py:309
+#: gajim/common/const.py:343
 msgid "On a Plane"
 msgstr ""
 
-#: gajim/common/const.py:310
+#: gajim/common/const.py:344
 #, fuzzy
 msgid "On a Train"
 msgstr "Ireki _lotura bezala"
 
-#: gajim/common/const.py:311
+#: gajim/common/const.py:345
 msgid "On a Trip"
 msgstr ""
 
-#: gajim/common/const.py:312
+#: gajim/common/const.py:346
 #, fuzzy
 msgid "Walking"
 msgstr "Lanean"
 
-#: gajim/common/const.py:315
+#: gajim/common/const.py:349
 #, fuzzy
 msgid "Coding"
 msgstr "Sortzen"
 
-#: gajim/common/const.py:316
+#: gajim/common/const.py:350
 msgid "In a Meeting"
 msgstr ""
 
-#: gajim/common/const.py:317
+#: gajim/common/const.py:351
 msgid "Studying"
 msgstr ""
 
-#: gajim/common/const.py:318
+#: gajim/common/const.py:352
 #, fuzzy
 msgid "Writing"
 msgstr "Lanean"
 
-#: gajim/common/const.py:321
+#: gajim/common/const.py:355
 msgid "Afraid"
 msgstr ""
 
-#: gajim/common/const.py:322
+#: gajim/common/const.py:356
 msgid "Amazed"
 msgstr ""
 
-#: gajim/common/const.py:323
+#: gajim/common/const.py:357
 msgid "Amorous"
 msgstr ""
 
-#: gajim/common/const.py:324
+#: gajim/common/const.py:358
 msgid "Angry"
 msgstr ""
 
-#: gajim/common/const.py:325
+#: gajim/common/const.py:359
 msgid "Annoyed"
 msgstr ""
 
-#: gajim/common/const.py:326
+#: gajim/common/const.py:360
 msgid "Anxious"
 msgstr ""
 
-#: gajim/common/const.py:327
+#: gajim/common/const.py:361
 #, fuzzy
 msgid "Aroused"
 msgstr "Etena"
 
-#: gajim/common/const.py:328
+#: gajim/common/const.py:362
 msgid "Ashamed"
 msgstr ""
 
-#: gajim/common/const.py:329
+#: gajim/common/const.py:363
 #, fuzzy
 msgid "Bored"
 msgstr "Negrita"
 
-#: gajim/common/const.py:330
+#: gajim/common/const.py:364
 #, fuzzy
 msgid "Brave"
 msgstr "daukadanean"
 
-#: gajim/common/const.py:331
+#: gajim/common/const.py:365
 msgid "Calm"
 msgstr ""
 
-#: gajim/common/const.py:332
+#: gajim/common/const.py:366
 #, fuzzy
 msgid "Cautious"
 msgstr "Txat-ak"
 
-#: gajim/common/const.py:333
+#: gajim/common/const.py:367
 #, fuzzy
 msgid "Cold"
 msgstr "Negrita"
 
-#: gajim/common/const.py:334
+#: gajim/common/const.py:368
 #, fuzzy
 msgid "Confident"
 msgstr "_Edukiak"
 
-#: gajim/common/const.py:335
+#: gajim/common/const.py:369
 msgid "Confused"
 msgstr ""
 
-#: gajim/common/const.py:336
+#: gajim/common/const.py:370
 #, fuzzy
 msgid "Contemplative"
 msgstr "Osatua"
 
-#: gajim/common/const.py:337
+#: gajim/common/const.py:371
 #, fuzzy
 msgid "Contented"
 msgstr "_Edukiak"
 
-#: gajim/common/const.py:338
+#: gajim/common/const.py:372
 msgid "Cranky"
 msgstr ""
 
-#: gajim/common/const.py:339
+#: gajim/common/const.py:373
 msgid "Crazy"
 msgstr ""
 
-#: gajim/common/const.py:340
+#: gajim/common/const.py:374
 #, fuzzy
 msgid "Creative"
 msgstr "Inaktiboa"
 
-#: gajim/common/const.py:341
+#: gajim/common/const.py:375
 msgid "Curious"
 msgstr ""
 
-#: gajim/common/const.py:342
+#: gajim/common/const.py:376
 #, fuzzy
 msgid "Dejected"
 msgstr "Ezabatu"
 
-#: gajim/common/const.py:343
+#: gajim/common/const.py:377
 msgid "Depressed"
 msgstr ""
 
-#: gajim/common/const.py:344
+#: gajim/common/const.py:378
 #, fuzzy
 msgid "Disappointed"
 msgstr "Ezindu"
 
-#: gajim/common/const.py:345
+#: gajim/common/const.py:379
 msgid "Disgusted"
 msgstr ""
 
-#: gajim/common/const.py:346
+#: gajim/common/const.py:380
 #, fuzzy
 msgid "Dismayed"
 msgstr "Ezindu"
 
-#: gajim/common/const.py:347
+#: gajim/common/const.py:381
 #, fuzzy
 msgid "Distracted"
 msgstr "Ezindu"
 
-#: gajim/common/const.py:348
+#: gajim/common/const.py:382
 msgid "Embarrassed"
 msgstr ""
 
-#: gajim/common/const.py:349
+#: gajim/common/const.py:383
 msgid "Envious"
 msgstr ""
 
-#: gajim/common/const.py:350
+#: gajim/common/const.py:384
 msgid "Excited"
 msgstr ""
 
-#: gajim/common/const.py:351
+#: gajim/common/const.py:385
 msgid "Flirtatious"
 msgstr ""
 
-#: gajim/common/const.py:352
+#: gajim/common/const.py:386
 msgid "Frustrated"
 msgstr ""
 
-#: gajim/common/const.py:353
+#: gajim/common/const.py:387
 msgid "Grateful"
 msgstr ""
 
-#: gajim/common/const.py:354
+#: gajim/common/const.py:388
 msgid "Grieving"
 msgstr ""
 
-#: gajim/common/const.py:355
+#: gajim/common/const.py:389
 #, fuzzy
 msgid "Grumpy"
 msgstr "Taldea"
 
-#: gajim/common/const.py:356
+#: gajim/common/const.py:390
 msgid "Guilty"
 msgstr ""
 
-#: gajim/common/const.py:357
+#: gajim/common/const.py:391
 msgid "Happy"
 msgstr ""
 
-#: gajim/common/const.py:358
+#: gajim/common/const.py:392
 msgid "Hopeful"
 msgstr ""
 
-#: gajim/common/const.py:359
+#: gajim/common/const.py:393
 #, fuzzy
 msgid "Hot"
 msgstr "_Host-a"
 
-#: gajim/common/const.py:360
+#: gajim/common/const.py:394
 msgid "Humbled"
 msgstr ""
 
-#: gajim/common/const.py:361
+#: gajim/common/const.py:395
 msgid "Humiliated"
 msgstr ""
 
-#: gajim/common/const.py:362
+#: gajim/common/const.py:396
 msgid "Hungry"
 msgstr ""
 
-#: gajim/common/const.py:363
+#: gajim/common/const.py:397
 msgid "Hurt"
 msgstr ""
 
-#: gajim/common/const.py:364
+#: gajim/common/const.py:398
 #, fuzzy
 msgid "Impressed"
 msgstr "mezua"
 
-#: gajim/common/const.py:365
+#: gajim/common/const.py:399
 msgid "In Awe"
 msgstr ""
 
-#: gajim/common/const.py:366
+#: gajim/common/const.py:400
 msgid "In Love"
 msgstr ""
 
-#: gajim/common/const.py:367
+#: gajim/common/const.py:401
 msgid "Indignant"
 msgstr ""
 
-#: gajim/common/const.py:368
+#: gajim/common/const.py:402
 msgid "Interested"
 msgstr ""
 
-#: gajim/common/const.py:369
+#: gajim/common/const.py:403
 msgid "Intoxicated"
 msgstr ""
 
-#: gajim/common/const.py:370
+#: gajim/common/const.py:404
 #, fuzzy
 msgid "Invincible"
 msgstr "Ikusezin"
 
-#: gajim/common/const.py:371
+#: gajim/common/const.py:405
 msgid "Jealous"
 msgstr ""
 
-#: gajim/common/const.py:372
+#: gajim/common/const.py:406
 #, fuzzy
 msgid "Lonely"
 msgstr "bat"
 
-#: gajim/common/const.py:373
+#: gajim/common/const.py:407
 #, fuzzy
 msgid "Lost"
 msgstr "_Host-a"
 
-#: gajim/common/const.py:374
+#: gajim/common/const.py:408
 msgid "Lucky"
 msgstr ""
 
-#: gajim/common/const.py:375
+#: gajim/common/const.py:409
 #, fuzzy
 msgid "Mean"
 msgstr "Alemaniera"
 
-#: gajim/common/const.py:376
+#: gajim/common/const.py:410
 #, fuzzy
 msgid "Moody"
 msgstr "_Eraldatu"
 
-#: gajim/common/const.py:377
+#: gajim/common/const.py:411
 msgid "Nervous"
 msgstr ""
 
-#: gajim/common/const.py:378
+#: gajim/common/const.py:412
 msgid "Neutral"
 msgstr ""
 
-#: gajim/common/const.py:379
+#: gajim/common/const.py:413
 #, fuzzy
 msgid "Offended"
 msgstr "Deskonektatuta"
 
-#: gajim/common/const.py:380
+#: gajim/common/const.py:414
 msgid "Outraged"
 msgstr ""
 
-#: gajim/common/const.py:381
+#: gajim/common/const.py:415
 msgid "Playful"
 msgstr ""
 
-#: gajim/common/const.py:382
+#: gajim/common/const.py:416
 #, fuzzy
 msgid "Proud"
 msgstr "Taldea"
 
-#: gajim/common/const.py:383
+#: gajim/common/const.py:417
 msgid "Relaxed"
 msgstr ""
 
-#: gajim/common/const.py:384
+#: gajim/common/const.py:418
 #, fuzzy
 msgid "Relieved"
 msgstr "hamaika"
 
-#: gajim/common/const.py:385
+#: gajim/common/const.py:419
 msgid "Remorseful"
 msgstr ""
 
-#: gajim/common/const.py:386
+#: gajim/common/const.py:420
 msgid "Restless"
 msgstr ""
 
-#: gajim/common/const.py:387
+#: gajim/common/const.py:421
 #, fuzzy
 msgid "Sad"
 msgstr "Stalled"
 
-#: gajim/common/const.py:388
+#: gajim/common/const.py:422
 msgid "Sarcastic"
 msgstr ""
 
-#: gajim/common/const.py:389
+#: gajim/common/const.py:423
 #, fuzzy
 msgid "Satisfied"
 msgstr "Azken Eraldaketa:"
 
-#: gajim/common/const.py:390
+#: gajim/common/const.py:424
 msgid "Serious"
 msgstr ""
 
-#: gajim/common/const.py:391
+#: gajim/common/const.py:425
 msgid "Shocked"
 msgstr ""
 
-#: gajim/common/const.py:392
+#: gajim/common/const.py:426
 msgid "Shy"
 msgstr ""
 
-#: gajim/common/const.py:393
+#: gajim/common/const.py:427
 #, fuzzy
 msgid "Sick"
 msgstr "Izengoitia"
 
-#: gajim/common/const.py:394
+#: gajim/common/const.py:428
 #, fuzzy
 msgid "Sleepy"
 msgstr "Lotan"
 
-#: gajim/common/const.py:395
+#: gajim/common/const.py:429
 msgid "Spontaneous"
 msgstr ""
 
-#: gajim/common/const.py:396
+#: gajim/common/const.py:430
 #, fuzzy
 msgid "Stressed"
 msgstr "Kalea:"
 
-#: gajim/common/const.py:397
+#: gajim/common/const.py:431
 msgid "Strong"
 msgstr ""
 
-#: gajim/common/const.py:398
+#: gajim/common/const.py:432
 #, fuzzy
 msgid "Surprised"
 msgstr "Harpidetu"
 
-#: gajim/common/const.py:399
+#: gajim/common/const.py:433
 msgid "Thankful"
 msgstr ""
 
-#: gajim/common/const.py:400
+#: gajim/common/const.py:434
 msgid "Thirsty"
 msgstr ""
 
-#: gajim/common/const.py:401
+#: gajim/common/const.py:435
 #, fuzzy
 msgid "Tired"
 msgstr "Denbora"
 
-#: gajim/common/const.py:402
+#: gajim/common/const.py:436
 #, fuzzy
 msgid "Undefined"
 msgstr "bederatzi"
 
-#: gajim/common/const.py:403
+#: gajim/common/const.py:437
 msgid "Weak"
 msgstr ""
 
-#: gajim/common/const.py:404
+#: gajim/common/const.py:438
 msgid "Worried"
 msgstr ""
 
-#: gajim/common/const.py:408
+#: gajim/common/const.py:442
 msgid "accuracy"
 msgstr ""
 
-#: gajim/common/const.py:409
+#: gajim/common/const.py:443
 #, fuzzy
 msgid "alt"
 msgstr "Berezkoa"
 
-#: gajim/common/const.py:410
+#: gajim/common/const.py:444
 msgid "area"
 msgstr ""
 
-#: gajim/common/const.py:411
+#: gajim/common/const.py:445
 #, fuzzy
 msgid "bearing"
 msgstr "arrantzale"
 
-#: gajim/common/const.py:412
+#: gajim/common/const.py:446
 #, fuzzy
 msgid "building"
 msgstr "Botatzen %s"
 
-#: gajim/common/const.py:413
+#: gajim/common/const.py:447
 #, fuzzy
 msgid "country"
 msgstr "Estatua:"
 
-#: gajim/common/const.py:414
+#: gajim/common/const.py:448
 #, fuzzy
 msgid "countrycode"
 msgstr "Kontua"
 
-#: gajim/common/const.py:415
+#: gajim/common/const.py:449
 msgid "datum"
 msgstr ""
 
-#: gajim/common/const.py:416
+#: gajim/common/const.py:450
 #, fuzzy
 msgid "description"
 msgstr "Deskribapena"
 
-#: gajim/common/const.py:417
+#: gajim/common/const.py:451
 #, fuzzy
 msgid "error"
 msgstr "Avahi error"
 
-#: gajim/common/const.py:418
+#: gajim/common/const.py:452
 msgid "floor"
 msgstr ""
 
-#: gajim/common/const.py:419
+#: gajim/common/const.py:453
 msgid "lat"
 msgstr ""
 
-#: gajim/common/const.py:420
+#: gajim/common/const.py:454
 msgid "locality"
 msgstr ""
 
-#: gajim/common/const.py:421
+#: gajim/common/const.py:455
 #, fuzzy
 msgid "lon"
 msgstr "bat"
 
-#: gajim/common/const.py:422
+#: gajim/common/const.py:456
 msgid "postalcode"
 msgstr ""
 
-#: gajim/common/const.py:423
+#: gajim/common/const.py:457
 msgid "region"
 msgstr ""
 
-#: gajim/common/const.py:424
+#: gajim/common/const.py:458
 #, fuzzy
 msgid "room"
 msgstr "-etik"
 
-#: gajim/common/const.py:425
+#: gajim/common/const.py:459
 msgid "speed"
 msgstr ""
 
-#: gajim/common/const.py:426
+#: gajim/common/const.py:460
 msgid "street"
 msgstr ""
 
-#: gajim/common/const.py:427
+#: gajim/common/const.py:461
 msgid "text"
 msgstr ""
 
-#: gajim/common/const.py:428
+#: gajim/common/const.py:462
 msgid "timestamp"
 msgstr ""
 
-#: gajim/common/const.py:429
+#: gajim/common/const.py:463
 msgid "URI"
 msgstr ""
 
-#: gajim/common/const.py:434
+#: gajim/common/const.py:468
 msgid "Unable to get issuer certificate"
 msgstr ""
 
-#: gajim/common/const.py:435
+#: gajim/common/const.py:469
 msgid "Unable to get certificate CRL"
 msgstr ""
 
-#: gajim/common/const.py:436
+#: gajim/common/const.py:470
 msgid "Unable to decrypt certificate's signature"
 msgstr ""
 
-#: gajim/common/const.py:437
+#: gajim/common/const.py:471
 msgid "Unable to decrypt CRL's signature"
 msgstr ""
 
-#: gajim/common/const.py:438
+#: gajim/common/const.py:472
 #, fuzzy
 msgid "Unable to decode issuer public key"
 msgstr "Ez izan da idle modulua kargatu"
 
-#: gajim/common/const.py:439
+#: gajim/common/const.py:473
 msgid "Certificate signature failure"
 msgstr ""
 
-#: gajim/common/const.py:440
+#: gajim/common/const.py:474
 msgid "CRL signature failure"
 msgstr ""
 
-#: gajim/common/const.py:441
+#: gajim/common/const.py:475
 msgid "Certificate is not yet valid"
 msgstr ""
 
-#: gajim/common/const.py:442
+#: gajim/common/const.py:476
 msgid "Certificate has expired"
 msgstr ""
 
-#: gajim/common/const.py:443
+#: gajim/common/const.py:477
 msgid "CRL is not yet valid"
 msgstr ""
 
-#: gajim/common/const.py:444
+#: gajim/common/const.py:478
 msgid "CRL has expired"
 msgstr ""
 
-#: gajim/common/const.py:445
+#: gajim/common/const.py:479
 msgid "Format error in certificate's notBefore field"
 msgstr ""
 
-#: gajim/common/const.py:446
+#: gajim/common/const.py:480
 msgid "Format error in certificate's notAfter field"
 msgstr ""
 
-#: gajim/common/const.py:447
+#: gajim/common/const.py:481
 msgid "Format error in CRL's lastUpdate field"
 msgstr ""
 
-#: gajim/common/const.py:448
+#: gajim/common/const.py:482
 msgid "Format error in CRL's nextUpdate field"
 msgstr ""
 
-#: gajim/common/const.py:449
+#: gajim/common/const.py:483
 msgid "Out of memory"
 msgstr ""
 
-#: gajim/common/const.py:450
+#: gajim/common/const.py:484
 msgid "Self signed certificate"
 msgstr ""
 
-#: gajim/common/const.py:451
+#: gajim/common/const.py:485
 msgid "Self signed certificate in certificate chain"
 msgstr ""
 
-#: gajim/common/const.py:452
+#: gajim/common/const.py:486
 msgid "Unable to get local issuer certificate"
 msgstr ""
 
-#: gajim/common/const.py:453
+#: gajim/common/const.py:487
 msgid "Unable to verify the first certificate"
 msgstr ""
 
-#: gajim/common/const.py:454
+#: gajim/common/const.py:488
 msgid "Certificate chain too long"
 msgstr ""
 
-#: gajim/common/const.py:455
+#: gajim/common/const.py:489
 msgid "Certificate revoked"
 msgstr ""
 
-#: gajim/common/const.py:456
+#: gajim/common/const.py:490
 #, fuzzy
 msgid "Invalid CA certificate"
 msgstr "Baliogabeko izena"
 
-#: gajim/common/const.py:457
+#: gajim/common/const.py:491
 msgid "Path length constraint exceeded"
 msgstr ""
 
-#: gajim/common/const.py:458
+#: gajim/common/const.py:492
 msgid "Unsupported certificate purpose"
 msgstr ""
 
-#: gajim/common/const.py:459
+#: gajim/common/const.py:493
 msgid "Certificate not trusted"
 msgstr ""
 
-#: gajim/common/const.py:460
+#: gajim/common/const.py:494
 msgid "Certificate rejected"
 msgstr ""
 
-#: gajim/common/const.py:461
+#: gajim/common/const.py:495
 msgid "Subject issuer mismatch"
 msgstr ""
 
-#: gajim/common/const.py:462
+#: gajim/common/const.py:496
 msgid "Authority and subject key identifier mismatch"
 msgstr ""
 
-#: gajim/common/const.py:463
+#: gajim/common/const.py:497
 msgid "Authority and issuer serial number mismatch"
 msgstr ""
 
-#: gajim/common/const.py:464
+#: gajim/common/const.py:498
 msgid "Key usage does not include certificate signing"
 msgstr ""
 
-#: gajim/common/const.py:465
+#: gajim/common/const.py:499
 msgid "Application verification failure"
 msgstr ""
 
@@ -5164,261 +5283,261 @@ msgstr ""
 msgid "video output"
 msgstr ""
 
-#: gajim/common/helpers.py:210
+#: gajim/common/helpers.py:216
 msgid "Server must be between 1 and 1023 bytes"
 msgstr ""
 
-#: gajim/common/helpers.py:214
+#: gajim/common/helpers.py:220
 msgid "Invalid character in hostname."
 msgstr "Baliogabeko karakterea hostname -ean."
 
-#: gajim/common/helpers.py:216
+#: gajim/common/helpers.py:222
 msgid "Server address required."
 msgstr "Zerbitzariaren helbidea behar da."
 
-#: gajim/common/helpers.py:220
+#: gajim/common/helpers.py:226
 msgid "Username must be between 1 and 1023 bytes"
 msgstr ""
 
-#: gajim/common/helpers.py:224
+#: gajim/common/helpers.py:230
 msgid "Invalid character in username."
 msgstr "Baliogabeko karakterea izenean."
 
-#: gajim/common/helpers.py:230
+#: gajim/common/helpers.py:236
 msgid "Resource must be between 1 and 1023 bytes"
 msgstr ""
 
-#: gajim/common/helpers.py:234
+#: gajim/common/helpers.py:240
 msgid "Invalid character in resource."
 msgstr "Invalid character in resource."
 
-#: gajim/common/helpers.py:275
+#: gajim/common/helpers.py:281
 msgid "_Busy"
 msgstr "Lan_petuta"
 
-#: gajim/common/helpers.py:277 gajim/gtk/tooltips.py:647
+#: gajim/common/helpers.py:283 gajim/gtk/tooltips.py:647
 msgid "Busy"
 msgstr "Lanpetuta"
 
-#: gajim/common/helpers.py:280
+#: gajim/common/helpers.py:286
 msgid "_Not Available"
 msgstr "Ez E_rabilgarri"
 
-#: gajim/common/helpers.py:282 gajim/gtk/tooltips.py:649
+#: gajim/common/helpers.py:288 gajim/gtk/tooltips.py:649
 msgid "Not Available"
 msgstr "Ez Erabilgarri"
 
-#: gajim/common/helpers.py:285
+#: gajim/common/helpers.py:291
 msgid "_Free for Chat"
 msgstr "Libre _Hitz Egiteko"
 
-#: gajim/common/helpers.py:287 gajim/gtk/tooltips.py:643
+#: gajim/common/helpers.py:293 gajim/gtk/tooltips.py:643
 msgid "Free for Chat"
 msgstr "Libre Hitz Egiteko"
 
-#: gajim/common/helpers.py:290
+#: gajim/common/helpers.py:296
 #, fuzzy
 msgid "?user status:_Available"
 msgstr "Gelditua"
 
-#: gajim/common/helpers.py:292 gajim/gtk/tooltips.py:641
+#: gajim/common/helpers.py:298 gajim/gtk/tooltips.py:641
 #, fuzzy
 msgid "?user status:Available"
 msgstr "Gelditua"
 
-#: gajim/common/helpers.py:294
+#: gajim/common/helpers.py:300
 msgid "Connecting"
 msgstr "Konektatzen"
 
-#: gajim/common/helpers.py:297 gajim/data/gui/preferences_window.ui:1251
+#: gajim/common/helpers.py:303 gajim/data/gui/preferences_window.ui:1251
 msgid "A_way"
 msgstr "_Kanpoan"
 
-#: gajim/common/helpers.py:299 gajim/common/modules/adhoc_commands.py:120
-#: gajim/command_system/implementation/standard.py:139
+#: gajim/common/helpers.py:305 gajim/common/modules/adhoc_commands.py:120
+#: gajim/command_system/implementation/standard.py:141
 #: gajim/gtk/tooltips.py:645
 msgid "Away"
 msgstr "Kanpoan"
 
-#: gajim/common/helpers.py:302
+#: gajim/common/helpers.py:308
 msgid "_Offline"
 msgstr "_Deskonektatuta"
 
-#: gajim/common/helpers.py:304 gajim/gtk/tooltips.py:651
+#: gajim/common/helpers.py:310 gajim/gtk/tooltips.py:651
 msgid "Offline"
 msgstr "Deskonektatuta"
 
-#: gajim/common/helpers.py:307
+#: gajim/common/helpers.py:313
 msgid "_Invisible"
 msgstr "Ikuse_zin"
 
-#: gajim/common/helpers.py:313
+#: gajim/common/helpers.py:319
 msgid "?contact has status:Unknown"
 msgstr "Ezin da jakin"
 
-#: gajim/common/helpers.py:315
+#: gajim/common/helpers.py:321
 msgid "?contact has status:Has errors"
 msgstr "Errorea du"
 
-#: gajim/common/helpers.py:330
+#: gajim/common/helpers.py:336
 msgid "?Subscription we already have:None"
 msgstr "Inork ez"
 
-#: gajim/common/helpers.py:332
+#: gajim/common/helpers.py:338
 msgid "To"
 msgstr "Norentzat"
 
-#: gajim/common/helpers.py:334 gajim/data/gui/groups_post_window.ui:33
+#: gajim/common/helpers.py:340 gajim/data/gui/groups_post_window.ui:33
 msgid "From"
 msgstr "-etik"
 
-#: gajim/common/helpers.py:336
+#: gajim/common/helpers.py:342
 msgid "Both"
 msgstr "Biak"
 
-#: gajim/common/helpers.py:338 gajim/gtk/server_info.py:151
+#: gajim/common/helpers.py:344 gajim/gtk/server_info.py:151
 #, fuzzy
 msgid "Unknown"
 msgstr "Aurkitu gabea"
 
-#: gajim/common/helpers.py:344
+#: gajim/common/helpers.py:350
 msgid "?Ask (for Subscription):None"
 msgstr "Inork ez"
 
-#: gajim/common/helpers.py:346
+#: gajim/common/helpers.py:352
 msgid "Subscribe"
 msgstr "Harpidetu"
 
-#: gajim/common/helpers.py:355
+#: gajim/common/helpers.py:361
 msgid "?Group Chat Contact Role:None"
 msgstr "Inor ez"
 
-#: gajim/common/helpers.py:358
+#: gajim/common/helpers.py:364
 msgid "Moderators"
 msgstr "Moderatzaileak"
 
-#: gajim/common/helpers.py:360
+#: gajim/common/helpers.py:366
 msgid "Moderator"
 msgstr "Moderatzailea"
 
-#: gajim/common/helpers.py:363
+#: gajim/common/helpers.py:369 gajim/data/gui/groupchat_info_scrolled.ui:243
 msgid "Participants"
 msgstr "Partaideak"
 
-#: gajim/common/helpers.py:365
+#: gajim/common/helpers.py:371
 msgid "Participant"
 msgstr "Partaidea"
 
-#: gajim/common/helpers.py:368
+#: gajim/common/helpers.py:374
 msgid "Visitors"
 msgstr "Bisitariak"
 
-#: gajim/common/helpers.py:370
+#: gajim/common/helpers.py:376
 msgid "Visitor"
 msgstr "Bisitaria"
 
-#: gajim/common/helpers.py:376 gajim/gtk/tooltips.py:253
+#: gajim/common/helpers.py:382 gajim/gtk/tooltips.py:253
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "Inor ez"
 
-#: gajim/common/helpers.py:378 gajim/data/gui/groupchat_config.ui:32
+#: gajim/common/helpers.py:384 gajim/data/gui/groupchat_config.ui:32
 #: gajim/gtk/tooltips.py:259
 msgid "Owner"
 msgstr "Jabea"
 
-#: gajim/common/helpers.py:380 gajim/gtk/tooltips.py:257
+#: gajim/common/helpers.py:386 gajim/gtk/tooltips.py:257
 msgid "Administrator"
 msgstr "Administratzailea"
 
-#: gajim/common/helpers.py:382 gajim/data/gui/groupchat_config.ui:40
+#: gajim/common/helpers.py:388 gajim/data/gui/groupchat_config.ui:40
 #: gajim/gtk/tooltips.py:255 gajim/gtk/groupchat_config.py:105
 msgid "Member"
 msgstr "Partaidea"
 
-#: gajim/common/helpers.py:421
+#: gajim/common/helpers.py:427
 msgid "is paying attention to the conversation"
 msgstr "arreta jartzen ari da elkarrizketara"
 
-#: gajim/common/helpers.py:423
+#: gajim/common/helpers.py:429
 msgid "is doing something else"
 msgstr "beste zerbait egiten ari da"
 
-#: gajim/common/helpers.py:425
+#: gajim/common/helpers.py:431
 #, fuzzy
 msgid "is composing a message…"
 msgstr "mezu bat sortzen ari da..."
 
-#: gajim/common/helpers.py:428
+#: gajim/common/helpers.py:434
 msgid "paused composing a message"
 msgstr "mezuaren sorrera gelditua"
 
-#: gajim/common/helpers.py:430
+#: gajim/common/helpers.py:436
 msgid "has closed the chat window or tab"
 msgstr "tab edo lehioa itxi egin du"
 
-#: gajim/common/helpers.py:936 gajim/common/helpers.py:943
+#: gajim/common/helpers.py:942 gajim/common/helpers.py:949
 #, fuzzy, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
 msgstr[0] "Bidali mezua"
 msgstr[1] "Bidali mezua"
 
-#: gajim/common/helpers.py:950
+#: gajim/common/helpers.py:956
 #, fuzzy, python-format
-msgid "from room %s"
-msgstr "%s naiz"
+msgid "from group chat %s"
+msgstr "Txat Taldean _Sartu"
 
-#: gajim/common/helpers.py:953 gajim/common/helpers.py:970
+#: gajim/common/helpers.py:959 gajim/common/helpers.py:976
 #, python-format
 msgid "from user %s"
 msgstr ""
 
-#: gajim/common/helpers.py:955
+#: gajim/common/helpers.py:961
 #, fuzzy, python-format
 msgid "from %s"
 msgstr "-etik"
 
-#: gajim/common/helpers.py:962 gajim/common/helpers.py:968
+#: gajim/common/helpers.py:968 gajim/common/helpers.py:974
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
 msgstr[0] ""
 msgstr[1] ""
 
-#: gajim/common/helpers.py:986 gajim/common/helpers.py:998
+#: gajim/common/helpers.py:992 gajim/common/helpers.py:1004
 #: gajim/data/gui/roster_window.ui:85 data/org.gajim.Gajim.desktop.in:4
 #: data/org.gajim.Gajim.appdata.xml.in:9
 msgid "Gajim"
 msgstr "Gajim"
 
-#: gajim/common/helpers.py:1000
+#: gajim/common/helpers.py:1006
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: gajim/common/helpers.py:1109 gajim/data/gui/add_new_contact_window.ui:25
+#: gajim/common/helpers.py:1115 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:1111
+#: gajim/common/helpers.py:1117
 msgid "Hello, I am $name."
 msgstr ""
 
-#: gajim/common/helpers.py:1215 gajim/common/helpers.py:1224
-#: gajim/common/helpers.py:1282
+#: gajim/common/helpers.py:1221 gajim/common/helpers.py:1230
+#: gajim/common/helpers.py:1288
 #, fuzzy
 msgid "Timeout loading image"
 msgstr "Ezin izan da irudia kargatu"
 
-#: gajim/common/helpers.py:1234 gajim/common/helpers.py:1280
+#: gajim/common/helpers.py:1240 gajim/common/helpers.py:1286
 msgid "Image is too big"
 msgstr ""
 
-#: gajim/common/helpers.py:1245
+#: gajim/common/helpers.py:1251
 msgid "PyCURL is not installed"
 msgstr ""
 
-#: gajim/common/helpers.py:1284
+#: gajim/common/helpers.py:1290
 #, fuzzy
 msgid "Error loading image"
 msgstr "Ezin izan da irudia kargatu"
@@ -5606,7 +5725,7 @@ msgstr ""
 #: gajim/common/modules/adhoc_commands.py:202
 #: gajim/common/modules/adhoc_commands.py:239
 #, fuzzy
-msgid "Leave Groupchats"
+msgid "Leave Group Chats"
 msgstr "Txat Taldea Berria"
 
 #: gajim/common/modules/adhoc_commands.py:228
@@ -5616,16 +5735,17 @@ msgstr "%(nickname)s  %(room_name)s gelatik"
 
 #: gajim/common/modules/adhoc_commands.py:232
 #, fuzzy
-msgid "You have not joined a groupchat."
+msgid "You have not joined a group chat."
 msgstr "%s gelan sartu da"
 
 #: gajim/common/modules/adhoc_commands.py:240
-msgid "Choose the groupchats you want to leave"
-msgstr ""
+#, fuzzy
+msgid "Choose the group chats you want to leave"
+msgstr "Mesedez bete sartu nahi duzun kontaktuaren informazioa"
 
 #: gajim/common/modules/adhoc_commands.py:289
 #, fuzzy
-msgid "You left the following groupchats:"
+msgid "You left the following group chats:"
 msgstr "%s gelan zaude dagoeneko"
 
 #: gajim/common/modules/roster_item_exchange.py:102
@@ -5643,7 +5763,7 @@ msgstr "Kontaktua"
 msgid "Blocked Contacts"
 msgstr "Kontaktua"
 
-#: gajim/data/gui/destroy_muc_dialog.ui:79 gajim/gtk/dialogs.py:736
+#: gajim/data/gui/destroy_muc_dialog.ui:79 gajim/gtk/dialogs.py:563
 msgid "Destroy this group chat permanently?"
 msgstr ""
 
@@ -5652,7 +5772,7 @@ msgstr ""
 msgid "Reason..."
 msgstr "Arrazoia"
 
-#: gajim/data/gui/destroy_muc_dialog.ui:124 gajim/gtk/dialogs.py:738
+#: gajim/data/gui/destroy_muc_dialog.ui:124 gajim/gtk/dialogs.py:565
 msgid "Where participants should go (optional)"
 msgstr ""
 
@@ -5664,35 +5784,6 @@ msgstr ""
 msgid "_Reason and alternate venue (optional)"
 msgstr ""
 
-#: gajim/data/gui/advanced_configuration_window.ui:7
-#: gajim/data/gui/preferences_window.ui:2723
-#, fuzzy
-msgid "Advanced Configuration Editor (ACE)"
-msgstr "Konfigurazio Aurreratuaren Editorea"
-
-#: gajim/data/gui/advanced_configuration_window.ui:52
-#, fuzzy
-msgid "You should restart Gajim for some changes to take effect"
-msgstr ""
-"<b>OHARRA:</b> Gajim berriro abiarazi beharko duzu aldagai batzuek efektua "
-"sor dezaten"
-
-#: gajim/data/gui/advanced_configuration_window.ui:84
-#, fuzzy
-msgid "_Filter"
-msgstr "_Filtroa:"
-
-#: gajim/data/gui/advanced_configuration_window.ui:153
-#: gajim/data/gui/filetransfers_send_file_dialog.ui:15
-#: gajim/gtk/discovery.py:1666
-msgid "Description"
-msgstr "Deskribapena"
-
-#: gajim/data/gui/advanced_configuration_window.ui:197
-#, fuzzy
-msgid "_Reset to default"
-msgstr "Be_rezko Koloreak Ezarri"
-
 #: gajim/data/gui/join_groupchat_window.ui:56
 #: gajim/data/gui/chat_to_muc_window.ui:67
 #: gajim/data/gui/chat_to_muc_window.ui:78
@@ -5704,9 +5795,8 @@ msgid "Join group chat every time Gajim is started"
 msgstr ""
 
 #: gajim/data/gui/join_groupchat_window.ui:113
-#, fuzzy
-msgid "Auto Join"
-msgstr "Automatikoki sartu"
+msgid "Join Automatically"
+msgstr ""
 
 #: gajim/data/gui/join_groupchat_window.ui:131
 #: gajim/data/gui/profile_window.ui:233
@@ -5715,10 +5805,11 @@ msgstr "Kontua"
 
 #: gajim/data/gui/join_groupchat_window.ui:147
 #, fuzzy
-msgid "Room"
-msgstr "Gela:"
+msgid "Group chat"
+msgstr "Txat Taldeak"
 
-#: gajim/data/gui/join_groupchat_window.ui:180 gajim/gtk/accounts.py:886
+#: gajim/data/gui/join_groupchat_window.ui:180 gajim/data/gui/bookmarks.ui:158
+#: gajim/gtk/accounts.py:889
 #, fuzzy
 msgid "Password"
 msgstr "Pasahitza:"
@@ -5742,93 +5833,11 @@ msgstr "Txat Taldean _Sartu"
 msgid "Search group chats on selected server"
 msgstr ""
 
-#: gajim/data/gui/join_groupchat_window.ui:437 gajim/gtk/discovery.py:1271
+#: gajim/data/gui/join_groupchat_window.ui:437 gajim/gtk/discovery.py:1270
 #, fuzzy
 msgid "Join"
 msgstr "_Sartu"
 
-#: gajim/data/gui/manage_proxies_window.ui:12
-#, fuzzy
-msgid "HTTP Connect"
-msgstr "HTTP konektatuta"
-
-#: gajim/data/gui/manage_proxies_window.ui:15
-msgid "SOCKS5"
-msgstr ""
-
-#: gajim/data/gui/manage_proxies_window.ui:18
-msgid "BOSH"
-msgstr ""
-
-#: gajim/data/gui/manage_proxies_window.ui:27
-msgid "Manage Proxy Profiles"
-msgstr "Proxy Profila Moldatu"
-
-#: gajim/data/gui/manage_proxies_window.ui:83
-#, fuzzy
-msgid "Add Proxy"
-msgstr "Proxy:"
-
-#: gajim/data/gui/manage_proxies_window.ui:97
-#, fuzzy
-msgid "Remove Proxy"
-msgstr "Ezabatu Taldea"
-
-#: gajim/data/gui/manage_proxies_window.ui:141
-#, fuzzy
-msgid "Properties"
-msgstr "<b>Ezaugarriak</b>"
-
-#: gajim/data/gui/manage_proxies_window.ui:157
-#, fuzzy
-msgid "_Name"
-msgstr "_Izena "
-
-#: gajim/data/gui/manage_proxies_window.ui:173
-#, fuzzy
-msgid "_Type"
-msgstr "Mota:"
-
-#: gajim/data/gui/manage_proxies_window.ui:236
-#, fuzzy
-msgid "_BOSH URL"
-msgstr "_URL:"
-
-#: gajim/data/gui/manage_proxies_window.ui:261
-#, fuzzy
-msgid "Use HTTP prox_y"
-msgstr "_Proxy erabili"
-
-#: gajim/data/gui/manage_proxies_window.ui:280
-#, fuzzy
-msgid "Proxy _Host"
-msgstr "Proxy:"
-
-#: gajim/data/gui/manage_proxies_window.ui:307
-#, fuzzy
-msgid "Proxy _Port"
-msgstr "_Portua:"
-
-#: gajim/data/gui/manage_proxies_window.ui:334
-#, fuzzy
-msgid "_Username"
-msgstr "_Izena"
-
-#: gajim/data/gui/manage_proxies_window.ui:347
-#, fuzzy
-msgid "Use proxy auth_entication"
-msgstr "Erabili autentifikazioa"
-
-#: gajim/data/gui/manage_proxies_window.ui:377
-#, fuzzy
-msgid "Pass_word"
-msgstr "Pasa_hitza:"
-
-#: gajim/data/gui/manage_proxies_window.ui:405 gajim/gtk/adhoc.py:321
-#, fuzzy
-msgid "Settings"
-msgstr "Konexioak huts egin du"
-
 #: gajim/data/gui/change_password_dialog.ui:17
 #, fuzzy
 msgid "New Password"
@@ -5859,11 +5868,13 @@ msgid "Status:"
 msgstr "Egoera:"
 
 #: gajim/data/gui/zeroconf_information_window.ui:89
-msgid "_Log conversation history"
+#, fuzzy
+msgid "_Store conversation history"
 msgstr "Elkarrizketaren _historiala"
 
 #: gajim/data/gui/zeroconf_information_window.ui:215
 #: gajim/data/gui/vcard_information_window.ui:390
+#: gajim/data/gui/groupchat_info_scrolled.ui:166
 msgid "Contact"
 msgstr "Kontaktua"
 
@@ -5876,8 +5887,9 @@ msgid "Last Name:"
 msgstr "Azken Izena:"
 
 #: gajim/data/gui/zeroconf_information_window.ui:260
-msgid "Jabber ID:"
-msgstr "Jabber ID:"
+#, fuzzy
+msgid "XMPP Address:"
+msgstr "AIM Hebidea:"
 
 #: gajim/data/gui/zeroconf_information_window.ui:273
 msgid "E-Mail:"
@@ -5898,8 +5910,8 @@ msgstr "Bidali _Fitxeroa"
 
 #: gajim/data/gui/gc_occupants_menu.ui:29
 #, fuzzy
-msgid "Occupant Actions"
-msgstr "_Bete Beharreko Aukerak"
+msgid "Participant Actions"
+msgstr "Partaideak"
 
 #: gajim/data/gui/gc_occupants_menu.ui:38
 msgid "_Voice"
@@ -5930,8 +5942,9 @@ msgid "_Ban"
 msgstr "_Debekatu"
 
 #: gajim/data/gui/gc_occupants_menu.ui:124
-msgid "_Add to Roster"
-msgstr "_Zerrendara Sartu"
+#, fuzzy
+msgid "_Add to Contact List"
+msgstr "_Kontaktua Gehitu..."
 
 #: gajim/data/gui/gc_occupants_menu.ui:132
 #, fuzzy
@@ -5972,11 +5985,6 @@ msgstr "Harpidetza:"
 msgid "_Status"
 msgstr "_Egoera"
 
-#: gajim/data/gui/zeroconf_context_menu.ui:26
-#: gajim/data/gui/account_context_menu.ui:79
-msgid "_Modify Account..."
-msgstr "Kontua E_ditatu"
-
 #: gajim/data/gui/certificate_dialog.ui:66
 #: gajim/data/gui/certificate_dialog.ui:178
 msgid "Common Name (CN)"
@@ -6058,13 +6066,19 @@ msgstr "Azken Eraldaketa:"
 msgid "Next entry"
 msgstr ""
 
+#: gajim/data/gui/filetransfers_send_file_dialog.ui:15
+#: gajim/data/gui/advanced_configuration.ui:143
+#: gajim/data/gui/groupchat_info_scrolled.ui:48 gajim/gtk/discovery.py:1663
+msgid "Description"
+msgstr "Deskribapena"
+
 #: gajim/data/gui/filetransfers_send_file_dialog.ui:54
 #, fuzzy
 msgid "_Send Files"
 msgstr "Bidali _Fitxeroa"
 
 #: gajim/data/gui/filetransfers_send_file_dialog.ui:58
-#: gajim/gtk/xml_console.py:90
+#: gajim/gtk/xml_console.py:87
 #, fuzzy
 msgid "Send"
 msgstr "_Bidali"
@@ -6091,8 +6105,8 @@ msgstr "Aldatu _Izengoitia"
 
 #: gajim/data/gui/gc_control_popup_menu.ui:20
 #, fuzzy
-msgid "_Manage Room"
-msgstr "Talde Agenda Moldatu"
+msgid "_Manage Group Chat"
+msgstr "Txat Taldea Berria"
 
 #: gajim/data/gui/gc_control_popup_menu.ui:31
 #, fuzzy
@@ -6101,13 +6115,13 @@ msgstr "Aldatu _Gaia"
 
 #: gajim/data/gui/gc_control_popup_menu.ui:38
 #, fuzzy
-msgid "Configure _Room..."
-msgstr "Gela Konfigu_ratu"
+msgid "Configure _Group Chat..."
+msgstr "Txat Taldean _Sartu"
 
 #: gajim/data/gui/gc_control_popup_menu.ui:52
 #, fuzzy
-msgid "_Destroy Room"
-msgstr "Deskribapena: %s"
+msgid "_Destroy Group Chat"
+msgstr "Txat Taldea Berria"
 
 #: gajim/data/gui/gc_control_popup_menu.ui:64
 msgid "_Minimize on close"
@@ -6118,7 +6132,7 @@ msgstr ""
 msgid "_Request Voice"
 msgstr "_Ahotsa"
 
-#: gajim/data/gui/gc_control_popup_menu.ui:99 gajim/gtk/discovery.py:1704
+#: gajim/data/gui/gc_control_popup_menu.ui:99
 #, fuzzy
 msgid "_Bookmark"
 msgstr "_Talde Agendan Sartu Gela hau"
@@ -6171,14 +6185,6 @@ msgstr "Web Pertsonala:"
 msgid "E-Mail"
 msgstr "E-Posta:"
 
-#: 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/blocking_list.ui:115 gajim/gtk/add_contact.py:30
-#: gajim/gtk/accounts.py:801
-#, fuzzy
-msgid "Jabber ID"
-msgstr "Jabber ID:"
-
 #: gajim/data/gui/profile_window.ui:440
 msgid "Main"
 msgstr ""
@@ -6314,35 +6320,42 @@ msgstr "Lana"
 msgid "About"
 msgstr "About"
 
-#: gajim/data/gui/start_chat_dialog.ui:114 gajim/gtk/discovery.py:1658
-msgid "Users"
-msgstr "Erabiltzaileak"
-
-#: gajim/data/gui/start_chat_dialog.ui:185
-msgid "Name:"
-msgstr "Izena:"
+#: gajim/data/gui/start_chat_dialog.ui:53
+#, fuzzy
+msgid "Global Group Chat Search"
+msgstr "Txat Taldean Sartu"
 
-#: gajim/data/gui/start_chat_dialog.ui:197
+#: 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
-msgid "Description:"
-msgstr "Deskribapena: %s"
+msgid "_Back"
+msgstr "Laster etorriko naiz"
 
-#: gajim/data/gui/start_chat_dialog.ui:209
+#: gajim/data/gui/start_chat_dialog.ui:245
+#: gajim/data/gui/groupchat_control.ui:796
+#: gajim/data/gui/groupchat_control.ui:888 gajim/gtk/discovery.py:1701
+#: gajim/gtk/groupchat_join.py:62
+msgid "_Join"
+msgstr "_Sartu"
+
+#: gajim/data/gui/start_chat_dialog.ui:289
 #, fuzzy
-msgid "Address:"
-msgstr "_Helbidea:"
+msgid "Select Account"
+msgstr "%s kontua ezabatzen"
 
-#: gajim/data/gui/start_chat_dialog.ui:246
-msgid ""
-"Semi-Anonymous\n"
-"<span size=\"small\">(Only moderators can see your XMPP-Address)</span>"
+#: gajim/data/gui/start_chat_dialog.ui:380
+msgid "_Select"
 msgstr ""
 
 #: gajim/data/gui/filetransfers.ui:21
 msgid "Pa_use/Resume"
 msgstr ""
 
-#: gajim/data/gui/filetransfers.ui:30 gajim/gtk/filechoosers.py:178
+#: gajim/data/gui/filetransfers.ui:30 gajim/data/gui/groupchat_control.ui:575
+#: gajim/data/gui/groupchat_control.ui:667
+#: gajim/data/gui/groupchat_control.ui:779
+#: gajim/data/gui/groupchat_control.ui:871 gajim/gtk/filechoosers.py:178
 msgid "_Cancel"
 msgstr "_kantzelatu"
 
@@ -6389,7 +6402,7 @@ msgstr ""
 
 #: gajim/data/gui/filetransfers.ui:207
 #, fuzzy
-msgid "Shows a list of file transfers between you and others"
+msgid "Shows a list of file transfers between you and your contacts"
 msgstr "Erakutsi zu eta beste baten arteko fitxero transferentzia"
 
 #: gajim/data/gui/groupchat_control.ui:13 gajim/data/gui/chat_control.ui:277
@@ -6411,7 +6424,6 @@ msgid "Strike"
 msgstr "Izengoitia"
 
 #: gajim/data/gui/groupchat_control.ui:54 gajim/data/gui/chat_control.ui:318
-#: gajim/gtk/advanced_config.py:86
 msgid "Color"
 msgstr ""
 
@@ -6425,16 +6437,45 @@ msgstr "_Mota:"
 msgid "Clear formatting"
 msgstr "Kontaktuaren Informazioa"
 
-#: gajim/data/gui/groupchat_control.ui:290 gajim/data/gui/chat_control.ui:880
+#: gajim/data/gui/groupchat_control.ui:291 gajim/data/gui/chat_control.ui:880
 #, fuzzy
 msgid "Choose encryption"
 msgstr "Aukeratu Bidaltzeko Fitxeroa..."
 
-#: gajim/data/gui/groupchat_control.ui:336 gajim/data/gui/chat_control.ui:640
+#: gajim/data/gui/groupchat_control.ui:337 gajim/data/gui/chat_control.ui:640
 #, fuzzy
 msgid "Show a list of emojis (Alt+M)"
 msgstr "Sakatu emoticon bat ezartzeko (Alt+M)"
 
+#: gajim/data/gui/groupchat_control.ui:484
+#, fuzzy
+msgid "Joining…"
+msgstr "Debekatzen..."
+
+#: gajim/data/gui/groupchat_control.ui:496
+msgid "_Abort"
+msgstr ""
+
+#: gajim/data/gui/groupchat_control.ui:542
+#, fuzzy
+msgid "Enter new nickname"
+msgstr "Izengoitiaren on_doren:"
+
+#: gajim/data/gui/groupchat_control.ui:592
+#: gajim/data/gui/groupchat_control.ui:684
+#, fuzzy
+msgid "Ch_ange"
+msgstr "Aldatu _Izengoitia"
+
+#: gajim/data/gui/groupchat_control.ui:761
+#, fuzzy
+msgid "Enter password"
+msgstr "Sartu pasahitz berria:"
+
+#: gajim/data/gui/groupchat_control.ui:1067
+msgid "_Try again"
+msgstr ""
+
 #: gajim/data/gui/popup_notification_window.ui:42
 #, fuzzy
 msgid "Event Type"
@@ -6516,8 +6557,8 @@ msgstr "Kanpoan"
 
 #: gajim/data/gui/mam_preferences.ui:18
 #, fuzzy
-msgid "Roster"
-msgstr "Ikusi _Zerrenda"
+msgid "Contact List"
+msgstr "Kontaktua"
 
 #: gajim/data/gui/mam_preferences.ui:22
 #: gajim/data/gui/preferences_window.ui:123
@@ -6542,12 +6583,12 @@ msgid "Add"
 msgstr "Gehitu"
 
 #: gajim/data/gui/mam_preferences.ui:194 gajim/data/gui/groupchat_config.ui:151
-#: gajim/gtk/dialogs.py:63 gajim/gtk/accounts.py:381
+#: gajim/gtk/dialogs.py:62 gajim/gtk/accounts.py:384
 #, fuzzy
 msgid "Remove"
 msgstr "_Ezabatu"
 
-#: gajim/data/gui/vcard_information_window.ui:72 gajim/gtk/accounts.py:753
+#: gajim/data/gui/vcard_information_window.ui:72 gajim/gtk/accounts.py:756
 #, fuzzy
 msgid "Resource"
 msgstr "Baliabidea:"
@@ -6600,6 +6641,7 @@ msgstr "Harpidetza:"
 #: gajim/data/gui/vcard_information_window.ui:974
 #: gajim/data/gui/vcard_information_window.ui:993
 #: gajim/data/gui/vcard_information_window.ui:1427
+#: gajim/data/gui/groupchat_info_scrolled.ui:222
 msgid "button"
 msgstr ""
 
@@ -6632,15 +6674,15 @@ msgstr "_Jakinarazi horri buruz"
 
 #: gajim/data/gui/preferences_window.ui:58
 #, fuzzy
-msgid "Show only in roster"
-msgstr "Ikusi _zerrendan bakarrik"
+msgid "Show only in contact list"
+msgstr "Ikusi _Deskonektatutako Kontaktuak"
 
 #: gajim/data/gui/preferences_window.ui:69
-msgid "Detached roster with detached chats"
+msgid "Detached contact list with detached chats"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:72
-msgid "Detached roster with single chat"
+msgid "Detached contact list with single chat"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:75
@@ -6648,11 +6690,11 @@ msgid "Single window for everything"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:78
-msgid "Detached roster with chat grouped by account"
+msgid "Detached contact list with chat grouped by account"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:81
-msgid "Detached roster with chat grouped by type"
+msgid "Detached contact list with chat grouped by type"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:92
@@ -6703,7 +6745,7 @@ msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:296
 #, fuzzy
-msgid "_Show roster on startup"
+msgid "_Show contact list on startup"
 msgstr "Ikusi _Zerrenda"
 
 #: gajim/data/gui/preferences_window.ui:311
@@ -6719,12 +6761,12 @@ msgid "_Tabs placement"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:363
-msgid "_Quit Gajim when closing roster window"
+msgid "_Quit Gajim when closing contact list"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:367
 msgid ""
-"If enabled, Gajim will quit when closing the roster window instead of "
+"If enabled, Gajim will quit when closing the contact list window instead of "
 "minimizing to the system's notification area"
 msgstr ""
 
@@ -6734,41 +6776,42 @@ msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:423
 #, fuzzy
-msgid "Show a_vatars of contacts in roster"
+msgid "Show a_vatars of contacts in contact list"
 msgstr "Kontaktuen a_batereak erakutsi zerrendan"
 
 #: gajim/data/gui/preferences_window.ui:427
 #, fuzzy
 msgid ""
-"If checked, avatars of contacts will be shown in the roster window and in "
-"group chats"
+"If checked, avatars of contacts will be shown in the contact list window and "
+"in group chats"
 msgstr ""
 "Hautatua badago, Gajim-ek zerrendan eta txat taldeetan kontaktuen abatereak "
 "azalaraziko ditu"
 
 #: gajim/data/gui/preferences_window.ui:441
 #, fuzzy
-msgid "Show status _messages of contacts in roster"
+msgid "Show status _messages of contacts in contact list"
 msgstr "Erakuts arazi kontaktuen egoera _mezua zerrendan"
 
 #: gajim/data/gui/preferences_window.ui:445
 #, fuzzy
 msgid ""
 "If checked, status messages of contacts will be shown under the contact's "
-"name, in the roster window, and in group chats"
+"name, in the contact list window, and in group chats"
 msgstr ""
 "Hautatua badago, Gajim-ek egoera mezua zerrendan erakutsaraziko du izenen "
 "azpian eta txat taldeetan"
 
 #: gajim/data/gui/preferences_window.ui:459
 #, fuzzy
-msgid "Show e_xtra information of contacts in roster (mood, activity, ...)"
+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
 msgid ""
-"If checked, additional info published by the contact will be shown in "
-"roster. Additional infos (published via PEP) may include e.g. mood, "
+"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 ""
 
@@ -6779,8 +6822,8 @@ msgstr "_Sailkatu kontaktuak egoeraren bidez"
 
 #: gajim/data/gui/preferences_window.ui:494
 #, fuzzy
-msgid "in _roster"
-msgstr "Ez dago zerrendan"
+msgid "in _contact list"
+msgstr "Kontaktua"
 
 #: gajim/data/gui/preferences_window.ui:511
 #, fuzzy
@@ -6789,8 +6832,8 @@ msgstr "Txat Taldean _Sartu"
 
 #: gajim/data/gui/preferences_window.ui:540
 #, fuzzy
-msgid "Roster Appearance"
-msgstr "<b>Arau bat editatu</b>"
+msgid "Contact List Appearance"
+msgstr "Kontaktua Deskonektatuta"
 
 #: gajim/data/gui/preferences_window.ui:585
 msgid "Enable spell _checking"
@@ -6851,7 +6894,7 @@ msgstr "Ezin da gela honetara sartu"
 
 #: gajim/data/gui/preferences_window.ui:660
 #, fuzzy
-msgid "If checked, the room subject will be shown when joining a group chat"
+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:682
@@ -6866,13 +6909,13 @@ msgstr ""
 #: gajim/data/gui/preferences_window.ui:701
 msgid ""
 "If join/leave status messages are shown in the group chat. This setting can "
-"be overridden in the groupchat menu."
+"be overridden in the group chat menu."
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:720
 msgid ""
 "The default sync threshold for new public group chats. This setting can be "
-"overridden in the groupchat menu."
+"overridden in the group chat menu."
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:722
@@ -6887,7 +6930,7 @@ msgstr "Kontaktuen egoera aldaketak gorde"
 #: gajim/data/gui/preferences_window.ui:768
 msgid ""
 "If status change messages are shown in the group chat. This setting can be "
-"overridden in the groupchat menu."
+"overridden in the group chat menu."
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:825
@@ -6904,8 +6947,8 @@ msgstr "Hautatua badago, Gajim-ek  txat talde honetan sartuko da abiaraztean"
 
 #: gajim/data/gui/preferences_window.ui:843
 #, fuzzy
-msgid "Show chatstate in roster"
-msgstr "Kontaktuen a_batereak erakutsi zerrendan"
+msgid "Show chatstate in contact list"
+msgstr "Isteko botoila erakutsi tab-ean?"
 
 #: gajim/data/gui/preferences_window.ui:847
 msgid ""
@@ -7202,7 +7245,7 @@ msgstr ""
 msgid "Vi_ew own video source"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2281 gajim/gtk/accounts.py:352
+#: gajim/data/gui/preferences_window.ui:2281 gajim/gtk/accounts.py:355
 msgid "Connection"
 msgstr "Konektatu"
 
@@ -7256,7 +7299,8 @@ msgid "_Manage..."
 msgstr "Moldatu..."
 
 #: gajim/data/gui/preferences_window.ui:2616
-msgid "_Log status changes of contacts"
+#, fuzzy
+msgid "_Store status changes of contacts in history"
 msgstr "Kontaktuen egoera aldaketak gorde"
 
 #: gajim/data/gui/preferences_window.ui:2633
@@ -7281,10 +7325,15 @@ msgstr ""
 msgid "_Open..."
 msgstr "_Ireki..."
 
+#: gajim/data/gui/preferences_window.ui:2723 gajim/gtk/advanced_config.py:84
+#, fuzzy
+msgid "Advanced Configuration Editor (ACE)"
+msgstr "Konfigurazio Aurreratuaren Editorea"
+
 #: gajim/data/gui/groupchat_config.ui:55
 #, fuzzy
 msgid ""
-"<b>Jabber-ID</b>\n"
+"<b>XMPP Address</b>\n"
 "&lt;user@domain/resource&gt; (only that resource matches)\n"
 "&lt;user@domain&gt; (any resource matches)\n"
 "&lt;domain/resource&gt; (only that resource matches)\n"
@@ -7303,7 +7352,8 @@ msgstr ""
 msgid "Only Admins and Owners can modify the affiliation"
 msgstr ""
 
-#: gajim/data/gui/groupchat_config.ui:270 gajim/plugins/gui.py:312
+#: gajim/data/gui/groupchat_config.ui:270
+#: gajim/data/gui/groupchat_info_scrolled.ui:210 gajim/plugins/gui.py:324
 #, fuzzy
 msgid "Configuration"
 msgstr "Gelaren Konfigurazioa"
@@ -7336,7 +7386,7 @@ msgid "Start _Chat"
 msgstr "Elkarrizketa _Hasi"
 
 #: gajim/data/gui/contact_context_menu.ui:20
-#: gajim/data/gui/systray_context_menu.ui:36
+#: gajim/data/gui/systray_context_menu.ui:29
 msgid "Send Single _Message..."
 msgstr "Bidali _Mezu Bakarra..."
 
@@ -7405,17 +7455,44 @@ msgstr ""
 
 #: gajim/data/gui/contact_context_menu.ui:174
 #, fuzzy
-msgid "_Add to Roster..."
-msgstr "_Zerrendara Sartu"
+msgid "_Add to Contact List..."
+msgstr "_Kontaktua Gehitu..."
+
+#: gajim/data/gui/advanced_configuration.ui:39
+#, fuzzy
+msgid "You should restart Gajim for some changes to take effect"
+msgstr ""
+"<b>OHARRA:</b> Gajim berriro abiarazi beharko duzu aldagai batzuek efektua "
+"sor dezaten"
+
+#: gajim/data/gui/advanced_configuration.ui:71
+#, fuzzy
+msgid "_Filter"
+msgstr "_Filtroa:"
+
+#: gajim/data/gui/advanced_configuration.ui:88
+msgid "Type to search for values..."
+msgstr ""
+
+#: gajim/data/gui/advanced_configuration.ui:180
+#, fuzzy
+msgid "_Reset Value"
+msgstr "Be_rezko Koloreak Ezarri"
+
+#: gajim/data/gui/advanced_configuration.ui:185
+#, fuzzy
+msgid "Resets value to default"
+msgstr "Be_rezko Koloreak Ezarri"
 
 #: gajim/data/gui/account_creation_wizard_window.ui:43
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim: Kontu Sortzailearen Wizard-a"
 
 #: gajim/data/gui/account_creation_wizard_window.ui:70
+#, fuzzy
 msgid ""
 "You need to have an account in order to connect\n"
-"to the Jabber network."
+"to the XMPP network."
 msgstr ""
 "Kontu bat behar duzu\n"
 "Jabber sarera konektatzeko"
@@ -7439,8 +7516,9 @@ msgid "<b>Please fill in the data for your existing account</b>"
 msgstr "<b>Mesedez bete zure kontu berrirako informazioa</b>"
 
 #: gajim/data/gui/account_creation_wizard_window.ui:187
-msgid "_Jabber ID:"
-msgstr "_Jabber ID:"
+#, fuzzy
+msgid "_XMPP Address:"
+msgstr "AIM Hebidea:"
 
 #: gajim/data/gui/account_creation_wizard_window.ui:239
 #: gajim/data/gui/account_creation_wizard_window.ui:394
@@ -7529,6 +7607,7 @@ msgid "Privacy Lists:"
 msgstr "Debekatze Zerrendak:"
 
 #: gajim/data/gui/service_discovery_window.ui:111
+#: gajim/data/gui/groupchat_creation.ui:227
 #, fuzzy
 msgid "_Address"
 msgstr "_Helbidea:"
@@ -7547,11 +7626,6 @@ msgstr ""
 msgid "Select the contacts you want to synchronise"
 msgstr "Txateatu nahi duzun pertsonaren JID-a"
 
-#: gajim/data/gui/groupchat_invitation_received.ui:42
-#, fuzzy
-msgid "Group Chat Invitation"
-msgstr "Txat Taldeko Gonbidapena"
-
 #: gajim/data/gui/groupchat_invitation_received.ui:111
 #, fuzzy
 msgid "Message..."
@@ -7603,11 +7677,10 @@ msgstr ""
 
 #: gajim/data/gui/add_new_contact_window.ui:84
 #, fuzzy
-msgid "_Jabber ID"
-msgstr "_Jabber ID:"
+msgid "_XMPP Address"
+msgstr "_Helbidea:"
 
 #: gajim/data/gui/add_new_contact_window.ui:100
-#: gajim/data/gui/manage_bookmarks_window.ui:192
 #, fuzzy
 msgid "_Nickname"
 msgstr "_Izengoitia:"
@@ -7686,7 +7759,7 @@ msgstr "<b>Soinuak</b>"
 msgid "<b>Message:</b>"
 msgstr "<b>Egoera Mezu Ezarriak</b>"
 
-#: gajim/data/gui/plugins_window.ui:10 gajim/data/gui/application_menu.ui:90
+#: gajim/data/gui/plugins_window.ui:10 gajim/data/gui/application_menu.ui:87
 msgid "Plugins"
 msgstr ""
 
@@ -7795,10 +7868,6 @@ msgstr "Baimendu"
 msgid "Deny"
 msgstr "Ukatu"
 
-#: gajim/data/gui/privacy_list_window.ui:317
-msgid "JabberID"
-msgstr "JabberID"
-
 #: gajim/data/gui/privacy_list_window.ui:358
 msgid "all in the group"
 msgstr "talde hontakoak"
@@ -7841,7 +7910,7 @@ msgstr "Ordena:"
 msgid "Manage sounds"
 msgstr "Kontuak moldatu"
 
-#: gajim/data/gui/manage_sounds_window.ui:55 gajim/plugins/gui.py:100
+#: gajim/data/gui/manage_sounds_window.ui:55 gajim/plugins/gui.py:101
 msgid "Active"
 msgstr "Aktibatuta"
 
@@ -7880,23 +7949,114 @@ msgstr "Ezabatu kontua Gajim-etik eta baita _zerbitzaritik"
 msgid "_Personal Events"
 msgstr "Informazio Pertsonala "
 
-#: gajim/data/gui/account_context_menu.ui:35
-#: gajim/data/gui/systray_context_menu.ui:28
-msgid "Join _Group Chat"
-msgstr "Txat Taldean _Sartu"
-
-#: gajim/data/gui/account_context_menu.ui:49
+#: gajim/data/gui/account_context_menu.ui:41
 msgid "_Add Contact..."
 msgstr "_Kontaktua Gehitu..."
 
-#: gajim/data/gui/account_context_menu.ui:57
+#: gajim/data/gui/account_context_menu.ui:49
 msgid "_Discover Services"
 msgstr "_Zerbitzuak Aurkitu"
 
-#: gajim/data/gui/account_context_menu.ui:65
+#: gajim/data/gui/account_context_menu.ui:57
 msgid "_Execute Command..."
 msgstr "_Komandoa Exekutatu..."
 
+#: gajim/data/gui/account_context_menu.ui:65
+#, fuzzy
+msgid "_View Certificate"
+msgstr "Baliogabeko izena"
+
+#: gajim/data/gui/manage_proxies.ui:12
+#, fuzzy
+msgctxt "proxy configuration"
+msgid "HTTP Connect"
+msgstr "HTTP konektatuta"
+
+#: gajim/data/gui/manage_proxies.ui:15
+msgctxt "proxy configuration"
+msgid "SOCKS5"
+msgstr ""
+
+#: gajim/data/gui/manage_proxies.ui:18
+#, fuzzy
+msgctxt "proxy configuration"
+msgid "BOSH"
+msgstr "_URL:"
+
+#: gajim/data/gui/manage_proxies.ui:68
+#, fuzzy
+msgid "Add Proxy"
+msgstr "Proxy:"
+
+#: gajim/data/gui/manage_proxies.ui:82
+#, fuzzy
+msgid "Remove Proxy"
+msgstr "Ezabatu Taldea"
+
+#: gajim/data/gui/manage_proxies.ui:134
+#, fuzzy
+msgid "Pass_word"
+msgstr "Pasa_hitza:"
+
+#: gajim/data/gui/manage_proxies.ui:159
+#, fuzzy
+msgid "Use proxy auth_entication"
+msgstr "Erabili autentifikazioa"
+
+#: gajim/data/gui/manage_proxies.ui:179
+#, fuzzy
+msgid "_Username"
+msgstr "_Izena"
+
+#: gajim/data/gui/manage_proxies.ui:209
+#, fuzzy
+msgid "_Port"
+msgstr "_Portua:"
+
+#: gajim/data/gui/manage_proxies.ui:226
+msgid "example.org"
+msgstr ""
+
+#: gajim/data/gui/manage_proxies.ui:240
+#, fuzzy
+msgid "_Host"
+msgstr "_Host-a"
+
+#: gajim/data/gui/manage_proxies.ui:254
+#, fuzzy
+msgid "Use HTTP prox_y"
+msgstr "_Proxy erabili"
+
+#: gajim/data/gui/manage_proxies.ui:275
+msgid "https://example.org/http-bind/"
+msgstr ""
+
+#: gajim/data/gui/manage_proxies.ui:291
+#, fuzzy
+msgid "_BOSH URL"
+msgstr "_URL:"
+
+#: gajim/data/gui/manage_proxies.ui:309 gajim/gtk/adhoc.py:322
+#, fuzzy
+msgid "Settings"
+msgstr "Konexioak huts egin du"
+
+#: gajim/data/gui/manage_proxies.ui:344
+#, fuzzy
+msgid "_Type"
+msgstr "Mota:"
+
+#: gajim/data/gui/manage_proxies.ui:361
+#: gajim/data/gui/groupchat_creation.ui:105
+#, fuzzy
+msgid "_Name"
+msgstr "_Izena "
+
+#: gajim/data/gui/manage_proxies.ui:391 gajim/gtk/accounts.py:742
+#, fuzzy
+msgid "Proxy"
+msgstr "Proxy:"
+
 #: gajim/data/gui/application_menu.ui:8
 #, fuzzy
 msgid "View"
@@ -7904,8 +8064,8 @@ msgstr "_Ikusi"
 
 #: gajim/data/gui/application_menu.ui:11
 #, fuzzy
-msgid "Show Roster"
-msgstr "Ikusi _Zerrenda"
+msgid "Show Contact List"
+msgstr "Ikusi _Deskonektatutako Kontaktuak"
 
 #: gajim/data/gui/application_menu.ui:16
 #, fuzzy
@@ -7947,23 +8107,24 @@ msgstr ""
 msgid "Features"
 msgstr "Zerbitzariaren Ezaugarriak:"
 
-#: gajim/data/gui/application_menu.ui:81
+#: gajim/data/gui/application_menu.ui:77
+#: gajim/data/gui/groupchat_creation.ui:81 gajim/gtk/groupchat_creation.py:45
 #, fuzzy
-msgid "Bookmarks"
-msgstr "_Talde Agendan Sartu Gela hau"
+msgid "Create Group Chat"
+msgstr "Txat Taldea Berria"
 
-#: gajim/data/gui/application_menu.ui:94 gajim/data/gui/shortcuts_window.ui:189
-#: gajim/gtk/preferences.py:59
+#: gajim/data/gui/application_menu.ui:91 gajim/data/gui/shortcuts_window.ui:189
+#: gajim/gtk/preferences.py:58
 msgid "Preferences"
 msgstr "Hobespenak"
 
-#: gajim/data/gui/application_menu.ui:99
+#: gajim/data/gui/application_menu.ui:96
 #, fuzzy
 msgid "Quit"
 msgstr "At_era"
 
 #: gajim/data/gui/httpupload_progress_dialog.ui:110
-#: gajim/gtk/filetransfer.py:121
+#: gajim/gtk/filetransfer.py:120
 msgid "Progress"
 msgstr "Prozesua"
 
@@ -7980,52 +8141,33 @@ msgstr ""
 msgid "_Cancel Upload"
 msgstr "_kantzelatu"
 
-#: gajim/data/gui/manage_bookmarks_window.ui:13
-#, fuzzy
-msgid "Group Chat Bookmarks"
-msgstr "Txat Taldea"
-
-#: gajim/data/gui/manage_bookmarks_window.ui:68
-#, fuzzy
-msgid "Add Bookmark"
-msgstr "_Talde Agendan Sartu Gela hau"
-
-#: gajim/data/gui/manage_bookmarks_window.ui:82
-#, fuzzy
-msgid "Remove Bookmark"
-msgstr "_Talde Agendan Sartu Gela hau"
+#: gajim/data/gui/groupchat_creation.ui:27
+msgid "Public or Private?"
+msgstr ""
 
-#: gajim/data/gui/manage_bookmarks_window.ui:126
-msgid "N_ame"
+#: 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 ""
 
-#: gajim/data/gui/manage_bookmarks_window.ui:145
-#, fuzzy
-msgid "Bookmark Name"
-msgstr "_Talde Agendan Sartu Gela hau"
+#: gajim/data/gui/groupchat_creation.ui:58
+msgid "<b>Public:</b> Anyone who knows the address can join."
+msgstr ""
 
-#: gajim/data/gui/manage_bookmarks_window.ui:160
+#: gajim/data/gui/groupchat_creation.ui:122
 #, fuzzy
-msgid "_Server"
-msgstr "_Zerbitzaria"
+msgid "_Description"
+msgstr "Deskribapena"
 
-#: gajim/data/gui/manage_bookmarks_window.ui:223
-msgid "Roo_m"
+#: gajim/data/gui/groupchat_creation.ui:164
+msgid "_Public"
 msgstr ""
 
-#: gajim/data/gui/manage_bookmarks_window.ui:253
+#: gajim/data/gui/groupchat_creation.ui:278
 #, fuzzy
-msgid "_Password"
-msgstr "_Pasahitza:"
-
-#: gajim/data/gui/manage_bookmarks_window.ui:299
-#, fuzzy
-msgid "Join chat when connected"
-msgstr "Kontaktua Deskonektatuta"
-
-#: gajim/data/gui/manage_bookmarks_window.ui:307
-msgid "_Join Automatically"
-msgstr ""
+msgid "_Account"
+msgstr "Kontuak"
 
 #: gajim/data/gui/exception_dialog.ui:49
 msgid "Sorry, that should not have happened"
@@ -8068,6 +8210,28 @@ msgstr "Kontaktu autorizatua beraz, zure egoera ikus dezake"
 msgid "Presets"
 msgstr "_Egoera"
 
+#: gajim/data/gui/groupchat_info_scrolled.ui:32
+msgid "Address"
+msgstr "Helbidea"
+
+#: gajim/data/gui/groupchat_info_scrolled.ui:64
+msgid "Topic"
+msgstr ""
+
+#: gajim/data/gui/groupchat_info_scrolled.ui:80
+#, fuzzy
+msgid "Author"
+msgstr "_Autorizatu"
+
+#: gajim/data/gui/groupchat_info_scrolled.ui:182
+msgid "Discussion Logs"
+msgstr ""
+
+#: gajim/data/gui/groupchat_info_scrolled.ui:260
+#, fuzzy
+msgid "Group Chat Language"
+msgstr "Txat Taldeko Gonbidapena"
+
 #: gajim/data/gui/emoji_chooser.ui:98
 msgid "No Results Found"
 msgstr ""
@@ -8079,24 +8243,34 @@ msgstr ""
 #: gajim/data/gui/chat_to_muc_window.ui:39
 #, fuzzy
 msgid ""
-"You are now entering a groupchat.\n"
+"You are now entering a group chat.\n"
 "Select the contacts you want to invite"
 msgstr "Txateatu nahi duzun pertsonaren JID-a"
 
 #: gajim/data/gui/chat_to_muc_window.ui:112
-msgid "Please select a MUC server."
-msgstr ""
+#, fuzzy
+msgid "Please select a group chat server."
+msgstr "Hau ez da txat talde bat"
 
 #: gajim/data/gui/chat_to_muc_window.ui:141
 #, fuzzy
-msgid "MUC server"
-msgstr "Begiratzaileak"
+msgid "Group chat server"
+msgstr "Txat Taldeak"
 
 #: gajim/data/gui/chat_to_muc_window.ui:176
 #, fuzzy
 msgid "In_vite"
 msgstr "Honera gonbidatu"
 
+#: gajim/data/gui/bookmarks.ui:176
+#, fuzzy
+msgid "Autojoin"
+msgstr "Automatikoki sartu"
+
+#: gajim/data/gui/bookmarks.ui:211
+msgid "_Apply"
+msgstr ""
+
 #: gajim/data/gui/history_manager.ui:11
 #, fuzzy
 msgid "_Export"
@@ -8113,11 +8287,11 @@ msgstr "Gajim Historialeko Log Administratzailea"
 
 #: gajim/data/gui/history_manager.ui:108
 msgid ""
-"This log manager is not intended for log viewing. If you are looking for "
-"such functionality, use the history window instead.\n"
+"This history manager is not intended for viewing chat history. If you are "
+"looking for such functionality, please use the history window instead.\n"
 "\n"
-"Use this program to delete or export logs. You can select logs from the left "
-"and/or search database from below."
+"You can use this program to delete or export history. Either select logs "
+"from the left or search the database."
 msgstr ""
 
 #: gajim/data/gui/history_manager.ui:124
@@ -8169,8 +8343,9 @@ msgid "Select an emoji"
 msgstr ""
 
 #: gajim/data/gui/shortcuts_window.ui:38
-msgid "Complete a command or a nick"
-msgstr ""
+#, fuzzy
+msgid "Complete a command or a nickname"
+msgstr "Mezu berria sortu"
 
 #: gajim/data/gui/shortcuts_window.ui:45
 #, fuzzy
@@ -8210,7 +8385,7 @@ msgstr ""
 msgid "Scroll down"
 msgstr ""
 
-#: gajim/data/gui/shortcuts_window.ui:100 gajim/gtk/xml_console.py:72
+#: gajim/data/gui/shortcuts_window.ui:100 gajim/gtk/xml_console.py:69
 #, fuzzy
 msgid "Clear"
 msgstr "Arratsaldea"
@@ -8252,8 +8427,9 @@ msgid "Close chat"
 msgstr ""
 
 #: gajim/data/gui/shortcuts_window.ui:173
-msgid "Roster Shortcuts"
-msgstr ""
+#, fuzzy
+msgid "Contact List Shortcuts"
+msgstr "Kontaktua Deskonektatuta"
 
 #: gajim/data/gui/shortcuts_window.ui:196
 #, fuzzy
@@ -8286,7 +8462,7 @@ msgid "Show only active contacts"
 msgstr "Ikusi _Deskonektatutako Kontaktuak"
 
 #: gajim/data/gui/shortcuts_window.ui:251
-msgid "Enable roster filtering"
+msgid "Enable contact list filtering"
 msgstr ""
 
 #: gajim/data/gui/shortcuts_window.ui:259
@@ -8332,12 +8508,12 @@ msgid "Search selected day only"
 msgstr ""
 
 #: gajim/data/gui/history_window.ui:317
-msgid "Record history for this chat"
+msgid "Store history for this chat"
 msgstr ""
 
 #: gajim/data/gui/history_window.ui:332
 #, fuzzy
-msgid "Record History"
+msgid "Store History"
 msgstr "Berriki:"
 
 #: gajim/data/gui/history_window.ui:350
@@ -8358,9 +8534,10 @@ msgstr "Mezu berria sortu"
 msgid "Fill in the form."
 msgstr "Formularioan bete"
 
-#: gajim/data/gui/data_form_window.ui:229
-msgid "Room Configuration"
-msgstr "Gelaren Konfigurazioa"
+#: gajim/data/gui/data_form_window.ui:229 gajim/gtk/groupchat_config.py:41
+#, fuzzy
+msgid "Group Chat Configuration"
+msgstr "Txat Taldeko Gonbidapena"
 
 #: gajim/data/gui/roster_item_exchange_window.ui:39
 #: gajim/gtk/roster_item_exchange.py:35
@@ -8382,15 +8559,15 @@ msgstr "E_goera"
 msgid "_Start Chat..."
 msgstr "Elkarrizketa  _Hasi"
 
-#: gajim/data/gui/systray_context_menu.ui:50
+#: gajim/data/gui/systray_context_menu.ui:43
 msgid "Show All Pending _Events"
 msgstr "Ikusi Gabeko _Gertaerak"
 
-#: gajim/data/gui/systray_context_menu.ui:59
+#: gajim/data/gui/systray_context_menu.ui:52
 msgid "Mute Sounds"
 msgstr "Soinua Kendu"
 
-#: gajim/data/gui/systray_context_menu.ui:75
+#: gajim/data/gui/systray_context_menu.ui:68
 #, fuzzy
 msgid "_Preferences"
 msgstr "Hobespenak"
@@ -8483,34 +8660,34 @@ msgstr ""
 msgid "Execute expression inside a shell, send output"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:45
+#: gajim/command_system/implementation/standard.py:47
 msgid ""
 "Show help on a given command or a list of available commands if -a is given"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:73
+#: gajim/command_system/implementation/standard.py:75
 #, fuzzy
 msgid "Send a message to the contact"
 msgstr "Erabilera:/%s, ezkutatu txat-eko botoilak."
 
-#: gajim/command_system/implementation/standard.py:78
+#: gajim/command_system/implementation/standard.py:80
 msgid "Send action (in the third person) to the current chat"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:83
+#: gajim/command_system/implementation/standard.py:85
 msgid "Show logged messages which mention given text"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:88
+#: gajim/command_system/implementation/standard.py:90
 #, fuzzy, python-format
 msgid "%s: Nothing found"
 msgstr "%s ez da aurkitu"
 
-#: gajim/command_system/implementation/standard.py:94
+#: gajim/command_system/implementation/standard.py:96
 msgid "Limit must be an integer"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:118
+#: gajim/command_system/implementation/standard.py:120
 msgid ""
 "\n"
 "    Set the current status\n"
@@ -8520,133 +8697,133 @@ msgid ""
 "    "
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:136
+#: gajim/command_system/implementation/standard.py:138
 msgid "Set the current status to away"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:150
+#: gajim/command_system/implementation/standard.py:152
 msgid "Set the current status to online"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:153
+#: gajim/command_system/implementation/standard.py:155
 #, fuzzy
 msgid "Available"
 msgstr "_Libre"
 
-#: gajim/command_system/implementation/standard.py:173
-#: gajim/command_system/implementation/standard.py:250
+#: gajim/command_system/implementation/standard.py:175
+#: gajim/command_system/implementation/standard.py:252
 #, fuzzy
 msgid "Clear the text window"
 msgstr "Erabilera: %s, testu leihoa itxi."
 
-#: gajim/command_system/implementation/standard.py:178
-#: gajim/command_system/implementation/standard.py:397
+#: gajim/command_system/implementation/standard.py:180
+#: gajim/command_system/implementation/standard.py:401
 #, fuzzy
 msgid "Send a ping to the contact"
 msgstr "Fitxero bat bidali kontaktu bati"
 
-#: gajim/command_system/implementation/standard.py:181
-#: gajim/command_system/implementation/standard.py:400
+#: gajim/command_system/implementation/standard.py:183
+#: gajim/command_system/implementation/standard.py:404
 msgid "Command is not supported for zeroconf accounts"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:185
-msgid "Send DTMF sequence through an open audio session"
+#: gajim/command_system/implementation/standard.py:187
+msgid "Send DTMF sequence through an open voice chat"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:188
+#: gajim/command_system/implementation/standard.py:190
 #, fuzzy
-msgid "No open audio sessions with the contact"
+msgid "No open voice chats with the contact"
 msgstr "Sakatu kontaktu honen elkarrizketa zaharrak ikusteko"
 
-#: gajim/command_system/implementation/standard.py:191
+#: gajim/command_system/implementation/standard.py:193
 #, python-format
 msgid "%s is not a valid tone"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:198
-msgid "Toggle audio session"
+#: gajim/command_system/implementation/standard.py:200
+msgid "Toggle Voice Chat"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:201
+#: gajim/command_system/implementation/standard.py:203
 #, fuzzy
-msgid "Audio sessions are not available"
-msgstr "Konexioa ez dago erabilgarri"
+msgid "Voice chats are not available"
+msgstr "Konexioa ez erablgarri"
 
-#: gajim/command_system/implementation/standard.py:208
-msgid "Toggle video session"
+#: gajim/command_system/implementation/standard.py:210
+msgid "Toggle Video Chat"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:211
+#: gajim/command_system/implementation/standard.py:213
 #, fuzzy
-msgid "Video sessions are not available"
+msgid "Video chats are not available"
 msgstr "Konexioa ez erablgarri"
 
-#: gajim/command_system/implementation/standard.py:218
+#: gajim/command_system/implementation/standard.py:220
 #, fuzzy
 msgid "Send a message to the contact that will attract their attention"
 msgstr "Erabilera:/%s, ezkutatu txat-eko botoilak."
 
-#: gajim/command_system/implementation/standard.py:255
+#: gajim/command_system/implementation/standard.py:257
 #, fuzzy
 msgid "Change your nickname in a group chat"
 msgstr "Aldatu _Izengoitia"
 
-#: gajim/command_system/implementation/standard.py:260 gajim/gtk/dialogs.py:674
-#: gajim/gtk/bookmarks.py:272
+#: gajim/command_system/implementation/standard.py:262
 #, fuzzy
 msgid "Invalid nickname"
 msgstr "Baliogabeko izena"
 
-#: gajim/command_system/implementation/standard.py:267
+#: gajim/command_system/implementation/standard.py:269
 #, fuzzy
-msgid "Open a private chat window with a specified occupant"
+msgid "Open a private chat window with a specified participant"
 msgstr ""
 "Erabilera: /%s <nickname>, ireki txat pribatu bat espezifikatutako "
 "erabiltzaileari."
 
-#: gajim/command_system/implementation/standard.py:273
-#: gajim/command_system/implementation/standard.py:282
-#: gajim/command_system/implementation/standard.py:332
-#: gajim/command_system/implementation/standard.py:345
-#: gajim/command_system/implementation/standard.py:357
+#: gajim/command_system/implementation/standard.py:275
+#: gajim/command_system/implementation/standard.py:284
+#: gajim/command_system/implementation/standard.py:336
+#: gajim/command_system/implementation/standard.py:349
+#: gajim/command_system/implementation/standard.py:361
 #, fuzzy
 msgid "Nickname not found"
 msgstr "Izengoitia aurkitugabea: %s"
 
-#: gajim/command_system/implementation/standard.py:276
+#: gajim/command_system/implementation/standard.py:278
 #, fuzzy
 msgid ""
-"Open a private chat window with a specified occupant and send him a message"
+"Open a private chat window with a specified participant and send him a "
+"message"
 msgstr ""
 "Erabilera: /%s <nickname>, ireki txat pribatu bat espezifikatutako "
 "erabiltzaileari."
 
-#: gajim/command_system/implementation/standard.py:285
+#: gajim/command_system/implementation/standard.py:287
 #, fuzzy
 msgid "Display or change a group chat topic"
 msgstr "Galdetu leiho bat itxi baino lehen."
 
-#: gajim/command_system/implementation/standard.py:294
-msgid "Invite a user to a room for a reason"
+#: gajim/command_system/implementation/standard.py:296
+msgid "Invite a user to a group chat for a reason"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:297
+#: gajim/command_system/implementation/standard.py:299
 #, fuzzy, python-format
 msgid "Invited %(jid)s to %(room_jid)s"
 msgstr "Gonbidatu  %(contact_jid)s %(room_jid)s. gelara."
 
-#: gajim/command_system/implementation/standard.py:301
+#: gajim/command_system/implementation/standard.py:303
 #, fuzzy
-msgid "Join a group chat given by a JID"
+msgid "Join a group chat given by an XMPP Address"
 msgstr "Txat Taldean _Sartu"
 
-#: gajim/command_system/implementation/standard.py:309
+#: gajim/command_system/implementation/standard.py:313
 msgid ""
-"Leave the groupchat, optionally giving a reason, and close tab or window"
+"Leave the group chat, optionally giving a reason, and close tab or window"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:314
+#: gajim/command_system/implementation/standard.py:318
 msgid ""
 "\n"
 "    Ban user by a nick or a JID from a groupchat\n"
@@ -8655,46 +8832,46 @@ msgid ""
 "    "
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:329
+#: gajim/command_system/implementation/standard.py:333
 #, fuzzy
-msgid "Kick user by a nick from a groupchat"
+msgid "Kick user by a nick from a group chat"
 msgstr "Gela honetan ukatua izan zara."
 
-#: gajim/command_system/implementation/standard.py:338
+#: gajim/command_system/implementation/standard.py:342
 msgid ""
-"Set occupant role in group chat.\n"
+"Set participant role in group chat.\n"
 "    Role can be given as one of the following values:\n"
 "    moderator, participant, visitor, none"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:343
+#: gajim/command_system/implementation/standard.py:347
 #, fuzzy
 msgid "Invalid role given"
 msgstr "Baliogabeko izena"
 
-#: gajim/command_system/implementation/standard.py:350
+#: gajim/command_system/implementation/standard.py:354
 msgid ""
-"Set occupant affiliation in group chat.\n"
+"Set participant affiliation in group chat.\n"
 "    Affiliation can be given as one of the following values:\n"
 "    owner, admin, member, outcast, none"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:355
+#: gajim/command_system/implementation/standard.py:359
 #, fuzzy
 msgid "Invalid affiliation given"
 msgstr "Afizioak: "
 
-#: gajim/command_system/implementation/standard.py:365
+#: gajim/command_system/implementation/standard.py:369
 #, fuzzy
-msgid "Display names of all group chat occupants"
+msgid "Display names of all group chat participants"
 msgstr "Erabilera:/%s , erakutsarazi gelako pertsonen izenak."
 
-#: gajim/command_system/implementation/standard.py:387
-msgid "Forbid an occupant to send you public or private messages"
+#: gajim/command_system/implementation/standard.py:391
+msgid "Forbid a participant to send you public or private messages"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:392
-msgid "Allow an occupant to send you public or private messages"
+#: gajim/command_system/implementation/standard.py:396
+msgid "Allow a participant to send you public or private messages"
 msgstr ""
 
 #: gajim/command_system/implementation/middleware.py:74
@@ -8705,204 +8882,329 @@ msgstr ""
 msgid "The same as using a doc-string, except it supports translation"
 msgstr ""
 
-#: gajim/gtk/filetransfer.py:91
+#: gajim/gtk/groupchat_info.py:36
+#, fuzzy
+msgid "?Group chat feature:Archiving"
+msgstr "Txat Taldeko Gonbidapena"
+
+#: gajim/gtk/groupchat_info.py:37
+#, fuzzy
+msgid "Messages are archived on the server"
+msgstr "Ez zaude zerbitzarira konektatuta"
+
+#: gajim/gtk/groupchat_info.py:40
+#, fuzzy
+msgid "?Group chat feature:Persistent"
+msgstr "Txat Taldeak"
+
+#: gajim/gtk/groupchat_info.py:41
+msgid "This group chat persists even if there are no participants"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:45
+#, fuzzy
+msgid "?Group chat feature:Temporary"
+msgstr "Inor ez"
+
+#: gajim/gtk/groupchat_info.py:46
+msgid "This group chat will be destroyed once the last participant left"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:50
+#, fuzzy
+msgid "?Group chat feature:Moderated"
+msgstr "Inor ez"
+
+#: gajim/gtk/groupchat_info.py:51
+msgid ""
+"Participants entering this group chat need to request permission to send "
+"messages"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:55
+#, fuzzy
+msgid "?Group chat feature:Not Moderated"
+msgstr "Txat Taldeak"
+
+#: gajim/gtk/groupchat_info.py:56
+msgid "Participants entering this group chat are allowed to send messages"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:60
+#, fuzzy
+msgid "?Group chat feature:Open"
+msgstr "Inor ez"
+
+#: gajim/gtk/groupchat_info.py:61
+#, fuzzy
+msgid "Anyone can join this group chat"
+msgstr "%s gelan sartu da"
+
+#: gajim/gtk/groupchat_info.py:64
+#, fuzzy
+msgid "?Group chat feature:Members Only"
+msgstr "Txat Taldeko Mezu Nabarmendua"
+
+#: gajim/gtk/groupchat_info.py:65
+msgid "This group chat is restricted to members only"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:69
+#, fuzzy
+msgid "?Group chat feature:Public"
+msgstr "Txat Taldeko Mezu Nabarmendua"
+
+#: gajim/gtk/groupchat_info.py:70
+msgid "Group chat can be found via search"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:73
+#, fuzzy
+msgid "?Group chat feature:Hidden"
+msgstr "Inor ez"
+
+#: gajim/gtk/groupchat_info.py:74
+#, fuzzy
+msgid "This group chat can not be found via search"
+msgstr "Gela honek ez du gairik"
+
+#: gajim/gtk/groupchat_info.py:77
+#, fuzzy
+msgid "?Group chat feature:Not Anonymous"
+msgstr "Txat Taldeak"
+
+#: gajim/gtk/groupchat_info.py:78
+msgid "All other group chat participants can see your XMPP address"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:82
+#, fuzzy
+msgid "?Group chat feature:Semi-Anonymous"
+msgstr "Txat Taldeko Mezu Nabarmendua"
+
+#: gajim/gtk/groupchat_info.py:83
+msgid "Only moderators can see your XMPP address"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:86
+#, fuzzy
+msgid "?Group chat feature:Password Required"
+msgstr "Txat Taldeak"
+
+#: gajim/gtk/groupchat_info.py:87
+msgid "This group chat does require a password upon entry"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:91
+#, fuzzy
+msgid "?Group chat feature:No Password Required"
+msgstr "Txat Taldeak"
+
+#: gajim/gtk/groupchat_info.py:92
+msgid "This group chat does not require a password upon entry"
+msgstr ""
+
+#: gajim/gtk/filetransfer.py:90
 msgid "File"
 msgstr "Fitxeroa"
 
-#: gajim/gtk/filetransfer.py:108
+#: gajim/gtk/filetransfer.py:107
 msgid "Time"
 msgstr "Denbora"
 
-#: gajim/gtk/filetransfer.py:228
+#: gajim/gtk/filetransfer.py:227
 #, fuzzy, python-format
 msgid "File name: %s"
 msgstr "Fitxeroaren izena: %s"
 
-#: gajim/gtk/filetransfer.py:229 gajim/gtk/filetransfer.py:464
+#: gajim/gtk/filetransfer.py:228 gajim/gtk/filetransfer.py:469
 #, python-format
 msgid "Size: %s"
 msgstr "Tamaina: %s"
 
-#: gajim/gtk/filetransfer.py:239
+#: gajim/gtk/filetransfer.py:238
 #, python-format
 msgid "Sender: %s"
 msgstr "Bidaltzaile: %s"
 
-#: gajim/gtk/filetransfer.py:240 gajim/gtk/filetransfer.py:744
+#: gajim/gtk/filetransfer.py:239 gajim/gtk/filetransfer.py:749
 #: gajim/gtk/tooltips.py:577
 msgid "Recipient: "
 msgstr "Hartzailea: "
 
-#: gajim/gtk/filetransfer.py:251
+#: gajim/gtk/filetransfer.py:250
 #, python-format
 msgid "Saved in: %s"
 msgstr "%s gordea"
 
-#: gajim/gtk/filetransfer.py:256
+#: gajim/gtk/filetransfer.py:255
 msgid "File transfer completed"
 msgstr "Fitxero transferentzia osatua"
 
-#: gajim/gtk/filetransfer.py:276 gajim/gtk/filetransfer.py:285
+#: gajim/gtk/filetransfer.py:275 gajim/gtk/filetransfer.py:284
 #, fuzzy
 msgid "Connection with peer could not be established."
 msgstr "Connection with peer cannot be established."
 
-#: gajim/gtk/filetransfer.py:293
+#: gajim/gtk/filetransfer.py:292
 #, python-format
 msgid "Filename: %s"
 msgstr "Fitxeroaren izena: %s"
 
-#: gajim/gtk/filetransfer.py:294
+#: gajim/gtk/filetransfer.py:293
 #, python-format
 msgid "Recipient: %s"
 msgstr "Hartzailea: %s"
 
-#: gajim/gtk/filetransfer.py:296
+#: gajim/gtk/filetransfer.py:295
 #, python-format
 msgid "Error message: %s"
 msgstr "Errore mezua: %s"
 
-#: gajim/gtk/filetransfer.py:333
-#, fuzzy
-msgid "File transfer error"
-msgstr "Fitxero Transferitze Errorea"
-
 #: gajim/gtk/filetransfer.py:334
 #, python-format
 msgid ""
-"The file %(file)s has been received, but it seems to have been damaged along "
-"the way.\n"
+"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 ""
 
-#: gajim/gtk/filetransfer.py:350
+#: gajim/gtk/filetransfer.py:340
+#, fuzzy
+msgid "_Download Again"
+msgstr "E_z galdetu berriro  "
+
+#: gajim/gtk/filetransfer.py:355
 #, fuzzy
 msgid "Gajim can not read this file"
 msgstr "Gajim-ek ezin du fitxero honetan sartu."
 
-#: gajim/gtk/filetransfer.py:351
+#: gajim/gtk/filetransfer.py:356
 msgid "Another process is using this file."
 msgstr ""
 
-#: gajim/gtk/filetransfer.py:418
+#: gajim/gtk/filetransfer.py:423
 #, fuzzy
 msgid "File Transfer Conflict"
 msgstr "Fitxero Transferitzea Egina"
 
-#: gajim/gtk/filetransfer.py:419
+#: gajim/gtk/filetransfer.py:424
 msgid "This file already exists"
 msgstr "Fitxero hau jadanik badago"
 
-#: gajim/gtk/filetransfer.py:420
+#: gajim/gtk/filetransfer.py:425
 msgid "Resume download or replace file?"
 msgstr ""
 
-#: gajim/gtk/filetransfer.py:424
+#: gajim/gtk/filetransfer.py:429
 #, fuzzy
 msgid "Replace _File"
 msgstr "Arratsaldea"
 
-#: gajim/gtk/filetransfer.py:427
+#: gajim/gtk/filetransfer.py:432
 #, fuzzy
 msgid "Resume _Download"
 msgstr "Deskargatu"
 
-#: gajim/gtk/filetransfer.py:437
+#: gajim/gtk/filetransfer.py:442
 #, fuzzy, python-format
 msgid "Directory '%s' is not writable"
 msgstr "\"%s\" kokapena ez da idazgarria"
 
-#: gajim/gtk/filetransfer.py:438
+#: gajim/gtk/filetransfer.py:443
 #, fuzzy
 msgid "You do not have permissions to create files in this directory."
 msgstr "Ez duzu baimenik kokapen honetan fitxerorik sortzeko."
 
-#: gajim/gtk/filetransfer.py:461
+#: gajim/gtk/filetransfer.py:466
 #, python-format
 msgid "File: %s"
 msgstr "Fitxeroa: %s"
 
-#: gajim/gtk/filetransfer.py:467
+#: gajim/gtk/filetransfer.py:472
 #, python-format
 msgid "Type: %s"
 msgstr "Mota: %s"
 
-#: gajim/gtk/filetransfer.py:469
+#: gajim/gtk/filetransfer.py:474
 #, python-format
 msgid "Description: %s"
 msgstr "Deskribapena: %s"
 
-#: gajim/gtk/filetransfer.py:480
+#: gajim/gtk/filetransfer.py:485
 #, fuzzy, python-format
 msgid "%s wants to send you a file"
 msgstr "%s fitxero bat bidali nahi dizu"
 
-#: gajim/gtk/filetransfer.py:509
+#: gajim/gtk/filetransfer.py:514
 #, fuzzy
 msgid "Checking file…"
 msgstr "Profila bidaltzen..."
 
-#: gajim/gtk/filetransfer.py:524
+#: gajim/gtk/filetransfer.py:529
 #, fuzzy
 msgid "File error"
 msgstr "Fitxero Transferitze Errorea"
 
-#: gajim/gtk/filetransfer.py:561
+#: gajim/gtk/filetransfer.py:566
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 
-#: gajim/gtk/filetransfer.py:658
+#: gajim/gtk/filetransfer.py:663
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/s)"
 
-#: gajim/gtk/filetransfer.py:711 gajim/gtk/filetransfer.py:715
+#: gajim/gtk/filetransfer.py:716 gajim/gtk/filetransfer.py:720
 msgid "Invalid File"
 msgstr "Fitxero Baliogabea"
 
-#: gajim/gtk/filetransfer.py:711
+#: gajim/gtk/filetransfer.py:716
 msgid "File: "
 msgstr "Fitxeroa:"
 
-#: gajim/gtk/filetransfer.py:716
+#: gajim/gtk/filetransfer.py:721
 msgid "It is not possible to send empty files"
 msgstr "Ez da posible hutsik dauden artxiboak bidaltzea"
 
-#: gajim/gtk/filetransfer.py:742 gajim/gtk/tooltips.py:571
+#: gajim/gtk/filetransfer.py:747 gajim/gtk/tooltips.py:571
 msgid "Sender: "
 msgstr "Bidaltzailea: "
 
-#: gajim/gtk/filetransfer.py:1038
+#: gajim/gtk/filetransfer.py:1043
 #, fuzzy
 msgid "Choose a File to Send…"
 msgstr "Aukeratu Bidaltzeko Fitxeroa..."
 
 #: gajim/gtk/start_chat.py:51
 #, fuzzy
-msgid "Start new Conversation"
+msgid "Start New Conversation"
 msgstr "Konektatu"
 
-#: gajim/gtk/start_chat.py:424
-#, fuzzy
-msgid "New Groupchat"
-msgstr "Txat Taldea Berria"
+#: gajim/gtk/start_chat.py:260 gajim/gtk/start_chat.py:328
+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:603 gajim/gtk/groupchat_join.py:38
+msgid "Join Group Chat"
+msgstr "Txat Taldean Sartu"
 
-#: gajim/gtk/start_chat.py:426
+#: gajim/gtk/start_chat.py:605 gajim/gtk/add_contact.py:40
 #, fuzzy
-msgid "New Contact"
-msgstr "Kontaktu Berri bat Sartu"
+msgid "Add Contact"
+msgstr "_Kontaktua Gehitu..."
 
-#: gajim/gtk/start_chat.py:588
+#: gajim/gtk/start_chat.py:746
 #, fuzzy, python-format
-msgid "%s Group chats found"
+msgid "%s group chats found"
 msgstr "%s ez da aurkitu"
 
-#: gajim/gtk/discovery.py:70
+#: gajim/gtk/discovery.py:69
 msgid "This service has not yet responded with detailed information"
 msgstr "Zerbitzu honek ez du oraindik erantzun informazio zehaztuz."
 
-#: gajim/gtk/discovery.py:71
+#: gajim/gtk/discovery.py:70
 #, fuzzy
 msgid ""
 "This service could not respond with detailed information.\n"
@@ -8911,32 +9213,33 @@ msgstr ""
 "Zerbitzu honek ezin izan du erantzun.\n"
 "Seguraski ez du erantzun espero bezala edo ez dabil."
 
-#: gajim/gtk/discovery.py:128
+#: gajim/gtk/discovery.py:126
 msgid "Others"
 msgstr "Besteak"
 
-#: gajim/gtk/discovery.py:131
-msgid "Conference"
-msgstr "Solasaldiak"
+#: gajim/gtk/discovery.py:129
+#, fuzzy
+msgid "Group Chat"
+msgstr "Txat _Taldea"
 
-#: gajim/gtk/discovery.py:519
+#: gajim/gtk/discovery.py:518
 msgid "Without a connection, you can not browse available services"
 msgstr "Konektatu gabe ezin duzu zerbitzari erabilgarriak bilatu"
 
-#: gajim/gtk/discovery.py:606
+#: gajim/gtk/discovery.py:605
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Zerbitzaria Aurkitua %s kontua erabiliz"
 
-#: gajim/gtk/discovery.py:608
+#: gajim/gtk/discovery.py:607
 msgid "Service Discovery"
 msgstr "Zerbitzua Aurkitua"
 
-#: gajim/gtk/discovery.py:691
+#: gajim/gtk/discovery.py:690
 msgid "The service could not be found"
 msgstr "Zerbitzua ezin izan da aurkitu"
 
-#: gajim/gtk/discovery.py:692
+#: gajim/gtk/discovery.py:691
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -8944,103 +9247,82 @@ msgstr ""
 "Ez dago zerbitzurik zuk sartu duzun helbidean edo ez du erantzuten. Begiratu "
 "helbidea eta saiatu berriro."
 
-#: gajim/gtk/discovery.py:699 gajim/gtk/discovery.py:1042
+#: gajim/gtk/discovery.py:698 gajim/gtk/discovery.py:1041
 msgid "The service is not browsable"
 msgstr "Zerbitzua erabilezina"
 
-#: gajim/gtk/discovery.py:700
+#: gajim/gtk/discovery.py:699
 msgid "This type of service does not contain any items to browse."
 msgstr "Zerbitzari honek ez du menurik begiratzeko."
 
-#: gajim/gtk/discovery.py:738 gajim/gtk/discovery.py:747
+#: gajim/gtk/discovery.py:737 gajim/gtk/discovery.py:746
 #, fuzzy
 msgid "Invalid Server Name"
 msgstr "Baliogabeko izena"
 
-#: gajim/gtk/discovery.py:806
+#: gajim/gtk/discovery.py:805
 #, fuzzy, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Begiratzen %s  %s kontua erabiliz"
 
-#: gajim/gtk/discovery.py:851
+#: gajim/gtk/discovery.py:850
 #, fuzzy
 msgid "Browse"
 msgstr "_Bilatu"
 
-#: gajim/gtk/discovery.py:1043
+#: gajim/gtk/discovery.py:1042
 msgid "This service does not contain any items to browse."
 msgstr "Zerbitzari honek ez du begiratzeko menurik."
 
-#: gajim/gtk/discovery.py:1255
+#: gajim/gtk/discovery.py:1254
 #, fuzzy
 msgid "_Command"
 msgstr "Azalpenak: %s"
 
-#: gajim/gtk/discovery.py:1264 gajim/gtk/discovery.py:1422
+#: gajim/gtk/discovery.py:1263 gajim/gtk/discovery.py:1420
 msgid "Re_gister"
 msgstr "Erre_gistratu"
 
-#: gajim/gtk/discovery.py:1277
+#: gajim/gtk/discovery.py:1276
 msgid "_Search"
 msgstr "_Bilatu"
 
-#: gajim/gtk/discovery.py:1420
+#: gajim/gtk/discovery.py:1418
 msgid "_Edit"
 msgstr "_Editatu"
 
-#: gajim/gtk/discovery.py:1458
+#: gajim/gtk/discovery.py:1456
 #, fuzzy, python-format
 msgid "Scanning %(current)d / %(total)d ..."
 msgstr "Eskaneatzen  %d / %d.."
 
-#: gajim/gtk/discovery.py:1674
+#: gajim/gtk/discovery.py:1655
+msgid "Users"
+msgstr "Erabiltzaileak"
+
+#: gajim/gtk/discovery.py:1671
 msgid "Id"
 msgstr "Id"
 
-#: gajim/gtk/discovery.py:1713
-msgid "_Join"
-msgstr "_Sartu"
-
-#: gajim/gtk/discovery.py:1736
-msgid "Bookmark already set"
-msgstr "Talde agenda ezarria"
-
-#: gajim/gtk/discovery.py:1737
-#, fuzzy, python-format
-msgid "Group Chat '%s' is already in your bookmarks."
-msgstr "\"%s\" gela zure talde agendan dago jadanik."
-
-#: gajim/gtk/discovery.py:1748
-msgid "Bookmark has been added successfully"
-msgstr "Talde agenda egoki sortu da"
-
-#: gajim/gtk/discovery.py:1749
-#, fuzzy
-msgid ""
-"You can manage your bookmarks by clicking the Bookmarks menu item in your "
-"contact list."
-msgstr ""
-"Zure talde agenda moldatu dezakezu zure zerrendako aukera menuaren bidez."
-
-#: gajim/gtk/discovery.py:1950
+#: gajim/gtk/discovery.py:1900
 msgid "Subscribed"
 msgstr "Harpidetu"
 
-#: gajim/gtk/discovery.py:1959
+#: gajim/gtk/discovery.py:1909
 #, fuzzy
 msgid "Node"
 msgstr "Ezer ez"
 
-#: gajim/gtk/discovery.py:2028
+#: gajim/gtk/discovery.py:1978
 #, fuzzy
 msgid "_New post"
 msgstr "Mezu berria"
 
-#: gajim/gtk/discovery.py:2037
+#: gajim/gtk/discovery.py:1987
 msgid "_Subscribe"
 msgstr "_Harpidetu"
 
-#: gajim/gtk/discovery.py:2045
+#: gajim/gtk/discovery.py:1995
 msgid "_Unsubscribe"
 msgstr "Harpidetza ezabat_u"
 
@@ -9088,7 +9370,7 @@ msgstr "%s naiz"
 msgid "Characters typed: %s"
 msgstr "Baimenik gabeko izengoitia: %s"
 
-#: gajim/gtk/single_message.py:274 gajim/gtk/xml_console.py:169
+#: gajim/gtk/single_message.py:274 gajim/gtk/xml_console.py:166
 msgid "Connection not available"
 msgstr "Konexioa ez erablgarri"
 
@@ -9097,6 +9379,12 @@ msgstr "Konexioa ez erablgarri"
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Mesedez begiratu \"%s\" -rekin konektatuta zauden."
 
+#: gajim/gtk/single_message.py:306
+#, 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:330
 #, python-format
 msgid "RE: %s"
@@ -9107,28 +9395,28 @@ msgstr "RE: %s"
 msgid "%s wrote:\n"
 msgstr "%s idatzia:\n"
 
-#: gajim/gtk/pep_config.py:44
+#: gajim/gtk/pep_config.py:45
 #, fuzzy, python-format
 msgid "PEP Service Configuration (%s)"
 msgstr "Gelaren Konfigurazioa"
 
-#: gajim/gtk/pep_config.py:77
+#: gajim/gtk/pep_config.py:78
 #, fuzzy
 msgid "Service"
 msgstr "Zerbitzaria"
 
-#: gajim/gtk/pep_config.py:114
+#: gajim/gtk/pep_config.py:115
 msgid "PEP node was not removed"
 msgstr ""
 
-#: gajim/gtk/pep_config.py:115
+#: gajim/gtk/pep_config.py:116
 #, python-format
 msgid ""
 "PEP node %(node)s was not removed:\n"
 "%(message)s"
 msgstr ""
 
-#: gajim/gtk/pep_config.py:146
+#: gajim/gtk/pep_config.py:147
 #, fuzzy, python-format
 msgid "Configure %s"
 msgstr "_Jarraitu"
@@ -9144,17 +9432,22 @@ msgstr "Erre_gistratu"
 msgid "Registration successful"
 msgstr "vCard argitarapena egina"
 
-#: gajim/gtk/dialogs.py:54 gajim/gtk/dataform.py:659 gajim/gtk/adhoc.py:85
+#: gajim/gtk/service_registration.py:215
+#, fuzzy
+msgid "Registration failed"
+msgstr "Konexioak huts egin du"
+
+#: gajim/gtk/dialogs.py:53 gajim/gtk/dataform.py:668 gajim/gtk/adhoc.py:86
 #, fuzzy
 msgid "Cancel"
 msgstr "_kantzelatu"
 
-#: gajim/gtk/dialogs.py:129
+#: gajim/gtk/dialogs.py:128
 #, fuzzy, python-format
 msgid "Dictionary for language \"%s\" not available"
 msgstr "%s hizkuntzarako hiztegia ez dago erabilgarri"
 
-#: gajim/gtk/dialogs.py:130
+#: gajim/gtk/dialogs.py:129
 #, fuzzy, python-format
 msgid ""
 "You have to install the dictionary \"%s\" to use spellchecking, or choose "
@@ -9165,12 +9458,12 @@ msgstr ""
 "%s hiztegia instalatu behar duzu zuzentzailea erabiltzeko, edota beste "
 "hizkuntz bat aukeratu speller_language aukera erabiliz."
 
-#: gajim/gtk/dialogs.py:410 gajim/gtk/dialogs.py:425
+#: gajim/gtk/dialogs.py:322 gajim/gtk/dialogs.py:337
 #, fuzzy
 msgid "Insecure connection"
 msgstr "Konektatu"
 
-#: gajim/gtk/dialogs.py:411
+#: gajim/gtk/dialogs.py:323
 #, fuzzy, python-format
 msgid ""
 "You are about to connect to the account %(account)s (%(server)s) insecurely. "
@@ -9179,120 +9472,115 @@ msgid ""
 "Are you sure you want to do that?"
 msgstr "Metakontaktu bat sortuko duzu. Jarraitu nahi al duzu?"
 
-#: gajim/gtk/dialogs.py:416
+#: gajim/gtk/dialogs.py:328
 msgid "Yes, I really want to connect insecurely"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:417
+#: gajim/gtk/dialogs.py:329
 msgid "Gajim will NOT connect unless you check this box"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:675
-#, fuzzy
-msgid "The nickname contains invalid characters."
-msgstr "ID Jabber gelak ez du onartzen karaktererik."
-
-#: gajim/gtk/dialogs.py:734
+#: gajim/gtk/dialogs.py:561
 #, fuzzy, python-format
 msgid "Destroy %s"
 msgstr "Deskribapena: %s"
 
-#: gajim/gtk/dialogs.py:775
+#: gajim/gtk/dialogs.py:602
 #, fuzzy
 msgid "Certificate"
 msgstr "Baliogabeko izena"
 
-#: gajim/gtk/dialogs.py:786
+#: gajim/gtk/dialogs.py:613
 #, fuzzy, python-format
 msgid ""
 "Certificate for account\n"
 "%s"
 msgstr "%s konturako"
 
-#: gajim/gtk/dialogs.py:824
+#: gajim/gtk/dialogs.py:651
 msgid "Issued to\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:825 gajim/gtk/dialogs.py:830
+#: gajim/gtk/dialogs.py:652 gajim/gtk/dialogs.py:657
 msgid "Common Name (CN): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:826 gajim/gtk/dialogs.py:831
+#: gajim/gtk/dialogs.py:653 gajim/gtk/dialogs.py:658
 msgid "Organization (O): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:827 gajim/gtk/dialogs.py:832
+#: gajim/gtk/dialogs.py:654 gajim/gtk/dialogs.py:659
 msgid "Organizational Unit (OU): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:828
+#: gajim/gtk/dialogs.py:655
 #, fuzzy
 msgid "Serial Number: "
 msgstr "GG zenbakia:"
 
-#: gajim/gtk/dialogs.py:829
+#: gajim/gtk/dialogs.py:656
 msgid "Issued by\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:833
+#: gajim/gtk/dialogs.py:660
 msgid "Validity\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:834
+#: gajim/gtk/dialogs.py:661
 msgid "Issued on: "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:835
+#: gajim/gtk/dialogs.py:662
 msgid "Expires on: "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:836
+#: gajim/gtk/dialogs.py:663
 msgid "SHA-1:"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:838
+#: gajim/gtk/dialogs.py:665
 msgid "SHA-256:"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:852
+#: gajim/gtk/dialogs.py:679
 #, fuzzy
 msgid "View certificate…"
 msgstr "Baliogabeko izena"
 
-#: gajim/gtk/dialogs.py:864 gajim/gtk/accounts.py:893
+#: gajim/gtk/dialogs.py:691 gajim/gtk/accounts.py:896
 msgid "Change Password"
 msgstr "Aldatu Pasahitza"
 
-#: gajim/gtk/dialogs.py:878
+#: gajim/gtk/dialogs.py:705
 msgid "_OK"
 msgstr "_OK"
 
-#: gajim/gtk/dialogs.py:891
+#: gajim/gtk/dialogs.py:718
 #, fuzzy
 msgid "You must enter a password"
 msgstr "Pasahitza sartu behar duzu."
 
-#: gajim/gtk/dialogs.py:895
+#: gajim/gtk/dialogs.py:722
 msgid "Passwords do not match"
 msgstr "Pasahitzak desberdinak dira"
 
-#: gajim/gtk/dialogs.py:923
+#: gajim/gtk/dialogs.py:750
 #, fuzzy
 msgid "Group Chat Invitation "
 msgstr "Txat Taldeko Gonbidapena"
 
-#: gajim/gtk/dialogs.py:948
+#: gajim/gtk/dialogs.py:775
 #, fuzzy, python-format
 msgid "<b>%s</b> has invited you to join a discussion"
 msgstr "%(contact_jid)s -ek %(room_jid)s gelara gonbidatu zaitu"
 
-#: gajim/gtk/dialogs.py:951
+#: gajim/gtk/dialogs.py:778
 #, 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:959
+#: gajim/gtk/dialogs.py:786
 #, python-format
 msgid "Comment: %s"
 msgstr "Azalpenak: %s"
@@ -9307,11 +9595,6 @@ msgstr "GG zenbakia:"
 msgid "ICQ Number"
 msgstr "ICQ zanbakia:"
 
-#: gajim/gtk/add_contact.py:40
-#, fuzzy
-msgid "Add Contact"
-msgstr "_Kontaktua Gehitu..."
-
 #: gajim/gtk/add_contact.py:259
 #, fuzzy, python-format
 msgid "%s Missing"
@@ -9333,7 +9616,7 @@ msgstr "ID erabiltzaileak ez du baliabiderik eraman behar."
 
 #: gajim/gtk/add_contact.py:299
 #, fuzzy
-msgid "You cannot add yourself to your roster."
+msgid "You cannot add yourself to your contact list."
 msgstr "Nire zerrendara gehitu nahi zaitut."
 
 #: gajim/gtk/add_contact.py:304
@@ -9346,11 +9629,13 @@ msgid "Your account must be online to add new contacts."
 msgstr ""
 
 #: gajim/gtk/add_contact.py:321
-msgid "Contact already in roster"
+#, fuzzy
+msgid "Contact Already in Contact List"
 msgstr "Kontaktua jadanik badago zerrendan"
 
 #: gajim/gtk/add_contact.py:322
-msgid "This contact is already listed in your roster."
+#, fuzzy
+msgid "This contact is already in your contact list."
 msgstr "Kontaktu hau zure zerrendan dago ezarria jadanik."
 
 #: gajim/gtk/add_contact.py:379 gajim/gtk/add_contact.py:417
@@ -9391,14 +9676,14 @@ msgstr "Kontaktu Egoera Aldaketa"
 
 #: gajim/gtk/themes.py:52
 #, fuzzy
-msgid "MUC Tab New Directed Message"
+msgid "Group Chat Tab New Directed Message"
 msgstr ""
 "MUC Zuzendua\n"
 "Mezuak"
 
 #: gajim/gtk/themes.py:56
 #, fuzzy
-msgid "MUC Tab New Message"
+msgid "Group Chat Tab New Message"
 msgstr "Mezu Berria Bat"
 
 #: gajim/gtk/themes.py:60
@@ -9614,13 +9899,13 @@ msgstr "Fitxategi guztiak"
 msgid "Clear File"
 msgstr "Arratsaldea"
 
-#: gajim/gtk/settings.py:570
+#: gajim/gtk/settings.py:570 gajim/gtk/proxies.py:32
 #, fuzzy
 msgid "Manage Proxies"
 msgstr "Proxy Profila Moldatu"
 
-#: gajim/gtk/settings.py:591 gajim/gtk/preferences.py:971
-#: gajim/gtk/preferences.py:984 gajim/gtk/preferences.py:988
+#: gajim/gtk/settings.py:591 gajim/gtk/preferences.py:968
+#: gajim/gtk/preferences.py:982 gajim/gtk/preferences.py:986
 #, fuzzy
 msgid "No Proxy"
 msgstr "Proxy:"
@@ -9701,14 +9986,15 @@ msgid ""
 "        "
 msgstr ""
 
-#: gajim/gtk/about.py:47 data/org.gajim.Gajim.appdata.xml.in:10
+#: gajim/gtk/about.py:47 data/org.gajim.Gajim.desktop.in:6
+#: data/org.gajim.Gajim.appdata.xml.in:10
 #, fuzzy
-msgid "A GTK+ XMPP client"
+msgid "A GTK XMPP client"
 msgstr "GTK+ Jabber bezeroa"
 
 #: gajim/gtk/about.py:48
 #, fuzzy, python-format
-msgid "GTK+ Version: %s"
+msgid "GTK Version: %s"
 msgstr "GTK+ Bertsioa:"
 
 #: gajim/gtk/about.py:49
@@ -9890,6 +10176,25 @@ msgstr "Gelditua"
 msgid "?transfer status:Not started"
 msgstr "Gelditua"
 
+#: gajim/gtk/groupchat_creation.py:97 gajim/gtk/groupchat_creation.py:99
+msgid " (optional)..."
+msgstr ""
+
+#: gajim/gtk/groupchat_creation.py:134
+#, fuzzy
+msgid "Invalid Address"
+msgstr "Fitxero Baliogabea"
+
+#: gajim/gtk/groupchat_creation.py:182
+#, fuzzy
+msgid "Not Connected"
+msgstr "Konektatu"
+
+#: gajim/gtk/groupchat_creation.py:183
+#, fuzzy
+msgid "You have to be connected to create a group chat."
+msgstr "%s gelan sartu da"
+
 #: gajim/gtk/sounds.py:39
 msgid "Wav Sounds"
 msgstr "Wav Soinuak"
@@ -9933,50 +10238,45 @@ msgstr "Txat Taldeko Mezu Nabarmendua"
 msgid "Group Chat Message Received"
 msgstr "Txat Taldeko Mezua Jasotzean"
 
-#: gajim/gtk/dataform.py:226 gajim/gtk/dataform.py:262
+#: gajim/gtk/dataform.py:232 gajim/gtk/dataform.py:268
 #, fuzzy
 msgid "Required"
 msgstr "Pasahitza behar da"
 
-#: gajim/gtk/dataform.py:286
+#: gajim/gtk/dataform.py:293
 msgid "Yes"
 msgstr ""
 
-#: gajim/gtk/dataform.py:286
+#: gajim/gtk/dataform.py:293
 #, fuzzy
 msgid "No"
 msgstr "Ezer ez"
 
-#: gajim/gtk/dataform.py:661
+#: gajim/gtk/dataform.py:670
 msgid "Submit"
 msgstr ""
 
-#: gajim/gtk/statusicon.py:213
+#: gajim/gtk/statusicon.py:206
 #, fuzzy
 msgid "_Change Status Message…"
 msgstr "_Egoera Mezua aldatu"
 
-#: gajim/gtk/statusicon.py:247 gajim/gtk/statusicon.py:292
-#: gajim/gtk/statusicon.py:299
+#: gajim/gtk/statusicon.py:258
 #, python-format
 msgid "using account %s"
 msgstr "%s kontua erabiliz "
 
-#: gajim/gtk/statusicon.py:309
+#: gajim/gtk/statusicon.py:269
 #, fuzzy
-msgid "_Manage Bookmarks…"
-msgstr "Talde Agenda Moldatu"
+msgid "Hide _Contact List"
+msgstr "Kontaktua"
 
-#: gajim/gtk/statusicon.py:325
+#: gajim/gtk/statusicon.py:273
 #, fuzzy
-msgid "Hide _Roster"
-msgstr "Ez dago zerrendan"
-
-#: gajim/gtk/statusicon.py:329
-msgid "Show _Roster"
-msgstr "Ikusi _Zerrenda"
+msgid "Show _Contact List"
+msgstr "Ikusi _Deskonektatutako Kontaktuak"
 
-#: gajim/gtk/statusicon.py:337
+#: gajim/gtk/statusicon.py:281
 msgid "Hide this menu"
 msgstr "Ezkutatu Menua"
 
@@ -10025,37 +10325,6 @@ msgstr ""
 "Errore bat agertu da zure informazio pertsonala argitaratzen zen bitartean, "
 "saiatu berriro beranduago."
 
-#: gajim/gtk/join_groupchat.py:202
-#, fuzzy
-msgid "Invalid Room"
-msgstr "Sarrera baliogabea"
-
-#: gajim/gtk/join_groupchat.py:203
-msgid "Please choose a room"
-msgstr ""
-
-#: gajim/gtk/join_groupchat.py:222 gajim/gtk/join_groupchat.py:229
-#, fuzzy
-msgid "Invalid Nickname"
-msgstr "Baliogabeko izena"
-
-#: gajim/gtk/join_groupchat.py:223
-#, fuzzy
-msgid "Please choose a nickname"
-msgstr "Mezu berria sortu"
-
-#: gajim/gtk/join_groupchat.py:282 gajim/gtk/join_groupchat.py:288
-#: gajim/gtk/join_groupchat.py:293
-#, fuzzy
-msgid "Wrong server"
-msgstr "Host okerra"
-
-#: gajim/gtk/join_groupchat.py:283 gajim/gtk/join_groupchat.py:289
-#: gajim/gtk/join_groupchat.py:294
-#, fuzzy, python-format
-msgid "%s is not a groupchat server"
-msgstr "Hau ez da txat talde bat"
-
 #: gajim/gtk/mam_preferences.py:38
 #, python-format
 msgid "Archiving Preferences for %s"
@@ -10086,48 +10355,55 @@ msgstr "Sarrera berri bat jaso duzu:"
 msgid "Archiving Preferences Error"
 msgstr "_Hobespenak"
 
-#: gajim/gtk/advanced_config.py:81
+#: gajim/gtk/advanced_config.py:95
 #, fuzzy
 msgid "Activated"
 msgstr "Aktibatuta"
 
-#: gajim/gtk/advanced_config.py:81
+#: gajim/gtk/advanced_config.py:95
 #, fuzzy
 msgid "Deactivated"
 msgstr "Inaktiboa"
 
-#: gajim/gtk/advanced_config.py:83
-msgid "Boolean"
+#: gajim/gtk/advanced_config.py:97
+msgid "?config type:Boolean"
 msgstr ""
 
-#: gajim/gtk/advanced_config.py:84
-#, fuzzy
-msgid "Integer"
-msgstr "Taldean"
+#: gajim/gtk/advanced_config.py:98
+msgid "?config type:Integer"
+msgstr ""
 
-#: gajim/gtk/advanced_config.py:85
-msgid "Text"
+#: gajim/gtk/advanced_config.py:99
+msgid "?config type:Text"
 msgstr ""
 
-#: gajim/gtk/advanced_config.py:97
-msgid "Preference Name"
+#: gajim/gtk/advanced_config.py:100
+msgid "?config type:Color"
+msgstr ""
+
+#: gajim/gtk/advanced_config.py:112
+#, fuzzy
+msgid "?config:Preference Name"
 msgstr "Izen Hautapena"
 
-#: gajim/gtk/advanced_config.py:104
-msgid "Value"
-msgstr "Balorea"
+#: gajim/gtk/advanced_config.py:123
+#, fuzzy
+msgid "?config:Value"
+msgstr "_Jarraitu"
 
-#: gajim/gtk/advanced_config.py:113
-msgid "Type"
-msgstr "Mota"
+#: gajim/gtk/advanced_config.py:132
+msgid "?config:Type"
+msgstr ""
 
-#: gajim/gtk/advanced_config.py:168
-msgid "(None)"
-msgstr "(Ezer ez)"
+#: gajim/gtk/advanced_config.py:187
+#, fuzzy
+msgid "?config description:None"
+msgstr "Inork ez"
 
-#: gajim/gtk/advanced_config.py:299
-msgid "Hidden"
-msgstr "Ikusezin"
+#: gajim/gtk/advanced_config.py:322
+#, fuzzy
+msgid "?password:Hidden"
+msgstr "Pasahitza:"
 
 #: gajim/gtk/server_info.py:66
 #, fuzzy
@@ -10139,8 +10415,8 @@ msgstr "_Lotura kokapena kopiatu"
 msgid "%(days)s days, %(hours)s hours"
 msgstr ""
 
-#: gajim/gtk/server_info.py:218 gajim/gtk/accounts.py:749
-#: gajim/gtk/accounts.py:853
+#: gajim/gtk/server_info.py:218 gajim/gtk/accounts.py:752
+#: gajim/gtk/accounts.py:856
 #, fuzzy
 msgid "Hostname"
 msgstr "Hostname: "
@@ -10318,11 +10594,6 @@ 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_config.py:41
-#, fuzzy
-msgid "Group Chat Configuration"
-msgstr "Txat Taldeko Gonbidapena"
-
 #: gajim/gtk/groupchat_config.py:134
 #, fuzzy
 msgid "A Group Chat needs at least one Owner"
@@ -10333,68 +10604,68 @@ msgid "You are not allowed to modify the affiliation of Admins and Owners"
 msgstr ""
 
 #: gajim/gtk/groupchat_config.py:399
-msgid "An entry with this Jabber-ID already exists"
+msgid "An entry with this XMPP Address already exists"
 msgstr ""
 
-#: gajim/gtk/adhoc.py:91
+#: gajim/gtk/adhoc.py:92
 #, fuzzy
 msgid "Finish"
 msgstr "_Bukatu"
 
-#: gajim/gtk/adhoc.py:97 gajim/gtk/adhoc.py:283
+#: gajim/gtk/adhoc.py:98 gajim/gtk/adhoc.py:284
 #, fuzzy
 msgid "Commands"
 msgstr "Azalpenak: %s"
 
-#: gajim/gtk/adhoc.py:103
+#: gajim/gtk/adhoc.py:104
 msgid "Next"
 msgstr ""
 
-#: gajim/gtk/adhoc.py:109
+#: gajim/gtk/adhoc.py:110
 msgid "Previous"
 msgstr ""
 
-#: gajim/gtk/adhoc.py:115
+#: gajim/gtk/adhoc.py:116
 #, fuzzy
 msgid "Execute"
 msgstr "_Komandoa Exekutatu..."
 
-#: gajim/gtk/adhoc.py:195
+#: gajim/gtk/adhoc.py:196
 #, fuzzy
 msgid "No commands available"
 msgstr "Ez dago konturik erabilgarri"
 
-#: gajim/gtk/adhoc.py:244
+#: gajim/gtk/adhoc.py:245
 #, fuzzy
 msgid "Request Command List"
 msgstr "_Komandoa Exekutatu..."
 
-#: gajim/gtk/adhoc.py:259
+#: gajim/gtk/adhoc.py:260
 #, fuzzy
 msgid "Executing…"
 msgstr "_Komandoa Exekutatu..."
 
-#: gajim/gtk/adhoc.py:266
+#: gajim/gtk/adhoc.py:267
 #, fuzzy
 msgid "Command List"
 msgstr "Azalpenak: %s"
 
-#: gajim/gtk/adhoc.py:384
+#: gajim/gtk/adhoc.py:385
 #, fuzzy
 msgid "Finished"
 msgstr "_Bukatu"
 
-#: gajim/gtk/adhoc.py:453
+#: gajim/gtk/adhoc.py:454
 #, fuzzy
 msgid "Execution failed"
 msgstr "Konexioak huts egin du"
 
-#: gajim/gtk/blocking.py:37
+#: gajim/gtk/blocking.py:38
 #, fuzzy, python-format
 msgid "Blocking List for %s"
 msgstr "Debekatze Zerrenda %s-entzat"
 
-#: gajim/gtk/blocking.py:71
+#: gajim/gtk/blocking.py:72
 #, fuzzy
 msgid "Error!"
 msgstr "Avahi error"
@@ -10442,8 +10713,7 @@ msgstr "Baliogabeko izena"
 msgid "You must provide a username to configure this account."
 msgstr "Izen bat sartu behar duzu kontu bat sortzeko."
 
-#: gajim/gtk/account_wizard.py:252 gajim/gtk/bookmarks.py:290
-#: gajim/gtk/bookmarks.py:303
+#: gajim/gtk/account_wizard.py:252
 #, fuzzy
 msgid "Invalid server"
 msgstr "Baliogabeko izena"
@@ -10461,7 +10731,7 @@ msgstr "Sarrera baliogabea"
 msgid "Custom port must be a port number."
 msgstr "Bezeroaren portua portu zenbaki bat izan behar da."
 
-#: gajim/gtk/account_wizard.py:405
+#: gajim/gtk/account_wizard.py:406
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -10471,16 +10741,16 @@ msgid ""
 "Do you still want to connect to this server?"
 msgstr ""
 
-#: gajim/gtk/account_wizard.py:446 gajim/gtk/account_wizard.py:480
+#: gajim/gtk/account_wizard.py:447 gajim/gtk/account_wizard.py:481
 #, fuzzy
 msgid "An error occurred during account creation"
 msgstr "Errore bat gertatu da kontua sortzen zen bitartean"
 
-#: gajim/gtk/account_wizard.py:545
+#: gajim/gtk/account_wizard.py:546
 msgid "Account name is in use"
 msgstr "Kontu izena erabiltzen ari da"
 
-#: gajim/gtk/account_wizard.py:546
+#: gajim/gtk/account_wizard.py:547
 msgid "You already have an account using this name."
 msgstr "Jadanik baduzu kontu izen hau erabilgarri."
 
@@ -10508,26 +10778,26 @@ msgstr ""
 msgid "%(minutes)s min %(seconds)s sec"
 msgstr ""
 
-#: gajim/gtk/xml_console.py:77
+#: gajim/gtk/xml_console.py:74
 #, fuzzy
 msgid "Filter"
 msgstr "Filtroa:"
 
-#: gajim/gtk/xml_console.py:82
+#: gajim/gtk/xml_console.py:79
 #, fuzzy
 msgid "XML Input"
 msgstr "<b>XML Sarrera</b>"
 
-#: gajim/gtk/xml_console.py:86
+#: gajim/gtk/xml_console.py:83
 msgid "Paste Last Input"
 msgstr ""
 
-#: gajim/gtk/xml_console.py:170
+#: gajim/gtk/xml_console.py:167
 #, fuzzy, python-format
 msgid "Please make sure you are connected with '%s'."
 msgstr "Mesedez begiratu \"%s\" -rekin konektatuta zauden."
 
-#: gajim/gtk/xml_console.py:182
+#: gajim/gtk/xml_console.py:177
 #, fuzzy
 msgid "Invalid Node"
 msgstr "Fitxero Baliogabea"
@@ -10560,306 +10830,316 @@ msgstr "Bilatu"
 msgid "No results found"
 msgstr "%s ez da aurkitu"
 
-#: gajim/gtk/preferences.py:358 gajim/gtk/preferences.py:362
+#: gajim/gtk/preferences.py:357 gajim/gtk/preferences.py:361
 msgid "Default"
 msgstr "Berezkoa"
 
-#: gajim/gtk/preferences.py:801
+#: gajim/gtk/preferences.py:798
 msgid "status message title"
 msgstr "egoera mezuaren izenburua"
 
-#: gajim/gtk/preferences.py:802
+#: gajim/gtk/preferences.py:799
 msgid "status message text"
 msgstr "egoera mezuaren testua"
 
+#: gajim/gtk/accounts.py:137
+#, fuzzy
+msgid "Re-Login"
+msgstr "Birkargatu orain?"
+
 #: gajim/gtk/accounts.py:138
-msgid "Relogin now?"
+#, fuzzy
+msgid "Re-Login now?"
 msgstr "Birkargatu orain?"
 
 #: gajim/gtk/accounts.py:139
-msgid "If you want all the changes to apply instantly, you must relogin."
+#, 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:191 gajim/gtk/accounts.py:975
+#: gajim/gtk/accounts.py:141
+msgid "_Later"
+msgstr ""
+
+#: gajim/gtk/accounts.py:143
+msgid "_Re-Login"
+msgstr ""
+
+#: gajim/gtk/accounts.py:194 gajim/gtk/accounts.py:978
 #, fuzzy
 msgid "Remove Account"
 msgstr "%s kontua ezabatzen"
 
-#: gajim/gtk/accounts.py:192
+#: gajim/gtk/accounts.py:195
 #, fuzzy, python-format
 msgid "You still have open chats in your account %s"
 msgstr "Txat-a %s kontuan ireki duzu"
 
-#: gajim/gtk/accounts.py:193
+#: gajim/gtk/accounts.py:196
 #, fuzzy
 msgid ""
 "All chat and group chat windows will be closed.\n"
 "Do you want to continue?"
 msgstr "Elkarrizketa guztiak itxiko dira. Jarraitu nahi al duzu?"
 
-#: gajim/gtk/accounts.py:424
+#: gajim/gtk/accounts.py:427
 #, fuzzy
 msgid "Back"
 msgstr "Laster etorriko naiz"
 
-#: gajim/gtk/accounts.py:530
+#: gajim/gtk/accounts.py:533
 #, fuzzy
 msgid "Please check if Bonjour is installed."
 msgstr "Mesedez begiratu Avahi  instalatuta dagoen."
 
-#: gajim/gtk/accounts.py:532
+#: gajim/gtk/accounts.py:535
 #, fuzzy
 msgid "Please check if Avahi is installed."
 msgstr "Mesedez begiratu Avahi  instalatuta dagoen."
 
-#: gajim/gtk/accounts.py:569
+#: gajim/gtk/accounts.py:572
 #, fuzzy
 msgid "Disable Account"
 msgstr "Kontu izen baliogabea"
 
-#: gajim/gtk/accounts.py:570
+#: gajim/gtk/accounts.py:573
 #, fuzzy, python-format
 msgid "Account %s is still connected"
 msgstr "\"%s\"  kontua zerbitzarira konektatu da"
 
-#: gajim/gtk/accounts.py:571
+#: gajim/gtk/accounts.py:574
 #, fuzzy
 msgid ""
 "All chat and group chat windows will be closed. Do you want to continue?"
 msgstr "Elkarrizketa guztiak itxiko dira. Jarraitu nahi al duzu?"
 
-#: gajim/gtk/accounts.py:576
+#: gajim/gtk/accounts.py:579
 #, fuzzy
 msgid "_Disable Account"
 msgstr "Kontu izen baliogabea"
 
-#: gajim/gtk/accounts.py:595
+#: gajim/gtk/accounts.py:598
 #, fuzzy
 msgid "Add Account"
 msgstr "_Kontaktua Gehitu..."
 
-#: gajim/gtk/accounts.py:663
+#: gajim/gtk/accounts.py:666
 msgid "Label"
 msgstr ""
 
-#: gajim/gtk/accounts.py:667
+#: gajim/gtk/accounts.py:670
 msgid "Login"
 msgstr ""
 
-#: gajim/gtk/accounts.py:670
+#: gajim/gtk/accounts.py:673
 #, fuzzy
 msgid "Import Contacts"
 msgstr "Kontaktua"
 
-#: gajim/gtk/accounts.py:674 gajim/gtk/accounts.py:870
+#: gajim/gtk/accounts.py:677 gajim/gtk/accounts.py:873
 #, fuzzy
 msgid "Client Certificate"
 msgstr "Baliogabeko izena"
 
-#: gajim/gtk/accounts.py:677 gajim/gtk/accounts.py:774
+#: gajim/gtk/accounts.py:680 gajim/gtk/accounts.py:777
 #, fuzzy
 msgid "Connect on startup"
 msgstr "K_onektatu Gajim irikitzean"
 
-#: gajim/gtk/accounts.py:681 gajim/gtk/accounts.py:779
+#: gajim/gtk/accounts.py:684 gajim/gtk/accounts.py:782
 #, fuzzy
 msgid "Save conversations for all contacts"
 msgstr "_Gorde kontu guztien elkarrizketak"
 
-#: gajim/gtk/accounts.py:683 gajim/gtk/accounts.py:781
+#: gajim/gtk/accounts.py:686 gajim/gtk/accounts.py:784
 msgid "Store conversations on the harddrive"
 msgstr ""
 
-#: gajim/gtk/accounts.py:685 gajim/gtk/accounts.py:783
+#: gajim/gtk/accounts.py:688 gajim/gtk/accounts.py:786
 #, fuzzy
 msgid "Global Status"
 msgstr "Egoera Guztiak"
 
-#: gajim/gtk/accounts.py:687
+#: gajim/gtk/accounts.py:690
 #, fuzzy
 msgid "Synchronise the status of all accounts"
 msgstr "Aldatu kontaktuaren edo kontaktuen egoera"
 
-#: gajim/gtk/accounts.py:689
+#: gajim/gtk/accounts.py:692
 msgid "Use file transfer proxies"
 msgstr "Erabili proxy fitxero transferentzia"
 
-#: gajim/gtk/accounts.py:705
+#: gajim/gtk/accounts.py:708
 #, fuzzy
 msgid "Idle Time"
 msgstr " %s-etik"
 
-#: gajim/gtk/accounts.py:707
+#: gajim/gtk/accounts.py:710
 msgid "Disclose the time of your last activity"
 msgstr ""
 
-#: gajim/gtk/accounts.py:709
+#: gajim/gtk/accounts.py:712
 msgid "Local System Time"
 msgstr ""
 
-#: gajim/gtk/accounts.py:711
+#: gajim/gtk/accounts.py:714
 msgid "Disclose the local system time of the device Gajim runs on"
 msgstr ""
 
-#: gajim/gtk/accounts.py:714
+#: gajim/gtk/accounts.py:717
 #, fuzzy
 msgid "Client / Operating System"
 msgstr "Baliogabeko izena"
 
-#: gajim/gtk/accounts.py:716
+#: gajim/gtk/accounts.py:719
 #, fuzzy
 msgid ""
 "Disclose informations about the client and operating system you currently use"
 msgstr "Hautatua badago, Gajim-ek  txat talde honetan sartuko da abiaraztean"
 
-#: gajim/gtk/accounts.py:719
+#: gajim/gtk/accounts.py:722
 #, fuzzy
 msgid "Ignore Unknown Contacts"
 msgstr "Kontaktua"
 
-#: gajim/gtk/accounts.py:721
+#: gajim/gtk/accounts.py:724
 #, fuzzy
 msgid "Ignore everything from contacts not in your Roster"
 msgstr "_Zerrendan ez dauden kontaktuen gertaerak baztertu"
 
-#: gajim/gtk/accounts.py:737 gajim/gtk/accounts.py:776
+#: gajim/gtk/accounts.py:740 gajim/gtk/accounts.py:779
 #, fuzzy
 msgid "Use environment variable"
 msgstr "Konexioa ez erablgarri"
 
-#: gajim/gtk/accounts.py:739
-#, fuzzy
-msgid "Proxy"
-msgstr "Proxy:"
-
-#: gajim/gtk/accounts.py:742
+#: gajim/gtk/accounts.py:745
 #, fuzzy
 msgid "Warn on insecure connection"
 msgstr "Konektatu"
 
-#: gajim/gtk/accounts.py:746
+#: gajim/gtk/accounts.py:749
 msgid "Send keep-alive packets"
 msgstr "Bidali keep-alive paketeak"
 
-#: gajim/gtk/accounts.py:750
+#: gajim/gtk/accounts.py:753
 msgid "Manually set the hostname for the server"
 msgstr ""
 
-#: gajim/gtk/accounts.py:756 gajim/gtk/accounts.py:826
-#: gajim/gtk/accounts.py:831
+#: gajim/gtk/accounts.py:759 gajim/gtk/accounts.py:829
+#: gajim/gtk/accounts.py:834
 #, fuzzy
 msgid "Priority"
 msgstr "Lehentas_una:"
 
-#: gajim/gtk/accounts.py:785
+#: gajim/gtk/accounts.py:788
 #, fuzzy
 msgid "Synchronize the status of all accounts"
 msgstr "Aldatu kontaktuaren edo kontaktuen egoera"
 
-#: gajim/gtk/accounts.py:795
+#: gajim/gtk/accounts.py:798
 #, fuzzy
 msgid "First Name"
 msgstr "Lehen Izena:"
 
-#: gajim/gtk/accounts.py:798
+#: gajim/gtk/accounts.py:801
 #, fuzzy
 msgid "Last Name"
 msgstr "Azken Izena:"
 
-#: gajim/gtk/accounts.py:804
+#: gajim/gtk/accounts.py:807
 #, fuzzy
 msgid "Email"
 msgstr "E-Posta Berria"
 
-#: gajim/gtk/accounts.py:822
+#: gajim/gtk/accounts.py:825
 #, fuzzy
 msgid "Adjust to status"
 msgstr "Egoerarekin b_at egin"
 
-#: gajim/gtk/accounts.py:849
+#: gajim/gtk/accounts.py:852
 msgid "Enable"
 msgstr "Aktibatu"
 
-#: gajim/gtk/accounts.py:857
+#: gajim/gtk/accounts.py:860
 #, fuzzy
 msgid "Port"
 msgstr "_Portua:"
 
-#: gajim/gtk/accounts.py:862
+#: gajim/gtk/accounts.py:865
 #, fuzzy
 msgid "Connection Settings"
 msgstr "Konektatu"
 
-#: gajim/gtk/accounts.py:872
+#: gajim/gtk/accounts.py:875
 msgid "PKCS12 Files"
 msgstr ""
 
-#: gajim/gtk/accounts.py:874
+#: gajim/gtk/accounts.py:877
 #, fuzzy
 msgid "Encrypted Certificate"
 msgstr "Baliogabeko izena"
 
-#: gajim/gtk/accounts.py:878
+#: gajim/gtk/accounts.py:881
 #, fuzzy
 msgid "Certificate Settings"
 msgstr "Baliogabeko izena"
 
-#: gajim/gtk/accounts.py:890
+#: gajim/gtk/accounts.py:893
 #, fuzzy
 msgid "Save Password"
 msgstr "Gorde pasahitza"
 
-#: gajim/gtk/accounts.py:898
+#: gajim/gtk/accounts.py:901
 #, fuzzy
 msgid "Login Settings"
 msgstr "Konexioak huts egin du"
 
-#: gajim/gtk/accounts.py:931
+#: gajim/gtk/accounts.py:934
 #, fuzzy, python-format
 msgid "Removing account %s"
 msgstr "%s kontua ezabatzen"
 
-#: gajim/gtk/accounts.py:946
+#: gajim/gtk/accounts.py:949
 #, fuzzy
 msgid "Account is disabled"
 msgstr "Enkriptazioa desaktibatuta"
 
-#: gajim/gtk/accounts.py:947
+#: gajim/gtk/accounts.py:950
 #, fuzzy
 msgid "To unregister from a server, the account must be enabled."
 msgstr "Kontuko izena aldatzeko deskonektatuta egon behar zara."
 
-#: gajim/gtk/accounts.py:962
+#: gajim/gtk/accounts.py:965
 #, fuzzy
 msgid "Password required"
 msgstr "Pasahitza behar da"
 
-#: gajim/gtk/accounts.py:976
+#: gajim/gtk/accounts.py:979
 #, fuzzy, python-format
 msgid "Account '%s' is still connected to the server"
 msgstr "\"%s\"  kontua zerbitzarira konektatu da"
 
-#: gajim/gtk/accounts.py:978
+#: gajim/gtk/accounts.py:981
 msgid "If you remove it, the connection will be lost."
 msgstr "Hau ezabatzen baduzu, konexioa galdu egingo da."
 
-#: gajim/gtk/accounts.py:995
+#: gajim/gtk/accounts.py:998
 #, fuzzy, python-format
 msgid "Connection to server %s failed"
 msgstr "Konexioak huts egin du"
 
-#: gajim/gtk/accounts.py:996
+#: gajim/gtk/accounts.py:999
 #, fuzzy
 msgid "What would you like to do?"
 msgstr "Zer nahi duzu egitea?"
 
-#: gajim/gtk/accounts.py:997
+#: gajim/gtk/accounts.py:1000
 #, fuzzy
 msgid "Remove only from Gajim"
 msgstr "Ezabatu k_ontua Gajim-etik bakarrik"
 
-#: gajim/gtk/accounts.py:998
+#: gajim/gtk/accounts.py:1001
 msgid "Don't remove anything. I'll try again later"
 msgstr ""
 
@@ -10883,6 +11163,10 @@ msgstr "Nire kontaktu zerrendara nahi zaitut sartu."
 msgid "Modify"
 msgstr "_Eraldatu"
 
+#: gajim/gtk/roster_item_exchange.py:80
+msgid "JID"
+msgstr "JID"
+
 #: gajim/gtk/roster_item_exchange.py:86
 #, fuzzy
 msgid "Groups"
@@ -10907,50 +11191,29 @@ msgid_plural "Removed %d contacts"
 msgstr[0] "Zerrendatik kontaktua ezabatu"
 msgstr[1] "Zerrendatik kontaktua ezabatu"
 
-#: gajim/gtk/util.py:581
+#: gajim/gtk/util.py:583
 msgid "Unknown Artist"
 msgstr ""
 
-#: gajim/gtk/util.py:582
+#: gajim/gtk/util.py:584
 msgid "Unknown Title"
 msgstr ""
 
-#: gajim/gtk/util.py:583
+#: gajim/gtk/util.py:585
 msgid "Unknown Source"
 msgstr ""
 
-#: gajim/gtk/util.py:585
+#: gajim/gtk/util.py:587
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
 "from <i>%(source)s</i>"
 msgstr ""
 
-#: gajim/gtk/bookmarks.py:121
-msgid "New Group Chat"
-msgstr "Txat Taldea Berria"
-
-#: gajim/gtk/bookmarks.py:161
-msgid "This bookmark has invalid data"
-msgstr "Talde agenda honek datu-banku baliogabea du"
-
-#: gajim/gtk/bookmarks.py:162
-msgid ""
-"Please be sure to fill out server and room fields or remove this bookmark."
-msgstr ""
-"Mesedez ziurtatu ezazu zerbitzariaren eta gelaren informazioa betetzeaz edo "
-"talde agenda hau ezabatzeaz"
-
-#: gajim/gtk/bookmarks.py:273 gajim/gtk/bookmarks.py:291
-#: gajim/gtk/bookmarks.py:304 gajim/gtk/bookmarks.py:335
-#, fuzzy
-msgid "Character not allowed"
-msgstr "Baimenik gabeko izengoitia: %s"
-
-#: gajim/gtk/bookmarks.py:334
-#, fuzzy
-msgid "Invalid room"
-msgstr "Sarrera baliogabea"
+#: gajim/gtk/bookmarks.py:47
+#, fuzzy, python-format
+msgid "Bookmarks for %s"
+msgstr "_Talde Agendan Sartu Gela hau"
 
 #: gajim/plugins/pluginmanager.py:736 gajim/plugins/pluginmanager.py:742
 msgid "Archive corrupted"
@@ -10962,50 +11225,53 @@ msgid "Archive empty"
 msgstr "Fitxeroaren tokia"
 
 #: gajim/plugins/pluginmanager.py:750 gajim/plugins/pluginmanager.py:758
-#: gajim/plugins/gui.py:257
+#: gajim/plugins/gui.py:258
 msgid "Archive is malformed"
 msgstr ""
 
-#: gajim/plugins/pluginmanager.py:766 gajim/plugins/gui.py:281
-#: gajim/plugins/gui.py:289
+#: gajim/plugins/pluginmanager.py:766 gajim/plugins/gui.py:288
+#: gajim/plugins/gui.py:301
 #, fuzzy
 msgid "Plugin already exists"
 msgstr "Fitxero hau jadanik badago"
 
-#: gajim/plugins/gui.py:82
+#: gajim/plugins/gui.py:83
 msgid "Click to view Gajim's wiki page on how to install plugins in Flatpak."
 msgstr ""
 
-#: gajim/plugins/gui.py:89
+#: gajim/plugins/gui.py:90
 msgid "Plugin"
 msgstr ""
 
-#: gajim/plugins/gui.py:151
+#: gajim/plugins/gui.py:152
 #, fuzzy, python-format
 msgid "Warning: %s"
 msgstr "Debekatzen %s"
 
-#: gajim/plugins/gui.py:206
+#: gajim/plugins/gui.py:207
 #, fuzzy
 msgid "Plugin failed"
 msgstr "Konexioak huts egin du"
 
-#: gajim/plugins/gui.py:245
+#: gajim/plugins/gui.py:246
 msgid "Unable to properly remove the plugin"
 msgstr ""
 
-#: gajim/plugins/gui.py:281
-msgid "Overwrite?"
-msgstr ""
+#: gajim/plugins/gui.py:287
+#, fuzzy
+msgid "Overwrite Plugin?"
+msgstr "Egoera Mezua"
+
+#: gajim/plugins/gui.py:289
+#, fuzzy
+msgid "Do you want to overwrite the currently installed version?"
+msgstr "Ezabatu nahi al duzu %s taldea zerrendatik?"
 
 #: data/org.gajim.Gajim.desktop.in:5
-msgid "Jabber IM Client"
+#, fuzzy
+msgid "XMPP IM Client"
 msgstr "IM Jabber Bezeroa"
 
-#: data/org.gajim.Gajim.desktop.in:6
-msgid "A GTK+ Jabber client"
-msgstr "GTK+ Jabber bezeroa"
-
 #: data/org.gajim.Gajim.desktop.in:8
 msgid "chat;messaging;im;xmpp;bonjour;voip;"
 msgstr ""
@@ -11057,7 +11323,7 @@ msgid "Easily send pictures, videos or other files to friends and groups"
 msgstr ""
 
 #: data/org.gajim.Gajim.appdata.xml.in:27
-msgid "Chat securely with End-to-End encryption via OMEMO or PGP"
+msgid "Chat securely with End-to-End encryption via OMEMO or OpenPGP"
 msgstr ""
 
 #: data/org.gajim.Gajim.appdata.xml.in:28
@@ -11118,7 +11384,7 @@ msgstr ""
 
 #: data/org.gajim.Gajim.appdata.xml.in:52
 #, fuzzy
-msgid "Roster, list of contacts"
+msgid "Contact list, list of contacts"
 msgstr "Kontaktuen egoera aldaketak gorde"
 
 #: data/org.gajim.Gajim.appdata.xml.in:56
@@ -11140,6 +11406,485 @@ msgstr "Berriki:"
 msgid "Plugin manager"
 msgstr "Konexioak huts egin du"
 
+#, fuzzy
+#~ msgid "Configure Services…"
+#~ msgstr "_Zerbitzuak Aurkitu..."
+
+#, fuzzy
+#~ msgid "Group Chat Bookmarks"
+#~ msgstr "Txat Taldea"
+
+#, fuzzy
+#~ msgid "Add Bookmark"
+#~ msgstr "_Talde Agendan Sartu Gela hau"
+
+#, fuzzy
+#~ msgid "Remove Bookmark"
+#~ msgstr "_Talde Agendan Sartu Gela hau"
+
+#, fuzzy
+#~ msgid "Bookmark Name"
+#~ msgstr "_Talde Agendan Sartu Gela hau"
+
+#, fuzzy
+#~ msgid "_Server"
+#~ msgstr "_Zerbitzaria"
+
+#, fuzzy
+#~ msgid "_Password"
+#~ msgstr "_Pasahitza:"
+
+#, fuzzy
+#~ msgid "Join chat when connected"
+#~ msgstr "Kontaktua Deskonektatuta"
+
+#~ msgid "New Group Chat"
+#~ msgstr "Txat Taldea Berria"
+
+#~ msgid "This bookmark has invalid data"
+#~ msgstr "Talde agenda honek datu-banku baliogabea du"
+
+#, fuzzy
+#~ msgid ""
+#~ "Please be sure to fill out server and group chat fields or remove this "
+#~ "bookmark."
+#~ msgstr ""
+#~ "Mesedez ziurtatu ezazu zerbitzariaren eta gelaren informazioa betetzeaz "
+#~ "edo talde agenda hau ezabatzeaz"
+
+#, fuzzy
+#~ msgid "Character not allowed"
+#~ msgstr "Baimenik gabeko izengoitia: %s"
+
+#, fuzzy
+#~ msgid "Invalid Group Chat"
+#~ msgstr "Jabber ID gela baliogabea"
+
+#~ msgid "Unable to join group chat"
+#~ msgstr "Ezin da gela honetara sartu"
+
+#, fuzzy
+#~ msgid "You are banned from group chat <b>%s</b>."
+#~ msgstr "Gela honetan ukatua izan zara."
+
+#, fuzzy
+#~ msgid "Remote server <b>%s</b> does not exist."
+#~ msgstr "Honako gela honek ez du existitzen."
+
+#, fuzzy
+#~ msgid "Group chat <b>%s</b> does not exist."
+#~ msgstr "Honako gela honek ez du existitzen."
+
+#, fuzzy
+#~ msgid "Group chat creation is not permitted."
+#~ msgstr "Gela sortzea mugatua dago."
+
+#, fuzzy
+#~ msgid "You must use your registered nickname in <b>%s</b>."
+#~ msgstr "Erregistratutako izengoitia erabilia izan behar da."
+
+#, fuzzy
+#~ msgid "You are not in the members list in group chat %s."
+#~ msgstr "Ez zaude kideen zerrendan."
+
+#, fuzzy
+#~ msgid "XMPP Address is not a group chat"
+#~ msgstr "Hau ez da txat talde bat"
+
+#~ msgid "This is not a group chat"
+#~ msgstr "Hau ez da txat talde bat"
+
+#, fuzzy
+#~ msgid "Please choose a group chat"
+#~ msgstr "Mezu berria sortu"
+
+#, fuzzy
+#~ msgid "Invalid Nickname"
+#~ msgstr "Baliogabeko izena"
+
+#, fuzzy
+#~ msgid "Please choose a nickname"
+#~ msgstr "Mezu berria sortu"
+
+#, fuzzy
+#~ msgid "Wrong server"
+#~ msgstr "Host okerra"
+
+#, fuzzy
+#~ msgid "%s is not a group chat server"
+#~ msgstr "Hau ez da txat talde bat"
+
+#, fuzzy
+#~ msgid "A Password is required to join the group chat %s. Please type it."
+#~ msgstr "Pasahitza behar da gela honetan sartzeko."
+
+#~ msgid "Not in Roster"
+#~ msgstr "Ez dago zerrendan"
+
+#~ msgid "I would like to add you to my roster"
+#~ msgstr "Nire zerrendara nahi nizuke sartu"
+
+#, fuzzy
+#~ msgid "Add to Roster"
+#~ msgstr "_Zerrendara Sartu"
+
+#, fuzzy
+#~ msgid "Manage Room"
+#~ msgstr "Talde Agenda Moldatu"
+
+#, fuzzy
+#~ msgid "Configure Room"
+#~ msgstr "Gela Konfigu_ratu"
+
+#, fuzzy
+#~ msgid "Destroy Room"
+#~ msgstr "Deskribapena: %s"
+
+#, fuzzy
+#~ msgid "Change Nick"
+#~ msgstr "Aldatu _Izengoitia"
+
+#, fuzzy
+#~ msgid "Disconnect"
+#~ msgstr "Kontaktua Deskonektatuta"
+
+#, fuzzy
+#~ msgid "Copy JID"
+#~ msgstr "Gela:"
+
+#, fuzzy
+#~ msgid "Add to Roster…"
+#~ msgstr "_Zerrendara Sartu"
+
+#, fuzzy
+#~ msgid "Copy JID/Email"
+#~ msgstr "_Kopiatu JID/Email-a"
+
+#, fuzzy
+#~ msgid "JID: <i>%s</i>"
+#~ msgstr "Jabber ID: <i>%s</i>"
+
+#~ msgid "Changing Subject"
+#~ msgstr "Gaia Aldatu"
+
+#~ msgid "Please specify the new subject:"
+#~ msgstr "Gai berria zehaztu:"
+
+#, fuzzy
+#~ msgid "You (%s) joined the room"
+#~ msgstr "%s gelan sartu da"
+
+#, fuzzy
+#~ msgid "Unable to join groupchat"
+#~ msgstr "Ezin da gela honetara sartu"
+
+#~ msgid "Groupchat Invitation"
+#~ msgstr "Txat Taldeko Gonbidapena"
+
+#, fuzzy
+#~ msgid "%(jid)s has been invited in this room"
+#~ msgstr "%(nick)s botata izan da %(who)s -engatik: %(reason)s"
+
+#, fuzzy
+#~ msgid "JID is not a Groupchat"
+#~ msgstr "Hau ez da txat talde bat"
+
+#~ msgid "Invalid JID"
+#~ msgstr "JID Baliogabea"
+
+#~ msgid "A connection is not available"
+#~ msgstr "Konexioa ez dago erabilgarri"
+
+#, fuzzy
+#~ msgid "JID already in list"
+#~ msgstr "IM Jabber Bezeroa"
+
+#, fuzzy
+#~ msgid "For the chosen encryption there is no encryption method available"
+#~ msgstr "Konexioa ez dago erabilgarri"
+
+#~ msgid "Removes contact from roster"
+#~ msgstr "Zerrendatik kontaktua ezabatu"
+
+#, fuzzy
+#~ msgid "Not in roster"
+#~ msgstr "Ez dago zerrendan"
+
+#, fuzzy
+#~ msgid "Contact signed in notification color."
+#~ msgstr "_Ikusarazi gertaera zerrendan"
+
+#, fuzzy
+#~ msgid "Contact signout notification color"
+#~ msgstr "_Ikusarazi gertaera zerrendan"
+
+#, fuzzy
+#~ msgid "File transfer request notification color."
+#~ msgstr "Fitxeroa Transferitzeko Baimena"
+
+#, fuzzy
+#~ msgid "File transfer error notification color."
+#~ msgstr "Fitxero transferentzia ezeztatua"
+
+#, fuzzy
+#~ msgid "File transfer complete or stopped notification color."
+#~ msgstr "Fitxero transferentzia bukatzean erakutsi popup jakinarazte bat"
+
+#, fuzzy
+#~ msgid "Groupchat invitation notification color"
+#~ msgstr "Txat Taldeko Gonbidapena"
+
+#~ msgid "Add * and [n] in roster title?"
+#~ msgstr "Sartu * eta [n] zerrendako izenburuan?"
+
+#~ msgid "Hides the banner in two persons chat window"
+#~ msgstr "Ezkutatu banner-a bi pertsonen txat leihoan "
+
+#, fuzzy
+#~ msgid ""
+#~ "Show the confirm metacontacts creation dialog or not? Empty string means "
+#~ "never show the dialog."
+#~ msgstr ""
+#~ "Ikusi beharko da metakontaktuen baieztatze leihoa?  Empty string means we "
+#~ "never show the dialog."
+
+#, fuzzy
+#~ msgid "Language for which misspelled words will be checked"
+#~ msgstr "Zuzentzeko erabili nahi dugun hizkuntza"
+
+#~ msgid "I'm eating, so leave me a message."
+#~ msgstr "Jaten ari naiz, utzi mezu bat beraz."
+
+#, fuzzy
+#~ msgid "from room %s"
+#~ msgstr "%s naiz"
+
+#, fuzzy
+#~ msgid "Leave Groupchats"
+#~ msgstr "Txat Taldea Berria"
+
+#, fuzzy
+#~ msgid "Auto Join"
+#~ msgstr "Automatikoki sartu"
+
+#, fuzzy
+#~ msgid "Room"
+#~ msgstr "Gela:"
+
+#~ msgid "Jabber ID:"
+#~ msgstr "Jabber ID:"
+
+#, fuzzy
+#~ msgid "Occupant Actions"
+#~ msgstr "_Bete Beharreko Aukerak"
+
+#~ msgid "_Add to Roster"
+#~ msgstr "_Zerrendara Sartu"
+
+#, fuzzy
+#~ msgid "_Manage Room"
+#~ msgstr "Talde Agenda Moldatu"
+
+#, fuzzy
+#~ msgid "Configure _Room..."
+#~ msgstr "Gela Konfigu_ratu"
+
+#, fuzzy
+#~ msgid "_Destroy Room"
+#~ msgstr "Deskribapena: %s"
+
+#, fuzzy
+#~ msgid "Jabber ID"
+#~ msgstr "Jabber ID:"
+
+#, fuzzy
+#~ msgid "account"
+#~ msgstr "Kontua"
+
+#, fuzzy
+#~ msgid "Roster"
+#~ msgstr "Ikusi _Zerrenda"
+
+#, fuzzy
+#~ msgid "Show only in roster"
+#~ msgstr "Ikusi _zerrendan bakarrik"
+
+#, fuzzy
+#~ msgid "in _roster"
+#~ msgstr "Ez dago zerrendan"
+
+#, fuzzy
+#~ msgid "Roster Appearance"
+#~ msgstr "<b>Arau bat editatu</b>"
+
+#, fuzzy
+#~ msgid "Show chatstate in roster"
+#~ msgstr "Kontaktuen a_batereak erakutsi zerrendan"
+
+#, fuzzy
+#~ msgid "_Add to Roster..."
+#~ msgstr "_Zerrendara Sartu"
+
+#~ msgid "_Jabber ID:"
+#~ msgstr "_Jabber ID:"
+
+#, fuzzy
+#~ msgid "_Jabber ID"
+#~ msgstr "_Jabber ID:"
+
+#~ msgid "JabberID"
+#~ msgstr "JabberID"
+
+#, fuzzy
+#~ msgid "Show Roster"
+#~ msgstr "Ikusi _Zerrenda"
+
+#, fuzzy
+#~ msgid "MUC server"
+#~ msgstr "Begiratzaileak"
+
+#~ msgid "Room Configuration"
+#~ msgstr "Gelaren Konfigurazioa"
+
+#~ msgid "Join _Group Chat"
+#~ msgstr "Txat Taldean _Sartu"
+
+#, fuzzy
+#~ msgid "Audio sessions are not available"
+#~ msgstr "Konexioa ez dago erabilgarri"
+
+#~ msgid "Conference"
+#~ msgstr "Solasaldiak"
+
+#, fuzzy
+#~ msgid "_Manage Bookmarks…"
+#~ msgstr "Talde Agenda Moldatu"
+
+#, fuzzy
+#~ msgid "Hide _Roster"
+#~ msgstr "Ez dago zerrendan"
+
+#~ msgid "Show _Roster"
+#~ msgstr "Ikusi _Zerrenda"
+
+#, fuzzy
+#~ msgid "Invalid Room"
+#~ msgstr "Sarrera baliogabea"
+
+#, fuzzy
+#~ msgid "Invalid room"
+#~ msgstr "Sarrera baliogabea"
+
+#~ msgid "A GTK+ Jabber client"
+#~ msgstr "GTK+ Jabber bezeroa"
+
+#~ msgid "Changing Nickname"
+#~ msgstr "Izengoitia Aldatu"
+
+#~ msgid "Please specify the new nickname you want to use:"
+#~ msgstr "Mesedez zehaztu ezazu erabili nahi duzun izengoiti berria:"
+
+#~ msgid "Bookmark already set"
+#~ msgstr "Talde agenda ezarria"
+
+#, fuzzy
+#~ msgid "Group Chat '%s' is already in your bookmarks."
+#~ msgstr "\"%s\" gela zure talde agendan dago jadanik."
+
+#~ msgid "Bookmark has been added successfully"
+#~ msgstr "Talde agenda egoki sortu da"
+
+#, fuzzy
+#~ msgid ""
+#~ "You can manage your bookmarks by clicking the Bookmarks menu item in your "
+#~ "contact list."
+#~ msgstr ""
+#~ "Zure talde agenda moldatu dezakezu zure zerrendako aukera menuaren bidez."
+
+#, fuzzy
+#~ msgid "The nickname contains invalid characters."
+#~ msgstr "ID Jabber gelak ez du onartzen karaktererik."
+
+#, fuzzy
+#~ msgid "Bookmark Room"
+#~ msgstr "_Talde Agendan Sartu Gela hau"
+
+#~ msgid "_Join New Group Chat"
+#~ msgstr "T_xat Talde Berrian Sartu"
+
+#, fuzzy
+#~ msgid "_Create Group Chat"
+#~ msgstr "Txat Taldea Berria"
+
+#~ msgid "Name:"
+#~ msgstr "Izena:"
+
+#, fuzzy
+#~ msgid "Description:"
+#~ msgstr "Deskribapena: %s"
+
+#, fuzzy
+#~ msgid "Address:"
+#~ msgstr "_Helbidea:"
+
+#, fuzzy
+#~ msgid "You can not start a new conversation unless you are connected."
+#~ msgstr "Ezin duzu txat talde batera sartu konektatuta ez zauden bitartean."
+
+#, fuzzy
+#~ msgid "Occupants"
+#~ msgstr "_Bete Beharreko Aukerak"
+
+#, fuzzy
+#~ msgid "File transfer error"
+#~ msgstr "Fitxero Transferitze Errorea"
+
+#, fuzzy
+#~ msgid "No Accounts available"
+#~ msgstr "Ez dago konturik erabilgarri"
+
+#~ msgid "_Modify Account..."
+#~ msgstr "Kontua E_ditatu"
+
+#, fuzzy
+#~ msgid "Integer"
+#~ msgstr "Taldean"
+
+#~ msgid "Value"
+#~ msgstr "Balorea"
+
+#~ msgid "Type"
+#~ msgstr "Mota"
+
+#~ msgid "(None)"
+#~ msgstr "(Ezer ez)"
+
+#~ msgid "Hidden"
+#~ msgstr "Ikusezin"
+
+#~ msgid "Manage Proxy Profiles"
+#~ msgstr "Proxy Profila Moldatu"
+
+#, fuzzy
+#~ msgid "Properties"
+#~ msgstr "<b>Ezaugarriak</b>"
+
+#, fuzzy
+#~ msgid "Proxy _Host"
+#~ msgstr "Proxy:"
+
+#, fuzzy
+#~ msgid "Proxy _Port"
+#~ msgstr "_Portua:"
+
+#, fuzzy
+#~ msgid "New Groupchat"
+#~ msgstr "Txat Taldea Berria"
+
+#, fuzzy
+#~ msgid "New Contact"
+#~ msgstr "Kontaktu Berri bat Sartu"
+
 #~ msgid "%s GiB"
 #~ msgstr "%s Gib"
 
@@ -11219,9 +11964,6 @@ msgstr "Konexioak huts egin du"
 #~ msgid "_Pause"
 #~ msgstr "_Eten"
 
-#~ msgid "Clean _up"
-#~ msgstr "_Garbitu"
-
 #~ msgid "Remove file transfer from the list."
 #~ msgstr "Listatik fitxero tranferentzia ezabatu."
 
@@ -11786,10 +12528,6 @@ msgstr "Konexioak huts egin du"
 #~ msgid "Nick"
 #~ msgstr "Izengoitia"
 
-#, fuzzy
-#~ msgid "Banning…"
-#~ msgstr "Debekatzen..."
-
 #~ msgid ""
 #~ "<b>Whom do you want to ban?</b>\n"
 #~ "\n"
@@ -11860,13 +12598,6 @@ msgstr "Konexioak huts egin du"
 #~ msgstr "Filtroa:"
 
 #, fuzzy
-#~ msgid ""
-#~ "If checked, Gajim will display the mood of contacts in the roster window"
-#~ msgstr ""
-#~ "Hautatua badago, Gajim-ek zerrendan eta txat taldeetan kontaktuen "
-#~ "abatereak azalaraziko ditu"
-
-#, fuzzy
 #~ msgid "<b>Chat Appearance</b>"
 #~ msgstr "<b>Arau bat editatu</b>"
 
@@ -12108,10 +12839,6 @@ msgstr "Konexioak huts egin du"
 #~ msgstr "Egoera mezua:"
 
 #, fuzzy
-#~ msgid "Group chat highlight"
-#~ msgstr "Txat Taldeko Mezu Nabarmendua"
-
-#, fuzzy
 #~ msgid "Your nickname"
 #~ msgstr "Izengoitia baino l_ehen:"
 
@@ -12275,9 +13002,6 @@ msgstr "Konexioak huts egin du"
 #~ msgid "The passwords typed in both fields must be identical."
 #~ msgstr "Bi lekuetan pasahitza berdina izan behar du."
 
-#~ msgid "Enter new password:"
-#~ msgstr "Sartu pasahitz berria:"
-
 #~ msgid "Enter it again for confirmation:"
 #~ msgstr "Sartu berriro baieztatzeko:"
 
@@ -12292,10 +13016,6 @@ msgstr "Konexioak huts egin du"
 #~ msgstr "Harpidetza kentzekoa eskaera %s -tik"
 
 #, fuzzy
-#~ msgid "Autojoin"
-#~ msgstr "Automatikoki sartu"
-
-#, fuzzy
 #~ msgid "Homepage:"
 #~ msgstr "Web Pertsonala:"
 
@@ -12388,9 +13108,6 @@ msgstr "Konexioak huts egin du"
 #~ msgid "Forward unread message then disconnect"
 #~ msgstr "%d mezu irakurri gabe"
 
-#~ msgid "AIM Address:"
-#~ msgstr "AIM Hebidea:"
-
 #~ msgid "MSN Address:"
 #~ msgstr "MSN Helbidea:"
 
@@ -12608,9 +13325,6 @@ msgstr "Konexioak huts egin du"
 #~ msgid "Server:"
 #~ msgstr "Zerbitzaria:"
 
-#~ msgid "Password:"
-#~ msgstr "Pasahitza:"
-
 #, fuzzy
 #~ msgid "Join this room _automatically when I connect"
 #~ msgstr "Ezarri nire profila konektatzen naizenean"
@@ -12627,11 +13341,6 @@ msgstr "Konexioak huts egin du"
 #~ msgid "Requires gnome-network-manager"
 #~ msgstr "Historial Administratzailea"
 
-#, fuzzy
-#~ msgid "This contact does not support file transfer."
-#~ msgstr ""
-#~ "Fitxategi tranferentzia aktiboen, bukatutakoen eta gelditutakoen lista"
-
 #~ msgid ""
 #~ "You have to install %s dictionary to use spellchecking, or choose another "
 #~ "language by setting the speller_language option."
@@ -12900,9 +13609,6 @@ msgstr "Konexioak huts egin du"
 #~ msgid "_Edit Personal Information..."
 #~ msgstr "Informazio Pertsonala Editatu..."
 
-#~ msgid "Information about you, as stored in the server"
-#~ msgstr "Zuri buzuzko informazioa zerbitzarian gordea izango da"
-
 #~ msgid "<b>Personal Information</b>"
 #~ msgstr "<b>Informazio Pertsonala</b>"
 
@@ -12945,13 +13651,6 @@ msgstr "Konexioak huts egin du"
 #~ msgid "Account Name Already Used"
 #~ msgstr "Kontu Izena Jadanik Erabilia"
 
-#~ msgid ""
-#~ "This name is already used by another of your accounts. Please choose "
-#~ "another name."
-#~ msgstr ""
-#~ "Izen hau jadanik zure kontaktu batengatik erabilita dago. Mesedez "
-#~ "aukeratu beste izen bat."
-
 #~ msgid "Invalid account name"
 #~ msgstr "Kontu izen baliogabea"
 
@@ -12987,9 +13686,6 @@ msgstr "Konexioak huts egin du"
 #~ msgid "Your server can't save your personal information."
 #~ msgstr "Zerbitzariak ezin du zure informazio pertsonala gorde"
 
-#~ msgid "Account Local already exists."
-#~ msgstr "Kontu izena jadanik badago"
-
 #~ msgid "Please rename or remove it before enabling link-local messaging."
 #~ msgstr ""
 #~ "Mesedez berridatzi edo ezabatu hori  link-local messaging martxan jarri "
@@ -13067,10 +13763,6 @@ msgstr "Konexioak huts egin du"
 #~ msgid "The following message was NOT encrypted"
 #~ msgstr "[Mezu hau enkriptatua dago]"
 
-#, fuzzy
-#~ msgid "Encryption used for this contact."
-#~ msgstr "OpenPGP aktibatu al dago kontu honetarako?"
-
 #~ msgid "Toggle Open_PGP Encryption"
 #~ msgstr "Toggle Open_PGP Encryption"
 
@@ -13141,10 +13833,6 @@ msgstr "Konexioak huts egin du"
 #~ msgid "Add _Contact..."
 #~ msgstr "_Kontaktua Gehitu..."
 
-#, fuzzy
-#~ msgid "_Accounts"
-#~ msgstr "Kontuak"
-
 #~ msgid "Profile, A_vatar"
 #~ msgstr "Profila, A_batarea"
 
@@ -13326,14 +14014,6 @@ msgstr "Konexioak huts egin du"
 #~ msgstr "Aktibatuta"
 
 #, fuzzy
-#~ msgid "Join _Group Chat..."
-#~ msgstr "Txat Taldean _Sartu"
-
-#, fuzzy
-#~ msgid "_Modify Account"
-#~ msgstr "Kontua E_raldatu"
-
-#, fuzzy
 #~ msgid ""
 #~ "If True, Gajim will check if it's the default jabber client on each "
 #~ "startup."
@@ -13868,9 +14548,6 @@ msgstr "Konexioak huts egin du"
 #~ msgid "Nickname not found: %s"
 #~ msgstr "Izengoitia aurkitugabea: %s"
 
-#~ msgid "This group chat has no subject"
-#~ msgstr "Gela honek ez du gairik"
-
 #, fuzzy
 #~ msgid ""
 #~ "Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
@@ -13942,9 +14619,6 @@ msgstr "Konexioak huts egin du"
 #~ msgstr ""
 #~ "Sakatu Jabber zerbitzariaren zenbait aukera(Msn ,ICQ, transport) ikusteko"
 
-#~ msgid "_Host:"
-#~ msgstr "_Host-a"
-
 #~ msgid "Modify Account"
 #~ msgstr "Kontua E_raldatu"
 
@@ -14043,9 +14717,6 @@ msgstr "Konexioak huts egin du"
 #~ msgid "<b>Interface Customization</b>"
 #~ msgstr "<b>Grafikoen Kontrola</b>"
 
-#~ msgid "A_fter nickname:"
-#~ msgstr "Izengoitiaren on_doren:"
-
 #~ msgid "Also known as iChat style"
 #~ msgstr "iChat estiloa bezala ere ezagutua"
 
@@ -14143,9 +14814,6 @@ msgstr "Konexioak huts egin du"
 #~ msgid "_Player:"
 #~ msgstr "_Entzun"
 
-#~ msgid "Address"
-#~ msgstr "Helbidea"
-
 #~ msgid "Role:"
 #~ msgstr "Eginkizuna:"
 
@@ -14198,9 +14866,6 @@ msgstr "Konexioak huts egin du"
 #~ msgid "Session Management support not available (missing gnome.ui module)"
 #~ msgstr "Session Management support not available (missing gnome.ui module)"
 
-#~ msgid "Private Chat"
-#~ msgstr "Txat Pribatua"
-
 #~ msgid "%s is now %s"
 #~ msgstr "%s orain %s da"
 
diff --git a/po/fr.po b/po/fr.po
index 01736e06f..c8da6bb04 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: 2019-07-02 02:06+0000\n"
+"POT-Creation-Date: 2019-08-11 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,29 +14,29 @@ msgstr ""
 "X-Pootle-Path: /fr/gajim/fr.po\n"
 "X-Pootle-Revision: 1011\n"
 
-#: gajim/chat_control_base.py:550
+#: gajim/chat_control_base.py:557
 msgid "_Undo"
 msgstr "A_nnuler"
 
-#: gajim/chat_control_base.py:558 gajim/conversation_textview.py:529
+#: gajim/chat_control_base.py:565 gajim/conversation_textview.py:529
 msgid "_Clear"
 msgstr "_Effacer"
 
-#: gajim/chat_control_base.py:563
+#: gajim/chat_control_base.py:570
 msgid "Paste as quote"
 msgstr "Coller en tant que citation"
 
-#: gajim/chat_control_base.py:613
+#: gajim/chat_control_base.py:620
 #, fuzzy
 msgid "Paste Image"
 msgstr "Choisissez une Image"
 
-#: gajim/chat_control_base.py:614
+#: gajim/chat_control_base.py:621
 #, fuzzy
 msgid "You are trying to paste an image"
 msgstr "Vous êtes sur le point de fermer plusieurs onglets"
 
-#: gajim/chat_control_base.py:615
+#: gajim/chat_control_base.py:622
 #, fuzzy
 msgid ""
 "Are you sure you want to paste your clipboard's image into the chat window?"
@@ -44,63 +44,62 @@ msgstr ""
 "Êtes-vous sûr de vouloir coller l'image du presse-papier dans la "
 "conversation ?"
 
-#: gajim/chat_control_base.py:617 gajim/groupchat_control.py:2310
-#: gajim/roster_window.py:2848 gajim/roster_window.py:4167
-#: gajim/message_window.py:252 gajim/gtk/dialogs.py:418
+#: gajim/chat_control_base.py:624 gajim/groupchat_control.py:2218
+#: gajim/roster_window.py:2841 gajim/roster_window.py:4118
+#: gajim/message_window.py:359 gajim/gtk/dialogs.py:330
 msgid "_Do not ask me again"
 msgstr "_Ne plus me poser la question"
 
-#: gajim/chat_control_base.py:620
+#: gajim/chat_control_base.py:627
 msgid "_Paste"
 msgstr ""
 
-#: gajim/chat_control_base.py:1162 gajim/gtk/accounts.py:351
+#: gajim/chat_control_base.py:1169 gajim/gtk/accounts.py:354
 msgid "Privacy"
 msgstr "Confidentialité"
 
-#: gajim/chat_control_base.py:1163
+#: gajim/chat_control_base.py:1170
 msgid "Warning"
 msgstr "Avertissement"
 
-#: gajim/chat_control_base.py:1164
+#: gajim/chat_control_base.py:1171
 #, python-format
 msgid "If you send a file to <b>%s</b>, your real JID will be revealed."
 msgstr "Si vous envoyer un fichier à <b>%s</b>, votre vrai JID sera révélé."
 
-#: gajim/chat_control_base.py:1169
+#: gajim/chat_control_base.py:1176
 msgid "Continue"
 msgstr "Continuer"
 
-#: gajim/gtkgui_helpers.py:163 gajim/gtk/filetransfer.py:393
+#: gajim/gtkgui_helpers.py:163 gajim/gtk/filetransfer.py:398
 #, fuzzy, python-format
 msgid "Cannot overwrite existing file '%s'"
 msgstr "Impossible de remplacer le fichier existant \"%s\""
 
-#: gajim/gtkgui_helpers.py:164 gajim/gtk/filetransfer.py:394
+#: gajim/gtkgui_helpers.py:164 gajim/gtk/filetransfer.py:399
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
 msgstr ""
-"Un fichier du même nom existe déjà et vous n'avez pas la permission de "
-"l'écraser."
+"Un fichier du même nom existe déjà et vous n’avez pas la permission de "
+"l’écraser."
 
 #: gajim/gtkgui_helpers.py:196
-#, fuzzy
 msgid "Error While Saving"
-msgstr "Erreur en ajoutant le service. %s"
+msgstr "Erreur lors de l’enregistrement"
 
 #: gajim/gtkgui_helpers.py:197
 msgid "Extension not supported"
 msgstr "Extension non supportée"
 
 #: gajim/gtkgui_helpers.py:198
-#, fuzzy, python-format
+#, python-format
 msgid ""
 "Image cannot be saved in %(type)s format.\n"
 "Save as %(new_filename)s?"
 msgstr ""
-"L'image ne peut être enregistrée en format %(type)s. Enregistrer en tant que "
-"%(new_filename)s ?"
+"L’image ne peut être enregistrée en format %(type)s.\n"
+"Enregistrer en tant que %(new_filename)s ?"
 
 #: gajim/gtkgui_helpers.py:204
 #, fuzzy
@@ -121,7 +120,7 @@ msgstr "?Date:Inconnue"
 
 #: gajim/vcard.py:367
 msgid "?Role in Group Chat:<b>Role:</b>"
-msgstr "<b>Role :</b>"
+msgstr "<b>Rôle :</b>"
 
 #: gajim/vcard.py:371
 msgid "<b>Affiliation:</b>"
@@ -132,14 +131,14 @@ msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in their presence"
 msgstr ""
-"Ce contact s'intéresse à votre état, mais vous ne vous intéressez pas au sien"
+"Ce contact s’intéresse à votre état, mais vous ne vous intéressez pas au sien"
 
 #: gajim/vcard.py:380
 msgid ""
 "You are interested in the contact's presence information, but it is not "
 "mutual"
 msgstr ""
-"Vous vous intéressez à l'état de ce contact, mais il ne s'intéresse pas au "
+"Vous vous intéressez à l’état de ce contact, mais il ne s'intéresse pas au "
 "vôtre"
 
 #: gajim/vcard.py:382
@@ -159,341 +158,349 @@ msgstr ""
 
 #: gajim/vcard.py:392
 msgid "There is no pending subscription request."
-msgstr "Il n'y a aucune requête d'inscription en attente."
+msgstr "Il n’y a aucune requête d’inscription en attente."
 
 #: gajim/vcard.py:397 gajim/vcard.py:447 gajim/vcard.py:554
 msgid " resource with priority "
 msgstr " ressource avec la priorité "
 
-#: gajim/gui_menu_builder.py:96
-msgid "_New Group Chat"
-msgstr "_Nouveau Salon de Discussion"
+#: gajim/gui_menu_builder.py:251 gajim/gui_menu_builder.py:342
+#: gajim/chat_control.py:305 gajim/roster_window.py:783
+#: gajim/roster_window.py:1716 gajim/roster_window.py:1718
+#: gajim/roster_window.py:2027 gajim/roster_window.py:3292
+#: gajim/roster_window.py:3325 gajim/gui_interface.py:396
+#: gajim/common/contacts.py:222 gajim/common/contacts.py:359
+#: gajim/common/contacts.py:471 gajim/common/helpers.py:86
+#: gajim/common/helpers.py:317 gajim/gtk/add_contact.py:319
+#: gajim/gtk/subscription_request.py:70 gajim/gtk/subscription_request.py:99
+#: gajim/gtk/roster_item_exchange.py:112
+#, fuzzy
+msgid "Not in contact list"
+msgstr "Afficher les contacts déconnectés"
 
-#: gajim/gui_menu_builder.py:289 gajim/gui_menu_builder.py:380
-#: gajim/chat_control.py:303 gajim/roster_window.py:786
-#: gajim/roster_window.py:1719 gajim/roster_window.py:1721
-#: gajim/roster_window.py:2030 gajim/roster_window.py:3336
-#: gajim/roster_window.py:3369 gajim/gui_interface.py:413
-#: gajim/common/contacts.py:206 gajim/common/contacts.py:343
-#: gajim/common/helpers.py:83 gajim/common/helpers.py:311
-#: gajim/gtk/add_contact.py:319 gajim/gtk/subscription_request.py:70
-#: gajim/gtk/subscription_request.py:99 gajim/gtk/roster_item_exchange.py:112
-msgid "Not in Roster"
-msgstr "Absent de la liste"
-
-#: gajim/gui_menu_builder.py:393
-msgid "I would like to add you to my roster"
+#: gajim/gui_menu_builder.py:355
+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:471
+#: gajim/gui_menu_builder.py:433
 msgid "Send Single _Message…"
-msgstr "Envoyer un _message simple…"
+msgstr "Envoyer un _message simple …"
 
-#: gajim/gui_menu_builder.py:486
+#: gajim/gui_menu_builder.py:448
 msgid "E_xecute Command…"
-msgstr "_Exécuter une commande…"
+msgstr "_Exécuter une commande …"
 
-#: gajim/gui_menu_builder.py:494
+#: gajim/gui_menu_builder.py:456
 msgid "_Manage Transport"
 msgstr "_Gérer les Passerelles"
 
-#: gajim/gui_menu_builder.py:500
+#: gajim/gui_menu_builder.py:462
 msgid "_Modify Transport"
 msgstr "_Modifier la Passerelle"
 
-#: gajim/gui_menu_builder.py:507 gajim/roster_window.py:5046
+#: gajim/gui_menu_builder.py:469 gajim/roster_window.py:4985
 msgid "_Rename…"
-msgstr "Re_nommer…"
+msgstr "Re_nommer …"
 
-#: gajim/gui_menu_builder.py:518 gajim/roster_window.py:5062
-#: gajim/roster_window.py:5177 gajim/data/gui/blocked_contacts_window.ui:52
+#: gajim/gui_menu_builder.py:480 gajim/roster_window.py:5001
+#: gajim/roster_window.py:5116 gajim/data/gui/blocked_contacts_window.ui:52
 #: gajim/data/gui/gc_occupants_menu.ui:148
 #: gajim/data/gui/contact_context_menu.ui:143
 msgid "_Unblock"
 msgstr "_Débloquer"
 
-#: gajim/gui_menu_builder.py:521 gajim/roster_window.py:5067
-#: gajim/roster_window.py:5181 gajim/data/gui/gc_occupants_menu.ui:140
+#: gajim/gui_menu_builder.py:483 gajim/roster_window.py:5006
+#: gajim/roster_window.py:5120 gajim/data/gui/gc_occupants_menu.ui:140
 #: gajim/data/gui/contact_context_menu.ui:151
 msgid "_Block"
 msgstr "_Bloquer"
 
-#: gajim/gui_menu_builder.py:529 gajim/roster_window.py:5074
+#: gajim/gui_menu_builder.py:491 gajim/roster_window.py:5013
 #: gajim/data/gui/contact_context_menu.ui:181
 msgid "Remo_ve"
 msgstr "Suppri_mer"
 
-#: gajim/gui_menu_builder.py:539 gajim/data/gui/contact_context_menu.ui:198
+#: gajim/gui_menu_builder.py:501 gajim/data/gui/contact_context_menu.ui:198
 msgid "_Information"
 msgstr "Information"
 
-#: gajim/gui_menu_builder.py:552
+#: gajim/gui_menu_builder.py:514
 msgid "Save _As"
 msgstr "Enregistrer _sous"
 
-#: gajim/gui_menu_builder.py:564 gajim/groupchat_control.py:501
-#: gajim/chat_control.py:340
+#: gajim/gui_menu_builder.py:526 gajim/groupchat_control.py:507
+#: gajim/chat_control.py:342
 msgid "Send File…"
-msgstr "Envoyer un fichier…"
+msgstr "Envoyer un fichier …"
 
-#: gajim/gui_menu_builder.py:565
+#: gajim/gui_menu_builder.py:527
 msgid "Upload File…"
-msgstr "Envoyer un fichier…"
+msgstr "Envoyer un fichier …"
 
-#: gajim/gui_menu_builder.py:566
+#: gajim/gui_menu_builder.py:528
 msgid "Send File Directly…"
-msgstr "Enregistrer un fichier directement…"
+msgstr "Enregistrer un fichier directement …"
 
-#: gajim/gui_menu_builder.py:568 gajim/gui_menu_builder.py:632
+#: gajim/gui_menu_builder.py:530 gajim/gui_menu_builder.py:596
 msgid "Send Chatstate"
 msgstr "Envoyer l’état de discussion"
 
-#: gajim/gui_menu_builder.py:569
+#: gajim/gui_menu_builder.py:531
 msgid "Invite Contacts"
 msgstr "Inviter des contacts"
 
-#: gajim/gui_menu_builder.py:570
-msgid "Add to Roster"
+#: gajim/gui_menu_builder.py:532
+msgid "Add to Contact List"
 msgstr "Ajouter à la liste de contacts"
 
-#: gajim/gui_menu_builder.py:571
-msgid "Audio Session"
-msgstr "Session audio"
+#: gajim/gui_menu_builder.py:533
+msgid "Voice Chat"
+msgstr "Discussion vocale"
 
-#: gajim/gui_menu_builder.py:572
-msgid "Video Session"
-msgstr "Session vidéo"
+#: gajim/gui_menu_builder.py:534
+msgid "Video Chat"
+msgstr "Visioconférence"
 
-#: gajim/gui_menu_builder.py:573
+#: gajim/gui_menu_builder.py:535 gajim/gui_menu_builder.py:582
 msgid "Information"
 msgstr "Information"
 
-#: gajim/gui_menu_builder.py:574 gajim/gui_menu_builder.py:639
+#: gajim/gui_menu_builder.py:536 gajim/gui_menu_builder.py:602
 #: gajim/data/gui/application_menu.ui:37
 msgid "History"
 msgstr "Historique"
 
-#: gajim/gui_menu_builder.py:580 gajim/gui_menu_builder.py:687
+#: gajim/gui_menu_builder.py:542 gajim/gui_menu_builder.py:650
 #: gajim/data/gui/preferences_window.ui:1823
 msgid "Disabled"
 msgstr "Désactivé"
 
-#: gajim/gui_menu_builder.py:581 gajim/gui_menu_builder.py:688
+#: gajim/gui_menu_builder.py:543 gajim/gui_menu_builder.py:651
 msgid "Composing only"
-msgstr "Seulement en train d'écrire"
+msgstr "Seulement en train d’écrire"
 
-#: gajim/gui_menu_builder.py:582 gajim/gui_menu_builder.py:689
+#: gajim/gui_menu_builder.py:544 gajim/gui_menu_builder.py:652
 msgid "All chat states"
 msgstr "Tous les états"
 
-#: gajim/gui_menu_builder.py:620
-msgid "Manage Room"
+#: gajim/gui_menu_builder.py:583
+msgid "Manage Group Chat"
 msgstr "Gérer le salon"
 
-#: gajim/gui_menu_builder.py:621
+#: gajim/gui_menu_builder.py:584 gajim/data/gui/groupchat_control.ui:649
 msgid "Change Subject"
 msgstr "Changer le sujet"
 
-#: gajim/gui_menu_builder.py:622
-msgid "Configure Room"
-msgstr "Configurer le salon"
+#: gajim/gui_menu_builder.py:585
+#, fuzzy
+msgid "Configure Group Chat"
+msgstr "Quitter des Groupes de Discussion"
 
-#: gajim/gui_menu_builder.py:623
+#: gajim/gui_menu_builder.py:586
 msgid "Upload Avatar…"
 msgstr "Envoyer un avatar…"
 
-#: gajim/gui_menu_builder.py:624
-msgid "Destroy Room"
-msgstr "Détruire le salon"
+#: gajim/gui_menu_builder.py:587
+msgid "Destroy Group Chat"
+msgstr "Détruire le salon de discussion"
 
-#: gajim/gui_menu_builder.py:626 gajim/data/gui/preferences_window.ui:790
+#: gajim/gui_menu_builder.py:589 gajim/data/gui/preferences_window.ui:790
 msgid "Chat Settings"
 msgstr "Paramètres de la fenêtre de discussion"
 
-#: gajim/gui_menu_builder.py:627
+#: gajim/gui_menu_builder.py:590
 msgid "Show join/leave"
 msgstr "Montrer connecté/parti"
 
-#: gajim/gui_menu_builder.py:628
+#: gajim/gui_menu_builder.py:591
 msgid "Show status changes"
-msgstr "Montrer les changements d'état"
+msgstr "Afficher les changements d’état"
 
-#: gajim/gui_menu_builder.py:629 gajim/data/gui/gc_control_popup_menu.ui:72
+#: gajim/gui_menu_builder.py:592 gajim/data/gui/gc_control_popup_menu.ui:72
 msgid "Notify on all messages"
 msgstr "Avertir pour tous les messages"
 
-#: gajim/gui_menu_builder.py:630
+#: gajim/gui_menu_builder.py:593
 msgid "Minimize on close"
 msgstr "Minimiser à la fermeture"
 
-#: gajim/gui_menu_builder.py:631
-msgid "Minimize on autojoin"
+#: gajim/gui_menu_builder.py:595
+#, fuzzy
+msgid "Minimize when joining automatically"
 msgstr "Minimiser à la connexion automatique"
 
-#: gajim/gui_menu_builder.py:634
+#: gajim/gui_menu_builder.py:598
 msgid "Sync Threshold"
 msgstr "Seuil de synchronisation"
 
-#: gajim/gui_menu_builder.py:635
-msgid "Change Nick"
-msgstr "Changer de surnom"
-
-#: gajim/gui_menu_builder.py:636
-msgid "Bookmark Room"
-msgstr "Enregistrer ce salon dans les marque-pages"
+#: gajim/gui_menu_builder.py:599
+msgid "Change Nickname"
+msgstr "Changer de pseudonyme"
 
-#: gajim/gui_menu_builder.py:637
+#: gajim/gui_menu_builder.py:600
 msgid "Request Voice"
 msgstr "Demander la parole"
 
-#: gajim/gui_menu_builder.py:638 gajim/roster_window.py:5246
+#: gajim/gui_menu_builder.py:601 gajim/roster_window.py:5185
 msgid "Execute command"
 msgstr "Exécuter une commande"
 
-#: gajim/gui_menu_builder.py:640
-msgid "Disconnect"
-msgstr "Déconnecter"
+#: gajim/gui_menu_builder.py:603
+msgid "Leave"
+msgstr "Quitter"
 
-#: gajim/gui_menu_builder.py:678 gajim/gtk/preferences.py:156
+#: gajim/gui_menu_builder.py:641 gajim/gtk/preferences.py:155
 msgid "No threshold"
 msgstr "Pas de seuil"
 
-#: gajim/gui_menu_builder.py:680 gajim/gtk/preferences.py:158
+#: gajim/gui_menu_builder.py:643 gajim/gtk/preferences.py:157
 #, python-format
 msgid "%i day"
 msgid_plural "%i days"
 msgstr[0] "%i jour"
 msgstr[1] "%i jours"
 
-#: gajim/gui_menu_builder.py:709 gajim/gui_menu_builder.py:747
-#: gajim/gtk/join_groupchat.py:43
-msgid "Join Group Chat"
-msgstr "Rejoindre un salon de discussion"
-
-#: gajim/gui_menu_builder.py:746
+#: gajim/gui_menu_builder.py:672
 msgid "Add Contact…"
 msgstr "Ajouter un contact…"
 
-#: gajim/gui_menu_builder.py:748 gajim/gtk/profile.py:52
-#: gajim/gtk/accounts.py:770 gajim/gtk/accounts.py:808
+#: gajim/gui_menu_builder.py:673 gajim/gtk/profile.py:52
+#: gajim/gtk/accounts.py:773 gajim/gtk/accounts.py:811
 msgid "Profile"
 msgstr "Profil"
 
-#: gajim/gui_menu_builder.py:749
+#: gajim/gui_menu_builder.py:674
+msgid "Send Single Message…"
+msgstr "Envoyer un _message simple…"
+
+#: gajim/gui_menu_builder.py:675
 msgid "Discover Services"
 msgstr "Découvrir les services"
 
-#: gajim/gui_menu_builder.py:750
-msgid "Send Single Message…"
-msgstr "Envoyer un _message simp…"
+#: gajim/gui_menu_builder.py:676 gajim/gtk/server_info.py:36
+msgid "Server Info"
+msgstr "Informations du serveur"
 
-#: gajim/gui_menu_builder.py:751 gajim/data/gui/preferences_window.ui:2741
+#: gajim/gui_menu_builder.py:677 gajim/data/gui/preferences_window.ui:2741
 msgid "Advanced"
 msgstr "Avancées"
 
-#: gajim/gui_menu_builder.py:752 gajim/gtk/mam_preferences.py:88
+#: gajim/gui_menu_builder.py:678 gajim/gtk/mam_preferences.py:88
 msgid "Archiving Preferences"
-msgstr "Éditer les préférences d'archivage"
+msgstr "Éditer les préférences d’archivage"
 
-#: gajim/gui_menu_builder.py:753
+#: gajim/gui_menu_builder.py:679
 msgid "Blocking List"
 msgstr "Liste des bannis"
 
-#: gajim/gui_menu_builder.py:754 gajim/gtk/history_sync.py:108
+#: gajim/gui_menu_builder.py:680
+msgid "Bookmarks"
+msgstr "Marques-pages"
+
+#: gajim/gui_menu_builder.py:681
+#, fuzzy
+msgid "PEP Configuration"
+msgstr "Configuration"
+
+#: gajim/gui_menu_builder.py:682 gajim/gtk/history_sync.py:108
 #: gajim/gtk/history_sync.py:186
 msgid "Synchronise History"
-msgstr "Synchroniser l'historique"
+msgstr "Synchroniser l’historique"
 
-#: gajim/gui_menu_builder.py:755 gajim/gtk/privacy_list.py:427
+#: gajim/gui_menu_builder.py:683 gajim/gtk/privacy_list.py:427
 msgid "Privacy Lists"
 msgstr "Listes privées"
 
-#: gajim/gui_menu_builder.py:756 gajim/gtk/server_info.py:36
-msgid "Server Info"
-msgstr "Informations du serveur"
-
-#: gajim/gui_menu_builder.py:757 gajim/gui_menu_builder.py:768
+#: gajim/gui_menu_builder.py:685 gajim/gui_menu_builder.py:696
 #: gajim/data/gui/xml_console_window.ui:77
 msgid "XML Console"
 msgstr "Console XML"
 
-#: gajim/gui_menu_builder.py:759 gajim/data/gui/groupchat_config.ui:36
+#: gajim/gui_menu_builder.py:687 gajim/data/gui/groupchat_config.ui:36
 msgid "Admin"
 msgstr "Admin"
 
-#: gajim/gui_menu_builder.py:760
+#: gajim/gui_menu_builder.py:688
 msgid "Send Server Message…"
 msgstr "Envoyer un message au serveur…"
 
-#: gajim/gui_menu_builder.py:761
+#: gajim/gui_menu_builder.py:689
 msgid "Set MOTD…"
 msgstr "Définir MOTD…"
 
-#: gajim/gui_menu_builder.py:762
+#: gajim/gui_menu_builder.py:690
 msgid "Update MOTD…"
 msgstr "Mettre à jour MOTD…"
 
-#: gajim/gui_menu_builder.py:763
+#: gajim/gui_menu_builder.py:691
 msgid "Delete MOTD…"
 msgstr "Supprimer MOTD…"
 
-#: gajim/gui_menu_builder.py:812
-msgid "No Accounts available"
-msgstr "Aucun compte disponible"
+#: gajim/gui_menu_builder.py:736
+msgid "_Add Account…"
+msgstr "_Ajouter un compte…"
 
-#: gajim/gui_menu_builder.py:823 gajim/data/gui/application_menu.ui:5
-#: gajim/data/gui/application_menu.ui:71 gajim/data/gui/shortcuts_window.ui:182
-#: gajim/gtk/accounts.py:58
+#: gajim/gui_menu_builder.py:742
+msgid "_Modify Accounts…"
+msgstr "_Modifier des comptes …"
+
+#: gajim/gui_menu_builder.py:751 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:755 gajim/data/gui/application_menu.ui:5
+#: gajim/data/gui/shortcuts_window.ui:182 gajim/gtk/accounts.py:57
 msgid "Accounts"
 msgstr "Comptes"
 
-#: gajim/gui_menu_builder.py:881 gajim/gui_menu_builder.py:886
-msgid "Copy JID"
-msgstr "Copier le JID"
+#: gajim/gui_menu_builder.py:784 gajim/gui_menu_builder.py:789
+msgid "Copy XMPP Address"
+msgstr "Copier l’adresse XMPP"
 
-#: gajim/gui_menu_builder.py:882 gajim/gui_menu_builder.py:914
+#: gajim/gui_menu_builder.py:785 gajim/gui_menu_builder.py:817
 msgid "Join Groupchat"
 msgstr "Rejoindre un salon de discussion"
 
-#: gajim/gui_menu_builder.py:887 gajim/gui_menu_builder.py:913
-#: gajim/data/gui/application_menu.ui:76
+#: gajim/gui_menu_builder.py:790 gajim/gui_menu_builder.py:816
+#: gajim/data/gui/application_menu.ui:71
 #: gajim/data/gui/subscription_request_window.ui:106
 msgid "Start Chat"
 msgstr "Commencer une discussion"
 
-#: gajim/gui_menu_builder.py:888 gajim/gui_menu_builder.py:915
-msgid "Add to Roster…"
-msgstr "Ajouter à la liste de contacts…"
+#: gajim/gui_menu_builder.py:791 gajim/gui_menu_builder.py:818
+msgid "Add to Contact List…"
+msgstr "Ajouter à la liste de contacts …"
 
-#: gajim/gui_menu_builder.py:893
+#: gajim/gui_menu_builder.py:796
 msgid "Copy Link Location"
 msgstr "Copier l'adresse du lien"
 
-#: gajim/gui_menu_builder.py:894
+#: gajim/gui_menu_builder.py:797
 msgid "Open Link in Browser"
 msgstr "Ouvrir le lien dans le navigateur"
 
-#: gajim/gui_menu_builder.py:899
+#: gajim/gui_menu_builder.py:802
 msgid "Copy Email Address"
-msgstr "Copier l'adresse électronique"
+msgstr "Copier l’adresse électronique"
 
-#: gajim/gui_menu_builder.py:900 gajim/gui_menu_builder.py:912
+#: gajim/gui_menu_builder.py:803 gajim/gui_menu_builder.py:815
 msgid "Open Email Composer"
 msgstr "Ouvrir le logiciel de courriel"
 
-#: gajim/gui_menu_builder.py:905
+#: gajim/gui_menu_builder.py:808
 msgid "Copy Location"
 msgstr "Copier l'emplacement"
 
-#: gajim/gui_menu_builder.py:906
+#: gajim/gui_menu_builder.py:809
 msgid "Show Location"
 msgstr "Montrer l'emplacement"
 
-#: gajim/gui_menu_builder.py:911
-msgid "Copy JID/Email"
-msgstr "Copier l'identifiant Jabber / l'adresse électronique"
+#: gajim/gui_menu_builder.py:814
+msgid "Copy XMPP Address/Email"
+msgstr "Copier l’adresse XMPP/électronique"
 
-#: gajim/gui_menu_builder.py:945
+#: gajim/gui_menu_builder.py:852
 msgid "Copy"
 msgstr "Copier"
 
@@ -513,93 +520,99 @@ msgstr "Afficher ce message d'aide et quitter"
 msgid "Choose folder for logfile"
 msgstr "Indiquer un répertoire pour le fichier de log"
 
-#: gajim/history_manager.py:107
+#: gajim/history_manager.py:106
 msgid "Cannot find history logs database"
-msgstr "Impossible de trouver la base de données de l'historique"
+msgstr "Impossible de trouver la base de données de l’historique"
 
-#: gajim/history_manager.py:108
-#, fuzzy, python-format
+#: gajim/history_manager.py:107
+#, python-format
 msgid "%s does not exist."
-msgstr "Le fichier n'existe pas"
+msgstr "%s n'existe pas"
 
-#: gajim/history_manager.py:141 gajim/history_manager.py:195
-#: gajim/gtk/discovery.py:829 gajim/gtk/roster_item_exchange.py:80
-msgid "JID"
-msgstr "Identifiant Jabber"
+#: gajim/history_manager.py:140 gajim/history_manager.py:194
+#: 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:30
+#: gajim/gtk/accounts.py:804
+msgid "XMPP Address"
+msgstr "Adresse XMPP"
 
-#: gajim/history_manager.py:154 gajim/history_manager.py:202
+#: gajim/history_manager.py:153 gajim/history_manager.py:201
 #: gajim/data/gui/history_window.ui:89 gajim/gtk/history.py:108
 msgid "Date"
 msgstr "Date"
 
-#: gajim/history_manager.py:161 gajim/history_manager.py:225
+#: gajim/history_manager.py:160 gajim/history_manager.py:224
 #: gajim/data/gui/join_groupchat_window.ui:208
 #: gajim/data/gui/profile_window.ui:214
 #: gajim/data/gui/vcard_information_window.ui:443
+#: gajim/data/gui/bookmarks.ui:140
 msgid "Nickname"
 msgstr "Pseudonyme"
 
-#: gajim/history_manager.py:172 gajim/history_manager.py:211
+#: gajim/history_manager.py:171 gajim/history_manager.py:210
 #: gajim/data/gui/preferences_window.ui:1344
 #: gajim/data/gui/single_message_window.ui:275 gajim/gtk/history.py:117
 msgid "Message"
 msgstr "Message"
 
-#: gajim/history_manager.py:180 gajim/history_manager.py:218
+#: gajim/history_manager.py:179 gajim/history_manager.py:217
 #: gajim/data/gui/groups_post_window.ui:49
 #: gajim/data/gui/single_message_window.ui:214
 msgid "Subject"
 msgstr "Sujet"
 
+#: gajim/history_manager.py:247
+msgid "Database Cleanup"
+msgstr "Nettoyage de la base de données"
+
 #: gajim/history_manager.py:248
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
 "RUNNING)"
 msgstr ""
-"Voulez vous nettoyer la base de donnée ? (TRÈS DÉCONSEILLÉ SI GAJIM EST "
+"Voulez vous nettoyer la base de donnée ? (TRÈS DÉCONSEILLÉ SI GAJIM EST "
 "LANCÉ)"
 
 #: gajim/history_manager.py:250
 msgid ""
-"Normally allocated database size will not be freed, it will just become "
-"reusable. If you really want to reduce database filesize, click YES, else "
-"click NO.\n"
-"\n"
-"In case you click YES, please wait…"
+"Normally, the allocated database size will not be freed, it will just become "
+"reusable. This operation may take a while."
 msgstr ""
 "Normalement la taille allouée a la base de donnée ne sera pas libérée, elle "
-"sera simplement ré-utilisable. Si vous voulez vraiment réduire la taille du "
-"fichier, choisir OUI, sinon choisir NON.\n"
-"\n"
-"Si vous choisissez OUI, patientez…"
+"sera simplement ré-utilisable. Cette action pourrait prendre un certain "
+"temps."
 
 #: gajim/history_manager.py:255
-msgid "Database Cleanup"
-msgstr "Nettoyage de la base de données"
+#, fuzzy
+msgid "_Cleanup"
+msgstr "_Nettoyer"
 
-#: gajim/history_manager.py:519 gajim/gtk/filetransfer.py:238
-#: gajim/gtk/filetransfer.py:248
+#: gajim/history_manager.py:518 gajim/gtk/filetransfer.py:237
+#: gajim/gtk/filetransfer.py:247
 msgid "You"
 msgstr "Vous"
 
-#: gajim/history_manager.py:531
+#: gajim/history_manager.py:530
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
-msgstr "%(who)s le %(time)s a dit: %(message)s\n"
+msgstr "%(who)s le %(time)s a dit : %(message)s\n"
 
-#: gajim/history_manager.py:568 gajim/history_manager.py:607
-#: gajim/gtk/dialogs.py:58 gajim/gtk/themes.py:319
+#: gajim/history_manager.py:567 gajim/history_manager.py:606
+#: gajim/gtk/dialogs.py:57 gajim/gtk/themes.py:319
 #: gajim/gtk/roster_item_exchange.py:75 gajim/gtk/roster_item_exchange.py:185
 msgid "Delete"
 msgstr "Supprimer"
 
-#: gajim/history_manager.py:569
+#: gajim/history_manager.py:568
 msgid "Delete Conversation"
 msgid_plural "Delete Conversations"
 msgstr[0] "Supprimer la conversation"
 msgstr[1] "Supprimer les conversations"
 
-#: gajim/history_manager.py:570
+#: gajim/history_manager.py:569
 #, 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?"
@@ -608,13 +621,13 @@ msgstr[0] ""
 msgstr[1] ""
 "Désirez-vous supprimer de façon permanente ces conversations avec <b>%s</b>"
 
-#: gajim/history_manager.py:608
+#: gajim/history_manager.py:607
 msgid "Delete Message"
 msgid_plural "Delete Messages"
 msgstr[0] "Supprimer le message"
 msgstr[1] "Supprimer les messages"
 
-#: gajim/history_manager.py:609
+#: gajim/history_manager.py:608
 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 ?"
@@ -627,14 +640,14 @@ msgstr "Nom du contact : <i>%s</i>"
 
 #: gajim/dialogs.py:84
 #, python-format
-msgid "JID: <i>%s</i>"
-msgstr "JID : <i>%s</i>"
+msgid "XMPP Address: <i>%s</i>"
+msgstr "Adresse XMPP : <i>%s</i>"
 
-#: gajim/dialogs.py:115 gajim/dialogs.py:128 gajim/roster_window.py:2901
-#: gajim/roster_window.py:3833 gajim/roster_window.py:5084
-#: gajim/common/contacts.py:157 gajim/common/contacts.py:190
+#: gajim/dialogs.py:115 gajim/dialogs.py:128 gajim/roster_window.py:2894
+#: gajim/roster_window.py:3784 gajim/roster_window.py:5023
+#: gajim/common/contacts.py:157 gajim/common/contacts.py:206
 #: gajim/data/gui/preferences_window.ui:558
-#: gajim/data/gui/shortcuts_window.ui:177 gajim/gtk/accounts.py:349
+#: gajim/data/gui/shortcuts_window.ui:177 gajim/gtk/accounts.py:352
 msgid "General"
 msgstr "Général"
 
@@ -648,7 +661,7 @@ msgstr "Dans le groupe"
 
 #: gajim/dialogs.py:356
 msgid "Set Mood"
-msgstr "Définir l'Humeur"
+msgstr "Définir l’Humeur"
 
 #: gajim/dialogs.py:403 gajim/dialogs.py:416
 #: gajim/data/gui/account_creation_wizard_window.ui:22
@@ -660,11 +673,11 @@ msgstr "Aucun"
 #: gajim/dialogs.py:477
 #, python-format
 msgid "%s Status Message"
-msgstr "Message d'état %s"
+msgstr "Message d’état %s"
 
 #: gajim/dialogs.py:491
 msgid "Status Message"
-msgstr "Message d'état"
+msgstr "Message d’état"
 
 #: gajim/dialogs.py:697
 #, fuzzy
@@ -680,32 +693,32 @@ msgstr "Remplacer le message de statut ?"
 msgid "Preset name is already in use. Do you want to overwrite this preset?"
 msgstr "Ce nom est déjà utilisé. Voulez vous remplacer ce message de statut ?"
 
-#: gajim/dialogs.py:703
+#: gajim/dialogs.py:703 gajim/plugins/gui.py:292
 #, fuzzy
 msgid "_Overwrite"
 msgstr "Remplacer ?"
 
 #: gajim/dialogs.py:712
 msgid "Save as Preset Status Message"
-msgstr "Enregistrer comme messages d'état prédéfini"
+msgstr "Enregistrer comme messages d’état prédéfini"
 
 #: gajim/dialogs.py:713
 msgid "Please type a name for this status message"
-msgstr "Tapez un nom pour ce message d'état"
+msgstr "Tapez un nom pour ce message d’état"
 
-#: gajim/dialogs.py:740 gajim/gui_interface.py:1441 gajim/dialog_messages.py:31
-#: gajim/gtk/discovery.py:518 gajim/gtk/profile.py:323
-#: gajim/gtk/join_groupchat.py:234
+#: gajim/dialogs.py:740 gajim/gtk/discovery.py:517 gajim/gtk/profile.py:323
 msgid "You are not connected to the server"
-msgstr "Vous n'êtes pas connecté au serveur"
+msgstr "Vous n’êtes pas connecté au serveur"
 
 #: gajim/dialogs.py:741
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Sans connexion, vous ne pouvez pas synchroniser vos contacts."
 
-#: gajim/dialogs.py:752 gajim/dialogs.py:823 gajim/gtk/discovery.py:822
-#: gajim/gtk/discovery.py:1648 gajim/gtk/discovery.py:1941
-#: gajim/gtk/history.py:99 gajim/gtk/roster_item_exchange.py:83
+#: gajim/dialogs.py:752 gajim/dialogs.py:823
+#: gajim/data/gui/groupchat_info_scrolled.ui:16 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/gtk/roster_item_exchange.py:83
 msgid "Name"
 msgstr "Nom"
 
@@ -726,386 +739,340 @@ msgstr ""
 msgid "Synchronise"
 msgstr "Synchroniser"
 
-#: gajim/dialogs.py:1043
+#: gajim/dialogs.py:1042
 msgid "an audio and video"
 msgstr "audio et vidéo"
 
-#: gajim/dialogs.py:1045
+#: gajim/dialogs.py:1044
 msgid "an audio"
 msgstr "audio"
 
-#: gajim/dialogs.py:1047
+#: gajim/dialogs.py:1046
 msgid "a video"
 msgstr "vidéo"
 
-#: gajim/dialogs.py:1051
-#, python-format
+#: gajim/dialogs.py:1050
+#, fuzzy, python-format
 msgid ""
-"%(contact)s wants to start %(type)s session with you. Do you want to answer "
+"%(contact)s wants to start a %(type)s chat with you. Do you want to answer "
 "the call?"
 msgstr ""
 "%(contact)s veut démarrer un session %(type)s avec vous. Voulez-vous "
 "répondre à son appel ?"
 
-#: gajim/groupchat_control.py:505
+#: gajim/groupchat_control.py:511
 #, python-format
 msgid "Send File (max. %s MiB)…"
 msgstr "Envoyer le fichier (max. %s MiB)…"
 
-#: gajim/groupchat_control.py:507 gajim/chat_control.py:342
+#: gajim/groupchat_control.py:513 gajim/chat_control.py:344
 msgid "No File Transfer available"
 msgstr "Pas de transfert de fichier disponible"
 
-#: gajim/groupchat_control.py:630 gajim/groupchat_control.py:2349
-msgid "Changing Subject"
-msgstr "Changement de Sujet"
-
-#: gajim/groupchat_control.py:631 gajim/groupchat_control.py:2350
-msgid "Please specify the new subject:"
-msgstr "Saisissez le nouveau sujet :"
-
-#: gajim/groupchat_control.py:638
-msgid "Changing Nickname"
-msgstr "Changement de Surnom"
-
-#: gajim/groupchat_control.py:639
-msgid "Please specify the new nickname you want to use:"
-msgstr "Saisissez le nouveau surnom que vous souhaitez utiliser :"
-
-#: gajim/groupchat_control.py:657
-msgid "Invalid group chat JID"
+#: gajim/groupchat_control.py:655
+#, fuzzy
+msgid "Invalid group chat XMPP Address"
 msgstr "JID de salon de discussion non invalide"
 
-#: gajim/groupchat_control.py:658
-msgid "The group chat JID has not allowed characters."
+#: gajim/groupchat_control.py:656
+#, fuzzy
+msgid "The group chat XMPP Address has not allowed characters."
 msgstr "Le JID du salon de discussion contient des caractères interdits."
 
-#: gajim/groupchat_control.py:758 gajim/gtk/profile.py:136
+#: gajim/groupchat_control.py:743 gajim/gtk/profile.py:136
 msgid "Could not load image"
 msgstr "Impossible de charger l’image"
 
-#: gajim/groupchat_control.py:888
+#: gajim/groupchat_control.py:873
 msgid "Insert Nickname"
 msgstr "Insérer un surnom"
 
-#: gajim/groupchat_control.py:1056 gajim/chat_control.py:824
+#: gajim/groupchat_control.py:1041 gajim/chat_control.py:848
 msgid "and authenticated"
 msgstr "et authentifiée"
 
-#: gajim/groupchat_control.py:1060 gajim/chat_control.py:828
+#: gajim/groupchat_control.py:1045 gajim/chat_control.py:852
 msgid "and NOT authenticated"
 msgstr "et NON authentifiée"
 
-#: gajim/groupchat_control.py:1064
+#: gajim/groupchat_control.py:1049
 #, python-format
 msgid "%(type)s encryption is active %(authenticated)s."
 msgstr "Chiffrement %(type)s actif %(authenticated)s."
 
-#: gajim/groupchat_control.py:1111
+#: gajim/groupchat_control.py:1096
 msgid "Conversation with "
 msgstr "Conversation avec "
 
-#: gajim/groupchat_control.py:1113
+#: gajim/groupchat_control.py:1098
 msgid "Continued conversation"
 msgstr "Conversation continuée"
 
-#: gajim/groupchat_control.py:1411
+#: gajim/groupchat_control.py:1357
 #, 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:1433
-msgid "Room now shows unavailable members"
+#: gajim/groupchat_control.py:1374
+#, fuzzy
+msgid "Group chat now shows unavailable members"
 msgstr "Le salon affiche dorénavant les membres non-disponibles"
 
-#: gajim/groupchat_control.py:1436
-msgid "Room now does not show unavailable members"
+#: gajim/groupchat_control.py:1377
+#, fuzzy
+msgid "Group chat now does not show unavailable members"
 msgstr "Le salon n’affiche plus les membres non-disponibles"
 
-#: gajim/groupchat_control.py:1439
+#: gajim/groupchat_control.py:1380
 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:1446
-msgid "Room logging is now enabled"
-msgstr "L’enregistrement des conversations du salon est maintenant activé"
+#: gajim/groupchat_control.py:1387 gajim/groupchat_control.py:1659
+#, fuzzy
+msgid "Conversations are stored on the server"
+msgstr "Cette session sera archivée sur le serveur"
 
-#: gajim/groupchat_control.py:1449
-msgid "Room logging is now disabled"
-msgstr "L’enregistrement des conversations du salon est maintenant désactivé"
+#: gajim/groupchat_control.py:1390
+#, fuzzy
+msgid "Conversations are not stored on the server"
+msgstr "Les informations vous concernant, stockées sur le serveur"
 
-#: gajim/groupchat_control.py:1452
-msgid "Room is now non-anonymous"
+#: gajim/groupchat_control.py:1393
+#, fuzzy
+msgid "Group chat is now non-anonymous"
 msgstr "Le salon n’est plus anonyme"
 
-#: gajim/groupchat_control.py:1456
-msgid "Room is now semi-anonymous"
+#: gajim/groupchat_control.py:1397
+#, fuzzy
+msgid "Group chat is now semi-anonymous"
 msgstr "Le salon est maintenant semi-anonyme"
 
-#: gajim/groupchat_control.py:1460
-msgid "Room is now fully anonymous"
+#: gajim/groupchat_control.py:1401
+#, fuzzy
+msgid "Group chat is now fully anonymous"
 msgstr "Le salon est maintenant totalement anonyme"
 
-#: gajim/groupchat_control.py:1500
+#: gajim/groupchat_control.py:1439
 #, python-format
 msgid "Ping? (%s)"
 msgstr "Ping ? (%s)"
 
-#: gajim/groupchat_control.py:1503
+#: gajim/groupchat_control.py:1442
 #, python-format
 msgid "Pong! (%(nick)s %(delay)s s.)"
 msgstr "Pong ! (%(nick)s %(delay)s s.)"
 
-#: gajim/groupchat_control.py:1506 gajim/chat_control.py:1213
+#: gajim/groupchat_control.py:1445 gajim/chat_control.py:1237
 msgid "Error."
 msgstr "Erreur."
 
-#: gajim/groupchat_control.py:1711
-#, python-format
-msgid "You (%s) joined the room"
-msgstr "Vous (%s) avez rejoint le salon de discussion"
+#: gajim/groupchat_control.py:1650
+#, fuzzy, python-format
+msgid "You (%s) joined the group chat"
+msgstr "%s a rejoint le salon de discussion"
 
-#: gajim/groupchat_control.py:1717
-msgid "Any occupant is allowed to see your full JID"
+#: gajim/groupchat_control.py:1655
+#, fuzzy
+msgid "Any participant is allowed to see your full XMPP Address"
 msgstr ""
 "N’importe quel occupant est autorisé à voir votre identifiant Jabber complet"
 
-#: gajim/groupchat_control.py:1721
-msgid "Room logging is enabled"
-msgstr "L’enregistrement des conversations du salon est activé"
-
-#: gajim/groupchat_control.py:1725
-msgid "The server has assigned or modified your roomnick"
+#: gajim/groupchat_control.py:1663
+#, fuzzy
+msgid "The server has assigned or modified your nickname in this group chat"
 msgstr "Le serveur à défini ou modifié votre Surnom de salon"
 
-#: gajim/groupchat_control.py:1732
-msgid "A new room has been created"
+#: gajim/groupchat_control.py:1671
+#, fuzzy
+msgid "A new group chat has been created"
 msgstr "Un nouveau salon a été créé"
 
-#: gajim/groupchat_control.py:1740 gajim/privatechat_control.py:112
+#: gajim/groupchat_control.py:1679 gajim/privatechat_control.py:115
 #, python-format
 msgid "You are now known as %s"
 msgstr "Vous êtes désormais connu sous le nom de %s"
 
-#: gajim/groupchat_control.py:1742 gajim/privatechat_control.py:114
+#: gajim/groupchat_control.py:1681 gajim/privatechat_control.py:117
 #, 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:1767 gajim/privatechat_control.py:141
+#: gajim/groupchat_control.py:1706 gajim/privatechat_control.py:144
 #, python-brace-format
 msgid "You are now {show}{status}"
 msgstr "Vous êtes désormais {show}{status}"
 
-#: gajim/groupchat_control.py:1773 gajim/privatechat_control.py:147
+#: gajim/groupchat_control.py:1712 gajim/privatechat_control.py:150
 #, python-brace-format
 msgid "{nick} is now {show}{status}"
 msgstr "{nick} est maintenant {show}{status}"
 
-#: gajim/groupchat_control.py:1790 gajim/groupchat_control.py:1819
-#: gajim/groupchat_control.py:1849 gajim/groupchat_control.py:1909
+#: gajim/groupchat_control.py:1729 gajim/groupchat_control.py:1758
+#: gajim/groupchat_control.py:1788 gajim/groupchat_control.py:1848
 #, python-brace-format
 msgid " by {actor}"
 msgstr " par {actor}"
 
-#: gajim/groupchat_control.py:1793
+#: gajim/groupchat_control.py:1732
 #, python-brace-format
 msgid "** Your Affiliation has been set to {affiliation}{actor}{reason}"
 msgstr "** Votre affiliation a été définie à {affiliation} par {actor}{reason}"
 
-#: gajim/groupchat_control.py:1799
+#: gajim/groupchat_control.py:1738
 #, python-brace-format
 msgid "** Affiliation of {nick} has been set to {affiliation}{actor}{reason}"
 msgstr ""
 "** L’affiliation de {nick} a été définie à {affiliation}{actor}{reason}"
 
-#: gajim/groupchat_control.py:1822
+#: gajim/groupchat_control.py:1761
 #, python-brace-format
 msgid "** Your Role has been set to {role}{actor}{reason}"
 msgstr "** Votre rôle de a été défini à {role}{actor}{reason}"
 
-#: gajim/groupchat_control.py:1827
+#: gajim/groupchat_control.py:1766
 #, python-brace-format
 msgid "** Role of {nick} has been set to {role}{actor}{reason}"
 msgstr "** Le rôle de {nick} a été défini à {role}{actor}{reason}"
 
-#: gajim/groupchat_control.py:1852
-#, python-brace-format
-msgid "You have been removed from the room{actor}{reason}"
+#: gajim/groupchat_control.py:1791
+#, fuzzy, python-brace-format
+msgid "You have been removed from the group chat{actor}{reason}"
 msgstr "Vous avez été supprimé du salon{actor}{reason}"
 
-#: gajim/groupchat_control.py:1857
+#: gajim/groupchat_control.py:1796
 #, python-brace-format
 msgid "You have left due to an error{reason}"
 msgstr "Vous êtes parti à cause d'une erreur{reason}"
 
-#: gajim/groupchat_control.py:1863
+#: gajim/groupchat_control.py:1802
 #, python-brace-format
 msgid "You have been kicked{actor}{reason}"
 msgstr "Vous avez été éjecté{actor}{reason}"
 
-#: gajim/groupchat_control.py:1870
+#: gajim/groupchat_control.py:1809
 #, python-brace-format
 msgid "You have been banned{actor}{reason}"
 msgstr "Vous avez été banni{actor}{reason}"
 
-#: gajim/groupchat_control.py:1877 gajim/groupchat_control.py:1943
+#: gajim/groupchat_control.py:1816 gajim/groupchat_control.py:1882
 msgid ": Affiliation changed"
 msgstr ": Changement d'affiliation"
 
-#: gajim/groupchat_control.py:1883 gajim/groupchat_control.py:1948
-msgid ": Room configuration changed to members-only"
+#: gajim/groupchat_control.py:1822 gajim/groupchat_control.py:1887
+#, fuzzy
+msgid ": Group chat configuration changed to members-only"
 msgstr ": La configuration du salon a changé pour « membres seulement »"
 
-#: gajim/groupchat_control.py:1912
-#, python-brace-format
-msgid "{nick} has been removed from the room{by}{reason}"
+#: gajim/groupchat_control.py:1851
+#, fuzzy, python-brace-format
+msgid "{nick} has been removed from the group chat{by}{reason}"
 msgstr "{nick} a été supprimé du salon{by}{reason}"
 
-#: gajim/groupchat_control.py:1922
+#: gajim/groupchat_control.py:1861
 #, python-brace-format
 msgid "{nick} has left due to an error{reason}"
 msgstr "{nick} est parti à cause d’une erreur{reason}"
 
-#: gajim/groupchat_control.py:1928
+#: gajim/groupchat_control.py:1867
 #, python-brace-format
 msgid "{nick} has been kicked{actor}{reason}"
 msgstr "{nick} a été éjecté{actor}{reason}"
 
-#: gajim/groupchat_control.py:1936
+#: gajim/groupchat_control.py:1875
 #, python-brace-format
 msgid "{nick} has been banned{actor}{reason}"
 msgstr "{nick} a été banni{actor}{reason}"
 
-#: gajim/groupchat_control.py:1953
+#: gajim/groupchat_control.py:1892
 #, python-brace-format
 msgid "{nick} has left{reason}"
 msgstr "{nick} est parti{reason}"
 
-#: gajim/groupchat_control.py:1970
+#: gajim/groupchat_control.py:1914
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s a rejoint le salon de discussion"
 
-#: gajim/groupchat_control.py:1985 gajim/groupchat_control.py:1990
-#: gajim/groupchat_control.py:1995 gajim/groupchat_control.py:2000
-#: gajim/groupchat_control.py:2011
-msgid "Unable to join group chat"
-msgstr "Impossible de rejoindre le salon"
-
-#: gajim/groupchat_control.py:1986
-#, python-format
-msgid "You are banned from group chat <b>%s</b>."
-msgstr "Vous êtes banni du salon <b>%s</b>."
-
-#: gajim/groupchat_control.py:1991
-#, python-format
-msgid "Remote server <b>%s</b> does not exist."
-msgstr "Le serveur distant <b>%s</b> n’existe pas."
-
-#: gajim/groupchat_control.py:1996
-#, python-format
-msgid "Group chat <b>%s</b> does not exist."
-msgstr "Le salon <b>%s</b> n’existe pas."
-
-#: gajim/groupchat_control.py:2001
-msgid "Group chat creation is not permitted."
-msgstr "La création de salon n’est pas autorisée."
-
-#: gajim/groupchat_control.py:2005
-msgid "Unable to join groupchat"
-msgstr "Impossible de rejoindre le salon"
-
-#: gajim/groupchat_control.py:2006
-#, python-format
-msgid "You must use your registered nickname in <b>%s</b>."
-msgstr "Vous devez utiliser votre pseudonyme enregistré dans <b>%s</b>."
-
-#: gajim/groupchat_control.py:2012
-#, python-format
-msgid "You are not in the members list in groupchat %s."
-msgstr "Vous n’êtes pas dans la liste des membres du salon %s."
-
-#: gajim/groupchat_control.py:2068
-msgid "Room has been destroyed"
+#: gajim/groupchat_control.py:1981
+#, fuzzy
+msgid "Group chat has been destroyed"
 msgstr "Le salon de discussion a été détruit"
 
-#: gajim/groupchat_control.py:2073
-#, python-format
-msgid "You can join this room instead: xmpp:%s?join"
+#: gajim/groupchat_control.py:1986
+#, fuzzy, python-format
+msgid "You can join this group chat instead: xmpp:%s?join"
 msgstr "Vous pouvez rejoindre le salon xmpp:%s?join à la place"
 
-#: gajim/groupchat_control.py:2306
+#: gajim/groupchat_control.py:2214
 #, fuzzy
 msgid "Leave Group Chat"
 msgstr "Quitter des Groupes de Discussion"
 
-#: gajim/groupchat_control.py:2307
-#, fuzzy
+#: gajim/groupchat_control.py:2215
 msgid "Are you sure you want to leave this group chat?"
-msgstr "Êtes-vous sûr de vouloir quitter le salon \"%s\" ?"
+msgstr "Êtes-vous sûr de vouloir quitter le salon ?"
 
-#: gajim/groupchat_control.py:2308
-#, fuzzy, python-format
-msgid "If you close this window, you will be disconnected from '%s'."
-msgstr "Si vous fermez cette fenêtre, vous serez déconnecté de ce salon."
+#: gajim/groupchat_control.py:2216
+#, python-format
+msgid "If you close this window, you will leave '%s'."
+msgstr "Si vous fermez cette fenêtre, vous quitterez '%s'."
 
-#: gajim/groupchat_control.py:2314
+#: gajim/groupchat_control.py:2222 gajim/roster_window.py:5177
 msgid "_Leave"
 msgstr ""
 
-#: gajim/groupchat_control.py:2377
+#: gajim/groupchat_control.py:2280 gajim/roster_window.py:3008
 #, fuzzy, python-format
 msgid "%(jid)s has been invited to this group chat"
 msgstr "%(jid)s a été invité dans ce salon"
 
-#: gajim/groupchat_control.py:2527
+#: gajim/groupchat_control.py:2463
 #, python-format
 msgid "Kicking %s"
 msgstr "Averti de %s"
 
-#: gajim/groupchat_control.py:2528 gajim/groupchat_control.py:2829
+#: gajim/groupchat_control.py:2464 gajim/groupchat_control.py:2765
 msgid "You may specify a reason below:"
 msgstr "Vous pouvez saisir une raison ci-dessous :"
 
-#: gajim/groupchat_control.py:2828
+#: gajim/groupchat_control.py:2764
 #, python-format
 msgid "Banning %s"
 msgstr "Bannissement de %s"
 
-#: gajim/chat_control.py:408
+#: gajim/chat_control.py:432
 msgid "Show a list of formattings"
 msgstr "Afficher une liste de styles"
 
-#: gajim/chat_control.py:412
+#: gajim/chat_control.py:436
 msgid "This contact does not support HTML"
 msgstr "Ce contact ne prend pas en charge le HTML"
 
-#: gajim/chat_control.py:562
+#: gajim/chat_control.py:586
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr "État %(type)s : %(state)s, raison : %(reason)s"
 
-#: gajim/chat_control.py:686
+#: gajim/chat_control.py:710
 #, 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:832
+#: gajim/chat_control.py:856
 #, python-format
 msgid "%(type)s encryption is active %(authenticated)s"
 msgstr "Chiffrement %(type)s actif %(authenticated)s"
 
-#: gajim/chat_control.py:1160 gajim/chat_control.py:1168
+#: gajim/chat_control.py:1184 gajim/chat_control.py:1192
 msgid "Close"
 msgstr "Fermer"
 
-#: gajim/chat_control.py:1161
+#: gajim/chat_control.py:1185
 #, python-format
 msgid "You just received a new message from %s"
 msgstr "Vous venez de recevoir un nouveau message de %s"
 
-#: gajim/chat_control.py:1163
+#: gajim/chat_control.py:1187
 #, fuzzy
 msgid ""
 "If you close this tab while having chat history disabled, this message will "
@@ -1114,16 +1081,16 @@ msgstr ""
 "Si vous fermez cette fenêtre et que l’historique n’est pas activé, ce "
 "message sera perdu."
 
-#: gajim/chat_control.py:1208
+#: gajim/chat_control.py:1232
 msgid "Ping?"
 msgstr "Ping ?"
 
-#: gajim/chat_control.py:1211
+#: gajim/chat_control.py:1235
 #, python-format
 msgid "Pong! (%s seconds)"
 msgstr "Pong ! (%s secondes)"
 
-#: gajim/chat_control.py:1308
+#: gajim/chat_control.py:1332
 #, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -1132,260 +1099,268 @@ msgstr ""
 "Sujet : %(subject)s\n"
 "%(message)s"
 
-#: gajim/chat_control.py:1416
+#: gajim/chat_control.py:1440
 #, python-format
 msgid "%(name)s is now %(show)s %(status)s"
 msgstr "%(name)s est maintenant %(show)s %(status)s"
 
-#: gajim/chat_control.py:1476 gajim/data/gui/application_menu.ui:32
+#: gajim/chat_control.py:1500 gajim/data/gui/application_menu.ui:32
 #: gajim/gtk/http_upload_progress.py:35
 msgid "File Transfer"
 msgstr "Transfert de fichiers"
 
-#: gajim/chat_control.py:1480
+#: gajim/chat_control.py:1504
 msgid "Size"
 msgstr "Taille"
 
-#: gajim/chat_control.py:1482 gajim/chat_control.py:1546
+#: gajim/chat_control.py:1506 gajim/chat_control.py:1566
+#: gajim/gui_interface.py:190
 #: gajim/data/gui/groupchat_invitation_received.ui:77
-#: gajim/gtk/filetransfer.py:485
+#: gajim/gtk/filetransfer.py:490
 msgid "_Accept"
 msgstr "_Accepter"
 
-#: gajim/chat_control.py:1484 gajim/chat_control.py:1548
+#: gajim/chat_control.py:1508 gajim/chat_control.py:1568
 #: gajim/data/gui/groupchat_invitation_received.ui:62
 msgid "_Decline"
 msgstr "_Refuser"
 
-#: gajim/chat_control.py:1506 gajim/gui_interface.py:791
-#: gajim/gui_interface.py:821 gajim/gui_interface.py:847
+#: gajim/chat_control.py:1530 gajim/gui_interface.py:777
+#: gajim/gui_interface.py:807 gajim/gui_interface.py:833
 #: gajim/gtk/notification.py:173 gajim/gtk/notification.py:278
 msgid "File Transfer Completed"
 msgstr "Transfert de fichier terminé"
 
-#: gajim/chat_control.py:1510 gajim/gtk/filetransfer.py:259
+#: gajim/chat_control.py:1534 gajim/gtk/filetransfer.py:258
 #, fuzzy
 msgid "Open _Folder"
 msgstr "Ouvrir le dossier de destination"
 
-#: gajim/chat_control.py:1512 gajim/chat_control.py:1521
+#: gajim/chat_control.py:1536 gajim/chat_control.py:1545
+#: gajim/data/gui/groupchat_control.ui:962
+#: gajim/data/gui/groupchat_control.ui:1049
+#: gajim/data/gui/groupchat_control.ui:1155
 msgid "_Close"
 msgstr "_Fermer"
 
-#: gajim/chat_control.py:1543 gajim/gui_interface.py:484
+#: gajim/chat_control.py:1563 gajim/gui_interface.py:473
+#: gajim/data/gui/groupchat_invitation_received.ui:42
 #: gajim/gtk/notification.py:174 gajim/gtk/notification.py:195
 #: gajim/gtk/notification.py:281
-msgid "Groupchat Invitation"
+#, fuzzy
+msgid "Group Chat Invitation"
 msgstr "Invitation à un salon"
 
-#: gajim/chat_control.py:1568 gajim/roster_window.py:1954
+#: gajim/chat_control.py:1588 gajim/roster_window.py:1951
 msgid "Remote contact stopped transfer"
 msgstr "Le contact distant à stoppé le transfert"
 
-#: gajim/chat_control.py:1570 gajim/roster_window.py:1956
+#: gajim/chat_control.py:1590 gajim/roster_window.py:1953
 msgid "Error opening file"
 msgstr "Erreur à l’ouverture du fichier"
 
-#: gajim/chat_control.py:1572 gajim/gtk/filetransfer.py:297
+#: gajim/chat_control.py:1592 gajim/gtk/filetransfer.py:296
 msgid "File transfer stopped"
 msgstr "Transfert de fichier interrompu"
 
-#: gajim/chat_control.py:1575 gajim/gtk/filetransfer.py:275
-#: gajim/gtk/filetransfer.py:284
+#: gajim/chat_control.py:1595 gajim/gtk/filetransfer.py:274
+#: gajim/gtk/filetransfer.py:283
 msgid "File transfer cancelled"
 msgstr "Transfert de fichier annulé"
 
-#: gajim/chat_control.py:1576
+#: gajim/chat_control.py:1596
 msgid "Connection with peer cannot be established."
 msgstr "La connexion avec le contact ne peut être établie."
 
-#: gajim/application.py:72
+#: gajim/application.py:75
 msgid "Show the application's version"
 msgstr "Afficher la version de l’application"
 
-#: gajim/application.py:79
+#: gajim/application.py:82
 msgid "Show only critical errors"
 msgstr "Ne montrer que les erreurs critiques"
 
-#: gajim/application.py:86
+#: gajim/application.py:89
 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:94
+#: gajim/application.py:97
 msgid "Print XML stanzas and other debug information"
 msgstr "Affiche le flux XML et autres informations de débogage"
 
-#: gajim/application.py:101
+#: gajim/application.py:104
 msgid "Use defined profile in configuration directory"
 msgstr "Utilise un profil défini dans le dossier de configuration"
 
-#: gajim/application.py:109
+#: gajim/application.py:112
 msgid "Set configuration directory"
 msgstr "Fixe le répertoire de configuration"
 
-#: gajim/application.py:117
+#: gajim/application.py:120
 msgid "Configure logging system"
 msgstr "Configurer le système de log"
 
-#: gajim/application.py:125
+#: gajim/application.py:128
 msgid "Show all warnings"
 msgstr "Afficher tous les avertissements"
 
-#: gajim/application.py:132
+#: gajim/application.py:135
 msgid "Open IPython shell"
 msgstr "Ouvrir un shell IPython"
 
-#: gajim/application.py:139
+#: gajim/application.py:142
 msgid "Pops up a window with the next pending event"
 msgstr "Afficher une fenêtre avec le prochain message non lu"
 
-#: gajim/application.py:145 gajim/data/gui/shortcuts_window.ui:203
+#: gajim/application.py:148 gajim/data/gui/shortcuts_window.ui:203
 #: data/org.gajim.Gajim.desktop.in:21
 msgid "Start a new chat"
 msgstr "Commencer une nouvelle discussion"
 
-#: gajim/application.py:152
+#: gajim/application.py:155
 msgid "Simulate loss of connectivity"
 msgstr "Simule une perte de connexion"
 
-#: gajim/application.py:159
+#: gajim/application.py:162
 msgid "Simulate regaining connectivity"
 msgstr "Simule le rétablissement de la connexion"
 
-#: gajim/application.py:201 gajim/gui_interface.py:133
+#: gajim/application.py:204 gajim/gui_interface.py:133
 msgid "Database Error"
 msgstr "Erreur de base de données"
 
-#: gajim/roster_window.py:294 gajim/roster_window.py:1030
+#: gajim/roster_window.py:291 gajim/roster_window.py:1027
 msgid "Merged accounts"
 msgstr "Comptes regroupés"
 
-#: gajim/roster_window.py:853 gajim/roster_window.py:1631
-#: gajim/roster_window.py:1664 gajim/roster_window.py:1715
-#: gajim/roster_window.py:1717 gajim/roster_window.py:1872
-#: gajim/roster_window.py:2531 gajim/roster_window.py:5025
-#: gajim/common/contacts.py:188 gajim/common/contacts.py:447
-#: gajim/common/helpers.py:83 gajim/gtk/discovery.py:129
-#: gajim/gtk/discovery.py:130 gajim/gtk/discovery.py:1416
+#: gajim/roster_window.py:850 gajim/roster_window.py:1628
+#: gajim/roster_window.py:1661 gajim/roster_window.py:1712
+#: gajim/roster_window.py:1714 gajim/roster_window.py:1869
+#: gajim/roster_window.py:2528 gajim/roster_window.py:4331
+#: gajim/roster_window.py:4964 gajim/common/contacts.py:204
+#: gajim/common/contacts.py:463 gajim/common/helpers.py:86
+#: gajim/gtk/discovery.py:127 gajim/gtk/discovery.py:128
+#: gajim/gtk/discovery.py:1414
 msgid "Transports"
 msgstr "Passerelles"
 
-#: gajim/roster_window.py:1723 gajim/roster_window.py:1725
-#: gajim/roster_window.py:4995 gajim/gui_interface.py:1613
-#: gajim/gui_interface.py:1639 gajim/common/contacts.py:186
-#: gajim/common/helpers.py:83 gajim/common/modules/adhoc_commands.py:245
-msgid "Groupchats"
+#: gajim/roster_window.py:1720 gajim/roster_window.py:1722
+#: gajim/roster_window.py:4331 gajim/roster_window.py:4934
+#: gajim/gui_interface.py:1527 gajim/common/contacts.py:202
+#: gajim/common/helpers.py:86 gajim/common/modules/adhoc_commands.py:245
+#, fuzzy
+msgid "Group chats"
 msgstr "Salons de discussion"
 
-#: gajim/roster_window.py:2012
+#: gajim/roster_window.py:2009
 msgid "Authorization sent"
 msgstr "L’autorisation a été envoyée"
 
-#: gajim/roster_window.py:2013
+#: gajim/roster_window.py:2010
 #, python-format
 msgid "\"%s\" will now see your status."
 msgstr "Désormais \"%s\" connaîtra votre état."
 
-#: gajim/roster_window.py:2031
+#: gajim/roster_window.py:2028
 msgid "Subscription request has been sent"
 msgstr "La requête d’inscription a été envoyée"
 
-#: gajim/roster_window.py:2032
-#, python-format
-msgid "If \"%s\" accepts this request you will know his or her status."
+#: gajim/roster_window.py:2029
+#, fuzzy, 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:2046
+#: gajim/roster_window.py:2043
 msgid "Authorization removed"
 msgstr "L’autorisation a été supprimée"
 
-#: gajim/roster_window.py:2047
+#: gajim/roster_window.py:2044
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Dorénavant, \"%s\" vous verra toujours déconnecté."
 
-#: gajim/roster_window.py:2250 gajim/roster_window.py:3504
+#: gajim/roster_window.py:2247 gajim/roster_window.py:3460
 msgid "Disconnect for Invisibility"
 msgstr ""
 
-#: gajim/roster_window.py:2251 gajim/roster_window.py:3505
+#: gajim/roster_window.py:2248 gajim/roster_window.py:3461
 msgid "You are participating in one or more group chats"
 msgstr "Vous participez à un ou plusieurs salons"
 
-#: gajim/roster_window.py:2252 gajim/roster_window.py:3506
-#, fuzzy
+#: gajim/roster_window.py:2249 gajim/roster_window.py:3462
 msgid ""
-"Changing your status to invisible will result in disconnection from those "
-"group chats.\n"
+"Changing your status to invisible will result in you leaving those group "
+"chats.\n"
 "Are you sure you want to go invisible?"
 msgstr ""
-"Basculer en état invisible entraînera votre déconnexion ces salons. Êtes-"
-"vous sûr de vouloir être invisible ?"
+"Basculer en état invisible entraînera votre déconnexion de ces salons de "
+"discussion.\n"
+"Êtes-vous sûr de vouloir passer en mode invisible ?"
 
-#: gajim/roster_window.py:2257 gajim/roster_window.py:3512
-#: gajim/roster_window.py:5238 gajim/data/gui/gc_control_popup_menu.ui:120
+#: gajim/roster_window.py:2254 gajim/roster_window.py:3468
+#: gajim/data/gui/gc_control_popup_menu.ui:120
 msgid "_Disconnect"
 msgstr "_Déconnecter"
 
-#: gajim/roster_window.py:2285
+#: gajim/roster_window.py:2282
 msgid "desynced"
 msgstr "désynchronisé"
 
-#: gajim/roster_window.py:2353 gajim/data/gui/shortcuts_window.ui:224
+#: gajim/roster_window.py:2350 gajim/data/gui/shortcuts_window.ui:224
 msgid "Quit Gajim"
 msgstr "Quitter Gajim"
 
-#: gajim/roster_window.py:2354
+#: gajim/roster_window.py:2351
 #, fuzzy
 msgid "You are about to quit Gajim"
 msgstr "Êtes-vous sûr de vouloir quitter Gajim ?"
 
-#: gajim/roster_window.py:2355
+#: gajim/roster_window.py:2352
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Êtes-vous sûr de vouloir quitter Gajim ?"
 
-#: gajim/roster_window.py:2356
+#: gajim/roster_window.py:2353
 #, fuzzy
 msgid "_Always quit when closing Gajim"
 msgstr "Toujours fermer Gajim"
 
-#: gajim/roster_window.py:2359 gajim/roster_window.py:2455
-#: gajim/roster_window.py:2495 gajim/data/gui/systray_context_menu.ui:90
+#: gajim/roster_window.py:2356 gajim/roster_window.py:2452
+#: gajim/roster_window.py:2492 gajim/data/gui/systray_context_menu.ui:83
 msgid "_Quit"
 msgstr "_Quitter"
 
-#: gajim/roster_window.py:2448
+#: gajim/roster_window.py:2445
 #, fuzzy
 msgid "Stop File Transfers"
 msgstr "Transfert de fichiers"
 
-#: gajim/roster_window.py:2449
+#: gajim/roster_window.py:2446
 #, fuzzy
 msgid "You still have running file transfers"
 msgstr "Vous avez des transferts de fichiers en cours"
 
-#: gajim/roster_window.py:2450
-#, fuzzy
+#: gajim/roster_window.py:2447
 msgid ""
 "If you quit now, the file(s) being transferred will be lost.\n"
 "Do you still want to quit?"
 msgstr ""
-"Si vous quittez maintenant, le transfert de fichier(s) sera arrêté. Voulez-"
-"vous toujours quitter ?"
+"Si vous quittez maintenant, le transfert de fichier(s) en cours sera "
+"interrompu.\n"
+"Voulez-vous toujours quitter ?"
 
-#: gajim/roster_window.py:2488
+#: gajim/roster_window.py:2485
 #, fuzzy
 msgid "Unread Messages"
 msgstr "Événements non lus"
 
-#: gajim/roster_window.py:2489
+#: gajim/roster_window.py:2486
 #, fuzzy
 msgid "You still have unread messages"
 msgstr "Vous avez des messages non lus"
 
-#: gajim/roster_window.py:2490
+#: gajim/roster_window.py:2487
 #, fuzzy
 msgid ""
 "Messages will only be available for reading them later if storing chat "
@@ -1394,20 +1369,20 @@ msgstr ""
 "Les messages seront disponibles pour une lecture ultérieure si l’archivage "
 "de l€historique est actif et si le contact est dans votre liste."
 
-#: gajim/roster_window.py:2760
+#: gajim/roster_window.py:2753
 msgid "You have unread messages"
 msgstr "Vous avez des messages non lus"
 
-#: gajim/roster_window.py:2761
+#: gajim/roster_window.py:2754
 msgid "You must read them before removing this transport."
 msgstr "Vous devez les lire avant de supprimer ce compte."
 
-#: gajim/roster_window.py:2764
+#: gajim/roster_window.py:2757
 #, fuzzy, python-format
 msgid "Transport '%s' will be removed"
 msgstr "La passerelle \"%s\" sera enlevée"
 
-#: gajim/roster_window.py:2765
+#: gajim/roster_window.py:2758
 #, fuzzy
 msgid ""
 "You will no longer be able to send and receive messages from and to contacts "
@@ -1416,34 +1391,35 @@ msgstr ""
 "Vous ne pourrez plus envoyer et recevoir de messages des contacts de cette "
 "passerelle."
 
-#: gajim/roster_window.py:2768
+#: gajim/roster_window.py:2761
 msgid "Transports will be removed"
 msgstr "Les passerelles seront enlevées"
 
-#: gajim/roster_window.py:2773
-#, fuzzy, python-format
+#: gajim/roster_window.py:2766
+#, python-format
 msgid ""
 "You will no longer be able to send and receive messages from and to contacts "
 "using these transports:\n"
 "%s"
 msgstr ""
 "Vous ne pourrez plus envoyer et recevoir de messages des contacts de cette "
-"passerelle."
+"passerelle.\n"
+"%s"
 
-#: gajim/roster_window.py:2777
+#: gajim/roster_window.py:2770
 #, fuzzy
 msgid "Remove Transport"
 msgstr "Afficher les passerelles"
 
-#: gajim/roster_window.py:2844
+#: gajim/roster_window.py:2837
 msgid "Block Contact"
 msgstr "Bloquer le contact"
 
-#: gajim/roster_window.py:2845
+#: gajim/roster_window.py:2838
 msgid "Really block this contact?"
 msgstr "Êtes-vous sûr de vouloir bloquer ce contact ?"
 
-#: gajim/roster_window.py:2846
+#: gajim/roster_window.py:2839
 #, fuzzy
 msgid ""
 "This contact will see you offline and you will not receive any messages sent "
@@ -1452,67 +1428,61 @@ msgstr ""
 "Ce contact vous verra hors-ligne et vous ne recevrez pas les messages qu’il "
 "vous enverra."
 
-#: gajim/roster_window.py:2851
+#: gajim/roster_window.py:2844
 #, fuzzy
 msgid "_Block Contact"
 msgstr "Bloquer le contact"
 
-#: gajim/roster_window.py:2896
+#: gajim/roster_window.py:2889
 msgid "Rename Contact"
 msgstr "Renommer le contact"
 
-#: gajim/roster_window.py:2897
+#: gajim/roster_window.py:2890
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Entrez un nouveau surnom pour le contact %s."
 
-#: gajim/roster_window.py:2904
+#: gajim/roster_window.py:2897
 msgid "Rename Group"
 msgstr "_Renommer le Groupe"
 
-#: gajim/roster_window.py:2905
+#: gajim/roster_window.py:2898
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Entrez un nouveau nom pour le groupe %s."
 
-#: gajim/roster_window.py:2953 gajim/roster_window.py:2954
+#: gajim/roster_window.py:2946 gajim/roster_window.py:2947
 msgid "Remove Group"
 msgstr "_Supprimer le Groupe"
 
-#: gajim/roster_window.py:2955
+#: gajim/roster_window.py:2948
 #, fuzzy, python-format
 msgid "Do you want to remove %s from the contact list?"
 msgstr "Voulez-vous enlever le groupe %s de la liste de contacts ?"
 
-#: gajim/roster_window.py:2956
+#: gajim/roster_window.py:2949
 #, fuzzy
 msgid "_Also remove all contacts of this group from contact list"
 msgstr ""
 "Supprimer également de votre liste tous les contacts appartenant à ce groupe"
 
-#: gajim/roster_window.py:3044
-#, python-format
-msgid "%(jid)s has been invited in this room"
-msgstr "%(jid)s a été invité dans ce salon"
-
-#: gajim/roster_window.py:3353
-#, fuzzy
+#: gajim/roster_window.py:3309
 msgid "Remove Contact"
-msgstr "Renommer le contact"
+msgstr "Supprimer un contact"
 
-#: gajim/roster_window.py:3354
+#: gajim/roster_window.py:3310
 #, fuzzy
 msgid "Remove contact from contact list"
 msgstr "Enlever le contact de la liste"
 
-#: gajim/roster_window.py:3355
+#: gajim/roster_window.py:3311
 #, 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:3364 gajim/roster_window.py:3384
+#: gajim/roster_window.py:3320 gajim/roster_window.py:3340
 #, fuzzy
 msgid ""
 "By removing this contact you also remove authorization. This means the "
@@ -1521,49 +1491,51 @@ msgstr ""
 "En supprimant ce contact vous enlevez aussi leurs autorisations, ces "
 "contacts vous verront donc toujours déconnecté⋅e."
 
-#: gajim/roster_window.py:3375
+#: gajim/roster_window.py:3331
 msgid "Do you want to continue?"
 msgstr "Voulez vous continuer ?"
 
-#: gajim/roster_window.py:3386
+#: gajim/roster_window.py:3342
 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:3393
+#: gajim/roster_window.py:3349
 #, fuzzy
 msgid "Remove contacts from contact list"
 msgstr "Enlever le contact de la liste"
 
-#: gajim/roster_window.py:3399
-#, fuzzy, python-format
+#: gajim/roster_window.py:3355
+#, python-format
 msgid ""
 "By removing the following contacts, you will also remove authorization. This "
 "means they will see you as offline:\n"
 "\n"
 "%s"
 msgstr ""
-"En supprimant ce contact vous enlevez aussi leurs autorisations, ces "
-"contacts vous verront donc toujours déconnecté⋅e."
+"En supprimant ces contacts vous enlevez aussi leurs autorisations. Ces "
+"contacts vous verront donc toujours comme étant déconnecté⋅e.\n"
+"\n"
+"%s"
 
-#: gajim/roster_window.py:3403
+#: gajim/roster_window.py:3359
 #, fuzzy
 msgid "Remove Contacts"
 msgstr "Renommer le contact"
 
-#: gajim/roster_window.py:3423
+#: gajim/roster_window.py:3379
 msgid "No account available"
 msgstr "Aucun compte disponible"
 
-#: gajim/roster_window.py:3424
+#: gajim/roster_window.py:3380
 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:4060
+#: gajim/roster_window.py:4011
 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:4062
+#: gajim/roster_window.py:4013
 msgid ""
 "Your server does not support storing metacontacts information. So this "
 "information will not be saved on next reconnection."
@@ -1572,14 +1544,11 @@ msgstr ""
 "métacontacts. Par conséquent, ces informations ne seront pas enregistrées "
 "lors de la prochaine connexion."
 
-#: gajim/roster_window.py:4159
-#, fuzzy
+#: gajim/roster_window.py:4110
 msgid "You are about to create a metacontact"
-msgstr ""
-"Vous êtes sur le point de créer un métacontact. Êtes-vous sûr de vouloir "
-"continuer ?"
+msgstr "Vous êtes sur le point de créer un méta-contact"
 
-#: gajim/roster_window.py:4160
+#: gajim/roster_window.py:4111
 #, fuzzy
 msgid ""
 "Metacontacts are a way to regroup several contacts in one single contact. "
@@ -1590,120 +1559,110 @@ msgstr ""
 "Généralement, cela est utile lorsqu'une même personne possède plusieurs "
 "comptes XMPP ou de transport."
 
-#: gajim/roster_window.py:4164
-#, fuzzy
+#: gajim/roster_window.py:4115
 msgid "Create Metacontact"
-msgstr "Renommer le contact"
+msgstr "Créer un méta-contact"
 
-#: gajim/roster_window.py:4170
-#, fuzzy
+#: gajim/roster_window.py:4121 gajim/data/gui/groupchat_creation.ui:317
 msgid "_Create"
-msgstr "Créatif(ve)"
+msgstr "_Créer"
 
-#: gajim/roster_window.py:4287
+#: gajim/roster_window.py:4238
 msgid "Invalid file URI:"
 msgstr "Url de fichier invalide :"
 
-#: gajim/roster_window.py:4298
+#: gajim/roster_window.py:4249
 msgid "Send file?"
 msgstr "Envoyer fichier ?"
 
-#: gajim/roster_window.py:4299
+#: gajim/roster_window.py:4250
 #, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
 msgstr[0] "Voulez vous envoyer ce fichier à %s :"
 msgstr[1] "Voulez vous envoyer ces fichiers à %s :"
 
-#: gajim/roster_window.py:4451
+#: gajim/roster_window.py:4401
 #, python-format
 msgid "Send %(from)s to %(to)s"
 msgstr "Envoyer %(from)s à %(to)s"
 
-#: gajim/roster_window.py:4464
+#: gajim/roster_window.py:4414
 #, python-format
 msgid "Make %s first contact"
 msgstr "Faire de %s le premier contact"
 
-#: gajim/roster_window.py:4469
+#: gajim/roster_window.py:4419
 #, 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:4825 gajim/roster_window.py:4923
+#: gajim/roster_window.py:4775 gajim/roster_window.py:4862
 msgid "_Change Status Message"
 msgstr "_Changer le message d'état"
 
-#: gajim/roster_window.py:4845
+#: gajim/roster_window.py:4795
 msgid "Publish Tune"
 msgstr "Publier ce que j'écoute"
 
-#: gajim/roster_window.py:4856
+#: gajim/roster_window.py:4806
 msgid "Publish Location"
 msgstr "Publier l'emplacement"
 
-#: gajim/roster_window.py:4868
-msgid "Configure Services…"
-msgstr "Configurer les Services…"
-
-#: gajim/roster_window.py:4997
+#: gajim/roster_window.py:4936
 msgid "_Maximize All"
 msgstr "Tout _maximiser"
 
-#: gajim/roster_window.py:5004 gajim/roster_window.py:5146
+#: gajim/roster_window.py:4943 gajim/roster_window.py:5085
 msgid "Send Group M_essage"
 msgstr "_Envoyer un message de groupe"
 
-#: gajim/roster_window.py:5011
+#: gajim/roster_window.py:4950
 msgid "To all users"
 msgstr "À tous les utilisateurs"
 
-#: gajim/roster_window.py:5015
+#: gajim/roster_window.py:4954
 msgid "To all online users"
 msgstr "À tous les utilisateurs connectés"
 
-#: gajim/roster_window.py:5027 gajim/roster_window.py:5152
+#: gajim/roster_window.py:4966 gajim/roster_window.py:5091
 #: gajim/data/gui/gc_occupants_menu.ui:110
 #: gajim/data/gui/contact_context_menu.ui:36
 msgid "In_vite to"
 msgstr "In_viter à"
 
-#: gajim/roster_window.py:5162
+#: gajim/roster_window.py:5101
 msgid "_Manage Contacts"
-msgstr "_Gérer les Contacts"
+msgstr "_Gérer les contacts"
 
-#: gajim/roster_window.py:5168
+#: gajim/roster_window.py:5107
 msgid "Edit _Groups…"
 msgstr "Éditer les _groupes…"
 
-#: gajim/roster_window.py:5189 gajim/data/gui/filetransfers.ui:12
+#: gajim/roster_window.py:5128 gajim/data/gui/filetransfers.ui:12
 #: gajim/data/gui/remove_account_window.ui:134
 msgid "_Remove"
 msgstr "_Supprimer"
 
-#: gajim/roster_window.py:5226
+#: gajim/roster_window.py:5165
 msgid "_Maximize"
 msgstr "_Maximiser"
 
-#: gajim/roster_window.py:5233
+#: gajim/roster_window.py:5172
 msgid "_Reconnect"
 msgstr "_Reconnecter"
 
-#: gajim/roster_window.py:5254 gajim/data/gui/gc_occupants_menu.ui:170
+#: gajim/roster_window.py:5193 gajim/data/gui/gc_occupants_menu.ui:170
 #: gajim/data/gui/gc_control_popup_menu.ui:113
 #: gajim/data/gui/contact_context_menu.ui:205
 msgid "_History"
 msgstr "_Historique"
 
-#: gajim/roster_window.py:5335 gajim/data/gui/application_menu.ui:86
+#: gajim/roster_window.py:5274 gajim/data/gui/application_menu.ui:83
 #: gajim/data/gui/history_window.ui:57
 msgid "History Manager"
 msgstr "Gestionnaire d'historique"
 
-#: gajim/roster_window.py:5343
-msgid "_Join New Group Chat"
-msgstr "_Joindre un salon de discussion"
-
 #: gajim/dataforms_widget.py:585
 msgid "Unable to load image"
 msgstr "Impossible de charger l'image"
@@ -1817,229 +1776,243 @@ msgstr "Chiffré (%s)"
 #: gajim/conversation_textview.py:1259 gajim/gtk/history.py:615
 #, python-format
 msgid "Subject: %s\n"
-msgstr "Sujet : %s\n"
+msgstr "Sujet : %s\n"
 
 #: gajim/message_textview.py:45
 msgid "Write a message…"
 msgstr "Écrire un message…"
 
-#: gajim/message_window.py:250
+#: gajim/message_window.py:356
+msgid "Close Tabs"
+msgstr "Fermer les onglets"
+
+#: gajim/message_window.py:357
 msgid "You are going to close several tabs"
 msgstr "Vous êtes sur le point de fermer plusieurs onglets"
 
-#: gajim/message_window.py:251
+#: gajim/message_window.py:358
 msgid "Do you really want to close them all?"
 msgstr "Voulez-vous vraiment tous les fermer ?"
 
-#: gajim/message_window.py:539
+#: gajim/message_window.py:514
 msgid "?Noun:Chats"
 msgstr "Discussions"
 
-#: gajim/message_window.py:543
+#: gajim/message_window.py:518
 #, fuzzy
 msgid "Group Chats"
 msgstr "Salons de discussion"
 
-#: gajim/message_window.py:547
+#: gajim/message_window.py:522
 msgid "Private Chats"
 msgstr "Conversations privées"
 
-#: gajim/message_window.py:553
+#: gajim/message_window.py:528
 msgid "Messages"
 msgstr "Messages"
 
-#: gajim/gui_interface.py:173
+#: gajim/gui_interface.py:170
+#, 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:175
 msgid "Do you accept this request?"
 msgstr "Acceptez vous sa requête ?"
 
-#: gajim/gui_interface.py:175
-#, python-format
-msgid "Do you accept this request on account %s?"
+#: gajim/gui_interface.py:177
+#, fuzzy, python-format
+msgid "Do you accept this request (account: %s)?"
 msgstr "Acceptez vous cette requête sur le compte %s ?"
 
-#: gajim/gui_interface.py:178
-#, 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:182
+msgid "Authorization"
+msgstr "Autorisation"
 
-#: gajim/gui_interface.py:194 gajim/gtk/notification.py:175
+#: gajim/gui_interface.py:186 gajim/gui_interface.py:420
+#: gajim/gtk/filetransfer.py:338
+#, fuzzy
+msgid "_No"
+msgstr "Non"
+
+#: gajim/gui_interface.py:205 gajim/gtk/notification.py:175
 #: gajim/gtk/notification.py:197
 msgid "Connection Failed"
 msgstr "La connexion a échoué"
 
-#: gajim/gui_interface.py:279 gajim/gui_interface.py:529
-msgid "Password Required"
-msgstr "Mot de passe requis"
-
-#: gajim/gui_interface.py:280
-#, python-format
-msgid "A Password is required to join the room %s. Please type it."
-msgstr ""
-"Un mot de passe est requis pour rejoindre le salon %s. Veuillez le taper."
-
-#: gajim/gui_interface.py:342 gajim/gui_interface.py:346
+#: gajim/gui_interface.py:325 gajim/gui_interface.py:329
 #, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr "Erreur %(code)s : %(msg)s"
 
-#: gajim/gui_interface.py:357 gajim/gui_interface.py:376
+#: gajim/gui_interface.py:340 gajim/gui_interface.py:359
 #: gajim/common/modules/message.py:122
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "erreur en envoyant %(message)s ( %(error)s )"
 
-#: gajim/gui_interface.py:401 gajim/gtk/notification.py:175
+#: gajim/gui_interface.py:384 gajim/gtk/notification.py:175
 msgid "Subscription request"
 msgstr "Requête d'Inscription"
 
-#: gajim/gui_interface.py:413 gajim/common/contacts.py:184
-#: gajim/common/helpers.py:83
+#: gajim/gui_interface.py:396 gajim/common/contacts.py:200
+#: gajim/common/helpers.py:86
 msgid "Observers"
 msgstr "Observateurs"
 
-#: gajim/gui_interface.py:422
+#: gajim/gui_interface.py:405
 msgid "Authorization accepted"
 msgstr "Autorisation acceptée"
 
-#: gajim/gui_interface.py:423
+#: gajim/gui_interface.py:406
 #, 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:431
-#, python-format
-msgid "Contact \"%s\" removed subscription from you"
+#: gajim/gui_interface.py:415
+#, fuzzy
+msgid "Subscription Removed"
+msgstr "Requête d'Inscription"
+
+#: gajim/gui_interface.py:416
+#, fuzzy, python-format
+msgid "Contact '%s' removed subscription from you"
 msgstr "Le contact \"%s\" a cessé de vous souscrire à sa présence"
 
-#: gajim/gui_interface.py:432
+#: gajim/gui_interface.py:417
+#, fuzzy
 msgid ""
-"You will always see them as offline.\n"
+"You will always see this contact as offline.\n"
 "Do you want to remove them from your contact list?"
 msgstr ""
 "Vous le/la verrez toujours hors-ligne.\n"
 "Voulez vous le/la supprimer de votre liste de contacts ?"
 
-#: gajim/gui_interface.py:453 gajim/gtk/notification.py:176
+#: gajim/gui_interface.py:442 gajim/gtk/notification.py:176
 msgid "Unsubscribed"
 msgstr "Désinscrit⋅e"
 
-#: gajim/gui_interface.py:465
+#: gajim/gui_interface.py:454
 #, python-format
 msgid "%(jid)s declined the invitation: %(reason)s"
 msgstr "%(jid)s a refusé l'invitation : %(reason)s"
 
-#: gajim/gui_interface.py:469
+#: gajim/gui_interface.py:458
 #, python-format
 msgid "%(jid)s declined the invitation"
 msgstr "%(jid)s a refusé l'invitation"
 
-#: gajim/gui_interface.py:485
+#: gajim/gui_interface.py:474
 #, 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:506
+#: gajim/gui_interface.py:495
 msgid "Certificate Passphrase Required"
 msgstr "Mot de passe du certificat requis"
 
-#: gajim/gui_interface.py:507
+#: gajim/gui_interface.py:496
 #, 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:516 gajim/gtk/accounts.py:963
+#: gajim/gui_interface.py:505 gajim/gtk/accounts.py:966
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Entrez votre mot de passe pour le compte %s"
 
-#: gajim/gui_interface.py:529 gajim/gtk/accounts.py:964
+#: gajim/gui_interface.py:518
+msgid "Password Required"
+msgstr "Mot de passe requis"
+
+#: gajim/gui_interface.py:518 gajim/gtk/accounts.py:967
 msgid "Save password"
 msgstr "Enregistrer le mot de passe"
 
-#: gajim/gui_interface.py:601 gajim/gui_interface.py:632
+#: gajim/gui_interface.py:587 gajim/gui_interface.py:618
+#: gajim/gtk/filetransfer.py:332 gajim/gtk/filetransfer.py:333
 #: gajim/gtk/notification.py:173 gajim/gtk/notification.py:276
 msgid "File Transfer Error"
 msgstr "Erreur de Transfert de fichier"
 
-#: gajim/gui_interface.py:666
+#: gajim/gui_interface.py:652
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s souhaite vous envoyer un fichier."
 
-#: gajim/gui_interface.py:668 gajim/gtk/filetransfer.py:479
+#: gajim/gui_interface.py:654 gajim/gtk/filetransfer.py:484
 #: gajim/gtk/notification.py:172 gajim/gtk/notification.py:274
 msgid "File Transfer Request"
 msgstr "Requête de transfert de fichier"
 
-#: gajim/gui_interface.py:767
+#: gajim/gui_interface.py:753
 #, fuzzy
 msgid "Remote Contact Stopped Transfer"
 msgstr "Le contact distant à stoppé le transfert"
 
-#: gajim/gui_interface.py:772
+#: gajim/gui_interface.py:758
 #, fuzzy
 msgid "Error Opening File"
 msgstr "Erreur à l’ouverture du fichier"
 
-#: gajim/gui_interface.py:782
-#, fuzzy
+#: gajim/gui_interface.py:768
 msgid "SSL Certificate Error"
 msgstr "Erreur de certificat SSL"
 
-#: gajim/gui_interface.py:795 gajim/gui_interface.py:826
-#: gajim/gui_interface.py:853 gajim/gtk/notification.py:174
+#: gajim/gui_interface.py:781 gajim/gui_interface.py:812
+#: gajim/gui_interface.py:839 gajim/gtk/notification.py:174
 #: gajim/gtk/notification.py:279
 msgid "File Transfer Stopped"
 msgstr "Transfert de fichier interrompu"
 
-#: gajim/gui_interface.py:799
+#: gajim/gui_interface.py:785
 msgid "File Transfer Failed"
 msgstr "Échec du transfert de fichier"
 
-#: gajim/gui_interface.py:822
+#: gajim/gui_interface.py:808
 #, python-format
 msgid "%(filename)s received from %(name)s."
 msgstr "%(filename)s reçu de %(name)s."
 
-#: gajim/gui_interface.py:827
+#: gajim/gui_interface.py:813
 #, 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:833
+#: gajim/gui_interface.py:819
 #, 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:848
+#: gajim/gui_interface.py:834
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Vous avez bien envoyé %(filename)s à %(name)s."
 
-#: gajim/gui_interface.py:854
+#: gajim/gui_interface.py:840
 #, 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:860
+#: gajim/gui_interface.py:846
 #, 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:971
+#: gajim/gui_interface.py:957
 msgid "Username Conflict"
 msgstr "Conflit de nom d'utilisateur"
 
-#: gajim/gui_interface.py:972
+#: gajim/gui_interface.py:958
 msgid "Please type a new username for your local account"
 msgstr "Veuillez entrer un nouveau surnom pour votre compte local"
 
-#: gajim/gui_interface.py:995
+#: gajim/gui_interface.py:981
 msgid "Resource Conflict"
 msgstr "Conflit de ressource"
 
-#: gajim/gui_interface.py:996
+#: gajim/gui_interface.py:982
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
@@ -2047,30 +2020,30 @@ msgstr ""
 "Vous êtes déjà connecté à ce compte avec la même ressource. Veuillez en "
 "entrer une nouvelle"
 
-#: gajim/gui_interface.py:1053
+#: gajim/gui_interface.py:1039
 #, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s souhaite vous envoyer un fichier."
 
-#: gajim/gui_interface.py:1055
+#: gajim/gui_interface.py:1041
 msgid "Voice Chat Request"
 msgstr "Requête de transfert de fichier"
 
-#: gajim/gui_interface.py:1123 gajim/gtk/account_wizard.py:312
+#: gajim/gui_interface.py:1109 gajim/gtk/account_wizard.py:312
 msgid "Certificate Already in File"
 msgstr "Certificat déjà dans un Fichier"
 
-#: gajim/gui_interface.py:1124 gajim/gtk/account_wizard.py:313
+#: gajim/gui_interface.py:1110 gajim/gtk/account_wizard.py:313
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr "Ce certificat est déjà dans le fichier %s, il n'a donc pas été ajouté."
 
-#: gajim/gui_interface.py:1145
+#: gajim/gui_interface.py:1131
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid"
 msgstr "L'authentification du certificat %s peut être invalide"
 
-#: gajim/gui_interface.py:1148
+#: gajim/gui_interface.py:1134
 #, python-format
 msgid ""
 "\n"
@@ -2079,7 +2052,7 @@ msgstr ""
 "\n"
 "Erreur SSL inconnue : %d"
 
-#: gajim/gui_interface.py:1150
+#: gajim/gui_interface.py:1136
 #, python-format
 msgid ""
 "\n"
@@ -2088,11 +2061,11 @@ msgstr ""
 "\n"
 "Erreur SSL : <b>%s</b>"
 
-#: gajim/gui_interface.py:1155
+#: gajim/gui_interface.py:1141
 msgid "Error verifying SSL certificate"
 msgstr "Erreur durant la vérification du certificat SSL"
 
-#: gajim/gui_interface.py:1156
+#: gajim/gui_interface.py:1142
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your XMPP server: "
@@ -2103,7 +2076,7 @@ msgstr ""
 "serveur XMPP : %(error)s\n"
 "Voulez-vous toujours vous connecter à ce serveur ?"
 
-#: gajim/gui_interface.py:1160 gajim/gtk/account_wizard.py:412
+#: gajim/gui_interface.py:1146 gajim/gtk/account_wizard.py:413
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -2118,176 +2091,162 @@ msgstr ""
 "Empreinte digitale SHA-256 du certificat :\n"
 "%(sha256)s"
 
-#: gajim/gui_interface.py:1166
+#: gajim/gui_interface.py:1152
 msgid "Ignore this error for this certificate."
 msgstr "Ignorer cette erreur pour ce certificat."
 
-#: gajim/gui_interface.py:1174
+#: gajim/gui_interface.py:1160
 #, python-format
 msgid "SSL Certificate Verification for %s"
 msgstr "Validation de certificat SSL pour %s"
 
-#: gajim/gui_interface.py:1442 gajim/gtk/join_groupchat.py:235
-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/gui_interface.py:1448
-msgid "JID is not a Groupchat"
-msgstr "JID n'est pas un salon de discussion"
-
-#: gajim/gui_interface.py:1579
-msgid "This is not a group chat"
-msgstr "Ceci n'est pas une conversation multi-utilisateurs"
-
-#: gajim/gui_interface.py:1580
-#, python-format
-msgid ""
-"%(room_jid)s is already in your roster. Please check if %(room_jid)s is a "
-"correct group chat name. If it is, delete it from your roster and try "
-"joining the group chat again."
-msgstr ""
-"%(room_jid)s est déjà dans votre liste de contacts. Veuillez vérifier si "
-"%(room_jid)s est un JID de salon de discussion correcte. Dans ce cas, "
-"supprimez-le de votre liste de contacts et réessayez de joindre le salon."
-
-#: gajim/gui_interface.py:1604 gajim/dialog_messages.py:58
+#: gajim/gui_interface.py:1577
 msgid "You cannot join a group chat while you are invisible"
 msgstr ""
 "Vous ne pouvez pas joindre un salon de discussion tant que vous êtes "
 "invisible."
 
-#: gajim/gui_interface.py:2037
+#: gajim/gui_interface.py:1976
 msgid "Could not save your settings and preferences"
 msgstr "Impossible d'enregistrer vos paramètres et préférences"
 
-#: gajim/gui_interface.py:2098
+#: gajim/gui_interface.py:2037
 msgid "Gajim: IPython Console"
 msgstr ""
 
-#: gajim/dialog_messages.py:32
-msgid "You can not start a new conversation unless you are connected."
-msgstr ""
-"Vous ne pouvez commencer une nouvelle conversation tant que vous n'êtes pas "
-"connecté."
+#: gajim/dialog_messages.py:31 gajim/dialog_messages.py:36
+#: gajim/gtk/single_message.py:305 gajim/gtk/account_wizard.py:229
+msgid "Invalid XMPP Address"
+msgstr "Adresse XMPP invalide"
 
-#: gajim/dialog_messages.py:36 gajim/dialog_messages.py:41
-#: gajim/gtk/single_message.py:305 gajim/gtk/join_groupchat.py:211
-#: gajim/gtk/account_wizard.py:229
-msgid "Invalid JID"
-msgstr "Identifiant Jabber invalide"
-
-#: gajim/dialog_messages.py:42 gajim/gtk/single_message.py:306
-#, python-format
-msgid "It is not possible to send a message to %s, this JID is not valid."
+#: gajim/dialog_messages.py:37
+#, 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/dialog_messages.py:47
-msgid "Unread events"
+#: gajim/dialog_messages.py:42
+#, fuzzy
+msgid "Unread Events"
 msgstr "Événements non lus"
 
-#: gajim/dialog_messages.py:48
-msgid "Read all pending events before removing this account."
+#: gajim/dialog_messages.py:43
+#, fuzzy
+msgid "Read or acknowledge all pending events before removing this account."
 msgstr "Lisez tous les événements avant de supprimer ce compte."
 
-#: gajim/dialog_messages.py:52
+#: gajim/dialog_messages.py:48
 msgid "Invalid Form"
 msgstr "Formulaire invalide"
 
-#: gajim/dialog_messages.py:53
+#: gajim/dialog_messages.py:49
 msgid "The form is not filled correctly."
 msgstr "Le forumlaire n'est pas correctement rempli."
 
-#: gajim/dialog_messages.py:57 gajim/common/helpers.py:309
+#: gajim/dialog_messages.py:53 gajim/common/helpers.py:315
 msgid "Invisible"
 msgstr "Invisible"
 
-#: gajim/dialog_messages.py:62
-msgid "A connection is not available"
+#: gajim/dialog_messages.py:54
+#, fuzzy
+msgid "You cannot join a group chat while being invisible."
+msgstr ""
+"Vous ne pouvez pas joindre un salon de discussion tant que vous êtes "
+"invisible."
+
+#: gajim/dialog_messages.py:58
+msgid "No Connection Available"
 msgstr "Aucune connexion disponible"
 
-#: gajim/dialog_messages.py:63
+#: gajim/dialog_messages.py:59
 msgid "Your message can not be sent until you are connected."
 msgstr ""
 "Votre message ne peut pas être envoyé tant que vous n'êtes pas connecté"
 
-#: gajim/dialog_messages.py:67
-msgid "JID already in list"
-msgstr "JID déjà dans la liste"
+#: gajim/dialog_messages.py:63
+msgid "XMPP Address Already in List"
+msgstr ""
 
-#: gajim/dialog_messages.py:68
-msgid "The JID you entered is already in the list. Choose another one."
+#: gajim/dialog_messages.py:64
+#, fuzzy
+msgid ""
+"The XMPP Address you entered is already in the list. Please choose another "
+"one."
 msgstr ""
 "Le JID que vous avez entré est déjà dans la liste. Veuillez en choisir un "
 "autre."
 
-#: gajim/dialog_messages.py:72
-msgid "Invalid answer"
+#: gajim/dialog_messages.py:69
+msgid "Invalid Answer"
 msgstr "Réponse non valide"
 
-#: gajim/dialog_messages.py:73
+#: gajim/dialog_messages.py:70
 #, python-format
 msgid "Transport %(name)s answered wrongly to register request: %(error)s"
 msgstr ""
 "La passerelle %(name)s a mal répondu à la requête d'enregistrement : "
 "%(error)s"
 
-#: gajim/dialog_messages.py:78
+#: gajim/dialog_messages.py:75
 msgid "Wrong Custom Hostname"
 msgstr "Nom d'hôte personnalisé invalide"
 
-#: gajim/dialog_messages.py:79
-#, python-format
-msgid "Wrong custom hostname \"%s\". Ignoring it."
+#: gajim/dialog_messages.py:76
+#, fuzzy, python-format
+msgid "Custom hostname \"%s\" is wrong. It will be ignored."
 msgstr "Nom d'hôte personnalisé invalide \"%s\". Ignoré."
 
-#: gajim/dialog_messages.py:83
-msgid "Error while removing privacy list"
+#: gajim/dialog_messages.py:80
+#, fuzzy
+msgid "Error While Removing Privacy List"
 msgstr "Une erreur s'est produite pendant la suppression de la liste privée"
 
-#: gajim/dialog_messages.py:84
-#, python-format
+#: gajim/dialog_messages.py:81
+#, fuzzy, python-format
 msgid ""
-"Privacy list %s has not been removed. It is maybe active in one of your "
-"connected resources. Deactivate it and try again."
+"Privacy list %s has not been removed. It is probably active in one of your "
+"connected resources. Please deactivate it and try again."
 msgstr ""
 "La liste privée %s n'a pas été supprimée. Elle est peut-être active dans une "
 "des ressources connectées. Désactivez la et réessayez."
 
-#: gajim/dialog_messages.py:90
-msgid "Invisibility not supported"
+#: gajim/dialog_messages.py:87
+#, fuzzy
+msgid "Invisibility Not Supported"
 msgstr "Invisibilité non-supportée"
 
-#: gajim/dialog_messages.py:91
-#, python-format
-msgid "Account %s doesn't support invisibility."
+#: gajim/dialog_messages.py:88
+#, fuzzy, python-format
+msgid "This account %s doesn't support invisibility."
 msgstr "Le compte %s ne supporte pas l'invisibilité."
 
-#: gajim/dialog_messages.py:95
-msgid "Unregister failed"
+#: gajim/dialog_messages.py:92
+#, fuzzy
+msgid "Unregister Failed"
 msgstr "La désinscription a échoué"
 
-#: gajim/dialog_messages.py:96
-#, python-format
-msgid "Unregistration with server %(server)s failed: %(error)s"
+#: gajim/dialog_messages.py:93
+#, fuzzy, python-format
+msgid "Unregistration on server %(server)s failed: %(error)s"
 msgstr "Le désabonnement du server %(server)s a échoué : %(error)s"
 
-#: gajim/dialog_messages.py:100
-msgid "Registration succeeded"
+#: gajim/dialog_messages.py:97
+#, fuzzy
+msgid "Registration Succeeded"
 msgstr "L'inscription a réussi"
 
-#: gajim/dialog_messages.py:101
-#, python-format
-msgid "Registration with agent %s succeeded"
+#: gajim/dialog_messages.py:98
+#, fuzzy, python-format
+msgid "Registration with agent %s succeeded."
 msgstr "Enregistrement avec l'agent %s réussi"
 
-#: gajim/dialog_messages.py:105 gajim/gtk/service_registration.py:215
-msgid "Registration failed"
+#: gajim/dialog_messages.py:102
+#, fuzzy
+msgid "Registration Failed"
 msgstr "L'inscription a échoué"
 
-#: gajim/dialog_messages.py:106
+#: gajim/dialog_messages.py:103
 #, python-format
 msgid ""
 "Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
@@ -2295,15 +2254,16 @@ msgstr ""
 "L'enregistrement avec l'agent %(agent)s a échoué avec l'erreur %(error)s : "
 "%(error_msg)s"
 
-#: gajim/dialog_messages.py:111
+#: gajim/dialog_messages.py:108
 msgid "Unable to Join Group Chat"
 msgstr "Impossible de rejoindre le salon de discussion"
 
-#: gajim/dialog_messages.py:116
-msgid "GStreamer error"
+#: gajim/dialog_messages.py:113
+#, fuzzy
+msgid "GStreamer Error"
 msgstr "Erreur GStreamer"
 
-#: gajim/dialog_messages.py:117
+#: gajim/dialog_messages.py:114
 #, python-format
 msgid ""
 "Error: %(error)s\n"
@@ -2312,19 +2272,20 @@ msgstr ""
 "Message d'erreur : %(error)s\n"
 "Debug : %(debug)s"
 
-#: gajim/dialog_messages.py:121
-msgid "Wrong host"
+#: gajim/dialog_messages.py:118
+#, fuzzy
+msgid "Wrong Host"
 msgstr "Mauvais serveur"
 
-#: gajim/dialog_messages.py:122
+#: gajim/dialog_messages.py:119
 msgid "Invalid local address? :-O"
 msgstr "Adresse locale non valide ? :-O"
 
-#: gajim/dialog_messages.py:126
-msgid "Avahi error"
+#: gajim/dialog_messages.py:123
+msgid "Avahi Error"
 msgstr "Erreur d'Avahi"
 
-#: gajim/dialog_messages.py:127
+#: gajim/dialog_messages.py:124
 #, python-format
 msgid ""
 "%s\n"
@@ -2333,60 +2294,67 @@ msgstr ""
 "%s\n"
 "La messagerie en « link-local » pourrait ne pas fonctionner correctement."
 
-#: gajim/dialog_messages.py:131 gajim/dialog_messages.py:136
-msgid "Could not request upload slot"
+#: gajim/dialog_messages.py:128 gajim/dialog_messages.py:133
+#, fuzzy
+msgid "Could not request upload slot for HTTP File Upload"
 msgstr "Impossible de demander l’envoi de fichier"
 
-#: gajim/dialog_messages.py:137
-msgid "Got unexpected response from server (see log)"
+#: gajim/dialog_messages.py:134
+#, fuzzy
+msgid "Got unexpected response from server (see log)."
 msgstr "Réponse inattendue du serveur (voir log)"
 
-#: gajim/dialog_messages.py:141 gajim/dialog_messages.py:146
-msgid "Could not open file"
+#: gajim/dialog_messages.py:138 gajim/dialog_messages.py:143
+#, fuzzy
+msgid "Could not Open File"
 msgstr "Impossible d’ouvrir le fichier"
 
-#: gajim/dialog_messages.py:142
-msgid "Exception raised while opening file (see log)"
+#: gajim/dialog_messages.py:139
+#, fuzzy
+msgid "Exception raised while trying to open file (see log)."
 msgstr "Erreur lors de l’ouverture du fichier (voir log)"
 
-#: gajim/dialog_messages.py:151
-msgid "Unsecure"
-msgstr "Non sécurisé"
+#: gajim/dialog_messages.py:148
+#, fuzzy
+msgid "Not Secure"
+msgstr "Non chiffré"
 
-#: gajim/dialog_messages.py:152
-msgid "Server returned unsecure transport (HTTP)"
+#: gajim/dialog_messages.py:149
+#, fuzzy
+msgid "The server returned an insecure transport (HTTP)."
 msgstr "Le servpvo a retourné un transport non sécurisé (HTTP)"
 
-#: gajim/dialog_messages.py:156
-msgid "Could not upload file"
+#: gajim/dialog_messages.py:153
+#, fuzzy
+msgid "Could not Upload File"
 msgstr "Impossible d’envoyer le fichier"
 
-#: gajim/dialog_messages.py:157
+#: gajim/dialog_messages.py:154
 #, python-format
 msgid "HTTP response code from server: %s"
 msgstr "Code de réponse HTTP du serveur : %s"
 
-#: gajim/dialog_messages.py:161
+#: gajim/dialog_messages.py:158
 msgid "Upload Error"
 msgstr "Erreur de l’envoi"
 
-#: gajim/dialog_messages.py:166
+#: gajim/dialog_messages.py:163
 msgid "Encryption Error"
 msgstr "Erreur du chiffrement"
 
-#: gajim/dialog_messages.py:167
-msgid "For the chosen encryption there is no encryption method available"
-msgstr "Aucune méthode disponible pour le chiffrement choisi"
+#: gajim/dialog_messages.py:164
+msgid "There is no encryption method available for the chosen encryption."
+msgstr ""
 
-#: gajim/dialog_messages.py:171
-msgid "Avatar upload failed"
+#: gajim/dialog_messages.py:169
+msgid "Avatar Upload Failed"
 msgstr "Échec lors de l’envoi de l’avatar"
 
-#: gajim/privatechat_control.py:204
+#: gajim/privatechat_control.py:207
 msgid "Sending private message failed"
 msgstr "L’envoi du message privé a échoué"
 
-#: gajim/privatechat_control.py:206
+#: gajim/privatechat_control.py:209
 #, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr ""
@@ -2410,7 +2378,8 @@ msgid "show help on command"
 msgstr "montrer l’aide sur la commande"
 
 #: gajim/gajim_remote.py:85
-msgid "Lists all contacts in roster, one for each line"
+#, fuzzy
+msgid "Lists all contacts in the contact list, one for each line"
 msgstr "Affiche tous les contacts de la liste, un par ligne"
 
 #: gajim/gajim_remote.py:87 gajim/gajim_remote.py:102 gajim/gajim_remote.py:112
@@ -2486,11 +2455,13 @@ msgstr ""
 
 #: gajim/gajim_remote.py:118
 #, fuzzy
-msgid "Sends new chat message to a contact in the roster. Account is optional."
+msgid ""
+"Sends new chat message to a contact in the contact list. Account is optional."
 msgstr "Envoie un message à ce contact qui attirera son attention"
 
 #: gajim/gajim_remote.py:120 gajim/gajim_remote.py:130
-msgid "JID of the contact that will receive the message"
+#, fuzzy
+msgid "XMPP Address of the contact that will receive the message"
 msgstr "L'identifiant Jabber du contact qui recevra le message"
 
 #: gajim/gajim_remote.py:121 gajim/gajim_remote.py:132
@@ -2504,8 +2475,10 @@ msgid "if specified, the message will be sent using this account"
 msgstr "Si spécifié, le message sera envoyé en utilisant ce compte"
 
 #: gajim/gajim_remote.py:127
-msgid "Sends a chat message to someone on your roster. Account is optional."
-msgstr ""
+#, fuzzy
+msgid ""
+"Sends a chat message to someone on your contact list. Account is optional."
+msgstr "Envoie un message à ce contact qui attirera son attention"
 
 #: gajim/gajim_remote.py:131
 msgid "subject"
@@ -2516,11 +2489,13 @@ msgid "message subject"
 msgstr "sujet du message"
 
 #: gajim/gajim_remote.py:138
-msgid "Sends new message to a groupchat you've joined."
+#, fuzzy
+msgid "Sends new message to a group chat you've joined."
 msgstr "Envoie un nouveau message à un salon que vous avez rejoint."
 
 #: gajim/gajim_remote.py:140
-msgid "JID of the room that will receive the message"
+#, fuzzy
+msgid "XMPP Address of the group chat that will receive the message"
 msgstr "L'identifiant Jabber du salon qui recevra le message"
 
 #: gajim/gajim_remote.py:147
@@ -2529,7 +2504,8 @@ msgstr "Récupère les informations détaillées d'un contact"
 
 #: gajim/gajim_remote.py:149 gajim/gajim_remote.py:162
 #: gajim/gajim_remote.py:192
-msgid "JID of the contact"
+#, fuzzy
+msgid "XMPP Address of the contact"
 msgstr "L'identifiant Jabber du contact"
 
 #: gajim/gajim_remote.py:153
@@ -2589,7 +2565,8 @@ msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Écrit les préférences actuelles de Gajim dans le fichier .config"
 
 #: gajim/gajim_remote.py:190
-msgid "Removes contact from roster"
+#, fuzzy
+msgid "Removes contact from contact list"
 msgstr "Enlever le contact de la liste"
 
 #: gajim/gajim_remote.py:193
@@ -2636,9 +2613,9 @@ msgid "Missing argument \"contact_jid\""
 msgstr "Argument manquant \"jid_contact\""
 
 #: gajim/gajim_remote.py:275
-#, python-format
+#, fuzzy, python-format
 msgid ""
-"'%s' is not in your roster.\n"
+"'%s' is not in your contact list.\n"
 "Please specify account for sending the message."
 msgstr ""
 "'%s' n'est pas dans votre liste de contact.\n"
@@ -2865,12 +2842,12 @@ msgstr "Fin de la semaine"
 msgid "Weekend!"
 msgstr "Fin de semaine !"
 
-#: gajim/common/logger.py:192 gajim/common/logger.py:197
+#: gajim/common/logger.py:189 gajim/common/logger.py:194
 #, 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:217
+#: gajim/common/logger.py:214
 #, python-format
 msgid "Creating %s"
 msgstr "Création de %s"
@@ -2943,24 +2920,23 @@ msgstr "%(nickname)s s'est déconnecté⋅e"
 msgid "Contact Signed Out"
 msgstr "Contact déconnecté"
 
-#: gajim/common/contacts.py:455
-msgid "Not in roster"
-msgstr "Pas dans la liste"
-
 #: gajim/common/config.py:80
+#, fuzzy
 msgid ""
 "Show desktop notification even when a chat window is opened for this contact "
-"and does not have focus"
+"and does not have focus."
 msgstr ""
 "Montrer les notifications même lorsqu'une fenêtre de discussion est ouverte "
 "pour ce contact et n'a pas le focus"
 
 #: gajim/common/config.py:81
-msgid "Play sound when user is busy"
+#, fuzzy
+msgid "Play sound even when being busy."
 msgstr "Jouer les sons quand vous êtes occupé⋅e"
 
 #: gajim/common/config.py:83
-msgid "Show only online and free for chat contacts in roster."
+#, fuzzy
+msgid "Show only online and free for chat contacts in the contact list."
 msgstr ""
 "Afficher uniquement les contacts « Connecté » et « Disponible pour discuter "
 "» dans la liste des contacts."
@@ -2970,11 +2946,15 @@ msgid "Time in minutes, after which your status changes to away."
 msgstr "Temps en minutes, au bout duquel votre état basculera absent⋅e."
 
 #: gajim/common/config.py:87
-msgid "$S (Away as a result of being idle more than $T min)"
+#, fuzzy
+msgid "$S (Away: Idle more than $T min)"
 msgstr "$S (Absent⋅e car inactif depuis plus de $T min)"
 
 #: gajim/common/config.py:87
-msgid "$S will be replaced by current status message, $T by autoawaytime."
+#, fuzzy
+msgid ""
+"$S will be replaced by current status message, $T by the 'autoawaytime' "
+"value."
 msgstr ""
 "$S sera remplacé par le message de statut, $T par le temps d'auto-absence."
 
@@ -2983,67 +2963,81 @@ msgid "Time in minutes, after which your status changes to not available."
 msgstr "Temps en minutes après lequel votre état basculera non disponible."
 
 #: gajim/common/config.py:90
-msgid "$S (Not available as a result of being idle more than $T min)"
+#, fuzzy
+msgid "$S (Not available: Idle more than $T min)"
 msgstr "$S (Non disponible car inactif depuis plus de $T min)"
 
 #: gajim/common/config.py:90
-msgid "$S will be replaced by current status message, $T by autoxatime."
+#, fuzzy
+msgid ""
+"$S will be replaced by current status message, $T by the 'autoxatime' value."
 msgstr "$S sera remplacé par le message de statut, $T par le temps d'auto-idle"
 
 #: gajim/common/config.py:93
+#, fuzzy
 msgid ""
-"When to show notification area icon. Can be 'never', 'on_event', 'always'."
+"When to show the notification area icon. Can be 'never', 'on_event', and "
+"'always'."
 msgstr ""
 "Quand afficher l'icône dans la zone de notifications. Peut être \"never"
 "\" (jamais), \"on_event\" (lorsqu'il y a un évènement en attente) ou \"always"
 "\" (toujours)"
 
 #: gajim/common/config.py:94
-msgid "Allow to hide the roster window even if the tray icon is not shown."
+#, fuzzy
+msgid ""
+"Allow to hide the contact list window even if the notification area icon is "
+"not shown."
 msgstr ""
 "Autoriser à cacher la liste des contacts même si l'icône de notification "
 "n'est pas affichée."
 
 #: gajim/common/config.py:97
-msgid "Contact signed in notification color."
-msgstr "Couleur des notifications lorsqu'un contact se connecte."
+#, fuzzy
+msgid "Notification color for contacts signing in."
+msgstr "Me signaler les contacts qui se _connectent"
 
 #: gajim/common/config.py:98
-msgid "Contact signout notification color"
-msgstr "Couleur des notifications lorsqu'un contact se déconnecte."
+#, fuzzy
+msgid "Notification color for contacts signing out."
+msgstr "Me signaler les contacts qui se _déconnectent"
 
 #: gajim/common/config.py:99
-msgid "New message notification color."
+#, fuzzy
+msgid "Notification color for new message notification."
 msgstr "Couleur des notifications de nouveau message."
 
 #: gajim/common/config.py:100
-msgid "File transfer request notification color."
-msgstr "Couleur des notifications pour une demande de transfert de fichier"
+#, fuzzy
+msgid "Notification color for file transfer request."
+msgstr "Me _signaler quand un transfert de fichier est terminé"
 
 #: gajim/common/config.py:101
-msgid "File transfer error notification color."
-msgstr "Couleur des notifications pour une erreur de transfert de fichier"
+#, fuzzy
+msgid "Notification color for file transfer errors."
+msgstr "Me _signaler quand un transfert de fichier est terminé"
 
 #: gajim/common/config.py:102
-msgid "File transfer complete or stopped notification color."
-msgstr "Couleur des notifications lorsqu'un transfert de fichier est terminé"
+msgid "Notification color for stopped or completed file transfers."
+msgstr ""
 
 #: gajim/common/config.py:103
-msgid "Groupchat invitation notification color"
+msgid "Notification color for group chat invitations."
 msgstr ""
-"Couleur des notifications pour une invitation dans un salon de discussion"
 
 #: gajim/common/config.py:104
-msgid "Background color of status changed notification"
+#, fuzzy
+msgid "Notification background color for changed status."
 msgstr "Couleur des notifications lorsqu'un contact change d'état"
 
 #: gajim/common/config.py:105
-msgid "Other dialogs color."
-msgstr "Couleur des autres fenêtres."
+msgid "Notification color for other dialogs."
+msgstr ""
 
 #: gajim/common/config.py:106
+#, fuzzy
 msgid ""
-"List (space separated) of rows (accounts and groups) that are collapsed."
+"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."
@@ -3052,8 +3046,10 @@ msgstr ""
 msgid "default"
 msgstr "Par défaut"
 
-#: gajim/common/config.py:113
-msgid "Language used by speller"
+#: gajim/common/config.py:113 gajim/common/config.py:424
+#: gajim/common/config.py:431
+#, fuzzy
+msgid "Language used for spell checking."
 msgstr "Langue utilisée par le vérificateur orthographique"
 
 #: gajim/common/config.py:114
@@ -3068,10 +3064,11 @@ msgstr ""
 "'never' - ne jamais afficher l'heure."
 
 #: gajim/common/config.py:115
+#, fuzzy
 msgid ""
 "Print time in chats using Fuzzy Clock. Value of fuzziness from 1 to 4, or 0 "
-"to disable fuzzyclock. 1 is the most precise clock, 4 the least precise one. "
-"This is used only if print_time is 'sometimes'."
+"to disable Fuzzy Clock. 1 is the most precise clock, 4 the least precise "
+"one. This is used only if 'print_time' is 'sometimes'."
 msgstr ""
 "Afficher l'horodatage dans les conversations à l'aide de l'« horloge "
 "approximative ». L'approximation peut prendre des valeurs comprises entre 1 "
@@ -3089,330 +3086,355 @@ msgstr ""
 "Traiter les paires de * / _ comme des éventuels caractères de formatage."
 
 #: gajim/common/config.py:120
+#, fuzzy
 msgid ""
-"If true, do not remove */_ . So *abc* will be bold but with * * not removed."
+"If enabled, do not remove */_ . So *abc* will be bold but with * * not "
+"removed."
 msgstr ""
 "Si activé, ne supprime pas */_ . Donc *abc* sera en gras mais sans supprimer "
 "les * *"
 
 #: gajim/common/config.py:123
 msgid ""
-"Uses ReStructured text markup to send HTML, plus ascii formatting if "
-"selected. For syntax, see http://docutils.sourceforge.net/docs/ref/rst/"
-"restructuredtext.html (If you want to use this, install docutils)"
+"Uses ReStructured text markup to send HTML, plus ASCII formatting if "
+"selected. Needs docutils installed (for syntax, see http://docutils."
+"sourceforge.net/docs/ref/rst/restructuredtext.html)."
 msgstr ""
 "Utiliser la syntaxe ReStructured pour l'HTML, ainsi que du formattage ascii. "
 "Pour la syntaxe voir http://docutils.sourceforge.net/docs/ref/rst/"
-"restructuredtext.html (si vous voulez utiliser cela, installez docutils)"
+"restructuredtext.html (si vous voulez utiliser cela, installez docutils)."
 
 #: gajim/common/config.py:132
+#, fuzzy
 msgid ""
-"Character to add after nickname when using nick completion (tab) in group "
-"chat."
+"Character to add after nickname when using nickname completion (tab) in "
+"group chat."
 msgstr ""
 "Caractère à ajouter après un surnom en utilisant la complétion automatique "
 "(tab) dans un salon de discussion."
 
 #: gajim/common/config.py:133
+#, fuzzy
 msgid ""
-"Character to propose to add after desired nickname when desired nickname is "
-"used by someone else in group chat."
+"Character to propose to add after desired nickname when nickname is already "
+"used in group chat."
 msgstr ""
 "Caractère ajouté automatiquement après un surnom s'il est déjà utilisé dans "
 "un salon de discussion."
 
 #: gajim/common/config.py:155
+#, fuzzy
 msgid ""
-"If true, Gajim will save roster position when hiding roster, and restore it "
-"when showing roster."
+"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 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:161
-msgid "Place the roster on the right in single window mode"
+#, fuzzy
+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:167
 msgid ""
-"This option let you customize timestamp that is printed in conversation. For "
-"example \"[%H:%M] \" will show \"[hour:minute] \". See python doc on "
-"strftime for full documentation: http://docs.python.org/lib/module-time.html"
+"This option lets you customize the timestamp that is printed in "
+"conversation. For example '[%H:%M] ' will show '[hour:minute] '. See python "
+"doc on strftime for full documentation (https://docs.python.org/3/library/"
+"time.html)."
 msgstr ""
 "Cette option vous permet de configurer l'heure affichée dans les "
 "conversations. Par exemple \"[%H:%M]\" affichera \"[heure:minute] \". Voir "
-"la documentation python de strftime pour une documentation complète : http://"
-"docs.python.org/lib/module-time.html"
+"la documentation python de strftime pour une documentation complète : "
+"https://docs.python.org/3/library/time.html"
 
 #: gajim/common/config.py:168
-msgid "Characters that are printed before the nickname in conversations"
+#, fuzzy
+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:169
-msgid "Characters that are printed after the nickname in conversations"
+#, fuzzy
+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:170
-msgid "Add * and [n] in roster title?"
-msgstr "Ajouter * et [n] au titre de la liste des contacts ?"
+#, fuzzy
+msgid "If enabled, Gajim will add * and [n] in contact list window title."
+msgstr ""
+"Si cette case est cochée, Gajim affichera l'humeur de chaque contact dans "
+"votre roster"
 
 #: gajim/common/config.py:171
+#, fuzzy
 msgid ""
-"How many history messages should be restored when a chat tab/window is "
-"reopened?"
+"Number of messages from chat history to be restored when a chat tab/window "
+"is reopened."
 msgstr ""
 "Nombre de lignes de l'historique à afficher lorsque l'onglet ou la fenêtre "
 "de discussion est ouvert à nouveau ?"
 
 #: gajim/common/config.py:172
-msgid "How far back in time (minutes) history is restored. -1 means no limit."
+#, fuzzy
+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:173
+#, fuzzy
 msgid ""
-"How many lines to request from server when entering a groupchat. -1 means no "
-"limit"
-msgstr ""
-"Le nombre de lignes d'archives qui seront demandées en entrant dans un "
-"salon. -1 signifie \"pas de limitation\""
-
-#: gajim/common/config.py:174
-msgid ""
-"Minutes of backlog to request when entering a groupchat. -1 means no limit"
-msgstr ""
-"Le nombre de minutes d'archives qui seront demandées en entrant dans un "
-"salon. -1 signifie \"pas de limitation\""
-
-#: gajim/common/config.py:175
-msgid ""
-"How many seconds to wait before trying to autorejoin to a conference you are "
-"being disconnected from. Set to 0 to disable autorejoining."
+"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 ""
 "Le nombre de secondes à attendre avant de tenter de se reconnecter "
 "automatiquement à un salon dont vous avez été déconnecté. Mettre à 0 pour "
 "désactiver."
 
-#: gajim/common/config.py:176
-msgid "Should autorejoin be activated when kicked from a conference?"
+#: gajim/common/config.py:174
+#, fuzzy
+msgid ""
+"Should automatic rejoin be activated when you were kicked from a group chat?"
 msgstr ""
 "La reconnexion automatique doit-elle être activée lorsque l'on est éjecté "
 "d'un salon de discussion ?"
 
-#: gajim/common/config.py:177
-msgid ""
-"Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
-"Client default behaviour)."
+#: gajim/common/config.py:175
+#, fuzzy
+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 "
 "(comportement par défaut du client ICQ de Mirabilis)."
 
-#: gajim/common/config.py:179
-msgid "How many lines to store for Ctrl+KeyUP."
+#: gajim/common/config.py:177
+#, fuzzy
+msgid "How many lines to store for Ctrl+KeyUP (previously sent messages)."
 msgstr ""
 "Nombre de lignes à stocker pour le rappel des lignes précédentes (avec Ctrl"
 "+flèche vers le haut)."
 
-#: gajim/common/config.py:182
-#, python-format
+#: gajim/common/config.py:180
+#, fuzzy, python-format
 msgid ""
-"Either custom URL with %%s in it where %%s is the word/phrase or "
-"'WIKTIONARY' which means use Wikitionary."
+"Either a custom URL with %%s in it (where %%s is the word/phrase) or "
+"'WIKTIONARY' (which means use Wikitionary)."
 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:185
+#: gajim/common/config.py:183
 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:187
+#: gajim/common/config.py:185
+#, fuzzy
 msgid ""
-"When not printing time for every message (print_time==sometimes), print it "
+"When not printing time for every message ('print_time'==sometimes), print it "
 "every x minutes."
 msgstr ""
 "Au lieu d'afficher l'heure à chaque message (print_time==sometimes), "
 "l'afficher toutes les x minutes."
 
-#: gajim/common/config.py:188
+#: gajim/common/config.py:186
 msgid "Ask before pasting an image."
 msgstr "Demander avant de coller une image."
 
-#: gajim/common/config.py:189
+#: gajim/common/config.py:187
 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:190
+#: gajim/common/config.py:188
+#, fuzzy
 msgid ""
-"Always ask for confirmation before closing groupchats with any of the JIDs "
-"on this space separated list."
+"Always ask for confirmation before closing group chats with any of the XMPP "
+"Addresses on this list (space separated)."
 msgstr ""
 "Toujours demander confirmation avant de fermer les salons de discussion avec "
 "les JIDs de cette liste séparés par des espaces."
 
-#: gajim/common/config.py:191
+#: gajim/common/config.py:189
+#, fuzzy
 msgid ""
-"Never ask for confirmation before closing groupchats with any of the JIDs on "
-"this space separated list."
+"Never ask for confirmation before closing group chats with any of the XMPP "
+"Addresses on this list (space separated)."
 msgstr ""
 "Ne jamais demander avant de fermer les salons de discussion avec les JIDs de "
 "cette liste séparées par des espaces."
 
-#: gajim/common/config.py:192
+#: gajim/common/config.py:190
+#, fuzzy
 msgid ""
-"Ask before closing tabbed chat window if there are controls that can lose "
-"data (chat, private chat, groupchat that will not be minimized)"
+"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 ""
 "Demander avant de fermer une fenêtre contenant des onglets si des données "
 "peuvent être perdues (conversations, conversations privées, salons qui se "
 "seront pas minimisés)"
 
-#: gajim/common/config.py:195
+#: gajim/common/config.py:193
+#, fuzzy
 msgid ""
-"Comma separated list of sent hosts, in addition of local interfaces, for "
-"File Transfer in case of address translation/port forwarding."
+"List of send hosts (comma separated) in addition to local interfaces for "
+"file transfers (in case of address translation/port forwarding)."
 msgstr ""
 "Liste séparées par des espaces d'hôtes que nous envoyons, en plus des "
 "interfaces locales, pour les transferts de fichiers dans le cas de "
 "traduction d'adresse / redirection de port."
 
-#: gajim/common/config.py:196
+#: gajim/common/config.py:194
 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:198
+#: gajim/common/config.py:196
 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:199
+#: gajim/common/config.py:197
+#, fuzzy
 msgid ""
-"If False, Gajim will display a static event icon instead of the blinking "
-"status icon in the notification area when notifying on event."
+"If disabled, Gajim will display a static event icon instead of the blinking "
+"status icon in the notification area when notifying about an event."
 msgstr ""
 "Si désactivé, Gajim affichera une icône d'événement statique au lieu de "
 "l'icône clignotant dans la zone de notification lors de la notification d'un "
 "événement."
 
-#: gajim/common/config.py:205
+#: gajim/common/config.py:203
 msgid "Show tab when only one conversation?"
 msgstr "Montrer l'onglet quand il n'y a qu'une discussion ?"
 
-#: gajim/common/config.py:206
+#: gajim/common/config.py:204
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "Afficher la bordure fenêtres de discussion à onglets ?"
 
-#: gajim/common/config.py:207
+#: gajim/common/config.py:205
 msgid "Show close button in tab?"
 msgstr "Afficher le bouton fermer sur l'onglet ?"
 
-#: gajim/common/config.py:220
+#: gajim/common/config.py:218
 msgid "Preview new messages in notification popup?"
 msgstr "Aperçu des nouveaux messages dans un popup ?"
 
-#: gajim/common/config.py:223
+#: gajim/common/config.py:221
+#, fuzzy
 msgid ""
-"A semicolon-separated list of words that will be highlighted in group chats."
+"A list of words (semicolon separated) that will be highlighted in group "
+"chats."
 msgstr ""
 "Une liste de mots séparés par des points-virgules qui seront mis en "
 "surbrillance dans les salons."
 
-#: gajim/common/config.py:224
+#: gajim/common/config.py:222
+#, fuzzy
 msgid ""
-"If true, quits Gajim when X button of Window Manager is clicked. This "
-"setting is taken into account only if notification icon is used."
+"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 activé, quitte Gajim quand on clique sur le bouton X du gestionnaire de "
 "fenêtre. Cette option n'est prise en compte que si l'icône dans la barre de "
 "notification est utilisée."
 
-#: gajim/common/config.py:225
+#: gajim/common/config.py:223
+#, fuzzy
 msgid ""
-"If true, Gajim hides the Roster window on pressing the X button instead of "
-"minimizing into the Dock."
+"If enabled, Gajim hides the contact list window when pressing the X button "
+"instead of minimizing into the notification area."
 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 le Dock."
 
-#: gajim/common/config.py:226
+#: gajim/common/config.py:224
+#, fuzzy
 msgid ""
-"If true, Gajim will display an icon on each tab containing unread messages. "
-"Depending on the theme, this icon may be animated."
+"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 dans chaque onglet une icône contenant les "
 "messages non lus. En fonction du thème, cette icône peut être animée."
 
-#: gajim/common/config.py:227
+#: gajim/common/config.py:225
+#, fuzzy
 msgid ""
-"If true, Gajim will display the status message, if not empty, for every "
-"contact under the contact name in roster window."
+"If enabled, Gajim will display the status message (if not empty) underneath "
+"the contact name in the contact list window."
 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:233
-msgid "Define the position of the avatar in roster. Can be left or right"
+#: gajim/common/config.py:231
+#, fuzzy
+msgid ""
+"Define the position of avatars in the contact list. Can be 'left' or 'right'."
 msgstr ""
 "Définir la position de l'avatar dans la liste des contacts. Peut être à "
 "droite (right) ou à gauche (left)."
 
-#: gajim/common/config.py:234
+#: gajim/common/config.py:232
+#, fuzzy
 msgid ""
-"If False, Gajim will no longer print status line in chats when a contact "
-"changes their status and/or their status message."
+"If disabled, Gajim will no longer print status messages in chats when a "
+"contact changes their status (and/or their status message)."
 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:235
+#: gajim/common/config.py:233
+#, fuzzy
 msgid ""
 "Default Setting: Show a status message for every join or leave in a group "
-"chat"
+"chat."
 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:236
+#: gajim/common/config.py:234
+#, fuzzy
 msgid ""
-"Default Setting: Show a status message for all status (away, dnd, etc.) "
-"changes of users in a group chat"
+"Default Setting: Show a status message for all status changes (away, dnd, "
+"etc.) of users in a group chat."
 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:238
-msgid "Log XHTML messages instead of plain text messages."
+#: gajim/common/config.py:236
+#, fuzzy
+msgid "Store XHTML messages in chat history instead of plain text messages."
 msgstr "Enregistrer les messages XHTML au lieu des messages en texte simple."
 
-#: gajim/common/config.py:239
+#: gajim/common/config.py:237
 msgid "Don't show avatar for the transport itself."
 msgstr "Ne pas afficher d'avatars particuliers pour les passerelles."
 
-#: gajim/common/config.py:240
-msgid "Don't show roster in the system taskbar."
+#: gajim/common/config.py:238
+#, 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:241
+#: gajim/common/config.py:239
+#, fuzzy
 msgid ""
-"If true, make the window flash (the default behaviour in most Window "
-"Managers) when holding pending events."
+"If enabled, Gajim makes the window flash (the default behaviour in most "
+"Window Managers) when holding pending events."
 msgstr ""
 "Si activé, fait clignoter (comportement par défaut dans la plupart des "
 "gestionnaires de fenêtres) la fenêtre quand elle contient des événements non "
 "lus."
 
-#: gajim/common/config.py:245
+#: gajim/common/config.py:243
+#, fuzzy
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
 "'always_with_roster' - Like 'always' but the messages are in a single window "
-"along with the roster.\n"
+"along with the contact list.\n"
 "'never' - All messages get their own window.\n"
 "'peracct' - Messages for each account are sent to a specific window.\n"
-"'pertype' - Each message type (e.g. chats vs. groupchats) is sent to a "
+"'pertype' - Each message type (e.g. chats vs. group chats) is sent to a "
 "specific window."
 msgstr ""
 "Contrôle la fenêtre dans laquelle sont placées les nouvelles conversations.\n"
@@ -3424,128 +3446,145 @@ msgstr ""
 "'pertype' - Toutes les conversations d'un même type (discussion, salon) dans "
 "la même fenêtre."
 
-#: gajim/common/config.py:246
+#: gajim/common/config.py:244
+#, fuzzy
 msgid ""
-"Show roster on startup.\n"
-"'always' - Always show roster.\n"
-"'never' - Never show roster.\n"
-"'last_state' - Restore the last state roster."
+"Show contact list window on startup.\n"
+"'always' - Always show contact list window.\n"
+"'never' - Never show contact list window.\n"
+"'last_state' - Restore last state of the contact list window."
 msgstr ""
 "Montrer la liste de contacts au démarrage.\n"
 "'always' - Toujours montrer.\n"
 "'never' - Jamais montrer.\n"
 "'last_state' - Restaurer le dernier état."
 
-#: gajim/common/config.py:247
-msgid "If False, you will no longer see the avatar in the chat window."
+#: gajim/common/config.py:245
+#, fuzzy
+msgid "If enabled, Gajim displays the avatar in the chat window."
 msgstr ""
 "Si désactivé, vous ne verrez plus les avatars dans les fenêtres de "
 "conversation."
 
-#: gajim/common/config.py:248
-msgid "If true, pressing the escape key closes a tab/window."
+#: gajim/common/config.py:246
+#, 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:249
-msgid "Hides the banner in a group chat window"
+#: gajim/common/config.py:247
+#, fuzzy
+msgid "Hides the banner in a group chat window."
 msgstr "Cacher les boutons dans la fenêtre de discussion"
 
-#: gajim/common/config.py:250
-msgid "Hides the banner in two persons chat window"
-msgstr "Cache la bannière dans les fenêtres de discussions"
+#: gajim/common/config.py:248
+#, 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:251
-msgid "Hides the group chat occupants list in group chat window."
+#: gajim/common/config.py:249
+#, 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:252
+#: gajim/common/config.py:250
+#, fuzzy
 msgid ""
 "In a chat, show the nickname at the beginning of a line only when it's not "
-"the same person talking than in previous message."
+"the same person talking as in the previous message."
 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:253
+#: gajim/common/config.py:251
 msgid "Indentation when using merge consecutive nickname."
 msgstr "Indentation lors du fusionnement d'un surnom répété."
 
-#: gajim/common/config.py:254
-msgid "Ctrl-Tab go to next composing tab when none is unread."
+#: gajim/common/config.py:252
+#, fuzzy
+msgid ""
+"Ctrl+Tab switches to the next composing tab when there are no tabs with "
+"messages pending."
 msgstr ""
 "Ctrl-Tab pour basculer au prochain onglet lorsqu'aucun d'entre eux n'a de "
 "nouveaux messages non lus."
 
-#: gajim/common/config.py:255
+#: gajim/common/config.py:253
+#, fuzzy
 msgid ""
-"Show the confirm metacontacts creation dialog or not? Empty string means "
-"never show the dialog."
+"Show a confirmation dialog to create metacontacts? Empty string means never "
+"show the dialog."
 msgstr ""
-"Afficher ou non la fenêtre de dialogue de confirmation de la création de "
-"métacontacts ? Une valeur vide signifie ne jamais l'afficher."
+"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:256
+#: gajim/common/config.py:254
+#, fuzzy
 msgid ""
-"Show the confirm block contact dialog or not? Empty string means never show "
+"Show a confirmation dialog to block a contact? Empty string means never show "
 "the dialog."
 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:257
+#: gajim/common/config.py:255
+#, fuzzy
 msgid ""
-"Show the confirm custom status dialog or not? Empty string means never show "
-"the dialog."
+"Show a confirmation dialog for a custom status? Empty string means never "
+"show the dialog."
 msgstr ""
 "Afficher ou non la fenêtre de dialogue de confirmation de l'envoi de statut "
 "personnalisé ? Une valeur vide signifie ne jamais l'afficher."
 
-#: gajim/common/config.py:258
+#: gajim/common/config.py:256
+#, fuzzy
 msgid ""
-"If true, you will be able to set a negative priority to your account in "
-"account modification window. BE CAREFUL, when you are logged in with a "
-"negative priority, you will NOT receive any message from your server."
+"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 activé, vous serez en mesure de spécifier une priorité négative à votre "
 "compte dans la fenêtre de gestion de comptes. ATTENTION, lorsque vous êtes "
 "connecté avec une priorité négative, vous ne recevrez AUCUN message en "
 "provenance de votre serveur."
 
-#: gajim/common/config.py:259
+#: gajim/common/config.py:257
+#, fuzzy
 msgid ""
-"If true, Gajim will show number of online and total contacts in account and "
-"group rows."
+"If enabled, Gajim will show both the number of online and total contacts in "
+"account rows as well as in group rows."
 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:260
+#: gajim/common/config.py:258
+#, fuzzy
 msgid ""
-"Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
-"as if they were of this type"
+"Can be empty, 'chat' or 'normal'. If not empty, all incoming messages are "
+"treated as if they were of this type."
 msgstr ""
 "Peut être vide, 'chat' ou 'normal'. Si non vide, traite tous les messages "
 "entrant comme des messages de ce type"
 
-#: gajim/common/config.py:261
+#: gajim/common/config.py:259
+#, fuzzy
 msgid ""
-"If true, Gajim will scroll and select the contact who sent you the last "
-"message, if chat window is not already opened."
+"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 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:262
+#: gajim/common/config.py:260
 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:263
+#: gajim/common/config.py:261
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
@@ -3553,81 +3592,91 @@ msgstr ""
 "Nombre maximum de lignes affichées dans les conversations. Les lignes les "
 "plus vieilles sont effacées."
 
-#: gajim/common/config.py:264
+#: gajim/common/config.py:262
+#, fuzzy
 msgid ""
-"If true, notification windows from notification-daemon will be attached to "
-"notification icon."
+"If enabled, notification windows from notification-daemon will be attached "
+"to the notification area icon."
 msgstr ""
 "Si activé, les fenêtres de notification du notification-daemon seront "
 "attachées à l'icône du Tray."
 
-#: gajim/common/config.py:265
+#: gajim/common/config.py:263
 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:266
+#: gajim/common/config.py:264
+#, fuzzy
 msgid ""
-"Valid uri schemes. Only schemes in this list will be accepted as \"real\" "
-"uri. (mailto and xmpp are handled separately)"
+"Valid URI schemes. Only schemes in this list will be accepted as 'real' URI "
+"(mailto and xmpp are handled separately)."
 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:267
-msgid "If true, completion in groupchats will be like a shell auto-completion"
+#: gajim/common/config.py:265
+#, 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:272
-msgid "Optionally fix jingle output video framerate. Example: 10/1 or 25/2"
+#: gajim/common/config.py:270
+#, 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:273
-msgid "Optionally resize jingle output video. Example: 320x240"
+#: gajim/common/config.py:271
+#, fuzzy
+msgid "Optionally resize Jingle output video. Example: 320x240."
 msgstr ""
 "Redimenssionne éventuellement la sortie video jingle. Exemple : 320x240"
 
-#: gajim/common/config.py:274
-msgid "If true, You will also see your webcam"
-msgstr "Si activé, vous verrez également votre webcam"
+#: gajim/common/config.py:272
+msgid "If enabled, you will see your webcam's video stream as well."
+msgstr ""
 
-#: gajim/common/config.py:277
+#: gajim/common/config.py:275
+#, fuzzy
 msgid ""
-"If true, Gajim will try to use a STUN server when using Jingle. The one in "
-"\"stun_server\" option, or the one given by the XMPP server."
+"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 activé, Gajim essaiera d'utiliser un serveur STUN lors de l'utilisation "
 "de jingle. Celui défini dans l'option \"stun_server\", ou celui donné par le "
 "serveur XMPP."
 
-#: gajim/common/config.py:278
+#: gajim/common/config.py:276
 msgid "STUN server to use when using Jingle"
 msgstr "Serveur STUN a utiliser avec jingle"
 
-#: gajim/common/config.py:279
+#: gajim/common/config.py:277
+#, fuzzy
 msgid ""
-"If true, Gajim will show affiliation of groupchat occupants by adding a "
-"colored square to the status icon"
+"If enabled, Gajim will show affiliation of group chat participants by adding "
+"a colored square to the status icon."
 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:280
+#: gajim/common/config.py:278
+#, fuzzy
 msgid ""
 "Proxy used for all outgoing connections if the account does not have a "
-"specific proxy configured"
+"specific proxy configured."
 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:281
-msgid "If true, Gajim will ignore incoming attention requests (\"wizz\")."
+#: gajim/common/config.py:279
+#, 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:282
+#: gajim/common/config.py:280
 msgid ""
 "If enabled, Gajim will reopen chat windows that were opened last time Gajim "
 "was closed."
@@ -3635,79 +3684,92 @@ msgstr ""
 "Si activé, Gajim rouvrira les fenêtres de discussion ouvertes lors de la "
 "dernière fermeture de Gajim."
 
-#: gajim/common/config.py:283
+#: gajim/common/config.py:281
+#, fuzzy
 msgid ""
-"If enabled, Gajim will show an icon to show that sent message has been "
-"received by your contact"
+"If enabled, Gajim will display an icon to show that sent messages have been "
+"received by your contact."
 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:284
-msgid "Show a mini avatar in chat window tabs and in window icon"
+#: gajim/common/config.py:282
+#, 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:285
-msgid "If true, Gajim will use the Systems Keyring to store account passwords."
+#: gajim/common/config.py:283
+#, fuzzy
+msgid ""
+"If enabled, Gajim will use the System's Keyring to store account passwords."
 msgstr ""
 "Si activé, Gajim utilisera le trousseau de clé du système pour stocker les "
 "mots de passe des comptes."
 
-#: gajim/common/config.py:286
-msgid "If true, Gajim will execute XEP-0146 Commands."
+#: gajim/common/config.py:284
+#, 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:287
+#: gajim/common/config.py:285
 msgid "2: System, 1: Enabled, 0: Disabled"
 msgstr "2 : Système, 1 : Activé, 0 : Désactivé"
 
-#: gajim/common/config.py:288
+#: gajim/common/config.py:286
 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:289
+#: gajim/common/config.py:287
+#, fuzzy
 msgid ""
-"Maximum history in days we request from a public room archive. 0: As much as "
-"possible"
+"Maximum history in days we request from a public group chat archive. 0: As "
+"much as possible."
 msgstr ""
 "Nombre maximum de jours d'historique demandé au serveur lorsqu’un salon "
 "publique est rejoint. 0 : Autant que possible"
 
-#: gajim/common/config.py:290
+#: gajim/common/config.py:288
+#, fuzzy
 msgid ""
-"Maximum history in days we request from a private room archive. 0: As much "
-"as possible"
+"Maximum history in days we request from a private group chat archive. 0: As "
+"much as possible."
 msgstr ""
 "Nombre maximum de jours d'historique demandé au serveur lorsqu'un salon "
 "privé est rejoint. 0 : Autant que possible"
 
-#: gajim/common/config.py:291
-msgid "If the room subject is shown in chat on join"
+#: gajim/common/config.py:289
+msgid ""
+"If enabled, Gajim shows the group chat subject in the chat window when "
+"joining."
 msgstr ""
-"Si le sujet du salon est affiche dans la conversation lorsqu'il est rejoint"
 
-#: gajim/common/config.py:292
+#: gajim/common/config.py:290
+#, fuzzy
 msgid ""
-"If the contact row is colored according to the current chatstate of the "
-"contact"
+"If enabled, the contact row is colored according to the current chat state "
+"of the contact."
 msgstr ""
 "Si la liste de contact est colorée selon l’état de discussion du contact"
 
-#: gajim/common/config.py:293
-msgid "If the tab is colored according to the current chatstate of the contact"
+#: gajim/common/config.py:291
+#, 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:294
+#: gajim/common/config.py:292
+#, fuzzy
 msgid ""
-"Shows a text in the banner that describes the current chatstate of the "
-"contact"
+"Shows a text in the banner that describes the current chat state of the "
+"contact."
 msgstr ""
 "Montrez le texte dans la bannière comme indiqué dans l’état de discussion du "
 "contact"
 
-#: gajim/common/config.py:295 gajim/common/config.py:424
+#: gajim/common/config.py:293
 #, fuzzy
 msgid ""
 "Chat state notifications that are sent to contacts. Possible values: all, "
@@ -3716,351 +3778,397 @@ msgstr ""
 "Notifications d'état qui sont envoyées au salon de discussion. Peut être "
 "all, composing_only ou disabled."
 
-#: gajim/common/config.py:296 gajim/common/config.py:438
+#: gajim/common/config.py:294
+#, fuzzy
 msgid ""
 "Chat state notifications that are sent to the group chat. Possible values: "
-"all, composing_only, disabled"
+"'all', 'composing_only', 'disabled'"
 msgstr ""
 "Notifications d'état qui sont envoyées au salon de discussion. Peut être "
 "all, composing_only ou disabled."
 
-#: gajim/common/config.py:312
+#: gajim/common/config.py:297
+msgid "API Preferences. Possible values: 'http', 'iq'"
+msgstr ""
+
+#: gajim/common/config.py:313
+#, fuzzy
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
-"defined in autopriority_* options."
+"defined in 'autopriority_*' options."
 msgstr ""
 "La priorité va changer automatiquement selon votre état. Les priorités sont "
 "définies dans les options autopriority_*."
 
-#: gajim/common/config.py:320
+#: gajim/common/config.py:321
+#, fuzzy
 msgid ""
-"Status used to autoconnect as. Can be online, chat, away, xa, dnd, "
-"invisible. NOTE: this option is used only if restore_last_status is disabled"
+"Status to be used automatically when connecting. Can be 'online', 'chat', "
+"'away', 'xa', 'dnd' or 'invisible'. NOTE: This option is used only if "
+"'restore_last_status' is disabled."
 msgstr ""
 "État sous lequel se connecter automatiquement. Peut être online (En ligne), "
 "chat (Disponible pour discuter), away (Absent⋅e), xa (indisponible), dnd "
 "(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:321
-msgid "If enabled, restore the last status that was used."
+#: gajim/common/config.py:322
+#, fuzzy
+msgid "If enabled, the last status will be restored."
 msgstr "Si activé, restaure le dernier statut qui était utilisé."
 
-#: gajim/common/config.py:322
+#: gajim/common/config.py:323
+#, fuzzy
 msgid ""
-"If true, Contacts requesting authorization will be automatically accepted."
+"If enabled, Contacts requesting authorization will be accepted automatically."
 msgstr ""
 "Si activé, les demandes d'autorisation des contacts seront automatiquement "
 "acceptées."
 
-#: gajim/common/config.py:323
+#: gajim/common/config.py:324
+#, fuzzy
 msgid ""
-"If False, this account will be disabled and will not appear in roster window."
+"If disabled, this account will be disabled and will not appear in the "
+"contact list window."
 msgstr ""
 "Si désactivé, ce compte sera désactivé et n'apparaîtra plus dans votre liste "
 "de contacts."
 
-#: gajim/common/config.py:327
-msgid "Allow plaintext connections"
+#: gajim/common/config.py:328
+#, fuzzy
+msgid "Allow plaintext connections."
 msgstr "Autoriser les connexions non chiffrées"
 
-#: gajim/common/config.py:330
+#: gajim/common/config.py:331
+#, fuzzy
 msgid ""
-"List (space separated) of authentication mechanisms to try. Can contain "
-"ANONYMOUS, EXTERNAL, GSSAPI, SCRAM-SHA-1-PLUS, SCRAM-SHA-1, DIGEST-MD5, "
-"PLAIN, X-MESSENGER-OAUTH2 or XEP-0078"
+"List of authentication mechanisms to try (space separated). Can contain "
+"'ANONYMOUS', 'EXTERNAL', 'GSSAPI', 'SCRAM-SHA-1-PLUS', 'SCRAM-SHA-1', "
+"'DIGEST-MD5', 'PLAIN', 'X-MESSENGER-OAUTH2' or 'XEP-0078'."
 msgstr ""
 "Liste séparée par des espaces des mécanismes d'authentification à essayer. "
 "Peut contenir ANONYMOUS, EXTERNAL, GSSAPI, SCRAM-SHA-1-PLUS, SCRAM-SHA-1, "
 "DIGEST-MD5, PLAIN, X-MESSENGER-OAUTH2 ou XEP-0078"
 
-#: gajim/common/config.py:331
+#: gajim/common/config.py:332
+#, fuzzy
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection. "
-"Can be 'warn', 'connect', 'disconnect'"
+"Can be 'warn', 'connect' or 'disconnect'."
 msgstr ""
 "Afficher un message d'avertissement avant d'envoyer un mot de passe via une "
 "connexion non-chiffrée. Peut prendre les valeurs 'warn', 'connect', "
 "'disconnect'"
 
-#: gajim/common/config.py:332
+#: gajim/common/config.py:333
 msgid "Show a warning dialog before using standard SSL library."
 msgstr ""
 "Afficher un message d'avertissement avant d'utiliser la librairie SSL "
 "standard."
 
-#: gajim/common/config.py:333
+#: gajim/common/config.py:334
 msgid ""
 "Show a warning dialog before sending PLAIN password over a plain connection."
 msgstr ""
 "Afficher un message d'avertissement avant d'envoyer un mot de passe non-"
 "chiffré via une connexion non-chiffrée."
 
-#: gajim/common/config.py:334
-msgid "Space separated list of ssl errors to ignore."
-msgstr "Liste d'erreurs ssl, séparées par une virgule, à ignorer."
+#: gajim/common/config.py:335
+msgid "List of SSL errors to ignore (space separated)."
+msgstr ""
 
-#: gajim/common/config.py:340
+#: gajim/common/config.py:341
+#, fuzzy
 msgid ""
-"Space separated list of JIDs for which you do not want to store logs. You "
-"can also add account name to log nothing for this account."
+"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 ""
 "Liste de jid, séparée par un espace, pour lesquels vous ne voulez pas "
 "enregistrer les conversations. Vous pouvez également ajouter le nom d'un "
 "compte pour ne rien enregistrer pour ce compte."
 
-#: gajim/common/config.py:341
+#: gajim/common/config.py:342
+#, fuzzy
 msgid ""
-"Space separated list of JIDs for which you accept to not log conversations "
-"if he does not want to."
+"List of XMPP Addresses (space separated) for which you accept to not store "
+"chat history if your contact does not want to."
 msgstr ""
 "Liste de jid, séparée par un espace, pour lesquels vous accepter de ne pas "
 "enregistrer les conversations s'il ne veut pas."
 
-#: gajim/common/config.py:343
-msgid "Whitespace sent after inactivity"
+#: gajim/common/config.py:344
+#, fuzzy
+msgid "If enabled, a whitespace is sent after inactivity (keep alive)."
 msgstr "Espace envoyée après inactivité"
 
-#: gajim/common/config.py:344
-msgid "XMPP ping sent after inactivity"
+#: gajim/common/config.py:345
+#, fuzzy
+msgid "If enabled, an XMPP ping is sent after inactivity (ping alive)."
 msgstr "ping XMPP envoyé après inactivité"
 
-#: gajim/common/config.py:348
+#: gajim/common/config.py:349
+#, fuzzy
 msgid ""
-"How many seconds to wait for the answer of ping alive packet before trying "
-"to reconnect?"
+"How many seconds to wait for the answer of a ping alive packet before trying "
+"to reconnect."
 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:352
-msgid "Jabberd2 workaround"
+#: gajim/common/config.py:353
+#, fuzzy
+msgid "Jabberd2 workaround."
 msgstr "Contournement de bug de jabberd2"
 
-#: gajim/common/config.py:355
+#: gajim/common/config.py:356
+#, fuzzy
 msgid ""
-"If checked, Gajim will use your IP and proxies defined in "
-"file_transfer_proxies option for file transfer."
+"If enabled, Gajim will use your IP and proxies defined in "
+"'file_transfer_proxies' option for file transfers."
 msgstr ""
 "Si cette case est cochée, Gajim utilisera votre IP et les serveurs "
 "mandataires définis dans l'option file_transfer_proxies pour les transferts "
 "de fichiers."
 
-#: gajim/common/config.py:356
+#: gajim/common/config.py:357
+#, fuzzy
 msgid ""
-"If true, Gajim will test file transfer proxies on startup to be sure it "
-"works. Openfire's proxies are known to fail this test even if they work."
+"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 activé, Gajim testera les serveurs mandataires de transfert de fichiers "
 "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:369
-msgid "Answer to receipt requests"
-msgstr "Répondre aux demandes d'accusés de réception"
-
 #: gajim/common/config.py:370
-msgid "Sent receipt requests"
-msgstr "Envoyer des demandes d'accusés de réception"
+#, 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:379
+#: gajim/common/config.py:371
+msgid "If enabled, Gajim will send message receipt requests."
+msgstr "Si activé, Gajim enverra des messages d’accusés de réception."
+
+#: gajim/common/config.py:380
 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:380
+#: gajim/common/config.py:381
 msgid "Allow Gajim to send your local time."
 msgstr "Autorise Gajim à envoyer votre heure."
 
-#: gajim/common/config.py:383
-msgid "Message that is sent to contacts you want to add"
+#: gajim/common/config.py:384
+#, 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:384
+#: gajim/common/config.py:385
+#, fuzzy
 msgid ""
-"If enabled, Gajim will send your local IPs so your contact can connect to "
-"your machine to transfer files."
+"If enabled, Gajim will send your local IP so your contact can connect to "
+"your machine for file transfers."
 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:385
+#: gajim/common/config.py:386
+#, fuzzy
 msgid ""
-"Space separated list of JIDs for which chat window will be re-opened on next "
-"startup."
+"List of XMPP Addresses (space separated) for which the chat window will be "
+"re-opened on next startup."
 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:387
-msgid "HTTP Upload: Enable HTTPS Verification"
+#: gajim/common/config.py:388
+#, fuzzy
+msgid "HTTP File Upload: Enable HTTPS Verification."
 msgstr "Envoie par HTTP : Activer la vérification HTTPS"
 
-#: gajim/common/config.py:388
+#: gajim/common/config.py:389
+#, fuzzy
 msgid ""
-"Preferred file transfer mechanism for file drag&drop on chat window. Can be "
-"'httpupload' (default) or 'jingle'"
+"Preferred file transfer mechanism for file drag&drop on a chat window. Can "
+"be 'httpupload' (default) or 'jingle'."
 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:389
-msgid "Allow cert verification with POSH"
+#: gajim/common/config.py:390
+#, fuzzy
+msgid "Allow certificate verification with POSH."
 msgstr "Autorise la vérification de certificat avec POSH"
 
-#: gajim/common/config.py:423 gajim/common/config.py:430
-msgid "Language for which misspelled words will be checked"
-msgstr "Langue dans laquelle faire la vérification orthographique"
-
-#: gajim/common/config.py:427
-msgid "The currently active encryption for that contact"
-msgstr "Chiffrement actuellement actif pour ce contact"
-
-#: gajim/common/config.py:431
+#: gajim/common/config.py:425
+#, fuzzy
 msgid ""
-"How many lines to request from server when entering a groupchat. -1 means no "
-"limit, -2 means global value"
+"Chat state notifications that are sent to contacts. Possible values: 'all', "
+"'composing_only', 'disabled'"
 msgstr ""
-"Le nombre de lignes d'archives qui seront demandées en entrant dans un "
-"salon. -1 signifie \"pas de limitation\", -2 signifie \"valeur globale\""
+"Notifications d'état qui sont envoyées au salon de discussion. Peut être "
+"all, composing_only ou disabled."
+
+#: gajim/common/config.py:428
+#, fuzzy
+msgid "The currently active encryption for that contact."
+msgstr "Chiffrement actuellement actif pour ce contact"
 
 #: gajim/common/config.py:432
+#, fuzzy
 msgid ""
-"Minutes of backlog to request when entering a groupchat. -1 means no limit, "
-"-2 means global value"
-msgstr ""
-"Le nombre de minutes d'archives qui seront demandées en entrant dans un "
-"salon. -1 signifie \"pas de limitation\", -2 signifie \"valeur globale\""
-
-#: gajim/common/config.py:433
-msgid "State whether a notification is created for every message in this room"
+"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:434
+#: gajim/common/config.py:433
+#, fuzzy
 msgid ""
-"Show a status message for all status (away, dnd, etc.) changes of users in a "
-"group chat"
+"Show a status message for all status changes (away, dnd, etc.) of users in a "
+"group chat."
 msgstr ""
 "Montre l’état du message pour tous les changements d’état des utilisateurs "
 "du groupe de discussion"
 
-#: gajim/common/config.py:435
-msgid "Show a status message for every join or leave in a group chat"
+#: gajim/common/config.py:434
+#, 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:436
-msgid "If the group chat is minimized into the roster on autojoin"
+#: gajim/common/config.py:435
+#, fuzzy
+msgid ""
+"If enabled, the group chat is minimized into the contact list when joining "
+"automatically."
 msgstr ""
 "Si le salon de discussion est réduit dans la liste de contacts à la "
 "connexion automatique"
 
-#: gajim/common/config.py:437
-msgid "If the group chat is minimized into the roster on close"
+#: gajim/common/config.py:436
+#, 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:441
+#: gajim/common/config.py:437
+#, fuzzy
+msgid ""
+"Chat state notifications that are sent to the group chat. Possible values: "
+"'all', 'composing_only' or 'disabled'."
+msgstr ""
+"Notifications d'état qui sont envoyées au salon de discussion. Peut être "
+"all, composing_only ou disabled."
+
+#: gajim/common/config.py:440
+#, fuzzy
 msgid ""
-"State whether plugins should be activated on startup (this is saved on Gajim "
-"exit). This option SHOULD NOT be used to (de)activate plug-ins. Use GUI "
-"instead."
+"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 ""
 "Spécifie si le plugin doit être activé au démarrage (sauvegardé quand Gajim "
 "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:446 gajim/common/const.py:281
+#: gajim/common/config.py:445 gajim/common/const.py:315
 msgid "Sleeping"
 msgstr "Dort"
 
-#: gajim/common/config.py:447
+#: gajim/common/config.py:446
 msgid "Back soon"
 msgstr "Bientôt de retour"
 
-#: gajim/common/config.py:447
+#: gajim/common/config.py:446
 msgid "Back in some minutes."
 msgstr "De retour dans quelques minutes."
 
-#: gajim/common/config.py:448 gajim/common/const.py:247
+#: gajim/common/config.py:447 gajim/common/const.py:281
 msgid "Eating"
 msgstr "Mange"
 
-#: gajim/common/config.py:448
-msgid "I'm eating, so leave me a message."
-msgstr "Je mange, donc laissez moi un message."
+#: gajim/common/config.py:447
+#, fuzzy
+msgid "I'm eating."
+msgstr "Je travaille."
 
-#: gajim/common/config.py:449
+#: gajim/common/config.py:448
 msgid "Movie"
 msgstr "Film"
 
-#: gajim/common/config.py:449
+#: gajim/common/config.py:448
 msgid "I'm watching a movie."
 msgstr "Je regarde un film."
 
-#: gajim/common/config.py:450 gajim/common/const.py:314
+#: gajim/common/config.py:449 gajim/common/const.py:348
 msgid "Working"
 msgstr "Travaille"
 
-#: gajim/common/config.py:450
+#: gajim/common/config.py:449
 msgid "I'm working."
 msgstr "Je travaille."
 
-#: gajim/common/config.py:451
+#: gajim/common/config.py:450
 msgid "Phone"
 msgstr "Téléphone"
 
-#: gajim/common/config.py:451
+#: gajim/common/config.py:450
 msgid "I'm on the phone."
 msgstr "Je suis au téléphone."
 
-#: gajim/common/config.py:452
+#: gajim/common/config.py:451
 msgid "Out"
 msgstr "Dehors"
 
-#: gajim/common/config.py:452
+#: gajim/common/config.py:451
 msgid "I'm out enjoying life."
 msgstr "Je suis sorti profiter de la vie."
 
-#: gajim/common/config.py:463
+#: gajim/common/config.py:462
 msgid "I'm available."
 msgstr "Disponible"
 
-#: gajim/common/config.py:464
+#: gajim/common/config.py:463
 msgid "I'm free for chat."
 msgstr "Disponible pour discuter"
 
-#: gajim/common/config.py:465 gajim/gtk/accounts.py:134
+#: gajim/common/config.py:464 gajim/gtk/accounts.py:133
 msgid "Be right back."
 msgstr "Revient de suite."
 
-#: gajim/common/config.py:466
+#: gajim/common/config.py:465
 msgid "I'm not available."
 msgstr "Non disponible"
 
-#: gajim/common/config.py:467
+#: gajim/common/config.py:466
 msgid "Do not disturb."
 msgstr "Ne pas déranger."
 
-#: gajim/common/config.py:468 gajim/common/config.py:469
+#: gajim/common/config.py:467 gajim/common/config.py:468
 msgid "Bye!"
 msgstr "Au revoir !"
 
-#: gajim/common/config.py:480
+#: gajim/common/config.py:479
+#, fuzzy
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
-"muc_highlight_words, or when a group chat message contains your nickname."
+"'muc_highlight_words' your nickname is mentioned."
 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:481
-msgid "Sound to play when any MUC message arrives."
+#: gajim/common/config.py:480
+#, 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:485
+#: gajim/common/config.py:484
 msgid "Tor"
 msgstr "Tor"
 
@@ -4069,11 +4177,104 @@ msgstr "Tor"
 msgid "Error: cannot open %s for reading"
 msgstr "Erreur : impossible d'ouvrir %s en lecture"
 
-#: gajim/common/const.py:214
+#: gajim/common/const.py:216
+#, fuzzy
+msgid "?Group chat name:Team"
+msgstr "Aucun"
+
+#: gajim/common/const.py:217
+msgid "?Group chat description:Project discussion"
+msgstr ""
+
+#: gajim/common/const.py:218
+#, fuzzy
+msgid "?Group chat address:team"
+msgstr "Support des salons de discussion"
+
+#: gajim/common/const.py:219
+#, fuzzy
+msgid "?Group chat name:Family"
+msgstr "Message d'un salon mis en surbrillance :"
+
+#: gajim/common/const.py:220
+msgid "?Group chat description:Spring gathering"
+msgstr ""
+
+#: gajim/common/const.py:221
+msgid "?Group chat address:family"
+msgstr ""
+
+#: gajim/common/const.py:222
+#, fuzzy
+msgid "?Group chat name:Vacation"
+msgstr "Invitation à un salon"
+
+#: gajim/common/const.py:223
+msgid "?Group chat description:Trip planning"
+msgstr ""
+
+#: gajim/common/const.py:224
+#, fuzzy
+msgid "?Group chat address:vacation"
+msgstr "Invitation à un salon"
+
+#: gajim/common/const.py:225
+#, fuzzy
+msgid "?Group chat name:Repairs"
+msgstr "Marque-pages des salons de discussion"
+
+#: gajim/common/const.py:226
+msgid "?Group chat description:Local help group"
+msgstr ""
+
+#: gajim/common/const.py:227
+#, fuzzy
+msgid "?Group chat address:repairs"
+msgstr "Support des salons de discussion"
+
+#: gajim/common/const.py:228
+#, fuzzy
+msgid "?Group chat name:News"
+msgstr "Aucun"
+
+#: gajim/common/const.py:229
+#, fuzzy
+msgid "?Group chat description:Local news and reports"
+msgstr "La création de salon n’est pas autorisée."
+
+#: gajim/common/const.py:230
+#, fuzzy
+msgid "?Group chat address:news"
+msgstr "Créer un salon de discussion"
+
+#: gajim/common/const.py:235
+#, fuzzy
+msgid "Remote server not found"
+msgstr "Le service n'a pu être trouvé"
+
+#: gajim/common/const.py:236
+msgid "Remote server timeout"
+msgstr "Pas de réponse du serveur distant"
+
+#: gajim/common/const.py:237 gajim/common/const.py:238
+#: gajim/common/const.py:239
+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:240
+#, fuzzy
+msgid "Group chat already exists"
+msgstr "Ce compte existe déjà localement."
+
+#: gajim/common/const.py:241
+msgid "Group chat does not exist"
+msgstr "Le salon n’existe pas"
+
+#: gajim/common/const.py:247
 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:217
+#: gajim/common/const.py:250
 msgid ""
 "This message was encrypted with Legacy OpenPGP and could not be decrypted. "
 "You can install the PGP plugin to handle those messages."
@@ -4081,863 +4282,865 @@ 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:221
+#: gajim/common/const.py:254
+#, fuzzy
 msgid ""
-"This message was encrypted with OpenPGP for XMPP and could not be decrypted."
+"This message was encrypted with OpenPGP for XMPP and could not be decrypted. "
+"You can install the OpenPGP plugin to handle those messages."
 msgstr ""
-"Ce message a été chiffre avec OpenGPG pour XMPP et ne peux pas être "
-"déchiffré."
+"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:224
+#: gajim/common/const.py:258
 #, 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:231
+#: gajim/common/const.py:265
 msgid "Doing Chores"
 msgstr "Fait des corvées"
 
-#: gajim/common/const.py:232
+#: gajim/common/const.py:266
 msgid "Buying Groceries"
 msgstr "Achète des provisions"
 
-#: gajim/common/const.py:233
+#: gajim/common/const.py:267
 msgid "Cleaning"
 msgstr "Fait le ménage"
 
-#: gajim/common/const.py:234
+#: gajim/common/const.py:268
 msgid "Cooking"
 msgstr "Cuisine"
 
-#: gajim/common/const.py:235
+#: gajim/common/const.py:269
 msgid "Doing Maintenance"
 msgstr "Fait de la maintenance"
 
-#: gajim/common/const.py:236
+#: gajim/common/const.py:270
 msgid "Doing the Dishes"
 msgstr "Fait la vaisselle"
 
-#: gajim/common/const.py:237
+#: gajim/common/const.py:271
 msgid "Doing the Laundry"
 msgstr "Lave le linge"
 
-#: gajim/common/const.py:238
+#: gajim/common/const.py:272
 msgid "Gardening"
 msgstr "Jardine"
 
-#: gajim/common/const.py:239
+#: gajim/common/const.py:273
 msgid "Running an Errand"
 msgstr "Fait une course"
 
-#: gajim/common/const.py:240
+#: gajim/common/const.py:274
 msgid "Walking the Dog"
 msgstr "Promène le chien"
 
-#: gajim/common/const.py:242
+#: gajim/common/const.py:276
 msgid "Drinking"
 msgstr "Boit"
 
-#: gajim/common/const.py:243
+#: gajim/common/const.py:277
 msgid "Having a Beer"
 msgstr "Prend une bière"
 
-#: gajim/common/const.py:244
+#: gajim/common/const.py:278
 msgid "Having Coffee"
 msgstr "Prend un café"
 
-#: gajim/common/const.py:245
+#: gajim/common/const.py:279
 msgid "Having Tea"
 msgstr "Prend un thé"
 
-#: gajim/common/const.py:248
+#: gajim/common/const.py:282
 msgid "Having a Snack"
 msgstr "Prend un snack"
 
-#: gajim/common/const.py:249
+#: gajim/common/const.py:283
 msgid "Having Breakfast"
 msgstr "Prend le petit-déjeuner"
 
-#: gajim/common/const.py:250
+#: gajim/common/const.py:284
 msgid "Having Dinner"
 msgstr "Soupe"
 
-#: gajim/common/const.py:251
+#: gajim/common/const.py:285
 msgid "Having Lunch"
 msgstr "Dîne"
 
-#: gajim/common/const.py:253
+#: gajim/common/const.py:287
 msgid "Exercising"
 msgstr "Fait de l'exercice"
 
-#: gajim/common/const.py:254 gajim/common/const.py:305
+#: gajim/common/const.py:288 gajim/common/const.py:339
 msgid "Cycling"
 msgstr "Fait du vélo"
 
-#: gajim/common/const.py:255
+#: gajim/common/const.py:289
 msgid "Dancing"
 msgstr "Danse"
 
-#: gajim/common/const.py:256
+#: gajim/common/const.py:290
 msgid "Hiking"
 msgstr "Fait de la randonnée"
 
-#: gajim/common/const.py:257
+#: gajim/common/const.py:291
 msgid "Jogging"
 msgstr "Fait un jogging"
 
-#: gajim/common/const.py:258
+#: gajim/common/const.py:292
 msgid "Playing Sports"
 msgstr "Fait du sport"
 
-#: gajim/common/const.py:259
+#: gajim/common/const.py:293
 msgid "Running"
 msgstr "Court"
 
-#: gajim/common/const.py:260
+#: gajim/common/const.py:294
 msgid "Skiing"
 msgstr "Skie"
 
-#: gajim/common/const.py:261
+#: gajim/common/const.py:295
 msgid "Swimming"
 msgstr "Nage"
 
-#: gajim/common/const.py:262
+#: gajim/common/const.py:296
 msgid "Working out"
 msgstr "S'entraine"
 
-#: gajim/common/const.py:264
+#: gajim/common/const.py:298
 msgid "Grooming"
 msgstr "Se toilette"
 
-#: gajim/common/const.py:265
+#: gajim/common/const.py:299
 msgid "At the Spa"
 msgstr "À la station thermale"
 
-#: gajim/common/const.py:266
+#: gajim/common/const.py:300
 msgid "Brushing Teeth"
 msgstr "Se brosse les dents"
 
-#: gajim/common/const.py:267
+#: gajim/common/const.py:301
 msgid "Getting a Haircut"
 msgstr "Se fait couper les cheveux"
 
-#: gajim/common/const.py:268
+#: gajim/common/const.py:302
 msgid "Shaving"
 msgstr "Se rase"
 
-#: gajim/common/const.py:269
+#: gajim/common/const.py:303
 msgid "Taking a Bath"
 msgstr "Prend un bain"
 
-#: gajim/common/const.py:270
+#: gajim/common/const.py:304
 msgid "Taking a Shower"
 msgstr "Prend une douche"
 
-#: gajim/common/const.py:272
+#: gajim/common/const.py:306
 msgid "Having an Appointment"
 msgstr "A un rendez-vous"
 
-#: gajim/common/const.py:274
+#: gajim/common/const.py:308
 msgid "Inactive"
 msgstr "Inactif"
 
-#: gajim/common/const.py:275
+#: gajim/common/const.py:309
 msgid "Day Off"
 msgstr "En congé"
 
-#: gajim/common/const.py:276
+#: gajim/common/const.py:310
 msgid "Hanging out"
 msgstr "Traîne"
 
-#: gajim/common/const.py:277
+#: gajim/common/const.py:311
 msgid "Hiding"
 msgstr "Se cache"
 
-#: gajim/common/const.py:278
+#: gajim/common/const.py:312
 msgid "On Vacation"
 msgstr "En vacances"
 
-#: gajim/common/const.py:279
+#: gajim/common/const.py:313
 msgid "Praying"
 msgstr "Fait une prière"
 
-#: gajim/common/const.py:280
+#: gajim/common/const.py:314
 msgid "Scheduled Holiday"
 msgstr "En vacances organisées"
 
-#: gajim/common/const.py:282
+#: gajim/common/const.py:316
 msgid "Thinking"
 msgstr "Réfléchit"
 
-#: gajim/common/const.py:284
+#: gajim/common/const.py:318
 msgid "Relaxing"
 msgstr "Se relaxe"
 
-#: gajim/common/const.py:285
+#: gajim/common/const.py:319
 msgid "Fishing"
 msgstr "Pêche"
 
-#: gajim/common/const.py:286
+#: gajim/common/const.py:320
 msgid "Gaming"
 msgstr "Joue"
 
-#: gajim/common/const.py:287
+#: gajim/common/const.py:321
 msgid "Going out"
 msgstr "Sort"
 
-#: gajim/common/const.py:288
+#: gajim/common/const.py:322
 msgid "Partying"
 msgstr "Fait la fête"
 
-#: gajim/common/const.py:289
+#: gajim/common/const.py:323
 msgid "Reading"
 msgstr "Lit"
 
-#: gajim/common/const.py:290
+#: gajim/common/const.py:324
 msgid "Rehearsing"
 msgstr "Se prépare"
 
-#: gajim/common/const.py:291
+#: gajim/common/const.py:325
 msgid "Shopping"
 msgstr "Fait les magasins"
 
-#: gajim/common/const.py:292
+#: gajim/common/const.py:326
 msgid "Smoking"
 msgstr "Fume"
 
-#: gajim/common/const.py:293
+#: gajim/common/const.py:327
 msgid "Socializing"
 msgstr "Se socialise"
 
-#: gajim/common/const.py:294
+#: gajim/common/const.py:328
 msgid "Sunbathing"
 msgstr "Prend un bain de soleil"
 
-#: gajim/common/const.py:295
+#: gajim/common/const.py:329
 msgid "Watching TV"
 msgstr "Regarde la télé"
 
-#: gajim/common/const.py:296
+#: gajim/common/const.py:330
 msgid "Watching a Movie"
 msgstr "Regarde un film"
 
-#: gajim/common/const.py:298
+#: gajim/common/const.py:332
 msgid "Talking"
 msgstr "Discute"
 
-#: gajim/common/const.py:299
+#: gajim/common/const.py:333
 msgid "In Real Life"
 msgstr "Dans la vraie vie"
 
-#: gajim/common/const.py:300
+#: gajim/common/const.py:334
 msgid "On the Phone"
 msgstr "Au téléphone"
 
-#: gajim/common/const.py:301
+#: gajim/common/const.py:335
 msgid "On Video Phone"
 msgstr "En visioconférence"
 
-#: gajim/common/const.py:303
+#: gajim/common/const.py:337
 msgid "Traveling"
 msgstr "Voyage"
 
-#: gajim/common/const.py:304
+#: gajim/common/const.py:338
 msgid "Commuting"
 msgstr "Fait la navette"
 
-#: gajim/common/const.py:306
+#: gajim/common/const.py:340
 msgid "Driving"
 msgstr "Conduit"
 
-#: gajim/common/const.py:307
+#: gajim/common/const.py:341
 msgid "In a Car"
 msgstr "En voiture"
 
-#: gajim/common/const.py:308
+#: gajim/common/const.py:342
 msgid "On a Bus"
 msgstr "En bus"
 
-#: gajim/common/const.py:309
+#: gajim/common/const.py:343
 msgid "On a Plane"
 msgstr "En avion"
 
-#: gajim/common/const.py:310
+#: gajim/common/const.py:344
 msgid "On a Train"
 msgstr "En train"
 
-#: gajim/common/const.py:311
+#: gajim/common/const.py:345
 msgid "On a Trip"
 msgstr "En séjour"
 
-#: gajim/common/const.py:312
+#: gajim/common/const.py:346
 msgid "Walking"
 msgstr "Marche"
 
-#: gajim/common/const.py:315
+#: gajim/common/const.py:349
 msgid "Coding"
 msgstr "Code"
 
-#: gajim/common/const.py:316
+#: gajim/common/const.py:350
 msgid "In a Meeting"
 msgstr "En réunion"
 
-#: gajim/common/const.py:317
+#: gajim/common/const.py:351
 msgid "Studying"
 msgstr "Étudie"
 
-#: gajim/common/const.py:318
+#: gajim/common/const.py:352
 msgid "Writing"
 msgstr "Écrit"
 
-#: gajim/common/const.py:321
+#: gajim/common/const.py:355
 msgid "Afraid"
 msgstr "Effrayé⋅e"
 
-#: gajim/common/const.py:322
+#: gajim/common/const.py:356
 msgid "Amazed"
 msgstr "Épaté⋅e"
 
-#: gajim/common/const.py:323
+#: gajim/common/const.py:357
 msgid "Amorous"
 msgstr "Amoureux(se)"
 
-#: gajim/common/const.py:324
+#: gajim/common/const.py:358
 msgid "Angry"
 msgstr "En colère"
 
-#: gajim/common/const.py:325
+#: gajim/common/const.py:359
 msgid "Annoyed"
 msgstr "Ennuyé⋅e"
 
-#: gajim/common/const.py:326
+#: gajim/common/const.py:360
 msgid "Anxious"
 msgstr "Anxieux(se)"
 
-#: gajim/common/const.py:327
+#: gajim/common/const.py:361
 msgid "Aroused"
 msgstr "Excité⋅e"
 
-#: gajim/common/const.py:328
+#: gajim/common/const.py:362
 msgid "Ashamed"
 msgstr "Honteux(se)"
 
-#: gajim/common/const.py:329
+#: gajim/common/const.py:363
 msgid "Bored"
 msgstr "Ennuyé⋅e"
 
-#: gajim/common/const.py:330
+#: gajim/common/const.py:364
 msgid "Brave"
 msgstr "Courageux(se)"
 
-#: gajim/common/const.py:331
+#: gajim/common/const.py:365
 msgid "Calm"
 msgstr "Calme"
 
-#: gajim/common/const.py:332
+#: gajim/common/const.py:366
 msgid "Cautious"
 msgstr "Prudent⋅e"
 
-#: gajim/common/const.py:333
+#: gajim/common/const.py:367
 msgid "Cold"
 msgstr "Froid⋅e"
 
-#: gajim/common/const.py:334
+#: gajim/common/const.py:368
 msgid "Confident"
 msgstr "Confiant⋅e"
 
-#: gajim/common/const.py:335
+#: gajim/common/const.py:369
 msgid "Confused"
 msgstr "Confus⋅e"
 
-#: gajim/common/const.py:336
+#: gajim/common/const.py:370
 msgid "Contemplative"
 msgstr "Contemplatif(ve)"
 
-#: gajim/common/const.py:337
+#: gajim/common/const.py:371
 msgid "Contented"
 msgstr "Satisfait⋅e"
 
-#: gajim/common/const.py:338
+#: gajim/common/const.py:372
 msgid "Cranky"
 msgstr "Grincheux(se)"
 
-#: gajim/common/const.py:339
+#: gajim/common/const.py:373
 msgid "Crazy"
 msgstr "Cinglé⋅e"
 
-#: gajim/common/const.py:340
+#: gajim/common/const.py:374
 msgid "Creative"
 msgstr "Créatif(ve)"
 
-#: gajim/common/const.py:341
+#: gajim/common/const.py:375
 msgid "Curious"
 msgstr "Curieux(se)"
 
-#: gajim/common/const.py:342
+#: gajim/common/const.py:376
 msgid "Dejected"
 msgstr "Découragé⋅e"
 
-#: gajim/common/const.py:343
+#: gajim/common/const.py:377
 msgid "Depressed"
 msgstr "Déprimé⋅e"
 
-#: gajim/common/const.py:344
+#: gajim/common/const.py:378
 msgid "Disappointed"
 msgstr "Déçu⋅e"
 
-#: gajim/common/const.py:345
+#: gajim/common/const.py:379
 msgid "Disgusted"
 msgstr "Écœuré⋅e"
 
-#: gajim/common/const.py:346
+#: gajim/common/const.py:380
 msgid "Dismayed"
 msgstr "Estomaqué⋅e"
 
-#: gajim/common/const.py:347
+#: gajim/common/const.py:381
 msgid "Distracted"
 msgstr "Distrait⋅e"
 
-#: gajim/common/const.py:348
+#: gajim/common/const.py:382
 msgid "Embarrassed"
 msgstr "Embarrassé⋅e"
 
-#: gajim/common/const.py:349
+#: gajim/common/const.py:383
 msgid "Envious"
 msgstr "Envieux(se)"
 
-#: gajim/common/const.py:350
+#: gajim/common/const.py:384
 msgid "Excited"
 msgstr "Excité⋅e"
 
-#: gajim/common/const.py:351
+#: gajim/common/const.py:385
 msgid "Flirtatious"
 msgstr "Dragueur(se)"
 
-#: gajim/common/const.py:352
+#: gajim/common/const.py:386
 msgid "Frustrated"
 msgstr "Frustré⋅e"
 
-#: gajim/common/const.py:353
+#: gajim/common/const.py:387
 msgid "Grateful"
 msgstr "Reconnaissant⋅e"
 
-#: gajim/common/const.py:354
+#: gajim/common/const.py:388
 msgid "Grieving"
 msgstr "En deuil"
 
-#: gajim/common/const.py:355
+#: gajim/common/const.py:389
 msgid "Grumpy"
 msgstr "Grognon(ne)"
 
-#: gajim/common/const.py:356
+#: gajim/common/const.py:390
 msgid "Guilty"
 msgstr "Coupable"
 
-#: gajim/common/const.py:357
+#: gajim/common/const.py:391
 msgid "Happy"
 msgstr "Heureux(se)"
 
-#: gajim/common/const.py:358
+#: gajim/common/const.py:392
 msgid "Hopeful"
 msgstr "optimiste"
 
-#: gajim/common/const.py:359
+#: gajim/common/const.py:393
 msgid "Hot"
 msgstr "Bouillant⋅e"
 
-#: gajim/common/const.py:360
+#: gajim/common/const.py:394
 msgid "Humbled"
 msgstr "Humble"
 
-#: gajim/common/const.py:361
+#: gajim/common/const.py:395
 msgid "Humiliated"
 msgstr "Humilié⋅e"
 
-#: gajim/common/const.py:362
+#: gajim/common/const.py:396
 msgid "Hungry"
 msgstr "Affamé⋅e"
 
-#: gajim/common/const.py:363
+#: gajim/common/const.py:397
 msgid "Hurt"
 msgstr "Blessé⋅e"
 
-#: gajim/common/const.py:364
+#: gajim/common/const.py:398
 msgid "Impressed"
 msgstr "Impressionné⋅e"
 
-#: gajim/common/const.py:365
+#: gajim/common/const.py:399
 msgid "In Awe"
 msgstr "Craintif(ve)"
 
-#: gajim/common/const.py:366
+#: gajim/common/const.py:400
 msgid "In Love"
 msgstr "Amoureux(se)"
 
-#: gajim/common/const.py:367
+#: gajim/common/const.py:401
 msgid "Indignant"
 msgstr "Indigné⋅e"
 
-#: gajim/common/const.py:368
+#: gajim/common/const.py:402
 msgid "Interested"
 msgstr "Intéressé⋅e"
 
-#: gajim/common/const.py:369
+#: gajim/common/const.py:403
 msgid "Intoxicated"
 msgstr "Intoxiqué⋅e"
 
-#: gajim/common/const.py:370
+#: gajim/common/const.py:404
 msgid "Invincible"
 msgstr "Invincible"
 
-#: gajim/common/const.py:371
+#: gajim/common/const.py:405
 msgid "Jealous"
 msgstr "Jaloux(se)"
 
-#: gajim/common/const.py:372
+#: gajim/common/const.py:406
 msgid "Lonely"
 msgstr "Solitaire"
 
-#: gajim/common/const.py:373
+#: gajim/common/const.py:407
 msgid "Lost"
 msgstr "Perdu⋅e"
 
-#: gajim/common/const.py:374
+#: gajim/common/const.py:408
 msgid "Lucky"
 msgstr "Chanceux(se)"
 
-#: gajim/common/const.py:375
+#: gajim/common/const.py:409
 msgid "Mean"
 msgstr "Méchant⋅e"
 
-#: gajim/common/const.py:376
+#: gajim/common/const.py:410
 msgid "Moody"
 msgstr "Morose"
 
-#: gajim/common/const.py:377
+#: gajim/common/const.py:411
 msgid "Nervous"
 msgstr "Nerveux(se)"
 
-#: gajim/common/const.py:378
+#: gajim/common/const.py:412
 msgid "Neutral"
 msgstr "Neutre"
 
-#: gajim/common/const.py:379
+#: gajim/common/const.py:413
 msgid "Offended"
 msgstr "Outré⋅e"
 
-#: gajim/common/const.py:380
+#: gajim/common/const.py:414
 msgid "Outraged"
 msgstr "Scandalisé⋅e"
 
-#: gajim/common/const.py:381
+#: gajim/common/const.py:415
 msgid "Playful"
 msgstr "Enjoué⋅e"
 
-#: gajim/common/const.py:382
+#: gajim/common/const.py:416
 msgid "Proud"
 msgstr "Fier/Fière"
 
-#: gajim/common/const.py:383
+#: gajim/common/const.py:417
 msgid "Relaxed"
 msgstr "Détendu⋅e"
 
-#: gajim/common/const.py:384
+#: gajim/common/const.py:418
 msgid "Relieved"
 msgstr "Soulagé⋅e"
 
-#: gajim/common/const.py:385
+#: gajim/common/const.py:419
 msgid "Remorseful"
 msgstr "Plein⋅e de remords"
 
-#: gajim/common/const.py:386
+#: gajim/common/const.py:420
 msgid "Restless"
 msgstr "Impatient⋅e"
 
-#: gajim/common/const.py:387
+#: gajim/common/const.py:421
 msgid "Sad"
 msgstr "Triste"
 
-#: gajim/common/const.py:388
+#: gajim/common/const.py:422
 msgid "Sarcastic"
 msgstr "Sarcastique"
 
-#: gajim/common/const.py:389
+#: gajim/common/const.py:423
 msgid "Satisfied"
 msgstr "Satisfait⋅e"
 
-#: gajim/common/const.py:390
+#: gajim/common/const.py:424
 msgid "Serious"
 msgstr "Concentré⋅e"
 
-#: gajim/common/const.py:391
+#: gajim/common/const.py:425
 msgid "Shocked"
 msgstr "Choqué⋅e"
 
-#: gajim/common/const.py:392
+#: gajim/common/const.py:426
 msgid "Shy"
 msgstr "Timide"
 
-#: gajim/common/const.py:393
+#: gajim/common/const.py:427
 msgid "Sick"
 msgstr "Malade"
 
-#: gajim/common/const.py:394
+#: gajim/common/const.py:428
 msgid "Sleepy"
 msgstr "Endormi⋅e"
 
-#: gajim/common/const.py:395
+#: gajim/common/const.py:429
 msgid "Spontaneous"
 msgstr "Spontané⋅e"
 
-#: gajim/common/const.py:396
+#: gajim/common/const.py:430
 msgid "Stressed"
 msgstr "Stressé⋅e"
 
-#: gajim/common/const.py:397
+#: gajim/common/const.py:431
 msgid "Strong"
 msgstr "Fort⋅e"
 
-#: gajim/common/const.py:398
+#: gajim/common/const.py:432
 msgid "Surprised"
 msgstr "Surpris⋅e"
 
-#: gajim/common/const.py:399
+#: gajim/common/const.py:433
 msgid "Thankful"
 msgstr "Reconnaissant⋅e"
 
-#: gajim/common/const.py:400
+#: gajim/common/const.py:434
 msgid "Thirsty"
 msgstr "Assoiffé⋅e"
 
-#: gajim/common/const.py:401
+#: gajim/common/const.py:435
 msgid "Tired"
 msgstr "Fatigué⋅e"
 
-#: gajim/common/const.py:402
+#: gajim/common/const.py:436
 msgid "Undefined"
 msgstr "Indéfini"
 
-#: gajim/common/const.py:403
+#: gajim/common/const.py:437
 msgid "Weak"
 msgstr "Faible"
 
-#: gajim/common/const.py:404
+#: gajim/common/const.py:438
 msgid "Worried"
 msgstr "Inquiet⋅e"
 
-#: gajim/common/const.py:408
+#: gajim/common/const.py:442
 msgid "accuracy"
 msgstr "précision"
 
-#: gajim/common/const.py:409
+#: gajim/common/const.py:443
 msgid "alt"
 msgstr "alt"
 
-#: gajim/common/const.py:410
+#: gajim/common/const.py:444
 msgid "area"
 msgstr "zone"
 
-#: gajim/common/const.py:411
+#: gajim/common/const.py:445
 msgid "bearing"
 msgstr "position"
 
-#: gajim/common/const.py:412
+#: gajim/common/const.py:446
 msgid "building"
 msgstr "bâtiment"
 
-#: gajim/common/const.py:413
+#: gajim/common/const.py:447
 msgid "country"
 msgstr "pays"
 
-#: gajim/common/const.py:414
+#: gajim/common/const.py:448
 msgid "countrycode"
 msgstr "code du pays"
 
-#: gajim/common/const.py:415
+#: gajim/common/const.py:449
 msgid "datum"
 msgstr "donnée"
 
-#: gajim/common/const.py:416
+#: gajim/common/const.py:450
 msgid "description"
 msgstr "description"
 
-#: gajim/common/const.py:417
+#: gajim/common/const.py:451
 msgid "error"
 msgstr "erreur"
 
-#: gajim/common/const.py:418
+#: gajim/common/const.py:452
 msgid "floor"
 msgstr "étage"
 
-#: gajim/common/const.py:419
+#: gajim/common/const.py:453
 msgid "lat"
 msgstr "lat"
 
-#: gajim/common/const.py:420
+#: gajim/common/const.py:454
 msgid "locality"
 msgstr "ville"
 
-#: gajim/common/const.py:421
+#: gajim/common/const.py:455
 msgid "lon"
 msgstr "lon"
 
-#: gajim/common/const.py:422
+#: gajim/common/const.py:456
 msgid "postalcode"
 msgstr "code postal"
 
-#: gajim/common/const.py:423
+#: gajim/common/const.py:457
 msgid "region"
 msgstr "région"
 
-#: gajim/common/const.py:424
+#: gajim/common/const.py:458
 msgid "room"
 msgstr "groupe de discussion"
 
-#: gajim/common/const.py:425
+#: gajim/common/const.py:459
 msgid "speed"
 msgstr "vitesse"
 
-#: gajim/common/const.py:426
+#: gajim/common/const.py:460
 msgid "street"
 msgstr "rue"
 
-#: gajim/common/const.py:427
+#: gajim/common/const.py:461
 msgid "text"
 msgstr "texte"
 
-#: gajim/common/const.py:428
+#: gajim/common/const.py:462
 msgid "timestamp"
 msgstr "horodatage"
 
-#: gajim/common/const.py:429
+#: gajim/common/const.py:463
 msgid "URI"
 msgstr "URI"
 
-#: gajim/common/const.py:434
+#: gajim/common/const.py:468
 msgid "Unable to get issuer certificate"
 msgstr "Impossible d'obtenir le certificat de l'émetteur"
 
-#: gajim/common/const.py:435
+#: gajim/common/const.py:469
 msgid "Unable to get certificate CRL"
 msgstr "Impossible d'obtenir un certificat CRL"
 
-#: gajim/common/const.py:436
+#: gajim/common/const.py:470
 msgid "Unable to decrypt certificate's signature"
 msgstr "Impossible de déchiffrer la signature du certificat"
 
-#: gajim/common/const.py:437
+#: gajim/common/const.py:471
 msgid "Unable to decrypt CRL's signature"
 msgstr "Impossible de déchiffrer la signature du CRL"
 
-#: gajim/common/const.py:438
+#: gajim/common/const.py:472
 msgid "Unable to decode issuer public key"
 msgstr "Impossible de déchiffrer la clef public de l'émetteur"
 
-#: gajim/common/const.py:439
+#: gajim/common/const.py:473
 msgid "Certificate signature failure"
 msgstr "Échec de la signature du certificat"
 
-#: gajim/common/const.py:440
+#: gajim/common/const.py:474
 msgid "CRL signature failure"
 msgstr "Échec de la signature CRL"
 
-#: gajim/common/const.py:441
+#: gajim/common/const.py:475
 msgid "Certificate is not yet valid"
 msgstr "Le certificat n'est pas encore valide"
 
-#: gajim/common/const.py:442
+#: gajim/common/const.py:476
 msgid "Certificate has expired"
 msgstr "Le certificat a expiré"
 
-#: gajim/common/const.py:443
+#: gajim/common/const.py:477
 msgid "CRL is not yet valid"
 msgstr "CRL n'est pas encore valide"
 
-#: gajim/common/const.py:444
+#: gajim/common/const.py:478
 msgid "CRL has expired"
 msgstr "CRL a expiré"
 
-#: gajim/common/const.py:445
+#: gajim/common/const.py:479
 msgid "Format error in certificate's notBefore field"
 msgstr "Erreur de format dans le champ notBefore du certificat"
 
-#: gajim/common/const.py:446
+#: gajim/common/const.py:480
 msgid "Format error in certificate's notAfter field"
 msgstr "Erreur de format dans le champ notAfter du certificat"
 
-#: gajim/common/const.py:447
+#: gajim/common/const.py:481
 msgid "Format error in CRL's lastUpdate field"
 msgstr "Erreur de format dans le champ lastUpdate du CRL"
 
-#: gajim/common/const.py:448
+#: gajim/common/const.py:482
 msgid "Format error in CRL's nextUpdate field"
 msgstr "Erreur de format dans le champ nextUpdate du CRL"
 
-#: gajim/common/const.py:449
+#: gajim/common/const.py:483
 msgid "Out of memory"
 msgstr "Mémoire insuffisante"
 
-#: gajim/common/const.py:450
+#: gajim/common/const.py:484
 msgid "Self signed certificate"
 msgstr "Certificat auto-signé"
 
-#: gajim/common/const.py:451
+#: gajim/common/const.py:485
 msgid "Self signed certificate in certificate chain"
 msgstr "Certificat auto-signé dans la chaîne de certificat"
 
-#: gajim/common/const.py:452
+#: gajim/common/const.py:486
 msgid "Unable to get local issuer certificate"
 msgstr "Impossible de récupérer le certificat de l'émeteur local"
 
-#: gajim/common/const.py:453
+#: gajim/common/const.py:487
 msgid "Unable to verify the first certificate"
 msgstr "Impossible de vérifier le premier certificat"
 
-#: gajim/common/const.py:454
+#: gajim/common/const.py:488
 msgid "Certificate chain too long"
 msgstr "Chaîne du certificat trop longue"
 
-#: gajim/common/const.py:455
+#: gajim/common/const.py:489
 msgid "Certificate revoked"
 msgstr "Certificat révoqué"
 
-#: gajim/common/const.py:456
+#: gajim/common/const.py:490
 msgid "Invalid CA certificate"
 msgstr "Certificat CA invalide"
 
-#: gajim/common/const.py:457
+#: gajim/common/const.py:491
 msgid "Path length constraint exceeded"
 msgstr "Longueur du chemin dépassée"
 
-#: gajim/common/const.py:458
+#: gajim/common/const.py:492
 msgid "Unsupported certificate purpose"
 msgstr "Objet du certificat non-supporté"
 
-#: gajim/common/const.py:459
+#: gajim/common/const.py:493
 msgid "Certificate not trusted"
 msgstr "Certificat non approuvé"
 
-#: gajim/common/const.py:460
+#: gajim/common/const.py:494
 msgid "Certificate rejected"
 msgstr "Certificat refusé"
 
-#: gajim/common/const.py:461
+#: gajim/common/const.py:495
 msgid "Subject issuer mismatch"
 msgstr "Décalage du sujet de l'émetteur"
 
-#: gajim/common/const.py:462
+#: gajim/common/const.py:496
 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:463
+#: gajim/common/const.py:497
 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:464
+#: gajim/common/const.py:498
 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:465
+#: gajim/common/const.py:499
 msgid "Application verification failure"
 msgstr "Echec de la vérification de l'application"
 
@@ -5112,256 +5315,256 @@ msgstr "Entrée vidéo"
 msgid "video output"
 msgstr "Sortie audio"
 
-#: gajim/common/helpers.py:210
+#: gajim/common/helpers.py:216
 msgid "Server must be between 1 and 1023 bytes"
 msgstr "Le serveur doit comprendre entre 1 et 1023 octets"
 
-#: gajim/common/helpers.py:214
+#: gajim/common/helpers.py:220
 msgid "Invalid character in hostname."
 msgstr "Caractère non valide dans le nom d'hôte."
 
-#: gajim/common/helpers.py:216
+#: gajim/common/helpers.py:222
 msgid "Server address required."
 msgstr "Adresse du serveur requise."
 
-#: gajim/common/helpers.py:220
+#: gajim/common/helpers.py:226
 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:224
+#: gajim/common/helpers.py:230
 msgid "Invalid character in username."
 msgstr "Caractère non valide dans le nom d'utilisateur."
 
-#: gajim/common/helpers.py:230
+#: gajim/common/helpers.py:236
 msgid "Resource must be between 1 and 1023 bytes"
 msgstr "La ressource doit comprendre entre 1 et 1023 octets"
 
-#: gajim/common/helpers.py:234
+#: gajim/common/helpers.py:240
 msgid "Invalid character in resource."
 msgstr "Caractère non valide dans la ressource."
 
-#: gajim/common/helpers.py:275
+#: gajim/common/helpers.py:281
 msgid "_Busy"
 msgstr "_Occupé⋅e"
 
-#: gajim/common/helpers.py:277 gajim/gtk/tooltips.py:647
+#: gajim/common/helpers.py:283 gajim/gtk/tooltips.py:647
 msgid "Busy"
 msgstr "Occupé⋅e"
 
-#: gajim/common/helpers.py:280
+#: gajim/common/helpers.py:286
 msgid "_Not Available"
 msgstr "_Non disponible"
 
-#: gajim/common/helpers.py:282 gajim/gtk/tooltips.py:649
+#: gajim/common/helpers.py:288 gajim/gtk/tooltips.py:649
 msgid "Not Available"
 msgstr "Non disponible"
 
-#: gajim/common/helpers.py:285
+#: gajim/common/helpers.py:291
 msgid "_Free for Chat"
 msgstr "Dis_ponible pour discuter"
 
-#: gajim/common/helpers.py:287 gajim/gtk/tooltips.py:643
+#: gajim/common/helpers.py:293 gajim/gtk/tooltips.py:643
 msgid "Free for Chat"
 msgstr "Disponible pour discuter"
 
-#: gajim/common/helpers.py:290
+#: gajim/common/helpers.py:296
 msgid "?user status:_Available"
 msgstr "?user status:_Disponible"
 
-#: gajim/common/helpers.py:292 gajim/gtk/tooltips.py:641
+#: gajim/common/helpers.py:298 gajim/gtk/tooltips.py:641
 msgid "?user status:Available"
 msgstr "?user status:Disponible"
 
-#: gajim/common/helpers.py:294
+#: gajim/common/helpers.py:300
 msgid "Connecting"
 msgstr "Connexion"
 
-#: gajim/common/helpers.py:297 gajim/data/gui/preferences_window.ui:1251
+#: gajim/common/helpers.py:303 gajim/data/gui/preferences_window.ui:1251
 msgid "A_way"
 msgstr "_Absent⋅e"
 
-#: gajim/common/helpers.py:299 gajim/common/modules/adhoc_commands.py:120
-#: gajim/command_system/implementation/standard.py:139
+#: gajim/common/helpers.py:305 gajim/common/modules/adhoc_commands.py:120
+#: gajim/command_system/implementation/standard.py:141
 #: gajim/gtk/tooltips.py:645
 msgid "Away"
 msgstr "Absent⋅e"
 
-#: gajim/common/helpers.py:302
+#: gajim/common/helpers.py:308
 msgid "_Offline"
 msgstr "_Déconnecté⋅e"
 
-#: gajim/common/helpers.py:304 gajim/gtk/tooltips.py:651
+#: gajim/common/helpers.py:310 gajim/gtk/tooltips.py:651
 msgid "Offline"
 msgstr "Déconnecté⋅e"
 
-#: gajim/common/helpers.py:307
+#: gajim/common/helpers.py:313
 msgid "_Invisible"
 msgstr "_Invisible"
 
-#: gajim/common/helpers.py:313
+#: gajim/common/helpers.py:319
 msgid "?contact has status:Unknown"
 msgstr "Inconnu"
 
-#: gajim/common/helpers.py:315
+#: gajim/common/helpers.py:321
 msgid "?contact has status:Has errors"
 msgstr "en erreur"
 
-#: gajim/common/helpers.py:330
+#: gajim/common/helpers.py:336
 msgid "?Subscription we already have:None"
 msgstr "Aucune"
 
-#: gajim/common/helpers.py:332
+#: gajim/common/helpers.py:338
 msgid "To"
 msgstr "À"
 
-#: gajim/common/helpers.py:334 gajim/data/gui/groups_post_window.ui:33
+#: gajim/common/helpers.py:340 gajim/data/gui/groups_post_window.ui:33
 msgid "From"
 msgstr "De"
 
-#: gajim/common/helpers.py:336
+#: gajim/common/helpers.py:342
 msgid "Both"
 msgstr "Les deux"
 
-#: gajim/common/helpers.py:338 gajim/gtk/server_info.py:151
+#: gajim/common/helpers.py:344 gajim/gtk/server_info.py:151
 msgid "Unknown"
 msgstr "Inconnu"
 
-#: gajim/common/helpers.py:344
+#: gajim/common/helpers.py:350
 msgid "?Ask (for Subscription):None"
 msgstr "Aucune"
 
-#: gajim/common/helpers.py:346
+#: gajim/common/helpers.py:352
 msgid "Subscribe"
 msgstr "S'inscrire"
 
-#: gajim/common/helpers.py:355
+#: gajim/common/helpers.py:361
 msgid "?Group Chat Contact Role:None"
 msgstr "Aucun"
 
-#: gajim/common/helpers.py:358
+#: gajim/common/helpers.py:364
 msgid "Moderators"
 msgstr "Modérateurs"
 
-#: gajim/common/helpers.py:360
+#: gajim/common/helpers.py:366
 msgid "Moderator"
 msgstr "Modérateur"
 
-#: gajim/common/helpers.py:363
+#: gajim/common/helpers.py:369 gajim/data/gui/groupchat_info_scrolled.ui:243
 msgid "Participants"
 msgstr "Participants"
 
-#: gajim/common/helpers.py:365
+#: gajim/common/helpers.py:371
 msgid "Participant"
 msgstr "Participant"
 
-#: gajim/common/helpers.py:368
+#: gajim/common/helpers.py:374
 msgid "Visitors"
 msgstr "Visiteurs"
 
-#: gajim/common/helpers.py:370
+#: gajim/common/helpers.py:376
 msgid "Visitor"
 msgstr "Visiteur"
 
-#: gajim/common/helpers.py:376 gajim/gtk/tooltips.py:253
+#: gajim/common/helpers.py:382 gajim/gtk/tooltips.py:253
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "?Group Chat Contact Affiliation:Aucune"
 
-#: gajim/common/helpers.py:378 gajim/data/gui/groupchat_config.ui:32
+#: gajim/common/helpers.py:384 gajim/data/gui/groupchat_config.ui:32
 #: gajim/gtk/tooltips.py:259
 msgid "Owner"
 msgstr "Propriétaire"
 
-#: gajim/common/helpers.py:380 gajim/gtk/tooltips.py:257
+#: gajim/common/helpers.py:386 gajim/gtk/tooltips.py:257
 msgid "Administrator"
 msgstr "Administrateur"
 
-#: gajim/common/helpers.py:382 gajim/data/gui/groupchat_config.ui:40
+#: gajim/common/helpers.py:388 gajim/data/gui/groupchat_config.ui:40
 #: gajim/gtk/tooltips.py:255 gajim/gtk/groupchat_config.py:105
 msgid "Member"
 msgstr "Membre"
 
-#: gajim/common/helpers.py:421
+#: gajim/common/helpers.py:427
 msgid "is paying attention to the conversation"
 msgstr "prête attention à la conversation"
 
-#: gajim/common/helpers.py:423
+#: gajim/common/helpers.py:429
 msgid "is doing something else"
 msgstr "fait quelque chose d'autre"
 
-#: gajim/common/helpers.py:425
+#: gajim/common/helpers.py:431
 msgid "is composing a message…"
 msgstr "écrit un message…"
 
-#: gajim/common/helpers.py:428
+#: gajim/common/helpers.py:434
 msgid "paused composing a message"
 msgstr "a arrêté d'écrire un message"
 
-#: gajim/common/helpers.py:430
+#: gajim/common/helpers.py:436
 msgid "has closed the chat window or tab"
 msgstr "a fermé la fenêtre ou l'onglet de discussion"
 
-#: gajim/common/helpers.py:936 gajim/common/helpers.py:943
+#: gajim/common/helpers.py:942 gajim/common/helpers.py:949
 #, 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:950
+#: gajim/common/helpers.py:956
 #, python-format
-msgid "from room %s"
-msgstr "du salon %s"
+msgid "from group chat %s"
+msgstr "depuis le salon de discussion %s"
 
-#: gajim/common/helpers.py:953 gajim/common/helpers.py:970
+#: gajim/common/helpers.py:959 gajim/common/helpers.py:976
 #, python-format
 msgid "from user %s"
 msgstr "de l'utilisateur %s"
 
-#: gajim/common/helpers.py:955
+#: gajim/common/helpers.py:961
 #, python-format
 msgid "from %s"
 msgstr "de %s"
 
-#: gajim/common/helpers.py:962 gajim/common/helpers.py:968
+#: gajim/common/helpers.py:968 gajim/common/helpers.py:974
 #, 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:986 gajim/common/helpers.py:998
+#: gajim/common/helpers.py:992 gajim/common/helpers.py:1004
 #: gajim/data/gui/roster_window.ui:85 data/org.gajim.Gajim.desktop.in:4
 #: data/org.gajim.Gajim.appdata.xml.in:9
 msgid "Gajim"
 msgstr "Gajim"
 
-#: gajim/common/helpers.py:1000
+#: gajim/common/helpers.py:1006
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: gajim/common/helpers.py:1109 gajim/data/gui/add_new_contact_window.ui:25
+#: gajim/common/helpers.py:1115 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:1111
+#: gajim/common/helpers.py:1117
 msgid "Hello, I am $name."
 msgstr "Bonjour, je m'appelle $name."
 
-#: gajim/common/helpers.py:1215 gajim/common/helpers.py:1224
-#: gajim/common/helpers.py:1282
+#: gajim/common/helpers.py:1221 gajim/common/helpers.py:1230
+#: gajim/common/helpers.py:1288
 msgid "Timeout loading image"
 msgstr "Délai du chargement de l'image dépassé"
 
-#: gajim/common/helpers.py:1234 gajim/common/helpers.py:1280
+#: gajim/common/helpers.py:1240 gajim/common/helpers.py:1286
 msgid "Image is too big"
 msgstr "L'image est trop grande"
 
-#: gajim/common/helpers.py:1245
+#: gajim/common/helpers.py:1251
 msgid "PyCURL is not installed"
 msgstr "PyCURL n'est pas installé"
 
-#: gajim/common/helpers.py:1284
+#: gajim/common/helpers.py:1290
 msgid "Error loading image"
 msgstr "Erreur lors du chargement de l'image"
 
@@ -5540,7 +5743,8 @@ msgstr "L'état a été changé."
 
 #: gajim/common/modules/adhoc_commands.py:202
 #: gajim/common/modules/adhoc_commands.py:239
-msgid "Leave Groupchats"
+#, fuzzy
+msgid "Leave Group Chats"
 msgstr "Quitter des Groupes de Discussion"
 
 #: gajim/common/modules/adhoc_commands.py:228
@@ -5549,15 +5753,17 @@ msgid "%(nickname)s on %(room_jid)s"
 msgstr "%(nickname)s dans %(room_jid)s"
 
 #: gajim/common/modules/adhoc_commands.py:232
-msgid "You have not joined a groupchat."
+#, fuzzy
+msgid "You have not joined a group chat."
 msgstr "Vous n'avez pas joint de groupe de discussion."
 
 #: gajim/common/modules/adhoc_commands.py:240
-msgid "Choose the groupchats you want to leave"
-msgstr "Choisissez les groupes de discussion que vous voulez quitter"
+msgid "Choose the group chats you want to leave"
+msgstr "Choisissez les groupes de discussion que vous désirez quitter"
 
 #: gajim/common/modules/adhoc_commands.py:289
-msgid "You left the following groupchats:"
+#, fuzzy
+msgid "You left the following group chats:"
 msgstr "Vous avez quitté les groupes de discussion suivants :"
 
 #: gajim/common/modules/roster_item_exchange.py:102
@@ -5573,18 +5779,17 @@ msgstr "Contacts envoyés :"
 msgid "Blocked Contacts"
 msgstr "Contacts Bloqués"
 
-#: gajim/data/gui/destroy_muc_dialog.ui:79 gajim/gtk/dialogs.py:736
+#: gajim/data/gui/destroy_muc_dialog.ui:79 gajim/gtk/dialogs.py:563
 msgid "Destroy this group chat permanently?"
-msgstr ""
+msgstr "Détruire ce salon de discussion de façon irréversible ?"
 
 #: gajim/data/gui/destroy_muc_dialog.ui:109
-#, fuzzy
 msgid "Reason..."
-msgstr "Raison"
+msgstr "Raison ..."
 
-#: gajim/data/gui/destroy_muc_dialog.ui:124 gajim/gtk/dialogs.py:738
+#: gajim/data/gui/destroy_muc_dialog.ui:124 gajim/gtk/dialogs.py:565
 msgid "Where participants should go (optional)"
-msgstr ""
+msgstr "Où est-ce que les participants devraient aller (facultatif)"
 
 #: gajim/data/gui/destroy_muc_dialog.ui:141
 msgid "Alternate venue..."
@@ -5595,32 +5800,6 @@ msgstr ""
 msgid "_Reason and alternate venue (optional)"
 msgstr "Vous pouvez également entrer une juridiction alternative :"
 
-#: gajim/data/gui/advanced_configuration_window.ui:7
-#: gajim/data/gui/preferences_window.ui:2723
-msgid "Advanced Configuration Editor (ACE)"
-msgstr "Éditeur de configuration avancé"
-
-#: gajim/data/gui/advanced_configuration_window.ui:52
-msgid "You should restart Gajim for some changes to take effect"
-msgstr ""
-"Vous devriez redémarrer Gajim pour prendre en compte certaines de vos "
-"modifications"
-
-#: gajim/data/gui/advanced_configuration_window.ui:84
-msgid "_Filter"
-msgstr "_Filtre"
-
-# ccount). Description column
-#: gajim/data/gui/advanced_configuration_window.ui:153
-#: gajim/data/gui/filetransfers_send_file_dialog.ui:15
-#: gajim/gtk/discovery.py:1666
-msgid "Description"
-msgstr "Description"
-
-#: gajim/data/gui/advanced_configuration_window.ui:197
-msgid "_Reset to default"
-msgstr "_Réinitialiser aux valeurs par défaut"
-
 #: gajim/data/gui/join_groupchat_window.ui:56
 #: gajim/data/gui/chat_to_muc_window.ui:67
 #: gajim/data/gui/chat_to_muc_window.ui:78
@@ -5632,8 +5811,9 @@ msgid "Join group chat every time Gajim is started"
 msgstr "Rejoindre ce salon à chaque démarrage de Gajim"
 
 #: gajim/data/gui/join_groupchat_window.ui:113
-msgid "Auto Join"
-msgstr "Rejoindre automatiquement"
+#, fuzzy
+msgid "Join Automatically"
+msgstr "_Rejoindre automatiquement"
 
 #: gajim/data/gui/join_groupchat_window.ui:131
 #: gajim/data/gui/profile_window.ui:233
@@ -5641,10 +5821,12 @@ msgid "Account"
 msgstr "Compte"
 
 #: gajim/data/gui/join_groupchat_window.ui:147
-msgid "Room"
-msgstr "Salon de discussion"
+#, fuzzy
+msgid "Group chat"
+msgstr "Salons de discussion"
 
-#: gajim/data/gui/join_groupchat_window.ui:180 gajim/gtk/accounts.py:886
+#: gajim/data/gui/join_groupchat_window.ui:180 gajim/data/gui/bookmarks.ui:158
+#: gajim/gtk/accounts.py:889
 msgid "Password"
 msgstr "Mot de passe"
 
@@ -5664,78 +5846,10 @@ 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:1271
+#: gajim/data/gui/join_groupchat_window.ui:437 gajim/gtk/discovery.py:1270
 msgid "Join"
 msgstr "Rejoindre"
 
-#: gajim/data/gui/manage_proxies_window.ui:12
-msgid "HTTP Connect"
-msgstr "Connexion HTTP"
-
-#: gajim/data/gui/manage_proxies_window.ui:15
-msgid "SOCKS5"
-msgstr "SOCKS5"
-
-#: gajim/data/gui/manage_proxies_window.ui:18
-msgid "BOSH"
-msgstr "BOSH"
-
-#: gajim/data/gui/manage_proxies_window.ui:27
-msgid "Manage Proxy Profiles"
-msgstr "Gérer les profils des serveurs mandataires"
-
-#: gajim/data/gui/manage_proxies_window.ui:83
-msgid "Add Proxy"
-msgstr "Ajouter un serveur mandataire"
-
-#: gajim/data/gui/manage_proxies_window.ui:97
-msgid "Remove Proxy"
-msgstr "Supprimer un serveur mandataire"
-
-#: gajim/data/gui/manage_proxies_window.ui:141
-msgid "Properties"
-msgstr "Propriétés"
-
-#: gajim/data/gui/manage_proxies_window.ui:157
-msgid "_Name"
-msgstr "_Nom"
-
-#: gajim/data/gui/manage_proxies_window.ui:173
-msgid "_Type"
-msgstr "_Type"
-
-#: gajim/data/gui/manage_proxies_window.ui:236
-msgid "_BOSH URL"
-msgstr "_BOSH URL"
-
-#: gajim/data/gui/manage_proxies_window.ui:261
-msgid "Use HTTP prox_y"
-msgstr "Utiliser un _serveur mandataire HTTP"
-
-#: gajim/data/gui/manage_proxies_window.ui:280
-msgid "Proxy _Host"
-msgstr "Hôte du serveur mandataire"
-
-#: gajim/data/gui/manage_proxies_window.ui:307
-msgid "Proxy _Port"
-msgstr "_Port du serveur mandataire"
-
-#: gajim/data/gui/manage_proxies_window.ui:334
-msgid "_Username"
-msgstr "_Nom d'utilisateur"
-
-#: gajim/data/gui/manage_proxies_window.ui:347
-msgid "Use proxy auth_entication"
-msgstr "Utiliser l'auth_entification"
-
-#: gajim/data/gui/manage_proxies_window.ui:377
-msgid "Pass_word"
-msgstr "_Mot de passe"
-
-#: gajim/data/gui/manage_proxies_window.ui:405 gajim/gtk/adhoc.py:321
-msgid "Settings"
-msgstr "Paramètres"
-
 #: gajim/data/gui/change_password_dialog.ui:17
 msgid "New Password"
 msgstr "Nouveau mot de passe"
@@ -5764,11 +5878,13 @@ msgid "Status:"
 msgstr "État :"
 
 #: gajim/data/gui/zeroconf_information_window.ui:89
-msgid "_Log conversation history"
+#, fuzzy
+msgid "_Store conversation history"
 msgstr "_Historique de conversation"
 
 #: gajim/data/gui/zeroconf_information_window.ui:215
 #: gajim/data/gui/vcard_information_window.ui:390
+#: gajim/data/gui/groupchat_info_scrolled.ui:166
 msgid "Contact"
 msgstr "Contact"
 
@@ -5781,8 +5897,8 @@ msgid "Last Name:"
 msgstr "Nom :"
 
 #: gajim/data/gui/zeroconf_information_window.ui:260
-msgid "Jabber ID:"
-msgstr "Identifiant Jabber :"
+msgid "XMPP Address:"
+msgstr "Adresse XMPP :"
 
 #: gajim/data/gui/zeroconf_information_window.ui:273
 msgid "E-Mail:"
@@ -5802,8 +5918,9 @@ msgid "Send _File"
 msgstr "Envoyer un _fichier"
 
 #: gajim/data/gui/gc_occupants_menu.ui:29
-msgid "Occupant Actions"
-msgstr "Actions des Occupants"
+#, fuzzy
+msgid "Participant Actions"
+msgstr "Participants"
 
 #: gajim/data/gui/gc_occupants_menu.ui:38
 msgid "_Voice"
@@ -5834,7 +5951,7 @@ msgid "_Ban"
 msgstr "_Bannir"
 
 #: gajim/data/gui/gc_occupants_menu.ui:124
-msgid "_Add to Roster"
+msgid "_Add to Contact List"
 msgstr "_Ajouter à la liste de contacts"
 
 #: gajim/data/gui/gc_occupants_menu.ui:132
@@ -5870,11 +5987,6 @@ msgstr "Souscription :"
 msgid "_Status"
 msgstr "É_tat"
 
-#: gajim/data/gui/zeroconf_context_menu.ui:26
-#: gajim/data/gui/account_context_menu.ui:79
-msgid "_Modify Account..."
-msgstr "_Modifier le compte..."
-
 #: gajim/data/gui/certificate_dialog.ui:66
 #: gajim/data/gui/certificate_dialog.ui:178
 msgid "Common Name (CN)"
@@ -5955,13 +6067,20 @@ msgstr "Dernière modification :"
 msgid "Next entry"
 msgstr "Élément suivant"
 
+# 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:48 gajim/gtk/discovery.py:1663
+msgid "Description"
+msgstr "Description"
+
 #: gajim/data/gui/filetransfers_send_file_dialog.ui:54
 #, fuzzy
 msgid "_Send Files"
 msgstr "Envoyer un _fichier"
 
 #: gajim/data/gui/filetransfers_send_file_dialog.ui:58
-#: gajim/gtk/xml_console.py:90
+#: gajim/gtk/xml_console.py:87
 msgid "Send"
 msgstr "Envoyer"
 
@@ -5985,20 +6104,23 @@ msgid "Change _Nickname..."
 msgstr "Changer de Sur_nom..."
 
 #: gajim/data/gui/gc_control_popup_menu.ui:20
-msgid "_Manage Room"
-msgstr "_Gérer le Salon"
+#, fuzzy
+msgid "_Manage Group Chat"
+msgstr "_Nouveau Salon de Discussion"
 
 #: gajim/data/gui/gc_control_popup_menu.ui:31
 msgid "Change _Subject..."
 msgstr "Changer le _Sujet..."
 
 #: gajim/data/gui/gc_control_popup_menu.ui:38
-msgid "Configure _Room..."
+#, fuzzy
+msgid "Configure _Group Chat..."
 msgstr "Configurer le _Salon..."
 
 #: gajim/data/gui/gc_control_popup_menu.ui:52
-msgid "_Destroy Room"
-msgstr "_Détruire le Salon"
+#, fuzzy
+msgid "_Destroy Group Chat"
+msgstr "_Nouveau Salon de Discussion"
 
 #: gajim/data/gui/gc_control_popup_menu.ui:64
 msgid "_Minimize on close"
@@ -6008,7 +6130,7 @@ msgstr "_Minimiser à la fermeture"
 msgid "_Request Voice"
 msgstr "_Demander la parole"
 
-#: gajim/data/gui/gc_control_popup_menu.ui:99 gajim/gtk/discovery.py:1704
+#: gajim/data/gui/gc_control_popup_menu.ui:99
 msgid "_Bookmark"
 msgstr "_Marque-pages"
 
@@ -6053,13 +6175,6 @@ msgstr "Site perso"
 msgid "E-Mail"
 msgstr "Courriel"
 
-#: 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/blocking_list.ui:115 gajim/gtk/add_contact.py:30
-#: gajim/gtk/accounts.py:801
-msgid "Jabber ID"
-msgstr "Identifiant Jabber"
-
 #: gajim/data/gui/profile_window.ui:440
 msgid "Main"
 msgstr "Principal"
@@ -6178,37 +6293,42 @@ msgstr "Emploi"
 msgid "About"
 msgstr "À propos"
 
-#: gajim/data/gui/start_chat_dialog.ui:114 gajim/gtk/discovery.py:1658
-msgid "Users"
-msgstr "Utilisateurs"
+#: gajim/data/gui/start_chat_dialog.ui:53
+#, fuzzy
+msgid "Global Group Chat Search"
+msgstr "Rejoindre un salon de discussion"
 
-#: gajim/data/gui/start_chat_dialog.ui:185
-msgid "Name:"
-msgstr "Nom : "
+#: gajim/data/gui/start_chat_dialog.ui:189
+#: gajim/data/gui/start_chat_dialog.ui:229
+#: gajim/data/gui/start_chat_dialog.ui:364
+msgid "_Back"
+msgstr "Retour"
 
-#: gajim/data/gui/start_chat_dialog.ui:197
-msgid "Description:"
-msgstr "Description :"
+#: gajim/data/gui/start_chat_dialog.ui:245
+#: gajim/data/gui/groupchat_control.ui:796
+#: gajim/data/gui/groupchat_control.ui:888 gajim/gtk/discovery.py:1701
+#: gajim/gtk/groupchat_join.py:62
+msgid "_Join"
+msgstr "Re_joindre"
 
-#: gajim/data/gui/start_chat_dialog.ui:209
-msgid "Address:"
-msgstr "Adresse :"
+#: gajim/data/gui/start_chat_dialog.ui:289
+msgid "Select Account"
+msgstr "Sélectionner un compte"
 
-#: gajim/data/gui/start_chat_dialog.ui:246
-msgid ""
-"Semi-Anonymous\n"
-"<span size=\"small\">(Only moderators can see your XMPP-Address)</span>"
-msgstr ""
-"Semi-anonyme\n"
-"<span size=\"small\">(Les modérateurs seulement peuvent voir votre adresse "
-"XMPP)</span>"
+#: gajim/data/gui/start_chat_dialog.ui:380
+#, fuzzy
+msgid "_Select"
+msgstr "Sélectionner des fichiers"
 
 #: gajim/data/gui/filetransfers.ui:21
 #, fuzzy
 msgid "Pa_use/Resume"
 msgstr "Reprendre"
 
-#: gajim/data/gui/filetransfers.ui:30 gajim/gtk/filechoosers.py:178
+#: gajim/data/gui/filetransfers.ui:30 gajim/data/gui/groupchat_control.ui:575
+#: gajim/data/gui/groupchat_control.ui:667
+#: gajim/data/gui/groupchat_control.ui:779
+#: gajim/data/gui/groupchat_control.ui:871 gajim/gtk/filechoosers.py:178
 msgid "_Cancel"
 msgstr "_Annuler"
 
@@ -6222,9 +6342,8 @@ msgid "File Transfers"
 msgstr "Transfert de fichiers"
 
 #: gajim/data/gui/filetransfers.ui:94
-#, fuzzy
 msgid "_Show notification when file transfer is complete"
-msgstr "Me _signaler quand un transfert de fichier est terminé"
+msgstr "Afficher une notification lorsque le tran_sfert de fichier est terminé"
 
 #: gajim/data/gui/filetransfers.ui:134
 msgid "file transfers list"
@@ -6251,7 +6370,8 @@ msgstr ""
 "incomplets"
 
 #: gajim/data/gui/filetransfers.ui:207
-msgid "Shows a list of file transfers between you and others"
+#, fuzzy
+msgid "Shows a list of file transfers between you and your contacts"
 msgstr "Affiche une liste des transferts de fichiers entre vous et les autres"
 
 #: gajim/data/gui/groupchat_control.ui:13 gajim/data/gui/chat_control.ui:277
@@ -6271,7 +6391,6 @@ msgid "Strike"
 msgstr "Barré"
 
 #: gajim/data/gui/groupchat_control.ui:54 gajim/data/gui/chat_control.ui:318
-#: gajim/gtk/advanced_config.py:86
 msgid "Color"
 msgstr "Couleur"
 
@@ -6283,14 +6402,44 @@ msgstr "Police"
 msgid "Clear formatting"
 msgstr "Effacer le formatage"
 
-#: gajim/data/gui/groupchat_control.ui:290 gajim/data/gui/chat_control.ui:880
+#: gajim/data/gui/groupchat_control.ui:291 gajim/data/gui/chat_control.ui:880
 msgid "Choose encryption"
 msgstr "Choisir un chiffrement"
 
-#: gajim/data/gui/groupchat_control.ui:336 gajim/data/gui/chat_control.ui:640
+#: gajim/data/gui/groupchat_control.ui:337 gajim/data/gui/chat_control.ui:640
 msgid "Show a list of emojis (Alt+M)"
 msgstr "Afficher une liste des émojis (Alt+M)"
 
+#: gajim/data/gui/groupchat_control.ui:484
+#, fuzzy
+msgid "Joining…"
+msgstr "Bannissement de …"
+
+#: gajim/data/gui/groupchat_control.ui:496
+#, fuzzy
+msgid "_Abort"
+msgstr "Annulé"
+
+#: gajim/data/gui/groupchat_control.ui:542
+msgid "Enter new nickname"
+msgstr "Saisissez un nouveau pseudonyme"
+
+#: gajim/data/gui/groupchat_control.ui:592
+#: gajim/data/gui/groupchat_control.ui:684
+#, fuzzy
+msgid "Ch_ange"
+msgstr "Changer de surnom"
+
+#: gajim/data/gui/groupchat_control.ui:761
+#, fuzzy
+msgid "Enter password"
+msgstr "Entrez un nouveau mot de passe :"
+
+#: gajim/data/gui/groupchat_control.ui:1067
+#, fuzzy
+msgid "_Try again"
+msgstr "Vérifier à nouveau..."
+
 #: gajim/data/gui/popup_notification_window.ui:42
 msgid "Event Type"
 msgstr "Type d'événement"
@@ -6358,7 +6507,7 @@ msgid "Always"
 msgstr "Toujours"
 
 #: gajim/data/gui/mam_preferences.ui:18
-msgid "Roster"
+msgid "Contact List"
 msgstr "Liste de contacts"
 
 #: gajim/data/gui/mam_preferences.ui:22
@@ -6382,11 +6531,11 @@ msgid "Add"
 msgstr "Ajouter"
 
 #: gajim/data/gui/mam_preferences.ui:194 gajim/data/gui/groupchat_config.ui:151
-#: gajim/gtk/dialogs.py:63 gajim/gtk/accounts.py:381
+#: gajim/gtk/dialogs.py:62 gajim/gtk/accounts.py:384
 msgid "Remove"
 msgstr "Supprimer"
 
-#: gajim/data/gui/vcard_information_window.ui:72 gajim/gtk/accounts.py:753
+#: gajim/data/gui/vcard_information_window.ui:72 gajim/gtk/accounts.py:756
 msgid "Resource"
 msgstr "Ressource"
 
@@ -6431,6 +6580,7 @@ msgstr "Souscription"
 #: gajim/data/gui/vcard_information_window.ui:974
 #: gajim/data/gui/vcard_information_window.ui:993
 #: gajim/data/gui/vcard_information_window.ui:1427
+#: gajim/data/gui/groupchat_info_scrolled.ui:222
 msgid "button"
 msgstr "bouton"
 
@@ -6459,15 +6609,18 @@ msgid "Notify me about it"
 msgstr "Me le signaler"
 
 #: gajim/data/gui/preferences_window.ui:58
-msgid "Show only in roster"
-msgstr "Ne le montrer que dans la liste"
+#, fuzzy
+msgid "Show only in contact list"
+msgstr "Afficher seulement les contacts actifs"
 
 #: gajim/data/gui/preferences_window.ui:69
-msgid "Detached roster with detached chats"
+#, fuzzy
+msgid "Detached contact list with detached chats"
 msgstr "Liste des contacts détachée avec conversations détachéee"
 
 #: gajim/data/gui/preferences_window.ui:72
-msgid "Detached roster with single chat"
+#, fuzzy
+msgid "Detached contact list with single chat"
 msgstr "Liste des contacts détachée avec conversations groupées"
 
 #: gajim/data/gui/preferences_window.ui:75
@@ -6475,11 +6628,13 @@ msgid "Single window for everything"
 msgstr "Une seule fenêtre pour tout"
 
 #: gajim/data/gui/preferences_window.ui:78
-msgid "Detached roster with chat grouped by account"
+#, fuzzy
+msgid "Detached contact list with chat grouped by account"
 msgstr "Liste des contacts détachée avec conversations groupées par compte"
 
 #: gajim/data/gui/preferences_window.ui:81
-msgid "Detached roster with chat grouped by type"
+#, fuzzy
+msgid "Detached contact list with chat grouped by type"
 msgstr "Liste des contacts détachée avec conversations groupées par type"
 
 #: gajim/data/gui/preferences_window.ui:92
@@ -6523,7 +6678,8 @@ msgid "_Window behavior"
 msgstr "Comportement de la _fenêtre"
 
 #: gajim/data/gui/preferences_window.ui:296
-msgid "_Show roster on startup"
+#, fuzzy
+msgid "_Show contact list on startup"
 msgstr "Montrer la _liste au démarrage"
 
 #: gajim/data/gui/preferences_window.ui:311
@@ -6540,12 +6696,14 @@ msgid "_Tabs placement"
 msgstr "Emplacement des _onglets"
 
 #: gajim/data/gui/preferences_window.ui:363
-msgid "_Quit Gajim when closing roster window"
+#, 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
+#, fuzzy
 msgid ""
-"If enabled, Gajim will quit when closing the roster window instead of "
+"If enabled, Gajim will quit when closing the contact list window instead of "
 "minimizing to the system's notification area"
 msgstr ""
 "Si activé, Gajim se fermera quand la fenêtre de la liste des contacts est "
@@ -6556,40 +6714,47 @@ msgid "Behavior of Windows and Tabs"
 msgstr "Comportement des fenêtres et des onglets"
 
 #: gajim/data/gui/preferences_window.ui:423
-msgid "Show a_vatars of contacts in roster"
+#, 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
+#, fuzzy
 msgid ""
-"If checked, avatars of contacts will be shown in the roster window and in "
-"group chats"
+"If checked, avatars of contacts will be shown in the contact list window and "
+"in group chats"
 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
-msgid "Show status _messages of contacts in roster"
+#, 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
+#, fuzzy
 msgid ""
 "If checked, status messages of contacts will be shown under the contact's "
-"name, in the roster window, and in group chats"
+"name, in the contact list window, and in group chats"
 msgstr ""
 "Si cette case est cochée, Gajim affichera les messages d'état des contacts "
 "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
-msgid "Show e_xtra information of contacts in roster (mood, activity, ...)"
+#, fuzzy
+msgid ""
+"Show e_xtra information of contacts in contact list (mood, activity, ...)"
 msgstr ""
 "Afficher les informations _supplémentaires des contacts dans la liste des "
 "contacts (humeur, activité, …)"
 
 #: gajim/data/gui/preferences_window.ui:463
+#, fuzzy
 msgid ""
-"If checked, additional info published by the contact will be shown in "
-"roster. Additional infos (published via PEP) may include e.g. mood, "
+"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 cette case est cochée, des informations additionnelles publiées par le "
@@ -6602,16 +6767,18 @@ msgid "Sort contacts by status"
 msgstr "Trier les contacts par état"
 
 #: gajim/data/gui/preferences_window.ui:494
-msgid "in _roster"
-msgstr "dans le _roster"
+#, fuzzy
+msgid "in _contact list"
+msgstr "Contacts envoyés :"
 
 #: gajim/data/gui/preferences_window.ui:511
 msgid "in _group chats"
 msgstr "dans les _salons de discussion"
 
 #: gajim/data/gui/preferences_window.ui:540
-msgid "Roster Appearance"
-msgstr "Apparence de la fenêtre principale"
+#, fuzzy
+msgid "Contact List Appearance"
+msgstr "Échange d'éléments de la liste des contacts"
 
 #: gajim/data/gui/preferences_window.ui:585
 msgid "Enable spell _checking"
@@ -6673,7 +6840,8 @@ 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:660
-msgid "If checked, the room subject will be shown when joining a group chat"
+#, 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"
@@ -6687,18 +6855,20 @@ msgid "Show join/leave (Default)"
 msgstr "Montrer rejoindre/partir (par défaut)"
 
 #: gajim/data/gui/preferences_window.ui:701
+#, fuzzy
 msgid ""
 "If join/leave status messages are shown in the group chat. This setting can "
-"be overridden in the groupchat menu."
+"be overridden in the group chat menu."
 msgstr ""
 "Si les messages connecté/parti sont montrés dans le salon de discussion. Ce "
 "paramètre peut être supplanté dans le menu du salon."
 
 # supplanté, outrepassé, ignoré, écrasé ?
 #: gajim/data/gui/preferences_window.ui:720
+#, fuzzy
 msgid ""
 "The default sync threshold for new public group chats. This setting can be "
-"overridden in the groupchat menu."
+"overridden in the group chat menu."
 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."
@@ -6712,9 +6882,10 @@ msgid "Show status changes (Default)"
 msgstr "Afficher les modifications d'état (par défaut)"
 
 #: gajim/data/gui/preferences_window.ui:768
+#, fuzzy
 msgid ""
 "If status change messages are shown in the group chat. This setting can be "
-"overridden in the groupchat menu."
+"overridden in the group chat menu."
 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."
@@ -6732,8 +6903,9 @@ msgstr ""
 "discussion de votre contact"
 
 #: gajim/data/gui/preferences_window.ui:843
-msgid "Show chatstate in roster"
-msgstr "Afficher l’état de discussion dans la liste des contacts"
+#, fuzzy
+msgid "Show chatstate in contact list"
+msgstr "Afficher l'état de la discussion dans les onglets"
 
 #: gajim/data/gui/preferences_window.ui:847
 msgid ""
@@ -6794,7 +6966,7 @@ msgid ""
 "bottom right of the screen "
 msgstr ""
 "Une fenêtre de notification apparaîtra en bas à droite de l'écran quand un "
-"contact se connecte"
+"contact se connecte "
 
 #: gajim/data/gui/preferences_window.ui:1069
 msgid "Notify me about contacts that sign _out"
@@ -6806,7 +6978,7 @@ msgid ""
 "bottom right of the screen "
 msgstr ""
 "Une fenêtre de notification apparaîtra en bas à droite de l'écran quand un "
-"contact se déconnecte"
+"contact se déconnecte "
 
 #: gajim/data/gui/preferences_window.ui:1091
 msgid "Visual Notifications"
@@ -7023,7 +7195,7 @@ msgstr "Taille de la vidéo"
 msgid "Vi_ew own video source"
 msgstr "Voir votre propre source vidéo"
 
-#: gajim/data/gui/preferences_window.ui:2281 gajim/gtk/accounts.py:352
+#: gajim/data/gui/preferences_window.ui:2281 gajim/gtk/accounts.py:355
 msgid "Connection"
 msgstr "Connexion"
 
@@ -7073,7 +7245,8 @@ msgid "_Manage..."
 msgstr "_Gérer..."
 
 #: gajim/data/gui/preferences_window.ui:2616
-msgid "_Log status changes of contacts"
+#, 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:2633
@@ -7097,9 +7270,14 @@ msgstr "Attention : utilisez ces options avec précaution !"
 msgid "_Open..."
 msgstr "_Ouvrir..."
 
+#: gajim/data/gui/preferences_window.ui:2723 gajim/gtk/advanced_config.py:84
+msgid "Advanced Configuration Editor (ACE)"
+msgstr "Éditeur de configuration avancé (ECA)"
+
 #: gajim/data/gui/groupchat_config.ui:55
+#, fuzzy
 msgid ""
-"<b>Jabber-ID</b>\n"
+"<b>XMPP Address</b>\n"
 "&lt;user@domain/resource&gt; (only that resource matches)\n"
 "&lt;user@domain&gt; (any resource matches)\n"
 "&lt;domain/resource&gt; (only that resource matches)\n"
@@ -7120,7 +7298,8 @@ msgstr ""
 "Seulement les administrateurs et les propriétaires peuvent modifier "
 "l'affiliation"
 
-#: gajim/data/gui/groupchat_config.ui:270 gajim/plugins/gui.py:312
+#: gajim/data/gui/groupchat_config.ui:270
+#: gajim/data/gui/groupchat_info_scrolled.ui:210 gajim/plugins/gui.py:324
 msgid "Configuration"
 msgstr "Configuration"
 
@@ -7149,7 +7328,7 @@ msgid "Start _Chat"
 msgstr "Commencer une _discussion"
 
 #: gajim/data/gui/contact_context_menu.ui:20
-#: gajim/data/gui/systray_context_menu.ui:36
+#: gajim/data/gui/systray_context_menu.ui:29
 msgid "Send Single _Message..."
 msgstr "Envoyer un _message simple..."
 
@@ -7167,7 +7346,7 @@ msgstr "E_xécuter une commande…"
 
 #: gajim/data/gui/contact_context_menu.ui:67
 msgid "M_anage Contact"
-msgstr "_Gérer le Contact"
+msgstr "_Gérer le contact"
 
 #: gajim/data/gui/contact_context_menu.ui:77
 msgid "_Rename..."
@@ -7206,8 +7385,34 @@ msgid "_Ignore"
 msgstr "_Ignorer"
 
 #: gajim/data/gui/contact_context_menu.ui:174
-msgid "_Add to Roster..."
-msgstr "_Ajouter à la liste de contacts..."
+#, fuzzy
+msgid "_Add to Contact List..."
+msgstr "_Ajouter un contact..."
+
+#: gajim/data/gui/advanced_configuration.ui:39
+msgid "You should restart Gajim for some changes to take effect"
+msgstr ""
+"Vous devriez redémarrer Gajim pour prendre en compte certaines de vos "
+"modifications"
+
+#: gajim/data/gui/advanced_configuration.ui:71
+msgid "_Filter"
+msgstr "_Filtre"
+
+#: gajim/data/gui/advanced_configuration.ui:88
+#, fuzzy
+msgid "Type to search for values..."
+msgstr "Entrez le sujet ici…"
+
+#: gajim/data/gui/advanced_configuration.ui:180
+#, fuzzy
+msgid "_Reset Value"
+msgstr "_Réinitialiser aux valeurs par défaut"
+
+#: gajim/data/gui/advanced_configuration.ui:185
+#, fuzzy
+msgid "Resets value to default"
+msgstr "_Réinitialiser aux valeurs par défaut"
 
 #: gajim/data/gui/account_creation_wizard_window.ui:43
 msgid "Gajim: Account Creation Wizard"
@@ -7216,10 +7421,10 @@ msgstr "Gajim : Assistant de création de compte"
 #: gajim/data/gui/account_creation_wizard_window.ui:70
 msgid ""
 "You need to have an account in order to connect\n"
-"to the Jabber network."
+"to the XMPP network."
 msgstr ""
 "Vous devez avoir un compte pour vous connecter\n"
-"au réseau Jabber."
+"au réseau XMPP."
 
 #: gajim/data/gui/account_creation_wizard_window.ui:95
 msgid "I already have an account I want to _use"
@@ -7238,8 +7443,8 @@ msgid "<b>Please fill in the data for your existing account</b>"
 msgstr "<b>Remplissez les informations pour votre compte</b>"
 
 #: gajim/data/gui/account_creation_wizard_window.ui:187
-msgid "_Jabber ID:"
-msgstr "Identifiant _Jabber :"
+msgid "_XMPP Address:"
+msgstr "Adresse XMPP :"
 
 #: gajim/data/gui/account_creation_wizard_window.ui:239
 #: gajim/data/gui/account_creation_wizard_window.ui:394
@@ -7327,9 +7532,9 @@ msgid "Privacy Lists:"
 msgstr "Listes privées :"
 
 #: gajim/data/gui/service_discovery_window.ui:111
-#, fuzzy
+#: gajim/data/gui/groupchat_creation.ui:227
 msgid "_Address"
-msgstr "_Adresse :"
+msgstr "_Adresse"
 
 #: gajim/data/gui/service_discovery_window.ui:152
 #, fuzzy
@@ -7344,11 +7549,6 @@ msgstr "Synchroniser : choisissez des contacts"
 msgid "Select the contacts you want to synchronise"
 msgstr "Sélectionnez les contacts que vous voulez synchroniser"
 
-#: gajim/data/gui/groupchat_invitation_received.ui:42
-#, fuzzy
-msgid "Group Chat Invitation"
-msgstr "Invitation à un salon"
-
 #: gajim/data/gui/groupchat_invitation_received.ui:111
 msgid "Message..."
 msgstr "Message…"
@@ -7394,11 +7594,10 @@ msgid "<b><big>Incoming call</big></b>"
 msgstr "<b><big>Appel entrant</big></b>"
 
 #: gajim/data/gui/add_new_contact_window.ui:84
-msgid "_Jabber ID"
-msgstr "Identifiant _Jabber"
+msgid "_XMPP Address"
+msgstr "Adresse XMPP"
 
 #: gajim/data/gui/add_new_contact_window.ui:100
-#: gajim/data/gui/manage_bookmarks_window.ui:192
 msgid "_Nickname"
 msgstr "_Surnom"
 
@@ -7468,7 +7667,7 @@ msgstr "<b>Humeur :</b>"
 msgid "<b>Message:</b>"
 msgstr "<b>Message :</b>"
 
-#: gajim/data/gui/plugins_window.ui:10 gajim/data/gui/application_menu.ui:90
+#: gajim/data/gui/plugins_window.ui:10 gajim/data/gui/application_menu.ui:87
 msgid "Plugins"
 msgstr "Plugins"
 
@@ -7570,10 +7769,6 @@ msgstr "Permettre"
 msgid "Deny"
 msgstr "Refuser"
 
-#: gajim/data/gui/privacy_list_window.ui:317
-msgid "JabberID"
-msgstr "Identifiant Jabber :"
-
 #: gajim/data/gui/privacy_list_window.ui:358
 msgid "all in the group"
 msgstr "tous ceux dans le groupe"
@@ -7614,7 +7809,7 @@ msgstr "Ordre :"
 msgid "Manage sounds"
 msgstr "Gérer les sons"
 
-#: gajim/data/gui/manage_sounds_window.ui:55 gajim/plugins/gui.py:100
+#: gajim/data/gui/manage_sounds_window.ui:55 gajim/plugins/gui.py:101
 msgid "Active"
 msgstr "Actif"
 
@@ -7636,7 +7831,7 @@ msgstr "Jouer les sons"
 
 #: gajim/data/gui/remove_account_window.ui:25
 msgid "What do you want to do?"
-msgstr "Que voulez vous faire ?"
+msgstr "Que voulez vous faire ?"
 
 #: gajim/data/gui/remove_account_window.ui:63
 msgid "Remove account _only from Gajim"
@@ -7650,30 +7845,111 @@ msgstr "Supprimer le compte de Gajim et du _serveur"
 msgid "_Personal Events"
 msgstr "Évènements P_ersonnels"
 
-#: gajim/data/gui/account_context_menu.ui:35
-#: gajim/data/gui/systray_context_menu.ui:28
-msgid "Join _Group Chat"
-msgstr "Rejoindre un _salon de discussion"
-
-#: gajim/data/gui/account_context_menu.ui:49
+#: gajim/data/gui/account_context_menu.ui:41
 msgid "_Add Contact..."
 msgstr "_Ajouter un contact..."
 
-#: gajim/data/gui/account_context_menu.ui:57
+#: gajim/data/gui/account_context_menu.ui:49
 msgid "_Discover Services"
 msgstr "_Découvrir les services"
 
-#: gajim/data/gui/account_context_menu.ui:65
+#: gajim/data/gui/account_context_menu.ui:57
 msgid "_Execute Command..."
 msgstr "_Exécuter une commande..."
 
+#: gajim/data/gui/account_context_menu.ui:65
+#, fuzzy
+msgid "_View Certificate"
+msgstr "Voir le certificat…"
+
+#: gajim/data/gui/manage_proxies.ui:12
+#, fuzzy
+msgctxt "proxy configuration"
+msgid "HTTP Connect"
+msgstr "Connexion HTTP"
+
+#: gajim/data/gui/manage_proxies.ui:15
+#, fuzzy
+msgctxt "proxy configuration"
+msgid "SOCKS5"
+msgstr "SOCKS5"
+
+#: gajim/data/gui/manage_proxies.ui:18
+#, fuzzy
+msgctxt "proxy configuration"
+msgid "BOSH"
+msgstr "BOSH"
+
+#: gajim/data/gui/manage_proxies.ui:68
+msgid "Add Proxy"
+msgstr "Ajouter un serveur mandataire"
+
+#: gajim/data/gui/manage_proxies.ui:82
+msgid "Remove Proxy"
+msgstr "Supprimer un serveur mandataire"
+
+#: gajim/data/gui/manage_proxies.ui:134
+msgid "Pass_word"
+msgstr "_Mot de passe"
+
+#: gajim/data/gui/manage_proxies.ui:159
+msgid "Use proxy auth_entication"
+msgstr "Utiliser l'auth_entification"
+
+#: gajim/data/gui/manage_proxies.ui:179
+msgid "_Username"
+msgstr "_Nom d'utilisateur"
+
+#: gajim/data/gui/manage_proxies.ui:209
+#, fuzzy
+msgid "_Port"
+msgstr "_Port :"
+
+#: gajim/data/gui/manage_proxies.ui:226
+msgid "example.org"
+msgstr "exemple.org"
+
+#: gajim/data/gui/manage_proxies.ui:240
+#, fuzzy
+msgid "_Host"
+msgstr "Nom d'_Hôte :"
+
+#: gajim/data/gui/manage_proxies.ui:254
+msgid "Use HTTP prox_y"
+msgstr "Utiliser un _serveur mandataire HTTP"
+
+#: gajim/data/gui/manage_proxies.ui:275
+msgid "https://example.org/http-bind/"
+msgstr "https://example.org/http-bind/"
+
+#: gajim/data/gui/manage_proxies.ui:291
+msgid "_BOSH URL"
+msgstr "_BOSH URL"
+
+#: gajim/data/gui/manage_proxies.ui:309 gajim/gtk/adhoc.py:322
+msgid "Settings"
+msgstr "Paramètres"
+
+#: gajim/data/gui/manage_proxies.ui:344
+msgid "_Type"
+msgstr "_Type"
+
+#: gajim/data/gui/manage_proxies.ui:361
+#: gajim/data/gui/groupchat_creation.ui:105
+msgid "_Name"
+msgstr "_Nom"
+
+#: gajim/data/gui/manage_proxies.ui:391 gajim/gtk/accounts.py:742
+msgid "Proxy"
+msgstr "Serveur mandataire"
+
 #: gajim/data/gui/application_menu.ui:8
 msgid "View"
 msgstr "Affichage"
 
 #: gajim/data/gui/application_menu.ui:11
-msgid "Show Roster"
-msgstr "Montrer la liste de contacts"
+msgid "Show Contact List"
+msgstr "Afficher la liste des contacts"
 
 #: gajim/data/gui/application_menu.ui:16
 msgid "Show Offline Contacts"
@@ -7708,21 +7984,22 @@ msgstr "Raccourcis clavier"
 msgid "Features"
 msgstr "Fonctionnalités"
 
-#: gajim/data/gui/application_menu.ui:81
-msgid "Bookmarks"
-msgstr "Marques-pages"
+#: gajim/data/gui/application_menu.ui:77
+#: gajim/data/gui/groupchat_creation.ui:81 gajim/gtk/groupchat_creation.py:45
+msgid "Create Group Chat"
+msgstr "Créer un groupe de discussion"
 
-#: gajim/data/gui/application_menu.ui:94 gajim/data/gui/shortcuts_window.ui:189
-#: gajim/gtk/preferences.py:59
+#: gajim/data/gui/application_menu.ui:91 gajim/data/gui/shortcuts_window.ui:189
+#: gajim/gtk/preferences.py:58
 msgid "Preferences"
 msgstr "Préférences"
 
-#: gajim/data/gui/application_menu.ui:99
+#: gajim/data/gui/application_menu.ui:96
 msgid "Quit"
 msgstr "Quitter"
 
 #: gajim/data/gui/httpupload_progress_dialog.ui:110
-#: gajim/gtk/filetransfer.py:121
+#: gajim/gtk/filetransfer.py:120
 msgid "Progress"
 msgstr "Progression"
 
@@ -7733,54 +8010,40 @@ msgstr "vitesse"
 
 #: gajim/data/gui/httpupload_progress_dialog.ui:140
 msgid "Time remaining"
-msgstr ""
+msgstr "Temps restant"
 
 #: gajim/data/gui/httpupload_progress_dialog.ui:172
-#, fuzzy
 msgid "_Cancel Upload"
-msgstr "_Annuler l'envoi"
-
-#: gajim/data/gui/manage_bookmarks_window.ui:13
-msgid "Group Chat Bookmarks"
-msgstr "Marque-pages des salons de discussion"
-
-#: gajim/data/gui/manage_bookmarks_window.ui:68
-#, fuzzy
-msgid "Add Bookmark"
-msgstr "Marque-page"
-
-#: gajim/data/gui/manage_bookmarks_window.ui:82
-#, fuzzy
-msgid "Remove Bookmark"
-msgstr "Marque-page"
+msgstr "Annuler l’envoi"
 
-#: gajim/data/gui/manage_bookmarks_window.ui:126
-msgid "N_ame"
-msgstr "N_om"
-
-#: gajim/data/gui/manage_bookmarks_window.ui:145
-msgid "Bookmark Name"
-msgstr "Nom du marque-page"
+#: gajim/data/gui/groupchat_creation.ui:27
+msgid "Public or Private?"
+msgstr ""
 
-#: gajim/data/gui/manage_bookmarks_window.ui:160
-msgid "_Server"
-msgstr "_Serveur"
+#: 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 ""
 
-#: gajim/data/gui/manage_bookmarks_window.ui:223
-msgid "Roo_m"
-msgstr "_Salon"
+#: gajim/data/gui/groupchat_creation.ui:58
+msgid "<b>Public:</b> Anyone who knows the address can join."
+msgstr ""
 
-#: gajim/data/gui/manage_bookmarks_window.ui:253
-msgid "_Password"
-msgstr "Mot de _passe"
+# ccount). Description column
+#: gajim/data/gui/groupchat_creation.ui:122
+#, fuzzy
+msgid "_Description"
+msgstr "Description"
 
-#: gajim/data/gui/manage_bookmarks_window.ui:299
-msgid "Join chat when connected"
-msgstr "Rejoindre le salon à la connexion"
+#: gajim/data/gui/groupchat_creation.ui:164
+msgid "_Public"
+msgstr ""
 
-#: gajim/data/gui/manage_bookmarks_window.ui:307
-msgid "_Join Automatically"
-msgstr "_Rejoindre automatiquement"
+#: gajim/data/gui/groupchat_creation.ui:278
+#, fuzzy
+msgid "_Account"
+msgstr "_Comptes"
 
 #: gajim/data/gui/exception_dialog.ui:49
 msgid "Sorry, that should not have happened"
@@ -7824,6 +8087,28 @@ msgstr "Autoriser le contact à savoir quand vous êtes connecté"
 msgid "Presets"
 msgstr "Préréglages"
 
+#: gajim/data/gui/groupchat_info_scrolled.ui:32
+msgid "Address"
+msgstr "Adresse"
+
+#: gajim/data/gui/groupchat_info_scrolled.ui:64
+msgid "Topic"
+msgstr "Sujet"
+
+#: gajim/data/gui/groupchat_info_scrolled.ui:80
+#, fuzzy
+msgid "Author"
+msgstr "Auteurs"
+
+#: gajim/data/gui/groupchat_info_scrolled.ui:182
+msgid "Discussion Logs"
+msgstr ""
+
+#: gajim/data/gui/groupchat_info_scrolled.ui:260
+#, fuzzy
+msgid "Group Chat Language"
+msgstr "Configuration du salon de discussion"
+
 #: gajim/data/gui/emoji_chooser.ui:98
 msgid "No Results Found"
 msgstr "Aucun résultat trouvé"
@@ -7833,25 +8118,36 @@ msgid "Invite Friends!"
 msgstr "Inviter des Amis !"
 
 #: gajim/data/gui/chat_to_muc_window.ui:39
+#, fuzzy
 msgid ""
-"You are now entering a groupchat.\n"
+"You are now entering a group chat.\n"
 "Select the contacts you want to invite"
 msgstr ""
 "Vous allez entrer dans un salon de discussion.\n"
 "Sélectionnez les contacts que vous voulez inviter"
 
 #: gajim/data/gui/chat_to_muc_window.ui:112
-msgid "Please select a MUC server."
+#, fuzzy
+msgid "Please select a group chat server."
 msgstr "Veuillez choisir un serveur de Salons de Discussion."
 
 #: gajim/data/gui/chat_to_muc_window.ui:141
-msgid "MUC server"
-msgstr "Serveur de salon"
+#, fuzzy
+msgid "Group chat server"
+msgstr "Support des salons de discussion"
 
 #: gajim/data/gui/chat_to_muc_window.ui:176
 msgid "In_vite"
 msgstr "In_viter"
 
+#: gajim/data/gui/bookmarks.ui:176
+msgid "Autojoin"
+msgstr "Rejoindre automatiquement"
+
+#: gajim/data/gui/bookmarks.ui:211
+msgid "_Apply"
+msgstr ""
+
 #: gajim/data/gui/history_manager.ui:11
 msgid "_Export"
 msgstr "_Exporter"
@@ -7866,12 +8162,13 @@ msgid "Gajim History Logs Manager"
 msgstr "Gestionnaire d'historique de Gajim"
 
 #: gajim/data/gui/history_manager.ui:108
+#, fuzzy
 msgid ""
-"This log manager is not intended for log viewing. If you are looking for "
-"such functionality, use the history window instead.\n"
+"This history manager is not intended for viewing chat history. If you are "
+"looking for such functionality, please use the history window instead.\n"
 "\n"
-"Use this program to delete or export logs. You can select logs from the left "
-"and/or search database from below."
+"You can use this program to delete or export history. Either select logs "
+"from the left or search the database."
 msgstr ""
 "Ce gestionnaire d'archives n'est pas fait pour le visionnage des archives. "
 "Si vous cherchez cette fonctionnalité, utilise la fenêtre d'historiques à la "
@@ -7921,7 +8218,8 @@ msgid "Select an emoji"
 msgstr "Sélectionnez un émoji"
 
 #: gajim/data/gui/shortcuts_window.ui:38
-msgid "Complete a command or a nick"
+#, fuzzy
+msgid "Complete a command or a nickname"
 msgstr "Complète une commande ou un surnom"
 
 #: gajim/data/gui/shortcuts_window.ui:45
@@ -7956,7 +8254,7 @@ msgstr "Défilement haut"
 msgid "Scroll down"
 msgstr "Défilement bas"
 
-#: gajim/data/gui/shortcuts_window.ui:100 gajim/gtk/xml_console.py:72
+#: gajim/data/gui/shortcuts_window.ui:100 gajim/gtk/xml_console.py:69
 msgid "Clear"
 msgstr "Effacer"
 
@@ -7997,8 +8295,9 @@ msgid "Close chat"
 msgstr "Clore la discussion"
 
 #: gajim/data/gui/shortcuts_window.ui:173
-msgid "Roster Shortcuts"
-msgstr "Raccourcis liste de contacts"
+#, fuzzy
+msgid "Contact List Shortcuts"
+msgstr "Raccourcis de la fenêtre de discussion"
 
 #: gajim/data/gui/shortcuts_window.ui:196
 msgid "File transfers"
@@ -8025,7 +8324,8 @@ msgid "Show only active contacts"
 msgstr "Afficher seulement les contacts actifs"
 
 #: gajim/data/gui/shortcuts_window.ui:251
-msgid "Enable roster filtering"
+#, fuzzy
+msgid "Enable contact list filtering"
 msgstr "Activer le filtrage de la liste"
 
 #: gajim/data/gui/shortcuts_window.ui:259
@@ -8065,11 +8365,13 @@ msgid "Search selected day only"
 msgstr "Chercher uniquement à la date sélectionnée"
 
 #: gajim/data/gui/history_window.ui:317
-msgid "Record history for this chat"
+#, fuzzy
+msgid "Store history for this chat"
 msgstr "Enregistrer l'historique pour cette discussion"
 
 #: gajim/data/gui/history_window.ui:332
-msgid "Record History"
+#, fuzzy
+msgid "Store History"
 msgstr "Enregistrer l'historique"
 
 #: gajim/data/gui/history_window.ui:350
@@ -8088,8 +8390,8 @@ msgstr "Rédiger un article"
 msgid "Fill in the form."
 msgstr "Remplissez le formulaire."
 
-#: gajim/data/gui/data_form_window.ui:229
-msgid "Room Configuration"
+#: gajim/data/gui/data_form_window.ui:229 gajim/gtk/groupchat_config.py:41
+msgid "Group Chat Configuration"
 msgstr "Configuration du salon de discussion"
 
 #: gajim/data/gui/roster_item_exchange_window.ui:39
@@ -8111,15 +8413,15 @@ msgstr "É_tat"
 msgid "_Start Chat..."
 msgstr "Commencer une _discussion..."
 
-#: gajim/data/gui/systray_context_menu.ui:50
+#: gajim/data/gui/systray_context_menu.ui:43
 msgid "Show All Pending _Events"
 msgstr "Montrer les _événements en attente"
 
-#: gajim/data/gui/systray_context_menu.ui:59
+#: gajim/data/gui/systray_context_menu.ui:52
 msgid "Mute Sounds"
 msgstr "Désactiver les sons"
 
-#: gajim/data/gui/systray_context_menu.ui:75
+#: gajim/data/gui/systray_context_menu.ui:68
 msgid "_Preferences"
 msgstr "_Préférences"
 
@@ -8146,9 +8448,8 @@ msgid "_Message"
 msgstr "_Message"
 
 #: gajim/data/gui/single_message_window.ui:153
-#, fuzzy
 msgid "Characters typed: 0"
-msgstr "Caractère non-autorisé"
+msgstr "Caractères saisis : 0"
 
 #: gajim/data/gui/single_message_window.ui:198
 #, fuzzy
@@ -8208,35 +8509,35 @@ msgstr "Éxecute une expression dans un shell, montre la sortie"
 msgid "Execute expression inside a shell, send output"
 msgstr "Éxecute une expression dans un shell, envoie la sortie"
 
-#: gajim/command_system/implementation/standard.py:45
+#: gajim/command_system/implementation/standard.py:47
 msgid ""
 "Show help on a given command or a list of available commands if -a is given"
 msgstr ""
 "Montre l'aide sur une commande donnée ou une listre des commandes possibles "
 "si -a est ajouté"
 
-#: gajim/command_system/implementation/standard.py:73
+#: gajim/command_system/implementation/standard.py:75
 msgid "Send a message to the contact"
 msgstr "Envoie un message a un contact"
 
-#: gajim/command_system/implementation/standard.py:78
+#: gajim/command_system/implementation/standard.py:80
 msgid "Send action (in the third person) to the current chat"
 msgstr "Envoie une action (à la troisième personne) à la conversation actuelle"
 
-#: gajim/command_system/implementation/standard.py:83
+#: gajim/command_system/implementation/standard.py:85
 msgid "Show logged messages which mention given text"
 msgstr "Montre les messages enregistrés qui mentionnent le texte donné"
 
-#: gajim/command_system/implementation/standard.py:88
+#: gajim/command_system/implementation/standard.py:90
 #, python-format
 msgid "%s: Nothing found"
 msgstr "%s : rien de trouvé"
 
-#: gajim/command_system/implementation/standard.py:94
+#: gajim/command_system/implementation/standard.py:96
 msgid "Limit must be an integer"
 msgstr "La limite doit être un entier"
 
-#: gajim/command_system/implementation/standard.py:118
+#: gajim/command_system/implementation/standard.py:120
 msgid ""
 "\n"
 "    Set the current status\n"
@@ -8252,119 +8553,126 @@ msgstr ""
 "    online, away, chat, xa, dnd.\n"
 "    "
 
-#: gajim/command_system/implementation/standard.py:136
+#: gajim/command_system/implementation/standard.py:138
 msgid "Set the current status to away"
 msgstr "Fixe l'état actuel à away"
 
-#: gajim/command_system/implementation/standard.py:150
+#: gajim/command_system/implementation/standard.py:152
 msgid "Set the current status to online"
 msgstr "Fixe l'état actuel à online"
 
-#: gajim/command_system/implementation/standard.py:153
+#: gajim/command_system/implementation/standard.py:155
 msgid "Available"
 msgstr "Disponible"
 
-#: gajim/command_system/implementation/standard.py:173
-#: gajim/command_system/implementation/standard.py:250
+#: gajim/command_system/implementation/standard.py:175
+#: gajim/command_system/implementation/standard.py:252
 msgid "Clear the text window"
 msgstr "Nettoie la fenêtre de conversation"
 
-#: gajim/command_system/implementation/standard.py:178
-#: gajim/command_system/implementation/standard.py:397
+#: gajim/command_system/implementation/standard.py:180
+#: gajim/command_system/implementation/standard.py:401
 msgid "Send a ping to the contact"
 msgstr "Envoie un ping au contact"
 
-#: gajim/command_system/implementation/standard.py:181
-#: gajim/command_system/implementation/standard.py:400
+#: gajim/command_system/implementation/standard.py:183
+#: gajim/command_system/implementation/standard.py:404
 msgid "Command is not supported for zeroconf accounts"
 msgstr "Commande non prise en charge pour les comptes zeroconf"
 
-#: gajim/command_system/implementation/standard.py:185
-msgid "Send DTMF sequence through an open audio session"
+#: gajim/command_system/implementation/standard.py:187
+#, fuzzy
+msgid "Send DTMF sequence through an open voice chat"
 msgstr "Envoie une séquence DTMF dans une session audio ouverte"
 
-#: gajim/command_system/implementation/standard.py:188
-msgid "No open audio sessions with the contact"
+#: gajim/command_system/implementation/standard.py:190
+#, fuzzy
+msgid "No open voice chats with the contact"
 msgstr "Pas de session audio ouverte avec le contact"
 
-#: gajim/command_system/implementation/standard.py:191
+#: gajim/command_system/implementation/standard.py:193
 #, python-format
 msgid "%s is not a valid tone"
 msgstr "%s n'est pas un ton valide"
 
-#: gajim/command_system/implementation/standard.py:198
-msgid "Toggle audio session"
-msgstr "Démarrer/arrêter une session audio"
+#: gajim/command_system/implementation/standard.py:200
+msgid "Toggle Voice Chat"
+msgstr ""
 
-#: gajim/command_system/implementation/standard.py:201
-msgid "Audio sessions are not available"
-msgstr "Les sessions audio ne sont pas disponibles"
+#: gajim/command_system/implementation/standard.py:203
+msgid "Voice chats are not available"
+msgstr "Les sessions vidéo ne sont pas disponibles"
 
-#: gajim/command_system/implementation/standard.py:208
-msgid "Toggle video session"
+#: gajim/command_system/implementation/standard.py:210
+#, fuzzy
+msgid "Toggle Video Chat"
 msgstr "Démarrer/arrêter une session vidéo"
 
-#: gajim/command_system/implementation/standard.py:211
-msgid "Video sessions are not available"
-msgstr "Les sessions video ne sont pas disponibles"
+#: gajim/command_system/implementation/standard.py:213
+msgid "Video chats are not available"
+msgstr "Les sessions vidéo ne sont pas disponibles"
 
-#: gajim/command_system/implementation/standard.py:218
+#: gajim/command_system/implementation/standard.py:220
 msgid "Send a message to the contact that will attract their attention"
 msgstr "Envoie un message à ce contact qui attirera son attention"
 
-#: gajim/command_system/implementation/standard.py:255
+#: gajim/command_system/implementation/standard.py:257
 msgid "Change your nickname in a group chat"
 msgstr "Changer votre surnom dans un salon de discussion"
 
-#: gajim/command_system/implementation/standard.py:260 gajim/gtk/dialogs.py:674
-#: gajim/gtk/bookmarks.py:272
+#: gajim/command_system/implementation/standard.py:262
 msgid "Invalid nickname"
 msgstr "Nom d'utilisateur invalide"
 
-#: gajim/command_system/implementation/standard.py:267
-msgid "Open a private chat window with a specified occupant"
+#: gajim/command_system/implementation/standard.py:269
+#, fuzzy
+msgid "Open a private chat window with a specified participant"
 msgstr "Ouvre une fenêtre de conversation privée avec l'occupant⋅e spécifié⋅e"
 
-#: gajim/command_system/implementation/standard.py:273
-#: gajim/command_system/implementation/standard.py:282
-#: gajim/command_system/implementation/standard.py:332
-#: gajim/command_system/implementation/standard.py:345
-#: gajim/command_system/implementation/standard.py:357
+#: gajim/command_system/implementation/standard.py:275
+#: gajim/command_system/implementation/standard.py:284
+#: gajim/command_system/implementation/standard.py:336
+#: gajim/command_system/implementation/standard.py:349
+#: gajim/command_system/implementation/standard.py:361
 msgid "Nickname not found"
 msgstr "Surnom introuvable"
 
-#: gajim/command_system/implementation/standard.py:276
+#: gajim/command_system/implementation/standard.py:278
+#, fuzzy
 msgid ""
-"Open a private chat window with a specified occupant and send him a message"
+"Open a private chat window with a specified participant and send him a "
+"message"
 msgstr ""
 "Ouvre une fenêtre de conversation privée avec l'occupant⋅e spécifié⋅e et lui "
 "envoyer un message"
 
-#: gajim/command_system/implementation/standard.py:285
+#: gajim/command_system/implementation/standard.py:287
 msgid "Display or change a group chat topic"
 msgstr "Affiche ou modifie le sujet d'un salon de discussion"
 
-#: gajim/command_system/implementation/standard.py:294
-msgid "Invite a user to a room for a reason"
+#: gajim/command_system/implementation/standard.py:296
+#, fuzzy
+msgid "Invite a user to a group chat for a reason"
 msgstr "Invite un contact à un salon de discussion pour une raison"
 
-#: gajim/command_system/implementation/standard.py:297
+#: gajim/command_system/implementation/standard.py:299
 #, python-format
 msgid "Invited %(jid)s to %(room_jid)s"
 msgstr "%(jid)s invité à %(room_jid)s"
 
-#: gajim/command_system/implementation/standard.py:301
-msgid "Join a group chat given by a JID"
+#: gajim/command_system/implementation/standard.py:303
+#, fuzzy
+msgid "Join a group chat given by an XMPP Address"
 msgstr "Rejoindre un salon de discussion en donnant son JID"
 
-#: gajim/command_system/implementation/standard.py:309
+#: gajim/command_system/implementation/standard.py:313
 msgid ""
-"Leave the groupchat, optionally giving a reason, and close tab or window"
+"Leave the group chat, optionally giving a reason, and close tab or window"
 msgstr ""
-"Quitte le salon de discussion, éventuellement en donnant une raison, et "
-"ferme l'onglet ou la fneêtre"
+"Quitte le salon de discussion, éventuellement en donnant une raison et ferme "
+"l’onglet ou la fenêtre"
 
-#: gajim/command_system/implementation/standard.py:314
+#: gajim/command_system/implementation/standard.py:318
 msgid ""
 "\n"
 "    Ban user by a nick or a JID from a groupchat\n"
@@ -8379,13 +8687,15 @@ msgstr ""
 "    Si le surnom donné n'existe pas, il sera traité comme un JID.\n"
 "    "
 
-#: gajim/command_system/implementation/standard.py:329
-msgid "Kick user by a nick from a groupchat"
+#: gajim/command_system/implementation/standard.py:333
+#, fuzzy
+msgid "Kick user by a nick from a group chat"
 msgstr "Éjecter un utilisateur par son surnom d'un salon de discussion"
 
-#: gajim/command_system/implementation/standard.py:338
+#: gajim/command_system/implementation/standard.py:342
+#, fuzzy
 msgid ""
-"Set occupant role in group chat.\n"
+"Set participant role in group chat.\n"
 "    Role can be given as one of the following values:\n"
 "    moderator, participant, visitor, none"
 msgstr ""
@@ -8393,13 +8703,14 @@ msgstr ""
 "    Le rôle peut prendre l'une des valeurs suivantes :\n"
 "    moderator, participant, visitor, none"
 
-#: gajim/command_system/implementation/standard.py:343
+#: gajim/command_system/implementation/standard.py:347
 msgid "Invalid role given"
 msgstr "Rôle non valide fourni"
 
-#: gajim/command_system/implementation/standard.py:350
+#: gajim/command_system/implementation/standard.py:354
+#, fuzzy
 msgid ""
-"Set occupant affiliation in group chat.\n"
+"Set participant affiliation in group chat.\n"
 "    Affiliation can be given as one of the following values:\n"
 "    owner, admin, member, outcast, none"
 msgstr ""
@@ -8407,21 +8718,23 @@ msgstr ""
 "    Le rôle peut prendre l'une des valeurs suivantes :\n"
 "    owner, admin, member, outcast, none"
 
-#: gajim/command_system/implementation/standard.py:355
+#: gajim/command_system/implementation/standard.py:359
 msgid "Invalid affiliation given"
 msgstr "Affiliation non valide fournie"
 
-#: gajim/command_system/implementation/standard.py:365
-msgid "Display names of all group chat occupants"
-msgstr "Affiche les noms des occupants du salon"
+#: gajim/command_system/implementation/standard.py:369
+msgid "Display names of all group chat participants"
+msgstr "Afficher les noms les tous les participants du salon"
 
-#: gajim/command_system/implementation/standard.py:387
-msgid "Forbid an occupant to send you public or private messages"
+#: gajim/command_system/implementation/standard.py:391
+#, fuzzy
+msgid "Forbid a participant to send you public or private messages"
 msgstr ""
 "Interdire un⋅e occupant⋅e de vous envoyer des messages publics ou privés"
 
-#: gajim/command_system/implementation/standard.py:392
-msgid "Allow an occupant to send you public or private messages"
+#: gajim/command_system/implementation/standard.py:396
+#, fuzzy
+msgid "Allow a participant to send you public or private messages"
 msgstr ""
 "Autoriser un⋅e occupant⋅e de vous envoyer des messages publics ou privés"
 
@@ -8433,199 +8746,332 @@ msgstr "Erreur lors de l’exécution de la commande !"
 msgid "The same as using a doc-string, except it supports translation"
 msgstr "Pareil qu'utiliser une doc-string, mais supporte la traduction"
 
-#: gajim/gtk/filetransfer.py:91
+#: gajim/gtk/groupchat_info.py:36
+#, fuzzy
+msgid "?Group chat feature:Archiving"
+msgstr "Invitation à un salon"
+
+#: gajim/gtk/groupchat_info.py:37
+#, fuzzy
+msgid "Messages are archived on the server"
+msgstr "Cette session sera archivée sur le serveur"
+
+#: gajim/gtk/groupchat_info.py:40
+#, fuzzy
+msgid "?Group chat feature:Persistent"
+msgstr "Support des salons de discussion"
+
+#: gajim/gtk/groupchat_info.py:41
+msgid "This group chat persists even if there are no participants"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:45
+#, fuzzy
+msgid "?Group chat feature:Temporary"
+msgstr "Aucun"
+
+#: gajim/gtk/groupchat_info.py:46
+msgid "This group chat will be destroyed once the last participant left"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:50
+#, fuzzy
+msgid "?Group chat feature:Moderated"
+msgstr "Aucun"
+
+#: gajim/gtk/groupchat_info.py:51
+msgid ""
+"Participants entering this group chat need to request permission to send "
+"messages"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:55
+#, fuzzy
+msgid "?Group chat feature:Not Moderated"
+msgstr "Support des salons de discussion"
+
+#: gajim/gtk/groupchat_info.py:56
+msgid "Participants entering this group chat are allowed to send messages"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:60
+#, fuzzy
+msgid "?Group chat feature:Open"
+msgstr "Aucun"
+
+#: gajim/gtk/groupchat_info.py:61
+msgid "Anyone can join this group chat"
+msgstr "N’importe qui pourra rejoindre ce salon de discussion"
+
+#: gajim/gtk/groupchat_info.py:64
+#, fuzzy
+msgid "?Group chat feature:Members Only"
+msgstr "Message d'un salon mis en surbrillance :"
+
+#: gajim/gtk/groupchat_info.py:65
+#, 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:69
+#, fuzzy
+msgid "?Group chat feature:Public"
+msgstr "Message d'un salon mis en surbrillance :"
+
+#: gajim/gtk/groupchat_info.py:70
+msgid "Group chat can be found via search"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:73
+#, fuzzy
+msgid "?Group chat feature:Hidden"
+msgstr "Aucun"
+
+#: gajim/gtk/groupchat_info.py:74
+#, fuzzy
+msgid "This group chat can not be found via search"
+msgstr "Ceci ne peut pas être annulé."
+
+#: gajim/gtk/groupchat_info.py:77
+#, fuzzy
+msgid "?Group chat feature:Not Anonymous"
+msgstr "Support des salons de discussion"
+
+#: gajim/gtk/groupchat_info.py:78
+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:82
+#, fuzzy
+msgid "?Group chat feature:Semi-Anonymous"
+msgstr "Message d'un salon mis en surbrillance :"
+
+#: gajim/gtk/groupchat_info.py:83
+msgid "Only moderators can see your XMPP address"
+msgstr "Seuls les modérateurs peuvent voir l’adresse XMPP"
+
+#: gajim/gtk/groupchat_info.py:86
+#, fuzzy
+msgid "?Group chat feature:Password Required"
+msgstr "Support des salons de discussion"
+
+#: gajim/gtk/groupchat_info.py:87
+msgid "This group chat does require a password upon entry"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:91
+#, fuzzy
+msgid "?Group chat feature:No Password Required"
+msgstr "Support des salons de discussion"
+
+#: gajim/gtk/groupchat_info.py:92
+msgid "This group chat does not require a password upon entry"
+msgstr ""
+
+#: gajim/gtk/filetransfer.py:90
 msgid "File"
 msgstr "Fichier"
 
-#: gajim/gtk/filetransfer.py:108
+#: gajim/gtk/filetransfer.py:107
 msgid "Time"
 msgstr "Durée"
 
-#: gajim/gtk/filetransfer.py:228
+#: gajim/gtk/filetransfer.py:227
 #, fuzzy, python-format
 msgid "File name: %s"
 msgstr "Nom du Fichier : %s"
 
-#: gajim/gtk/filetransfer.py:229 gajim/gtk/filetransfer.py:464
+#: gajim/gtk/filetransfer.py:228 gajim/gtk/filetransfer.py:469
 #, python-format
 msgid "Size: %s"
 msgstr "Taille : %s"
 
-#: gajim/gtk/filetransfer.py:239
+#: gajim/gtk/filetransfer.py:238
 #, python-format
 msgid "Sender: %s"
 msgstr "Expéditeur : %s"
 
-#: gajim/gtk/filetransfer.py:240 gajim/gtk/filetransfer.py:744
+#: gajim/gtk/filetransfer.py:239 gajim/gtk/filetransfer.py:749
 #: gajim/gtk/tooltips.py:577
 msgid "Recipient: "
 msgstr "Destinataire : "
 
-#: gajim/gtk/filetransfer.py:251
+#: gajim/gtk/filetransfer.py:250
 #, python-format
 msgid "Saved in: %s"
 msgstr "Enregistré dans : %s"
 
-#: gajim/gtk/filetransfer.py:256
+#: gajim/gtk/filetransfer.py:255
 msgid "File transfer completed"
 msgstr "Transfert de fichier terminé"
 
-#: gajim/gtk/filetransfer.py:276 gajim/gtk/filetransfer.py:285
+#: gajim/gtk/filetransfer.py:275 gajim/gtk/filetransfer.py:284
 #, fuzzy
 msgid "Connection with peer could not be established."
 msgstr "La connexion avec le contact ne peut être établie."
 
-#: gajim/gtk/filetransfer.py:293
+#: gajim/gtk/filetransfer.py:292
 #, python-format
 msgid "Filename: %s"
 msgstr "Nom du Fichier : %s"
 
-#: gajim/gtk/filetransfer.py:294
+#: gajim/gtk/filetransfer.py:293
 #, python-format
 msgid "Recipient: %s"
 msgstr "Destinataire : %s"
 
-#: gajim/gtk/filetransfer.py:296
+#: gajim/gtk/filetransfer.py:295
 #, python-format
 msgid "Error message: %s"
 msgstr "Message d'erreur : %s"
 
-#: gajim/gtk/filetransfer.py:333
-#, fuzzy
-msgid "File transfer error"
-msgstr "Erreur de Transfert de fichier"
-
 #: gajim/gtk/filetransfer.py:334
 #, python-format
 msgid ""
-"The file %(file)s has been received, but it seems to have been damaged along "
-"the way.\n"
+"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 ""
-"Le fichier %(file)s a été reçu, mais il semble avoir été endommagé.\n"
-"Voulez-vous le télécharger de nouveau ?"
+"Le fichier %s a été reçu mais il semble avoir été endommagé lors du "
+"transfert.\n"
+"Voulez-vous le re-télécharger de nouveau ?"
+
+#: gajim/gtk/filetransfer.py:340
+#, fuzzy
+msgid "_Download Again"
+msgstr "_Ne plus me poser la question"
 
-#: gajim/gtk/filetransfer.py:350
+#: gajim/gtk/filetransfer.py:355
 msgid "Gajim can not read this file"
 msgstr "Gajim ne peut pas lire ce fichier"
 
-#: gajim/gtk/filetransfer.py:351
+#: gajim/gtk/filetransfer.py:356
 msgid "Another process is using this file."
 msgstr "Un autre processus utilise ce fichier."
 
-#: gajim/gtk/filetransfer.py:418
+#: gajim/gtk/filetransfer.py:423
 #, fuzzy
 msgid "File Transfer Conflict"
 msgstr "Transfert de fichier terminé"
 
-#: gajim/gtk/filetransfer.py:419
+#: gajim/gtk/filetransfer.py:424
 msgid "This file already exists"
 msgstr "Ce fichier existe déjà"
 
-#: gajim/gtk/filetransfer.py:420
+#: gajim/gtk/filetransfer.py:425
 msgid "Resume download or replace file?"
 msgstr ""
 
-#: gajim/gtk/filetransfer.py:424
+#: gajim/gtk/filetransfer.py:429
 #, fuzzy
 msgid "Replace _File"
 msgstr "Remplacer"
 
-#: gajim/gtk/filetransfer.py:427
+#: gajim/gtk/filetransfer.py:432
 #, fuzzy
 msgid "Resume _Download"
 msgstr "Téléchargement"
 
-#: gajim/gtk/filetransfer.py:437
+#: gajim/gtk/filetransfer.py:442
 #, fuzzy, python-format
 msgid "Directory '%s' is not writable"
 msgstr "Le dossier \"%s\" n'est pas accessible en écriture"
 
-#: gajim/gtk/filetransfer.py:438
-#, fuzzy
+#: gajim/gtk/filetransfer.py:443
 msgid "You do not have permissions to create files in this directory."
-msgstr "Vous n'avez pas les permissions de créer des fichiers dans ce dossier."
+msgstr ""
+"Vous n’avez pas les permissions pour pouvoir créer des fichiers dans ce "
+"dossier."
 
-#: gajim/gtk/filetransfer.py:461
+#: gajim/gtk/filetransfer.py:466
 #, python-format
 msgid "File: %s"
 msgstr "Fichier : %s"
 
-#: gajim/gtk/filetransfer.py:467
+#: gajim/gtk/filetransfer.py:472
 #, python-format
 msgid "Type: %s"
 msgstr "Type : %s"
 
-#: gajim/gtk/filetransfer.py:469
+#: gajim/gtk/filetransfer.py:474
 #, python-format
 msgid "Description: %s"
 msgstr "Description : %s"
 
-#: gajim/gtk/filetransfer.py:480
+#: gajim/gtk/filetransfer.py:485
 #, fuzzy, python-format
 msgid "%s wants to send you a file"
 msgstr "%s souhaite vous envoyer un fichier."
 
-#: gajim/gtk/filetransfer.py:509
+#: gajim/gtk/filetransfer.py:514
 msgid "Checking file…"
 msgstr "Vérification du fichier…"
 
-#: gajim/gtk/filetransfer.py:524
+#: gajim/gtk/filetransfer.py:529
 msgid "File error"
 msgstr "Erreur de fichier"
 
-#: gajim/gtk/filetransfer.py:561
+#: gajim/gtk/filetransfer.py:566
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 
-#: gajim/gtk/filetransfer.py:658
+#: gajim/gtk/filetransfer.py:663
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/s)"
 
-#: gajim/gtk/filetransfer.py:711 gajim/gtk/filetransfer.py:715
+#: gajim/gtk/filetransfer.py:716 gajim/gtk/filetransfer.py:720
 msgid "Invalid File"
 msgstr "Fichier non valide"
 
-#: gajim/gtk/filetransfer.py:711
+#: gajim/gtk/filetransfer.py:716
 msgid "File: "
 msgstr "Fichier : "
 
-#: gajim/gtk/filetransfer.py:716
+#: gajim/gtk/filetransfer.py:721
 msgid "It is not possible to send empty files"
 msgstr "Il n'est pas possible d'envoyer un fichier vide"
 
-#: gajim/gtk/filetransfer.py:742 gajim/gtk/tooltips.py:571
+#: gajim/gtk/filetransfer.py:747 gajim/gtk/tooltips.py:571
 msgid "Sender: "
 msgstr "Expéditeur : "
 
-#: gajim/gtk/filetransfer.py:1038
+#: gajim/gtk/filetransfer.py:1043
 msgid "Choose a File to Send…"
 msgstr "Choisissez un fichier à envoyer…"
 
 #: gajim/gtk/start_chat.py:51
-msgid "Start new Conversation"
+#, fuzzy
+msgid "Start New Conversation"
 msgstr "Démarrer une nouvelle conversation"
 
-#: gajim/gtk/start_chat.py:424
-msgid "New Groupchat"
-msgstr "Nouveau salon de discussion"
+#: gajim/gtk/start_chat.py:260 gajim/gtk/start_chat.py:328
+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:426
-msgid "New Contact"
-msgstr "Nouveau contact"
+#: gajim/gtk/start_chat.py:603 gajim/gtk/groupchat_join.py:38
+msgid "Join Group Chat"
+msgstr "Rejoindre un salon de discussion"
 
-#: gajim/gtk/start_chat.py:588
-#, python-format
-msgid "%s Group chats found"
+#: gajim/gtk/start_chat.py:605 gajim/gtk/add_contact.py:40
+msgid "Add Contact"
+msgstr "Ajouter un contact"
+
+#: gajim/gtk/start_chat.py:746
+#, fuzzy, python-format
+msgid "%s group chats found"
 msgstr "%s salons de discussion trouvés"
 
-#: gajim/gtk/discovery.py:70
+#: gajim/gtk/discovery.py:69
 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:71
+#: gajim/gtk/discovery.py:70
 #, fuzzy
 msgid ""
 "This service could not respond with detailed information.\n"
@@ -8634,32 +9080,33 @@ msgstr ""
 "Ce service n'a pas renvoyé d'informations détaillées.\n"
 "Il est probablement défectueux ou cassé"
 
-#: gajim/gtk/discovery.py:128
+#: gajim/gtk/discovery.py:126
 msgid "Others"
 msgstr "Autres"
 
-#: gajim/gtk/discovery.py:131
-msgid "Conference"
-msgstr "Conférences"
+#: gajim/gtk/discovery.py:129
+#, fuzzy
+msgid "Group Chat"
+msgstr "Salons de discussion"
 
-#: gajim/gtk/discovery.py:519
+#: gajim/gtk/discovery.py:518
 msgid "Without a connection, you can not browse available services"
 msgstr "Vous devez être connecté pour parcourir les services disponibles"
 
-#: gajim/gtk/discovery.py:606
+#: gajim/gtk/discovery.py:605
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Gestion des Services du compte %s"
 
-#: gajim/gtk/discovery.py:608
+#: gajim/gtk/discovery.py:607
 msgid "Service Discovery"
 msgstr "Gestion des Services"
 
-#: gajim/gtk/discovery.py:691
+#: gajim/gtk/discovery.py:690
 msgid "The service could not be found"
 msgstr "Le service n'a pu être trouvé"
 
-#: gajim/gtk/discovery.py:692
+#: gajim/gtk/discovery.py:691
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -8667,101 +9114,78 @@ 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:699 gajim/gtk/discovery.py:1042
+#: gajim/gtk/discovery.py:698 gajim/gtk/discovery.py:1041
 msgid "The service is not browsable"
 msgstr "Le service ne peut pas être parcouru"
 
-#: gajim/gtk/discovery.py:700
+#: gajim/gtk/discovery.py:699
 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:738 gajim/gtk/discovery.py:747
+#: gajim/gtk/discovery.py:737 gajim/gtk/discovery.py:746
 msgid "Invalid Server Name"
 msgstr "Nom de serveur invalide"
 
-#: gajim/gtk/discovery.py:806
+#: gajim/gtk/discovery.py:805
 #, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Parcourt %(address)s en utilisant le compte %(account)s"
 
-#: gajim/gtk/discovery.py:851
+#: gajim/gtk/discovery.py:850
 msgid "Browse"
 msgstr "Parcourir"
 
-#: gajim/gtk/discovery.py:1043
+#: gajim/gtk/discovery.py:1042
 msgid "This service does not contain any items to browse."
 msgstr "Ce service ne contient aucun élément à parcourir."
 
-#: gajim/gtk/discovery.py:1255
-#, fuzzy
+#: gajim/gtk/discovery.py:1254
 msgid "_Command"
-msgstr "Commandes"
+msgstr "_Commande"
 
-#: gajim/gtk/discovery.py:1264 gajim/gtk/discovery.py:1422
+#: gajim/gtk/discovery.py:1263 gajim/gtk/discovery.py:1420
 msgid "Re_gister"
 msgstr "_Souscrire"
 
-#: gajim/gtk/discovery.py:1277
+#: gajim/gtk/discovery.py:1276
 msgid "_Search"
 msgstr "_Rechercher"
 
-#: gajim/gtk/discovery.py:1420
+#: gajim/gtk/discovery.py:1418
 msgid "_Edit"
 msgstr "É_dition"
 
-#: gajim/gtk/discovery.py:1458
+#: gajim/gtk/discovery.py:1456
 #, fuzzy, python-format
 msgid "Scanning %(current)d / %(total)d ..."
 msgstr "Scanne %(current)d / %(total)d.."
 
-#: gajim/gtk/discovery.py:1674
+#: gajim/gtk/discovery.py:1655
+msgid "Users"
+msgstr "Utilisateurs"
+
+#: gajim/gtk/discovery.py:1671
 msgid "Id"
 msgstr "Id"
 
-#: gajim/gtk/discovery.py:1713
-msgid "_Join"
-msgstr "Re_joindre"
-
-#: gajim/gtk/discovery.py:1736
-msgid "Bookmark already set"
-msgstr "Marque-page déjà spécifié"
-
-#: gajim/gtk/discovery.py:1737
-#, fuzzy, python-format
-msgid "Group Chat '%s' is already in your bookmarks."
-msgstr "Le salon \"%s\" est déjà dans vos marque-pages."
-
-#: gajim/gtk/discovery.py:1748
-msgid "Bookmark has been added successfully"
-msgstr "Marque-page ajouté avec succès"
-
-#: gajim/gtk/discovery.py:1749
-#, fuzzy
-msgid ""
-"You can manage your bookmarks by clicking the Bookmarks menu item in your "
-"contact list."
-msgstr ""
-"Vous pouvez gérer vos marque-pages par le menu Actions de votre liste de "
-"contacts."
-
-#: gajim/gtk/discovery.py:1950
+#: gajim/gtk/discovery.py:1900
 msgid "Subscribed"
 msgstr "Inscrit"
 
-#: gajim/gtk/discovery.py:1959
+#: gajim/gtk/discovery.py:1909
 msgid "Node"
 msgstr "Nœud"
 
-#: gajim/gtk/discovery.py:2028
+#: gajim/gtk/discovery.py:1978
 #, fuzzy
 msgid "_New post"
 msgstr "Nouvel article"
 
-#: gajim/gtk/discovery.py:2037
+#: gajim/gtk/discovery.py:1987
 msgid "_Subscribe"
 msgstr "_Ajouter"
 
-#: gajim/gtk/discovery.py:2045
+#: gajim/gtk/discovery.py:1995
 msgid "_Unsubscribe"
 msgstr "_Désinscrire"
 
@@ -8771,9 +9195,8 @@ msgid "Send Single Message"
 msgstr "Envoyer un _message simp…"
 
 #: gajim/gtk/single_message.py:114
-#, fuzzy
 msgid "(No subject)"
-msgstr "sujet"
+msgstr "(Aucun sujet)"
 
 #: gajim/gtk/single_message.py:201
 #, python-format
@@ -8809,7 +9232,7 @@ msgstr "De %s"
 msgid "Characters typed: %s"
 msgstr "Caractères saisis : %s"
 
-#: gajim/gtk/single_message.py:274 gajim/gtk/xml_console.py:169
+#: gajim/gtk/single_message.py:274 gajim/gtk/xml_console.py:166
 msgid "Connection not available"
 msgstr "Connexion non disponible"
 
@@ -8818,6 +9241,13 @@ msgstr "Connexion non disponible"
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Vérifiez que vous êtes connecté avec \"%s\"."
 
+#: gajim/gtk/single_message.py:306
+#, 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:330
 #, python-format
 msgid "RE: %s"
@@ -8828,28 +9258,30 @@ msgstr "RE: %s"
 msgid "%s wrote:\n"
 msgstr "%s a écrit :\n"
 
-#: gajim/gtk/pep_config.py:44
-#, fuzzy, python-format
+#: gajim/gtk/pep_config.py:45
+#, python-format
 msgid "PEP Service Configuration (%s)"
-msgstr "Configuration du Service PEP"
+msgstr "Configuration du Service PEP (%s)"
 
-#: gajim/gtk/pep_config.py:77
+#: gajim/gtk/pep_config.py:78
 #, fuzzy
 msgid "Service"
 msgstr "Serveur"
 
-#: gajim/gtk/pep_config.py:114
+#: gajim/gtk/pep_config.py:115
 msgid "PEP node was not removed"
 msgstr "Le nœud PEP n'a pas été supprimé"
 
-#: gajim/gtk/pep_config.py:115
-#, fuzzy, python-format
+#: gajim/gtk/pep_config.py:116
+#, python-format
 msgid ""
 "PEP node %(node)s was not removed:\n"
 "%(message)s"
-msgstr "Le nœud PEP %(node)s n'a pas été supprimé : %(message)s"
+msgstr ""
+"Le nœud PEP %(node)s n’a pas été supprimé :\n"
+"%(message)s"
 
-#: gajim/gtk/pep_config.py:146
+#: gajim/gtk/pep_config.py:147
 #, python-format
 msgid "Configure %s"
 msgstr "Configurer %s"
@@ -8863,16 +9295,20 @@ msgstr "Souscrire"
 msgid "Registration successful"
 msgstr "L'inscription a réussi"
 
-#: gajim/gtk/dialogs.py:54 gajim/gtk/dataform.py:659 gajim/gtk/adhoc.py:85
+#: gajim/gtk/service_registration.py:215
+msgid "Registration failed"
+msgstr "L'inscription a échoué"
+
+#: gajim/gtk/dialogs.py:53 gajim/gtk/dataform.py:668 gajim/gtk/adhoc.py:86
 msgid "Cancel"
 msgstr "Annuler"
 
-#: gajim/gtk/dialogs.py:129
+#: gajim/gtk/dialogs.py:128
 #, python-format
 msgid "Dictionary for language \"%s\" not available"
 msgstr "Dictionnaire pour la langue \"%s\" indisponible"
 
-#: gajim/gtk/dialogs.py:130
+#: gajim/gtk/dialogs.py:129
 #, python-format
 msgid ""
 "You have to install the dictionary \"%s\" to use spellchecking, or choose "
@@ -8886,11 +9322,11 @@ msgstr ""
 "\n"
 "Le soulignement des fautes d'orthographe ne sera pas utilisé"
 
-#: gajim/gtk/dialogs.py:410 gajim/gtk/dialogs.py:425
+#: gajim/gtk/dialogs.py:322 gajim/gtk/dialogs.py:337
 msgid "Insecure connection"
 msgstr "Connexion non-sécurisée"
 
-#: gajim/gtk/dialogs.py:411
+#: gajim/gtk/dialogs.py:323
 #, python-format
 msgid ""
 "You are about to connect to the account %(account)s (%(server)s) insecurely. "
@@ -8903,28 +9339,24 @@ msgstr ""
 "chiffrées, et cela est vraiment déconseillé.\n"
 "Êtes vous sûr de vouloir faire cela ?"
 
-#: gajim/gtk/dialogs.py:416
+#: gajim/gtk/dialogs.py:328
 msgid "Yes, I really want to connect insecurely"
 msgstr "Oui, je veux vraiment me connecter de façon non-sécurisée"
 
-#: gajim/gtk/dialogs.py:417
+#: gajim/gtk/dialogs.py:329
 msgid "Gajim will NOT connect unless you check this box"
 msgstr "Gajim ne se connectera pas si vous ne cochez pas cette case."
 
-#: gajim/gtk/dialogs.py:675
-msgid "The nickname contains invalid characters."
-msgstr "Le pseudonyme contient des caractères non valides."
-
-#: gajim/gtk/dialogs.py:734
-#, fuzzy, python-format
+#: gajim/gtk/dialogs.py:561
+#, python-format
 msgid "Destroy %s"
-msgstr "Destruction de %s"
+msgstr "Détruire %s"
 
-#: gajim/gtk/dialogs.py:775
+#: gajim/gtk/dialogs.py:602
 msgid "Certificate"
 msgstr "Certificat"
 
-#: gajim/gtk/dialogs.py:786
+#: gajim/gtk/dialogs.py:613
 #, python-format
 msgid ""
 "Certificate for account\n"
@@ -8933,88 +9365,82 @@ msgstr ""
 "Certificat pour le compte\n"
 "%s"
 
-#: gajim/gtk/dialogs.py:824
+#: gajim/gtk/dialogs.py:651
 msgid "Issued to\n"
 msgstr "Émis à\n"
 
-#: gajim/gtk/dialogs.py:825 gajim/gtk/dialogs.py:830
+#: gajim/gtk/dialogs.py:652 gajim/gtk/dialogs.py:657
 msgid "Common Name (CN): "
-msgstr "Nom commun (NC) :"
+msgstr "Nom commun (NC) : "
 
-#: gajim/gtk/dialogs.py:826 gajim/gtk/dialogs.py:831
-#, fuzzy
+#: gajim/gtk/dialogs.py:653 gajim/gtk/dialogs.py:658
 msgid "Organization (O): "
-msgstr "Organisation (O)"
+msgstr "Organisation (O) : "
 
-#: gajim/gtk/dialogs.py:827 gajim/gtk/dialogs.py:832
-#, fuzzy
+#: gajim/gtk/dialogs.py:654 gajim/gtk/dialogs.py:659
 msgid "Organizational Unit (OU): "
-msgstr "Organisation (O)"
+msgstr "Organisation (O) : "
 
-#: gajim/gtk/dialogs.py:828
-#, fuzzy
+#: gajim/gtk/dialogs.py:655
 msgid "Serial Number: "
-msgstr "Numéro de série"
+msgstr "Numéro de série : "
 
-#: gajim/gtk/dialogs.py:829
+#: gajim/gtk/dialogs.py:656
 msgid "Issued by\n"
 msgstr "Émis par\n"
 
-#: gajim/gtk/dialogs.py:833
+#: gajim/gtk/dialogs.py:660
 msgid "Validity\n"
 msgstr "Validité\n"
 
-#: gajim/gtk/dialogs.py:834
-#, fuzzy
+#: gajim/gtk/dialogs.py:661
 msgid "Issued on: "
-msgstr "Émis le"
+msgstr "Émis le : "
 
-#: gajim/gtk/dialogs.py:835
-#, fuzzy
+#: gajim/gtk/dialogs.py:662
 msgid "Expires on: "
-msgstr "Expire le"
+msgstr "Expire le : "
 
-#: gajim/gtk/dialogs.py:836
+#: gajim/gtk/dialogs.py:663
 #, fuzzy
 msgid "SHA-1:"
 msgstr "SHA-1"
 
-#: gajim/gtk/dialogs.py:838
+#: gajim/gtk/dialogs.py:665
 #, fuzzy
 msgid "SHA-256:"
 msgstr "SHA-256"
 
-#: gajim/gtk/dialogs.py:852
+#: gajim/gtk/dialogs.py:679
 msgid "View certificate…"
 msgstr "Voir le certificat…"
 
-#: gajim/gtk/dialogs.py:864 gajim/gtk/accounts.py:893
+#: gajim/gtk/dialogs.py:691 gajim/gtk/accounts.py:896
 msgid "Change Password"
 msgstr "Changer le mot de passe"
 
-#: gajim/gtk/dialogs.py:878
+#: gajim/gtk/dialogs.py:705
 msgid "_OK"
 msgstr "_OK"
 
-#: gajim/gtk/dialogs.py:891
+#: gajim/gtk/dialogs.py:718
 msgid "You must enter a password"
 msgstr "Vous devez entrer un mot de passe"
 
-#: gajim/gtk/dialogs.py:895
+#: gajim/gtk/dialogs.py:722
 msgid "Passwords do not match"
 msgstr "Les mots de passe ne correspondent pas"
 
-#: gajim/gtk/dialogs.py:923
-#, fuzzy
+#: gajim/gtk/dialogs.py:750
 msgid "Group Chat Invitation "
-msgstr "Invitation à un salon"
+msgstr "Invitation à un salon "
 
-#: gajim/gtk/dialogs.py:948
+#: gajim/gtk/dialogs.py:775
 #, python-format
 msgid "<b>%s</b> has invited you to join a discussion"
 msgstr "<b>%s</b> vous a invité dans un salon de discussion"
 
-#: gajim/gtk/dialogs.py:951
+#: gajim/gtk/dialogs.py:778
 #, python-format
 msgid ""
 "<b>%(contact)s</b> has invited you to the group chat <b>%(room_jid)s</b>"
@@ -9022,7 +9448,7 @@ msgstr ""
 "<b>%(contact)s</b> vous a invité dans le salon de discussion <b>"
 "%(room_jid)s</b>"
 
-#: gajim/gtk/dialogs.py:959
+#: gajim/gtk/dialogs.py:786
 #, python-format
 msgid "Comment: %s"
 msgstr "Commentaire : %s"
@@ -9035,10 +9461,6 @@ msgstr "Numéro GG"
 msgid "ICQ Number"
 msgstr "Numéro ICQ"
 
-#: gajim/gtk/add_contact.py:40
-msgid "Add Contact"
-msgstr "Ajouter un contact"
-
 #: gajim/gtk/add_contact.py:259
 #, python-format
 msgid "%s Missing"
@@ -9059,7 +9481,8 @@ msgid "The user ID must not contain a resource."
 msgstr "L'identifiant utilisateur ne doit pas contenir de ressource."
 
 #: gajim/gtk/add_contact.py:299
-msgid "You cannot add yourself to your roster."
+#, fuzzy
+msgid "You cannot add yourself to your contact list."
 msgstr "Vous ne pouvez pas vous ajouter à votre liste de contacts."
 
 #: gajim/gtk/add_contact.py:304
@@ -9071,11 +9494,11 @@ msgid "Your account must be online to add new contacts."
 msgstr "Votre compte doit être connecté pour ajouter de nouveaux contacts."
 
 #: gajim/gtk/add_contact.py:321
-msgid "Contact already in roster"
-msgstr "Contact déjà dans la liste"
+msgid "Contact Already in Contact List"
+msgstr "Contact déjà présent dans la liste"
 
 #: gajim/gtk/add_contact.py:322
-msgid "This contact is already listed in your roster."
+msgid "This contact is already in your contact list."
 msgstr "Le contact est déjà dans votre liste."
 
 #: gajim/gtk/add_contact.py:379 gajim/gtk/add_contact.py:417
@@ -9115,11 +9538,13 @@ msgid "Chatstate Paused"
 msgstr "État de conversation en pause"
 
 #: gajim/gtk/themes.py:52
-msgid "MUC Tab New Directed Message"
+#, fuzzy
+msgid "Group Chat Tab New Directed Message"
 msgstr "Onglet de salons avec nouveau messages dirigé"
 
 #: gajim/gtk/themes.py:56
-msgid "MUC Tab New Message"
+#, fuzzy
+msgid "Group Chat Tab New Message"
 msgstr "Onglet du salon lorsqu'il y a un nouveau message"
 
 #: gajim/gtk/themes.py:60
@@ -9224,7 +9649,7 @@ msgstr "Arrière plan du contact déconnecté"
 
 #: gajim/gtk/themes.py:160
 msgid "Contact Connected Background "
-msgstr "Arrière plan du contact connecté"
+msgstr "Arrière plan du contact connecté "
 
 #: gajim/gtk/themes.py:174
 msgid "Gajim Themes"
@@ -9313,18 +9738,18 @@ msgstr "Tous les fichiers"
 msgid "Clear File"
 msgstr "Effacer le fichier"
 
-#: gajim/gtk/settings.py:570
+#: gajim/gtk/settings.py:570 gajim/gtk/proxies.py:32
 msgid "Manage Proxies"
 msgstr "Gérer les serveurs mandataires"
 
-#: gajim/gtk/settings.py:591 gajim/gtk/preferences.py:971
-#: gajim/gtk/preferences.py:984 gajim/gtk/preferences.py:988
+#: gajim/gtk/settings.py:591 gajim/gtk/preferences.py:968
+#: gajim/gtk/preferences.py:982 gajim/gtk/preferences.py:986
 msgid "No Proxy"
 msgstr "Pas de serveur mandataire"
 
 #: gajim/gtk/settings.py:617
 msgid "Adjust to Status"
-msgstr "Ajuster selon l'état"
+msgstr "Ajuster selon l’état"
 
 #: gajim/gtk/settings.py:629
 msgid "On"
@@ -9406,13 +9831,15 @@ msgstr ""
 "        Veuillez réessayer plus tard.\n"
 "        "
 
-#: gajim/gtk/about.py:47 data/org.gajim.Gajim.appdata.xml.in:10
-msgid "A GTK+ XMPP client"
+#: gajim/gtk/about.py:47 data/org.gajim.Gajim.desktop.in:6
+#: data/org.gajim.Gajim.appdata.xml.in:10
+#, fuzzy
+msgid "A GTK XMPP client"
 msgstr "Un client XMPP en GTK+"
 
 #: gajim/gtk/about.py:48
-#, python-format
-msgid "GTK+ Version: %s"
+#, fuzzy, python-format
+msgid "GTK Version: %s"
 msgstr "Version de GTK+ : %s"
 
 #: gajim/gtk/about.py:49
@@ -9519,9 +9946,8 @@ msgid "Disconnected"
 msgstr "Déconnecté⋅e"
 
 #: gajim/gtk/tooltips.py:567
-#, fuzzy
 msgid "File Name: "
-msgstr "Nom du Fichier : %s"
+msgstr "Nom du fichier :"
 
 #: gajim/gtk/tooltips.py:570
 msgid "?Noun:Download"
@@ -9548,7 +9974,7 @@ msgstr "?transfer status:En pause"
 
 #: gajim/gtk/tooltips.py:594
 msgid "Description: "
-msgstr "Description :"
+msgstr "Description : "
 
 #: gajim/gtk/tooltips.py:618
 #, fuzzy
@@ -9579,6 +10005,23 @@ msgstr "?transfer status:En pause"
 msgid "?transfer status:Not started"
 msgstr "?transfer status:En pause"
 
+#: gajim/gtk/groupchat_creation.py:97 gajim/gtk/groupchat_creation.py:99
+msgid " (optional)..."
+msgstr " (facultatif) ..."
+
+#: gajim/gtk/groupchat_creation.py:134
+msgid "Invalid Address"
+msgstr "Adresse non valide"
+
+#: gajim/gtk/groupchat_creation.py:182
+#, fuzzy
+msgid "Not Connected"
+msgstr "Connecté"
+
+#: gajim/gtk/groupchat_creation.py:183
+msgid "You have to be connected to create a group chat."
+msgstr "Vous devez être connecté pour pouvoir créer un groupe de discussion."
+
 #: gajim/gtk/sounds.py:39
 msgid "Wav Sounds"
 msgstr "Sons wav"
@@ -9619,45 +10062,41 @@ msgstr "Message d'un salon mis en surbrillance"
 msgid "Group Chat Message Received"
 msgstr "Message reçu dans un salon"
 
-#: gajim/gtk/dataform.py:226 gajim/gtk/dataform.py:262
+#: gajim/gtk/dataform.py:232 gajim/gtk/dataform.py:268
 msgid "Required"
 msgstr "Requis"
 
-#: gajim/gtk/dataform.py:286
+#: gajim/gtk/dataform.py:293
 msgid "Yes"
 msgstr "Oui"
 
-#: gajim/gtk/dataform.py:286
+#: gajim/gtk/dataform.py:293
 msgid "No"
 msgstr "Non"
 
-#: gajim/gtk/dataform.py:661
+#: gajim/gtk/dataform.py:670
 msgid "Submit"
 msgstr "Soumettre"
 
-#: gajim/gtk/statusicon.py:213
+#: gajim/gtk/statusicon.py:206
 msgid "_Change Status Message…"
 msgstr "_Changer le message d'état…"
 
-#: gajim/gtk/statusicon.py:247 gajim/gtk/statusicon.py:292
-#: gajim/gtk/statusicon.py:299
+#: gajim/gtk/statusicon.py:258
 #, python-format
 msgid "using account %s"
 msgstr "du compte %s"
 
-#: gajim/gtk/statusicon.py:309
-msgid "_Manage Bookmarks…"
-msgstr "_Gérer les marque-pages…"
-
-#: gajim/gtk/statusicon.py:325
-msgid "Hide _Roster"
-msgstr "Cacher la liste de contacts"
+#: gajim/gtk/statusicon.py:269
+#, fuzzy
+msgid "Hide _Contact List"
+msgstr "Inviter des _Contacts"
 
-#: gajim/gtk/statusicon.py:329
-msgid "Show _Roster"
-msgstr "Montrer la _liste de contacts"
+#: gajim/gtk/statusicon.py:273
+msgid "Show _Contact List"
+msgstr "Affiche_r la liste des contacts"
 
-#: gajim/gtk/statusicon.py:337
+#: gajim/gtk/statusicon.py:281
 msgid "Hide this menu"
 msgstr "Cacher ce menu"
 
@@ -9701,33 +10140,6 @@ msgstr ""
 "Une erreur s'est produite lors de la publication de vos informations "
 "personnelles, veuillez réessayer plus tard."
 
-#: gajim/gtk/join_groupchat.py:202
-msgid "Invalid Room"
-msgstr "Salon invalide"
-
-#: gajim/gtk/join_groupchat.py:203
-msgid "Please choose a room"
-msgstr "Veuillez choisir un salon"
-
-#: gajim/gtk/join_groupchat.py:222 gajim/gtk/join_groupchat.py:229
-msgid "Invalid Nickname"
-msgstr "Nom d'utilisateur invalide"
-
-#: gajim/gtk/join_groupchat.py:223
-msgid "Please choose a nickname"
-msgstr "Veuillez choisir un surnom"
-
-#: gajim/gtk/join_groupchat.py:282 gajim/gtk/join_groupchat.py:288
-#: gajim/gtk/join_groupchat.py:293
-msgid "Wrong server"
-msgstr "Mauvais serveur"
-
-#: gajim/gtk/join_groupchat.py:283 gajim/gtk/join_groupchat.py:289
-#: gajim/gtk/join_groupchat.py:294
-#, python-format
-msgid "%s is not a groupchat server"
-msgstr "%s n'est pas un serveur de salons de discussion"
-
 #: gajim/gtk/mam_preferences.py:38
 #, python-format
 msgid "Archiving Preferences for %s"
@@ -9756,45 +10168,53 @@ msgstr "Erreur reçus : {}"
 msgid "Archiving Preferences Error"
 msgstr "Éditer les préférences d'archivage"
 
-#: gajim/gtk/advanced_config.py:81
+#: gajim/gtk/advanced_config.py:95
 msgid "Activated"
 msgstr "Activé"
 
-#: gajim/gtk/advanced_config.py:81
+#: gajim/gtk/advanced_config.py:95
 msgid "Deactivated"
 msgstr "Désactivé"
 
-#: gajim/gtk/advanced_config.py:83
-msgid "Boolean"
-msgstr "Booléen"
+#: gajim/gtk/advanced_config.py:97
+msgid "?config type:Boolean"
+msgstr ""
+
+#: gajim/gtk/advanced_config.py:98
+msgid "?config type:Integer"
+msgstr ""
 
-#: gajim/gtk/advanced_config.py:84
-msgid "Integer"
-msgstr "Entier"
+#: gajim/gtk/advanced_config.py:99
+msgid "?config type:Text"
+msgstr ""
 
-#: gajim/gtk/advanced_config.py:85
-msgid "Text"
-msgstr "Texte"
+#: gajim/gtk/advanced_config.py:100
+msgid "?config type:Color"
+msgstr ""
 
-#: gajim/gtk/advanced_config.py:97
-msgid "Preference Name"
+#: gajim/gtk/advanced_config.py:112
+#, fuzzy
+msgid "?config:Preference Name"
 msgstr "Option"
 
-#: gajim/gtk/advanced_config.py:104
-msgid "Value"
-msgstr "Valeur"
+#: gajim/gtk/advanced_config.py:123
+#, fuzzy
+msgid "?config:Value"
+msgstr "Configurer"
 
-#: gajim/gtk/advanced_config.py:113
-msgid "Type"
-msgstr "Type"
+#: gajim/gtk/advanced_config.py:132
+msgid "?config:Type"
+msgstr ""
 
-#: gajim/gtk/advanced_config.py:168
-msgid "(None)"
-msgstr "(Aucune)"
+#: gajim/gtk/advanced_config.py:187
+#, fuzzy
+msgid "?config description:None"
+msgstr "Aucune"
 
-#: gajim/gtk/advanced_config.py:299
-msgid "Hidden"
-msgstr "Éléments masqués"
+#: gajim/gtk/advanced_config.py:322
+#, fuzzy
+msgid "?password:Hidden"
+msgstr "Mot de passe :"
 
 #: gajim/gtk/server_info.py:66
 msgid "Copy info to clipboard"
@@ -9805,8 +10225,8 @@ msgstr "Copier l'information dans le presse-papier"
 msgid "%(days)s days, %(hours)s hours"
 msgstr "%(days)s jours, %(hours)s heures"
 
-#: gajim/gtk/server_info.py:218 gajim/gtk/accounts.py:749
-#: gajim/gtk/accounts.py:853
+#: gajim/gtk/server_info.py:218 gajim/gtk/accounts.py:752
+#: gajim/gtk/accounts.py:856
 msgid "Hostname"
 msgstr "Nom d'hôte"
 
@@ -9996,10 +10416,6 @@ 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_config.py:41
-msgid "Group Chat Configuration"
-msgstr "Configuration du salon de discussion"
-
 #: gajim/gtk/groupchat_config.py:134
 msgid "A Group Chat needs at least one Owner"
 msgstr "Un salon de discussion a besoin d'au moins un propriétaire"
@@ -10011,77 +10427,77 @@ msgstr ""
 "propriétaires"
 
 #: gajim/gtk/groupchat_config.py:399
-msgid "An entry with this Jabber-ID already exists"
+#, fuzzy
+msgid "An entry with this XMPP Address already exists"
 msgstr "Une entrée avec cet identifiant Jabber existe déjà"
 
-#: gajim/gtk/adhoc.py:91
+#: gajim/gtk/adhoc.py:92
 msgid "Finish"
 msgstr "Finir"
 
-#: gajim/gtk/adhoc.py:97 gajim/gtk/adhoc.py:283
+#: gajim/gtk/adhoc.py:98 gajim/gtk/adhoc.py:284
 msgid "Commands"
 msgstr "Commandes"
 
-#: gajim/gtk/adhoc.py:103
+#: gajim/gtk/adhoc.py:104
 msgid "Next"
 msgstr "Suivant"
 
-#: gajim/gtk/adhoc.py:109
+#: gajim/gtk/adhoc.py:110
 msgid "Previous"
 msgstr "Précédent"
 
-#: gajim/gtk/adhoc.py:115
+#: gajim/gtk/adhoc.py:116
 msgid "Execute"
 msgstr "Exécuter"
 
-#: gajim/gtk/adhoc.py:195
-#, fuzzy
+#: gajim/gtk/adhoc.py:196
 msgid "No commands available"
-msgstr "Aucun compte disponible"
+msgstr "Aucune commande n'est disponible"
 
-#: gajim/gtk/adhoc.py:244
+#: gajim/gtk/adhoc.py:245
 #, fuzzy
 msgid "Request Command List"
 msgstr "Exécuter une commande"
 
-#: gajim/gtk/adhoc.py:259
+#: gajim/gtk/adhoc.py:260
 msgid "Executing…"
 msgstr "Exécution…"
 
-#: gajim/gtk/adhoc.py:266
+#: gajim/gtk/adhoc.py:267
 msgid "Command List"
 msgstr "Liste des commandes"
 
-#: gajim/gtk/adhoc.py:384
+#: gajim/gtk/adhoc.py:385
 msgid "Finished"
 msgstr "Fini"
 
-#: gajim/gtk/adhoc.py:453
+#: gajim/gtk/adhoc.py:454
 msgid "Execution failed"
 msgstr "L'exécution a échoué"
 
-#: gajim/gtk/blocking.py:37
+#: gajim/gtk/blocking.py:38
 #, python-format
 msgid "Blocking List for %s"
 msgstr "Liste de blocage pour %s"
 
-#: gajim/gtk/blocking.py:71
+#: gajim/gtk/blocking.py:72
 msgid "Error!"
 msgstr "Erreur !"
 
 #: gajim/gtk/subscription_request.py:34
 msgid "Subscription Request"
-msgstr "Requête d'Inscription"
+msgstr "Requête d’Inscription"
 
 #: gajim/gtk/subscription_request.py:44
 #, python-format
 msgid "Subscription request for account %(account)s from %(jid)s"
-msgstr "Requête d'inscription pour le compte %(account)s de la part de %(jid)s"
+msgstr "Requête d’inscription pour le compte %(account)s de la part de %(jid)s"
 
 #: gajim/gtk/subscription_request.py:47
 #, python-format
 msgid "Subscription request from %s"
-msgstr "Requête d'inscription de la part de %s"
+msgstr "Requête d’inscription de la part de %s"
 
 #: gajim/gtk/htmltextview.py:543
 msgid "Loading"
@@ -10113,8 +10529,7 @@ msgstr "Nom d'utilisateur non valide"
 msgid "You must provide a username to configure this account."
 msgstr "Vous devez entrer un nom d'utilisateur pour configurer ce compte."
 
-#: gajim/gtk/account_wizard.py:252 gajim/gtk/bookmarks.py:290
-#: gajim/gtk/bookmarks.py:303
+#: gajim/gtk/account_wizard.py:252
 msgid "Invalid server"
 msgstr "Serveur invalide"
 
@@ -10130,7 +10545,7 @@ msgstr "Entrée invalide"
 msgid "Custom port must be a port number."
 msgstr "Le port personnalisé doit être un numéro de port"
 
-#: gajim/gtk/account_wizard.py:405
+#: gajim/gtk/account_wizard.py:406
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -10145,15 +10560,15 @@ msgstr ""
 "Erreur SSL  %(error)s\n"
 "Voulez vous toujours vous connecter au serveur ?"
 
-#: gajim/gtk/account_wizard.py:446 gajim/gtk/account_wizard.py:480
+#: gajim/gtk/account_wizard.py:447 gajim/gtk/account_wizard.py:481
 msgid "An error occurred during account creation"
 msgstr "Une erreur est survenue lors de la création du compte"
 
-#: gajim/gtk/account_wizard.py:545
+#: gajim/gtk/account_wizard.py:546
 msgid "Account name is in use"
 msgstr "Le nom du compte est utilisé"
 
-#: gajim/gtk/account_wizard.py:546
+#: gajim/gtk/account_wizard.py:547
 msgid "You already have an account using this name."
 msgstr "Vous avez déjà un compte avec ce nom."
 
@@ -10170,34 +10585,34 @@ msgid "Encrypting file…"
 msgstr "Chiffrement du fichier …"
 
 #: gajim/gtk/http_upload_progress.py:111
-#, fuzzy, python-format
+#, python-format
 msgid "%(progress)s of %(total)s"
-msgstr "%(progress)s sur %(total)s MiB envoyé (%(speed)s MiB/s)"
+msgstr "%(progress)s sur %(total)s"
 
 #: gajim/gtk/http_upload_progress.py:127
 #, python-format
 msgid "%(minutes)s min %(seconds)s sec"
-msgstr ""
+msgstr "%(minutes)s min %(seconds)s sec"
 
-#: gajim/gtk/xml_console.py:77
+#: gajim/gtk/xml_console.py:74
 msgid "Filter"
 msgstr "Filtre"
 
-#: gajim/gtk/xml_console.py:82
+#: gajim/gtk/xml_console.py:79
 msgid "XML Input"
 msgstr "Entrée XML"
 
-#: gajim/gtk/xml_console.py:86
+#: gajim/gtk/xml_console.py:83
 #, fuzzy
 msgid "Paste Last Input"
 msgstr "Coller en tant que citation"
 
-#: gajim/gtk/xml_console.py:170
+#: gajim/gtk/xml_console.py:167
 #, fuzzy, python-format
 msgid "Please make sure you are connected with '%s'."
 msgstr "Vérifiez que vous êtes connecté avec \"%s\"."
 
-#: gajim/gtk/xml_console.py:182
+#: gajim/gtk/xml_console.py:177
 msgid "Invalid Node"
 msgstr "Nœud invalide"
 
@@ -10229,72 +10644,86 @@ msgstr "Chercher"
 msgid "No results found"
 msgstr "Aucun résultat trouvé"
 
-#: gajim/gtk/preferences.py:358 gajim/gtk/preferences.py:362
+#: gajim/gtk/preferences.py:357 gajim/gtk/preferences.py:361
 msgid "Default"
 msgstr "Par défaut"
 
-#: gajim/gtk/preferences.py:801
+#: gajim/gtk/preferences.py:798
 msgid "status message title"
 msgstr "titre du message d'état"
 
-#: gajim/gtk/preferences.py:802
+#: gajim/gtk/preferences.py:799
 msgid "status message text"
 msgstr "texte du message d'état :"
 
+#: gajim/gtk/accounts.py:137
+#, fuzzy
+msgid "Re-Login"
+msgstr "Identifiant"
+
 #: gajim/gtk/accounts.py:138
-msgid "Relogin now?"
+#, fuzzy
+msgid "Re-Login now?"
 msgstr "Reconnecter maintenant ?"
 
 #: gajim/gtk/accounts.py:139
-msgid "If you want all the changes to apply instantly, you must relogin."
+#, 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:191 gajim/gtk/accounts.py:975
+#: gajim/gtk/accounts.py:141
+msgid "_Later"
+msgstr ""
+
+#: gajim/gtk/accounts.py:143
 #, fuzzy
+msgid "_Re-Login"
+msgstr "Identifiant"
+
+#: gajim/gtk/accounts.py:194 gajim/gtk/accounts.py:978
 msgid "Remove Account"
-msgstr "Suppression du compte %s"
+msgstr "Supprimer le compte"
 
-#: gajim/gtk/accounts.py:192
+#: gajim/gtk/accounts.py:195
 #, fuzzy, python-format
 msgid "You still have open chats in your account %s"
 msgstr "Vous avez une conversation ouverte dans le compte %s"
 
-#: gajim/gtk/accounts.py:193
-#, fuzzy
+#: gajim/gtk/accounts.py:196
 msgid ""
 "All chat and group chat windows will be closed.\n"
 "Do you want to continue?"
 msgstr ""
-"Toutes les fenêtres de conversation et de salons de discussion seront "
-"fermées. Voulez-vous continuer ?"
+"Toutes les fenêtres des salons de discussion seront fermées.\n"
+"Voulez-vous continuer ?"
 
-#: gajim/gtk/accounts.py:424
+#: gajim/gtk/accounts.py:427
 #, fuzzy
 msgid "Back"
 msgstr "Bientôt de retour"
 
-#: gajim/gtk/accounts.py:530
+#: gajim/gtk/accounts.py:533
 #, fuzzy
 msgid "Please check if Bonjour is installed."
 msgstr "Veuillez vérifier si Avahi ou Bonjour sont installés."
 
-#: gajim/gtk/accounts.py:532
+#: gajim/gtk/accounts.py:535
 #, fuzzy
 msgid "Please check if Avahi is installed."
 msgstr "Veuillez vérifier si Avahi ou Bonjour sont installés."
 
-#: gajim/gtk/accounts.py:569
+#: gajim/gtk/accounts.py:572
 msgid "Disable Account"
 msgstr "Désactiver le compte"
 
-#: gajim/gtk/accounts.py:570
+#: gajim/gtk/accounts.py:573
 #, python-format
 msgid "Account %s is still connected"
 msgstr "Le compte \"%s\" est toujours connecté"
 
-#: gajim/gtk/accounts.py:571
+#: gajim/gtk/accounts.py:574
 #, fuzzy
 msgid ""
 "All chat and group chat windows will be closed. Do you want to continue?"
@@ -10302,251 +10731,240 @@ msgstr ""
 "Toutes les fenêtres de conversation et de salons de discussion seront "
 "fermées. Voulez-vous continuer ?"
 
-#: gajim/gtk/accounts.py:576
-#, fuzzy
+#: gajim/gtk/accounts.py:579
 msgid "_Disable Account"
-msgstr "Désactiver le compte"
+msgstr "_Désactiver le compte"
 
-#: gajim/gtk/accounts.py:595
-#, fuzzy
+#: gajim/gtk/accounts.py:598
 msgid "Add Account"
-msgstr "Ajouter un compte…"
+msgstr "Ajouter un compte"
 
-#: gajim/gtk/accounts.py:663
+#: gajim/gtk/accounts.py:666
 msgid "Label"
 msgstr "Étiquette"
 
-#: gajim/gtk/accounts.py:667
+#: gajim/gtk/accounts.py:670
 msgid "Login"
 msgstr "Identifiant"
 
-#: gajim/gtk/accounts.py:670
+#: gajim/gtk/accounts.py:673
 msgid "Import Contacts"
 msgstr "Importer des contacts"
 
-#: gajim/gtk/accounts.py:674 gajim/gtk/accounts.py:870
+#: gajim/gtk/accounts.py:677 gajim/gtk/accounts.py:873
 msgid "Client Certificate"
 msgstr "Certificat client"
 
-#: gajim/gtk/accounts.py:677 gajim/gtk/accounts.py:774
+#: gajim/gtk/accounts.py:680 gajim/gtk/accounts.py:777
 msgid "Connect on startup"
 msgstr "Se connecter au démarrage"
 
-#: gajim/gtk/accounts.py:681 gajim/gtk/accounts.py:779
+#: gajim/gtk/accounts.py:684 gajim/gtk/accounts.py:782
 msgid "Save conversations for all contacts"
 msgstr "Garder l'historique des conversations pour tous les contacts"
 
-#: gajim/gtk/accounts.py:683 gajim/gtk/accounts.py:781
+#: gajim/gtk/accounts.py:686 gajim/gtk/accounts.py:784
 msgid "Store conversations on the harddrive"
 msgstr "Enregistrer les conversations sur le disque dur"
 
-#: gajim/gtk/accounts.py:685 gajim/gtk/accounts.py:783
+#: gajim/gtk/accounts.py:688 gajim/gtk/accounts.py:786
 msgid "Global Status"
 msgstr "Statut Global"
 
-#: gajim/gtk/accounts.py:687
+#: gajim/gtk/accounts.py:690
 msgid "Synchronise the status of all accounts"
 msgstr "Synchroniser le statut de tous les comptes"
 
-#: gajim/gtk/accounts.py:689
+#: gajim/gtk/accounts.py:692
 msgid "Use file transfer proxies"
 msgstr "Utiliser les serveurs mandataires pour les transferts de fichiers"
 
-#: gajim/gtk/accounts.py:705
-#, fuzzy
+#: gajim/gtk/accounts.py:708
 msgid "Idle Time"
-msgstr "Inactif depuis :"
+msgstr "Durée d’inactivité"
 
-#: gajim/gtk/accounts.py:707
+#: gajim/gtk/accounts.py:710
 msgid "Disclose the time of your last activity"
-msgstr "Divulguer l'heure de votre dernière activité"
+msgstr "Divulguer l’heure de votre dernière activité"
 
-#: gajim/gtk/accounts.py:709
+#: gajim/gtk/accounts.py:712
 msgid "Local System Time"
 msgstr "Heure locale du système"
 
-#: gajim/gtk/accounts.py:711
+#: gajim/gtk/accounts.py:714
 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"
+"Divulguer l’heure locale du système du périphérique sur lequel tourne Gajim"
 
-#: gajim/gtk/accounts.py:714
-#, fuzzy
+#: gajim/gtk/accounts.py:717
 msgid "Client / Operating System"
-msgstr "Certificat client"
+msgstr "Client / Système d’exploitation"
 
-#: gajim/gtk/accounts.py:716
-#, fuzzy
+#: gajim/gtk/accounts.py:719
 msgid ""
 "Disclose informations about the client and operating system you currently use"
 msgstr ""
-"Si cette case est cochée, Gajim autorisera les autres à détecter le système "
-"d'exploitation que vous utilisez"
+"Divulguer des informations à propos du client et du système d’exploitation "
+"que vous utilisez actuellement"
 
-#: gajim/gtk/accounts.py:719
-#, fuzzy
+#: gajim/gtk/accounts.py:722
 msgid "Ignore Unknown Contacts"
-msgstr "Inviter des contacts"
+msgstr "Ignorer les contacts inconnus"
 
-#: gajim/gtk/accounts.py:721
-#, fuzzy
+#: gajim/gtk/accounts.py:724
 msgid "Ignore everything from contacts not in your Roster"
-msgstr "_Ignorer les messages des contacts qui ne sont pas dans votre liste"
+msgstr "Ignorer les messages des contacts qui ne sont pas dans votre liste"
 
-#: gajim/gtk/accounts.py:737 gajim/gtk/accounts.py:776
+#: gajim/gtk/accounts.py:740 gajim/gtk/accounts.py:779
 msgid "Use environment variable"
 msgstr "Utiliser la variable d'environnement"
 
-#: gajim/gtk/accounts.py:739
-msgid "Proxy"
-msgstr "Serveur mandataire"
-
-#: gajim/gtk/accounts.py:742
+#: gajim/gtk/accounts.py:745
 msgid "Warn on insecure connection"
 msgstr "Prévenir avant d'utiliser une connexion non sécurisée"
 
-#: gajim/gtk/accounts.py:746
+#: gajim/gtk/accounts.py:749
 msgid "Send keep-alive packets"
 msgstr "Envoi des paquets de maintien de connexion"
 
-#: gajim/gtk/accounts.py:750
+#: gajim/gtk/accounts.py:753
 msgid "Manually set the hostname for the server"
 msgstr "Fixer le nom du serveur manuellement"
 
-#: gajim/gtk/accounts.py:756 gajim/gtk/accounts.py:826
-#: gajim/gtk/accounts.py:831
+#: gajim/gtk/accounts.py:759 gajim/gtk/accounts.py:829
+#: gajim/gtk/accounts.py:834
 msgid "Priority"
 msgstr "Priorité"
 
-#: gajim/gtk/accounts.py:785
+#: gajim/gtk/accounts.py:788
 msgid "Synchronize the status of all accounts"
 msgstr "Synchroniser l'état de tous les comptes"
 
-#: gajim/gtk/accounts.py:795
+#: gajim/gtk/accounts.py:798
 msgid "First Name"
 msgstr "Prénom"
 
-#: gajim/gtk/accounts.py:798
+#: gajim/gtk/accounts.py:801
 msgid "Last Name"
 msgstr "Nom"
 
-#: gajim/gtk/accounts.py:804
+#: gajim/gtk/accounts.py:807
 msgid "Email"
 msgstr "Courrier électronique"
 
-#: gajim/gtk/accounts.py:822
+#: gajim/gtk/accounts.py:825
 msgid "Adjust to status"
 msgstr "Ajuster selon l'état"
 
-#: gajim/gtk/accounts.py:849
+#: gajim/gtk/accounts.py:852
 msgid "Enable"
 msgstr "Activer"
 
-#: gajim/gtk/accounts.py:857
+#: gajim/gtk/accounts.py:860
 msgid "Port"
 msgstr "Port"
 
-#: gajim/gtk/accounts.py:862
-#, fuzzy
+#: gajim/gtk/accounts.py:865
 msgid "Connection Settings"
-msgstr "Options de connexion"
+msgstr "Paramètres de connexion"
 
-#: gajim/gtk/accounts.py:872
+#: gajim/gtk/accounts.py:875
 msgid "PKCS12 Files"
 msgstr "Fichier PKCS12"
 
-#: gajim/gtk/accounts.py:874
+#: gajim/gtk/accounts.py:877
 msgid "Encrypted Certificate"
 msgstr "Certificat chiffré"
 
-#: gajim/gtk/accounts.py:878
-#, fuzzy
+#: gajim/gtk/accounts.py:881
 msgid "Certificate Settings"
-msgstr "Options du certificat"
+msgstr "Configuration du certificat"
 
-#: gajim/gtk/accounts.py:890
+#: gajim/gtk/accounts.py:893
 msgid "Save Password"
 msgstr "Enregistrer le mot de passe"
 
-#: gajim/gtk/accounts.py:898
-#, fuzzy
+#: gajim/gtk/accounts.py:901
 msgid "Login Settings"
-msgstr "Paramètres du plugin"
+msgstr "Paramètres de connexion"
 
-#: gajim/gtk/accounts.py:931
+#: gajim/gtk/accounts.py:934
 #, python-format
 msgid "Removing account %s"
 msgstr "Suppression du compte %s"
 
-#: gajim/gtk/accounts.py:946
+#: gajim/gtk/accounts.py:949
 msgid "Account is disabled"
 msgstr "Compte désactivé"
 
-#: gajim/gtk/accounts.py:947
+#: gajim/gtk/accounts.py:950
 msgid "To unregister from a server, the account must be enabled."
 msgstr "Pour se désinscrire d'un serveur, le compte doit être activé."
 
-#: gajim/gtk/accounts.py:962
+#: gajim/gtk/accounts.py:965
 msgid "Password required"
 msgstr "Mot de passe requis"
 
-#: gajim/gtk/accounts.py:976
+#: gajim/gtk/accounts.py:979
 #, fuzzy, python-format
 msgid "Account '%s' is still connected to the server"
 msgstr "Le compte \"%s\" est connecté au serveur"
 
-#: gajim/gtk/accounts.py:978
+#: gajim/gtk/accounts.py:981
 msgid "If you remove it, the connection will be lost."
 msgstr "Si vous l'enlevez, la connection sera perdue."
 
-#: gajim/gtk/accounts.py:995
+#: gajim/gtk/accounts.py:998
 #, python-format
 msgid "Connection to server %s failed"
 msgstr "La connexion au serveur %s a échoué"
 
-#: gajim/gtk/accounts.py:996
+#: gajim/gtk/accounts.py:999
 msgid "What would you like to do?"
 msgstr "Que voulez vous faire ?"
 
-#: gajim/gtk/accounts.py:997
+#: gajim/gtk/accounts.py:1000
 msgid "Remove only from Gajim"
 msgstr "Supprimer le compte de Gajim _uniquement"
 
-#: gajim/gtk/accounts.py:998
+#: gajim/gtk/accounts.py:1001
 msgid "Don't remove anything. I'll try again later"
 msgstr "Ne rien supprimer. Je réessaierai plus tard."
 
 #: 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 "Je souhaiterais vous ajouter à ma liste de contacts."
+msgstr ""
+"<b>%s</b> souhaiterait ajouter quelques contacts à votre liste de contacts."
 
 #: 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> aimerait que vous <b>%(action)s</b> quelques contacts dans "
-"votre liste."
+"<b>%s</b> aimerait modifier quelques contacts dans votre liste de contacts."
 
 #: 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> aimerait que vous <b>%(action)s</b> quelques contacts dans "
-"votre liste."
+"<b>%s</b> aimerait supprimer quelques contacts dans votre liste de contacts."
 
 #: gajim/gtk/roster_item_exchange.py:73 gajim/gtk/roster_item_exchange.py:161
 msgid "Modify"
 msgstr "Modifier"
 
+#: gajim/gtk/roster_item_exchange.py:80
+msgid "JID"
+msgstr "Identifiant Jabber"
+
 #: gajim/gtk/roster_item_exchange.py:86
 msgid "Groups"
 msgstr "Groupes"
 
 #: 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 m’a conseillé de vous ajouter à mes contacts."
+msgstr "%s m’a suggéré de vous ajouter à ma liste de contacts."
 
 #: gajim/gtk/roster_item_exchange.py:211
 #, python-format
@@ -10562,19 +10980,19 @@ msgid_plural "Removed %d contacts"
 msgstr[0] "%d contact supprimé"
 msgstr[1] "%d contacts supprimés"
 
-#: gajim/gtk/util.py:581
+#: gajim/gtk/util.py:583
 msgid "Unknown Artist"
 msgstr "Artiste Inconnu"
 
-#: gajim/gtk/util.py:582
+#: gajim/gtk/util.py:584
 msgid "Unknown Title"
 msgstr "Titre Iconnu"
 
-#: gajim/gtk/util.py:583
+#: gajim/gtk/util.py:585
 msgid "Unknown Source"
 msgstr "Source Inconnue"
 
-#: gajim/gtk/util.py:585
+#: gajim/gtk/util.py:587
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
@@ -10583,28 +11001,10 @@ msgstr ""
 "<b>« %(title)s »</b> par <i>%(artist)s</i>\n"
 "de <i>%(source)s</i>"
 
-#: gajim/gtk/bookmarks.py:121
-msgid "New Group Chat"
-msgstr "Créer un salon de discussion"
-
-#: gajim/gtk/bookmarks.py:161
-msgid "This bookmark has invalid data"
-msgstr "Ce marque-page contient des données invalides"
-
-#: gajim/gtk/bookmarks.py:162
-msgid ""
-"Please be sure to fill out server and room fields or remove this bookmark."
-msgstr ""
-"Assurez-vous de remplir les champs serveur et salon ou enlevez ce marque-page"
-
-#: gajim/gtk/bookmarks.py:273 gajim/gtk/bookmarks.py:291
-#: gajim/gtk/bookmarks.py:304 gajim/gtk/bookmarks.py:335
-msgid "Character not allowed"
-msgstr "Caractère non-autorisé"
-
-#: gajim/gtk/bookmarks.py:334
-msgid "Invalid room"
-msgstr "Salon invalide"
+#: gajim/gtk/bookmarks.py:47
+#, python-format
+msgid "Bookmarks for %s"
+msgstr "Marques-pages pour %s"
 
 #: gajim/plugins/pluginmanager.py:736 gajim/plugins/pluginmanager.py:742
 msgid "Archive corrupted"
@@ -10615,50 +11015,53 @@ msgid "Archive empty"
 msgstr "L'archive est vide"
 
 #: gajim/plugins/pluginmanager.py:750 gajim/plugins/pluginmanager.py:758
-#: gajim/plugins/gui.py:257
+#: gajim/plugins/gui.py:258
 msgid "Archive is malformed"
 msgstr "L'archive est mal-formée"
 
-#: gajim/plugins/pluginmanager.py:766 gajim/plugins/gui.py:281
-#: gajim/plugins/gui.py:289
+#: gajim/plugins/pluginmanager.py:766 gajim/plugins/gui.py:288
+#: gajim/plugins/gui.py:301
 msgid "Plugin already exists"
 msgstr "Le plugin existe déjà"
 
-#: gajim/plugins/gui.py:82
+#: gajim/plugins/gui.py:83
 msgid "Click to view Gajim's wiki page on how to install plugins in Flatpak."
 msgstr ""
 "Cliquer pour voir la page du wiki de Gajim sur l'installation des plugins "
 "dans Flatpak."
 
-#: gajim/plugins/gui.py:89
+#: gajim/plugins/gui.py:90
 msgid "Plugin"
 msgstr "Plugin"
 
-#: gajim/plugins/gui.py:151
+#: gajim/plugins/gui.py:152
 #, python-format
 msgid "Warning: %s"
 msgstr "Avertissement : %s"
 
-#: gajim/plugins/gui.py:206
+#: gajim/plugins/gui.py:207
 msgid "Plugin failed"
 msgstr "Plugin échoué"
 
-#: gajim/plugins/gui.py:245
+#: gajim/plugins/gui.py:246
 msgid "Unable to properly remove the plugin"
 msgstr "Impossible de supprimer le plugin proprement"
 
-#: gajim/plugins/gui.py:281
-msgid "Overwrite?"
+#: gajim/plugins/gui.py:287
+#, fuzzy
+msgid "Overwrite Plugin?"
 msgstr "Remplacer ?"
 
+#: gajim/plugins/gui.py:289
+#, fuzzy
+msgid "Do you want to overwrite the currently installed version?"
+msgstr "Voulez-vous accepter l’invitation ?"
+
 #: data/org.gajim.Gajim.desktop.in:5
-msgid "Jabber IM Client"
+#, fuzzy
+msgid "XMPP IM Client"
 msgstr "Client de Messagerie Instantanée Jabber"
 
-#: data/org.gajim.Gajim.desktop.in:6
-msgid "A GTK+ Jabber client"
-msgstr "Un client Jabber en GTK+"
-
 #: data/org.gajim.Gajim.desktop.in:8
 msgid "chat;messaging;im;xmpp;bonjour;voip;"
 msgstr "discussion;messagerie;messagerie instantanée;xmpp;bonjour;voip;"
@@ -10720,7 +11123,8 @@ msgstr ""
 "groupes"
 
 #: data/org.gajim.Gajim.appdata.xml.in:27
-msgid "Chat securely with End-to-End encryption via OMEMO or PGP"
+#, 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"
@@ -10788,7 +11192,8 @@ msgid "Even more features via plugins"
 msgstr "Encore plus de fonctionnalités avec des greffons"
 
 #: data/org.gajim.Gajim.appdata.xml.in:52
-msgid "Roster, list of contacts"
+#, fuzzy
+msgid "Contact list, list of contacts"
 msgstr "Liste de contacts"
 
 #: data/org.gajim.Gajim.appdata.xml.in:56
@@ -10807,6 +11212,526 @@ msgstr "Historique des discussions"
 msgid "Plugin manager"
 msgstr "Gestionnaire de plugins"
 
+#~ msgid "Configure Services…"
+#~ msgstr "Configurer les Services…"
+
+#~ msgid "Group Chat Bookmarks"
+#~ msgstr "Marque-pages des salons de discussion"
+
+#~ msgid "Add Bookmark"
+#~ msgstr "Ajouter un signet"
+
+#, fuzzy
+#~ msgid "Remove Bookmark"
+#~ msgstr "Marque-page"
+
+#~ msgid "N_ame"
+#~ msgstr "N_om"
+
+#~ msgid "Bookmark Name"
+#~ msgstr "Nom du marque-page"
+
+#~ msgid "_Server"
+#~ msgstr "_Serveur"
+
+#~ msgid "Roo_m"
+#~ msgstr "_Salon"
+
+#~ msgid "_Password"
+#~ msgstr "Mot de _passe"
+
+#~ msgid "Join chat when connected"
+#~ msgstr "Rejoindre le salon à la connexion"
+
+#~ msgid "_Join Automatically"
+#~ msgstr "_Rejoindre automatiquement"
+
+#~ msgid "New Group Chat"
+#~ msgstr "Créer un salon de discussion"
+
+#~ msgid "This bookmark has invalid data"
+#~ msgstr "Ce marque-page contient des données invalides"
+
+#, fuzzy
+#~ msgid ""
+#~ "Please be sure to fill out server and group chat fields or remove this "
+#~ "bookmark."
+#~ msgstr ""
+#~ "Assurez-vous de remplir les champs serveur et salon ou enlevez ce marque-"
+#~ "page"
+
+#~ msgid "Character not allowed"
+#~ msgstr "Caractère non-autorisé"
+
+#, fuzzy
+#~ msgid "Invalid Group Chat"
+#~ msgstr "JID de salon de discussion non invalide"
+
+#~ msgid "Unable to join group chat"
+#~ msgstr "Impossible de rejoindre le salon"
+
+#~ msgid "You are banned from group chat <b>%s</b>."
+#~ msgstr "Vous êtes banni du salon <b>%s</b>."
+
+#~ msgid "Remote server <b>%s</b> does not exist."
+#~ msgstr "Le serveur distant <b>%s</b> n’existe pas."
+
+#~ msgid "Group chat <b>%s</b> does not exist."
+#~ msgstr "Le salon <b>%s</b> n’existe pas."
+
+#~ msgid "Group chat creation is not permitted."
+#~ msgstr "La création de salon n’est pas autorisée."
+
+#~ msgid "You must use your registered nickname in <b>%s</b>."
+#~ msgstr "Vous devez utiliser votre pseudonyme enregistré dans <b>%s</b>."
+
+#, fuzzy
+#~ msgid "You are not in the members list in group chat %s."
+#~ msgstr "Vous n’êtes pas dans la liste des membres du salon %s."
+
+#, fuzzy
+#~ msgid "XMPP Address is not a group chat"
+#~ msgstr "Ceci n'est pas une conversation multi-utilisateurs"
+
+#~ msgid "This is not a group chat"
+#~ msgstr "Ceci n'est pas une conversation multi-utilisateurs"
+
+#, fuzzy
+#~ msgid ""
+#~ "%(room_jid)s is already in your contact list. Please check if "
+#~ "%(room_jid)s is a correct group chat name. If it is, delete it from your "
+#~ "contact list and try joining the group chat again."
+#~ msgstr ""
+#~ "%(room_jid)s est déjà dans votre liste de contacts. Veuillez vérifier si "
+#~ "%(room_jid)s est un JID de salon de discussion correcte. Dans ce cas, "
+#~ "supprimez-le de votre liste de contacts et réessayez de joindre le salon."
+
+#, fuzzy
+#~ msgid "Please choose a group chat"
+#~ msgstr "Veuillez choisir un salon"
+
+#~ msgid "Invalid Nickname"
+#~ msgstr "Nom d'utilisateur invalide"
+
+#~ msgid "Please choose a nickname"
+#~ msgstr "Veuillez choisir un surnom"
+
+#~ msgid "Wrong server"
+#~ msgstr "Mauvais serveur"
+
+#, fuzzy
+#~ msgid "%s is not a group chat server"
+#~ msgstr "%s n'est pas un serveur de salons de discussion"
+
+#, fuzzy
+#~ msgid ""
+#~ "How many lines to request from server when entering a group chat. -1 "
+#~ "means no limit."
+#~ msgstr ""
+#~ "Le nombre de lignes d'archives qui seront demandées en entrant dans un "
+#~ "salon. -1 signifie \"pas de limitation\""
+
+#, fuzzy
+#~ msgid ""
+#~ "Minutes of backlog to request when entering a group chat. -1 means no "
+#~ "limit."
+#~ msgstr ""
+#~ "Le nombre de minutes d'archives qui seront demandées en entrant dans un "
+#~ "salon. -1 signifie \"pas de limitation\""
+
+#, fuzzy
+#~ msgid ""
+#~ "How many lines to request from server when entering a group chat. -1 "
+#~ "means no limit, -2 means global value."
+#~ msgstr ""
+#~ "Le nombre de lignes d'archives qui seront demandées en entrant dans un "
+#~ "salon. -1 signifie \"pas de limitation\", -2 signifie \"valeur globale\""
+
+#, fuzzy
+#~ msgid ""
+#~ "Minutes of backlog to request when entering a group chat. -1 means no "
+#~ "limit, -2 means global value."
+#~ msgstr ""
+#~ "Le nombre de minutes d'archives qui seront demandées en entrant dans un "
+#~ "salon. -1 signifie \"pas de limitation\", -2 signifie \"valeur globale\""
+
+#, fuzzy
+#~ msgid "A Password is required to join the group chat %s. Please type it."
+#~ msgstr ""
+#~ "Un mot de passe est requis pour rejoindre le salon %s. Veuillez le taper."
+
+#~ msgid "Not in Roster"
+#~ msgstr "Absent de la liste"
+
+#~ msgid "I would like to add you to my roster"
+#~ msgstr "Je souhaiterais vous ajouter à ma liste de contacts"
+
+#~ msgid "Add to Roster"
+#~ msgstr "Ajouter à la liste de contacts"
+
+#~ msgid "Audio Session"
+#~ msgstr "Session audio"
+
+#~ msgid "Video Session"
+#~ msgstr "Session vidéo"
+
+#~ msgid "Manage Room"
+#~ msgstr "Gérer le salon"
+
+#~ msgid "Configure Room"
+#~ msgstr "Configurer le salon"
+
+#~ msgid "Destroy Room"
+#~ msgstr "Détruire le salon"
+
+#~ msgid "Change Nick"
+#~ msgstr "Changer de surnom"
+
+#~ msgid "Disconnect"
+#~ msgstr "Déconnecter"
+
+#~ msgid "Copy JID"
+#~ msgstr "Copier le JID"
+
+#~ msgid "Add to Roster…"
+#~ msgstr "Ajouter à la liste de contacts…"
+
+#~ msgid "Copy JID/Email"
+#~ msgstr "Copier l'identifiant Jabber / l'adresse électronique"
+
+#~ msgid "JID: <i>%s</i>"
+#~ msgstr "JID : <i>%s</i>"
+
+#~ msgid "Changing Subject"
+#~ msgstr "Changement de Sujet"
+
+#~ msgid "Please specify the new subject:"
+#~ msgstr "Saisissez le nouveau sujet :"
+
+#~ msgid "Room logging is now enabled"
+#~ msgstr "L’enregistrement des conversations du salon est maintenant activé"
+
+#~ msgid "Room logging is now disabled"
+#~ msgstr ""
+#~ "L’enregistrement des conversations du salon est maintenant désactivé"
+
+#~ msgid "You (%s) joined the room"
+#~ msgstr "Vous (%s) avez rejoint le salon de discussion"
+
+#~ msgid "Room logging is enabled"
+#~ msgstr "L’enregistrement des conversations du salon est activé"
+
+#~ msgid "Unable to join groupchat"
+#~ msgstr "Impossible de rejoindre le salon"
+
+#~ msgid "Groupchat Invitation"
+#~ msgstr "Invitation à un salon"
+
+#~ msgid "%(jid)s has been invited in this room"
+#~ msgstr "%(jid)s a été invité dans ce salon"
+
+#~ msgid "JID is not a Groupchat"
+#~ msgstr "JID n'est pas un salon de discussion"
+
+#~ msgid "Invalid JID"
+#~ msgstr "Identifiant Jabber invalide"
+
+#~ msgid "A connection is not available"
+#~ msgstr "Aucune connexion disponible"
+
+#~ msgid "JID already in list"
+#~ msgstr "JID déjà dans la liste"
+
+#~ msgid "Unsecure"
+#~ msgstr "Non sécurisé"
+
+#~ msgid "For the chosen encryption there is no encryption method available"
+#~ msgstr "Aucune méthode disponible pour le chiffrement choisi"
+
+#~ msgid "Removes contact from roster"
+#~ msgstr "Enlever le contact de la liste"
+
+#~ msgid "Not in roster"
+#~ msgstr "Pas dans la liste"
+
+#~ msgid "Contact signed in notification color."
+#~ msgstr "Couleur des notifications lorsqu'un contact se connecte."
+
+#~ msgid "Contact signout notification color"
+#~ msgstr "Couleur des notifications lorsqu'un contact se déconnecte."
+
+#~ msgid "File transfer request notification color."
+#~ msgstr "Couleur des notifications pour une demande de transfert de fichier"
+
+#~ msgid "File transfer error notification color."
+#~ msgstr "Couleur des notifications pour une erreur de transfert de fichier"
+
+#~ msgid "File transfer complete or stopped notification color."
+#~ msgstr ""
+#~ "Couleur des notifications lorsqu'un transfert de fichier est terminé"
+
+#~ msgid "Groupchat invitation notification color"
+#~ msgstr ""
+#~ "Couleur des notifications pour une invitation dans un salon de discussion"
+
+#~ msgid "Other dialogs color."
+#~ msgstr "Couleur des autres fenêtres."
+
+#~ msgid "Add * and [n] in roster title?"
+#~ msgstr "Ajouter * et [n] au titre de la liste des contacts ?"
+
+#~ msgid "Hides the banner in two persons chat window"
+#~ msgstr "Cache la bannière dans les fenêtres de discussions"
+
+#~ msgid ""
+#~ "Show the confirm metacontacts creation dialog or not? Empty string means "
+#~ "never show the dialog."
+#~ msgstr ""
+#~ "Afficher ou non la fenêtre de dialogue de confirmation de la création de "
+#~ "métacontacts ? Une valeur vide signifie ne jamais l'afficher."
+
+#~ msgid "If true, You will also see your webcam"
+#~ msgstr "Si activé, vous verrez également votre webcam"
+
+#~ msgid "If the room subject is shown in chat on join"
+#~ msgstr ""
+#~ "Si le sujet du salon est affiche dans la conversation lorsqu'il est "
+#~ "rejoint"
+
+#~ msgid "Space separated list of ssl errors to ignore."
+#~ msgstr "Liste d'erreurs ssl, séparées par une virgule, à ignorer."
+
+#~ msgid "Answer to receipt requests"
+#~ msgstr "Répondre aux demandes d'accusés de réception"
+
+#~ msgid "Sent receipt requests"
+#~ msgstr "Envoyer des demandes d'accusés de réception"
+
+#~ msgid "Language for which misspelled words will be checked"
+#~ msgstr "Langue dans laquelle faire la vérification orthographique"
+
+#~ msgid "I'm eating, so leave me a message."
+#~ msgstr "Je mange, donc laissez moi un message."
+
+#~ msgid ""
+#~ "This message was encrypted with OpenPGP for XMPP and could not be "
+#~ "decrypted."
+#~ msgstr ""
+#~ "Ce message a été chiffre avec OpenGPG pour XMPP et ne peux pas être "
+#~ "déchiffré."
+
+#~ msgid "from room %s"
+#~ msgstr "du salon %s"
+
+#~ msgid "Leave Groupchats"
+#~ msgstr "Quitter des Groupes de Discussion"
+
+#~ msgid "Auto Join"
+#~ msgstr "Rejoindre automatiquement"
+
+#~ msgid "Room"
+#~ msgstr "Salon de discussion"
+
+#~ msgid "Jabber ID:"
+#~ msgstr "Identifiant Jabber :"
+
+#~ msgid "Occupant Actions"
+#~ msgstr "Actions des Occupants"
+
+#~ msgid "_Add to Roster"
+#~ msgstr "_Ajouter à la liste de contacts"
+
+#~ msgid "_Manage Room"
+#~ msgstr "_Gérer le Salon"
+
+#~ msgid "_Destroy Room"
+#~ msgstr "_Détruire le Salon"
+
+#~ msgid "Jabber ID"
+#~ msgstr "Identifiant Jabber"
+
+#, fuzzy
+#~ msgid "account"
+#~ msgstr "Compte"
+
+#~ msgid "Roster"
+#~ msgstr "Liste de contacts"
+
+#~ msgid "Show only in roster"
+#~ msgstr "Ne le montrer que dans la liste"
+
+#~ msgid "in _roster"
+#~ msgstr "dans le _roster"
+
+#~ msgid "Roster Appearance"
+#~ msgstr "Apparence de la fenêtre principale"
+
+#~ msgid "Show chatstate in roster"
+#~ msgstr "Afficher l’état de discussion dans la liste des contacts"
+
+#~ msgid "_Add to Roster..."
+#~ msgstr "_Ajouter à la liste de contacts..."
+
+#~ msgid "_Jabber ID:"
+#~ msgstr "Identifiant _Jabber :"
+
+#~ msgid "_Jabber ID"
+#~ msgstr "Identifiant _Jabber"
+
+#~ msgid "JabberID"
+#~ msgstr "Identifiant Jabber :"
+
+#~ msgid "Show Roster"
+#~ msgstr "Montrer la liste de contacts"
+
+#~ msgid "MUC server"
+#~ msgstr "Serveur de salon"
+
+#~ msgid "Roster Shortcuts"
+#~ msgstr "Raccourcis liste de contacts"
+
+#~ msgid "Room Configuration"
+#~ msgstr "Configuration du salon de discussion"
+
+#~ msgid "Join _Group Chat"
+#~ msgstr "Rejoindre un _salon de discussion"
+
+#~ msgid "Toggle audio session"
+#~ msgstr "Démarrer/arrêter une session audio"
+
+#~ msgid "Audio sessions are not available"
+#~ msgstr "Les sessions audio ne sont pas disponibles"
+
+#~ msgid "Conference"
+#~ msgstr "Conférences"
+
+#~ msgid "_Manage Bookmarks…"
+#~ msgstr "_Gérer les marque-pages…"
+
+#~ msgid "Hide _Roster"
+#~ msgstr "Cacher la liste de contacts"
+
+#~ msgid "Show _Roster"
+#~ msgstr "Montrer la _liste de contacts"
+
+#~ msgid "Invalid Room"
+#~ msgstr "Salon invalide"
+
+#~ msgid "Invalid room"
+#~ msgstr "Salon invalide"
+
+#~ msgid "A GTK+ Jabber client"
+#~ msgstr "Un client Jabber en GTK+"
+
+#~ msgid "Changing Nickname"
+#~ msgstr "Changement de Surnom"
+
+#~ msgid "Please specify the new nickname you want to use:"
+#~ msgstr "Saisissez le nouveau surnom que vous souhaitez utiliser :"
+
+#~ msgid "Bookmark already set"
+#~ msgstr "Marque-page déjà spécifié"
+
+#, fuzzy
+#~ msgid "Group Chat '%s' is already in your bookmarks."
+#~ msgstr "Le salon \"%s\" est déjà dans vos marque-pages."
+
+#~ msgid "Bookmark has been added successfully"
+#~ msgstr "Marque-page ajouté avec succès"
+
+#, fuzzy
+#~ msgid ""
+#~ "You can manage your bookmarks by clicking the Bookmarks menu item in your "
+#~ "contact list."
+#~ msgstr ""
+#~ "Vous pouvez gérer vos marque-pages par le menu Actions de votre liste de "
+#~ "contacts."
+
+#~ msgid "The nickname contains invalid characters."
+#~ msgstr "Le pseudonyme contient des caractères non valides."
+
+#~ msgid "Bookmark Room"
+#~ msgstr "Enregistrer ce salon dans les marque-pages"
+
+#~ msgid "_Join New Group Chat"
+#~ msgstr "_Joindre un salon de discussion"
+
+#, fuzzy
+#~ msgid "_Create Group Chat"
+#~ msgstr "Quitter des Groupes de Discussion"
+
+#~ msgid "Name:"
+#~ msgstr "Nom : "
+
+#~ msgid "Description:"
+#~ msgstr "Description :"
+
+#~ msgid "Address:"
+#~ msgstr "Adresse :"
+
+#~ msgid ""
+#~ "Semi-Anonymous\n"
+#~ "<span size=\"small\">(Only moderators can see your XMPP-Address)</span>"
+#~ msgstr ""
+#~ "Semi-anonyme\n"
+#~ "<span size=\"small\">(Les modérateurs seulement peuvent voir votre "
+#~ "adresse XMPP)</span>"
+
+#~ msgid "You can not start a new conversation unless you are connected."
+#~ msgstr ""
+#~ "Vous ne pouvez commencer une nouvelle conversation tant que vous n'êtes "
+#~ "pas connecté."
+
+#, fuzzy
+#~ msgid "Occupants"
+#~ msgstr "Actions des Occupants"
+
+#, fuzzy
+#~ msgid "File transfer error"
+#~ msgstr "Erreur de Transfert de fichier"
+
+#~ msgid "No Accounts available"
+#~ msgstr "Aucun compte disponible"
+
+#~ msgid "Boolean"
+#~ msgstr "Booléen"
+
+#~ msgid "Integer"
+#~ msgstr "Entier"
+
+#~ msgid "Text"
+#~ msgstr "Texte"
+
+#~ msgid "Value"
+#~ msgstr "Valeur"
+
+#~ msgid "Type"
+#~ msgstr "Type"
+
+#~ msgid "(None)"
+#~ msgstr "(Aucune)"
+
+#~ msgid "Hidden"
+#~ msgstr "Éléments masqués"
+
+#~ msgid "Manage Proxy Profiles"
+#~ msgstr "Gérer les profils des serveurs mandataires"
+
+#~ msgid "Properties"
+#~ msgstr "Propriétés"
+
+#~ msgid "Proxy _Host"
+#~ msgstr "Hôte du serveur mandataire"
+
+#~ msgid "Proxy _Port"
+#~ msgstr "_Port du serveur mandataire"
+
+#~ msgid "New Groupchat"
+#~ msgstr "Nouveau salon de discussion"
+
+#~ msgid "New Contact"
+#~ msgstr "Nouveau contact"
+
 #~ msgid "%s GiB"
 #~ msgstr "%s Gio"
 
@@ -10889,9 +11814,6 @@ msgstr "Gestionnaire de plugins"
 #~ msgid "_Pause"
 #~ msgstr "_Pause"
 
-#~ msgid "Clean _up"
-#~ msgstr "_Nettoyer"
-
 #~ msgid "Remove file transfer from the list."
 #~ msgstr "Supprimer le transfert de fichier de la liste."
 
@@ -10913,9 +11835,6 @@ msgstr "Gestionnaire de plugins"
 #~ "Quand le transfert de fichier est terminé, montrer une fenêtre de "
 #~ "notification"
 
-#~ msgid "Select Files"
-#~ msgstr "Sélectionner des fichiers"
-
 #~ msgid "From:"
 #~ msgstr "De :"
 
@@ -10946,9 +11865,6 @@ msgstr "Gestionnaire de plugins"
 #~ msgid "Status: "
 #~ msgstr "État : "
 
-#~ msgid "Aborted"
-#~ msgstr "Annulé"
-
 #~ msgid "Completed"
 #~ msgstr "Terminé"
 
@@ -11365,9 +12281,6 @@ msgstr "Gestionnaire de plugins"
 #~ msgid "You are invited to a groupchat"
 #~ msgstr "Vous êtes invité dans un groupe de discussion"
 
-#~ msgid "Do you want to accept the invitation?"
-#~ msgstr "Voulez-vous accepter l’invitation ?"
-
 #~ msgid ""
 #~ "<b>Issued to:</b>\n"
 #~ "Common Name (CN): %(scn)s\n"
@@ -11433,9 +12346,6 @@ msgstr "Gestionnaire de plugins"
 #~ msgid "Do you wish to delete all correspondence with the selected contacts?"
 #~ msgstr "Voulez vous réellement supprimer l'historique de ces contacts ?"
 
-#~ msgid "This can not be undone."
-#~ msgstr "Ceci ne peut pas être annulé."
-
 #~ msgid "<b>What do you want to do?</b>"
 #~ msgstr "<b>Que voulez vous faire ?</b>"
 
@@ -11634,9 +12544,6 @@ msgstr "Gestionnaire de plugins"
 #~ msgid "Nick"
 #~ msgstr "Pseudonyme"
 
-#~ msgid "Banning…"
-#~ msgstr "Bannissement de …"
-
 #~ msgid ""
 #~ "<b>Whom do you want to ban?</b>\n"
 #~ "\n"
@@ -11720,12 +12627,6 @@ msgstr "Gestionnaire de plugins"
 #~ msgid "Filter:"
 #~ msgstr "Filtre :"
 
-#~ msgid ""
-#~ "If checked, Gajim will display the mood of contacts in the roster window"
-#~ msgstr ""
-#~ "Si cette case est cochée, Gajim affichera l'humeur de chaque contact dans "
-#~ "votre roster"
-
 #~ msgid "Spell _checker"
 #~ msgstr "Vérificateur d'orthographe"
 
@@ -12048,10 +12949,6 @@ msgstr "Gestionnaire de plugins"
 #~ msgstr "Message d'état :"
 
 #, fuzzy
-#~ msgid "Group chat highlight"
-#~ msgstr "Message d'un salon mis en surbrillance :"
-
-#, fuzzy
 #~ msgid "Your nickname"
 #~ msgstr "Votre pseudo :"
 
@@ -12194,9 +13091,6 @@ msgstr "Gestionnaire de plugins"
 #~ msgid "The passwords typed in both fields must be identical."
 #~ msgstr "Les mots de passe tapés dans chaque champs doivent être identiques."
 
-#~ msgid "Enter new password:"
-#~ msgstr "Entrez un nouveau mot de passe :"
-
 #~ msgid "Enter it again for confirmation:"
 #~ msgstr "Entrez le à nouveau pour confirmer :"
 
@@ -12211,9 +13105,6 @@ msgstr "Gestionnaire de plugins"
 #~ msgid "unsubscribe request from %s"
 #~ msgstr "Requête de désinscription de la part de %s"
 
-#~ msgid "Autojoin"
-#~ msgstr "Rejoindre automatiquement"
-
 #~ msgid "&lt;empty&gt;"
 #~ msgstr "&lt;vide&gt;"
 
@@ -12322,9 +13213,6 @@ msgstr "Gestionnaire de plugins"
 #~ msgid "Forward unread message then disconnect"
 #~ msgstr "Transférer les messages non-lus et se déconnecter"
 
-#~ msgid "AIM Address:"
-#~ msgstr "Adresse AIM :"
-
 #~ msgid "MSN Address:"
 #~ msgstr "Adresse MSN :"
 
@@ -12372,9 +13260,6 @@ msgstr "Gestionnaire de plugins"
 #~ msgid "Session negotiation cancelled"
 #~ msgstr "Négociation annulée"
 
-#~ msgid "This session WILL be archived on server"
-#~ msgstr "Cette session sera archivée sur le serveur"
-
 #~ msgid "This session WILL NOT be archived on server"
 #~ msgstr "La session ne sera PAS archivée sur le serveur"
 
@@ -12756,9 +13641,6 @@ msgstr "Gestionnaire de plugins"
 #~ msgid "Server:"
 #~ msgstr "Serveur :"
 
-#~ msgid "Password:"
-#~ msgstr "Mot de passe :"
-
 #~ msgid "Join this room _automatically when I connect"
 #~ msgstr "Joindre ce s_alon de discussion quand je me connecte"
 
@@ -13117,9 +13999,6 @@ msgstr "Gestionnaire de plugins"
 #~ msgid "_Edit Personal Information..."
 #~ msgstr "_Éditer les informations personnelles…"
 
-#~ msgid "Information about you, as stored in the server"
-#~ msgstr "Les informations vous concernant, stockées sur le serveur"
-
 #~ msgid "<b>Personal Information</b>"
 #~ msgstr "<b>Informations personnelles</b>"
 
@@ -13198,9 +14077,6 @@ msgstr "Gestionnaire de plugins"
 #~ msgid "Your server can't save your personal information."
 #~ msgstr "Votre serveur ne peut enregistrer d'informations personnelles."
 
-#~ msgid "Account Local already exists."
-#~ msgstr "Ce compte existe déjà localement."
-
 #~ msgid "Please rename or remove it before enabling link-local messaging."
 #~ msgstr ""
 #~ "Veuillez le renommer et l'enlever avant d'activer la messagerie link-"
@@ -13437,10 +14313,6 @@ msgstr "Gestionnaire de plugins"
 #~ msgid "Contact's identity verified"
 #~ msgstr "Identité du contact vérifiée"
 
-#, fuzzy
-#~ msgid "Verify again…"
-#~ msgstr "Vérifier à nouveau..."
-
 #~ msgid ""
 #~ "To be certain that <b>only</b> the expected person can read your messages "
 #~ "or send you messages, you need to verify their identity by clicking the "
@@ -13569,9 +14441,6 @@ msgstr "Gestionnaire de plugins"
 #~ msgid "Add _Contact..."
 #~ msgstr "_Ajouter un contact..."
 
-#~ msgid "_Accounts"
-#~ msgstr "_Comptes"
-
 #~ msgid "P_lugins"
 #~ msgstr "P_lugins"
 
diff --git a/po/gl.po b/po/gl.po
index aec7d2b60..ee6508baf 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: 2019-07-02 02:06+0000\n"
+"POT-Creation-Date: 2019-08-11 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,71 +21,71 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 "X-Generator: KBabel 1.11.2\n"
 
-#: gajim/chat_control_base.py:550
+#: gajim/chat_control_base.py:557
 msgid "_Undo"
 msgstr ""
 
-#: gajim/chat_control_base.py:558 gajim/conversation_textview.py:529
+#: gajim/chat_control_base.py:565 gajim/conversation_textview.py:529
 msgid "_Clear"
 msgstr ""
 
-#: gajim/chat_control_base.py:563
+#: gajim/chat_control_base.py:570
 msgid "Paste as quote"
 msgstr ""
 
-#: gajim/chat_control_base.py:613
+#: gajim/chat_control_base.py:620
 #, fuzzy
 msgid "Paste Image"
 msgstr "Elixir unha imaxe"
 
-#: gajim/chat_control_base.py:614
+#: gajim/chat_control_base.py:621
 #, fuzzy
 msgid "You are trying to paste an image"
 msgstr "Non está conectado ao servidor"
 
-#: gajim/chat_control_base.py:615
+#: gajim/chat_control_base.py:622
 #, 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:617 gajim/groupchat_control.py:2310
-#: gajim/roster_window.py:2848 gajim/roster_window.py:4167
-#: gajim/message_window.py:252 gajim/gtk/dialogs.py:418
+#: gajim/chat_control_base.py:624 gajim/groupchat_control.py:2218
+#: gajim/roster_window.py:2841 gajim/roster_window.py:4118
+#: gajim/message_window.py:359 gajim/gtk/dialogs.py:330
 #, fuzzy
 msgid "_Do not ask me again"
 msgstr "_Non me preguntar outra vez"
 
-#: gajim/chat_control_base.py:620
+#: gajim/chat_control_base.py:627
 msgid "_Paste"
 msgstr ""
 
-#: gajim/chat_control_base.py:1162 gajim/gtk/accounts.py:351
+#: gajim/chat_control_base.py:1169 gajim/gtk/accounts.py:354
 #, fuzzy
 msgid "Privacy"
 msgstr "Listaxe de privacidade"
 
-#: gajim/chat_control_base.py:1163
+#: gajim/chat_control_base.py:1170
 #, fuzzy
 msgid "Warning"
 msgstr "A expulsar %s"
 
-#: gajim/chat_control_base.py:1164
+#: gajim/chat_control_base.py:1171
 #, python-format
 msgid "If you send a file to <b>%s</b>, your real JID will be revealed."
 msgstr ""
 
-#: gajim/chat_control_base.py:1169
+#: gajim/chat_control_base.py:1176
 #, fuzzy
 msgid "Continue"
 msgstr "_Continuar"
 
-#: gajim/gtkgui_helpers.py:163 gajim/gtk/filetransfer.py:393
+#: gajim/gtkgui_helpers.py:163 gajim/gtk/filetransfer.py:398
 #, fuzzy, python-format
 msgid "Cannot overwrite existing file '%s'"
 msgstr "Non se pode sobrescribir o ficheiro existente \"%s\""
 
-#: gajim/gtkgui_helpers.py:164 gajim/gtk/filetransfer.py:394
+#: gajim/gtkgui_helpers.py:164 gajim/gtk/filetransfer.py:399
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
@@ -184,391 +184,400 @@ msgstr ""
 msgid " resource with priority "
 msgstr " recurso con prioridade "
 
-#: gajim/gui_menu_builder.py:96
-#, fuzzy
-msgid "_New Group Chat"
-msgstr "Novo grupo de charla"
+#: gajim/gui_menu_builder.py:251 gajim/gui_menu_builder.py:342
+#: gajim/chat_control.py:305 gajim/roster_window.py:783
+#: gajim/roster_window.py:1716 gajim/roster_window.py:1718
+#: gajim/roster_window.py:2027 gajim/roster_window.py:3292
+#: gajim/roster_window.py:3325 gajim/gui_interface.py:396
+#: gajim/common/contacts.py:222 gajim/common/contacts.py:359
+#: gajim/common/contacts.py:471 gajim/common/helpers.py:86
+#: gajim/common/helpers.py:317 gajim/gtk/add_contact.py:319
+#: gajim/gtk/subscription_request.py:70 gajim/gtk/subscription_request.py:99
+#: gajim/gtk/roster_item_exchange.py:112
+#, fuzzy
+msgid "Not in contact list"
+msgstr "Amosar os contactos desconectados"
 
-#: gajim/gui_menu_builder.py:289 gajim/gui_menu_builder.py:380
-#: gajim/chat_control.py:303 gajim/roster_window.py:786
-#: gajim/roster_window.py:1719 gajim/roster_window.py:1721
-#: gajim/roster_window.py:2030 gajim/roster_window.py:3336
-#: gajim/roster_window.py:3369 gajim/gui_interface.py:413
-#: gajim/common/contacts.py:206 gajim/common/contacts.py:343
-#: gajim/common/helpers.py:83 gajim/common/helpers.py:311
-#: gajim/gtk/add_contact.py:319 gajim/gtk/subscription_request.py:70
-#: gajim/gtk/subscription_request.py:99 gajim/gtk/roster_item_exchange.py:112
-msgid "Not in Roster"
-msgstr "Non está na listaxe"
-
-#: gajim/gui_menu_builder.py:393
-msgid "I would like to add you to my roster"
-msgstr "Gustaríame engadilo á miña listaxe de contactos"
+#: gajim/gui_menu_builder.py:355
+#, 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:471
+#: gajim/gui_menu_builder.py:433
 #, fuzzy
 msgid "Send Single _Message…"
 msgstr "Enviar mensaxe"
 
-#: gajim/gui_menu_builder.py:486
+#: gajim/gui_menu_builder.py:448
 #, fuzzy
 msgid "E_xecute Command…"
 msgstr "Executar o _comando..."
 
-#: gajim/gui_menu_builder.py:494
+#: gajim/gui_menu_builder.py:456
 #, fuzzy
 msgid "_Manage Transport"
 msgstr "Transportes"
 
-#: gajim/gui_menu_builder.py:500
+#: gajim/gui_menu_builder.py:462
 #, fuzzy
 msgid "_Modify Transport"
 msgstr "Amosar os trans_portes"
 
-#: gajim/gui_menu_builder.py:507 gajim/roster_window.py:5046
+#: gajim/gui_menu_builder.py:469 gajim/roster_window.py:4985
 #, fuzzy
 msgid "_Rename…"
 msgstr "Renomear"
 
-#: gajim/gui_menu_builder.py:518 gajim/roster_window.py:5062
-#: gajim/roster_window.py:5177 gajim/data/gui/blocked_contacts_window.ui:52
+#: gajim/gui_menu_builder.py:480 gajim/roster_window.py:5001
+#: gajim/roster_window.py:5116 gajim/data/gui/blocked_contacts_window.ui:52
 #: gajim/data/gui/gc_occupants_menu.ui:148
 #: gajim/data/gui/contact_context_menu.ui:143
 msgid "_Unblock"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:521 gajim/roster_window.py:5067
-#: gajim/roster_window.py:5181 gajim/data/gui/gc_occupants_menu.ui:140
+#: gajim/gui_menu_builder.py:483 gajim/roster_window.py:5006
+#: gajim/roster_window.py:5120 gajim/data/gui/gc_occupants_menu.ui:140
 #: gajim/data/gui/contact_context_menu.ui:151
 msgid "_Block"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:529 gajim/roster_window.py:5074
+#: gajim/gui_menu_builder.py:491 gajim/roster_window.py:5013
 #: gajim/data/gui/contact_context_menu.ui:181
 #, fuzzy
 msgid "Remo_ve"
 msgstr "_Eliminar"
 
-#: gajim/gui_menu_builder.py:539 gajim/data/gui/contact_context_menu.ui:198
+#: gajim/gui_menu_builder.py:501 gajim/data/gui/contact_context_menu.ui:198
 #, fuzzy
 msgid "_Information"
 msgstr "Información"
 
-#: gajim/gui_menu_builder.py:552
+#: gajim/gui_menu_builder.py:514
 #, fuzzy
 msgid "Save _As"
 msgstr "Ten "
 
-#: gajim/gui_menu_builder.py:564 gajim/groupchat_control.py:501
-#: gajim/chat_control.py:340
+#: gajim/gui_menu_builder.py:526 gajim/groupchat_control.py:507
+#: gajim/chat_control.py:342
 #, fuzzy
 msgid "Send File…"
 msgstr "Enviar ficheiro"
 
-#: gajim/gui_menu_builder.py:565
+#: gajim/gui_menu_builder.py:527
 #, fuzzy
 msgid "Upload File…"
 msgstr "Gardar o ficheiro como..."
 
-#: gajim/gui_menu_builder.py:566
+#: gajim/gui_menu_builder.py:528
 #, fuzzy
 msgid "Send File Directly…"
 msgstr "Gardar o ficheiro como..."
 
-#: gajim/gui_menu_builder.py:568 gajim/gui_menu_builder.py:632
+#: gajim/gui_menu_builder.py:530 gajim/gui_menu_builder.py:596
 #, fuzzy
 msgid "Send Chatstate"
 msgstr "Último estado: %s"
 
-#: gajim/gui_menu_builder.py:569
+#: gajim/gui_menu_builder.py:531
 #, fuzzy
 msgid "Invite Contacts"
 msgstr "Contactos"
 
-#: gajim/gui_menu_builder.py:570
+#: gajim/gui_menu_builder.py:532
 #, fuzzy
-msgid "Add to Roster"
-msgstr "_Engadir á listaxe de contactos"
+msgid "Add to Contact List"
+msgstr "_Engadir un contacto..."
 
-#: gajim/gui_menu_builder.py:571
-msgid "Audio Session"
-msgstr ""
+#: gajim/gui_menu_builder.py:533
+#, fuzzy
+msgid "Voice Chat"
+msgstr "Solicitude de transferencia de ficheiro"
 
-#: gajim/gui_menu_builder.py:572
-msgid "Video Session"
-msgstr ""
+#: gajim/gui_menu_builder.py:534
+#, fuzzy
+msgid "Video Chat"
+msgstr "Charla privada"
 
-#: gajim/gui_menu_builder.py:573
+#: gajim/gui_menu_builder.py:535 gajim/gui_menu_builder.py:582
 #, fuzzy
 msgid "Information"
 msgstr "Información"
 
-#: gajim/gui_menu_builder.py:574 gajim/gui_menu_builder.py:639
+#: gajim/gui_menu_builder.py:536 gajim/gui_menu_builder.py:602
 #: gajim/data/gui/application_menu.ui:37
 #, fuzzy
 msgid "History"
 msgstr "_Historial"
 
-#: gajim/gui_menu_builder.py:580 gajim/gui_menu_builder.py:687
+#: gajim/gui_menu_builder.py:542 gajim/gui_menu_builder.py:650
 #: gajim/data/gui/preferences_window.ui:1823
 msgid "Disabled"
 msgstr "Desactivado"
 
-#: gajim/gui_menu_builder.py:581 gajim/gui_menu_builder.py:688
+#: gajim/gui_menu_builder.py:543 gajim/gui_menu_builder.py:651
 #, fuzzy
 msgid "Composing only"
 msgstr "A compor"
 
-#: gajim/gui_menu_builder.py:582 gajim/gui_menu_builder.py:689
+#: gajim/gui_menu_builder.py:544 gajim/gui_menu_builder.py:652
 #, fuzzy
 msgid "All chat states"
 msgstr "Todos os estados"
 
-#: gajim/gui_menu_builder.py:620
+#: gajim/gui_menu_builder.py:583
 #, fuzzy
-msgid "Manage Room"
-msgstr "Xestionar os marcadores"
+msgid "Manage Group Chat"
+msgstr "Novo grupo de charla"
 
-#: gajim/gui_menu_builder.py:621
+#: gajim/gui_menu_builder.py:584 gajim/data/gui/groupchat_control.ui:649
 #, fuzzy
 msgid "Change Subject"
 msgstr "Cambiar o _tema"
 
-#: gajim/gui_menu_builder.py:622
+#: gajim/gui_menu_builder.py:585
 #, fuzzy
-msgid "Configure Room"
-msgstr "Configurar a sala"
+msgid "Configure Group Chat"
+msgstr "Novo grupo de charla"
 
-#: gajim/gui_menu_builder.py:623
+#: gajim/gui_menu_builder.py:586
 #, fuzzy
 msgid "Upload Avatar…"
 msgstr "Elixir unha imaxe"
 
-#: gajim/gui_menu_builder.py:624
+#: gajim/gui_menu_builder.py:587
 #, fuzzy
-msgid "Destroy Room"
-msgstr "Descrición: %s"
+msgid "Destroy Group Chat"
+msgstr "Novo grupo de charla"
 
-#: gajim/gui_menu_builder.py:626 gajim/data/gui/preferences_window.ui:790
+#: gajim/gui_menu_builder.py:589 gajim/data/gui/preferences_window.ui:790
 #, fuzzy
 msgid "Chat Settings"
 msgstr "Fallou a conexión"
 
-#: gajim/gui_menu_builder.py:627
+#: gajim/gui_menu_builder.py:590
 msgid "Show join/leave"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:628
+#: gajim/gui_menu_builder.py:591
 #, fuzzy
 msgid "Show status changes"
 msgstr "_Rexistrar os cambios de estado dos contactos"
 
-#: gajim/gui_menu_builder.py:629 gajim/data/gui/gc_control_popup_menu.ui:72
+#: gajim/gui_menu_builder.py:592 gajim/data/gui/gc_control_popup_menu.ui:72
 #, fuzzy
 msgid "Notify on all messages"
 msgstr "Mensaxes predefinidas:"
 
-#: gajim/gui_menu_builder.py:630
+#: gajim/gui_menu_builder.py:593
 msgid "Minimize on close"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:631
-msgid "Minimize on autojoin"
+#: gajim/gui_menu_builder.py:595
+msgid "Minimize when joining automatically"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:634
+#: gajim/gui_menu_builder.py:598
 msgid "Sync Threshold"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:635
+#: gajim/gui_menu_builder.py:599
 #, fuzzy
-msgid "Change Nick"
+msgid "Change Nickname"
 msgstr "Cambiar o _alcume"
 
-#: gajim/gui_menu_builder.py:636
-#, fuzzy
-msgid "Bookmark Room"
-msgstr "Engadir esta sala aos marcadores"
-
-#: gajim/gui_menu_builder.py:637
+#: gajim/gui_menu_builder.py:600
 #, fuzzy
 msgid "Request Voice"
 msgstr "_Voz"
 
-#: gajim/gui_menu_builder.py:638 gajim/roster_window.py:5246
+#: gajim/gui_menu_builder.py:601 gajim/roster_window.py:5185
 #, fuzzy
 msgid "Execute command"
 msgstr "Executar o _comando..."
 
-#: gajim/gui_menu_builder.py:640
-#, fuzzy
-msgid "Disconnect"
-msgstr "Contacto desconectado"
+#: gajim/gui_menu_builder.py:603
+msgid "Leave"
+msgstr ""
 
-#: gajim/gui_menu_builder.py:678 gajim/gtk/preferences.py:156
+#: gajim/gui_menu_builder.py:641 gajim/gtk/preferences.py:155
 msgid "No threshold"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:680 gajim/gtk/preferences.py:158
+#: gajim/gui_menu_builder.py:643 gajim/gtk/preferences.py:157
 #, 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:709 gajim/gui_menu_builder.py:747
-#: gajim/gtk/join_groupchat.py:43
-msgid "Join Group Chat"
-msgstr "Entrar nunha sala de charlas"
-
-#: gajim/gui_menu_builder.py:746
+#: gajim/gui_menu_builder.py:672
 #, fuzzy
 msgid "Add Contact…"
 msgstr "_Engadir un contacto..."
 
-#: gajim/gui_menu_builder.py:748 gajim/gtk/profile.py:52
-#: gajim/gtk/accounts.py:770 gajim/gtk/accounts.py:808
+#: gajim/gui_menu_builder.py:673 gajim/gtk/profile.py:52
+#: gajim/gtk/accounts.py:773 gajim/gtk/accounts.py:811
 #, fuzzy
 msgid "Profile"
 msgstr "ficheiro"
 
-#: gajim/gui_menu_builder.py:749
+#: gajim/gui_menu_builder.py:674
+#, fuzzy
+msgid "Send Single Message…"
+msgstr "Enviar mensaxe"
+
+#: gajim/gui_menu_builder.py:675
 #, fuzzy
 msgid "Discover Services"
 msgstr "_Descubrir os servizos"
 
-#: gajim/gui_menu_builder.py:750
+#: gajim/gui_menu_builder.py:676 gajim/gtk/server_info.py:36
 #, fuzzy
-msgid "Send Single Message…"
-msgstr "Enviar mensaxe"
+msgid "Server Info"
+msgstr "Servidor"
 
-#: gajim/gui_menu_builder.py:751 gajim/data/gui/preferences_window.ui:2741
+#: gajim/gui_menu_builder.py:677 gajim/data/gui/preferences_window.ui:2741
 msgid "Advanced"
 msgstr "Avanzado"
 
-#: gajim/gui_menu_builder.py:752 gajim/gtk/mam_preferences.py:88
+#: gajim/gui_menu_builder.py:678 gajim/gtk/mam_preferences.py:88
 #, fuzzy
 msgid "Archiving Preferences"
 msgstr "_Preferencias"
 
-#: gajim/gui_menu_builder.py:753
+#: gajim/gui_menu_builder.py:679
 #, fuzzy
 msgid "Blocking List"
 msgstr "Listaxe de expulsión"
 
-#: gajim/gui_menu_builder.py:754 gajim/gtk/history_sync.py:108
+#: gajim/gui_menu_builder.py:680
+#, fuzzy
+msgid "Bookmarks"
+msgstr "Engadir esta sala aos marcadores"
+
+#: gajim/gui_menu_builder.py:681
+#, fuzzy
+msgid "PEP Configuration"
+msgstr "Configuración da sala"
+
+#: gajim/gui_menu_builder.py:682 gajim/gtk/history_sync.py:108
 #: gajim/gtk/history_sync.py:186
 #, fuzzy
 msgid "Synchronise History"
 msgstr "Amosar os contactos desconectados"
 
-#: gajim/gui_menu_builder.py:755 gajim/gtk/privacy_list.py:427
+#: gajim/gui_menu_builder.py:683 gajim/gtk/privacy_list.py:427
 msgid "Privacy Lists"
 msgstr "Listaxes de privacidade"
 
-#: gajim/gui_menu_builder.py:756 gajim/gtk/server_info.py:36
-#, fuzzy
-msgid "Server Info"
-msgstr "Servidor"
-
-#: gajim/gui_menu_builder.py:757 gajim/gui_menu_builder.py:768
+#: gajim/gui_menu_builder.py:685 gajim/gui_menu_builder.py:696
 #: gajim/data/gui/xml_console_window.ui:77
 msgid "XML Console"
 msgstr "Consola XML"
 
-#: gajim/gui_menu_builder.py:759 gajim/data/gui/groupchat_config.ui:36
+#: gajim/gui_menu_builder.py:687 gajim/data/gui/groupchat_config.ui:36
 #, fuzzy
 msgid "Admin"
 msgstr "_Administrar"
 
-#: gajim/gui_menu_builder.py:760
+#: gajim/gui_menu_builder.py:688
 #, fuzzy
 msgid "Send Server Message…"
 msgstr "_Enviar a mensaxe do servidor"
 
-#: gajim/gui_menu_builder.py:761
+#: gajim/gui_menu_builder.py:689
 #, fuzzy
 msgid "Set MOTD…"
 msgstr "Definir a MDD"
 
-#: gajim/gui_menu_builder.py:762
+#: gajim/gui_menu_builder.py:690
 #, fuzzy
 msgid "Update MOTD…"
 msgstr "Actualizar a MDD"
 
-#: gajim/gui_menu_builder.py:763
+#: gajim/gui_menu_builder.py:691
 #, fuzzy
 msgid "Delete MOTD…"
 msgstr "Eliminar MDD"
 
-#: gajim/gui_menu_builder.py:812
+#: gajim/gui_menu_builder.py:736
 #, fuzzy
-msgid "No Accounts available"
-msgstr "A conta non está dispoñíbel"
+msgid "_Add Account…"
+msgstr "_Engadir un contacto..."
+
+#: gajim/gui_menu_builder.py:742
+#, fuzzy
+msgid "_Modify Accounts…"
+msgstr "Modificar conta"
+
+#: gajim/gui_menu_builder.py:751 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:823 gajim/data/gui/application_menu.ui:5
-#: gajim/data/gui/application_menu.ui:71 gajim/data/gui/shortcuts_window.ui:182
-#: gajim/gtk/accounts.py:58
+#: gajim/gui_menu_builder.py:755 gajim/data/gui/application_menu.ui:5
+#: gajim/data/gui/shortcuts_window.ui:182 gajim/gtk/accounts.py:57
 msgid "Accounts"
 msgstr "Contas"
 
-#: gajim/gui_menu_builder.py:881 gajim/gui_menu_builder.py:886
+#: gajim/gui_menu_builder.py:784 gajim/gui_menu_builder.py:789
 #, fuzzy
-msgid "Copy JID"
-msgstr "Sala:"
+msgid "Copy XMPP Address"
+msgstr "_Copiar o enderezo"
 
-#: gajim/gui_menu_builder.py:882 gajim/gui_menu_builder.py:914
+#: gajim/gui_menu_builder.py:785 gajim/gui_menu_builder.py:817
 #, fuzzy
 msgid "Join Groupchat"
 msgstr "Entrar nunha sala de charlas"
 
-#: gajim/gui_menu_builder.py:887 gajim/gui_menu_builder.py:913
-#: gajim/data/gui/application_menu.ui:76
+#: gajim/gui_menu_builder.py:790 gajim/gui_menu_builder.py:816
+#: gajim/data/gui/application_menu.ui:71
 #: gajim/data/gui/subscription_request_window.ui:106
 msgid "Start Chat"
 msgstr "Iniciar a charla"
 
-#: gajim/gui_menu_builder.py:888 gajim/gui_menu_builder.py:915
+#: gajim/gui_menu_builder.py:791 gajim/gui_menu_builder.py:818
 #, fuzzy
-msgid "Add to Roster…"
-msgstr "_Engadir á listaxe de contactos"
+msgid "Add to Contact List…"
+msgstr "_Engadir un contacto..."
 
-#: gajim/gui_menu_builder.py:893
+#: gajim/gui_menu_builder.py:796
 #, fuzzy
 msgid "Copy Link Location"
 msgstr "_Copiar o enderezo da ligazón"
 
-#: gajim/gui_menu_builder.py:894
+#: gajim/gui_menu_builder.py:797
 #, fuzzy
 msgid "Open Link in Browser"
 msgstr "_Abrir a ligazón no navegador"
 
-#: gajim/gui_menu_builder.py:899
+#: gajim/gui_menu_builder.py:802
 #, fuzzy
 msgid "Copy Email Address"
 msgstr "_Copiar o enderezo"
 
-#: gajim/gui_menu_builder.py:900 gajim/gui_menu_builder.py:912
+#: gajim/gui_menu_builder.py:803 gajim/gui_menu_builder.py:815
 #, fuzzy
 msgid "Open Email Composer"
 msgstr "_Abrir o editor de correo"
 
-#: gajim/gui_menu_builder.py:905
+#: gajim/gui_menu_builder.py:808
 #, fuzzy
 msgid "Copy Location"
 msgstr "_Copiar o enderezo da ligazón"
 
-#: gajim/gui_menu_builder.py:906
+#: gajim/gui_menu_builder.py:809
 #, fuzzy
 msgid "Show Location"
 msgstr "Modificar a conta"
 
-#: gajim/gui_menu_builder.py:911
+#: gajim/gui_menu_builder.py:814
 #, fuzzy
-msgid "Copy JID/Email"
+msgid "Copy XMPP Address/Email"
 msgstr "_Copiar o enderezo"
 
-#: gajim/gui_menu_builder.py:945
+#: gajim/gui_menu_builder.py:852
 #, fuzzy
 msgid "Copy"
 msgstr "Sala:"
@@ -591,44 +600,55 @@ msgstr ""
 msgid "Choose folder for logfile"
 msgstr ""
 
-#: gajim/history_manager.py:107
+#: gajim/history_manager.py:106
 msgid "Cannot find history logs database"
 msgstr "Non se pode achar a base de datos do historial"
 
-#: gajim/history_manager.py:108
+#: gajim/history_manager.py:107
 #, fuzzy, python-format
 msgid "%s does not exist."
 msgstr "Non existe o grupo de charla."
 
-#: gajim/history_manager.py:141 gajim/history_manager.py:195
-#: gajim/gtk/discovery.py:829 gajim/gtk/roster_item_exchange.py:80
-msgid "JID"
-msgstr "JID"
+#: gajim/history_manager.py:140 gajim/history_manager.py:194
+#: 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:30
+#: gajim/gtk/accounts.py:804
+#, fuzzy
+msgid "XMPP Address"
+msgstr "Enderezo de AIM:"
 
-#: gajim/history_manager.py:154 gajim/history_manager.py:202
+#: gajim/history_manager.py:153 gajim/history_manager.py:201
 #: gajim/data/gui/history_window.ui:89 gajim/gtk/history.py:108
 msgid "Date"
 msgstr "Data"
 
-#: gajim/history_manager.py:161 gajim/history_manager.py:225
+#: gajim/history_manager.py:160 gajim/history_manager.py:224
 #: gajim/data/gui/join_groupchat_window.ui:208
 #: gajim/data/gui/profile_window.ui:214
 #: gajim/data/gui/vcard_information_window.ui:443
+#: gajim/data/gui/bookmarks.ui:140
 msgid "Nickname"
 msgstr "Alcume"
 
-#: gajim/history_manager.py:172 gajim/history_manager.py:211
+#: gajim/history_manager.py:171 gajim/history_manager.py:210
 #: gajim/data/gui/preferences_window.ui:1344
 #: gajim/data/gui/single_message_window.ui:275 gajim/gtk/history.py:117
 msgid "Message"
 msgstr "Mensaxe"
 
-#: gajim/history_manager.py:180 gajim/history_manager.py:218
+#: gajim/history_manager.py:179 gajim/history_manager.py:217
 #: gajim/data/gui/groups_post_window.ui:49
 #: gajim/data/gui/single_message_window.ui:214
 msgid "Subject"
 msgstr "Asunto"
 
+#: gajim/history_manager.py:247
+msgid "Database Cleanup"
+msgstr ""
+
 #: gajim/history_manager.py:248
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
@@ -640,11 +660,8 @@ msgstr ""
 #: gajim/history_manager.py:250
 #, fuzzy
 msgid ""
-"Normally allocated database size will not be freed, it will just become "
-"reusable. If you really want to reduce database filesize, click YES, else "
-"click NO.\n"
-"\n"
-"In case you click YES, please wait…"
+"Normally, the allocated database size will not be freed, it will just become "
+"reusable. This operation may take a while."
 msgstr ""
 "Normalmente, o tamaño que se lle asigna á base de datos non se libera; "
 "simplemente volve poder usarse. Se o que quere é reducir o tamaño da base de "
@@ -653,47 +670,48 @@ msgstr ""
 "Caso de elixir SI, por favor, agarde..."
 
 #: gajim/history_manager.py:255
-msgid "Database Cleanup"
-msgstr ""
+#, fuzzy
+msgid "_Cleanup"
+msgstr "Limpar"
 
-#: gajim/history_manager.py:519 gajim/gtk/filetransfer.py:238
-#: gajim/gtk/filetransfer.py:248
+#: gajim/history_manager.py:518 gajim/gtk/filetransfer.py:237
+#: gajim/gtk/filetransfer.py:247
 msgid "You"
 msgstr "Vostede"
 
-#: gajim/history_manager.py:531
+#: gajim/history_manager.py:530
 #, 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:568 gajim/history_manager.py:607
-#: gajim/gtk/dialogs.py:58 gajim/gtk/themes.py:319
+#: gajim/history_manager.py:567 gajim/history_manager.py:606
+#: gajim/gtk/dialogs.py:57 gajim/gtk/themes.py:319
 #: gajim/gtk/roster_item_exchange.py:75 gajim/gtk/roster_item_exchange.py:185
 msgid "Delete"
 msgstr "Eliminar"
 
-#: gajim/history_manager.py:569
+#: gajim/history_manager.py:568
 #, fuzzy
 msgid "Delete Conversation"
 msgid_plural "Delete Conversations"
 msgstr[0] "Información"
 msgstr[1] "Información"
 
-#: gajim/history_manager.py:570
+#: gajim/history_manager.py:569
 #, 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:608
+#: gajim/history_manager.py:607
 #, 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:609
+#: gajim/history_manager.py:608
 #, fuzzy
 msgid "Do you want to permanently delete this message"
 msgid_plural "Do you want to permanently delete these messages"
@@ -706,15 +724,15 @@ msgid "Contact name: <i>%s</i>"
 msgstr "Nome do contacto : <i>%s</i>"
 
 #: gajim/dialogs.py:84
-#, fuzzy, python-format
-msgid "JID: <i>%s</i>"
-msgstr "ID de Jabber : <i>%s</i>"
+#, python-format
+msgid "XMPP Address: <i>%s</i>"
+msgstr ""
 
-#: gajim/dialogs.py:115 gajim/dialogs.py:128 gajim/roster_window.py:2901
-#: gajim/roster_window.py:3833 gajim/roster_window.py:5084
-#: gajim/common/contacts.py:157 gajim/common/contacts.py:190
+#: gajim/dialogs.py:115 gajim/dialogs.py:128 gajim/roster_window.py:2894
+#: gajim/roster_window.py:3784 gajim/roster_window.py:5023
+#: gajim/common/contacts.py:157 gajim/common/contacts.py:206
 #: gajim/data/gui/preferences_window.ui:558
-#: gajim/data/gui/shortcuts_window.ui:177 gajim/gtk/accounts.py:349
+#: gajim/data/gui/shortcuts_window.ui:177 gajim/gtk/accounts.py:352
 msgid "General"
 msgstr "Xeral"
 
@@ -763,7 +781,7 @@ msgstr ""
 "Este nome xa está en uso por outra das súas contas. Por favor, escolla outro "
 "nome."
 
-#: gajim/dialogs.py:703
+#: gajim/dialogs.py:703 gajim/plugins/gui.py:292
 msgid "_Overwrite"
 msgstr ""
 
@@ -775,9 +793,7 @@ msgstr "Gardar como mensaxe de estado predefinido"
 msgid "Please type a name for this status message"
 msgstr "Escriba un nome para esta mensaxe de estado"
 
-#: gajim/dialogs.py:740 gajim/gui_interface.py:1441 gajim/dialog_messages.py:31
-#: gajim/gtk/discovery.py:518 gajim/gtk/profile.py:323
-#: gajim/gtk/join_groupchat.py:234
+#: gajim/dialogs.py:740 gajim/gtk/discovery.py:517 gajim/gtk/profile.py:323
 msgid "You are not connected to the server"
 msgstr "Non está conectado ao servidor"
 
@@ -786,9 +802,11 @@ msgstr "Non está conectado ao servidor"
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Sen unha conexión, non pode cambiar o seu contrasinal."
 
-#: gajim/dialogs.py:752 gajim/dialogs.py:823 gajim/gtk/discovery.py:822
-#: gajim/gtk/discovery.py:1648 gajim/gtk/discovery.py:1941
-#: gajim/gtk/history.py:99 gajim/gtk/roster_item_exchange.py:83
+#: gajim/dialogs.py:752 gajim/dialogs.py:823
+#: gajim/data/gui/groupchat_info_scrolled.ui:16 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/gtk/roster_item_exchange.py:83
 msgid "Name"
 msgstr "Nome"
 
@@ -810,399 +828,345 @@ msgstr "Non pode entrar nunha sala de charla até que non se conecte."
 msgid "Synchronise"
 msgstr ""
 
-#: gajim/dialogs.py:1043
+#: gajim/dialogs.py:1042
 msgid "an audio and video"
 msgstr ""
 
-#: gajim/dialogs.py:1045
+#: gajim/dialogs.py:1044
 msgid "an audio"
 msgstr ""
 
-#: gajim/dialogs.py:1047
+#: gajim/dialogs.py:1046
 msgid "a video"
 msgstr ""
 
-#: gajim/dialogs.py:1051
+#: gajim/dialogs.py:1050
 #, python-format
 msgid ""
-"%(contact)s wants to start %(type)s session with you. Do you want to answer "
+"%(contact)s wants to start a %(type)s chat with you. Do you want to answer "
 "the call?"
 msgstr ""
 
-#: gajim/groupchat_control.py:505
+#: gajim/groupchat_control.py:511
 #, fuzzy, python-format
 msgid "Send File (max. %s MiB)…"
 msgstr "Gardar o ficheiro como..."
 
-#: gajim/groupchat_control.py:507 gajim/chat_control.py:342
+#: gajim/groupchat_control.py:513 gajim/chat_control.py:344
 #, fuzzy
 msgid "No File Transfer available"
 msgstr "Transferencias"
 
-#: gajim/groupchat_control.py:630 gajim/groupchat_control.py:2349
-msgid "Changing Subject"
-msgstr "Cambiando o asunto"
-
-#: gajim/groupchat_control.py:631 gajim/groupchat_control.py:2350
-msgid "Please specify the new subject:"
-msgstr "Especifique o asunto novo:"
-
-#: gajim/groupchat_control.py:638
-msgid "Changing Nickname"
-msgstr "Cambiando o alcume"
-
-#: gajim/groupchat_control.py:639
-msgid "Please specify the new nickname you want to use:"
-msgstr "Especifique o novo alcume que quere usar:"
-
-#: gajim/groupchat_control.py:657
+#: gajim/groupchat_control.py:655
 #, fuzzy
-msgid "Invalid group chat JID"
+msgid "Invalid group chat XMPP Address"
 msgstr "A ID de Jabber non é válida para o grupo de charla"
 
-#: gajim/groupchat_control.py:658
+#: gajim/groupchat_control.py:656
 #, fuzzy
-msgid "The group chat JID has not allowed characters."
+msgid "The group chat XMPP Address has not allowed characters."
 msgstr ""
 "A ID de Jabber para o grupo de charla contén caracteres que non se permiten."
 
-#: gajim/groupchat_control.py:758 gajim/gtk/profile.py:136
+#: gajim/groupchat_control.py:743 gajim/gtk/profile.py:136
 msgid "Could not load image"
 msgstr "Non foi posíbel cargar a imaxe"
 
-#: gajim/groupchat_control.py:888
+#: gajim/groupchat_control.py:873
 msgid "Insert Nickname"
 msgstr "Introducir alcume"
 
-#: gajim/groupchat_control.py:1056 gajim/chat_control.py:824
+#: gajim/groupchat_control.py:1041 gajim/chat_control.py:848
 #, fuzzy
 msgid "and authenticated"
 msgstr "Usar a autenticación"
 
-#: gajim/groupchat_control.py:1060 gajim/chat_control.py:828
+#: gajim/groupchat_control.py:1045 gajim/chat_control.py:852
 #, fuzzy
 msgid "and NOT authenticated"
 msgstr "Usar a autenticación"
 
-#: gajim/groupchat_control.py:1064
+#: gajim/groupchat_control.py:1049
 #, python-format
 msgid "%(type)s encryption is active %(authenticated)s."
 msgstr ""
 
-#: gajim/groupchat_control.py:1111
+#: gajim/groupchat_control.py:1096
 #, fuzzy
 msgid "Conversation with "
 msgstr "Historial de conversas"
 
-#: gajim/groupchat_control.py:1113
+#: gajim/groupchat_control.py:1098
 #, fuzzy
 msgid "Continued conversation"
 msgstr "Conexión"
 
-#: gajim/groupchat_control.py:1411
+#: gajim/groupchat_control.py:1357
 #, 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:1433
-msgid "Room now shows unavailable members"
+#: gajim/groupchat_control.py:1374
+msgid "Group chat now shows unavailable members"
 msgstr ""
 
-#: gajim/groupchat_control.py:1436
-msgid "Room now does not show unavailable members"
-msgstr ""
+#: gajim/groupchat_control.py:1377
+#, fuzzy
+msgid "Group chat now does not show unavailable members"
+msgstr "Non existe o grupo de charla."
 
-#: gajim/groupchat_control.py:1439
+#: gajim/groupchat_control.py:1380
 msgid "A setting not related to privacy has been changed"
 msgstr ""
 
-#: gajim/groupchat_control.py:1446
-msgid "Room logging is now enabled"
-msgstr ""
+#: gajim/groupchat_control.py:1387 gajim/groupchat_control.py:1659
+#, fuzzy
+msgid "Conversations are stored on the server"
+msgstr "Non está conectado ao servidor"
 
-#: gajim/groupchat_control.py:1449
-msgid "Room logging is now disabled"
-msgstr ""
+#: gajim/groupchat_control.py:1390
+#, fuzzy
+msgid "Conversations are not stored on the server"
+msgstr "A súa información, para se gardar no servidor"
 
-#: gajim/groupchat_control.py:1452
-msgid "Room is now non-anonymous"
-msgstr ""
+#: gajim/groupchat_control.py:1393
+#, fuzzy
+msgid "Group chat is now non-anonymous"
+msgstr "Grupos de charla"
 
-#: gajim/groupchat_control.py:1456
-msgid "Room is now semi-anonymous"
-msgstr ""
+#: gajim/groupchat_control.py:1397
+#, fuzzy
+msgid "Group chat is now semi-anonymous"
+msgstr "Remarcado da mensaxe de grupo de charla"
 
-#: gajim/groupchat_control.py:1460
-msgid "Room is now fully anonymous"
-msgstr ""
+#: gajim/groupchat_control.py:1401
+#, fuzzy
+msgid "Group chat is now fully anonymous"
+msgstr "Grupos de charla"
 
-#: gajim/groupchat_control.py:1500
+#: gajim/groupchat_control.py:1439
 #, python-format
 msgid "Ping? (%s)"
 msgstr ""
 
-#: gajim/groupchat_control.py:1503
+#: gajim/groupchat_control.py:1442
 #, python-format
 msgid "Pong! (%(nick)s %(delay)s s.)"
 msgstr ""
 
-#: gajim/groupchat_control.py:1506 gajim/chat_control.py:1213
+#: gajim/groupchat_control.py:1445 gajim/chat_control.py:1237
 #, fuzzy
 msgid "Error."
 msgstr "Erro de Avahi"
 
-#: gajim/groupchat_control.py:1711
+#: gajim/groupchat_control.py:1650
 #, fuzzy, python-format
-msgid "You (%s) joined the room"
+msgid "You (%s) joined the group chat"
 msgstr "%s entrou no grupo de charla"
 
-#: gajim/groupchat_control.py:1717
-msgid "Any occupant is allowed to see your full JID"
+#: gajim/groupchat_control.py:1655
+msgid "Any participant is allowed to see your full XMPP Address"
 msgstr ""
 
-#: gajim/groupchat_control.py:1721
-msgid "Room logging is enabled"
-msgstr ""
-
-#: gajim/groupchat_control.py:1725
-msgid "The server has assigned or modified your roomnick"
-msgstr ""
+#: gajim/groupchat_control.py:1663
+#, fuzzy
+msgid "The server has assigned or modified your nickname in this group chat"
+msgstr "Cambiar o _alcume"
 
-#: gajim/groupchat_control.py:1732
+#: gajim/groupchat_control.py:1671
 #, fuzzy
-msgid "A new room has been created"
+msgid "A new group chat has been created"
 msgstr "A súa conta nova creouse con éxito"
 
-#: gajim/groupchat_control.py:1740 gajim/privatechat_control.py:112
+#: gajim/groupchat_control.py:1679 gajim/privatechat_control.py:115
 #, python-format
 msgid "You are now known as %s"
 msgstr "Coñéceselle como %s"
 
-#: gajim/groupchat_control.py:1742 gajim/privatechat_control.py:114
+#: gajim/groupchat_control.py:1681 gajim/privatechat_control.py:117
 #, fuzzy, python-brace-format
 msgid "{nick} is now known as {new_nick}"
 msgstr "%s coñéceselle como %s"
 
-#: gajim/groupchat_control.py:1767 gajim/privatechat_control.py:141
+#: gajim/groupchat_control.py:1706 gajim/privatechat_control.py:144
 #, fuzzy, python-brace-format
 msgid "You are now {show}{status}"
 msgstr "Coñéceselle como %s"
 
-#: gajim/groupchat_control.py:1773 gajim/privatechat_control.py:147
+#: gajim/groupchat_control.py:1712 gajim/privatechat_control.py:150
 #, fuzzy, python-brace-format
 msgid "{nick} is now {show}{status}"
 msgstr "%(nick)s está agora %(status)s"
 
-#: gajim/groupchat_control.py:1790 gajim/groupchat_control.py:1819
-#: gajim/groupchat_control.py:1849 gajim/groupchat_control.py:1909
+#: gajim/groupchat_control.py:1729 gajim/groupchat_control.py:1758
+#: gajim/groupchat_control.py:1788 gajim/groupchat_control.py:1848
 #, python-brace-format
 msgid " by {actor}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1793
+#: gajim/groupchat_control.py:1732
 #, python-brace-format
 msgid "** Your Affiliation has been set to {affiliation}{actor}{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1799
+#: gajim/groupchat_control.py:1738
 #, python-brace-format
 msgid "** Affiliation of {nick} has been set to {affiliation}{actor}{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1822
+#: gajim/groupchat_control.py:1761
 #, fuzzy, python-brace-format
 msgid "** Your Role has been set to {role}{actor}{reason}"
 msgstr "%(nick)s foi expulsado por %(who)s: %(reason)s"
 
-#: gajim/groupchat_control.py:1827
+#: gajim/groupchat_control.py:1766
 #, fuzzy, python-brace-format
 msgid "** Role of {nick} has been set to {role}{actor}{reason}"
 msgstr "%(nick)s foi expulsado por %(who)s: %(reason)s"
 
-#: gajim/groupchat_control.py:1852
+#: gajim/groupchat_control.py:1791
 #, fuzzy, python-brace-format
-msgid "You have been removed from the room{actor}{reason}"
+msgid "You have been removed from the group chat{actor}{reason}"
 msgstr "%(nick)s foi expulsado por %(who)s: %(reason)s"
 
-#: gajim/groupchat_control.py:1857
+#: gajim/groupchat_control.py:1796
 #, python-brace-format
 msgid "You have left due to an error{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1863
+#: gajim/groupchat_control.py:1802
 #, python-brace-format
 msgid "You have been kicked{actor}{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1870
+#: gajim/groupchat_control.py:1809
 #, python-brace-format
 msgid "You have been banned{actor}{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1877 gajim/groupchat_control.py:1943
+#: gajim/groupchat_control.py:1816 gajim/groupchat_control.py:1882
 #, fuzzy
 msgid ": Affiliation changed"
 msgstr "Afiliación:"
 
-#: gajim/groupchat_control.py:1883 gajim/groupchat_control.py:1948
-msgid ": Room configuration changed to members-only"
+#: gajim/groupchat_control.py:1822 gajim/groupchat_control.py:1887
+msgid ": Group chat configuration changed to members-only"
 msgstr ""
 
-#: gajim/groupchat_control.py:1912
+#: gajim/groupchat_control.py:1851
 #, fuzzy, python-brace-format
-msgid "{nick} has been removed from the room{by}{reason}"
+msgid "{nick} has been removed from the group chat{by}{reason}"
 msgstr "%(nick)s foi expulsado por %(who)s: %(reason)s"
 
-#: gajim/groupchat_control.py:1922
+#: gajim/groupchat_control.py:1861
 #, python-brace-format
 msgid "{nick} has left due to an error{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1928
+#: gajim/groupchat_control.py:1867
 #, fuzzy, python-brace-format
 msgid "{nick} has been kicked{actor}{reason}"
 msgstr "%(nick)s foi expulsado por %(reason)s"
 
-#: gajim/groupchat_control.py:1936
+#: gajim/groupchat_control.py:1875
 #, fuzzy, python-brace-format
 msgid "{nick} has been banned{actor}{reason}"
 msgstr "%(nick)s foi expulsado: %(reason)s"
 
-#: gajim/groupchat_control.py:1953
+#: gajim/groupchat_control.py:1892
 #, python-brace-format
 msgid "{nick} has left{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1970
+#: gajim/groupchat_control.py:1914
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s entrou no grupo de charla"
 
-#: gajim/groupchat_control.py:1985 gajim/groupchat_control.py:1990
-#: gajim/groupchat_control.py:1995 gajim/groupchat_control.py:2000
-#: gajim/groupchat_control.py:2011
-msgid "Unable to join group chat"
-msgstr "Non se puido entrar no grupo de charla"
-
-#: gajim/groupchat_control.py:1986
-#, fuzzy, python-format
-msgid "You are banned from group chat <b>%s</b>."
-msgstr "Está expulsado deste grupo de charla."
-
-#: gajim/groupchat_control.py:1991
-#, fuzzy, python-format
-msgid "Remote server <b>%s</b> does not exist."
-msgstr "Non existe o grupo de charla."
-
-#: gajim/groupchat_control.py:1996
-#, fuzzy, python-format
-msgid "Group chat <b>%s</b> does not exist."
-msgstr "Non existe o grupo de charla."
-
-#: gajim/groupchat_control.py:2001
-#, fuzzy
-msgid "Group chat creation is not permitted."
-msgstr "A creación de grupos de charla está restrinxida."
-
-#: gajim/groupchat_control.py:2005
+#: gajim/groupchat_control.py:1981
 #, fuzzy
-msgid "Unable to join groupchat"
-msgstr "Non se puido entrar no grupo de charla"
-
-#: gajim/groupchat_control.py:2006
-#, fuzzy, python-format
-msgid "You must use your registered nickname in <b>%s</b>."
-msgstr "É necesario usar o alcume rexistrado."
-
-#: gajim/groupchat_control.py:2012
-#, fuzzy, python-format
-msgid "You are not in the members list in groupchat %s."
-msgstr "Non está na listaxe de membros"
-
-#: gajim/groupchat_control.py:2068
-#, fuzzy
-msgid "Room has been destroyed"
+msgid "Group chat has been destroyed"
 msgstr "Eliminouse a autorización"
 
-#: gajim/groupchat_control.py:2073
-#, python-format
-msgid "You can join this room instead: xmpp:%s?join"
-msgstr ""
+#: gajim/groupchat_control.py:1986
+#, fuzzy, python-format
+msgid "You can join this group chat instead: xmpp:%s?join"
+msgstr "%s entrou no grupo de charla"
 
-#: gajim/groupchat_control.py:2306
+#: gajim/groupchat_control.py:2214
 #, fuzzy
 msgid "Leave Group Chat"
 msgstr "Novo grupo de charla"
 
-#: gajim/groupchat_control.py:2307
+#: gajim/groupchat_control.py:2215
 #, fuzzy
 msgid "Are you sure you want to leave this group chat?"
 msgstr "Está seguro de que quere abandonar a sala \"%s\"?"
 
-#: gajim/groupchat_control.py:2308
+#: gajim/groupchat_control.py:2216
 #, fuzzy, python-format
-msgid "If you close this window, you will be disconnected from '%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:2314
+#: gajim/groupchat_control.py:2222 gajim/roster_window.py:5177
 msgid "_Leave"
 msgstr ""
 
-#: gajim/groupchat_control.py:2377
+#: gajim/groupchat_control.py:2280 gajim/roster_window.py:3008
 #, fuzzy, python-format
 msgid "%(jid)s has been invited to this group chat"
 msgstr "%(nick)s foi expulsado por %(who)s: %(reason)s"
 
-#: gajim/groupchat_control.py:2527
+#: gajim/groupchat_control.py:2463
 #, python-format
 msgid "Kicking %s"
 msgstr "A expulsar %s"
 
-#: gajim/groupchat_control.py:2528 gajim/groupchat_control.py:2829
+#: gajim/groupchat_control.py:2464 gajim/groupchat_control.py:2765
 msgid "You may specify a reason below:"
 msgstr "Debe especificar un motivo debaixo:"
 
-#: gajim/groupchat_control.py:2828
+#: gajim/groupchat_control.py:2764
 #, python-format
 msgid "Banning %s"
 msgstr "A expulsar %s"
 
-#: gajim/chat_control.py:408
+#: gajim/chat_control.py:432
 #, fuzzy
 msgid "Show a list of formattings"
 msgstr "Prema aquí para inserir unha emoticona (Alt+M)"
 
-#: gajim/chat_control.py:412
+#: gajim/chat_control.py:436
 #, fuzzy
 msgid "This contact does not support HTML"
 msgstr "Listaxe de transferencias activas, rematadas e detidas"
 
-#: gajim/chat_control.py:562
+#: gajim/chat_control.py:586
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr ""
 
-#: gajim/chat_control.py:686
+#: gajim/chat_control.py:710
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s da sala %(room_name)s"
 
-#: gajim/chat_control.py:832
+#: gajim/chat_control.py:856
 #, python-format
 msgid "%(type)s encryption is active %(authenticated)s"
 msgstr ""
 
-#: gajim/chat_control.py:1160 gajim/chat_control.py:1168
+#: gajim/chat_control.py:1184 gajim/chat_control.py:1192
 #, fuzzy
 msgid "Close"
 msgstr "_Enviar e pechar"
 
-#: gajim/chat_control.py:1161
+#: gajim/chat_control.py:1185
 #, fuzzy, python-format
 msgid "You just received a new message from %s"
 msgstr "Acaba de recibir unha mensaxe nova de \"%s\""
 
-#: gajim/chat_control.py:1163
+#: gajim/chat_control.py:1187
 #, fuzzy
 msgid ""
 "If you close this tab while having chat history disabled, this message will "
@@ -1211,16 +1175,16 @@ msgstr ""
 "Se pecha este separador e ten o historial desactivado, esta mensaxe "
 "perderase."
 
-#: gajim/chat_control.py:1208
+#: gajim/chat_control.py:1232
 msgid "Ping?"
 msgstr ""
 
-#: gajim/chat_control.py:1211
+#: gajim/chat_control.py:1235
 #, python-format
 msgid "Pong! (%s seconds)"
 msgstr ""
 
-#: gajim/chat_control.py:1308
+#: gajim/chat_control.py:1332
 #, fuzzy, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -1229,278 +1193,285 @@ msgstr ""
 "Asunto: %s\n"
 "%s"
 
-#: gajim/chat_control.py:1416
+#: gajim/chat_control.py:1440
 #, fuzzy, python-format
 msgid "%(name)s is now %(show)s %(status)s"
 msgstr "%(nick)s está agora %(status)s"
 
-#: gajim/chat_control.py:1476 gajim/data/gui/application_menu.ui:32
+#: gajim/chat_control.py:1500 gajim/data/gui/application_menu.ui:32
 #: gajim/gtk/http_upload_progress.py:35
 #, fuzzy
 msgid "File Transfer"
 msgstr "Transferencias"
 
-#: gajim/chat_control.py:1480
+#: gajim/chat_control.py:1504
 #, fuzzy
 msgid "Size"
 msgstr "Tamaño: %s"
 
-#: gajim/chat_control.py:1482 gajim/chat_control.py:1546
+#: gajim/chat_control.py:1506 gajim/chat_control.py:1566
+#: gajim/gui_interface.py:190
 #: gajim/data/gui/groupchat_invitation_received.ui:77
-#: gajim/gtk/filetransfer.py:485
+#: gajim/gtk/filetransfer.py:490
 #, fuzzy
 msgid "_Accept"
 msgstr "Aceptar"
 
-#: gajim/chat_control.py:1484 gajim/chat_control.py:1548
+#: gajim/chat_control.py:1508 gajim/chat_control.py:1568
 #: gajim/data/gui/groupchat_invitation_received.ui:62
 #, fuzzy
 msgid "_Decline"
 msgstr "D_esconectado"
 
-#: gajim/chat_control.py:1506 gajim/gui_interface.py:791
-#: gajim/gui_interface.py:821 gajim/gui_interface.py:847
+#: gajim/chat_control.py:1530 gajim/gui_interface.py:777
+#: gajim/gui_interface.py:807 gajim/gui_interface.py:833
 #: gajim/gtk/notification.py:173 gajim/gtk/notification.py:278
 msgid "File Transfer Completed"
 msgstr "Rematou a transferencia do ficheiro"
 
-#: gajim/chat_control.py:1510 gajim/gtk/filetransfer.py:259
+#: gajim/chat_control.py:1534 gajim/gtk/filetransfer.py:258
 #, fuzzy
 msgid "Open _Folder"
 msgstr "_Abrir un cartafol de contido"
 
-#: gajim/chat_control.py:1512 gajim/chat_control.py:1521
+#: gajim/chat_control.py:1536 gajim/chat_control.py:1545
+#: gajim/data/gui/groupchat_control.ui:962
+#: gajim/data/gui/groupchat_control.ui:1049
+#: gajim/data/gui/groupchat_control.ui:1155
 #, fuzzy
 msgid "_Close"
 msgstr "_Enviar e pechar"
 
-#: gajim/chat_control.py:1543 gajim/gui_interface.py:484
+#: gajim/chat_control.py:1563 gajim/gui_interface.py:473
+#: gajim/data/gui/groupchat_invitation_received.ui:42
 #: gajim/gtk/notification.py:174 gajim/gtk/notification.py:195
 #: gajim/gtk/notification.py:281
-msgid "Groupchat Invitation"
+#, fuzzy
+msgid "Group Chat Invitation"
 msgstr "Convite a grupo de charla"
 
-#: gajim/chat_control.py:1568 gajim/roster_window.py:1954
+#: gajim/chat_control.py:1588 gajim/roster_window.py:1951
 #, fuzzy
 msgid "Remote contact stopped transfer"
 msgstr "Elimina o contacto da listaxe"
 
-#: gajim/chat_control.py:1570 gajim/roster_window.py:1956
+#: gajim/chat_control.py:1590 gajim/roster_window.py:1953
 #, fuzzy
 msgid "Error opening file"
 msgstr "Erro ao ler o ficheiro:"
 
-#: gajim/chat_control.py:1572 gajim/gtk/filetransfer.py:297
+#: gajim/chat_control.py:1592 gajim/gtk/filetransfer.py:296
 #, fuzzy
 msgid "File transfer stopped"
 msgstr "Detívose a transferencia do ficheiro"
 
-#: gajim/chat_control.py:1575 gajim/gtk/filetransfer.py:275
-#: gajim/gtk/filetransfer.py:284
+#: gajim/chat_control.py:1595 gajim/gtk/filetransfer.py:274
+#: gajim/gtk/filetransfer.py:283
 #, fuzzy
 msgid "File transfer cancelled"
 msgstr "Cancelouse a transferencia do ficheiro"
 
-#: gajim/chat_control.py:1576
+#: gajim/chat_control.py:1596
 msgid "Connection with peer cannot be established."
 msgstr "Non se puido estabelecer a conexión co cliente."
 
-#: gajim/application.py:72
+#: gajim/application.py:75
 #, fuzzy
 msgid "Show the application's version"
 msgstr "Usar a icona na á_rea de notificación"
 
-#: gajim/application.py:79
+#: gajim/application.py:82
 #, fuzzy
 msgid "Show only critical errors"
 msgstr "Amosar só na _listaxe de contactos"
 
-#: gajim/application.py:86
+#: gajim/application.py:89
 msgid "Separate profile files completely (even history database and plugins)"
 msgstr ""
 
-#: gajim/application.py:94
+#: gajim/application.py:97
 msgid "Print XML stanzas and other debug information"
 msgstr ""
 
-#: gajim/application.py:101
+#: gajim/application.py:104
 #, fuzzy
 msgid "Use defined profile in configuration directory"
 msgstr "Editor avanzado de configuración"
 
-#: gajim/application.py:109
+#: gajim/application.py:112
 #, fuzzy
 msgid "Set configuration directory"
 msgstr "Configuración da sala"
 
-#: gajim/application.py:117
+#: gajim/application.py:120
 msgid "Configure logging system"
 msgstr ""
 
-#: gajim/application.py:125
+#: gajim/application.py:128
 #, fuzzy
 msgid "Show all warnings"
 msgstr "Amosar todos os _eventos pendentes"
 
-#: gajim/application.py:132
+#: gajim/application.py:135
 msgid "Open IPython shell"
 msgstr ""
 
-#: gajim/application.py:139
+#: gajim/application.py:142
 #, fuzzy
 msgid "Pops up a window with the next pending event"
 msgstr "Amosa unha fiestra emerxente co seguinte acontecemento pendente"
 
-#: gajim/application.py:145 gajim/data/gui/shortcuts_window.ui:203
+#: gajim/application.py:148 gajim/data/gui/shortcuts_window.ui:203
 #: data/org.gajim.Gajim.desktop.in:21
 #, fuzzy
 msgid "Start a new chat"
 msgstr "Iniciar a charla"
 
-#: gajim/application.py:152
+#: gajim/application.py:155
 msgid "Simulate loss of connectivity"
 msgstr ""
 
-#: gajim/application.py:159
+#: gajim/application.py:162
 msgid "Simulate regaining connectivity"
 msgstr ""
 
-#: gajim/application.py:201 gajim/gui_interface.py:133
+#: gajim/application.py:204 gajim/gui_interface.py:133
 msgid "Database Error"
 msgstr ""
 
-#: gajim/roster_window.py:294 gajim/roster_window.py:1030
+#: gajim/roster_window.py:291 gajim/roster_window.py:1027
 msgid "Merged accounts"
 msgstr "Contas combinadas"
 
-#: gajim/roster_window.py:853 gajim/roster_window.py:1631
-#: gajim/roster_window.py:1664 gajim/roster_window.py:1715
-#: gajim/roster_window.py:1717 gajim/roster_window.py:1872
-#: gajim/roster_window.py:2531 gajim/roster_window.py:5025
-#: gajim/common/contacts.py:188 gajim/common/contacts.py:447
-#: gajim/common/helpers.py:83 gajim/gtk/discovery.py:129
-#: gajim/gtk/discovery.py:130 gajim/gtk/discovery.py:1416
+#: gajim/roster_window.py:850 gajim/roster_window.py:1628
+#: gajim/roster_window.py:1661 gajim/roster_window.py:1712
+#: gajim/roster_window.py:1714 gajim/roster_window.py:1869
+#: gajim/roster_window.py:2528 gajim/roster_window.py:4331
+#: gajim/roster_window.py:4964 gajim/common/contacts.py:204
+#: gajim/common/contacts.py:463 gajim/common/helpers.py:86
+#: gajim/gtk/discovery.py:127 gajim/gtk/discovery.py:128
+#: gajim/gtk/discovery.py:1414
 msgid "Transports"
 msgstr "Transportes"
 
-#: gajim/roster_window.py:1723 gajim/roster_window.py:1725
-#: gajim/roster_window.py:4995 gajim/gui_interface.py:1613
-#: gajim/gui_interface.py:1639 gajim/common/contacts.py:186
-#: gajim/common/helpers.py:83 gajim/common/modules/adhoc_commands.py:245
+#: gajim/roster_window.py:1720 gajim/roster_window.py:1722
+#: gajim/roster_window.py:4331 gajim/roster_window.py:4934
+#: gajim/gui_interface.py:1527 gajim/common/contacts.py:202
+#: gajim/common/helpers.py:86 gajim/common/modules/adhoc_commands.py:245
 #, fuzzy
-msgid "Groupchats"
+msgid "Group chats"
 msgstr "Grupos de charla"
 
-#: gajim/roster_window.py:2012
+#: gajim/roster_window.py:2009
 #, fuzzy
 msgid "Authorization sent"
 msgstr "Enviouse a autorización"
 
-#: gajim/roster_window.py:2013
+#: gajim/roster_window.py:2010
 #, fuzzy, python-format
 msgid "\"%s\" will now see your status."
 msgstr "Agora \"%s\" poderá saber o seu estado."
 
-#: gajim/roster_window.py:2031
+#: gajim/roster_window.py:2028
 msgid "Subscription request has been sent"
 msgstr "Enviouse a solicitude de subscrición"
 
-#: gajim/roster_window.py:2032
-#, python-format
-msgid "If \"%s\" accepts this request you will know his or her status."
+#: gajim/roster_window.py:2029
+#, 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:2046
+#: gajim/roster_window.py:2043
 #, fuzzy
 msgid "Authorization removed"
 msgstr "Eliminouse a autorización"
 
-#: gajim/roster_window.py:2047
+#: gajim/roster_window.py:2044
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Agora \"%s\" sempre o/a verá desconectado."
 
-#: gajim/roster_window.py:2250 gajim/roster_window.py:3504
+#: gajim/roster_window.py:2247 gajim/roster_window.py:3460
 msgid "Disconnect for Invisibility"
 msgstr ""
 
-#: gajim/roster_window.py:2251 gajim/roster_window.py:3505
+#: gajim/roster_window.py:2248 gajim/roster_window.py:3461
 msgid "You are participating in one or more group chats"
 msgstr "Está a participar nun ou máis grupos de charlas"
 
-#: gajim/roster_window.py:2252 gajim/roster_window.py:3506
+#: gajim/roster_window.py:2249 gajim/roster_window.py:3462
 #, fuzzy
 msgid ""
-"Changing your status to invisible will result in disconnection from those "
-"group chats.\n"
+"Changing your status to invisible will result in you leaving those group "
+"chats.\n"
 "Are you sure you want to go invisible?"
 msgstr ""
 "Ao cambiar o seu estado a invisíbel provocará a súa desconexión dos grupos "
 "de charla. Está seguro de que quere ser invisíbel?"
 
-#: gajim/roster_window.py:2257 gajim/roster_window.py:3512
-#: gajim/roster_window.py:5238 gajim/data/gui/gc_control_popup_menu.ui:120
+#: gajim/roster_window.py:2254 gajim/roster_window.py:3468
+#: gajim/data/gui/gc_control_popup_menu.ui:120
 #, fuzzy
 msgid "_Disconnect"
 msgstr "Contacto desconectado"
 
-#: gajim/roster_window.py:2285
+#: gajim/roster_window.py:2282
 #, fuzzy
 msgid "desynced"
 msgstr "Avanzado"
 
-#: gajim/roster_window.py:2353 gajim/data/gui/shortcuts_window.ui:224
+#: gajim/roster_window.py:2350 gajim/data/gui/shortcuts_window.ui:224
 #, fuzzy
 msgid "Quit Gajim"
 msgstr "Gajim"
 
-#: gajim/roster_window.py:2354
+#: gajim/roster_window.py:2351
 #, fuzzy
 msgid "You are about to quit Gajim"
 msgstr "Está seguro de que quere abandonar a sala \"%s\"?"
 
-#: gajim/roster_window.py:2355
+#: gajim/roster_window.py:2352
 #, fuzzy
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Está seguro de que quere abandonar a sala \"%s\"?"
 
-#: gajim/roster_window.py:2356
+#: gajim/roster_window.py:2353
 msgid "_Always quit when closing Gajim"
 msgstr ""
 
-#: gajim/roster_window.py:2359 gajim/roster_window.py:2455
-#: gajim/roster_window.py:2495 gajim/data/gui/systray_context_menu.ui:90
+#: gajim/roster_window.py:2356 gajim/roster_window.py:2452
+#: gajim/roster_window.py:2492 gajim/data/gui/systray_context_menu.ui:83
 #, fuzzy
 msgid "_Quit"
 msgstr "_Saír"
 
-#: gajim/roster_window.py:2448
+#: gajim/roster_window.py:2445
 #, fuzzy
 msgid "Stop File Transfers"
 msgstr "Transferencias"
 
-#: gajim/roster_window.py:2449
+#: gajim/roster_window.py:2446
 #, fuzzy
 msgid "You still have running file transfers"
 msgstr "Cancelar a transferencia"
 
-#: gajim/roster_window.py:2450
+#: gajim/roster_window.py:2447
 msgid ""
 "If you quit now, the file(s) being transferred will be lost.\n"
 "Do you still want to quit?"
 msgstr ""
 
-#: gajim/roster_window.py:2488
+#: gajim/roster_window.py:2485
 #, fuzzy
 msgid "Unread Messages"
 msgstr "Acontecementos sen ler"
 
-#: gajim/roster_window.py:2489
+#: gajim/roster_window.py:2486
 #, fuzzy
 msgid "You still have unread messages"
 msgstr "Ten mensaxes sen ler"
 
-#: gajim/roster_window.py:2490
+#: gajim/roster_window.py:2487
 #, fuzzy
 msgid ""
 "Messages will only be available for reading them later if storing chat "
@@ -1509,20 +1480,20 @@ msgstr ""
 "As mensaxes só estarán dispoñíbeis para a súa lectura posterior se ten o "
 "historial activado"
 
-#: gajim/roster_window.py:2760
+#: gajim/roster_window.py:2753
 msgid "You have unread messages"
 msgstr "Ten mensaxes sen ler"
 
-#: gajim/roster_window.py:2761
+#: gajim/roster_window.py:2754
 msgid "You must read them before removing this transport."
 msgstr "Debe lelas antes de eliminar este transporte."
 
-#: gajim/roster_window.py:2764
+#: gajim/roster_window.py:2757
 #, fuzzy, python-format
 msgid "Transport '%s' will be removed"
 msgstr "Eliminarase o transporte \"%s\""
 
-#: gajim/roster_window.py:2765
+#: gajim/roster_window.py:2758
 #, fuzzy
 msgid ""
 "You will no longer be able to send and receive messages from and to contacts "
@@ -1530,11 +1501,11 @@ msgid ""
 msgstr ""
 "Xa non poderá enviar e recibir mensaxes a contactos desde este transporte"
 
-#: gajim/roster_window.py:2768
+#: gajim/roster_window.py:2761
 msgid "Transports will be removed"
 msgstr "Eliminaranse os transportes"
 
-#: gajim/roster_window.py:2773
+#: gajim/roster_window.py:2766
 #, fuzzy, python-format
 msgid ""
 "You will no longer be able to send and receive messages from and to contacts "
@@ -1543,85 +1514,80 @@ msgid ""
 msgstr ""
 "Xa non poderá enviar e recibir mensaxes a contactos desde este transporte"
 
-#: gajim/roster_window.py:2777
+#: gajim/roster_window.py:2770
 #, fuzzy
 msgid "Remove Transport"
 msgstr "Amosar os trans_portes"
 
-#: gajim/roster_window.py:2844
+#: gajim/roster_window.py:2837
 #, fuzzy
 msgid "Block Contact"
 msgstr "Contactos"
 
-#: gajim/roster_window.py:2845
+#: gajim/roster_window.py:2838
 #, fuzzy
 msgid "Really block this contact?"
 msgstr "Está o OpenPGP activado para este contacto?"
 
-#: gajim/roster_window.py:2846
+#: gajim/roster_window.py:2839
 msgid ""
 "This contact will see you offline and you will not receive any messages sent "
 "to you by this contact."
 msgstr ""
 
-#: gajim/roster_window.py:2851
+#: gajim/roster_window.py:2844
 #, fuzzy
 msgid "_Block Contact"
 msgstr "Contactos"
 
-#: gajim/roster_window.py:2896
+#: gajim/roster_window.py:2889
 msgid "Rename Contact"
 msgstr "Renomear o contacto"
 
-#: gajim/roster_window.py:2897
+#: gajim/roster_window.py:2890
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Introduza un alcume novo para o contacto %s"
 
-#: gajim/roster_window.py:2904
+#: gajim/roster_window.py:2897
 msgid "Rename Group"
 msgstr "Renomear o grupo"
 
-#: gajim/roster_window.py:2905
+#: gajim/roster_window.py:2898
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Introduza un nome novo para o grupo %s"
 
-#: gajim/roster_window.py:2953 gajim/roster_window.py:2954
+#: gajim/roster_window.py:2946 gajim/roster_window.py:2947
 msgid "Remove Group"
 msgstr "Eliminar o grupo"
 
-#: gajim/roster_window.py:2955
+#: gajim/roster_window.py:2948
 #, fuzzy, python-format
 msgid "Do you want to remove %s from the contact list?"
 msgstr "Quere eliminar o grupo %s da listaxe?"
 
-#: gajim/roster_window.py:2956
+#: gajim/roster_window.py:2949
 #, fuzzy
 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:3044
-#, fuzzy, python-format
-msgid "%(jid)s has been invited in this room"
-msgstr "%(nick)s foi expulsado por %(who)s: %(reason)s"
-
-#: gajim/roster_window.py:3353
+#: gajim/roster_window.py:3309
 #, fuzzy
 msgid "Remove Contact"
 msgstr "Renomear o contacto"
 
-#: gajim/roster_window.py:3354
+#: gajim/roster_window.py:3310
 #, fuzzy
 msgid "Remove contact from contact list"
 msgstr "Elimina o contacto da listaxe"
 
-#: gajim/roster_window.py:3355
+#: gajim/roster_window.py:3311
 #, python-format
 msgid "You are about to remove '%(name)s' (%(jid)s) from your contact list.\n"
 msgstr ""
 
-#: gajim/roster_window.py:3364 gajim/roster_window.py:3384
+#: gajim/roster_window.py:3320 gajim/roster_window.py:3340
 #, fuzzy
 msgid ""
 "By removing this contact you also remove authorization. This means the "
@@ -1631,22 +1597,22 @@ msgstr ""
 "tamén eliminará as autorizacións resultantes e eles/elas sempre o/a verán "
 "desconectado."
 
-#: gajim/roster_window.py:3375
+#: gajim/roster_window.py:3331
 #, fuzzy
 msgid "Do you want to continue?"
 msgstr "Que quere facer?"
 
-#: gajim/roster_window.py:3386
+#: gajim/roster_window.py:3342
 #, 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:3393
+#: gajim/roster_window.py:3349
 #, fuzzy
 msgid "Remove contacts from contact list"
 msgstr "Elimina o contacto da listaxe"
 
-#: gajim/roster_window.py:3399
+#: gajim/roster_window.py:3355
 #, fuzzy, python-format
 msgid ""
 "By removing the following contacts, you will also remove authorization. This "
@@ -1658,24 +1624,24 @@ msgstr ""
 "tamén eliminará as autorizacións resultantes e eles/elas sempre o/a verán "
 "desconectado."
 
-#: gajim/roster_window.py:3403
+#: gajim/roster_window.py:3359
 #, fuzzy
 msgid "Remove Contacts"
 msgstr "Renomear o contacto"
 
-#: gajim/roster_window.py:3423
+#: gajim/roster_window.py:3379
 msgid "No account available"
 msgstr "A conta non está dispoñíbel"
 
-#: gajim/roster_window.py:3424
+#: gajim/roster_window.py:3380
 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:4060
+#: gajim/roster_window.py:4011
 msgid "Metacontacts storage not supported by your server"
 msgstr "O teu servidor non admite o almacenamento de metacontactos"
 
-#: gajim/roster_window.py:4062
+#: gajim/roster_window.py:4013
 #, fuzzy
 msgid ""
 "Your server does not support storing metacontacts information. So this "
@@ -1684,12 +1650,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:4159
+#: gajim/roster_window.py:4110
 #, fuzzy
 msgid "You are about to create a metacontact"
 msgstr "Vai crear un metacontacto. Está seguro de que quere continuar?"
 
-#: gajim/roster_window.py:4160
+#: gajim/roster_window.py:4111
 #, fuzzy
 msgid ""
 "Metacontacts are a way to regroup several contacts in one single contact. "
@@ -1700,128 +1666,119 @@ msgstr ""
 "Xeralmente se usan cando a mesma persoa ten varias contas de Jabber ou "
 "contas de transportes."
 
-#: gajim/roster_window.py:4164
+#: gajim/roster_window.py:4115
 #, fuzzy
 msgid "Create Metacontact"
 msgstr "Renomear o contacto"
 
-#: gajim/roster_window.py:4170
+#: gajim/roster_window.py:4121 gajim/data/gui/groupchat_creation.ui:317
 #, fuzzy
 msgid "_Create"
 msgstr "Inactivo"
 
-#: gajim/roster_window.py:4287
+#: gajim/roster_window.py:4238
 #, fuzzy
 msgid "Invalid file URI:"
 msgstr "O ficheiro non é válido"
 
-#: gajim/roster_window.py:4298
+#: gajim/roster_window.py:4249
 #, fuzzy
 msgid "Send file?"
 msgstr "Enviar ficheiro"
 
-#: gajim/roster_window.py:4299
+#: gajim/roster_window.py:4250
 #, fuzzy, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
 msgstr[0] "%s quere enviarlle un ficheiro:"
 msgstr[1] "%s quere enviarlle un ficheiro:"
 
-#: gajim/roster_window.py:4451
+#: gajim/roster_window.py:4401
 #, fuzzy, python-format
 msgid "Send %(from)s to %(to)s"
 msgstr "Enviar %s"
 
-#: gajim/roster_window.py:4464
+#: gajim/roster_window.py:4414
 #, fuzzy, python-format
 msgid "Make %s first contact"
 msgstr "Facer %s e %s metacontactos"
 
-#: gajim/roster_window.py:4469
+#: gajim/roster_window.py:4419
 #, fuzzy, python-format
 msgid "Make %(contact1)s and %(contact2)s metacontacts"
 msgstr "Facer %s e %s metacontactos"
 
-#: gajim/roster_window.py:4825 gajim/roster_window.py:4923
+#: gajim/roster_window.py:4775 gajim/roster_window.py:4862
 msgid "_Change Status Message"
 msgstr "_Cambiar a mensaxe de estado"
 
-#: gajim/roster_window.py:4845
+#: gajim/roster_window.py:4795
 #, fuzzy
 msgid "Publish Tune"
 msgstr "_Publicar"
 
-#: gajim/roster_window.py:4856
+#: gajim/roster_window.py:4806
 #, fuzzy
 msgid "Publish Location"
 msgstr "_Publicar"
 
-#: gajim/roster_window.py:4868
-#, fuzzy
-msgid "Configure Services…"
-msgstr "_Descubrir os servizos..."
-
-#: gajim/roster_window.py:4997
+#: gajim/roster_window.py:4936
 msgid "_Maximize All"
 msgstr ""
 
-#: gajim/roster_window.py:5004 gajim/roster_window.py:5146
+#: gajim/roster_window.py:4943 gajim/roster_window.py:5085
 msgid "Send Group M_essage"
 msgstr "Enviar mensaxe ao grupo"
 
-#: gajim/roster_window.py:5011
+#: gajim/roster_window.py:4950
 msgid "To all users"
 msgstr "A todos os usuarios"
 
-#: gajim/roster_window.py:5015
+#: gajim/roster_window.py:4954
 msgid "To all online users"
 msgstr "A todos os usuarios en liña"
 
-#: gajim/roster_window.py:5027 gajim/roster_window.py:5152
+#: gajim/roster_window.py:4966 gajim/roster_window.py:5091
 #: gajim/data/gui/gc_occupants_menu.ui:110
 #: gajim/data/gui/contact_context_menu.ui:36
 msgid "In_vite to"
 msgstr "Con_vidar"
 
-#: gajim/roster_window.py:5162
+#: gajim/roster_window.py:5101
 #, fuzzy
 msgid "_Manage Contacts"
 msgstr "Renomear o contacto"
 
-#: gajim/roster_window.py:5168
+#: gajim/roster_window.py:5107
 #, fuzzy
 msgid "Edit _Groups…"
 msgstr "Editar os grupos"
 
-#: gajim/roster_window.py:5189 gajim/data/gui/filetransfers.ui:12
+#: gajim/roster_window.py:5128 gajim/data/gui/filetransfers.ui:12
 #: gajim/data/gui/remove_account_window.ui:134
 msgid "_Remove"
 msgstr "_Eliminar"
 
-#: gajim/roster_window.py:5226
+#: gajim/roster_window.py:5165
 msgid "_Maximize"
 msgstr ""
 
-#: gajim/roster_window.py:5233
+#: gajim/roster_window.py:5172
 #, fuzzy
 msgid "_Reconnect"
 msgstr "Contacto desconectado"
 
-#: gajim/roster_window.py:5254 gajim/data/gui/gc_occupants_menu.ui:170
+#: gajim/roster_window.py:5193 gajim/data/gui/gc_occupants_menu.ui:170
 #: gajim/data/gui/gc_control_popup_menu.ui:113
 #: gajim/data/gui/contact_context_menu.ui:205
 msgid "_History"
 msgstr "_Historial"
 
-#: gajim/roster_window.py:5335 gajim/data/gui/application_menu.ui:86
+#: gajim/roster_window.py:5274 gajim/data/gui/application_menu.ui:83
 #: gajim/data/gui/history_window.ui:57
 msgid "History Manager"
 msgstr "Historial"
 
-#: gajim/roster_window.py:5343
-msgid "_Join New Group Chat"
-msgstr "_Entrar nun outro grupo de charla"
-
 #: gajim/dataforms_widget.py:585
 #, fuzzy
 msgid "Unable to load image"
@@ -1945,276 +1902,293 @@ msgstr "Asunto: %s\n"
 msgid "Write a message…"
 msgstr "Mensaxe privada nova"
 
-#: gajim/message_window.py:250
+#: gajim/message_window.py:356
+#, fuzzy
+msgid "Close Tabs"
+msgstr "_Enviar e pechar"
+
+#: gajim/message_window.py:357
 #, fuzzy
 msgid "You are going to close several tabs"
 msgstr "Non está conectado ao servidor"
 
-#: gajim/message_window.py:251
+#: gajim/message_window.py:358
 #, fuzzy
 msgid "Do you really want to close them all?"
 msgstr "Está seguro de que quere eliminar a mensaxe que seleccionou?"
 
-#: gajim/message_window.py:539
+#: gajim/message_window.py:514
 #, fuzzy
 msgid "?Noun:Chats"
 msgstr "Grupos de charla"
 
-#: gajim/message_window.py:543
+#: gajim/message_window.py:518
 #, fuzzy
 msgid "Group Chats"
 msgstr "_Grupos de charla"
 
-#: gajim/message_window.py:547
+#: gajim/message_window.py:522
 msgid "Private Chats"
 msgstr "Charlas privadas"
 
-#: gajim/message_window.py:553
+#: gajim/message_window.py:528
 msgid "Messages"
 msgstr "Mensaxes"
 
-#: gajim/gui_interface.py:173
+#: gajim/gui_interface.py:170
+#, 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:175
 msgid "Do you accept this request?"
 msgstr "Acepta esta solicitude?"
 
-#: gajim/gui_interface.py:175
+#: gajim/gui_interface.py:177
 #, fuzzy, python-format
-msgid "Do you accept this request on account %s?"
+msgid "Do you accept this request (account: %s)?"
 msgstr "Acepta esta solicitude?"
 
-#: gajim/gui_interface.py:178
-#, 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:182
+#, fuzzy
+msgid "Authorization"
+msgstr "Enviouse a autorización"
+
+#: gajim/gui_interface.py:186 gajim/gui_interface.py:420
+#: gajim/gtk/filetransfer.py:338
+#, fuzzy
+msgid "_No"
+msgstr "Ningún"
 
-#: gajim/gui_interface.py:194 gajim/gtk/notification.py:175
+#: gajim/gui_interface.py:205 gajim/gtk/notification.py:175
 #: gajim/gtk/notification.py:197
 msgid "Connection Failed"
 msgstr "Fallou a conexión"
 
-#: gajim/gui_interface.py:279 gajim/gui_interface.py:529
-msgid "Password Required"
-msgstr "É necesario o contrasinal"
-
-#: gajim/gui_interface.py:280
-#, fuzzy, python-format
-msgid "A Password is required to join the room %s. Please type it."
-msgstr "É necesario un contrasinal para entrar a este grupo de charla."
-
-#: gajim/gui_interface.py:342 gajim/gui_interface.py:346
+#: gajim/gui_interface.py:325 gajim/gui_interface.py:329
 #, fuzzy, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr "%(nickname)s: %(message)s"
 
-#: gajim/gui_interface.py:357 gajim/gui_interface.py:376
+#: gajim/gui_interface.py:340 gajim/gui_interface.py:359
 #: gajim/common/modules/message.py:122
 #, fuzzy, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "produciuse un erro mentres se enviaba %s ( %s )"
 
-#: gajim/gui_interface.py:401 gajim/gtk/notification.py:175
+#: gajim/gui_interface.py:384 gajim/gtk/notification.py:175
 #, fuzzy
 msgid "Subscription request"
 msgstr "Solicitude de subscrición"
 
-#: gajim/gui_interface.py:413 gajim/common/contacts.py:184
-#: gajim/common/helpers.py:83
+#: gajim/gui_interface.py:396 gajim/common/contacts.py:200
+#: gajim/common/helpers.py:86
 msgid "Observers"
 msgstr "Observadores"
 
-#: gajim/gui_interface.py:422
+#: gajim/gui_interface.py:405
 msgid "Authorization accepted"
 msgstr "Autorización aceptada"
 
-#: gajim/gui_interface.py:423
+#: gajim/gui_interface.py:406
 #, 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:431
-#, python-format
-msgid "Contact \"%s\" removed subscription from you"
+#: gajim/gui_interface.py:415
+#, fuzzy
+msgid "Subscription Removed"
+msgstr "Solicitude de subscrición"
+
+#: gajim/gui_interface.py:416
+#, fuzzy, python-format
+msgid "Contact '%s' removed subscription from you"
 msgstr "O contacto \"%s\" eliminou a súa subscrición"
 
-#: gajim/gui_interface.py:432
+#: gajim/gui_interface.py:417
 msgid ""
-"You will always see them as offline.\n"
+"You will always see this contact as offline.\n"
 "Do you want to remove them from your contact list?"
 msgstr ""
 
-#: gajim/gui_interface.py:453 gajim/gtk/notification.py:176
+#: gajim/gui_interface.py:442 gajim/gtk/notification.py:176
 #, fuzzy
 msgid "Unsubscribed"
 msgstr "_Eliminar"
 
-#: gajim/gui_interface.py:465
+#: gajim/gui_interface.py:454
 #, python-format
 msgid "%(jid)s declined the invitation: %(reason)s"
 msgstr ""
 
-#: gajim/gui_interface.py:469
+#: gajim/gui_interface.py:458
 #, python-format
 msgid "%(jid)s declined the invitation"
 msgstr ""
 
-#: gajim/gui_interface.py:485
+#: gajim/gui_interface.py:474
 #, fuzzy, python-brace-format
 msgid "You are invited to {room} by {user}"
 msgstr "Está expulsado deste grupo de charla."
 
-#: gajim/gui_interface.py:506
+#: gajim/gui_interface.py:495
 #, fuzzy
 msgid "Certificate Passphrase Required"
 msgstr "É necesario o contrasinal"
 
-#: gajim/gui_interface.py:507
+#: gajim/gui_interface.py:496
 #, fuzzy, python-format
 msgid "Enter the certificate passphrase for account %s"
 msgstr "Introduza o contrasinal GPG para a conta %s"
 
-#: gajim/gui_interface.py:516 gajim/gtk/accounts.py:963
+#: gajim/gui_interface.py:505 gajim/gtk/accounts.py:966
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Introduza un contrasinal para a conta %s"
 
-#: gajim/gui_interface.py:529 gajim/gtk/accounts.py:964
+#: gajim/gui_interface.py:518
+msgid "Password Required"
+msgstr "É necesario o contrasinal"
+
+#: gajim/gui_interface.py:518 gajim/gtk/accounts.py:967
 msgid "Save password"
 msgstr "Gardar o contrasinal"
 
-#: gajim/gui_interface.py:601 gajim/gui_interface.py:632
+#: gajim/gui_interface.py:587 gajim/gui_interface.py:618
+#: gajim/gtk/filetransfer.py:332 gajim/gtk/filetransfer.py:333
 #: gajim/gtk/notification.py:173 gajim/gtk/notification.py:276
 msgid "File Transfer Error"
 msgstr "Produciuse un erro na transferencia do ficheiro"
 
-#: gajim/gui_interface.py:666
+#: gajim/gui_interface.py:652
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s quere enviarlle un ficheiro."
 
-#: gajim/gui_interface.py:668 gajim/gtk/filetransfer.py:479
+#: gajim/gui_interface.py:654 gajim/gtk/filetransfer.py:484
 #: gajim/gtk/notification.py:172 gajim/gtk/notification.py:274
 msgid "File Transfer Request"
 msgstr "Solicitude de transferencia de ficheiro"
 
-#: gajim/gui_interface.py:767
+#: gajim/gui_interface.py:753
 #, fuzzy
 msgid "Remote Contact Stopped Transfer"
 msgstr "Elimina o contacto da listaxe"
 
-#: gajim/gui_interface.py:772
+#: gajim/gui_interface.py:758
 #, fuzzy
 msgid "Error Opening File"
 msgstr "Erro ao ler o ficheiro:"
 
-#: gajim/gui_interface.py:782
+#: gajim/gui_interface.py:768
 #, fuzzy
 msgid "SSL Certificate Error"
 msgstr "O nome de usuario non é válido"
 
-#: gajim/gui_interface.py:795 gajim/gui_interface.py:826
-#: gajim/gui_interface.py:853 gajim/gtk/notification.py:174
+#: gajim/gui_interface.py:781 gajim/gui_interface.py:812
+#: gajim/gui_interface.py:839 gajim/gtk/notification.py:174
 #: gajim/gtk/notification.py:279
 msgid "File Transfer Stopped"
 msgstr "Detívose a transferencia do ficheiro"
 
-#: gajim/gui_interface.py:799
+#: gajim/gui_interface.py:785
 #, fuzzy
 msgid "File Transfer Failed"
 msgstr "Transferencias"
 
-#: gajim/gui_interface.py:822
+#: gajim/gui_interface.py:808
 #, 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:827
+#: gajim/gui_interface.py:813
 #, 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:833
+#: gajim/gui_interface.py:819
 #, 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:848
+#: gajim/gui_interface.py:834
 #, 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:854
+#: gajim/gui_interface.py:840
 #, 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:860
+#: gajim/gui_interface.py:846
 #, 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:971
+#: gajim/gui_interface.py:957
 msgid "Username Conflict"
 msgstr "Conflito co nome de usuario"
 
-#: gajim/gui_interface.py:972
+#: gajim/gui_interface.py:958
 msgid "Please type a new username for your local account"
 msgstr "Por favor, escriba un nome de usuario novo para a súa conta local"
 
-#: gajim/gui_interface.py:995
+#: gajim/gui_interface.py:981
 #, fuzzy
 msgid "Resource Conflict"
 msgstr "Conflito co nome de usuario"
 
-#: gajim/gui_interface.py:996
+#: gajim/gui_interface.py:982
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
 msgstr ""
 
-#: gajim/gui_interface.py:1053
+#: gajim/gui_interface.py:1039
 #, fuzzy, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s quere enviarlle un ficheiro."
 
-#: gajim/gui_interface.py:1055
+#: gajim/gui_interface.py:1041
 #, fuzzy
 msgid "Voice Chat Request"
 msgstr "Solicitude de transferencia de ficheiro"
 
-#: gajim/gui_interface.py:1123 gajim/gtk/account_wizard.py:312
+#: gajim/gui_interface.py:1109 gajim/gtk/account_wizard.py:312
 #, fuzzy
 msgid "Certificate Already in File"
 msgstr "O contacto xa está na listaxe"
 
-#: gajim/gui_interface.py:1124 gajim/gtk/account_wizard.py:313
+#: gajim/gui_interface.py:1110 gajim/gtk/account_wizard.py:313
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr ""
 
-#: gajim/gui_interface.py:1145
+#: gajim/gui_interface.py:1131
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid"
 msgstr ""
 
-#: gajim/gui_interface.py:1148
+#: gajim/gui_interface.py:1134
 #, python-format
 msgid ""
 "\n"
 "Unknown SSL error: %d"
 msgstr ""
 
-#: gajim/gui_interface.py:1150
+#: gajim/gui_interface.py:1136
 #, python-format
 msgid ""
 "\n"
 "SSL Error: <b>%s</b>"
 msgstr ""
 
-#: gajim/gui_interface.py:1155
+#: gajim/gui_interface.py:1141
 msgid "Error verifying SSL certificate"
 msgstr ""
 
-#: gajim/gui_interface.py:1156
+#: gajim/gui_interface.py:1142
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your XMPP server: "
@@ -2222,7 +2196,7 @@ msgid ""
 "Do you still want to connect to this server?"
 msgstr ""
 
-#: gajim/gui_interface.py:1160 gajim/gtk/account_wizard.py:412
+#: gajim/gui_interface.py:1146 gajim/gtk/account_wizard.py:413
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -2232,205 +2206,195 @@ msgid ""
 "%(sha256)s"
 msgstr ""
 
-#: gajim/gui_interface.py:1166
+#: gajim/gui_interface.py:1152
 msgid "Ignore this error for this certificate."
 msgstr ""
 
-#: gajim/gui_interface.py:1174
+#: gajim/gui_interface.py:1160
 #, fuzzy, python-format
 msgid "SSL Certificate Verification for %s"
 msgstr "Engadir unha notificación especial para %s"
 
-#: gajim/gui_interface.py:1442 gajim/gtk/join_groupchat.py:235
-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/gui_interface.py:1448
-#, fuzzy
-msgid "JID is not a Groupchat"
-msgstr "Isto non é un grupo de charla"
-
-#: gajim/gui_interface.py:1579
-msgid "This is not a group chat"
-msgstr "Isto non é un grupo de charla"
-
-#: gajim/gui_interface.py:1580
-#, python-format
-msgid ""
-"%(room_jid)s is already in your roster. Please check if %(room_jid)s is a "
-"correct group chat name. If it is, delete it from your roster and try "
-"joining the group chat again."
-msgstr ""
-
-#: gajim/gui_interface.py:1604 gajim/dialog_messages.py:58
+#: gajim/gui_interface.py:1577
 msgid "You cannot join a group chat while you are invisible"
 msgstr "Non pode entrar nun grupo de charlas se está invisíbel"
 
-#: gajim/gui_interface.py:2037
+#: gajim/gui_interface.py:1976
 msgid "Could not save your settings and preferences"
 msgstr "Non se poden gardar as preferencias"
 
-#: gajim/gui_interface.py:2098
+#: gajim/gui_interface.py:2037
 msgid "Gajim: IPython Console"
 msgstr ""
 
-#: gajim/dialog_messages.py:32
+#: gajim/dialog_messages.py:31 gajim/dialog_messages.py:36
+#: gajim/gtk/single_message.py:305 gajim/gtk/account_wizard.py:229
 #, fuzzy
-msgid "You can not start a new conversation unless you are connected."
-msgstr "Non pode entrar nunha sala de charla até que non se conecte."
-
-#: gajim/dialog_messages.py:36 gajim/dialog_messages.py:41
-#: gajim/gtk/single_message.py:305 gajim/gtk/join_groupchat.py:211
-#: gajim/gtk/account_wizard.py:229
-msgid "Invalid JID"
-msgstr "A ID de Jabber non é válida"
+msgid "Invalid XMPP Address"
+msgstr "O ficheiro non é válido"
 
-#: gajim/dialog_messages.py:42 gajim/gtk/single_message.py:306
+#: gajim/dialog_messages.py:37
 #, fuzzy, python-format
-msgid "It is not possible to send a message to %s, this JID is not valid."
+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/dialog_messages.py:47
-msgid "Unread events"
+#: gajim/dialog_messages.py:42
+#, fuzzy
+msgid "Unread Events"
 msgstr "Acontecementos sen ler"
 
-#: gajim/dialog_messages.py:48
-msgid "Read all pending events before removing this account."
+#: gajim/dialog_messages.py:43
+#, fuzzy
+msgid "Read or acknowledge all pending events before removing this account."
 msgstr "Lea todos os eventos pendentes antes de eliminar esta conta."
 
-#: gajim/dialog_messages.py:52
+#: gajim/dialog_messages.py:48
 #, fuzzy
 msgid "Invalid Form"
 msgstr "A entrada non é válida"
 
-#: gajim/dialog_messages.py:53
+#: gajim/dialog_messages.py:49
 #, fuzzy
 msgid "The form is not filled correctly."
 msgstr ""
 "A ID de Jabber para o grupo de charla contén caracteres que non se permiten."
 
-#: gajim/dialog_messages.py:57 gajim/common/helpers.py:309
+#: gajim/dialog_messages.py:53 gajim/common/helpers.py:315
 msgid "Invisible"
 msgstr "Invisíbel"
 
-#: gajim/dialog_messages.py:62
-msgid "A connection is not available"
-msgstr "Non está dispoñíbel ningunha conexión"
+#: gajim/dialog_messages.py:54
+#, fuzzy
+msgid "You cannot join a group chat while being invisible."
+msgstr "Non pode entrar nun grupo de charlas se está invisíbel"
 
-#: gajim/dialog_messages.py:63
+#: gajim/dialog_messages.py:58
+#, fuzzy
+msgid "No Connection Available"
+msgstr "Conexión non dispoñíbel"
+
+#: gajim/dialog_messages.py:59
 msgid "Your message can not be sent until you are connected."
 msgstr "A súa mensaxe non se enviará mentres non estiver conectado."
 
-#: gajim/dialog_messages.py:67
-#, fuzzy
-msgid "JID already in list"
-msgstr "Cliente de MI de Jabber"
+#: gajim/dialog_messages.py:63
+msgid "XMPP Address Already in List"
+msgstr ""
 
-#: gajim/dialog_messages.py:68
-msgid "The JID you entered is already in the list. Choose another one."
+#: gajim/dialog_messages.py:64
+#, fuzzy
+msgid ""
+"The XMPP Address you entered is already in the list. Please choose another "
+"one."
 msgstr ""
+"Este nome xa está en uso por outra das súas contas. Por favor, escolla outro "
+"nome."
 
-#: gajim/dialog_messages.py:72
-msgid "Invalid answer"
+#: gajim/dialog_messages.py:69
+#, fuzzy
+msgid "Invalid Answer"
 msgstr "A resposta non é válida"
 
-#: gajim/dialog_messages.py:73
+#: gajim/dialog_messages.py:70
 #, fuzzy, python-format
 msgid "Transport %(name)s answered wrongly to register request: %(error)s"
 msgstr "O transporte %s respondeu incorrectamente á solicitude de rexistro: %s"
 
-#: gajim/dialog_messages.py:78
+#: gajim/dialog_messages.py:75
 #, fuzzy
 msgid "Wrong Custom Hostname"
 msgstr "Usa un nome de host e un porto personalizados"
 
-#: gajim/dialog_messages.py:79
+#: gajim/dialog_messages.py:76
 #, fuzzy, python-format
-msgid "Wrong custom hostname \"%s\". Ignoring it."
+msgid "Custom hostname \"%s\" is wrong. It will be ignored."
 msgstr "Usa un nome de host e un porto personalizados"
 
-#: gajim/dialog_messages.py:83
+#: gajim/dialog_messages.py:80
 #, fuzzy
-msgid "Error while removing privacy list"
+msgid "Error While Removing Privacy List"
 msgstr "Erro ao engadir o servizo. %s"
 
-#: gajim/dialog_messages.py:84
+#: gajim/dialog_messages.py:81
 #, python-format
 msgid ""
-"Privacy list %s has not been removed. It is maybe active in one of your "
-"connected resources. Deactivate it and try again."
+"Privacy list %s has not been removed. It is probably active in one of your "
+"connected resources. Please deactivate it and try again."
 msgstr ""
 
-#: gajim/dialog_messages.py:90
+#: gajim/dialog_messages.py:87
 #, fuzzy
-msgid "Invisibility not supported"
+msgid "Invisibility Not Supported"
 msgstr "Extensión non admitida"
 
-#: gajim/dialog_messages.py:91
-#, python-format
-msgid "Account %s doesn't support invisibility."
-msgstr ""
+#: gajim/dialog_messages.py:88
+#, fuzzy, python-format
+msgid "This account %s doesn't support invisibility."
+msgstr "Listaxe de transferencias activas, rematadas e detidas"
 
-#: gajim/dialog_messages.py:95
+#: gajim/dialog_messages.py:92
 #, fuzzy
-msgid "Unregister failed"
+msgid "Unregister Failed"
 msgstr "Fallou a conexión"
 
-#: gajim/dialog_messages.py:96
-#, python-format
-msgid "Unregistration with server %(server)s failed: %(error)s"
-msgstr ""
+#: gajim/dialog_messages.py:93
+#, fuzzy, python-format
+msgid "Unregistration on server %(server)s failed: %(error)s"
+msgstr "Fallou a conexión"
 
-#: gajim/dialog_messages.py:100
+#: gajim/dialog_messages.py:97
 #, fuzzy
-msgid "Registration succeeded"
+msgid "Registration Succeeded"
 msgstr "Rexistrar %s"
 
-#: gajim/dialog_messages.py:101
-#, python-format
-msgid "Registration with agent %s succeeded"
-msgstr ""
+#: gajim/dialog_messages.py:98
+#, fuzzy, python-format
+msgid "Registration with agent %s succeeded."
+msgstr "Rexistrar %s"
 
-#: gajim/dialog_messages.py:105 gajim/gtk/service_registration.py:215
+#: gajim/dialog_messages.py:102
 #, fuzzy
-msgid "Registration failed"
+msgid "Registration Failed"
 msgstr "Fallou a conexión"
 
-#: gajim/dialog_messages.py:106
+#: gajim/dialog_messages.py:103
 #, python-format
 msgid ""
 "Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
 msgstr ""
 
-#: gajim/dialog_messages.py:111
+#: gajim/dialog_messages.py:108
 #, fuzzy
 msgid "Unable to Join Group Chat"
 msgstr "Non se puido entrar no grupo de charla"
 
-#: gajim/dialog_messages.py:116
-msgid "GStreamer error"
+#: gajim/dialog_messages.py:113
+msgid "GStreamer Error"
 msgstr ""
 
-#: gajim/dialog_messages.py:117
+#: gajim/dialog_messages.py:114
 #, fuzzy, python-format
 msgid ""
 "Error: %(error)s\n"
 "Debug: %(debug)s"
 msgstr "Mensaxe de erro: %s"
 
-#: gajim/dialog_messages.py:121
-msgid "Wrong host"
+#: gajim/dialog_messages.py:118
+#, fuzzy
+msgid "Wrong Host"
 msgstr "Host errado"
 
-#: gajim/dialog_messages.py:122
+#: gajim/dialog_messages.py:119
 msgid "Invalid local address? :-O"
 msgstr ""
 
-#: gajim/dialog_messages.py:126
-msgid "Avahi error"
+#: gajim/dialog_messages.py:123
+#, fuzzy
+msgid "Avahi Error"
 msgstr "Erro de Avahi"
 
-#: gajim/dialog_messages.py:127
+#: gajim/dialog_messages.py:124
 #, python-format
 msgid ""
 "%s\n"
@@ -2439,66 +2403,66 @@ msgstr ""
 "%s\n"
 "A mensaxaría de ligazón local podería non funcionar correctamente."
 
-#: gajim/dialog_messages.py:131 gajim/dialog_messages.py:136
+#: gajim/dialog_messages.py:128 gajim/dialog_messages.py:133
 #, fuzzy
-msgid "Could not request upload slot"
+msgid "Could not request upload slot for HTTP File Upload"
 msgstr "Non foi posíbel iniciar o servizo local"
 
-#: gajim/dialog_messages.py:137
-msgid "Got unexpected response from server (see log)"
+#: gajim/dialog_messages.py:134
+msgid "Got unexpected response from server (see log)."
 msgstr ""
 
-#: gajim/dialog_messages.py:141 gajim/dialog_messages.py:146
+#: gajim/dialog_messages.py:138 gajim/dialog_messages.py:143
 #, fuzzy
-msgid "Could not open file"
+msgid "Could not Open File"
 msgstr "Non foi posíbel cargar a imaxe"
 
-#: gajim/dialog_messages.py:142
-msgid "Exception raised while opening file (see log)"
+#: gajim/dialog_messages.py:139
+msgid "Exception raised while trying to open file (see log)."
 msgstr ""
 
-#: gajim/dialog_messages.py:151
-msgid "Unsecure"
-msgstr ""
+#: gajim/dialog_messages.py:148
+#, fuzzy
+msgid "Not Secure"
+msgstr "Non iniciado"
 
-#: gajim/dialog_messages.py:152
-msgid "Server returned unsecure transport (HTTP)"
+#: gajim/dialog_messages.py:149
+msgid "The server returned an insecure transport (HTTP)."
 msgstr ""
 
-#: gajim/dialog_messages.py:156
+#: gajim/dialog_messages.py:153
 #, fuzzy
-msgid "Could not upload file"
+msgid "Could not Upload File"
 msgstr "Non foi posíbel cargar a imaxe"
 
-#: gajim/dialog_messages.py:157
+#: gajim/dialog_messages.py:154
 #, python-format
 msgid "HTTP response code from server: %s"
 msgstr ""
 
-#: gajim/dialog_messages.py:161
+#: gajim/dialog_messages.py:158
 msgid "Upload Error"
 msgstr ""
 
-#: gajim/dialog_messages.py:166
+#: gajim/dialog_messages.py:163
 #, fuzzy
 msgid "Encryption Error"
 msgstr "Cifrado activado"
 
-#: gajim/dialog_messages.py:167
-#, fuzzy
-msgid "For the chosen encryption there is no encryption method available"
-msgstr "Non está dispoñíbel ningunha conexión"
+#: gajim/dialog_messages.py:164
+msgid "There is no encryption method available for the chosen encryption."
+msgstr ""
 
-#: gajim/dialog_messages.py:171
+#: gajim/dialog_messages.py:169
 #, fuzzy
-msgid "Avatar upload failed"
+msgid "Avatar Upload Failed"
 msgstr "Fallou a publicación da vCard"
 
-#: gajim/privatechat_control.py:204
+#: gajim/privatechat_control.py:207
 msgid "Sending private message failed"
 msgstr "O envío da mensaxe privada fallou"
 
-#: gajim/privatechat_control.py:206
+#: gajim/privatechat_control.py:209
 #, fuzzy, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr ""
@@ -2522,7 +2486,7 @@ msgstr "amosar axuda sobre un comando"
 
 #: gajim/gajim_remote.py:85
 #, fuzzy
-msgid "Lists all contacts in roster, one for each line"
+msgid "Lists all contacts in the contact list, one for each line"
 msgstr ""
 "Amosa unha listaxe de todos os contactos na listaxe. Cada contacto aparece "
 "nunha liña distinta"
@@ -2609,11 +2573,13 @@ msgstr ""
 
 #: gajim/gajim_remote.py:118
 #, fuzzy
-msgid "Sends new chat message to a contact in the roster. Account is optional."
+msgid ""
+"Sends new chat message to a contact in the contact list. Account is optional."
 msgstr "Uso: /%s, oculta os botóns de charla."
 
 #: gajim/gajim_remote.py:120 gajim/gajim_remote.py:130
-msgid "JID of the contact that will receive the message"
+#, fuzzy
+msgid "XMPP Address of the contact that will receive the message"
 msgstr "JID do contacto que recibirá a mensaxe"
 
 #: gajim/gajim_remote.py:121 gajim/gajim_remote.py:132
@@ -2627,8 +2593,10 @@ msgid "if specified, the message will be sent using this account"
 msgstr "se se especifica, a mensaxe enviarase a través desta conta"
 
 #: gajim/gajim_remote.py:127
-msgid "Sends a chat message to someone on your roster. Account is optional."
-msgstr ""
+#, fuzzy
+msgid ""
+"Sends a chat message to someone on your contact list. Account is optional."
+msgstr "Uso: /%s, oculta os botóns de charla."
 
 #: gajim/gajim_remote.py:131
 msgid "subject"
@@ -2639,12 +2607,12 @@ msgid "message subject"
 msgstr "tema da mensaxe"
 
 #: gajim/gajim_remote.py:138
-msgid "Sends new message to a groupchat you've joined."
+msgid "Sends new message to a group chat you've joined."
 msgstr ""
 
 #: gajim/gajim_remote.py:140
 #, fuzzy
-msgid "JID of the room that will receive the message"
+msgid "XMPP Address of the group chat that will receive the message"
 msgstr "JID do contacto que recibirá a mensaxe"
 
 #: gajim/gajim_remote.py:147
@@ -2653,7 +2621,8 @@ msgstr "Obter información detallada dun contacto"
 
 #: gajim/gajim_remote.py:149 gajim/gajim_remote.py:162
 #: gajim/gajim_remote.py:192
-msgid "JID of the contact"
+#, fuzzy
+msgid "XMPP Address of the contact"
 msgstr "JID do contacto"
 
 #: gajim/gajim_remote.py:153
@@ -2717,7 +2686,8 @@ msgstr ""
 "configuración"
 
 #: gajim/gajim_remote.py:190
-msgid "Removes contact from roster"
+#, fuzzy
+msgid "Removes contact from contact list"
 msgstr "Elimina o contacto da listaxe"
 
 #: gajim/gajim_remote.py:193
@@ -2767,9 +2737,9 @@ msgid "Missing argument \"contact_jid\""
 msgstr "Non se atopa o argumento \"contact_jid\""
 
 #: gajim/gajim_remote.py:275
-#, python-format
+#, fuzzy, python-format
 msgid ""
-"'%s' is not in your roster.\n"
+"'%s' is not in your contact list.\n"
 "Please specify account for sending the message."
 msgstr ""
 "'%s' non está na súa listaxe de contactos.\n"
@@ -2990,12 +2960,12 @@ msgstr "Final de semana"
 msgid "Weekend!"
 msgstr "Fin de semana!"
 
-#: gajim/common/logger.py:192 gajim/common/logger.py:197
+#: gajim/common/logger.py:189 gajim/common/logger.py:194
 #, 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:217
+#: gajim/common/logger.py:214
 #, fuzzy, python-format
 msgid "Creating %s"
 msgstr "Descrición: %s"
@@ -3069,24 +3039,23 @@ msgstr "%(nickname)s desconectouse"
 msgid "Contact Signed Out"
 msgstr "Contacto desconectado"
 
-#: gajim/common/contacts.py:455
-#, fuzzy
-msgid "Not in roster"
-msgstr "Non está na listaxe"
-
 #: gajim/common/config.py:80
+#, fuzzy
 msgid ""
 "Show desktop notification even when a chat window is opened for this contact "
-"and does not have focus"
+"and does not have focus."
 msgstr ""
+"Permitir as notificacións emerxentes cando estou _ausente, non dispoñíbel, "
+"ocupado ou invisíbel."
 
 #: gajim/common/config.py:81
-msgid "Play sound when user is busy"
+msgid "Play sound even when being busy."
 msgstr ""
 
 #: gajim/common/config.py:83
-msgid "Show only online and free for chat contacts in roster."
-msgstr ""
+#, fuzzy
+msgid "Show only online and free for chat contacts in the contact list."
+msgstr "Gustaríame engadilo á miña listaxe de contactos."
 
 #: gajim/common/config.py:86
 msgid "Time in minutes, after which your status changes to away."
@@ -3094,11 +3063,13 @@ msgstr "Tempo en minutos, despois de cambiar a ausente"
 
 #: gajim/common/config.py:87
 #, fuzzy
-msgid "$S (Away as a result of being idle more than $T min)"
+msgid "$S (Away: Idle more than $T min)"
 msgstr "Ausente por inactividade"
 
 #: gajim/common/config.py:87
-msgid "$S will be replaced by current status message, $T by autoawaytime."
+msgid ""
+"$S will be replaced by current status message, $T by the 'autoawaytime' "
+"value."
 msgstr ""
 
 #: gajim/common/config.py:89
@@ -3107,71 +3078,73 @@ msgstr "Tempo en minutos, despois de cambiar a non dispoñíbel"
 
 #: gajim/common/config.py:90
 #, fuzzy
-msgid "$S (Not available as a result of being idle more than $T min)"
+msgid "$S (Not available: Idle more than $T min)"
 msgstr "Non dispoñíbel por inactividade"
 
 #: gajim/common/config.py:90
-msgid "$S will be replaced by current status message, $T by autoxatime."
+msgid ""
+"$S will be replaced by current status message, $T by the 'autoxatime' value."
 msgstr ""
 
 #: gajim/common/config.py:93
 msgid ""
-"When to show notification area icon. Can be 'never', 'on_event', 'always'."
+"When to show the notification area icon. Can be 'never', 'on_event', and "
+"'always'."
 msgstr ""
 
 #: gajim/common/config.py:94
-msgid "Allow to hide the roster window even if the tray icon is not shown."
+msgid ""
+"Allow to hide the contact list window even if the notification area icon is "
+"not shown."
 msgstr ""
 
 #: gajim/common/config.py:97
 #, fuzzy
-msgid "Contact signed in notification color."
-msgstr "_Mostrar o evento na listaxe de contactos"
+msgid "Notification color for contacts signing in."
+msgstr "Notificar cando un contacto: "
 
 #: gajim/common/config.py:98
 #, fuzzy
-msgid "Contact signout notification color"
-msgstr "_Mostrar o evento na listaxe de contactos"
+msgid "Notification color for contacts signing out."
+msgstr "Notificar cando un contacto: "
 
 #: gajim/common/config.py:99
 #, fuzzy
-msgid "New message notification color."
+msgid "Notification color for new message notification."
 msgstr "_Mostrar o evento na listaxe de contactos"
 
 #: gajim/common/config.py:100
 #, fuzzy
-msgid "File transfer request notification color."
-msgstr "Solicitude de transferencia de ficheiro"
+msgid "Notification color for file transfer request."
+msgstr "_Notificarme cando rematar unha transferencia"
 
 #: gajim/common/config.py:101
 #, fuzzy
-msgid "File transfer error notification color."
-msgstr "Cancelouse a transferencia do ficheiro"
+msgid "Notification color for file transfer errors."
+msgstr "_Notificarme cando rematar unha transferencia"
 
 #: gajim/common/config.py:102
-#, fuzzy
-msgid "File transfer complete or stopped notification color."
+msgid "Notification color for stopped or completed file transfers."
 msgstr ""
-"Cando unha transferencia se completar, amosa unha notificación emerxente"
 
 #: gajim/common/config.py:103
-#, fuzzy
-msgid "Groupchat invitation notification color"
-msgstr "Convite a grupo de charla"
+msgid "Notification color for group chat invitations."
+msgstr ""
 
 #: gajim/common/config.py:104
 #, fuzzy
-msgid "Background color of status changed notification"
+msgid "Notification background color for changed status."
 msgstr "Cor de fondo para os contactos que acaban de se conectar."
 
 #: gajim/common/config.py:105
-msgid "Other dialogs color."
+msgid "Notification color for other dialogs."
 msgstr ""
 
 # duda sobre collapsed
 #: gajim/common/config.py:106
+#, fuzzy
 msgid ""
-"List (space separated) of rows (accounts and groups) that are collapsed."
+"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."
 
@@ -3180,8 +3153,10 @@ msgstr ""
 msgid "default"
 msgstr "Por defecto"
 
-#: gajim/common/config.py:113
-msgid "Language used by speller"
+#: gajim/common/config.py:113 gajim/common/config.py:424
+#: gajim/common/config.py:431
+#, fuzzy
+msgid "Language used for spell checking."
 msgstr "Idioma que emprega o corrector"
 
 #: gajim/common/config.py:114
@@ -3198,8 +3173,8 @@ msgstr ""
 #, fuzzy
 msgid ""
 "Print time in chats using Fuzzy Clock. Value of fuzziness from 1 to 4, or 0 "
-"to disable fuzzyclock. 1 is the most precise clock, 4 the least precise one. "
-"This is used only if print_time is 'sometimes'."
+"to disable Fuzzy Clock. 1 is the most precise clock, 4 the least precise "
+"one. This is used only if 'print_time' is 'sometimes'."
 msgstr ""
 "Amosar a hora nas charlas co Fuzzy Clock. Valor do fuzziness desde 1 a 4 ou "
 "0 para desactivar o fuzzyclock. 1 é o reloxo máis preciso, 4 o menos "
@@ -3216,7 +3191,8 @@ msgstr "Tratar os pares de * / _ como posíbeis caracteres de formato."
 #: gajim/common/config.py:120
 #, fuzzy
 msgid ""
-"If true, do not remove */_ . So *abc* will be bold but with * * not removed."
+"If enabled, do not remove */_ . So *abc* will be bold but with * * not "
+"removed."
 msgstr ""
 "Se é verdadeiro, non elimina */_ . Daquela, *abc* será negra, mais sen "
 "eliminar * *"
@@ -3224,298 +3200,302 @@ msgstr ""
 #: gajim/common/config.py:123
 #, fuzzy
 msgid ""
-"Uses ReStructured text markup to send HTML, plus ascii formatting if "
-"selected. For syntax, see http://docutils.sourceforge.net/docs/ref/rst/"
-"restructuredtext.html (If you want to use this, install docutils)"
+"Uses ReStructured text markup to send HTML, plus ASCII formatting if "
+"selected. Needs docutils installed (for syntax, see http://docutils."
+"sourceforge.net/docs/ref/rst/restructuredtext.html)."
 msgstr ""
 "Usa a sintaxe de ReStructured para HTML, mais o formato ascii se está "
 "seleccionado (se quere usalo, instale o docutils)"
 
 #: gajim/common/config.py:132
+#, fuzzy
 msgid ""
-"Character to add after nickname when using nick completion (tab) in group "
-"chat."
+"Character to add after nickname when using nickname completion (tab) in "
+"group chat."
 msgstr ""
 "Carácter para engadir despois do alcume cando se usa o completado de alcume "
 "(tab) nos grupos de charla."
 
 #: gajim/common/config.py:133
+#, fuzzy
 msgid ""
-"Character to propose to add after desired nickname when desired nickname is "
-"used by someone else in group chat."
+"Character to propose to add after desired nickname when nickname is already "
+"used in group chat."
 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:155
 msgid ""
-"If true, Gajim will save roster position when hiding roster, and restore it "
-"when showing roster."
+"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:161
-msgid "Place the roster on the right in single window mode"
+msgid "Place the contact list on the right in single window mode"
 msgstr ""
 
 #: gajim/common/config.py:167
 msgid ""
-"This option let you customize timestamp that is printed in conversation. For "
-"example \"[%H:%M] \" will show \"[hour:minute] \". See python doc on "
-"strftime for full documentation: http://docs.python.org/lib/module-time.html"
+"This option lets you customize the timestamp that is printed in "
+"conversation. For example '[%H:%M] ' will show '[hour:minute] '. See python "
+"doc on strftime for full documentation (https://docs.python.org/3/library/"
+"time.html)."
 msgstr ""
 
 #: gajim/common/config.py:168
-msgid "Characters that are printed before the nickname in conversations"
+msgid "Characters that are printed before the nickname in conversations."
 msgstr ""
 
 #: gajim/common/config.py:169
-msgid "Characters that are printed after the nickname in conversations"
+msgid "Characters that are printed after the nickname in conversations."
 msgstr ""
 
 #: gajim/common/config.py:170
-msgid "Add * and [n] in roster title?"
-msgstr "Engadir * e [n] no título da listaxe?"
+#, 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:171
 #, fuzzy
 msgid ""
-"How many history messages should be restored when a chat tab/window is "
-"reopened?"
+"Number of messages from chat history to be restored when a chat tab/window "
+"is reopened."
 msgstr ""
 "Cantas liñas quere lembrar da última charla cando se volve abrir un "
 "separador/fiestra de charla"
 
 #: gajim/common/config.py:172
-msgid "How far back in time (minutes) history is restored. -1 means no limit."
+msgid ""
+"How far back in time (minutes) chat history is restored. -1 means no limit."
 msgstr ""
 
 #: gajim/common/config.py:173
 msgid ""
-"How many lines to request from server when entering a groupchat. -1 means no "
-"limit"
+"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:174
 msgid ""
-"Minutes of backlog to request when entering a groupchat. -1 means no limit"
+"Should automatic rejoin be activated when you were kicked from a group chat?"
 msgstr ""
 
 #: gajim/common/config.py:175
-msgid ""
-"How many seconds to wait before trying to autorejoin to a conference you are "
-"being disconnected from. Set to 0 to disable autorejoining."
-msgstr ""
-
-#: gajim/common/config.py:176
-msgid "Should autorejoin be activated when kicked from a conference?"
-msgstr ""
-
-#: gajim/common/config.py:177
-msgid ""
-"Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
-"Client default behaviour)."
+#, 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:179
-msgid "How many lines to store for Ctrl+KeyUP."
+#: gajim/common/config.py:177
+#, 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:182
+#: gajim/common/config.py:180
 #, fuzzy, python-format
 msgid ""
-"Either custom URL with %%s in it where %%s is the word/phrase or "
-"'WIKTIONARY' which means use Wikitionary."
+"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 onde %s é a palabra/frase ou 'WIKTIONARY' que "
 "significa usar o wiktionary"
 
-#: gajim/common/config.py:185
+#: gajim/common/config.py:183
 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:187
+#: gajim/common/config.py:185
+#, fuzzy
 msgid ""
-"When not printing time for every message (print_time==sometimes), print it "
+"When not printing time for every message ('print_time'==sometimes), print it "
 "every x minutes."
 msgstr ""
 "Cando non se amosa a hora en cada mensaxe (print_time==sometimes), móstraa "
 "cada x minutos."
 
-#: gajim/common/config.py:188
+#: gajim/common/config.py:186
 msgid "Ask before pasting an image."
 msgstr ""
 
-#: gajim/common/config.py:189
+#: gajim/common/config.py:187
 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:190
+#: gajim/common/config.py:188
 #, fuzzy
 msgid ""
-"Always ask for confirmation before closing groupchats with any of the JIDs "
-"on this space separated list."
+"Always ask for confirmation before closing group chats with any of the XMPP "
+"Addresses on this list (space separated)."
 msgstr ""
 "Preguntar sempre antes de pechar a fiestra/separador dun grupo de charla "
 "nesta listaxe (separada por espazos) de ID de Jabber de grupos de charla."
 
-#: gajim/common/config.py:191
+#: gajim/common/config.py:189
 #, fuzzy
 msgid ""
-"Never ask for confirmation before closing groupchats with any of the JIDs on "
-"this space separated list."
+"Never ask for confirmation before closing group chats with any of the XMPP "
+"Addresses on this list (space separated)."
 msgstr ""
 "Non preguntar nunca antes de pechar a fiestra/separador dun grupo de charla "
 "nesta listaxe (separada por espazos) de ID de Jabber de grupos de charla."
 
-#: gajim/common/config.py:192
+#: gajim/common/config.py:190
 msgid ""
-"Ask before closing tabbed chat window if there are controls that can lose "
-"data (chat, private chat, groupchat that will not be minimized)"
+"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:195
+#: gajim/common/config.py:193
 #, fuzzy
 msgid ""
-"Comma separated list of sent hosts, in addition of local interfaces, for "
-"File Transfer in case of address translation/port forwarding."
+"List of send hosts (comma separated) in addition to local interfaces for "
+"file transfers (in case of address translation/port forwarding)."
 msgstr ""
 "Elimínase o host que enviamos para a transferencia dun ficheiro caso de "
 "tradución do enderezo ou o redirección de portos."
 
-#: gajim/common/config.py:196
+#: gajim/common/config.py:194
 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:198
+#: gajim/common/config.py:196
 #, fuzzy
 msgid "Notify of events in the notification area."
 msgstr "Notifica acontecementos na área de notificación."
 
-#: gajim/common/config.py:199
+#: gajim/common/config.py:197
 msgid ""
-"If False, Gajim will display a static event icon instead of the blinking "
-"status icon in the notification area when notifying on event."
+"If disabled, Gajim will display a static event icon instead of the blinking "
+"status icon in the notification area when notifying about an event."
 msgstr ""
 
-#: gajim/common/config.py:205
+#: gajim/common/config.py:203
 msgid "Show tab when only one conversation?"
 msgstr "Quere amosar o separador cando só hai unha conversa?"
 
-#: gajim/common/config.py:206
+#: gajim/common/config.py:204
 #, 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:207
+#: gajim/common/config.py:205
 msgid "Show close button in tab?"
 msgstr "Quere amosar o botón de pechar no tabulador?"
 
-#: gajim/common/config.py:220
+#: gajim/common/config.py:218
 msgid "Preview new messages in notification popup?"
 msgstr ""
 
-#: gajim/common/config.py:223
+#: gajim/common/config.py:221
+#, fuzzy
 msgid ""
-"A semicolon-separated list of words that will be highlighted in group chats."
+"A list of words (semicolon separated) that will be highlighted in group "
+"chats."
 msgstr ""
 "Separarase por ';'unha listaxe de palabras que serán resaltadas nos grupos "
 "de charla."
 
-#: gajim/common/config.py:224
+#: gajim/common/config.py:222
 #, fuzzy
 msgid ""
-"If true, quits Gajim when X button of Window Manager is clicked. This "
-"setting is taken into account only if notification icon is used."
+"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 ""
 "Se é verdadeiro, peche o Gajim cando se preme o botón X do xestor de "
 "fiestras. Esta preferencia só se activa se se usa a icona da área de "
 "notificación. "
 
-#: gajim/common/config.py:225
+#: gajim/common/config.py:223
 msgid ""
-"If true, Gajim hides the Roster window on pressing the X button instead of "
-"minimizing into the Dock."
+"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:226
+#: gajim/common/config.py:224
 #, fuzzy
 msgid ""
-"If true, Gajim will display an icon on each tab containing unread messages. "
-"Depending on the theme, this icon may be animated."
+"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:227
+#: gajim/common/config.py:225
 #, fuzzy
 msgid ""
-"If true, Gajim will display the status message, if not empty, for every "
-"contact under the contact name in roster window."
+"If enabled, Gajim will display the status message (if not empty) underneath "
+"the contact name in the contact list window."
 msgstr ""
 "Se é verdadeiro, o Gajim amosará a mensaxe de estado, se non está baleiro, "
 "para cada contacto baixo o seu nome de contacto na fiestra da listaxe."
 
-#: gajim/common/config.py:233
-msgid "Define the position of the avatar in roster. Can be left or right"
+#: gajim/common/config.py:231
+msgid ""
+"Define the position of avatars in the contact list. Can be 'left' or 'right'."
 msgstr ""
 
-#: gajim/common/config.py:234
+#: gajim/common/config.py:232
 #, fuzzy
 msgid ""
-"If False, Gajim will no longer print status line in chats when a contact "
-"changes their status and/or their status message."
+"If disabled, Gajim will no longer print status messages in chats when a "
+"contact changes their status (and/or their status message)."
 msgstr ""
 "Se é falso, o Gajim nunca máis amosará a liña de estado cando un contacto "
 "cambie o seu estado ou a súa mensaxe de estado"
 
-#: gajim/common/config.py:235
+#: gajim/common/config.py:233
 #, fuzzy
 msgid ""
 "Default Setting: Show a status message for every join or leave in a group "
-"chat"
+"chat."
 msgstr "Non se puido entrar no grupo de charla"
 
-#: gajim/common/config.py:236
+#: gajim/common/config.py:234
+#, fuzzy
 msgid ""
-"Default Setting: Show a status message for all status (away, dnd, etc.) "
-"changes of users in a group chat"
-msgstr ""
+"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:238
-msgid "Log XHTML messages instead of plain text messages."
+#: gajim/common/config.py:236
+msgid "Store XHTML messages in chat history instead of plain text messages."
 msgstr ""
 
-#: gajim/common/config.py:239
+#: gajim/common/config.py:237
 msgid "Don't show avatar for the transport itself."
 msgstr "Non amosar a circunstancia para o transporte en si mesmo"
 
-#: gajim/common/config.py:240
-msgid "Don't show roster in the system taskbar."
+#: gajim/common/config.py:238
+#, 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:241
+#: gajim/common/config.py:239
 #, fuzzy
 msgid ""
-"If true, make the window flash (the default behaviour in most Window "
-"Managers) when holding pending events."
+"If enabled, Gajim makes the window flash (the default behaviour in most "
+"Window Managers) when holding pending events."
 msgstr ""
 "Se é verdadeiro e as versións instaladas de GTK+ e PyGTK son, cando menos, "
 "2.8, resalta a fiestra cando hai eventos pendentes."
 
-#: gajim/common/config.py:245
+#: gajim/common/config.py:243
 #, fuzzy
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
 "'always_with_roster' - Like 'always' but the messages are in a single window "
-"along with the roster.\n"
+"along with the contact list.\n"
 "'never' - All messages get their own window.\n"
 "'peracct' - Messages for each account are sent to a specific window.\n"
-"'pertype' - Each message type (e.g. chats vs. groupchats) is sent to a "
+"'pertype' - Each message type (e.g. chats vs. group chats) is sent to a "
 "specific window."
 msgstr ""
 "Controla a fiestra onde se colocan as novas mensaxes.\n"
@@ -3527,244 +3507,261 @@ 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:246
+#: gajim/common/config.py:244
 msgid ""
-"Show roster on startup.\n"
-"'always' - Always show roster.\n"
-"'never' - Never show roster.\n"
-"'last_state' - Restore the last state roster."
+"Show contact list window on startup.\n"
+"'always' - Always show contact list window.\n"
+"'never' - Never show contact list window.\n"
+"'last_state' - Restore last state of the contact list window."
 msgstr ""
 
-#: gajim/common/config.py:247
-msgid "If False, you will no longer see the avatar in the chat window."
+#: gajim/common/config.py:245
+#, 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:248
+#: gajim/common/config.py:246
 #, fuzzy
-msgid "If true, pressing the escape key closes a tab/window."
+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:249
-msgid "Hides the banner in a group chat window"
+#: gajim/common/config.py:247
+#, 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:250
-msgid "Hides the banner in two persons chat window"
-msgstr "Oculta o báner nunha fiestra de charla de dúas persoas."
+#: gajim/common/config.py:248
+#, 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:251
-msgid "Hides the group chat occupants list in group chat window."
+#: gajim/common/config.py:249
+#, 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:252
+#: gajim/common/config.py:250
+#, fuzzy
 msgid ""
 "In a chat, show the nickname at the beginning of a line only when it's not "
-"the same person talking than in previous message."
+"the same person talking as in the previous message."
 msgstr ""
 "Nunha charla, amosa o alcume ao comezo nunha soa liña cando non é a mesma "
 "persoa a que enviou a última mensaxe."
 
-#: gajim/common/config.py:253
+#: gajim/common/config.py:251
 #, fuzzy
 msgid "Indentation when using merge consecutive nickname."
 msgstr "Sangría cando se use unha combinación de alcumes consecutivos."
 
-#: gajim/common/config.py:254
-msgid "Ctrl-Tab go to next composing tab when none is unread."
+#: gajim/common/config.py:252
+#, fuzzy
+msgid ""
+"Ctrl+Tab switches to the next composing tab when there are no tabs with "
+"messages pending."
 msgstr ""
 "Ctrl-Tab conduce ao próximo separador de composición cando ningún está sen "
 "ler."
 
-#: gajim/common/config.py:255
+#: gajim/common/config.py:253
 #, fuzzy
 msgid ""
-"Show the confirm metacontacts creation dialog or not? Empty string means "
-"never show the dialog."
+"Show a confirmation dialog to create metacontacts? Empty string means never "
+"show the dialog."
 msgstr ""
 "Débese amosar a confirmación da creación de metacontactos ou non? Unha "
 "secuencia baleira significa que nunca se amosará."
 
-#: gajim/common/config.py:256
+#: gajim/common/config.py:254
 #, fuzzy
 msgid ""
-"Show the confirm block contact dialog or not? Empty string means never show "
+"Show a confirmation dialog to block a contact? Empty string means never show "
 "the dialog."
 msgstr ""
 "Débese amosar a confirmación da creación de metacontactos ou non? Unha "
 "secuencia baleira significa que nunca se amosará."
 
-#: gajim/common/config.py:257
+#: gajim/common/config.py:255
 #, fuzzy
 msgid ""
-"Show the confirm custom status dialog or not? Empty string means never show "
-"the dialog."
+"Show a confirmation dialog for a custom status? Empty string means never "
+"show the dialog."
 msgstr ""
 "Débese amosar a confirmación da creación de metacontactos ou non? Unha "
 "secuencia baleira significa que nunca se amosará."
 
-#: gajim/common/config.py:258
+#: gajim/common/config.py:256
 #, fuzzy
 msgid ""
-"If true, you will be able to set a negative priority to your account in "
-"account modification window. BE CAREFUL, when you are logged in with a "
-"negative priority, you will NOT receive any message from your server."
+"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 ""
 "Se é verdadeiro, poderá definir unha prioridade negativa á súa conta na "
 "fiestra de modificación de conta. TEÑA COIDADO, cando está conectado cunha "
 "prioridade negativa, NON recibirá ningunha mensaxe do seu servidor."
 
-#: gajim/common/config.py:259
+#: gajim/common/config.py:257
 msgid ""
-"If true, Gajim will show number of online and total contacts in account and "
-"group rows."
+"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:260
+#: gajim/common/config.py:258
 msgid ""
-"Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
-"as if they were of this type"
+"Can be empty, 'chat' or 'normal'. If not empty, all incoming messages are "
+"treated as if they were of this type."
 msgstr ""
 
-#: gajim/common/config.py:261
+#: gajim/common/config.py:259
 msgid ""
-"If true, Gajim will scroll and select the contact who sent you the last "
-"message, if chat window is not already opened."
+"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:262
+#: gajim/common/config.py:260
 msgid "Time of inactivity needed before the change status window closes down."
 msgstr ""
 
-#: gajim/common/config.py:263
+#: gajim/common/config.py:261
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
 msgstr ""
 
-#: gajim/common/config.py:264
+#: gajim/common/config.py:262
 msgid ""
-"If true, notification windows from notification-daemon will be attached to "
-"notification icon."
+"If enabled, notification windows from notification-daemon will be attached "
+"to the notification area icon."
 msgstr ""
 
-#: gajim/common/config.py:265
+#: gajim/common/config.py:263
 msgid "Choose interval between 2 checks of idleness."
 msgstr ""
 
-#: gajim/common/config.py:266
+#: gajim/common/config.py:264
 msgid ""
-"Valid uri schemes. Only schemes in this list will be accepted as \"real\" "
-"uri. (mailto and xmpp are handled separately)"
+"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:265
+msgid ""
+"If enabled, completion in group chats will be like a shell auto-completion."
+msgstr ""
+
+#: gajim/common/config.py:270
+msgid "Optionally fix Jingle output video framerate. Example: 10/1 or 25/2."
 msgstr ""
 
-#: gajim/common/config.py:267
-msgid "If true, completion in groupchats will be like a shell auto-completion"
+#: gajim/common/config.py:271
+msgid "Optionally resize Jingle output video. Example: 320x240."
 msgstr ""
 
 #: gajim/common/config.py:272
-msgid "Optionally fix jingle output video framerate. Example: 10/1 or 25/2"
+msgid "If enabled, you will see your webcam's video stream as well."
 msgstr ""
 
-#: gajim/common/config.py:273
-msgid "Optionally resize jingle output video. Example: 320x240"
+#: gajim/common/config.py:275
+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:274
-msgid "If true, You will also see your webcam"
+#: gajim/common/config.py:276
+msgid "STUN server to use when using Jingle"
 msgstr ""
 
 #: gajim/common/config.py:277
 msgid ""
-"If true, Gajim will try to use a STUN server when using Jingle. The one in "
-"\"stun_server\" option, or the one given by the XMPP server."
+"If enabled, Gajim will show affiliation of group chat participants by adding "
+"a colored square to the status icon."
 msgstr ""
 
 #: gajim/common/config.py:278
-msgid "STUN server to use when using Jingle"
+msgid ""
+"Proxy used for all outgoing connections if the account does not have a "
+"specific proxy configured."
 msgstr ""
 
 #: gajim/common/config.py:279
-msgid ""
-"If true, Gajim will show affiliation of groupchat occupants by adding a "
-"colored square to the status icon"
+msgid "If enabled, Gajim will ignore incoming attention requests ('wizz')."
 msgstr ""
 
 #: gajim/common/config.py:280
 msgid ""
-"Proxy used for all outgoing connections if the account does not have a "
-"specific proxy configured"
+"If enabled, Gajim will reopen chat windows that were opened last time Gajim "
+"was closed."
 msgstr ""
 
 #: gajim/common/config.py:281
-msgid "If true, Gajim will ignore incoming attention requests (\"wizz\")."
+msgid ""
+"If enabled, Gajim will display an icon to show that sent messages have been "
+"received by your contact."
 msgstr ""
 
 #: gajim/common/config.py:282
-msgid ""
-"If enabled, Gajim will reopen chat windows that were opened last time Gajim "
-"was closed."
+msgid "Show a mini avatar in chat window tabs and as the window's icon."
 msgstr ""
 
 #: gajim/common/config.py:283
 msgid ""
-"If enabled, Gajim will show an icon to show that sent message has been "
-"received by your contact"
+"If enabled, Gajim will use the System's Keyring to store account passwords."
 msgstr ""
 
 #: gajim/common/config.py:284
-msgid "Show a mini avatar in chat window tabs and in window icon"
+msgid "If enabled, Gajim will execute XEP-0146 Commands."
 msgstr ""
 
 #: gajim/common/config.py:285
-msgid "If true, Gajim will use the Systems Keyring to store account passwords."
+msgid "2: System, 1: Enabled, 0: Disabled"
 msgstr ""
 
 #: gajim/common/config.py:286
-msgid "If true, Gajim will execute XEP-0146 Commands."
+msgid "Options in days which can be chosen in the sync threshold menu"
 msgstr ""
 
 #: gajim/common/config.py:287
-msgid "2: System, 1: Enabled, 0: Disabled"
+msgid ""
+"Maximum history in days we request from a public group chat archive. 0: As "
+"much as possible."
 msgstr ""
 
 #: gajim/common/config.py:288
-msgid "Options in days which can be chosen in the sync threshold menu"
+msgid ""
+"Maximum history in days we request from a private group chat archive. 0: As "
+"much as possible."
 msgstr ""
 
 #: gajim/common/config.py:289
 msgid ""
-"Maximum history in days we request from a public room archive. 0: As much as "
-"possible"
+"If enabled, Gajim shows the group chat subject in the chat window when "
+"joining."
 msgstr ""
 
 #: gajim/common/config.py:290
+#, fuzzy
 msgid ""
-"Maximum history in days we request from a private room archive. 0: As much "
-"as possible"
-msgstr ""
+"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:291
-msgid "If the room subject is shown in chat on join"
-msgstr ""
+#, 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:292
+#, fuzzy
 msgid ""
-"If the contact row is colored according to the current chatstate of the "
-"contact"
-msgstr ""
+"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:293
-msgid "If the tab is colored according to the current chatstate of the contact"
-msgstr ""
-
-#: gajim/common/config.py:294
-msgid ""
-"Shows a text in the banner that describes the current chatstate of the "
-"contact"
-msgstr ""
-
-#: gajim/common/config.py:295 gajim/common/config.py:424
 #, fuzzy
 msgid ""
 "Chat state notifications that are sent to contacts. Possible values: all, "
@@ -3773,309 +3770,334 @@ msgstr ""
 "Enviáronse as notificacións de estado. Pode ser all, composing_only o "
 "disabled."
 
-#: gajim/common/config.py:296 gajim/common/config.py:438
+#: gajim/common/config.py:294
 #, fuzzy
 msgid ""
 "Chat state notifications that are sent to the group chat. Possible values: "
-"all, composing_only, disabled"
+"'all', 'composing_only', 'disabled'"
 msgstr ""
 "Enviáronse as notificacións de estado. Pode ser all, composing_only o "
 "disabled."
 
-#: gajim/common/config.py:312
+#: gajim/common/config.py:297
+msgid "API Preferences. Possible values: 'http', 'iq'"
+msgstr ""
+
+#: gajim/common/config.py:313
+#, fuzzy
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
-"defined in autopriority_* options."
+"defined in 'autopriority_*' options."
 msgstr ""
 "A prioridade cambiará automaticamente segundo o seu estado. As prioridades "
 "están definidas nas opcións de autoprioridade_*"
 
-#: gajim/common/config.py:320
+#: gajim/common/config.py:321
 msgid ""
-"Status used to autoconnect as. Can be online, chat, away, xa, dnd, "
-"invisible. NOTE: this option is used only if restore_last_status is disabled"
+"Status to be used automatically when connecting. Can be 'online', 'chat', "
+"'away', 'xa', 'dnd' or 'invisible'. NOTE: This option is used only if "
+"'restore_last_status' is disabled."
 msgstr ""
 
-#: gajim/common/config.py:321
-msgid "If enabled, restore the last status that was used."
+#: gajim/common/config.py:322
+msgid "If enabled, the last status will be restored."
 msgstr ""
 
-#: gajim/common/config.py:322
+#: gajim/common/config.py:323
 msgid ""
-"If true, Contacts requesting authorization will be automatically accepted."
+"If enabled, Contacts requesting authorization will be accepted automatically."
 msgstr ""
 
-#: gajim/common/config.py:323
+#: gajim/common/config.py:324
 #, fuzzy
 msgid ""
-"If False, this account will be disabled and will not appear in roster window."
+"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:327
-msgid "Allow plaintext connections"
+#: gajim/common/config.py:328
+msgid "Allow plaintext connections."
 msgstr ""
 
-#: gajim/common/config.py:330
+#: gajim/common/config.py:331
 msgid ""
-"List (space separated) of authentication mechanisms to try. Can contain "
-"ANONYMOUS, EXTERNAL, GSSAPI, SCRAM-SHA-1-PLUS, SCRAM-SHA-1, DIGEST-MD5, "
-"PLAIN, X-MESSENGER-OAUTH2 or XEP-0078"
+"List of authentication mechanisms to try (space separated). Can contain "
+"'ANONYMOUS', 'EXTERNAL', 'GSSAPI', 'SCRAM-SHA-1-PLUS', 'SCRAM-SHA-1', "
+"'DIGEST-MD5', 'PLAIN', 'X-MESSENGER-OAUTH2' or 'XEP-0078'."
 msgstr ""
 
-#: gajim/common/config.py:331
+#: gajim/common/config.py:332
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection. "
-"Can be 'warn', 'connect', 'disconnect'"
+"Can be 'warn', 'connect' or 'disconnect'."
 msgstr ""
 
-#: gajim/common/config.py:332
+#: gajim/common/config.py:333
 msgid "Show a warning dialog before using standard SSL library."
 msgstr ""
 
-#: gajim/common/config.py:333
+#: gajim/common/config.py:334
 msgid ""
 "Show a warning dialog before sending PLAIN password over a plain connection."
 msgstr ""
 
-#: gajim/common/config.py:334
-msgid "Space separated list of ssl errors to ignore."
+#: gajim/common/config.py:335
+msgid "List of SSL errors to ignore (space separated)."
 msgstr ""
 
-#: gajim/common/config.py:340
+#: gajim/common/config.py:341
 msgid ""
-"Space separated list of JIDs for which you do not want to store logs. You "
-"can also add account name to log nothing for this account."
+"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:341
+#: gajim/common/config.py:342
 msgid ""
-"Space separated list of JIDs for which you accept to not log conversations "
-"if he does not want to."
+"List of XMPP Addresses (space separated) for which you accept to not store "
+"chat history if your contact does not want to."
 msgstr ""
 
-#: gajim/common/config.py:343
-msgid "Whitespace sent after inactivity"
+#: gajim/common/config.py:344
+msgid "If enabled, a whitespace is sent after inactivity (keep alive)."
 msgstr ""
 
-#: gajim/common/config.py:344
-msgid "XMPP ping sent after inactivity"
+#: gajim/common/config.py:345
+msgid "If enabled, an XMPP ping is sent after inactivity (ping alive)."
 msgstr ""
 
-#: gajim/common/config.py:348
+#: gajim/common/config.py:349
 msgid ""
-"How many seconds to wait for the answer of ping alive packet before trying "
-"to reconnect?"
+"How many seconds to wait for the answer of a ping alive packet before trying "
+"to reconnect."
 msgstr ""
 
-#: gajim/common/config.py:352
-msgid "Jabberd2 workaround"
+#: gajim/common/config.py:353
+#, fuzzy
+msgid "Jabberd2 workaround."
 msgstr "Corrección Jabberd2"
 
-#: gajim/common/config.py:355
+#: gajim/common/config.py:356
+#, fuzzy
 msgid ""
-"If checked, Gajim will use your IP and proxies defined in "
-"file_transfer_proxies option for file transfer."
+"If enabled, Gajim will use your IP and proxies defined in "
+"'file_transfer_proxies' option for file transfers."
 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:356
+#: gajim/common/config.py:357
 msgid ""
-"If true, Gajim will test file transfer proxies on startup to be sure it "
-"works. Openfire's proxies are known to fail this test even if they work."
+"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:369
-msgid "Answer to receipt requests"
+#: gajim/common/config.py:370
+msgid "If enabled, Gajim will answer to message receipt requests."
 msgstr ""
 
-#: gajim/common/config.py:370
-msgid "Sent receipt requests"
+#: gajim/common/config.py:371
+msgid "If enabled, Gajim will send message receipt requests."
 msgstr ""
 
-#: gajim/common/config.py:379
+#: gajim/common/config.py:380
 #, 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:380
+#: gajim/common/config.py:381
 #, fuzzy
 msgid "Allow Gajim to send your local time."
 msgstr "%s quere enviarlle un ficheiro."
 
-#: gajim/common/config.py:383
+#: gajim/common/config.py:384
 #, fuzzy
-msgid "Message that is sent to contacts you want to add"
+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:384
-msgid ""
-"If enabled, Gajim will send your local IPs so your contact can connect to "
-"your machine to transfer files."
-msgstr ""
-
 #: gajim/common/config.py:385
+#, fuzzy
 msgid ""
-"Space separated list of JIDs for which chat window will be re-opened on next "
-"startup."
+"If enabled, Gajim will send your local IP so your contact can connect to "
+"your machine for file transfers."
 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:387
-msgid "HTTP Upload: Enable HTTPS Verification"
+#: gajim/common/config.py:386
+msgid ""
+"List of XMPP Addresses (space separated) for which the chat window will be "
+"re-opened on next startup."
 msgstr ""
 
 #: gajim/common/config.py:388
-msgid ""
-"Preferred file transfer mechanism for file drag&drop on chat window. Can be "
-"'httpupload' (default) or 'jingle'"
+msgid "HTTP File Upload: Enable HTTPS Verification."
 msgstr ""
 
 #: gajim/common/config.py:389
-msgid "Allow cert verification with POSH"
+msgid ""
+"Preferred file transfer mechanism for file drag&drop on a chat window. Can "
+"be 'httpupload' (default) or 'jingle'."
 msgstr ""
 
-#: gajim/common/config.py:423 gajim/common/config.py:430
+#: gajim/common/config.py:390
 #, fuzzy
-msgid "Language for which misspelled words will be checked"
-msgstr "Lingua en que se comprobarán os erros ortográficos"
-
-#: gajim/common/config.py:427
-msgid "The currently active encryption for that contact"
-msgstr ""
+msgid "Allow certificate verification with POSH."
+msgstr "Engadir unha notificación especial para %s"
 
-#: gajim/common/config.py:431
+#: gajim/common/config.py:425
+#, fuzzy
 msgid ""
-"How many lines to request from server when entering a groupchat. -1 means no "
-"limit, -2 means global value"
+"Chat state notifications that are sent to contacts. Possible values: 'all', "
+"'composing_only', 'disabled'"
 msgstr ""
+"Enviáronse as notificacións de estado. Pode ser all, composing_only o "
+"disabled."
+
+#: gajim/common/config.py:428
+#, fuzzy
+msgid "The currently active encryption for that contact."
+msgstr "Está o OpenPGP activado para este contacto?"
 
 #: gajim/common/config.py:432
 msgid ""
-"Minutes of backlog to request when entering a groupchat. -1 means no limit, "
-"-2 means global value"
+"If enabled, a notification is created for every message in this group chat."
 msgstr ""
 
 #: gajim/common/config.py:433
-msgid "State whether a notification is created for every message in this room"
-msgstr ""
-
-#: gajim/common/config.py:434
+#, fuzzy
 msgid ""
-"Show a status message for all status (away, dnd, etc.) changes of users in a "
-"group chat"
-msgstr ""
+"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:435
+#: gajim/common/config.py:434
 #, fuzzy
-msgid "Show a status message for every join or leave in a group chat"
+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:435
+msgid ""
+"If enabled, the group chat is minimized into the contact list when joining "
+"automatically."
+msgstr ""
+
 #: gajim/common/config.py:436
-msgid "If the group chat is minimized into the roster on autojoin"
+msgid ""
+"If enabled, the group chat is minimized into the contact list when closing "
+"it."
 msgstr ""
 
 #: gajim/common/config.py:437
-msgid "If the group chat is minimized into the roster on close"
+#, fuzzy
+msgid ""
+"Chat state notifications that are sent to the group chat. Possible values: "
+"'all', 'composing_only' or 'disabled'."
 msgstr ""
+"Enviáronse as notificacións de estado. Pode ser all, composing_only o "
+"disabled."
 
-#: gajim/common/config.py:441
+#: gajim/common/config.py:440
 msgid ""
-"State whether plugins should be activated on startup (this is saved on Gajim "
-"exit). This option SHOULD NOT be used to (de)activate plug-ins. Use GUI "
-"instead."
+"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:446 gajim/common/const.py:281
+#: gajim/common/config.py:445 gajim/common/const.py:315
 msgid "Sleeping"
 msgstr "A durmir"
 
-#: gajim/common/config.py:447
+#: gajim/common/config.py:446
 msgid "Back soon"
 msgstr "Volvo axiña"
 
-#: gajim/common/config.py:447
+#: gajim/common/config.py:446
 msgid "Back in some minutes."
 msgstr "Volvo nuns minutos."
 
-#: gajim/common/config.py:448 gajim/common/const.py:247
+#: gajim/common/config.py:447 gajim/common/const.py:281
 msgid "Eating"
 msgstr "A comer"
 
-#: gajim/common/config.py:448
-msgid "I'm eating, so leave me a message."
-msgstr "Estou a comer, déixeme unha mensaxe."
+#: gajim/common/config.py:447
+#, fuzzy
+msgid "I'm eating."
+msgstr "Estou a traballar."
 
-#: gajim/common/config.py:449
+#: gajim/common/config.py:448
 msgid "Movie"
 msgstr "Filme"
 
-#: gajim/common/config.py:449
+#: gajim/common/config.py:448
 msgid "I'm watching a movie."
 msgstr "Estou a ver un filme."
 
-#: gajim/common/config.py:450 gajim/common/const.py:314
+#: gajim/common/config.py:449 gajim/common/const.py:348
 msgid "Working"
 msgstr "A traballar"
 
-#: gajim/common/config.py:450
+#: gajim/common/config.py:449
 msgid "I'm working."
 msgstr "Estou a traballar."
 
-#: gajim/common/config.py:451
+#: gajim/common/config.py:450
 msgid "Phone"
 msgstr "Teléfono"
 
-#: gajim/common/config.py:451
+#: gajim/common/config.py:450
 msgid "I'm on the phone."
 msgstr "Estou a falar por teléfono."
 
-#: gajim/common/config.py:452
+#: gajim/common/config.py:451
 msgid "Out"
 msgstr "Fóra"
 
-#: gajim/common/config.py:452
+#: gajim/common/config.py:451
 msgid "I'm out enjoying life."
 msgstr "Estou fóra a gozar da vida."
 
-#: gajim/common/config.py:463
+#: gajim/common/config.py:462
 msgid "I'm available."
 msgstr "Estou dispoñíbel."
 
-#: gajim/common/config.py:464
+#: gajim/common/config.py:463
 msgid "I'm free for chat."
 msgstr "Estou libre para falar."
 
-#: gajim/common/config.py:465 gajim/gtk/accounts.py:134
+#: gajim/common/config.py:464 gajim/gtk/accounts.py:133
 msgid "Be right back."
 msgstr "Volvo axiña"
 
-#: gajim/common/config.py:466
+#: gajim/common/config.py:465
 msgid "I'm not available."
 msgstr "Non estou dispoñíbel."
 
-#: gajim/common/config.py:467
+#: gajim/common/config.py:466
 msgid "Do not disturb."
 msgstr "Non molestar."
 
-#: gajim/common/config.py:468 gajim/common/config.py:469
+#: gajim/common/config.py:467 gajim/common/config.py:468
 msgid "Bye!"
 msgstr "Adeus!"
 
-#: gajim/common/config.py:480
+#: gajim/common/config.py:479
+#, fuzzy
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
-"muc_highlight_words, or when a group chat message contains your nickname."
+"'muc_highlight_words' your nickname is mentioned."
 msgstr ""
 "Son para reproducir cando unha mensaxe de grupo de charla contén unha das "
 "palabras de muc_highlight_words, ou cuando unha mensaxe dun grupo de charla "
 "contén o teu alcume."
 
-#: gajim/common/config.py:481
-msgid "Sound to play when any MUC message arrives."
+#: gajim/common/config.py:480
+#, fuzzy
+msgid "Sound to play when any group chat message arrives."
 msgstr "Son para reproducir cando chega calquera mensaxe MUC"
 
-#: gajim/common/config.py:485
+#: gajim/common/config.py:484
 #, fuzzy
 msgid "Tor"
 msgstr "A"
@@ -4085,946 +4107,1042 @@ msgstr "A"
 msgid "Error: cannot open %s for reading"
 msgstr "Erro: non se pode abrir %s para lectura"
 
-#: gajim/common/const.py:214
+#: gajim/common/const.py:216
+#, fuzzy
+msgid "?Group chat name:Team"
+msgstr "Ningún"
+
+#: gajim/common/const.py:217
+msgid "?Group chat description:Project discussion"
+msgstr ""
+
+#: gajim/common/const.py:218
+#, fuzzy
+msgid "?Group chat address:team"
+msgstr "Grupos de charla"
+
+#: gajim/common/const.py:219
+#, fuzzy
+msgid "?Group chat name:Family"
+msgstr "Remarcado da mensaxe de grupo de charla"
+
+#: gajim/common/const.py:220
+msgid "?Group chat description:Spring gathering"
+msgstr ""
+
+#: gajim/common/const.py:221
+msgid "?Group chat address:family"
+msgstr ""
+
+#: gajim/common/const.py:222
+#, fuzzy
+msgid "?Group chat name:Vacation"
+msgstr "Convite a grupo de charla"
+
+#: gajim/common/const.py:223
+msgid "?Group chat description:Trip planning"
+msgstr ""
+
+#: gajim/common/const.py:224
+#, fuzzy
+msgid "?Group chat address:vacation"
+msgstr "Convite a grupo de charla"
+
+#: gajim/common/const.py:225
+#, fuzzy
+msgid "?Group chat name:Repairs"
+msgstr "Grupos de charla"
+
+#: gajim/common/const.py:226
+msgid "?Group chat description:Local help group"
+msgstr ""
+
+#: gajim/common/const.py:227
+#, fuzzy
+msgid "?Group chat address:repairs"
+msgstr "Grupos de charla"
+
+#: gajim/common/const.py:228
+#, fuzzy
+msgid "?Group chat name:News"
+msgstr "Ningún"
+
+#: gajim/common/const.py:229
+#, fuzzy
+msgid "?Group chat description:Local news and reports"
+msgstr "A creación de grupos de charla está restrinxida."
+
+#: gajim/common/const.py:230
+#, fuzzy
+msgid "?Group chat address:news"
+msgstr "Novo grupo de charla"
+
+#: gajim/common/const.py:235
+#, fuzzy
+msgid "Remote server not found"
+msgstr "O servizo non se achou"
+
+#: gajim/common/const.py:236
+msgid "Remote server timeout"
+msgstr ""
+
+#: gajim/common/const.py:237 gajim/common/const.py:238
+#: gajim/common/const.py:239
+#, fuzzy
+msgid "Address does not belong to a group chat server"
+msgstr "Isto non é un grupo de charla"
+
+#: gajim/common/const.py:240
+#, fuzzy
+msgid "Group chat already exists"
+msgstr "A conta local xa existe."
+
+#: gajim/common/const.py:241
+#, fuzzy
+msgid "Group chat does not exist"
+msgstr "Non existe o grupo de charla."
+
+#: gajim/common/const.py:247
 msgid "This message was encrypted with OTR and could not be decrypted."
 msgstr ""
 
-#: gajim/common/const.py:217
+#: gajim/common/const.py:250
 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:221
+#: gajim/common/const.py:254
 msgid ""
-"This message was encrypted with OpenPGP for XMPP and could not be decrypted."
+"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:224
+#: gajim/common/const.py:258
 #, python-format
 msgid "This message was encrypted with %s and could not be decrypted."
 msgstr ""
 
-#: gajim/common/const.py:231
+#: gajim/common/const.py:265
 #, fuzzy
 msgid "Doing Chores"
 msgstr "Host errado"
 
-#: gajim/common/const.py:232
+#: gajim/common/const.py:266
 msgid "Buying Groceries"
 msgstr ""
 
-#: gajim/common/const.py:233
+#: gajim/common/const.py:267
 #, fuzzy
 msgid "Cleaning"
 msgstr "Serán"
 
-#: gajim/common/const.py:234
+#: gajim/common/const.py:268
 #, fuzzy
 msgid "Cooking"
 msgstr "A compor"
 
-#: gajim/common/const.py:235
+#: gajim/common/const.py:269
 msgid "Doing Maintenance"
 msgstr ""
 
-#: gajim/common/const.py:236
+#: gajim/common/const.py:270
 msgid "Doing the Dishes"
 msgstr ""
 
-#: gajim/common/const.py:237
+#: gajim/common/const.py:271
 msgid "Doing the Laundry"
 msgstr ""
 
-#: gajim/common/const.py:238
+#: gajim/common/const.py:272
 #, fuzzy
 msgid "Gardening"
 msgstr "Mañá"
 
-#: gajim/common/const.py:239
+#: gajim/common/const.py:273
 msgid "Running an Errand"
 msgstr ""
 
-#: gajim/common/const.py:240
+#: gajim/common/const.py:274
 #, fuzzy
 msgid "Walking the Dog"
 msgstr "todos no grupo"
 
-#: gajim/common/const.py:242
+#: gajim/common/const.py:276
 #, fuzzy
 msgid "Drinking"
 msgstr "A traballar"
 
-#: gajim/common/const.py:243
+#: gajim/common/const.py:277
 msgid "Having a Beer"
 msgstr ""
 
-#: gajim/common/const.py:244
+#: gajim/common/const.py:278
 msgid "Having Coffee"
 msgstr ""
 
-#: gajim/common/const.py:245
+#: gajim/common/const.py:279
 msgid "Having Tea"
 msgstr ""
 
-#: gajim/common/const.py:248
+#: gajim/common/const.py:282
 msgid "Having a Snack"
 msgstr ""
 
-#: gajim/common/const.py:249
+#: gajim/common/const.py:283
 msgid "Having Breakfast"
 msgstr ""
 
-#: gajim/common/const.py:250
+#: gajim/common/const.py:284
 msgid "Having Dinner"
 msgstr ""
 
-#: gajim/common/const.py:251
+#: gajim/common/const.py:285
 msgid "Having Lunch"
 msgstr ""
 
-#: gajim/common/const.py:253
+#: gajim/common/const.py:287
 msgid "Exercising"
 msgstr ""
 
-#: gajim/common/const.py:254 gajim/common/const.py:305
+#: gajim/common/const.py:288 gajim/common/const.py:339
 msgid "Cycling"
 msgstr ""
 
-#: gajim/common/const.py:255
+#: gajim/common/const.py:289
 #, fuzzy
 msgid "Dancing"
 msgstr "Serán"
 
-#: gajim/common/const.py:256
+#: gajim/common/const.py:290
 #, fuzzy
 msgid "Hiking"
 msgstr "A expulsar %s"
 
-#: gajim/common/const.py:257
+#: gajim/common/const.py:291
 #, fuzzy
 msgid "Jogging"
 msgstr "_Entrar"
 
-#: gajim/common/const.py:258
+#: gajim/common/const.py:292
 msgid "Playing Sports"
 msgstr ""
 
-#: gajim/common/const.py:259
+#: gajim/common/const.py:293
 msgid "Running"
 msgstr ""
 
-#: gajim/common/const.py:260
+#: gajim/common/const.py:294
 #, fuzzy
 msgid "Skiing"
 msgstr "A traballar"
 
-#: gajim/common/const.py:261
+#: gajim/common/const.py:295
 msgid "Swimming"
 msgstr ""
 
-#: gajim/common/const.py:262
+#: gajim/common/const.py:296
 #, fuzzy
 msgid "Working out"
 msgstr "A traballar"
 
-#: gajim/common/const.py:264
+#: gajim/common/const.py:298
 msgid "Grooming"
 msgstr ""
 
-#: gajim/common/const.py:265
+#: gajim/common/const.py:299
 msgid "At the Spa"
 msgstr ""
 
-#: gajim/common/const.py:266
+#: gajim/common/const.py:300
 msgid "Brushing Teeth"
 msgstr ""
 
-#: gajim/common/const.py:267
+#: gajim/common/const.py:301
 msgid "Getting a Haircut"
 msgstr ""
 
-#: gajim/common/const.py:268
+#: gajim/common/const.py:302
 #, fuzzy
 msgid "Shaving"
 msgstr "A comer"
 
-#: gajim/common/const.py:269
+#: gajim/common/const.py:303
 msgid "Taking a Bath"
 msgstr ""
 
-#: gajim/common/const.py:270
+#: gajim/common/const.py:304
 msgid "Taking a Shower"
 msgstr ""
 
-#: gajim/common/const.py:272
+#: gajim/common/const.py:306
 msgid "Having an Appointment"
 msgstr ""
 
-#: gajim/common/const.py:274
+#: gajim/common/const.py:308
 msgid "Inactive"
 msgstr "Inactivo"
 
-#: gajim/common/const.py:275
+#: gajim/common/const.py:309
 msgid "Day Off"
 msgstr ""
 
-#: gajim/common/const.py:276
+#: gajim/common/const.py:310
 #, fuzzy
 msgid "Hanging out"
 msgstr "Cambiando o asunto"
 
-#: gajim/common/const.py:277
+#: gajim/common/const.py:311
 #, fuzzy
 msgid "Hiding"
 msgstr "A expulsar %s"
 
-#: gajim/common/const.py:278
+#: gajim/common/const.py:312
 msgid "On Vacation"
 msgstr ""
 
-#: gajim/common/const.py:279
+#: gajim/common/const.py:313
 #, fuzzy
 msgid "Praying"
 msgstr "A comer"
 
-#: gajim/common/const.py:280
+#: gajim/common/const.py:314
 msgid "Scheduled Holiday"
 msgstr ""
 
-#: gajim/common/const.py:282
+#: gajim/common/const.py:316
 #, fuzzy
 msgid "Thinking"
 msgstr "A traballar"
 
-#: gajim/common/const.py:284
+#: gajim/common/const.py:318
 msgid "Relaxing"
 msgstr ""
 
-#: gajim/common/const.py:285
+#: gajim/common/const.py:319
 #, fuzzy
 msgid "Fishing"
 msgstr "A expulsar %s"
 
-#: gajim/common/const.py:286
+#: gajim/common/const.py:320
 #, fuzzy
 msgid "Gaming"
 msgstr "A comer"
 
-#: gajim/common/const.py:287
+#: gajim/common/const.py:321
 #, fuzzy
 msgid "Going out"
 msgstr "_Desconectar"
 
-#: gajim/common/const.py:288
+#: gajim/common/const.py:322
 #, fuzzy
 msgid "Partying"
 msgstr "A comer"
 
-#: gajim/common/const.py:289
+#: gajim/common/const.py:323
 #, fuzzy
 msgid "Reading"
 msgstr "Motivo"
 
-#: gajim/common/const.py:290
+#: gajim/common/const.py:324
 #, fuzzy
 msgid "Rehearsing"
 msgstr "Motivo"
 
-#: gajim/common/const.py:291
+#: gajim/common/const.py:325
 #, fuzzy
 msgid "Shopping"
 msgstr "A durmir"
 
-#: gajim/common/const.py:292
+#: gajim/common/const.py:326
 #, fuzzy
 msgid "Smoking"
 msgstr "A traballar"
 
-#: gajim/common/const.py:293
+#: gajim/common/const.py:327
 msgid "Socializing"
 msgstr ""
 
-#: gajim/common/const.py:294
+#: gajim/common/const.py:328
 #, fuzzy
 msgid "Sunbathing"
 msgstr "A comer"
 
-#: gajim/common/const.py:295
+#: gajim/common/const.py:329
 msgid "Watching TV"
 msgstr ""
 
-#: gajim/common/const.py:296
+#: gajim/common/const.py:330
 #, fuzzy
 msgid "Watching a Movie"
 msgstr "Estou a ver un filme."
 
-#: gajim/common/const.py:298
+#: gajim/common/const.py:332
 #, fuzzy
 msgid "Talking"
 msgstr "A comer"
 
-#: gajim/common/const.py:299
+#: gajim/common/const.py:333
 msgid "In Real Life"
 msgstr ""
 
-#: gajim/common/const.py:300
+#: gajim/common/const.py:334
 #, fuzzy
 msgid "On the Phone"
 msgstr "Estou a falar por teléfono."
 
-#: gajim/common/const.py:301
+#: gajim/common/const.py:335
 msgid "On Video Phone"
 msgstr ""
 
-#: gajim/common/const.py:303
+#: gajim/common/const.py:337
 #, fuzzy
 msgid "Traveling"
 msgstr "A transferir"
 
-#: gajim/common/const.py:304
+#: gajim/common/const.py:338
 #, fuzzy
 msgid "Commuting"
 msgstr "A compor"
 
-#: gajim/common/const.py:306
+#: gajim/common/const.py:340
 msgid "Driving"
 msgstr ""
 
-#: gajim/common/const.py:307
+#: gajim/common/const.py:341
 msgid "In a Car"
 msgstr ""
 
-#: gajim/common/const.py:308
+#: gajim/common/const.py:342
 msgid "On a Bus"
 msgstr ""
 
-#: gajim/common/const.py:309
+#: gajim/common/const.py:343
 msgid "On a Plane"
 msgstr ""
 
-#: gajim/common/const.py:310
+#: gajim/common/const.py:344
 #, fuzzy
 msgid "On a Train"
 msgstr "_Abrir como ligazón"
 
-#: gajim/common/const.py:311
+#: gajim/common/const.py:345
 msgid "On a Trip"
 msgstr ""
 
-#: gajim/common/const.py:312
+#: gajim/common/const.py:346
 #, fuzzy
 msgid "Walking"
 msgstr "A traballar"
 
-#: gajim/common/const.py:315
+#: gajim/common/const.py:349
 #, fuzzy
 msgid "Coding"
 msgstr "A compor"
 
-#: gajim/common/const.py:316
+#: gajim/common/const.py:350
 msgid "In a Meeting"
 msgstr ""
 
-#: gajim/common/const.py:317
+#: gajim/common/const.py:351
 msgid "Studying"
 msgstr ""
 
-#: gajim/common/const.py:318
+#: gajim/common/const.py:352
 #, fuzzy
 msgid "Writing"
 msgstr "A traballar"
 
-#: gajim/common/const.py:321
+#: gajim/common/const.py:355
 msgid "Afraid"
 msgstr ""
 
-#: gajim/common/const.py:322
+#: gajim/common/const.py:356
 msgid "Amazed"
 msgstr ""
 
-#: gajim/common/const.py:323
+#: gajim/common/const.py:357
 msgid "Amorous"
 msgstr ""
 
-#: gajim/common/const.py:324
+#: gajim/common/const.py:358
 msgid "Angry"
 msgstr ""
 
-#: gajim/common/const.py:325
+#: gajim/common/const.py:359
 msgid "Annoyed"
 msgstr ""
 
-#: gajim/common/const.py:326
+#: gajim/common/const.py:360
 msgid "Anxious"
 msgstr ""
 
-#: gajim/common/const.py:327
+#: gajim/common/const.py:361
 #, fuzzy
 msgid "Aroused"
 msgstr "Pausado"
 
-#: gajim/common/const.py:328
+#: gajim/common/const.py:362
 msgid "Ashamed"
 msgstr ""
 
-#: gajim/common/const.py:329
+#: gajim/common/const.py:363
 #, fuzzy
 msgid "Bored"
 msgstr "Negra"
 
-#: gajim/common/const.py:330
+#: gajim/common/const.py:364
 #, fuzzy
 msgid "Brave"
 msgstr "Ten "
 
-#: gajim/common/const.py:331
+#: gajim/common/const.py:365
 msgid "Calm"
 msgstr ""
 
-#: gajim/common/const.py:332
+#: gajim/common/const.py:366
 #, fuzzy
 msgid "Cautious"
 msgstr "Charlas"
 
-#: gajim/common/const.py:333
+#: gajim/common/const.py:367
 #, fuzzy
 msgid "Cold"
 msgstr "Negra"
 
-#: gajim/common/const.py:334
+#: gajim/common/const.py:368
 #, fuzzy
 msgid "Confident"
 msgstr "_Contidos"
 
-#: gajim/common/const.py:335
+#: gajim/common/const.py:369
 msgid "Confused"
 msgstr ""
 
-#: gajim/common/const.py:336
+#: gajim/common/const.py:370
 #, fuzzy
 msgid "Contemplative"
 msgstr "Completado"
 
-#: gajim/common/const.py:337
+#: gajim/common/const.py:371
 #, fuzzy
 msgid "Contented"
 msgstr "_Contidos"
 
-#: gajim/common/const.py:338
+#: gajim/common/const.py:372
 msgid "Cranky"
 msgstr ""
 
-#: gajim/common/const.py:339
+#: gajim/common/const.py:373
 msgid "Crazy"
 msgstr ""
 
-#: gajim/common/const.py:340
+#: gajim/common/const.py:374
 #, fuzzy
 msgid "Creative"
 msgstr "Inactivo"
 
-#: gajim/common/const.py:341
+#: gajim/common/const.py:375
 msgid "Curious"
 msgstr ""
 
-#: gajim/common/const.py:342
+#: gajim/common/const.py:376
 #, fuzzy
 msgid "Dejected"
 msgstr "Eliminar"
 
-#: gajim/common/const.py:343
+#: gajim/common/const.py:377
 msgid "Depressed"
 msgstr ""
 
-#: gajim/common/const.py:344
+#: gajim/common/const.py:378
 #, fuzzy
 msgid "Disappointed"
 msgstr "Desactivado"
 
-#: gajim/common/const.py:345
+#: gajim/common/const.py:379
 msgid "Disgusted"
 msgstr ""
 
-#: gajim/common/const.py:346
+#: gajim/common/const.py:380
 #, fuzzy
 msgid "Dismayed"
 msgstr "Desactivado"
 
-#: gajim/common/const.py:347
+#: gajim/common/const.py:381
 #, fuzzy
 msgid "Distracted"
 msgstr "Desactivado"
 
-#: gajim/common/const.py:348
+#: gajim/common/const.py:382
 msgid "Embarrassed"
 msgstr ""
 
-#: gajim/common/const.py:349
+#: gajim/common/const.py:383
 msgid "Envious"
 msgstr ""
 
-#: gajim/common/const.py:350
+#: gajim/common/const.py:384
 msgid "Excited"
 msgstr ""
 
-#: gajim/common/const.py:351
+#: gajim/common/const.py:385
 msgid "Flirtatious"
 msgstr ""
 
-#: gajim/common/const.py:352
+#: gajim/common/const.py:386
 msgid "Frustrated"
 msgstr ""
 
-#: gajim/common/const.py:353
+#: gajim/common/const.py:387
 msgid "Grateful"
 msgstr ""
 
-#: gajim/common/const.py:354
+#: gajim/common/const.py:388
 msgid "Grieving"
 msgstr ""
 
-#: gajim/common/const.py:355
+#: gajim/common/const.py:389
 #, fuzzy
 msgid "Grumpy"
 msgstr "Grupo"
 
-#: gajim/common/const.py:356
+#: gajim/common/const.py:390
 msgid "Guilty"
 msgstr ""
 
-#: gajim/common/const.py:357
+#: gajim/common/const.py:391
 msgid "Happy"
 msgstr ""
 
-#: gajim/common/const.py:358
+#: gajim/common/const.py:392
 msgid "Hopeful"
 msgstr ""
 
-#: gajim/common/const.py:359
+#: gajim/common/const.py:393
 msgid "Hot"
 msgstr ""
 
-#: gajim/common/const.py:360
+#: gajim/common/const.py:394
 msgid "Humbled"
 msgstr ""
 
-#: gajim/common/const.py:361
+#: gajim/common/const.py:395
 msgid "Humiliated"
 msgstr ""
 
-#: gajim/common/const.py:362
+#: gajim/common/const.py:396
 msgid "Hungry"
 msgstr ""
 
-#: gajim/common/const.py:363
+#: gajim/common/const.py:397
 msgid "Hurt"
 msgstr ""
 
-#: gajim/common/const.py:364
+#: gajim/common/const.py:398
 #, fuzzy
 msgid "Impressed"
 msgstr "mensaxe"
 
-#: gajim/common/const.py:365
+#: gajim/common/const.py:399
 msgid "In Awe"
 msgstr ""
 
-#: gajim/common/const.py:366
+#: gajim/common/const.py:400
 msgid "In Love"
 msgstr ""
 
-#: gajim/common/const.py:367
+#: gajim/common/const.py:401
 msgid "Indignant"
 msgstr ""
 
-#: gajim/common/const.py:368
+#: gajim/common/const.py:402
 msgid "Interested"
 msgstr ""
 
-#: gajim/common/const.py:369
+#: gajim/common/const.py:403
 msgid "Intoxicated"
 msgstr ""
 
-#: gajim/common/const.py:370
+#: gajim/common/const.py:404
 #, fuzzy
 msgid "Invincible"
 msgstr "Invisíbel"
 
-#: gajim/common/const.py:371
+#: gajim/common/const.py:405
 msgid "Jealous"
 msgstr ""
 
-#: gajim/common/const.py:372
+#: gajim/common/const.py:406
 #, fuzzy
 msgid "Lonely"
 msgstr "unha"
 
-#: gajim/common/const.py:373
+#: gajim/common/const.py:407
 msgid "Lost"
 msgstr ""
 
-#: gajim/common/const.py:374
+#: gajim/common/const.py:408
 msgid "Lucky"
 msgstr ""
 
-#: gajim/common/const.py:375
+#: gajim/common/const.py:409
 #, fuzzy
 msgid "Mean"
 msgstr "Alemán"
 
-#: gajim/common/const.py:376
+#: gajim/common/const.py:410
 #, fuzzy
 msgid "Moody"
 msgstr "_Modificar"
 
-#: gajim/common/const.py:377
+#: gajim/common/const.py:411
 msgid "Nervous"
 msgstr ""
 
-#: gajim/common/const.py:378
+#: gajim/common/const.py:412
 msgid "Neutral"
 msgstr ""
 
-#: gajim/common/const.py:379
+#: gajim/common/const.py:413
 #, fuzzy
 msgid "Offended"
 msgstr "Desconectado"
 
-#: gajim/common/const.py:380
+#: gajim/common/const.py:414
 msgid "Outraged"
 msgstr ""
 
-#: gajim/common/const.py:381
+#: gajim/common/const.py:415
 msgid "Playful"
 msgstr ""
 
-#: gajim/common/const.py:382
+#: gajim/common/const.py:416
 #, fuzzy
 msgid "Proud"
 msgstr "Grupo"
 
-#: gajim/common/const.py:383
+#: gajim/common/const.py:417
 msgid "Relaxed"
 msgstr ""
 
-#: gajim/common/const.py:384
+#: gajim/common/const.py:418
 #, fuzzy
 msgid "Relieved"
 msgstr "once"
 
-#: gajim/common/const.py:385
+#: gajim/common/const.py:419
 msgid "Remorseful"
 msgstr ""
 
-#: gajim/common/const.py:386
+#: gajim/common/const.py:420
 msgid "Restless"
 msgstr ""
 
-#: gajim/common/const.py:387
+#: gajim/common/const.py:421
 #, fuzzy
 msgid "Sad"
 msgstr "Atascado"
 
-#: gajim/common/const.py:388
+#: gajim/common/const.py:422
 msgid "Sarcastic"
 msgstr ""
 
-#: gajim/common/const.py:389
+#: gajim/common/const.py:423
 #, fuzzy
 msgid "Satisfied"
 msgstr "Última modificación:"
 
-#: gajim/common/const.py:390
+#: gajim/common/const.py:424
 msgid "Serious"
 msgstr ""
 
-#: gajim/common/const.py:391
+#: gajim/common/const.py:425
 msgid "Shocked"
 msgstr ""
 
-#: gajim/common/const.py:392
+#: gajim/common/const.py:426
 msgid "Shy"
 msgstr ""
 
-#: gajim/common/const.py:393
+#: gajim/common/const.py:427
 #, fuzzy
 msgid "Sick"
 msgstr "Alcume"
 
-#: gajim/common/const.py:394
+#: gajim/common/const.py:428
 #, fuzzy
 msgid "Sleepy"
 msgstr "A durmir"
 
-#: gajim/common/const.py:395
+#: gajim/common/const.py:429
 msgid "Spontaneous"
 msgstr ""
 
-#: gajim/common/const.py:396
+#: gajim/common/const.py:430
 #, fuzzy
 msgid "Stressed"
 msgstr "Rúa:"
 
-#: gajim/common/const.py:397
+#: gajim/common/const.py:431
 msgid "Strong"
 msgstr ""
 
-#: gajim/common/const.py:398
+#: gajim/common/const.py:432
 #, fuzzy
 msgid "Surprised"
 msgstr "Engadiuse"
 
-#: gajim/common/const.py:399
+#: gajim/common/const.py:433
 msgid "Thankful"
 msgstr ""
 
-#: gajim/common/const.py:400
+#: gajim/common/const.py:434
 msgid "Thirsty"
 msgstr ""
 
-#: gajim/common/const.py:401
+#: gajim/common/const.py:435
 #, fuzzy
 msgid "Tired"
 msgstr "Hora"
 
-#: gajim/common/const.py:402
+#: gajim/common/const.py:436
 #, fuzzy
 msgid "Undefined"
 msgstr "nove"
 
-#: gajim/common/const.py:403
+#: gajim/common/const.py:437
 msgid "Weak"
 msgstr ""
 
-#: gajim/common/const.py:404
+#: gajim/common/const.py:438
 msgid "Worried"
 msgstr ""
 
-#: gajim/common/const.py:408
+#: gajim/common/const.py:442
 msgid "accuracy"
 msgstr ""
 
-#: gajim/common/const.py:409
+#: gajim/common/const.py:443
 #, fuzzy
 msgid "alt"
 msgstr "Por defecto"
 
-#: gajim/common/const.py:410
+#: gajim/common/const.py:444
 msgid "area"
 msgstr ""
 
-#: gajim/common/const.py:411
+#: gajim/common/const.py:445
 #, fuzzy
 msgid "bearing"
 msgstr "mariño"
 
-#: gajim/common/const.py:412
+#: gajim/common/const.py:446
 #, fuzzy
 msgid "building"
 msgstr "A expulsar %s"
 
-#: gajim/common/const.py:413
+#: gajim/common/const.py:447
 #, fuzzy
 msgid "country"
 msgstr "País:"
 
-#: gajim/common/const.py:414
+#: gajim/common/const.py:448
 #, fuzzy
 msgid "countrycode"
 msgstr "Conta"
 
-#: gajim/common/const.py:415
+#: gajim/common/const.py:449
 msgid "datum"
 msgstr ""
 
-#: gajim/common/const.py:416
+#: gajim/common/const.py:450
 #, fuzzy
 msgid "description"
 msgstr "Descrición"
 
-#: gajim/common/const.py:417
+#: gajim/common/const.py:451
 #, fuzzy
 msgid "error"
 msgstr "Erro de Avahi"
 
-#: gajim/common/const.py:418
+#: gajim/common/const.py:452
 msgid "floor"
 msgstr ""
 
-#: gajim/common/const.py:419
+#: gajim/common/const.py:453
 msgid "lat"
 msgstr ""
 
-#: gajim/common/const.py:420
+#: gajim/common/const.py:454
 msgid "locality"
 msgstr ""
 
-#: gajim/common/const.py:421
+#: gajim/common/const.py:455
 #, fuzzy
 msgid "lon"
 msgstr "unha"
 
-#: gajim/common/const.py:422
+#: gajim/common/const.py:456
 msgid "postalcode"
 msgstr ""
 
-#: gajim/common/const.py:423
+#: gajim/common/const.py:457
 msgid "region"
 msgstr ""
 
-#: gajim/common/const.py:424
+#: gajim/common/const.py:458
 #, fuzzy
 msgid "room"
 msgstr "De"
 
-#: gajim/common/const.py:425
+#: gajim/common/const.py:459
 msgid "speed"
 msgstr ""
 
-#: gajim/common/const.py:426
+#: gajim/common/const.py:460
 msgid "street"
 msgstr ""
 
-#: gajim/common/const.py:427
+#: gajim/common/const.py:461
 msgid "text"
 msgstr ""
 
-#: gajim/common/const.py:428
+#: gajim/common/const.py:462
 msgid "timestamp"
 msgstr ""
 
-#: gajim/common/const.py:429
+#: gajim/common/const.py:463
 msgid "URI"
 msgstr ""
 
-#: gajim/common/const.py:434
+#: gajim/common/const.py:468
 msgid "Unable to get issuer certificate"
 msgstr ""
 
-#: gajim/common/const.py:435
+#: gajim/common/const.py:469
 msgid "Unable to get certificate CRL"
 msgstr ""
 
-#: gajim/common/const.py:436
+#: gajim/common/const.py:470
 msgid "Unable to decrypt certificate's signature"
 msgstr ""
 
-#: gajim/common/const.py:437
+#: gajim/common/const.py:471
 msgid "Unable to decrypt CRL's signature"
 msgstr ""
 
-#: gajim/common/const.py:438
+#: gajim/common/const.py:472
 #, fuzzy
 msgid "Unable to decode issuer public key"
 msgstr "Non se pode cargar o módulo inactivo"
 
-#: gajim/common/const.py:439
+#: gajim/common/const.py:473
 msgid "Certificate signature failure"
 msgstr ""
 
-#: gajim/common/const.py:440
+#: gajim/common/const.py:474
 msgid "CRL signature failure"
 msgstr ""
 
-#: gajim/common/const.py:441
+#: gajim/common/const.py:475
 msgid "Certificate is not yet valid"
 msgstr ""
 
-#: gajim/common/const.py:442
+#: gajim/common/const.py:476
 msgid "Certificate has expired"
 msgstr ""
 
-#: gajim/common/const.py:443
+#: gajim/common/const.py:477
 msgid "CRL is not yet valid"
 msgstr ""
 
-#: gajim/common/const.py:444
+#: gajim/common/const.py:478
 msgid "CRL has expired"
 msgstr ""
 
-#: gajim/common/const.py:445
+#: gajim/common/const.py:479
 msgid "Format error in certificate's notBefore field"
 msgstr ""
 
-#: gajim/common/const.py:446
+#: gajim/common/const.py:480
 msgid "Format error in certificate's notAfter field"
 msgstr ""
 
-#: gajim/common/const.py:447
+#: gajim/common/const.py:481
 msgid "Format error in CRL's lastUpdate field"
 msgstr ""
 
-#: gajim/common/const.py:448
+#: gajim/common/const.py:482
 msgid "Format error in CRL's nextUpdate field"
 msgstr ""
 
-#: gajim/common/const.py:449
+#: gajim/common/const.py:483
 msgid "Out of memory"
 msgstr ""
 
-#: gajim/common/const.py:450
+#: gajim/common/const.py:484
 msgid "Self signed certificate"
 msgstr ""
 
-#: gajim/common/const.py:451
+#: gajim/common/const.py:485
 msgid "Self signed certificate in certificate chain"
 msgstr ""
 
-#: gajim/common/const.py:452
+#: gajim/common/const.py:486
 msgid "Unable to get local issuer certificate"
 msgstr ""
 
-#: gajim/common/const.py:453
+#: gajim/common/const.py:487
 msgid "Unable to verify the first certificate"
 msgstr ""
 
-#: gajim/common/const.py:454
+#: gajim/common/const.py:488
 msgid "Certificate chain too long"
 msgstr ""
 
-#: gajim/common/const.py:455
+#: gajim/common/const.py:489
 msgid "Certificate revoked"
 msgstr ""
 
-#: gajim/common/const.py:456
+#: gajim/common/const.py:490
 #, fuzzy
 msgid "Invalid CA certificate"
 msgstr "O nome de usuario non é válido"
 
-#: gajim/common/const.py:457
+#: gajim/common/const.py:491
 msgid "Path length constraint exceeded"
 msgstr ""
 
-#: gajim/common/const.py:458
+#: gajim/common/const.py:492
 msgid "Unsupported certificate purpose"
 msgstr ""
 
-#: gajim/common/const.py:459
+#: gajim/common/const.py:493
 msgid "Certificate not trusted"
 msgstr ""
 
-#: gajim/common/const.py:460
+#: gajim/common/const.py:494
 msgid "Certificate rejected"
 msgstr ""
 
-#: gajim/common/const.py:461
+#: gajim/common/const.py:495
 msgid "Subject issuer mismatch"
 msgstr ""
 
-#: gajim/common/const.py:462
+#: gajim/common/const.py:496
 msgid "Authority and subject key identifier mismatch"
 msgstr ""
 
-#: gajim/common/const.py:463
+#: gajim/common/const.py:497
 msgid "Authority and issuer serial number mismatch"
 msgstr ""
 
-#: gajim/common/const.py:464
+#: gajim/common/const.py:498
 msgid "Key usage does not include certificate signing"
 msgstr ""
 
-#: gajim/common/const.py:465
+#: gajim/common/const.py:499
 msgid "Application verification failure"
 msgstr ""
 
@@ -5192,261 +5310,261 @@ msgstr ""
 msgid "video output"
 msgstr ""
 
-#: gajim/common/helpers.py:210
+#: gajim/common/helpers.py:216
 msgid "Server must be between 1 and 1023 bytes"
 msgstr ""
 
-#: gajim/common/helpers.py:214
+#: gajim/common/helpers.py:220
 msgid "Invalid character in hostname."
 msgstr "Carácter non válido no nome do host."
 
-#: gajim/common/helpers.py:216
+#: gajim/common/helpers.py:222
 msgid "Server address required."
 msgstr "É necesario o enderezo do servidor."
 
-#: gajim/common/helpers.py:220
+#: gajim/common/helpers.py:226
 msgid "Username must be between 1 and 1023 bytes"
 msgstr ""
 
-#: gajim/common/helpers.py:224
+#: gajim/common/helpers.py:230
 msgid "Invalid character in username."
 msgstr "Hai un caracter non válido no nome de usuario."
 
-#: gajim/common/helpers.py:230
+#: gajim/common/helpers.py:236
 msgid "Resource must be between 1 and 1023 bytes"
 msgstr ""
 
-#: gajim/common/helpers.py:234
+#: gajim/common/helpers.py:240
 msgid "Invalid character in resource."
 msgstr "Carácter non válido no recurso."
 
-#: gajim/common/helpers.py:275
+#: gajim/common/helpers.py:281
 msgid "_Busy"
 msgstr "_Ocupado"
 
-#: gajim/common/helpers.py:277 gajim/gtk/tooltips.py:647
+#: gajim/common/helpers.py:283 gajim/gtk/tooltips.py:647
 msgid "Busy"
 msgstr "Ocupado"
 
-#: gajim/common/helpers.py:280
+#: gajim/common/helpers.py:286
 msgid "_Not Available"
 msgstr "_Non dispoñíbel"
 
-#: gajim/common/helpers.py:282 gajim/gtk/tooltips.py:649
+#: gajim/common/helpers.py:288 gajim/gtk/tooltips.py:649
 msgid "Not Available"
 msgstr "Non dispoñíbel"
 
-#: gajim/common/helpers.py:285
+#: gajim/common/helpers.py:291
 msgid "_Free for Chat"
 msgstr "_Libre para falar"
 
-#: gajim/common/helpers.py:287 gajim/gtk/tooltips.py:643
+#: gajim/common/helpers.py:293 gajim/gtk/tooltips.py:643
 msgid "Free for Chat"
 msgstr "Libre para falar"
 
-#: gajim/common/helpers.py:290
+#: gajim/common/helpers.py:296
 #, fuzzy
 msgid "?user status:_Available"
 msgstr "Pausada"
 
-#: gajim/common/helpers.py:292 gajim/gtk/tooltips.py:641
+#: gajim/common/helpers.py:298 gajim/gtk/tooltips.py:641
 #, fuzzy
 msgid "?user status:Available"
 msgstr "Pausada"
 
-#: gajim/common/helpers.py:294
+#: gajim/common/helpers.py:300
 msgid "Connecting"
 msgstr "Conectando"
 
-#: gajim/common/helpers.py:297 gajim/data/gui/preferences_window.ui:1251
+#: gajim/common/helpers.py:303 gajim/data/gui/preferences_window.ui:1251
 msgid "A_way"
 msgstr "A_usente"
 
-#: gajim/common/helpers.py:299 gajim/common/modules/adhoc_commands.py:120
-#: gajim/command_system/implementation/standard.py:139
+#: gajim/common/helpers.py:305 gajim/common/modules/adhoc_commands.py:120
+#: gajim/command_system/implementation/standard.py:141
 #: gajim/gtk/tooltips.py:645
 msgid "Away"
 msgstr "Ausente"
 
-#: gajim/common/helpers.py:302
+#: gajim/common/helpers.py:308
 msgid "_Offline"
 msgstr "D_esconectado"
 
-#: gajim/common/helpers.py:304 gajim/gtk/tooltips.py:651
+#: gajim/common/helpers.py:310 gajim/gtk/tooltips.py:651
 msgid "Offline"
 msgstr "Desconectado"
 
-#: gajim/common/helpers.py:307
+#: gajim/common/helpers.py:313
 msgid "_Invisible"
 msgstr "_Invisíbel"
 
-#: gajim/common/helpers.py:313
+#: gajim/common/helpers.py:319
 msgid "?contact has status:Unknown"
 msgstr "Descoñecido"
 
-#: gajim/common/helpers.py:315
+#: gajim/common/helpers.py:321
 msgid "?contact has status:Has errors"
 msgstr "Ten erros"
 
-#: gajim/common/helpers.py:330
+#: gajim/common/helpers.py:336
 msgid "?Subscription we already have:None"
 msgstr "Ningunha"
 
-#: gajim/common/helpers.py:332
+#: gajim/common/helpers.py:338
 msgid "To"
 msgstr "A"
 
-#: gajim/common/helpers.py:334 gajim/data/gui/groups_post_window.ui:33
+#: gajim/common/helpers.py:340 gajim/data/gui/groups_post_window.ui:33
 msgid "From"
 msgstr "De"
 
-#: gajim/common/helpers.py:336
+#: gajim/common/helpers.py:342
 msgid "Both"
 msgstr "Ambos"
 
-#: gajim/common/helpers.py:338 gajim/gtk/server_info.py:151
+#: gajim/common/helpers.py:344 gajim/gtk/server_info.py:151
 #, fuzzy
 msgid "Unknown"
 msgstr "Descoñecido"
 
-#: gajim/common/helpers.py:344
+#: gajim/common/helpers.py:350
 msgid "?Ask (for Subscription):None"
 msgstr "Ningunha"
 
-#: gajim/common/helpers.py:346
+#: gajim/common/helpers.py:352
 msgid "Subscribe"
 msgstr "_Engadir"
 
-#: gajim/common/helpers.py:355
+#: gajim/common/helpers.py:361
 msgid "?Group Chat Contact Role:None"
 msgstr "Ningún"
 
-#: gajim/common/helpers.py:358
+#: gajim/common/helpers.py:364
 msgid "Moderators"
 msgstr "Moderadores"
 
-#: gajim/common/helpers.py:360
+#: gajim/common/helpers.py:366
 msgid "Moderator"
 msgstr "Moderador"
 
-#: gajim/common/helpers.py:363
+#: gajim/common/helpers.py:369 gajim/data/gui/groupchat_info_scrolled.ui:243
 msgid "Participants"
 msgstr "Participantes"
 
-#: gajim/common/helpers.py:365
+#: gajim/common/helpers.py:371
 msgid "Participant"
 msgstr "Participante"
 
-#: gajim/common/helpers.py:368
+#: gajim/common/helpers.py:374
 msgid "Visitors"
 msgstr "Visitantes"
 
-#: gajim/common/helpers.py:370
+#: gajim/common/helpers.py:376
 msgid "Visitor"
 msgstr "Visitante"
 
-#: gajim/common/helpers.py:376 gajim/gtk/tooltips.py:253
+#: gajim/common/helpers.py:382 gajim/gtk/tooltips.py:253
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "Ningún"
 
-#: gajim/common/helpers.py:378 gajim/data/gui/groupchat_config.ui:32
+#: gajim/common/helpers.py:384 gajim/data/gui/groupchat_config.ui:32
 #: gajim/gtk/tooltips.py:259
 msgid "Owner"
 msgstr "Propietario"
 
-#: gajim/common/helpers.py:380 gajim/gtk/tooltips.py:257
+#: gajim/common/helpers.py:386 gajim/gtk/tooltips.py:257
 msgid "Administrator"
 msgstr "Administrador"
 
-#: gajim/common/helpers.py:382 gajim/data/gui/groupchat_config.ui:40
+#: gajim/common/helpers.py:388 gajim/data/gui/groupchat_config.ui:40
 #: gajim/gtk/tooltips.py:255 gajim/gtk/groupchat_config.py:105
 msgid "Member"
 msgstr "Membro"
 
-#: gajim/common/helpers.py:421
+#: gajim/common/helpers.py:427
 msgid "is paying attention to the conversation"
 msgstr "está a prestar atención á conversa"
 
-#: gajim/common/helpers.py:423
+#: gajim/common/helpers.py:429
 msgid "is doing something else"
 msgstr "está a facer algo máis"
 
-#: gajim/common/helpers.py:425
+#: gajim/common/helpers.py:431
 #, fuzzy
 msgid "is composing a message…"
 msgstr "está a escribir..."
 
-#: gajim/common/helpers.py:428
+#: gajim/common/helpers.py:434
 msgid "paused composing a message"
 msgstr "Parou de escribir"
 
-#: gajim/common/helpers.py:430
+#: gajim/common/helpers.py:436
 msgid "has closed the chat window or tab"
 msgstr "pechou a fiestra de charla"
 
-#: gajim/common/helpers.py:936 gajim/common/helpers.py:943
+#: gajim/common/helpers.py:942 gajim/common/helpers.py:949
 #, 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:950
+#: gajim/common/helpers.py:956
 #, fuzzy, python-format
-msgid "from room %s"
-msgstr "Estou %s"
+msgid "from group chat %s"
+msgstr "Entrar nun grupo de charla"
 
-#: gajim/common/helpers.py:953 gajim/common/helpers.py:970
+#: gajim/common/helpers.py:959 gajim/common/helpers.py:976
 #, python-format
 msgid "from user %s"
 msgstr ""
 
-#: gajim/common/helpers.py:955
+#: gajim/common/helpers.py:961
 #, fuzzy, python-format
 msgid "from %s"
 msgstr "De"
 
-#: gajim/common/helpers.py:962 gajim/common/helpers.py:968
+#: gajim/common/helpers.py:968 gajim/common/helpers.py:974
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
 msgstr[0] ""
 msgstr[1] ""
 
-#: gajim/common/helpers.py:986 gajim/common/helpers.py:998
+#: gajim/common/helpers.py:992 gajim/common/helpers.py:1004
 #: gajim/data/gui/roster_window.ui:85 data/org.gajim.Gajim.desktop.in:4
 #: data/org.gajim.Gajim.appdata.xml.in:9
 msgid "Gajim"
 msgstr "Gajim"
 
-#: gajim/common/helpers.py:1000
+#: gajim/common/helpers.py:1006
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: gajim/common/helpers.py:1109 gajim/data/gui/add_new_contact_window.ui:25
+#: gajim/common/helpers.py:1115 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:1111
+#: gajim/common/helpers.py:1117
 msgid "Hello, I am $name."
 msgstr ""
 
-#: gajim/common/helpers.py:1215 gajim/common/helpers.py:1224
-#: gajim/common/helpers.py:1282
+#: gajim/common/helpers.py:1221 gajim/common/helpers.py:1230
+#: gajim/common/helpers.py:1288
 #, fuzzy
 msgid "Timeout loading image"
 msgstr "Non foi posíbel cargar a imaxe"
 
-#: gajim/common/helpers.py:1234 gajim/common/helpers.py:1280
+#: gajim/common/helpers.py:1240 gajim/common/helpers.py:1286
 msgid "Image is too big"
 msgstr ""
 
-#: gajim/common/helpers.py:1245
+#: gajim/common/helpers.py:1251
 msgid "PyCURL is not installed"
 msgstr ""
 
-#: gajim/common/helpers.py:1284
+#: gajim/common/helpers.py:1290
 #, fuzzy
 msgid "Error loading image"
 msgstr "Non foi posíbel cargar a imaxe"
@@ -5636,7 +5754,7 @@ msgstr ""
 #: gajim/common/modules/adhoc_commands.py:202
 #: gajim/common/modules/adhoc_commands.py:239
 #, fuzzy
-msgid "Leave Groupchats"
+msgid "Leave Group Chats"
 msgstr "Novo grupo de charla"
 
 #: gajim/common/modules/adhoc_commands.py:228
@@ -5646,16 +5764,17 @@ msgstr "%(nickname)s da sala %(room_name)s"
 
 #: gajim/common/modules/adhoc_commands.py:232
 #, fuzzy
-msgid "You have not joined a groupchat."
+msgid "You have not joined a group chat."
 msgstr "%s entrou no grupo de charla"
 
 #: gajim/common/modules/adhoc_commands.py:240
-msgid "Choose the groupchats you want to leave"
-msgstr ""
+#, fuzzy
+msgid "Choose the group chats you want to leave"
+msgstr "Por favor, cubra a información do contacto que quere engadir"
 
 #: gajim/common/modules/adhoc_commands.py:289
 #, fuzzy
-msgid "You left the following groupchats:"
+msgid "You left the following group chats:"
 msgstr "Xa está na sala %s"
 
 #: gajim/common/modules/roster_item_exchange.py:102
@@ -5673,7 +5792,7 @@ msgstr "Contactos"
 msgid "Blocked Contacts"
 msgstr "Contactos"
 
-#: gajim/data/gui/destroy_muc_dialog.ui:79 gajim/gtk/dialogs.py:736
+#: gajim/data/gui/destroy_muc_dialog.ui:79 gajim/gtk/dialogs.py:563
 msgid "Destroy this group chat permanently?"
 msgstr ""
 
@@ -5682,7 +5801,7 @@ msgstr ""
 msgid "Reason..."
 msgstr "Motivo"
 
-#: gajim/data/gui/destroy_muc_dialog.ui:124 gajim/gtk/dialogs.py:738
+#: gajim/data/gui/destroy_muc_dialog.ui:124 gajim/gtk/dialogs.py:565
 msgid "Where participants should go (optional)"
 msgstr ""
 
@@ -5694,34 +5813,6 @@ msgstr ""
 msgid "_Reason and alternate venue (optional)"
 msgstr ""
 
-#: gajim/data/gui/advanced_configuration_window.ui:7
-#: gajim/data/gui/preferences_window.ui:2723
-#, fuzzy
-msgid "Advanced Configuration Editor (ACE)"
-msgstr "Editor avanzado de configuración"
-
-#: gajim/data/gui/advanced_configuration_window.ui:52
-#, fuzzy
-msgid "You should restart Gajim for some changes to take effect"
-msgstr ""
-"<b>NOTA:</b> Debe reiniciar o Gajim para que algúns cambios teñan efecto"
-
-#: gajim/data/gui/advanced_configuration_window.ui:84
-#, fuzzy
-msgid "_Filter"
-msgstr "_Filtro:"
-
-#: gajim/data/gui/advanced_configuration_window.ui:153
-#: gajim/data/gui/filetransfers_send_file_dialog.ui:15
-#: gajim/gtk/discovery.py:1666
-msgid "Description"
-msgstr "Descrición"
-
-#: gajim/data/gui/advanced_configuration_window.ui:197
-#, fuzzy
-msgid "_Reset to default"
-msgstr "_Restabelecer as cores predeterminadas"
-
 #: gajim/data/gui/join_groupchat_window.ui:56
 #: gajim/data/gui/chat_to_muc_window.ui:67
 #: gajim/data/gui/chat_to_muc_window.ui:78
@@ -5733,9 +5824,8 @@ msgid "Join group chat every time Gajim is started"
 msgstr ""
 
 #: gajim/data/gui/join_groupchat_window.ui:113
-#, fuzzy
-msgid "Auto Join"
-msgstr "Autoconectar"
+msgid "Join Automatically"
+msgstr ""
 
 #: gajim/data/gui/join_groupchat_window.ui:131
 #: gajim/data/gui/profile_window.ui:233
@@ -5744,10 +5834,11 @@ msgstr "Conta"
 
 #: gajim/data/gui/join_groupchat_window.ui:147
 #, fuzzy
-msgid "Room"
-msgstr "Sala:"
+msgid "Group chat"
+msgstr "Grupos de charla"
 
-#: gajim/data/gui/join_groupchat_window.ui:180 gajim/gtk/accounts.py:886
+#: gajim/data/gui/join_groupchat_window.ui:180 gajim/data/gui/bookmarks.ui:158
+#: gajim/gtk/accounts.py:889
 #, fuzzy
 msgid "Password"
 msgstr "Contrasinal: "
@@ -5771,93 +5862,11 @@ 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:1271
+#: gajim/data/gui/join_groupchat_window.ui:437 gajim/gtk/discovery.py:1270
 #, fuzzy
 msgid "Join"
 msgstr "_Entrar"
 
-#: gajim/data/gui/manage_proxies_window.ui:12
-#, fuzzy
-msgid "HTTP Connect"
-msgstr "Conectar con HTTP"
-
-#: gajim/data/gui/manage_proxies_window.ui:15
-msgid "SOCKS5"
-msgstr ""
-
-#: gajim/data/gui/manage_proxies_window.ui:18
-msgid "BOSH"
-msgstr ""
-
-#: gajim/data/gui/manage_proxies_window.ui:27
-msgid "Manage Proxy Profiles"
-msgstr "Xestionar os perfís do proxy"
-
-#: gajim/data/gui/manage_proxies_window.ui:83
-#, fuzzy
-msgid "Add Proxy"
-msgstr "Proxy"
-
-#: gajim/data/gui/manage_proxies_window.ui:97
-#, fuzzy
-msgid "Remove Proxy"
-msgstr "Eliminar o grupo"
-
-#: gajim/data/gui/manage_proxies_window.ui:141
-#, fuzzy
-msgid "Properties"
-msgstr "<b>Propiedades</b>"
-
-#: gajim/data/gui/manage_proxies_window.ui:157
-#, fuzzy
-msgid "_Name"
-msgstr "_Nome: "
-
-#: gajim/data/gui/manage_proxies_window.ui:173
-#, fuzzy
-msgid "_Type"
-msgstr "Tipo:"
-
-#: gajim/data/gui/manage_proxies_window.ui:236
-#, fuzzy
-msgid "_BOSH URL"
-msgstr "_URL"
-
-#: gajim/data/gui/manage_proxies_window.ui:261
-#, fuzzy
-msgid "Use HTTP prox_y"
-msgstr "_Usar proxy"
-
-#: gajim/data/gui/manage_proxies_window.ui:280
-#, fuzzy
-msgid "Proxy _Host"
-msgstr "Proxy"
-
-#: gajim/data/gui/manage_proxies_window.ui:307
-#, fuzzy
-msgid "Proxy _Port"
-msgstr "_Porto:"
-
-#: gajim/data/gui/manage_proxies_window.ui:334
-#, fuzzy
-msgid "_Username"
-msgstr "_Nome de usuario:"
-
-#: gajim/data/gui/manage_proxies_window.ui:347
-#, fuzzy
-msgid "Use proxy auth_entication"
-msgstr "Usar a autenticación"
-
-#: gajim/data/gui/manage_proxies_window.ui:377
-#, fuzzy
-msgid "Pass_word"
-msgstr "_Contrasinal: "
-
-#: gajim/data/gui/manage_proxies_window.ui:405 gajim/gtk/adhoc.py:321
-#, fuzzy
-msgid "Settings"
-msgstr "Fallou a conexión"
-
 #: gajim/data/gui/change_password_dialog.ui:17
 #, fuzzy
 msgid "New Password"
@@ -5888,11 +5897,13 @@ msgid "Status:"
 msgstr "Estado:"
 
 #: gajim/data/gui/zeroconf_information_window.ui:89
-msgid "_Log conversation history"
+#, fuzzy
+msgid "_Store conversation history"
 msgstr "Historial de conversas"
 
 #: gajim/data/gui/zeroconf_information_window.ui:215
 #: gajim/data/gui/vcard_information_window.ui:390
+#: gajim/data/gui/groupchat_info_scrolled.ui:166
 msgid "Contact"
 msgstr "Contacto"
 
@@ -5905,8 +5916,9 @@ msgid "Last Name:"
 msgstr "Apelido(s):"
 
 #: gajim/data/gui/zeroconf_information_window.ui:260
-msgid "Jabber ID:"
-msgstr "ID de Jabber:"
+#, fuzzy
+msgid "XMPP Address:"
+msgstr "Enderezo de AIM:"
 
 #: gajim/data/gui/zeroconf_information_window.ui:273
 msgid "E-Mail:"
@@ -5927,8 +5939,8 @@ msgstr "Enviar ficheiro"
 
 #: gajim/data/gui/gc_occupants_menu.ui:29
 #, fuzzy
-msgid "Occupant Actions"
-msgstr "_Accións"
+msgid "Participant Actions"
+msgstr "Participantes"
 
 #: gajim/data/gui/gc_occupants_menu.ui:38
 msgid "_Voice"
@@ -5959,8 +5971,9 @@ msgid "_Ban"
 msgstr "_Deshabilitar"
 
 #: gajim/data/gui/gc_occupants_menu.ui:124
-msgid "_Add to Roster"
-msgstr "_Engadir á listaxe de contactos"
+#, fuzzy
+msgid "_Add to Contact List"
+msgstr "_Engadir un contacto..."
 
 #: gajim/data/gui/gc_occupants_menu.ui:132
 #, fuzzy
@@ -6001,11 +6014,6 @@ msgstr "Subscrición:"
 msgid "_Status"
 msgstr "E_stado"
 
-#: gajim/data/gui/zeroconf_context_menu.ui:26
-#: gajim/data/gui/account_context_menu.ui:79
-msgid "_Modify Account..."
-msgstr "_Modificar a conta..."
-
 #: gajim/data/gui/certificate_dialog.ui:66
 #: gajim/data/gui/certificate_dialog.ui:178
 msgid "Common Name (CN)"
@@ -6087,13 +6095,19 @@ msgstr "Última modificación:"
 msgid "Next entry"
 msgstr ""
 
+#: gajim/data/gui/filetransfers_send_file_dialog.ui:15
+#: gajim/data/gui/advanced_configuration.ui:143
+#: gajim/data/gui/groupchat_info_scrolled.ui:48 gajim/gtk/discovery.py:1663
+msgid "Description"
+msgstr "Descrición"
+
 #: gajim/data/gui/filetransfers_send_file_dialog.ui:54
 #, fuzzy
 msgid "_Send Files"
 msgstr "Enviar ficheiro"
 
 #: gajim/data/gui/filetransfers_send_file_dialog.ui:58
-#: gajim/gtk/xml_console.py:90
+#: gajim/gtk/xml_console.py:87
 #, fuzzy
 msgid "Send"
 msgstr "_Enviar"
@@ -6120,8 +6134,8 @@ msgstr "Cambiar o _alcume"
 
 #: gajim/data/gui/gc_control_popup_menu.ui:20
 #, fuzzy
-msgid "_Manage Room"
-msgstr "Xestionar os marcadores"
+msgid "_Manage Group Chat"
+msgstr "Novo grupo de charla"
 
 #: gajim/data/gui/gc_control_popup_menu.ui:31
 #, fuzzy
@@ -6130,13 +6144,13 @@ msgstr "Cambiar o _tema"
 
 #: gajim/data/gui/gc_control_popup_menu.ui:38
 #, fuzzy
-msgid "Configure _Room..."
-msgstr "Configurar a sala"
+msgid "Configure _Group Chat..."
+msgstr "Entrar nun grupo de charla"
 
 #: gajim/data/gui/gc_control_popup_menu.ui:52
 #, fuzzy
-msgid "_Destroy Room"
-msgstr "Descrición: %s"
+msgid "_Destroy Group Chat"
+msgstr "Novo grupo de charla"
 
 #: gajim/data/gui/gc_control_popup_menu.ui:64
 msgid "_Minimize on close"
@@ -6147,7 +6161,7 @@ msgstr ""
 msgid "_Request Voice"
 msgstr "_Voz"
 
-#: gajim/data/gui/gc_control_popup_menu.ui:99 gajim/gtk/discovery.py:1704
+#: gajim/data/gui/gc_control_popup_menu.ui:99
 #, fuzzy
 msgid "_Bookmark"
 msgstr "Engadir esta sala aos marcadores"
@@ -6200,14 +6214,6 @@ msgstr "Páxina web:"
 msgid "E-Mail"
 msgstr "Correo electrónico:"
 
-#: 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/blocking_list.ui:115 gajim/gtk/add_contact.py:30
-#: gajim/gtk/accounts.py:801
-#, fuzzy
-msgid "Jabber ID"
-msgstr "ID de Jabber:"
-
 #: gajim/data/gui/profile_window.ui:440
 msgid "Main"
 msgstr ""
@@ -6343,35 +6349,42 @@ msgstr "Traballo"
 msgid "About"
 msgstr "Acerca de"
 
-#: gajim/data/gui/start_chat_dialog.ui:114 gajim/gtk/discovery.py:1658
-msgid "Users"
-msgstr "Usuarios"
-
-#: gajim/data/gui/start_chat_dialog.ui:185
-msgid "Name:"
-msgstr "Nome:"
+#: gajim/data/gui/start_chat_dialog.ui:53
+#, fuzzy
+msgid "Global Group Chat Search"
+msgstr "Entrar nunha sala de charlas"
 
-#: gajim/data/gui/start_chat_dialog.ui:197
+#: 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
-msgid "Description:"
-msgstr "Descrición: %s"
+msgid "_Back"
+msgstr "Volvo axiña"
 
-#: gajim/data/gui/start_chat_dialog.ui:209
+#: gajim/data/gui/start_chat_dialog.ui:245
+#: gajim/data/gui/groupchat_control.ui:796
+#: gajim/data/gui/groupchat_control.ui:888 gajim/gtk/discovery.py:1701
+#: gajim/gtk/groupchat_join.py:62
+msgid "_Join"
+msgstr "_Entrar"
+
+#: gajim/data/gui/start_chat_dialog.ui:289
 #, fuzzy
-msgid "Address:"
-msgstr "_Enderezo:"
+msgid "Select Account"
+msgstr "A eliminar a conta %s"
 
-#: gajim/data/gui/start_chat_dialog.ui:246
-msgid ""
-"Semi-Anonymous\n"
-"<span size=\"small\">(Only moderators can see your XMPP-Address)</span>"
+#: gajim/data/gui/start_chat_dialog.ui:380
+msgid "_Select"
 msgstr ""
 
 #: gajim/data/gui/filetransfers.ui:21
 msgid "Pa_use/Resume"
 msgstr ""
 
-#: gajim/data/gui/filetransfers.ui:30 gajim/gtk/filechoosers.py:178
+#: gajim/data/gui/filetransfers.ui:30 gajim/data/gui/groupchat_control.ui:575
+#: gajim/data/gui/groupchat_control.ui:667
+#: gajim/data/gui/groupchat_control.ui:779
+#: gajim/data/gui/groupchat_control.ui:871 gajim/gtk/filechoosers.py:178
 msgid "_Cancel"
 msgstr "_Cancelar"
 
@@ -6416,7 +6429,7 @@ msgstr ""
 
 #: gajim/data/gui/filetransfers.ui:207
 #, fuzzy
-msgid "Shows a list of file transfers between you and others"
+msgid "Shows a list of file transfers between you and your contacts"
 msgstr "Amosa unha listaxe de transferencias entre vostede e outra persoa"
 
 #: gajim/data/gui/groupchat_control.ui:13 gajim/data/gui/chat_control.ui:277
@@ -6438,7 +6451,6 @@ msgid "Strike"
 msgstr "Alcume"
 
 #: gajim/data/gui/groupchat_control.ui:54 gajim/data/gui/chat_control.ui:318
-#: gajim/gtk/advanced_config.py:86
 msgid "Color"
 msgstr ""
 
@@ -6452,16 +6464,45 @@ msgstr "_Letra:"
 msgid "Clear formatting"
 msgstr "Información"
 
-#: gajim/data/gui/groupchat_control.ui:290 gajim/data/gui/chat_control.ui:880
+#: gajim/data/gui/groupchat_control.ui:291 gajim/data/gui/chat_control.ui:880
 #, fuzzy
 msgid "Choose encryption"
 msgstr "Elixa un ficheiro para enviar..."
 
-#: gajim/data/gui/groupchat_control.ui:336 gajim/data/gui/chat_control.ui:640
+#: gajim/data/gui/groupchat_control.ui:337 gajim/data/gui/chat_control.ui:640
 #, fuzzy
 msgid "Show a list of emojis (Alt+M)"
 msgstr "Prema aquí para inserir unha emoticona (Alt+M)"
 
+#: gajim/data/gui/groupchat_control.ui:484
+#, fuzzy
+msgid "Joining…"
+msgstr "A expulsar..."
+
+#: gajim/data/gui/groupchat_control.ui:496
+msgid "_Abort"
+msgstr ""
+
+#: gajim/data/gui/groupchat_control.ui:542
+#, fuzzy
+msgid "Enter new nickname"
+msgstr "Despois do alcume:"
+
+#: gajim/data/gui/groupchat_control.ui:592
+#: gajim/data/gui/groupchat_control.ui:684
+#, fuzzy
+msgid "Ch_ange"
+msgstr "Cambiar o _alcume"
+
+#: gajim/data/gui/groupchat_control.ui:761
+#, fuzzy
+msgid "Enter password"
+msgstr "Insira o contrasinal novo:"
+
+#: gajim/data/gui/groupchat_control.ui:1067
+msgid "_Try again"
+msgstr ""
+
 #: gajim/data/gui/popup_notification_window.ui:42
 #, fuzzy
 msgid "Event Type"
@@ -6543,8 +6584,8 @@ msgstr "Ausente"
 
 #: gajim/data/gui/mam_preferences.ui:18
 #, fuzzy
-msgid "Roster"
-msgstr "Amosar _listaxe"
+msgid "Contact List"
+msgstr "Contactos"
 
 #: gajim/data/gui/mam_preferences.ui:22
 #: gajim/data/gui/preferences_window.ui:123
@@ -6570,12 +6611,12 @@ msgid "Add"
 msgstr "Enderezo"
 
 #: gajim/data/gui/mam_preferences.ui:194 gajim/data/gui/groupchat_config.ui:151
-#: gajim/gtk/dialogs.py:63 gajim/gtk/accounts.py:381
+#: gajim/gtk/dialogs.py:62 gajim/gtk/accounts.py:384
 #, fuzzy
 msgid "Remove"
 msgstr "_Eliminar"
 
-#: gajim/data/gui/vcard_information_window.ui:72 gajim/gtk/accounts.py:753
+#: gajim/data/gui/vcard_information_window.ui:72 gajim/gtk/accounts.py:756
 #, fuzzy
 msgid "Resource"
 msgstr "Recurso:"
@@ -6628,6 +6669,7 @@ msgstr "Subscrición:"
 #: gajim/data/gui/vcard_information_window.ui:974
 #: gajim/data/gui/vcard_information_window.ui:993
 #: gajim/data/gui/vcard_information_window.ui:1427
+#: gajim/data/gui/groupchat_info_scrolled.ui:222
 msgid "button"
 msgstr ""
 
@@ -6660,15 +6702,15 @@ msgstr "_Notificarmo"
 
 #: gajim/data/gui/preferences_window.ui:58
 #, fuzzy
-msgid "Show only in roster"
-msgstr "Amosar só na _listaxe de contactos"
+msgid "Show only in contact list"
+msgstr "Amosar os contactos desconectados"
 
 #: gajim/data/gui/preferences_window.ui:69
-msgid "Detached roster with detached chats"
+msgid "Detached contact list with detached chats"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:72
-msgid "Detached roster with single chat"
+msgid "Detached contact list with single chat"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:75
@@ -6676,11 +6718,11 @@ msgid "Single window for everything"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:78
-msgid "Detached roster with chat grouped by account"
+msgid "Detached contact list with chat grouped by account"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:81
-msgid "Detached roster with chat grouped by type"
+msgid "Detached contact list with chat grouped by type"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:92
@@ -6731,7 +6773,7 @@ msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:296
 #, fuzzy
-msgid "_Show roster on startup"
+msgid "_Show contact list on startup"
 msgstr "Amosar _listaxe"
 
 #: gajim/data/gui/preferences_window.ui:311
@@ -6747,12 +6789,12 @@ msgid "_Tabs placement"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:363
-msgid "_Quit Gajim when closing roster window"
+msgid "_Quit Gajim when closing contact list"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:367
 msgid ""
-"If enabled, Gajim will quit when closing the roster window instead of "
+"If enabled, Gajim will quit when closing the contact list window instead of "
 "minimizing to the system's notification area"
 msgstr ""
 
@@ -6762,41 +6804,42 @@ msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:423
 #, fuzzy
-msgid "Show a_vatars of contacts in roster"
+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
 #, fuzzy
 msgid ""
-"If checked, avatars of contacts will be shown in the roster window and in "
-"group chats"
+"If checked, avatars of contacts will be shown in the contact list window and "
+"in group chats"
 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
 #, fuzzy
-msgid "Show status _messages of contacts in roster"
+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
 #, fuzzy
 msgid ""
 "If checked, status messages of contacts will be shown under the contact's "
-"name, in the roster window, and in group chats"
+"name, in the contact list window, and in group chats"
 msgstr ""
 "Se isto está marcado, o Gajim amosará as mensaxes de estado dos contactos "
 "debaixo do nome do contacto na listaxe e en grupos de charla"
 
 #: gajim/data/gui/preferences_window.ui:459
 #, fuzzy
-msgid "Show e_xtra information of contacts in roster (mood, activity, ...)"
+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
 msgid ""
-"If checked, additional info published by the contact will be shown in "
-"roster. Additional infos (published via PEP) may include e.g. mood, "
+"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 ""
 
@@ -6807,8 +6850,8 @@ msgstr "Ordenar os contacto_s polo estado"
 
 #: gajim/data/gui/preferences_window.ui:494
 #, fuzzy
-msgid "in _roster"
-msgstr "Non está na listaxe"
+msgid "in _contact list"
+msgstr "Contactos"
 
 #: gajim/data/gui/preferences_window.ui:511
 #, fuzzy
@@ -6817,8 +6860,8 @@ msgstr "Entrar nun grupo de charla"
 
 #: gajim/data/gui/preferences_window.ui:540
 #, fuzzy
-msgid "Roster Appearance"
-msgstr "<b>Editar unha regra</b>"
+msgid "Contact List Appearance"
+msgstr "Contacto desconectado"
 
 #: gajim/data/gui/preferences_window.ui:585
 msgid "Enable spell _checking"
@@ -6879,7 +6922,7 @@ msgstr "Non se puido entrar no grupo de charla"
 
 #: gajim/data/gui/preferences_window.ui:660
 #, fuzzy
-msgid "If checked, the room subject will be shown when joining a group chat"
+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:682
@@ -6894,13 +6937,13 @@ msgstr ""
 #: gajim/data/gui/preferences_window.ui:701
 msgid ""
 "If join/leave status messages are shown in the group chat. This setting can "
-"be overridden in the groupchat menu."
+"be overridden in the group chat menu."
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:720
 msgid ""
 "The default sync threshold for new public group chats. This setting can be "
-"overridden in the groupchat menu."
+"overridden in the group chat menu."
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:722
@@ -6915,7 +6958,7 @@ msgstr "_Rexistrar os cambios de estado dos contactos"
 #: gajim/data/gui/preferences_window.ui:768
 msgid ""
 "If status change messages are shown in the group chat. This setting can be "
-"overridden in the groupchat menu."
+"overridden in the group chat menu."
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:825
@@ -6932,8 +6975,8 @@ msgstr "Se isto está marcado, o Gajim entrará a esta sala ao inicio"
 
 #: gajim/data/gui/preferences_window.ui:843
 #, fuzzy
-msgid "Show chatstate in roster"
-msgstr "Amosar na listaxe os a_vatares dos contactos"
+msgid "Show chatstate in contact list"
+msgstr "Quere amosar o botón de pechar no tabulador?"
 
 #: gajim/data/gui/preferences_window.ui:847
 msgid ""
@@ -7230,7 +7273,7 @@ msgstr ""
 msgid "Vi_ew own video source"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2281 gajim/gtk/accounts.py:352
+#: gajim/data/gui/preferences_window.ui:2281 gajim/gtk/accounts.py:355
 msgid "Connection"
 msgstr "Conexión"
 
@@ -7284,7 +7327,8 @@ msgid "_Manage..."
 msgstr "Xestionar..."
 
 #: gajim/data/gui/preferences_window.ui:2616
-msgid "_Log status changes of contacts"
+#, fuzzy
+msgid "_Store status changes of contacts in history"
 msgstr "_Rexistrar os cambios de estado dos contactos"
 
 #: gajim/data/gui/preferences_window.ui:2633
@@ -7309,10 +7353,15 @@ msgstr ""
 msgid "_Open..."
 msgstr "_Abrir..."
 
+#: gajim/data/gui/preferences_window.ui:2723 gajim/gtk/advanced_config.py:84
+#, fuzzy
+msgid "Advanced Configuration Editor (ACE)"
+msgstr "Editor avanzado de configuración"
+
 #: gajim/data/gui/groupchat_config.ui:55
 #, fuzzy
 msgid ""
-"<b>Jabber-ID</b>\n"
+"<b>XMPP Address</b>\n"
 "&lt;user@domain/resource&gt; (only that resource matches)\n"
 "&lt;user@domain&gt; (any resource matches)\n"
 "&lt;domain/resource&gt; (only that resource matches)\n"
@@ -7331,7 +7380,8 @@ msgstr ""
 msgid "Only Admins and Owners can modify the affiliation"
 msgstr ""
 
-#: gajim/data/gui/groupchat_config.ui:270 gajim/plugins/gui.py:312
+#: gajim/data/gui/groupchat_config.ui:270
+#: gajim/data/gui/groupchat_info_scrolled.ui:210 gajim/plugins/gui.py:324
 #, fuzzy
 msgid "Configuration"
 msgstr "Configuración da sala"
@@ -7364,7 +7414,7 @@ msgid "Start _Chat"
 msgstr "Iniciar a charla"
 
 #: gajim/data/gui/contact_context_menu.ui:20
-#: gajim/data/gui/systray_context_menu.ui:36
+#: gajim/data/gui/systray_context_menu.ui:29
 msgid "Send Single _Message..."
 msgstr "Enviar unha _mensaxe..."
 
@@ -7433,17 +7483,43 @@ msgstr ""
 
 #: gajim/data/gui/contact_context_menu.ui:174
 #, fuzzy
-msgid "_Add to Roster..."
-msgstr "_Engadir á listaxe de contactos"
+msgid "_Add to Contact List..."
+msgstr "_Engadir un contacto..."
+
+#: gajim/data/gui/advanced_configuration.ui:39
+#, fuzzy
+msgid "You should restart Gajim for some changes to take effect"
+msgstr ""
+"<b>NOTA:</b> Debe reiniciar o Gajim para que algúns cambios teñan efecto"
+
+#: gajim/data/gui/advanced_configuration.ui:71
+#, fuzzy
+msgid "_Filter"
+msgstr "_Filtro:"
+
+#: gajim/data/gui/advanced_configuration.ui:88
+msgid "Type to search for values..."
+msgstr ""
+
+#: gajim/data/gui/advanced_configuration.ui:180
+#, fuzzy
+msgid "_Reset Value"
+msgstr "_Restabelecer as cores predeterminadas"
+
+#: gajim/data/gui/advanced_configuration.ui:185
+#, fuzzy
+msgid "Resets value to default"
+msgstr "_Restabelecer as cores predeterminadas"
 
 #: gajim/data/gui/account_creation_wizard_window.ui:43
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim: asistente para crear unha conta"
 
 #: gajim/data/gui/account_creation_wizard_window.ui:70
+#, fuzzy
 msgid ""
 "You need to have an account in order to connect\n"
-"to the Jabber network."
+"to the XMPP network."
 msgstr ""
 "Precisa unha conta para se conectar\n"
 "á rede Jabber"
@@ -7467,8 +7543,9 @@ msgid "<b>Please fill in the data for your existing account</b>"
 msgstr "<b>Por favor, introduza os datos para a súa conta nova</b>"
 
 #: gajim/data/gui/account_creation_wizard_window.ui:187
-msgid "_Jabber ID:"
-msgstr "ID de _Jabber: "
+#, fuzzy
+msgid "_XMPP Address:"
+msgstr "Enderezo de AIM:"
 
 #: gajim/data/gui/account_creation_wizard_window.ui:239
 #: gajim/data/gui/account_creation_wizard_window.ui:394
@@ -7557,6 +7634,7 @@ msgid "Privacy Lists:"
 msgstr "Listaxes de privacidade:"
 
 #: gajim/data/gui/service_discovery_window.ui:111
+#: gajim/data/gui/groupchat_creation.ui:227
 #, fuzzy
 msgid "_Address"
 msgstr "_Enderezo:"
@@ -7575,11 +7653,6 @@ msgstr ""
 msgid "Select the contacts you want to synchronise"
 msgstr "JID do contacto co que quere conversar"
 
-#: gajim/data/gui/groupchat_invitation_received.ui:42
-#, fuzzy
-msgid "Group Chat Invitation"
-msgstr "Convite a grupo de charla"
-
 #: gajim/data/gui/groupchat_invitation_received.ui:111
 #, fuzzy
 msgid "Message..."
@@ -7631,11 +7704,10 @@ msgstr ""
 
 #: gajim/data/gui/add_new_contact_window.ui:84
 #, fuzzy
-msgid "_Jabber ID"
-msgstr "ID de _Jabber: "
+msgid "_XMPP Address"
+msgstr "_Enderezo:"
 
 #: gajim/data/gui/add_new_contact_window.ui:100
-#: gajim/data/gui/manage_bookmarks_window.ui:192
 #, fuzzy
 msgid "_Nickname"
 msgstr "_Alcume:"
@@ -7715,7 +7787,7 @@ msgstr "<b>Sons</b>"
 msgid "<b>Message:</b>"
 msgstr "<b>Mensaxes de estado predefinidas</b>"
 
-#: gajim/data/gui/plugins_window.ui:10 gajim/data/gui/application_menu.ui:90
+#: gajim/data/gui/plugins_window.ui:10 gajim/data/gui/application_menu.ui:87
 msgid "Plugins"
 msgstr ""
 
@@ -7824,10 +7896,6 @@ msgstr "Permitir"
 msgid "Deny"
 msgstr "Denegar"
 
-#: gajim/data/gui/privacy_list_window.ui:317
-msgid "JabberID"
-msgstr "ID de Jabber:"
-
 #: gajim/data/gui/privacy_list_window.ui:358
 msgid "all in the group"
 msgstr "todos no grupo"
@@ -7870,7 +7938,7 @@ msgstr "Orde:"
 msgid "Manage sounds"
 msgstr "Xestionar as contas"
 
-#: gajim/data/gui/manage_sounds_window.ui:55 gajim/plugins/gui.py:100
+#: gajim/data/gui/manage_sounds_window.ui:55 gajim/plugins/gui.py:101
 msgid "Active"
 msgstr "Activo"
 
@@ -7909,23 +7977,114 @@ msgstr "Eliminar a conta do Gajim e do _servidor"
 msgid "_Personal Events"
 msgstr "Información persoal"
 
-#: gajim/data/gui/account_context_menu.ui:35
-#: gajim/data/gui/systray_context_menu.ui:28
-msgid "Join _Group Chat"
-msgstr "Entrar nun grupo de charla"
-
-#: gajim/data/gui/account_context_menu.ui:49
+#: gajim/data/gui/account_context_menu.ui:41
 msgid "_Add Contact..."
 msgstr "_Engadir un contacto..."
 
-#: gajim/data/gui/account_context_menu.ui:57
+#: gajim/data/gui/account_context_menu.ui:49
 msgid "_Discover Services"
 msgstr "_Descubrir os servizos"
 
-#: gajim/data/gui/account_context_menu.ui:65
+#: gajim/data/gui/account_context_menu.ui:57
 msgid "_Execute Command..."
 msgstr "Executar o _comando..."
 
+#: gajim/data/gui/account_context_menu.ui:65
+#, fuzzy
+msgid "_View Certificate"
+msgstr "O nome de usuario non é válido"
+
+#: gajim/data/gui/manage_proxies.ui:12
+#, fuzzy
+msgctxt "proxy configuration"
+msgid "HTTP Connect"
+msgstr "Conectar con HTTP"
+
+#: gajim/data/gui/manage_proxies.ui:15
+msgctxt "proxy configuration"
+msgid "SOCKS5"
+msgstr ""
+
+#: gajim/data/gui/manage_proxies.ui:18
+#, fuzzy
+msgctxt "proxy configuration"
+msgid "BOSH"
+msgstr "_URL"
+
+#: gajim/data/gui/manage_proxies.ui:68
+#, fuzzy
+msgid "Add Proxy"
+msgstr "Proxy"
+
+#: gajim/data/gui/manage_proxies.ui:82
+#, fuzzy
+msgid "Remove Proxy"
+msgstr "Eliminar o grupo"
+
+#: gajim/data/gui/manage_proxies.ui:134
+#, fuzzy
+msgid "Pass_word"
+msgstr "_Contrasinal: "
+
+#: gajim/data/gui/manage_proxies.ui:159
+#, fuzzy
+msgid "Use proxy auth_entication"
+msgstr "Usar a autenticación"
+
+#: gajim/data/gui/manage_proxies.ui:179
+#, fuzzy
+msgid "_Username"
+msgstr "_Nome de usuario:"
+
+#: gajim/data/gui/manage_proxies.ui:209
+#, fuzzy
+msgid "_Port"
+msgstr "_Porto:"
+
+#: gajim/data/gui/manage_proxies.ui:226
+msgid "example.org"
+msgstr ""
+
+#: gajim/data/gui/manage_proxies.ui:240
+#, fuzzy
+msgid "_Host"
+msgstr "_Porto:"
+
+#: gajim/data/gui/manage_proxies.ui:254
+#, fuzzy
+msgid "Use HTTP prox_y"
+msgstr "_Usar proxy"
+
+#: gajim/data/gui/manage_proxies.ui:275
+msgid "https://example.org/http-bind/"
+msgstr ""
+
+#: gajim/data/gui/manage_proxies.ui:291
+#, fuzzy
+msgid "_BOSH URL"
+msgstr "_URL"
+
+#: gajim/data/gui/manage_proxies.ui:309 gajim/gtk/adhoc.py:322
+#, fuzzy
+msgid "Settings"
+msgstr "Fallou a conexión"
+
+#: gajim/data/gui/manage_proxies.ui:344
+#, fuzzy
+msgid "_Type"
+msgstr "Tipo:"
+
+#: gajim/data/gui/manage_proxies.ui:361
+#: gajim/data/gui/groupchat_creation.ui:105
+#, fuzzy
+msgid "_Name"
+msgstr "_Nome: "
+
+#: gajim/data/gui/manage_proxies.ui:391 gajim/gtk/accounts.py:742
+#, fuzzy
+msgid "Proxy"
+msgstr "Proxy"
+
 #: gajim/data/gui/application_menu.ui:8
 #, fuzzy
 msgid "View"
@@ -7933,8 +8092,8 @@ msgstr "_Ver"
 
 #: gajim/data/gui/application_menu.ui:11
 #, fuzzy
-msgid "Show Roster"
-msgstr "Amosar _listaxe"
+msgid "Show Contact List"
+msgstr "Amosar os contactos desconectados"
 
 #: gajim/data/gui/application_menu.ui:16
 #, fuzzy
@@ -7976,23 +8135,24 @@ msgstr ""
 msgid "Features"
 msgstr "Características dos servidores"
 
-#: gajim/data/gui/application_menu.ui:81
+#: gajim/data/gui/application_menu.ui:77
+#: gajim/data/gui/groupchat_creation.ui:81 gajim/gtk/groupchat_creation.py:45
 #, fuzzy
-msgid "Bookmarks"
-msgstr "Engadir esta sala aos marcadores"
+msgid "Create Group Chat"
+msgstr "Novo grupo de charla"
 
-#: gajim/data/gui/application_menu.ui:94 gajim/data/gui/shortcuts_window.ui:189
-#: gajim/gtk/preferences.py:59
+#: gajim/data/gui/application_menu.ui:91 gajim/data/gui/shortcuts_window.ui:189
+#: gajim/gtk/preferences.py:58
 msgid "Preferences"
 msgstr "Preferencias"
 
-#: gajim/data/gui/application_menu.ui:99
+#: gajim/data/gui/application_menu.ui:96
 #, fuzzy
 msgid "Quit"
 msgstr "_Saír"
 
 #: gajim/data/gui/httpupload_progress_dialog.ui:110
-#: gajim/gtk/filetransfer.py:121
+#: gajim/gtk/filetransfer.py:120
 msgid "Progress"
 msgstr "Progreso"
 
@@ -8009,52 +8169,33 @@ msgstr ""
 msgid "_Cancel Upload"
 msgstr "_Cancelar"
 
-#: gajim/data/gui/manage_bookmarks_window.ui:13
-#, fuzzy
-msgid "Group Chat Bookmarks"
-msgstr "Grupos de charla"
-
-#: gajim/data/gui/manage_bookmarks_window.ui:68
-#, fuzzy
-msgid "Add Bookmark"
-msgstr "Engadir esta sala aos marcadores"
-
-#: gajim/data/gui/manage_bookmarks_window.ui:82
-#, fuzzy
-msgid "Remove Bookmark"
-msgstr "Engadir esta sala aos marcadores"
+#: gajim/data/gui/groupchat_creation.ui:27
+msgid "Public or Private?"
+msgstr ""
 
-#: gajim/data/gui/manage_bookmarks_window.ui:126
-msgid "N_ame"
+#: 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 ""
 
-#: gajim/data/gui/manage_bookmarks_window.ui:145
-#, fuzzy
-msgid "Bookmark Name"
-msgstr "Engadir esta sala aos marcadores"
+#: gajim/data/gui/groupchat_creation.ui:58
+msgid "<b>Public:</b> Anyone who knows the address can join."
+msgstr ""
 
-#: gajim/data/gui/manage_bookmarks_window.ui:160
+#: gajim/data/gui/groupchat_creation.ui:122
 #, fuzzy
-msgid "_Server"
-msgstr "_Servidor:"
+msgid "_Description"
+msgstr "Descrición"
 
-#: gajim/data/gui/manage_bookmarks_window.ui:223
-msgid "Roo_m"
+#: gajim/data/gui/groupchat_creation.ui:164
+msgid "_Public"
 msgstr ""
 
-#: gajim/data/gui/manage_bookmarks_window.ui:253
-#, fuzzy
-msgid "_Password"
-msgstr "C_ontrasinal:"
-
-#: gajim/data/gui/manage_bookmarks_window.ui:299
+#: gajim/data/gui/groupchat_creation.ui:278
 #, fuzzy
-msgid "Join chat when connected"
-msgstr "Contacto desconectado"
-
-#: gajim/data/gui/manage_bookmarks_window.ui:307
-msgid "_Join Automatically"
-msgstr ""
+msgid "_Account"
+msgstr "Contas"
 
 #: gajim/data/gui/exception_dialog.ui:49
 msgid "Sorry, that should not have happened"
@@ -8099,6 +8240,29 @@ msgstr "Autorizar o contacto para que poida saber cando estou conectado"
 msgid "Presets"
 msgstr "_Presenza"
 
+#: gajim/data/gui/groupchat_info_scrolled.ui:32
+#, fuzzy
+msgid "Address"
+msgstr "_Enderezo:"
+
+#: gajim/data/gui/groupchat_info_scrolled.ui:64
+msgid "Topic"
+msgstr ""
+
+#: gajim/data/gui/groupchat_info_scrolled.ui:80
+#, fuzzy
+msgid "Author"
+msgstr "Au_torizar"
+
+#: gajim/data/gui/groupchat_info_scrolled.ui:182
+msgid "Discussion Logs"
+msgstr ""
+
+#: gajim/data/gui/groupchat_info_scrolled.ui:260
+#, fuzzy
+msgid "Group Chat Language"
+msgstr "Convite a grupo de charla"
+
 #: gajim/data/gui/emoji_chooser.ui:98
 msgid "No Results Found"
 msgstr ""
@@ -8110,24 +8274,34 @@ msgstr ""
 #: gajim/data/gui/chat_to_muc_window.ui:39
 #, fuzzy
 msgid ""
-"You are now entering a groupchat.\n"
+"You are now entering a group chat.\n"
 "Select the contacts you want to invite"
 msgstr "JID do contacto co que quere conversar"
 
 #: gajim/data/gui/chat_to_muc_window.ui:112
-msgid "Please select a MUC server."
-msgstr ""
+#, fuzzy
+msgid "Please select a group chat server."
+msgstr "Isto non é un grupo de charla"
 
 #: gajim/data/gui/chat_to_muc_window.ui:141
 #, fuzzy
-msgid "MUC server"
-msgstr "Observadores"
+msgid "Group chat server"
+msgstr "Grupos de charla"
 
 #: gajim/data/gui/chat_to_muc_window.ui:176
 #, fuzzy
 msgid "In_vite"
 msgstr "Con_vidar"
 
+#: gajim/data/gui/bookmarks.ui:176
+#, fuzzy
+msgid "Autojoin"
+msgstr "Autoconectar"
+
+#: gajim/data/gui/bookmarks.ui:211
+msgid "_Apply"
+msgstr ""
+
 #: gajim/data/gui/history_manager.ui:11
 #, fuzzy
 msgid "_Export"
@@ -8144,11 +8318,11 @@ msgstr "Xestor do Historial de Gajim"
 
 #: gajim/data/gui/history_manager.ui:108
 msgid ""
-"This log manager is not intended for log viewing. If you are looking for "
-"such functionality, use the history window instead.\n"
+"This history manager is not intended for viewing chat history. If you are "
+"looking for such functionality, please use the history window instead.\n"
 "\n"
-"Use this program to delete or export logs. You can select logs from the left "
-"and/or search database from below."
+"You can use this program to delete or export history. Either select logs "
+"from the left or search the database."
 msgstr ""
 
 #: gajim/data/gui/history_manager.ui:124
@@ -8202,8 +8376,9 @@ msgid "Select an emoji"
 msgstr ""
 
 #: gajim/data/gui/shortcuts_window.ui:38
-msgid "Complete a command or a nick"
-msgstr ""
+#, fuzzy
+msgid "Complete a command or a nickname"
+msgstr "Crear unha publicación nova"
 
 #: gajim/data/gui/shortcuts_window.ui:45
 #, fuzzy
@@ -8243,7 +8418,7 @@ msgstr ""
 msgid "Scroll down"
 msgstr ""
 
-#: gajim/data/gui/shortcuts_window.ui:100 gajim/gtk/xml_console.py:72
+#: gajim/data/gui/shortcuts_window.ui:100 gajim/gtk/xml_console.py:69
 #, fuzzy
 msgid "Clear"
 msgstr "Serán"
@@ -8285,8 +8460,9 @@ msgid "Close chat"
 msgstr ""
 
 #: gajim/data/gui/shortcuts_window.ui:173
-msgid "Roster Shortcuts"
-msgstr ""
+#, fuzzy
+msgid "Contact List Shortcuts"
+msgstr "Contacto desconectado"
 
 #: gajim/data/gui/shortcuts_window.ui:196
 #, fuzzy
@@ -8319,7 +8495,7 @@ msgid "Show only active contacts"
 msgstr "Amosar os contactos desconectados"
 
 #: gajim/data/gui/shortcuts_window.ui:251
-msgid "Enable roster filtering"
+msgid "Enable contact list filtering"
 msgstr ""
 
 #: gajim/data/gui/shortcuts_window.ui:259
@@ -8365,12 +8541,12 @@ msgid "Search selected day only"
 msgstr ""
 
 #: gajim/data/gui/history_window.ui:317
-msgid "Record history for this chat"
+msgid "Store history for this chat"
 msgstr ""
 
 #: gajim/data/gui/history_window.ui:332
 #, fuzzy
-msgid "Record History"
+msgid "Store History"
 msgstr "Recentemente:"
 
 #: gajim/data/gui/history_window.ui:350
@@ -8391,9 +8567,10 @@ msgstr "Crear unha publicación nova"
 msgid "Fill in the form."
 msgstr "Cubrir o formulario."
 
-#: gajim/data/gui/data_form_window.ui:229
-msgid "Room Configuration"
-msgstr "Configuración da sala"
+#: gajim/data/gui/data_form_window.ui:229 gajim/gtk/groupchat_config.py:41
+#, fuzzy
+msgid "Group Chat Configuration"
+msgstr "Convite a grupo de charla"
 
 #: gajim/data/gui/roster_item_exchange_window.ui:39
 #: gajim/gtk/roster_item_exchange.py:35
@@ -8415,15 +8592,15 @@ msgstr "Es_tado"
 msgid "_Start Chat..."
 msgstr "_Iniciar a charla"
 
-#: gajim/data/gui/systray_context_menu.ui:50
+#: gajim/data/gui/systray_context_menu.ui:43
 msgid "Show All Pending _Events"
 msgstr "Amosar todos os _eventos pendentes"
 
-#: gajim/data/gui/systray_context_menu.ui:59
+#: gajim/data/gui/systray_context_menu.ui:52
 msgid "Mute Sounds"
 msgstr "Sen sons"
 
-#: gajim/data/gui/systray_context_menu.ui:75
+#: gajim/data/gui/systray_context_menu.ui:68
 #, fuzzy
 msgid "_Preferences"
 msgstr "Preferencias"
@@ -8516,34 +8693,34 @@ msgstr ""
 msgid "Execute expression inside a shell, send output"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:45
+#: gajim/command_system/implementation/standard.py:47
 msgid ""
 "Show help on a given command or a list of available commands if -a is given"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:73
+#: gajim/command_system/implementation/standard.py:75
 #, fuzzy
 msgid "Send a message to the contact"
 msgstr "Uso: /%s, oculta os botóns de charla."
 
-#: gajim/command_system/implementation/standard.py:78
+#: gajim/command_system/implementation/standard.py:80
 msgid "Send action (in the third person) to the current chat"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:83
+#: gajim/command_system/implementation/standard.py:85
 msgid "Show logged messages which mention given text"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:88
+#: gajim/command_system/implementation/standard.py:90
 #, fuzzy, python-format
 msgid "%s: Nothing found"
 msgstr "Non se encontrou %s"
 
-#: gajim/command_system/implementation/standard.py:94
+#: gajim/command_system/implementation/standard.py:96
 msgid "Limit must be an integer"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:118
+#: gajim/command_system/implementation/standard.py:120
 msgid ""
 "\n"
 "    Set the current status\n"
@@ -8553,131 +8730,131 @@ msgid ""
 "    "
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:136
+#: gajim/command_system/implementation/standard.py:138
 msgid "Set the current status to away"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:150
+#: gajim/command_system/implementation/standard.py:152
 msgid "Set the current status to online"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:153
+#: gajim/command_system/implementation/standard.py:155
 #, fuzzy
 msgid "Available"
 msgstr "En liñ_a"
 
-#: gajim/command_system/implementation/standard.py:173
-#: gajim/command_system/implementation/standard.py:250
+#: gajim/command_system/implementation/standard.py:175
+#: gajim/command_system/implementation/standard.py:252
 #, fuzzy
 msgid "Clear the text window"
 msgstr "Uso: /%s, limpa o texto da fiestra."
 
-#: gajim/command_system/implementation/standard.py:178
-#: gajim/command_system/implementation/standard.py:397
+#: gajim/command_system/implementation/standard.py:180
+#: gajim/command_system/implementation/standard.py:401
 #, fuzzy
 msgid "Send a ping to the contact"
 msgstr "Enviarlle un ficheiro a un contacto"
 
-#: gajim/command_system/implementation/standard.py:181
-#: gajim/command_system/implementation/standard.py:400
+#: gajim/command_system/implementation/standard.py:183
+#: gajim/command_system/implementation/standard.py:404
 msgid "Command is not supported for zeroconf accounts"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:185
-msgid "Send DTMF sequence through an open audio session"
+#: gajim/command_system/implementation/standard.py:187
+msgid "Send DTMF sequence through an open voice chat"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:188
+#: gajim/command_system/implementation/standard.py:190
 #, fuzzy
-msgid "No open audio sessions with the contact"
+msgid "No open voice chats with the contact"
 msgstr "Prema aquí para ver as charlas anteriores con este contacto"
 
-#: gajim/command_system/implementation/standard.py:191
+#: gajim/command_system/implementation/standard.py:193
 #, python-format
 msgid "%s is not a valid tone"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:198
-msgid "Toggle audio session"
+#: gajim/command_system/implementation/standard.py:200
+msgid "Toggle Voice Chat"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:201
+#: gajim/command_system/implementation/standard.py:203
 #, fuzzy
-msgid "Audio sessions are not available"
-msgstr "Non está dispoñíbel ningunha conexión"
+msgid "Voice chats are not available"
+msgstr "Conexión non dispoñíbel"
 
-#: gajim/command_system/implementation/standard.py:208
-msgid "Toggle video session"
+#: gajim/command_system/implementation/standard.py:210
+msgid "Toggle Video Chat"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:211
+#: gajim/command_system/implementation/standard.py:213
 #, fuzzy
-msgid "Video sessions are not available"
+msgid "Video chats are not available"
 msgstr "Conexión non dispoñíbel"
 
-#: gajim/command_system/implementation/standard.py:218
+#: gajim/command_system/implementation/standard.py:220
 #, fuzzy
 msgid "Send a message to the contact that will attract their attention"
 msgstr "Uso: /%s, oculta os botóns de charla."
 
-#: gajim/command_system/implementation/standard.py:255
+#: gajim/command_system/implementation/standard.py:257
 #, fuzzy
 msgid "Change your nickname in a group chat"
 msgstr "Cambiar o _alcume"
 
-#: gajim/command_system/implementation/standard.py:260 gajim/gtk/dialogs.py:674
-#: gajim/gtk/bookmarks.py:272
+#: gajim/command_system/implementation/standard.py:262
 #, fuzzy
 msgid "Invalid nickname"
 msgstr "O nome de usuario non é válido"
 
-#: gajim/command_system/implementation/standard.py:267
+#: gajim/command_system/implementation/standard.py:269
 #, fuzzy
-msgid "Open a private chat window with a specified occupant"
+msgid "Open a private chat window with a specified participant"
 msgstr ""
 "Uso: /%s <alcume>, abre unha fiestra de charla co ocupante especificado."
 
-#: gajim/command_system/implementation/standard.py:273
-#: gajim/command_system/implementation/standard.py:282
-#: gajim/command_system/implementation/standard.py:332
-#: gajim/command_system/implementation/standard.py:345
-#: gajim/command_system/implementation/standard.py:357
+#: gajim/command_system/implementation/standard.py:275
+#: gajim/command_system/implementation/standard.py:284
+#: gajim/command_system/implementation/standard.py:336
+#: gajim/command_system/implementation/standard.py:349
+#: gajim/command_system/implementation/standard.py:361
 #, fuzzy
 msgid "Nickname not found"
 msgstr "Non se achou o alcume: %s"
 
-#: gajim/command_system/implementation/standard.py:276
+#: gajim/command_system/implementation/standard.py:278
 #, fuzzy
 msgid ""
-"Open a private chat window with a specified occupant and send him a message"
+"Open a private chat window with a specified participant and send him a "
+"message"
 msgstr ""
 "Uso: /%s <alcume>, abre unha fiestra de charla co ocupante especificado."
 
-#: gajim/command_system/implementation/standard.py:285
+#: gajim/command_system/implementation/standard.py:287
 #, fuzzy
 msgid "Display or change a group chat topic"
 msgstr "Preguntar antes de pechar unha fiestra/separador da sala de charla."
 
-#: gajim/command_system/implementation/standard.py:294
-msgid "Invite a user to a room for a reason"
+#: gajim/command_system/implementation/standard.py:296
+msgid "Invite a user to a group chat for a reason"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:297
+#: gajim/command_system/implementation/standard.py:299
 #, fuzzy, python-format
 msgid "Invited %(jid)s to %(room_jid)s"
 msgstr "%(contact_jid)s convidouse a %(room_jid)s."
 
-#: gajim/command_system/implementation/standard.py:301
+#: gajim/command_system/implementation/standard.py:303
 #, fuzzy
-msgid "Join a group chat given by a JID"
+msgid "Join a group chat given by an XMPP Address"
 msgstr "Entrar nun grupo de charla"
 
-#: gajim/command_system/implementation/standard.py:309
+#: gajim/command_system/implementation/standard.py:313
 msgid ""
-"Leave the groupchat, optionally giving a reason, and close tab or window"
+"Leave the group chat, optionally giving a reason, and close tab or window"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:314
+#: gajim/command_system/implementation/standard.py:318
 msgid ""
 "\n"
 "    Ban user by a nick or a JID from a groupchat\n"
@@ -8686,46 +8863,46 @@ msgid ""
 "    "
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:329
+#: gajim/command_system/implementation/standard.py:333
 #, fuzzy
-msgid "Kick user by a nick from a groupchat"
+msgid "Kick user by a nick from a group chat"
 msgstr "Está expulsado deste grupo de charla."
 
-#: gajim/command_system/implementation/standard.py:338
+#: gajim/command_system/implementation/standard.py:342
 msgid ""
-"Set occupant role in group chat.\n"
+"Set participant role in group chat.\n"
 "    Role can be given as one of the following values:\n"
 "    moderator, participant, visitor, none"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:343
+#: gajim/command_system/implementation/standard.py:347
 #, fuzzy
 msgid "Invalid role given"
 msgstr "O nome de usuario non é válido"
 
-#: gajim/command_system/implementation/standard.py:350
+#: gajim/command_system/implementation/standard.py:354
 msgid ""
-"Set occupant affiliation in group chat.\n"
+"Set participant affiliation in group chat.\n"
 "    Affiliation can be given as one of the following values:\n"
 "    owner, admin, member, outcast, none"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:355
+#: gajim/command_system/implementation/standard.py:359
 #, fuzzy
 msgid "Invalid affiliation given"
 msgstr "Afiliación:"
 
-#: gajim/command_system/implementation/standard.py:365
+#: gajim/command_system/implementation/standard.py:369
 #, fuzzy
-msgid "Display names of all group chat occupants"
+msgid "Display names of all group chat participants"
 msgstr "Uso: /%s , amosa os nomes dos ocupantes do grupo de charla."
 
-#: gajim/command_system/implementation/standard.py:387
-msgid "Forbid an occupant to send you public or private messages"
+#: gajim/command_system/implementation/standard.py:391
+msgid "Forbid a participant to send you public or private messages"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:392
-msgid "Allow an occupant to send you public or private messages"
+#: gajim/command_system/implementation/standard.py:396
+msgid "Allow a participant to send you public or private messages"
 msgstr ""
 
 #: gajim/command_system/implementation/middleware.py:74
@@ -8736,204 +8913,329 @@ msgstr ""
 msgid "The same as using a doc-string, except it supports translation"
 msgstr ""
 
-#: gajim/gtk/filetransfer.py:91
+#: gajim/gtk/groupchat_info.py:36
+#, fuzzy
+msgid "?Group chat feature:Archiving"
+msgstr "Convite a grupo de charla"
+
+#: gajim/gtk/groupchat_info.py:37
+#, fuzzy
+msgid "Messages are archived on the server"
+msgstr "Non está conectado ao servidor"
+
+#: gajim/gtk/groupchat_info.py:40
+#, fuzzy
+msgid "?Group chat feature:Persistent"
+msgstr "Grupos de charla"
+
+#: gajim/gtk/groupchat_info.py:41
+msgid "This group chat persists even if there are no participants"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:45
+#, fuzzy
+msgid "?Group chat feature:Temporary"
+msgstr "Ningún"
+
+#: gajim/gtk/groupchat_info.py:46
+msgid "This group chat will be destroyed once the last participant left"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:50
+#, fuzzy
+msgid "?Group chat feature:Moderated"
+msgstr "Ningún"
+
+#: gajim/gtk/groupchat_info.py:51
+msgid ""
+"Participants entering this group chat need to request permission to send "
+"messages"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:55
+#, fuzzy
+msgid "?Group chat feature:Not Moderated"
+msgstr "Grupos de charla"
+
+#: gajim/gtk/groupchat_info.py:56
+msgid "Participants entering this group chat are allowed to send messages"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:60
+#, fuzzy
+msgid "?Group chat feature:Open"
+msgstr "Ningún"
+
+#: gajim/gtk/groupchat_info.py:61
+#, fuzzy
+msgid "Anyone can join this group chat"
+msgstr "%s entrou no grupo de charla"
+
+#: gajim/gtk/groupchat_info.py:64
+#, fuzzy
+msgid "?Group chat feature:Members Only"
+msgstr "Remarcado da mensaxe de grupo de charla"
+
+#: gajim/gtk/groupchat_info.py:65
+msgid "This group chat is restricted to members only"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:69
+#, fuzzy
+msgid "?Group chat feature:Public"
+msgstr "Remarcado da mensaxe de grupo de charla"
+
+#: gajim/gtk/groupchat_info.py:70
+msgid "Group chat can be found via search"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:73
+#, fuzzy
+msgid "?Group chat feature:Hidden"
+msgstr "Ningún"
+
+#: gajim/gtk/groupchat_info.py:74
+#, 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:77
+#, fuzzy
+msgid "?Group chat feature:Not Anonymous"
+msgstr "Grupos de charla"
+
+#: gajim/gtk/groupchat_info.py:78
+msgid "All other group chat participants can see your XMPP address"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:82
+#, fuzzy
+msgid "?Group chat feature:Semi-Anonymous"
+msgstr "Remarcado da mensaxe de grupo de charla"
+
+#: gajim/gtk/groupchat_info.py:83
+msgid "Only moderators can see your XMPP address"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:86
+#, fuzzy
+msgid "?Group chat feature:Password Required"
+msgstr "Grupos de charla"
+
+#: gajim/gtk/groupchat_info.py:87
+msgid "This group chat does require a password upon entry"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:91
+#, fuzzy
+msgid "?Group chat feature:No Password Required"
+msgstr "Grupos de charla"
+
+#: gajim/gtk/groupchat_info.py:92
+msgid "This group chat does not require a password upon entry"
+msgstr ""
+
+#: gajim/gtk/filetransfer.py:90
 msgid "File"
 msgstr "Ficheiro"
 
-#: gajim/gtk/filetransfer.py:108
+#: gajim/gtk/filetransfer.py:107
 msgid "Time"
 msgstr "Hora"
 
-#: gajim/gtk/filetransfer.py:228
+#: gajim/gtk/filetransfer.py:227
 #, fuzzy, python-format
 msgid "File name: %s"
 msgstr "Nome do ficheiro: %s"
 
-#: gajim/gtk/filetransfer.py:229 gajim/gtk/filetransfer.py:464
+#: gajim/gtk/filetransfer.py:228 gajim/gtk/filetransfer.py:469
 #, python-format
 msgid "Size: %s"
 msgstr "Tamaño: %s"
 
-#: gajim/gtk/filetransfer.py:239
+#: gajim/gtk/filetransfer.py:238
 #, python-format
 msgid "Sender: %s"
 msgstr "Remitente: %s"
 
-#: gajim/gtk/filetransfer.py:240 gajim/gtk/filetransfer.py:744
+#: gajim/gtk/filetransfer.py:239 gajim/gtk/filetransfer.py:749
 #: gajim/gtk/tooltips.py:577
 msgid "Recipient: "
 msgstr "Destinatario: "
 
-#: gajim/gtk/filetransfer.py:251
+#: gajim/gtk/filetransfer.py:250
 #, python-format
 msgid "Saved in: %s"
 msgstr "Gardouse en: %s"
 
-#: gajim/gtk/filetransfer.py:256
+#: gajim/gtk/filetransfer.py:255
 msgid "File transfer completed"
 msgstr "Rematou a transferencia do ficheiro"
 
-#: gajim/gtk/filetransfer.py:276 gajim/gtk/filetransfer.py:285
+#: gajim/gtk/filetransfer.py:275 gajim/gtk/filetransfer.py:284
 #, fuzzy
 msgid "Connection with peer could not be established."
 msgstr "Non se puido estabelecer a conexión co cliente."
 
-#: gajim/gtk/filetransfer.py:293
+#: gajim/gtk/filetransfer.py:292
 #, python-format
 msgid "Filename: %s"
 msgstr "Nome do ficheiro: %s"
 
-#: gajim/gtk/filetransfer.py:294
+#: gajim/gtk/filetransfer.py:293
 #, python-format
 msgid "Recipient: %s"
 msgstr "Destinatario: %s"
 
-#: gajim/gtk/filetransfer.py:296
+#: gajim/gtk/filetransfer.py:295
 #, python-format
 msgid "Error message: %s"
 msgstr "Mensaxe de erro: %s"
 
-#: gajim/gtk/filetransfer.py:333
-#, fuzzy
-msgid "File transfer error"
-msgstr "Produciuse un erro na transferencia do ficheiro"
-
 #: gajim/gtk/filetransfer.py:334
 #, python-format
 msgid ""
-"The file %(file)s has been received, but it seems to have been damaged along "
-"the way.\n"
+"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 ""
 
-#: gajim/gtk/filetransfer.py:350
+#: gajim/gtk/filetransfer.py:340
+#, fuzzy
+msgid "_Download Again"
+msgstr "_Non me preguntar outra vez"
+
+#: gajim/gtk/filetransfer.py:355
 #, fuzzy
 msgid "Gajim can not read this file"
 msgstr "O Gajim non pode acceder a este ficheiro"
 
-#: gajim/gtk/filetransfer.py:351
+#: gajim/gtk/filetransfer.py:356
 msgid "Another process is using this file."
 msgstr ""
 
-#: gajim/gtk/filetransfer.py:418
+#: gajim/gtk/filetransfer.py:423
 #, fuzzy
 msgid "File Transfer Conflict"
 msgstr "Rematou a transferencia do ficheiro"
 
-#: gajim/gtk/filetransfer.py:419
+#: gajim/gtk/filetransfer.py:424
 msgid "This file already exists"
 msgstr "Este ficheiro xa existe"
 
-#: gajim/gtk/filetransfer.py:420
+#: gajim/gtk/filetransfer.py:425
 msgid "Resume download or replace file?"
 msgstr ""
 
-#: gajim/gtk/filetransfer.py:424
+#: gajim/gtk/filetransfer.py:429
 #, fuzzy
 msgid "Replace _File"
 msgstr "Serán"
 
-#: gajim/gtk/filetransfer.py:427
+#: gajim/gtk/filetransfer.py:432
 #, fuzzy
 msgid "Resume _Download"
 msgstr "Descarga"
 
-#: gajim/gtk/filetransfer.py:437
+#: gajim/gtk/filetransfer.py:442
 #, fuzzy, python-format
 msgid "Directory '%s' is not writable"
 msgstr "Non se pode escribir no directorio \"%s\""
 
-#: gajim/gtk/filetransfer.py:438
+#: gajim/gtk/filetransfer.py:443
 #, fuzzy
 msgid "You do not have permissions to create files in this directory."
 msgstr "Non ten autorización para crear ficheiros neste directorio."
 
-#: gajim/gtk/filetransfer.py:461
+#: gajim/gtk/filetransfer.py:466
 #, python-format
 msgid "File: %s"
 msgstr "Ficheiro: %s"
 
-#: gajim/gtk/filetransfer.py:467
+#: gajim/gtk/filetransfer.py:472
 #, python-format
 msgid "Type: %s"
 msgstr "Tipo: %s"
 
-#: gajim/gtk/filetransfer.py:469
+#: gajim/gtk/filetransfer.py:474
 #, python-format
 msgid "Description: %s"
 msgstr "Descrición: %s"
 
-#: gajim/gtk/filetransfer.py:480
+#: gajim/gtk/filetransfer.py:485
 #, fuzzy, python-format
 msgid "%s wants to send you a file"
 msgstr "%s quere enviarlle un ficheiro."
 
-#: gajim/gtk/filetransfer.py:509
+#: gajim/gtk/filetransfer.py:514
 #, fuzzy
 msgid "Checking file…"
 msgstr "A enviar o perfil..."
 
-#: gajim/gtk/filetransfer.py:524
+#: gajim/gtk/filetransfer.py:529
 #, fuzzy
 msgid "File error"
 msgstr "Produciuse un erro na transferencia do ficheiro"
 
-#: gajim/gtk/filetransfer.py:561
+#: gajim/gtk/filetransfer.py:566
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 
-#: gajim/gtk/filetransfer.py:658
+#: gajim/gtk/filetransfer.py:663
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/s)"
 
-#: gajim/gtk/filetransfer.py:711 gajim/gtk/filetransfer.py:715
+#: gajim/gtk/filetransfer.py:716 gajim/gtk/filetransfer.py:720
 msgid "Invalid File"
 msgstr "O ficheiro non é válido"
 
-#: gajim/gtk/filetransfer.py:711
+#: gajim/gtk/filetransfer.py:716
 msgid "File: "
 msgstr "Ficheiro: "
 
-#: gajim/gtk/filetransfer.py:716
+#: gajim/gtk/filetransfer.py:721
 msgid "It is not possible to send empty files"
 msgstr "Non se pode enviar ficheiros baleiros"
 
-#: gajim/gtk/filetransfer.py:742 gajim/gtk/tooltips.py:571
+#: gajim/gtk/filetransfer.py:747 gajim/gtk/tooltips.py:571
 msgid "Sender: "
 msgstr "Remitente: "
 
-#: gajim/gtk/filetransfer.py:1038
+#: gajim/gtk/filetransfer.py:1043
 #, fuzzy
 msgid "Choose a File to Send…"
 msgstr "Elixa un ficheiro para enviar..."
 
 #: gajim/gtk/start_chat.py:51
 #, fuzzy
-msgid "Start new Conversation"
+msgid "Start New Conversation"
 msgstr "Conexión"
 
-#: gajim/gtk/start_chat.py:424
-#, fuzzy
-msgid "New Groupchat"
-msgstr "Novo grupo de charla"
+#: gajim/gtk/start_chat.py:260 gajim/gtk/start_chat.py:328
+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:603 gajim/gtk/groupchat_join.py:38
+msgid "Join Group Chat"
+msgstr "Entrar nunha sala de charlas"
 
-#: gajim/gtk/start_chat.py:426
+#: gajim/gtk/start_chat.py:605 gajim/gtk/add_contact.py:40
 #, fuzzy
-msgid "New Contact"
-msgstr "Engadir un contacto novo"
+msgid "Add Contact"
+msgstr "_Engadir un contacto..."
 
-#: gajim/gtk/start_chat.py:588
+#: gajim/gtk/start_chat.py:746
 #, fuzzy, python-format
-msgid "%s Group chats found"
+msgid "%s group chats found"
 msgstr "Non se encontrou %s"
 
-#: gajim/gtk/discovery.py:70
+#: gajim/gtk/discovery.py:69
 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:71
+#: gajim/gtk/discovery.py:70
 #, fuzzy
 msgid ""
 "This service could not respond with detailed information.\n"
@@ -8942,32 +9244,33 @@ msgstr ""
 "Este servizo podería non responder con información detallada.\n"
 "Posibelmente é antigo ou está roto"
 
-#: gajim/gtk/discovery.py:128
+#: gajim/gtk/discovery.py:126
 msgid "Others"
 msgstr "Outros"
 
-#: gajim/gtk/discovery.py:131
-msgid "Conference"
-msgstr "Conferencia"
+#: gajim/gtk/discovery.py:129
+#, fuzzy
+msgid "Group Chat"
+msgstr "_Grupos de charla"
 
-#: gajim/gtk/discovery.py:519
+#: gajim/gtk/discovery.py:518
 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:606
+#: gajim/gtk/discovery.py:605
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Xestión de servizos coa conta %s"
 
-#: gajim/gtk/discovery.py:608
+#: gajim/gtk/discovery.py:607
 msgid "Service Discovery"
 msgstr "Xestión de servizos"
 
-#: gajim/gtk/discovery.py:691
+#: gajim/gtk/discovery.py:690
 msgid "The service could not be found"
 msgstr "O servizo non se achou"
 
-#: gajim/gtk/discovery.py:692
+#: gajim/gtk/discovery.py:691
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -8975,103 +9278,82 @@ msgstr ""
 "Non hai servizo neste enderezo ou non está a responder. Comprobe o enderezo "
 "e ténteo máis tarde."
 
-#: gajim/gtk/discovery.py:699 gajim/gtk/discovery.py:1042
+#: gajim/gtk/discovery.py:698 gajim/gtk/discovery.py:1041
 msgid "The service is not browsable"
 msgstr "O servizo non é navegábel"
 
-#: gajim/gtk/discovery.py:700
+#: gajim/gtk/discovery.py:699
 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:738 gajim/gtk/discovery.py:747
+#: gajim/gtk/discovery.py:737 gajim/gtk/discovery.py:746
 #, fuzzy
 msgid "Invalid Server Name"
 msgstr "O nome de usuario non é válido"
 
-#: gajim/gtk/discovery.py:806
+#: gajim/gtk/discovery.py:805
 #, fuzzy, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Navegar %s coa conta %s"
 
-#: gajim/gtk/discovery.py:851
+#: gajim/gtk/discovery.py:850
 #, fuzzy
 msgid "Browse"
 msgstr "_Navegar"
 
-#: gajim/gtk/discovery.py:1043
+#: gajim/gtk/discovery.py:1042
 msgid "This service does not contain any items to browse."
 msgstr "Este servizo non contén elementos para navegar."
 
-#: gajim/gtk/discovery.py:1255
+#: gajim/gtk/discovery.py:1254
 #, fuzzy
 msgid "_Command"
 msgstr "Comandos: %s"
 
-#: gajim/gtk/discovery.py:1264 gajim/gtk/discovery.py:1422
+#: gajim/gtk/discovery.py:1263 gajim/gtk/discovery.py:1420
 msgid "Re_gister"
 msgstr "_Subscribir"
 
-#: gajim/gtk/discovery.py:1277
+#: gajim/gtk/discovery.py:1276
 msgid "_Search"
 msgstr "_Buscar"
 
-#: gajim/gtk/discovery.py:1420
+#: gajim/gtk/discovery.py:1418
 msgid "_Edit"
 msgstr "_Editar"
 
-#: gajim/gtk/discovery.py:1458
+#: gajim/gtk/discovery.py:1456
 #, fuzzy, python-format
 msgid "Scanning %(current)d / %(total)d ..."
 msgstr "Escaneando %d / %d.."
 
-#: gajim/gtk/discovery.py:1674
+#: gajim/gtk/discovery.py:1655
+msgid "Users"
+msgstr "Usuarios"
+
+#: gajim/gtk/discovery.py:1671
 msgid "Id"
 msgstr "Id"
 
-#: gajim/gtk/discovery.py:1713
-msgid "_Join"
-msgstr "_Entrar"
-
-#: gajim/gtk/discovery.py:1736
-msgid "Bookmark already set"
-msgstr "O marcador xa se definiu"
-
-#: gajim/gtk/discovery.py:1737
-#, fuzzy, python-format
-msgid "Group Chat '%s' is already in your bookmarks."
-msgstr "A sala \"%s\" xa está nos seus marcadores."
-
-#: gajim/gtk/discovery.py:1748
-msgid "Bookmark has been added successfully"
-msgstr "O marcador engadiuse con éxito"
-
-#: gajim/gtk/discovery.py:1749
-#, fuzzy
-msgid ""
-"You can manage your bookmarks by clicking the Bookmarks menu item in your "
-"contact list."
-msgstr ""
-"Pode xestionar os seus marcadores mediante o menú Accións da súa listaxe"
-
-#: gajim/gtk/discovery.py:1950
+#: gajim/gtk/discovery.py:1900
 msgid "Subscribed"
 msgstr "Engadiuse"
 
-#: gajim/gtk/discovery.py:1959
+#: gajim/gtk/discovery.py:1909
 #, fuzzy
 msgid "Node"
 msgstr "Ningún"
 
-#: gajim/gtk/discovery.py:2028
+#: gajim/gtk/discovery.py:1978
 #, fuzzy
 msgid "_New post"
 msgstr "Publicación nova"
 
-#: gajim/gtk/discovery.py:2037
+#: gajim/gtk/discovery.py:1987
 msgid "_Subscribe"
 msgstr "_Engadir"
 
-#: gajim/gtk/discovery.py:2045
+#: gajim/gtk/discovery.py:1995
 msgid "_Unsubscribe"
 msgstr "_Eliminar"
 
@@ -9119,7 +9401,7 @@ msgstr "Estou %s"
 msgid "Characters typed: %s"
 msgstr "Alcume non permitido: %s"
 
-#: gajim/gtk/single_message.py:274 gajim/gtk/xml_console.py:169
+#: gajim/gtk/single_message.py:274 gajim/gtk/xml_console.py:166
 msgid "Connection not available"
 msgstr "Conexión non dispoñíbel"
 
@@ -9128,6 +9410,12 @@ msgstr "Conexión non dispoñíbel"
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Por favor, asegúrese de estar conectado con \"%s\"."
 
+#: gajim/gtk/single_message.py:306
+#, 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:330
 #, python-format
 msgid "RE: %s"
@@ -9138,28 +9426,28 @@ msgstr "RE: %s"
 msgid "%s wrote:\n"
 msgstr "%s escribiu:\n"
 
-#: gajim/gtk/pep_config.py:44
+#: gajim/gtk/pep_config.py:45
 #, fuzzy, python-format
 msgid "PEP Service Configuration (%s)"
 msgstr "Configuración da sala"
 
-#: gajim/gtk/pep_config.py:77
+#: gajim/gtk/pep_config.py:78
 #, fuzzy
 msgid "Service"
 msgstr "Servidor"
 
-#: gajim/gtk/pep_config.py:114
+#: gajim/gtk/pep_config.py:115
 msgid "PEP node was not removed"
 msgstr ""
 
-#: gajim/gtk/pep_config.py:115
+#: gajim/gtk/pep_config.py:116
 #, python-format
 msgid ""
 "PEP node %(node)s was not removed:\n"
 "%(message)s"
 msgstr ""
 
-#: gajim/gtk/pep_config.py:146
+#: gajim/gtk/pep_config.py:147
 #, fuzzy, python-format
 msgid "Configure %s"
 msgstr "_Continuar"
@@ -9175,17 +9463,22 @@ msgstr "_Rexistrar"
 msgid "Registration successful"
 msgstr "Rexistrar %s"
 
-#: gajim/gtk/dialogs.py:54 gajim/gtk/dataform.py:659 gajim/gtk/adhoc.py:85
+#: gajim/gtk/service_registration.py:215
+#, fuzzy
+msgid "Registration failed"
+msgstr "Fallou a conexión"
+
+#: gajim/gtk/dialogs.py:53 gajim/gtk/dataform.py:668 gajim/gtk/adhoc.py:86
 #, fuzzy
 msgid "Cancel"
 msgstr "_Cancelar"
 
-#: gajim/gtk/dialogs.py:129
+#: gajim/gtk/dialogs.py:128
 #, 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:130
+#: gajim/gtk/dialogs.py:129
 #, fuzzy, python-format
 msgid ""
 "You have to install the dictionary \"%s\" to use spellchecking, or choose "
@@ -9196,12 +9489,12 @@ 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:410 gajim/gtk/dialogs.py:425
+#: gajim/gtk/dialogs.py:322 gajim/gtk/dialogs.py:337
 #, fuzzy
 msgid "Insecure connection"
 msgstr "Conexión"
 
-#: gajim/gtk/dialogs.py:411
+#: gajim/gtk/dialogs.py:323
 #, fuzzy, python-format
 msgid ""
 "You are about to connect to the account %(account)s (%(server)s) insecurely. "
@@ -9210,121 +9503,115 @@ msgid ""
 "Are you sure you want to do that?"
 msgstr "Vai crear un metacontacto. Está seguro de que quere continuar?"
 
-#: gajim/gtk/dialogs.py:416
+#: gajim/gtk/dialogs.py:328
 msgid "Yes, I really want to connect insecurely"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:417
+#: gajim/gtk/dialogs.py:329
 msgid "Gajim will NOT connect unless you check this box"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:675
-#, fuzzy
-msgid "The nickname contains invalid characters."
-msgstr ""
-"A ID de Jabber para o grupo de charla contén caracteres que non se permiten."
-
-#: gajim/gtk/dialogs.py:734
+#: gajim/gtk/dialogs.py:561
 #, fuzzy, python-format
 msgid "Destroy %s"
 msgstr "Descrición: %s"
 
-#: gajim/gtk/dialogs.py:775
+#: gajim/gtk/dialogs.py:602
 #, fuzzy
 msgid "Certificate"
 msgstr "O nome de usuario non é válido"
 
-#: gajim/gtk/dialogs.py:786
+#: gajim/gtk/dialogs.py:613
 #, fuzzy, python-format
 msgid ""
 "Certificate for account\n"
 "%s"
 msgstr "para a conta %s"
 
-#: gajim/gtk/dialogs.py:824
+#: gajim/gtk/dialogs.py:651
 msgid "Issued to\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:825 gajim/gtk/dialogs.py:830
+#: gajim/gtk/dialogs.py:652 gajim/gtk/dialogs.py:657
 msgid "Common Name (CN): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:826 gajim/gtk/dialogs.py:831
+#: gajim/gtk/dialogs.py:653 gajim/gtk/dialogs.py:658
 msgid "Organization (O): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:827 gajim/gtk/dialogs.py:832
+#: gajim/gtk/dialogs.py:654 gajim/gtk/dialogs.py:659
 msgid "Organizational Unit (OU): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:828
+#: gajim/gtk/dialogs.py:655
 #, fuzzy
 msgid "Serial Number: "
 msgstr "Número de GG:"
 
-#: gajim/gtk/dialogs.py:829
+#: gajim/gtk/dialogs.py:656
 msgid "Issued by\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:833
+#: gajim/gtk/dialogs.py:660
 msgid "Validity\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:834
+#: gajim/gtk/dialogs.py:661
 msgid "Issued on: "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:835
+#: gajim/gtk/dialogs.py:662
 msgid "Expires on: "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:836
+#: gajim/gtk/dialogs.py:663
 msgid "SHA-1:"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:838
+#: gajim/gtk/dialogs.py:665
 msgid "SHA-256:"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:852
+#: gajim/gtk/dialogs.py:679
 #, fuzzy
 msgid "View certificate…"
 msgstr "O nome de usuario non é válido"
 
-#: gajim/gtk/dialogs.py:864 gajim/gtk/accounts.py:893
+#: gajim/gtk/dialogs.py:691 gajim/gtk/accounts.py:896
 msgid "Change Password"
 msgstr "Cambiar o contrasinal"
 
-#: gajim/gtk/dialogs.py:878
+#: gajim/gtk/dialogs.py:705
 msgid "_OK"
 msgstr "_Aceptar"
 
-#: gajim/gtk/dialogs.py:891
+#: gajim/gtk/dialogs.py:718
 #, fuzzy
 msgid "You must enter a password"
 msgstr "Debe introducir un contrasinal."
 
-#: gajim/gtk/dialogs.py:895
+#: gajim/gtk/dialogs.py:722
 msgid "Passwords do not match"
 msgstr "Os contrasinais non coinciden"
 
-#: gajim/gtk/dialogs.py:923
+#: gajim/gtk/dialogs.py:750
 #, fuzzy
 msgid "Group Chat Invitation "
 msgstr "Convite a grupo de charla"
 
-#: gajim/gtk/dialogs.py:948
+#: gajim/gtk/dialogs.py:775
 #, fuzzy, python-format
 msgid "<b>%s</b> has invited you to join a discussion"
 msgstr "%(contact_jid)s convidouno ao grupo de charla %(room_jid)s."
 
-#: gajim/gtk/dialogs.py:951
+#: gajim/gtk/dialogs.py:778
 #, 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:959
+#: gajim/gtk/dialogs.py:786
 #, python-format
 msgid "Comment: %s"
 msgstr "Comentario: %s"
@@ -9339,11 +9626,6 @@ msgstr "Número de GG:"
 msgid "ICQ Number"
 msgstr "Número de ICQ:"
 
-#: gajim/gtk/add_contact.py:40
-#, fuzzy
-msgid "Add Contact"
-msgstr "_Engadir un contacto..."
-
 #: gajim/gtk/add_contact.py:259
 #, fuzzy, python-format
 msgid "%s Missing"
@@ -9365,7 +9647,7 @@ msgstr "Esta ID de usuario non contén un recurso."
 
 #: gajim/gtk/add_contact.py:299
 #, fuzzy
-msgid "You cannot add yourself to your roster."
+msgid "You cannot add yourself to your contact list."
 msgstr "Gustaríame engadilo á miña listaxe de contactos"
 
 #: gajim/gtk/add_contact.py:304
@@ -9378,11 +9660,13 @@ msgid "Your account must be online to add new contacts."
 msgstr ""
 
 #: gajim/gtk/add_contact.py:321
-msgid "Contact already in roster"
+#, fuzzy
+msgid "Contact Already in Contact List"
 msgstr "O contacto xa está na listaxe"
 
 #: gajim/gtk/add_contact.py:322
-msgid "This contact is already listed in your roster."
+#, fuzzy
+msgid "This contact is already in your contact list."
 msgstr "Xa engadiu este contacto á súa listaxe."
 
 #: gajim/gtk/add_contact.py:379 gajim/gtk/add_contact.py:417
@@ -9423,14 +9707,14 @@ msgstr "Un contacto cambiou o seu estado"
 
 #: gajim/gtk/themes.py:52
 #, fuzzy
-msgid "MUC Tab New Directed Message"
+msgid "Group Chat Tab New Directed Message"
 msgstr ""
 "Mensaxes dirixidas\n"
 "ás salas"
 
 #: gajim/gtk/themes.py:56
 #, fuzzy
-msgid "MUC Tab New Message"
+msgid "Group Chat Tab New Message"
 msgstr "Mensaxe nova"
 
 #: gajim/gtk/themes.py:60
@@ -9646,13 +9930,13 @@ msgstr "Todos os ficheiros"
 msgid "Clear File"
 msgstr "Serán"
 
-#: gajim/gtk/settings.py:570
+#: gajim/gtk/settings.py:570 gajim/gtk/proxies.py:32
 #, fuzzy
 msgid "Manage Proxies"
 msgstr "Xestionar os perfís do proxy"
 
-#: gajim/gtk/settings.py:591 gajim/gtk/preferences.py:971
-#: gajim/gtk/preferences.py:984 gajim/gtk/preferences.py:988
+#: gajim/gtk/settings.py:591 gajim/gtk/preferences.py:968
+#: gajim/gtk/preferences.py:982 gajim/gtk/preferences.py:986
 #, fuzzy
 msgid "No Proxy"
 msgstr "Proxy"
@@ -9732,14 +10016,15 @@ msgid ""
 "        "
 msgstr ""
 
-#: gajim/gtk/about.py:47 data/org.gajim.Gajim.appdata.xml.in:10
+#: gajim/gtk/about.py:47 data/org.gajim.Gajim.desktop.in:6
+#: data/org.gajim.Gajim.appdata.xml.in:10
 #, fuzzy
-msgid "A GTK+ XMPP client"
+msgid "A GTK XMPP client"
 msgstr "Un cliente de Jabber de GTK"
 
 #: gajim/gtk/about.py:48
 #, fuzzy, python-format
-msgid "GTK+ Version: %s"
+msgid "GTK Version: %s"
 msgstr "Versión de GTK+:"
 
 #: gajim/gtk/about.py:49
@@ -9921,6 +10206,25 @@ msgstr "Pausada"
 msgid "?transfer status:Not started"
 msgstr "Pausada"
 
+#: gajim/gtk/groupchat_creation.py:97 gajim/gtk/groupchat_creation.py:99
+msgid " (optional)..."
+msgstr ""
+
+#: gajim/gtk/groupchat_creation.py:134
+#, fuzzy
+msgid "Invalid Address"
+msgstr "O ficheiro non é válido"
+
+#: gajim/gtk/groupchat_creation.py:182
+#, fuzzy
+msgid "Not Connected"
+msgstr "Conexión"
+
+#: gajim/gtk/groupchat_creation.py:183
+#, fuzzy
+msgid "You have to be connected to create a group chat."
+msgstr "%s entrou no grupo de charla"
+
 #: gajim/gtk/sounds.py:39
 msgid "Wav Sounds"
 msgstr "Sons Wav"
@@ -9964,50 +10268,45 @@ 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:226 gajim/gtk/dataform.py:262
+#: gajim/gtk/dataform.py:232 gajim/gtk/dataform.py:268
 #, fuzzy
 msgid "Required"
 msgstr "É necesario o contrasinal"
 
-#: gajim/gtk/dataform.py:286
+#: gajim/gtk/dataform.py:293
 msgid "Yes"
 msgstr ""
 
-#: gajim/gtk/dataform.py:286
+#: gajim/gtk/dataform.py:293
 #, fuzzy
 msgid "No"
 msgstr "Ningún"
 
-#: gajim/gtk/dataform.py:661
+#: gajim/gtk/dataform.py:670
 msgid "Submit"
 msgstr ""
 
-#: gajim/gtk/statusicon.py:213
+#: gajim/gtk/statusicon.py:206
 #, fuzzy
 msgid "_Change Status Message…"
 msgstr "_Cambiar a mensaxe de estado"
 
-#: gajim/gtk/statusicon.py:247 gajim/gtk/statusicon.py:292
-#: gajim/gtk/statusicon.py:299
+#: gajim/gtk/statusicon.py:258
 #, python-format
 msgid "using account %s"
 msgstr "a usar a conta %s"
 
-#: gajim/gtk/statusicon.py:309
+#: gajim/gtk/statusicon.py:269
 #, fuzzy
-msgid "_Manage Bookmarks…"
-msgstr "Xestionar os marcadores"
+msgid "Hide _Contact List"
+msgstr "Contactos"
 
-#: gajim/gtk/statusicon.py:325
+#: gajim/gtk/statusicon.py:273
 #, fuzzy
-msgid "Hide _Roster"
-msgstr "Non está na listaxe"
-
-#: gajim/gtk/statusicon.py:329
-msgid "Show _Roster"
-msgstr "Amosar _listaxe"
+msgid "Show _Contact List"
+msgstr "Amosar os contactos desconectados"
 
-#: gajim/gtk/statusicon.py:337
+#: gajim/gtk/statusicon.py:281
 msgid "Hide this menu"
 msgstr "Ocultar este menú"
 
@@ -10056,37 +10355,6 @@ msgstr ""
 "Produciuse un erro mentres se publicaba a súa información persoal, probe de "
 "novo máis tarde."
 
-#: gajim/gtk/join_groupchat.py:202
-#, fuzzy
-msgid "Invalid Room"
-msgstr "A entrada non é válida"
-
-#: gajim/gtk/join_groupchat.py:203
-msgid "Please choose a room"
-msgstr ""
-
-#: gajim/gtk/join_groupchat.py:222 gajim/gtk/join_groupchat.py:229
-#, fuzzy
-msgid "Invalid Nickname"
-msgstr "O nome de usuario non é válido"
-
-#: gajim/gtk/join_groupchat.py:223
-#, fuzzy
-msgid "Please choose a nickname"
-msgstr "Crear unha publicación nova"
-
-#: gajim/gtk/join_groupchat.py:282 gajim/gtk/join_groupchat.py:288
-#: gajim/gtk/join_groupchat.py:293
-#, fuzzy
-msgid "Wrong server"
-msgstr "Host errado"
-
-#: gajim/gtk/join_groupchat.py:283 gajim/gtk/join_groupchat.py:289
-#: gajim/gtk/join_groupchat.py:294
-#, fuzzy, python-format
-msgid "%s is not a groupchat server"
-msgstr "Isto non é un grupo de charla"
-
 #: gajim/gtk/mam_preferences.py:38
 #, python-format
 msgid "Archiving Preferences for %s"
@@ -10117,48 +10385,55 @@ msgstr "Recibiu unha entrada nova:"
 msgid "Archiving Preferences Error"
 msgstr "_Preferencias"
 
-#: gajim/gtk/advanced_config.py:81
+#: gajim/gtk/advanced_config.py:95
 #, fuzzy
 msgid "Activated"
 msgstr "Activo"
 
-#: gajim/gtk/advanced_config.py:81
+#: gajim/gtk/advanced_config.py:95
 #, fuzzy
 msgid "Deactivated"
 msgstr "Inactivo"
 
-#: gajim/gtk/advanced_config.py:83
-msgid "Boolean"
+#: gajim/gtk/advanced_config.py:97
+msgid "?config type:Boolean"
 msgstr ""
 
-#: gajim/gtk/advanced_config.py:84
-#, fuzzy
-msgid "Integer"
-msgstr "No grupo"
+#: gajim/gtk/advanced_config.py:98
+msgid "?config type:Integer"
+msgstr ""
 
-#: gajim/gtk/advanced_config.py:85
-msgid "Text"
+#: gajim/gtk/advanced_config.py:99
+msgid "?config type:Text"
 msgstr ""
 
-#: gajim/gtk/advanced_config.py:97
-msgid "Preference Name"
+#: gajim/gtk/advanced_config.py:100
+msgid "?config type:Color"
+msgstr ""
+
+#: gajim/gtk/advanced_config.py:112
+#, fuzzy
+msgid "?config:Preference Name"
 msgstr "Nome da opción"
 
-#: gajim/gtk/advanced_config.py:104
-msgid "Value"
-msgstr "Valor"
+#: gajim/gtk/advanced_config.py:123
+#, fuzzy
+msgid "?config:Value"
+msgstr "_Continuar"
 
-#: gajim/gtk/advanced_config.py:113
-msgid "Type"
-msgstr "Tipo"
+#: gajim/gtk/advanced_config.py:132
+msgid "?config:Type"
+msgstr ""
 
-#: gajim/gtk/advanced_config.py:168
-msgid "(None)"
-msgstr "(Ningún)"
+#: gajim/gtk/advanced_config.py:187
+#, fuzzy
+msgid "?config description:None"
+msgstr "Ningunha"
 
-#: gajim/gtk/advanced_config.py:299
-msgid "Hidden"
-msgstr "Oculta"
+#: gajim/gtk/advanced_config.py:322
+#, fuzzy
+msgid "?password:Hidden"
+msgstr "Contrasinal: "
 
 #: gajim/gtk/server_info.py:66
 #, fuzzy
@@ -10170,8 +10445,8 @@ msgstr "_Copiar o enderezo da ligazón"
 msgid "%(days)s days, %(hours)s hours"
 msgstr ""
 
-#: gajim/gtk/server_info.py:218 gajim/gtk/accounts.py:749
-#: gajim/gtk/accounts.py:853
+#: gajim/gtk/server_info.py:218 gajim/gtk/accounts.py:752
+#: gajim/gtk/accounts.py:856
 #, fuzzy
 msgid "Hostname"
 msgstr "Nome do host:"
@@ -10349,11 +10624,6 @@ 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_config.py:41
-#, fuzzy
-msgid "Group Chat Configuration"
-msgstr "Convite a grupo de charla"
-
 #: gajim/gtk/groupchat_config.py:134
 #, fuzzy
 msgid "A Group Chat needs at least one Owner"
@@ -10364,68 +10634,68 @@ msgid "You are not allowed to modify the affiliation of Admins and Owners"
 msgstr ""
 
 #: gajim/gtk/groupchat_config.py:399
-msgid "An entry with this Jabber-ID already exists"
+msgid "An entry with this XMPP Address already exists"
 msgstr ""
 
-#: gajim/gtk/adhoc.py:91
+#: gajim/gtk/adhoc.py:92
 #, fuzzy
 msgid "Finish"
 msgstr "_Rematar"
 
-#: gajim/gtk/adhoc.py:97 gajim/gtk/adhoc.py:283
+#: gajim/gtk/adhoc.py:98 gajim/gtk/adhoc.py:284
 #, fuzzy
 msgid "Commands"
 msgstr "Comandos: %s"
 
-#: gajim/gtk/adhoc.py:103
+#: gajim/gtk/adhoc.py:104
 msgid "Next"
 msgstr ""
 
-#: gajim/gtk/adhoc.py:109
+#: gajim/gtk/adhoc.py:110
 msgid "Previous"
 msgstr ""
 
-#: gajim/gtk/adhoc.py:115
+#: gajim/gtk/adhoc.py:116
 #, fuzzy
 msgid "Execute"
 msgstr "Executar o _comando..."
 
-#: gajim/gtk/adhoc.py:195
+#: gajim/gtk/adhoc.py:196
 #, fuzzy
 msgid "No commands available"
 msgstr "A conta non está dispoñíbel"
 
-#: gajim/gtk/adhoc.py:244
+#: gajim/gtk/adhoc.py:245
 #, fuzzy
 msgid "Request Command List"
 msgstr "Executar o _comando..."
 
-#: gajim/gtk/adhoc.py:259
+#: gajim/gtk/adhoc.py:260
 #, fuzzy
 msgid "Executing…"
 msgstr "Executar o _comando..."
 
-#: gajim/gtk/adhoc.py:266
+#: gajim/gtk/adhoc.py:267
 #, fuzzy
 msgid "Command List"
 msgstr "Comandos: %s"
 
-#: gajim/gtk/adhoc.py:384
+#: gajim/gtk/adhoc.py:385
 #, fuzzy
 msgid "Finished"
 msgstr "_Rematar"
 
-#: gajim/gtk/adhoc.py:453
+#: gajim/gtk/adhoc.py:454
 #, fuzzy
 msgid "Execution failed"
 msgstr "Fallou a conexión"
 
-#: gajim/gtk/blocking.py:37
+#: gajim/gtk/blocking.py:38
 #, fuzzy, python-format
 msgid "Blocking List for %s"
 msgstr "Listaxe de privacidade para %s"
 
-#: gajim/gtk/blocking.py:71
+#: gajim/gtk/blocking.py:72
 #, fuzzy
 msgid "Error!"
 msgstr "Erro de Avahi"
@@ -10475,8 +10745,7 @@ msgstr "O nome de usuario non é válido"
 msgid "You must provide a username to configure this account."
 msgstr "Debe pórlle un nome para configurar esta conta."
 
-#: gajim/gtk/account_wizard.py:252 gajim/gtk/bookmarks.py:290
-#: gajim/gtk/bookmarks.py:303
+#: gajim/gtk/account_wizard.py:252
 #, fuzzy
 msgid "Invalid server"
 msgstr "O nome de usuario non é válido"
@@ -10494,7 +10763,7 @@ msgstr "A entrada non é válida"
 msgid "Custom port must be a port number."
 msgstr "O porto personalizado debe ser un número de porto"
 
-#: gajim/gtk/account_wizard.py:405
+#: gajim/gtk/account_wizard.py:406
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -10504,16 +10773,16 @@ msgid ""
 "Do you still want to connect to this server?"
 msgstr ""
 
-#: gajim/gtk/account_wizard.py:446 gajim/gtk/account_wizard.py:480
+#: gajim/gtk/account_wizard.py:447 gajim/gtk/account_wizard.py:481
 #, fuzzy
 msgid "An error occurred during account creation"
 msgstr "Produciuse un erro durante a creación da conta"
 
-#: gajim/gtk/account_wizard.py:545
+#: gajim/gtk/account_wizard.py:546
 msgid "Account name is in use"
 msgstr "O nome da conta está en uso"
 
-#: gajim/gtk/account_wizard.py:546
+#: gajim/gtk/account_wizard.py:547
 msgid "You already have an account using this name."
 msgstr "Xa ten unha conta en que emprega este nome"
 
@@ -10540,26 +10809,26 @@ msgstr "Detívose a transferencia do ficheiro %(filename)s de %(name)s."
 msgid "%(minutes)s min %(seconds)s sec"
 msgstr ""
 
-#: gajim/gtk/xml_console.py:77
+#: gajim/gtk/xml_console.py:74
 #, fuzzy
 msgid "Filter"
 msgstr "Filtro:"
 
-#: gajim/gtk/xml_console.py:82
+#: gajim/gtk/xml_console.py:79
 #, fuzzy
 msgid "XML Input"
 msgstr "<b>Entrada de XML</b>"
 
-#: gajim/gtk/xml_console.py:86
+#: gajim/gtk/xml_console.py:83
 msgid "Paste Last Input"
 msgstr ""
 
-#: gajim/gtk/xml_console.py:170
+#: gajim/gtk/xml_console.py:167
 #, fuzzy, python-format
 msgid "Please make sure you are connected with '%s'."
 msgstr "Por favor, asegúrese de estar conectado con \"%s\"."
 
-#: gajim/gtk/xml_console.py:182
+#: gajim/gtk/xml_console.py:177
 #, fuzzy
 msgid "Invalid Node"
 msgstr "O ficheiro non é válido"
@@ -10592,308 +10861,318 @@ msgstr "Buscar"
 msgid "No results found"
 msgstr "Non se encontrou %s"
 
-#: gajim/gtk/preferences.py:358 gajim/gtk/preferences.py:362
+#: gajim/gtk/preferences.py:357 gajim/gtk/preferences.py:361
 msgid "Default"
 msgstr "Por defecto"
 
-#: gajim/gtk/preferences.py:801
+#: gajim/gtk/preferences.py:798
 msgid "status message title"
 msgstr "título da mensaxe de estado"
 
-#: gajim/gtk/preferences.py:802
+#: gajim/gtk/preferences.py:799
 msgid "status message text"
 msgstr "texto da mensaxe de estado"
 
+#: gajim/gtk/accounts.py:137
+#, fuzzy
+msgid "Re-Login"
+msgstr "Quere reconectarse agora?"
+
 #: gajim/gtk/accounts.py:138
-msgid "Relogin now?"
+#, fuzzy
+msgid "Re-Login now?"
 msgstr "Quere reconectarse agora?"
 
 #: gajim/gtk/accounts.py:139
-msgid "If you want all the changes to apply instantly, you must relogin."
+#, 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:191 gajim/gtk/accounts.py:975
+#: gajim/gtk/accounts.py:141
+msgid "_Later"
+msgstr ""
+
+#: gajim/gtk/accounts.py:143
+msgid "_Re-Login"
+msgstr ""
+
+#: gajim/gtk/accounts.py:194 gajim/gtk/accounts.py:978
 #, fuzzy
 msgid "Remove Account"
 msgstr "A eliminar a conta %s"
 
-#: gajim/gtk/accounts.py:192
+#: gajim/gtk/accounts.py:195
 #, fuzzy, python-format
 msgid "You still have open chats in your account %s"
 msgstr "Comezou unha charla coa conta %s"
 
-#: gajim/gtk/accounts.py:193
+#: gajim/gtk/accounts.py:196
 #, fuzzy
 msgid ""
 "All chat and group chat windows will be closed.\n"
 "Do you want to continue?"
 msgstr "Todas as charlas e os grupos de charlas pecharanse. Desexa continuar?"
 
-#: gajim/gtk/accounts.py:424
+#: gajim/gtk/accounts.py:427
 #, fuzzy
 msgid "Back"
 msgstr "Volvo axiña"
 
-#: gajim/gtk/accounts.py:530
+#: gajim/gtk/accounts.py:533
 #, fuzzy
 msgid "Please check if Bonjour is installed."
 msgstr "Por favor, comprobe se o Avahi está instalado."
 
-#: gajim/gtk/accounts.py:532
+#: gajim/gtk/accounts.py:535
 #, fuzzy
 msgid "Please check if Avahi is installed."
 msgstr "Por favor, comprobe se o Avahi está instalado."
 
-#: gajim/gtk/accounts.py:569
+#: gajim/gtk/accounts.py:572
 #, fuzzy
 msgid "Disable Account"
 msgstr "O nome da conta non é válido"
 
-#: gajim/gtk/accounts.py:570
+#: gajim/gtk/accounts.py:573
 #, fuzzy, python-format
 msgid "Account %s is still connected"
 msgstr "A conta \"%s\" está conectada ao servidor"
 
-#: gajim/gtk/accounts.py:571
+#: gajim/gtk/accounts.py:574
 #, fuzzy
 msgid ""
 "All chat and group chat windows will be closed. Do you want to continue?"
 msgstr "Todas as charlas e os grupos de charlas pecharanse. Desexa continuar?"
 
-#: gajim/gtk/accounts.py:576
+#: gajim/gtk/accounts.py:579
 #, fuzzy
 msgid "_Disable Account"
 msgstr "O nome da conta non é válido"
 
-#: gajim/gtk/accounts.py:595
+#: gajim/gtk/accounts.py:598
 #, fuzzy
 msgid "Add Account"
 msgstr "_Engadir un contacto..."
 
-#: gajim/gtk/accounts.py:663
+#: gajim/gtk/accounts.py:666
 msgid "Label"
 msgstr ""
 
-#: gajim/gtk/accounts.py:667
+#: gajim/gtk/accounts.py:670
 msgid "Login"
 msgstr ""
 
-#: gajim/gtk/accounts.py:670
+#: gajim/gtk/accounts.py:673
 #, fuzzy
 msgid "Import Contacts"
 msgstr "Contactos"
 
-#: gajim/gtk/accounts.py:674 gajim/gtk/accounts.py:870
+#: gajim/gtk/accounts.py:677 gajim/gtk/accounts.py:873
 #, fuzzy
 msgid "Client Certificate"
 msgstr "O nome de usuario non é válido"
 
-#: gajim/gtk/accounts.py:677 gajim/gtk/accounts.py:774
+#: gajim/gtk/accounts.py:680 gajim/gtk/accounts.py:777
 #, fuzzy
 msgid "Connect on startup"
 msgstr "C_onectar ao inicio de Gajim"
 
-#: gajim/gtk/accounts.py:681 gajim/gtk/accounts.py:779
+#: gajim/gtk/accounts.py:684 gajim/gtk/accounts.py:782
 #, fuzzy
 msgid "Save conversations for all contacts"
 msgstr "Gravar as conversas para todos os contactos"
 
-#: gajim/gtk/accounts.py:683 gajim/gtk/accounts.py:781
+#: gajim/gtk/accounts.py:686 gajim/gtk/accounts.py:784
 msgid "Store conversations on the harddrive"
 msgstr ""
 
-#: gajim/gtk/accounts.py:685 gajim/gtk/accounts.py:783
+#: gajim/gtk/accounts.py:688 gajim/gtk/accounts.py:786
 #, fuzzy
 msgid "Global Status"
 msgstr "Todos os estados"
 
-#: gajim/gtk/accounts.py:687
+#: gajim/gtk/accounts.py:690
 #, fuzzy
 msgid "Synchronise the status of all accounts"
 msgstr "Cambia o estado dunha ou de varias contas"
 
-#: gajim/gtk/accounts.py:689
+#: gajim/gtk/accounts.py:692
 msgid "Use file transfer proxies"
 msgstr "Usar proxies para as transferencias de ficheiros"
 
-#: gajim/gtk/accounts.py:705
+#: gajim/gtk/accounts.py:708
 #, fuzzy
 msgid "Idle Time"
 msgstr " desde %s"
 
-#: gajim/gtk/accounts.py:707
+#: gajim/gtk/accounts.py:710
 msgid "Disclose the time of your last activity"
 msgstr ""
 
-#: gajim/gtk/accounts.py:709
+#: gajim/gtk/accounts.py:712
 msgid "Local System Time"
 msgstr ""
 
-#: gajim/gtk/accounts.py:711
+#: gajim/gtk/accounts.py:714
 msgid "Disclose the local system time of the device Gajim runs on"
 msgstr ""
 
-#: gajim/gtk/accounts.py:714
+#: gajim/gtk/accounts.py:717
 #, fuzzy
 msgid "Client / Operating System"
 msgstr "O nome de usuario non é válido"
 
-#: gajim/gtk/accounts.py:716
+#: gajim/gtk/accounts.py:719
 #, fuzzy
 msgid ""
 "Disclose informations 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:719
+#: gajim/gtk/accounts.py:722
 #, fuzzy
 msgid "Ignore Unknown Contacts"
 msgstr "Contactos"
 
-#: gajim/gtk/accounts.py:721
+#: gajim/gtk/accounts.py:724
 #, 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:737 gajim/gtk/accounts.py:776
+#: gajim/gtk/accounts.py:740 gajim/gtk/accounts.py:779
 #, fuzzy
 msgid "Use environment variable"
 msgstr "Conexión non dispoñíbel"
 
-#: gajim/gtk/accounts.py:739
-#, fuzzy
-msgid "Proxy"
-msgstr "Proxy"
-
-#: gajim/gtk/accounts.py:742
+#: gajim/gtk/accounts.py:745
 #, fuzzy
 msgid "Warn on insecure connection"
 msgstr "Conexión"
 
-#: gajim/gtk/accounts.py:746
+#: gajim/gtk/accounts.py:749
 msgid "Send keep-alive packets"
 msgstr "Enviar paquetes de mantemento de actividade"
 
-#: gajim/gtk/accounts.py:750
+#: gajim/gtk/accounts.py:753
 msgid "Manually set the hostname for the server"
 msgstr ""
 
-#: gajim/gtk/accounts.py:756 gajim/gtk/accounts.py:826
-#: gajim/gtk/accounts.py:831
+#: gajim/gtk/accounts.py:759 gajim/gtk/accounts.py:829
+#: gajim/gtk/accounts.py:834
 #, fuzzy
 msgid "Priority"
 msgstr "Pr_ioridade:"
 
-#: gajim/gtk/accounts.py:785
+#: gajim/gtk/accounts.py:788
 #, fuzzy
 msgid "Synchronize the status of all accounts"
 msgstr "Cambia o estado dunha ou de varias contas"
 
-#: gajim/gtk/accounts.py:795
+#: gajim/gtk/accounts.py:798
 #, fuzzy
 msgid "First Name"
 msgstr "Nome:"
 
-#: gajim/gtk/accounts.py:798
+#: gajim/gtk/accounts.py:801
 #, fuzzy
 msgid "Last Name"
 msgstr "Apelido(s):"
 
-#: gajim/gtk/accounts.py:804
+#: gajim/gtk/accounts.py:807
 #, fuzzy
 msgid "Email"
 msgstr "Correo electrónico novo"
 
-#: gajim/gtk/accounts.py:822
+#: gajim/gtk/accounts.py:825
 #, fuzzy
 msgid "Adjust to status"
 msgstr "_Adaptar ao estado"
 
-#: gajim/gtk/accounts.py:849
+#: gajim/gtk/accounts.py:852
 msgid "Enable"
 msgstr "Activar"
 
-#: gajim/gtk/accounts.py:857
+#: gajim/gtk/accounts.py:860
 #, fuzzy
 msgid "Port"
 msgstr "_Porto:"
 
-#: gajim/gtk/accounts.py:862
+#: gajim/gtk/accounts.py:865
 #, fuzzy
 msgid "Connection Settings"
 msgstr "Conexión"
 
-#: gajim/gtk/accounts.py:872
+#: gajim/gtk/accounts.py:875
 msgid "PKCS12 Files"
 msgstr ""
 
-#: gajim/gtk/accounts.py:874
+#: gajim/gtk/accounts.py:877
 #, fuzzy
 msgid "Encrypted Certificate"
 msgstr "O nome de usuario non é válido"
 
-#: gajim/gtk/accounts.py:878
+#: gajim/gtk/accounts.py:881
 #, fuzzy
 msgid "Certificate Settings"
 msgstr "O nome de usuario non é válido"
 
-#: gajim/gtk/accounts.py:890
+#: gajim/gtk/accounts.py:893
 #, fuzzy
 msgid "Save Password"
 msgstr "Gardar o contrasinal"
 
-#: gajim/gtk/accounts.py:898
+#: gajim/gtk/accounts.py:901
 #, fuzzy
 msgid "Login Settings"
 msgstr "Fallou a conexión"
 
-#: gajim/gtk/accounts.py:931
+#: gajim/gtk/accounts.py:934
 #, fuzzy, python-format
 msgid "Removing account %s"
 msgstr "A eliminar a conta %s"
 
-#: gajim/gtk/accounts.py:946
+#: gajim/gtk/accounts.py:949
 #, fuzzy
 msgid "Account is disabled"
 msgstr "Cifrado desactivado"
 
-#: gajim/gtk/accounts.py:947
+#: gajim/gtk/accounts.py:950
 #, fuzzy
 msgid "To unregister from a server, the account must be enabled."
 msgstr "Para cambiar o nome da conta, debe estar desconectado"
 
-#: gajim/gtk/accounts.py:962
+#: gajim/gtk/accounts.py:965
 #, fuzzy
 msgid "Password required"
 msgstr "É necesario o contrasinal"
 
-#: gajim/gtk/accounts.py:976
+#: gajim/gtk/accounts.py:979
 #, fuzzy, python-format
 msgid "Account '%s' is still connected to the server"
 msgstr "A conta \"%s\" está conectada ao servidor"
 
-#: gajim/gtk/accounts.py:978
+#: gajim/gtk/accounts.py:981
 msgid "If you remove it, the connection will be lost."
 msgstr "Se a elimina, perderase a conexión co servidor"
 
-#: gajim/gtk/accounts.py:995
+#: gajim/gtk/accounts.py:998
 #, fuzzy, python-format
 msgid "Connection to server %s failed"
 msgstr "Fallou a conexión"
 
-#: gajim/gtk/accounts.py:996
+#: gajim/gtk/accounts.py:999
 #, fuzzy
 msgid "What would you like to do?"
 msgstr "Que quere facer?"
 
-#: gajim/gtk/accounts.py:997
+#: gajim/gtk/accounts.py:1000
 #, fuzzy
 msgid "Remove only from Gajim"
 msgstr "Eliminar a _conta unicamente do Gajim"
 
-#: gajim/gtk/accounts.py:998
+#: gajim/gtk/accounts.py:1001
 msgid "Don't remove anything. I'll try again later"
 msgstr ""
 
@@ -10917,6 +11196,10 @@ msgstr "Gustaríame engadilo á miña listaxe de contactos."
 msgid "Modify"
 msgstr "_Modificar"
 
+#: gajim/gtk/roster_item_exchange.py:80
+msgid "JID"
+msgstr "JID"
+
 #: gajim/gtk/roster_item_exchange.py:86
 #, fuzzy
 msgid "Groups"
@@ -10941,50 +11224,29 @@ msgid_plural "Removed %d contacts"
 msgstr[0] "Elimina o contacto da listaxe"
 msgstr[1] "Elimina o contacto da listaxe"
 
-#: gajim/gtk/util.py:581
+#: gajim/gtk/util.py:583
 msgid "Unknown Artist"
 msgstr ""
 
-#: gajim/gtk/util.py:582
+#: gajim/gtk/util.py:584
 msgid "Unknown Title"
 msgstr ""
 
-#: gajim/gtk/util.py:583
+#: gajim/gtk/util.py:585
 msgid "Unknown Source"
 msgstr ""
 
-#: gajim/gtk/util.py:585
+#: gajim/gtk/util.py:587
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
 "from <i>%(source)s</i>"
 msgstr ""
 
-#: gajim/gtk/bookmarks.py:121
-msgid "New Group Chat"
-msgstr "Novo grupo de charla"
-
-#: gajim/gtk/bookmarks.py:161
-msgid "This bookmark has invalid data"
-msgstr "Este marcador ten información que non é válida"
-
-#: gajim/gtk/bookmarks.py:162
-msgid ""
-"Please be sure to fill out server and room fields or remove this bookmark."
-msgstr ""
-"Por favor, asegúrese de cubrir os campos de servidor e de sala ou elimine "
-"este marcador."
-
-#: gajim/gtk/bookmarks.py:273 gajim/gtk/bookmarks.py:291
-#: gajim/gtk/bookmarks.py:304 gajim/gtk/bookmarks.py:335
-#, fuzzy
-msgid "Character not allowed"
-msgstr "Alcume non permitido: %s"
-
-#: gajim/gtk/bookmarks.py:334
-#, fuzzy
-msgid "Invalid room"
-msgstr "A entrada non é válida"
+#: gajim/gtk/bookmarks.py:47
+#, fuzzy, python-format
+msgid "Bookmarks for %s"
+msgstr "Engadir esta sala aos marcadores"
 
 #: gajim/plugins/pluginmanager.py:736 gajim/plugins/pluginmanager.py:742
 msgid "Archive corrupted"
@@ -10996,50 +11258,53 @@ msgid "Archive empty"
 msgstr "Camiño do ficheiro"
 
 #: gajim/plugins/pluginmanager.py:750 gajim/plugins/pluginmanager.py:758
-#: gajim/plugins/gui.py:257
+#: gajim/plugins/gui.py:258
 msgid "Archive is malformed"
 msgstr ""
 
-#: gajim/plugins/pluginmanager.py:766 gajim/plugins/gui.py:281
-#: gajim/plugins/gui.py:289
+#: gajim/plugins/pluginmanager.py:766 gajim/plugins/gui.py:288
+#: gajim/plugins/gui.py:301
 #, fuzzy
 msgid "Plugin already exists"
 msgstr "Este ficheiro xa existe"
 
-#: gajim/plugins/gui.py:82
+#: gajim/plugins/gui.py:83
 msgid "Click to view Gajim's wiki page on how to install plugins in Flatpak."
 msgstr ""
 
-#: gajim/plugins/gui.py:89
+#: gajim/plugins/gui.py:90
 msgid "Plugin"
 msgstr ""
 
-#: gajim/plugins/gui.py:151
+#: gajim/plugins/gui.py:152
 #, fuzzy, python-format
 msgid "Warning: %s"
 msgstr "A expulsar %s"
 
-#: gajim/plugins/gui.py:206
+#: gajim/plugins/gui.py:207
 #, fuzzy
 msgid "Plugin failed"
 msgstr "Fallou a conexión"
 
-#: gajim/plugins/gui.py:245
+#: gajim/plugins/gui.py:246
 msgid "Unable to properly remove the plugin"
 msgstr ""
 
-#: gajim/plugins/gui.py:281
-msgid "Overwrite?"
-msgstr ""
+#: gajim/plugins/gui.py:287
+#, fuzzy
+msgid "Overwrite Plugin?"
+msgstr "Mensaxe de estado"
+
+#: gajim/plugins/gui.py:289
+#, fuzzy
+msgid "Do you want to overwrite the currently installed version?"
+msgstr "Quere eliminar o grupo %s da listaxe?"
 
 #: data/org.gajim.Gajim.desktop.in:5
-msgid "Jabber IM Client"
+#, fuzzy
+msgid "XMPP IM Client"
 msgstr "Cliente de MI de Jabber"
 
-#: data/org.gajim.Gajim.desktop.in:6
-msgid "A GTK+ Jabber client"
-msgstr "Un cliente de Jabber de GTK"
-
 #: data/org.gajim.Gajim.desktop.in:8
 msgid "chat;messaging;im;xmpp;bonjour;voip;"
 msgstr ""
@@ -11091,7 +11356,7 @@ msgid "Easily send pictures, videos or other files to friends and groups"
 msgstr ""
 
 #: data/org.gajim.Gajim.appdata.xml.in:27
-msgid "Chat securely with End-to-End encryption via OMEMO or PGP"
+msgid "Chat securely with End-to-End encryption via OMEMO or OpenPGP"
 msgstr ""
 
 #: data/org.gajim.Gajim.appdata.xml.in:28
@@ -11152,7 +11417,7 @@ msgstr ""
 
 #: data/org.gajim.Gajim.appdata.xml.in:52
 #, fuzzy
-msgid "Roster, list of contacts"
+msgid "Contact list, list of contacts"
 msgstr "_Rexistrar os cambios de estado dos contactos"
 
 #: data/org.gajim.Gajim.appdata.xml.in:56
@@ -11174,6 +11439,488 @@ msgstr "Recentemente:"
 msgid "Plugin manager"
 msgstr "Fallou a conexión"
 
+#, fuzzy
+#~ msgid "Configure Services…"
+#~ msgstr "_Descubrir os servizos..."
+
+#, fuzzy
+#~ msgid "Group Chat Bookmarks"
+#~ msgstr "Grupos de charla"
+
+#, fuzzy
+#~ msgid "Add Bookmark"
+#~ msgstr "Engadir esta sala aos marcadores"
+
+#, fuzzy
+#~ msgid "Remove Bookmark"
+#~ msgstr "Engadir esta sala aos marcadores"
+
+#, fuzzy
+#~ msgid "Bookmark Name"
+#~ msgstr "Engadir esta sala aos marcadores"
+
+#, fuzzy
+#~ msgid "_Server"
+#~ msgstr "_Servidor:"
+
+#, fuzzy
+#~ msgid "_Password"
+#~ msgstr "C_ontrasinal:"
+
+#, fuzzy
+#~ msgid "Join chat when connected"
+#~ msgstr "Contacto desconectado"
+
+#~ msgid "New Group Chat"
+#~ msgstr "Novo grupo de charla"
+
+#~ msgid "This bookmark has invalid data"
+#~ msgstr "Este marcador ten información que non é válida"
+
+#, fuzzy
+#~ msgid ""
+#~ "Please be sure to fill out server and group chat fields or remove this "
+#~ "bookmark."
+#~ msgstr ""
+#~ "Por favor, asegúrese de cubrir os campos de servidor e de sala ou elimine "
+#~ "este marcador."
+
+#, fuzzy
+#~ msgid "Character not allowed"
+#~ msgstr "Alcume non permitido: %s"
+
+#, fuzzy
+#~ msgid "Invalid Group Chat"
+#~ msgstr "A ID de Jabber non é válida para o grupo de charla"
+
+#~ msgid "Unable to join group chat"
+#~ msgstr "Non se puido entrar no grupo de charla"
+
+#, fuzzy
+#~ msgid "You are banned from group chat <b>%s</b>."
+#~ msgstr "Está expulsado deste grupo de charla."
+
+#, fuzzy
+#~ msgid "Remote server <b>%s</b> does not exist."
+#~ msgstr "Non existe o grupo de charla."
+
+#, fuzzy
+#~ msgid "Group chat <b>%s</b> does not exist."
+#~ msgstr "Non existe o grupo de charla."
+
+#, fuzzy
+#~ msgid "Group chat creation is not permitted."
+#~ msgstr "A creación de grupos de charla está restrinxida."
+
+#, fuzzy
+#~ msgid "You must use your registered nickname in <b>%s</b>."
+#~ msgstr "É necesario usar o alcume rexistrado."
+
+#, fuzzy
+#~ msgid "You are not in the members list in group chat %s."
+#~ msgstr "Non está na listaxe de membros"
+
+#, fuzzy
+#~ msgid "XMPP Address is not a group chat"
+#~ msgstr "Isto non é un grupo de charla"
+
+#~ msgid "This is not a group chat"
+#~ msgstr "Isto non é un grupo de charla"
+
+#, fuzzy
+#~ msgid "Please choose a group chat"
+#~ msgstr "Crear unha publicación nova"
+
+#, fuzzy
+#~ msgid "Invalid Nickname"
+#~ msgstr "O nome de usuario non é válido"
+
+#, fuzzy
+#~ msgid "Please choose a nickname"
+#~ msgstr "Crear unha publicación nova"
+
+#, fuzzy
+#~ msgid "Wrong server"
+#~ msgstr "Host errado"
+
+#, fuzzy
+#~ msgid "%s is not a group chat server"
+#~ msgstr "Isto non é un grupo de charla"
+
+#, fuzzy
+#~ msgid "A Password is required to join the group chat %s. Please type it."
+#~ msgstr "É necesario un contrasinal para entrar a este grupo de charla."
+
+#~ msgid "Not in Roster"
+#~ msgstr "Non está na listaxe"
+
+#~ msgid "I would like to add you to my roster"
+#~ msgstr "Gustaríame engadilo á miña listaxe de contactos"
+
+#, fuzzy
+#~ msgid "Add to Roster"
+#~ msgstr "_Engadir á listaxe de contactos"
+
+#, fuzzy
+#~ msgid "Manage Room"
+#~ msgstr "Xestionar os marcadores"
+
+#, fuzzy
+#~ msgid "Configure Room"
+#~ msgstr "Configurar a sala"
+
+#, fuzzy
+#~ msgid "Destroy Room"
+#~ msgstr "Descrición: %s"
+
+#, fuzzy
+#~ msgid "Change Nick"
+#~ msgstr "Cambiar o _alcume"
+
+#, fuzzy
+#~ msgid "Disconnect"
+#~ msgstr "Contacto desconectado"
+
+#, fuzzy
+#~ msgid "Copy JID"
+#~ msgstr "Sala:"
+
+#, fuzzy
+#~ msgid "Add to Roster…"
+#~ msgstr "_Engadir á listaxe de contactos"
+
+#, fuzzy
+#~ msgid "Copy JID/Email"
+#~ msgstr "_Copiar o enderezo"
+
+#, fuzzy
+#~ msgid "JID: <i>%s</i>"
+#~ msgstr "ID de Jabber : <i>%s</i>"
+
+#~ msgid "Changing Subject"
+#~ msgstr "Cambiando o asunto"
+
+#~ msgid "Please specify the new subject:"
+#~ msgstr "Especifique o asunto novo:"
+
+#, fuzzy
+#~ msgid "You (%s) joined the room"
+#~ msgstr "%s entrou no grupo de charla"
+
+#, fuzzy
+#~ msgid "Unable to join groupchat"
+#~ msgstr "Non se puido entrar no grupo de charla"
+
+#~ msgid "Groupchat Invitation"
+#~ msgstr "Convite a grupo de charla"
+
+#, fuzzy
+#~ msgid "%(jid)s has been invited in this room"
+#~ msgstr "%(nick)s foi expulsado por %(who)s: %(reason)s"
+
+#, fuzzy
+#~ msgid "JID is not a Groupchat"
+#~ msgstr "Isto non é un grupo de charla"
+
+#~ msgid "Invalid JID"
+#~ msgstr "A ID de Jabber non é válida"
+
+#~ msgid "A connection is not available"
+#~ msgstr "Non está dispoñíbel ningunha conexión"
+
+#, fuzzy
+#~ msgid "JID already in list"
+#~ msgstr "Cliente de MI de Jabber"
+
+#, fuzzy
+#~ msgid "For the chosen encryption there is no encryption method available"
+#~ msgstr "Non está dispoñíbel ningunha conexión"
+
+#~ msgid "Removes contact from roster"
+#~ msgstr "Elimina o contacto da listaxe"
+
+#, fuzzy
+#~ msgid "Not in roster"
+#~ msgstr "Non está na listaxe"
+
+#, fuzzy
+#~ msgid "Contact signed in notification color."
+#~ msgstr "_Mostrar o evento na listaxe de contactos"
+
+#, fuzzy
+#~ msgid "Contact signout notification color"
+#~ msgstr "_Mostrar o evento na listaxe de contactos"
+
+#, fuzzy
+#~ msgid "File transfer request notification color."
+#~ msgstr "Solicitude de transferencia de ficheiro"
+
+#, fuzzy
+#~ msgid "File transfer error notification color."
+#~ msgstr "Cancelouse a transferencia do ficheiro"
+
+#, fuzzy
+#~ msgid "File transfer complete or stopped notification color."
+#~ msgstr ""
+#~ "Cando unha transferencia se completar, amosa unha notificación emerxente"
+
+#, fuzzy
+#~ msgid "Groupchat invitation notification color"
+#~ msgstr "Convite a grupo de charla"
+
+#~ msgid "Add * and [n] in roster title?"
+#~ msgstr "Engadir * e [n] no título da listaxe?"
+
+#~ msgid "Hides the banner in two persons chat window"
+#~ msgstr "Oculta o báner nunha fiestra de charla de dúas persoas."
+
+#, fuzzy
+#~ msgid ""
+#~ "Show the confirm metacontacts creation dialog or not? Empty string means "
+#~ "never show the dialog."
+#~ msgstr ""
+#~ "Débese amosar a confirmación da creación de metacontactos ou non? Unha "
+#~ "secuencia baleira significa que nunca se amosará."
+
+#, fuzzy
+#~ msgid "Language for which misspelled words will be checked"
+#~ msgstr "Lingua en que se comprobarán os erros ortográficos"
+
+#~ msgid "I'm eating, so leave me a message."
+#~ msgstr "Estou a comer, déixeme unha mensaxe."
+
+#, fuzzy
+#~ msgid "from room %s"
+#~ msgstr "Estou %s"
+
+#, fuzzy
+#~ msgid "Leave Groupchats"
+#~ msgstr "Novo grupo de charla"
+
+#, fuzzy
+#~ msgid "Auto Join"
+#~ msgstr "Autoconectar"
+
+#, fuzzy
+#~ msgid "Room"
+#~ msgstr "Sala:"
+
+#~ msgid "Jabber ID:"
+#~ msgstr "ID de Jabber:"
+
+#, fuzzy
+#~ msgid "Occupant Actions"
+#~ msgstr "_Accións"
+
+#~ msgid "_Add to Roster"
+#~ msgstr "_Engadir á listaxe de contactos"
+
+#, fuzzy
+#~ msgid "_Manage Room"
+#~ msgstr "Xestionar os marcadores"
+
+#, fuzzy
+#~ msgid "Configure _Room..."
+#~ msgstr "Configurar a sala"
+
+#, fuzzy
+#~ msgid "_Destroy Room"
+#~ msgstr "Descrición: %s"
+
+#, fuzzy
+#~ msgid "Jabber ID"
+#~ msgstr "ID de Jabber:"
+
+#, fuzzy
+#~ msgid "account"
+#~ msgstr "Conta"
+
+#, fuzzy
+#~ msgid "Roster"
+#~ msgstr "Amosar _listaxe"
+
+#, fuzzy
+#~ msgid "Show only in roster"
+#~ msgstr "Amosar só na _listaxe de contactos"
+
+#, fuzzy
+#~ msgid "in _roster"
+#~ msgstr "Non está na listaxe"
+
+#, fuzzy
+#~ msgid "Roster Appearance"
+#~ msgstr "<b>Editar unha regra</b>"
+
+#, fuzzy
+#~ msgid "Show chatstate in roster"
+#~ msgstr "Amosar na listaxe os a_vatares dos contactos"
+
+#, fuzzy
+#~ msgid "_Add to Roster..."
+#~ msgstr "_Engadir á listaxe de contactos"
+
+#~ msgid "_Jabber ID:"
+#~ msgstr "ID de _Jabber: "
+
+#, fuzzy
+#~ msgid "_Jabber ID"
+#~ msgstr "ID de _Jabber: "
+
+#~ msgid "JabberID"
+#~ msgstr "ID de Jabber:"
+
+#, fuzzy
+#~ msgid "Show Roster"
+#~ msgstr "Amosar _listaxe"
+
+#, fuzzy
+#~ msgid "MUC server"
+#~ msgstr "Observadores"
+
+#~ msgid "Room Configuration"
+#~ msgstr "Configuración da sala"
+
+#~ msgid "Join _Group Chat"
+#~ msgstr "Entrar nun grupo de charla"
+
+#, fuzzy
+#~ msgid "Audio sessions are not available"
+#~ msgstr "Non está dispoñíbel ningunha conexión"
+
+#~ msgid "Conference"
+#~ msgstr "Conferencia"
+
+#, fuzzy
+#~ msgid "_Manage Bookmarks…"
+#~ msgstr "Xestionar os marcadores"
+
+#, fuzzy
+#~ msgid "Hide _Roster"
+#~ msgstr "Non está na listaxe"
+
+#~ msgid "Show _Roster"
+#~ msgstr "Amosar _listaxe"
+
+#, fuzzy
+#~ msgid "Invalid Room"
+#~ msgstr "A entrada non é válida"
+
+#, fuzzy
+#~ msgid "Invalid room"
+#~ msgstr "A entrada non é válida"
+
+#~ msgid "A GTK+ Jabber client"
+#~ msgstr "Un cliente de Jabber de GTK"
+
+#~ msgid "Changing Nickname"
+#~ msgstr "Cambiando o alcume"
+
+#~ msgid "Please specify the new nickname you want to use:"
+#~ msgstr "Especifique o novo alcume que quere usar:"
+
+#~ msgid "Bookmark already set"
+#~ msgstr "O marcador xa se definiu"
+
+#, fuzzy
+#~ msgid "Group Chat '%s' is already in your bookmarks."
+#~ msgstr "A sala \"%s\" xa está nos seus marcadores."
+
+#~ msgid "Bookmark has been added successfully"
+#~ msgstr "O marcador engadiuse con éxito"
+
+#, fuzzy
+#~ msgid ""
+#~ "You can manage your bookmarks by clicking the Bookmarks menu item in your "
+#~ "contact list."
+#~ msgstr ""
+#~ "Pode xestionar os seus marcadores mediante o menú Accións da súa listaxe"
+
+#, fuzzy
+#~ msgid "The nickname contains invalid characters."
+#~ msgstr ""
+#~ "A ID de Jabber para o grupo de charla contén caracteres que non se "
+#~ "permiten."
+
+#, fuzzy
+#~ msgid "Bookmark Room"
+#~ msgstr "Engadir esta sala aos marcadores"
+
+#~ msgid "_Join New Group Chat"
+#~ msgstr "_Entrar nun outro grupo de charla"
+
+#, fuzzy
+#~ msgid "_Create Group Chat"
+#~ msgstr "Novo grupo de charla"
+
+#~ msgid "Name:"
+#~ msgstr "Nome:"
+
+#, fuzzy
+#~ msgid "Description:"
+#~ msgstr "Descrición: %s"
+
+#, fuzzy
+#~ msgid "Address:"
+#~ msgstr "_Enderezo:"
+
+#, fuzzy
+#~ msgid "You can not start a new conversation unless you are connected."
+#~ msgstr "Non pode entrar nunha sala de charla até que non se conecte."
+
+#, fuzzy
+#~ msgid "Occupants"
+#~ msgstr "_Accións"
+
+#, fuzzy
+#~ msgid "File transfer error"
+#~ msgstr "Produciuse un erro na transferencia do ficheiro"
+
+#, fuzzy
+#~ msgid "No Accounts available"
+#~ msgstr "A conta non está dispoñíbel"
+
+#~ msgid "_Modify Account..."
+#~ msgstr "_Modificar a conta..."
+
+#, fuzzy
+#~ msgid "Integer"
+#~ msgstr "No grupo"
+
+#~ msgid "Value"
+#~ msgstr "Valor"
+
+#~ msgid "Type"
+#~ msgstr "Tipo"
+
+#~ msgid "(None)"
+#~ msgstr "(Ningún)"
+
+#~ msgid "Hidden"
+#~ msgstr "Oculta"
+
+#~ msgid "Manage Proxy Profiles"
+#~ msgstr "Xestionar os perfís do proxy"
+
+#, fuzzy
+#~ msgid "Properties"
+#~ msgstr "<b>Propiedades</b>"
+
+#, fuzzy
+#~ msgid "Proxy _Host"
+#~ msgstr "Proxy"
+
+#, fuzzy
+#~ msgid "Proxy _Port"
+#~ msgstr "_Porto:"
+
+#, fuzzy
+#~ msgid "New Groupchat"
+#~ msgstr "Novo grupo de charla"
+
+#, fuzzy
+#~ msgid "New Contact"
+#~ msgstr "Engadir un contacto novo"
+
 #~ msgid "%s GiB"
 #~ msgstr "%s GiB"
 
@@ -11253,9 +12000,6 @@ msgstr "Fallou a conexión"
 #~ msgid "_Pause"
 #~ msgstr "_Pausa"
 
-#~ msgid "Clean _up"
-#~ msgstr "Limpar"
-
 #~ msgid "Remove file transfer from the list."
 #~ msgstr "Eliminar transferencias da listaxe"
 
@@ -11821,10 +12565,6 @@ msgstr "Fallou a conexión"
 #~ msgid "Nick"
 #~ msgstr "Alcume"
 
-#, fuzzy
-#~ msgid "Banning…"
-#~ msgstr "A expulsar..."
-
 #~ msgid ""
 #~ "<b>Whom do you want to ban?</b>\n"
 #~ "\n"
@@ -11895,13 +12635,6 @@ msgstr "Fallou a conexión"
 #~ msgstr "Filtro:"
 
 #, fuzzy
-#~ msgid ""
-#~ "If checked, Gajim will display the mood of contacts in the roster window"
-#~ msgstr ""
-#~ "Se isto está marcado, o Gajim amosará as circunstancias dos contactos na "
-#~ "listaxe e nos grupos de charla"
-
-#, fuzzy
 #~ msgid "<b>Chat Appearance</b>"
 #~ msgstr "<b>Editar unha regra</b>"
 
@@ -12143,10 +12876,6 @@ msgstr "Fallou a conexión"
 #~ msgstr "Men_saxe de estado:"
 
 #, fuzzy
-#~ msgid "Group chat highlight"
-#~ msgstr "Remarcado da mensaxe de grupo de charla"
-
-#, fuzzy
 #~ msgid "Your nickname"
 #~ msgstr "Ant_es do alcume:"
 
@@ -12309,9 +13038,6 @@ msgstr "Fallou a conexión"
 #~ msgid "The passwords typed in both fields must be identical."
 #~ msgstr "Os contrasinais escritos nos dous campos deben ser idénticos."
 
-#~ msgid "Enter new password:"
-#~ msgstr "Insira o contrasinal novo:"
-
 #~ msgid "Enter it again for confirmation:"
 #~ msgstr "Insírao mais unha vez para confirmar:"
 
@@ -12327,10 +13053,6 @@ msgstr "Fallou a conexión"
 #~ msgstr "solicitude de eliminación de subscrición de %s"
 
 #, fuzzy
-#~ msgid "Autojoin"
-#~ msgstr "Autoconectar"
-
-#, fuzzy
 #~ msgid "Homepage:"
 #~ msgstr "Páxina web:"
 
@@ -12423,9 +13145,6 @@ msgstr "Fallou a conexión"
 #~ msgid "Forward unread message then disconnect"
 #~ msgstr "%d mensaxe sen ler"
 
-#~ msgid "AIM Address:"
-#~ msgstr "Enderezo de AIM:"
-
 #~ msgid "MSN Address:"
 #~ msgstr "Enderezo de MSN:"
 
@@ -12642,9 +13361,6 @@ msgstr "Fallou a conexión"
 #~ msgid "Server:"
 #~ msgstr "Servidor:"
 
-#~ msgid "Password:"
-#~ msgstr "Contrasinal: "
-
 #, fuzzy
 #~ msgid "Join this room _automatically when I connect"
 #~ msgstr "Configurar o meu perfil ao me conectar"
@@ -12661,10 +13377,6 @@ msgstr "Fallou a conexión"
 #~ msgid "Requires gnome-network-manager"
 #~ msgstr "Historial"
 
-#, fuzzy
-#~ msgid "This contact does not support file transfer."
-#~ msgstr "Listaxe de transferencias activas, rematadas e detidas"
-
 #~ msgid ""
 #~ "You have to install %s dictionary to use spellchecking, or choose another "
 #~ "language by setting the speller_language option."
@@ -12936,9 +13648,6 @@ msgstr "Fallou a conexión"
 #~ msgid "_Edit Personal Information..."
 #~ msgstr "_Editar a información persoal..."
 
-#~ msgid "Information about you, as stored in the server"
-#~ msgstr "A súa información, para se gardar no servidor"
-
 #~ msgid "<b>Personal Information</b>"
 #~ msgstr "<b>Información persoal</b>"
 
@@ -12981,13 +13690,6 @@ msgstr "Fallou a conexión"
 #~ msgid "Account Name Already Used"
 #~ msgstr "O nome da conta xa está en uso"
 
-#~ msgid ""
-#~ "This name is already used by another of your accounts. Please choose "
-#~ "another name."
-#~ msgstr ""
-#~ "Este nome xa está en uso por outra das súas contas. Por favor, escolla "
-#~ "outro nome."
-
 #~ msgid "Invalid account name"
 #~ msgstr "O nome da conta non é válido"
 
@@ -13022,9 +13724,6 @@ msgstr "Fallou a conexión"
 #~ msgid "Your server can't save your personal information."
 #~ msgstr "O seu servidor non pode gardar a súa información persoal."
 
-#~ msgid "Account Local already exists."
-#~ msgstr "A conta local xa existe."
-
 #~ msgid "Please rename or remove it before enabling link-local messaging."
 #~ msgstr ""
 #~ "Por favor, volva darlle nome ou elimíneo antes de habilitar a mensaxaría "
@@ -13095,10 +13794,6 @@ msgstr "Fallou a conexión"
 #~ msgid "The following message was NOT encrypted"
 #~ msgstr "[Esta mensaxe está cifrada]"
 
-#, fuzzy
-#~ msgid "Encryption used for this contact."
-#~ msgstr "Está o OpenPGP activado para este contacto?"
-
 #~ msgid "Toggle Open_PGP Encryption"
 #~ msgstr "Alternar a codificación OpenPGP"
 
@@ -13169,10 +13864,6 @@ msgstr "Fallou a conexión"
 #~ msgid "Add _Contact..."
 #~ msgstr "_Engadir un contacto..."
 
-#, fuzzy
-#~ msgid "_Accounts"
-#~ msgstr "Contas"
-
 #~ msgid "Profile, A_vatar"
 #~ msgstr "Perfil, Ima_xe"
 
@@ -13356,14 +14047,6 @@ msgstr "Fallou a conexión"
 #~ msgstr "Activo"
 
 #, fuzzy
-#~ msgid "Join _Group Chat..."
-#~ msgstr "Entrar nun grupo de charla"
-
-#, fuzzy
-#~ msgid "_Modify Account"
-#~ msgstr "Modificar conta"
-
-#, fuzzy
 #~ msgid ""
 #~ "If True, Gajim will check if it's the default jabber client on each "
 #~ "startup."
@@ -13903,9 +14586,6 @@ msgstr "Fallou a conexión"
 #~ msgid "Nickname not found: %s"
 #~ msgstr "Non se achou o alcume: %s"
 
-#~ msgid "This group chat has no subject"
-#~ msgstr "Este grupo de charla non ten un asunto"
-
 #, fuzzy
 #~ msgid ""
 #~ "Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
@@ -13977,10 +14657,6 @@ msgstr "Fallou a conexión"
 #~ "Prema para ver as características (como transportes de MSN e ICQ) dos "
 #~ "servidores de Jabber"
 
-#, fuzzy
-#~ msgid "_Host:"
-#~ msgstr "_Porto:"
-
 #~ msgid "Modify Account"
 #~ msgstr "Modificar conta"
 
@@ -14079,9 +14755,6 @@ msgstr "Fallou a conexión"
 #~ msgid "<b>Interface Customization</b>"
 #~ msgstr "<b>Personalización da interface</b>"
 
-#~ msgid "A_fter nickname:"
-#~ msgstr "Despois do alcume:"
-
 #~ msgid "Also known as iChat style"
 #~ msgstr "Tamén coñecido como estilo iChat"
 
@@ -14238,9 +14911,6 @@ msgstr "Fallou a conexión"
 #~ "O soporte de manexo de sesión non está dispoñíbel (falta o módulo gnome."
 #~ "ui)"
 
-#~ msgid "Private Chat"
-#~ msgstr "Charla privada"
-
 #~ msgid "%s is now %s"
 #~ msgstr "%s está agora %s"
 
diff --git a/po/he.po b/po/he.po
index 38d4ac1e5..d746b0efe 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: 2019-07-02 02:06+0000\n"
+"POT-Creation-Date: 2019-08-11 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,71 +21,71 @@ msgstr ""
 "X-Language: he\n"
 "X-Source-Language: en\n"
 
-#: gajim/chat_control_base.py:550
+#: gajim/chat_control_base.py:557
 msgid "_Undo"
 msgstr ""
 
-#: gajim/chat_control_base.py:558 gajim/conversation_textview.py:529
+#: gajim/chat_control_base.py:565 gajim/conversation_textview.py:529
 msgid "_Clear"
 msgstr ""
 
-#: gajim/chat_control_base.py:563
+#: gajim/chat_control_base.py:570
 msgid "Paste as quote"
 msgstr ""
 
-#: gajim/chat_control_base.py:613
+#: gajim/chat_control_base.py:620
 #, fuzzy
 msgid "Paste Image"
 msgstr "בחירת תמונה"
 
-#: gajim/chat_control_base.py:614
+#: gajim/chat_control_base.py:621
 #, fuzzy
 msgid "You are trying to paste an image"
 msgstr "בחרת לסגור מספר כרטיסיות"
 
-#: gajim/chat_control_base.py:615
+#: gajim/chat_control_base.py:622
 #, fuzzy
 msgid ""
 "Are you sure you want to paste your clipboard's image into the chat window?"
 msgstr "האם אתה בטוח כי ברצונך לעזוב את שיחת קבוצה \"%s\"?"
 
-#: gajim/chat_control_base.py:617 gajim/groupchat_control.py:2310
-#: gajim/roster_window.py:2848 gajim/roster_window.py:4167
-#: gajim/message_window.py:252 gajim/gtk/dialogs.py:418
+#: gajim/chat_control_base.py:624 gajim/groupchat_control.py:2218
+#: gajim/roster_window.py:2841 gajim/roster_window.py:4118
+#: gajim/message_window.py:359 gajim/gtk/dialogs.py:330
 msgid "_Do not ask me again"
 msgstr "אל ת_שאל אותי שוב"
 
-#: gajim/chat_control_base.py:620
+#: gajim/chat_control_base.py:627
 msgid "_Paste"
 msgstr ""
 
-#: gajim/chat_control_base.py:1162 gajim/gtk/accounts.py:351
+#: gajim/chat_control_base.py:1169 gajim/gtk/accounts.py:354
 #, fuzzy
 msgid "Privacy"
 msgstr "רשימת פרטיות"
 
-#: gajim/chat_control_base.py:1163
+#: gajim/chat_control_base.py:1170
 #, fuzzy
 msgid "Warning"
 msgstr "אזהרה: %s"
 
-#: gajim/chat_control_base.py:1164
+#: gajim/chat_control_base.py:1171
 #, fuzzy, python-format
 msgid "If you send a file to <b>%s</b>, your real JID will be revealed."
 msgstr "אם תשלח קובץ אל %s, הוא/היא ידעו את המזהה Jabber שלך במלואו."
 
-#: gajim/chat_control_base.py:1169
+#: gajim/chat_control_base.py:1176
 #, fuzzy
 msgid "Continue"
 msgstr "ה_משך"
 
 # להחליף
-#: gajim/gtkgui_helpers.py:163 gajim/gtk/filetransfer.py:393
+#: gajim/gtkgui_helpers.py:163 gajim/gtk/filetransfer.py:398
 #, fuzzy, python-format
 msgid "Cannot overwrite existing file '%s'"
 msgstr "אין אפשרות לכתוב על קובץ קיים \"%s\""
 
-#: gajim/gtkgui_helpers.py:164 gajim/gtk/filetransfer.py:394
+#: gajim/gtkgui_helpers.py:164 gajim/gtk/filetransfer.py:399
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
@@ -180,391 +180,399 @@ msgstr "לא קיימת שום בקשת הרשמה ממתינה."
 msgid " resource with priority "
 msgstr " משאב עם עדיפות "
 
-#: gajim/gui_menu_builder.py:96
-msgid "_New Group Chat"
-msgstr "שיחת קבוצה _חדשה"
-
-#: gajim/gui_menu_builder.py:289 gajim/gui_menu_builder.py:380
-#: gajim/chat_control.py:303 gajim/roster_window.py:786
-#: gajim/roster_window.py:1719 gajim/roster_window.py:1721
-#: gajim/roster_window.py:2030 gajim/roster_window.py:3336
-#: gajim/roster_window.py:3369 gajim/gui_interface.py:413
-#: gajim/common/contacts.py:206 gajim/common/contacts.py:343
-#: gajim/common/helpers.py:83 gajim/common/helpers.py:311
-#: gajim/gtk/add_contact.py:319 gajim/gtk/subscription_request.py:70
-#: gajim/gtk/subscription_request.py:99 gajim/gtk/roster_item_exchange.py:112
-msgid "Not in Roster"
-msgstr "לא ברשימה"
+#: gajim/gui_menu_builder.py:251 gajim/gui_menu_builder.py:342
+#: gajim/chat_control.py:305 gajim/roster_window.py:783
+#: gajim/roster_window.py:1716 gajim/roster_window.py:1718
+#: gajim/roster_window.py:2027 gajim/roster_window.py:3292
+#: gajim/roster_window.py:3325 gajim/gui_interface.py:396
+#: gajim/common/contacts.py:222 gajim/common/contacts.py:359
+#: gajim/common/contacts.py:471 gajim/common/helpers.py:86
+#: gajim/common/helpers.py:317 gajim/gtk/add_contact.py:319
+#: gajim/gtk/subscription_request.py:70 gajim/gtk/subscription_request.py:99
+#: gajim/gtk/roster_item_exchange.py:112
+#, fuzzy
+msgid "Not in contact list"
+msgstr "הצג אנשי קשר _לא מקוונים"
 
-#: gajim/gui_menu_builder.py:393
-msgid "I would like to add you to my roster"
-msgstr "ברצוני להוסיף אותך לרשימה שלי"
+#: gajim/gui_menu_builder.py:355
+#, fuzzy
+msgid "I would like to add you to my contact list"
+msgstr "ברצוני להוסיף אותך לרשימת הקשר שלי."
 
-#: gajim/gui_menu_builder.py:471
+#: gajim/gui_menu_builder.py:433
 #, fuzzy
 msgid "Send Single _Message…"
 msgstr "שלח הודעה _בודדת..."
 
-#: gajim/gui_menu_builder.py:486
+#: gajim/gui_menu_builder.py:448
 #, fuzzy
 msgid "E_xecute Command…"
 msgstr "הרץ _פקודה"
 
-#: gajim/gui_menu_builder.py:494
+#: gajim/gui_menu_builder.py:456
 msgid "_Manage Transport"
 msgstr "_נהל מוביל"
 
-#: gajim/gui_menu_builder.py:500
+#: gajim/gui_menu_builder.py:462
 msgid "_Modify Transport"
 msgstr "ה_תאם מוביל"
 
-#: gajim/gui_menu_builder.py:507 gajim/roster_window.py:5046
+#: gajim/gui_menu_builder.py:469 gajim/roster_window.py:4985
 #, fuzzy
 msgid "_Rename…"
 msgstr "_שנה שם"
 
-#: gajim/gui_menu_builder.py:518 gajim/roster_window.py:5062
-#: gajim/roster_window.py:5177 gajim/data/gui/blocked_contacts_window.ui:52
+#: gajim/gui_menu_builder.py:480 gajim/roster_window.py:5001
+#: gajim/roster_window.py:5116 gajim/data/gui/blocked_contacts_window.ui:52
 #: gajim/data/gui/gc_occupants_menu.ui:148
 #: gajim/data/gui/contact_context_menu.ui:143
 msgid "_Unblock"
 msgstr "_בטל חסימה"
 
-#: gajim/gui_menu_builder.py:521 gajim/roster_window.py:5067
-#: gajim/roster_window.py:5181 gajim/data/gui/gc_occupants_menu.ui:140
+#: gajim/gui_menu_builder.py:483 gajim/roster_window.py:5006
+#: gajim/roster_window.py:5120 gajim/data/gui/gc_occupants_menu.ui:140
 #: gajim/data/gui/contact_context_menu.ui:151
 msgid "_Block"
 msgstr "_חסום"
 
-#: gajim/gui_menu_builder.py:529 gajim/roster_window.py:5074
+#: gajim/gui_menu_builder.py:491 gajim/roster_window.py:5013
 #: gajim/data/gui/contact_context_menu.ui:181
 msgid "Remo_ve"
 msgstr "הס_ר"
 
-#: gajim/gui_menu_builder.py:539 gajim/data/gui/contact_context_menu.ui:198
+#: gajim/gui_menu_builder.py:501 gajim/data/gui/contact_context_menu.ui:198
 msgid "_Information"
 msgstr "_מידע"
 
-#: gajim/gui_menu_builder.py:552
+#: gajim/gui_menu_builder.py:514
 #, fuzzy
 msgid "Save _As"
 msgstr "נשמר בתוך: ‎%s"
 
-#: gajim/gui_menu_builder.py:564 gajim/groupchat_control.py:501
-#: gajim/chat_control.py:340
+#: gajim/gui_menu_builder.py:526 gajim/groupchat_control.py:507
+#: gajim/chat_control.py:342
 #, fuzzy
 msgid "Send File…"
 msgstr "שלח _קובץ"
 
-#: gajim/gui_menu_builder.py:565
+#: gajim/gui_menu_builder.py:527
 #, fuzzy
 msgid "Upload File…"
 msgstr "שמור קובץ בשם..."
 
-#: gajim/gui_menu_builder.py:566
+#: gajim/gui_menu_builder.py:528
 #, fuzzy
 msgid "Send File Directly…"
 msgstr "שמור קובץ בשם..."
 
 # By last state
-#: gajim/gui_menu_builder.py:568 gajim/gui_menu_builder.py:632
+#: gajim/gui_menu_builder.py:530 gajim/gui_menu_builder.py:596
 #, fuzzy
 msgid "Send Chatstate"
 msgstr "לפי מצב אחרון"
 
-#: gajim/gui_menu_builder.py:569
+#: gajim/gui_menu_builder.py:531
 #, fuzzy
 msgid "Invite Contacts"
 msgstr "הזמן _אנשי קשר"
 
-#: gajim/gui_menu_builder.py:570
+#: gajim/gui_menu_builder.py:532
 #, fuzzy
-msgid "Add to Roster"
-msgstr "הו_סף לרשימה"
+msgid "Add to Contact List"
+msgstr "הוסף _איש קשר..."
 
-#: gajim/gui_menu_builder.py:571
+#: gajim/gui_menu_builder.py:533
 #, fuzzy
-msgid "Audio Session"
-msgstr "בדיקת קול"
+msgid "Voice Chat"
+msgstr "בקשה לשיחה קולית"
 
-#: gajim/gui_menu_builder.py:572
+#: gajim/gui_menu_builder.py:534
 #, fuzzy
-msgid "Video Session"
+msgid "Video Chat"
 msgstr "בדיקת וידאו"
 
-#: gajim/gui_menu_builder.py:573
+#: gajim/gui_menu_builder.py:535 gajim/gui_menu_builder.py:582
 #, fuzzy
 msgid "Information"
 msgstr "_מידע"
 
-#: gajim/gui_menu_builder.py:574 gajim/gui_menu_builder.py:639
+#: gajim/gui_menu_builder.py:536 gajim/gui_menu_builder.py:602
 #: gajim/data/gui/application_menu.ui:37
 #, fuzzy
 msgid "History"
 msgstr "_היסטוריה"
 
-#: gajim/gui_menu_builder.py:580 gajim/gui_menu_builder.py:687
+#: gajim/gui_menu_builder.py:542 gajim/gui_menu_builder.py:650
 #: gajim/data/gui/preferences_window.ui:1823
 msgid "Disabled"
 msgstr "מנוטרלת"
 
-#: gajim/gui_menu_builder.py:581 gajim/gui_menu_builder.py:688
+#: gajim/gui_menu_builder.py:543 gajim/gui_menu_builder.py:651
 msgid "Composing only"
 msgstr "הלחנה בלבד"
 
-#: gajim/gui_menu_builder.py:582 gajim/gui_menu_builder.py:689
+#: gajim/gui_menu_builder.py:544 gajim/gui_menu_builder.py:652
 msgid "All chat states"
 msgstr "בכל מצב שיחה"
 
-#: gajim/gui_menu_builder.py:620
+#: gajim/gui_menu_builder.py:583
 #, fuzzy
-msgid "Manage Room"
-msgstr "נהל _חדר"
+msgid "Manage Group Chat"
+msgstr "עזוב שיחות קבוצה"
 
-#: gajim/gui_menu_builder.py:621
+#: gajim/gui_menu_builder.py:584 gajim/data/gui/groupchat_control.ui:649
 #, fuzzy
 msgid "Change Subject"
 msgstr "שנה _נושא..."
 
-#: gajim/gui_menu_builder.py:622
+#: gajim/gui_menu_builder.py:585
 #, fuzzy
-msgid "Configure Room"
-msgstr "ה_גדר חדר..."
+msgid "Configure Group Chat"
+msgstr "עזוב שיחות קבוצה"
 
-#: gajim/gui_menu_builder.py:623
+#: gajim/gui_menu_builder.py:586
 #, fuzzy
 msgid "Upload Avatar…"
 msgstr "בחירת ארכיון"
 
-#: gajim/gui_menu_builder.py:624
+#: gajim/gui_menu_builder.py:587
 #, fuzzy
-msgid "Destroy Room"
-msgstr "ה_חרב חדר"
+msgid "Destroy Group Chat"
+msgstr "שיחת קבוצה חדשה"
 
-#: gajim/gui_menu_builder.py:626 gajim/data/gui/preferences_window.ui:790
+#: gajim/gui_menu_builder.py:589 gajim/data/gui/preferences_window.ui:790
 #, fuzzy
 msgid "Chat Settings"
 msgstr "קיצורי מקש"
 
-#: gajim/gui_menu_builder.py:627
+#: gajim/gui_menu_builder.py:590
 msgid "Show join/leave"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:628
+#: gajim/gui_menu_builder.py:591
 #, fuzzy
 msgid "Show status changes"
 msgstr "הצג _הודעות מצב"
 
-#: gajim/gui_menu_builder.py:629 gajim/data/gui/gc_control_popup_menu.ui:72
+#: gajim/gui_menu_builder.py:592 gajim/data/gui/gc_control_popup_menu.ui:72
 #, fuzzy
 msgid "Notify on all messages"
 msgstr "הודעות מותאמות:"
 
-#: gajim/gui_menu_builder.py:630
+#: gajim/gui_menu_builder.py:593
 #, fuzzy
 msgid "Minimize on close"
 msgstr "_מזער בעת סגירה"
 
-#: gajim/gui_menu_builder.py:631
+#: gajim/gui_menu_builder.py:595
 #, fuzzy
-msgid "Minimize on autojoin"
+msgid "Minimize when joining automatically"
 msgstr "מ_זער בעת הצטרפות אוטומטית"
 
-#: gajim/gui_menu_builder.py:634
+#: gajim/gui_menu_builder.py:598
 msgid "Sync Threshold"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:635
+#: gajim/gui_menu_builder.py:599
 #, fuzzy
-msgid "Change Nick"
+msgid "Change Nickname"
 msgstr "שנה שם _כינוי..."
 
-#: gajim/gui_menu_builder.py:636
-#, fuzzy
-msgid "Bookmark Room"
-msgstr "_סמן את חדר זה"
-
-#: gajim/gui_menu_builder.py:637
+#: gajim/gui_menu_builder.py:600
 #, fuzzy
 msgid "Request Voice"
 msgstr "_בקש ביטוי"
 
-#: gajim/gui_menu_builder.py:638 gajim/roster_window.py:5246
+#: gajim/gui_menu_builder.py:601 gajim/roster_window.py:5185
 #, fuzzy
 msgid "Execute command"
 msgstr "הרץ _פקודה"
 
-#: gajim/gui_menu_builder.py:640
-#, fuzzy
-msgid "Disconnect"
-msgstr "הת_נתק"
+#: gajim/gui_menu_builder.py:603
+msgid "Leave"
+msgstr ""
 
-#: gajim/gui_menu_builder.py:678 gajim/gtk/preferences.py:156
+#: gajim/gui_menu_builder.py:641 gajim/gtk/preferences.py:155
 msgid "No threshold"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:680 gajim/gtk/preferences.py:158
+#: gajim/gui_menu_builder.py:643 gajim/gtk/preferences.py:157
 #, python-format
 msgid "%i day"
 msgid_plural "%i days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: gajim/gui_menu_builder.py:709 gajim/gui_menu_builder.py:747
-#: gajim/gtk/join_groupchat.py:43
-msgid "Join Group Chat"
-msgstr "הצטרף לשיחת קבוצה"
-
-#: gajim/gui_menu_builder.py:746
+#: gajim/gui_menu_builder.py:672
 #, fuzzy
 msgid "Add Contact…"
 msgstr "הוסף _איש קשר..."
 
-#: gajim/gui_menu_builder.py:748 gajim/gtk/profile.py:52
-#: gajim/gtk/accounts.py:770 gajim/gtk/accounts.py:808
+#: gajim/gui_menu_builder.py:673 gajim/gtk/profile.py:52
+#: gajim/gtk/accounts.py:773 gajim/gtk/accounts.py:811
 #, fuzzy
 msgid "Profile"
 msgstr "cli"
 
+#: gajim/gui_menu_builder.py:674
+#, fuzzy
+msgid "Send Single Message…"
+msgstr "שלח הודעה _בודדת..."
+
 # איתור
-#: gajim/gui_menu_builder.py:749
+#: gajim/gui_menu_builder.py:675
 #, fuzzy
 msgid "Discover Services"
 msgstr "מצא _שירותים"
 
-#: gajim/gui_menu_builder.py:750
+#: gajim/gui_menu_builder.py:676 gajim/gtk/server_info.py:36
 #, fuzzy
-msgid "Send Single Message…"
-msgstr "שלח הודעה _בודדת..."
+msgid "Server Info"
+msgstr "שרת"
 
-#: gajim/gui_menu_builder.py:751 gajim/data/gui/preferences_window.ui:2741
+#: gajim/gui_menu_builder.py:677 gajim/data/gui/preferences_window.ui:2741
 msgid "Advanced"
 msgstr "מתקדם"
 
-#: gajim/gui_menu_builder.py:752 gajim/gtk/mam_preferences.py:88
+#: gajim/gui_menu_builder.py:678 gajim/gtk/mam_preferences.py:88
 #, fuzzy
 msgid "Archiving Preferences"
 msgstr "ערוך העדפות _ארכיונאות"
 
-#: gajim/gui_menu_builder.py:753
+#: gajim/gui_menu_builder.py:679
 #, fuzzy
 msgid "Blocking List"
 msgstr "רשימת אסירה"
 
-#: gajim/gui_menu_builder.py:754 gajim/gtk/history_sync.py:108
+#: gajim/gui_menu_builder.py:680
+#, fuzzy
+msgid "Bookmarks"
+msgstr "_סמן"
+
+#: gajim/gui_menu_builder.py:681
+#, fuzzy
+msgid "PEP Configuration"
+msgstr "תצורה"
+
+#: gajim/gui_menu_builder.py:682 gajim/gtk/history_sync.py:108
 #: gajim/gtk/history_sync.py:186
 #, fuzzy
 msgid "Synchronise History"
 msgstr "סנכרון"
 
-#: gajim/gui_menu_builder.py:755 gajim/gtk/privacy_list.py:427
+#: gajim/gui_menu_builder.py:683 gajim/gtk/privacy_list.py:427
 msgid "Privacy Lists"
 msgstr "רשימות פרטיות"
 
-#: gajim/gui_menu_builder.py:756 gajim/gtk/server_info.py:36
-#, fuzzy
-msgid "Server Info"
-msgstr "שרת"
-
-#: gajim/gui_menu_builder.py:757 gajim/gui_menu_builder.py:768
+#: gajim/gui_menu_builder.py:685 gajim/gui_menu_builder.py:696
 #: gajim/data/gui/xml_console_window.ui:77
 msgid "XML Console"
 msgstr "מסוף XML"
 
-#: gajim/gui_menu_builder.py:759 gajim/data/gui/groupchat_config.ui:36
+#: gajim/gui_menu_builder.py:687 gajim/data/gui/groupchat_config.ui:36
 #, fuzzy
 msgid "Admin"
 msgstr "_מנהל"
 
 # בשורה מסר
-#: gajim/gui_menu_builder.py:760
+#: gajim/gui_menu_builder.py:688
 #, fuzzy
 msgid "Send Server Message…"
 msgstr "_שלח הודעת שרת..."
 
-#: gajim/gui_menu_builder.py:761
+#: gajim/gui_menu_builder.py:689
 #, fuzzy
 msgid "Set MOTD…"
 msgstr "הגדר MOTD..."
 
-#: gajim/gui_menu_builder.py:762
+#: gajim/gui_menu_builder.py:690
 #, fuzzy
 msgid "Update MOTD…"
 msgstr "עדכן MOTD..."
 
-#: gajim/gui_menu_builder.py:763
+#: gajim/gui_menu_builder.py:691
 #, fuzzy
 msgid "Delete MOTD…"
 msgstr "מחק MOTD"
 
-#: gajim/gui_menu_builder.py:812
+#: gajim/gui_menu_builder.py:736
 #, fuzzy
-msgid "No Accounts available"
-msgstr "אין חשבון זמין"
+msgid "_Add Account…"
+msgstr "הוסף _איש קשר..."
+
+#: gajim/gui_menu_builder.py:742
+#, fuzzy
+msgid "_Modify Accounts…"
+msgstr "ה_תאם חשבון..."
+
+#: gajim/gui_menu_builder.py:751 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:823 gajim/data/gui/application_menu.ui:5
-#: gajim/data/gui/application_menu.ui:71 gajim/data/gui/shortcuts_window.ui:182
-#: gajim/gtk/accounts.py:58
+#: gajim/gui_menu_builder.py:755 gajim/data/gui/application_menu.ui:5
+#: gajim/data/gui/shortcuts_window.ui:182 gajim/gtk/accounts.py:57
 msgid "Accounts"
 msgstr "חשבונות"
 
-#: gajim/gui_menu_builder.py:881 gajim/gui_menu_builder.py:886
+#: gajim/gui_menu_builder.py:784 gajim/gui_menu_builder.py:789
 #, fuzzy
-msgid "Copy JID"
-msgstr "cli"
+msgid "Copy XMPP Address"
+msgstr "ה_עתק כתובת JID/דוא״ל"
 
-#: gajim/gui_menu_builder.py:882 gajim/gui_menu_builder.py:914
+#: gajim/gui_menu_builder.py:785 gajim/gui_menu_builder.py:817
 #, fuzzy
 msgid "Join Groupchat"
 msgstr "הצטרף לשיחת קבוצה"
 
-#: gajim/gui_menu_builder.py:887 gajim/gui_menu_builder.py:913
-#: gajim/data/gui/application_menu.ui:76
+#: gajim/gui_menu_builder.py:790 gajim/gui_menu_builder.py:816
+#: gajim/data/gui/application_menu.ui:71
 #: gajim/data/gui/subscription_request_window.ui:106
 msgid "Start Chat"
 msgstr "התחלת שיחה"
 
-#: gajim/gui_menu_builder.py:888 gajim/gui_menu_builder.py:915
+#: gajim/gui_menu_builder.py:791 gajim/gui_menu_builder.py:818
 #, fuzzy
-msgid "Add to Roster…"
-msgstr "הו_סף לרשימה"
+msgid "Add to Contact List…"
+msgstr "הוסף _איש קשר..."
 
-#: gajim/gui_menu_builder.py:893
+#: gajim/gui_menu_builder.py:796
 #, fuzzy
 msgid "Copy Link Location"
 msgstr "ה_עתק מיקום קישור"
 
-#: gajim/gui_menu_builder.py:894
+#: gajim/gui_menu_builder.py:797
 #, fuzzy
 msgid "Open Link in Browser"
 msgstr "_פתח קישור בתוך דפדפן"
 
-#: gajim/gui_menu_builder.py:899
+#: gajim/gui_menu_builder.py:802
 #, fuzzy
 msgid "Copy Email Address"
 msgstr "ה_עתק כתובת JID/דוא״ל"
 
-#: gajim/gui_menu_builder.py:900 gajim/gui_menu_builder.py:912
+#: gajim/gui_menu_builder.py:803 gajim/gui_menu_builder.py:815
 #, fuzzy
 msgid "Open Email Composer"
 msgstr "_פתח מלחין דוא״ל"
 
-#: gajim/gui_menu_builder.py:905
+#: gajim/gui_menu_builder.py:808
 #, fuzzy
 msgid "Copy Location"
 msgstr "ה_עתק מיקום קישור"
 
-#: gajim/gui_menu_builder.py:906
+#: gajim/gui_menu_builder.py:809
 #, fuzzy
 msgid "Show Location"
 msgstr "מיקום: "
 
-#: gajim/gui_menu_builder.py:911
+#: gajim/gui_menu_builder.py:814
 #, fuzzy
-msgid "Copy JID/Email"
+msgid "Copy XMPP Address/Email"
 msgstr "ה_עתק כתובת JID/דוא״ל"
 
-#: gajim/gui_menu_builder.py:945
+#: gajim/gui_menu_builder.py:852
 #, fuzzy
 msgid "Copy"
 msgstr "cli"
@@ -588,44 +596,55 @@ msgstr "cli"
 msgid "Choose folder for logfile"
 msgstr ""
 
-#: gajim/history_manager.py:107
+#: gajim/history_manager.py:106
 msgid "Cannot find history logs database"
 msgstr "אין אפשרות למצוא מסד נתונים של רשומות היסטוריה"
 
-#: gajim/history_manager.py:108
+#: gajim/history_manager.py:107
 #, fuzzy, python-format
 msgid "%s does not exist."
 msgstr "קובץ לא קיים"
 
-#: gajim/history_manager.py:141 gajim/history_manager.py:195
-#: gajim/gtk/discovery.py:829 gajim/gtk/roster_item_exchange.py:80
-msgid "JID"
-msgstr "‏JID"
+#: gajim/history_manager.py:140 gajim/history_manager.py:194
+#: 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:30
+#: gajim/gtk/accounts.py:804
+#, fuzzy
+msgid "XMPP Address"
+msgstr "כתובת AIM:"
 
-#: gajim/history_manager.py:154 gajim/history_manager.py:202
+#: gajim/history_manager.py:153 gajim/history_manager.py:201
 #: gajim/data/gui/history_window.ui:89 gajim/gtk/history.py:108
 msgid "Date"
 msgstr "תאריך"
 
-#: gajim/history_manager.py:161 gajim/history_manager.py:225
+#: gajim/history_manager.py:160 gajim/history_manager.py:224
 #: gajim/data/gui/join_groupchat_window.ui:208
 #: gajim/data/gui/profile_window.ui:214
 #: gajim/data/gui/vcard_information_window.ui:443
+#: gajim/data/gui/bookmarks.ui:140
 msgid "Nickname"
 msgstr "שם כינוי"
 
-#: gajim/history_manager.py:172 gajim/history_manager.py:211
+#: gajim/history_manager.py:171 gajim/history_manager.py:210
 #: gajim/data/gui/preferences_window.ui:1344
 #: gajim/data/gui/single_message_window.ui:275 gajim/gtk/history.py:117
 msgid "Message"
 msgstr "הודעה"
 
-#: gajim/history_manager.py:180 gajim/history_manager.py:218
+#: gajim/history_manager.py:179 gajim/history_manager.py:217
 #: gajim/data/gui/groups_post_window.ui:49
 #: gajim/data/gui/single_message_window.ui:214
 msgid "Subject"
 msgstr "נושא"
 
+#: gajim/history_manager.py:247
+msgid "Database Cleanup"
+msgstr "ניקוי מסד נתונים"
+
 #: gajim/history_manager.py:248
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
@@ -636,11 +655,8 @@ msgstr ""
 #: gajim/history_manager.py:250
 #, fuzzy
 msgid ""
-"Normally allocated database size will not be freed, it will just become "
-"reusable. If you really want to reduce database filesize, click YES, else "
-"click NO.\n"
-"\n"
-"In case you click YES, please wait…"
+"Normally, the allocated database size will not be freed, it will just become "
+"reusable. This operation may take a while."
 msgstr ""
 "בדרך כלל גודל מסד נתונים מוקצה לא יהיה חופשי, אלא הוא רק יהפוך לכזה אשר ניתן "
 "לשימוש חוזר. אם באמת ברצונך להקטין את הגודל של קובץ מסד הנתונים, עליך להקיש "
@@ -649,51 +665,52 @@ msgstr ""
 "במידה ותבחר להקיש כן, אנא המתן..."
 
 #: gajim/history_manager.py:255
-msgid "Database Cleanup"
-msgstr "ניקוי מסד נתונים"
+#, fuzzy
+msgid "_Cleanup"
+msgstr "_נקה"
 
 # Can this be changed to: Me?
 # את/ה
-#: gajim/history_manager.py:519 gajim/gtk/filetransfer.py:238
-#: gajim/gtk/filetransfer.py:248
+#: gajim/history_manager.py:518 gajim/gtk/filetransfer.py:237
+#: gajim/gtk/filetransfer.py:247
 msgid "You"
 msgstr "עצמך"
 
 # BUG: said > wrote?
 # Needs to be tested
-#: gajim/history_manager.py:531
+#: gajim/history_manager.py:530
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "‏%(who)s בשעה %(time)s אמר/ה: %(message)s\n"
 
-#: gajim/history_manager.py:568 gajim/history_manager.py:607
-#: gajim/gtk/dialogs.py:58 gajim/gtk/themes.py:319
+#: gajim/history_manager.py:567 gajim/history_manager.py:606
+#: gajim/gtk/dialogs.py:57 gajim/gtk/themes.py:319
 #: gajim/gtk/roster_item_exchange.py:75 gajim/gtk/roster_item_exchange.py:185
 msgid "Delete"
 msgstr "מחק"
 
-#: gajim/history_manager.py:569
+#: gajim/history_manager.py:568
 #, fuzzy
 msgid "Delete Conversation"
 msgid_plural "Delete Conversations"
 msgstr[0] "אימות מחיקה"
 msgstr[1] "אימות מחיקה"
 
-#: gajim/history_manager.py:570
+#: gajim/history_manager.py:569
 #, 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:608
+#: gajim/history_manager.py:607
 #, fuzzy
 msgid "Delete Message"
 msgid_plural "Delete Messages"
 msgstr[0] "הודעה שגרתית"
 msgstr[1] "הודעה שגרתית"
 
-#: gajim/history_manager.py:609
+#: gajim/history_manager.py:608
 #, fuzzy
 msgid "Do you want to permanently delete this message"
 msgid_plural "Do you want to permanently delete these messages"
@@ -706,16 +723,16 @@ msgid "Contact name: <i>%s</i>"
 msgstr "שם איש קשר: <i>%s</i>"
 
 #: gajim/dialogs.py:84
-#, fuzzy, python-format
-msgid "JID: <i>%s</i>"
-msgstr "מזהה Jabber: ‏<i>%s</i>"
+#, python-format
+msgid "XMPP Address: <i>%s</i>"
+msgstr ""
 
 # (קבוצה כללית)
-#: gajim/dialogs.py:115 gajim/dialogs.py:128 gajim/roster_window.py:2901
-#: gajim/roster_window.py:3833 gajim/roster_window.py:5084
-#: gajim/common/contacts.py:157 gajim/common/contacts.py:190
+#: gajim/dialogs.py:115 gajim/dialogs.py:128 gajim/roster_window.py:2894
+#: gajim/roster_window.py:3784 gajim/roster_window.py:5023
+#: gajim/common/contacts.py:157 gajim/common/contacts.py:206
 #: gajim/data/gui/preferences_window.ui:558
-#: gajim/data/gui/shortcuts_window.ui:177 gajim/gtk/accounts.py:349
+#: gajim/data/gui/shortcuts_window.ui:177 gajim/gtk/accounts.py:352
 msgid "General"
 msgstr "כללית"
 
@@ -761,7 +778,7 @@ msgstr "החלף הודעת מצב?"
 msgid "Preset name is already in use. Do you want to overwrite this preset?"
 msgstr "שם זה כבר מצוי בשימוש. האם ברצונך להחליף את הודעת המצב הקיימת?"
 
-#: gajim/dialogs.py:703
+#: gajim/dialogs.py:703 gajim/plugins/gui.py:292
 #, fuzzy
 msgid "_Overwrite"
 msgstr "להחליף?"
@@ -774,9 +791,7 @@ msgstr "שמירה בתור הודעת מצב מותאמת"
 msgid "Please type a name for this status message"
 msgstr "אנא הקלד שם עבור הודעת מצב זו"
 
-#: gajim/dialogs.py:740 gajim/gui_interface.py:1441 gajim/dialog_messages.py:31
-#: gajim/gtk/discovery.py:518 gajim/gtk/profile.py:323
-#: gajim/gtk/join_groupchat.py:234
+#: gajim/dialogs.py:740 gajim/gtk/discovery.py:517 gajim/gtk/profile.py:323
 msgid "You are not connected to the server"
 msgstr "אינך מחובר לשרת"
 
@@ -784,9 +799,11 @@ msgstr "אינך מחובר לשרת"
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "ללא חיבור, אין באפשרותך לסנכרן את אנשי הקשר שלך."
 
-#: gajim/dialogs.py:752 gajim/dialogs.py:823 gajim/gtk/discovery.py:822
-#: gajim/gtk/discovery.py:1648 gajim/gtk/discovery.py:1941
-#: gajim/gtk/history.py:99 gajim/gtk/roster_item_exchange.py:83
+#: gajim/dialogs.py:752 gajim/dialogs.py:823
+#: gajim/data/gui/groupchat_info_scrolled.ui:16 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/gtk/roster_item_exchange.py:83
 msgid "Name"
 msgstr "שם"
 
@@ -810,79 +827,63 @@ msgstr "אין באפשרותך להסתנכרן עם חשבון אלא אם כ�
 msgid "Synchronise"
 msgstr "סנכרון"
 
-#: gajim/dialogs.py:1043
+#: gajim/dialogs.py:1042
 msgid "an audio and video"
 msgstr "קול וגם וידאו"
 
-#: gajim/dialogs.py:1045
+#: gajim/dialogs.py:1044
 msgid "an audio"
 msgstr "קול"
 
-#: gajim/dialogs.py:1047
+#: gajim/dialogs.py:1046
 msgid "a video"
 msgstr "וידאו"
 
-#: gajim/dialogs.py:1051
-#, python-format
+#: gajim/dialogs.py:1050
+#, fuzzy, python-format
 msgid ""
-"%(contact)s wants to start %(type)s session with you. Do you want to answer "
+"%(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:505
+#: gajim/groupchat_control.py:511
 #, fuzzy, python-format
 msgid "Send File (max. %s MiB)…"
 msgstr "שמור קובץ בשם..."
 
-#: gajim/groupchat_control.py:507 gajim/chat_control.py:342
+#: gajim/groupchat_control.py:513 gajim/chat_control.py:344
 #, fuzzy
 msgid "No File Transfer available"
 msgstr "העברת קובץ נכשלה"
 
-#: gajim/groupchat_control.py:630 gajim/groupchat_control.py:2349
-msgid "Changing Subject"
-msgstr "שינוי נושא"
-
-#: gajim/groupchat_control.py:631 gajim/groupchat_control.py:2350
-msgid "Please specify the new subject:"
-msgstr "אנא ציין את נושא חדש:"
-
-#: gajim/groupchat_control.py:638
-msgid "Changing Nickname"
-msgstr "שינוי שם כינוי"
-
-#: gajim/groupchat_control.py:639
-msgid "Please specify the new nickname you want to use:"
-msgstr "אנא ציין שם כינוי חדש אשר ברצונך לעשות בו שימוש:"
-
-#: gajim/groupchat_control.py:657
+#: gajim/groupchat_control.py:655
 #, fuzzy
-msgid "Invalid group chat JID"
+msgid "Invalid group chat XMPP Address"
 msgstr "מזהה Jabber של שיחת קבוצה שגוי"
 
-#: gajim/groupchat_control.py:658
+#: gajim/groupchat_control.py:656
 #, fuzzy
-msgid "The group chat JID has not allowed characters."
+msgid "The group chat XMPP Address has not allowed characters."
 msgstr "מזהה Jabber של שיחת קבוצה מכילה תווים אסורים."
 
-#: gajim/groupchat_control.py:758 gajim/gtk/profile.py:136
+#: gajim/groupchat_control.py:743 gajim/gtk/profile.py:136
 msgid "Could not load image"
 msgstr "לא היתה אפשרות להטעין תמונה"
 
 # להכניס/להזין
-#: gajim/groupchat_control.py:888
+#: gajim/groupchat_control.py:873
 msgid "Insert Nickname"
 msgstr "שבץ שם כינוי"
 
-#: gajim/groupchat_control.py:1056 gajim/chat_control.py:824
+#: gajim/groupchat_control.py:1041 gajim/chat_control.py:848
 msgid "and authenticated"
 msgstr "והינה מאומתת"
 
-#: gajim/groupchat_control.py:1060 gajim/chat_control.py:828
+#: gajim/groupchat_control.py:1045 gajim/chat_control.py:852
 msgid "and NOT authenticated"
 msgstr "ואינה מאומתת"
 
-#: gajim/groupchat_control.py:1064
+#: gajim/groupchat_control.py:1049
 #, fuzzy, python-format
 msgid "%(type)s encryption is active %(authenticated)s."
 msgstr ""
@@ -890,351 +891,315 @@ msgstr ""
 "סשן שיחתך %(logged)s ברשומות ההיסטוריה."
 
 # direction_mark needed
-#: gajim/groupchat_control.py:1111
+#: gajim/groupchat_control.py:1096
 msgid "Conversation with "
 msgstr "שיחה עם "
 
 # שבר משולב continued fraction
 # שיחה נמשכת
-#: gajim/groupchat_control.py:1113
+#: gajim/groupchat_control.py:1098
 msgid "Continued conversation"
 msgstr "שיחה משולבת"
 
 # ‏%(jid)s הגדיר/ה את הנושא אל %(subject)s
-#: gajim/groupchat_control.py:1411
+#: gajim/groupchat_control.py:1357
 #, python-format
 msgid "%(nick)s has set the subject to %(subject)s"
 msgstr "הנושא הוגדר על ידי %(nick)s אל %(subject)s"
 
-#: gajim/groupchat_control.py:1433
-msgid "Room now shows unavailable members"
+#: gajim/groupchat_control.py:1374
+#, fuzzy
+msgid "Group chat now shows unavailable members"
 msgstr "כרגע החדר מציג חברים אשר אינם זמינים"
 
-#: gajim/groupchat_control.py:1436
-msgid "Room now does not show unavailable members"
+#: gajim/groupchat_control.py:1377
+#, fuzzy
+msgid "Group chat now does not show unavailable members"
 msgstr "כרגע החדר לא מציג חברים אשר אינם זמינים"
 
-#: gajim/groupchat_control.py:1439
+#: gajim/groupchat_control.py:1380
 msgid "A setting not related to privacy has been changed"
 msgstr ""
 
-#: gajim/groupchat_control.py:1446
-msgid "Room logging is now enabled"
-msgstr "רישום פעילות חדר מאופשר כעת"
+#: gajim/groupchat_control.py:1387 gajim/groupchat_control.py:1659
+#, fuzzy
+msgid "Conversations are stored on the server"
+msgstr "סשן זה יושם בארכיון על שרת"
 
-#: gajim/groupchat_control.py:1449
-msgid "Room logging is now disabled"
-msgstr "רישום פעילות חדר מנוטרל כעת"
+#: gajim/groupchat_control.py:1390
+#, fuzzy
+msgid "Conversations are not stored on the server"
+msgstr "מידע אודותייך, כפי שמאוחסן בשרת"
 
 # This room is not anonymous
 # חדר לא אנונימי
-#: gajim/groupchat_control.py:1452
-msgid "Room is now non-anonymous"
+#: gajim/groupchat_control.py:1393
+#, fuzzy
+msgid "Group chat is now non-anonymous"
 msgstr "החדר אינו אנונימי"
 
-#: gajim/groupchat_control.py:1456
-msgid "Room is now semi-anonymous"
+#: gajim/groupchat_control.py:1397
+#, fuzzy
+msgid "Group chat is now semi-anonymous"
 msgstr "החדר הינו אנונימי למחצה"
 
-#: gajim/groupchat_control.py:1460
+#: gajim/groupchat_control.py:1401
 #, fuzzy
-msgid "Room is now fully anonymous"
+msgid "Group chat is now fully anonymous"
 msgstr "החדר הינו אנונימי לחלוטין"
 
-#: gajim/groupchat_control.py:1500
+#: gajim/groupchat_control.py:1439
 #, fuzzy, python-format
 msgid "Ping? (%s)"
 msgstr "פונג! (%s ש.)"
 
-#: gajim/groupchat_control.py:1503
+#: gajim/groupchat_control.py:1442
 #, fuzzy, python-format
 msgid "Pong! (%(nick)s %(delay)s s.)"
 msgstr "פונג! (%s ש.)"
 
-#: gajim/groupchat_control.py:1506 gajim/chat_control.py:1213
+#: gajim/groupchat_control.py:1445 gajim/chat_control.py:1237
 msgid "Error."
 msgstr "שגיאה."
 
 # הצטרף
-#: gajim/groupchat_control.py:1711
+#: gajim/groupchat_control.py:1650
 #, fuzzy, python-format
-msgid "You (%s) joined the room"
+msgid "You (%s) joined the group chat"
 msgstr "%s נכנס/ה לשיחת קבוצה"
 
-#: gajim/groupchat_control.py:1717
-msgid "Any occupant is allowed to see your full JID"
+#: gajim/groupchat_control.py:1655
+#, fuzzy
+msgid "Any participant is allowed to see your full XMPP Address"
 msgstr "כל נוכח רשאי לראות את המזהה Jabber שלך במלואו"
 
-#: gajim/groupchat_control.py:1721
-msgid "Room logging is enabled"
-msgstr "רישום של פעילות חדר הינו מאופשר"
-
 # BUG: room nick
 # הקצה
-#: gajim/groupchat_control.py:1725
-msgid "The server has assigned or modified your roomnick"
+#: gajim/groupchat_control.py:1663
+#, fuzzy
+msgid "The server has assigned or modified your nickname in this group chat"
 msgstr "השרת הסב או שינה את כינוי החדר שלך"
 
-#: gajim/groupchat_control.py:1732
-msgid "A new room has been created"
+#: gajim/groupchat_control.py:1671
+#, fuzzy
+msgid "A new group chat has been created"
 msgstr "חדר חדש נוצר"
 
 # את/ה ידוע/ה כעת בתור
-#: gajim/groupchat_control.py:1740 gajim/privatechat_control.py:112
+#: gajim/groupchat_control.py:1679 gajim/privatechat_control.py:115
 #, python-format
 msgid "You are now known as %s"
 msgstr "הכינוי החדש שלך הוא %s"
 
 # בכינוי
-#: gajim/groupchat_control.py:1742 gajim/privatechat_control.py:114
+#: gajim/groupchat_control.py:1681 gajim/privatechat_control.py:117
 #, fuzzy, python-brace-format
 msgid "{nick} is now known as {new_nick}"
 msgstr "%(nick)s ידוע/ה כעת בתור %(new_nick)s"
 
 # את/ה ידוע/ה כעת בתור
-#: gajim/groupchat_control.py:1767 gajim/privatechat_control.py:141
+#: gajim/groupchat_control.py:1706 gajim/privatechat_control.py:144
 #, fuzzy, python-brace-format
 msgid "You are now {show}{status}"
 msgstr "הכינוי החדש שלך הוא %s"
 
-#: gajim/groupchat_control.py:1773 gajim/privatechat_control.py:147
+#: gajim/groupchat_control.py:1712 gajim/privatechat_control.py:150
 #, fuzzy, python-brace-format
 msgid "{nick} is now {show}{status}"
 msgstr "%(nick)s מצוי/ה כעת במצב %(status)s "
 
-#: gajim/groupchat_control.py:1790 gajim/groupchat_control.py:1819
-#: gajim/groupchat_control.py:1849 gajim/groupchat_control.py:1909
+#: gajim/groupchat_control.py:1729 gajim/groupchat_control.py:1758
+#: gajim/groupchat_control.py:1788 gajim/groupchat_control.py:1848
 #, python-brace-format
 msgid " by {actor}"
 msgstr ""
 
 # נקבע
-#: gajim/groupchat_control.py:1793
+#: gajim/groupchat_control.py:1732
 #, fuzzy, python-brace-format
 msgid "** Your Affiliation has been set to {affiliation}{actor}{reason}"
 msgstr "** השיוך של %(nick)s הוגדר אל %(affiliation)s על ידי %(actor)s"
 
-#: gajim/groupchat_control.py:1799
+#: gajim/groupchat_control.py:1738
 #, fuzzy, python-brace-format
 msgid "** Affiliation of {nick} has been set to {affiliation}{actor}{reason}"
 msgstr "** השיוך של %(nick)s הוגדר אל %(affiliation)s"
 
-#: gajim/groupchat_control.py:1822
+#: gajim/groupchat_control.py:1761
 #, fuzzy, python-brace-format
 msgid "** Your Role has been set to {role}{actor}{reason}"
 msgstr "** התפקיד של %(nick)s הוגדר אל %(role)s על ידי %(actor)s"
 
-#: gajim/groupchat_control.py:1827
+#: gajim/groupchat_control.py:1766
 #, fuzzy, python-brace-format
 msgid "** Role of {nick} has been set to {role}{actor}{reason}"
 msgstr "** התפקיד של %(nick)s הוגדר אל %(role)s על ידי %(actor)s"
 
-#: gajim/groupchat_control.py:1852
+#: gajim/groupchat_control.py:1791
 #, fuzzy, python-brace-format
-msgid "You have been removed from the room{actor}{reason}"
+msgid "You have been removed from the group chat{actor}{reason}"
 msgstr "%(nick)s הוסר/ה מתוך החדר (%(reason)s)"
 
-#: gajim/groupchat_control.py:1857
+#: gajim/groupchat_control.py:1796
 #, python-brace-format
 msgid "You have left due to an error{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1863
+#: gajim/groupchat_control.py:1802
 #, python-brace-format
 msgid "You have been kicked{actor}{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1870
+#: gajim/groupchat_control.py:1809
 #, python-brace-format
 msgid "You have been banned{actor}{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1877 gajim/groupchat_control.py:1943
+#: gajim/groupchat_control.py:1816 gajim/groupchat_control.py:1882
 #, fuzzy
 msgid ": Affiliation changed"
 msgstr "שיוך שונה"
 
-#: gajim/groupchat_control.py:1883 gajim/groupchat_control.py:1948
+#: gajim/groupchat_control.py:1822 gajim/groupchat_control.py:1887
 #, fuzzy
-msgid ": Room configuration changed to members-only"
+msgid ": Group chat configuration changed to members-only"
 msgstr "תצורת חדר שונתה אל חברים-בלבד"
 
-#: gajim/groupchat_control.py:1912
+#: gajim/groupchat_control.py:1851
 #, fuzzy, python-brace-format
-msgid "{nick} has been removed from the room{by}{reason}"
+msgid "{nick} has been removed from the group chat{by}{reason}"
 msgstr "%(nick)s הוסר/ה מתוך החדר (%(reason)s)"
 
-#: gajim/groupchat_control.py:1922
+#: gajim/groupchat_control.py:1861
 #, python-brace-format
 msgid "{nick} has left due to an error{reason}"
 msgstr ""
 
 # סולק
-#: gajim/groupchat_control.py:1928
+#: gajim/groupchat_control.py:1867
 #, fuzzy, python-brace-format
 msgid "{nick} has been kicked{actor}{reason}"
 msgstr "%(nick)s נבעט/ה: %(reason)s"
 
-#: gajim/groupchat_control.py:1936
+#: gajim/groupchat_control.py:1875
 #, fuzzy, python-brace-format
 msgid "{nick} has been banned{actor}{reason}"
 msgstr "%(nick)s נאסר/ה: %(reason)s"
 
-#: gajim/groupchat_control.py:1953
+#: gajim/groupchat_control.py:1892
 #, python-brace-format
 msgid "{nick} has left{reason}"
 msgstr ""
 
 # הצטרף
-#: gajim/groupchat_control.py:1970
+#: gajim/groupchat_control.py:1914
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s נכנס/ה לשיחת קבוצה"
 
-#: gajim/groupchat_control.py:1985 gajim/groupchat_control.py:1990
-#: gajim/groupchat_control.py:1995 gajim/groupchat_control.py:2000
-#: gajim/groupchat_control.py:2011
-msgid "Unable to join group chat"
-msgstr "אין אפשרות להצטרף לשיחת קבוצה"
-
-# בכתובת
-#: gajim/groupchat_control.py:1986
-#, python-format
-msgid "You are banned from group chat <b>%s</b>."
-msgstr "נאסרת מתוך שיחת קבוצה בכתובת <b>%s</b>."
-
-#: gajim/groupchat_control.py:1991
-#, fuzzy, python-format
-msgid "Remote server <b>%s</b> does not exist."
-msgstr "שיחת קבוצה <b>%s</b> לא קיימת."
-
-#: gajim/groupchat_control.py:1996
-#, python-format
-msgid "Group chat <b>%s</b> does not exist."
-msgstr "שיחת קבוצה <b>%s</b> לא קיימת."
-
-#: gajim/groupchat_control.py:2001
+#: gajim/groupchat_control.py:1981
 #, fuzzy
-msgid "Group chat creation is not permitted."
-msgstr "יצירת שיחות קבוצה הינה מוגבלת."
-
-#: gajim/groupchat_control.py:2005
-#, fuzzy
-msgid "Unable to join groupchat"
-msgstr "אין אפשרות להצטרף לשיחת קבוצה"
-
-#: gajim/groupchat_control.py:2006
-#, fuzzy, python-format
-msgid "You must use your registered nickname in <b>%s</b>."
-msgstr "שם הכינוי הרשום שלך מוכרח להיות בשימוש בתוך שיחת קבוצה <b>%s</b>."
-
-#: gajim/groupchat_control.py:2012
-#, python-format
-msgid "You are not in the members list in groupchat %s."
-msgstr "אינך ברשימת החברים בתוך שיחות קבוצה %s."
-
-#: gajim/groupchat_control.py:2068
-msgid "Room has been destroyed"
+msgid "Group chat has been destroyed"
 msgstr "החדר הוחרב"
 
-#: gajim/groupchat_control.py:2073
+#: gajim/groupchat_control.py:1986
 #, fuzzy, python-format
-msgid "You can join this room instead: xmpp:%s?join"
+msgid "You can join this group chat instead: xmpp:%s?join"
 msgstr "באפשרותך להצטרף לחדר זה במקום: %s"
 
-#: gajim/groupchat_control.py:2306
+#: gajim/groupchat_control.py:2214
 #, fuzzy
 msgid "Leave Group Chat"
 msgstr "עזוב שיחות קבוצה"
 
-#: gajim/groupchat_control.py:2307
+#: gajim/groupchat_control.py:2215
 #, fuzzy
 msgid "Are you sure you want to leave this group chat?"
 msgstr "האם אתה בטוח כי ברצונך לעזוב את שיחת קבוצה \"%s\"?"
 
-#: gajim/groupchat_control.py:2308
+#: gajim/groupchat_control.py:2216
 #, fuzzy, python-format
-msgid "If you close this window, you will be disconnected from '%s'."
+msgid "If you close this window, you will leave '%s'."
 msgstr "כאשר תסגור את חלון זה, אתה תנותק מתוך שיחת קבוצה זו."
 
-#: gajim/groupchat_control.py:2314
+#: gajim/groupchat_control.py:2222 gajim/roster_window.py:5177
 msgid "_Leave"
 msgstr ""
 
 # in or to?
-#: gajim/groupchat_control.py:2377
+#: gajim/groupchat_control.py:2280 gajim/roster_window.py:3008
 #, fuzzy, python-format
 msgid "%(jid)s has been invited to this group chat"
 msgstr "%(jid)s הוזמן/ה לחדר זה"
 
-#: gajim/groupchat_control.py:2527
+#: gajim/groupchat_control.py:2463
 #, python-format
 msgid "Kicking %s"
 msgstr "בעיטת ‫%s"
 
-#: gajim/groupchat_control.py:2528 gajim/groupchat_control.py:2829
+#: gajim/groupchat_control.py:2464 gajim/groupchat_control.py:2765
 msgid "You may specify a reason below:"
 msgstr "באפשרותך לציין סיבה למטה:"
 
-#: gajim/groupchat_control.py:2828
+#: gajim/groupchat_control.py:2764
 #, python-format
 msgid "Banning %s"
 msgstr "אסירת ‫%s"
 
-#: gajim/chat_control.py:408
+#: gajim/chat_control.py:432
 msgid "Show a list of formattings"
 msgstr "הצגת רשימת עיצובים"
 
-#: gajim/chat_control.py:412
+#: gajim/chat_control.py:436
 msgid "This contact does not support HTML"
 msgstr "איש קשר זה לא תומך HTML"
 
 # This status message is not aligned by Gajim
 # Should a bug be reported?
-#: gajim/chat_control.py:562
+#: gajim/chat_control.py:586
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr "מצב : %(type)s :‏ %(state)s, סיבה: %(reason)s"
 
-#: gajim/chat_control.py:686
+#: gajim/chat_control.py:710
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s מתוך שיחת קבוצה %(room_name)s"
 
-#: gajim/chat_control.py:832
+#: gajim/chat_control.py:856
 #, fuzzy, python-format
 msgid "%(type)s encryption is active %(authenticated)s"
 msgstr ""
 "הצפנת %(type)s %(status)s מופעלת %(authenticated)s.\n"
 "סשן שיחתך %(logged)s ברשומות ההיסטוריה."
 
-#: gajim/chat_control.py:1160 gajim/chat_control.py:1168
+#: gajim/chat_control.py:1184 gajim/chat_control.py:1192
 #, fuzzy
 msgid "Close"
 msgstr "_שלח וסגור"
 
-#: gajim/chat_control.py:1161
+#: gajim/chat_control.py:1185
 #, fuzzy, python-format
 msgid "You just received a new message from %s"
 msgstr "זה עתה קיבלת הודעה חדשה מן \"%s\""
 
-#: gajim/chat_control.py:1163
+#: gajim/chat_control.py:1187
 #, fuzzy
 msgid ""
 "If you close this tab while having chat history disabled, this message will "
 "be lost."
 msgstr "אם כרטיסייה זו תיסגר וכאשר רשימת היסטוריה מנוטרלת אצלך. הודעה זו תאבד."
 
-#: gajim/chat_control.py:1208
+#: gajim/chat_control.py:1232
 msgid "Ping?"
 msgstr "פינג?"
 
-#: gajim/chat_control.py:1211
+#: gajim/chat_control.py:1235
 #, fuzzy, python-format
 msgid "Pong! (%s seconds)"
 msgstr "פונג! (%s ש.)"
 
-#: gajim/chat_control.py:1308
+#: gajim/chat_control.py:1332
 #, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -1243,269 +1208,277 @@ msgstr ""
 "נושא: %(subject)s\n"
 "%(message)s"
 
-#: gajim/chat_control.py:1416
+#: gajim/chat_control.py:1440
 #, fuzzy, python-format
 msgid "%(name)s is now %(show)s %(status)s"
 msgstr "%(name)s מצוי/ה כעת במצב %(status)s"
 
-#: gajim/chat_control.py:1476 gajim/data/gui/application_menu.ui:32
+#: gajim/chat_control.py:1500 gajim/data/gui/application_menu.ui:32
 #: gajim/gtk/http_upload_progress.py:35
 #, fuzzy
 msgid "File Transfer"
 msgstr "העברות קבצים"
 
-#: gajim/chat_control.py:1480
+#: gajim/chat_control.py:1504
 msgid "Size"
 msgstr "גודל"
 
-#: gajim/chat_control.py:1482 gajim/chat_control.py:1546
+#: gajim/chat_control.py:1506 gajim/chat_control.py:1566
+#: gajim/gui_interface.py:190
 #: gajim/data/gui/groupchat_invitation_received.ui:77
-#: gajim/gtk/filetransfer.py:485
+#: gajim/gtk/filetransfer.py:490
 #, fuzzy
 msgid "_Accept"
 msgstr "_קבל"
 
-#: gajim/chat_control.py:1484 gajim/chat_control.py:1548
+#: gajim/chat_control.py:1508 gajim/chat_control.py:1568
 #: gajim/data/gui/groupchat_invitation_received.ui:62
 #, fuzzy
 msgid "_Decline"
 msgstr "לא מ_קוון"
 
-#: gajim/chat_control.py:1506 gajim/gui_interface.py:791
-#: gajim/gui_interface.py:821 gajim/gui_interface.py:847
+#: gajim/chat_control.py:1530 gajim/gui_interface.py:777
+#: gajim/gui_interface.py:807 gajim/gui_interface.py:833
 #: gajim/gtk/notification.py:173 gajim/gtk/notification.py:278
 msgid "File Transfer Completed"
 msgstr "העברת קובץ הושלמה"
 
-#: gajim/chat_control.py:1510 gajim/gtk/filetransfer.py:259
+#: gajim/chat_control.py:1534 gajim/gtk/filetransfer.py:258
 #, fuzzy
 msgid "Open _Folder"
 msgstr "_פתח תיקיה מכילה"
 
-#: gajim/chat_control.py:1512 gajim/chat_control.py:1521
+#: gajim/chat_control.py:1536 gajim/chat_control.py:1545
+#: gajim/data/gui/groupchat_control.ui:962
+#: gajim/data/gui/groupchat_control.ui:1049
+#: gajim/data/gui/groupchat_control.ui:1155
 #, fuzzy
 msgid "_Close"
 msgstr "_שלח וסגור"
 
-#: gajim/chat_control.py:1543 gajim/gui_interface.py:484
+#: gajim/chat_control.py:1563 gajim/gui_interface.py:473
+#: gajim/data/gui/groupchat_invitation_received.ui:42
 #: gajim/gtk/notification.py:174 gajim/gtk/notification.py:195
 #: gajim/gtk/notification.py:281
-msgid "Groupchat Invitation"
+#, fuzzy
+msgid "Group Chat Invitation"
 msgstr "הזמנת שיחת קבוצה"
 
-#: gajim/chat_control.py:1568 gajim/roster_window.py:1954
+#: gajim/chat_control.py:1588 gajim/roster_window.py:1951
 msgid "Remote contact stopped transfer"
 msgstr "איש קשר מרוחק הפסיק העברה"
 
-#: gajim/chat_control.py:1570 gajim/roster_window.py:1956
+#: gajim/chat_control.py:1590 gajim/roster_window.py:1953
 msgid "Error opening file"
 msgstr "שגיאה בפתיחת קובץ"
 
-#: gajim/chat_control.py:1572 gajim/gtk/filetransfer.py:297
+#: gajim/chat_control.py:1592 gajim/gtk/filetransfer.py:296
 msgid "File transfer stopped"
 msgstr "העברת קובץ נעצרה"
 
-#: gajim/chat_control.py:1575 gajim/gtk/filetransfer.py:275
-#: gajim/gtk/filetransfer.py:284
+#: gajim/chat_control.py:1595 gajim/gtk/filetransfer.py:274
+#: gajim/gtk/filetransfer.py:283
 msgid "File transfer cancelled"
 msgstr "העברת קובץ בוטלה"
 
-#: gajim/chat_control.py:1576
+#: gajim/chat_control.py:1596
 msgid "Connection with peer cannot be established."
 msgstr "חיבור עם עמית לא היה אפשרי לביסוס."
 
-#: gajim/application.py:72
+#: gajim/application.py:75
 #, fuzzy
 msgid "Show the application's version"
 msgstr "הצג סמל אזור התראה:"
 
-#: gajim/application.py:79
+#: gajim/application.py:82
 #, fuzzy
 msgid "Show only critical errors"
 msgstr "cli"
 
-#: gajim/application.py:86
+#: gajim/application.py:89
 msgid "Separate profile files completely (even history database and plugins)"
 msgstr ""
 
-#: gajim/application.py:94
+#: gajim/application.py:97
 #, fuzzy
 msgid "Print XML stanzas and other debug information"
 msgstr "cli"
 
-#: gajim/application.py:101
+#: gajim/application.py:104
 #, fuzzy
 msgid "Use defined profile in configuration directory"
 msgstr "cli"
 
-#: gajim/application.py:109
+#: gajim/application.py:112
 #, fuzzy
 msgid "Set configuration directory"
 msgstr "cli"
 
-#: gajim/application.py:117
+#: gajim/application.py:120
 #, fuzzy
 msgid "Configure logging system"
 msgstr "cli"
 
-#: gajim/application.py:125
+#: gajim/application.py:128
 #, fuzzy
 msgid "Show all warnings"
 msgstr "הצג _אירועים ממתינים"
 
-#: gajim/application.py:132
+#: gajim/application.py:135
 msgid "Open IPython shell"
 msgstr ""
 
-#: gajim/application.py:139
+#: gajim/application.py:142
 #, fuzzy
 msgid "Pops up a window with the next pending event"
 msgstr "cli"
 
-#: gajim/application.py:145 gajim/data/gui/shortcuts_window.ui:203
+#: gajim/application.py:148 gajim/data/gui/shortcuts_window.ui:203
 #: data/org.gajim.Gajim.desktop.in:21
 #, fuzzy
 msgid "Start a new chat"
 msgstr "התחלת שיחה"
 
-#: gajim/application.py:152
+#: gajim/application.py:155
 msgid "Simulate loss of connectivity"
 msgstr ""
 
-#: gajim/application.py:159
+#: gajim/application.py:162
 msgid "Simulate regaining connectivity"
 msgstr ""
 
-#: gajim/application.py:201 gajim/gui_interface.py:133
+#: gajim/application.py:204 gajim/gui_interface.py:133
 msgid "Database Error"
 msgstr "שגיאת מסד נתונים"
 
-#: gajim/roster_window.py:294 gajim/roster_window.py:1030
+#: gajim/roster_window.py:291 gajim/roster_window.py:1027
 msgid "Merged accounts"
 msgstr "חשבונות ממוזגים"
 
-#: gajim/roster_window.py:853 gajim/roster_window.py:1631
-#: gajim/roster_window.py:1664 gajim/roster_window.py:1715
-#: gajim/roster_window.py:1717 gajim/roster_window.py:1872
-#: gajim/roster_window.py:2531 gajim/roster_window.py:5025
-#: gajim/common/contacts.py:188 gajim/common/contacts.py:447
-#: gajim/common/helpers.py:83 gajim/gtk/discovery.py:129
-#: gajim/gtk/discovery.py:130 gajim/gtk/discovery.py:1416
+#: gajim/roster_window.py:850 gajim/roster_window.py:1628
+#: gajim/roster_window.py:1661 gajim/roster_window.py:1712
+#: gajim/roster_window.py:1714 gajim/roster_window.py:1869
+#: gajim/roster_window.py:2528 gajim/roster_window.py:4331
+#: gajim/roster_window.py:4964 gajim/common/contacts.py:204
+#: gajim/common/contacts.py:463 gajim/common/helpers.py:86
+#: gajim/gtk/discovery.py:127 gajim/gtk/discovery.py:128
+#: gajim/gtk/discovery.py:1414
 msgid "Transports"
 msgstr "מובילים"
 
-#: gajim/roster_window.py:1723 gajim/roster_window.py:1725
-#: gajim/roster_window.py:4995 gajim/gui_interface.py:1613
-#: gajim/gui_interface.py:1639 gajim/common/contacts.py:186
-#: gajim/common/helpers.py:83 gajim/common/modules/adhoc_commands.py:245
-msgid "Groupchats"
+#: gajim/roster_window.py:1720 gajim/roster_window.py:1722
+#: gajim/roster_window.py:4331 gajim/roster_window.py:4934
+#: gajim/gui_interface.py:1527 gajim/common/contacts.py:202
+#: gajim/common/helpers.py:86 gajim/common/modules/adhoc_commands.py:245
+#, fuzzy
+msgid "Group chats"
 msgstr "שיחות קבוצה"
 
-#: gajim/roster_window.py:2012
+#: gajim/roster_window.py:2009
 #, fuzzy
 msgid "Authorization sent"
 msgstr "הרשאה נשלחה"
 
-#: gajim/roster_window.py:2013
+#: gajim/roster_window.py:2010
 #, fuzzy, python-format
 msgid "\"%s\" will now see your status."
 msgstr "מעתה המצב שלך יהיה גלוי בפני \"%s\"."
 
-#: gajim/roster_window.py:2031
+#: gajim/roster_window.py:2028
 msgid "Subscription request has been sent"
 msgstr "בקשת הרשמה נשלחה"
 
-#: gajim/roster_window.py:2032
-#, python-format
-msgid "If \"%s\" accepts this request you will know his or her status."
+#: gajim/roster_window.py:2029
+#, fuzzy, python-format
+msgid "If \"%s\" accepts this request you will know their status."
 msgstr "אם בקשתך תתקבל על ידי \"%s\" המצב שלו או שלה יהיה גלוי בפניך."
 
-#: gajim/roster_window.py:2046
+#: gajim/roster_window.py:2043
 #, fuzzy
 msgid "Authorization removed"
 msgstr "הרשאה הוסרה"
 
-#: gajim/roster_window.py:2047
+#: gajim/roster_window.py:2044
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "מעתה המצב שלך יראה בתור לא מקוון עבור \"%s\"."
 
-#: gajim/roster_window.py:2250 gajim/roster_window.py:3504
+#: gajim/roster_window.py:2247 gajim/roster_window.py:3460
 msgid "Disconnect for Invisibility"
 msgstr ""
 
-#: gajim/roster_window.py:2251 gajim/roster_window.py:3505
+#: gajim/roster_window.py:2248 gajim/roster_window.py:3461
 msgid "You are participating in one or more group chats"
 msgstr "אתה משתתף בשיחת קבוצה אחת או יותר"
 
-#: gajim/roster_window.py:2252 gajim/roster_window.py:3506
+#: gajim/roster_window.py:2249 gajim/roster_window.py:3462
 #, fuzzy
 msgid ""
-"Changing your status to invisible will result in disconnection from those "
-"group chats.\n"
+"Changing your status to invisible will result in you leaving those group "
+"chats.\n"
 "Are you sure you want to go invisible?"
 msgstr ""
 "שינוי המצב שלך אל בלתי נראה יגרום לניתוק מתוך שיחות קבוצה אלו. האם אתה בטוח "
 "כי ברצונך להפוך את המצב שלך אל בלתי נראה?"
 
-#: gajim/roster_window.py:2257 gajim/roster_window.py:3512
-#: gajim/roster_window.py:5238 gajim/data/gui/gc_control_popup_menu.ui:120
+#: gajim/roster_window.py:2254 gajim/roster_window.py:3468
+#: gajim/data/gui/gc_control_popup_menu.ui:120
 msgid "_Disconnect"
 msgstr "הת_נתק"
 
-#: gajim/roster_window.py:2285
+#: gajim/roster_window.py:2282
 #, fuzzy
 msgid "desynced"
 msgstr "לא מסונכרן"
 
 # In Hebrew: גאג'ים
-#: gajim/roster_window.py:2353 gajim/data/gui/shortcuts_window.ui:224
+#: gajim/roster_window.py:2350 gajim/data/gui/shortcuts_window.ui:224
 #, fuzzy
 msgid "Quit Gajim"
 msgstr "‫Gajim"
 
-#: gajim/roster_window.py:2354
+#: gajim/roster_window.py:2351
 #, fuzzy
 msgid "You are about to quit Gajim"
 msgstr "האם אתה בטוח כי ברצונך לסגור את Gajim?"
 
-#: gajim/roster_window.py:2355
+#: gajim/roster_window.py:2352
 msgid "Are you sure you want to quit Gajim?"
 msgstr "האם אתה בטוח כי ברצונך לסגור את Gajim?"
 
-#: gajim/roster_window.py:2356
+#: gajim/roster_window.py:2353
 #, fuzzy
 msgid "_Always quit when closing Gajim"
 msgstr "סגור את Gajim תמיד"
 
-#: gajim/roster_window.py:2359 gajim/roster_window.py:2455
-#: gajim/roster_window.py:2495 gajim/data/gui/systray_context_menu.ui:90
+#: gajim/roster_window.py:2356 gajim/roster_window.py:2452
+#: gajim/roster_window.py:2492 gajim/data/gui/systray_context_menu.ui:83
 msgid "_Quit"
 msgstr ""
 
-#: gajim/roster_window.py:2448
+#: gajim/roster_window.py:2445
 #, fuzzy
 msgid "Stop File Transfers"
 msgstr "העברות קבצים"
 
-#: gajim/roster_window.py:2449
+#: gajim/roster_window.py:2446
 #, fuzzy
 msgid "You still have running file transfers"
 msgstr "נותרו העברות קבצים פעילות"
 
-#: gajim/roster_window.py:2450
+#: gajim/roster_window.py:2447
 #, fuzzy
 msgid ""
 "If you quit now, the file(s) being transferred will be lost.\n"
 "Do you still want to quit?"
 msgstr "אם תצא עכשיו, הקבצים אשר מועברים כעת יופסקו. האם עדיין ברצונך לצאת?"
 
-#: gajim/roster_window.py:2488
+#: gajim/roster_window.py:2485
 #, fuzzy
 msgid "Unread Messages"
 msgstr "אירועים אשר לא נקראו"
 
-#: gajim/roster_window.py:2489
+#: gajim/roster_window.py:2486
 #, fuzzy
 msgid "You still have unread messages"
 msgstr "נותרו הודעות אשר לא נקראו"
@@ -1513,7 +1486,7 @@ msgstr "נותרו הודעות אשר לא נקראו"
 # BUG: and (A or THE) contact
 # קיימת לרשותך
 # היסטוריה מאופשרת
-#: gajim/roster_window.py:2490
+#: gajim/roster_window.py:2487
 #, fuzzy
 msgid ""
 "Messages will only be available for reading them later if storing chat "
@@ -1522,20 +1495,20 @@ msgstr ""
 "הודעות יהיו זמינות לקריאה מאוחרת רק אם אפשרת רישום היסטוריה ואיש הקשר מצוי "
 "ברשימה שלך."
 
-#: gajim/roster_window.py:2760
+#: gajim/roster_window.py:2753
 msgid "You have unread messages"
 msgstr "נותרו הודעות אשר לא נקראו"
 
-#: gajim/roster_window.py:2761
+#: gajim/roster_window.py:2754
 msgid "You must read them before removing this transport."
 msgstr "עליך לקרוא אותן בטרם הסרת מוביל זה."
 
-#: gajim/roster_window.py:2764
+#: gajim/roster_window.py:2757
 #, fuzzy, python-format
 msgid "Transport '%s' will be removed"
 msgstr "מוביל \"%s\" יוסר"
 
-#: gajim/roster_window.py:2765
+#: gajim/roster_window.py:2758
 #, fuzzy
 msgid ""
 "You will no longer be able to send and receive messages from and to contacts "
@@ -1543,11 +1516,11 @@ msgid ""
 msgstr ""
 "לא תעמוד עוד לרשותך האפשרות לקבל וגם לשלוח הודעות מאנשי קשר באמצעות מוביל זה."
 
-#: gajim/roster_window.py:2768
+#: gajim/roster_window.py:2761
 msgid "Transports will be removed"
 msgstr "מובילים יוסרו"
 
-#: gajim/roster_window.py:2773
+#: gajim/roster_window.py:2766
 #, fuzzy, python-format
 msgid ""
 "You will no longer be able to send and receive messages from and to contacts "
@@ -1556,24 +1529,24 @@ msgid ""
 msgstr ""
 "לא תעמוד עוד לרשותך האפשרות לקבל וגם לשלוח הודעות מאנשי קשר באמצעות מוביל זה."
 
-#: gajim/roster_window.py:2777
+#: gajim/roster_window.py:2770
 #, fuzzy
 msgid "Remove Transport"
 msgstr "הצג מו_בילים"
 
-#: gajim/roster_window.py:2844
+#: gajim/roster_window.py:2837
 #, fuzzy
 msgid "Block Contact"
 msgstr "אנשי קשר חסומים"
 
-#: gajim/roster_window.py:2845
+#: gajim/roster_window.py:2838
 #, fuzzy
 msgid "Really block this contact?"
 msgstr "האם OpenPGP מאופשרת עבור איש קשר זה?"
 
 # BUG: HE and SHE
 # על ידו או על ידה
-#: gajim/roster_window.py:2846
+#: gajim/roster_window.py:2839
 #, fuzzy
 msgid ""
 "This contact will see you offline and you will not receive any messages sent "
@@ -1582,65 +1555,59 @@ msgstr ""
 "איש קשר זה תמיד יראה אותך במצב לא מקוון ולא תהיה באפשרותך לקבל הודעות אשר "
 "יישלחו אליך ממנו."
 
-#: gajim/roster_window.py:2851
+#: gajim/roster_window.py:2844
 #, fuzzy
 msgid "_Block Contact"
 msgstr "אנשי קשר חסומים"
 
-#: gajim/roster_window.py:2896
+#: gajim/roster_window.py:2889
 msgid "Rename Contact"
 msgstr "שינוי שם איש קשר"
 
-#: gajim/roster_window.py:2897
+#: gajim/roster_window.py:2890
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "הזן שם כינוי חדש עבור איש קשר %s"
 
-#: gajim/roster_window.py:2904
+#: gajim/roster_window.py:2897
 msgid "Rename Group"
 msgstr "שינוי שם קבוצה"
 
-#: gajim/roster_window.py:2905
+#: gajim/roster_window.py:2898
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "הזן שם חדש עבור קבוצת %s"
 
-#: gajim/roster_window.py:2953 gajim/roster_window.py:2954
+#: gajim/roster_window.py:2946 gajim/roster_window.py:2947
 msgid "Remove Group"
 msgstr "הסרת קבוצה"
 
-#: gajim/roster_window.py:2955
+#: gajim/roster_window.py:2948
 #, fuzzy, python-format
 msgid "Do you want to remove %s from the contact list?"
 msgstr "האם ברצונך להסיר את קבוצת %s מתוך הרשימה?"
 
-#: gajim/roster_window.py:2956
+#: gajim/roster_window.py:2949
 #, fuzzy
 msgid "_Also remove all contacts of this group from contact list"
 msgstr "הסר גם את כל אנשי הקשר שבקבוצה זו מתוך הרשימה שלי"
 
-# in or to?
-#: gajim/roster_window.py:3044
-#, python-format
-msgid "%(jid)s has been invited in this room"
-msgstr "%(jid)s הוזמן/ה לחדר זה"
-
-#: gajim/roster_window.py:3353
+#: gajim/roster_window.py:3309
 #, fuzzy
 msgid "Remove Contact"
 msgstr "שינוי שם איש קשר"
 
-#: gajim/roster_window.py:3354
+#: gajim/roster_window.py:3310
 #, fuzzy
 msgid "Remove contact from contact list"
 msgstr "cli"
 
-#: gajim/roster_window.py:3355
+#: gajim/roster_window.py:3311
 #, 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:3364 gajim/roster_window.py:3384
+#: gajim/roster_window.py:3320 gajim/roster_window.py:3340
 #, fuzzy
 msgid ""
 "By removing this contact you also remove authorization. This means the "
@@ -1650,22 +1617,22 @@ msgstr ""
 "אתה גם תסיר הרשאה דבר אשר יגרום למצב בו אנשי קשר אלה תמיד יראו אותך במצב לא "
 "מקוון."
 
-#: gajim/roster_window.py:3375
+#: gajim/roster_window.py:3331
 msgid "Do you want to continue?"
 msgstr "האם ברצונך להמשיך?"
 
 # לאחר כעבור
-#: gajim/roster_window.py:3386
+#: gajim/roster_window.py:3342
 #, fuzzy
 msgid "_I want this contact to know my status after removal"
 msgstr "ברצוני כי איש קשר זה יהיה מיודע באשר למצב שלי עובר הסרה"
 
-#: gajim/roster_window.py:3393
+#: gajim/roster_window.py:3349
 #, fuzzy
 msgid "Remove contacts from contact list"
 msgstr "cli"
 
-#: gajim/roster_window.py:3399
+#: gajim/roster_window.py:3355
 #, fuzzy, python-format
 msgid ""
 "By removing the following contacts, you will also remove authorization. This "
@@ -1677,25 +1644,25 @@ msgstr ""
 "אתה גם תסיר הרשאה דבר אשר יגרום למצב בו אנשי קשר אלה תמיד יראו אותך במצב לא "
 "מקוון."
 
-#: gajim/roster_window.py:3403
+#: gajim/roster_window.py:3359
 #, fuzzy
 msgid "Remove Contacts"
 msgstr "שינוי שם איש קשר"
 
-#: gajim/roster_window.py:3423
+#: gajim/roster_window.py:3379
 msgid "No account available"
 msgstr "אין חשבון זמין"
 
 # לפני שתעמוד לרשותך האפשרות לשוחח
-#: gajim/roster_window.py:3424
+#: gajim/roster_window.py:3380
 msgid "You must create an account before you can chat with other contacts."
 msgstr "עליך ליצור חשבון בטרם תהיה באפשרותך לשוחח עם אנשי קשר אחרים."
 
-#: gajim/roster_window.py:4060
+#: gajim/roster_window.py:4011
 msgid "Metacontacts storage not supported by your server"
 msgstr "אחסון אנשי קשר מוצמדים לא נתמך על ידי השרת שלך"
 
-#: gajim/roster_window.py:4062
+#: gajim/roster_window.py:4013
 msgid ""
 "Your server does not support storing metacontacts information. So this "
 "information will not be saved on next reconnection."
@@ -1703,12 +1670,12 @@ msgstr ""
 "השרת שלך לא תומך באחסון מידע אנשי קשר מוצמדים. לכן מידע זה לא יישמר בהתחברות "
 "הבאה."
 
-#: gajim/roster_window.py:4159
+#: gajim/roster_window.py:4110
 #, fuzzy
 msgid "You are about to create a metacontact"
 msgstr "בחרת ליצור איש קשר מוצמד. האם אתה בטוח כי ברצונך להמשיך?"
 
-#: gajim/roster_window.py:4160
+#: gajim/roster_window.py:4111
 #, fuzzy
 msgid ""
 "Metacontacts are a way to regroup several contacts in one single contact. "
@@ -1719,125 +1686,116 @@ msgstr ""
 "כללי זו בשימוש כאשר אותה האישיות מחזיקה במספר חשבונות Jabber או חשבונות "
 "מוביל."
 
-#: gajim/roster_window.py:4164
+#: gajim/roster_window.py:4115
 #, fuzzy
 msgid "Create Metacontact"
 msgstr "שינוי שם איש קשר"
 
-#: gajim/roster_window.py:4170
+#: gajim/roster_window.py:4121 gajim/data/gui/groupchat_creation.ui:317
 #, fuzzy
 msgid "_Create"
 msgstr "יצירתי"
 
-#: gajim/roster_window.py:4287
+#: gajim/roster_window.py:4238
 msgid "Invalid file URI:"
 msgstr "כתובת URI של קובץ שגויה:"
 
-#: gajim/roster_window.py:4298
+#: gajim/roster_window.py:4249
 #, fuzzy
 msgid "Send file?"
 msgstr "שלח _קובץ"
 
-#: gajim/roster_window.py:4299
+#: gajim/roster_window.py:4250
 #, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
 msgstr[0] "האם ברצונך לשלוח קובץ זה אל %s:"
 msgstr[1] "האם ברצונך לשלוח קבצים אלו אל %s:"
 
-#: gajim/roster_window.py:4451
+#: gajim/roster_window.py:4401
 #, fuzzy, python-format
 msgid "Send %(from)s to %(to)s"
 msgstr "שלח את %s אל %s"
 
-#: gajim/roster_window.py:4464
+#: gajim/roster_window.py:4414
 #, python-format
 msgid "Make %s first contact"
 msgstr "הפוך את %s לאיש קשר ראשון"
 
-#: gajim/roster_window.py:4469
+#: gajim/roster_window.py:4419
 #, fuzzy, python-format
 msgid "Make %(contact1)s and %(contact2)s metacontacts"
 msgstr "הפוך את %s ואת %s לאנשי קשר מוצמדים"
 
-#: gajim/roster_window.py:4825 gajim/roster_window.py:4923
+#: gajim/roster_window.py:4775 gajim/roster_window.py:4862
 msgid "_Change Status Message"
 msgstr "_שנה הודעת מצב"
 
-#: gajim/roster_window.py:4845
+#: gajim/roster_window.py:4795
 msgid "Publish Tune"
 msgstr "פרסם לחן"
 
-#: gajim/roster_window.py:4856
+#: gajim/roster_window.py:4806
 msgid "Publish Location"
 msgstr "פרסם מיקום"
 
-#: gajim/roster_window.py:4868
-#, fuzzy
-msgid "Configure Services…"
-msgstr "הגדר שירותים..."
-
 # restore
-#: gajim/roster_window.py:4997
+#: gajim/roster_window.py:4936
 msgid "_Maximize All"
 msgstr "ה_גדל את כולם"
 
-#: gajim/roster_window.py:5004 gajim/roster_window.py:5146
+#: gajim/roster_window.py:4943 gajim/roster_window.py:5085
 msgid "Send Group M_essage"
 msgstr "שלח הודעת _אשכול"
 
-#: gajim/roster_window.py:5011
+#: gajim/roster_window.py:4950
 msgid "To all users"
 msgstr "אל כל המשתמשים"
 
-#: gajim/roster_window.py:5015
+#: gajim/roster_window.py:4954
 msgid "To all online users"
 msgstr "אל כל המשתמשים המקוונים"
 
-#: gajim/roster_window.py:5027 gajim/roster_window.py:5152
+#: gajim/roster_window.py:4966 gajim/roster_window.py:5091
 #: gajim/data/gui/gc_occupants_menu.ui:110
 #: gajim/data/gui/contact_context_menu.ui:36
 msgid "In_vite to"
 msgstr "ה_זמן אל"
 
-#: gajim/roster_window.py:5162
+#: gajim/roster_window.py:5101
 msgid "_Manage Contacts"
 msgstr "_נהל אנשי קשר"
 
-#: gajim/roster_window.py:5168
+#: gajim/roster_window.py:5107
 #, fuzzy
 msgid "Edit _Groups…"
 msgstr "ערוך _קבוצות"
 
-#: gajim/roster_window.py:5189 gajim/data/gui/filetransfers.ui:12
+#: gajim/roster_window.py:5128 gajim/data/gui/filetransfers.ui:12
 #: gajim/data/gui/remove_account_window.ui:134
 msgid "_Remove"
 msgstr "הס_ר"
 
 # Restore שחזר
-#: gajim/roster_window.py:5226
+#: gajim/roster_window.py:5165
 msgid "_Maximize"
 msgstr "ה_גדל"
 
-#: gajim/roster_window.py:5233
+#: gajim/roster_window.py:5172
 msgid "_Reconnect"
 msgstr "הת_חבר מחדש"
 
-#: gajim/roster_window.py:5254 gajim/data/gui/gc_occupants_menu.ui:170
+#: gajim/roster_window.py:5193 gajim/data/gui/gc_occupants_menu.ui:170
 #: gajim/data/gui/gc_control_popup_menu.ui:113
 #: gajim/data/gui/contact_context_menu.ui:205
 msgid "_History"
 msgstr "_היסטוריה"
 
-#: gajim/roster_window.py:5335 gajim/data/gui/application_menu.ui:86
+#: gajim/roster_window.py:5274 gajim/data/gui/application_menu.ui:83
 #: gajim/data/gui/history_window.ui:57
 msgid "History Manager"
 msgstr "מנהל היסטוריה"
 
-#: gajim/roster_window.py:5343
-msgid "_Join New Group Chat"
-msgstr "ה_צטרף לשיחת קבוצה חדשה"
-
 #: gajim/dataforms_widget.py:585
 msgid "Unable to load image"
 msgstr "אין אפשרות לטעון תמונה"
@@ -1963,257 +1921,274 @@ msgstr "נושא: %s\n"
 msgid "Write a message…"
 msgstr "cli"
 
-#: gajim/message_window.py:250
+#: gajim/message_window.py:356
+#, fuzzy
+msgid "Close Tabs"
+msgstr "_שלח וסגור"
+
+#: gajim/message_window.py:357
 msgid "You are going to close several tabs"
 msgstr "בחרת לסגור מספר כרטיסיות"
 
-#: gajim/message_window.py:251
+#: gajim/message_window.py:358
 msgid "Do you really want to close them all?"
 msgstr "האם אתה בטוח כי ברצונך לסגור את כולן?"
 
-#: gajim/message_window.py:539
+#: gajim/message_window.py:514
 #, fuzzy
 msgid "?Noun:Chats"
 msgstr "שיחות קבוצה"
 
-#: gajim/message_window.py:543
+#: gajim/message_window.py:518
 #, fuzzy
 msgid "Group Chats"
 msgstr "שיחות קבוצה"
 
-#: gajim/message_window.py:547
+#: gajim/message_window.py:522
 msgid "Private Chats"
 msgstr "שיחות פרטיות"
 
-#: gajim/message_window.py:553
+#: gajim/message_window.py:528
 msgid "Messages"
 msgstr "הודעות"
 
-#: gajim/gui_interface.py:173
+#: gajim/gui_interface.py:170
+#, 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:175
 msgid "Do you accept this request?"
 msgstr "האם לקבל את בקשה זו?"
 
-#: gajim/gui_interface.py:175
-#, python-format
-msgid "Do you accept this request on account %s?"
+#: gajim/gui_interface.py:177
+#, fuzzy, python-format
+msgid "Do you accept this request (account: %s)?"
 msgstr "האם לקבל את בקשה זו בחשבון %s?"
 
-#: gajim/gui_interface.py:178
-#, 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:182
+#, fuzzy
+msgid "Authorization"
+msgstr "הרשאה נשלחה"
 
-#: gajim/gui_interface.py:194 gajim/gtk/notification.py:175
+#: gajim/gui_interface.py:186 gajim/gui_interface.py:420
+#: gajim/gtk/filetransfer.py:338
+#, fuzzy
+msgid "_No"
+msgstr "לא"
+
+#: gajim/gui_interface.py:205 gajim/gtk/notification.py:175
 #: gajim/gtk/notification.py:197
 msgid "Connection Failed"
 msgstr "התחברות נכשלה"
 
-#: gajim/gui_interface.py:279 gajim/gui_interface.py:529
-msgid "Password Required"
-msgstr "נדרשת מילת מעבר"
-
-#: gajim/gui_interface.py:280
-#, python-format
-msgid "A Password is required to join the room %s. Please type it."
-msgstr "נדרשת מילת מעבר כדי להצטרף לחדר %s. אנא הקלד אותה."
-
-#: gajim/gui_interface.py:342 gajim/gui_interface.py:346
+#: gajim/gui_interface.py:325 gajim/gui_interface.py:329
 #, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr "שגיאה %(code)s: ‏%(msg)s"
 
-#: gajim/gui_interface.py:357 gajim/gui_interface.py:376
+#: gajim/gui_interface.py:340 gajim/gui_interface.py:359
 #: gajim/common/modules/message.py:122
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "שגיאה בעת מסירת %(message)s ‏( %(error)s )"
 
-#: gajim/gui_interface.py:401 gajim/gtk/notification.py:175
+#: gajim/gui_interface.py:384 gajim/gtk/notification.py:175
 msgid "Subscription request"
 msgstr "בקשת הרשמה"
 
-#: gajim/gui_interface.py:413 gajim/common/contacts.py:184
-#: gajim/common/helpers.py:83
+#: gajim/gui_interface.py:396 gajim/common/contacts.py:200
+#: gajim/common/helpers.py:86
 msgid "Observers"
 msgstr "משקיפים"
 
-#: gajim/gui_interface.py:422
+#: gajim/gui_interface.py:405
 msgid "Authorization accepted"
 msgstr "התקבלה הרשאה"
 
-#: gajim/gui_interface.py:423
+#: gajim/gui_interface.py:406
 #, fuzzy, python-format
 msgid "The contact \"%s\" has authorized you to see their status."
 msgstr "הוענקה לך הרשאה מאת \"%s\" לראות את המצב שלו או שלה."
 
-#: gajim/gui_interface.py:431
-#, python-format
-msgid "Contact \"%s\" removed subscription from you"
+#: gajim/gui_interface.py:415
+#, fuzzy
+msgid "Subscription Removed"
+msgstr "בקשת הרשמה"
+
+#: gajim/gui_interface.py:416
+#, fuzzy, python-format
+msgid "Contact '%s' removed subscription from you"
 msgstr "איש קשר \"%s\" הסיר הרשמה ממך"
 
-#: gajim/gui_interface.py:432
+#: gajim/gui_interface.py:417
 #, fuzzy
 msgid ""
-"You will always see them as offline.\n"
+"You will always see this contact as offline.\n"
 "Do you want to remove them from your contact list?"
 msgstr ""
 "איש קשר זה תמיד ייראה עבורך במצב לא מקוון.\n"
 "האם ברצונך להסיר אותו מתוך הרשימת קשר שלך?"
 
-#: gajim/gui_interface.py:453 gajim/gtk/notification.py:176
+#: gajim/gui_interface.py:442 gajim/gtk/notification.py:176
 msgid "Unsubscribed"
 msgstr "הרשמה בוטלה"
 
-#: gajim/gui_interface.py:465
+#: gajim/gui_interface.py:454
 #, python-format
 msgid "%(jid)s declined the invitation: %(reason)s"
 msgstr "%(jid)s סרב/ה את ההזמנה: %(reason)s"
 
-#: gajim/gui_interface.py:469
+#: gajim/gui_interface.py:458
 #, python-format
 msgid "%(jid)s declined the invitation"
 msgstr "%(jid)s סרב/ה את ההזמנה"
 
 # Changed to: You have been invited to a groupchat
-#: gajim/gui_interface.py:485
+#: gajim/gui_interface.py:474
 #, fuzzy, python-brace-format
 msgid "You are invited to {room} by {user}"
 msgstr "הוזמנת לשיחת קבוצה"
 
-#: gajim/gui_interface.py:506
+#: gajim/gui_interface.py:495
 msgid "Certificate Passphrase Required"
 msgstr "נדרשת מימרת סיסמה של תעודת"
 
-#: gajim/gui_interface.py:507
+#: gajim/gui_interface.py:496
 #, fuzzy, python-format
 msgid "Enter the certificate passphrase for account %s"
 msgstr "הזן מימרת סיסמה עבור התעודה עבור חשבון %s"
 
-#: gajim/gui_interface.py:516 gajim/gtk/accounts.py:963
+#: gajim/gui_interface.py:505 gajim/gtk/accounts.py:966
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "הזן סיסמה עבור חשבון %s"
 
-#: gajim/gui_interface.py:529 gajim/gtk/accounts.py:964
+#: gajim/gui_interface.py:518
+msgid "Password Required"
+msgstr "נדרשת מילת מעבר"
+
+#: gajim/gui_interface.py:518 gajim/gtk/accounts.py:967
 msgid "Save password"
 msgstr "שמור סיסמה"
 
-#: gajim/gui_interface.py:601 gajim/gui_interface.py:632
+#: gajim/gui_interface.py:587 gajim/gui_interface.py:618
+#: gajim/gtk/filetransfer.py:332 gajim/gtk/filetransfer.py:333
 #: gajim/gtk/notification.py:173 gajim/gtk/notification.py:276
 msgid "File Transfer Error"
 msgstr "שגיאת העברת קובץ"
 
-#: gajim/gui_interface.py:666
+#: gajim/gui_interface.py:652
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "‏%s רוצה לשלוח לך קובץ."
 
-#: gajim/gui_interface.py:668 gajim/gtk/filetransfer.py:479
+#: gajim/gui_interface.py:654 gajim/gtk/filetransfer.py:484
 #: gajim/gtk/notification.py:172 gajim/gtk/notification.py:274
 msgid "File Transfer Request"
 msgstr "בקשת העברת קובץ"
 
-#: gajim/gui_interface.py:767
+#: gajim/gui_interface.py:753
 #, fuzzy
 msgid "Remote Contact Stopped Transfer"
 msgstr "איש קשר מרוחק הפסיק העברה"
 
-#: gajim/gui_interface.py:772
+#: gajim/gui_interface.py:758
 #, fuzzy
 msgid "Error Opening File"
 msgstr "שגיאה בפתיחת קובץ"
 
-#: gajim/gui_interface.py:782
+#: gajim/gui_interface.py:768
 #, fuzzy
 msgid "SSL Certificate Error"
 msgstr "שגיאת תעודת SSL"
 
-#: gajim/gui_interface.py:795 gajim/gui_interface.py:826
-#: gajim/gui_interface.py:853 gajim/gtk/notification.py:174
+#: gajim/gui_interface.py:781 gajim/gui_interface.py:812
+#: gajim/gui_interface.py:839 gajim/gtk/notification.py:174
 #: gajim/gtk/notification.py:279
 msgid "File Transfer Stopped"
 msgstr "העברת קובץ נעצרה"
 
-#: gajim/gui_interface.py:799
+#: gajim/gui_interface.py:785
 msgid "File Transfer Failed"
 msgstr "העברת קובץ נכשלה"
 
-#: gajim/gui_interface.py:822
+#: gajim/gui_interface.py:808
 #, fuzzy, python-format
 msgid "%(filename)s received from %(name)s."
 msgstr "העברת קובץ %(filename)s מן %(name)s נכשלה."
 
-#: gajim/gui_interface.py:827
+#: gajim/gui_interface.py:813
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "העברת קובץ %(filename)s מן %(name)s נעצרה."
 
-#: gajim/gui_interface.py:833
+#: gajim/gui_interface.py:819
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s failed."
 msgstr "העברת קובץ %(filename)s מן %(name)s נכשלה."
 
-#: gajim/gui_interface.py:848
+#: gajim/gui_interface.py:834
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "שלחת בהצלחה את %(filename)s אל %(name)s."
 
-#: gajim/gui_interface.py:854
+#: gajim/gui_interface.py:840
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "העברת קובץ %(filename)s אל %(name)s נעצרה."
 
-#: gajim/gui_interface.py:860
+#: gajim/gui_interface.py:846
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s failed."
 msgstr "העברת הקובץ %(filename)s אל %(name)s נכשלה."
 
 # התנגשויות, ניגודים, קונפליקט
-#: gajim/gui_interface.py:971
+#: gajim/gui_interface.py:957
 msgid "Username Conflict"
 msgstr "התנגשות שם משתמש"
 
-#: gajim/gui_interface.py:972
+#: gajim/gui_interface.py:958
 msgid "Please type a new username for your local account"
 msgstr "אנא הקלד שם משתמש חדש עבור חשבונך המקומי"
 
-#: gajim/gui_interface.py:995
+#: gajim/gui_interface.py:981
 msgid "Resource Conflict"
 msgstr "התנגשות משאב"
 
-#: gajim/gui_interface.py:996
+#: gajim/gui_interface.py:982
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
 msgstr "אתה כבר מחובר לחשבון זה באמצעות אותו משאב. אנא הקלד אחד חדש"
 
-#: gajim/gui_interface.py:1053
+#: gajim/gui_interface.py:1039
 #, python-format
 msgid "%s wants to start a voice chat."
 msgstr "‏%s רוצה להתחיל שיחה קולית."
 
-#: gajim/gui_interface.py:1055
+#: gajim/gui_interface.py:1041
 msgid "Voice Chat Request"
 msgstr "בקשה לשיחה קולית"
 
 # BUG: גודל אותיות באנגלית?
-#: gajim/gui_interface.py:1123 gajim/gtk/account_wizard.py:312
+#: gajim/gui_interface.py:1109 gajim/gtk/account_wizard.py:312
 msgid "Certificate Already in File"
 msgstr "התעודה כבר מצויה בקובץ"
 
 # חריג לכלל: עשיתי שימוש במילה שנית במקום שוב מכיוון שתמיד יהיה 'ראשון' ולאחריו שני
-#: gajim/gui_interface.py:1124 gajim/gtk/account_wizard.py:313
+#: gajim/gui_interface.py:1110 gajim/gtk/account_wizard.py:313
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr "תעודה זו כבר מצויה בקובץ %s, ולכן היא לא תוסף בשנית."
 
 # חסרת תוקף
-#: gajim/gui_interface.py:1145
+#: gajim/gui_interface.py:1131
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid"
 msgstr "אמינותה של התעודה %s עלולה להיות רעועה"
 
-#: gajim/gui_interface.py:1148
+#: gajim/gui_interface.py:1134
 #, python-format
 msgid ""
 "\n"
@@ -2222,7 +2197,7 @@ msgstr ""
 "\n"
 "שגיאת SSL לא מוכרת: %d"
 
-#: gajim/gui_interface.py:1150
+#: gajim/gui_interface.py:1136
 #, python-format
 msgid ""
 "\n"
@@ -2231,11 +2206,11 @@ msgstr ""
 "\n"
 "שגיאת SSL: ‏<b>%s</b>"
 
-#: gajim/gui_interface.py:1155
+#: gajim/gui_interface.py:1141
 msgid "Error verifying SSL certificate"
 msgstr "שגיאה באימות תעודת SSL"
 
-#: gajim/gui_interface.py:1156
+#: gajim/gui_interface.py:1142
 #, fuzzy, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your XMPP server: "
@@ -2245,7 +2220,7 @@ msgstr ""
 "אירעה שגיאה תוך כדי אימות תעודת SSL של שרת Jabber זה: %(error)s\n"
 "האם עדיין יש ברצונך להתחבר לשרת זה?"
 
-#: gajim/gui_interface.py:1160 gajim/gtk/account_wizard.py:412
+#: gajim/gui_interface.py:1146 gajim/gtk/account_wizard.py:413
 #, fuzzy, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -2258,184 +2233,175 @@ msgstr ""
 "טביעת אצבע SHA1 של התעודה:\n"
 "%s"
 
-#: gajim/gui_interface.py:1166
+#: gajim/gui_interface.py:1152
 msgid "Ignore this error for this certificate."
 msgstr "התעלם משגיאה זו עבור תעודה זו."
 
-#: gajim/gui_interface.py:1174
+#: gajim/gui_interface.py:1160
 #, python-format
 msgid "SSL Certificate Verification for %s"
 msgstr "אימות תעודת SSL עבור %s"
 
-#: gajim/gui_interface.py:1442 gajim/gtk/join_groupchat.py:235
-msgid "You can not join a group chat unless you are connected."
-msgstr "אין באפשרותך להצטרף לשיחת קבוצה אלא כאשר תחובר."
-
-#: gajim/gui_interface.py:1448
-#, fuzzy
-msgid "JID is not a Groupchat"
-msgstr "זוהי אינה שיחת קבוצה"
-
-#: gajim/gui_interface.py:1579
-msgid "This is not a group chat"
-msgstr "זוהי אינה שיחת קבוצה"
-
-#: gajim/gui_interface.py:1580
-#, python-format
-msgid ""
-"%(room_jid)s is already in your roster. Please check if %(room_jid)s is a "
-"correct group chat name. If it is, delete it from your roster and try "
-"joining the group chat again."
-msgstr ""
-
-#: gajim/gui_interface.py:1604 gajim/dialog_messages.py:58
+#: gajim/gui_interface.py:1577
 msgid "You cannot join a group chat while you are invisible"
 msgstr "אין באפשרותך להשתתף בשיחת קבוצה כאשר הינך במצב בלתי נראה"
 
-#: gajim/gui_interface.py:2037
+#: gajim/gui_interface.py:1976
 msgid "Could not save your settings and preferences"
 msgstr "לא היתה אפשרות לשמור את ההגדרות וההעדפות שלך"
 
-#: gajim/gui_interface.py:2098
+#: gajim/gui_interface.py:2037
 msgid "Gajim: IPython Console"
 msgstr ""
 
-#: gajim/dialog_messages.py:32
+#: gajim/dialog_messages.py:31 gajim/dialog_messages.py:36
+#: gajim/gtk/single_message.py:305 gajim/gtk/account_wizard.py:229
 #, fuzzy
-msgid "You can not start a new conversation unless you are connected."
-msgstr "אין באפשרותך להצטרף לשיחת קבוצה אלא כאשר תחובר."
-
-#: gajim/dialog_messages.py:36 gajim/dialog_messages.py:41
-#: gajim/gtk/single_message.py:305 gajim/gtk/join_groupchat.py:211
-#: gajim/gtk/account_wizard.py:229
-msgid "Invalid JID"
-msgstr "כתובת JID שגויה"
+msgid "Invalid XMPP Address"
+msgstr "קובץ שגוי"
 
-#: gajim/dialog_messages.py:42 gajim/gtk/single_message.py:306
-#, python-format
-msgid "It is not possible to send a message to %s, this JID is not valid."
+#: gajim/dialog_messages.py:37
+#, fuzzy, python-format
+msgid ""
+"It is not possible to send a message to %s. This XMPP Address is not valid."
 msgstr "אין אפשרות לשלוח הודעה אל %s, כתובת JID זו אינה תקפה."
 
-#: gajim/dialog_messages.py:47
-msgid "Unread events"
+#: gajim/dialog_messages.py:42
+#, fuzzy
+msgid "Unread Events"
 msgstr "אירועים אשר לא נקראו"
 
-#: gajim/dialog_messages.py:48
-msgid "Read all pending events before removing this account."
+#: gajim/dialog_messages.py:43
+#, fuzzy
+msgid "Read or acknowledge all pending events before removing this account."
 msgstr "קרא את כל האירועים אשר ממתינים בטרם הסרת חשבון זה."
 
-#: gajim/dialog_messages.py:52
+#: gajim/dialog_messages.py:48
 msgid "Invalid Form"
 msgstr "טופס שגוי"
 
-#: gajim/dialog_messages.py:53
+#: gajim/dialog_messages.py:49
 msgid "The form is not filled correctly."
 msgstr "הטופס אינו ממולא כראוי."
 
-#: gajim/dialog_messages.py:57 gajim/common/helpers.py:309
+#: gajim/dialog_messages.py:53 gajim/common/helpers.py:315
 msgid "Invisible"
 msgstr "בלתי נראה"
 
-#: gajim/dialog_messages.py:62
-msgid "A connection is not available"
-msgstr "חיבור אינו זמין"
+#: gajim/dialog_messages.py:54
+#, fuzzy
+msgid "You cannot join a group chat while being invisible."
+msgstr "אין באפשרותך להשתתף בשיחת קבוצה כאשר הינך במצב בלתי נראה"
 
-#: gajim/dialog_messages.py:63
+#: gajim/dialog_messages.py:58
+#, fuzzy
+msgid "No Connection Available"
+msgstr "חיבור לא זמין"
+
+#: gajim/dialog_messages.py:59
 msgid "Your message can not be sent until you are connected."
 msgstr "הודעתך לא יכולה להישלח עד אשר תהיה מחובר."
 
-#: gajim/dialog_messages.py:67
-#, fuzzy
-msgid "JID already in list"
-msgstr "מזהה Jabber כבר מצוי בתוך הרשימה"
+#: gajim/dialog_messages.py:63
+msgid "XMPP Address Already in List"
+msgstr ""
 
-#: gajim/dialog_messages.py:68
+#: gajim/dialog_messages.py:64
 #, fuzzy
-msgid "The JID you entered is already in the list. Choose another one."
+msgid ""
+"The XMPP Address you entered is already in the list. Please choose another "
+"one."
 msgstr "מזהה Jabber אשר הזנת כבר מצוי בתוך הרשימה. בחר מזהה אחר."
 
-#: gajim/dialog_messages.py:72
-msgid "Invalid answer"
+#: gajim/dialog_messages.py:69
+#, fuzzy
+msgid "Invalid Answer"
 msgstr "תשובה שגויה"
 
-#: gajim/dialog_messages.py:73
+#: gajim/dialog_messages.py:70
 #, python-format
 msgid "Transport %(name)s answered wrongly to register request: %(error)s"
 msgstr "מוביל %(name)s ענה באופן שגוי לבקשת רישום: %(error)s"
 
-#: gajim/dialog_messages.py:78
+#: gajim/dialog_messages.py:75
 msgid "Wrong Custom Hostname"
 msgstr "שם מארח מותאם שגוי"
 
-#: gajim/dialog_messages.py:79
+#: gajim/dialog_messages.py:76
 #, fuzzy, python-format
-msgid "Wrong custom hostname \"%s\". Ignoring it."
+msgid "Custom hostname \"%s\" is wrong. It will be ignored."
 msgstr "שם מארח מותאם שגוי"
 
-#: gajim/dialog_messages.py:83
-msgid "Error while removing privacy list"
+#: gajim/dialog_messages.py:80
+#, fuzzy
+msgid "Error While Removing Privacy List"
 msgstr "שגיאה בעת הסרת רשימת פרטיות"
 
 # Deactivate privacy list or resource?
-#: gajim/dialog_messages.py:84
-#, python-format
+#: gajim/dialog_messages.py:81
+#, fuzzy, python-format
 msgid ""
-"Privacy list %s has not been removed. It is maybe active in one of your "
-"connected resources. Deactivate it and try again."
+"Privacy list %s has not been removed. It is probably active in one of your "
+"connected resources. Please deactivate it and try again."
 msgstr ""
 "רשימת הפרטיות %s לא הוסרה. ייתכן כי זו פעילה באחד ממשאביך אשר מחוברים כעת. "
 "נטרל את פעילותו ונסה שוב."
 
-#: gajim/dialog_messages.py:90
-msgid "Invisibility not supported"
+#: gajim/dialog_messages.py:87
+#, fuzzy
+msgid "Invisibility Not Supported"
 msgstr "מצב בלתי נראה אינו נתמך"
 
-#: gajim/dialog_messages.py:91
-#, python-format
-msgid "Account %s doesn't support invisibility."
+#: gajim/dialog_messages.py:88
+#, fuzzy, python-format
+msgid "This account %s doesn't support invisibility."
 msgstr "חשבון %s לא תומך במצב בלתי נראה."
 
-#: gajim/dialog_messages.py:95
-msgid "Unregister failed"
+#: gajim/dialog_messages.py:92
+#, fuzzy
+msgid "Unregister Failed"
 msgstr "ביטול רישום נכשל"
 
-#: gajim/dialog_messages.py:96
-#, python-format
-msgid "Unregistration with server %(server)s failed: %(error)s"
+#: gajim/dialog_messages.py:93
+#, fuzzy, python-format
+msgid "Unregistration on server %(server)s failed: %(error)s"
 msgstr "אי רישום בתוך שרת %(server)s נכשל: %(error)s"
 
-#: gajim/dialog_messages.py:100
-msgid "Registration succeeded"
+#: gajim/dialog_messages.py:97
+#, fuzzy
+msgid "Registration Succeeded"
 msgstr "רישום בוצע בהצלחה"
 
-#: gajim/dialog_messages.py:101
-#, python-format
-msgid "Registration with agent %s succeeded"
+#: gajim/dialog_messages.py:98
+#, fuzzy, python-format
+msgid "Registration with agent %s succeeded."
 msgstr "רישום עם סוכן %s בוצע בהצלחה"
 
-#: gajim/dialog_messages.py:105 gajim/gtk/service_registration.py:215
-msgid "Registration failed"
+#: gajim/dialog_messages.py:102
+#, fuzzy
+msgid "Registration Failed"
 msgstr "רישום נכשל"
 
 # BUG: with errors
 # BUG: with an error
 # Needs to be tested
-#: gajim/dialog_messages.py:106
+#: gajim/dialog_messages.py:103
 #, python-format
 msgid ""
 "Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
 msgstr "רישום עם סוכן %(agent)s נכשל בליווי שגיאה %(error)s: ‏%(error_msg)s"
 
-#: gajim/dialog_messages.py:111
+#: gajim/dialog_messages.py:108
 #, fuzzy
 msgid "Unable to Join Group Chat"
 msgstr "אין אפשרות להצטרף לשיחת קבוצה"
 
-#: gajim/dialog_messages.py:116
-msgid "GStreamer error"
+#: gajim/dialog_messages.py:113
+#, fuzzy
+msgid "GStreamer Error"
 msgstr "שגיאת ‫GStreamer"
 
-#: gajim/dialog_messages.py:117
+#: gajim/dialog_messages.py:114
 #, fuzzy, python-format
 msgid ""
 "Error: %(error)s\n"
@@ -2444,20 +2410,21 @@ msgstr ""
 "שגיאה: %s\n"
 "ניפוי שגיאות: %s"
 
-#: gajim/dialog_messages.py:121
+#: gajim/dialog_messages.py:118
 #, fuzzy
-msgid "Wrong host"
+msgid "Wrong Host"
 msgstr "שרת שגוי"
 
-#: gajim/dialog_messages.py:122
+#: gajim/dialog_messages.py:119
 msgid "Invalid local address? :-O"
 msgstr ""
 
-#: gajim/dialog_messages.py:126
-msgid "Avahi error"
+#: gajim/dialog_messages.py:123
+#, fuzzy
+msgid "Avahi Error"
 msgstr "שגיאת Avahi"
 
-#: gajim/dialog_messages.py:127
+#: gajim/dialog_messages.py:124
 #, python-format
 msgid ""
 "%s\n"
@@ -2466,67 +2433,67 @@ msgstr ""
 "%s\n"
 "ייתכן כי קישוריות מסרים מקומית לא תעבוד כראוי."
 
-#: gajim/dialog_messages.py:131 gajim/dialog_messages.py:136
+#: gajim/dialog_messages.py:128 gajim/dialog_messages.py:133
 #, fuzzy
-msgid "Could not request upload slot"
+msgid "Could not request upload slot for HTTP File Upload"
 msgstr "לא היתה אפשרות להתחיל שירות מקומי"
 
-#: gajim/dialog_messages.py:137
-msgid "Got unexpected response from server (see log)"
+#: gajim/dialog_messages.py:134
+msgid "Got unexpected response from server (see log)."
 msgstr ""
 
-#: gajim/dialog_messages.py:141 gajim/dialog_messages.py:146
+#: gajim/dialog_messages.py:138 gajim/dialog_messages.py:143
 #, fuzzy
-msgid "Could not open file"
+msgid "Could not Open File"
 msgstr "לא היתה אפשרות להטעין תמונה"
 
-#: gajim/dialog_messages.py:142
-msgid "Exception raised while opening file (see log)"
+#: gajim/dialog_messages.py:139
+msgid "Exception raised while trying to open file (see log)."
 msgstr ""
 
-#: gajim/dialog_messages.py:151
-msgid "Unsecure"
-msgstr ""
+#: gajim/dialog_messages.py:148
+#, fuzzy
+msgid "Not Secure"
+msgstr "לא הותחלה"
 
-#: gajim/dialog_messages.py:152
+#: gajim/dialog_messages.py:149
 #, fuzzy
-msgid "Server returned unsecure transport (HTTP)"
+msgid "The server returned an insecure transport (HTTP)."
 msgstr "שירות החזיר שגיאה."
 
-#: gajim/dialog_messages.py:156
+#: gajim/dialog_messages.py:153
 #, fuzzy
-msgid "Could not upload file"
+msgid "Could not Upload File"
 msgstr "לא היתה אפשרות להטעין תמונה"
 
-#: gajim/dialog_messages.py:157
+#: gajim/dialog_messages.py:154
 #, python-format
 msgid "HTTP response code from server: %s"
 msgstr ""
 
-#: gajim/dialog_messages.py:161
+#: gajim/dialog_messages.py:158
 msgid "Upload Error"
 msgstr ""
 
-#: gajim/dialog_messages.py:166
+#: gajim/dialog_messages.py:163
 msgid "Encryption Error"
 msgstr ""
 
-#: gajim/dialog_messages.py:167
-#, fuzzy
-msgid "For the chosen encryption there is no encryption method available"
-msgstr "חיבור אינו זמין"
+#: gajim/dialog_messages.py:164
+msgid "There is no encryption method available for the chosen encryption."
+msgstr ""
 
-#: gajim/dialog_messages.py:171
+#: gajim/dialog_messages.py:169
 #, fuzzy
-msgid "Avatar upload failed"
+msgid "Avatar Upload Failed"
 msgstr "פרסום vCard נכשל"
 
-#: gajim/privatechat_control.py:204
+#: gajim/privatechat_control.py:207
 msgid "Sending private message failed"
 msgstr "מסירת הודעה פרטית נכשלה"
 
 # אינך עוד בשיחת קבוצה או שהמשתמש עזב
-#: gajim/privatechat_control.py:206
+#: gajim/privatechat_control.py:209
 #, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr "אינך נוכח בשיחת קבוצה \"%(room)s\" או שהמשתמש \"%(nick)s\" עזב."
@@ -2552,7 +2519,7 @@ msgstr "cli"
 
 #: gajim/gajim_remote.py:85
 #, fuzzy
-msgid "Lists all contacts in roster, one for each line"
+msgid "Lists all contacts in the contact list, one for each line"
 msgstr "cli"
 
 #: gajim/gajim_remote.py:87 gajim/gajim_remote.py:102 gajim/gajim_remote.py:112
@@ -2634,12 +2601,13 @@ msgstr "cli"
 # he she
 #: gajim/gajim_remote.py:118
 #, fuzzy
-msgid "Sends new chat message to a contact in the roster. Account is optional."
+msgid ""
+"Sends new chat message to a contact in the contact list. Account is optional."
 msgstr "מסירת הודעה לאיש קשר אשר תסב את תשומת ליבו"
 
 #: gajim/gajim_remote.py:120 gajim/gajim_remote.py:130
 #, fuzzy
-msgid "JID of the contact that will receive the message"
+msgid "XMPP Address of the contact that will receive the message"
 msgstr "cli"
 
 #: gajim/gajim_remote.py:121 gajim/gajim_remote.py:132
@@ -2654,9 +2622,13 @@ msgstr "cli"
 msgid "if specified, the message will be sent using this account"
 msgstr "cli"
 
+# BUG: him or her or they
+# he she
 #: gajim/gajim_remote.py:127
-msgid "Sends a chat message to someone on your roster. Account is optional."
-msgstr ""
+#, fuzzy
+msgid ""
+"Sends a chat message to someone on your contact list. Account is optional."
+msgstr "מסירת הודעה לאיש קשר אשר תסב את תשומת ליבו"
 
 #: gajim/gajim_remote.py:131
 #, fuzzy
@@ -2670,12 +2642,12 @@ msgstr "cli"
 
 #: gajim/gajim_remote.py:138
 #, fuzzy
-msgid "Sends new message to a groupchat you've joined."
+msgid "Sends new message to a group chat you've joined."
 msgstr "cli"
 
 #: gajim/gajim_remote.py:140
 #, fuzzy
-msgid "JID of the room that will receive the message"
+msgid "XMPP Address of the group chat that will receive the message"
 msgstr "cli"
 
 #: gajim/gajim_remote.py:147
@@ -2686,7 +2658,7 @@ msgstr "cli"
 #: gajim/gajim_remote.py:149 gajim/gajim_remote.py:162
 #: gajim/gajim_remote.py:192
 #, fuzzy
-msgid "JID of the contact"
+msgid "XMPP Address of the contact"
 msgstr "cli"
 
 # BUG: on an account
@@ -2762,7 +2734,7 @@ msgstr "cli"
 
 #: gajim/gajim_remote.py:190
 #, fuzzy
-msgid "Removes contact from roster"
+msgid "Removes contact from contact list"
 msgstr "cli"
 
 #: gajim/gajim_remote.py:193
@@ -2816,7 +2788,7 @@ msgstr "cli"
 #: gajim/gajim_remote.py:275
 #, fuzzy, python-format
 msgid ""
-"'%s' is not in your roster.\n"
+"'%s' is not in your contact list.\n"
 "Please specify account for sending the message."
 msgstr "cli"
 
@@ -3033,13 +3005,13 @@ msgstr "סוף השבוע"
 msgid "Weekend!"
 msgstr "סופשבוע!"
 
-#: gajim/common/logger.py:192 gajim/common/logger.py:197
+#: gajim/common/logger.py:189 gajim/common/logger.py:194
 #, 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:217
+#: gajim/common/logger.py:214
 #, fuzzy, python-format
 msgid "Creating %s"
 msgstr "החרבת ‫%s"
@@ -3113,22 +3085,21 @@ msgstr "%(nickname)s התנתק/ה"
 msgid "Contact Signed Out"
 msgstr "איש קשר התנתק"
 
-#: gajim/common/contacts.py:455
-msgid "Not in roster"
-msgstr "לא ברשימה"
-
 #: gajim/common/config.py:80
+#, fuzzy
 msgid ""
 "Show desktop notification even when a chat window is opened for this contact "
-"and does not have focus"
-msgstr ""
+"and does not have focus."
+msgstr "התר התראות מוקפצות כאשר אני במצב נעדר/_לא זמין/עסוק/בלתי נראה"
 
 #: gajim/common/config.py:81
-msgid "Play sound when user is busy"
+#, fuzzy
+msgid "Play sound even when being busy."
 msgstr "נגן צלילים כאשר משתמש הינו עסוק"
 
 #: gajim/common/config.py:83
-msgid "Show only online and free for chat contacts in roster."
+#, fuzzy
+msgid "Show only online and free for chat contacts in the contact list."
 msgstr "הצגה בלעדית של אנשי קשר מקוונים וחופשיים לשיחה ברשימה."
 
 #: gajim/common/config.py:86
@@ -3137,11 +3108,15 @@ msgstr "זמן בדקות, אשר לאחריו המצב שלך ישונה אל �
 
 # בשל היותי במצב סרק
 #: gajim/common/config.py:87
-msgid "$S (Away as a result of being idle more than $T min)"
+#, fuzzy
+msgid "$S (Away: Idle more than $T min)"
 msgstr "$S (נעדר כתוצאה מהיותי בחוסר פעילות למשך של יותר מ־$T דקות)"
 
 #: gajim/common/config.py:87
-msgid "$S will be replaced by current status message, $T by autoawaytime."
+#, fuzzy
+msgid ""
+"$S will be replaced by current status message, $T by the 'autoawaytime' "
+"value."
 msgstr ""
 "התווים $S יוחלפו על ידי הודעת מצב נוכחית, והתווים $T יוחלפו בערך הנקוב "
 "ברשומה autoawaytime."
@@ -3151,75 +3126,84 @@ msgid "Time in minutes, after which your status changes to not available."
 msgstr "זמן בדקות, אשר לאחריו המצב שלך ישתנה אל לא זמין."
 
 #: gajim/common/config.py:90
-msgid "$S (Not available as a result of being idle more than $T min)"
+#, fuzzy
+msgid "$S (Not available: Idle more than $T min)"
 msgstr "$S (לא זמין כתוצאה מהיותי בחוסר פעילות למשך של יותר מ־$T דקות)"
 
 #: gajim/common/config.py:90
-msgid "$S will be replaced by current status message, $T by autoxatime."
+#, fuzzy
+msgid ""
+"$S will be replaced by current status message, $T by the 'autoxatime' value."
 msgstr ""
 "התווים $S יוחלפו על ידי הודעת מצב נוכחית, והתווים $T יוחלפו בערך הנקוב "
 "ברשומה autoxatime."
 
 # מגש המערכת
 #: gajim/common/config.py:93
+#, fuzzy
 msgid ""
-"When to show notification area icon. Can be 'never', 'on_event', 'always'."
+"When to show the notification area icon. Can be 'never', 'on_event', and "
+"'always'."
 msgstr ""
 "מתי להציג סמל אזור התראה. יכול להיות 'never' (בכלל לא), 'on_event' (בעת "
 "אירוע), 'always' (תמיד)."
 
 #: gajim/common/config.py:94
-msgid "Allow to hide the roster window even if the tray icon is not shown."
+#, fuzzy
+msgid ""
+"Allow to hide the contact list window even if the notification area icon is "
+"not shown."
 msgstr "אפשר הסתרת הרשימה אפילו כאשר סמל מגש איננו מוצג."
 
 #: gajim/common/config.py:97
-msgid "Contact signed in notification color."
-msgstr "צבע התראה של התחברות איש קשר."
+#, fuzzy
+msgid "Notification color for contacts signing in."
+msgstr "הודע לי אודות אנשי קשר אשר מת_חברים"
 
-# BUG: no Dot
 #: gajim/common/config.py:98
-msgid "Contact signout notification color"
-msgstr "צבע התראה של התנתקות איש קשר"
+#, fuzzy
+msgid "Notification color for contacts signing out."
+msgstr "הודע לי אודות אנשי קשר אשר מת_נתקים"
 
 #: gajim/common/config.py:99
 #, fuzzy
-msgid "New message notification color."
+msgid "Notification color for new message notification."
 msgstr "צבע התראה של הודעה/דוא״ל חדש/ה."
 
 #: gajim/common/config.py:100
-msgid "File transfer request notification color."
-msgstr "צבע התראה של בקשת העברת קובץ."
+#, fuzzy
+msgid "Notification color for file transfer request."
+msgstr "הו_דע לי כאשר העברת קובץ הושלמה"
 
 #: gajim/common/config.py:101
-msgid "File transfer error notification color."
-msgstr "צבע התראה של שגיאת העברת קובץ."
+#, fuzzy
+msgid "Notification color for file transfer errors."
+msgstr "הו_דע לי כאשר העברת קובץ הושלמה"
 
-# תושלם, מושלמת, סוימה
-# השלמת או הפסקת
 #: gajim/common/config.py:102
-msgid "File transfer complete or stopped notification color."
-msgstr "צבע התראה של העברת קובץ שהושלמה או שהופסקה."
+msgid "Notification color for stopped or completed file transfers."
+msgstr ""
 
-# BUG: no Dot
 #: gajim/common/config.py:103
-msgid "Groupchat invitation notification color"
-msgstr "צבע התראה של הזמנת שיחת קבוצה"
+msgid "Notification color for group chat invitations."
+msgstr ""
 
 # בזמן שהם מתחברים
 # שזה עתה
 # בעת שהם
 #: gajim/common/config.py:104
 #, fuzzy
-msgid "Background color of status changed notification"
+msgid "Notification background color for changed status."
 msgstr "צבע רקע אחורי של אנשי קשר כאשר הם מתחברים."
 
 #: gajim/common/config.py:105
-msgid "Other dialogs color."
-msgstr "צבע תיבות דו שיח אחרות."
+msgid "Notification color for other dialogs."
+msgstr ""
 
 #: gajim/common/config.py:106
+#, fuzzy
 msgid ""
-"List (space separated) of rows (accounts and groups) that are collapsed."
+"List of rows (accounts and groups) that are collapsed (space separated)."
 msgstr ""
 "רשימה (מופרדת על ידי רווח) של שורות (חשבונות וקבוצות) אשר הינן מכווצות."
 
@@ -3227,8 +3211,10 @@ msgstr ""
 msgid "default"
 msgstr "ברירת מחדל"
 
-#: gajim/common/config.py:113
-msgid "Language used by speller"
+#: gajim/common/config.py:113 gajim/common/config.py:424
+#: gajim/common/config.py:431
+#, fuzzy
+msgid "Language used for spell checking."
 msgstr "שפה אשר מצויה בשימוש על ידי מאיית"
 
 #: gajim/common/config.py:114
@@ -3243,10 +3229,11 @@ msgstr ""
 
 # while the value 1 will
 #: gajim/common/config.py:115
+#, fuzzy
 msgid ""
 "Print time in chats using Fuzzy Clock. Value of fuzziness from 1 to 4, or 0 "
-"to disable fuzzyclock. 1 is the most precise clock, 4 the least precise one. "
-"This is used only if print_time is 'sometimes'."
+"to disable Fuzzy Clock. 1 is the most precise clock, 4 the least precise "
+"one. This is used only if 'print_time' is 'sometimes'."
 msgstr ""
 "הדפסת זמן בתוך שיחות באמצעות שעון מעורפל. ערך הערפול נע בין 1 עד 4, או 0 "
 "לנטרול שעון מעורפל. בעוד שהערך 1 יספק את השעה המדויקת ביותר, הערך 4 יספק את "
@@ -3264,33 +3251,37 @@ msgstr "התייחסות לצמדים של * / _  בתור תווי עיצוב �
 #: gajim/common/config.py:120
 #, fuzzy
 msgid ""
-"If true, do not remove */_ . So *abc* will be bold but with * * not removed."
+"If enabled, do not remove */_ . So *abc* will be bold but with * * not "
+"removed."
 msgstr ""
 "כאשר מופעלת, אל תסיר */_ . כך שמחרוזת כגון *אבג* תהיה מובלטת כאשר * * לא "
 "מוסרים."
 
 #: gajim/common/config.py:123
+#, fuzzy
 msgid ""
-"Uses ReStructured text markup to send HTML, plus ascii formatting if "
-"selected. For syntax, see http://docutils.sourceforge.net/docs/ref/rst/"
-"restructuredtext.html (If you want to use this, install docutils)"
+"Uses ReStructured text markup to send HTML, plus ASCII formatting if "
+"selected. Needs docutils installed (for syntax, see http://docutils."
+"sourceforge.net/docs/ref/rst/restructuredtext.html)."
 msgstr ""
 "השתמש בשיטת קידוד ReStructured כדי לשלוח HTML, בנוסף גם עיצוב ascii במידה "
 "ונבחר. לתחביר, ראו http://docutils.sourceforge.net/docs/ref/rst/"
 "restructuredtext.html (אם רצונך להפיק מזה שימוש, יש להתקין docutils)"
 
 #: gajim/common/config.py:132
+#, fuzzy
 msgid ""
-"Character to add after nickname when using nick completion (tab) in group "
-"chat."
+"Character to add after nickname when using nickname completion (tab) in "
+"group chat."
 msgstr ""
 "תו להוספה לאחר שם כינוי כאשר משתמשים בהשלמת כינוי (tab) בתוך שיחת קבוצה."
 
 # after *a* desired
 #: gajim/common/config.py:133
+#, fuzzy
 msgid ""
-"Character to propose to add after desired nickname when desired nickname is "
-"used by someone else in group chat."
+"Character to propose to add after desired nickname when nickname is already "
+"used in group chat."
 msgstr ""
 "תו להציע להוספה לאחר שם כינוי רצוי כאשר זה בשימוש על ידי מישהו אחר בתוך שיחת "
 "קבוצה."
@@ -3298,295 +3289,302 @@ msgstr ""
 #: gajim/common/config.py:155
 #, fuzzy
 msgid ""
-"If true, Gajim will save roster position when hiding roster, and restore it "
-"when showing roster."
+"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:161
-msgid "Place the roster on the right in single window mode"
+msgid "Place the contact list on the right in single window mode"
 msgstr ""
 
 # ראה
 #: gajim/common/config.py:167
 #, fuzzy
 msgid ""
-"This option let you customize timestamp that is printed in conversation. For "
-"example \"[%H:%M] \" will show \"[hour:minute] \". See python doc on "
-"strftime for full documentation: http://docs.python.org/lib/module-time.html"
+"This option lets you customize the timestamp that is printed in "
+"conversation. For example '[%H:%M] ' will show '[hour:minute] '. See python "
+"doc on strftime for full documentation (https://docs.python.org/3/library/"
+"time.html)."
 msgstr ""
 "אפשרות זו מאפשרת לך להתאים את חותמת הזמן המודפסת בתוך דיון. למשל \"[%H:%M] "
 "\" תציג \"[שעה:דקה] \". לרשותך קיים מסמך Python אודות strftime לשם תיעוד מלא "
 "בכתובת: http://docs.python.org/lib/module-time.html"
 
 #: gajim/common/config.py:168
-msgid "Characters that are printed before the nickname in conversations"
+#, fuzzy
+msgid "Characters that are printed before the nickname in conversations."
 msgstr "תווים אשר מודפסים לפני שם כינוי בתוך דיונים"
 
 #: gajim/common/config.py:169
-msgid "Characters that are printed after the nickname in conversations"
+#, fuzzy
+msgid "Characters that are printed after the nickname in conversations."
 msgstr "תווים אשר מודפסים אחרי שם כינוי בתוך דיונים"
 
+# BUG: a dot at the end
 #: gajim/common/config.py:170
-msgid "Add * and [n] in roster title?"
-msgstr "להוסיף * וגם [n] בתוך כותרת רשימה?"
+#, fuzzy
+msgid "If enabled, Gajim will add * and [n] in contact list window title."
+msgstr "כאשר מסומן, Gajim יציג את מצבי הרוח של אנשי קשר בחלון הרשימה"
 
 # נפתחת שוב
 #: gajim/common/config.py:171
 #, fuzzy
 msgid ""
-"How many history messages should be restored when a chat tab/window is "
-"reopened?"
+"Number of messages from chat history to be restored when a chat tab/window "
+"is reopened."
 msgstr "כמה שורות לזכור מתוך דיון קודם כאשר חלון/כרטיסייה שיחה נפתחים מחדש?"
 
 #: gajim/common/config.py:172
-msgid "How far back in time (minutes) history is restored. -1 means no limit."
+msgid ""
+"How far back in time (minutes) chat history is restored. -1 means no limit."
 msgstr ""
 
-# ללא גבול/סייג
 #: gajim/common/config.py:173
-msgid ""
-"How many lines to request from server when entering a groupchat. -1 means no "
-"limit"
-msgstr "כמה שורות לבקש מתוך שרת בעת כניסה לשיחת קבוצה. 1- מסמל אי הגבלה"
-
-#: gajim/common/config.py:174
 #, fuzzy
 msgid ""
-"Minutes of backlog to request when entering a groupchat. -1 means no limit"
-msgstr "כמה דקות לאחור לבקש רשומות בעת התחברות לשיחת קבוצה. 1- מסמל אי הגבלה"
-
-#: gajim/common/config.py:175
-msgid ""
-"How many seconds to wait before trying to autorejoin to a conference you are "
-"being disconnected from. Set to 0 to disable autorejoining."
+"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:176
+#: gajim/common/config.py:174
 #, fuzzy
-msgid "Should autorejoin be activated when kicked from a conference?"
+msgid ""
+"Should automatic rejoin be activated when you were kicked from a group chat?"
 msgstr ""
 "האם על הצטרפות חוזרת אוטומטית להיות מופעלת כאשר אנחנו נבעטים מתוך שיחת ועידה?"
 
-#: gajim/common/config.py:177
-msgid ""
-"Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
-"Client default behaviour)."
+#: gajim/common/config.py:175
+#, fuzzy
+msgid "Send message on Ctrl+Enter and make a new line with Enter."
 msgstr ""
 "מסירת הודעה בלחיצת Ctrl+Enter ויצירת שורה חדשה באמצעות המקש Enter (התנהגות "
 "שגרתית של Mirabilis לקוח ICQ)."
 
 # Ctrl+מעלה
-#: gajim/common/config.py:179
-msgid "How many lines to store for Ctrl+KeyUP."
+#: gajim/common/config.py:177
+#, fuzzy
+msgid "How many lines to store for Ctrl+KeyUP (previously sent messages)."
 msgstr "כמה שורות לאחסן עבור Ctrl+KeyUP."
 
-#: gajim/common/config.py:182
+#: gajim/common/config.py:180
 #, fuzzy, python-format
 msgid ""
-"Either custom URL with %%s in it where %%s is the word/phrase or "
-"'WIKTIONARY' which means use Wikitionary."
+"Either a custom URL with %%s in it (where %%s is the word/phrase) or "
+"'WIKTIONARY' (which means use Wikitionary)."
 msgstr ""
 "או כתובת url מותאמת עם %s בתוכה כאשר הסימן %s הינו המילה/הצירוף או "
 "'WIKTIONARY' אשר משמעותו היא להשתמש בויקימילון."
 
-#: gajim/common/config.py:185
+#: gajim/common/config.py:183
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr "כאשר מסומן, Gajim יכול לפעול באופן מרוחק באמצעות gajim-remote."
 
-#: gajim/common/config.py:187
+#: gajim/common/config.py:185
+#, fuzzy
 msgid ""
-"When not printing time for every message (print_time==sometimes), print it "
+"When not printing time for every message ('print_time'==sometimes), print it "
 "every x minutes."
 msgstr ""
 "כאשר זמן לא מודפס עבור כל הודעה (print_time==sometimes), הזמן יודפס כל x "
 "דקות."
 
-#: gajim/common/config.py:188
+#: gajim/common/config.py:186
 msgid "Ask before pasting an image."
 msgstr ""
 
-#: gajim/common/config.py:189
+#: gajim/common/config.py:187
 msgid "Ask before closing a group chat tab/window."
 msgstr "שאל בטרם סגירת חלון/כרטיסייה של שיחת קבוצה."
 
-#: gajim/common/config.py:190
+#: gajim/common/config.py:188
 #, fuzzy
 msgid ""
-"Always ask for confirmation before closing groupchats with any of the JIDs "
-"on this space separated list."
+"Always ask for confirmation before closing group chats with any of the XMPP "
+"Addresses on this list (space separated)."
 msgstr ""
 "שאל תמיד בטרם סגירת חלון/כרטיסייה של שיחת קבוצה ברשימה זו אשר מופרדת על ידי "
 "רווח, של כתובות JID של שיחות קבוצה."
 
-#: gajim/common/config.py:191
+#: gajim/common/config.py:189
 #, fuzzy
 msgid ""
-"Never ask for confirmation before closing groupchats with any of the JIDs on "
-"this space separated list."
+"Never ask for confirmation before closing group chats with any of the XMPP "
+"Addresses on this list (space separated)."
 msgstr ""
 "לעולם אל תשאל בטרם סגירת חלון/כרטיסייה של שיחת קבוצה ברשימה זו אשר מופרדת על "
 "ידי רווח, של כתובות JID של שיחות קבוצה."
 
-#: gajim/common/config.py:192
+#: gajim/common/config.py:190
+#, fuzzy
 msgid ""
-"Ask before closing tabbed chat window if there are controls that can lose "
-"data (chat, private chat, groupchat that will not be minimized)"
+"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:195
+#: gajim/common/config.py:193
 #, fuzzy
 msgid ""
-"Comma separated list of sent hosts, in addition of local interfaces, for "
-"File Transfer in case of address translation/port forwarding."
+"List of send hosts (comma separated) in addition to local interfaces for "
+"file transfers (in case of address translation/port forwarding)."
 msgstr ""
 "רשימה אשר מופרדת על ידי פסיק, של מארחים אותם אנו שולחים, בנוסף לממשק מקומי, "
 "לשם העברת קובץ במקרה של address translation/port forwarding."
 
 # לפי תקן IEC
-#: gajim/common/config.py:196
+#: gajim/common/config.py:194
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "תקן IEC אומר KiB‏ = 1024 ביתים, KB‏ = 1000 ביתים."
 
-#: gajim/common/config.py:198
+#: gajim/common/config.py:196
 msgid "Notify of events in the notification area."
 msgstr "הודע על אירועים באזור ההתראה."
 
 # המהבהבת
 # כאשר זה מתריע על אירוע
-#: gajim/common/config.py:199
+#: gajim/common/config.py:197
+#, fuzzy
 msgid ""
-"If False, Gajim will display a static event icon instead of the blinking "
-"status icon in the notification area when notifying on event."
+"If disabled, Gajim will display a static event icon instead of the blinking "
+"status icon in the notification area when notifying about an event."
 msgstr ""
 "כאשר מנוטרלת, Gajim יציג סמל אירוע סטטי במקום סמל מצב אשר ממצמץ באזור התראה "
 "בעת יידוע על אירוע."
 
-#: gajim/common/config.py:205
+#: gajim/common/config.py:203
 msgid "Show tab when only one conversation?"
 msgstr "האם להציג כרטיסייה כאשר ישנו רק דיון אחד?"
 
 # help translate
-#: gajim/common/config.py:206
+#: gajim/common/config.py:204
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "להציג מסגרת פנקס מתויג בתוך חלונות שיחה?"
 
-#: gajim/common/config.py:207
+#: gajim/common/config.py:205
 msgid "Show close button in tab?"
 msgstr "האם להציג לחצן סגירה בתוך כרטיסייה?"
 
-#: gajim/common/config.py:220
+#: gajim/common/config.py:218
 msgid "Preview new messages in notification popup?"
 msgstr "האם להראות תצוגה מוקדמת של הודעות חדשות בהתראה מוקפצת?"
 
 # (יש לעשות שימוש בנקודה ופסיק ; כדי להפריד בין מילים)
-#: gajim/common/config.py:223
+#: gajim/common/config.py:221
+#, fuzzy
 msgid ""
-"A semicolon-separated list of words that will be highlighted in group chats."
+"A list of words (semicolon separated) that will be highlighted in group "
+"chats."
 msgstr ""
 "רשימה אשר מופרדת על ידי נקודה ופסיק, של מילים שיובלטו בתוך שיחות קבוצה."
 
-#: gajim/common/config.py:224
+#: gajim/common/config.py:222
 #, fuzzy
 msgid ""
-"If true, quits Gajim when X button of Window Manager is clicked. This "
-"setting is taken into account only if notification icon is used."
+"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 יצא כאשר לחצן X של מנהל חלונות נלחץ. הגדרה זו נלקחת "
 "בחשבון רק כאשר סמל התראה מצוי בשימוש."
 
-#: gajim/common/config.py:225
+#: gajim/common/config.py:223
 msgid ""
-"If true, Gajim hides the Roster window on pressing the X button instead of "
-"minimizing into the Dock."
+"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:226
+#: gajim/common/config.py:224
 #, fuzzy
 msgid ""
-"If true, Gajim will display an icon on each tab containing unread messages. "
-"Depending on the theme, this icon may be animated."
+"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:227
+#: gajim/common/config.py:225
 #, fuzzy
 msgid ""
-"If true, Gajim will display the status message, if not empty, for every "
-"contact under the contact name in roster window."
+"If enabled, Gajim will display the status message (if not empty) underneath "
+"the contact name in the contact list window."
 msgstr ""
 "כאשר מופעלת, Gajim יציג הודעת מצב, בתנאי שזו לא ריקה, עבור כל איש קשר תחת שם "
 "איש קשר בחלון הרשימה."
 
 # right is left and left is right
-#: gajim/common/config.py:233
-msgid "Define the position of the avatar in roster. Can be left or right"
+#: gajim/common/config.py:231
+#, fuzzy
+msgid ""
+"Define the position of avatars in the contact list. Can be 'left' or 'right'."
 msgstr ""
 "הגדרת המיקום של האווטאר ברשימה. המיקום יכול להיות בצד ימין (left) או בצד "
 "שמאל (right)"
 
 # BUG: or is better than and/or
-#: gajim/common/config.py:234
+#: gajim/common/config.py:232
 #, fuzzy
 msgid ""
-"If False, Gajim will no longer print status line in chats when a contact "
-"changes their status and/or their status message."
+"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/common/config.py:235
+#: gajim/common/config.py:233
 #, fuzzy
 msgid ""
 "Default Setting: Show a status message for every join or leave in a group "
-"chat"
+"chat."
 msgstr "אין אפשרות להצטרף לשיחת קבוצה"
 
-#: gajim/common/config.py:236
+#: gajim/common/config.py:234
+#, fuzzy
 msgid ""
-"Default Setting: Show a status message for all status (away, dnd, etc.) "
-"changes of users in a group chat"
-msgstr ""
+"Default Setting: Show a status message for all status changes (away, dnd, "
+"etc.) of users in a group chat."
+msgstr "אין אפשרות להצטרף לשיחת קבוצה"
 
-#: gajim/common/config.py:238
-msgid "Log XHTML messages instead of plain text messages."
+#: gajim/common/config.py:236
+#, fuzzy
+msgid "Store XHTML messages in chat history instead of plain text messages."
 msgstr "רישום הודעות בתסדיר XHTML במקום הודעות בתמליל רגיל."
 
-#: gajim/common/config.py:239
+#: gajim/common/config.py:237
 msgid "Don't show avatar for the transport itself."
 msgstr "אל תציג אווטאר עבור המוביל עצמו."
 
-#: gajim/common/config.py:240
-msgid "Don't show roster in the system taskbar."
+#: gajim/common/config.py:238
+#, fuzzy
+msgid "Don't show contact list window in the system taskbar."
 msgstr "אל תציג את הרשימה בתוך שורת המשימות של המערכת."
 
 # להבהב
-#: gajim/common/config.py:241
+#: gajim/common/config.py:239
 #, fuzzy
 msgid ""
-"If true, make the window flash (the default behaviour in most Window "
-"Managers) when holding pending events."
+"If enabled, Gajim makes the window flash (the default behaviour in most "
+"Window Managers) when holding pending events."
 msgstr ""
 "כאשר מופעלת, והגרסאות המותקנות של ‭GTK+‬ ושל PyGTK הן לפחות 2.8, גרום לחלון "
 "להבזיק (לרוב זוהי ההתנהגות השגרתית אצל מנהלי חלונות) כאשר ישנם אירועים "
 "ממתינים."
 
-#: gajim/common/config.py:245
+#: gajim/common/config.py:243
+#, fuzzy
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
 "'always_with_roster' - Like 'always' but the messages are in a single window "
-"along with the roster.\n"
+"along with the contact list.\n"
 "'never' - All messages get their own window.\n"
 "'peracct' - Messages for each account are sent to a specific window.\n"
-"'pertype' - Each message type (e.g. chats vs. groupchats) is sent to a "
+"'pertype' - Each message type (e.g. chats vs. group chats) is sent to a "
 "specific window."
 msgstr ""
 "בקרה על החלון בו הודעות חדשות מושמות.\n"
@@ -3597,130 +3595,136 @@ msgstr ""
 "‏'peracct' - הודעות עבור כל חשבון נשלחות לחלון מסוים.\n"
 "‏'pertype' - כל טיפוס הודעה (למשל, שיחות כנגד שיחות קבוצה) נשלח לחלון מסוים."
 
-#: gajim/common/config.py:246
+#: gajim/common/config.py:244
+#, fuzzy
 msgid ""
-"Show roster on startup.\n"
-"'always' - Always show roster.\n"
-"'never' - Never show roster.\n"
-"'last_state' - Restore the last state roster."
+"Show contact list window on startup.\n"
+"'always' - Always show contact list window.\n"
+"'never' - Never show contact list window.\n"
+"'last_state' - Restore last state of the contact list window."
 msgstr ""
 "הצגת רשימה בעת הפעלה.\n"
 "‏'always' - תמיד להציג את הרשימה.\n"
 "‏'never' - לא להציג רשימה בכלל.\n"
 "‏'last_state' - שחזור המצב האחרון של הרשימה."
 
-#: gajim/common/config.py:247
-msgid "If False, you will no longer see the avatar in the chat window."
+#: gajim/common/config.py:245
+#, fuzzy
+msgid "If enabled, Gajim displays the avatar in the chat window."
 msgstr "כאשר מנוטרלת, לא תהיה לך האפשרות לראות את האווטאר בחלון השיחה."
 
-#: gajim/common/config.py:248
+#: gajim/common/config.py:246
 #, fuzzy
-msgid "If true, pressing the escape key closes a tab/window."
+msgid "If enabled, pressing Esc closes a tab/window."
 msgstr "כאשר מופעלת, לחיצה על המקש Esc תוביל לסגירת חלון/כרטיסייה."
 
-#: gajim/common/config.py:249
-msgid "Hides the banner in a group chat window"
+#: gajim/common/config.py:247
+#, fuzzy
+msgid "Hides the banner in a group chat window."
 msgstr "הסתרת הכרזה בחלון שיחת קבוצה"
 
-# עם שתי אישויות
-#: gajim/common/config.py:250
-msgid "Hides the banner in two persons chat window"
-msgstr "הסתרת הכרזה בחלון שיחה עם שני נוכחים"
+#: gajim/common/config.py:248
+#, fuzzy
+msgid "Hides the banner in a 1:1 chat window."
+msgstr "הסתרת הכרזה בחלון שיחת קבוצה"
 
 # הסתרת רשימת הנוכחים בשיחת קבוצה בתוך חלון שיחת קבוצה
-#: gajim/common/config.py:251
-msgid "Hides the group chat occupants list in group chat window."
+#: gajim/common/config.py:249
+#, fuzzy
+msgid "Hides the group chat participants list in a group chat window."
 msgstr "הסתרת רשימת הנוכחים בחלון שיחת קבוצה."
 
 # What does "than" mean?
-#: gajim/common/config.py:252
+#: gajim/common/config.py:250
+#, fuzzy
 msgid ""
 "In a chat, show the nickname at the beginning of a line only when it's not "
-"the same person talking than in previous message."
+"the same person talking as in the previous message."
 msgstr ""
 "בשיחה, הצג את שם הכינוי בתחילת שורה רק כאשר אין זו אותה האישיות אשר מדברת "
 "מבהודעה קודמת."
 
-#: gajim/common/config.py:253
+#: gajim/common/config.py:251
 msgid "Indentation when using merge consecutive nickname."
 msgstr "הזחה בעת שימוש בשם כינוי עוקב מובלע."
 
-#: gajim/common/config.py:254
-msgid "Ctrl-Tab go to next composing tab when none is unread."
+#: gajim/common/config.py:252
+#, fuzzy
+msgid ""
+"Ctrl+Tab switches to the next composing tab when there are no tabs with "
+"messages pending."
 msgstr ""
 "‏Ctrl-Tab כדי לעבור להכרטיסייה המלחינה הבאה כאשר אין כרטיסיות שלא נקראו."
 
-# אנשי־קשר-מוצמדים
-# Meta- (from the Greek preposition μετά = "after", "beyond", "adjacent", "self",
-# adjacent = adjoining = צמוד
-#: gajim/common/config.py:255
+#: gajim/common/config.py:253
 #, fuzzy
 msgid ""
-"Show the confirm metacontacts creation dialog or not? Empty string means "
-"never show the dialog."
+"Show a confirmation dialog to create metacontacts? Empty string means never "
+"show the dialog."
 msgstr ""
-"האם עלינו להציג דו שיח וידוא יצירת אנשי קשר מוצמדים או לא? המשמעות של מחרוזת "
-"ריקה תהיה שאנחנו לא נציג את הדו שיח בכלל."
+"האם עלינו להציג דו שיח וידוא חסימת איש קשר? המשמעות של מחרוזת ריקה תהיה "
+"שאנחנו לא נציג את הדו שיח בכלל."
 
-#: gajim/common/config.py:256
+#: gajim/common/config.py:254
 #, fuzzy
 msgid ""
-"Show the confirm block contact dialog or not? Empty string means never show "
+"Show a confirmation dialog to block a contact? Empty string means never show "
 "the dialog."
 msgstr ""
 "האם עלינו להציג דו שיח וידוא חסימת איש קשר? המשמעות של מחרוזת ריקה תהיה "
 "שאנחנו לא נציג את הדו שיח בכלל."
 
-#: gajim/common/config.py:257
+#: gajim/common/config.py:255
 #, fuzzy
 msgid ""
-"Show the confirm custom status dialog or not? Empty string means never show "
-"the dialog."
+"Show a confirmation dialog for a custom status? Empty string means never "
+"show the dialog."
 msgstr ""
 "האם עלינו להציג דו שיח וידוא מצב מותאם? המשמעות של מחרוזת ריקה תהיה שאנחנו "
 "לא נציג את הדו שיח בכלל."
 
-#: gajim/common/config.py:258
+#: gajim/common/config.py:256
 #, fuzzy
 msgid ""
-"If true, you will be able to set a negative priority to your account in "
-"account modification window. BE CAREFUL, when you are logged in with a "
-"negative priority, you will NOT receive any message from your server."
+"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:259
+#: gajim/common/config.py:257
 #, fuzzy
 msgid ""
-"If true, Gajim will show number of online and total contacts in account and "
-"group rows."
+"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:260
+#: gajim/common/config.py:258
+#, fuzzy
 msgid ""
-"Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
-"as if they were of this type"
+"Can be empty, 'chat' or 'normal'. If not empty, all incoming messages are "
+"treated as if they were of this type."
 msgstr ""
 "יכול להיות ריק, 'chat' (שיחה) או 'normal' (רגיל). כאשר ערך זה לא ריק, התייחס "
 "לכל ההודעות הנכנסות כאילו היו מטיפוס זה"
 
 # שממנו נשלחה
-#: gajim/common/config.py:261
+#: gajim/common/config.py:259
 #, fuzzy
 msgid ""
-"If true, Gajim will scroll and select the contact who sent you the last "
-"message, if chat window is not already opened."
+"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 יגולל ויבחר את האיש קשר אשר שלח לך את ההודעה האחרונה, אם "
 "וכאשר חלון שיחה אינו פתוח כבר."
 
-#: gajim/common/config.py:262
+#: gajim/common/config.py:260
 msgid "Time of inactivity needed before the change status window closes down."
 msgstr "זמן חוסר פעילות אשר נחוץ לפני שחלון שינוי מצב נסגר."
 
-#: gajim/common/config.py:263
+#: gajim/common/config.py:261
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
@@ -3728,85 +3732,89 @@ msgstr "מספר מרבי של שורות אשר יודפסו בתוך דיונ�
 
 # יכרכו
 # BUG: the notification icon?
-#: gajim/common/config.py:264
+#: gajim/common/config.py:262
 #, fuzzy
 msgid ""
-"If true, notification windows from notification-daemon will be attached to "
-"notification icon."
+"If enabled, notification windows from notification-daemon will be attached "
+"to the notification area icon."
 msgstr "כאשר מופעלת, חלונות התראה מתוך notification-daemon יסופחו לסמל התראה."
 
 # חוסר
-#: gajim/common/config.py:265
+#: gajim/common/config.py:263
 msgid "Choose interval between 2 checks of idleness."
 msgstr "בחר תדירות עדכון בין 2 בדיקות של העדר פעילות."
 
-#: gajim/common/config.py:266
+#: gajim/common/config.py:264
+#, fuzzy
 msgid ""
-"Valid uri schemes. Only schemes in this list will be accepted as \"real\" "
-"uri. (mailto and xmpp are handled separately)"
+"Valid URI schemes. Only schemes in this list will be accepted as 'real' URI "
+"(mailto and xmpp are handled separately)."
 msgstr ""
 "תרשים uri תקף. תרשימים המצויים בתוך הרשימה בלבד יתקבלו בתור תרשים uri \"אמיתי"
 "\". (mailto וגם xmpp מטופלים בנפרד)"
 
 # BUG: Dot at end
-#: gajim/common/config.py:267
+#: gajim/common/config.py:265
 #, fuzzy
-msgid "If true, completion in groupchats will be like a shell auto-completion"
+msgid ""
+"If enabled, completion in group chats will be like a shell auto-completion."
 msgstr ""
 "כאשר מופעלת, השלמה בתוך שיחות קבוצה תיעשה בדומה להשלמה אוטומטית במעטפת "
 "(shell) של מסוף"
 
-#: gajim/common/config.py:272
-msgid "Optionally fix jingle output video framerate. Example: 10/1 or 25/2"
+#: gajim/common/config.py:270
+#, fuzzy
+msgid "Optionally fix Jingle output video framerate. Example: 10/1 or 25/2."
 msgstr "אפשרות קיבוע פלט תדר וידאו של jingle. דוגמא: 10/1 או 25/2"
 
-#: gajim/common/config.py:273
-msgid "Optionally resize jingle output video. Example: 320x240"
+#: gajim/common/config.py:271
+#, fuzzy
+msgid "Optionally resize Jingle output video. Example: 320x240."
 msgstr "אפשרות שינוי מידת פלט הוידאו של jingle. דוגמא: 320x240"
 
-#: gajim/common/config.py:274
-#, fuzzy
-msgid "If true, You will also see your webcam"
-msgstr "כאשר מופעלת, תהיה באפשרותך לראות גם את מצלמת הרשת שלך"
+#: gajim/common/config.py:272
+msgid "If enabled, you will see your webcam's video stream as well."
+msgstr ""
 
-#: gajim/common/config.py:277
+#: gajim/common/config.py:275
 #, fuzzy
 msgid ""
-"If true, Gajim will try to use a STUN server when using Jingle. The one in "
-"\"stun_server\" option, or the one given by the XMPP server."
+"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 ינסה לעשות שימש בשרת STUN כאשר jingle הינו מצוי בשימוש. "
 "זה אשר הוגדר בתוך אפשרות \"stun_server\", או בזה אשר ניתן על ידי שרת jabber "
 "נתון."
 
-#: gajim/common/config.py:278
+#: gajim/common/config.py:276
 #, fuzzy
 msgid "STUN server to use when using Jingle"
 msgstr "שרת STUN אשר ישמש אותך בעת שימוש בטכנולוגיית jingle"
 
-#: gajim/common/config.py:279
+#: gajim/common/config.py:277
 #, fuzzy
 msgid ""
-"If true, Gajim will show affiliation of groupchat occupants by adding a "
-"colored square to the status icon"
+"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:280
+#: gajim/common/config.py:278
+#, fuzzy
 msgid ""
 "Proxy used for all outgoing connections if the account does not have a "
-"specific proxy configured"
+"specific proxy configured."
 msgstr ""
 "ציר (proxy) אשר בשימוש עבור כל החיבורים היוצאים במידה ולחשבון אין ציר מסוים "
 "מוגדר"
 
-#: gajim/common/config.py:281
+#: gajim/common/config.py:279
 #, fuzzy
-msgid "If true, Gajim will ignore incoming attention requests (\"wizz\")."
+msgid "If enabled, Gajim will ignore incoming attention requests ('wizz')."
 msgstr "כאשר מופעלת, Gajim יתעלם מבקשות הקשב נכנסות (\"wizz\")."
 
-#: gajim/common/config.py:282
+#: gajim/common/config.py:280
 msgid ""
 "If enabled, Gajim will reopen chat windows that were opened last time Gajim "
 "was closed."
@@ -3814,70 +3822,82 @@ msgstr ""
 "כאשר מופעלת, Gajim יפתח מחדש חלונות שיחה שהיו פתוחים בפעם האחרונה בה Gajim "
 "נסגר."
 
-#: gajim/common/config.py:283
+#: gajim/common/config.py:281
+#, fuzzy
 msgid ""
-"If enabled, Gajim will show an icon to show that sent message has been "
-"received by your contact"
+"If enabled, Gajim will display an icon to show that sent messages have been "
+"received by your contact."
 msgstr ""
 "כאשר מופעלת, Gajim יציג סמל המעיד על כך שהודעה אשר נשלחה התקבלה על ידי איש "
 "הקשר שלך"
 
-#: gajim/common/config.py:284
-msgid "Show a mini avatar in chat window tabs and in window icon"
+#: gajim/common/config.py:282
+msgid "Show a mini avatar in chat window tabs and as the window's icon."
 msgstr ""
 
-#: gajim/common/config.py:285
+#: gajim/common/config.py:283
 #, fuzzy
-msgid "If true, Gajim will use the Systems Keyring to store account passwords."
+msgid ""
+"If enabled, Gajim will use the System's Keyring to store account passwords."
 msgstr ""
 "כאשר מופעלת, Gajim יעשה שימוש ביישום Gnome Keyring (אם זמין) כדי לאחסן "
 "סיסמאות חשבון."
 
+#: gajim/common/config.py:284
+msgid "If enabled, Gajim will execute XEP-0146 Commands."
+msgstr ""
+
+#: gajim/common/config.py:285
+msgid "2: System, 1: Enabled, 0: Disabled"
+msgstr ""
+
 #: gajim/common/config.py:286
-msgid "If true, Gajim will execute XEP-0146 Commands."
+msgid "Options in days which can be chosen in the sync threshold menu"
 msgstr ""
 
 #: gajim/common/config.py:287
-msgid "2: System, 1: Enabled, 0: Disabled"
+msgid ""
+"Maximum history in days we request from a public group chat archive. 0: As "
+"much as possible."
 msgstr ""
 
 #: gajim/common/config.py:288
-msgid "Options in days which can be chosen in the sync threshold menu"
+msgid ""
+"Maximum history in days we request from a private group chat archive. 0: As "
+"much as possible."
 msgstr ""
 
 #: gajim/common/config.py:289
 msgid ""
-"Maximum history in days we request from a public room archive. 0: As much as "
-"possible"
+"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:290
+#, fuzzy
 msgid ""
-"Maximum history in days we request from a private room archive. 0: As much "
-"as possible"
-msgstr ""
+"If enabled, the contact row is colored according to the current chat state "
+"of the contact."
+msgstr "כאשר מסומן, Gajim יתיר לאחרים לאתר את הזמן של המערכת שלך"
 
+# BUG: a dot at the end
 #: gajim/common/config.py:291
-msgid "If the room subject is shown in chat on join"
-msgstr ""
+#, fuzzy
+msgid ""
+"If enabled, the tab is colored according to the current chat state of the "
+"contact."
+msgstr "כאשר מסומן, Gajim יתיר לאחרים לאתר את הזמן של המערכת שלך"
 
+# BUG: a dot at the end
 #: gajim/common/config.py:292
+#, fuzzy
 msgid ""
-"If the contact row is colored according to the current chatstate of the "
-"contact"
-msgstr ""
+"Shows a text in the banner that describes the current chat state of the "
+"contact."
+msgstr "כאשר מסומן, Gajim יתיר לאחרים לאתר את הזמן של המערכת שלך"
 
 #: gajim/common/config.py:293
-msgid "If the tab is colored according to the current chatstate of the contact"
-msgstr ""
-
-#: gajim/common/config.py:294
-msgid ""
-"Shows a text in the banner that describes the current chatstate of the "
-"contact"
-msgstr ""
-
-#: gajim/common/config.py:295 gajim/common/config.py:424
 #, fuzzy
 msgid ""
 "Chat state notifications that are sent to contacts. Possible values: all, "
@@ -3885,344 +3905,372 @@ msgid ""
 msgstr ""
 "התראות מצב שיחה שנשלחות. יכול להיות אחד מאלו all, composing_only, disabled."
 
-#: gajim/common/config.py:296 gajim/common/config.py:438
+#: gajim/common/config.py:294
 #, fuzzy
 msgid ""
 "Chat state notifications that are sent to the group chat. Possible values: "
-"all, composing_only, disabled"
+"'all', 'composing_only', 'disabled'"
 msgstr ""
 "התראות מצב שיחה שנשלחות. יכול להיות אחד מאלו all, composing_only, disabled."
 
-#: gajim/common/config.py:312
+#: gajim/common/config.py:297
+msgid "API Preferences. Possible values: 'http', 'iq'"
+msgstr ""
+
+#: gajim/common/config.py:313
+#, fuzzy
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
-"defined in autopriority_* options."
+"defined in 'autopriority_*' options."
 msgstr ""
 "עדיפות תשונה אוטומטית בהתאם למצב שלך. עדיפויות מוגדרות בתוך האפשרות "
 "autopriority_*."
 
-#: gajim/common/config.py:320
+#: gajim/common/config.py:321
+#, fuzzy
 msgid ""
-"Status used to autoconnect as. Can be online, chat, away, xa, dnd, "
-"invisible. NOTE: this option is used only if restore_last_status is disabled"
+"Status to be used automatically when connecting. Can be 'online', 'chat', "
+"'away', 'xa', 'dnd' or 'invisible'. NOTE: This option is used only if "
+"'restore_last_status' is disabled."
 msgstr ""
 "מצב בשימוש להתחברות אוטומטית בתור . יכול להיות online (מקוון), chat (פנוי "
 "לשיחה), away (נעדר), xa (לא זמין), dnd (עסוק), invisible (בלתי נראה). הערה: "
 "אפשרות זו נכנסת לשימוש רק אם ההעדפה restore_last_status מנוטרלת"
 
-#: gajim/common/config.py:321
-msgid "If enabled, restore the last status that was used."
+#: gajim/common/config.py:322
+#, 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:322
+#: gajim/common/config.py:323
 #, fuzzy
 msgid ""
-"If true, Contacts requesting authorization will be automatically accepted."
+"If enabled, Contacts requesting authorization will be accepted automatically."
 msgstr "כאשר מופעלת, אנשי קשר אשר מבקשים הרשאה יתקבלו אוטומטית."
 
-#: gajim/common/config.py:323
+#: gajim/common/config.py:324
+#, fuzzy
 msgid ""
-"If False, this account will be disabled and will not appear in roster window."
+"If disabled, this account will be disabled and will not appear in the "
+"contact list window."
 msgstr "כאשר מנוטרלת, חשבון זה ינוטרל ולא יופיע בחלון רשימה."
 
-#: gajim/common/config.py:327
-msgid "Allow plaintext connections"
+#: gajim/common/config.py:328
+msgid "Allow plaintext connections."
 msgstr ""
 
-#: gajim/common/config.py:330
+#: gajim/common/config.py:331
+#, fuzzy
 msgid ""
-"List (space separated) of authentication mechanisms to try. Can contain "
-"ANONYMOUS, EXTERNAL, GSSAPI, SCRAM-SHA-1-PLUS, SCRAM-SHA-1, DIGEST-MD5, "
-"PLAIN, X-MESSENGER-OAUTH2 or XEP-0078"
+"List of authentication mechanisms to try (space separated). Can contain "
+"'ANONYMOUS', 'EXTERNAL', 'GSSAPI', 'SCRAM-SHA-1-PLUS', 'SCRAM-SHA-1', "
+"'DIGEST-MD5', 'PLAIN', 'X-MESSENGER-OAUTH2' or 'XEP-0078'."
 msgstr ""
 "רשימה (מופרדת על ידי רווח) של מנגנוני אימות לנסות. יכולה להכיל ANONYMOUS,‏ "
 "EXTERNAL,‏ GSSAPI,‏ SCRAM-SHA-1-PLUS,‏ SCRAM-SHA-1,‏ DIGEST-MD5,‏ PLAIN, X-"
 "MESSENGER-OAUTH2 או XEP-0078"
 
-#: gajim/common/config.py:331
+#: gajim/common/config.py:332
+#, fuzzy
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection. "
-"Can be 'warn', 'connect', 'disconnect'"
+"Can be 'warn', 'connect' or 'disconnect'."
 msgstr ""
 "הצגת דו שיח אזהרה בטרם שליחת סיסמה על פני חיבור גלוי. יכול להיות "
 "'warn' (הזהר), 'connect' (התחבר), 'disconnect' (התנתק)"
 
-#: gajim/common/config.py:332
+#: gajim/common/config.py:333
 msgid "Show a warning dialog before using standard SSL library."
 msgstr "הצג דו שיח אזהרה בטרם שימוש בספריית SSL סטנדרטית."
 
-#: gajim/common/config.py:333
+#: gajim/common/config.py:334
 msgid ""
 "Show a warning dialog before sending PLAIN password over a plain connection."
 msgstr "הצגת דו שיח אזהרה בטרם שליחת סיסמה חשופה (PLAIN) על פני חיבור גלוי."
 
-#: gajim/common/config.py:334
-msgid "Space separated list of ssl errors to ignore."
-msgstr "רשימה אשר מופרדת על ידי רווח, של שגיאות ssl שיש להתעלם מהן."
+#: gajim/common/config.py:335
+msgid "List of SSL errors to ignore (space separated)."
+msgstr ""
 
-#: gajim/common/config.py:340
+#: gajim/common/config.py:341
+#, fuzzy
 msgid ""
-"Space separated list of JIDs for which you do not want to store logs. You "
-"can also add account name to log nothing for this account."
+"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 ""
 "רשימה אשר מופרדת על ידי רווח, של כתובות JID עבורן אין ברצונך לאחסן רשומות. "
 "באפשרותך גם להוסיף שם חשבון כדי לא לרשום דבר עבור חשבון זה."
 
 # BUG: he or she
-#: gajim/common/config.py:341
+#: gajim/common/config.py:342
+#, fuzzy
 msgid ""
-"Space separated list of JIDs for which you accept to not log conversations "
-"if he does not want to."
+"List of XMPP Addresses (space separated) for which you accept to not store "
+"chat history if your contact does not want to."
 msgstr ""
 "רשימה אשר מופרדת על ידי רווח, של כתובות JID עבורן אתה מביע הסכמה שלא לרשום "
 "דיונים כאשר הקצה השני לא מעוניין בכך."
 
 # חלל לבן, עקב
-#: gajim/common/config.py:343
-msgid "Whitespace sent after inactivity"
+#: gajim/common/config.py:344
+#, fuzzy
+msgid "If enabled, a whitespace is sent after inactivity (keep alive)."
 msgstr "סימן לבן נשלח לאחר חוסר פעילות"
 
-#: gajim/common/config.py:344
-msgid "XMPP ping sent after inactivity"
+#: gajim/common/config.py:345
+#, fuzzy
+msgid "If enabled, an XMPP ping is sent after inactivity (ping alive)."
 msgstr "פינג XMPP נשלח לאחר חוסר פעילות"
 
-#: gajim/common/config.py:348
+#: gajim/common/config.py:349
 #, fuzzy
 msgid ""
-"How many seconds to wait for the answer of ping alive packet before trying "
-"to reconnect?"
+"How many seconds to wait for the answer of a ping alive packet before trying "
+"to reconnect."
 msgstr ""
 "כמה שניות להמתין עבור תשובת חבילת פינג חי לפני שאנחנו מנסים להתחבר מחדש?"
 
-#: gajim/common/config.py:352
-msgid "Jabberd2 workaround"
+#: gajim/common/config.py:353
+#, fuzzy
+msgid "Jabberd2 workaround."
 msgstr "מעקף Jabberd2"
 
 # INTERESTING!
 # option (אפשרות), not entry (רשומה)
-#: gajim/common/config.py:355
+#: gajim/common/config.py:356
+#, fuzzy
 msgid ""
-"If checked, Gajim will use your IP and proxies defined in "
-"file_transfer_proxies option for file transfer."
+"If enabled, Gajim will use your IP and proxies defined in "
+"'file_transfer_proxies' option for file transfers."
 msgstr ""
 "כאשר מסומן, Gajim יעשה שימוש בכתובת IP ובצירים (proxy) שהוגדרו על ידך "
 "באפשרות file_transfer_proxies לשם העברת קובץ."
 
-#: gajim/common/config.py:356
+#: gajim/common/config.py:357
 #, fuzzy
 msgid ""
-"If true, Gajim will test file transfer proxies on startup to be sure it "
-"works. Openfire's proxies are known to fail this test even if they work."
+"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 יבחן צירי (proxy) העברת קובץ בעת הפעלה כדי לוודא כי זו "
 "אכן פועלת. ידוע כי מתווכי Openfire נכשלים בבחינה זו אפילו אם אלו עובדים."
 
-#: gajim/common/config.py:369
-msgid "Answer to receipt requests"
-msgstr "מענה לבקשות קבלה"
-
 #: gajim/common/config.py:370
-msgid "Sent receipt requests"
-msgstr "בקשות קבלה אשר נשלחו"
+#, fuzzy
+msgid "If enabled, Gajim will answer to message receipt requests."
+msgstr ""
+"כאשר מופעלת, Gajim יציג סמל המעיד על כך שהודעה אשר נשלחה התקבלה על ידי איש "
+"הקשר שלך"
+
+#: gajim/common/config.py:371
+msgid "If enabled, Gajim will send message receipt requests."
+msgstr ""
 
-#: gajim/common/config.py:379
+#: gajim/common/config.py:380
 msgid ""
 "Allow Gajim to send information about the operating system you are running."
 msgstr "התר ל־Gajim לשלוח מידע אודות מערכת ההפעלה אשר בשימושך."
 
-#: gajim/common/config.py:380
+#: gajim/common/config.py:381
 msgid "Allow Gajim to send your local time."
 msgstr "התר ל־Gajim לשלוח את הזמן המקומי שלך."
 
-#: gajim/common/config.py:383
-msgid "Message that is sent to contacts you want to add"
+#: gajim/common/config.py:384
+#, fuzzy
+msgid "Message that is sent to contacts you want to add."
 msgstr "הודעה אשר תישלח לאנשי קשר אותם ברצונך להוסיף"
 
 # BUG: can directly connect to
-#: gajim/common/config.py:384
+#: gajim/common/config.py:385
+#, fuzzy
 msgid ""
-"If enabled, Gajim will send your local IPs so your contact can connect to "
-"your machine to transfer files."
+"If enabled, Gajim will send your local IP so your contact can connect to "
+"your machine for file transfers."
 msgstr ""
 "כאשר מופעלת, Gajim ישלח את כתובות IP מקומיות שלך, כך שהאיש קשר שלך יוכל "
 "להתחבר ישירות למחשב שלך כדי להעביר קבצים."
 
-#: gajim/common/config.py:385
+#: gajim/common/config.py:386
 #, fuzzy
 msgid ""
-"Space separated list of JIDs for which chat window will be re-opened on next "
-"startup."
+"List of XMPP Addresses (space separated) for which the chat window will be "
+"re-opened on next startup."
 msgstr ""
 "רשימה אשר מופרדת על ידי רווח, של כתובות JID עבורן אנו רוצים לפתוח מחדש חלון "
 "שיחה בהפעלה הבאה."
 
-#: gajim/common/config.py:387
-msgid "HTTP Upload: Enable HTTPS Verification"
-msgstr ""
-
 #: gajim/common/config.py:388
-msgid ""
-"Preferred file transfer mechanism for file drag&drop on chat window. Can be "
-"'httpupload' (default) or 'jingle'"
+msgid "HTTP File Upload: Enable HTTPS Verification."
 msgstr ""
 
 #: gajim/common/config.py:389
-msgid "Allow cert verification with POSH"
+msgid ""
+"Preferred file transfer mechanism for file drag&drop on a chat window. Can "
+"be 'httpupload' (default) or 'jingle'."
 msgstr ""
 
-# אשר ברצוננו
-#: gajim/common/config.py:423 gajim/common/config.py:430
+#: gajim/common/config.py:390
 #, fuzzy
-msgid "Language for which misspelled words will be checked"
-msgstr "שפה עבורה אנחנו רוצים לבדוק מילים אשר לא מאויתות כראוי"
-
-#: gajim/common/config.py:427
-msgid "The currently active encryption for that contact"
-msgstr ""
+msgid "Allow certificate verification with POSH."
+msgstr "אימות תעודת SSL עבור %s"
 
-# ללא
-#: gajim/common/config.py:431
+#: gajim/common/config.py:425
+#, fuzzy
 msgid ""
-"How many lines to request from server when entering a groupchat. -1 means no "
-"limit, -2 means global value"
+"Chat state notifications that are sent to contacts. Possible values: 'all', "
+"'composing_only', 'disabled'"
 msgstr ""
-"כמה שורות לבקש מתוך שרת בעת כניסה לשיחת קבוצה. 1- מסמל אי הגבלה, 2- מסמל ערך "
-"גלובלי"
+"התראות מצב שיחה שנשלחות. יכול להיות אחד מאלו all, composing_only, disabled."
 
-#: gajim/common/config.py:432
+#: gajim/common/config.py:428
 #, fuzzy
+msgid "The currently active encryption for that contact."
+msgstr "אפשור הצפנת ESessions עבור חשבון זה."
+
+#: gajim/common/config.py:432
 msgid ""
-"Minutes of backlog to request when entering a groupchat. -1 means no limit, "
-"-2 means global value"
+"If enabled, a notification is created for every message in this group chat."
 msgstr ""
-"כמה דקות לאחור לבקש רשומות בעת התחברות לשיחת קבוצה. 1- מסמל אי הגבלה, 2- "
-"מסמל ערך גלובלי"
 
 #: gajim/common/config.py:433
-msgid "State whether a notification is created for every message in this room"
-msgstr ""
-
-#: gajim/common/config.py:434
+#, fuzzy
 msgid ""
-"Show a status message for all status (away, dnd, etc.) changes of users in a "
-"group chat"
-msgstr ""
+"Show a status message for all status changes (away, dnd, etc.) of users in a "
+"group chat."
+msgstr "אין אפשרות להצטרף לשיחת קבוצה"
 
-#: gajim/common/config.py:435
+#: gajim/common/config.py:434
 #, fuzzy
-msgid "Show a status message for every join or leave in a group chat"
+msgid "Show a status message for every join or leave in a group chat."
 msgstr "אין אפשרות להצטרף לשיחת קבוצה"
 
+#: gajim/common/config.py:435
+msgid ""
+"If enabled, the group chat is minimized into the contact list when joining "
+"automatically."
+msgstr ""
+
 #: gajim/common/config.py:436
-msgid "If the group chat is minimized into the roster on autojoin"
+msgid ""
+"If enabled, the group chat is minimized into the contact list when closing "
+"it."
 msgstr ""
 
 #: gajim/common/config.py:437
-msgid "If the group chat is minimized into the roster on close"
+#, fuzzy
+msgid ""
+"Chat state notifications that are sent to the group chat. Possible values: "
+"'all', 'composing_only' or 'disabled'."
 msgstr ""
+"התראות מצב שיחה שנשלחות. יכול להיות אחד מאלו all, composing_only, disabled."
 
-#: gajim/common/config.py:441
+#: gajim/common/config.py:440
+#, fuzzy
 msgid ""
-"State whether plugins should be activated on startup (this is saved on Gajim "
-"exit). This option SHOULD NOT be used to (de)activate plug-ins. Use GUI "
-"instead."
+"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). אין להשתמש באפשרות זו כדי לשפעל או לנטרל תוספים. עליך להשתמש בממשק "
 "משתמש גרפי במקום."
 
 # יושן
-#: gajim/common/config.py:446 gajim/common/const.py:281
+#: gajim/common/config.py:445 gajim/common/const.py:315
 msgid "Sleeping"
 msgstr "ישן"
 
-#: gajim/common/config.py:447
+#: gajim/common/config.py:446
 msgid "Back soon"
 msgstr "אשוב בקרוב"
 
-#: gajim/common/config.py:447
+#: gajim/common/config.py:446
 msgid "Back in some minutes."
 msgstr "אני אחזור בעוד כמה דקות."
 
-#: gajim/common/config.py:448 gajim/common/const.py:247
+#: gajim/common/config.py:447 gajim/common/const.py:281
 msgid "Eating"
 msgstr "אוכל"
 
-#: gajim/common/config.py:448
-msgid "I'm eating, so leave me a message."
-msgstr "אני בהפסקת אוכל, אז תשאירו לי הודעה."
+#: gajim/common/config.py:447
+#, fuzzy
+msgid "I'm eating."
+msgstr "אני בעבודה."
 
-#: gajim/common/config.py:449
+#: gajim/common/config.py:448
 msgid "Movie"
 msgstr "סרט"
 
-#: gajim/common/config.py:449
+#: gajim/common/config.py:448
 msgid "I'm watching a movie."
 msgstr "אני צופה בסרט."
 
-#: gajim/common/config.py:450 gajim/common/const.py:314
+#: gajim/common/config.py:449 gajim/common/const.py:348
 msgid "Working"
 msgstr "עובד"
 
-#: gajim/common/config.py:450
+#: gajim/common/config.py:449
 msgid "I'm working."
 msgstr "אני בעבודה."
 
-#: gajim/common/config.py:451
+#: gajim/common/config.py:450
 msgid "Phone"
 msgstr "טלפון"
 
-#: gajim/common/config.py:451
+#: gajim/common/config.py:450
 msgid "I'm on the phone."
 msgstr "אני בטלפון."
 
-#: gajim/common/config.py:452
+#: gajim/common/config.py:451
 msgid "Out"
 msgstr "בחוץ"
 
-#: gajim/common/config.py:452
+#: gajim/common/config.py:451
 msgid "I'm out enjoying life."
 msgstr "יצאתי החוצה ליהנות מן החיים."
 
-#: gajim/common/config.py:463
+#: gajim/common/config.py:462
 msgid "I'm available."
 msgstr "אני זמין/ה."
 
-#: gajim/common/config.py:464
+#: gajim/common/config.py:463
 msgid "I'm free for chat."
 msgstr "אני פנוי/ה לשיחה."
 
-#: gajim/common/config.py:465 gajim/gtk/accounts.py:134
+#: gajim/common/config.py:464 gajim/gtk/accounts.py:133
 msgid "Be right back."
 msgstr "מיד אשוב."
 
-#: gajim/common/config.py:466
+#: gajim/common/config.py:465
 msgid "I'm not available."
 msgstr "אני לא זמין/ה."
 
-#: gajim/common/config.py:467
+#: gajim/common/config.py:466
 msgid "Do not disturb."
 msgstr "נא לא להפריע."
 
-#: gajim/common/config.py:468 gajim/common/config.py:469
+#: gajim/common/config.py:467 gajim/common/config.py:468
 msgid "Bye!"
 msgstr "להתראות!"
 
-#: gajim/common/config.py:480
+#: gajim/common/config.py:479
+#, fuzzy
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
-"muc_highlight_words, or when a group chat message contains your nickname."
+"'muc_highlight_words' your nickname is mentioned."
 msgstr ""
 "צליל לניגון כאשר הודעת שיחת קבוצה מכילה אחת מתוך המילים אשר מצוינות בתוך "
 "muc_highlight_words, או כאשר הודעת שיחת קבוצה מכילה את השם כינוי שלך."
 
-#: gajim/common/config.py:481
-msgid "Sound to play when any MUC message arrives."
+#: gajim/common/config.py:480
+#, fuzzy
+msgid "Sound to play when any group chat message arrives."
 msgstr "צליל לניגון כאשר הודעת שמ״מ מגיעה."
 
-#: gajim/common/config.py:485
+#: gajim/common/config.py:484
 msgid "Tor"
 msgstr ""
 
@@ -4232,137 +4280,234 @@ msgstr ""
 msgid "Error: cannot open %s for reading"
 msgstr "שגיאה: אין אפשרות לפתוח את %s לקריאה"
 
-#: gajim/common/const.py:214
+#: gajim/common/const.py:216
+#, fuzzy
+msgid "?Group chat name:Team"
+msgstr "אין"
+
+#: gajim/common/const.py:217
+msgid "?Group chat description:Project discussion"
+msgstr ""
+
+#: gajim/common/const.py:218
+#, fuzzy
+msgid "?Group chat address:team"
+msgstr "שיחות קבוצה"
+
+#: gajim/common/const.py:219
+#, fuzzy
+msgid "?Group chat name:Family"
+msgstr "הבלטת שיחת קבוצה:"
+
+#: gajim/common/const.py:220
+msgid "?Group chat description:Spring gathering"
+msgstr ""
+
+#: gajim/common/const.py:221
+msgid "?Group chat address:family"
+msgstr ""
+
+#: gajim/common/const.py:222
+#, fuzzy
+msgid "?Group chat name:Vacation"
+msgstr "הזמנת שיחת קבוצה"
+
+#: gajim/common/const.py:223
+msgid "?Group chat description:Trip planning"
+msgstr ""
+
+#: gajim/common/const.py:224
+#, fuzzy
+msgid "?Group chat address:vacation"
+msgstr "הזמנת שיחת קבוצה"
+
+#: gajim/common/const.py:225
+#, fuzzy
+msgid "?Group chat name:Repairs"
+msgstr "שיחות קבוצה"
+
+#: gajim/common/const.py:226
+msgid "?Group chat description:Local help group"
+msgstr ""
+
+#: gajim/common/const.py:227
+#, fuzzy
+msgid "?Group chat address:repairs"
+msgstr "שיחות קבוצה"
+
+#: gajim/common/const.py:228
+#, fuzzy
+msgid "?Group chat name:News"
+msgstr "אין"
+
+#: gajim/common/const.py:229
+#, fuzzy
+msgid "?Group chat description:Local news and reports"
+msgstr "יצירת שיחות קבוצה הינה מוגבלת."
+
+#: gajim/common/const.py:230
+#, fuzzy
+msgid "?Group chat address:news"
+msgstr "שיחת קבוצה חדשה"
+
+# BUG: general title without "the"
+#: gajim/common/const.py:235
+#, fuzzy
+msgid "Remote server not found"
+msgstr "השירות לא היה יכול להימצא"
+
+#: gajim/common/const.py:236
+msgid "Remote server timeout"
+msgstr ""
+
+#: gajim/common/const.py:237 gajim/common/const.py:238
+#: gajim/common/const.py:239
+#, fuzzy
+msgid "Address does not belong to a group chat server"
+msgstr "‏%s אינו שרת שיחת קבוצה"
+
+#: gajim/common/const.py:240
+#, fuzzy
+msgid "Group chat already exists"
+msgstr "חשבון Local כבר ישנו."
+
+#: gajim/common/const.py:241
+#, fuzzy
+msgid "Group chat does not exist"
+msgstr "שיחת קבוצה <b>%s</b> לא קיימת."
+
+#: gajim/common/const.py:247
 msgid "This message was encrypted with OTR and could not be decrypted."
 msgstr ""
 
-#: gajim/common/const.py:217
+#: gajim/common/const.py:250
 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:221
+#: gajim/common/const.py:254
 msgid ""
-"This message was encrypted with OpenPGP for XMPP and could not be decrypted."
+"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:224
+#: gajim/common/const.py:258
 #, python-format
 msgid "This message was encrypted with %s and could not be decrypted."
 msgstr ""
 
 # עושה
-#: gajim/common/const.py:231
+#: gajim/common/const.py:265
 msgid "Doing Chores"
 msgstr "מבצע מטלות"
 
-#: gajim/common/const.py:232
+#: gajim/common/const.py:266
 msgid "Buying Groceries"
 msgstr "קונה מצרכים"
 
-#: gajim/common/const.py:233
+#: gajim/common/const.py:267
 msgid "Cleaning"
 msgstr "מנקה"
 
-#: gajim/common/const.py:234
+#: gajim/common/const.py:268
 msgid "Cooking"
 msgstr "מבשל"
 
-#: gajim/common/const.py:235
+#: gajim/common/const.py:269
 msgid "Doing Maintenance"
 msgstr "עושה תחזוקה"
 
-#: gajim/common/const.py:236
+#: gajim/common/const.py:270
 msgid "Doing the Dishes"
 msgstr "עושה כלים"
 
-#: gajim/common/const.py:237
+#: gajim/common/const.py:271
 msgid "Doing the Laundry"
 msgstr "עושה כביסה"
 
-#: gajim/common/const.py:238
+#: gajim/common/const.py:272
 msgid "Gardening"
 msgstr "מגנן"
 
-#: gajim/common/const.py:239
+#: gajim/common/const.py:273
 msgid "Running an Errand"
 msgstr "עושה שליחות קצרה"
 
-#: gajim/common/const.py:240
+#: gajim/common/const.py:274
 msgid "Walking the Dog"
 msgstr "מוליך את הכלב"
 
-#: gajim/common/const.py:242
+#: gajim/common/const.py:276
 msgid "Drinking"
 msgstr "שותה"
 
-#: gajim/common/const.py:243
+#: gajim/common/const.py:277
 msgid "Having a Beer"
 msgstr "שותה בירה"
 
-#: gajim/common/const.py:244
+#: gajim/common/const.py:278
 msgid "Having Coffee"
 msgstr "שותה קפה"
 
-#: gajim/common/const.py:245
+#: gajim/common/const.py:279
 msgid "Having Tea"
 msgstr "שותה תה"
 
-#: gajim/common/const.py:248
+#: gajim/common/const.py:282
 msgid "Having a Snack"
 msgstr "אוכל חטיף"
 
-#: gajim/common/const.py:249
+#: gajim/common/const.py:283
 msgid "Having Breakfast"
 msgstr "אוכל ארוחת בוקר"
 
-#: gajim/common/const.py:250
+#: gajim/common/const.py:284
 msgid "Having Dinner"
 msgstr "אוכל ארוחת ערב"
 
-#: gajim/common/const.py:251
+#: gajim/common/const.py:285
 msgid "Having Lunch"
 msgstr "אוכל ארוחת צהריים"
 
-#: gajim/common/const.py:253
+#: gajim/common/const.py:287
 msgid "Exercising"
 msgstr "מתאמן"
 
-#: gajim/common/const.py:254 gajim/common/const.py:305
+#: gajim/common/const.py:288 gajim/common/const.py:339
 msgid "Cycling"
 msgstr "ברכיבה על אופניים"
 
-#: gajim/common/const.py:255
+#: gajim/common/const.py:289
 msgid "Dancing"
 msgstr "רוקד"
 
 # הליכה, צעידה
-#: gajim/common/const.py:256
+#: gajim/common/const.py:290
 msgid "Hiking"
 msgstr "הייקינג"
 
-#: gajim/common/const.py:257
+#: gajim/common/const.py:291
 msgid "Jogging"
 msgstr "ג׳וגינג"
 
-#: gajim/common/const.py:258
+#: gajim/common/const.py:292
 msgid "Playing Sports"
 msgstr "משחק בספורט"
 
-#: gajim/common/const.py:259
+#: gajim/common/const.py:293
 msgid "Running"
 msgstr "ריצה"
 
-#: gajim/common/const.py:260
+#: gajim/common/const.py:294
 msgid "Skiing"
 msgstr "סקי"
 
-#: gajim/common/const.py:261
+#: gajim/common/const.py:295
 msgid "Swimming"
 msgstr "שחייה"
 
-#: gajim/common/const.py:262
+#: gajim/common/const.py:296
 msgid "Working out"
 msgstr "מתעמל"
 
@@ -4371,774 +4516,774 @@ msgstr "מתעמל"
 # משפר הופעה
 # מטפח
 # מתקשטת
-#: gajim/common/const.py:264
+#: gajim/common/const.py:298
 msgid "Grooming"
 msgstr "טיפוח"
 
-#: gajim/common/const.py:265
+#: gajim/common/const.py:299
 msgid "At the Spa"
 msgstr "בספא"
 
-#: gajim/common/const.py:266
+#: gajim/common/const.py:300
 msgid "Brushing Teeth"
 msgstr "מצחצח שיניים"
 
-#: gajim/common/const.py:267
+#: gajim/common/const.py:301
 msgid "Getting a Haircut"
 msgstr "עושה תספורת"
 
-#: gajim/common/const.py:268
+#: gajim/common/const.py:302
 msgid "Shaving"
 msgstr "מתגלח"
 
-#: gajim/common/const.py:269
+#: gajim/common/const.py:303
 msgid "Taking a Bath"
 msgstr "מתרחץ"
 
-#: gajim/common/const.py:270
+#: gajim/common/const.py:304
 msgid "Taking a Shower"
 msgstr "מתקלח"
 
 # יש לי תור
-#: gajim/common/const.py:272
+#: gajim/common/const.py:306
 msgid "Having an Appointment"
 msgstr "יש לי פגישה"
 
-#: gajim/common/const.py:274
+#: gajim/common/const.py:308
 msgid "Inactive"
 msgstr "לא פעיל"
 
-#: gajim/common/const.py:275
+#: gajim/common/const.py:309
 msgid "Day Off"
 msgstr "יום חופשה"
 
-#: gajim/common/const.py:276
+#: gajim/common/const.py:310
 msgid "Hanging out"
 msgstr "מבלה"
 
-#: gajim/common/const.py:277
+#: gajim/common/const.py:311
 msgid "Hiding"
 msgstr "מסתתר"
 
-#: gajim/common/const.py:278
+#: gajim/common/const.py:312
 msgid "On Vacation"
 msgstr "בחופשה"
 
-#: gajim/common/const.py:279
+#: gajim/common/const.py:313
 msgid "Praying"
 msgstr "מתפלל"
 
 # חג, חופשה, נופש מתוזמן
-#: gajim/common/const.py:280
+#: gajim/common/const.py:314
 msgid "Scheduled Holiday"
 msgstr "בפגרה מתוכננת"
 
-#: gajim/common/const.py:282
+#: gajim/common/const.py:316
 msgid "Thinking"
 msgstr "חושב"
 
-#: gajim/common/const.py:284
+#: gajim/common/const.py:318
 msgid "Relaxing"
 msgstr "נרגע"
 
-#: gajim/common/const.py:285
+#: gajim/common/const.py:319
 msgid "Fishing"
 msgstr "דג"
 
-#: gajim/common/const.py:286
+#: gajim/common/const.py:320
 msgid "Gaming"
 msgstr "משחק"
 
 # any better word?
 # יוצאים קבוע going steady
 # יוצא
-#: gajim/common/const.py:287
+#: gajim/common/const.py:321
 msgid "Going out"
 msgstr "מסתובב בחוץ"
 
-#: gajim/common/const.py:288
+#: gajim/common/const.py:322
 msgid "Partying"
 msgstr "חוגג"
 
-#: gajim/common/const.py:289
+#: gajim/common/const.py:323
 msgid "Reading"
 msgstr "קורא"
 
 # מתאמן
-#: gajim/common/const.py:290
+#: gajim/common/const.py:324
 msgid "Rehearsing"
 msgstr "מתרגל"
 
-#: gajim/common/const.py:291
+#: gajim/common/const.py:325
 msgid "Shopping"
 msgstr "בקניות"
 
-#: gajim/common/const.py:292
+#: gajim/common/const.py:326
 msgid "Smoking"
 msgstr "מעשן"
 
 # Be aware of brainwashing terms!
 # בגיבוש, מתגבש
-#: gajim/common/const.py:293
+#: gajim/common/const.py:327
 msgid "Socializing"
 msgstr "מתחבר"
 
-#: gajim/common/const.py:294
+#: gajim/common/const.py:328
 msgid "Sunbathing"
 msgstr "משתזף"
 
-#: gajim/common/const.py:295
+#: gajim/common/const.py:329
 msgid "Watching TV"
 msgstr "צופה בטלוויזיה"
 
-#: gajim/common/const.py:296
+#: gajim/common/const.py:330
 msgid "Watching a Movie"
 msgstr "צופה בסרט"
 
-#: gajim/common/const.py:298
+#: gajim/common/const.py:332
 msgid "Talking"
 msgstr "משוחח"
 
-#: gajim/common/const.py:299
+#: gajim/common/const.py:333
 msgid "In Real Life"
 msgstr "בחיים האמיתיים"
 
-#: gajim/common/const.py:300
+#: gajim/common/const.py:334
 msgid "On the Phone"
 msgstr "בטלפון"
 
-#: gajim/common/const.py:301
+#: gajim/common/const.py:335
 msgid "On Video Phone"
 msgstr "בוידאו־פון"
 
-#: gajim/common/const.py:303
+#: gajim/common/const.py:337
 msgid "Traveling"
 msgstr "במסע"
 
-#: gajim/common/const.py:304
+#: gajim/common/const.py:338
 msgid "Commuting"
 msgstr "ביוממות"
 
-#: gajim/common/const.py:306
+#: gajim/common/const.py:340
 msgid "Driving"
 msgstr "בנהיגה"
 
-#: gajim/common/const.py:307
+#: gajim/common/const.py:341
 msgid "In a Car"
 msgstr "במכונית"
 
-#: gajim/common/const.py:308
+#: gajim/common/const.py:342
 msgid "On a Bus"
 msgstr "באוטובוס"
 
-#: gajim/common/const.py:309
+#: gajim/common/const.py:343
 msgid "On a Plane"
 msgstr "במטוס"
 
-#: gajim/common/const.py:310
+#: gajim/common/const.py:344
 msgid "On a Train"
 msgstr "ברכבת"
 
-#: gajim/common/const.py:311
+#: gajim/common/const.py:345
 msgid "On a Trip"
 msgstr "בטיול"
 
-#: gajim/common/const.py:312
+#: gajim/common/const.py:346
 msgid "Walking"
 msgstr "הולך"
 
-#: gajim/common/const.py:315
+#: gajim/common/const.py:349
 msgid "Coding"
 msgstr "מקודד"
 
-#: gajim/common/const.py:316
+#: gajim/common/const.py:350
 msgid "In a Meeting"
 msgstr "בפגישה"
 
-#: gajim/common/const.py:317
+#: gajim/common/const.py:351
 msgid "Studying"
 msgstr "לומד"
 
-#: gajim/common/const.py:318
+#: gajim/common/const.py:352
 msgid "Writing"
 msgstr "כותב"
 
-#: gajim/common/const.py:321
+#: gajim/common/const.py:355
 msgid "Afraid"
 msgstr "מפחד"
 
-#: gajim/common/const.py:322
+#: gajim/common/const.py:356
 msgid "Amazed"
 msgstr "נדהם"
 
-#: gajim/common/const.py:323
+#: gajim/common/const.py:357
 msgid "Amorous"
 msgstr "חושק"
 
-#: gajim/common/const.py:324
+#: gajim/common/const.py:358
 msgid "Angry"
 msgstr "זועם"
 
-#: gajim/common/const.py:325
+#: gajim/common/const.py:359
 msgid "Annoyed"
 msgstr "נרגז"
 
-#: gajim/common/const.py:326
+#: gajim/common/const.py:360
 msgid "Anxious"
 msgstr "חרד"
 
 # מגורה
-#: gajim/common/const.py:327
+#: gajim/common/const.py:361
 msgid "Aroused"
 msgstr "מרוגש"
 
-#: gajim/common/const.py:328
+#: gajim/common/const.py:362
 msgid "Ashamed"
 msgstr "מתבייש"
 
-#: gajim/common/const.py:329
+#: gajim/common/const.py:363
 msgid "Bored"
 msgstr "משועמם"
 
-#: gajim/common/const.py:330
+#: gajim/common/const.py:364
 msgid "Brave"
 msgstr "אמיץ"
 
-#: gajim/common/const.py:331
+#: gajim/common/const.py:365
 msgid "Calm"
 msgstr "רגוע"
 
-#: gajim/common/const.py:332
+#: gajim/common/const.py:366
 msgid "Cautious"
 msgstr "זהיר"
 
-#: gajim/common/const.py:333
+#: gajim/common/const.py:367
 msgid "Cold"
 msgstr "קר"
 
-#: gajim/common/const.py:334
+#: gajim/common/const.py:368
 msgid "Confident"
 msgstr "סמוך ובטוח"
 
-#: gajim/common/const.py:335
+#: gajim/common/const.py:369
 msgid "Confused"
 msgstr "מבולבל"
 
 # מעורר מחשבה, שקוע במחשבות, ספקולטיבי, תיאורטי, עיוני, מחשבתי, מהורהר
-#: gajim/common/const.py:336
+#: gajim/common/const.py:370
 msgid "Contemplative"
 msgstr "ספקולטיבי"
 
-#: gajim/common/const.py:337
+#: gajim/common/const.py:371
 msgid "Contented"
 msgstr "מסופק"
 
-#: gajim/common/const.py:338
+#: gajim/common/const.py:372
 msgid "Cranky"
 msgstr "רעוע"
 
-#: gajim/common/const.py:339
+#: gajim/common/const.py:373
 msgid "Crazy"
 msgstr "מטורף"
 
-#: gajim/common/const.py:340
+#: gajim/common/const.py:374
 msgid "Creative"
 msgstr "יצירתי"
 
-#: gajim/common/const.py:341
+#: gajim/common/const.py:375
 msgid "Curious"
 msgstr "סקרן"
 
-#: gajim/common/const.py:342
+#: gajim/common/const.py:376
 msgid "Dejected"
 msgstr "מיואש"
 
-#: gajim/common/const.py:343
+#: gajim/common/const.py:377
 msgid "Depressed"
 msgstr "מדוכא"
 
-#: gajim/common/const.py:344
+#: gajim/common/const.py:378
 msgid "Disappointed"
 msgstr "מאוכזב"
 
 # תחושת גועל
-#: gajim/common/const.py:345
+#: gajim/common/const.py:379
 msgid "Disgusted"
 msgstr "נגעל"
 
 # מופחד מובהל מוחרד מודהם
 # מפוחד מבוהל נחרד נדהם
-#: gajim/common/const.py:346
+#: gajim/common/const.py:380
 msgid "Dismayed"
 msgstr "נחרד"
 
 # טרוד
-#: gajim/common/const.py:347
+#: gajim/common/const.py:381
 msgid "Distracted"
 msgstr "מוטרד"
 
-#: gajim/common/const.py:348
+#: gajim/common/const.py:382
 msgid "Embarrassed"
 msgstr "נבוך"
 
-#: gajim/common/const.py:349
+#: gajim/common/const.py:383
 msgid "Envious"
 msgstr "מקנא"
 
-#: gajim/common/const.py:350
+#: gajim/common/const.py:384
 msgid "Excited"
 msgstr "נרגש"
 
 # עגבני
-#: gajim/common/const.py:351
+#: gajim/common/const.py:385
 msgid "Flirtatious"
 msgstr "פלרטטני"
 
-#: gajim/common/const.py:352
+#: gajim/common/const.py:386
 msgid "Frustrated"
 msgstr "מתוסכל"
 
-#: gajim/common/const.py:353
+#: gajim/common/const.py:387
 msgid "Grateful"
 msgstr "נעים"
 
-#: gajim/common/const.py:354
+#: gajim/common/const.py:388
 msgid "Grieving"
 msgstr "מתאבל"
 
-#: gajim/common/const.py:355
+#: gajim/common/const.py:389
 msgid "Grumpy"
 msgstr "זועף"
 
-#: gajim/common/const.py:356
+#: gajim/common/const.py:390
 msgid "Guilty"
 msgstr "אשם"
 
-#: gajim/common/const.py:357
+#: gajim/common/const.py:391
 msgid "Happy"
 msgstr "שמח"
 
 # מלא תקווה, מבטיח
-#: gajim/common/const.py:358
+#: gajim/common/const.py:392
 msgid "Hopeful"
 msgstr "אופטימי"
 
-#: gajim/common/const.py:359
+#: gajim/common/const.py:393
 msgid "Hot"
 msgstr "לוהט"
 
-#: gajim/common/const.py:360
+#: gajim/common/const.py:394
 msgid "Humbled"
 msgstr "מוכנע"
 
-#: gajim/common/const.py:361
+#: gajim/common/const.py:395
 msgid "Humiliated"
 msgstr "מושפל"
 
-#: gajim/common/const.py:362
+#: gajim/common/const.py:396
 msgid "Hungry"
 msgstr "רעב"
 
-#: gajim/common/const.py:363
+#: gajim/common/const.py:397
 msgid "Hurt"
 msgstr "פגוע"
 
 # מורשם, מרוגש, מלא פליאה
-#: gajim/common/const.py:364
+#: gajim/common/const.py:398
 msgid "Impressed"
 msgstr "מתפעל"
 
-#: gajim/common/const.py:365
+#: gajim/common/const.py:399
 msgid "In Awe"
 msgstr "מפוחד"
 
-#: gajim/common/const.py:366
+#: gajim/common/const.py:400
 msgid "In Love"
 msgstr "מאוהב"
 
-#: gajim/common/const.py:367
+#: gajim/common/const.py:401
 msgid "Indignant"
 msgstr "ממורמר"
 
 # מעוניין, מגלה עניין, מתעניין
-#: gajim/common/const.py:368
+#: gajim/common/const.py:402
 msgid "Interested"
 msgstr "מגלה עניין"
 
 # שתוי, מסוחרר
-#: gajim/common/const.py:369
+#: gajim/common/const.py:403
 msgid "Intoxicated"
 msgstr "שיכור"
 
-#: gajim/common/const.py:370
+#: gajim/common/const.py:404
 msgid "Invincible"
 msgstr "בלתי מנוצח"
 
-#: gajim/common/const.py:371
+#: gajim/common/const.py:405
 msgid "Jealous"
 msgstr "מקנא"
 
-#: gajim/common/const.py:372
+#: gajim/common/const.py:406
 msgid "Lonely"
 msgstr "בודד"
 
-#: gajim/common/const.py:373
+#: gajim/common/const.py:407
 msgid "Lost"
 msgstr "אבוד"
 
-#: gajim/common/const.py:374
+#: gajim/common/const.py:408
 msgid "Lucky"
 msgstr "בר מזל"
 
-#: gajim/common/const.py:375
+#: gajim/common/const.py:409
 msgid "Mean"
 msgstr "דל"
 
-#: gajim/common/const.py:376
+#: gajim/common/const.py:410
 msgid "Moody"
 msgstr "מדוכדך"
 
-#: gajim/common/const.py:377
+#: gajim/common/const.py:411
 msgid "Nervous"
 msgstr "עצבני"
 
-#: gajim/common/const.py:378
+#: gajim/common/const.py:412
 msgid "Neutral"
 msgstr "אדיש"
 
-#: gajim/common/const.py:379
+#: gajim/common/const.py:413
 msgid "Offended"
 msgstr "נעלב"
 
-#: gajim/common/const.py:380
+#: gajim/common/const.py:414
 msgid "Outraged"
 msgstr "מזועזע"
 
-#: gajim/common/const.py:381
+#: gajim/common/const.py:415
 msgid "Playful"
 msgstr "שובב"
 
-#: gajim/common/const.py:382
+#: gajim/common/const.py:416
 msgid "Proud"
 msgstr "יהיר"
 
-#: gajim/common/const.py:383
+#: gajim/common/const.py:417
 msgid "Relaxed"
 msgstr "רגוע"
 
 # הקלה, מורגע
-#: gajim/common/const.py:384
+#: gajim/common/const.py:418
 msgid "Relieved"
 msgstr "משוחרר"
 
 # מלא חרטה
-#: gajim/common/const.py:385
+#: gajim/common/const.py:419
 msgid "Remorseful"
 msgstr "מתייסר"
 
-#: gajim/common/const.py:386
+#: gajim/common/const.py:420
 msgid "Restless"
 msgstr "חסר מנוחה"
 
-#: gajim/common/const.py:387
+#: gajim/common/const.py:421
 msgid "Sad"
 msgstr "עצוב"
 
-#: gajim/common/const.py:388
+#: gajim/common/const.py:422
 msgid "Sarcastic"
 msgstr "עוקצני"
 
-#: gajim/common/const.py:389
+#: gajim/common/const.py:423
 msgid "Satisfied"
 msgstr "מרוצה"
 
-#: gajim/common/const.py:390
+#: gajim/common/const.py:424
 msgid "Serious"
 msgstr "רציני"
 
-#: gajim/common/const.py:391
+#: gajim/common/const.py:425
 msgid "Shocked"
 msgstr "הלום"
 
-#: gajim/common/const.py:392
+#: gajim/common/const.py:426
 msgid "Shy"
 msgstr "ביישן"
 
-#: gajim/common/const.py:393
+#: gajim/common/const.py:427
 msgid "Sick"
 msgstr "חולה"
 
-#: gajim/common/const.py:394
+#: gajim/common/const.py:428
 msgid "Sleepy"
 msgstr "ישנוני"
 
 # טבעי, עצמוני
-#: gajim/common/const.py:395
+#: gajim/common/const.py:429
 msgid "Spontaneous"
 msgstr "ספונטני"
 
-#: gajim/common/const.py:396
+#: gajim/common/const.py:430
 msgid "Stressed"
 msgstr "לחוץ"
 
-#: gajim/common/const.py:397
+#: gajim/common/const.py:431
 msgid "Strong"
 msgstr "חזק"
 
-#: gajim/common/const.py:398
+#: gajim/common/const.py:432
 msgid "Surprised"
 msgstr "מופתע"
 
 # מביע הערכה, מביע תודה
-#: gajim/common/const.py:399
+#: gajim/common/const.py:433
 msgid "Thankful"
 msgstr "אסיר תודה"
 
-#: gajim/common/const.py:400
+#: gajim/common/const.py:434
 msgid "Thirsty"
 msgstr "צמא"
 
-#: gajim/common/const.py:401
+#: gajim/common/const.py:435
 msgid "Tired"
 msgstr "עייף"
 
 # בלתי מוגדר, לא ברור
 # לא צלול (unclear)
 # מטושטש, חבוי, קודר
-#: gajim/common/const.py:402
+#: gajim/common/const.py:436
 msgid "Undefined"
 msgstr "מעורפל"
 
-#: gajim/common/const.py:403
+#: gajim/common/const.py:437
 msgid "Weak"
 msgstr "חלש"
 
-#: gajim/common/const.py:404
+#: gajim/common/const.py:438
 msgid "Worried"
 msgstr "מודאג"
 
-#: gajim/common/const.py:408
+#: gajim/common/const.py:442
 msgid "accuracy"
 msgstr "דיוק"
 
-#: gajim/common/const.py:409
+#: gajim/common/const.py:443
 msgid "alt"
 msgstr "גובה"
 
-#: gajim/common/const.py:410
+#: gajim/common/const.py:444
 msgid "area"
 msgstr "אזור"
 
 # GPS bearing
-#: gajim/common/const.py:411
+#: gajim/common/const.py:445
 msgid "bearing"
 msgstr "הסבה"
 
-#: gajim/common/const.py:412
+#: gajim/common/const.py:446
 msgid "building"
 msgstr "בניין"
 
-#: gajim/common/const.py:413
+#: gajim/common/const.py:447
 msgid "country"
 msgstr "ארץ"
 
-#: gajim/common/const.py:414
+#: gajim/common/const.py:448
 msgid "countrycode"
 msgstr "מיקוד מדינה"
 
 # GPS datum
-#: gajim/common/const.py:415
+#: gajim/common/const.py:449
 msgid "datum"
 msgstr "נתון"
 
-#: gajim/common/const.py:416
+#: gajim/common/const.py:450
 msgid "description"
 msgstr "תיאור"
 
-#: gajim/common/const.py:417
+#: gajim/common/const.py:451
 msgid "error"
 msgstr "שגיאה"
 
-#: gajim/common/const.py:418
+#: gajim/common/const.py:452
 msgid "floor"
 msgstr "קומה"
 
-#: gajim/common/const.py:419
+#: gajim/common/const.py:453
 msgid "lat"
 msgstr "קו רוחב"
 
-#: gajim/common/const.py:420
+#: gajim/common/const.py:454
 msgid "locality"
 msgstr "מקומיות"
 
-#: gajim/common/const.py:421
+#: gajim/common/const.py:455
 msgid "lon"
 msgstr "קו אורך"
 
-#: gajim/common/const.py:422
+#: gajim/common/const.py:456
 msgid "postalcode"
 msgstr "מיקוד דואר"
 
-#: gajim/common/const.py:423
+#: gajim/common/const.py:457
 msgid "region"
 msgstr "תחום"
 
-#: gajim/common/const.py:424
+#: gajim/common/const.py:458
 msgid "room"
 msgstr "חדר"
 
-#: gajim/common/const.py:425
+#: gajim/common/const.py:459
 msgid "speed"
 msgstr "מהירות"
 
-#: gajim/common/const.py:426
+#: gajim/common/const.py:460
 msgid "street"
 msgstr "רחוב"
 
-#: gajim/common/const.py:427
+#: gajim/common/const.py:461
 msgid "text"
 msgstr "תמליל"
 
-#: gajim/common/const.py:428
+#: gajim/common/const.py:462
 msgid "timestamp"
 msgstr "חותמת זמן"
 
-#: gajim/common/const.py:429
+#: gajim/common/const.py:463
 msgid "URI"
 msgstr ""
 
-#: gajim/common/const.py:434
+#: gajim/common/const.py:468
 msgid "Unable to get issuer certificate"
 msgstr "אין אפשרות לקבל תעודת מנפיק"
 
-#: gajim/common/const.py:435
+#: gajim/common/const.py:469
 msgid "Unable to get certificate CRL"
 msgstr "אין אפשרות לקבל תעודת CRL"
 
-#: gajim/common/const.py:436
+#: gajim/common/const.py:470
 msgid "Unable to decrypt certificate's signature"
 msgstr "אין אפשרות לפענח חתימת תעודה"
 
-#: gajim/common/const.py:437
+#: gajim/common/const.py:471
 msgid "Unable to decrypt CRL's signature"
 msgstr "אין אפשרות לפענח חתימת CRL"
 
-#: gajim/common/const.py:438
+#: gajim/common/const.py:472
 msgid "Unable to decode issuer public key"
 msgstr "אין אפשרות לפענח מפתח ציבורי של מנפיק"
 
-#: gajim/common/const.py:439
+#: gajim/common/const.py:473
 msgid "Certificate signature failure"
 msgstr "כשל תעודת חתימה"
 
-#: gajim/common/const.py:440
+#: gajim/common/const.py:474
 msgid "CRL signature failure"
 msgstr "כשל חתימת CRL"
 
-#: gajim/common/const.py:441
+#: gajim/common/const.py:475
 msgid "Certificate is not yet valid"
 msgstr "התעודה אינה תקפה עדיין"
 
-#: gajim/common/const.py:442
+#: gajim/common/const.py:476
 msgid "Certificate has expired"
 msgstr "התעודה פקעה"
 
 # CRL what? (Certificate?)
-#: gajim/common/const.py:443
+#: gajim/common/const.py:477
 msgid "CRL is not yet valid"
 msgstr "‏CRL אינה תקפה עדיין"
 
 # CRL what? (Certificate?)
-#: gajim/common/const.py:444
+#: gajim/common/const.py:478
 msgid "CRL has expired"
 msgstr "‏CRL פקעה"
 
-#: gajim/common/const.py:445
+#: gajim/common/const.py:479
 msgid "Format error in certificate's notBefore field"
 msgstr "שגיאת תסדיר בשדה notBefore של התעודה"
 
-#: gajim/common/const.py:446
+#: gajim/common/const.py:480
 msgid "Format error in certificate's notAfter field"
 msgstr "שגיאת תסדיר בשדה notAfter של התעודה"
 
-#: gajim/common/const.py:447
+#: gajim/common/const.py:481
 msgid "Format error in CRL's lastUpdate field"
 msgstr "שגיאת תסדיר בשדה lastUpdate של CRL"
 
-#: gajim/common/const.py:448
+#: gajim/common/const.py:482
 msgid "Format error in CRL's nextUpdate field"
 msgstr "שגיאת תסדיר בשדה nextUpdate של CRL"
 
 # זיכרון אזל
-#: gajim/common/const.py:449
+#: gajim/common/const.py:483
 msgid "Out of memory"
 msgstr "לא נותר זיכרון"
 
-#: gajim/common/const.py:450
+#: gajim/common/const.py:484
 msgid "Self signed certificate"
 msgstr "תעודה חתומה באופן עצמי"
 
-#: gajim/common/const.py:451
+#: gajim/common/const.py:485
 msgid "Self signed certificate in certificate chain"
 msgstr "תעודה חתומה באופן עצמי בתוך שרשרת תעודה"
 
-#: gajim/common/const.py:452
+#: gajim/common/const.py:486
 msgid "Unable to get local issuer certificate"
 msgstr "אין אפשרות לקבל תעודת מנפיק מקומית"
 
-#: gajim/common/const.py:453
+#: gajim/common/const.py:487
 msgid "Unable to verify the first certificate"
 msgstr "אין אפשרות לאמת את התעודה הראשונה"
 
-#: gajim/common/const.py:454
+#: gajim/common/const.py:488
 msgid "Certificate chain too long"
 msgstr "שרשרת תעודה ארוכה מדי"
 
-#: gajim/common/const.py:455
+#: gajim/common/const.py:489
 msgid "Certificate revoked"
 msgstr "התעודה בוטלה"
 
-#: gajim/common/const.py:456
+#: gajim/common/const.py:490
 msgid "Invalid CA certificate"
 msgstr "תעודת CA חסרת תוקף"
 
-#: gajim/common/const.py:457
+#: gajim/common/const.py:491
 msgid "Path length constraint exceeded"
 msgstr "מגבלת אורך נתיב מוצתה"
 
-#: gajim/common/const.py:458
+#: gajim/common/const.py:492
 msgid "Unsupported certificate purpose"
 msgstr "תכלית תעודה לא נתמכת"
 
-#: gajim/common/const.py:459
+#: gajim/common/const.py:493
 msgid "Certificate not trusted"
 msgstr "התעודה אינה מהימנה"
 
-#: gajim/common/const.py:460
+#: gajim/common/const.py:494
 msgid "Certificate rejected"
 msgstr "התעודה נדחתה"
 
 # התניית המנפיק אינה תואמת
 # תוכן/נושא מנפיק אינו תואם
 # קיימת אי תיאום עם/ב
-#: gajim/common/const.py:461
+#: gajim/common/const.py:495
 msgid "Subject issuer mismatch"
 msgstr "נושא מנפיק לא תואם"
 
-#: gajim/common/const.py:462
+#: gajim/common/const.py:496
 msgid "Authority and subject key identifier mismatch"
 msgstr "רשות ונושא מזהה מפתח לא תואמים"
 
 # ומספר מנפיק סידורי
-#: gajim/common/const.py:463
+#: gajim/common/const.py:497
 msgid "Authority and issuer serial number mismatch"
 msgstr "רשות ומספר סידורי של מנפיק לא תואמים"
 
-#: gajim/common/const.py:464
+#: gajim/common/const.py:498
 msgid "Key usage does not include certificate signing"
 msgstr "שימוש מפתח לא כולל חתימת תעודה"
 
-#: gajim/common/const.py:465
+#: gajim/common/const.py:499
 msgid "Application verification failure"
 msgstr "כשל אימות פניה"
 
@@ -5315,224 +5460,224 @@ msgstr "קלט וידאו"
 msgid "video output"
 msgstr "פלט וידאו"
 
-#: gajim/common/helpers.py:210
+#: gajim/common/helpers.py:216
 #, fuzzy
 msgid "Server must be between 1 and 1023 bytes"
 msgstr "שרת מוכרח להיות בין 1 עד 1023 תווים"
 
-#: gajim/common/helpers.py:214
+#: gajim/common/helpers.py:220
 msgid "Invalid character in hostname."
 msgstr "תו שגוי בשם מארח."
 
-#: gajim/common/helpers.py:216
+#: gajim/common/helpers.py:222
 msgid "Server address required."
 msgstr "נדרשת כתובת שרת."
 
-#: gajim/common/helpers.py:220
+#: gajim/common/helpers.py:226
 #, fuzzy
 msgid "Username must be between 1 and 1023 bytes"
 msgstr "שם משתמש מוכרח להיות בין 1 עד 1023 תווים"
 
-#: gajim/common/helpers.py:224
+#: gajim/common/helpers.py:230
 msgid "Invalid character in username."
 msgstr "תו שגוי בתוך שם משתמש."
 
-#: gajim/common/helpers.py:230
+#: gajim/common/helpers.py:236
 #, fuzzy
 msgid "Resource must be between 1 and 1023 bytes"
 msgstr "משאב מוכרח להיות בין 1 עד 1023 תווים"
 
-#: gajim/common/helpers.py:234
+#: gajim/common/helpers.py:240
 msgid "Invalid character in resource."
 msgstr "תו שגוי במשאב."
 
-#: gajim/common/helpers.py:275
+#: gajim/common/helpers.py:281
 msgid "_Busy"
 msgstr "_עסוק"
 
-#: gajim/common/helpers.py:277 gajim/gtk/tooltips.py:647
+#: gajim/common/helpers.py:283 gajim/gtk/tooltips.py:647
 msgid "Busy"
 msgstr "עסוק"
 
-#: gajim/common/helpers.py:280
+#: gajim/common/helpers.py:286
 msgid "_Not Available"
 msgstr "_לא זמין"
 
-#: gajim/common/helpers.py:282 gajim/gtk/tooltips.py:649
+#: gajim/common/helpers.py:288 gajim/gtk/tooltips.py:649
 msgid "Not Available"
 msgstr "לא זמין"
 
-#: gajim/common/helpers.py:285
+#: gajim/common/helpers.py:291
 msgid "_Free for Chat"
 msgstr "_חופשי לשיחה"
 
 # BUG: x2
-#: gajim/common/helpers.py:287 gajim/gtk/tooltips.py:643
+#: gajim/common/helpers.py:293 gajim/gtk/tooltips.py:643
 msgid "Free for Chat"
 msgstr "חופשי לשיחה"
 
-#: gajim/common/helpers.py:290
+#: gajim/common/helpers.py:296
 msgid "?user status:_Available"
 msgstr "_זמין"
 
-#: gajim/common/helpers.py:292 gajim/gtk/tooltips.py:641
+#: gajim/common/helpers.py:298 gajim/gtk/tooltips.py:641
 msgid "?user status:Available"
 msgstr "זמין"
 
-#: gajim/common/helpers.py:294
+#: gajim/common/helpers.py:300
 msgid "Connecting"
 msgstr "מתחבר כעת"
 
-#: gajim/common/helpers.py:297 gajim/data/gui/preferences_window.ui:1251
+#: gajim/common/helpers.py:303 gajim/data/gui/preferences_window.ui:1251
 msgid "A_way"
 msgstr "_נעדר"
 
-#: gajim/common/helpers.py:299 gajim/common/modules/adhoc_commands.py:120
-#: gajim/command_system/implementation/standard.py:139
+#: gajim/common/helpers.py:305 gajim/common/modules/adhoc_commands.py:120
+#: gajim/command_system/implementation/standard.py:141
 #: gajim/gtk/tooltips.py:645
 msgid "Away"
 msgstr "נעדר"
 
-#: gajim/common/helpers.py:302
+#: gajim/common/helpers.py:308
 msgid "_Offline"
 msgstr "לא מ_קוון"
 
-#: gajim/common/helpers.py:304 gajim/gtk/tooltips.py:651
+#: gajim/common/helpers.py:310 gajim/gtk/tooltips.py:651
 msgid "Offline"
 msgstr "לא מקוון"
 
-#: gajim/common/helpers.py:307
+#: gajim/common/helpers.py:313
 msgid "_Invisible"
 msgstr "_בלתי נראה"
 
-#: gajim/common/helpers.py:313
+#: gajim/common/helpers.py:319
 msgid "?contact has status:Unknown"
 msgstr "לא ידוע"
 
 # Has>Contain
-#: gajim/common/helpers.py:315
+#: gajim/common/helpers.py:321
 msgid "?contact has status:Has errors"
 msgstr "מכיל שגיאות"
 
-#: gajim/common/helpers.py:330
+#: gajim/common/helpers.py:336
 msgid "?Subscription we already have:None"
 msgstr "ללא"
 
-#: gajim/common/helpers.py:332
+#: gajim/common/helpers.py:338
 msgid "To"
 msgstr "אל"
 
-#: gajim/common/helpers.py:334 gajim/data/gui/groups_post_window.ui:33
+#: gajim/common/helpers.py:340 gajim/data/gui/groups_post_window.ui:33
 msgid "From"
 msgstr "מן"
 
-#: gajim/common/helpers.py:336
+#: gajim/common/helpers.py:342
 msgid "Both"
 msgstr "הדדית"
 
-#: gajim/common/helpers.py:338 gajim/gtk/server_info.py:151
+#: gajim/common/helpers.py:344 gajim/gtk/server_info.py:151
 #, fuzzy
 msgid "Unknown"
 msgstr "לא ידועה"
 
-#: gajim/common/helpers.py:344
+#: gajim/common/helpers.py:350
 msgid "?Ask (for Subscription):None"
 msgstr "אין"
 
-#: gajim/common/helpers.py:346
+#: gajim/common/helpers.py:352
 msgid "Subscribe"
 msgstr "הרשמה"
 
-#: gajim/common/helpers.py:355
+#: gajim/common/helpers.py:361
 msgid "?Group Chat Contact Role:None"
 msgstr "אין"
 
-#: gajim/common/helpers.py:358
+#: gajim/common/helpers.py:364
 msgid "Moderators"
 msgstr "אחראים"
 
-#: gajim/common/helpers.py:360
+#: gajim/common/helpers.py:366
 msgid "Moderator"
 msgstr "אחראי"
 
-#: gajim/common/helpers.py:363
+#: gajim/common/helpers.py:369 gajim/data/gui/groupchat_info_scrolled.ui:243
 msgid "Participants"
 msgstr "משתתפים"
 
-#: gajim/common/helpers.py:365
+#: gajim/common/helpers.py:371
 msgid "Participant"
 msgstr "משתתף"
 
-#: gajim/common/helpers.py:368
+#: gajim/common/helpers.py:374
 msgid "Visitors"
 msgstr "מבקרים"
 
-#: gajim/common/helpers.py:370
+#: gajim/common/helpers.py:376
 msgid "Visitor"
 msgstr "מבקר"
 
-#: gajim/common/helpers.py:376 gajim/gtk/tooltips.py:253
+#: gajim/common/helpers.py:382 gajim/gtk/tooltips.py:253
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "ללא"
 
-#: gajim/common/helpers.py:378 gajim/data/gui/groupchat_config.ui:32
+#: gajim/common/helpers.py:384 gajim/data/gui/groupchat_config.ui:32
 #: gajim/gtk/tooltips.py:259
 msgid "Owner"
 msgstr "בעלים"
 
-#: gajim/common/helpers.py:380 gajim/gtk/tooltips.py:257
+#: gajim/common/helpers.py:386 gajim/gtk/tooltips.py:257
 msgid "Administrator"
 msgstr "מנהל"
 
-#: gajim/common/helpers.py:382 gajim/data/gui/groupchat_config.ui:40
+#: gajim/common/helpers.py:388 gajim/data/gui/groupchat_config.ui:40
 #: gajim/gtk/tooltips.py:255 gajim/gtk/groupchat_config.py:105
 msgid "Member"
 msgstr "חבר"
 
-#: gajim/common/helpers.py:421
+#: gajim/common/helpers.py:427
 msgid "is paying attention to the conversation"
 msgstr "קשוב/ה כעת לשיחה"
 
-#: gajim/common/helpers.py:423
+#: gajim/common/helpers.py:429
 msgid "is doing something else"
 msgstr "עושה כעת משהו אחר"
 
-#: gajim/common/helpers.py:425
+#: gajim/common/helpers.py:431
 #, fuzzy
 msgid "is composing a message…"
 msgstr "כותב/ת כעת הודעה..."
 
-#: gajim/common/helpers.py:428
+#: gajim/common/helpers.py:434
 msgid "paused composing a message"
 msgstr "חדל/ה מלהלחין הודעה"
 
-#: gajim/common/helpers.py:430
+#: gajim/common/helpers.py:436
 msgid "has closed the chat window or tab"
 msgstr "סגר/ה את כרטיסיית או חלון השיחה"
 
-#: gajim/common/helpers.py:936 gajim/common/helpers.py:943
+#: gajim/common/helpers.py:942 gajim/common/helpers.py:949
 #, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
 msgstr[0] "ממתינה לך הודעה %d"
 msgstr[1] "ממתינות לך %d הודעות"
 
-#: gajim/common/helpers.py:950
+#: gajim/common/helpers.py:956
 #, fuzzy, python-format
-msgid "from room %s"
-msgstr " בחדר %s"
+msgid "from group chat %s"
+msgstr "בתוך _שיחות קבוצה"
 
-#: gajim/common/helpers.py:953 gajim/common/helpers.py:970
+#: gajim/common/helpers.py:959 gajim/common/helpers.py:976
 #, fuzzy, python-format
 msgid "from user %s"
 msgstr " מאת המשתמש %s"
 
-#: gajim/common/helpers.py:955
+#: gajim/common/helpers.py:961
 #, fuzzy, python-format
 msgid "from %s"
 msgstr " מאת %s"
 
-#: gajim/common/helpers.py:962 gajim/common/helpers.py:968
+#: gajim/common/helpers.py:968 gajim/common/helpers.py:974
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
@@ -5540,40 +5685,40 @@ msgstr[0] "אירוע %d תלוי ועומד"
 msgstr[1] "%d אירועים תלויים ועומדים"
 
 # In Hebrew: גאג'ים
-#: gajim/common/helpers.py:986 gajim/common/helpers.py:998
+#: gajim/common/helpers.py:992 gajim/common/helpers.py:1004
 #: gajim/data/gui/roster_window.ui:85 data/org.gajim.Gajim.desktop.in:4
 #: data/org.gajim.Gajim.appdata.xml.in:9
 msgid "Gajim"
 msgstr "‫Gajim"
 
-#: gajim/common/helpers.py:1000
+#: gajim/common/helpers.py:1006
 #, python-format
 msgid "Gajim - %s"
 msgstr "‫Gajim - ‫%s"
 
-#: gajim/common/helpers.py:1109 gajim/data/gui/add_new_contact_window.ui:25
+#: gajim/common/helpers.py:1115 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:1111
+#: gajim/common/helpers.py:1117
 msgid "Hello, I am $name."
 msgstr "שלום, שמי $name."
 
-#: gajim/common/helpers.py:1215 gajim/common/helpers.py:1224
-#: gajim/common/helpers.py:1282
+#: gajim/common/helpers.py:1221 gajim/common/helpers.py:1230
+#: gajim/common/helpers.py:1288
 msgid "Timeout loading image"
 msgstr "תם הזמן אשר הוקצב לטעינת תמונה"
 
 # BUG: File too big
-#: gajim/common/helpers.py:1234 gajim/common/helpers.py:1280
+#: gajim/common/helpers.py:1240 gajim/common/helpers.py:1286
 msgid "Image is too big"
 msgstr "התמונה הינה גדולה מדי"
 
-#: gajim/common/helpers.py:1245
+#: gajim/common/helpers.py:1251
 msgid "PyCURL is not installed"
 msgstr "‏PyCURL אינה מותקנת"
 
-#: gajim/common/helpers.py:1284
+#: gajim/common/helpers.py:1290
 msgid "Error loading image"
 msgstr "שגיאה בטעינת תמונה"
 
@@ -5761,7 +5906,8 @@ msgstr "המצב השתנה."
 
 #: gajim/common/modules/adhoc_commands.py:202
 #: gajim/common/modules/adhoc_commands.py:239
-msgid "Leave Groupchats"
+#, fuzzy
+msgid "Leave Group Chats"
 msgstr "עזוב שיחות קבוצה"
 
 #: gajim/common/modules/adhoc_commands.py:228
@@ -5770,15 +5916,18 @@ msgid "%(nickname)s on %(room_jid)s"
 msgstr "%(nickname)s בחדר %(room_jid)s"
 
 #: gajim/common/modules/adhoc_commands.py:232
-msgid "You have not joined a groupchat."
+#, fuzzy
+msgid "You have not joined a group chat."
 msgstr "לא הצטרפת לשיחת קבוצה."
 
 #: gajim/common/modules/adhoc_commands.py:240
-msgid "Choose the groupchats you want to leave"
+#, fuzzy
+msgid "Choose the group chats you want to leave"
 msgstr "בחר שיחות קבוצה אשר ברצונך לעזוב"
 
 #: gajim/common/modules/adhoc_commands.py:289
-msgid "You left the following groupchats:"
+#, fuzzy
+msgid "You left the following group chats:"
 msgstr "עזבת את שיחות הקבוצה הבאות:"
 
 #: gajim/common/modules/roster_item_exchange.py:102
@@ -5794,7 +5943,7 @@ msgstr "אנשי קשר אשר נשלחו:"
 msgid "Blocked Contacts"
 msgstr "אנשי קשר חסומים"
 
-#: gajim/data/gui/destroy_muc_dialog.ui:79 gajim/gtk/dialogs.py:736
+#: gajim/data/gui/destroy_muc_dialog.ui:79 gajim/gtk/dialogs.py:563
 msgid "Destroy this group chat permanently?"
 msgstr ""
 
@@ -5803,7 +5952,7 @@ msgstr ""
 msgid "Reason..."
 msgstr "סיבה"
 
-#: gajim/data/gui/destroy_muc_dialog.ui:124 gajim/gtk/dialogs.py:738
+#: gajim/data/gui/destroy_muc_dialog.ui:124 gajim/gtk/dialogs.py:565
 msgid "Where participants should go (optional)"
 msgstr ""
 
@@ -5817,32 +5966,6 @@ msgstr ""
 msgid "_Reason and alternate venue (optional)"
 msgstr "באפשרותך להזין זירה אלטרנטיבית:"
 
-#: gajim/data/gui/advanced_configuration_window.ui:7
-#: gajim/data/gui/preferences_window.ui:2723
-#, fuzzy
-msgid "Advanced Configuration Editor (ACE)"
-msgstr "עורך תצורה מתקדם"
-
-#: gajim/data/gui/advanced_configuration_window.ui:52
-#, fuzzy
-msgid "You should restart Gajim for some changes to take effect"
-msgstr "<b>הערה:</b> עליך לאתחל את Gajim כדי שהגדרות מסוימות ייכנסו לתוקף"
-
-#: gajim/data/gui/advanced_configuration_window.ui:84
-#, fuzzy
-msgid "_Filter"
-msgstr "סינון:"
-
-#: gajim/data/gui/advanced_configuration_window.ui:153
-#: gajim/data/gui/filetransfers_send_file_dialog.ui:15
-#: gajim/gtk/discovery.py:1666
-msgid "Description"
-msgstr "תיאור"
-
-#: gajim/data/gui/advanced_configuration_window.ui:197
-msgid "_Reset to default"
-msgstr "_אפס לברירת מחדל"
-
 #: gajim/data/gui/join_groupchat_window.ui:56
 #: gajim/data/gui/chat_to_muc_window.ui:67
 #: gajim/data/gui/chat_to_muc_window.ui:78
@@ -5854,9 +5977,8 @@ msgid "Join group chat every time Gajim is started"
 msgstr ""
 
 #: gajim/data/gui/join_groupchat_window.ui:113
-#, fuzzy
-msgid "Auto Join"
-msgstr "ה_צטרף אוטומטית"
+msgid "Join Automatically"
+msgstr ""
 
 #: gajim/data/gui/join_groupchat_window.ui:131
 #: gajim/data/gui/profile_window.ui:233
@@ -5865,10 +5987,11 @@ msgstr "חשבון"
 
 #: gajim/data/gui/join_groupchat_window.ui:147
 #, fuzzy
-msgid "Room"
-msgstr "חדר:"
+msgid "Group chat"
+msgstr "שיחות קבוצה"
 
-#: gajim/data/gui/join_groupchat_window.ui:180 gajim/gtk/accounts.py:886
+#: gajim/data/gui/join_groupchat_window.ui:180 gajim/data/gui/bookmarks.ui:158
+#: gajim/gtk/accounts.py:889
 #, fuzzy
 msgid "Password"
 msgstr "סיסמה:"
@@ -5892,91 +6015,11 @@ msgstr "בתוך _שיחות קבוצה"
 msgid "Search group chats on selected server"
 msgstr ""
 
-#: gajim/data/gui/join_groupchat_window.ui:437 gajim/gtk/discovery.py:1271
+#: gajim/data/gui/join_groupchat_window.ui:437 gajim/gtk/discovery.py:1270
 #, fuzzy
 msgid "Join"
 msgstr "ה_צטרף"
 
-#: gajim/data/gui/manage_proxies_window.ui:12
-msgid "HTTP Connect"
-msgstr ""
-
-#: gajim/data/gui/manage_proxies_window.ui:15
-msgid "SOCKS5"
-msgstr ""
-
-#: gajim/data/gui/manage_proxies_window.ui:18
-msgid "BOSH"
-msgstr ""
-
-#: gajim/data/gui/manage_proxies_window.ui:27
-msgid "Manage Proxy Profiles"
-msgstr "ניהול דיוקני Proxy"
-
-#: gajim/data/gui/manage_proxies_window.ui:83
-#, fuzzy
-msgid "Add Proxy"
-msgstr "_פרוקסי:"
-
-#: gajim/data/gui/manage_proxies_window.ui:97
-#, fuzzy
-msgid "Remove Proxy"
-msgstr "הסרת קבוצה"
-
-#: gajim/data/gui/manage_proxies_window.ui:141
-#, fuzzy
-msgid "Properties"
-msgstr "<b>מאפיינים</b>"
-
-#: gajim/data/gui/manage_proxies_window.ui:157
-#, fuzzy
-msgid "_Name"
-msgstr "_שם:"
-
-#: gajim/data/gui/manage_proxies_window.ui:173
-#, fuzzy
-msgid "_Type"
-msgstr "_טיפוס:"
-
-# כתובת _BOSH:
-#: gajim/data/gui/manage_proxies_window.ui:236
-#, fuzzy
-msgid "_BOSH URL"
-msgstr "‏_BOSH URL:"
-
-#: gajim/data/gui/manage_proxies_window.ui:261
-msgid "Use HTTP prox_y"
-msgstr "אפשר _HTTP proxy"
-
-#: gajim/data/gui/manage_proxies_window.ui:280
-#, fuzzy
-msgid "Proxy _Host"
-msgstr "מ_ארח proxy:"
-
-#: gajim/data/gui/manage_proxies_window.ui:307
-#, fuzzy
-msgid "Proxy _Port"
-msgstr "פו_רט proxy:"
-
-#: gajim/data/gui/manage_proxies_window.ui:334
-#, fuzzy
-msgid "_Username"
-msgstr "שם _משתמש:"
-
-#: gajim/data/gui/manage_proxies_window.ui:347
-msgid "Use proxy auth_entication"
-msgstr "השתמש באימות _proxy"
-
-#: gajim/data/gui/manage_proxies_window.ui:377
-#, fuzzy
-msgid "Pass_word"
-msgstr "ס_יסמה:"
-
-#: gajim/data/gui/manage_proxies_window.ui:405 gajim/gtk/adhoc.py:321
-#, fuzzy
-msgid "Settings"
-msgstr "קיצורי מקש"
-
 #: gajim/data/gui/change_password_dialog.ui:17
 #, fuzzy
 msgid "New Password"
@@ -6007,11 +6050,13 @@ msgid "Status:"
 msgstr "מצב:"
 
 #: gajim/data/gui/zeroconf_information_window.ui:89
-msgid "_Log conversation history"
+#, fuzzy
+msgid "_Store conversation history"
 msgstr "_רשום היסטוריית שיחה"
 
 #: gajim/data/gui/zeroconf_information_window.ui:215
 #: gajim/data/gui/vcard_information_window.ui:390
+#: gajim/data/gui/groupchat_info_scrolled.ui:166
 msgid "Contact"
 msgstr "איש קשר"
 
@@ -6024,8 +6069,9 @@ msgid "Last Name:"
 msgstr "שם משפחה:"
 
 #: gajim/data/gui/zeroconf_information_window.ui:260
-msgid "Jabber ID:"
-msgstr "מזהה Jabber:"
+#, fuzzy
+msgid "XMPP Address:"
+msgstr "כתובת AIM:"
 
 #: gajim/data/gui/zeroconf_information_window.ui:273
 msgid "E-Mail:"
@@ -6045,8 +6091,9 @@ msgid "Send _File"
 msgstr "שלח _קובץ"
 
 #: gajim/data/gui/gc_occupants_menu.ui:29
-msgid "Occupant Actions"
-msgstr "פעולות נוכח"
+#, fuzzy
+msgid "Participant Actions"
+msgstr "משתתפים"
 
 #: gajim/data/gui/gc_occupants_menu.ui:38
 msgid "_Voice"
@@ -6077,8 +6124,9 @@ msgid "_Ban"
 msgstr "א_סור"
 
 #: gajim/data/gui/gc_occupants_menu.ui:124
-msgid "_Add to Roster"
-msgstr "הו_סף לרשימה"
+#, fuzzy
+msgid "_Add to Contact List"
+msgstr "הוסף _איש קשר..."
 
 #: gajim/data/gui/gc_occupants_menu.ui:132
 #, fuzzy
@@ -6119,11 +6167,6 @@ msgstr "הרשמה: "
 msgid "_Status"
 msgstr "_מצב"
 
-#: gajim/data/gui/zeroconf_context_menu.ui:26
-#: gajim/data/gui/account_context_menu.ui:79
-msgid "_Modify Account..."
-msgstr "ה_תאם חשבון..."
-
 #: gajim/data/gui/certificate_dialog.ui:66
 #: gajim/data/gui/certificate_dialog.ui:178
 msgid "Common Name (CN)"
@@ -6206,13 +6249,19 @@ msgstr "שונתה לאחרונה:"
 msgid "Next entry"
 msgstr "רשומה באה"
 
+#: gajim/data/gui/filetransfers_send_file_dialog.ui:15
+#: gajim/data/gui/advanced_configuration.ui:143
+#: gajim/data/gui/groupchat_info_scrolled.ui:48 gajim/gtk/discovery.py:1663
+msgid "Description"
+msgstr "תיאור"
+
 #: gajim/data/gui/filetransfers_send_file_dialog.ui:54
 #, fuzzy
 msgid "_Send Files"
 msgstr "שלח _קובץ"
 
 #: gajim/data/gui/filetransfers_send_file_dialog.ui:58
-#: gajim/gtk/xml_console.py:90
+#: gajim/gtk/xml_console.py:87
 #, fuzzy
 msgid "Send"
 msgstr "_שלח"
@@ -6237,20 +6286,23 @@ msgid "Change _Nickname..."
 msgstr "שנה שם _כינוי..."
 
 #: gajim/data/gui/gc_control_popup_menu.ui:20
-msgid "_Manage Room"
-msgstr "נהל _חדר"
+#, fuzzy
+msgid "_Manage Group Chat"
+msgstr "שיחת קבוצה _חדשה"
 
 #: gajim/data/gui/gc_control_popup_menu.ui:31
 msgid "Change _Subject..."
 msgstr "שנה _נושא..."
 
 #: gajim/data/gui/gc_control_popup_menu.ui:38
-msgid "Configure _Room..."
+#, fuzzy
+msgid "Configure _Group Chat..."
 msgstr "ה_גדר חדר..."
 
 #: gajim/data/gui/gc_control_popup_menu.ui:52
-msgid "_Destroy Room"
-msgstr "ה_חרב חדר"
+#, fuzzy
+msgid "_Destroy Group Chat"
+msgstr "שיחת קבוצה _חדשה"
 
 #: gajim/data/gui/gc_control_popup_menu.ui:64
 msgid "_Minimize on close"
@@ -6260,7 +6312,7 @@ msgstr "_מזער בעת סגירה"
 msgid "_Request Voice"
 msgstr "_בקש ביטוי"
 
-#: gajim/data/gui/gc_control_popup_menu.ui:99 gajim/gtk/discovery.py:1704
+#: gajim/data/gui/gc_control_popup_menu.ui:99
 msgid "_Bookmark"
 msgstr "_סמן"
 
@@ -6312,13 +6364,6 @@ msgstr "עמוד בית:"
 msgid "E-Mail"
 msgstr "דוא״ל:"
 
-#: 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/blocking_list.ui:115 gajim/gtk/add_contact.py:30
-#: gajim/gtk/accounts.py:801
-msgid "Jabber ID"
-msgstr "מזהה Jabber"
-
 #: gajim/data/gui/profile_window.ui:440
 msgid "Main"
 msgstr ""
@@ -6452,36 +6497,44 @@ msgstr "עבודה"
 msgid "About"
 msgstr "אודות"
 
-#: gajim/data/gui/start_chat_dialog.ui:114 gajim/gtk/discovery.py:1658
-msgid "Users"
-msgstr "משתמשים"
+#: gajim/data/gui/start_chat_dialog.ui:53
+#, fuzzy
+msgid "Global Group Chat Search"
+msgstr "הצטרף לשיחת קבוצה"
 
-#: gajim/data/gui/start_chat_dialog.ui:185
+#: 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
-msgid "Name:"
-msgstr "שם: "
+msgid "_Back"
+msgstr "אשוב בקרוב"
 
-#: gajim/data/gui/start_chat_dialog.ui:197
-msgid "Description:"
-msgstr "תיאור:"
+#: gajim/data/gui/start_chat_dialog.ui:245
+#: gajim/data/gui/groupchat_control.ui:796
+#: gajim/data/gui/groupchat_control.ui:888 gajim/gtk/discovery.py:1701
+#: gajim/gtk/groupchat_join.py:62
+msgid "_Join"
+msgstr "ה_צטרף"
 
-#: gajim/data/gui/start_chat_dialog.ui:209
+#: gajim/data/gui/start_chat_dialog.ui:289
 #, fuzzy
-msgid "Address:"
-msgstr "_כתובת:"
+msgid "Select Account"
+msgstr "הסרת חשבון ‫%s"
 
-#: gajim/data/gui/start_chat_dialog.ui:246
-msgid ""
-"Semi-Anonymous\n"
-"<span size=\"small\">(Only moderators can see your XMPP-Address)</span>"
-msgstr ""
+#: gajim/data/gui/start_chat_dialog.ui:380
+#, fuzzy
+msgid "_Select"
+msgstr "מנקה"
 
 #: gajim/data/gui/filetransfers.ui:21
 #, fuzzy
 msgid "Pa_use/Resume"
 msgstr "_חזור"
 
-#: gajim/data/gui/filetransfers.ui:30 gajim/gtk/filechoosers.py:178
+#: gajim/data/gui/filetransfers.ui:30 gajim/data/gui/groupchat_control.ui:575
+#: gajim/data/gui/groupchat_control.ui:667
+#: gajim/data/gui/groupchat_control.ui:779
+#: gajim/data/gui/groupchat_control.ui:871 gajim/gtk/filechoosers.py:178
 msgid "_Cancel"
 msgstr "_ביטול"
 
@@ -6523,7 +6576,8 @@ msgid "Cancel the selected file transfer and remove incomplete files"
 msgstr "ביטול העברת קובץ נבחר והסרת קבצים לא שלמים"
 
 #: gajim/data/gui/filetransfers.ui:207
-msgid "Shows a list of file transfers between you and others"
+#, fuzzy
+msgid "Shows a list of file transfers between you and your contacts"
 msgstr "הצגת רשימה של העברות קבצים בינך לבין אחרים"
 
 #: gajim/data/gui/groupchat_control.ui:13 gajim/data/gui/chat_control.ui:277
@@ -6543,7 +6597,6 @@ msgid "Strike"
 msgstr "קו חוצה"
 
 #: gajim/data/gui/groupchat_control.ui:54 gajim/data/gui/chat_control.ui:318
-#: gajim/gtk/advanced_config.py:86
 msgid "Color"
 msgstr "צבע"
 
@@ -6557,16 +6610,47 @@ msgstr "גופן"
 msgid "Clear formatting"
 msgstr "איפוס עיצוב"
 
-#: gajim/data/gui/groupchat_control.ui:290 gajim/data/gui/chat_control.ui:880
+#: gajim/data/gui/groupchat_control.ui:291 gajim/data/gui/chat_control.ui:880
 #, fuzzy
 msgid "Choose encryption"
 msgstr "הצפנת סיסמה"
 
-#: gajim/data/gui/groupchat_control.ui:336 gajim/data/gui/chat_control.ui:640
+#: gajim/data/gui/groupchat_control.ui:337 gajim/data/gui/chat_control.ui:640
 #, fuzzy
 msgid "Show a list of emojis (Alt+M)"
 msgstr "הצגת רשימת רגשונים (Alt+M)"
 
+#: gajim/data/gui/groupchat_control.ui:484
+#, fuzzy
+msgid "Joining…"
+msgstr "אסירה..."
+
+#: gajim/data/gui/groupchat_control.ui:496
+msgid "_Abort"
+msgstr ""
+
+#: gajim/data/gui/groupchat_control.ui:542
+#, fuzzy
+msgid "Enter new nickname"
+msgstr "הזן שם כינוי חדש עבור איש קשר %s"
+
+#: gajim/data/gui/groupchat_control.ui:592
+#: gajim/data/gui/groupchat_control.ui:684
+#, fuzzy
+msgid "Ch_ange"
+msgstr "שנה שם _כינוי..."
+
+#: gajim/data/gui/groupchat_control.ui:761
+#, fuzzy
+msgid "Enter password"
+msgstr "הזן סיסמה חדשה:"
+
+# מאמת
+#: gajim/data/gui/groupchat_control.ui:1067
+#, fuzzy
+msgid "_Try again"
+msgstr "אמת שוב..."
+
 #: gajim/data/gui/popup_notification_window.ui:42
 msgid "Event Type"
 msgstr "טיפוס אירוע"
@@ -6645,8 +6729,8 @@ msgstr "תמיד"
 
 #: gajim/data/gui/mam_preferences.ui:18
 #, fuzzy
-msgid "Roster"
-msgstr "הצג _רשימה"
+msgid "Contact List"
+msgstr "איש קשר"
 
 #: gajim/data/gui/mam_preferences.ui:22
 #: gajim/data/gui/preferences_window.ui:123
@@ -6670,12 +6754,12 @@ msgid "Add"
 msgstr "הוסף"
 
 #: gajim/data/gui/mam_preferences.ui:194 gajim/data/gui/groupchat_config.ui:151
-#: gajim/gtk/dialogs.py:63 gajim/gtk/accounts.py:381
+#: gajim/gtk/dialogs.py:62 gajim/gtk/accounts.py:384
 #, fuzzy
 msgid "Remove"
 msgstr "הס_ר"
 
-#: gajim/data/gui/vcard_information_window.ui:72 gajim/gtk/accounts.py:753
+#: gajim/data/gui/vcard_information_window.ui:72 gajim/gtk/accounts.py:756
 #, fuzzy
 msgid "Resource"
 msgstr "משאב:"
@@ -6727,6 +6811,7 @@ msgstr "הרשמה: "
 #: gajim/data/gui/vcard_information_window.ui:974
 #: gajim/data/gui/vcard_information_window.ui:993
 #: gajim/data/gui/vcard_information_window.ui:1427
+#: gajim/data/gui/groupchat_info_scrolled.ui:222
 msgid "button"
 msgstr ""
 
@@ -6755,15 +6840,18 @@ msgid "Notify me about it"
 msgstr "הודע לי על כך"
 
 #: gajim/data/gui/preferences_window.ui:58
-msgid "Show only in roster"
-msgstr "הצג ברשימה בלבד"
+#, fuzzy
+msgid "Show only in contact list"
+msgstr "הצג אנשי קשר _פעילים בלבד"
 
 #: gajim/data/gui/preferences_window.ui:69
-msgid "Detached roster with detached chats"
+#, fuzzy
+msgid "Detached contact list with detached chats"
 msgstr "רשימה מנותקת עם שיחות מופרדות"
 
 #: gajim/data/gui/preferences_window.ui:72
-msgid "Detached roster with single chat"
+#, fuzzy
+msgid "Detached contact list with single chat"
 msgstr "רשימה מנותקת עם שיחה יחידה"
 
 #: gajim/data/gui/preferences_window.ui:75
@@ -6771,11 +6859,13 @@ msgid "Single window for everything"
 msgstr "חלון מאוגד עבור כל החלונות"
 
 #: gajim/data/gui/preferences_window.ui:78
-msgid "Detached roster with chat grouped by account"
+#, fuzzy
+msgid "Detached contact list with chat grouped by account"
 msgstr "רשימה מנותקת עם שיחות מאוגדות לפי חשבון"
 
 #: gajim/data/gui/preferences_window.ui:81
-msgid "Detached roster with chat grouped by type"
+#, fuzzy
+msgid "Detached contact list with chat grouped by type"
 msgstr "רשימה מנותקת עם שיחות מאוגדות לפי טיפוס"
 
 #: gajim/data/gui/preferences_window.ui:92
@@ -6827,7 +6917,7 @@ msgstr "התנהגות _חלון:"
 
 #: gajim/data/gui/preferences_window.ui:296
 #, fuzzy
-msgid "_Show roster on startup"
+msgid "_Show contact list on startup"
 msgstr "ה_צג רשימה בעת הפעלה:"
 
 #: gajim/data/gui/preferences_window.ui:311
@@ -6843,12 +6933,12 @@ msgid "_Tabs placement"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:363
-msgid "_Quit Gajim when closing roster window"
+msgid "_Quit Gajim when closing contact list"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:367
 msgid ""
-"If enabled, Gajim will quit when closing the roster window instead of "
+"If enabled, Gajim will quit when closing the contact list window instead of "
 "minimizing to the system's notification area"
 msgstr ""
 
@@ -6858,21 +6948,21 @@ msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:423
 #, fuzzy
-msgid "Show a_vatars of contacts in roster"
+msgid "Show a_vatars of contacts in contact list"
 msgstr "הצג _אווטארים של אנשי קשר ברשימה"
 
 # BUG: a dot at the end
 #: gajim/data/gui/preferences_window.ui:427
 #, fuzzy
 msgid ""
-"If checked, avatars of contacts will be shown in the roster window and in "
-"group chats"
+"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
 #, fuzzy
-msgid "Show status _messages of contacts in roster"
+msgid "Show status _messages of contacts in contact list"
 msgstr "הצג הו_דעות מצב של אנשי קשר ברשימה"
 
 # BUG: a dot at the end
@@ -6881,20 +6971,21 @@ msgstr "הצג הו_דעות מצב של אנשי קשר ברשימה"
 #, fuzzy
 msgid ""
 "If checked, status messages of contacts will be shown under the contact's "
-"name, in the roster window, and in group chats"
+"name, in the contact list window, and in group chats"
 msgstr ""
 "כאשר מסומן, Gajim יציג את הודעות המצב של אנשי קשר תחת שם איש קשר בתוך חלון "
 "הרשימה וגם בתוך שיחות קבוצה"
 
 #: gajim/data/gui/preferences_window.ui:459
 #, fuzzy
-msgid "Show e_xtra information of contacts in roster (mood, activity, ...)"
+msgid ""
+"Show e_xtra information of contacts in contact list (mood, activity, ...)"
 msgstr "הצג _מידע נוסף של אנשי קשר ברשימה (מצב רוח, פעילות, ...)"
 
 #: gajim/data/gui/preferences_window.ui:463
 msgid ""
-"If checked, additional info published by the contact will be shown in "
-"roster. Additional infos (published via PEP) may include e.g. mood, "
+"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 ""
 
@@ -6903,8 +6994,9 @@ msgid "Sort contacts by status"
 msgstr "מיין אנשי קשר לפי מצב"
 
 #: gajim/data/gui/preferences_window.ui:494
-msgid "in _roster"
-msgstr "בתוך _רשימה"
+#, fuzzy
+msgid "in _contact list"
+msgstr "אנשי קשר אשר נשלחו:"
 
 #: gajim/data/gui/preferences_window.ui:511
 msgid "in _group chats"
@@ -6912,8 +7004,8 @@ msgstr "בתוך _שיחות קבוצה"
 
 #: gajim/data/gui/preferences_window.ui:540
 #, fuzzy
-msgid "Roster Appearance"
-msgstr "<b>הופעת רשימה</b>"
+msgid "Contact List Appearance"
+msgstr "המרת פריט רשימה"
 
 #: gajim/data/gui/preferences_window.ui:585
 #, fuzzy
@@ -6981,7 +7073,7 @@ msgstr "אין אפשרות להצטרף לשיחת קבוצה"
 
 #: gajim/data/gui/preferences_window.ui:660
 #, fuzzy
-msgid "If checked, the room subject will be shown when joining a group chat"
+msgid "If checked, the subject will be shown when joining a group chat"
 msgstr "אין אפשרות להצטרף לשיחת קבוצה"
 
 #: gajim/data/gui/preferences_window.ui:682
@@ -6996,13 +7088,13 @@ msgstr ""
 #: gajim/data/gui/preferences_window.ui:701
 msgid ""
 "If join/leave status messages are shown in the group chat. This setting can "
-"be overridden in the groupchat menu."
+"be overridden in the group chat menu."
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:720
 msgid ""
 "The default sync threshold for new public group chats. This setting can be "
-"overridden in the groupchat menu."
+"overridden in the group chat menu."
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:722
@@ -7017,7 +7109,7 @@ msgstr "הצג _הודעות מצב"
 #: gajim/data/gui/preferences_window.ui:768
 msgid ""
 "If status change messages are shown in the group chat. This setting can be "
-"overridden in the groupchat menu."
+"overridden in the group chat menu."
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:825
@@ -7035,8 +7127,8 @@ msgstr "כאשר מסומן, Gajim יתיר לאחרים לאתר את הזמן
 
 #: gajim/data/gui/preferences_window.ui:843
 #, fuzzy
-msgid "Show chatstate in roster"
-msgstr "הצג _אווטארים של אנשי קשר ברשימה"
+msgid "Show chatstate in contact list"
+msgstr "האם להציג לחצן סגירה בתוך כרטיסייה?"
 
 #: gajim/data/gui/preferences_window.ui:847
 msgid ""
@@ -7354,7 +7446,7 @@ msgstr "גודל וידאו"
 msgid "Vi_ew own video source"
 msgstr "הצג מקור וידאו עצמי"
 
-#: gajim/data/gui/preferences_window.ui:2281 gajim/gtk/accounts.py:352
+#: gajim/data/gui/preferences_window.ui:2281 gajim/gtk/accounts.py:355
 msgid "Connection"
 msgstr "חיבור"
 
@@ -7414,7 +7506,8 @@ msgid "_Manage..."
 msgstr "  נה_ל...  "
 
 #: gajim/data/gui/preferences_window.ui:2616
-msgid "_Log status changes of contacts"
+#, fuzzy
+msgid "_Store status changes of contacts in history"
 msgstr "רשום _שינויים של מצב אנשי קשר"
 
 #: gajim/data/gui/preferences_window.ui:2633
@@ -7440,6 +7533,11 @@ msgstr ""
 msgid "_Open..."
 msgstr "_פתח..."
 
+#: gajim/data/gui/preferences_window.ui:2723 gajim/gtk/advanced_config.py:84
+#, fuzzy
+msgid "Advanced Configuration Editor (ACE)"
+msgstr "עורך תצורה מתקדם"
+
 # \n
 #      ‏‏domain = מתחם\n
 #      ‏‏user = משתמש\n
@@ -7448,7 +7546,7 @@ msgstr "_פתח..."
 #: gajim/data/gui/groupchat_config.ui:55
 #, fuzzy
 msgid ""
-"<b>Jabber-ID</b>\n"
+"<b>XMPP Address</b>\n"
 "&lt;user@domain/resource&gt; (only that resource matches)\n"
 "&lt;user@domain&gt; (any resource matches)\n"
 "&lt;domain/resource&gt; (only that resource matches)\n"
@@ -7467,7 +7565,8 @@ msgstr ""
 msgid "Only Admins and Owners can modify the affiliation"
 msgstr ""
 
-#: gajim/data/gui/groupchat_config.ui:270 gajim/plugins/gui.py:312
+#: gajim/data/gui/groupchat_config.ui:270
+#: gajim/data/gui/groupchat_info_scrolled.ui:210 gajim/plugins/gui.py:324
 msgid "Configuration"
 msgstr "תצורה"
 
@@ -7500,7 +7599,7 @@ msgid "Start _Chat"
 msgstr "התחל _שיחה"
 
 #: gajim/data/gui/contact_context_menu.ui:20
-#: gajim/data/gui/systray_context_menu.ui:36
+#: gajim/data/gui/systray_context_menu.ui:29
 msgid "Send Single _Message..."
 msgstr "שלח הודעה _בודדת..."
 
@@ -7557,17 +7656,43 @@ msgid "_Ignore"
 msgstr "הת_עלם"
 
 #: gajim/data/gui/contact_context_menu.ui:174
-msgid "_Add to Roster..."
-msgstr "הו_סף לרשימה..."
+#, fuzzy
+msgid "_Add to Contact List..."
+msgstr "הוסף _איש קשר..."
+
+#: gajim/data/gui/advanced_configuration.ui:39
+#, fuzzy
+msgid "You should restart Gajim for some changes to take effect"
+msgstr "<b>הערה:</b> עליך לאתחל את Gajim כדי שהגדרות מסוימות ייכנסו לתוקף"
+
+#: gajim/data/gui/advanced_configuration.ui:71
+#, fuzzy
+msgid "_Filter"
+msgstr "סינון:"
+
+#: gajim/data/gui/advanced_configuration.ui:88
+msgid "Type to search for values..."
+msgstr ""
+
+#: gajim/data/gui/advanced_configuration.ui:180
+#, fuzzy
+msgid "_Reset Value"
+msgstr "_אפס לברירת מחדל"
+
+#: gajim/data/gui/advanced_configuration.ui:185
+#, fuzzy
+msgid "Resets value to default"
+msgstr "_אפס לברירת מחדל"
 
 #: gajim/data/gui/account_creation_wizard_window.ui:43
 msgid "Gajim: Account Creation Wizard"
 msgstr "‫Gajim: אשף יצירת חשבון"
 
 #: gajim/data/gui/account_creation_wizard_window.ui:70
+#, fuzzy
 msgid ""
 "You need to have an account in order to connect\n"
-"to the Jabber network."
+"to the XMPP network."
 msgstr ""
 "יש צורך בחשבון בכדי להתחבר\n"
 "לרשת Jabber."
@@ -7590,8 +7715,9 @@ msgid "<b>Please fill in the data for your existing account</b>"
 msgstr "<b>אנא מלא נתוני התחברות בשביל חשבונך הקיים</b>"
 
 #: gajim/data/gui/account_creation_wizard_window.ui:187
-msgid "_Jabber ID:"
-msgstr "מזהה _Jabber:"
+#, fuzzy
+msgid "_XMPP Address:"
+msgstr "כתובת AIM:"
 
 #: gajim/data/gui/account_creation_wizard_window.ui:239
 #: gajim/data/gui/account_creation_wizard_window.ui:394
@@ -7681,6 +7807,7 @@ msgid "Privacy Lists:"
 msgstr "רשימות פרטיות:"
 
 #: gajim/data/gui/service_discovery_window.ui:111
+#: gajim/data/gui/groupchat_creation.ui:227
 #, fuzzy
 msgid "_Address"
 msgstr "_כתובת:"
@@ -7698,11 +7825,6 @@ msgstr "סנכרון : בחירת אנשי קשר"
 msgid "Select the contacts you want to synchronise"
 msgstr "בחירת אנשי הקשר אותם ברצונך לסנכרן"
 
-#: gajim/data/gui/groupchat_invitation_received.ui:42
-#, fuzzy
-msgid "Group Chat Invitation"
-msgstr "הזמנת שיחת קבוצה"
-
 #: gajim/data/gui/groupchat_invitation_received.ui:111
 #, fuzzy
 msgid "Message..."
@@ -7756,11 +7878,10 @@ msgstr ""
 
 #: gajim/data/gui/add_new_contact_window.ui:84
 #, fuzzy
-msgid "_Jabber ID"
-msgstr "מזהה _Jabber:"
+msgid "_XMPP Address"
+msgstr "_כתובת:"
 
 #: gajim/data/gui/add_new_contact_window.ui:100
-#: gajim/data/gui/manage_bookmarks_window.ui:192
 #, fuzzy
 msgid "_Nickname"
 msgstr "שם כי_נוי:"
@@ -7841,7 +7962,7 @@ msgstr "<b>מצב רוח:</b>"
 msgid "<b>Message:</b>"
 msgstr "<b>הודעה:</b>"
 
-#: gajim/data/gui/plugins_window.ui:10 gajim/data/gui/application_menu.ui:90
+#: gajim/data/gui/plugins_window.ui:10 gajim/data/gui/application_menu.ui:87
 msgid "Plugins"
 msgstr "תוספים"
 
@@ -7949,10 +8070,6 @@ msgstr "לאפשר"
 msgid "Deny"
 msgstr "לאסור"
 
-#: gajim/data/gui/privacy_list_window.ui:317
-msgid "JabberID"
-msgstr "מזהה Jabber"
-
 # אשר
 #: gajim/data/gui/privacy_list_window.ui:358
 msgid "all in the group"
@@ -7994,7 +8111,7 @@ msgstr "סדר:"
 msgid "Manage sounds"
 msgstr "ניהול צלילים"
 
-#: gajim/data/gui/manage_sounds_window.ui:55 gajim/plugins/gui.py:100
+#: gajim/data/gui/manage_sounds_window.ui:55 gajim/plugins/gui.py:101
 msgid "Active"
 msgstr "פעיל"
 
@@ -8032,24 +8149,115 @@ msgstr "להסיר חשבון מתוך Gajim וגם מתוך _שרת"
 msgid "_Personal Events"
 msgstr "_אירועים אישיים"
 
-#: gajim/data/gui/account_context_menu.ui:35
-#: gajim/data/gui/systray_context_menu.ui:28
-msgid "Join _Group Chat"
-msgstr "הצטרף לשיחת _קבוצה"
-
-#: gajim/data/gui/account_context_menu.ui:49
+#: gajim/data/gui/account_context_menu.ui:41
 msgid "_Add Contact..."
 msgstr "הוסף _איש קשר..."
 
 # איתור
-#: gajim/data/gui/account_context_menu.ui:57
+#: gajim/data/gui/account_context_menu.ui:49
 msgid "_Discover Services"
 msgstr "מצא _שירותים"
 
-#: gajim/data/gui/account_context_menu.ui:65
+#: gajim/data/gui/account_context_menu.ui:57
 msgid "_Execute Command..."
 msgstr "הרץ _פקודה..."
 
+#: gajim/data/gui/account_context_menu.ui:65
+#, fuzzy
+msgid "_View Certificate"
+msgstr "הצג תעודה..."
+
+#: gajim/data/gui/manage_proxies.ui:12
+#, fuzzy
+msgctxt "proxy configuration"
+msgid "HTTP Connect"
+msgstr "מחובר"
+
+#: gajim/data/gui/manage_proxies.ui:15
+msgctxt "proxy configuration"
+msgid "SOCKS5"
+msgstr ""
+
+# כתובת _BOSH:
+#: gajim/data/gui/manage_proxies.ui:18
+#, fuzzy
+msgctxt "proxy configuration"
+msgid "BOSH"
+msgstr "‏_BOSH URL:"
+
+#: gajim/data/gui/manage_proxies.ui:68
+#, fuzzy
+msgid "Add Proxy"
+msgstr "_פרוקסי:"
+
+#: gajim/data/gui/manage_proxies.ui:82
+#, fuzzy
+msgid "Remove Proxy"
+msgstr "הסרת קבוצה"
+
+#: gajim/data/gui/manage_proxies.ui:134
+#, fuzzy
+msgid "Pass_word"
+msgstr "ס_יסמה:"
+
+#: gajim/data/gui/manage_proxies.ui:159
+msgid "Use proxy auth_entication"
+msgstr "השתמש באימות _proxy"
+
+#: gajim/data/gui/manage_proxies.ui:179
+#, fuzzy
+msgid "_Username"
+msgstr "שם _משתמש:"
+
+#: gajim/data/gui/manage_proxies.ui:209
+#, fuzzy
+msgid "_Port"
+msgstr "_פורט:"
+
+#: gajim/data/gui/manage_proxies.ui:226
+msgid "example.org"
+msgstr ""
+
+#: gajim/data/gui/manage_proxies.ui:240
+#, fuzzy
+msgid "_Host"
+msgstr "שם מ_ארח:"
+
+#: gajim/data/gui/manage_proxies.ui:254
+msgid "Use HTTP prox_y"
+msgstr "אפשר _HTTP proxy"
+
+#: gajim/data/gui/manage_proxies.ui:275
+msgid "https://example.org/http-bind/"
+msgstr ""
+
+# כתובת _BOSH:
+#: gajim/data/gui/manage_proxies.ui:291
+#, fuzzy
+msgid "_BOSH URL"
+msgstr "‏_BOSH URL:"
+
+#: gajim/data/gui/manage_proxies.ui:309 gajim/gtk/adhoc.py:322
+#, fuzzy
+msgid "Settings"
+msgstr "קיצורי מקש"
+
+#: gajim/data/gui/manage_proxies.ui:344
+#, fuzzy
+msgid "_Type"
+msgstr "_טיפוס:"
+
+#: gajim/data/gui/manage_proxies.ui:361
+#: gajim/data/gui/groupchat_creation.ui:105
+#, fuzzy
+msgid "_Name"
+msgstr "_שם:"
+
+#: gajim/data/gui/manage_proxies.ui:391 gajim/gtk/accounts.py:742
+#, fuzzy
+msgid "Proxy"
+msgstr "_פרוקסי:"
+
 #: gajim/data/gui/application_menu.ui:8
 #, fuzzy
 msgid "View"
@@ -8057,8 +8265,8 @@ msgstr "_תצוגה"
 
 #: gajim/data/gui/application_menu.ui:11
 #, fuzzy
-msgid "Show Roster"
-msgstr "הצג _רשימה"
+msgid "Show Contact List"
+msgstr "הצג אנשי קשר _פעילים בלבד"
 
 #: gajim/data/gui/application_menu.ui:16
 #, fuzzy
@@ -8099,22 +8307,23 @@ msgstr "קיצורי מקש"
 msgid "Features"
 msgstr "תכונות"
 
-#: gajim/data/gui/application_menu.ui:81
+#: gajim/data/gui/application_menu.ui:77
+#: gajim/data/gui/groupchat_creation.ui:81 gajim/gtk/groupchat_creation.py:45
 #, fuzzy
-msgid "Bookmarks"
-msgstr "_סמן"
+msgid "Create Group Chat"
+msgstr "עזוב שיחות קבוצה"
 
-#: gajim/data/gui/application_menu.ui:94 gajim/data/gui/shortcuts_window.ui:189
-#: gajim/gtk/preferences.py:59
+#: gajim/data/gui/application_menu.ui:91 gajim/data/gui/shortcuts_window.ui:189
+#: gajim/gtk/preferences.py:58
 msgid "Preferences"
 msgstr "העדפות"
 
-#: gajim/data/gui/application_menu.ui:99
+#: gajim/data/gui/application_menu.ui:96
 msgid "Quit"
 msgstr ""
 
 #: gajim/data/gui/httpupload_progress_dialog.ui:110
-#: gajim/gtk/filetransfer.py:121
+#: gajim/gtk/filetransfer.py:120
 msgid "Progress"
 msgstr "התקדמות"
 
@@ -8132,53 +8341,33 @@ msgstr ""
 msgid "_Cancel Upload"
 msgstr "_ביטול"
 
-#: gajim/data/gui/manage_bookmarks_window.ui:13
-#, fuzzy
-msgid "Group Chat Bookmarks"
-msgstr "שיחות קבוצה"
-
-#: gajim/data/gui/manage_bookmarks_window.ui:68
-#, fuzzy
-msgid "Add Bookmark"
-msgstr "_סמן"
-
-#: gajim/data/gui/manage_bookmarks_window.ui:82
-#, fuzzy
-msgid "Remove Bookmark"
-msgstr "_סמן"
-
-#: gajim/data/gui/manage_bookmarks_window.ui:126
-msgid "N_ame"
+#: gajim/data/gui/groupchat_creation.ui:27
+msgid "Public or Private?"
 msgstr ""
 
-#: gajim/data/gui/manage_bookmarks_window.ui:145
-#, fuzzy
-msgid "Bookmark Name"
-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 ""
 
-#: gajim/data/gui/manage_bookmarks_window.ui:160
-#, fuzzy
-msgid "_Server"
-msgstr "_שרת:"
+#: gajim/data/gui/groupchat_creation.ui:58
+msgid "<b>Public:</b> Anyone who knows the address can join."
+msgstr ""
 
-#: gajim/data/gui/manage_bookmarks_window.ui:223
+#: gajim/data/gui/groupchat_creation.ui:122
 #, fuzzy
-msgid "Roo_m"
-msgstr "_חדר:"
+msgid "_Description"
+msgstr "תיאור"
 
-#: gajim/data/gui/manage_bookmarks_window.ui:253
-#, fuzzy
-msgid "_Password"
-msgstr "סיס_מה:"
+#: gajim/data/gui/groupchat_creation.ui:164
+msgid "_Public"
+msgstr ""
 
-#: gajim/data/gui/manage_bookmarks_window.ui:299
+#: gajim/data/gui/groupchat_creation.ui:278
 #, fuzzy
-msgid "Join chat when connected"
-msgstr "איש קשר מנותק"
-
-#: gajim/data/gui/manage_bookmarks_window.ui:307
-msgid "_Join Automatically"
-msgstr ""
+msgid "_Account"
+msgstr "_חשבונות"
 
 #: gajim/data/gui/exception_dialog.ui:49
 msgid "Sorry, that should not have happened"
@@ -8221,6 +8410,29 @@ msgstr "הענקת הרשאה לאיש קשר כדי שזה ידע מתי אתה
 msgid "Presets"
 msgstr "_נוכחות"
 
+#: gajim/data/gui/groupchat_info_scrolled.ui:32
+#, fuzzy
+msgid "Address"
+msgstr "_כתובת:"
+
+#: gajim/data/gui/groupchat_info_scrolled.ui:64
+msgid "Topic"
+msgstr ""
+
+#: gajim/data/gui/groupchat_info_scrolled.ui:80
+#, fuzzy
+msgid "Author"
+msgstr "מחברים:"
+
+#: gajim/data/gui/groupchat_info_scrolled.ui:182
+msgid "Discussion Logs"
+msgstr ""
+
+#: gajim/data/gui/groupchat_info_scrolled.ui:260
+#, fuzzy
+msgid "Group Chat Language"
+msgstr "הזמנת שיחת קבוצה"
+
 #: gajim/data/gui/emoji_chooser.ui:98
 #, fuzzy
 msgid "No Results Found"
@@ -8233,24 +8445,35 @@ msgstr "הזמנת ידידים!"
 #: gajim/data/gui/chat_to_muc_window.ui:39
 #, fuzzy
 msgid ""
-"You are now entering a groupchat.\n"
+"You are now entering a group chat.\n"
 "Select the contacts you want to invite"
 msgstr ""
 "בחרת להתחיל שיחה מרובת משתתפים.\n"
 "בחר את אנשי הקשר אותם ברצונך להזמין"
 
 #: gajim/data/gui/chat_to_muc_window.ui:112
-msgid "Please select a MUC server."
+#, fuzzy
+msgid "Please select a group chat server."
 msgstr "אנא בחר שרת שמ״מ."
 
 #: gajim/data/gui/chat_to_muc_window.ui:141
-msgid "MUC server"
-msgstr "שרת MUC (שיחה מרובת משתתפים)"
+#, fuzzy
+msgid "Group chat server"
+msgstr "שיחות קבוצה"
 
 #: gajim/data/gui/chat_to_muc_window.ui:176
 msgid "In_vite"
 msgstr "ה_זמן"
 
+#: gajim/data/gui/bookmarks.ui:176
+#, fuzzy
+msgid "Autojoin"
+msgstr "ה_צטרף אוטומטית"
+
+#: gajim/data/gui/bookmarks.ui:211
+msgid "_Apply"
+msgstr ""
+
 #: gajim/data/gui/history_manager.ui:11
 #, fuzzy
 msgid "_Export"
@@ -8268,12 +8491,13 @@ msgstr "מנהל רשומות היסטוריה של ‫Gajim"
 # BUG: or is better than and/or
 # אינו מהווה כלי לשם/לצורך צפיה
 #: gajim/data/gui/history_manager.ui:108
+#, fuzzy
 msgid ""
-"This log manager is not intended for log viewing. If you are looking for "
-"such functionality, use the history window instead.\n"
+"This history manager is not intended for viewing chat history. If you are "
+"looking for such functionality, please use the history window instead.\n"
 "\n"
-"Use this program to delete or export logs. You can select logs from the left "
-"and/or search database from below."
+"You can use this program to delete or export history. Either select logs "
+"from the left or search the database."
 msgstr ""
 "מנהל רשומות זה אינו מיועד לצורך צפייה ברשומות. אם רצונך בתפקודיות שכזו, "
 "לרשותך עומד חלון ההיסטוריה במקום.\n"
@@ -8326,8 +8550,9 @@ msgid "Select an emoji"
 msgstr ""
 
 #: gajim/data/gui/shortcuts_window.ui:38
-msgid "Complete a command or a nick"
-msgstr ""
+#, fuzzy
+msgid "Complete a command or a nickname"
+msgstr "אנא צור מוטיב חדש עם השם הרצוי עליך."
 
 #: gajim/data/gui/shortcuts_window.ui:45
 #, fuzzy
@@ -8370,7 +8595,7 @@ msgstr ""
 msgid "Scroll down"
 msgstr ""
 
-#: gajim/data/gui/shortcuts_window.ui:100 gajim/gtk/xml_console.py:72
+#: gajim/data/gui/shortcuts_window.ui:100 gajim/gtk/xml_console.py:69
 #, fuzzy
 msgid "Clear"
 msgstr "מנקה"
@@ -8413,7 +8638,7 @@ msgstr ""
 
 #: gajim/data/gui/shortcuts_window.ui:173
 #, fuzzy
-msgid "Roster Shortcuts"
+msgid "Contact List Shortcuts"
 msgstr "קיצורי מקש"
 
 #: gajim/data/gui/shortcuts_window.ui:196
@@ -8447,7 +8672,7 @@ msgid "Show only active contacts"
 msgstr "הצג אנשי קשר _פעילים בלבד"
 
 #: gajim/data/gui/shortcuts_window.ui:251
-msgid "Enable roster filtering"
+msgid "Enable contact list filtering"
 msgstr ""
 
 #: gajim/data/gui/shortcuts_window.ui:259
@@ -8502,7 +8727,7 @@ msgstr "חיפוש בתוך היום הנבחר בלבד"
 
 #: gajim/data/gui/history_window.ui:317
 #, fuzzy
-msgid "Record history for this chat"
+msgid "Store history for this chat"
 msgstr "התעלם משגיאה זו עבור תעודה זו."
 
 # (שנפתחו) לאחרונה
@@ -8510,7 +8735,7 @@ msgstr "התעלם משגיאה זו עבור תעודה זו."
 # (כתובות) אחרונות
 #: gajim/data/gui/history_window.ui:332
 #, fuzzy
-msgid "Record History"
+msgid "Store History"
 msgstr "אחרונים:"
 
 #: gajim/data/gui/history_window.ui:350
@@ -8530,9 +8755,10 @@ msgstr "יצירת פוסט חדש"
 msgid "Fill in the form."
 msgstr "מלא את הטופס."
 
-#: gajim/data/gui/data_form_window.ui:229
-msgid "Room Configuration"
-msgstr "תצורת חדר"
+#: gajim/data/gui/data_form_window.ui:229 gajim/gtk/groupchat_config.py:41
+#, fuzzy
+msgid "Group Chat Configuration"
+msgstr "הזמנת שיחת קבוצה"
 
 #: gajim/data/gui/roster_item_exchange_window.ui:39
 #: gajim/gtk/roster_item_exchange.py:35
@@ -8553,15 +8779,15 @@ msgstr "_מצב"
 msgid "_Start Chat..."
 msgstr "התחל _שיחה..."
 
-#: gajim/data/gui/systray_context_menu.ui:50
+#: gajim/data/gui/systray_context_menu.ui:43
 msgid "Show All Pending _Events"
 msgstr "הצג _אירועים ממתינים"
 
-#: gajim/data/gui/systray_context_menu.ui:59
+#: gajim/data/gui/systray_context_menu.ui:52
 msgid "Mute Sounds"
 msgstr "דומם _צלילים"
 
-#: gajim/data/gui/systray_context_menu.ui:75
+#: gajim/data/gui/systray_context_menu.ui:68
 #, fuzzy
 msgid "_Preferences"
 msgstr "העדפות"
@@ -8652,35 +8878,35 @@ msgstr "הרצת ביטוי בתוך מעטפת, הצגת פלט"
 msgid "Execute expression inside a shell, send output"
 msgstr "הרצת ביטוי בתוך מעטפת, מסירת פלט"
 
-#: gajim/command_system/implementation/standard.py:45
+#: gajim/command_system/implementation/standard.py:47
 msgid ""
 "Show help on a given command or a list of available commands if -a is given"
 msgstr ""
 "הצגת עזרה על פקודה נתונה או רשימה של פקודות זמינות כאשר הארגומנט ‎-a ניתן"
 
-#: gajim/command_system/implementation/standard.py:73
+#: gajim/command_system/implementation/standard.py:75
 msgid "Send a message to the contact"
 msgstr "מסירת הודעה לאיש קשר"
 
-#: gajim/command_system/implementation/standard.py:78
+#: gajim/command_system/implementation/standard.py:80
 msgid "Send action (in the third person) to the current chat"
 msgstr "מסירת פעולה (בגוף השלישי) לשיחה הנוכחית"
 
-#: gajim/command_system/implementation/standard.py:83
+#: gajim/command_system/implementation/standard.py:85
 msgid "Show logged messages which mention given text"
 msgstr "הצגת הודעות רשומות אשר מאזכרות תמליל נתון"
 
 # gajim-remote?
-#: gajim/command_system/implementation/standard.py:88
+#: gajim/command_system/implementation/standard.py:90
 #, python-format
 msgid "%s: Nothing found"
 msgstr "‏%s: לא נמצא דבר"
 
-#: gajim/command_system/implementation/standard.py:94
+#: gajim/command_system/implementation/standard.py:96
 msgid "Limit must be an integer"
 msgstr "תחום מוכרח להיות ספרה"
 
-#: gajim/command_system/implementation/standard.py:118
+#: gajim/command_system/implementation/standard.py:120
 msgid ""
 "\n"
 "    Set the current status\n"
@@ -8696,123 +8922,132 @@ msgstr ""
 "    ‏online, away, chat, xa, dnd.\n"
 "    "
 
-#: gajim/command_system/implementation/standard.py:136
+#: gajim/command_system/implementation/standard.py:138
 msgid "Set the current status to away"
 msgstr "קביעת מצב נוכחי אל נעדר"
 
-#: gajim/command_system/implementation/standard.py:150
+#: gajim/command_system/implementation/standard.py:152
 msgid "Set the current status to online"
 msgstr "קביעת מצב נוכחי אל מקוון"
 
-#: gajim/command_system/implementation/standard.py:153
+#: gajim/command_system/implementation/standard.py:155
 msgid "Available"
 msgstr "זמין"
 
-#: gajim/command_system/implementation/standard.py:173
-#: gajim/command_system/implementation/standard.py:250
+#: gajim/command_system/implementation/standard.py:175
+#: gajim/command_system/implementation/standard.py:252
 msgid "Clear the text window"
 msgstr "טיהור תמליל חלון"
 
-#: gajim/command_system/implementation/standard.py:178
-#: gajim/command_system/implementation/standard.py:397
+#: gajim/command_system/implementation/standard.py:180
+#: gajim/command_system/implementation/standard.py:401
 msgid "Send a ping to the contact"
 msgstr "מסירת פינג לאיש קשר"
 
-#: gajim/command_system/implementation/standard.py:181
-#: gajim/command_system/implementation/standard.py:400
+#: gajim/command_system/implementation/standard.py:183
+#: gajim/command_system/implementation/standard.py:404
 msgid "Command is not supported for zeroconf accounts"
 msgstr "פקודה לא נתמכת עבור חשבונות zeroconf"
 
-#: gajim/command_system/implementation/standard.py:185
-msgid "Send DTMF sequence through an open audio session"
+#: gajim/command_system/implementation/standard.py:187
+#, fuzzy
+msgid "Send DTMF sequence through an open voice chat"
 msgstr "מסירת רצף טזמ״ת (DTMF) מבעד לסשן קולי פתוח"
 
 # הפעלות
-#: gajim/command_system/implementation/standard.py:188
-msgid "No open audio sessions with the contact"
+#: gajim/command_system/implementation/standard.py:190
+#, fuzzy
+msgid "No open voice chats with the contact"
 msgstr "לא קיימים סשנים קוליים פתוחים עם האיש קשר"
 
-#: gajim/command_system/implementation/standard.py:191
+#: gajim/command_system/implementation/standard.py:193
 #, python-format
 msgid "%s is not a valid tone"
 msgstr "‏%s אינו טון (tone) תקף"
 
-#: gajim/command_system/implementation/standard.py:198
-msgid "Toggle audio session"
-msgstr "הפעלת סשן קולי"
+#: gajim/command_system/implementation/standard.py:200
+msgid "Toggle Voice Chat"
+msgstr ""
 
-#: gajim/command_system/implementation/standard.py:201
-msgid "Audio sessions are not available"
-msgstr "סשנים קוליים אינם זמינים"
+#: gajim/command_system/implementation/standard.py:203
+#, fuzzy
+msgid "Voice chats are not available"
+msgstr "סשנים חזותיים אינם זמינים"
 
-#: gajim/command_system/implementation/standard.py:208
-msgid "Toggle video session"
+#: gajim/command_system/implementation/standard.py:210
+#, fuzzy
+msgid "Toggle Video Chat"
 msgstr "הפעלת סשן וידאו"
 
-#: gajim/command_system/implementation/standard.py:211
-msgid "Video sessions are not available"
+#: gajim/command_system/implementation/standard.py:213
+#, fuzzy
+msgid "Video chats are not available"
 msgstr "סשנים חזותיים אינם זמינים"
 
 # BUG: him or her or they
 # he she
-#: gajim/command_system/implementation/standard.py:218
+#: gajim/command_system/implementation/standard.py:220
 #, fuzzy
 msgid "Send a message to the contact that will attract their attention"
 msgstr "מסירת הודעה לאיש קשר אשר תסב את תשומת ליבו"
 
-#: gajim/command_system/implementation/standard.py:255
+#: gajim/command_system/implementation/standard.py:257
 msgid "Change your nickname in a group chat"
 msgstr "שינוי שם הכינוי שלך בתוך שיחת קבוצה"
 
-#: gajim/command_system/implementation/standard.py:260 gajim/gtk/dialogs.py:674
-#: gajim/gtk/bookmarks.py:272
+#: gajim/command_system/implementation/standard.py:262
 msgid "Invalid nickname"
 msgstr "שם כינוי שגוי"
 
-#: gajim/command_system/implementation/standard.py:267
-msgid "Open a private chat window with a specified occupant"
+#: gajim/command_system/implementation/standard.py:269
+#, fuzzy
+msgid "Open a private chat window with a specified participant"
 msgstr "פתיחת חלון שיחה פרטית עם נוכח מצוין"
 
-#: gajim/command_system/implementation/standard.py:273
-#: gajim/command_system/implementation/standard.py:282
-#: gajim/command_system/implementation/standard.py:332
-#: gajim/command_system/implementation/standard.py:345
-#: gajim/command_system/implementation/standard.py:357
+#: gajim/command_system/implementation/standard.py:275
+#: gajim/command_system/implementation/standard.py:284
+#: gajim/command_system/implementation/standard.py:336
+#: gajim/command_system/implementation/standard.py:349
+#: gajim/command_system/implementation/standard.py:361
 msgid "Nickname not found"
 msgstr "שם כינוי לא נמצא"
 
 # BUG: him or her or they
 # he she
-#: gajim/command_system/implementation/standard.py:276
+#: gajim/command_system/implementation/standard.py:278
+#, fuzzy
 msgid ""
-"Open a private chat window with a specified occupant and send him a message"
+"Open a private chat window with a specified participant and send him a "
+"message"
 msgstr "פתיחת חלון שיחה פרטית עם נוכח מצוין ומסירת הודעה אליו"
 
-#: gajim/command_system/implementation/standard.py:285
+#: gajim/command_system/implementation/standard.py:287
 msgid "Display or change a group chat topic"
 msgstr "הצגה או שינוי נושא של שיחת קבוצה"
 
 # בליווי תכלית
-#: gajim/command_system/implementation/standard.py:294
-msgid "Invite a user to a room for a reason"
+#: gajim/command_system/implementation/standard.py:296
+#, fuzzy
+msgid "Invite a user to a group chat for a reason"
 msgstr "הזמנת משתמש לחדר עם ציון סיבה"
 
-#: gajim/command_system/implementation/standard.py:297
+#: gajim/command_system/implementation/standard.py:299
 #, fuzzy, python-format
 msgid "Invited %(jid)s to %(room_jid)s"
 msgstr "הזמנת %s אל %s"
 
-#: gajim/command_system/implementation/standard.py:301
+#: gajim/command_system/implementation/standard.py:303
 #, fuzzy
-msgid "Join a group chat given by a JID"
+msgid "Join a group chat given by an XMPP Address"
 msgstr "בתוך _שיחות קבוצה"
 
-#: gajim/command_system/implementation/standard.py:309
+#: gajim/command_system/implementation/standard.py:313
+#, fuzzy
 msgid ""
-"Leave the groupchat, optionally giving a reason, and close tab or window"
+"Leave the group chat, optionally giving a reason, and close tab or window"
 msgstr "עזיבת שיחת קבוצה, אפשרי לתת סיבה, ולסגור את הכרטיסייה או את החלון"
 
-#: gajim/command_system/implementation/standard.py:314
+#: gajim/command_system/implementation/standard.py:318
 #, fuzzy
 msgid ""
 "\n"
@@ -8827,13 +9062,15 @@ msgstr ""
 "    כאשר שם כינוי נתון לא נמצא זה ייוחס בתור jid.\n"
 "    "
 
-#: gajim/command_system/implementation/standard.py:329
-msgid "Kick user by a nick from a groupchat"
+#: gajim/command_system/implementation/standard.py:333
+#, fuzzy
+msgid "Kick user by a nick from a group chat"
 msgstr "בעיטת משתמש מתוך שיחת קבוצה לפי כינוי"
 
-#: gajim/command_system/implementation/standard.py:338
+#: gajim/command_system/implementation/standard.py:342
+#, fuzzy
 msgid ""
-"Set occupant role in group chat.\n"
+"Set participant role in group chat.\n"
 "    Role can be given as one of the following values:\n"
 "    moderator, participant, visitor, none"
 msgstr ""
@@ -8841,13 +9078,14 @@ msgstr ""
 "    תפקיד יכול להיות נתון בתור אחד מתוך הערכים הבאים:\n"
 "    ‏moderator, participant, visitor, none"
 
-#: gajim/command_system/implementation/standard.py:343
+#: gajim/command_system/implementation/standard.py:347
 msgid "Invalid role given"
 msgstr "ניתן תפקיד שגוי"
 
-#: gajim/command_system/implementation/standard.py:350
+#: gajim/command_system/implementation/standard.py:354
+#, fuzzy
 msgid ""
-"Set occupant affiliation in group chat.\n"
+"Set participant affiliation in group chat.\n"
 "    Affiliation can be given as one of the following values:\n"
 "    owner, admin, member, outcast, none"
 msgstr ""
@@ -8855,20 +9093,23 @@ msgstr ""
 "    שיוך יכול להיות נתון בתור אחד מתוך הערכים הבאים:\n"
 "    ‏owner, admin, member, outcast, none"
 
-#: gajim/command_system/implementation/standard.py:355
+#: gajim/command_system/implementation/standard.py:359
 msgid "Invalid affiliation given"
 msgstr "ניתן שיוך שגוי"
 
-#: gajim/command_system/implementation/standard.py:365
-msgid "Display names of all group chat occupants"
+#: gajim/command_system/implementation/standard.py:369
+#, fuzzy
+msgid "Display names of all group chat participants"
 msgstr "הצגת שמות של כל הנוכחים בתוך שיחת קבוצה"
 
-#: gajim/command_system/implementation/standard.py:387
-msgid "Forbid an occupant to send you public or private messages"
+#: gajim/command_system/implementation/standard.py:391
+#, fuzzy
+msgid "Forbid a participant to send you public or private messages"
 msgstr "אסירה על נוכח לשלוח אליך הודעות פומביות או פרטיות"
 
-#: gajim/command_system/implementation/standard.py:392
-msgid "Allow an occupant to send you public or private messages"
+#: gajim/command_system/implementation/standard.py:396
+#, fuzzy
+msgid "Allow a participant to send you public or private messages"
 msgstr "התרה לנוכח לשלוח לך הודעות פומביות או פרטיות"
 
 #: gajim/command_system/implementation/middleware.py:74
@@ -8879,181 +9120,305 @@ msgstr "שגיאה במהלך הוצאה לפועל של פקודה!"
 msgid "The same as using a doc-string, except it supports translation"
 msgstr ""
 
-#: gajim/gtk/filetransfer.py:91
+#: gajim/gtk/groupchat_info.py:36
+#, fuzzy
+msgid "?Group chat feature:Archiving"
+msgstr "הזמנת שיחת קבוצה"
+
+#: gajim/gtk/groupchat_info.py:37
+#, fuzzy
+msgid "Messages are archived on the server"
+msgstr "סשן זה יושם בארכיון על שרת"
+
+#: gajim/gtk/groupchat_info.py:40
+#, fuzzy
+msgid "?Group chat feature:Persistent"
+msgstr "שיחות קבוצה"
+
+#: gajim/gtk/groupchat_info.py:41
+msgid "This group chat persists even if there are no participants"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:45
+#, fuzzy
+msgid "?Group chat feature:Temporary"
+msgstr "אין"
+
+#: gajim/gtk/groupchat_info.py:46
+msgid "This group chat will be destroyed once the last participant left"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:50
+#, fuzzy
+msgid "?Group chat feature:Moderated"
+msgstr "אין"
+
+#: gajim/gtk/groupchat_info.py:51
+msgid ""
+"Participants entering this group chat need to request permission to send "
+"messages"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:55
+#, fuzzy
+msgid "?Group chat feature:Not Moderated"
+msgstr "שיחות קבוצה"
+
+#: gajim/gtk/groupchat_info.py:56
+msgid "Participants entering this group chat are allowed to send messages"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:60
+#, fuzzy
+msgid "?Group chat feature:Open"
+msgstr "אין"
+
+# הצטרף
+#: gajim/gtk/groupchat_info.py:61
+#, fuzzy
+msgid "Anyone can join this group chat"
+msgstr "%s נכנס/ה לשיחת קבוצה"
+
+#: gajim/gtk/groupchat_info.py:64
+#, fuzzy
+msgid "?Group chat feature:Members Only"
+msgstr "הבלטת שיחת קבוצה:"
+
+#: gajim/gtk/groupchat_info.py:65
+msgid "This group chat is restricted to members only"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:69
+#, fuzzy
+msgid "?Group chat feature:Public"
+msgstr "הבלטת שיחת קבוצה:"
+
+#: gajim/gtk/groupchat_info.py:70
+msgid "Group chat can be found via search"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:73
+#, fuzzy
+msgid "?Group chat feature:Hidden"
+msgstr "אין"
+
+# BUG: general title without "the"
+#: gajim/gtk/groupchat_info.py:74
+#, fuzzy
+msgid "This group chat can not be found via search"
+msgstr "השירות לא היה יכול להימצא"
+
+#: gajim/gtk/groupchat_info.py:77
+#, fuzzy
+msgid "?Group chat feature:Not Anonymous"
+msgstr "שיחות קבוצה"
+
+#: gajim/gtk/groupchat_info.py:78
+msgid "All other group chat participants can see your XMPP address"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:82
+#, fuzzy
+msgid "?Group chat feature:Semi-Anonymous"
+msgstr "הבלטת שיחת קבוצה:"
+
+#: gajim/gtk/groupchat_info.py:83
+msgid "Only moderators can see your XMPP address"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:86
+#, fuzzy
+msgid "?Group chat feature:Password Required"
+msgstr "שיחות קבוצה"
+
+#: gajim/gtk/groupchat_info.py:87
+msgid "This group chat does require a password upon entry"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:91
+#, fuzzy
+msgid "?Group chat feature:No Password Required"
+msgstr "שיחות קבוצה"
+
+#: gajim/gtk/groupchat_info.py:92
+msgid "This group chat does not require a password upon entry"
+msgstr ""
+
+#: gajim/gtk/filetransfer.py:90
 msgid "File"
 msgstr "קובץ"
 
-#: gajim/gtk/filetransfer.py:108
+#: gajim/gtk/filetransfer.py:107
 msgid "Time"
 msgstr "זמן"
 
-#: gajim/gtk/filetransfer.py:228
+#: gajim/gtk/filetransfer.py:227
 #, fuzzy, python-format
 msgid "File name: %s"
 msgstr "שם קובץ: %s"
 
-#: gajim/gtk/filetransfer.py:229 gajim/gtk/filetransfer.py:464
+#: gajim/gtk/filetransfer.py:228 gajim/gtk/filetransfer.py:469
 #, python-format
 msgid "Size: %s"
 msgstr "גודל: %s"
 
-#: gajim/gtk/filetransfer.py:239
+#: gajim/gtk/filetransfer.py:238
 #, python-format
 msgid "Sender: %s"
 msgstr "ממען: %s"
 
-#: gajim/gtk/filetransfer.py:240 gajim/gtk/filetransfer.py:744
+#: gajim/gtk/filetransfer.py:239 gajim/gtk/filetransfer.py:749
 #: gajim/gtk/tooltips.py:577
 msgid "Recipient: "
 msgstr "נמען: "
 
-#: gajim/gtk/filetransfer.py:251
+#: gajim/gtk/filetransfer.py:250
 #, python-format
 msgid "Saved in: %s"
 msgstr "נשמר בתוך: ‎%s"
 
-#: gajim/gtk/filetransfer.py:256
+#: gajim/gtk/filetransfer.py:255
 msgid "File transfer completed"
 msgstr "העברת קובץ הושלמה"
 
-#: gajim/gtk/filetransfer.py:276 gajim/gtk/filetransfer.py:285
+#: gajim/gtk/filetransfer.py:275 gajim/gtk/filetransfer.py:284
 #, fuzzy
 msgid "Connection with peer could not be established."
 msgstr "חיבור עם עמית לא היה אפשרי לביסוס."
 
-#: gajim/gtk/filetransfer.py:293
+#: gajim/gtk/filetransfer.py:292
 #, python-format
 msgid "Filename: %s"
 msgstr "שם קובץ: %s"
 
-#: gajim/gtk/filetransfer.py:294
+#: gajim/gtk/filetransfer.py:293
 #, python-format
 msgid "Recipient: %s"
 msgstr "נמען: %s"
 
-#: gajim/gtk/filetransfer.py:296
+#: gajim/gtk/filetransfer.py:295
 #, python-format
 msgid "Error message: %s"
 msgstr "הודעת שגיאה: %s"
 
-#: gajim/gtk/filetransfer.py:333
-#, fuzzy
-msgid "File transfer error"
-msgstr "שגיאת העברת קובץ"
-
 # אופן מסולף
 #: gajim/gtk/filetransfer.py:334
 #, fuzzy, python-format
 msgid ""
-"The file %(file)s has been received, but it seems to have been damaged along "
-"the way.\n"
+"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"
 "האם ברצונך להטעינו מחדש?"
 
+#: gajim/gtk/filetransfer.py:340
+#, fuzzy
+msgid "_Download Again"
+msgstr "אל ת_שאל אותי שוב"
+
 # להשיג גישה
-#: gajim/gtk/filetransfer.py:350
+#: gajim/gtk/filetransfer.py:355
 #, fuzzy
 msgid "Gajim can not read this file"
 msgstr "‏Gajim לא מסוגל לגשת לקובץ זה"
 
-#: gajim/gtk/filetransfer.py:351
+#: gajim/gtk/filetransfer.py:356
 msgid "Another process is using this file."
 msgstr ""
 
-#: gajim/gtk/filetransfer.py:418
+#: gajim/gtk/filetransfer.py:423
 #, fuzzy
 msgid "File Transfer Conflict"
 msgstr "העברת קובץ הושלמה"
 
-#: gajim/gtk/filetransfer.py:419
+#: gajim/gtk/filetransfer.py:424
 msgid "This file already exists"
 msgstr "קובץ זה כבר ישנו"
 
-#: gajim/gtk/filetransfer.py:420
+#: gajim/gtk/filetransfer.py:425
 msgid "Resume download or replace file?"
 msgstr ""
 
-#: gajim/gtk/filetransfer.py:424
+#: gajim/gtk/filetransfer.py:429
 #, fuzzy
 msgid "Replace _File"
 msgstr "ה_חלף"
 
-#: gajim/gtk/filetransfer.py:427
+#: gajim/gtk/filetransfer.py:432
 #, fuzzy
 msgid "Resume _Download"
 msgstr "הורדה"
 
 # זמין לכתיבה
-#: gajim/gtk/filetransfer.py:437
+#: gajim/gtk/filetransfer.py:442
 #, fuzzy, python-format
 msgid "Directory '%s' is not writable"
 msgstr "המדור \"%s\" אינו נתון לכתיבה"
 
-#: gajim/gtk/filetransfer.py:438
+#: gajim/gtk/filetransfer.py:443
 #, fuzzy
 msgid "You do not have permissions to create files in this directory."
 msgstr "אין לך הרשאות ליצור קבצים במדור זה."
 
-#: gajim/gtk/filetransfer.py:461
+#: gajim/gtk/filetransfer.py:466
 #, python-format
 msgid "File: %s"
 msgstr "קובץ: %s"
 
-#: gajim/gtk/filetransfer.py:467
+#: gajim/gtk/filetransfer.py:472
 #, python-format
 msgid "Type: %s"
 msgstr "טיפוס: %s"
 
-#: gajim/gtk/filetransfer.py:469
+#: gajim/gtk/filetransfer.py:474
 #, python-format
 msgid "Description: %s"
 msgstr "תיאור: %s"
 
-#: gajim/gtk/filetransfer.py:480
+#: gajim/gtk/filetransfer.py:485
 #, fuzzy, python-format
 msgid "%s wants to send you a file"
 msgstr "‏%s רוצה לשלוח לך קובץ."
 
-#: gajim/gtk/filetransfer.py:509
+#: gajim/gtk/filetransfer.py:514
 #, fuzzy
 msgid "Checking file…"
 msgstr "כעת בודק קובץ..."
 
-#: gajim/gtk/filetransfer.py:524
+#: gajim/gtk/filetransfer.py:529
 msgid "File error"
 msgstr "שגיאת קובץ"
 
-#: gajim/gtk/filetransfer.py:561
+#: gajim/gtk/filetransfer.py:566
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr ""
 
-#: gajim/gtk/filetransfer.py:658
+#: gajim/gtk/filetransfer.py:663
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/ש)"
 
-#: gajim/gtk/filetransfer.py:711 gajim/gtk/filetransfer.py:715
+#: gajim/gtk/filetransfer.py:716 gajim/gtk/filetransfer.py:720
 msgid "Invalid File"
 msgstr "קובץ שגוי"
 
-#: gajim/gtk/filetransfer.py:711
+#: gajim/gtk/filetransfer.py:716
 msgid "File: "
 msgstr "קובץ: "
 
 # לא קיימת אפשרות
 # אין אפשרות
-#: gajim/gtk/filetransfer.py:716
+#: gajim/gtk/filetransfer.py:721
 msgid "It is not possible to send empty files"
 msgstr "אין זה אפשרי לשלוח קבצים ריקים"
 
-#: gajim/gtk/filetransfer.py:742 gajim/gtk/tooltips.py:571
+#: gajim/gtk/filetransfer.py:747 gajim/gtk/tooltips.py:571
 msgid "Sender: "
 msgstr "ממען: "
 
-#: gajim/gtk/filetransfer.py:1038
+#: gajim/gtk/filetransfer.py:1043
 #, fuzzy
 msgid "Choose a File to Send…"
 msgstr "בחירת קובץ לשליחה..."
@@ -9062,31 +9427,34 @@ msgstr "בחירת קובץ לשליחה..."
 # שיחה נמשכת
 #: gajim/gtk/start_chat.py:51
 #, fuzzy
-msgid "Start new Conversation"
+msgid "Start New Conversation"
 msgstr "שיחה משולבת"
 
-#: gajim/gtk/start_chat.py:424
-#, fuzzy
-msgid "New Groupchat"
-msgstr "שיחת קבוצה חדשה"
+#: gajim/gtk/start_chat.py:260 gajim/gtk/start_chat.py:328
+msgid "You can not join a group chat unless you are connected."
+msgstr "אין באפשרותך להצטרף לשיחת קבוצה אלא כאשר תחובר."
 
-#: gajim/gtk/start_chat.py:426
+#: gajim/gtk/start_chat.py:603 gajim/gtk/groupchat_join.py:38
+msgid "Join Group Chat"
+msgstr "הצטרף לשיחת קבוצה"
+
+#: gajim/gtk/start_chat.py:605 gajim/gtk/add_contact.py:40
 #, fuzzy
-msgid "New Contact"
-msgstr "הוספת איש קשר חדש"
+msgid "Add Contact"
+msgstr "הוסף _איש קשר..."
 
-#: gajim/gtk/start_chat.py:588
+#: gajim/gtk/start_chat.py:746
 #, fuzzy, python-format
-msgid "%s Group chats found"
+msgid "%s group chats found"
 msgstr "cli"
 
 # השיב
-#: gajim/gtk/discovery.py:70
+#: gajim/gtk/discovery.py:69
 msgid "This service has not yet responded with detailed information"
 msgstr "שירות זה טרם הגיב עם מידע מפורט"
 
 # שבור, פגום
-#: gajim/gtk/discovery.py:71
+#: gajim/gtk/discovery.py:70
 #, fuzzy
 msgid ""
 "This service could not respond with detailed information.\n"
@@ -9095,137 +9463,117 @@ msgstr ""
 "לא היה ביכולתו של שירות זה להגיב עם מידע מפורט.\n"
 "נראה כי שירות זה הינו מיושן או מקוטע"
 
-#: gajim/gtk/discovery.py:128
+#: gajim/gtk/discovery.py:126
 msgid "Others"
 msgstr "אחרים"
 
-#: gajim/gtk/discovery.py:131
-msgid "Conference"
-msgstr "ועידה"
+#: gajim/gtk/discovery.py:129
+#, fuzzy
+msgid "Group Chat"
+msgstr "שיחות קבוצה"
 
 # BUG: Dot
-#: gajim/gtk/discovery.py:519
+#: gajim/gtk/discovery.py:518
 msgid "Without a connection, you can not browse available services"
 msgstr "ללא חיבור, אין באפשרותך לעיין בשירותים זמינים"
 
-#: gajim/gtk/discovery.py:606
+#: gajim/gtk/discovery.py:605
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "מציאת שירות באמצעות חשבון ‫%s"
 
-#: gajim/gtk/discovery.py:608
+#: gajim/gtk/discovery.py:607
 msgid "Service Discovery"
 msgstr "מציאת שירות"
 
 # BUG: general title without "the"
-#: gajim/gtk/discovery.py:691
+#: gajim/gtk/discovery.py:690
 msgid "The service could not be found"
 msgstr "השירות לא היה יכול להימצא"
 
-#: gajim/gtk/discovery.py:692
+#: gajim/gtk/discovery.py:691
 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:699 gajim/gtk/discovery.py:1042
+#: gajim/gtk/discovery.py:698 gajim/gtk/discovery.py:1041
 msgid "The service is not browsable"
 msgstr "השירות אינו בר עיון"
 
-#: gajim/gtk/discovery.py:700
+#: gajim/gtk/discovery.py:699
 msgid "This type of service does not contain any items to browse."
 msgstr "טיפוס זה של שירות לא מכיל פריטים לעיון."
 
-#: gajim/gtk/discovery.py:738 gajim/gtk/discovery.py:747
+#: gajim/gtk/discovery.py:737 gajim/gtk/discovery.py:746
 msgid "Invalid Server Name"
 msgstr "שם שרת שגוי"
 
-#: gajim/gtk/discovery.py:806
+#: gajim/gtk/discovery.py:805
 #, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "עיון בשירותים בכתובת ‫%(address)s באמצעות חשבון ‫%(account)s"
 
-#: gajim/gtk/discovery.py:851
+#: gajim/gtk/discovery.py:850
 #, fuzzy
 msgid "Browse"
 msgstr "_עיין"
 
-#: gajim/gtk/discovery.py:1043
+#: gajim/gtk/discovery.py:1042
 msgid "This service does not contain any items to browse."
 msgstr "שירות זה לא מכיל פריטים לעיון."
 
-#: gajim/gtk/discovery.py:1255
+#: gajim/gtk/discovery.py:1254
 #, fuzzy
 msgid "_Command"
 msgstr "cli"
 
-#: gajim/gtk/discovery.py:1264 gajim/gtk/discovery.py:1422
+#: gajim/gtk/discovery.py:1263 gajim/gtk/discovery.py:1420
 msgid "Re_gister"
 msgstr "ה_רשמה"
 
-#: gajim/gtk/discovery.py:1277
+#: gajim/gtk/discovery.py:1276
 msgid "_Search"
 msgstr "_חפש"
 
-#: gajim/gtk/discovery.py:1420
+#: gajim/gtk/discovery.py:1418
 msgid "_Edit"
 msgstr "ע_ריכה"
 
 # Scanned/Identified/Detected/Discovered/Found %(current)d out of %(total)d..
 # אותרו, זוהו, נמצאו
-#: gajim/gtk/discovery.py:1458
+#: gajim/gtk/discovery.py:1456
 #, fuzzy, python-format
 msgid "Scanning %(current)d / %(total)d ..."
 msgstr "נסרקו %(current)d שירותים מתוך %(total)d.."
 
-#: gajim/gtk/discovery.py:1674
+#: gajim/gtk/discovery.py:1655
+msgid "Users"
+msgstr "משתמשים"
+
+#: gajim/gtk/discovery.py:1671
 msgid "Id"
 msgstr "מזהה"
 
-#: gajim/gtk/discovery.py:1713
-msgid "_Join"
-msgstr "ה_צטרף"
-
-#: gajim/gtk/discovery.py:1736
-msgid "Bookmark already set"
-msgstr "סימנייה כבר הוגדרה"
-
-#: gajim/gtk/discovery.py:1737
-#, fuzzy, python-format
-msgid "Group Chat '%s' is already in your bookmarks."
-msgstr "שיחת קבוצה \"%s\" כבר קיימת בסימניות שלך."
-
-#: gajim/gtk/discovery.py:1748
-msgid "Bookmark has been added successfully"
-msgstr "סימנייה הוספה בהצלחה"
-
-#: gajim/gtk/discovery.py:1749
-#, fuzzy
-msgid ""
-"You can manage your bookmarks by clicking the Bookmarks menu item in your "
-"contact list."
-msgstr ""
-"באפשרותך לנהל את הסימניות שלך דרך תפריט 'פעולות' אשר מצוי בתוך הרשימה שלך."
-
-#: gajim/gtk/discovery.py:1950
+#: gajim/gtk/discovery.py:1900
 msgid "Subscribed"
 msgstr "רשום"
 
-#: gajim/gtk/discovery.py:1959
+#: gajim/gtk/discovery.py:1909
 msgid "Node"
 msgstr "צומת"
 
 # פרסום
-#: gajim/gtk/discovery.py:2028
+#: gajim/gtk/discovery.py:1978
 #, fuzzy
 msgid "_New post"
 msgstr "פוסט חדש"
 
-#: gajim/gtk/discovery.py:2037
+#: gajim/gtk/discovery.py:1987
 msgid "_Subscribe"
 msgstr "הי_רשם"
 
-#: gajim/gtk/discovery.py:2045
+#: gajim/gtk/discovery.py:1995
 msgid "_Unsubscribe"
 msgstr "_בטל הרשמה"
 
@@ -9273,7 +9621,7 @@ msgstr "טופס %s"
 msgid "Characters typed: %s"
 msgstr "תו לא מורשה"
 
-#: gajim/gtk/single_message.py:274 gajim/gtk/xml_console.py:169
+#: gajim/gtk/single_message.py:274 gajim/gtk/xml_console.py:166
 msgid "Connection not available"
 msgstr "חיבור לא זמין"
 
@@ -9282,6 +9630,12 @@ msgstr "חיבור לא זמין"
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "אנא ודא כי אתה מחובר בעזרת \"%s\"."
 
+#: gajim/gtk/single_message.py:306
+#, 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:330
 #, python-format
@@ -9293,28 +9647,28 @@ msgstr ""
 msgid "%s wrote:\n"
 msgstr "‏%s כתב/ה:\n"
 
-#: gajim/gtk/pep_config.py:44
+#: gajim/gtk/pep_config.py:45
 #, fuzzy, python-format
 msgid "PEP Service Configuration (%s)"
 msgstr "תצורת שירות ‫PEP"
 
-#: gajim/gtk/pep_config.py:77
+#: gajim/gtk/pep_config.py:78
 #, fuzzy
 msgid "Service"
 msgstr "שרת"
 
-#: gajim/gtk/pep_config.py:114
+#: gajim/gtk/pep_config.py:115
 msgid "PEP node was not removed"
 msgstr "צומת PEP לא הוסר"
 
-#: gajim/gtk/pep_config.py:115
+#: gajim/gtk/pep_config.py:116
 #, fuzzy, python-format
 msgid ""
 "PEP node %(node)s was not removed:\n"
 "%(message)s"
 msgstr "צומת PEP ‏%(node)s לא הוסר: %(message)s"
 
-#: gajim/gtk/pep_config.py:146
+#: gajim/gtk/pep_config.py:147
 #, python-format
 msgid "Configure %s"
 msgstr "תצורת ‫%s"
@@ -9330,17 +9684,21 @@ msgstr "_רישום"
 msgid "Registration successful"
 msgstr "רישום בוצע בהצלחה"
 
-#: gajim/gtk/dialogs.py:54 gajim/gtk/dataform.py:659 gajim/gtk/adhoc.py:85
+#: gajim/gtk/service_registration.py:215
+msgid "Registration failed"
+msgstr "רישום נכשל"
+
+#: gajim/gtk/dialogs.py:53 gajim/gtk/dataform.py:668 gajim/gtk/adhoc.py:86
 #, fuzzy
 msgid "Cancel"
 msgstr "_ביטול"
 
-#: gajim/gtk/dialogs.py:129
+#: gajim/gtk/dialogs.py:128
 #, fuzzy, python-format
 msgid "Dictionary for language \"%s\" not available"
 msgstr "מילון עבור שפה %s לא זמין"
 
-#: gajim/gtk/dialogs.py:130
+#: gajim/gtk/dialogs.py:129
 #, fuzzy, python-format
 msgid ""
 "You have to install the dictionary \"%s\" to use spellchecking, or choose "
@@ -9353,7 +9711,7 @@ msgstr ""
 "\n"
 "הדגשת מילים אשר לא אויתו כראוי לא תנוצל"
 
-#: gajim/gtk/dialogs.py:410 gajim/gtk/dialogs.py:425
+#: gajim/gtk/dialogs.py:322 gajim/gtk/dialogs.py:337
 msgid "Insecure connection"
 msgstr "חיבור לא מאובטח"
 
@@ -9363,7 +9721,7 @@ msgstr "חיבור לא מאובטח"
 # discouraged:
 #  > deprived > לקוי בחסר
 #  > dissuade > dissuade from > להניא מ-
-#: gajim/gtk/dialogs.py:411
+#: gajim/gtk/dialogs.py:323
 #, fuzzy, python-format
 msgid ""
 "You are about to connect to the account %(account)s (%(server)s) insecurely. "
@@ -9376,121 +9734,117 @@ msgstr ""
 "להימנע מחיבורים מטיפוס זה.\n"
 "האם אתה בטוח כי ברצונך להתחבר?"
 
-#: gajim/gtk/dialogs.py:416
+#: gajim/gtk/dialogs.py:328
 msgid "Yes, I really want to connect insecurely"
 msgstr "כן, אני באמת רוצה להתחבר בשיטה לא בטוחה"
 
-#: gajim/gtk/dialogs.py:417
+#: gajim/gtk/dialogs.py:329
 msgid "Gajim will NOT connect unless you check this box"
 msgstr "‏Gajim לא יתחבר אלא אם כן תיבה זו תסומן"
 
-#: gajim/gtk/dialogs.py:675
-msgid "The nickname contains invalid characters."
-msgstr "שם הכינוי מכיל תווים אסורים."
-
 # Destroying is "at this moment".  It should be Destroy without ing
-#: gajim/gtk/dialogs.py:734
+#: gajim/gtk/dialogs.py:561
 #, fuzzy, python-format
 msgid "Destroy %s"
 msgstr "החרבת ‫%s"
 
-#: gajim/gtk/dialogs.py:775
+#: gajim/gtk/dialogs.py:602
 #, fuzzy
 msgid "Certificate"
 msgstr "תעודת לקוח"
 
-#: gajim/gtk/dialogs.py:786
+#: gajim/gtk/dialogs.py:613
 #, fuzzy, python-format
 msgid ""
 "Certificate for account\n"
 "%s"
 msgstr "תעודה עבור חשבון ‫%s"
 
-#: gajim/gtk/dialogs.py:824
+#: gajim/gtk/dialogs.py:651
 msgid "Issued to\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:825 gajim/gtk/dialogs.py:830
+#: gajim/gtk/dialogs.py:652 gajim/gtk/dialogs.py:657
 msgid "Common Name (CN): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:826 gajim/gtk/dialogs.py:831
+#: gajim/gtk/dialogs.py:653 gajim/gtk/dialogs.py:658
 msgid "Organization (O): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:827 gajim/gtk/dialogs.py:832
+#: gajim/gtk/dialogs.py:654 gajim/gtk/dialogs.py:659
 msgid "Organizational Unit (OU): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:828
+#: gajim/gtk/dialogs.py:655
 #, fuzzy
 msgid "Serial Number: "
 msgstr "מספר GG:"
 
-#: gajim/gtk/dialogs.py:829
+#: gajim/gtk/dialogs.py:656
 msgid "Issued by\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:833
+#: gajim/gtk/dialogs.py:660
 msgid "Validity\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:834
+#: gajim/gtk/dialogs.py:661
 msgid "Issued on: "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:835
+#: gajim/gtk/dialogs.py:662
 #, fuzzy
 msgid "Expires on: "
 msgstr "פוקעת"
 
-#: gajim/gtk/dialogs.py:836
+#: gajim/gtk/dialogs.py:663
 msgid "SHA-1:"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:838
+#: gajim/gtk/dialogs.py:665
 msgid "SHA-256:"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:852
+#: gajim/gtk/dialogs.py:679
 #, fuzzy
 msgid "View certificate…"
 msgstr "הצג תעודה..."
 
-#: gajim/gtk/dialogs.py:864 gajim/gtk/accounts.py:893
+#: gajim/gtk/dialogs.py:691 gajim/gtk/accounts.py:896
 msgid "Change Password"
 msgstr "שינוי סיסמה"
 
-#: gajim/gtk/dialogs.py:878
+#: gajim/gtk/dialogs.py:705
 msgid "_OK"
 msgstr "_אישור"
 
-#: gajim/gtk/dialogs.py:891
+#: gajim/gtk/dialogs.py:718
 #, fuzzy
 msgid "You must enter a password"
 msgstr "עליך להזין סיסמה."
 
-#: gajim/gtk/dialogs.py:895
+#: gajim/gtk/dialogs.py:722
 msgid "Passwords do not match"
 msgstr "סיסמאות לא תואמות"
 
-#: gajim/gtk/dialogs.py:923
+#: gajim/gtk/dialogs.py:750
 #, fuzzy
 msgid "Group Chat Invitation "
 msgstr "הזמנת שיחת קבוצה"
 
-#: gajim/gtk/dialogs.py:948
+#: gajim/gtk/dialogs.py:775
 #, fuzzy, python-format
 msgid "<b>%s</b> has invited you to join a discussion"
 msgstr "$Contact הזמינך להצטרף לדיון"
 
-#: gajim/gtk/dialogs.py:951
+#: gajim/gtk/dialogs.py:778
 #, 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:959
+#: gajim/gtk/dialogs.py:786
 #, python-format
 msgid "Comment: %s"
 msgstr "הערה: %s"
@@ -9505,11 +9859,6 @@ msgstr "מספר GG:"
 msgid "ICQ Number"
 msgstr "מספר ICQ:"
 
-#: gajim/gtk/add_contact.py:40
-#, fuzzy
-msgid "Add Contact"
-msgstr "הוסף _איש קשר..."
-
 # מיבי בתים
 #: gajim/gtk/add_contact.py:259
 #, fuzzy, python-format
@@ -9534,7 +9883,8 @@ msgid "The user ID must not contain a resource."
 msgstr "מזהה משתמש לא יכול להכיל משאב."
 
 #: gajim/gtk/add_contact.py:299
-msgid "You cannot add yourself to your roster."
+#, fuzzy
+msgid "You cannot add yourself to your contact list."
 msgstr "אין באפשרותך להוסיף את עצמך לרשימה שלך."
 
 #: gajim/gtk/add_contact.py:304
@@ -9547,11 +9897,13 @@ msgid "Your account must be online to add new contacts."
 msgstr ""
 
 #: gajim/gtk/add_contact.py:321
-msgid "Contact already in roster"
+#, fuzzy
+msgid "Contact Already in Contact List"
 msgstr "איש קשר כבר מצוי ברשימה"
 
 #: gajim/gtk/add_contact.py:322
-msgid "This contact is already listed in your roster."
+#, fuzzy
+msgid "This contact is already in your contact list."
 msgstr "איש קשר זה כבר מצוי ברשימה שלך."
 
 #: gajim/gtk/add_contact.py:379 gajim/gtk/add_contact.py:417
@@ -9592,14 +9944,14 @@ msgstr "שנה מצב"
 
 #: gajim/gtk/themes.py:52
 #, fuzzy
-msgid "MUC Tab New Directed Message"
+msgid "Group Chat Tab New Directed Message"
 msgstr ""
 "הודעות שמ״מ\n"
 "ישירות"
 
 #: gajim/gtk/themes.py:56
 #, fuzzy
-msgid "MUC Tab New Message"
+msgid "Group Chat Tab New Message"
 msgstr "הודעה חדשה"
 
 #: gajim/gtk/themes.py:60
@@ -9821,13 +10173,13 @@ msgstr "כל הקבצים"
 msgid "Clear File"
 msgstr "מנקה"
 
-#: gajim/gtk/settings.py:570
+#: gajim/gtk/settings.py:570 gajim/gtk/proxies.py:32
 #, fuzzy
 msgid "Manage Proxies"
 msgstr "ניהול דיוקני Proxy"
 
-#: gajim/gtk/settings.py:591 gajim/gtk/preferences.py:971
-#: gajim/gtk/preferences.py:984 gajim/gtk/preferences.py:988
+#: gajim/gtk/settings.py:591 gajim/gtk/preferences.py:968
+#: gajim/gtk/preferences.py:982 gajim/gtk/preferences.py:986
 #, fuzzy
 msgid "No Proxy"
 msgstr "_פרוקסי:"
@@ -9907,14 +10259,15 @@ msgid ""
 "        "
 msgstr ""
 
-#: gajim/gtk/about.py:47 data/org.gajim.Gajim.appdata.xml.in:10
+#: gajim/gtk/about.py:47 data/org.gajim.Gajim.desktop.in:6
+#: data/org.gajim.Gajim.appdata.xml.in:10
 #, fuzzy
-msgid "A GTK+ XMPP client"
+msgid "A GTK XMPP client"
 msgstr "לקוח Jabber/XMPP מבוסס GTK+‎"
 
 #: gajim/gtk/about.py:48
 #, fuzzy, python-format
-msgid "GTK+ Version: %s"
+msgid "GTK Version: %s"
 msgstr "גרסא:"
 
 #: gajim/gtk/about.py:49
@@ -10101,6 +10454,25 @@ msgstr "הושהתה"
 msgid "?transfer status:Not started"
 msgstr "הושהתה"
 
+#: gajim/gtk/groupchat_creation.py:97 gajim/gtk/groupchat_creation.py:99
+msgid " (optional)..."
+msgstr ""
+
+#: gajim/gtk/groupchat_creation.py:134
+#, fuzzy
+msgid "Invalid Address"
+msgstr "קובץ שגוי"
+
+#: gajim/gtk/groupchat_creation.py:182
+#, fuzzy
+msgid "Not Connected"
+msgstr "מחובר"
+
+#: gajim/gtk/groupchat_creation.py:183
+#, fuzzy
+msgid "You have to be connected to create a group chat."
+msgstr "לא הצטרפת לשיחת קבוצה."
+
 #: gajim/gtk/sounds.py:39
 msgid "Wav Sounds"
 msgstr "צלילי Wav"
@@ -10141,48 +10513,44 @@ msgstr "הודעת שיחת קבוצה מודגשת"
 msgid "Group Chat Message Received"
 msgstr "הודעת שיחת קבוצה אשר התקבלה"
 
-#: gajim/gtk/dataform.py:226 gajim/gtk/dataform.py:262
+#: gajim/gtk/dataform.py:232 gajim/gtk/dataform.py:268
 #, fuzzy
 msgid "Required"
 msgstr "דרוש"
 
-#: gajim/gtk/dataform.py:286
+#: gajim/gtk/dataform.py:293
 msgid "Yes"
 msgstr "כן"
 
-#: gajim/gtk/dataform.py:286
+#: gajim/gtk/dataform.py:293
 msgid "No"
 msgstr "לא"
 
-#: gajim/gtk/dataform.py:661
+#: gajim/gtk/dataform.py:670
 msgid "Submit"
 msgstr ""
 
-#: gajim/gtk/statusicon.py:213
+#: gajim/gtk/statusicon.py:206
 #, fuzzy
 msgid "_Change Status Message…"
 msgstr "_שנה הודעת מצב"
 
-#: gajim/gtk/statusicon.py:247 gajim/gtk/statusicon.py:292
-#: gajim/gtk/statusicon.py:299
+#: gajim/gtk/statusicon.py:258
 #, python-format
 msgid "using account %s"
 msgstr "באמצעות חשבון %s"
 
-#: gajim/gtk/statusicon.py:309
+#: gajim/gtk/statusicon.py:269
 #, fuzzy
-msgid "_Manage Bookmarks…"
-msgstr "ניהול סימניות"
-
-#: gajim/gtk/statusicon.py:325
-msgid "Hide _Roster"
-msgstr "הסתר _רשימה"
+msgid "Hide _Contact List"
+msgstr "הזמן _אנשי קשר"
 
-#: gajim/gtk/statusicon.py:329
-msgid "Show _Roster"
-msgstr "הצג _רשימה"
+#: gajim/gtk/statusicon.py:273
+#, fuzzy
+msgid "Show _Contact List"
+msgstr "הצג אנשי קשר _פעילים בלבד"
 
-#: gajim/gtk/statusicon.py:337
+#: gajim/gtk/statusicon.py:281
 msgid "Hide this menu"
 msgstr "הסתר תפריט זה"
 
@@ -10227,35 +10595,6 @@ msgid ""
 "later."
 msgstr "אירעה שגיאה במהלך פרסום המידע האישי שלך, נסה שוב מאוחר יותר."
 
-#: gajim/gtk/join_groupchat.py:202
-#, fuzzy
-msgid "Invalid Room"
-msgstr "חדר שגוי"
-
-#: gajim/gtk/join_groupchat.py:203
-msgid "Please choose a room"
-msgstr ""
-
-#: gajim/gtk/join_groupchat.py:222 gajim/gtk/join_groupchat.py:229
-msgid "Invalid Nickname"
-msgstr "שם כינוי שגוי"
-
-#: gajim/gtk/join_groupchat.py:223
-#, fuzzy
-msgid "Please choose a nickname"
-msgstr "אנא צור מוטיב חדש עם השם הרצוי עליך."
-
-#: gajim/gtk/join_groupchat.py:282 gajim/gtk/join_groupchat.py:288
-#: gajim/gtk/join_groupchat.py:293
-msgid "Wrong server"
-msgstr "שרת שגוי"
-
-#: gajim/gtk/join_groupchat.py:283 gajim/gtk/join_groupchat.py:289
-#: gajim/gtk/join_groupchat.py:294
-#, python-format
-msgid "%s is not a groupchat server"
-msgstr "‏%s אינו שרת שיחת קבוצה"
-
 # ארכיונאות
 #: gajim/gtk/mam_preferences.py:38
 #, python-format
@@ -10288,46 +10627,53 @@ msgstr "שגיאה בקבלת dataform"
 msgid "Archiving Preferences Error"
 msgstr "ערוך העדפות _ארכיונאות"
 
-#: gajim/gtk/advanced_config.py:81
+#: gajim/gtk/advanced_config.py:95
 msgid "Activated"
 msgstr "מופעלת"
 
-#: gajim/gtk/advanced_config.py:81
+#: gajim/gtk/advanced_config.py:95
 msgid "Deactivated"
 msgstr "מנוטרלת"
 
-#: gajim/gtk/advanced_config.py:83
-msgid "Boolean"
-msgstr "בוליאני"
+#: gajim/gtk/advanced_config.py:97
+msgid "?config type:Boolean"
+msgstr ""
+
+#: gajim/gtk/advanced_config.py:98
+msgid "?config type:Integer"
+msgstr ""
 
-#: gajim/gtk/advanced_config.py:84
-msgid "Integer"
-msgstr "ספרה"
+#: gajim/gtk/advanced_config.py:99
+msgid "?config type:Text"
+msgstr ""
 
-#: gajim/gtk/advanced_config.py:85
-msgid "Text"
-msgstr "תמליל"
+#: gajim/gtk/advanced_config.py:100
+msgid "?config type:Color"
+msgstr ""
 
-#: gajim/gtk/advanced_config.py:97
-msgid "Preference Name"
+#: gajim/gtk/advanced_config.py:112
+#, fuzzy
+msgid "?config:Preference Name"
 msgstr "שם העדפה"
 
-#: gajim/gtk/advanced_config.py:104
-msgid "Value"
-msgstr "ערך"
+#: gajim/gtk/advanced_config.py:123
+#, fuzzy
+msgid "?config:Value"
+msgstr "תצורה"
 
-#: gajim/gtk/advanced_config.py:113
-msgid "Type"
-msgstr "טיפוס"
+#: gajim/gtk/advanced_config.py:132
+msgid "?config:Type"
+msgstr ""
 
-#: gajim/gtk/advanced_config.py:168
-msgid "(None)"
-msgstr "(אין)"
+#: gajim/gtk/advanced_config.py:187
+#, fuzzy
+msgid "?config description:None"
+msgstr "אין"
 
-# Needs to be tested
-#: gajim/gtk/advanced_config.py:299
-msgid "Hidden"
-msgstr "מוסתר"
+#: gajim/gtk/advanced_config.py:322
+#, fuzzy
+msgid "?password:Hidden"
+msgstr "סיסמה:"
 
 #: gajim/gtk/server_info.py:66
 #, fuzzy
@@ -10339,8 +10685,8 @@ msgstr "ה_עתק מיקום קישור"
 msgid "%(days)s days, %(hours)s hours"
 msgstr ""
 
-#: gajim/gtk/server_info.py:218 gajim/gtk/accounts.py:749
-#: gajim/gtk/accounts.py:853
+#: gajim/gtk/server_info.py:218 gajim/gtk/accounts.py:752
+#: gajim/gtk/accounts.py:856
 #, fuzzy
 msgid "Hostname"
 msgstr "שם מ_ארח:"
@@ -10539,11 +10885,6 @@ msgstr "שם רשימה שגוי"
 msgid "You must enter a name to create a privacy list."
 msgstr "עליך להזין שם כדי ליצור רשימת פרטיות."
 
-#: gajim/gtk/groupchat_config.py:41
-#, fuzzy
-msgid "Group Chat Configuration"
-msgstr "הזמנת שיחת קבוצה"
-
 #: gajim/gtk/groupchat_config.py:134
 #, fuzzy
 msgid "A Group Chat needs at least one Owner"
@@ -10554,69 +10895,69 @@ msgid "You are not allowed to modify the affiliation of Admins and Owners"
 msgstr ""
 
 #: gajim/gtk/groupchat_config.py:399
-msgid "An entry with this Jabber-ID already exists"
+msgid "An entry with this XMPP Address already exists"
 msgstr ""
 
-#: gajim/gtk/adhoc.py:91
+#: gajim/gtk/adhoc.py:92
 #, fuzzy
 msgid "Finish"
 msgstr "_סיים"
 
-#: gajim/gtk/adhoc.py:97 gajim/gtk/adhoc.py:283
+#: gajim/gtk/adhoc.py:98 gajim/gtk/adhoc.py:284
 #, fuzzy
 msgid "Commands"
 msgstr "cli"
 
-#: gajim/gtk/adhoc.py:103
+#: gajim/gtk/adhoc.py:104
 msgid "Next"
 msgstr ""
 
-#: gajim/gtk/adhoc.py:109
+#: gajim/gtk/adhoc.py:110
 #, fuzzy
 msgid "Previous"
 msgstr "מקנא"
 
-#: gajim/gtk/adhoc.py:115
+#: gajim/gtk/adhoc.py:116
 #, fuzzy
 msgid "Execute"
 msgstr "הרץ _פקודה"
 
-#: gajim/gtk/adhoc.py:195
+#: gajim/gtk/adhoc.py:196
 #, fuzzy
 msgid "No commands available"
 msgstr "אין חשבון זמין"
 
-#: gajim/gtk/adhoc.py:244
+#: gajim/gtk/adhoc.py:245
 #, fuzzy
 msgid "Request Command List"
 msgstr "הרץ _פקודה"
 
-#: gajim/gtk/adhoc.py:259
+#: gajim/gtk/adhoc.py:260
 #, fuzzy
 msgid "Executing…"
 msgstr "הרץ _פקודה"
 
-#: gajim/gtk/adhoc.py:266
+#: gajim/gtk/adhoc.py:267
 #, fuzzy
 msgid "Command List"
 msgstr "רשימת אסירה"
 
-#: gajim/gtk/adhoc.py:384
+#: gajim/gtk/adhoc.py:385
 #, fuzzy
 msgid "Finished"
 msgstr "_סיים"
 
-#: gajim/gtk/adhoc.py:453
+#: gajim/gtk/adhoc.py:454
 #, fuzzy
 msgid "Execution failed"
 msgstr "התחברות נכשלה"
 
-#: gajim/gtk/blocking.py:37
+#: gajim/gtk/blocking.py:38
 #, fuzzy, python-format
 msgid "Blocking List for %s"
 msgstr "רשימת פרטיות עבור ‫%s"
 
-#: gajim/gtk/blocking.py:71
+#: gajim/gtk/blocking.py:72
 #, fuzzy
 msgid "Error!"
 msgstr "שגיאה"
@@ -10665,8 +11006,7 @@ msgstr "שם משתמש שגוי"
 msgid "You must provide a username to configure this account."
 msgstr "עליך לספק שם משתמש כדי להגדיר את חשבון זה."
 
-#: gajim/gtk/account_wizard.py:252 gajim/gtk/bookmarks.py:290
-#: gajim/gtk/bookmarks.py:303
+#: gajim/gtk/account_wizard.py:252
 msgid "Invalid server"
 msgstr "שרת שגוי"
 
@@ -10682,7 +11022,7 @@ msgstr "רשומה שגויה"
 msgid "Custom port must be a port number."
 msgstr "פורט מותאם מוכרח להיות מספר פורט."
 
-#: gajim/gtk/account_wizard.py:405
+#: gajim/gtk/account_wizard.py:406
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -10697,15 +11037,15 @@ msgstr ""
 "שגיאת SSL: ‏%(error)s\n"
 "האם עדיין יש ברצונך להתחבר לשרת זה?"
 
-#: gajim/gtk/account_wizard.py:446 gajim/gtk/account_wizard.py:480
+#: gajim/gtk/account_wizard.py:447 gajim/gtk/account_wizard.py:481
 msgid "An error occurred during account creation"
 msgstr "אירעה שגיאה בעת מהלך יצירת חשבון"
 
-#: gajim/gtk/account_wizard.py:545
+#: gajim/gtk/account_wizard.py:546
 msgid "Account name is in use"
 msgstr "שם חשבון הינו בשימוש"
 
-#: gajim/gtk/account_wizard.py:546
+#: gajim/gtk/account_wizard.py:547
 msgid "You already have an account using this name."
 msgstr "כבר יש ברשותך חשבון אשר עושה שימוש בשם זה."
 
@@ -10732,26 +11072,26 @@ msgstr "העברת קובץ %(filename)s מן %(name)s נכשלה."
 msgid "%(minutes)s min %(seconds)s sec"
 msgstr ""
 
-#: gajim/gtk/xml_console.py:77
+#: gajim/gtk/xml_console.py:74
 #, fuzzy
 msgid "Filter"
 msgstr "סינון:"
 
-#: gajim/gtk/xml_console.py:82
+#: gajim/gtk/xml_console.py:79
 #, fuzzy
 msgid "XML Input"
 msgstr "<b>קלט XML</b>"
 
-#: gajim/gtk/xml_console.py:86
+#: gajim/gtk/xml_console.py:83
 msgid "Paste Last Input"
 msgstr ""
 
-#: gajim/gtk/xml_console.py:170
+#: gajim/gtk/xml_console.py:167
 #, fuzzy, python-format
 msgid "Please make sure you are connected with '%s'."
 msgstr "אנא ודא כי אתה מחובר בעזרת \"%s\"."
 
-#: gajim/gtk/xml_console.py:182
+#: gajim/gtk/xml_console.py:177
 #, fuzzy
 msgid "Invalid Node"
 msgstr "קובץ שגוי"
@@ -10784,310 +11124,320 @@ msgstr "חיפוש"
 msgid "No results found"
 msgstr "אין תנובה"
 
-#: gajim/gtk/preferences.py:358 gajim/gtk/preferences.py:362
+#: gajim/gtk/preferences.py:357 gajim/gtk/preferences.py:361
 msgid "Default"
 msgstr "ברירת מחדל"
 
-#: gajim/gtk/preferences.py:801
+#: gajim/gtk/preferences.py:798
 msgid "status message title"
 msgstr "כותרת הודעת מצב"
 
-#: gajim/gtk/preferences.py:802
+#: gajim/gtk/preferences.py:799
 msgid "status message text"
 msgstr "תמליל הודעת מצב"
 
+#: gajim/gtk/accounts.py:137
+#, fuzzy
+msgid "Re-Login"
+msgstr "להתחבר מחדש עכשיו?"
+
 #: gajim/gtk/accounts.py:138
-msgid "Relogin now?"
+#, fuzzy
+msgid "Re-Login now?"
 msgstr "להתחבר מחדש עכשיו?"
 
 #: gajim/gtk/accounts.py:139
-msgid "If you want all the changes to apply instantly, you must relogin."
+#, fuzzy
+msgid "To apply all changes instantly, you have to re-login."
 msgstr "אם ברצונך כי השינויים יחולו באופן מידי, עליך להתחבר מחדש."
 
-#: gajim/gtk/accounts.py:191 gajim/gtk/accounts.py:975
+#: gajim/gtk/accounts.py:141
+msgid "_Later"
+msgstr ""
+
+#: gajim/gtk/accounts.py:143
+msgid "_Re-Login"
+msgstr ""
+
+#: gajim/gtk/accounts.py:194 gajim/gtk/accounts.py:978
 #, fuzzy
 msgid "Remove Account"
 msgstr "הסרת חשבון ‫%s"
 
-#: gajim/gtk/accounts.py:192
+#: gajim/gtk/accounts.py:195
 #, fuzzy, python-format
 msgid "You still have open chats in your account %s"
 msgstr "פתחת שיחה בחשבון %s"
 
-#: gajim/gtk/accounts.py:193
+#: gajim/gtk/accounts.py:196
 #, fuzzy
 msgid ""
 "All chat and group chat windows will be closed.\n"
 "Do you want to continue?"
 msgstr "כל חלונות שיחה וחלונות שיחת קבוצה ייסגרו. האם ברצונך להמשיך?"
 
-#: gajim/gtk/accounts.py:424
+#: gajim/gtk/accounts.py:427
 #, fuzzy
 msgid "Back"
 msgstr "אשוב בקרוב"
 
-#: gajim/gtk/accounts.py:530
+#: gajim/gtk/accounts.py:533
 #, fuzzy
 msgid "Please check if Bonjour is installed."
 msgstr "אנא בדוק כי Avahi או Bonjour מותקן במערכת."
 
-#: gajim/gtk/accounts.py:532
+#: gajim/gtk/accounts.py:535
 #, fuzzy
 msgid "Please check if Avahi is installed."
 msgstr "אנא בדוק כי Avahi או Bonjour מותקן במערכת."
 
-#: gajim/gtk/accounts.py:569
+#: gajim/gtk/accounts.py:572
 #, fuzzy
 msgid "Disable Account"
 msgstr "חשבון שגוי"
 
-#: gajim/gtk/accounts.py:570
+#: gajim/gtk/accounts.py:573
 #, fuzzy, python-format
 msgid "Account %s is still connected"
 msgstr "חשבון \"%s\" מחובר כעת לשרת"
 
-#: gajim/gtk/accounts.py:571
+#: gajim/gtk/accounts.py:574
 #, fuzzy
 msgid ""
 "All chat and group chat windows will be closed. Do you want to continue?"
 msgstr "כל חלונות שיחה וחלונות שיחת קבוצה ייסגרו. האם ברצונך להמשיך?"
 
-#: gajim/gtk/accounts.py:576
+#: gajim/gtk/accounts.py:579
 #, fuzzy
 msgid "_Disable Account"
 msgstr "חשבון שגוי"
 
-#: gajim/gtk/accounts.py:595
+#: gajim/gtk/accounts.py:598
 #, fuzzy
 msgid "Add Account"
 msgstr "הוסף _איש קשר..."
 
-#: gajim/gtk/accounts.py:663
+#: gajim/gtk/accounts.py:666
 msgid "Label"
 msgstr ""
 
-#: gajim/gtk/accounts.py:667
+#: gajim/gtk/accounts.py:670
 msgid "Login"
 msgstr ""
 
-#: gajim/gtk/accounts.py:670
+#: gajim/gtk/accounts.py:673
 #, fuzzy
 msgid "Import Contacts"
 msgstr "הזמן _אנשי קשר"
 
-#: gajim/gtk/accounts.py:674 gajim/gtk/accounts.py:870
+#: gajim/gtk/accounts.py:677 gajim/gtk/accounts.py:873
 #, fuzzy
 msgid "Client Certificate"
 msgstr "תעודת לקוח"
 
-#: gajim/gtk/accounts.py:677 gajim/gtk/accounts.py:774
+#: gajim/gtk/accounts.py:680 gajim/gtk/accounts.py:777
 #, fuzzy
 msgid "Connect on startup"
 msgstr "התחבר בעת ה_פעלת Gajim"
 
-#: gajim/gtk/accounts.py:681 gajim/gtk/accounts.py:779
+#: gajim/gtk/accounts.py:684 gajim/gtk/accounts.py:782
 #, fuzzy
 msgid "Save conversations for all contacts"
 msgstr "שמור רשו_מות שיחה עבור כל איש קשר"
 
-#: gajim/gtk/accounts.py:683 gajim/gtk/accounts.py:781
+#: gajim/gtk/accounts.py:686 gajim/gtk/accounts.py:784
 msgid "Store conversations on the harddrive"
 msgstr ""
 
-#: gajim/gtk/accounts.py:685 gajim/gtk/accounts.py:783
+#: gajim/gtk/accounts.py:688 gajim/gtk/accounts.py:786
 #, fuzzy
 msgid "Global Status"
 msgstr "מצב"
 
-#: gajim/gtk/accounts.py:687
+#: gajim/gtk/accounts.py:690
 #, fuzzy
 msgid "Synchronise the status of all accounts"
 msgstr "cli"
 
 # BUG: _underline
-#: gajim/gtk/accounts.py:689
+#: gajim/gtk/accounts.py:692
 msgid "Use file transfer proxies"
 msgstr "השתמש בצירי (proxy) העברת קובץ"
 
 # מצוי/ה בחוסר פעילות
-#: gajim/gtk/accounts.py:705
+#: gajim/gtk/accounts.py:708
 #, fuzzy
 msgid "Idle Time"
 msgstr "בחוסר פעילות מאז %s"
 
-#: gajim/gtk/accounts.py:707
+#: gajim/gtk/accounts.py:710
 msgid "Disclose the time of your last activity"
 msgstr ""
 
-#: gajim/gtk/accounts.py:709
+#: gajim/gtk/accounts.py:712
 msgid "Local System Time"
 msgstr ""
 
-#: gajim/gtk/accounts.py:711
+#: gajim/gtk/accounts.py:714
 msgid "Disclose the local system time of the device Gajim runs on"
 msgstr ""
 
-#: gajim/gtk/accounts.py:714
+#: gajim/gtk/accounts.py:717
 #, fuzzy
 msgid "Client / Operating System"
 msgstr "תעודת לקוח"
 
-#: gajim/gtk/accounts.py:716
+#: gajim/gtk/accounts.py:719
 #, fuzzy
 msgid ""
 "Disclose informations about the client and operating system you currently use"
 msgstr "התר ל־Gajim לשלוח מידע אודות מערכת ההפעלה אשר בשימושך."
 
-#: gajim/gtk/accounts.py:719
+#: gajim/gtk/accounts.py:722
 #, fuzzy
 msgid "Ignore Unknown Contacts"
 msgstr "הזמן _אנשי קשר"
 
-#: gajim/gtk/accounts.py:721
+#: gajim/gtk/accounts.py:724
 #, fuzzy
 msgid "Ignore everything from contacts not in your Roster"
 msgstr "הת_עלם מאירועים מאת אנשי קשר שלא ברשימה"
 
-#: gajim/gtk/accounts.py:737 gajim/gtk/accounts.py:776
+#: gajim/gtk/accounts.py:740 gajim/gtk/accounts.py:779
 #, fuzzy
 msgid "Use environment variable"
 msgstr "השתמש במשת_ני סביבת HTTP__PROXY"
 
-#: gajim/gtk/accounts.py:739
-#, fuzzy
-msgid "Proxy"
-msgstr "_פרוקסי:"
-
-#: gajim/gtk/accounts.py:742
+#: gajim/gtk/accounts.py:745
 #, fuzzy
 msgid "Warn on insecure connection"
 msgstr "ה_זהר אותי לפני שימוש בחיבור לא מאובטח"
 
-#: gajim/gtk/accounts.py:746
+#: gajim/gtk/accounts.py:749
 #, fuzzy
 msgid "Send keep-alive packets"
 msgstr "ש_לח חבילות keep-alive"
 
-#: gajim/gtk/accounts.py:750
+#: gajim/gtk/accounts.py:753
 msgid "Manually set the hostname for the server"
 msgstr ""
 
-#: gajim/gtk/accounts.py:756 gajim/gtk/accounts.py:826
-#: gajim/gtk/accounts.py:831
+#: gajim/gtk/accounts.py:759 gajim/gtk/accounts.py:829
+#: gajim/gtk/accounts.py:834
 #, fuzzy
 msgid "Priority"
 msgstr "_עדיפות:"
 
-#: gajim/gtk/accounts.py:785
+#: gajim/gtk/accounts.py:788
 #, fuzzy
 msgid "Synchronize the status of all accounts"
 msgstr "cli"
 
-#: gajim/gtk/accounts.py:795
+#: gajim/gtk/accounts.py:798
 #, fuzzy
 msgid "First Name"
 msgstr "שם פרטי:"
 
-#: gajim/gtk/accounts.py:798
+#: gajim/gtk/accounts.py:801
 #, fuzzy
 msgid "Last Name"
 msgstr "שם משפחה:"
 
-#: gajim/gtk/accounts.py:804
+#: gajim/gtk/accounts.py:807
 #, fuzzy
 msgid "Email"
 msgstr "דוא״ל חדש"
 
-#: gajim/gtk/accounts.py:822
+#: gajim/gtk/accounts.py:825
 #, fuzzy
 msgid "Adjust to status"
 msgstr "_התאם למצב"
 
-#: gajim/gtk/accounts.py:849
+#: gajim/gtk/accounts.py:852
 #, fuzzy
 msgid "Enable"
 msgstr "מאופשר"
 
-#: gajim/gtk/accounts.py:857
+#: gajim/gtk/accounts.py:860
 #, fuzzy
 msgid "Port"
 msgstr "_פורט:"
 
-#: gajim/gtk/accounts.py:862
+#: gajim/gtk/accounts.py:865
 #, fuzzy
 msgid "Connection Settings"
 msgstr "חיבור"
 
-#: gajim/gtk/accounts.py:872
+#: gajim/gtk/accounts.py:875
 msgid "PKCS12 Files"
 msgstr "קבצי PKCS12"
 
-#: gajim/gtk/accounts.py:874
+#: gajim/gtk/accounts.py:877
 #, fuzzy
 msgid "Encrypted Certificate"
 msgstr "תעודת לקוח"
 
-#: gajim/gtk/accounts.py:878
+#: gajim/gtk/accounts.py:881
 #, fuzzy
 msgid "Certificate Settings"
 msgstr "התראות"
 
-#: gajim/gtk/accounts.py:890
+#: gajim/gtk/accounts.py:893
 #, fuzzy
 msgid "Save Password"
 msgstr "שמור סיסמה"
 
-#: gajim/gtk/accounts.py:898
+#: gajim/gtk/accounts.py:901
 #, fuzzy
 msgid "Login Settings"
 msgstr "תוספים"
 
-#: gajim/gtk/accounts.py:931
+#: gajim/gtk/accounts.py:934
 #, fuzzy, python-format
 msgid "Removing account %s"
 msgstr "הסרת חשבון ‫%s"
 
-#: gajim/gtk/accounts.py:946
+#: gajim/gtk/accounts.py:949
 msgid "Account is disabled"
 msgstr "חשבון מנוטרל"
 
-#: gajim/gtk/accounts.py:947
+#: gajim/gtk/accounts.py:950
 #, fuzzy
 msgid "To unregister from a server, the account must be enabled."
 msgstr "כדי לבטל רישום מתוך שרת, על חשבון נתון להיות מאופשר."
 
-#: gajim/gtk/accounts.py:962
+#: gajim/gtk/accounts.py:965
 #, fuzzy
 msgid "Password required"
 msgstr "נדרשת מילת מעבר"
 
-#: gajim/gtk/accounts.py:976
+#: gajim/gtk/accounts.py:979
 #, fuzzy, python-format
 msgid "Account '%s' is still connected to the server"
 msgstr "חשבון \"%s\" מחובר כעת לשרת"
 
 # it = account?
 # תסיר/י אותו
-#: gajim/gtk/accounts.py:978
+#: gajim/gtk/accounts.py:981
 msgid "If you remove it, the connection will be lost."
 msgstr "אם תסירו, החיבור יאבד."
 
-#: gajim/gtk/accounts.py:995
+#: gajim/gtk/accounts.py:998
 #, python-format
 msgid "Connection to server %s failed"
 msgstr "התחברות לשרת %s נכשלה"
 
-#: gajim/gtk/accounts.py:996
+#: gajim/gtk/accounts.py:999
 msgid "What would you like to do?"
 msgstr "מה ברצונך לעשות?"
 
 # BUG: USE: Remove account _only from Gajim
-#: gajim/gtk/accounts.py:997
+#: gajim/gtk/accounts.py:1000
 msgid "Remove only from Gajim"
 msgstr "להסיר מתוך Gajim בלבד"
 
 # BUG: Underline
-#: gajim/gtk/accounts.py:998
+#: gajim/gtk/accounts.py:1001
 msgid "Don't remove anything. I'll try again later"
 msgstr "לא להסיר דבר. אני אנסה שוב מאוחר יותר"
 
@@ -11122,6 +11472,10 @@ msgstr ""
 msgid "Modify"
 msgstr "התאמה"
 
+#: gajim/gtk/roster_item_exchange.py:80
+msgid "JID"
+msgstr "‏JID"
+
 #: gajim/gtk/roster_item_exchange.py:86
 msgid "Groups"
 msgstr "קבוצות"
@@ -11146,19 +11500,19 @@ msgid_plural "Removed %d contacts"
 msgstr[0] "הוסר איש קשר %d"
 msgstr[1] "הוסרו %d אנשי קשר"
 
-#: gajim/gtk/util.py:581
+#: gajim/gtk/util.py:583
 msgid "Unknown Artist"
 msgstr "אמן לא ידוע"
 
-#: gajim/gtk/util.py:582
+#: gajim/gtk/util.py:584
 msgid "Unknown Title"
 msgstr "כותרת לא ידועה"
 
-#: gajim/gtk/util.py:583
+#: gajim/gtk/util.py:585
 msgid "Unknown Source"
 msgstr "מקור לא ידוע"
 
-#: gajim/gtk/util.py:585
+#: gajim/gtk/util.py:587
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
@@ -11167,27 +11521,10 @@ msgstr ""
 "‏<b>\"%(title)s\"</b> מאת <i>%(artist)s</i>\n"
 "מתוך <i>%(source)s</i>"
 
-#: gajim/gtk/bookmarks.py:121
-msgid "New Group Chat"
-msgstr "שיחת קבוצה חדשה"
-
-#: gajim/gtk/bookmarks.py:161
-msgid "This bookmark has invalid data"
-msgstr "סימנייה זו מכילה מידע שגוי"
-
-#: gajim/gtk/bookmarks.py:162
-msgid ""
-"Please be sure to fill out server and room fields or remove this bookmark."
-msgstr "אנא דאג למלא שדות חדר ושרת או הסר את סימנייה זו."
-
-#: gajim/gtk/bookmarks.py:273 gajim/gtk/bookmarks.py:291
-#: gajim/gtk/bookmarks.py:304 gajim/gtk/bookmarks.py:335
-msgid "Character not allowed"
-msgstr "תו לא מורשה"
-
-#: gajim/gtk/bookmarks.py:334
-msgid "Invalid room"
-msgstr "חדר שגוי"
+#: gajim/gtk/bookmarks.py:47
+#, fuzzy, python-format
+msgid "Bookmarks for %s"
+msgstr "_סמן"
 
 #: gajim/plugins/pluginmanager.py:736 gajim/plugins/pluginmanager.py:742
 msgid "Archive corrupted"
@@ -11198,48 +11535,51 @@ msgid "Archive empty"
 msgstr "ארכיון ריק"
 
 #: gajim/plugins/pluginmanager.py:750 gajim/plugins/pluginmanager.py:758
-#: gajim/plugins/gui.py:257
+#: gajim/plugins/gui.py:258
 msgid "Archive is malformed"
 msgstr "ארכיון הינו פגום"
 
-#: gajim/plugins/pluginmanager.py:766 gajim/plugins/gui.py:281
-#: gajim/plugins/gui.py:289
+#: gajim/plugins/pluginmanager.py:766 gajim/plugins/gui.py:288
+#: gajim/plugins/gui.py:301
 msgid "Plugin already exists"
 msgstr "תוסף כבר ישנו"
 
-#: gajim/plugins/gui.py:82
+#: gajim/plugins/gui.py:83
 msgid "Click to view Gajim's wiki page on how to install plugins in Flatpak."
 msgstr ""
 
-#: gajim/plugins/gui.py:89
+#: gajim/plugins/gui.py:90
 msgid "Plugin"
 msgstr "תוסף"
 
-#: gajim/plugins/gui.py:151
+#: gajim/plugins/gui.py:152
 #, python-format
 msgid "Warning: %s"
 msgstr "אזהרה: %s"
 
-#: gajim/plugins/gui.py:206
+#: gajim/plugins/gui.py:207
 msgid "Plugin failed"
 msgstr "כשל תוסף"
 
-#: gajim/plugins/gui.py:245
+#: gajim/plugins/gui.py:246
 msgid "Unable to properly remove the plugin"
 msgstr "אין אפשרות להסיר כהוגן את התוסף"
 
-#: gajim/plugins/gui.py:281
-msgid "Overwrite?"
+#: gajim/plugins/gui.py:287
+#, fuzzy
+msgid "Overwrite Plugin?"
 msgstr "להחליף?"
 
+#: gajim/plugins/gui.py:289
+#, fuzzy
+msgid "Do you want to overwrite the currently installed version?"
+msgstr "האם ברצונך לקבל את ההזמנה?"
+
 #: data/org.gajim.Gajim.desktop.in:5
-msgid "Jabber IM Client"
+#, fuzzy
+msgid "XMPP IM Client"
 msgstr "לקוח מסרים מידיים Jabber"
 
-#: data/org.gajim.Gajim.desktop.in:6
-msgid "A GTK+ Jabber client"
-msgstr "לקוח ג׳אבּר GTK+‎"
-
 #: data/org.gajim.Gajim.desktop.in:8
 #, fuzzy
 msgid "chat;messaging;im;xmpp;bonjour;voip;"
@@ -11292,7 +11632,7 @@ msgid "Easily send pictures, videos or other files to friends and groups"
 msgstr ""
 
 #: data/org.gajim.Gajim.appdata.xml.in:27
-msgid "Chat securely with End-to-End encryption via OMEMO or PGP"
+msgid "Chat securely with End-to-End encryption via OMEMO or OpenPGP"
 msgstr ""
 
 #: data/org.gajim.Gajim.appdata.xml.in:28
@@ -11355,7 +11695,7 @@ msgstr ""
 
 #: data/org.gajim.Gajim.appdata.xml.in:52
 #, fuzzy
-msgid "Roster, list of contacts"
+msgid "Contact list, list of contacts"
 msgstr "רשום _שינויים של מצב אנשי קשר"
 
 #: data/org.gajim.Gajim.appdata.xml.in:56
@@ -11380,6 +11720,544 @@ msgstr "אחרונים:"
 msgid "Plugin manager"
 msgstr "כשל תוסף"
 
+#, fuzzy
+#~ msgid "Configure Services…"
+#~ msgstr "הגדר שירותים..."
+
+#, fuzzy
+#~ msgid "Group Chat Bookmarks"
+#~ msgstr "שיחות קבוצה"
+
+#, fuzzy
+#~ msgid "Add Bookmark"
+#~ msgstr "_סמן"
+
+#, fuzzy
+#~ msgid "Remove Bookmark"
+#~ msgstr "_סמן"
+
+#, fuzzy
+#~ msgid "Bookmark Name"
+#~ msgstr "_סמן את חדר זה"
+
+#, fuzzy
+#~ msgid "_Server"
+#~ msgstr "_שרת:"
+
+#, fuzzy
+#~ msgid "Roo_m"
+#~ msgstr "_חדר:"
+
+#, fuzzy
+#~ msgid "_Password"
+#~ msgstr "סיס_מה:"
+
+#, fuzzy
+#~ msgid "Join chat when connected"
+#~ msgstr "איש קשר מנותק"
+
+#~ msgid "New Group Chat"
+#~ msgstr "שיחת קבוצה חדשה"
+
+#~ msgid "This bookmark has invalid data"
+#~ msgstr "סימנייה זו מכילה מידע שגוי"
+
+#, fuzzy
+#~ msgid ""
+#~ "Please be sure to fill out server and group chat fields or remove this "
+#~ "bookmark."
+#~ msgstr "אנא דאג למלא שדות חדר ושרת או הסר את סימנייה זו."
+
+#~ msgid "Character not allowed"
+#~ msgstr "תו לא מורשה"
+
+#, fuzzy
+#~ msgid "Invalid Group Chat"
+#~ msgstr "מזהה Jabber של שיחת קבוצה שגוי"
+
+#~ msgid "Unable to join group chat"
+#~ msgstr "אין אפשרות להצטרף לשיחת קבוצה"
+
+# בכתובת
+#~ msgid "You are banned from group chat <b>%s</b>."
+#~ msgstr "נאסרת מתוך שיחת קבוצה בכתובת <b>%s</b>."
+
+#, fuzzy
+#~ msgid "Remote server <b>%s</b> does not exist."
+#~ msgstr "שיחת קבוצה <b>%s</b> לא קיימת."
+
+#~ msgid "Group chat <b>%s</b> does not exist."
+#~ msgstr "שיחת קבוצה <b>%s</b> לא קיימת."
+
+#, fuzzy
+#~ msgid "Group chat creation is not permitted."
+#~ msgstr "יצירת שיחות קבוצה הינה מוגבלת."
+
+#, fuzzy
+#~ msgid "You must use your registered nickname in <b>%s</b>."
+#~ msgstr "שם הכינוי הרשום שלך מוכרח להיות בשימוש בתוך שיחת קבוצה <b>%s</b>."
+
+#, fuzzy
+#~ msgid "You are not in the members list in group chat %s."
+#~ msgstr "אינך ברשימת החברים בתוך שיחות קבוצה %s."
+
+#, fuzzy
+#~ msgid "XMPP Address is not a group chat"
+#~ msgstr "זוהי אינה שיחת קבוצה"
+
+#~ msgid "This is not a group chat"
+#~ msgstr "זוהי אינה שיחת קבוצה"
+
+#, fuzzy
+#~ msgid "Please choose a group chat"
+#~ msgstr "אנא צור מוטיב חדש עם השם הרצוי עליך."
+
+#~ msgid "Invalid Nickname"
+#~ msgstr "שם כינוי שגוי"
+
+#, fuzzy
+#~ msgid "Please choose a nickname"
+#~ msgstr "אנא צור מוטיב חדש עם השם הרצוי עליך."
+
+#~ msgid "Wrong server"
+#~ msgstr "שרת שגוי"
+
+#, fuzzy
+#~ msgid "%s is not a group chat server"
+#~ msgstr "‏%s אינו שרת שיחת קבוצה"
+
+# ללא גבול/סייג
+#, fuzzy
+#~ msgid ""
+#~ "How many lines to request from server when entering a group chat. -1 "
+#~ "means no limit."
+#~ msgstr "כמה שורות לבקש מתוך שרת בעת כניסה לשיחת קבוצה. 1- מסמל אי הגבלה"
+
+#, fuzzy
+#~ msgid ""
+#~ "Minutes of backlog to request when entering a group chat. -1 means no "
+#~ "limit."
+#~ msgstr ""
+#~ "כמה דקות לאחור לבקש רשומות בעת התחברות לשיחת קבוצה. 1- מסמל אי הגבלה"
+
+# ללא
+#, fuzzy
+#~ msgid ""
+#~ "How many lines to request from server when entering a group chat. -1 "
+#~ "means no limit, -2 means global value."
+#~ msgstr ""
+#~ "כמה שורות לבקש מתוך שרת בעת כניסה לשיחת קבוצה. 1- מסמל אי הגבלה, 2- מסמל "
+#~ "ערך גלובלי"
+
+#, fuzzy
+#~ msgid ""
+#~ "Minutes of backlog to request when entering a group chat. -1 means no "
+#~ "limit, -2 means global value."
+#~ msgstr ""
+#~ "כמה דקות לאחור לבקש רשומות בעת התחברות לשיחת קבוצה. 1- מסמל אי הגבלה, 2- "
+#~ "מסמל ערך גלובלי"
+
+#, fuzzy
+#~ msgid "A Password is required to join the group chat %s. Please type it."
+#~ msgstr "נדרשת מילת מעבר כדי להצטרף לחדר %s. אנא הקלד אותה."
+
+#~ msgid "Not in Roster"
+#~ msgstr "לא ברשימה"
+
+#~ msgid "I would like to add you to my roster"
+#~ msgstr "ברצוני להוסיף אותך לרשימה שלי"
+
+#, fuzzy
+#~ msgid "Add to Roster"
+#~ msgstr "הו_סף לרשימה"
+
+#, fuzzy
+#~ msgid "Audio Session"
+#~ msgstr "בדיקת קול"
+
+#, fuzzy
+#~ msgid "Video Session"
+#~ msgstr "בדיקת וידאו"
+
+#, fuzzy
+#~ msgid "Manage Room"
+#~ msgstr "נהל _חדר"
+
+#, fuzzy
+#~ msgid "Configure Room"
+#~ msgstr "ה_גדר חדר..."
+
+#, fuzzy
+#~ msgid "Destroy Room"
+#~ msgstr "ה_חרב חדר"
+
+#, fuzzy
+#~ msgid "Change Nick"
+#~ msgstr "שנה שם _כינוי..."
+
+#, fuzzy
+#~ msgid "Disconnect"
+#~ msgstr "הת_נתק"
+
+#, fuzzy
+#~ msgid "Copy JID"
+#~ msgstr "cli"
+
+#, fuzzy
+#~ msgid "Add to Roster…"
+#~ msgstr "הו_סף לרשימה"
+
+#, fuzzy
+#~ msgid "Copy JID/Email"
+#~ msgstr "ה_עתק כתובת JID/דוא״ל"
+
+#, fuzzy
+#~ msgid "JID: <i>%s</i>"
+#~ msgstr "מזהה Jabber: ‏<i>%s</i>"
+
+#~ msgid "Changing Subject"
+#~ msgstr "שינוי נושא"
+
+#~ msgid "Please specify the new subject:"
+#~ msgstr "אנא ציין את נושא חדש:"
+
+#~ msgid "Room logging is now enabled"
+#~ msgstr "רישום פעילות חדר מאופשר כעת"
+
+#~ msgid "Room logging is now disabled"
+#~ msgstr "רישום פעילות חדר מנוטרל כעת"
+
+# הצטרף
+#, fuzzy
+#~ msgid "You (%s) joined the room"
+#~ msgstr "%s נכנס/ה לשיחת קבוצה"
+
+#~ msgid "Room logging is enabled"
+#~ msgstr "רישום של פעילות חדר הינו מאופשר"
+
+#, fuzzy
+#~ msgid "Unable to join groupchat"
+#~ msgstr "אין אפשרות להצטרף לשיחת קבוצה"
+
+#~ msgid "Groupchat Invitation"
+#~ msgstr "הזמנת שיחת קבוצה"
+
+# in or to?
+#~ msgid "%(jid)s has been invited in this room"
+#~ msgstr "%(jid)s הוזמן/ה לחדר זה"
+
+#, fuzzy
+#~ msgid "JID is not a Groupchat"
+#~ msgstr "זוהי אינה שיחת קבוצה"
+
+#~ msgid "Invalid JID"
+#~ msgstr "כתובת JID שגויה"
+
+#~ msgid "A connection is not available"
+#~ msgstr "חיבור אינו זמין"
+
+#, fuzzy
+#~ msgid "JID already in list"
+#~ msgstr "מזהה Jabber כבר מצוי בתוך הרשימה"
+
+#, fuzzy
+#~ msgid "For the chosen encryption there is no encryption method available"
+#~ msgstr "חיבור אינו זמין"
+
+#, fuzzy
+#~ msgid "Removes contact from roster"
+#~ msgstr "cli"
+
+#~ msgid "Not in roster"
+#~ msgstr "לא ברשימה"
+
+#~ msgid "Contact signed in notification color."
+#~ msgstr "צבע התראה של התחברות איש קשר."
+
+# BUG: no Dot
+#~ msgid "Contact signout notification color"
+#~ msgstr "צבע התראה של התנתקות איש קשר"
+
+#~ msgid "File transfer request notification color."
+#~ msgstr "צבע התראה של בקשת העברת קובץ."
+
+#~ msgid "File transfer error notification color."
+#~ msgstr "צבע התראה של שגיאת העברת קובץ."
+
+# תושלם, מושלמת, סוימה
+# השלמת או הפסקת
+#~ msgid "File transfer complete or stopped notification color."
+#~ msgstr "צבע התראה של העברת קובץ שהושלמה או שהופסקה."
+
+# BUG: no Dot
+#~ msgid "Groupchat invitation notification color"
+#~ msgstr "צבע התראה של הזמנת שיחת קבוצה"
+
+#~ msgid "Other dialogs color."
+#~ msgstr "צבע תיבות דו שיח אחרות."
+
+#~ msgid "Add * and [n] in roster title?"
+#~ msgstr "להוסיף * וגם [n] בתוך כותרת רשימה?"
+
+# עם שתי אישויות
+#~ msgid "Hides the banner in two persons chat window"
+#~ msgstr "הסתרת הכרזה בחלון שיחה עם שני נוכחים"
+
+# אנשי־קשר-מוצמדים
+# Meta- (from the Greek preposition μετά = "after", "beyond", "adjacent", "self",
+# adjacent = adjoining = צמוד
+#, fuzzy
+#~ msgid ""
+#~ "Show the confirm metacontacts creation dialog or not? Empty string means "
+#~ "never show the dialog."
+#~ msgstr ""
+#~ "האם עלינו להציג דו שיח וידוא יצירת אנשי קשר מוצמדים או לא? המשמעות של "
+#~ "מחרוזת ריקה תהיה שאנחנו לא נציג את הדו שיח בכלל."
+
+#, fuzzy
+#~ msgid "If true, You will also see your webcam"
+#~ msgstr "כאשר מופעלת, תהיה באפשרותך לראות גם את מצלמת הרשת שלך"
+
+#~ msgid "Space separated list of ssl errors to ignore."
+#~ msgstr "רשימה אשר מופרדת על ידי רווח, של שגיאות ssl שיש להתעלם מהן."
+
+#~ msgid "Answer to receipt requests"
+#~ msgstr "מענה לבקשות קבלה"
+
+#~ msgid "Sent receipt requests"
+#~ msgstr "בקשות קבלה אשר נשלחו"
+
+# אשר ברצוננו
+#, fuzzy
+#~ msgid "Language for which misspelled words will be checked"
+#~ msgstr "שפה עבורה אנחנו רוצים לבדוק מילים אשר לא מאויתות כראוי"
+
+#~ msgid "I'm eating, so leave me a message."
+#~ msgstr "אני בהפסקת אוכל, אז תשאירו לי הודעה."
+
+#, fuzzy
+#~ msgid "from room %s"
+#~ msgstr " בחדר %s"
+
+#~ msgid "Leave Groupchats"
+#~ msgstr "עזוב שיחות קבוצה"
+
+#, fuzzy
+#~ msgid "Auto Join"
+#~ msgstr "ה_צטרף אוטומטית"
+
+#, fuzzy
+#~ msgid "Room"
+#~ msgstr "חדר:"
+
+#~ msgid "Jabber ID:"
+#~ msgstr "מזהה Jabber:"
+
+#~ msgid "Occupant Actions"
+#~ msgstr "פעולות נוכח"
+
+#~ msgid "_Add to Roster"
+#~ msgstr "הו_סף לרשימה"
+
+#~ msgid "_Manage Room"
+#~ msgstr "נהל _חדר"
+
+#~ msgid "_Destroy Room"
+#~ msgstr "ה_חרב חדר"
+
+#~ msgid "Jabber ID"
+#~ msgstr "מזהה Jabber"
+
+#, fuzzy
+#~ msgid "account"
+#~ msgstr "חשבון"
+
+#, fuzzy
+#~ msgid "Roster"
+#~ msgstr "הצג _רשימה"
+
+#~ msgid "Show only in roster"
+#~ msgstr "הצג ברשימה בלבד"
+
+#~ msgid "in _roster"
+#~ msgstr "בתוך _רשימה"
+
+#, fuzzy
+#~ msgid "Roster Appearance"
+#~ msgstr "<b>הופעת רשימה</b>"
+
+#, fuzzy
+#~ msgid "Show chatstate in roster"
+#~ msgstr "הצג _אווטארים של אנשי קשר ברשימה"
+
+#~ msgid "_Add to Roster..."
+#~ msgstr "הו_סף לרשימה..."
+
+#~ msgid "_Jabber ID:"
+#~ msgstr "מזהה _Jabber:"
+
+#, fuzzy
+#~ msgid "_Jabber ID"
+#~ msgstr "מזהה _Jabber:"
+
+#~ msgid "JabberID"
+#~ msgstr "מזהה Jabber"
+
+#, fuzzy
+#~ msgid "Show Roster"
+#~ msgstr "הצג _רשימה"
+
+#~ msgid "MUC server"
+#~ msgstr "שרת MUC (שיחה מרובת משתתפים)"
+
+#, fuzzy
+#~ msgid "Roster Shortcuts"
+#~ msgstr "קיצורי מקש"
+
+#~ msgid "Room Configuration"
+#~ msgstr "תצורת חדר"
+
+#~ msgid "Join _Group Chat"
+#~ msgstr "הצטרף לשיחת _קבוצה"
+
+#~ msgid "Toggle audio session"
+#~ msgstr "הפעלת סשן קולי"
+
+#~ msgid "Audio sessions are not available"
+#~ msgstr "סשנים קוליים אינם זמינים"
+
+#~ msgid "Conference"
+#~ msgstr "ועידה"
+
+#, fuzzy
+#~ msgid "_Manage Bookmarks…"
+#~ msgstr "ניהול סימניות"
+
+#~ msgid "Hide _Roster"
+#~ msgstr "הסתר _רשימה"
+
+#~ msgid "Show _Roster"
+#~ msgstr "הצג _רשימה"
+
+#, fuzzy
+#~ msgid "Invalid Room"
+#~ msgstr "חדר שגוי"
+
+#~ msgid "Invalid room"
+#~ msgstr "חדר שגוי"
+
+#~ msgid "A GTK+ Jabber client"
+#~ msgstr "לקוח ג׳אבּר GTK+‎"
+
+#~ msgid "Changing Nickname"
+#~ msgstr "שינוי שם כינוי"
+
+#~ msgid "Please specify the new nickname you want to use:"
+#~ msgstr "אנא ציין שם כינוי חדש אשר ברצונך לעשות בו שימוש:"
+
+#~ msgid "Bookmark already set"
+#~ msgstr "סימנייה כבר הוגדרה"
+
+#, fuzzy
+#~ msgid "Group Chat '%s' is already in your bookmarks."
+#~ msgstr "שיחת קבוצה \"%s\" כבר קיימת בסימניות שלך."
+
+#~ msgid "Bookmark has been added successfully"
+#~ msgstr "סימנייה הוספה בהצלחה"
+
+#, fuzzy
+#~ msgid ""
+#~ "You can manage your bookmarks by clicking the Bookmarks menu item in your "
+#~ "contact list."
+#~ msgstr ""
+#~ "באפשרותך לנהל את הסימניות שלך דרך תפריט 'פעולות' אשר מצוי בתוך הרשימה שלך."
+
+#~ msgid "The nickname contains invalid characters."
+#~ msgstr "שם הכינוי מכיל תווים אסורים."
+
+#, fuzzy
+#~ msgid "Bookmark Room"
+#~ msgstr "_סמן את חדר זה"
+
+#~ msgid "_Join New Group Chat"
+#~ msgstr "ה_צטרף לשיחת קבוצה חדשה"
+
+#, fuzzy
+#~ msgid "_Create Group Chat"
+#~ msgstr "עזוב שיחות קבוצה"
+
+#, fuzzy
+#~ msgid "Name:"
+#~ msgstr "שם: "
+
+#~ msgid "Description:"
+#~ msgstr "תיאור:"
+
+#, fuzzy
+#~ msgid "Address:"
+#~ msgstr "_כתובת:"
+
+#, fuzzy
+#~ msgid "You can not start a new conversation unless you are connected."
+#~ msgstr "אין באפשרותך להצטרף לשיחת קבוצה אלא כאשר תחובר."
+
+#, fuzzy
+#~ msgid "Occupants"
+#~ msgstr "פעולות נוכח"
+
+#, fuzzy
+#~ msgid "File transfer error"
+#~ msgstr "שגיאת העברת קובץ"
+
+#, fuzzy
+#~ msgid "No Accounts available"
+#~ msgstr "אין חשבון זמין"
+
+#~ msgid "Boolean"
+#~ msgstr "בוליאני"
+
+#~ msgid "Integer"
+#~ msgstr "ספרה"
+
+#~ msgid "Text"
+#~ msgstr "תמליל"
+
+#~ msgid "Value"
+#~ msgstr "ערך"
+
+#~ msgid "Type"
+#~ msgstr "טיפוס"
+
+#~ msgid "(None)"
+#~ msgstr "(אין)"
+
+# Needs to be tested
+#~ msgid "Hidden"
+#~ msgstr "מוסתר"
+
+#~ msgid "Manage Proxy Profiles"
+#~ msgstr "ניהול דיוקני Proxy"
+
+#, fuzzy
+#~ msgid "Properties"
+#~ msgstr "<b>מאפיינים</b>"
+
+#, fuzzy
+#~ msgid "Proxy _Host"
+#~ msgstr "מ_ארח proxy:"
+
+#, fuzzy
+#~ msgid "Proxy _Port"
+#~ msgstr "פו_רט proxy:"
+
+#, fuzzy
+#~ msgid "New Groupchat"
+#~ msgstr "שיחת קבוצה חדשה"
+
+#, fuzzy
+#~ msgid "New Contact"
+#~ msgstr "הוספת איש קשר חדש"
+
 # גיבי בתים
 #~ msgid "%s GiB"
 #~ msgstr "%s גי״ב"
@@ -11467,9 +12345,6 @@ msgstr "כשל תוסף"
 #~ msgid "_Pause"
 #~ msgstr "ה_שהה"
 
-#~ msgid "Clean _up"
-#~ msgstr "_נקה"
-
 #~ msgid "Remove file transfer from the list."
 #~ msgstr "הסר העברת קובץ מתוך הרשימה."
 
@@ -11491,10 +12366,6 @@ msgstr "כשל תוסף"
 #~ msgid "When a file transfer is complete show a popup notification"
 #~ msgstr "הצג התראה מוקפצת כאשר העברת קובץ הושלמה"
 
-#, fuzzy
-#~ msgid "Select Files"
-#~ msgstr "מנקה"
-
 #~ msgid "From:"
 #~ msgstr "מאת:"
 
@@ -11917,9 +12788,6 @@ msgstr "כשל תוסף"
 #~ msgid "You are invited to a groupchat"
 #~ msgstr "הוזמנת לשיחת קבוצה"
 
-#~ msgid "Do you want to accept the invitation?"
-#~ msgstr "האם ברצונך לקבל את ההזמנה?"
-
 #, fuzzy
 #~ msgid ""
 #~ "<b>Issued to:</b>\n"
@@ -11988,11 +12856,6 @@ msgstr "כשל תוסף"
 #~ msgid "Do you wish to delete all correspondence with the selected contacts?"
 #~ msgstr "האם אתה בטוח כי ברצונך למחוק את הרשומות של אנשי קשר נבחרים?"
 
-# BUG: general title without "the"
-#, fuzzy
-#~ msgid "This can not be undone."
-#~ msgstr "השירות לא היה יכול להימצא"
-
 #~ msgid "<b>What do you want to do?</b>"
 #~ msgstr "<b>מה ברצונך לעשות?</b>"
 
@@ -12175,10 +13038,6 @@ msgstr "כשל תוסף"
 #~ msgid "Nick"
 #~ msgstr "כינוי"
 
-#, fuzzy
-#~ msgid "Banning…"
-#~ msgstr "אסירה..."
-
 #~ msgid ""
 #~ "<b>Whom do you want to ban?</b>\n"
 #~ "\n"
@@ -12260,11 +13119,6 @@ msgstr "כשל תוסף"
 #~ msgid "Filter:"
 #~ msgstr "סינון:"
 
-# BUG: a dot at the end
-#~ msgid ""
-#~ "If checked, Gajim will display the mood of contacts in the roster window"
-#~ msgstr "כאשר מסומן, Gajim יציג את מצבי הרוח של אנשי קשר בחלון הרשימה"
-
 #~ msgid "<b>Chat Appearance</b>"
 #~ msgstr "<b>הופעת שיחה</b>"
 
@@ -12532,10 +13386,6 @@ msgstr "כשל תוסף"
 #~ msgstr "הודעת _מצב:"
 
 #, fuzzy
-#~ msgid "Group chat highlight"
-#~ msgstr "הבלטת שיחת קבוצה:"
-
-#, fuzzy
 #~ msgid "Your nickname"
 #~ msgstr "שם כינוי:"
 
@@ -12685,9 +13535,6 @@ msgstr "כשל תוסף"
 #~ msgid "The passwords typed in both fields must be identical."
 #~ msgstr "הסיסמאות אשר מוקלדות בשני השדות מוכרחות להיות זהות."
 
-#~ msgid "Enter new password:"
-#~ msgstr "הזן סיסמה חדשה:"
-
 #~ msgid "Enter it again for confirmation:"
 #~ msgstr "הזן את הסיסמה, פעם נוספת, לצורך אימות:"
 
@@ -12701,10 +13548,6 @@ msgstr "כשל תוסף"
 #~ msgid "unsubscribe request from %s"
 #~ msgstr "בקשת ביטול הרשמה מאת %s"
 
-#, fuzzy
-#~ msgid "Autojoin"
-#~ msgstr "ה_צטרף אוטומטית"
-
 #~ msgid "&lt;empty&gt;"
 #~ msgstr "&lt;ריק&gt;"
 
@@ -12825,9 +13668,6 @@ msgstr "כשל תוסף"
 #~ msgid "Forward unread message then disconnect"
 #~ msgstr "קדם הודעות אשר לא נקראו והתנתק לאחר מכן"
 
-#~ msgid "AIM Address:"
-#~ msgstr "כתובת AIM:"
-
 #~ msgid "MSN Address:"
 #~ msgstr "כתובת MSN:"
 
@@ -12878,9 +13718,6 @@ msgstr "כשל תוסף"
 #~ msgid "Session negotiation cancelled"
 #~ msgstr "הסדרת סשן בוטלה"
 
-#~ msgid "This session WILL be archived on server"
-#~ msgstr "סשן זה יושם בארכיון על שרת"
-
 #~ msgid "This session WILL NOT be archived on server"
 #~ msgstr "סשן זה לא יושם בארכיון על שרת"
 
@@ -13233,9 +14070,6 @@ msgstr "כשל תוסף"
 #~ msgid "Server:"
 #~ msgstr "שרת:"
 
-#~ msgid "Password:"
-#~ msgstr "סיסמה:"
-
 #~ msgid "Join this room _automatically when I connect"
 #~ msgstr "הצטרף לחדר זה באופן _אוטומטי בעת התחברותי"
 
@@ -13584,9 +14418,6 @@ msgstr "כשל תוסף"
 #~ msgid "_Edit Personal Information..."
 #~ msgstr "_ערוך מידע אישי..."
 
-#~ msgid "Information about you, as stored in the server"
-#~ msgstr "מידע אודותייך, כפי שמאוחסן בשרת"
-
 #~ msgid "<b>Personal Information</b>"
 #~ msgstr "<b>מידע אישי</b>"
 
@@ -13664,9 +14495,6 @@ msgstr "כשל תוסף"
 #~ msgid "Your server can't save your personal information."
 #~ msgstr "השרת שלך לא יכול לשמור את המידע האישי שלך."
 
-#~ msgid "Account Local already exists."
-#~ msgstr "חשבון Local כבר ישנו."
-
 #~ msgid "Please rename or remove it before enabling link-local messaging."
 #~ msgstr "אנא שנה את שמו או הסר אותו בטרם אפשור קישוריות מסרים מקומית."
 
@@ -13814,10 +14642,6 @@ msgstr "כשל תוסף"
 #~ msgid "The following message was NOT encrypted"
 #~ msgstr "ההודעה הבאה לא הוצפנה"
 
-#, fuzzy
-#~ msgid "Encryption used for this contact."
-#~ msgstr "אפשור הצפנת ESessions עבור חשבון זה."
-
 #~ msgid "Toggle Open_PGP Encryption"
 #~ msgstr "הפעל הצפנת Open_PGP"
 
@@ -13893,11 +14717,6 @@ msgstr "כשל תוסף"
 #~ msgid "Contact's identity verified"
 #~ msgstr "זהות איש קשר אומתה"
 
-# מאמת
-#, fuzzy
-#~ msgid "Verify again…"
-#~ msgstr "אמת שוב..."
-
 # הודעותיך
 # GOOD! their identity, not his or her ("he or she") identity [not a BUG:]
 #~ msgid ""
@@ -14024,9 +14843,6 @@ msgstr "כשל תוסף"
 #~ msgid "Add _Contact..."
 #~ msgstr "הוסף _איש קשר..."
 
-#~ msgid "_Accounts"
-#~ msgstr "_חשבונות"
-
 #~ msgid "P_lugins"
 #~ msgstr "_תוספות"
 
diff --git a/po/hr.po b/po/hr.po
index 41d578b63..cc834ea2a 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: 2019-07-02 02:06+0000\n"
+"POT-Creation-Date: 2019-08-11 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,71 +21,71 @@ 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:550
+#: gajim/chat_control_base.py:557
 msgid "_Undo"
 msgstr ""
 
-#: gajim/chat_control_base.py:558 gajim/conversation_textview.py:529
+#: gajim/chat_control_base.py:565 gajim/conversation_textview.py:529
 msgid "_Clear"
 msgstr ""
 
-#: gajim/chat_control_base.py:563
+#: gajim/chat_control_base.py:570
 msgid "Paste as quote"
 msgstr ""
 
-#: gajim/chat_control_base.py:613
+#: gajim/chat_control_base.py:620
 #, fuzzy
 msgid "Paste Image"
 msgstr "Odabir Slike"
 
-#: gajim/chat_control_base.py:614
+#: gajim/chat_control_base.py:621
 #, fuzzy
 msgid "You are trying to paste an image"
 msgstr "Zatvorit će te nekoliko kartica"
 
-#: gajim/chat_control_base.py:615
+#: gajim/chat_control_base.py:622
 #, 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:617 gajim/groupchat_control.py:2310
-#: gajim/roster_window.py:2848 gajim/roster_window.py:4167
-#: gajim/message_window.py:252 gajim/gtk/dialogs.py:418
+#: gajim/chat_control_base.py:624 gajim/groupchat_control.py:2218
+#: gajim/roster_window.py:2841 gajim/roster_window.py:4118
+#: gajim/message_window.py:359 gajim/gtk/dialogs.py:330
 #, fuzzy
 msgid "_Do not ask me again"
 msgstr "_Ne pitaj me više"
 
-#: gajim/chat_control_base.py:620
+#: gajim/chat_control_base.py:627
 msgid "_Paste"
 msgstr ""
 
-#: gajim/chat_control_base.py:1162 gajim/gtk/accounts.py:351
+#: gajim/chat_control_base.py:1169 gajim/gtk/accounts.py:354
 #, fuzzy
 msgid "Privacy"
 msgstr "Lista Privatnosti"
 
-#: gajim/chat_control_base.py:1163
+#: gajim/chat_control_base.py:1170
 #, fuzzy
 msgid "Warning"
 msgstr "Zabranjujem pristup %s"
 
-#: gajim/chat_control_base.py:1164
+#: gajim/chat_control_base.py:1171
 #, fuzzy, python-format
 msgid "If you send a file to <b>%s</b>, your real JID will be revealed."
 msgstr "Ako pošaljete datoteku osobi %s, on/ona će znati vaš pravi Jabber ID."
 
-#: gajim/chat_control_base.py:1169
+#: gajim/chat_control_base.py:1176
 #, fuzzy
 msgid "Continue"
 msgstr "_Nastaviti"
 
-#: gajim/gtkgui_helpers.py:163 gajim/gtk/filetransfer.py:393
+#: gajim/gtkgui_helpers.py:163 gajim/gtk/filetransfer.py:398
 #, fuzzy, python-format
 msgid "Cannot overwrite existing file '%s'"
 msgstr "Nije moguće prepisati postojeću datoteku \"%s\""
 
-#: gajim/gtkgui_helpers.py:164 gajim/gtk/filetransfer.py:394
+#: gajim/gtkgui_helpers.py:164 gajim/gtk/filetransfer.py:399
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
@@ -177,229 +177,224 @@ msgstr "Niti jedan zahtjev za pretplatu nije u toku."
 msgid " resource with priority "
 msgstr " resurs s prioritetom "
 
-#: gajim/gui_menu_builder.py:96
-msgid "_New Group Chat"
-msgstr "_Novi Grupni Razgovor"
-
-#: gajim/gui_menu_builder.py:289 gajim/gui_menu_builder.py:380
-#: gajim/chat_control.py:303 gajim/roster_window.py:786
-#: gajim/roster_window.py:1719 gajim/roster_window.py:1721
-#: gajim/roster_window.py:2030 gajim/roster_window.py:3336
-#: gajim/roster_window.py:3369 gajim/gui_interface.py:413
-#: gajim/common/contacts.py:206 gajim/common/contacts.py:343
-#: gajim/common/helpers.py:83 gajim/common/helpers.py:311
-#: gajim/gtk/add_contact.py:319 gajim/gtk/subscription_request.py:70
-#: gajim/gtk/subscription_request.py:99 gajim/gtk/roster_item_exchange.py:112
-msgid "Not in Roster"
-msgstr "Nije na Listi Kontakata"
+#: gajim/gui_menu_builder.py:251 gajim/gui_menu_builder.py:342
+#: gajim/chat_control.py:305 gajim/roster_window.py:783
+#: gajim/roster_window.py:1716 gajim/roster_window.py:1718
+#: gajim/roster_window.py:2027 gajim/roster_window.py:3292
+#: gajim/roster_window.py:3325 gajim/gui_interface.py:396
+#: gajim/common/contacts.py:222 gajim/common/contacts.py:359
+#: gajim/common/contacts.py:471 gajim/common/helpers.py:86
+#: gajim/common/helpers.py:317 gajim/gtk/add_contact.py:319
+#: gajim/gtk/subscription_request.py:70 gajim/gtk/subscription_request.py:99
+#: gajim/gtk/roster_item_exchange.py:112
+#, fuzzy
+msgid "Not in contact list"
+msgstr "Prikaži _Odspojene Kontakte"
 
-#: gajim/gui_menu_builder.py:393
-msgid "I would like to add you to my roster"
-msgstr "Želio bih vas dodati na svoju listu kontakata"
+#: gajim/gui_menu_builder.py:355
+#, 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:471
+#: gajim/gui_menu_builder.py:433
 #, fuzzy
 msgid "Send Single _Message…"
 msgstr "Pošalji Jednu _Poruku"
 
-#: gajim/gui_menu_builder.py:486
+#: gajim/gui_menu_builder.py:448
 #, fuzzy
 msgid "E_xecute Command…"
 msgstr "_Izvrši Naredbu..."
 
-#: gajim/gui_menu_builder.py:494
+#: gajim/gui_menu_builder.py:456
 msgid "_Manage Transport"
 msgstr "_Upravljanje Prijenosom"
 
-#: gajim/gui_menu_builder.py:500
+#: gajim/gui_menu_builder.py:462
 msgid "_Modify Transport"
 msgstr "_Izmjeni Prijenos"
 
-#: gajim/gui_menu_builder.py:507 gajim/roster_window.py:5046
+#: gajim/gui_menu_builder.py:469 gajim/roster_window.py:4985
 #, fuzzy
 msgid "_Rename…"
 msgstr "_Preimenuj"
 
-#: gajim/gui_menu_builder.py:518 gajim/roster_window.py:5062
-#: gajim/roster_window.py:5177 gajim/data/gui/blocked_contacts_window.ui:52
+#: gajim/gui_menu_builder.py:480 gajim/roster_window.py:5001
+#: gajim/roster_window.py:5116 gajim/data/gui/blocked_contacts_window.ui:52
 #: gajim/data/gui/gc_occupants_menu.ui:148
 #: gajim/data/gui/contact_context_menu.ui:143
 msgid "_Unblock"
 msgstr "_Odblokiraj"
 
-#: gajim/gui_menu_builder.py:521 gajim/roster_window.py:5067
-#: gajim/roster_window.py:5181 gajim/data/gui/gc_occupants_menu.ui:140
+#: gajim/gui_menu_builder.py:483 gajim/roster_window.py:5006
+#: gajim/roster_window.py:5120 gajim/data/gui/gc_occupants_menu.ui:140
 #: gajim/data/gui/contact_context_menu.ui:151
 msgid "_Block"
 msgstr "_Blokiraj"
 
-#: gajim/gui_menu_builder.py:529 gajim/roster_window.py:5074
+#: gajim/gui_menu_builder.py:491 gajim/roster_window.py:5013
 #: gajim/data/gui/contact_context_menu.ui:181
 msgid "Remo_ve"
 msgstr "Uklo_ni"
 
-#: gajim/gui_menu_builder.py:539 gajim/data/gui/contact_context_menu.ui:198
+#: gajim/gui_menu_builder.py:501 gajim/data/gui/contact_context_menu.ui:198
 msgid "_Information"
 msgstr "_Informacije"
 
-#: gajim/gui_menu_builder.py:552
+#: gajim/gui_menu_builder.py:514
 #, fuzzy
 msgid "Save _As"
 msgstr "Imam "
 
-#: gajim/gui_menu_builder.py:564 gajim/groupchat_control.py:501
-#: gajim/chat_control.py:340
+#: gajim/gui_menu_builder.py:526 gajim/groupchat_control.py:507
+#: gajim/chat_control.py:342
 #, fuzzy
 msgid "Send File…"
 msgstr "Pošalji _Datoteku"
 
-#: gajim/gui_menu_builder.py:565
+#: gajim/gui_menu_builder.py:527
 #, fuzzy
 msgid "Upload File…"
 msgstr "Snimiti Datoteku kao..."
 
-#: gajim/gui_menu_builder.py:566
+#: gajim/gui_menu_builder.py:528
 #, fuzzy
 msgid "Send File Directly…"
 msgstr "Snimiti Datoteku kao..."
 
-#: gajim/gui_menu_builder.py:568 gajim/gui_menu_builder.py:632
+#: gajim/gui_menu_builder.py:530 gajim/gui_menu_builder.py:596
 #, fuzzy
 msgid "Send Chatstate"
 msgstr "Zadnji status: %s"
 
-#: gajim/gui_menu_builder.py:569
+#: gajim/gui_menu_builder.py:531
 #, fuzzy
 msgid "Invite Contacts"
 msgstr "Pozovi _Kontakte"
 
-#: gajim/gui_menu_builder.py:570
+#: gajim/gui_menu_builder.py:532
 #, fuzzy
-msgid "Add to Roster"
-msgstr "_Dodaj na Listu"
+msgid "Add to Contact List"
+msgstr "_Dodaj Kontakt..."
 
-#: gajim/gui_menu_builder.py:571
-msgid "Audio Session"
-msgstr ""
+#: gajim/gui_menu_builder.py:533
+#, fuzzy
+msgid "Voice Chat"
+msgstr "Zahtjev Razmjene Datoteka"
 
-#: gajim/gui_menu_builder.py:572
-msgid "Video Session"
-msgstr ""
+#: gajim/gui_menu_builder.py:534
+#, fuzzy
+msgid "Video Chat"
+msgstr "Privanti Razgovori"
 
-#: gajim/gui_menu_builder.py:573
+#: gajim/gui_menu_builder.py:535 gajim/gui_menu_builder.py:582
 #, fuzzy
 msgid "Information"
 msgstr "_Informacije"
 
-#: gajim/gui_menu_builder.py:574 gajim/gui_menu_builder.py:639
+#: gajim/gui_menu_builder.py:536 gajim/gui_menu_builder.py:602
 #: gajim/data/gui/application_menu.ui:37
 #, fuzzy
 msgid "History"
 msgstr "_Povijest razgovora"
 
-#: gajim/gui_menu_builder.py:580 gajim/gui_menu_builder.py:687
+#: gajim/gui_menu_builder.py:542 gajim/gui_menu_builder.py:650
 #: gajim/data/gui/preferences_window.ui:1823
 msgid "Disabled"
 msgstr "Onemogućeno"
 
-#: gajim/gui_menu_builder.py:581 gajim/gui_menu_builder.py:688
+#: gajim/gui_menu_builder.py:543 gajim/gui_menu_builder.py:651
 #, fuzzy
 msgid "Composing only"
 msgstr "Pisanje"
 
-#: gajim/gui_menu_builder.py:582 gajim/gui_menu_builder.py:689
+#: gajim/gui_menu_builder.py:544 gajim/gui_menu_builder.py:652
 #, fuzzy
 msgid "All chat states"
 msgstr "Svi statusi"
 
-#: gajim/gui_menu_builder.py:620
+#: gajim/gui_menu_builder.py:583
 #, fuzzy
-msgid "Manage Room"
-msgstr "_Upravljanje sobom"
+msgid "Manage Group Chat"
+msgstr "Novi Grupni Razgovor"
 
-#: gajim/gui_menu_builder.py:621
+#: gajim/gui_menu_builder.py:584 gajim/data/gui/groupchat_control.ui:649
 #, fuzzy
 msgid "Change Subject"
 msgstr "Promijeni _Temu..."
 
-#: gajim/gui_menu_builder.py:622
+#: gajim/gui_menu_builder.py:585
 #, fuzzy
-msgid "Configure Room"
-msgstr "Podešavanje _Sobe..."
+msgid "Configure Group Chat"
+msgstr "Novi Grupni Razgovor"
 
-#: gajim/gui_menu_builder.py:623
+#: gajim/gui_menu_builder.py:586
 #, fuzzy
 msgid "Upload Avatar…"
 msgstr "Odabir Slike"
 
-#: gajim/gui_menu_builder.py:624
+#: gajim/gui_menu_builder.py:587
 #, fuzzy
-msgid "Destroy Room"
-msgstr "_Uništi Sobu"
+msgid "Destroy Group Chat"
+msgstr "Novi Grupni Razgovor"
 
-#: gajim/gui_menu_builder.py:626 gajim/data/gui/preferences_window.ui:790
+#: gajim/gui_menu_builder.py:589 gajim/data/gui/preferences_window.ui:790
 #, fuzzy
 msgid "Chat Settings"
 msgstr "Registracija nije uspijela"
 
-#: gajim/gui_menu_builder.py:627
+#: gajim/gui_menu_builder.py:590
 msgid "Show join/leave"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:628
+#: gajim/gui_menu_builder.py:591
 #, fuzzy
 msgid "Show status changes"
 msgstr "_Pamti promjene statusa kontakata"
 
-#: gajim/gui_menu_builder.py:629 gajim/data/gui/gc_control_popup_menu.ui:72
+#: gajim/gui_menu_builder.py:592 gajim/data/gui/gc_control_popup_menu.ui:72
 #, fuzzy
 msgid "Notify on all messages"
 msgstr "Predefinirane poruke:"
 
-#: gajim/gui_menu_builder.py:630
+#: gajim/gui_menu_builder.py:593
 #, fuzzy
 msgid "Minimize on close"
 msgstr "_Minimiziraj kod izlaza"
 
-#: gajim/gui_menu_builder.py:631
+#: gajim/gui_menu_builder.py:595
 #, fuzzy
-msgid "Minimize on autojoin"
+msgid "Minimize when joining automatically"
 msgstr "Minimiziraj kod Automatskog Ulaska"
 
-#: gajim/gui_menu_builder.py:634
+#: gajim/gui_menu_builder.py:598
 msgid "Sync Threshold"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:635
+#: gajim/gui_menu_builder.py:599
 #, fuzzy
-msgid "Change Nick"
+msgid "Change Nickname"
 msgstr "Promijeni _Nadimak..."
 
-#: gajim/gui_menu_builder.py:636
-#, fuzzy
-msgid "Bookmark Room"
-msgstr "Postavi knjižnu oznaku za sobu"
-
-#: gajim/gui_menu_builder.py:637
+#: gajim/gui_menu_builder.py:600
 #, fuzzy
 msgid "Request Voice"
 msgstr "_Glas"
 
-#: gajim/gui_menu_builder.py:638 gajim/roster_window.py:5246
+#: gajim/gui_menu_builder.py:601 gajim/roster_window.py:5185
 #, fuzzy
 msgid "Execute command"
 msgstr "_Izvrši Naredbu..."
 
-#: gajim/gui_menu_builder.py:640
-#, fuzzy
-msgid "Disconnect"
-msgstr "_Odspoji"
+#: gajim/gui_menu_builder.py:603
+msgid "Leave"
+msgstr ""
 
-#: gajim/gui_menu_builder.py:678 gajim/gtk/preferences.py:156
+#: gajim/gui_menu_builder.py:641 gajim/gtk/preferences.py:155
 msgid "No threshold"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:680 gajim/gtk/preferences.py:158
+#: gajim/gui_menu_builder.py:643 gajim/gtk/preferences.py:157
 #, fuzzy, python-format
 msgid "%i day"
 msgid_plural "%i days"
@@ -407,159 +402,174 @@ msgstr[0] "Prije %i dana"
 msgstr[1] "Prije %i dana"
 msgstr[2] "Prije %i dana"
 
-#: gajim/gui_menu_builder.py:709 gajim/gui_menu_builder.py:747
-#: gajim/gtk/join_groupchat.py:43
-msgid "Join Group Chat"
-msgstr "Pridružiti se Grupnom Razgovoru"
-
-#: gajim/gui_menu_builder.py:746
+#: gajim/gui_menu_builder.py:672
 #, fuzzy
 msgid "Add Contact…"
 msgstr "_Dodaj Kontakt..."
 
-#: gajim/gui_menu_builder.py:748 gajim/gtk/profile.py:52
-#: gajim/gtk/accounts.py:770 gajim/gtk/accounts.py:808
+#: gajim/gui_menu_builder.py:673 gajim/gtk/profile.py:52
+#: gajim/gtk/accounts.py:773 gajim/gtk/accounts.py:811
 #, fuzzy
 msgid "Profile"
 msgstr "datoteka"
 
-#: gajim/gui_menu_builder.py:749
+#: gajim/gui_menu_builder.py:674
+#, fuzzy
+msgid "Send Single Message…"
+msgstr "Pošalji Jednu _Poruku"
+
+#: gajim/gui_menu_builder.py:675
 #, fuzzy
 msgid "Discover Services"
 msgstr "_Otkrivanje Usluga"
 
-#: gajim/gui_menu_builder.py:750
+#: gajim/gui_menu_builder.py:676 gajim/gtk/server_info.py:36
 #, fuzzy
-msgid "Send Single Message…"
-msgstr "Pošalji Jednu _Poruku"
+msgid "Server Info"
+msgstr "Poslužitelj"
 
-#: gajim/gui_menu_builder.py:751 gajim/data/gui/preferences_window.ui:2741
+#: gajim/gui_menu_builder.py:677 gajim/data/gui/preferences_window.ui:2741
 msgid "Advanced"
 msgstr "Napredno"
 
-#: gajim/gui_menu_builder.py:752 gajim/gtk/mam_preferences.py:88
+#: gajim/gui_menu_builder.py:678 gajim/gtk/mam_preferences.py:88
 #, fuzzy
 msgid "Archiving Preferences"
 msgstr "_Postavke"
 
-#: gajim/gui_menu_builder.py:753
+#: gajim/gui_menu_builder.py:679
 #, fuzzy
 msgid "Blocking List"
 msgstr "Ban Lista"
 
-#: gajim/gui_menu_builder.py:754 gajim/gtk/history_sync.py:108
+#: gajim/gui_menu_builder.py:680
+#, fuzzy
+msgid "Bookmarks"
+msgstr "_Postavi Oznaku"
+
+#: gajim/gui_menu_builder.py:681
+#, fuzzy
+msgid "PEP Configuration"
+msgstr "Konfiguracija Sobe"
+
+#: gajim/gui_menu_builder.py:682 gajim/gtk/history_sync.py:108
 #: gajim/gtk/history_sync.py:186
 #, fuzzy
 msgid "Synchronise History"
 msgstr "Sinkroniziraj"
 
-#: gajim/gui_menu_builder.py:755 gajim/gtk/privacy_list.py:427
+#: gajim/gui_menu_builder.py:683 gajim/gtk/privacy_list.py:427
 msgid "Privacy Lists"
 msgstr "Liste Privatnosti"
 
-#: gajim/gui_menu_builder.py:756 gajim/gtk/server_info.py:36
-#, fuzzy
-msgid "Server Info"
-msgstr "Poslužitelj"
-
-#: gajim/gui_menu_builder.py:757 gajim/gui_menu_builder.py:768
+#: gajim/gui_menu_builder.py:685 gajim/gui_menu_builder.py:696
 #: gajim/data/gui/xml_console_window.ui:77
 msgid "XML Console"
 msgstr "XML Konzola"
 
-#: gajim/gui_menu_builder.py:759 gajim/data/gui/groupchat_config.ui:36
+#: gajim/gui_menu_builder.py:687 gajim/data/gui/groupchat_config.ui:36
 #, fuzzy
 msgid "Admin"
 msgstr "_Admin"
 
-#: gajim/gui_menu_builder.py:760
+#: gajim/gui_menu_builder.py:688
 #, fuzzy
 msgid "Send Server Message…"
 msgstr "_Pošalji Poslužiteljsku Poruku..."
 
-#: gajim/gui_menu_builder.py:761
+#: gajim/gui_menu_builder.py:689
 #, fuzzy
 msgid "Set MOTD…"
 msgstr "Postavi MOTD..."
 
-#: gajim/gui_menu_builder.py:762
+#: gajim/gui_menu_builder.py:690
 #, fuzzy
 msgid "Update MOTD…"
 msgstr "Osvježi MOTD..."
 
-#: gajim/gui_menu_builder.py:763
+#: gajim/gui_menu_builder.py:691
 #, fuzzy
 msgid "Delete MOTD…"
 msgstr "Izbriši MOTD"
 
-#: gajim/gui_menu_builder.py:812
+#: gajim/gui_menu_builder.py:736
 #, fuzzy
-msgid "No Accounts available"
-msgstr "Nema dostupnih računa"
+msgid "_Add Account…"
+msgstr "_Dodaj Kontakt..."
+
+#: gajim/gui_menu_builder.py:742
+#, fuzzy
+msgid "_Modify Accounts…"
+msgstr "_Izmjeni Račun"
 
-#: gajim/gui_menu_builder.py:823 gajim/data/gui/application_menu.ui:5
-#: gajim/data/gui/application_menu.ui:71 gajim/data/gui/shortcuts_window.ui:182
-#: gajim/gtk/accounts.py:58
+#: gajim/gui_menu_builder.py:751 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:755 gajim/data/gui/application_menu.ui:5
+#: gajim/data/gui/shortcuts_window.ui:182 gajim/gtk/accounts.py:57
 msgid "Accounts"
 msgstr "Korisnički Račun"
 
-#: gajim/gui_menu_builder.py:881 gajim/gui_menu_builder.py:886
+#: gajim/gui_menu_builder.py:784 gajim/gui_menu_builder.py:789
 #, fuzzy
-msgid "Copy JID"
-msgstr "JID Sobe"
+msgid "Copy XMPP Address"
+msgstr "_Kopiraj JID/Email Adresu"
 
-#: gajim/gui_menu_builder.py:882 gajim/gui_menu_builder.py:914
+#: gajim/gui_menu_builder.py:785 gajim/gui_menu_builder.py:817
 #, fuzzy
 msgid "Join Groupchat"
 msgstr "Pridružiti se Grupnom Razgovoru"
 
-#: gajim/gui_menu_builder.py:887 gajim/gui_menu_builder.py:913
-#: gajim/data/gui/application_menu.ui:76
+#: gajim/gui_menu_builder.py:790 gajim/gui_menu_builder.py:816
+#: gajim/data/gui/application_menu.ui:71
 #: gajim/data/gui/subscription_request_window.ui:106
 msgid "Start Chat"
 msgstr "Započeti Razgovor"
 
-#: gajim/gui_menu_builder.py:888 gajim/gui_menu_builder.py:915
+#: gajim/gui_menu_builder.py:791 gajim/gui_menu_builder.py:818
 #, fuzzy
-msgid "Add to Roster…"
-msgstr "_Dodaj na Listu"
+msgid "Add to Contact List…"
+msgstr "_Dodaj Kontakt..."
 
-#: gajim/gui_menu_builder.py:893
+#: gajim/gui_menu_builder.py:796
 #, fuzzy
 msgid "Copy Link Location"
 msgstr "_Kopiraj Lokaciju Linka"
 
-#: gajim/gui_menu_builder.py:894
+#: gajim/gui_menu_builder.py:797
 #, fuzzy
 msgid "Open Link in Browser"
 msgstr "_Otvori Link u Pregledniku"
 
-#: gajim/gui_menu_builder.py:899
+#: gajim/gui_menu_builder.py:802
 #, fuzzy
 msgid "Copy Email Address"
 msgstr "_Kopiraj JID/Email Adresu"
 
-#: gajim/gui_menu_builder.py:900 gajim/gui_menu_builder.py:912
+#: gajim/gui_menu_builder.py:803 gajim/gui_menu_builder.py:815
 #, fuzzy
 msgid "Open Email Composer"
 msgstr "_Otvori Sastavljanje Emaila"
 
-#: gajim/gui_menu_builder.py:905
+#: gajim/gui_menu_builder.py:808
 #, fuzzy
 msgid "Copy Location"
 msgstr "_Kopiraj Lokaciju Linka"
 
-#: gajim/gui_menu_builder.py:906
+#: gajim/gui_menu_builder.py:809
 #, fuzzy
 msgid "Show Location"
 msgstr "Obavijest"
 
-#: gajim/gui_menu_builder.py:911
+#: gajim/gui_menu_builder.py:814
 #, fuzzy
-msgid "Copy JID/Email"
+msgid "Copy XMPP Address/Email"
 msgstr "_Kopiraj JID/Email Adresu"
 
-#: gajim/gui_menu_builder.py:945
+#: gajim/gui_menu_builder.py:852
 #, fuzzy
 msgid "Copy"
 msgstr "JID Sobe"
@@ -582,44 +592,56 @@ msgstr ""
 msgid "Choose folder for logfile"
 msgstr ""
 
-#: gajim/history_manager.py:107
+#: gajim/history_manager.py:106
 msgid "Cannot find history logs database"
 msgstr "Nije moguće pronaći bazu podataka zapisa"
 
-#: gajim/history_manager.py:108
+#: gajim/history_manager.py:107
 #, fuzzy, python-format
 msgid "%s does not exist."
 msgstr "Datoteka ne postoji"
 
-#: gajim/history_manager.py:141 gajim/history_manager.py:195
-#: gajim/gtk/discovery.py:829 gajim/gtk/roster_item_exchange.py:80
-msgid "JID"
-msgstr "JID"
+#: gajim/history_manager.py:140 gajim/history_manager.py:194
+#: 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:30
+#: gajim/gtk/accounts.py:804
+#, fuzzy
+msgid "XMPP Address"
+msgstr "AIM Adresa:"
 
-#: gajim/history_manager.py:154 gajim/history_manager.py:202
+#: gajim/history_manager.py:153 gajim/history_manager.py:201
 #: gajim/data/gui/history_window.ui:89 gajim/gtk/history.py:108
 msgid "Date"
 msgstr "Datum"
 
-#: gajim/history_manager.py:161 gajim/history_manager.py:225
+#: gajim/history_manager.py:160 gajim/history_manager.py:224
 #: gajim/data/gui/join_groupchat_window.ui:208
 #: gajim/data/gui/profile_window.ui:214
 #: gajim/data/gui/vcard_information_window.ui:443
+#: gajim/data/gui/bookmarks.ui:140
 msgid "Nickname"
 msgstr "Nadimak"
 
-#: gajim/history_manager.py:172 gajim/history_manager.py:211
+#: gajim/history_manager.py:171 gajim/history_manager.py:210
 #: gajim/data/gui/preferences_window.ui:1344
 #: gajim/data/gui/single_message_window.ui:275 gajim/gtk/history.py:117
 msgid "Message"
 msgstr "Poruka"
 
-#: gajim/history_manager.py:180 gajim/history_manager.py:218
+#: gajim/history_manager.py:179 gajim/history_manager.py:217
 #: gajim/data/gui/groups_post_window.ui:49
 #: gajim/data/gui/single_message_window.ui:214
 msgid "Subject"
 msgstr "Tema"
 
+#: gajim/history_manager.py:247
+#, fuzzy
+msgid "Database Cleanup"
+msgstr "Pogreška Baze Podataka"
+
 #: gajim/history_manager.py:248
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
@@ -631,11 +653,8 @@ msgstr ""
 #: gajim/history_manager.py:250
 #, fuzzy
 msgid ""
-"Normally allocated database size will not be freed, it will just become "
-"reusable. If you really want to reduce database filesize, click YES, else "
-"click NO.\n"
-"\n"
-"In case you click YES, please wait…"
+"Normally, the allocated database size will not be freed, it will just become "
+"reusable. This operation may take a while."
 msgstr ""
 "Uobičajeno, veličina prikupljenog prostora za bazu podataka neće biti "
 "oslobođena, samo će postati ponovo koristiva. Ukoliko zaista želite smanjiti "
@@ -645,26 +664,26 @@ msgstr ""
 
 #: gajim/history_manager.py:255
 #, fuzzy
-msgid "Database Cleanup"
-msgstr "Pogreška Baze Podataka"
+msgid "_Cleanup"
+msgstr "Počist_i"
 
-#: gajim/history_manager.py:519 gajim/gtk/filetransfer.py:238
-#: gajim/gtk/filetransfer.py:248
+#: gajim/history_manager.py:518 gajim/gtk/filetransfer.py:237
+#: gajim/gtk/filetransfer.py:247
 msgid "You"
 msgstr "Vi"
 
-#: gajim/history_manager.py:531
+#: gajim/history_manager.py:530
 #, 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:568 gajim/history_manager.py:607
-#: gajim/gtk/dialogs.py:58 gajim/gtk/themes.py:319
+#: gajim/history_manager.py:567 gajim/history_manager.py:606
+#: gajim/gtk/dialogs.py:57 gajim/gtk/themes.py:319
 #: gajim/gtk/roster_item_exchange.py:75 gajim/gtk/roster_item_exchange.py:185
 msgid "Delete"
 msgstr "Obriši"
 
-#: gajim/history_manager.py:569
+#: gajim/history_manager.py:568
 #, fuzzy
 msgid "Delete Conversation"
 msgid_plural "Delete Conversations"
@@ -672,7 +691,7 @@ msgstr[0] "Otkaži potvrdu"
 msgstr[1] "Otkaži potvrdu"
 msgstr[2] "Otkaži potvrdu"
 
-#: gajim/history_manager.py:570
+#: gajim/history_manager.py:569
 #, 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?"
@@ -680,7 +699,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:608
+#: gajim/history_manager.py:607
 #, fuzzy
 msgid "Delete Message"
 msgid_plural "Delete Messages"
@@ -688,7 +707,7 @@ msgstr[0] "Predefinirana Poruka"
 msgstr[1] "Predefinirana Poruka"
 msgstr[2] "Predefinirana Poruka"
 
-#: gajim/history_manager.py:609
+#: gajim/history_manager.py:608
 #, fuzzy
 msgid "Do you want to permanently delete this message"
 msgid_plural "Do you want to permanently delete these messages"
@@ -702,15 +721,15 @@ msgid "Contact name: <i>%s</i>"
 msgstr "Ime kontakta: <i>%s</i>"
 
 #: gajim/dialogs.py:84
-#, fuzzy, python-format
-msgid "JID: <i>%s</i>"
-msgstr "Jabber ID: <i>%s</i>"
+#, python-format
+msgid "XMPP Address: <i>%s</i>"
+msgstr ""
 
-#: gajim/dialogs.py:115 gajim/dialogs.py:128 gajim/roster_window.py:2901
-#: gajim/roster_window.py:3833 gajim/roster_window.py:5084
-#: gajim/common/contacts.py:157 gajim/common/contacts.py:190
+#: gajim/dialogs.py:115 gajim/dialogs.py:128 gajim/roster_window.py:2894
+#: gajim/roster_window.py:3784 gajim/roster_window.py:5023
+#: gajim/common/contacts.py:157 gajim/common/contacts.py:206
 #: gajim/data/gui/preferences_window.ui:558
-#: gajim/data/gui/shortcuts_window.ui:177 gajim/gtk/accounts.py:349
+#: gajim/data/gui/shortcuts_window.ui:177 gajim/gtk/accounts.py:352
 msgid "General"
 msgstr "Općenito"
 
@@ -755,7 +774,7 @@ msgstr "Prepiši Statusnu Poruku?"
 msgid "Preset 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:703
+#: gajim/dialogs.py:703 gajim/plugins/gui.py:292
 msgid "_Overwrite"
 msgstr ""
 
@@ -767,9 +786,7 @@ msgstr "Snimiti kao Unaprijed Postavljenu Statusnu Poruku"
 msgid "Please type a name for this status message"
 msgstr "Molim unesite ime za ovu statusnu poruku"
 
-#: gajim/dialogs.py:740 gajim/gui_interface.py:1441 gajim/dialog_messages.py:31
-#: gajim/gtk/discovery.py:518 gajim/gtk/profile.py:323
-#: gajim/gtk/join_groupchat.py:234
+#: gajim/dialogs.py:740 gajim/gtk/discovery.py:517 gajim/gtk/profile.py:323
 msgid "You are not connected to the server"
 msgstr "Niste spojeni na poslužitelj."
 
@@ -777,9 +794,11 @@ msgstr "Niste spojeni na poslužitelj."
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Bez veze nije moguća sinkronizirati vaše kontakte."
 
-#: gajim/dialogs.py:752 gajim/dialogs.py:823 gajim/gtk/discovery.py:822
-#: gajim/gtk/discovery.py:1648 gajim/gtk/discovery.py:1941
-#: gajim/gtk/history.py:99 gajim/gtk/roster_item_exchange.py:83
+#: gajim/dialogs.py:752 gajim/dialogs.py:823
+#: gajim/data/gui/groupchat_info_scrolled.ui:16 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/gtk/roster_item_exchange.py:83
 msgid "Name"
 msgstr "Ime"
 
@@ -799,400 +818,347 @@ msgstr "Ne možete sinkronizirati sa računom ukoliko nije spojen."
 msgid "Synchronise"
 msgstr "Sinkroniziraj"
 
-#: gajim/dialogs.py:1043
+#: gajim/dialogs.py:1042
 msgid "an audio and video"
 msgstr ""
 
-#: gajim/dialogs.py:1045
+#: gajim/dialogs.py:1044
 msgid "an audio"
 msgstr ""
 
-#: gajim/dialogs.py:1047
+#: gajim/dialogs.py:1046
 msgid "a video"
 msgstr ""
 
-#: gajim/dialogs.py:1051
+#: gajim/dialogs.py:1050
 #, python-format
 msgid ""
-"%(contact)s wants to start %(type)s session with you. Do you want to answer "
+"%(contact)s wants to start a %(type)s chat with you. Do you want to answer "
 "the call?"
 msgstr ""
 
-#: gajim/groupchat_control.py:505
+#: gajim/groupchat_control.py:511
 #, fuzzy, python-format
 msgid "Send File (max. %s MiB)…"
 msgstr "Snimiti Datoteku kao..."
 
-#: gajim/groupchat_control.py:507 gajim/chat_control.py:342
+#: gajim/groupchat_control.py:513 gajim/chat_control.py:344
 #, fuzzy
 msgid "No File Transfer available"
 msgstr "Prijenosi Datoteka"
 
-#: gajim/groupchat_control.py:630 gajim/groupchat_control.py:2349
-msgid "Changing Subject"
-msgstr "Mijenjanje Teme"
-
-#: gajim/groupchat_control.py:631 gajim/groupchat_control.py:2350
-msgid "Please specify the new subject:"
-msgstr "Molim specificirajte novu temu:"
-
-#: gajim/groupchat_control.py:638
-msgid "Changing Nickname"
-msgstr "Mijenjam Nadimak"
-
-#: gajim/groupchat_control.py:639
-msgid "Please specify the new nickname you want to use:"
-msgstr "Molim specificirajte novi nadimak ako ga želite koristiti:"
-
-#: gajim/groupchat_control.py:657
+#: gajim/groupchat_control.py:655
 #, fuzzy
-msgid "Invalid group chat JID"
+msgid "Invalid group chat XMPP Address"
 msgstr "Neispravan Jabber ID grupnog razgovora"
 
-#: gajim/groupchat_control.py:658
+#: gajim/groupchat_control.py:656
 #, fuzzy
-msgid "The group chat JID has not allowed characters."
+msgid "The group chat XMPP Address has not allowed characters."
 msgstr "Jabber ID grupnog razgovora ima nedozvoljene znakove."
 
-#: gajim/groupchat_control.py:758 gajim/gtk/profile.py:136
+#: gajim/groupchat_control.py:743 gajim/gtk/profile.py:136
 msgid "Could not load image"
 msgstr "Nemogu učitati sliku"
 
-#: gajim/groupchat_control.py:888
+#: gajim/groupchat_control.py:873
 msgid "Insert Nickname"
 msgstr "Umetni _Nadimak"
 
-#: gajim/groupchat_control.py:1056 gajim/chat_control.py:824
+#: gajim/groupchat_control.py:1041 gajim/chat_control.py:848
 msgid "and authenticated"
 msgstr "i autentičan"
 
-#: gajim/groupchat_control.py:1060 gajim/chat_control.py:828
+#: gajim/groupchat_control.py:1045 gajim/chat_control.py:852
 msgid "and NOT authenticated"
 msgstr "i NIJE autentičan"
 
-#: gajim/groupchat_control.py:1064
+#: gajim/groupchat_control.py:1049
 #, 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/groupchat_control.py:1111
+#: gajim/groupchat_control.py:1096
 msgid "Conversation with "
 msgstr "Razgovor sa"
 
-#: gajim/groupchat_control.py:1113
+#: gajim/groupchat_control.py:1098
 msgid "Continued conversation"
 msgstr "Nastavljeni razgovor"
 
-#: gajim/groupchat_control.py:1411
+#: gajim/groupchat_control.py:1357
 #, 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:1433
+#: gajim/groupchat_control.py:1374
 #, fuzzy
-msgid "Room now shows unavailable members"
+msgid "Group chat now shows unavailable members"
 msgstr "Soba od sada prikazuje nedostupne članove"
 
-#: gajim/groupchat_control.py:1436
+#: gajim/groupchat_control.py:1377
 #, fuzzy
-msgid "Room now does not show unavailable members"
+msgid "Group chat now does not show unavailable members"
 msgstr "Soba od sada ne prikazuje nedostupne članove"
 
-#: gajim/groupchat_control.py:1439
+#: gajim/groupchat_control.py:1380
 msgid "A setting not related to privacy has been changed"
 msgstr ""
 
-#: gajim/groupchat_control.py:1446
-msgid "Room logging is now enabled"
-msgstr "Zapisivanje razgovora u sobi je sada omogućeno"
+#: gajim/groupchat_control.py:1387 gajim/groupchat_control.py:1659
+#, fuzzy
+msgid "Conversations are stored on the server"
+msgstr "Sesija NEĆE biti sačuvana"
 
-#: gajim/groupchat_control.py:1449
-msgid "Room logging is now disabled"
-msgstr "Zapisivanje razgovora u sobi je sada onemogućeno"
+#: gajim/groupchat_control.py:1390
+#, fuzzy
+msgid "Conversations are not stored on the server"
+msgstr "Informacije o vama, kako stoji na poslužitelju"
 
-#: gajim/groupchat_control.py:1452
-msgid "Room is now non-anonymous"
+#: gajim/groupchat_control.py:1393
+#, fuzzy
+msgid "Group chat is now non-anonymous"
 msgstr "Soba je sada non-anonymous"
 
-#: gajim/groupchat_control.py:1456
-msgid "Room is now semi-anonymous"
+#: gajim/groupchat_control.py:1397
+#, fuzzy
+msgid "Group chat is now semi-anonymous"
 msgstr "Soba je sada semi-anonymous"
 
-#: gajim/groupchat_control.py:1460
+#: gajim/groupchat_control.py:1401
 #, fuzzy
-msgid "Room is now fully anonymous"
+msgid "Group chat is now fully anonymous"
 msgstr "Soba je sada fully-anonymous"
 
-#: gajim/groupchat_control.py:1500
+#: gajim/groupchat_control.py:1439
 #, fuzzy, python-format
 msgid "Ping? (%s)"
 msgstr "Pong! (%s s.)"
 
-#: gajim/groupchat_control.py:1503
+#: gajim/groupchat_control.py:1442
 #, fuzzy, python-format
 msgid "Pong! (%(nick)s %(delay)s s.)"
 msgstr "Pong! (%s s.)"
 
-#: gajim/groupchat_control.py:1506 gajim/chat_control.py:1213
+#: gajim/groupchat_control.py:1445 gajim/chat_control.py:1237
 msgid "Error."
 msgstr "Greška."
 
-#: gajim/groupchat_control.py:1711
+#: gajim/groupchat_control.py:1650
 #, fuzzy, python-format
-msgid "You (%s) joined the room"
+msgid "You (%s) joined the group chat"
 msgstr "%s se pridružio grupnom razgovoru"
 
-#: gajim/groupchat_control.py:1717
-msgid "Any occupant is allowed to see your full JID"
+#: gajim/groupchat_control.py:1655
+#, fuzzy
+msgid "Any participant is allowed to see your full XMPP Address"
 msgstr "Svakom sudioniku je sada dopušteno da vidi vaš puni JID"
 
-#: gajim/groupchat_control.py:1721
-msgid "Room logging is enabled"
-msgstr "Zapisivanje razgovora u sobi je omogućeno"
-
-#: gajim/groupchat_control.py:1725
-msgid "The server has assigned or modified your roomnick"
+#: gajim/groupchat_control.py:1663
+#, fuzzy
+msgid "The server has assigned or modified your nickname in this group chat"
 msgstr "Poslužitelj je dodijelio ili promjenio vaš nadimak"
 
-#: gajim/groupchat_control.py:1732
-msgid "A new room has been created"
+#: gajim/groupchat_control.py:1671
+#, fuzzy
+msgid "A new group chat has been created"
 msgstr "Nova soba je stvorena"
 
-#: gajim/groupchat_control.py:1740 gajim/privatechat_control.py:112
+#: gajim/groupchat_control.py:1679 gajim/privatechat_control.py:115
 #, python-format
 msgid "You are now known as %s"
 msgstr "Od sada ste poznati kao %s"
 
-#: gajim/groupchat_control.py:1742 gajim/privatechat_control.py:114
+#: gajim/groupchat_control.py:1681 gajim/privatechat_control.py:117
 #, 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:1767 gajim/privatechat_control.py:141
+#: gajim/groupchat_control.py:1706 gajim/privatechat_control.py:144
 #, fuzzy, python-brace-format
 msgid "You are now {show}{status}"
 msgstr "Od sada ste poznati kao %s"
 
-#: gajim/groupchat_control.py:1773 gajim/privatechat_control.py:147
+#: gajim/groupchat_control.py:1712 gajim/privatechat_control.py:150
 #, fuzzy, python-brace-format
 msgid "{nick} is now {show}{status}"
 msgstr "%(nick)s je trenutno %(status)s"
 
-#: gajim/groupchat_control.py:1790 gajim/groupchat_control.py:1819
-#: gajim/groupchat_control.py:1849 gajim/groupchat_control.py:1909
+#: gajim/groupchat_control.py:1729 gajim/groupchat_control.py:1758
+#: gajim/groupchat_control.py:1788 gajim/groupchat_control.py:1848
 #, python-brace-format
 msgid " by {actor}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1793
+#: gajim/groupchat_control.py:1732
 #, fuzzy, python-brace-format
 msgid "** Your Affiliation has been set to {affiliation}{actor}{reason}"
 msgstr ""
 "** Pripadnost %(nick)s je postavljena na %(affiliation)s od strane %(actor)s"
 
-#: gajim/groupchat_control.py:1799
+#: gajim/groupchat_control.py:1738
 #, fuzzy, python-brace-format
 msgid "** Affiliation of {nick} has been set to {affiliation}{actor}{reason}"
 msgstr "** Pripadnost %(nick)s je postavljena na %(affiliation)s"
 
-#: gajim/groupchat_control.py:1822
+#: gajim/groupchat_control.py:1761
 #, fuzzy, python-brace-format
 msgid "** Your Role has been set to {role}{actor}{reason}"
 msgstr "** Uloga %(nick)s je postavljena na %(role)s od strane %(actor)s"
 
-#: gajim/groupchat_control.py:1827
+#: gajim/groupchat_control.py:1766
 #, fuzzy, python-brace-format
 msgid "** Role of {nick} has been set to {role}{actor}{reason}"
 msgstr "** Uloga %(nick)s je postavljena na %(role)s od strane %(actor)s"
 
-#: gajim/groupchat_control.py:1852
+#: gajim/groupchat_control.py:1791
 #, fuzzy, python-brace-format
-msgid "You have been removed from the room{actor}{reason}"
+msgid "You have been removed from the group chat{actor}{reason}"
 msgstr "%(nick)s je izbačen iz sobe (%(reason)s)"
 
-#: gajim/groupchat_control.py:1857
+#: gajim/groupchat_control.py:1796
 #, python-brace-format
 msgid "You have left due to an error{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1863
+#: gajim/groupchat_control.py:1802
 #, python-brace-format
 msgid "You have been kicked{actor}{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1870
+#: gajim/groupchat_control.py:1809
 #, python-brace-format
 msgid "You have been banned{actor}{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1877 gajim/groupchat_control.py:1943
+#: gajim/groupchat_control.py:1816 gajim/groupchat_control.py:1882
 #, fuzzy
 msgid ": Affiliation changed"
 msgstr "pripadnost promjenjena"
 
-#: gajim/groupchat_control.py:1883 gajim/groupchat_control.py:1948
+#: gajim/groupchat_control.py:1822 gajim/groupchat_control.py:1887
 #, fuzzy
-msgid ": Room configuration changed to members-only"
+msgid ": Group chat configuration changed to members-only"
 msgstr "konfiguracija sobe promjenjena na members-only"
 
-#: gajim/groupchat_control.py:1912
+#: gajim/groupchat_control.py:1851
 #, fuzzy, python-brace-format
-msgid "{nick} has been removed from the room{by}{reason}"
+msgid "{nick} has been removed from the group chat{by}{reason}"
 msgstr "%(nick)s je izbačen iz sobe (%(reason)s)"
 
-#: gajim/groupchat_control.py:1922
+#: gajim/groupchat_control.py:1861
 #, python-brace-format
 msgid "{nick} has left due to an error{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1928
+#: gajim/groupchat_control.py:1867
 #, fuzzy, python-brace-format
 msgid "{nick} has been kicked{actor}{reason}"
 msgstr "%(nick)s je izbačen: %(reason)s"
 
-#: gajim/groupchat_control.py:1936
+#: gajim/groupchat_control.py:1875
 #, fuzzy, python-brace-format
 msgid "{nick} has been banned{actor}{reason}"
 msgstr "%(nick)s ima zabranjen pristup: %(reason)s"
 
-#: gajim/groupchat_control.py:1953
+#: gajim/groupchat_control.py:1892
 #, python-brace-format
 msgid "{nick} has left{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1970
+#: gajim/groupchat_control.py:1914
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s se pridružio grupnom razgovoru"
 
-#: gajim/groupchat_control.py:1985 gajim/groupchat_control.py:1990
-#: gajim/groupchat_control.py:1995 gajim/groupchat_control.py:2000
-#: gajim/groupchat_control.py:2011
-msgid "Unable to join group chat"
-msgstr "Nije moguće pridružiti se grupnom razgovoru"
-
-#: gajim/groupchat_control.py:1986
-#, fuzzy, python-format
-msgid "You are banned from group chat <b>%s</b>."
-msgstr "Zabranjen vam je pristup grupnom razgovoru %s."
-
-#: gajim/groupchat_control.py:1991
-#, fuzzy, python-format
-msgid "Remote server <b>%s</b> does not exist."
-msgstr "Grupni razgovor %s ne postoji."
-
-#: gajim/groupchat_control.py:1996
-#, fuzzy, python-format
-msgid "Group chat <b>%s</b> does not exist."
-msgstr "Grupni razgovor %s ne postoji."
-
-#: gajim/groupchat_control.py:2001
+#: gajim/groupchat_control.py:1981
 #, fuzzy
-msgid "Group chat creation is not permitted."
-msgstr "Stvaranje grupnih razgovora je ograničeno."
-
-#: gajim/groupchat_control.py:2005
-#, fuzzy
-msgid "Unable to join groupchat"
-msgstr "Nije moguće pridružiti se grupnom razgovoru"
-
-#: gajim/groupchat_control.py:2006
-#, fuzzy, python-format
-msgid "You must use your registered nickname in <b>%s</b>."
-msgstr "Morate koristiti vaš registrirani nadimak u grupnom razgovoru %s."
-
-#: gajim/groupchat_control.py:2012
-#, python-format
-msgid "You are not in the members list in groupchat %s."
-msgstr "Niste u listi članova grupnog razgovora %s."
-
-#: gajim/groupchat_control.py:2068
-msgid "Room has been destroyed"
+msgid "Group chat has been destroyed"
 msgstr "Soba je uništena"
 
-#: gajim/groupchat_control.py:2073
+#: gajim/groupchat_control.py:1986
 #, fuzzy, python-format
-msgid "You can join this room instead: xmpp:%s?join"
+msgid "You can join this group chat instead: xmpp:%s?join"
 msgstr "Možete se pridružiti ovoj sobi umjesto: %s"
 
-#: gajim/groupchat_control.py:2306
+#: gajim/groupchat_control.py:2214
 #, fuzzy
 msgid "Leave Group Chat"
 msgstr "Novi Grupni Razgovor"
 
-#: gajim/groupchat_control.py:2307
+#: gajim/groupchat_control.py:2215
 #, fuzzy
 msgid "Are you sure you want to leave this group chat?"
 msgstr "Jeste li sigurni da želite napustiti grupni razgovor \"%s\"?"
 
-#: gajim/groupchat_control.py:2308
+#: gajim/groupchat_control.py:2216
 #, fuzzy, python-format
-msgid "If you close this window, you will be disconnected from '%s'."
+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:2314
+#: gajim/groupchat_control.py:2222 gajim/roster_window.py:5177
 msgid "_Leave"
 msgstr ""
 
-#: gajim/groupchat_control.py:2377
+#: gajim/groupchat_control.py:2280 gajim/roster_window.py:3008
 #, fuzzy, python-format
 msgid "%(jid)s has been invited to this group chat"
 msgstr "%(nick)s je izbačen iz sobe (%(reason)s)"
 
-#: gajim/groupchat_control.py:2527
+#: gajim/groupchat_control.py:2463
 #, python-format
 msgid "Kicking %s"
 msgstr "Izbacujem %s"
 
-#: gajim/groupchat_control.py:2528 gajim/groupchat_control.py:2829
+#: gajim/groupchat_control.py:2464 gajim/groupchat_control.py:2765
 msgid "You may specify a reason below:"
 msgstr "Možete specificirati razlog ispod:"
 
-#: gajim/groupchat_control.py:2828
+#: gajim/groupchat_control.py:2764
 #, python-format
 msgid "Banning %s"
 msgstr "Zabranjujem pristup %s"
 
-#: gajim/chat_control.py:408
+#: gajim/chat_control.py:432
 msgid "Show a list of formattings"
 msgstr "Prikaži popis formata"
 
-#: gajim/chat_control.py:412
+#: gajim/chat_control.py:436
 #, fuzzy
 msgid "This contact does not support HTML"
 msgstr "Ovaj kontakt ne podržava prijenosa datoteka."
 
-#: gajim/chat_control.py:562
+#: gajim/chat_control.py:586
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr ""
 
-#: gajim/chat_control.py:686
+#: gajim/chat_control.py:710
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s iz grupnog razgovora %(room_name)s"
 
-#: gajim/chat_control.py:832
+#: gajim/chat_control.py:856
 #, 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.py:1160 gajim/chat_control.py:1168
+#: gajim/chat_control.py:1184 gajim/chat_control.py:1192
 #, fuzzy
 msgid "Close"
 msgstr "_Pošalji i Zatvori"
 
-#: gajim/chat_control.py:1161
+#: gajim/chat_control.py:1185
 #, fuzzy, python-format
 msgid "You just received a new message from %s"
 msgstr "Upravo ste primili novu poruku od \"%s\""
 
-#: gajim/chat_control.py:1163
+#: gajim/chat_control.py:1187
 #, fuzzy
 msgid ""
 "If you close this tab while having chat history disabled, this message will "
@@ -1201,16 +1167,16 @@ msgstr ""
 "Ako zatvorite ovu karticu, a imate povijest onemogućenu, ova poruka biti će "
 "izgubljena."
 
-#: gajim/chat_control.py:1208
+#: gajim/chat_control.py:1232
 msgid "Ping?"
 msgstr "Ping?"
 
-#: gajim/chat_control.py:1211
+#: gajim/chat_control.py:1235
 #, fuzzy, python-format
 msgid "Pong! (%s seconds)"
 msgstr "Pong! (%s s.)"
 
-#: gajim/chat_control.py:1308
+#: gajim/chat_control.py:1332
 #, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -1219,271 +1185,279 @@ msgstr ""
 "Tema: %(subject)s\n"
 "%(message)s"
 
-#: gajim/chat_control.py:1416
+#: gajim/chat_control.py:1440
 #, fuzzy, python-format
 msgid "%(name)s is now %(show)s %(status)s"
 msgstr "%(name)s je trenutno %(status)s"
 
-#: gajim/chat_control.py:1476 gajim/data/gui/application_menu.ui:32
+#: gajim/chat_control.py:1500 gajim/data/gui/application_menu.ui:32
 #: gajim/gtk/http_upload_progress.py:35
 #, fuzzy
 msgid "File Transfer"
 msgstr "Prijenosi Datoteka"
 
-#: gajim/chat_control.py:1480
+#: gajim/chat_control.py:1504
 #, fuzzy
 msgid "Size"
 msgstr "veličina: %s"
 
-#: gajim/chat_control.py:1482 gajim/chat_control.py:1546
+#: gajim/chat_control.py:1506 gajim/chat_control.py:1566
+#: gajim/gui_interface.py:190
 #: gajim/data/gui/groupchat_invitation_received.ui:77
-#: gajim/gtk/filetransfer.py:485
+#: gajim/gtk/filetransfer.py:490
 #, fuzzy
 msgid "_Accept"
 msgstr "Prihvati"
 
-#: gajim/chat_control.py:1484 gajim/chat_control.py:1548
+#: gajim/chat_control.py:1508 gajim/chat_control.py:1568
 #: gajim/data/gui/groupchat_invitation_received.ui:62
 #, fuzzy
 msgid "_Decline"
 msgstr "_Odspojen"
 
-#: gajim/chat_control.py:1506 gajim/gui_interface.py:791
-#: gajim/gui_interface.py:821 gajim/gui_interface.py:847
+#: gajim/chat_control.py:1530 gajim/gui_interface.py:777
+#: gajim/gui_interface.py:807 gajim/gui_interface.py:833
 #: gajim/gtk/notification.py:173 gajim/gtk/notification.py:278
 msgid "File Transfer Completed"
 msgstr "Razmjena Datoteka Završena"
 
-#: gajim/chat_control.py:1510 gajim/gtk/filetransfer.py:259
+#: gajim/chat_control.py:1534 gajim/gtk/filetransfer.py:258
 #, fuzzy
 msgid "Open _Folder"
 msgstr "_Otvaranje Mape Sadržaja"
 
-#: gajim/chat_control.py:1512 gajim/chat_control.py:1521
+#: gajim/chat_control.py:1536 gajim/chat_control.py:1545
+#: gajim/data/gui/groupchat_control.ui:962
+#: gajim/data/gui/groupchat_control.ui:1049
+#: gajim/data/gui/groupchat_control.ui:1155
 #, fuzzy
 msgid "_Close"
 msgstr "_Pošalji i Zatvori"
 
-#: gajim/chat_control.py:1543 gajim/gui_interface.py:484
+#: gajim/chat_control.py:1563 gajim/gui_interface.py:473
+#: gajim/data/gui/groupchat_invitation_received.ui:42
 #: gajim/gtk/notification.py:174 gajim/gtk/notification.py:195
 #: gajim/gtk/notification.py:281
-msgid "Groupchat Invitation"
+#, fuzzy
+msgid "Group Chat Invitation"
 msgstr "Poziv na Grupni Razgovor"
 
-#: gajim/chat_control.py:1568 gajim/roster_window.py:1954
+#: gajim/chat_control.py:1588 gajim/roster_window.py:1951
 msgid "Remote contact stopped transfer"
 msgstr "Druga strana je prekinula prijenos"
 
-#: gajim/chat_control.py:1570 gajim/roster_window.py:1956
+#: gajim/chat_control.py:1590 gajim/roster_window.py:1953
 msgid "Error opening file"
 msgstr "Greška pri čitanju datoteke"
 
-#: gajim/chat_control.py:1572 gajim/gtk/filetransfer.py:297
+#: gajim/chat_control.py:1592 gajim/gtk/filetransfer.py:296
 msgid "File transfer stopped"
 msgstr "Razmjena datoteka zaustavljena"
 
-#: gajim/chat_control.py:1575 gajim/gtk/filetransfer.py:275
-#: gajim/gtk/filetransfer.py:284
+#: gajim/chat_control.py:1595 gajim/gtk/filetransfer.py:274
+#: gajim/gtk/filetransfer.py:283
 msgid "File transfer cancelled"
 msgstr "Prijenos datoteka otkazan"
 
-#: gajim/chat_control.py:1576
+#: gajim/chat_control.py:1596
 msgid "Connection with peer cannot be established."
 msgstr "Vezu nije moguće ostvariti."
 
-#: gajim/application.py:72
+#: gajim/application.py:75
 #, fuzzy
 msgid "Show the application's version"
 msgstr "Koristi t_ray ikonu"
 
-#: gajim/application.py:79
+#: gajim/application.py:82
 #, fuzzy
 msgid "Show only critical errors"
 msgstr "Prikaži samo u _listi kontakata"
 
-#: gajim/application.py:86
+#: gajim/application.py:89
 msgid "Separate profile files completely (even history database and plugins)"
 msgstr ""
 
-#: gajim/application.py:94
+#: gajim/application.py:97
 msgid "Print XML stanzas and other debug information"
 msgstr ""
 
-#: gajim/application.py:101
+#: gajim/application.py:104
 #, fuzzy
 msgid "Use defined profile in configuration directory"
 msgstr "Napredni Uređivač Postavki"
 
-#: gajim/application.py:109
+#: gajim/application.py:112
 #, fuzzy
 msgid "Set configuration directory"
 msgstr "Konfiguracija Sobe"
 
-#: gajim/application.py:117
+#: gajim/application.py:120
 msgid "Configure logging system"
 msgstr ""
 
-#: gajim/application.py:125
+#: gajim/application.py:128
 #, fuzzy
 msgid "Show all warnings"
 msgstr "Prikaži Sve _Događaje na Čekanju"
 
-#: gajim/application.py:132
+#: gajim/application.py:135
 msgid "Open IPython shell"
 msgstr ""
 
-#: gajim/application.py:139
+#: gajim/application.py:142
 msgid "Pops up a window with the next pending event"
 msgstr "Prikazuje prozor sa sljedećim događajem na čekanju"
 
-#: gajim/application.py:145 gajim/data/gui/shortcuts_window.ui:203
+#: gajim/application.py:148 gajim/data/gui/shortcuts_window.ui:203
 #: data/org.gajim.Gajim.desktop.in:21
 #, fuzzy
 msgid "Start a new chat"
 msgstr "Započeti Razgovor"
 
-#: gajim/application.py:152
+#: gajim/application.py:155
 msgid "Simulate loss of connectivity"
 msgstr ""
 
-#: gajim/application.py:159
+#: gajim/application.py:162
 msgid "Simulate regaining connectivity"
 msgstr ""
 
-#: gajim/application.py:201 gajim/gui_interface.py:133
+#: gajim/application.py:204 gajim/gui_interface.py:133
 msgid "Database Error"
 msgstr "Pogreška Baze Podataka"
 
-#: gajim/roster_window.py:294 gajim/roster_window.py:1030
+#: gajim/roster_window.py:291 gajim/roster_window.py:1027
 msgid "Merged accounts"
 msgstr "Spojeni računi"
 
-#: gajim/roster_window.py:853 gajim/roster_window.py:1631
-#: gajim/roster_window.py:1664 gajim/roster_window.py:1715
-#: gajim/roster_window.py:1717 gajim/roster_window.py:1872
-#: gajim/roster_window.py:2531 gajim/roster_window.py:5025
-#: gajim/common/contacts.py:188 gajim/common/contacts.py:447
-#: gajim/common/helpers.py:83 gajim/gtk/discovery.py:129
-#: gajim/gtk/discovery.py:130 gajim/gtk/discovery.py:1416
+#: gajim/roster_window.py:850 gajim/roster_window.py:1628
+#: gajim/roster_window.py:1661 gajim/roster_window.py:1712
+#: gajim/roster_window.py:1714 gajim/roster_window.py:1869
+#: gajim/roster_window.py:2528 gajim/roster_window.py:4331
+#: gajim/roster_window.py:4964 gajim/common/contacts.py:204
+#: gajim/common/contacts.py:463 gajim/common/helpers.py:86
+#: gajim/gtk/discovery.py:127 gajim/gtk/discovery.py:128
+#: gajim/gtk/discovery.py:1414
 msgid "Transports"
 msgstr "Prijenosi"
 
-#: gajim/roster_window.py:1723 gajim/roster_window.py:1725
-#: gajim/roster_window.py:4995 gajim/gui_interface.py:1613
-#: gajim/gui_interface.py:1639 gajim/common/contacts.py:186
-#: gajim/common/helpers.py:83 gajim/common/modules/adhoc_commands.py:245
-msgid "Groupchats"
+#: gajim/roster_window.py:1720 gajim/roster_window.py:1722
+#: gajim/roster_window.py:4331 gajim/roster_window.py:4934
+#: gajim/gui_interface.py:1527 gajim/common/contacts.py:202
+#: gajim/common/helpers.py:86 gajim/common/modules/adhoc_commands.py:245
+#, fuzzy
+msgid "Group chats"
 msgstr "Grupni Razgovori"
 
-#: gajim/roster_window.py:2012
+#: gajim/roster_window.py:2009
 #, fuzzy
 msgid "Authorization sent"
 msgstr "Odobrenje je poslano"
 
-#: gajim/roster_window.py:2013
+#: gajim/roster_window.py:2010
 #, fuzzy, python-format
 msgid "\"%s\" will now see your status."
 msgstr "Sada će \"%s\" znati vaš status."
 
-#: gajim/roster_window.py:2031
+#: gajim/roster_window.py:2028
 msgid "Subscription request has been sent"
 msgstr "Zahtjev za pretplatom je poslan"
 
-#: gajim/roster_window.py:2032
-#, python-format
-msgid "If \"%s\" accepts this request you will know his or her status."
+#: gajim/roster_window.py:2029
+#, 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:2046
+#: gajim/roster_window.py:2043
 #, fuzzy
 msgid "Authorization removed"
 msgstr "Odobrenje je uklonjeno"
 
-#: gajim/roster_window.py:2047
+#: gajim/roster_window.py:2044
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Sada će vas \"%s\" uvijek vidjeti kao odspojenog."
 
-#: gajim/roster_window.py:2250 gajim/roster_window.py:3504
+#: gajim/roster_window.py:2247 gajim/roster_window.py:3460
 msgid "Disconnect for Invisibility"
 msgstr ""
 
-#: gajim/roster_window.py:2251 gajim/roster_window.py:3505
+#: gajim/roster_window.py:2248 gajim/roster_window.py:3461
 msgid "You are participating in one or more group chats"
 msgstr "Sudjelujete u jednom ili više grupnih razovora"
 
-#: gajim/roster_window.py:2252 gajim/roster_window.py:3506
+#: gajim/roster_window.py:2249 gajim/roster_window.py:3462
 #, fuzzy
 msgid ""
-"Changing your status to invisible will result in disconnection from those "
-"group chats.\n"
+"Changing your status to invisible will result in you leaving those group "
+"chats.\n"
 "Are you sure you want to go invisible?"
 msgstr ""
 "Promjena vašeg statusa u nevidljivo rezultirati će odspajanjem sa tih "
 "grupnih razgovora. Jeste li sigurni da želite ići na nevidljivo?"
 
-#: gajim/roster_window.py:2257 gajim/roster_window.py:3512
-#: gajim/roster_window.py:5238 gajim/data/gui/gc_control_popup_menu.ui:120
+#: gajim/roster_window.py:2254 gajim/roster_window.py:3468
+#: gajim/data/gui/gc_control_popup_menu.ui:120
 msgid "_Disconnect"
 msgstr "_Odspoji"
 
-#: gajim/roster_window.py:2285
+#: gajim/roster_window.py:2282
 #, fuzzy
 msgid "desynced"
 msgstr "desinkroniziran"
 
-#: gajim/roster_window.py:2353 gajim/data/gui/shortcuts_window.ui:224
+#: gajim/roster_window.py:2350 gajim/data/gui/shortcuts_window.ui:224
 #, fuzzy
 msgid "Quit Gajim"
 msgstr "Gajim"
 
-#: gajim/roster_window.py:2354
+#: gajim/roster_window.py:2351
 #, fuzzy
 msgid "You are about to quit Gajim"
 msgstr "Jeste li sigurni da želite zatvoriti Gajim?"
 
-#: gajim/roster_window.py:2355
+#: gajim/roster_window.py:2352
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Jeste li sigurni da želite zatvoriti Gajim?"
 
-#: gajim/roster_window.py:2356
+#: gajim/roster_window.py:2353
 #, fuzzy
 msgid "_Always quit when closing Gajim"
 msgstr "Uvijek zatvori Gajim"
 
-#: gajim/roster_window.py:2359 gajim/roster_window.py:2455
-#: gajim/roster_window.py:2495 gajim/data/gui/systray_context_menu.ui:90
+#: gajim/roster_window.py:2356 gajim/roster_window.py:2452
+#: gajim/roster_window.py:2492 gajim/data/gui/systray_context_menu.ui:83
 #, fuzzy
 msgid "_Quit"
 msgstr "_Izlaz"
 
-#: gajim/roster_window.py:2448
+#: gajim/roster_window.py:2445
 #, fuzzy
 msgid "Stop File Transfers"
 msgstr "Prijenosi Datoteka"
 
-#: gajim/roster_window.py:2449
+#: gajim/roster_window.py:2446
 #, fuzzy
 msgid "You still have running file transfers"
 msgstr "Prekini transfer datoteke"
 
-#: gajim/roster_window.py:2450
+#: gajim/roster_window.py:2447
 msgid ""
 "If you quit now, the file(s) being transferred will be lost.\n"
 "Do you still want to quit?"
 msgstr ""
 
-#: gajim/roster_window.py:2488
+#: gajim/roster_window.py:2485
 #, fuzzy
 msgid "Unread Messages"
 msgstr "Nepročitani događaji"
 
-#: gajim/roster_window.py:2489
+#: gajim/roster_window.py:2486
 #, fuzzy
 msgid "You still have unread messages"
 msgstr "Imte nepročitane poruke"
 
-#: gajim/roster_window.py:2490
+#: gajim/roster_window.py:2487
 #, fuzzy
 msgid ""
 "Messages will only be available for reading them later if storing chat "
@@ -1492,20 +1466,20 @@ msgstr ""
 "Poruke će biti dostupne za čitanje i kasnije ukoliko imate omogućenu "
 "povijest i kontakt je na vašoj listi."
 
-#: gajim/roster_window.py:2760
+#: gajim/roster_window.py:2753
 msgid "You have unread messages"
 msgstr "Imte nepročitane poruke"
 
-#: gajim/roster_window.py:2761
+#: gajim/roster_window.py:2754
 msgid "You must read them before removing this transport."
 msgstr "Morate ih pročitati prije uklanjanja ovog prijenosa."
 
-#: gajim/roster_window.py:2764
+#: gajim/roster_window.py:2757
 #, fuzzy, python-format
 msgid "Transport '%s' will be removed"
 msgstr "Prijenos \"%s\" biti će uklonjen"
 
-#: gajim/roster_window.py:2765
+#: gajim/roster_window.py:2758
 #, fuzzy
 msgid ""
 "You will no longer be able to send and receive messages from and to contacts "
@@ -1514,11 +1488,11 @@ msgstr ""
 "Više nećete biti u mogućnosti razmjenjivati poruka sa kontaktima koji "
 "koriste ovaj prijenos."
 
-#: gajim/roster_window.py:2768
+#: gajim/roster_window.py:2761
 msgid "Transports will be removed"
 msgstr "Prijenos će biti uklonjen"
 
-#: gajim/roster_window.py:2773
+#: gajim/roster_window.py:2766
 #, fuzzy, python-format
 msgid ""
 "You will no longer be able to send and receive messages from and to contacts "
@@ -1528,22 +1502,22 @@ msgstr ""
 "Više nećete biti u mogućnosti razmjenjivati poruka sa kontaktima koji "
 "koriste ovaj prijenos."
 
-#: gajim/roster_window.py:2777
+#: gajim/roster_window.py:2770
 #, fuzzy
 msgid "Remove Transport"
 msgstr "Prikaži _Prijenose"
 
-#: gajim/roster_window.py:2844
+#: gajim/roster_window.py:2837
 #, fuzzy
 msgid "Block Contact"
 msgstr "Blokirani Kontakti"
 
-#: gajim/roster_window.py:2845
+#: gajim/roster_window.py:2838
 #, fuzzy
 msgid "Really block this contact?"
 msgstr "Je li OpenPGP omogućen za ovog kontakta?"
 
-#: gajim/roster_window.py:2846
+#: gajim/roster_window.py:2839
 #, fuzzy
 msgid ""
 "This contact will see you offline and you will not receive any messages sent "
@@ -1552,64 +1526,59 @@ msgstr ""
 "Uvijek će te biti nedostupni za ovaj kontakt, i poruke koje pošalje nećete "
 "primiti."
 
-#: gajim/roster_window.py:2851
+#: gajim/roster_window.py:2844
 #, fuzzy
 msgid "_Block Contact"
 msgstr "Blokirani Kontakti"
 
-#: gajim/roster_window.py:2896
+#: gajim/roster_window.py:2889
 msgid "Rename Contact"
 msgstr "Preimenuj Kontakt"
 
-#: gajim/roster_window.py:2897
+#: gajim/roster_window.py:2890
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Unesite novi nadimak za kontakt %s"
 
-#: gajim/roster_window.py:2904
+#: gajim/roster_window.py:2897
 msgid "Rename Group"
 msgstr "Preimenuj Grupu"
 
-#: gajim/roster_window.py:2905
+#: gajim/roster_window.py:2898
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Unesite novo ime za grupu %s"
 
-#: gajim/roster_window.py:2953 gajim/roster_window.py:2954
+#: gajim/roster_window.py:2946 gajim/roster_window.py:2947
 msgid "Remove Group"
 msgstr "Ukloni Grupu"
 
-#: gajim/roster_window.py:2955
+#: gajim/roster_window.py:2948
 #, fuzzy, python-format
 msgid "Do you want to remove %s from the contact list?"
 msgstr "Želite li ukloniti grupu %s sa liste kontakata?"
 
-#: gajim/roster_window.py:2956
+#: gajim/roster_window.py:2949
 #, fuzzy
 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:3044
-#, fuzzy, python-format
-msgid "%(jid)s has been invited in this room"
-msgstr "%(nick)s je izbačen iz sobe (%(reason)s)"
-
-#: gajim/roster_window.py:3353
+#: gajim/roster_window.py:3309
 #, fuzzy
 msgid "Remove Contact"
 msgstr "Preimenuj Kontakt"
 
-#: gajim/roster_window.py:3354
+#: gajim/roster_window.py:3310
 #, fuzzy
 msgid "Remove contact from contact list"
 msgstr "Uklanja kontakt sa liste"
 
-#: gajim/roster_window.py:3355
+#: gajim/roster_window.py:3311
 #, 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:3364 gajim/roster_window.py:3384
+#: gajim/roster_window.py:3320 gajim/roster_window.py:3340
 #, fuzzy
 msgid ""
 "By removing this contact you also remove authorization. This means the "
@@ -1619,21 +1588,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:3375
+#: gajim/roster_window.py:3331
 msgid "Do you want to continue?"
 msgstr "Želite li nastaviti?"
 
-#: gajim/roster_window.py:3386
+#: gajim/roster_window.py:3342
 #, 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:3393
+#: gajim/roster_window.py:3349
 #, fuzzy
 msgid "Remove contacts from contact list"
 msgstr "Uklanja kontakt sa liste"
 
-#: gajim/roster_window.py:3399
+#: gajim/roster_window.py:3355
 #, fuzzy, python-format
 msgid ""
 "By removing the following contacts, you will also remove authorization. This "
@@ -1645,25 +1614,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:3403
+#: gajim/roster_window.py:3359
 #, fuzzy
 msgid "Remove Contacts"
 msgstr "Preimenuj Kontakt"
 
-#: gajim/roster_window.py:3423
+#: gajim/roster_window.py:3379
 msgid "No account available"
 msgstr "Nema dostupnih računa"
 
-#: gajim/roster_window.py:3424
+#: gajim/roster_window.py:3380
 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:4060
+#: gajim/roster_window.py:4011
 msgid "Metacontacts storage not supported by your server"
 msgstr "Spremanje metakontakata nije podržano na vašem poslužitelju"
 
-#: gajim/roster_window.py:4062
+#: gajim/roster_window.py:4013
 #, fuzzy
 msgid ""
 "Your server does not support storing metacontacts information. So this "
@@ -1672,13 +1641,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:4159
+#: gajim/roster_window.py:4110
 #, fuzzy
 msgid "You are about to create a metacontact"
 msgstr ""
 "Spremate se stvoriti metakontakt. Jeste li sigurni da želite nastaviti?"
 
-#: gajim/roster_window.py:4160
+#: gajim/roster_window.py:4111
 #, fuzzy
 msgid ""
 "Metacontacts are a way to regroup several contacts in one single contact. "
@@ -1689,26 +1658,26 @@ msgstr ""
 "oni se koriste kada ista osoba ima nekoliko Jabber računa ili računa "
 "prijenosa."
 
-#: gajim/roster_window.py:4164
+#: gajim/roster_window.py:4115
 #, fuzzy
 msgid "Create Metacontact"
 msgstr "Preimenuj Kontakt"
 
-#: gajim/roster_window.py:4170
+#: gajim/roster_window.py:4121 gajim/data/gui/groupchat_creation.ui:317
 #, fuzzy
 msgid "_Create"
 msgstr "Kreativan"
 
-#: gajim/roster_window.py:4287
+#: gajim/roster_window.py:4238
 msgid "Invalid file URI:"
 msgstr "Neispravan URI datoteke:"
 
-#: gajim/roster_window.py:4298
+#: gajim/roster_window.py:4249
 #, fuzzy
 msgid "Send file?"
 msgstr "Pošalji _Datoteku"
 
-#: gajim/roster_window.py:4299
+#: gajim/roster_window.py:4250
 #, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
@@ -1716,98 +1685,89 @@ 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:4451
+#: gajim/roster_window.py:4401
 #, fuzzy, python-format
 msgid "Send %(from)s to %(to)s"
 msgstr "Poslati %s prema %s"
 
-#: gajim/roster_window.py:4464
+#: gajim/roster_window.py:4414
 #, fuzzy, python-format
 msgid "Make %s first contact"
 msgstr "Učini %s i %s pseudokontaktima"
 
-#: gajim/roster_window.py:4469
+#: gajim/roster_window.py:4419
 #, fuzzy, python-format
 msgid "Make %(contact1)s and %(contact2)s metacontacts"
 msgstr "Učini %s i %s pseudokontaktima"
 
-#: gajim/roster_window.py:4825 gajim/roster_window.py:4923
+#: gajim/roster_window.py:4775 gajim/roster_window.py:4862
 msgid "_Change Status Message"
 msgstr "_Izmjena Statusne Poruke"
 
-#: gajim/roster_window.py:4845
+#: gajim/roster_window.py:4795
 msgid "Publish Tune"
 msgstr "Objavi Glazbu"
 
-#: gajim/roster_window.py:4856
+#: gajim/roster_window.py:4806
 #, fuzzy
 msgid "Publish Location"
 msgstr "Objavi Glazbu"
 
-#: gajim/roster_window.py:4868
-#, fuzzy
-msgid "Configure Services…"
-msgstr "Postavi Usluge..."
-
-#: gajim/roster_window.py:4997
+#: gajim/roster_window.py:4936
 msgid "_Maximize All"
 msgstr "_Maksimiziraj Sve"
 
-#: gajim/roster_window.py:5004 gajim/roster_window.py:5146
+#: gajim/roster_window.py:4943 gajim/roster_window.py:5085
 msgid "Send Group M_essage"
 msgstr "Pošalji _Grupnu Poruku"
 
-#: gajim/roster_window.py:5011
+#: gajim/roster_window.py:4950
 msgid "To all users"
 msgstr "Svim korisnicima"
 
-#: gajim/roster_window.py:5015
+#: gajim/roster_window.py:4954
 msgid "To all online users"
 msgstr "Svim spojenim korisnicima"
 
-#: gajim/roster_window.py:5027 gajim/roster_window.py:5152
+#: gajim/roster_window.py:4966 gajim/roster_window.py:5091
 #: gajim/data/gui/gc_occupants_menu.ui:110
 #: gajim/data/gui/contact_context_menu.ui:36
 msgid "In_vite to"
 msgstr "Pozo_vi u"
 
-#: gajim/roster_window.py:5162
+#: gajim/roster_window.py:5101
 msgid "_Manage Contacts"
 msgstr "_Upravljanje Kontaktima"
 
-#: gajim/roster_window.py:5168
+#: gajim/roster_window.py:5107
 #, fuzzy
 msgid "Edit _Groups…"
 msgstr "Izmjeni _Grupe"
 
-#: gajim/roster_window.py:5189 gajim/data/gui/filetransfers.ui:12
+#: gajim/roster_window.py:5128 gajim/data/gui/filetransfers.ui:12
 #: gajim/data/gui/remove_account_window.ui:134
 msgid "_Remove"
 msgstr "_Ukloni"
 
-#: gajim/roster_window.py:5226
+#: gajim/roster_window.py:5165
 msgid "_Maximize"
 msgstr "_Maksimiziraj"
 
-#: gajim/roster_window.py:5233
+#: gajim/roster_window.py:5172
 msgid "_Reconnect"
 msgstr "_Ponovno spajanje"
 
-#: gajim/roster_window.py:5254 gajim/data/gui/gc_occupants_menu.ui:170
+#: gajim/roster_window.py:5193 gajim/data/gui/gc_occupants_menu.ui:170
 #: gajim/data/gui/gc_control_popup_menu.ui:113
 #: gajim/data/gui/contact_context_menu.ui:205
 msgid "_History"
 msgstr "_Povijest razgovora"
 
-#: gajim/roster_window.py:5335 gajim/data/gui/application_menu.ui:86
+#: gajim/roster_window.py:5274 gajim/data/gui/application_menu.ui:83
 #: gajim/data/gui/history_window.ui:57
 msgid "History Manager"
 msgstr "Upravitelj Zapisima"
 
-#: gajim/roster_window.py:5343
-msgid "_Join New Group Chat"
-msgstr "_Pridruži se Novom Grupnom Razgovoru"
-
 #: gajim/dataforms_widget.py:585
 #, fuzzy
 msgid "Unable to load image"
@@ -1931,256 +1891,272 @@ msgstr "Tema: %s\n"
 msgid "Write a message…"
 msgstr "Nova Privatna Poruka"
 
-#: gajim/message_window.py:250
+#: gajim/message_window.py:356
+#, fuzzy
+msgid "Close Tabs"
+msgstr "_Pošalji i Zatvori"
+
+#: gajim/message_window.py:357
 msgid "You are going to close several tabs"
 msgstr "Zatvorit će te nekoliko kartica"
 
-#: gajim/message_window.py:251
+#: gajim/message_window.py:358
 msgid "Do you really want to close them all?"
 msgstr "Da li ih zaista želite sve zatvoriti?"
 
-#: gajim/message_window.py:539
+#: gajim/message_window.py:514
 #, fuzzy
 msgid "?Noun:Chats"
 msgstr "Grupni Razgovori"
 
-#: gajim/message_window.py:543
+#: gajim/message_window.py:518
 #, fuzzy
 msgid "Group Chats"
 msgstr "Grupni Razgovori"
 
-#: gajim/message_window.py:547
+#: gajim/message_window.py:522
 msgid "Private Chats"
 msgstr "Privanti Razgovori"
 
-#: gajim/message_window.py:553
+#: gajim/message_window.py:528
 msgid "Messages"
 msgstr "Poruke"
 
-#: gajim/gui_interface.py:173
+#: gajim/gui_interface.py:170
+#, 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:175
 msgid "Do you accept this request?"
 msgstr "Prihvaćate li ovaj zahtjev?"
 
-#: gajim/gui_interface.py:175
-#, python-format
-msgid "Do you accept this request on account %s?"
+#: gajim/gui_interface.py:177
+#, 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:178
-#, 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:182
+#, fuzzy
+msgid "Authorization"
+msgstr "Odobrenje je poslano"
+
+#: gajim/gui_interface.py:186 gajim/gui_interface.py:420
+#: gajim/gtk/filetransfer.py:338
+#, fuzzy
+msgid "_No"
+msgstr "Ništa"
 
-#: gajim/gui_interface.py:194 gajim/gtk/notification.py:175
+#: gajim/gui_interface.py:205 gajim/gtk/notification.py:175
 #: gajim/gtk/notification.py:197
 msgid "Connection Failed"
 msgstr "Veza Prekinuta"
 
-#: gajim/gui_interface.py:279 gajim/gui_interface.py:529
-msgid "Password Required"
-msgstr "Potrebna Lozinka"
-
-#: gajim/gui_interface.py:280
-#, python-format
-msgid "A Password is required to join the room %s. Please type it."
-msgstr ""
-"Potrebna je lozinka za pridruživanje grupnom razgovoru %s. Molim unesite je."
-
-#: gajim/gui_interface.py:342 gajim/gui_interface.py:346
+#: gajim/gui_interface.py:325 gajim/gui_interface.py:329
 #, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr "Greška %(code)s: %(msg)s"
 
-#: gajim/gui_interface.py:357 gajim/gui_interface.py:376
+#: gajim/gui_interface.py:340 gajim/gui_interface.py:359
 #: gajim/common/modules/message.py:122
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "greška prilikom slanja %(message)s ( %(error)s )"
 
-#: gajim/gui_interface.py:401 gajim/gtk/notification.py:175
+#: gajim/gui_interface.py:384 gajim/gtk/notification.py:175
 msgid "Subscription request"
 msgstr "Zahtjev za pretplatom"
 
-#: gajim/gui_interface.py:413 gajim/common/contacts.py:184
-#: gajim/common/helpers.py:83
+#: gajim/gui_interface.py:396 gajim/common/contacts.py:200
+#: gajim/common/helpers.py:86
 msgid "Observers"
 msgstr "Posmatrači"
 
-#: gajim/gui_interface.py:422
+#: gajim/gui_interface.py:405
 msgid "Authorization accepted"
 msgstr "Autorizacija prihvaćena"
 
-#: gajim/gui_interface.py:423
+#: gajim/gui_interface.py:406
 #, 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:431
-#, python-format
-msgid "Contact \"%s\" removed subscription from you"
+#: gajim/gui_interface.py:415
+#, fuzzy
+msgid "Subscription Removed"
+msgstr "Zahtjev za Pretplatom"
+
+#: gajim/gui_interface.py:416
+#, fuzzy, python-format
+msgid "Contact '%s' removed subscription from you"
 msgstr "Kontankt \"%s\" je uklonio pretplatu od vas"
 
-#: gajim/gui_interface.py:432
+#: gajim/gui_interface.py:417
 #, fuzzy
 msgid ""
-"You will always see them as offline.\n"
+"You will always see this contact as offline.\n"
 "Do you want to remove them from your contact list?"
 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:453 gajim/gtk/notification.py:176
+#: gajim/gui_interface.py:442 gajim/gtk/notification.py:176
 msgid "Unsubscribed"
 msgstr "Pretplata uklonjena"
 
-#: gajim/gui_interface.py:465
+#: gajim/gui_interface.py:454
 #, python-format
 msgid "%(jid)s declined the invitation: %(reason)s"
 msgstr ""
 
-#: gajim/gui_interface.py:469
+#: gajim/gui_interface.py:458
 #, python-format
 msgid "%(jid)s declined the invitation"
 msgstr ""
 
-#: gajim/gui_interface.py:485
+#: gajim/gui_interface.py:474
 #, fuzzy, python-brace-format
 msgid "You are invited to {room} by {user}"
 msgstr "Pozvani ste na grupni razgovor"
 
-#: gajim/gui_interface.py:506
+#: gajim/gui_interface.py:495
 #, fuzzy
 msgid "Certificate Passphrase Required"
 msgstr "Certifikat je istekao"
 
-#: gajim/gui_interface.py:507
+#: gajim/gui_interface.py:496
 #, 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:516 gajim/gtk/accounts.py:963
+#: gajim/gui_interface.py:505 gajim/gtk/accounts.py:966
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Unesite svoju lozinku za račun %s"
 
-#: gajim/gui_interface.py:529 gajim/gtk/accounts.py:964
+#: gajim/gui_interface.py:518
+msgid "Password Required"
+msgstr "Potrebna Lozinka"
+
+#: gajim/gui_interface.py:518 gajim/gtk/accounts.py:967
 msgid "Save password"
 msgstr "Spremiti lozinku"
 
-#: gajim/gui_interface.py:601 gajim/gui_interface.py:632
+#: gajim/gui_interface.py:587 gajim/gui_interface.py:618
+#: gajim/gtk/filetransfer.py:332 gajim/gtk/filetransfer.py:333
 #: gajim/gtk/notification.py:173 gajim/gtk/notification.py:276
 msgid "File Transfer Error"
 msgstr "Greška u Razmjeni Datoteka"
 
-#: gajim/gui_interface.py:666
+#: gajim/gui_interface.py:652
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s vam želi poslati datoteku."
 
-#: gajim/gui_interface.py:668 gajim/gtk/filetransfer.py:479
+#: gajim/gui_interface.py:654 gajim/gtk/filetransfer.py:484
 #: gajim/gtk/notification.py:172 gajim/gtk/notification.py:274
 msgid "File Transfer Request"
 msgstr "Zahtjev Razmjene Datoteka"
 
-#: gajim/gui_interface.py:767
+#: gajim/gui_interface.py:753
 #, fuzzy
 msgid "Remote Contact Stopped Transfer"
 msgstr "Druga strana je prekinula prijenos"
 
-#: gajim/gui_interface.py:772
+#: gajim/gui_interface.py:758
 #, fuzzy
 msgid "Error Opening File"
 msgstr "Greška pri čitanju datoteke"
 
-#: gajim/gui_interface.py:782
+#: gajim/gui_interface.py:768
 #, fuzzy
 msgid "SSL Certificate Error"
 msgstr "Greška SSL certifikata"
 
-#: gajim/gui_interface.py:795 gajim/gui_interface.py:826
-#: gajim/gui_interface.py:853 gajim/gtk/notification.py:174
+#: gajim/gui_interface.py:781 gajim/gui_interface.py:812
+#: gajim/gui_interface.py:839 gajim/gtk/notification.py:174
 #: gajim/gtk/notification.py:279
 msgid "File Transfer Stopped"
 msgstr "Razmjena Datoteka Zaustavljena"
 
-#: gajim/gui_interface.py:799
+#: gajim/gui_interface.py:785
 #, fuzzy
 msgid "File Transfer Failed"
 msgstr "Prijenosi Datoteka"
 
-#: gajim/gui_interface.py:822
+#: gajim/gui_interface.py:808
 #, fuzzy, python-format
 msgid "%(filename)s received from %(name)s."
 msgstr "Prijenos %(filename)s od %(name)s je zaustavljen."
 
-#: gajim/gui_interface.py:827
+#: gajim/gui_interface.py:813
 #, 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:833
+#: gajim/gui_interface.py:819
 #, 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:848
+#: gajim/gui_interface.py:834
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Uspješno ste poslali %(filename)s %(name)s"
 
-#: gajim/gui_interface.py:854
+#: gajim/gui_interface.py:840
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Prijenos %(filename)s %(name)s je zaustavljen. "
 
-#: gajim/gui_interface.py:860
+#: gajim/gui_interface.py:846
 #, 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:971
+#: gajim/gui_interface.py:957
 msgid "Username Conflict"
 msgstr "Konflikt korisničkog imena"
 
-#: gajim/gui_interface.py:972
+#: gajim/gui_interface.py:958
 msgid "Please type a new username for your local account"
 msgstr "Molim unesite novo korisničko ime za vaš lokalni račun"
 
-#: gajim/gui_interface.py:995
+#: gajim/gui_interface.py:981
 msgid "Resource Conflict"
 msgstr "Konflikt Resursa"
 
-#: gajim/gui_interface.py:996
+#: gajim/gui_interface.py:982
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
 msgstr "Već ste spojeni na ovaj račun sa istim resursom. Molim unesite novi."
 
-#: gajim/gui_interface.py:1053
+#: gajim/gui_interface.py:1039
 #, fuzzy, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s vam želi poslati datoteku."
 
-#: gajim/gui_interface.py:1055
+#: gajim/gui_interface.py:1041
 #, fuzzy
 msgid "Voice Chat Request"
 msgstr "Zahtjev Razmjene Datoteka"
 
-#: gajim/gui_interface.py:1123 gajim/gtk/account_wizard.py:312
+#: gajim/gui_interface.py:1109 gajim/gtk/account_wizard.py:312
 msgid "Certificate Already in File"
 msgstr "Certifikat je već na listi"
 
-#: gajim/gui_interface.py:1124 gajim/gtk/account_wizard.py:313
+#: gajim/gui_interface.py:1110 gajim/gtk/account_wizard.py:313
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr "Ovaj certifikat je već u datoteci %s, neće biti ponovno dodan."
 
-#: gajim/gui_interface.py:1145
+#: gajim/gui_interface.py:1131
 #, fuzzy, python-format
 msgid "The authenticity of the %s certificate could be invalid"
 msgstr "Autentičnost certifikata %s bi mogla biti neispravna."
 
-#: gajim/gui_interface.py:1148
+#: gajim/gui_interface.py:1134
 #, python-format
 msgid ""
 "\n"
@@ -2189,7 +2165,7 @@ msgstr ""
 "\n"
 "Nepoznata SSL greška: %d"
 
-#: gajim/gui_interface.py:1150
+#: gajim/gui_interface.py:1136
 #, python-format
 msgid ""
 "\n"
@@ -2198,11 +2174,11 @@ msgstr ""
 "\n"
 "SSL Greška: <b>%s</b>"
 
-#: gajim/gui_interface.py:1155
+#: gajim/gui_interface.py:1141
 msgid "Error verifying SSL certificate"
 msgstr "Greška kod ovjere SSL certifikata"
 
-#: gajim/gui_interface.py:1156
+#: gajim/gui_interface.py:1142
 #, fuzzy, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your XMPP server: "
@@ -2213,7 +2189,7 @@ msgstr ""
 "%(error)s\n"
 "Još uvijek se želite povezati na ovaj poslužitelj?"
 
-#: gajim/gui_interface.py:1160 gajim/gtk/account_wizard.py:412
+#: gajim/gui_interface.py:1146 gajim/gtk/account_wizard.py:413
 #, fuzzy, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -2226,170 +2202,160 @@ msgstr ""
 "SHA1 otisak certifikata:\n"
 "%s"
 
-#: gajim/gui_interface.py:1166
+#: gajim/gui_interface.py:1152
 msgid "Ignore this error for this certificate."
 msgstr "Ignoriraj ovu grešku za ovaj certifikat."
 
-#: gajim/gui_interface.py:1174
+#: gajim/gui_interface.py:1160
 #, fuzzy, python-format
 msgid "SSL Certificate Verification for %s"
 msgstr "Greška SSL certifikata"
 
-#: gajim/gui_interface.py:1442 gajim/gtk/join_groupchat.py:235
-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/gui_interface.py:1448
-#, fuzzy
-msgid "JID is not a Groupchat"
-msgstr "Ovo nije grupni razgovor"
-
-#: gajim/gui_interface.py:1579
-msgid "This is not a group chat"
-msgstr "Ovo nije grupni razgovor"
-
-#: gajim/gui_interface.py:1580
-#, python-format
-msgid ""
-"%(room_jid)s is already in your roster. Please check if %(room_jid)s is a "
-"correct group chat name. If it is, delete it from your roster and try "
-"joining the group chat again."
-msgstr ""
-
-#: gajim/gui_interface.py:1604 gajim/dialog_messages.py:58
+#: gajim/gui_interface.py:1577
 msgid "You cannot join a group chat while you are invisible"
 msgstr "Nije moguće pridruživanje grupnom razgovoru dok ste nevidljivi"
 
-#: gajim/gui_interface.py:2037
+#: gajim/gui_interface.py:1976
 msgid "Could not save your settings and preferences"
 msgstr "Nije moguće spremanje vaših postavki"
 
-#: gajim/gui_interface.py:2098
+#: gajim/gui_interface.py:2037
 msgid "Gajim: IPython Console"
 msgstr ""
 
-#: gajim/dialog_messages.py:32
+#: gajim/dialog_messages.py:31 gajim/dialog_messages.py:36
+#: gajim/gtk/single_message.py:305 gajim/gtk/account_wizard.py:229
 #, fuzzy
-msgid "You can not start a new conversation unless you are connected."
-msgstr "Ne možete se pridružiti grupnom razgovoru ukoliko niste spojeni."
-
-#: gajim/dialog_messages.py:36 gajim/dialog_messages.py:41
-#: gajim/gtk/single_message.py:305 gajim/gtk/join_groupchat.py:211
-#: gajim/gtk/account_wizard.py:229
-msgid "Invalid JID"
-msgstr "Neispravan JID"
+msgid "Invalid XMPP Address"
+msgstr "Neispravna Datoteka"
 
-#: gajim/dialog_messages.py:42 gajim/gtk/single_message.py:306
-#, python-format
-msgid "It is not possible to send a message to %s, this JID is not valid."
+#: gajim/dialog_messages.py:37
+#, 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/dialog_messages.py:47
-msgid "Unread events"
+#: gajim/dialog_messages.py:42
+#, fuzzy
+msgid "Unread Events"
 msgstr "Nepročitani događaji"
 
-#: gajim/dialog_messages.py:48
-msgid "Read all pending events before removing this account."
+#: gajim/dialog_messages.py:43
+#, fuzzy
+msgid "Read or acknowledge all pending events before removing this account."
 msgstr "Pročitajte sve događaje na čekanju prije uklanjanja ovog računa."
 
-#: gajim/dialog_messages.py:52
+#: gajim/dialog_messages.py:48
 #, fuzzy
 msgid "Invalid Form"
 msgstr "Neispravna soba"
 
-#: gajim/dialog_messages.py:53
+#: gajim/dialog_messages.py:49
 #, fuzzy
 msgid "The form is not filled correctly."
 msgstr "Nadimak sadrži nedozvoljene znakove."
 
-#: gajim/dialog_messages.py:57 gajim/common/helpers.py:309
+#: gajim/dialog_messages.py:53 gajim/common/helpers.py:315
 msgid "Invisible"
 msgstr "Nevidljiv"
 
-#: gajim/dialog_messages.py:62
-msgid "A connection is not available"
+#: gajim/dialog_messages.py:54
+#, fuzzy
+msgid "You cannot join a group chat while being invisible."
+msgstr "Nije moguće pridruživanje grupnom razgovoru dok ste nevidljivi"
+
+#: gajim/dialog_messages.py:58
+#, fuzzy
+msgid "No Connection Available"
 msgstr "Veza nije dostupna"
 
-#: gajim/dialog_messages.py:63
+#: gajim/dialog_messages.py:59
 msgid "Your message can not be sent until you are connected."
 msgstr "Vaša poruka ne može biti poslana dok niste spojeni."
 
-#: gajim/dialog_messages.py:67
-#, fuzzy
-msgid "JID already in list"
-msgstr "Jabber ID je već na listi"
+#: gajim/dialog_messages.py:63
+msgid "XMPP Address Already in List"
+msgstr ""
 
-#: gajim/dialog_messages.py:68
+#: gajim/dialog_messages.py:64
 #, fuzzy
-msgid "The JID you entered is already in the list. Choose another one."
+msgid ""
+"The XMPP Address you entered is already in the list. Please choose another "
+"one."
 msgstr "Jabber ID koji ste unjeli je već na popisu. Izaberite drugi."
 
-#: gajim/dialog_messages.py:72
-msgid "Invalid answer"
+#: gajim/dialog_messages.py:69
+#, fuzzy
+msgid "Invalid Answer"
 msgstr "Nepravilan odgovor"
 
-#: gajim/dialog_messages.py:73
+#: gajim/dialog_messages.py:70
 #, python-format
 msgid "Transport %(name)s answered wrongly to register request: %(error)s"
 msgstr ""
 "Prijenos %(name)s je krivo odgovorio na zahtjev za registraciju: %(error)s"
 
-#: gajim/dialog_messages.py:78
+#: gajim/dialog_messages.py:75
 #, fuzzy
 msgid "Wrong Custom Hostname"
 msgstr "Koristi vlastito ime poslužitelja/port"
 
-#: gajim/dialog_messages.py:79
+#: gajim/dialog_messages.py:76
 #, fuzzy, python-format
-msgid "Wrong custom hostname \"%s\". Ignoring it."
+msgid "Custom hostname \"%s\" is wrong. It will be ignored."
 msgstr "Koristi vlastito ime poslužitelja/port"
 
-#: gajim/dialog_messages.py:83
-msgid "Error while removing privacy list"
+#: gajim/dialog_messages.py:80
+#, fuzzy
+msgid "Error While Removing Privacy List"
 msgstr "Greška prilikom brisanja liste privatnosti"
 
-#: gajim/dialog_messages.py:84
-#, python-format
+#: gajim/dialog_messages.py:81
+#, fuzzy, python-format
 msgid ""
-"Privacy list %s has not been removed. It is maybe active in one of your "
-"connected resources. Deactivate it and try again."
+"Privacy list %s has not been removed. It is probably active in one of your "
+"connected resources. Please deactivate it and try again."
 msgstr ""
 "Lista privatnosti %s nije uklonjena. Možda je aktivna u nekom od vaših "
 "spojenih resursa. Obustavite ju i pokušajte ponovno."
 
-#: gajim/dialog_messages.py:90
-msgid "Invisibility not supported"
+#: gajim/dialog_messages.py:87
+#, fuzzy
+msgid "Invisibility Not Supported"
 msgstr "Nevidljivost nije podržana"
 
-#: gajim/dialog_messages.py:91
-#, python-format
-msgid "Account %s doesn't support invisibility."
+#: gajim/dialog_messages.py:88
+#, fuzzy, python-format
+msgid "This account %s doesn't support invisibility."
 msgstr "Račun %s ne podržava nevidljivost."
 
-#: gajim/dialog_messages.py:95
-msgid "Unregister failed"
+#: gajim/dialog_messages.py:92
+#, fuzzy
+msgid "Unregister Failed"
 msgstr "Brisanje registracije nije uspijelo"
 
-#: gajim/dialog_messages.py:96
-#, python-format
-msgid "Unregistration with server %(server)s failed: %(error)s"
+#: gajim/dialog_messages.py:93
+#, fuzzy, python-format
+msgid "Unregistration on server %(server)s failed: %(error)s"
 msgstr ""
 "Brisanje registracije na poslužitelju %(server)s nije uspjelo: %(error)s"
 
-#: gajim/dialog_messages.py:100
-msgid "Registration succeeded"
+#: gajim/dialog_messages.py:97
+#, fuzzy
+msgid "Registration Succeeded"
 msgstr "Registracija uspijela"
 
-#: gajim/dialog_messages.py:101
-#, python-format
-msgid "Registration with agent %s succeeded"
+#: gajim/dialog_messages.py:98
+#, fuzzy, python-format
+msgid "Registration with agent %s succeeded."
 msgstr "Registracija sa agentom %s je uspjela"
 
-#: gajim/dialog_messages.py:105 gajim/gtk/service_registration.py:215
-msgid "Registration failed"
+#: gajim/dialog_messages.py:102
+#, fuzzy
+msgid "Registration Failed"
 msgstr "Registracija nije uspijela"
 
-#: gajim/dialog_messages.py:106
+#: gajim/dialog_messages.py:103
 #, python-format
 msgid ""
 "Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
@@ -2397,35 +2363,38 @@ msgstr ""
 "Registracija sa agentom %(agent)s nije uspjela, uz poruku o grešci "
 "%(error)s: %(error_msg)s"
 
-#: gajim/dialog_messages.py:111
+#: gajim/dialog_messages.py:108
 #, fuzzy
 msgid "Unable to Join Group Chat"
 msgstr "Nije moguće pridružiti se grupnom razgovoru"
 
-#: gajim/dialog_messages.py:116
-msgid "GStreamer error"
-msgstr ""
+#: gajim/dialog_messages.py:113
+#, fuzzy
+msgid "GStreamer Error"
+msgstr "Pogreška Baze Podataka"
 
-#: gajim/dialog_messages.py:117
+#: gajim/dialog_messages.py:114
 #, fuzzy, python-format
 msgid ""
 "Error: %(error)s\n"
 "Debug: %(debug)s"
 msgstr "Poruka Greške: %s"
 
-#: gajim/dialog_messages.py:121
-msgid "Wrong host"
+#: gajim/dialog_messages.py:118
+#, fuzzy
+msgid "Wrong Host"
 msgstr "Krivi domaćin"
 
-#: gajim/dialog_messages.py:122
+#: gajim/dialog_messages.py:119
 msgid "Invalid local address? :-O"
 msgstr "Neispravna lokalna adresa? :-O"
 
-#: gajim/dialog_messages.py:126
-msgid "Avahi error"
+#: gajim/dialog_messages.py:123
+#, fuzzy
+msgid "Avahi Error"
 msgstr "Avahi greška"
 
-#: gajim/dialog_messages.py:127
+#: gajim/dialog_messages.py:124
 #, python-format
 msgid ""
 "%s\n"
@@ -2434,67 +2403,67 @@ msgstr ""
 "%s\n"
 "Poruke lokalne veze možda ne rade kako treba."
 
-#: gajim/dialog_messages.py:131 gajim/dialog_messages.py:136
+#: gajim/dialog_messages.py:128 gajim/dialog_messages.py:133
 #, fuzzy
-msgid "Could not request upload slot"
+msgid "Could not request upload slot for HTTP File Upload"
 msgstr "Nije moguće pokrenuti lokalnu uslugu"
 
-#: gajim/dialog_messages.py:137
-msgid "Got unexpected response from server (see log)"
+#: gajim/dialog_messages.py:134
+msgid "Got unexpected response from server (see log)."
 msgstr ""
 
-#: gajim/dialog_messages.py:141 gajim/dialog_messages.py:146
+#: gajim/dialog_messages.py:138 gajim/dialog_messages.py:143
 #, fuzzy
-msgid "Could not open file"
+msgid "Could not Open File"
 msgstr "Nemogu učitati sliku"
 
-#: gajim/dialog_messages.py:142
-msgid "Exception raised while opening file (see log)"
+#: gajim/dialog_messages.py:139
+msgid "Exception raised while trying to open file (see log)."
 msgstr ""
 
-#: gajim/dialog_messages.py:151
-msgid "Unsecure"
-msgstr ""
+#: gajim/dialog_messages.py:148
+#, fuzzy
+msgid "Not Secure"
+msgstr "Nije početo"
 
-#: gajim/dialog_messages.py:152
+#: gajim/dialog_messages.py:149
 #, fuzzy
-msgid "Server returned unsecure transport (HTTP)"
+msgid "The server returned an insecure transport (HTTP)."
 msgstr "Servis je odgovorio sa greškom."
 
-#: gajim/dialog_messages.py:156
+#: gajim/dialog_messages.py:153
 #, fuzzy
-msgid "Could not upload file"
+msgid "Could not Upload File"
 msgstr "Nemogu učitati sliku"
 
-#: gajim/dialog_messages.py:157
+#: gajim/dialog_messages.py:154
 #, python-format
 msgid "HTTP response code from server: %s"
 msgstr ""
 
-#: gajim/dialog_messages.py:161
+#: gajim/dialog_messages.py:158
 msgid "Upload Error"
 msgstr ""
 
-#: gajim/dialog_messages.py:166
+#: gajim/dialog_messages.py:163
 #, fuzzy
 msgid "Encryption Error"
 msgstr "Enkripcija omogućena"
 
-#: gajim/dialog_messages.py:167
-#, fuzzy
-msgid "For the chosen encryption there is no encryption method available"
-msgstr "Veza nije dostupna"
+#: gajim/dialog_messages.py:164
+msgid "There is no encryption method available for the chosen encryption."
+msgstr ""
 
-#: gajim/dialog_messages.py:171
+#: gajim/dialog_messages.py:169
 #, fuzzy
-msgid "Avatar upload failed"
+msgid "Avatar Upload Failed"
 msgstr "Objava vCard neuspješna"
 
-#: gajim/privatechat_control.py:204
+#: gajim/privatechat_control.py:207
 msgid "Sending private message failed"
 msgstr "Slanje privatne poruke neuspješno"
 
-#: gajim/privatechat_control.py:206
+#: gajim/privatechat_control.py:209
 #, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr ""
@@ -2518,7 +2487,7 @@ msgstr "prikaži pomoć za komandu"
 
 #: gajim/gajim_remote.py:85
 #, fuzzy
-msgid "Lists all contacts in roster, one for each line"
+msgid "Lists all contacts in the contact list, one for each line"
 msgstr ""
 "Ispisuje listu svih kontakata na listi. Svaki kontakt pojavljuje se u "
 "odvojenoj liniji"
@@ -2602,11 +2571,13 @@ msgstr ""
 
 #: gajim/gajim_remote.py:118
 #, fuzzy
-msgid "Sends new chat message to a contact in the roster. Account is optional."
+msgid ""
+"Sends new chat message to a contact in the contact list. Account is optional."
 msgstr "Uporaba: /%s, šalje poruku kontaktu"
 
 #: gajim/gajim_remote.py:120 gajim/gajim_remote.py:130
-msgid "JID of the contact that will receive the message"
+#, fuzzy
+msgid "XMPP Address of the contact that will receive the message"
 msgstr "JID kontakta koji će primiti poruku"
 
 #: gajim/gajim_remote.py:121 gajim/gajim_remote.py:132
@@ -2620,8 +2591,10 @@ msgid "if specified, the message will be sent using this account"
 msgstr "ako je označeno, poruka će biti poslana koristeći ovaj račun"
 
 #: gajim/gajim_remote.py:127
-msgid "Sends a chat message to someone on your roster. Account is optional."
-msgstr ""
+#, fuzzy
+msgid ""
+"Sends a chat message to someone on your contact list. Account is optional."
+msgstr "Uporaba: /%s, šalje poruku kontaktu"
 
 #: gajim/gajim_remote.py:131
 msgid "subject"
@@ -2632,11 +2605,13 @@ msgid "message subject"
 msgstr "tema poruke"
 
 #: gajim/gajim_remote.py:138
-msgid "Sends new message to a groupchat you've joined."
+#, fuzzy
+msgid "Sends new message to a group chat you've joined."
 msgstr "Šalje novu poruku grupnom razgovoru kojem ste pristupili."
 
 #: gajim/gajim_remote.py:140
-msgid "JID of the room that will receive the message"
+#, fuzzy
+msgid "XMPP Address of the group chat that will receive the message"
 msgstr "JID sobe koja će primiti poruku"
 
 #: gajim/gajim_remote.py:147
@@ -2645,7 +2620,8 @@ msgstr "Daje detaljne informacije o kontaktu"
 
 #: gajim/gajim_remote.py:149 gajim/gajim_remote.py:162
 #: gajim/gajim_remote.py:192
-msgid "JID of the contact"
+#, fuzzy
+msgid "XMPP Address of the contact"
 msgstr "JID kontakta"
 
 #: gajim/gajim_remote.py:153
@@ -2707,7 +2683,8 @@ msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Zapisuje trenutno stanje Gajim postavku u .config datoteku"
 
 #: gajim/gajim_remote.py:190
-msgid "Removes contact from roster"
+#, fuzzy
+msgid "Removes contact from contact list"
 msgstr "Uklanja kontakt sa liste"
 
 #: gajim/gajim_remote.py:193
@@ -2753,9 +2730,9 @@ msgid "Missing argument \"contact_jid\""
 msgstr "Nedostaje argument \"contact_jid\""
 
 #: gajim/gajim_remote.py:275
-#, python-format
+#, fuzzy, python-format
 msgid ""
-"'%s' is not in your roster.\n"
+"'%s' is not in your contact list.\n"
 "Please specify account for sending the message."
 msgstr ""
 "'%s' nije na vašoj listi.\n"
@@ -2978,12 +2955,12 @@ msgstr "Kraj tjedna"
 msgid "Weekend!"
 msgstr "Vikend!"
 
-#: gajim/common/logger.py:192 gajim/common/logger.py:197
+#: gajim/common/logger.py:189 gajim/common/logger.py:194
 #, 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:217
+#: gajim/common/logger.py:214
 #, fuzzy, python-format
 msgid "Creating %s"
 msgstr "Uništavam %s"
@@ -3058,22 +3035,21 @@ msgstr "%(nickname)s Se Odjavio"
 msgid "Contact Signed Out"
 msgstr "Kontakt Se Odjavio"
 
-#: gajim/common/contacts.py:455
-msgid "Not in roster"
-msgstr "Nije na Listi Kontakata"
-
 #: gajim/common/config.py:80
+#, fuzzy
 msgid ""
 "Show desktop notification even when a chat window is opened for this contact "
-"and does not have focus"
-msgstr ""
+"and does not have focus."
+msgstr "Dozvoli obavijesti kada sam _odsutan/nedostupan/zauzet/nevidljiv"
 
 #: gajim/common/config.py:81
-msgid "Play sound when user is busy"
+#, fuzzy
+msgid "Play sound even when being busy."
 msgstr "Odsviraj zvuk kad je korisnik zauzet"
 
 #: gajim/common/config.py:83
-msgid "Show only online and free for chat contacts in roster."
+#, fuzzy
+msgid "Show only online and free for chat contacts in the contact list."
 msgstr "Prikaži samo dostupne i slobodne kontakte na listi."
 
 #: gajim/common/config.py:86
@@ -3082,12 +3058,15 @@ msgstr ""
 "Vrijeme u minutama, nako kojega će se vaš status promijeniti u odsutan."
 
 #: gajim/common/config.py:87
-msgid "$S (Away as a result of being idle more than $T min)"
+#, fuzzy
+msgid "$S (Away: Idle more than $T min)"
 msgstr "$S (Odsutan kao rezultat mirovanja dužeg od $T min)"
 
 #: gajim/common/config.py:87
 #, fuzzy
-msgid "$S will be replaced by current status message, $T by autoawaytime."
+msgid ""
+"$S will be replaced by current status message, $T by the 'autoawaytime' "
+"value."
 msgstr ""
 "$S će biti zamjenjen sa trenutnom statusnom porukom, $T vremena automatske "
 "odsutnosti."
@@ -3098,12 +3077,14 @@ msgstr ""
 "Vrijeme u minutama, nakon kojega će se vaš status promijenti u nije dostupan."
 
 #: gajim/common/config.py:90
-msgid "$S (Not available as a result of being idle more than $T min)"
+#, fuzzy
+msgid "$S (Not available: Idle more than $T min)"
 msgstr "$S (Nije dostupan, kao posljedica mirovanja dužeg od $T min)"
 
 #: gajim/common/config.py:90
 #, fuzzy
-msgid "$S will be replaced by current status message, $T by autoxatime."
+msgid ""
+"$S will be replaced by current status message, $T by the 'autoxatime' value."
 msgstr ""
 "$S će biti zamjenjen sa trenutnom statusnom porukom, $T vremena automatske "
 "produžene nedostupnosti."
@@ -3111,70 +3092,74 @@ msgstr ""
 #: gajim/common/config.py:93
 #, fuzzy
 msgid ""
-"When to show notification area icon. Can be 'never', 'on_event', 'always'."
+"When to show the notification area icon. Can be 'never', 'on_event', and "
+"'always'."
 msgstr ""
 "Kada prikazati ikonu u traci radne površine. Može biti 'never', 'on_event', "
 "'always'."
 
 #: gajim/common/config.py:94
-msgid "Allow to hide the roster window even if the tray icon is not shown."
+msgid ""
+"Allow to hide the contact list window even if the notification area icon is "
+"not shown."
 msgstr ""
 
 #: gajim/common/config.py:97
 #, fuzzy
-msgid "Contact signed in notification color."
-msgstr "Prikaži događaj u _listi kontakata"
+msgid "Notification color for contacts signing in."
+msgstr "Obavijesti me o kontaktima koji se _prijave"
 
 #: gajim/common/config.py:98
 #, fuzzy
-msgid "Contact signout notification color"
-msgstr "Prikaži događaj u _listi kontakata"
+msgid "Notification color for contacts signing out."
+msgstr "Obavijesti me o kontaktima koji se _odjave"
 
 #: gajim/common/config.py:99
 #, fuzzy
-msgid "New message notification color."
+msgid "Notification color for new message notification."
 msgstr "Pregled novih poruka kao obavijest u iskočnom prozoru?"
 
 #: gajim/common/config.py:100
 #, fuzzy
-msgid "File transfer request notification color."
-msgstr "Zahtjev Razmjene Datoteka"
+msgid "Notification color for file transfer request."
+msgstr "_Obavijesti me kada se završi prijenos datoteka"
 
 #: gajim/common/config.py:101
 #, fuzzy
-msgid "File transfer error notification color."
-msgstr "Prijenos datoteka otkazan"
+msgid "Notification color for file transfer errors."
+msgstr "_Obavijesti me kada se završi prijenos datoteka"
 
 #: gajim/common/config.py:102
-#, fuzzy
-msgid "File transfer complete or stopped notification color."
-msgstr "Prikaži obavijest kada završi prijenos datoteka"
+msgid "Notification color for stopped or completed file transfers."
+msgstr ""
 
 #: gajim/common/config.py:103
-#, fuzzy
-msgid "Groupchat invitation notification color"
-msgstr "Poziv na Grupni Razgovor"
+msgid "Notification color for group chat invitations."
+msgstr ""
 
 #: gajim/common/config.py:104
 #, fuzzy
-msgid "Background color of status changed notification"
+msgid "Notification background color for changed status."
 msgstr "Boja pozadine kontakata u trenu prijave."
 
 #: gajim/common/config.py:105
-msgid "Other dialogs color."
+msgid "Notification color for other dialogs."
 msgstr ""
 
 #: gajim/common/config.py:106
+#, fuzzy
 msgid ""
-"List (space separated) of rows (accounts and groups) that are collapsed."
+"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:107
 msgid "default"
 msgstr "predefinirano"
 
-#: gajim/common/config.py:113
-msgid "Language used by speller"
+#: gajim/common/config.py:113 gajim/common/config.py:424
+#: gajim/common/config.py:431
+#, fuzzy
+msgid "Language used for spell checking."
 msgstr "Jezik koji se koristi za provjeru pravopisa"
 
 #: gajim/common/config.py:114
@@ -3188,10 +3173,11 @@ msgstr ""
 "'never' - nikada ne ispisuj vrijeme."
 
 #: gajim/common/config.py:115
+#, fuzzy
 msgid ""
 "Print time in chats using Fuzzy Clock. Value of fuzziness from 1 to 4, or 0 "
-"to disable fuzzyclock. 1 is the most precise clock, 4 the least precise one. "
-"This is used only if print_time is 'sometimes'."
+"to disable Fuzzy Clock. 1 is the most precise clock, 4 the least precise "
+"one. This is used only if 'print_time' is 'sometimes'."
 msgstr ""
 "Ispisuj vrijeme u razgovorima koristeći Nejasni Sat. Vrijednost nejasnoće od "
 "1 do 4 ili 0 za onemogućavanje nejasnog sata. 1 je najprecizniji sat, 4 "
@@ -3209,53 +3195,58 @@ msgstr "Koristi * / _ parove kao znakove za formatiranje."
 #: gajim/common/config.py:120
 #, fuzzy
 msgid ""
-"If true, do not remove */_ . So *abc* will be bold but with * * not removed."
+"If enabled, do not remove */_ . So *abc* will be bold but with * * not "
+"removed."
 msgstr ""
 "Ako je Aktivno, nemoj odstraniti */_ . Tako će *abc* biti podebljano, ali "
 "omeđeno sa * *."
 
 #: gajim/common/config.py:123
+#, fuzzy
 msgid ""
-"Uses ReStructured text markup to send HTML, plus ascii formatting if "
-"selected. For syntax, see http://docutils.sourceforge.net/docs/ref/rst/"
-"restructuredtext.html (If you want to use this, install docutils)"
+"Uses ReStructured text markup to send HTML, plus ASCII formatting if "
+"selected. Needs docutils installed (for syntax, see http://docutils."
+"sourceforge.net/docs/ref/rst/restructuredtext.html)."
 msgstr ""
 "Koristi ReStructured tekst markup za HTML i ascii formatiranje ako je "
 "odabrano. Za sintaksu, pogledajte http://docutils.sourceforge.net/docs/ref/"
 "rst/restructuredtext.html (Ako ovo želite koristiti, instalirajte docutils)"
 
 #: gajim/common/config.py:132
+#, fuzzy
 msgid ""
-"Character to add after nickname when using nick completion (tab) in group "
-"chat."
+"Character to add after nickname when using nickname completion (tab) in "
+"group chat."
 msgstr ""
 "Znak za dodavanje nakon nadimka pri korištenju dopune nadimka (tipka tab) u "
 "grupnom razgovoru"
 
 #: gajim/common/config.py:133
+#, fuzzy
 msgid ""
-"Character to propose to add after desired nickname when desired nickname is "
-"used by someone else in group chat."
+"Character to propose to add after desired nickname when nickname is already "
+"used in group chat."
 msgstr ""
 "Znak koji treba pokušati dodati željenom nadimku ukoliko netko u grupnom "
 "razgovoru već koristi željeni nadimak"
 
 #: gajim/common/config.py:155
 msgid ""
-"If true, Gajim will save roster position when hiding roster, and restore it "
-"when showing roster."
+"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:161
-msgid "Place the roster on the right in single window mode"
+msgid "Place the contact list on the right in single window mode"
 msgstr ""
 
 #: gajim/common/config.py:167
 #, fuzzy
 msgid ""
-"This option let you customize timestamp that is printed in conversation. For "
-"example \"[%H:%M] \" will show \"[hour:minute] \". See python doc on "
-"strftime for full documentation: http://docs.python.org/lib/module-time.html"
+"This option lets you customize the timestamp that is printed in "
+"conversation. For example '[%H:%M] ' will show '[hour:minute] '. See python "
+"doc on strftime for full documentation (https://docs.python.org/3/library/"
+"time.html)."
 msgstr ""
 "Ova postavka omogućava prilagođavanje vremenske oznake koja se ispisuje u "
 "razgovorima. Na primjer  \"[%H:%M] \" će prikazati \"[hour:minute] \". "
@@ -3263,266 +3254,263 @@ msgstr ""
 "python.org/lib/module-time.html"
 
 #: gajim/common/config.py:168
-msgid "Characters that are printed before the nickname in conversations"
+#, fuzzy
+msgid "Characters that are printed before the nickname in conversations."
 msgstr "Znakovi koji se ispisuju ispred nadimka u razgovorima"
 
 #: gajim/common/config.py:169
-msgid "Characters that are printed after the nickname in conversations"
+#, fuzzy
+msgid "Characters that are printed after the nickname in conversations."
 msgstr "Znakovi koji se ispisuju nakon nadimka u razgovorima"
 
 #: gajim/common/config.py:170
-msgid "Add * and [n] in roster title?"
-msgstr "Dodaj * i [n] u naslov liste?"
+#, 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:171
 #, fuzzy
 msgid ""
-"How many history messages should be restored when a chat tab/window is "
-"reopened?"
+"Number of messages from chat history to be restored when a chat tab/window "
+"is reopened."
 msgstr ""
 "Koliko će se linija pamtiti iz prošlih razgovora kada se prozor/kartica "
 "razgovora ponovno otvori."
 
 #: gajim/common/config.py:172
-msgid "How far back in time (minutes) history is restored. -1 means no limit."
+msgid ""
+"How far back in time (minutes) chat history is restored. -1 means no limit."
 msgstr ""
 
 #: gajim/common/config.py:173
 #, fuzzy
 msgid ""
-"How many lines to request from server when entering a groupchat. -1 means no "
-"limit"
+"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 ""
-"Koliko linija teksta zatražiti od poslužitelja kod pridruživanja grupnom "
-"razgovoru."
+"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:174
-#, fuzzy
 msgid ""
-"Minutes of backlog to request when entering a groupchat. -1 means no limit"
+"Should automatic rejoin be activated when you were kicked from a group chat?"
 msgstr ""
-"Koliko minuta prijašnjeg razgovora zatražiti kod pridruživanja grupnom "
-"razgovoru."
 
 #: gajim/common/config.py:175
-msgid ""
-"How many seconds to wait before trying to autorejoin to a conference you are "
-"being disconnected from. Set to 0 to disable autorejoining."
-msgstr ""
-"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:176
-msgid "Should autorejoin be activated when kicked from a conference?"
-msgstr ""
-
-#: gajim/common/config.py:177
-msgid ""
-"Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
-"Client default behaviour)."
+#, 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:179
-msgid "How many lines to store for Ctrl+KeyUP."
+#: gajim/common/config.py:177
+#, 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:182
+#: gajim/common/config.py:180
 #, fuzzy, python-format
 msgid ""
-"Either custom URL with %%s in it where %%s is the word/phrase or "
-"'WIKTIONARY' which means use Wikitionary."
+"Either a custom URL with %%s in it (where %%s is the word/phrase) or "
+"'WIKTIONARY' (which means use Wikitionary)."
 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:185
+#: gajim/common/config.py:183
 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:187
+#: gajim/common/config.py:185
+#, fuzzy
 msgid ""
-"When not printing time for every message (print_time==sometimes), print it "
+"When not printing time for every message ('print_time'==sometimes), print it "
 "every x minutes."
 msgstr ""
 "Ako se ne ispisuje vrijeme za svaku poruku (print_time==ponekad), ispisati "
 "ga svakih x minuta"
 
-#: gajim/common/config.py:188
+#: gajim/common/config.py:186
 msgid "Ask before pasting an image."
 msgstr ""
 
-#: gajim/common/config.py:189
+#: gajim/common/config.py:187
 msgid "Ask before closing a group chat tab/window."
 msgstr "Pitaj prije zatvaranja kartice/prozora razgovora grupe."
 
-#: gajim/common/config.py:190
+#: gajim/common/config.py:188
 #, fuzzy
 msgid ""
-"Always ask for confirmation before closing groupchats with any of the JIDs "
-"on this space separated list."
+"Always ask for confirmation before closing group chats with any of the XMPP "
+"Addresses on this list (space separated)."
 msgstr ""
 "Uvijek pitaj prije zatvaranja kartice/prozora grupnog razgovora u ovoj "
 "razmakom odjeljenoj listi jid-ova grupnog razgovora."
 
-#: gajim/common/config.py:191
+#: gajim/common/config.py:189
 #, fuzzy
 msgid ""
-"Never ask for confirmation before closing groupchats with any of the JIDs on "
-"this space separated list."
+"Never ask for confirmation before closing group chats with any of the XMPP "
+"Addresses on this list (space separated)."
 msgstr ""
 "Nikad ne pitaj prije zatvaranja kartice/prozora grupnog razgovora u ovoj "
 "razmacima podjeljenoj listi jid-ova grupnog razgovora."
 
-#: gajim/common/config.py:192
+#: gajim/common/config.py:190
 #, fuzzy
 msgid ""
-"Ask before closing tabbed chat window if there are controls that can lose "
-"data (chat, private chat, groupchat that will not be minimized)"
+"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 ""
 "Pitaj prije zatvaranja prozora za razgovor koji ima kartice, ako postoje "
 "neki koji mogu izgubiti podatke (razgovor, privatni razgovor, grupni "
 "razgovor koji neće biti minimizirani)"
 
-#: gajim/common/config.py:195
+#: gajim/common/config.py:193
 #, fuzzy
 msgid ""
-"Comma separated list of sent hosts, in addition of local interfaces, for "
-"File Transfer in case of address translation/port forwarding."
+"List of send hosts (comma separated) in addition to local interfaces for "
+"file transfers (in case of address translation/port forwarding)."
 msgstr ""
 "Lista računala odvojenih zarezom koje šaljemo, kao dodatak lokalnim "
 "sučeljima, za prijenos datoteka u slučaju prosljeđivanja."
 
-#: gajim/common/config.py:196
+#: gajim/common/config.py:194
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "IEC standard definira KiB = 1024 bajtova, KB = 1000 bajtova"
 
-#: gajim/common/config.py:198
+#: gajim/common/config.py:196
 #, fuzzy
 msgid "Notify of events in the notification area."
 msgstr "Obavijesti o svim događajima u traci radne površine."
 
-#: gajim/common/config.py:199
+#: gajim/common/config.py:197
 msgid ""
-"If False, Gajim will display a static event icon instead of the blinking "
-"status icon in the notification area when notifying on event."
+"If disabled, Gajim will display a static event icon instead of the blinking "
+"status icon in the notification area when notifying about an event."
 msgstr ""
 
-#: gajim/common/config.py:205
+#: gajim/common/config.py:203
 msgid "Show tab when only one conversation?"
 msgstr "Prikaži karticu ako je otvoren samo jedan razgovor?"
 
-#: gajim/common/config.py:206
+#: gajim/common/config.py:204
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "Prikaži granicu notesa sa karticama u prozorima razgovora?"
 
-#: gajim/common/config.py:207
+#: gajim/common/config.py:205
 msgid "Show close button in tab?"
 msgstr "Prikaži gumb za zatvaranje u kartici?"
 
-#: gajim/common/config.py:220
+#: gajim/common/config.py:218
 msgid "Preview new messages in notification popup?"
 msgstr "Pregled novih poruka kao obavijest u iskočnom prozoru?"
 
-#: gajim/common/config.py:223
+#: gajim/common/config.py:221
+#, fuzzy
 msgid ""
-"A semicolon-separated list of words that will be highlighted in group chats."
+"A list of words (semicolon separated) that will be highlighted in group "
+"chats."
 msgstr ""
 "Lista riječi odijeljena točka-zarezom koje će biti označene u grupnim "
 "razgovorima."
 
-#: gajim/common/config.py:224
+#: gajim/common/config.py:222
 #, fuzzy
 msgid ""
-"If true, quits Gajim when X button of Window Manager is clicked. This "
-"setting is taken into account only if notification icon is used."
+"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 ""
 "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:225
+#: gajim/common/config.py:223
 msgid ""
-"If true, Gajim hides the Roster window on pressing the X button instead of "
-"minimizing into the Dock."
+"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:226
+#: gajim/common/config.py:224
 #, fuzzy
 msgid ""
-"If true, Gajim will display an icon on each tab containing unread messages. "
-"Depending on the theme, this icon may be animated."
+"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:227
+#: gajim/common/config.py:225
 #, fuzzy
 msgid ""
-"If true, Gajim will display the status message, if not empty, for every "
-"contact under the contact name in roster window."
+"If enabled, Gajim will display the status message (if not empty) underneath "
+"the contact name in the contact list window."
 msgstr ""
 "Ako je Aktivno, Gajim će prikazivati statusnu poruku, ako nije prazna, za "
 "svaki kontakt pod imenom kontakta na listi."
 
-#: gajim/common/config.py:233
-msgid "Define the position of the avatar in roster. Can be left or right"
+#: gajim/common/config.py:231
+#, 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:234
+#: gajim/common/config.py:232
 #, fuzzy
 msgid ""
-"If False, Gajim will no longer print status line in chats when a contact "
-"changes their status and/or their status message."
+"If disabled, Gajim will no longer print status messages in chats when a "
+"contact changes their status (and/or their status message)."
 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:235
+#: gajim/common/config.py:233
 #, fuzzy
 msgid ""
 "Default Setting: Show a status message for every join or leave in a group "
-"chat"
+"chat."
 msgstr "Nije moguće pridružiti se grupnom razgovoru"
 
-#: gajim/common/config.py:236
+#: gajim/common/config.py:234
+#, fuzzy
 msgid ""
-"Default Setting: Show a status message for all status (away, dnd, etc.) "
-"changes of users in a group chat"
-msgstr ""
+"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:238
-msgid "Log XHTML messages instead of plain text messages."
+#: gajim/common/config.py:236
+msgid "Store XHTML messages in chat history instead of plain text messages."
 msgstr ""
 
-#: gajim/common/config.py:239
+#: gajim/common/config.py:237
 msgid "Don't show avatar for the transport itself."
 msgstr "Ne prikazuj avatar za sam transport."
 
-#: gajim/common/config.py:240
-msgid "Don't show roster in the system taskbar."
+#: gajim/common/config.py:238
+#, fuzzy
+msgid "Don't show contact list window in the system taskbar."
 msgstr "Ne prikazuj listu kontakata u programskoj traci."
 
-#: gajim/common/config.py:241
+#: gajim/common/config.py:239
 #, fuzzy
 msgid ""
-"If true, make the window flash (the default behaviour in most Window "
-"Managers) when holding pending events."
+"If enabled, Gajim makes the window flash (the default behaviour in most "
+"Window Managers) when holding pending events."
 msgstr ""
 "Ako je Aktivno, i instalirane verzije GTK+ i PyGTK su minimalno 2.8, prozor "
 "će bljeskati (pretpostavljeno ponašanje u većini Window Manager-a) kod novih "
 "događaja."
 
-#: gajim/common/config.py:245
+#: gajim/common/config.py:243
 #, fuzzy
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
 "'always_with_roster' - Like 'always' but the messages are in a single window "
-"along with the roster.\n"
+"along with the contact list.\n"
 "'never' - All messages get their own window.\n"
 "'peracct' - Messages for each account are sent to a specific window.\n"
-"'pertype' - Each message type (e.g. chats vs. groupchats) is sent to a "
+"'pertype' - Each message type (e.g. chats vs. group chats) is sent to a "
 "specific window."
 msgstr ""
 "Upravlja prozorom u koji se smještaju nove poruke.\n"
@@ -3534,122 +3522,131 @@ msgstr ""
 "'pertype' - Svaki tip poruke (npr., razgovori i grupni razgovori) se šalje u "
 "vezani prozor."
 
-#: gajim/common/config.py:246
+#: gajim/common/config.py:244
 msgid ""
-"Show roster on startup.\n"
-"'always' - Always show roster.\n"
-"'never' - Never show roster.\n"
-"'last_state' - Restore the last state roster."
+"Show contact list window on startup.\n"
+"'always' - Always show contact list window.\n"
+"'never' - Never show contact list window.\n"
+"'last_state' - Restore last state of the contact list window."
 msgstr ""
 
-#: gajim/common/config.py:247
-msgid "If False, you will no longer see the avatar in the chat window."
+#: gajim/common/config.py:245
+#, 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:248
+#: gajim/common/config.py:246
 #, fuzzy
-msgid "If true, pressing the escape key closes a tab/window."
+msgid "If enabled, pressing Esc closes a tab/window."
 msgstr "Ako je Aktivno, pritisak na 'esc' tipku zatvara karticu/prozor."
 
-#: gajim/common/config.py:249
-msgid "Hides the banner in a group chat window"
+#: gajim/common/config.py:247
+#, fuzzy
+msgid "Hides the banner in a group chat window."
 msgstr "Skriva baner u prozoru grupnog razgovora"
 
-#: gajim/common/config.py:250
-msgid "Hides the banner in two persons chat window"
-msgstr "Skriva baner u prozoru razgovora dviju osoba"
+#: gajim/common/config.py:248
+#, fuzzy
+msgid "Hides the banner in a 1:1 chat window."
+msgstr "Skriva baner u prozoru grupnog razgovora"
 
-#: gajim/common/config.py:251
-msgid "Hides the group chat occupants list in group chat window."
+#: gajim/common/config.py:249
+#, 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:252
+#: gajim/common/config.py:250
+#, fuzzy
 msgid ""
 "In a chat, show the nickname at the beginning of a line only when it's not "
-"the same person talking than in previous message."
+"the same person talking as in the previous message."
 msgstr ""
 "U razgovoru, prikaži nadimak na početku reda samo kada se ne radi o istoj "
 "osobi koja je pričala i u prošloj poruci."
 
-#: gajim/common/config.py:253
+#: gajim/common/config.py:251
 msgid "Indentation when using merge consecutive nickname."
 msgstr "Indentacija kod korištenja nadimaka koji se uzastopno pojavljuju."
 
-#: gajim/common/config.py:254
-msgid "Ctrl-Tab go to next composing tab when none is unread."
+#: gajim/common/config.py:252
+#, 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:255
+#: gajim/common/config.py:253
 #, fuzzy
 msgid ""
-"Show the confirm metacontacts creation dialog or not? Empty string means "
-"never show the dialog."
+"Show a confirmation dialog to create metacontacts? Empty string means never "
+"show the dialog."
 msgstr ""
-"Trebamo li prikazati upit za potvrdu stvaranja metakontakata ili ne? Prazan "
-"niz znači da nikada ne prikazujemo upit."
+"Treba li prikazati upit za potvrdu blokiranja kontakata ili ne? Prazan niz "
+"znači da nikada ne prikazujemo upit."
 
-#: gajim/common/config.py:256
+#: gajim/common/config.py:254
 #, fuzzy
 msgid ""
-"Show the confirm block contact dialog or not? Empty string means never show "
+"Show a confirmation dialog to block a contact? Empty string means never show "
 "the dialog."
 msgstr ""
 "Treba li prikazati upit za potvrdu blokiranja kontakata ili ne? Prazan niz "
 "znači da nikada ne prikazujemo upit."
 
-#: gajim/common/config.py:257
+#: gajim/common/config.py:255
 #, fuzzy
 msgid ""
-"Show the confirm custom status dialog or not? Empty string means never show "
-"the dialog."
+"Show a confirmation dialog for a custom status? Empty string means never "
+"show the dialog."
 msgstr ""
 "Treba li prikazati upit za potvrdu osobnog statusa ili ne? Prazan niz znači "
 "da nikada ne prikazujemo upit."
 
-#: gajim/common/config.py:258
+#: gajim/common/config.py:256
 #, fuzzy
 msgid ""
-"If true, you will be able to set a negative priority to your account in "
-"account modification window. BE CAREFUL, when you are logged in with a "
-"negative priority, you will NOT receive any message from your server."
+"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 ""
 "Ako je Aktivno, biti ćete u mogućnosti postaviti negativni prioritet na vaš "
 "račun u prozoru za izmjenu postavki računa. BUDITE OPREZNI, kada ste "
 "prijavljeni sa negativnim prioritetom NEĆETE primati nikakve poruke sa vašeg "
 "poslužitelja."
 
-#: gajim/common/config.py:259
+#: gajim/common/config.py:257
 #, fuzzy
 msgid ""
-"If true, Gajim will show number of online and total contacts in account and "
-"group rows."
+"If enabled, Gajim will show both the number of online and total contacts in "
+"account rows as well as in group rows."
 msgstr ""
 "Ako je Aktivno, Gajim će prikazivati broj prisutnih i ukupnih kontakata u "
 "redovima za račune i grupe."
 
-#: gajim/common/config.py:260
+#: gajim/common/config.py:258
+#, fuzzy
 msgid ""
-"Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
-"as if they were of this type"
+"Can be empty, 'chat' or 'normal'. If not empty, all incoming messages are "
+"treated as if they were of this type."
 msgstr ""
 "Može biti prazno, 'chat' ili 'normal'. Ako nije prazno, tretiraj sve dolazne "
 "poruke kao da su izabrane vrste"
 
-#: gajim/common/config.py:261
+#: gajim/common/config.py:259
 #, fuzzy
 msgid ""
-"If true, Gajim will scroll and select the contact who sent you the last "
-"message, if chat window is not already opened."
+"If enabled, Gajim will scroll and select the contact who sent you the last "
+"message, if the chat window is not already opened."
 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:262
+#: gajim/common/config.py:260
 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:263
+#: gajim/common/config.py:261
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
@@ -3657,143 +3654,159 @@ msgstr ""
 "Maksimalan broj linija koje se ispisuju u razgovorima. Najstarije linije se "
 "čiste."
 
-#: gajim/common/config.py:264
+#: gajim/common/config.py:262
 #, fuzzy
 msgid ""
-"If true, notification windows from notification-daemon will be attached to "
-"notification icon."
+"If enabled, notification windows from notification-daemon will be attached "
+"to the notification area icon."
 msgstr ""
 "Ako je Aktivno, prozori sa obavijestima notification-daemon-a će biti "
 "prikačeni uz ikonu u traci radne površine."
 
-#: gajim/common/config.py:265
+#: gajim/common/config.py:263
 msgid "Choose interval between 2 checks of idleness."
 msgstr "Izaberi interval između dvije provjere nezaposlenosti."
 
-#: gajim/common/config.py:266
+#: gajim/common/config.py:264
+#, fuzzy
 msgid ""
-"Valid uri schemes. Only schemes in this list will be accepted as \"real\" "
-"uri. (mailto and xmpp are handled separately)"
+"Valid URI schemes. Only schemes in this list will be accepted as 'real' URI "
+"(mailto and xmpp are handled separately)."
 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:267
+#: gajim/common/config.py:265
 #, fuzzy
-msgid "If true, completion in groupchats will be like a shell auto-completion"
+msgid ""
+"If enabled, completion in group chats will be like a shell auto-completion."
 msgstr ""
 "Ako je Aktivno, automatska dopuna u grupnim razgovorima će biti poput "
 "automatske dopune u sistemskoj ljusci"
 
-#: gajim/common/config.py:272
-msgid "Optionally fix jingle output video framerate. Example: 10/1 or 25/2"
+#: gajim/common/config.py:270
+msgid "Optionally fix Jingle output video framerate. Example: 10/1 or 25/2."
 msgstr ""
 
-#: gajim/common/config.py:273
-msgid "Optionally resize jingle output video. Example: 320x240"
+#: gajim/common/config.py:271
+msgid "Optionally resize Jingle output video. Example: 320x240."
 msgstr ""
 
-#: gajim/common/config.py:274
-msgid "If true, You will also see your webcam"
+#: gajim/common/config.py:272
+msgid "If enabled, you will see your webcam's video stream as well."
 msgstr ""
 
-#: gajim/common/config.py:277
+#: gajim/common/config.py:275
 msgid ""
-"If true, Gajim will try to use a STUN server when using Jingle. The one in "
-"\"stun_server\" option, or the one given by the XMPP server."
+"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:278
+#: gajim/common/config.py:276
 msgid "STUN server to use when using Jingle"
 msgstr ""
 
-#: gajim/common/config.py:279
+#: gajim/common/config.py:277
 msgid ""
-"If true, Gajim will show affiliation of groupchat occupants by adding a "
-"colored square to the status icon"
+"If enabled, Gajim will show affiliation of group chat participants by adding "
+"a colored square to the status icon."
 msgstr ""
 
-#: gajim/common/config.py:280
+#: gajim/common/config.py:278
 msgid ""
 "Proxy used for all outgoing connections if the account does not have a "
-"specific proxy configured"
+"specific proxy configured."
 msgstr ""
 
-#: gajim/common/config.py:281
-msgid "If true, Gajim will ignore incoming attention requests (\"wizz\")."
+#: gajim/common/config.py:279
+msgid "If enabled, Gajim will ignore incoming attention requests ('wizz')."
 msgstr ""
 
-#: gajim/common/config.py:282
+#: gajim/common/config.py:280
 msgid ""
 "If enabled, Gajim will reopen chat windows that were opened last time Gajim "
 "was closed."
 msgstr ""
 
-#: gajim/common/config.py:283
+#: gajim/common/config.py:281
 #, fuzzy
 msgid ""
-"If enabled, Gajim will show an icon to show that sent message has been "
-"received by your contact"
+"If enabled, Gajim will display an icon to show that sent messages have been "
+"received by your contact."
 msgstr ""
 "Ako je označeno, Gajim neće pitati za statusnu poruku. Koristit će se "
 "odabrana predefinirana poruka."
 
-#: gajim/common/config.py:284
-msgid "Show a mini avatar in chat window tabs and in window icon"
+#: gajim/common/config.py:282
+msgid "Show a mini avatar in chat window tabs and as the window's icon."
 msgstr ""
 
-#: gajim/common/config.py:285
+#: gajim/common/config.py:283
 #, fuzzy
-msgid "If true, Gajim will use the Systems Keyring to store account passwords."
+msgid ""
+"If enabled, Gajim will use the System's Keyring to store account passwords."
 msgstr ""
 "Ako je Aktivno, Gajim će koristiti Gnome Keyring (ako je dostupan) da bi "
 "pohranio lozinke računa."
 
+#: gajim/common/config.py:284
+msgid "If enabled, Gajim will execute XEP-0146 Commands."
+msgstr ""
+
+#: gajim/common/config.py:285
+msgid "2: System, 1: Enabled, 0: Disabled"
+msgstr ""
+
 #: gajim/common/config.py:286
-msgid "If true, Gajim will execute XEP-0146 Commands."
+msgid "Options in days which can be chosen in the sync threshold menu"
 msgstr ""
 
 #: gajim/common/config.py:287
-msgid "2: System, 1: Enabled, 0: Disabled"
+msgid ""
+"Maximum history in days we request from a public group chat archive. 0: As "
+"much as possible."
 msgstr ""
 
 #: gajim/common/config.py:288
-msgid "Options in days which can be chosen in the sync threshold menu"
+msgid ""
+"Maximum history in days we request from a private group chat archive. 0: As "
+"much as possible."
 msgstr ""
 
 #: gajim/common/config.py:289
 msgid ""
-"Maximum history in days we request from a public room archive. 0: As much as "
-"possible"
+"If enabled, Gajim shows the group chat subject in the chat window when "
+"joining."
 msgstr ""
 
 #: gajim/common/config.py:290
+#, fuzzy
 msgid ""
-"Maximum history in days we request from a private room archive. 0: As much "
-"as possible"
+"If enabled, the contact row is colored according to the current chat state "
+"of the contact."
 msgstr ""
+"Ako je označeno, Gajim će dopustiti drugima da vide koji operativni sustav "
+"koristite"
 
 #: gajim/common/config.py:291
-msgid "If the room subject is shown in chat on join"
+#, fuzzy
+msgid ""
+"If enabled, the tab is colored according to the current chat state of the "
+"contact."
 msgstr ""
+"Ako je označeno, Gajim će dopustiti drugima da vide koji operativni sustav "
+"koristite"
 
 #: gajim/common/config.py:292
+#, fuzzy
 msgid ""
-"If the contact row is colored according to the current chatstate of the "
-"contact"
+"Shows a text in the banner that describes the current chat state of the "
+"contact."
 msgstr ""
+"Ako je označeno, Gajim će dopustiti drugima da vide koji operativni sustav "
+"koristite"
 
 #: gajim/common/config.py:293
-msgid "If the tab is colored according to the current chatstate of the contact"
-msgstr ""
-
-#: gajim/common/config.py:294
-msgid ""
-"Shows a text in the banner that describes the current chatstate of the "
-"contact"
-msgstr ""
-
-#: gajim/common/config.py:295 gajim/common/config.py:424
 #, fuzzy
 msgid ""
 "Chat state notifications that are sent to contacts. Possible values: all, "
@@ -3802,140 +3815,158 @@ msgstr ""
 "Poslane obavijesti o statusu u razgovoru. Može biti jedno od svi,"
 "samo_sastavljanje, onemogućeno."
 
-#: gajim/common/config.py:296 gajim/common/config.py:438
+#: gajim/common/config.py:294
 #, fuzzy
 msgid ""
 "Chat state notifications that are sent to the group chat. Possible values: "
-"all, composing_only, disabled"
+"'all', 'composing_only', 'disabled'"
 msgstr ""
 "Poslane obavijesti o statusu u razgovoru. Može biti jedno od svi,"
 "samo_sastavljanje, onemogućeno."
 
-#: gajim/common/config.py:312
+#: gajim/common/config.py:297
+msgid "API Preferences. Possible values: 'http', 'iq'"
+msgstr ""
+
+#: gajim/common/config.py:313
+#, fuzzy
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
-"defined in autopriority_* options."
+"defined in 'autopriority_*' options."
 msgstr ""
 "Prioritet će se automatski promjeniti ovistno o vašem statusu. Prioriteti su "
 "definirani u autopriority_* opcijama."
 
-#: gajim/common/config.py:320
+#: gajim/common/config.py:321
+#, fuzzy
 msgid ""
-"Status used to autoconnect as. Can be online, chat, away, xa, dnd, "
-"invisible. NOTE: this option is used only if restore_last_status is disabled"
+"Status to be used automatically when connecting. Can be 'online', 'chat', "
+"'away', 'xa', 'dnd' or 'invisible'. NOTE: This option is used only if "
+"'restore_last_status' is disabled."
 msgstr ""
 "Status koji se koristi za automatsko spajanje. Može biti povezan, razgovor, "
 "odsutan, produženo nedostupan, ne uznemiravaj, nevidljivd. PRIMJEDBA: ova "
 "postavka se koristi samo ako je restore_last_status onemogućen."
 
-#: gajim/common/config.py:321
-msgid "If enabled, restore the last status that was used."
+#: gajim/common/config.py:322
+#, 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:322
+#: gajim/common/config.py:323
 #, fuzzy
 msgid ""
-"If true, Contacts requesting authorization will be automatically accepted."
+"If enabled, Contacts requesting authorization will be accepted automatically."
 msgstr "Ako je Aktivno, Autorizacija kontakata će biti obavljena automatski."
 
-#: gajim/common/config.py:323
+#: gajim/common/config.py:324
+#, fuzzy
 msgid ""
-"If False, this account will be disabled and will not appear in roster window."
+"If disabled, this account will be disabled and will not appear in the "
+"contact list window."
 msgstr ""
 "Ako je Neaktivno, ovaj račun će biti neaktivan i neće biti prikazan na listi "
 "kontakata."
 
-#: gajim/common/config.py:327
-msgid "Allow plaintext connections"
+#: gajim/common/config.py:328
+msgid "Allow plaintext connections."
 msgstr ""
 
-#: gajim/common/config.py:330
+#: gajim/common/config.py:331
 msgid ""
-"List (space separated) of authentication mechanisms to try. Can contain "
-"ANONYMOUS, EXTERNAL, GSSAPI, SCRAM-SHA-1-PLUS, SCRAM-SHA-1, DIGEST-MD5, "
-"PLAIN, X-MESSENGER-OAUTH2 or XEP-0078"
+"List of authentication mechanisms to try (space separated). Can contain "
+"'ANONYMOUS', 'EXTERNAL', 'GSSAPI', 'SCRAM-SHA-1-PLUS', 'SCRAM-SHA-1', "
+"'DIGEST-MD5', 'PLAIN', 'X-MESSENGER-OAUTH2' or 'XEP-0078'."
 msgstr ""
 
-#: gajim/common/config.py:331
+#: gajim/common/config.py:332
 #, fuzzy
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection. "
-"Can be 'warn', 'connect', 'disconnect'"
+"Can be 'warn', 'connect' or 'disconnect'."
 msgstr ""
 "Prikaži dijalog sa upozorenjem prije slanja lozinke preko nezaštićene veze."
 
-#: gajim/common/config.py:332
+#: gajim/common/config.py:333
 msgid "Show a warning dialog before using standard SSL library."
 msgstr ""
 "Prikaži dijalog sa upozorenjem prije korištenja standardne SSL biblioteke."
 
-#: gajim/common/config.py:333
+#: gajim/common/config.py:334
 #, fuzzy
 msgid ""
 "Show a warning dialog before sending PLAIN password over a plain connection."
 msgstr ""
 "Prikaži dijalog sa upozorenjem prije slanja lozinke preko nezaštićene veze."
 
-#: gajim/common/config.py:334
-msgid "Space separated list of ssl errors to ignore."
-msgstr "Popis ssl grešaka koje će se ignorirati, odjeljene razmakom."
+#: gajim/common/config.py:335
+msgid "List of SSL errors to ignore (space separated)."
+msgstr ""
 
-#: gajim/common/config.py:340
+#: gajim/common/config.py:341
 msgid ""
-"Space separated list of JIDs for which you do not want to store logs. You "
-"can also add account name to log nothing for this account."
+"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:341
+#: gajim/common/config.py:342
 msgid ""
-"Space separated list of JIDs for which you accept to not log conversations "
-"if he does not want to."
+"List of XMPP Addresses (space separated) for which you accept to not store "
+"chat history if your contact does not want to."
 msgstr ""
 
-#: gajim/common/config.py:343
-msgid "Whitespace sent after inactivity"
+#: gajim/common/config.py:344
+#, fuzzy
+msgid "If enabled, a whitespace is sent after inactivity (keep alive)."
 msgstr "Razmak poslan nakon neaktivnosti"
 
-#: gajim/common/config.py:344
-msgid "XMPP ping sent after inactivity"
+#: gajim/common/config.py:345
+#, fuzzy
+msgid "If enabled, an XMPP ping is sent after inactivity (ping alive)."
 msgstr "XMPP ping poslan nakon neaktivnosti"
 
-#: gajim/common/config.py:348
+#: gajim/common/config.py:349
 #, fuzzy
 msgid ""
-"How many seconds to wait for the answer of ping alive packet before trying "
-"to reconnect?"
+"How many seconds to wait for the answer of a ping alive packet before trying "
+"to reconnect."
 msgstr ""
 "Koliko sekundi čekati odgovor ping alive paketa prije nego pokušamo ponovno "
 "spajanje."
 
-#: gajim/common/config.py:352
-msgid "Jabberd2 workaround"
+#: gajim/common/config.py:353
+#, fuzzy
+msgid "Jabberd2 workaround."
 msgstr "Jabberd2 workaround"
 
-#: gajim/common/config.py:355
+#: gajim/common/config.py:356
+#, fuzzy
 msgid ""
-"If checked, Gajim will use your IP and proxies defined in "
-"file_transfer_proxies option for file transfer."
+"If enabled, Gajim will use your IP and proxies defined in "
+"'file_transfer_proxies' option for file transfers."
 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:356
+#: gajim/common/config.py:357
 msgid ""
-"If true, Gajim will test file transfer proxies on startup to be sure it "
-"works. Openfire's proxies are known to fail this test even if they work."
+"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:369
-msgid "Answer to receipt requests"
-msgstr "Odgovor na zahtjev za potvrdom o primitku"
-
 #: gajim/common/config.py:370
-msgid "Sent receipt requests"
-msgstr "Šalji potvrde o primitku"
+#, 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:379
+#: gajim/common/config.py:371
+msgid "If enabled, Gajim will send message receipt requests."
+msgstr ""
+
+#: gajim/common/config.py:380
 #, fuzzy
 msgid ""
 "Allow Gajim to send information about the operating system you are running."
@@ -3943,189 +3974,198 @@ msgstr ""
 "Ako je označeno, Gajim će dopustiti drugima da vide koji operativni sustav "
 "koristite"
 
-#: gajim/common/config.py:380
+#: gajim/common/config.py:381
 #, fuzzy
 msgid "Allow Gajim to send your local time."
 msgstr "%s vam želi poslati datoteku."
 
-#: gajim/common/config.py:383
+#: gajim/common/config.py:384
 #, fuzzy
-msgid "Message that is sent to contacts you want to add"
+msgid "Message that is sent to contacts you want to add."
 msgstr "Molim ispunite podatke kontakta kojeg želite dodati"
 
-#: gajim/common/config.py:384
-msgid ""
-"If enabled, Gajim will send your local IPs so your contact can connect to "
-"your machine to transfer files."
-msgstr ""
-
 #: gajim/common/config.py:385
+#, fuzzy
 msgid ""
-"Space separated list of JIDs for which chat window will be re-opened on next "
-"startup."
+"If enabled, Gajim will send your local IP so your contact can connect to "
+"your machine for file transfers."
 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:387
-msgid "HTTP Upload: Enable HTTPS Verification"
+#: gajim/common/config.py:386
+msgid ""
+"List of XMPP Addresses (space separated) for which the chat window will be "
+"re-opened on next startup."
 msgstr ""
 
 #: gajim/common/config.py:388
-msgid ""
-"Preferred file transfer mechanism for file drag&drop on chat window. Can be "
-"'httpupload' (default) or 'jingle'"
+msgid "HTTP File Upload: Enable HTTPS Verification."
 msgstr ""
 
 #: gajim/common/config.py:389
-msgid "Allow cert verification with POSH"
+msgid ""
+"Preferred file transfer mechanism for file drag&drop on a chat window. Can "
+"be 'httpupload' (default) or 'jingle'."
 msgstr ""
 
-#: gajim/common/config.py:423 gajim/common/config.py:430
+#: gajim/common/config.py:390
 #, fuzzy
-msgid "Language for which misspelled words will be checked"
-msgstr "Jezik koji se koristi za provjeru pravopisa"
-
-#: gajim/common/config.py:427
-msgid "The currently active encryption for that contact"
-msgstr ""
+msgid "Allow certificate verification with POSH."
+msgstr "Greška SSL certifikata"
 
-#: gajim/common/config.py:431
+#: gajim/common/config.py:425
 #, fuzzy
 msgid ""
-"How many lines to request from server when entering a groupchat. -1 means no "
-"limit, -2 means global value"
+"Chat state notifications that are sent to contacts. Possible values: 'all', "
+"'composing_only', 'disabled'"
 msgstr ""
-"Koliko linija teksta zatražiti od poslužitelja kod pridruživanja grupnom "
-"razgovoru."
+"Poslane obavijesti o statusu u razgovoru. Može biti jedno od svi,"
+"samo_sastavljanje, onemogućeno."
 
-#: gajim/common/config.py:432
+#: gajim/common/config.py:428
 #, fuzzy
+msgid "The currently active encryption for that contact."
+msgstr "Omogući ESessions enkripciju za ovaj račun."
+
+#: gajim/common/config.py:432
 msgid ""
-"Minutes of backlog to request when entering a groupchat. -1 means no limit, "
-"-2 means global value"
+"If enabled, a notification is created for every message in this group chat."
 msgstr ""
-"Koliko minuta prijašnjeg razgovora zatražiti kod pridruživanja grupnom "
-"razgovoru."
 
 #: gajim/common/config.py:433
-msgid "State whether a notification is created for every message in this room"
-msgstr ""
-
-#: gajim/common/config.py:434
+#, fuzzy
 msgid ""
-"Show a status message for all status (away, dnd, etc.) changes of users in a "
-"group chat"
-msgstr ""
+"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:435
+#: gajim/common/config.py:434
 #, fuzzy
-msgid "Show a status message for every join or leave in a group chat"
+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:435
+msgid ""
+"If enabled, the group chat is minimized into the contact list when joining "
+"automatically."
+msgstr ""
+
 #: gajim/common/config.py:436
-msgid "If the group chat is minimized into the roster on autojoin"
+msgid ""
+"If enabled, the group chat is minimized into the contact list when closing "
+"it."
 msgstr ""
 
 #: gajim/common/config.py:437
-msgid "If the group chat is minimized into the roster on close"
+#, fuzzy
+msgid ""
+"Chat state notifications that are sent to the group chat. Possible values: "
+"'all', 'composing_only' or 'disabled'."
 msgstr ""
+"Poslane obavijesti o statusu u razgovoru. Može biti jedno od svi,"
+"samo_sastavljanje, onemogućeno."
 
-#: gajim/common/config.py:441
+#: gajim/common/config.py:440
 msgid ""
-"State whether plugins should be activated on startup (this is saved on Gajim "
-"exit). This option SHOULD NOT be used to (de)activate plug-ins. Use GUI "
-"instead."
+"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:446 gajim/common/const.py:281
+#: gajim/common/config.py:445 gajim/common/const.py:315
 msgid "Sleeping"
 msgstr "Spavam"
 
-#: gajim/common/config.py:447
+#: gajim/common/config.py:446
 msgid "Back soon"
 msgstr "Vraćam se ubrzo"
 
-#: gajim/common/config.py:447
+#: gajim/common/config.py:446
 msgid "Back in some minutes."
 msgstr "Vraćam se za nekoliko minuta."
 
-#: gajim/common/config.py:448 gajim/common/const.py:247
+#: gajim/common/config.py:447 gajim/common/const.py:281
 msgid "Eating"
 msgstr "Jedem"
 
-#: gajim/common/config.py:448
-msgid "I'm eating, so leave me a message."
-msgstr "Jedem, ostavite mi poruku."
+#: gajim/common/config.py:447
+#, fuzzy
+msgid "I'm eating."
+msgstr "Radim."
 
-#: gajim/common/config.py:449
+#: gajim/common/config.py:448
 msgid "Movie"
 msgstr "Film"
 
-#: gajim/common/config.py:449
+#: gajim/common/config.py:448
 msgid "I'm watching a movie."
 msgstr "Gledam film."
 
-#: gajim/common/config.py:450 gajim/common/const.py:314
+#: gajim/common/config.py:449 gajim/common/const.py:348
 msgid "Working"
 msgstr "Radim"
 
-#: gajim/common/config.py:450
+#: gajim/common/config.py:449
 msgid "I'm working."
 msgstr "Radim."
 
-#: gajim/common/config.py:451
+#: gajim/common/config.py:450
 msgid "Phone"
 msgstr "Telefon"
 
-#: gajim/common/config.py:451
+#: gajim/common/config.py:450
 msgid "I'm on the phone."
 msgstr "Telefoniram."
 
-#: gajim/common/config.py:452
+#: gajim/common/config.py:451
 msgid "Out"
 msgstr "Vani"
 
-#: gajim/common/config.py:452
+#: gajim/common/config.py:451
 msgid "I'm out enjoying life."
 msgstr "Vani uživam život."
 
-#: gajim/common/config.py:463
+#: gajim/common/config.py:462
 msgid "I'm available."
 msgstr "Dostupan sam."
 
-#: gajim/common/config.py:464
+#: gajim/common/config.py:463
 msgid "I'm free for chat."
 msgstr "Slobodan sam za razgovor."
 
-#: gajim/common/config.py:465 gajim/gtk/accounts.py:134
+#: gajim/common/config.py:464 gajim/gtk/accounts.py:133
 msgid "Be right back."
 msgstr "Odmah se vraćam."
 
-#: gajim/common/config.py:466
+#: gajim/common/config.py:465
 msgid "I'm not available."
 msgstr "Nedostupan sam."
 
-#: gajim/common/config.py:467
+#: gajim/common/config.py:466
 msgid "Do not disturb."
 msgstr "Ne uznemiravaj."
 
-#: gajim/common/config.py:468 gajim/common/config.py:469
+#: gajim/common/config.py:467 gajim/common/config.py:468
 msgid "Bye!"
 msgstr "Pozdrav!"
 
-#: gajim/common/config.py:480
+#: gajim/common/config.py:479
+#, fuzzy
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
-"muc_highlight_words, or when a group chat message contains your nickname."
+"'muc_highlight_words' your nickname is mentioned."
 msgstr ""
 "Zvuk koji će biti pušten kada poruka grupnog razgovora sadrži neku riječ iz "
 "muc_highlight_words, ili kada neka poruka grupnog razgovora sadrži vaš "
 "nadimak."
 
-#: gajim/common/config.py:481
-msgid "Sound to play when any MUC message arrives."
+#: gajim/common/config.py:480
+#, 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:485
+#: gajim/common/config.py:484
 #, fuzzy
 msgid "Tor"
 msgstr "Za"
@@ -4135,879 +4175,975 @@ msgstr "Za"
 msgid "Error: cannot open %s for reading"
 msgstr "Greška: nije moguće otvoriti %s za čitanje"
 
-#: gajim/common/const.py:214
+#: gajim/common/const.py:216
+#, fuzzy
+msgid "?Group chat name:Team"
+msgstr "?Uloga Kontakta u Grupnom Razgvoru:Nikakva"
+
+#: gajim/common/const.py:217
+msgid "?Group chat description:Project discussion"
+msgstr ""
+
+#: gajim/common/const.py:218
+#, fuzzy
+msgid "?Group chat address:team"
+msgstr "Grupni Razgovori"
+
+#: gajim/common/const.py:219
+#, fuzzy
+msgid "?Group chat name:Family"
+msgstr "Označavanje Poruke Grupnog Razgovora"
+
+#: gajim/common/const.py:220
+msgid "?Group chat description:Spring gathering"
+msgstr ""
+
+#: gajim/common/const.py:221
+msgid "?Group chat address:family"
+msgstr ""
+
+#: gajim/common/const.py:222
+#, fuzzy
+msgid "?Group chat name:Vacation"
+msgstr "Poziv na Grupni Razgovor"
+
+#: gajim/common/const.py:223
+msgid "?Group chat description:Trip planning"
+msgstr ""
+
+#: gajim/common/const.py:224
+#, fuzzy
+msgid "?Group chat address:vacation"
+msgstr "Poziv na Grupni Razgovor"
+
+#: gajim/common/const.py:225
+#, fuzzy
+msgid "?Group chat name:Repairs"
+msgstr "_Grupni Razgovor"
+
+#: gajim/common/const.py:226
+msgid "?Group chat description:Local help group"
+msgstr ""
+
+#: gajim/common/const.py:227
+#, fuzzy
+msgid "?Group chat address:repairs"
+msgstr "Grupni Razgovori"
+
+#: gajim/common/const.py:228
+#, fuzzy
+msgid "?Group chat name:News"
+msgstr "?Uloga Kontakta u Grupnom Razgvoru:Nikakva"
+
+#: gajim/common/const.py:229
+#, fuzzy
+msgid "?Group chat description:Local news and reports"
+msgstr "Stvaranje grupnih razgovora je ograničeno."
+
+#: gajim/common/const.py:230
+#, fuzzy
+msgid "?Group chat address:news"
+msgstr "Novi Grupni Razgovor"
+
+#: gajim/common/const.py:235
+#, fuzzy
+msgid "Remote server not found"
+msgstr "Usluga nije pronađena"
+
+#: gajim/common/const.py:236
+msgid "Remote server timeout"
+msgstr ""
+
+#: gajim/common/const.py:237 gajim/common/const.py:238
+#: gajim/common/const.py:239
+#, fuzzy
+msgid "Address does not belong to a group chat server"
+msgstr "Ovo nije grupni razgovor"
+
+#: gajim/common/const.py:240
+#, fuzzy
+msgid "Group chat already exists"
+msgstr "Račun Lokalno već postoji."
+
+#: gajim/common/const.py:241
+#, fuzzy
+msgid "Group chat does not exist"
+msgstr "Grupni razgovor %s ne postoji."
+
+#: gajim/common/const.py:247
 msgid "This message was encrypted with OTR and could not be decrypted."
 msgstr ""
 
-#: gajim/common/const.py:217
+#: gajim/common/const.py:250
 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:221
+#: gajim/common/const.py:254
 msgid ""
-"This message was encrypted with OpenPGP for XMPP and could not be decrypted."
+"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:224
+#: gajim/common/const.py:258
 #, python-format
 msgid "This message was encrypted with %s and could not be decrypted."
 msgstr ""
 
-#: gajim/common/const.py:231
+#: gajim/common/const.py:265
 msgid "Doing Chores"
 msgstr "Radim kućanske poslove"
 
-#: gajim/common/const.py:232
+#: gajim/common/const.py:266
 msgid "Buying Groceries"
 msgstr "Kupujem namirnice"
 
-#: gajim/common/const.py:233
+#: gajim/common/const.py:267
 msgid "Cleaning"
 msgstr "Čistim"
 
-#: gajim/common/const.py:234
+#: gajim/common/const.py:268
 msgid "Cooking"
 msgstr "Kuham"
 
-#: gajim/common/const.py:235
+#: gajim/common/const.py:269
 msgid "Doing Maintenance"
 msgstr "Popravljam"
 
-#: gajim/common/const.py:236
+#: gajim/common/const.py:270
 msgid "Doing the Dishes"
 msgstr "Perem Suđe"
 
-#: gajim/common/const.py:237
+#: gajim/common/const.py:271
 msgid "Doing the Laundry"
 msgstr "Perem Rublje"
 
-#: gajim/common/const.py:238
+#: gajim/common/const.py:272
 msgid "Gardening"
 msgstr "Uređujem vrt"
 
-#: gajim/common/const.py:239
+#: gajim/common/const.py:273
 msgid "Running an Errand"
 msgstr "Obavljam nešto"
 
-#: gajim/common/const.py:240
+#: gajim/common/const.py:274
 msgid "Walking the Dog"
 msgstr "Šetam psa"
 
-#: gajim/common/const.py:242
+#: gajim/common/const.py:276
 msgid "Drinking"
 msgstr "Pijem"
 
-#: gajim/common/const.py:243
+#: gajim/common/const.py:277
 msgid "Having a Beer"
 msgstr "Pijem Pivo"
 
-#: gajim/common/const.py:244
+#: gajim/common/const.py:278
 msgid "Having Coffee"
 msgstr "Pijem Kavu"
 
-#: gajim/common/const.py:245
+#: gajim/common/const.py:279
 msgid "Having Tea"
 msgstr "Pijem Čaj"
 
-#: gajim/common/const.py:248
+#: gajim/common/const.py:282
 msgid "Having a Snack"
 msgstr "Marendam"
 
-#: gajim/common/const.py:249
+#: gajim/common/const.py:283
 msgid "Having Breakfast"
 msgstr "Doručkujem"
 
-#: gajim/common/const.py:250
+#: gajim/common/const.py:284
 msgid "Having Dinner"
 msgstr "Večeram"
 
-#: gajim/common/const.py:251
+#: gajim/common/const.py:285
 msgid "Having Lunch"
 msgstr "Ručam"
 
-#: gajim/common/const.py:253
+#: gajim/common/const.py:287
 msgid "Exercising"
 msgstr "Vježbam"
 
-#: gajim/common/const.py:254 gajim/common/const.py:305
+#: gajim/common/const.py:288 gajim/common/const.py:339
 msgid "Cycling"
 msgstr "Vozim Bicikl"
 
-#: gajim/common/const.py:255
+#: gajim/common/const.py:289
 msgid "Dancing"
 msgstr "Plešem"
 
-#: gajim/common/const.py:256
+#: gajim/common/const.py:290
 msgid "Hiking"
 msgstr "Planinarim"
 
-#: gajim/common/const.py:257
+#: gajim/common/const.py:291
 msgid "Jogging"
 msgstr "Trčim"
 
-#: gajim/common/const.py:258
+#: gajim/common/const.py:292
 msgid "Playing Sports"
 msgstr "Bavim se Sportom"
 
-#: gajim/common/const.py:259
+#: gajim/common/const.py:293
 msgid "Running"
 msgstr "Trčim"
 
-#: gajim/common/const.py:260
+#: gajim/common/const.py:294
 msgid "Skiing"
 msgstr "Skijam"
 
-#: gajim/common/const.py:261
+#: gajim/common/const.py:295
 msgid "Swimming"
 msgstr "Plivam"
 
-#: gajim/common/const.py:262
+#: gajim/common/const.py:296
 msgid "Working out"
 msgstr "U teretani"
 
-#: gajim/common/const.py:264
+#: gajim/common/const.py:298
 msgid "Grooming"
 msgstr "Uređujem se"
 
-#: gajim/common/const.py:265
+#: gajim/common/const.py:299
 msgid "At the Spa"
 msgstr "U Toplicama"
 
-#: gajim/common/const.py:266
+#: gajim/common/const.py:300
 msgid "Brushing Teeth"
 msgstr "Perem Zube"
 
-#: gajim/common/const.py:267
+#: gajim/common/const.py:301
 msgid "Getting a Haircut"
 msgstr "Na Šišanju"
 
-#: gajim/common/const.py:268
+#: gajim/common/const.py:302
 msgid "Shaving"
 msgstr "Brijem se"
 
-#: gajim/common/const.py:269
+#: gajim/common/const.py:303
 msgid "Taking a Bath"
 msgstr "Kupam se"
 
-#: gajim/common/const.py:270
+#: gajim/common/const.py:304
 msgid "Taking a Shower"
 msgstr "Tuširam se"
 
-#: gajim/common/const.py:272
+#: gajim/common/const.py:306
 msgid "Having an Appointment"
 msgstr "Na Sastanku sam"
 
-#: gajim/common/const.py:274
+#: gajim/common/const.py:308
 msgid "Inactive"
 msgstr "Neaktivno"
 
-#: gajim/common/const.py:275
+#: gajim/common/const.py:309
 msgid "Day Off"
 msgstr "Slobodan Dan"
 
-#: gajim/common/const.py:276
+#: gajim/common/const.py:310
 msgid "Hanging out"
 msgstr "Družim se"
 
-#: gajim/common/const.py:277
+#: gajim/common/const.py:311
 msgid "Hiding"
 msgstr "Skrivam se"
 
-#: gajim/common/const.py:278
+#: gajim/common/const.py:312
 msgid "On Vacation"
 msgstr "Na Odmoru"
 
-#: gajim/common/const.py:279
+#: gajim/common/const.py:313
 msgid "Praying"
 msgstr "Molim se"
 
-#: gajim/common/const.py:280
+#: gajim/common/const.py:314
 msgid "Scheduled Holiday"
 msgstr "Planirani Praznik"
 
-#: gajim/common/const.py:282
+#: gajim/common/const.py:316
 msgid "Thinking"
 msgstr "Razmišljam"
 
-#: gajim/common/const.py:284
+#: gajim/common/const.py:318
 msgid "Relaxing"
 msgstr "Opuštam se"
 
-#: gajim/common/const.py:285
+#: gajim/common/const.py:319
 msgid "Fishing"
 msgstr "Pecam"
 
-#: gajim/common/const.py:286
+#: gajim/common/const.py:320
 msgid "Gaming"
 msgstr "Igram se"
 
-#: gajim/common/const.py:287
+#: gajim/common/const.py:321
 msgid "Going out"
 msgstr "Izlazim"
 
-#: gajim/common/const.py:288
+#: gajim/common/const.py:322
 msgid "Partying"
 msgstr "Na tulumu"
 
-#: gajim/common/const.py:289
+#: gajim/common/const.py:323
 msgid "Reading"
 msgstr "Čitam"
 
-#: gajim/common/const.py:290
+#: gajim/common/const.py:324
 msgid "Rehearsing"
 msgstr "Ponavljam"
 
-#: gajim/common/const.py:291
+#: gajim/common/const.py:325
 msgid "Shopping"
 msgstr "Kupujem"
 
-#: gajim/common/const.py:292
+#: gajim/common/const.py:326
 msgid "Smoking"
 msgstr "Pušim"
 
-#: gajim/common/const.py:293
+#: gajim/common/const.py:327
 msgid "Socializing"
 msgstr "Družim se"
 
-#: gajim/common/const.py:294
+#: gajim/common/const.py:328
 msgid "Sunbathing"
 msgstr "Sunčam se"
 
-#: gajim/common/const.py:295
+#: gajim/common/const.py:329
 msgid "Watching TV"
 msgstr "Gledam TV"
 
-#: gajim/common/const.py:296
+#: gajim/common/const.py:330
 msgid "Watching a Movie"
 msgstr "Gledam film"
 
-#: gajim/common/const.py:298
+#: gajim/common/const.py:332
 msgid "Talking"
 msgstr "Telefoniram"
 
-#: gajim/common/const.py:299
+#: gajim/common/const.py:333
 msgid "In Real Life"
 msgstr "Vani sam"
 
-#: gajim/common/const.py:300
+#: gajim/common/const.py:334
 msgid "On the Phone"
 msgstr "Koristim Mobitel"
 
-#: gajim/common/const.py:301
+#: gajim/common/const.py:335
 msgid "On Video Phone"
 msgstr "Na Video Konferenciji"
 
-#: gajim/common/const.py:303
+#: gajim/common/const.py:337
 msgid "Traveling"
 msgstr "Putujem"
 
-#: gajim/common/const.py:304
+#: gajim/common/const.py:338
 msgid "Commuting"
 msgstr "Putujem na posao"
 
-#: gajim/common/const.py:306
+#: gajim/common/const.py:340
 msgid "Driving"
 msgstr "Vozim"
 
-#: gajim/common/const.py:307
+#: gajim/common/const.py:341
 msgid "In a Car"
 msgstr "U Automobilu"
 
-#: gajim/common/const.py:308
+#: gajim/common/const.py:342
 msgid "On a Bus"
 msgstr "U Autobusu"
 
-#: gajim/common/const.py:309
+#: gajim/common/const.py:343
 msgid "On a Plane"
 msgstr "U Avionu"
 
-#: gajim/common/const.py:310
+#: gajim/common/const.py:344
 msgid "On a Train"
 msgstr "U Vlaku"
 
-#: gajim/common/const.py:311
+#: gajim/common/const.py:345
 msgid "On a Trip"
 msgstr "Na Putu"
 
-#: gajim/common/const.py:312
+#: gajim/common/const.py:346
 msgid "Walking"
 msgstr "Pješačim"
 
-#: gajim/common/const.py:315
+#: gajim/common/const.py:349
 msgid "Coding"
 msgstr "Programiram"
 
-#: gajim/common/const.py:316
+#: gajim/common/const.py:350
 msgid "In a Meeting"
 msgstr "Na Sastanku"
 
-#: gajim/common/const.py:317
+#: gajim/common/const.py:351
 msgid "Studying"
 msgstr "Učim"
 
-#: gajim/common/const.py:318
+#: gajim/common/const.py:352
 msgid "Writing"
 msgstr "Pišem"
 
-#: gajim/common/const.py:321
+#: gajim/common/const.py:355
 msgid "Afraid"
 msgstr "Ustrašen"
 
-#: gajim/common/const.py:322
+#: gajim/common/const.py:356
 msgid "Amazed"
 msgstr "Zapanjen"
 
-#: gajim/common/const.py:323
+#: gajim/common/const.py:357
 msgid "Amorous"
 msgstr "Zaljubljen"
 
-#: gajim/common/const.py:324
+#: gajim/common/const.py:358
 msgid "Angry"
 msgstr "Ljut"
 
-#: gajim/common/const.py:325
+#: gajim/common/const.py:359
 msgid "Annoyed"
 msgstr "Uznemiren"
 
-#: gajim/common/const.py:326
+#: gajim/common/const.py:360
 msgid "Anxious"
 msgstr "Zabrinut"
 
-#: gajim/common/const.py:327
+#: gajim/common/const.py:361
 msgid "Aroused"
 msgstr "Uzbuđen"
 
-#: gajim/common/const.py:328
+#: gajim/common/const.py:362
 msgid "Ashamed"
 msgstr "Posramljen"
 
-#: gajim/common/const.py:329
+#: gajim/common/const.py:363
 msgid "Bored"
 msgstr "Dosadno"
 
-#: gajim/common/const.py:330
+#: gajim/common/const.py:364
 msgid "Brave"
 msgstr "Hrabar"
 
-#: gajim/common/const.py:331
+#: gajim/common/const.py:365
 msgid "Calm"
 msgstr "Miran"
 
-#: gajim/common/const.py:332
+#: gajim/common/const.py:366
 msgid "Cautious"
 msgstr "Oprezan"
 
-#: gajim/common/const.py:333
+#: gajim/common/const.py:367
 msgid "Cold"
 msgstr "Hladno"
 
-#: gajim/common/const.py:334
+#: gajim/common/const.py:368
 msgid "Confident"
 msgstr "Pouzdan"
 
-#: gajim/common/const.py:335
+#: gajim/common/const.py:369
 msgid "Confused"
 msgstr "Zbunjen"
 
-#: gajim/common/const.py:336
+#: gajim/common/const.py:370
 msgid "Contemplative"
 msgstr "Razmišlja"
 
-#: gajim/common/const.py:337
+#: gajim/common/const.py:371
 msgid "Contented"
 msgstr "Zadovoljan"
 
-#: gajim/common/const.py:338
+#: gajim/common/const.py:372
 msgid "Cranky"
 msgstr "Hirovit"
 
-#: gajim/common/const.py:339
+#: gajim/common/const.py:373
 msgid "Crazy"
 msgstr "Lud"
 
-#: gajim/common/const.py:340
+#: gajim/common/const.py:374
 msgid "Creative"
 msgstr "Kreativan"
 
-#: gajim/common/const.py:341
+#: gajim/common/const.py:375
 msgid "Curious"
 msgstr "Znatiželjan"
 
-#: gajim/common/const.py:342
+#: gajim/common/const.py:376
 msgid "Dejected"
 msgstr "Bezvoljan"
 
-#: gajim/common/const.py:343
+#: gajim/common/const.py:377
 msgid "Depressed"
 msgstr "Depresivan"
 
-#: gajim/common/const.py:344
+#: gajim/common/const.py:378
 msgid "Disappointed"
 msgstr "Razočaran"
 
-#: gajim/common/const.py:345
+#: gajim/common/const.py:379
 msgid "Disgusted"
 msgstr "Zgađen"
 
-#: gajim/common/const.py:346
+#: gajim/common/const.py:380
 msgid "Dismayed"
 msgstr "Zastrašen"
 
-#: gajim/common/const.py:347
+#: gajim/common/const.py:381
 msgid "Distracted"
 msgstr "Smeten"
 
-#: gajim/common/const.py:348
+#: gajim/common/const.py:382
 msgid "Embarrassed"
 msgstr "Postiđen"
 
-#: gajim/common/const.py:349
+#: gajim/common/const.py:383
 msgid "Envious"
 msgstr "Zavidan"
 
-#: gajim/common/const.py:350
+#: gajim/common/const.py:384
 msgid "Excited"
 msgstr "Uzbuđen"
 
-#: gajim/common/const.py:351
+#: gajim/common/const.py:385
 msgid "Flirtatious"
 msgstr "Koketan"
 
-#: gajim/common/const.py:352
+#: gajim/common/const.py:386
 msgid "Frustrated"
 msgstr "Frustriran"
 
-#: gajim/common/const.py:353
+#: gajim/common/const.py:387
 msgid "Grateful"
 msgstr "Zahvalan"
 
-#: gajim/common/const.py:354
+#: gajim/common/const.py:388
 msgid "Grieving"
 msgstr "Tuguje"
 
-#: gajim/common/const.py:355
+#: gajim/common/const.py:389
 msgid "Grumpy"
 msgstr "Zanovijeta"
 
-#: gajim/common/const.py:356
+#: gajim/common/const.py:390
 msgid "Guilty"
 msgstr "Kriv"
 
-#: gajim/common/const.py:357
+#: gajim/common/const.py:391
 msgid "Happy"
 msgstr "Sretan"
 
-#: gajim/common/const.py:358
+#: gajim/common/const.py:392
 msgid "Hopeful"
 msgstr "Pun nade"
 
-#: gajim/common/const.py:359
+#: gajim/common/const.py:393
 msgid "Hot"
 msgstr "Vruć"
 
-#: gajim/common/const.py:360
+#: gajim/common/const.py:394
 msgid "Humbled"
 msgstr "Skroman"
 
-#: gajim/common/const.py:361
+#: gajim/common/const.py:395
 msgid "Humiliated"
 msgstr "Ponižen"
 
-#: gajim/common/const.py:362
+#: gajim/common/const.py:396
 msgid "Hungry"
 msgstr "Gladan"
 
-#: gajim/common/const.py:363
+#: gajim/common/const.py:397
 msgid "Hurt"
 msgstr "Povrijeđen"
 
-#: gajim/common/const.py:364
+#: gajim/common/const.py:398
 msgid "Impressed"
 msgstr "Impresioniran"
 
-#: gajim/common/const.py:365
+#: gajim/common/const.py:399
 msgid "In Awe"
 msgstr "Pun strahopoštovanja"
 
-#: gajim/common/const.py:366
+#: gajim/common/const.py:400
 msgid "In Love"
 msgstr "Zaljubljen"
 
-#: gajim/common/const.py:367
+#: gajim/common/const.py:401
 msgid "Indignant"
 msgstr "Nezadovoljan"
 
-#: gajim/common/const.py:368
+#: gajim/common/const.py:402
 msgid "Interested"
 msgstr "Zainteresiran"
 
-#: gajim/common/const.py:369
+#: gajim/common/const.py:403
 msgid "Intoxicated"
 msgstr "Pijan"
 
-#: gajim/common/const.py:370
+#: gajim/common/const.py:404
 msgid "Invincible"
 msgstr "Nepobjediv"
 
-#: gajim/common/const.py:371
+#: gajim/common/const.py:405
 msgid "Jealous"
 msgstr "Ljubomoran"
 
-#: gajim/common/const.py:372
+#: gajim/common/const.py:406
 msgid "Lonely"
 msgstr "Usamljen"
 
-#: gajim/common/const.py:373
+#: gajim/common/const.py:407
 msgid "Lost"
 msgstr "Izgubljen"
 
-#: gajim/common/const.py:374
+#: gajim/common/const.py:408
 msgid "Lucky"
 msgstr "Sretan"
 
-#: gajim/common/const.py:375
+#: gajim/common/const.py:409
 msgid "Mean"
 msgstr "Podmukao"
 
-#: gajim/common/const.py:376
+#: gajim/common/const.py:410
 msgid "Moody"
 msgstr "Zlovoljan"
 
-#: gajim/common/const.py:377
+#: gajim/common/const.py:411
 msgid "Nervous"
 msgstr "Živčan"
 
-#: gajim/common/const.py:378
+#: gajim/common/const.py:412
 msgid "Neutral"
 msgstr "Neutralan"
 
-#: gajim/common/const.py:379
+#: gajim/common/const.py:413
 msgid "Offended"
 msgstr "Uvrijeđen"
 
-#: gajim/common/const.py:380
+#: gajim/common/const.py:414
 msgid "Outraged"
 msgstr "Nasilan"
 
-#: gajim/common/const.py:381
+#: gajim/common/const.py:415
 msgid "Playful"
 msgstr "Razigran"
 
-#: gajim/common/const.py:382
+#: gajim/common/const.py:416
 msgid "Proud"
 msgstr "Ponosan"
 
-#: gajim/common/const.py:383
+#: gajim/common/const.py:417
 msgid "Relaxed"
 msgstr "Opušten"
 
-#: gajim/common/const.py:384
+#: gajim/common/const.py:418
 msgid "Relieved"
 msgstr "Umiren"
 
-#: gajim/common/const.py:385
+#: gajim/common/const.py:419
 msgid "Remorseful"
 msgstr "Sažaljen"
 
-#: gajim/common/const.py:386
+#: gajim/common/const.py:420
 msgid "Restless"
 msgstr "Nemiran"
 
-#: gajim/common/const.py:387
+#: gajim/common/const.py:421
 msgid "Sad"
 msgstr "Tužan"
 
-#: gajim/common/const.py:388
+#: gajim/common/const.py:422
 msgid "Sarcastic"
 msgstr "Zajedljiv"
 
-#: gajim/common/const.py:389
+#: gajim/common/const.py:423
 msgid "Satisfied"
 msgstr "Zadovoljan"
 
-#: gajim/common/const.py:390
+#: gajim/common/const.py:424
 msgid "Serious"
 msgstr "Ozbiljan"
 
-#: gajim/common/const.py:391
+#: gajim/common/const.py:425
 msgid "Shocked"
 msgstr "Šokiran"
 
-#: gajim/common/const.py:392
+#: gajim/common/const.py:426
 msgid "Shy"
 msgstr "Sramežljiv"
 
-#: gajim/common/const.py:393
+#: gajim/common/const.py:427
 msgid "Sick"
 msgstr "Bolestan"
 
-#: gajim/common/const.py:394
+#: gajim/common/const.py:428
 msgid "Sleepy"
 msgstr "Pospan"
 
-#: gajim/common/const.py:395
+#: gajim/common/const.py:429
 msgid "Spontaneous"
 msgstr "Spontan"
 
-#: gajim/common/const.py:396
+#: gajim/common/const.py:430
 msgid "Stressed"
 msgstr "Pod stresom"
 
-#: gajim/common/const.py:397
+#: gajim/common/const.py:431
 msgid "Strong"
 msgstr "Jak"
 
-#: gajim/common/const.py:398
+#: gajim/common/const.py:432
 msgid "Surprised"
 msgstr "Iznenađen"
 
-#: gajim/common/const.py:399
+#: gajim/common/const.py:433
 msgid "Thankful"
 msgstr "Zahvalan"
 
-#: gajim/common/const.py:400
+#: gajim/common/const.py:434
 msgid "Thirsty"
 msgstr "Žedan"
 
-#: gajim/common/const.py:401
+#: gajim/common/const.py:435
 msgid "Tired"
 msgstr "Umoran"
 
-#: gajim/common/const.py:402
+#: gajim/common/const.py:436
 msgid "Undefined"
 msgstr "Neodređen"
 
-#: gajim/common/const.py:403
+#: gajim/common/const.py:437
 msgid "Weak"
 msgstr "Slab"
 
-#: gajim/common/const.py:404
+#: gajim/common/const.py:438
 msgid "Worried"
 msgstr "Zabrinut"
 
-#: gajim/common/const.py:408
+#: gajim/common/const.py:442
 msgid "accuracy"
 msgstr ""
 
-#: gajim/common/const.py:409
+#: gajim/common/const.py:443
 #, fuzzy
 msgid "alt"
 msgstr "predefinirano"
 
-#: gajim/common/const.py:410
+#: gajim/common/const.py:444
 msgid "area"
 msgstr ""
 
-#: gajim/common/const.py:411
+#: gajim/common/const.py:445
 #, fuzzy
 msgid "bearing"
 msgstr "morska"
 
-#: gajim/common/const.py:412
+#: gajim/common/const.py:446
 #, fuzzy
 msgid "building"
 msgstr "Skrivam se"
 
-#: gajim/common/const.py:413
+#: gajim/common/const.py:447
 #, fuzzy
 msgid "country"
 msgstr "Država:"
 
-#: gajim/common/const.py:414
+#: gajim/common/const.py:448
 #, fuzzy
 msgid "countrycode"
 msgstr "Korisnički račun"
 
-#: gajim/common/const.py:415
+#: gajim/common/const.py:449
 msgid "datum"
 msgstr ""
 
-#: gajim/common/const.py:416
+#: gajim/common/const.py:450
 #, fuzzy
 msgid "description"
 msgstr "Opis"
 
-#: gajim/common/const.py:417
+#: gajim/common/const.py:451
 #, fuzzy
 msgid "error"
 msgstr "Greška"
 
-#: gajim/common/const.py:418
+#: gajim/common/const.py:452
 msgid "floor"
 msgstr ""
 
-#: gajim/common/const.py:419
+#: gajim/common/const.py:453
 msgid "lat"
 msgstr ""
 
-#: gajim/common/const.py:420
+#: gajim/common/const.py:454
 msgid "locality"
 msgstr ""
 
-#: gajim/common/const.py:421
+#: gajim/common/const.py:455
 #, fuzzy
 msgid "lon"
 msgstr "jedan"
 
-#: gajim/common/const.py:422
+#: gajim/common/const.py:456
 msgid "postalcode"
 msgstr ""
 
-#: gajim/common/const.py:423
+#: gajim/common/const.py:457
 msgid "region"
 msgstr ""
 
-#: gajim/common/const.py:424
+#: gajim/common/const.py:458
 msgid "room"
 msgstr "soba"
 
-#: gajim/common/const.py:425
+#: gajim/common/const.py:459
 msgid "speed"
 msgstr ""
 
-#: gajim/common/const.py:426
+#: gajim/common/const.py:460
 msgid "street"
 msgstr ""
 
-#: gajim/common/const.py:427
+#: gajim/common/const.py:461
 msgid "text"
 msgstr ""
 
-#: gajim/common/const.py:428
+#: gajim/common/const.py:462
 msgid "timestamp"
 msgstr ""
 
-#: gajim/common/const.py:429
+#: gajim/common/const.py:463
 msgid "URI"
 msgstr ""
 
-#: gajim/common/const.py:434
+#: gajim/common/const.py:468
 msgid "Unable to get issuer certificate"
 msgstr "Nemoguće dobaviti certifikat izdavača"
 
-#: gajim/common/const.py:435
+#: gajim/common/const.py:469
 msgid "Unable to get certificate CRL"
 msgstr "Nemoguće dobaviti CRL certifikata"
 
-#: gajim/common/const.py:436
+#: gajim/common/const.py:470
 msgid "Unable to decrypt certificate's signature"
 msgstr "Nemoguće dekriptirati potpis certifikata"
 
-#: gajim/common/const.py:437
+#: gajim/common/const.py:471
 msgid "Unable to decrypt CRL's signature"
 msgstr "Nemoguće dekriptirati CRL potpis"
 
-#: gajim/common/const.py:438
+#: gajim/common/const.py:472
 msgid "Unable to decode issuer public key"
 msgstr "Nije moguće dekodirati izdavačev javni ključ"
 
-#: gajim/common/const.py:439
+#: gajim/common/const.py:473
 msgid "Certificate signature failure"
 msgstr "Greška u potpisu certifikata"
 
-#: gajim/common/const.py:440
+#: gajim/common/const.py:474
 msgid "CRL signature failure"
 msgstr "Greška u CRL potpisu"
 
-#: gajim/common/const.py:441
+#: gajim/common/const.py:475
 msgid "Certificate is not yet valid"
 msgstr "Certifikat još nije ispravan"
 
-#: gajim/common/const.py:442
+#: gajim/common/const.py:476
 msgid "Certificate has expired"
 msgstr "Certifikat je istekao"
 
-#: gajim/common/const.py:443
+#: gajim/common/const.py:477
 msgid "CRL is not yet valid"
 msgstr "CRL nije još ispravan"
 
-#: gajim/common/const.py:444
+#: gajim/common/const.py:478
 msgid "CRL has expired"
 msgstr "CRL je istekao"
 
-#: gajim/common/const.py:445
+#: gajim/common/const.py:479
 msgid "Format error in certificate's notBefore field"
 msgstr "Format greška u certifikatovom notBefore polju"
 
-#: gajim/common/const.py:446
+#: gajim/common/const.py:480
 msgid "Format error in certificate's notAfter field"
 msgstr "Format greška u certifikatovom notAfter polju"
 
-#: gajim/common/const.py:447
+#: gajim/common/const.py:481
 msgid "Format error in CRL's lastUpdate field"
 msgstr "Format greška u CRL lastUpdate polju"
 
-#: gajim/common/const.py:448
+#: gajim/common/const.py:482
 msgid "Format error in CRL's nextUpdate field"
 msgstr "Format greška u CRL nextUpdate polju"
 
-#: gajim/common/const.py:449
+#: gajim/common/const.py:483
 msgid "Out of memory"
 msgstr "Nema dovoljno memorije"
 
-#: gajim/common/const.py:450
+#: gajim/common/const.py:484
 msgid "Self signed certificate"
 msgstr "Osobno potpisan certifikat"
 
-#: gajim/common/const.py:451
+#: gajim/common/const.py:485
 msgid "Self signed certificate in certificate chain"
 msgstr "Osobno potpisan certifikat u lancu"
 
-#: gajim/common/const.py:452
+#: gajim/common/const.py:486
 msgid "Unable to get local issuer certificate"
 msgstr "Nemoguće dobaviti certifikat lokalnog izdavača"
 
-#: gajim/common/const.py:453
+#: gajim/common/const.py:487
 msgid "Unable to verify the first certificate"
 msgstr "Nemoguće potvrditi ispravnost prvog certifikata"
 
-#: gajim/common/const.py:454
+#: gajim/common/const.py:488
 msgid "Certificate chain too long"
 msgstr "Lanac certifikata je pre dugačak"
 
-#: gajim/common/const.py:455
+#: gajim/common/const.py:489
 msgid "Certificate revoked"
 msgstr "Certifikat je poništen"
 
-#: gajim/common/const.py:456
+#: gajim/common/const.py:490
 msgid "Invalid CA certificate"
 msgstr "Neispravan CA certifikat"
 
-#: gajim/common/const.py:457
+#: gajim/common/const.py:491
 msgid "Path length constraint exceeded"
 msgstr "Pređeno ograničenje duljine putanje"
 
-#: gajim/common/const.py:458
+#: gajim/common/const.py:492
 msgid "Unsupported certificate purpose"
 msgstr "Nepodržana svrha certifikata"
 
-#: gajim/common/const.py:459
+#: gajim/common/const.py:493
 msgid "Certificate not trusted"
 msgstr "Certifikat nije pouzdan"
 
-#: gajim/common/const.py:460
+#: gajim/common/const.py:494
 msgid "Certificate rejected"
 msgstr "Certifikat odbijen"
 
-#: gajim/common/const.py:461
+#: gajim/common/const.py:495
 msgid "Subject issuer mismatch"
 msgstr "Subject issuer mismatch"
 
-#: gajim/common/const.py:462
+#: gajim/common/const.py:496
 msgid "Authority and subject key identifier mismatch"
 msgstr "Authority and subject key identifier mismatch"
 
-#: gajim/common/const.py:463
+#: gajim/common/const.py:497
 msgid "Authority and issuer serial number mismatch"
 msgstr "Authority and issuer serial number mismatch"
 
-#: gajim/common/const.py:464
+#: gajim/common/const.py:498
 msgid "Key usage does not include certificate signing"
 msgstr "Korištenje ključa ne uključuje potpisivanje certifikata"
 
-#: gajim/common/const.py:465
+#: gajim/common/const.py:499
 msgid "Application verification failure"
 msgstr "Application verification failure"
 
@@ -5173,199 +5309,199 @@ msgstr ""
 msgid "video output"
 msgstr ""
 
-#: gajim/common/helpers.py:210
+#: gajim/common/helpers.py:216
 msgid "Server must be between 1 and 1023 bytes"
 msgstr ""
 
-#: gajim/common/helpers.py:214
+#: gajim/common/helpers.py:220
 msgid "Invalid character in hostname."
 msgstr "Neispravan znak u imenu računala."
 
-#: gajim/common/helpers.py:216
+#: gajim/common/helpers.py:222
 msgid "Server address required."
 msgstr "Potrebna je adresa poslužitelja."
 
-#: gajim/common/helpers.py:220
+#: gajim/common/helpers.py:226
 msgid "Username must be between 1 and 1023 bytes"
 msgstr ""
 
-#: gajim/common/helpers.py:224
+#: gajim/common/helpers.py:230
 msgid "Invalid character in username."
 msgstr "Neispravan znak u korisničkom imenu."
 
-#: gajim/common/helpers.py:230
+#: gajim/common/helpers.py:236
 msgid "Resource must be between 1 and 1023 bytes"
 msgstr ""
 
-#: gajim/common/helpers.py:234
+#: gajim/common/helpers.py:240
 msgid "Invalid character in resource."
 msgstr "Neispravan znak u resursu."
 
-#: gajim/common/helpers.py:275
+#: gajim/common/helpers.py:281
 msgid "_Busy"
 msgstr "_Zauzet"
 
-#: gajim/common/helpers.py:277 gajim/gtk/tooltips.py:647
+#: gajim/common/helpers.py:283 gajim/gtk/tooltips.py:647
 msgid "Busy"
 msgstr "Zauzet"
 
-#: gajim/common/helpers.py:280
+#: gajim/common/helpers.py:286
 msgid "_Not Available"
 msgstr "_Nedostupan"
 
-#: gajim/common/helpers.py:282 gajim/gtk/tooltips.py:649
+#: gajim/common/helpers.py:288 gajim/gtk/tooltips.py:649
 msgid "Not Available"
 msgstr "Nedostupan"
 
-#: gajim/common/helpers.py:285
+#: gajim/common/helpers.py:291
 msgid "_Free for Chat"
 msgstr "_Slobodan za razgovor"
 
-#: gajim/common/helpers.py:287 gajim/gtk/tooltips.py:643
+#: gajim/common/helpers.py:293 gajim/gtk/tooltips.py:643
 msgid "Free for Chat"
 msgstr "Slobodan za razgovor"
 
-#: gajim/common/helpers.py:290
+#: gajim/common/helpers.py:296
 #, fuzzy
 msgid "?user status:_Available"
 msgstr "?status prijenosa:Stanka"
 
-#: gajim/common/helpers.py:292 gajim/gtk/tooltips.py:641
+#: gajim/common/helpers.py:298 gajim/gtk/tooltips.py:641
 #, fuzzy
 msgid "?user status:Available"
 msgstr "?status prijenosa:Stanka"
 
-#: gajim/common/helpers.py:294
+#: gajim/common/helpers.py:300
 msgid "Connecting"
 msgstr "Povezujem"
 
-#: gajim/common/helpers.py:297 gajim/data/gui/preferences_window.ui:1251
+#: gajim/common/helpers.py:303 gajim/data/gui/preferences_window.ui:1251
 msgid "A_way"
 msgstr "O_dsutan"
 
-#: gajim/common/helpers.py:299 gajim/common/modules/adhoc_commands.py:120
-#: gajim/command_system/implementation/standard.py:139
+#: gajim/common/helpers.py:305 gajim/common/modules/adhoc_commands.py:120
+#: gajim/command_system/implementation/standard.py:141
 #: gajim/gtk/tooltips.py:645
 msgid "Away"
 msgstr "Odsutan"
 
-#: gajim/common/helpers.py:302
+#: gajim/common/helpers.py:308
 msgid "_Offline"
 msgstr "_Odspojen"
 
-#: gajim/common/helpers.py:304 gajim/gtk/tooltips.py:651
+#: gajim/common/helpers.py:310 gajim/gtk/tooltips.py:651
 msgid "Offline"
 msgstr "Odspojen"
 
-#: gajim/common/helpers.py:307
+#: gajim/common/helpers.py:313
 msgid "_Invisible"
 msgstr "_Nevidljiv"
 
-#: gajim/common/helpers.py:313
+#: gajim/common/helpers.py:319
 msgid "?contact has status:Unknown"
 msgstr "?kontakt ima status:Nepoznat"
 
-#: gajim/common/helpers.py:315
+#: gajim/common/helpers.py:321
 msgid "?contact has status:Has errors"
 msgstr "?kontakt ima status:Ima greške"
 
-#: gajim/common/helpers.py:330
+#: gajim/common/helpers.py:336
 msgid "?Subscription we already have:None"
 msgstr "?Pretplata koju već imamo:Ništa"
 
-#: gajim/common/helpers.py:332
+#: gajim/common/helpers.py:338
 msgid "To"
 msgstr "Za"
 
-#: gajim/common/helpers.py:334 gajim/data/gui/groups_post_window.ui:33
+#: gajim/common/helpers.py:340 gajim/data/gui/groups_post_window.ui:33
 msgid "From"
 msgstr "Od"
 
-#: gajim/common/helpers.py:336
+#: gajim/common/helpers.py:342
 msgid "Both"
 msgstr "Oboje"
 
-#: gajim/common/helpers.py:338 gajim/gtk/server_info.py:151
+#: gajim/common/helpers.py:344 gajim/gtk/server_info.py:151
 #, fuzzy
 msgid "Unknown"
 msgstr "?OS:Nepoznat"
 
-#: gajim/common/helpers.py:344
+#: gajim/common/helpers.py:350
 msgid "?Ask (for Subscription):None"
 msgstr "?Pitaj (za Pretplatu):Ništa"
 
-#: gajim/common/helpers.py:346
+#: gajim/common/helpers.py:352
 msgid "Subscribe"
 msgstr "Pretplatite se"
 
-#: gajim/common/helpers.py:355
+#: gajim/common/helpers.py:361
 msgid "?Group Chat Contact Role:None"
 msgstr "?Uloga Kontakta u Grupnom Razgvoru:Nikakva"
 
-#: gajim/common/helpers.py:358
+#: gajim/common/helpers.py:364
 msgid "Moderators"
 msgstr "Moderatori"
 
-#: gajim/common/helpers.py:360
+#: gajim/common/helpers.py:366
 msgid "Moderator"
 msgstr "Moderator"
 
-#: gajim/common/helpers.py:363
+#: gajim/common/helpers.py:369 gajim/data/gui/groupchat_info_scrolled.ui:243
 msgid "Participants"
 msgstr "Sudionici"
 
-#: gajim/common/helpers.py:365
+#: gajim/common/helpers.py:371
 msgid "Participant"
 msgstr "Sudionik"
 
-#: gajim/common/helpers.py:368
+#: gajim/common/helpers.py:374
 msgid "Visitors"
 msgstr "Posjetitelji"
 
-#: gajim/common/helpers.py:370
+#: gajim/common/helpers.py:376
 msgid "Visitor"
 msgstr "Posjetitelj"
 
-#: gajim/common/helpers.py:376 gajim/gtk/tooltips.py:253
+#: gajim/common/helpers.py:382 gajim/gtk/tooltips.py:253
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "?Vezanost Kontakta u Grupnom Razgvoru:Nikakva"
 
-#: gajim/common/helpers.py:378 gajim/data/gui/groupchat_config.ui:32
+#: gajim/common/helpers.py:384 gajim/data/gui/groupchat_config.ui:32
 #: gajim/gtk/tooltips.py:259
 msgid "Owner"
 msgstr "Vlasnik"
 
-#: gajim/common/helpers.py:380 gajim/gtk/tooltips.py:257
+#: gajim/common/helpers.py:386 gajim/gtk/tooltips.py:257
 msgid "Administrator"
 msgstr "Administrator"
 
-#: gajim/common/helpers.py:382 gajim/data/gui/groupchat_config.ui:40
+#: gajim/common/helpers.py:388 gajim/data/gui/groupchat_config.ui:40
 #: gajim/gtk/tooltips.py:255 gajim/gtk/groupchat_config.py:105
 msgid "Member"
 msgstr "Član"
 
-#: gajim/common/helpers.py:421
+#: gajim/common/helpers.py:427
 msgid "is paying attention to the conversation"
 msgstr "obraća pažnju na razgovor"
 
-#: gajim/common/helpers.py:423
+#: gajim/common/helpers.py:429
 msgid "is doing something else"
 msgstr "radi nešto drugo"
 
-#: gajim/common/helpers.py:425
+#: gajim/common/helpers.py:431
 #, fuzzy
 msgid "is composing a message…"
 msgstr "piše poruku..."
 
-#: gajim/common/helpers.py:428
+#: gajim/common/helpers.py:434
 msgid "paused composing a message"
 msgstr "stanka pri pisanju poruke"
 
-#: gajim/common/helpers.py:430
+#: gajim/common/helpers.py:436
 msgid "has closed the chat window or tab"
 msgstr "je zatvorio/zatvorila prozor za razgovor"
 
-#: gajim/common/helpers.py:936 gajim/common/helpers.py:943
+#: gajim/common/helpers.py:942 gajim/common/helpers.py:949
 #, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
@@ -5373,22 +5509,22 @@ msgstr[0] "%d poruka na čekanju"
 msgstr[1] "%d poruke na čekanju"
 msgstr[2] "%d poruka na čekanju"
 
-#: gajim/common/helpers.py:950
+#: gajim/common/helpers.py:956
 #, fuzzy, python-format
-msgid "from room %s"
-msgstr "iz sobe %s"
+msgid "from group chat %s"
+msgstr "u _grupnim razgovorima"
 
-#: gajim/common/helpers.py:953 gajim/common/helpers.py:970
+#: gajim/common/helpers.py:959 gajim/common/helpers.py:976
 #, fuzzy, python-format
 msgid "from user %s"
 msgstr "od korisnika %s"
 
-#: gajim/common/helpers.py:955
+#: gajim/common/helpers.py:961
 #, fuzzy, python-format
 msgid "from %s"
 msgstr "od %s"
 
-#: gajim/common/helpers.py:962 gajim/common/helpers.py:968
+#: gajim/common/helpers.py:968 gajim/common/helpers.py:974
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
@@ -5396,40 +5532,40 @@ 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:986 gajim/common/helpers.py:998
+#: gajim/common/helpers.py:992 gajim/common/helpers.py:1004
 #: gajim/data/gui/roster_window.ui:85 data/org.gajim.Gajim.desktop.in:4
 #: data/org.gajim.Gajim.appdata.xml.in:9
 msgid "Gajim"
 msgstr "Gajim"
 
-#: gajim/common/helpers.py:1000
+#: gajim/common/helpers.py:1006
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: gajim/common/helpers.py:1109 gajim/data/gui/add_new_contact_window.ui:25
+#: gajim/common/helpers.py:1115 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:1111
+#: gajim/common/helpers.py:1117
 msgid "Hello, I am $name."
 msgstr ""
 
-#: gajim/common/helpers.py:1215 gajim/common/helpers.py:1224
-#: gajim/common/helpers.py:1282
+#: gajim/common/helpers.py:1221 gajim/common/helpers.py:1230
+#: gajim/common/helpers.py:1288
 msgid "Timeout loading image"
 msgstr "Vrijeme isteklo kod učitavanja slike"
 
-#: gajim/common/helpers.py:1234 gajim/common/helpers.py:1280
+#: gajim/common/helpers.py:1240 gajim/common/helpers.py:1286
 msgid "Image is too big"
 msgstr "Slika je prevelika"
 
-#: gajim/common/helpers.py:1245
+#: gajim/common/helpers.py:1251
 #, fuzzy
 msgid "PyCURL is not installed"
 msgstr "CRL nije još ispravan"
 
-#: gajim/common/helpers.py:1284
+#: gajim/common/helpers.py:1290
 #, fuzzy
 msgid "Error loading image"
 msgstr "Vrijeme isteklo kod učitavanja slike"
@@ -5609,7 +5745,8 @@ msgstr "Status je promjenjen."
 
 #: gajim/common/modules/adhoc_commands.py:202
 #: gajim/common/modules/adhoc_commands.py:239
-msgid "Leave Groupchats"
+#, fuzzy
+msgid "Leave Group Chats"
 msgstr "Novi Grupni Razgovor"
 
 #: gajim/common/modules/adhoc_commands.py:228
@@ -5618,15 +5755,18 @@ msgid "%(nickname)s on %(room_jid)s"
 msgstr "%(nickname)s u %(room_jid)s"
 
 #: gajim/common/modules/adhoc_commands.py:232
-msgid "You have not joined a groupchat."
+#, fuzzy
+msgid "You have not joined a group chat."
 msgstr "Niste se  pridružili grupnom razgovoru"
 
 #: gajim/common/modules/adhoc_commands.py:240
-msgid "Choose the groupchats you want to leave"
+#, fuzzy
+msgid "Choose the group chats you want to leave"
 msgstr "Izaberite grupne razgovore koje želite napustiti"
 
 #: gajim/common/modules/adhoc_commands.py:289
-msgid "You left the following groupchats:"
+#, fuzzy
+msgid "You left the following group chats:"
 msgstr "Napustili ste sljedeći grupni razgovor:"
 
 #: gajim/common/modules/roster_item_exchange.py:102
@@ -5642,7 +5782,7 @@ msgstr "Poslani kontakti:"
 msgid "Blocked Contacts"
 msgstr "Blokirani Kontakti"
 
-#: gajim/data/gui/destroy_muc_dialog.ui:79 gajim/gtk/dialogs.py:736
+#: gajim/data/gui/destroy_muc_dialog.ui:79 gajim/gtk/dialogs.py:563
 msgid "Destroy this group chat permanently?"
 msgstr ""
 
@@ -5651,7 +5791,7 @@ msgstr ""
 msgid "Reason..."
 msgstr "Razlog"
 
-#: gajim/data/gui/destroy_muc_dialog.ui:124 gajim/gtk/dialogs.py:738
+#: gajim/data/gui/destroy_muc_dialog.ui:124 gajim/gtk/dialogs.py:565
 msgid "Where participants should go (optional)"
 msgstr ""
 
@@ -5664,35 +5804,6 @@ msgstr ""
 msgid "_Reason and alternate venue (optional)"
 msgstr "Također možete unjeti alternativno mjesto sastanka:"
 
-#: gajim/data/gui/advanced_configuration_window.ui:7
-#: gajim/data/gui/preferences_window.ui:2723
-#, fuzzy
-msgid "Advanced Configuration Editor (ACE)"
-msgstr "Napredni Uređivač Postavki"
-
-#: gajim/data/gui/advanced_configuration_window.ui:52
-#, fuzzy
-msgid "You should restart Gajim for some changes to take effect"
-msgstr ""
-"<b>NAPOMENA:</b> Trebali bi ste ponovno pokrenuti gajim da bi neke postavke "
-"postale aktivne"
-
-#: gajim/data/gui/advanced_configuration_window.ui:84
-#, fuzzy
-msgid "_Filter"
-msgstr "_Filter:"
-
-#: gajim/data/gui/advanced_configuration_window.ui:153
-#: gajim/data/gui/filetransfers_send_file_dialog.ui:15
-#: gajim/gtk/discovery.py:1666
-msgid "Description"
-msgstr "Opis"
-
-#: gajim/data/gui/advanced_configuration_window.ui:197
-#, fuzzy
-msgid "_Reset to default"
-msgstr "_Vrati predefinirane boje"
-
 #: gajim/data/gui/join_groupchat_window.ui:56
 #: gajim/data/gui/chat_to_muc_window.ui:67
 #: gajim/data/gui/chat_to_muc_window.ui:78
@@ -5704,9 +5815,8 @@ msgid "Join group chat every time Gajim is started"
 msgstr ""
 
 #: gajim/data/gui/join_groupchat_window.ui:113
-#, fuzzy
-msgid "Auto Join"
-msgstr "Automatsko spajanje"
+msgid "Join Automatically"
+msgstr ""
 
 #: gajim/data/gui/join_groupchat_window.ui:131
 #: gajim/data/gui/profile_window.ui:233
@@ -5715,10 +5825,11 @@ msgstr "Korisnički račun"
 
 #: gajim/data/gui/join_groupchat_window.ui:147
 #, fuzzy
-msgid "Room"
-msgstr "Soba:"
+msgid "Group chat"
+msgstr "Grupni Razgovori"
 
-#: gajim/data/gui/join_groupchat_window.ui:180 gajim/gtk/accounts.py:886
+#: gajim/data/gui/join_groupchat_window.ui:180 gajim/data/gui/bookmarks.ui:158
+#: gajim/gtk/accounts.py:889
 #, fuzzy
 msgid "Password"
 msgstr "Lozinka:"
@@ -5742,94 +5853,11 @@ msgstr "u _grupnim razgovorima"
 msgid "Search group chats on selected server"
 msgstr ""
 
-#: gajim/data/gui/join_groupchat_window.ui:437 gajim/gtk/discovery.py:1271
+#: gajim/data/gui/join_groupchat_window.ui:437 gajim/gtk/discovery.py:1270
 #, fuzzy
 msgid "Join"
 msgstr "_Pridruživanje"
 
-#: gajim/data/gui/manage_proxies_window.ui:12
-#, fuzzy
-msgid "HTTP Connect"
-msgstr ""
-"HTTP Spoj\n"
-"SOCKS5\n"
-"BOSH"
-
-#: gajim/data/gui/manage_proxies_window.ui:15
-msgid "SOCKS5"
-msgstr ""
-
-#: gajim/data/gui/manage_proxies_window.ui:18
-msgid "BOSH"
-msgstr ""
-
-#: gajim/data/gui/manage_proxies_window.ui:27
-msgid "Manage Proxy Profiles"
-msgstr "Podešavanje Proxy Profila"
-
-#: gajim/data/gui/manage_proxies_window.ui:83
-#, fuzzy
-msgid "Add Proxy"
-msgstr "Proxy:"
-
-#: gajim/data/gui/manage_proxies_window.ui:97
-#, fuzzy
-msgid "Remove Proxy"
-msgstr "Ukloni Grupu"
-
-#: gajim/data/gui/manage_proxies_window.ui:141
-#, fuzzy
-msgid "Properties"
-msgstr "<b>Karakteristike</b>"
-
-#: gajim/data/gui/manage_proxies_window.ui:157
-#, fuzzy
-msgid "_Name"
-msgstr "_Ime:"
-
-#: gajim/data/gui/manage_proxies_window.ui:173
-#, fuzzy
-msgid "_Type"
-msgstr "_Vrsta:"
-
-#: gajim/data/gui/manage_proxies_window.ui:236
-#, fuzzy
-msgid "_BOSH URL"
-msgstr "_BOSH URL:"
-
-#: gajim/data/gui/manage_proxies_window.ui:261
-msgid "Use HTTP prox_y"
-msgstr "Koristi HTTP prox_y"
-
-#: gajim/data/gui/manage_proxies_window.ui:280
-#, fuzzy
-msgid "Proxy _Host"
-msgstr "Proxy _Računalo:"
-
-#: gajim/data/gui/manage_proxies_window.ui:307
-#, fuzzy
-msgid "Proxy _Port"
-msgstr "Proxy _Port:"
-
-#: gajim/data/gui/manage_proxies_window.ui:334
-#, fuzzy
-msgid "_Username"
-msgstr "_Korisničko ime:"
-
-#: gajim/data/gui/manage_proxies_window.ui:347
-msgid "Use proxy auth_entication"
-msgstr "Koristi proxy aut_entifikaciju"
-
-#: gajim/data/gui/manage_proxies_window.ui:377
-#, fuzzy
-msgid "Pass_word"
-msgstr "Lo_zinka:"
-
-#: gajim/data/gui/manage_proxies_window.ui:405 gajim/gtk/adhoc.py:321
-#, fuzzy
-msgid "Settings"
-msgstr "Registracija nije uspijela"
-
 #: gajim/data/gui/change_password_dialog.ui:17
 #, fuzzy
 msgid "New Password"
@@ -5860,11 +5888,13 @@ msgid "Status:"
 msgstr "Status:"
 
 #: gajim/data/gui/zeroconf_information_window.ui:89
-msgid "_Log conversation history"
+#, fuzzy
+msgid "_Store conversation history"
 msgstr "_Pamti povijest razgovora"
 
 #: gajim/data/gui/zeroconf_information_window.ui:215
 #: gajim/data/gui/vcard_information_window.ui:390
+#: gajim/data/gui/groupchat_info_scrolled.ui:166
 msgid "Contact"
 msgstr "Kontakt"
 
@@ -5877,8 +5907,9 @@ msgid "Last Name:"
 msgstr "Prezime:"
 
 #: gajim/data/gui/zeroconf_information_window.ui:260
-msgid "Jabber ID:"
-msgstr "Jabber ID:"
+#, fuzzy
+msgid "XMPP Address:"
+msgstr "AIM Adresa:"
 
 #: gajim/data/gui/zeroconf_information_window.ui:273
 msgid "E-Mail:"
@@ -5898,8 +5929,9 @@ msgid "Send _File"
 msgstr "Pošalji _Datoteku"
 
 #: gajim/data/gui/gc_occupants_menu.ui:29
-msgid "Occupant Actions"
-msgstr "Akcije Prisutnih"
+#, fuzzy
+msgid "Participant Actions"
+msgstr "Sudionici"
 
 #: gajim/data/gui/gc_occupants_menu.ui:38
 msgid "_Voice"
@@ -5930,8 +5962,9 @@ msgid "_Ban"
 msgstr "_Zabrani"
 
 #: gajim/data/gui/gc_occupants_menu.ui:124
-msgid "_Add to Roster"
-msgstr "_Dodaj na Listu"
+#, fuzzy
+msgid "_Add to Contact List"
+msgstr "_Dodaj Kontakt..."
 
 #: gajim/data/gui/gc_occupants_menu.ui:132
 #, fuzzy
@@ -5970,11 +6003,6 @@ msgstr "Pretplata:"
 msgid "_Status"
 msgstr "_Status"
 
-#: gajim/data/gui/zeroconf_context_menu.ui:26
-#: gajim/data/gui/account_context_menu.ui:79
-msgid "_Modify Account..."
-msgstr "_Izmjeni Račun..."
-
 #: gajim/data/gui/certificate_dialog.ui:66
 #: gajim/data/gui/certificate_dialog.ui:178
 msgid "Common Name (CN)"
@@ -6056,13 +6084,19 @@ msgstr "Posljednja izmjena:"
 msgid "Next entry"
 msgstr ""
 
+#: gajim/data/gui/filetransfers_send_file_dialog.ui:15
+#: gajim/data/gui/advanced_configuration.ui:143
+#: gajim/data/gui/groupchat_info_scrolled.ui:48 gajim/gtk/discovery.py:1663
+msgid "Description"
+msgstr "Opis"
+
 #: gajim/data/gui/filetransfers_send_file_dialog.ui:54
 #, fuzzy
 msgid "_Send Files"
 msgstr "Pošalji _Datoteku"
 
 #: gajim/data/gui/filetransfers_send_file_dialog.ui:58
-#: gajim/gtk/xml_console.py:90
+#: gajim/gtk/xml_console.py:87
 #, fuzzy
 msgid "Send"
 msgstr "_Pošalji"
@@ -6087,20 +6121,23 @@ msgid "Change _Nickname..."
 msgstr "Promijeni _Nadimak..."
 
 #: gajim/data/gui/gc_control_popup_menu.ui:20
-msgid "_Manage Room"
-msgstr "_Upravljanje sobom"
+#, fuzzy
+msgid "_Manage Group Chat"
+msgstr "_Novi Grupni Razgovor"
 
 #: gajim/data/gui/gc_control_popup_menu.ui:31
 msgid "Change _Subject..."
 msgstr "Promijeni _Temu..."
 
 #: gajim/data/gui/gc_control_popup_menu.ui:38
-msgid "Configure _Room..."
-msgstr "Podešavanje _Sobe..."
+#, fuzzy
+msgid "Configure _Group Chat..."
+msgstr "_Grupni Razgovori..."
 
 #: gajim/data/gui/gc_control_popup_menu.ui:52
-msgid "_Destroy Room"
-msgstr "_Uništi Sobu"
+#, fuzzy
+msgid "_Destroy Group Chat"
+msgstr "_Novi Grupni Razgovor"
 
 #: gajim/data/gui/gc_control_popup_menu.ui:64
 msgid "_Minimize on close"
@@ -6111,7 +6148,7 @@ msgstr "_Minimiziraj kod izlaza"
 msgid "_Request Voice"
 msgstr "_Glas"
 
-#: gajim/data/gui/gc_control_popup_menu.ui:99 gajim/gtk/discovery.py:1704
+#: gajim/data/gui/gc_control_popup_menu.ui:99
 msgid "_Bookmark"
 msgstr "_Postavi Oznaku"
 
@@ -6163,13 +6200,6 @@ msgstr "<b>Osobna Stranica:</b>"
 msgid "E-Mail"
 msgstr "E-Mail:"
 
-#: 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/blocking_list.ui:115 gajim/gtk/add_contact.py:30
-#: gajim/gtk/accounts.py:801
-msgid "Jabber ID"
-msgstr "Jabber ID"
-
 #: gajim/data/gui/profile_window.ui:440
 msgid "Main"
 msgstr ""
@@ -6304,35 +6334,42 @@ msgstr "Posao"
 msgid "About"
 msgstr "O meni"
 
-#: gajim/data/gui/start_chat_dialog.ui:114 gajim/gtk/discovery.py:1658
-msgid "Users"
-msgstr "Korisnici"
-
-#: gajim/data/gui/start_chat_dialog.ui:185
-msgid "Name:"
-msgstr "Ime:"
+#: gajim/data/gui/start_chat_dialog.ui:53
+#, fuzzy
+msgid "Global Group Chat Search"
+msgstr "Pridružiti se Grupnom Razgovoru"
 
-#: gajim/data/gui/start_chat_dialog.ui:197
+#: 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
-msgid "Description:"
-msgstr "Opis: "
+msgid "_Back"
+msgstr "Vraćam se ubrzo"
+
+#: gajim/data/gui/start_chat_dialog.ui:245
+#: gajim/data/gui/groupchat_control.ui:796
+#: gajim/data/gui/groupchat_control.ui:888 gajim/gtk/discovery.py:1701
+#: gajim/gtk/groupchat_join.py:62
+msgid "_Join"
+msgstr "_Pridruživanje"
 
-#: gajim/data/gui/start_chat_dialog.ui:209
+#: gajim/data/gui/start_chat_dialog.ui:289
 #, fuzzy
-msgid "Address:"
-msgstr "_Adresa:"
+msgid "Select Account"
+msgstr "Uklanjanje %s računa"
 
-#: gajim/data/gui/start_chat_dialog.ui:246
-msgid ""
-"Semi-Anonymous\n"
-"<span size=\"small\">(Only moderators can see your XMPP-Address)</span>"
+#: gajim/data/gui/start_chat_dialog.ui:380
+msgid "_Select"
 msgstr ""
 
 #: gajim/data/gui/filetransfers.ui:21
 msgid "Pa_use/Resume"
 msgstr ""
 
-#: gajim/data/gui/filetransfers.ui:30 gajim/gtk/filechoosers.py:178
+#: gajim/data/gui/filetransfers.ui:30 gajim/data/gui/groupchat_control.ui:575
+#: gajim/data/gui/groupchat_control.ui:667
+#: gajim/data/gui/groupchat_control.ui:779
+#: gajim/data/gui/groupchat_control.ui:871 gajim/gtk/filechoosers.py:178
 msgid "_Cancel"
 msgstr "_Odustani"
 
@@ -6375,7 +6412,8 @@ msgid "Cancel the selected file transfer and remove incomplete files"
 msgstr "Prekini transfer odabrane datoteke i izbriši nekompletnu datoteku"
 
 #: gajim/data/gui/filetransfers.ui:207
-msgid "Shows a list of file transfers between you and others"
+#, fuzzy
+msgid "Shows a list of file transfers between you and your contacts"
 msgstr "Prikazuje listu prijenosa datoteka između vas i ostalih"
 
 #: gajim/data/gui/groupchat_control.ui:13 gajim/data/gui/chat_control.ui:277
@@ -6395,7 +6433,6 @@ msgid "Strike"
 msgstr "Precrtaj"
 
 #: gajim/data/gui/groupchat_control.ui:54 gajim/data/gui/chat_control.ui:318
-#: gajim/gtk/advanced_config.py:86
 msgid "Color"
 msgstr "Boja"
 
@@ -6408,16 +6445,46 @@ msgstr "Font"
 msgid "Clear formatting"
 msgstr "Očisti oblikovanje"
 
-#: gajim/data/gui/groupchat_control.ui:290 gajim/data/gui/chat_control.ui:880
+#: gajim/data/gui/groupchat_control.ui:291 gajim/data/gui/chat_control.ui:880
 #, fuzzy
 msgid "Choose encryption"
 msgstr "Odabir Datoteke za Slanje..."
 
-#: gajim/data/gui/groupchat_control.ui:336 gajim/data/gui/chat_control.ui:640
+#: gajim/data/gui/groupchat_control.ui:337 gajim/data/gui/chat_control.ui:640
 #, fuzzy
 msgid "Show a list of emojis (Alt+M)"
 msgstr "Prikaži popis emoticona (Alt+M)"
 
+#: gajim/data/gui/groupchat_control.ui:484
+#, fuzzy
+msgid "Joining…"
+msgstr "Zabranjivanje..."
+
+#: gajim/data/gui/groupchat_control.ui:496
+msgid "_Abort"
+msgstr ""
+
+#: gajim/data/gui/groupchat_control.ui:542
+#, fuzzy
+msgid "Enter new nickname"
+msgstr "Unesite novi nadimak za kontakt %s"
+
+#: gajim/data/gui/groupchat_control.ui:592
+#: gajim/data/gui/groupchat_control.ui:684
+#, fuzzy
+msgid "Ch_ange"
+msgstr "Promijeni _Nadimak..."
+
+#: gajim/data/gui/groupchat_control.ui:761
+#, fuzzy
+msgid "Enter password"
+msgstr "Unesite novu lozinku:"
+
+#: gajim/data/gui/groupchat_control.ui:1067
+#, fuzzy
+msgid "_Try again"
+msgstr "Potvrdi ponovno..."
+
 #: gajim/data/gui/popup_notification_window.ui:42
 #, fuzzy
 msgid "Event Type"
@@ -6499,8 +6566,8 @@ msgstr "Odsutan"
 
 #: gajim/data/gui/mam_preferences.ui:18
 #, fuzzy
-msgid "Roster"
-msgstr "Prikaži _Listu Kontakata"
+msgid "Contact List"
+msgstr "Kontakti"
 
 #: gajim/data/gui/mam_preferences.ui:22
 #: gajim/data/gui/preferences_window.ui:123
@@ -6525,12 +6592,12 @@ msgid "Add"
 msgstr "Dodaj"
 
 #: gajim/data/gui/mam_preferences.ui:194 gajim/data/gui/groupchat_config.ui:151
-#: gajim/gtk/dialogs.py:63 gajim/gtk/accounts.py:381
+#: gajim/gtk/dialogs.py:62 gajim/gtk/accounts.py:384
 #, fuzzy
 msgid "Remove"
 msgstr "_Ukloni"
 
-#: gajim/data/gui/vcard_information_window.ui:72 gajim/gtk/accounts.py:753
+#: gajim/data/gui/vcard_information_window.ui:72 gajim/gtk/accounts.py:756
 #, fuzzy
 msgid "Resource"
 msgstr "Resurs"
@@ -6583,6 +6650,7 @@ msgstr "Pretplata:"
 #: gajim/data/gui/vcard_information_window.ui:974
 #: gajim/data/gui/vcard_information_window.ui:993
 #: gajim/data/gui/vcard_information_window.ui:1427
+#: gajim/data/gui/groupchat_info_scrolled.ui:222
 msgid "button"
 msgstr ""
 
@@ -6615,15 +6683,15 @@ msgstr "_Obavijesti me o tome"
 
 #: gajim/data/gui/preferences_window.ui:58
 #, fuzzy
-msgid "Show only in roster"
-msgstr "Prikaži samo u _listi kontakata"
+msgid "Show only in contact list"
+msgstr "Prikaži Samo _Aktivne Kontakte"
 
 #: gajim/data/gui/preferences_window.ui:69
-msgid "Detached roster with detached chats"
+msgid "Detached contact list with detached chats"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:72
-msgid "Detached roster with single chat"
+msgid "Detached contact list with single chat"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:75
@@ -6631,11 +6699,11 @@ msgid "Single window for everything"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:78
-msgid "Detached roster with chat grouped by account"
+msgid "Detached contact list with chat grouped by account"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:81
-msgid "Detached roster with chat grouped by type"
+msgid "Detached contact list with chat grouped by type"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:92
@@ -6691,7 +6759,7 @@ msgstr "_Ponašanje Prozora"
 
 #: gajim/data/gui/preferences_window.ui:296
 #, fuzzy
-msgid "_Show roster on startup"
+msgid "_Show contact list on startup"
 msgstr "Prikaži _listu kontakata"
 
 #: gajim/data/gui/preferences_window.ui:311
@@ -6707,12 +6775,12 @@ msgid "_Tabs placement"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:363
-msgid "_Quit Gajim when closing roster window"
+msgid "_Quit Gajim when closing contact list"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:367
 msgid ""
-"If enabled, Gajim will quit when closing the roster window instead of "
+"If enabled, Gajim will quit when closing the contact list window instead of "
 "minimizing to the system's notification area"
 msgstr ""
 
@@ -6722,41 +6790,42 @@ msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:423
 #, fuzzy
-msgid "Show a_vatars of contacts in roster"
+msgid "Show a_vatars of contacts in contact list"
 msgstr "Prikaži a_vatare kontakata na listi"
 
 #: gajim/data/gui/preferences_window.ui:427
 #, fuzzy
 msgid ""
-"If checked, avatars of contacts will be shown in the roster window and in "
-"group chats"
+"If checked, avatars of contacts will be shown in the contact list window and "
+"in group chats"
 msgstr ""
 "Ako je označeno, Gajim će prikazivati avatare kontakata u listi kontakata i "
 "u grupnim razgovorima"
 
 #: gajim/data/gui/preferences_window.ui:441
 #, fuzzy
-msgid "Show status _messages of contacts in roster"
+msgid "Show status _messages of contacts in contact list"
 msgstr "Prikaži statusne _poruke kontakata na listi"
 
 #: gajim/data/gui/preferences_window.ui:445
 #, fuzzy
 msgid ""
 "If checked, status messages of contacts will be shown under the contact's "
-"name, in the roster window, and in group chats"
+"name, in the contact list window, and in group chats"
 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
 #, fuzzy
-msgid "Show e_xtra information of contacts in roster (mood, activity, ...)"
+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
 msgid ""
-"If checked, additional info published by the contact will be shown in "
-"roster. Additional infos (published via PEP) may include e.g. mood, "
+"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 ""
 
@@ -6765,8 +6834,9 @@ msgid "Sort contacts by status"
 msgstr "Sortiranje kontakata po statusu"
 
 #: gajim/data/gui/preferences_window.ui:494
-msgid "in _roster"
-msgstr "na _listi"
+#, fuzzy
+msgid "in _contact list"
+msgstr "Poslani kontakti:"
 
 #: gajim/data/gui/preferences_window.ui:511
 msgid "in _group chats"
@@ -6774,8 +6844,8 @@ msgstr "u _grupnim razgovorima"
 
 #: gajim/data/gui/preferences_window.ui:540
 #, fuzzy
-msgid "Roster Appearance"
-msgstr "<b>Izgled Liste Kontakata</b>"
+msgid "Contact List Appearance"
+msgstr "Razmjena Artikla Sa Liste Kontakata"
 
 #: gajim/data/gui/preferences_window.ui:585
 #, fuzzy
@@ -6842,7 +6912,7 @@ msgstr "Nije moguće pridružiti se grupnom razgovoru"
 
 #: gajim/data/gui/preferences_window.ui:660
 #, fuzzy
-msgid "If checked, the room subject will be shown when joining a group chat"
+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:682
@@ -6857,13 +6927,13 @@ msgstr ""
 #: gajim/data/gui/preferences_window.ui:701
 msgid ""
 "If join/leave status messages are shown in the group chat. This setting can "
-"be overridden in the groupchat menu."
+"be overridden in the group chat menu."
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:720
 msgid ""
 "The default sync threshold for new public group chats. This setting can be "
-"overridden in the groupchat menu."
+"overridden in the group chat menu."
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:722
@@ -6878,7 +6948,7 @@ msgstr "_Pamti promjene statusa kontakata"
 #: gajim/data/gui/preferences_window.ui:768
 msgid ""
 "If status change messages are shown in the group chat. This setting can be "
-"overridden in the groupchat menu."
+"overridden in the group chat menu."
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:825
@@ -6897,8 +6967,8 @@ msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:843
 #, fuzzy
-msgid "Show chatstate in roster"
-msgstr "Prikaži a_vatare kontakata na listi"
+msgid "Show chatstate in contact list"
+msgstr "Prikaži gumb za zatvaranje u kartici?"
 
 #: gajim/data/gui/preferences_window.ui:847
 msgid ""
@@ -7203,7 +7273,7 @@ msgstr ""
 msgid "Vi_ew own video source"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2281 gajim/gtk/accounts.py:352
+#: gajim/data/gui/preferences_window.ui:2281 gajim/gtk/accounts.py:355
 msgid "Connection"
 msgstr "Veza"
 
@@ -7257,7 +7327,8 @@ msgid "_Manage..."
 msgstr "_Uredi..."
 
 #: gajim/data/gui/preferences_window.ui:2616
-msgid "_Log status changes of contacts"
+#, fuzzy
+msgid "_Store status changes of contacts in history"
 msgstr "_Pamti promjene statusa kontakata"
 
 #: gajim/data/gui/preferences_window.ui:2633
@@ -7282,10 +7353,15 @@ msgstr ""
 msgid "_Open..."
 msgstr "_Otvori..."
 
+#: gajim/data/gui/preferences_window.ui:2723 gajim/gtk/advanced_config.py:84
+#, fuzzy
+msgid "Advanced Configuration Editor (ACE)"
+msgstr "Napredni Uređivač Postavki"
+
 #: gajim/data/gui/groupchat_config.ui:55
 #, fuzzy
 msgid ""
-"<b>Jabber-ID</b>\n"
+"<b>XMPP Address</b>\n"
 "&lt;user@domain/resource&gt; (only that resource matches)\n"
 "&lt;user@domain&gt; (any resource matches)\n"
 "&lt;domain/resource&gt; (only that resource matches)\n"
@@ -7304,7 +7380,8 @@ msgstr ""
 msgid "Only Admins and Owners can modify the affiliation"
 msgstr ""
 
-#: gajim/data/gui/groupchat_config.ui:270 gajim/plugins/gui.py:312
+#: gajim/data/gui/groupchat_config.ui:270
+#: gajim/data/gui/groupchat_info_scrolled.ui:210 gajim/plugins/gui.py:324
 #, fuzzy
 msgid "Configuration"
 msgstr "Konfiguracija Sobe"
@@ -7337,7 +7414,7 @@ msgid "Start _Chat"
 msgstr "Započni _Razgovor"
 
 #: gajim/data/gui/contact_context_menu.ui:20
-#: gajim/data/gui/systray_context_menu.ui:36
+#: gajim/data/gui/systray_context_menu.ui:29
 msgid "Send Single _Message..."
 msgstr "Pošalji Jednu _Poruku..."
 
@@ -7398,17 +7475,45 @@ msgid "_Ignore"
 msgstr "_Ignoriraj"
 
 #: gajim/data/gui/contact_context_menu.ui:174
-msgid "_Add to Roster..."
-msgstr "_Dodaj na Listu..."
+#, fuzzy
+msgid "_Add to Contact List..."
+msgstr "_Dodaj Kontakt..."
+
+#: gajim/data/gui/advanced_configuration.ui:39
+#, fuzzy
+msgid "You should restart Gajim for some changes to take effect"
+msgstr ""
+"<b>NAPOMENA:</b> Trebali bi ste ponovno pokrenuti gajim da bi neke postavke "
+"postale aktivne"
+
+#: gajim/data/gui/advanced_configuration.ui:71
+#, fuzzy
+msgid "_Filter"
+msgstr "_Filter:"
+
+#: gajim/data/gui/advanced_configuration.ui:88
+msgid "Type to search for values..."
+msgstr ""
+
+#: gajim/data/gui/advanced_configuration.ui:180
+#, fuzzy
+msgid "_Reset Value"
+msgstr "_Vrati predefinirane boje"
+
+#: gajim/data/gui/advanced_configuration.ui:185
+#, fuzzy
+msgid "Resets value to default"
+msgstr "_Vrati predefinirane boje"
 
 #: gajim/data/gui/account_creation_wizard_window.ui:43
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim: Čarobnjak za Stvaranje Računa"
 
 #: gajim/data/gui/account_creation_wizard_window.ui:70
+#, fuzzy
 msgid ""
 "You need to have an account in order to connect\n"
-"to the Jabber network."
+"to the XMPP network."
 msgstr ""
 "Morate imati račun kako bi se mogli spojiti\n"
 "na Jabber mrežu."
@@ -7430,8 +7535,9 @@ msgid "<b>Please fill in the data for your existing account</b>"
 msgstr "<b>Molim popunite podatke za vaš postojeći korisnički račun</b>"
 
 #: gajim/data/gui/account_creation_wizard_window.ui:187
-msgid "_Jabber ID:"
-msgstr "_Jabber ID:"
+#, fuzzy
+msgid "_XMPP Address:"
+msgstr "AIM Adresa:"
 
 #: gajim/data/gui/account_creation_wizard_window.ui:239
 #: gajim/data/gui/account_creation_wizard_window.ui:394
@@ -7518,6 +7624,7 @@ msgid "Privacy Lists:"
 msgstr "Liste Privatnosti:"
 
 #: gajim/data/gui/service_discovery_window.ui:111
+#: gajim/data/gui/groupchat_creation.ui:227
 #, fuzzy
 msgid "_Address"
 msgstr "_Adresa:"
@@ -7535,11 +7642,6 @@ msgstr "Sinkroniziraj : označi kontakte"
 msgid "Select the contacts you want to synchronise"
 msgstr "Označite kontakte sa kojima želite sinkronizirati"
 
-#: gajim/data/gui/groupchat_invitation_received.ui:42
-#, fuzzy
-msgid "Group Chat Invitation"
-msgstr "Poziv na Grupni Razgovor"
-
 #: gajim/data/gui/groupchat_invitation_received.ui:111
 #, fuzzy
 msgid "Message..."
@@ -7590,11 +7692,10 @@ msgstr ""
 
 #: gajim/data/gui/add_new_contact_window.ui:84
 #, fuzzy
-msgid "_Jabber ID"
-msgstr "_Jabber ID:"
+msgid "_XMPP Address"
+msgstr "_Adresa:"
 
 #: gajim/data/gui/add_new_contact_window.ui:100
-#: gajim/data/gui/manage_bookmarks_window.ui:192
 #, fuzzy
 msgid "_Nickname"
 msgstr "_Nadimak:"
@@ -7672,7 +7773,7 @@ msgstr "<b>Raspoloženje:</b>"
 msgid "<b>Message:</b>"
 msgstr "<b>Poruka:</b>"
 
-#: gajim/data/gui/plugins_window.ui:10 gajim/data/gui/application_menu.ui:90
+#: gajim/data/gui/plugins_window.ui:10 gajim/data/gui/application_menu.ui:87
 msgid "Plugins"
 msgstr ""
 
@@ -7781,10 +7882,6 @@ msgstr "Dozvoli"
 msgid "Deny"
 msgstr "Odbij"
 
-#: gajim/data/gui/privacy_list_window.ui:317
-msgid "JabberID"
-msgstr "JabberID"
-
 #: gajim/data/gui/privacy_list_window.ui:358
 msgid "all in the group"
 msgstr "sve u grupi"
@@ -7826,7 +7923,7 @@ msgstr "Poredak:"
 msgid "Manage sounds"
 msgstr "Podešavanje Računa"
 
-#: gajim/data/gui/manage_sounds_window.ui:55 gajim/plugins/gui.py:100
+#: gajim/data/gui/manage_sounds_window.ui:55 gajim/plugins/gui.py:101
 msgid "Active"
 msgstr "Aktivno"
 
@@ -7864,23 +7961,115 @@ msgstr "Ukloni račun iz Gajima i sa po_služitelja"
 msgid "_Personal Events"
 msgstr "_Osobni Događaji"
 
-#: gajim/data/gui/account_context_menu.ui:35
-#: gajim/data/gui/systray_context_menu.ui:28
-msgid "Join _Group Chat"
-msgstr "_Grupni Razgovori"
-
-#: gajim/data/gui/account_context_menu.ui:49
+#: gajim/data/gui/account_context_menu.ui:41
 msgid "_Add Contact..."
 msgstr "_Dodaj Kontakt..."
 
-#: gajim/data/gui/account_context_menu.ui:57
+#: gajim/data/gui/account_context_menu.ui:49
 msgid "_Discover Services"
 msgstr "_Otkrivanje Usluga"
 
-#: gajim/data/gui/account_context_menu.ui:65
+#: gajim/data/gui/account_context_menu.ui:57
 msgid "_Execute Command..."
 msgstr "_Izvrši Naredbu..."
 
+#: gajim/data/gui/account_context_menu.ui:65
+#, fuzzy
+msgid "_View Certificate"
+msgstr "Osobno potpisan certifikat"
+
+#: gajim/data/gui/manage_proxies.ui:12
+#, fuzzy
+msgctxt "proxy configuration"
+msgid "HTTP Connect"
+msgstr ""
+"HTTP Spoj\n"
+"SOCKS5\n"
+"BOSH"
+
+#: gajim/data/gui/manage_proxies.ui:15
+msgctxt "proxy configuration"
+msgid "SOCKS5"
+msgstr ""
+
+#: gajim/data/gui/manage_proxies.ui:18
+#, fuzzy
+msgctxt "proxy configuration"
+msgid "BOSH"
+msgstr "_BOSH URL:"
+
+#: gajim/data/gui/manage_proxies.ui:68
+#, fuzzy
+msgid "Add Proxy"
+msgstr "Proxy:"
+
+#: gajim/data/gui/manage_proxies.ui:82
+#, fuzzy
+msgid "Remove Proxy"
+msgstr "Ukloni Grupu"
+
+#: gajim/data/gui/manage_proxies.ui:134
+#, fuzzy
+msgid "Pass_word"
+msgstr "Lo_zinka:"
+
+#: gajim/data/gui/manage_proxies.ui:159
+msgid "Use proxy auth_entication"
+msgstr "Koristi proxy aut_entifikaciju"
+
+#: gajim/data/gui/manage_proxies.ui:179
+#, fuzzy
+msgid "_Username"
+msgstr "_Korisničko ime:"
+
+#: gajim/data/gui/manage_proxies.ui:209
+#, fuzzy
+msgid "_Port"
+msgstr "_Port:"
+
+#: gajim/data/gui/manage_proxies.ui:226
+msgid "example.org"
+msgstr ""
+
+#: gajim/data/gui/manage_proxies.ui:240
+#, fuzzy
+msgid "_Host"
+msgstr "_Poslužitelj:"
+
+#: gajim/data/gui/manage_proxies.ui:254
+msgid "Use HTTP prox_y"
+msgstr "Koristi HTTP prox_y"
+
+#: gajim/data/gui/manage_proxies.ui:275
+msgid "https://example.org/http-bind/"
+msgstr ""
+
+#: gajim/data/gui/manage_proxies.ui:291
+#, fuzzy
+msgid "_BOSH URL"
+msgstr "_BOSH URL:"
+
+#: gajim/data/gui/manage_proxies.ui:309 gajim/gtk/adhoc.py:322
+#, fuzzy
+msgid "Settings"
+msgstr "Registracija nije uspijela"
+
+#: gajim/data/gui/manage_proxies.ui:344
+#, fuzzy
+msgid "_Type"
+msgstr "_Vrsta:"
+
+#: gajim/data/gui/manage_proxies.ui:361
+#: gajim/data/gui/groupchat_creation.ui:105
+#, fuzzy
+msgid "_Name"
+msgstr "_Ime:"
+
+#: gajim/data/gui/manage_proxies.ui:391 gajim/gtk/accounts.py:742
+#, fuzzy
+msgid "Proxy"
+msgstr "Proxy:"
+
 #: gajim/data/gui/application_menu.ui:8
 #, fuzzy
 msgid "View"
@@ -7888,8 +8077,8 @@ msgstr "_Prikaz"
 
 #: gajim/data/gui/application_menu.ui:11
 #, fuzzy
-msgid "Show Roster"
-msgstr "Prikaži _Listu Kontakata"
+msgid "Show Contact List"
+msgstr "Prikaži Samo _Aktivne Kontakte"
 
 #: gajim/data/gui/application_menu.ui:16
 #, fuzzy
@@ -7930,23 +8119,24 @@ msgstr ""
 msgid "Features"
 msgstr "Mogućnosti"
 
-#: gajim/data/gui/application_menu.ui:81
+#: gajim/data/gui/application_menu.ui:77
+#: gajim/data/gui/groupchat_creation.ui:81 gajim/gtk/groupchat_creation.py:45
 #, fuzzy
-msgid "Bookmarks"
-msgstr "_Postavi Oznaku"
+msgid "Create Group Chat"
+msgstr "Novi Grupni Razgovor"
 
-#: gajim/data/gui/application_menu.ui:94 gajim/data/gui/shortcuts_window.ui:189
-#: gajim/gtk/preferences.py:59
+#: gajim/data/gui/application_menu.ui:91 gajim/data/gui/shortcuts_window.ui:189
+#: gajim/gtk/preferences.py:58
 msgid "Preferences"
 msgstr "Postavke"
 
-#: gajim/data/gui/application_menu.ui:99
+#: gajim/data/gui/application_menu.ui:96
 #, fuzzy
 msgid "Quit"
 msgstr "_Izlaz"
 
 #: gajim/data/gui/httpupload_progress_dialog.ui:110
-#: gajim/gtk/filetransfer.py:121
+#: gajim/gtk/filetransfer.py:120
 msgid "Progress"
 msgstr "Napredak"
 
@@ -7963,52 +8153,33 @@ msgstr ""
 msgid "_Cancel Upload"
 msgstr "_Odustani"
 
-#: gajim/data/gui/manage_bookmarks_window.ui:13
-#, fuzzy
-msgid "Group Chat Bookmarks"
-msgstr "_Grupni Razgovor"
-
-#: gajim/data/gui/manage_bookmarks_window.ui:68
-#, fuzzy
-msgid "Add Bookmark"
-msgstr "_Postavi Oznaku"
-
-#: gajim/data/gui/manage_bookmarks_window.ui:82
-#, fuzzy
-msgid "Remove Bookmark"
-msgstr "_Postavi Oznaku"
+#: gajim/data/gui/groupchat_creation.ui:27
+msgid "Public or Private?"
+msgstr ""
 
-#: gajim/data/gui/manage_bookmarks_window.ui:126
-msgid "N_ame"
+#: 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 ""
 
-#: gajim/data/gui/manage_bookmarks_window.ui:145
-#, fuzzy
-msgid "Bookmark Name"
-msgstr "Postavi knjižnu oznaku za sobu"
+#: gajim/data/gui/groupchat_creation.ui:58
+msgid "<b>Public:</b> Anyone who knows the address can join."
+msgstr ""
 
-#: gajim/data/gui/manage_bookmarks_window.ui:160
+#: gajim/data/gui/groupchat_creation.ui:122
 #, fuzzy
-msgid "_Server"
-msgstr "_Poslužitelj:"
+msgid "_Description"
+msgstr "Opis"
 
-#: gajim/data/gui/manage_bookmarks_window.ui:223
-msgid "Roo_m"
+#: gajim/data/gui/groupchat_creation.ui:164
+msgid "_Public"
 msgstr ""
 
-#: gajim/data/gui/manage_bookmarks_window.ui:253
+#: gajim/data/gui/groupchat_creation.ui:278
 #, fuzzy
-msgid "_Password"
-msgstr "_Lozinka:"
-
-#: gajim/data/gui/manage_bookmarks_window.ui:299
-#, fuzzy
-msgid "Join chat when connected"
-msgstr "Kontakt Odspojen"
-
-#: gajim/data/gui/manage_bookmarks_window.ui:307
-msgid "_Join Automatically"
-msgstr ""
+msgid "_Account"
+msgstr "_Korisnički Računi"
 
 #: gajim/data/gui/exception_dialog.ui:49
 msgid "Sorry, that should not have happened"
@@ -8051,6 +8222,29 @@ msgstr "Dozvoli kontaktu da može vidjeti kada sam spojen"
 msgid "Presets"
 msgstr "_Prisutnost"
 
+#: gajim/data/gui/groupchat_info_scrolled.ui:32
+#, fuzzy
+msgid "Address"
+msgstr "_Adresa:"
+
+#: gajim/data/gui/groupchat_info_scrolled.ui:64
+msgid "Topic"
+msgstr ""
+
+#: gajim/data/gui/groupchat_info_scrolled.ui:80
+#, fuzzy
+msgid "Author"
+msgstr "_Odobri"
+
+#: gajim/data/gui/groupchat_info_scrolled.ui:182
+msgid "Discussion Logs"
+msgstr ""
+
+#: gajim/data/gui/groupchat_info_scrolled.ui:260
+#, fuzzy
+msgid "Group Chat Language"
+msgstr "Poziv na Grupni Razgovor"
+
 #: gajim/data/gui/emoji_chooser.ui:98
 #, fuzzy
 msgid "No Results Found"
@@ -8063,24 +8257,35 @@ msgstr "Pozovi Prijatelje!"
 #: gajim/data/gui/chat_to_muc_window.ui:39
 #, fuzzy
 msgid ""
-"You are now entering a groupchat.\n"
+"You are now entering a group chat.\n"
 "Select the contacts you want to invite"
 msgstr ""
 "Započeti će te MUC razgovor.\n"
 "Odaberite kontakte koje želite pozvati"
 
 #: gajim/data/gui/chat_to_muc_window.ui:112
-msgid "Please select a MUC server."
+#, fuzzy
+msgid "Please select a group chat server."
 msgstr "Molim odaberite MUC poslužitelj."
 
 #: gajim/data/gui/chat_to_muc_window.ui:141
-msgid "MUC server"
-msgstr "MUC poslužitelj"
+#, fuzzy
+msgid "Group chat server"
+msgstr "Grupni Razgovori"
 
 #: gajim/data/gui/chat_to_muc_window.ui:176
 msgid "In_vite"
 msgstr "Po_zovi"
 
+#: gajim/data/gui/bookmarks.ui:176
+#, fuzzy
+msgid "Autojoin"
+msgstr "Automatsko spajanje"
+
+#: gajim/data/gui/bookmarks.ui:211
+msgid "_Apply"
+msgstr ""
+
 #: gajim/data/gui/history_manager.ui:11
 #, fuzzy
 msgid "_Export"
@@ -8096,12 +8301,13 @@ msgid "Gajim History Logs Manager"
 msgstr "Gajim Upravitelj Zapisima"
 
 #: gajim/data/gui/history_manager.ui:108
+#, fuzzy
 msgid ""
-"This log manager is not intended for log viewing. If you are looking for "
-"such functionality, use the history window instead.\n"
+"This history manager is not intended for viewing chat history. If you are "
+"looking for such functionality, please use the history window instead.\n"
 "\n"
-"Use this program to delete or export logs. You can select logs from the left "
-"and/or search database from below."
+"You can use this program to delete or export history. Either select logs "
+"from the left or search the database."
 msgstr ""
 "Ovaj upravitelj spremljenih zapisa nije namjenjen za čitanje istih. Ukoliko "
 "tražite takvu mogućnost koristite prozor za povijest razgovora (po "
@@ -8155,8 +8361,9 @@ msgid "Select an emoji"
 msgstr ""
 
 #: gajim/data/gui/shortcuts_window.ui:38
-msgid "Complete a command or a nick"
-msgstr ""
+#, fuzzy
+msgid "Complete a command or a nickname"
+msgstr "Molim napravite novu temu sa vašim željenim imenom."
 
 #: gajim/data/gui/shortcuts_window.ui:45
 #, fuzzy
@@ -8196,7 +8403,7 @@ msgstr ""
 msgid "Scroll down"
 msgstr ""
 
-#: gajim/data/gui/shortcuts_window.ui:100 gajim/gtk/xml_console.py:72
+#: gajim/data/gui/shortcuts_window.ui:100 gajim/gtk/xml_console.py:69
 #, fuzzy
 msgid "Clear"
 msgstr "Čistim"
@@ -8238,8 +8445,9 @@ msgid "Close chat"
 msgstr ""
 
 #: gajim/data/gui/shortcuts_window.ui:173
-msgid "Roster Shortcuts"
-msgstr ""
+#, fuzzy
+msgid "Contact List Shortcuts"
+msgstr "Razmjena Artikla Sa Liste Kontakata"
 
 #: gajim/data/gui/shortcuts_window.ui:196
 #, fuzzy
@@ -8272,7 +8480,7 @@ msgid "Show only active contacts"
 msgstr "Prikaži Samo _Aktivne Kontakte"
 
 #: gajim/data/gui/shortcuts_window.ui:251
-msgid "Enable roster filtering"
+msgid "Enable contact list filtering"
 msgstr ""
 
 #: gajim/data/gui/shortcuts_window.ui:259
@@ -8319,12 +8527,12 @@ msgstr ""
 
 #: gajim/data/gui/history_window.ui:317
 #, fuzzy
-msgid "Record history for this chat"
+msgid "Store history for this chat"
 msgstr "Ignoriraj ovu grešku za ovaj certifikat."
 
 #: gajim/data/gui/history_window.ui:332
 #, fuzzy
-msgid "Record History"
+msgid "Store History"
 msgstr "Nedavno:"
 
 #: gajim/data/gui/history_window.ui:350
@@ -8345,9 +8553,10 @@ msgstr "Stvorite novi dopis"
 msgid "Fill in the form."
 msgstr "Ispunite formular."
 
-#: gajim/data/gui/data_form_window.ui:229
-msgid "Room Configuration"
-msgstr "Konfiguracija Sobe"
+#: gajim/data/gui/data_form_window.ui:229 gajim/gtk/groupchat_config.py:41
+#, fuzzy
+msgid "Group Chat Configuration"
+msgstr "Poziv na Grupni Razgovor"
 
 #: gajim/data/gui/roster_item_exchange_window.ui:39
 #: gajim/gtk/roster_item_exchange.py:35
@@ -8368,15 +8577,15 @@ msgstr "Sta_tus"
 msgid "_Start Chat..."
 msgstr "_Novi Razgovor..."
 
-#: gajim/data/gui/systray_context_menu.ui:50
+#: gajim/data/gui/systray_context_menu.ui:43
 msgid "Show All Pending _Events"
 msgstr "Prikaži Sve _Događaje na Čekanju"
 
-#: gajim/data/gui/systray_context_menu.ui:59
+#: gajim/data/gui/systray_context_menu.ui:52
 msgid "Mute Sounds"
 msgstr "Onemogući Zvukove"
 
-#: gajim/data/gui/systray_context_menu.ui:75
+#: gajim/data/gui/systray_context_menu.ui:68
 #, fuzzy
 msgid "_Preferences"
 msgstr "Postavke"
@@ -8468,34 +8677,34 @@ msgstr ""
 msgid "Execute expression inside a shell, send output"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:45
+#: gajim/command_system/implementation/standard.py:47
 msgid ""
 "Show help on a given command or a list of available commands if -a is given"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:73
+#: gajim/command_system/implementation/standard.py:75
 #, fuzzy
 msgid "Send a message to the contact"
 msgstr "Uporaba: /%s, šalje poruku kontaktu"
 
-#: gajim/command_system/implementation/standard.py:78
+#: gajim/command_system/implementation/standard.py:80
 msgid "Send action (in the third person) to the current chat"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:83
+#: gajim/command_system/implementation/standard.py:85
 msgid "Show logged messages which mention given text"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:88
+#: gajim/command_system/implementation/standard.py:90
 #, fuzzy, python-format
 msgid "%s: Nothing found"
 msgstr "%s nije pronađen"
 
-#: gajim/command_system/implementation/standard.py:94
+#: gajim/command_system/implementation/standard.py:96
 msgid "Limit must be an integer"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:118
+#: gajim/command_system/implementation/standard.py:120
 msgid ""
 "\n"
 "    Set the current status\n"
@@ -8505,131 +8714,131 @@ msgid ""
 "    "
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:136
+#: gajim/command_system/implementation/standard.py:138
 msgid "Set the current status to away"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:150
+#: gajim/command_system/implementation/standard.py:152
 msgid "Set the current status to online"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:153
+#: gajim/command_system/implementation/standard.py:155
 #, fuzzy
 msgid "Available"
 msgstr "_Dostupan"
 
-#: gajim/command_system/implementation/standard.py:173
-#: gajim/command_system/implementation/standard.py:250
+#: gajim/command_system/implementation/standard.py:175
+#: gajim/command_system/implementation/standard.py:252
 #, fuzzy
 msgid "Clear the text window"
 msgstr "Uporaba: /%s, prazni tekstualni prozor"
 
-#: gajim/command_system/implementation/standard.py:178
-#: gajim/command_system/implementation/standard.py:397
+#: gajim/command_system/implementation/standard.py:180
+#: gajim/command_system/implementation/standard.py:401
 #, fuzzy
 msgid "Send a ping to the contact"
 msgstr "Uporaba: /%s, šalje ping kontaktu"
 
-#: gajim/command_system/implementation/standard.py:181
-#: gajim/command_system/implementation/standard.py:400
+#: gajim/command_system/implementation/standard.py:183
+#: gajim/command_system/implementation/standard.py:404
 #, fuzzy
 msgid "Command is not supported for zeroconf accounts"
 msgstr "Naredba nije podržana za zeroconf račun."
 
-#: gajim/command_system/implementation/standard.py:185
-msgid "Send DTMF sequence through an open audio session"
+#: gajim/command_system/implementation/standard.py:187
+msgid "Send DTMF sequence through an open voice chat"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:188
+#: gajim/command_system/implementation/standard.py:190
 #, fuzzy
-msgid "No open audio sessions with the contact"
+msgid "No open voice chats with the contact"
 msgstr "Pritisnite za pregled prošlih razgovora sa ovim kontaktom"
 
-#: gajim/command_system/implementation/standard.py:191
+#: gajim/command_system/implementation/standard.py:193
 #, fuzzy, python-format
 msgid "%s is not a valid tone"
 msgstr "%s nije ispravna razina zapisnika (loglevel)"
 
-#: gajim/command_system/implementation/standard.py:198
-msgid "Toggle audio session"
+#: gajim/command_system/implementation/standard.py:200
+msgid "Toggle Voice Chat"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:201
+#: gajim/command_system/implementation/standard.py:203
 #, fuzzy
-msgid "Audio sessions are not available"
+msgid "Voice chats are not available"
 msgstr "Veza nije dostupna"
 
-#: gajim/command_system/implementation/standard.py:208
-msgid "Toggle video session"
+#: gajim/command_system/implementation/standard.py:210
+msgid "Toggle Video Chat"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:211
+#: gajim/command_system/implementation/standard.py:213
 #, fuzzy
-msgid "Video sessions are not available"
+msgid "Video chats are not available"
 msgstr "Veza nije dostupna"
 
-#: gajim/command_system/implementation/standard.py:218
+#: gajim/command_system/implementation/standard.py:220
 #, fuzzy
 msgid "Send a message to the contact that will attract their attention"
 msgstr "Uporaba: /%s, šalje poruku kontaktu"
 
-#: gajim/command_system/implementation/standard.py:255
+#: gajim/command_system/implementation/standard.py:257
 #, fuzzy
 msgid "Change your nickname in a group chat"
 msgstr "Promijeni nadimak (Ctrl+N)"
 
-#: gajim/command_system/implementation/standard.py:260 gajim/gtk/dialogs.py:674
-#: gajim/gtk/bookmarks.py:272
+#: gajim/command_system/implementation/standard.py:262
 msgid "Invalid nickname"
 msgstr "Neispravan nadimak"
 
-#: gajim/command_system/implementation/standard.py:267
+#: gajim/command_system/implementation/standard.py:269
 #, fuzzy
-msgid "Open a private chat window with a specified occupant"
+msgid "Open a private chat window with a specified participant"
 msgstr ""
 "Uporaba: /%s <nickname>, otvara privatni razgovor sa navedenim učesnikom."
 
-#: gajim/command_system/implementation/standard.py:273
-#: gajim/command_system/implementation/standard.py:282
-#: gajim/command_system/implementation/standard.py:332
-#: gajim/command_system/implementation/standard.py:345
-#: gajim/command_system/implementation/standard.py:357
+#: gajim/command_system/implementation/standard.py:275
+#: gajim/command_system/implementation/standard.py:284
+#: gajim/command_system/implementation/standard.py:336
+#: gajim/command_system/implementation/standard.py:349
+#: gajim/command_system/implementation/standard.py:361
 #, fuzzy
 msgid "Nickname not found"
 msgstr "Nadimak nije pronađen: %s "
 
-#: gajim/command_system/implementation/standard.py:276
+#: gajim/command_system/implementation/standard.py:278
 #, fuzzy
 msgid ""
-"Open a private chat window with a specified occupant and send him a message"
+"Open a private chat window with a specified participant and send him a "
+"message"
 msgstr ""
 "Uporaba: /%s <nickname>, otvara privatni razgovor sa navedenim učesnikom."
 
-#: gajim/command_system/implementation/standard.py:285
+#: gajim/command_system/implementation/standard.py:287
 #, fuzzy
 msgid "Display or change a group chat topic"
 msgstr "Pitaj prije zatvaranja kartice/prozora razgovora grupe."
 
-#: gajim/command_system/implementation/standard.py:294
-msgid "Invite a user to a room for a reason"
+#: gajim/command_system/implementation/standard.py:296
+msgid "Invite a user to a group chat for a reason"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:297
+#: gajim/command_system/implementation/standard.py:299
 #, fuzzy, python-format
 msgid "Invited %(jid)s to %(room_jid)s"
 msgstr "Pozvali ste %(contact_jid)s na %(room_jid)s"
 
-#: gajim/command_system/implementation/standard.py:301
+#: gajim/command_system/implementation/standard.py:303
 #, fuzzy
-msgid "Join a group chat given by a JID"
+msgid "Join a group chat given by an XMPP Address"
 msgstr "u _grupnim razgovorima"
 
-#: gajim/command_system/implementation/standard.py:309
+#: gajim/command_system/implementation/standard.py:313
 msgid ""
-"Leave the groupchat, optionally giving a reason, and close tab or window"
+"Leave the group chat, optionally giving a reason, and close tab or window"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:314
+#: gajim/command_system/implementation/standard.py:318
 msgid ""
 "\n"
 "    Ban user by a nick or a JID from a groupchat\n"
@@ -8638,46 +8847,46 @@ msgid ""
 "    "
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:329
+#: gajim/command_system/implementation/standard.py:333
 #, fuzzy
-msgid "Kick user by a nick from a groupchat"
+msgid "Kick user by a nick from a group chat"
 msgstr "Pozvani ste na grupni razgovor"
 
-#: gajim/command_system/implementation/standard.py:338
+#: gajim/command_system/implementation/standard.py:342
 msgid ""
-"Set occupant role in group chat.\n"
+"Set participant role in group chat.\n"
 "    Role can be given as one of the following values:\n"
 "    moderator, participant, visitor, none"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:343
+#: gajim/command_system/implementation/standard.py:347
 #, fuzzy
 msgid "Invalid role given"
 msgstr "Neispravan poslužitelj"
 
-#: gajim/command_system/implementation/standard.py:350
+#: gajim/command_system/implementation/standard.py:354
 msgid ""
-"Set occupant affiliation in group chat.\n"
+"Set participant affiliation in group chat.\n"
 "    Affiliation can be given as one of the following values:\n"
 "    owner, admin, member, outcast, none"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:355
+#: gajim/command_system/implementation/standard.py:359
 #, fuzzy
 msgid "Invalid affiliation given"
 msgstr "pripadnost promjenjena"
 
-#: gajim/command_system/implementation/standard.py:365
+#: gajim/command_system/implementation/standard.py:369
 #, fuzzy
-msgid "Display names of all group chat occupants"
+msgid "Display names of all group chat participants"
 msgstr "Uporaba: /%s , prikazuje imena učesnika u grupnom razgovoru."
 
-#: gajim/command_system/implementation/standard.py:387
-msgid "Forbid an occupant to send you public or private messages"
+#: gajim/command_system/implementation/standard.py:391
+msgid "Forbid a participant to send you public or private messages"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:392
-msgid "Allow an occupant to send you public or private messages"
+#: gajim/command_system/implementation/standard.py:396
+msgid "Allow a participant to send you public or private messages"
 msgstr ""
 
 #: gajim/command_system/implementation/middleware.py:74
@@ -8688,204 +8897,329 @@ msgstr ""
 msgid "The same as using a doc-string, except it supports translation"
 msgstr ""
 
-#: gajim/gtk/filetransfer.py:91
+#: gajim/gtk/groupchat_info.py:36
+#, fuzzy
+msgid "?Group chat feature:Archiving"
+msgstr "Poziv na Grupni Razgovor"
+
+#: gajim/gtk/groupchat_info.py:37
+#, fuzzy
+msgid "Messages are archived on the server"
+msgstr "Sesija NEĆE biti sačuvana"
+
+#: gajim/gtk/groupchat_info.py:40
+#, fuzzy
+msgid "?Group chat feature:Persistent"
+msgstr "Grupni Razgovori"
+
+#: gajim/gtk/groupchat_info.py:41
+msgid "This group chat persists even if there are no participants"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:45
+#, fuzzy
+msgid "?Group chat feature:Temporary"
+msgstr "?Uloga Kontakta u Grupnom Razgvoru:Nikakva"
+
+#: gajim/gtk/groupchat_info.py:46
+msgid "This group chat will be destroyed once the last participant left"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:50
+#, fuzzy
+msgid "?Group chat feature:Moderated"
+msgstr "?Uloga Kontakta u Grupnom Razgvoru:Nikakva"
+
+#: gajim/gtk/groupchat_info.py:51
+msgid ""
+"Participants entering this group chat need to request permission to send "
+"messages"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:55
+#, fuzzy
+msgid "?Group chat feature:Not Moderated"
+msgstr "Grupni Razgovori"
+
+#: gajim/gtk/groupchat_info.py:56
+msgid "Participants entering this group chat are allowed to send messages"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:60
+#, fuzzy
+msgid "?Group chat feature:Open"
+msgstr "?Uloga Kontakta u Grupnom Razgvoru:Nikakva"
+
+#: gajim/gtk/groupchat_info.py:61
+#, fuzzy
+msgid "Anyone can join this group chat"
+msgstr "%s se pridružio grupnom razgovoru"
+
+#: gajim/gtk/groupchat_info.py:64
+#, fuzzy
+msgid "?Group chat feature:Members Only"
+msgstr "Označavanje Poruke Grupnog Razgovora"
+
+#: gajim/gtk/groupchat_info.py:65
+msgid "This group chat is restricted to members only"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:69
+#, fuzzy
+msgid "?Group chat feature:Public"
+msgstr "Označavanje Poruke Grupnog Razgovora"
+
+#: gajim/gtk/groupchat_info.py:70
+msgid "Group chat can be found via search"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:73
+#, fuzzy
+msgid "?Group chat feature:Hidden"
+msgstr "?Uloga Kontakta u Grupnom Razgvoru:Nikakva"
+
+#: gajim/gtk/groupchat_info.py:74
+#, fuzzy
+msgid "This group chat can not be found via search"
+msgstr "Ovaj grupni razgovor nema temu"
+
+#: gajim/gtk/groupchat_info.py:77
+#, fuzzy
+msgid "?Group chat feature:Not Anonymous"
+msgstr "Grupni Razgovori"
+
+#: gajim/gtk/groupchat_info.py:78
+msgid "All other group chat participants can see your XMPP address"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:82
+#, fuzzy
+msgid "?Group chat feature:Semi-Anonymous"
+msgstr "Označavanje Poruke Grupnog Razgovora"
+
+#: gajim/gtk/groupchat_info.py:83
+msgid "Only moderators can see your XMPP address"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:86
+#, fuzzy
+msgid "?Group chat feature:Password Required"
+msgstr "Grupni Razgovori"
+
+#: gajim/gtk/groupchat_info.py:87
+msgid "This group chat does require a password upon entry"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:91
+#, fuzzy
+msgid "?Group chat feature:No Password Required"
+msgstr "Grupni Razgovori"
+
+#: gajim/gtk/groupchat_info.py:92
+msgid "This group chat does not require a password upon entry"
+msgstr ""
+
+#: gajim/gtk/filetransfer.py:90
 msgid "File"
 msgstr "Datoteka"
 
-#: gajim/gtk/filetransfer.py:108
+#: gajim/gtk/filetransfer.py:107
 msgid "Time"
 msgstr "Vrijeme"
 
-#: gajim/gtk/filetransfer.py:228
+#: gajim/gtk/filetransfer.py:227
 #, fuzzy, python-format
 msgid "File name: %s"
 msgstr "Ime datoteke: %s"
 
-#: gajim/gtk/filetransfer.py:229 gajim/gtk/filetransfer.py:464
+#: gajim/gtk/filetransfer.py:228 gajim/gtk/filetransfer.py:469
 #, python-format
 msgid "Size: %s"
 msgstr "veličina: %s"
 
-#: gajim/gtk/filetransfer.py:239
+#: gajim/gtk/filetransfer.py:238
 #, python-format
 msgid "Sender: %s"
 msgstr "Pošiljatelj: %s"
 
-#: gajim/gtk/filetransfer.py:240 gajim/gtk/filetransfer.py:744
+#: gajim/gtk/filetransfer.py:239 gajim/gtk/filetransfer.py:749
 #: gajim/gtk/tooltips.py:577
 msgid "Recipient: "
 msgstr "Primatelj: "
 
-#: gajim/gtk/filetransfer.py:251
+#: gajim/gtk/filetransfer.py:250
 #, python-format
 msgid "Saved in: %s"
 msgstr "Spremljeno u: %s"
 
-#: gajim/gtk/filetransfer.py:256
+#: gajim/gtk/filetransfer.py:255
 msgid "File transfer completed"
 msgstr "Prijenos datoteka završen"
 
-#: gajim/gtk/filetransfer.py:276 gajim/gtk/filetransfer.py:285
+#: gajim/gtk/filetransfer.py:275 gajim/gtk/filetransfer.py:284
 #, fuzzy
 msgid "Connection with peer could not be established."
 msgstr "Vezu nije moguće ostvariti."
 
-#: gajim/gtk/filetransfer.py:293
+#: gajim/gtk/filetransfer.py:292
 #, python-format
 msgid "Filename: %s"
 msgstr "Ime datoteke: %s"
 
-#: gajim/gtk/filetransfer.py:294
+#: gajim/gtk/filetransfer.py:293
 #, python-format
 msgid "Recipient: %s"
 msgstr "Primatelj: %s"
 
-#: gajim/gtk/filetransfer.py:296
+#: gajim/gtk/filetransfer.py:295
 #, python-format
 msgid "Error message: %s"
 msgstr "Poruka Greške: %s"
 
-#: gajim/gtk/filetransfer.py:333
-#, fuzzy
-msgid "File transfer error"
-msgstr "Greška u Razmjeni Datoteka"
-
 #: gajim/gtk/filetransfer.py:334
 #, python-format
 msgid ""
-"The file %(file)s has been received, but it seems to have been damaged along "
-"the way.\n"
+"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 ""
 
-#: gajim/gtk/filetransfer.py:350
+#: gajim/gtk/filetransfer.py:340
+#, fuzzy
+msgid "_Download Again"
+msgstr "_Ne pitaj me više"
+
+#: gajim/gtk/filetransfer.py:355
 #, fuzzy
 msgid "Gajim can not read this file"
 msgstr "Gajim ne može pristupiti ovoj datoteci"
 
-#: gajim/gtk/filetransfer.py:351
+#: gajim/gtk/filetransfer.py:356
 msgid "Another process is using this file."
 msgstr ""
 
-#: gajim/gtk/filetransfer.py:418
+#: gajim/gtk/filetransfer.py:423
 #, fuzzy
 msgid "File Transfer Conflict"
 msgstr "Razmjena Datoteka Završena"
 
-#: gajim/gtk/filetransfer.py:419
+#: gajim/gtk/filetransfer.py:424
 msgid "This file already exists"
 msgstr "Ova datoteka već postoji"
 
-#: gajim/gtk/filetransfer.py:420
+#: gajim/gtk/filetransfer.py:425
 msgid "Resume download or replace file?"
 msgstr ""
 
-#: gajim/gtk/filetransfer.py:424
+#: gajim/gtk/filetransfer.py:429
 #, fuzzy
 msgid "Replace _File"
 msgstr "Čistim"
 
-#: gajim/gtk/filetransfer.py:427
+#: gajim/gtk/filetransfer.py:432
 #, fuzzy
 msgid "Resume _Download"
 msgstr "Skidanje"
 
-#: gajim/gtk/filetransfer.py:437
+#: gajim/gtk/filetransfer.py:442
 #, fuzzy, python-format
 msgid "Directory '%s' is not writable"
 msgstr "U direktorij \"%s\" nije moguće zapisivati"
 
-#: gajim/gtk/filetransfer.py:438
+#: gajim/gtk/filetransfer.py:443
 #, fuzzy
 msgid "You do not have permissions to create files in this directory."
 msgstr "Nemate ovlasti stvarati datoteke u ovom direktoriju"
 
-#: gajim/gtk/filetransfer.py:461
+#: gajim/gtk/filetransfer.py:466
 #, python-format
 msgid "File: %s"
 msgstr "Datoteka: %s"
 
-#: gajim/gtk/filetransfer.py:467
+#: gajim/gtk/filetransfer.py:472
 #, python-format
 msgid "Type: %s"
 msgstr "Tip: %s"
 
-#: gajim/gtk/filetransfer.py:469
+#: gajim/gtk/filetransfer.py:474
 #, python-format
 msgid "Description: %s"
 msgstr "Opis: %s"
 
-#: gajim/gtk/filetransfer.py:480
+#: gajim/gtk/filetransfer.py:485
 #, fuzzy, python-format
 msgid "%s wants to send you a file"
 msgstr "%s vam želi poslati datoteku."
 
-#: gajim/gtk/filetransfer.py:509
+#: gajim/gtk/filetransfer.py:514
 #, fuzzy
 msgid "Checking file…"
 msgstr "Šaljem profil..."
 
-#: gajim/gtk/filetransfer.py:524
+#: gajim/gtk/filetransfer.py:529
 #, fuzzy
 msgid "File error"
 msgstr "Greška u Razmjeni Datoteka"
 
-#: gajim/gtk/filetransfer.py:561
+#: gajim/gtk/filetransfer.py:566
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 
-#: gajim/gtk/filetransfer.py:658
+#: gajim/gtk/filetransfer.py:663
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/s)"
 
-#: gajim/gtk/filetransfer.py:711 gajim/gtk/filetransfer.py:715
+#: gajim/gtk/filetransfer.py:716 gajim/gtk/filetransfer.py:720
 msgid "Invalid File"
 msgstr "Neispravna Datoteka"
 
-#: gajim/gtk/filetransfer.py:711
+#: gajim/gtk/filetransfer.py:716
 msgid "File: "
 msgstr "Datoteka: "
 
-#: gajim/gtk/filetransfer.py:716
+#: gajim/gtk/filetransfer.py:721
 msgid "It is not possible to send empty files"
 msgstr "Nije moguće poslati prazne datoteke"
 
-#: gajim/gtk/filetransfer.py:742 gajim/gtk/tooltips.py:571
+#: gajim/gtk/filetransfer.py:747 gajim/gtk/tooltips.py:571
 msgid "Sender: "
 msgstr "Pošiljatelj: "
 
-#: gajim/gtk/filetransfer.py:1038
+#: gajim/gtk/filetransfer.py:1043
 #, fuzzy
 msgid "Choose a File to Send…"
 msgstr "Odabir Datoteke za Slanje..."
 
 #: gajim/gtk/start_chat.py:51
 #, fuzzy
-msgid "Start new Conversation"
+msgid "Start New Conversation"
 msgstr "Nastavljeni razgovor"
 
-#: gajim/gtk/start_chat.py:424
-#, fuzzy
-msgid "New Groupchat"
-msgstr "Novi Grupni Razgovor"
+#: gajim/gtk/start_chat.py:260 gajim/gtk/start_chat.py:328
+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:426
+#: gajim/gtk/start_chat.py:603 gajim/gtk/groupchat_join.py:38
+msgid "Join Group Chat"
+msgstr "Pridružiti se Grupnom Razgovoru"
+
+#: gajim/gtk/start_chat.py:605 gajim/gtk/add_contact.py:40
 #, fuzzy
-msgid "New Contact"
-msgstr "Dodaj Novi Kontakt"
+msgid "Add Contact"
+msgstr "_Dodaj Kontakt..."
 
-#: gajim/gtk/start_chat.py:588
+#: gajim/gtk/start_chat.py:746
 #, fuzzy, python-format
-msgid "%s Group chats found"
+msgid "%s group chats found"
 msgstr "%s nije pronađen"
 
-#: gajim/gtk/discovery.py:70
+#: gajim/gtk/discovery.py:69
 msgid "This service has not yet responded with detailed information"
 msgstr "Ovaj servis nije još pružio detaljnije informacije"
 
-#: gajim/gtk/discovery.py:71
+#: gajim/gtk/discovery.py:70
 #, fuzzy
 msgid ""
 "This service could not respond with detailed information.\n"
@@ -8894,32 +9228,33 @@ msgstr ""
 "Ova usluga nije mogla odgovoriti sa detaljnim informacijama.\n"
 "Najvjerojatnije je zastarjela ili neispravna"
 
-#: gajim/gtk/discovery.py:128
+#: gajim/gtk/discovery.py:126
 msgid "Others"
 msgstr "Ostali"
 
-#: gajim/gtk/discovery.py:131
-msgid "Conference"
-msgstr "Konferencija"
+#: gajim/gtk/discovery.py:129
+#, fuzzy
+msgid "Group Chat"
+msgstr "Grupni Razgovori"
 
-#: gajim/gtk/discovery.py:519
+#: gajim/gtk/discovery.py:518
 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:606
+#: gajim/gtk/discovery.py:605
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Otkrivanje Usluga koristeći račun %s"
 
-#: gajim/gtk/discovery.py:608
+#: gajim/gtk/discovery.py:607
 msgid "Service Discovery"
 msgstr "Otkrivanje Usluga"
 
-#: gajim/gtk/discovery.py:691
+#: gajim/gtk/discovery.py:690
 msgid "The service could not be found"
 msgstr "Usluga nije pronađena"
 
-#: gajim/gtk/discovery.py:692
+#: gajim/gtk/discovery.py:691
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -8927,102 +9262,80 @@ msgstr ""
 "Na adresi koju ste naveli nema usluge ili odgovora. Provjerite adresu i "
 "pokušajte ponovo."
 
-#: gajim/gtk/discovery.py:699 gajim/gtk/discovery.py:1042
+#: gajim/gtk/discovery.py:698 gajim/gtk/discovery.py:1041
 msgid "The service is not browsable"
 msgstr "Uslugu nije moguće pretražiti"
 
-#: gajim/gtk/discovery.py:700
+#: gajim/gtk/discovery.py:699
 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:738 gajim/gtk/discovery.py:747
+#: gajim/gtk/discovery.py:737 gajim/gtk/discovery.py:746
 msgid "Invalid Server Name"
 msgstr "Neispravno Ime Poslužitelja"
 
-#: gajim/gtk/discovery.py:806
+#: gajim/gtk/discovery.py:805
 #, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Pregled %(address)s koristeći račun %(account)s"
 
-#: gajim/gtk/discovery.py:851
+#: gajim/gtk/discovery.py:850
 #, fuzzy
 msgid "Browse"
 msgstr "_Pregled"
 
-#: gajim/gtk/discovery.py:1043
+#: gajim/gtk/discovery.py:1042
 msgid "This service does not contain any items to browse."
 msgstr "Ova usluga ne sadrži stvari za pretraživanje"
 
-#: gajim/gtk/discovery.py:1255
+#: gajim/gtk/discovery.py:1254
 #, fuzzy
 msgid "_Command"
 msgstr "Komanda: %s"
 
-#: gajim/gtk/discovery.py:1264 gajim/gtk/discovery.py:1422
+#: gajim/gtk/discovery.py:1263 gajim/gtk/discovery.py:1420
 msgid "Re_gister"
 msgstr "Re_gistracija"
 
-#: gajim/gtk/discovery.py:1277
+#: gajim/gtk/discovery.py:1276
 msgid "_Search"
 msgstr "_Pretraga"
 
-#: gajim/gtk/discovery.py:1420
+#: gajim/gtk/discovery.py:1418
 msgid "_Edit"
 msgstr "_Uredi"
 
-#: gajim/gtk/discovery.py:1458
+#: gajim/gtk/discovery.py:1456
 #, fuzzy, python-format
 msgid "Scanning %(current)d / %(total)d ..."
 msgstr "Skeniranje %(current)d / %(total)d.."
 
-#: gajim/gtk/discovery.py:1674
+#: gajim/gtk/discovery.py:1655
+msgid "Users"
+msgstr "Korisnici"
+
+#: gajim/gtk/discovery.py:1671
 msgid "Id"
 msgstr "Identifikacija"
 
-#: gajim/gtk/discovery.py:1713
-msgid "_Join"
-msgstr "_Pridruživanje"
-
-#: gajim/gtk/discovery.py:1736
-msgid "Bookmark already set"
-msgstr "Knjižna oznaka je već postavljena"
-
-#: gajim/gtk/discovery.py:1737
-#, fuzzy, python-format
-msgid "Group Chat '%s' is already in your bookmarks."
-msgstr "Grupni Razgovor \"%s\" je već u vašim knjižnim oznakama."
-
-#: gajim/gtk/discovery.py:1748
-msgid "Bookmark has been added successfully"
-msgstr "Knjižna oznaka je bez uspješno dodana"
-
-#: gajim/gtk/discovery.py:1749
-#, fuzzy
-msgid ""
-"You can manage your bookmarks by clicking the Bookmarks menu item in your "
-"contact list."
-msgstr ""
-"Možete upravljati vašim knjižnim oznakama pomoću izbornika Akcije u vašem "
-"spisku."
-
-#: gajim/gtk/discovery.py:1950
+#: gajim/gtk/discovery.py:1900
 msgid "Subscribed"
 msgstr "Pretplaćeno"
 
-#: gajim/gtk/discovery.py:1959
+#: gajim/gtk/discovery.py:1909
 msgid "Node"
 msgstr "Čvor"
 
-#: gajim/gtk/discovery.py:2028
+#: gajim/gtk/discovery.py:1978
 #, fuzzy
 msgid "_New post"
 msgstr "Nova objava"
 
-#: gajim/gtk/discovery.py:2037
+#: gajim/gtk/discovery.py:1987
 msgid "_Subscribe"
 msgstr "_Pretplatiti se"
 
-#: gajim/gtk/discovery.py:2045
+#: gajim/gtk/discovery.py:1995
 msgid "_Unsubscribe"
 msgstr "_Ukinuti pretplatu"
 
@@ -9069,7 +9382,7 @@ msgstr "Forma %s"
 msgid "Characters typed: %s"
 msgstr "Znak nije dozvoljen"
 
-#: gajim/gtk/single_message.py:274 gajim/gtk/xml_console.py:169
+#: gajim/gtk/single_message.py:274 gajim/gtk/xml_console.py:166
 msgid "Connection not available"
 msgstr "Veza nije dostupna"
 
@@ -9078,6 +9391,12 @@ msgstr "Veza nije dostupna"
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Molim potvrdite da ste spojeni na \"%s\"."
 
+#: gajim/gtk/single_message.py:306
+#, 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:330
 #, python-format
 msgid "RE: %s"
@@ -9088,28 +9407,28 @@ msgstr "RE: %s"
 msgid "%s wrote:\n"
 msgstr "%s piše:\n"
 
-#: gajim/gtk/pep_config.py:44
+#: gajim/gtk/pep_config.py:45
 #, fuzzy, python-format
 msgid "PEP Service Configuration (%s)"
 msgstr "Konfiguracija PEP Servisa"
 
-#: gajim/gtk/pep_config.py:77
+#: gajim/gtk/pep_config.py:78
 #, fuzzy
 msgid "Service"
 msgstr "Poslužitelj"
 
-#: gajim/gtk/pep_config.py:114
+#: gajim/gtk/pep_config.py:115
 msgid "PEP node was not removed"
 msgstr "PEP čvor nije obrisan"
 
-#: gajim/gtk/pep_config.py:115
+#: gajim/gtk/pep_config.py:116
 #, fuzzy, python-format
 msgid ""
 "PEP node %(node)s was not removed:\n"
 "%(message)s"
 msgstr "PEP čvor %(node)s nije obrisan: %(message)s"
 
-#: gajim/gtk/pep_config.py:146
+#: gajim/gtk/pep_config.py:147
 #, fuzzy, python-format
 msgid "Configure %s"
 msgstr "_Postavi"
@@ -9125,17 +9444,21 @@ msgstr "Re_gistracija"
 msgid "Registration successful"
 msgstr "Registracija uspijela"
 
-#: gajim/gtk/dialogs.py:54 gajim/gtk/dataform.py:659 gajim/gtk/adhoc.py:85
+#: gajim/gtk/service_registration.py:215
+msgid "Registration failed"
+msgstr "Registracija nije uspijela"
+
+#: gajim/gtk/dialogs.py:53 gajim/gtk/dataform.py:668 gajim/gtk/adhoc.py:86
 #, fuzzy
 msgid "Cancel"
 msgstr "_Odustani"
 
-#: gajim/gtk/dialogs.py:129
+#: gajim/gtk/dialogs.py:128
 #, fuzzy, python-format
 msgid "Dictionary for language \"%s\" not available"
 msgstr "Riječnik za jezik %s nije dostupan"
 
-#: gajim/gtk/dialogs.py:130
+#: gajim/gtk/dialogs.py:129
 #, fuzzy, python-format
 msgid ""
 "You have to install the dictionary \"%s\" to use spellchecking, or choose "
@@ -9147,11 +9470,11 @@ msgstr ""
 "pravopisa, ili odaberite drugi jezik postavkom odabira speller_language "
 "opcije."
 
-#: gajim/gtk/dialogs.py:410 gajim/gtk/dialogs.py:425
+#: gajim/gtk/dialogs.py:322 gajim/gtk/dialogs.py:337
 msgid "Insecure connection"
 msgstr "Nesigurna Veza"
 
-#: gajim/gtk/dialogs.py:411
+#: gajim/gtk/dialogs.py:323
 #, fuzzy, python-format
 msgid ""
 "You are about to connect to the account %(account)s (%(server)s) insecurely. "
@@ -9162,120 +9485,115 @@ msgstr ""
 "Spremate se poslati vašu lozinku preko nesigurne veze. Trebali bi "
 "instalirati PyOpenSSL da bi to izbjegli. Sigurni ste da želite nastaviti?"
 
-#: gajim/gtk/dialogs.py:416
+#: gajim/gtk/dialogs.py:328
 msgid "Yes, I really want to connect insecurely"
 msgstr "Da, stvarno želim nesigurno povezivanje"
 
-#: gajim/gtk/dialogs.py:417
+#: gajim/gtk/dialogs.py:329
 msgid "Gajim will NOT connect unless you check this box"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:675
-#, fuzzy
-msgid "The nickname contains invalid characters."
-msgstr "Nadimak sadrži nedozvoljene znakove."
-
-#: gajim/gtk/dialogs.py:734
+#: gajim/gtk/dialogs.py:561
 #, fuzzy, python-format
 msgid "Destroy %s"
 msgstr "Uništavam %s"
 
-#: gajim/gtk/dialogs.py:775
+#: gajim/gtk/dialogs.py:602
 #, fuzzy
 msgid "Certificate"
 msgstr "Osobno potpisan certifikat"
 
-#: gajim/gtk/dialogs.py:786
+#: gajim/gtk/dialogs.py:613
 #, fuzzy, python-format
 msgid ""
 "Certificate for account\n"
 "%s"
 msgstr "za račun %s"
 
-#: gajim/gtk/dialogs.py:824
+#: gajim/gtk/dialogs.py:651
 msgid "Issued to\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:825 gajim/gtk/dialogs.py:830
+#: gajim/gtk/dialogs.py:652 gajim/gtk/dialogs.py:657
 msgid "Common Name (CN): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:826 gajim/gtk/dialogs.py:831
+#: gajim/gtk/dialogs.py:653 gajim/gtk/dialogs.py:658
 msgid "Organization (O): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:827 gajim/gtk/dialogs.py:832
+#: gajim/gtk/dialogs.py:654 gajim/gtk/dialogs.py:659
 msgid "Organizational Unit (OU): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:828
+#: gajim/gtk/dialogs.py:655
 #, fuzzy
 msgid "Serial Number: "
 msgstr "GG Broj:"
 
-#: gajim/gtk/dialogs.py:829
+#: gajim/gtk/dialogs.py:656
 msgid "Issued by\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:833
+#: gajim/gtk/dialogs.py:660
 msgid "Validity\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:834
+#: gajim/gtk/dialogs.py:661
 msgid "Issued on: "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:835
+#: gajim/gtk/dialogs.py:662
 msgid "Expires on: "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:836
+#: gajim/gtk/dialogs.py:663
 msgid "SHA-1:"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:838
+#: gajim/gtk/dialogs.py:665
 msgid "SHA-256:"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:852
+#: gajim/gtk/dialogs.py:679
 #, fuzzy
 msgid "View certificate…"
 msgstr "Osobno potpisan certifikat"
 
-#: gajim/gtk/dialogs.py:864 gajim/gtk/accounts.py:893
+#: gajim/gtk/dialogs.py:691 gajim/gtk/accounts.py:896
 msgid "Change Password"
 msgstr "Promijeni Password"
 
-#: gajim/gtk/dialogs.py:878
+#: gajim/gtk/dialogs.py:705
 msgid "_OK"
 msgstr "_Uredu"
 
-#: gajim/gtk/dialogs.py:891
+#: gajim/gtk/dialogs.py:718
 #, fuzzy
 msgid "You must enter a password"
 msgstr "Morate unesti lozinku."
 
-#: gajim/gtk/dialogs.py:895
+#: gajim/gtk/dialogs.py:722
 msgid "Passwords do not match"
 msgstr "Lozinke se ne podudaraju"
 
-#: gajim/gtk/dialogs.py:923
+#: gajim/gtk/dialogs.py:750
 #, fuzzy
 msgid "Group Chat Invitation "
 msgstr "Poziv na Grupni Razgovor"
 
-#: gajim/gtk/dialogs.py:948
+#: gajim/gtk/dialogs.py:775
 #, fuzzy, python-format
 msgid "<b>%s</b> has invited you to join a discussion"
 msgstr "$Contact vas je pozvao da se uključite u raspravu."
 
-#: gajim/gtk/dialogs.py:951
+#: gajim/gtk/dialogs.py:778
 #, 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:959
+#: gajim/gtk/dialogs.py:786
 #, python-format
 msgid "Comment: %s"
 msgstr "Komentar: %s"
@@ -9290,11 +9608,6 @@ msgstr "GG Broj:"
 msgid "ICQ Number"
 msgstr "ICQ Broj:"
 
-#: gajim/gtk/add_contact.py:40
-#, fuzzy
-msgid "Add Contact"
-msgstr "_Dodaj Kontakt..."
-
 #: gajim/gtk/add_contact.py:259
 #, fuzzy, python-format
 msgid "%s Missing"
@@ -9315,7 +9628,8 @@ msgid "The user ID must not contain a resource."
 msgstr "ID korisnika ne smije sadržavati resurs."
 
 #: gajim/gtk/add_contact.py:299
-msgid "You cannot add yourself to your roster."
+#, fuzzy
+msgid "You cannot add yourself to your contact list."
 msgstr "Nemoguće dodati samog sebe na vlastitu listu."
 
 #: gajim/gtk/add_contact.py:304
@@ -9328,11 +9642,13 @@ msgid "Your account must be online to add new contacts."
 msgstr ""
 
 #: gajim/gtk/add_contact.py:321
-msgid "Contact already in roster"
+#, fuzzy
+msgid "Contact Already in Contact List"
 msgstr "Kontakt je već na listi"
 
 #: gajim/gtk/add_contact.py:322
-msgid "This contact is already listed in your roster."
+#, fuzzy
+msgid "This contact is already in your contact list."
 msgstr "Ovaj kontakt je već na vašoj listi kontakata."
 
 #: gajim/gtk/add_contact.py:379 gajim/gtk/add_contact.py:417
@@ -9373,14 +9689,14 @@ msgstr "Promjeni status"
 
 #: gajim/gtk/themes.py:52
 #, fuzzy
-msgid "MUC Tab New Directed Message"
+msgid "Group Chat Tab New Directed Message"
 msgstr ""
 "MUC Usmjerene\n"
 "Poruke"
 
 #: gajim/gtk/themes.py:56
 #, fuzzy
-msgid "MUC Tab New Message"
+msgid "Group Chat Tab New Message"
 msgstr "Nova Poruka"
 
 #: gajim/gtk/themes.py:60
@@ -9597,13 +9913,13 @@ msgstr "Sve datoteke"
 msgid "Clear File"
 msgstr "Čistim"
 
-#: gajim/gtk/settings.py:570
+#: gajim/gtk/settings.py:570 gajim/gtk/proxies.py:32
 #, fuzzy
 msgid "Manage Proxies"
 msgstr "Podešavanje Proxy Profila"
 
-#: gajim/gtk/settings.py:591 gajim/gtk/preferences.py:971
-#: gajim/gtk/preferences.py:984 gajim/gtk/preferences.py:988
+#: gajim/gtk/settings.py:591 gajim/gtk/preferences.py:968
+#: gajim/gtk/preferences.py:982 gajim/gtk/preferences.py:986
 #, fuzzy
 msgid "No Proxy"
 msgstr "Proxy:"
@@ -9683,14 +9999,15 @@ msgid ""
 "        "
 msgstr ""
 
-#: gajim/gtk/about.py:47 data/org.gajim.Gajim.appdata.xml.in:10
+#: gajim/gtk/about.py:47 data/org.gajim.Gajim.desktop.in:6
+#: data/org.gajim.Gajim.appdata.xml.in:10
 #, fuzzy
-msgid "A GTK+ XMPP client"
+msgid "A GTK XMPP client"
 msgstr "GTK+ Jabber klijent"
 
 #: gajim/gtk/about.py:48
 #, fuzzy, python-format
-msgid "GTK+ Version: %s"
+msgid "GTK Version: %s"
 msgstr "GTK+ Verzija:"
 
 #: gajim/gtk/about.py:49
@@ -9874,6 +10191,25 @@ msgstr "?status prijenosa:Stanka"
 msgid "?transfer status:Not started"
 msgstr "?status prijenosa:Stanka"
 
+#: gajim/gtk/groupchat_creation.py:97 gajim/gtk/groupchat_creation.py:99
+msgid " (optional)..."
+msgstr ""
+
+#: gajim/gtk/groupchat_creation.py:134
+#, fuzzy
+msgid "Invalid Address"
+msgstr "Neispravna Datoteka"
+
+#: gajim/gtk/groupchat_creation.py:182
+#, fuzzy
+msgid "Not Connected"
+msgstr "Spojen"
+
+#: gajim/gtk/groupchat_creation.py:183
+#, fuzzy
+msgid "You have to be connected to create a group chat."
+msgstr "Niste se  pridružili grupnom razgovoru"
+
 #: gajim/gtk/sounds.py:39
 msgid "Wav Sounds"
 msgstr "Wav Zvuci"
@@ -9915,50 +10251,45 @@ msgstr "Označavanje Poruke Grupnog Razgovora"
 msgid "Group Chat Message Received"
 msgstr "Primljena Poruka Grupnog Razgovora"
 
-#: gajim/gtk/dataform.py:226 gajim/gtk/dataform.py:262
+#: gajim/gtk/dataform.py:232 gajim/gtk/dataform.py:268
 #, fuzzy
 msgid "Required"
 msgstr "Potrebna Lozinka"
 
-#: gajim/gtk/dataform.py:286
+#: gajim/gtk/dataform.py:293
 msgid "Yes"
 msgstr ""
 
-#: gajim/gtk/dataform.py:286
+#: gajim/gtk/dataform.py:293
 #, fuzzy
 msgid "No"
 msgstr "Ništa"
 
-#: gajim/gtk/dataform.py:661
+#: gajim/gtk/dataform.py:670
 msgid "Submit"
 msgstr ""
 
-#: gajim/gtk/statusicon.py:213
+#: gajim/gtk/statusicon.py:206
 #, fuzzy
 msgid "_Change Status Message…"
 msgstr "_Izmjena Statusne Poruke"
 
-#: gajim/gtk/statusicon.py:247 gajim/gtk/statusicon.py:292
-#: gajim/gtk/statusicon.py:299
+#: gajim/gtk/statusicon.py:258
 #, python-format
 msgid "using account %s"
 msgstr "koristeći račun %s"
 
-#: gajim/gtk/statusicon.py:309
+#: gajim/gtk/statusicon.py:269
 #, fuzzy
-msgid "_Manage Bookmarks…"
-msgstr "Podešavanje Knjižnih Oznaka"
+msgid "Hide _Contact List"
+msgstr "Pozovi _Kontakte"
 
-#: gajim/gtk/statusicon.py:325
+#: gajim/gtk/statusicon.py:273
 #, fuzzy
-msgid "Hide _Roster"
-msgstr "na _listi"
-
-#: gajim/gtk/statusicon.py:329
-msgid "Show _Roster"
-msgstr "Prikaži _Listu Kontakata"
+msgid "Show _Contact List"
+msgstr "Prikaži Samo _Aktivne Kontakte"
 
-#: gajim/gtk/statusicon.py:337
+#: gajim/gtk/statusicon.py:281
 msgid "Hide this menu"
 msgstr "Sakrij ovaj izbornik"
 
@@ -10007,36 +10338,6 @@ msgstr ""
 "Nastala je greška prilikom objavljivanja vaših osobnih podataka, pokušajte "
 "ponovno kasnije."
 
-#: gajim/gtk/join_groupchat.py:202
-#, fuzzy
-msgid "Invalid Room"
-msgstr "Neispravna soba"
-
-#: gajim/gtk/join_groupchat.py:203
-msgid "Please choose a room"
-msgstr ""
-
-#: gajim/gtk/join_groupchat.py:222 gajim/gtk/join_groupchat.py:229
-msgid "Invalid Nickname"
-msgstr "Neispravan Nadimak"
-
-#: gajim/gtk/join_groupchat.py:223
-#, fuzzy
-msgid "Please choose a nickname"
-msgstr "Molim napravite novu temu sa vašim željenim imenom."
-
-#: gajim/gtk/join_groupchat.py:282 gajim/gtk/join_groupchat.py:288
-#: gajim/gtk/join_groupchat.py:293
-#, fuzzy
-msgid "Wrong server"
-msgstr "Krivi uri"
-
-#: gajim/gtk/join_groupchat.py:283 gajim/gtk/join_groupchat.py:289
-#: gajim/gtk/join_groupchat.py:294
-#, fuzzy, python-format
-msgid "%s is not a groupchat server"
-msgstr "Ovo nije grupni razgovor"
-
 #: gajim/gtk/mam_preferences.py:38
 #, python-format
 msgid "Archiving Preferences for %s"
@@ -10067,45 +10368,53 @@ msgstr "Greška u primljenom podatkovnom obrascu"
 msgid "Archiving Preferences Error"
 msgstr "_Postavke"
 
-#: gajim/gtk/advanced_config.py:81
+#: gajim/gtk/advanced_config.py:95
 msgid "Activated"
 msgstr "Aktivno"
 
-#: gajim/gtk/advanced_config.py:81
+#: gajim/gtk/advanced_config.py:95
 msgid "Deactivated"
 msgstr "Neaktivno"
 
-#: gajim/gtk/advanced_config.py:83
-msgid "Boolean"
-msgstr "Boolean"
+#: gajim/gtk/advanced_config.py:97
+msgid "?config type:Boolean"
+msgstr ""
+
+#: gajim/gtk/advanced_config.py:98
+msgid "?config type:Integer"
+msgstr ""
 
-#: gajim/gtk/advanced_config.py:84
-msgid "Integer"
-msgstr "Cijeli broj"
+#: gajim/gtk/advanced_config.py:99
+msgid "?config type:Text"
+msgstr ""
 
-#: gajim/gtk/advanced_config.py:85
-msgid "Text"
-msgstr "Tekst"
+#: gajim/gtk/advanced_config.py:100
+msgid "?config type:Color"
+msgstr ""
 
-#: gajim/gtk/advanced_config.py:97
-msgid "Preference Name"
+#: gajim/gtk/advanced_config.py:112
+#, fuzzy
+msgid "?config:Preference Name"
 msgstr "Ime Postavke"
 
-#: gajim/gtk/advanced_config.py:104
-msgid "Value"
-msgstr "Vrijednost"
+#: gajim/gtk/advanced_config.py:123
+#, fuzzy
+msgid "?config:Value"
+msgstr "_Postavi"
 
-#: gajim/gtk/advanced_config.py:113
-msgid "Type"
-msgstr "Vrsta"
+#: gajim/gtk/advanced_config.py:132
+msgid "?config:Type"
+msgstr ""
 
-#: gajim/gtk/advanced_config.py:168
-msgid "(None)"
-msgstr "(Nema)"
+#: gajim/gtk/advanced_config.py:187
+#, fuzzy
+msgid "?config description:None"
+msgstr "?Pitaj (za Pretplatu):Ništa"
 
-#: gajim/gtk/advanced_config.py:299
-msgid "Hidden"
-msgstr "Skrivena"
+#: gajim/gtk/advanced_config.py:322
+#, fuzzy
+msgid "?password:Hidden"
+msgstr "Lozinka:"
 
 #: gajim/gtk/server_info.py:66
 #, fuzzy
@@ -10117,8 +10426,8 @@ msgstr "_Kopiraj Lokaciju Linka"
 msgid "%(days)s days, %(hours)s hours"
 msgstr ""
 
-#: gajim/gtk/server_info.py:218 gajim/gtk/accounts.py:749
-#: gajim/gtk/accounts.py:853
+#: gajim/gtk/server_info.py:218 gajim/gtk/accounts.py:752
+#: gajim/gtk/accounts.py:856
 #, fuzzy
 msgid "Hostname"
 msgstr "_Ime poslužitelja:"
@@ -10310,11 +10619,6 @@ 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_config.py:41
-#, fuzzy
-msgid "Group Chat Configuration"
-msgstr "Poziv na Grupni Razgovor"
-
 #: gajim/gtk/groupchat_config.py:134
 #, fuzzy
 msgid "A Group Chat needs at least one Owner"
@@ -10325,69 +10629,69 @@ msgid "You are not allowed to modify the affiliation of Admins and Owners"
 msgstr ""
 
 #: gajim/gtk/groupchat_config.py:399
-msgid "An entry with this Jabber-ID already exists"
+msgid "An entry with this XMPP Address already exists"
 msgstr ""
 
-#: gajim/gtk/adhoc.py:91
+#: gajim/gtk/adhoc.py:92
 #, fuzzy
 msgid "Finish"
 msgstr "_Završi"
 
-#: gajim/gtk/adhoc.py:97 gajim/gtk/adhoc.py:283
+#: gajim/gtk/adhoc.py:98 gajim/gtk/adhoc.py:284
 #, fuzzy
 msgid "Commands"
 msgstr "Komanda: %s"
 
-#: gajim/gtk/adhoc.py:103
+#: gajim/gtk/adhoc.py:104
 msgid "Next"
 msgstr ""
 
-#: gajim/gtk/adhoc.py:109
+#: gajim/gtk/adhoc.py:110
 #, fuzzy
 msgid "Previous"
 msgstr "Zavidan"
 
-#: gajim/gtk/adhoc.py:115
+#: gajim/gtk/adhoc.py:116
 #, fuzzy
 msgid "Execute"
 msgstr "_Izvrši Naredbu..."
 
-#: gajim/gtk/adhoc.py:195
+#: gajim/gtk/adhoc.py:196
 #, fuzzy
 msgid "No commands available"
 msgstr "Nema dostupnih računa"
 
-#: gajim/gtk/adhoc.py:244
+#: gajim/gtk/adhoc.py:245
 #, fuzzy
 msgid "Request Command List"
 msgstr "_Izvrši Naredbu..."
 
-#: gajim/gtk/adhoc.py:259
+#: gajim/gtk/adhoc.py:260
 #, fuzzy
 msgid "Executing…"
 msgstr "_Izvrši Naredbu..."
 
-#: gajim/gtk/adhoc.py:266
+#: gajim/gtk/adhoc.py:267
 #, fuzzy
 msgid "Command List"
 msgstr "Komanda: %s"
 
-#: gajim/gtk/adhoc.py:384
+#: gajim/gtk/adhoc.py:385
 #, fuzzy
 msgid "Finished"
 msgstr "_Završi"
 
-#: gajim/gtk/adhoc.py:453
+#: gajim/gtk/adhoc.py:454
 #, fuzzy
 msgid "Execution failed"
 msgstr "Veza Prekinuta"
 
-#: gajim/gtk/blocking.py:37
+#: gajim/gtk/blocking.py:38
 #, fuzzy, python-format
 msgid "Blocking List for %s"
 msgstr "Lista Privatnosti za %s"
 
-#: gajim/gtk/blocking.py:71
+#: gajim/gtk/blocking.py:72
 #, fuzzy
 msgid "Error!"
 msgstr "Greška"
@@ -10436,8 +10740,7 @@ msgstr "Neispravno korisničko ime"
 msgid "You must provide a username to configure this account."
 msgstr "Morate ponuditi korisničko ime za postavke ovog računa."
 
-#: gajim/gtk/account_wizard.py:252 gajim/gtk/bookmarks.py:290
-#: gajim/gtk/bookmarks.py:303
+#: gajim/gtk/account_wizard.py:252
 msgid "Invalid server"
 msgstr "Neispravan poslužitelj"
 
@@ -10453,7 +10756,7 @@ msgstr "Neispravan unos"
 msgid "Custom port must be a port number."
 msgstr "Osobni port mora biti broj porta."
 
-#: gajim/gtk/account_wizard.py:405
+#: gajim/gtk/account_wizard.py:406
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -10468,15 +10771,15 @@ msgstr ""
 "SSL Greška: %(error)s\n"
 "Još uvijek se želite povezati na ovaj poslužitelj?"
 
-#: gajim/gtk/account_wizard.py:446 gajim/gtk/account_wizard.py:480
+#: gajim/gtk/account_wizard.py:447 gajim/gtk/account_wizard.py:481
 msgid "An error occurred during account creation"
 msgstr "Pojavila se greška pri stvaranju računa"
 
-#: gajim/gtk/account_wizard.py:545
+#: gajim/gtk/account_wizard.py:546
 msgid "Account name is in use"
 msgstr "Ime računa se već koristi"
 
-#: gajim/gtk/account_wizard.py:546
+#: gajim/gtk/account_wizard.py:547
 msgid "You already have an account using this name."
 msgstr "Već imate račun pod tim imenom."
 
@@ -10503,26 +10806,26 @@ msgstr "Prijenos %(filename)s od %(name)s je zaustavljen."
 msgid "%(minutes)s min %(seconds)s sec"
 msgstr ""
 
-#: gajim/gtk/xml_console.py:77
+#: gajim/gtk/xml_console.py:74
 #, fuzzy
 msgid "Filter"
 msgstr "Filter:"
 
-#: gajim/gtk/xml_console.py:82
+#: gajim/gtk/xml_console.py:79
 #, fuzzy
 msgid "XML Input"
 msgstr "<b>XML Unos</b>"
 
-#: gajim/gtk/xml_console.py:86
+#: gajim/gtk/xml_console.py:83
 msgid "Paste Last Input"
 msgstr ""
 
-#: gajim/gtk/xml_console.py:170
+#: gajim/gtk/xml_console.py:167
 #, fuzzy, python-format
 msgid "Please make sure you are connected with '%s'."
 msgstr "Molim potvrdite da ste spojeni na \"%s\"."
 
-#: gajim/gtk/xml_console.py:182
+#: gajim/gtk/xml_console.py:177
 #, fuzzy
 msgid "Invalid Node"
 msgstr "Neispravna Datoteka"
@@ -10555,38 +10858,53 @@ msgstr "Pretraga"
 msgid "No results found"
 msgstr "Nema rezultata"
 
-#: gajim/gtk/preferences.py:358 gajim/gtk/preferences.py:362
+#: gajim/gtk/preferences.py:357 gajim/gtk/preferences.py:361
 msgid "Default"
 msgstr "Predefinirano"
 
-#: gajim/gtk/preferences.py:801
+#: gajim/gtk/preferences.py:798
 msgid "status message title"
 msgstr "naslov statusne poruke"
 
-#: gajim/gtk/preferences.py:802
+#: gajim/gtk/preferences.py:799
 msgid "status message text"
 msgstr "tekst statusne poruke"
 
+#: gajim/gtk/accounts.py:137
+#, fuzzy
+msgid "Re-Login"
+msgstr "Prijaviti se odmah?"
+
 #: gajim/gtk/accounts.py:138
-msgid "Relogin now?"
+#, fuzzy
+msgid "Re-Login now?"
 msgstr "Prijaviti se odmah?"
 
 #: gajim/gtk/accounts.py:139
-msgid "If you want all the changes to apply instantly, you must relogin."
+#, 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:191 gajim/gtk/accounts.py:975
+#: gajim/gtk/accounts.py:141
+msgid "_Later"
+msgstr ""
+
+#: gajim/gtk/accounts.py:143
+msgid "_Re-Login"
+msgstr ""
+
+#: gajim/gtk/accounts.py:194 gajim/gtk/accounts.py:978
 #, fuzzy
 msgid "Remove Account"
 msgstr "Uklanjanje %s računa"
 
-#: gajim/gtk/accounts.py:192
+#: gajim/gtk/accounts.py:195
 #, fuzzy, python-format
 msgid "You still have open chats in your account %s"
 msgstr "Otvorili ste razgovor u računu %s"
 
-#: gajim/gtk/accounts.py:193
+#: gajim/gtk/accounts.py:196
 #, fuzzy
 msgid ""
 "All chat and group chat windows will be closed.\n"
@@ -10595,32 +10913,32 @@ msgstr ""
 "Prozori svih razgovora i grupnih razgovora biti će zatvoreni. Želite li "
 "nastaviti?"
 
-#: gajim/gtk/accounts.py:424
+#: gajim/gtk/accounts.py:427
 #, fuzzy
 msgid "Back"
 msgstr "Vraćam se ubrzo"
 
-#: gajim/gtk/accounts.py:530
+#: gajim/gtk/accounts.py:533
 #, fuzzy
 msgid "Please check if Bonjour is installed."
 msgstr "Molimo provjerite da su Avahi ili Bonjour instalirani."
 
-#: gajim/gtk/accounts.py:532
+#: gajim/gtk/accounts.py:535
 #, fuzzy
 msgid "Please check if Avahi is installed."
 msgstr "Molimo provjerite da su Avahi ili Bonjour instalirani."
 
-#: gajim/gtk/accounts.py:569
+#: gajim/gtk/accounts.py:572
 #, fuzzy
 msgid "Disable Account"
 msgstr "Neispravan Račun"
 
-#: gajim/gtk/accounts.py:570
+#: gajim/gtk/accounts.py:573
 #, fuzzy, python-format
 msgid "Account %s is still connected"
 msgstr "Račun \"%s\" je spojen na poslužitelj"
 
-#: gajim/gtk/accounts.py:571
+#: gajim/gtk/accounts.py:574
 #, fuzzy
 msgid ""
 "All chat and group chat windows will be closed. Do you want to continue?"
@@ -10628,85 +10946,85 @@ msgstr ""
 "Prozori svih razgovora i grupnih razgovora biti će zatvoreni. Želite li "
 "nastaviti?"
 
-#: gajim/gtk/accounts.py:576
+#: gajim/gtk/accounts.py:579
 #, fuzzy
 msgid "_Disable Account"
 msgstr "Neispravan Račun"
 
-#: gajim/gtk/accounts.py:595
+#: gajim/gtk/accounts.py:598
 #, fuzzy
 msgid "Add Account"
 msgstr "_Dodaj Kontakt..."
 
-#: gajim/gtk/accounts.py:663
+#: gajim/gtk/accounts.py:666
 msgid "Label"
 msgstr ""
 
-#: gajim/gtk/accounts.py:667
+#: gajim/gtk/accounts.py:670
 msgid "Login"
 msgstr ""
 
-#: gajim/gtk/accounts.py:670
+#: gajim/gtk/accounts.py:673
 #, fuzzy
 msgid "Import Contacts"
 msgstr "Pozovi _Kontakte"
 
-#: gajim/gtk/accounts.py:674 gajim/gtk/accounts.py:870
+#: gajim/gtk/accounts.py:677 gajim/gtk/accounts.py:873
 #, fuzzy
 msgid "Client Certificate"
 msgstr "Osobno potpisan certifikat"
 
-#: gajim/gtk/accounts.py:677 gajim/gtk/accounts.py:774
+#: gajim/gtk/accounts.py:680 gajim/gtk/accounts.py:777
 #, fuzzy
 msgid "Connect on startup"
 msgstr "Sp_oji se prilikom pokretanja Gajima"
 
-#: gajim/gtk/accounts.py:681 gajim/gtk/accounts.py:779
+#: gajim/gtk/accounts.py:684 gajim/gtk/accounts.py:782
 #, fuzzy
 msgid "Save conversations for all contacts"
 msgstr "Spremaj _povijest razgovora za sve kontakte"
 
-#: gajim/gtk/accounts.py:683 gajim/gtk/accounts.py:781
+#: gajim/gtk/accounts.py:686 gajim/gtk/accounts.py:784
 msgid "Store conversations on the harddrive"
 msgstr ""
 
-#: gajim/gtk/accounts.py:685 gajim/gtk/accounts.py:783
+#: gajim/gtk/accounts.py:688 gajim/gtk/accounts.py:786
 #, fuzzy
 msgid "Global Status"
 msgstr "Svi statusi"
 
-#: gajim/gtk/accounts.py:687
+#: gajim/gtk/accounts.py:690
 #, fuzzy
 msgid "Synchronise the status of all accounts"
 msgstr "Mjenja status jednog računa ili više njih"
 
-#: gajim/gtk/accounts.py:689
+#: gajim/gtk/accounts.py:692
 msgid "Use file transfer proxies"
 msgstr "Koristi proxy za prijenos datoteka"
 
-#: gajim/gtk/accounts.py:705
+#: gajim/gtk/accounts.py:708
 #, fuzzy
 msgid "Idle Time"
 msgstr " od %s"
 
-#: gajim/gtk/accounts.py:707
+#: gajim/gtk/accounts.py:710
 msgid "Disclose the time of your last activity"
 msgstr ""
 
-#: gajim/gtk/accounts.py:709
+#: gajim/gtk/accounts.py:712
 msgid "Local System Time"
 msgstr ""
 
-#: gajim/gtk/accounts.py:711
+#: gajim/gtk/accounts.py:714
 msgid "Disclose the local system time of the device Gajim runs on"
 msgstr ""
 
-#: gajim/gtk/accounts.py:714
+#: gajim/gtk/accounts.py:717
 #, fuzzy
 msgid "Client / Operating System"
 msgstr "Osobno potpisan certifikat"
 
-#: gajim/gtk/accounts.py:716
+#: gajim/gtk/accounts.py:719
 #, fuzzy
 msgid ""
 "Disclose informations about the client and operating system you currently use"
@@ -10714,153 +11032,148 @@ msgstr ""
 "Ako je označeno, Gajim će dopustiti drugima da vide koji operativni sustav "
 "koristite"
 
-#: gajim/gtk/accounts.py:719
+#: gajim/gtk/accounts.py:722
 #, fuzzy
 msgid "Ignore Unknown Contacts"
 msgstr "Pozovi _Kontakte"
 
-#: gajim/gtk/accounts.py:721
+#: gajim/gtk/accounts.py:724
 #, 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:737 gajim/gtk/accounts.py:776
+#: gajim/gtk/accounts.py:740 gajim/gtk/accounts.py:779
 #, fuzzy
 msgid "Use environment variable"
 msgstr "_koristi HTTP__PROXY varijablu okruženja"
 
-#: gajim/gtk/accounts.py:739
-#, fuzzy
-msgid "Proxy"
-msgstr "Proxy:"
-
-#: gajim/gtk/accounts.py:742
+#: gajim/gtk/accounts.py:745
 #, fuzzy
 msgid "Warn on insecure connection"
 msgstr "_Upozori prije korištenja nesigurne veze"
 
-#: gajim/gtk/accounts.py:746
+#: gajim/gtk/accounts.py:749
 msgid "Send keep-alive packets"
 msgstr "Šalji keep-alive pakete"
 
-#: gajim/gtk/accounts.py:750
+#: gajim/gtk/accounts.py:753
 msgid "Manually set the hostname for the server"
 msgstr ""
 
-#: gajim/gtk/accounts.py:756 gajim/gtk/accounts.py:826
-#: gajim/gtk/accounts.py:831
+#: gajim/gtk/accounts.py:759 gajim/gtk/accounts.py:829
+#: gajim/gtk/accounts.py:834
 #, fuzzy
 msgid "Priority"
 msgstr "Priori_tet:"
 
-#: gajim/gtk/accounts.py:785
+#: gajim/gtk/accounts.py:788
 #, fuzzy
 msgid "Synchronize the status of all accounts"
 msgstr "Mjenja status jednog računa ili više njih"
 
-#: gajim/gtk/accounts.py:795
+#: gajim/gtk/accounts.py:798
 #, fuzzy
 msgid "First Name"
 msgstr "Ime:"
 
-#: gajim/gtk/accounts.py:798
+#: gajim/gtk/accounts.py:801
 #, fuzzy
 msgid "Last Name"
 msgstr "Prezime:"
 
-#: gajim/gtk/accounts.py:804
+#: gajim/gtk/accounts.py:807
 #, fuzzy
 msgid "Email"
 msgstr "Novi E-mail"
 
-#: gajim/gtk/accounts.py:822
+#: gajim/gtk/accounts.py:825
 #, fuzzy
 msgid "Adjust to status"
 msgstr "_Uredi prema statusu"
 
-#: gajim/gtk/accounts.py:849
+#: gajim/gtk/accounts.py:852
 msgid "Enable"
 msgstr "Omogući"
 
-#: gajim/gtk/accounts.py:857
+#: gajim/gtk/accounts.py:860
 #, fuzzy
 msgid "Port"
 msgstr "_Port:"
 
-#: gajim/gtk/accounts.py:862
+#: gajim/gtk/accounts.py:865
 #, fuzzy
 msgid "Connection Settings"
 msgstr "Veza"
 
-#: gajim/gtk/accounts.py:872
+#: gajim/gtk/accounts.py:875
 msgid "PKCS12 Files"
 msgstr ""
 
-#: gajim/gtk/accounts.py:874
+#: gajim/gtk/accounts.py:877
 #, fuzzy
 msgid "Encrypted Certificate"
 msgstr "Osobno potpisan certifikat"
 
-#: gajim/gtk/accounts.py:878
+#: gajim/gtk/accounts.py:881
 #, fuzzy
 msgid "Certificate Settings"
 msgstr "Osobno potpisan certifikat"
 
-#: gajim/gtk/accounts.py:890
+#: gajim/gtk/accounts.py:893
 #, fuzzy
 msgid "Save Password"
 msgstr "Spremiti lozinku"
 
-#: gajim/gtk/accounts.py:898
+#: gajim/gtk/accounts.py:901
 #, fuzzy
 msgid "Login Settings"
 msgstr "Registracija nije uspijela"
 
-#: gajim/gtk/accounts.py:931
+#: gajim/gtk/accounts.py:934
 #, fuzzy, python-format
 msgid "Removing account %s"
 msgstr "Uklanjanje %s računa"
 
-#: gajim/gtk/accounts.py:946
+#: gajim/gtk/accounts.py:949
 #, fuzzy
 msgid "Account is disabled"
 msgstr "Emotikoni onemogućeni"
 
-#: gajim/gtk/accounts.py:947
+#: gajim/gtk/accounts.py:950
 #, fuzzy
 msgid "To unregister from a server, the account must be enabled."
 msgstr "Za deaktivaciju računa morate biti odspojeni."
 
-#: gajim/gtk/accounts.py:962
+#: gajim/gtk/accounts.py:965
 #, fuzzy
 msgid "Password required"
 msgstr "Potrebna Lozinka"
 
-#: gajim/gtk/accounts.py:976
+#: gajim/gtk/accounts.py:979
 #, fuzzy, python-format
 msgid "Account '%s' is still connected to the server"
 msgstr "Račun \"%s\" je spojen na poslužitelj"
 
-#: gajim/gtk/accounts.py:978
+#: gajim/gtk/accounts.py:981
 msgid "If you remove it, the connection will be lost."
 msgstr "Ukoliko ga uklonite, veza će biti izgubljena."
 
-#: gajim/gtk/accounts.py:995
+#: gajim/gtk/accounts.py:998
 #, fuzzy, python-format
 msgid "Connection to server %s failed"
 msgstr "Veza na proxy nije uspjela"
 
-#: gajim/gtk/accounts.py:996
+#: gajim/gtk/accounts.py:999
 #, fuzzy
 msgid "What would you like to do?"
 msgstr "Å to želite učiniti?"
 
-#: gajim/gtk/accounts.py:997
+#: gajim/gtk/accounts.py:1000
 #, fuzzy
 msgid "Remove only from Gajim"
 msgstr "Ukloni račun sam_o iz Gajima"
 
-#: gajim/gtk/accounts.py:998
+#: gajim/gtk/accounts.py:1001
 msgid "Don't remove anything. I'll try again later"
 msgstr ""
 
@@ -10883,6 +11196,10 @@ msgstr "<b>%s</b> želi da <b>%s</b> neke kontakte na vašoj listi."
 msgid "Modify"
 msgstr "Uredi"
 
+#: gajim/gtk/roster_item_exchange.py:80
+msgid "JID"
+msgstr "JID"
+
 #: gajim/gtk/roster_item_exchange.py:86
 msgid "Groups"
 msgstr "Grupe"
@@ -10908,19 +11225,19 @@ msgstr[0] "Uklanja kontakt sa liste"
 msgstr[1] "Uklanja kontakt sa liste"
 msgstr[2] "Uklanja kontakt sa liste"
 
-#: gajim/gtk/util.py:581
+#: gajim/gtk/util.py:583
 msgid "Unknown Artist"
 msgstr "Nepoznat Izvođač"
 
-#: gajim/gtk/util.py:582
+#: gajim/gtk/util.py:584
 msgid "Unknown Title"
 msgstr "Nepoznat Naslov"
 
-#: gajim/gtk/util.py:583
+#: gajim/gtk/util.py:585
 msgid "Unknown Source"
 msgstr "Nepoznat Izvor"
 
-#: gajim/gtk/util.py:585
+#: gajim/gtk/util.py:587
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
@@ -10929,29 +11246,10 @@ msgstr ""
 "<b>\"%(title)s\"</b> od <i>%(artist)s</i>\n"
 "šalje <i>%(source)s</i>"
 
-#: gajim/gtk/bookmarks.py:121
-msgid "New Group Chat"
-msgstr "Novi Grupni Razgovor"
-
-#: gajim/gtk/bookmarks.py:161
-msgid "This bookmark has invalid data"
-msgstr "Ova knjižna oznaka ima neispravne podatke"
-
-#: gajim/gtk/bookmarks.py:162
-msgid ""
-"Please be sure to fill out server and room fields or remove this bookmark."
-msgstr ""
-"Molim obavezno ispunite polja poslužitelja i sobe ili uklonite ovu kljižnu "
-"oznaku."
-
-#: gajim/gtk/bookmarks.py:273 gajim/gtk/bookmarks.py:291
-#: gajim/gtk/bookmarks.py:304 gajim/gtk/bookmarks.py:335
-msgid "Character not allowed"
-msgstr "Znak nije dozvoljen"
-
-#: gajim/gtk/bookmarks.py:334
-msgid "Invalid room"
-msgstr "Neispravna soba"
+#: gajim/gtk/bookmarks.py:47
+#, fuzzy, python-format
+msgid "Bookmarks for %s"
+msgstr "_Postavi Oznaku"
 
 #: gajim/plugins/pluginmanager.py:736 gajim/plugins/pluginmanager.py:742
 msgid "Archive corrupted"
@@ -10963,51 +11261,54 @@ msgid "Archive empty"
 msgstr "Datoteka je prazna"
 
 #: gajim/plugins/pluginmanager.py:750 gajim/plugins/pluginmanager.py:758
-#: gajim/plugins/gui.py:257
+#: gajim/plugins/gui.py:258
 #, fuzzy
 msgid "Archive is malformed"
 msgstr "Servis je poslao neispravne podatke"
 
-#: gajim/plugins/pluginmanager.py:766 gajim/plugins/gui.py:281
-#: gajim/plugins/gui.py:289
+#: gajim/plugins/pluginmanager.py:766 gajim/plugins/gui.py:288
+#: gajim/plugins/gui.py:301
 #, fuzzy
 msgid "Plugin already exists"
 msgstr "Ova datoteka već postoji"
 
-#: gajim/plugins/gui.py:82
+#: gajim/plugins/gui.py:83
 msgid "Click to view Gajim's wiki page on how to install plugins in Flatpak."
 msgstr ""
 
-#: gajim/plugins/gui.py:89
+#: gajim/plugins/gui.py:90
 msgid "Plugin"
 msgstr ""
 
-#: gajim/plugins/gui.py:151
+#: gajim/plugins/gui.py:152
 #, fuzzy, python-format
 msgid "Warning: %s"
 msgstr "Zabranjujem pristup %s"
 
-#: gajim/plugins/gui.py:206
+#: gajim/plugins/gui.py:207
 #, fuzzy
 msgid "Plugin failed"
 msgstr "Registracija nije uspijela"
 
-#: gajim/plugins/gui.py:245
+#: gajim/plugins/gui.py:246
 msgid "Unable to properly remove the plugin"
 msgstr ""
 
-#: gajim/plugins/gui.py:281
-msgid "Overwrite?"
-msgstr ""
+#: gajim/plugins/gui.py:287
+#, fuzzy
+msgid "Overwrite Plugin?"
+msgstr "Prepiši Statusnu Poruku?"
+
+#: gajim/plugins/gui.py:289
+#, fuzzy
+msgid "Do you want to overwrite the currently installed version?"
+msgstr "Želite li prihvatiti poziv?"
 
 #: data/org.gajim.Gajim.desktop.in:5
-msgid "Jabber IM Client"
+#, fuzzy
+msgid "XMPP IM Client"
 msgstr "Jabber IM Klijent"
 
-#: data/org.gajim.Gajim.desktop.in:6
-msgid "A GTK+ Jabber client"
-msgstr "GTK+ Jabber klijent"
-
 #: data/org.gajim.Gajim.desktop.in:8
 msgid "chat;messaging;im;xmpp;bonjour;voip;"
 msgstr ""
@@ -11059,7 +11360,7 @@ msgid "Easily send pictures, videos or other files to friends and groups"
 msgstr ""
 
 #: data/org.gajim.Gajim.appdata.xml.in:27
-msgid "Chat securely with End-to-End encryption via OMEMO or PGP"
+msgid "Chat securely with End-to-End encryption via OMEMO or OpenPGP"
 msgstr ""
 
 #: data/org.gajim.Gajim.appdata.xml.in:28
@@ -11121,7 +11422,7 @@ msgstr ""
 
 #: data/org.gajim.Gajim.appdata.xml.in:52
 #, fuzzy
-msgid "Roster, list of contacts"
+msgid "Contact list, list of contacts"
 msgstr "_Pamti promjene statusa kontakata"
 
 #: data/org.gajim.Gajim.appdata.xml.in:56
@@ -11143,6 +11444,534 @@ msgstr "Nedavno:"
 msgid "Plugin manager"
 msgstr "Registracija nije uspijela"
 
+#, fuzzy
+#~ msgid "Configure Services…"
+#~ msgstr "Postavi Usluge..."
+
+#, fuzzy
+#~ msgid "Group Chat Bookmarks"
+#~ msgstr "_Grupni Razgovor"
+
+#, fuzzy
+#~ msgid "Add Bookmark"
+#~ msgstr "_Postavi Oznaku"
+
+#, fuzzy
+#~ msgid "Remove Bookmark"
+#~ msgstr "_Postavi Oznaku"
+
+#, fuzzy
+#~ msgid "Bookmark Name"
+#~ msgstr "Postavi knjižnu oznaku za sobu"
+
+#, fuzzy
+#~ msgid "_Server"
+#~ msgstr "_Poslužitelj:"
+
+#, fuzzy
+#~ msgid "_Password"
+#~ msgstr "_Lozinka:"
+
+#, fuzzy
+#~ msgid "Join chat when connected"
+#~ msgstr "Kontakt Odspojen"
+
+#~ msgid "New Group Chat"
+#~ msgstr "Novi Grupni Razgovor"
+
+#~ msgid "This bookmark has invalid data"
+#~ msgstr "Ova knjižna oznaka ima neispravne podatke"
+
+#, fuzzy
+#~ msgid ""
+#~ "Please be sure to fill out server and group chat fields or remove this "
+#~ "bookmark."
+#~ msgstr ""
+#~ "Molim obavezno ispunite polja poslužitelja i sobe ili uklonite ovu "
+#~ "kljižnu oznaku."
+
+#~ msgid "Character not allowed"
+#~ msgstr "Znak nije dozvoljen"
+
+#, fuzzy
+#~ msgid "Invalid Group Chat"
+#~ msgstr "Neispravan Jabber ID grupnog razgovora"
+
+#~ msgid "Unable to join group chat"
+#~ msgstr "Nije moguće pridružiti se grupnom razgovoru"
+
+#, fuzzy
+#~ msgid "You are banned from group chat <b>%s</b>."
+#~ msgstr "Zabranjen vam je pristup grupnom razgovoru %s."
+
+#, fuzzy
+#~ msgid "Remote server <b>%s</b> does not exist."
+#~ msgstr "Grupni razgovor %s ne postoji."
+
+#, fuzzy
+#~ msgid "Group chat <b>%s</b> does not exist."
+#~ msgstr "Grupni razgovor %s ne postoji."
+
+#, fuzzy
+#~ msgid "Group chat creation is not permitted."
+#~ msgstr "Stvaranje grupnih razgovora je ograničeno."
+
+#, fuzzy
+#~ msgid "You must use your registered nickname in <b>%s</b>."
+#~ msgstr "Morate koristiti vaš registrirani nadimak u grupnom razgovoru %s."
+
+#, fuzzy
+#~ msgid "You are not in the members list in group chat %s."
+#~ msgstr "Niste u listi članova grupnog razgovora %s."
+
+#, fuzzy
+#~ msgid "XMPP Address is not a group chat"
+#~ msgstr "Ovo nije grupni razgovor"
+
+#~ msgid "This is not a group chat"
+#~ msgstr "Ovo nije grupni razgovor"
+
+#, fuzzy
+#~ msgid "Please choose a group chat"
+#~ msgstr "Molim napravite novu temu sa vašim željenim imenom."
+
+#~ msgid "Invalid Nickname"
+#~ msgstr "Neispravan Nadimak"
+
+#, fuzzy
+#~ msgid "Please choose a nickname"
+#~ msgstr "Molim napravite novu temu sa vašim željenim imenom."
+
+#, fuzzy
+#~ msgid "Wrong server"
+#~ msgstr "Krivi uri"
+
+#, fuzzy
+#~ msgid "%s is not a group chat server"
+#~ msgstr "Ovo nije grupni razgovor"
+
+#, fuzzy
+#~ msgid ""
+#~ "How many lines to request from server when entering a group chat. -1 "
+#~ "means no limit."
+#~ msgstr ""
+#~ "Koliko linija teksta zatražiti od poslužitelja kod pridruživanja grupnom "
+#~ "razgovoru."
+
+#, fuzzy
+#~ msgid ""
+#~ "Minutes of backlog to request when entering a group chat. -1 means no "
+#~ "limit."
+#~ msgstr ""
+#~ "Koliko minuta prijašnjeg razgovora zatražiti kod pridruživanja grupnom "
+#~ "razgovoru."
+
+#, fuzzy
+#~ msgid ""
+#~ "How many lines to request from server when entering a group chat. -1 "
+#~ "means no limit, -2 means global value."
+#~ msgstr ""
+#~ "Koliko linija teksta zatražiti od poslužitelja kod pridruživanja grupnom "
+#~ "razgovoru."
+
+#, fuzzy
+#~ msgid ""
+#~ "Minutes of backlog to request when entering a group chat. -1 means no "
+#~ "limit, -2 means global value."
+#~ msgstr ""
+#~ "Koliko minuta prijašnjeg razgovora zatražiti kod pridruživanja grupnom "
+#~ "razgovoru."
+
+#, fuzzy
+#~ msgid "A Password is required to join the group chat %s. Please type it."
+#~ msgstr ""
+#~ "Potrebna je lozinka za pridruživanje grupnom razgovoru %s. Molim unesite "
+#~ "je."
+
+#~ msgid "Not in Roster"
+#~ msgstr "Nije na Listi Kontakata"
+
+#~ msgid "I would like to add you to my roster"
+#~ msgstr "Želio bih vas dodati na svoju listu kontakata"
+
+#, fuzzy
+#~ msgid "Add to Roster"
+#~ msgstr "_Dodaj na Listu"
+
+#, fuzzy
+#~ msgid "Manage Room"
+#~ msgstr "_Upravljanje sobom"
+
+#, fuzzy
+#~ msgid "Configure Room"
+#~ msgstr "Podešavanje _Sobe..."
+
+#, fuzzy
+#~ msgid "Destroy Room"
+#~ msgstr "_Uništi Sobu"
+
+#, fuzzy
+#~ msgid "Change Nick"
+#~ msgstr "Promijeni _Nadimak..."
+
+#, fuzzy
+#~ msgid "Disconnect"
+#~ msgstr "_Odspoji"
+
+#, fuzzy
+#~ msgid "Copy JID"
+#~ msgstr "JID Sobe"
+
+#, fuzzy
+#~ msgid "Add to Roster…"
+#~ msgstr "_Dodaj na Listu"
+
+#, fuzzy
+#~ msgid "Copy JID/Email"
+#~ msgstr "_Kopiraj JID/Email Adresu"
+
+#, fuzzy
+#~ msgid "JID: <i>%s</i>"
+#~ msgstr "Jabber ID: <i>%s</i>"
+
+#~ msgid "Changing Subject"
+#~ msgstr "Mijenjanje Teme"
+
+#~ msgid "Please specify the new subject:"
+#~ msgstr "Molim specificirajte novu temu:"
+
+#~ msgid "Room logging is now enabled"
+#~ msgstr "Zapisivanje razgovora u sobi je sada omogućeno"
+
+#~ msgid "Room logging is now disabled"
+#~ msgstr "Zapisivanje razgovora u sobi je sada onemogućeno"
+
+#, fuzzy
+#~ msgid "You (%s) joined the room"
+#~ msgstr "%s se pridružio grupnom razgovoru"
+
+#~ msgid "Room logging is enabled"
+#~ msgstr "Zapisivanje razgovora u sobi je omogućeno"
+
+#, fuzzy
+#~ msgid "Unable to join groupchat"
+#~ msgstr "Nije moguće pridružiti se grupnom razgovoru"
+
+#~ msgid "Groupchat Invitation"
+#~ msgstr "Poziv na Grupni Razgovor"
+
+#, fuzzy
+#~ msgid "%(jid)s has been invited in this room"
+#~ msgstr "%(nick)s je izbačen iz sobe (%(reason)s)"
+
+#, fuzzy
+#~ msgid "JID is not a Groupchat"
+#~ msgstr "Ovo nije grupni razgovor"
+
+#~ msgid "Invalid JID"
+#~ msgstr "Neispravan JID"
+
+#~ msgid "A connection is not available"
+#~ msgstr "Veza nije dostupna"
+
+#, fuzzy
+#~ msgid "JID already in list"
+#~ msgstr "Jabber ID je već na listi"
+
+#, fuzzy
+#~ msgid "For the chosen encryption there is no encryption method available"
+#~ msgstr "Veza nije dostupna"
+
+#~ msgid "Removes contact from roster"
+#~ msgstr "Uklanja kontakt sa liste"
+
+#~ msgid "Not in roster"
+#~ msgstr "Nije na Listi Kontakata"
+
+#, fuzzy
+#~ msgid "Contact signed in notification color."
+#~ msgstr "Prikaži događaj u _listi kontakata"
+
+#, fuzzy
+#~ msgid "Contact signout notification color"
+#~ msgstr "Prikaži događaj u _listi kontakata"
+
+#, fuzzy
+#~ msgid "File transfer request notification color."
+#~ msgstr "Zahtjev Razmjene Datoteka"
+
+#, fuzzy
+#~ msgid "File transfer error notification color."
+#~ msgstr "Prijenos datoteka otkazan"
+
+#, fuzzy
+#~ msgid "File transfer complete or stopped notification color."
+#~ msgstr "Prikaži obavijest kada završi prijenos datoteka"
+
+#, fuzzy
+#~ msgid "Groupchat invitation notification color"
+#~ msgstr "Poziv na Grupni Razgovor"
+
+#~ msgid "Add * and [n] in roster title?"
+#~ msgstr "Dodaj * i [n] u naslov liste?"
+
+#~ msgid "Hides the banner in two persons chat window"
+#~ msgstr "Skriva baner u prozoru razgovora dviju osoba"
+
+#, fuzzy
+#~ msgid ""
+#~ "Show the confirm metacontacts creation dialog or not? Empty string means "
+#~ "never show the dialog."
+#~ msgstr ""
+#~ "Trebamo li prikazati upit za potvrdu stvaranja metakontakata ili ne? "
+#~ "Prazan niz znači da nikada ne prikazujemo upit."
+
+#~ msgid "Space separated list of ssl errors to ignore."
+#~ msgstr "Popis ssl grešaka koje će se ignorirati, odjeljene razmakom."
+
+#~ msgid "Answer to receipt requests"
+#~ msgstr "Odgovor na zahtjev za potvrdom o primitku"
+
+#~ msgid "Sent receipt requests"
+#~ msgstr "Šalji potvrde o primitku"
+
+#, fuzzy
+#~ msgid "Language for which misspelled words will be checked"
+#~ msgstr "Jezik koji se koristi za provjeru pravopisa"
+
+#~ msgid "I'm eating, so leave me a message."
+#~ msgstr "Jedem, ostavite mi poruku."
+
+#, fuzzy
+#~ msgid "from room %s"
+#~ msgstr "iz sobe %s"
+
+#~ msgid "Leave Groupchats"
+#~ msgstr "Novi Grupni Razgovor"
+
+#, fuzzy
+#~ msgid "Auto Join"
+#~ msgstr "Automatsko spajanje"
+
+#, fuzzy
+#~ msgid "Room"
+#~ msgstr "Soba:"
+
+#~ msgid "Jabber ID:"
+#~ msgstr "Jabber ID:"
+
+#~ msgid "Occupant Actions"
+#~ msgstr "Akcije Prisutnih"
+
+#~ msgid "_Add to Roster"
+#~ msgstr "_Dodaj na Listu"
+
+#~ msgid "_Manage Room"
+#~ msgstr "_Upravljanje sobom"
+
+#~ msgid "Configure _Room..."
+#~ msgstr "Podešavanje _Sobe..."
+
+#~ msgid "_Destroy Room"
+#~ msgstr "_Uništi Sobu"
+
+#~ msgid "Jabber ID"
+#~ msgstr "Jabber ID"
+
+#, fuzzy
+#~ msgid "icon"
+#~ msgstr "Trayicon"
+
+#, fuzzy
+#~ msgid "account"
+#~ msgstr "Korisnički račun"
+
+#, fuzzy
+#~ msgid "Roster"
+#~ msgstr "Prikaži _Listu Kontakata"
+
+#, fuzzy
+#~ msgid "Show only in roster"
+#~ msgstr "Prikaži samo u _listi kontakata"
+
+#~ msgid "in _roster"
+#~ msgstr "na _listi"
+
+#, fuzzy
+#~ msgid "Roster Appearance"
+#~ msgstr "<b>Izgled Liste Kontakata</b>"
+
+#, fuzzy
+#~ msgid "Show chatstate in roster"
+#~ msgstr "Prikaži a_vatare kontakata na listi"
+
+#~ msgid "_Add to Roster..."
+#~ msgstr "_Dodaj na Listu..."
+
+#~ msgid "_Jabber ID:"
+#~ msgstr "_Jabber ID:"
+
+#, fuzzy
+#~ msgid "_Jabber ID"
+#~ msgstr "_Jabber ID:"
+
+#~ msgid "JabberID"
+#~ msgstr "JabberID"
+
+#, fuzzy
+#~ msgid "Show Roster"
+#~ msgstr "Prikaži _Listu Kontakata"
+
+#~ msgid "MUC server"
+#~ msgstr "MUC poslužitelj"
+
+#~ msgid "Room Configuration"
+#~ msgstr "Konfiguracija Sobe"
+
+#~ msgid "Join _Group Chat"
+#~ msgstr "_Grupni Razgovori"
+
+#, fuzzy
+#~ msgid "Audio sessions are not available"
+#~ msgstr "Veza nije dostupna"
+
+#~ msgid "Conference"
+#~ msgstr "Konferencija"
+
+#, fuzzy
+#~ msgid "_Manage Bookmarks…"
+#~ msgstr "Podešavanje Knjižnih Oznaka"
+
+#, fuzzy
+#~ msgid "Hide _Roster"
+#~ msgstr "na _listi"
+
+#~ msgid "Show _Roster"
+#~ msgstr "Prikaži _Listu Kontakata"
+
+#, fuzzy
+#~ msgid "Invalid Room"
+#~ msgstr "Neispravna soba"
+
+#~ msgid "Invalid room"
+#~ msgstr "Neispravna soba"
+
+#~ msgid "A GTK+ Jabber client"
+#~ msgstr "GTK+ Jabber klijent"
+
+#~ msgid "Changing Nickname"
+#~ msgstr "Mijenjam Nadimak"
+
+#~ msgid "Please specify the new nickname you want to use:"
+#~ msgstr "Molim specificirajte novi nadimak ako ga želite koristiti:"
+
+#~ msgid "Bookmark already set"
+#~ msgstr "Knjižna oznaka je već postavljena"
+
+#, fuzzy
+#~ msgid "Group Chat '%s' is already in your bookmarks."
+#~ msgstr "Grupni Razgovor \"%s\" je već u vašim knjižnim oznakama."
+
+#~ msgid "Bookmark has been added successfully"
+#~ msgstr "Knjižna oznaka je bez uspješno dodana"
+
+#, fuzzy
+#~ msgid ""
+#~ "You can manage your bookmarks by clicking the Bookmarks menu item in your "
+#~ "contact list."
+#~ msgstr ""
+#~ "Možete upravljati vašim knjižnim oznakama pomoću izbornika Akcije u vašem "
+#~ "spisku."
+
+#, fuzzy
+#~ msgid "The nickname contains invalid characters."
+#~ msgstr "Nadimak sadrži nedozvoljene znakove."
+
+#, fuzzy
+#~ msgid "Bookmark Room"
+#~ msgstr "Postavi knjižnu oznaku za sobu"
+
+#~ msgid "_Join New Group Chat"
+#~ msgstr "_Pridruži se Novom Grupnom Razgovoru"
+
+#, fuzzy
+#~ msgid "_Create Group Chat"
+#~ msgstr "Novi Grupni Razgovor"
+
+#~ msgid "Name:"
+#~ msgstr "Ime:"
+
+#, fuzzy
+#~ msgid "Description:"
+#~ msgstr "Opis: "
+
+#, fuzzy
+#~ msgid "Address:"
+#~ msgstr "_Adresa:"
+
+#, fuzzy
+#~ msgid "You can not start a new conversation unless you are connected."
+#~ msgstr "Ne možete se pridružiti grupnom razgovoru ukoliko niste spojeni."
+
+#, fuzzy
+#~ msgid "Occupants"
+#~ msgstr "Akcije Prisutnih"
+
+#, fuzzy
+#~ msgid "File transfer error"
+#~ msgstr "Greška u Razmjeni Datoteka"
+
+#, fuzzy
+#~ msgid "No Accounts available"
+#~ msgstr "Nema dostupnih računa"
+
+#~ msgid "_Modify Account..."
+#~ msgstr "_Izmjeni Račun..."
+
+#~ msgid "Boolean"
+#~ msgstr "Boolean"
+
+#~ msgid "Integer"
+#~ msgstr "Cijeli broj"
+
+#~ msgid "Text"
+#~ msgstr "Tekst"
+
+#~ msgid "Value"
+#~ msgstr "Vrijednost"
+
+#~ msgid "Type"
+#~ msgstr "Vrsta"
+
+#~ msgid "(None)"
+#~ msgstr "(Nema)"
+
+#~ msgid "Hidden"
+#~ msgstr "Skrivena"
+
+#~ msgid "Manage Proxy Profiles"
+#~ msgstr "Podešavanje Proxy Profila"
+
+#, fuzzy
+#~ msgid "Properties"
+#~ msgstr "<b>Karakteristike</b>"
+
+#, fuzzy
+#~ msgid "Proxy _Host"
+#~ msgstr "Proxy _Računalo:"
+
+#, fuzzy
+#~ msgid "Proxy _Port"
+#~ msgstr "Proxy _Port:"
+
+#, fuzzy
+#~ msgid "New Groupchat"
+#~ msgstr "Novi Grupni Razgovor"
+
+#, fuzzy
+#~ msgid "New Contact"
+#~ msgstr "Dodaj Novi Kontakt"
+
 #~ msgid "%s GiB"
 #~ msgstr "%s GiB"
 
@@ -11225,9 +12054,6 @@ msgstr "Registracija nije uspijela"
 #~ msgid "_Pause"
 #~ msgstr "_Stanka"
 
-#~ msgid "Clean _up"
-#~ msgstr "Počist_i"
-
 #~ msgid "Remove file transfer from the list."
 #~ msgstr "Ukloni prijenos datoteka sa liste"
 
@@ -11677,9 +12503,6 @@ msgstr "Registracija nije uspijela"
 #~ msgid "You are invited to a groupchat"
 #~ msgstr "Pozvani ste na grupni razgovor"
 
-#~ msgid "Do you want to accept the invitation?"
-#~ msgstr "Želite li prihvatiti poziv?"
-
 #~ msgid "_Start Chat"
 #~ msgstr "_Započni Razgovor"
 
@@ -11894,10 +12717,6 @@ msgstr "Registracija nije uspijela"
 #~ msgid "Nick"
 #~ msgstr "Nadimak"
 
-#, fuzzy
-#~ msgid "Banning…"
-#~ msgstr "Zabranjivanje..."
-
 #~ msgid ""
 #~ "<b>Whom do you want to ban?</b>\n"
 #~ "\n"
@@ -11979,11 +12798,6 @@ msgstr "Registracija nije uspijela"
 #~ msgid "Filter:"
 #~ msgstr "Filter:"
 
-#~ msgid ""
-#~ "If checked, Gajim will display the mood of contacts in the roster window"
-#~ msgstr ""
-#~ "Ako je označeno, Gajim će prikazivati raspoloženje kontakata na listi"
-
 #~ msgid "<b>Chat Appearance</b>"
 #~ msgstr "<b>Izgled Razgovora</b>"
 
@@ -12241,10 +13055,6 @@ msgstr "Registracija nije uspijela"
 #~ msgstr "_Statusna poruka:"
 
 #, fuzzy
-#~ msgid "Group chat highlight"
-#~ msgstr "Označavanje Poruke Grupnog Razgovora"
-
-#, fuzzy
 #~ msgid "Your nickname"
 #~ msgstr "Nadimak:"
 
@@ -12386,9 +13196,6 @@ msgstr "Registracija nije uspijela"
 #~ msgid "The passwords typed in both fields must be identical."
 #~ msgstr "Lozinke upisane u oba polja moraju biti identične."
 
-#~ msgid "Enter new password:"
-#~ msgstr "Unesite novu lozinku:"
-
 #~ msgid "Enter it again for confirmation:"
 #~ msgstr "Ponovite unos za potvrdu:"
 
@@ -12404,10 +13211,6 @@ msgstr "Registracija nije uspijela"
 #~ msgstr "Zahtjev za ukidanjem pretplate od %s"
 
 #, fuzzy
-#~ msgid "Autojoin"
-#~ msgstr "Automatsko spajanje"
-
-#, fuzzy
 #~ msgid "Homepage:"
 #~ msgstr "<b>Osobna Stranica:</b>"
 
@@ -12521,9 +13324,6 @@ msgstr "Registracija nije uspijela"
 #~ msgid "Forward unread message then disconnect"
 #~ msgstr "Proslijedi nepročitane poruke"
 
-#~ msgid "AIM Address:"
-#~ msgstr "AIM Adresa:"
-
 #~ msgid "MSN Address:"
 #~ msgstr "MSN Adresa:"
 
@@ -12573,10 +13373,6 @@ msgstr "Registracija nije uspijela"
 #~ msgid "Session negotiation cancelled"
 #~ msgstr "Pregovaranje o sesiji neuspješno"
 
-#, fuzzy
-#~ msgid "This session WILL NOT be archived on server"
-#~ msgstr "Sesija NEĆE biti sačuvana"
-
 #~ msgid "This session is encrypted"
 #~ msgstr "Ova razgovor je kriptiran"
 
@@ -12894,9 +13690,6 @@ msgstr "Registracija nije uspijela"
 #~ msgid "Server:"
 #~ msgstr "Poslužitelj:"
 
-#~ msgid "Password:"
-#~ msgstr "Lozinka:"
-
 #, fuzzy
 #~ msgid "Join this room _automatically when I connect"
 #~ msgstr "Pridruži se ovoj sobi automatski kada se povežem"
@@ -13237,9 +14030,6 @@ msgstr "Registracija nije uspijela"
 #~ msgid "_Edit Personal Information..."
 #~ msgstr "_Izmjeni Osobne Informacije..."
 
-#~ msgid "Information about you, as stored in the server"
-#~ msgstr "Informacije o vama, kako stoji na poslužitelju"
-
 #~ msgid "<b>Personal Information</b>"
 #~ msgstr "<b>Osobne informacije</b>"
 
@@ -13316,9 +14106,6 @@ msgstr "Registracija nije uspijela"
 #~ msgid "Your server can't save your personal information."
 #~ msgstr "Vaš poslužitelj nije u mogućnosti spremiti vaše osobne informacije."
 
-#~ msgid "Account Local already exists."
-#~ msgstr "Račun Lokalno već postoji."
-
 #~ msgid "Please rename or remove it before enabling link-local messaging."
 #~ msgstr ""
 #~ "Molim uklonite ili preimenujte prije omogućivanja poruka lokalne veze."
@@ -13410,10 +14197,6 @@ msgstr "Registracija nije uspijela"
 #~ msgid "The following message was NOT encrypted"
 #~ msgstr "Ova poruka NIJE kriptirana"
 
-#, fuzzy
-#~ msgid "Encryption used for this contact."
-#~ msgstr "Omogući ESessions enkripciju za ovaj račun."
-
 #~ msgid "Toggle Open_PGP Encryption"
 #~ msgstr "Uključi/Isključi Open_PGP Enkripciju"
 
@@ -13492,10 +14275,6 @@ msgstr "Registracija nije uspijela"
 #~ msgid "Contact's identity verified"
 #~ msgstr "Kontaktov identitet potvrđen"
 
-#, fuzzy
-#~ msgid "Verify again…"
-#~ msgstr "Potvrdi ponovno..."
-
 #~ msgid ""
 #~ "To be certain that <b>only</b> the expected person can read your messages "
 #~ "or send you messages, you need to verify their identity by clicking the "
@@ -13621,9 +14400,6 @@ msgstr "Registracija nije uspijela"
 #~ msgid "Add _Contact..."
 #~ msgstr "Dodaj _Kontakt..."
 
-#~ msgid "_Accounts"
-#~ msgstr "_Korisnički Računi"
-
 #~ msgid "Profile, A_vatar"
 #~ msgstr "Profil, A_vatar"
 
@@ -13858,12 +14634,6 @@ msgstr "Registracija nije uspijela"
 #~ msgid "Activity: "
 #~ msgstr "Aktivnost:"
 
-#~ msgid "Join _Group Chat..."
-#~ msgstr "_Grupni Razgovori..."
-
-#~ msgid "_Modify Account"
-#~ msgstr "_Izmjeni Račun"
-
 #~ msgid "Check on startup if Gajim is the _default Jabber client"
 #~ msgstr "Pri pokretanju provjeri ako je Gajim _zadani Jabber klijent"
 
@@ -14492,9 +15262,6 @@ msgstr "Registracija nije uspijela"
 #~ msgid "[This message is encrypted]"
 #~ msgstr "[Ova poruka je kriptirana]"
 
-#~ msgid "Trayicon"
-#~ msgstr "Trayicon"
-
 #~ msgid "A icon in systemtray reflecting the current presence."
 #~ msgstr "Ikona u traci radne površine koja odražava trenutni status."
 
@@ -14530,9 +15297,6 @@ msgstr "Registracija nije uspijela"
 #~ msgid "Nickname not found: %s"
 #~ msgstr "Nadimak nije pronađen: %s "
 
-#~ msgid "This group chat has no subject"
-#~ msgstr "Ovaj grupni razgovor nema temu"
-
 #, fuzzy
 #~ msgid ""
 #~ "Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
@@ -14660,9 +15424,6 @@ msgstr "Registracija nije uspijela"
 #~ msgid "Mood"
 #~ msgstr "Raspoloženje"
 
-#~ msgid "_Host:"
-#~ msgstr "_Poslužitelj:"
-
 #~ msgid "Requires compilation of the idle module from Gajim sources."
 #~ msgstr "Potrebno je kompilirati idle modul iz Gajim izvornog koda."
 
diff --git a/po/hu.po b/po/hu.po
index fa9604705..95b5b10b5 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: 2019-07-02 02:06+0000\n"
+"POT-Creation-Date: 2019-08-11 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,71 +17,71 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Virtaal 0.6.1\n"
 
-#: gajim/chat_control_base.py:550
+#: gajim/chat_control_base.py:557
 msgid "_Undo"
 msgstr ""
 
-#: gajim/chat_control_base.py:558 gajim/conversation_textview.py:529
+#: gajim/chat_control_base.py:565 gajim/conversation_textview.py:529
 msgid "_Clear"
 msgstr ""
 
-#: gajim/chat_control_base.py:563
+#: gajim/chat_control_base.py:570
 msgid "Paste as quote"
 msgstr ""
 
-#: gajim/chat_control_base.py:613
+#: gajim/chat_control_base.py:620
 #, fuzzy
 msgid "Paste Image"
 msgstr "Válassz képet"
 
-#: gajim/chat_control_base.py:614
+#: gajim/chat_control_base.py:621
 #, fuzzy
 msgid "You are trying to paste an image"
 msgstr "Több lap bezárása előtt állsz"
 
-#: gajim/chat_control_base.py:615
+#: gajim/chat_control_base.py:622
 #, 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:617 gajim/groupchat_control.py:2310
-#: gajim/roster_window.py:2848 gajim/roster_window.py:4167
-#: gajim/message_window.py:252 gajim/gtk/dialogs.py:418
+#: gajim/chat_control_base.py:624 gajim/groupchat_control.py:2218
+#: gajim/roster_window.py:2841 gajim/roster_window.py:4118
+#: gajim/message_window.py:359 gajim/gtk/dialogs.py:330
 msgid "_Do not ask me again"
 msgstr "_Ne kérdezzen meg újra"
 
-#: gajim/chat_control_base.py:620
+#: gajim/chat_control_base.py:627
 msgid "_Paste"
 msgstr ""
 
-#: gajim/chat_control_base.py:1162 gajim/gtk/accounts.py:351
+#: gajim/chat_control_base.py:1169 gajim/gtk/accounts.py:354
 #, fuzzy
 msgid "Privacy"
 msgstr "Magánéleti lista"
 
-#: gajim/chat_control_base.py:1163
+#: gajim/chat_control_base.py:1170
 #, fuzzy
 msgid "Warning"
 msgstr "%s bannolása"
 
-#: gajim/chat_control_base.py:1164
+#: gajim/chat_control_base.py:1171
 #, fuzzy, python-format
 msgid "If you send a file to <b>%s</b>, your real JID 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:1169
+#: gajim/chat_control_base.py:1176
 #, fuzzy
 msgid "Continue"
 msgstr "_Continue"
 
-#: gajim/gtkgui_helpers.py:163 gajim/gtk/filetransfer.py:393
+#: gajim/gtkgui_helpers.py:163 gajim/gtk/filetransfer.py:398
 #, fuzzy, python-format
 msgid "Cannot overwrite existing file '%s'"
 msgstr "Nem lehet kicserélni a létező filet \"%s\""
 
-#: gajim/gtkgui_helpers.py:164 gajim/gtk/filetransfer.py:394
+#: gajim/gtkgui_helpers.py:164 gajim/gtk/filetransfer.py:399
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
@@ -174,388 +174,396 @@ msgstr "Nincs függő feliratkozási kérelem."
 msgid " resource with priority "
 msgstr " erőforrás prioritással "
 
-#: gajim/gui_menu_builder.py:96
-msgid "_New Group Chat"
-msgstr "Ú_j közös társalgás"
-
-#: gajim/gui_menu_builder.py:289 gajim/gui_menu_builder.py:380
-#: gajim/chat_control.py:303 gajim/roster_window.py:786
-#: gajim/roster_window.py:1719 gajim/roster_window.py:1721
-#: gajim/roster_window.py:2030 gajim/roster_window.py:3336
-#: gajim/roster_window.py:3369 gajim/gui_interface.py:413
-#: gajim/common/contacts.py:206 gajim/common/contacts.py:343
-#: gajim/common/helpers.py:83 gajim/common/helpers.py:311
-#: gajim/gtk/add_contact.py:319 gajim/gtk/subscription_request.py:70
-#: gajim/gtk/subscription_request.py:99 gajim/gtk/roster_item_exchange.py:112
-msgid "Not in Roster"
-msgstr "Nincs a névsorban"
+#: gajim/gui_menu_builder.py:251 gajim/gui_menu_builder.py:342
+#: gajim/chat_control.py:305 gajim/roster_window.py:783
+#: gajim/roster_window.py:1716 gajim/roster_window.py:1718
+#: gajim/roster_window.py:2027 gajim/roster_window.py:3292
+#: gajim/roster_window.py:3325 gajim/gui_interface.py:396
+#: gajim/common/contacts.py:222 gajim/common/contacts.py:359
+#: gajim/common/contacts.py:471 gajim/common/helpers.py:86
+#: gajim/common/helpers.py:317 gajim/gtk/add_contact.py:319
+#: gajim/gtk/subscription_request.py:70 gajim/gtk/subscription_request.py:99
+#: gajim/gtk/roster_item_exchange.py:112
+#, fuzzy
+msgid "Not in contact list"
+msgstr "Mutassa a kijelentkezett partnereket"
 
-#: gajim/gui_menu_builder.py:393
-msgid "I would like to add you to my roster"
-msgstr "Hozzá szeretnélek adni a névsoromhoz"
+#: gajim/gui_menu_builder.py:355
+#, 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:471
+#: gajim/gui_menu_builder.py:433
 #, fuzzy
 msgid "Send Single _Message…"
 msgstr "_Levél küldése"
 
-#: gajim/gui_menu_builder.py:486
+#: gajim/gui_menu_builder.py:448
 #, fuzzy
 msgid "E_xecute Command…"
 msgstr "Parancs _futtatása"
 
-#: gajim/gui_menu_builder.py:494
+#: gajim/gui_menu_builder.py:456
 msgid "_Manage Transport"
 msgstr "Transzport _kezelése"
 
-#: gajim/gui_menu_builder.py:500
+#: gajim/gui_menu_builder.py:462
 msgid "_Modify Transport"
 msgstr "Transzport _módosítása"
 
-#: gajim/gui_menu_builder.py:507 gajim/roster_window.py:5046
+#: gajim/gui_menu_builder.py:469 gajim/roster_window.py:4985
 #, fuzzy
 msgid "_Rename…"
 msgstr "Át_nevez"
 
-#: gajim/gui_menu_builder.py:518 gajim/roster_window.py:5062
-#: gajim/roster_window.py:5177 gajim/data/gui/blocked_contacts_window.ui:52
+#: gajim/gui_menu_builder.py:480 gajim/roster_window.py:5001
+#: gajim/roster_window.py:5116 gajim/data/gui/blocked_contacts_window.ui:52
 #: gajim/data/gui/gc_occupants_menu.ui:148
 #: gajim/data/gui/contact_context_menu.ui:143
 msgid "_Unblock"
 msgstr "Tiltás _Feloldása"
 
-#: gajim/gui_menu_builder.py:521 gajim/roster_window.py:5067
-#: gajim/roster_window.py:5181 gajim/data/gui/gc_occupants_menu.ui:140
+#: gajim/gui_menu_builder.py:483 gajim/roster_window.py:5006
+#: gajim/roster_window.py:5120 gajim/data/gui/gc_occupants_menu.ui:140
 #: gajim/data/gui/contact_context_menu.ui:151
 msgid "_Block"
 msgstr "_Tiltás"
 
-#: gajim/gui_menu_builder.py:529 gajim/roster_window.py:5074
+#: gajim/gui_menu_builder.py:491 gajim/roster_window.py:5013
 #: gajim/data/gui/contact_context_menu.ui:181
 msgid "Remo_ve"
 msgstr "Eltá_volít"
 
-#: gajim/gui_menu_builder.py:539 gajim/data/gui/contact_context_menu.ui:198
+#: gajim/gui_menu_builder.py:501 gajim/data/gui/contact_context_menu.ui:198
 msgid "_Information"
 msgstr "_Információ"
 
-#: gajim/gui_menu_builder.py:552
+#: gajim/gui_menu_builder.py:514
 #, fuzzy
 msgid "Save _As"
 msgstr "Van "
 
-#: gajim/gui_menu_builder.py:564 gajim/groupchat_control.py:501
-#: gajim/chat_control.py:340
+#: gajim/gui_menu_builder.py:526 gajim/groupchat_control.py:507
+#: gajim/chat_control.py:342
 #, fuzzy
 msgid "Send File…"
 msgstr "_File Küldése"
 
-#: gajim/gui_menu_builder.py:565
+#: gajim/gui_menu_builder.py:527
 #, fuzzy
 msgid "Upload File…"
 msgstr "File mentése másként..."
 
-#: gajim/gui_menu_builder.py:566
+#: gajim/gui_menu_builder.py:528
 #, fuzzy
 msgid "Send File Directly…"
 msgstr "File mentése másként..."
 
-#: gajim/gui_menu_builder.py:568 gajim/gui_menu_builder.py:632
+#: gajim/gui_menu_builder.py:530 gajim/gui_menu_builder.py:596
 #, fuzzy
 msgid "Send Chatstate"
 msgstr "Legutóbbi állapot: %s"
 
-#: gajim/gui_menu_builder.py:569
+#: gajim/gui_menu_builder.py:531
 #, fuzzy
 msgid "Invite Contacts"
 msgstr "_Partnerek Meghívása "
 
-#: gajim/gui_menu_builder.py:570
+#: gajim/gui_menu_builder.py:532
 #, fuzzy
-msgid "Add to Roster"
-msgstr "_Hozzáadás a Főablakhoz"
+msgid "Add to Contact List"
+msgstr "_Ismerős hozzáadása..."
 
-#: gajim/gui_menu_builder.py:571
+#: gajim/gui_menu_builder.py:533
 #, fuzzy
-msgid "Audio Session"
-msgstr "Hang teszt"
+msgid "Voice Chat"
+msgstr "Élőszavas beszélgetés kérelem"
 
-#: gajim/gui_menu_builder.py:572
+#: gajim/gui_menu_builder.py:534
 #, fuzzy
-msgid "Video Session"
+msgid "Video Chat"
 msgstr "Videó teszt"
 
-#: gajim/gui_menu_builder.py:573
+#: gajim/gui_menu_builder.py:535 gajim/gui_menu_builder.py:582
 #, fuzzy
 msgid "Information"
 msgstr "_Információ"
 
-#: gajim/gui_menu_builder.py:574 gajim/gui_menu_builder.py:639
+#: gajim/gui_menu_builder.py:536 gajim/gui_menu_builder.py:602
 #: gajim/data/gui/application_menu.ui:37
 #, fuzzy
 msgid "History"
 msgstr "_Előzmények"
 
-#: gajim/gui_menu_builder.py:580 gajim/gui_menu_builder.py:687
+#: gajim/gui_menu_builder.py:542 gajim/gui_menu_builder.py:650
 #: gajim/data/gui/preferences_window.ui:1823
 msgid "Disabled"
 msgstr "Kikapcsolva"
 
-#: gajim/gui_menu_builder.py:581 gajim/gui_menu_builder.py:688
+#: gajim/gui_menu_builder.py:543 gajim/gui_menu_builder.py:651
 msgid "Composing only"
 msgstr "Csak fogalmazás"
 
-#: gajim/gui_menu_builder.py:582 gajim/gui_menu_builder.py:689
+#: gajim/gui_menu_builder.py:544 gajim/gui_menu_builder.py:652
 msgid "All chat states"
 msgstr "Minden beszélgetésállapot"
 
-#: gajim/gui_menu_builder.py:620
+#: gajim/gui_menu_builder.py:583
 #, fuzzy
-msgid "Manage Room"
-msgstr "Szoba _Kezelése"
+msgid "Manage Group Chat"
+msgstr "Csoportos beszélgetések elhagyása"
 
-#: gajim/gui_menu_builder.py:621
+#: gajim/gui_menu_builder.py:584 gajim/data/gui/groupchat_control.ui:649
 #, fuzzy
 msgid "Change Subject"
 msgstr "_Beszélgetőtéma megváltoztatása..."
 
-#: gajim/gui_menu_builder.py:622
+#: gajim/gui_menu_builder.py:585
 #, fuzzy
-msgid "Configure Room"
-msgstr "_Szoba Beállítása..."
+msgid "Configure Group Chat"
+msgstr "Csoportos beszélgetések elhagyása"
 
-#: gajim/gui_menu_builder.py:623
+#: gajim/gui_menu_builder.py:586
 #, fuzzy
 msgid "Upload Avatar…"
 msgstr "Válassz képet"
 
-#: gajim/gui_menu_builder.py:624
+#: gajim/gui_menu_builder.py:587
 #, fuzzy
-msgid "Destroy Room"
-msgstr "Szoba _törlése"
+msgid "Destroy Group Chat"
+msgstr "Új közös beszélgetés"
 
-#: gajim/gui_menu_builder.py:626 gajim/data/gui/preferences_window.ui:790
+#: gajim/gui_menu_builder.py:589 gajim/data/gui/preferences_window.ui:790
 #, fuzzy
 msgid "Chat Settings"
 msgstr "Regisztráció nem sikerült"
 
-#: gajim/gui_menu_builder.py:627
+#: gajim/gui_menu_builder.py:590
 msgid "Show join/leave"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:628
+#: gajim/gui_menu_builder.py:591
 #, fuzzy
 msgid "Show status changes"
 msgstr "_Log status changes of contacts"
 
-#: gajim/gui_menu_builder.py:629 gajim/data/gui/gc_control_popup_menu.ui:72
+#: gajim/gui_menu_builder.py:592 gajim/data/gui/gc_control_popup_menu.ui:72
 #, fuzzy
 msgid "Notify on all messages"
 msgstr "Sablonüzenetek:"
 
-#: gajim/gui_menu_builder.py:630
+#: gajim/gui_menu_builder.py:593
 #, fuzzy
 msgid "Minimize on close"
 msgstr "_Tálcára helyezés bezáráskor"
 
-#: gajim/gui_menu_builder.py:631
+#: gajim/gui_menu_builder.py:595
 #, fuzzy
-msgid "Minimize on autojoin"
+msgid "Minimize when joining automatically"
 msgstr "Tálcára helyezés automatikus csatlakozáskor"
 
-#: gajim/gui_menu_builder.py:634
+#: gajim/gui_menu_builder.py:598
 msgid "Sync Threshold"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:635
+#: gajim/gui_menu_builder.py:599
 #, fuzzy
-msgid "Change Nick"
+msgid "Change Nickname"
 msgstr "Becenév _megváltoztatása..."
 
-#: gajim/gui_menu_builder.py:636
-#, fuzzy
-msgid "Bookmark Room"
-msgstr "Szoba felvétele a _könyvjelzők közé"
-
-#: gajim/gui_menu_builder.py:637
+#: gajim/gui_menu_builder.py:600
 #, fuzzy
 msgid "Request Voice"
 msgstr "_Hang"
 
-#: gajim/gui_menu_builder.py:638 gajim/roster_window.py:5246
+#: gajim/gui_menu_builder.py:601 gajim/roster_window.py:5185
 #, fuzzy
 msgid "Execute command"
 msgstr "Parancs _futtatása"
 
-#: gajim/gui_menu_builder.py:640
-#, fuzzy
-msgid "Disconnect"
-msgstr "_Lecsatlakozás"
+#: gajim/gui_menu_builder.py:603
+msgid "Leave"
+msgstr ""
 
-#: gajim/gui_menu_builder.py:678 gajim/gtk/preferences.py:156
+#: gajim/gui_menu_builder.py:641 gajim/gtk/preferences.py:155
 msgid "No threshold"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:680 gajim/gtk/preferences.py:158
+#: gajim/gui_menu_builder.py:643 gajim/gtk/preferences.py:157
 #, python-format
 msgid "%i day"
 msgid_plural "%i days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: gajim/gui_menu_builder.py:709 gajim/gui_menu_builder.py:747
-#: gajim/gtk/join_groupchat.py:43
-msgid "Join Group Chat"
-msgstr "Csatlakozás Csoportos Beszélgetéshez"
-
-#: gajim/gui_menu_builder.py:746
+#: gajim/gui_menu_builder.py:672
 #, fuzzy
 msgid "Add Contact…"
 msgstr "_Ismerős hozzáadása..."
 
-#: gajim/gui_menu_builder.py:748 gajim/gtk/profile.py:52
-#: gajim/gtk/accounts.py:770 gajim/gtk/accounts.py:808
+#: gajim/gui_menu_builder.py:673 gajim/gtk/profile.py:52
+#: gajim/gtk/accounts.py:773 gajim/gtk/accounts.py:811
 #, fuzzy
 msgid "Profile"
 msgstr "file"
 
-#: gajim/gui_menu_builder.py:749
+#: gajim/gui_menu_builder.py:674
+#, fuzzy
+msgid "Send Single Message…"
+msgstr "_Levél küldése"
+
+#: gajim/gui_menu_builder.py:675
 #, fuzzy
 msgid "Discover Services"
 msgstr "_Szolgáltatások felderítése"
 
-#: gajim/gui_menu_builder.py:750
+#: gajim/gui_menu_builder.py:676 gajim/gtk/server_info.py:36
 #, fuzzy
-msgid "Send Single Message…"
-msgstr "_Levél küldése"
+msgid "Server Info"
+msgstr "Szerver"
 
-#: gajim/gui_menu_builder.py:751 gajim/data/gui/preferences_window.ui:2741
+#: gajim/gui_menu_builder.py:677 gajim/data/gui/preferences_window.ui:2741
 msgid "Advanced"
 msgstr "Haladó"
 
-#: gajim/gui_menu_builder.py:752 gajim/gtk/mam_preferences.py:88
+#: gajim/gui_menu_builder.py:678 gajim/gtk/mam_preferences.py:88
 #, fuzzy
 msgid "Archiving Preferences"
 msgstr "Tulajdonságok"
 
-#: gajim/gui_menu_builder.py:753
+#: gajim/gui_menu_builder.py:679
 #, fuzzy
 msgid "Blocking List"
 msgstr "Ban lista"
 
-#: gajim/gui_menu_builder.py:754 gajim/gtk/history_sync.py:108
+#: gajim/gui_menu_builder.py:680
+#, fuzzy
+msgid "Bookmarks"
+msgstr "_Könyvjelző"
+
+#: gajim/gui_menu_builder.py:681
+#, fuzzy
+msgid "PEP Configuration"
+msgstr "Szoba Konfiguráció"
+
+#: gajim/gui_menu_builder.py:682 gajim/gtk/history_sync.py:108
 #: gajim/gtk/history_sync.py:186
 #, fuzzy
 msgid "Synchronise History"
 msgstr "Szinkronizálás"
 
-#: gajim/gui_menu_builder.py:755 gajim/gtk/privacy_list.py:427
+#: gajim/gui_menu_builder.py:683 gajim/gtk/privacy_list.py:427
 msgid "Privacy Lists"
 msgstr "Magánéleti listák"
 
-#: gajim/gui_menu_builder.py:756 gajim/gtk/server_info.py:36
-#, fuzzy
-msgid "Server Info"
-msgstr "Szerver"
-
-#: gajim/gui_menu_builder.py:757 gajim/gui_menu_builder.py:768
+#: gajim/gui_menu_builder.py:685 gajim/gui_menu_builder.py:696
 #: gajim/data/gui/xml_console_window.ui:77
 msgid "XML Console"
 msgstr "XML parancssor"
 
-#: gajim/gui_menu_builder.py:759 gajim/data/gui/groupchat_config.ui:36
+#: gajim/gui_menu_builder.py:687 gajim/data/gui/groupchat_config.ui:36
 #, fuzzy
 msgid "Admin"
 msgstr "_Admin"
 
-#: gajim/gui_menu_builder.py:760
+#: gajim/gui_menu_builder.py:688
 #, fuzzy
 msgid "Send Server Message…"
 msgstr "_Szerverüzenet küldése..."
 
-#: gajim/gui_menu_builder.py:761
+#: gajim/gui_menu_builder.py:689
 #, fuzzy
 msgid "Set MOTD…"
 msgstr "MOTD Beállítása..."
 
-#: gajim/gui_menu_builder.py:762
+#: gajim/gui_menu_builder.py:690
 #, fuzzy
 msgid "Update MOTD…"
 msgstr "MOTD Frissítése..."
 
-#: gajim/gui_menu_builder.py:763
+#: gajim/gui_menu_builder.py:691
 #, fuzzy
 msgid "Delete MOTD…"
 msgstr "MOTD Törlése"
 
-#: gajim/gui_menu_builder.py:812
+#: gajim/gui_menu_builder.py:736
 #, fuzzy
-msgid "No Accounts available"
-msgstr "No account available"
+msgid "_Add Account…"
+msgstr "_Ismerős hozzáadása..."
 
-#: gajim/gui_menu_builder.py:823 gajim/data/gui/application_menu.ui:5
-#: gajim/data/gui/application_menu.ui:71 gajim/data/gui/shortcuts_window.ui:182
-#: gajim/gtk/accounts.py:58
+#: gajim/gui_menu_builder.py:742
+#, fuzzy
+msgid "_Modify Accounts…"
+msgstr "_Fiók módosítása"
+
+#: gajim/gui_menu_builder.py:751 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:755 gajim/data/gui/application_menu.ui:5
+#: gajim/data/gui/shortcuts_window.ui:182 gajim/gtk/accounts.py:57
 msgid "Accounts"
 msgstr "Fiókok"
 
-#: gajim/gui_menu_builder.py:881 gajim/gui_menu_builder.py:886
+#: gajim/gui_menu_builder.py:784 gajim/gui_menu_builder.py:789
 #, fuzzy
-msgid "Copy JID"
-msgstr "Szoba Jabber Azonosítója"
+msgid "Copy XMPP Address"
+msgstr "JID/E-mail Cím _Másolása"
 
-#: gajim/gui_menu_builder.py:882 gajim/gui_menu_builder.py:914
+#: gajim/gui_menu_builder.py:785 gajim/gui_menu_builder.py:817
 #, fuzzy
 msgid "Join Groupchat"
 msgstr "Csatlakozás Csoportos Beszélgetéshez"
 
-#: gajim/gui_menu_builder.py:887 gajim/gui_menu_builder.py:913
-#: gajim/data/gui/application_menu.ui:76
+#: gajim/gui_menu_builder.py:790 gajim/gui_menu_builder.py:816
+#: gajim/data/gui/application_menu.ui:71
 #: gajim/data/gui/subscription_request_window.ui:106
 msgid "Start Chat"
 msgstr "Beszélgetés kezdeményezése"
 
-#: gajim/gui_menu_builder.py:888 gajim/gui_menu_builder.py:915
+#: gajim/gui_menu_builder.py:791 gajim/gui_menu_builder.py:818
 #, fuzzy
-msgid "Add to Roster…"
-msgstr "_Hozzáadás a Főablakhoz"
+msgid "Add to Contact List…"
+msgstr "_Ismerős hozzáadása..."
 
-#: gajim/gui_menu_builder.py:893
+#: gajim/gui_menu_builder.py:796
 #, fuzzy
 msgid "Copy Link Location"
 msgstr "Link Helyének _Másolása"
 
-#: gajim/gui_menu_builder.py:894
+#: gajim/gui_menu_builder.py:797
 #, fuzzy
 msgid "Open Link in Browser"
 msgstr "Link _Megnyitása Böngészőben"
 
-#: gajim/gui_menu_builder.py:899
+#: gajim/gui_menu_builder.py:802
 #, fuzzy
 msgid "Copy Email Address"
 msgstr "JID/E-mail Cím _Másolása"
 
-#: gajim/gui_menu_builder.py:900 gajim/gui_menu_builder.py:912
+#: gajim/gui_menu_builder.py:803 gajim/gui_menu_builder.py:815
 #, fuzzy
 msgid "Open Email Composer"
 msgstr "E-Mail Szerkesztő _Megnyitása"
 
-#: gajim/gui_menu_builder.py:905
+#: gajim/gui_menu_builder.py:808
 #, fuzzy
 msgid "Copy Location"
 msgstr "Link Helyének _Másolása"
 
-#: gajim/gui_menu_builder.py:906
+#: gajim/gui_menu_builder.py:809
 #, fuzzy
 msgid "Show Location"
 msgstr "Tartózkodási hely: %s"
 
-#: gajim/gui_menu_builder.py:911
+#: gajim/gui_menu_builder.py:814
 #, fuzzy
-msgid "Copy JID/Email"
+msgid "Copy XMPP Address/Email"
 msgstr "JID/E-mail Cím _Másolása"
 
-#: gajim/gui_menu_builder.py:945
+#: gajim/gui_menu_builder.py:852
 #, fuzzy
 msgid "Copy"
 msgstr "Szoba Jabber Azonosítója"
@@ -578,44 +586,56 @@ msgstr ""
 msgid "Choose folder for logfile"
 msgstr ""
 
-#: gajim/history_manager.py:107
+#: gajim/history_manager.py:106
 msgid "Cannot find history logs database"
 msgstr "Nem található az előzménynapló adatbázisa"
 
-#: gajim/history_manager.py:108
+#: gajim/history_manager.py:107
 #, fuzzy, python-format
 msgid "%s does not exist."
 msgstr "A file nem létezik"
 
-#: gajim/history_manager.py:141 gajim/history_manager.py:195
-#: gajim/gtk/discovery.py:829 gajim/gtk/roster_item_exchange.py:80
-msgid "JID"
-msgstr "Jabber Azonosító"
+#: gajim/history_manager.py:140 gajim/history_manager.py:194
+#: 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:30
+#: gajim/gtk/accounts.py:804
+#, fuzzy
+msgid "XMPP Address"
+msgstr "AIM cím:"
 
-#: gajim/history_manager.py:154 gajim/history_manager.py:202
+#: gajim/history_manager.py:153 gajim/history_manager.py:201
 #: gajim/data/gui/history_window.ui:89 gajim/gtk/history.py:108
 msgid "Date"
 msgstr "Dátum"
 
-#: gajim/history_manager.py:161 gajim/history_manager.py:225
+#: gajim/history_manager.py:160 gajim/history_manager.py:224
 #: gajim/data/gui/join_groupchat_window.ui:208
 #: gajim/data/gui/profile_window.ui:214
 #: gajim/data/gui/vcard_information_window.ui:443
+#: gajim/data/gui/bookmarks.ui:140
 msgid "Nickname"
 msgstr "Becenév"
 
-#: gajim/history_manager.py:172 gajim/history_manager.py:211
+#: gajim/history_manager.py:171 gajim/history_manager.py:210
 #: gajim/data/gui/preferences_window.ui:1344
 #: gajim/data/gui/single_message_window.ui:275 gajim/gtk/history.py:117
 msgid "Message"
 msgstr "Üzenet"
 
-#: gajim/history_manager.py:180 gajim/history_manager.py:218
+#: gajim/history_manager.py:179 gajim/history_manager.py:217
 #: gajim/data/gui/groups_post_window.ui:49
 #: gajim/data/gui/single_message_window.ui:214
 msgid "Subject"
 msgstr "Tárgy"
 
+#: gajim/history_manager.py:247
+#, fuzzy
+msgid "Database Cleanup"
+msgstr "Adatbázis hiba"
+
 #: gajim/history_manager.py:248
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
@@ -627,11 +647,8 @@ msgstr ""
 #: gajim/history_manager.py:250
 #, fuzzy
 msgid ""
-"Normally allocated database size will not be freed, it will just become "
-"reusable. If you really want to reduce database filesize, click YES, else "
-"click NO.\n"
-"\n"
-"In case you click YES, please wait…"
+"Normally, the allocated database size will not be freed, it will just become "
+"reusable. This operation may take a while."
 msgstr ""
 "Normally allocated database size will not be freed, it will just become "
 "reusable. If you really want to reduce database filesize, click YES, "
@@ -641,47 +658,47 @@ msgstr ""
 
 #: gajim/history_manager.py:255
 #, fuzzy
-msgid "Database Cleanup"
-msgstr "Adatbázis hiba"
+msgid "_Cleanup"
+msgstr "_Tisztítás"
 
-#: gajim/history_manager.py:519 gajim/gtk/filetransfer.py:238
-#: gajim/gtk/filetransfer.py:248
+#: gajim/history_manager.py:518 gajim/gtk/filetransfer.py:237
+#: gajim/gtk/filetransfer.py:247
 msgid "You"
 msgstr "Te üzeneted"
 
-#: gajim/history_manager.py:531
+#: gajim/history_manager.py:530
 #, 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:568 gajim/history_manager.py:607
-#: gajim/gtk/dialogs.py:58 gajim/gtk/themes.py:319
+#: gajim/history_manager.py:567 gajim/history_manager.py:606
+#: gajim/gtk/dialogs.py:57 gajim/gtk/themes.py:319
 #: gajim/gtk/roster_item_exchange.py:75 gajim/gtk/roster_item_exchange.py:185
 msgid "Delete"
 msgstr "Törlés"
 
-#: gajim/history_manager.py:569
+#: gajim/history_manager.py:568
 #, 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:570
+#: gajim/history_manager.py:569
 #, 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:608
+#: gajim/history_manager.py:607
 #, fuzzy
 msgid "Delete Message"
 msgid_plural "Delete Messages"
 msgstr[0] "Alapértelmezett üzenet"
 msgstr[1] "Alapértelmezett üzenet"
 
-#: gajim/history_manager.py:609
+#: gajim/history_manager.py:608
 #, fuzzy
 msgid "Do you want to permanently delete this message"
 msgid_plural "Do you want to permanently delete these messages"
@@ -694,15 +711,15 @@ msgid "Contact name: <i>%s</i>"
 msgstr "Partner neve: <i>%s</i>"
 
 #: gajim/dialogs.py:84
-#, fuzzy, python-format
-msgid "JID: <i>%s</i>"
-msgstr "Jabber Azonosító: <i>%s</i>"
+#, python-format
+msgid "XMPP Address: <i>%s</i>"
+msgstr ""
 
-#: gajim/dialogs.py:115 gajim/dialogs.py:128 gajim/roster_window.py:2901
-#: gajim/roster_window.py:3833 gajim/roster_window.py:5084
-#: gajim/common/contacts.py:157 gajim/common/contacts.py:190
+#: gajim/dialogs.py:115 gajim/dialogs.py:128 gajim/roster_window.py:2894
+#: gajim/roster_window.py:3784 gajim/roster_window.py:5023
+#: gajim/common/contacts.py:157 gajim/common/contacts.py:206
 #: gajim/data/gui/preferences_window.ui:558
-#: gajim/data/gui/shortcuts_window.ui:177 gajim/gtk/accounts.py:349
+#: gajim/data/gui/shortcuts_window.ui:177 gajim/gtk/accounts.py:352
 msgid "General"
 msgstr "Általános"
 
@@ -748,7 +765,7 @@ msgid "Preset 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:703
+#: gajim/dialogs.py:703 gajim/plugins/gui.py:292
 msgid "_Overwrite"
 msgstr ""
 
@@ -760,9 +777,7 @@ msgstr "Mentés sablon állapotüzenetként"
 msgid "Please type a name for this status message"
 msgstr "Kérlek írj be egy nevet ehhez az állapotüzenethez"
 
-#: gajim/dialogs.py:740 gajim/gui_interface.py:1441 gajim/dialog_messages.py:31
-#: gajim/gtk/discovery.py:518 gajim/gtk/profile.py:323
-#: gajim/gtk/join_groupchat.py:234
+#: gajim/dialogs.py:740 gajim/gtk/discovery.py:517 gajim/gtk/profile.py:323
 msgid "You are not connected to the server"
 msgstr "Nem csatlakozol a szerverhez"
 
@@ -770,9 +785,11 @@ msgstr "Nem csatlakozol a szerverhez"
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Kapcsolat nélkül nem szinkronizálhatod a partnereid."
 
-#: gajim/dialogs.py:752 gajim/dialogs.py:823 gajim/gtk/discovery.py:822
-#: gajim/gtk/discovery.py:1648 gajim/gtk/discovery.py:1941
-#: gajim/gtk/history.py:99 gajim/gtk/roster_item_exchange.py:83
+#: gajim/dialogs.py:752 gajim/dialogs.py:823
+#: gajim/data/gui/groupchat_info_scrolled.ui:16 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/gtk/roster_item_exchange.py:83
 msgid "Name"
 msgstr "Név"
 
@@ -792,406 +809,350 @@ msgstr "Addig nem szinkronizálhatod a fiókkal amíg csatlakozva van."
 msgid "Synchronise"
 msgstr "Szinkronizálás"
 
-#: gajim/dialogs.py:1043
+#: gajim/dialogs.py:1042
 msgid "an audio and video"
 msgstr "egy hang és videó"
 
-#: gajim/dialogs.py:1045
+#: gajim/dialogs.py:1044
 msgid "an audio"
 msgstr "egy hang"
 
-#: gajim/dialogs.py:1047
+#: gajim/dialogs.py:1046
 msgid "a video"
 msgstr "egy videó"
 
-#: gajim/dialogs.py:1051
+#: gajim/dialogs.py:1050
 #, fuzzy, python-format
 msgid ""
-"%(contact)s wants to start %(type)s session with you. Do you want to answer "
+"%(contact)s wants to start a %(type)s chat with you. Do you want to answer "
 "the call?"
 msgstr ""
 "%(contact)s wants to start %(type)s session with you. Do you want to answer "
 "the call?"
 
-#: gajim/groupchat_control.py:505
+#: gajim/groupchat_control.py:511
 #, fuzzy, python-format
 msgid "Send File (max. %s MiB)…"
 msgstr "File mentése másként..."
 
-#: gajim/groupchat_control.py:507 gajim/chat_control.py:342
+#: gajim/groupchat_control.py:513 gajim/chat_control.py:344
 #, fuzzy
 msgid "No File Transfer available"
 msgstr "Fileküldés Befejezve"
 
-#: gajim/groupchat_control.py:630 gajim/groupchat_control.py:2349
-msgid "Changing Subject"
-msgstr "Téma váltása"
-
-#: gajim/groupchat_control.py:631 gajim/groupchat_control.py:2350
-msgid "Please specify the new subject:"
-msgstr "Kérlek add meg az új témát:"
-
-#: gajim/groupchat_control.py:638
-msgid "Changing Nickname"
-msgstr "Becenév megváltoztatása"
-
-#: gajim/groupchat_control.py:639
-msgid "Please specify the new nickname you want to use:"
-msgstr "Kérlek határozd meg az új becenevet amelyet használni szerenél:"
-
-#: gajim/groupchat_control.py:657
+#: gajim/groupchat_control.py:655
 #, fuzzy
-msgid "Invalid group chat JID"
+msgid "Invalid group chat XMPP Address"
 msgstr "Érvénytelen közös társalgási Jabber Azonosító"
 
-#: gajim/groupchat_control.py:658
+#: gajim/groupchat_control.py:656
 #, fuzzy
-msgid "The group chat JID has not allowed characters."
+msgid "The group chat XMPP Address has not allowed characters."
 msgstr ""
 "A közös társalgás Jabber Azonosítójában nem megengedett karakterek vannak."
 
-#: gajim/groupchat_control.py:758 gajim/gtk/profile.py:136
+#: gajim/groupchat_control.py:743 gajim/gtk/profile.py:136
 msgid "Could not load image"
 msgstr "Nem lehet a képet betölteni"
 
-#: gajim/groupchat_control.py:888
+#: gajim/groupchat_control.py:873
 msgid "Insert Nickname"
 msgstr "Írd be a becenevet"
 
-#: gajim/groupchat_control.py:1056 gajim/chat_control.py:824
+#: gajim/groupchat_control.py:1041 gajim/chat_control.py:848
 msgid "and authenticated"
 msgstr "és hitelesített"
 
-#: gajim/groupchat_control.py:1060 gajim/chat_control.py:828
+#: gajim/groupchat_control.py:1045 gajim/chat_control.py:852
 msgid "and NOT authenticated"
 msgstr "és NEM hitelesített"
 
-#: gajim/groupchat_control.py:1064
+#: gajim/groupchat_control.py:1049
 #, 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/groupchat_control.py:1111
+#: gajim/groupchat_control.py:1096
 msgid "Conversation with "
 msgstr "Beszélgetés vele: "
 
-#: gajim/groupchat_control.py:1113
+#: gajim/groupchat_control.py:1098
 msgid "Continued conversation"
 msgstr "Folytatott beszélgetés"
 
-#: gajim/groupchat_control.py:1411
+#: gajim/groupchat_control.py:1357
 #, 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:1433
+#: gajim/groupchat_control.py:1374
 #, fuzzy
-msgid "Room now shows unavailable members"
+msgid "Group chat now shows unavailable members"
 msgstr "A szoba mostantól mutatja a nem elérhető tagokat"
 
-#: gajim/groupchat_control.py:1436
+#: gajim/groupchat_control.py:1377
 #, fuzzy
-msgid "Room now does not show unavailable members"
+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:1439
+#: gajim/groupchat_control.py:1380
 msgid "A setting not related to privacy has been changed"
 msgstr ""
 
-#: gajim/groupchat_control.py:1446
-msgid "Room logging is now enabled"
-msgstr "A szoba naplózása mostantól engedélyezve van"
+#: gajim/groupchat_control.py:1387 gajim/groupchat_control.py:1659
+#, fuzzy
+msgid "Conversations are stored on the server"
+msgstr "A munkamenet NEM LESZ naplózva"
 
-#: gajim/groupchat_control.py:1449
-msgid "Room logging is now disabled"
-msgstr "A szoba naplózása mostantól nincs engedélyezve"
+#: gajim/groupchat_control.py:1390
+#, fuzzy
+msgid "Conversations are not stored on the server"
+msgstr "Information about you, as stored in the server"
 
-#: gajim/groupchat_control.py:1452
+#: gajim/groupchat_control.py:1393
 #, fuzzy
-msgid "Room is now non-anonymous"
+msgid "Group chat is now non-anonymous"
 msgstr "Room is now non-anonymous"
 
-#: gajim/groupchat_control.py:1456
+#: gajim/groupchat_control.py:1397
 #, fuzzy
-msgid "Room is now semi-anonymous"
+msgid "Group chat is now semi-anonymous"
 msgstr "Room is now semi-anonymous"
 
-#: gajim/groupchat_control.py:1460
+#: gajim/groupchat_control.py:1401
 #, fuzzy
-msgid "Room is now fully anonymous"
+msgid "Group chat is now fully anonymous"
 msgstr "A szoba mostantól teljesen anonymous"
 
-#: gajim/groupchat_control.py:1500
+#: gajim/groupchat_control.py:1439
 #, fuzzy, python-format
 msgid "Ping? (%s)"
 msgstr "Pong! (%s s.)"
 
-#: gajim/groupchat_control.py:1503
+#: gajim/groupchat_control.py:1442
 #, fuzzy, python-format
 msgid "Pong! (%(nick)s %(delay)s s.)"
 msgstr "Pong! (%s s.)"
 
-#: gajim/groupchat_control.py:1506 gajim/chat_control.py:1213
+#: gajim/groupchat_control.py:1445 gajim/chat_control.py:1237
 msgid "Error."
 msgstr "Hiba."
 
-#: gajim/groupchat_control.py:1711
+#: gajim/groupchat_control.py:1650
 #, fuzzy, python-format
-msgid "You (%s) joined the room"
+msgid "You (%s) joined the group chat"
 msgstr "%s csatlakozott a közös beszélgetéshez"
 
-#: gajim/groupchat_control.py:1717
+#: gajim/groupchat_control.py:1655
 #, fuzzy
-msgid "Any occupant is allowed to see your full JID"
+msgid "Any participant is allowed to see your full XMPP Address"
 msgstr "Any occupant is allowed to see your full JID"
 
-#: gajim/groupchat_control.py:1721
-msgid "Room logging is enabled"
-msgstr "Szoba naplózása engedélyezve"
-
-#: gajim/groupchat_control.py:1725
-msgid "The server has assigned or modified your roomnick"
+#: gajim/groupchat_control.py:1663
+#, fuzzy
+msgid "The server has assigned or modified your nickname in this group chat"
 msgstr ""
 "A szerver hozzárendelte vagy módosította a te beceneved ebben a szobában"
 
-#: gajim/groupchat_control.py:1732
-msgid "A new room has been created"
+#: gajim/groupchat_control.py:1671
+#, fuzzy
+msgid "A new group chat has been created"
 msgstr "Egy új szoba lett létrehozva"
 
-#: gajim/groupchat_control.py:1740 gajim/privatechat_control.py:112
+#: gajim/groupchat_control.py:1679 gajim/privatechat_control.py:115
 #, python-format
 msgid "You are now known as %s"
 msgstr "Mostantól így szerepelsz: %s"
 
-#: gajim/groupchat_control.py:1742 gajim/privatechat_control.py:114
+#: gajim/groupchat_control.py:1681 gajim/privatechat_control.py:117
 #, 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:1767 gajim/privatechat_control.py:141
+#: gajim/groupchat_control.py:1706 gajim/privatechat_control.py:144
 #, fuzzy, python-brace-format
 msgid "You are now {show}{status}"
 msgstr "Mostantól így szerepelsz: %s"
 
-#: gajim/groupchat_control.py:1773 gajim/privatechat_control.py:147
+#: gajim/groupchat_control.py:1712 gajim/privatechat_control.py:150
 #, fuzzy, python-brace-format
 msgid "{nick} is now {show}{status}"
 msgstr "%(nick)s mostantól %(status)s"
 
-#: gajim/groupchat_control.py:1790 gajim/groupchat_control.py:1819
-#: gajim/groupchat_control.py:1849 gajim/groupchat_control.py:1909
+#: gajim/groupchat_control.py:1729 gajim/groupchat_control.py:1758
+#: gajim/groupchat_control.py:1788 gajim/groupchat_control.py:1848
 #, python-brace-format
 msgid " by {actor}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1793
+#: gajim/groupchat_control.py:1732
 #, fuzzy, python-brace-format
 msgid "** Your Affiliation has been set to {affiliation}{actor}{reason}"
 msgstr ""
 "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
 
-#: gajim/groupchat_control.py:1799
+#: gajim/groupchat_control.py:1738
 #, fuzzy, python-brace-format
 msgid "** Affiliation of {nick} has been set to {affiliation}{actor}{reason}"
 msgstr "** Affiliation of %(nick)s has been set to %(affiliation)s"
 
-#: gajim/groupchat_control.py:1822
+#: gajim/groupchat_control.py:1761
 #, fuzzy, python-brace-format
 msgid "** Your Role has been set to {role}{actor}{reason}"
 msgstr "** Role of %(nick)s has been set to %(role)s by %(actor)s"
 
-#: gajim/groupchat_control.py:1827
+#: gajim/groupchat_control.py:1766
 #, fuzzy, python-brace-format
 msgid "** Role of {nick} has been set to {role}{actor}{reason}"
 msgstr "** Role of %(nick)s has been set to %(role)s by %(actor)s"
 
-#: gajim/groupchat_control.py:1852
+#: gajim/groupchat_control.py:1791
 #, fuzzy, python-brace-format
-msgid "You have been removed from the room{actor}{reason}"
+msgid "You have been removed from the group chat{actor}{reason}"
 msgstr "%(nick)s el lettek távolítva a szobából (%(reason)s)"
 
-#: gajim/groupchat_control.py:1857
+#: gajim/groupchat_control.py:1796
 #, python-brace-format
 msgid "You have left due to an error{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1863
+#: gajim/groupchat_control.py:1802
 #, python-brace-format
 msgid "You have been kicked{actor}{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1870
+#: gajim/groupchat_control.py:1809
 #, python-brace-format
 msgid "You have been banned{actor}{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1877 gajim/groupchat_control.py:1943
+#: gajim/groupchat_control.py:1816 gajim/groupchat_control.py:1882
 #, fuzzy
 msgid ": Affiliation changed"
 msgstr "a hovatartozás megváltozott"
 
-#: gajim/groupchat_control.py:1883 gajim/groupchat_control.py:1948
+#: gajim/groupchat_control.py:1822 gajim/groupchat_control.py:1887
 #, fuzzy
-msgid ": Room configuration changed to members-only"
+msgid ": Group chat configuration changed to members-only"
 msgstr "room configuration changed to members-only"
 
-#: gajim/groupchat_control.py:1912
+#: gajim/groupchat_control.py:1851
 #, fuzzy, python-brace-format
-msgid "{nick} has been removed from the room{by}{reason}"
+msgid "{nick} has been removed from the group chat{by}{reason}"
 msgstr "%(nick)s el lettek távolítva a szobából (%(reason)s)"
 
-#: gajim/groupchat_control.py:1922
+#: gajim/groupchat_control.py:1861
 #, python-brace-format
 msgid "{nick} has left due to an error{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1928
+#: gajim/groupchat_control.py:1867
 #, fuzzy, python-brace-format
 msgid "{nick} has been kicked{actor}{reason}"
 msgstr "%(nick)s has been kicked: %(reason)s"
 
-#: gajim/groupchat_control.py:1936
+#: gajim/groupchat_control.py:1875
 #, fuzzy, python-brace-format
 msgid "{nick} has been banned{actor}{reason}"
 msgstr "%(nick)s has been banned: %(reason)s"
 
-#: gajim/groupchat_control.py:1953
+#: gajim/groupchat_control.py:1892
 #, python-brace-format
 msgid "{nick} has left{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1970
+#: gajim/groupchat_control.py:1914
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s csatlakozott a közös beszélgetéshez"
 
-#: gajim/groupchat_control.py:1985 gajim/groupchat_control.py:1990
-#: gajim/groupchat_control.py:1995 gajim/groupchat_control.py:2000
-#: gajim/groupchat_control.py:2011
-msgid "Unable to join group chat"
-msgstr "Nem sikerült csatlakozni közös beszélgetéshez"
-
-#: gajim/groupchat_control.py:1986
-#, fuzzy, python-format
-msgid "You are banned from group chat <b>%s</b>."
-msgstr "Bannolva lettél a közös beszélgetésekből %s."
-
-#: gajim/groupchat_control.py:1991
-#, fuzzy, python-format
-msgid "Remote server <b>%s</b> does not exist."
-msgstr "Group chat %s does not exist."
-
-#: gajim/groupchat_control.py:1996
-#, fuzzy, python-format
-msgid "Group chat <b>%s</b> does not exist."
-msgstr "Group chat %s does not exist."
-
-#: gajim/groupchat_control.py:2001
-#, fuzzy
-msgid "Group chat creation is not permitted."
-msgstr "Közös beszélgetés létrehozása korlátozva van."
-
-#: gajim/groupchat_control.py:2005
+#: gajim/groupchat_control.py:1981
 #, fuzzy
-msgid "Unable to join groupchat"
-msgstr "Nem sikerült csatlakozni közös beszélgetéshez"
-
-#: gajim/groupchat_control.py:2006
-#, fuzzy, python-format
-msgid "You must use your registered nickname in <b>%s</b>."
-msgstr "A regisztrált becenevedet kell használnod a közös beszélgetésben %s."
-
-#: gajim/groupchat_control.py:2012
-#, python-format
-msgid "You are not in the members list in groupchat %s."
-msgstr "Nem vagy ennek a közös beszélgetésnek a taglistáján %s."
-
-#: gajim/groupchat_control.py:2068
-msgid "Room has been destroyed"
+msgid "Group chat has been destroyed"
 msgstr "Szoba törölve"
 
-#: gajim/groupchat_control.py:2073
+#: gajim/groupchat_control.py:1986
 #, fuzzy, python-format
-msgid "You can join this room instead: xmpp:%s?join"
+msgid "You can join this group chat instead: xmpp:%s?join"
 msgstr "Helyette csatlakozhatsz ehhez a szobához: %s"
 
-#: gajim/groupchat_control.py:2306
+#: gajim/groupchat_control.py:2214
 #, fuzzy
 msgid "Leave Group Chat"
 msgstr "Csoportos beszélgetések elhagyása"
 
-#: gajim/groupchat_control.py:2307
+#: gajim/groupchat_control.py:2215
 #, fuzzy
 msgid "Are you sure you want to leave this group chat?"
 msgstr "Biztosan el szeretnéd hagyni ezt a közös beszélgetést: \"%s\"?"
 
-#: gajim/groupchat_control.py:2308
+#: gajim/groupchat_control.py:2216
 #, fuzzy, python-format
-msgid "If you close this window, you will be disconnected from '%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:2314
+#: gajim/groupchat_control.py:2222 gajim/roster_window.py:5177
 msgid "_Leave"
 msgstr ""
 
-#: gajim/groupchat_control.py:2377
+#: gajim/groupchat_control.py:2280 gajim/roster_window.py:3008
 #, 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/groupchat_control.py:2527
+#: gajim/groupchat_control.py:2463
 #, python-format
 msgid "Kicking %s"
 msgstr "%s kirúgása"
 
-#: gajim/groupchat_control.py:2528 gajim/groupchat_control.py:2829
+#: gajim/groupchat_control.py:2464 gajim/groupchat_control.py:2765
 msgid "You may specify a reason below:"
 msgstr "Ha szeretnél, beírhatsz egy indokot:"
 
-#: gajim/groupchat_control.py:2828
+#: gajim/groupchat_control.py:2764
 #, python-format
 msgid "Banning %s"
 msgstr "%s bannolása"
 
-#: gajim/chat_control.py:408
+#: gajim/chat_control.py:432
 msgid "Show a list of formattings"
 msgstr ""
 
-#: gajim/chat_control.py:412
+#: gajim/chat_control.py:436
 #, fuzzy
 msgid "This contact does not support HTML"
 msgstr "Ez a partner nem támogatja a fileátvitelt."
 
-#: gajim/chat_control.py:562
+#: gajim/chat_control.py:586
 #, 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:686
+#: gajim/chat_control.py:710
 #, 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:832
+#: gajim/chat_control.py:856
 #, 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.py:1160 gajim/chat_control.py:1168
+#: gajim/chat_control.py:1184 gajim/chat_control.py:1192
 #, fuzzy
 msgid "Close"
 msgstr "_Küld & Bezár"
 
-#: gajim/chat_control.py:1161
+#: gajim/chat_control.py:1185
 #, fuzzy, python-format
 msgid "You just received a new message from %s"
 msgstr "Új üzeneted érkezett tőle: \"%s\""
 
-#: gajim/chat_control.py:1163
+#: gajim/chat_control.py:1187
 #, fuzzy
 msgid ""
 "If you close this tab while having chat history disabled, this message will "
@@ -1200,16 +1161,16 @@ msgstr ""
 "Ha bezárod ezt a fület és a beszélgetésnaplózás funkció ki van kapcsolva, "
 "akkor ez az üzenet el fog veszni."
 
-#: gajim/chat_control.py:1208
+#: gajim/chat_control.py:1232
 msgid "Ping?"
 msgstr "Ping?"
 
-#: gajim/chat_control.py:1211
+#: gajim/chat_control.py:1235
 #, fuzzy, python-format
 msgid "Pong! (%s seconds)"
 msgstr "Pong! (%s s.)"
 
-#: gajim/chat_control.py:1308
+#: gajim/chat_control.py:1332
 #, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -1218,255 +1179,263 @@ msgstr ""
 "Tárgy: %(subject)s\n"
 "%(message)s"
 
-#: gajim/chat_control.py:1416
+#: gajim/chat_control.py:1440
 #, fuzzy, python-format
 msgid "%(name)s is now %(show)s %(status)s"
 msgstr "%(name)s mostantól %(status)s"
 
-#: gajim/chat_control.py:1476 gajim/data/gui/application_menu.ui:32
+#: gajim/chat_control.py:1500 gajim/data/gui/application_menu.ui:32
 #: gajim/gtk/http_upload_progress.py:35
 #, fuzzy
 msgid "File Transfer"
 msgstr "Fileátvitelek"
 
-#: gajim/chat_control.py:1480
+#: gajim/chat_control.py:1504
 #, fuzzy
 msgid "Size"
 msgstr "Méret: %s"
 
-#: gajim/chat_control.py:1482 gajim/chat_control.py:1546
+#: gajim/chat_control.py:1506 gajim/chat_control.py:1566
+#: gajim/gui_interface.py:190
 #: gajim/data/gui/groupchat_invitation_received.ui:77
-#: gajim/gtk/filetransfer.py:485
+#: gajim/gtk/filetransfer.py:490
 #, fuzzy
 msgid "_Accept"
 msgstr "_Fiókok"
 
-#: gajim/chat_control.py:1484 gajim/chat_control.py:1548
+#: gajim/chat_control.py:1508 gajim/chat_control.py:1568
 #: gajim/data/gui/groupchat_invitation_received.ui:62
 #, fuzzy
 msgid "_Decline"
 msgstr "_Kijelentkezett"
 
-#: gajim/chat_control.py:1506 gajim/gui_interface.py:791
-#: gajim/gui_interface.py:821 gajim/gui_interface.py:847
+#: gajim/chat_control.py:1530 gajim/gui_interface.py:777
+#: gajim/gui_interface.py:807 gajim/gui_interface.py:833
 #: gajim/gtk/notification.py:173 gajim/gtk/notification.py:278
 msgid "File Transfer Completed"
 msgstr "Fileátvitel befejezve"
 
-#: gajim/chat_control.py:1510 gajim/gtk/filetransfer.py:259
+#: gajim/chat_control.py:1534 gajim/gtk/filetransfer.py:258
 #, fuzzy
 msgid "Open _Folder"
 msgstr "_Open Containing Folder"
 
-#: gajim/chat_control.py:1512 gajim/chat_control.py:1521
+#: gajim/chat_control.py:1536 gajim/chat_control.py:1545
+#: gajim/data/gui/groupchat_control.ui:962
+#: gajim/data/gui/groupchat_control.ui:1049
+#: gajim/data/gui/groupchat_control.ui:1155
 #, fuzzy
 msgid "_Close"
 msgstr "_Küld & Bezár"
 
-#: gajim/chat_control.py:1543 gajim/gui_interface.py:484
+#: gajim/chat_control.py:1563 gajim/gui_interface.py:473
+#: gajim/data/gui/groupchat_invitation_received.ui:42
 #: gajim/gtk/notification.py:174 gajim/gtk/notification.py:195
 #: gajim/gtk/notification.py:281
-msgid "Groupchat Invitation"
+#, fuzzy
+msgid "Group Chat Invitation"
 msgstr "Meghívó közös társalgásba"
 
-#: gajim/chat_control.py:1568 gajim/roster_window.py:1954
+#: gajim/chat_control.py:1588 gajim/roster_window.py:1951
 msgid "Remote contact stopped transfer"
 msgstr "A partner megállította a fileátvitelt"
 
-#: gajim/chat_control.py:1570 gajim/roster_window.py:1956
+#: gajim/chat_control.py:1590 gajim/roster_window.py:1953
 msgid "Error opening file"
 msgstr "Hiba a file megnyitása közben"
 
-#: gajim/chat_control.py:1572 gajim/gtk/filetransfer.py:297
+#: gajim/chat_control.py:1592 gajim/gtk/filetransfer.py:296
 msgid "File transfer stopped"
 msgstr "Fileátvitel megállítva"
 
-#: gajim/chat_control.py:1575 gajim/gtk/filetransfer.py:275
-#: gajim/gtk/filetransfer.py:284
+#: gajim/chat_control.py:1595 gajim/gtk/filetransfer.py:274
+#: gajim/gtk/filetransfer.py:283
 msgid "File transfer cancelled"
 msgstr "Fileátvitel megszakítva"
 
-#: gajim/chat_control.py:1576
+#: gajim/chat_control.py:1596
 msgid "Connection with peer cannot be established."
 msgstr "Nem létesíthető kapcsolat a partnerrel."
 
-#: gajim/application.py:72
+#: gajim/application.py:75
 #, fuzzy
 msgid "Show the application's version"
 msgstr "Show tab when only one conversation?"
 
-#: gajim/application.py:79
+#: gajim/application.py:82
 #, fuzzy
 msgid "Show only critical errors"
 msgstr "Csak a főablakban jelenítse meg"
 
-#: gajim/application.py:86
+#: gajim/application.py:89
 msgid "Separate profile files completely (even history database and plugins)"
 msgstr ""
 
-#: gajim/application.py:94
+#: gajim/application.py:97
 msgid "Print XML stanzas and other debug information"
 msgstr ""
 
-#: gajim/application.py:101
+#: gajim/application.py:104
 #, fuzzy
 msgid "Use defined profile in configuration directory"
 msgstr "Bővített Konfiguráció Szerkesztő"
 
-#: gajim/application.py:109
+#: gajim/application.py:112
 #, fuzzy
 msgid "Set configuration directory"
 msgstr "%s konfiguráció hiba"
 
-#: gajim/application.py:117
+#: gajim/application.py:120
 msgid "Configure logging system"
 msgstr ""
 
-#: gajim/application.py:125
+#: gajim/application.py:128
 #, fuzzy
 msgid "Show all warnings"
 msgstr "Összes függő esemény mutatása"
 
-#: gajim/application.py:132
+#: gajim/application.py:135
 msgid "Open IPython shell"
 msgstr ""
 
-#: gajim/application.py:139
+#: gajim/application.py:142
 msgid "Pops up a window with the next pending event"
 msgstr "Megnyit egy ablakot a következő függő eseménnyel"
 
-#: gajim/application.py:145 gajim/data/gui/shortcuts_window.ui:203
+#: gajim/application.py:148 gajim/data/gui/shortcuts_window.ui:203
 #: data/org.gajim.Gajim.desktop.in:21
 #, fuzzy
 msgid "Start a new chat"
 msgstr "Beszélgetés kezdeményezése"
 
-#: gajim/application.py:152
+#: gajim/application.py:155
 msgid "Simulate loss of connectivity"
 msgstr ""
 
-#: gajim/application.py:159
+#: gajim/application.py:162
 msgid "Simulate regaining connectivity"
 msgstr ""
 
-#: gajim/application.py:201 gajim/gui_interface.py:133
+#: gajim/application.py:204 gajim/gui_interface.py:133
 msgid "Database Error"
 msgstr "Adatbázis hiba"
 
-#: gajim/roster_window.py:294 gajim/roster_window.py:1030
+#: gajim/roster_window.py:291 gajim/roster_window.py:1027
 msgid "Merged accounts"
 msgstr "Összevont fiókok"
 
-#: gajim/roster_window.py:853 gajim/roster_window.py:1631
-#: gajim/roster_window.py:1664 gajim/roster_window.py:1715
-#: gajim/roster_window.py:1717 gajim/roster_window.py:1872
-#: gajim/roster_window.py:2531 gajim/roster_window.py:5025
-#: gajim/common/contacts.py:188 gajim/common/contacts.py:447
-#: gajim/common/helpers.py:83 gajim/gtk/discovery.py:129
-#: gajim/gtk/discovery.py:130 gajim/gtk/discovery.py:1416
+#: gajim/roster_window.py:850 gajim/roster_window.py:1628
+#: gajim/roster_window.py:1661 gajim/roster_window.py:1712
+#: gajim/roster_window.py:1714 gajim/roster_window.py:1869
+#: gajim/roster_window.py:2528 gajim/roster_window.py:4331
+#: gajim/roster_window.py:4964 gajim/common/contacts.py:204
+#: gajim/common/contacts.py:463 gajim/common/helpers.py:86
+#: gajim/gtk/discovery.py:127 gajim/gtk/discovery.py:128
+#: gajim/gtk/discovery.py:1414
 msgid "Transports"
 msgstr "Transzportok"
 
-#: gajim/roster_window.py:1723 gajim/roster_window.py:1725
-#: gajim/roster_window.py:4995 gajim/gui_interface.py:1613
-#: gajim/gui_interface.py:1639 gajim/common/contacts.py:186
-#: gajim/common/helpers.py:83 gajim/common/modules/adhoc_commands.py:245
-msgid "Groupchats"
+#: gajim/roster_window.py:1720 gajim/roster_window.py:1722
+#: gajim/roster_window.py:4331 gajim/roster_window.py:4934
+#: gajim/gui_interface.py:1527 gajim/common/contacts.py:202
+#: gajim/common/helpers.py:86 gajim/common/modules/adhoc_commands.py:245
+#, fuzzy
+msgid "Group chats"
 msgstr "Csoportos beszélgetések"
 
-#: gajim/roster_window.py:2012
+#: gajim/roster_window.py:2009
 #, fuzzy
 msgid "Authorization sent"
 msgstr "Engedély elküldve"
 
-#: gajim/roster_window.py:2013
+#: gajim/roster_window.py:2010
 #, fuzzy, python-format
 msgid "\"%s\" will now see your status."
 msgstr "Now \"%s\" will know your status."
 
-#: gajim/roster_window.py:2031
+#: gajim/roster_window.py:2028
 msgid "Subscription request has been sent"
 msgstr "Feliratkozási kérelem elküldve"
 
-#: gajim/roster_window.py:2032
+#: gajim/roster_window.py:2029
 #, fuzzy, python-format
-msgid "If \"%s\" accepts this request you will know his or her status."
+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:2046
+#: gajim/roster_window.py:2043
 #, fuzzy
 msgid "Authorization removed"
 msgstr "Engedély eltávolítva"
 
-#: gajim/roster_window.py:2047
+#: gajim/roster_window.py:2044
 #, fuzzy, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Now \"%s\" will always see you as offline."
 
-#: gajim/roster_window.py:2250 gajim/roster_window.py:3504
+#: gajim/roster_window.py:2247 gajim/roster_window.py:3460
 msgid "Disconnect for Invisibility"
 msgstr ""
 
-#: gajim/roster_window.py:2251 gajim/roster_window.py:3505
+#: gajim/roster_window.py:2248 gajim/roster_window.py:3461
 msgid "You are participating in one or more group chats"
 msgstr "Egy vagy több közös beszélgetésben veszel részt"
 
-#: gajim/roster_window.py:2252 gajim/roster_window.py:3506
+#: gajim/roster_window.py:2249 gajim/roster_window.py:3462
 #, fuzzy
 msgid ""
-"Changing your status to invisible will result in disconnection from those "
-"group chats.\n"
+"Changing your status to invisible will result in you leaving those group "
+"chats.\n"
 "Are you sure you want to go invisible?"
 msgstr ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
 
-#: gajim/roster_window.py:2257 gajim/roster_window.py:3512
-#: gajim/roster_window.py:5238 gajim/data/gui/gc_control_popup_menu.ui:120
+#: gajim/roster_window.py:2254 gajim/roster_window.py:3468
+#: gajim/data/gui/gc_control_popup_menu.ui:120
 msgid "_Disconnect"
 msgstr "_Lecsatlakozás"
 
-#: gajim/roster_window.py:2285
+#: gajim/roster_window.py:2282
 #, fuzzy
 msgid "desynced"
 msgstr "szétkapcsolt"
 
-#: gajim/roster_window.py:2353 gajim/data/gui/shortcuts_window.ui:224
+#: gajim/roster_window.py:2350 gajim/data/gui/shortcuts_window.ui:224
 #, fuzzy
 msgid "Quit Gajim"
 msgstr "Gajim"
 
-#: gajim/roster_window.py:2354
+#: gajim/roster_window.py:2351
 #, fuzzy
 msgid "You are about to quit Gajim"
 msgstr "Are you sure you want to quit Gajim?"
 
-#: gajim/roster_window.py:2355
+#: gajim/roster_window.py:2352
 #, fuzzy
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Are you sure you want to quit Gajim?"
 
-#: gajim/roster_window.py:2356
+#: gajim/roster_window.py:2353
 #, fuzzy
 msgid "_Always quit when closing Gajim"
 msgstr "Always close Gajim"
 
-#: gajim/roster_window.py:2359 gajim/roster_window.py:2455
-#: gajim/roster_window.py:2495 gajim/data/gui/systray_context_menu.ui:90
+#: gajim/roster_window.py:2356 gajim/roster_window.py:2452
+#: gajim/roster_window.py:2492 gajim/data/gui/systray_context_menu.ui:83
 msgid "_Quit"
 msgstr ""
 
-#: gajim/roster_window.py:2448
+#: gajim/roster_window.py:2445
 #, fuzzy
 msgid "Stop File Transfers"
 msgstr "Fileátvitelek"
 
-#: gajim/roster_window.py:2449
+#: gajim/roster_window.py:2446
 #, fuzzy
 msgid "You still have running file transfers"
 msgstr "You have running file transfers"
 
-#: gajim/roster_window.py:2450
+#: gajim/roster_window.py:2447
 #, fuzzy
 msgid ""
 "If you quit now, the file(s) being transferred will be lost.\n"
@@ -1475,17 +1444,17 @@ msgstr ""
 "If you quit now, the file(s) being transferred will be stopped. Do you still "
 "want to quit?"
 
-#: gajim/roster_window.py:2488
+#: gajim/roster_window.py:2485
 #, fuzzy
 msgid "Unread Messages"
 msgstr "Olvasatlan események"
 
-#: gajim/roster_window.py:2489
+#: gajim/roster_window.py:2486
 #, fuzzy
 msgid "You still have unread messages"
 msgstr "You have unread messages"
 
-#: gajim/roster_window.py:2490
+#: gajim/roster_window.py:2487
 #, fuzzy
 msgid ""
 "Messages will only be available for reading them later if storing chat "
@@ -1494,22 +1463,22 @@ msgstr ""
 "Messages will only be available for reading them later if you have history "
 "enabled and contact is in your roster."
 
-#: gajim/roster_window.py:2760
+#: gajim/roster_window.py:2753
 #, fuzzy
 msgid "You have unread messages"
 msgstr "You have unread messages"
 
-#: gajim/roster_window.py:2761
+#: gajim/roster_window.py:2754
 #, fuzzy
 msgid "You must read them before removing this transport."
 msgstr "You must read them before removing this transport."
 
-#: gajim/roster_window.py:2764
+#: gajim/roster_window.py:2757
 #, fuzzy, python-format
 msgid "Transport '%s' will be removed"
 msgstr "Transport \"%s\" will be removed"
 
-#: gajim/roster_window.py:2765
+#: gajim/roster_window.py:2758
 #, fuzzy
 msgid ""
 "You will no longer be able to send and receive messages from and to contacts "
@@ -1518,12 +1487,12 @@ msgstr ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
 
-#: gajim/roster_window.py:2768
+#: gajim/roster_window.py:2761
 #, fuzzy
 msgid "Transports will be removed"
 msgstr "Transports will be removed"
 
-#: gajim/roster_window.py:2773
+#: gajim/roster_window.py:2766
 #, fuzzy, python-format
 msgid ""
 "You will no longer be able to send and receive messages from and to contacts "
@@ -1533,22 +1502,22 @@ msgstr ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
 
-#: gajim/roster_window.py:2777
+#: gajim/roster_window.py:2770
 #, fuzzy
 msgid "Remove Transport"
 msgstr "Mutassa a transzportokat"
 
-#: gajim/roster_window.py:2844
+#: gajim/roster_window.py:2837
 #, fuzzy
 msgid "Block Contact"
 msgstr "Letiltott Partnerek"
 
-#: gajim/roster_window.py:2845
+#: gajim/roster_window.py:2838
 #, fuzzy
 msgid "Really block this contact?"
 msgstr "Is OpenPGP enabled for this contact?"
 
-#: gajim/roster_window.py:2846
+#: gajim/roster_window.py:2839
 #, fuzzy
 msgid ""
 "This contact will see you offline and you will not receive any messages sent "
@@ -1557,67 +1526,62 @@ msgstr ""
 "This contact will see you offline and you will not receive messages he will "
 "send you."
 
-#: gajim/roster_window.py:2851
+#: gajim/roster_window.py:2844
 #, fuzzy
 msgid "_Block Contact"
 msgstr "Letiltott Partnerek"
 
-#: gajim/roster_window.py:2896
+#: gajim/roster_window.py:2889
 #, fuzzy
 msgid "Rename Contact"
 msgstr "Rename Contact"
 
-#: gajim/roster_window.py:2897
+#: gajim/roster_window.py:2890
 #, fuzzy, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Enter a new nickname for contact %s"
 
-#: gajim/roster_window.py:2904
+#: gajim/roster_window.py:2897
 #, fuzzy
 msgid "Rename Group"
 msgstr "Rename Group"
 
-#: gajim/roster_window.py:2905
+#: gajim/roster_window.py:2898
 #, fuzzy, python-format
 msgid "Enter a new name for group %s"
 msgstr "Enter a new name for group %s"
 
-#: gajim/roster_window.py:2953 gajim/roster_window.py:2954
+#: gajim/roster_window.py:2946 gajim/roster_window.py:2947
 #, fuzzy
 msgid "Remove Group"
 msgstr "Remove Group"
 
-#: gajim/roster_window.py:2955
+#: gajim/roster_window.py:2948
 #, fuzzy, python-format
 msgid "Do you want to remove %s from the contact list?"
 msgstr "Do you want to remove group %s from the roster?"
 
-#: gajim/roster_window.py:2956
+#: gajim/roster_window.py:2949
 #, fuzzy
 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:3044
-#, fuzzy, python-format
-msgid "%(jid)s has been invited in this room"
-msgstr "%(nick)s el lettek távolítva a szobából (%(reason)s)"
-
-#: gajim/roster_window.py:3353
+#: gajim/roster_window.py:3309
 #, fuzzy
 msgid "Remove Contact"
 msgstr "Rename Contact"
 
-#: gajim/roster_window.py:3354
+#: gajim/roster_window.py:3310
 #, fuzzy
 msgid "Remove contact from contact list"
 msgstr "Eltávolítja a partnert a névsorról"
 
-#: gajim/roster_window.py:3355
+#: gajim/roster_window.py:3311
 #, 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:3364 gajim/roster_window.py:3384
+#: gajim/roster_window.py:3320 gajim/roster_window.py:3340
 #, fuzzy
 msgid ""
 "By removing this contact you also remove authorization. This means the "
@@ -1626,22 +1590,22 @@ msgstr ""
 "By removing these contacts:%s\n"
 "you also remove authorisation resulting in them always seeing you as offline."
 
-#: gajim/roster_window.py:3375
+#: gajim/roster_window.py:3331
 #, fuzzy
 msgid "Do you want to continue?"
 msgstr "Do you want to continue?"
 
-#: gajim/roster_window.py:3386
+#: gajim/roster_window.py:3342
 #, 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:3393
+#: gajim/roster_window.py:3349
 #, fuzzy
 msgid "Remove contacts from contact list"
 msgstr "Eltávolítja a partnert a névsorról"
 
-#: gajim/roster_window.py:3399
+#: gajim/roster_window.py:3355
 #, fuzzy, python-format
 msgid ""
 "By removing the following contacts, you will also remove authorization. This "
@@ -1652,27 +1616,27 @@ msgstr ""
 "By removing these contacts:%s\n"
 "you also remove authorisation resulting in them always seeing you as offline."
 
-#: gajim/roster_window.py:3403
+#: gajim/roster_window.py:3359
 #, fuzzy
 msgid "Remove Contacts"
 msgstr "Rename Contact"
 
-#: gajim/roster_window.py:3423
+#: gajim/roster_window.py:3379
 #, fuzzy
 msgid "No account available"
 msgstr "No account available"
 
-#: gajim/roster_window.py:3424
+#: gajim/roster_window.py:3380
 #, 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:4060
+#: gajim/roster_window.py:4011
 #, fuzzy
 msgid "Metacontacts storage not supported by your server"
 msgstr "Metacontacts storage not supported by your server"
 
-#: gajim/roster_window.py:4062
+#: gajim/roster_window.py:4013
 #, fuzzy
 msgid ""
 "Your server does not support storing metacontacts information. So this "
@@ -1681,13 +1645,13 @@ msgstr ""
 "Your server does not support storing metacontacts information. So those "
 "information will not be saved on next reconnection."
 
-#: gajim/roster_window.py:4159
+#: gajim/roster_window.py:4110
 #, 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:4160
+#: gajim/roster_window.py:4111
 #, fuzzy
 msgid ""
 "Metacontacts are a way to regroup several contacts in one single contact. "
@@ -1698,123 +1662,114 @@ msgstr ""
 "is used when the same person has several Jabber accounts or transport "
 "accounts."
 
-#: gajim/roster_window.py:4164
+#: gajim/roster_window.py:4115
 #, fuzzy
 msgid "Create Metacontact"
 msgstr "Rename Contact"
 
-#: gajim/roster_window.py:4170
+#: gajim/roster_window.py:4121 gajim/data/gui/groupchat_creation.ui:317
 #, fuzzy
 msgid "_Create"
 msgstr "Kreatív"
 
-#: gajim/roster_window.py:4287
+#: gajim/roster_window.py:4238
 msgid "Invalid file URI:"
 msgstr "Érvénytelen file URI:"
 
-#: gajim/roster_window.py:4298
+#: gajim/roster_window.py:4249
 #, fuzzy
 msgid "Send file?"
 msgstr "_File Küldése"
 
-#: gajim/roster_window.py:4299
+#: gajim/roster_window.py:4250
 #, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
 msgstr[0] "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:4451
+#: gajim/roster_window.py:4401
 #, fuzzy, python-format
 msgid "Send %(from)s to %(to)s"
 msgstr "Send %s to %s"
 
-#: gajim/roster_window.py:4464
+#: gajim/roster_window.py:4414
 #, fuzzy, python-format
 msgid "Make %s first contact"
 msgstr "Make %s and %s metacontacts"
 
-#: gajim/roster_window.py:4469
+#: gajim/roster_window.py:4419
 #, fuzzy, python-format
 msgid "Make %(contact1)s and %(contact2)s metacontacts"
 msgstr "Make %s and %s metacontacts"
 
-#: gajim/roster_window.py:4825 gajim/roster_window.py:4923
+#: gajim/roster_window.py:4775 gajim/roster_window.py:4862
 msgid "_Change Status Message"
 msgstr "Állapot üzenet _megváltoztatása"
 
-#: gajim/roster_window.py:4845
+#: gajim/roster_window.py:4795
 msgid "Publish Tune"
 msgstr "Éppen hallgatott zeneszám címének közzététele"
 
-#: gajim/roster_window.py:4856
+#: gajim/roster_window.py:4806
 msgid "Publish Location"
 msgstr "Tartózkodási hely közzététele"
 
-#: gajim/roster_window.py:4868
-#, fuzzy
-msgid "Configure Services…"
-msgstr "Szolgáltatások beállítása..."
-
-#: gajim/roster_window.py:4997
+#: gajim/roster_window.py:4936
 msgid "_Maximize All"
 msgstr "Mindet _teljes képernyőre"
 
-#: gajim/roster_window.py:5004 gajim/roster_window.py:5146
+#: gajim/roster_window.py:4943 gajim/roster_window.py:5085
 msgid "Send Group M_essage"
 msgstr "Közös _beszélgetési üzenet küldése"
 
-#: gajim/roster_window.py:5011
+#: gajim/roster_window.py:4950
 msgid "To all users"
 msgstr "Az összes felhasználónak"
 
-#: gajim/roster_window.py:5015
+#: gajim/roster_window.py:4954
 msgid "To all online users"
 msgstr "Az összes jelenlévő felhasználónak"
 
-#: gajim/roster_window.py:5027 gajim/roster_window.py:5152
+#: gajim/roster_window.py:4966 gajim/roster_window.py:5091
 #: gajim/data/gui/gc_occupants_menu.ui:110
 #: gajim/data/gui/contact_context_menu.ui:36
 msgid "In_vite to"
 msgstr "Meg_hívás ide:"
 
-#: gajim/roster_window.py:5162
+#: gajim/roster_window.py:5101
 msgid "_Manage Contacts"
 msgstr "Partnerek _kezelése"
 
-#: gajim/roster_window.py:5168
+#: gajim/roster_window.py:5107
 #, fuzzy
 msgid "Edit _Groups…"
 msgstr "_Csoportok szerkesztése"
 
-#: gajim/roster_window.py:5189 gajim/data/gui/filetransfers.ui:12
+#: gajim/roster_window.py:5128 gajim/data/gui/filetransfers.ui:12
 #: gajim/data/gui/remove_account_window.ui:134
 msgid "_Remove"
 msgstr "_Eltávolítás"
 
-#: gajim/roster_window.py:5226
+#: gajim/roster_window.py:5165
 msgid "_Maximize"
 msgstr "_Teljes képernyő"
 
-#: gajim/roster_window.py:5233
+#: gajim/roster_window.py:5172
 msgid "_Reconnect"
 msgstr "Újracsatlakozás"
 
-#: gajim/roster_window.py:5254 gajim/data/gui/gc_occupants_menu.ui:170
+#: gajim/roster_window.py:5193 gajim/data/gui/gc_occupants_menu.ui:170
 #: gajim/data/gui/gc_control_popup_menu.ui:113
 #: gajim/data/gui/contact_context_menu.ui:205
 msgid "_History"
 msgstr "_Előzmények"
 
-#: gajim/roster_window.py:5335 gajim/data/gui/application_menu.ui:86
+#: gajim/roster_window.py:5274 gajim/data/gui/application_menu.ui:83
 #: gajim/data/gui/history_window.ui:57
 msgid "History Manager"
 msgstr "Előzménykezelő"
 
-#: gajim/roster_window.py:5343
-msgid "_Join New Group Chat"
-msgstr "_Csatlakozás új közös beszélgetéshez"
-
 #: gajim/dataforms_widget.py:585
 msgid "Unable to load image"
 msgstr "Nem lehet betölteni a képet"
@@ -1937,225 +1892,242 @@ msgstr "Tárgy: %s\n"
 msgid "Write a message…"
 msgstr "Egy Üzenet Fogadása"
 
-#: gajim/message_window.py:250
+#: gajim/message_window.py:356
+#, fuzzy
+msgid "Close Tabs"
+msgstr "_Küld & Bezár"
+
+#: gajim/message_window.py:357
 msgid "You are going to close several tabs"
 msgstr "Több lap bezárása előtt állsz"
 
-#: gajim/message_window.py:251
+#: gajim/message_window.py:358
 msgid "Do you really want to close them all?"
 msgstr "Biztosan mindet be szeretnéd zárni?"
 
-#: gajim/message_window.py:539
+#: gajim/message_window.py:514
 #, fuzzy
 msgid "?Noun:Chats"
 msgstr "Közös beszélgetések"
 
-#: gajim/message_window.py:543
+#: gajim/message_window.py:518
 #, fuzzy
 msgid "Group Chats"
 msgstr "Csoportos beszélgetések"
 
-#: gajim/message_window.py:547
+#: gajim/message_window.py:522
 msgid "Private Chats"
 msgstr "Privát beszélgetések"
 
-#: gajim/message_window.py:553
+#: gajim/message_window.py:528
 msgid "Messages"
 msgstr "Üzenetek"
 
-#: gajim/gui_interface.py:173
+#: gajim/gui_interface.py:170
+#, 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:175
 msgid "Do you accept this request?"
 msgstr "Elfogadod ezt a felkérést?"
 
-#: gajim/gui_interface.py:175
+#: gajim/gui_interface.py:177
 #, fuzzy, python-format
-msgid "Do you accept this request on account %s?"
+msgid "Do you accept this request (account: %s)?"
 msgstr "Do you accept this request on account %s?"
 
-#: gajim/gui_interface.py:178
-#, 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:182
+#, fuzzy
+msgid "Authorization"
+msgstr "Engedély elküldve"
 
-#: gajim/gui_interface.py:194 gajim/gtk/notification.py:175
+#: gajim/gui_interface.py:186 gajim/gui_interface.py:420
+#: gajim/gtk/filetransfer.py:338
+#, fuzzy
+msgid "_No"
+msgstr "Egyik sem"
+
+#: gajim/gui_interface.py:205 gajim/gtk/notification.py:175
 #: gajim/gtk/notification.py:197
 msgid "Connection Failed"
 msgstr "Kapcsolat megszakadt"
 
-#: gajim/gui_interface.py:279 gajim/gui_interface.py:529
-msgid "Password Required"
-msgstr "Jelszó szükséges"
-
-#: gajim/gui_interface.py:280
-#, fuzzy, python-format
-msgid "A Password is required to join the room %s. Please type it."
-msgstr "A Password is required to join the room %s. Please type it."
-
-#: gajim/gui_interface.py:342 gajim/gui_interface.py:346
+#: gajim/gui_interface.py:325 gajim/gui_interface.py:329
 #, fuzzy, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr "Error %(code)s: %(msg)s"
 
-#: gajim/gui_interface.py:357 gajim/gui_interface.py:376
+#: gajim/gui_interface.py:340 gajim/gui_interface.py:359
 #: gajim/common/modules/message.py:122
 #, 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:401 gajim/gtk/notification.py:175
+#: gajim/gui_interface.py:384 gajim/gtk/notification.py:175
 msgid "Subscription request"
 msgstr "Feliratkozási kérelem"
 
-#: gajim/gui_interface.py:413 gajim/common/contacts.py:184
-#: gajim/common/helpers.py:83
+#: gajim/gui_interface.py:396 gajim/common/contacts.py:200
+#: gajim/common/helpers.py:86
 msgid "Observers"
 msgstr "Megfigyelők"
 
-#: gajim/gui_interface.py:422
+#: gajim/gui_interface.py:405
 msgid "Authorization accepted"
 msgstr "Engedély elfogadva"
 
-#: gajim/gui_interface.py:423
+#: gajim/gui_interface.py:406
 #, 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:431
+#: gajim/gui_interface.py:415
+#, fuzzy
+msgid "Subscription Removed"
+msgstr "Feliratkozási kérelem"
+
+#: gajim/gui_interface.py:416
 #, fuzzy, python-format
-msgid "Contact \"%s\" removed subscription from you"
+msgid "Contact '%s' removed subscription from you"
 msgstr "Contact \"%s\" removed subscription from you"
 
-#: gajim/gui_interface.py:432
+#: gajim/gui_interface.py:417
 #, fuzzy
 msgid ""
-"You will always see them as offline.\n"
+"You will always see this contact as offline.\n"
 "Do you want to remove them from your contact list?"
 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:453 gajim/gtk/notification.py:176
+#: gajim/gui_interface.py:442 gajim/gtk/notification.py:176
 msgid "Unsubscribed"
 msgstr "Leiratkozva"
 
-#: gajim/gui_interface.py:465
+#: gajim/gui_interface.py:454
 #, python-format
 msgid "%(jid)s declined the invitation: %(reason)s"
 msgstr ""
 
-#: gajim/gui_interface.py:469
+#: gajim/gui_interface.py:458
 #, python-format
 msgid "%(jid)s declined the invitation"
 msgstr ""
 
-#: gajim/gui_interface.py:485
+#: gajim/gui_interface.py:474
 #, 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:506
+#: gajim/gui_interface.py:495
 #, fuzzy
 msgid "Certificate Passphrase Required"
 msgstr "A tanusítvány lejárt"
 
-#: gajim/gui_interface.py:507
+#: gajim/gui_interface.py:496
 #, 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:516 gajim/gtk/accounts.py:963
+#: gajim/gui_interface.py:505 gajim/gtk/accounts.py:966
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Írd be a jelszavad a következő fiókhoz: %s"
 
-#: gajim/gui_interface.py:529 gajim/gtk/accounts.py:964
+#: gajim/gui_interface.py:518
+msgid "Password Required"
+msgstr "Jelszó szükséges"
+
+#: gajim/gui_interface.py:518 gajim/gtk/accounts.py:967
 msgid "Save password"
 msgstr "Jelszó megjegyzése"
 
-#: gajim/gui_interface.py:601 gajim/gui_interface.py:632
+#: gajim/gui_interface.py:587 gajim/gui_interface.py:618
+#: gajim/gtk/filetransfer.py:332 gajim/gtk/filetransfer.py:333
 #: gajim/gtk/notification.py:173 gajim/gtk/notification.py:276
 msgid "File Transfer Error"
 msgstr "Fileátvitel hiba"
 
-#: gajim/gui_interface.py:666
+#: gajim/gui_interface.py:652
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s egy filet szeretne küldeni neked."
 
-#: gajim/gui_interface.py:668 gajim/gtk/filetransfer.py:479
+#: gajim/gui_interface.py:654 gajim/gtk/filetransfer.py:484
 #: gajim/gtk/notification.py:172 gajim/gtk/notification.py:274
 msgid "File Transfer Request"
 msgstr "Fileátviteli kérelem"
 
-#: gajim/gui_interface.py:767
+#: gajim/gui_interface.py:753
 #, fuzzy
 msgid "Remote Contact Stopped Transfer"
 msgstr "A partner megállította a fileátvitelt"
 
-#: gajim/gui_interface.py:772
+#: gajim/gui_interface.py:758
 #, fuzzy
 msgid "Error Opening File"
 msgstr "Hiba a file megnyitása közben"
 
-#: gajim/gui_interface.py:782
+#: gajim/gui_interface.py:768
 #, fuzzy
 msgid "SSL Certificate Error"
 msgstr "SSL tanusítvány hiba"
 
-#: gajim/gui_interface.py:795 gajim/gui_interface.py:826
-#: gajim/gui_interface.py:853 gajim/gtk/notification.py:174
+#: gajim/gui_interface.py:781 gajim/gui_interface.py:812
+#: gajim/gui_interface.py:839 gajim/gtk/notification.py:174
 #: gajim/gtk/notification.py:279
 msgid "File Transfer Stopped"
 msgstr "Fileátvitel megállítva"
 
-#: gajim/gui_interface.py:799
+#: gajim/gui_interface.py:785
 #, fuzzy
 msgid "File Transfer Failed"
 msgstr "Fileküldés Befejezve"
 
-#: gajim/gui_interface.py:822
+#: gajim/gui_interface.py:808
 #, fuzzy, python-format
 msgid "%(filename)s received from %(name)s."
 msgstr "File transfer of %(filename)s from %(name)s stopped."
 
-#: gajim/gui_interface.py:827
+#: gajim/gui_interface.py:813
 #, 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:833
+#: gajim/gui_interface.py:819
 #, 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:848
+#: gajim/gui_interface.py:834
 #, 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:854
+#: gajim/gui_interface.py:840
 #, 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:860
+#: gajim/gui_interface.py:846
 #, 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:971
+#: gajim/gui_interface.py:957
 msgid "Username Conflict"
 msgstr "felhasználónév összeférhetetlenség"
 
-#: gajim/gui_interface.py:972
+#: gajim/gui_interface.py:958
 msgid "Please type 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:995
+#: gajim/gui_interface.py:981
 msgid "Resource Conflict"
 msgstr "Erőforrás összeférhetetlenség"
 
-#: gajim/gui_interface.py:996
+#: gajim/gui_interface.py:982
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
@@ -2163,30 +2135,30 @@ msgstr ""
 "Már csatlakozva vagy ehhez a fiókhoz ugyanazzal az erőforrással. Kérlek írj "
 "be egy másikat"
 
-#: gajim/gui_interface.py:1053
+#: gajim/gui_interface.py:1039
 #, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s szeretne élőszóban beszélni veled."
 
-#: gajim/gui_interface.py:1055
+#: gajim/gui_interface.py:1041
 msgid "Voice Chat Request"
 msgstr "Élőszavas beszélgetés kérelem"
 
-#: gajim/gui_interface.py:1123 gajim/gtk/account_wizard.py:312
+#: gajim/gui_interface.py:1109 gajim/gtk/account_wizard.py:312
 msgid "Certificate Already in File"
 msgstr "Tanusítvány már a fileban van"
 
-#: gajim/gui_interface.py:1124 gajim/gtk/account_wizard.py:313
+#: gajim/gui_interface.py:1110 gajim/gtk/account_wizard.py:313
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr "Ez a tanusítvány már a %s fileban van, ezért nem lett ismét hozzáadva."
 
-#: gajim/gui_interface.py:1145
+#: gajim/gui_interface.py:1131
 #, fuzzy, python-format
 msgid "The authenticity of the %s certificate could be invalid"
 msgstr "The authenticity of the %s certificate could be invalid."
 
-#: gajim/gui_interface.py:1148
+#: gajim/gui_interface.py:1134
 #, python-format
 msgid ""
 "\n"
@@ -2195,7 +2167,7 @@ msgstr ""
 "\n"
 "Ismeretlen SSL hiba: %d"
 
-#: gajim/gui_interface.py:1150
+#: gajim/gui_interface.py:1136
 #, python-format
 msgid ""
 "\n"
@@ -2204,11 +2176,11 @@ msgstr ""
 "\n"
 "SSL hiba: <b>%s</b>"
 
-#: gajim/gui_interface.py:1155
+#: gajim/gui_interface.py:1141
 msgid "Error verifying SSL certificate"
 msgstr "Hiba az SSL tanusítvány ellenőrzése közben"
 
-#: gajim/gui_interface.py:1156
+#: gajim/gui_interface.py:1142
 #, fuzzy, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your XMPP server: "
@@ -2219,7 +2191,7 @@ msgstr ""
 "%(error)s\n"
 "Do you still want to connect to this server?"
 
-#: gajim/gui_interface.py:1160 gajim/gtk/account_wizard.py:412
+#: gajim/gui_interface.py:1146 gajim/gtk/account_wizard.py:413
 #, fuzzy, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -2232,190 +2204,181 @@ msgstr ""
 "A tanusítvány SHA1 ujjlenyomata:\n"
 "%s"
 
-#: gajim/gui_interface.py:1166
+#: gajim/gui_interface.py:1152
 msgid "Ignore this error for this certificate."
 msgstr "Mellőzd ezt a hibát ehhez a tanusítványhoz."
 
-#: gajim/gui_interface.py:1174
+#: gajim/gui_interface.py:1160
 #, fuzzy, python-format
 msgid "SSL Certificate Verification for %s"
 msgstr "SSL tanusítvány hiba"
 
-#: gajim/gui_interface.py:1442 gajim/gtk/join_groupchat.py:235
-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/gui_interface.py:1448
-#, fuzzy
-msgid "JID is not a Groupchat"
-msgstr "Ez nem egy közös társalgás"
-
-#: gajim/gui_interface.py:1579
-msgid "This is not a group chat"
-msgstr "Ez nem egy közös társalgás"
-
-#: gajim/gui_interface.py:1580
-#, python-format
-msgid ""
-"%(room_jid)s is already in your roster. Please check if %(room_jid)s is a "
-"correct group chat name. If it is, delete it from your roster and try "
-"joining the group chat again."
-msgstr ""
-
-#: gajim/gui_interface.py:1604 gajim/dialog_messages.py:58
+#: gajim/gui_interface.py:1577
 msgid "You cannot join a group chat while you are invisible"
 msgstr "Amíg láthatatlan vagy nem csatlakozhatsz közös beszélgetéshez"
 
-#: gajim/gui_interface.py:2037
+#: gajim/gui_interface.py:1976
 msgid "Could not save your settings and preferences"
 msgstr "Nem lehet elmenteni a beállításaid."
 
-#: gajim/gui_interface.py:2098
+#: gajim/gui_interface.py:2037
 msgid "Gajim: IPython Console"
 msgstr ""
 
-#: gajim/dialog_messages.py:32
+#: gajim/dialog_messages.py:31 gajim/dialog_messages.py:36
+#: gajim/gtk/single_message.py:305 gajim/gtk/account_wizard.py:229
 #, fuzzy
-msgid "You can not start a new conversation unless you are connected."
-msgstr "Addig nem léphetsz be közös társalgásba amíg csatlakozva vagy."
-
-#: gajim/dialog_messages.py:36 gajim/dialog_messages.py:41
-#: gajim/gtk/single_message.py:305 gajim/gtk/join_groupchat.py:211
-#: gajim/gtk/account_wizard.py:229
-msgid "Invalid JID"
-msgstr "Érvénytelen Jabber Azonosító"
+msgid "Invalid XMPP Address"
+msgstr "Érvénytelen file"
 
-#: gajim/dialog_messages.py:42 gajim/gtk/single_message.py:306
-#, python-format
-msgid "It is not possible to send a message to %s, this JID is not valid."
+#: gajim/dialog_messages.py:37
+#, 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/dialog_messages.py:47
-msgid "Unread events"
+#: gajim/dialog_messages.py:42
+#, fuzzy
+msgid "Unread Events"
 msgstr "Olvasatlan események"
 
-#: gajim/dialog_messages.py:48
-msgid "Read all pending events before removing this account."
+#: gajim/dialog_messages.py:43
+#, fuzzy
+msgid "Read or acknowledge all pending events before removing this account."
 msgstr "Összes függő esemény elolvasása mielőtt a fiók törlésre kerül."
 
-#: gajim/dialog_messages.py:52
+#: gajim/dialog_messages.py:48
 #, fuzzy
 msgid "Invalid Form"
 msgstr "Érvénytelen szoba"
 
-#: gajim/dialog_messages.py:53
+#: gajim/dialog_messages.py:49
 #, fuzzy
 msgid "The form is not filled correctly."
 msgstr "A becenévben nem megengedett karakterek vannak."
 
-#: gajim/dialog_messages.py:57 gajim/common/helpers.py:309
+#: gajim/dialog_messages.py:53 gajim/common/helpers.py:315
 msgid "Invisible"
 msgstr "Láthatatlan"
 
-#: gajim/dialog_messages.py:62
-msgid "A connection is not available"
-msgstr "Egy kapcsolat nem elérhető"
+#: gajim/dialog_messages.py:54
+#, fuzzy
+msgid "You cannot join a group chat while being invisible."
+msgstr "Amíg láthatatlan vagy nem csatlakozhatsz közös beszélgetéshez"
 
-#: gajim/dialog_messages.py:63
+#: gajim/dialog_messages.py:58
+#, fuzzy
+msgid "No Connection Available"
+msgstr "Kapcsolat nem elérhető"
+
+#: gajim/dialog_messages.py:59
 msgid "Your message can not be sent until you are connected."
 msgstr "Az üzenet addig nem küldhető el, amíg nem csatlakozol."
 
-#: gajim/dialog_messages.py:67
-#, fuzzy
-msgid "JID already in list"
-msgstr "Ez a Jabber Azonosító már a listán van"
+#: gajim/dialog_messages.py:63
+msgid "XMPP Address Already in List"
+msgstr ""
 
-#: gajim/dialog_messages.py:68
+#: gajim/dialog_messages.py:64
 #, fuzzy
-msgid "The JID you entered is already in the list. Choose another one."
+msgid ""
+"The XMPP Address you entered is already in the list. Please choose another "
+"one."
 msgstr ""
 "A Jabber Azonosító amit beírt már szerepel a listán. Válasszon egy másikat."
 
-#: gajim/dialog_messages.py:72
-msgid "Invalid answer"
+#: gajim/dialog_messages.py:69
+#, fuzzy
+msgid "Invalid Answer"
 msgstr "Érvénytelen válasz"
 
-#: gajim/dialog_messages.py:73
+#: gajim/dialog_messages.py:70
 #, python-format
 msgid "Transport %(name)s answered wrongly to register request: %(error)s"
 msgstr ""
 "Transzport %(name)s rosszul lettek megválaszolva a kérés regisztrálásához: "
 "%(error)s"
 
-#: gajim/dialog_messages.py:78
+#: gajim/dialog_messages.py:75
 #, fuzzy
 msgid "Wrong Custom Hostname"
 msgstr "Egyéni hostnév/port használata"
 
-#: gajim/dialog_messages.py:79
+#: gajim/dialog_messages.py:76
 #, fuzzy, python-format
-msgid "Wrong custom hostname \"%s\". Ignoring it."
+msgid "Custom hostname \"%s\" is wrong. It will be ignored."
 msgstr "Egyéni hostnév/port használata"
 
-#: gajim/dialog_messages.py:83
-msgid "Error while removing privacy list"
+#: gajim/dialog_messages.py:80
+#, fuzzy
+msgid "Error While Removing Privacy List"
 msgstr "Hiba a magánéleti lista eltávolításakor"
 
-#: gajim/dialog_messages.py:84
-#, python-format
+#: gajim/dialog_messages.py:81
+#, fuzzy, python-format
 msgid ""
-"Privacy list %s has not been removed. It is maybe active in one of your "
-"connected resources. Deactivate it and try again."
+"Privacy list %s has not been removed. It is probably active in one of your "
+"connected resources. Please deactivate it and try again."
 msgstr ""
 "Privacy list %s has not been removed. It is maybe active in one of your "
 "connected resources. Deactivate it and try again."
 
-#: gajim/dialog_messages.py:90
-msgid "Invisibility not supported"
+#: gajim/dialog_messages.py:87
+#, fuzzy
+msgid "Invisibility Not Supported"
 msgstr "A láthatatlanság nem támogatott"
 
-#: gajim/dialog_messages.py:91
+#: gajim/dialog_messages.py:88
 #, fuzzy, python-format
-msgid "Account %s doesn't support invisibility."
+msgid "This account %s doesn't support invisibility."
 msgstr "Account %s doesn't support invisibility."
 
-#: gajim/dialog_messages.py:95
-msgid "Unregister failed"
+#: gajim/dialog_messages.py:92
+#, fuzzy
+msgid "Unregister Failed"
 msgstr "Regisztráció megszűntetése nem sikerült"
 
-#: gajim/dialog_messages.py:96
-#, python-format
-msgid "Unregistration with server %(server)s failed: %(error)s"
+#: gajim/dialog_messages.py:93
+#, fuzzy, python-format
+msgid "Unregistration on server %(server)s failed: %(error)s"
 msgstr ""
 "A szerverrel való regisztráció megszűntetése %(server)s nem sikerült: "
 "%(error)s"
 
-#: gajim/dialog_messages.py:100
-msgid "Registration succeeded"
+#: gajim/dialog_messages.py:97
+#, fuzzy
+msgid "Registration Succeeded"
 msgstr "Regisztráció sikeres"
 
-#: gajim/dialog_messages.py:101
-#, python-format
-msgid "Registration with agent %s succeeded"
+#: gajim/dialog_messages.py:98
+#, fuzzy, python-format
+msgid "Registration with agent %s succeeded."
 msgstr "Registration with agent %s succeeded"
 
-#: gajim/dialog_messages.py:105 gajim/gtk/service_registration.py:215
-msgid "Registration failed"
+#: gajim/dialog_messages.py:102
+#, fuzzy
+msgid "Registration Failed"
 msgstr "Regisztráció nem sikerült"
 
-#: gajim/dialog_messages.py:106
+#: gajim/dialog_messages.py:103
 #, python-format
 msgid ""
 "Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
 msgstr ""
 "Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
 
-#: gajim/dialog_messages.py:111
+#: gajim/dialog_messages.py:108
 #, fuzzy
 msgid "Unable to Join Group Chat"
 msgstr "Nem sikerült csatlakozni közös beszélgetéshez"
 
-#: gajim/dialog_messages.py:116
-msgid "GStreamer error"
+#: gajim/dialog_messages.py:113
+#, fuzzy
+msgid "GStreamer Error"
 msgstr "GStreamer hiba"
 
-#: gajim/dialog_messages.py:117
+#: gajim/dialog_messages.py:114
 #, fuzzy, python-format
 msgid ""
 "Error: %(error)s\n"
@@ -2424,20 +2387,21 @@ msgstr ""
 "Hiba: %s\n"
 "Hibajavítás: %s"
 
-#: gajim/dialog_messages.py:121
+#: gajim/dialog_messages.py:118
 #, fuzzy
-msgid "Wrong host"
+msgid "Wrong Host"
 msgstr "Rossz URI"
 
-#: gajim/dialog_messages.py:122
+#: gajim/dialog_messages.py:119
 msgid "Invalid local address? :-O"
 msgstr ""
 
-#: gajim/dialog_messages.py:126
-msgid "Avahi error"
+#: gajim/dialog_messages.py:123
+#, fuzzy
+msgid "Avahi Error"
 msgstr "Avahi hiba"
 
-#: gajim/dialog_messages.py:127
+#: gajim/dialog_messages.py:124
 #, python-format
 msgid ""
 "%s\n"
@@ -2446,66 +2410,66 @@ msgstr ""
 "%s\n"
 "Link-helyi üzenetküldés valószínűleg nem jól működik."
 
-#: gajim/dialog_messages.py:131 gajim/dialog_messages.py:136
+#: gajim/dialog_messages.py:128 gajim/dialog_messages.py:133
 #, fuzzy
-msgid "Could not request upload slot"
+msgid "Could not request upload slot for HTTP File Upload"
 msgstr "Nem lehet elindítani a helyi szolgáltatást"
 
-#: gajim/dialog_messages.py:137
-msgid "Got unexpected response from server (see log)"
+#: gajim/dialog_messages.py:134
+msgid "Got unexpected response from server (see log)."
 msgstr ""
 
-#: gajim/dialog_messages.py:141 gajim/dialog_messages.py:146
+#: gajim/dialog_messages.py:138 gajim/dialog_messages.py:143
 #, fuzzy
-msgid "Could not open file"
+msgid "Could not Open File"
 msgstr "Nem lehet a képet betölteni"
 
-#: gajim/dialog_messages.py:142
-msgid "Exception raised while opening file (see log)"
+#: gajim/dialog_messages.py:139
+msgid "Exception raised while trying to open file (see log)."
 msgstr ""
 
-#: gajim/dialog_messages.py:151
-msgid "Unsecure"
-msgstr ""
+#: gajim/dialog_messages.py:148
+#, fuzzy
+msgid "Not Secure"
+msgstr "Nincs elkezdve"
 
-#: gajim/dialog_messages.py:152
+#: gajim/dialog_messages.py:149
 #, fuzzy
-msgid "Server returned unsecure transport (HTTP)"
+msgid "The server returned an insecure transport (HTTP)."
 msgstr "A szolgáltatás hibát jelzett."
 
-#: gajim/dialog_messages.py:156
+#: gajim/dialog_messages.py:153
 #, fuzzy
-msgid "Could not upload file"
+msgid "Could not Upload File"
 msgstr "Nem lehet a képet betölteni"
 
-#: gajim/dialog_messages.py:157
+#: gajim/dialog_messages.py:154
 #, python-format
 msgid "HTTP response code from server: %s"
 msgstr ""
 
-#: gajim/dialog_messages.py:161
+#: gajim/dialog_messages.py:158
 msgid "Upload Error"
 msgstr ""
 
-#: gajim/dialog_messages.py:166
+#: gajim/dialog_messages.py:163
 msgid "Encryption Error"
 msgstr ""
 
-#: gajim/dialog_messages.py:167
-#, fuzzy
-msgid "For the chosen encryption there is no encryption method available"
-msgstr "Egy kapcsolat nem elérhető"
+#: gajim/dialog_messages.py:164
+msgid "There is no encryption method available for the chosen encryption."
+msgstr ""
 
-#: gajim/dialog_messages.py:171
+#: gajim/dialog_messages.py:169
 #, fuzzy
-msgid "Avatar upload failed"
+msgid "Avatar Upload Failed"
 msgstr "vCard közzététel nem sikerült"
 
-#: gajim/privatechat_control.py:204
+#: gajim/privatechat_control.py:207
 msgid "Sending private message failed"
 msgstr "Nem sikerült elküldeni a privát üzenetet"
 
-#: gajim/privatechat_control.py:206
+#: gajim/privatechat_control.py:209
 #, 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."
@@ -2528,7 +2492,7 @@ msgstr "mutass súgót az egyes parancsoknál"
 
 #: gajim/gajim_remote.py:85
 #, fuzzy
-msgid "Lists all contacts in roster, one for each line"
+msgid "Lists all contacts in the contact list, one for each line"
 msgstr ""
 "Kiír egy listát az összes névsoron lévő partnerről. Minden partner külön "
 "sorba kerül"
@@ -2614,11 +2578,13 @@ msgstr ""
 
 #: gajim/gajim_remote.py:118
 #, fuzzy
-msgid "Sends new chat message to a contact in the roster. Account is optional."
+msgid ""
+"Sends new chat message to a contact in the contact list. Account is optional."
 msgstr "Filet küld egy partnernek"
 
 #: gajim/gajim_remote.py:120 gajim/gajim_remote.py:130
-msgid "JID of the contact that will receive the message"
+#, fuzzy
+msgid "XMPP Address of the contact that will receive the message"
 msgstr "Annak a partnernek a Jabber Azonosítója aki az üzenetet kapni fogja"
 
 #: gajim/gajim_remote.py:121 gajim/gajim_remote.py:132
@@ -2632,8 +2598,10 @@ msgid "if specified, the message will be sent using this account"
 msgstr "ha be van állítva, az üzenet ezzel a fiókkal lesz elküldve"
 
 #: gajim/gajim_remote.py:127
-msgid "Sends a chat message to someone on your roster. Account is optional."
-msgstr ""
+#, fuzzy
+msgid ""
+"Sends a chat message to someone on your contact list. Account is optional."
+msgstr "Filet küld egy partnernek"
 
 #: gajim/gajim_remote.py:131
 msgid "subject"
@@ -2644,11 +2612,13 @@ msgid "message subject"
 msgstr "üzenet tárgya"
 
 #: gajim/gajim_remote.py:138
-msgid "Sends new message to a groupchat you've joined."
+#, fuzzy
+msgid "Sends new message to a group chat you've joined."
 msgstr "Új üzenetet küld egy olyan közös beszélgetésbe amelyhez csatlakoztál."
 
 #: gajim/gajim_remote.py:140
-msgid "JID of the room that will receive the message"
+#, fuzzy
+msgid "XMPP Address of the group chat that will receive the message"
 msgstr "A Jabber Azonosítója annak a szobának ami meg fogja kapni az üzenetet"
 
 #: gajim/gajim_remote.py:147
@@ -2657,7 +2627,8 @@ msgstr "Részletes információkat kér le a partnerről"
 
 #: gajim/gajim_remote.py:149 gajim/gajim_remote.py:162
 #: gajim/gajim_remote.py:192
-msgid "JID of the contact"
+#, fuzzy
+msgid "XMPP Address of the contact"
 msgstr "Partner Jabber Azonosítója"
 
 #: gajim/gajim_remote.py:153
@@ -2719,7 +2690,8 @@ msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Kiírja a Gajim beállításainak jelenlegi állapotát egy .config fileba"
 
 #: gajim/gajim_remote.py:190
-msgid "Removes contact from roster"
+#, fuzzy
+msgid "Removes contact from contact list"
 msgstr "Eltávolítja a partnert a névsorról"
 
 #: gajim/gajim_remote.py:193
@@ -2771,7 +2743,7 @@ msgstr "Hiányzó argumentum \"contact_jid\""
 #: gajim/gajim_remote.py:275
 #, fuzzy, python-format
 msgid ""
-"'%s' is not in your roster.\n"
+"'%s' is not in your contact list.\n"
 "Please specify account for sending the message."
 msgstr ""
 "'%s' is not in your roster.\n"
@@ -2994,12 +2966,12 @@ msgstr "A hét vége"
 msgid "Weekend!"
 msgstr "Hétvége!"
 
-#: gajim/common/logger.py:192 gajim/common/logger.py:197
+#: gajim/common/logger.py:189 gajim/common/logger.py:194
 #, 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:217
+#: gajim/common/logger.py:214
 #, fuzzy, python-format
 msgid "Creating %s"
 msgstr "%s törlése"
@@ -3073,22 +3045,21 @@ msgstr "%(nickname)s kijelentkezett"
 msgid "Contact Signed Out"
 msgstr "Partner kijelentkezett"
 
-#: gajim/common/contacts.py:455
-msgid "Not in roster"
-msgstr "Nincs a névsoron"
-
 #: gajim/common/config.py:80
+#, fuzzy
 msgid ""
 "Show desktop notification even when a chat window is opened for this contact "
-"and does not have focus"
-msgstr ""
+"and does not have focus."
+msgstr "Allow pop-up/notifications when I'm _away/na/busy/invisible"
 
 #: gajim/common/config.py:81
-msgid "Play sound when user is busy"
+#, fuzzy
+msgid "Play sound even when being busy."
 msgstr "Hang lejátszása ha a felhasználó elfoglalt"
 
 #: gajim/common/config.py:83
-msgid "Show only online and free for chat contacts in roster."
+#, fuzzy
+msgid "Show only online and free for chat contacts in the contact list."
 msgstr ""
 "Csak az \"Elérhető\" illetve \"ráér beszélgetni\" partnereket mutasd a "
 "névsoron."
@@ -3098,12 +3069,15 @@ msgid "Time in minutes, after which your status changes to away."
 msgstr "Idő percben, miután az állapotod távolra változik."
 
 #: gajim/common/config.py:87
-msgid "$S (Away as a result of being idle more than $T min)"
+#, fuzzy
+msgid "$S (Away: Idle more than $T min)"
 msgstr "$S (Állapota: Távol, mert több mint $T percig tétlen volt)"
 
 #: gajim/common/config.py:87
 #, fuzzy
-msgid "$S will be replaced by current status message, $T by autoawaytime."
+msgid ""
+"$S will be replaced by current status message, $T by the 'autoawaytime' "
+"value."
 msgstr ""
 "$S fel lesz cserélve a jelenlegi állapotüzenetedre, amit ez az idő eltelik: "
 "$T."
@@ -3113,12 +3087,14 @@ msgid "Time in minutes, after which your status changes to not available."
 msgstr "Idő percben, miután az állapotod nem elérhetőre változik."
 
 #: gajim/common/config.py:90
-msgid "$S (Not available as a result of being idle more than $T min)"
+#, fuzzy
+msgid "$S (Not available: Idle more than $T min)"
 msgstr "$S (Állapota: Nem elérhető, mert több mint $T percig tétlen volt)"
 
 #: gajim/common/config.py:90
 #, fuzzy
-msgid "$S will be replaced by current status message, $T by autoxatime."
+msgid ""
+"$S will be replaced by current status message, $T by the 'autoxatime' value."
 msgstr ""
 "$S fel lesz cserélve a jelenlegi állapotüzeneteddel, amint ez az idő "
 "eltelik: $T."
@@ -3126,59 +3102,62 @@ msgstr ""
 #: gajim/common/config.py:93
 #, fuzzy
 msgid ""
-"When to show notification area icon. Can be 'never', 'on_event', 'always'."
+"When to show the notification area icon. Can be 'never', 'on_event', and "
+"'always'."
 msgstr "When to show systray icon. Can be 'never', 'on_event', 'always'."
 
 #: gajim/common/config.py:94
-msgid "Allow to hide the roster window even if the tray icon is not shown."
+msgid ""
+"Allow to hide the contact list window even if the notification area icon is "
+"not shown."
 msgstr ""
 
 #: gajim/common/config.py:97
-msgid "Contact signed in notification color."
-msgstr ""
+#, fuzzy
+msgid "Notification color for contacts signing in."
+msgstr "Notify me about contacts that sign _in"
 
 #: gajim/common/config.py:98
-msgid "Contact signout notification color"
-msgstr ""
+#, fuzzy
+msgid "Notification color for contacts signing out."
+msgstr "Notify me about contacts that sign _out"
 
 #: gajim/common/config.py:99
 #, fuzzy
-msgid "New message notification color."
+msgid "Notification color for new message notification."
 msgstr "Preview new messages in notification popup?"
 
 #: gajim/common/config.py:100
 #, fuzzy
-msgid "File transfer request notification color."
-msgstr "Fileküldési Kérelem "
+msgid "Notification color for file transfer request."
+msgstr "_Notify me when a file transfer is complete"
 
 #: gajim/common/config.py:101
 #, fuzzy
-msgid "File transfer error notification color."
-msgstr "Fileátvitel megszakítva"
+msgid "Notification color for file transfer errors."
+msgstr "_Notify me when a file transfer is complete"
 
 #: gajim/common/config.py:102
-#, fuzzy
-msgid "File transfer complete or stopped notification color."
-msgstr "Show a pop-up notification when a file transfer is complete "
+msgid "Notification color for stopped or completed file transfers."
+msgstr ""
 
 #: gajim/common/config.py:103
-#, fuzzy
-msgid "Groupchat invitation notification color"
-msgstr "Meghívó közös társalgásba"
+msgid "Notification color for group chat invitations."
+msgstr ""
 
 #: gajim/common/config.py:104
 #, fuzzy
-msgid "Background color of status changed notification"
+msgid "Notification background color for changed status."
 msgstr "Background colour of contacts when they just signed in."
 
 #: gajim/common/config.py:105
-msgid "Other dialogs color."
+msgid "Notification color for other dialogs."
 msgstr ""
 
 #: gajim/common/config.py:106
 #, fuzzy
 msgid ""
-"List (space separated) of rows (accounts and groups) that are collapsed."
+"List of rows (accounts and groups) that are collapsed (space separated)."
 msgstr ""
 "List (space separated) of rows (accounts and groups) that are collapsed."
 
@@ -3186,8 +3165,10 @@ msgstr ""
 msgid "default"
 msgstr "alapértelmezett"
 
-#: gajim/common/config.py:113
-msgid "Language used by speller"
+#: gajim/common/config.py:113 gajim/common/config.py:424
+#: gajim/common/config.py:431
+#, fuzzy
+msgid "Language used for spell checking."
 msgstr "Beszélő által használt nyelv"
 
 #: gajim/common/config.py:114
@@ -3204,8 +3185,8 @@ msgstr ""
 #, fuzzy
 msgid ""
 "Print time in chats using Fuzzy Clock. Value of fuzziness from 1 to 4, or 0 "
-"to disable fuzzyclock. 1 is the most precise clock, 4 the least precise one. "
-"This is used only if print_time is 'sometimes'."
+"to disable Fuzzy Clock. 1 is the most precise clock, 4 the least precise "
+"one. This is used only if 'print_time' is 'sometimes'."
 msgstr ""
 "Print time in chats using Fuzzy Clock. Value of fuzziness from 1 to 4, or 0 "
 "to disable fuzzyclock. 1 is the most precise clock, 4 the least precise one. "
@@ -3223,16 +3204,17 @@ msgstr "Treat * / _ pairs as possible formatting characters."
 #: gajim/common/config.py:120
 #, fuzzy
 msgid ""
-"If true, do not remove */_ . So *abc* will be bold but with * * not removed."
+"If enabled, do not remove */_ . So *abc* will be bold but with * * not "
+"removed."
 msgstr ""
 "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
 
 #: gajim/common/config.py:123
 #, fuzzy
 msgid ""
-"Uses ReStructured text markup to send HTML, plus ascii formatting if "
-"selected. For syntax, see http://docutils.sourceforge.net/docs/ref/rst/"
-"restructuredtext.html (If you want to use this, install docutils)"
+"Uses ReStructured text markup to send HTML, plus ASCII formatting if "
+"selected. Needs docutils installed (for syntax, see http://docutils."
+"sourceforge.net/docs/ref/rst/restructuredtext.html)."
 msgstr ""
 "Uses ReStructured text markup to send HTML, plus ascii formatting if "
 "selected. For syntax, see http://docutils.sourceforge.net/docs/ref/rst/"
@@ -3241,8 +3223,8 @@ msgstr ""
 #: gajim/common/config.py:132
 #, fuzzy
 msgid ""
-"Character to add after nickname when using nick completion (tab) in group "
-"chat."
+"Character to add after nickname when using nickname completion (tab) in "
+"group chat."
 msgstr ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
@@ -3250,28 +3232,29 @@ msgstr ""
 #: gajim/common/config.py:133
 #, fuzzy
 msgid ""
-"Character to propose to add after desired nickname when desired nickname is "
-"used by someone else in group chat."
+"Character to propose to add after desired nickname when nickname is already "
+"used in group chat."
 msgstr ""
 "Character to propose to add after desired nickname when desired nickname is "
 "used by someone else in group chat."
 
 #: gajim/common/config.py:155
 msgid ""
-"If true, Gajim will save roster position when hiding roster, and restore it "
-"when showing roster."
+"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:161
-msgid "Place the roster on the right in single window mode"
+msgid "Place the contact list on the right in single window mode"
 msgstr ""
 
 #: gajim/common/config.py:167
 #, fuzzy
 msgid ""
-"This option let you customize timestamp that is printed in conversation. For "
-"example \"[%H:%M] \" will show \"[hour:minute] \". See python doc on "
-"strftime for full documentation: http://docs.python.org/lib/module-time.html"
+"This option lets you customize the timestamp that is printed in "
+"conversation. For example '[%H:%M] ' will show '[hour:minute] '. See python "
+"doc on strftime for full documentation (https://docs.python.org/3/library/"
+"time.html)."
 msgstr ""
 "This option let you customize timestamp that is printed in conversation. For "
 "exemple \"[%H:%M] \" will show \"[hour:minute] \". See python doc on "
@@ -3279,277 +3262,269 @@ msgstr ""
 
 #: gajim/common/config.py:168
 #, fuzzy
-msgid "Characters that are printed before the nickname in conversations"
+msgid "Characters that are printed before the nickname in conversations."
 msgstr "Characters that are printed before the nickname in conversations"
 
 #: gajim/common/config.py:169
 #, fuzzy
-msgid "Characters that are printed after the nickname in conversations"
+msgid "Characters that are printed after the nickname in conversations."
 msgstr "Characters that are printed after the nickname in conversations"
 
 #: gajim/common/config.py:170
 #, fuzzy
-msgid "Add * and [n] in roster title?"
-msgstr "Add * and [n] in roster title?"
+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:171
 #, fuzzy
 msgid ""
-"How many history messages should be restored when a chat tab/window is "
-"reopened?"
+"Number of messages from chat history to be restored when a chat tab/window "
+"is reopened."
 msgstr ""
 "How many lines to remember from previous conversation when a chat tab/window "
 "is reopened."
 
 #: gajim/common/config.py:172
-msgid "How far back in time (minutes) history is restored. -1 means no limit."
+msgid ""
+"How far back in time (minutes) chat history is restored. -1 means no limit."
 msgstr ""
 
 #: gajim/common/config.py:173
 #, fuzzy
 msgid ""
-"How many lines to request from server when entering a groupchat. -1 means no "
-"limit"
-msgstr "How many lines to request to server when entering a groupchat."
-
-#: gajim/common/config.py:174
-#, fuzzy
-msgid ""
-"Minutes of backlog to request when entering a groupchat. -1 means no limit"
-msgstr "How many minutes back to request logs when a entering a groupchat."
-
-#: gajim/common/config.py:175
-#, fuzzy
-msgid ""
-"How many seconds to wait before trying to autorejoin to a conference you are "
-"being disconnected from. Set to 0 to disable autorejoining."
+"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 ""
 "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:176
-msgid "Should autorejoin be activated when kicked from a conference?"
+#: gajim/common/config.py:174
+msgid ""
+"Should automatic rejoin be activated when you were kicked from a group chat?"
 msgstr ""
 
-#: gajim/common/config.py:177
+#: gajim/common/config.py:175
 #, fuzzy
-msgid ""
-"Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
-"Client default behaviour)."
+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:179
+#: gajim/common/config.py:177
 #, fuzzy
-msgid "How many lines to store for Ctrl+KeyUP."
+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:182
+#: gajim/common/config.py:180
 #, fuzzy, python-format
 msgid ""
-"Either custom URL with %%s in it where %%s is the word/phrase or "
-"'WIKTIONARY' which means use Wikitionary."
+"Either a custom URL with %%s in it (where %%s is the word/phrase) or "
+"'WIKTIONARY' (which means use Wikitionary)."
 msgstr ""
 "Either custom URL with %s in it where %s is the word/phrase or 'WIKTIONARY' "
 "which means use wiktionary."
 
-#: gajim/common/config.py:185
+#: gajim/common/config.py:183
 #, 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:187
+#: gajim/common/config.py:185
 #, fuzzy
 msgid ""
-"When not printing time for every message (print_time==sometimes), print it "
+"When not printing time for every message ('print_time'==sometimes), print it "
 "every x minutes."
 msgstr ""
 "When not printing time for every message (print_time==sometimes), print it "
 "every x minutes."
 
-#: gajim/common/config.py:188
+#: gajim/common/config.py:186
 msgid "Ask before pasting an image."
 msgstr ""
 
-#: gajim/common/config.py:189
+#: gajim/common/config.py:187
 #, fuzzy
 msgid "Ask before closing a group chat tab/window."
 msgstr "Ask before closing a group chat tab/window."
 
-#: gajim/common/config.py:190
+#: gajim/common/config.py:188
 #, fuzzy
 msgid ""
-"Always ask for confirmation before closing groupchats with any of the JIDs "
-"on this space separated list."
+"Always ask for confirmation before closing group chats with any of the XMPP "
+"Addresses on this list (space separated)."
 msgstr ""
 "Always ask before closing group chat tab/window in this space separated list "
 "of group chat jids."
 
-#: gajim/common/config.py:191
+#: gajim/common/config.py:189
 #, fuzzy
 msgid ""
-"Never ask for confirmation before closing groupchats with any of the JIDs on "
-"this space separated list."
+"Never ask for confirmation before closing group chats with any of the XMPP "
+"Addresses on this list (space separated)."
 msgstr ""
 "Never ask before closing group chat tab/window in this space separated list "
 "of group chat jids."
 
-#: gajim/common/config.py:192
+#: gajim/common/config.py:190
 #, fuzzy
 msgid ""
-"Ask before closing tabbed chat window if there are controls that can lose "
-"data (chat, private chat, groupchat that will not be minimized)"
+"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 ""
 "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:195
+#: gajim/common/config.py:193
 #, fuzzy
 msgid ""
-"Comma separated list of sent hosts, in addition of local interfaces, for "
-"File Transfer in case of address translation/port forwarding."
+"List of send hosts (comma separated) in addition to local interfaces for "
+"file transfers (in case of address translation/port forwarding)."
 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:196
+#: gajim/common/config.py:194
 #, 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:198
+#: gajim/common/config.py:196
 #, fuzzy
 msgid "Notify of events in the notification area."
 msgstr "Notify of events in the system trayicon."
 
-#: gajim/common/config.py:199
+#: gajim/common/config.py:197
 msgid ""
-"If False, Gajim will display a static event icon instead of the blinking "
-"status icon in the notification area when notifying on event."
+"If disabled, Gajim will display a static event icon instead of the blinking "
+"status icon in the notification area when notifying about an event."
 msgstr ""
 
-#: gajim/common/config.py:205
+#: gajim/common/config.py:203
 #, fuzzy
 msgid "Show tab when only one conversation?"
 msgstr "Show tab when only one conversation?"
 
-#: gajim/common/config.py:206
+#: gajim/common/config.py:204
 #, fuzzy
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "Show tabbed notebook border in chat windows?"
 
-#: gajim/common/config.py:207
+#: gajim/common/config.py:205
 #, fuzzy
 msgid "Show close button in tab?"
 msgstr "Mutassa a bezárás gombot a füleken?"
 
-#: gajim/common/config.py:220
+#: gajim/common/config.py:218
 #, fuzzy
 msgid "Preview new messages in notification popup?"
 msgstr "Preview new messages in notification popup?"
 
-#: gajim/common/config.py:223
+#: gajim/common/config.py:221
 #, fuzzy
 msgid ""
-"A semicolon-separated list of words that will be highlighted in group chats."
+"A list of words (semicolon separated) that will be highlighted in group "
+"chats."
 msgstr ""
 "A semicolon-separated list of words that will be highlighted in group chats."
 
-#: gajim/common/config.py:224
+#: gajim/common/config.py:222
 #, fuzzy
 msgid ""
-"If true, quits Gajim when X button of Window Manager is clicked. This "
-"setting is taken into account only if notification icon is used."
+"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 ""
 "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:225
+#: gajim/common/config.py:223
 msgid ""
-"If true, Gajim hides the Roster window on pressing the X button instead of "
-"minimizing into the Dock."
+"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:226
+#: gajim/common/config.py:224
 #, fuzzy
 msgid ""
-"If true, Gajim will display an icon on each tab containing unread messages. "
-"Depending on the theme, this icon may be animated."
+"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:227
+#: gajim/common/config.py:225
 #, fuzzy
 msgid ""
-"If true, Gajim will display the status message, if not empty, for every "
-"contact under the contact name in roster window."
+"If enabled, Gajim will display the status message (if not empty) underneath "
+"the contact name in the contact list window."
 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:233
+#: gajim/common/config.py:231
 #, fuzzy
-msgid "Define the position of the avatar in roster. Can be left or right"
+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:234
+#: gajim/common/config.py:232
 #, fuzzy
 msgid ""
-"If False, Gajim will no longer print status line in chats when a contact "
-"changes their status and/or their status message."
+"If disabled, Gajim will no longer print status messages in chats when a "
+"contact changes their status (and/or their status message)."
 msgstr ""
 "If False, Gajim will no longer print status line in chats when a contact "
 "changes his or her status and/or status message."
 
-#: gajim/common/config.py:235
+#: gajim/common/config.py:233
 #, fuzzy
 msgid ""
 "Default Setting: Show a status message for every join or leave in a group "
-"chat"
+"chat."
 msgstr "Nem sikerült csatlakozni közös beszélgetéshez"
 
-#: gajim/common/config.py:236
+#: gajim/common/config.py:234
+#, fuzzy
 msgid ""
-"Default Setting: Show a status message for all status (away, dnd, etc.) "
-"changes of users in a group chat"
-msgstr ""
+"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:238
-msgid "Log XHTML messages instead of plain text messages."
+#: gajim/common/config.py:236
+msgid "Store XHTML messages in chat history instead of plain text messages."
 msgstr ""
 
-#: gajim/common/config.py:239
+#: gajim/common/config.py:237
 #, fuzzy
 msgid "Don't show avatar for the transport itself."
 msgstr "Don't show avatar for the transport itself."
 
-#: gajim/common/config.py:240
+#: gajim/common/config.py:238
 #, fuzzy
-msgid "Don't show roster in the system taskbar."
+msgid "Don't show contact list window in the system taskbar."
 msgstr "Don't show roster in the system taskbar."
 
-#: gajim/common/config.py:241
+#: gajim/common/config.py:239
 #, fuzzy
 msgid ""
-"If true, make the window flash (the default behaviour in most Window "
-"Managers) when holding pending events."
+"If enabled, Gajim makes the window flash (the default behaviour in most "
+"Window Managers) when holding pending events."
 msgstr ""
 "If True and installed GTK+ and PyGTK versions are at least 2.8, make the "
 "window flash (the default behaviour in most Window Managers) when holding "
 "pending events."
 
-#: gajim/common/config.py:245
+#: gajim/common/config.py:243
 #, fuzzy
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
 "'always_with_roster' - Like 'always' but the messages are in a single window "
-"along with the roster.\n"
+"along with the contact list.\n"
 "'never' - All messages get their own window.\n"
 "'peracct' - Messages for each account are sent to a specific window.\n"
-"'pertype' - Each message type (e.g. chats vs. groupchats) is sent to a "
+"'pertype' - Each message type (e.g. chats vs. group chats) is sent to a "
 "specific window."
 msgstr ""
 "Controls the window where new messages are placed.\n"
@@ -3561,128 +3536,131 @@ msgstr ""
 "'pertype' - Each message type (e.g., chats vs. groupchats) are sent to a "
 "specific window."
 
-#: gajim/common/config.py:246
+#: gajim/common/config.py:244
 msgid ""
-"Show roster on startup.\n"
-"'always' - Always show roster.\n"
-"'never' - Never show roster.\n"
-"'last_state' - Restore the last state roster."
+"Show contact list window on startup.\n"
+"'always' - Always show contact list window.\n"
+"'never' - Never show contact list window.\n"
+"'last_state' - Restore last state of the contact list window."
 msgstr ""
 
-#: gajim/common/config.py:247
+#: gajim/common/config.py:245
 #, fuzzy
-msgid "If False, you will no longer see the avatar in the chat window."
+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:248
+#: gajim/common/config.py:246
 #, fuzzy
-msgid "If true, pressing the escape key closes a tab/window."
+msgid "If enabled, pressing Esc closes a tab/window."
 msgstr "If True, pressing the escape key closes a tab/window."
 
-#: gajim/common/config.py:249
-msgid "Hides the banner in a group chat window"
+#: gajim/common/config.py:247
+#, 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:250
+#: gajim/common/config.py:248
 #, fuzzy
-msgid "Hides the banner in two persons chat window"
-msgstr "Hides the banner in two persons chat window"
+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:251
+#: gajim/common/config.py:249
 #, fuzzy
-msgid "Hides the group chat occupants list in group chat window."
+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:252
+#: gajim/common/config.py:250
 #, fuzzy
 msgid ""
 "In a chat, show the nickname at the beginning of a line only when it's not "
-"the same person talking than in previous message."
+"the same person talking as in the previous message."
 msgstr ""
 "In a chat, show the nickname at the beginning of a line only when it's not "
 "the same person talking than in previous message."
 
-#: gajim/common/config.py:253
+#: gajim/common/config.py:251
 #, fuzzy
 msgid "Indentation when using merge consecutive nickname."
 msgstr "Indentation when using merge consecutive nickname."
 
-#: gajim/common/config.py:254
+#: gajim/common/config.py:252
 #, fuzzy
-msgid "Ctrl-Tab go to next composing tab when none is unread."
+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:255
+#: gajim/common/config.py:253
 #, fuzzy
 msgid ""
-"Show the confirm metacontacts creation dialog or not? Empty string means "
-"never show the dialog."
+"Show a confirmation dialog to create metacontacts? Empty string means never "
+"show the dialog."
 msgstr ""
-"Should we show the confirm metacontacts creation dialogue or not? Empty "
-"string means we never show the dialogue."
+"Should we show the confirm block contact dialogue or not? Empty string means "
+"we never show the dialogue."
 
-#: gajim/common/config.py:256
+#: gajim/common/config.py:254
 #, fuzzy
 msgid ""
-"Show the confirm block contact dialog or not? Empty string means never show "
+"Show a confirmation dialog to block a contact? Empty string means never show "
 "the dialog."
 msgstr ""
 "Should we show the confirm block contact dialogue or not? Empty string means "
 "we never show the dialogue."
 
-#: gajim/common/config.py:257
+#: gajim/common/config.py:255
 #, fuzzy
 msgid ""
-"Show the confirm custom status dialog or not? Empty string means never show "
-"the dialog."
+"Show a confirmation dialog for a custom status? Empty string means never "
+"show the dialog."
 msgstr ""
 "Should we show the confirm custom status dialogue or not? Empty string means "
 "we never show the dialogue."
 
-#: gajim/common/config.py:258
+#: gajim/common/config.py:256
 #, fuzzy
 msgid ""
-"If true, you will be able to set a negative priority to your account in "
-"account modification window. BE CAREFUL, when you are logged in with a "
-"negative priority, you will NOT receive any message from your server."
+"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 ""
 "If True, you will be able to set a negative priority to your account in "
 "account modification window. BE CAREFUL, when you are logged in with a "
 "negative priority, you will NOT receive any message from your server."
 
-#: gajim/common/config.py:259
+#: gajim/common/config.py:257
 #, fuzzy
 msgid ""
-"If true, Gajim will show number of online and total contacts in account and "
-"group rows."
+"If enabled, Gajim will show both the number of online and total contacts in "
+"account rows as well as in group rows."
 msgstr ""
 "If True, Gajim will show number of online and total contacts in account and "
 "group rows."
 
-#: gajim/common/config.py:260
+#: gajim/common/config.py:258
 #, fuzzy
 msgid ""
-"Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
-"as if they were of this type"
+"Can be empty, 'chat' or 'normal'. If not empty, all incoming messages are "
+"treated as if they were of this type."
 msgstr ""
 "Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
 "as if they were of this type"
 
-#: gajim/common/config.py:261
+#: gajim/common/config.py:259
 #, fuzzy
 msgid ""
-"If true, Gajim will scroll and select the contact who sent you the last "
-"message, if chat window is not already opened."
+"If enabled, Gajim will scroll and select the contact who sent you the last "
+"message, if the chat window is not already opened."
 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:262
+#: gajim/common/config.py:260
 #, 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:263
+#: gajim/common/config.py:261
 #, fuzzy
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
@@ -3691,152 +3669,167 @@ msgstr ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
 
-#: gajim/common/config.py:264
+#: gajim/common/config.py:262
 #, fuzzy
 msgid ""
-"If true, notification windows from notification-daemon will be attached to "
-"notification icon."
+"If enabled, notification windows from notification-daemon will be attached "
+"to the notification area icon."
 msgstr ""
 "If True, notification windows from notification-daemon will be attached to "
 "systray icon."
 
-#: gajim/common/config.py:265
+#: gajim/common/config.py:263
 #, fuzzy
 msgid "Choose interval between 2 checks of idleness."
 msgstr "Choose interval between 2 checks of idleness."
 
-#: gajim/common/config.py:266
+#: gajim/common/config.py:264
 #, fuzzy
 msgid ""
-"Valid uri schemes. Only schemes in this list will be accepted as \"real\" "
-"uri. (mailto and xmpp are handled separately)"
+"Valid URI schemes. Only schemes in this list will be accepted as 'real' URI "
+"(mailto and xmpp are handled separately)."
 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:267
+#: gajim/common/config.py:265
 #, fuzzy
-msgid "If true, completion in groupchats will be like a shell auto-completion"
+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:272
+#: gajim/common/config.py:270
 #, fuzzy
-msgid "Optionally fix jingle output video framerate. Example: 10/1 or 25/2"
+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:273
+#: gajim/common/config.py:271
 #, fuzzy
-msgid "Optionally resize jingle output video. Example: 320x240"
+msgid "Optionally resize Jingle output video. Example: 320x240."
 msgstr "Optionally resize jingle output video. Example: 320x240"
 
-#: gajim/common/config.py:274
-msgid "If true, You will also see your webcam"
+#: gajim/common/config.py:272
+msgid "If enabled, you will see your webcam's video stream as well."
 msgstr ""
 
-#: gajim/common/config.py:277
+#: gajim/common/config.py:275
 #, fuzzy
 msgid ""
-"If true, Gajim will try to use a STUN server when using Jingle. The one in "
-"\"stun_server\" option, or the one given by the XMPP server."
+"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 ""
 "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:278
+#: gajim/common/config.py:276
 #, fuzzy
 msgid "STUN server to use when using Jingle"
 msgstr "STUN server to use when using jingle"
 
-#: gajim/common/config.py:279
+#: gajim/common/config.py:277
 #, fuzzy
 msgid ""
-"If true, Gajim will show affiliation of groupchat occupants by adding a "
-"colored square to the status icon"
+"If enabled, Gajim will show affiliation of group chat participants by adding "
+"a colored square to the status icon."
 msgstr ""
 "If True, Gajim will show affiliation of groupchat occupants by adding a "
 "coloured square to the status icon"
 
-#: gajim/common/config.py:280
+#: gajim/common/config.py:278
 msgid ""
 "Proxy used for all outgoing connections if the account does not have a "
-"specific proxy configured"
+"specific proxy configured."
 msgstr ""
 
-#: gajim/common/config.py:281
-msgid "If true, Gajim will ignore incoming attention requests (\"wizz\")."
+#: gajim/common/config.py:279
+msgid "If enabled, Gajim will ignore incoming attention requests ('wizz')."
 msgstr ""
 
-#: gajim/common/config.py:282
+#: gajim/common/config.py:280
 msgid ""
 "If enabled, Gajim will reopen chat windows that were opened last time Gajim "
 "was closed."
 msgstr ""
 
-#: gajim/common/config.py:283
+#: gajim/common/config.py:281
 #, fuzzy
 msgid ""
-"If enabled, Gajim will show an icon to show that sent message has been "
-"received by your contact"
+"If enabled, Gajim will display an icon to show that sent messages have been "
+"received by your contact."
 msgstr ""
 "If enabled, Gajim will not ask for a status message. The specified default "
 "message will be used instead."
 
-#: gajim/common/config.py:284
-msgid "Show a mini avatar in chat window tabs and in window icon"
+#: gajim/common/config.py:282
+msgid "Show a mini avatar in chat window tabs and as the window's icon."
 msgstr ""
 
-#: gajim/common/config.py:285
+#: gajim/common/config.py:283
 #, fuzzy
-msgid "If true, Gajim will use the Systems Keyring to store account passwords."
+msgid ""
+"If enabled, Gajim will use the System's Keyring to store account passwords."
 msgstr ""
 "If True, Gajim will use Gnome Keyring (if available) to store account "
 "passwords."
 
+#: gajim/common/config.py:284
+msgid "If enabled, Gajim will execute XEP-0146 Commands."
+msgstr ""
+
+#: gajim/common/config.py:285
+msgid "2: System, 1: Enabled, 0: Disabled"
+msgstr ""
+
 #: gajim/common/config.py:286
-msgid "If true, Gajim will execute XEP-0146 Commands."
+msgid "Options in days which can be chosen in the sync threshold menu"
 msgstr ""
 
 #: gajim/common/config.py:287
-msgid "2: System, 1: Enabled, 0: Disabled"
+msgid ""
+"Maximum history in days we request from a public group chat archive. 0: As "
+"much as possible."
 msgstr ""
 
 #: gajim/common/config.py:288
-msgid "Options in days which can be chosen in the sync threshold menu"
+msgid ""
+"Maximum history in days we request from a private group chat archive. 0: As "
+"much as possible."
 msgstr ""
 
 #: gajim/common/config.py:289
 msgid ""
-"Maximum history in days we request from a public room archive. 0: As much as "
-"possible"
+"If enabled, Gajim shows the group chat subject in the chat window when "
+"joining."
 msgstr ""
 
 #: gajim/common/config.py:290
+#, fuzzy
 msgid ""
-"Maximum history in days we request from a private room archive. 0: As much "
-"as possible"
+"If enabled, the contact row is colored according to the current chat state "
+"of the contact."
 msgstr ""
+"If ticked, Gajim will allow others to detect the operation system you are "
+"using"
 
 #: gajim/common/config.py:291
-msgid "If the room subject is shown in chat on join"
+#, fuzzy
+msgid ""
+"If enabled, the tab is colored according to the current chat state of the "
+"contact."
 msgstr ""
+"If ticked, Gajim will allow others to detect the operation system you are "
+"using"
 
 #: gajim/common/config.py:292
+#, fuzzy
 msgid ""
-"If the contact row is colored according to the current chatstate of the "
-"contact"
+"Shows a text in the banner that describes the current chat state of the "
+"contact."
 msgstr ""
+"If ticked, Gajim will allow others to detect the operation system you are "
+"using"
 
 #: gajim/common/config.py:293
-msgid "If the tab is colored according to the current chatstate of the contact"
-msgstr ""
-
-#: gajim/common/config.py:294
-msgid ""
-"Shows a text in the banner that describes the current chatstate of the "
-"contact"
-msgstr ""
-
-#: gajim/common/config.py:295 gajim/common/config.py:424
 #, fuzzy
 msgid ""
 "Chat state notifications that are sent to contacts. Possible values: all, "
@@ -3844,76 +3837,82 @@ msgid ""
 msgstr ""
 "Sent chat state notifications. Can be one of all, composing_only, disabled."
 
-#: gajim/common/config.py:296 gajim/common/config.py:438
+#: gajim/common/config.py:294
 #, fuzzy
 msgid ""
 "Chat state notifications that are sent to the group chat. Possible values: "
-"all, composing_only, disabled"
+"'all', 'composing_only', 'disabled'"
 msgstr ""
 "Sent chat state notifications. Can be one of all, composing_only, disabled."
 
-#: gajim/common/config.py:312
+#: gajim/common/config.py:297
+msgid "API Preferences. Possible values: 'http', 'iq'"
+msgstr ""
+
+#: gajim/common/config.py:313
 #, fuzzy
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
-"defined in autopriority_* options."
+"defined in 'autopriority_*' options."
 msgstr ""
 "Priority will change automatically according to your status. Priorities are "
 "defined in autopriority_* options."
 
-#: gajim/common/config.py:320
+#: gajim/common/config.py:321
 #, fuzzy
 msgid ""
-"Status used to autoconnect as. Can be online, chat, away, xa, dnd, "
-"invisible. NOTE: this option is used only if restore_last_status is disabled"
+"Status to be used automatically when connecting. Can be 'online', 'chat', "
+"'away', 'xa', 'dnd' or 'invisible'. NOTE: This option is used only if "
+"'restore_last_status' is disabled."
 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:321
+#: gajim/common/config.py:322
 #, fuzzy
-msgid "If enabled, restore the last status that was used."
+msgid "If enabled, the last status will be restored."
 msgstr "If enabled, restore the last status that was used."
 
-#: gajim/common/config.py:322
+#: gajim/common/config.py:323
 #, fuzzy
 msgid ""
-"If true, Contacts requesting authorization will be automatically accepted."
+"If enabled, Contacts requesting authorization will be accepted automatically."
 msgstr ""
 "If True, Contacts requesting authorisation will be automatically accepted."
 
-#: gajim/common/config.py:323
+#: gajim/common/config.py:324
 #, fuzzy
 msgid ""
-"If False, this account will be disabled and will not appear in roster window."
+"If disabled, this account will be disabled and will not appear in the "
+"contact list window."
 msgstr ""
 "If False, this account will be disabled and will not appear in roster window."
 
-#: gajim/common/config.py:327
-msgid "Allow plaintext connections"
+#: gajim/common/config.py:328
+msgid "Allow plaintext connections."
 msgstr ""
 
-#: gajim/common/config.py:330
+#: gajim/common/config.py:331
 msgid ""
-"List (space separated) of authentication mechanisms to try. Can contain "
-"ANONYMOUS, EXTERNAL, GSSAPI, SCRAM-SHA-1-PLUS, SCRAM-SHA-1, DIGEST-MD5, "
-"PLAIN, X-MESSENGER-OAUTH2 or XEP-0078"
+"List of authentication mechanisms to try (space separated). Can contain "
+"'ANONYMOUS', 'EXTERNAL', 'GSSAPI', 'SCRAM-SHA-1-PLUS', 'SCRAM-SHA-1', "
+"'DIGEST-MD5', 'PLAIN', 'X-MESSENGER-OAUTH2' or 'XEP-0078'."
 msgstr ""
 
-#: gajim/common/config.py:331
+#: gajim/common/config.py:332
 #, fuzzy
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection. "
-"Can be 'warn', 'connect', 'disconnect'"
+"Can be 'warn', 'connect' or 'disconnect'."
 msgstr ""
 "Show a warning dialogue before sending password on an plaintext connection."
 
-#: gajim/common/config.py:332
+#: gajim/common/config.py:333
 #, fuzzy
 msgid "Show a warning dialog before using standard SSL library."
 msgstr "Show a warning dialogue before using standard SSL library."
 
-#: gajim/common/config.py:333
+#: gajim/common/config.py:334
 #, fuzzy
 msgid ""
 "Show a warning dialog before sending PLAIN password over a plain connection."
@@ -3921,73 +3920,74 @@ msgstr ""
 "Show a warning dialogue before sending PLAIN password over a plain "
 "conenction."
 
-#: gajim/common/config.py:334
-#, fuzzy
-msgid "Space separated list of ssl errors to ignore."
-msgstr "Space separated list of SSL errors to ignore."
+#: gajim/common/config.py:335
+msgid "List of SSL errors to ignore (space separated)."
+msgstr ""
 
-#: gajim/common/config.py:340
+#: gajim/common/config.py:341
 msgid ""
-"Space separated list of JIDs for which you do not want to store logs. You "
-"can also add account name to log nothing for this account."
+"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:341
+#: gajim/common/config.py:342
 msgid ""
-"Space separated list of JIDs for which you accept to not log conversations "
-"if he does not want to."
+"List of XMPP Addresses (space separated) for which you accept to not store "
+"chat history if your contact does not want to."
 msgstr ""
 
-#: gajim/common/config.py:343
+#: gajim/common/config.py:344
 #, fuzzy
-msgid "Whitespace sent after inactivity"
+msgid "If enabled, a whitespace is sent after inactivity (keep alive)."
 msgstr "Whitespace sent after inactivity"
 
-#: gajim/common/config.py:344
+#: gajim/common/config.py:345
 #, fuzzy
-msgid "XMPP ping sent after inactivity"
+msgid "If enabled, an XMPP ping is sent after inactivity (ping alive)."
 msgstr "XMPP ping sent after inactivity"
 
-#: gajim/common/config.py:348
+#: gajim/common/config.py:349
 #, fuzzy
 msgid ""
-"How many seconds to wait for the answer of ping alive packet before trying "
-"to reconnect?"
+"How many seconds to wait for the answer of a ping alive packet before trying "
+"to reconnect."
 msgstr ""
 "How many seconds to wait for the answer of ping alive packet before we try "
 "to reconnect."
 
-#: gajim/common/config.py:352
+#: gajim/common/config.py:353
 #, fuzzy
-msgid "Jabberd2 workaround"
+msgid "Jabberd2 workaround."
 msgstr "Jabberd2 workaround"
 
-#: gajim/common/config.py:355
+#: gajim/common/config.py:356
 #, fuzzy
 msgid ""
-"If checked, Gajim will use your IP and proxies defined in "
-"file_transfer_proxies option for file transfer."
+"If enabled, Gajim will use your IP and proxies defined in "
+"'file_transfer_proxies' option for file transfers."
 msgstr ""
 "If ticked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
 
-#: gajim/common/config.py:356
+#: gajim/common/config.py:357
 msgid ""
-"If true, Gajim will test file transfer proxies on startup to be sure it "
-"works. Openfire's proxies are known to fail this test even if they work."
+"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:369
-#, fuzzy
-msgid "Answer to receipt requests"
-msgstr "Answer to receipt requests"
-
 #: gajim/common/config.py:370
 #, fuzzy
-msgid "Sent receipt requests"
-msgstr "Sent receipt requests"
+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:371
+msgid "If enabled, Gajim will send message receipt requests."
+msgstr ""
 
-#: gajim/common/config.py:379
+#: gajim/common/config.py:380
 #, fuzzy
 msgid ""
 "Allow Gajim to send information about the operating system you are running."
@@ -3995,186 +3995,195 @@ msgstr ""
 "If ticked, Gajim will allow others to detect the operation system you are "
 "using"
 
-#: gajim/common/config.py:380
+#: gajim/common/config.py:381
 #, fuzzy
 msgid "Allow Gajim to send your local time."
 msgstr "%s egy filet szeretne küldeni neked."
 
-#: gajim/common/config.py:383
+#: gajim/common/config.py:384
 #, fuzzy
-msgid "Message that is sent to contacts you want to add"
+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:384
-msgid ""
-"If enabled, Gajim will send your local IPs so your contact can connect to "
-"your machine to transfer files."
-msgstr ""
-
 #: gajim/common/config.py:385
+#, fuzzy
 msgid ""
-"Space separated list of JIDs for which chat window will be re-opened on next "
-"startup."
+"If enabled, Gajim will send your local IP so your contact can connect to "
+"your machine for file transfers."
 msgstr ""
+"If ticked, Gajim will use your IP and proxies defined in "
+"file_transfer_proxies option for file transfer."
 
-#: gajim/common/config.py:387
-msgid "HTTP Upload: Enable HTTPS Verification"
+#: gajim/common/config.py:386
+msgid ""
+"List of XMPP Addresses (space separated) for which the chat window will be "
+"re-opened on next startup."
 msgstr ""
 
 #: gajim/common/config.py:388
-msgid ""
-"Preferred file transfer mechanism for file drag&drop on chat window. Can be "
-"'httpupload' (default) or 'jingle'"
+msgid "HTTP File Upload: Enable HTTPS Verification."
 msgstr ""
 
 #: gajim/common/config.py:389
-msgid "Allow cert verification with POSH"
+msgid ""
+"Preferred file transfer mechanism for file drag&drop on a chat window. Can "
+"be 'httpupload' (default) or 'jingle'."
 msgstr ""
 
-#: gajim/common/config.py:423 gajim/common/config.py:430
+#: gajim/common/config.py:390
 #, fuzzy
-msgid "Language for which misspelled words will be checked"
-msgstr "Language for which we want to check misspelt words"
+msgid "Allow certificate verification with POSH."
+msgstr "SSL tanusítvány hiba"
 
-#: gajim/common/config.py:427
-msgid "The currently active encryption for that contact"
+#: gajim/common/config.py:425
+#, fuzzy
+msgid ""
+"Chat state notifications that are sent to contacts. Possible values: 'all', "
+"'composing_only', 'disabled'"
 msgstr ""
+"Sent chat state notifications. Can be one of all, composing_only, disabled."
 
-#: gajim/common/config.py:431
+#: gajim/common/config.py:428
 #, fuzzy
-msgid ""
-"How many lines to request from server when entering a groupchat. -1 means no "
-"limit, -2 means global value"
-msgstr "How many lines to request to server when entering a groupchat."
+msgid "The currently active encryption for that contact."
+msgstr "Enable ESessions encryption for this account."
 
 #: gajim/common/config.py:432
-#, fuzzy
 msgid ""
-"Minutes of backlog to request when entering a groupchat. -1 means no limit, "
-"-2 means global value"
-msgstr "How many minutes back to request logs when a entering a groupchat."
-
-#: gajim/common/config.py:433
-msgid "State whether a notification is created for every message in this room"
+"If enabled, a notification is created for every message in this group chat."
 msgstr ""
 
-#: gajim/common/config.py:434
+#: gajim/common/config.py:433
+#, fuzzy
 msgid ""
-"Show a status message for all status (away, dnd, etc.) changes of users in a "
-"group chat"
-msgstr ""
+"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:435
+#: gajim/common/config.py:434
 #, fuzzy
-msgid "Show a status message for every join or leave in a group chat"
+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:435
+msgid ""
+"If enabled, the group chat is minimized into the contact list when joining "
+"automatically."
+msgstr ""
+
 #: gajim/common/config.py:436
-msgid "If the group chat is minimized into the roster on autojoin"
+msgid ""
+"If enabled, the group chat is minimized into the contact list when closing "
+"it."
 msgstr ""
 
 #: gajim/common/config.py:437
-msgid "If the group chat is minimized into the roster on close"
+#, fuzzy
+msgid ""
+"Chat state notifications that are sent to the group chat. Possible values: "
+"'all', 'composing_only' or 'disabled'."
 msgstr ""
+"Sent chat state notifications. Can be one of all, composing_only, disabled."
 
-#: gajim/common/config.py:441
+#: gajim/common/config.py:440
 msgid ""
-"State whether plugins should be activated on startup (this is saved on Gajim "
-"exit). This option SHOULD NOT be used to (de)activate plug-ins. Use GUI "
-"instead."
+"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:446 gajim/common/const.py:281
+#: gajim/common/config.py:445 gajim/common/const.py:315
 msgid "Sleeping"
 msgstr "Alszik"
 
-#: gajim/common/config.py:447
+#: gajim/common/config.py:446
 msgid "Back soon"
 msgstr "Nemsokára vagyok"
 
-#: gajim/common/config.py:447
+#: gajim/common/config.py:446
 msgid "Back in some minutes."
 msgstr "Néhány perc múlva vagyok."
 
-#: gajim/common/config.py:448 gajim/common/const.py:247
+#: gajim/common/config.py:447 gajim/common/const.py:281
 msgid "Eating"
 msgstr "Eszik"
 
-#: gajim/common/config.py:448
-msgid "I'm eating, so leave me a message."
-msgstr "Eszek, hagyj üzenetet."
+#: gajim/common/config.py:447
+#, fuzzy
+msgid "I'm eating."
+msgstr "Dolgozom."
 
-#: gajim/common/config.py:449
+#: gajim/common/config.py:448
 msgid "Movie"
 msgstr "Film"
 
-#: gajim/common/config.py:449
+#: gajim/common/config.py:448
 msgid "I'm watching a movie."
 msgstr "Filmet nézek."
 
-#: gajim/common/config.py:450 gajim/common/const.py:314
+#: gajim/common/config.py:449 gajim/common/const.py:348
 msgid "Working"
 msgstr "Munka"
 
-#: gajim/common/config.py:450
+#: gajim/common/config.py:449
 msgid "I'm working."
 msgstr "Dolgozom."
 
-#: gajim/common/config.py:451
+#: gajim/common/config.py:450
 msgid "Phone"
 msgstr "Telefon"
 
-#: gajim/common/config.py:451
+#: gajim/common/config.py:450
 msgid "I'm on the phone."
 msgstr "Telefonálok."
 
-#: gajim/common/config.py:452
+#: gajim/common/config.py:451
 msgid "Out"
 msgstr "Szabadban"
 
-#: gajim/common/config.py:452
+#: gajim/common/config.py:451
 msgid "I'm out enjoying life."
 msgstr "Kint vagyok a szabadban, élvezem az életet."
 
-#: gajim/common/config.py:463
+#: gajim/common/config.py:462
 msgid "I'm available."
 msgstr "Elérhető vagyok."
 
-#: gajim/common/config.py:464
+#: gajim/common/config.py:463
 msgid "I'm free for chat."
 msgstr "Ráérek beszélgetni."
 
-#: gajim/common/config.py:465 gajim/gtk/accounts.py:134
+#: gajim/common/config.py:464 gajim/gtk/accounts.py:133
 msgid "Be right back."
 msgstr "Nemsokára vagyok."
 
-#: gajim/common/config.py:466
+#: gajim/common/config.py:465
 msgid "I'm not available."
 msgstr "Nem vagyok elérhető."
 
-#: gajim/common/config.py:467
+#: gajim/common/config.py:466
 msgid "Do not disturb."
 msgstr "Ne zavarjanak."
 
-#: gajim/common/config.py:468 gajim/common/config.py:469
+#: gajim/common/config.py:467 gajim/common/config.py:468
 msgid "Bye!"
 msgstr "Bye!"
 
-#: gajim/common/config.py:480
+#: gajim/common/config.py:479
 #, fuzzy
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
-"muc_highlight_words, or when a group chat message contains your nickname."
+"'muc_highlight_words' your nickname is mentioned."
 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:481
+#: gajim/common/config.py:480
 #, fuzzy
-msgid "Sound to play when any MUC message arrives."
+msgid "Sound to play when any group chat message arrives."
 msgstr "Sound to play when any MUC message arrives."
 
-#: gajim/common/config.py:485
+#: gajim/common/config.py:484
 #, fuzzy
 msgid "Tor"
 msgstr "neki"
@@ -4184,889 +4193,985 @@ msgstr "neki"
 msgid "Error: cannot open %s for reading"
 msgstr "Hiba: nem lehet %s-t megnyitni olvasásra"
 
-#: gajim/common/const.py:214
+#: gajim/common/const.py:216
+#, fuzzy
+msgid "?Group chat name:Team"
+msgstr "Nincs"
+
+#: gajim/common/const.py:217
+msgid "?Group chat description:Project discussion"
+msgstr ""
+
+#: gajim/common/const.py:218
+#, fuzzy
+msgid "?Group chat address:team"
+msgstr "Csoportos beszélgetések"
+
+#: gajim/common/const.py:219
+#, fuzzy
+msgid "?Group chat name:Family"
+msgstr "Közös beszélgetés üzenet kiemelése"
+
+#: gajim/common/const.py:220
+msgid "?Group chat description:Spring gathering"
+msgstr ""
+
+#: gajim/common/const.py:221
+msgid "?Group chat address:family"
+msgstr ""
+
+#: gajim/common/const.py:222
+#, fuzzy
+msgid "?Group chat name:Vacation"
+msgstr "Meghívó közös társalgásba"
+
+#: gajim/common/const.py:223
+msgid "?Group chat description:Trip planning"
+msgstr ""
+
+#: gajim/common/const.py:224
+#, fuzzy
+msgid "?Group chat address:vacation"
+msgstr "Meghívó közös társalgásba"
+
+#: gajim/common/const.py:225
+#, fuzzy
+msgid "?Group chat name:Repairs"
+msgstr "_Csoportos beszélgetés"
+
+#: gajim/common/const.py:226
+msgid "?Group chat description:Local help group"
+msgstr ""
+
+#: gajim/common/const.py:227
+#, fuzzy
+msgid "?Group chat address:repairs"
+msgstr "Csoportos beszélgetések"
+
+#: gajim/common/const.py:228
+#, fuzzy
+msgid "?Group chat name:News"
+msgstr "Nincs"
+
+#: gajim/common/const.py:229
+#, 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:230
+#, fuzzy
+msgid "?Group chat address:news"
+msgstr "Új közös beszélgetés"
+
+#: gajim/common/const.py:235
+#, fuzzy
+msgid "Remote server not found"
+msgstr "A szolgáltatás nem található"
+
+#: gajim/common/const.py:236
+msgid "Remote server timeout"
+msgstr ""
+
+#: gajim/common/const.py:237 gajim/common/const.py:238
+#: gajim/common/const.py:239
+#, 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:240
+#, fuzzy
+msgid "Group chat already exists"
+msgstr "A Helyi fiók már létezik."
+
+#: gajim/common/const.py:241
+#, fuzzy
+msgid "Group chat does not exist"
+msgstr "Group chat %s does not exist."
+
+#: gajim/common/const.py:247
 msgid "This message was encrypted with OTR and could not be decrypted."
 msgstr ""
 
-#: gajim/common/const.py:217
+#: gajim/common/const.py:250
 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:221
+#: gajim/common/const.py:254
 msgid ""
-"This message was encrypted with OpenPGP for XMPP and could not be decrypted."
+"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:224
+#: gajim/common/const.py:258
 #, python-format
 msgid "This message was encrypted with %s and could not be decrypted."
 msgstr ""
 
-#: gajim/common/const.py:231
+#: gajim/common/const.py:265
 msgid "Doing Chores"
 msgstr "Házimunkát csinál"
 
-#: gajim/common/const.py:232
+#: gajim/common/const.py:266
 msgid "Buying Groceries"
 msgstr "Bevásárol"
 
-#: gajim/common/const.py:233
+#: gajim/common/const.py:267
 msgid "Cleaning"
 msgstr "Takarít"
 
-#: gajim/common/const.py:234
+#: gajim/common/const.py:268
 msgid "Cooking"
 msgstr "Főz"
 
-#: gajim/common/const.py:235
+#: gajim/common/const.py:269
 msgid "Doing Maintenance"
 msgstr "Karbantart"
 
-#: gajim/common/const.py:236
+#: gajim/common/const.py:270
 msgid "Doing the Dishes"
 msgstr "Mosogat"
 
-#: gajim/common/const.py:237
+#: gajim/common/const.py:271
 msgid "Doing the Laundry"
 msgstr "Mos"
 
-#: gajim/common/const.py:238
+#: gajim/common/const.py:272
 msgid "Gardening"
 msgstr "Kertészkedik"
 
-#: gajim/common/const.py:239
+#: gajim/common/const.py:273
 msgid "Running an Errand"
 msgstr "Megbízást teljesít"
 
-#: gajim/common/const.py:240
+#: gajim/common/const.py:274
 msgid "Walking the Dog"
 msgstr "Kutyát sétáltat"
 
-#: gajim/common/const.py:242
+#: gajim/common/const.py:276
 msgid "Drinking"
 msgstr "Iszik"
 
-#: gajim/common/const.py:243
+#: gajim/common/const.py:277
 msgid "Having a Beer"
 msgstr "Sörözik"
 
-#: gajim/common/const.py:244
+#: gajim/common/const.py:278
 msgid "Having Coffee"
 msgstr "Kávézik"
 
-#: gajim/common/const.py:245
+#: gajim/common/const.py:279
 msgid "Having Tea"
 msgstr "Teázik"
 
-#: gajim/common/const.py:248
+#: gajim/common/const.py:282
 msgid "Having a Snack"
 msgstr "Harap valamit"
 
-#: gajim/common/const.py:249
+#: gajim/common/const.py:283
 msgid "Having Breakfast"
 msgstr "Reggelizik"
 
-#: gajim/common/const.py:250
+#: gajim/common/const.py:284
 msgid "Having Dinner"
 msgstr "Vacsorázik"
 
-#: gajim/common/const.py:251
+#: gajim/common/const.py:285
 msgid "Having Lunch"
 msgstr "Ebédel"
 
-#: gajim/common/const.py:253
+#: gajim/common/const.py:287
 msgid "Exercising"
 msgstr "Edz"
 
-#: gajim/common/const.py:254 gajim/common/const.py:305
+#: gajim/common/const.py:288 gajim/common/const.py:339
 msgid "Cycling"
 msgstr "Bringázik"
 
-#: gajim/common/const.py:255
+#: gajim/common/const.py:289
 msgid "Dancing"
 msgstr "Táncol"
 
-#: gajim/common/const.py:256
+#: gajim/common/const.py:290
 msgid "Hiking"
 msgstr "Túrázik"
 
-#: gajim/common/const.py:257
+#: gajim/common/const.py:291
 msgid "Jogging"
 msgstr "Kocog"
 
-#: gajim/common/const.py:258
+#: gajim/common/const.py:292
 msgid "Playing Sports"
 msgstr "Sportol"
 
-#: gajim/common/const.py:259
+#: gajim/common/const.py:293
 msgid "Running"
 msgstr "Fut"
 
-#: gajim/common/const.py:260
+#: gajim/common/const.py:294
 msgid "Skiing"
 msgstr "Síel"
 
-#: gajim/common/const.py:261
+#: gajim/common/const.py:295
 msgid "Swimming"
 msgstr "Úszik"
 
-#: gajim/common/const.py:262
+#: gajim/common/const.py:296
 msgid "Working out"
 msgstr "Kondizik"
 
-#: gajim/common/const.py:264
+#: gajim/common/const.py:298
 msgid "Grooming"
 msgstr "Ápolja magát"
 
-#: gajim/common/const.py:265
+#: gajim/common/const.py:299
 msgid "At the Spa"
 msgstr "A gyógyfürdőben"
 
-#: gajim/common/const.py:266
+#: gajim/common/const.py:300
 msgid "Brushing Teeth"
 msgstr "Fogat mos"
 
-#: gajim/common/const.py:267
+#: gajim/common/const.py:301
 msgid "Getting a Haircut"
 msgstr "Fodrásznál van"
 
-#: gajim/common/const.py:268
+#: gajim/common/const.py:302
 msgid "Shaving"
 msgstr "Borotválkozik"
 
-#: gajim/common/const.py:269
+#: gajim/common/const.py:303
 msgid "Taking a Bath"
 msgstr "Fürdik"
 
-#: gajim/common/const.py:270
+#: gajim/common/const.py:304
 msgid "Taking a Shower"
 msgstr "Tusol"
 
-#: gajim/common/const.py:272
+#: gajim/common/const.py:306
 msgid "Having an Appointment"
 msgstr "Találkozón van"
 
-#: gajim/common/const.py:274
+#: gajim/common/const.py:308
 msgid "Inactive"
 msgstr "Inaktív"
 
-#: gajim/common/const.py:275
+#: gajim/common/const.py:309
 msgid "Day Off"
 msgstr "Szabadnap"
 
-#: gajim/common/const.py:276
+#: gajim/common/const.py:310
 msgid "Hanging out"
 msgstr "Kiruccan"
 
-#: gajim/common/const.py:277
+#: gajim/common/const.py:311
 msgid "Hiding"
 msgstr "Rejtőzködik"
 
-#: gajim/common/const.py:278
+#: gajim/common/const.py:312
 msgid "On Vacation"
 msgstr "Vakáción"
 
-#: gajim/common/const.py:279
+#: gajim/common/const.py:313
 msgid "Praying"
 msgstr "Imádkozik"
 
-#: gajim/common/const.py:280
+#: gajim/common/const.py:314
 msgid "Scheduled Holiday"
 msgstr "Tervezett szabadság"
 
-#: gajim/common/const.py:282
+#: gajim/common/const.py:316
 msgid "Thinking"
 msgstr "Gondolkodik"
 
-#: gajim/common/const.py:284
+#: gajim/common/const.py:318
 msgid "Relaxing"
 msgstr "Relaxál"
 
-#: gajim/common/const.py:285
+#: gajim/common/const.py:319
 msgid "Fishing"
 msgstr "Horgászik"
 
-#: gajim/common/const.py:286
+#: gajim/common/const.py:320
 msgid "Gaming"
 msgstr "Jászik"
 
-#: gajim/common/const.py:287
+#: gajim/common/const.py:321
 msgid "Going out"
 msgstr "Kiment"
 
-#: gajim/common/const.py:288
+#: gajim/common/const.py:322
 msgid "Partying"
 msgstr "Partizik"
 
-#: gajim/common/const.py:289
+#: gajim/common/const.py:323
 msgid "Reading"
 msgstr "Olvas"
 
-#: gajim/common/const.py:290
+#: gajim/common/const.py:324
 msgid "Rehearsing"
 msgstr "Rehearsing"
 
-#: gajim/common/const.py:291
+#: gajim/common/const.py:325
 msgid "Shopping"
 msgstr "Vásárol"
 
-#: gajim/common/const.py:292
+#: gajim/common/const.py:326
 msgid "Smoking"
 msgstr "Cigizik"
 
-#: gajim/common/const.py:293
+#: gajim/common/const.py:327
 msgid "Socializing"
 msgstr "Szocializálódik"
 
-#: gajim/common/const.py:294
+#: gajim/common/const.py:328
 msgid "Sunbathing"
 msgstr "Napozik"
 
-#: gajim/common/const.py:295
+#: gajim/common/const.py:329
 msgid "Watching TV"
 msgstr "Tévézik"
 
-#: gajim/common/const.py:296
+#: gajim/common/const.py:330
 msgid "Watching a Movie"
 msgstr "Filmet néz"
 
-#: gajim/common/const.py:298
+#: gajim/common/const.py:332
 msgid "Talking"
 msgstr "Beszélget"
 
-#: gajim/common/const.py:299
+#: gajim/common/const.py:333
 msgid "In Real Life"
 msgstr "Kint van a való világban"
 
-#: gajim/common/const.py:300
+#: gajim/common/const.py:334
 msgid "On the Phone"
 msgstr "Telefonál"
 
-#: gajim/common/const.py:301
+#: gajim/common/const.py:335
 msgid "On Video Phone"
 msgstr "Videótelefonál"
 
-#: gajim/common/const.py:303
+#: gajim/common/const.py:337
 msgid "Traveling"
 msgstr "Utazik"
 
-#: gajim/common/const.py:304
+#: gajim/common/const.py:338
 msgid "Commuting"
 msgstr "Ingázik"
 
-#: gajim/common/const.py:306
+#: gajim/common/const.py:340
 msgid "Driving"
 msgstr "Vezet"
 
-#: gajim/common/const.py:307
+#: gajim/common/const.py:341
 msgid "In a Car"
 msgstr "Autóban"
 
-#: gajim/common/const.py:308
+#: gajim/common/const.py:342
 msgid "On a Bus"
 msgstr "Buszon"
 
-#: gajim/common/const.py:309
+#: gajim/common/const.py:343
 msgid "On a Plane"
 msgstr "Repülőn"
 
-#: gajim/common/const.py:310
+#: gajim/common/const.py:344
 msgid "On a Train"
 msgstr "Vonaton"
 
-#: gajim/common/const.py:311
+#: gajim/common/const.py:345
 msgid "On a Trip"
 msgstr "Túrán"
 
-#: gajim/common/const.py:312
+#: gajim/common/const.py:346
 msgid "Walking"
 msgstr "Sétál"
 
-#: gajim/common/const.py:315
+#: gajim/common/const.py:349
 msgid "Coding"
 msgstr "Programozik"
 
-#: gajim/common/const.py:316
+#: gajim/common/const.py:350
 msgid "In a Meeting"
 msgstr "Találkozón"
 
-#: gajim/common/const.py:317
+#: gajim/common/const.py:351
 msgid "Studying"
 msgstr "Tanul"
 
-#: gajim/common/const.py:318
+#: gajim/common/const.py:352
 msgid "Writing"
 msgstr "Ír"
 
-#: gajim/common/const.py:321
+#: gajim/common/const.py:355
 msgid "Afraid"
 msgstr "Fél"
 
-#: gajim/common/const.py:322
+#: gajim/common/const.py:356
 msgid "Amazed"
 msgstr "Meghökkent"
 
-#: gajim/common/const.py:323
+#: gajim/common/const.py:357
 msgid "Amorous"
 msgstr "Belezúgott"
 
-#: gajim/common/const.py:324
+#: gajim/common/const.py:358
 msgid "Angry"
 msgstr "Mérges"
 
-#: gajim/common/const.py:325
+#: gajim/common/const.py:359
 msgid "Annoyed"
 msgstr "Bosszús"
 
-#: gajim/common/const.py:326
+#: gajim/common/const.py:360
 msgid "Anxious"
 msgstr "Aggódó"
 
-#: gajim/common/const.py:327
+#: gajim/common/const.py:361
 msgid "Aroused"
 msgstr "Érdeklődő"
 
-#: gajim/common/const.py:328
+#: gajim/common/const.py:362
 msgid "Ashamed"
 msgstr "Szégyelli magát"
 
-#: gajim/common/const.py:329
+#: gajim/common/const.py:363
 msgid "Bored"
 msgstr "Unatkozik"
 
-#: gajim/common/const.py:330
+#: gajim/common/const.py:364
 msgid "Brave"
 msgstr "Bátor"
 
-#: gajim/common/const.py:331
+#: gajim/common/const.py:365
 msgid "Calm"
 msgstr "Nyugodt"
 
-#: gajim/common/const.py:332
+#: gajim/common/const.py:366
 msgid "Cautious"
 msgstr "Elővigyázatos"
 
-#: gajim/common/const.py:333
+#: gajim/common/const.py:367
 msgid "Cold"
 msgstr "Hideg"
 
-#: gajim/common/const.py:334
+#: gajim/common/const.py:368
 msgid "Confident"
 msgstr "Magabiztos"
 
-#: gajim/common/const.py:335
+#: gajim/common/const.py:369
 msgid "Confused"
 msgstr "Összezavarodott"
 
-#: gajim/common/const.py:336
+#: gajim/common/const.py:370
 msgid "Contemplative"
 msgstr "Elmélkedő"
 
-#: gajim/common/const.py:337
+#: gajim/common/const.py:371
 msgid "Contented"
 msgstr "Elégedett"
 
-#: gajim/common/const.py:338
+#: gajim/common/const.py:372
 msgid "Cranky"
 msgstr "Házsártos"
 
-#: gajim/common/const.py:339
+#: gajim/common/const.py:373
 msgid "Crazy"
 msgstr "Őrült"
 
-#: gajim/common/const.py:340
+#: gajim/common/const.py:374
 msgid "Creative"
 msgstr "Kreatív"
 
-#: gajim/common/const.py:341
+#: gajim/common/const.py:375
 msgid "Curious"
 msgstr "Kíváncsi"
 
-#: gajim/common/const.py:342
+#: gajim/common/const.py:376
 msgid "Dejected"
 msgstr "Levert"
 
-#: gajim/common/const.py:343
+#: gajim/common/const.py:377
 msgid "Depressed"
 msgstr "Lehangolt"
 
-#: gajim/common/const.py:344
+#: gajim/common/const.py:378
 msgid "Disappointed"
 msgstr "Kiábrándult"
 
-#: gajim/common/const.py:345
+#: gajim/common/const.py:379
 msgid "Disgusted"
 msgstr "Felháborodott"
 
-#: gajim/common/const.py:346
+#: gajim/common/const.py:380
 msgid "Dismayed"
 msgstr "Megdöbbent"
 
-#: gajim/common/const.py:347
+#: gajim/common/const.py:381
 msgid "Distracted"
 msgstr "Zaklatott"
 
-#: gajim/common/const.py:348
+#: gajim/common/const.py:382
 msgid "Embarrassed"
 msgstr "Feszélyezett"
 
-#: gajim/common/const.py:349
+#: gajim/common/const.py:383
 msgid "Envious"
 msgstr "Irígy"
 
-#: gajim/common/const.py:350
+#: gajim/common/const.py:384
 msgid "Excited"
 msgstr "Izgatott"
 
-#: gajim/common/const.py:351
+#: gajim/common/const.py:385
 msgid "Flirtatious"
 msgstr "Kacér"
 
-#: gajim/common/const.py:352
+#: gajim/common/const.py:386
 msgid "Frustrated"
 msgstr "Frusztrált"
 
-#: gajim/common/const.py:353
+#: gajim/common/const.py:387
 msgid "Grateful"
 msgstr "Hálás"
 
-#: gajim/common/const.py:354
+#: gajim/common/const.py:388
 msgid "Grieving"
 msgstr "Gyászol"
 
-#: gajim/common/const.py:355
+#: gajim/common/const.py:389
 msgid "Grumpy"
 msgstr "Zsémbes"
 
-#: gajim/common/const.py:356
+#: gajim/common/const.py:390
 msgid "Guilty"
 msgstr "Bűnös"
 
-#: gajim/common/const.py:357
+#: gajim/common/const.py:391
 msgid "Happy"
 msgstr "Boldog"
 
-#: gajim/common/const.py:358
+#: gajim/common/const.py:392
 msgid "Hopeful"
 msgstr "Reményteli"
 
-#: gajim/common/const.py:359
+#: gajim/common/const.py:393
 msgid "Hot"
 msgstr "Hot"
 
-#: gajim/common/const.py:360
+#: gajim/common/const.py:394
 msgid "Humbled"
 msgstr "Megaláztatott"
 
-#: gajim/common/const.py:361
+#: gajim/common/const.py:395
 msgid "Humiliated"
 msgstr "Megalázott"
 
-#: gajim/common/const.py:362
+#: gajim/common/const.py:396
 msgid "Hungry"
 msgstr "Éhes"
 
-#: gajim/common/const.py:363
+#: gajim/common/const.py:397
 msgid "Hurt"
 msgstr "Megsebesült"
 
-#: gajim/common/const.py:364
+#: gajim/common/const.py:398
 msgid "Impressed"
 msgstr "Impressed"
 
-#: gajim/common/const.py:365
+#: gajim/common/const.py:399
 msgid "In Awe"
 msgstr "Félelemben"
 
-#: gajim/common/const.py:366
+#: gajim/common/const.py:400
 msgid "In Love"
 msgstr "Szerelmes"
 
-#: gajim/common/const.py:367
+#: gajim/common/const.py:401
 msgid "Indignant"
 msgstr "Méltatlankodó"
 
-#: gajim/common/const.py:368
+#: gajim/common/const.py:402
 msgid "Interested"
 msgstr "Érdeklődő"
 
-#: gajim/common/const.py:369
+#: gajim/common/const.py:403
 msgid "Intoxicated"
 msgstr "Mámoros"
 
-#: gajim/common/const.py:370
+#: gajim/common/const.py:404
 msgid "Invincible"
 msgstr "Legyőzhetetlen"
 
-#: gajim/common/const.py:371
+#: gajim/common/const.py:405
 msgid "Jealous"
 msgstr "Féltékeny"
 
-#: gajim/common/const.py:372
+#: gajim/common/const.py:406
 msgid "Lonely"
 msgstr "Magányos"
 
-#: gajim/common/const.py:373
+#: gajim/common/const.py:407
 msgid "Lost"
 msgstr "Elveszett"
 
-#: gajim/common/const.py:374
+#: gajim/common/const.py:408
 msgid "Lucky"
 msgstr "Szerencsés"
 
-#: gajim/common/const.py:375
+#: gajim/common/const.py:409
 msgid "Mean"
 msgstr "Középszerű"
 
-#: gajim/common/const.py:376
+#: gajim/common/const.py:410
 msgid "Moody"
 msgstr "Rosszkedvű"
 
-#: gajim/common/const.py:377
+#: gajim/common/const.py:411
 msgid "Nervous"
 msgstr "Ideges"
 
-#: gajim/common/const.py:378
+#: gajim/common/const.py:412
 msgid "Neutral"
 msgstr "Normális"
 
-#: gajim/common/const.py:379
+#: gajim/common/const.py:413
 msgid "Offended"
 msgstr "Sértődött"
 
-#: gajim/common/const.py:380
+#: gajim/common/const.py:414
 msgid "Outraged"
 msgstr "Felháborodott"
 
-#: gajim/common/const.py:381
+#: gajim/common/const.py:415
 msgid "Playful"
 msgstr "Játékos"
 
-#: gajim/common/const.py:382
+#: gajim/common/const.py:416
 msgid "Proud"
 msgstr "Büszke"
 
-#: gajim/common/const.py:383
+#: gajim/common/const.py:417
 msgid "Relaxed"
 msgstr "Nyugodt"
 
-#: gajim/common/const.py:384
+#: gajim/common/const.py:418
 msgid "Relieved"
 msgstr "Megkönnyebbült"
 
-#: gajim/common/const.py:385
+#: gajim/common/const.py:419
 msgid "Remorseful"
 msgstr "Bűnbánó"
 
-#: gajim/common/const.py:386
+#: gajim/common/const.py:420
 msgid "Restless"
 msgstr "Nyughatatlan"
 
-#: gajim/common/const.py:387
+#: gajim/common/const.py:421
 msgid "Sad"
 msgstr "Szomorú"
 
-#: gajim/common/const.py:388
+#: gajim/common/const.py:422
 msgid "Sarcastic"
 msgstr "Gúnyos"
 
-#: gajim/common/const.py:389
+#: gajim/common/const.py:423
 msgid "Satisfied"
 msgstr "Elégedett"
 
-#: gajim/common/const.py:390
+#: gajim/common/const.py:424
 msgid "Serious"
 msgstr "Komoly"
 
-#: gajim/common/const.py:391
+#: gajim/common/const.py:425
 msgid "Shocked"
 msgstr "Döbbent"
 
-#: gajim/common/const.py:392
+#: gajim/common/const.py:426
 msgid "Shy"
 msgstr "Félénk"
 
-#: gajim/common/const.py:393
+#: gajim/common/const.py:427
 msgid "Sick"
 msgstr "Beteg"
 
-#: gajim/common/const.py:394
+#: gajim/common/const.py:428
 msgid "Sleepy"
 msgstr "Álmos"
 
-#: gajim/common/const.py:395
+#: gajim/common/const.py:429
 msgid "Spontaneous"
 msgstr "Spontán"
 
-#: gajim/common/const.py:396
+#: gajim/common/const.py:430
 msgid "Stressed"
 msgstr "Stresszes"
 
-#: gajim/common/const.py:397
+#: gajim/common/const.py:431
 msgid "Strong"
 msgstr "Erős"
 
-#: gajim/common/const.py:398
+#: gajim/common/const.py:432
 msgid "Surprised"
 msgstr "Meglepett"
 
-#: gajim/common/const.py:399
+#: gajim/common/const.py:433
 msgid "Thankful"
 msgstr "Hálás"
 
-#: gajim/common/const.py:400
+#: gajim/common/const.py:434
 msgid "Thirsty"
 msgstr "Szomjas"
 
-#: gajim/common/const.py:401
+#: gajim/common/const.py:435
 msgid "Tired"
 msgstr "Fáradt"
 
-#: gajim/common/const.py:402
+#: gajim/common/const.py:436
 msgid "Undefined"
 msgstr "Nem meghatározott"
 
-#: gajim/common/const.py:403
+#: gajim/common/const.py:437
 msgid "Weak"
 msgstr "Gyenge"
 
-#: gajim/common/const.py:404
+#: gajim/common/const.py:438
 msgid "Worried"
 msgstr "Aggódó"
 
-#: gajim/common/const.py:408
+#: gajim/common/const.py:442
 msgid "accuracy"
 msgstr ""
 
-#: gajim/common/const.py:409
+#: gajim/common/const.py:443
 #, fuzzy
 msgid "alt"
 msgstr "alapértelmezett"
 
-#: gajim/common/const.py:410
+#: gajim/common/const.py:444
 msgid "area"
 msgstr ""
 
-#: gajim/common/const.py:411
+#: gajim/common/const.py:445
 #, fuzzy
 msgid "bearing"
 msgstr "tengerész"
 
-#: gajim/common/const.py:412
+#: gajim/common/const.py:446
 #, fuzzy
 msgid "building"
 msgstr "Rejtőzködik"
 
-#: gajim/common/const.py:413
+#: gajim/common/const.py:447
 #, fuzzy
 msgid "country"
 msgstr "Fiók"
 
-#: gajim/common/const.py:414
+#: gajim/common/const.py:448
 #, fuzzy
 msgid "countrycode"
 msgstr "Fiók sor"
 
-#: gajim/common/const.py:415
+#: gajim/common/const.py:449
 msgid "datum"
 msgstr ""
 
-#: gajim/common/const.py:416
+#: gajim/common/const.py:450
 #, fuzzy
 msgid "description"
 msgstr "Leírás"
 
-#: gajim/common/const.py:417
+#: gajim/common/const.py:451
 #, fuzzy
 msgid "error"
 msgstr "Hiba"
 
-#: gajim/common/const.py:418
+#: gajim/common/const.py:452
 msgid "floor"
 msgstr ""
 
-#: gajim/common/const.py:419
+#: gajim/common/const.py:453
 msgid "lat"
 msgstr ""
 
-#: gajim/common/const.py:420
+#: gajim/common/const.py:454
 msgid "locality"
 msgstr ""
 
-#: gajim/common/const.py:421
+#: gajim/common/const.py:455
 #, fuzzy
 msgid "lon"
 msgstr "egy"
 
-#: gajim/common/const.py:422
+#: gajim/common/const.py:456
 msgid "postalcode"
 msgstr ""
 
-#: gajim/common/const.py:423
+#: gajim/common/const.py:457
 msgid "region"
 msgstr ""
 
-#: gajim/common/const.py:424
+#: gajim/common/const.py:458
 msgid "room"
 msgstr "room"
 
-#: gajim/common/const.py:425
+#: gajim/common/const.py:459
 msgid "speed"
 msgstr ""
 
-#: gajim/common/const.py:426
+#: gajim/common/const.py:460
 msgid "street"
 msgstr ""
 
-#: gajim/common/const.py:427
+#: gajim/common/const.py:461
 msgid "text"
 msgstr ""
 
-#: gajim/common/const.py:428
+#: gajim/common/const.py:462
 msgid "timestamp"
 msgstr ""
 
-#: gajim/common/const.py:429
+#: gajim/common/const.py:463
 msgid "URI"
 msgstr ""
 
-#: gajim/common/const.py:434
+#: gajim/common/const.py:468
 #, fuzzy
 msgid "Unable to get issuer certificate"
 msgstr "Unable to get issuer certificate"
 
-#: gajim/common/const.py:435
+#: gajim/common/const.py:469
 #, fuzzy
 msgid "Unable to get certificate CRL"
 msgstr "Unable to get certificate CRL"
 
-#: gajim/common/const.py:436
+#: gajim/common/const.py:470
 #, fuzzy
 msgid "Unable to decrypt certificate's signature"
 msgstr "Unable to decrypt certificate's signature"
 
-#: gajim/common/const.py:437
+#: gajim/common/const.py:471
 #, fuzzy
 msgid "Unable to decrypt CRL's signature"
 msgstr "Unable to decrypt CRL's signature"
 
-#: gajim/common/const.py:438
+#: gajim/common/const.py:472
 msgid "Unable to decode issuer public key"
 msgstr "Nem lehet dekódolni a kibocsátó publikus kulcsát"
 
-#: gajim/common/const.py:439
+#: gajim/common/const.py:473
 msgid "Certificate signature failure"
 msgstr "Tanusítvány aláírás hiba"
 
-#: gajim/common/const.py:440
+#: gajim/common/const.py:474
 msgid "CRL signature failure"
 msgstr "CRL aláírás hiba"
 
-#: gajim/common/const.py:441
+#: gajim/common/const.py:475
 msgid "Certificate is not yet valid"
 msgstr "Az tanusítvány még nem érvényes"
 
-#: gajim/common/const.py:442
+#: gajim/common/const.py:476
 msgid "Certificate has expired"
 msgstr "A tanusítvány lejárt"
 
-#: gajim/common/const.py:443
+#: gajim/common/const.py:477
 msgid "CRL is not yet valid"
 msgstr "CRL még nem érvényes"
 
-#: gajim/common/const.py:444
+#: gajim/common/const.py:478
 msgid "CRL has expired"
 msgstr "CRL lejárt"
 
-#: gajim/common/const.py:445
+#: gajim/common/const.py:479
 #, fuzzy
 msgid "Format error in certificate's notBefore field"
 msgstr "Format error in certificate's notBefore field"
 
-#: gajim/common/const.py:446
+#: gajim/common/const.py:480
 #, fuzzy
 msgid "Format error in certificate's notAfter field"
 msgstr "Format error in certificate's notAfter field"
 
-#: gajim/common/const.py:447
+#: gajim/common/const.py:481
 #, fuzzy
 msgid "Format error in CRL's lastUpdate field"
 msgstr "Format error in CRL's lastUpdate field"
 
-#: gajim/common/const.py:448
+#: gajim/common/const.py:482
 #, fuzzy
 msgid "Format error in CRL's nextUpdate field"
 msgstr "Format error in CRL's nextUpdate field"
 
-#: gajim/common/const.py:449
+#: gajim/common/const.py:483
 msgid "Out of memory"
 msgstr "Elfogyott a memória"
 
-#: gajim/common/const.py:450
+#: gajim/common/const.py:484
 msgid "Self signed certificate"
 msgstr "Saját magunk által aláírt tanusítvány"
 
-#: gajim/common/const.py:451
+#: gajim/common/const.py:485
 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:452
+#: gajim/common/const.py:486
 msgid "Unable to get local issuer certificate"
 msgstr "Nem lehet lekérni a helyi kibocsátó tanusítványát"
 
-#: gajim/common/const.py:453
+#: gajim/common/const.py:487
 msgid "Unable to verify the first certificate"
 msgstr "Nem lehet ellenőrizni az első tanusítványt"
 
-#: gajim/common/const.py:454
+#: gajim/common/const.py:488
 msgid "Certificate chain too long"
 msgstr "A tanusítványlánc túl hosszú"
 
-#: gajim/common/const.py:455
+#: gajim/common/const.py:489
 msgid "Certificate revoked"
 msgstr "Tanusítvány érvénytelenítve"
 
-#: gajim/common/const.py:456
+#: gajim/common/const.py:490
 msgid "Invalid CA certificate"
 msgstr "Érvénytelen CA tanusítvány"
 
-#: gajim/common/const.py:457
+#: gajim/common/const.py:491
 msgid "Path length constraint exceeded"
 msgstr "Az elérési útvonal elérte a megengedett maximális hosszát"
 
-#: gajim/common/const.py:458
+#: gajim/common/const.py:492
 msgid "Unsupported certificate purpose"
 msgstr "Nem támogatott tanusítvány cél"
 
-#: gajim/common/const.py:459
+#: gajim/common/const.py:493
 msgid "Certificate not trusted"
 msgstr "A tanusítvány nem megbízható"
 
-#: gajim/common/const.py:460
+#: gajim/common/const.py:494
 msgid "Certificate rejected"
 msgstr "Tanusítvány visszautasítva"
 
-#: gajim/common/const.py:461
+#: gajim/common/const.py:495
 msgid "Subject issuer mismatch"
 msgstr "Téma kibocsátó eltérés"
 
-#: gajim/common/const.py:462
+#: gajim/common/const.py:496
 #, fuzzy
 msgid "Authority and subject key identifier mismatch"
 msgstr "Authority and subject key identifier mismatch"
 
-#: gajim/common/const.py:463
+#: gajim/common/const.py:497
 #, fuzzy
 msgid "Authority and issuer serial number mismatch"
 msgstr "Authority and issuer serial number mismatch"
 
-#: gajim/common/const.py:464
+#: gajim/common/const.py:498
 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:465
+#: gajim/common/const.py:499
 msgid "Application verification failure"
 msgstr "Alkalmazás ellenőrzési funkció"
 
@@ -5240,259 +5345,259 @@ msgstr "videó bemenet"
 msgid "video output"
 msgstr "videó kimenet"
 
-#: gajim/common/helpers.py:210
+#: gajim/common/helpers.py:216
 msgid "Server must be between 1 and 1023 bytes"
 msgstr ""
 
-#: gajim/common/helpers.py:214
+#: gajim/common/helpers.py:220
 msgid "Invalid character in hostname."
 msgstr "Nem megfelelő karakter van a hosztnévben."
 
-#: gajim/common/helpers.py:216
+#: gajim/common/helpers.py:222
 msgid "Server address required."
 msgstr "Szerver cím szükséges."
 
-#: gajim/common/helpers.py:220
+#: gajim/common/helpers.py:226
 msgid "Username must be between 1 and 1023 bytes"
 msgstr ""
 
-#: gajim/common/helpers.py:224
+#: gajim/common/helpers.py:230
 msgid "Invalid character in username."
 msgstr "Nem megfelelő karakter van a felhasználónévben."
 
-#: gajim/common/helpers.py:230
+#: gajim/common/helpers.py:236
 msgid "Resource must be between 1 and 1023 bytes"
 msgstr ""
 
-#: gajim/common/helpers.py:234
+#: gajim/common/helpers.py:240
 msgid "Invalid character in resource."
 msgstr "Nem megfelelő karakter van az erőforrásban."
 
-#: gajim/common/helpers.py:275
+#: gajim/common/helpers.py:281
 msgid "_Busy"
 msgstr "El_foglalt"
 
-#: gajim/common/helpers.py:277 gajim/gtk/tooltips.py:647
+#: gajim/common/helpers.py:283 gajim/gtk/tooltips.py:647
 msgid "Busy"
 msgstr "Elfoglalt"
 
-#: gajim/common/helpers.py:280
+#: gajim/common/helpers.py:286
 msgid "_Not Available"
 msgstr "_Nem elérhető"
 
-#: gajim/common/helpers.py:282 gajim/gtk/tooltips.py:649
+#: gajim/common/helpers.py:288 gajim/gtk/tooltips.py:649
 msgid "Not Available"
 msgstr "Nem elérhető"
 
-#: gajim/common/helpers.py:285
+#: gajim/common/helpers.py:291
 msgid "_Free for Chat"
 msgstr "_Ráér beszélgetni"
 
-#: gajim/common/helpers.py:287 gajim/gtk/tooltips.py:643
+#: gajim/common/helpers.py:293 gajim/gtk/tooltips.py:643
 msgid "Free for Chat"
 msgstr "Ráér beszélgetni"
 
-#: gajim/common/helpers.py:290
+#: gajim/common/helpers.py:296
 msgid "?user status:_Available"
 msgstr "_Elérhető"
 
-#: gajim/common/helpers.py:292 gajim/gtk/tooltips.py:641
+#: gajim/common/helpers.py:298 gajim/gtk/tooltips.py:641
 msgid "?user status:Available"
 msgstr "Elérhető"
 
-#: gajim/common/helpers.py:294
+#: gajim/common/helpers.py:300
 msgid "Connecting"
 msgstr "Csatlakozás"
 
-#: gajim/common/helpers.py:297 gajim/data/gui/preferences_window.ui:1251
+#: gajim/common/helpers.py:303 gajim/data/gui/preferences_window.ui:1251
 msgid "A_way"
 msgstr "_Távol"
 
-#: gajim/common/helpers.py:299 gajim/common/modules/adhoc_commands.py:120
-#: gajim/command_system/implementation/standard.py:139
+#: gajim/common/helpers.py:305 gajim/common/modules/adhoc_commands.py:120
+#: gajim/command_system/implementation/standard.py:141
 #: gajim/gtk/tooltips.py:645
 msgid "Away"
 msgstr "Távol"
 
-#: gajim/common/helpers.py:302
+#: gajim/common/helpers.py:308
 msgid "_Offline"
 msgstr "_Kijelentkezett"
 
-#: gajim/common/helpers.py:304 gajim/gtk/tooltips.py:651
+#: gajim/common/helpers.py:310 gajim/gtk/tooltips.py:651
 msgid "Offline"
 msgstr "Kijelentkezett"
 
-#: gajim/common/helpers.py:307
+#: gajim/common/helpers.py:313
 msgid "_Invisible"
 msgstr "_Láthatatlan"
 
-#: gajim/common/helpers.py:313
+#: gajim/common/helpers.py:319
 msgid "?contact has status:Unknown"
 msgstr "Ismeretlen"
 
-#: gajim/common/helpers.py:315
+#: gajim/common/helpers.py:321
 msgid "?contact has status:Has errors"
 msgstr "Hibái vannak"
 
-#: gajim/common/helpers.py:330
+#: gajim/common/helpers.py:336
 msgid "?Subscription we already have:None"
 msgstr "Nincs"
 
-#: gajim/common/helpers.py:332
+#: gajim/common/helpers.py:338
 msgid "To"
 msgstr "neki"
 
-#: gajim/common/helpers.py:334 gajim/data/gui/groups_post_window.ui:33
+#: gajim/common/helpers.py:340 gajim/data/gui/groups_post_window.ui:33
 msgid "From"
 msgstr "Feladó"
 
-#: gajim/common/helpers.py:336
+#: gajim/common/helpers.py:342
 msgid "Both"
 msgstr "mindkét"
 
-#: gajim/common/helpers.py:338 gajim/gtk/server_info.py:151
+#: gajim/common/helpers.py:344 gajim/gtk/server_info.py:151
 #, fuzzy
 msgid "Unknown"
 msgstr "Ismeretlen"
 
-#: gajim/common/helpers.py:344
+#: gajim/common/helpers.py:350
 msgid "?Ask (for Subscription):None"
 msgstr "Egyik sem"
 
-#: gajim/common/helpers.py:346
+#: gajim/common/helpers.py:352
 msgid "Subscribe"
 msgstr "Feliratkozás"
 
-#: gajim/common/helpers.py:355
+#: gajim/common/helpers.py:361
 msgid "?Group Chat Contact Role:None"
 msgstr "Nincs"
 
-#: gajim/common/helpers.py:358
+#: gajim/common/helpers.py:364
 msgid "Moderators"
 msgstr "Moderátorok"
 
-#: gajim/common/helpers.py:360
+#: gajim/common/helpers.py:366
 msgid "Moderator"
 msgstr "Moderátor"
 
-#: gajim/common/helpers.py:363
+#: gajim/common/helpers.py:369 gajim/data/gui/groupchat_info_scrolled.ui:243
 msgid "Participants"
 msgstr "Résztvevők"
 
-#: gajim/common/helpers.py:365
+#: gajim/common/helpers.py:371
 msgid "Participant"
 msgstr "Résztvevő"
 
-#: gajim/common/helpers.py:368
+#: gajim/common/helpers.py:374
 msgid "Visitors"
 msgstr "Látogatók"
 
-#: gajim/common/helpers.py:370
+#: gajim/common/helpers.py:376
 msgid "Visitor"
 msgstr "Látogató"
 
-#: gajim/common/helpers.py:376 gajim/gtk/tooltips.py:253
+#: gajim/common/helpers.py:382 gajim/gtk/tooltips.py:253
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "Nincs"
 
-#: gajim/common/helpers.py:378 gajim/data/gui/groupchat_config.ui:32
+#: gajim/common/helpers.py:384 gajim/data/gui/groupchat_config.ui:32
 #: gajim/gtk/tooltips.py:259
 msgid "Owner"
 msgstr "Tulajdonos"
 
-#: gajim/common/helpers.py:380 gajim/gtk/tooltips.py:257
+#: gajim/common/helpers.py:386 gajim/gtk/tooltips.py:257
 msgid "Administrator"
 msgstr "Adminisztrátor"
 
-#: gajim/common/helpers.py:382 gajim/data/gui/groupchat_config.ui:40
+#: gajim/common/helpers.py:388 gajim/data/gui/groupchat_config.ui:40
 #: gajim/gtk/tooltips.py:255 gajim/gtk/groupchat_config.py:105
 msgid "Member"
 msgstr "Tag"
 
-#: gajim/common/helpers.py:421
+#: gajim/common/helpers.py:427
 msgid "is paying attention to the conversation"
 msgstr "figyeli a beszélgetést"
 
-#: gajim/common/helpers.py:423
+#: gajim/common/helpers.py:429
 msgid "is doing something else"
 msgstr "valami mást csinál"
 
-#: gajim/common/helpers.py:425
+#: gajim/common/helpers.py:431
 #, fuzzy
 msgid "is composing a message…"
 msgstr "üzenetet fogalmaz..."
 
-#: gajim/common/helpers.py:428
+#: gajim/common/helpers.py:434
 msgid "paused composing a message"
 msgstr "üzenetet fogalmaz, de nem gépel"
 
-#: gajim/common/helpers.py:430
+#: gajim/common/helpers.py:436
 msgid "has closed the chat window or tab"
 msgstr "bezárta a beszélgetőablakot, vagy fület"
 
-#: gajim/common/helpers.py:936 gajim/common/helpers.py:943
+#: gajim/common/helpers.py:942 gajim/common/helpers.py:949
 #, 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:950
+#: gajim/common/helpers.py:956
 #, fuzzy, python-format
-msgid "from room %s"
-msgstr " szobából %s"
+msgid "from group chat %s"
+msgstr "_csoportos beszélgetésekben"
 
-#: gajim/common/helpers.py:953 gajim/common/helpers.py:970
+#: gajim/common/helpers.py:959 gajim/common/helpers.py:976
 #, fuzzy, python-format
 msgid "from user %s"
 msgstr " felhasználótól %s"
 
-#: gajim/common/helpers.py:955
+#: gajim/common/helpers.py:961
 #, fuzzy, python-format
 msgid "from %s"
 msgstr " tól/től %s"
 
-#: gajim/common/helpers.py:962 gajim/common/helpers.py:968
+#: gajim/common/helpers.py:968 gajim/common/helpers.py:974
 #, 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:986 gajim/common/helpers.py:998
+#: gajim/common/helpers.py:992 gajim/common/helpers.py:1004
 #: gajim/data/gui/roster_window.ui:85 data/org.gajim.Gajim.desktop.in:4
 #: data/org.gajim.Gajim.appdata.xml.in:9
 msgid "Gajim"
 msgstr "Gajim"
 
-#: gajim/common/helpers.py:1000
+#: gajim/common/helpers.py:1006
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: gajim/common/helpers.py:1109 gajim/data/gui/add_new_contact_window.ui:25
+#: gajim/common/helpers.py:1115 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:1111
+#: gajim/common/helpers.py:1117
 msgid "Hello, I am $name."
 msgstr "Szia! Én $name vagyok."
 
-#: gajim/common/helpers.py:1215 gajim/common/helpers.py:1224
-#: gajim/common/helpers.py:1282
+#: gajim/common/helpers.py:1221 gajim/common/helpers.py:1230
+#: gajim/common/helpers.py:1288
 msgid "Timeout loading image"
 msgstr "Időtúllépés a kép betöltése közben"
 
-#: gajim/common/helpers.py:1234 gajim/common/helpers.py:1280
+#: gajim/common/helpers.py:1240 gajim/common/helpers.py:1286
 msgid "Image is too big"
 msgstr "Túl nagy a kép"
 
-#: gajim/common/helpers.py:1245
+#: gajim/common/helpers.py:1251
 #, fuzzy
 msgid "PyCURL is not installed"
 msgstr "CRL még nem érvényes"
 
-#: gajim/common/helpers.py:1284
+#: gajim/common/helpers.py:1290
 #, fuzzy
 msgid "Error loading image"
 msgstr "Időtúllépés a kép betöltése közben"
@@ -5672,7 +5777,8 @@ msgstr "Az állapot megváltozott."
 
 #: gajim/common/modules/adhoc_commands.py:202
 #: gajim/common/modules/adhoc_commands.py:239
-msgid "Leave Groupchats"
+#, fuzzy
+msgid "Leave Group Chats"
 msgstr "Csoportos beszélgetések elhagyása"
 
 #: gajim/common/modules/adhoc_commands.py:228
@@ -5681,15 +5787,18 @@ msgid "%(nickname)s on %(room_jid)s"
 msgstr "%(nickname)s on %(room_jid)s"
 
 #: gajim/common/modules/adhoc_commands.py:232
-msgid "You have not joined a groupchat."
+#, fuzzy
+msgid "You have not joined a group chat."
 msgstr "Nem csatlakoztál a csoportos beszélgetéshez."
 
 #: gajim/common/modules/adhoc_commands.py:240
-msgid "Choose the groupchats you want to leave"
+#, fuzzy
+msgid "Choose the group chats you want to leave"
 msgstr "Válaszd ki a csoportos beszélgetéseket amelyeket el szeretnél hagyni"
 
 #: gajim/common/modules/adhoc_commands.py:289
-msgid "You left the following groupchats:"
+#, fuzzy
+msgid "You left the following group chats:"
 msgstr "Elhagytad a következő csoportos beszélgetéseket:"
 
 #: gajim/common/modules/roster_item_exchange.py:102
@@ -5705,7 +5814,7 @@ msgstr "Elküldött partnerek:"
 msgid "Blocked Contacts"
 msgstr "Letiltott Partnerek"
 
-#: gajim/data/gui/destroy_muc_dialog.ui:79 gajim/gtk/dialogs.py:736
+#: gajim/data/gui/destroy_muc_dialog.ui:79 gajim/gtk/dialogs.py:563
 msgid "Destroy this group chat permanently?"
 msgstr ""
 
@@ -5714,7 +5823,7 @@ msgstr ""
 msgid "Reason..."
 msgstr "Indok"
 
-#: gajim/data/gui/destroy_muc_dialog.ui:124 gajim/gtk/dialogs.py:738
+#: gajim/data/gui/destroy_muc_dialog.ui:124 gajim/gtk/dialogs.py:565
 msgid "Where participants should go (optional)"
 msgstr ""
 
@@ -5727,35 +5836,6 @@ msgstr ""
 msgid "_Reason and alternate venue (optional)"
 msgstr "Ha szeretnél, beírhatsz egy alternatív értéket:"
 
-#: gajim/data/gui/advanced_configuration_window.ui:7
-#: gajim/data/gui/preferences_window.ui:2723
-#, fuzzy
-msgid "Advanced Configuration Editor (ACE)"
-msgstr "Bővített Konfiguráció Szerkesztő"
-
-#: gajim/data/gui/advanced_configuration_window.ui:52
-#, fuzzy
-msgid "You should restart Gajim for some changes to take effect"
-msgstr ""
-"<b>MEGJEGYZÉS:</b> Ahhoz hogy minden módosítás életbeléphessen, újra kell "
-"indítani a Gajim-ot"
-
-#: gajim/data/gui/advanced_configuration_window.ui:84
-#, fuzzy
-msgid "_Filter"
-msgstr "Szűrés:"
-
-#: gajim/data/gui/advanced_configuration_window.ui:153
-#: gajim/data/gui/filetransfers_send_file_dialog.ui:15
-#: gajim/gtk/discovery.py:1666
-msgid "Description"
-msgstr "Leírás"
-
-#: gajim/data/gui/advanced_configuration_window.ui:197
-#, fuzzy
-msgid "_Reset to default"
-msgstr "_Alapértelmezett színek visszaállítása"
-
 #: gajim/data/gui/join_groupchat_window.ui:56
 #: gajim/data/gui/chat_to_muc_window.ui:67
 #: gajim/data/gui/chat_to_muc_window.ui:78
@@ -5767,9 +5847,8 @@ msgid "Join group chat every time Gajim is started"
 msgstr ""
 
 #: gajim/data/gui/join_groupchat_window.ui:113
-#, fuzzy
-msgid "Auto Join"
-msgstr "Automatikus csatlakozás"
+msgid "Join Automatically"
+msgstr ""
 
 #: gajim/data/gui/join_groupchat_window.ui:131
 #: gajim/data/gui/profile_window.ui:233
@@ -5778,10 +5857,11 @@ msgstr "Fiók"
 
 #: gajim/data/gui/join_groupchat_window.ui:147
 #, fuzzy
-msgid "Room"
-msgstr "Szoba:"
+msgid "Group chat"
+msgstr "Csoportos beszélgetések"
 
-#: gajim/data/gui/join_groupchat_window.ui:180 gajim/gtk/accounts.py:886
+#: gajim/data/gui/join_groupchat_window.ui:180 gajim/data/gui/bookmarks.ui:158
+#: gajim/gtk/accounts.py:889
 #, fuzzy
 msgid "Password"
 msgstr "Jelszó:"
@@ -5805,92 +5885,11 @@ 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:1271
+#: gajim/data/gui/join_groupchat_window.ui:437 gajim/gtk/discovery.py:1270
 #, fuzzy
 msgid "Join"
 msgstr "_Csatlakozás"
 
-#: gajim/data/gui/manage_proxies_window.ui:12
-msgid "HTTP Connect"
-msgstr "HTTP Csatlakozás"
-
-#: gajim/data/gui/manage_proxies_window.ui:15
-msgid "SOCKS5"
-msgstr "SOCKS5"
-
-#: gajim/data/gui/manage_proxies_window.ui:18
-msgid "BOSH"
-msgstr "BOSH"
-
-#: gajim/data/gui/manage_proxies_window.ui:27
-#, fuzzy
-msgid "Manage Proxy Profiles"
-msgstr "Manage Proxy Profiles"
-
-#: gajim/data/gui/manage_proxies_window.ui:83
-#, fuzzy
-msgid "Add Proxy"
-msgstr "Prox_y:"
-
-#: gajim/data/gui/manage_proxies_window.ui:97
-#, fuzzy
-msgid "Remove Proxy"
-msgstr "Remove Group"
-
-#: gajim/data/gui/manage_proxies_window.ui:141
-#, fuzzy
-msgid "Properties"
-msgstr "<b>Tulajdonságok</b>"
-
-#: gajim/data/gui/manage_proxies_window.ui:157
-#, fuzzy
-msgid "_Name"
-msgstr "_Név:"
-
-#: gajim/data/gui/manage_proxies_window.ui:173
-#, fuzzy
-msgid "_Type"
-msgstr "_Típus:"
-
-#: gajim/data/gui/manage_proxies_window.ui:236
-#, fuzzy
-msgid "_BOSH URL"
-msgstr "_BOSH URL:"
-
-#: gajim/data/gui/manage_proxies_window.ui:261
-msgid "Use HTTP prox_y"
-msgstr "HTTP prox_y használata"
-
-#: gajim/data/gui/manage_proxies_window.ui:280
-#, fuzzy
-msgid "Proxy _Host"
-msgstr "Proxy _Hoszt:"
-
-#: gajim/data/gui/manage_proxies_window.ui:307
-#, fuzzy
-msgid "Proxy _Port"
-msgstr "Proxy _Port:"
-
-#: gajim/data/gui/manage_proxies_window.ui:334
-#, fuzzy
-msgid "_Username"
-msgstr "_Felhasználónév:"
-
-#: gajim/data/gui/manage_proxies_window.ui:347
-#, fuzzy
-msgid "Use proxy auth_entication"
-msgstr "Use proxy auth_entication"
-
-#: gajim/data/gui/manage_proxies_window.ui:377
-#, fuzzy
-msgid "Pass_word"
-msgstr "Jel_szó:"
-
-#: gajim/data/gui/manage_proxies_window.ui:405 gajim/gtk/adhoc.py:321
-#, fuzzy
-msgid "Settings"
-msgstr "Regisztráció nem sikerült"
-
 #: gajim/data/gui/change_password_dialog.ui:17
 #, fuzzy
 msgid "New Password"
@@ -5921,11 +5920,13 @@ msgid "Status:"
 msgstr "Állapot:"
 
 #: gajim/data/gui/zeroconf_information_window.ui:89
-msgid "_Log conversation history"
+#, fuzzy
+msgid "_Store conversation history"
 msgstr "Beszélgetés _naplózása"
 
 #: gajim/data/gui/zeroconf_information_window.ui:215
 #: gajim/data/gui/vcard_information_window.ui:390
+#: gajim/data/gui/groupchat_info_scrolled.ui:166
 msgid "Contact"
 msgstr "Partner"
 
@@ -5938,8 +5939,9 @@ msgid "Last Name:"
 msgstr "Keresztnév:"
 
 #: gajim/data/gui/zeroconf_information_window.ui:260
-msgid "Jabber ID:"
-msgstr "Jabber Azonosító:"
+#, fuzzy
+msgid "XMPP Address:"
+msgstr "AIM cím:"
 
 #: gajim/data/gui/zeroconf_information_window.ui:273
 msgid "E-Mail:"
@@ -5960,8 +5962,8 @@ msgstr "_File Küldése"
 
 #: gajim/data/gui/gc_occupants_menu.ui:29
 #, fuzzy
-msgid "Occupant Actions"
-msgstr "Occupant Actions"
+msgid "Participant Actions"
+msgstr "Résztvevők"
 
 #: gajim/data/gui/gc_occupants_menu.ui:38
 msgid "_Voice"
@@ -5992,8 +5994,9 @@ msgid "_Ban"
 msgstr "_Ban"
 
 #: gajim/data/gui/gc_occupants_menu.ui:124
-msgid "_Add to Roster"
-msgstr "_Hozzáadás a Főablakhoz"
+#, fuzzy
+msgid "_Add to Contact List"
+msgstr "_Ismerős hozzáadása..."
 
 #: gajim/data/gui/gc_occupants_menu.ui:132
 #, fuzzy
@@ -6033,11 +6036,6 @@ msgstr "Feliratkozás:"
 msgid "_Status"
 msgstr "_Állapot"
 
-#: gajim/data/gui/zeroconf_context_menu.ui:26
-#: gajim/data/gui/account_context_menu.ui:79
-msgid "_Modify Account..."
-msgstr "Fiók _módosítása..."
-
 #: gajim/data/gui/certificate_dialog.ui:66
 #: gajim/data/gui/certificate_dialog.ui:178
 msgid "Common Name (CN)"
@@ -6119,13 +6117,19 @@ msgstr "Utoljára módosítva:"
 msgid "Next entry"
 msgstr ""
 
+#: gajim/data/gui/filetransfers_send_file_dialog.ui:15
+#: gajim/data/gui/advanced_configuration.ui:143
+#: gajim/data/gui/groupchat_info_scrolled.ui:48 gajim/gtk/discovery.py:1663
+msgid "Description"
+msgstr "Leírás"
+
 #: gajim/data/gui/filetransfers_send_file_dialog.ui:54
 #, fuzzy
 msgid "_Send Files"
 msgstr "_File Küldése"
 
 #: gajim/data/gui/filetransfers_send_file_dialog.ui:58
-#: gajim/gtk/xml_console.py:90
+#: gajim/gtk/xml_console.py:87
 #, fuzzy
 msgid "Send"
 msgstr "_Küld"
@@ -6150,20 +6154,23 @@ msgid "Change _Nickname..."
 msgstr "Becenév _megváltoztatása..."
 
 #: gajim/data/gui/gc_control_popup_menu.ui:20
-msgid "_Manage Room"
-msgstr "Szoba _Kezelése"
+#, fuzzy
+msgid "_Manage Group Chat"
+msgstr "Ú_j közös társalgás"
 
 #: gajim/data/gui/gc_control_popup_menu.ui:31
 msgid "Change _Subject..."
 msgstr "_Beszélgetőtéma megváltoztatása..."
 
 #: gajim/data/gui/gc_control_popup_menu.ui:38
-msgid "Configure _Room..."
-msgstr "_Szoba Beállítása..."
+#, fuzzy
+msgid "Configure _Group Chat..."
+msgstr "_Csatlakozás közös beszélgetéshez..."
 
 #: gajim/data/gui/gc_control_popup_menu.ui:52
-msgid "_Destroy Room"
-msgstr "Szoba _törlése"
+#, fuzzy
+msgid "_Destroy Group Chat"
+msgstr "Ú_j közös társalgás"
 
 #: gajim/data/gui/gc_control_popup_menu.ui:64
 msgid "_Minimize on close"
@@ -6174,7 +6181,7 @@ msgstr "_Tálcára helyezés bezáráskor"
 msgid "_Request Voice"
 msgstr "_Hang"
 
-#: gajim/data/gui/gc_control_popup_menu.ui:99 gajim/gtk/discovery.py:1704
+#: gajim/data/gui/gc_control_popup_menu.ui:99
 msgid "_Bookmark"
 msgstr "_Könyvjelző"
 
@@ -6226,13 +6233,6 @@ msgstr "<b>Weboldal:</b>"
 msgid "E-Mail"
 msgstr "E-Mail:"
 
-#: 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/blocking_list.ui:115 gajim/gtk/add_contact.py:30
-#: gajim/gtk/accounts.py:801
-msgid "Jabber ID"
-msgstr "Jabber Azonosító"
-
 #: gajim/data/gui/profile_window.ui:440
 msgid "Main"
 msgstr ""
@@ -6365,36 +6365,42 @@ msgstr "Munka"
 msgid "About"
 msgstr "Magamról"
 
-#: gajim/data/gui/start_chat_dialog.ui:114 gajim/gtk/discovery.py:1658
-msgid "Users"
-msgstr "Felhasználók"
-
-#: gajim/data/gui/start_chat_dialog.ui:185
+#: gajim/data/gui/start_chat_dialog.ui:53
 #, fuzzy
-msgid "Name:"
-msgstr "Név: "
+msgid "Global Group Chat Search"
+msgstr "Csatlakozás Csoportos Beszélgetéshez"
 
-#: gajim/data/gui/start_chat_dialog.ui:197
+#: 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
-msgid "Description:"
-msgstr "Leírás: "
+msgid "_Back"
+msgstr "Nemsokára vagyok"
+
+#: gajim/data/gui/start_chat_dialog.ui:245
+#: gajim/data/gui/groupchat_control.ui:796
+#: gajim/data/gui/groupchat_control.ui:888 gajim/gtk/discovery.py:1701
+#: gajim/gtk/groupchat_join.py:62
+msgid "_Join"
+msgstr "_Csatlakozás"
 
-#: gajim/data/gui/start_chat_dialog.ui:209
+#: gajim/data/gui/start_chat_dialog.ui:289
 #, fuzzy
-msgid "Address:"
-msgstr "_Cím:"
+msgid "Select Account"
+msgstr "%s fiók törlése"
 
-#: gajim/data/gui/start_chat_dialog.ui:246
-msgid ""
-"Semi-Anonymous\n"
-"<span size=\"small\">(Only moderators can see your XMPP-Address)</span>"
+#: gajim/data/gui/start_chat_dialog.ui:380
+msgid "_Select"
 msgstr ""
 
 #: gajim/data/gui/filetransfers.ui:21
 msgid "Pa_use/Resume"
 msgstr ""
 
-#: gajim/data/gui/filetransfers.ui:30 gajim/gtk/filechoosers.py:178
+#: gajim/data/gui/filetransfers.ui:30 gajim/data/gui/groupchat_control.ui:575
+#: gajim/data/gui/groupchat_control.ui:667
+#: gajim/data/gui/groupchat_control.ui:779
+#: gajim/data/gui/groupchat_control.ui:871 gajim/gtk/filechoosers.py:178
 msgid "_Cancel"
 msgstr "_Mégse"
 
@@ -6437,7 +6443,7 @@ msgstr "Cancels the selected file transfer and removes incomplete file"
 
 #: gajim/data/gui/filetransfers.ui:207
 #, fuzzy
-msgid "Shows a list of file transfers between you and others"
+msgid "Shows a list of file transfers between you and your contacts"
 msgstr "Shows a list of file transfers between you and others"
 
 #: gajim/data/gui/groupchat_control.ui:13 gajim/data/gui/chat_control.ui:277
@@ -6457,7 +6463,6 @@ msgid "Strike"
 msgstr "Áthúzás"
 
 #: gajim/data/gui/groupchat_control.ui:54 gajim/data/gui/chat_control.ui:318
-#: gajim/gtk/advanced_config.py:86
 msgid "Color"
 msgstr "Szín"
 
@@ -6470,15 +6475,45 @@ msgstr "Betűtípus"
 msgid "Clear formatting"
 msgstr "Formázás törlése"
 
-#: gajim/data/gui/groupchat_control.ui:290 gajim/data/gui/chat_control.ui:880
+#: gajim/data/gui/groupchat_control.ui:291 gajim/data/gui/chat_control.ui:880
 #, fuzzy
 msgid "Choose encryption"
 msgstr "Válasszon kliens tanusítványt"
 
-#: gajim/data/gui/groupchat_control.ui:336 gajim/data/gui/chat_control.ui:640
+#: gajim/data/gui/groupchat_control.ui:337 gajim/data/gui/chat_control.ui:640
 msgid "Show a list of emojis (Alt+M)"
 msgstr ""
 
+#: gajim/data/gui/groupchat_control.ui:484
+#, fuzzy
+msgid "Joining…"
+msgstr "Bannolás..."
+
+#: gajim/data/gui/groupchat_control.ui:496
+msgid "_Abort"
+msgstr ""
+
+#: gajim/data/gui/groupchat_control.ui:542
+#, fuzzy
+msgid "Enter new nickname"
+msgstr "Enter a new nickname for contact %s"
+
+#: gajim/data/gui/groupchat_control.ui:592
+#: gajim/data/gui/groupchat_control.ui:684
+#, fuzzy
+msgid "Ch_ange"
+msgstr "Becenév _megváltoztatása..."
+
+#: gajim/data/gui/groupchat_control.ui:761
+#, fuzzy
+msgid "Enter password"
+msgstr "Írja be az új jelszót:"
+
+#: gajim/data/gui/groupchat_control.ui:1067
+#, fuzzy
+msgid "_Try again"
+msgstr "Újra hitelesít..."
+
 #: gajim/data/gui/popup_notification_window.ui:42
 msgid "Event Type"
 msgstr "Esemény típusa"
@@ -6557,8 +6592,8 @@ msgstr "Mindig"
 
 #: gajim/data/gui/mam_preferences.ui:18
 #, fuzzy
-msgid "Roster"
-msgstr "Névsor mutatása"
+msgid "Contact List"
+msgstr "Partnerek"
 
 #: gajim/data/gui/mam_preferences.ui:22
 #: gajim/data/gui/preferences_window.ui:123
@@ -6582,12 +6617,12 @@ msgid "Add"
 msgstr "Hozzáad"
 
 #: gajim/data/gui/mam_preferences.ui:194 gajim/data/gui/groupchat_config.ui:151
-#: gajim/gtk/dialogs.py:63 gajim/gtk/accounts.py:381
+#: gajim/gtk/dialogs.py:62 gajim/gtk/accounts.py:384
 #, fuzzy
 msgid "Remove"
 msgstr "_Eltávolítás"
 
-#: gajim/data/gui/vcard_information_window.ui:72 gajim/gtk/accounts.py:753
+#: gajim/data/gui/vcard_information_window.ui:72 gajim/gtk/accounts.py:756
 #, fuzzy
 msgid "Resource"
 msgstr "Erőforrás:"
@@ -6639,6 +6674,7 @@ msgstr "Feliratkozás:"
 #: gajim/data/gui/vcard_information_window.ui:974
 #: gajim/data/gui/vcard_information_window.ui:993
 #: gajim/data/gui/vcard_information_window.ui:1427
+#: gajim/data/gui/groupchat_info_scrolled.ui:222
 msgid "button"
 msgstr ""
 
@@ -6668,15 +6704,18 @@ msgid "Notify me about it"
 msgstr "Figyelmeztessen róla"
 
 #: gajim/data/gui/preferences_window.ui:58
-msgid "Show only in roster"
-msgstr "Csak a főablakban jelenítse meg"
+#, fuzzy
+msgid "Show only in contact list"
+msgstr "Csak az _aktív partnereket mutassa"
 
 #: gajim/data/gui/preferences_window.ui:69
-msgid "Detached roster with detached chats"
+#, fuzzy
+msgid "Detached contact list with detached chats"
 msgstr "Külön főablak külön beszélgetőablakokkal"
 
 #: gajim/data/gui/preferences_window.ui:72
-msgid "Detached roster with single chat"
+#, fuzzy
+msgid "Detached contact list with single chat"
 msgstr "Külön főablak egy közös beszélgetőablakkal"
 
 #: gajim/data/gui/preferences_window.ui:75
@@ -6684,11 +6723,13 @@ msgid "Single window for everything"
 msgstr "Egy ablak mindenre"
 
 #: gajim/data/gui/preferences_window.ui:78
-msgid "Detached roster with chat grouped by account"
+#, fuzzy
+msgid "Detached contact list with chat grouped by account"
 msgstr "Külön főablak fiók szerint csoportosított beszélgetésekkel"
 
 #: gajim/data/gui/preferences_window.ui:81
-msgid "Detached roster with chat grouped by type"
+#, fuzzy
+msgid "Detached contact list with chat grouped by type"
 msgstr "Külön főablak típus szerint csoportosított beszélgetésekkel"
 
 #: gajim/data/gui/preferences_window.ui:92
@@ -6740,7 +6781,7 @@ msgstr "_Ablak viselkedés:"
 
 #: gajim/data/gui/preferences_window.ui:296
 #, fuzzy
-msgid "_Show roster on startup"
+msgid "_Show contact list on startup"
 msgstr "C_satlakozás a Gajim indításával"
 
 #: gajim/data/gui/preferences_window.ui:311
@@ -6756,12 +6797,12 @@ msgid "_Tabs placement"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:363
-msgid "_Quit Gajim when closing roster window"
+msgid "_Quit Gajim when closing contact list"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:367
 msgid ""
-"If enabled, Gajim will quit when closing the roster window instead of "
+"If enabled, Gajim will quit when closing the contact list window instead of "
 "minimizing to the system's notification area"
 msgstr ""
 
@@ -6771,41 +6812,42 @@ msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:423
 #, fuzzy
-msgid "Show a_vatars of contacts in roster"
+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
 #, fuzzy
 msgid ""
-"If checked, avatars of contacts will be shown in the roster window and in "
-"group chats"
+"If checked, avatars of contacts will be shown in the contact list window and "
+"in group chats"
 msgstr ""
 "If ticked, Gajim will display avatars of contacts in roster window and in "
 "group chats"
 
 #: gajim/data/gui/preferences_window.ui:441
 #, fuzzy
-msgid "Show status _messages of contacts in roster"
+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
 #, fuzzy
 msgid ""
 "If checked, status messages of contacts will be shown under the contact's "
-"name, in the roster window, and in group chats"
+"name, in the contact list window, and in group chats"
 msgstr ""
 "If ticked, Gajim will display status messages of contacts under the contact "
 "name in roster window and in group chats"
 
 #: gajim/data/gui/preferences_window.ui:459
 #, fuzzy
-msgid "Show e_xtra information of contacts in roster (mood, activity, ...)"
+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
 msgid ""
-"If checked, additional info published by the contact will be shown in "
-"roster. Additional infos (published via PEP) may include e.g. mood, "
+"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 ""
 
@@ -6814,8 +6856,9 @@ msgid "Sort contacts by status"
 msgstr "Partnerek állapot szerinti rendezése"
 
 #: gajim/data/gui/preferences_window.ui:494
-msgid "in _roster"
-msgstr "_főablakban"
+#, fuzzy
+msgid "in _contact list"
+msgstr "Elküldött partnerek:"
 
 #: gajim/data/gui/preferences_window.ui:511
 msgid "in _group chats"
@@ -6823,8 +6866,8 @@ msgstr "_csoportos beszélgetésekben"
 
 #: gajim/data/gui/preferences_window.ui:540
 #, fuzzy
-msgid "Roster Appearance"
-msgstr "<b>Főablak kinézete</b>"
+msgid "Contact List Appearance"
+msgstr "Névsor elem cseréje"
 
 #: gajim/data/gui/preferences_window.ui:585
 #, fuzzy
@@ -6890,7 +6933,7 @@ msgstr "Nem sikerült csatlakozni közös beszélgetéshez"
 
 #: gajim/data/gui/preferences_window.ui:660
 #, fuzzy
-msgid "If checked, the room subject will be shown when joining a group chat"
+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:682
@@ -6905,13 +6948,13 @@ msgstr ""
 #: gajim/data/gui/preferences_window.ui:701
 msgid ""
 "If join/leave status messages are shown in the group chat. This setting can "
-"be overridden in the groupchat menu."
+"be overridden in the group chat menu."
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:720
 msgid ""
 "The default sync threshold for new public group chats. This setting can be "
-"overridden in the groupchat menu."
+"overridden in the group chat menu."
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:722
@@ -6926,7 +6969,7 @@ msgstr "_Log status changes of contacts"
 #: gajim/data/gui/preferences_window.ui:768
 msgid ""
 "If status change messages are shown in the group chat. This setting can be "
-"overridden in the groupchat menu."
+"overridden in the group chat menu."
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:825
@@ -6945,8 +6988,8 @@ msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:843
 #, fuzzy
-msgid "Show chatstate in roster"
-msgstr "Partnerek a_vatarjainak megjelenítése a főablakban"
+msgid "Show chatstate in contact list"
+msgstr "Mutassa a bezárás gombot a füleken?"
 
 #: gajim/data/gui/preferences_window.ui:847
 msgid ""
@@ -7260,7 +7303,7 @@ msgstr "Videó mérete"
 msgid "Vi_ew own video source"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2281 gajim/gtk/accounts.py:352
+#: gajim/data/gui/preferences_window.ui:2281 gajim/gtk/accounts.py:355
 msgid "Connection"
 msgstr "Kapcsolat"
 
@@ -7318,7 +7361,8 @@ msgid "_Manage..."
 msgstr "_Kezelés..."
 
 #: gajim/data/gui/preferences_window.ui:2616
-msgid "_Log status changes of contacts"
+#, fuzzy
+msgid "_Store status changes of contacts in history"
 msgstr "_Log status changes of contacts"
 
 #: gajim/data/gui/preferences_window.ui:2633
@@ -7344,10 +7388,15 @@ msgstr ""
 msgid "_Open..."
 msgstr "_Megnyitás..."
 
+#: gajim/data/gui/preferences_window.ui:2723 gajim/gtk/advanced_config.py:84
+#, fuzzy
+msgid "Advanced Configuration Editor (ACE)"
+msgstr "Bővített Konfiguráció Szerkesztő"
+
 #: gajim/data/gui/groupchat_config.ui:55
 #, fuzzy
 msgid ""
-"<b>Jabber-ID</b>\n"
+"<b>XMPP Address</b>\n"
 "&lt;user@domain/resource&gt; (only that resource matches)\n"
 "&lt;user@domain&gt; (any resource matches)\n"
 "&lt;domain/resource&gt; (only that resource matches)\n"
@@ -7366,7 +7415,8 @@ msgstr ""
 msgid "Only Admins and Owners can modify the affiliation"
 msgstr ""
 
-#: gajim/data/gui/groupchat_config.ui:270 gajim/plugins/gui.py:312
+#: gajim/data/gui/groupchat_config.ui:270
+#: gajim/data/gui/groupchat_info_scrolled.ui:210 gajim/plugins/gui.py:324
 #, fuzzy
 msgid "Configuration"
 msgstr "Szoba Konfiguráció"
@@ -7399,7 +7449,7 @@ msgid "Start _Chat"
 msgstr "_Beszélgetés Indítása"
 
 #: gajim/data/gui/contact_context_menu.ui:20
-#: gajim/data/gui/systray_context_menu.ui:36
+#: gajim/data/gui/systray_context_menu.ui:29
 msgid "Send Single _Message..."
 msgstr "_Levél Küldése..."
 
@@ -7461,17 +7511,45 @@ msgid "_Ignore"
 msgstr "_Figyelmen kívül hagy"
 
 #: gajim/data/gui/contact_context_menu.ui:174
-msgid "_Add to Roster..."
-msgstr "_Hozzáad a Partnerlistához..."
+#, fuzzy
+msgid "_Add to Contact List..."
+msgstr "_Ismerős hozzáadása..."
+
+#: gajim/data/gui/advanced_configuration.ui:39
+#, fuzzy
+msgid "You should restart Gajim for some changes to take effect"
+msgstr ""
+"<b>MEGJEGYZÉS:</b> Ahhoz hogy minden módosítás életbeléphessen, újra kell "
+"indítani a Gajim-ot"
+
+#: gajim/data/gui/advanced_configuration.ui:71
+#, fuzzy
+msgid "_Filter"
+msgstr "Szűrés:"
+
+#: gajim/data/gui/advanced_configuration.ui:88
+msgid "Type to search for values..."
+msgstr ""
+
+#: gajim/data/gui/advanced_configuration.ui:180
+#, fuzzy
+msgid "_Reset Value"
+msgstr "_Alapértelmezett színek visszaállítása"
+
+#: gajim/data/gui/advanced_configuration.ui:185
+#, fuzzy
+msgid "Resets value to default"
+msgstr "_Alapértelmezett színek visszaállítása"
 
 #: gajim/data/gui/account_creation_wizard_window.ui:43
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim: Fiók Létrehozása Varázsló"
 
 #: gajim/data/gui/account_creation_wizard_window.ui:70
+#, fuzzy
 msgid ""
 "You need to have an account in order to connect\n"
-"to the Jabber network."
+"to the XMPP network."
 msgstr ""
 "Szüksége van egy fiókra, hogy csatlakozhasson\n"
 "a Jabber hálózatra."
@@ -7493,8 +7571,9 @@ msgid "<b>Please fill in the data for your existing account</b>"
 msgstr "<b>Kérem töltse ki az adatokat a már létező fiókjához</b>"
 
 #: gajim/data/gui/account_creation_wizard_window.ui:187
-msgid "_Jabber ID:"
-msgstr "_Jabber ID:"
+#, fuzzy
+msgid "_XMPP Address:"
+msgstr "AIM cím:"
 
 #: gajim/data/gui/account_creation_wizard_window.ui:239
 #: gajim/data/gui/account_creation_wizard_window.ui:394
@@ -7582,6 +7661,7 @@ msgid "Privacy Lists:"
 msgstr "Magánéleti listák:"
 
 #: gajim/data/gui/service_discovery_window.ui:111
+#: gajim/data/gui/groupchat_creation.ui:227
 #, fuzzy
 msgid "_Address"
 msgstr "_Cím:"
@@ -7599,11 +7679,6 @@ msgstr "Szonkronizálás : válassz partnereket"
 msgid "Select the contacts you want to synchronise"
 msgstr "Válaszd ki a partnereket akikkel szinkronizálni akarsz"
 
-#: gajim/data/gui/groupchat_invitation_received.ui:42
-#, fuzzy
-msgid "Group Chat Invitation"
-msgstr "Meghívó közös társalgásba"
-
 #: gajim/data/gui/groupchat_invitation_received.ui:111
 #, fuzzy
 msgid "Message..."
@@ -7654,11 +7729,10 @@ msgstr ""
 
 #: gajim/data/gui/add_new_contact_window.ui:84
 #, fuzzy
-msgid "_Jabber ID"
-msgstr "_Jabber ID:"
+msgid "_XMPP Address"
+msgstr "_Cím:"
 
 #: gajim/data/gui/add_new_contact_window.ui:100
-#: gajim/data/gui/manage_bookmarks_window.ui:192
 #, fuzzy
 msgid "_Nickname"
 msgstr "_Becenév:"
@@ -7736,7 +7810,7 @@ msgstr "<b>Hangulat:</b>"
 msgid "<b>Message:</b>"
 msgstr "<b>Üzenet:</b>"
 
-#: gajim/data/gui/plugins_window.ui:10 gajim/data/gui/application_menu.ui:90
+#: gajim/data/gui/plugins_window.ui:10 gajim/data/gui/application_menu.ui:87
 msgid "Plugins"
 msgstr ""
 
@@ -7843,10 +7917,6 @@ msgstr "Engedélyez"
 msgid "Deny"
 msgstr "Elutasít"
 
-#: gajim/data/gui/privacy_list_window.ui:317
-msgid "JabberID"
-msgstr "Jabber Azonosító"
-
 #: gajim/data/gui/privacy_list_window.ui:358
 msgid "all in the group"
 msgstr "összes a csoportban"
@@ -7888,7 +7958,7 @@ msgstr "Sorrend:"
 msgid "Manage sounds"
 msgstr "Partnerek _kezelése"
 
-#: gajim/data/gui/manage_sounds_window.ui:55 gajim/plugins/gui.py:100
+#: gajim/data/gui/manage_sounds_window.ui:55 gajim/plugins/gui.py:101
 msgid "Active"
 msgstr "Aktív"
 
@@ -7926,23 +7996,114 @@ msgstr "Fiók eltávolítása a Gajim-ból és a _szerverről is"
 msgid "_Personal Events"
 msgstr "Személyes _események"
 
-#: gajim/data/gui/account_context_menu.ui:35
-#: gajim/data/gui/systray_context_menu.ui:28
-msgid "Join _Group Chat"
-msgstr "Csatlakozás _Csoportos Társalgáshoz"
-
-#: gajim/data/gui/account_context_menu.ui:49
+#: gajim/data/gui/account_context_menu.ui:41
 msgid "_Add Contact..."
 msgstr "_Ismerős hozzáadása..."
 
-#: gajim/data/gui/account_context_menu.ui:57
+#: gajim/data/gui/account_context_menu.ui:49
 msgid "_Discover Services"
 msgstr "_Szolgáltatások felderítése"
 
-#: gajim/data/gui/account_context_menu.ui:65
+#: gajim/data/gui/account_context_menu.ui:57
 msgid "_Execute Command..."
 msgstr "_Parancs futtatása..."
 
+#: gajim/data/gui/account_context_menu.ui:65
+#, fuzzy
+msgid "_View Certificate"
+msgstr "Kliens tanusítvány"
+
+#: gajim/data/gui/manage_proxies.ui:12
+#, fuzzy
+msgctxt "proxy configuration"
+msgid "HTTP Connect"
+msgstr "HTTP Csatlakozás"
+
+#: gajim/data/gui/manage_proxies.ui:15
+#, fuzzy
+msgctxt "proxy configuration"
+msgid "SOCKS5"
+msgstr "SOCKS5"
+
+#: gajim/data/gui/manage_proxies.ui:18
+#, fuzzy
+msgctxt "proxy configuration"
+msgid "BOSH"
+msgstr "BOSH"
+
+#: gajim/data/gui/manage_proxies.ui:68
+#, fuzzy
+msgid "Add Proxy"
+msgstr "Prox_y:"
+
+#: gajim/data/gui/manage_proxies.ui:82
+#, fuzzy
+msgid "Remove Proxy"
+msgstr "Remove Group"
+
+#: gajim/data/gui/manage_proxies.ui:134
+#, fuzzy
+msgid "Pass_word"
+msgstr "Jel_szó:"
+
+#: gajim/data/gui/manage_proxies.ui:159
+#, fuzzy
+msgid "Use proxy auth_entication"
+msgstr "Use proxy auth_entication"
+
+#: gajim/data/gui/manage_proxies.ui:179
+#, fuzzy
+msgid "_Username"
+msgstr "_Felhasználónév:"
+
+#: gajim/data/gui/manage_proxies.ui:209
+#, fuzzy
+msgid "_Port"
+msgstr "_Port:"
+
+#: gajim/data/gui/manage_proxies.ui:226
+msgid "example.org"
+msgstr ""
+
+#: gajim/data/gui/manage_proxies.ui:240
+#, fuzzy
+msgid "_Host"
+msgstr "_Hostnév:"
+
+#: gajim/data/gui/manage_proxies.ui:254
+msgid "Use HTTP prox_y"
+msgstr "HTTP prox_y használata"
+
+#: gajim/data/gui/manage_proxies.ui:275
+msgid "https://example.org/http-bind/"
+msgstr ""
+
+#: gajim/data/gui/manage_proxies.ui:291
+#, fuzzy
+msgid "_BOSH URL"
+msgstr "_BOSH URL:"
+
+#: gajim/data/gui/manage_proxies.ui:309 gajim/gtk/adhoc.py:322
+#, fuzzy
+msgid "Settings"
+msgstr "Regisztráció nem sikerült"
+
+#: gajim/data/gui/manage_proxies.ui:344
+#, fuzzy
+msgid "_Type"
+msgstr "_Típus:"
+
+#: gajim/data/gui/manage_proxies.ui:361
+#: gajim/data/gui/groupchat_creation.ui:105
+#, fuzzy
+msgid "_Name"
+msgstr "_Név:"
+
+#: gajim/data/gui/manage_proxies.ui:391 gajim/gtk/accounts.py:742
+#, fuzzy
+msgid "Proxy"
+msgstr "Prox_y:"
+
 #: gajim/data/gui/application_menu.ui:8
 #, fuzzy
 msgid "View"
@@ -7950,8 +8111,8 @@ msgstr "_Nézet"
 
 #: gajim/data/gui/application_menu.ui:11
 #, fuzzy
-msgid "Show Roster"
-msgstr "Névsor mutatása"
+msgid "Show Contact List"
+msgstr "Csak az _aktív partnereket mutassa"
 
 #: gajim/data/gui/application_menu.ui:16
 #, fuzzy
@@ -7992,22 +8153,23 @@ msgstr ""
 msgid "Features"
 msgstr "Funkciók"
 
-#: gajim/data/gui/application_menu.ui:81
+#: gajim/data/gui/application_menu.ui:77
+#: gajim/data/gui/groupchat_creation.ui:81 gajim/gtk/groupchat_creation.py:45
 #, fuzzy
-msgid "Bookmarks"
-msgstr "_Könyvjelző"
+msgid "Create Group Chat"
+msgstr "Csoportos beszélgetések elhagyása"
 
-#: gajim/data/gui/application_menu.ui:94 gajim/data/gui/shortcuts_window.ui:189
-#: gajim/gtk/preferences.py:59
+#: gajim/data/gui/application_menu.ui:91 gajim/data/gui/shortcuts_window.ui:189
+#: gajim/gtk/preferences.py:58
 msgid "Preferences"
 msgstr "Beállítások"
 
-#: gajim/data/gui/application_menu.ui:99
+#: gajim/data/gui/application_menu.ui:96
 msgid "Quit"
 msgstr ""
 
 #: gajim/data/gui/httpupload_progress_dialog.ui:110
-#: gajim/gtk/filetransfer.py:121
+#: gajim/gtk/filetransfer.py:120
 msgid "Progress"
 msgstr "Állapot"
 
@@ -8024,52 +8186,33 @@ msgstr ""
 msgid "_Cancel Upload"
 msgstr "_Mégse"
 
-#: gajim/data/gui/manage_bookmarks_window.ui:13
-#, fuzzy
-msgid "Group Chat Bookmarks"
-msgstr "_Csoportos beszélgetés"
-
-#: gajim/data/gui/manage_bookmarks_window.ui:68
-#, fuzzy
-msgid "Add Bookmark"
-msgstr "_Könyvjelző"
-
-#: gajim/data/gui/manage_bookmarks_window.ui:82
-#, fuzzy
-msgid "Remove Bookmark"
-msgstr "_Könyvjelző"
+#: gajim/data/gui/groupchat_creation.ui:27
+msgid "Public or Private?"
+msgstr ""
 
-#: gajim/data/gui/manage_bookmarks_window.ui:126
-msgid "N_ame"
+#: 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 ""
 
-#: gajim/data/gui/manage_bookmarks_window.ui:145
-#, fuzzy
-msgid "Bookmark Name"
-msgstr "Szoba felvétele a _könyvjelzők közé"
+#: gajim/data/gui/groupchat_creation.ui:58
+msgid "<b>Public:</b> Anyone who knows the address can join."
+msgstr ""
 
-#: gajim/data/gui/manage_bookmarks_window.ui:160
+#: gajim/data/gui/groupchat_creation.ui:122
 #, fuzzy
-msgid "_Server"
-msgstr "_Szerver:"
+msgid "_Description"
+msgstr "Leírás"
 
-#: gajim/data/gui/manage_bookmarks_window.ui:223
-msgid "Roo_m"
+#: gajim/data/gui/groupchat_creation.ui:164
+msgid "_Public"
 msgstr ""
 
-#: gajim/data/gui/manage_bookmarks_window.ui:253
-#, fuzzy
-msgid "_Password"
-msgstr "_Jelszó:"
-
-#: gajim/data/gui/manage_bookmarks_window.ui:299
+#: gajim/data/gui/groupchat_creation.ui:278
 #, fuzzy
-msgid "Join chat when connected"
-msgstr "Partner lecsatlakozott"
-
-#: gajim/data/gui/manage_bookmarks_window.ui:307
-msgid "_Join Automatically"
-msgstr ""
+msgid "_Account"
+msgstr "_Fiókok"
 
 #: gajim/data/gui/exception_dialog.ui:49
 msgid "Sorry, that should not have happened"
@@ -8114,6 +8257,29 @@ msgstr "Partner engedélyezése, hogy lássa a csatlakozásod"
 msgid "Presets"
 msgstr "_Jelenlét"
 
+#: gajim/data/gui/groupchat_info_scrolled.ui:32
+#, fuzzy
+msgid "Address"
+msgstr "_Cím:"
+
+#: gajim/data/gui/groupchat_info_scrolled.ui:64
+msgid "Topic"
+msgstr ""
+
+#: gajim/data/gui/groupchat_info_scrolled.ui:80
+#, fuzzy
+msgid "Author"
+msgstr "_Engedélyez"
+
+#: gajim/data/gui/groupchat_info_scrolled.ui:182
+msgid "Discussion Logs"
+msgstr ""
+
+#: gajim/data/gui/groupchat_info_scrolled.ui:260
+#, fuzzy
+msgid "Group Chat Language"
+msgstr "Meghívó közös társalgásba"
+
 #: gajim/data/gui/emoji_chooser.ui:98
 #, fuzzy
 msgid "No Results Found"
@@ -8126,24 +8292,35 @@ msgstr "Barátok Meghívása!"
 #: gajim/data/gui/chat_to_muc_window.ui:39
 #, fuzzy
 msgid ""
-"You are now entering a groupchat.\n"
+"You are now entering a group chat.\n"
 "Select the contacts you want to invite"
 msgstr ""
 "You are going to begin a Multi-User Chat.\n"
 "Select the contacts you want to invite"
 
 #: gajim/data/gui/chat_to_muc_window.ui:112
-msgid "Please select a MUC server."
+#, fuzzy
+msgid "Please select a group chat server."
 msgstr "Kérem válasszon MUC szervert."
 
 #: gajim/data/gui/chat_to_muc_window.ui:141
-msgid "MUC server"
-msgstr "MUC szerver"
+#, fuzzy
+msgid "Group chat server"
+msgstr "Csoportos beszélgetések"
 
 #: gajim/data/gui/chat_to_muc_window.ui:176
 msgid "In_vite"
 msgstr "Meg_hív"
 
+#: gajim/data/gui/bookmarks.ui:176
+#, fuzzy
+msgid "Autojoin"
+msgstr "Automatikus csatlakozás"
+
+#: gajim/data/gui/bookmarks.ui:211
+msgid "_Apply"
+msgstr ""
+
 #: gajim/data/gui/history_manager.ui:11
 #, fuzzy
 msgid "_Export"
@@ -8162,11 +8339,11 @@ msgstr "Gajim History Logs Manager"
 #: gajim/data/gui/history_manager.ui:108
 #, fuzzy
 msgid ""
-"This log manager is not intended for log viewing. If you are looking for "
-"such functionality, use the history window instead.\n"
+"This history manager is not intended for viewing chat history. If you are "
+"looking for such functionality, please use the history window instead.\n"
 "\n"
-"Use this program to delete or export logs. You can select logs from the left "
-"and/or search database from below."
+"You can use this program to delete or export history. Either select logs "
+"from the left or search the database."
 msgstr ""
 "This log manager is not intended for log viewing. If you are looking for "
 "such functionality, use the history window instead.\n"
@@ -8219,8 +8396,9 @@ msgid "Select an emoji"
 msgstr ""
 
 #: gajim/data/gui/shortcuts_window.ui:38
-msgid "Complete a command or a nick"
-msgstr ""
+#, fuzzy
+msgid "Complete a command or a nickname"
+msgstr "Kérlek készíts egy tiszta új témát a kívánt névvel."
 
 #: gajim/data/gui/shortcuts_window.ui:45
 #, fuzzy
@@ -8260,7 +8438,7 @@ msgstr ""
 msgid "Scroll down"
 msgstr ""
 
-#: gajim/data/gui/shortcuts_window.ui:100 gajim/gtk/xml_console.py:72
+#: gajim/data/gui/shortcuts_window.ui:100 gajim/gtk/xml_console.py:69
 #, fuzzy
 msgid "Clear"
 msgstr "Takarít"
@@ -8302,8 +8480,9 @@ msgid "Close chat"
 msgstr ""
 
 #: gajim/data/gui/shortcuts_window.ui:173
-msgid "Roster Shortcuts"
-msgstr ""
+#, fuzzy
+msgid "Contact List Shortcuts"
+msgstr "Névsor elem cseréje"
 
 #: gajim/data/gui/shortcuts_window.ui:196
 #, fuzzy
@@ -8336,7 +8515,7 @@ msgid "Show only active contacts"
 msgstr "Csak az _aktív partnereket mutassa"
 
 #: gajim/data/gui/shortcuts_window.ui:251
-msgid "Enable roster filtering"
+msgid "Enable contact list filtering"
 msgstr ""
 
 #: gajim/data/gui/shortcuts_window.ui:259
@@ -8384,12 +8563,12 @@ msgstr ""
 
 #: gajim/data/gui/history_window.ui:317
 #, fuzzy
-msgid "Record history for this chat"
+msgid "Store history for this chat"
 msgstr "Mellőzd ezt a hibát ehhez a tanusítványhoz."
 
 #: gajim/data/gui/history_window.ui:332
 #, fuzzy
-msgid "Record History"
+msgid "Store History"
 msgstr "Legutóbbi:"
 
 #: gajim/data/gui/history_window.ui:350
@@ -8410,9 +8589,10 @@ msgstr "Új bejegyzés létrehozása"
 msgid "Fill in the form."
 msgstr "Töltse ki az ívet."
 
-#: gajim/data/gui/data_form_window.ui:229
-msgid "Room Configuration"
-msgstr "Szoba Konfiguráció"
+#: gajim/data/gui/data_form_window.ui:229 gajim/gtk/groupchat_config.py:41
+#, fuzzy
+msgid "Group Chat Configuration"
+msgstr "Meghívó közös társalgásba"
 
 #: gajim/data/gui/roster_item_exchange_window.ui:39
 #: gajim/gtk/roster_item_exchange.py:35
@@ -8433,15 +8613,15 @@ msgstr "Á_llapot"
 msgid "_Start Chat..."
 msgstr "Csevegés _kezdeményezése..."
 
-#: gajim/data/gui/systray_context_menu.ui:50
+#: gajim/data/gui/systray_context_menu.ui:43
 msgid "Show All Pending _Events"
 msgstr "Összes függő esemény mutatása"
 
-#: gajim/data/gui/systray_context_menu.ui:59
+#: gajim/data/gui/systray_context_menu.ui:52
 msgid "Mute Sounds"
 msgstr "Hangok némítása"
 
-#: gajim/data/gui/systray_context_menu.ui:75
+#: gajim/data/gui/systray_context_menu.ui:68
 msgid "_Preferences"
 msgstr "_Beállítások"
 
@@ -8532,34 +8712,34 @@ msgstr ""
 msgid "Execute expression inside a shell, send output"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:45
+#: gajim/command_system/implementation/standard.py:47
 msgid ""
 "Show help on a given command or a list of available commands if -a is given"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:73
+#: gajim/command_system/implementation/standard.py:75
 #, fuzzy
 msgid "Send a message to the contact"
 msgstr "Filet küld egy partnernek"
 
-#: gajim/command_system/implementation/standard.py:78
+#: gajim/command_system/implementation/standard.py:80
 msgid "Send action (in the third person) to the current chat"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:83
+#: gajim/command_system/implementation/standard.py:85
 msgid "Show logged messages which mention given text"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:88
+#: gajim/command_system/implementation/standard.py:90
 #, fuzzy, python-format
 msgid "%s: Nothing found"
 msgstr "%s nincs meg"
 
-#: gajim/command_system/implementation/standard.py:94
+#: gajim/command_system/implementation/standard.py:96
 msgid "Limit must be an integer"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:118
+#: gajim/command_system/implementation/standard.py:120
 msgid ""
 "\n"
 "    Set the current status\n"
@@ -8569,128 +8749,132 @@ msgid ""
 "    "
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:136
+#: gajim/command_system/implementation/standard.py:138
 msgid "Set the current status to away"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:150
+#: gajim/command_system/implementation/standard.py:152
 msgid "Set the current status to online"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:153
+#: gajim/command_system/implementation/standard.py:155
 #, fuzzy
 msgid "Available"
 msgstr "Nem elérhető"
 
-#: gajim/command_system/implementation/standard.py:173
-#: gajim/command_system/implementation/standard.py:250
+#: gajim/command_system/implementation/standard.py:175
+#: gajim/command_system/implementation/standard.py:252
 #, fuzzy
 msgid "Clear the text window"
 msgstr "Elrejti az ablakot"
 
-#: gajim/command_system/implementation/standard.py:178
-#: gajim/command_system/implementation/standard.py:397
+#: gajim/command_system/implementation/standard.py:180
+#: gajim/command_system/implementation/standard.py:401
 #, fuzzy
 msgid "Send a ping to the contact"
 msgstr "Filet küld egy partnernek"
 
-#: gajim/command_system/implementation/standard.py:181
-#: gajim/command_system/implementation/standard.py:400
+#: gajim/command_system/implementation/standard.py:183
+#: gajim/command_system/implementation/standard.py:404
 msgid "Command is not supported for zeroconf accounts"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:185
-msgid "Send DTMF sequence through an open audio session"
+#: gajim/command_system/implementation/standard.py:187
+msgid "Send DTMF sequence through an open voice chat"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:188
-msgid "No open audio sessions with the contact"
-msgstr ""
+#: gajim/command_system/implementation/standard.py:190
+#, fuzzy
+msgid "No open voice chats with the contact"
+msgstr " a window/tab opened with that contact "
 
-#: gajim/command_system/implementation/standard.py:191
+#: gajim/command_system/implementation/standard.py:193
 #, fuzzy, python-format
 msgid "%s is not a valid tone"
 msgstr "%s érvénytelen naplózási szint"
 
-#: gajim/command_system/implementation/standard.py:198
-msgid "Toggle audio session"
+#: gajim/command_system/implementation/standard.py:200
+msgid "Toggle Voice Chat"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:201
+#: gajim/command_system/implementation/standard.py:203
 #, fuzzy
-msgid "Audio sessions are not available"
-msgstr "Egy kapcsolat nem elérhető"
+msgid "Voice chats are not available"
+msgstr "Kapcsolat nem elérhető"
 
-#: gajim/command_system/implementation/standard.py:208
-msgid "Toggle video session"
+#: gajim/command_system/implementation/standard.py:210
+msgid "Toggle Video Chat"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:211
+#: gajim/command_system/implementation/standard.py:213
 #, fuzzy
-msgid "Video sessions are not available"
+msgid "Video chats are not available"
 msgstr "Kapcsolat nem elérhető"
 
-#: gajim/command_system/implementation/standard.py:218
+#: gajim/command_system/implementation/standard.py:220
 #, fuzzy
 msgid "Send a message to the contact that will attract their attention"
 msgstr "Filet küld egy partnernek"
 
-#: gajim/command_system/implementation/standard.py:255
+#: gajim/command_system/implementation/standard.py:257
 #, fuzzy
 msgid "Change your nickname in a group chat"
 msgstr "Nem csatlakoztál a csoportos beszélgetéshez."
 
-#: gajim/command_system/implementation/standard.py:260 gajim/gtk/dialogs.py:674
-#: gajim/gtk/bookmarks.py:272
+#: gajim/command_system/implementation/standard.py:262
 msgid "Invalid nickname"
 msgstr "Érvénytelen becenév"
 
-#: gajim/command_system/implementation/standard.py:267
+#: gajim/command_system/implementation/standard.py:269
 #, fuzzy
-msgid "Open a private chat window with a specified occupant"
+msgid "Open a private chat window with a specified participant"
 msgstr ""
 "\n"
 "_Open chat window with user"
 
-#: gajim/command_system/implementation/standard.py:273
-#: gajim/command_system/implementation/standard.py:282
-#: gajim/command_system/implementation/standard.py:332
-#: gajim/command_system/implementation/standard.py:345
-#: gajim/command_system/implementation/standard.py:357
+#: gajim/command_system/implementation/standard.py:275
+#: gajim/command_system/implementation/standard.py:284
+#: gajim/command_system/implementation/standard.py:336
+#: gajim/command_system/implementation/standard.py:349
+#: gajim/command_system/implementation/standard.py:361
 #, fuzzy
 msgid "Nickname not found"
 msgstr "Használandó becenév"
 
-#: gajim/command_system/implementation/standard.py:276
+#: gajim/command_system/implementation/standard.py:278
+#, fuzzy
 msgid ""
-"Open a private chat window with a specified occupant and send him a message"
+"Open a private chat window with a specified participant and send him a "
+"message"
 msgstr ""
+"\n"
+"_Open chat window with user"
 
-#: gajim/command_system/implementation/standard.py:285
+#: gajim/command_system/implementation/standard.py:287
 #, fuzzy
 msgid "Display or change a group chat topic"
 msgstr "Ask before closing a group chat tab/window."
 
-#: gajim/command_system/implementation/standard.py:294
-msgid "Invite a user to a room for a reason"
+#: gajim/command_system/implementation/standard.py:296
+msgid "Invite a user to a group chat for a reason"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:297
+#: gajim/command_system/implementation/standard.py:299
 #, fuzzy, python-format
 msgid "Invited %(jid)s to %(room_jid)s"
 msgstr "Send %s to %s"
 
-#: gajim/command_system/implementation/standard.py:301
+#: gajim/command_system/implementation/standard.py:303
 #, fuzzy
-msgid "Join a group chat given by a JID"
+msgid "Join a group chat given by an XMPP Address"
 msgstr "_csoportos beszélgetésekben"
 
-#: gajim/command_system/implementation/standard.py:309
+#: gajim/command_system/implementation/standard.py:313
 msgid ""
-"Leave the groupchat, optionally giving a reason, and close tab or window"
+"Leave the group chat, optionally giving a reason, and close tab or window"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:314
+#: gajim/command_system/implementation/standard.py:318
 msgid ""
 "\n"
 "    Ban user by a nick or a JID from a groupchat\n"
@@ -8699,46 +8883,46 @@ msgid ""
 "    "
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:329
+#: gajim/command_system/implementation/standard.py:333
 #, fuzzy
-msgid "Kick user by a nick from a groupchat"
+msgid "Kick user by a nick from a group chat"
 msgstr "Meghívtak közös társalgásba"
 
-#: gajim/command_system/implementation/standard.py:338
+#: gajim/command_system/implementation/standard.py:342
 msgid ""
-"Set occupant role in group chat.\n"
+"Set participant role in group chat.\n"
 "    Role can be given as one of the following values:\n"
 "    moderator, participant, visitor, none"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:343
+#: gajim/command_system/implementation/standard.py:347
 #, fuzzy
 msgid "Invalid role given"
 msgstr "Érvénytelen szerver"
 
-#: gajim/command_system/implementation/standard.py:350
+#: gajim/command_system/implementation/standard.py:354
 msgid ""
-"Set occupant affiliation in group chat.\n"
+"Set participant affiliation in group chat.\n"
 "    Affiliation can be given as one of the following values:\n"
 "    owner, admin, member, outcast, none"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:355
+#: gajim/command_system/implementation/standard.py:359
 #, fuzzy
 msgid "Invalid affiliation given"
 msgstr "a hovatartozás megváltozott"
 
-#: gajim/command_system/implementation/standard.py:365
+#: gajim/command_system/implementation/standard.py:369
 #, fuzzy
-msgid "Display names of all group chat occupants"
+msgid "Display names of all group chat participants"
 msgstr "%s nem a közös beszélgetés neve."
 
-#: gajim/command_system/implementation/standard.py:387
-msgid "Forbid an occupant to send you public or private messages"
+#: gajim/command_system/implementation/standard.py:391
+msgid "Forbid a participant to send you public or private messages"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:392
-msgid "Allow an occupant to send you public or private messages"
+#: gajim/command_system/implementation/standard.py:396
+msgid "Allow a participant to send you public or private messages"
 msgstr ""
 
 #: gajim/command_system/implementation/middleware.py:74
@@ -8749,204 +8933,329 @@ msgstr ""
 msgid "The same as using a doc-string, except it supports translation"
 msgstr ""
 
-#: gajim/gtk/filetransfer.py:91
+#: gajim/gtk/groupchat_info.py:36
+#, fuzzy
+msgid "?Group chat feature:Archiving"
+msgstr "Meghívó közös társalgásba"
+
+#: gajim/gtk/groupchat_info.py:37
+#, fuzzy
+msgid "Messages are archived on the server"
+msgstr "A munkamenet NEM LESZ naplózva"
+
+#: gajim/gtk/groupchat_info.py:40
+#, fuzzy
+msgid "?Group chat feature:Persistent"
+msgstr "Csoportos beszélgetések"
+
+#: gajim/gtk/groupchat_info.py:41
+msgid "This group chat persists even if there are no participants"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:45
+#, fuzzy
+msgid "?Group chat feature:Temporary"
+msgstr "Nincs"
+
+#: gajim/gtk/groupchat_info.py:46
+msgid "This group chat will be destroyed once the last participant left"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:50
+#, fuzzy
+msgid "?Group chat feature:Moderated"
+msgstr "Nincs"
+
+#: gajim/gtk/groupchat_info.py:51
+msgid ""
+"Participants entering this group chat need to request permission to send "
+"messages"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:55
+#, fuzzy
+msgid "?Group chat feature:Not Moderated"
+msgstr "Csoportos beszélgetések"
+
+#: gajim/gtk/groupchat_info.py:56
+msgid "Participants entering this group chat are allowed to send messages"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:60
+#, fuzzy
+msgid "?Group chat feature:Open"
+msgstr "Nincs"
+
+#: gajim/gtk/groupchat_info.py:61
+#, fuzzy
+msgid "Anyone can join this group chat"
+msgstr "%s csatlakozott a közös beszélgetéshez"
+
+#: gajim/gtk/groupchat_info.py:64
+#, fuzzy
+msgid "?Group chat feature:Members Only"
+msgstr "Közös beszélgetés üzenet kiemelése"
+
+#: gajim/gtk/groupchat_info.py:65
+msgid "This group chat is restricted to members only"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:69
+#, fuzzy
+msgid "?Group chat feature:Public"
+msgstr "Közös beszélgetés üzenet kiemelése"
+
+#: gajim/gtk/groupchat_info.py:70
+msgid "Group chat can be found via search"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:73
+#, fuzzy
+msgid "?Group chat feature:Hidden"
+msgstr "Nincs"
+
+#: gajim/gtk/groupchat_info.py:74
+#, fuzzy
+msgid "This group chat can not be found via search"
+msgstr "A szolgáltatás nem található"
+
+#: gajim/gtk/groupchat_info.py:77
+#, fuzzy
+msgid "?Group chat feature:Not Anonymous"
+msgstr "Csoportos beszélgetések"
+
+#: gajim/gtk/groupchat_info.py:78
+msgid "All other group chat participants can see your XMPP address"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:82
+#, fuzzy
+msgid "?Group chat feature:Semi-Anonymous"
+msgstr "Közös beszélgetés üzenet kiemelése"
+
+#: gajim/gtk/groupchat_info.py:83
+msgid "Only moderators can see your XMPP address"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:86
+#, fuzzy
+msgid "?Group chat feature:Password Required"
+msgstr "Csoportos beszélgetések"
+
+#: gajim/gtk/groupchat_info.py:87
+msgid "This group chat does require a password upon entry"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:91
+#, fuzzy
+msgid "?Group chat feature:No Password Required"
+msgstr "Csoportos beszélgetések"
+
+#: gajim/gtk/groupchat_info.py:92
+msgid "This group chat does not require a password upon entry"
+msgstr ""
+
+#: gajim/gtk/filetransfer.py:90
 msgid "File"
 msgstr "File"
 
-#: gajim/gtk/filetransfer.py:108
+#: gajim/gtk/filetransfer.py:107
 msgid "Time"
 msgstr "Idő"
 
-#: gajim/gtk/filetransfer.py:228
+#: gajim/gtk/filetransfer.py:227
 #, fuzzy, python-format
 msgid "File name: %s"
 msgstr "Filenév: %s"
 
-#: gajim/gtk/filetransfer.py:229 gajim/gtk/filetransfer.py:464
+#: gajim/gtk/filetransfer.py:228 gajim/gtk/filetransfer.py:469
 #, python-format
 msgid "Size: %s"
 msgstr "Méret: %s"
 
-#: gajim/gtk/filetransfer.py:239
+#: gajim/gtk/filetransfer.py:238
 #, python-format
 msgid "Sender: %s"
 msgstr "Feladó: %s"
 
-#: gajim/gtk/filetransfer.py:240 gajim/gtk/filetransfer.py:744
+#: gajim/gtk/filetransfer.py:239 gajim/gtk/filetransfer.py:749
 #: gajim/gtk/tooltips.py:577
 msgid "Recipient: "
 msgstr "Címzett: "
 
-#: gajim/gtk/filetransfer.py:251
+#: gajim/gtk/filetransfer.py:250
 #, python-format
 msgid "Saved in: %s"
 msgstr "Elmentve ebbe: %s"
 
-#: gajim/gtk/filetransfer.py:256
+#: gajim/gtk/filetransfer.py:255
 msgid "File transfer completed"
 msgstr "Fileátvitel sikeres"
 
-#: gajim/gtk/filetransfer.py:276 gajim/gtk/filetransfer.py:285
+#: gajim/gtk/filetransfer.py:275 gajim/gtk/filetransfer.py:284
 #, fuzzy
 msgid "Connection with peer could not be established."
 msgstr "Nem létesíthető kapcsolat a partnerrel."
 
-#: gajim/gtk/filetransfer.py:293
+#: gajim/gtk/filetransfer.py:292
 #, python-format
 msgid "Filename: %s"
 msgstr "Filenév: %s"
 
-#: gajim/gtk/filetransfer.py:294
+#: gajim/gtk/filetransfer.py:293
 #, python-format
 msgid "Recipient: %s"
 msgstr "Címzett: %s"
 
-#: gajim/gtk/filetransfer.py:296
+#: gajim/gtk/filetransfer.py:295
 #, python-format
 msgid "Error message: %s"
 msgstr "Hibaüzenet: %s"
 
-#: gajim/gtk/filetransfer.py:333
-#, fuzzy
-msgid "File transfer error"
-msgstr "Fileátvitel hiba"
-
 #: gajim/gtk/filetransfer.py:334
 #, python-format
 msgid ""
-"The file %(file)s has been received, but it seems to have been damaged along "
-"the way.\n"
+"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 ""
 
-#: gajim/gtk/filetransfer.py:350
+#: gajim/gtk/filetransfer.py:340
+#, fuzzy
+msgid "_Download Again"
+msgstr "_Ne kérdezzen meg újra"
+
+#: gajim/gtk/filetransfer.py:355
 #, fuzzy
 msgid "Gajim can not read this file"
 msgstr "A Gajim nem fér hozzá ehhez a filehoz"
 
-#: gajim/gtk/filetransfer.py:351
+#: gajim/gtk/filetransfer.py:356
 msgid "Another process is using this file."
 msgstr ""
 
-#: gajim/gtk/filetransfer.py:418
+#: gajim/gtk/filetransfer.py:423
 #, fuzzy
 msgid "File Transfer Conflict"
 msgstr "Fileátvitel befejezve"
 
-#: gajim/gtk/filetransfer.py:419
+#: gajim/gtk/filetransfer.py:424
 msgid "This file already exists"
 msgstr "Ez a file már létezik"
 
-#: gajim/gtk/filetransfer.py:420
+#: gajim/gtk/filetransfer.py:425
 msgid "Resume download or replace file?"
 msgstr ""
 
-#: gajim/gtk/filetransfer.py:424
+#: gajim/gtk/filetransfer.py:429
 #, fuzzy
 msgid "Replace _File"
 msgstr "Takarít"
 
-#: gajim/gtk/filetransfer.py:427
+#: gajim/gtk/filetransfer.py:432
 #, fuzzy
 msgid "Resume _Download"
 msgstr "Letöltés"
 
-#: gajim/gtk/filetransfer.py:437
+#: gajim/gtk/filetransfer.py:442
 #, fuzzy, python-format
 msgid "Directory '%s' is not writable"
 msgstr "A(z) \"%s\" könyvtár nem írható"
 
-#: gajim/gtk/filetransfer.py:438
+#: gajim/gtk/filetransfer.py:443
 #, fuzzy
 msgid "You do not have permissions to create files in this directory."
 msgstr "Nincs jogosultságod file létrehozására ebbe a könyvtárba"
 
-#: gajim/gtk/filetransfer.py:461
+#: gajim/gtk/filetransfer.py:466
 #, python-format
 msgid "File: %s"
 msgstr "File: %s"
 
-#: gajim/gtk/filetransfer.py:467
+#: gajim/gtk/filetransfer.py:472
 #, python-format
 msgid "Type: %s"
 msgstr "Típus: %s"
 
-#: gajim/gtk/filetransfer.py:469
+#: gajim/gtk/filetransfer.py:474
 #, python-format
 msgid "Description: %s"
 msgstr "Leírás: %s"
 
-#: gajim/gtk/filetransfer.py:480
+#: gajim/gtk/filetransfer.py:485
 #, fuzzy, python-format
 msgid "%s wants to send you a file"
 msgstr "%s egy filet szeretne küldeni neked."
 
-#: gajim/gtk/filetransfer.py:509
+#: gajim/gtk/filetransfer.py:514
 #, fuzzy
 msgid "Checking file…"
 msgstr "Profil küldése..."
 
-#: gajim/gtk/filetransfer.py:524
+#: gajim/gtk/filetransfer.py:529
 #, fuzzy
 msgid "File error"
 msgstr "Fileátvitel hiba"
 
-#: gajim/gtk/filetransfer.py:561
+#: gajim/gtk/filetransfer.py:566
 #, fuzzy, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 
-#: gajim/gtk/filetransfer.py:658
+#: gajim/gtk/filetransfer.py:663
 #, fuzzy, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/s)"
 
-#: gajim/gtk/filetransfer.py:711 gajim/gtk/filetransfer.py:715
+#: gajim/gtk/filetransfer.py:716 gajim/gtk/filetransfer.py:720
 msgid "Invalid File"
 msgstr "Érvénytelen file"
 
-#: gajim/gtk/filetransfer.py:711
+#: gajim/gtk/filetransfer.py:716
 msgid "File: "
 msgstr "File: "
 
-#: gajim/gtk/filetransfer.py:716
+#: gajim/gtk/filetransfer.py:721
 msgid "It is not possible to send empty files"
 msgstr "Nem lehet üres fileokat küldeni"
 
-#: gajim/gtk/filetransfer.py:742 gajim/gtk/tooltips.py:571
+#: gajim/gtk/filetransfer.py:747 gajim/gtk/tooltips.py:571
 msgid "Sender: "
 msgstr "Feladó: "
 
-#: gajim/gtk/filetransfer.py:1038
+#: gajim/gtk/filetransfer.py:1043
 #, fuzzy
 msgid "Choose a File to Send…"
 msgstr "Válaszd ki az elküldendő filet..."
 
 #: gajim/gtk/start_chat.py:51
 #, fuzzy
-msgid "Start new Conversation"
+msgid "Start New Conversation"
 msgstr "Folytatott beszélgetés"
 
-#: gajim/gtk/start_chat.py:424
-#, fuzzy
-msgid "New Groupchat"
-msgstr "Új közös beszélgetés"
+#: gajim/gtk/start_chat.py:260 gajim/gtk/start_chat.py:328
+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:603 gajim/gtk/groupchat_join.py:38
+msgid "Join Group Chat"
+msgstr "Csatlakozás Csoportos Beszélgetéshez"
 
-#: gajim/gtk/start_chat.py:426
+#: gajim/gtk/start_chat.py:605 gajim/gtk/add_contact.py:40
 #, fuzzy
-msgid "New Contact"
-msgstr "Új partner felvétele"
+msgid "Add Contact"
+msgstr "_Ismerős hozzáadása..."
 
-#: gajim/gtk/start_chat.py:588
+#: gajim/gtk/start_chat.py:746
 #, fuzzy, python-format
-msgid "%s Group chats found"
+msgid "%s group chats found"
 msgstr "%s nincs meg"
 
-#: gajim/gtk/discovery.py:70
+#: gajim/gtk/discovery.py:69
 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:71
+#: gajim/gtk/discovery.py:70
 #, fuzzy
 msgid ""
 "This service could not respond with detailed information.\n"
@@ -8955,32 +9264,33 @@ msgstr ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
 
-#: gajim/gtk/discovery.py:128
+#: gajim/gtk/discovery.py:126
 msgid "Others"
 msgstr "Egyebek"
 
-#: gajim/gtk/discovery.py:131
-msgid "Conference"
-msgstr "Konferencia"
+#: gajim/gtk/discovery.py:129
+#, fuzzy
+msgid "Group Chat"
+msgstr "Csoportos beszélgetések"
 
-#: gajim/gtk/discovery.py:519
+#: gajim/gtk/discovery.py:518
 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:606
+#: gajim/gtk/discovery.py:605
 #, 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:608
+#: gajim/gtk/discovery.py:607
 msgid "Service Discovery"
 msgstr "Szolgáltatás felderítés"
 
-#: gajim/gtk/discovery.py:691
+#: gajim/gtk/discovery.py:690
 msgid "The service could not be found"
 msgstr "A szolgáltatás nem található"
 
-#: gajim/gtk/discovery.py:692
+#: gajim/gtk/discovery.py:691
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -8988,101 +9298,80 @@ 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:699 gajim/gtk/discovery.py:1042
+#: gajim/gtk/discovery.py:698 gajim/gtk/discovery.py:1041
 msgid "The service is not browsable"
 msgstr "A szolgáltatás nem böngészhető"
 
-#: gajim/gtk/discovery.py:700
+#: gajim/gtk/discovery.py:699
 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:738 gajim/gtk/discovery.py:747
+#: gajim/gtk/discovery.py:737 gajim/gtk/discovery.py:746
 msgid "Invalid Server Name"
 msgstr "Érvénytelen szervernév"
 
-#: gajim/gtk/discovery.py:806
+#: gajim/gtk/discovery.py:805
 #, fuzzy, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Browsing %(address)s using account %(account)s"
 
-#: gajim/gtk/discovery.py:851
+#: gajim/gtk/discovery.py:850
 #, fuzzy
 msgid "Browse"
 msgstr "_Tallózás"
 
-#: gajim/gtk/discovery.py:1043
+#: gajim/gtk/discovery.py:1042
 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:1255
+#: gajim/gtk/discovery.py:1254
 #, fuzzy
 msgid "_Command"
 msgstr "parancs"
 
-#: gajim/gtk/discovery.py:1264 gajim/gtk/discovery.py:1422
+#: gajim/gtk/discovery.py:1263 gajim/gtk/discovery.py:1420
 msgid "Re_gister"
 msgstr "Re_gisztrál"
 
-#: gajim/gtk/discovery.py:1277
+#: gajim/gtk/discovery.py:1276
 msgid "_Search"
 msgstr "_Keresés"
 
-#: gajim/gtk/discovery.py:1420
+#: gajim/gtk/discovery.py:1418
 msgid "_Edit"
 msgstr "_Szerkesztés"
 
-#: gajim/gtk/discovery.py:1458
+#: gajim/gtk/discovery.py:1456
 #, fuzzy, python-format
 msgid "Scanning %(current)d / %(total)d ..."
 msgstr "Scanning %(current)d / %(total)d.."
 
-#: gajim/gtk/discovery.py:1674
+#: gajim/gtk/discovery.py:1655
+msgid "Users"
+msgstr "Felhasználók"
+
+#: gajim/gtk/discovery.py:1671
 msgid "Id"
 msgstr "Azonosító"
 
-#: gajim/gtk/discovery.py:1713
-msgid "_Join"
-msgstr "_Csatlakozás"
-
-#: gajim/gtk/discovery.py:1736
-msgid "Bookmark already set"
-msgstr "Ez a könyvjelző már fel van véve"
-
-#: gajim/gtk/discovery.py:1737
-#, fuzzy, python-format
-msgid "Group Chat '%s' is already in your bookmarks."
-msgstr "Group Chat \"%s\" is already in your bookmarks."
-
-#: gajim/gtk/discovery.py:1748
-msgid "Bookmark has been added successfully"
-msgstr "A könyvjelző sikeresen hozzá lett adva"
-
-#: gajim/gtk/discovery.py:1749
-#, fuzzy
-msgid ""
-"You can manage your bookmarks by clicking the Bookmarks menu item in your "
-"contact list."
-msgstr ""
-"A könyvjelzőkezelőt a névsor tetején lévő \"Műveletek\" menüben éred el"
-
-#: gajim/gtk/discovery.py:1950
+#: gajim/gtk/discovery.py:1900
 msgid "Subscribed"
 msgstr "Feliratkozva"
 
-#: gajim/gtk/discovery.py:1959
+#: gajim/gtk/discovery.py:1909
 msgid "Node"
 msgstr "Csomópont"
 
-#: gajim/gtk/discovery.py:2028
+#: gajim/gtk/discovery.py:1978
 #, fuzzy
 msgid "_New post"
 msgstr "Új bejegyzés"
 
-#: gajim/gtk/discovery.py:2037
+#: gajim/gtk/discovery.py:1987
 msgid "_Subscribe"
 msgstr "_Feliratkozás"
 
-#: gajim/gtk/discovery.py:2045
+#: gajim/gtk/discovery.py:1995
 msgid "_Unsubscribe"
 msgstr "_Leiratkozás"
 
@@ -9129,7 +9418,7 @@ msgstr "Feladó %s"
 msgid "Characters typed: %s"
 msgstr "Nem megengedett karakter"
 
-#: gajim/gtk/single_message.py:274 gajim/gtk/xml_console.py:169
+#: gajim/gtk/single_message.py:274 gajim/gtk/xml_console.py:166
 msgid "Connection not available"
 msgstr "Kapcsolat nem elérhető"
 
@@ -9138,6 +9427,13 @@ msgstr "Kapcsolat nem elérhető"
 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:306
+#, 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:330
 #, python-format
 msgid "RE: %s"
@@ -9148,28 +9444,28 @@ msgstr "RE: %s"
 msgid "%s wrote:\n"
 msgstr "%s írta:\n"
 
-#: gajim/gtk/pep_config.py:44
+#: gajim/gtk/pep_config.py:45
 #, fuzzy, python-format
 msgid "PEP Service Configuration (%s)"
 msgstr "PEP szolgáltatás beállítása"
 
-#: gajim/gtk/pep_config.py:77
+#: gajim/gtk/pep_config.py:78
 #, fuzzy
 msgid "Service"
 msgstr "Szerver"
 
-#: gajim/gtk/pep_config.py:114
+#: gajim/gtk/pep_config.py:115
 msgid "PEP node was not removed"
 msgstr ""
 
-#: gajim/gtk/pep_config.py:115
+#: gajim/gtk/pep_config.py:116
 #, python-format
 msgid ""
 "PEP node %(node)s was not removed:\n"
 "%(message)s"
 msgstr ""
 
-#: gajim/gtk/pep_config.py:146
+#: gajim/gtk/pep_config.py:147
 #, fuzzy, python-format
 msgid "Configure %s"
 msgstr "_Beállítás"
@@ -9185,17 +9481,21 @@ msgstr "_Regisztrálás"
 msgid "Registration successful"
 msgstr "Regisztráció sikeres"
 
-#: gajim/gtk/dialogs.py:54 gajim/gtk/dataform.py:659 gajim/gtk/adhoc.py:85
+#: gajim/gtk/service_registration.py:215
+msgid "Registration failed"
+msgstr "Regisztráció nem sikerült"
+
+#: gajim/gtk/dialogs.py:53 gajim/gtk/dataform.py:668 gajim/gtk/adhoc.py:86
 #, fuzzy
 msgid "Cancel"
 msgstr "_Mégse"
 
-#: gajim/gtk/dialogs.py:129
+#: gajim/gtk/dialogs.py:128
 #, 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:130
+#: gajim/gtk/dialogs.py:129
 #, fuzzy, python-format
 msgid ""
 "You have to install the dictionary \"%s\" to use spellchecking, or choose "
@@ -9209,11 +9509,11 @@ msgstr ""
 "\n"
 "A félregépelt szövegek kiemelése funkció nem lesz használva"
 
-#: gajim/gtk/dialogs.py:410 gajim/gtk/dialogs.py:425
+#: gajim/gtk/dialogs.py:322 gajim/gtk/dialogs.py:337
 msgid "Insecure connection"
 msgstr "Nem biztonságos kapcsolat"
 
-#: gajim/gtk/dialogs.py:411
+#: gajim/gtk/dialogs.py:323
 #, fuzzy, python-format
 msgid ""
 "You are about to connect to the account %(account)s (%(server)s) insecurely. "
@@ -9225,120 +9525,115 @@ msgstr ""
 "azt jelenti, hogy az összes beszélgetésed titkosítatlanul fog továbbítódni. "
 "Biztosan ezt szeretnéd tenni?"
 
-#: gajim/gtk/dialogs.py:416
+#: gajim/gtk/dialogs.py:328
 msgid "Yes, I really want to connect insecurely"
 msgstr "Igen, ennek ellenére szeretnék csatlakozni"
 
-#: gajim/gtk/dialogs.py:417
+#: gajim/gtk/dialogs.py:329
 msgid "Gajim will NOT connect unless you check this box"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:675
-#, fuzzy
-msgid "The nickname contains invalid characters."
-msgstr "A becenévben nem megengedett karakterek vannak."
-
-#: gajim/gtk/dialogs.py:734
+#: gajim/gtk/dialogs.py:561
 #, fuzzy, python-format
 msgid "Destroy %s"
 msgstr "%s törlése"
 
-#: gajim/gtk/dialogs.py:775
+#: gajim/gtk/dialogs.py:602
 #, fuzzy
 msgid "Certificate"
 msgstr "Kliens tanusítvány"
 
-#: gajim/gtk/dialogs.py:786
+#: gajim/gtk/dialogs.py:613
 #, fuzzy, python-format
 msgid ""
 "Certificate for account\n"
 "%s"
 msgstr "for account %s"
 
-#: gajim/gtk/dialogs.py:824
+#: gajim/gtk/dialogs.py:651
 msgid "Issued to\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:825 gajim/gtk/dialogs.py:830
+#: gajim/gtk/dialogs.py:652 gajim/gtk/dialogs.py:657
 msgid "Common Name (CN): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:826 gajim/gtk/dialogs.py:831
+#: gajim/gtk/dialogs.py:653 gajim/gtk/dialogs.py:658
 msgid "Organization (O): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:827 gajim/gtk/dialogs.py:832
+#: gajim/gtk/dialogs.py:654 gajim/gtk/dialogs.py:659
 msgid "Organizational Unit (OU): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:828
+#: gajim/gtk/dialogs.py:655
 #, fuzzy
 msgid "Serial Number: "
 msgstr "GG szám:"
 
-#: gajim/gtk/dialogs.py:829
+#: gajim/gtk/dialogs.py:656
 msgid "Issued by\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:833
+#: gajim/gtk/dialogs.py:660
 msgid "Validity\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:834
+#: gajim/gtk/dialogs.py:661
 msgid "Issued on: "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:835
+#: gajim/gtk/dialogs.py:662
 msgid "Expires on: "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:836
+#: gajim/gtk/dialogs.py:663
 msgid "SHA-1:"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:838
+#: gajim/gtk/dialogs.py:665
 msgid "SHA-256:"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:852
+#: gajim/gtk/dialogs.py:679
 #, fuzzy
 msgid "View certificate…"
 msgstr "Kliens tanusítvány"
 
-#: gajim/gtk/dialogs.py:864 gajim/gtk/accounts.py:893
+#: gajim/gtk/dialogs.py:691 gajim/gtk/accounts.py:896
 msgid "Change Password"
 msgstr "Jelszó megváltoztatása"
 
-#: gajim/gtk/dialogs.py:878
+#: gajim/gtk/dialogs.py:705
 msgid "_OK"
 msgstr "_OK"
 
-#: gajim/gtk/dialogs.py:891
+#: gajim/gtk/dialogs.py:718
 #, fuzzy
 msgid "You must enter a password"
 msgstr "Be kell írnod egy jelszót."
 
-#: gajim/gtk/dialogs.py:895
+#: gajim/gtk/dialogs.py:722
 msgid "Passwords do not match"
 msgstr "A beírt jelszavak nem egyeznek"
 
-#: gajim/gtk/dialogs.py:923
+#: gajim/gtk/dialogs.py:750
 #, fuzzy
 msgid "Group Chat Invitation "
 msgstr "Meghívó közös társalgásba"
 
-#: gajim/gtk/dialogs.py:948
+#: gajim/gtk/dialogs.py:775
 #, fuzzy, python-format
 msgid "<b>%s</b> has invited you to join a discussion"
 msgstr "$Partner meghívott téged hogy csatlakozz egy beszélgetéshez"
 
-#: gajim/gtk/dialogs.py:951
+#: gajim/gtk/dialogs.py:778
 #, 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:959
+#: gajim/gtk/dialogs.py:786
 #, python-format
 msgid "Comment: %s"
 msgstr "Megjegyzés: %s"
@@ -9353,11 +9648,6 @@ msgstr "GG szám:"
 msgid "ICQ Number"
 msgstr "ICQ szám:"
 
-#: gajim/gtk/add_contact.py:40
-#, fuzzy
-msgid "Add Contact"
-msgstr "_Ismerős hozzáadása..."
-
 #: gajim/gtk/add_contact.py:259
 #, fuzzy, python-format
 msgid "%s Missing"
@@ -9378,7 +9668,8 @@ msgid "The user ID must not contain a resource."
 msgstr "A felhasználói azonosító nem tartalmazhat erőforrást"
 
 #: gajim/gtk/add_contact.py:299
-msgid "You cannot add yourself to your roster."
+#, fuzzy
+msgid "You cannot add yourself to your contact list."
 msgstr "Nem veheted fel saját magad a névsorra."
 
 #: gajim/gtk/add_contact.py:304
@@ -9391,11 +9682,13 @@ msgid "Your account must be online to add new contacts."
 msgstr ""
 
 #: gajim/gtk/add_contact.py:321
-msgid "Contact already in roster"
+#, fuzzy
+msgid "Contact Already in Contact List"
 msgstr "A partner már a névsoron van"
 
 #: gajim/gtk/add_contact.py:322
-msgid "This contact is already listed in your roster."
+#, fuzzy
+msgid "This contact is already in your contact list."
 msgstr "Ez a partner már fel van véve a névsorba."
 
 #: gajim/gtk/add_contact.py:379 gajim/gtk/add_contact.py:417
@@ -9436,14 +9729,14 @@ msgstr "Állapot megváltoztatása"
 
 #: gajim/gtk/themes.py:52
 #, fuzzy
-msgid "MUC Tab New Directed Message"
+msgid "Group Chat Tab New Directed Message"
 msgstr ""
 "MUC Irányított\n"
 "Üzenetek"
 
 #: gajim/gtk/themes.py:56
 #, fuzzy
-msgid "MUC Tab New Message"
+msgid "Group Chat Tab New Message"
 msgstr "Új üzenet"
 
 #: gajim/gtk/themes.py:60
@@ -9660,13 +9953,13 @@ msgstr "Minden file"
 msgid "Clear File"
 msgstr "Takarít"
 
-#: gajim/gtk/settings.py:570
+#: gajim/gtk/settings.py:570 gajim/gtk/proxies.py:32
 #, fuzzy
 msgid "Manage Proxies"
 msgstr "Manage Proxy Profiles"
 
-#: gajim/gtk/settings.py:591 gajim/gtk/preferences.py:971
-#: gajim/gtk/preferences.py:984 gajim/gtk/preferences.py:988
+#: gajim/gtk/settings.py:591 gajim/gtk/preferences.py:968
+#: gajim/gtk/preferences.py:982 gajim/gtk/preferences.py:986
 #, fuzzy
 msgid "No Proxy"
 msgstr "Prox_y:"
@@ -9746,14 +10039,15 @@ msgid ""
 "        "
 msgstr ""
 
-#: gajim/gtk/about.py:47 data/org.gajim.Gajim.appdata.xml.in:10
+#: gajim/gtk/about.py:47 data/org.gajim.Gajim.desktop.in:6
+#: data/org.gajim.Gajim.appdata.xml.in:10
 #, fuzzy
-msgid "A GTK+ XMPP client"
+msgid "A GTK XMPP client"
 msgstr "Egy GTK+ Jabber kliens"
 
 #: gajim/gtk/about.py:48
 #, fuzzy, python-format
-msgid "GTK+ Version: %s"
+msgid "GTK Version: %s"
 msgstr "GTK+ Verzió:"
 
 #: gajim/gtk/about.py:49
@@ -9935,6 +10229,25 @@ msgstr "Szüneteltetve"
 msgid "?transfer status:Not started"
 msgstr "Szüneteltetve"
 
+#: gajim/gtk/groupchat_creation.py:97 gajim/gtk/groupchat_creation.py:99
+msgid " (optional)..."
+msgstr ""
+
+#: gajim/gtk/groupchat_creation.py:134
+#, fuzzy
+msgid "Invalid Address"
+msgstr "Érvénytelen file"
+
+#: gajim/gtk/groupchat_creation.py:182
+#, fuzzy
+msgid "Not Connected"
+msgstr "Csatlakozva"
+
+#: gajim/gtk/groupchat_creation.py:183
+#, fuzzy
+msgid "You have to be connected to create a group chat."
+msgstr "Nem csatlakoztál a csoportos beszélgetéshez."
+
 #: gajim/gtk/sounds.py:39
 msgid "Wav Sounds"
 msgstr "Wav hangok"
@@ -9976,49 +10289,45 @@ 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:226 gajim/gtk/dataform.py:262
+#: gajim/gtk/dataform.py:232 gajim/gtk/dataform.py:268
 #, fuzzy
 msgid "Required"
 msgstr "Jelszó szükséges"
 
-#: gajim/gtk/dataform.py:286
+#: gajim/gtk/dataform.py:293
 msgid "Yes"
 msgstr ""
 
-#: gajim/gtk/dataform.py:286
+#: gajim/gtk/dataform.py:293
 #, fuzzy
 msgid "No"
 msgstr "Egyik sem"
 
-#: gajim/gtk/dataform.py:661
+#: gajim/gtk/dataform.py:670
 msgid "Submit"
 msgstr ""
 
-#: gajim/gtk/statusicon.py:213
+#: gajim/gtk/statusicon.py:206
 #, fuzzy
 msgid "_Change Status Message…"
 msgstr "Állapot üzenet _megváltoztatása"
 
-#: gajim/gtk/statusicon.py:247 gajim/gtk/statusicon.py:292
-#: gajim/gtk/statusicon.py:299
+#: gajim/gtk/statusicon.py:258
 #, python-format
 msgid "using account %s"
 msgstr "%s fiók használatával"
 
-#: gajim/gtk/statusicon.py:309
+#: gajim/gtk/statusicon.py:269
 #, fuzzy
-msgid "_Manage Bookmarks…"
-msgstr "Könyvjelzők kezelése"
-
-#: gajim/gtk/statusicon.py:325
-msgid "Hide _Roster"
-msgstr "Névsor el_rejtése"
+msgid "Hide _Contact List"
+msgstr "_Partnerek Meghívása "
 
-#: gajim/gtk/statusicon.py:329
-msgid "Show _Roster"
-msgstr "Névsor mutatása"
+#: gajim/gtk/statusicon.py:273
+#, fuzzy
+msgid "Show _Contact List"
+msgstr "Csak az _aktív partnereket mutassa"
 
-#: gajim/gtk/statusicon.py:337
+#: gajim/gtk/statusicon.py:281
 msgid "Hide this menu"
 msgstr "Elrejti ezt a menüt"
 
@@ -10065,36 +10374,6 @@ 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/join_groupchat.py:202
-#, fuzzy
-msgid "Invalid Room"
-msgstr "Érvénytelen szoba"
-
-#: gajim/gtk/join_groupchat.py:203
-msgid "Please choose a room"
-msgstr ""
-
-#: gajim/gtk/join_groupchat.py:222 gajim/gtk/join_groupchat.py:229
-msgid "Invalid Nickname"
-msgstr "Érvénytelen becenév"
-
-#: gajim/gtk/join_groupchat.py:223
-#, fuzzy
-msgid "Please choose a nickname"
-msgstr "Kérlek készíts egy tiszta új témát a kívánt névvel."
-
-#: gajim/gtk/join_groupchat.py:282 gajim/gtk/join_groupchat.py:288
-#: gajim/gtk/join_groupchat.py:293
-#, fuzzy
-msgid "Wrong server"
-msgstr "Rossz URI"
-
-#: gajim/gtk/join_groupchat.py:283 gajim/gtk/join_groupchat.py:289
-#: gajim/gtk/join_groupchat.py:294
-#, fuzzy, python-format
-msgid "%s is not a groupchat server"
-msgstr "Ez nem egy közös társalgás"
-
 #: gajim/gtk/mam_preferences.py:38
 #, python-format
 msgid "Archiving Preferences for %s"
@@ -10124,45 +10403,53 @@ msgstr "Hiba a fogadott adatformában"
 msgid "Archiving Preferences Error"
 msgstr "Tulajdonságok"
 
-#: gajim/gtk/advanced_config.py:81
+#: gajim/gtk/advanced_config.py:95
 msgid "Activated"
 msgstr "Aktiválva"
 
-#: gajim/gtk/advanced_config.py:81
+#: gajim/gtk/advanced_config.py:95
 msgid "Deactivated"
 msgstr "Kikapcsolva"
 
-#: gajim/gtk/advanced_config.py:83
-msgid "Boolean"
-msgstr "Eldöntendő"
+#: gajim/gtk/advanced_config.py:97
+msgid "?config type:Boolean"
+msgstr ""
+
+#: gajim/gtk/advanced_config.py:98
+msgid "?config type:Integer"
+msgstr ""
 
-#: gajim/gtk/advanced_config.py:84
-msgid "Integer"
-msgstr "Egész szám"
+#: gajim/gtk/advanced_config.py:99
+msgid "?config type:Text"
+msgstr ""
 
-#: gajim/gtk/advanced_config.py:85
-msgid "Text"
-msgstr "Szöveg"
+#: gajim/gtk/advanced_config.py:100
+msgid "?config type:Color"
+msgstr ""
 
-#: gajim/gtk/advanced_config.py:97
-msgid "Preference Name"
+#: gajim/gtk/advanced_config.py:112
+#, fuzzy
+msgid "?config:Preference Name"
 msgstr "Beállítás neve"
 
-#: gajim/gtk/advanced_config.py:104
-msgid "Value"
-msgstr "Érték"
+#: gajim/gtk/advanced_config.py:123
+#, fuzzy
+msgid "?config:Value"
+msgstr "_Beállítás"
 
-#: gajim/gtk/advanced_config.py:113
-msgid "Type"
-msgstr "Típus"
+#: gajim/gtk/advanced_config.py:132
+msgid "?config:Type"
+msgstr ""
 
-#: gajim/gtk/advanced_config.py:168
-msgid "(None)"
-msgstr "(Nincs)"
+#: gajim/gtk/advanced_config.py:187
+#, fuzzy
+msgid "?config description:None"
+msgstr "Egyik sem"
 
-#: gajim/gtk/advanced_config.py:299
-msgid "Hidden"
-msgstr "Rejtett"
+#: gajim/gtk/advanced_config.py:322
+#, fuzzy
+msgid "?password:Hidden"
+msgstr "Jelszó:"
 
 #: gajim/gtk/server_info.py:66
 #, fuzzy
@@ -10174,8 +10461,8 @@ msgstr "Link Helyének _Másolása"
 msgid "%(days)s days, %(hours)s hours"
 msgstr ""
 
-#: gajim/gtk/server_info.py:218 gajim/gtk/accounts.py:749
-#: gajim/gtk/accounts.py:853
+#: gajim/gtk/server_info.py:218 gajim/gtk/accounts.py:752
+#: gajim/gtk/accounts.py:856
 #, fuzzy
 msgid "Hostname"
 msgstr "_Hostnév:"
@@ -10369,11 +10656,6 @@ 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_config.py:41
-#, fuzzy
-msgid "Group Chat Configuration"
-msgstr "Meghívó közös társalgásba"
-
 #: gajim/gtk/groupchat_config.py:134
 #, fuzzy
 msgid "A Group Chat needs at least one Owner"
@@ -10384,69 +10666,69 @@ msgid "You are not allowed to modify the affiliation of Admins and Owners"
 msgstr ""
 
 #: gajim/gtk/groupchat_config.py:399
-msgid "An entry with this Jabber-ID already exists"
+msgid "An entry with this XMPP Address already exists"
 msgstr ""
 
-#: gajim/gtk/adhoc.py:91
+#: gajim/gtk/adhoc.py:92
 #, fuzzy
 msgid "Finish"
 msgstr "_Kész"
 
-#: gajim/gtk/adhoc.py:97 gajim/gtk/adhoc.py:283
+#: gajim/gtk/adhoc.py:98 gajim/gtk/adhoc.py:284
 #, fuzzy
 msgid "Commands"
 msgstr "parancs"
 
-#: gajim/gtk/adhoc.py:103
+#: gajim/gtk/adhoc.py:104
 msgid "Next"
 msgstr ""
 
-#: gajim/gtk/adhoc.py:109
+#: gajim/gtk/adhoc.py:110
 #, fuzzy
 msgid "Previous"
 msgstr "Irígy"
 
-#: gajim/gtk/adhoc.py:115
+#: gajim/gtk/adhoc.py:116
 #, fuzzy
 msgid "Execute"
 msgstr "Parancs _futtatása"
 
-#: gajim/gtk/adhoc.py:195
+#: gajim/gtk/adhoc.py:196
 #, fuzzy
 msgid "No commands available"
 msgstr "No account available"
 
-#: gajim/gtk/adhoc.py:244
+#: gajim/gtk/adhoc.py:245
 #, fuzzy
 msgid "Request Command List"
 msgstr "Parancs _futtatása"
 
-#: gajim/gtk/adhoc.py:259
+#: gajim/gtk/adhoc.py:260
 #, fuzzy
 msgid "Executing…"
 msgstr "Parancs _futtatása"
 
-#: gajim/gtk/adhoc.py:266
+#: gajim/gtk/adhoc.py:267
 #, fuzzy
 msgid "Command List"
 msgstr "Ban lista"
 
-#: gajim/gtk/adhoc.py:384
+#: gajim/gtk/adhoc.py:385
 #, fuzzy
 msgid "Finished"
 msgstr "_Kész"
 
-#: gajim/gtk/adhoc.py:453
+#: gajim/gtk/adhoc.py:454
 #, fuzzy
 msgid "Execution failed"
 msgstr "Kapcsolat megszakadt"
 
-#: gajim/gtk/blocking.py:37
+#: gajim/gtk/blocking.py:38
 #, fuzzy, python-format
 msgid "Blocking List for %s"
 msgstr "Magánéleti lista ehhez: %s"
 
-#: gajim/gtk/blocking.py:71
+#: gajim/gtk/blocking.py:72
 #, fuzzy
 msgid "Error!"
 msgstr "Hiba"
@@ -10499,8 +10781,7 @@ msgstr "Érvénytelen felhasználónév"
 msgid "You must provide a username to configure this account."
 msgstr "Meg kell adnod egy felhasználónevet hogy beállíthasd ezt a fiókot."
 
-#: gajim/gtk/account_wizard.py:252 gajim/gtk/bookmarks.py:290
-#: gajim/gtk/bookmarks.py:303
+#: gajim/gtk/account_wizard.py:252
 msgid "Invalid server"
 msgstr "Érvénytelen szerver"
 
@@ -10516,7 +10797,7 @@ msgstr "Érvénytelen bejegyzés"
 msgid "Custom port must be a port number."
 msgstr "Az egyedi portnak egy számnak kell lennie."
 
-#: gajim/gtk/account_wizard.py:405
+#: gajim/gtk/account_wizard.py:406
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -10531,15 +10812,15 @@ msgstr ""
 "SSL hiba: %(error)s\n"
 "Ennek ellenére szeretnél csatlakozni a szerverhez?"
 
-#: gajim/gtk/account_wizard.py:446 gajim/gtk/account_wizard.py:480
+#: gajim/gtk/account_wizard.py:447 gajim/gtk/account_wizard.py:481
 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:545
+#: gajim/gtk/account_wizard.py:546
 msgid "Account name is in use"
 msgstr "Fióknév használatban van"
 
-#: gajim/gtk/account_wizard.py:546
+#: gajim/gtk/account_wizard.py:547
 msgid "You already have an account using this name."
 msgstr "Már van egy fiókod ezzel a névvel."
 
@@ -10566,26 +10847,26 @@ msgstr "File transfer of %(filename)s from %(name)s stopped."
 msgid "%(minutes)s min %(seconds)s sec"
 msgstr ""
 
-#: gajim/gtk/xml_console.py:77
+#: gajim/gtk/xml_console.py:74
 #, fuzzy
 msgid "Filter"
 msgstr "Szűrés:"
 
-#: gajim/gtk/xml_console.py:82
+#: gajim/gtk/xml_console.py:79
 #, fuzzy
 msgid "XML Input"
 msgstr "<b>XML bemenet</b>"
 
-#: gajim/gtk/xml_console.py:86
+#: gajim/gtk/xml_console.py:83
 msgid "Paste Last Input"
 msgstr ""
 
-#: gajim/gtk/xml_console.py:170
+#: gajim/gtk/xml_console.py:167
 #, fuzzy, 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/xml_console.py:182
+#: gajim/gtk/xml_console.py:177
 #, fuzzy
 msgid "Invalid Node"
 msgstr "Érvénytelen file"
@@ -10618,39 +10899,54 @@ msgstr "Keresés"
 msgid "No results found"
 msgstr "Nincs eredmény"
 
-#: gajim/gtk/preferences.py:358 gajim/gtk/preferences.py:362
+#: gajim/gtk/preferences.py:357 gajim/gtk/preferences.py:361
 msgid "Default"
 msgstr "Alapértelmezett"
 
-#: gajim/gtk/preferences.py:801
+#: gajim/gtk/preferences.py:798
 msgid "status message title"
 msgstr "állapotüzenet címe"
 
-#: gajim/gtk/preferences.py:802
+#: gajim/gtk/preferences.py:799
 msgid "status message text"
 msgstr "állapotüzenet szövege"
 
+#: gajim/gtk/accounts.py:137
+#, fuzzy
+msgid "Re-Login"
+msgstr "Újracsatlakozik?"
+
 #: gajim/gtk/accounts.py:138
-msgid "Relogin now?"
+#, fuzzy
+msgid "Re-Login now?"
 msgstr "Újracsatlakozik?"
 
 #: gajim/gtk/accounts.py:139
-msgid "If you want all the changes to apply instantly, you must relogin."
+#, 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:191 gajim/gtk/accounts.py:975
+#: gajim/gtk/accounts.py:141
+msgid "_Later"
+msgstr ""
+
+#: gajim/gtk/accounts.py:143
+msgid "_Re-Login"
+msgstr ""
+
+#: gajim/gtk/accounts.py:194 gajim/gtk/accounts.py:978
 #, fuzzy
 msgid "Remove Account"
 msgstr "%s fiók törlése"
 
-#: gajim/gtk/accounts.py:192
+#: gajim/gtk/accounts.py:195
 #, fuzzy, python-format
 msgid "You still have open chats in your account %s"
 msgstr "Megnyitotál egy beszélgetést a következő fiókban: %s"
 
-#: gajim/gtk/accounts.py:193
+#: gajim/gtk/accounts.py:196
 #, fuzzy
 msgid ""
 "All chat and group chat windows will be closed.\n"
@@ -10659,32 +10955,32 @@ msgstr ""
 "Minden beszélgető és közös beszélgetőablak be lesz zárva. Szeretnéd "
 "folytatni?"
 
-#: gajim/gtk/accounts.py:424
+#: gajim/gtk/accounts.py:427
 #, fuzzy
 msgid "Back"
 msgstr "Nemsokára vagyok"
 
-#: gajim/gtk/accounts.py:530
+#: gajim/gtk/accounts.py:533
 #, 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:532
+#: gajim/gtk/accounts.py:535
 #, 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:569
+#: gajim/gtk/accounts.py:572
 #, fuzzy
 msgid "Disable Account"
 msgstr "Érvénytelen fiók"
 
-#: gajim/gtk/accounts.py:570
+#: gajim/gtk/accounts.py:573
 #, fuzzy, python-format
 msgid "Account %s is still connected"
 msgstr "A \"%s\" fiók csatlakozva van a szerverhez"
 
-#: gajim/gtk/accounts.py:571
+#: gajim/gtk/accounts.py:574
 #, fuzzy
 msgid ""
 "All chat and group chat windows will be closed. Do you want to continue?"
@@ -10692,86 +10988,86 @@ msgstr ""
 "Minden beszélgető és közös beszélgetőablak be lesz zárva. Szeretnéd "
 "folytatni?"
 
-#: gajim/gtk/accounts.py:576
+#: gajim/gtk/accounts.py:579
 #, fuzzy
 msgid "_Disable Account"
 msgstr "Érvénytelen fiók"
 
-#: gajim/gtk/accounts.py:595
+#: gajim/gtk/accounts.py:598
 #, fuzzy
 msgid "Add Account"
 msgstr "_Ismerős hozzáadása..."
 
-#: gajim/gtk/accounts.py:663
+#: gajim/gtk/accounts.py:666
 #, fuzzy
 msgid "Label"
 msgstr "címke"
 
-#: gajim/gtk/accounts.py:667
+#: gajim/gtk/accounts.py:670
 msgid "Login"
 msgstr ""
 
-#: gajim/gtk/accounts.py:670
+#: gajim/gtk/accounts.py:673
 #, fuzzy
 msgid "Import Contacts"
 msgstr "_Partnerek Meghívása "
 
-#: gajim/gtk/accounts.py:674 gajim/gtk/accounts.py:870
+#: gajim/gtk/accounts.py:677 gajim/gtk/accounts.py:873
 #, fuzzy
 msgid "Client Certificate"
 msgstr "Kliens tanusítvány"
 
-#: gajim/gtk/accounts.py:677 gajim/gtk/accounts.py:774
+#: gajim/gtk/accounts.py:680 gajim/gtk/accounts.py:777
 #, fuzzy
 msgid "Connect on startup"
 msgstr "C_satlakozás a Gajim indításával"
 
-#: gajim/gtk/accounts.py:681 gajim/gtk/accounts.py:779
+#: gajim/gtk/accounts.py:684 gajim/gtk/accounts.py:782
 #, fuzzy
 msgid "Save conversations for all contacts"
 msgstr "Beszé_lgetésnapló mentése az összes partnerhez"
 
-#: gajim/gtk/accounts.py:683 gajim/gtk/accounts.py:781
+#: gajim/gtk/accounts.py:686 gajim/gtk/accounts.py:784
 msgid "Store conversations on the harddrive"
 msgstr ""
 
-#: gajim/gtk/accounts.py:685 gajim/gtk/accounts.py:783
+#: gajim/gtk/accounts.py:688 gajim/gtk/accounts.py:786
 #, fuzzy
 msgid "Global Status"
 msgstr "Minden állapot"
 
-#: gajim/gtk/accounts.py:687
+#: gajim/gtk/accounts.py:690
 #, 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:689
+#: gajim/gtk/accounts.py:692
 msgid "Use file transfer proxies"
 msgstr "File küldő proxy-k használata"
 
-#: gajim/gtk/accounts.py:705
+#: gajim/gtk/accounts.py:708
 #, fuzzy
 msgid "Idle Time"
 msgstr "%s óta tétlen"
 
-#: gajim/gtk/accounts.py:707
+#: gajim/gtk/accounts.py:710
 msgid "Disclose the time of your last activity"
 msgstr ""
 
-#: gajim/gtk/accounts.py:709
+#: gajim/gtk/accounts.py:712
 msgid "Local System Time"
 msgstr ""
 
-#: gajim/gtk/accounts.py:711
+#: gajim/gtk/accounts.py:714
 msgid "Disclose the local system time of the device Gajim runs on"
 msgstr ""
 
-#: gajim/gtk/accounts.py:714
+#: gajim/gtk/accounts.py:717
 #, fuzzy
 msgid "Client / Operating System"
 msgstr "Kliens tanusítvány"
 
-#: gajim/gtk/accounts.py:716
+#: gajim/gtk/accounts.py:719
 #, fuzzy
 msgid ""
 "Disclose informations about the client and operating system you currently use"
@@ -10779,154 +11075,149 @@ msgstr ""
 "If ticked, Gajim will allow others to detect the operation system you are "
 "using"
 
-#: gajim/gtk/accounts.py:719
+#: gajim/gtk/accounts.py:722
 #, fuzzy
 msgid "Ignore Unknown Contacts"
 msgstr "_Partnerek Meghívása "
 
-#: gajim/gtk/accounts.py:721
+#: gajim/gtk/accounts.py:724
 #, fuzzy
 msgid "Ignore everything from contacts not in your Roster"
 msgstr "_Ignore events from contacts not in the roster"
 
-#: gajim/gtk/accounts.py:737 gajim/gtk/accounts.py:776
+#: gajim/gtk/accounts.py:740 gajim/gtk/accounts.py:779
 #, fuzzy
 msgid "Use environment variable"
 msgstr "HTTP__PROXY környezeti változójának _használata"
 
-#: gajim/gtk/accounts.py:739
-#, fuzzy
-msgid "Proxy"
-msgstr "Prox_y:"
-
-#: gajim/gtk/accounts.py:742
+#: gajim/gtk/accounts.py:745
 #, fuzzy
 msgid "Warn on insecure connection"
 msgstr "_Figyelmeztetés nem biztonságos kapcsolat használata előtt"
 
-#: gajim/gtk/accounts.py:746
+#: gajim/gtk/accounts.py:749
 #, fuzzy
 msgid "Send keep-alive packets"
 msgstr "_Kapcsolat életbentartó csomagok küldése"
 
-#: gajim/gtk/accounts.py:750
+#: gajim/gtk/accounts.py:753
 msgid "Manually set the hostname for the server"
 msgstr ""
 
-#: gajim/gtk/accounts.py:756 gajim/gtk/accounts.py:826
-#: gajim/gtk/accounts.py:831
+#: gajim/gtk/accounts.py:759 gajim/gtk/accounts.py:829
+#: gajim/gtk/accounts.py:834
 #, fuzzy
 msgid "Priority"
 msgstr "Priori_tás:"
 
-#: gajim/gtk/accounts.py:785
+#: gajim/gtk/accounts.py:788
 #, 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:795
+#: gajim/gtk/accounts.py:798
 #, fuzzy
 msgid "First Name"
 msgstr "Vezetéknév:"
 
-#: gajim/gtk/accounts.py:798
+#: gajim/gtk/accounts.py:801
 #, fuzzy
 msgid "Last Name"
 msgstr "Keresztnév:"
 
-#: gajim/gtk/accounts.py:804
+#: gajim/gtk/accounts.py:807
 #, fuzzy
 msgid "Email"
 msgstr "Új E-mail"
 
-#: gajim/gtk/accounts.py:822
+#: gajim/gtk/accounts.py:825
 #, fuzzy
 msgid "Adjust to status"
 msgstr "Állapothoz _igazítás"
 
-#: gajim/gtk/accounts.py:849
+#: gajim/gtk/accounts.py:852
 #, fuzzy
 msgid "Enable"
 msgstr "Engedélyezve"
 
-#: gajim/gtk/accounts.py:857
+#: gajim/gtk/accounts.py:860
 #, fuzzy
 msgid "Port"
 msgstr "_Port:"
 
-#: gajim/gtk/accounts.py:862
+#: gajim/gtk/accounts.py:865
 #, fuzzy
 msgid "Connection Settings"
 msgstr "Kapcsolat"
 
-#: gajim/gtk/accounts.py:872
+#: gajim/gtk/accounts.py:875
 msgid "PKCS12 Files"
 msgstr "PKCS12 Fileok"
 
-#: gajim/gtk/accounts.py:874
+#: gajim/gtk/accounts.py:877
 #, fuzzy
 msgid "Encrypted Certificate"
 msgstr "Kliens tanusítvány"
 
-#: gajim/gtk/accounts.py:878
+#: gajim/gtk/accounts.py:881
 #, fuzzy
 msgid "Certificate Settings"
 msgstr "Kliens tanusítvány"
 
-#: gajim/gtk/accounts.py:890
+#: gajim/gtk/accounts.py:893
 #, fuzzy
 msgid "Save Password"
 msgstr "Jelszó megjegyzése"
 
-#: gajim/gtk/accounts.py:898
+#: gajim/gtk/accounts.py:901
 #, fuzzy
 msgid "Login Settings"
 msgstr "Regisztráció nem sikerült"
 
-#: gajim/gtk/accounts.py:931
+#: gajim/gtk/accounts.py:934
 #, fuzzy, python-format
 msgid "Removing account %s"
 msgstr "%s fiók törlése"
 
-#: gajim/gtk/accounts.py:946
+#: gajim/gtk/accounts.py:949
 msgid "Account is disabled"
 msgstr "Fiók kikapcsolva"
 
-#: gajim/gtk/accounts.py:947
+#: gajim/gtk/accounts.py:950
 #, fuzzy
 msgid "To unregister from a server, the account must be enabled."
 msgstr ""
 "Ahhoz hogy töröld a regisztrációd egy szerverről, a fiókodnak engedélyezve "
 "kell lenni."
 
-#: gajim/gtk/accounts.py:962
+#: gajim/gtk/accounts.py:965
 #, fuzzy
 msgid "Password required"
 msgstr "Jelszó szükséges"
 
-#: gajim/gtk/accounts.py:976
+#: gajim/gtk/accounts.py:979
 #, fuzzy, python-format
 msgid "Account '%s' is still connected to the server"
 msgstr "A \"%s\" fiók csatlakozva van a szerverhez"
 
-#: gajim/gtk/accounts.py:978
+#: gajim/gtk/accounts.py:981
 msgid "If you remove it, the connection will be lost."
 msgstr "Ha eltávolítod, akkor a kapcsolat megszakad."
 
-#: gajim/gtk/accounts.py:995
+#: gajim/gtk/accounts.py:998
 #, python-format
 msgid "Connection to server %s failed"
 msgstr "A kapcsolat a %s szerverrel megszakadt"
 
-#: gajim/gtk/accounts.py:996
+#: gajim/gtk/accounts.py:999
 msgid "What would you like to do?"
 msgstr "Mit szeretnél tenni?"
 
-#: gajim/gtk/accounts.py:997
+#: gajim/gtk/accounts.py:1000
 msgid "Remove only from Gajim"
 msgstr "Eltávolítás csak a Gajim-ból"
 
-#: gajim/gtk/accounts.py:998
+#: gajim/gtk/accounts.py:1001
 msgid "Don't remove anything. I'll try again later"
 msgstr "Ne távolíts el semmit. Később újból megpróbálom"
 
@@ -10951,6 +11242,10 @@ msgstr ""
 msgid "Modify"
 msgstr "Módosít"
 
+#: gajim/gtk/roster_item_exchange.py:80
+msgid "JID"
+msgstr "Jabber Azonosító"
+
 #: gajim/gtk/roster_item_exchange.py:86
 msgid "Groups"
 msgstr "Csoportok"
@@ -10974,19 +11269,19 @@ msgid_plural "Removed %d contacts"
 msgstr[0] "%d partner eltávolítva"
 msgstr[1] "%d partner eltávolítva"
 
-#: gajim/gtk/util.py:581
+#: gajim/gtk/util.py:583
 msgid "Unknown Artist"
 msgstr "Ismeretlen Előadó"
 
-#: gajim/gtk/util.py:582
+#: gajim/gtk/util.py:584
 msgid "Unknown Title"
 msgstr "Ismeretlen Cím"
 
-#: gajim/gtk/util.py:583
+#: gajim/gtk/util.py:585
 msgid "Unknown Source"
 msgstr "Ismeretlen forrás"
 
-#: gajim/gtk/util.py:585
+#: gajim/gtk/util.py:587
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
@@ -10995,28 +11290,10 @@ msgstr ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
 "from <i>%(source)s</i>"
 
-#: gajim/gtk/bookmarks.py:121
-msgid "New Group Chat"
-msgstr "Új közös beszélgetés"
-
-#: gajim/gtk/bookmarks.py:161
-msgid "This bookmark has invalid data"
-msgstr "Ennek a könyvjelzőnek érvénytelen adatai vanak"
-
-#: gajim/gtk/bookmarks.py:162
-msgid ""
-"Please be sure to fill out server and room fields or remove this bookmark."
-msgstr ""
-"Kérlek töltsd ki a szerver és a szoba mezőket vagy töröld ezt a könyvjelzőt."
-
-#: gajim/gtk/bookmarks.py:273 gajim/gtk/bookmarks.py:291
-#: gajim/gtk/bookmarks.py:304 gajim/gtk/bookmarks.py:335
-msgid "Character not allowed"
-msgstr "Nem megengedett karakter"
-
-#: gajim/gtk/bookmarks.py:334
-msgid "Invalid room"
-msgstr "Érvénytelen szoba"
+#: gajim/gtk/bookmarks.py:47
+#, fuzzy, python-format
+msgid "Bookmarks for %s"
+msgstr "_Könyvjelző"
 
 #: gajim/plugins/pluginmanager.py:736 gajim/plugins/pluginmanager.py:742
 msgid "Archive corrupted"
@@ -11028,51 +11305,54 @@ msgid "Archive empty"
 msgstr "A file üres"
 
 #: gajim/plugins/pluginmanager.py:750 gajim/plugins/pluginmanager.py:758
-#: gajim/plugins/gui.py:257
+#: gajim/plugins/gui.py:258
 #, fuzzy
 msgid "Archive is malformed"
 msgstr "Service sent malformed data"
 
-#: gajim/plugins/pluginmanager.py:766 gajim/plugins/gui.py:281
-#: gajim/plugins/gui.py:289
+#: gajim/plugins/pluginmanager.py:766 gajim/plugins/gui.py:288
+#: gajim/plugins/gui.py:301
 #, fuzzy
 msgid "Plugin already exists"
 msgstr "Ez a file már létezik"
 
-#: gajim/plugins/gui.py:82
+#: gajim/plugins/gui.py:83
 msgid "Click to view Gajim's wiki page on how to install plugins in Flatpak."
 msgstr ""
 
-#: gajim/plugins/gui.py:89
+#: gajim/plugins/gui.py:90
 msgid "Plugin"
 msgstr ""
 
-#: gajim/plugins/gui.py:151
+#: gajim/plugins/gui.py:152
 #, fuzzy, python-format
 msgid "Warning: %s"
 msgstr "%s bannolása"
 
-#: gajim/plugins/gui.py:206
+#: gajim/plugins/gui.py:207
 #, fuzzy
 msgid "Plugin failed"
 msgstr "Regisztráció nem sikerült"
 
-#: gajim/plugins/gui.py:245
+#: gajim/plugins/gui.py:246
 msgid "Unable to properly remove the plugin"
 msgstr ""
 
-#: gajim/plugins/gui.py:281
-msgid "Overwrite?"
-msgstr ""
+#: gajim/plugins/gui.py:287
+#, fuzzy
+msgid "Overwrite Plugin?"
+msgstr "Felülítja az állapotüzenetet?"
+
+#: gajim/plugins/gui.py:289
+#, fuzzy
+msgid "Do you want to overwrite the currently installed version?"
+msgstr "El szeretnéd fogadni a meghívást?"
 
 #: data/org.gajim.Gajim.desktop.in:5
-msgid "Jabber IM Client"
+#, fuzzy
+msgid "XMPP IM Client"
 msgstr "Jabber Azonnali üzenetküldő kliens"
 
-#: data/org.gajim.Gajim.desktop.in:6
-msgid "A GTK+ Jabber client"
-msgstr "Egy GTK+ Jabber kliens"
-
 #: data/org.gajim.Gajim.desktop.in:8
 msgid "chat;messaging;im;xmpp;bonjour;voip;"
 msgstr ""
@@ -11124,7 +11404,7 @@ msgid "Easily send pictures, videos or other files to friends and groups"
 msgstr ""
 
 #: data/org.gajim.Gajim.appdata.xml.in:27
-msgid "Chat securely with End-to-End encryption via OMEMO or PGP"
+msgid "Chat securely with End-to-End encryption via OMEMO or OpenPGP"
 msgstr ""
 
 #: data/org.gajim.Gajim.appdata.xml.in:28
@@ -11186,7 +11466,7 @@ msgstr ""
 
 #: data/org.gajim.Gajim.appdata.xml.in:52
 #, fuzzy
-msgid "Roster, list of contacts"
+msgid "Contact list, list of contacts"
 msgstr "_Log status changes of contacts"
 
 #: data/org.gajim.Gajim.appdata.xml.in:56
@@ -11208,6 +11488,526 @@ msgstr "Legutóbbi:"
 msgid "Plugin manager"
 msgstr "Regisztráció nem sikerült"
 
+#, fuzzy
+#~ msgid "Configure Services…"
+#~ msgstr "Szolgáltatások beállítása..."
+
+#, fuzzy
+#~ msgid "Group Chat Bookmarks"
+#~ msgstr "_Csoportos beszélgetés"
+
+#, fuzzy
+#~ msgid "Add Bookmark"
+#~ msgstr "_Könyvjelző"
+
+#, fuzzy
+#~ msgid "Remove Bookmark"
+#~ msgstr "_Könyvjelző"
+
+#, fuzzy
+#~ msgid "Bookmark Name"
+#~ msgstr "Szoba felvétele a _könyvjelzők közé"
+
+#, fuzzy
+#~ msgid "_Server"
+#~ msgstr "_Szerver:"
+
+#, fuzzy
+#~ msgid "_Password"
+#~ msgstr "_Jelszó:"
+
+#, fuzzy
+#~ msgid "Join chat when connected"
+#~ msgstr "Partner lecsatlakozott"
+
+#~ msgid "New Group Chat"
+#~ msgstr "Új közös beszélgetés"
+
+#~ msgid "This bookmark has invalid data"
+#~ msgstr "Ennek a könyvjelzőnek érvénytelen adatai vanak"
+
+#, fuzzy
+#~ msgid ""
+#~ "Please be sure to fill out server and group chat fields or remove this "
+#~ "bookmark."
+#~ msgstr ""
+#~ "Kérlek töltsd ki a szerver és a szoba mezőket vagy töröld ezt a "
+#~ "könyvjelzőt."
+
+#~ msgid "Character not allowed"
+#~ msgstr "Nem megengedett karakter"
+
+#, fuzzy
+#~ msgid "Invalid Group Chat"
+#~ msgstr "Érvénytelen közös társalgási Jabber Azonosító"
+
+#~ msgid "Unable to join group chat"
+#~ msgstr "Nem sikerült csatlakozni közös beszélgetéshez"
+
+#, fuzzy
+#~ msgid "You are banned from group chat <b>%s</b>."
+#~ msgstr "Bannolva lettél a közös beszélgetésekből %s."
+
+#, fuzzy
+#~ msgid "Remote server <b>%s</b> does not exist."
+#~ msgstr "Group chat %s does not exist."
+
+#, fuzzy
+#~ msgid "Group chat <b>%s</b> does not exist."
+#~ msgstr "Group chat %s does not exist."
+
+#, fuzzy
+#~ msgid "Group chat creation is not permitted."
+#~ msgstr "Közös beszélgetés létrehozása korlátozva van."
+
+#, fuzzy
+#~ msgid "You must use your registered nickname in <b>%s</b>."
+#~ msgstr ""
+#~ "A regisztrált becenevedet kell használnod a közös beszélgetésben %s."
+
+#, fuzzy
+#~ msgid "You are not in the members list in group chat %s."
+#~ msgstr "Nem vagy ennek a közös beszélgetésnek a taglistáján %s."
+
+#, fuzzy
+#~ msgid "XMPP Address is not a group chat"
+#~ msgstr "Ez nem egy közös társalgás"
+
+#~ msgid "This is not a group chat"
+#~ msgstr "Ez nem egy közös társalgás"
+
+#, fuzzy
+#~ msgid "Please choose a group chat"
+#~ msgstr "Kérlek készíts egy tiszta új témát a kívánt névvel."
+
+#~ msgid "Invalid Nickname"
+#~ msgstr "Érvénytelen becenév"
+
+#, fuzzy
+#~ msgid "Please choose a nickname"
+#~ msgstr "Kérlek készíts egy tiszta új témát a kívánt névvel."
+
+#, fuzzy
+#~ msgid "Wrong server"
+#~ msgstr "Rossz URI"
+
+#, fuzzy
+#~ msgid "%s is not a group chat server"
+#~ msgstr "Ez nem egy közös társalgás"
+
+#, fuzzy
+#~ msgid ""
+#~ "How many lines to request from server when entering a group chat. -1 "
+#~ "means no limit."
+#~ msgstr "How many lines to request to server when entering a groupchat."
+
+#, fuzzy
+#~ msgid ""
+#~ "Minutes of backlog to request when entering a group chat. -1 means no "
+#~ "limit."
+#~ msgstr "How many minutes back to request logs when a entering a groupchat."
+
+#, fuzzy
+#~ msgid ""
+#~ "How many lines to request from server when entering a group chat. -1 "
+#~ "means no limit, -2 means global value."
+#~ msgstr "How many lines to request to server when entering a groupchat."
+
+#, fuzzy
+#~ msgid ""
+#~ "Minutes of backlog to request when entering a group chat. -1 means no "
+#~ "limit, -2 means global value."
+#~ msgstr "How many minutes back to request logs when a entering a groupchat."
+
+#, fuzzy
+#~ msgid "A Password is required to join the group chat %s. Please type it."
+#~ msgstr "A Password is required to join the room %s. Please type it."
+
+#~ msgid "Not in Roster"
+#~ msgstr "Nincs a névsorban"
+
+#~ msgid "I would like to add you to my roster"
+#~ msgstr "Hozzá szeretnélek adni a névsoromhoz"
+
+#, fuzzy
+#~ msgid "Add to Roster"
+#~ msgstr "_Hozzáadás a Főablakhoz"
+
+#, fuzzy
+#~ msgid "Audio Session"
+#~ msgstr "Hang teszt"
+
+#, fuzzy
+#~ msgid "Video Session"
+#~ msgstr "Videó teszt"
+
+#, fuzzy
+#~ msgid "Manage Room"
+#~ msgstr "Szoba _Kezelése"
+
+#, fuzzy
+#~ msgid "Configure Room"
+#~ msgstr "_Szoba Beállítása..."
+
+#, fuzzy
+#~ msgid "Destroy Room"
+#~ msgstr "Szoba _törlése"
+
+#, fuzzy
+#~ msgid "Change Nick"
+#~ msgstr "Becenév _megváltoztatása..."
+
+#, fuzzy
+#~ msgid "Disconnect"
+#~ msgstr "_Lecsatlakozás"
+
+#, fuzzy
+#~ msgid "Copy JID"
+#~ msgstr "Szoba Jabber Azonosítója"
+
+#, fuzzy
+#~ msgid "Add to Roster…"
+#~ msgstr "_Hozzáadás a Főablakhoz"
+
+#, fuzzy
+#~ msgid "Copy JID/Email"
+#~ msgstr "JID/E-mail Cím _Másolása"
+
+#, fuzzy
+#~ msgid "JID: <i>%s</i>"
+#~ msgstr "Jabber Azonosító: <i>%s</i>"
+
+#~ msgid "Changing Subject"
+#~ msgstr "Téma váltása"
+
+#~ msgid "Please specify the new subject:"
+#~ msgstr "Kérlek add meg az új témát:"
+
+#~ msgid "Room logging is now enabled"
+#~ msgstr "A szoba naplózása mostantól engedélyezve van"
+
+#~ msgid "Room logging is now disabled"
+#~ msgstr "A szoba naplózása mostantól nincs engedélyezve"
+
+#, fuzzy
+#~ msgid "You (%s) joined the room"
+#~ msgstr "%s csatlakozott a közös beszélgetéshez"
+
+#~ msgid "Room logging is enabled"
+#~ msgstr "Szoba naplózása engedélyezve"
+
+#, fuzzy
+#~ msgid "Unable to join groupchat"
+#~ msgstr "Nem sikerült csatlakozni közös beszélgetéshez"
+
+#~ msgid "Groupchat Invitation"
+#~ msgstr "Meghívó közös társalgásba"
+
+#, fuzzy
+#~ msgid "%(jid)s has been invited in this room"
+#~ msgstr "%(nick)s el lettek távolítva a szobából (%(reason)s)"
+
+#, fuzzy
+#~ msgid "JID is not a Groupchat"
+#~ msgstr "Ez nem egy közös társalgás"
+
+#~ msgid "Invalid JID"
+#~ msgstr "Érvénytelen Jabber Azonosító"
+
+#~ msgid "A connection is not available"
+#~ msgstr "Egy kapcsolat nem elérhető"
+
+#, fuzzy
+#~ msgid "JID already in list"
+#~ msgstr "Ez a Jabber Azonosító már a listán van"
+
+#, fuzzy
+#~ msgid "For the chosen encryption there is no encryption method available"
+#~ msgstr "Egy kapcsolat nem elérhető"
+
+#~ msgid "Removes contact from roster"
+#~ msgstr "Eltávolítja a partnert a névsorról"
+
+#~ msgid "Not in roster"
+#~ msgstr "Nincs a névsoron"
+
+#, fuzzy
+#~ msgid "File transfer request notification color."
+#~ msgstr "Fileküldési Kérelem "
+
+#, fuzzy
+#~ msgid "File transfer error notification color."
+#~ msgstr "Fileátvitel megszakítva"
+
+#, fuzzy
+#~ msgid "File transfer complete or stopped notification color."
+#~ msgstr "Show a pop-up notification when a file transfer is complete "
+
+#, fuzzy
+#~ msgid "Groupchat invitation notification color"
+#~ msgstr "Meghívó közös társalgásba"
+
+#, fuzzy
+#~ msgid "Add * and [n] in roster title?"
+#~ msgstr "Add * and [n] in roster title?"
+
+#, fuzzy
+#~ msgid "Hides the banner in two persons chat window"
+#~ msgstr "Hides the banner in two persons chat window"
+
+#, fuzzy
+#~ msgid ""
+#~ "Show the confirm metacontacts creation dialog or not? Empty string means "
+#~ "never show the dialog."
+#~ msgstr ""
+#~ "Should we show the confirm metacontacts creation dialogue or not? Empty "
+#~ "string means we never show the dialogue."
+
+#, fuzzy
+#~ msgid "Space separated list of ssl errors to ignore."
+#~ msgstr "Space separated list of SSL errors to ignore."
+
+#, fuzzy
+#~ msgid "Answer to receipt requests"
+#~ msgstr "Answer to receipt requests"
+
+#, fuzzy
+#~ msgid "Sent receipt requests"
+#~ msgstr "Sent receipt requests"
+
+#, fuzzy
+#~ msgid "Language for which misspelled words will be checked"
+#~ msgstr "Language for which we want to check misspelt words"
+
+#~ msgid "I'm eating, so leave me a message."
+#~ msgstr "Eszek, hagyj üzenetet."
+
+#, fuzzy
+#~ msgid "from room %s"
+#~ msgstr " szobából %s"
+
+#~ msgid "Leave Groupchats"
+#~ msgstr "Csoportos beszélgetések elhagyása"
+
+#, fuzzy
+#~ msgid "Auto Join"
+#~ msgstr "Automatikus csatlakozás"
+
+#, fuzzy
+#~ msgid "Room"
+#~ msgstr "Szoba:"
+
+#~ msgid "Jabber ID:"
+#~ msgstr "Jabber Azonosító:"
+
+#, fuzzy
+#~ msgid "Occupant Actions"
+#~ msgstr "Occupant Actions"
+
+#~ msgid "_Add to Roster"
+#~ msgstr "_Hozzáadás a Főablakhoz"
+
+#~ msgid "_Manage Room"
+#~ msgstr "Szoba _Kezelése"
+
+#~ msgid "Configure _Room..."
+#~ msgstr "_Szoba Beállítása..."
+
+#~ msgid "_Destroy Room"
+#~ msgstr "Szoba _törlése"
+
+#~ msgid "Jabber ID"
+#~ msgstr "Jabber Azonosító"
+
+#, fuzzy
+#~ msgid "account"
+#~ msgstr "Fiók"
+
+#, fuzzy
+#~ msgid "Roster"
+#~ msgstr "Névsor mutatása"
+
+#~ msgid "Show only in roster"
+#~ msgstr "Csak a főablakban jelenítse meg"
+
+#~ msgid "in _roster"
+#~ msgstr "_főablakban"
+
+#, fuzzy
+#~ msgid "Roster Appearance"
+#~ msgstr "<b>Főablak kinézete</b>"
+
+#, fuzzy
+#~ msgid "Show chatstate in roster"
+#~ msgstr "Partnerek a_vatarjainak megjelenítése a főablakban"
+
+#~ msgid "_Add to Roster..."
+#~ msgstr "_Hozzáad a Partnerlistához..."
+
+#~ msgid "_Jabber ID:"
+#~ msgstr "_Jabber ID:"
+
+#, fuzzy
+#~ msgid "_Jabber ID"
+#~ msgstr "_Jabber ID:"
+
+#~ msgid "JabberID"
+#~ msgstr "Jabber Azonosító"
+
+#, fuzzy
+#~ msgid "Show Roster"
+#~ msgstr "Névsor mutatása"
+
+#~ msgid "MUC server"
+#~ msgstr "MUC szerver"
+
+#~ msgid "Room Configuration"
+#~ msgstr "Szoba Konfiguráció"
+
+#~ msgid "Join _Group Chat"
+#~ msgstr "Csatlakozás _Csoportos Társalgáshoz"
+
+#, fuzzy
+#~ msgid "Audio sessions are not available"
+#~ msgstr "Egy kapcsolat nem elérhető"
+
+#~ msgid "Conference"
+#~ msgstr "Konferencia"
+
+#, fuzzy
+#~ msgid "_Manage Bookmarks…"
+#~ msgstr "Könyvjelzők kezelése"
+
+#~ msgid "Hide _Roster"
+#~ msgstr "Névsor el_rejtése"
+
+#~ msgid "Show _Roster"
+#~ msgstr "Névsor mutatása"
+
+#, fuzzy
+#~ msgid "Invalid Room"
+#~ msgstr "Érvénytelen szoba"
+
+#~ msgid "Invalid room"
+#~ msgstr "Érvénytelen szoba"
+
+#~ msgid "A GTK+ Jabber client"
+#~ msgstr "Egy GTK+ Jabber kliens"
+
+#~ msgid "Changing Nickname"
+#~ msgstr "Becenév megváltoztatása"
+
+#~ msgid "Please specify the new nickname you want to use:"
+#~ msgstr "Kérlek határozd meg az új becenevet amelyet használni szerenél:"
+
+#~ msgid "Bookmark already set"
+#~ msgstr "Ez a könyvjelző már fel van véve"
+
+#, fuzzy
+#~ msgid "Group Chat '%s' is already in your bookmarks."
+#~ msgstr "Group Chat \"%s\" is already in your bookmarks."
+
+#~ msgid "Bookmark has been added successfully"
+#~ msgstr "A könyvjelző sikeresen hozzá lett adva"
+
+#, fuzzy
+#~ msgid ""
+#~ "You can manage your bookmarks by clicking the Bookmarks menu item in your "
+#~ "contact list."
+#~ msgstr ""
+#~ "A könyvjelzőkezelőt a névsor tetején lévő \"Műveletek\" menüben éred el"
+
+#, fuzzy
+#~ msgid "The nickname contains invalid characters."
+#~ msgstr "A becenévben nem megengedett karakterek vannak."
+
+#, fuzzy
+#~ msgid "Bookmark Room"
+#~ msgstr "Szoba felvétele a _könyvjelzők közé"
+
+#~ msgid "_Join New Group Chat"
+#~ msgstr "_Csatlakozás új közös beszélgetéshez"
+
+#, fuzzy
+#~ msgid "_Create Group Chat"
+#~ msgstr "Csoportos beszélgetések elhagyása"
+
+#, fuzzy
+#~ msgid "Name:"
+#~ msgstr "Név: "
+
+#, fuzzy
+#~ msgid "Description:"
+#~ msgstr "Leírás: "
+
+#, fuzzy
+#~ msgid "Address:"
+#~ msgstr "_Cím:"
+
+#, fuzzy
+#~ msgid "You can not start a new conversation unless you are connected."
+#~ msgstr "Addig nem léphetsz be közös társalgásba amíg csatlakozva vagy."
+
+#, fuzzy
+#~ msgid "Occupants"
+#~ msgstr "Occupant Actions"
+
+#, fuzzy
+#~ msgid "File transfer error"
+#~ msgstr "Fileátvitel hiba"
+
+#, fuzzy
+#~ msgid "No Accounts available"
+#~ msgstr "No account available"
+
+#~ msgid "_Modify Account..."
+#~ msgstr "Fiók _módosítása..."
+
+#~ msgid "Boolean"
+#~ msgstr "Eldöntendő"
+
+#~ msgid "Integer"
+#~ msgstr "Egész szám"
+
+#~ msgid "Text"
+#~ msgstr "Szöveg"
+
+#~ msgid "Value"
+#~ msgstr "Érték"
+
+#~ msgid "Type"
+#~ msgstr "Típus"
+
+#~ msgid "(None)"
+#~ msgstr "(Nincs)"
+
+#~ msgid "Hidden"
+#~ msgstr "Rejtett"
+
+#, fuzzy
+#~ msgid "Manage Proxy Profiles"
+#~ msgstr "Manage Proxy Profiles"
+
+#, fuzzy
+#~ msgid "Properties"
+#~ msgstr "<b>Tulajdonságok</b>"
+
+#, fuzzy
+#~ msgid "Proxy _Host"
+#~ msgstr "Proxy _Hoszt:"
+
+#, fuzzy
+#~ msgid "Proxy _Port"
+#~ msgstr "Proxy _Port:"
+
+#, fuzzy
+#~ msgid "New Groupchat"
+#~ msgstr "Új közös beszélgetés"
+
+#, fuzzy
+#~ msgid "New Contact"
+#~ msgstr "Új partner felvétele"
+
 #~ msgid "%s GiB"
 #~ msgstr "%s GiB"
 
@@ -11294,9 +12094,6 @@ msgstr "Regisztráció nem sikerült"
 #~ msgid "_Pause"
 #~ msgstr "_Szünet"
 
-#~ msgid "Clean _up"
-#~ msgstr "_Tisztítás"
-
 #~ msgid "Remove file transfer from the list."
 #~ msgstr "Fileátvitel eltávolítása a listáról."
 
@@ -11749,9 +12546,6 @@ msgstr "Regisztráció nem sikerült"
 #~ msgid "You are invited to a groupchat"
 #~ msgstr "Meghívtak közös társalgásba"
 
-#~ msgid "Do you want to accept the invitation?"
-#~ msgstr "El szeretnéd fogadni a meghívást?"
-
 #~ msgid "_Start Chat"
 #~ msgstr "Beszélgetés _Indítása"
 
@@ -11779,10 +12573,6 @@ msgstr "Regisztráció nem sikerült"
 #~ msgid "Do you wish to delete all correspondence with the selected contacts?"
 #~ msgstr "Biztosan szeretnéd törölni a kiválasztott partner naplóit?"
 
-#, fuzzy
-#~ msgid "This can not be undone."
-#~ msgstr "A szolgáltatás nem található"
-
 #~ msgid "<b>What do you want to do?</b>"
 #~ msgstr "<b>Mit szeretnél csinálni?</b>"
 
@@ -11974,10 +12764,6 @@ msgstr "Regisztráció nem sikerült"
 #~ msgid "Nick"
 #~ msgstr "Becenév"
 
-#, fuzzy
-#~ msgid "Banning…"
-#~ msgstr "Bannolás..."
-
 #~ msgid ""
 #~ "<b>Whom do you want to ban?</b>\n"
 #~ "\n"
@@ -12059,12 +12845,6 @@ msgstr "Regisztráció nem sikerült"
 #~ msgid "Filter:"
 #~ msgstr "Szűrés:"
 
-#, fuzzy
-#~ msgid ""
-#~ "If checked, Gajim will display the mood of contacts in the roster window"
-#~ msgstr ""
-#~ "If ticked, Gajim will display the mood of contacts in the roster window"
-
 #~ msgid "<b>Chat Appearance</b>"
 #~ msgstr "<b>Beszélgetés kinézete</b>"
 
@@ -12336,10 +13116,6 @@ msgstr "Regisztráció nem sikerült"
 #~ msgstr "_Állapot üzenet:"
 
 #, fuzzy
-#~ msgid "Group chat highlight"
-#~ msgstr "Közös beszélgetés üzenet kiemelése"
-
-#, fuzzy
 #~ msgid "Your nickname"
 #~ msgstr "Beceneved:"
 
@@ -12479,9 +13255,6 @@ msgstr "Regisztráció nem sikerült"
 #~ msgid "The passwords typed in both fields must be identical."
 #~ msgstr "A jelszavaknak egyezniük kell egymással mindkét mezőben."
 
-#~ msgid "Enter new password:"
-#~ msgstr "Írja be az új jelszót:"
-
 #~ msgid "Enter it again for confirmation:"
 #~ msgstr "Írja be újra megerősítésképp:"
 
@@ -12497,10 +13270,6 @@ msgstr "Regisztráció nem sikerült"
 #~ msgstr "liratkozási kérelem tőle: %s"
 
 #, fuzzy
-#~ msgid "Autojoin"
-#~ msgstr "Automatikus csatlakozás"
-
-#, fuzzy
 #~ msgid "Homepage:"
 #~ msgstr "<b>Weboldal:</b>"
 
@@ -12614,9 +13383,6 @@ msgstr "Regisztráció nem sikerült"
 #~ msgid "Forward unread message then disconnect"
 #~ msgstr "Továbbítsd az olvasatlan üzeneteket, majd kapcsolódj le"
 
-#~ msgid "AIM Address:"
-#~ msgstr "AIM cím:"
-
 #~ msgid "MSN Address:"
 #~ msgstr "MSN cím:"
 
@@ -12667,10 +13433,6 @@ msgstr "Regisztráció nem sikerült"
 #~ msgid "Session negotiation cancelled"
 #~ msgstr "Munkamenet létrehozása megszakítva"
 
-#, fuzzy
-#~ msgid "This session WILL NOT be archived on server"
-#~ msgstr "A munkamenet NEM LESZ naplózva"
-
 #~ msgid "This session is encrypted"
 #~ msgstr "Ez a munkamenet titkosított"
 
@@ -13002,9 +13764,6 @@ msgstr "Regisztráció nem sikerült"
 #~ msgid "Server:"
 #~ msgstr "Szerver:"
 
-#~ msgid "Password:"
-#~ msgstr "Jelszó:"
-
 #, fuzzy
 #~ msgid "Join this room _automatically when I connect"
 #~ msgstr "Join this room _automatically when I connect"
@@ -13344,10 +14103,6 @@ msgstr "Regisztráció nem sikerült"
 #~ msgid "_Edit Personal Information..."
 #~ msgstr "_Személyes adatok szerkesztése..."
 
-#, fuzzy
-#~ msgid "Information about you, as stored in the server"
-#~ msgstr "Information about you, as stored in the server"
-
 #~ msgid "<b>Personal Information</b>"
 #~ msgstr "<b>Személyes információ</b>"
 
@@ -13429,9 +14184,6 @@ msgstr "Regisztráció nem sikerült"
 #~ msgid "Your server can't save your personal information."
 #~ msgstr "A szervered nem menti el a személyes adataid."
 
-#~ msgid "Account Local already exists."
-#~ msgstr "A Helyi fiók már létezik."
-
 #~ msgid "Please rename or remove it before enabling link-local messaging."
 #~ msgstr ""
 #~ "Kérlek nevezd át vagy töröld mielőtt engedélyezed a link-local "
@@ -13541,10 +14293,6 @@ msgstr "Regisztráció nem sikerült"
 #~ msgid "The following message was NOT encrypted"
 #~ msgstr "A következő szöveg NEM VOLT titkosítva"
 
-#, fuzzy
-#~ msgid "Encryption used for this contact."
-#~ msgstr "Enable ESessions encryption for this account."
-
 #~ msgid "Toggle Open_PGP Encryption"
 #~ msgstr "Open_PGP titkosítás Be/Kikapcsolása"
 
@@ -13625,10 +14373,6 @@ msgstr "Regisztráció nem sikerült"
 #~ msgid "Contact's identity verified"
 #~ msgstr "Partner kiléte hitelesítve"
 
-#, fuzzy
-#~ msgid "Verify again…"
-#~ msgstr "Újra hitelesít..."
-
 #~ msgid ""
 #~ "To be certain that <b>only</b> the expected person can read your messages "
 #~ "or send you messages, you need to verify their identity by clicking the "
@@ -13764,9 +14508,6 @@ msgstr "Regisztráció nem sikerült"
 #~ msgid "Add _Contact..."
 #~ msgstr "_Partner felvétele..."
 
-#~ msgid "_Accounts"
-#~ msgstr "_Fiókok"
-
 #~ msgid "Profile, A_vatar"
 #~ msgstr "Profil, A_vatar"
 
@@ -14033,12 +14774,6 @@ msgstr "Regisztráció nem sikerült"
 #~ msgid "Activity: "
 #~ msgstr "Tevékenység:"
 
-#~ msgid "Join _Group Chat..."
-#~ msgstr "_Csatlakozás közös beszélgetéshez..."
-
-#~ msgid "_Modify Account"
-#~ msgstr "_Fiók módosítása"
-
 #, fuzzy
 #~ msgid "Check on startup if Gajim is the _default Jabber client"
 #~ msgstr "Check on startup if Gajim is the _default Jabber client"
@@ -14072,9 +14807,6 @@ msgstr "Regisztráció nem sikerült"
 #~ msgid "The path to the client certificate and key in PKCS#12 format"
 #~ msgstr "The path to the client certificate and key in PKCS#12 format"
 
-#~ msgid " a window/tab opened with that contact "
-#~ msgstr " a window/tab opened with that contact "
-
 #~ msgid "<b>Actions</b>"
 #~ msgstr "<b>Műveletek</b>"
 
diff --git a/po/it.po b/po/it.po
index cfec6cb8e..32577ba0f 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: 2019-07-02 02:06+0000\n"
+"POT-Creation-Date: 2019-08-11 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,67 +22,67 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Virtaal 0.7.1\n"
 
-#: gajim/chat_control_base.py:550
+#: gajim/chat_control_base.py:557
 msgid "_Undo"
 msgstr "Ann_ulla"
 
-#: gajim/chat_control_base.py:558 gajim/conversation_textview.py:529
+#: gajim/chat_control_base.py:565 gajim/conversation_textview.py:529
 msgid "_Clear"
 msgstr "_Cancella"
 
-#: gajim/chat_control_base.py:563
+#: gajim/chat_control_base.py:570
 msgid "Paste as quote"
 msgstr "Incolla come citazione"
 
-#: gajim/chat_control_base.py:613
+#: gajim/chat_control_base.py:620
 #, fuzzy
 msgid "Paste Image"
 msgstr "Scegli un'immagine"
 
-#: gajim/chat_control_base.py:614
+#: gajim/chat_control_base.py:621
 #, fuzzy
 msgid "You are trying to paste an image"
 msgstr "Stai per chiudere diverse schede"
 
-#: gajim/chat_control_base.py:615
+#: gajim/chat_control_base.py:622
 #, fuzzy
 msgid ""
 "Are you sure you want to paste your clipboard's image into the chat window?"
 msgstr "Si è sicuri di voler uscire dalla stanza \"%s\"?"
 
-#: gajim/chat_control_base.py:617 gajim/groupchat_control.py:2310
-#: gajim/roster_window.py:2848 gajim/roster_window.py:4167
-#: gajim/message_window.py:252 gajim/gtk/dialogs.py:418
+#: gajim/chat_control_base.py:624 gajim/groupchat_control.py:2218
+#: gajim/roster_window.py:2841 gajim/roster_window.py:4118
+#: gajim/message_window.py:359 gajim/gtk/dialogs.py:330
 msgid "_Do not ask me again"
 msgstr "_Non chiedermelo di nuovo"
 
-#: gajim/chat_control_base.py:620
+#: gajim/chat_control_base.py:627
 msgid "_Paste"
 msgstr ""
 
-#: gajim/chat_control_base.py:1162 gajim/gtk/accounts.py:351
+#: gajim/chat_control_base.py:1169 gajim/gtk/accounts.py:354
 msgid "Privacy"
 msgstr "Privacy"
 
-#: gajim/chat_control_base.py:1163
+#: gajim/chat_control_base.py:1170
 msgid "Warning"
 msgstr "Avvertimento"
 
-#: gajim/chat_control_base.py:1164
+#: gajim/chat_control_base.py:1171
 #, python-format
 msgid "If you send a file to <b>%s</b>, your real JID will be revealed."
 msgstr "Se invii un file a <b>%s</b>, il tuo vero JID sarà rivelato."
 
-#: gajim/chat_control_base.py:1169
+#: gajim/chat_control_base.py:1176
 msgid "Continue"
 msgstr "Continua"
 
-#: gajim/gtkgui_helpers.py:163 gajim/gtk/filetransfer.py:393
+#: gajim/gtkgui_helpers.py:163 gajim/gtk/filetransfer.py:398
 #, fuzzy, python-format
 msgid "Cannot overwrite existing file '%s'"
 msgstr "Non è possibile sovrascrivere il file esistente \"%s\""
 
-#: gajim/gtkgui_helpers.py:164 gajim/gtk/filetransfer.py:394
+#: gajim/gtkgui_helpers.py:164 gajim/gtk/filetransfer.py:399
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
@@ -174,335 +174,357 @@ msgstr "Non c'è nessuna richiesta di sottoscrizione in attesa."
 msgid " resource with priority "
 msgstr " risorsa con priorità "
 
-#: gajim/gui_menu_builder.py:96
-msgid "_New Group Chat"
-msgstr "_Nuova conversazione di gruppo"
+#: gajim/gui_menu_builder.py:251 gajim/gui_menu_builder.py:342
+#: gajim/chat_control.py:305 gajim/roster_window.py:783
+#: gajim/roster_window.py:1716 gajim/roster_window.py:1718
+#: gajim/roster_window.py:2027 gajim/roster_window.py:3292
+#: gajim/roster_window.py:3325 gajim/gui_interface.py:396
+#: gajim/common/contacts.py:222 gajim/common/contacts.py:359
+#: gajim/common/contacts.py:471 gajim/common/helpers.py:86
+#: gajim/common/helpers.py:317 gajim/gtk/add_contact.py:319
+#: gajim/gtk/subscription_request.py:70 gajim/gtk/subscription_request.py:99
+#: gajim/gtk/roster_item_exchange.py:112
+#, fuzzy
+msgid "Not in contact list"
+msgstr "Mostra i contatti non in linea"
+
+#: gajim/gui_menu_builder.py:355
+#, fuzzy
+msgid "I would like to add you to my contact list"
+msgstr "Vorrei aggiungerti all'elenco dei miei contatti."
 
-#: gajim/gui_menu_builder.py:289 gajim/gui_menu_builder.py:380
-#: gajim/chat_control.py:303 gajim/roster_window.py:786
-#: gajim/roster_window.py:1719 gajim/roster_window.py:1721
-#: gajim/roster_window.py:2030 gajim/roster_window.py:3336
-#: gajim/roster_window.py:3369 gajim/gui_interface.py:413
-#: gajim/common/contacts.py:206 gajim/common/contacts.py:343
-#: gajim/common/helpers.py:83 gajim/common/helpers.py:311
-#: gajim/gtk/add_contact.py:319 gajim/gtk/subscription_request.py:70
-#: gajim/gtk/subscription_request.py:99 gajim/gtk/roster_item_exchange.py:112
-msgid "Not in Roster"
-msgstr "Non nei tuoi contatti"
-
-#: gajim/gui_menu_builder.py:393
-msgid "I would like to add you to my roster"
-msgstr "Vorrei aggiungerti ai miei contatti"
-
-#: gajim/gui_menu_builder.py:471
+#: gajim/gui_menu_builder.py:433
 msgid "Send Single _Message…"
 msgstr "Invia un _messaggio singolo…"
 
-#: gajim/gui_menu_builder.py:486
+#: gajim/gui_menu_builder.py:448
 msgid "E_xecute Command…"
 msgstr "_Esegui il comando…"
 
-#: gajim/gui_menu_builder.py:494
+#: gajim/gui_menu_builder.py:456
 msgid "_Manage Transport"
 msgstr "_Gestisci il trasporto"
 
-#: gajim/gui_menu_builder.py:500
+#: gajim/gui_menu_builder.py:462
 msgid "_Modify Transport"
 msgstr "_Modifica il trasporto"
 
-#: gajim/gui_menu_builder.py:507 gajim/roster_window.py:5046
+#: gajim/gui_menu_builder.py:469 gajim/roster_window.py:4985
 msgid "_Rename…"
 msgstr "_Rinomina…"
 
-#: gajim/gui_menu_builder.py:518 gajim/roster_window.py:5062
-#: gajim/roster_window.py:5177 gajim/data/gui/blocked_contacts_window.ui:52
+#: gajim/gui_menu_builder.py:480 gajim/roster_window.py:5001
+#: gajim/roster_window.py:5116 gajim/data/gui/blocked_contacts_window.ui:52
 #: gajim/data/gui/gc_occupants_menu.ui:148
 #: gajim/data/gui/contact_context_menu.ui:143
 msgid "_Unblock"
 msgstr "_Sblocca"
 
-#: gajim/gui_menu_builder.py:521 gajim/roster_window.py:5067
-#: gajim/roster_window.py:5181 gajim/data/gui/gc_occupants_menu.ui:140
+#: gajim/gui_menu_builder.py:483 gajim/roster_window.py:5006
+#: gajim/roster_window.py:5120 gajim/data/gui/gc_occupants_menu.ui:140
 #: gajim/data/gui/contact_context_menu.ui:151
 msgid "_Block"
 msgstr "_Blocca"
 
-#: gajim/gui_menu_builder.py:529 gajim/roster_window.py:5074
+#: gajim/gui_menu_builder.py:491 gajim/roster_window.py:5013
 #: gajim/data/gui/contact_context_menu.ui:181
 msgid "Remo_ve"
 msgstr "_Elimina"
 
-#: gajim/gui_menu_builder.py:539 gajim/data/gui/contact_context_menu.ui:198
+#: gajim/gui_menu_builder.py:501 gajim/data/gui/contact_context_menu.ui:198
 msgid "_Information"
 msgstr "_Informazioni"
 
-#: gajim/gui_menu_builder.py:552
+#: gajim/gui_menu_builder.py:514
 msgid "Save _As"
 msgstr "Salv_a come "
 
-#: gajim/gui_menu_builder.py:564 gajim/groupchat_control.py:501
-#: gajim/chat_control.py:340
+#: gajim/gui_menu_builder.py:526 gajim/groupchat_control.py:507
+#: gajim/chat_control.py:342
 msgid "Send File…"
 msgstr "Invia un file…"
 
-#: gajim/gui_menu_builder.py:565
+#: gajim/gui_menu_builder.py:527
 msgid "Upload File…"
 msgstr "Carica un file…"
 
-#: gajim/gui_menu_builder.py:566
+#: gajim/gui_menu_builder.py:528
 msgid "Send File Directly…"
 msgstr "Invia un file direttamente…"
 
-#: gajim/gui_menu_builder.py:568 gajim/gui_menu_builder.py:632
+#: gajim/gui_menu_builder.py:530 gajim/gui_menu_builder.py:596
 msgid "Send Chatstate"
 msgstr "Invia lo stato della chat"
 
-#: gajim/gui_menu_builder.py:569
+#: gajim/gui_menu_builder.py:531
 msgid "Invite Contacts"
 msgstr "Invita contatti"
 
-#: gajim/gui_menu_builder.py:570
-msgid "Add to Roster"
-msgstr "Aggiungi all'elenco contatti"
+#: gajim/gui_menu_builder.py:532
+#, fuzzy
+msgid "Add to Contact List"
+msgstr "Aggiungi un _contatto"
 
-#: gajim/gui_menu_builder.py:571
-msgid "Audio Session"
-msgstr "Sessione audio"
+#: gajim/gui_menu_builder.py:533
+#, fuzzy
+msgid "Voice Chat"
+msgstr "Richiesta di conversazione vocale"
 
-#: gajim/gui_menu_builder.py:572
-msgid "Video Session"
-msgstr "Sessione video"
+#: gajim/gui_menu_builder.py:534
+#, fuzzy
+msgid "Video Chat"
+msgstr "Test video"
 
-#: gajim/gui_menu_builder.py:573
+#: gajim/gui_menu_builder.py:535 gajim/gui_menu_builder.py:582
 msgid "Information"
 msgstr "Informazioni"
 
-#: gajim/gui_menu_builder.py:574 gajim/gui_menu_builder.py:639
+#: gajim/gui_menu_builder.py:536 gajim/gui_menu_builder.py:602
 #: gajim/data/gui/application_menu.ui:37
 msgid "History"
 msgstr "Cronologia"
 
-#: gajim/gui_menu_builder.py:580 gajim/gui_menu_builder.py:687
+#: gajim/gui_menu_builder.py:542 gajim/gui_menu_builder.py:650
 #: gajim/data/gui/preferences_window.ui:1823
 msgid "Disabled"
 msgstr "Disabilitato"
 
-#: gajim/gui_menu_builder.py:581 gajim/gui_menu_builder.py:688
+#: gajim/gui_menu_builder.py:543 gajim/gui_menu_builder.py:651
 msgid "Composing only"
 msgstr "Solo scrittura"
 
-#: gajim/gui_menu_builder.py:582 gajim/gui_menu_builder.py:689
+#: gajim/gui_menu_builder.py:544 gajim/gui_menu_builder.py:652
 msgid "All chat states"
 msgstr "Tutti gli stati"
 
-#: gajim/gui_menu_builder.py:620
-msgid "Manage Room"
-msgstr "Gestisci la stanza"
+#: gajim/gui_menu_builder.py:583
+#, fuzzy
+msgid "Manage Group Chat"
+msgstr "Esci dalle conversazioni di gruppo"
 
-#: gajim/gui_menu_builder.py:621
+#: gajim/gui_menu_builder.py:584 gajim/data/gui/groupchat_control.ui:649
 msgid "Change Subject"
 msgstr "Cambia il soggetto"
 
-#: gajim/gui_menu_builder.py:622
-msgid "Configure Room"
-msgstr "Configura la stanza"
+#: gajim/gui_menu_builder.py:585
+#, fuzzy
+msgid "Configure Group Chat"
+msgstr "Esci dalle conversazioni di gruppo"
 
-#: gajim/gui_menu_builder.py:623
+#: gajim/gui_menu_builder.py:586
 msgid "Upload Avatar…"
 msgstr "Carica un avatar…"
 
-#: gajim/gui_menu_builder.py:624
-msgid "Destroy Room"
-msgstr "Elimina la stanza"
+#: gajim/gui_menu_builder.py:587
+#, fuzzy
+msgid "Destroy Group Chat"
+msgstr "Nuova conversazione di gruppo"
 
-#: gajim/gui_menu_builder.py:626 gajim/data/gui/preferences_window.ui:790
+#: gajim/gui_menu_builder.py:589 gajim/data/gui/preferences_window.ui:790
 msgid "Chat Settings"
 msgstr "Impostazioni della chat"
 
-#: gajim/gui_menu_builder.py:627
+#: gajim/gui_menu_builder.py:590
 msgid "Show join/leave"
 msgstr "Mostra chi si unisce / se ne va"
 
-#: gajim/gui_menu_builder.py:628
+#: gajim/gui_menu_builder.py:591
 msgid "Show status changes"
 msgstr "Mostra i cambiamenti di stato"
 
-#: gajim/gui_menu_builder.py:629 gajim/data/gui/gc_control_popup_menu.ui:72
+#: gajim/gui_menu_builder.py:592 gajim/data/gui/gc_control_popup_menu.ui:72
 msgid "Notify on all messages"
 msgstr "Notifica per tutti i messaggi"
 
-#: gajim/gui_menu_builder.py:630
+#: gajim/gui_menu_builder.py:593
 msgid "Minimize on close"
 msgstr "Minimizza alla chiusura"
 
-#: gajim/gui_menu_builder.py:631
-msgid "Minimize on autojoin"
+#: gajim/gui_menu_builder.py:595
+#, fuzzy
+msgid "Minimize when joining automatically"
 msgstr "Minimizza all'entrata automatica"
 
-#: gajim/gui_menu_builder.py:634
+#: gajim/gui_menu_builder.py:598
 msgid "Sync Threshold"
 msgstr "Sincronizza il valore di soglia"
 
-#: gajim/gui_menu_builder.py:635
-msgid "Change Nick"
-msgstr "Cambia soprannome"
-
-#: gajim/gui_menu_builder.py:636
-msgid "Bookmark Room"
-msgstr "Aggiungi stanza ai segnalibri"
+#: gajim/gui_menu_builder.py:599
+#, fuzzy
+msgid "Change Nickname"
+msgstr "Cambia il _soprannome..."
 
-#: gajim/gui_menu_builder.py:637
+#: gajim/gui_menu_builder.py:600
 msgid "Request Voice"
 msgstr "Richiedi voce"
 
-#: gajim/gui_menu_builder.py:638 gajim/roster_window.py:5246
+#: gajim/gui_menu_builder.py:601 gajim/roster_window.py:5185
 msgid "Execute command"
 msgstr "Esegui comando"
 
-#: gajim/gui_menu_builder.py:640
-msgid "Disconnect"
-msgstr "Disconnetti"
+#: gajim/gui_menu_builder.py:603
+msgid "Leave"
+msgstr ""
 
-#: gajim/gui_menu_builder.py:678 gajim/gtk/preferences.py:156
+#: gajim/gui_menu_builder.py:641 gajim/gtk/preferences.py:155
 msgid "No threshold"
 msgstr "Nessun valore di soglia"
 
-#: gajim/gui_menu_builder.py:680 gajim/gtk/preferences.py:158
+#: gajim/gui_menu_builder.py:643 gajim/gtk/preferences.py:157
 #, python-format
 msgid "%i day"
 msgid_plural "%i days"
 msgstr[0] "%i giorno fa"
 msgstr[1] "%i giorni fa"
 
-#: gajim/gui_menu_builder.py:709 gajim/gui_menu_builder.py:747
-#: gajim/gtk/join_groupchat.py:43
-msgid "Join Group Chat"
-msgstr "Unisciti alla conversazione di gruppo"
-
-#: gajim/gui_menu_builder.py:746
+#: gajim/gui_menu_builder.py:672
 msgid "Add Contact…"
 msgstr "Aggiungi un contatto…"
 
-#: gajim/gui_menu_builder.py:748 gajim/gtk/profile.py:52
-#: gajim/gtk/accounts.py:770 gajim/gtk/accounts.py:808
+#: gajim/gui_menu_builder.py:673 gajim/gtk/profile.py:52
+#: gajim/gtk/accounts.py:773 gajim/gtk/accounts.py:811
 msgid "Profile"
 msgstr "Profilo"
 
-#: gajim/gui_menu_builder.py:749
+#: gajim/gui_menu_builder.py:674
+msgid "Send Single Message…"
+msgstr "Invia un messaggio singolo…"
+
+#: gajim/gui_menu_builder.py:675
 msgid "Discover Services"
 msgstr "Ricerca servizi"
 
-#: gajim/gui_menu_builder.py:750
-msgid "Send Single Message…"
-msgstr "Invia un messaggio singolo…"
+#: gajim/gui_menu_builder.py:676 gajim/gtk/server_info.py:36
+msgid "Server Info"
+msgstr "Informazioni sul server"
 
-#: gajim/gui_menu_builder.py:751 gajim/data/gui/preferences_window.ui:2741
+#: gajim/gui_menu_builder.py:677 gajim/data/gui/preferences_window.ui:2741
 msgid "Advanced"
 msgstr "Avanzato"
 
-#: gajim/gui_menu_builder.py:752 gajim/gtk/mam_preferences.py:88
+#: gajim/gui_menu_builder.py:678 gajim/gtk/mam_preferences.py:88
 msgid "Archiving Preferences"
 msgstr "Archiviazione preferenze"
 
-#: gajim/gui_menu_builder.py:753
+#: gajim/gui_menu_builder.py:679
 msgid "Blocking List"
 msgstr "Elenco degli utenti bloccati"
 
-#: gajim/gui_menu_builder.py:754 gajim/gtk/history_sync.py:108
+#: gajim/gui_menu_builder.py:680
+#, fuzzy
+msgid "Bookmarks"
+msgstr "Aggiungi ai _segnalibri"
+
+#: gajim/gui_menu_builder.py:681
+#, fuzzy
+msgid "PEP Configuration"
+msgstr "Configurazione"
+
+#: gajim/gui_menu_builder.py:682 gajim/gtk/history_sync.py:108
 #: gajim/gtk/history_sync.py:186
 msgid "Synchronise History"
 msgstr "Sincronizza cronologia"
 
-#: gajim/gui_menu_builder.py:755 gajim/gtk/privacy_list.py:427
+#: gajim/gui_menu_builder.py:683 gajim/gtk/privacy_list.py:427
 msgid "Privacy Lists"
 msgstr "Elenchi della privacy"
 
-#: gajim/gui_menu_builder.py:756 gajim/gtk/server_info.py:36
-msgid "Server Info"
-msgstr "Informazioni sul server"
-
-#: gajim/gui_menu_builder.py:757 gajim/gui_menu_builder.py:768
+#: gajim/gui_menu_builder.py:685 gajim/gui_menu_builder.py:696
 #: gajim/data/gui/xml_console_window.ui:77
 msgid "XML Console"
 msgstr "Console XML"
 
-#: gajim/gui_menu_builder.py:759 gajim/data/gui/groupchat_config.ui:36
+#: gajim/gui_menu_builder.py:687 gajim/data/gui/groupchat_config.ui:36
 msgid "Admin"
 msgstr "Amministratore"
 
-#: gajim/gui_menu_builder.py:760
+#: gajim/gui_menu_builder.py:688
 msgid "Send Server Message…"
 msgstr "Invia un messaggio del server..."
 
-#: gajim/gui_menu_builder.py:761
+#: gajim/gui_menu_builder.py:689
 msgid "Set MOTD…"
 msgstr "Imposta il messaggio del giorno..."
 
-#: gajim/gui_menu_builder.py:762
+#: gajim/gui_menu_builder.py:690
 msgid "Update MOTD…"
 msgstr "Aggiorna il messaggio del giorno..."
 
-#: gajim/gui_menu_builder.py:763
+#: gajim/gui_menu_builder.py:691
 msgid "Delete MOTD…"
 msgstr "Elimina messaggio del giorno..."
 
-#: gajim/gui_menu_builder.py:812
-msgid "No Accounts available"
-msgstr "Nessun account disponibile"
+#: gajim/gui_menu_builder.py:736
+#, fuzzy
+msgid "_Add Account…"
+msgstr "_Aggiungi un contatto"
+
+#: gajim/gui_menu_builder.py:742
+#, fuzzy
+msgid "_Modify Accounts…"
+msgstr "_Modifica l'account"
+
+#: gajim/gui_menu_builder.py:751 gajim/data/gui/zeroconf_context_menu.ui:26
+#: gajim/data/gui/account_context_menu.ui:79
+#, fuzzy
+msgid "_Modify Account…"
+msgstr "_Modifica l'account"
 
-#: gajim/gui_menu_builder.py:823 gajim/data/gui/application_menu.ui:5
-#: gajim/data/gui/application_menu.ui:71 gajim/data/gui/shortcuts_window.ui:182
-#: gajim/gtk/accounts.py:58
+#: gajim/gui_menu_builder.py:755 gajim/data/gui/application_menu.ui:5
+#: gajim/data/gui/shortcuts_window.ui:182 gajim/gtk/accounts.py:57
 msgid "Accounts"
 msgstr "Account"
 
-#: gajim/gui_menu_builder.py:881 gajim/gui_menu_builder.py:886
-msgid "Copy JID"
-msgstr "Copia JID"
+#: gajim/gui_menu_builder.py:784 gajim/gui_menu_builder.py:789
+#, fuzzy
+msgid "Copy XMPP Address"
+msgstr "Copia l'indirizzo e-mail"
 
-#: gajim/gui_menu_builder.py:882 gajim/gui_menu_builder.py:914
+#: gajim/gui_menu_builder.py:785 gajim/gui_menu_builder.py:817
 msgid "Join Groupchat"
 msgstr "Unisciti alla conversazione di gruppo"
 
-#: gajim/gui_menu_builder.py:887 gajim/gui_menu_builder.py:913
-#: gajim/data/gui/application_menu.ui:76
+#: gajim/gui_menu_builder.py:790 gajim/gui_menu_builder.py:816
+#: gajim/data/gui/application_menu.ui:71
 #: gajim/data/gui/subscription_request_window.ui:106
 msgid "Start Chat"
 msgstr "Inizia una conversazione"
 
-#: gajim/gui_menu_builder.py:888 gajim/gui_menu_builder.py:915
-msgid "Add to Roster…"
-msgstr "Aggiungi all'elenco contatti…"
+#: gajim/gui_menu_builder.py:791 gajim/gui_menu_builder.py:818
+#, fuzzy
+msgid "Add to Contact List…"
+msgstr "Aggiungi un contatto…"
 
-#: gajim/gui_menu_builder.py:893
+#: gajim/gui_menu_builder.py:796
 msgid "Copy Link Location"
 msgstr "Copia l'indirizzo del collegamento"
 
-#: gajim/gui_menu_builder.py:894
+#: gajim/gui_menu_builder.py:797
 msgid "Open Link in Browser"
 msgstr "Apri il collegamento nel browser"
 
-#: gajim/gui_menu_builder.py:899
+#: gajim/gui_menu_builder.py:802
 msgid "Copy Email Address"
 msgstr "Copia l'indirizzo e-mail"
 
-#: gajim/gui_menu_builder.py:900 gajim/gui_menu_builder.py:912
+#: gajim/gui_menu_builder.py:803 gajim/gui_menu_builder.py:815
 msgid "Open Email Composer"
 msgstr "Apri il compositore delle e-mail"
 
-#: gajim/gui_menu_builder.py:905
+#: gajim/gui_menu_builder.py:808
 msgid "Copy Location"
 msgstr "Copia la posizione"
 
-#: gajim/gui_menu_builder.py:906
+#: gajim/gui_menu_builder.py:809
 msgid "Show Location"
 msgstr "Mostra la posizione"
 
-#: gajim/gui_menu_builder.py:911
-msgid "Copy JID/Email"
-msgstr "Copia JID/indirizzo e-mail"
+#: gajim/gui_menu_builder.py:814
+#, fuzzy
+msgid "Copy XMPP Address/Email"
+msgstr "Copia l'indirizzo e-mail"
 
-#: gajim/gui_menu_builder.py:945
+#: gajim/gui_menu_builder.py:852
 msgid "Copy"
 msgstr "Copia"
 
@@ -522,44 +544,55 @@ msgstr "Mostra questo messaggio di aiuto ed esci"
 msgid "Choose folder for logfile"
 msgstr "Scegli cartella per il logfile"
 
-#: gajim/history_manager.py:107
+#: gajim/history_manager.py:106
 msgid "Cannot find history logs database"
 msgstr "Impossibile trovare il database delle cronologie"
 
-#: gajim/history_manager.py:108
+#: gajim/history_manager.py:107
 #, fuzzy, python-format
 msgid "%s does not exist."
 msgstr "Il file non esiste"
 
-#: gajim/history_manager.py:141 gajim/history_manager.py:195
-#: gajim/gtk/discovery.py:829 gajim/gtk/roster_item_exchange.py:80
-msgid "JID"
-msgstr "JID"
+#: gajim/history_manager.py:140 gajim/history_manager.py:194
+#: 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:30
+#: gajim/gtk/accounts.py:804
+#, fuzzy
+msgid "XMPP Address"
+msgstr "Indirizzo AIM:"
 
-#: gajim/history_manager.py:154 gajim/history_manager.py:202
+#: gajim/history_manager.py:153 gajim/history_manager.py:201
 #: gajim/data/gui/history_window.ui:89 gajim/gtk/history.py:108
 msgid "Date"
 msgstr "Data"
 
-#: gajim/history_manager.py:161 gajim/history_manager.py:225
+#: gajim/history_manager.py:160 gajim/history_manager.py:224
 #: gajim/data/gui/join_groupchat_window.ui:208
 #: gajim/data/gui/profile_window.ui:214
 #: gajim/data/gui/vcard_information_window.ui:443
+#: gajim/data/gui/bookmarks.ui:140
 msgid "Nickname"
 msgstr "Soprannome"
 
-#: gajim/history_manager.py:172 gajim/history_manager.py:211
+#: gajim/history_manager.py:171 gajim/history_manager.py:210
 #: gajim/data/gui/preferences_window.ui:1344
 #: gajim/data/gui/single_message_window.ui:275 gajim/gtk/history.py:117
 msgid "Message"
 msgstr "Messaggio"
 
-#: gajim/history_manager.py:180 gajim/history_manager.py:218
+#: gajim/history_manager.py:179 gajim/history_manager.py:217
 #: gajim/data/gui/groups_post_window.ui:49
 #: gajim/data/gui/single_message_window.ui:214
 msgid "Subject"
 msgstr "Soggetto"
 
+#: gajim/history_manager.py:247
+msgid "Database Cleanup"
+msgstr "Pulizia del database"
+
 #: gajim/history_manager.py:248
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
@@ -568,12 +601,10 @@ msgstr ""
 "Vuoi ripulire il database? (FORTEMENTE SCONSIGLIATO SE GAJIM È IN ESECUZIONE)"
 
 #: gajim/history_manager.py:250
+#, fuzzy
 msgid ""
-"Normally allocated database size will not be freed, it will just become "
-"reusable. If you really want to reduce database filesize, click YES, else "
-"click NO.\n"
-"\n"
-"In case you click YES, please wait…"
+"Normally, the allocated database size will not be freed, it will just become "
+"reusable. This operation may take a while."
 msgstr ""
 "Solitamente lo spazio allocato per la base di dati non verrà liberato, ma "
 "solamente reso riutilizzabile. Se si vuole veramente ridurre la dimensione "
@@ -582,45 +613,46 @@ msgstr ""
 "Nel caso si prema SÌ, attendere..."
 
 #: gajim/history_manager.py:255
-msgid "Database Cleanup"
-msgstr "Pulizia del database"
+#, fuzzy
+msgid "_Cleanup"
+msgstr "P_ulisci"
 
-#: gajim/history_manager.py:519 gajim/gtk/filetransfer.py:238
-#: gajim/gtk/filetransfer.py:248
+#: gajim/history_manager.py:518 gajim/gtk/filetransfer.py:237
+#: gajim/gtk/filetransfer.py:247
 msgid "You"
 msgstr "Tu"
 
-#: gajim/history_manager.py:531
+#: gajim/history_manager.py:530
 #, 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:568 gajim/history_manager.py:607
-#: gajim/gtk/dialogs.py:58 gajim/gtk/themes.py:319
+#: gajim/history_manager.py:567 gajim/history_manager.py:606
+#: gajim/gtk/dialogs.py:57 gajim/gtk/themes.py:319
 #: gajim/gtk/roster_item_exchange.py:75 gajim/gtk/roster_item_exchange.py:185
 msgid "Delete"
 msgstr "Elimina"
 
-#: gajim/history_manager.py:569
+#: gajim/history_manager.py:568
 msgid "Delete Conversation"
 msgid_plural "Delete Conversations"
 msgstr[0] "Elimina conversazione"
 msgstr[1] "Elimina conversazioni"
 
-#: gajim/history_manager.py:570
+#: gajim/history_manager.py:569
 #, 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] "Si vuole davvero eliminare il messaggio selezionato?"
 msgstr[1] "Si vuole davvero eliminare il messaggio selezionato?"
 
-#: gajim/history_manager.py:608
+#: gajim/history_manager.py:607
 msgid "Delete Message"
 msgid_plural "Delete Messages"
 msgstr[0] "Elimina messaggio"
 msgstr[1] "Elimina messaggi"
 
-#: gajim/history_manager.py:609
+#: gajim/history_manager.py:608
 #, fuzzy
 msgid "Do you want to permanently delete this message"
 msgid_plural "Do you want to permanently delete these messages"
@@ -634,14 +666,14 @@ msgstr "Nome del contatto: <i>%s</i>"
 
 #: gajim/dialogs.py:84
 #, python-format
-msgid "JID: <i>%s</i>"
-msgstr "JID: <i>%s</i>"
+msgid "XMPP Address: <i>%s</i>"
+msgstr ""
 
-#: gajim/dialogs.py:115 gajim/dialogs.py:128 gajim/roster_window.py:2901
-#: gajim/roster_window.py:3833 gajim/roster_window.py:5084
-#: gajim/common/contacts.py:157 gajim/common/contacts.py:190
+#: gajim/dialogs.py:115 gajim/dialogs.py:128 gajim/roster_window.py:2894
+#: gajim/roster_window.py:3784 gajim/roster_window.py:5023
+#: gajim/common/contacts.py:157 gajim/common/contacts.py:206
 #: gajim/data/gui/preferences_window.ui:558
-#: gajim/data/gui/shortcuts_window.ui:177 gajim/gtk/accounts.py:349
+#: gajim/data/gui/shortcuts_window.ui:177 gajim/gtk/accounts.py:352
 msgid "General"
 msgstr "Generale"
 
@@ -689,7 +721,7 @@ msgstr ""
 "Questo nome è già stato utilizzato. Vuoi sovrascrivere questo messaggio di "
 "stato?"
 
-#: gajim/dialogs.py:703
+#: gajim/dialogs.py:703 gajim/plugins/gui.py:292
 #, fuzzy
 msgid "_Overwrite"
 msgstr "Sovrascrivere?"
@@ -702,9 +734,7 @@ msgstr "Salva come messaggio di stato predefinito"
 msgid "Please type a name for this status message"
 msgstr "Per piacere, inserisci un nome per questo messaggio di stato"
 
-#: gajim/dialogs.py:740 gajim/gui_interface.py:1441 gajim/dialog_messages.py:31
-#: gajim/gtk/discovery.py:518 gajim/gtk/profile.py:323
-#: gajim/gtk/join_groupchat.py:234
+#: gajim/dialogs.py:740 gajim/gtk/discovery.py:517 gajim/gtk/profile.py:323
 msgid "You are not connected to the server"
 msgstr "Non sei connesso al server"
 
@@ -712,9 +742,11 @@ msgstr "Non sei connesso al server"
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Senza una connessione, non puoi sincronizzare i tuoi contatti."
 
-#: gajim/dialogs.py:752 gajim/dialogs.py:823 gajim/gtk/discovery.py:822
-#: gajim/gtk/discovery.py:1648 gajim/gtk/discovery.py:1941
-#: gajim/gtk/history.py:99 gajim/gtk/roster_item_exchange.py:83
+#: gajim/dialogs.py:752 gajim/dialogs.py:823
+#: gajim/data/gui/groupchat_info_scrolled.ui:16 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/gtk/roster_item_exchange.py:83
 msgid "Name"
 msgstr "Nome"
 
@@ -738,7 +770,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:1043
+#: gajim/dialogs.py:1042
 msgid "an audio and video"
 msgstr "audio-video"
 
@@ -746,7 +778,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:1045
+#: gajim/dialogs.py:1044
 msgid "an audio"
 msgstr "audio"
 
@@ -754,381 +786,335 @@ 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:1047
+#: gajim/dialogs.py:1046
 msgid "a video"
 msgstr "video"
 
 # in italian translation, %(type)s will be one of: audio, video, audio-video.
-#: gajim/dialogs.py:1051
-#, python-format
+#: gajim/dialogs.py:1050
+#, fuzzy, python-format
 msgid ""
-"%(contact)s wants to start %(type)s session with you. Do you want to answer "
+"%(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?"
 
-#: gajim/groupchat_control.py:505
+#: gajim/groupchat_control.py:511
 #, python-format
 msgid "Send File (max. %s MiB)…"
 msgstr "Invia un file (massimo %s MiB)…"
 
-#: gajim/groupchat_control.py:507 gajim/chat_control.py:342
+#: gajim/groupchat_control.py:513 gajim/chat_control.py:344
 msgid "No File Transfer available"
 msgstr "Nessun trasferimento di file disponibile"
 
-#: gajim/groupchat_control.py:630 gajim/groupchat_control.py:2349
-msgid "Changing Subject"
-msgstr "Cambio oggetto"
-
-#: gajim/groupchat_control.py:631 gajim/groupchat_control.py:2350
-msgid "Please specify the new subject:"
-msgstr "Per piacere, specifica il nuovo soggetto:"
-
-#: gajim/groupchat_control.py:638
-msgid "Changing Nickname"
-msgstr "Cambiamento del soprannome in corso"
-
-#: gajim/groupchat_control.py:639
-msgid "Please specify the new nickname you want to use:"
-msgstr "Specifica il nuovo soprannome che vuoi usare:"
-
-#: gajim/groupchat_control.py:657
-msgid "Invalid group chat JID"
+#: gajim/groupchat_control.py:655
+#, fuzzy
+msgid "Invalid group chat XMPP Address"
 msgstr "JID della conversazione di gruppo non valido"
 
-#: gajim/groupchat_control.py:658
-msgid "The group chat JID has not allowed characters."
+#: gajim/groupchat_control.py:656
+#, fuzzy
+msgid "The group chat XMPP Address has not allowed characters."
 msgstr ""
 "Il JID della conversazione di gruppo contiene dei caratteri non permessi."
 
-#: gajim/groupchat_control.py:758 gajim/gtk/profile.py:136
+#: gajim/groupchat_control.py:743 gajim/gtk/profile.py:136
 msgid "Could not load image"
 msgstr "Non è stato possibile caricare l'immagine"
 
-#: gajim/groupchat_control.py:888
+#: gajim/groupchat_control.py:873
 msgid "Insert Nickname"
 msgstr "Inserisci il soprannome"
 
-#: gajim/groupchat_control.py:1056 gajim/chat_control.py:824
+#: gajim/groupchat_control.py:1041 gajim/chat_control.py:848
 msgid "and authenticated"
 msgstr "e autenticata"
 
-#: gajim/groupchat_control.py:1060 gajim/chat_control.py:828
+#: gajim/groupchat_control.py:1045 gajim/chat_control.py:852
 msgid "and NOT authenticated"
 msgstr "e NON autenticata"
 
-#: gajim/groupchat_control.py:1064
+#: gajim/groupchat_control.py:1049
 #, python-format
 msgid "%(type)s encryption is active %(authenticated)s."
 msgstr "cifratura %(type)s è attiva %(authenticated)s."
 
-#: gajim/groupchat_control.py:1111
+#: gajim/groupchat_control.py:1096
 msgid "Conversation with "
 msgstr "Conversazione con "
 
-#: gajim/groupchat_control.py:1113
+#: gajim/groupchat_control.py:1098
 msgid "Continued conversation"
 msgstr "Conversazione continuata"
 
-#: gajim/groupchat_control.py:1411
+#: gajim/groupchat_control.py:1357
 #, 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:1433
-msgid "Room now shows unavailable members"
+#: gajim/groupchat_control.py:1374
+#, fuzzy
+msgid "Group chat now shows unavailable members"
 msgstr "La stanza ora mostra i membri non disponibili"
 
-#: gajim/groupchat_control.py:1436
-msgid "Room now does not show unavailable members"
+#: gajim/groupchat_control.py:1377
+#, fuzzy
+msgid "Group chat now does not show unavailable members"
 msgstr "La stanza ora non mostra i membri non disponibili"
 
-#: gajim/groupchat_control.py:1439
+#: gajim/groupchat_control.py:1380
 msgid "A setting not related to privacy has been changed"
 msgstr "Un'impostazione non relativa alla privacy è stata cambiata"
 
-#: gajim/groupchat_control.py:1446
-msgid "Room logging is now enabled"
-msgstr "La registrazione dei messaggi della stanza è stata attivata"
+#: gajim/groupchat_control.py:1387 gajim/groupchat_control.py:1659
+#, fuzzy
+msgid "Conversations are stored on the server"
+msgstr "Questa sessione SARÀ registrata sul server"
 
-#: gajim/groupchat_control.py:1449
-msgid "Room logging is now disabled"
-msgstr "La registrazione dei messaggi della stanza è stata disattivata"
+#: gajim/groupchat_control.py:1390
+#, fuzzy
+msgid "Conversations are not stored on the server"
+msgstr "Informazioni su di te, archiviate sul server"
 
-#: gajim/groupchat_control.py:1452
-msgid "Room is now non-anonymous"
+#: gajim/groupchat_control.py:1393
+#, fuzzy
+msgid "Group chat is now non-anonymous"
 msgstr "La stanza è ora completamente non anonima"
 
-#: gajim/groupchat_control.py:1456
-msgid "Room is now semi-anonymous"
+#: gajim/groupchat_control.py:1397
+#, fuzzy
+msgid "Group chat is now semi-anonymous"
 msgstr "La stanza è ora semi-anonima"
 
-#: gajim/groupchat_control.py:1460
-msgid "Room is now fully anonymous"
+#: gajim/groupchat_control.py:1401
+#, fuzzy
+msgid "Group chat is now fully anonymous"
 msgstr "La stanza ora è completamente anonima"
 
-#: gajim/groupchat_control.py:1500
+#: gajim/groupchat_control.py:1439
 #, python-format
 msgid "Ping? (%s)"
 msgstr "Ping? (%s)"
 
-#: gajim/groupchat_control.py:1503
+#: gajim/groupchat_control.py:1442
 #, python-format
 msgid "Pong! (%(nick)s %(delay)s s.)"
 msgstr "Pong! (%(nick)s %(delay)s s.)"
 
-#: gajim/groupchat_control.py:1506 gajim/chat_control.py:1213
+#: gajim/groupchat_control.py:1445 gajim/chat_control.py:1237
 msgid "Error."
 msgstr "Errore."
 
-#: gajim/groupchat_control.py:1711
-#, python-format
-msgid "You (%s) joined the room"
-msgstr "Tu (%s) ti sei unito alla stanza"
+#: gajim/groupchat_control.py:1650
+#, fuzzy, python-format
+msgid "You (%s) joined the group chat"
+msgstr "%s si è unito alla conversazione di gruppo"
 
-#: gajim/groupchat_control.py:1717
-msgid "Any occupant is allowed to see your full JID"
+#: gajim/groupchat_control.py:1655
+#, fuzzy
+msgid "Any participant is allowed to see your full XMPP Address"
 msgstr "Tutti i partecipanti possono vedere il tuo JID"
 
-#: gajim/groupchat_control.py:1721
-msgid "Room logging is enabled"
-msgstr "La registrazione dei messaggi della stanza è stata attivata"
-
-#: gajim/groupchat_control.py:1725
-msgid "The server has assigned or modified your roomnick"
+#: gajim/groupchat_control.py:1663
+#, fuzzy
+msgid "The server has assigned or modified your nickname in this group chat"
 msgstr "Il server ha assegnato o modificato il tuo soprannome"
 
-#: gajim/groupchat_control.py:1732
-msgid "A new room has been created"
+#: gajim/groupchat_control.py:1671
+#, fuzzy
+msgid "A new group chat has been created"
 msgstr "È stata creata una nuova stanza"
 
-#: gajim/groupchat_control.py:1740 gajim/privatechat_control.py:112
+#: gajim/groupchat_control.py:1679 gajim/privatechat_control.py:115
 #, python-format
 msgid "You are now known as %s"
 msgstr "Ora sei conosciuto come %s"
 
-#: gajim/groupchat_control.py:1742 gajim/privatechat_control.py:114
+#: gajim/groupchat_control.py:1681 gajim/privatechat_control.py:117
 #, python-brace-format
 msgid "{nick} is now known as {new_nick}"
 msgstr "{nick} è ora conosciuto come {new_nick}"
 
-#: gajim/groupchat_control.py:1767 gajim/privatechat_control.py:141
+#: gajim/groupchat_control.py:1706 gajim/privatechat_control.py:144
 #, python-brace-format
 msgid "You are now {show}{status}"
 msgstr "Ora sei {show}{status}"
 
-#: gajim/groupchat_control.py:1773 gajim/privatechat_control.py:147
+#: gajim/groupchat_control.py:1712 gajim/privatechat_control.py:150
 #, python-brace-format
 msgid "{nick} is now {show}{status}"
 msgstr "{nick} è ora {show}{status}"
 
-#: gajim/groupchat_control.py:1790 gajim/groupchat_control.py:1819
-#: gajim/groupchat_control.py:1849 gajim/groupchat_control.py:1909
+#: gajim/groupchat_control.py:1729 gajim/groupchat_control.py:1758
+#: gajim/groupchat_control.py:1788 gajim/groupchat_control.py:1848
 #, python-brace-format
 msgid " by {actor}"
 msgstr " da {actor}"
 
-#: gajim/groupchat_control.py:1793
+#: gajim/groupchat_control.py:1732
 #, python-brace-format
 msgid "** Your Affiliation has been set to {affiliation}{actor}{reason}"
 msgstr ""
 "** La tua affiliazione è stata impostata a {affiliation}{actor}{reason}"
 
-#: gajim/groupchat_control.py:1799
+#: gajim/groupchat_control.py:1738
 #, python-brace-format
 msgid "** Affiliation of {nick} has been set to {affiliation}{actor}{reason}"
 msgstr ""
 "** L'affiliazione di {nick} è stata impostata a {affiliation}{actor}{reason}"
 
-#: gajim/groupchat_control.py:1822
+#: gajim/groupchat_control.py:1761
 #, python-brace-format
 msgid "** Your Role has been set to {role}{actor}{reason}"
 msgstr "** Il tuo ruolo è stato impostato a {role}{actor}{reason}"
 
-#: gajim/groupchat_control.py:1827
+#: gajim/groupchat_control.py:1766
 #, python-brace-format
 msgid "** Role of {nick} has been set to {role}{actor}{reason}"
 msgstr "** Il ruolo di {nick} è stato impostato a {role}{actor}{reason}"
 
-#: gajim/groupchat_control.py:1852
-#, python-brace-format
-msgid "You have been removed from the room{actor}{reason}"
+#: gajim/groupchat_control.py:1791
+#, fuzzy, python-brace-format
+msgid "You have been removed from the group chat{actor}{reason}"
 msgstr "Sei stato rimosso dalla stanza{actor}{reason}"
 
-#: gajim/groupchat_control.py:1857
+#: gajim/groupchat_control.py:1796
 #, python-brace-format
 msgid "You have left due to an error{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1863
+#: gajim/groupchat_control.py:1802
 #, python-brace-format
 msgid "You have been kicked{actor}{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1870
+#: gajim/groupchat_control.py:1809
 #, python-brace-format
 msgid "You have been banned{actor}{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1877 gajim/groupchat_control.py:1943
+#: gajim/groupchat_control.py:1816 gajim/groupchat_control.py:1882
 msgid ": Affiliation changed"
 msgstr ": Affiliazione cambiata"
 
-#: gajim/groupchat_control.py:1883 gajim/groupchat_control.py:1948
+#: gajim/groupchat_control.py:1822 gajim/groupchat_control.py:1887
 #, fuzzy
-msgid ": Room configuration changed to members-only"
+msgid ": Group chat configuration changed to members-only"
 msgstr "la stanza è ora accessibile solo ai membri"
 
-#: gajim/groupchat_control.py:1912
-#, python-brace-format
-msgid "{nick} has been removed from the room{by}{reason}"
+#: gajim/groupchat_control.py:1851
+#, fuzzy, python-brace-format
+msgid "{nick} has been removed from the group chat{by}{reason}"
 msgstr "{nick} è stato rimosso dalla stanza{by}{reason}"
 
-#: gajim/groupchat_control.py:1922
+#: gajim/groupchat_control.py:1861
 #, python-brace-format
 msgid "{nick} has left due to an error{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1928
+#: gajim/groupchat_control.py:1867
 #, python-brace-format
 msgid "{nick} has been kicked{actor}{reason}"
 msgstr "{nick} è stato cacciato{actor}{reason}"
 
-#: gajim/groupchat_control.py:1936
+#: gajim/groupchat_control.py:1875
 #, python-brace-format
 msgid "{nick} has been banned{actor}{reason}"
 msgstr "{nick} è stato bandito{actor}{reason}"
 
-#: gajim/groupchat_control.py:1953
+#: gajim/groupchat_control.py:1892
 #, python-brace-format
 msgid "{nick} has left{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1970
+#: gajim/groupchat_control.py:1914
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s si è unito alla conversazione di gruppo"
 
-#: gajim/groupchat_control.py:1985 gajim/groupchat_control.py:1990
-#: gajim/groupchat_control.py:1995 gajim/groupchat_control.py:2000
-#: gajim/groupchat_control.py:2011
-msgid "Unable to join group chat"
-msgstr "Non si è in grado di unirsi alla conversazione di gruppo"
-
-#: gajim/groupchat_control.py:1986
-#, python-format
-msgid "You are banned from group chat <b>%s</b>."
-msgstr "Sei stato bloccato dalla stanza <b>%s</b>."
-
-#: gajim/groupchat_control.py:1991
-#, python-format
-msgid "Remote server <b>%s</b> does not exist."
-msgstr "Il server remoto <b>%s</b> non esiste."
-
-#: gajim/groupchat_control.py:1996
-#, python-format
-msgid "Group chat <b>%s</b> does not exist."
-msgstr "La conversazione di gruppo <b>%s</b> non esiste."
-
-#: gajim/groupchat_control.py:2001
-msgid "Group chat creation is not permitted."
-msgstr "La creazione di conversazioni di gruppo non è permessa."
-
-#: gajim/groupchat_control.py:2005
-msgid "Unable to join groupchat"
-msgstr "Non si è in grado di unirsi alla conversazione di gruppo"
-
-#: gajim/groupchat_control.py:2006
-#, python-format
-msgid "You must use your registered nickname in <b>%s</b>."
-msgstr "Devi utilizzare il tuo soprannome registrato in <b>%s</b>."
-
-#: gajim/groupchat_control.py:2012
-#, python-format
-msgid "You are not in the members list in groupchat %s."
-msgstr "Non sei nella lista dei membri nella conversazione di gruppo %s."
-
-#: gajim/groupchat_control.py:2068
-msgid "Room has been destroyed"
+#: gajim/groupchat_control.py:1981
+#, fuzzy
+msgid "Group chat has been destroyed"
 msgstr "La stanza è stata eliminata"
 
-#: gajim/groupchat_control.py:2073
-#, python-format
-msgid "You can join this room instead: xmpp:%s?join"
+#: gajim/groupchat_control.py:1986
+#, fuzzy, python-format
+msgid "You can join this group chat instead: xmpp:%s?join"
 msgstr "Puoi invece entrare in questa stanza: xmpp:%s?join"
 
-#: gajim/groupchat_control.py:2306
+#: gajim/groupchat_control.py:2214
 #, fuzzy
 msgid "Leave Group Chat"
 msgstr "Esci dalle conversazioni di gruppo"
 
-#: gajim/groupchat_control.py:2307
+#: gajim/groupchat_control.py:2215
 #, fuzzy
 msgid "Are you sure you want to leave this group chat?"
 msgstr "Si è sicuri di voler uscire dalla stanza \"%s\"?"
 
-#: gajim/groupchat_control.py:2308
+#: gajim/groupchat_control.py:2216
 #, fuzzy, python-format
-msgid "If you close this window, you will be disconnected from '%s'."
+msgid "If you close this window, you will leave '%s'."
 msgstr "Chiudendo questa finestra, si verrà disconnessi da queste stanze."
 
-#: gajim/groupchat_control.py:2314
+#: gajim/groupchat_control.py:2222 gajim/roster_window.py:5177
 msgid "_Leave"
 msgstr ""
 
-#: gajim/groupchat_control.py:2377
+#: gajim/groupchat_control.py:2280 gajim/roster_window.py:3008
 #, fuzzy, python-format
 msgid "%(jid)s has been invited to this group chat"
 msgstr "%(jid)s è stato invitato in questa stanza"
 
-#: gajim/groupchat_control.py:2527
+#: gajim/groupchat_control.py:2463
 #, python-format
 msgid "Kicking %s"
 msgstr "Sto cacciando %s"
 
-#: gajim/groupchat_control.py:2528 gajim/groupchat_control.py:2829
+#: gajim/groupchat_control.py:2464 gajim/groupchat_control.py:2765
 msgid "You may specify a reason below:"
 msgstr "Specifica un motivo qui sotto:"
 
-#: gajim/groupchat_control.py:2828
+#: gajim/groupchat_control.py:2764
 #, python-format
 msgid "Banning %s"
 msgstr "Sto bloccando %s"
 
-#: gajim/chat_control.py:408
+#: gajim/chat_control.py:432
 msgid "Show a list of formattings"
 msgstr "Mostra un elenco di formattazioni"
 
-#: gajim/chat_control.py:412
+#: gajim/chat_control.py:436
 msgid "This contact does not support HTML"
 msgstr "Questo contatto non supporta HTML"
 
-#: gajim/chat_control.py:562
+#: gajim/chat_control.py:586
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr "%(type)s stato : %(state)s, motivo : %(reason)s"
 
-#: gajim/chat_control.py:686
+#: gajim/chat_control.py:710
 #, 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:832
+#: gajim/chat_control.py:856
 #, fuzzy, python-format
 msgid "%(type)s encryption is active %(authenticated)s"
 msgstr "cifratura %(type)s è attiva %(authenticated)s."
 
-#: gajim/chat_control.py:1160 gajim/chat_control.py:1168
+#: gajim/chat_control.py:1184 gajim/chat_control.py:1192
 msgid "Close"
 msgstr "Chiudi"
 
-#: gajim/chat_control.py:1161
+#: gajim/chat_control.py:1185
 #, python-format
 msgid "You just received a new message from %s"
 msgstr "Hai appena ricevuto un nuovo messaggio da %s"
 
-#: gajim/chat_control.py:1163
+#: gajim/chat_control.py:1187
 #, fuzzy
 msgid ""
 "If you close this tab while having chat history disabled, this message will "
@@ -1137,16 +1123,16 @@ msgstr ""
 "Se chiudi questa scheda e la cronologia è disabilitata, questo messaggio "
 "verrà perso."
 
-#: gajim/chat_control.py:1208
+#: gajim/chat_control.py:1232
 msgid "Ping?"
 msgstr "Ping?"
 
-#: gajim/chat_control.py:1211
+#: gajim/chat_control.py:1235
 #, python-format
 msgid "Pong! (%s seconds)"
 msgstr "Pong! (%s secondi)"
 
-#: gajim/chat_control.py:1308
+#: gajim/chat_control.py:1332
 #, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -1155,245 +1141,253 @@ msgstr ""
 "Oggetto: %(subject)s\n"
 "%(message)s"
 
-#: gajim/chat_control.py:1416
+#: gajim/chat_control.py:1440
 #, python-format
 msgid "%(name)s is now %(show)s %(status)s"
 msgstr "%(name)s ora è %(show)s %(status)s"
 
-#: gajim/chat_control.py:1476 gajim/data/gui/application_menu.ui:32
+#: gajim/chat_control.py:1500 gajim/data/gui/application_menu.ui:32
 #: gajim/gtk/http_upload_progress.py:35
 msgid "File Transfer"
 msgstr "Trasferimento di file"
 
-#: gajim/chat_control.py:1480
+#: gajim/chat_control.py:1504
 msgid "Size"
 msgstr "Dimensione"
 
-#: gajim/chat_control.py:1482 gajim/chat_control.py:1546
+#: gajim/chat_control.py:1506 gajim/chat_control.py:1566
+#: gajim/gui_interface.py:190
 #: gajim/data/gui/groupchat_invitation_received.ui:77
-#: gajim/gtk/filetransfer.py:485
+#: gajim/gtk/filetransfer.py:490
 #, fuzzy
 msgid "_Accept"
 msgstr "_Accetta"
 
-#: gajim/chat_control.py:1484 gajim/chat_control.py:1548
+#: gajim/chat_control.py:1508 gajim/chat_control.py:1568
 #: gajim/data/gui/groupchat_invitation_received.ui:62
 #, fuzzy
 msgid "_Decline"
 msgstr "_Non in linea"
 
-#: gajim/chat_control.py:1506 gajim/gui_interface.py:791
-#: gajim/gui_interface.py:821 gajim/gui_interface.py:847
+#: gajim/chat_control.py:1530 gajim/gui_interface.py:777
+#: gajim/gui_interface.py:807 gajim/gui_interface.py:833
 #: gajim/gtk/notification.py:173 gajim/gtk/notification.py:278
 msgid "File Transfer Completed"
 msgstr "Trasferimento del file completato"
 
-#: gajim/chat_control.py:1510 gajim/gtk/filetransfer.py:259
+#: gajim/chat_control.py:1534 gajim/gtk/filetransfer.py:258
 #, fuzzy
 msgid "Open _Folder"
 msgstr "Apri la cartella _contenitrice"
 
-#: gajim/chat_control.py:1512 gajim/chat_control.py:1521
+#: gajim/chat_control.py:1536 gajim/chat_control.py:1545
+#: gajim/data/gui/groupchat_control.ui:962
+#: gajim/data/gui/groupchat_control.ui:1049
+#: gajim/data/gui/groupchat_control.ui:1155
 #, fuzzy
 msgid "_Close"
 msgstr "Invia e _chiudi"
 
-#: gajim/chat_control.py:1543 gajim/gui_interface.py:484
+#: gajim/chat_control.py:1563 gajim/gui_interface.py:473
+#: gajim/data/gui/groupchat_invitation_received.ui:42
 #: gajim/gtk/notification.py:174 gajim/gtk/notification.py:195
 #: gajim/gtk/notification.py:281
-msgid "Groupchat Invitation"
+#, fuzzy
+msgid "Group Chat Invitation"
 msgstr "Invito in una conversazione di gruppo"
 
-#: gajim/chat_control.py:1568 gajim/roster_window.py:1954
+#: gajim/chat_control.py:1588 gajim/roster_window.py:1951
 msgid "Remote contact stopped transfer"
 msgstr "Il contatto remoto ha interrotto il trasferimento"
 
-#: gajim/chat_control.py:1570 gajim/roster_window.py:1956
+#: gajim/chat_control.py:1590 gajim/roster_window.py:1953
 msgid "Error opening file"
 msgstr "Errore nell'apertura del file"
 
-#: gajim/chat_control.py:1572 gajim/gtk/filetransfer.py:297
+#: gajim/chat_control.py:1592 gajim/gtk/filetransfer.py:296
 msgid "File transfer stopped"
 msgstr "Trasferimento del file interrotto"
 
-#: gajim/chat_control.py:1575 gajim/gtk/filetransfer.py:275
-#: gajim/gtk/filetransfer.py:284
+#: gajim/chat_control.py:1595 gajim/gtk/filetransfer.py:274
+#: gajim/gtk/filetransfer.py:283
 msgid "File transfer cancelled"
 msgstr "Trasferimento del file annullato"
 
-#: gajim/chat_control.py:1576
+#: gajim/chat_control.py:1596
 msgid "Connection with peer cannot be established."
 msgstr "La connessione con il contatto non può essere stabilita."
 
-#: gajim/application.py:72
+#: gajim/application.py:75
 msgid "Show the application's version"
 msgstr "Mostra la versione dell'applicazione"
 
-#: gajim/application.py:79
+#: gajim/application.py:82
 msgid "Show only critical errors"
 msgstr "Mostra solo gli errori critici"
 
-#: gajim/application.py:86
+#: gajim/application.py:89
 msgid "Separate profile files completely (even history database and plugins)"
 msgstr ""
 
-#: gajim/application.py:94
+#: gajim/application.py:97
 #, fuzzy
 msgid "Print XML stanzas and other debug information"
 msgstr "Stampa xml stanza e altre informazioni di debug"
 
-#: gajim/application.py:101
+#: gajim/application.py:104
 msgid "Use defined profile in configuration directory"
 msgstr "Usa il profilo definito nella cartella di configurazione"
 
-#: gajim/application.py:109
+#: gajim/application.py:112
 msgid "Set configuration directory"
 msgstr "Imposta la cartella di configurazione"
 
-#: gajim/application.py:117
+#: gajim/application.py:120
 msgid "Configure logging system"
 msgstr "Configura il sistema di registrazione degli eventi"
 
-#: gajim/application.py:125
+#: gajim/application.py:128
 msgid "Show all warnings"
 msgstr "Mostra tutti gli avvertimenti"
 
-#: gajim/application.py:132
+#: gajim/application.py:135
 msgid "Open IPython shell"
 msgstr ""
 
-#: gajim/application.py:139
+#: gajim/application.py:142
 msgid "Pops up a window with the next pending event"
 msgstr "Apre una finestra con il prossimo evento in attesa"
 
-#: gajim/application.py:145 gajim/data/gui/shortcuts_window.ui:203
+#: gajim/application.py:148 gajim/data/gui/shortcuts_window.ui:203
 #: data/org.gajim.Gajim.desktop.in:21
 msgid "Start a new chat"
 msgstr "Inizia una conversazione"
 
-#: gajim/application.py:152
+#: gajim/application.py:155
 msgid "Simulate loss of connectivity"
 msgstr "Simula perdita di connettività"
 
-#: gajim/application.py:159
+#: gajim/application.py:162
 msgid "Simulate regaining connectivity"
 msgstr ""
 
-#: gajim/application.py:201 gajim/gui_interface.py:133
+#: gajim/application.py:204 gajim/gui_interface.py:133
 msgid "Database Error"
 msgstr "Errore del database"
 
-#: gajim/roster_window.py:294 gajim/roster_window.py:1030
+#: gajim/roster_window.py:291 gajim/roster_window.py:1027
 msgid "Merged accounts"
 msgstr "Account uniti"
 
-#: gajim/roster_window.py:853 gajim/roster_window.py:1631
-#: gajim/roster_window.py:1664 gajim/roster_window.py:1715
-#: gajim/roster_window.py:1717 gajim/roster_window.py:1872
-#: gajim/roster_window.py:2531 gajim/roster_window.py:5025
-#: gajim/common/contacts.py:188 gajim/common/contacts.py:447
-#: gajim/common/helpers.py:83 gajim/gtk/discovery.py:129
-#: gajim/gtk/discovery.py:130 gajim/gtk/discovery.py:1416
+#: gajim/roster_window.py:850 gajim/roster_window.py:1628
+#: gajim/roster_window.py:1661 gajim/roster_window.py:1712
+#: gajim/roster_window.py:1714 gajim/roster_window.py:1869
+#: gajim/roster_window.py:2528 gajim/roster_window.py:4331
+#: gajim/roster_window.py:4964 gajim/common/contacts.py:204
+#: gajim/common/contacts.py:463 gajim/common/helpers.py:86
+#: gajim/gtk/discovery.py:127 gajim/gtk/discovery.py:128
+#: gajim/gtk/discovery.py:1414
 msgid "Transports"
 msgstr "Trasporti"
 
-#: gajim/roster_window.py:1723 gajim/roster_window.py:1725
-#: gajim/roster_window.py:4995 gajim/gui_interface.py:1613
-#: gajim/gui_interface.py:1639 gajim/common/contacts.py:186
-#: gajim/common/helpers.py:83 gajim/common/modules/adhoc_commands.py:245
-msgid "Groupchats"
+#: gajim/roster_window.py:1720 gajim/roster_window.py:1722
+#: gajim/roster_window.py:4331 gajim/roster_window.py:4934
+#: gajim/gui_interface.py:1527 gajim/common/contacts.py:202
+#: gajim/common/helpers.py:86 gajim/common/modules/adhoc_commands.py:245
+#, fuzzy
+msgid "Group chats"
 msgstr "Conversazioni di gruppo"
 
-#: gajim/roster_window.py:2012
+#: gajim/roster_window.py:2009
 msgid "Authorization sent"
 msgstr "Autorizzazione inviata"
 
-#: gajim/roster_window.py:2013
+#: gajim/roster_window.py:2010
 #, python-format
 msgid "\"%s\" will now see your status."
 msgstr "\"%s\" ora vedrà il tuo stato."
 
-#: gajim/roster_window.py:2031
+#: gajim/roster_window.py:2028
 msgid "Subscription request has been sent"
 msgstr "La richiesta di iscrizione è stata inviata"
 
-#: gajim/roster_window.py:2032
-#, python-format
-msgid "If \"%s\" accepts this request you will know his or her status."
+#: gajim/roster_window.py:2029
+#, fuzzy, 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:2046
+#: gajim/roster_window.py:2043
 msgid "Authorization removed"
 msgstr "Autorizzazione rimossa"
 
-#: gajim/roster_window.py:2047
+#: gajim/roster_window.py:2044
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Ora \"%s\" ti vedrà sempre come non in linea."
 
-#: gajim/roster_window.py:2250 gajim/roster_window.py:3504
+#: gajim/roster_window.py:2247 gajim/roster_window.py:3460
 msgid "Disconnect for Invisibility"
 msgstr ""
 
-#: gajim/roster_window.py:2251 gajim/roster_window.py:3505
+#: gajim/roster_window.py:2248 gajim/roster_window.py:3461
 msgid "You are participating in one or more group chats"
 msgstr "Si sta partecipando ad una o più conversazioni di gruppo"
 
-#: gajim/roster_window.py:2252 gajim/roster_window.py:3506
+#: gajim/roster_window.py:2249 gajim/roster_window.py:3462
 #, fuzzy
 msgid ""
-"Changing your status to invisible will result in disconnection from those "
-"group chats.\n"
+"Changing your status to invisible will result in you leaving those group "
+"chats.\n"
 "Are you sure you want to go invisible?"
 msgstr ""
 "Impostare lo stato invisibile ti farà disconnettere da queste conversazioni "
 "di gruppo. Diventare veramente invisibile?"
 
-#: gajim/roster_window.py:2257 gajim/roster_window.py:3512
-#: gajim/roster_window.py:5238 gajim/data/gui/gc_control_popup_menu.ui:120
+#: gajim/roster_window.py:2254 gajim/roster_window.py:3468
+#: gajim/data/gui/gc_control_popup_menu.ui:120
 msgid "_Disconnect"
 msgstr "_Disconnetti"
 
-#: gajim/roster_window.py:2285
+#: gajim/roster_window.py:2282
 msgid "desynced"
 msgstr "desincronizzato"
 
-#: gajim/roster_window.py:2353 gajim/data/gui/shortcuts_window.ui:224
+#: gajim/roster_window.py:2350 gajim/data/gui/shortcuts_window.ui:224
 #, fuzzy
 msgid "Quit Gajim"
 msgstr "Gajim"
 
-#: gajim/roster_window.py:2354
+#: gajim/roster_window.py:2351
 #, fuzzy
 msgid "You are about to quit Gajim"
 msgstr "Sei sicuro di volere uscire da Gajim?"
 
-#: gajim/roster_window.py:2355
+#: gajim/roster_window.py:2352
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Sei sicuro di volere uscire da Gajim?"
 
-#: gajim/roster_window.py:2356
+#: gajim/roster_window.py:2353
 #, fuzzy
 msgid "_Always quit when closing Gajim"
 msgstr "Chiudi sempre Gajim"
 
-#: gajim/roster_window.py:2359 gajim/roster_window.py:2455
-#: gajim/roster_window.py:2495 gajim/data/gui/systray_context_menu.ui:90
+#: gajim/roster_window.py:2356 gajim/roster_window.py:2452
+#: gajim/roster_window.py:2492 gajim/data/gui/systray_context_menu.ui:83
 #, fuzzy
 msgid "_Quit"
 msgstr "_Esci"
 
-#: gajim/roster_window.py:2448
+#: gajim/roster_window.py:2445
 #, fuzzy
 msgid "Stop File Transfers"
 msgstr "Interrompi il trasferimento file"
 
-#: gajim/roster_window.py:2449
+#: gajim/roster_window.py:2446
 #, fuzzy
 msgid "You still have running file transfers"
 msgstr "Hai dei trasferimenti di file in corso"
 
-#: gajim/roster_window.py:2450
+#: gajim/roster_window.py:2447
 #, fuzzy
 msgid ""
 "If you quit now, the file(s) being transferred will be lost.\n"
@@ -1402,17 +1396,17 @@ msgstr ""
 "Se si esce ora, i file in trasferimento saranno interrotti. Procedere "
 "comunque con l'uscita?"
 
-#: gajim/roster_window.py:2488
+#: gajim/roster_window.py:2485
 #, fuzzy
 msgid "Unread Messages"
 msgstr "Eventi non letti"
 
-#: gajim/roster_window.py:2489
+#: gajim/roster_window.py:2486
 #, fuzzy
 msgid "You still have unread messages"
 msgstr "Ci sono dei messaggi non letti"
 
-#: gajim/roster_window.py:2490
+#: gajim/roster_window.py:2487
 #, fuzzy
 msgid ""
 "Messages will only be available for reading them later if storing chat "
@@ -1421,21 +1415,21 @@ msgstr ""
 "I messaggi saranno disponibili per una lettura successiva solo se la "
 "cronologia è abilitata e il contatto è nell'elenco dei tuoi contatti."
 
-#: gajim/roster_window.py:2760
+#: gajim/roster_window.py:2753
 msgid "You have unread messages"
 msgstr "Ci sono dei messaggi non letti"
 
-#: gajim/roster_window.py:2761
+#: gajim/roster_window.py:2754
 msgid "You must read them before removing this transport."
 msgstr ""
 "Devi leggere tutti gli eventi pendenti prima di rimuovere questo account."
 
-#: gajim/roster_window.py:2764
+#: gajim/roster_window.py:2757
 #, fuzzy, python-format
 msgid "Transport '%s' will be removed"
 msgstr "Il trasporto \"%s\" verrà rimosso"
 
-#: gajim/roster_window.py:2765
+#: gajim/roster_window.py:2758
 #, fuzzy
 msgid ""
 "You will no longer be able to send and receive messages from and to contacts "
@@ -1444,11 +1438,11 @@ msgstr ""
 "Non si potranno più inviare e ricevere messaggi verso i contatti di questo "
 "trasporto."
 
-#: gajim/roster_window.py:2768
+#: gajim/roster_window.py:2761
 msgid "Transports will be removed"
 msgstr "I trasporti verranno rimossi"
 
-#: gajim/roster_window.py:2773
+#: gajim/roster_window.py:2766
 #, fuzzy, python-format
 msgid ""
 "You will no longer be able to send and receive messages from and to contacts "
@@ -1458,20 +1452,20 @@ msgstr ""
 "Non si potranno più inviare e ricevere messaggi verso i contatti di questo "
 "trasporto."
 
-#: gajim/roster_window.py:2777
+#: gajim/roster_window.py:2770
 #, fuzzy
 msgid "Remove Transport"
 msgstr "Mostra i t_rasporti"
 
-#: gajim/roster_window.py:2844
+#: gajim/roster_window.py:2837
 msgid "Block Contact"
 msgstr "Blocca il contatto"
 
-#: gajim/roster_window.py:2845
+#: gajim/roster_window.py:2838
 msgid "Really block this contact?"
 msgstr "Bloccare davvero questo contatto?"
 
-#: gajim/roster_window.py:2846
+#: gajim/roster_window.py:2839
 #, fuzzy
 msgid ""
 "This contact will see you offline and you will not receive any messages sent "
@@ -1480,65 +1474,60 @@ msgstr ""
 "Questo contatto ti vedrà non in linea e non riceverai i messaggi che ti "
 "manderà."
 
-#: gajim/roster_window.py:2851
+#: gajim/roster_window.py:2844
 #, fuzzy
 msgid "_Block Contact"
 msgstr "Blocca il contatto"
 
-#: gajim/roster_window.py:2896
+#: gajim/roster_window.py:2889
 msgid "Rename Contact"
 msgstr "Rinomina il contatto"
 
-#: gajim/roster_window.py:2897
+#: gajim/roster_window.py:2890
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Inserisci un nuovo soprannome per il contatto %s"
 
-#: gajim/roster_window.py:2904
+#: gajim/roster_window.py:2897
 msgid "Rename Group"
 msgstr "Rinomina il gruppo"
 
-#: gajim/roster_window.py:2905
+#: gajim/roster_window.py:2898
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Inserisci un nuovo nome per il gruppo %s."
 
-#: gajim/roster_window.py:2953 gajim/roster_window.py:2954
+#: gajim/roster_window.py:2946 gajim/roster_window.py:2947
 msgid "Remove Group"
 msgstr "Elimina il gruppo"
 
-#: gajim/roster_window.py:2955
+#: gajim/roster_window.py:2948
 #, fuzzy, python-format
 msgid "Do you want to remove %s from the contact list?"
 msgstr "Vuoi rimuovere il gruppo %s dal tuo gruppo?"
 
-#: gajim/roster_window.py:2956
+#: gajim/roster_window.py:2949
 #, fuzzy
 msgid "_Also remove all contacts of this group from contact list"
 msgstr "Rimuovi anche tutti i contatti di questo gruppo dal tuo elenco"
 
-#: gajim/roster_window.py:3044
-#, python-format
-msgid "%(jid)s has been invited in this room"
-msgstr "%(jid)s è stato invitato in questa stanza"
-
-#: gajim/roster_window.py:3353
+#: gajim/roster_window.py:3309
 #, fuzzy
 msgid "Remove Contact"
 msgstr "Rinomina il contatto"
 
-#: gajim/roster_window.py:3354
+#: gajim/roster_window.py:3310
 #, fuzzy
 msgid "Remove contact from contact list"
 msgstr "Rimuove il contatto dal tuo elenco"
 
-#: gajim/roster_window.py:3355
+#: gajim/roster_window.py:3311
 #, fuzzy, 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) dall'elenco dei tuoi contatti.\n"
 
-#: gajim/roster_window.py:3364 gajim/roster_window.py:3384
+#: gajim/roster_window.py:3320 gajim/roster_window.py:3340
 #, fuzzy
 msgid ""
 "By removing this contact you also remove authorization. This means the "
@@ -1547,20 +1536,20 @@ msgstr ""
 "Eliminando questo contatto ne verrà rimossa anche l'autorizzazione, di "
 "conseguenza ti vedrà sempre non in linea."
 
-#: gajim/roster_window.py:3375
+#: gajim/roster_window.py:3331
 msgid "Do you want to continue?"
 msgstr "Vuoi continuare?"
 
-#: gajim/roster_window.py:3386
+#: gajim/roster_window.py:3342
 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:3393
+#: gajim/roster_window.py:3349
 #, fuzzy
 msgid "Remove contacts from contact list"
 msgstr "Rimuove il contatto dal tuo elenco"
 
-#: gajim/roster_window.py:3399
+#: gajim/roster_window.py:3355
 #, fuzzy, python-format
 msgid ""
 "By removing the following contacts, you will also remove authorization. This "
@@ -1571,25 +1560,25 @@ msgstr ""
 "Eliminando questo contatto ne verrà rimossa anche l'autorizzazione, di "
 "conseguenza ti vedrà sempre non in linea."
 
-#: gajim/roster_window.py:3403
+#: gajim/roster_window.py:3359
 #, fuzzy
 msgid "Remove Contacts"
 msgstr "Rinomina il contatto"
 
-#: gajim/roster_window.py:3423
+#: gajim/roster_window.py:3379
 msgid "No account available"
 msgstr "Nessun account disponibile"
 
-#: gajim/roster_window.py:3424
+#: gajim/roster_window.py:3380
 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:4060
+#: gajim/roster_window.py:4011
 msgid "Metacontacts storage not supported by your server"
 msgstr "Il supporto metacontatti non è supportato dal tuo server"
 
-#: gajim/roster_window.py:4062
+#: gajim/roster_window.py:4013
 msgid ""
 "Your server does not support storing metacontacts information. So this "
 "information will not be saved on next reconnection."
@@ -1597,12 +1586,12 @@ 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:4159
+#: gajim/roster_window.py:4110
 #, fuzzy
 msgid "You are about to create a metacontact"
 msgstr "Stai per creare un metacontatto. Continuare?"
 
-#: gajim/roster_window.py:4160
+#: gajim/roster_window.py:4111
 #, fuzzy
 msgid ""
 "Metacontacts are a way to regroup several contacts in one single contact. "
@@ -1613,120 +1602,112 @@ msgstr ""
 "Generalmente si usano quando la stessa persona ha più account XMPP o su vari "
 "transport."
 
-#: gajim/roster_window.py:4164
+#: gajim/roster_window.py:4115
 #, fuzzy
 msgid "Create Metacontact"
 msgstr "Rinomina il contatto"
 
-#: gajim/roster_window.py:4170
+#: gajim/roster_window.py:4121 gajim/data/gui/groupchat_creation.ui:317
 #, fuzzy
 msgid "_Create"
 msgstr "Creativo"
 
-#: gajim/roster_window.py:4287
+#: gajim/roster_window.py:4238
 msgid "Invalid file URI:"
 msgstr "File URI non valido:"
 
-#: gajim/roster_window.py:4298
+#: gajim/roster_window.py:4249
 msgid "Send file?"
 msgstr "Inviare il file?"
 
-#: gajim/roster_window.py:4299
+#: gajim/roster_window.py:4250
 #, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
 msgstr[0] "Vuoi inviare questo file a %s:"
 msgstr[1] "Vuoi inviare questi file a %s:"
 
-#: gajim/roster_window.py:4451
+#: gajim/roster_window.py:4401
 #, python-format
 msgid "Send %(from)s to %(to)s"
 msgstr "Invia %(from)s a %(to)s"
 
-#: gajim/roster_window.py:4464
+#: gajim/roster_window.py:4414
 #, python-format
 msgid "Make %s first contact"
 msgstr "Rendi %s il primo contatto"
 
-#: gajim/roster_window.py:4469
+#: gajim/roster_window.py:4419
 #, python-format
 msgid "Make %(contact1)s and %(contact2)s metacontacts"
 msgstr "Rendi %(contact1)s e %(contact2)s metacontatti"
 
-#: gajim/roster_window.py:4825 gajim/roster_window.py:4923
+#: gajim/roster_window.py:4775 gajim/roster_window.py:4862
 msgid "_Change Status Message"
 msgstr "_Cambia il messaggio di stato"
 
-#: gajim/roster_window.py:4845
+#: gajim/roster_window.py:4795
 msgid "Publish Tune"
 msgstr "Pubblica il brano musicale"
 
-#: gajim/roster_window.py:4856
+#: gajim/roster_window.py:4806
 msgid "Publish Location"
 msgstr "Pubblica la posizione"
 
-#: gajim/roster_window.py:4868
-msgid "Configure Services…"
-msgstr "Configura i servizi..."
-
-#: gajim/roster_window.py:4997
+#: gajim/roster_window.py:4936
 msgid "_Maximize All"
 msgstr "_Massimizza tutti"
 
-#: gajim/roster_window.py:5004 gajim/roster_window.py:5146
+#: gajim/roster_window.py:4943 gajim/roster_window.py:5085
 msgid "Send Group M_essage"
 msgstr "Invia un m_essaggio di gruppo"
 
-#: gajim/roster_window.py:5011
+#: gajim/roster_window.py:4950
 msgid "To all users"
 msgstr "A tutti gli utenti"
 
-#: gajim/roster_window.py:5015
+#: gajim/roster_window.py:4954
 msgid "To all online users"
 msgstr "A tutti gli utenti in linea"
 
-#: gajim/roster_window.py:5027 gajim/roster_window.py:5152
+#: gajim/roster_window.py:4966 gajim/roster_window.py:5091
 #: gajim/data/gui/gc_occupants_menu.ui:110
 #: gajim/data/gui/contact_context_menu.ui:36
 msgid "In_vite to"
 msgstr "In_vita a"
 
-#: gajim/roster_window.py:5162
+#: gajim/roster_window.py:5101
 msgid "_Manage Contacts"
 msgstr "_Gestisci i contatti"
 
-#: gajim/roster_window.py:5168
+#: gajim/roster_window.py:5107
 msgid "Edit _Groups…"
 msgstr "Modifica i _gruppi…"
 
-#: gajim/roster_window.py:5189 gajim/data/gui/filetransfers.ui:12
+#: gajim/roster_window.py:5128 gajim/data/gui/filetransfers.ui:12
 #: gajim/data/gui/remove_account_window.ui:134
 msgid "_Remove"
 msgstr "_Rimuovi"
 
-#: gajim/roster_window.py:5226
+#: gajim/roster_window.py:5165
 msgid "_Maximize"
 msgstr "_Massimizza"
 
-#: gajim/roster_window.py:5233
+#: gajim/roster_window.py:5172
 msgid "_Reconnect"
 msgstr "_Riconnetti"
 
-#: gajim/roster_window.py:5254 gajim/data/gui/gc_occupants_menu.ui:170
+#: gajim/roster_window.py:5193 gajim/data/gui/gc_occupants_menu.ui:170
 #: gajim/data/gui/gc_control_popup_menu.ui:113
 #: gajim/data/gui/contact_context_menu.ui:205
 msgid "_History"
 msgstr "_Cronologia"
 
-#: gajim/roster_window.py:5335 gajim/data/gui/application_menu.ui:86
+#: gajim/roster_window.py:5274 gajim/data/gui/application_menu.ui:83
 #: gajim/data/gui/history_window.ui:57
 msgid "History Manager"
 msgstr "Gestore della cronologia"
 
-#: gajim/roster_window.py:5343
-msgid "_Join New Group Chat"
-msgstr "_Unisciti a una nuova conversazione di gruppo"
-
 #: gajim/dataforms_widget.py:585
 msgid "Unable to load image"
 msgstr "Impossibile caricare l'immagine"
@@ -1848,252 +1829,269 @@ msgstr "Soggetto: %s\n"
 msgid "Write a message…"
 msgstr "Scrivi un messaggio…"
 
-#: gajim/message_window.py:250
+#: gajim/message_window.py:356
+#, fuzzy
+msgid "Close Tabs"
+msgstr "Chiudi la chat"
+
+#: gajim/message_window.py:357
 msgid "You are going to close several tabs"
 msgstr "Stai per chiudere diverse schede"
 
-#: gajim/message_window.py:251
+#: gajim/message_window.py:358
 msgid "Do you really want to close them all?"
 msgstr "Vuoi davvero chiuderle tutte?"
 
-#: gajim/message_window.py:539
+#: gajim/message_window.py:514
 msgid "?Noun:Chats"
 msgstr "Conversazioni"
 
-#: gajim/message_window.py:543
+#: gajim/message_window.py:518
 msgid "Group Chats"
 msgstr "Conversazione di gruppo"
 
-#: gajim/message_window.py:547
+#: gajim/message_window.py:522
 msgid "Private Chats"
 msgstr "Conversazioni private"
 
-#: gajim/message_window.py:553
+#: gajim/message_window.py:528
 msgid "Messages"
 msgstr "Messaggi"
 
-#: gajim/gui_interface.py:173
+#: gajim/gui_interface.py:170
+#, 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:175
 msgid "Do you accept this request?"
 msgstr "Accetti questa richiesta?"
 
-#: gajim/gui_interface.py:175
-#, python-format
-msgid "Do you accept this request on account %s?"
+#: gajim/gui_interface.py:177
+#, fuzzy, python-format
+msgid "Do you accept this request (account: %s)?"
 msgstr "Accetti questa richiesta per l'account %s?"
 
-#: gajim/gui_interface.py:178
-#, 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:182
+#, fuzzy
+msgid "Authorization"
+msgstr "Autorizzazione inviata"
 
-#: gajim/gui_interface.py:194 gajim/gtk/notification.py:175
+#: gajim/gui_interface.py:186 gajim/gui_interface.py:420
+#: gajim/gtk/filetransfer.py:338
+#, fuzzy
+msgid "_No"
+msgstr "No"
+
+#: gajim/gui_interface.py:205 gajim/gtk/notification.py:175
 #: gajim/gtk/notification.py:197
 msgid "Connection Failed"
 msgstr "Connessione fallita"
 
-#: gajim/gui_interface.py:279 gajim/gui_interface.py:529
-msgid "Password Required"
-msgstr "È richiesta una password"
-
-#: gajim/gui_interface.py:280
-#, python-format
-msgid "A Password is required to join the room %s. Please type it."
-msgstr ""
-"È necessaria una password per entrare nella stanza %s. Digitala, per piacere."
-
-#: gajim/gui_interface.py:342 gajim/gui_interface.py:346
+#: gajim/gui_interface.py:325 gajim/gui_interface.py:329
 #, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr "Errore %(code)s: %(msg)s"
 
-#: gajim/gui_interface.py:357 gajim/gui_interface.py:376
+#: gajim/gui_interface.py:340 gajim/gui_interface.py:359
 #: gajim/common/modules/message.py:122
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "errore durante l'invio del %(message)s ( %(error)s )"
 
-#: gajim/gui_interface.py:401 gajim/gtk/notification.py:175
+#: gajim/gui_interface.py:384 gajim/gtk/notification.py:175
 msgid "Subscription request"
 msgstr "Richiesta di iscrizione"
 
-#: gajim/gui_interface.py:413 gajim/common/contacts.py:184
-#: gajim/common/helpers.py:83
+#: gajim/gui_interface.py:396 gajim/common/contacts.py:200
+#: gajim/common/helpers.py:86
 msgid "Observers"
 msgstr "Osservatori"
 
-#: gajim/gui_interface.py:422
+#: gajim/gui_interface.py:405
 msgid "Authorization accepted"
 msgstr "Autorizzazione accettata"
 
-#: gajim/gui_interface.py:423
+#: gajim/gui_interface.py:406
 #, 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:431
-#, python-format
-msgid "Contact \"%s\" removed subscription from you"
+#: gajim/gui_interface.py:415
+#, fuzzy
+msgid "Subscription Removed"
+msgstr "Richiesta di iscrizione"
+
+#: gajim/gui_interface.py:416
+#, fuzzy, python-format
+msgid "Contact '%s' removed subscription from you"
 msgstr "Il contatto \"%s\" ha eliminato il tuo abbonamento verso di lui"
 
-#: gajim/gui_interface.py:432
+#: gajim/gui_interface.py:417
+#, fuzzy
 msgid ""
-"You will always see them as offline.\n"
+"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?"
 
-#: gajim/gui_interface.py:453 gajim/gtk/notification.py:176
+#: gajim/gui_interface.py:442 gajim/gtk/notification.py:176
 msgid "Unsubscribed"
 msgstr "Non abbonato"
 
-#: gajim/gui_interface.py:465
+#: gajim/gui_interface.py:454
 #, python-format
 msgid "%(jid)s declined the invitation: %(reason)s"
 msgstr "%(jid)s ha rifiutato l'invito: %(reason)s"
 
-#: gajim/gui_interface.py:469
+#: gajim/gui_interface.py:458
 #, python-format
 msgid "%(jid)s declined the invitation"
 msgstr "%(jid)s ha rifiutato l'invito"
 
-#: gajim/gui_interface.py:485
+#: gajim/gui_interface.py:474
 #, python-brace-format
 msgid "You are invited to {room} by {user}"
 msgstr "Sei stato invitato nella stanza {room} da {user}"
 
-#: gajim/gui_interface.py:506
+#: gajim/gui_interface.py:495
 msgid "Certificate Passphrase Required"
 msgstr "Richiesta la frase di accesso per il certificato"
 
-#: gajim/gui_interface.py:507
+#: gajim/gui_interface.py:496
 #, 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:516 gajim/gtk/accounts.py:963
+#: gajim/gui_interface.py:505 gajim/gtk/accounts.py:966
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Inserire la password per l'account %s"
 
-#: gajim/gui_interface.py:529 gajim/gtk/accounts.py:964
+#: gajim/gui_interface.py:518
+msgid "Password Required"
+msgstr "È richiesta una password"
+
+#: gajim/gui_interface.py:518 gajim/gtk/accounts.py:967
 msgid "Save password"
 msgstr "Memorizza la password"
 
-#: gajim/gui_interface.py:601 gajim/gui_interface.py:632
+#: gajim/gui_interface.py:587 gajim/gui_interface.py:618
+#: gajim/gtk/filetransfer.py:332 gajim/gtk/filetransfer.py:333
 #: gajim/gtk/notification.py:173 gajim/gtk/notification.py:276
 msgid "File Transfer Error"
 msgstr "Errore durante il trasferimento del file"
 
-#: gajim/gui_interface.py:666
+#: gajim/gui_interface.py:652
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s vuole inviarti un file."
 
-#: gajim/gui_interface.py:668 gajim/gtk/filetransfer.py:479
+#: gajim/gui_interface.py:654 gajim/gtk/filetransfer.py:484
 #: gajim/gtk/notification.py:172 gajim/gtk/notification.py:274
 msgid "File Transfer Request"
 msgstr "Richiesta di trasferimento di file"
 
-#: gajim/gui_interface.py:767
+#: gajim/gui_interface.py:753
 #, fuzzy
 msgid "Remote Contact Stopped Transfer"
 msgstr "Il contatto remoto ha interrotto il trasferimento"
 
-#: gajim/gui_interface.py:772
+#: gajim/gui_interface.py:758
 #, fuzzy
 msgid "Error Opening File"
 msgstr "Errore nell'apertura del file"
 
-#: gajim/gui_interface.py:782
+#: gajim/gui_interface.py:768
 #, fuzzy
 msgid "SSL Certificate Error"
 msgstr "Errore del certificato SSL"
 
-#: gajim/gui_interface.py:795 gajim/gui_interface.py:826
-#: gajim/gui_interface.py:853 gajim/gtk/notification.py:174
+#: gajim/gui_interface.py:781 gajim/gui_interface.py:812
+#: gajim/gui_interface.py:839 gajim/gtk/notification.py:174
 #: gajim/gtk/notification.py:279
 msgid "File Transfer Stopped"
 msgstr "Trasferimento del file interrotto"
 
-#: gajim/gui_interface.py:799
+#: gajim/gui_interface.py:785
 msgid "File Transfer Failed"
 msgstr "Trasferimento del file fallito"
 
-#: gajim/gui_interface.py:822
+#: gajim/gui_interface.py:808
 #, python-format
 msgid "%(filename)s received from %(name)s."
 msgstr "%(filename)s ricevuto da %(name)s."
 
-#: gajim/gui_interface.py:827
+#: gajim/gui_interface.py:813
 #, 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:833
+#: gajim/gui_interface.py:819
 #, 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:848
+#: gajim/gui_interface.py:834
 #, 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:854
+#: gajim/gui_interface.py:840
 #, 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:860
+#: gajim/gui_interface.py:846
 #, 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:971
+#: gajim/gui_interface.py:957
 msgid "Username Conflict"
 msgstr "Conflitto tra nomi utente"
 
-#: gajim/gui_interface.py:972
+#: gajim/gui_interface.py:958
 msgid "Please type a new username for your local account"
 msgstr "Inserire un nuovo nome utente per l'account locale"
 
-#: gajim/gui_interface.py:995
+#: gajim/gui_interface.py:981
 msgid "Resource Conflict"
 msgstr "Conflitto tra risorse"
 
-#: gajim/gui_interface.py:996
+#: gajim/gui_interface.py:982
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
 msgstr ""
 "Sei già connesso a questo account con la stessa risorsa. Inseriscine un'altra"
 
-#: gajim/gui_interface.py:1053
+#: gajim/gui_interface.py:1039
 #, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s vuole iniziare una conversazione vocale."
 
-#: gajim/gui_interface.py:1055
+#: gajim/gui_interface.py:1041
 msgid "Voice Chat Request"
 msgstr "Richiesta di conversazione vocale"
 
-#: gajim/gui_interface.py:1123 gajim/gtk/account_wizard.py:312
+#: gajim/gui_interface.py:1109 gajim/gtk/account_wizard.py:312
 msgid "Certificate Already in File"
 msgstr "Certificato già nel file"
 
-#: gajim/gui_interface.py:1124 gajim/gtk/account_wizard.py:313
+#: gajim/gui_interface.py:1110 gajim/gtk/account_wizard.py:313
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr ""
 "Questo certificato è già nel file %s, quindi non verrà aggiunto di nuovo."
 
-#: gajim/gui_interface.py:1145
+#: gajim/gui_interface.py:1131
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid"
 msgstr "L'autenticazione del certificato %s potrebbe non essere valida."
 
-#: gajim/gui_interface.py:1148
+#: gajim/gui_interface.py:1134
 #, python-format
 msgid ""
 "\n"
@@ -2102,7 +2100,7 @@ msgstr ""
 "\n"
 "Errore SSL sconosciuto: %d"
 
-#: gajim/gui_interface.py:1150
+#: gajim/gui_interface.py:1136
 #, python-format
 msgid ""
 "\n"
@@ -2111,11 +2109,11 @@ msgstr ""
 "\n"
 "Errore SSL: <b>%s</b>"
 
-#: gajim/gui_interface.py:1155
+#: gajim/gui_interface.py:1141
 msgid "Error verifying SSL certificate"
 msgstr "Errore nel verificare il certificato SSL"
 
-#: gajim/gui_interface.py:1156
+#: gajim/gui_interface.py:1142
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your XMPP server: "
@@ -2126,7 +2124,7 @@ msgstr ""
 "%(error)s\n"
 "Vuoi ancora connetterti a questo server?"
 
-#: gajim/gui_interface.py:1160 gajim/gtk/account_wizard.py:412
+#: gajim/gui_interface.py:1146 gajim/gtk/account_wizard.py:413
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -2141,167 +2139,158 @@ msgstr ""
 "Impronta digitale SHA-256 del certificato:\n"
 "%(sha256)s"
 
-#: gajim/gui_interface.py:1166
+#: gajim/gui_interface.py:1152
 msgid "Ignore this error for this certificate."
 msgstr "Ignora questo errore per questo certificato"
 
-#: gajim/gui_interface.py:1174
+#: gajim/gui_interface.py:1160
 #, python-format
 msgid "SSL Certificate Verification for %s"
 msgstr "Validazione del certificato SSL per %s"
 
-#: gajim/gui_interface.py:1442 gajim/gtk/join_groupchat.py:235
-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/gui_interface.py:1448
-msgid "JID is not a Groupchat"
-msgstr "Il JID non è una conversazione di gruppo"
-
-#: gajim/gui_interface.py:1579
-msgid "This is not a group chat"
-msgstr "Questa non è una conversazione di gruppo"
-
-#: gajim/gui_interface.py:1580
-#, python-format
-msgid ""
-"%(room_jid)s is already in your roster. Please check if %(room_jid)s is a "
-"correct group chat name. If it is, delete it from your roster and try "
-"joining the group chat again."
-msgstr ""
-
-#: gajim/gui_interface.py:1604 gajim/dialog_messages.py:58
+#: gajim/gui_interface.py:1577
 msgid "You cannot join a group chat while you are invisible"
 msgstr "Non è possibile unirsi ad una stanza quando si è invisibili"
 
-#: gajim/gui_interface.py:2037
+#: gajim/gui_interface.py:1976
 msgid "Could not save your settings and preferences"
 msgstr "Impossibile salvare impostazioni e preferenze"
 
-#: gajim/gui_interface.py:2098
+#: gajim/gui_interface.py:2037
 msgid "Gajim: IPython Console"
 msgstr ""
 
-#: gajim/dialog_messages.py:32
-msgid "You can not start a new conversation unless you are connected."
-msgstr ""
-"Non è possibile unirsi a una nuova conversazione finché non si è connessi."
-
-#: gajim/dialog_messages.py:36 gajim/dialog_messages.py:41
-#: gajim/gtk/single_message.py:305 gajim/gtk/join_groupchat.py:211
-#: gajim/gtk/account_wizard.py:229
-msgid "Invalid JID"
-msgstr "JID non valido"
+#: gajim/dialog_messages.py:31 gajim/dialog_messages.py:36
+#: gajim/gtk/single_message.py:305 gajim/gtk/account_wizard.py:229
+#, fuzzy
+msgid "Invalid XMPP Address"
+msgstr "File non valido"
 
-#: gajim/dialog_messages.py:42 gajim/gtk/single_message.py:306
-#, python-format
-msgid "It is not possible to send a message to %s, this JID is not valid."
+#: gajim/dialog_messages.py:37
+#, 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/dialog_messages.py:47
-msgid "Unread events"
+#: gajim/dialog_messages.py:42
+#, fuzzy
+msgid "Unread Events"
 msgstr "Eventi non letti"
 
-#: gajim/dialog_messages.py:48
-msgid "Read all pending events before removing this account."
+#: 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."
 
-#: gajim/dialog_messages.py:52
+#: gajim/dialog_messages.py:48
 msgid "Invalid Form"
 msgstr "Modulo non valido"
 
-#: gajim/dialog_messages.py:53
+#: gajim/dialog_messages.py:49
 msgid "The form is not filled correctly."
 msgstr "Il modulo non è stato compilato correttamente."
 
-#: gajim/dialog_messages.py:57 gajim/common/helpers.py:309
+#: gajim/dialog_messages.py:53 gajim/common/helpers.py:315
 msgid "Invisible"
 msgstr "Invisibile"
 
-#: gajim/dialog_messages.py:62
-msgid "A connection is not available"
-msgstr "Nessuna connessione disponibile"
+#: gajim/dialog_messages.py:54
+#, fuzzy
+msgid "You cannot join a group chat while being invisible."
+msgstr "Non è possibile unirsi ad una stanza quando si è invisibili"
 
-#: gajim/dialog_messages.py:63
+#: gajim/dialog_messages.py:58
+#, fuzzy
+msgid "No Connection Available"
+msgstr "Connessione non disponibile"
+
+#: gajim/dialog_messages.py:59
 msgid "Your message can not be sent until you are connected."
 msgstr "Impossibile inviare il messaggio finché non si è connessi."
 
-#: gajim/dialog_messages.py:67
-msgid "JID already in list"
-msgstr "JID già nella lista"
+#: gajim/dialog_messages.py:63
+msgid "XMPP Address Already in List"
+msgstr ""
 
-#: gajim/dialog_messages.py:68
+#: gajim/dialog_messages.py:64
 #, fuzzy
-msgid "The JID you entered is already in the list. Choose another one."
+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."
 
-#: gajim/dialog_messages.py:72
-msgid "Invalid answer"
+#: gajim/dialog_messages.py:69
+#, fuzzy
+msgid "Invalid Answer"
 msgstr "Risposta non valida"
 
-#: gajim/dialog_messages.py:73
+#: gajim/dialog_messages.py:70
 #, python-format
 msgid "Transport %(name)s answered wrongly to register request: %(error)s"
 msgstr ""
 "Il trasporto %(name)s ha risposto in maniera errata alla richiesta di "
 "registrazione: %(error)s"
 
-#: gajim/dialog_messages.py:78
+#: gajim/dialog_messages.py:75
 #, fuzzy
 msgid "Wrong Custom Hostname"
 msgstr "Usa nome host/porta personalizzati"
 
-#: gajim/dialog_messages.py:79
-#, python-format
-msgid "Wrong custom hostname \"%s\". Ignoring it."
+#: gajim/dialog_messages.py:76
+#, fuzzy, python-format
+msgid "Custom hostname \"%s\" is wrong. It will be ignored."
 msgstr "Nome host \"%s\" errato. Sta venendo ignorato."
 
-#: gajim/dialog_messages.py:83
-msgid "Error while removing privacy list"
+#: gajim/dialog_messages.py:80
+#, fuzzy
+msgid "Error While Removing Privacy List"
 msgstr "Errore durante la rimozione dell'elenco della privacy"
 
-#: gajim/dialog_messages.py:84
-#, python-format
+#: gajim/dialog_messages.py:81
+#, fuzzy, python-format
 msgid ""
-"Privacy list %s has not been removed. It is maybe active in one of your "
-"connected resources. Deactivate it and try again."
+"Privacy list %s has not been removed. It is probably active in one of your "
+"connected resources. Please deactivate it and try again."
 msgstr ""
 "L'elenco della privacy %s non è stato rimosso. Potrebbe essere attivo in una "
 "delle risorse connesse. Disattivalo e riprova."
 
-#: gajim/dialog_messages.py:90
-msgid "Invisibility not supported"
+#: gajim/dialog_messages.py:87
+#, fuzzy
+msgid "Invisibility Not Supported"
 msgstr "Invisibilità non supportata"
 
-#: gajim/dialog_messages.py:91
-#, python-format
-msgid "Account %s doesn't support invisibility."
+#: gajim/dialog_messages.py:88
+#, fuzzy, python-format
+msgid "This account %s doesn't support invisibility."
 msgstr "L'account %s non supporta l'invisibilità."
 
-#: gajim/dialog_messages.py:95
-msgid "Unregister failed"
+#: gajim/dialog_messages.py:92
+#, fuzzy
+msgid "Unregister Failed"
 msgstr "De-registrazione fallita"
 
-#: gajim/dialog_messages.py:96
-#, python-format
-msgid "Unregistration with server %(server)s failed: %(error)s"
+#: gajim/dialog_messages.py:93
+#, fuzzy, python-format
+msgid "Unregistration on server %(server)s failed: %(error)s"
 msgstr "De-registrazione con il server %(server)s fallita: %(error)s"
 
-#: gajim/dialog_messages.py:100
-msgid "Registration succeeded"
+#: gajim/dialog_messages.py:97
+#, fuzzy
+msgid "Registration Succeeded"
 msgstr "Registrazione riuscita"
 
-#: gajim/dialog_messages.py:101
-#, python-format
-msgid "Registration with agent %s succeeded"
+#: gajim/dialog_messages.py:98
+#, fuzzy, python-format
+msgid "Registration with agent %s succeeded."
 msgstr "Registrazione con l'agente %s riuscita"
 
-#: gajim/dialog_messages.py:105 gajim/gtk/service_registration.py:215
-msgid "Registration failed"
+#: gajim/dialog_messages.py:102
+#, fuzzy
+msgid "Registration Failed"
 msgstr "Registrazione fallita"
 
-#: gajim/dialog_messages.py:106
+#: gajim/dialog_messages.py:103
 #, python-format
 msgid ""
 "Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
@@ -2309,15 +2298,16 @@ msgstr ""
 "Registrazione con l'agente %(agent)s fallita con errore %(error)s: "
 "%(error_msg)s"
 
-#: gajim/dialog_messages.py:111
+#: gajim/dialog_messages.py:108
 msgid "Unable to Join Group Chat"
 msgstr "Non si è in grado di unirsi alla conversazione di gruppo"
 
-#: gajim/dialog_messages.py:116
-msgid "GStreamer error"
+#: gajim/dialog_messages.py:113
+#, fuzzy
+msgid "GStreamer Error"
 msgstr "Errore GStreamer"
 
-#: gajim/dialog_messages.py:117
+#: gajim/dialog_messages.py:114
 #, python-format
 msgid ""
 "Error: %(error)s\n"
@@ -2326,19 +2316,21 @@ msgstr ""
 "Errore: %(error)s\n"
 "Debug: %(debug)s"
 
-#: gajim/dialog_messages.py:121
-msgid "Wrong host"
+#: gajim/dialog_messages.py:118
+#, fuzzy
+msgid "Wrong Host"
 msgstr "Host errato"
 
-#: gajim/dialog_messages.py:122
+#: gajim/dialog_messages.py:119
 msgid "Invalid local address? :-O"
 msgstr "Indirizzo locale non valido? :-O"
 
-#: gajim/dialog_messages.py:126
-msgid "Avahi error"
+#: gajim/dialog_messages.py:123
+#, fuzzy
+msgid "Avahi Error"
 msgstr "Errore avahi"
 
-#: gajim/dialog_messages.py:127
+#: gajim/dialog_messages.py:124
 #, python-format
 msgid ""
 "%s\n"
@@ -2347,65 +2339,67 @@ msgstr ""
 "%s\n"
 "La messaggistica sulla rete locale potrebbe non funzionare correttamente."
 
-#: gajim/dialog_messages.py:131 gajim/dialog_messages.py:136
+#: gajim/dialog_messages.py:128 gajim/dialog_messages.py:133
 #, fuzzy
-msgid "Could not request upload slot"
+msgid "Could not request upload slot for HTTP File Upload"
 msgstr "Impossibile avviare il servizio locale"
 
-#: gajim/dialog_messages.py:137
+#: gajim/dialog_messages.py:134
 #, fuzzy
-msgid "Got unexpected response from server (see log)"
+msgid "Got unexpected response from server (see log)."
 msgstr "Nessuna risposta dal server"
 
-#: gajim/dialog_messages.py:141 gajim/dialog_messages.py:146
+#: gajim/dialog_messages.py:138 gajim/dialog_messages.py:143
 #, fuzzy
-msgid "Could not open file"
+msgid "Could not Open File"
 msgstr "Non è stato possibile caricare l'immagine"
 
-#: gajim/dialog_messages.py:142
-msgid "Exception raised while opening file (see log)"
+#: gajim/dialog_messages.py:139
+msgid "Exception raised while trying to open file (see log)."
 msgstr ""
 
-#: gajim/dialog_messages.py:151
-msgid "Unsecure"
-msgstr ""
+#: gajim/dialog_messages.py:148
+#, fuzzy
+msgid "Not Secure"
+msgstr "Non iniziato"
 
-#: gajim/dialog_messages.py:152
+#: gajim/dialog_messages.py:149
 #, fuzzy
-msgid "Server returned unsecure transport (HTTP)"
+msgid "The server returned an insecure transport (HTTP)."
 msgstr "Il servizio ha riportato un errore."
 
-#: gajim/dialog_messages.py:156
-msgid "Could not upload file"
+#: gajim/dialog_messages.py:153
+#, fuzzy
+msgid "Could not Upload File"
 msgstr "Non è stato possibile caricare il file"
 
-#: gajim/dialog_messages.py:157
+#: gajim/dialog_messages.py:154
 #, python-format
 msgid "HTTP response code from server: %s"
 msgstr ""
 
-#: gajim/dialog_messages.py:161
+#: gajim/dialog_messages.py:158
 msgid "Upload Error"
 msgstr "Carica errore"
 
-#: gajim/dialog_messages.py:166
+#: gajim/dialog_messages.py:163
 msgid "Encryption Error"
 msgstr "Errore di cifratura"
 
-#: gajim/dialog_messages.py:167
-#, fuzzy
-msgid "For the chosen encryption there is no encryption method available"
-msgstr "Nessuna connessione disponibile"
+#: gajim/dialog_messages.py:164
+msgid "There is no encryption method available for the chosen encryption."
+msgstr ""
 
-#: gajim/dialog_messages.py:171
-msgid "Avatar upload failed"
+#: gajim/dialog_messages.py:169
+#, fuzzy
+msgid "Avatar Upload Failed"
 msgstr "Fallito l'upload dell'avatar"
 
-#: gajim/privatechat_control.py:204
+#: gajim/privatechat_control.py:207
 msgid "Sending private message failed"
 msgstr "Invio di un messaggio privato fallito"
 
-#: gajim/privatechat_control.py:206
+#: gajim/privatechat_control.py:209
 #, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr ""
@@ -2432,7 +2426,7 @@ msgstr "mostra l'aiuto sul comando"
 
 #: gajim/gajim_remote.py:85
 #, fuzzy
-msgid "Lists all contacts in roster, one for each line"
+msgid "Lists all contacts in the contact list, one for each line"
 msgstr ""
 "Stampa una lista di tutti i contatti nella lista contatti. Ogni contatto "
 "appare su una linea separata"
@@ -2510,11 +2504,13 @@ msgstr ""
 
 #: gajim/gajim_remote.py:118
 #, fuzzy
-msgid "Sends new chat message to a contact in the roster. Account is optional."
+msgid ""
+"Sends new chat message to a contact in the contact list. Account is optional."
 msgstr "Invia un messaggio al contatto per attirare la sua attenzione"
 
 #: gajim/gajim_remote.py:120 gajim/gajim_remote.py:130
-msgid "JID of the contact that will receive the message"
+#, fuzzy
+msgid "XMPP Address of the contact that will receive the message"
 msgstr "JID del contatto che riceverà il messaggio"
 
 #: gajim/gajim_remote.py:121 gajim/gajim_remote.py:132
@@ -2528,8 +2524,10 @@ msgid "if specified, the message will be sent using this account"
 msgstr "se specificato, il messaggio verrà inviato usando questo account"
 
 #: gajim/gajim_remote.py:127
-msgid "Sends a chat message to someone on your roster. Account is optional."
-msgstr ""
+#, fuzzy
+msgid ""
+"Sends a chat message to someone on your contact list. Account is optional."
+msgstr "Invia un messaggio al contatto per attirare la sua attenzione"
 
 #: gajim/gajim_remote.py:131
 msgid "subject"
@@ -2540,11 +2538,13 @@ msgid "message subject"
 msgstr "oggetto del messaggio "
 
 #: gajim/gajim_remote.py:138
-msgid "Sends new message to a groupchat you've joined."
+#, fuzzy
+msgid "Sends new message to a group chat you've joined."
 msgstr "Invia nuovi messaggi alla conversazione di gruppo in cui sei entrato."
 
 #: gajim/gajim_remote.py:140
-msgid "JID of the room that will receive the message"
+#, fuzzy
+msgid "XMPP Address of the group chat that will receive the message"
 msgstr "JID della stanza che riceverà il messaggio"
 
 #: gajim/gajim_remote.py:147
@@ -2553,7 +2553,8 @@ msgstr "Ottiene informazioni dettagliate su un contatto"
 
 #: gajim/gajim_remote.py:149 gajim/gajim_remote.py:162
 #: gajim/gajim_remote.py:192
-msgid "JID of the contact"
+#, fuzzy
+msgid "XMPP Address of the contact"
 msgstr "JID del contatto"
 
 #: gajim/gajim_remote.py:153
@@ -2615,7 +2616,8 @@ msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Scrive lo stato corrente delle preferenze di Gajim nel file .config"
 
 #: gajim/gajim_remote.py:190
-msgid "Removes contact from roster"
+#, fuzzy
+msgid "Removes contact from contact list"
 msgstr "Rimuove il contatto dal tuo elenco"
 
 #: gajim/gajim_remote.py:193
@@ -2666,9 +2668,9 @@ msgid "Missing argument \"contact_jid\""
 msgstr "Parametro mancante \"contact_jid\""
 
 #: gajim/gajim_remote.py:275
-#, python-format
+#, fuzzy, python-format
 msgid ""
-"'%s' is not in your roster.\n"
+"'%s' is not in your contact list.\n"
 "Please specify account for sending the message."
 msgstr ""
 "'%s' non appartiene alla lista contatti.\n"
@@ -2895,12 +2897,12 @@ msgstr "Fine della settimana"
 msgid "Weekend!"
 msgstr "Fine-settimana!"
 
-#: gajim/common/logger.py:192 gajim/common/logger.py:197
+#: gajim/common/logger.py:189 gajim/common/logger.py:194
 #, 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:217
+#: gajim/common/logger.py:214
 #, python-format
 msgid "Creating %s"
 msgstr "Creazione di %s in corso"
@@ -2973,22 +2975,23 @@ msgstr "%(nickname)s si è disconnesso"
 msgid "Contact Signed Out"
 msgstr "Contatto disconnesso"
 
-#: gajim/common/contacts.py:455
-msgid "Not in roster"
-msgstr "Non nell'elenco dei tuoi contatti"
-
 #: gajim/common/config.py:80
+#, fuzzy
 msgid ""
 "Show desktop notification even when a chat window is opened for this contact "
-"and does not have focus"
+"and does not have focus."
 msgstr ""
+"Consentire notifiche/popup quando _assente/non disponibile/occupato/"
+"invisibile."
 
 #: gajim/common/config.py:81
-msgid "Play sound when user is busy"
+#, fuzzy
+msgid "Play sound even when being busy."
 msgstr "Riproduci suoni quando l'utente è occupato"
 
 #: gajim/common/config.py:83
-msgid "Show only online and free for chat contacts in roster."
+#, fuzzy
+msgid "Show only online and free for chat contacts in the contact list."
 msgstr ""
 "Mostra solo contatti in linea e liberi per chat nell'elenco dei tuoi "
 "contatti."
@@ -2998,11 +3001,15 @@ msgid "Time in minutes, after which your status changes to away."
 msgstr "Tempo in minuti dopo il quale lo stato diventa 'assente'."
 
 #: gajim/common/config.py:87
-msgid "$S (Away as a result of being idle more than $T min)"
+#, fuzzy
+msgid "$S (Away: Idle more than $T min)"
 msgstr "$S (Assente per inattività dopo più di $T minuti)"
 
 #: gajim/common/config.py:87
-msgid "$S will be replaced by current status message, $T by autoawaytime."
+#, fuzzy
+msgid ""
+"$S will be replaced by current status message, $T by the 'autoawaytime' "
+"value."
 msgstr ""
 "$S sarà sostituito dal messaggio di stato attuale, $T dal tempo di assenza "
 "automatica."
@@ -3012,78 +3019,92 @@ msgid "Time in minutes, after which your status changes to not available."
 msgstr "Tempo in minuti dopo il quale lo stato diventa non disponibile."
 
 #: gajim/common/config.py:90
-msgid "$S (Not available as a result of being idle more than $T min)"
+#, fuzzy
+msgid "$S (Not available: Idle more than $T min)"
 msgstr "$S (Non disponibile per inattività dopo più di $T minuti)"
 
 #: gajim/common/config.py:90
-msgid "$S will be replaced by current status message, $T by autoxatime."
+#, fuzzy
+msgid ""
+"$S will be replaced by current status message, $T by the 'autoxatime' value."
 msgstr ""
 "$S sarà sostituito dal messaggio di stato attuale, $T dal tempo di auto xa "
 "automatico."
 
 #: gajim/common/config.py:93
+#, fuzzy
 msgid ""
-"When to show notification area icon. Can be 'never', 'on_event', 'always'."
+"When to show the notification area icon. Can be 'never', 'on_event', and "
+"'always'."
 msgstr ""
 "Quando mostrare l'icona nell'area di notifica. Può essere 'never', "
 "'on_event', 'always'."
 
 #: gajim/common/config.py:94
-msgid "Allow to hide the roster window even if the tray icon is not shown."
+#, fuzzy
+msgid ""
+"Allow to hide the contact list window even if the notification area icon is "
+"not shown."
 msgstr ""
 "Permetti di nascondere la finestra dei tuoi contatti anche se l'icona "
 "nell'area di notifica non è mostrata."
 
 #: gajim/common/config.py:97
-msgid "Contact signed in notification color."
-msgstr "Colore della notifica di contatto che effettua l'accesso."
+#, fuzzy
+msgid "Notification color for contacts signing in."
+msgstr "Mostra una notifica per i contatti che si _connettono"
 
 #: gajim/common/config.py:98
-msgid "Contact signout notification color"
-msgstr "Colore della notifica di un contatto che si disconnette."
+#, fuzzy
+msgid "Notification color for contacts signing out."
+msgstr "Mostra una notifica per i contatti che si _disconnettono"
 
 #: gajim/common/config.py:99
 #, fuzzy
-msgid "New message notification color."
+msgid "Notification color for new message notification."
 msgstr "Colore della notifica di un nuovo messaggio/email."
 
 #: gajim/common/config.py:100
-msgid "File transfer request notification color."
-msgstr "Colore della notifica di un trasferimento file."
+#, fuzzy
+msgid "Notification color for file transfer request."
+msgstr "_Notifica quando un trasferimento file viene completato"
 
 #: gajim/common/config.py:101
-msgid "File transfer error notification color."
-msgstr "Colore della notifica di un errore nel trasferimento file."
+#, fuzzy
+msgid "Notification color for file transfer errors."
+msgstr "_Notifica quando un trasferimento file viene completato"
 
 #: gajim/common/config.py:102
-msgid "File transfer complete or stopped notification color."
+msgid "Notification color for stopped or completed file transfers."
 msgstr ""
-"Colore della notifica di un trasferimento file completato o interrotto."
 
 #: gajim/common/config.py:103
-msgid "Groupchat invitation notification color"
-msgstr "Colore della notifica di un invito ad una conversazione di gruppo."
+msgid "Notification color for group chat invitations."
+msgstr ""
 
 #: gajim/common/config.py:104
 #, fuzzy
-msgid "Background color of status changed notification"
+msgid "Notification background color for changed status."
 msgstr "Colore di sfondo dei contatti appena connessi."
 
 #: gajim/common/config.py:105
-msgid "Other dialogs color."
-msgstr "Colore delle altre finestre di dialogo."
+msgid "Notification color for other dialogs."
+msgstr ""
 
 #: gajim/common/config.py:106
+#, fuzzy
 msgid ""
-"List (space separated) of rows (accounts and groups) that are collapsed."
+"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:107
 msgid "default"
 msgstr "predefinito"
 
-#: gajim/common/config.py:113
-msgid "Language used by speller"
+#: gajim/common/config.py:113 gajim/common/config.py:424
+#: gajim/common/config.py:431
+#, fuzzy
+msgid "Language used for spell checking."
 msgstr "Lingua usata dal controllo ortografico"
 
 #: gajim/common/config.py:114
@@ -3097,10 +3118,11 @@ msgstr ""
 "'mai' - non scrive mai l'ora."
 
 #: gajim/common/config.py:115
+#, fuzzy
 msgid ""
 "Print time in chats using Fuzzy Clock. Value of fuzziness from 1 to 4, or 0 "
-"to disable fuzzyclock. 1 is the most precise clock, 4 the least precise one. "
-"This is used only if print_time is 'sometimes'."
+"to disable Fuzzy Clock. 1 is the most precise clock, 4 the least precise "
+"one. This is used only if 'print_time' is 'sometimes'."
 msgstr ""
 "Scrive l'ora nelle conversazioni usando l'orologio vago. Valore di vaghezza "
 "da 1 a 4, o 0 per disabilitarlo. 1 è l'orologio più preciso, 4 è il meno "
@@ -3117,16 +3139,18 @@ msgstr "Tratta le coppie di * / _ come possibili caratteri di formattazione."
 #: gajim/common/config.py:120
 #, fuzzy
 msgid ""
-"If true, do not remove */_ . So *abc* will be bold but with * * not removed."
+"If enabled, do not remove */_ . So *abc* will be bold but with * * not "
+"removed."
 msgstr ""
 "Se Vero, non verranno rimossi */_ . Perciò *abc* verrà mostrato in grassetto "
 "ma senza rimuovere * *."
 
 #: gajim/common/config.py:123
+#, fuzzy
 msgid ""
-"Uses ReStructured text markup to send HTML, plus ascii formatting if "
-"selected. For syntax, see http://docutils.sourceforge.net/docs/ref/rst/"
-"restructuredtext.html (If you want to use this, install docutils)"
+"Uses ReStructured text markup to send HTML, plus ASCII formatting if "
+"selected. Needs docutils installed (for syntax, see http://docutils."
+"sourceforge.net/docs/ref/rst/restructuredtext.html)."
 msgstr ""
 "Usa il testo annotato ReStructured per inviare HTML, più la formattazione "
 "ascii se selezionata. Per la sintassi, vedere http://docutils.sourceforge."
@@ -3134,17 +3158,19 @@ msgstr ""
 "installare docutils)"
 
 #: gajim/common/config.py:132
+#, fuzzy
 msgid ""
-"Character to add after nickname when using nick completion (tab) in group "
-"chat."
+"Character to add after nickname when using nickname completion (tab) in "
+"group chat."
 msgstr ""
 "Carattere da aggiungere dopo il soprannome quando si usa il completamento "
 "automatico dei soprannomi (tab) nella conversazione di gruppo."
 
 #: gajim/common/config.py:133
+#, fuzzy
 msgid ""
-"Character to propose to add after desired nickname when desired nickname is "
-"used by someone else in group chat."
+"Character to propose to add after desired nickname when nickname is already "
+"used in group chat."
 msgstr ""
 "Carattere da proporre di aggiungere dopo il soprannome desiderato quando il "
 "soprannome desiderato è già usato da qualcun'altro nella conversazione di "
@@ -3153,22 +3179,23 @@ msgstr ""
 #: gajim/common/config.py:155
 #, fuzzy
 msgid ""
-"If true, Gajim will save roster position when hiding roster, and restore it "
-"when showing roster."
+"If enabled, Gajim will save the contact list window position when hiding it, "
+"and restore it when showing the contact list window again."
 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:161
-msgid "Place the roster on the right in single window mode"
+msgid "Place the contact list on the right in single window mode"
 msgstr ""
 
 #: gajim/common/config.py:167
 #, fuzzy
 msgid ""
-"This option let you customize timestamp that is printed in conversation. For "
-"example \"[%H:%M] \" will show \"[hour:minute] \". See python doc on "
-"strftime for full documentation: http://docs.python.org/lib/module-time.html"
+"This option lets you customize the timestamp that is printed in "
+"conversation. For example '[%H:%M] ' will show '[hour:minute] '. See python "
+"doc on strftime for full documentation (https://docs.python.org/3/library/"
+"time.html)."
 msgstr ""
 "Questa opzione permette di personalizzare l'orario stampato nelle "
 "conversazioni. Per esempio, \"[%H:%M] \" mostrerà \"[ora:minuto] \". Vedere "
@@ -3176,273 +3203,277 @@ msgstr ""
 "completa: http://docs.python.org/lib/module-time.html"
 
 #: gajim/common/config.py:168
-msgid "Characters that are printed before the nickname in conversations"
+#, fuzzy
+msgid "Characters that are printed before the nickname in conversations."
 msgstr "Caratteri scritti prima del soprannome nelle conversazioni"
 
 #: gajim/common/config.py:169
-msgid "Characters that are printed after the nickname in conversations"
+#, fuzzy
+msgid "Characters that are printed after the nickname in conversations."
 msgstr "Caratteri scritti dopo il soprannome nelle conversazioni"
 
 #: gajim/common/config.py:170
-msgid "Add * and [n] in roster title?"
-msgstr "Aggiungere * e [n] al titolo dell'elenco dei tuoi contatti?"
+#, 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:171
 #, fuzzy
 msgid ""
-"How many history messages should be restored when a chat tab/window is "
-"reopened?"
+"Number of messages from chat history to be restored when a chat tab/window "
+"is reopened."
 msgstr ""
 "Quante linee dalla precedente conversazione ricordare quando una scheda/"
 "finestra di conversazione viene riaperta?"
 
 #: gajim/common/config.py:172
-msgid "How far back in time (minutes) history is restored. -1 means no limit."
-msgstr ""
-
-#: gajim/common/config.py:173
 msgid ""
-"How many lines to request from server when entering a groupchat. -1 means no "
-"limit"
+"How far back in time (minutes) chat history is restored. -1 means no limit."
 msgstr ""
-"Quante linee richiedere al server entrando in una conversazione di gruppo. "
-"-1 indica nessun limite"
 
-#: gajim/common/config.py:174
+#: gajim/common/config.py:173
 #, fuzzy
 msgid ""
-"Minutes of backlog to request when entering a groupchat. -1 means no limit"
-msgstr ""
-"Di quanti minuti indietro richiedere i log entrando in una conversazione di "
-"gruppo. -1 indica nessun limite"
-
-#: gajim/common/config.py:175
-msgid ""
-"How many seconds to wait before trying to autorejoin to a conference you are "
-"being disconnected from. Set to 0 to disable autorejoining."
+"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 ""
 "Quanti secondi di attesa prima di provare a rientrare automaticamente in una "
 "conversazione dalla quale sei stato disconnesso. Impostare a 0 per "
 "disabilitare il rientro automatico."
 
-#: gajim/common/config.py:176
+#: gajim/common/config.py:174
 #, fuzzy
-msgid "Should autorejoin be activated when kicked from a conference?"
+msgid ""
+"Should automatic rejoin be activated when you were kicked from a group chat?"
 msgstr ""
 "Abilitare il rientro automatico quando si viene espulsi da una conversazione?"
 
-#: gajim/common/config.py:177
-msgid ""
-"Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
-"Client default behaviour)."
+#: gajim/common/config.py:175
+#, 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:179
-msgid "How many lines to store for Ctrl+KeyUP."
+#: gajim/common/config.py:177
+#, fuzzy
+msgid "How many lines to store for Ctrl+KeyUP (previously sent messages)."
 msgstr "Quante linee memorizzare per Ctrl+FrecciaSù."
 
-#: gajim/common/config.py:182
+#: gajim/common/config.py:180
 #, fuzzy, python-format
 msgid ""
-"Either custom URL with %%s in it where %%s is the word/phrase or "
-"'WIKTIONARY' which means use Wikitionary."
+"Either a custom URL with %%s in it (where %%s is the word/phrase) or "
+"'WIKTIONARY' (which means use Wikitionary)."
 msgstr ""
 "URL personalizzato contenente %s dove %s è la parola/frase o 'WIKTIONARY', "
 "che significa usare wiktionary."
 
-#: gajim/common/config.py:185
+#: gajim/common/config.py:183
 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:187
+#: gajim/common/config.py:185
+#, fuzzy
 msgid ""
-"When not printing time for every message (print_time==sometimes), print it "
+"When not printing time for every message ('print_time'==sometimes), print it "
 "every x minutes."
 msgstr ""
 "Quando non scrivi la data ad ogni messaggio (print_time==sometimes), "
 "scriverla ogni x minuti."
 
-#: gajim/common/config.py:188
+#: gajim/common/config.py:186
 msgid "Ask before pasting an image."
 msgstr ""
 
-#: gajim/common/config.py:189
+#: gajim/common/config.py:187
 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:190
+#: gajim/common/config.py:188
 #, fuzzy
 msgid ""
-"Always ask for confirmation before closing groupchats with any of the JIDs "
-"on this space separated list."
+"Always ask for confirmation before closing group chats with any of the XMPP "
+"Addresses on this list (space separated)."
 msgstr ""
 "Chiedere sempre prima di chiudere una finestra/scheda di conversazione di "
 "gruppo presente in questa lista separata da spazi di JID di stanze."
 
-#: gajim/common/config.py:191
+#: gajim/common/config.py:189
 #, fuzzy
 msgid ""
-"Never ask for confirmation before closing groupchats with any of the JIDs on "
-"this space separated list."
+"Never ask for confirmation before closing group chats with any of the XMPP "
+"Addresses on this list (space separated)."
 msgstr ""
 "Non chiedere mai prima di chiudere una scheda/finestra di conversazione "
 "presente in questo elenco separata da spazi di JID di stanze."
 
-#: gajim/common/config.py:192
+#: gajim/common/config.py:190
+#, fuzzy
 msgid ""
-"Ask before closing tabbed chat window if there are controls that can lose "
-"data (chat, private chat, groupchat that will not be minimized)"
+"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 ""
 "Chiedere prima di chiudere finestre di conversazione con schede se c'è il "
 "rischio di perdere dati (conversazioni, conversazioni private, conversazioni "
 "di gruppo che non saranno minimizzate)"
 
-#: gajim/common/config.py:195
+#: gajim/common/config.py:193
 #, fuzzy
 msgid ""
-"Comma separated list of sent hosts, in addition of local interfaces, for "
-"File Transfer in case of address translation/port forwarding."
+"List of send hosts (comma separated) in addition to local interfaces for "
+"file transfers (in case of address translation/port forwarding)."
 msgstr ""
 "Lista di host separati da una virgola che saranno inviati, insieme alle "
 "interfacce locali, per il trasferimento file in caso di traslazione "
 "dell'indirizzo/inoltro porte."
 
-#: gajim/common/config.py:196
+#: gajim/common/config.py:194
 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:198
+#: gajim/common/config.py:196
 msgid "Notify of events in the notification area."
 msgstr "Notifica gli eventi nell'area di notifica."
 
-#: gajim/common/config.py:199
+#: gajim/common/config.py:197
+#, fuzzy
 msgid ""
-"If False, Gajim will display a static event icon instead of the blinking "
-"status icon in the notification area when notifying on event."
+"If disabled, Gajim will display a static event icon instead of the blinking "
+"status icon in the notification area when notifying about an event."
 msgstr ""
 "Se Falso, Gajim mostrerà un'icona di eventi statica invece dell'icona di "
 "stato lampeggiante nell'area di notifica quando viene notificato un evento."
 
-#: gajim/common/config.py:205
+#: gajim/common/config.py:203
 msgid "Show tab when only one conversation?"
 msgstr "Mostrare la scheda quando c'è una sola conversazione?"
 
-#: gajim/common/config.py:206
+#: gajim/common/config.py:204
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "Mostrare il bordo per le schede quando c'è una sola conversazione?"
 
-#: gajim/common/config.py:207
+#: gajim/common/config.py:205
 msgid "Show close button in tab?"
 msgstr "Mostrare il pulsante \"chiudi\" nelle schede?"
 
-#: gajim/common/config.py:220
+#: gajim/common/config.py:218
 msgid "Preview new messages in notification popup?"
 msgstr "Includere l'anteprima dei nuovi messaggi nelle notifiche popup?"
 
-#: gajim/common/config.py:223
+#: gajim/common/config.py:221
+#, fuzzy
 msgid ""
-"A semicolon-separated list of words that will be highlighted in group chats."
+"A list of words (semicolon separated) that will be highlighted in group "
+"chats."
 msgstr ""
 "Una lista separata da caratteri ';' di parole che verranno evidenziate nelle "
 "conversazioni multi-utente."
 
-#: gajim/common/config.py:224
+#: gajim/common/config.py:222
 #, fuzzy
 msgid ""
-"If true, quits Gajim when X button of Window Manager is clicked. This "
-"setting is taken into account only if notification icon is used."
+"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 ""
 "Se Vero, esce da Gajim quando il pulsante X del Window Manager viene "
 "cliccato. Questa impostazione è presa in considerazione solo se viene usata "
 "l'icona nello spazio di notifica."
 
-#: gajim/common/config.py:225
+#: gajim/common/config.py:223
 msgid ""
-"If true, Gajim hides the Roster window on pressing the X button instead of "
-"minimizing into the Dock."
+"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:226
+#: gajim/common/config.py:224
 #, fuzzy
 msgid ""
-"If true, Gajim will display an icon on each tab containing unread messages. "
-"Depending on the theme, this icon may be animated."
+"If enabled, Gajim will display an icon on each tab containing unread "
+"messages. Depending on the theme, this icon may be animated."
 msgstr ""
 "Se Vero, Gajim mostrerà un icona su ogni scheda contenente messaggi non "
 "letti. A seconda del tema, questa icona può essere animata."
 
-#: gajim/common/config.py:227
+#: gajim/common/config.py:225
 #, fuzzy
 msgid ""
-"If true, Gajim will display the status message, if not empty, for every "
-"contact under the contact name in roster window."
+"If enabled, Gajim will display the status message (if not empty) underneath "
+"the contact name in the contact list window."
 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:233
-msgid "Define the position of the avatar in roster. Can be left or right"
+#: gajim/common/config.py:231
+#, fuzzy
+msgid ""
+"Define the position of avatars in the contact list. Can be 'left' or 'right'."
 msgstr ""
 "Definisce la posizione dell'avatar nell'elenco dei tuoi contatti. Può essere "
 "sinistra o destra"
 
-#: gajim/common/config.py:234
+#: gajim/common/config.py:232
 #, fuzzy
 msgid ""
-"If False, Gajim will no longer print status line in chats when a contact "
-"changes their status and/or their status message."
+"If disabled, Gajim will no longer print status messages in chats when a "
+"contact changes their status (and/or their status message)."
 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:235
+#: gajim/common/config.py:233
 #, fuzzy
 msgid ""
 "Default Setting: Show a status message for every join or leave in a group "
-"chat"
+"chat."
 msgstr "Non è possibile entrare nella stanza"
 
-#: gajim/common/config.py:236
+#: gajim/common/config.py:234
+#, fuzzy
 msgid ""
-"Default Setting: Show a status message for all status (away, dnd, etc.) "
-"changes of users in a group chat"
-msgstr ""
+"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:238
-msgid "Log XHTML messages instead of plain text messages."
+#: gajim/common/config.py:236
+#, fuzzy
+msgid "Store XHTML messages in chat history instead of plain text messages."
 msgstr "Registra messaggi XHTML invece di messaggi in testo semplice."
 
-#: gajim/common/config.py:239
+#: gajim/common/config.py:237
 msgid "Don't show avatar for the transport itself."
 msgstr "Non mostrare l'avatar per il trasporto stesso."
 
-#: gajim/common/config.py:240
-msgid "Don't show roster in the system taskbar."
+#: gajim/common/config.py:238
+#, 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:241
+#: gajim/common/config.py:239
 #, fuzzy
 msgid ""
-"If true, make the window flash (the default behaviour in most Window "
-"Managers) when holding pending events."
+"If enabled, Gajim makes the window flash (the default behaviour in most "
+"Window Managers) when holding pending events."
 msgstr ""
 "Se Vero e le versioni installate di GTK+ e PyGTK sono 2.8 o superiori, la "
 "finestra lampeggia (comportamento predefinito per la maggior parte dei "
 "gestori di finestre) quando contiene nuovi eventi."
 
-#: gajim/common/config.py:245
+#: gajim/common/config.py:243
+#, fuzzy
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
 "'always_with_roster' - Like 'always' but the messages are in a single window "
-"along with the roster.\n"
+"along with the contact list.\n"
 "'never' - All messages get their own window.\n"
 "'peracct' - Messages for each account are sent to a specific window.\n"
-"'pertype' - Each message type (e.g. chats vs. groupchats) is sent to a "
+"'pertype' - Each message type (e.g. chats vs. group chats) is sent to a "
 "specific window."
 msgstr ""
 "Controlla la finestra dove vengono posizionati i nuovi messaggi.\n"
@@ -3455,130 +3486,140 @@ msgstr ""
 "'pertype' - Ogni tipo di messaggi (es., conversazioni e conversazioni di "
 "gruppo) viene inviato ad una specifica finestra."
 
-#: gajim/common/config.py:246
+#: gajim/common/config.py:244
+#, fuzzy
 msgid ""
-"Show roster on startup.\n"
-"'always' - Always show roster.\n"
-"'never' - Never show roster.\n"
-"'last_state' - Restore the last state roster."
+"Show contact list window on startup.\n"
+"'always' - Always show contact list window.\n"
+"'never' - Never show contact list window.\n"
+"'last_state' - Restore last state of the contact list window."
 msgstr ""
 "Mostra l'elenco dei tuoi contatti all'avvio di Gajim.\n"
 "'sempre' - Mostra sempre l'elenco dei tuoi contatti.\n"
 "'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:247
-msgid "If False, you will no longer see the avatar in the chat window."
+#: gajim/common/config.py:245
+#, 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:248
+#: gajim/common/config.py:246
 #, fuzzy
-msgid "If true, pressing the escape key closes a tab/window."
+msgid "If enabled, pressing Esc closes a tab/window."
 msgstr "Se Vero, premere il tasto Esc chiude una scheda/finestra."
 
-#: gajim/common/config.py:249
-msgid "Hides the banner in a group chat window"
+#: gajim/common/config.py:247
+#, 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:250
-msgid "Hides the banner in two persons chat window"
-msgstr "Nasconde il banner nella finestra di conversazione a due persone"
+#: gajim/common/config.py:248
+#, fuzzy
+msgid "Hides the banner in a 1:1 chat window."
+msgstr "Nasconde il banner in una finestra di conversazione di gruppo"
 
-#: gajim/common/config.py:251
-msgid "Hides the group chat occupants list in group chat window."
+#: gajim/common/config.py:249
+#, 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:252
+#: gajim/common/config.py:250
+#, fuzzy
 msgid ""
 "In a chat, show the nickname at the beginning of a line only when it's not "
-"the same person talking than in previous message."
+"the same person talking as in the previous message."
 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:253
+#: gajim/common/config.py:251
 msgid "Indentation when using merge consecutive nickname."
 msgstr "Indentazione quando si raggruppano soprannomi consecutivi."
 
-#: gajim/common/config.py:254
-msgid "Ctrl-Tab go to next composing tab when none is unread."
+#: gajim/common/config.py:252
+#, fuzzy
+msgid ""
+"Ctrl+Tab switches to the next composing tab when there are no tabs with "
+"messages pending."
 msgstr ""
 "Ctrl-Tab va alla prossima scheda di composizione se nessuna è non letta."
 
-#: gajim/common/config.py:255
+#: gajim/common/config.py:253
 #, fuzzy
 msgid ""
-"Show the confirm metacontacts creation dialog or not? Empty string means "
-"never show the dialog."
+"Show a confirmation dialog to create metacontacts? Empty string means never "
+"show the dialog."
 msgstr ""
-"Mostrare la richiesta di conferma creazione metacontatti o meno? Una stringa "
-"vuota significa che non verrà mai mostrata."
+"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:256
+#: gajim/common/config.py:254
 #, fuzzy
 msgid ""
-"Show the confirm block contact dialog or not? Empty string means never show "
+"Show a confirmation dialog to block a contact? Empty string means never show "
 "the dialog."
 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:257
+#: gajim/common/config.py:255
 #, fuzzy
 msgid ""
-"Show the confirm custom status dialog or not? Empty string means never show "
-"the dialog."
+"Show a confirmation dialog for a custom status? Empty string means never "
+"show the dialog."
 msgstr ""
 "Mostrare la richiesta di conferma per lo stato personalizzato o meno? Una "
 "stringa vuota significa che non verrà mai mostrata."
 
-#: gajim/common/config.py:258
+#: gajim/common/config.py:256
 #, fuzzy
 msgid ""
-"If true, you will be able to set a negative priority to your account in "
-"account modification window. BE CAREFUL, when you are logged in with a "
-"negative priority, you will NOT receive any message from your server."
+"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 ""
 "Se Vero, si può impostare una priorità negativa all'account nella finestra "
 "di modifica account. ATTENZIONE, quando si è collegati con priorità "
 "negativa, NON si riceveranno messaggi dal server."
 
-#: gajim/common/config.py:259
+#: gajim/common/config.py:257
 #, fuzzy
 msgid ""
-"If true, Gajim will show number of online and total contacts in account and "
-"group rows."
+"If enabled, Gajim will show both the number of online and total contacts in "
+"account rows as well as in group rows."
 msgstr ""
 "Se Vero, Gajim mostrerà il numero di account in linea e totali nelle linee "
 "degli account e dei gruppi."
 
-#: gajim/common/config.py:260
+#: gajim/common/config.py:258
+#, fuzzy
 msgid ""
-"Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
-"as if they were of this type"
+"Can be empty, 'chat' or 'normal'. If not empty, all incoming messages are "
+"treated as if they were of this type."
 msgstr ""
 "Può essere vuoto, 'chat' o 'normal'. Se non vuoto, tratta tutti i messaggi "
 "in arrivo come se fossero di questo tipo"
 
-#: gajim/common/config.py:261
+#: gajim/common/config.py:259
 #, fuzzy
 msgid ""
-"If true, Gajim will scroll and select the contact who sent you the last "
-"message, if chat window is not already opened."
+"If enabled, Gajim will scroll and select the contact who sent you the last "
+"message, if the chat window is not already opened."
 msgstr ""
 "Se Vero, Gajim scorrerà e selezionerà il contatto che ti ha mandato l'ultimo "
 "messaggio, se la finestra di conversazione non è già aperta."
 
-#: gajim/common/config.py:262
+#: gajim/common/config.py:260
 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:263
+#: gajim/common/config.py:261
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
@@ -3586,88 +3627,92 @@ msgstr ""
 "Massimo numero di linee che sono visualizzate nelle conversazioni. Le linee "
 "più vecchie verranno cancellate."
 
-#: gajim/common/config.py:264
+#: gajim/common/config.py:262
 #, fuzzy
 msgid ""
-"If true, notification windows from notification-daemon will be attached to "
-"notification icon."
+"If enabled, notification windows from notification-daemon will be attached "
+"to the notification area icon."
 msgstr ""
 "Se Vero, le finestre di notifica del demone-notifiche saranno attaccate "
 "all'icona di notifica."
 
-#: gajim/common/config.py:265
+#: gajim/common/config.py:263
 msgid "Choose interval between 2 checks of idleness."
 msgstr "Selezione l'intervallo tra 2 controlli di inattività."
 
-#: gajim/common/config.py:266
+#: gajim/common/config.py:264
+#, fuzzy
 msgid ""
-"Valid uri schemes. Only schemes in this list will be accepted as \"real\" "
-"uri. (mailto and xmpp are handled separately)"
+"Valid URI schemes. Only schemes in this list will be accepted as 'real' URI "
+"(mailto and xmpp are handled separately)."
 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:267
+#: gajim/common/config.py:265
 #, fuzzy
-msgid "If true, completion in groupchats will be like a shell auto-completion"
+msgid ""
+"If enabled, completion in group chats will be like a shell auto-completion."
 msgstr ""
 "Se Vero, il completamento nelle conversazioni di gruppo funzionerà come un "
 "auto-completamento di shell."
 
-#: gajim/common/config.py:272
-msgid "Optionally fix jingle output video framerate. Example: 10/1 or 25/2"
+#: gajim/common/config.py:270
+#, 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:273
-msgid "Optionally resize jingle output video. Example: 320x240"
+#: gajim/common/config.py:271
+#, fuzzy
+msgid "Optionally resize Jingle output video. Example: 320x240."
 msgstr ""
 "Opzionalmente ridimensionare l'output video di jingle. Esempio: 320x240"
 
-#: gajim/common/config.py:274
-#, fuzzy
-msgid "If true, You will also see your webcam"
-msgstr "Se Vero, anche la tua webcam sarà visibile"
+#: gajim/common/config.py:272
+msgid "If enabled, you will see your webcam's video stream as well."
+msgstr ""
 
-#: gajim/common/config.py:277
+#: gajim/common/config.py:275
 #, fuzzy
 msgid ""
-"If true, Gajim will try to use a STUN server when using Jingle. The one in "
-"\"stun_server\" option, or the one given by the XMPP server."
+"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 ""
 "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:278
+#: gajim/common/config.py:276
 #, fuzzy
 msgid "STUN server to use when using Jingle"
 msgstr "Server STUN da usare quando si usa jingle"
 
-#: gajim/common/config.py:279
+#: gajim/common/config.py:277
 #, fuzzy
 msgid ""
-"If true, Gajim will show affiliation of groupchat occupants by adding a "
-"colored square to the status icon"
+"If enabled, Gajim will show affiliation of group chat participants by adding "
+"a colored square to the status icon."
 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:280
+#: gajim/common/config.py:278
+#, fuzzy
 msgid ""
 "Proxy used for all outgoing connections if the account does not have a "
-"specific proxy configured"
+"specific proxy configured."
 msgstr ""
 "Proxy usato per tutte le connessioni in uscita se l'account non ha uno "
 "specifico proxy configurato"
 
-#: gajim/common/config.py:281
+#: gajim/common/config.py:279
 #, fuzzy
-msgid "If true, Gajim will ignore incoming attention requests (\"wizz\")."
+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:282
+#: gajim/common/config.py:280
 msgid ""
 "If enabled, Gajim will reopen chat windows that were opened last time Gajim "
 "was closed."
@@ -3675,70 +3720,82 @@ msgstr ""
 "Se abilitato, Gajim riaprirà le finestre di conversazione che erano aperte "
 "quando è stato chiuso l'ultima volta."
 
-#: gajim/common/config.py:283
+#: gajim/common/config.py:281
+#, fuzzy
 msgid ""
-"If enabled, Gajim will show an icon to show that sent message has been "
-"received by your contact"
+"If enabled, Gajim will display an icon to show that sent messages have been "
+"received by your contact."
 msgstr ""
 "Se abilitato, Gajim mostrerà un'icona per indicare che il messaggio inviato "
 "è stato ricevuto dal contatto"
 
-#: gajim/common/config.py:284
-msgid "Show a mini avatar in chat window tabs and in window icon"
+#: gajim/common/config.py:282
+msgid "Show a mini avatar in chat window tabs and as the window's icon."
 msgstr ""
 
-#: gajim/common/config.py:285
+#: gajim/common/config.py:283
 #, fuzzy
-msgid "If true, Gajim will use the Systems Keyring to store account passwords."
+msgid ""
+"If enabled, Gajim will use the System's Keyring to store account passwords."
 msgstr ""
 "Se Vero, Gajim userà Gnome-Keyring (se disponibile) per memorizzare le "
 "password degli account."
 
+#: gajim/common/config.py:284
+msgid "If enabled, Gajim will execute XEP-0146 Commands."
+msgstr ""
+
+#: gajim/common/config.py:285
+msgid "2: System, 1: Enabled, 0: Disabled"
+msgstr ""
+
 #: gajim/common/config.py:286
-msgid "If true, Gajim will execute XEP-0146 Commands."
+msgid "Options in days which can be chosen in the sync threshold menu"
 msgstr ""
 
 #: gajim/common/config.py:287
-msgid "2: System, 1: Enabled, 0: Disabled"
+msgid ""
+"Maximum history in days we request from a public group chat archive. 0: As "
+"much as possible."
 msgstr ""
 
 #: gajim/common/config.py:288
-msgid "Options in days which can be chosen in the sync threshold menu"
+msgid ""
+"Maximum history in days we request from a private group chat archive. 0: As "
+"much as possible."
 msgstr ""
 
 #: gajim/common/config.py:289
 msgid ""
-"Maximum history in days we request from a public room archive. 0: As much as "
-"possible"
+"If enabled, Gajim shows the group chat subject in the chat window when "
+"joining."
 msgstr ""
 
 #: gajim/common/config.py:290
+#, fuzzy
 msgid ""
-"Maximum history in days we request from a private room archive. 0: As much "
-"as possible"
+"If enabled, the contact row is colored according to the current chat state "
+"of the contact."
 msgstr ""
+"Se marcato, Gajim permetterà agli altri di conoscere l'ora del tuo sistema"
 
 #: gajim/common/config.py:291
-msgid "If the room subject is shown in chat on join"
+#, fuzzy
+msgid ""
+"If enabled, the tab is colored according to the current chat state of the "
+"contact."
 msgstr ""
+"Se marcato, Gajim permetterà agli altri di conoscere l'ora del tuo sistema"
 
 #: gajim/common/config.py:292
+#, fuzzy
 msgid ""
-"If the contact row is colored according to the current chatstate of the "
-"contact"
+"Shows a text in the banner that describes the current chat state of the "
+"contact."
 msgstr ""
+"Se marcato, Gajim permetterà agli altri di conoscere l'ora del tuo sistema"
 
 #: gajim/common/config.py:293
-msgid "If the tab is colored according to the current chatstate of the contact"
-msgstr ""
-
-#: gajim/common/config.py:294
-msgid ""
-"Shows a text in the banner that describes the current chatstate of the "
-"contact"
-msgstr ""
-
-#: gajim/common/config.py:295 gajim/common/config.py:424
 #, fuzzy
 msgid ""
 "Chat state notifications that are sent to contacts. Possible values: all, "
@@ -3746,342 +3803,371 @@ msgid ""
 msgstr ""
 "Notifiche di stato inviate. Può essere una tra all, composing_only, disabled."
 
-#: gajim/common/config.py:296 gajim/common/config.py:438
+#: gajim/common/config.py:294
 #, fuzzy
 msgid ""
 "Chat state notifications that are sent to the group chat. Possible values: "
-"all, composing_only, disabled"
+"'all', 'composing_only', 'disabled'"
 msgstr ""
 "Notifiche di stato inviate. Può essere una tra all, composing_only, disabled."
 
-#: gajim/common/config.py:312
+#: gajim/common/config.py:297
+msgid "API Preferences. Possible values: 'http', 'iq'"
+msgstr ""
+
+#: gajim/common/config.py:313
+#, fuzzy
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
-"defined in autopriority_* options."
+"defined in 'autopriority_*' options."
 msgstr ""
 "La priorità cambierà automaticamente rispetto al tuo stato. Le priorità sono "
 "definite nelle opzioni autopriority_*."
 
-#: gajim/common/config.py:320
+#: gajim/common/config.py:321
+#, fuzzy
 msgid ""
-"Status used to autoconnect as. Can be online, chat, away, xa, dnd, "
-"invisible. NOTE: this option is used only if restore_last_status is disabled"
+"Status to be used automatically when connecting. Can be 'online', 'chat', "
+"'away', 'xa', 'dnd' or 'invisible'. NOTE: This option is used only if "
+"'restore_last_status' is disabled."
 msgstr ""
 "Stato usato per la connessione automatica. Può essere online, chat, away, "
 "xa, dnd, invisible. NOTA: questa opzione è usata solo se restore_last_status "
 "è disabilitata"
 
-#: gajim/common/config.py:321
-msgid "If enabled, restore the last status that was used."
+#: gajim/common/config.py:322
+#, fuzzy
+msgid "If enabled, the last status will be restored."
 msgstr "Se abilitato, ripristina l'ultimo stato usato."
 
-#: gajim/common/config.py:322
+#: gajim/common/config.py:323
 #, fuzzy
 msgid ""
-"If true, Contacts requesting authorization will be automatically accepted."
+"If enabled, Contacts requesting authorization will be accepted automatically."
 msgstr ""
 "Se Vero, i contatti che richiedono l'autorizzazione saranno automaticamente "
 "accettati."
 
-#: gajim/common/config.py:323
+#: gajim/common/config.py:324
+#, fuzzy
 msgid ""
-"If False, this account will be disabled and will not appear in roster window."
+"If disabled, this account will be disabled and will not appear in the "
+"contact list window."
 msgstr ""
 "Se Falso, questo account sarà disabilitato e non apparirà nella finestra "
 "contatti."
 
-#: gajim/common/config.py:327
-msgid "Allow plaintext connections"
+#: gajim/common/config.py:328
+msgid "Allow plaintext connections."
 msgstr ""
 
-#: gajim/common/config.py:330
+#: gajim/common/config.py:331
 msgid ""
-"List (space separated) of authentication mechanisms to try. Can contain "
-"ANONYMOUS, EXTERNAL, GSSAPI, SCRAM-SHA-1-PLUS, SCRAM-SHA-1, DIGEST-MD5, "
-"PLAIN, X-MESSENGER-OAUTH2 or XEP-0078"
+"List of authentication mechanisms to try (space separated). Can contain "
+"'ANONYMOUS', 'EXTERNAL', 'GSSAPI', 'SCRAM-SHA-1-PLUS', 'SCRAM-SHA-1', "
+"'DIGEST-MD5', 'PLAIN', 'X-MESSENGER-OAUTH2' or 'XEP-0078'."
 msgstr ""
 
-#: gajim/common/config.py:331
+#: gajim/common/config.py:332
+#, fuzzy
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection. "
-"Can be 'warn', 'connect', 'disconnect'"
+"Can be 'warn', 'connect' or 'disconnect'."
 msgstr ""
 "Mostrare un avvertimento prima di mandare una password su una connessione in "
 "chiaro. Può essere 'warn', 'connect', 'disconnect'"
 
-#: gajim/common/config.py:332
+#: gajim/common/config.py:333
 msgid "Show a warning dialog before using standard SSL library."
 msgstr "Mostra un avvertimento prima di usare una libreria SSL standard."
 
-#: gajim/common/config.py:333
+#: gajim/common/config.py:334
 msgid ""
 "Show a warning dialog before sending PLAIN password over a plain connection."
 msgstr ""
 "Mostra un avvertimento prima di inviare una password IN CHIARO su una "
 "connessione in chiaro."
 
-#: gajim/common/config.py:334
-msgid "Space separated list of ssl errors to ignore."
-msgstr "Elenco degli errori ssl da ignorare separati da spazi."
+#: gajim/common/config.py:335
+msgid "List of SSL errors to ignore (space separated)."
+msgstr ""
 
-#: gajim/common/config.py:340
+#: gajim/common/config.py:341
+#, fuzzy
 msgid ""
-"Space separated list of JIDs for which you do not want to store logs. You "
-"can also add account name to log nothing for this account."
+"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 ""
 "Elenco dei JID separati da spazi per i quali non vuoi registrare le "
 "conversazioni. Puoi anche aggiungere il nome dell'account per non registrare "
 "nulla per questo account."
 
-#: gajim/common/config.py:341
+#: gajim/common/config.py:342
+#, fuzzy
 msgid ""
-"Space separated list of JIDs for which you accept to not log conversations "
-"if he does not want to."
+"List of XMPP Addresses (space separated) for which you accept to not store "
+"chat history if your contact does not want to."
 msgstr ""
 "Elenco dei JID separati da spazi per i quali accetti di non registrare le "
 "conversazioni se loro non vogliono. "
 
-#: gajim/common/config.py:343
-msgid "Whitespace sent after inactivity"
+#: gajim/common/config.py:344
+#, fuzzy
+msgid "If enabled, a whitespace is sent after inactivity (keep alive)."
 msgstr "Spazio bianco inviato dopo inattività"
 
-#: gajim/common/config.py:344
-msgid "XMPP ping sent after inactivity"
+#: gajim/common/config.py:345
+#, fuzzy
+msgid "If enabled, an XMPP ping is sent after inactivity (ping alive)."
 msgstr "Ping XMPP inviato dopo inattività"
 
-#: gajim/common/config.py:348
+#: gajim/common/config.py:349
 #, fuzzy
 msgid ""
-"How many seconds to wait for the answer of ping alive packet before trying "
-"to reconnect?"
+"How many seconds to wait for the answer of a ping alive packet before trying "
+"to reconnect."
 msgstr ""
 "Quanti secondi attendere per la risposta ad un ping prima di un tentativo di "
 "riconnessione?"
 
-#: gajim/common/config.py:352
-msgid "Jabberd2 workaround"
+#: gajim/common/config.py:353
+#, fuzzy
+msgid "Jabberd2 workaround."
 msgstr "Workaround Jabberd2"
 
-#: gajim/common/config.py:355
+#: gajim/common/config.py:356
+#, fuzzy
 msgid ""
-"If checked, Gajim will use your IP and proxies defined in "
-"file_transfer_proxies option for file transfer."
+"If enabled, Gajim will use your IP and proxies defined in "
+"'file_transfer_proxies' option for file transfers."
 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:356
+#: gajim/common/config.py:357
 #, fuzzy
 msgid ""
-"If true, Gajim will test file transfer proxies on startup to be sure it "
-"works. Openfire's proxies are known to fail this test even if they work."
+"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 ""
 "Se Vero, Gajim testerà i proxy di trasferimento file per assicurarsi che "
 "funzionino. È noto che questo test fallisce con i proxy Openfire anche se "
 "essi funzionano."
 
-#: gajim/common/config.py:369
-msgid "Answer to receipt requests"
-msgstr "Rispondi alle richieste di ricevuta"
-
 #: gajim/common/config.py:370
-msgid "Sent receipt requests"
-msgstr "Richieste di ricevuta inviate"
+#, 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:371
+msgid "If enabled, Gajim will send message receipt requests."
+msgstr ""
 
-#: gajim/common/config.py:379
+#: gajim/common/config.py:380
 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:380
+#: gajim/common/config.py:381
 msgid "Allow Gajim to send your local time."
 msgstr "Consenti a Gajim di inviare la tua ora locale."
 
-#: gajim/common/config.py:383
-msgid "Message that is sent to contacts you want to add"
+#: gajim/common/config.py:384
+#, fuzzy
+msgid "Message that is sent to contacts you want to add."
 msgstr "Messaggio inviato ai contatti che vuoi aggiungere"
 
-#: gajim/common/config.py:384
+#: gajim/common/config.py:385
+#, fuzzy
 msgid ""
-"If enabled, Gajim will send your local IPs so your contact can connect to "
-"your machine to transfer files."
+"If enabled, Gajim will send your local IP so your contact can connect to "
+"your machine for file transfers."
 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:385
+#: gajim/common/config.py:386
 #, fuzzy
 msgid ""
-"Space separated list of JIDs for which chat window will be re-opened on next "
-"startup."
+"List of XMPP Addresses (space separated) for which the chat window will be "
+"re-opened on next startup."
 msgstr ""
 "Lista di JID separati da spazi per i quali si vuole riaprire una finestra di "
 "conversazione al prossimo avvio. "
 
-#: gajim/common/config.py:387
-msgid "HTTP Upload: Enable HTTPS Verification"
-msgstr ""
-
 #: gajim/common/config.py:388
-msgid ""
-"Preferred file transfer mechanism for file drag&drop on chat window. Can be "
-"'httpupload' (default) or 'jingle'"
+msgid "HTTP File Upload: Enable HTTPS Verification."
 msgstr ""
 
 #: gajim/common/config.py:389
-msgid "Allow cert verification with POSH"
+msgid ""
+"Preferred file transfer mechanism for file drag&drop on a chat window. Can "
+"be 'httpupload' (default) or 'jingle'."
 msgstr ""
 
-#: gajim/common/config.py:423 gajim/common/config.py:430
+#: gajim/common/config.py:390
 #, fuzzy
-msgid "Language for which misspelled words will be checked"
-msgstr "Linguaggio per il quale vogliamo controllare le parole sbagliate"
-
-#: gajim/common/config.py:427
-msgid "The currently active encryption for that contact"
-msgstr "La cifratura attualmente attiva per quel contatto"
+msgid "Allow certificate verification with POSH."
+msgstr "Validazione del certificato SSL per %s"
 
-#: gajim/common/config.py:431
+#: gajim/common/config.py:425
+#, fuzzy
 msgid ""
-"How many lines to request from server when entering a groupchat. -1 means no "
-"limit, -2 means global value"
+"Chat state notifications that are sent to contacts. Possible values: 'all', "
+"'composing_only', 'disabled'"
 msgstr ""
-"Quante linee richiedere al server entrando in una conversazione di gruppo. "
-"-1 indica nessun limite, -2 indica il valore globale"
+"Notifiche di stato inviate. Può essere una tra all, composing_only, disabled."
 
-#: gajim/common/config.py:432
+#: gajim/common/config.py:428
 #, fuzzy
+msgid "The currently active encryption for that contact."
+msgstr "La cifratura attualmente attiva per quel contatto"
+
+#: gajim/common/config.py:432
 msgid ""
-"Minutes of backlog to request when entering a groupchat. -1 means no limit, "
-"-2 means global value"
+"If enabled, a notification is created for every message in this group chat."
 msgstr ""
-"Di quanti minuti prima richiedere i log entrando in una conversazione di "
-"gruppo. -1 indica nessun limite, -2 indica il valore globale"
 
 #: gajim/common/config.py:433
-msgid "State whether a notification is created for every message in this room"
-msgstr ""
-
-#: gajim/common/config.py:434
+#, fuzzy
 msgid ""
-"Show a status message for all status (away, dnd, etc.) changes of users in a "
-"group chat"
-msgstr ""
+"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:435
+#: gajim/common/config.py:434
 #, fuzzy
-msgid "Show a status message for every join or leave in a group chat"
+msgid "Show a status message for every join or leave in a group chat."
 msgstr "Non è possibile entrare nella stanza"
 
+#: gajim/common/config.py:435
+msgid ""
+"If enabled, the group chat is minimized into the contact list when joining "
+"automatically."
+msgstr ""
+
 #: gajim/common/config.py:436
-msgid "If the group chat is minimized into the roster on autojoin"
+msgid ""
+"If enabled, the group chat is minimized into the contact list when closing "
+"it."
 msgstr ""
 
 #: gajim/common/config.py:437
-msgid "If the group chat is minimized into the roster on close"
+#, fuzzy
+msgid ""
+"Chat state notifications that are sent to the group chat. Possible values: "
+"'all', 'composing_only' or 'disabled'."
 msgstr ""
+"Notifiche di stato inviate. Può essere una tra all, composing_only, disabled."
 
-#: gajim/common/config.py:441
+#: gajim/common/config.py:440
+#, fuzzy
 msgid ""
-"State whether plugins should be activated on startup (this is saved on Gajim "
-"exit). This option SHOULD NOT be used to (de)activate plug-ins. Use GUI "
-"instead."
+"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 ""
 "Stabilsci se i plugin dovrebbero essere attivati all'avvio (viene salvato "
 "all'uscita da Gajim). Questa opzione NON DOVREBBE essere usata per "
 "(dis)attivare i plugin. Usare invece l'interfaccia grafica."
 
-#: gajim/common/config.py:446 gajim/common/const.py:281
+#: gajim/common/config.py:445 gajim/common/const.py:315
 msgid "Sleeping"
 msgstr "Dormo"
 
-#: gajim/common/config.py:447
+#: gajim/common/config.py:446
 msgid "Back soon"
 msgstr "Torno presto"
 
-#: gajim/common/config.py:447
+#: gajim/common/config.py:446
 msgid "Back in some minutes."
 msgstr "Torno tra qualche minuto."
 
-#: gajim/common/config.py:448 gajim/common/const.py:247
+#: gajim/common/config.py:447 gajim/common/const.py:281
 msgid "Eating"
 msgstr "Mangio"
 
-#: gajim/common/config.py:448
-msgid "I'm eating, so leave me a message."
-msgstr "Sto mangiando, lascia pure un messaggio."
+#: gajim/common/config.py:447
+#, fuzzy
+msgid "I'm eating."
+msgstr "Sto lavorando."
 
-#: gajim/common/config.py:449
+#: gajim/common/config.py:448
 msgid "Movie"
 msgstr "Film"
 
-#: gajim/common/config.py:449
+#: gajim/common/config.py:448
 msgid "I'm watching a movie."
 msgstr "Sto guardando un film."
 
-#: gajim/common/config.py:450 gajim/common/const.py:314
+#: gajim/common/config.py:449 gajim/common/const.py:348
 msgid "Working"
 msgstr "Lavoro"
 
-#: gajim/common/config.py:450
+#: gajim/common/config.py:449
 msgid "I'm working."
 msgstr "Sto lavorando."
 
-#: gajim/common/config.py:451
+#: gajim/common/config.py:450
 msgid "Phone"
 msgstr "Telefono"
 
-#: gajim/common/config.py:451
+#: gajim/common/config.py:450
 msgid "I'm on the phone."
 msgstr "Sono al telefono."
 
-#: gajim/common/config.py:452
+#: gajim/common/config.py:451
 msgid "Out"
 msgstr "Fuori"
 
-#: gajim/common/config.py:452
+#: gajim/common/config.py:451
 msgid "I'm out enjoying life."
 msgstr "Sono fuori a godermi la vita."
 
-#: gajim/common/config.py:463
+#: gajim/common/config.py:462
 msgid "I'm available."
 msgstr "Sono disponibile."
 
-#: gajim/common/config.py:464
+#: gajim/common/config.py:463
 msgid "I'm free for chat."
 msgstr "Solo disponibile per conversare."
 
-#: gajim/common/config.py:465 gajim/gtk/accounts.py:134
+#: gajim/common/config.py:464 gajim/gtk/accounts.py:133
 msgid "Be right back."
 msgstr "Torno subito."
 
-#: gajim/common/config.py:466
+#: gajim/common/config.py:465
 msgid "I'm not available."
 msgstr "Non sono disponibile."
 
-#: gajim/common/config.py:467
+#: gajim/common/config.py:466
 msgid "Do not disturb."
 msgstr "Non disturbare."
 
-#: gajim/common/config.py:468 gajim/common/config.py:469
+#: gajim/common/config.py:467 gajim/common/config.py:468
 msgid "Bye!"
 msgstr "Ciao ciao!"
 
-#: gajim/common/config.py:480
+#: gajim/common/config.py:479
+#, fuzzy
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
-"muc_highlight_words, or when a group chat message contains your nickname."
+"'muc_highlight_words' your nickname is mentioned."
 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:481
-msgid "Sound to play when any MUC message arrives."
+#: gajim/common/config.py:480
+#, fuzzy
+msgid "Sound to play when any group chat message arrives."
 msgstr "Suono da riprodurre quando un messaggio MUC arriva."
 
-#: gajim/common/config.py:485
+#: gajim/common/config.py:484
 msgid "Tor"
 msgstr "Tor"
 
@@ -4090,871 +4176,967 @@ msgstr "Tor"
 msgid "Error: cannot open %s for reading"
 msgstr "Errore: impossibile aprire %s in lettura"
 
-#: gajim/common/const.py:214
+#: gajim/common/const.py:216
+#, fuzzy
+msgid "?Group chat name:Team"
+msgstr "?Group Chat Contact Role:Nessuno"
+
+#: gajim/common/const.py:217
+msgid "?Group chat description:Project discussion"
+msgstr ""
+
+#: gajim/common/const.py:218
+#, fuzzy
+msgid "?Group chat address:team"
+msgstr "Supporto per le conversazioni di gruppo"
+
+#: gajim/common/const.py:219
+#, fuzzy
+msgid "?Group chat name:Family"
+msgstr "Evidenziatura dei messaggi nelle conversazioni di gruppo:"
+
+#: gajim/common/const.py:220
+msgid "?Group chat description:Spring gathering"
+msgstr ""
+
+#: gajim/common/const.py:221
+msgid "?Group chat address:family"
+msgstr ""
+
+#: gajim/common/const.py:222
+#, fuzzy
+msgid "?Group chat name:Vacation"
+msgstr "Invito in una conversazione di gruppo"
+
+#: gajim/common/const.py:223
+msgid "?Group chat description:Trip planning"
+msgstr ""
+
+#: gajim/common/const.py:224
+#, fuzzy
+msgid "?Group chat address:vacation"
+msgstr "Invito in una conversazione di gruppo"
+
+#: gajim/common/const.py:225
+#, fuzzy
+msgid "?Group chat name:Repairs"
+msgstr "Conversazione di gruppo"
+
+#: gajim/common/const.py:226
+msgid "?Group chat description:Local help group"
+msgstr ""
+
+#: gajim/common/const.py:227
+#, fuzzy
+msgid "?Group chat address:repairs"
+msgstr "Supporto per le conversazioni di gruppo"
+
+#: gajim/common/const.py:228
+#, fuzzy
+msgid "?Group chat name:News"
+msgstr "?Group Chat Contact Role:Nessuno"
+
+#: gajim/common/const.py:229
+#, fuzzy
+msgid "?Group chat description:Local news and reports"
+msgstr "La creazione di conversazioni di gruppo non è permessa."
+
+#: gajim/common/const.py:230
+#, fuzzy
+msgid "?Group chat address:news"
+msgstr "Nuovo messaggio della conversazione di gruppo"
+
+#: gajim/common/const.py:235
+#, fuzzy
+msgid "Remote server not found"
+msgstr "Il servizio non è stato trovato"
+
+#: gajim/common/const.py:236
+msgid "Remote server timeout"
+msgstr ""
+
+#: gajim/common/const.py:237 gajim/common/const.py:238
+#: gajim/common/const.py:239
+#, fuzzy
+msgid "Address does not belong to a group chat server"
+msgstr "%s non è un server di conversazione di gruppo"
+
+#: gajim/common/const.py:240
+#, fuzzy
+msgid "Group chat already exists"
+msgstr "L'account Local esiste già."
+
+#: gajim/common/const.py:241
+#, fuzzy
+msgid "Group chat does not exist"
+msgstr "La conversazione di gruppo <b>%s</b> non esiste."
+
+#: gajim/common/const.py:247
 msgid "This message was encrypted with OTR and could not be decrypted."
 msgstr ""
 
-#: gajim/common/const.py:217
+#: gajim/common/const.py:250
 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:221
+#: gajim/common/const.py:254
 msgid ""
-"This message was encrypted with OpenPGP for XMPP and could not be decrypted."
+"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:224
+#: gajim/common/const.py:258
 #, python-format
 msgid "This message was encrypted with %s and could not be decrypted."
 msgstr ""
 
-#: gajim/common/const.py:231
+#: gajim/common/const.py:265
 msgid "Doing Chores"
 msgstr "Facendo lavori domestici"
 
-#: gajim/common/const.py:232
+#: gajim/common/const.py:266
 msgid "Buying Groceries"
 msgstr "Comprando alimentari"
 
-#: gajim/common/const.py:233
+#: gajim/common/const.py:267
 msgid "Cleaning"
 msgstr "Pulendo"
 
-#: gajim/common/const.py:234
+#: gajim/common/const.py:268
 msgid "Cooking"
 msgstr "Cucinando"
 
-#: gajim/common/const.py:235
+#: gajim/common/const.py:269
 msgid "Doing Maintenance"
 msgstr "Facendo dele riparazioni"
 
-#: gajim/common/const.py:236
+#: gajim/common/const.py:270
 msgid "Doing the Dishes"
 msgstr "Lavando i piatti"
 
-#: gajim/common/const.py:237
+#: gajim/common/const.py:271
 msgid "Doing the Laundry"
 msgstr "Facendo il bucato"
 
-#: gajim/common/const.py:238
+#: gajim/common/const.py:272
 msgid "Gardening"
 msgstr "Facendo giardinaggio"
 
-#: gajim/common/const.py:239
+#: gajim/common/const.py:273
 msgid "Running an Errand"
 msgstr "Facendo una commissione"
 
-#: gajim/common/const.py:240
+#: gajim/common/const.py:274
 msgid "Walking the Dog"
 msgstr "Portando a spasso il cane"
 
-#: gajim/common/const.py:242
+#: gajim/common/const.py:276
 msgid "Drinking"
 msgstr "Bevendo"
 
-#: gajim/common/const.py:243
+#: gajim/common/const.py:277
 msgid "Having a Beer"
 msgstr "Bevendo una birra"
 
-#: gajim/common/const.py:244
+#: gajim/common/const.py:278
 msgid "Having Coffee"
 msgstr "Bevendo del caffè"
 
-#: gajim/common/const.py:245
+#: gajim/common/const.py:279
 msgid "Having Tea"
 msgstr "Bevendo del tè."
 
-#: gajim/common/const.py:248
+#: gajim/common/const.py:282
 msgid "Having a Snack"
 msgstr "Facendo uno spuntino"
 
-#: gajim/common/const.py:249
+#: gajim/common/const.py:283
 msgid "Having Breakfast"
 msgstr "Facendo colazione"
 
-#: gajim/common/const.py:250
+#: gajim/common/const.py:284
 msgid "Having Dinner"
 msgstr "Cenando"
 
-#: gajim/common/const.py:251
+#: gajim/common/const.py:285
 msgid "Having Lunch"
 msgstr "Pranzando"
 
-#: gajim/common/const.py:253
+#: gajim/common/const.py:287
 msgid "Exercising"
 msgstr "Facendo esercizi"
 
-#: gajim/common/const.py:254 gajim/common/const.py:305
+#: gajim/common/const.py:288 gajim/common/const.py:339
 msgid "Cycling"
 msgstr "In bicicletta"
 
-#: gajim/common/const.py:255
+#: gajim/common/const.py:289
 msgid "Dancing"
 msgstr "Ballando"
 
-#: gajim/common/const.py:256
+#: gajim/common/const.py:290
 msgid "Hiking"
 msgstr "Facendo escursionismo"
 
-#: gajim/common/const.py:257
+#: gajim/common/const.py:291
 msgid "Jogging"
 msgstr "Facendo jogging"
 
-#: gajim/common/const.py:258
+#: gajim/common/const.py:292
 msgid "Playing Sports"
 msgstr "Facendo sport"
 
-#: gajim/common/const.py:259
+#: gajim/common/const.py:293
 msgid "Running"
 msgstr "Correndo"
 
-#: gajim/common/const.py:260
+#: gajim/common/const.py:294
 msgid "Skiing"
 msgstr "Sciando"
 
-#: gajim/common/const.py:261
+#: gajim/common/const.py:295
 msgid "Swimming"
 msgstr "Nuotando"
 
-#: gajim/common/const.py:262
+#: gajim/common/const.py:296
 msgid "Working out"
 msgstr "Facendo ginnastica"
 
-#: gajim/common/const.py:264
+#: gajim/common/const.py:298
 msgid "Grooming"
 msgstr "Pettinando"
 
-#: gajim/common/const.py:265
+#: gajim/common/const.py:299
 msgid "At the Spa"
 msgstr "Al centro benessere"
 
-#: gajim/common/const.py:266
+#: gajim/common/const.py:300
 msgid "Brushing Teeth"
 msgstr "Lavandosi i denti"
 
-#: gajim/common/const.py:267
+#: gajim/common/const.py:301
 msgid "Getting a Haircut"
 msgstr "Facendo un taglio di capelli"
 
-#: gajim/common/const.py:268
+#: gajim/common/const.py:302
 msgid "Shaving"
 msgstr "Facendo la barba"
 
-#: gajim/common/const.py:269
+#: gajim/common/const.py:303
 msgid "Taking a Bath"
 msgstr "Facendo un bagno"
 
-#: gajim/common/const.py:270
+#: gajim/common/const.py:304
 msgid "Taking a Shower"
 msgstr "Facendo una doccia"
 
-#: gajim/common/const.py:272
+#: gajim/common/const.py:306
 msgid "Having an Appointment"
 msgstr "Ad un appuntamento"
 
-#: gajim/common/const.py:274
+#: gajim/common/const.py:308
 msgid "Inactive"
 msgstr "Inattivo"
 
-#: gajim/common/const.py:275
+#: gajim/common/const.py:309
 msgid "Day Off"
 msgstr "Giorno libero"
 
-#: gajim/common/const.py:276
+#: gajim/common/const.py:310
 msgid "Hanging out"
 msgstr "Passando il tempo"
 
-#: gajim/common/const.py:277
+#: gajim/common/const.py:311
 msgid "Hiding"
 msgstr "Nascondendo"
 
-#: gajim/common/const.py:278
+#: gajim/common/const.py:312
 msgid "On Vacation"
 msgstr "In vacanza"
 
-#: gajim/common/const.py:279
+#: gajim/common/const.py:313
 msgid "Praying"
 msgstr "Pregando"
 
-#: gajim/common/const.py:280
+#: gajim/common/const.py:314
 msgid "Scheduled Holiday"
 msgstr "Vacanza prenotata"
 
-#: gajim/common/const.py:282
+#: gajim/common/const.py:316
 msgid "Thinking"
 msgstr "Pensando"
 
-#: gajim/common/const.py:284
+#: gajim/common/const.py:318
 msgid "Relaxing"
 msgstr "Rilassando"
 
-#: gajim/common/const.py:285
+#: gajim/common/const.py:319
 msgid "Fishing"
 msgstr "Pescando"
 
-#: gajim/common/const.py:286
+#: gajim/common/const.py:320
 msgid "Gaming"
 msgstr "Giocando"
 
-#: gajim/common/const.py:287
+#: gajim/common/const.py:321
 msgid "Going out"
 msgstr "Uscendo"
 
-#: gajim/common/const.py:288
+#: gajim/common/const.py:322
 msgid "Partying"
 msgstr "Festeggiando"
 
-#: gajim/common/const.py:289
+#: gajim/common/const.py:323
 msgid "Reading"
 msgstr "Leggendo"
 
-#: gajim/common/const.py:290
+#: gajim/common/const.py:324
 msgid "Rehearsing"
 msgstr "Ripassando"
 
-#: gajim/common/const.py:291
+#: gajim/common/const.py:325
 msgid "Shopping"
 msgstr "Facendo shopping"
 
-#: gajim/common/const.py:292
+#: gajim/common/const.py:326
 msgid "Smoking"
 msgstr "Fumando"
 
-#: gajim/common/const.py:293
+#: gajim/common/const.py:327
 msgid "Socializing"
 msgstr "Socializzando"
 
-#: gajim/common/const.py:294
+#: gajim/common/const.py:328
 msgid "Sunbathing"
 msgstr "Prendendo il sole"
 
-#: gajim/common/const.py:295
+#: gajim/common/const.py:329
 msgid "Watching TV"
 msgstr "Guardando la TV"
 
-#: gajim/common/const.py:296
+#: gajim/common/const.py:330
 msgid "Watching a Movie"
 msgstr "Guardando un film"
 
-#: gajim/common/const.py:298
+#: gajim/common/const.py:332
 msgid "Talking"
 msgstr "Parlando"
 
-#: gajim/common/const.py:299
+#: gajim/common/const.py:333
 msgid "In Real Life"
 msgstr "Nella vita reale"
 
-#: gajim/common/const.py:300
+#: gajim/common/const.py:334
 msgid "On the Phone"
 msgstr "Al telefono"
 
-#: gajim/common/const.py:301
+#: gajim/common/const.py:335
 msgid "On Video Phone"
 msgstr "In videochiamata"
 
-#: gajim/common/const.py:303
+#: gajim/common/const.py:337
 msgid "Traveling"
 msgstr "Viaggiando"
 
-#: gajim/common/const.py:304
+#: gajim/common/const.py:338
 msgid "Commuting"
 msgstr "Facendo il pendolare"
 
-#: gajim/common/const.py:306
+#: gajim/common/const.py:340
 msgid "Driving"
 msgstr "Guidando"
 
-#: gajim/common/const.py:307
+#: gajim/common/const.py:341
 msgid "In a Car"
 msgstr "In automobile"
 
-#: gajim/common/const.py:308
+#: gajim/common/const.py:342
 msgid "On a Bus"
 msgstr "Sul bus"
 
-#: gajim/common/const.py:309
+#: gajim/common/const.py:343
 msgid "On a Plane"
 msgstr "In aereo"
 
-#: gajim/common/const.py:310
+#: gajim/common/const.py:344
 msgid "On a Train"
 msgstr "In treno"
 
-#: gajim/common/const.py:311
+#: gajim/common/const.py:345
 msgid "On a Trip"
 msgstr "In viaggio"
 
-#: gajim/common/const.py:312
+#: gajim/common/const.py:346
 msgid "Walking"
 msgstr "Camminando"
 
-#: gajim/common/const.py:315
+#: gajim/common/const.py:349
 msgid "Coding"
 msgstr "Scrivendo codice"
 
-#: gajim/common/const.py:316
+#: gajim/common/const.py:350
 msgid "In a Meeting"
 msgstr "A una riunione"
 
-#: gajim/common/const.py:317
+#: gajim/common/const.py:351
 msgid "Studying"
 msgstr "Studiando"
 
-#: gajim/common/const.py:318
+#: gajim/common/const.py:352
 msgid "Writing"
 msgstr "Scrivendo"
 
-#: gajim/common/const.py:321
+#: gajim/common/const.py:355
 msgid "Afraid"
 msgstr "Impaurito"
 
-#: gajim/common/const.py:322
+#: gajim/common/const.py:356
 msgid "Amazed"
 msgstr "Stupefatto"
 
-#: gajim/common/const.py:323
+#: gajim/common/const.py:357
 msgid "Amorous"
 msgstr "Voglioso"
 
-#: gajim/common/const.py:324
+#: gajim/common/const.py:358
 msgid "Angry"
 msgstr "Arrabbiato"
 
-#: gajim/common/const.py:325
+#: gajim/common/const.py:359
 msgid "Annoyed"
 msgstr "Infastidito"
 
-#: gajim/common/const.py:326
+#: gajim/common/const.py:360
 msgid "Anxious"
 msgstr "Ansioso"
 
-#: gajim/common/const.py:327
+#: gajim/common/const.py:361
 msgid "Aroused"
 msgstr "Eccitato"
 
-#: gajim/common/const.py:328
+#: gajim/common/const.py:362
 msgid "Ashamed"
 msgstr "Vergognato"
 
-#: gajim/common/const.py:329
+#: gajim/common/const.py:363
 msgid "Bored"
 msgstr "Annoiato"
 
-#: gajim/common/const.py:330
+#: gajim/common/const.py:364
 msgid "Brave"
 msgstr "Coraggioso"
 
-#: gajim/common/const.py:331
+#: gajim/common/const.py:365
 msgid "Calm"
 msgstr "Calmo"
 
-#: gajim/common/const.py:332
+#: gajim/common/const.py:366
 msgid "Cautious"
 msgstr "Cauto"
 
-#: gajim/common/const.py:333
+#: gajim/common/const.py:367
 msgid "Cold"
 msgstr "Raffreddato"
 
-#: gajim/common/const.py:334
+#: gajim/common/const.py:368
 msgid "Confident"
 msgstr "Fiducioso"
 
-#: gajim/common/const.py:335
+#: gajim/common/const.py:369
 msgid "Confused"
 msgstr "Confuso"
 
-#: gajim/common/const.py:336
+#: gajim/common/const.py:370
 msgid "Contemplative"
 msgstr "Contemplativo"
 
-#: gajim/common/const.py:337
+#: gajim/common/const.py:371
 msgid "Contented"
 msgstr "Soddisfatto"
 
-#: gajim/common/const.py:338
+#: gajim/common/const.py:372
 msgid "Cranky"
 msgstr "Irritabile"
 
-#: gajim/common/const.py:339
+#: gajim/common/const.py:373
 msgid "Crazy"
 msgstr "Pazzo"
 
-#: gajim/common/const.py:340
+#: gajim/common/const.py:374
 msgid "Creative"
 msgstr "Creativo"
 
-#: gajim/common/const.py:341
+#: gajim/common/const.py:375
 msgid "Curious"
 msgstr "Curioso"
 
-#: gajim/common/const.py:342
+#: gajim/common/const.py:376
 msgid "Dejected"
 msgstr "Abbattuto"
 
-#: gajim/common/const.py:343
+#: gajim/common/const.py:377
 msgid "Depressed"
 msgstr "Depresso"
 
-#: gajim/common/const.py:344
+#: gajim/common/const.py:378
 msgid "Disappointed"
 msgstr "Deluso"
 
-#: gajim/common/const.py:345
+#: gajim/common/const.py:379
 msgid "Disgusted"
 msgstr "Disgustato"
 
-#: gajim/common/const.py:346
+#: gajim/common/const.py:380
 msgid "Dismayed"
 msgstr "Costernato"
 
-#: gajim/common/const.py:347
+#: gajim/common/const.py:381
 msgid "Distracted"
 msgstr "Distratto"
 
-#: gajim/common/const.py:348
+#: gajim/common/const.py:382
 msgid "Embarrassed"
 msgstr "Imbarazzato"
 
-#: gajim/common/const.py:349
+#: gajim/common/const.py:383
 msgid "Envious"
 msgstr "Invidioso"
 
-#: gajim/common/const.py:350
+#: gajim/common/const.py:384
 msgid "Excited"
 msgstr "Emozionato"
 
-#: gajim/common/const.py:351
+#: gajim/common/const.py:385
 msgid "Flirtatious"
 msgstr "Leggero"
 
-#: gajim/common/const.py:352
+#: gajim/common/const.py:386
 msgid "Frustrated"
 msgstr "Frustrato"
 
-#: gajim/common/const.py:353
+#: gajim/common/const.py:387
 msgid "Grateful"
 msgstr "Riconoscente"
 
-#: gajim/common/const.py:354
+#: gajim/common/const.py:388
 msgid "Grieving"
 msgstr "In lutto"
 
-#: gajim/common/const.py:355
+#: gajim/common/const.py:389
 msgid "Grumpy"
 msgstr "Scontroso"
 
-#: gajim/common/const.py:356
+#: gajim/common/const.py:390
 msgid "Guilty"
 msgstr "Colpevole"
 
-#: gajim/common/const.py:357
+#: gajim/common/const.py:391
 msgid "Happy"
 msgstr "Felice"
 
-#: gajim/common/const.py:358
+#: gajim/common/const.py:392
 msgid "Hopeful"
 msgstr "Speranzoso"
 
-#: gajim/common/const.py:359
+#: gajim/common/const.py:393
 msgid "Hot"
 msgstr "Accaldato"
 
-#: gajim/common/const.py:360
+#: gajim/common/const.py:394
 msgid "Humbled"
 msgstr "Mortificato"
 
-#: gajim/common/const.py:361
+#: gajim/common/const.py:395
 msgid "Humiliated"
 msgstr "Umiliato"
 
-#: gajim/common/const.py:362
+#: gajim/common/const.py:396
 msgid "Hungry"
 msgstr "Affamato"
 
-#: gajim/common/const.py:363
+#: gajim/common/const.py:397
 msgid "Hurt"
 msgstr "Ferito"
 
-#: gajim/common/const.py:364
+#: gajim/common/const.py:398
 msgid "Impressed"
 msgstr "Colpito"
 
-#: gajim/common/const.py:365
+#: gajim/common/const.py:399
 msgid "In Awe"
 msgstr "In venerazione"
 
-#: gajim/common/const.py:366
+#: gajim/common/const.py:400
 msgid "In Love"
 msgstr "Innamorato"
 
-#: gajim/common/const.py:367
+#: gajim/common/const.py:401
 msgid "Indignant"
 msgstr "Indignato"
 
-#: gajim/common/const.py:368
+#: gajim/common/const.py:402
 msgid "Interested"
 msgstr "Interessato"
 
-#: gajim/common/const.py:369
+#: gajim/common/const.py:403
 msgid "Intoxicated"
 msgstr "Intossicato"
 
-#: gajim/common/const.py:370
+#: gajim/common/const.py:404
 msgid "Invincible"
 msgstr "Invincibile"
 
-#: gajim/common/const.py:371
+#: gajim/common/const.py:405
 msgid "Jealous"
 msgstr "Geloso"
 
-#: gajim/common/const.py:372
+#: gajim/common/const.py:406
 msgid "Lonely"
 msgstr "Solitario"
 
-#: gajim/common/const.py:373
+#: gajim/common/const.py:407
 msgid "Lost"
 msgstr "Perso"
 
-#: gajim/common/const.py:374
+#: gajim/common/const.py:408
 msgid "Lucky"
 msgstr "Fortunato"
 
-#: gajim/common/const.py:375
+#: gajim/common/const.py:409
 msgid "Mean"
 msgstr "Meschino"
 
-#: gajim/common/const.py:376
+#: gajim/common/const.py:410
 msgid "Moody"
 msgstr "Lunatico"
 
-#: gajim/common/const.py:377
+#: gajim/common/const.py:411
 msgid "Nervous"
 msgstr "Nervoso"
 
-#: gajim/common/const.py:378
+#: gajim/common/const.py:412
 msgid "Neutral"
 msgstr "Neutrale"
 
-#: gajim/common/const.py:379
+#: gajim/common/const.py:413
 msgid "Offended"
 msgstr "Offeso"
 
-#: gajim/common/const.py:380
+#: gajim/common/const.py:414
 msgid "Outraged"
 msgstr "Oltraggiato"
 
-#: gajim/common/const.py:381
+#: gajim/common/const.py:415
 msgid "Playful"
 msgstr "Giocoso"
 
-#: gajim/common/const.py:382
+#: gajim/common/const.py:416
 msgid "Proud"
 msgstr "Orgoglioso"
 
-#: gajim/common/const.py:383
+#: gajim/common/const.py:417
 msgid "Relaxed"
 msgstr "Rilassato"
 
-#: gajim/common/const.py:384
+#: gajim/common/const.py:418
 msgid "Relieved"
 msgstr "Rincuorato"
 
-#: gajim/common/const.py:385
+#: gajim/common/const.py:419
 msgid "Remorseful"
 msgstr "Tormentato dal rimorso"
 
-#: gajim/common/const.py:386
+#: gajim/common/const.py:420
 msgid "Restless"
 msgstr "Irrequieto"
 
-#: gajim/common/const.py:387
+#: gajim/common/const.py:421
 msgid "Sad"
 msgstr "Triste"
 
-#: gajim/common/const.py:388
+#: gajim/common/const.py:422
 msgid "Sarcastic"
 msgstr "Sarcastico"
 
-#: gajim/common/const.py:389
+#: gajim/common/const.py:423
 msgid "Satisfied"
 msgstr "Soddisfatto"
 
-#: gajim/common/const.py:390
+#: gajim/common/const.py:424
 msgid "Serious"
 msgstr "Serio"
 
-#: gajim/common/const.py:391
+#: gajim/common/const.py:425
 msgid "Shocked"
 msgstr "Scioccato"
 
-#: gajim/common/const.py:392
+#: gajim/common/const.py:426
 msgid "Shy"
 msgstr "Timido"
 
-#: gajim/common/const.py:393
+#: gajim/common/const.py:427
 msgid "Sick"
 msgstr "Ammalato"
 
-#: gajim/common/const.py:394
+#: gajim/common/const.py:428
 msgid "Sleepy"
 msgstr "Assonnato"
 
-#: gajim/common/const.py:395
+#: gajim/common/const.py:429
 msgid "Spontaneous"
 msgstr "Spontaneo"
 
-#: gajim/common/const.py:396
+#: gajim/common/const.py:430
 msgid "Stressed"
 msgstr "Stressato"
 
-#: gajim/common/const.py:397
+#: gajim/common/const.py:431
 msgid "Strong"
 msgstr "Forte"
 
-#: gajim/common/const.py:398
+#: gajim/common/const.py:432
 msgid "Surprised"
 msgstr "Sorpreso"
 
-#: gajim/common/const.py:399
+#: gajim/common/const.py:433
 msgid "Thankful"
 msgstr "Riconoscente"
 
-#: gajim/common/const.py:400
+#: gajim/common/const.py:434
 msgid "Thirsty"
 msgstr "Assetato"
 
-#: gajim/common/const.py:401
+#: gajim/common/const.py:435
 msgid "Tired"
 msgstr "Stanco"
 
-#: gajim/common/const.py:402
+#: gajim/common/const.py:436
 msgid "Undefined"
 msgstr "Indefinito"
 
-#: gajim/common/const.py:403
+#: gajim/common/const.py:437
 msgid "Weak"
 msgstr "Debole"
 
-#: gajim/common/const.py:404
+#: gajim/common/const.py:438
 msgid "Worried"
 msgstr "Preoccupato"
 
-#: gajim/common/const.py:408
+#: gajim/common/const.py:442
 msgid "accuracy"
 msgstr "precisione"
 
-#: gajim/common/const.py:409
+#: gajim/common/const.py:443
 msgid "alt"
 msgstr "altitudine"
 
-#: gajim/common/const.py:410
+#: gajim/common/const.py:444
 msgid "area"
 msgstr "zona"
 
-#: gajim/common/const.py:411
+#: gajim/common/const.py:445
 msgid "bearing"
 msgstr "direzione"
 
-#: gajim/common/const.py:412
+#: gajim/common/const.py:446
 msgid "building"
 msgstr "edificio"
 
-#: gajim/common/const.py:413
+#: gajim/common/const.py:447
 msgid "country"
 msgstr "paese"
 
-#: gajim/common/const.py:414
+#: gajim/common/const.py:448
 msgid "countrycode"
 msgstr "codice paese"
 
-#: gajim/common/const.py:415
+#: gajim/common/const.py:449
 msgid "datum"
 msgstr "datum"
 
-#: gajim/common/const.py:416
+#: gajim/common/const.py:450
 msgid "description"
 msgstr "descrizione"
 
-#: gajim/common/const.py:417
+#: gajim/common/const.py:451
 msgid "error"
 msgstr "errore"
 
-#: gajim/common/const.py:418
+#: gajim/common/const.py:452
 msgid "floor"
 msgstr "piano"
 
-#: gajim/common/const.py:419
+#: gajim/common/const.py:453
 msgid "lat"
 msgstr "latitudine"
 
-#: gajim/common/const.py:420
+#: gajim/common/const.py:454
 msgid "locality"
 msgstr "località"
 
-#: gajim/common/const.py:421
+#: gajim/common/const.py:455
 msgid "lon"
 msgstr "longitudine"
 
-#: gajim/common/const.py:422
+#: gajim/common/const.py:456
 msgid "postalcode"
 msgstr "codice postale"
 
-#: gajim/common/const.py:423
+#: gajim/common/const.py:457
 msgid "region"
 msgstr "regione"
 
-#: gajim/common/const.py:424
+#: gajim/common/const.py:458
 msgid "room"
 msgstr "stanza"
 
-#: gajim/common/const.py:425
+#: gajim/common/const.py:459
 msgid "speed"
 msgstr "velocità"
 
-#: gajim/common/const.py:426
+#: gajim/common/const.py:460
 msgid "street"
 msgstr "strada"
 
-#: gajim/common/const.py:427
+#: gajim/common/const.py:461
 msgid "text"
 msgstr "informazioni"
 
-#: gajim/common/const.py:428
+#: gajim/common/const.py:462
 msgid "timestamp"
 msgstr "orario"
 
-#: gajim/common/const.py:429
+#: gajim/common/const.py:463
 msgid "URI"
 msgstr "URI"
 
-#: gajim/common/const.py:434
+#: gajim/common/const.py:468
 msgid "Unable to get issuer certificate"
 msgstr "Impossibile ottenere il certificato dell'entità emittente"
 
-#: gajim/common/const.py:435
+#: gajim/common/const.py:469
 msgid "Unable to get certificate CRL"
 msgstr "Impossibile ottenere la CRL del certificato"
 
-#: gajim/common/const.py:436
+#: gajim/common/const.py:470
 msgid "Unable to decrypt certificate's signature"
 msgstr "Impossibile decifrare la firma del certificato"
 
-#: gajim/common/const.py:437
+#: gajim/common/const.py:471
 msgid "Unable to decrypt CRL's signature"
 msgstr "Impossibile decifrare la firma della CRL"
 
-#: gajim/common/const.py:438
+#: gajim/common/const.py:472
 msgid "Unable to decode issuer public key"
 msgstr "Impossibile decodificare la chiave pubblica dell'entità emittente"
 
-#: gajim/common/const.py:439
+#: gajim/common/const.py:473
 msgid "Certificate signature failure"
 msgstr "Fallimento firma del certificato"
 
-#: gajim/common/const.py:440
+#: gajim/common/const.py:474
 msgid "CRL signature failure"
 msgstr "Fallimento firma CRL"
 
-#: gajim/common/const.py:441
+#: gajim/common/const.py:475
 msgid "Certificate is not yet valid"
 msgstr "Il certificato non è ancora valido"
 
-#: gajim/common/const.py:442
+#: gajim/common/const.py:476
 msgid "Certificate has expired"
 msgstr "Il certificato è scaduto"
 
-#: gajim/common/const.py:443
+#: gajim/common/const.py:477
 msgid "CRL is not yet valid"
 msgstr "La CRL non è ancora valida"
 
-#: gajim/common/const.py:444
+#: gajim/common/const.py:478
 msgid "CRL has expired"
 msgstr "La CRL è scaduta"
 
-#: gajim/common/const.py:445
+#: gajim/common/const.py:479
 msgid "Format error in certificate's notBefore field"
 msgstr "Errore di formato nel campo notBefore del certificato"
 
-#: gajim/common/const.py:446
+#: gajim/common/const.py:480
 msgid "Format error in certificate's notAfter field"
 msgstr "Errore di formato nel campo notAfter del certificato"
 
-#: gajim/common/const.py:447
+#: gajim/common/const.py:481
 msgid "Format error in CRL's lastUpdate field"
 msgstr "Errore di formato nel campo lastUpdate della CRL"
 
-#: gajim/common/const.py:448
+#: gajim/common/const.py:482
 msgid "Format error in CRL's nextUpdate field"
 msgstr "Errore di formato nel campo nextUpdate della CRL"
 
-#: gajim/common/const.py:449
+#: gajim/common/const.py:483
 msgid "Out of memory"
 msgstr "Memoria esaurita"
 
-#: gajim/common/const.py:450
+#: gajim/common/const.py:484
 msgid "Self signed certificate"
 msgstr "Certificato autofirmato"
 
-#: gajim/common/const.py:451
+#: gajim/common/const.py:485
 msgid "Self signed certificate in certificate chain"
 msgstr "Certificato autofirmato nella catena di certificazione"
 
-#: gajim/common/const.py:452
+#: gajim/common/const.py:486
 msgid "Unable to get local issuer certificate"
 msgstr "Impossibile ottenere il certificato dell'entità emittente locale"
 
-#: gajim/common/const.py:453
+#: gajim/common/const.py:487
 msgid "Unable to verify the first certificate"
 msgstr "Impossibile verificare il primo certificato"
 
-#: gajim/common/const.py:454
+#: gajim/common/const.py:488
 msgid "Certificate chain too long"
 msgstr "Catena di certificazione troppo lunga"
 
-#: gajim/common/const.py:455
+#: gajim/common/const.py:489
 msgid "Certificate revoked"
 msgstr "Certificato revocato"
 
-#: gajim/common/const.py:456
+#: gajim/common/const.py:490
 msgid "Invalid CA certificate"
 msgstr "Certificato di una CA non valida"
 
-#: gajim/common/const.py:457
+#: gajim/common/const.py:491
 msgid "Path length constraint exceeded"
 msgstr "Limite della lunghezza del percorso superato"
 
-#: gajim/common/const.py:458
+#: gajim/common/const.py:492
 msgid "Unsupported certificate purpose"
 msgstr "Scopo del certificato non supportato"
 
-#: gajim/common/const.py:459
+#: gajim/common/const.py:493
 msgid "Certificate not trusted"
 msgstr "Certificato non attendibile"
 
-#: gajim/common/const.py:460
+#: gajim/common/const.py:494
 msgid "Certificate rejected"
 msgstr "Certificato rifiutato"
 
-#: gajim/common/const.py:461
+#: gajim/common/const.py:495
 msgid "Subject issuer mismatch"
 msgstr "L'entità emittente del soggetto non coincide"
 
-#: gajim/common/const.py:462
+#: gajim/common/const.py:496
 msgid "Authority and subject key identifier mismatch"
 msgstr "L'autorità e l'identificatore di chiave del soggetto non coincidono"
 
-#: gajim/common/const.py:463
+#: gajim/common/const.py:497
 msgid "Authority and issuer serial number mismatch"
 msgstr "L'autorità e il numero seriale dell'entità emittente non coincidono"
 
-#: gajim/common/const.py:464
+#: gajim/common/const.py:498
 msgid "Key usage does not include certificate signing"
 msgstr "L'uso della chiave non include la firma del certificato"
 
-#: gajim/common/const.py:465
+#: gajim/common/const.py:499
 msgid "Application verification failure"
 msgstr "Fallimento verifica applicazione"
 
@@ -5127,261 +5309,261 @@ msgstr "ingresso video"
 msgid "video output"
 msgstr "uscita video"
 
-#: gajim/common/helpers.py:210
+#: gajim/common/helpers.py:216
 #, fuzzy
 msgid "Server must be between 1 and 1023 bytes"
 msgstr "Il server deve essere tra 1 e 1023 caratteri"
 
-#: gajim/common/helpers.py:214
+#: gajim/common/helpers.py:220
 msgid "Invalid character in hostname."
 msgstr "Carattere non valido nell'hostname."
 
-#: gajim/common/helpers.py:216
+#: gajim/common/helpers.py:222
 msgid "Server address required."
 msgstr "Indirizzo del server richiesto."
 
-#: gajim/common/helpers.py:220
+#: gajim/common/helpers.py:226
 #, 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:224
+#: gajim/common/helpers.py:230
 msgid "Invalid character in username."
 msgstr "Carattere non valido nel nome utente."
 
-#: gajim/common/helpers.py:230
+#: gajim/common/helpers.py:236
 #, fuzzy
 msgid "Resource must be between 1 and 1023 bytes"
 msgstr "La risorsa deve essere tra 1 e 1023 caratteri"
 
-#: gajim/common/helpers.py:234
+#: gajim/common/helpers.py:240
 msgid "Invalid character in resource."
 msgstr "Carattere non valido nella risorsa."
 
-#: gajim/common/helpers.py:275
+#: gajim/common/helpers.py:281
 msgid "_Busy"
 msgstr "O_ccupato"
 
-#: gajim/common/helpers.py:277 gajim/gtk/tooltips.py:647
+#: gajim/common/helpers.py:283 gajim/gtk/tooltips.py:647
 msgid "Busy"
 msgstr "Occupato"
 
-#: gajim/common/helpers.py:280
+#: gajim/common/helpers.py:286
 msgid "_Not Available"
 msgstr "_Non disponibile"
 
-#: gajim/common/helpers.py:282 gajim/gtk/tooltips.py:649
+#: gajim/common/helpers.py:288 gajim/gtk/tooltips.py:649
 msgid "Not Available"
 msgstr "Non disponibile"
 
-#: gajim/common/helpers.py:285
+#: gajim/common/helpers.py:291
 msgid "_Free for Chat"
 msgstr "_Disponibile per conversare"
 
-#: gajim/common/helpers.py:287 gajim/gtk/tooltips.py:643
+#: gajim/common/helpers.py:293 gajim/gtk/tooltips.py:643
 msgid "Free for Chat"
 msgstr "Disponibile per conversare"
 
-#: gajim/common/helpers.py:290
+#: gajim/common/helpers.py:296
 msgid "?user status:_Available"
 msgstr "?user status:_Disponibile"
 
-#: gajim/common/helpers.py:292 gajim/gtk/tooltips.py:641
+#: gajim/common/helpers.py:298 gajim/gtk/tooltips.py:641
 msgid "?user status:Available"
 msgstr "?user status:Disponibile"
 
-#: gajim/common/helpers.py:294
+#: gajim/common/helpers.py:300
 msgid "Connecting"
 msgstr "Connessione in corso"
 
-#: gajim/common/helpers.py:297 gajim/data/gui/preferences_window.ui:1251
+#: gajim/common/helpers.py:303 gajim/data/gui/preferences_window.ui:1251
 msgid "A_way"
 msgstr "_Assente"
 
-#: gajim/common/helpers.py:299 gajim/common/modules/adhoc_commands.py:120
-#: gajim/command_system/implementation/standard.py:139
+#: gajim/common/helpers.py:305 gajim/common/modules/adhoc_commands.py:120
+#: gajim/command_system/implementation/standard.py:141
 #: gajim/gtk/tooltips.py:645
 msgid "Away"
 msgstr "Assente"
 
-#: gajim/common/helpers.py:302
+#: gajim/common/helpers.py:308
 msgid "_Offline"
 msgstr "_Non in linea"
 
-#: gajim/common/helpers.py:304 gajim/gtk/tooltips.py:651
+#: gajim/common/helpers.py:310 gajim/gtk/tooltips.py:651
 msgid "Offline"
 msgstr "Non in linea"
 
-#: gajim/common/helpers.py:307
+#: gajim/common/helpers.py:313
 msgid "_Invisible"
 msgstr "_Invisibile"
 
-#: gajim/common/helpers.py:313
+#: gajim/common/helpers.py:319
 msgid "?contact has status:Unknown"
 msgstr "?contact has status:Sconosciuto"
 
-#: gajim/common/helpers.py:315
+#: gajim/common/helpers.py:321
 msgid "?contact has status:Has errors"
 msgstr "?contact has status:Ha degli errori"
 
-#: gajim/common/helpers.py:330
+#: gajim/common/helpers.py:336
 msgid "?Subscription we already have:None"
 msgstr "?Subscription we already have:Nessuno"
 
-#: gajim/common/helpers.py:332
+#: gajim/common/helpers.py:338
 msgid "To"
 msgstr "A"
 
-#: gajim/common/helpers.py:334 gajim/data/gui/groups_post_window.ui:33
+#: gajim/common/helpers.py:340 gajim/data/gui/groups_post_window.ui:33
 msgid "From"
 msgstr "Da"
 
-#: gajim/common/helpers.py:336
+#: gajim/common/helpers.py:342
 msgid "Both"
 msgstr "Entrambi"
 
-#: gajim/common/helpers.py:338 gajim/gtk/server_info.py:151
+#: gajim/common/helpers.py:344 gajim/gtk/server_info.py:151
 #, fuzzy
 msgid "Unknown"
 msgstr "?OS:Sconosciuto"
 
-#: gajim/common/helpers.py:344
+#: gajim/common/helpers.py:350
 msgid "?Ask (for Subscription):None"
 msgstr "?Ask (for Subscription):Nessuno"
 
-#: gajim/common/helpers.py:346
+#: gajim/common/helpers.py:352
 msgid "Subscribe"
 msgstr "Abbonati"
 
-#: gajim/common/helpers.py:355
+#: gajim/common/helpers.py:361
 msgid "?Group Chat Contact Role:None"
 msgstr "?Group Chat Contact Role:Nessuno"
 
-#: gajim/common/helpers.py:358
+#: gajim/common/helpers.py:364
 msgid "Moderators"
 msgstr "Moderatori"
 
-#: gajim/common/helpers.py:360
+#: gajim/common/helpers.py:366
 msgid "Moderator"
 msgstr "Moderatore"
 
-#: gajim/common/helpers.py:363
+#: gajim/common/helpers.py:369 gajim/data/gui/groupchat_info_scrolled.ui:243
 msgid "Participants"
 msgstr "Partecipanti"
 
-#: gajim/common/helpers.py:365
+#: gajim/common/helpers.py:371
 msgid "Participant"
 msgstr "Participante"
 
-#: gajim/common/helpers.py:368
+#: gajim/common/helpers.py:374
 msgid "Visitors"
 msgstr "Visitatori"
 
-#: gajim/common/helpers.py:370
+#: gajim/common/helpers.py:376
 msgid "Visitor"
 msgstr "Visitatore"
 
-#: gajim/common/helpers.py:376 gajim/gtk/tooltips.py:253
+#: gajim/common/helpers.py:382 gajim/gtk/tooltips.py:253
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "?Group Chat Contact Affiliation:Nessuno"
 
-#: gajim/common/helpers.py:378 gajim/data/gui/groupchat_config.ui:32
+#: gajim/common/helpers.py:384 gajim/data/gui/groupchat_config.ui:32
 #: gajim/gtk/tooltips.py:259
 msgid "Owner"
 msgstr "Proprietario"
 
-#: gajim/common/helpers.py:380 gajim/gtk/tooltips.py:257
+#: gajim/common/helpers.py:386 gajim/gtk/tooltips.py:257
 msgid "Administrator"
 msgstr "Amministratore"
 
-#: gajim/common/helpers.py:382 gajim/data/gui/groupchat_config.ui:40
+#: gajim/common/helpers.py:388 gajim/data/gui/groupchat_config.ui:40
 #: gajim/gtk/tooltips.py:255 gajim/gtk/groupchat_config.py:105
 msgid "Member"
 msgstr "Membro"
 
-#: gajim/common/helpers.py:421
+#: gajim/common/helpers.py:427
 msgid "is paying attention to the conversation"
 msgstr "sta seguendo la conversazione"
 
-#: gajim/common/helpers.py:423
+#: gajim/common/helpers.py:429
 msgid "is doing something else"
 msgstr "sta facendo qualcos'altro"
 
-#: gajim/common/helpers.py:425
+#: gajim/common/helpers.py:431
 #, fuzzy
 msgid "is composing a message…"
 msgstr "sta scrivendo..."
 
-#: gajim/common/helpers.py:428
+#: gajim/common/helpers.py:434
 msgid "paused composing a message"
 msgstr "ha smesso di scrivere"
 
-#: gajim/common/helpers.py:430
+#: gajim/common/helpers.py:436
 msgid "has closed the chat window or tab"
 msgstr "ha chiuso la finestra o la scheda della conversazione"
 
-#: gajim/common/helpers.py:936 gajim/common/helpers.py:943
+#: gajim/common/helpers.py:942 gajim/common/helpers.py:949
 #, 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:950
+#: gajim/common/helpers.py:956
 #, fuzzy, python-format
-msgid "from room %s"
-msgstr " dalla stanza %s"
+msgid "from group chat %s"
+msgstr "nelle conversazioni di _gruppo"
 
-#: gajim/common/helpers.py:953 gajim/common/helpers.py:970
+#: gajim/common/helpers.py:959 gajim/common/helpers.py:976
 #, fuzzy, python-format
 msgid "from user %s"
 msgstr " dall'utente %s"
 
-#: gajim/common/helpers.py:955
+#: gajim/common/helpers.py:961
 #, fuzzy, python-format
 msgid "from %s"
 msgstr " da %s"
 
-#: gajim/common/helpers.py:962 gajim/common/helpers.py:968
+#: gajim/common/helpers.py:968 gajim/common/helpers.py:974
 #, 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:986 gajim/common/helpers.py:998
+#: gajim/common/helpers.py:992 gajim/common/helpers.py:1004
 #: gajim/data/gui/roster_window.ui:85 data/org.gajim.Gajim.desktop.in:4
 #: data/org.gajim.Gajim.appdata.xml.in:9
 msgid "Gajim"
 msgstr "Gajim"
 
-#: gajim/common/helpers.py:1000
+#: gajim/common/helpers.py:1006
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: gajim/common/helpers.py:1109 gajim/data/gui/add_new_contact_window.ui:25
+#: gajim/common/helpers.py:1115 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:1111
+#: gajim/common/helpers.py:1117
 msgid "Hello, I am $name."
 msgstr "Ciao, sono $name"
 
-#: gajim/common/helpers.py:1215 gajim/common/helpers.py:1224
-#: gajim/common/helpers.py:1282
+#: gajim/common/helpers.py:1221 gajim/common/helpers.py:1230
+#: gajim/common/helpers.py:1288
 msgid "Timeout loading image"
 msgstr "Impossibile caricare l'immagine"
 
-#: gajim/common/helpers.py:1234 gajim/common/helpers.py:1280
+#: gajim/common/helpers.py:1240 gajim/common/helpers.py:1286
 msgid "Image is too big"
 msgstr "L'immagine è troppo grande"
 
-#: gajim/common/helpers.py:1245
+#: gajim/common/helpers.py:1251
 msgid "PyCURL is not installed"
 msgstr "PyCURL non è installato"
 
-#: gajim/common/helpers.py:1284
+#: gajim/common/helpers.py:1290
 msgid "Error loading image"
 msgstr "Errore caricamento immagine"
 
@@ -5565,7 +5747,8 @@ msgstr "Stato modificato."
 
 #: gajim/common/modules/adhoc_commands.py:202
 #: gajim/common/modules/adhoc_commands.py:239
-msgid "Leave Groupchats"
+#, fuzzy
+msgid "Leave Group Chats"
 msgstr "Esci dalle conversazioni di gruppo"
 
 #: gajim/common/modules/adhoc_commands.py:228
@@ -5574,15 +5757,18 @@ msgid "%(nickname)s on %(room_jid)s"
 msgstr "%(nickname)s su %(room_jid)s"
 
 #: gajim/common/modules/adhoc_commands.py:232
-msgid "You have not joined a groupchat."
+#, fuzzy
+msgid "You have not joined a group chat."
 msgstr "Non si è entrati in una conversazione di gruppo."
 
 #: gajim/common/modules/adhoc_commands.py:240
-msgid "Choose the groupchats you want to leave"
+#, fuzzy
+msgid "Choose the group chats you want to leave"
 msgstr "Scegliere le conversazioni di gruppo da cui vuoi uscire"
 
 #: gajim/common/modules/adhoc_commands.py:289
-msgid "You left the following groupchats:"
+#, fuzzy
+msgid "You left the following group chats:"
 msgstr "Sei uscito dalle seguenti conversazioni di gruppo:"
 
 #: gajim/common/modules/roster_item_exchange.py:102
@@ -5598,7 +5784,7 @@ msgstr "Contatti inviati:"
 msgid "Blocked Contacts"
 msgstr "Contatti bloccati"
 
-#: gajim/data/gui/destroy_muc_dialog.ui:79 gajim/gtk/dialogs.py:736
+#: gajim/data/gui/destroy_muc_dialog.ui:79 gajim/gtk/dialogs.py:563
 msgid "Destroy this group chat permanently?"
 msgstr ""
 
@@ -5607,7 +5793,7 @@ msgstr ""
 msgid "Reason..."
 msgstr "Motivo"
 
-#: gajim/data/gui/destroy_muc_dialog.ui:124 gajim/gtk/dialogs.py:738
+#: gajim/data/gui/destroy_muc_dialog.ui:124 gajim/gtk/dialogs.py:565
 msgid "Where participants should go (optional)"
 msgstr ""
 
@@ -5620,31 +5806,6 @@ msgstr ""
 msgid "_Reason and alternate venue (optional)"
 msgstr "Puoi anche inserire un nome alternativo:"
 
-#: gajim/data/gui/advanced_configuration_window.ui:7
-#: gajim/data/gui/preferences_window.ui:2723
-#, fuzzy
-msgid "Advanced Configuration Editor (ACE)"
-msgstr "Editor di configurazione avanzata"
-
-#: gajim/data/gui/advanced_configuration_window.ui:52
-msgid "You should restart Gajim for some changes to take effect"
-msgstr "Dovresti riavviare Gajim perché alcuni cambiamenti abbiano effetto"
-
-#: gajim/data/gui/advanced_configuration_window.ui:84
-#, fuzzy
-msgid "_Filter"
-msgstr "_Filtro:"
-
-#: gajim/data/gui/advanced_configuration_window.ui:153
-#: gajim/data/gui/filetransfers_send_file_dialog.ui:15
-#: gajim/gtk/discovery.py:1666
-msgid "Description"
-msgstr "Descrizione"
-
-#: gajim/data/gui/advanced_configuration_window.ui:197
-msgid "_Reset to default"
-msgstr "_Reimposta ai colori predefiniti"
-
 #: gajim/data/gui/join_groupchat_window.ui:56
 #: gajim/data/gui/chat_to_muc_window.ui:67
 #: gajim/data/gui/chat_to_muc_window.ui:78
@@ -5657,8 +5818,8 @@ msgstr ""
 
 #: gajim/data/gui/join_groupchat_window.ui:113
 #, fuzzy
-msgid "Auto Join"
-msgstr "Unisciti _automaticamente"
+msgid "Join Automatically"
+msgstr "_Unisciti automaticamente"
 
 #: gajim/data/gui/join_groupchat_window.ui:131
 #: gajim/data/gui/profile_window.ui:233
@@ -5667,10 +5828,11 @@ msgstr "Account"
 
 #: gajim/data/gui/join_groupchat_window.ui:147
 #, fuzzy
-msgid "Room"
-msgstr "Stanza:"
+msgid "Group chat"
+msgstr "Conversazioni di gruppo"
 
-#: gajim/data/gui/join_groupchat_window.ui:180 gajim/gtk/accounts.py:886
+#: gajim/data/gui/join_groupchat_window.ui:180 gajim/data/gui/bookmarks.ui:158
+#: gajim/gtk/accounts.py:889
 #, fuzzy
 msgid "Password"
 msgstr "Password:"
@@ -5692,88 +5854,10 @@ msgstr "Conversazioni di gruppo utilizzate di recente"
 msgid "Search group chats on selected server"
 msgstr ""
 
-#: gajim/data/gui/join_groupchat_window.ui:437 gajim/gtk/discovery.py:1271
+#: gajim/data/gui/join_groupchat_window.ui:437 gajim/gtk/discovery.py:1270
 msgid "Join"
 msgstr "Entra"
 
-#: gajim/data/gui/manage_proxies_window.ui:12
-msgid "HTTP Connect"
-msgstr "Connessione HTTP"
-
-#: gajim/data/gui/manage_proxies_window.ui:15
-msgid "SOCKS5"
-msgstr "SOCKS5"
-
-#: gajim/data/gui/manage_proxies_window.ui:18
-msgid "BOSH"
-msgstr "BOSH"
-
-#: gajim/data/gui/manage_proxies_window.ui:27
-msgid "Manage Proxy Profiles"
-msgstr "Gestisci i profili proxy"
-
-#: gajim/data/gui/manage_proxies_window.ui:83
-#, fuzzy
-msgid "Add Proxy"
-msgstr "Proxy:"
-
-#: gajim/data/gui/manage_proxies_window.ui:97
-#, fuzzy
-msgid "Remove Proxy"
-msgstr "Elimina il gruppo"
-
-#: gajim/data/gui/manage_proxies_window.ui:141
-msgid "Properties"
-msgstr "Proprietà"
-
-#: gajim/data/gui/manage_proxies_window.ui:157
-#, fuzzy
-msgid "_Name"
-msgstr "_Nome:"
-
-#: gajim/data/gui/manage_proxies_window.ui:173
-#, fuzzy
-msgid "_Type"
-msgstr "_Tipo:"
-
-#: gajim/data/gui/manage_proxies_window.ui:236
-#, fuzzy
-msgid "_BOSH URL"
-msgstr "URL _BOSH:"
-
-#: gajim/data/gui/manage_proxies_window.ui:261
-msgid "Use HTTP prox_y"
-msgstr "Usa prox_y HTTP"
-
-#: gajim/data/gui/manage_proxies_window.ui:280
-#, fuzzy
-msgid "Proxy _Host"
-msgstr "_Host del proxy:"
-
-#: gajim/data/gui/manage_proxies_window.ui:307
-#, fuzzy
-msgid "Proxy _Port"
-msgstr "_Porta del proxy:"
-
-#: gajim/data/gui/manage_proxies_window.ui:334
-#, fuzzy
-msgid "_Username"
-msgstr "_Nome utente:"
-
-#: gajim/data/gui/manage_proxies_window.ui:347
-msgid "Use proxy auth_entication"
-msgstr "Usa l'aut_enticazione proxy"
-
-#: gajim/data/gui/manage_proxies_window.ui:377
-#, fuzzy
-msgid "Pass_word"
-msgstr "Pass_word:"
-
-#: gajim/data/gui/manage_proxies_window.ui:405 gajim/gtk/adhoc.py:321
-#, fuzzy
-msgid "Settings"
-msgstr "Scorciatoie da tastiera"
-
 #: gajim/data/gui/change_password_dialog.ui:17
 #, fuzzy
 msgid "New Password"
@@ -5804,11 +5888,13 @@ msgid "Status:"
 msgstr "Stato:"
 
 #: gajim/data/gui/zeroconf_information_window.ui:89
-msgid "_Log conversation history"
+#, fuzzy
+msgid "_Store conversation history"
 msgstr "_Memorizza la cronologia della conversazione"
 
 #: gajim/data/gui/zeroconf_information_window.ui:215
 #: gajim/data/gui/vcard_information_window.ui:390
+#: gajim/data/gui/groupchat_info_scrolled.ui:166
 msgid "Contact"
 msgstr "Contatto"
 
@@ -5821,8 +5907,9 @@ msgid "Last Name:"
 msgstr "Cognome:"
 
 #: gajim/data/gui/zeroconf_information_window.ui:260
-msgid "Jabber ID:"
-msgstr "ID Jabber: "
+#, fuzzy
+msgid "XMPP Address:"
+msgstr "Indirizzo AIM:"
 
 #: gajim/data/gui/zeroconf_information_window.ui:273
 msgid "E-Mail:"
@@ -5842,8 +5929,9 @@ msgid "Send _File"
 msgstr "Invia un _file"
 
 #: gajim/data/gui/gc_occupants_menu.ui:29
-msgid "Occupant Actions"
-msgstr "Azioni partecipante"
+#, fuzzy
+msgid "Participant Actions"
+msgstr "Partecipanti"
 
 #: gajim/data/gui/gc_occupants_menu.ui:38
 msgid "_Voice"
@@ -5874,8 +5962,9 @@ msgid "_Ban"
 msgstr "_Blocca"
 
 #: gajim/data/gui/gc_occupants_menu.ui:124
-msgid "_Add to Roster"
-msgstr "_Aggiungi all'elenco dei tuoi contatti"
+#, fuzzy
+msgid "_Add to Contact List"
+msgstr "Aggiungi un _contatto"
 
 #: gajim/data/gui/gc_occupants_menu.ui:132
 #, fuzzy
@@ -5913,11 +6002,6 @@ msgstr "Iscrizione:"
 msgid "_Status"
 msgstr "_Stato"
 
-#: gajim/data/gui/zeroconf_context_menu.ui:26
-#: gajim/data/gui/account_context_menu.ui:79
-msgid "_Modify Account..."
-msgstr "_Modifica l'account..."
-
 #: gajim/data/gui/certificate_dialog.ui:66
 #: gajim/data/gui/certificate_dialog.ui:178
 msgid "Common Name (CN)"
@@ -5999,13 +6083,19 @@ msgstr "Ultima modifica:"
 msgid "Next entry"
 msgstr "Voce successiva"
 
+#: gajim/data/gui/filetransfers_send_file_dialog.ui:15
+#: gajim/data/gui/advanced_configuration.ui:143
+#: gajim/data/gui/groupchat_info_scrolled.ui:48 gajim/gtk/discovery.py:1663
+msgid "Description"
+msgstr "Descrizione"
+
 #: gajim/data/gui/filetransfers_send_file_dialog.ui:54
 #, fuzzy
 msgid "_Send Files"
 msgstr "Invia un _file"
 
 #: gajim/data/gui/filetransfers_send_file_dialog.ui:58
-#: gajim/gtk/xml_console.py:90
+#: gajim/gtk/xml_console.py:87
 msgid "Send"
 msgstr "Invia"
 
@@ -6029,20 +6119,23 @@ msgid "Change _Nickname..."
 msgstr "Cambia il _soprannome..."
 
 #: gajim/data/gui/gc_control_popup_menu.ui:20
-msgid "_Manage Room"
-msgstr "_Gestisci la stanza"
+#, fuzzy
+msgid "_Manage Group Chat"
+msgstr "_Nuova conversazione di gruppo"
 
 #: gajim/data/gui/gc_control_popup_menu.ui:31
 msgid "Change _Subject..."
 msgstr "Cambia il _soggetto..."
 
 #: gajim/data/gui/gc_control_popup_menu.ui:38
-msgid "Configure _Room..."
-msgstr "Configura la _stanza..."
+#, fuzzy
+msgid "Configure _Group Chat..."
+msgstr "Entra in una conversazione di _gruppo..."
 
 #: gajim/data/gui/gc_control_popup_menu.ui:52
-msgid "_Destroy Room"
-msgstr "_Elimina la stanza"
+#, fuzzy
+msgid "_Destroy Group Chat"
+msgstr "_Nuova conversazione di gruppo"
 
 #: gajim/data/gui/gc_control_popup_menu.ui:64
 msgid "_Minimize on close"
@@ -6052,7 +6145,7 @@ msgstr "_Minimizza alla chiusura"
 msgid "_Request Voice"
 msgstr "_Richiedi la voce"
 
-#: gajim/data/gui/gc_control_popup_menu.ui:99 gajim/gtk/discovery.py:1704
+#: gajim/data/gui/gc_control_popup_menu.ui:99
 msgid "_Bookmark"
 msgstr "Aggiungi ai _segnalibri"
 
@@ -6100,13 +6193,6 @@ msgstr "Pagina iniziale"
 msgid "E-Mail"
 msgstr "E-mail:"
 
-#: 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/blocking_list.ui:115 gajim/gtk/add_contact.py:30
-#: gajim/gtk/accounts.py:801
-msgid "Jabber ID"
-msgstr "ID Jabber"
-
 #: gajim/data/gui/profile_window.ui:440
 msgid "Main"
 msgstr "Principale"
@@ -6231,35 +6317,44 @@ msgstr "Lavoro"
 msgid "About"
 msgstr "A riguardo"
 
-#: gajim/data/gui/start_chat_dialog.ui:114 gajim/gtk/discovery.py:1658
-msgid "Users"
-msgstr "Utenti"
+#: gajim/data/gui/start_chat_dialog.ui:53
+#, fuzzy
+msgid "Global Group Chat Search"
+msgstr "Unisciti alla conversazione di gruppo"
 
-#: gajim/data/gui/start_chat_dialog.ui:185
-msgid "Name:"
-msgstr "Nome:"
+#: 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
+msgid "_Back"
+msgstr "Torno presto"
 
-#: gajim/data/gui/start_chat_dialog.ui:197
-msgid "Description:"
-msgstr "Descrizione: "
+#: gajim/data/gui/start_chat_dialog.ui:245
+#: gajim/data/gui/groupchat_control.ui:796
+#: gajim/data/gui/groupchat_control.ui:888 gajim/gtk/discovery.py:1701
+#: gajim/gtk/groupchat_join.py:62
+msgid "_Join"
+msgstr "_Unisciti"
 
-#: gajim/data/gui/start_chat_dialog.ui:209
+#: gajim/data/gui/start_chat_dialog.ui:289
 #, fuzzy
-msgid "Address:"
-msgstr "_Indirizzo:"
+msgid "Select Account"
+msgstr "Eliminazione dell'account %s in corso"
 
-#: gajim/data/gui/start_chat_dialog.ui:246
-msgid ""
-"Semi-Anonymous\n"
-"<span size=\"small\">(Only moderators can see your XMPP-Address)</span>"
-msgstr ""
+#: gajim/data/gui/start_chat_dialog.ui:380
+#, fuzzy
+msgid "_Select"
+msgstr "Pulendo"
 
 #: gajim/data/gui/filetransfers.ui:21
 #, fuzzy
 msgid "Pa_use/Resume"
 msgstr "_Riprendi"
 
-#: gajim/data/gui/filetransfers.ui:30 gajim/gtk/filechoosers.py:178
+#: gajim/data/gui/filetransfers.ui:30 gajim/data/gui/groupchat_control.ui:575
+#: gajim/data/gui/groupchat_control.ui:667
+#: gajim/data/gui/groupchat_control.ui:779
+#: gajim/data/gui/groupchat_control.ui:871 gajim/gtk/filechoosers.py:178
 msgid "_Cancel"
 msgstr "_Annulla"
 
@@ -6302,7 +6397,8 @@ msgid "Cancel the selected file transfer and remove incomplete files"
 msgstr "Annulla il trasferimento file selezionato e rimuove il file incompleto"
 
 #: gajim/data/gui/filetransfers.ui:207
-msgid "Shows a list of file transfers between you and others"
+#, fuzzy
+msgid "Shows a list of file transfers between you and your contacts"
 msgstr "Mostra una lista dei trasferimenti di file"
 
 #: gajim/data/gui/groupchat_control.ui:13 gajim/data/gui/chat_control.ui:277
@@ -6322,7 +6418,6 @@ msgid "Strike"
 msgstr "Barra"
 
 #: gajim/data/gui/groupchat_control.ui:54 gajim/data/gui/chat_control.ui:318
-#: gajim/gtk/advanced_config.py:86
 msgid "Color"
 msgstr "Colore"
 
@@ -6335,15 +6430,46 @@ msgstr "Carattere"
 msgid "Clear formatting"
 msgstr "Pulisci la formattazione"
 
-#: gajim/data/gui/groupchat_control.ui:290 gajim/data/gui/chat_control.ui:880
+#: gajim/data/gui/groupchat_control.ui:291 gajim/data/gui/chat_control.ui:880
 #, fuzzy
 msgid "Choose encryption"
 msgstr "Scegli il certificato del client"
 
-#: gajim/data/gui/groupchat_control.ui:336 gajim/data/gui/chat_control.ui:640
+#: gajim/data/gui/groupchat_control.ui:337 gajim/data/gui/chat_control.ui:640
 msgid "Show a list of emojis (Alt+M)"
 msgstr "Mostra un elenco di emoji (Alt+M)"
 
+#: gajim/data/gui/groupchat_control.ui:484
+#, fuzzy
+msgid "Joining…"
+msgstr "Sto bloccando..."
+
+#: gajim/data/gui/groupchat_control.ui:496
+#, fuzzy
+msgid "_Abort"
+msgstr "_Informazioni"
+
+#: gajim/data/gui/groupchat_control.ui:542
+#, fuzzy
+msgid "Enter new nickname"
+msgstr "D_opo il soprannome:"
+
+#: gajim/data/gui/groupchat_control.ui:592
+#: gajim/data/gui/groupchat_control.ui:684
+#, fuzzy
+msgid "Ch_ange"
+msgstr "Cambia soprannome"
+
+#: gajim/data/gui/groupchat_control.ui:761
+#, fuzzy
+msgid "Enter password"
+msgstr "Inserisci la nuova password:"
+
+#: gajim/data/gui/groupchat_control.ui:1067
+#, fuzzy
+msgid "_Try again"
+msgstr "Verifica di nuovo..."
+
 #: gajim/data/gui/popup_notification_window.ui:42
 msgid "Event Type"
 msgstr "Tipo di evento"
@@ -6422,8 +6548,8 @@ msgstr "Sempre"
 
 #: gajim/data/gui/mam_preferences.ui:18
 #, fuzzy
-msgid "Roster"
-msgstr "Mostra l'elenco dei tuoi _contatti"
+msgid "Contact List"
+msgstr "Contatti"
 
 #: gajim/data/gui/mam_preferences.ui:22
 #: gajim/data/gui/preferences_window.ui:123
@@ -6447,11 +6573,11 @@ msgid "Add"
 msgstr "Aggiungi"
 
 #: gajim/data/gui/mam_preferences.ui:194 gajim/data/gui/groupchat_config.ui:151
-#: gajim/gtk/dialogs.py:63 gajim/gtk/accounts.py:381
+#: gajim/gtk/dialogs.py:62 gajim/gtk/accounts.py:384
 msgid "Remove"
 msgstr "Rimuovi"
 
-#: gajim/data/gui/vcard_information_window.ui:72 gajim/gtk/accounts.py:753
+#: gajim/data/gui/vcard_information_window.ui:72 gajim/gtk/accounts.py:756
 #, fuzzy
 msgid "Resource"
 msgstr "Risorsa:"
@@ -6500,6 +6626,7 @@ msgstr "Iscrizione"
 #: gajim/data/gui/vcard_information_window.ui:974
 #: gajim/data/gui/vcard_information_window.ui:993
 #: gajim/data/gui/vcard_information_window.ui:1427
+#: gajim/data/gui/groupchat_info_scrolled.ui:222
 msgid "button"
 msgstr ""
 
@@ -6528,16 +6655,19 @@ msgid "Notify me about it"
 msgstr "Inviami una notifica"
 
 #: gajim/data/gui/preferences_window.ui:58
-msgid "Show only in roster"
-msgstr "Mostra solo nell'elenco dei tuoi contatti"
+#, fuzzy
+msgid "Show only in contact list"
+msgstr "Mostra solo i contatti attivi"
 
 #: gajim/data/gui/preferences_window.ui:69
-msgid "Detached roster with detached chats"
+#, fuzzy
+msgid "Detached contact list with detached chats"
 msgstr ""
 "Elenco dei tuoi contatti separato con finestre di conversazione separate"
 
 #: gajim/data/gui/preferences_window.ui:72
-msgid "Detached roster with single chat"
+#, fuzzy
+msgid "Detached contact list with single chat"
 msgstr ""
 "Elenco dei tuoi contatti separato con una finestra di conversazione unica"
 
@@ -6546,13 +6676,15 @@ msgid "Single window for everything"
 msgstr "Una finestra unica per tutto"
 
 #: gajim/data/gui/preferences_window.ui:78
-msgid "Detached roster with chat grouped by account"
+#, fuzzy
+msgid "Detached contact list with chat grouped by account"
 msgstr ""
 "Elenco dei tuoi contatti separato con le finestre di conversazione "
 "raggruppate per account"
 
 #: gajim/data/gui/preferences_window.ui:81
-msgid "Detached roster with chat grouped by type"
+#, fuzzy
+msgid "Detached contact list with chat grouped by type"
 msgstr ""
 "Elenco dei tuoi contatti separato con finestre di conversazione raggruppate "
 "per tipo"
@@ -6605,7 +6737,7 @@ msgstr "Comportamento della _finestra:"
 
 #: gajim/data/gui/preferences_window.ui:296
 #, fuzzy
-msgid "_Show roster on startup"
+msgid "_Show contact list on startup"
 msgstr "Mo_stra l'elenco dei tuoi contatti all'avvio di Gajim:"
 
 #: gajim/data/gui/preferences_window.ui:311
@@ -6621,12 +6753,12 @@ msgid "_Tabs placement"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:363
-msgid "_Quit Gajim when closing roster window"
+msgid "_Quit Gajim when closing contact list"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:367
 msgid ""
-"If enabled, Gajim will quit when closing the roster window instead of "
+"If enabled, Gajim will quit when closing the contact list window instead of "
 "minimizing to the system's notification area"
 msgstr ""
 
@@ -6635,42 +6767,45 @@ msgid "Behavior of Windows and Tabs"
 msgstr "Comportamento di finestre e schede"
 
 #: gajim/data/gui/preferences_window.ui:423
-msgid "Show a_vatars of contacts in roster"
+#, fuzzy
+msgid "Show a_vatars of contacts in contact list"
 msgstr "Mostra gli a_vatar dei contatti nell'elenco dei tuoi contatti"
 
 #: gajim/data/gui/preferences_window.ui:427
 #, fuzzy
 msgid ""
-"If checked, avatars of contacts will be shown in the roster window and in "
-"group chats"
+"If checked, avatars of contacts will be shown in the contact list window and "
+"in group chats"
 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
-msgid "Show status _messages of contacts in roster"
+#, 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
 #, fuzzy
 msgid ""
 "If checked, status messages of contacts will be shown under the contact's "
-"name, in the roster window, and in group chats"
+"name, in the contact list window, and in group chats"
 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
 #, fuzzy
-msgid "Show e_xtra information of contacts in roster (mood, activity, ...)"
+msgid ""
+"Show e_xtra information of contacts in contact list (mood, activity, ...)"
 msgstr ""
 "Mostra informazioni ag_giuntive dei contatti nell'elenco dei tuoi contatti "
 "(stato d'animo, attività, ...)"
 
 #: gajim/data/gui/preferences_window.ui:463
 msgid ""
-"If checked, additional info published by the contact will be shown in "
-"roster. Additional infos (published via PEP) may include e.g. mood, "
+"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 ""
 
@@ -6679,16 +6814,18 @@ msgid "Sort contacts by status"
 msgstr "Ordina i contatti per stato"
 
 #: gajim/data/gui/preferences_window.ui:494
-msgid "in _roster"
-msgstr "nell'elenco dei tuoi _contatti"
+#, fuzzy
+msgid "in _contact list"
+msgstr "Contatti inviati:"
 
 #: gajim/data/gui/preferences_window.ui:511
 msgid "in _group chats"
 msgstr "nelle conversazioni di _gruppo"
 
 #: gajim/data/gui/preferences_window.ui:540
-msgid "Roster Appearance"
-msgstr "Aspetto dell'elenco dei tuoi contatti"
+#, fuzzy
+msgid "Contact List Appearance"
+msgstr "Scambio degli elementi nell'elenco dei tuoi contatti"
 
 #: gajim/data/gui/preferences_window.ui:585
 #, fuzzy
@@ -6756,7 +6893,7 @@ msgstr "Non è possibile entrare nella stanza"
 
 #: gajim/data/gui/preferences_window.ui:660
 #, fuzzy
-msgid "If checked, the room subject will be shown when joining a group chat"
+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:682
@@ -6770,13 +6907,13 @@ msgstr ""
 #: gajim/data/gui/preferences_window.ui:701
 msgid ""
 "If join/leave status messages are shown in the group chat. This setting can "
-"be overridden in the groupchat menu."
+"be overridden in the group chat menu."
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:720
 msgid ""
 "The default sync threshold for new public group chats. This setting can be "
-"overridden in the groupchat menu."
+"overridden in the group chat menu."
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:722
@@ -6791,7 +6928,7 @@ msgstr "_Mostra i cambiamenti di stato"
 #: gajim/data/gui/preferences_window.ui:768
 msgid ""
 "If status change messages are shown in the group chat. This setting can be "
-"overridden in the groupchat menu."
+"overridden in the group chat menu."
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:825
@@ -6809,8 +6946,8 @@ msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:843
 #, fuzzy
-msgid "Show chatstate in roster"
-msgstr "Mostra gli a_vatar dei contatti nell'elenco dei tuoi contatti"
+msgid "Show chatstate in contact list"
+msgstr "Mostrare il pulsante \"chiudi\" nelle schede?"
 
 #: gajim/data/gui/preferences_window.ui:847
 msgid ""
@@ -7126,7 +7263,7 @@ msgstr "Dimensioni del video"
 msgid "Vi_ew own video source"
 msgstr "Visualizzare la propria sorgente video"
 
-#: gajim/data/gui/preferences_window.ui:2281 gajim/gtk/accounts.py:352
+#: gajim/data/gui/preferences_window.ui:2281 gajim/gtk/accounts.py:355
 msgid "Connection"
 msgstr "Connessione"
 
@@ -7184,7 +7321,8 @@ msgid "_Manage..."
 msgstr "_Gestisci..."
 
 #: gajim/data/gui/preferences_window.ui:2616
-msgid "_Log status changes of contacts"
+#, fuzzy
+msgid "_Store status changes of contacts in history"
 msgstr "_Registra i cambiamenti di stato dei contatti"
 
 #: gajim/data/gui/preferences_window.ui:2633
@@ -7208,9 +7346,15 @@ msgstr ""
 msgid "_Open..."
 msgstr "_Apri..."
 
+#: gajim/data/gui/preferences_window.ui:2723 gajim/gtk/advanced_config.py:84
+#, fuzzy
+msgid "Advanced Configuration Editor (ACE)"
+msgstr "Editor di configurazione avanzata"
+
 #: gajim/data/gui/groupchat_config.ui:55
+#, fuzzy
 msgid ""
-"<b>Jabber-ID</b>\n"
+"<b>XMPP Address</b>\n"
 "&lt;user@domain/resource&gt; (only that resource matches)\n"
 "&lt;user@domain&gt; (any resource matches)\n"
 "&lt;domain/resource&gt; (only that resource matches)\n"
@@ -7231,7 +7375,8 @@ msgstr ""
 msgid "Only Admins and Owners can modify the affiliation"
 msgstr ""
 
-#: gajim/data/gui/groupchat_config.ui:270 gajim/plugins/gui.py:312
+#: gajim/data/gui/groupchat_config.ui:270
+#: gajim/data/gui/groupchat_info_scrolled.ui:210 gajim/plugins/gui.py:324
 msgid "Configuration"
 msgstr "Configurazione"
 
@@ -7263,7 +7408,7 @@ msgid "Start _Chat"
 msgstr "Inizia una _conversazione"
 
 #: gajim/data/gui/contact_context_menu.ui:20
-#: gajim/data/gui/systray_context_menu.ui:36
+#: gajim/data/gui/systray_context_menu.ui:29
 msgid "Send Single _Message..."
 msgstr "Invia un _messaggio singolo..."
 
@@ -7320,17 +7465,42 @@ msgid "_Ignore"
 msgstr "_Ignora"
 
 #: gajim/data/gui/contact_context_menu.ui:174
-msgid "_Add to Roster..."
-msgstr "_Aggiungi all'elenco dei tuoi contatti..."
+#, fuzzy
+msgid "_Add to Contact List..."
+msgstr "_Aggiungi un contatto..."
+
+#: gajim/data/gui/advanced_configuration.ui:39
+msgid "You should restart Gajim for some changes to take effect"
+msgstr "Dovresti riavviare Gajim perché alcuni cambiamenti abbiano effetto"
+
+#: gajim/data/gui/advanced_configuration.ui:71
+#, fuzzy
+msgid "_Filter"
+msgstr "_Filtro:"
+
+#: gajim/data/gui/advanced_configuration.ui:88
+msgid "Type to search for values..."
+msgstr ""
+
+#: gajim/data/gui/advanced_configuration.ui:180
+#, fuzzy
+msgid "_Reset Value"
+msgstr "_Reimposta ai colori predefiniti"
+
+#: gajim/data/gui/advanced_configuration.ui:185
+#, fuzzy
+msgid "Resets value to default"
+msgstr "_Reimposta ai colori predefiniti"
 
 #: gajim/data/gui/account_creation_wizard_window.ui:43
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim: Assistente alla creazione di un account"
 
 #: gajim/data/gui/account_creation_wizard_window.ui:70
+#, fuzzy
 msgid ""
 "You need to have an account in order to connect\n"
-"to the Jabber network."
+"to the XMPP network."
 msgstr ""
 "È necessario avere un account per connettersi\n"
 "alla rete Jabber."
@@ -7352,8 +7522,9 @@ msgid "<b>Please fill in the data for your existing account</b>"
 msgstr "<b>Per piacere, inserisci i dati per l'account esistente</b>"
 
 #: gajim/data/gui/account_creation_wizard_window.ui:187
-msgid "_Jabber ID:"
-msgstr "ID _Jabber:"
+#, fuzzy
+msgid "_XMPP Address:"
+msgstr "Indirizzo AIM:"
 
 #: gajim/data/gui/account_creation_wizard_window.ui:239
 #: gajim/data/gui/account_creation_wizard_window.ui:394
@@ -7440,6 +7611,7 @@ msgid "Privacy Lists:"
 msgstr "Elenchi della privacy:"
 
 #: gajim/data/gui/service_discovery_window.ui:111
+#: gajim/data/gui/groupchat_creation.ui:227
 #, fuzzy
 msgid "_Address"
 msgstr "_Indirizzo:"
@@ -7457,11 +7629,6 @@ msgstr "Sincronizzazione: scegli i contatti"
 msgid "Select the contacts you want to synchronise"
 msgstr "Seleziona i contatti che vuoi sincronizzare"
 
-#: gajim/data/gui/groupchat_invitation_received.ui:42
-#, fuzzy
-msgid "Group Chat Invitation"
-msgstr "Invito in una conversazione di gruppo"
-
 #: gajim/data/gui/groupchat_invitation_received.ui:111
 #, fuzzy
 msgid "Message..."
@@ -7513,11 +7680,10 @@ msgstr "<b><big>Chiamata in arrivo</big></b>"
 
 #: gajim/data/gui/add_new_contact_window.ui:84
 #, fuzzy
-msgid "_Jabber ID"
-msgstr "ID _Jabber:"
+msgid "_XMPP Address"
+msgstr "_Indirizzo:"
 
 #: gajim/data/gui/add_new_contact_window.ui:100
-#: gajim/data/gui/manage_bookmarks_window.ui:192
 #, fuzzy
 msgid "_Nickname"
 msgstr "_Soprannome:"
@@ -7592,7 +7758,7 @@ msgstr "<b>Stato d'animo:</b>"
 msgid "<b>Message:</b>"
 msgstr "<b>Messaggio:</b>"
 
-#: gajim/data/gui/plugins_window.ui:10 gajim/data/gui/application_menu.ui:90
+#: gajim/data/gui/plugins_window.ui:10 gajim/data/gui/application_menu.ui:87
 msgid "Plugins"
 msgstr "Plugin"
 
@@ -7700,10 +7866,6 @@ msgstr "Permetti"
 msgid "Deny"
 msgstr "Nega"
 
-#: gajim/data/gui/privacy_list_window.ui:317
-msgid "JabberID"
-msgstr "ID Jabber"
-
 #: gajim/data/gui/privacy_list_window.ui:358
 msgid "all in the group"
 msgstr "tutti nel gruppo"
@@ -7744,7 +7906,7 @@ msgstr "Ordine:"
 msgid "Manage sounds"
 msgstr "Gestisci i suoni"
 
-#: gajim/data/gui/manage_sounds_window.ui:55 gajim/plugins/gui.py:100
+#: gajim/data/gui/manage_sounds_window.ui:55 gajim/plugins/gui.py:101
 msgid "Active"
 msgstr "Attivo"
 
@@ -7782,31 +7944,122 @@ msgstr "Rimuovi l'account da Gajim e dal _server"
 msgid "_Personal Events"
 msgstr "Eventi _personali"
 
-#: gajim/data/gui/account_context_menu.ui:35
-#: gajim/data/gui/systray_context_menu.ui:28
-msgid "Join _Group Chat"
-msgstr "Entra in una conversazione di _gruppo"
-
-#: gajim/data/gui/account_context_menu.ui:49
+#: gajim/data/gui/account_context_menu.ui:41
 msgid "_Add Contact..."
 msgstr "_Aggiungi un contatto..."
 
-#: gajim/data/gui/account_context_menu.ui:57
+#: gajim/data/gui/account_context_menu.ui:49
 msgid "_Discover Services"
 msgstr "_Ricerca dei servizi"
 
-#: gajim/data/gui/account_context_menu.ui:65
+#: gajim/data/gui/account_context_menu.ui:57
 msgid "_Execute Command..."
 msgstr "_Esegui un comando..."
 
+#: gajim/data/gui/account_context_menu.ui:65
+#, fuzzy
+msgid "_View Certificate"
+msgstr "Visualizza il certificato..."
+
+#: gajim/data/gui/manage_proxies.ui:12
+#, fuzzy
+msgctxt "proxy configuration"
+msgid "HTTP Connect"
+msgstr "Connessione HTTP"
+
+#: gajim/data/gui/manage_proxies.ui:15
+#, fuzzy
+msgctxt "proxy configuration"
+msgid "SOCKS5"
+msgstr "SOCKS5"
+
+#: gajim/data/gui/manage_proxies.ui:18
+#, fuzzy
+msgctxt "proxy configuration"
+msgid "BOSH"
+msgstr "BOSH"
+
+#: gajim/data/gui/manage_proxies.ui:68
+#, fuzzy
+msgid "Add Proxy"
+msgstr "Proxy:"
+
+#: gajim/data/gui/manage_proxies.ui:82
+#, fuzzy
+msgid "Remove Proxy"
+msgstr "Elimina il gruppo"
+
+#: gajim/data/gui/manage_proxies.ui:134
+#, fuzzy
+msgid "Pass_word"
+msgstr "Pass_word:"
+
+#: gajim/data/gui/manage_proxies.ui:159
+msgid "Use proxy auth_entication"
+msgstr "Usa l'aut_enticazione proxy"
+
+#: gajim/data/gui/manage_proxies.ui:179
+#, fuzzy
+msgid "_Username"
+msgstr "_Nome utente:"
+
+#: gajim/data/gui/manage_proxies.ui:209
+#, fuzzy
+msgid "_Port"
+msgstr "_Porta:"
+
+#: gajim/data/gui/manage_proxies.ui:226
+#, fuzzy
+msgid "example.org"
+msgstr "utente@esempio.org"
+
+#: gajim/data/gui/manage_proxies.ui:240
+#, fuzzy
+msgid "_Host"
+msgstr "_Host:"
+
+#: gajim/data/gui/manage_proxies.ui:254
+msgid "Use HTTP prox_y"
+msgstr "Usa prox_y HTTP"
+
+#: gajim/data/gui/manage_proxies.ui:275
+msgid "https://example.org/http-bind/"
+msgstr ""
+
+#: gajim/data/gui/manage_proxies.ui:291
+#, fuzzy
+msgid "_BOSH URL"
+msgstr "URL _BOSH:"
+
+#: gajim/data/gui/manage_proxies.ui:309 gajim/gtk/adhoc.py:322
+#, fuzzy
+msgid "Settings"
+msgstr "Scorciatoie da tastiera"
+
+#: gajim/data/gui/manage_proxies.ui:344
+#, fuzzy
+msgid "_Type"
+msgstr "_Tipo:"
+
+#: gajim/data/gui/manage_proxies.ui:361
+#: gajim/data/gui/groupchat_creation.ui:105
+#, fuzzy
+msgid "_Name"
+msgstr "_Nome:"
+
+#: gajim/data/gui/manage_proxies.ui:391 gajim/gtk/accounts.py:742
+#, fuzzy
+msgid "Proxy"
+msgstr "Proxy:"
+
 #: gajim/data/gui/application_menu.ui:8
 msgid "View"
 msgstr "Visualizza"
 
 #: gajim/data/gui/application_menu.ui:11
 #, fuzzy
-msgid "Show Roster"
-msgstr "Mostra l'elenco dei tuoi _contatti"
+msgid "Show Contact List"
+msgstr "Mostra i contatti attivi"
 
 #: gajim/data/gui/application_menu.ui:16
 msgid "Show Offline Contacts"
@@ -7844,23 +8097,24 @@ msgstr "Scorciatoie da tastiera"
 msgid "Features"
 msgstr "Funzionalità"
 
-#: gajim/data/gui/application_menu.ui:81
+#: gajim/data/gui/application_menu.ui:77
+#: gajim/data/gui/groupchat_creation.ui:81 gajim/gtk/groupchat_creation.py:45
 #, fuzzy
-msgid "Bookmarks"
-msgstr "Aggiungi ai _segnalibri"
+msgid "Create Group Chat"
+msgstr "Esci dalle conversazioni di gruppo"
 
-#: gajim/data/gui/application_menu.ui:94 gajim/data/gui/shortcuts_window.ui:189
-#: gajim/gtk/preferences.py:59
+#: gajim/data/gui/application_menu.ui:91 gajim/data/gui/shortcuts_window.ui:189
+#: gajim/gtk/preferences.py:58
 msgid "Preferences"
 msgstr "Preferenze"
 
-#: gajim/data/gui/application_menu.ui:99
+#: gajim/data/gui/application_menu.ui:96
 #, fuzzy
 msgid "Quit"
 msgstr "_Esci"
 
 #: gajim/data/gui/httpupload_progress_dialog.ui:110
-#: gajim/gtk/filetransfer.py:121
+#: gajim/gtk/filetransfer.py:120
 msgid "Progress"
 msgstr "Progresso"
 
@@ -7878,53 +8132,33 @@ msgstr ""
 msgid "_Cancel Upload"
 msgstr "_Annulla"
 
-#: gajim/data/gui/manage_bookmarks_window.ui:13
-#, fuzzy
-msgid "Group Chat Bookmarks"
-msgstr "Conversazione di gruppo"
-
-#: gajim/data/gui/manage_bookmarks_window.ui:68
-#, fuzzy
-msgid "Add Bookmark"
-msgstr "Aggiungi ai _segnalibri"
-
-#: gajim/data/gui/manage_bookmarks_window.ui:82
-#, fuzzy
-msgid "Remove Bookmark"
-msgstr "Aggiungi ai _segnalibri"
-
-#: gajim/data/gui/manage_bookmarks_window.ui:126
-msgid "N_ame"
-msgstr "N_ome"
+#: gajim/data/gui/groupchat_creation.ui:27
+msgid "Public or Private?"
+msgstr ""
 
-#: gajim/data/gui/manage_bookmarks_window.ui:145
-#, fuzzy
-msgid "Bookmark Name"
-msgstr "Aggiungi stanza ai segnalibri"
+#: 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 ""
 
-#: gajim/data/gui/manage_bookmarks_window.ui:160
-#, fuzzy
-msgid "_Server"
-msgstr "_Server:"
+#: gajim/data/gui/groupchat_creation.ui:58
+msgid "<b>Public:</b> Anyone who knows the address can join."
+msgstr ""
 
-#: gajim/data/gui/manage_bookmarks_window.ui:223
+#: gajim/data/gui/groupchat_creation.ui:122
 #, fuzzy
-msgid "Roo_m"
-msgstr "Stanza:"
+msgid "_Description"
+msgstr "Descrizione"
 
-#: gajim/data/gui/manage_bookmarks_window.ui:253
-#, fuzzy
-msgid "_Password"
-msgstr "_Password:"
+#: gajim/data/gui/groupchat_creation.ui:164
+msgid "_Public"
+msgstr ""
 
-#: gajim/data/gui/manage_bookmarks_window.ui:299
+#: gajim/data/gui/groupchat_creation.ui:278
 #, fuzzy
-msgid "Join chat when connected"
-msgstr "Contatto disconnesso"
-
-#: gajim/data/gui/manage_bookmarks_window.ui:307
-msgid "_Join Automatically"
-msgstr "_Unisciti automaticamente"
+msgid "_Account"
+msgstr "_Account"
 
 #: gajim/data/gui/exception_dialog.ui:49
 msgid "Sorry, that should not have happened"
@@ -7968,6 +8202,29 @@ msgstr "Autorizza il contatto affinché sappia quando sei connesso"
 msgid "Presets"
 msgstr "_Presenza"
 
+#: gajim/data/gui/groupchat_info_scrolled.ui:32
+#, fuzzy
+msgid "Address"
+msgstr "_Indirizzo:"
+
+#: gajim/data/gui/groupchat_info_scrolled.ui:64
+msgid "Topic"
+msgstr ""
+
+#: gajim/data/gui/groupchat_info_scrolled.ui:80
+#, fuzzy
+msgid "Author"
+msgstr "Autori:"
+
+#: gajim/data/gui/groupchat_info_scrolled.ui:182
+msgid "Discussion Logs"
+msgstr ""
+
+#: gajim/data/gui/groupchat_info_scrolled.ui:260
+#, fuzzy
+msgid "Group Chat Language"
+msgstr "Invito in una conversazione di gruppo"
+
 #: gajim/data/gui/emoji_chooser.ui:98
 #, fuzzy
 msgid "No Results Found"
@@ -7980,24 +8237,35 @@ msgstr "Invita degli amici!"
 #: gajim/data/gui/chat_to_muc_window.ui:39
 #, fuzzy
 msgid ""
-"You are now entering a groupchat.\n"
+"You are now entering a group chat.\n"
 "Select the contacts you want to invite"
 msgstr ""
 "Stai per iniziare una conversazione di gruppo.\n"
 "Scegli i contatti che vuoi invitare"
 
 #: gajim/data/gui/chat_to_muc_window.ui:112
-msgid "Please select a MUC server."
+#, fuzzy
+msgid "Please select a group chat server."
 msgstr "Selezionare un server MUC."
 
 #: gajim/data/gui/chat_to_muc_window.ui:141
-msgid "MUC server"
-msgstr "Server MUC"
+#, fuzzy
+msgid "Group chat server"
+msgstr "Supporto per le conversazioni di gruppo"
 
 #: gajim/data/gui/chat_to_muc_window.ui:176
 msgid "In_vite"
 msgstr "In_vita"
 
+#: gajim/data/gui/bookmarks.ui:176
+#, fuzzy
+msgid "Autojoin"
+msgstr "Unisciti _automaticamente"
+
+#: gajim/data/gui/bookmarks.ui:211
+msgid "_Apply"
+msgstr ""
+
 #: gajim/data/gui/history_manager.ui:11
 #, fuzzy
 msgid "_Export"
@@ -8013,12 +8281,13 @@ msgid "Gajim History Logs Manager"
 msgstr "Gestore delle cronologie di Gajim"
 
 #: gajim/data/gui/history_manager.ui:108
+#, fuzzy
 msgid ""
-"This log manager is not intended for log viewing. If you are looking for "
-"such functionality, use the history window instead.\n"
+"This history manager is not intended for viewing chat history. If you are "
+"looking for such functionality, please use the history window instead.\n"
 "\n"
-"Use this program to delete or export logs. You can select logs from the left "
-"and/or search database from below."
+"You can use this program to delete or export history. Either select logs "
+"from the left or search the database."
 msgstr ""
 "Non è previsto usare questo gestore della cronologia per visualizzare dei "
 "file di registro. Se si desidera tale funzionalità, usare invece la finestra "
@@ -8073,7 +8342,8 @@ msgid "Select an emoji"
 msgstr "_Usa delle emoticon"
 
 #: gajim/data/gui/shortcuts_window.ui:38
-msgid "Complete a command or a nick"
+#, fuzzy
+msgid "Complete a command or a nickname"
 msgstr "Completa un comando o un soprannome"
 
 #: gajim/data/gui/shortcuts_window.ui:45
@@ -8114,7 +8384,7 @@ msgstr ""
 msgid "Scroll down"
 msgstr ""
 
-#: gajim/data/gui/shortcuts_window.ui:100 gajim/gtk/xml_console.py:72
+#: gajim/data/gui/shortcuts_window.ui:100 gajim/gtk/xml_console.py:69
 #, fuzzy
 msgid "Clear"
 msgstr "Pulendo"
@@ -8157,7 +8427,7 @@ msgstr "Chiudi la chat"
 
 #: gajim/data/gui/shortcuts_window.ui:173
 #, fuzzy
-msgid "Roster Shortcuts"
+msgid "Contact List Shortcuts"
 msgstr "Scorciatoie da tastiera"
 
 #: gajim/data/gui/shortcuts_window.ui:196
@@ -8187,7 +8457,7 @@ msgid "Show only active contacts"
 msgstr "Mostra solo i contatti attivi"
 
 #: gajim/data/gui/shortcuts_window.ui:251
-msgid "Enable roster filtering"
+msgid "Enable contact list filtering"
 msgstr ""
 
 #: gajim/data/gui/shortcuts_window.ui:259
@@ -8234,12 +8504,12 @@ msgstr "Ricerca nel solo giorno selezionato"
 
 #: gajim/data/gui/history_window.ui:317
 #, fuzzy
-msgid "Record history for this chat"
+msgid "Store history for this chat"
 msgstr "Ignora questo errore per questo certificato"
 
 #: gajim/data/gui/history_window.ui:332
 #, fuzzy
-msgid "Record History"
+msgid "Store History"
 msgstr "Cronologia dei registri"
 
 #: gajim/data/gui/history_window.ui:350
@@ -8259,9 +8529,10 @@ msgstr "Crea un nuovo post"
 msgid "Fill in the form."
 msgstr "Completa il modulo."
 
-#: gajim/data/gui/data_form_window.ui:229
-msgid "Room Configuration"
-msgstr "Configurazione della stanza"
+#: gajim/data/gui/data_form_window.ui:229 gajim/gtk/groupchat_config.py:41
+#, fuzzy
+msgid "Group Chat Configuration"
+msgstr "Invito in una conversazione di gruppo"
 
 #: gajim/data/gui/roster_item_exchange_window.ui:39
 #: gajim/gtk/roster_item_exchange.py:35
@@ -8282,15 +8553,15 @@ msgstr "Sta_to"
 msgid "_Start Chat..."
 msgstr "_Inizia una conversazione..."
 
-#: gajim/data/gui/systray_context_menu.ui:50
+#: gajim/data/gui/systray_context_menu.ui:43
 msgid "Show All Pending _Events"
 msgstr "Mostra tutti gli _eventi in attesa"
 
-#: gajim/data/gui/systray_context_menu.ui:59
+#: gajim/data/gui/systray_context_menu.ui:52
 msgid "Mute Sounds"
 msgstr "Disabilita i suoni"
 
-#: gajim/data/gui/systray_context_menu.ui:75
+#: gajim/data/gui/systray_context_menu.ui:68
 #, fuzzy
 msgid "_Preferences"
 msgstr "Preferenze"
@@ -8381,35 +8652,35 @@ msgstr "Esegui l'espressione in una shell, mostra l'output"
 msgid "Execute expression inside a shell, send output"
 msgstr "Esegui l'espressione in una shell, invia l'output"
 
-#: gajim/command_system/implementation/standard.py:45
+#: gajim/command_system/implementation/standard.py:47
 msgid ""
 "Show help on a given command or a list of available commands if -a is given"
 msgstr ""
 "Mostra l'aiuto per un dato comando o un elenco di comandi disponibili se "
 "viene specificato -a"
 
-#: gajim/command_system/implementation/standard.py:73
+#: gajim/command_system/implementation/standard.py:75
 msgid "Send a message to the contact"
 msgstr "Invia un messaggio al contatto"
 
-#: gajim/command_system/implementation/standard.py:78
+#: gajim/command_system/implementation/standard.py:80
 msgid "Send action (in the third person) to the current chat"
 msgstr "Invia azione (in terza persona) alla conversazione corrente"
 
-#: gajim/command_system/implementation/standard.py:83
+#: gajim/command_system/implementation/standard.py:85
 msgid "Show logged messages which mention given text"
 msgstr "Mostra messaggi registrati che contengono il testo specificato"
 
-#: gajim/command_system/implementation/standard.py:88
+#: gajim/command_system/implementation/standard.py:90
 #, python-format
 msgid "%s: Nothing found"
 msgstr "%s: Nessun risultato trovato"
 
-#: gajim/command_system/implementation/standard.py:94
+#: gajim/command_system/implementation/standard.py:96
 msgid "Limit must be an integer"
 msgstr "Il limite deve essere un intero"
 
-#: gajim/command_system/implementation/standard.py:118
+#: gajim/command_system/implementation/standard.py:120
 msgid ""
 "\n"
 "    Set the current status\n"
@@ -8425,122 +8696,131 @@ msgstr ""
 "    online, away, chat, xa, dnd.\n"
 "    "
 
-#: gajim/command_system/implementation/standard.py:136
+#: gajim/command_system/implementation/standard.py:138
 msgid "Set the current status to away"
 msgstr "Imposta lo stato corrente come assente"
 
-#: gajim/command_system/implementation/standard.py:150
+#: gajim/command_system/implementation/standard.py:152
 msgid "Set the current status to online"
 msgstr "Imposta lo stato corrente come in linea"
 
-#: gajim/command_system/implementation/standard.py:153
+#: gajim/command_system/implementation/standard.py:155
 msgid "Available"
 msgstr "Disponibile"
 
-#: gajim/command_system/implementation/standard.py:173
-#: gajim/command_system/implementation/standard.py:250
+#: gajim/command_system/implementation/standard.py:175
+#: gajim/command_system/implementation/standard.py:252
 msgid "Clear the text window"
 msgstr "Pulisci la finestra del testo"
 
-#: gajim/command_system/implementation/standard.py:178
-#: gajim/command_system/implementation/standard.py:397
+#: gajim/command_system/implementation/standard.py:180
+#: gajim/command_system/implementation/standard.py:401
 msgid "Send a ping to the contact"
 msgstr "Invia un ping al contatto"
 
-#: gajim/command_system/implementation/standard.py:181
-#: gajim/command_system/implementation/standard.py:400
+#: gajim/command_system/implementation/standard.py:183
+#: gajim/command_system/implementation/standard.py:404
 msgid "Command is not supported for zeroconf accounts"
 msgstr "Il comando non è supportato per contatti zeroconf"
 
-#: gajim/command_system/implementation/standard.py:185
-msgid "Send DTMF sequence through an open audio session"
+#: gajim/command_system/implementation/standard.py:187
+#, fuzzy
+msgid "Send DTMF sequence through an open voice chat"
 msgstr "Invia una sequenza DTMF attraverso una sessione audio aperta"
 
-#: gajim/command_system/implementation/standard.py:188
-msgid "No open audio sessions with the contact"
+#: gajim/command_system/implementation/standard.py:190
+#, fuzzy
+msgid "No open voice chats with the contact"
 msgstr "Nessuna sessione audio con il contatto"
 
-#: gajim/command_system/implementation/standard.py:191
+#: gajim/command_system/implementation/standard.py:193
 #, python-format
 msgid "%s is not a valid tone"
 msgstr "%s non è un tono valido"
 
-#: gajim/command_system/implementation/standard.py:198
-msgid "Toggle audio session"
-msgstr "Attiva sessione audio"
+#: gajim/command_system/implementation/standard.py:200
+msgid "Toggle Voice Chat"
+msgstr ""
 
-#: gajim/command_system/implementation/standard.py:201
-msgid "Audio sessions are not available"
-msgstr "Le sessioni audio non sono disponibili"
+#: gajim/command_system/implementation/standard.py:203
+#, fuzzy
+msgid "Voice chats are not available"
+msgstr "Le sessioni video non sono disponibili"
 
-#: gajim/command_system/implementation/standard.py:208
-msgid "Toggle video session"
+#: gajim/command_system/implementation/standard.py:210
+#, fuzzy
+msgid "Toggle Video Chat"
 msgstr "Attiva sessione video"
 
-#: gajim/command_system/implementation/standard.py:211
-msgid "Video sessions are not available"
+#: gajim/command_system/implementation/standard.py:213
+#, fuzzy
+msgid "Video chats are not available"
 msgstr "Le sessioni video non sono disponibili"
 
-#: gajim/command_system/implementation/standard.py:218
+#: gajim/command_system/implementation/standard.py:220
 #, fuzzy
 msgid "Send a message to the contact that will attract their attention"
 msgstr "Invia un messaggio al contatto per attirare la sua attenzione"
 
-#: gajim/command_system/implementation/standard.py:255
+#: gajim/command_system/implementation/standard.py:257
 msgid "Change your nickname in a group chat"
 msgstr "Cambia il tuo soprannome in una conversazione di gruppo"
 
-#: gajim/command_system/implementation/standard.py:260 gajim/gtk/dialogs.py:674
-#: gajim/gtk/bookmarks.py:272
+#: gajim/command_system/implementation/standard.py:262
 msgid "Invalid nickname"
 msgstr "Soprannome non valido"
 
-#: gajim/command_system/implementation/standard.py:267
-msgid "Open a private chat window with a specified occupant"
+#: gajim/command_system/implementation/standard.py:269
+#, fuzzy
+msgid "Open a private chat window with a specified participant"
 msgstr ""
 "Apri una finestra di conversazione privata con un partecipante specificato"
 
-#: gajim/command_system/implementation/standard.py:273
-#: gajim/command_system/implementation/standard.py:282
-#: gajim/command_system/implementation/standard.py:332
-#: gajim/command_system/implementation/standard.py:345
-#: gajim/command_system/implementation/standard.py:357
+#: gajim/command_system/implementation/standard.py:275
+#: gajim/command_system/implementation/standard.py:284
+#: gajim/command_system/implementation/standard.py:336
+#: gajim/command_system/implementation/standard.py:349
+#: gajim/command_system/implementation/standard.py:361
 msgid "Nickname not found"
 msgstr "Soprannome non trovato"
 
-#: gajim/command_system/implementation/standard.py:276
+#: gajim/command_system/implementation/standard.py:278
+#, fuzzy
 msgid ""
-"Open a private chat window with a specified occupant and send him a message"
+"Open a private chat window with a specified participant and send him a "
+"message"
 msgstr ""
 "Apri una finestra di conversazione privata con un utente specificato e "
 "mandagli un messaggio"
 
-#: gajim/command_system/implementation/standard.py:285
+#: gajim/command_system/implementation/standard.py:287
 msgid "Display or change a group chat topic"
 msgstr "Mostra o modifica l'argomento di una conversazione di gruppo"
 
-#: gajim/command_system/implementation/standard.py:294
-msgid "Invite a user to a room for a reason"
+#: gajim/command_system/implementation/standard.py:296
+#, fuzzy
+msgid "Invite a user to a group chat for a reason"
 msgstr "Invita un utente in una stanza per un motivo"
 
-#: gajim/command_system/implementation/standard.py:297
+#: gajim/command_system/implementation/standard.py:299
 #, python-format
 msgid "Invited %(jid)s to %(room_jid)s"
 msgstr "È stato invitato %(jid)s in %(room_jid)s"
 
-#: gajim/command_system/implementation/standard.py:301
+#: gajim/command_system/implementation/standard.py:303
 #, fuzzy
-msgid "Join a group chat given by a JID"
+msgid "Join a group chat given by an XMPP Address"
 msgstr "nelle conversazioni di _gruppo"
 
-#: gajim/command_system/implementation/standard.py:309
+#: gajim/command_system/implementation/standard.py:313
+#, fuzzy
 msgid ""
-"Leave the groupchat, optionally giving a reason, and close tab or window"
+"Leave the group chat, optionally giving a reason, and close tab or window"
 msgstr ""
 "Lascia la conversazione di gruppo, opzionalmente specificando un motivo, e "
 "chiudi la scheda o la finestra"
 
-#: gajim/command_system/implementation/standard.py:314
+#: gajim/command_system/implementation/standard.py:318
 #, fuzzy
 msgid ""
 "\n"
@@ -8557,14 +8837,16 @@ msgstr ""
 "JID.\n"
 "    "
 
-#: gajim/command_system/implementation/standard.py:329
-msgid "Kick user by a nick from a groupchat"
+#: gajim/command_system/implementation/standard.py:333
+#, fuzzy
+msgid "Kick user by a nick from a group chat"
 msgstr ""
 "Espelli un utente con un certo soprannome da una conversazione di gruppo"
 
-#: gajim/command_system/implementation/standard.py:338
+#: gajim/command_system/implementation/standard.py:342
+#, fuzzy
 msgid ""
-"Set occupant role in group chat.\n"
+"Set participant role in group chat.\n"
 "    Role can be given as one of the following values:\n"
 "    moderator, participant, visitor, none"
 msgstr ""
@@ -8572,13 +8854,14 @@ msgstr ""
 "    Il ruolo può essere specificato come uno dei seguenti valori:\n"
 "    moderator, participant, visitor, none"
 
-#: gajim/command_system/implementation/standard.py:343
+#: gajim/command_system/implementation/standard.py:347
 msgid "Invalid role given"
 msgstr "Ruolo non valido"
 
-#: gajim/command_system/implementation/standard.py:350
+#: gajim/command_system/implementation/standard.py:354
+#, fuzzy
 msgid ""
-"Set occupant affiliation in group chat.\n"
+"Set participant affiliation in group chat.\n"
 "    Affiliation can be given as one of the following values:\n"
 "    owner, admin, member, outcast, none"
 msgstr ""
@@ -8586,20 +8869,23 @@ msgstr ""
 "    L'affiliazione può essere specificata come uno dei seguenti valori:\n"
 "    owner, admin, member, outcast, none    "
 
-#: gajim/command_system/implementation/standard.py:355
+#: gajim/command_system/implementation/standard.py:359
 msgid "Invalid affiliation given"
 msgstr "Affiliazione non valida"
 
-#: gajim/command_system/implementation/standard.py:365
-msgid "Display names of all group chat occupants"
+#: gajim/command_system/implementation/standard.py:369
+#, fuzzy
+msgid "Display names of all group chat participants"
 msgstr "Mostra i nomi di tutti i partecipanti alla conversazione di gruppo"
 
-#: gajim/command_system/implementation/standard.py:387
-msgid "Forbid an occupant to send you public or private messages"
+#: gajim/command_system/implementation/standard.py:391
+#, fuzzy
+msgid "Forbid a participant to send you public or private messages"
 msgstr "Vieta ad un partecipante di inviarti messaggi pubblici o privati"
 
-#: gajim/command_system/implementation/standard.py:392
-msgid "Allow an occupant to send you public or private messages"
+#: gajim/command_system/implementation/standard.py:396
+#, fuzzy
+msgid "Allow a participant to send you public or private messages"
 msgstr "Consenti ad un partecipante di inviarti messaggi pubblici o privati"
 
 #: gajim/command_system/implementation/middleware.py:74
@@ -8610,205 +8896,332 @@ msgstr "Errore durante l'esecuzione del comando!"
 msgid "The same as using a doc-string, except it supports translation"
 msgstr "Lo stesso che usare una doc-string, eccetto che supporta la traduzione"
 
-#: gajim/gtk/filetransfer.py:91
+#: gajim/gtk/groupchat_info.py:36
+#, fuzzy
+msgid "?Group chat feature:Archiving"
+msgstr "Invito in una conversazione di gruppo"
+
+#: gajim/gtk/groupchat_info.py:37
+#, fuzzy
+msgid "Messages are archived on the server"
+msgstr "Questa sessione SARÀ registrata sul server"
+
+#: gajim/gtk/groupchat_info.py:40
+#, fuzzy
+msgid "?Group chat feature:Persistent"
+msgstr "Supporto per le conversazioni di gruppo"
+
+#: gajim/gtk/groupchat_info.py:41
+msgid "This group chat persists even if there are no participants"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:45
+#, fuzzy
+msgid "?Group chat feature:Temporary"
+msgstr "?Group Chat Contact Role:Nessuno"
+
+#: gajim/gtk/groupchat_info.py:46
+msgid "This group chat will be destroyed once the last participant left"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:50
+#, fuzzy
+msgid "?Group chat feature:Moderated"
+msgstr "?Group Chat Contact Role:Nessuno"
+
+#: gajim/gtk/groupchat_info.py:51
+msgid ""
+"Participants entering this group chat need to request permission to send "
+"messages"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:55
+#, fuzzy
+msgid "?Group chat feature:Not Moderated"
+msgstr "Supporto per le conversazioni di gruppo"
+
+#: gajim/gtk/groupchat_info.py:56
+msgid "Participants entering this group chat are allowed to send messages"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:60
+#, fuzzy
+msgid "?Group chat feature:Open"
+msgstr "?Group Chat Contact Role:Nessuno"
+
+#: gajim/gtk/groupchat_info.py:61
+#, fuzzy
+msgid "Anyone can join this group chat"
+msgstr "%s si è unito alla conversazione di gruppo"
+
+#: gajim/gtk/groupchat_info.py:64
+#, fuzzy
+msgid "?Group chat feature:Members Only"
+msgstr "Evidenziatura dei messaggi nelle conversazioni di gruppo:"
+
+#: gajim/gtk/groupchat_info.py:65
+msgid "This group chat is restricted to members only"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:69
+#, fuzzy
+msgid "?Group chat feature:Public"
+msgstr "Evidenziatura dei messaggi nelle conversazioni di gruppo:"
+
+#: gajim/gtk/groupchat_info.py:70
+msgid "Group chat can be found via search"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:73
+#, fuzzy
+msgid "?Group chat feature:Hidden"
+msgstr "?Group Chat Contact Role:Nessuno"
+
+#: gajim/gtk/groupchat_info.py:74
+#, fuzzy
+msgid "This group chat can not be found via search"
+msgstr "Questa stanza non ha soggetto"
+
+#: gajim/gtk/groupchat_info.py:77
+#, fuzzy
+msgid "?Group chat feature:Not Anonymous"
+msgstr "Supporto per le conversazioni di gruppo"
+
+#: gajim/gtk/groupchat_info.py:78
+msgid "All other group chat participants can see your XMPP address"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:82
+#, fuzzy
+msgid "?Group chat feature:Semi-Anonymous"
+msgstr "Evidenziatura dei messaggi nelle conversazioni di gruppo:"
+
+#: gajim/gtk/groupchat_info.py:83
+msgid "Only moderators can see your XMPP address"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:86
+#, fuzzy
+msgid "?Group chat feature:Password Required"
+msgstr "Supporto per le conversazioni di gruppo"
+
+#: gajim/gtk/groupchat_info.py:87
+msgid "This group chat does require a password upon entry"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:91
+#, fuzzy
+msgid "?Group chat feature:No Password Required"
+msgstr "Supporto per le conversazioni di gruppo"
+
+#: gajim/gtk/groupchat_info.py:92
+msgid "This group chat does not require a password upon entry"
+msgstr ""
+
+#: gajim/gtk/filetransfer.py:90
 msgid "File"
 msgstr "File"
 
-#: gajim/gtk/filetransfer.py:108
+#: gajim/gtk/filetransfer.py:107
 msgid "Time"
 msgstr "Tempo"
 
-#: gajim/gtk/filetransfer.py:228
+#: gajim/gtk/filetransfer.py:227
 #, fuzzy, python-format
 msgid "File name: %s"
 msgstr "Nome file: %s"
 
-#: gajim/gtk/filetransfer.py:229 gajim/gtk/filetransfer.py:464
+#: gajim/gtk/filetransfer.py:228 gajim/gtk/filetransfer.py:469
 #, python-format
 msgid "Size: %s"
 msgstr "Dimensione: %s"
 
-#: gajim/gtk/filetransfer.py:239
+#: gajim/gtk/filetransfer.py:238
 #, python-format
 msgid "Sender: %s"
 msgstr "Mittente: %s"
 
-#: gajim/gtk/filetransfer.py:240 gajim/gtk/filetransfer.py:744
+#: gajim/gtk/filetransfer.py:239 gajim/gtk/filetransfer.py:749
 #: gajim/gtk/tooltips.py:577
 msgid "Recipient: "
 msgstr "Destinatario: "
 
-#: gajim/gtk/filetransfer.py:251
+#: gajim/gtk/filetransfer.py:250
 #, python-format
 msgid "Saved in: %s"
 msgstr "Salvato in: %s"
 
-#: gajim/gtk/filetransfer.py:256
+#: gajim/gtk/filetransfer.py:255
 msgid "File transfer completed"
 msgstr "Trasferimento del file completato"
 
-#: gajim/gtk/filetransfer.py:276 gajim/gtk/filetransfer.py:285
+#: gajim/gtk/filetransfer.py:275 gajim/gtk/filetransfer.py:284
 #, fuzzy
 msgid "Connection with peer could not be established."
 msgstr "La connessione con il contatto non può essere stabilita."
 
-#: gajim/gtk/filetransfer.py:293
+#: gajim/gtk/filetransfer.py:292
 #, python-format
 msgid "Filename: %s"
 msgstr "Nome file: %s"
 
-#: gajim/gtk/filetransfer.py:294
+#: gajim/gtk/filetransfer.py:293
 #, python-format
 msgid "Recipient: %s"
 msgstr "Destinatario: %s"
 
-#: gajim/gtk/filetransfer.py:296
+#: gajim/gtk/filetransfer.py:295
 #, python-format
 msgid "Error message: %s"
 msgstr "Messaggio di errore: %s"
 
-#: gajim/gtk/filetransfer.py:333
-#, fuzzy
-msgid "File transfer error"
-msgstr "Errore durante il trasferimento del file"
-
 #: gajim/gtk/filetransfer.py:334
 #, fuzzy, python-format
 msgid ""
-"The file %(file)s has been received, but it seems to have been damaged along "
-"the way.\n"
+"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 ""
 "Il file %(file)s è stato ricevuto per intero, ma sembra sia stato ricevuto "
 "in modo errato.\n"
 "Ricaricarlo?"
 
-#: gajim/gtk/filetransfer.py:350
+#: gajim/gtk/filetransfer.py:340
+#, fuzzy
+msgid "_Download Again"
+msgstr "_Non chiedermelo di nuovo"
+
+#: gajim/gtk/filetransfer.py:355
 #, fuzzy
 msgid "Gajim can not read this file"
 msgstr "Gajim non riesce a leggere questo file"
 
-#: gajim/gtk/filetransfer.py:351
+#: gajim/gtk/filetransfer.py:356
 msgid "Another process is using this file."
 msgstr "Un altro processo sta usando questo file."
 
-#: gajim/gtk/filetransfer.py:418
+#: gajim/gtk/filetransfer.py:423
 #, fuzzy
 msgid "File Transfer Conflict"
 msgstr "Trasferimento del file completato"
 
-#: gajim/gtk/filetransfer.py:419
+#: gajim/gtk/filetransfer.py:424
 msgid "This file already exists"
 msgstr "Questo file esiste già"
 
-#: gajim/gtk/filetransfer.py:420
+#: gajim/gtk/filetransfer.py:425
 msgid "Resume download or replace file?"
 msgstr ""
 
-#: gajim/gtk/filetransfer.py:424
+#: gajim/gtk/filetransfer.py:429
 #, fuzzy
 msgid "Replace _File"
 msgstr "Sos_tituisci"
 
-#: gajim/gtk/filetransfer.py:427
+#: gajim/gtk/filetransfer.py:432
 #, fuzzy
 msgid "Resume _Download"
 msgstr "Scarica"
 
-#: gajim/gtk/filetransfer.py:437
+#: gajim/gtk/filetransfer.py:442
 #, fuzzy, python-format
 msgid "Directory '%s' is not writable"
 msgstr "La cartella \"%s\" non è scrivibile."
 
-#: gajim/gtk/filetransfer.py:438
+#: gajim/gtk/filetransfer.py:443
 #, fuzzy
 msgid "You do not have permissions to create files in this directory."
 msgstr "Non hai il permesso di creare file in questa cartella."
 
-#: gajim/gtk/filetransfer.py:461
+#: gajim/gtk/filetransfer.py:466
 #, python-format
 msgid "File: %s"
 msgstr "File: %s"
 
-#: gajim/gtk/filetransfer.py:467
+#: gajim/gtk/filetransfer.py:472
 #, python-format
 msgid "Type: %s"
 msgstr "Tipo: %s"
 
-#: gajim/gtk/filetransfer.py:469
+#: gajim/gtk/filetransfer.py:474
 #, python-format
 msgid "Description: %s"
 msgstr "Descrizione: %s"
 
-#: gajim/gtk/filetransfer.py:480
+#: gajim/gtk/filetransfer.py:485
 #, fuzzy, python-format
 msgid "%s wants to send you a file"
 msgstr "%s vuole inviarti un file."
 
-#: gajim/gtk/filetransfer.py:509
+#: gajim/gtk/filetransfer.py:514
 #, fuzzy
 msgid "Checking file…"
 msgstr "Verifica file..."
 
-#: gajim/gtk/filetransfer.py:524
+#: gajim/gtk/filetransfer.py:529
 msgid "File error"
 msgstr "Errore file"
 
-#: gajim/gtk/filetransfer.py:561
+#: gajim/gtk/filetransfer.py:566
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 
-#: gajim/gtk/filetransfer.py:658
+#: gajim/gtk/filetransfer.py:663
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/s)"
 
-#: gajim/gtk/filetransfer.py:711 gajim/gtk/filetransfer.py:715
+#: gajim/gtk/filetransfer.py:716 gajim/gtk/filetransfer.py:720
 msgid "Invalid File"
 msgstr "File non valido"
 
-#: gajim/gtk/filetransfer.py:711
+#: gajim/gtk/filetransfer.py:716
 msgid "File: "
 msgstr "File: "
 
-#: gajim/gtk/filetransfer.py:716
+#: gajim/gtk/filetransfer.py:721
 msgid "It is not possible to send empty files"
 msgstr "Non è possibile inviare dei file vuoti"
 
-#: gajim/gtk/filetransfer.py:742 gajim/gtk/tooltips.py:571
+#: gajim/gtk/filetransfer.py:747 gajim/gtk/tooltips.py:571
 msgid "Sender: "
 msgstr "Mittente: "
 
-#: gajim/gtk/filetransfer.py:1038
+#: gajim/gtk/filetransfer.py:1043
 #, fuzzy
 msgid "Choose a File to Send…"
 msgstr "Scegli il file da inviare..."
 
 #: gajim/gtk/start_chat.py:51
-msgid "Start new Conversation"
+#, fuzzy
+msgid "Start New Conversation"
 msgstr "Comincia nuova conversazione"
 
-#: gajim/gtk/start_chat.py:424
-#, fuzzy
-msgid "New Groupchat"
-msgstr "Nuova Conversazione di Gruppo"
+#: gajim/gtk/start_chat.py:260 gajim/gtk/start_chat.py:328
+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:426
+#: gajim/gtk/start_chat.py:603 gajim/gtk/groupchat_join.py:38
+msgid "Join Group Chat"
+msgstr "Unisciti alla conversazione di gruppo"
+
+#: gajim/gtk/start_chat.py:605 gajim/gtk/add_contact.py:40
 #, fuzzy
-msgid "New Contact"
-msgstr "Aggiungi un nuovo contatto"
+msgid "Add Contact"
+msgstr "Aggiungi un _contatto"
 
-#: gajim/gtk/start_chat.py:588
-#, python-format
-msgid "%s Group chats found"
+#: gajim/gtk/start_chat.py:746
+#, fuzzy, python-format
+msgid "%s group chats found"
 msgstr "Trovate %s conversazioni di gruppo"
 
-#: gajim/gtk/discovery.py:70
+#: gajim/gtk/discovery.py:69
 msgid "This service has not yet responded with detailed information"
 msgstr "Questo servizio non ha ancora inviato informazioni dettagliate"
 
-#: gajim/gtk/discovery.py:71
+#: gajim/gtk/discovery.py:70
 #, fuzzy
 msgid ""
 "This service could not respond with detailed information.\n"
@@ -8817,33 +9230,34 @@ msgstr ""
 "Questo servizio non ha inviato informazioni dettagliate.\n"
 "È probabilmente vecchio o malfunzionante"
 
-#: gajim/gtk/discovery.py:128
+#: gajim/gtk/discovery.py:126
 msgid "Others"
 msgstr "Altri"
 
-#: gajim/gtk/discovery.py:131
-msgid "Conference"
-msgstr "Conferenze"
+#: gajim/gtk/discovery.py:129
+#, fuzzy
+msgid "Group Chat"
+msgstr "Conversazione di gruppo"
 
-#: gajim/gtk/discovery.py:519
+#: gajim/gtk/discovery.py:518
 msgid "Without a connection, you can not browse available services"
 msgstr ""
 "Senza una connessione, non è possibile consultare i servizi disponibili"
 
-#: gajim/gtk/discovery.py:606
+#: gajim/gtk/discovery.py:605
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Ricerca dei servizi usando l'account %s"
 
-#: gajim/gtk/discovery.py:608
+#: gajim/gtk/discovery.py:607
 msgid "Service Discovery"
 msgstr "Ricerca dei servizi"
 
-#: gajim/gtk/discovery.py:691
+#: gajim/gtk/discovery.py:690
 msgid "The service could not be found"
 msgstr "Il servizio non è stato trovato"
 
-#: gajim/gtk/discovery.py:692
+#: gajim/gtk/discovery.py:691
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -8851,101 +9265,79 @@ msgstr ""
 "Il servizio all'indirizzo immesso non risponde o è inesistente. Controlla "
 "l'indirizzo e riprova."
 
-#: gajim/gtk/discovery.py:699 gajim/gtk/discovery.py:1042
+#: gajim/gtk/discovery.py:698 gajim/gtk/discovery.py:1041
 msgid "The service is not browsable"
 msgstr "Non è possibile consultare il servizio"
 
-#: gajim/gtk/discovery.py:700
+#: gajim/gtk/discovery.py:699
 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:738 gajim/gtk/discovery.py:747
+#: gajim/gtk/discovery.py:737 gajim/gtk/discovery.py:746
 msgid "Invalid Server Name"
 msgstr "Nome del server non valido"
 
-#: gajim/gtk/discovery.py:806
+#: gajim/gtk/discovery.py:805
 #, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Consultando %(address)s usando l'account %(account)s"
 
-#: gajim/gtk/discovery.py:851
+#: gajim/gtk/discovery.py:850
 msgid "Browse"
 msgstr "Esplora"
 
-#: gajim/gtk/discovery.py:1043
+#: gajim/gtk/discovery.py:1042
 msgid "This service does not contain any items to browse."
 msgstr "Questo servizio non contiene oggetti da consultare."
 
-#: gajim/gtk/discovery.py:1255
+#: gajim/gtk/discovery.py:1254
 #, fuzzy
 msgid "_Command"
 msgstr "Comandi"
 
-#: gajim/gtk/discovery.py:1264 gajim/gtk/discovery.py:1422
+#: gajim/gtk/discovery.py:1263 gajim/gtk/discovery.py:1420
 msgid "Re_gister"
 msgstr "_Registra"
 
-#: gajim/gtk/discovery.py:1277
+#: gajim/gtk/discovery.py:1276
 msgid "_Search"
 msgstr "_Cerca"
 
-#: gajim/gtk/discovery.py:1420
+#: gajim/gtk/discovery.py:1418
 msgid "_Edit"
 msgstr "_Modifica"
 
-#: gajim/gtk/discovery.py:1458
+#: gajim/gtk/discovery.py:1456
 #, fuzzy, python-format
 msgid "Scanning %(current)d / %(total)d ..."
 msgstr "Analizzando %(current)d / %(total)d..."
 
-#: gajim/gtk/discovery.py:1674
+#: gajim/gtk/discovery.py:1655
+msgid "Users"
+msgstr "Utenti"
+
+#: gajim/gtk/discovery.py:1671
 msgid "Id"
 msgstr "Id"
 
-#: gajim/gtk/discovery.py:1713
-msgid "_Join"
-msgstr "_Unisciti"
-
-#: gajim/gtk/discovery.py:1736
-msgid "Bookmark already set"
-msgstr "Segnalibro già impostato"
-
-#: gajim/gtk/discovery.py:1737
-#, fuzzy, python-format
-msgid "Group Chat '%s' is already in your bookmarks."
-msgstr "La stanza \"%s\" è già tra i segnalibri."
-
-#: gajim/gtk/discovery.py:1748
-msgid "Bookmark has been added successfully"
-msgstr "Il segnalibro è stato aggiunto con successo"
-
-#: gajim/gtk/discovery.py:1749
-#, fuzzy
-msgid ""
-"You can manage your bookmarks by clicking the Bookmarks menu item in your "
-"contact list."
-msgstr ""
-"È possibile gestire i segnalibri attraverso il menu Azioni nella finestra "
-"della lista contatti."
-
-#: gajim/gtk/discovery.py:1950
+#: gajim/gtk/discovery.py:1900
 msgid "Subscribed"
 msgstr "Iscritti"
 
-#: gajim/gtk/discovery.py:1959
+#: gajim/gtk/discovery.py:1909
 msgid "Node"
 msgstr "Nodo"
 
-#: gajim/gtk/discovery.py:2028
+#: gajim/gtk/discovery.py:1978
 #, fuzzy
 msgid "_New post"
 msgstr "Nuovo post"
 
-#: gajim/gtk/discovery.py:2037
+#: gajim/gtk/discovery.py:1987
 msgid "_Subscribe"
 msgstr "A_bbonati"
 
-#: gajim/gtk/discovery.py:2045
+#: gajim/gtk/discovery.py:1995
 msgid "_Unsubscribe"
 msgstr "Disa_bbonati"
 
@@ -8992,7 +9384,7 @@ msgstr "Modulo %s"
 msgid "Characters typed: %s"
 msgstr "Caratteri digitati: %s"
 
-#: gajim/gtk/single_message.py:274 gajim/gtk/xml_console.py:169
+#: gajim/gtk/single_message.py:274 gajim/gtk/xml_console.py:166
 msgid "Connection not available"
 msgstr "Connessione non disponibile"
 
@@ -9001,6 +9393,12 @@ msgstr "Connessione non disponibile"
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Assicurati di essere connesso con \"%s\"."
 
+#: gajim/gtk/single_message.py:306
+#, 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:330
 #, python-format
 msgid "RE: %s"
@@ -9011,28 +9409,28 @@ msgstr "RE: %s"
 msgid "%s wrote:\n"
 msgstr "%s ha scritto:\n"
 
-#: gajim/gtk/pep_config.py:44
+#: gajim/gtk/pep_config.py:45
 #, fuzzy, python-format
 msgid "PEP Service Configuration (%s)"
 msgstr "Configurazione del servizio PEP"
 
-#: gajim/gtk/pep_config.py:77
+#: gajim/gtk/pep_config.py:78
 #, fuzzy
 msgid "Service"
 msgstr "Server"
 
-#: gajim/gtk/pep_config.py:114
+#: gajim/gtk/pep_config.py:115
 msgid "PEP node was not removed"
 msgstr "Il nodo PEP non è stato rimosso"
 
-#: gajim/gtk/pep_config.py:115
+#: gajim/gtk/pep_config.py:116
 #, fuzzy, python-format
 msgid ""
 "PEP node %(node)s was not removed:\n"
 "%(message)s"
 msgstr "Il nodo PEP %(node)s non è stato rimosso: %(message)s"
 
-#: gajim/gtk/pep_config.py:146
+#: gajim/gtk/pep_config.py:147
 #, python-format
 msgid "Configure %s"
 msgstr "Configura %s"
@@ -9048,17 +9446,21 @@ msgstr "_Registra"
 msgid "Registration successful"
 msgstr "Registrazione account avvenuta con successo"
 
-#: gajim/gtk/dialogs.py:54 gajim/gtk/dataform.py:659 gajim/gtk/adhoc.py:85
+#: gajim/gtk/service_registration.py:215
+msgid "Registration failed"
+msgstr "Registrazione fallita"
+
+#: gajim/gtk/dialogs.py:53 gajim/gtk/dataform.py:668 gajim/gtk/adhoc.py:86
 #, fuzzy
 msgid "Cancel"
 msgstr "_Annulla"
 
-#: gajim/gtk/dialogs.py:129
+#: gajim/gtk/dialogs.py:128
 #, fuzzy, python-format
 msgid "Dictionary for language \"%s\" not available"
 msgstr "Dizionario per la lingua \"%s\" non disponibile"
 
-#: gajim/gtk/dialogs.py:130
+#: gajim/gtk/dialogs.py:129
 #, fuzzy, python-format
 msgid ""
 "You have to install the dictionary \"%s\" to use spellchecking, or choose "
@@ -9071,11 +9473,11 @@ msgstr ""
 "\n"
 "La funzionalità di evidenziatura delle parole errate non verrà usata"
 
-#: gajim/gtk/dialogs.py:410 gajim/gtk/dialogs.py:425
+#: gajim/gtk/dialogs.py:322 gajim/gtk/dialogs.py:337
 msgid "Insecure connection"
 msgstr "Connessione non sicura"
 
-#: gajim/gtk/dialogs.py:411
+#: gajim/gtk/dialogs.py:323
 #, fuzzy, python-format
 msgid ""
 "You are about to connect to the account %(account)s (%(server)s) insecurely. "
@@ -9089,29 +9491,25 @@ msgstr ""
 "sconsigliato.\n"
 "Si è sicuri di volerlo fare?"
 
-#: gajim/gtk/dialogs.py:416
+#: gajim/gtk/dialogs.py:328
 msgid "Yes, I really want to connect insecurely"
 msgstr "Sì, voglio davvero connettermi in modo non sicuro"
 
-#: gajim/gtk/dialogs.py:417
+#: gajim/gtk/dialogs.py:329
 msgid "Gajim will NOT connect unless you check this box"
 msgstr "Gajim NON si connetterà a meno che non viene marcata questa casella"
 
-#: gajim/gtk/dialogs.py:675
-msgid "The nickname contains invalid characters."
-msgstr "Il soprannome contiene dei caratteri non consentiti."
-
-#: gajim/gtk/dialogs.py:734
+#: gajim/gtk/dialogs.py:561
 #, fuzzy, python-format
 msgid "Destroy %s"
 msgstr "Eliminazione di %s in corso"
 
-#: gajim/gtk/dialogs.py:775
+#: gajim/gtk/dialogs.py:602
 #, fuzzy
 msgid "Certificate"
 msgstr "Certificato del client"
 
-#: gajim/gtk/dialogs.py:786
+#: gajim/gtk/dialogs.py:613
 #, python-format
 msgid ""
 "Certificate for account\n"
@@ -9120,83 +9518,83 @@ msgstr ""
 "Certificato per l'account\n"
 "%s"
 
-#: gajim/gtk/dialogs.py:824
+#: gajim/gtk/dialogs.py:651
 msgid "Issued to\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:825 gajim/gtk/dialogs.py:830
+#: gajim/gtk/dialogs.py:652 gajim/gtk/dialogs.py:657
 msgid "Common Name (CN): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:826 gajim/gtk/dialogs.py:831
+#: gajim/gtk/dialogs.py:653 gajim/gtk/dialogs.py:658
 msgid "Organization (O): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:827 gajim/gtk/dialogs.py:832
+#: gajim/gtk/dialogs.py:654 gajim/gtk/dialogs.py:659
 msgid "Organizational Unit (OU): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:828
+#: gajim/gtk/dialogs.py:655
 #, fuzzy
 msgid "Serial Number: "
 msgstr "Numero GG:"
 
-#: gajim/gtk/dialogs.py:829
+#: gajim/gtk/dialogs.py:656
 msgid "Issued by\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:833
+#: gajim/gtk/dialogs.py:660
 msgid "Validity\n"
 msgstr "Validità\n"
 
-#: gajim/gtk/dialogs.py:834
+#: gajim/gtk/dialogs.py:661
 msgid "Issued on: "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:835
+#: gajim/gtk/dialogs.py:662
 #, fuzzy
 msgid "Expires on: "
 msgstr "scade"
 
-#: gajim/gtk/dialogs.py:836
+#: gajim/gtk/dialogs.py:663
 msgid "SHA-1:"
 msgstr "SHA-1:"
 
-#: gajim/gtk/dialogs.py:838
+#: gajim/gtk/dialogs.py:665
 msgid "SHA-256:"
 msgstr "SHA-256:"
 
-#: gajim/gtk/dialogs.py:852
+#: gajim/gtk/dialogs.py:679
 msgid "View certificate…"
 msgstr "Visualizza il certificato..."
 
-#: gajim/gtk/dialogs.py:864 gajim/gtk/accounts.py:893
+#: gajim/gtk/dialogs.py:691 gajim/gtk/accounts.py:896
 msgid "Change Password"
 msgstr "Cambia la password"
 
-#: gajim/gtk/dialogs.py:878
+#: gajim/gtk/dialogs.py:705
 msgid "_OK"
 msgstr "_OK"
 
-#: gajim/gtk/dialogs.py:891
+#: gajim/gtk/dialogs.py:718
 #, fuzzy
 msgid "You must enter a password"
 msgstr "È necessario inserire una password."
 
-#: gajim/gtk/dialogs.py:895
+#: gajim/gtk/dialogs.py:722
 msgid "Passwords do not match"
 msgstr "Le password non coincidono"
 
-#: gajim/gtk/dialogs.py:923
+#: gajim/gtk/dialogs.py:750
 msgid "Group Chat Invitation "
 msgstr "Invito in una conversazione di gruppo"
 
-#: gajim/gtk/dialogs.py:948
+#: gajim/gtk/dialogs.py:775
 #, python-format
 msgid "<b>%s</b> has invited you to join a discussion"
 msgstr "<b>%s</b> ti ha invitato a unirti a una discussione"
 
-#: gajim/gtk/dialogs.py:951
+#: gajim/gtk/dialogs.py:778
 #, python-format
 msgid ""
 "<b>%(contact)s</b> has invited you to the group chat <b>%(room_jid)s</b>"
@@ -9204,7 +9602,7 @@ msgstr ""
 "<b>%(contact)s</b> ti ha invitato alla conversazione di gruppo <b>"
 "%(room_jid)s</b>"
 
-#: gajim/gtk/dialogs.py:959
+#: gajim/gtk/dialogs.py:786
 #, python-format
 msgid "Comment: %s"
 msgstr "Commento: %s"
@@ -9219,11 +9617,6 @@ msgstr "Numero GG:"
 msgid "ICQ Number"
 msgstr "Numero ICQ:"
 
-#: gajim/gtk/add_contact.py:40
-#, fuzzy
-msgid "Add Contact"
-msgstr "Aggiungi un _contatto"
-
 #: gajim/gtk/add_contact.py:259
 #, fuzzy, python-format
 msgid "%s Missing"
@@ -9244,7 +9637,8 @@ msgid "The user ID must not contain a resource."
 msgstr "L'identificatore dell'utente non deve contenere una risorsa."
 
 #: gajim/gtk/add_contact.py:299
-msgid "You cannot add yourself to your roster."
+#, fuzzy
+msgid "You cannot add yourself to your contact list."
 msgstr "Non puoi aggiungere te stesso all'elenco dei tuoi contatti."
 
 #: gajim/gtk/add_contact.py:304
@@ -9257,11 +9651,13 @@ msgid "Your account must be online to add new contacts."
 msgstr "Il tuo account deve essere online per aggiungere dei nuovi contatti."
 
 #: gajim/gtk/add_contact.py:321
-msgid "Contact already in roster"
+#, fuzzy
+msgid "Contact Already in Contact List"
 msgstr "Contatto già presente nell'elenco dei tuoi contatti"
 
 #: gajim/gtk/add_contact.py:322
-msgid "This contact is already listed in your roster."
+#, fuzzy
+msgid "This contact is already in your contact list."
 msgstr "Questo contatto è già presente nell'elenco dei tuoi contatti."
 
 #: gajim/gtk/add_contact.py:379 gajim/gtk/add_contact.py:417
@@ -9301,14 +9697,14 @@ msgstr "Modifica lo stato"
 
 #: gajim/gtk/themes.py:52
 #, fuzzy
-msgid "MUC Tab New Directed Message"
+msgid "Group Chat Tab New Directed Message"
 msgstr ""
 "Messaggi inviati in\n"
 "una conversazione di gruppo"
 
 #: gajim/gtk/themes.py:56
 #, fuzzy
-msgid "MUC Tab New Message"
+msgid "Group Chat Tab New Message"
 msgstr "Nuovo messaggio"
 
 #: gajim/gtk/themes.py:60
@@ -9525,13 +9921,13 @@ msgstr "Tutti i file"
 msgid "Clear File"
 msgstr "Pulendo"
 
-#: gajim/gtk/settings.py:570
+#: gajim/gtk/settings.py:570 gajim/gtk/proxies.py:32
 #, fuzzy
 msgid "Manage Proxies"
 msgstr "Gestisci i profili proxy"
 
-#: gajim/gtk/settings.py:591 gajim/gtk/preferences.py:971
-#: gajim/gtk/preferences.py:984 gajim/gtk/preferences.py:988
+#: gajim/gtk/settings.py:591 gajim/gtk/preferences.py:968
+#: gajim/gtk/preferences.py:982 gajim/gtk/preferences.py:986
 #, fuzzy
 msgid "No Proxy"
 msgstr "Proxy:"
@@ -9608,13 +10004,15 @@ msgid ""
 "        "
 msgstr ""
 
-#: gajim/gtk/about.py:47 data/org.gajim.Gajim.appdata.xml.in:10
-msgid "A GTK+ XMPP client"
+#: gajim/gtk/about.py:47 data/org.gajim.Gajim.desktop.in:6
+#: data/org.gajim.Gajim.appdata.xml.in:10
+#, fuzzy
+msgid "A GTK XMPP client"
 msgstr "Un client XMPP GTK+"
 
 #: gajim/gtk/about.py:48
-#, python-format
-msgid "GTK+ Version: %s"
+#, fuzzy, python-format
+msgid "GTK Version: %s"
 msgstr "Versione di GTK+: %s"
 
 #: gajim/gtk/about.py:49
@@ -9797,6 +10195,25 @@ msgstr "?transfer status:In pausa"
 msgid "?transfer status:Not started"
 msgstr "?transfer status:In pausa"
 
+#: gajim/gtk/groupchat_creation.py:97 gajim/gtk/groupchat_creation.py:99
+msgid " (optional)..."
+msgstr ""
+
+#: gajim/gtk/groupchat_creation.py:134
+#, fuzzy
+msgid "Invalid Address"
+msgstr "File non valido"
+
+#: gajim/gtk/groupchat_creation.py:182
+#, fuzzy
+msgid "Not Connected"
+msgstr "Connesso"
+
+#: gajim/gtk/groupchat_creation.py:183
+#, fuzzy
+msgid "You have to be connected to create a group chat."
+msgstr "Non si è entrati in una conversazione di gruppo."
+
 #: gajim/gtk/sounds.py:39
 msgid "Wav Sounds"
 msgstr "Suoni Wav"
@@ -9837,46 +10254,43 @@ 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:226 gajim/gtk/dataform.py:262
+#: gajim/gtk/dataform.py:232 gajim/gtk/dataform.py:268
 #, fuzzy
 msgid "Required"
 msgstr "richiedi"
 
-#: gajim/gtk/dataform.py:286
+#: gajim/gtk/dataform.py:293
 msgid "Yes"
 msgstr "Sì"
 
-#: gajim/gtk/dataform.py:286
+#: gajim/gtk/dataform.py:293
 msgid "No"
 msgstr "No"
 
-#: gajim/gtk/dataform.py:661
+#: gajim/gtk/dataform.py:670
 msgid "Submit"
 msgstr "Invia"
 
-#: gajim/gtk/statusicon.py:213
+#: gajim/gtk/statusicon.py:206
 msgid "_Change Status Message…"
 msgstr "_Cambia il messaggio di stato…"
 
-#: gajim/gtk/statusicon.py:247 gajim/gtk/statusicon.py:292
-#: gajim/gtk/statusicon.py:299
+#: gajim/gtk/statusicon.py:258
 #, python-format
 msgid "using account %s"
 msgstr "usando l'account %s"
 
-#: gajim/gtk/statusicon.py:309
-msgid "_Manage Bookmarks…"
-msgstr "_Gestisci i segnalibri…"
-
-#: gajim/gtk/statusicon.py:325
-msgid "Hide _Roster"
-msgstr "Nascondi l'elenco dei tuoi _contatti"
+#: gajim/gtk/statusicon.py:269
+#, fuzzy
+msgid "Hide _Contact List"
+msgstr "Invita dei _contatti"
 
-#: gajim/gtk/statusicon.py:329
-msgid "Show _Roster"
-msgstr "Mostra l'elenco dei tuoi _contatti"
+#: gajim/gtk/statusicon.py:273
+#, fuzzy
+msgid "Show _Contact List"
+msgstr "Mostra i contatti attivi"
 
-#: gajim/gtk/statusicon.py:337
+#: gajim/gtk/statusicon.py:281
 msgid "Hide this menu"
 msgstr "Nascondi questo menù"
 
@@ -9921,33 +10335,6 @@ msgstr ""
 "C'è stato un errore nella pubblicazione delle informazioni personali, "
 "riprova più tardi."
 
-#: gajim/gtk/join_groupchat.py:202
-msgid "Invalid Room"
-msgstr "Stanza non valida"
-
-#: gajim/gtk/join_groupchat.py:203
-msgid "Please choose a room"
-msgstr "Scegliere una stanza"
-
-#: gajim/gtk/join_groupchat.py:222 gajim/gtk/join_groupchat.py:229
-msgid "Invalid Nickname"
-msgstr "Soprannome non valido"
-
-#: gajim/gtk/join_groupchat.py:223
-msgid "Please choose a nickname"
-msgstr "Scegli un altro soprannome"
-
-#: gajim/gtk/join_groupchat.py:282 gajim/gtk/join_groupchat.py:288
-#: gajim/gtk/join_groupchat.py:293
-msgid "Wrong server"
-msgstr "Server errato"
-
-#: gajim/gtk/join_groupchat.py:283 gajim/gtk/join_groupchat.py:289
-#: gajim/gtk/join_groupchat.py:294
-#, python-format
-msgid "%s is not a groupchat server"
-msgstr "%s non è un server di conversazione di gruppo"
-
 #: gajim/gtk/mam_preferences.py:38
 #, python-format
 msgid "Archiving Preferences for %s"
@@ -9977,45 +10364,53 @@ msgstr "Errore ricevuto: {}"
 msgid "Archiving Preferences Error"
 msgstr "Archiviazione preferenze"
 
-#: gajim/gtk/advanced_config.py:81
+#: gajim/gtk/advanced_config.py:95
 msgid "Activated"
 msgstr "Attivato"
 
-#: gajim/gtk/advanced_config.py:81
+#: gajim/gtk/advanced_config.py:95
 msgid "Deactivated"
 msgstr "Disattivato"
 
-#: gajim/gtk/advanced_config.py:83
-msgid "Boolean"
-msgstr "Booleano"
+#: gajim/gtk/advanced_config.py:97
+msgid "?config type:Boolean"
+msgstr ""
+
+#: gajim/gtk/advanced_config.py:98
+msgid "?config type:Integer"
+msgstr ""
 
-#: gajim/gtk/advanced_config.py:84
-msgid "Integer"
-msgstr "Intero"
+#: gajim/gtk/advanced_config.py:99
+msgid "?config type:Text"
+msgstr ""
 
-#: gajim/gtk/advanced_config.py:85
-msgid "Text"
-msgstr "Testo"
+#: gajim/gtk/advanced_config.py:100
+msgid "?config type:Color"
+msgstr ""
 
-#: gajim/gtk/advanced_config.py:97
-msgid "Preference Name"
+#: gajim/gtk/advanced_config.py:112
+#, fuzzy
+msgid "?config:Preference Name"
 msgstr "Nome della preferenza"
 
-#: gajim/gtk/advanced_config.py:104
-msgid "Value"
-msgstr "Valore"
+#: gajim/gtk/advanced_config.py:123
+#, fuzzy
+msgid "?config:Value"
+msgstr "Configura"
 
-#: gajim/gtk/advanced_config.py:113
-msgid "Type"
-msgstr "Tipo"
+#: gajim/gtk/advanced_config.py:132
+msgid "?config:Type"
+msgstr ""
 
-#: gajim/gtk/advanced_config.py:168
-msgid "(None)"
-msgstr "(Nessuna)"
+#: gajim/gtk/advanced_config.py:187
+#, fuzzy
+msgid "?config description:None"
+msgstr "?Ask (for Subscription):Nessuno"
 
-#: gajim/gtk/advanced_config.py:299
-msgid "Hidden"
-msgstr "Nascosta"
+#: gajim/gtk/advanced_config.py:322
+#, fuzzy
+msgid "?password:Hidden"
+msgstr "Password:"
 
 #: gajim/gtk/server_info.py:66
 #, fuzzy
@@ -10027,8 +10422,8 @@ msgstr "_Copia l'indirizzo del collegamento"
 msgid "%(days)s days, %(hours)s hours"
 msgstr ""
 
-#: gajim/gtk/server_info.py:218 gajim/gtk/accounts.py:749
-#: gajim/gtk/accounts.py:853
+#: gajim/gtk/server_info.py:218 gajim/gtk/accounts.py:752
+#: gajim/gtk/accounts.py:856
 msgid "Hostname"
 msgstr "Nome host"
 
@@ -10225,11 +10620,6 @@ 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_config.py:41
-#, fuzzy
-msgid "Group Chat Configuration"
-msgstr "Invito in una conversazione di gruppo"
-
 #: gajim/gtk/groupchat_config.py:134
 #, fuzzy
 msgid "A Group Chat needs at least one Owner"
@@ -10240,67 +10630,67 @@ msgid "You are not allowed to modify the affiliation of Admins and Owners"
 msgstr ""
 
 #: gajim/gtk/groupchat_config.py:399
-msgid "An entry with this Jabber-ID already exists"
+msgid "An entry with this XMPP Address already exists"
 msgstr ""
 
-#: gajim/gtk/adhoc.py:91
+#: gajim/gtk/adhoc.py:92
 #, fuzzy
 msgid "Finish"
 msgstr "_Fine"
 
-#: gajim/gtk/adhoc.py:97 gajim/gtk/adhoc.py:283
+#: gajim/gtk/adhoc.py:98 gajim/gtk/adhoc.py:284
 msgid "Commands"
 msgstr "Comandi"
 
-#: gajim/gtk/adhoc.py:103
+#: gajim/gtk/adhoc.py:104
 msgid "Next"
 msgstr "Successivo"
 
-#: gajim/gtk/adhoc.py:109
+#: gajim/gtk/adhoc.py:110
 #, fuzzy
 msgid "Previous"
 msgstr "Invidioso"
 
-#: gajim/gtk/adhoc.py:115
+#: gajim/gtk/adhoc.py:116
 #, fuzzy
 msgid "Execute"
 msgstr "Esegui comando"
 
-#: gajim/gtk/adhoc.py:195
+#: gajim/gtk/adhoc.py:196
 #, fuzzy
 msgid "No commands available"
 msgstr "Nessun account disponibile"
 
-#: gajim/gtk/adhoc.py:244
+#: gajim/gtk/adhoc.py:245
 #, fuzzy
 msgid "Request Command List"
 msgstr "Esegui comando"
 
-#: gajim/gtk/adhoc.py:259
+#: gajim/gtk/adhoc.py:260
 #, fuzzy
 msgid "Executing…"
 msgstr "_Esegui il comando…"
 
-#: gajim/gtk/adhoc.py:266
+#: gajim/gtk/adhoc.py:267
 msgid "Command List"
 msgstr "Elenco dei comandi"
 
-#: gajim/gtk/adhoc.py:384
+#: gajim/gtk/adhoc.py:385
 #, fuzzy
 msgid "Finished"
 msgstr "_Fine"
 
-#: gajim/gtk/adhoc.py:453
+#: gajim/gtk/adhoc.py:454
 #, fuzzy
 msgid "Execution failed"
 msgstr "Connessione fallita"
 
-#: gajim/gtk/blocking.py:37
+#: gajim/gtk/blocking.py:38
 #, fuzzy, python-format
 msgid "Blocking List for %s"
 msgstr "Elenco della privacy per %s"
 
-#: gajim/gtk/blocking.py:71
+#: gajim/gtk/blocking.py:72
 msgid "Error!"
 msgstr "Errore!"
 
@@ -10348,8 +10738,7 @@ msgstr "Nome utente non valido"
 msgid "You must provide a username to configure this account."
 msgstr "È necessario inserire un nome utente per configurare questo account."
 
-#: gajim/gtk/account_wizard.py:252 gajim/gtk/bookmarks.py:290
-#: gajim/gtk/bookmarks.py:303
+#: gajim/gtk/account_wizard.py:252
 msgid "Invalid server"
 msgstr "Server non valido"
 
@@ -10365,7 +10754,7 @@ msgstr "Voce non valida"
 msgid "Custom port must be a port number."
 msgstr "Si deve scegliere un numero di porta."
 
-#: gajim/gtk/account_wizard.py:405
+#: gajim/gtk/account_wizard.py:406
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -10381,15 +10770,15 @@ msgstr ""
 "Errore SSL: %(error)s\n"
 "Vuoi ancora connetterti a questo server?"
 
-#: gajim/gtk/account_wizard.py:446 gajim/gtk/account_wizard.py:480
+#: gajim/gtk/account_wizard.py:447 gajim/gtk/account_wizard.py:481
 msgid "An error occurred during account creation"
 msgstr "Si è verificato un errore durante la creazione dell'account"
 
-#: gajim/gtk/account_wizard.py:545
+#: gajim/gtk/account_wizard.py:546
 msgid "Account name is in use"
 msgstr "Il nome dell'account è già in uso"
 
-#: gajim/gtk/account_wizard.py:546
+#: gajim/gtk/account_wizard.py:547
 msgid "You already have an account using this name."
 msgstr "Esiste già un account con lo stesso nome."
 
@@ -10415,25 +10804,25 @@ msgstr "%(progress)s di %(total)s MiB inviati (%(speed)s MiB/s)"
 msgid "%(minutes)s min %(seconds)s sec"
 msgstr ""
 
-#: gajim/gtk/xml_console.py:77
+#: gajim/gtk/xml_console.py:74
 #, fuzzy
 msgid "Filter"
 msgstr "Filtro:"
 
-#: gajim/gtk/xml_console.py:82
+#: gajim/gtk/xml_console.py:79
 msgid "XML Input"
 msgstr "Input XML"
 
-#: gajim/gtk/xml_console.py:86
+#: gajim/gtk/xml_console.py:83
 msgid "Paste Last Input"
 msgstr ""
 
-#: gajim/gtk/xml_console.py:170
+#: gajim/gtk/xml_console.py:167
 #, fuzzy, python-format
 msgid "Please make sure you are connected with '%s'."
 msgstr "Assicurati di essere connesso con \"%s\"."
 
-#: gajim/gtk/xml_console.py:182
+#: gajim/gtk/xml_console.py:177
 #, fuzzy
 msgid "Invalid Node"
 msgstr "File non valido"
@@ -10466,39 +10855,55 @@ msgstr "Cerca"
 msgid "No results found"
 msgstr "Nessun risultato"
 
-#: gajim/gtk/preferences.py:358 gajim/gtk/preferences.py:362
+#: gajim/gtk/preferences.py:357 gajim/gtk/preferences.py:361
 msgid "Default"
 msgstr "Predefinito"
 
-#: gajim/gtk/preferences.py:801
+#: gajim/gtk/preferences.py:798
 msgid "status message title"
 msgstr "titolo del messaggio di stato"
 
-#: gajim/gtk/preferences.py:802
+#: gajim/gtk/preferences.py:799
 msgid "status message text"
 msgstr "testo del messaggio di stato"
 
+#: gajim/gtk/accounts.py:137
+#, fuzzy
+msgid "Re-Login"
+msgstr "Effettuare un nuovo accesso?"
+
 #: gajim/gtk/accounts.py:138
-msgid "Relogin now?"
+#, fuzzy
+msgid "Re-Login now?"
 msgstr "Effettuare un nuovo accesso?"
 
 #: gajim/gtk/accounts.py:139
-msgid "If you want all the changes to apply instantly, you must relogin."
+#, 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:191 gajim/gtk/accounts.py:975
+#: gajim/gtk/accounts.py:141
+#, fuzzy
+msgid "_Later"
+msgstr "_Ultimo"
+
+#: gajim/gtk/accounts.py:143
+msgid "_Re-Login"
+msgstr ""
+
+#: gajim/gtk/accounts.py:194 gajim/gtk/accounts.py:978
 #, fuzzy
 msgid "Remove Account"
 msgstr "Eliminazione dell'account %s in corso"
 
-#: gajim/gtk/accounts.py:192
+#: gajim/gtk/accounts.py:195
 #, fuzzy, python-format
 msgid "You still have open chats in your account %s"
 msgstr "Hai aperto una conversazione con l'account %s"
 
-#: gajim/gtk/accounts.py:193
+#: gajim/gtk/accounts.py:196
 #, fuzzy
 msgid ""
 "All chat and group chat windows will be closed.\n"
@@ -10507,32 +10912,32 @@ msgstr ""
 "Tutte le finestre di conversazione e le conversazioni di gruppo saranno "
 "chiuse. Si desidera continuare?"
 
-#: gajim/gtk/accounts.py:424
+#: gajim/gtk/accounts.py:427
 #, fuzzy
 msgid "Back"
 msgstr "Torno presto"
 
-#: gajim/gtk/accounts.py:530
+#: gajim/gtk/accounts.py:533
 #, fuzzy
 msgid "Please check if Bonjour is installed."
 msgstr "Per piacere, controlla se Avahi o Bonjour sono installati."
 
-#: gajim/gtk/accounts.py:532
+#: gajim/gtk/accounts.py:535
 #, fuzzy
 msgid "Please check if Avahi is installed."
 msgstr "Per piacere, controlla se Avahi o Bonjour sono installati."
 
-#: gajim/gtk/accounts.py:569
+#: gajim/gtk/accounts.py:572
 #, fuzzy
 msgid "Disable Account"
 msgstr "Account non valido"
 
-#: gajim/gtk/accounts.py:570
+#: gajim/gtk/accounts.py:573
 #, fuzzy, python-format
 msgid "Account %s is still connected"
 msgstr "L'account \"%s\" è connesso al server"
 
-#: gajim/gtk/accounts.py:571
+#: gajim/gtk/accounts.py:574
 #, fuzzy
 msgid ""
 "All chat and group chat windows will be closed. Do you want to continue?"
@@ -10540,86 +10945,86 @@ msgstr ""
 "Tutte le finestre di conversazione e le conversazioni di gruppo saranno "
 "chiuse. Si desidera continuare?"
 
-#: gajim/gtk/accounts.py:576
+#: gajim/gtk/accounts.py:579
 #, fuzzy
 msgid "_Disable Account"
 msgstr "Account non valido"
 
-#: gajim/gtk/accounts.py:595
+#: gajim/gtk/accounts.py:598
 #, fuzzy
 msgid "Add Account"
 msgstr "_Aggiungi un contatto"
 
-#: gajim/gtk/accounts.py:663
+#: gajim/gtk/accounts.py:666
 #, fuzzy
 msgid "Label"
 msgstr "etichetta"
 
-#: gajim/gtk/accounts.py:667
+#: gajim/gtk/accounts.py:670
 msgid "Login"
 msgstr ""
 
-#: gajim/gtk/accounts.py:670
+#: gajim/gtk/accounts.py:673
 #, fuzzy
 msgid "Import Contacts"
 msgstr "Invita dei _contatti"
 
-#: gajim/gtk/accounts.py:674 gajim/gtk/accounts.py:870
+#: gajim/gtk/accounts.py:677 gajim/gtk/accounts.py:873
 #, fuzzy
 msgid "Client Certificate"
 msgstr "Certificato del client"
 
-#: gajim/gtk/accounts.py:677 gajim/gtk/accounts.py:774
+#: gajim/gtk/accounts.py:680 gajim/gtk/accounts.py:777
 #, fuzzy
 msgid "Connect on startup"
 msgstr "C_onnetti all'avvio di Gajim"
 
-#: gajim/gtk/accounts.py:681 gajim/gtk/accounts.py:779
+#: gajim/gtk/accounts.py:684 gajim/gtk/accounts.py:782
 #, fuzzy
 msgid "Save conversations for all contacts"
 msgstr "_Registra le conversazioni con tutti i contatti"
 
-#: gajim/gtk/accounts.py:683 gajim/gtk/accounts.py:781
+#: gajim/gtk/accounts.py:686 gajim/gtk/accounts.py:784
 msgid "Store conversations on the harddrive"
 msgstr ""
 
-#: gajim/gtk/accounts.py:685 gajim/gtk/accounts.py:783
+#: gajim/gtk/accounts.py:688 gajim/gtk/accounts.py:786
 #, fuzzy
 msgid "Global Status"
 msgstr "Tutti gli stati"
 
-#: gajim/gtk/accounts.py:687
+#: gajim/gtk/accounts.py:690
 #, fuzzy
 msgid "Synchronise the status of all accounts"
 msgstr "Cambia lo stato degli account"
 
-#: gajim/gtk/accounts.py:689
+#: gajim/gtk/accounts.py:692
 msgid "Use file transfer proxies"
 msgstr "Usa un proxy per il trasferimento di file"
 
-#: gajim/gtk/accounts.py:705
+#: gajim/gtk/accounts.py:708
 #, fuzzy
 msgid "Idle Time"
 msgstr "Inattivo da:"
 
-#: gajim/gtk/accounts.py:707
+#: gajim/gtk/accounts.py:710
 msgid "Disclose the time of your last activity"
 msgstr ""
 
-#: gajim/gtk/accounts.py:709
+#: gajim/gtk/accounts.py:712
 msgid "Local System Time"
 msgstr "Orario locale del sistema"
 
-#: gajim/gtk/accounts.py:711
+#: gajim/gtk/accounts.py:714
 msgid "Disclose the local system time of the device Gajim runs on"
 msgstr ""
 
-#: gajim/gtk/accounts.py:714
+#: gajim/gtk/accounts.py:717
 #, fuzzy
 msgid "Client / Operating System"
 msgstr "Certificato del client"
 
-#: gajim/gtk/accounts.py:716
+#: gajim/gtk/accounts.py:719
 #, fuzzy
 msgid ""
 "Disclose informations about the client and operating system you currently use"
@@ -10627,150 +11032,145 @@ msgstr ""
 "Consenti a Gajim di inviare informazioni sul sistema operativo che stai "
 "usando."
 
-#: gajim/gtk/accounts.py:719
+#: gajim/gtk/accounts.py:722
 #, fuzzy
 msgid "Ignore Unknown Contacts"
 msgstr "Invita contatti"
 
-#: gajim/gtk/accounts.py:721
+#: gajim/gtk/accounts.py:724
 #, 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:737 gajim/gtk/accounts.py:776
+#: gajim/gtk/accounts.py:740 gajim/gtk/accounts.py:779
 #, fuzzy
 msgid "Use environment variable"
 msgstr "_usa la variabile d'ambiente HTTP__PROXY"
 
-#: gajim/gtk/accounts.py:739
-#, fuzzy
-msgid "Proxy"
-msgstr "Proxy:"
-
-#: gajim/gtk/accounts.py:742
+#: gajim/gtk/accounts.py:745
 #, fuzzy
 msgid "Warn on insecure connection"
 msgstr "_Avvisa prima di utilizzare una connessione non sicura"
 
-#: gajim/gtk/accounts.py:746
+#: gajim/gtk/accounts.py:749
 msgid "Send keep-alive packets"
 msgstr "Invia pacchetti di keep-alive"
 
-#: gajim/gtk/accounts.py:750
+#: gajim/gtk/accounts.py:753
 msgid "Manually set the hostname for the server"
 msgstr ""
 
-#: gajim/gtk/accounts.py:756 gajim/gtk/accounts.py:826
-#: gajim/gtk/accounts.py:831
+#: gajim/gtk/accounts.py:759 gajim/gtk/accounts.py:829
+#: gajim/gtk/accounts.py:834
 #, fuzzy
 msgid "Priority"
 msgstr "Priori_tà:"
 
-#: gajim/gtk/accounts.py:785
+#: gajim/gtk/accounts.py:788
 #, fuzzy
 msgid "Synchronize the status of all accounts"
 msgstr "Cambia lo stato degli account"
 
-#: gajim/gtk/accounts.py:795
+#: gajim/gtk/accounts.py:798
 #, fuzzy
 msgid "First Name"
 msgstr "Nome:"
 
-#: gajim/gtk/accounts.py:798
+#: gajim/gtk/accounts.py:801
 #, fuzzy
 msgid "Last Name"
 msgstr "Cognome:"
 
-#: gajim/gtk/accounts.py:804
+#: gajim/gtk/accounts.py:807
 #, fuzzy
 msgid "Email"
 msgstr "Nuova e-mail"
 
-#: gajim/gtk/accounts.py:822
+#: gajim/gtk/accounts.py:825
 #, fuzzy
 msgid "Adjust to status"
 msgstr "_Modifica lo stato"
 
-#: gajim/gtk/accounts.py:849
+#: gajim/gtk/accounts.py:852
 msgid "Enable"
 msgstr "Abilita"
 
-#: gajim/gtk/accounts.py:857
+#: gajim/gtk/accounts.py:860
 #, fuzzy
 msgid "Port"
 msgstr "_Porta:"
 
-#: gajim/gtk/accounts.py:862
+#: gajim/gtk/accounts.py:865
 #, fuzzy
 msgid "Connection Settings"
 msgstr "Connessione"
 
-#: gajim/gtk/accounts.py:872
+#: gajim/gtk/accounts.py:875
 msgid "PKCS12 Files"
 msgstr "PKCS12 File"
 
-#: gajim/gtk/accounts.py:874
+#: gajim/gtk/accounts.py:877
 #, fuzzy
 msgid "Encrypted Certificate"
 msgstr "Certificato del client"
 
-#: gajim/gtk/accounts.py:878
+#: gajim/gtk/accounts.py:881
 #, fuzzy
 msgid "Certificate Settings"
 msgstr "Notifiche"
 
-#: gajim/gtk/accounts.py:890
+#: gajim/gtk/accounts.py:893
 #, fuzzy
 msgid "Save Password"
 msgstr "Memorizza la password"
 
-#: gajim/gtk/accounts.py:898
+#: gajim/gtk/accounts.py:901
 #, fuzzy
 msgid "Login Settings"
 msgstr "Plugin"
 
-#: gajim/gtk/accounts.py:931
+#: gajim/gtk/accounts.py:934
 #, fuzzy, python-format
 msgid "Removing account %s"
 msgstr "Eliminazione dell'account %s in corso"
 
-#: gajim/gtk/accounts.py:946
+#: gajim/gtk/accounts.py:949
 msgid "Account is disabled"
 msgstr "L'account è disabilitato"
 
-#: gajim/gtk/accounts.py:947
+#: gajim/gtk/accounts.py:950
 #, fuzzy
 msgid "To unregister from a server, the account must be enabled."
 msgstr "Per de-registrarsi da un server, l'account deve essere abilitato."
 
-#: gajim/gtk/accounts.py:962
+#: gajim/gtk/accounts.py:965
 #, fuzzy
 msgid "Password required"
 msgstr "È richiesta una password"
 
-#: gajim/gtk/accounts.py:976
+#: gajim/gtk/accounts.py:979
 #, fuzzy, python-format
 msgid "Account '%s' is still connected to the server"
 msgstr "L'account \"%s\" è connesso al server"
 
-#: gajim/gtk/accounts.py:978
+#: gajim/gtk/accounts.py:981
 msgid "If you remove it, the connection will be lost."
 msgstr "Se lo rimuovi, la connessione verrà persa."
 
-#: gajim/gtk/accounts.py:995
+#: gajim/gtk/accounts.py:998
 #, python-format
 msgid "Connection to server %s failed"
 msgstr "Connessione al server %s fallita"
 
-#: gajim/gtk/accounts.py:996
+#: gajim/gtk/accounts.py:999
 msgid "What would you like to do?"
 msgstr "Cosa vorresti fare?"
 
-#: gajim/gtk/accounts.py:997
+#: gajim/gtk/accounts.py:1000
 msgid "Remove only from Gajim"
 msgstr "Rimuovi solo da Gajim"
 
-#: gajim/gtk/accounts.py:998
+#: gajim/gtk/accounts.py:1001
 msgid "Don't remove anything. I'll try again later"
 msgstr "Non rimuovere nulla. Riproverò più tardi"
 
@@ -10799,6 +11199,10 @@ msgstr ""
 msgid "Modify"
 msgstr "Modifica"
 
+#: gajim/gtk/roster_item_exchange.py:80
+msgid "JID"
+msgstr "JID"
+
 #: gajim/gtk/roster_item_exchange.py:86
 msgid "Groups"
 msgstr "Gruppi"
@@ -10822,19 +11226,19 @@ msgid_plural "Removed %d contacts"
 msgstr[0] "Rimosso %d contatto"
 msgstr[1] "Rimossi %d contatti"
 
-#: gajim/gtk/util.py:581
+#: gajim/gtk/util.py:583
 msgid "Unknown Artist"
 msgstr "Artista sconosciuto"
 
-#: gajim/gtk/util.py:582
+#: gajim/gtk/util.py:584
 msgid "Unknown Title"
 msgstr "Titolo sconosciuto"
 
-#: gajim/gtk/util.py:583
+#: gajim/gtk/util.py:585
 msgid "Unknown Source"
 msgstr "Risorsa sconosciuta"
 
-#: gajim/gtk/util.py:585
+#: gajim/gtk/util.py:587
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
@@ -10843,29 +11247,10 @@ msgstr ""
 "<b>\"%(title)s\"</b> di <i>%(artist)s</i>\n"
 "da <i>%(source)s</i>"
 
-#: gajim/gtk/bookmarks.py:121
-msgid "New Group Chat"
-msgstr "Nuova conversazione di gruppo"
-
-#: gajim/gtk/bookmarks.py:161
-msgid "This bookmark has invalid data"
-msgstr "Questo segnalibro contiene dati non validi"
-
-#: gajim/gtk/bookmarks.py:162
-msgid ""
-"Please be sure to fill out server and room fields or remove this bookmark."
-msgstr ""
-"Controlla di avere compilato i campi server e stanza, o elimina questo "
-"segnalibro."
-
-#: gajim/gtk/bookmarks.py:273 gajim/gtk/bookmarks.py:291
-#: gajim/gtk/bookmarks.py:304 gajim/gtk/bookmarks.py:335
-msgid "Character not allowed"
-msgstr "Carattere non ammesso"
-
-#: gajim/gtk/bookmarks.py:334
-msgid "Invalid room"
-msgstr "Stanza non valida"
+#: gajim/gtk/bookmarks.py:47
+#, fuzzy, python-format
+msgid "Bookmarks for %s"
+msgstr "Aggiungi ai _segnalibri"
 
 #: gajim/plugins/pluginmanager.py:736 gajim/plugins/pluginmanager.py:742
 msgid "Archive corrupted"
@@ -10876,48 +11261,51 @@ msgid "Archive empty"
 msgstr "Archivio vuoto"
 
 #: gajim/plugins/pluginmanager.py:750 gajim/plugins/pluginmanager.py:758
-#: gajim/plugins/gui.py:257
+#: gajim/plugins/gui.py:258
 msgid "Archive is malformed"
 msgstr "L'archivio è malformato"
 
-#: gajim/plugins/pluginmanager.py:766 gajim/plugins/gui.py:281
-#: gajim/plugins/gui.py:289
+#: gajim/plugins/pluginmanager.py:766 gajim/plugins/gui.py:288
+#: gajim/plugins/gui.py:301
 msgid "Plugin already exists"
 msgstr "Il plugin esiste già"
 
-#: gajim/plugins/gui.py:82
+#: gajim/plugins/gui.py:83
 msgid "Click to view Gajim's wiki page on how to install plugins in Flatpak."
 msgstr ""
 
-#: gajim/plugins/gui.py:89
+#: gajim/plugins/gui.py:90
 msgid "Plugin"
 msgstr "Plugin"
 
-#: gajim/plugins/gui.py:151
+#: gajim/plugins/gui.py:152
 #, python-format
 msgid "Warning: %s"
 msgstr "Attenzione: %s"
 
-#: gajim/plugins/gui.py:206
+#: gajim/plugins/gui.py:207
 msgid "Plugin failed"
 msgstr "Plugin fallito"
 
-#: gajim/plugins/gui.py:245
+#: gajim/plugins/gui.py:246
 msgid "Unable to properly remove the plugin"
 msgstr "Impossibile rimuovere correttamente il plugin"
 
-#: gajim/plugins/gui.py:281
-msgid "Overwrite?"
+#: gajim/plugins/gui.py:287
+#, fuzzy
+msgid "Overwrite Plugin?"
 msgstr "Sovrascrivere?"
 
+#: gajim/plugins/gui.py:289
+#, fuzzy
+msgid "Do you want to overwrite the currently installed version?"
+msgstr "Vuoi accettare l'invito?"
+
 #: data/org.gajim.Gajim.desktop.in:5
-msgid "Jabber IM Client"
+#, fuzzy
+msgid "XMPP IM Client"
 msgstr "Client IM Jabber"
 
-#: data/org.gajim.Gajim.desktop.in:6
-msgid "A GTK+ Jabber client"
-msgstr "Un client Jabber GTK+"
-
 #: data/org.gajim.Gajim.desktop.in:8
 #, fuzzy
 msgid "chat;messaging;im;xmpp;bonjour;voip;"
@@ -10969,7 +11357,7 @@ msgid "Easily send pictures, videos or other files to friends and groups"
 msgstr ""
 
 #: data/org.gajim.Gajim.appdata.xml.in:27
-msgid "Chat securely with End-to-End encryption via OMEMO or PGP"
+msgid "Chat securely with End-to-End encryption via OMEMO or OpenPGP"
 msgstr ""
 
 #: data/org.gajim.Gajim.appdata.xml.in:28
@@ -11031,7 +11419,7 @@ msgstr ""
 
 #: data/org.gajim.Gajim.appdata.xml.in:52
 #, fuzzy
-msgid "Roster, list of contacts"
+msgid "Contact list, list of contacts"
 msgstr "_Registra i cambiamenti di stato dei contatti"
 
 #: data/org.gajim.Gajim.appdata.xml.in:56
@@ -11052,6 +11440,525 @@ msgstr "Cronologia dei registri"
 msgid "Plugin manager"
 msgstr "Plugin fallito"
 
+#~ msgid "Configure Services…"
+#~ msgstr "Configura i servizi..."
+
+#, fuzzy
+#~ msgid "Group Chat Bookmarks"
+#~ msgstr "Conversazione di gruppo"
+
+#, fuzzy
+#~ msgid "Add Bookmark"
+#~ msgstr "Aggiungi ai _segnalibri"
+
+#, fuzzy
+#~ msgid "Remove Bookmark"
+#~ msgstr "Aggiungi ai _segnalibri"
+
+#~ msgid "N_ame"
+#~ msgstr "N_ome"
+
+#, fuzzy
+#~ msgid "Bookmark Name"
+#~ msgstr "Aggiungi stanza ai segnalibri"
+
+#, fuzzy
+#~ msgid "_Server"
+#~ msgstr "_Server:"
+
+#, fuzzy
+#~ msgid "Roo_m"
+#~ msgstr "Stanza:"
+
+#, fuzzy
+#~ msgid "_Password"
+#~ msgstr "_Password:"
+
+#, fuzzy
+#~ msgid "Join chat when connected"
+#~ msgstr "Contatto disconnesso"
+
+#~ msgid "_Join Automatically"
+#~ msgstr "_Unisciti automaticamente"
+
+#~ msgid "New Group Chat"
+#~ msgstr "Nuova conversazione di gruppo"
+
+#~ msgid "This bookmark has invalid data"
+#~ msgstr "Questo segnalibro contiene dati non validi"
+
+#, fuzzy
+#~ msgid ""
+#~ "Please be sure to fill out server and group chat fields or remove this "
+#~ "bookmark."
+#~ msgstr ""
+#~ "Controlla di avere compilato i campi server e stanza, o elimina questo "
+#~ "segnalibro."
+
+#~ msgid "Character not allowed"
+#~ msgstr "Carattere non ammesso"
+
+#, fuzzy
+#~ msgid "Invalid Group Chat"
+#~ msgstr "JID della conversazione di gruppo non valido"
+
+#~ msgid "Unable to join group chat"
+#~ msgstr "Non si è in grado di unirsi alla conversazione di gruppo"
+
+#~ msgid "You are banned from group chat <b>%s</b>."
+#~ msgstr "Sei stato bloccato dalla stanza <b>%s</b>."
+
+#~ msgid "Remote server <b>%s</b> does not exist."
+#~ msgstr "Il server remoto <b>%s</b> non esiste."
+
+#~ msgid "Group chat <b>%s</b> does not exist."
+#~ msgstr "La conversazione di gruppo <b>%s</b> non esiste."
+
+#~ msgid "Group chat creation is not permitted."
+#~ msgstr "La creazione di conversazioni di gruppo non è permessa."
+
+#~ msgid "You must use your registered nickname in <b>%s</b>."
+#~ msgstr "Devi utilizzare il tuo soprannome registrato in <b>%s</b>."
+
+#, fuzzy
+#~ msgid "You are not in the members list in group chat %s."
+#~ msgstr "Non sei nella lista dei membri nella conversazione di gruppo %s."
+
+#, fuzzy
+#~ msgid "XMPP Address is not a group chat"
+#~ msgstr "Questa non è una conversazione di gruppo"
+
+#~ msgid "This is not a group chat"
+#~ msgstr "Questa non è una conversazione di gruppo"
+
+#, fuzzy
+#~ msgid "Please choose a group chat"
+#~ msgstr "Scegliere una stanza"
+
+#~ msgid "Invalid Nickname"
+#~ msgstr "Soprannome non valido"
+
+#~ msgid "Please choose a nickname"
+#~ msgstr "Scegli un altro soprannome"
+
+#~ msgid "Wrong server"
+#~ msgstr "Server errato"
+
+#, fuzzy
+#~ msgid "%s is not a group chat server"
+#~ msgstr "%s non è un server di conversazione di gruppo"
+
+#, fuzzy
+#~ msgid ""
+#~ "How many lines to request from server when entering a group chat. -1 "
+#~ "means no limit."
+#~ msgstr ""
+#~ "Quante linee richiedere al server entrando in una conversazione di "
+#~ "gruppo. -1 indica nessun limite"
+
+#, fuzzy
+#~ msgid ""
+#~ "Minutes of backlog to request when entering a group chat. -1 means no "
+#~ "limit."
+#~ msgstr ""
+#~ "Di quanti minuti indietro richiedere i log entrando in una conversazione "
+#~ "di gruppo. -1 indica nessun limite"
+
+#, fuzzy
+#~ msgid ""
+#~ "How many lines to request from server when entering a group chat. -1 "
+#~ "means no limit, -2 means global value."
+#~ msgstr ""
+#~ "Quante linee richiedere al server entrando in una conversazione di "
+#~ "gruppo. -1 indica nessun limite, -2 indica il valore globale"
+
+#, fuzzy
+#~ msgid ""
+#~ "Minutes of backlog to request when entering a group chat. -1 means no "
+#~ "limit, -2 means global value."
+#~ msgstr ""
+#~ "Di quanti minuti prima richiedere i log entrando in una conversazione di "
+#~ "gruppo. -1 indica nessun limite, -2 indica il valore globale"
+
+#, fuzzy
+#~ msgid "A Password is required to join the group chat %s. Please type it."
+#~ msgstr ""
+#~ "È necessaria una password per entrare nella stanza %s. Digitala, per "
+#~ "piacere."
+
+#~ msgid "Not in Roster"
+#~ msgstr "Non nei tuoi contatti"
+
+#~ msgid "I would like to add you to my roster"
+#~ msgstr "Vorrei aggiungerti ai miei contatti"
+
+#~ msgid "Add to Roster"
+#~ msgstr "Aggiungi all'elenco contatti"
+
+#~ msgid "Audio Session"
+#~ msgstr "Sessione audio"
+
+#~ msgid "Video Session"
+#~ msgstr "Sessione video"
+
+#~ msgid "Manage Room"
+#~ msgstr "Gestisci la stanza"
+
+#~ msgid "Configure Room"
+#~ msgstr "Configura la stanza"
+
+#~ msgid "Destroy Room"
+#~ msgstr "Elimina la stanza"
+
+#~ msgid "Change Nick"
+#~ msgstr "Cambia soprannome"
+
+#~ msgid "Disconnect"
+#~ msgstr "Disconnetti"
+
+#~ msgid "Copy JID"
+#~ msgstr "Copia JID"
+
+#~ msgid "Add to Roster…"
+#~ msgstr "Aggiungi all'elenco contatti…"
+
+#~ msgid "Copy JID/Email"
+#~ msgstr "Copia JID/indirizzo e-mail"
+
+#~ msgid "JID: <i>%s</i>"
+#~ msgstr "JID: <i>%s</i>"
+
+#~ msgid "Changing Subject"
+#~ msgstr "Cambio oggetto"
+
+#~ msgid "Please specify the new subject:"
+#~ msgstr "Per piacere, specifica il nuovo soggetto:"
+
+#~ msgid "Room logging is now enabled"
+#~ msgstr "La registrazione dei messaggi della stanza è stata attivata"
+
+#~ msgid "Room logging is now disabled"
+#~ msgstr "La registrazione dei messaggi della stanza è stata disattivata"
+
+#~ msgid "You (%s) joined the room"
+#~ msgstr "Tu (%s) ti sei unito alla stanza"
+
+#~ msgid "Room logging is enabled"
+#~ msgstr "La registrazione dei messaggi della stanza è stata attivata"
+
+#~ msgid "Unable to join groupchat"
+#~ msgstr "Non si è in grado di unirsi alla conversazione di gruppo"
+
+#~ msgid "Groupchat Invitation"
+#~ msgstr "Invito in una conversazione di gruppo"
+
+#~ msgid "%(jid)s has been invited in this room"
+#~ msgstr "%(jid)s è stato invitato in questa stanza"
+
+#~ msgid "JID is not a Groupchat"
+#~ msgstr "Il JID non è una conversazione di gruppo"
+
+#~ msgid "Invalid JID"
+#~ msgstr "JID non valido"
+
+#~ msgid "A connection is not available"
+#~ msgstr "Nessuna connessione disponibile"
+
+#~ msgid "JID already in list"
+#~ msgstr "JID già nella lista"
+
+#, fuzzy
+#~ msgid "For the chosen encryption there is no encryption method available"
+#~ msgstr "Nessuna connessione disponibile"
+
+#~ msgid "Removes contact from roster"
+#~ msgstr "Rimuove il contatto dal tuo elenco"
+
+#~ msgid "Not in roster"
+#~ msgstr "Non nell'elenco dei tuoi contatti"
+
+#~ msgid "Contact signed in notification color."
+#~ msgstr "Colore della notifica di contatto che effettua l'accesso."
+
+#~ msgid "Contact signout notification color"
+#~ msgstr "Colore della notifica di un contatto che si disconnette."
+
+#~ msgid "File transfer request notification color."
+#~ msgstr "Colore della notifica di un trasferimento file."
+
+#~ msgid "File transfer error notification color."
+#~ msgstr "Colore della notifica di un errore nel trasferimento file."
+
+#~ msgid "File transfer complete or stopped notification color."
+#~ msgstr ""
+#~ "Colore della notifica di un trasferimento file completato o interrotto."
+
+#~ msgid "Groupchat invitation notification color"
+#~ msgstr "Colore della notifica di un invito ad una conversazione di gruppo."
+
+#~ msgid "Other dialogs color."
+#~ msgstr "Colore delle altre finestre di dialogo."
+
+#~ msgid "Add * and [n] in roster title?"
+#~ msgstr "Aggiungere * e [n] al titolo dell'elenco dei tuoi contatti?"
+
+#~ msgid "Hides the banner in two persons chat window"
+#~ msgstr "Nasconde il banner nella finestra di conversazione a due persone"
+
+#, fuzzy
+#~ msgid ""
+#~ "Show the confirm metacontacts creation dialog or not? Empty string means "
+#~ "never show the dialog."
+#~ msgstr ""
+#~ "Mostrare la richiesta di conferma creazione metacontatti o meno? Una "
+#~ "stringa vuota significa che non verrà mai mostrata."
+
+#, fuzzy
+#~ msgid "If true, You will also see your webcam"
+#~ msgstr "Se Vero, anche la tua webcam sarà visibile"
+
+#~ msgid "Space separated list of ssl errors to ignore."
+#~ msgstr "Elenco degli errori ssl da ignorare separati da spazi."
+
+#~ msgid "Answer to receipt requests"
+#~ msgstr "Rispondi alle richieste di ricevuta"
+
+#~ msgid "Sent receipt requests"
+#~ msgstr "Richieste di ricevuta inviate"
+
+#, fuzzy
+#~ msgid "Language for which misspelled words will be checked"
+#~ msgstr "Linguaggio per il quale vogliamo controllare le parole sbagliate"
+
+#~ msgid "I'm eating, so leave me a message."
+#~ msgstr "Sto mangiando, lascia pure un messaggio."
+
+#, fuzzy
+#~ msgid "from room %s"
+#~ msgstr " dalla stanza %s"
+
+#~ msgid "Leave Groupchats"
+#~ msgstr "Esci dalle conversazioni di gruppo"
+
+#, fuzzy
+#~ msgid "Auto Join"
+#~ msgstr "Unisciti _automaticamente"
+
+#, fuzzy
+#~ msgid "Room"
+#~ msgstr "Stanza:"
+
+#~ msgid "Jabber ID:"
+#~ msgstr "ID Jabber: "
+
+#~ msgid "Occupant Actions"
+#~ msgstr "Azioni partecipante"
+
+#~ msgid "_Add to Roster"
+#~ msgstr "_Aggiungi all'elenco dei tuoi contatti"
+
+#~ msgid "_Manage Room"
+#~ msgstr "_Gestisci la stanza"
+
+#~ msgid "Configure _Room..."
+#~ msgstr "Configura la _stanza..."
+
+#~ msgid "_Destroy Room"
+#~ msgstr "_Elimina la stanza"
+
+#~ msgid "Jabber ID"
+#~ msgstr "ID Jabber"
+
+#, fuzzy
+#~ msgid "icon"
+#~ msgstr "Icona nell'area di notifica"
+
+#, fuzzy
+#~ msgid "account"
+#~ msgstr "account: "
+
+#, fuzzy
+#~ msgid "Roster"
+#~ msgstr "Mostra l'elenco dei tuoi _contatti"
+
+#~ msgid "Show only in roster"
+#~ msgstr "Mostra solo nell'elenco dei tuoi contatti"
+
+#~ msgid "in _roster"
+#~ msgstr "nell'elenco dei tuoi _contatti"
+
+#~ msgid "Roster Appearance"
+#~ msgstr "Aspetto dell'elenco dei tuoi contatti"
+
+#, fuzzy
+#~ msgid "Show chatstate in roster"
+#~ msgstr "Mostra gli a_vatar dei contatti nell'elenco dei tuoi contatti"
+
+#~ msgid "_Add to Roster..."
+#~ msgstr "_Aggiungi all'elenco dei tuoi contatti..."
+
+#~ msgid "_Jabber ID:"
+#~ msgstr "ID _Jabber:"
+
+#, fuzzy
+#~ msgid "_Jabber ID"
+#~ msgstr "ID _Jabber:"
+
+#~ msgid "JabberID"
+#~ msgstr "ID Jabber"
+
+#, fuzzy
+#~ msgid "Show Roster"
+#~ msgstr "Mostra l'elenco dei tuoi _contatti"
+
+#~ msgid "MUC server"
+#~ msgstr "Server MUC"
+
+#, fuzzy
+#~ msgid "Roster Shortcuts"
+#~ msgstr "Scorciatoie da tastiera"
+
+#~ msgid "Room Configuration"
+#~ msgstr "Configurazione della stanza"
+
+#~ msgid "Join _Group Chat"
+#~ msgstr "Entra in una conversazione di _gruppo"
+
+#~ msgid "Toggle audio session"
+#~ msgstr "Attiva sessione audio"
+
+#~ msgid "Audio sessions are not available"
+#~ msgstr "Le sessioni audio non sono disponibili"
+
+#~ msgid "Conference"
+#~ msgstr "Conferenze"
+
+#~ msgid "_Manage Bookmarks…"
+#~ msgstr "_Gestisci i segnalibri…"
+
+#~ msgid "Hide _Roster"
+#~ msgstr "Nascondi l'elenco dei tuoi _contatti"
+
+#~ msgid "Show _Roster"
+#~ msgstr "Mostra l'elenco dei tuoi _contatti"
+
+#~ msgid "Invalid Room"
+#~ msgstr "Stanza non valida"
+
+#~ msgid "Invalid room"
+#~ msgstr "Stanza non valida"
+
+#~ msgid "A GTK+ Jabber client"
+#~ msgstr "Un client Jabber GTK+"
+
+#~ msgid "Changing Nickname"
+#~ msgstr "Cambiamento del soprannome in corso"
+
+#~ msgid "Please specify the new nickname you want to use:"
+#~ msgstr "Specifica il nuovo soprannome che vuoi usare:"
+
+#~ msgid "Bookmark already set"
+#~ msgstr "Segnalibro già impostato"
+
+#, fuzzy
+#~ msgid "Group Chat '%s' is already in your bookmarks."
+#~ msgstr "La stanza \"%s\" è già tra i segnalibri."
+
+#~ msgid "Bookmark has been added successfully"
+#~ msgstr "Il segnalibro è stato aggiunto con successo"
+
+#, fuzzy
+#~ msgid ""
+#~ "You can manage your bookmarks by clicking the Bookmarks menu item in your "
+#~ "contact list."
+#~ msgstr ""
+#~ "È possibile gestire i segnalibri attraverso il menu Azioni nella finestra "
+#~ "della lista contatti."
+
+#~ msgid "The nickname contains invalid characters."
+#~ msgstr "Il soprannome contiene dei caratteri non consentiti."
+
+#~ msgid "Bookmark Room"
+#~ msgstr "Aggiungi stanza ai segnalibri"
+
+#~ msgid "_Join New Group Chat"
+#~ msgstr "_Unisciti a una nuova conversazione di gruppo"
+
+#, fuzzy
+#~ msgid "_Create Group Chat"
+#~ msgstr "Esci dalle conversazioni di gruppo"
+
+#~ msgid "Name:"
+#~ msgstr "Nome:"
+
+#~ msgid "Description:"
+#~ msgstr "Descrizione: "
+
+#, fuzzy
+#~ msgid "Address:"
+#~ msgstr "_Indirizzo:"
+
+#~ msgid "You can not start a new conversation unless you are connected."
+#~ msgstr ""
+#~ "Non è possibile unirsi a una nuova conversazione finché non si è connessi."
+
+#, fuzzy
+#~ msgid "Occupants"
+#~ msgstr "Azioni partecipante"
+
+#, fuzzy
+#~ msgid "File transfer error"
+#~ msgstr "Errore durante il trasferimento del file"
+
+#~ msgid "No Accounts available"
+#~ msgstr "Nessun account disponibile"
+
+#~ msgid "_Modify Account..."
+#~ msgstr "_Modifica l'account..."
+
+#~ msgid "Boolean"
+#~ msgstr "Booleano"
+
+#~ msgid "Integer"
+#~ msgstr "Intero"
+
+#~ msgid "Text"
+#~ msgstr "Testo"
+
+#~ msgid "Value"
+#~ msgstr "Valore"
+
+#~ msgid "Type"
+#~ msgstr "Tipo"
+
+#~ msgid "(None)"
+#~ msgstr "(Nessuna)"
+
+#~ msgid "Hidden"
+#~ msgstr "Nascosta"
+
+#~ msgid "Manage Proxy Profiles"
+#~ msgstr "Gestisci i profili proxy"
+
+#~ msgid "Properties"
+#~ msgstr "Proprietà"
+
+#, fuzzy
+#~ msgid "Proxy _Host"
+#~ msgstr "_Host del proxy:"
+
+#, fuzzy
+#~ msgid "Proxy _Port"
+#~ msgstr "_Porta del proxy:"
+
+#, fuzzy
+#~ msgid "New Groupchat"
+#~ msgstr "Nuova Conversazione di Gruppo"
+
+#, fuzzy
+#~ msgid "New Contact"
+#~ msgstr "Aggiungi un nuovo contatto"
+
 #~ msgid "%s GiB"
 #~ msgstr "%s GiB"
 
@@ -11136,9 +12043,6 @@ msgstr "Plugin fallito"
 #~ msgid "_Pause"
 #~ msgstr "_Pausa"
 
-#~ msgid "Clean _up"
-#~ msgstr "P_ulisci"
-
 #~ msgid "Remove file transfer from the list."
 #~ msgstr "Rimuove il trasferimento file dalla lista."
 
@@ -11160,10 +12064,6 @@ msgstr "Plugin fallito"
 #~ msgstr ""
 #~ "Mostra una notifica popup quando un trasferimento file viene completato"
 
-#, fuzzy
-#~ msgid "Select Files"
-#~ msgstr "Pulendo"
-
 #~ msgid "From:"
 #~ msgstr "Da:"
 
@@ -11603,9 +12503,6 @@ msgstr "Plugin fallito"
 #~ msgid "You are invited to a groupchat"
 #~ msgstr "Sei stato invitato ad un conversazione di gruppo"
 
-#~ msgid "Do you want to accept the invitation?"
-#~ msgstr "Vuoi accettare l'invito?"
-
 #, fuzzy
 #~ msgid ""
 #~ "<b>Issued to:</b>\n"
@@ -11875,10 +12772,6 @@ msgstr "Plugin fallito"
 #~ msgid "Nick"
 #~ msgstr "Soprannome"
 
-#, fuzzy
-#~ msgid "Banning…"
-#~ msgstr "Sto bloccando..."
-
 #~ msgid ""
 #~ "<b>Whom do you want to ban?</b>\n"
 #~ "\n"
@@ -11963,12 +12856,6 @@ msgstr "Plugin fallito"
 #~ msgid "Filter:"
 #~ msgstr "Filtro:"
 
-#~ msgid ""
-#~ "If checked, Gajim will display the mood of contacts in the roster window"
-#~ msgstr ""
-#~ "Se marcato, Gajim mostrerà lo stato d'animo dei contatti nella finestra "
-#~ "dei tuoi contatti"
-
 #~ msgid "<b>Chat Appearance</b>"
 #~ msgstr "<b>Aspetto della chat</b>"
 
@@ -12233,10 +13120,6 @@ msgstr "Plugin fallito"
 #~ msgstr "Messaggio di _stato:"
 
 #, fuzzy
-#~ msgid "Group chat highlight"
-#~ msgstr "Evidenziatura dei messaggi nelle conversazioni di gruppo:"
-
-#, fuzzy
 #~ msgid "Your nickname"
 #~ msgstr "Il tuo soprannome:"
 
@@ -12383,9 +13266,6 @@ msgstr "Plugin fallito"
 #~ msgid "The passwords typed in both fields must be identical."
 #~ msgstr "Le password immesse nei due campi devono essere identiche."
 
-#~ msgid "Enter new password:"
-#~ msgstr "Inserisci la nuova password:"
-
 #~ msgid "Enter it again for confirmation:"
 #~ msgstr "Inseriscila nuovamente per conferma:"
 
@@ -12400,10 +13280,6 @@ msgstr "Plugin fallito"
 #~ msgid "unsubscribe request from %s"
 #~ msgstr "richiesta di cancellazione abbonamento da %s"
 
-#, fuzzy
-#~ msgid "Autojoin"
-#~ msgstr "Unisciti _automaticamente"
-
 #~ msgid "&lt;empty&gt;"
 #~ msgstr "&lt;vuoto&gt;"
 
@@ -12516,9 +13392,6 @@ msgstr "Plugin fallito"
 #~ msgid "Forward unread message then disconnect"
 #~ msgstr "Inoltra messaggi non letti e disconnetti"
 
-#~ msgid "AIM Address:"
-#~ msgstr "Indirizzo AIM:"
-
 #~ msgid "MSN Address:"
 #~ msgstr "Indirizzo MSN:"
 
@@ -12567,9 +13440,6 @@ msgstr "Plugin fallito"
 #~ msgid "Session negotiation cancelled"
 #~ msgstr "Negoziazione della sessione annullata"
 
-#~ msgid "This session WILL be archived on server"
-#~ msgstr "Questa sessione SARÀ registrata sul server"
-
 #~ msgid "This session WILL NOT be archived on server"
 #~ msgstr "Questa sessione NON SARÀ registrata sul server"
 
@@ -12934,9 +13804,6 @@ msgstr "Plugin fallito"
 #~ msgid "Server:"
 #~ msgstr "Server:"
 
-#~ msgid "Password:"
-#~ msgstr "Password:"
-
 #~ msgid "Join this room _automatically when I connect"
 #~ msgstr "Entra _automaticamente in questa stanza alla connessione"
 
@@ -13300,9 +14167,6 @@ msgstr "Plugin fallito"
 #~ msgid "_Edit Personal Information..."
 #~ msgstr "_Modifica le informazioni personali..."
 
-#~ msgid "Information about you, as stored in the server"
-#~ msgstr "Informazioni su di te, archiviate sul server"
-
 #~ msgid "<b>Personal Information</b>"
 #~ msgstr "<b>Informazioni personali</b>"
 
@@ -13384,9 +14248,6 @@ msgstr "Plugin fallito"
 #~ msgid "Your server can't save your personal information."
 #~ msgstr "Il server non può salvare le informazioni personali."
 
-#~ msgid "Account Local already exists."
-#~ msgstr "L'account Local esiste già."
-
 #~ msgid "Please rename or remove it before enabling link-local messaging."
 #~ msgstr ""
 #~ "Rinominalo o rimuovilo prima di abilitare la messaggistica sulla rete "
@@ -13623,10 +14484,6 @@ msgstr "Plugin fallito"
 #~ msgid "Contact's identity verified"
 #~ msgstr "Identità del contatto verificata"
 
-#, fuzzy
-#~ msgid "Verify again…"
-#~ msgstr "Verifica di nuovo..."
-
 #~ msgid ""
 #~ "To be certain that <b>only</b> the expected person can read your messages "
 #~ "or send you messages, you need to verify their identity by clicking the "
@@ -13753,9 +14610,6 @@ msgstr "Plugin fallito"
 #~ msgid "Add _Contact..."
 #~ msgstr "Aggiungi un _contatto..."
 
-#~ msgid "_Accounts"
-#~ msgstr "_Account"
-
 #~ msgid "Profile, A_vatar"
 #~ msgstr "Profilo, a_vatar"
 
@@ -14043,12 +14897,6 @@ msgstr "Plugin fallito"
 #~ msgid "Always check to see if Gajim is the default Jabber client on startup"
 #~ msgstr "Verifica sempre se Gajim è il client Jabber predefinito all'avvio"
 
-#~ msgid "Join _Group Chat..."
-#~ msgstr "Entra in una conversazione di _gruppo..."
-
-#~ msgid "_Modify Account"
-#~ msgstr "_Modifica l'account"
-
 #~ msgid "Execute Command..."
 #~ msgstr "Esegui il comando..."
 
@@ -14603,9 +15451,6 @@ msgstr "Plugin fallito"
 #~ "Non sei connesso o non sei visibile ad altri. Il tuo messaggio non può "
 #~ "essere inviato."
 
-#~ msgid "Trayicon"
-#~ msgstr "Icona nell'area di notifica"
-
 #~ msgid "A icon in systemtray reflecting the current presence."
 #~ msgstr "Un'icona nell'area di notifica che riflette lo stato attuale."
 
@@ -14641,9 +15486,6 @@ msgstr "Plugin fallito"
 #~ msgid "Nickname not found: %s"
 #~ msgstr "Soprannome non trovato: %s"
 
-#~ msgid "This group chat has no subject"
-#~ msgstr "Questa stanza non ha soggetto"
-
 #~ msgid ""
 #~ "Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
 #~ "nickname of an occupant may be substituted, but not if it contains \"@\". "
@@ -14712,9 +15554,6 @@ msgstr "Plugin fallito"
 #~ msgstr ""
 #~ "Clicca per vedere i servizi (come i trasporti MSN o ICQ) dei server Jabber"
 
-#~ msgid "_Host:"
-#~ msgstr "_Host:"
-
 #~ msgid "Show _roster"
 #~ msgstr "Mostra l'elenco dei tuoi _contatti"
 
@@ -15128,9 +15967,6 @@ msgstr "Plugin fallito"
 #~ msgid "gtk+"
 #~ msgstr "gtk+"
 
-#~ msgid "A_fter nickname:"
-#~ msgstr "D_opo il soprannome:"
-
 #~ msgid "_After time:"
 #~ msgstr "_Dopo l'orario:"
 
@@ -15281,9 +16117,6 @@ msgstr "Plugin fallito"
 #~ msgid "Timeout"
 #~ msgstr "Timeout"
 
-#~ msgid "account: "
-#~ msgstr "account: "
-
 #~ msgid "Activate/Disable notification for when a file transfer is complete"
 #~ msgstr ""
 #~ "Abilita/disabilita la notifica di quando un trasferimento di un file è "
@@ -15414,9 +16247,6 @@ msgstr "Plugin fallito"
 #~ msgid "_Earliest"
 #~ msgstr "Più _vecchi"
 
-#~ msgid "_Latest"
-#~ msgstr "_Ultimo"
-
 #~ msgid "Filter query too short"
 #~ msgstr "Richiesta del filtro troppo breve"
 
@@ -15542,8 +16372,5 @@ msgstr "Plugin fallito"
 #~ msgid "If you close the window, this message will be lost."
 #~ msgstr "Chiudendo la finestra, questo messaggio verrà perso."
 
-#~ msgid "_About"
-#~ msgstr "_Informazioni"
-
 #~ msgid "paused"
 #~ msgstr "in pausa"
diff --git a/po/ja.po b/po/ja.po
index 5ddc23207..62ff7b2d5 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: 2019-07-02 02:06+0000\n"
+"POT-Creation-Date: 2019-08-11 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,72 @@ msgstr ""
 "X-Pootle-Path: /ja/gajim/ja.po\n"
 "X-Pootle-Revision: 1602\n"
 
-#: gajim/chat_control_base.py:550
+#: gajim/chat_control_base.py:557
 msgid "_Undo"
 msgstr "元に戻す (_U)"
 
-#: gajim/chat_control_base.py:558 gajim/conversation_textview.py:529
+#: gajim/chat_control_base.py:565 gajim/conversation_textview.py:529
 msgid "_Clear"
 msgstr "消去 (_C)"
 
-#: gajim/chat_control_base.py:563
+#: gajim/chat_control_base.py:570
 msgid "Paste as quote"
 msgstr ""
 
-#: gajim/chat_control_base.py:613
+#: gajim/chat_control_base.py:620
 #, fuzzy
 msgid "Paste Image"
 msgstr "画像の選択"
 
-#: gajim/chat_control_base.py:614
+#: gajim/chat_control_base.py:621
 #, fuzzy
 msgid "You are trying to paste an image"
 msgstr "タブを閉じようとしています"
 
-#: gajim/chat_control_base.py:615
+#: gajim/chat_control_base.py:622
 #, fuzzy
 msgid ""
 "Are you sure you want to paste your clipboard's image into the chat window?"
 msgstr "本当にグループチャット \"%s\" から退出しますか ?"
 
-#: gajim/chat_control_base.py:617 gajim/groupchat_control.py:2310
-#: gajim/roster_window.py:2848 gajim/roster_window.py:4167
-#: gajim/message_window.py:252 gajim/gtk/dialogs.py:418
+#: gajim/chat_control_base.py:624 gajim/groupchat_control.py:2218
+#: gajim/roster_window.py:2841 gajim/roster_window.py:4118
+#: gajim/message_window.py:359 gajim/gtk/dialogs.py:330
 msgid "_Do not ask me again"
 msgstr "次回から質問しない (_D)"
 
-#: gajim/chat_control_base.py:620
+#: gajim/chat_control_base.py:627
 msgid "_Paste"
 msgstr ""
 
-#: gajim/chat_control_base.py:1162 gajim/gtk/accounts.py:351
+#: gajim/chat_control_base.py:1169 gajim/gtk/accounts.py:354
 #, fuzzy
 msgid "Privacy"
 msgstr "プライバシーリスト"
 
-#: gajim/chat_control_base.py:1163
+#: gajim/chat_control_base.py:1170
 #, fuzzy
 msgid "Warning"
 msgstr "警告: %s"
 
-#: gajim/chat_control_base.py:1164
+#: gajim/chat_control_base.py:1171
 #, fuzzy, python-format
 msgid "If you send a file to <b>%s</b>, your real JID will be revealed."
 msgstr ""
 "ファイルを %s に送信すると、その相手はあなたの本当の JID を知ることになりま"
 "す。"
 
-#: gajim/chat_control_base.py:1169
+#: gajim/chat_control_base.py:1176
 #, fuzzy
 msgid "Continue"
 msgstr "続ける (_C)"
 
-#: gajim/gtkgui_helpers.py:163 gajim/gtk/filetransfer.py:393
+#: gajim/gtkgui_helpers.py:163 gajim/gtk/filetransfer.py:398
 #, fuzzy, python-format
 msgid "Cannot overwrite existing file '%s'"
 msgstr "既存のファイル \"%s\" に上書きできません"
 
-#: gajim/gtkgui_helpers.py:164 gajim/gtk/filetransfer.py:394
+#: gajim/gtkgui_helpers.py:164 gajim/gtk/filetransfer.py:399
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
@@ -165,348 +165,366 @@ msgstr "保留中の在席通知の申し込みはありません。"
 msgid " resource with priority "
 msgstr " リソース。優先順位は "
 
-#: gajim/gui_menu_builder.py:96
-msgid "_New Group Chat"
-msgstr "新しいグループチャット (_N)"
+#: gajim/gui_menu_builder.py:251 gajim/gui_menu_builder.py:342
+#: gajim/chat_control.py:305 gajim/roster_window.py:783
+#: gajim/roster_window.py:1716 gajim/roster_window.py:1718
+#: gajim/roster_window.py:2027 gajim/roster_window.py:3292
+#: gajim/roster_window.py:3325 gajim/gui_interface.py:396
+#: gajim/common/contacts.py:222 gajim/common/contacts.py:359
+#: gajim/common/contacts.py:471 gajim/common/helpers.py:86
+#: gajim/common/helpers.py:317 gajim/gtk/add_contact.py:319
+#: gajim/gtk/subscription_request.py:70 gajim/gtk/subscription_request.py:99
+#: gajim/gtk/roster_item_exchange.py:112
+#, fuzzy
+msgid "Not in contact list"
+msgstr "オフラインの相手先を表示"
 
-#: gajim/gui_menu_builder.py:289 gajim/gui_menu_builder.py:380
-#: gajim/chat_control.py:303 gajim/roster_window.py:786
-#: gajim/roster_window.py:1719 gajim/roster_window.py:1721
-#: gajim/roster_window.py:2030 gajim/roster_window.py:3336
-#: gajim/roster_window.py:3369 gajim/gui_interface.py:413
-#: gajim/common/contacts.py:206 gajim/common/contacts.py:343
-#: gajim/common/helpers.py:83 gajim/common/helpers.py:311
-#: gajim/gtk/add_contact.py:319 gajim/gtk/subscription_request.py:70
-#: gajim/gtk/subscription_request.py:99 gajim/gtk/roster_item_exchange.py:112
-msgid "Not in Roster"
-msgstr "名簿にありません"
-
-#: gajim/gui_menu_builder.py:393
-msgid "I would like to add you to my roster"
-msgstr "私はあなたを名簿に追加したいと思っています"
-
-#: gajim/gui_menu_builder.py:471
+#: gajim/gui_menu_builder.py:355
+#, fuzzy
+msgid "I would like to add you to my contact list"
+msgstr "あなたを私の相手先リストに追加したいと思います。"
+
+#: gajim/gui_menu_builder.py:433
 msgid "Send Single _Message…"
 msgstr "単発メッセージを送信…(_M)"
 
-#: gajim/gui_menu_builder.py:486
+#: gajim/gui_menu_builder.py:448
 msgid "E_xecute Command…"
 msgstr "コマンド実行…(_X)"
 
-#: gajim/gui_menu_builder.py:494
+#: gajim/gui_menu_builder.py:456
 msgid "_Manage Transport"
 msgstr "中継先の管理 (_M)"
 
-#: gajim/gui_menu_builder.py:500
+#: gajim/gui_menu_builder.py:462
 msgid "_Modify Transport"
 msgstr "中継先の変更 (_M)"
 
-#: gajim/gui_menu_builder.py:507 gajim/roster_window.py:5046
+#: gajim/gui_menu_builder.py:469 gajim/roster_window.py:4985
 msgid "_Rename…"
 msgstr "名前の変更…(_R)"
 
-#: gajim/gui_menu_builder.py:518 gajim/roster_window.py:5062
-#: gajim/roster_window.py:5177 gajim/data/gui/blocked_contacts_window.ui:52
+#: gajim/gui_menu_builder.py:480 gajim/roster_window.py:5001
+#: gajim/roster_window.py:5116 gajim/data/gui/blocked_contacts_window.ui:52
 #: gajim/data/gui/gc_occupants_menu.ui:148
 #: gajim/data/gui/contact_context_menu.ui:143
 msgid "_Unblock"
 msgstr "遮断の解除 (_U)"
 
-#: gajim/gui_menu_builder.py:521 gajim/roster_window.py:5067
-#: gajim/roster_window.py:5181 gajim/data/gui/gc_occupants_menu.ui:140
+#: gajim/gui_menu_builder.py:483 gajim/roster_window.py:5006
+#: gajim/roster_window.py:5120 gajim/data/gui/gc_occupants_menu.ui:140
 #: gajim/data/gui/contact_context_menu.ui:151
 msgid "_Block"
 msgstr "遮断 (_B)"
 
-#: gajim/gui_menu_builder.py:529 gajim/roster_window.py:5074
+#: gajim/gui_menu_builder.py:491 gajim/roster_window.py:5013
 #: gajim/data/gui/contact_context_menu.ui:181
 msgid "Remo_ve"
 msgstr "削除 (_V)"
 
-#: gajim/gui_menu_builder.py:539 gajim/data/gui/contact_context_menu.ui:198
+#: gajim/gui_menu_builder.py:501 gajim/data/gui/contact_context_menu.ui:198
 msgid "_Information"
 msgstr "情報 (_I)"
 
-#: gajim/gui_menu_builder.py:552
+#: gajim/gui_menu_builder.py:514
 msgid "Save _As"
 msgstr "名前を付けて保存 (_A)"
 
-#: gajim/gui_menu_builder.py:564 gajim/groupchat_control.py:501
-#: gajim/chat_control.py:340
+#: gajim/gui_menu_builder.py:526 gajim/groupchat_control.py:507
+#: gajim/chat_control.py:342
 msgid "Send File…"
 msgstr "ファイルを送信…"
 
-#: gajim/gui_menu_builder.py:565
+#: gajim/gui_menu_builder.py:527
 msgid "Upload File…"
 msgstr "ファイルをアップロード…"
 
-#: gajim/gui_menu_builder.py:566
+#: gajim/gui_menu_builder.py:528
 msgid "Send File Directly…"
 msgstr "直接ファイルを送信…"
 
 # 起動時に名簿を表示するか
-#: gajim/gui_menu_builder.py:568 gajim/gui_menu_builder.py:632
+#: gajim/gui_menu_builder.py:530 gajim/gui_menu_builder.py:596
 #, fuzzy
 msgid "Send Chatstate"
 msgstr "以前の状態"
 
-#: gajim/gui_menu_builder.py:569
+#: gajim/gui_menu_builder.py:531
 msgid "Invite Contacts"
 msgstr "相手先を招待"
 
-#: gajim/gui_menu_builder.py:570
-msgid "Add to Roster"
-msgstr "名簿に追加"
+#: gajim/gui_menu_builder.py:532
+#, fuzzy
+msgid "Add to Contact List"
+msgstr "相手先を追加"
 
-#: gajim/gui_menu_builder.py:571
-msgid "Audio Session"
-msgstr "音声会話"
+#: gajim/gui_menu_builder.py:533
+#, fuzzy
+msgid "Voice Chat"
+msgstr "音声チャットの要求"
 
-#: gajim/gui_menu_builder.py:572
-msgid "Video Session"
-msgstr "ビデオ会話"
+#: gajim/gui_menu_builder.py:534
+#, fuzzy
+msgid "Video Chat"
+msgstr "ビデオのテスト"
 
-#: gajim/gui_menu_builder.py:573
+#: gajim/gui_menu_builder.py:535 gajim/gui_menu_builder.py:582
 msgid "Information"
 msgstr "情報"
 
-#: gajim/gui_menu_builder.py:574 gajim/gui_menu_builder.py:639
+#: gajim/gui_menu_builder.py:536 gajim/gui_menu_builder.py:602
 #: gajim/data/gui/application_menu.ui:37
 msgid "History"
 msgstr "履歴"
 
-#: gajim/gui_menu_builder.py:580 gajim/gui_menu_builder.py:687
+#: gajim/gui_menu_builder.py:542 gajim/gui_menu_builder.py:650
 #: gajim/data/gui/preferences_window.ui:1823
 msgid "Disabled"
 msgstr "無効"
 
-#: gajim/gui_menu_builder.py:581 gajim/gui_menu_builder.py:688
+#: gajim/gui_menu_builder.py:543 gajim/gui_menu_builder.py:651
 msgid "Composing only"
 msgstr "入力中のみ"
 
-#: gajim/gui_menu_builder.py:582 gajim/gui_menu_builder.py:689
+#: gajim/gui_menu_builder.py:544 gajim/gui_menu_builder.py:652
 msgid "All chat states"
 msgstr "すべてのチャット状態"
 
-#: gajim/gui_menu_builder.py:620
-msgid "Manage Room"
-msgstr "談話室を管理"
+#: gajim/gui_menu_builder.py:583
+#, fuzzy
+msgid "Manage Group Chat"
+msgstr "グループチャットから退出"
 
-#: gajim/gui_menu_builder.py:621
+#: gajim/gui_menu_builder.py:584 gajim/data/gui/groupchat_control.ui:649
 msgid "Change Subject"
 msgstr "談話室の題を変更"
 
-#: gajim/gui_menu_builder.py:622
-msgid "Configure Room"
-msgstr "談話室を調整"
+#: gajim/gui_menu_builder.py:585
+#, fuzzy
+msgid "Configure Group Chat"
+msgstr "グループチャットから退出"
 
-#: gajim/gui_menu_builder.py:623
+#: gajim/gui_menu_builder.py:586
 msgid "Upload Avatar…"
 msgstr "アバターをアップロード…"
 
-#: gajim/gui_menu_builder.py:624
-msgid "Destroy Room"
-msgstr "談話室を閉鎖"
+#: gajim/gui_menu_builder.py:587
+#, fuzzy
+msgid "Destroy Group Chat"
+msgstr "新しいグループチャット"
 
-#: gajim/gui_menu_builder.py:626 gajim/data/gui/preferences_window.ui:790
+#: gajim/gui_menu_builder.py:589 gajim/data/gui/preferences_window.ui:790
 #, fuzzy
 msgid "Chat Settings"
 msgstr "チャットのショートカット"
 
-#: gajim/gui_menu_builder.py:627
+#: gajim/gui_menu_builder.py:590
 msgid "Show join/leave"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:628
+#: gajim/gui_menu_builder.py:591
 #, fuzzy
 msgid "Show status changes"
 msgstr "相手先の状況変更を記録する (_S)"
 
-#: gajim/gui_menu_builder.py:629 gajim/data/gui/gc_control_popup_menu.ui:72
+#: gajim/gui_menu_builder.py:592 gajim/data/gui/gc_control_popup_menu.ui:72
 msgid "Notify on all messages"
 msgstr "すべてのメッセージを通知する"
 
-#: gajim/gui_menu_builder.py:630
+#: gajim/gui_menu_builder.py:593
 msgid "Minimize on close"
 msgstr "閉じるボタンで最小化"
 
-#: gajim/gui_menu_builder.py:631
+#: gajim/gui_menu_builder.py:595
 #, fuzzy
-msgid "Minimize on autojoin"
+msgid "Minimize when joining automatically"
 msgstr "自動参加して最小化"
 
-#: gajim/gui_menu_builder.py:634
+#: gajim/gui_menu_builder.py:598
 msgid "Sync Threshold"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:635
-msgid "Change Nick"
-msgstr "ニックネームを変更"
-
-#: gajim/gui_menu_builder.py:636
-msgid "Bookmark Room"
-msgstr "この談話室をブックマークする"
+#: gajim/gui_menu_builder.py:599
+#, fuzzy
+msgid "Change Nickname"
+msgstr "ニックネームを変更...(_N)"
 
-#: gajim/gui_menu_builder.py:637
+#: gajim/gui_menu_builder.py:600
 msgid "Request Voice"
 msgstr "発言権を要求"
 
-#: gajim/gui_menu_builder.py:638 gajim/roster_window.py:5246
+#: gajim/gui_menu_builder.py:601 gajim/roster_window.py:5185
 msgid "Execute command"
 msgstr "コマンドを実行"
 
-#: gajim/gui_menu_builder.py:640
-msgid "Disconnect"
-msgstr "切断"
+#: gajim/gui_menu_builder.py:603
+msgid "Leave"
+msgstr ""
 
-#: gajim/gui_menu_builder.py:678 gajim/gtk/preferences.py:156
+#: gajim/gui_menu_builder.py:641 gajim/gtk/preferences.py:155
 msgid "No threshold"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:680 gajim/gtk/preferences.py:158
+#: gajim/gui_menu_builder.py:643 gajim/gtk/preferences.py:157
 #, python-format
 msgid "%i day"
 msgid_plural "%i days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: gajim/gui_menu_builder.py:709 gajim/gui_menu_builder.py:747
-#: gajim/gtk/join_groupchat.py:43
-msgid "Join Group Chat"
-msgstr "グループチャットに参加"
-
-#: gajim/gui_menu_builder.py:746
+#: gajim/gui_menu_builder.py:672
 msgid "Add Contact…"
 msgstr "相手先を追加..."
 
-#: gajim/gui_menu_builder.py:748 gajim/gtk/profile.py:52
-#: gajim/gtk/accounts.py:770 gajim/gtk/accounts.py:808
+#: gajim/gui_menu_builder.py:673 gajim/gtk/profile.py:52
+#: gajim/gtk/accounts.py:773 gajim/gtk/accounts.py:811
 msgid "Profile"
 msgstr "プロフィール"
 
-#: gajim/gui_menu_builder.py:749
+#: gajim/gui_menu_builder.py:674
+msgid "Send Single Message…"
+msgstr "単発メッセージを送信…"
+
+#: gajim/gui_menu_builder.py:675
 msgid "Discover Services"
 msgstr "サービスを探索"
 
-#: gajim/gui_menu_builder.py:750
-msgid "Send Single Message…"
-msgstr "単発メッセージを送信…"
+#: gajim/gui_menu_builder.py:676 gajim/gtk/server_info.py:36
+msgid "Server Info"
+msgstr "サーバー情報"
 
-#: gajim/gui_menu_builder.py:751 gajim/data/gui/preferences_window.ui:2741
+#: gajim/gui_menu_builder.py:677 gajim/data/gui/preferences_window.ui:2741
 msgid "Advanced"
 msgstr "拡張"
 
-#: gajim/gui_menu_builder.py:752 gajim/gtk/mam_preferences.py:88
+#: gajim/gui_menu_builder.py:678 gajim/gtk/mam_preferences.py:88
 msgid "Archiving Preferences"
 msgstr "書庫の設定"
 
-#: gajim/gui_menu_builder.py:753
+#: gajim/gui_menu_builder.py:679
 #, fuzzy
 msgid "Blocking List"
 msgstr "追放者の一覧"
 
-#: gajim/gui_menu_builder.py:754 gajim/gtk/history_sync.py:108
+#: gajim/gui_menu_builder.py:680
+msgid "Bookmarks"
+msgstr "ブックマーク"
+
+#: gajim/gui_menu_builder.py:681
+#, fuzzy
+msgid "PEP Configuration"
+msgstr "調整"
+
+#: gajim/gui_menu_builder.py:682 gajim/gtk/history_sync.py:108
 #: gajim/gtk/history_sync.py:186
 msgid "Synchronise History"
 msgstr "履歴を同期"
 
-#: gajim/gui_menu_builder.py:755 gajim/gtk/privacy_list.py:427
+#: gajim/gui_menu_builder.py:683 gajim/gtk/privacy_list.py:427
 msgid "Privacy Lists"
 msgstr "プライバシーリスト"
 
-#: gajim/gui_menu_builder.py:756 gajim/gtk/server_info.py:36
-msgid "Server Info"
-msgstr "サーバー情報"
-
-#: gajim/gui_menu_builder.py:757 gajim/gui_menu_builder.py:768
+#: gajim/gui_menu_builder.py:685 gajim/gui_menu_builder.py:696
 #: gajim/data/gui/xml_console_window.ui:77
 msgid "XML Console"
 msgstr "XML コンソール"
 
-#: gajim/gui_menu_builder.py:759 gajim/data/gui/groupchat_config.ui:36
+#: gajim/gui_menu_builder.py:687 gajim/data/gui/groupchat_config.ui:36
 msgid "Admin"
 msgstr "管理"
 
-#: gajim/gui_menu_builder.py:760
+#: gajim/gui_menu_builder.py:688
 msgid "Send Server Message…"
 msgstr "サーバーメッセージを送信..."
 
-#: gajim/gui_menu_builder.py:761
+#: gajim/gui_menu_builder.py:689
 msgid "Set MOTD…"
 msgstr "MOTD を設定…"
 
-#: gajim/gui_menu_builder.py:762
+#: gajim/gui_menu_builder.py:690
 msgid "Update MOTD…"
 msgstr "MOTD を更新…"
 
-#: gajim/gui_menu_builder.py:763
+#: gajim/gui_menu_builder.py:691
 msgid "Delete MOTD…"
 msgstr "MOTD を削除…"
 
-#: gajim/gui_menu_builder.py:812
-msgid "No Accounts available"
-msgstr "アカウントがありません"
+#: gajim/gui_menu_builder.py:736
+#, fuzzy
+msgid "_Add Account…"
+msgstr "アカウントを追加…"
+
+#: gajim/gui_menu_builder.py:742
+#, fuzzy
+msgid "_Modify Accounts…"
+msgstr "アカウントを編集...(_M)"
 
-#: gajim/gui_menu_builder.py:823 gajim/data/gui/application_menu.ui:5
-#: gajim/data/gui/application_menu.ui:71 gajim/data/gui/shortcuts_window.ui:182
-#: gajim/gtk/accounts.py:58
+#: gajim/gui_menu_builder.py:751 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:755 gajim/data/gui/application_menu.ui:5
+#: gajim/data/gui/shortcuts_window.ui:182 gajim/gtk/accounts.py:57
 msgid "Accounts"
 msgstr "アカウント"
 
-#: gajim/gui_menu_builder.py:881 gajim/gui_menu_builder.py:886
-msgid "Copy JID"
-msgstr "JID をコピー"
+#: gajim/gui_menu_builder.py:784 gajim/gui_menu_builder.py:789
+#, fuzzy
+msgid "Copy XMPP Address"
+msgstr "Eメールアドレスをコピー"
 
-#: gajim/gui_menu_builder.py:882 gajim/gui_menu_builder.py:914
+#: gajim/gui_menu_builder.py:785 gajim/gui_menu_builder.py:817
 msgid "Join Groupchat"
 msgstr "グループチャットに参加"
 
-#: gajim/gui_menu_builder.py:887 gajim/gui_menu_builder.py:913
-#: gajim/data/gui/application_menu.ui:76
+#: gajim/gui_menu_builder.py:790 gajim/gui_menu_builder.py:816
+#: gajim/data/gui/application_menu.ui:71
 #: gajim/data/gui/subscription_request_window.ui:106
 msgid "Start Chat"
 msgstr "チャットを開始"
 
-#: gajim/gui_menu_builder.py:888 gajim/gui_menu_builder.py:915
+#: gajim/gui_menu_builder.py:791 gajim/gui_menu_builder.py:818
 #, fuzzy
-msgid "Add to Roster…"
-msgstr "名簿に追加"
+msgid "Add to Contact List…"
+msgstr "相手先を追加..."
 
-#: gajim/gui_menu_builder.py:893
+#: gajim/gui_menu_builder.py:796
 #, fuzzy
 msgid "Copy Link Location"
 msgstr "リンクの場所をコピー (_C)"
 
-#: gajim/gui_menu_builder.py:894
+#: gajim/gui_menu_builder.py:797
 #, fuzzy
 msgid "Open Link in Browser"
 msgstr "リンク先をブラウザで開く (_O)"
 
-#: gajim/gui_menu_builder.py:899
+#: gajim/gui_menu_builder.py:802
 msgid "Copy Email Address"
 msgstr "Eメールアドレスをコピー"
 
-#: gajim/gui_menu_builder.py:900 gajim/gui_menu_builder.py:912
+#: gajim/gui_menu_builder.py:803 gajim/gui_menu_builder.py:815
 #, fuzzy
 msgid "Open Email Composer"
 msgstr "メール作成画面を開く (_O)"
 
-#: gajim/gui_menu_builder.py:905
+#: gajim/gui_menu_builder.py:808
 #, fuzzy
 msgid "Copy Location"
 msgstr "リンクの場所をコピー (_C)"
 
-#: gajim/gui_menu_builder.py:906
+#: gajim/gui_menu_builder.py:809
 #, fuzzy
 msgid "Show Location"
 msgstr "位置:"
 
-#: gajim/gui_menu_builder.py:911
+#: gajim/gui_menu_builder.py:814
 #, fuzzy
-msgid "Copy JID/Email"
-msgstr "JID/Eメールアドレスをコピー (_C)"
+msgid "Copy XMPP Address/Email"
+msgstr "Eメールアドレスをコピー"
 
-#: gajim/gui_menu_builder.py:945
+#: gajim/gui_menu_builder.py:852
 #, fuzzy
 msgid "Copy"
 msgstr "JID をコピー"
@@ -527,44 +545,55 @@ msgstr "このヘルプを表示して終了"
 msgid "Choose folder for logfile"
 msgstr "記録ファイルのフォルダーを選択してください"
 
-#: gajim/history_manager.py:107
+#: gajim/history_manager.py:106
 msgid "Cannot find history logs database"
 msgstr "履歴記録データベースが見つかりません"
 
-#: gajim/history_manager.py:108
+#: gajim/history_manager.py:107
 #, fuzzy, python-format
 msgid "%s does not exist."
 msgstr "ファイルがありません"
 
-#: gajim/history_manager.py:141 gajim/history_manager.py:195
-#: gajim/gtk/discovery.py:829 gajim/gtk/roster_item_exchange.py:80
-msgid "JID"
-msgstr "JID"
+#: gajim/history_manager.py:140 gajim/history_manager.py:194
+#: 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:30
+#: gajim/gtk/accounts.py:804
+#, fuzzy
+msgid "XMPP Address"
+msgstr "AIM アドレス:"
 
-#: gajim/history_manager.py:154 gajim/history_manager.py:202
+#: gajim/history_manager.py:153 gajim/history_manager.py:201
 #: gajim/data/gui/history_window.ui:89 gajim/gtk/history.py:108
 msgid "Date"
 msgstr "日付"
 
-#: gajim/history_manager.py:161 gajim/history_manager.py:225
+#: gajim/history_manager.py:160 gajim/history_manager.py:224
 #: gajim/data/gui/join_groupchat_window.ui:208
 #: gajim/data/gui/profile_window.ui:214
 #: gajim/data/gui/vcard_information_window.ui:443
+#: gajim/data/gui/bookmarks.ui:140
 msgid "Nickname"
 msgstr "ニックネーム"
 
-#: gajim/history_manager.py:172 gajim/history_manager.py:211
+#: gajim/history_manager.py:171 gajim/history_manager.py:210
 #: gajim/data/gui/preferences_window.ui:1344
 #: gajim/data/gui/single_message_window.ui:275 gajim/gtk/history.py:117
 msgid "Message"
 msgstr "メッセージ"
 
-#: gajim/history_manager.py:180 gajim/history_manager.py:218
+#: gajim/history_manager.py:179 gajim/history_manager.py:217
 #: gajim/data/gui/groups_post_window.ui:49
 #: gajim/data/gui/single_message_window.ui:214
 msgid "Subject"
 msgstr "題"
 
+#: gajim/history_manager.py:247
+msgid "Database Cleanup"
+msgstr "データベースの掃除"
+
 #: gajim/history_manager.py:248
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
@@ -574,12 +603,10 @@ msgstr ""
 "せん)"
 
 #: gajim/history_manager.py:250
+#, fuzzy
 msgid ""
-"Normally allocated database size will not be freed, it will just become "
-"reusable. If you really want to reduce database filesize, click YES, else "
-"click NO.\n"
-"\n"
-"In case you click YES, please wait…"
+"Normally, the allocated database size will not be freed, it will just become "
+"reusable. This operation may take a while."
 msgstr ""
 "通常、データベース領域が空になるわけではなく、再使用可能になるだけです。もし"
 "データベース領域を本当に消去する場合は YES を、そうでなければ NO をクリックし"
@@ -588,47 +615,48 @@ msgstr ""
 "YES をクリックした場合、しばらくお待ちください…"
 
 #: gajim/history_manager.py:255
-msgid "Database Cleanup"
-msgstr "データベースの掃除"
+#, fuzzy
+msgid "_Cleanup"
+msgstr "消去 (_U)"
 
-#: gajim/history_manager.py:519 gajim/gtk/filetransfer.py:238
-#: gajim/gtk/filetransfer.py:248
+#: gajim/history_manager.py:518 gajim/gtk/filetransfer.py:237
+#: gajim/gtk/filetransfer.py:247
 msgid "You"
 msgstr "あなた"
 
-#: gajim/history_manager.py:531
+#: gajim/history_manager.py:530
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(time)s 、%(who)s さんは言いました: %(message)s\n"
 
-#: gajim/history_manager.py:568 gajim/history_manager.py:607
-#: gajim/gtk/dialogs.py:58 gajim/gtk/themes.py:319
+#: gajim/history_manager.py:567 gajim/history_manager.py:606
+#: gajim/gtk/dialogs.py:57 gajim/gtk/themes.py:319
 #: gajim/gtk/roster_item_exchange.py:75 gajim/gtk/roster_item_exchange.py:185
 msgid "Delete"
 msgstr "削除"
 
-#: gajim/history_manager.py:569
+#: gajim/history_manager.py:568
 #, fuzzy
 msgid "Delete Conversation"
 msgid_plural "Delete Conversations"
 msgstr[0] "削除の確認"
 msgstr[1] "削除の確認"
 
-#: gajim/history_manager.py:570
+#: gajim/history_manager.py:569
 #, 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:608
+#: gajim/history_manager.py:607
 #, fuzzy
 msgid "Delete Message"
 msgid_plural "Delete Messages"
 msgstr[0] "デフォルトのメッセージ"
 msgstr[1] "デフォルトのメッセージ"
 
-#: gajim/history_manager.py:609
+#: gajim/history_manager.py:608
 #, fuzzy
 msgid "Do you want to permanently delete this message"
 msgid_plural "Do you want to permanently delete these messages"
@@ -642,14 +670,14 @@ msgstr "相手先名: <i>%s</i>"
 
 #: gajim/dialogs.py:84
 #, python-format
-msgid "JID: <i>%s</i>"
-msgstr "JID: <i>%s</i>"
+msgid "XMPP Address: <i>%s</i>"
+msgstr ""
 
-#: gajim/dialogs.py:115 gajim/dialogs.py:128 gajim/roster_window.py:2901
-#: gajim/roster_window.py:3833 gajim/roster_window.py:5084
-#: gajim/common/contacts.py:157 gajim/common/contacts.py:190
+#: gajim/dialogs.py:115 gajim/dialogs.py:128 gajim/roster_window.py:2894
+#: gajim/roster_window.py:3784 gajim/roster_window.py:5023
+#: gajim/common/contacts.py:157 gajim/common/contacts.py:206
 #: gajim/data/gui/preferences_window.ui:558
-#: gajim/data/gui/shortcuts_window.ui:177 gajim/gtk/accounts.py:349
+#: gajim/data/gui/shortcuts_window.ui:177 gajim/gtk/accounts.py:352
 msgid "General"
 msgstr "全般"
 
@@ -695,7 +723,7 @@ msgstr "状況メッセージを上書きしますか ?"
 msgid "Preset name is already in use. Do you want to overwrite this preset?"
 msgstr "この名前は既に使われています。この状況メッセージを上書きしますか ?"
 
-#: gajim/dialogs.py:703
+#: gajim/dialogs.py:703 gajim/plugins/gui.py:292
 #, fuzzy
 msgid "_Overwrite"
 msgstr "上書きしますか ?"
@@ -708,9 +736,7 @@ msgstr "用意しておく状況メッセージとして保存"
 msgid "Please type a name for this status message"
 msgstr "この状況メッセージの名前を入力してください"
 
-#: gajim/dialogs.py:740 gajim/gui_interface.py:1441 gajim/dialog_messages.py:31
-#: gajim/gtk/discovery.py:518 gajim/gtk/profile.py:323
-#: gajim/gtk/join_groupchat.py:234
+#: gajim/dialogs.py:740 gajim/gtk/discovery.py:517 gajim/gtk/profile.py:323
 msgid "You are not connected to the server"
 msgstr "サーバーに接続していません"
 
@@ -718,9 +744,11 @@ msgstr "サーバーに接続していません"
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "接続していないと、相手先を合わせることはできません。"
 
-#: gajim/dialogs.py:752 gajim/dialogs.py:823 gajim/gtk/discovery.py:822
-#: gajim/gtk/discovery.py:1648 gajim/gtk/discovery.py:1941
-#: gajim/gtk/history.py:99 gajim/gtk/roster_item_exchange.py:83
+#: gajim/dialogs.py:752 gajim/dialogs.py:823
+#: gajim/data/gui/groupchat_info_scrolled.ui:16 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/gtk/roster_item_exchange.py:83
 msgid "Name"
 msgstr "名前"
 
@@ -740,394 +768,348 @@ msgstr "接続していないと、相手先に合わせることはできませ
 msgid "Synchronise"
 msgstr "同調"
 
-#: gajim/dialogs.py:1043
+#: gajim/dialogs.py:1042
 msgid "an audio and video"
 msgstr "音声とビデオ"
 
-#: gajim/dialogs.py:1045
+#: gajim/dialogs.py:1044
 msgid "an audio"
 msgstr "音声"
 
-#: gajim/dialogs.py:1047
+#: gajim/dialogs.py:1046
 msgid "a video"
 msgstr "ビデオ"
 
-#: gajim/dialogs.py:1051
-#, python-format
+#: gajim/dialogs.py:1050
+#, fuzzy, python-format
 msgid ""
-"%(contact)s wants to start %(type)s session with you. Do you want to answer "
+"%(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:505
+#: gajim/groupchat_control.py:511
 #, fuzzy, python-format
 msgid "Send File (max. %s MiB)…"
 msgstr "ファイルの保存…"
 
-#: gajim/groupchat_control.py:507 gajim/chat_control.py:342
+#: gajim/groupchat_control.py:513 gajim/chat_control.py:344
 msgid "No File Transfer available"
 msgstr "ファイル転送は利用できません"
 
-#: gajim/groupchat_control.py:630 gajim/groupchat_control.py:2349
-msgid "Changing Subject"
-msgstr "題の変更"
-
-#: gajim/groupchat_control.py:631 gajim/groupchat_control.py:2350
-msgid "Please specify the new subject:"
-msgstr "新しい題を入力してください:"
-
-#: gajim/groupchat_control.py:638
-msgid "Changing Nickname"
-msgstr "ニックネームの変更"
-
-#: gajim/groupchat_control.py:639
-msgid "Please specify the new nickname you want to use:"
-msgstr "使用する新しいニックネームを入力してください:"
-
-#: gajim/groupchat_control.py:657
-msgid "Invalid group chat JID"
+#: gajim/groupchat_control.py:655
+#, fuzzy
+msgid "Invalid group chat XMPP Address"
 msgstr "グループチャットの JID が正しくありません"
 
-#: gajim/groupchat_control.py:658
-msgid "The group chat JID has not allowed characters."
+#: gajim/groupchat_control.py:656
+#, fuzzy
+msgid "The group chat XMPP Address has not allowed characters."
 msgstr "グループチャットの JID に使えない文字が含まれています。"
 
-#: gajim/groupchat_control.py:758 gajim/gtk/profile.py:136
+#: gajim/groupchat_control.py:743 gajim/gtk/profile.py:136
 msgid "Could not load image"
 msgstr "画像を読み込めませんでした"
 
-#: gajim/groupchat_control.py:888
+#: gajim/groupchat_control.py:873
 msgid "Insert Nickname"
 msgstr "ニックネームを挿入"
 
-#: gajim/groupchat_control.py:1056 gajim/chat_control.py:824
+#: gajim/groupchat_control.py:1041 gajim/chat_control.py:848
 msgid "and authenticated"
 msgstr "認証されています"
 
-#: gajim/groupchat_control.py:1060 gajim/chat_control.py:828
+#: gajim/groupchat_control.py:1045 gajim/chat_control.py:852
 msgid "and NOT authenticated"
 msgstr "認証されていません"
 
-#: gajim/groupchat_control.py:1064
+#: gajim/groupchat_control.py:1049
 #, python-format
 msgid "%(type)s encryption is active %(authenticated)s."
 msgstr "%(type)s の暗号化は有効 %(authenticated)s。"
 
 # (Mako) 語順が問題。コロンでごまかしてみる
-#: gajim/groupchat_control.py:1111
+#: gajim/groupchat_control.py:1096
 msgid "Conversation with "
 msgstr "会話中: "
 
-#: gajim/groupchat_control.py:1113
+#: gajim/groupchat_control.py:1098
 msgid "Continued conversation"
 msgstr "会話中"
 
-#: gajim/groupchat_control.py:1411
+#: gajim/groupchat_control.py:1357
 #, python-format
 msgid "%(nick)s has set the subject to %(subject)s"
 msgstr "%(nick)s さんは題を %(subject)s に設定しました"
 
-#: gajim/groupchat_control.py:1433
-msgid "Room now shows unavailable members"
+#: gajim/groupchat_control.py:1374
+#, fuzzy
+msgid "Group chat now shows unavailable members"
 msgstr "談話室はメンバー以外にも見えます"
 
-#: gajim/groupchat_control.py:1436
-msgid "Room now does not show unavailable members"
+#: gajim/groupchat_control.py:1377
+#, fuzzy
+msgid "Group chat now does not show unavailable members"
 msgstr "談話室はメンバー以外には見えません"
 
-#: gajim/groupchat_control.py:1439
+#: gajim/groupchat_control.py:1380
 msgid "A setting not related to privacy has been changed"
 msgstr "プライバシーに関係のない設定が変更されました"
 
-#: gajim/groupchat_control.py:1446
-msgid "Room logging is now enabled"
-msgstr "談話室の記録を取りはじめます"
+#: gajim/groupchat_control.py:1387 gajim/groupchat_control.py:1659
+#, fuzzy
+msgid "Conversations are stored on the server"
+msgstr "セッションはサーバーに記録されます"
 
-#: gajim/groupchat_control.py:1449
-msgid "Room logging is now disabled"
-msgstr "談話室の記録を止めます"
+#: gajim/groupchat_control.py:1390
+#, fuzzy
+msgid "Conversations are not stored on the server"
+msgstr "サーバに格納する、あなたに関する情報です"
 
-#: gajim/groupchat_control.py:1452
-msgid "Room is now non-anonymous"
+#: gajim/groupchat_control.py:1393
+#, fuzzy
+msgid "Group chat is now non-anonymous"
 msgstr "談話室は非匿名になります"
 
-#: gajim/groupchat_control.py:1456
-msgid "Room is now semi-anonymous"
+#: gajim/groupchat_control.py:1397
+#, fuzzy
+msgid "Group chat is now semi-anonymous"
 msgstr "談話室は半匿名になります"
 
-#: gajim/groupchat_control.py:1460
-msgid "Room is now fully anonymous"
+#: gajim/groupchat_control.py:1401
+#, fuzzy
+msgid "Group chat is now fully anonymous"
 msgstr "談話室は完全匿名になります"
 
-#: gajim/groupchat_control.py:1500
+#: gajim/groupchat_control.py:1439
 #, python-format
 msgid "Ping? (%s)"
 msgstr "Ping? (%s)"
 
-#: gajim/groupchat_control.py:1503
+#: gajim/groupchat_control.py:1442
 #, fuzzy, python-format
 msgid "Pong! (%(nick)s %(delay)s s.)"
 msgstr "Pong! (%s)"
 
-#: gajim/groupchat_control.py:1506 gajim/chat_control.py:1213
+#: gajim/groupchat_control.py:1445 gajim/chat_control.py:1237
 msgid "Error."
 msgstr "エラーです。"
 
-#: gajim/groupchat_control.py:1711
+#: gajim/groupchat_control.py:1650
 #, fuzzy, python-format
-msgid "You (%s) joined the room"
+msgid "You (%s) joined the group chat"
 msgstr "%s さんが参加しました"
 
-#: gajim/groupchat_control.py:1717
-msgid "Any occupant is allowed to see your full JID"
+#: gajim/groupchat_control.py:1655
+#, fuzzy
+msgid "Any participant is allowed to see your full XMPP Address"
 msgstr "在室者の誰もがあなたのフルJID を知ることができます"
 
-#: gajim/groupchat_control.py:1721
-msgid "Room logging is enabled"
-msgstr "談話室の会話は記録されています"
-
-#: gajim/groupchat_control.py:1725
-msgid "The server has assigned or modified your roomnick"
+#: gajim/groupchat_control.py:1663
+#, fuzzy
+msgid "The server has assigned or modified your nickname in this group chat"
 msgstr "サーバーはあなたの談話室ニックネームを割り当て (または変更し) ました"
 
-#: gajim/groupchat_control.py:1732
-msgid "A new room has been created"
+#: gajim/groupchat_control.py:1671
+#, fuzzy
+msgid "A new group chat has been created"
 msgstr "新しい談話室が作成されました"
 
-#: gajim/groupchat_control.py:1740 gajim/privatechat_control.py:112
+#: gajim/groupchat_control.py:1679 gajim/privatechat_control.py:115
 #, python-format
 msgid "You are now known as %s"
 msgstr "あなたは %s として認識されます"
 
-#: gajim/groupchat_control.py:1742 gajim/privatechat_control.py:114
+#: gajim/groupchat_control.py:1681 gajim/privatechat_control.py:117
 #, fuzzy, python-brace-format
 msgid "{nick} is now known as {new_nick}"
 msgstr "%(nick)s さんは現在 %(new_nick)s さんと認識されました"
 
-#: gajim/groupchat_control.py:1767 gajim/privatechat_control.py:141
+#: gajim/groupchat_control.py:1706 gajim/privatechat_control.py:144
 #, fuzzy, python-brace-format
 msgid "You are now {show}{status}"
 msgstr "あなたは %s として認識されます"
 
-#: gajim/groupchat_control.py:1773 gajim/privatechat_control.py:147
+#: gajim/groupchat_control.py:1712 gajim/privatechat_control.py:150
 #, fuzzy, python-brace-format
 msgid "{nick} is now {show}{status}"
 msgstr "%(nick)s さんは現在 %(status)s"
 
-#: gajim/groupchat_control.py:1790 gajim/groupchat_control.py:1819
-#: gajim/groupchat_control.py:1849 gajim/groupchat_control.py:1909
+#: gajim/groupchat_control.py:1729 gajim/groupchat_control.py:1758
+#: gajim/groupchat_control.py:1788 gajim/groupchat_control.py:1848
 #, python-brace-format
 msgid " by {actor}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1793
+#: gajim/groupchat_control.py:1732
 #, fuzzy, python-brace-format
 msgid "** Your Affiliation has been set to {affiliation}{actor}{reason}"
 msgstr ""
 "** %(actor)s さんによって、%(nick)s さんの分掌は %(affiliation)s に設定されま"
 "した"
 
-#: gajim/groupchat_control.py:1799
+#: gajim/groupchat_control.py:1738
 #, fuzzy, python-brace-format
 msgid "** Affiliation of {nick} has been set to {affiliation}{actor}{reason}"
 msgstr "** %(nick)s さんの分掌は %(affiliation)s に設定されました"
 
 # (Mako)ここでの role は「役」
-#: gajim/groupchat_control.py:1822
+#: gajim/groupchat_control.py:1761
 #, fuzzy, python-brace-format
 msgid "** Your Role has been set to {role}{actor}{reason}"
 msgstr ""
 "** %(actor)s さんによって、%(nick)s さんの役は %(role)s に設定されました"
 
 # (Mako)ここでの role は「役」
-#: gajim/groupchat_control.py:1827
+#: gajim/groupchat_control.py:1766
 #, fuzzy, python-brace-format
 msgid "** Role of {nick} has been set to {role}{actor}{reason}"
 msgstr ""
 "** %(actor)s さんによって、%(nick)s さんの役は %(role)s に設定されました"
 
-#: gajim/groupchat_control.py:1852
+#: gajim/groupchat_control.py:1791
 #, fuzzy, python-brace-format
-msgid "You have been removed from the room{actor}{reason}"
+msgid "You have been removed from the group chat{actor}{reason}"
 msgstr "%(nick)s は退出しました (%(reason)s)"
 
-#: gajim/groupchat_control.py:1857
+#: gajim/groupchat_control.py:1796
 #, python-brace-format
 msgid "You have left due to an error{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1863
+#: gajim/groupchat_control.py:1802
 #, python-brace-format
 msgid "You have been kicked{actor}{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1870
+#: gajim/groupchat_control.py:1809
 #, python-brace-format
 msgid "You have been banned{actor}{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1877 gajim/groupchat_control.py:1943
+#: gajim/groupchat_control.py:1816 gajim/groupchat_control.py:1882
 #, fuzzy
 msgid ": Affiliation changed"
 msgstr "分掌を変更しました"
 
-#: gajim/groupchat_control.py:1883 gajim/groupchat_control.py:1948
+#: gajim/groupchat_control.py:1822 gajim/groupchat_control.py:1887
 #, fuzzy
-msgid ": Room configuration changed to members-only"
+msgid ": Group chat configuration changed to members-only"
 msgstr "談話室はメンバー制に変更されました"
 
-#: gajim/groupchat_control.py:1912
+#: gajim/groupchat_control.py:1851
 #, fuzzy, python-brace-format
-msgid "{nick} has been removed from the room{by}{reason}"
+msgid "{nick} has been removed from the group chat{by}{reason}"
 msgstr "%(nick)s は退出しました (%(reason)s)"
 
-#: gajim/groupchat_control.py:1922
+#: gajim/groupchat_control.py:1861
 #, python-brace-format
 msgid "{nick} has left due to an error{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1928
+#: gajim/groupchat_control.py:1867
 #, fuzzy, python-brace-format
 msgid "{nick} has been kicked{actor}{reason}"
 msgstr "%(nick)s は蹴り出されました: %(reason)s"
 
-#: gajim/groupchat_control.py:1936
+#: gajim/groupchat_control.py:1875
 #, fuzzy, python-brace-format
 msgid "{nick} has been banned{actor}{reason}"
 msgstr "%(nick)s は締め出されました: %(reason)s"
 
-#: gajim/groupchat_control.py:1953
+#: gajim/groupchat_control.py:1892
 #, python-brace-format
 msgid "{nick} has left{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1970
+#: gajim/groupchat_control.py:1914
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s さんが参加しました"
 
-#: gajim/groupchat_control.py:1985 gajim/groupchat_control.py:1990
-#: gajim/groupchat_control.py:1995 gajim/groupchat_control.py:2000
-#: gajim/groupchat_control.py:2011
-msgid "Unable to join group chat"
-msgstr "グループに参加できません"
-
-#: gajim/groupchat_control.py:1986
-#, python-format
-msgid "You are banned from group chat <b>%s</b>."
-msgstr "グループチャット <b>%s</b> から締め出されています。"
-
-#: gajim/groupchat_control.py:1991
-#, python-format
-msgid "Remote server <b>%s</b> does not exist."
-msgstr "リモートサーバー <b>%s</b> は存在しません。"
-
-#: gajim/groupchat_control.py:1996
-#, python-format
-msgid "Group chat <b>%s</b> does not exist."
-msgstr "グループチャット <b>%s</b> は存在しません。"
-
-#: gajim/groupchat_control.py:2001
-msgid "Group chat creation is not permitted."
-msgstr "グループチャットの作成は制限されています。"
-
-#: gajim/groupchat_control.py:2005
-msgid "Unable to join groupchat"
-msgstr "グループに参加できません"
-
-#: gajim/groupchat_control.py:2006
-#, python-format
-msgid "You must use your registered nickname in <b>%s</b>."
-msgstr "<b>%s</b> では登録したニックネームを使う必要があります。"
-
-#: gajim/groupchat_control.py:2012
-#, python-format
-msgid "You are not in the members list in groupchat %s."
-msgstr "あなたはグループチャット %s のメンバー一覧にありません。"
-
-#: gajim/groupchat_control.py:2068
-msgid "Room has been destroyed"
+#: gajim/groupchat_control.py:1981
+#, fuzzy
+msgid "Group chat has been destroyed"
 msgstr "談話室は閉鎖されました"
 
-#: gajim/groupchat_control.py:2073
+#: gajim/groupchat_control.py:1986
 #, fuzzy, python-format
-msgid "You can join this room instead: xmpp:%s?join"
+msgid "You can join this group chat instead: xmpp:%s?join"
 msgstr "代わりに次の談話室に参加できます: %s"
 
-#: gajim/groupchat_control.py:2306
+#: gajim/groupchat_control.py:2214
 #, fuzzy
 msgid "Leave Group Chat"
 msgstr "グループチャットから退出"
 
-#: gajim/groupchat_control.py:2307
+#: gajim/groupchat_control.py:2215
 #, fuzzy
 msgid "Are you sure you want to leave this group chat?"
 msgstr "本当にグループチャット \"%s\" から退出しますか ?"
 
-#: gajim/groupchat_control.py:2308
+#: gajim/groupchat_control.py:2216
 #, fuzzy, python-format
-msgid "If you close this window, you will be disconnected from '%s'."
+msgid "If you close this window, you will leave '%s'."
 msgstr "このウィンドウを閉じると、このグループチャットから切断されます。"
 
-#: gajim/groupchat_control.py:2314
+#: gajim/groupchat_control.py:2222 gajim/roster_window.py:5177
 msgid "_Leave"
 msgstr ""
 
-#: gajim/groupchat_control.py:2377
+#: gajim/groupchat_control.py:2280 gajim/roster_window.py:3008
 #, fuzzy, python-format
 msgid "%(jid)s has been invited to this group chat"
 msgstr "%(jid)s は既にこの談話室に招待されています"
 
-#: gajim/groupchat_control.py:2527
+#: gajim/groupchat_control.py:2463
 #, python-format
 msgid "Kicking %s"
 msgstr "%s を蹴り出し"
 
-#: gajim/groupchat_control.py:2528 gajim/groupchat_control.py:2829
+#: gajim/groupchat_control.py:2464 gajim/groupchat_control.py:2765
 msgid "You may specify a reason below:"
 msgstr "下に理由を書けます:"
 
-#: gajim/groupchat_control.py:2828
+#: gajim/groupchat_control.py:2764
 #, python-format
 msgid "Banning %s"
 msgstr "%s を締め出し"
 
-#: gajim/chat_control.py:408
+#: gajim/chat_control.py:432
 msgid "Show a list of formattings"
 msgstr "書式の一覧を表示する"
 
-#: gajim/chat_control.py:412
+#: gajim/chat_control.py:436
 msgid "This contact does not support HTML"
 msgstr "この相手先は HTML に対応していません。"
 
-#: gajim/chat_control.py:562
+#: gajim/chat_control.py:586
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr "%(type)s の状態: %(state)s  理由: %(reason)s"
 
-#: gajim/chat_control.py:686
+#: gajim/chat_control.py:710
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s さん (グループチャット %(room_name)s より)"
 
-#: gajim/chat_control.py:832
+#: gajim/chat_control.py:856
 #, fuzzy, python-format
 msgid "%(type)s encryption is active %(authenticated)s"
 msgstr "%(type)s の暗号化は有効 %(authenticated)s。"
 
-#: gajim/chat_control.py:1160 gajim/chat_control.py:1168
+#: gajim/chat_control.py:1184 gajim/chat_control.py:1192
 #, fuzzy
 msgid "Close"
 msgstr "閉じる (_C)"
 
-#: gajim/chat_control.py:1161
+#: gajim/chat_control.py:1185
 #, fuzzy, python-format
 msgid "You just received a new message from %s"
 msgstr "\"%s\" さんから新しいメッセージを受信しました"
 
-#: gajim/chat_control.py:1163
+#: gajim/chat_control.py:1187
 #, fuzzy
 msgid ""
 "If you close this tab while having chat history disabled, this message will "
@@ -1135,16 +1117,16 @@ msgid ""
 msgstr ""
 "このタブを閉じると、記録を残さない設定の場合、このメッセージは失われます。"
 
-#: gajim/chat_control.py:1208
+#: gajim/chat_control.py:1232
 msgid "Ping?"
 msgstr "Ping?"
 
-#: gajim/chat_control.py:1211
+#: gajim/chat_control.py:1235
 #, fuzzy, python-format
 msgid "Pong! (%s seconds)"
 msgstr "Pong! (%s)"
 
-#: gajim/chat_control.py:1308
+#: gajim/chat_control.py:1332
 #, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -1153,261 +1135,269 @@ msgstr ""
 "件名: %(subject)s\n"
 "%(message)s"
 
-#: gajim/chat_control.py:1416
+#: gajim/chat_control.py:1440
 #, python-format
 msgid "%(name)s is now %(show)s %(status)s"
 msgstr "%(name)s さんは現在、%(show)s %(status)s"
 
-#: gajim/chat_control.py:1476 gajim/data/gui/application_menu.ui:32
+#: gajim/chat_control.py:1500 gajim/data/gui/application_menu.ui:32
 #: gajim/gtk/http_upload_progress.py:35
 msgid "File Transfer"
 msgstr "ファイルを転送"
 
-#: gajim/chat_control.py:1480
+#: gajim/chat_control.py:1504
 msgid "Size"
 msgstr "サイズ"
 
-#: gajim/chat_control.py:1482 gajim/chat_control.py:1546
+#: gajim/chat_control.py:1506 gajim/chat_control.py:1566
+#: gajim/gui_interface.py:190
 #: gajim/data/gui/groupchat_invitation_received.ui:77
-#: gajim/gtk/filetransfer.py:485
+#: gajim/gtk/filetransfer.py:490
 #, fuzzy
 msgid "_Accept"
 msgstr "承諾する"
 
-#: gajim/chat_control.py:1484 gajim/chat_control.py:1548
+#: gajim/chat_control.py:1508 gajim/chat_control.py:1568
 #: gajim/data/gui/groupchat_invitation_received.ui:62
 #, fuzzy
 msgid "_Decline"
 msgstr "オフライン (_O)"
 
-#: gajim/chat_control.py:1506 gajim/gui_interface.py:791
-#: gajim/gui_interface.py:821 gajim/gui_interface.py:847
+#: gajim/chat_control.py:1530 gajim/gui_interface.py:777
+#: gajim/gui_interface.py:807 gajim/gui_interface.py:833
 #: gajim/gtk/notification.py:173 gajim/gtk/notification.py:278
 msgid "File Transfer Completed"
 msgstr "ファイルの転送の完了"
 
 # #(Mako)Containing をどうする
-#: gajim/chat_control.py:1510 gajim/gtk/filetransfer.py:259
+#: gajim/chat_control.py:1534 gajim/gtk/filetransfer.py:258
 #, fuzzy
 msgid "Open _Folder"
 msgstr "フォルダを開く (_C)"
 
-#: gajim/chat_control.py:1512 gajim/chat_control.py:1521
+#: gajim/chat_control.py:1536 gajim/chat_control.py:1545
+#: gajim/data/gui/groupchat_control.ui:962
+#: gajim/data/gui/groupchat_control.ui:1049
+#: gajim/data/gui/groupchat_control.ui:1155
 msgid "_Close"
 msgstr "閉じる (_C)"
 
-#: gajim/chat_control.py:1543 gajim/gui_interface.py:484
+#: gajim/chat_control.py:1563 gajim/gui_interface.py:473
+#: gajim/data/gui/groupchat_invitation_received.ui:42
 #: gajim/gtk/notification.py:174 gajim/gtk/notification.py:195
 #: gajim/gtk/notification.py:281
-msgid "Groupchat Invitation"
+#, fuzzy
+msgid "Group Chat Invitation"
 msgstr "グループチャットへの招待"
 
-#: gajim/chat_control.py:1568 gajim/roster_window.py:1954
+#: gajim/chat_control.py:1588 gajim/roster_window.py:1951
 msgid "Remote contact stopped transfer"
 msgstr "遠くの相手先が転送を中止しました"
 
-#: gajim/chat_control.py:1570 gajim/roster_window.py:1956
+#: gajim/chat_control.py:1590 gajim/roster_window.py:1953
 msgid "Error opening file"
 msgstr "ファイルを開く際のエラー"
 
-#: gajim/chat_control.py:1572 gajim/gtk/filetransfer.py:297
+#: gajim/chat_control.py:1592 gajim/gtk/filetransfer.py:296
 msgid "File transfer stopped"
 msgstr "ファイルの転送が中断しました"
 
-#: gajim/chat_control.py:1575 gajim/gtk/filetransfer.py:275
-#: gajim/gtk/filetransfer.py:284
+#: gajim/chat_control.py:1595 gajim/gtk/filetransfer.py:274
+#: gajim/gtk/filetransfer.py:283
 msgid "File transfer cancelled"
 msgstr "ファイルの転送が中止されました"
 
-#: gajim/chat_control.py:1576
+#: gajim/chat_control.py:1596
 msgid "Connection with peer cannot be established."
 msgstr "ピア接続は確立できません。"
 
-#: gajim/application.py:72
+#: gajim/application.py:75
 msgid "Show the application's version"
 msgstr "アプリケーションのバージョンを表示"
 
-#: gajim/application.py:79
+#: gajim/application.py:82
 msgid "Show only critical errors"
 msgstr "深刻なエラーのみ表示"
 
-#: gajim/application.py:86
+#: gajim/application.py:89
 msgid "Separate profile files completely (even history database and plugins)"
 msgstr "プロフィールのファイルを完全に分離する(履歴データベースやプラグインも)"
 
-#: gajim/application.py:94
+#: gajim/application.py:97
 msgid "Print XML stanzas and other debug information"
 msgstr "XML スタンザとその他のデバッグ情報を出力"
 
-#: gajim/application.py:101
+#: gajim/application.py:104
 msgid "Use defined profile in configuration directory"
 msgstr "設定ディレクトリ内の設定ファイルを指定"
 
-#: gajim/application.py:109
+#: gajim/application.py:112
 msgid "Set configuration directory"
 msgstr "設定ファイルのディレクトリを指定"
 
-#: gajim/application.py:117
+#: gajim/application.py:120
 msgid "Configure logging system"
 msgstr "ログシステムを設定"
 
-#: gajim/application.py:125
+#: gajim/application.py:128
 msgid "Show all warnings"
 msgstr "すべての警告を表示"
 
-#: gajim/application.py:132
+#: gajim/application.py:135
 msgid "Open IPython shell"
 msgstr "IPython のシェルを開く"
 
-#: gajim/application.py:139
+#: gajim/application.py:142
 msgid "Pops up a window with the next pending event"
 msgstr "次の保留イベントをポップアップウィンドウに表示します"
 
-#: gajim/application.py:145 gajim/data/gui/shortcuts_window.ui:203
+#: gajim/application.py:148 gajim/data/gui/shortcuts_window.ui:203
 #: data/org.gajim.Gajim.desktop.in:21
 msgid "Start a new chat"
 msgstr "新しいチャットを開始"
 
-#: gajim/application.py:152
+#: gajim/application.py:155
 msgid "Simulate loss of connectivity"
 msgstr ""
 
-#: gajim/application.py:159
+#: gajim/application.py:162
 msgid "Simulate regaining connectivity"
 msgstr ""
 
-#: gajim/application.py:201 gajim/gui_interface.py:133
+#: gajim/application.py:204 gajim/gui_interface.py:133
 msgid "Database Error"
 msgstr "データベースのエラー"
 
-#: gajim/roster_window.py:294 gajim/roster_window.py:1030
+#: gajim/roster_window.py:291 gajim/roster_window.py:1027
 msgid "Merged accounts"
 msgstr "統合アカウント"
 
-#: gajim/roster_window.py:853 gajim/roster_window.py:1631
-#: gajim/roster_window.py:1664 gajim/roster_window.py:1715
-#: gajim/roster_window.py:1717 gajim/roster_window.py:1872
-#: gajim/roster_window.py:2531 gajim/roster_window.py:5025
-#: gajim/common/contacts.py:188 gajim/common/contacts.py:447
-#: gajim/common/helpers.py:83 gajim/gtk/discovery.py:129
-#: gajim/gtk/discovery.py:130 gajim/gtk/discovery.py:1416
+#: gajim/roster_window.py:850 gajim/roster_window.py:1628
+#: gajim/roster_window.py:1661 gajim/roster_window.py:1712
+#: gajim/roster_window.py:1714 gajim/roster_window.py:1869
+#: gajim/roster_window.py:2528 gajim/roster_window.py:4331
+#: gajim/roster_window.py:4964 gajim/common/contacts.py:204
+#: gajim/common/contacts.py:463 gajim/common/helpers.py:86
+#: gajim/gtk/discovery.py:127 gajim/gtk/discovery.py:128
+#: gajim/gtk/discovery.py:1414
 msgid "Transports"
 msgstr "中継先"
 
-#: gajim/roster_window.py:1723 gajim/roster_window.py:1725
-#: gajim/roster_window.py:4995 gajim/gui_interface.py:1613
-#: gajim/gui_interface.py:1639 gajim/common/contacts.py:186
-#: gajim/common/helpers.py:83 gajim/common/modules/adhoc_commands.py:245
-msgid "Groupchats"
+#: gajim/roster_window.py:1720 gajim/roster_window.py:1722
+#: gajim/roster_window.py:4331 gajim/roster_window.py:4934
+#: gajim/gui_interface.py:1527 gajim/common/contacts.py:202
+#: gajim/common/helpers.py:86 gajim/common/modules/adhoc_commands.py:245
+#, fuzzy
+msgid "Group chats"
 msgstr "グループチャット"
 
-#: gajim/roster_window.py:2012
+#: gajim/roster_window.py:2009
 msgid "Authorization sent"
 msgstr "承認が送信されました"
 
-#: gajim/roster_window.py:2013
+#: gajim/roster_window.py:2010
 #, python-format
 msgid "\"%s\" will now see your status."
 msgstr "現在 \"%s\" さんはあなたの在席状況を知ることができます。"
 
-#: gajim/roster_window.py:2031
+#: gajim/roster_window.py:2028
 msgid "Subscription request has been sent"
 msgstr "在席通知の申し込みを送信しました"
 
-#: gajim/roster_window.py:2032
-#, python-format
-msgid "If \"%s\" accepts this request you will know his or her status."
+#: gajim/roster_window.py:2029
+#, fuzzy, python-format
+msgid "If \"%s\" accepts this request you will know their status."
 msgstr ""
 "\"%s\" さんがこの申し込みを承認したら、相手先の在席状況を知ることができます。"
 
-#: gajim/roster_window.py:2046
+#: gajim/roster_window.py:2043
 msgid "Authorization removed"
 msgstr "承認が取り消されました"
 
-#: gajim/roster_window.py:2047
+#: gajim/roster_window.py:2044
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "\"%s\" さんは常にあなたをオフラインとして見ることになります。"
 
-#: gajim/roster_window.py:2250 gajim/roster_window.py:3504
+#: gajim/roster_window.py:2247 gajim/roster_window.py:3460
 msgid "Disconnect for Invisibility"
 msgstr ""
 
-#: gajim/roster_window.py:2251 gajim/roster_window.py:3505
+#: gajim/roster_window.py:2248 gajim/roster_window.py:3461
 msgid "You are participating in one or more group chats"
 msgstr "1つ以上のグループチャットに参加中です。"
 
-#: gajim/roster_window.py:2252 gajim/roster_window.py:3506
+#: gajim/roster_window.py:2249 gajim/roster_window.py:3462
 #, fuzzy
 msgid ""
-"Changing your status to invisible will result in disconnection from those "
-"group chats.\n"
+"Changing your status to invisible will result in you leaving those group "
+"chats.\n"
 "Are you sure you want to go invisible?"
 msgstr ""
 "在席状況を「居ないふり」にすると、グループチャットから退出することになりま"
 "す。本当に「居ないふり」にしますか ?"
 
-#: gajim/roster_window.py:2257 gajim/roster_window.py:3512
-#: gajim/roster_window.py:5238 gajim/data/gui/gc_control_popup_menu.ui:120
+#: gajim/roster_window.py:2254 gajim/roster_window.py:3468
+#: gajim/data/gui/gc_control_popup_menu.ui:120
 msgid "_Disconnect"
 msgstr "切断 (_D)"
 
-#: gajim/roster_window.py:2285
+#: gajim/roster_window.py:2282
 #, fuzzy
 msgid "desynced"
 msgstr "不揃い"
 
-#: gajim/roster_window.py:2353 gajim/data/gui/shortcuts_window.ui:224
+#: gajim/roster_window.py:2350 gajim/data/gui/shortcuts_window.ui:224
 msgid "Quit Gajim"
 msgstr "Gajim を終了"
 
-#: gajim/roster_window.py:2354
+#: gajim/roster_window.py:2351
 #, fuzzy
 msgid "You are about to quit Gajim"
 msgstr "本当に Gajim を終了しますか ?"
 
-#: gajim/roster_window.py:2355
+#: gajim/roster_window.py:2352
 msgid "Are you sure you want to quit Gajim?"
 msgstr "本当に Gajim を終了しますか ?"
 
-#: gajim/roster_window.py:2356
+#: gajim/roster_window.py:2353
 #, fuzzy
 msgid "_Always quit when closing Gajim"
 msgstr "常に Gajim を終了する"
 
-#: gajim/roster_window.py:2359 gajim/roster_window.py:2455
-#: gajim/roster_window.py:2495 gajim/data/gui/systray_context_menu.ui:90
+#: gajim/roster_window.py:2356 gajim/roster_window.py:2452
+#: gajim/roster_window.py:2492 gajim/data/gui/systray_context_menu.ui:83
 msgid "_Quit"
 msgstr "終了 (_Q)"
 
-#: gajim/roster_window.py:2448
+#: gajim/roster_window.py:2445
 #, fuzzy
 msgid "Stop File Transfers"
 msgstr "ファイルの転送"
 
-#: gajim/roster_window.py:2449
+#: gajim/roster_window.py:2446
 #, fuzzy
 msgid "You still have running file transfers"
 msgstr "ファイルの転送を実行中です"
 
-#: gajim/roster_window.py:2450
+#: gajim/roster_window.py:2447
 #, fuzzy
 msgid ""
 "If you quit now, the file(s) being transferred will be lost.\n"
 "Do you still want to quit?"
 msgstr "いま終了すると、転送中のファイルは中断されます。それでも終了しますか?"
 
-#: gajim/roster_window.py:2488
+#: gajim/roster_window.py:2485
 #, fuzzy
 msgid "Unread Messages"
 msgstr "未読のイベント"
 
-#: gajim/roster_window.py:2489
+#: gajim/roster_window.py:2486
 #, fuzzy
 msgid "You still have unread messages"
 msgstr "未読のメッセージがあります"
 
-#: gajim/roster_window.py:2490
+#: gajim/roster_window.py:2487
 #, fuzzy
 msgid ""
 "Messages will only be available for reading them later if storing chat "
@@ -1415,20 +1405,20 @@ msgid ""
 msgstr ""
 "履歴が有効になっていて、かつ相手先が名簿にあれば、メッセージは後で読めます。"
 
-#: gajim/roster_window.py:2760
+#: gajim/roster_window.py:2753
 msgid "You have unread messages"
 msgstr "未読のメッセージがあります"
 
-#: gajim/roster_window.py:2761
+#: gajim/roster_window.py:2754
 msgid "You must read them before removing this transport."
 msgstr "この中継先を削除する前に、それらを読んでください。"
 
-#: gajim/roster_window.py:2764
+#: gajim/roster_window.py:2757
 #, fuzzy, python-format
 msgid "Transport '%s' will be removed"
 msgstr "中継先 \"%s\" を削除します"
 
-#: gajim/roster_window.py:2765
+#: gajim/roster_window.py:2758
 #, fuzzy
 msgid ""
 "You will no longer be able to send and receive messages from and to contacts "
@@ -1436,11 +1426,11 @@ msgid ""
 msgstr ""
 "もうこの中継先をとおして相手先からメッセージを送受信することはできません。"
 
-#: gajim/roster_window.py:2768
+#: gajim/roster_window.py:2761
 msgid "Transports will be removed"
 msgstr "中継先を削除します"
 
-#: gajim/roster_window.py:2773
+#: gajim/roster_window.py:2766
 #, fuzzy, python-format
 msgid ""
 "You will no longer be able to send and receive messages from and to contacts "
@@ -1449,22 +1439,22 @@ msgid ""
 msgstr ""
 "もうこの中継先をとおして相手先からメッセージを送受信することはできません。"
 
-#: gajim/roster_window.py:2777
+#: gajim/roster_window.py:2770
 #, fuzzy
 msgid "Remove Transport"
 msgstr "中継先を表示"
 
-#: gajim/roster_window.py:2844
+#: gajim/roster_window.py:2837
 #, fuzzy
 msgid "Block Contact"
 msgstr "遮断している相手先"
 
-#: gajim/roster_window.py:2845
+#: gajim/roster_window.py:2838
 #, fuzzy
 msgid "Really block this contact?"
 msgstr "この相手先に OpenPGP を使えるかどうか"
 
-#: gajim/roster_window.py:2846
+#: gajim/roster_window.py:2839
 #, fuzzy
 msgid ""
 "This contact will see you offline and you will not receive any messages sent "
@@ -1473,64 +1463,59 @@ msgstr ""
 "この相手先はあなたをオフラインと認識します。相手が送るメッセージは受信しませ"
 "ん。"
 
-#: gajim/roster_window.py:2851
+#: gajim/roster_window.py:2844
 #, fuzzy
 msgid "_Block Contact"
 msgstr "遮断している相手先"
 
-#: gajim/roster_window.py:2896
+#: gajim/roster_window.py:2889
 msgid "Rename Contact"
 msgstr "相手先の名前を変更"
 
-#: gajim/roster_window.py:2897
+#: gajim/roster_window.py:2890
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "相手先 %s さんの新しいニックネームを入力してください"
 
-#: gajim/roster_window.py:2904
+#: gajim/roster_window.py:2897
 msgid "Rename Group"
 msgstr "グループの名前変更"
 
-#: gajim/roster_window.py:2905
+#: gajim/roster_window.py:2898
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "グループ %s の新しい名前を入力してください"
 
-#: gajim/roster_window.py:2953 gajim/roster_window.py:2954
+#: gajim/roster_window.py:2946 gajim/roster_window.py:2947
 msgid "Remove Group"
 msgstr "グループの削除"
 
-#: gajim/roster_window.py:2955
+#: gajim/roster_window.py:2948
 #, fuzzy, python-format
 msgid "Do you want to remove %s from the contact list?"
 msgstr "名簿からグループ %s を削除しますか ?"
 
-#: gajim/roster_window.py:2956
+#: gajim/roster_window.py:2949
 #, fuzzy
 msgid "_Also remove all contacts of this group from contact list"
 msgstr "名簿のこのグループのすべての相手先も削除します"
 
-#: gajim/roster_window.py:3044
-#, python-format
-msgid "%(jid)s has been invited in this room"
-msgstr "%(jid)s は既にこの談話室に招待されています"
-
-#: gajim/roster_window.py:3353
+#: gajim/roster_window.py:3309
 #, fuzzy
 msgid "Remove Contact"
 msgstr "相手先の名前を変更"
 
-#: gajim/roster_window.py:3354
+#: gajim/roster_window.py:3310
 #, fuzzy
 msgid "Remove contact from contact list"
 msgstr "相手先を名簿から削除します"
 
-#: gajim/roster_window.py:3355
+#: gajim/roster_window.py:3311
 #, 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:3364 gajim/roster_window.py:3384
+#: gajim/roster_window.py:3320 gajim/roster_window.py:3340
 #, fuzzy
 msgid ""
 "By removing this contact you also remove authorization. This means the "
@@ -1539,21 +1524,21 @@ msgstr ""
 "この相手先を名簿から削除すると、在席通知の承認も取り消します。相手先はあなた"
 "を常にオフラインとして見ることになります。"
 
-#: gajim/roster_window.py:3375
+#: gajim/roster_window.py:3331
 msgid "Do you want to continue?"
 msgstr "続けますか ?"
 
-#: gajim/roster_window.py:3386
+#: gajim/roster_window.py:3342
 #, fuzzy
 msgid "_I want this contact to know my status after removal"
 msgstr "削除後も、この相手先に自分の在席状況を知らせる"
 
-#: gajim/roster_window.py:3393
+#: gajim/roster_window.py:3349
 #, fuzzy
 msgid "Remove contacts from contact list"
 msgstr "相手先を名簿から削除します"
 
-#: gajim/roster_window.py:3399
+#: gajim/roster_window.py:3355
 #, fuzzy, python-format
 msgid ""
 "By removing the following contacts, you will also remove authorization. This "
@@ -1564,24 +1549,24 @@ msgstr ""
 "この相手先を名簿から削除すると、在席通知の承認も取り消します。相手先はあなた"
 "を常にオフラインとして見ることになります。"
 
-#: gajim/roster_window.py:3403
+#: gajim/roster_window.py:3359
 #, fuzzy
 msgid "Remove Contacts"
 msgstr "相手先の名前を変更"
 
-#: gajim/roster_window.py:3423
+#: gajim/roster_window.py:3379
 msgid "No account available"
 msgstr "アカウントがありません"
 
-#: gajim/roster_window.py:3424
+#: gajim/roster_window.py:3380
 msgid "You must create an account before you can chat with other contacts."
 msgstr "相手先とチャットを開始する前に、アカウントを作成してください。"
 
-#: gajim/roster_window.py:4060
+#: gajim/roster_window.py:4011
 msgid "Metacontacts storage not supported by your server"
 msgstr "サーバーはメタ相手先の保存に対応していません"
 
-#: gajim/roster_window.py:4062
+#: gajim/roster_window.py:4013
 msgid ""
 "Your server does not support storing metacontacts information. So this "
 "information will not be saved on next reconnection."
@@ -1589,12 +1574,12 @@ msgstr ""
 "サーバーはメタ相手先の情報の保存に対応していません。したがってその情報は次の"
 "接続の際には失われています。"
 
-#: gajim/roster_window.py:4159
+#: gajim/roster_window.py:4110
 #, fuzzy
 msgid "You are about to create a metacontact"
 msgstr "メタ相手先を作成しようとしています。本当に続けますか ?"
 
-#: gajim/roster_window.py:4160
+#: gajim/roster_window.py:4111
 #, fuzzy
 msgid ""
 "Metacontacts are a way to regroup several contacts in one single contact. "
@@ -1605,124 +1590,116 @@ msgstr ""
 "人物が複数の Jabber アカウントや中継先アカウントを持っているときに使用しま"
 "す。"
 
-#: gajim/roster_window.py:4164
+#: gajim/roster_window.py:4115
 #, fuzzy
 msgid "Create Metacontact"
 msgstr "相手先の名前を変更"
 
-#: gajim/roster_window.py:4170
+#: gajim/roster_window.py:4121 gajim/data/gui/groupchat_creation.ui:317
 #, fuzzy
 msgid "_Create"
 msgstr "創造的"
 
-#: gajim/roster_window.py:4287
+#: gajim/roster_window.py:4238
 msgid "Invalid file URI:"
 msgstr "ファイルの URI が正しくありません:"
 
-#: gajim/roster_window.py:4298
+#: gajim/roster_window.py:4249
 #, fuzzy
 msgid "Send file?"
 msgstr "ファイルを送信 (_F)"
 
-#: gajim/roster_window.py:4299
+#: gajim/roster_window.py:4250
 #, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
 msgstr[0] "このファイルを %s さんに転送しますか:"
 msgstr[1] "これらのファイルを %s さんに転送しますか:"
 
-#: gajim/roster_window.py:4451
+#: gajim/roster_window.py:4401
 #, python-format
 msgid "Send %(from)s to %(to)s"
 msgstr "%(from)s を %(to)s に送信"
 
-#: gajim/roster_window.py:4464
+#: gajim/roster_window.py:4414
 #, 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:4469
+#: gajim/roster_window.py:4419
 #, python-format
 msgid "Make %(contact1)s and %(contact2)s metacontacts"
 msgstr "%(contact1)s と %(contact2)s をメタ相手先とする"
 
-#: gajim/roster_window.py:4825 gajim/roster_window.py:4923
+#: gajim/roster_window.py:4775 gajim/roster_window.py:4862
 msgid "_Change Status Message"
 msgstr "状況メッセージの変更 (_C)"
 
-#: gajim/roster_window.py:4845
+#: gajim/roster_window.py:4795
 msgid "Publish Tune"
 msgstr "聴いている楽曲名を公開"
 
-#: gajim/roster_window.py:4856
+#: gajim/roster_window.py:4806
 msgid "Publish Location"
 msgstr "位置情報を公開"
 
-#: gajim/roster_window.py:4868
-msgid "Configure Services…"
-msgstr "サービスの調整…"
-
 # (Mako)ここでは「復元」の意味か
-#: gajim/roster_window.py:4997
+#: gajim/roster_window.py:4936
 msgid "_Maximize All"
 msgstr "ウィンドウをすべて復元 (_M)"
 
-#: gajim/roster_window.py:5004 gajim/roster_window.py:5146
+#: gajim/roster_window.py:4943 gajim/roster_window.py:5085
 msgid "Send Group M_essage"
 msgstr "メッセージの一斉送信 (_E)"
 
-#: gajim/roster_window.py:5011
+#: gajim/roster_window.py:4950
 msgid "To all users"
 msgstr "すべてのユーザーに"
 
-#: gajim/roster_window.py:5015
+#: gajim/roster_window.py:4954
 msgid "To all online users"
 msgstr "オンラインのすべてのユーザーに"
 
-#: gajim/roster_window.py:5027 gajim/roster_window.py:5152
+#: gajim/roster_window.py:4966 gajim/roster_window.py:5091
 #: gajim/data/gui/gc_occupants_menu.ui:110
 #: gajim/data/gui/contact_context_menu.ui:36
 msgid "In_vite to"
 msgstr "招待 (_V)"
 
-#: gajim/roster_window.py:5162
+#: gajim/roster_window.py:5101
 msgid "_Manage Contacts"
 msgstr "相手先の管理 (_M)"
 
-#: gajim/roster_window.py:5168
+#: gajim/roster_window.py:5107
 msgid "Edit _Groups…"
 msgstr "グループの編集…(_G)"
 
-#: gajim/roster_window.py:5189 gajim/data/gui/filetransfers.ui:12
+#: gajim/roster_window.py:5128 gajim/data/gui/filetransfers.ui:12
 #: gajim/data/gui/remove_account_window.ui:134
 msgid "_Remove"
 msgstr "削除 (_R)"
 
 # (Mako)ここでは「復元」の意味か
-#: gajim/roster_window.py:5226
+#: gajim/roster_window.py:5165
 msgid "_Maximize"
 msgstr "ウィンドウの復元 (_M)"
 
-#: gajim/roster_window.py:5233
+#: gajim/roster_window.py:5172
 msgid "_Reconnect"
 msgstr "再接続 (_R)"
 
-#: gajim/roster_window.py:5254 gajim/data/gui/gc_occupants_menu.ui:170
+#: gajim/roster_window.py:5193 gajim/data/gui/gc_occupants_menu.ui:170
 #: gajim/data/gui/gc_control_popup_menu.ui:113
 #: gajim/data/gui/contact_context_menu.ui:205
 msgid "_History"
 msgstr "履歴 (_H)"
 
-#: gajim/roster_window.py:5335 gajim/data/gui/application_menu.ui:86
+#: gajim/roster_window.py:5274 gajim/data/gui/application_menu.ui:83
 #: gajim/data/gui/history_window.ui:57
 msgid "History Manager"
 msgstr "履歴マネージャ"
 
-#: gajim/roster_window.py:5343
-msgid "_Join New Group Chat"
-msgstr "新しいグループチャットに参加 (_J)"
-
 #: gajim/dataforms_widget.py:585
 msgid "Unable to load image"
 msgstr "画像をロードできません"
@@ -1845,222 +1822,241 @@ msgstr "件名: %s\n"
 msgid "Write a message…"
 msgstr "メッセージを書いてください…"
 
-#: gajim/message_window.py:250
+#: gajim/message_window.py:356
+#, fuzzy
+msgid "Close Tabs"
+msgstr "会話を閉じる"
+
+#: gajim/message_window.py:357
 msgid "You are going to close several tabs"
 msgstr "タブを閉じようとしています"
 
-#: gajim/message_window.py:251
+#: gajim/message_window.py:358
 msgid "Do you really want to close them all?"
 msgstr "本当にそれらをすべて閉じますか ?"
 
-#: gajim/message_window.py:539
+#: gajim/message_window.py:514
 msgid "?Noun:Chats"
 msgstr "チャット"
 
-#: gajim/message_window.py:543
+#: gajim/message_window.py:518
 #, fuzzy
 msgid "Group Chats"
 msgstr "グループチャット"
 
-#: gajim/message_window.py:547
+#: gajim/message_window.py:522
 msgid "Private Chats"
 msgstr "個人チャット"
 
-#: gajim/message_window.py:553
+#: gajim/message_window.py:528
 msgid "Messages"
 msgstr "メッセージ"
 
-#: gajim/gui_interface.py:173
+#: gajim/gui_interface.py:170
+#, 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:175
 msgid "Do you accept this request?"
 msgstr "この申し込みを承認しますか ?"
 
-#: gajim/gui_interface.py:175
-#, python-format
-msgid "Do you accept this request on account %s?"
+#: gajim/gui_interface.py:177
+#, fuzzy, python-format
+msgid "Do you accept this request (account: %s)?"
 msgstr "アカウント %s への申し込みを承認しますか ?"
 
-#: gajim/gui_interface.py:178
-#, 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:182
+#, fuzzy
+msgid "Authorization"
+msgstr "承認が送信されました"
+
+# Auto の選択肢
+#: gajim/gui_interface.py:186 gajim/gui_interface.py:420
+#: gajim/gtk/filetransfer.py:338
+#, fuzzy
+msgid "_No"
+msgstr "しない"
 
-#: gajim/gui_interface.py:194 gajim/gtk/notification.py:175
+#: gajim/gui_interface.py:205 gajim/gtk/notification.py:175
 #: gajim/gtk/notification.py:197
 msgid "Connection Failed"
 msgstr "接続に失敗しました"
 
-#: gajim/gui_interface.py:279 gajim/gui_interface.py:529
-msgid "Password Required"
-msgstr "パスワードが必要です"
-
-#: gajim/gui_interface.py:280
-#, python-format
-msgid "A Password is required to join the room %s. Please type it."
-msgstr "談話室 %s に参加するにはパスワードが必要です。入力してください。"
-
-#: gajim/gui_interface.py:342 gajim/gui_interface.py:346
+#: gajim/gui_interface.py:325 gajim/gui_interface.py:329
 #, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr "エラー %(code)s: %(msg)s"
 
-#: gajim/gui_interface.py:357 gajim/gui_interface.py:376
+#: gajim/gui_interface.py:340 gajim/gui_interface.py:359
 #: gajim/common/modules/message.py:122
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "%(message)s を送信する際にエラー ( %(error)s )"
 
-#: gajim/gui_interface.py:401 gajim/gtk/notification.py:175
+#: gajim/gui_interface.py:384 gajim/gtk/notification.py:175
 msgid "Subscription request"
 msgstr "在席通知申込"
 
 # (Mako)承認なしに名簿にある状態
-#: gajim/gui_interface.py:413 gajim/common/contacts.py:184
-#: gajim/common/helpers.py:83
+#: gajim/gui_interface.py:396 gajim/common/contacts.py:200
+#: gajim/common/helpers.py:86
 msgid "Observers"
 msgstr "オブザーバー"
 
-#: gajim/gui_interface.py:422
+#: gajim/gui_interface.py:405
 msgid "Authorization accepted"
 msgstr "承認が得られました"
 
-#: gajim/gui_interface.py:423
+#: gajim/gui_interface.py:406
 #, python-format
 msgid "The contact \"%s\" has authorized you to see their status."
 msgstr "相手先 \"%s\" さんは、あなたが在席状況を見ることを承認しました。"
 
-#: gajim/gui_interface.py:431
-#, python-format
-msgid "Contact \"%s\" removed subscription from you"
+#: gajim/gui_interface.py:415
+#, fuzzy
+msgid "Subscription Removed"
+msgstr "在席通知の申し込み"
+
+#: gajim/gui_interface.py:416
+#, fuzzy, python-format
+msgid "Contact '%s' removed subscription from you"
 msgstr "相手先 \"%s\" さんは、あなたからの申し込みを削除しました。"
 
-#: gajim/gui_interface.py:432
+#: gajim/gui_interface.py:417
+#, fuzzy
 msgid ""
-"You will always see them as offline.\n"
+"You will always see this contact as offline.\n"
 "Do you want to remove them from your contact list?"
 msgstr ""
 "これらの相手先を常にオフラインとして見ることになります。\n"
 "相手先一覧から削除しますか ?"
 
-#: gajim/gui_interface.py:453 gajim/gtk/notification.py:176
+#: gajim/gui_interface.py:442 gajim/gtk/notification.py:176
 msgid "Unsubscribed"
 msgstr "在席通知の取り消し"
 
-#: gajim/gui_interface.py:465
+#: gajim/gui_interface.py:454
 #, python-format
 msgid "%(jid)s declined the invitation: %(reason)s"
 msgstr "%(jid)s は招待を断りました: %(reason)s"
 
-#: gajim/gui_interface.py:469
+#: gajim/gui_interface.py:458
 #, python-format
 msgid "%(jid)s declined the invitation"
 msgstr "%(jid)s は招待を断りました。"
 
-#: gajim/gui_interface.py:485
+#: gajim/gui_interface.py:474
 #, fuzzy, python-brace-format
 msgid "You are invited to {room} by {user}"
 msgstr "{user} さんがグループチャット {room} へ招待しました"
 
-#: gajim/gui_interface.py:506
+#: gajim/gui_interface.py:495
 msgid "Certificate Passphrase Required"
 msgstr "証明書のパスフレーズが必要です"
 
-#: gajim/gui_interface.py:507
+#: gajim/gui_interface.py:496
 #, python-format
 msgid "Enter the certificate passphrase for account %s"
 msgstr "アカウント %s の証明書のパスフレーズを入力してください"
 
-#: gajim/gui_interface.py:516 gajim/gtk/accounts.py:963
+#: gajim/gui_interface.py:505 gajim/gtk/accounts.py:966
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "%s のパスワードを入力してください"
 
-#: gajim/gui_interface.py:529 gajim/gtk/accounts.py:964
+#: gajim/gui_interface.py:518
+msgid "Password Required"
+msgstr "パスワードが必要です"
+
+#: gajim/gui_interface.py:518 gajim/gtk/accounts.py:967
 msgid "Save password"
 msgstr "パスワードを保存する"
 
-#: gajim/gui_interface.py:601 gajim/gui_interface.py:632
+#: gajim/gui_interface.py:587 gajim/gui_interface.py:618
+#: gajim/gtk/filetransfer.py:332 gajim/gtk/filetransfer.py:333
 #: gajim/gtk/notification.py:173 gajim/gtk/notification.py:276
 msgid "File Transfer Error"
 msgstr "ファイル転送のエラー"
 
-#: gajim/gui_interface.py:666
+#: gajim/gui_interface.py:652
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s さんがファイルを転送したがっています。"
 
-#: gajim/gui_interface.py:668 gajim/gtk/filetransfer.py:479
+#: gajim/gui_interface.py:654 gajim/gtk/filetransfer.py:484
 #: gajim/gtk/notification.py:172 gajim/gtk/notification.py:274
 msgid "File Transfer Request"
 msgstr "ファイル転送の要求"
 
-#: gajim/gui_interface.py:767
+#: gajim/gui_interface.py:753
 #, fuzzy
 msgid "Remote Contact Stopped Transfer"
 msgstr "遠くの相手先が転送を中止しました"
 
-#: gajim/gui_interface.py:772
+#: gajim/gui_interface.py:758
 #, fuzzy
 msgid "Error Opening File"
 msgstr "ファイルを開く際のエラー"
 
-#: gajim/gui_interface.py:782
+#: gajim/gui_interface.py:768
 #, fuzzy
 msgid "SSL Certificate Error"
 msgstr "SSL 証明書エラー"
 
-#: gajim/gui_interface.py:795 gajim/gui_interface.py:826
-#: gajim/gui_interface.py:853 gajim/gtk/notification.py:174
+#: gajim/gui_interface.py:781 gajim/gui_interface.py:812
+#: gajim/gui_interface.py:839 gajim/gtk/notification.py:174
 #: gajim/gtk/notification.py:279
 msgid "File Transfer Stopped"
 msgstr "ファイルの転送の中断"
 
-#: gajim/gui_interface.py:799
+#: gajim/gui_interface.py:785
 msgid "File Transfer Failed"
 msgstr "ファイル転送に失敗しました"
 
-#: gajim/gui_interface.py:822
+#: gajim/gui_interface.py:808
 #, python-format
 msgid "%(filename)s received from %(name)s."
 msgstr "%(name)s さんからのファイル %(filename)s を受け取りました。"
 
-#: gajim/gui_interface.py:827
+#: gajim/gui_interface.py:813
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "%(name)s さんからのファイル %(filename)s の転送を中断しました。"
 
-#: gajim/gui_interface.py:833
+#: gajim/gui_interface.py:819
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s failed."
 msgstr "%(name)s さんからのファイル %(filename)s の転送に失敗しました。"
 
-#: gajim/gui_interface.py:848
+#: gajim/gui_interface.py:834
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "%(name)s さんへファイル %(filename)s を送りました。"
 
-#: gajim/gui_interface.py:854
+#: gajim/gui_interface.py:840
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "%(name)s さんへのファイル %(filename)s の転送を中断しました。"
 
-#: gajim/gui_interface.py:860
+#: gajim/gui_interface.py:846
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s failed."
 msgstr "%(name)s さんへのファイル %(filename)s の転送に失敗しました。"
 
-#: gajim/gui_interface.py:971
+#: gajim/gui_interface.py:957
 msgid "Username Conflict"
 msgstr "ユーザー名の重複"
 
-#: gajim/gui_interface.py:972
+#: gajim/gui_interface.py:958
 msgid "Please type a new username for your local account"
 msgstr "ローカルのアカウントの新しいユーザー名を入力してください"
 
-#: gajim/gui_interface.py:995
+#: gajim/gui_interface.py:981
 msgid "Resource Conflict"
 msgstr "リソースの衝突"
 
-#: gajim/gui_interface.py:996
+#: gajim/gui_interface.py:982
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
@@ -2068,30 +2064,30 @@ msgstr ""
 "このアカウントの同じリソースですでに接続しています。新しいアカウントを入力し"
 "てください"
 
-#: gajim/gui_interface.py:1053
+#: gajim/gui_interface.py:1039
 #, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s さんがファイルを音声チャットを始めたがっています。"
 
-#: gajim/gui_interface.py:1055
+#: gajim/gui_interface.py:1041
 msgid "Voice Chat Request"
 msgstr "音声チャットの要求"
 
-#: gajim/gui_interface.py:1123 gajim/gtk/account_wizard.py:312
+#: gajim/gui_interface.py:1109 gajim/gtk/account_wizard.py:312
 msgid "Certificate Already in File"
 msgstr "証明書はファイルにあります"
 
-#: gajim/gui_interface.py:1124 gajim/gtk/account_wizard.py:313
+#: gajim/gui_interface.py:1110 gajim/gtk/account_wizard.py:313
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr "この証明書は既にファイル %s にあります。再び追加しません。"
 
-#: gajim/gui_interface.py:1145
+#: gajim/gui_interface.py:1131
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid"
 msgstr "%s の証明書の真正性は検証できませんでした。"
 
-#: gajim/gui_interface.py:1148
+#: gajim/gui_interface.py:1134
 #, python-format
 msgid ""
 "\n"
@@ -2100,7 +2096,7 @@ msgstr ""
 "\n"
 "未知の SSL エラー: %d"
 
-#: gajim/gui_interface.py:1150
+#: gajim/gui_interface.py:1136
 #, python-format
 msgid ""
 "\n"
@@ -2109,11 +2105,11 @@ msgstr ""
 "\n"
 "SSL エラー: <b>%s</b>"
 
-#: gajim/gui_interface.py:1155
+#: gajim/gui_interface.py:1141
 msgid "Error verifying SSL certificate"
 msgstr "SSL 証明書の検証エラー"
 
-#: gajim/gui_interface.py:1156
+#: gajim/gui_interface.py:1142
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your XMPP server: "
@@ -2123,7 +2119,7 @@ msgstr ""
 "XMPP サーバーの SSL 証明書の検証にエラーがあります: %(error)s\n"
 "それでもこのサーバーに接続しますか ?"
 
-#: gajim/gui_interface.py:1160 gajim/gtk/account_wizard.py:412
+#: gajim/gui_interface.py:1146 gajim/gtk/account_wizard.py:413
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -2138,179 +2134,171 @@ msgstr ""
 "この証明書の SHA-256 指紋:\n"
 "%(sha256)s"
 
-#: gajim/gui_interface.py:1166
+#: gajim/gui_interface.py:1152
 msgid "Ignore this error for this certificate."
 msgstr "この証明書のこのエラーを無視します。"
 
-#: gajim/gui_interface.py:1174
+#: gajim/gui_interface.py:1160
 #, python-format
 msgid "SSL Certificate Verification for %s"
 msgstr "%s のSSL 証明書の検証"
 
-#: gajim/gui_interface.py:1442 gajim/gtk/join_groupchat.py:235
-msgid "You can not join a group chat unless you are connected."
-msgstr "接続しないと、グループチャットに参加できません。"
-
-#: gajim/gui_interface.py:1448
-msgid "JID is not a Groupchat"
-msgstr "JID はグループチャットではありません"
-
-#: gajim/gui_interface.py:1579
-msgid "This is not a group chat"
-msgstr "グループチャットではありません"
-
-#: gajim/gui_interface.py:1580
-#, python-format
-msgid ""
-"%(room_jid)s is already in your roster. Please check if %(room_jid)s is a "
-"correct group chat name. If it is, delete it from your roster and try "
-"joining the group chat again."
-msgstr ""
-"%(room_jid)s は既に名簿にあります。%(room_jid)s が正しいグループチャット名か"
-"どうか確認してください。もし正しければ、それを名簿から削除して、もう一度その"
-"グループチャットに参加してみてください。"
-
-#: gajim/gui_interface.py:1604 gajim/dialog_messages.py:58
+#: gajim/gui_interface.py:1577
 msgid "You cannot join a group chat while you are invisible"
 msgstr "「居ないふり」のあいだはグループチャットに参加できません"
 
-#: gajim/gui_interface.py:2037
+#: gajim/gui_interface.py:1976
 msgid "Could not save your settings and preferences"
 msgstr "設定を保存できませんでした"
 
-#: gajim/gui_interface.py:2098
+#: gajim/gui_interface.py:2037
 msgid "Gajim: IPython Console"
 msgstr ""
 
-#: gajim/dialog_messages.py:32
-msgid "You can not start a new conversation unless you are connected."
-msgstr "接続しないと、新しい会話を開始できません。"
-
-#: gajim/dialog_messages.py:36 gajim/dialog_messages.py:41
-#: gajim/gtk/single_message.py:305 gajim/gtk/join_groupchat.py:211
-#: gajim/gtk/account_wizard.py:229
-msgid "Invalid JID"
-msgstr "JID が正しくありません"
+#: gajim/dialog_messages.py:31 gajim/dialog_messages.py:36
+#: gajim/gtk/single_message.py:305 gajim/gtk/account_wizard.py:229
+#, fuzzy
+msgid "Invalid XMPP Address"
+msgstr "ファイルが正しくありません"
 
-#: gajim/dialog_messages.py:42 gajim/gtk/single_message.py:306
-#, python-format
-msgid "It is not possible to send a message to %s, this JID is not valid."
+#: gajim/dialog_messages.py:37
+#, fuzzy, python-format
+msgid ""
+"It is not possible to send a message to %s. This XMPP Address is not valid."
 msgstr "%s さんにメッセージを送れません。JID が正しくありません。"
 
-#: gajim/dialog_messages.py:47
-msgid "Unread events"
+#: gajim/dialog_messages.py:42
+#, fuzzy
+msgid "Unread Events"
 msgstr "未読のイベント"
 
-#: gajim/dialog_messages.py:48
-msgid "Read all pending events before removing this account."
+#: gajim/dialog_messages.py:43
+#, fuzzy
+msgid "Read or acknowledge all pending events before removing this account."
 msgstr "このアカウントを削除する前にすべての保留イベントを読みます。"
 
-#: gajim/dialog_messages.py:52
+#: gajim/dialog_messages.py:48
 msgid "Invalid Form"
 msgstr "フォームが正しくありません"
 
-#: gajim/dialog_messages.py:53
+#: gajim/dialog_messages.py:49
 msgid "The form is not filled correctly."
 msgstr "フォームが正しく入力されていません。"
 
-#: gajim/dialog_messages.py:57 gajim/common/helpers.py:309
+#: gajim/dialog_messages.py:53 gajim/common/helpers.py:315
 msgid "Invisible"
 msgstr "居ないふり"
 
-#: gajim/dialog_messages.py:62
-msgid "A connection is not available"
-msgstr "接続は有効ではありません"
+#: gajim/dialog_messages.py:54
+#, fuzzy
+msgid "You cannot join a group chat while being invisible."
+msgstr "「居ないふり」のあいだはグループチャットに参加できません"
 
-#: gajim/dialog_messages.py:63
+#: gajim/dialog_messages.py:58
+#, fuzzy
+msgid "No Connection Available"
+msgstr "接続していません"
+
+#: gajim/dialog_messages.py:59
 msgid "Your message can not be sent until you are connected."
 msgstr "接続するまでメッセージは送信されません。"
 
-#: gajim/dialog_messages.py:67
-msgid "JID already in list"
-msgstr "JID は一覧にあります"
+#: gajim/dialog_messages.py:63
+msgid "XMPP Address Already in List"
+msgstr ""
 
-#: gajim/dialog_messages.py:68
-msgid "The JID you entered is already in the list. Choose another one."
+#: gajim/dialog_messages.py:64
+#, fuzzy
+msgid ""
+"The XMPP Address you entered is already in the list. Please choose another "
+"one."
 msgstr "入力された JID は既に一覧に載っています。別の JID を選択してください。"
 
-#: gajim/dialog_messages.py:72
-msgid "Invalid answer"
+#: gajim/dialog_messages.py:69
+#, fuzzy
+msgid "Invalid Answer"
 msgstr "応答が正しくありません"
 
-#: gajim/dialog_messages.py:73
+#: gajim/dialog_messages.py:70
 #, python-format
 msgid "Transport %(name)s answered wrongly to register request: %(error)s"
 msgstr "中継先 %(name)s は登録要求に対してエラーを返しました: %(error)s"
 
-#: gajim/dialog_messages.py:78
+#: gajim/dialog_messages.py:75
 msgid "Wrong Custom Hostname"
 msgstr "カスタムホスト名が正しくありません"
 
-#: gajim/dialog_messages.py:79
-#, python-format
-msgid "Wrong custom hostname \"%s\". Ignoring it."
+#: gajim/dialog_messages.py:76
+#, fuzzy, python-format
+msgid "Custom hostname \"%s\" is wrong. It will be ignored."
 msgstr "カスタムホスト名 \"%s\" が正しくありません。これを無視します。"
 
-#: gajim/dialog_messages.py:83
-msgid "Error while removing privacy list"
+#: gajim/dialog_messages.py:80
+#, fuzzy
+msgid "Error While Removing Privacy List"
 msgstr "プライバシーリストを削除する際のエラー"
 
-#: gajim/dialog_messages.py:84
-#, python-format
+#: gajim/dialog_messages.py:81
+#, fuzzy, python-format
 msgid ""
-"Privacy list %s has not been removed. It is maybe active in one of your "
-"connected resources. Deactivate it and try again."
+"Privacy list %s has not been removed. It is probably active in one of your "
+"connected resources. Please deactivate it and try again."
 msgstr ""
 "プライバシーリスト %s は削除されませんでした。現在の接続に使用されているよう"
 "です。使用をやめて、もういちど試してください。"
 
-#: gajim/dialog_messages.py:90
-msgid "Invisibility not supported"
+#: gajim/dialog_messages.py:87
+#, fuzzy
+msgid "Invisibility Not Supported"
 msgstr "「居ないふり」はサポートされていません"
 
-#: gajim/dialog_messages.py:91
-#, python-format
-msgid "Account %s doesn't support invisibility."
+#: gajim/dialog_messages.py:88
+#, fuzzy, python-format
+msgid "This account %s doesn't support invisibility."
 msgstr "アカウント %s は「居ないふり」に対応していません。"
 
-#: gajim/dialog_messages.py:95
-msgid "Unregister failed"
+#: gajim/dialog_messages.py:92
+#, fuzzy
+msgid "Unregister Failed"
 msgstr "登録解除に失敗"
 
-#: gajim/dialog_messages.py:96
-#, python-format
-msgid "Unregistration with server %(server)s failed: %(error)s"
+#: gajim/dialog_messages.py:93
+#, fuzzy, python-format
+msgid "Unregistration on server %(server)s failed: %(error)s"
 msgstr "サーバー %(server)s での登録解除に失敗しました: %(error)s"
 
-#: gajim/dialog_messages.py:100
-msgid "Registration succeeded"
+#: gajim/dialog_messages.py:97
+#, fuzzy
+msgid "Registration Succeeded"
 msgstr "登録が完了しました"
 
-#: gajim/dialog_messages.py:101
-#, python-format
-msgid "Registration with agent %s succeeded"
+#: gajim/dialog_messages.py:98
+#, fuzzy, python-format
+msgid "Registration with agent %s succeeded."
 msgstr "エージェント %s の登録は成功しました"
 
-#: gajim/dialog_messages.py:105 gajim/gtk/service_registration.py:215
-msgid "Registration failed"
+#: gajim/dialog_messages.py:102
+#, fuzzy
+msgid "Registration Failed"
 msgstr "登録に失敗しました"
 
-#: gajim/dialog_messages.py:106
+#: gajim/dialog_messages.py:103
 #, python-format
 msgid ""
 "Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
 msgstr "%(agent)s の登録は失敗しました。%(error)s: %(error_msg)s"
 
-#: gajim/dialog_messages.py:111
+#: gajim/dialog_messages.py:108
 #, fuzzy
 msgid "Unable to Join Group Chat"
 msgstr "グループチャットに参加できません"
 
-#: gajim/dialog_messages.py:116
-msgid "GStreamer error"
+#: gajim/dialog_messages.py:113
+#, fuzzy
+msgid "GStreamer Error"
 msgstr "GStreamer エラー"
 
-#: gajim/dialog_messages.py:117
+#: gajim/dialog_messages.py:114
 #, python-format
 msgid ""
 "Error: %(error)s\n"
@@ -2319,19 +2307,21 @@ msgstr ""
 "エラー: %(error)s\n"
 "デバッグ: %(debug)s"
 
-#: gajim/dialog_messages.py:121
-msgid "Wrong host"
+#: gajim/dialog_messages.py:118
+#, fuzzy
+msgid "Wrong Host"
 msgstr "ホストが正しくありません"
 
-#: gajim/dialog_messages.py:122
+#: gajim/dialog_messages.py:119
 msgid "Invalid local address? :-O"
 msgstr "ローカルアドレスが正しくありません"
 
-#: gajim/dialog_messages.py:126
-msgid "Avahi error"
+#: gajim/dialog_messages.py:123
+#, fuzzy
+msgid "Avahi Error"
 msgstr "Avahi エラー"
 
-#: gajim/dialog_messages.py:127
+#: gajim/dialog_messages.py:124
 #, python-format
 msgid ""
 "%s\n"
@@ -2340,61 +2330,69 @@ msgstr ""
 "%s\n"
 "ローカルの伝送がうまく働いていないようです。"
 
-#: gajim/dialog_messages.py:131 gajim/dialog_messages.py:136
-msgid "Could not request upload slot"
+#: gajim/dialog_messages.py:128 gajim/dialog_messages.py:133
+#, fuzzy
+msgid "Could not request upload slot for HTTP File Upload"
 msgstr "アップロード枠を要求できませんでした"
 
-#: gajim/dialog_messages.py:137
-msgid "Got unexpected response from server (see log)"
+#: gajim/dialog_messages.py:134
+#, fuzzy
+msgid "Got unexpected response from server (see log)."
 msgstr "サーバーから予期しない応答がありました (ログを参照してください)"
 
-#: gajim/dialog_messages.py:141 gajim/dialog_messages.py:146
-msgid "Could not open file"
+#: gajim/dialog_messages.py:138 gajim/dialog_messages.py:143
+#, fuzzy
+msgid "Could not Open File"
 msgstr "ファイルを開けませんでした"
 
-#: gajim/dialog_messages.py:142
-msgid "Exception raised while opening file (see log)"
+#: gajim/dialog_messages.py:139
+#, fuzzy
+msgid "Exception raised while trying to open file (see log)."
 msgstr ""
 "ファイルを開いているあいだに例外が発生しました (ログを参照してください)"
 
-#: gajim/dialog_messages.py:151
-msgid "Unsecure"
-msgstr "安全ではありません"
+#: gajim/dialog_messages.py:148
+#, fuzzy
+msgid "Not Secure"
+msgstr "開始していません"
 
-#: gajim/dialog_messages.py:152
-msgid "Server returned unsecure transport (HTTP)"
+#: gajim/dialog_messages.py:149
+#, fuzzy
+msgid "The server returned an insecure transport (HTTP)."
 msgstr "サーバーは安全でない経路 (HTTP) を返しました"
 
-#: gajim/dialog_messages.py:156
-msgid "Could not upload file"
+#: gajim/dialog_messages.py:153
+#, fuzzy
+msgid "Could not Upload File"
 msgstr "ファイルをアップロードできませんでした"
 
-#: gajim/dialog_messages.py:157
+#: gajim/dialog_messages.py:154
 #, python-format
 msgid "HTTP response code from server: %s"
 msgstr "サーバーからのHTTP応答コード: %s"
 
-#: gajim/dialog_messages.py:161
+#: gajim/dialog_messages.py:158
 msgid "Upload Error"
 msgstr "アップロードエラー"
 
-#: gajim/dialog_messages.py:166
+#: gajim/dialog_messages.py:163
 msgid "Encryption Error"
 msgstr "暗号化のエラー"
 
-#: gajim/dialog_messages.py:167
-msgid "For the chosen encryption there is no encryption method available"
-msgstr "その暗号化は有効な暗号化方式ではありません"
+#: gajim/dialog_messages.py:164
+msgid "There is no encryption method available for the chosen encryption."
+msgstr ""
 
-#: gajim/dialog_messages.py:171
-msgid "Avatar upload failed"
+#: gajim/dialog_messages.py:169
+#, fuzzy
+msgid "Avatar Upload Failed"
 msgstr "アバターのアップロードに失敗しました"
 
-#: gajim/privatechat_control.py:204
+#: gajim/privatechat_control.py:207
 msgid "Sending private message failed"
 msgstr "私信の送信に失敗しました"
 
-#: gajim/privatechat_control.py:206
+#: gajim/privatechat_control.py:209
 #, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr ""
@@ -2419,7 +2417,8 @@ msgid "show help on command"
 msgstr "コマンドのヘルプを表示します"
 
 #: gajim/gajim_remote.py:85
-msgid "Lists all contacts in roster, one for each line"
+#, fuzzy
+msgid "Lists all contacts in the contact list, one for each line"
 msgstr "名簿にある相手先すべてを、それぞれ1行に表示します"
 
 #: gajim/gajim_remote.py:87 gajim/gajim_remote.py:102 gajim/gajim_remote.py:112
@@ -2495,11 +2494,13 @@ msgstr ""
 
 #: gajim/gajim_remote.py:118
 #, fuzzy
-msgid "Sends new chat message to a contact in the roster. Account is optional."
+msgid ""
+"Sends new chat message to a contact in the contact list. Account is optional."
 msgstr "相手先に注目させるためのメッセージを送信します"
 
 #: gajim/gajim_remote.py:120 gajim/gajim_remote.py:130
-msgid "JID of the contact that will receive the message"
+#, fuzzy
+msgid "XMPP Address of the contact that will receive the message"
 msgstr "メッセージを受け取りたい相手先の JID"
 
 #: gajim/gajim_remote.py:121 gajim/gajim_remote.py:132
@@ -2513,8 +2514,10 @@ msgid "if specified, the message will be sent using this account"
 msgstr "指定した場合、メッセージはこのアカウントを使って送られます"
 
 #: gajim/gajim_remote.py:127
-msgid "Sends a chat message to someone on your roster. Account is optional."
-msgstr ""
+#, fuzzy
+msgid ""
+"Sends a chat message to someone on your contact list. Account is optional."
+msgstr "相手先に注目させるためのメッセージを送信します"
 
 #: gajim/gajim_remote.py:131
 msgid "subject"
@@ -2525,11 +2528,13 @@ msgid "message subject"
 msgstr "メッセージの件名"
 
 #: gajim/gajim_remote.py:138
-msgid "Sends new message to a groupchat you've joined."
+#, fuzzy
+msgid "Sends new message to a group chat you've joined."
 msgstr "参加しているグループチャットに新しいメッセージを送信します。"
 
 #: gajim/gajim_remote.py:140
-msgid "JID of the room that will receive the message"
+#, fuzzy
+msgid "XMPP Address of the group chat that will receive the message"
 msgstr "メッセージを受け取る談話室そのものの JID"
 
 #: gajim/gajim_remote.py:147
@@ -2538,7 +2543,8 @@ msgstr "相手先の詳細情報を取得します"
 
 #: gajim/gajim_remote.py:149 gajim/gajim_remote.py:162
 #: gajim/gajim_remote.py:192
-msgid "JID of the contact"
+#, fuzzy
+msgid "XMPP Address of the contact"
 msgstr "相手先の JID"
 
 #: gajim/gajim_remote.py:153
@@ -2600,7 +2606,8 @@ msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Gajim の設定の現在の状態を .config ファイルに書き出します"
 
 #: gajim/gajim_remote.py:190
-msgid "Removes contact from roster"
+#, fuzzy
+msgid "Removes contact from contact list"
 msgstr "相手先を名簿から削除します"
 
 #: gajim/gajim_remote.py:193
@@ -2649,9 +2656,9 @@ msgid "Missing argument \"contact_jid\""
 msgstr "引数 \"contact_jid\" がありません"
 
 #: gajim/gajim_remote.py:275
-#, python-format
+#, fuzzy, python-format
 msgid ""
-"'%s' is not in your roster.\n"
+"'%s' is not in your contact list.\n"
 "Please specify account for sending the message."
 msgstr ""
 "'%s' は名簿にありません。\n"
@@ -2876,12 +2883,12 @@ msgstr "週の終わり"
 msgid "Weekend!"
 msgstr "週末 !"
 
-#: gajim/common/logger.py:192 gajim/common/logger.py:197
+#: gajim/common/logger.py:189 gajim/common/logger.py:194
 #, python-format
 msgid "%s is a directory but should be a file"
 msgstr "%s はディレクトリです。ファイルでなければなりません"
 
-#: gajim/common/logger.py:217
+#: gajim/common/logger.py:214
 #, python-format
 msgid "Creating %s"
 msgstr "%s を作成中"
@@ -2955,24 +2962,23 @@ msgstr "%(nickname)s さんがサインアウトしました"
 msgid "Contact Signed Out"
 msgstr "相手先がサインアウトしました"
 
-#: gajim/common/contacts.py:455
-msgid "Not in roster"
-msgstr "名簿にありません"
-
 #: gajim/common/config.py:80
+#, fuzzy
 msgid ""
 "Show desktop notification even when a chat window is opened for this contact "
-"and does not have focus"
+"and does not have focus."
 msgstr ""
 "この相手先のチャットウィンドウが開いていてフォーカスが当たっていない場合でも"
 "デスクトップ通知を表示します"
 
 #: gajim/common/config.py:81
-msgid "Play sound when user is busy"
+#, fuzzy
+msgid "Play sound even when being busy."
 msgstr "取り込み中でもサウンドを鳴らします"
 
 #: gajim/common/config.py:83
-msgid "Show only online and free for chat contacts in roster."
+#, fuzzy
+msgid "Show only online and free for chat contacts in the contact list."
 msgstr "「オンライン」と「チャットできます」の相手先のみを名簿に表示します。"
 
 #: gajim/common/config.py:86
@@ -2980,11 +2986,15 @@ msgid "Time in minutes, after which your status changes to away."
 msgstr "在席状況が「離席中」に変わるまでの時間 (単位は分)。"
 
 #: gajim/common/config.py:87
-msgid "$S (Away as a result of being idle more than $T min)"
+#, fuzzy
+msgid "$S (Away: Idle more than $T min)"
 msgstr "$S (操作のない状態が $T 分を超えたため、離席中とします)"
 
 #: gajim/common/config.py:87
-msgid "$S will be replaced by current status message, $T by autoawaytime."
+#, fuzzy
+msgid ""
+"$S will be replaced by current status message, $T by the 'autoawaytime' "
+"value."
 msgstr "$S は現在の状況メッセージに置き換えられます。$T は自動離席の時間です。"
 
 #: gajim/common/config.py:89
@@ -2992,73 +3002,90 @@ msgid "Time in minutes, after which your status changes to not available."
 msgstr "在席状況が「不在」に変わるまでの時間 (単位は分)。"
 
 #: gajim/common/config.py:90
-msgid "$S (Not available as a result of being idle more than $T min)"
+#, fuzzy
+msgid "$S (Not available: Idle more than $T min)"
 msgstr "$S (操作のない状態が $T 分を超えたため、不在とします)"
 
 #: gajim/common/config.py:90
-msgid "$S will be replaced by current status message, $T by autoxatime."
+#, fuzzy
+msgid ""
+"$S will be replaced by current status message, $T by the 'autoxatime' value."
 msgstr "$S は現在の状況メッセージに置き換えられます。$T は自動不在の時間です。"
 
 #: gajim/common/config.py:93
+#, fuzzy
 msgid ""
-"When to show notification area icon. Can be 'never', 'on_event', 'always'."
+"When to show the notification area icon. Can be 'never', 'on_event', and "
+"'always'."
 msgstr ""
 "いつ通知エリアにアイコンを表示するか。'never'(表示しない)、'on_event'(保留イ"
 "ベントがあるときだけ)、'always'(常に)のいずれか。"
 
 #: gajim/common/config.py:94
-msgid "Allow to hide the roster window even if the tray icon is not shown."
+#, fuzzy
+msgid ""
+"Allow to hide the contact list window even if the notification area icon is "
+"not shown."
 msgstr ""
 "トレイアイコンが表示されていない状態でも名簿ウィンドウを閉じることを許しま"
 "す。"
 
 #: gajim/common/config.py:97
-msgid "Contact signed in notification color."
-msgstr "相手先のサインインの通知の色。"
+#, fuzzy
+msgid "Notification color for contacts signing in."
+msgstr "相手先のサインインを通知する (_I)"
 
 #: gajim/common/config.py:98
-msgid "Contact signout notification color"
-msgstr "相手先のサインアウトの通知の色"
+#, fuzzy
+msgid "Notification color for contacts signing out."
+msgstr "相手先のサインアウトを通知する (_O)"
 
 #: gajim/common/config.py:99
-msgid "New message notification color."
+#, fuzzy
+msgid "Notification color for new message notification."
 msgstr "新着メッセージ通知の色。"
 
 #: gajim/common/config.py:100
-msgid "File transfer request notification color."
-msgstr "ファイル転送要求の通知の色。"
+#, fuzzy
+msgid "Notification color for file transfer request."
+msgstr "ファイル転送が完了したら知らせる (_N)"
 
 #: gajim/common/config.py:101
-msgid "File transfer error notification color."
-msgstr "ファイル転送エラーの通知の色。"
+#, fuzzy
+msgid "Notification color for file transfer errors."
+msgstr "ファイル転送が完了したら知らせる (_N)"
 
 #: gajim/common/config.py:102
-msgid "File transfer complete or stopped notification color."
-msgstr "ファイル転送の完了または中止の通知の色。"
+msgid "Notification color for stopped or completed file transfers."
+msgstr ""
 
 #: gajim/common/config.py:103
-msgid "Groupchat invitation notification color"
-msgstr "グループチャットへの招待の通知の色"
+msgid "Notification color for group chat invitations."
+msgstr ""
 
 #: gajim/common/config.py:104
-msgid "Background color of status changed notification"
+#, fuzzy
+msgid "Notification background color for changed status."
 msgstr "在席状況変更の通知の背景色"
 
 #: gajim/common/config.py:105
-msgid "Other dialogs color."
-msgstr "その他のダイアログの色。"
+msgid "Notification color for other dialogs."
+msgstr ""
 
 #: gajim/common/config.py:106
+#, fuzzy
 msgid ""
-"List (space separated) of rows (accounts and groups) that are collapsed."
+"List of rows (accounts and groups) that are collapsed (space separated)."
 msgstr "折り畳む (アカウントやグループチャットの) 行の一覧 (空白で区切る)。"
 
 #: gajim/common/config.py:107
 msgid "default"
 msgstr "デフォルト"
 
-#: gajim/common/config.py:113
-msgid "Language used by speller"
+#: gajim/common/config.py:113 gajim/common/config.py:424
+#: gajim/common/config.py:431
+#, fuzzy
+msgid "Language used for spell checking."
 msgstr "スペルチェックのための言語"
 
 #: gajim/common/config.py:114
@@ -3073,10 +3100,11 @@ msgstr ""
 "'never'(なし) - 時刻を印さない。"
 
 #: gajim/common/config.py:115
+#, fuzzy
 msgid ""
 "Print time in chats using Fuzzy Clock. Value of fuzziness from 1 to 4, or 0 "
-"to disable fuzzyclock. 1 is the most precise clock, 4 the least precise one. "
-"This is used only if print_time is 'sometimes'."
+"to disable Fuzzy Clock. 1 is the most precise clock, 4 the least precise "
+"one. This is used only if 'print_time' is 'sometimes'."
 msgstr ""
 "あいまい時計を使って、チャットに時刻を印します。曖昧さは 1 から 4です。0 なら"
 "あいまい時計を使いません。1 が最も正確な時計で、4 が最も正確ではありません。"
@@ -3092,17 +3120,20 @@ msgid "Treat * / _ pairs as possible formatting characters."
 msgstr "* / _ の組を、書式指定の文字として扱います。"
 
 #: gajim/common/config.py:120
+#, fuzzy
 msgid ""
-"If true, do not remove */_ . So *abc* will be bold but with * * not removed."
+"If enabled, do not remove */_ . So *abc* will be bold but with * * not "
+"removed."
 msgstr ""
 "真なら、*/_ を除去しません。たとえば *abc* は太字になりますが * * は除かれま"
 "せん。"
 
 #: gajim/common/config.py:123
+#, fuzzy
 msgid ""
-"Uses ReStructured text markup to send HTML, plus ascii formatting if "
-"selected. For syntax, see http://docutils.sourceforge.net/docs/ref/rst/"
-"restructuredtext.html (If you want to use this, install docutils)"
+"Uses ReStructured text markup to send HTML, plus ASCII formatting if "
+"selected. Needs docutils installed (for syntax, see http://docutils."
+"sourceforge.net/docs/ref/rst/restructuredtext.html)."
 msgstr ""
 "HTML を送信するために構造化テキスト (ReStructured text markup) を使う (選択す"
 "ればアスキーフォーマットも)。文法は http://docutils.sourceforge.net/docs/ref/"
@@ -3110,288 +3141,310 @@ msgstr ""
 "ストールしてください)。"
 
 #: gajim/common/config.py:132
+#, fuzzy
 msgid ""
-"Character to add after nickname when using nick completion (tab) in group "
-"chat."
+"Character to add after nickname when using nickname completion (tab) in "
+"group chat."
 msgstr ""
 "グループチャットで、ニックネーム補完 (タブ) を使うとき、ニックネームの後ろに"
 "つけ加えられる文字。"
 
 #: gajim/common/config.py:133
+#, fuzzy
 msgid ""
-"Character to propose to add after desired nickname when desired nickname is "
-"used by someone else in group chat."
+"Character to propose to add after desired nickname when nickname is already "
+"used in group chat."
 msgstr ""
 "グループチャットで、希望したニックネームが他の誰かに使われていた場合、希望し"
 "たニックネームの後ろにつけ加えられる文字。"
 
 #: gajim/common/config.py:155
+#, fuzzy
 msgid ""
-"If true, Gajim will save roster position when hiding roster, and restore it "
-"when showing roster."
+"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:161
-msgid "Place the roster on the right in single window mode"
+#, fuzzy
+msgid "Place the contact list on the right in single window mode"
 msgstr "ひとつのウィンドウの場合、名簿を右側にします"
 
 #: gajim/common/config.py:167
 #, fuzzy
 msgid ""
-"This option let you customize timestamp that is printed in conversation. For "
-"example \"[%H:%M] \" will show \"[hour:minute] \". See python doc on "
-"strftime for full documentation: http://docs.python.org/lib/module-time.html"
+"This option lets you customize the timestamp that is printed in "
+"conversation. For example '[%H:%M] ' will show '[hour:minute] '. See python "
+"doc on strftime for full documentation (https://docs.python.org/3/library/"
+"time.html)."
 msgstr ""
 "このオプションで、会話に印される時刻の書式を指定できます。たとえば、\"[%H:"
 "%M] \" は \"[hour:minute] \" となります。詳しくは python の strftime に関する"
 "文書を参照してください: http://docs.python.org/lib/module-time.html"
 
 #: gajim/common/config.py:168
-msgid "Characters that are printed before the nickname in conversations"
+#, fuzzy
+msgid "Characters that are printed before the nickname in conversations."
 msgstr "会話の中で、ニックネームの前に表示される文字列"
 
 #: gajim/common/config.py:169
-msgid "Characters that are printed after the nickname in conversations"
+#, fuzzy
+msgid "Characters that are printed after the nickname in conversations."
 msgstr "会話の中で、ニックネームの後に表示される文字列"
 
 #: gajim/common/config.py:170
-msgid "Add * and [n] in roster title?"
-msgstr "* と [n] を名簿の題に追加するかどうか。"
+#, fuzzy
+msgid "If enabled, Gajim will add * and [n] in contact list window title."
+msgstr "チェックをつけると、Gajim は名簿ウィンドウに相手先の気分を表示します"
 
 #: gajim/common/config.py:171
+#, fuzzy
 msgid ""
-"How many history messages should be restored when a chat tab/window is "
-"reopened?"
+"Number of messages from chat history to be restored when a chat tab/window "
+"is reopened."
 msgstr ""
 "チャットのタブまたはウィンドウを再び開いたとき、再現されるメッセージの行数。"
 
 #: gajim/common/config.py:172
-msgid "How far back in time (minutes) history is restored. -1 means no limit."
+#, fuzzy
+msgid ""
+"How far back in time (minutes) chat history is restored. -1 means no limit."
 msgstr "履歴を復元する際に遡る時間 (単位は分) 。-1 は制限なし。"
 
 #: gajim/common/config.py:173
+#, fuzzy
 msgid ""
-"How many lines to request from server when entering a groupchat. -1 means no "
-"limit"
-msgstr ""
-"グループチャットに参加するとき、サーバーに要求する行数。-1 は制限なし。"
-
-#: gajim/common/config.py:174
-msgid ""
-"Minutes of backlog to request when entering a groupchat. -1 means no limit"
-msgstr ""
-"グループチャットに参加するとき、記録を遡る時間 (単位は分)。-1 は制限なし"
-
-#: gajim/common/config.py:175
-msgid ""
-"How many seconds to wait before trying to autorejoin to a conference you are "
-"being disconnected from. Set to 0 to disable autorejoining."
+"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:176
-msgid "Should autorejoin be activated when kicked from a conference?"
+#: gajim/common/config.py:174
+#, fuzzy
+msgid ""
+"Should automatic rejoin be activated when you were kicked from a group chat?"
 msgstr "談話室から蹴り出された場合、自動で再参加するかどうか。"
 
-#: gajim/common/config.py:177
-msgid ""
-"Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
-"Client default behaviour)."
+#: gajim/common/config.py:175
+#, fuzzy
+msgid "Send message on Ctrl+Enter and make a new line with Enter."
 msgstr ""
 "Ctrl+Enter をメッセージ送信として、Enter を改行とします (Mirabilis ICQ クライ"
 "アントのデフォルトの挙動)。"
 
-#: gajim/common/config.py:179
-msgid "How many lines to store for Ctrl+KeyUP."
+#: gajim/common/config.py:177
+#, fuzzy
+msgid "How many lines to store for Ctrl+KeyUP (previously sent messages)."
 msgstr "Ctrl+KeyUP で遡ることのできる行数。"
 
-#: gajim/common/config.py:182
-#, python-format
+#: gajim/common/config.py:180
+#, fuzzy, python-format
 msgid ""
-"Either custom URL with %%s in it where %%s is the word/phrase or "
-"'WIKTIONARY' which means use Wikitionary."
+"Either a custom URL with %%s in it (where %%s is the word/phrase) or "
+"'WIKTIONARY' (which means use Wikitionary)."
 msgstr ""
 "独自の辞書の URL (%%s を含めます。ここで %%s は語/フレーズです)。または、"
 "wikitionary を使う場合は単に 'WIKTIONARY' としてください。"
 
-#: gajim/common/config.py:185
+#: gajim/common/config.py:183
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr "チェックをつけると、Gajim を gajim-remote を使って遠隔操作できます。"
 
-#: gajim/common/config.py:187
+#: gajim/common/config.py:185
+#, fuzzy
 msgid ""
-"When not printing time for every message (print_time==sometimes), print it "
+"When not printing time for every message ('print_time'==sometimes), print it "
 "every x minutes."
 msgstr ""
 "個々のメッセージに時刻を印すのではない場合 (print_time==sometimes (時々))、時"
 "刻を印す時間間隔 (単位:分)。"
 
-#: gajim/common/config.py:188
+#: gajim/common/config.py:186
 msgid "Ask before pasting an image."
 msgstr ""
 
-#: gajim/common/config.py:189
+#: gajim/common/config.py:187
 msgid "Ask before closing a group chat tab/window."
 msgstr "グループチャットのタブまたはウィンドウを閉じる前に確認を求めます。"
 
-#: gajim/common/config.py:190
+#: gajim/common/config.py:188
+#, fuzzy
 msgid ""
-"Always ask for confirmation before closing groupchats with any of the JIDs "
-"on this space separated list."
+"Always ask for confirmation before closing group chats with any of the XMPP "
+"Addresses on this list (space separated)."
 msgstr ""
 "JID の一覧 (空白で区切る) にあるグループチャットのタブまたはウィンドウを閉じ"
 "る前には、必ず確認を求めます。"
 
-#: gajim/common/config.py:191
+#: gajim/common/config.py:189
+#, fuzzy
 msgid ""
-"Never ask for confirmation before closing groupchats with any of the JIDs on "
-"this space separated list."
+"Never ask for confirmation before closing group chats with any of the XMPP "
+"Addresses on this list (space separated)."
 msgstr ""
 "JID の一覧 (空白で区切る) にあるグループチャットのタブまたはウィンドウを閉じ"
 "る前には、決して確認を求めません。"
 
-#: gajim/common/config.py:192
+#: gajim/common/config.py:190
+#, fuzzy
 msgid ""
-"Ask before closing tabbed chat window if there are controls that can lose "
-"data (chat, private chat, groupchat that will not be minimized)"
+"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:195
+#: gajim/common/config.py:193
+#, fuzzy
 msgid ""
-"Comma separated list of sent hosts, in addition of local interfaces, for "
-"File Transfer in case of address translation/port forwarding."
+"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:196
+#: gajim/common/config.py:194
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "IEC 標準規格で、KiB は 1024 バイト、KB は 1000 バイト。"
 
-#: gajim/common/config.py:198
+#: gajim/common/config.py:196
 msgid "Notify of events in the notification area."
 msgstr "システムの通知エリアでイベントを通知します。"
 
-#: gajim/common/config.py:199
+#: gajim/common/config.py:197
+#, fuzzy
 msgid ""
-"If False, Gajim will display a static event icon instead of the blinking "
-"status icon in the notification area when notifying on event."
+"If disabled, Gajim will display a static event icon instead of the blinking "
+"status icon in the notification area when notifying about an event."
 msgstr ""
 "偽なら、通知エリアでイベントを通知する際に、状態アイコンを点滅させず固定のア"
 "イコンを表示します。"
 
-#: gajim/common/config.py:205
+#: gajim/common/config.py:203
 msgid "Show tab when only one conversation?"
 msgstr "会話がひとつだけのときもタブを表示するかどうか。"
 
-#: gajim/common/config.py:206
+#: gajim/common/config.py:204
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "チャットウィンドウにタブつき帳面の縁を表示するかどうか。"
 
-#: gajim/common/config.py:207
+#: gajim/common/config.py:205
 msgid "Show close button in tab?"
 msgstr "タブに閉じるボタンを表示するかどうか。"
 
-#: gajim/common/config.py:220
+#: gajim/common/config.py:218
 msgid "Preview new messages in notification popup?"
 msgstr "新着のメッセージをポップアップ通知に表示するかどうか。"
 
-#: gajim/common/config.py:223
+#: gajim/common/config.py:221
+#, fuzzy
 msgid ""
-"A semicolon-separated list of words that will be highlighted in group chats."
+"A list of words (semicolon separated) that will be highlighted in group "
+"chats."
 msgstr "グループチャットで強調表示する語の一覧 (セミコロンで区切る)。"
 
-#: gajim/common/config.py:224
+#: gajim/common/config.py:222
+#, fuzzy
 msgid ""
-"If true, quits Gajim when X button of Window Manager is clicked. This "
-"setting is taken into account only if notification icon is used."
+"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 を終了し"
 "ます。この設定は通知アイコンが使用されているときのみ適用されます。"
 
-#: gajim/common/config.py:225
+#: gajim/common/config.py:223
+#, fuzzy
 msgid ""
-"If true, Gajim hides the Roster window on pressing the X button instead of "
-"minimizing into the Dock."
+"If enabled, Gajim hides the contact list window when pressing the X button "
+"instead of minimizing into the notification area."
 msgstr ""
 "真なら、Gajim は X ボタンが押された際に、名簿ウィンドウを最小化するのではな"
 "く、閉じます。"
 
-#: gajim/common/config.py:226
+#: gajim/common/config.py:224
+#, fuzzy
 msgid ""
-"If true, Gajim will display an icon on each tab containing unread messages. "
-"Depending on the theme, this icon may be animated."
+"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:227
+#: gajim/common/config.py:225
+#, fuzzy
 msgid ""
-"If true, Gajim will display the status message, if not empty, for every "
-"contact under the contact name in roster window."
+"If enabled, Gajim will display the status message (if not empty) underneath "
+"the contact name in the contact list window."
 msgstr ""
 "真なら、Gajim は名簿ウィンドウの相手先の名前の下に在席状況メッセージを (それ"
 "が空でなければ) 表示します。"
 
-#: gajim/common/config.py:233
-msgid "Define the position of the avatar in roster. Can be left or right"
+#: gajim/common/config.py:231
+#, fuzzy
+msgid ""
+"Define the position of avatars in the contact list. Can be 'left' or 'right'."
 msgstr "名簿でのアバターの表示位置。left(左)またはright(右)"
 
-#: gajim/common/config.py:234
+#: gajim/common/config.py:232
+#, fuzzy
 msgid ""
-"If False, Gajim will no longer print status line in chats when a contact "
-"changes their status and/or their status message."
+"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/common/config.py:235
+#: gajim/common/config.py:233
 #, fuzzy
 msgid ""
 "Default Setting: Show a status message for every join or leave in a group "
-"chat"
+"chat."
 msgstr "グループに参加できません"
 
-#: gajim/common/config.py:236
+#: gajim/common/config.py:234
+#, fuzzy
 msgid ""
-"Default Setting: Show a status message for all status (away, dnd, etc.) "
-"changes of users in a group chat"
-msgstr ""
+"Default Setting: Show a status message for all status changes (away, dnd, "
+"etc.) of users in a group chat."
+msgstr "グループに参加できません"
 
-#: gajim/common/config.py:238
-msgid "Log XHTML messages instead of plain text messages."
+#: gajim/common/config.py:236
+#, fuzzy
+msgid "Store XHTML messages in chat history instead of plain text messages."
 msgstr "プレーンテキストのメッセージではなく XHTML のメッセージを記録します。"
 
-#: gajim/common/config.py:239
+#: gajim/common/config.py:237
 msgid "Don't show avatar for the transport itself."
 msgstr "中継先そのもののアバターを表示しません。"
 
-#: gajim/common/config.py:240
-msgid "Don't show roster in the system taskbar."
+#: gajim/common/config.py:238
+#, fuzzy
+msgid "Don't show contact list window in the system taskbar."
 msgstr "システムのタスクバーに名簿を表示しません。"
 
-#: gajim/common/config.py:241
+#: gajim/common/config.py:239
+#, fuzzy
 msgid ""
-"If true, make the window flash (the default behaviour in most Window "
-"Managers) when holding pending events."
+"If enabled, Gajim makes the window flash (the default behaviour in most "
+"Window Managers) when holding pending events."
 msgstr ""
 "真なら、保留のイベントがある場合にウィンドウをフラッシュさせます (たいていの"
 "ウィンドウマネージャのデフォルトです)。"
 
-#: gajim/common/config.py:245
+#: gajim/common/config.py:243
+#, fuzzy
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
 "'always_with_roster' - Like 'always' but the messages are in a single window "
-"along with the roster.\n"
+"along with the contact list.\n"
 "'never' - All messages get their own window.\n"
 "'peracct' - Messages for each account are sent to a specific window.\n"
-"'pertype' - Each message type (e.g. chats vs. groupchats) is sent to a "
+"'pertype' - Each message type (e.g. chats vs. group chats) is sent to a "
 "specific window."
 msgstr ""
 "新着メッセージを置くウィンドウの制御。\n"
@@ -3404,194 +3457,220 @@ msgstr ""
 "'pertype'(種類ごと) - メッセージの種類(たとえばチャット、グループチャット)ご"
 "とにそれぞれのウィンドウに。"
 
-#: gajim/common/config.py:246
+#: gajim/common/config.py:244
+#, fuzzy
 msgid ""
-"Show roster on startup.\n"
-"'always' - Always show roster.\n"
-"'never' - Never show roster.\n"
-"'last_state' - Restore the last state roster."
+"Show contact list window on startup.\n"
+"'always' - Always show contact list window.\n"
+"'never' - Never show contact list window.\n"
+"'last_state' - Restore last state of the contact list window."
 msgstr ""
 "起動時に名簿を表示するかどうか。\n"
 "'always'(常に) - 常に名簿を表示する。\n"
 "'never'(なし) - 名簿を表示しない。\n"
 "'last_state'(以前の状態) - 以前の名簿の表示状態のとおりにする。"
 
-#: gajim/common/config.py:247
-msgid "If False, you will no longer see the avatar in the chat window."
+#: gajim/common/config.py:245
+#, fuzzy
+msgid "If enabled, Gajim displays the avatar in the chat window."
 msgstr "偽なら、チャットウィンドウにアバターは表示されません。"
 
-#: gajim/common/config.py:248
-msgid "If true, pressing the escape key closes a tab/window."
+#: gajim/common/config.py:246
+#, fuzzy
+msgid "If enabled, pressing Esc closes a tab/window."
 msgstr "真なら、エスケープキーを押すことでタブまたはウィンドウを閉じます。"
 
-#: gajim/common/config.py:249
-msgid "Hides the banner in a group chat window"
+#: gajim/common/config.py:247
+#, fuzzy
+msgid "Hides the banner in a group chat window."
 msgstr "グループチャットのバナーを表示しません"
 
-#: gajim/common/config.py:250
-msgid "Hides the banner in two persons chat window"
-msgstr "1対1チャットのウィンドウのバナーを表示しません"
+#: gajim/common/config.py:248
+#, fuzzy
+msgid "Hides the banner in a 1:1 chat window."
+msgstr "グループチャットのバナーを表示しません"
 
-#: gajim/common/config.py:251
-msgid "Hides the group chat occupants list in group chat window."
+#: gajim/common/config.py:249
+#, fuzzy
+msgid "Hides the group chat participants list in a group chat window."
 msgstr "グループチャットウィンドウで、在室者一覧を表示しません。"
 
 # (Mako)chat は group chat のことか?
-#: gajim/common/config.py:252
+#: gajim/common/config.py:250
+#, fuzzy
 msgid ""
 "In a chat, show the nickname at the beginning of a line only when it's not "
-"the same person talking than in previous message."
+"the same person talking as in the previous message."
 msgstr ""
 "チャットで、前のメッセージと別の人の場合のみ、行の先頭にニックネームを表示し"
 "ます。"
 
-#: gajim/common/config.py:253
+#: gajim/common/config.py:251
 msgid "Indentation when using merge consecutive nickname."
 msgstr "連続するニックネームを統合する際の字下げ幅。"
 
-#: gajim/common/config.py:254
-msgid "Ctrl-Tab go to next composing tab when none is unread."
+#: gajim/common/config.py:252
+#, 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:255
+#: gajim/common/config.py:253
+#, fuzzy
 msgid ""
-"Show the confirm metacontacts creation dialog or not? Empty string means "
-"never show the dialog."
+"Show a confirmation dialog to create metacontacts? Empty string means never "
+"show the dialog."
 msgstr ""
-"メタ相手先の作成の確認のダイアログを表示するかどうか。空文字ならダイアログを"
-"表示しません。"
+"相手先の遮断の確認のダイアログを表示するかどうか。空文字ならダイアログを表示"
+"しません。"
 
-#: gajim/common/config.py:256
+#: gajim/common/config.py:254
+#, fuzzy
 msgid ""
-"Show the confirm block contact dialog or not? Empty string means never show "
+"Show a confirmation dialog to block a contact? Empty string means never show "
 "the dialog."
 msgstr ""
 "相手先の遮断の確認のダイアログを表示するかどうか。空文字ならダイアログを表示"
 "しません。"
 
-#: gajim/common/config.py:257
+#: gajim/common/config.py:255
+#, fuzzy
 msgid ""
-"Show the confirm custom status dialog or not? Empty string means never show "
-"the dialog."
+"Show a confirmation dialog for a custom status? Empty string means never "
+"show the dialog."
 msgstr ""
 "個別の在席状況の確認のダイアログを表示するかどうか。空文字ならダイアログを表"
 "示しません。"
 
-#: gajim/common/config.py:258
+#: gajim/common/config.py:256
+#, fuzzy
 msgid ""
-"If true, you will be able to set a negative priority to your account in "
-"account modification window. BE CAREFUL, when you are logged in with a "
-"negative priority, you will NOT receive any message from your server."
+"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:259
+#: gajim/common/config.py:257
+#, fuzzy
 msgid ""
-"If true, Gajim will show number of online and total contacts in account and "
-"group rows."
+"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:260
+#: gajim/common/config.py:258
+#, fuzzy
 msgid ""
-"Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
-"as if they were of this type"
+"Can be empty, 'chat' or 'normal'. If not empty, all incoming messages are "
+"treated as if they were of this type."
 msgstr ""
 "空白、'chat'(チャット)、'normal'(普通) のいずれか。もし空でなければ、すべての"
 "受信メッセージをこのタイプとして扱います"
 
-#: gajim/common/config.py:261
+#: gajim/common/config.py:259
+#, fuzzy
 msgid ""
-"If true, Gajim will scroll and select the contact who sent you the last "
-"message, if chat window is not already opened."
+"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:262
+#: gajim/common/config.py:260
 msgid "Time of inactivity needed before the change status window closes down."
 msgstr "在籍情況変更ウィンドウを閉じるまでの活動停止の時間。"
 
-#: gajim/common/config.py:263
+#: gajim/common/config.py:261
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
 msgstr "表示された会話の最大行数。古いほうから削除されます。"
 
-#: gajim/common/config.py:264
+#: gajim/common/config.py:262
+#, fuzzy
 msgid ""
-"If true, notification windows from notification-daemon will be attached to "
-"notification icon."
+"If enabled, notification windows from notification-daemon will be attached "
+"to the notification area icon."
 msgstr ""
 "真なら、notification-daemon からの通知は通知アイコンの脇に表示されます。"
 
-#: gajim/common/config.py:265
+#: gajim/common/config.py:263
 msgid "Choose interval between 2 checks of idleness."
 msgstr "操作しない状態をチェックする時間間隔。"
 
-#: gajim/common/config.py:266
+#: gajim/common/config.py:264
+#, fuzzy
 msgid ""
-"Valid uri schemes. Only schemes in this list will be accepted as \"real\" "
-"uri. (mailto and xmpp are handled separately)"
+"Valid URI schemes. Only schemes in this list will be accepted as 'real' URI "
+"(mailto and xmpp are handled separately)."
 msgstr ""
 "正当な URI スキーム。この一覧にあるスキームだけが“実際の”URIとして扱われます"
 "(mailto と xmpp は別)。"
 
-#: gajim/common/config.py:267
-msgid "If true, completion in groupchats will be like a shell auto-completion"
+#: gajim/common/config.py:265
+#, fuzzy
+msgid ""
+"If enabled, completion in group chats will be like a shell auto-completion."
 msgstr "真なら、グループチャットでの補完をシェルの自動補完のようにします。"
 
-#: gajim/common/config.py:272
-msgid "Optionally fix jingle output video framerate. Example: 10/1 or 25/2"
+#: gajim/common/config.py:270
+#, fuzzy
+msgid "Optionally fix Jingle output video framerate. Example: 10/1 or 25/2."
 msgstr ""
 "jingle の出力のビデオのフレームレート (オプション)。例: 10/1 または 25/2"
 
-#: gajim/common/config.py:273
-msgid "Optionally resize jingle output video. Example: 320x240"
+#: gajim/common/config.py:271
+#, fuzzy
+msgid "Optionally resize Jingle output video. Example: 320x240."
 msgstr "jingle の出力のビデオの大きさ (オプション). 例: 320x240"
 
-#: gajim/common/config.py:274
-msgid "If true, You will also see your webcam"
-msgstr "真なら、自分のウェブカメラも表示します。"
+#: gajim/common/config.py:272
+msgid "If enabled, you will see your webcam's video stream as well."
+msgstr ""
 
-#: gajim/common/config.py:277
+#: gajim/common/config.py:275
+#, fuzzy
 msgid ""
-"If true, Gajim will try to use a STUN server when using Jingle. The one in "
-"\"stun_server\" option, or the one given by the XMPP server."
+"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/common/config.py:278
+#: gajim/common/config.py:276
 msgid "STUN server to use when using Jingle"
 msgstr "Jingle を使う際に利用する STUN サーバー"
 
-#: gajim/common/config.py:279
+#: gajim/common/config.py:277
+#, fuzzy
 msgid ""
-"If true, Gajim will show affiliation of groupchat occupants by adding a "
-"colored square to the status icon"
+"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:280
+#: gajim/common/config.py:278
+#, fuzzy
 msgid ""
 "Proxy used for all outgoing connections if the account does not have a "
-"specific proxy configured"
+"specific proxy configured."
 msgstr ""
 "アカウントで正しいプロキシの設定がなされていない場合に、外向きの通信に使われ"
 "るプロキシ"
 
-#: gajim/common/config.py:281
+#: gajim/common/config.py:279
 #, fuzzy
-msgid "If true, Gajim will ignore incoming attention requests (\"wizz\")."
+msgid "If enabled, Gajim will ignore incoming attention requests ('wizz')."
 msgstr "真なら、Gajim は受信する注目メッセージを無視します (\"wizz\")。"
 
-#: gajim/common/config.py:282
+#: gajim/common/config.py:280
 msgid ""
 "If enabled, Gajim will reopen chat windows that were opened last time Gajim "
 "was closed."
@@ -3599,67 +3678,79 @@ msgstr ""
 "真なら、Gajim は、最後に終了した際に開いていたチャットウィンドウを再び開きま"
 "す。"
 
-#: gajim/common/config.py:283
+#: gajim/common/config.py:281
+#, fuzzy
 msgid ""
-"If enabled, Gajim will show an icon to show that sent message has been "
-"received by your contact"
+"If enabled, Gajim will display an icon to show that sent messages have been "
+"received by your contact."
 msgstr ""
 "チェックをつけると、Gajim は、送ったメッセージが相手先に受信されたとき、アイ"
 "コンを表示します。"
 
-#: gajim/common/config.py:284
-msgid "Show a mini avatar in chat window tabs and in window icon"
+#: gajim/common/config.py:282
+#, fuzzy
+msgid "Show a mini avatar in chat window tabs and as the window's icon."
 msgstr "チャットウィンドウとウィンドウアイコンに小さなアバターを表示します"
 
-#: gajim/common/config.py:285
-msgid "If true, Gajim will use the Systems Keyring to store account passwords."
+#: gajim/common/config.py:283
+#, fuzzy
+msgid ""
+"If enabled, Gajim will use the System's Keyring to store account passwords."
 msgstr "真なら、Gajim はパスワードの保存にシステムのキーリングを使います。"
 
-#: gajim/common/config.py:286
-msgid "If true, Gajim will execute XEP-0146 Commands."
+#: gajim/common/config.py:284
+#, fuzzy
+msgid "If enabled, Gajim will execute XEP-0146 Commands."
 msgstr "真なら、Gajim は XEP-0146 コマンドを実行します。"
 
-#: gajim/common/config.py:287
+#: gajim/common/config.py:285
 msgid "2: System, 1: Enabled, 0: Disabled"
 msgstr ""
 
-#: gajim/common/config.py:288
+#: gajim/common/config.py:286
 msgid "Options in days which can be chosen in the sync threshold menu"
 msgstr ""
 
-#: gajim/common/config.py:289
+#: gajim/common/config.py:287
 msgid ""
-"Maximum history in days we request from a public room archive. 0: As much as "
-"possible"
+"Maximum history in days we request from a public group chat archive. 0: As "
+"much as possible."
 msgstr ""
 
-#: gajim/common/config.py:290
+#: gajim/common/config.py:288
 msgid ""
-"Maximum history in days we request from a private room archive. 0: As much "
-"as possible"
+"Maximum history in days we request from a private group chat archive. 0: As "
+"much as possible."
 msgstr ""
 
-#: gajim/common/config.py:291
-msgid "If the room subject is shown in chat on join"
+#: gajim/common/config.py:289
+msgid ""
+"If enabled, Gajim shows the group chat subject in the chat window when "
+"joining."
 msgstr ""
 
-#: gajim/common/config.py:292
+#: gajim/common/config.py:290
+#, fuzzy
 msgid ""
-"If the contact row is colored according to the current chatstate of the "
-"contact"
-msgstr ""
+"If enabled, the contact row is colored according to the current chat state "
+"of the contact."
+msgstr "チェックをつけると、Gajim はシステムの時刻を知られることを許可します"
 
-#: gajim/common/config.py:293
-msgid "If the tab is colored according to the current chatstate of the contact"
-msgstr ""
+#: gajim/common/config.py:291
+#, fuzzy
+msgid ""
+"If enabled, the tab is colored according to the current chat state of the "
+"contact."
+msgstr "チェックをつけると、Gajim はシステムの時刻を知られることを許可します"
 
-#: gajim/common/config.py:294
+#: gajim/common/config.py:292
+#, fuzzy
 msgid ""
-"Shows a text in the banner that describes the current chatstate of the "
-"contact"
-msgstr ""
+"Shows a text in the banner that describes the current chat state of the "
+"contact."
+msgstr "チェックをつけると、Gajim はシステムの時刻を知られることを許可します"
 
-#: gajim/common/config.py:295 gajim/common/config.py:424
+#: gajim/common/config.py:293
 #, fuzzy
 msgid ""
 "Chat state notifications that are sent to contacts. Possible values: all, "
@@ -3668,334 +3759,376 @@ msgstr ""
 "チャット状態通知の送信。all (すべての状態)、composing_only (入力中のみ)、"
 "disabled (通知しない) のいずれか。"
 
-#: gajim/common/config.py:296 gajim/common/config.py:438
+#: gajim/common/config.py:294
 #, fuzzy
 msgid ""
 "Chat state notifications that are sent to the group chat. Possible values: "
-"all, composing_only, disabled"
+"'all', 'composing_only', 'disabled'"
 msgstr ""
 "チャット状態通知の送信。all (すべての状態)、composing_only (入力中のみ)、"
 "disabled (通知しない) のいずれか。"
 
-#: gajim/common/config.py:312
+#: gajim/common/config.py:297
+msgid "API Preferences. Possible values: 'http', 'iq'"
+msgstr ""
+
+#: gajim/common/config.py:313
+#, fuzzy
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
-"defined in autopriority_* options."
+"defined in 'autopriority_*' options."
 msgstr ""
 "在席状況に応じて優先順位を自動的に変更します。優先順位は autopriority_* オプ"
 "ションで定義します。"
 
-#: gajim/common/config.py:320
+#: gajim/common/config.py:321
+#, fuzzy
 msgid ""
-"Status used to autoconnect as. Can be online, chat, away, xa, dnd, "
-"invisible. NOTE: this option is used only if restore_last_status is disabled"
+"Status to be used automatically when connecting. Can be 'online', 'chat', "
+"'away', 'xa', 'dnd' or 'invisible'. NOTE: This option is used only if "
+"'restore_last_status' is disabled."
 msgstr ""
 "自動接続の際に使われる在席状況。online (オンライン)、chat (チャット可)、away "
 "(離席中)、xa (不在)、dnd (取り込み中)、invisible (居ないふり) のいずれか。注"
 "意: このオプションは restore_last_status が無効のときのみ使われます"
 
 # (Mako) If enabled は If True であるべきだろう
-#: gajim/common/config.py:321
-msgid "If enabled, restore the last status that was used."
+#: gajim/common/config.py:322
+#, fuzzy
+msgid "If enabled, the last status will be restored."
 msgstr "真なら、最後に使われた在席状況を復元します。"
 
-#: gajim/common/config.py:322
+#: gajim/common/config.py:323
+#, fuzzy
 msgid ""
-"If true, Contacts requesting authorization will be automatically accepted."
+"If enabled, Contacts requesting authorization will be accepted automatically."
 msgstr "真なら、相手先の承認の要求は自動的に了承されます。"
 
-#: gajim/common/config.py:323
+#: gajim/common/config.py:324
+#, fuzzy
 msgid ""
-"If False, this account will be disabled and will not appear in roster window."
+"If disabled, this account will be disabled and will not appear in the "
+"contact list window."
 msgstr ""
 "偽なら、このアカウントを無効にして、チャットウィンドウにアバターを表示しませ"
 "ん。"
 
-#: gajim/common/config.py:327
-msgid "Allow plaintext connections"
+#: gajim/common/config.py:328
+#, fuzzy
+msgid "Allow plaintext connections."
 msgstr "暗号化されない接続を許可します"
 
-#: gajim/common/config.py:330
+#: gajim/common/config.py:331
+#, fuzzy
 msgid ""
-"List (space separated) of authentication mechanisms to try. Can contain "
-"ANONYMOUS, EXTERNAL, GSSAPI, SCRAM-SHA-1-PLUS, SCRAM-SHA-1, DIGEST-MD5, "
-"PLAIN, X-MESSENGER-OAUTH2 or XEP-0078"
+"List of authentication mechanisms to try (space separated). Can contain "
+"'ANONYMOUS', 'EXTERNAL', 'GSSAPI', 'SCRAM-SHA-1-PLUS', 'SCRAM-SHA-1', "
+"'DIGEST-MD5', 'PLAIN', 'X-MESSENGER-OAUTH2' or 'XEP-0078'."
 msgstr ""
 "試みる認証の種類 (空白で区切る)。 ANONYMOUS, EXTERNAL, GSSAPI, SCRAM-SHA-1-"
 "PLUS, SCRAM-SHA-1, DIGEST-MD5, PLAIN, X-MESSENGER-OAUTH2 または XEP-0078"
 
-#: gajim/common/config.py:331
+#: gajim/common/config.py:332
+#, fuzzy
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection. "
-"Can be 'warn', 'connect', 'disconnect'"
+"Can be 'warn', 'connect' or 'disconnect'."
 msgstr ""
 "暗号化されない接続の場合、パスワードを送る前に警告のダイアログを表示します。"
 "warn(警告する)、connect(接続する)または disconnect(接続しない)"
 
-#: gajim/common/config.py:332
+#: gajim/common/config.py:333
 msgid "Show a warning dialog before using standard SSL library."
 msgstr "標準の SSL ライブラリを使う前に警告のダイアログを表示します。"
 
-#: gajim/common/config.py:333
+#: gajim/common/config.py:334
 msgid ""
 "Show a warning dialog before sending PLAIN password over a plain connection."
 msgstr ""
 "暗号化されない接続で平文でパスワードを送る前に、警告のダイアログを表示しま"
 "す。"
 
-#: gajim/common/config.py:334
-msgid "Space separated list of ssl errors to ignore."
-msgstr "無視すべき SSL のエラーの一覧 (空白で区切る)。"
+#: gajim/common/config.py:335
+msgid "List of SSL errors to ignore (space separated)."
+msgstr ""
 
-#: gajim/common/config.py:340
+#: gajim/common/config.py:341
+#, fuzzy
 msgid ""
-"Space separated list of JIDs for which you do not want to store logs. You "
-"can also add account name to log nothing for this account."
+"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 ""
 "記録を保存しない JID の一覧 (空白で区切る)。アカウント名も追加でき、そのアカ"
 "ウントについて記録を残しません。"
 
-#: gajim/common/config.py:341
+#: gajim/common/config.py:342
+#, fuzzy
 msgid ""
-"Space separated list of JIDs for which you accept to not log conversations "
-"if he does not want to."
+"List of XMPP Addresses (space separated) for which you accept to not store "
+"chat history if your contact does not want to."
 msgstr ""
 "相手が記録しないことを望む場合、記録しない会話を受け入れる JID の一覧 (空白で"
 "区切る)。"
 
-#: gajim/common/config.py:343
-msgid "Whitespace sent after inactivity"
+#: gajim/common/config.py:344
+#, fuzzy
+msgid "If enabled, a whitespace is sent after inactivity (keep alive)."
 msgstr "活動停止状態の後に送られる空白"
 
-#: gajim/common/config.py:344
-msgid "XMPP ping sent after inactivity"
+#: gajim/common/config.py:345
+#, fuzzy
+msgid "If enabled, an XMPP ping is sent after inactivity (ping alive)."
 msgstr "活動停止状態の後に XMPP ping を送ります"
 
-#: gajim/common/config.py:348
+#: gajim/common/config.py:349
+#, fuzzy
 msgid ""
-"How many seconds to wait for the answer of ping alive packet before trying "
-"to reconnect?"
+"How many seconds to wait for the answer of a ping alive packet before trying "
+"to reconnect."
 msgstr "生存パケットを送ってから再接続を試みるまで待機する時間 (単位は秒)。"
 
-#: gajim/common/config.py:352
-msgid "Jabberd2 workaround"
+#: gajim/common/config.py:353
+#, fuzzy
+msgid "Jabberd2 workaround."
 msgstr "Jabberd2 対策"
 
-#: gajim/common/config.py:355
+#: gajim/common/config.py:356
+#, fuzzy
 msgid ""
-"If checked, Gajim will use your IP and proxies defined in "
-"file_transfer_proxies option for file transfer."
+"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/common/config.py:356
+#: gajim/common/config.py:357
+#, fuzzy
 msgid ""
-"If true, Gajim will test file transfer proxies on startup to be sure it "
-"works. Openfire's proxies are known to fail this test even if they work."
+"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/common/config.py:369
-msgid "Answer to receipt requests"
-msgstr "受領確認に応じます"
-
 #: gajim/common/config.py:370
-msgid "Sent receipt requests"
-msgstr "受領確認を求めます"
+#, fuzzy
+msgid "If enabled, Gajim will answer to message receipt requests."
+msgstr ""
+"チェックをつけると、Gajim は、送ったメッセージが相手先に受信されたとき、アイ"
+"コンを表示します。"
 
-#: gajim/common/config.py:379
+#: gajim/common/config.py:371
+msgid "If enabled, Gajim will send message receipt requests."
+msgstr ""
+
+#: gajim/common/config.py:380
 msgid ""
 "Allow Gajim to send information about the operating system you are running."
 msgstr "Gajim が使用中の OS を通知することを許可します。"
 
-#: gajim/common/config.py:380
+#: gajim/common/config.py:381
 msgid "Allow Gajim to send your local time."
 msgstr "Gajim があなたの現地時間を通知することを許可します。"
 
-#: gajim/common/config.py:383
-msgid "Message that is sent to contacts you want to add"
+#: gajim/common/config.py:384
+#, fuzzy
+msgid "Message that is sent to contacts you want to add."
 msgstr "追加する相手先に送られるメッセージ"
 
-#: gajim/common/config.py:384
+#: gajim/common/config.py:385
+#, fuzzy
 msgid ""
-"If enabled, Gajim will send your local IPs so your contact can connect to "
-"your machine to transfer files."
+"If enabled, Gajim will send your local IP so your contact can connect to "
+"your machine for file transfers."
 msgstr ""
 "真にすると、Gajim は相手先がファイル転送を行うためにあなたのローカル IP アド"
 "レスを送信します。"
 
-#: gajim/common/config.py:385
+#: gajim/common/config.py:386
+#, fuzzy
 msgid ""
-"Space separated list of JIDs for which chat window will be re-opened on next "
-"startup."
+"List of XMPP Addresses (space separated) for which the chat window will be "
+"re-opened on next startup."
 msgstr "次回の起動時にチャットウィンドウを開く JID の一覧 (空白で区切る)。"
 
-#: gajim/common/config.py:387
-msgid "HTTP Upload: Enable HTTPS Verification"
+#: gajim/common/config.py:388
+#, fuzzy
+msgid "HTTP File Upload: Enable HTTPS Verification."
 msgstr "HTTP アップロード: HTTPS 検証を有効化"
 
-#: gajim/common/config.py:388
+#: gajim/common/config.py:389
+#, fuzzy
 msgid ""
-"Preferred file transfer mechanism for file drag&drop on chat window. Can be "
-"'httpupload' (default) or 'jingle'"
+"Preferred file transfer mechanism for file drag&drop on a chat window. Can "
+"be 'httpupload' (default) or 'jingle'."
 msgstr ""
 "チャットウィンドウへのファイルのドラッグアンドドロップで用いられる転送方"
 "法。'httpupload' (デフォルト)または 'jingle'"
 
-#: gajim/common/config.py:389
-msgid "Allow cert verification with POSH"
+#: gajim/common/config.py:390
+#, fuzzy
+msgid "Allow certificate verification with POSH."
 msgstr "POSH での証明書の検証を許可"
 
-#: gajim/common/config.py:423 gajim/common/config.py:430
-msgid "Language for which misspelled words will be checked"
-msgstr "スペル間違いを調べる言語"
-
-#: gajim/common/config.py:427
-msgid "The currently active encryption for that contact"
-msgstr "現在その相手先に適用する暗号化方式"
-
-#: gajim/common/config.py:431
+#: gajim/common/config.py:425
+#, fuzzy
 msgid ""
-"How many lines to request from server when entering a groupchat. -1 means no "
-"limit, -2 means global value"
+"Chat state notifications that are sent to contacts. Possible values: 'all', "
+"'composing_only', 'disabled'"
 msgstr ""
-"グループチャットに参加するとき、サーバーに要求する行数。-1 は制限なし、-2 は"
-"大域値"
+"チャット状態通知の送信。all (すべての状態)、composing_only (入力中のみ)、"
+"disabled (通知しない) のいずれか。"
+
+#: gajim/common/config.py:428
+#, fuzzy
+msgid "The currently active encryption for that contact."
+msgstr "現在その相手先に適用する暗号化方式"
 
 #: gajim/common/config.py:432
+#, fuzzy
 msgid ""
-"Minutes of backlog to request when entering a groupchat. -1 means no limit, "
-"-2 means global value"
-msgstr ""
-"グループチャットに参加するとき、記録を遡る時間 (単位は分)。-1 は制限なし、-2 "
-"は大域値"
-
-#: gajim/common/config.py:433
-msgid "State whether a notification is created for every message in this room"
+"If enabled, a notification is created for every message in this group chat."
 msgstr "この談話室でのすべてのメッセージについて通知が必要かどうか"
 
-#: gajim/common/config.py:434
+#: gajim/common/config.py:433
+#, fuzzy
 msgid ""
-"Show a status message for all status (away, dnd, etc.) changes of users in a "
-"group chat"
-msgstr ""
+"Show a status message for all status changes (away, dnd, etc.) of users in a "
+"group chat."
+msgstr "グループに参加できません"
 
-#: gajim/common/config.py:435
+#: gajim/common/config.py:434
 #, fuzzy
-msgid "Show a status message for every join or leave in a group chat"
+msgid "Show a status message for every join or leave in a group chat."
 msgstr "グループに参加できません"
 
+#: gajim/common/config.py:435
+msgid ""
+"If enabled, the group chat is minimized into the contact list when joining "
+"automatically."
+msgstr ""
+
 #: gajim/common/config.py:436
-msgid "If the group chat is minimized into the roster on autojoin"
+msgid ""
+"If enabled, the group chat is minimized into the contact list when closing "
+"it."
 msgstr ""
 
 #: gajim/common/config.py:437
-msgid "If the group chat is minimized into the roster on close"
+#, fuzzy
+msgid ""
+"Chat state notifications that are sent to the group chat. Possible values: "
+"'all', 'composing_only' or 'disabled'."
 msgstr ""
+"チャット状態通知の送信。all (すべての状態)、composing_only (入力中のみ)、"
+"disabled (通知しない) のいずれか。"
 
-#: gajim/common/config.py:441
+#: gajim/common/config.py:440
+#, fuzzy
 msgid ""
-"State whether plugins should be activated on startup (this is saved on Gajim "
-"exit). This option SHOULD NOT be used to (de)activate plug-ins. Use GUI "
-"instead."
+"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/common/config.py:446 gajim/common/const.py:281
+#: gajim/common/config.py:445 gajim/common/const.py:315
 msgid "Sleeping"
 msgstr "睡眠中"
 
-#: gajim/common/config.py:447
+#: gajim/common/config.py:446
 msgid "Back soon"
 msgstr "すぐに戻ります"
 
-#: gajim/common/config.py:447
+#: gajim/common/config.py:446
 msgid "Back in some minutes."
 msgstr "数分後に戻ります。"
 
-#: gajim/common/config.py:448 gajim/common/const.py:247
+#: gajim/common/config.py:447 gajim/common/const.py:281
 msgid "Eating"
 msgstr "食事"
 
-#: gajim/common/config.py:448
-msgid "I'm eating, so leave me a message."
-msgstr "食事のため、しばらく離れます。"
+#: gajim/common/config.py:447
+#, fuzzy
+msgid "I'm eating."
+msgstr "仕事中です。"
 
-#: gajim/common/config.py:449
+#: gajim/common/config.py:448
 msgid "Movie"
 msgstr "映画"
 
-#: gajim/common/config.py:449
+#: gajim/common/config.py:448
 msgid "I'm watching a movie."
 msgstr "ただいま映画鑑賞中です。"
 
-#: gajim/common/config.py:450 gajim/common/const.py:314
+#: gajim/common/config.py:449 gajim/common/const.py:348
 msgid "Working"
 msgstr "仕事中"
 
-#: gajim/common/config.py:450
+#: gajim/common/config.py:449
 msgid "I'm working."
 msgstr "仕事中です。"
 
-#: gajim/common/config.py:451
+#: gajim/common/config.py:450
 msgid "Phone"
 msgstr "電話中"
 
-#: gajim/common/config.py:451
+#: gajim/common/config.py:450
 msgid "I'm on the phone."
 msgstr "電話中です。"
 
-#: gajim/common/config.py:452
+#: gajim/common/config.py:451
 msgid "Out"
 msgstr "外出中"
 
-#: gajim/common/config.py:452
+#: gajim/common/config.py:451
 msgid "I'm out enjoying life."
 msgstr "出かけています。"
 
-#: gajim/common/config.py:463
+#: gajim/common/config.py:462
 msgid "I'm available."
 msgstr "在席しています。"
 
-#: gajim/common/config.py:464
+#: gajim/common/config.py:463
 msgid "I'm free for chat."
 msgstr "チャットできます。"
 
-#: gajim/common/config.py:465 gajim/gtk/accounts.py:134
+#: gajim/common/config.py:464 gajim/gtk/accounts.py:133
 msgid "Be right back."
 msgstr "すぐ戻ります。"
 
-#: gajim/common/config.py:466
+#: gajim/common/config.py:465
 msgid "I'm not available."
 msgstr "不在です。"
 
-#: gajim/common/config.py:467
+#: gajim/common/config.py:466
 msgid "Do not disturb."
 msgstr "邪魔しないでください。"
 
-#: gajim/common/config.py:468 gajim/common/config.py:469
+#: gajim/common/config.py:467 gajim/common/config.py:468
 msgid "Bye!"
 msgstr "バイバイ !"
 
-#: gajim/common/config.py:480
+#: gajim/common/config.py:479
+#, fuzzy
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
-"muc_highlight_words, or when a group chat message contains your nickname."
+"'muc_highlight_words' your nickname is mentioned."
 msgstr ""
 "グループチャットのメッセージに、muc_highlight_words で設定した語、またはあな"
 "たのニックネームが含まれる場合にサウンドを鳴らします。"
 
-#: gajim/common/config.py:481
-msgid "Sound to play when any MUC message arrives."
+#: gajim/common/config.py:480
+#, fuzzy
+msgid "Sound to play when any group chat message arrives."
 msgstr "グループチャットのメッセージがあった際にサウンドを鳴らします。"
 
 # 固有名詞(プロキシ・サーバー The Onion Router)
-#: gajim/common/config.py:485
+#: gajim/common/config.py:484
 msgid "Tor"
 msgstr "Tor"
 
@@ -4004,11 +4137,106 @@ msgstr "Tor"
 msgid "Error: cannot open %s for reading"
 msgstr "エラー: 読み込みモードで %s を開けません"
 
-#: gajim/common/const.py:214
+#: gajim/common/const.py:216
+#, fuzzy
+msgid "?Group chat name:Team"
+msgstr "なし"
+
+#: gajim/common/const.py:217
+msgid "?Group chat description:Project discussion"
+msgstr ""
+
+#: gajim/common/const.py:218
+#, fuzzy
+msgid "?Group chat address:team"
+msgstr "グループチャットに対応"
+
+#: gajim/common/const.py:219
+#, fuzzy
+msgid "?Group chat name:Family"
+msgstr "グループチャットのメッセージの強調:"
+
+#: gajim/common/const.py:220
+msgid "?Group chat description:Spring gathering"
+msgstr ""
+
+#: gajim/common/const.py:221
+msgid "?Group chat address:family"
+msgstr ""
+
+#: gajim/common/const.py:222
+#, fuzzy
+msgid "?Group chat name:Vacation"
+msgstr "グループチャットへの招待"
+
+#: gajim/common/const.py:223
+msgid "?Group chat description:Trip planning"
+msgstr ""
+
+#: gajim/common/const.py:224
+#, fuzzy
+msgid "?Group chat address:vacation"
+msgstr "グループチャットへの招待"
+
+#: gajim/common/const.py:225
+#, fuzzy
+msgid "?Group chat name:Repairs"
+msgstr "グループチャットのブックマーク"
+
+#: gajim/common/const.py:226
+msgid "?Group chat description:Local help group"
+msgstr ""
+
+#: gajim/common/const.py:227
+#, fuzzy
+msgid "?Group chat address:repairs"
+msgstr "グループチャットに対応"
+
+#: gajim/common/const.py:228
+#, fuzzy
+msgid "?Group chat name:News"
+msgstr "なし"
+
+#: gajim/common/const.py:229
+#, fuzzy
+msgid "?Group chat description:Local news and reports"
+msgstr "グループチャットの作成は制限されています。"
+
+#: gajim/common/const.py:230
+#, fuzzy
+msgid "?Group chat address:news"
+msgstr "新しいグループチャット"
+
+#: gajim/common/const.py:235
+#, fuzzy
+msgid "Remote server not found"
+msgstr "サービスが見つかりませんでした"
+
+#: gajim/common/const.py:236
+msgid "Remote server timeout"
+msgstr ""
+
+#: gajim/common/const.py:237 gajim/common/const.py:238
+#: gajim/common/const.py:239
+#, fuzzy
+msgid "Address does not belong to a group chat server"
+msgstr "%s はグループチャットのサーバーではありません"
+
+#: gajim/common/const.py:240
+#, fuzzy
+msgid "Group chat already exists"
+msgstr "アカウント Local は既に存在しています。"
+
+#: gajim/common/const.py:241
+#, fuzzy
+msgid "Group chat does not exist"
+msgstr "グループチャット <b>%s</b> は存在しません。"
+
+#: gajim/common/const.py:247
 msgid "This message was encrypted with OTR and could not be decrypted."
 msgstr "このメッセージは OTR で暗号化されており、復号することができません。"
 
-#: gajim/common/const.py:217
+#: gajim/common/const.py:250
 msgid ""
 "This message was encrypted with Legacy OpenPGP and could not be decrypted. "
 "You can install the PGP plugin to handle those messages."
@@ -4016,864 +4244,866 @@ msgstr ""
 "このメッセージは伝統的な OpenPGP で暗号化されており、復号することができませ"
 "ん。このようなメッセージを扱うには PGP プラグインをインストールしてください。"
 
-#: gajim/common/const.py:221
+#: gajim/common/const.py:254
+#, fuzzy
 msgid ""
-"This message was encrypted with OpenPGP for XMPP and could not be decrypted."
+"This message was encrypted with OpenPGP for XMPP and could not be decrypted. "
+"You can install the OpenPGP plugin to handle those messages."
 msgstr ""
-"このメッセージは OpenPGP for XMPP で暗号化されており、復号することができませ"
-"ん。"
+"このメッセージは伝統的な OpenPGP で暗号化されており、復号することができませ"
+"ん。このようなメッセージを扱うには PGP プラグインをインストールしてください。"
 
-#: gajim/common/const.py:224
+#: gajim/common/const.py:258
 #, python-format
 msgid "This message was encrypted with %s and could not be decrypted."
 msgstr "このメッセージは %s で暗号化されており、復号することができません。"
 
-#: gajim/common/const.py:231
+#: gajim/common/const.py:265
 msgid "Doing Chores"
 msgstr "家事"
 
-#: gajim/common/const.py:232
+#: gajim/common/const.py:266
 msgid "Buying Groceries"
 msgstr "買い物"
 
-#: gajim/common/const.py:233
+#: gajim/common/const.py:267
 msgid "Cleaning"
 msgstr "掃除"
 
-#: gajim/common/const.py:234
+#: gajim/common/const.py:268
 msgid "Cooking"
 msgstr "料理"
 
-#: gajim/common/const.py:235
+#: gajim/common/const.py:269
 msgid "Doing Maintenance"
 msgstr "修繕"
 
-#: gajim/common/const.py:236
+#: gajim/common/const.py:270
 msgid "Doing the Dishes"
 msgstr "皿洗い"
 
-#: gajim/common/const.py:237
+#: gajim/common/const.py:271
 msgid "Doing the Laundry"
 msgstr "洗濯"
 
-#: gajim/common/const.py:238
+#: gajim/common/const.py:272
 msgid "Gardening"
 msgstr "庭仕事"
 
-#: gajim/common/const.py:239
+#: gajim/common/const.py:273
 msgid "Running an Errand"
 msgstr "お使い"
 
-#: gajim/common/const.py:240
+#: gajim/common/const.py:274
 msgid "Walking the Dog"
 msgstr "犬の散歩"
 
-#: gajim/common/const.py:242
+#: gajim/common/const.py:276
 msgid "Drinking"
 msgstr "飲み"
 
-#: gajim/common/const.py:243
+#: gajim/common/const.py:277
 msgid "Having a Beer"
 msgstr "ビール"
 
-#: gajim/common/const.py:244
+#: gajim/common/const.py:278
 msgid "Having Coffee"
 msgstr "コーヒー"
 
-#: gajim/common/const.py:245
+#: gajim/common/const.py:279
 msgid "Having Tea"
 msgstr "茶"
 
-#: gajim/common/const.py:248
+#: gajim/common/const.py:282
 msgid "Having a Snack"
 msgstr "スナック菓子"
 
-#: gajim/common/const.py:249
+#: gajim/common/const.py:283
 msgid "Having Breakfast"
 msgstr "朝食"
 
-#: gajim/common/const.py:250
+#: gajim/common/const.py:284
 msgid "Having Dinner"
 msgstr "夕食"
 
-#: gajim/common/const.py:251
+#: gajim/common/const.py:285
 msgid "Having Lunch"
 msgstr "昼食"
 
-#: gajim/common/const.py:253
+#: gajim/common/const.py:287
 msgid "Exercising"
 msgstr "運動"
 
-#: gajim/common/const.py:254 gajim/common/const.py:305
+#: gajim/common/const.py:288 gajim/common/const.py:339
 msgid "Cycling"
 msgstr "自転車"
 
-#: gajim/common/const.py:255
+#: gajim/common/const.py:289
 msgid "Dancing"
 msgstr "ダンス"
 
-#: gajim/common/const.py:256
+#: gajim/common/const.py:290
 msgid "Hiking"
 msgstr "ハイキング"
 
-#: gajim/common/const.py:257
+#: gajim/common/const.py:291
 msgid "Jogging"
 msgstr "ジョギング"
 
-#: gajim/common/const.py:258
+#: gajim/common/const.py:292
 msgid "Playing Sports"
 msgstr "スポーツ"
 
-#: gajim/common/const.py:259
+#: gajim/common/const.py:293
 msgid "Running"
 msgstr "ランニング"
 
-#: gajim/common/const.py:260
+#: gajim/common/const.py:294
 msgid "Skiing"
 msgstr "スキー"
 
-#: gajim/common/const.py:261
+#: gajim/common/const.py:295
 msgid "Swimming"
 msgstr "水泳"
 
-#: gajim/common/const.py:262
+#: gajim/common/const.py:296
 msgid "Working out"
 msgstr "練習"
 
-#: gajim/common/const.py:264
+#: gajim/common/const.py:298
 msgid "Grooming"
 msgstr "身づくろい"
 
-#: gajim/common/const.py:265
+#: gajim/common/const.py:299
 msgid "At the Spa"
 msgstr "温泉"
 
-#: gajim/common/const.py:266
+#: gajim/common/const.py:300
 msgid "Brushing Teeth"
 msgstr "歯磨き"
 
-#: gajim/common/const.py:267
+#: gajim/common/const.py:301
 msgid "Getting a Haircut"
 msgstr "整髪"
 
-#: gajim/common/const.py:268
+#: gajim/common/const.py:302
 msgid "Shaving"
 msgstr "髭剃り"
 
-#: gajim/common/const.py:269
+#: gajim/common/const.py:303
 msgid "Taking a Bath"
 msgstr "風呂"
 
-#: gajim/common/const.py:270
+#: gajim/common/const.py:304
 msgid "Taking a Shower"
 msgstr "シャワー"
 
-#: gajim/common/const.py:272
+#: gajim/common/const.py:306
 msgid "Having an Appointment"
 msgstr "約束あり"
 
-#: gajim/common/const.py:274
+#: gajim/common/const.py:308
 msgid "Inactive"
 msgstr "停止中"
 
-#: gajim/common/const.py:275
+#: gajim/common/const.py:309
 msgid "Day Off"
 msgstr "休み"
 
-#: gajim/common/const.py:276
+#: gajim/common/const.py:310
 msgid "Hanging out"
 msgstr "遠出"
 
-#: gajim/common/const.py:277
+#: gajim/common/const.py:311
 msgid "Hiding"
 msgstr "隠密"
 
-#: gajim/common/const.py:278
+#: gajim/common/const.py:312
 msgid "On Vacation"
 msgstr "長期休暇"
 
-#: gajim/common/const.py:279
+#: gajim/common/const.py:313
 msgid "Praying"
 msgstr "祈り"
 
-#: gajim/common/const.py:280
+#: gajim/common/const.py:314
 msgid "Scheduled Holiday"
 msgstr "予定していた休暇"
 
-#: gajim/common/const.py:282
+#: gajim/common/const.py:316
 msgid "Thinking"
 msgstr "思索"
 
-#: gajim/common/const.py:284
+#: gajim/common/const.py:318
 msgid "Relaxing"
 msgstr "趣味"
 
-#: gajim/common/const.py:285
+#: gajim/common/const.py:319
 msgid "Fishing"
 msgstr "釣り"
 
-#: gajim/common/const.py:286
+#: gajim/common/const.py:320
 msgid "Gaming"
 msgstr "ゲーム"
 
-#: gajim/common/const.py:287
+#: gajim/common/const.py:321
 msgid "Going out"
 msgstr "外出"
 
-#: gajim/common/const.py:288
+#: gajim/common/const.py:322
 msgid "Partying"
 msgstr "パーティ"
 
-#: gajim/common/const.py:289
+#: gajim/common/const.py:323
 msgid "Reading"
 msgstr "読書"
 
-#: gajim/common/const.py:290
+#: gajim/common/const.py:324
 msgid "Rehearsing"
 msgstr "リハーサル"
 
-#: gajim/common/const.py:291
+#: gajim/common/const.py:325
 msgid "Shopping"
 msgstr "買い物"
 
-#: gajim/common/const.py:292
+#: gajim/common/const.py:326
 msgid "Smoking"
 msgstr "喫煙"
 
-#: gajim/common/const.py:293
+#: gajim/common/const.py:327
 msgid "Socializing"
 msgstr "交流"
 
-#: gajim/common/const.py:294
+#: gajim/common/const.py:328
 msgid "Sunbathing"
 msgstr "日向ぼっこ"
 
-#: gajim/common/const.py:295
+#: gajim/common/const.py:329
 msgid "Watching TV"
 msgstr "テレビ"
 
-#: gajim/common/const.py:296
+#: gajim/common/const.py:330
 msgid "Watching a Movie"
 msgstr "映画"
 
-#: gajim/common/const.py:298
+#: gajim/common/const.py:332
 msgid "Talking"
 msgstr "話し中"
 
-#: gajim/common/const.py:299
+#: gajim/common/const.py:333
 msgid "In Real Life"
 msgstr "直接会って"
 
-#: gajim/common/const.py:300
+#: gajim/common/const.py:334
 msgid "On the Phone"
 msgstr "電話で"
 
-#: gajim/common/const.py:301
+#: gajim/common/const.py:335
 msgid "On Video Phone"
 msgstr "ビデオ電話で"
 
-#: gajim/common/const.py:303
+#: gajim/common/const.py:337
 msgid "Traveling"
 msgstr "旅行"
 
-#: gajim/common/const.py:304
+#: gajim/common/const.py:338
 msgid "Commuting"
 msgstr "通勤中"
 
-#: gajim/common/const.py:306
+#: gajim/common/const.py:340
 msgid "Driving"
 msgstr "運転中"
 
-#: gajim/common/const.py:307
+#: gajim/common/const.py:341
 msgid "In a Car"
 msgstr "車の中"
 
-#: gajim/common/const.py:308
+#: gajim/common/const.py:342
 msgid "On a Bus"
 msgstr "バスで"
 
-#: gajim/common/const.py:309
+#: gajim/common/const.py:343
 msgid "On a Plane"
 msgstr "飛行機で"
 
-#: gajim/common/const.py:310
+#: gajim/common/const.py:344
 msgid "On a Train"
 msgstr "列車で"
 
-#: gajim/common/const.py:311
+#: gajim/common/const.py:345
 msgid "On a Trip"
 msgstr "旅行中"
 
-#: gajim/common/const.py:312
+#: gajim/common/const.py:346
 msgid "Walking"
 msgstr "徒歩で"
 
-#: gajim/common/const.py:315
+#: gajim/common/const.py:349
 msgid "Coding"
 msgstr "コーディング中"
 
-#: gajim/common/const.py:316
+#: gajim/common/const.py:350
 msgid "In a Meeting"
 msgstr "会議中"
 
-#: gajim/common/const.py:317
+#: gajim/common/const.py:351
 msgid "Studying"
 msgstr "勉強中"
 
-#: gajim/common/const.py:318
+#: gajim/common/const.py:352
 msgid "Writing"
 msgstr "執筆中"
 
-#: gajim/common/const.py:321
+#: gajim/common/const.py:355
 msgid "Afraid"
 msgstr "恐"
 
-#: gajim/common/const.py:322
+#: gajim/common/const.py:356
 msgid "Amazed"
 msgstr "驚"
 
-#: gajim/common/const.py:323
+#: gajim/common/const.py:357
 msgid "Amorous"
 msgstr "慕"
 
-#: gajim/common/const.py:324
+#: gajim/common/const.py:358
 msgid "Angry"
 msgstr "立腹"
 
-#: gajim/common/const.py:325
+#: gajim/common/const.py:359
 msgid "Annoyed"
 msgstr "煩"
 
-#: gajim/common/const.py:326
+#: gajim/common/const.py:360
 msgid "Anxious"
 msgstr "心配"
 
-#: gajim/common/const.py:327
+#: gajim/common/const.py:361
 msgid "Aroused"
 msgstr "奮"
 
-#: gajim/common/const.py:328
+#: gajim/common/const.py:362
 msgid "Ashamed"
 msgstr "恥"
 
-#: gajim/common/const.py:329
+#: gajim/common/const.py:363
 msgid "Bored"
 msgstr "うんざり"
 
-#: gajim/common/const.py:330
+#: gajim/common/const.py:364
 msgid "Brave"
 msgstr "勇"
 
-#: gajim/common/const.py:331
+#: gajim/common/const.py:365
 msgid "Calm"
 msgstr "閑"
 
-#: gajim/common/const.py:332
+#: gajim/common/const.py:366
 msgid "Cautious"
 msgstr "疑"
 
-#: gajim/common/const.py:333
+#: gajim/common/const.py:367
 msgid "Cold"
 msgstr "寒"
 
-#: gajim/common/const.py:334
+#: gajim/common/const.py:368
 msgid "Confident"
 msgstr "信"
 
-#: gajim/common/const.py:335
+#: gajim/common/const.py:369
 msgid "Confused"
 msgstr "混乱"
 
-#: gajim/common/const.py:336
+#: gajim/common/const.py:370
 msgid "Contemplative"
 msgstr "黙"
 
-#: gajim/common/const.py:337
+#: gajim/common/const.py:371
 msgid "Contented"
 msgstr "大満足"
 
-#: gajim/common/const.py:338
+#: gajim/common/const.py:372
 msgid "Cranky"
 msgstr "偏屈"
 
-#: gajim/common/const.py:339
+#: gajim/common/const.py:373
 msgid "Crazy"
 msgstr "狂"
 
-#: gajim/common/const.py:340
+#: gajim/common/const.py:374
 msgid "Creative"
 msgstr "創造的"
 
-#: gajim/common/const.py:341
+#: gajim/common/const.py:375
 msgid "Curious"
 msgstr "好奇"
 
-#: gajim/common/const.py:342
+#: gajim/common/const.py:376
 msgid "Dejected"
 msgstr "落胆"
 
-#: gajim/common/const.py:343
+#: gajim/common/const.py:377
 msgid "Depressed"
 msgstr "消沈"
 
-#: gajim/common/const.py:344
+#: gajim/common/const.py:378
 msgid "Disappointed"
 msgstr "失望"
 
-#: gajim/common/const.py:345
+#: gajim/common/const.py:379
 msgid "Disgusted"
 msgstr "嫌気"
 
-#: gajim/common/const.py:346
+#: gajim/common/const.py:380
 msgid "Dismayed"
 msgstr "狼狽"
 
-#: gajim/common/const.py:347
+#: gajim/common/const.py:381
 msgid "Distracted"
 msgstr "取り乱し"
 
-#: gajim/common/const.py:348
+#: gajim/common/const.py:382
 msgid "Embarrassed"
 msgstr "当惑"
 
-#: gajim/common/const.py:349
+#: gajim/common/const.py:383
 msgid "Envious"
 msgstr "妬み"
 
-#: gajim/common/const.py:350
+#: gajim/common/const.py:384
 msgid "Excited"
 msgstr "興奮"
 
-#: gajim/common/const.py:351
+#: gajim/common/const.py:385
 msgid "Flirtatious"
 msgstr "浮わつき"
 
-#: gajim/common/const.py:352
+#: gajim/common/const.py:386
 msgid "Frustrated"
 msgstr "挫折"
 
-#: gajim/common/const.py:353
+#: gajim/common/const.py:387
 msgid "Grateful"
 msgstr "(人に)感謝"
 
-#: gajim/common/const.py:354
+#: gajim/common/const.py:388
 msgid "Grieving"
 msgstr "悲嘆"
 
-#: gajim/common/const.py:355
+#: gajim/common/const.py:389
 msgid "Grumpy"
 msgstr "不機嫌"
 
-#: gajim/common/const.py:356
+#: gajim/common/const.py:390
 msgid "Guilty"
 msgstr "罪"
 
-#: gajim/common/const.py:357
+#: gajim/common/const.py:391
 msgid "Happy"
 msgstr "幸"
 
-#: gajim/common/const.py:358
+#: gajim/common/const.py:392
 msgid "Hopeful"
 msgstr "希望"
 
-#: gajim/common/const.py:359
+#: gajim/common/const.py:393
 msgid "Hot"
 msgstr "暑"
 
-#: gajim/common/const.py:360
+#: gajim/common/const.py:394
 msgid "Humbled"
 msgstr "控え目"
 
-#: gajim/common/const.py:361
+#: gajim/common/const.py:395
 msgid "Humiliated"
 msgstr "傷心"
 
-#: gajim/common/const.py:362
+#: gajim/common/const.py:396
 msgid "Hungry"
 msgstr "空腹"
 
-#: gajim/common/const.py:363
+#: gajim/common/const.py:397
 msgid "Hurt"
 msgstr "傷つき"
 
-#: gajim/common/const.py:364
+#: gajim/common/const.py:398
 msgid "Impressed"
 msgstr "感銘"
 
-#: gajim/common/const.py:365
+#: gajim/common/const.py:399
 msgid "In Awe"
 msgstr "畏敬"
 
-#: gajim/common/const.py:366
+#: gajim/common/const.py:400
 msgid "In Love"
 msgstr "恋愛"
 
-#: gajim/common/const.py:367
+#: gajim/common/const.py:401
 msgid "Indignant"
 msgstr "義憤"
 
-#: gajim/common/const.py:368
+#: gajim/common/const.py:402
 msgid "Interested"
 msgstr "興味"
 
-#: gajim/common/const.py:369
+#: gajim/common/const.py:403
 msgid "Intoxicated"
 msgstr "酔"
 
-#: gajim/common/const.py:370
+#: gajim/common/const.py:404
 msgid "Invincible"
 msgstr "無敵"
 
-#: gajim/common/const.py:371
+#: gajim/common/const.py:405
 msgid "Jealous"
 msgstr "やきもち"
 
-#: gajim/common/const.py:372
+#: gajim/common/const.py:406
 msgid "Lonely"
 msgstr "孤独"
 
-#: gajim/common/const.py:373
+#: gajim/common/const.py:407
 msgid "Lost"
 msgstr "失"
 
-#: gajim/common/const.py:374
+#: gajim/common/const.py:408
 msgid "Lucky"
 msgstr "幸運"
 
-#: gajim/common/const.py:375
+#: gajim/common/const.py:409
 msgid "Mean"
 msgstr "卑劣"
 
-#: gajim/common/const.py:376
+#: gajim/common/const.py:410
 msgid "Moody"
 msgstr "きまぐれ"
 
-#: gajim/common/const.py:377
+#: gajim/common/const.py:411
 msgid "Nervous"
 msgstr "神経質"
 
-#: gajim/common/const.py:378
+#: gajim/common/const.py:412
 msgid "Neutral"
 msgstr "中間"
 
-#: gajim/common/const.py:379
+#: gajim/common/const.py:413
 msgid "Offended"
 msgstr "憤怒"
 
-#: gajim/common/const.py:380
+#: gajim/common/const.py:414
 msgid "Outraged"
 msgstr "非道"
 
-#: gajim/common/const.py:381
+#: gajim/common/const.py:415
 msgid "Playful"
 msgstr "陽気"
 
-#: gajim/common/const.py:382
+#: gajim/common/const.py:416
 msgid "Proud"
 msgstr "誇"
 
-#: gajim/common/const.py:383
+#: gajim/common/const.py:417
 msgid "Relaxed"
 msgstr "癒"
 
-#: gajim/common/const.py:384
+#: gajim/common/const.py:418
 msgid "Relieved"
 msgstr "解放"
 
-#: gajim/common/const.py:385
+#: gajim/common/const.py:419
 msgid "Remorseful"
 msgstr "後悔"
 
-#: gajim/common/const.py:386
+#: gajim/common/const.py:420
 msgid "Restless"
 msgstr "そわそわ"
 
-#: gajim/common/const.py:387
+#: gajim/common/const.py:421
 msgid "Sad"
 msgstr "悲"
 
-#: gajim/common/const.py:388
+#: gajim/common/const.py:422
 msgid "Sarcastic"
 msgstr "皮肉"
 
-#: gajim/common/const.py:389
+#: gajim/common/const.py:423
 msgid "Satisfied"
 msgstr "満足"
 
-#: gajim/common/const.py:390
+#: gajim/common/const.py:424
 msgid "Serious"
 msgstr "深刻"
 
-#: gajim/common/const.py:391
+#: gajim/common/const.py:425
 msgid "Shocked"
 msgstr "衝撃"
 
-#: gajim/common/const.py:392
+#: gajim/common/const.py:426
 msgid "Shy"
 msgstr "はにかみ"
 
-#: gajim/common/const.py:393
+#: gajim/common/const.py:427
 msgid "Sick"
 msgstr "病"
 
-#: gajim/common/const.py:394
+#: gajim/common/const.py:428
 msgid "Sleepy"
 msgstr "眠い"
 
-#: gajim/common/const.py:395
+#: gajim/common/const.py:429
 msgid "Spontaneous"
 msgstr "自発的"
 
-#: gajim/common/const.py:396
+#: gajim/common/const.py:430
 msgid "Stressed"
 msgstr "重圧"
 
-#: gajim/common/const.py:397
+#: gajim/common/const.py:431
 msgid "Strong"
 msgstr "強"
 
-#: gajim/common/const.py:398
+#: gajim/common/const.py:432
 msgid "Surprised"
 msgstr "驚"
 
-#: gajim/common/const.py:399
+#: gajim/common/const.py:433
 msgid "Thankful"
 msgstr "感謝"
 
-#: gajim/common/const.py:400
+#: gajim/common/const.py:434
 msgid "Thirsty"
 msgstr "渇"
 
-#: gajim/common/const.py:401
+#: gajim/common/const.py:435
 msgid "Tired"
 msgstr "疲"
 
-#: gajim/common/const.py:402
+#: gajim/common/const.py:436
 msgid "Undefined"
 msgstr "未定義"
 
-#: gajim/common/const.py:403
+#: gajim/common/const.py:437
 msgid "Weak"
 msgstr "弱"
 
-#: gajim/common/const.py:404
+#: gajim/common/const.py:438
 msgid "Worried"
 msgstr "迷惑"
 
-#: gajim/common/const.py:408
+#: gajim/common/const.py:442
 msgid "accuracy"
 msgstr "精度"
 
-#: gajim/common/const.py:409
+#: gajim/common/const.py:443
 msgid "alt"
 msgstr "高度"
 
-#: gajim/common/const.py:410
+#: gajim/common/const.py:444
 msgid "area"
 msgstr "地区"
 
-#: gajim/common/const.py:411
+#: gajim/common/const.py:445
 msgid "bearing"
 msgstr "方位"
 
-#: gajim/common/const.py:412
+#: gajim/common/const.py:446
 msgid "building"
 msgstr "建物"
 
-#: gajim/common/const.py:413
+#: gajim/common/const.py:447
 msgid "country"
 msgstr "国"
 
-#: gajim/common/const.py:414
+#: gajim/common/const.py:448
 msgid "countrycode"
 msgstr "国コード"
 
-#: gajim/common/const.py:415
+#: gajim/common/const.py:449
 msgid "datum"
 msgstr "データ"
 
-#: gajim/common/const.py:416
+#: gajim/common/const.py:450
 msgid "description"
 msgstr "説明"
 
-#: gajim/common/const.py:417
+#: gajim/common/const.py:451
 msgid "error"
 msgstr "誤差"
 
-#: gajim/common/const.py:418
+#: gajim/common/const.py:452
 msgid "floor"
 msgstr "階"
 
-#: gajim/common/const.py:419
+#: gajim/common/const.py:453
 msgid "lat"
 msgstr "緯度"
 
-#: gajim/common/const.py:420
+#: gajim/common/const.py:454
 msgid "locality"
 msgstr "市(区町村)"
 
-#: gajim/common/const.py:421
+#: gajim/common/const.py:455
 msgid "lon"
 msgstr "経度"
 
-#: gajim/common/const.py:422
+#: gajim/common/const.py:456
 msgid "postalcode"
 msgstr "郵便番号"
 
-#: gajim/common/const.py:423
+#: gajim/common/const.py:457
 msgid "region"
 msgstr "州(県)"
 
-#: gajim/common/const.py:424
+#: gajim/common/const.py:458
 msgid "room"
 msgstr "部屋"
 
-#: gajim/common/const.py:425
+#: gajim/common/const.py:459
 msgid "speed"
 msgstr "移動速度"
 
-#: gajim/common/const.py:426
+#: gajim/common/const.py:460
 msgid "street"
 msgstr "町丁名・番地"
 
-#: gajim/common/const.py:427
+#: gajim/common/const.py:461
 msgid "text"
 msgstr "その他の情報"
 
-#: gajim/common/const.py:428
+#: gajim/common/const.py:462
 msgid "timestamp"
 msgstr "日付・時刻"
 
-#: gajim/common/const.py:429
+#: gajim/common/const.py:463
 msgid "URI"
 msgstr "URI"
 
-#: gajim/common/const.py:434
+#: gajim/common/const.py:468
 msgid "Unable to get issuer certificate"
 msgstr "発行者の証明書を取得できません"
 
-#: gajim/common/const.py:435
+#: gajim/common/const.py:469
 msgid "Unable to get certificate CRL"
 msgstr "証明書失効リストを取得できません"
 
-#: gajim/common/const.py:436
+#: gajim/common/const.py:470
 msgid "Unable to decrypt certificate's signature"
 msgstr "証明書の署名を復号できません"
 
-#: gajim/common/const.py:437
+#: gajim/common/const.py:471
 msgid "Unable to decrypt CRL's signature"
 msgstr "証明書失効リストの署名を復号できません"
 
-#: gajim/common/const.py:438
+#: gajim/common/const.py:472
 msgid "Unable to decode issuer public key"
 msgstr "発行者の公開鍵を復元できません"
 
-#: gajim/common/const.py:439
+#: gajim/common/const.py:473
 msgid "Certificate signature failure"
 msgstr "証明書の署名の失敗"
 
-#: gajim/common/const.py:440
+#: gajim/common/const.py:474
 msgid "CRL signature failure"
 msgstr "証明書失効リストの署名の失敗"
 
-#: gajim/common/const.py:441
+#: gajim/common/const.py:475
 msgid "Certificate is not yet valid"
 msgstr "証明書は検証されていません"
 
-#: gajim/common/const.py:442
+#: gajim/common/const.py:476
 msgid "Certificate has expired"
 msgstr "証明書は期限切れです"
 
-#: gajim/common/const.py:443
+#: gajim/common/const.py:477
 msgid "CRL is not yet valid"
 msgstr "証明書失効リストは検証されていません"
 
-#: gajim/common/const.py:444
+#: gajim/common/const.py:478
 msgid "CRL has expired"
 msgstr "証明書失効リストは有効期限が切れています"
 
-#: gajim/common/const.py:445
+#: gajim/common/const.py:479
 msgid "Format error in certificate's notBefore field"
 msgstr "証明書の notBefore (有効期限の始め)の書式のエラー"
 
-#: gajim/common/const.py:446
+#: gajim/common/const.py:480
 msgid "Format error in certificate's notAfter field"
 msgstr "証明書の notAfter (有効期限の終わり)の書式のエラー"
 
-#: gajim/common/const.py:447
+#: gajim/common/const.py:481
 msgid "Format error in CRL's lastUpdate field"
 msgstr "証明書失効リストの最終更新の書式のエラー"
 
-#: gajim/common/const.py:448
+#: gajim/common/const.py:482
 msgid "Format error in CRL's nextUpdate field"
 msgstr "証明書失効リストの次回更新の書式のエラー"
 
-#: gajim/common/const.py:449
+#: gajim/common/const.py:483
 msgid "Out of memory"
 msgstr "メモリが足りません"
 
-#: gajim/common/const.py:450
+#: gajim/common/const.py:484
 msgid "Self signed certificate"
 msgstr "自己署名証明書"
 
-#: gajim/common/const.py:451
+#: gajim/common/const.py:485
 msgid "Self signed certificate in certificate chain"
 msgstr "認証パス中の自己署名証明書"
 
-#: gajim/common/const.py:452
+#: gajim/common/const.py:486
 msgid "Unable to get local issuer certificate"
 msgstr "ローカルの発行者の証明書を取得できません"
 
 # (Mako)The first は root のことか?
-#: gajim/common/const.py:453
+#: gajim/common/const.py:487
 msgid "Unable to verify the first certificate"
 msgstr "ルート証明書が検証できません"
 
-#: gajim/common/const.py:454
+#: gajim/common/const.py:488
 msgid "Certificate chain too long"
 msgstr "認証パスが長すぎます"
 
-#: gajim/common/const.py:455
+#: gajim/common/const.py:489
 msgid "Certificate revoked"
 msgstr "証明書は失効しています"
 
-#: gajim/common/const.py:456
+#: gajim/common/const.py:490
 msgid "Invalid CA certificate"
 msgstr "検証されない認証局証明書"
 
-#: gajim/common/const.py:457
+#: gajim/common/const.py:491
 msgid "Path length constraint exceeded"
 msgstr "パスの長さの制限を越えています"
 
-#: gajim/common/const.py:458
+#: gajim/common/const.py:492
 msgid "Unsupported certificate purpose"
 msgstr "証明書の目的はサポートされていません"
 
-#: gajim/common/const.py:459
+#: gajim/common/const.py:493
 msgid "Certificate not trusted"
 msgstr "証明書は信頼できません"
 
-#: gajim/common/const.py:460
+#: gajim/common/const.py:494
 msgid "Certificate rejected"
 msgstr "証明書は却下されました"
 
-#: gajim/common/const.py:461
+#: gajim/common/const.py:495
 msgid "Subject issuer mismatch"
 msgstr "サブジェクトの発行者が合致しません"
 
-#: gajim/common/const.py:462
+#: gajim/common/const.py:496
 msgid "Authority and subject key identifier mismatch"
 msgstr "機関とサブジェクトの鍵IDが合致しません"
 
-#: gajim/common/const.py:463
+#: gajim/common/const.py:497
 msgid "Authority and issuer serial number mismatch"
 msgstr "機関と発行者シリアル番号が合致しません"
 
-#: gajim/common/const.py:464
+#: gajim/common/const.py:498
 msgid "Key usage does not include certificate signing"
 msgstr "証明書署名に鍵の使い方が含まれていません"
 
-#: gajim/common/const.py:465
+#: gajim/common/const.py:499
 msgid "Application verification failure"
 msgstr "アプリケーションの検証に失敗しました"
 
@@ -5044,263 +5274,263 @@ msgstr "ビデオ入力"
 msgid "video output"
 msgstr "ビデオ出力"
 
-#: gajim/common/helpers.py:210
+#: gajim/common/helpers.py:216
 msgid "Server must be between 1 and 1023 bytes"
 msgstr "サーバー名は1文字以上1023文字以下にしてください"
 
-#: gajim/common/helpers.py:214
+#: gajim/common/helpers.py:220
 msgid "Invalid character in hostname."
 msgstr "ホスト名に不正な文字が含まれています。"
 
-#: gajim/common/helpers.py:216
+#: gajim/common/helpers.py:222
 msgid "Server address required."
 msgstr "サーバーのアドレスが必要です。"
 
-#: gajim/common/helpers.py:220
+#: gajim/common/helpers.py:226
 msgid "Username must be between 1 and 1023 bytes"
 msgstr "ユーザー名は1文字以上1023文字以下にしてください"
 
-#: gajim/common/helpers.py:224
+#: gajim/common/helpers.py:230
 msgid "Invalid character in username."
 msgstr "ユーザー名に不正な文字が含まれています。"
 
-#: gajim/common/helpers.py:230
+#: gajim/common/helpers.py:236
 msgid "Resource must be between 1 and 1023 bytes"
 msgstr "リソースは1文字以上1023文字以下にしてください"
 
-#: gajim/common/helpers.py:234
+#: gajim/common/helpers.py:240
 msgid "Invalid character in resource."
 msgstr "リソースに不正な文字が含まれています。"
 
-#: gajim/common/helpers.py:275
+#: gajim/common/helpers.py:281
 msgid "_Busy"
 msgstr "取り込み中 (_B)"
 
-#: gajim/common/helpers.py:277 gajim/gtk/tooltips.py:647
+#: gajim/common/helpers.py:283 gajim/gtk/tooltips.py:647
 msgid "Busy"
 msgstr "取り込み中"
 
-#: gajim/common/helpers.py:280
+#: gajim/common/helpers.py:286
 msgid "_Not Available"
 msgstr "不在 (_N)"
 
-#: gajim/common/helpers.py:282 gajim/gtk/tooltips.py:649
+#: gajim/common/helpers.py:288 gajim/gtk/tooltips.py:649
 msgid "Not Available"
 msgstr "不在"
 
-#: gajim/common/helpers.py:285
+#: gajim/common/helpers.py:291
 msgid "_Free for Chat"
 msgstr "チャット可 (_F)"
 
-#: gajim/common/helpers.py:287 gajim/gtk/tooltips.py:643
+#: gajim/common/helpers.py:293 gajim/gtk/tooltips.py:643
 msgid "Free for Chat"
 msgstr "チャット可"
 
-#: gajim/common/helpers.py:290
+#: gajim/common/helpers.py:296
 msgid "?user status:_Available"
 msgstr "在席 (_A)"
 
-#: gajim/common/helpers.py:292 gajim/gtk/tooltips.py:641
+#: gajim/common/helpers.py:298 gajim/gtk/tooltips.py:641
 msgid "?user status:Available"
 msgstr "在席"
 
-#: gajim/common/helpers.py:294
+#: gajim/common/helpers.py:300
 msgid "Connecting"
 msgstr "接続中です"
 
-#: gajim/common/helpers.py:297 gajim/data/gui/preferences_window.ui:1251
+#: gajim/common/helpers.py:303 gajim/data/gui/preferences_window.ui:1251
 msgid "A_way"
 msgstr "離席中 (_W)"
 
-#: gajim/common/helpers.py:299 gajim/common/modules/adhoc_commands.py:120
-#: gajim/command_system/implementation/standard.py:139
+#: gajim/common/helpers.py:305 gajim/common/modules/adhoc_commands.py:120
+#: gajim/command_system/implementation/standard.py:141
 #: gajim/gtk/tooltips.py:645
 msgid "Away"
 msgstr "離席中"
 
-#: gajim/common/helpers.py:302
+#: gajim/common/helpers.py:308
 msgid "_Offline"
 msgstr "オフライン (_O)"
 
-#: gajim/common/helpers.py:304 gajim/gtk/tooltips.py:651
+#: gajim/common/helpers.py:310 gajim/gtk/tooltips.py:651
 msgid "Offline"
 msgstr "オフライン"
 
-#: gajim/common/helpers.py:307
+#: gajim/common/helpers.py:313
 msgid "_Invisible"
 msgstr "居ないふり (_I)"
 
-#: gajim/common/helpers.py:313
+#: gajim/common/helpers.py:319
 msgid "?contact has status:Unknown"
 msgstr "不明"
 
-#: gajim/common/helpers.py:315
+#: gajim/common/helpers.py:321
 msgid "?contact has status:Has errors"
 msgstr "エラーが起こっています"
 
-#: gajim/common/helpers.py:330
+#: gajim/common/helpers.py:336
 msgid "?Subscription we already have:None"
 msgstr "なし"
 
 # (Mako)subscription
-#: gajim/common/helpers.py:332
+#: gajim/common/helpers.py:338
 msgid "To"
 msgstr "相手先が承認"
 
 # (Mako)groups_post_window.ui は、メールの「差出人」に相当
 # helpers.pyは、
 # 相手先の情報で、subscriptionの有無なので、「こちらが承認」としたい
-#: gajim/common/helpers.py:334 gajim/data/gui/groups_post_window.ui:33
+#: gajim/common/helpers.py:340 gajim/data/gui/groups_post_window.ui:33
 msgid "From"
 msgstr "こちらが承認"
 
-#: gajim/common/helpers.py:336
+#: gajim/common/helpers.py:342
 msgid "Both"
 msgstr "相互に承認"
 
-#: gajim/common/helpers.py:338 gajim/gtk/server_info.py:151
+#: gajim/common/helpers.py:344 gajim/gtk/server_info.py:151
 msgid "Unknown"
 msgstr "不明"
 
-#: gajim/common/helpers.py:344
+#: gajim/common/helpers.py:350
 msgid "?Ask (for Subscription):None"
 msgstr "なし"
 
-#: gajim/common/helpers.py:346
+#: gajim/common/helpers.py:352
 msgid "Subscribe"
 msgstr "申し込み"
 
-#: gajim/common/helpers.py:355
+#: gajim/common/helpers.py:361
 msgid "?Group Chat Contact Role:None"
 msgstr "なし"
 
-#: gajim/common/helpers.py:358
+#: gajim/common/helpers.py:364
 msgid "Moderators"
 msgstr "司会者"
 
-#: gajim/common/helpers.py:360
+#: gajim/common/helpers.py:366
 msgid "Moderator"
 msgstr "司会者"
 
-#: gajim/common/helpers.py:363
+#: gajim/common/helpers.py:369 gajim/data/gui/groupchat_info_scrolled.ui:243
 msgid "Participants"
 msgstr "参加者"
 
-#: gajim/common/helpers.py:365
+#: gajim/common/helpers.py:371
 msgid "Participant"
 msgstr "参加者"
 
 # (Mako)moderated room で、発言権(voice)を持たない者
-#: gajim/common/helpers.py:368
+#: gajim/common/helpers.py:374
 msgid "Visitors"
 msgstr "傍聴者"
 
-#: gajim/common/helpers.py:370
+#: gajim/common/helpers.py:376
 msgid "Visitor"
 msgstr "傍聴者"
 
-#: gajim/common/helpers.py:376 gajim/gtk/tooltips.py:253
+#: gajim/common/helpers.py:382 gajim/gtk/tooltips.py:253
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "なし"
 
-#: gajim/common/helpers.py:378 gajim/data/gui/groupchat_config.ui:32
+#: gajim/common/helpers.py:384 gajim/data/gui/groupchat_config.ui:32
 #: gajim/gtk/tooltips.py:259
 msgid "Owner"
 msgstr "主宰者"
 
-#: gajim/common/helpers.py:380 gajim/gtk/tooltips.py:257
+#: gajim/common/helpers.py:386 gajim/gtk/tooltips.py:257
 msgid "Administrator"
 msgstr "管理人"
 
 # (Mako)「会員」では排他的なニュアンスが強いのでしかたなくカタカナ語で
-#: gajim/common/helpers.py:382 gajim/data/gui/groupchat_config.ui:40
+#: gajim/common/helpers.py:388 gajim/data/gui/groupchat_config.ui:40
 #: gajim/gtk/tooltips.py:255 gajim/gtk/groupchat_config.py:105
 msgid "Member"
 msgstr "メンバー"
 
-#: gajim/common/helpers.py:421
+#: gajim/common/helpers.py:427
 msgid "is paying attention to the conversation"
 msgstr "さんはこの会話に目を向けています"
 
-#: gajim/common/helpers.py:423
+#: gajim/common/helpers.py:429
 msgid "is doing something else"
 msgstr "さんは何かほかのことをしています"
 
-#: gajim/common/helpers.py:425
+#: gajim/common/helpers.py:431
 msgid "is composing a message…"
 msgstr "さんはメッセージを書いています…"
 
-#: gajim/common/helpers.py:428
+#: gajim/common/helpers.py:434
 msgid "paused composing a message"
 msgstr "さんは書く手をちょっと止めています"
 
-#: gajim/common/helpers.py:430
+#: gajim/common/helpers.py:436
 msgid "has closed the chat window or tab"
 msgstr "さんは会話ウインドウを閉じました"
 
 # (Mako)これと、次の "from room %s" は連続して表示される
-#: gajim/common/helpers.py:936 gajim/common/helpers.py:943
+#: gajim/common/helpers.py:942 gajim/common/helpers.py:949
 #, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
 msgstr[0] "保留メッセージ %d 件"
 msgstr[1] "保留メッセージ %d 件"
 
-#: gajim/common/helpers.py:950
-#, python-format
-msgid "from room %s"
-msgstr " - 談話室 \"%s\""
+#: gajim/common/helpers.py:956
+#, fuzzy, python-format
+msgid "from group chat %s"
+msgstr "グループチャットで (_G)"
 
-#: gajim/common/helpers.py:953 gajim/common/helpers.py:970
+#: gajim/common/helpers.py:959 gajim/common/helpers.py:976
 #, python-format
 msgid "from user %s"
 msgstr " - ユーザー %s"
 
-#: gajim/common/helpers.py:955
+#: gajim/common/helpers.py:961
 #, python-format
 msgid "from %s"
 msgstr "- %s"
 
-#: gajim/common/helpers.py:962 gajim/common/helpers.py:968
+#: gajim/common/helpers.py:968 gajim/common/helpers.py:974
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
 msgstr[0] "保留イベント %d 件"
 msgstr[1] "保留イベント %d 件"
 
-#: gajim/common/helpers.py:986 gajim/common/helpers.py:998
+#: gajim/common/helpers.py:992 gajim/common/helpers.py:1004
 #: gajim/data/gui/roster_window.ui:85 data/org.gajim.Gajim.desktop.in:4
 #: data/org.gajim.Gajim.appdata.xml.in:9
 msgid "Gajim"
 msgstr "Gajim"
 
-#: gajim/common/helpers.py:1000
+#: gajim/common/helpers.py:1006
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: gajim/common/helpers.py:1109 gajim/data/gui/add_new_contact_window.ui:25
+#: gajim/common/helpers.py:1115 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:1111
+#: gajim/common/helpers.py:1117
 msgid "Hello, I am $name."
 msgstr "こんにちは。私は $name です。"
 
-#: gajim/common/helpers.py:1215 gajim/common/helpers.py:1224
-#: gajim/common/helpers.py:1282
+#: gajim/common/helpers.py:1221 gajim/common/helpers.py:1230
+#: gajim/common/helpers.py:1288
 msgid "Timeout loading image"
 msgstr "画像の読み込みに失敗しました"
 
-#: gajim/common/helpers.py:1234 gajim/common/helpers.py:1280
+#: gajim/common/helpers.py:1240 gajim/common/helpers.py:1286
 msgid "Image is too big"
 msgstr "画像が大きすぎます"
 
-#: gajim/common/helpers.py:1245
+#: gajim/common/helpers.py:1251
 msgid "PyCURL is not installed"
 msgstr "pyCURL がインストールされていません"
 
-#: gajim/common/helpers.py:1284
+#: gajim/common/helpers.py:1290
 msgid "Error loading image"
 msgstr "画像読み込みエラー"
 
@@ -5479,7 +5709,8 @@ msgstr "在席状況が変更されました。"
 
 #: gajim/common/modules/adhoc_commands.py:202
 #: gajim/common/modules/adhoc_commands.py:239
-msgid "Leave Groupchats"
+#, fuzzy
+msgid "Leave Group Chats"
 msgstr "グループチャットから退出"
 
 #: gajim/common/modules/adhoc_commands.py:228
@@ -5488,15 +5719,18 @@ msgid "%(nickname)s on %(room_jid)s"
 msgstr "%(room_jid)s の %(nickname)s さん"
 
 #: gajim/common/modules/adhoc_commands.py:232
-msgid "You have not joined a groupchat."
+#, fuzzy
+msgid "You have not joined a group chat."
 msgstr "グループチャットに参加していません。"
 
 #: gajim/common/modules/adhoc_commands.py:240
-msgid "Choose the groupchats you want to leave"
+#, fuzzy
+msgid "Choose the group chats you want to leave"
 msgstr "退出するグループチャットを選択してください"
 
 #: gajim/common/modules/adhoc_commands.py:289
-msgid "You left the following groupchats:"
+#, fuzzy
+msgid "You left the following group chats:"
 msgstr "次のグループチャットから退出しました:"
 
 #: gajim/common/modules/roster_item_exchange.py:102
@@ -5512,7 +5746,7 @@ msgstr "送った相手先:"
 msgid "Blocked Contacts"
 msgstr "遮断している相手先"
 
-#: gajim/data/gui/destroy_muc_dialog.ui:79 gajim/gtk/dialogs.py:736
+#: gajim/data/gui/destroy_muc_dialog.ui:79 gajim/gtk/dialogs.py:563
 msgid "Destroy this group chat permanently?"
 msgstr ""
 
@@ -5521,7 +5755,7 @@ msgstr ""
 msgid "Reason..."
 msgstr "理由"
 
-#: gajim/data/gui/destroy_muc_dialog.ui:124 gajim/gtk/dialogs.py:738
+#: gajim/data/gui/destroy_muc_dialog.ui:124 gajim/gtk/dialogs.py:565
 msgid "Where participants should go (optional)"
 msgstr ""
 
@@ -5534,32 +5768,6 @@ msgstr ""
 msgid "_Reason and alternate venue (optional)"
 msgstr "また、代替の談話室を入力できます:"
 
-#: gajim/data/gui/advanced_configuration_window.ui:7
-#: gajim/data/gui/preferences_window.ui:2723
-#, fuzzy
-msgid "Advanced Configuration Editor (ACE)"
-msgstr "詳細設定エディタ"
-
-#: gajim/data/gui/advanced_configuration_window.ui:52
-#, fuzzy
-msgid "You should restart Gajim for some changes to take effect"
-msgstr "<b>注意:</b> 設定を有効にするには Gajim を再起動してください"
-
-#: gajim/data/gui/advanced_configuration_window.ui:84
-#, fuzzy
-msgid "_Filter"
-msgstr "フィルター"
-
-#: gajim/data/gui/advanced_configuration_window.ui:153
-#: gajim/data/gui/filetransfers_send_file_dialog.ui:15
-#: gajim/gtk/discovery.py:1666
-msgid "Description"
-msgstr "説明"
-
-#: gajim/data/gui/advanced_configuration_window.ui:197
-msgid "_Reset to default"
-msgstr "デフォルトに戻す (_R)"
-
 #: gajim/data/gui/join_groupchat_window.ui:56
 #: gajim/data/gui/chat_to_muc_window.ui:67
 #: gajim/data/gui/chat_to_muc_window.ui:78
@@ -5571,8 +5779,8 @@ msgid "Join group chat every time Gajim is started"
 msgstr "Gajim 起動時にこの談話室に参加する"
 
 #: gajim/data/gui/join_groupchat_window.ui:113
-msgid "Auto Join"
-msgstr "自動参加"
+msgid "Join Automatically"
+msgstr ""
 
 #: gajim/data/gui/join_groupchat_window.ui:131
 #: gajim/data/gui/profile_window.ui:233
@@ -5580,10 +5788,12 @@ msgid "Account"
 msgstr "アカウント"
 
 #: gajim/data/gui/join_groupchat_window.ui:147
-msgid "Room"
-msgstr "談話室"
+#, fuzzy
+msgid "Group chat"
+msgstr "グループチャット"
 
-#: gajim/data/gui/join_groupchat_window.ui:180 gajim/gtk/accounts.py:886
+#: gajim/data/gui/join_groupchat_window.ui:180 gajim/data/gui/bookmarks.ui:158
+#: gajim/gtk/accounts.py:889
 msgid "Password"
 msgstr "パスワード"
 
@@ -5603,89 +5813,10 @@ msgstr "最近使ったグループチャット"
 msgid "Search group chats on selected server"
 msgstr "選択したサーバーで談話室を検索"
 
-#: gajim/data/gui/join_groupchat_window.ui:437 gajim/gtk/discovery.py:1271
+#: gajim/data/gui/join_groupchat_window.ui:437 gajim/gtk/discovery.py:1270
 msgid "Join"
 msgstr "参加"
 
-#: gajim/data/gui/manage_proxies_window.ui:12
-msgid "HTTP Connect"
-msgstr "HTTP 接続"
-
-#: gajim/data/gui/manage_proxies_window.ui:15
-msgid "SOCKS5"
-msgstr "SOCKS5"
-
-#: gajim/data/gui/manage_proxies_window.ui:18
-msgid "BOSH"
-msgstr "BOSH"
-
-#: gajim/data/gui/manage_proxies_window.ui:27
-msgid "Manage Proxy Profiles"
-msgstr "プロキシの設定"
-
-#: gajim/data/gui/manage_proxies_window.ui:83
-#, fuzzy
-msgid "Add Proxy"
-msgstr "プロキシ"
-
-#: gajim/data/gui/manage_proxies_window.ui:97
-#, fuzzy
-msgid "Remove Proxy"
-msgstr "グループの削除"
-
-#: gajim/data/gui/manage_proxies_window.ui:141
-#, fuzzy
-msgid "Properties"
-msgstr "<b>プロパティ</b>"
-
-#: gajim/data/gui/manage_proxies_window.ui:157
-#, fuzzy
-msgid "_Name"
-msgstr "名前 (_N):"
-
-#: gajim/data/gui/manage_proxies_window.ui:173
-#, fuzzy
-msgid "_Type"
-msgstr "種類 (_T):"
-
-#: gajim/data/gui/manage_proxies_window.ui:236
-#, fuzzy
-msgid "_BOSH URL"
-msgstr "BOSH の URL (_B):"
-
-#: gajim/data/gui/manage_proxies_window.ui:261
-msgid "Use HTTP prox_y"
-msgstr "HTTP プロキシを利用する (_Y)"
-
-#: gajim/data/gui/manage_proxies_window.ui:280
-#, fuzzy
-msgid "Proxy _Host"
-msgstr "プロキシのホスト (_H):"
-
-#: gajim/data/gui/manage_proxies_window.ui:307
-#, fuzzy
-msgid "Proxy _Port"
-msgstr "プロキシのポート (_P):"
-
-#: gajim/data/gui/manage_proxies_window.ui:334
-#, fuzzy
-msgid "_Username"
-msgstr "ユーザー名 (_U):"
-
-#: gajim/data/gui/manage_proxies_window.ui:347
-msgid "Use proxy auth_entication"
-msgstr "プロキシの認証を使用する (_E)"
-
-#: gajim/data/gui/manage_proxies_window.ui:377
-#, fuzzy
-msgid "Pass_word"
-msgstr "パスワード (_W):"
-
-#: gajim/data/gui/manage_proxies_window.ui:405 gajim/gtk/adhoc.py:321
-#, fuzzy
-msgid "Settings"
-msgstr "チャットのショートカット"
-
 #: gajim/data/gui/change_password_dialog.ui:17
 msgid "New Password"
 msgstr "新しいパスワード"
@@ -5714,11 +5845,13 @@ msgid "Status:"
 msgstr "在席状況:"
 
 #: gajim/data/gui/zeroconf_information_window.ui:89
-msgid "_Log conversation history"
+#, fuzzy
+msgid "_Store conversation history"
 msgstr "会話の履歴を記録 (_L)"
 
 #: gajim/data/gui/zeroconf_information_window.ui:215
 #: gajim/data/gui/vcard_information_window.ui:390
+#: gajim/data/gui/groupchat_info_scrolled.ui:166
 msgid "Contact"
 msgstr "相手先"
 
@@ -5731,8 +5864,9 @@ msgid "Last Name:"
 msgstr "姓:"
 
 #: gajim/data/gui/zeroconf_information_window.ui:260
-msgid "Jabber ID:"
-msgstr "Jabber ID:"
+#, fuzzy
+msgid "XMPP Address:"
+msgstr "AIM アドレス:"
 
 #: gajim/data/gui/zeroconf_information_window.ui:273
 msgid "E-Mail:"
@@ -5752,8 +5886,9 @@ msgid "Send _File"
 msgstr "ファイルを送信 (_F)"
 
 #: gajim/data/gui/gc_occupants_menu.ui:29
-msgid "Occupant Actions"
-msgstr "在室者の操作"
+#, fuzzy
+msgid "Participant Actions"
+msgstr "参加者"
 
 # (Mako)moderated room での発言する権利
 #: gajim/data/gui/gc_occupants_menu.ui:38
@@ -5785,8 +5920,9 @@ msgid "_Ban"
 msgstr "締め出し (_B)"
 
 #: gajim/data/gui/gc_occupants_menu.ui:124
-msgid "_Add to Roster"
-msgstr "名簿に追加 (A)"
+#, fuzzy
+msgid "_Add to Contact List"
+msgstr "相手先を追加"
 
 #: gajim/data/gui/gc_occupants_menu.ui:132
 msgid "_Execute command"
@@ -5821,11 +5957,6 @@ msgstr "在席通知の承認:"
 msgid "_Status"
 msgstr "在席状況 (_S)"
 
-#: gajim/data/gui/zeroconf_context_menu.ui:26
-#: gajim/data/gui/account_context_menu.ui:79
-msgid "_Modify Account..."
-msgstr "アカウントを編集...(_M)"
-
 #: gajim/data/gui/certificate_dialog.ui:66
 #: gajim/data/gui/certificate_dialog.ui:178
 msgid "Common Name (CN)"
@@ -5908,13 +6039,19 @@ msgstr "更新日時:"
 msgid "Next entry"
 msgstr "次のエントリー"
 
+#: gajim/data/gui/filetransfers_send_file_dialog.ui:15
+#: gajim/data/gui/advanced_configuration.ui:143
+#: gajim/data/gui/groupchat_info_scrolled.ui:48 gajim/gtk/discovery.py:1663
+msgid "Description"
+msgstr "説明"
+
 #: gajim/data/gui/filetransfers_send_file_dialog.ui:54
 #, fuzzy
 msgid "_Send Files"
 msgstr "ファイルを送信 (_F)"
 
 #: gajim/data/gui/filetransfers_send_file_dialog.ui:58
-#: gajim/gtk/xml_console.py:90
+#: gajim/gtk/xml_console.py:87
 msgid "Send"
 msgstr "送信"
 
@@ -5938,20 +6075,23 @@ msgid "Change _Nickname..."
 msgstr "ニックネームを変更...(_N)"
 
 #: gajim/data/gui/gc_control_popup_menu.ui:20
-msgid "_Manage Room"
-msgstr "談話室を管理 (_M)"
+#, fuzzy
+msgid "_Manage Group Chat"
+msgstr "新しいグループチャット (_N)"
 
 #: gajim/data/gui/gc_control_popup_menu.ui:31
 msgid "Change _Subject..."
 msgstr "談話室の題を変更...(_S)"
 
 #: gajim/data/gui/gc_control_popup_menu.ui:38
-msgid "Configure _Room..."
+#, fuzzy
+msgid "Configure _Group Chat..."
 msgstr "談話室を調整...(_R)"
 
 #: gajim/data/gui/gc_control_popup_menu.ui:52
-msgid "_Destroy Room"
-msgstr "談話室を閉鎖 (_D)"
+#, fuzzy
+msgid "_Destroy Group Chat"
+msgstr "新しいグループチャット (_N)"
 
 #: gajim/data/gui/gc_control_popup_menu.ui:64
 msgid "_Minimize on close"
@@ -5961,7 +6101,7 @@ msgstr "閉じるボタンで最小化 (_M)"
 msgid "_Request Voice"
 msgstr "発言権を要求 (_R)"
 
-#: gajim/data/gui/gc_control_popup_menu.ui:99 gajim/gtk/discovery.py:1704
+#: gajim/data/gui/gc_control_popup_menu.ui:99
 msgid "_Bookmark"
 msgstr "ブックマーク (_B)"
 
@@ -6006,13 +6146,6 @@ msgstr "ホームページ"
 msgid "E-Mail"
 msgstr "E-メール"
 
-#: 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/blocking_list.ui:115 gajim/gtk/add_contact.py:30
-#: gajim/gtk/accounts.py:801
-msgid "Jabber ID"
-msgstr "Jabber ID"
-
 #: gajim/data/gui/profile_window.ui:440
 msgid "Main"
 msgstr ""
@@ -6131,36 +6264,44 @@ msgstr "職業"
 msgid "About"
 msgstr "概略"
 
-#: gajim/data/gui/start_chat_dialog.ui:114 gajim/gtk/discovery.py:1658
-msgid "Users"
-msgstr "ユーザー数"
+#: gajim/data/gui/start_chat_dialog.ui:53
+#, fuzzy
+msgid "Global Group Chat Search"
+msgstr "グループチャットに参加"
 
-#: gajim/data/gui/start_chat_dialog.ui:185
+#: 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
-msgid "Name:"
-msgstr "名前: "
+msgid "_Back"
+msgstr "すぐに戻ります"
 
-#: gajim/data/gui/start_chat_dialog.ui:197
-msgid "Description:"
-msgstr "説明:"
+#: gajim/data/gui/start_chat_dialog.ui:245
+#: gajim/data/gui/groupchat_control.ui:796
+#: gajim/data/gui/groupchat_control.ui:888 gajim/gtk/discovery.py:1701
+#: gajim/gtk/groupchat_join.py:62
+msgid "_Join"
+msgstr "参加 (_J)"
 
-#: gajim/data/gui/start_chat_dialog.ui:209
+#: gajim/data/gui/start_chat_dialog.ui:289
 #, fuzzy
-msgid "Address:"
-msgstr "アドレス (_A):"
+msgid "Select Account"
+msgstr "アカウント %s を削除します"
 
-#: gajim/data/gui/start_chat_dialog.ui:246
-msgid ""
-"Semi-Anonymous\n"
-"<span size=\"small\">(Only moderators can see your XMPP-Address)</span>"
-msgstr ""
+#: gajim/data/gui/start_chat_dialog.ui:380
+#, fuzzy
+msgid "_Select"
+msgstr "ファイルを選択"
 
 #: gajim/data/gui/filetransfers.ui:21
 #, fuzzy
 msgid "Pa_use/Resume"
 msgstr "残す (_R)"
 
-#: gajim/data/gui/filetransfers.ui:30 gajim/gtk/filechoosers.py:178
+#: gajim/data/gui/filetransfers.ui:30 gajim/data/gui/groupchat_control.ui:575
+#: gajim/data/gui/groupchat_control.ui:667
+#: gajim/data/gui/groupchat_control.ui:779
+#: gajim/data/gui/groupchat_control.ui:871 gajim/gtk/filechoosers.py:178
 msgid "_Cancel"
 msgstr "中止 (_C)"
 
@@ -6201,7 +6342,8 @@ msgid "Cancel the selected file transfer and remove incomplete files"
 msgstr "選択されたファイルの転送を中止し、不完全なファイルは削除します"
 
 #: gajim/data/gui/filetransfers.ui:207
-msgid "Shows a list of file transfers between you and others"
+#, fuzzy
+msgid "Shows a list of file transfers between you and your contacts"
 msgstr "ファイル転送の一覧を表示します"
 
 #: gajim/data/gui/groupchat_control.ui:13 gajim/data/gui/chat_control.ui:277
@@ -6221,7 +6363,6 @@ msgid "Strike"
 msgstr "抹消線"
 
 #: gajim/data/gui/groupchat_control.ui:54 gajim/data/gui/chat_control.ui:318
-#: gajim/gtk/advanced_config.py:86
 msgid "Color"
 msgstr "色"
 
@@ -6233,15 +6374,45 @@ msgstr "フォント"
 msgid "Clear formatting"
 msgstr "書式の解除"
 
-#: gajim/data/gui/groupchat_control.ui:290 gajim/data/gui/chat_control.ui:880
+#: gajim/data/gui/groupchat_control.ui:291 gajim/data/gui/chat_control.ui:880
 msgid "Choose encryption"
 msgstr "暗号化方式を選択"
 
-#: gajim/data/gui/groupchat_control.ui:336 gajim/data/gui/chat_control.ui:640
+#: gajim/data/gui/groupchat_control.ui:337 gajim/data/gui/chat_control.ui:640
 #, fuzzy
 msgid "Show a list of emojis (Alt+M)"
 msgstr "感情アイコンの一覧を表示する (Alt+M)"
 
+#: gajim/data/gui/groupchat_control.ui:484
+#, fuzzy
+msgid "Joining…"
+msgstr "締め出し中…"
+
+#: gajim/data/gui/groupchat_control.ui:496
+msgid "_Abort"
+msgstr ""
+
+#: gajim/data/gui/groupchat_control.ui:542
+#, fuzzy
+msgid "Enter new nickname"
+msgstr "相手先 %s さんの新しいニックネームを入力してください"
+
+#: gajim/data/gui/groupchat_control.ui:592
+#: gajim/data/gui/groupchat_control.ui:684
+#, fuzzy
+msgid "Ch_ange"
+msgstr "ニックネームを変更"
+
+#: gajim/data/gui/groupchat_control.ui:761
+#, fuzzy
+msgid "Enter password"
+msgstr "新しいパスワードを入力してください:"
+
+#: gajim/data/gui/groupchat_control.ui:1067
+#, fuzzy
+msgid "_Try again"
+msgstr "再検証中..."
+
 #: gajim/data/gui/popup_notification_window.ui:42
 msgid "Event Type"
 msgstr "イベントの種類"
@@ -6309,8 +6480,9 @@ msgid "Always"
 msgstr "常に"
 
 #: gajim/data/gui/mam_preferences.ui:18
-msgid "Roster"
-msgstr "名簿"
+#, fuzzy
+msgid "Contact List"
+msgstr "相手先"
 
 # (Mako)systrayに表示
 #: gajim/data/gui/mam_preferences.ui:22
@@ -6334,11 +6506,11 @@ msgid "Add"
 msgstr "追加"
 
 #: gajim/data/gui/mam_preferences.ui:194 gajim/data/gui/groupchat_config.ui:151
-#: gajim/gtk/dialogs.py:63 gajim/gtk/accounts.py:381
+#: gajim/gtk/dialogs.py:62 gajim/gtk/accounts.py:384
 msgid "Remove"
 msgstr "削除"
 
-#: gajim/data/gui/vcard_information_window.ui:72 gajim/gtk/accounts.py:753
+#: gajim/data/gui/vcard_information_window.ui:72 gajim/gtk/accounts.py:756
 msgid "Resource"
 msgstr "リソース"
 
@@ -6385,6 +6557,7 @@ msgstr "在席通知の承認:"
 #: gajim/data/gui/vcard_information_window.ui:974
 #: gajim/data/gui/vcard_information_window.ui:993
 #: gajim/data/gui/vcard_information_window.ui:1427
+#: gajim/data/gui/groupchat_info_scrolled.ui:222
 msgid "button"
 msgstr "ボタン"
 
@@ -6413,15 +6586,18 @@ msgid "Notify me about it"
 msgstr "それについて通知する"
 
 #: gajim/data/gui/preferences_window.ui:58
-msgid "Show only in roster"
-msgstr "名簿にのみ表示する"
+#, fuzzy
+msgid "Show only in contact list"
+msgstr "アクティブな相手先のみ表示"
 
 #: gajim/data/gui/preferences_window.ui:69
-msgid "Detached roster with detached chats"
+#, fuzzy
+msgid "Detached contact list with detached chats"
 msgstr "名簿は別ウィンドウ、チャットは個々のウィンドウ"
 
 #: gajim/data/gui/preferences_window.ui:72
-msgid "Detached roster with single chat"
+#, fuzzy
+msgid "Detached contact list with single chat"
 msgstr "名簿は別ウィンドウ、チャットはひとつにまとめたウィンドウ"
 
 #: gajim/data/gui/preferences_window.ui:75
@@ -6429,11 +6605,13 @@ msgid "Single window for everything"
 msgstr "すべてをひとつのウィンドウ"
 
 #: gajim/data/gui/preferences_window.ui:78
-msgid "Detached roster with chat grouped by account"
+#, fuzzy
+msgid "Detached contact list with chat grouped by account"
 msgstr "名簿は別ウィンドウ、チャットはアカウントでまとめたウィンドウ"
 
 #: gajim/data/gui/preferences_window.ui:81
-msgid "Detached roster with chat grouped by type"
+#, fuzzy
+msgid "Detached contact list with chat grouped by type"
 msgstr "名簿は別ウィンドウ、チャットは種類でまとめたウィンドウ"
 
 #: gajim/data/gui/preferences_window.ui:92
@@ -6484,7 +6662,8 @@ msgid "_Window behavior"
 msgstr "ウィンドウの配置 (_W)"
 
 #: gajim/data/gui/preferences_window.ui:296
-msgid "_Show roster on startup"
+#, fuzzy
+msgid "_Show contact list on startup"
 msgstr "起動時に名簿を表示する (_S)"
 
 #: gajim/data/gui/preferences_window.ui:311
@@ -6501,12 +6680,12 @@ msgid "_Tabs placement"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:363
-msgid "_Quit Gajim when closing roster window"
+msgid "_Quit Gajim when closing contact list"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:367
 msgid ""
-"If enabled, Gajim will quit when closing the roster window instead of "
+"If enabled, Gajim will quit when closing the contact list window instead of "
 "minimizing to the system's notification area"
 msgstr ""
 
@@ -6516,41 +6695,42 @@ msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:423
 #, fuzzy
-msgid "Show a_vatars of contacts in roster"
+msgid "Show a_vatars of contacts in contact list"
 msgstr "名簿に相手先のアバターを表示する (_V)"
 
 #: gajim/data/gui/preferences_window.ui:427
 #, fuzzy
 msgid ""
-"If checked, avatars of contacts will be shown in the roster window and in "
-"group chats"
+"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
 #, fuzzy
-msgid "Show status _messages of contacts in roster"
+msgid "Show status _messages of contacts in contact list"
 msgstr "名簿に相手先の状況メッセージを表示する (_M)"
 
 #: gajim/data/gui/preferences_window.ui:445
 #, fuzzy
 msgid ""
 "If checked, status messages of contacts will be shown under the contact's "
-"name, in the roster window, and in group chats"
+"name, in the contact list window, and in group chats"
 msgstr ""
 "チェックをつけると、Gajim は名簿ウィンドウとグループチャットの相手先名の下に"
 "状況メッセージを表示します"
 
 #: gajim/data/gui/preferences_window.ui:459
 #, fuzzy
-msgid "Show e_xtra information of contacts in roster (mood, activity, ...)"
+msgid ""
+"Show e_xtra information of contacts in contact list (mood, activity, ...)"
 msgstr "相手先の詳細情報(気分、動向…)を名簿に表示する (_X)"
 
 #: gajim/data/gui/preferences_window.ui:463
 msgid ""
-"If checked, additional info published by the contact will be shown in "
-"roster. Additional infos (published via PEP) may include e.g. mood, "
+"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 ""
 
@@ -6559,8 +6739,9 @@ msgid "Sort contacts by status"
 msgstr "相手先を在席状況順に並べる"
 
 #: gajim/data/gui/preferences_window.ui:494
-msgid "in _roster"
-msgstr "名簿で (_R)"
+#, fuzzy
+msgid "in _contact list"
+msgstr "送った相手先:"
 
 #: gajim/data/gui/preferences_window.ui:511
 msgid "in _group chats"
@@ -6568,8 +6749,8 @@ msgstr "グループチャットで (_G)"
 
 #: gajim/data/gui/preferences_window.ui:540
 #, fuzzy
-msgid "Roster Appearance"
-msgstr "<b>名簿の外観</b>"
+msgid "Contact List Appearance"
+msgstr "名簿の項目の交換"
 
 #: gajim/data/gui/preferences_window.ui:585
 #, fuzzy
@@ -6635,7 +6816,7 @@ msgstr "グループに参加できません"
 
 #: gajim/data/gui/preferences_window.ui:660
 #, fuzzy
-msgid "If checked, the room subject will be shown when joining a group chat"
+msgid "If checked, the subject will be shown when joining a group chat"
 msgstr "グループに参加できません"
 
 #: gajim/data/gui/preferences_window.ui:682
@@ -6650,13 +6831,13 @@ msgstr ""
 #: gajim/data/gui/preferences_window.ui:701
 msgid ""
 "If join/leave status messages are shown in the group chat. This setting can "
-"be overridden in the groupchat menu."
+"be overridden in the group chat menu."
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:720
 msgid ""
 "The default sync threshold for new public group chats. This setting can be "
-"overridden in the groupchat menu."
+"overridden in the group chat menu."
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:722
@@ -6671,7 +6852,7 @@ msgstr "相手先の状況変更を記録する (_S)"
 #: gajim/data/gui/preferences_window.ui:768
 msgid ""
 "If status change messages are shown in the group chat. This setting can be "
-"overridden in the groupchat menu."
+"overridden in the group chat menu."
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:825
@@ -6688,8 +6869,8 @@ msgstr "チェックをつけると、Gajim はシステムの時刻を知られ
 
 #: gajim/data/gui/preferences_window.ui:843
 #, fuzzy
-msgid "Show chatstate in roster"
-msgstr "名簿に相手先のアバターを表示する (_V)"
+msgid "Show chatstate in contact list"
+msgstr "タブに閉じるボタンを表示するかどうか。"
 
 #: gajim/data/gui/preferences_window.ui:847
 msgid ""
@@ -7005,7 +7186,7 @@ msgstr "ビデオの大きさ"
 msgid "Vi_ew own video source"
 msgstr "自分の画像入力を見る"
 
-#: gajim/data/gui/preferences_window.ui:2281 gajim/gtk/accounts.py:352
+#: gajim/data/gui/preferences_window.ui:2281 gajim/gtk/accounts.py:355
 msgid "Connection"
 msgstr "接続"
 
@@ -7061,7 +7242,8 @@ msgid "_Manage..."
 msgstr "管理...(_M)"
 
 #: gajim/data/gui/preferences_window.ui:2616
-msgid "_Log status changes of contacts"
+#, fuzzy
+msgid "_Store status changes of contacts in history"
 msgstr "相手先の状況変更を記録する (_L)"
 
 #: gajim/data/gui/preferences_window.ui:2633
@@ -7087,10 +7269,15 @@ msgstr ""
 msgid "_Open..."
 msgstr "開く...(_O)"
 
+#: gajim/data/gui/preferences_window.ui:2723 gajim/gtk/advanced_config.py:84
+#, fuzzy
+msgid "Advanced Configuration Editor (ACE)"
+msgstr "詳細設定エディタ"
+
 #: gajim/data/gui/groupchat_config.ui:55
 #, fuzzy
 msgid ""
-"<b>Jabber-ID</b>\n"
+"<b>XMPP Address</b>\n"
 "&lt;user@domain/resource&gt; (only that resource matches)\n"
 "&lt;user@domain&gt; (any resource matches)\n"
 "&lt;domain/resource&gt; (only that resource matches)\n"
@@ -7109,7 +7296,8 @@ msgstr ""
 msgid "Only Admins and Owners can modify the affiliation"
 msgstr ""
 
-#: gajim/data/gui/groupchat_config.ui:270 gajim/plugins/gui.py:312
+#: gajim/data/gui/groupchat_config.ui:270
+#: gajim/data/gui/groupchat_info_scrolled.ui:210 gajim/plugins/gui.py:324
 msgid "Configuration"
 msgstr "調整"
 
@@ -7141,7 +7329,7 @@ msgid "Start _Chat"
 msgstr "チャットを開始 (_C)"
 
 #: gajim/data/gui/contact_context_menu.ui:20
-#: gajim/data/gui/systray_context_menu.ui:36
+#: gajim/data/gui/systray_context_menu.ui:29
 msgid "Send Single _Message..."
 msgstr "単発メッセージを送信...(_M)"
 
@@ -7198,17 +7386,43 @@ msgid "_Ignore"
 msgstr "無視 (_I)"
 
 #: gajim/data/gui/contact_context_menu.ui:174
-msgid "_Add to Roster..."
-msgstr "名簿に追加...(_A)"
+#, fuzzy
+msgid "_Add to Contact List..."
+msgstr "相手先リストに追加...(_A)"
+
+#: gajim/data/gui/advanced_configuration.ui:39
+#, fuzzy
+msgid "You should restart Gajim for some changes to take effect"
+msgstr "<b>注意:</b> 設定を有効にするには Gajim を再起動してください"
+
+#: gajim/data/gui/advanced_configuration.ui:71
+#, fuzzy
+msgid "_Filter"
+msgstr "フィルター"
+
+#: gajim/data/gui/advanced_configuration.ui:88
+msgid "Type to search for values..."
+msgstr ""
+
+#: gajim/data/gui/advanced_configuration.ui:180
+#, fuzzy
+msgid "_Reset Value"
+msgstr "デフォルトに戻す (_R)"
+
+#: gajim/data/gui/advanced_configuration.ui:185
+#, fuzzy
+msgid "Resets value to default"
+msgstr "デフォルトに戻す (_R)"
 
 #: gajim/data/gui/account_creation_wizard_window.ui:43
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim: アカウント作成ウィザード"
 
 #: gajim/data/gui/account_creation_wizard_window.ui:70
+#, fuzzy
 msgid ""
 "You need to have an account in order to connect\n"
-"to the Jabber network."
+"to the XMPP network."
 msgstr ""
 "Jabber ネットワークに接続するには、\n"
 "アカウントが必要です。"
@@ -7230,8 +7444,9 @@ msgid "<b>Please fill in the data for your existing account</b>"
 msgstr "<b>既にお持ちのアカウントの情報を入力してください</b>"
 
 #: gajim/data/gui/account_creation_wizard_window.ui:187
-msgid "_Jabber ID:"
-msgstr "Jabber ID (_J):"
+#, fuzzy
+msgid "_XMPP Address:"
+msgstr "AIM アドレス:"
 
 #: gajim/data/gui/account_creation_wizard_window.ui:239
 #: gajim/data/gui/account_creation_wizard_window.ui:394
@@ -7318,6 +7533,7 @@ msgid "Privacy Lists:"
 msgstr "プライバシーリスト:"
 
 #: gajim/data/gui/service_discovery_window.ui:111
+#: gajim/data/gui/groupchat_creation.ui:227
 #, fuzzy
 msgid "_Address"
 msgstr "アドレス (_A):"
@@ -7335,11 +7551,6 @@ msgstr "同調: 相手先の選択"
 msgid "Select the contacts you want to synchronise"
 msgstr "合わせたい相手先を選択してください"
 
-#: gajim/data/gui/groupchat_invitation_received.ui:42
-#, fuzzy
-msgid "Group Chat Invitation"
-msgstr "グループチャットへの招待"
-
 #: gajim/data/gui/groupchat_invitation_received.ui:111
 #, fuzzy
 msgid "Message..."
@@ -7391,11 +7602,11 @@ msgid "<b><big>Incoming call</big></b>"
 msgstr "<b><big>着信</big></b>"
 
 #: gajim/data/gui/add_new_contact_window.ui:84
-msgid "_Jabber ID"
-msgstr "Jabber ID (_J)"
+#, fuzzy
+msgid "_XMPP Address"
+msgstr "アドレス (_A):"
 
 #: gajim/data/gui/add_new_contact_window.ui:100
-#: gajim/data/gui/manage_bookmarks_window.ui:192
 msgid "_Nickname"
 msgstr "ニックネーム (_N)"
 
@@ -7465,7 +7676,7 @@ msgstr "<b>気分:</b>"
 msgid "<b>Message:</b>"
 msgstr "<b>メッセージ:</b>"
 
-#: gajim/data/gui/plugins_window.ui:10 gajim/data/gui/application_menu.ui:90
+#: gajim/data/gui/plugins_window.ui:10 gajim/data/gui/application_menu.ui:87
 msgid "Plugins"
 msgstr "プラグイン"
 
@@ -7568,10 +7779,6 @@ msgstr "許可する"
 msgid "Deny"
 msgstr "拒否する"
 
-#: gajim/data/gui/privacy_list_window.ui:317
-msgid "JabberID"
-msgstr "JabberID"
-
 #: gajim/data/gui/privacy_list_window.ui:358
 msgid "all in the group"
 msgstr "グループが"
@@ -7612,7 +7819,7 @@ msgstr "順位:"
 msgid "Manage sounds"
 msgstr "サウンドの管理"
 
-#: gajim/data/gui/manage_sounds_window.ui:55 gajim/plugins/gui.py:100
+#: gajim/data/gui/manage_sounds_window.ui:55 gajim/plugins/gui.py:101
 msgid "Active"
 msgstr "有効"
 
@@ -7650,30 +7857,121 @@ msgstr "アカウントを Gajim とサーバーからも削除 (_S)"
 msgid "_Personal Events"
 msgstr "個人イベント (_P)"
 
-#: gajim/data/gui/account_context_menu.ui:35
-#: gajim/data/gui/systray_context_menu.ui:28
-msgid "Join _Group Chat"
-msgstr "グループチャットに参加 (_G)"
-
-#: gajim/data/gui/account_context_menu.ui:49
+#: gajim/data/gui/account_context_menu.ui:41
 msgid "_Add Contact..."
 msgstr "相手先リストに追加...(_A)"
 
-#: gajim/data/gui/account_context_menu.ui:57
+#: gajim/data/gui/account_context_menu.ui:49
 msgid "_Discover Services"
 msgstr "サービスを探索 (_D)"
 
-#: gajim/data/gui/account_context_menu.ui:65
+#: gajim/data/gui/account_context_menu.ui:57
 msgid "_Execute Command..."
 msgstr "コマンドを実行...(_E)"
 
+#: gajim/data/gui/account_context_menu.ui:65
+#, fuzzy
+msgid "_View Certificate"
+msgstr "証明書を表示…"
+
+#: gajim/data/gui/manage_proxies.ui:12
+#, fuzzy
+msgctxt "proxy configuration"
+msgid "HTTP Connect"
+msgstr "HTTP 接続"
+
+#: gajim/data/gui/manage_proxies.ui:15
+#, fuzzy
+msgctxt "proxy configuration"
+msgid "SOCKS5"
+msgstr "SOCKS5"
+
+#: gajim/data/gui/manage_proxies.ui:18
+#, fuzzy
+msgctxt "proxy configuration"
+msgid "BOSH"
+msgstr "BOSH"
+
+#: gajim/data/gui/manage_proxies.ui:68
+#, fuzzy
+msgid "Add Proxy"
+msgstr "プロキシ"
+
+#: gajim/data/gui/manage_proxies.ui:82
+#, fuzzy
+msgid "Remove Proxy"
+msgstr "グループの削除"
+
+#: gajim/data/gui/manage_proxies.ui:134
+#, fuzzy
+msgid "Pass_word"
+msgstr "パスワード (_W):"
+
+#: gajim/data/gui/manage_proxies.ui:159
+msgid "Use proxy auth_entication"
+msgstr "プロキシの認証を使用する (_E)"
+
+#: gajim/data/gui/manage_proxies.ui:179
+#, fuzzy
+msgid "_Username"
+msgstr "ユーザー名 (_U):"
+
+#: gajim/data/gui/manage_proxies.ui:209
+#, fuzzy
+msgid "_Port"
+msgstr "ポート番号 (_P):"
+
+#: gajim/data/gui/manage_proxies.ui:226
+#, fuzzy
+msgid "example.org"
+msgstr "user@example.org"
+
+#: gajim/data/gui/manage_proxies.ui:240
+#, fuzzy
+msgid "_Host"
+msgstr "ホスト名 (_H):"
+
+#: gajim/data/gui/manage_proxies.ui:254
+msgid "Use HTTP prox_y"
+msgstr "HTTP プロキシを利用する (_Y)"
+
+#: gajim/data/gui/manage_proxies.ui:275
+msgid "https://example.org/http-bind/"
+msgstr ""
+
+#: gajim/data/gui/manage_proxies.ui:291
+#, fuzzy
+msgid "_BOSH URL"
+msgstr "BOSH の URL (_B):"
+
+#: gajim/data/gui/manage_proxies.ui:309 gajim/gtk/adhoc.py:322
+#, fuzzy
+msgid "Settings"
+msgstr "チャットのショートカット"
+
+#: gajim/data/gui/manage_proxies.ui:344
+#, fuzzy
+msgid "_Type"
+msgstr "種類 (_T):"
+
+#: gajim/data/gui/manage_proxies.ui:361
+#: gajim/data/gui/groupchat_creation.ui:105
+#, fuzzy
+msgid "_Name"
+msgstr "名前 (_N):"
+
+#: gajim/data/gui/manage_proxies.ui:391 gajim/gtk/accounts.py:742
+msgid "Proxy"
+msgstr "プロキシ"
+
 #: gajim/data/gui/application_menu.ui:8
 msgid "View"
 msgstr "表示"
 
 #: gajim/data/gui/application_menu.ui:11
-msgid "Show Roster"
-msgstr "名簿を表示"
+#, fuzzy
+msgid "Show Contact List"
+msgstr "アクティブな相手先のみ表示"
 
 #: gajim/data/gui/application_menu.ui:16
 msgid "Show Offline Contacts"
@@ -7708,21 +8006,23 @@ msgstr "キーボードショートカット"
 msgid "Features"
 msgstr "機能"
 
-#: gajim/data/gui/application_menu.ui:81
-msgid "Bookmarks"
-msgstr "ブックマーク"
+#: gajim/data/gui/application_menu.ui:77
+#: gajim/data/gui/groupchat_creation.ui:81 gajim/gtk/groupchat_creation.py:45
+#, fuzzy
+msgid "Create Group Chat"
+msgstr "グループチャットから退出"
 
-#: gajim/data/gui/application_menu.ui:94 gajim/data/gui/shortcuts_window.ui:189
-#: gajim/gtk/preferences.py:59
+#: gajim/data/gui/application_menu.ui:91 gajim/data/gui/shortcuts_window.ui:189
+#: gajim/gtk/preferences.py:58
 msgid "Preferences"
 msgstr "設定"
 
-#: gajim/data/gui/application_menu.ui:99
+#: gajim/data/gui/application_menu.ui:96
 msgid "Quit"
 msgstr "終了"
 
 #: gajim/data/gui/httpupload_progress_dialog.ui:110
-#: gajim/gtk/filetransfer.py:121
+#: gajim/gtk/filetransfer.py:120
 msgid "Progress"
 msgstr "進捗"
 
@@ -7740,48 +8040,34 @@ msgstr ""
 msgid "_Cancel Upload"
 msgstr "中止 (_C)"
 
-#: gajim/data/gui/manage_bookmarks_window.ui:13
-msgid "Group Chat Bookmarks"
-msgstr "グループチャットのブックマーク"
-
-#: gajim/data/gui/manage_bookmarks_window.ui:68
-#, fuzzy
-msgid "Add Bookmark"
-msgstr "ブックマーク"
-
-#: gajim/data/gui/manage_bookmarks_window.ui:82
-#, fuzzy
-msgid "Remove Bookmark"
-msgstr "ブックマーク"
-
-#: gajim/data/gui/manage_bookmarks_window.ui:126
-msgid "N_ame"
+#: gajim/data/gui/groupchat_creation.ui:27
+msgid "Public or Private?"
 msgstr ""
 
-#: gajim/data/gui/manage_bookmarks_window.ui:145
-msgid "Bookmark Name"
-msgstr "ブックマーク名"
-
-#: gajim/data/gui/manage_bookmarks_window.ui:160
-msgid "_Server"
-msgstr "サーバー (_S)"
-
-#: gajim/data/gui/manage_bookmarks_window.ui:223
-msgid "Roo_m"
-msgstr "談話室 (_M)"
+#: 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 ""
 
-#: gajim/data/gui/manage_bookmarks_window.ui:253
-msgid "_Password"
-msgstr "パスワード (_P)"
+#: gajim/data/gui/groupchat_creation.ui:58
+msgid "<b>Public:</b> Anyone who knows the address can join."
+msgstr ""
 
-#: gajim/data/gui/manage_bookmarks_window.ui:299
-msgid "Join chat when connected"
-msgstr "接続したらチャットに参加"
+#: gajim/data/gui/groupchat_creation.ui:122
+#, fuzzy
+msgid "_Description"
+msgstr "説明"
 
-#: gajim/data/gui/manage_bookmarks_window.ui:307
-msgid "_Join Automatically"
+#: gajim/data/gui/groupchat_creation.ui:164
+msgid "_Public"
 msgstr ""
 
+#: gajim/data/gui/groupchat_creation.ui:278
+#, fuzzy
+msgid "_Account"
+msgstr "アカウント (_A)"
+
 #: gajim/data/gui/exception_dialog.ui:49
 msgid "Sorry, that should not have happened"
 msgstr ""
@@ -7824,6 +8110,29 @@ msgstr "承認すると、あなたが接続したときに相手先はそのこ
 msgid "Presets"
 msgstr "Presets"
 
+#: gajim/data/gui/groupchat_info_scrolled.ui:32
+#, fuzzy
+msgid "Address"
+msgstr "アドレス (_A):"
+
+#: gajim/data/gui/groupchat_info_scrolled.ui:64
+msgid "Topic"
+msgstr ""
+
+#: gajim/data/gui/groupchat_info_scrolled.ui:80
+#, fuzzy
+msgid "Author"
+msgstr "作者"
+
+#: gajim/data/gui/groupchat_info_scrolled.ui:182
+msgid "Discussion Logs"
+msgstr ""
+
+#: gajim/data/gui/groupchat_info_scrolled.ui:260
+#, fuzzy
+msgid "Group Chat Language"
+msgstr "グループチャットへの招待"
+
 #: gajim/data/gui/emoji_chooser.ui:98
 #, fuzzy
 msgid "No Results Found"
@@ -7834,25 +8143,36 @@ msgid "Invite Friends!"
 msgstr "友だちを招待 !"
 
 #: gajim/data/gui/chat_to_muc_window.ui:39
+#, fuzzy
 msgid ""
-"You are now entering a groupchat.\n"
+"You are now entering a group chat.\n"
 "Select the contacts you want to invite"
 msgstr ""
 "グループチャットを始めようとしています。\n"
 "招待する相手先を選択してください"
 
 #: gajim/data/gui/chat_to_muc_window.ui:112
-msgid "Please select a MUC server."
+#, fuzzy
+msgid "Please select a group chat server."
 msgstr "グループチャットのサーバーを選択してください。"
 
 #: gajim/data/gui/chat_to_muc_window.ui:141
-msgid "MUC server"
-msgstr "グループチャットのサーバー"
+#, fuzzy
+msgid "Group chat server"
+msgstr "グループチャットに対応"
 
 #: gajim/data/gui/chat_to_muc_window.ui:176
 msgid "In_vite"
 msgstr "招待 (_V)"
 
+#: gajim/data/gui/bookmarks.ui:176
+msgid "Autojoin"
+msgstr "自動参加"
+
+#: gajim/data/gui/bookmarks.ui:211
+msgid "_Apply"
+msgstr ""
+
 #: gajim/data/gui/history_manager.ui:11
 msgid "_Export"
 msgstr "書き出し (_E)"
@@ -7867,12 +8187,13 @@ msgid "Gajim History Logs Manager"
 msgstr "Gajim 履歴記録マネージャー"
 
 #: gajim/data/gui/history_manager.ui:108
+#, fuzzy
 msgid ""
-"This log manager is not intended for log viewing. If you are looking for "
-"such functionality, use the history window instead.\n"
+"This history manager is not intended for viewing chat history. If you are "
+"looking for such functionality, please use the history window instead.\n"
 "\n"
-"Use this program to delete or export logs. You can select logs from the left "
-"and/or search database from below."
+"You can use this program to delete or export history. Either select logs "
+"from the left or search the database."
 msgstr ""
 "この記録マネージャーは記録を見るためのものではありません。そのような機能のた"
 "めには、かわりに履歴ウィンドウを使ってください。\n"
@@ -7922,7 +8243,8 @@ msgid "Select an emoji"
 msgstr "感情アイコンを選択"
 
 #: gajim/data/gui/shortcuts_window.ui:38
-msgid "Complete a command or a nick"
+#, fuzzy
+msgid "Complete a command or a nickname"
 msgstr "コマンドやニックネームを補完"
 
 #: gajim/data/gui/shortcuts_window.ui:45
@@ -7957,7 +8279,7 @@ msgstr "スクロールアップ"
 msgid "Scroll down"
 msgstr "スクロールダウン"
 
-#: gajim/data/gui/shortcuts_window.ui:100 gajim/gtk/xml_console.py:72
+#: gajim/data/gui/shortcuts_window.ui:100 gajim/gtk/xml_console.py:69
 msgid "Clear"
 msgstr "消去"
 
@@ -7998,8 +8320,9 @@ msgid "Close chat"
 msgstr "会話を閉じる"
 
 #: gajim/data/gui/shortcuts_window.ui:173
-msgid "Roster Shortcuts"
-msgstr "名簿のショートカット"
+#, fuzzy
+msgid "Contact List Shortcuts"
+msgstr "チャットのショートカット"
 
 #: gajim/data/gui/shortcuts_window.ui:196
 msgid "File transfers"
@@ -8026,7 +8349,8 @@ msgid "Show only active contacts"
 msgstr "アクティブな相手先のみ表示"
 
 #: gajim/data/gui/shortcuts_window.ui:251
-msgid "Enable roster filtering"
+#, fuzzy
+msgid "Enable contact list filtering"
 msgstr "名簿を絞り込み"
 
 #: gajim/data/gui/shortcuts_window.ui:259
@@ -8068,11 +8392,13 @@ msgid "Search selected day only"
 msgstr "選択した日の中だけでの検索 "
 
 #: gajim/data/gui/history_window.ui:317
-msgid "Record history for this chat"
+#, fuzzy
+msgid "Store history for this chat"
 msgstr "このチャットの履歴を記録"
 
 #: gajim/data/gui/history_window.ui:332
-msgid "Record History"
+#, fuzzy
+msgid "Store History"
 msgstr "履歴を記録"
 
 #: gajim/data/gui/history_window.ui:350
@@ -8091,9 +8417,10 @@ msgstr "新しい投稿を作成"
 msgid "Fill in the form."
 msgstr "次の欄を埋めてください。"
 
-#: gajim/data/gui/data_form_window.ui:229
-msgid "Room Configuration"
-msgstr "談話室の調整"
+#: gajim/data/gui/data_form_window.ui:229 gajim/gtk/groupchat_config.py:41
+#, fuzzy
+msgid "Group Chat Configuration"
+msgstr "グループチャットへの招待"
 
 #: gajim/data/gui/roster_item_exchange_window.ui:39
 #: gajim/gtk/roster_item_exchange.py:35
@@ -8115,15 +8442,15 @@ msgstr "状態 (_T)"
 msgid "_Start Chat..."
 msgstr "チャットを開始...(_S)"
 
-#: gajim/data/gui/systray_context_menu.ui:50
+#: gajim/data/gui/systray_context_menu.ui:43
 msgid "Show All Pending _Events"
 msgstr "すべての保留イベントの表示 (_E)"
 
-#: gajim/data/gui/systray_context_menu.ui:59
+#: gajim/data/gui/systray_context_menu.ui:52
 msgid "Mute Sounds"
 msgstr "サウンドのミュート"
 
-#: gajim/data/gui/systray_context_menu.ui:75
+#: gajim/data/gui/systray_context_menu.ui:68
 msgid "_Preferences"
 msgstr "設定 (_P)"
 
@@ -8217,33 +8544,33 @@ msgstr "表現をシェル内で実行し、結果を表示します"
 msgid "Execute expression inside a shell, send output"
 msgstr "表現をシェル内で実行し、結果を送信します"
 
-#: gajim/command_system/implementation/standard.py:45
+#: gajim/command_system/implementation/standard.py:47
 msgid ""
 "Show help on a given command or a list of available commands if -a is given"
 msgstr "コマンドのヘルプを表示します。-a で、可能なコマンドの一覧を表示します"
 
-#: gajim/command_system/implementation/standard.py:73
+#: gajim/command_system/implementation/standard.py:75
 msgid "Send a message to the contact"
 msgstr "相手先にメッセージを送信します"
 
-#: gajim/command_system/implementation/standard.py:78
+#: gajim/command_system/implementation/standard.py:80
 msgid "Send action (in the third person) to the current chat"
 msgstr "このチャットに(三人称で)動向を送信します"
 
-#: gajim/command_system/implementation/standard.py:83
+#: gajim/command_system/implementation/standard.py:85
 msgid "Show logged messages which mention given text"
 msgstr "記録されたメッセージから、検索語句を含むものを表示します"
 
-#: gajim/command_system/implementation/standard.py:88
+#: gajim/command_system/implementation/standard.py:90
 #, python-format
 msgid "%s: Nothing found"
 msgstr "%s: 見つかりません"
 
-#: gajim/command_system/implementation/standard.py:94
+#: gajim/command_system/implementation/standard.py:96
 msgid "Limit must be an integer"
 msgstr "制限は整数にしてください"
 
-#: gajim/command_system/implementation/standard.py:118
+#: gajim/command_system/implementation/standard.py:120
 msgid ""
 "\n"
 "    Set the current status\n"
@@ -8259,117 +8586,127 @@ msgstr ""
 "    chat (チャット可), xa (不在), dnd (取り込み中).\n"
 "    "
 
-#: gajim/command_system/implementation/standard.py:136
+#: gajim/command_system/implementation/standard.py:138
 msgid "Set the current status to away"
 msgstr "在席状況を「離席中」に設定します"
 
-#: gajim/command_system/implementation/standard.py:150
+#: gajim/command_system/implementation/standard.py:152
 msgid "Set the current status to online"
 msgstr "在席状況を「在席」に設定します"
 
-#: gajim/command_system/implementation/standard.py:153
+#: gajim/command_system/implementation/standard.py:155
 msgid "Available"
 msgstr "在席"
 
-#: gajim/command_system/implementation/standard.py:173
-#: gajim/command_system/implementation/standard.py:250
+#: gajim/command_system/implementation/standard.py:175
+#: gajim/command_system/implementation/standard.py:252
 msgid "Clear the text window"
 msgstr "ウィンドウ内を消去します"
 
-#: gajim/command_system/implementation/standard.py:178
-#: gajim/command_system/implementation/standard.py:397
+#: gajim/command_system/implementation/standard.py:180
+#: gajim/command_system/implementation/standard.py:401
 msgid "Send a ping to the contact"
 msgstr "相手先に ping を送信します"
 
-#: gajim/command_system/implementation/standard.py:181
-#: gajim/command_system/implementation/standard.py:400
+#: gajim/command_system/implementation/standard.py:183
+#: gajim/command_system/implementation/standard.py:404
 msgid "Command is not supported for zeroconf accounts"
 msgstr "コマンドは、zeroconf アカウントには使えません"
 
-#: gajim/command_system/implementation/standard.py:185
-msgid "Send DTMF sequence through an open audio session"
+#: gajim/command_system/implementation/standard.py:187
+#, fuzzy
+msgid "Send DTMF sequence through an open voice chat"
 msgstr "接続している音声セッションに DTMF 手順を送信します"
 
-#: gajim/command_system/implementation/standard.py:188
-msgid "No open audio sessions with the contact"
+#: gajim/command_system/implementation/standard.py:190
+#, fuzzy
+msgid "No open voice chats with the contact"
 msgstr "この相手先と接続している音声セッションがありません"
 
-#: gajim/command_system/implementation/standard.py:191
+#: gajim/command_system/implementation/standard.py:193
 #, python-format
 msgid "%s is not a valid tone"
 msgstr "%s は有効なトーンではありません"
 
-#: gajim/command_system/implementation/standard.py:198
-msgid "Toggle audio session"
-msgstr "音声セッションにする/しない"
+#: gajim/command_system/implementation/standard.py:200
+msgid "Toggle Voice Chat"
+msgstr ""
 
-#: gajim/command_system/implementation/standard.py:201
-msgid "Audio sessions are not available"
-msgstr "音声セッションは有効ではありません"
+#: gajim/command_system/implementation/standard.py:203
+#, fuzzy
+msgid "Voice chats are not available"
+msgstr "ビデオセッションは有効ではありません"
 
-#: gajim/command_system/implementation/standard.py:208
-msgid "Toggle video session"
+#: gajim/command_system/implementation/standard.py:210
+#, fuzzy
+msgid "Toggle Video Chat"
 msgstr "ビデオセッションにする/しない"
 
-#: gajim/command_system/implementation/standard.py:211
-msgid "Video sessions are not available"
+#: gajim/command_system/implementation/standard.py:213
+#, fuzzy
+msgid "Video chats are not available"
 msgstr "ビデオセッションは有効ではありません"
 
-#: gajim/command_system/implementation/standard.py:218
+#: gajim/command_system/implementation/standard.py:220
 msgid "Send a message to the contact that will attract their attention"
 msgstr "相手先に注目させるためのメッセージを送信します"
 
-#: gajim/command_system/implementation/standard.py:255
+#: gajim/command_system/implementation/standard.py:257
 msgid "Change your nickname in a group chat"
 msgstr "グループチャットでニックネームを変更します"
 
-#: gajim/command_system/implementation/standard.py:260 gajim/gtk/dialogs.py:674
-#: gajim/gtk/bookmarks.py:272
+#: gajim/command_system/implementation/standard.py:262
 msgid "Invalid nickname"
 msgstr "ニックネームは有効ではありません"
 
-#: gajim/command_system/implementation/standard.py:267
-msgid "Open a private chat window with a specified occupant"
+#: gajim/command_system/implementation/standard.py:269
+#, fuzzy
+msgid "Open a private chat window with a specified participant"
 msgstr "指定した在室者との私信のウィンドウを開きます"
 
-#: gajim/command_system/implementation/standard.py:273
-#: gajim/command_system/implementation/standard.py:282
-#: gajim/command_system/implementation/standard.py:332
-#: gajim/command_system/implementation/standard.py:345
-#: gajim/command_system/implementation/standard.py:357
+#: gajim/command_system/implementation/standard.py:275
+#: gajim/command_system/implementation/standard.py:284
+#: gajim/command_system/implementation/standard.py:336
+#: gajim/command_system/implementation/standard.py:349
+#: gajim/command_system/implementation/standard.py:361
 msgid "Nickname not found"
 msgstr "ニックネームは見つかりません"
 
-#: gajim/command_system/implementation/standard.py:276
+#: gajim/command_system/implementation/standard.py:278
+#, fuzzy
 msgid ""
-"Open a private chat window with a specified occupant and send him a message"
+"Open a private chat window with a specified participant and send him a "
+"message"
 msgstr "指定した在室者との私信のウィンドウを開き、メッセージを送信します"
 
-#: gajim/command_system/implementation/standard.py:285
+#: gajim/command_system/implementation/standard.py:287
 msgid "Display or change a group chat topic"
 msgstr "グループチャットの題を表示または変更します"
 
-#: gajim/command_system/implementation/standard.py:294
-msgid "Invite a user to a room for a reason"
+#: gajim/command_system/implementation/standard.py:296
+#, fuzzy
+msgid "Invite a user to a group chat for a reason"
 msgstr "理由を添えて、談話室に招待します"
 
-#: gajim/command_system/implementation/standard.py:297
+#: gajim/command_system/implementation/standard.py:299
 #, python-format
 msgid "Invited %(jid)s to %(room_jid)s"
 msgstr "%(jid)s を %(room_jid)s に招待しました"
 
-#: gajim/command_system/implementation/standard.py:301
-msgid "Join a group chat given by a JID"
+#: gajim/command_system/implementation/standard.py:303
+#, fuzzy
+msgid "Join a group chat given by an XMPP Address"
 msgstr "JID 指定でグループチャットに参加"
 
-#: gajim/command_system/implementation/standard.py:309
+#: gajim/command_system/implementation/standard.py:313
+#, fuzzy
 msgid ""
-"Leave the groupchat, optionally giving a reason, and close tab or window"
+"Leave the group chat, optionally giving a reason, and close tab or window"
 msgstr ""
 "グループチャットから退出し (理由があればそれを送信します)、タブまたはウィンド"
 "ウを閉じます"
 
-#: gajim/command_system/implementation/standard.py:314
+#: gajim/command_system/implementation/standard.py:318
 msgid ""
 "\n"
 "    Ban user by a nick or a JID from a groupchat\n"
@@ -8384,13 +8721,15 @@ msgstr ""
 "    ニックネームが見つからなければ JID として扱います。\n"
 "    "
 
-#: gajim/command_system/implementation/standard.py:329
-msgid "Kick user by a nick from a groupchat"
+#: gajim/command_system/implementation/standard.py:333
+#, fuzzy
+msgid "Kick user by a nick from a group chat"
 msgstr "ニックネームで指定するユーザーをグループチャットから蹴り出します"
 
-#: gajim/command_system/implementation/standard.py:338
+#: gajim/command_system/implementation/standard.py:342
+#, fuzzy
 msgid ""
-"Set occupant role in group chat.\n"
+"Set participant role in group chat.\n"
 "    Role can be given as one of the following values:\n"
 "    moderator, participant, visitor, none"
 msgstr ""
@@ -8398,13 +8737,14 @@ msgstr ""
 "    役は次のいずれかの値です:\n"
 "    moderator (司会者), participant (参加者), visitor (傍聴者), none (なし)"
 
-#: gajim/command_system/implementation/standard.py:343
+#: gajim/command_system/implementation/standard.py:347
 msgid "Invalid role given"
 msgstr "役が正しくありません"
 
-#: gajim/command_system/implementation/standard.py:350
+#: gajim/command_system/implementation/standard.py:354
+#, fuzzy
 msgid ""
-"Set occupant affiliation in group chat.\n"
+"Set participant affiliation in group chat.\n"
 "    Affiliation can be given as one of the following values:\n"
 "    owner, admin, member, outcast, none"
 msgstr ""
@@ -8413,20 +8753,23 @@ msgstr ""
 "    owner (主宰者), admin (管理者), member (メンバー), outcast (追放者), "
 "none (なし)"
 
-#: gajim/command_system/implementation/standard.py:355
+#: gajim/command_system/implementation/standard.py:359
 msgid "Invalid affiliation given"
 msgstr "分掌が正しくありません"
 
-#: gajim/command_system/implementation/standard.py:365
-msgid "Display names of all group chat occupants"
+#: gajim/command_system/implementation/standard.py:369
+#, fuzzy
+msgid "Display names of all group chat participants"
 msgstr "グループチャットのすべての在室者の名前を表示します"
 
-#: gajim/command_system/implementation/standard.py:387
-msgid "Forbid an occupant to send you public or private messages"
+#: gajim/command_system/implementation/standard.py:391
+#, fuzzy
+msgid "Forbid a participant to send you public or private messages"
 msgstr "在室者がメッセージ (私信も含む) を送ってくることを禁止します"
 
-#: gajim/command_system/implementation/standard.py:392
-msgid "Allow an occupant to send you public or private messages"
+#: gajim/command_system/implementation/standard.py:396
+#, fuzzy
+msgid "Allow a participant to send you public or private messages"
 msgstr "在室者がメッセージ (私信も含む) を送ってくることを許可します"
 
 #: gajim/command_system/implementation/middleware.py:74
@@ -8437,201 +8780,328 @@ msgstr "コマンド実行中のエラー"
 msgid "The same as using a doc-string, except it supports translation"
 msgstr "使う文章は同じものとします (翻訳は除く)"
 
-#: gajim/gtk/filetransfer.py:91
+#: gajim/gtk/groupchat_info.py:36
+#, fuzzy
+msgid "?Group chat feature:Archiving"
+msgstr "グループチャットへの招待"
+
+#: gajim/gtk/groupchat_info.py:37
+#, fuzzy
+msgid "Messages are archived on the server"
+msgstr "セッションはサーバーに記録されます"
+
+#: gajim/gtk/groupchat_info.py:40
+#, fuzzy
+msgid "?Group chat feature:Persistent"
+msgstr "グループチャットに対応"
+
+#: gajim/gtk/groupchat_info.py:41
+msgid "This group chat persists even if there are no participants"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:45
+#, fuzzy
+msgid "?Group chat feature:Temporary"
+msgstr "なし"
+
+#: gajim/gtk/groupchat_info.py:46
+msgid "This group chat will be destroyed once the last participant left"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:50
+#, fuzzy
+msgid "?Group chat feature:Moderated"
+msgstr "なし"
+
+#: gajim/gtk/groupchat_info.py:51
+msgid ""
+"Participants entering this group chat need to request permission to send "
+"messages"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:55
+#, fuzzy
+msgid "?Group chat feature:Not Moderated"
+msgstr "グループチャットに対応"
+
+#: gajim/gtk/groupchat_info.py:56
+msgid "Participants entering this group chat are allowed to send messages"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:60
+#, fuzzy
+msgid "?Group chat feature:Open"
+msgstr "なし"
+
+#: gajim/gtk/groupchat_info.py:61
+#, fuzzy
+msgid "Anyone can join this group chat"
+msgstr "%s さんが参加しました"
+
+#: gajim/gtk/groupchat_info.py:64
+#, fuzzy
+msgid "?Group chat feature:Members Only"
+msgstr "グループチャットのメッセージの強調:"
+
+#: gajim/gtk/groupchat_info.py:65
+msgid "This group chat is restricted to members only"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:69
+#, fuzzy
+msgid "?Group chat feature:Public"
+msgstr "グループチャットのメッセージの強調:"
+
+#: gajim/gtk/groupchat_info.py:70
+msgid "Group chat can be found via search"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:73
+#, fuzzy
+msgid "?Group chat feature:Hidden"
+msgstr "なし"
+
+#: gajim/gtk/groupchat_info.py:74
+#, fuzzy
+msgid "This group chat can not be found via search"
+msgstr "元に戻すことができません。"
+
+#: gajim/gtk/groupchat_info.py:77
+#, fuzzy
+msgid "?Group chat feature:Not Anonymous"
+msgstr "グループチャットに対応"
+
+#: gajim/gtk/groupchat_info.py:78
+msgid "All other group chat participants can see your XMPP address"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:82
+#, fuzzy
+msgid "?Group chat feature:Semi-Anonymous"
+msgstr "グループチャットのメッセージの強調:"
+
+#: gajim/gtk/groupchat_info.py:83
+msgid "Only moderators can see your XMPP address"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:86
+#, fuzzy
+msgid "?Group chat feature:Password Required"
+msgstr "グループチャットに対応"
+
+#: gajim/gtk/groupchat_info.py:87
+msgid "This group chat does require a password upon entry"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:91
+#, fuzzy
+msgid "?Group chat feature:No Password Required"
+msgstr "グループチャットに対応"
+
+#: gajim/gtk/groupchat_info.py:92
+msgid "This group chat does not require a password upon entry"
+msgstr ""
+
+#: gajim/gtk/filetransfer.py:90
 msgid "File"
 msgstr "ファイル"
 
-#: gajim/gtk/filetransfer.py:108
+#: gajim/gtk/filetransfer.py:107
 msgid "Time"
 msgstr "時間"
 
-#: gajim/gtk/filetransfer.py:228
+#: gajim/gtk/filetransfer.py:227
 #, fuzzy, python-format
 msgid "File name: %s"
 msgstr "ファイル名: %s"
 
-#: gajim/gtk/filetransfer.py:229 gajim/gtk/filetransfer.py:464
+#: gajim/gtk/filetransfer.py:228 gajim/gtk/filetransfer.py:469
 #, python-format
 msgid "Size: %s"
 msgstr "サイズ: %s"
 
-#: gajim/gtk/filetransfer.py:239
+#: gajim/gtk/filetransfer.py:238
 #, python-format
 msgid "Sender: %s"
 msgstr "送信者: %s"
 
-#: gajim/gtk/filetransfer.py:240 gajim/gtk/filetransfer.py:744
+#: gajim/gtk/filetransfer.py:239 gajim/gtk/filetransfer.py:749
 #: gajim/gtk/tooltips.py:577
 msgid "Recipient: "
 msgstr "受取人: "
 
-#: gajim/gtk/filetransfer.py:251
+#: gajim/gtk/filetransfer.py:250
 #, python-format
 msgid "Saved in: %s"
 msgstr "保存場所: %s"
 
-#: gajim/gtk/filetransfer.py:256
+#: gajim/gtk/filetransfer.py:255
 msgid "File transfer completed"
 msgstr "ファイルの転送が完了しました"
 
-#: gajim/gtk/filetransfer.py:276 gajim/gtk/filetransfer.py:285
+#: gajim/gtk/filetransfer.py:275 gajim/gtk/filetransfer.py:284
 #, fuzzy
 msgid "Connection with peer could not be established."
 msgstr "ピア接続は確立できません。"
 
-#: gajim/gtk/filetransfer.py:293
+#: gajim/gtk/filetransfer.py:292
 #, python-format
 msgid "Filename: %s"
 msgstr "ファイル名: %s"
 
 # (Mako) とりあえず「受取人」で
-#: gajim/gtk/filetransfer.py:294
+#: gajim/gtk/filetransfer.py:293
 #, python-format
 msgid "Recipient: %s"
 msgstr "受取人: %s"
 
-#: gajim/gtk/filetransfer.py:296
+#: gajim/gtk/filetransfer.py:295
 #, python-format
 msgid "Error message: %s"
 msgstr "エラーメッセージ: %s"
 
-#: gajim/gtk/filetransfer.py:333
-#, fuzzy
-msgid "File transfer error"
-msgstr "ファイル転送のエラー"
-
 #: gajim/gtk/filetransfer.py:334
-#, python-format
+#, fuzzy, python-format
 msgid ""
-"The file %(file)s has been received, but it seems to have been damaged along "
-"the way.\n"
+"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"
 "もう一度ダウンロードしますか ?"
 
-#: gajim/gtk/filetransfer.py:350
+#: gajim/gtk/filetransfer.py:340
+#, fuzzy
+msgid "_Download Again"
+msgstr "次回から質問しない (_D)"
+
+#: gajim/gtk/filetransfer.py:355
 msgid "Gajim can not read this file"
 msgstr "Gajim はこのファイルを読むことができません"
 
-#: gajim/gtk/filetransfer.py:351
+#: gajim/gtk/filetransfer.py:356
 msgid "Another process is using this file."
 msgstr "別のプロセスがこのファイルを使用中です。"
 
-#: gajim/gtk/filetransfer.py:418
+#: gajim/gtk/filetransfer.py:423
 #, fuzzy
 msgid "File Transfer Conflict"
 msgstr "ファイルの転送の完了"
 
-#: gajim/gtk/filetransfer.py:419
+#: gajim/gtk/filetransfer.py:424
 msgid "This file already exists"
 msgstr "そのファイルは既に存在しています"
 
-#: gajim/gtk/filetransfer.py:420
+#: gajim/gtk/filetransfer.py:425
 msgid "Resume download or replace file?"
 msgstr ""
 
-#: gajim/gtk/filetransfer.py:424
+#: gajim/gtk/filetransfer.py:429
 #, fuzzy
 msgid "Replace _File"
 msgstr "置換する (_P)"
 
-#: gajim/gtk/filetransfer.py:427
+#: gajim/gtk/filetransfer.py:432
 #, fuzzy
 msgid "Resume _Download"
 msgstr "ダウンロード"
 
-#: gajim/gtk/filetransfer.py:437
+#: gajim/gtk/filetransfer.py:442
 #, fuzzy, python-format
 msgid "Directory '%s' is not writable"
 msgstr "ディレクトリ \"%s\" に書き込む権限がありません"
 
-#: gajim/gtk/filetransfer.py:438
+#: gajim/gtk/filetransfer.py:443
 #, fuzzy
 msgid "You do not have permissions to create files in this directory."
 msgstr "このディレクトリにファイルを作成する権限がありません。"
 
-#: gajim/gtk/filetransfer.py:461
+#: gajim/gtk/filetransfer.py:466
 #, python-format
 msgid "File: %s"
 msgstr "ファイル: %s"
 
-#: gajim/gtk/filetransfer.py:467
+#: gajim/gtk/filetransfer.py:472
 #, python-format
 msgid "Type: %s"
 msgstr "種類: %s"
 
-#: gajim/gtk/filetransfer.py:469
+#: gajim/gtk/filetransfer.py:474
 #, python-format
 msgid "Description: %s"
 msgstr "説明: %s"
 
-#: gajim/gtk/filetransfer.py:480
+#: gajim/gtk/filetransfer.py:485
 #, fuzzy, python-format
 msgid "%s wants to send you a file"
 msgstr "%s さんがファイルを転送したがっています。"
 
-#: gajim/gtk/filetransfer.py:509
+#: gajim/gtk/filetransfer.py:514
 msgid "Checking file…"
 msgstr "ファイルをチェックしています…"
 
-#: gajim/gtk/filetransfer.py:524
+#: gajim/gtk/filetransfer.py:529
 msgid "File error"
 msgstr "ファイルのエラー"
 
-#: gajim/gtk/filetransfer.py:561
+#: gajim/gtk/filetransfer.py:566
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 
-#: gajim/gtk/filetransfer.py:658
+#: gajim/gtk/filetransfer.py:663
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/秒)"
 
-#: gajim/gtk/filetransfer.py:711 gajim/gtk/filetransfer.py:715
+#: gajim/gtk/filetransfer.py:716 gajim/gtk/filetransfer.py:720
 msgid "Invalid File"
 msgstr "ファイルが正しくありません"
 
-#: gajim/gtk/filetransfer.py:711
+#: gajim/gtk/filetransfer.py:716
 msgid "File: "
 msgstr "ファイル: "
 
-#: gajim/gtk/filetransfer.py:716
+#: gajim/gtk/filetransfer.py:721
 msgid "It is not possible to send empty files"
 msgstr "空のファイルを転送することはできません"
 
-#: gajim/gtk/filetransfer.py:742 gajim/gtk/tooltips.py:571
+#: gajim/gtk/filetransfer.py:747 gajim/gtk/tooltips.py:571
 msgid "Sender: "
 msgstr "送信者: "
 
-#: gajim/gtk/filetransfer.py:1038
+#: gajim/gtk/filetransfer.py:1043
 msgid "Choose a File to Send…"
 msgstr "転送するファイルを選択…"
 
 #: gajim/gtk/start_chat.py:51
-msgid "Start new Conversation"
+#, fuzzy
+msgid "Start New Conversation"
 msgstr "新しく会話を開始"
 
-#: gajim/gtk/start_chat.py:424
-msgid "New Groupchat"
-msgstr "新しいグループチャット"
+#: gajim/gtk/start_chat.py:260 gajim/gtk/start_chat.py:328
+msgid "You can not join a group chat unless you are connected."
+msgstr "接続しないと、グループチャットに参加できません。"
 
-#: gajim/gtk/start_chat.py:426
-msgid "New Contact"
-msgstr "新しい相手先"
+#: gajim/gtk/start_chat.py:603 gajim/gtk/groupchat_join.py:38
+msgid "Join Group Chat"
+msgstr "グループチャットに参加"
+
+#: gajim/gtk/start_chat.py:605 gajim/gtk/add_contact.py:40
+msgid "Add Contact"
+msgstr "相手先を追加"
 
-#: gajim/gtk/start_chat.py:588
+#: gajim/gtk/start_chat.py:746
 #, fuzzy, python-format
-msgid "%s Group chats found"
+msgid "%s group chats found"
 msgstr "%s は見つかりません"
 
-#: gajim/gtk/discovery.py:70
+#: gajim/gtk/discovery.py:69
 msgid "This service has not yet responded with detailed information"
 msgstr "このサービスは、詳細情報の返答がありません"
 
-#: gajim/gtk/discovery.py:71
+#: gajim/gtk/discovery.py:70
 #, fuzzy
 msgid ""
 "This service could not respond with detailed information.\n"
@@ -8640,32 +9110,33 @@ msgstr ""
 "このサービスは詳細情報を返答できませんでした。\n"
 "古いか、または壊れています"
 
-#: gajim/gtk/discovery.py:128
+#: gajim/gtk/discovery.py:126
 msgid "Others"
 msgstr "その他"
 
-#: gajim/gtk/discovery.py:131
-msgid "Conference"
-msgstr "会議室 (グループチャット)"
+#: gajim/gtk/discovery.py:129
+#, fuzzy
+msgid "Group Chat"
+msgstr "グループチャット"
 
-#: gajim/gtk/discovery.py:519
+#: gajim/gtk/discovery.py:518
 msgid "Without a connection, you can not browse available services"
 msgstr "接続しないと、サービスを見ることはできません"
 
-#: gajim/gtk/discovery.py:606
+#: gajim/gtk/discovery.py:605
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "アカウント %s でサービス探索"
 
-#: gajim/gtk/discovery.py:608
+#: gajim/gtk/discovery.py:607
 msgid "Service Discovery"
 msgstr "サービス探索"
 
-#: gajim/gtk/discovery.py:691
+#: gajim/gtk/discovery.py:690
 msgid "The service could not be found"
 msgstr "サービスが見つかりませんでした"
 
-#: gajim/gtk/discovery.py:692
+#: gajim/gtk/discovery.py:691
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -8673,100 +9144,80 @@ msgstr ""
 "あなたが入力したアドレスにサービスが見つからないか、または応答がありません。"
 "アドレスを確認し、もういちど試してください。"
 
-#: gajim/gtk/discovery.py:699 gajim/gtk/discovery.py:1042
+#: gajim/gtk/discovery.py:698 gajim/gtk/discovery.py:1041
 msgid "The service is not browsable"
 msgstr "このサービスを見ることはできません"
 
-#: gajim/gtk/discovery.py:700
+#: gajim/gtk/discovery.py:699
 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:738 gajim/gtk/discovery.py:747
+#: gajim/gtk/discovery.py:737 gajim/gtk/discovery.py:746
 msgid "Invalid Server Name"
 msgstr "サーバー名が正しくありません"
 
-#: gajim/gtk/discovery.py:806
+#: gajim/gtk/discovery.py:805
 #, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "アカウント %(account)s で %(address)s を閲覧"
 
-#: gajim/gtk/discovery.py:851
+#: gajim/gtk/discovery.py:850
 msgid "Browse"
 msgstr "一覧"
 
-#: gajim/gtk/discovery.py:1043
+#: gajim/gtk/discovery.py:1042
 msgid "This service does not contain any items to browse."
 msgstr "このサービスには表示すべき項目がありません。"
 
-#: gajim/gtk/discovery.py:1255
+#: gajim/gtk/discovery.py:1254
 #, fuzzy
 msgid "_Command"
 msgstr "コマンド"
 
-#: gajim/gtk/discovery.py:1264 gajim/gtk/discovery.py:1422
+#: gajim/gtk/discovery.py:1263 gajim/gtk/discovery.py:1420
 msgid "Re_gister"
 msgstr "登録 (_G)"
 
-#: gajim/gtk/discovery.py:1277
+#: gajim/gtk/discovery.py:1276
 msgid "_Search"
 msgstr "検索 (_S)"
 
-#: gajim/gtk/discovery.py:1420
+#: gajim/gtk/discovery.py:1418
 msgid "_Edit"
 msgstr "編集 (_E)"
 
-#: gajim/gtk/discovery.py:1458
+#: gajim/gtk/discovery.py:1456
 #, fuzzy, python-format
 msgid "Scanning %(current)d / %(total)d ..."
 msgstr "走査中 %(current)d / %(total)d.."
 
-#: gajim/gtk/discovery.py:1674
+#: gajim/gtk/discovery.py:1655
+msgid "Users"
+msgstr "ユーザー数"
+
+#: gajim/gtk/discovery.py:1671
 msgid "Id"
 msgstr "Id"
 
-#: gajim/gtk/discovery.py:1713
-msgid "_Join"
-msgstr "参加 (_J)"
-
-#: gajim/gtk/discovery.py:1736
-msgid "Bookmark already set"
-msgstr "既にブックマーク"
-
-#: gajim/gtk/discovery.py:1737
-#, fuzzy, python-format
-msgid "Group Chat '%s' is already in your bookmarks."
-msgstr "グループチャット \"%s\" は既にブックマークにあります。"
-
-#: gajim/gtk/discovery.py:1748
-msgid "Bookmark has been added successfully"
-msgstr "ブックマークが追加されました"
-
-#: gajim/gtk/discovery.py:1749
-#, fuzzy
-msgid ""
-"You can manage your bookmarks by clicking the Bookmarks menu item in your "
-"contact list."
-msgstr "ブックマークは、名簿の「アクション」メニューから管理できます。"
-
-#: gajim/gtk/discovery.py:1950
+#: gajim/gtk/discovery.py:1900
 msgid "Subscribed"
 msgstr "継読中"
 
-#: gajim/gtk/discovery.py:1959
+#: gajim/gtk/discovery.py:1909
 msgid "Node"
 msgstr "ノード"
 
 # (Mako)pubsubのところ
-#: gajim/gtk/discovery.py:2028
+#: gajim/gtk/discovery.py:1978
 #, fuzzy
 msgid "_New post"
 msgstr "新しい投稿"
 
-#: gajim/gtk/discovery.py:2037
+#: gajim/gtk/discovery.py:1987
 msgid "_Subscribe"
 msgstr "継読 (_S)"
 
-#: gajim/gtk/discovery.py:2045
+#: gajim/gtk/discovery.py:1995
 msgid "_Unsubscribe"
 msgstr "継読の取り消し (_U)"
 
@@ -8814,7 +9265,7 @@ msgstr "フォーム %s"
 msgid "Characters typed: %s"
 msgstr "使えない文字です"
 
-#: gajim/gtk/single_message.py:274 gajim/gtk/xml_console.py:169
+#: gajim/gtk/single_message.py:274 gajim/gtk/xml_console.py:166
 msgid "Connection not available"
 msgstr "接続していません"
 
@@ -8823,6 +9274,12 @@ msgstr "接続していません"
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "\"%s\" に接続していることを確認してください。"
 
+#: gajim/gtk/single_message.py:306
+#, 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:330
 #, python-format
 msgid "RE: %s"
@@ -8834,28 +9291,28 @@ msgid "%s wrote:\n"
 msgstr "%s wrote:\n"
 
 # (Mako)Personal Eventing via Pubsub
-#: gajim/gtk/pep_config.py:44
+#: gajim/gtk/pep_config.py:45
 #, fuzzy, python-format
 msgid "PEP Service Configuration (%s)"
 msgstr "PEP サービスの調整"
 
-#: gajim/gtk/pep_config.py:77
+#: gajim/gtk/pep_config.py:78
 #, fuzzy
 msgid "Service"
 msgstr "サーバー"
 
-#: gajim/gtk/pep_config.py:114
+#: gajim/gtk/pep_config.py:115
 msgid "PEP node was not removed"
 msgstr "PEP ノードは削除されませんでした"
 
-#: gajim/gtk/pep_config.py:115
+#: gajim/gtk/pep_config.py:116
 #, fuzzy, python-format
 msgid ""
 "PEP node %(node)s was not removed:\n"
 "%(message)s"
 msgstr "PEP ノード %(node)s は削除されませんでした: %(message)s"
 
-#: gajim/gtk/pep_config.py:146
+#: gajim/gtk/pep_config.py:147
 #, python-format
 msgid "Configure %s"
 msgstr "%s を調整"
@@ -8869,17 +9326,21 @@ msgstr "登録"
 msgid "Registration successful"
 msgstr "登録が完了しました"
 
-#: gajim/gtk/dialogs.py:54 gajim/gtk/dataform.py:659 gajim/gtk/adhoc.py:85
+#: gajim/gtk/service_registration.py:215
+msgid "Registration failed"
+msgstr "登録に失敗しました"
+
+#: gajim/gtk/dialogs.py:53 gajim/gtk/dataform.py:668 gajim/gtk/adhoc.py:86
 #, fuzzy
 msgid "Cancel"
 msgstr "中止 (_C)"
 
-#: gajim/gtk/dialogs.py:129
+#: gajim/gtk/dialogs.py:128
 #, python-format
 msgid "Dictionary for language \"%s\" not available"
 msgstr "言語 \"%s\" の辞書はありません"
 
-#: gajim/gtk/dialogs.py:130
+#: gajim/gtk/dialogs.py:129
 #, python-format
 msgid ""
 "You have to install the dictionary \"%s\" to use spellchecking, or choose "
@@ -8892,11 +9353,11 @@ msgstr ""
 "\n"
 "スペル間違いの強調表示は使われません"
 
-#: gajim/gtk/dialogs.py:410 gajim/gtk/dialogs.py:425
+#: gajim/gtk/dialogs.py:322 gajim/gtk/dialogs.py:337
 msgid "Insecure connection"
 msgstr "安全でない接続"
 
-#: gajim/gtk/dialogs.py:411
+#: gajim/gtk/dialogs.py:323
 #, python-format
 msgid ""
 "You are about to connect to the account %(account)s (%(server)s) insecurely. "
@@ -8909,120 +9370,116 @@ msgstr ""
 "たく推奨しません。\n"
 "それでも続けますか ?"
 
-#: gajim/gtk/dialogs.py:416
+#: gajim/gtk/dialogs.py:328
 msgid "Yes, I really want to connect insecurely"
 msgstr "はい。安全でないまま接続します"
 
-#: gajim/gtk/dialogs.py:417
+#: gajim/gtk/dialogs.py:329
 msgid "Gajim will NOT connect unless you check this box"
 msgstr "このボックスにチェックしなければ、Gajim は接続しません"
 
-#: gajim/gtk/dialogs.py:675
-msgid "The nickname contains invalid characters."
-msgstr "ニックネームに使用できない文字が含まれています。"
-
-#: gajim/gtk/dialogs.py:734
+#: gajim/gtk/dialogs.py:561
 #, fuzzy, python-format
 msgid "Destroy %s"
 msgstr "%s の閉鎖"
 
-#: gajim/gtk/dialogs.py:775
+#: gajim/gtk/dialogs.py:602
 #, fuzzy
 msgid "Certificate"
 msgstr "クライアント証明書"
 
-#: gajim/gtk/dialogs.py:786
+#: gajim/gtk/dialogs.py:613
 #, fuzzy, python-format
 msgid ""
 "Certificate for account\n"
 "%s"
 msgstr "アカウント %s の証明書"
 
-#: gajim/gtk/dialogs.py:824
+#: gajim/gtk/dialogs.py:651
 msgid "Issued to\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:825 gajim/gtk/dialogs.py:830
+#: gajim/gtk/dialogs.py:652 gajim/gtk/dialogs.py:657
 msgid "Common Name (CN): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:826 gajim/gtk/dialogs.py:831
+#: gajim/gtk/dialogs.py:653 gajim/gtk/dialogs.py:658
 msgid "Organization (O): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:827 gajim/gtk/dialogs.py:832
+#: gajim/gtk/dialogs.py:654 gajim/gtk/dialogs.py:659
 msgid "Organizational Unit (OU): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:828
+#: gajim/gtk/dialogs.py:655
 #, fuzzy
 msgid "Serial Number: "
 msgstr "GG 番号"
 
-#: gajim/gtk/dialogs.py:829
+#: gajim/gtk/dialogs.py:656
 msgid "Issued by\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:833
+#: gajim/gtk/dialogs.py:660
 msgid "Validity\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:834
+#: gajim/gtk/dialogs.py:661
 msgid "Issued on: "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:835
+#: gajim/gtk/dialogs.py:662
 #, fuzzy
 msgid "Expires on: "
 msgstr "保管期限"
 
-#: gajim/gtk/dialogs.py:836
+#: gajim/gtk/dialogs.py:663
 msgid "SHA-1:"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:838
+#: gajim/gtk/dialogs.py:665
 msgid "SHA-256:"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:852
+#: gajim/gtk/dialogs.py:679
 #, fuzzy
 msgid "View certificate…"
 msgstr "証明書を表示…"
 
-#: gajim/gtk/dialogs.py:864 gajim/gtk/accounts.py:893
+#: gajim/gtk/dialogs.py:691 gajim/gtk/accounts.py:896
 msgid "Change Password"
 msgstr "パスワードを変更"
 
 # (Mako)ほかの項目との並びで、バランスを考えてあえてカッコでつけ加えている
-#: gajim/gtk/dialogs.py:878
+#: gajim/gtk/dialogs.py:705
 msgid "_OK"
 msgstr "OK (_O)"
 
-#: gajim/gtk/dialogs.py:891
+#: gajim/gtk/dialogs.py:718
 msgid "You must enter a password"
 msgstr "パスワードを入力してください"
 
-#: gajim/gtk/dialogs.py:895
+#: gajim/gtk/dialogs.py:722
 msgid "Passwords do not match"
 msgstr "パスワードが一致しません"
 
-#: gajim/gtk/dialogs.py:923
+#: gajim/gtk/dialogs.py:750
 #, fuzzy
 msgid "Group Chat Invitation "
 msgstr "グループチャットへの招待"
 
-#: gajim/gtk/dialogs.py:948
+#: gajim/gtk/dialogs.py:775
 #, fuzzy, python-format
 msgid "<b>%s</b> has invited you to join a discussion"
 msgstr "$Contact さんがあなたを議論に参加するよう招待しています"
 
-#: gajim/gtk/dialogs.py:951
+#: gajim/gtk/dialogs.py:778
 #, 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:959
+#: gajim/gtk/dialogs.py:786
 #, python-format
 msgid "Comment: %s"
 msgstr "コメント: %s"
@@ -9035,10 +9492,6 @@ msgstr "GG 番号"
 msgid "ICQ Number"
 msgstr "ICQ 番号"
 
-#: gajim/gtk/add_contact.py:40
-msgid "Add Contact"
-msgstr "相手先を追加"
-
 #: gajim/gtk/add_contact.py:259
 #, fuzzy, python-format
 msgid "%s Missing"
@@ -9059,7 +9512,8 @@ msgid "The user ID must not contain a resource."
 msgstr "ユーザー ID にはリソースを含めないでください。"
 
 #: gajim/gtk/add_contact.py:299
-msgid "You cannot add yourself to your roster."
+#, fuzzy
+msgid "You cannot add yourself to your contact list."
 msgstr "あなた自身は名簿に追加できません。"
 
 #: gajim/gtk/add_contact.py:304
@@ -9072,11 +9526,13 @@ msgid "Your account must be online to add new contacts."
 msgstr ""
 
 #: gajim/gtk/add_contact.py:321
-msgid "Contact already in roster"
+#, fuzzy
+msgid "Contact Already in Contact List"
 msgstr "相手先は既に名簿にあります"
 
 #: gajim/gtk/add_contact.py:322
-msgid "This contact is already listed in your roster."
+#, fuzzy
+msgid "This contact is already in your contact list."
 msgstr "この相手先は既に名簿に登録されています。"
 
 #: gajim/gtk/add_contact.py:379 gajim/gtk/add_contact.py:417
@@ -9119,14 +9575,14 @@ msgstr "在席状況を変更する"
 
 #: gajim/gtk/themes.py:52
 #, fuzzy
-msgid "MUC Tab New Directed Message"
+msgid "Group Chat Tab New Directed Message"
 msgstr ""
 "グループチャットでの\n"
 "指示メッセージ"
 
 #: gajim/gtk/themes.py:56
 #, fuzzy
-msgid "MUC Tab New Message"
+msgid "Group Chat Tab New Message"
 msgstr "新着メッセージ"
 
 #: gajim/gtk/themes.py:60
@@ -9331,12 +9787,12 @@ msgstr "すべてのファイル"
 msgid "Clear File"
 msgstr "ファイルを消去"
 
-#: gajim/gtk/settings.py:570
+#: gajim/gtk/settings.py:570 gajim/gtk/proxies.py:32
 msgid "Manage Proxies"
 msgstr "プロキシを管理"
 
-#: gajim/gtk/settings.py:591 gajim/gtk/preferences.py:971
-#: gajim/gtk/preferences.py:984 gajim/gtk/preferences.py:988
+#: gajim/gtk/settings.py:591 gajim/gtk/preferences.py:968
+#: gajim/gtk/preferences.py:982 gajim/gtk/preferences.py:986
 #, fuzzy
 msgid "No Proxy"
 msgstr "プロキシ"
@@ -9425,13 +9881,15 @@ msgstr ""
 "        後で試してください。\n"
 "        "
 
-#: gajim/gtk/about.py:47 data/org.gajim.Gajim.appdata.xml.in:10
-msgid "A GTK+ XMPP client"
+#: gajim/gtk/about.py:47 data/org.gajim.Gajim.desktop.in:6
+#: data/org.gajim.Gajim.appdata.xml.in:10
+#, fuzzy
+msgid "A GTK XMPP client"
 msgstr "GTK+ XMPP クライアント"
 
 #: gajim/gtk/about.py:48
-#, python-format
-msgid "GTK+ Version: %s"
+#, fuzzy, python-format
+msgid "GTK Version: %s"
 msgstr "GTK+ バージョン: %s"
 
 #: gajim/gtk/about.py:49
@@ -9595,6 +10053,25 @@ msgstr "一時停止しました"
 msgid "?transfer status:Not started"
 msgstr "一時停止しました"
 
+#: gajim/gtk/groupchat_creation.py:97 gajim/gtk/groupchat_creation.py:99
+msgid " (optional)..."
+msgstr ""
+
+#: gajim/gtk/groupchat_creation.py:134
+#, fuzzy
+msgid "Invalid Address"
+msgstr "ファイルが正しくありません"
+
+#: gajim/gtk/groupchat_creation.py:182
+#, fuzzy
+msgid "Not Connected"
+msgstr "接続中"
+
+#: gajim/gtk/groupchat_creation.py:183
+#, fuzzy
+msgid "You have to be connected to create a group chat."
+msgstr "グループチャットに参加していません。"
+
 #: gajim/gtk/sounds.py:39
 msgid "Wav Sounds"
 msgstr "WAV サウンド"
@@ -9635,48 +10112,45 @@ msgstr "グループチャットのメッセージの強調"
 msgid "Group Chat Message Received"
 msgstr "グループチャットのメッセージを受信した"
 
-#: gajim/gtk/dataform.py:226 gajim/gtk/dataform.py:262
+#: gajim/gtk/dataform.py:232 gajim/gtk/dataform.py:268
 #, fuzzy
 msgid "Required"
 msgstr "require(必須)"
 
 # Auto の選択肢
-#: gajim/gtk/dataform.py:286
+#: gajim/gtk/dataform.py:293
 msgid "Yes"
 msgstr "する"
 
 # Auto の選択肢
-#: gajim/gtk/dataform.py:286
+#: gajim/gtk/dataform.py:293
 msgid "No"
 msgstr "しない"
 
-#: gajim/gtk/dataform.py:661
+#: gajim/gtk/dataform.py:670
 msgid "Submit"
 msgstr ""
 
-#: gajim/gtk/statusicon.py:213
+#: gajim/gtk/statusicon.py:206
 msgid "_Change Status Message…"
 msgstr "状況メッセージを変更…(_C)"
 
-#: gajim/gtk/statusicon.py:247 gajim/gtk/statusicon.py:292
-#: gajim/gtk/statusicon.py:299
+#: gajim/gtk/statusicon.py:258
 #, python-format
 msgid "using account %s"
 msgstr "アカウント %s で"
 
-#: gajim/gtk/statusicon.py:309
-msgid "_Manage Bookmarks…"
-msgstr "ブックマークを管理…(_M)"
-
-#: gajim/gtk/statusicon.py:325
-msgid "Hide _Roster"
-msgstr "名簿を閉じる (_R)"
+#: gajim/gtk/statusicon.py:269
+#, fuzzy
+msgid "Hide _Contact List"
+msgstr "相手先を招待 (_C)"
 
-#: gajim/gtk/statusicon.py:329
-msgid "Show _Roster"
-msgstr "名簿を表示 (_R)"
+#: gajim/gtk/statusicon.py:273
+#, fuzzy
+msgid "Show _Contact List"
+msgstr "アクティブな相手先のみ表示"
 
-#: gajim/gtk/statusicon.py:337
+#: gajim/gtk/statusicon.py:281
 msgid "Hide this menu"
 msgstr "このメニューを表示しない"
 
@@ -9718,33 +10192,6 @@ msgid ""
 "later."
 msgstr "個人情報の公開する際にエラーが発生しました。あとで試してください。"
 
-#: gajim/gtk/join_groupchat.py:202
-msgid "Invalid Room"
-msgstr "談話室が正しくありません"
-
-#: gajim/gtk/join_groupchat.py:203
-msgid "Please choose a room"
-msgstr "談話室を選択してください"
-
-#: gajim/gtk/join_groupchat.py:222 gajim/gtk/join_groupchat.py:229
-msgid "Invalid Nickname"
-msgstr "ニックネームが正しくありません"
-
-#: gajim/gtk/join_groupchat.py:223
-msgid "Please choose a nickname"
-msgstr "ニックネームをつけてください"
-
-#: gajim/gtk/join_groupchat.py:282 gajim/gtk/join_groupchat.py:288
-#: gajim/gtk/join_groupchat.py:293
-msgid "Wrong server"
-msgstr "サーバーが正しくありません"
-
-#: gajim/gtk/join_groupchat.py:283 gajim/gtk/join_groupchat.py:289
-#: gajim/gtk/join_groupchat.py:294
-#, python-format
-msgid "%s is not a groupchat server"
-msgstr "%s はグループチャットのサーバーではありません"
-
 #: gajim/gtk/mam_preferences.py:38
 #, python-format
 msgid "Archiving Preferences for %s"
@@ -9773,45 +10220,53 @@ msgstr "エラーを受け取りました: {}"
 msgid "Archiving Preferences Error"
 msgstr "書庫の設定"
 
-#: gajim/gtk/advanced_config.py:81
+#: gajim/gtk/advanced_config.py:95
 msgid "Activated"
 msgstr "真"
 
-#: gajim/gtk/advanced_config.py:81
+#: gajim/gtk/advanced_config.py:95
 msgid "Deactivated"
 msgstr "偽"
 
-#: gajim/gtk/advanced_config.py:83
-msgid "Boolean"
-msgstr "真偽型"
+#: gajim/gtk/advanced_config.py:97
+msgid "?config type:Boolean"
+msgstr ""
+
+#: gajim/gtk/advanced_config.py:98
+msgid "?config type:Integer"
+msgstr ""
 
-#: gajim/gtk/advanced_config.py:84
-msgid "Integer"
-msgstr "整数型"
+#: gajim/gtk/advanced_config.py:99
+msgid "?config type:Text"
+msgstr ""
 
-#: gajim/gtk/advanced_config.py:85
-msgid "Text"
-msgstr "文字列型"
+#: gajim/gtk/advanced_config.py:100
+msgid "?config type:Color"
+msgstr ""
 
-#: gajim/gtk/advanced_config.py:97
-msgid "Preference Name"
+#: gajim/gtk/advanced_config.py:112
+#, fuzzy
+msgid "?config:Preference Name"
 msgstr "設定名"
 
-#: gajim/gtk/advanced_config.py:104
-msgid "Value"
-msgstr "値"
+#: gajim/gtk/advanced_config.py:123
+#, fuzzy
+msgid "?config:Value"
+msgstr "調整"
 
-#: gajim/gtk/advanced_config.py:113
-msgid "Type"
-msgstr "種類"
+#: gajim/gtk/advanced_config.py:132
+msgid "?config:Type"
+msgstr ""
 
-#: gajim/gtk/advanced_config.py:168
-msgid "(None)"
-msgstr "(なし)"
+#: gajim/gtk/advanced_config.py:187
+#, fuzzy
+msgid "?config description:None"
+msgstr "なし"
 
-#: gajim/gtk/advanced_config.py:299
-msgid "Hidden"
-msgstr "(非表示)"
+#: gajim/gtk/advanced_config.py:322
+#, fuzzy
+msgid "?password:Hidden"
+msgstr "パスワード:"
 
 #: gajim/gtk/server_info.py:66
 #, fuzzy
@@ -9823,8 +10278,8 @@ msgstr "リンクの場所をコピー (_C)"
 msgid "%(days)s days, %(hours)s hours"
 msgstr "%(days)s日%(hours)s時間"
 
-#: gajim/gtk/server_info.py:218 gajim/gtk/accounts.py:749
-#: gajim/gtk/accounts.py:853
+#: gajim/gtk/server_info.py:218 gajim/gtk/accounts.py:752
+#: gajim/gtk/accounts.py:856
 msgid "Hostname"
 msgstr "ホスト名"
 
@@ -10022,11 +10477,6 @@ msgstr "リスト名が正しくありません"
 msgid "You must enter a name to create a privacy list."
 msgstr "プライバシーリストを作成するには、名前を入力してください。"
 
-#: gajim/gtk/groupchat_config.py:41
-#, fuzzy
-msgid "Group Chat Configuration"
-msgstr "グループチャットへの招待"
-
 #: gajim/gtk/groupchat_config.py:134
 #, fuzzy
 msgid "A Group Chat needs at least one Owner"
@@ -10037,69 +10487,69 @@ msgid "You are not allowed to modify the affiliation of Admins and Owners"
 msgstr ""
 
 #: gajim/gtk/groupchat_config.py:399
-msgid "An entry with this Jabber-ID already exists"
+msgid "An entry with this XMPP Address already exists"
 msgstr ""
 
-#: gajim/gtk/adhoc.py:91
+#: gajim/gtk/adhoc.py:92
 #, fuzzy
 msgid "Finish"
 msgstr "完了 (_F)"
 
-#: gajim/gtk/adhoc.py:97 gajim/gtk/adhoc.py:283
+#: gajim/gtk/adhoc.py:98 gajim/gtk/adhoc.py:284
 #, fuzzy
 msgid "Commands"
 msgstr "コマンド"
 
-#: gajim/gtk/adhoc.py:103
+#: gajim/gtk/adhoc.py:104
 msgid "Next"
 msgstr ""
 
-#: gajim/gtk/adhoc.py:109
+#: gajim/gtk/adhoc.py:110
 #, fuzzy
 msgid "Previous"
 msgstr "妬み"
 
-#: gajim/gtk/adhoc.py:115
+#: gajim/gtk/adhoc.py:116
 #, fuzzy
 msgid "Execute"
 msgstr "コマンドを実行"
 
-#: gajim/gtk/adhoc.py:195
+#: gajim/gtk/adhoc.py:196
 #, fuzzy
 msgid "No commands available"
 msgstr "アカウントがありません"
 
-#: gajim/gtk/adhoc.py:244
+#: gajim/gtk/adhoc.py:245
 #, fuzzy
 msgid "Request Command List"
 msgstr "コマンド実行"
 
-#: gajim/gtk/adhoc.py:259
+#: gajim/gtk/adhoc.py:260
 #, fuzzy
 msgid "Executing…"
 msgstr "コマンド実行…(_X)"
 
-#: gajim/gtk/adhoc.py:266
+#: gajim/gtk/adhoc.py:267
 #, fuzzy
 msgid "Command List"
 msgstr "追放者の一覧"
 
-#: gajim/gtk/adhoc.py:384
+#: gajim/gtk/adhoc.py:385
 #, fuzzy
 msgid "Finished"
 msgstr "完了 (_F)"
 
-#: gajim/gtk/adhoc.py:453
+#: gajim/gtk/adhoc.py:454
 #, fuzzy
 msgid "Execution failed"
 msgstr "接続に失敗しました"
 
-#: gajim/gtk/blocking.py:37
+#: gajim/gtk/blocking.py:38
 #, fuzzy, python-format
 msgid "Blocking List for %s"
 msgstr "%s のプライバシーリスト"
 
-#: gajim/gtk/blocking.py:71
+#: gajim/gtk/blocking.py:72
 msgid "Error!"
 msgstr "エラー !"
 
@@ -10146,8 +10596,7 @@ msgstr "ユーザー名が正しくありません"
 msgid "You must provide a username to configure this account."
 msgstr "このアカウントを編集するには、ユーザー名を指定してください。"
 
-#: gajim/gtk/account_wizard.py:252 gajim/gtk/bookmarks.py:290
-#: gajim/gtk/bookmarks.py:303
+#: gajim/gtk/account_wizard.py:252
 msgid "Invalid server"
 msgstr "サーバー名が正しくありません"
 
@@ -10163,7 +10612,7 @@ msgstr "入力内容が正しくありません"
 msgid "Custom port must be a port number."
 msgstr "ポートは番号で指定してください。"
 
-#: gajim/gtk/account_wizard.py:405
+#: gajim/gtk/account_wizard.py:406
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -10178,15 +10627,15 @@ msgstr ""
 "SSL エラー: %(error)s\n"
 "それでもこのサーバーに接続しますか ?"
 
-#: gajim/gtk/account_wizard.py:446 gajim/gtk/account_wizard.py:480
+#: gajim/gtk/account_wizard.py:447 gajim/gtk/account_wizard.py:481
 msgid "An error occurred during account creation"
 msgstr "アカウント作成時にエラーが起きました"
 
-#: gajim/gtk/account_wizard.py:545
+#: gajim/gtk/account_wizard.py:546
 msgid "Account name is in use"
 msgstr "アカウント名は使われています"
 
-#: gajim/gtk/account_wizard.py:546
+#: gajim/gtk/account_wizard.py:547
 msgid "You already have an account using this name."
 msgstr "この名前のアカウントは既に存在しています。"
 
@@ -10214,24 +10663,24 @@ msgstr "%(max)s のうち %(received)s"
 msgid "%(minutes)s min %(seconds)s sec"
 msgstr ""
 
-#: gajim/gtk/xml_console.py:77
+#: gajim/gtk/xml_console.py:74
 msgid "Filter"
 msgstr "フィルター"
 
-#: gajim/gtk/xml_console.py:82
+#: gajim/gtk/xml_console.py:79
 msgid "XML Input"
 msgstr "XML 入力"
 
-#: gajim/gtk/xml_console.py:86
+#: gajim/gtk/xml_console.py:83
 msgid "Paste Last Input"
 msgstr ""
 
-#: gajim/gtk/xml_console.py:170
+#: gajim/gtk/xml_console.py:167
 #, fuzzy, python-format
 msgid "Please make sure you are connected with '%s'."
 msgstr "\"%s\" に接続していることを確認してください。"
 
-#: gajim/gtk/xml_console.py:182
+#: gajim/gtk/xml_console.py:177
 #, fuzzy
 msgid "Invalid Node"
 msgstr "ファイルが正しくありません"
@@ -10264,284 +10713,296 @@ msgstr "検索"
 msgid "No results found"
 msgstr "見つかりません"
 
-#: gajim/gtk/preferences.py:358 gajim/gtk/preferences.py:362
+#: gajim/gtk/preferences.py:357 gajim/gtk/preferences.py:361
 msgid "Default"
 msgstr "デフォルト"
 
-#: gajim/gtk/preferences.py:801
+#: gajim/gtk/preferences.py:798
 msgid "status message title"
 msgstr "状況メッセージのタイトル"
 
-#: gajim/gtk/preferences.py:802
+#: gajim/gtk/preferences.py:799
 msgid "status message text"
 msgstr "状況メッセージの文"
 
+#: gajim/gtk/accounts.py:137
+#, fuzzy
+msgid "Re-Login"
+msgstr "ログイン"
+
 #: gajim/gtk/accounts.py:138
-msgid "Relogin now?"
+#, fuzzy
+msgid "Re-Login now?"
 msgstr "今すぐ再ログインしますか ?"
 
 #: gajim/gtk/accounts.py:139
-msgid "If you want all the changes to apply instantly, you must relogin."
+#, fuzzy
+msgid "To apply all changes instantly, you have to re-login."
 msgstr "すべての変更を直ちに有効にするには、再ログインしてください。"
 
-#: gajim/gtk/accounts.py:191 gajim/gtk/accounts.py:975
+#: gajim/gtk/accounts.py:141
+msgid "_Later"
+msgstr ""
+
+#: gajim/gtk/accounts.py:143
+#, fuzzy
+msgid "_Re-Login"
+msgstr "ログイン"
+
+#: gajim/gtk/accounts.py:194 gajim/gtk/accounts.py:978
 #, fuzzy
 msgid "Remove Account"
 msgstr "アカウント %s を削除します"
 
-#: gajim/gtk/accounts.py:192
+#: gajim/gtk/accounts.py:195
 #, fuzzy, python-format
 msgid "You still have open chats in your account %s"
 msgstr "アカウント %s でチャット中です"
 
-#: gajim/gtk/accounts.py:193
+#: gajim/gtk/accounts.py:196
 #, fuzzy
 msgid ""
 "All chat and group chat windows will be closed.\n"
 "Do you want to continue?"
 msgstr "すべてのチャットとグループチャットのウィンドウを閉じます。続けますか ?"
 
-#: gajim/gtk/accounts.py:424
+#: gajim/gtk/accounts.py:427
 #, fuzzy
 msgid "Back"
 msgstr "すぐに戻ります"
 
-#: gajim/gtk/accounts.py:530
+#: gajim/gtk/accounts.py:533
 #, fuzzy
 msgid "Please check if Bonjour is installed."
 msgstr "Avahi か Bonjour がインストールされているか確認してください。"
 
-#: gajim/gtk/accounts.py:532
+#: gajim/gtk/accounts.py:535
 #, fuzzy
 msgid "Please check if Avahi is installed."
 msgstr "Avahi か Bonjour がインストールされているか確認してください。"
 
-#: gajim/gtk/accounts.py:569
+#: gajim/gtk/accounts.py:572
 #, fuzzy
 msgid "Disable Account"
 msgstr "アカウントが正しくありません"
 
-#: gajim/gtk/accounts.py:570
+#: gajim/gtk/accounts.py:573
 #, fuzzy, python-format
 msgid "Account %s is still connected"
 msgstr "アカウント \"%s\" はサーバーに接続しています"
 
-#: gajim/gtk/accounts.py:571
+#: gajim/gtk/accounts.py:574
 #, fuzzy
 msgid ""
 "All chat and group chat windows will be closed. Do you want to continue?"
 msgstr "すべてのチャットとグループチャットのウィンドウを閉じます。続けますか ?"
 
-#: gajim/gtk/accounts.py:576
+#: gajim/gtk/accounts.py:579
 #, fuzzy
 msgid "_Disable Account"
 msgstr "アカウントが正しくありません"
 
-#: gajim/gtk/accounts.py:595
+#: gajim/gtk/accounts.py:598
 #, fuzzy
 msgid "Add Account"
 msgstr "アカウントを追加…"
 
-#: gajim/gtk/accounts.py:663
+#: gajim/gtk/accounts.py:666
 msgid "Label"
 msgstr "ラベル"
 
-#: gajim/gtk/accounts.py:667
+#: gajim/gtk/accounts.py:670
 msgid "Login"
 msgstr "ログイン"
 
-#: gajim/gtk/accounts.py:670
+#: gajim/gtk/accounts.py:673
 msgid "Import Contacts"
 msgstr "相手先をインポート"
 
-#: gajim/gtk/accounts.py:674 gajim/gtk/accounts.py:870
+#: gajim/gtk/accounts.py:677 gajim/gtk/accounts.py:873
 msgid "Client Certificate"
 msgstr "クライアント証明書"
 
-#: gajim/gtk/accounts.py:677 gajim/gtk/accounts.py:774
+#: gajim/gtk/accounts.py:680 gajim/gtk/accounts.py:777
 msgid "Connect on startup"
 msgstr "起動時に接続する"
 
-#: gajim/gtk/accounts.py:681 gajim/gtk/accounts.py:779
+#: gajim/gtk/accounts.py:684 gajim/gtk/accounts.py:782
 msgid "Save conversations for all contacts"
 msgstr "すべての相手先の会話記録を保存する"
 
-#: gajim/gtk/accounts.py:683 gajim/gtk/accounts.py:781
+#: gajim/gtk/accounts.py:686 gajim/gtk/accounts.py:784
 msgid "Store conversations on the harddrive"
 msgstr "ハードドライブに会話を保存"
 
-#: gajim/gtk/accounts.py:685 gajim/gtk/accounts.py:783
+#: gajim/gtk/accounts.py:688 gajim/gtk/accounts.py:786
 msgid "Global Status"
 msgstr "全体の在席状況"
 
-#: gajim/gtk/accounts.py:687
+#: gajim/gtk/accounts.py:690
 msgid "Synchronise the status of all accounts"
 msgstr "すべてのアカウントの在席状況を同期します"
 
-#: gajim/gtk/accounts.py:689
+#: gajim/gtk/accounts.py:692
 msgid "Use file transfer proxies"
 msgstr "ファイル転送のプロキシを使う"
 
-#: gajim/gtk/accounts.py:705
+#: gajim/gtk/accounts.py:708
 #, fuzzy
 msgid "Idle Time"
 msgstr "操作のない状態(いつから):"
 
-#: gajim/gtk/accounts.py:707
+#: gajim/gtk/accounts.py:710
 msgid "Disclose the time of your last activity"
 msgstr ""
 
-#: gajim/gtk/accounts.py:709
+#: gajim/gtk/accounts.py:712
 msgid "Local System Time"
 msgstr ""
 
-#: gajim/gtk/accounts.py:711
+#: gajim/gtk/accounts.py:714
 msgid "Disclose the local system time of the device Gajim runs on"
 msgstr ""
 
-#: gajim/gtk/accounts.py:714
+#: gajim/gtk/accounts.py:717
 #, fuzzy
 msgid "Client / Operating System"
 msgstr "クライアント証明書"
 
-#: gajim/gtk/accounts.py:716
+#: gajim/gtk/accounts.py:719
 #, fuzzy
 msgid ""
 "Disclose informations about the client and operating system you currently use"
 msgstr "Gajim が使用中の OS を通知することを許可します。"
 
-#: gajim/gtk/accounts.py:719
+#: gajim/gtk/accounts.py:722
 #, fuzzy
 msgid "Ignore Unknown Contacts"
 msgstr "相手先を招待"
 
-#: gajim/gtk/accounts.py:721
+#: gajim/gtk/accounts.py:724
 #, fuzzy
 msgid "Ignore everything from contacts not in your Roster"
 msgstr "名簿にない相手先からのイベントを無視する (_I)"
 
-#: gajim/gtk/accounts.py:737 gajim/gtk/accounts.py:776
+#: gajim/gtk/accounts.py:740 gajim/gtk/accounts.py:779
 msgid "Use environment variable"
 msgstr "環境変数を使う"
 
-#: gajim/gtk/accounts.py:739
-msgid "Proxy"
-msgstr "プロキシ"
-
-#: gajim/gtk/accounts.py:742
+#: gajim/gtk/accounts.py:745
 msgid "Warn on insecure connection"
 msgstr "安全でない接続の前には警告する"
 
-#: gajim/gtk/accounts.py:746
+#: gajim/gtk/accounts.py:749
 msgid "Send keep-alive packets"
 msgstr "生存パケットを送信する"
 
-#: gajim/gtk/accounts.py:750
+#: gajim/gtk/accounts.py:753
 msgid "Manually set the hostname for the server"
 msgstr "サーバーのホスト名を手動で設定する"
 
-#: gajim/gtk/accounts.py:756 gajim/gtk/accounts.py:826
-#: gajim/gtk/accounts.py:831
+#: gajim/gtk/accounts.py:759 gajim/gtk/accounts.py:829
+#: gajim/gtk/accounts.py:834
 msgid "Priority"
 msgstr "優先順位"
 
-#: gajim/gtk/accounts.py:785
+#: gajim/gtk/accounts.py:788
 msgid "Synchronize the status of all accounts"
 msgstr "すべてのアカウントの在席状況を同期します"
 
-#: gajim/gtk/accounts.py:795
+#: gajim/gtk/accounts.py:798
 msgid "First Name"
 msgstr "名"
 
-#: gajim/gtk/accounts.py:798
+#: gajim/gtk/accounts.py:801
 msgid "Last Name"
 msgstr "姓"
 
-#: gajim/gtk/accounts.py:804
+#: gajim/gtk/accounts.py:807
 msgid "Email"
 msgstr "メール"
 
-#: gajim/gtk/accounts.py:822
+#: gajim/gtk/accounts.py:825
 msgid "Adjust to status"
 msgstr "在席状況に合わせる"
 
-#: gajim/gtk/accounts.py:849
+#: gajim/gtk/accounts.py:852
 msgid "Enable"
 msgstr "有効"
 
-#: gajim/gtk/accounts.py:857
+#: gajim/gtk/accounts.py:860
 msgid "Port"
 msgstr "ポート番号"
 
-#: gajim/gtk/accounts.py:862
+#: gajim/gtk/accounts.py:865
 #, fuzzy
 msgid "Connection Settings"
 msgstr "接続オプション"
 
-#: gajim/gtk/accounts.py:872
+#: gajim/gtk/accounts.py:875
 msgid "PKCS12 Files"
 msgstr "PKCS12 形式のファイル"
 
-#: gajim/gtk/accounts.py:874
+#: gajim/gtk/accounts.py:877
 msgid "Encrypted Certificate"
 msgstr "暗号化された証明書"
 
-#: gajim/gtk/accounts.py:878
+#: gajim/gtk/accounts.py:881
 #, fuzzy
 msgid "Certificate Settings"
 msgstr "証明書オプション"
 
-#: gajim/gtk/accounts.py:890
+#: gajim/gtk/accounts.py:893
 msgid "Save Password"
 msgstr "パスワードを保存"
 
-#: gajim/gtk/accounts.py:898
+#: gajim/gtk/accounts.py:901
 #, fuzzy
 msgid "Login Settings"
 msgstr "プラグインの設定"
 
-#: gajim/gtk/accounts.py:931
+#: gajim/gtk/accounts.py:934
 #, fuzzy, python-format
 msgid "Removing account %s"
 msgstr "アカウント %s を削除します"
 
-#: gajim/gtk/accounts.py:946
+#: gajim/gtk/accounts.py:949
 msgid "Account is disabled"
 msgstr "アカウントは無効です"
 
-#: gajim/gtk/accounts.py:947
+#: gajim/gtk/accounts.py:950
 #, fuzzy
 msgid "To unregister from a server, the account must be enabled."
 msgstr "サーバーから登録を解除するには、アカウントを有効にしてください。"
 
-#: gajim/gtk/accounts.py:962
+#: gajim/gtk/accounts.py:965
 #, fuzzy
 msgid "Password required"
 msgstr "パスワードが必要です"
 
-#: gajim/gtk/accounts.py:976
+#: gajim/gtk/accounts.py:979
 #, fuzzy, python-format
 msgid "Account '%s' is still connected to the server"
 msgstr "アカウント \"%s\" はサーバーに接続しています"
 
-#: gajim/gtk/accounts.py:978
+#: gajim/gtk/accounts.py:981
 msgid "If you remove it, the connection will be lost."
 msgstr "削除すると、接続が失われます。"
 
-#: gajim/gtk/accounts.py:995
+#: gajim/gtk/accounts.py:998
 #, python-format
 msgid "Connection to server %s failed"
 msgstr "サーバー %s への接続に失敗しました"
 
-#: gajim/gtk/accounts.py:996
+#: gajim/gtk/accounts.py:999
 msgid "What would you like to do?"
 msgstr "何をしたいですか ?"
 
-#: gajim/gtk/accounts.py:997
+#: gajim/gtk/accounts.py:1000
 msgid "Remove only from Gajim"
 msgstr "アカウントを Gajim からのみ削除"
 
-#: gajim/gtk/accounts.py:998
+#: gajim/gtk/accounts.py:1001
 msgid "Don't remove anything. I'll try again later"
 msgstr "何も削除できません。あとで試みます"
 
@@ -10568,6 +11029,10 @@ msgstr ""
 msgid "Modify"
 msgstr "変更"
 
+#: gajim/gtk/roster_item_exchange.py:80
+msgid "JID"
+msgstr "JID"
+
 #: gajim/gtk/roster_item_exchange.py:86
 msgid "Groups"
 msgstr "グループ"
@@ -10591,19 +11056,19 @@ msgid_plural "Removed %d contacts"
 msgstr[0] "%d 件の相手先を削除しました"
 msgstr[1] "%d 件の相手先を削除しました"
 
-#: gajim/gtk/util.py:581
+#: gajim/gtk/util.py:583
 msgid "Unknown Artist"
 msgstr "不明"
 
-#: gajim/gtk/util.py:582
+#: gajim/gtk/util.py:584
 msgid "Unknown Title"
 msgstr "不明"
 
-#: gajim/gtk/util.py:583
+#: gajim/gtk/util.py:585
 msgid "Unknown Source"
 msgstr "不明"
 
-#: gajim/gtk/util.py:585
+#: gajim/gtk/util.py:587
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
@@ -10612,28 +11077,10 @@ msgstr ""
 "<b>\"%(title)s\"</b> <i>%(artist)s</i>\n"
 "( <i>%(source)s</i> より)"
 
-#: gajim/gtk/bookmarks.py:121
-msgid "New Group Chat"
-msgstr "新しいグループチャット"
-
-#: gajim/gtk/bookmarks.py:161
-msgid "This bookmark has invalid data"
-msgstr "このブックマークは不正なデータを含んでいます"
-
-#: gajim/gtk/bookmarks.py:162
-msgid ""
-"Please be sure to fill out server and room fields or remove this bookmark."
-msgstr ""
-"サーバーと談話室の欄を正しく入力するか、このブックマークを削除してください。"
-
-#: gajim/gtk/bookmarks.py:273 gajim/gtk/bookmarks.py:291
-#: gajim/gtk/bookmarks.py:304 gajim/gtk/bookmarks.py:335
-msgid "Character not allowed"
-msgstr "使えない文字です"
-
-#: gajim/gtk/bookmarks.py:334
-msgid "Invalid room"
-msgstr "談話室名が正しくありません"
+#: gajim/gtk/bookmarks.py:47
+#, fuzzy, python-format
+msgid "Bookmarks for %s"
+msgstr "ブックマーク"
 
 #: gajim/plugins/pluginmanager.py:736 gajim/plugins/pluginmanager.py:742
 msgid "Archive corrupted"
@@ -10644,48 +11091,51 @@ msgid "Archive empty"
 msgstr "書庫が空です"
 
 #: gajim/plugins/pluginmanager.py:750 gajim/plugins/pluginmanager.py:758
-#: gajim/plugins/gui.py:257
+#: gajim/plugins/gui.py:258
 msgid "Archive is malformed"
 msgstr "書庫の形式が正しくありません"
 
-#: gajim/plugins/pluginmanager.py:766 gajim/plugins/gui.py:281
-#: gajim/plugins/gui.py:289
+#: gajim/plugins/pluginmanager.py:766 gajim/plugins/gui.py:288
+#: gajim/plugins/gui.py:301
 msgid "Plugin already exists"
 msgstr "プラグインは既に存在しています"
 
-#: gajim/plugins/gui.py:82
+#: gajim/plugins/gui.py:83
 msgid "Click to view Gajim's wiki page on how to install plugins in Flatpak."
 msgstr ""
 
-#: gajim/plugins/gui.py:89
+#: gajim/plugins/gui.py:90
 msgid "Plugin"
 msgstr "プラグイン"
 
-#: gajim/plugins/gui.py:151
+#: gajim/plugins/gui.py:152
 #, python-format
 msgid "Warning: %s"
 msgstr "警告: %s"
 
-#: gajim/plugins/gui.py:206
+#: gajim/plugins/gui.py:207
 msgid "Plugin failed"
 msgstr "プラグインに失敗しました"
 
-#: gajim/plugins/gui.py:245
+#: gajim/plugins/gui.py:246
 msgid "Unable to properly remove the plugin"
 msgstr "プラグインを正しく削除できません"
 
-#: gajim/plugins/gui.py:281
-msgid "Overwrite?"
+#: gajim/plugins/gui.py:287
+#, fuzzy
+msgid "Overwrite Plugin?"
 msgstr "上書きしますか ?"
 
+#: gajim/plugins/gui.py:289
+#, fuzzy
+msgid "Do you want to overwrite the currently installed version?"
+msgstr "招待に応じますか ?"
+
 #: data/org.gajim.Gajim.desktop.in:5
-msgid "Jabber IM Client"
+#, fuzzy
+msgid "XMPP IM Client"
 msgstr "Jabber IM クライアント"
 
-#: data/org.gajim.Gajim.desktop.in:6
-msgid "A GTK+ Jabber client"
-msgstr "GTK+ Jabber クライアント"
-
 #: data/org.gajim.Gajim.desktop.in:8
 msgid "chat;messaging;im;xmpp;bonjour;voip;"
 msgstr "chat;messaging;im;xmpp;bonjour;voip;"
@@ -10736,7 +11186,7 @@ msgid "Easily send pictures, videos or other files to friends and groups"
 msgstr ""
 
 #: data/org.gajim.Gajim.appdata.xml.in:27
-msgid "Chat securely with End-to-End encryption via OMEMO or PGP"
+msgid "Chat securely with End-to-End encryption via OMEMO or OpenPGP"
 msgstr ""
 
 #: data/org.gajim.Gajim.appdata.xml.in:28
@@ -10799,7 +11249,8 @@ msgid "Even more features via plugins"
 msgstr "プラグインによる機能拡張"
 
 #: data/org.gajim.Gajim.appdata.xml.in:52
-msgid "Roster, list of contacts"
+#, fuzzy
+msgid "Contact list, list of contacts"
 msgstr "名簿 (相手先の一覧)"
 
 #: data/org.gajim.Gajim.appdata.xml.in:56
@@ -10818,6 +11269,508 @@ msgstr "会話の履歴"
 msgid "Plugin manager"
 msgstr "プラグイン管理"
 
+#~ msgid "Configure Services…"
+#~ msgstr "サービスの調整…"
+
+#~ msgid "Group Chat Bookmarks"
+#~ msgstr "グループチャットのブックマーク"
+
+#, fuzzy
+#~ msgid "Add Bookmark"
+#~ msgstr "ブックマーク"
+
+#, fuzzy
+#~ msgid "Remove Bookmark"
+#~ msgstr "ブックマーク"
+
+#~ msgid "Bookmark Name"
+#~ msgstr "ブックマーク名"
+
+#~ msgid "_Server"
+#~ msgstr "サーバー (_S)"
+
+#~ msgid "Roo_m"
+#~ msgstr "談話室 (_M)"
+
+#~ msgid "_Password"
+#~ msgstr "パスワード (_P)"
+
+#~ msgid "Join chat when connected"
+#~ msgstr "接続したらチャットに参加"
+
+#~ msgid "New Group Chat"
+#~ msgstr "新しいグループチャット"
+
+#~ msgid "This bookmark has invalid data"
+#~ msgstr "このブックマークは不正なデータを含んでいます"
+
+#, fuzzy
+#~ msgid ""
+#~ "Please be sure to fill out server and group chat fields or remove this "
+#~ "bookmark."
+#~ msgstr ""
+#~ "サーバーと談話室の欄を正しく入力するか、このブックマークを削除してくださ"
+#~ "い。"
+
+#~ msgid "Character not allowed"
+#~ msgstr "使えない文字です"
+
+#, fuzzy
+#~ msgid "Invalid Group Chat"
+#~ msgstr "グループチャットの JID が正しくありません"
+
+#~ msgid "Unable to join group chat"
+#~ msgstr "グループに参加できません"
+
+#~ msgid "You are banned from group chat <b>%s</b>."
+#~ msgstr "グループチャット <b>%s</b> から締め出されています。"
+
+#~ msgid "Remote server <b>%s</b> does not exist."
+#~ msgstr "リモートサーバー <b>%s</b> は存在しません。"
+
+#~ msgid "Group chat <b>%s</b> does not exist."
+#~ msgstr "グループチャット <b>%s</b> は存在しません。"
+
+#~ msgid "Group chat creation is not permitted."
+#~ msgstr "グループチャットの作成は制限されています。"
+
+#~ msgid "You must use your registered nickname in <b>%s</b>."
+#~ msgstr "<b>%s</b> では登録したニックネームを使う必要があります。"
+
+#, fuzzy
+#~ msgid "You are not in the members list in group chat %s."
+#~ msgstr "あなたはグループチャット %s のメンバー一覧にありません。"
+
+#, fuzzy
+#~ msgid "XMPP Address is not a group chat"
+#~ msgstr "グループチャットではありません"
+
+#~ msgid "This is not a group chat"
+#~ msgstr "グループチャットではありません"
+
+#, fuzzy
+#~ msgid ""
+#~ "%(room_jid)s is already in your contact list. Please check if "
+#~ "%(room_jid)s is a correct group chat name. If it is, delete it from your "
+#~ "contact list and try joining the group chat again."
+#~ msgstr ""
+#~ "%(room_jid)s は既に名簿にあります。%(room_jid)s が正しいグループチャット名"
+#~ "かどうか確認してください。もし正しければ、それを名簿から削除して、もう一度"
+#~ "そのグループチャットに参加してみてください。"
+
+#, fuzzy
+#~ msgid "Please choose a group chat"
+#~ msgstr "談話室を選択してください"
+
+#~ msgid "Invalid Nickname"
+#~ msgstr "ニックネームが正しくありません"
+
+#~ msgid "Please choose a nickname"
+#~ msgstr "ニックネームをつけてください"
+
+#~ msgid "Wrong server"
+#~ msgstr "サーバーが正しくありません"
+
+#, fuzzy
+#~ msgid "%s is not a group chat server"
+#~ msgstr "%s はグループチャットのサーバーではありません"
+
+#, fuzzy
+#~ msgid ""
+#~ "How many lines to request from server when entering a group chat. -1 "
+#~ "means no limit."
+#~ msgstr ""
+#~ "グループチャットに参加するとき、サーバーに要求する行数。-1 は制限なし。"
+
+#, fuzzy
+#~ msgid ""
+#~ "Minutes of backlog to request when entering a group chat. -1 means no "
+#~ "limit."
+#~ msgstr ""
+#~ "グループチャットに参加するとき、記録を遡る時間 (単位は分)。-1 は制限なし"
+
+#, fuzzy
+#~ msgid ""
+#~ "How many lines to request from server when entering a group chat. -1 "
+#~ "means no limit, -2 means global value."
+#~ msgstr ""
+#~ "グループチャットに参加するとき、サーバーに要求する行数。-1 は制限なし、-2 "
+#~ "は大域値"
+
+#, fuzzy
+#~ msgid ""
+#~ "Minutes of backlog to request when entering a group chat. -1 means no "
+#~ "limit, -2 means global value."
+#~ msgstr ""
+#~ "グループチャットに参加するとき、記録を遡る時間 (単位は分)。-1 は制限な"
+#~ "し、-2 は大域値"
+
+#, fuzzy
+#~ msgid "A Password is required to join the group chat %s. Please type it."
+#~ msgstr "談話室 %s に参加するにはパスワードが必要です。入力してください。"
+
+#~ msgid "Not in Roster"
+#~ msgstr "名簿にありません"
+
+#~ msgid "I would like to add you to my roster"
+#~ msgstr "私はあなたを名簿に追加したいと思っています"
+
+#~ msgid "Add to Roster"
+#~ msgstr "名簿に追加"
+
+#~ msgid "Audio Session"
+#~ msgstr "音声会話"
+
+#~ msgid "Video Session"
+#~ msgstr "ビデオ会話"
+
+#~ msgid "Manage Room"
+#~ msgstr "談話室を管理"
+
+#~ msgid "Configure Room"
+#~ msgstr "談話室を調整"
+
+#~ msgid "Destroy Room"
+#~ msgstr "談話室を閉鎖"
+
+#~ msgid "Change Nick"
+#~ msgstr "ニックネームを変更"
+
+#~ msgid "Disconnect"
+#~ msgstr "切断"
+
+#~ msgid "Copy JID"
+#~ msgstr "JID をコピー"
+
+#, fuzzy
+#~ msgid "Add to Roster…"
+#~ msgstr "名簿に追加"
+
+#, fuzzy
+#~ msgid "Copy JID/Email"
+#~ msgstr "JID/Eメールアドレスをコピー (_C)"
+
+#~ msgid "JID: <i>%s</i>"
+#~ msgstr "JID: <i>%s</i>"
+
+#~ msgid "Changing Subject"
+#~ msgstr "題の変更"
+
+#~ msgid "Please specify the new subject:"
+#~ msgstr "新しい題を入力してください:"
+
+#~ msgid "Room logging is now enabled"
+#~ msgstr "談話室の記録を取りはじめます"
+
+#~ msgid "Room logging is now disabled"
+#~ msgstr "談話室の記録を止めます"
+
+#, fuzzy
+#~ msgid "You (%s) joined the room"
+#~ msgstr "%s さんが参加しました"
+
+#~ msgid "Room logging is enabled"
+#~ msgstr "談話室の会話は記録されています"
+
+#~ msgid "Unable to join groupchat"
+#~ msgstr "グループに参加できません"
+
+#~ msgid "Groupchat Invitation"
+#~ msgstr "グループチャットへの招待"
+
+#~ msgid "%(jid)s has been invited in this room"
+#~ msgstr "%(jid)s は既にこの談話室に招待されています"
+
+#~ msgid "JID is not a Groupchat"
+#~ msgstr "JID はグループチャットではありません"
+
+#~ msgid "Invalid JID"
+#~ msgstr "JID が正しくありません"
+
+#~ msgid "A connection is not available"
+#~ msgstr "接続は有効ではありません"
+
+#~ msgid "JID already in list"
+#~ msgstr "JID は一覧にあります"
+
+#~ msgid "Unsecure"
+#~ msgstr "安全ではありません"
+
+#~ msgid "For the chosen encryption there is no encryption method available"
+#~ msgstr "その暗号化は有効な暗号化方式ではありません"
+
+#~ msgid "Removes contact from roster"
+#~ msgstr "相手先を名簿から削除します"
+
+#~ msgid "Not in roster"
+#~ msgstr "名簿にありません"
+
+#~ msgid "Contact signed in notification color."
+#~ msgstr "相手先のサインインの通知の色。"
+
+#~ msgid "Contact signout notification color"
+#~ msgstr "相手先のサインアウトの通知の色"
+
+#~ msgid "File transfer request notification color."
+#~ msgstr "ファイル転送要求の通知の色。"
+
+#~ msgid "File transfer error notification color."
+#~ msgstr "ファイル転送エラーの通知の色。"
+
+#~ msgid "File transfer complete or stopped notification color."
+#~ msgstr "ファイル転送の完了または中止の通知の色。"
+
+#~ msgid "Groupchat invitation notification color"
+#~ msgstr "グループチャットへの招待の通知の色"
+
+#~ msgid "Other dialogs color."
+#~ msgstr "その他のダイアログの色。"
+
+#~ msgid "Add * and [n] in roster title?"
+#~ msgstr "* と [n] を名簿の題に追加するかどうか。"
+
+#~ msgid "Hides the banner in two persons chat window"
+#~ msgstr "1対1チャットのウィンドウのバナーを表示しません"
+
+#~ msgid ""
+#~ "Show the confirm metacontacts creation dialog or not? Empty string means "
+#~ "never show the dialog."
+#~ msgstr ""
+#~ "メタ相手先の作成の確認のダイアログを表示するかどうか。空文字ならダイアログ"
+#~ "を表示しません。"
+
+#~ msgid "If true, You will also see your webcam"
+#~ msgstr "真なら、自分のウェブカメラも表示します。"
+
+#~ msgid "Space separated list of ssl errors to ignore."
+#~ msgstr "無視すべき SSL のエラーの一覧 (空白で区切る)。"
+
+#~ msgid "Answer to receipt requests"
+#~ msgstr "受領確認に応じます"
+
+#~ msgid "Sent receipt requests"
+#~ msgstr "受領確認を求めます"
+
+#~ msgid "Language for which misspelled words will be checked"
+#~ msgstr "スペル間違いを調べる言語"
+
+#~ msgid "I'm eating, so leave me a message."
+#~ msgstr "食事のため、しばらく離れます。"
+
+#~ msgid ""
+#~ "This message was encrypted with OpenPGP for XMPP and could not be "
+#~ "decrypted."
+#~ msgstr ""
+#~ "このメッセージは OpenPGP for XMPP で暗号化されており、復号することができま"
+#~ "せん。"
+
+#~ msgid "from room %s"
+#~ msgstr " - 談話室 \"%s\""
+
+#~ msgid "Leave Groupchats"
+#~ msgstr "グループチャットから退出"
+
+#~ msgid "Auto Join"
+#~ msgstr "自動参加"
+
+#~ msgid "Room"
+#~ msgstr "談話室"
+
+#~ msgid "Jabber ID:"
+#~ msgstr "Jabber ID:"
+
+#~ msgid "Occupant Actions"
+#~ msgstr "在室者の操作"
+
+#~ msgid "_Add to Roster"
+#~ msgstr "名簿に追加 (A)"
+
+#~ msgid "_Manage Room"
+#~ msgstr "談話室を管理 (_M)"
+
+#~ msgid "_Destroy Room"
+#~ msgstr "談話室を閉鎖 (_D)"
+
+#~ msgid "Jabber ID"
+#~ msgstr "Jabber ID"
+
+#, fuzzy
+#~ msgid "account"
+#~ msgstr "アカウント"
+
+#~ msgid "Roster"
+#~ msgstr "名簿"
+
+#~ msgid "Show only in roster"
+#~ msgstr "名簿にのみ表示する"
+
+#~ msgid "in _roster"
+#~ msgstr "名簿で (_R)"
+
+#, fuzzy
+#~ msgid "Roster Appearance"
+#~ msgstr "<b>名簿の外観</b>"
+
+#, fuzzy
+#~ msgid "Show chatstate in roster"
+#~ msgstr "名簿に相手先のアバターを表示する (_V)"
+
+#~ msgid "_Add to Roster..."
+#~ msgstr "名簿に追加...(_A)"
+
+#~ msgid "_Jabber ID:"
+#~ msgstr "Jabber ID (_J):"
+
+#~ msgid "_Jabber ID"
+#~ msgstr "Jabber ID (_J)"
+
+#~ msgid "JabberID"
+#~ msgstr "JabberID"
+
+#~ msgid "Show Roster"
+#~ msgstr "名簿を表示"
+
+#~ msgid "MUC server"
+#~ msgstr "グループチャットのサーバー"
+
+#~ msgid "Roster Shortcuts"
+#~ msgstr "名簿のショートカット"
+
+#~ msgid "Room Configuration"
+#~ msgstr "談話室の調整"
+
+#~ msgid "Join _Group Chat"
+#~ msgstr "グループチャットに参加 (_G)"
+
+#~ msgid "Toggle audio session"
+#~ msgstr "音声セッションにする/しない"
+
+#~ msgid "Audio sessions are not available"
+#~ msgstr "音声セッションは有効ではありません"
+
+#~ msgid "Conference"
+#~ msgstr "会議室 (グループチャット)"
+
+#~ msgid "_Manage Bookmarks…"
+#~ msgstr "ブックマークを管理…(_M)"
+
+#~ msgid "Hide _Roster"
+#~ msgstr "名簿を閉じる (_R)"
+
+#~ msgid "Show _Roster"
+#~ msgstr "名簿を表示 (_R)"
+
+#~ msgid "Invalid Room"
+#~ msgstr "談話室が正しくありません"
+
+#~ msgid "Invalid room"
+#~ msgstr "談話室名が正しくありません"
+
+#~ msgid "A GTK+ Jabber client"
+#~ msgstr "GTK+ Jabber クライアント"
+
+#~ msgid "Changing Nickname"
+#~ msgstr "ニックネームの変更"
+
+#~ msgid "Please specify the new nickname you want to use:"
+#~ msgstr "使用する新しいニックネームを入力してください:"
+
+#~ msgid "Bookmark already set"
+#~ msgstr "既にブックマーク"
+
+#, fuzzy
+#~ msgid "Group Chat '%s' is already in your bookmarks."
+#~ msgstr "グループチャット \"%s\" は既にブックマークにあります。"
+
+#~ msgid "Bookmark has been added successfully"
+#~ msgstr "ブックマークが追加されました"
+
+#, fuzzy
+#~ msgid ""
+#~ "You can manage your bookmarks by clicking the Bookmarks menu item in your "
+#~ "contact list."
+#~ msgstr "ブックマークは、名簿の「アクション」メニューから管理できます。"
+
+#~ msgid "The nickname contains invalid characters."
+#~ msgstr "ニックネームに使用できない文字が含まれています。"
+
+#~ msgid "Bookmark Room"
+#~ msgstr "この談話室をブックマークする"
+
+#~ msgid "_Join New Group Chat"
+#~ msgstr "新しいグループチャットに参加 (_J)"
+
+#, fuzzy
+#~ msgid "_Create Group Chat"
+#~ msgstr "グループチャットから退出"
+
+#, fuzzy
+#~ msgid "Name:"
+#~ msgstr "名前: "
+
+#~ msgid "Description:"
+#~ msgstr "説明:"
+
+#, fuzzy
+#~ msgid "Address:"
+#~ msgstr "アドレス (_A):"
+
+#~ msgid "You can not start a new conversation unless you are connected."
+#~ msgstr "接続しないと、新しい会話を開始できません。"
+
+#, fuzzy
+#~ msgid "Occupants"
+#~ msgstr "在室者の操作"
+
+#, fuzzy
+#~ msgid "File transfer error"
+#~ msgstr "ファイル転送のエラー"
+
+#~ msgid "No Accounts available"
+#~ msgstr "アカウントがありません"
+
+#~ msgid "Boolean"
+#~ msgstr "真偽型"
+
+#~ msgid "Integer"
+#~ msgstr "整数型"
+
+#~ msgid "Text"
+#~ msgstr "文字列型"
+
+#~ msgid "Value"
+#~ msgstr "値"
+
+#~ msgid "Type"
+#~ msgstr "種類"
+
+#~ msgid "(None)"
+#~ msgstr "(なし)"
+
+#~ msgid "Hidden"
+#~ msgstr "(非表示)"
+
+#~ msgid "Manage Proxy Profiles"
+#~ msgstr "プロキシの設定"
+
+#, fuzzy
+#~ msgid "Properties"
+#~ msgstr "<b>プロパティ</b>"
+
+#, fuzzy
+#~ msgid "Proxy _Host"
+#~ msgstr "プロキシのホスト (_H):"
+
+#, fuzzy
+#~ msgid "Proxy _Port"
+#~ msgstr "プロキシのポート (_P):"
+
+#~ msgid "New Groupchat"
+#~ msgstr "新しいグループチャット"
+
+#~ msgid "New Contact"
+#~ msgstr "新しい相手先"
+
 #~ msgid "%s GiB"
 #~ msgstr "%s GiB"
 
@@ -10901,9 +11854,6 @@ msgstr "プラグイン管理"
 #~ msgid "_Pause"
 #~ msgstr "一時停止 (_P)"
 
-#~ msgid "Clean _up"
-#~ msgstr "消去 (_U)"
-
 #~ msgid "Remove file transfer from the list."
 #~ msgstr "ファイル転送を一覧から削除します。"
 
@@ -10924,9 +11874,6 @@ msgstr "プラグイン管理"
 #~ msgid "When a file transfer is complete show a popup notification"
 #~ msgstr "ファイル転送が完了したら、ポップアップで知らせる"
 
-#~ msgid "Select Files"
-#~ msgstr "ファイルを選択"
-
 #~ msgid "From:"
 #~ msgstr "差出人:"
 
@@ -11371,9 +12318,6 @@ msgstr "プラグイン管理"
 #~ msgid "You are invited to a groupchat"
 #~ msgstr "グループチャットへの招待を受けました"
 
-#~ msgid "Do you want to accept the invitation?"
-#~ msgstr "招待に応じますか ?"
-
 #~ msgid ""
 #~ "<b>Issued to:</b>\n"
 #~ "Common Name (CN): %(scn)s\n"
@@ -11440,9 +12384,6 @@ msgstr "プラグイン管理"
 #~ msgid "Do you wish to delete all correspondence with the selected contacts?"
 #~ msgstr "本当に、選択した相手先の記録を削除しますか ?"
 
-#~ msgid "This can not be undone."
-#~ msgstr "元に戻すことができません。"
-
 #~ msgid "<b>What do you want to do?</b>"
 #~ msgstr "<b>あなたがやりたいことは ?</b>"
 
@@ -11631,9 +12572,6 @@ msgstr "プラグイン管理"
 #~ msgid "Nick"
 #~ msgstr "ニックネーム"
 
-#~ msgid "Banning…"
-#~ msgstr "締め出し中…"
-
 #~ msgid ""
 #~ "<b>Whom do you want to ban?</b>\n"
 #~ "\n"
@@ -11717,11 +12655,6 @@ msgstr "プラグイン管理"
 #~ msgid "Filter:"
 #~ msgstr "フィルター:"
 
-#~ msgid ""
-#~ "If checked, Gajim will display the mood of contacts in the roster window"
-#~ msgstr ""
-#~ "チェックをつけると、Gajim は名簿ウィンドウに相手先の気分を表示します"
-
 #, fuzzy
 #~ msgid "Spell _checker"
 #~ msgstr "スペルチェッカー"
@@ -12035,10 +12968,6 @@ msgstr "プラグイン管理"
 #~ msgstr "状況メッセージ (_S):"
 
 #, fuzzy
-#~ msgid "Group chat highlight"
-#~ msgstr "グループチャットのメッセージの強調:"
-
-#, fuzzy
 #~ msgid "Your nickname"
 #~ msgstr "あなたのニックネーム:"
 
@@ -12182,9 +13111,6 @@ msgstr "プラグイン管理"
 #~ msgid "The passwords typed in both fields must be identical."
 #~ msgstr "ふたつの欄のパスワードは同じにしてください。"
 
-#~ msgid "Enter new password:"
-#~ msgstr "新しいパスワードを入力してください:"
-
 #~ msgid "Enter it again for confirmation:"
 #~ msgstr "確認のためもう一度入力してください:"
 
@@ -12200,9 +13126,6 @@ msgstr "プラグイン管理"
 #~ msgid "unsubscribe request from %s"
 #~ msgstr "%s から継読中止の要求"
 
-#~ msgid "Autojoin"
-#~ msgstr "自動参加"
-
 #~ msgid "&lt;empty&gt;"
 #~ msgstr "&lt;空&gt;"
 
@@ -12308,9 +13231,6 @@ msgstr "プラグイン管理"
 #~ msgid "Forward unread message then disconnect"
 #~ msgstr "未読メッセージを転送してから切断"
 
-#~ msgid "AIM Address:"
-#~ msgstr "AIM アドレス:"
-
 #~ msgid "MSN Address:"
 #~ msgstr "MSN アドレス:"
 
@@ -12358,9 +13278,6 @@ msgstr "プラグイン管理"
 #~ msgid "Session negotiation cancelled"
 #~ msgstr "セッションの確立を中止しました"
 
-#~ msgid "This session WILL be archived on server"
-#~ msgstr "セッションはサーバーに記録されます"
-
 #~ msgid "This session WILL NOT be archived on server"
 #~ msgstr "セッションはサーバーに記録されません"
 
@@ -12739,9 +13656,6 @@ msgstr "プラグイン管理"
 #~ msgid "Server:"
 #~ msgstr "サーバー:"
 
-#~ msgid "Password:"
-#~ msgstr "パスワード:"
-
 #~ msgid "Join this room _automatically when I connect"
 #~ msgstr "接続時に自動的にこの談話室に参加する (_A)"
 
@@ -13091,9 +14005,6 @@ msgstr "プラグイン管理"
 #~ msgid "_Edit Personal Information..."
 #~ msgstr "個人情報を編集する...(_E)"
 
-#~ msgid "Information about you, as stored in the server"
-#~ msgstr "サーバに格納する、あなたに関する情報です"
-
 #~ msgid "<b>Personal Information</b>"
 #~ msgstr "<b>個人情報</b>"
 
@@ -13171,9 +14082,6 @@ msgstr "プラグイン管理"
 #~ msgid "Your server can't save your personal information."
 #~ msgstr "このサーバーは個人情報を保持できません。"
 
-#~ msgid "Account Local already exists."
-#~ msgstr "アカウント Local は既に存在しています。"
-
 #~ msgid "Please rename or remove it before enabling link-local messaging."
 #~ msgstr ""
 #~ "ローカルの伝送を有効にするには、名前の変更または削除を行ってください。"
@@ -13403,10 +14311,6 @@ msgstr "プラグイン管理"
 #~ msgid "Contact's identity verified"
 #~ msgstr "相手先の同一性を確認しました"
 
-#, fuzzy
-#~ msgid "Verify again…"
-#~ msgstr "再検証中..."
-
 #~ msgid ""
 #~ "To be certain that <b>only</b> the expected person can read your messages "
 #~ "or send you messages, you need to verify their identity by clicking the "
@@ -13531,9 +14435,6 @@ msgstr "プラグイン管理"
 #~ msgid "Add _Contact..."
 #~ msgstr "相手先リストに追加...(_C)"
 
-#~ msgid "_Accounts"
-#~ msgstr "アカウント (_A)"
-
 #~ msgid "P_lugins"
 #~ msgstr "プラグイン (_L)"
 
diff --git a/po/kk.po b/po/kk.po
index 8240de254..1a1d1a68a 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: 2019-07-02 02:06+0000\n"
+"POT-Creation-Date: 2019-08-11 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,71 +19,71 @@ msgstr ""
 "X-Poedit-Language: Kazakh\n"
 "X-Poedit-Country: KAZAKHSTAN\n"
 
-#: gajim/chat_control_base.py:550
+#: gajim/chat_control_base.py:557
 msgid "_Undo"
 msgstr ""
 
-#: gajim/chat_control_base.py:558 gajim/conversation_textview.py:529
+#: gajim/chat_control_base.py:565 gajim/conversation_textview.py:529
 msgid "_Clear"
 msgstr ""
 
-#: gajim/chat_control_base.py:563
+#: gajim/chat_control_base.py:570
 msgid "Paste as quote"
 msgstr ""
 
-#: gajim/chat_control_base.py:613
+#: gajim/chat_control_base.py:620
 #, fuzzy
 msgid "Paste Image"
 msgstr "Суретті таңдау"
 
-#: gajim/chat_control_base.py:614
+#: gajim/chat_control_base.py:621
 #, fuzzy
 msgid "You are trying to paste an image"
 msgstr "Сіз бірнеше чатты жабуды таңдадыңыз"
 
-#: gajim/chat_control_base.py:615
+#: gajim/chat_control_base.py:622
 #, fuzzy
 msgid ""
 "Are you sure you want to paste your clipboard's image into the chat window?"
 msgstr "\"%s\" топ чатынан шығуды шынымен қалайсыз ба?"
 
-#: gajim/chat_control_base.py:617 gajim/groupchat_control.py:2310
-#: gajim/roster_window.py:2848 gajim/roster_window.py:4167
-#: gajim/message_window.py:252 gajim/gtk/dialogs.py:418
+#: gajim/chat_control_base.py:624 gajim/groupchat_control.py:2218
+#: gajim/roster_window.py:2841 gajim/roster_window.py:4118
+#: gajim/message_window.py:359 gajim/gtk/dialogs.py:330
 msgid "_Do not ask me again"
 msgstr "М_ені қайта сұрамау"
 
-#: gajim/chat_control_base.py:620
+#: gajim/chat_control_base.py:627
 msgid "_Paste"
 msgstr ""
 
-#: gajim/chat_control_base.py:1162 gajim/gtk/accounts.py:351
+#: gajim/chat_control_base.py:1169 gajim/gtk/accounts.py:354
 #, fuzzy
 msgid "Privacy"
 msgstr "Жекелік тізімі"
 
-#: gajim/chat_control_base.py:1163
+#: gajim/chat_control_base.py:1170
 #, fuzzy
 msgid "Warning"
 msgstr "%s банға жіберу"
 
-#: gajim/chat_control_base.py:1164
+#: gajim/chat_control_base.py:1171
 #, fuzzy, python-format
 msgid "If you send a file to <b>%s</b>, your real JID will be revealed."
 msgstr ""
 "Егер сіз файлды %s-қа жіберсеңіз, ол сіздің шын Jabber ID-ді білетін болады."
 
-#: gajim/chat_control_base.py:1169
+#: gajim/chat_control_base.py:1176
 #, fuzzy
 msgid "Continue"
 msgstr "Жалға_стыру"
 
-#: gajim/gtkgui_helpers.py:163 gajim/gtk/filetransfer.py:393
+#: gajim/gtkgui_helpers.py:163 gajim/gtk/filetransfer.py:398
 #, fuzzy, python-format
 msgid "Cannot overwrite existing file '%s'"
 msgstr "Бар файлды \"%s\" үстінен жазу мүмкін емес"
 
-#: gajim/gtkgui_helpers.py:164 gajim/gtk/filetransfer.py:394
+#: gajim/gtkgui_helpers.py:164 gajim/gtk/filetransfer.py:399
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
@@ -172,388 +172,396 @@ msgstr "Кезекте жазылуға сұранымдар жоқ."
 msgid " resource with priority "
 msgstr " ресурс приоритеті"
 
-#: gajim/gui_menu_builder.py:96
-msgid "_New Group Chat"
-msgstr "_Жаңа чат бөлмесі"
+#: gajim/gui_menu_builder.py:251 gajim/gui_menu_builder.py:342
+#: gajim/chat_control.py:305 gajim/roster_window.py:783
+#: gajim/roster_window.py:1716 gajim/roster_window.py:1718
+#: gajim/roster_window.py:2027 gajim/roster_window.py:3292
+#: gajim/roster_window.py:3325 gajim/gui_interface.py:396
+#: gajim/common/contacts.py:222 gajim/common/contacts.py:359
+#: gajim/common/contacts.py:471 gajim/common/helpers.py:86
+#: gajim/common/helpers.py:317 gajim/gtk/add_contact.py:319
+#: gajim/gtk/subscription_request.py:70 gajim/gtk/subscription_request.py:99
+#: gajim/gtk/roster_item_exchange.py:112
+#, fuzzy
+msgid "Not in contact list"
+msgstr "Желіде _еместерді көрсету"
 
-#: gajim/gui_menu_builder.py:289 gajim/gui_menu_builder.py:380
-#: gajim/chat_control.py:303 gajim/roster_window.py:786
-#: gajim/roster_window.py:1719 gajim/roster_window.py:1721
-#: gajim/roster_window.py:2030 gajim/roster_window.py:3336
-#: gajim/roster_window.py:3369 gajim/gui_interface.py:413
-#: gajim/common/contacts.py:206 gajim/common/contacts.py:343
-#: gajim/common/helpers.py:83 gajim/common/helpers.py:311
-#: gajim/gtk/add_contact.py:319 gajim/gtk/subscription_request.py:70
-#: gajim/gtk/subscription_request.py:99 gajim/gtk/roster_item_exchange.py:112
-msgid "Not in Roster"
-msgstr "Ростерде емес"
-
-#: gajim/gui_menu_builder.py:393
-msgid "I would like to add you to my roster"
-msgstr "Мен өз ростеріме сізді қосқым келеді"
+#: gajim/gui_menu_builder.py:355
+#, fuzzy
+msgid "I would like to add you to my contact list"
+msgstr "Мен сізді өзімнің контакттар тізіміне қосқым келеді."
 
-#: gajim/gui_menu_builder.py:471
+#: gajim/gui_menu_builder.py:433
 #, fuzzy
 msgid "Send Single _Message…"
 msgstr "Бі_р хабарламаны жіберу..."
 
-#: gajim/gui_menu_builder.py:486
+#: gajim/gui_menu_builder.py:448
 #, fuzzy
 msgid "E_xecute Command…"
 msgstr "К_оманда орындау"
 
-#: gajim/gui_menu_builder.py:494
+#: gajim/gui_menu_builder.py:456
 msgid "_Manage Transport"
 msgstr "_Транспортты басқару"
 
-#: gajim/gui_menu_builder.py:500
+#: gajim/gui_menu_builder.py:462
 msgid "_Modify Transport"
 msgstr "Тр_анспортты басқару"
 
-#: gajim/gui_menu_builder.py:507 gajim/roster_window.py:5046
+#: gajim/gui_menu_builder.py:469 gajim/roster_window.py:4985
 #, fuzzy
 msgid "_Rename…"
 msgstr "Атын ауысты_ру"
 
-#: gajim/gui_menu_builder.py:518 gajim/roster_window.py:5062
-#: gajim/roster_window.py:5177 gajim/data/gui/blocked_contacts_window.ui:52
+#: gajim/gui_menu_builder.py:480 gajim/roster_window.py:5001
+#: gajim/roster_window.py:5116 gajim/data/gui/blocked_contacts_window.ui:52
 #: gajim/data/gui/gc_occupants_menu.ui:148
 #: gajim/data/gui/contact_context_menu.ui:143
 msgid "_Unblock"
 msgstr "Б_локтамау"
 
-#: gajim/gui_menu_builder.py:521 gajim/roster_window.py:5067
-#: gajim/roster_window.py:5181 gajim/data/gui/gc_occupants_menu.ui:140
+#: gajim/gui_menu_builder.py:483 gajim/roster_window.py:5006
+#: gajim/roster_window.py:5120 gajim/data/gui/gc_occupants_menu.ui:140
 #: gajim/data/gui/contact_context_menu.ui:151
 msgid "_Block"
 msgstr "_Блоктау"
 
-#: gajim/gui_menu_builder.py:529 gajim/roster_window.py:5074
+#: gajim/gui_menu_builder.py:491 gajim/roster_window.py:5013
 #: gajim/data/gui/contact_context_menu.ui:181
 msgid "Remo_ve"
 msgstr "Ө_шіру"
 
-#: gajim/gui_menu_builder.py:539 gajim/data/gui/contact_context_menu.ui:198
+#: gajim/gui_menu_builder.py:501 gajim/data/gui/contact_context_menu.ui:198
 msgid "_Information"
 msgstr "_Ақпараты"
 
-#: gajim/gui_menu_builder.py:552
+#: gajim/gui_menu_builder.py:514
 #, fuzzy
 msgid "Save _As"
 msgstr "Бар "
 
-#: gajim/gui_menu_builder.py:564 gajim/groupchat_control.py:501
-#: gajim/chat_control.py:340
+#: gajim/gui_menu_builder.py:526 gajim/groupchat_control.py:507
+#: gajim/chat_control.py:342
 #, fuzzy
 msgid "Send File…"
 msgstr "_Файлды жіберу"
 
-#: gajim/gui_menu_builder.py:565
+#: gajim/gui_menu_builder.py:527
 #, fuzzy
 msgid "Upload File…"
 msgstr "Файлды қалайша сақтау..."
 
-#: gajim/gui_menu_builder.py:566
+#: gajim/gui_menu_builder.py:528
 #, fuzzy
 msgid "Send File Directly…"
 msgstr "Файлды қалайша сақтау..."
 
-#: gajim/gui_menu_builder.py:568 gajim/gui_menu_builder.py:632
+#: gajim/gui_menu_builder.py:530 gajim/gui_menu_builder.py:596
 #, fuzzy
 msgid "Send Chatstate"
 msgstr "Соңғы қалып-күйі: %s"
 
-#: gajim/gui_menu_builder.py:569
+#: gajim/gui_menu_builder.py:531
 #, fuzzy
 msgid "Invite Contacts"
 msgstr "Контакттарды _шақыру"
 
-#: gajim/gui_menu_builder.py:570
+#: gajim/gui_menu_builder.py:532
 #, fuzzy
-msgid "Add to Roster"
-msgstr "Р_остерге қосу"
+msgid "Add to Contact List"
+msgstr "_Контакт қосу..."
 
-#: gajim/gui_menu_builder.py:571
+#: gajim/gui_menu_builder.py:533
 #, fuzzy
-msgid "Audio Session"
-msgstr "Аудио сынау"
+msgid "Voice Chat"
+msgstr "Дауыс чатына сұраным"
 
-#: gajim/gui_menu_builder.py:572
+#: gajim/gui_menu_builder.py:534
 #, fuzzy
-msgid "Video Session"
+msgid "Video Chat"
 msgstr "Видео сынау"
 
-#: gajim/gui_menu_builder.py:573
+#: gajim/gui_menu_builder.py:535 gajim/gui_menu_builder.py:582
 #, fuzzy
 msgid "Information"
 msgstr "_Ақпараты"
 
-#: gajim/gui_menu_builder.py:574 gajim/gui_menu_builder.py:639
+#: gajim/gui_menu_builder.py:536 gajim/gui_menu_builder.py:602
 #: gajim/data/gui/application_menu.ui:37
 #, fuzzy
 msgid "History"
 msgstr "Тар_ихы"
 
-#: gajim/gui_menu_builder.py:580 gajim/gui_menu_builder.py:687
+#: gajim/gui_menu_builder.py:542 gajim/gui_menu_builder.py:650
 #: gajim/data/gui/preferences_window.ui:1823
 msgid "Disabled"
 msgstr "Сөндірулі"
 
-#: gajim/gui_menu_builder.py:581 gajim/gui_menu_builder.py:688
+#: gajim/gui_menu_builder.py:543 gajim/gui_menu_builder.py:651
 msgid "Composing only"
 msgstr "Тек жазу"
 
-#: gajim/gui_menu_builder.py:582 gajim/gui_menu_builder.py:689
+#: gajim/gui_menu_builder.py:544 gajim/gui_menu_builder.py:652
 msgid "All chat states"
 msgstr "Барлық чат күйлері"
 
-#: gajim/gui_menu_builder.py:620
+#: gajim/gui_menu_builder.py:583
 #, fuzzy
-msgid "Manage Room"
-msgstr "_Бөлмені басқару"
+msgid "Manage Group Chat"
+msgstr "Топ чаттардан шығу"
 
-#: gajim/gui_menu_builder.py:621
+#: gajim/gui_menu_builder.py:584 gajim/data/gui/groupchat_control.ui:649
 #, fuzzy
 msgid "Change Subject"
 msgstr "_Тақырыпты өзгерту..."
 
-#: gajim/gui_menu_builder.py:622
+#: gajim/gui_menu_builder.py:585
 #, fuzzy
-msgid "Configure Room"
-msgstr "_Бөлмені баптау..."
+msgid "Configure Group Chat"
+msgstr "Топ чаттардан шығу"
 
-#: gajim/gui_menu_builder.py:623
+#: gajim/gui_menu_builder.py:586
 #, fuzzy
 msgid "Upload Avatar…"
 msgstr "Архивті таңдаңыз"
 
-#: gajim/gui_menu_builder.py:624
+#: gajim/gui_menu_builder.py:587
 #, fuzzy
-msgid "Destroy Room"
-msgstr "Бөлме_ні жою"
+msgid "Destroy Group Chat"
+msgstr "Жаңа чат бөлмесі"
 
-#: gajim/gui_menu_builder.py:626 gajim/data/gui/preferences_window.ui:790
+#: gajim/gui_menu_builder.py:589 gajim/data/gui/preferences_window.ui:790
 #, fuzzy
 msgid "Chat Settings"
 msgstr "Плагиндер"
 
-#: gajim/gui_menu_builder.py:627
+#: gajim/gui_menu_builder.py:590
 msgid "Show join/leave"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:628
+#: gajim/gui_menu_builder.py:591
 #, fuzzy
 msgid "Show status changes"
 msgstr "К_онтакттардың күй өзгерісін тарихқа жазу"
 
-#: gajim/gui_menu_builder.py:629 gajim/data/gui/gc_control_popup_menu.ui:72
+#: gajim/gui_menu_builder.py:592 gajim/data/gui/gc_control_popup_menu.ui:72
 #, fuzzy
 msgid "Notify on all messages"
 msgstr "Орнатылған хабарламалар:"
 
-#: gajim/gui_menu_builder.py:630
+#: gajim/gui_menu_builder.py:593
 #, fuzzy
 msgid "Minimize on close"
 msgstr "_Жабылғанда, ростерге орналастыру"
 
-#: gajim/gui_menu_builder.py:631
+#: gajim/gui_menu_builder.py:595
 #, fuzzy
-msgid "Minimize on autojoin"
+msgid "Minimize when joining automatically"
 msgstr "Авто кір_генде қайыру"
 
-#: gajim/gui_menu_builder.py:634
+#: gajim/gui_menu_builder.py:598
 msgid "Sync Threshold"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:635
+#: gajim/gui_menu_builder.py:599
 #, fuzzy
-msgid "Change Nick"
+msgid "Change Nickname"
 msgstr "_Никті өзгерту..."
 
-#: gajim/gui_menu_builder.py:636
-#, fuzzy
-msgid "Bookmark Room"
-msgstr "_Бөлмені бетбелгілерге қосу"
-
-#: gajim/gui_menu_builder.py:637
+#: gajim/gui_menu_builder.py:600
 #, fuzzy
 msgid "Request Voice"
 msgstr "_Даусы бар"
 
-#: gajim/gui_menu_builder.py:638 gajim/roster_window.py:5246
+#: gajim/gui_menu_builder.py:601 gajim/roster_window.py:5185
 #, fuzzy
 msgid "Execute command"
 msgstr "К_оманда орындау"
 
-#: gajim/gui_menu_builder.py:640
-#, fuzzy
-msgid "Disconnect"
-msgstr "Ба_йланысты үзу"
+#: gajim/gui_menu_builder.py:603
+msgid "Leave"
+msgstr ""
 
-#: gajim/gui_menu_builder.py:678 gajim/gtk/preferences.py:156
+#: gajim/gui_menu_builder.py:641 gajim/gtk/preferences.py:155
 msgid "No threshold"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:680 gajim/gtk/preferences.py:158
+#: gajim/gui_menu_builder.py:643 gajim/gtk/preferences.py:157
 #, fuzzy, python-format
 msgid "%i day"
 msgid_plural "%i days"
 msgstr[0] "%i күн бұрын"
 msgstr[1] "%i күн бұрын"
 
-#: gajim/gui_menu_builder.py:709 gajim/gui_menu_builder.py:747
-#: gajim/gtk/join_groupchat.py:43
-msgid "Join Group Chat"
-msgstr "Бөлмеге кіру"
-
-#: gajim/gui_menu_builder.py:746
+#: gajim/gui_menu_builder.py:672
 #, fuzzy
 msgid "Add Contact…"
 msgstr "_Контакт қосу..."
 
-#: gajim/gui_menu_builder.py:748 gajim/gtk/profile.py:52
-#: gajim/gtk/accounts.py:770 gajim/gtk/accounts.py:808
+#: gajim/gui_menu_builder.py:673 gajim/gtk/profile.py:52
+#: gajim/gtk/accounts.py:773 gajim/gtk/accounts.py:811
 #, fuzzy
 msgid "Profile"
 msgstr "файл"
 
-#: gajim/gui_menu_builder.py:749
+#: gajim/gui_menu_builder.py:674
+#, fuzzy
+msgid "Send Single Message…"
+msgstr "Бі_р хабарламаны жіберу..."
+
+#: gajim/gui_menu_builder.py:675
 #, fuzzy
 msgid "Discover Services"
 msgstr "Қы_зметтерді қарап шығу"
 
-#: gajim/gui_menu_builder.py:750
+#: gajim/gui_menu_builder.py:676 gajim/gtk/server_info.py:36
 #, fuzzy
-msgid "Send Single Message…"
-msgstr "Бі_р хабарламаны жіберу..."
+msgid "Server Info"
+msgstr "Сервер"
 
-#: gajim/gui_menu_builder.py:751 gajim/data/gui/preferences_window.ui:2741
+#: gajim/gui_menu_builder.py:677 gajim/data/gui/preferences_window.ui:2741
 msgid "Advanced"
 msgstr "Кеңейтілген"
 
-#: gajim/gui_menu_builder.py:752 gajim/gtk/mam_preferences.py:88
+#: gajim/gui_menu_builder.py:678 gajim/gtk/mam_preferences.py:88
 #, fuzzy
 msgid "Archiving Preferences"
 msgstr "Архивтеу ба_птауларын түзету"
 
-#: gajim/gui_menu_builder.py:753
+#: gajim/gui_menu_builder.py:679
 #, fuzzy
 msgid "Blocking List"
 msgstr "Блок тізім"
 
-#: gajim/gui_menu_builder.py:754 gajim/gtk/history_sync.py:108
+#: gajim/gui_menu_builder.py:680
+#, fuzzy
+msgid "Bookmarks"
+msgstr "_Бетбелгі"
+
+#: gajim/gui_menu_builder.py:681
+#, fuzzy
+msgid "PEP Configuration"
+msgstr "Баптаулар"
+
+#: gajim/gui_menu_builder.py:682 gajim/gtk/history_sync.py:108
 #: gajim/gtk/history_sync.py:186
 #, fuzzy
 msgid "Synchronise History"
 msgstr "Синхрондау"
 
-#: gajim/gui_menu_builder.py:755 gajim/gtk/privacy_list.py:427
+#: gajim/gui_menu_builder.py:683 gajim/gtk/privacy_list.py:427
 msgid "Privacy Lists"
 msgstr "Жекелік тізімдер"
 
-#: gajim/gui_menu_builder.py:756 gajim/gtk/server_info.py:36
-#, fuzzy
-msgid "Server Info"
-msgstr "Сервер"
-
-#: gajim/gui_menu_builder.py:757 gajim/gui_menu_builder.py:768
+#: gajim/gui_menu_builder.py:685 gajim/gui_menu_builder.py:696
 #: gajim/data/gui/xml_console_window.ui:77
 msgid "XML Console"
 msgstr "XML консолі"
 
-#: gajim/gui_menu_builder.py:759 gajim/data/gui/groupchat_config.ui:36
+#: gajim/gui_menu_builder.py:687 gajim/data/gui/groupchat_config.ui:36
 #, fuzzy
 msgid "Admin"
 msgstr "Ә_кімші"
 
-#: gajim/gui_menu_builder.py:760
+#: gajim/gui_menu_builder.py:688
 #, fuzzy
 msgid "Send Server Message…"
 msgstr "_Сервер хабарламасын жіберу..."
 
-#: gajim/gui_menu_builder.py:761
+#: gajim/gui_menu_builder.py:689
 #, fuzzy
 msgid "Set MOTD…"
 msgstr "MOTD орнату..."
 
-#: gajim/gui_menu_builder.py:762
+#: gajim/gui_menu_builder.py:690
 #, fuzzy
 msgid "Update MOTD…"
 msgstr "MOTD жаңарту..."
 
-#: gajim/gui_menu_builder.py:763
+#: gajim/gui_menu_builder.py:691
 #, fuzzy
 msgid "Delete MOTD…"
 msgstr "MOTD өшіру"
 
-#: gajim/gui_menu_builder.py:812
+#: gajim/gui_menu_builder.py:736
 #, fuzzy
-msgid "No Accounts available"
-msgstr "Бірде-бір тіркелгі қолжетерсіз"
+msgid "_Add Account…"
+msgstr "_Контакт қосу..."
+
+#: gajim/gui_menu_builder.py:742
+#, fuzzy
+msgid "_Modify Accounts…"
+msgstr "Тіркелгіні тү_зету"
 
-#: gajim/gui_menu_builder.py:823 gajim/data/gui/application_menu.ui:5
-#: gajim/data/gui/application_menu.ui:71 gajim/data/gui/shortcuts_window.ui:182
-#: gajim/gtk/accounts.py:58
+#: gajim/gui_menu_builder.py:751 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:755 gajim/data/gui/application_menu.ui:5
+#: gajim/data/gui/shortcuts_window.ui:182 gajim/gtk/accounts.py:57
 msgid "Accounts"
 msgstr "Тіркелгілер"
 
-#: gajim/gui_menu_builder.py:881 gajim/gui_menu_builder.py:886
+#: gajim/gui_menu_builder.py:784 gajim/gui_menu_builder.py:789
 #, fuzzy
-msgid "Copy JID"
-msgstr "Бөлме JID-і"
+msgid "Copy XMPP Address"
+msgstr "JID/Email _адресін көшіру"
 
-#: gajim/gui_menu_builder.py:882 gajim/gui_menu_builder.py:914
+#: gajim/gui_menu_builder.py:785 gajim/gui_menu_builder.py:817
 #, fuzzy
 msgid "Join Groupchat"
 msgstr "Бөлмеге кіру"
 
-#: gajim/gui_menu_builder.py:887 gajim/gui_menu_builder.py:913
-#: gajim/data/gui/application_menu.ui:76
+#: gajim/gui_menu_builder.py:790 gajim/gui_menu_builder.py:816
+#: gajim/data/gui/application_menu.ui:71
 #: gajim/data/gui/subscription_request_window.ui:106
 msgid "Start Chat"
 msgstr "Чатты бастау"
 
-#: gajim/gui_menu_builder.py:888 gajim/gui_menu_builder.py:915
+#: gajim/gui_menu_builder.py:791 gajim/gui_menu_builder.py:818
 #, fuzzy
-msgid "Add to Roster…"
-msgstr "Р_остерге қосу"
+msgid "Add to Contact List…"
+msgstr "_Контакт қосу..."
 
-#: gajim/gui_menu_builder.py:893
+#: gajim/gui_menu_builder.py:796
 #, fuzzy
 msgid "Copy Link Location"
 msgstr "_Сілтеме адресін көшіру"
 
-#: gajim/gui_menu_builder.py:894
+#: gajim/gui_menu_builder.py:797
 #, fuzzy
 msgid "Open Link in Browser"
 msgstr "Сіл_темені браузерде ашу"
 
-#: gajim/gui_menu_builder.py:899
+#: gajim/gui_menu_builder.py:802
 #, fuzzy
 msgid "Copy Email Address"
 msgstr "JID/Email _адресін көшіру"
 
-#: gajim/gui_menu_builder.py:900 gajim/gui_menu_builder.py:912
+#: gajim/gui_menu_builder.py:803 gajim/gui_menu_builder.py:815
 #, fuzzy
 msgid "Open Email Composer"
 msgstr "Email қ_олданбасын ашу"
 
-#: gajim/gui_menu_builder.py:905
+#: gajim/gui_menu_builder.py:808
 #, fuzzy
 msgid "Copy Location"
 msgstr "_Сілтеме адресін көшіру"
 
-#: gajim/gui_menu_builder.py:906
+#: gajim/gui_menu_builder.py:809
 #, fuzzy
 msgid "Show Location"
 msgstr "Орналасуы: %s"
 
-#: gajim/gui_menu_builder.py:911
+#: gajim/gui_menu_builder.py:814
 #, fuzzy
-msgid "Copy JID/Email"
+msgid "Copy XMPP Address/Email"
 msgstr "JID/Email _адресін көшіру"
 
-#: gajim/gui_menu_builder.py:945
+#: gajim/gui_menu_builder.py:852
 #, fuzzy
 msgid "Copy"
 msgstr "Бөлме JID-і"
@@ -576,44 +584,56 @@ msgstr ""
 msgid "Choose folder for logfile"
 msgstr ""
 
-#: gajim/history_manager.py:107
+#: gajim/history_manager.py:106
 msgid "Cannot find history logs database"
 msgstr "Тарих логтар дерекқоры табылмады"
 
-#: gajim/history_manager.py:108
+#: gajim/history_manager.py:107
 #, fuzzy, python-format
 msgid "%s does not exist."
 msgstr "Файл жоқ"
 
-#: gajim/history_manager.py:141 gajim/history_manager.py:195
-#: gajim/gtk/discovery.py:829 gajim/gtk/roster_item_exchange.py:80
-msgid "JID"
-msgstr "JID"
+#: gajim/history_manager.py:140 gajim/history_manager.py:194
+#: 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:30
+#: gajim/gtk/accounts.py:804
+#, fuzzy
+msgid "XMPP Address"
+msgstr "AIM адресі:"
 
-#: gajim/history_manager.py:154 gajim/history_manager.py:202
+#: gajim/history_manager.py:153 gajim/history_manager.py:201
 #: gajim/data/gui/history_window.ui:89 gajim/gtk/history.py:108
 msgid "Date"
 msgstr "Уақыты"
 
-#: gajim/history_manager.py:161 gajim/history_manager.py:225
+#: gajim/history_manager.py:160 gajim/history_manager.py:224
 #: gajim/data/gui/join_groupchat_window.ui:208
 #: gajim/data/gui/profile_window.ui:214
 #: gajim/data/gui/vcard_information_window.ui:443
+#: gajim/data/gui/bookmarks.ui:140
 msgid "Nickname"
 msgstr "Ник аты"
 
-#: gajim/history_manager.py:172 gajim/history_manager.py:211
+#: gajim/history_manager.py:171 gajim/history_manager.py:210
 #: gajim/data/gui/preferences_window.ui:1344
 #: gajim/data/gui/single_message_window.ui:275 gajim/gtk/history.py:117
 msgid "Message"
 msgstr "Хабарлама"
 
-#: gajim/history_manager.py:180 gajim/history_manager.py:218
+#: gajim/history_manager.py:179 gajim/history_manager.py:217
 #: gajim/data/gui/groups_post_window.ui:49
 #: gajim/data/gui/single_message_window.ui:214
 msgid "Subject"
 msgstr "Тақырып"
 
+#: gajim/history_manager.py:247
+#, fuzzy
+msgid "Database Cleanup"
+msgstr "Дерекқор қатесі"
+
 #: gajim/history_manager.py:248
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
@@ -625,11 +645,8 @@ msgstr ""
 #: gajim/history_manager.py:250
 #, fuzzy
 msgid ""
-"Normally allocated database size will not be freed, it will just become "
-"reusable. If you really want to reduce database filesize, click YES, else "
-"click NO.\n"
-"\n"
-"In case you click YES, please wait…"
+"Normally, the allocated database size will not be freed, it will just become "
+"reusable. This operation may take a while."
 msgstr ""
 "Қалыпты бөлінген дерекқор өлшемі азаймайды, оны қайта қолдануға болады. "
 "Дерекқор өлшемін шынымен азайтсам десеңіз, ИӘ шертіңіз, олай болмаса, ЖОҚ "
@@ -638,47 +655,47 @@ msgstr ""
 
 #: gajim/history_manager.py:255
 #, fuzzy
-msgid "Database Cleanup"
-msgstr "Дерекқор қатесі"
+msgid "_Cleanup"
+msgstr "Тазарт_у"
 
-#: gajim/history_manager.py:519 gajim/gtk/filetransfer.py:238
-#: gajim/gtk/filetransfer.py:248
+#: gajim/history_manager.py:518 gajim/gtk/filetransfer.py:237
+#: gajim/gtk/filetransfer.py:247
 msgid "You"
 msgstr "Сіз"
 
-#: gajim/history_manager.py:531
+#: gajim/history_manager.py:530
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(time)s уақытында %(who)s айтқан: %(message)s\n"
 
-#: gajim/history_manager.py:568 gajim/history_manager.py:607
-#: gajim/gtk/dialogs.py:58 gajim/gtk/themes.py:319
+#: gajim/history_manager.py:567 gajim/history_manager.py:606
+#: gajim/gtk/dialogs.py:57 gajim/gtk/themes.py:319
 #: gajim/gtk/roster_item_exchange.py:75 gajim/gtk/roster_item_exchange.py:185
 msgid "Delete"
 msgstr "Өшіру"
 
-#: gajim/history_manager.py:569
+#: gajim/history_manager.py:568
 #, fuzzy
 msgid "Delete Conversation"
 msgid_plural "Delete Conversations"
 msgstr[0] "Растауды тайдыру"
 msgstr[1] "Растауды тайдыру"
 
-#: gajim/history_manager.py:570
+#: gajim/history_manager.py:569
 #, 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:608
+#: gajim/history_manager.py:607
 #, fuzzy
 msgid "Delete Message"
 msgid_plural "Delete Messages"
 msgstr[0] "Хабарлама"
 msgstr[1] "Хабарлама"
 
-#: gajim/history_manager.py:609
+#: gajim/history_manager.py:608
 #, fuzzy
 msgid "Do you want to permanently delete this message"
 msgid_plural "Do you want to permanently delete these messages"
@@ -691,15 +708,15 @@ msgid "Contact name: <i>%s</i>"
 msgstr "Контакт аты: <i>%s</i>"
 
 #: gajim/dialogs.py:84
-#, fuzzy, python-format
-msgid "JID: <i>%s</i>"
-msgstr "Jabber ID: <i>%s</i>"
+#, python-format
+msgid "XMPP Address: <i>%s</i>"
+msgstr ""
 
-#: gajim/dialogs.py:115 gajim/dialogs.py:128 gajim/roster_window.py:2901
-#: gajim/roster_window.py:3833 gajim/roster_window.py:5084
-#: gajim/common/contacts.py:157 gajim/common/contacts.py:190
+#: gajim/dialogs.py:115 gajim/dialogs.py:128 gajim/roster_window.py:2894
+#: gajim/roster_window.py:3784 gajim/roster_window.py:5023
+#: gajim/common/contacts.py:157 gajim/common/contacts.py:206
 #: gajim/data/gui/preferences_window.ui:558
-#: gajim/data/gui/shortcuts_window.ui:177 gajim/gtk/accounts.py:349
+#: gajim/data/gui/shortcuts_window.ui:177 gajim/gtk/accounts.py:352
 msgid "General"
 msgstr "Жалпы"
 
@@ -746,7 +763,7 @@ msgid "Preset name is already in use. Do you want to overwrite this preset?"
 msgstr ""
 "Бұл атау қолдануда. Бұл қалып-күй хабарламасын алмастыруды қалайсыз ба?"
 
-#: gajim/dialogs.py:703
+#: gajim/dialogs.py:703 gajim/plugins/gui.py:292
 #, fuzzy
 msgid "_Overwrite"
 msgstr "Үстінен жазу керек пе?"
@@ -759,9 +776,7 @@ msgstr "Орнатылған хабарлама ретінде сақтау"
 msgid "Please type a name for this status message"
 msgstr " Бұл қалып-күй хабарламасы үшін атын енгізіңіз"
 
-#: gajim/dialogs.py:740 gajim/gui_interface.py:1441 gajim/dialog_messages.py:31
-#: gajim/gtk/discovery.py:518 gajim/gtk/profile.py:323
-#: gajim/gtk/join_groupchat.py:234
+#: gajim/dialogs.py:740 gajim/gtk/discovery.py:517 gajim/gtk/profile.py:323
 msgid "You are not connected to the server"
 msgstr "Сервермен байланысты орнатқан жоқсыз"
 
@@ -769,9 +784,11 @@ msgstr "Сервермен байланысты орнатқан жоқсыз"
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Байланыс орнатылмаса, контакттарды синхрондай алмайсыз."
 
-#: gajim/dialogs.py:752 gajim/dialogs.py:823 gajim/gtk/discovery.py:822
-#: gajim/gtk/discovery.py:1648 gajim/gtk/discovery.py:1941
-#: gajim/gtk/history.py:99 gajim/gtk/roster_item_exchange.py:83
+#: gajim/dialogs.py:752 gajim/dialogs.py:823
+#: gajim/data/gui/groupchat_info_scrolled.ui:16 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/gtk/roster_item_exchange.py:83
 msgid "Name"
 msgstr "Аты"
 
@@ -791,400 +808,347 @@ msgstr "Байланыспаған тіркелгімен синхрондай �
 msgid "Synchronise"
 msgstr "Синхрондау"
 
-#: gajim/dialogs.py:1043
+#: gajim/dialogs.py:1042
 msgid "an audio and video"
 msgstr "аудио мен видео"
 
-#: gajim/dialogs.py:1045
+#: gajim/dialogs.py:1044
 msgid "an audio"
 msgstr "аудио"
 
-#: gajim/dialogs.py:1047
+#: gajim/dialogs.py:1046
 msgid "a video"
 msgstr "видео"
 
-#: gajim/dialogs.py:1051
-#, python-format
+#: gajim/dialogs.py:1050
+#, fuzzy, python-format
 msgid ""
-"%(contact)s wants to start %(type)s session with you. Do you want to answer "
+"%(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:505
+#: gajim/groupchat_control.py:511
 #, fuzzy, python-format
 msgid "Send File (max. %s MiB)…"
 msgstr "Файлды қалайша сақтау..."
 
-#: gajim/groupchat_control.py:507 gajim/chat_control.py:342
+#: gajim/groupchat_control.py:513 gajim/chat_control.py:344
 #, fuzzy
 msgid "No File Transfer available"
 msgstr "Файлдармен алмасу аяқталды"
 
-#: gajim/groupchat_control.py:630 gajim/groupchat_control.py:2349
-msgid "Changing Subject"
-msgstr "Тақырыпты өзгерту"
-
-#: gajim/groupchat_control.py:631 gajim/groupchat_control.py:2350
-msgid "Please specify the new subject:"
-msgstr "Жаңа тақырыпты көрсетіңіз:"
-
-#: gajim/groupchat_control.py:638
-msgid "Changing Nickname"
-msgstr "Ник атын өзгерту"
-
-#: gajim/groupchat_control.py:639
-msgid "Please specify the new nickname you want to use:"
-msgstr "Жаңа ник атыңызды енгізіңіз:"
-
-#: gajim/groupchat_control.py:657
+#: gajim/groupchat_control.py:655
 #, fuzzy
-msgid "Invalid group chat JID"
+msgid "Invalid group chat XMPP Address"
 msgstr "Топтық чаттың Jabber ID-і зате"
 
-#: gajim/groupchat_control.py:658
+#: gajim/groupchat_control.py:656
 #, fuzzy
-msgid "The group chat JID has not allowed characters."
+msgid "The group chat XMPP Address has not allowed characters."
 msgstr "Топ чат Jabber ID ішінде рұқсат етілмеген таңбалар бар."
 
-#: gajim/groupchat_control.py:758 gajim/gtk/profile.py:136
+#: gajim/groupchat_control.py:743 gajim/gtk/profile.py:136
 msgid "Could not load image"
 msgstr "Суретті жүктеу мүмкін емес"
 
-#: gajim/groupchat_control.py:888
+#: gajim/groupchat_control.py:873
 msgid "Insert Nickname"
 msgstr "Ник кірістіру"
 
-#: gajim/groupchat_control.py:1056 gajim/chat_control.py:824
+#: gajim/groupchat_control.py:1041 gajim/chat_control.py:848
 msgid "and authenticated"
 msgstr "аутентификацияланған"
 
-#: gajim/groupchat_control.py:1060 gajim/chat_control.py:828
+#: gajim/groupchat_control.py:1045 gajim/chat_control.py:852
 msgid "and NOT authenticated"
 msgstr "аутентификацияланБАған"
 
-#: gajim/groupchat_control.py:1064
+#: gajim/groupchat_control.py:1049
 #, fuzzy, python-format
 msgid "%(type)s encryption is active %(authenticated)s."
 msgstr ""
 "%(type)s түрдегі шифрлену %(status)s және %(authenticated)s.\n"
 "Сөйлесу сессия тарихыңыз %(logged)s."
 
-#: gajim/groupchat_control.py:1111
+#: gajim/groupchat_control.py:1096
 msgid "Conversation with "
 msgstr "Сөйлесу - "
 
-#: gajim/groupchat_control.py:1113
+#: gajim/groupchat_control.py:1098
 msgid "Continued conversation"
 msgstr "Жалғастырылған сөйлесу"
 
-#: gajim/groupchat_control.py:1411
+#: gajim/groupchat_control.py:1357
 #, python-format
 msgid "%(nick)s has set the subject to %(subject)s"
 msgstr "%(nick)s тақырыпты %(subject)s етіп орнатқан"
 
-#: gajim/groupchat_control.py:1433
+#: gajim/groupchat_control.py:1374
 #, fuzzy
-msgid "Room now shows unavailable members"
+msgid "Group chat now shows unavailable members"
 msgstr "Бөлме енді қолжетерсіз қатысушыларды көрсетеді"
 
-#: gajim/groupchat_control.py:1436
+#: gajim/groupchat_control.py:1377
 #, fuzzy
-msgid "Room now does not show unavailable members"
+msgid "Group chat now does not show unavailable members"
 msgstr "Бөлме енді қолжетерсіз қатысушыларды көрсетпейді"
 
-#: gajim/groupchat_control.py:1439
+#: gajim/groupchat_control.py:1380
 msgid "A setting not related to privacy has been changed"
 msgstr ""
 
-#: gajim/groupchat_control.py:1446
-msgid "Room logging is now enabled"
-msgstr "Бөлме тарихын сақтау енді қосулы"
+#: gajim/groupchat_control.py:1387 gajim/groupchat_control.py:1659
+#, fuzzy
+msgid "Conversations are stored on the server"
+msgstr "Бұл сессия серверде САҚТАЛАДЫ"
 
-#: gajim/groupchat_control.py:1449
-msgid "Room logging is now disabled"
-msgstr "Бөлме тарихын сақтау енді сөндірулі"
+#: gajim/groupchat_control.py:1390
+#, fuzzy
+msgid "Conversations are not stored on the server"
+msgstr "Сіз туралы ақпарат, серверде сақталған түрде"
 
-#: gajim/groupchat_control.py:1452
-msgid "Room is now non-anonymous"
+#: gajim/groupchat_control.py:1393
+#, fuzzy
+msgid "Group chat is now non-anonymous"
 msgstr "Бөлме енді анонимды емес"
 
-#: gajim/groupchat_control.py:1456
-msgid "Room is now semi-anonymous"
+#: gajim/groupchat_control.py:1397
+#, fuzzy
+msgid "Group chat is now semi-anonymous"
 msgstr "Бөлме енді жартылай анонимды"
 
-#: gajim/groupchat_control.py:1460
+#: gajim/groupchat_control.py:1401
 #, fuzzy
-msgid "Room is now fully anonymous"
+msgid "Group chat is now fully anonymous"
 msgstr "Бөлме енді толық анонимды"
 
-#: gajim/groupchat_control.py:1500
+#: gajim/groupchat_control.py:1439
 #, fuzzy, python-format
 msgid "Ping? (%s)"
 msgstr "Pong! (%s сек.)"
 
-#: gajim/groupchat_control.py:1503
+#: gajim/groupchat_control.py:1442
 #, fuzzy, python-format
 msgid "Pong! (%(nick)s %(delay)s s.)"
 msgstr "Pong! (%s сек.)"
 
-#: gajim/groupchat_control.py:1506 gajim/chat_control.py:1213
+#: gajim/groupchat_control.py:1445 gajim/chat_control.py:1237
 msgid "Error."
 msgstr "Қате."
 
-#: gajim/groupchat_control.py:1711
+#: gajim/groupchat_control.py:1650
 #, fuzzy, python-format
-msgid "You (%s) joined the room"
+msgid "You (%s) joined the group chat"
 msgstr "%s чат бөлмесіне кірді"
 
-#: gajim/groupchat_control.py:1717
-msgid "Any occupant is allowed to see your full JID"
+#: gajim/groupchat_control.py:1655
+#, fuzzy
+msgid "Any participant is allowed to see your full XMPP Address"
 msgstr "Әр қатысушы сіздің толық JID-ды көре алады"
 
-#: gajim/groupchat_control.py:1721
-msgid "Room logging is enabled"
-msgstr "Бөлме тарихын сақтау қосулы"
-
-#: gajim/groupchat_control.py:1725
-msgid "The server has assigned or modified your roomnick"
+#: gajim/groupchat_control.py:1663
+#, fuzzy
+msgid "The server has assigned or modified your nickname in this group chat"
 msgstr "Сервер сізге бөлме никті таңдаған не сіздегісін өзгерткен"
 
-#: gajim/groupchat_control.py:1732
-msgid "A new room has been created"
+#: gajim/groupchat_control.py:1671
+#, fuzzy
+msgid "A new group chat has been created"
 msgstr "Жаңа бөлме жасалған"
 
-#: gajim/groupchat_control.py:1740 gajim/privatechat_control.py:112
+#: gajim/groupchat_control.py:1679 gajim/privatechat_control.py:115
 #, python-format
 msgid "You are now known as %s"
 msgstr "Бұдан былай %s ретінде белгілі боласыз"
 
-#: gajim/groupchat_control.py:1742 gajim/privatechat_control.py:114
+#: gajim/groupchat_control.py:1681 gajim/privatechat_control.py:117
 #, fuzzy, python-brace-format
 msgid "{nick} is now known as {new_nick}"
 msgstr "%(nick)s енді %(new_nick)s ретінде белгілі болады"
 
-#: gajim/groupchat_control.py:1767 gajim/privatechat_control.py:141
+#: gajim/groupchat_control.py:1706 gajim/privatechat_control.py:144
 #, fuzzy, python-brace-format
 msgid "You are now {show}{status}"
 msgstr "Бұдан былай %s ретінде белгілі боласыз"
 
-#: gajim/groupchat_control.py:1773 gajim/privatechat_control.py:147
+#: gajim/groupchat_control.py:1712 gajim/privatechat_control.py:150
 #, fuzzy, python-brace-format
 msgid "{nick} is now {show}{status}"
 msgstr "%(nick)s қазір %(status)s"
 
-#: gajim/groupchat_control.py:1790 gajim/groupchat_control.py:1819
-#: gajim/groupchat_control.py:1849 gajim/groupchat_control.py:1909
+#: gajim/groupchat_control.py:1729 gajim/groupchat_control.py:1758
+#: gajim/groupchat_control.py:1788 gajim/groupchat_control.py:1848
 #, python-brace-format
 msgid " by {actor}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1793
+#: gajim/groupchat_control.py:1732
 #, fuzzy, python-brace-format
 msgid "** Your Affiliation has been set to {affiliation}{actor}{reason}"
 msgstr "** %(actor)s қазір %(nick)s қатысуын %(affiliation)s етіп орнатқан"
 
-#: gajim/groupchat_control.py:1799
+#: gajim/groupchat_control.py:1738
 #, fuzzy, python-brace-format
 msgid "** Affiliation of {nick} has been set to {affiliation}{actor}{reason}"
 msgstr "** %(nick)s қатысуы %(affiliation)s етіп орнатылған"
 
-#: gajim/groupchat_control.py:1822
+#: gajim/groupchat_control.py:1761
 #, fuzzy, python-brace-format
 msgid "** Your Role has been set to {role}{actor}{reason}"
 msgstr "** %(actor)s қазір %(nick)s ролін %(role)s етіп орнатқан"
 
-#: gajim/groupchat_control.py:1827
+#: gajim/groupchat_control.py:1766
 #, fuzzy, python-brace-format
 msgid "** Role of {nick} has been set to {role}{actor}{reason}"
 msgstr "** %(actor)s қазір %(nick)s ролін %(role)s етіп орнатқан"
 
-#: gajim/groupchat_control.py:1852
+#: gajim/groupchat_control.py:1791
 #, fuzzy, python-brace-format
-msgid "You have been removed from the room{actor}{reason}"
+msgid "You have been removed from the group chat{actor}{reason}"
 msgstr "%(nick)s бөлімнен шығарылған (%(reason)s)"
 
-#: gajim/groupchat_control.py:1857
+#: gajim/groupchat_control.py:1796
 #, python-brace-format
 msgid "You have left due to an error{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1863
+#: gajim/groupchat_control.py:1802
 #, python-brace-format
 msgid "You have been kicked{actor}{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1870
+#: gajim/groupchat_control.py:1809
 #, python-brace-format
 msgid "You have been banned{actor}{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1877 gajim/groupchat_control.py:1943
+#: gajim/groupchat_control.py:1816 gajim/groupchat_control.py:1882
 #, fuzzy
 msgid ": Affiliation changed"
 msgstr "қатысуы өзгертілген"
 
-#: gajim/groupchat_control.py:1883 gajim/groupchat_control.py:1948
+#: gajim/groupchat_control.py:1822 gajim/groupchat_control.py:1887
 #, fuzzy
-msgid ": Room configuration changed to members-only"
+msgid ": Group chat configuration changed to members-only"
 msgstr "бөлімге қатысу тек мүшелер үшін деп өзгертілген"
 
-#: gajim/groupchat_control.py:1912
+#: gajim/groupchat_control.py:1851
 #, fuzzy, python-brace-format
-msgid "{nick} has been removed from the room{by}{reason}"
+msgid "{nick} has been removed from the group chat{by}{reason}"
 msgstr "%(nick)s бөлімнен шығарылған (%(reason)s)"
 
-#: gajim/groupchat_control.py:1922
+#: gajim/groupchat_control.py:1861
 #, python-brace-format
 msgid "{nick} has left due to an error{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1928
+#: gajim/groupchat_control.py:1867
 #, fuzzy, python-brace-format
 msgid "{nick} has been kicked{actor}{reason}"
 msgstr "%(nick)s тебілген болса керек: %(reason)s"
 
-#: gajim/groupchat_control.py:1936
+#: gajim/groupchat_control.py:1875
 #, fuzzy, python-brace-format
 msgid "{nick} has been banned{actor}{reason}"
 msgstr "%(nick)s бандалған болса керек: %(reason)s"
 
-#: gajim/groupchat_control.py:1953
+#: gajim/groupchat_control.py:1892
 #, python-brace-format
 msgid "{nick} has left{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1970
+#: gajim/groupchat_control.py:1914
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s чат бөлмесіне кірді"
 
-#: gajim/groupchat_control.py:1985 gajim/groupchat_control.py:1990
-#: gajim/groupchat_control.py:1995 gajim/groupchat_control.py:2000
-#: gajim/groupchat_control.py:2011
-msgid "Unable to join group chat"
-msgstr "Чат бөлмесіне кіру мүмкін емес"
-
-#: gajim/groupchat_control.py:1986
-#, fuzzy, python-format
-msgid "You are banned from group chat <b>%s</b>."
-msgstr "Сізді %s топ чатынан бандаған."
-
-#: gajim/groupchat_control.py:1991
-#, fuzzy, python-format
-msgid "Remote server <b>%s</b> does not exist."
-msgstr "%s топтық чаты жоқ."
-
-#: gajim/groupchat_control.py:1996
-#, fuzzy, python-format
-msgid "Group chat <b>%s</b> does not exist."
-msgstr "%s топтық чаты жоқ."
-
-#: gajim/groupchat_control.py:2001
-#, fuzzy
-msgid "Group chat creation is not permitted."
-msgstr "Топтық чаттарды жасау рұқсат етілмеген."
-
-#: gajim/groupchat_control.py:2005
+#: gajim/groupchat_control.py:1981
 #, fuzzy
-msgid "Unable to join groupchat"
-msgstr "Чат бөлмесіне кіру мүмкін емес"
-
-#: gajim/groupchat_control.py:2006
-#, fuzzy, python-format
-msgid "You must use your registered nickname in <b>%s</b>."
-msgstr "Сіздің тіркелген ник атыңыз %s топ чатында қолданылуы керек."
-
-#: gajim/groupchat_control.py:2012
-#, python-format
-msgid "You are not in the members list in groupchat %s."
-msgstr "Сіз %s топ чат мүшелері тізімінде емессіз."
-
-#: gajim/groupchat_control.py:2068
-msgid "Room has been destroyed"
+msgid "Group chat has been destroyed"
 msgstr "Бөлме жойылған"
 
-#: gajim/groupchat_control.py:2073
+#: gajim/groupchat_control.py:1986
 #, fuzzy, python-format
-msgid "You can join this room instead: xmpp:%s?join"
+msgid "You can join this group chat instead: xmpp:%s?join"
 msgstr "Оның орнына мына бөлмеге кіре аласыз: %s"
 
-#: gajim/groupchat_control.py:2306
+#: gajim/groupchat_control.py:2214
 #, fuzzy
 msgid "Leave Group Chat"
 msgstr "Топ чаттардан шығу"
 
-#: gajim/groupchat_control.py:2307
+#: gajim/groupchat_control.py:2215
 #, fuzzy
 msgid "Are you sure you want to leave this group chat?"
 msgstr "\"%s\" топ чатынан шығуды шынымен қалайсыз ба?"
 
-#: gajim/groupchat_control.py:2308
+#: gajim/groupchat_control.py:2216
 #, fuzzy, python-format
-msgid "If you close this window, you will be disconnected from '%s'."
+msgid "If you close this window, you will leave '%s'."
 msgstr "Бұл терезені жапсаңыз, топ чатынан шығасыз."
 
-#: gajim/groupchat_control.py:2314
+#: gajim/groupchat_control.py:2222 gajim/roster_window.py:5177
 msgid "_Leave"
 msgstr ""
 
-#: gajim/groupchat_control.py:2377
+#: gajim/groupchat_control.py:2280 gajim/roster_window.py:3008
 #, fuzzy, python-format
 msgid "%(jid)s has been invited to this group chat"
 msgstr "%(nick)s бөлімнен шығарылған (%(reason)s)"
 
-#: gajim/groupchat_control.py:2527
+#: gajim/groupchat_control.py:2463
 #, python-format
 msgid "Kicking %s"
 msgstr "%s тебілуде"
 
-#: gajim/groupchat_control.py:2528 gajim/groupchat_control.py:2829
+#: gajim/groupchat_control.py:2464 gajim/groupchat_control.py:2765
 msgid "You may specify a reason below:"
 msgstr "Төменде оның себебін көрсете аласыз:"
 
-#: gajim/groupchat_control.py:2828
+#: gajim/groupchat_control.py:2764
 #, python-format
 msgid "Banning %s"
 msgstr "%s банға жіберу"
 
-#: gajim/chat_control.py:408
+#: gajim/chat_control.py:432
 msgid "Show a list of formattings"
 msgstr "Пішімдеулер тізімін көрсету"
 
-#: gajim/chat_control.py:412
+#: gajim/chat_control.py:436
 #, fuzzy
 msgid "This contact does not support HTML"
 msgstr "Контакт файлдармен алмасуды қолдамайды."
 
-#: gajim/chat_control.py:562
+#: gajim/chat_control.py:586
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr "%(type)s қалып-күйі : %(state)s, себебі: %(reason)s"
 
-#: gajim/chat_control.py:686
+#: gajim/chat_control.py:710
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s, %(room_name)s топ чатынан"
 
-#: gajim/chat_control.py:832
+#: gajim/chat_control.py:856
 #, fuzzy, python-format
 msgid "%(type)s encryption is active %(authenticated)s"
 msgstr ""
 "%(type)s түрдегі шифрлену %(status)s және %(authenticated)s.\n"
 "Сөйлесу сессия тарихыңыз %(logged)s."
 
-#: gajim/chat_control.py:1160 gajim/chat_control.py:1168
+#: gajim/chat_control.py:1184 gajim/chat_control.py:1192
 #, fuzzy
 msgid "Close"
 msgstr "_Жіберу мен жабу"
 
-#: gajim/chat_control.py:1161
+#: gajim/chat_control.py:1185
 #, fuzzy, python-format
 msgid "You just received a new message from %s"
 msgstr "Сіз жаңа ғана \"%s\" жіберген жаңа хабарламаны алдыңыз"
 
-#: gajim/chat_control.py:1163
+#: gajim/chat_control.py:1187
 #, fuzzy
 msgid ""
 "If you close this tab while having chat history disabled, this message will "
@@ -1193,16 +1157,16 @@ msgstr ""
 "Егер сіз бұл бетті жауып, тарихты сақтау сөндірілген болса, бұл хабарлама "
 "жоғалтылады."
 
-#: gajim/chat_control.py:1208
+#: gajim/chat_control.py:1232
 msgid "Ping?"
 msgstr "Ping?"
 
-#: gajim/chat_control.py:1211
+#: gajim/chat_control.py:1235
 #, fuzzy, python-format
 msgid "Pong! (%s seconds)"
 msgstr "Pong! (%s сек.)"
 
-#: gajim/chat_control.py:1308
+#: gajim/chat_control.py:1332
 #, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -1211,274 +1175,282 @@ msgstr ""
 "Тақырыбы: %(subject)s\n"
 "%(message)s"
 
-#: gajim/chat_control.py:1416
+#: gajim/chat_control.py:1440
 #, fuzzy, python-format
 msgid "%(name)s is now %(show)s %(status)s"
 msgstr "%(name)s қазір %(status)s"
 
-#: gajim/chat_control.py:1476 gajim/data/gui/application_menu.ui:32
+#: gajim/chat_control.py:1500 gajim/data/gui/application_menu.ui:32
 #: gajim/gtk/http_upload_progress.py:35
 #, fuzzy
 msgid "File Transfer"
 msgstr "Файлдармен алмасу"
 
-#: gajim/chat_control.py:1480
+#: gajim/chat_control.py:1504
 #, fuzzy
 msgid "Size"
 msgstr "Өлшемі: %s"
 
-#: gajim/chat_control.py:1482 gajim/chat_control.py:1546
+#: gajim/chat_control.py:1506 gajim/chat_control.py:1566
+#: gajim/gui_interface.py:190
 #: gajim/data/gui/groupchat_invitation_received.ui:77
-#: gajim/gtk/filetransfer.py:485
+#: gajim/gtk/filetransfer.py:490
 #, fuzzy
 msgid "_Accept"
 msgstr "_Тіркелгілер"
 
-#: gajim/chat_control.py:1484 gajim/chat_control.py:1548
+#: gajim/chat_control.py:1508 gajim/chat_control.py:1568
 #: gajim/data/gui/groupchat_invitation_received.ui:62
 #, fuzzy
 msgid "_Decline"
 msgstr "Желі_де емес"
 
-#: gajim/chat_control.py:1506 gajim/gui_interface.py:791
-#: gajim/gui_interface.py:821 gajim/gui_interface.py:847
+#: gajim/chat_control.py:1530 gajim/gui_interface.py:777
+#: gajim/gui_interface.py:807 gajim/gui_interface.py:833
 #: gajim/gtk/notification.py:173 gajim/gtk/notification.py:278
 msgid "File Transfer Completed"
 msgstr "Файлдармен алмасу аяқталды"
 
-#: gajim/chat_control.py:1510 gajim/gtk/filetransfer.py:259
+#: gajim/chat_control.py:1534 gajim/gtk/filetransfer.py:258
 #, fuzzy
 msgid "Open _Folder"
 msgstr "_Орналасқан буманы ашу"
 
-#: gajim/chat_control.py:1512 gajim/chat_control.py:1521
+#: gajim/chat_control.py:1536 gajim/chat_control.py:1545
+#: gajim/data/gui/groupchat_control.ui:962
+#: gajim/data/gui/groupchat_control.ui:1049
+#: gajim/data/gui/groupchat_control.ui:1155
 #, fuzzy
 msgid "_Close"
 msgstr "_Жіберу мен жабу"
 
-#: gajim/chat_control.py:1543 gajim/gui_interface.py:484
+#: gajim/chat_control.py:1563 gajim/gui_interface.py:473
+#: gajim/data/gui/groupchat_invitation_received.ui:42
 #: gajim/gtk/notification.py:174 gajim/gtk/notification.py:195
 #: gajim/gtk/notification.py:281
-msgid "Groupchat Invitation"
+#, fuzzy
+msgid "Group Chat Invitation"
 msgstr "Топ чатына шақыру"
 
-#: gajim/chat_control.py:1568 gajim/roster_window.py:1954
+#: gajim/chat_control.py:1588 gajim/roster_window.py:1951
 msgid "Remote contact stopped transfer"
 msgstr "Қашықтағы контакт файлдармен алмасуды тоқтатқан"
 
-#: gajim/chat_control.py:1570 gajim/roster_window.py:1956
+#: gajim/chat_control.py:1590 gajim/roster_window.py:1953
 msgid "Error opening file"
 msgstr "Файлды ашу қатесі"
 
-#: gajim/chat_control.py:1572 gajim/gtk/filetransfer.py:297
+#: gajim/chat_control.py:1592 gajim/gtk/filetransfer.py:296
 msgid "File transfer stopped"
 msgstr "Файлдармен алмасу тоқтатылды"
 
-#: gajim/chat_control.py:1575 gajim/gtk/filetransfer.py:275
-#: gajim/gtk/filetransfer.py:284
+#: gajim/chat_control.py:1595 gajim/gtk/filetransfer.py:274
+#: gajim/gtk/filetransfer.py:283
 msgid "File transfer cancelled"
 msgstr "Файлдармен алмасу тоқтатылды"
 
-#: gajim/chat_control.py:1576
+#: gajim/chat_control.py:1596
 msgid "Connection with peer cannot be established."
 msgstr "Тораппен байланысты орнату мүмкін емес."
 
-#: gajim/application.py:72
+#: gajim/application.py:75
 #, fuzzy
 msgid "Show the application's version"
 msgstr "Жүйелік сөре таңбашасын көрсету:"
 
-#: gajim/application.py:79
+#: gajim/application.py:82
 #, fuzzy
 msgid "Show only critical errors"
 msgstr "Тек ростерде көрсету"
 
-#: gajim/application.py:86
+#: gajim/application.py:89
 msgid "Separate profile files completely (even history database and plugins)"
 msgstr ""
 
-#: gajim/application.py:94
+#: gajim/application.py:97
 msgid "Print XML stanzas and other debug information"
 msgstr ""
 
-#: gajim/application.py:101
+#: gajim/application.py:104
 #, fuzzy
 msgid "Use defined profile in configuration directory"
 msgstr "Кеңейтілген баптаулар түзетушісі"
 
-#: gajim/application.py:109
+#: gajim/application.py:112
 #, fuzzy
 msgid "Set configuration directory"
 msgstr "%s баптау қатесі"
 
-#: gajim/application.py:117
+#: gajim/application.py:120
 #, fuzzy
 msgid "Configure logging system"
 msgstr "%s баптау"
 
-#: gajim/application.py:125
+#: gajim/application.py:128
 #, fuzzy
 msgid "Show all warnings"
 msgstr "Қат_ыспаған оқиғаларды көрсету"
 
-#: gajim/application.py:132
+#: gajim/application.py:135
 msgid "Open IPython shell"
 msgstr ""
 
-#: gajim/application.py:139
+#: gajim/application.py:142
 msgid "Pops up a window with the next pending event"
 msgstr "Келесі кезектегі оқиға бар қалқымалы терезені көрсетеді"
 
-#: gajim/application.py:145 gajim/data/gui/shortcuts_window.ui:203
+#: gajim/application.py:148 gajim/data/gui/shortcuts_window.ui:203
 #: data/org.gajim.Gajim.desktop.in:21
 #, fuzzy
 msgid "Start a new chat"
 msgstr "Чатты бастау"
 
-#: gajim/application.py:152
+#: gajim/application.py:155
 msgid "Simulate loss of connectivity"
 msgstr ""
 
-#: gajim/application.py:159
+#: gajim/application.py:162
 msgid "Simulate regaining connectivity"
 msgstr ""
 
-#: gajim/application.py:201 gajim/gui_interface.py:133
+#: gajim/application.py:204 gajim/gui_interface.py:133
 msgid "Database Error"
 msgstr "Дерекқор қатесі"
 
-#: gajim/roster_window.py:294 gajim/roster_window.py:1030
+#: gajim/roster_window.py:291 gajim/roster_window.py:1027
 msgid "Merged accounts"
 msgstr "Біріктірілген тіркелгілер"
 
-#: gajim/roster_window.py:853 gajim/roster_window.py:1631
-#: gajim/roster_window.py:1664 gajim/roster_window.py:1715
-#: gajim/roster_window.py:1717 gajim/roster_window.py:1872
-#: gajim/roster_window.py:2531 gajim/roster_window.py:5025
-#: gajim/common/contacts.py:188 gajim/common/contacts.py:447
-#: gajim/common/helpers.py:83 gajim/gtk/discovery.py:129
-#: gajim/gtk/discovery.py:130 gajim/gtk/discovery.py:1416
+#: gajim/roster_window.py:850 gajim/roster_window.py:1628
+#: gajim/roster_window.py:1661 gajim/roster_window.py:1712
+#: gajim/roster_window.py:1714 gajim/roster_window.py:1869
+#: gajim/roster_window.py:2528 gajim/roster_window.py:4331
+#: gajim/roster_window.py:4964 gajim/common/contacts.py:204
+#: gajim/common/contacts.py:463 gajim/common/helpers.py:86
+#: gajim/gtk/discovery.py:127 gajim/gtk/discovery.py:128
+#: gajim/gtk/discovery.py:1414
 msgid "Transports"
 msgstr "Қызметтер"
 
-#: gajim/roster_window.py:1723 gajim/roster_window.py:1725
-#: gajim/roster_window.py:4995 gajim/gui_interface.py:1613
-#: gajim/gui_interface.py:1639 gajim/common/contacts.py:186
-#: gajim/common/helpers.py:83 gajim/common/modules/adhoc_commands.py:245
-msgid "Groupchats"
+#: gajim/roster_window.py:1720 gajim/roster_window.py:1722
+#: gajim/roster_window.py:4331 gajim/roster_window.py:4934
+#: gajim/gui_interface.py:1527 gajim/common/contacts.py:202
+#: gajim/common/helpers.py:86 gajim/common/modules/adhoc_commands.py:245
+#, fuzzy
+msgid "Group chats"
 msgstr "Топтық чаттар"
 
-#: gajim/roster_window.py:2012
+#: gajim/roster_window.py:2009
 #, fuzzy
 msgid "Authorization sent"
 msgstr "Авторизация жіберілді"
 
-#: gajim/roster_window.py:2013
+#: gajim/roster_window.py:2010
 #, fuzzy, python-format
 msgid "\"%s\" will now see your status."
 msgstr "\"%s\" енді сіздің қалып-күйіңізді біле алады."
 
-#: gajim/roster_window.py:2031
+#: gajim/roster_window.py:2028
 msgid "Subscription request has been sent"
 msgstr "Жазылуға сұраным жіберілді"
 
-#: gajim/roster_window.py:2032
-#, python-format
-msgid "If \"%s\" accepts this request you will know his or her status."
+#: gajim/roster_window.py:2029
+#, fuzzy, python-format
+msgid "If \"%s\" accepts this request you will know their status."
 msgstr ""
 "Егер \"%s\" сіздің сұранымыңызды қабылдаса, сіз оның қалып-күйін біле аласыз."
 
-#: gajim/roster_window.py:2046
+#: gajim/roster_window.py:2043
 #, fuzzy
 msgid "Authorization removed"
 msgstr "Авторизация өшірілді"
 
-#: gajim/roster_window.py:2047
+#: gajim/roster_window.py:2044
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "\"%s\" енді сізді әрқашан желіде емес күйінде көреді."
 
-#: gajim/roster_window.py:2250 gajim/roster_window.py:3504
+#: gajim/roster_window.py:2247 gajim/roster_window.py:3460
 msgid "Disconnect for Invisibility"
 msgstr ""
 
-#: gajim/roster_window.py:2251 gajim/roster_window.py:3505
+#: gajim/roster_window.py:2248 gajim/roster_window.py:3461
 msgid "You are participating in one or more group chats"
 msgstr "Сіз бір не бірнеше чат бөлмесіне қатысушы болып тұрсыз"
 
-#: gajim/roster_window.py:2252 gajim/roster_window.py:3506
+#: gajim/roster_window.py:2249 gajim/roster_window.py:3462
 #, fuzzy
 msgid ""
-"Changing your status to invisible will result in disconnection from those "
-"group chats.\n"
+"Changing your status to invisible will result in you leaving those group "
+"chats.\n"
 "Are you sure you want to go invisible?"
 msgstr ""
 "Қалып-күйіңізді жасырын етіп орнатсаңыз, келесі топ чаттарынан байланысты "
 "үзесіз. Жасырын етуді қалайсыз ба?"
 
-#: gajim/roster_window.py:2257 gajim/roster_window.py:3512
-#: gajim/roster_window.py:5238 gajim/data/gui/gc_control_popup_menu.ui:120
+#: gajim/roster_window.py:2254 gajim/roster_window.py:3468
+#: gajim/data/gui/gc_control_popup_menu.ui:120
 msgid "_Disconnect"
 msgstr "Ба_йланысты үзу"
 
-#: gajim/roster_window.py:2285
+#: gajim/roster_window.py:2282
 #, fuzzy
 msgid "desynced"
 msgstr "байланыспаған"
 
-#: gajim/roster_window.py:2353 gajim/data/gui/shortcuts_window.ui:224
+#: gajim/roster_window.py:2350 gajim/data/gui/shortcuts_window.ui:224
 #, fuzzy
 msgid "Quit Gajim"
 msgstr "Gajim"
 
-#: gajim/roster_window.py:2354
+#: gajim/roster_window.py:2351
 #, fuzzy
 msgid "You are about to quit Gajim"
 msgstr "Gajim-нан шығуды шынымен қалайсыз ба?"
 
-#: gajim/roster_window.py:2355
+#: gajim/roster_window.py:2352
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Gajim-нан шығуды шынымен қалайсыз ба?"
 
-#: gajim/roster_window.py:2356
+#: gajim/roster_window.py:2353
 #, fuzzy
 msgid "_Always quit when closing Gajim"
 msgstr "Gajim-ді әрқашан жабу"
 
-#: gajim/roster_window.py:2359 gajim/roster_window.py:2455
-#: gajim/roster_window.py:2495 gajim/data/gui/systray_context_menu.ui:90
+#: gajim/roster_window.py:2356 gajim/roster_window.py:2452
+#: gajim/roster_window.py:2492 gajim/data/gui/systray_context_menu.ui:83
 #, fuzzy
 msgid "_Quit"
 msgstr "_Шығу"
 
-#: gajim/roster_window.py:2448
+#: gajim/roster_window.py:2445
 #, fuzzy
 msgid "Stop File Transfers"
 msgstr "Файлдармен алмасу"
 
-#: gajim/roster_window.py:2449
+#: gajim/roster_window.py:2446
 #, fuzzy
 msgid "You still have running file transfers"
 msgstr "Қазір белсенді файлдармен алмасулар бар"
 
-#: gajim/roster_window.py:2450
+#: gajim/roster_window.py:2447
 #, fuzzy
 msgid ""
 "If you quit now, the file(s) being transferred will be lost.\n"
 "Do you still want to quit?"
 msgstr "Қазыр шықсаңыз, файлдармен алмасу(лар) тоқталады. Шығуды қалайсыз ба?"
 
-#: gajim/roster_window.py:2488
+#: gajim/roster_window.py:2485
 #, fuzzy
 msgid "Unread Messages"
 msgstr "Оқылмаған оқиғалар"
 
-#: gajim/roster_window.py:2489
+#: gajim/roster_window.py:2486
 #, fuzzy
 msgid "You still have unread messages"
 msgstr "Сізде оқылмаған хабарламалар бар"
 
-#: gajim/roster_window.py:2490
+#: gajim/roster_window.py:2487
 #, fuzzy
 msgid ""
 "Messages will only be available for reading them later if storing chat "
@@ -1487,20 +1459,20 @@ msgstr ""
 "Кейінірек оқу үшін хабарламалар тек тарихыңыз қосулы және контакт "
 "ростеріңізде болса ғана қолжетерлік болады."
 
-#: gajim/roster_window.py:2760
+#: gajim/roster_window.py:2753
 msgid "You have unread messages"
 msgstr "Сізде оқылмаған хабарламалар бар"
 
-#: gajim/roster_window.py:2761
+#: gajim/roster_window.py:2754
 msgid "You must read them before removing this transport."
 msgstr "Транспортты өшіру алдында келесіні оқуыңыз керек."
 
-#: gajim/roster_window.py:2764
+#: gajim/roster_window.py:2757
 #, fuzzy, python-format
 msgid "Transport '%s' will be removed"
 msgstr "\"%s\" транспорты өшіріледі"
 
-#: gajim/roster_window.py:2765
+#: gajim/roster_window.py:2758
 #, fuzzy
 msgid ""
 "You will no longer be able to send and receive messages from and to contacts "
@@ -1509,11 +1481,11 @@ msgstr ""
 "Бұл транспортты қолданатын барлық контакттарға бұдан былай хабарламаларды "
 "жібере не ала алмайтын боласыз."
 
-#: gajim/roster_window.py:2768
+#: gajim/roster_window.py:2761
 msgid "Transports will be removed"
 msgstr "Транспорттар өшіріледі"
 
-#: gajim/roster_window.py:2773
+#: gajim/roster_window.py:2766
 #, fuzzy, python-format
 msgid ""
 "You will no longer be able to send and receive messages from and to contacts "
@@ -1523,22 +1495,22 @@ msgstr ""
 "Бұл транспортты қолданатын барлық контакттарға бұдан былай хабарламаларды "
 "жібере не ала алмайтын боласыз."
 
-#: gajim/roster_window.py:2777
+#: gajim/roster_window.py:2770
 #, fuzzy
 msgid "Remove Transport"
 msgstr "Транс_порттарды көрсету"
 
-#: gajim/roster_window.py:2844
+#: gajim/roster_window.py:2837
 #, fuzzy
 msgid "Block Contact"
 msgstr "Блокталған контакттар"
 
-#: gajim/roster_window.py:2845
+#: gajim/roster_window.py:2838
 #, fuzzy
 msgid "Really block this contact?"
 msgstr "Бұл контакт үшін OpenPGP қосулы тұр ма?"
 
-#: gajim/roster_window.py:2846
+#: gajim/roster_window.py:2839
 #, fuzzy
 msgid ""
 "This contact will see you offline and you will not receive any messages sent "
@@ -1547,64 +1519,59 @@ msgstr ""
 "Контакт бұдан былай сізді желіде емес сияқты көреді және сіз ол сізге "
 "жібергісі келетін хабарламаларды ала алмайтын боласыз."
 
-#: gajim/roster_window.py:2851
+#: gajim/roster_window.py:2844
 #, fuzzy
 msgid "_Block Contact"
 msgstr "Блокталған контакттар"
 
-#: gajim/roster_window.py:2896
+#: gajim/roster_window.py:2889
 msgid "Rename Contact"
 msgstr "Контакт атын ауыстыру"
 
-#: gajim/roster_window.py:2897
+#: gajim/roster_window.py:2890
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "%s контакты үшін жаңа ник атын енгізіңіз"
 
-#: gajim/roster_window.py:2904
+#: gajim/roster_window.py:2897
 msgid "Rename Group"
 msgstr "Топ атын ауыстыру"
 
-#: gajim/roster_window.py:2905
+#: gajim/roster_window.py:2898
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "%s тобы үшін жаңа атын енгізіңіз"
 
-#: gajim/roster_window.py:2953 gajim/roster_window.py:2954
+#: gajim/roster_window.py:2946 gajim/roster_window.py:2947
 msgid "Remove Group"
 msgstr "Топты өшіру"
 
-#: gajim/roster_window.py:2955
+#: gajim/roster_window.py:2948
 #, fuzzy, python-format
 msgid "Do you want to remove %s from the contact list?"
 msgstr "Сіз ростерден %s тобын өшіруді қалайсыз ба?"
 
-#: gajim/roster_window.py:2956
+#: gajim/roster_window.py:2949
 #, fuzzy
 msgid "_Also remove all contacts of this group from contact list"
 msgstr "Сонымен қатар ростерден осы топтың барлық контакттарын өшіру"
 
-#: gajim/roster_window.py:3044
-#, fuzzy, python-format
-msgid "%(jid)s has been invited in this room"
-msgstr "%(nick)s бөлімнен шығарылған (%(reason)s)"
-
-#: gajim/roster_window.py:3353
+#: gajim/roster_window.py:3309
 #, fuzzy
 msgid "Remove Contact"
 msgstr "Контакт атын ауыстыру"
 
-#: gajim/roster_window.py:3354
+#: gajim/roster_window.py:3310
 #, fuzzy
 msgid "Remove contact from contact list"
 msgstr "Ростерден контактты өшіреді"
 
-#: gajim/roster_window.py:3355
+#: gajim/roster_window.py:3311
 #, 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:3364 gajim/roster_window.py:3384
+#: gajim/roster_window.py:3320 gajim/roster_window.py:3340
 #, fuzzy
 msgid ""
 "By removing this contact you also remove authorization. This means the "
@@ -1614,21 +1581,21 @@ msgstr ""
 "оларға берген авторизацияны да өшіресіз, ол енді сізді әрқашан желіде емес "
 "сияқты көреді."
 
-#: gajim/roster_window.py:3375
+#: gajim/roster_window.py:3331
 msgid "Do you want to continue?"
 msgstr "Жалғастыруды қалайсыз ба?"
 
-#: gajim/roster_window.py:3386
+#: gajim/roster_window.py:3342
 #, fuzzy
 msgid "_I want this contact to know my status after removal"
 msgstr "Өшіруден кейін осы контакттар менің қалып-күйімді білуін қалаймын"
 
-#: gajim/roster_window.py:3393
+#: gajim/roster_window.py:3349
 #, fuzzy
 msgid "Remove contacts from contact list"
 msgstr "Ростерден контактты өшіреді"
 
-#: gajim/roster_window.py:3399
+#: gajim/roster_window.py:3355
 #, fuzzy, python-format
 msgid ""
 "By removing the following contacts, you will also remove authorization. This "
@@ -1640,24 +1607,24 @@ msgstr ""
 "оларға берген авторизацияны да өшіресіз, ол енді сізді әрқашан желіде емес "
 "сияқты көреді."
 
-#: gajim/roster_window.py:3403
+#: gajim/roster_window.py:3359
 #, fuzzy
 msgid "Remove Contacts"
 msgstr "Контакт атын ауыстыру"
 
-#: gajim/roster_window.py:3423
+#: gajim/roster_window.py:3379
 msgid "No account available"
 msgstr "Бірде-бір тіркелгі қолжетерсіз"
 
-#: gajim/roster_window.py:3424
+#: gajim/roster_window.py:3380
 msgid "You must create an account before you can chat with other contacts."
 msgstr "Басқа контакттармен сөйлесу үшін алдымен тіркелгіні жасауыңыз қажет."
 
-#: gajim/roster_window.py:4060
+#: gajim/roster_window.py:4011
 msgid "Metacontacts storage not supported by your server"
 msgstr "Метаконтакттарды сақтау серверіңіз қолдамайды"
 
-#: gajim/roster_window.py:4062
+#: gajim/roster_window.py:4013
 #, fuzzy
 msgid ""
 "Your server does not support storing metacontacts information. So this "
@@ -1666,12 +1633,12 @@ msgstr ""
 "Серверінің метаконтакттар ақпаратын сақтауды қолдамайды. Сол үшін, бұл "
 "ақпарат келесі рет қосылғаны үшін сақталмайды."
 
-#: gajim/roster_window.py:4159
+#: gajim/roster_window.py:4110
 #, fuzzy
 msgid "You are about to create a metacontact"
 msgstr "Метаконтакт жасауды қалағансыз. Жалғастырамыз ба?"
 
-#: gajim/roster_window.py:4160
+#: gajim/roster_window.py:4111
 #, fuzzy
 msgid ""
 "Metacontacts are a way to regroup several contacts in one single contact. "
@@ -1681,123 +1648,114 @@ msgstr ""
 "Метаконтакт - бірнеше бірлік контактты бір жолға біріктіру тәсілі. Әдетте ол "
 "бір адамның бірнеше Jabber не транспорт тіркелгілері бар болса қолданылады."
 
-#: gajim/roster_window.py:4164
+#: gajim/roster_window.py:4115
 #, fuzzy
 msgid "Create Metacontact"
 msgstr "Контакт атын ауыстыру"
 
-#: gajim/roster_window.py:4170
+#: gajim/roster_window.py:4121 gajim/data/gui/groupchat_creation.ui:317
 #, fuzzy
 msgid "_Create"
 msgstr "Жасампаз"
 
-#: gajim/roster_window.py:4287
+#: gajim/roster_window.py:4238
 msgid "Invalid file URI:"
 msgstr "Файл URI қате:"
 
-#: gajim/roster_window.py:4298
+#: gajim/roster_window.py:4249
 #, fuzzy
 msgid "Send file?"
 msgstr "_Файлды жіберу"
 
-#: gajim/roster_window.py:4299
+#: gajim/roster_window.py:4250
 #, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
 msgstr[0] "Бұл файлды %s үшін жіберуді қалайсыз ба:"
 msgstr[1] "Бұл файлдарды %s үшін жіберуді қалайсыз ба:"
 
-#: gajim/roster_window.py:4451
+#: gajim/roster_window.py:4401
 #, fuzzy, python-format
 msgid "Send %(from)s to %(to)s"
 msgstr "%s қазір %s үшін жіберу"
 
-#: gajim/roster_window.py:4464
+#: gajim/roster_window.py:4414
 #, python-format
 msgid "Make %s first contact"
 msgstr "%s бірінші контакт қылу"
 
-#: gajim/roster_window.py:4469
+#: gajim/roster_window.py:4419
 #, fuzzy, python-format
 msgid "Make %(contact1)s and %(contact2)s metacontacts"
 msgstr "%s және %s метаконтакт жасау"
 
-#: gajim/roster_window.py:4825 gajim/roster_window.py:4923
+#: gajim/roster_window.py:4775 gajim/roster_window.py:4862
 msgid "_Change Status Message"
 msgstr "Қалып-кү_й хабарламасын өзгерту"
 
-#: gajim/roster_window.py:4845
+#: gajim/roster_window.py:4795
 msgid "Publish Tune"
 msgstr "Өленді жариялау"
 
-#: gajim/roster_window.py:4856
+#: gajim/roster_window.py:4806
 msgid "Publish Location"
 msgstr "Орналасуды жариялау"
 
-#: gajim/roster_window.py:4868
-#, fuzzy
-msgid "Configure Services…"
-msgstr "Қызметтерді баптау..."
-
-#: gajim/roster_window.py:4997
+#: gajim/roster_window.py:4936
 msgid "_Maximize All"
 msgstr "Бар_лығын жазу"
 
-#: gajim/roster_window.py:5004 gajim/roster_window.py:5146
+#: gajim/roster_window.py:4943 gajim/roster_window.py:5085
 msgid "Send Group M_essage"
 msgstr "Топ ү_шін хабарлама жіберу"
 
-#: gajim/roster_window.py:5011
+#: gajim/roster_window.py:4950
 msgid "To all users"
 msgstr "Барлық пайдаланушыларға"
 
-#: gajim/roster_window.py:5015
+#: gajim/roster_window.py:4954
 msgid "To all online users"
 msgstr "Барлық желідегі пайдаланушыларға"
 
-#: gajim/roster_window.py:5027 gajim/roster_window.py:5152
+#: gajim/roster_window.py:4966 gajim/roster_window.py:5091
 #: gajim/data/gui/gc_occupants_menu.ui:110
 #: gajim/data/gui/contact_context_menu.ui:36
 msgid "In_vite to"
 msgstr "_Шақыру"
 
-#: gajim/roster_window.py:5162
+#: gajim/roster_window.py:5101
 msgid "_Manage Contacts"
 msgstr "_Контакттарды басқару"
 
-#: gajim/roster_window.py:5168
+#: gajim/roster_window.py:5107
 #, fuzzy
 msgid "Edit _Groups…"
 msgstr "Топтар_ды түзету"
 
-#: gajim/roster_window.py:5189 gajim/data/gui/filetransfers.ui:12
+#: gajim/roster_window.py:5128 gajim/data/gui/filetransfers.ui:12
 #: gajim/data/gui/remove_account_window.ui:134
 msgid "_Remove"
 msgstr "Өші_ру"
 
-#: gajim/roster_window.py:5226
+#: gajim/roster_window.py:5165
 msgid "_Maximize"
 msgstr "_Максималды қылу"
 
-#: gajim/roster_window.py:5233
+#: gajim/roster_window.py:5172
 msgid "_Reconnect"
 msgstr "Қа_йта байланысу"
 
-#: gajim/roster_window.py:5254 gajim/data/gui/gc_occupants_menu.ui:170
+#: gajim/roster_window.py:5193 gajim/data/gui/gc_occupants_menu.ui:170
 #: gajim/data/gui/gc_control_popup_menu.ui:113
 #: gajim/data/gui/contact_context_menu.ui:205
 msgid "_History"
 msgstr "Тар_ихы"
 
-#: gajim/roster_window.py:5335 gajim/data/gui/application_menu.ui:86
+#: gajim/roster_window.py:5274 gajim/data/gui/application_menu.ui:83
 #: gajim/data/gui/history_window.ui:57
 msgid "History Manager"
 msgstr "Тарихты басқару"
 
-#: gajim/roster_window.py:5343
-msgid "_Join New Group Chat"
-msgstr "Жаңа _чат бөлмесіне кіру"
-
 #: gajim/dataforms_widget.py:585
 msgid "Unable to load image"
 msgstr "Суретті жүктеу мүмкін емес"
@@ -1919,255 +1877,272 @@ msgstr "Тақырыбы: %s\n"
 msgid "Write a message…"
 msgstr "Хабарлама алу"
 
-#: gajim/message_window.py:250
+#: gajim/message_window.py:356
+#, fuzzy
+msgid "Close Tabs"
+msgstr "_Жіберу мен жабу"
+
+#: gajim/message_window.py:357
 msgid "You are going to close several tabs"
 msgstr "Сіз бірнеше чатты жабуды таңдадыңыз"
 
-#: gajim/message_window.py:251
+#: gajim/message_window.py:358
 msgid "Do you really want to close them all?"
 msgstr "Сіз олардың барлығын жабуды таңдайсыз ба?"
 
-#: gajim/message_window.py:539
+#: gajim/message_window.py:514
 #, fuzzy
 msgid "?Noun:Chats"
 msgstr "Чат бөлмелері"
 
-#: gajim/message_window.py:543
+#: gajim/message_window.py:518
 #, fuzzy
 msgid "Group Chats"
 msgstr "Топтық чаттар"
 
-#: gajim/message_window.py:547
+#: gajim/message_window.py:522
 msgid "Private Chats"
 msgstr "Жеке чаттар"
 
-#: gajim/message_window.py:553
+#: gajim/message_window.py:528
 msgid "Messages"
 msgstr "Хабарламалар"
 
-#: gajim/gui_interface.py:173
+#: gajim/gui_interface.py:170
+#, 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:175
 msgid "Do you accept this request?"
 msgstr "Бұл сұранымды қабылдайсыз ба?"
 
-#: gajim/gui_interface.py:175
-#, python-format
-msgid "Do you accept this request on account %s?"
+#: gajim/gui_interface.py:177
+#, fuzzy, python-format
+msgid "Do you accept this request (account: %s)?"
 msgstr "%s тіркелгісіндегі бұл сұранымды қабылдайсыз ба?"
 
-#: gajim/gui_interface.py:178
-#, 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:182
+#, fuzzy
+msgid "Authorization"
+msgstr "Авторизация жіберілді"
 
-#: gajim/gui_interface.py:194 gajim/gtk/notification.py:175
+#: gajim/gui_interface.py:186 gajim/gui_interface.py:420
+#: gajim/gtk/filetransfer.py:338
+#, fuzzy
+msgid "_No"
+msgstr "Жоқ"
+
+#: gajim/gui_interface.py:205 gajim/gtk/notification.py:175
 #: gajim/gtk/notification.py:197
 msgid "Connection Failed"
 msgstr "Байланысу сәтсіз"
 
-#: gajim/gui_interface.py:279 gajim/gui_interface.py:529
-msgid "Password Required"
-msgstr "Пароль керек"
-
-#: gajim/gui_interface.py:280
-#, python-format
-msgid "A Password is required to join the room %s. Please type it."
-msgstr "%s бөлмесіне кіру үшін пароль керек. Оны көрсетіңіз."
-
-#: gajim/gui_interface.py:342 gajim/gui_interface.py:346
+#: gajim/gui_interface.py:325 gajim/gui_interface.py:329
 #, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr "Қате %(code)s: %(msg)s"
 
-#: gajim/gui_interface.py:357 gajim/gui_interface.py:376
+#: gajim/gui_interface.py:340 gajim/gui_interface.py:359
 #: gajim/common/modules/message.py:122
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "%(message)s жіберу кезіндегі қате ( %(error)s )"
 
-#: gajim/gui_interface.py:401 gajim/gtk/notification.py:175
+#: gajim/gui_interface.py:384 gajim/gtk/notification.py:175
 msgid "Subscription request"
 msgstr "Жазылуға сұраным"
 
-#: gajim/gui_interface.py:413 gajim/common/contacts.py:184
-#: gajim/common/helpers.py:83
+#: gajim/gui_interface.py:396 gajim/common/contacts.py:200
+#: gajim/common/helpers.py:86
 msgid "Observers"
 msgstr "Байқаушылар"
 
-#: gajim/gui_interface.py:422
+#: gajim/gui_interface.py:405
 msgid "Authorization accepted"
 msgstr "Авторизация қабылданды"
 
-#: gajim/gui_interface.py:423
+#: gajim/gui_interface.py:406
 #, fuzzy, python-format
 msgid "The contact \"%s\" has authorized you to see their status."
 msgstr "\"%s\" контакты өз қалып-күйін көруге сізге авторизация берген."
 
-#: gajim/gui_interface.py:431
-#, python-format
-msgid "Contact \"%s\" removed subscription from you"
+#: gajim/gui_interface.py:415
+#, fuzzy
+msgid "Subscription Removed"
+msgstr "Жазылуға сұраным"
+
+#: gajim/gui_interface.py:416
+#, fuzzy, python-format
+msgid "Contact '%s' removed subscription from you"
 msgstr "\"%s\" контакты сізден өзіне жазылуды өшіріп тастаған"
 
-#: gajim/gui_interface.py:432
+#: gajim/gui_interface.py:417
 #, fuzzy
 msgid ""
-"You will always see them as offline.\n"
+"You will always see this contact as offline.\n"
 "Do you want to remove them from your contact list?"
 msgstr ""
 "Сіз енді оны әрқашан да желіде емес ретінде көресіз.\n"
 "Оны өз контакттар тізіміңізден өшіруді қалайсыз ба?"
 
-#: gajim/gui_interface.py:453 gajim/gtk/notification.py:176
+#: gajim/gui_interface.py:442 gajim/gtk/notification.py:176
 msgid "Unsubscribed"
 msgstr "Жазылмаған"
 
-#: gajim/gui_interface.py:465
+#: gajim/gui_interface.py:454
 #, python-format
 msgid "%(jid)s declined the invitation: %(reason)s"
 msgstr ""
 
-#: gajim/gui_interface.py:469
+#: gajim/gui_interface.py:458
 #, python-format
 msgid "%(jid)s declined the invitation"
 msgstr ""
 
-#: gajim/gui_interface.py:485
+#: gajim/gui_interface.py:474
 #, fuzzy, python-brace-format
 msgid "You are invited to {room} by {user}"
 msgstr "Сізді топтық чатқа шақырған"
 
-#: gajim/gui_interface.py:506
+#: gajim/gui_interface.py:495
 #, fuzzy
 msgid "Certificate Passphrase Required"
 msgstr "Сертификат мерзімі біткен"
 
-#: gajim/gui_interface.py:507
+#: gajim/gui_interface.py:496
 #, fuzzy, python-format
 msgid "Enter the certificate passphrase for account %s"
 msgstr ""
 "%(keyid)s кілті үшін GPG кілт құпия сөзін енгізіңіз (%(account)s тіркелгісі)."
 
-#: gajim/gui_interface.py:516 gajim/gtk/accounts.py:963
+#: gajim/gui_interface.py:505 gajim/gtk/accounts.py:966
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "%s тіркелгіңіз үшін парольді енгізіңіз"
 
-#: gajim/gui_interface.py:529 gajim/gtk/accounts.py:964
+#: gajim/gui_interface.py:518
+msgid "Password Required"
+msgstr "Пароль керек"
+
+#: gajim/gui_interface.py:518 gajim/gtk/accounts.py:967
 msgid "Save password"
 msgstr "Парольді сақтау"
 
-#: gajim/gui_interface.py:601 gajim/gui_interface.py:632
+#: gajim/gui_interface.py:587 gajim/gui_interface.py:618
+#: gajim/gtk/filetransfer.py:332 gajim/gtk/filetransfer.py:333
 #: gajim/gtk/notification.py:173 gajim/gtk/notification.py:276
 msgid "File Transfer Error"
 msgstr "Файл алмасу қатесі"
 
-#: gajim/gui_interface.py:666
+#: gajim/gui_interface.py:652
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s сізге файлды жібергісі келеді:"
 
-#: gajim/gui_interface.py:668 gajim/gtk/filetransfer.py:479
+#: gajim/gui_interface.py:654 gajim/gtk/filetransfer.py:484
 #: gajim/gtk/notification.py:172 gajim/gtk/notification.py:274
 msgid "File Transfer Request"
 msgstr "Файл алмасуға сұраным"
 
-#: gajim/gui_interface.py:767
+#: gajim/gui_interface.py:753
 #, fuzzy
 msgid "Remote Contact Stopped Transfer"
 msgstr "Қашықтағы контакт файлдармен алмасуды тоқтатқан"
 
-#: gajim/gui_interface.py:772
+#: gajim/gui_interface.py:758
 #, fuzzy
 msgid "Error Opening File"
 msgstr "Файлды ашу қатесі"
 
-#: gajim/gui_interface.py:782
+#: gajim/gui_interface.py:768
 #, fuzzy
 msgid "SSL Certificate Error"
 msgstr "SSL сертификат қатесі"
 
-#: gajim/gui_interface.py:795 gajim/gui_interface.py:826
-#: gajim/gui_interface.py:853 gajim/gtk/notification.py:174
+#: gajim/gui_interface.py:781 gajim/gui_interface.py:812
+#: gajim/gui_interface.py:839 gajim/gtk/notification.py:174
 #: gajim/gtk/notification.py:279
 msgid "File Transfer Stopped"
 msgstr "Файл алмасу тоқтатылған"
 
-#: gajim/gui_interface.py:799
+#: gajim/gui_interface.py:785
 #, fuzzy
 msgid "File Transfer Failed"
 msgstr "Файлдармен алмасу аяқталды"
 
-#: gajim/gui_interface.py:822
+#: gajim/gui_interface.py:808
 #, fuzzy, python-format
 msgid "%(filename)s received from %(name)s."
 msgstr "%(name)s жіберген %(filename)s файлын алу тоқтатылды."
 
-#: gajim/gui_interface.py:827
+#: gajim/gui_interface.py:813
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "%(name)s жіберген %(filename)s файлын алу тоқтатылды."
 
-#: gajim/gui_interface.py:833
+#: gajim/gui_interface.py:819
 #, fuzzy, python-format
 msgid "File transfer of %(filename)s from %(name)s failed."
 msgstr "%(name)s жіберген %(filename)s файлын алу тоқтатылды."
 
-#: gajim/gui_interface.py:848
+#: gajim/gui_interface.py:834
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Сіз %(filename)s файлын %(name)s үшін сәтті жібердіңіз."
 
-#: gajim/gui_interface.py:854
+#: gajim/gui_interface.py:840
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "%(filename)s файлын %(name)s үшін жіберу тоқтатылды."
 
-#: gajim/gui_interface.py:860
+#: gajim/gui_interface.py:846
 #, fuzzy, python-format
 msgid "File transfer of %(filename)s to %(name)s failed."
 msgstr "%(filename)s файлын %(name)s үшін жіберу тоқтатылды."
 
-#: gajim/gui_interface.py:971
+#: gajim/gui_interface.py:957
 msgid "Username Conflict"
 msgstr "Пайдаланушы аттардың ерегісуі"
 
-#: gajim/gui_interface.py:972
+#: gajim/gui_interface.py:958
 msgid "Please type a new username for your local account"
 msgstr "Жергілікті тіркелгіңіз үшін жаңа пайдаланушы атын енгізіңіз"
 
-#: gajim/gui_interface.py:995
+#: gajim/gui_interface.py:981
 msgid "Resource Conflict"
 msgstr "Ресурстар ерегісуі"
 
-#: gajim/gui_interface.py:996
+#: gajim/gui_interface.py:982
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
 msgstr "Сіз осы тіркелгіге осы ресурспен қосулы тұрсыз. Жаңасын көрсетіңіз"
 
-#: gajim/gui_interface.py:1053
+#: gajim/gui_interface.py:1039
 #, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s сізбен дауыс чатын бастағысы келеді."
 
-#: gajim/gui_interface.py:1055
+#: gajim/gui_interface.py:1041
 msgid "Voice Chat Request"
 msgstr "Дауыс чатына сұраным"
 
-#: gajim/gui_interface.py:1123 gajim/gtk/account_wizard.py:312
+#: gajim/gui_interface.py:1109 gajim/gtk/account_wizard.py:312
 msgid "Certificate Already in File"
 msgstr "Сертификат файлда бар болып тұр"
 
-#: gajim/gui_interface.py:1124 gajim/gtk/account_wizard.py:313
+#: gajim/gui_interface.py:1110 gajim/gtk/account_wizard.py:313
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr "Сертификат %s файлында бар болып тұр, сол үшін қайта қосылмайды."
 
-#: gajim/gui_interface.py:1145
+#: gajim/gui_interface.py:1131
 #, fuzzy, python-format
 msgid "The authenticity of the %s certificate could be invalid"
 msgstr "%s сертификатының нақтылығы қате болуы мүмкін."
 
-#: gajim/gui_interface.py:1148
+#: gajim/gui_interface.py:1134
 #, python-format
 msgid ""
 "\n"
@@ -2176,7 +2151,7 @@ msgstr ""
 "\n"
 "Белгісіз SSL қатесі: %d"
 
-#: gajim/gui_interface.py:1150
+#: gajim/gui_interface.py:1136
 #, python-format
 msgid ""
 "\n"
@@ -2185,11 +2160,11 @@ msgstr ""
 "\n"
 "SSL Қатесі: <b>%s</b>"
 
-#: gajim/gui_interface.py:1155
+#: gajim/gui_interface.py:1141
 msgid "Error verifying SSL certificate"
 msgstr "SSL сертификатын растау қатесі"
 
-#: gajim/gui_interface.py:1156
+#: gajim/gui_interface.py:1142
 #, fuzzy, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your XMPP server: "
@@ -2200,7 +2175,7 @@ msgstr ""
 "%(error)s\n"
 "Сонда да сервермен байланысты орнатуды қалайсыз ба?"
 
-#: gajim/gui_interface.py:1160 gajim/gtk/account_wizard.py:412
+#: gajim/gui_interface.py:1146 gajim/gtk/account_wizard.py:413
 #, fuzzy, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -2213,167 +2188,157 @@ msgstr ""
 "Сертификаттың SHA1 баспасы:\n"
 "%s"
 
-#: gajim/gui_interface.py:1166
+#: gajim/gui_interface.py:1152
 msgid "Ignore this error for this certificate."
 msgstr "Бұл сертификат үшін осы қатені елемеу."
 
-#: gajim/gui_interface.py:1174
+#: gajim/gui_interface.py:1160
 #, fuzzy, python-format
 msgid "SSL Certificate Verification for %s"
 msgstr "SSL сертификат қатесі"
 
-#: gajim/gui_interface.py:1442 gajim/gtk/join_groupchat.py:235
-msgid "You can not join a group chat unless you are connected."
-msgstr "Байланыс орнатпасаңыз, топтық чатқа кіре алмайсыз."
-
-#: gajim/gui_interface.py:1448
-#, fuzzy
-msgid "JID is not a Groupchat"
-msgstr "Бұл топтық чат"
-
-#: gajim/gui_interface.py:1579
-msgid "This is not a group chat"
-msgstr "Бұл топтық чат"
-
-#: gajim/gui_interface.py:1580
-#, python-format
-msgid ""
-"%(room_jid)s is already in your roster. Please check if %(room_jid)s is a "
-"correct group chat name. If it is, delete it from your roster and try "
-"joining the group chat again."
-msgstr ""
-
-#: gajim/gui_interface.py:1604 gajim/dialog_messages.py:58
+#: gajim/gui_interface.py:1577
 msgid "You cannot join a group chat while you are invisible"
 msgstr "Жасырын болған кезде топ чатқа кіре алмайсыз"
 
-#: gajim/gui_interface.py:2037
+#: gajim/gui_interface.py:1976
 msgid "Could not save your settings and preferences"
 msgstr "Баптауларыңызды сақтау мүмкін емес"
 
-#: gajim/gui_interface.py:2098
+#: gajim/gui_interface.py:2037
 msgid "Gajim: IPython Console"
 msgstr ""
 
-#: gajim/dialog_messages.py:32
+#: gajim/dialog_messages.py:31 gajim/dialog_messages.py:36
+#: gajim/gtk/single_message.py:305 gajim/gtk/account_wizard.py:229
 #, fuzzy
-msgid "You can not start a new conversation unless you are connected."
-msgstr "Байланыс орнатпасаңыз, топтық чатқа кіре алмайсыз."
-
-#: gajim/dialog_messages.py:36 gajim/dialog_messages.py:41
-#: gajim/gtk/single_message.py:305 gajim/gtk/join_groupchat.py:211
-#: gajim/gtk/account_wizard.py:229
-msgid "Invalid JID"
-msgstr "Қате JID"
+msgid "Invalid XMPP Address"
+msgstr "Қате файл"
 
-#: gajim/dialog_messages.py:42 gajim/gtk/single_message.py:306
-#, python-format
-msgid "It is not possible to send a message to %s, this JID is not valid."
+#: gajim/dialog_messages.py:37
+#, fuzzy, python-format
+msgid ""
+"It is not possible to send a message to %s. This XMPP Address is not valid."
 msgstr "%s үшін хабарламаны жіберу мүмкін емес, бұл JID дұрыс емес."
 
-#: gajim/dialog_messages.py:47
-msgid "Unread events"
+#: gajim/dialog_messages.py:42
+#, fuzzy
+msgid "Unread Events"
 msgstr "Оқылмаған оқиғалар"
 
-#: gajim/dialog_messages.py:48
-msgid "Read all pending events before removing this account."
+#: gajim/dialog_messages.py:43
+#, fuzzy
+msgid "Read or acknowledge all pending events before removing this account."
 msgstr ""
 "Осы тіркелгіні өшіру алдында барлық кезекте тұрған оқиғаларды оқып шығу."
 
-#: gajim/dialog_messages.py:52
+#: gajim/dialog_messages.py:48
 msgid "Invalid Form"
 msgstr "Қате форма"
 
-#: gajim/dialog_messages.py:53
+#: gajim/dialog_messages.py:49
 msgid "The form is not filled correctly."
 msgstr "Форма дұрыс толтырылмаған."
 
-#: gajim/dialog_messages.py:57 gajim/common/helpers.py:309
+#: gajim/dialog_messages.py:53 gajim/common/helpers.py:315
 msgid "Invisible"
 msgstr "Жасырын"
 
-#: gajim/dialog_messages.py:62
-msgid "A connection is not available"
+#: gajim/dialog_messages.py:54
+#, fuzzy
+msgid "You cannot join a group chat while being invisible."
+msgstr "Жасырын болған кезде топ чатқа кіре алмайсыз"
+
+#: gajim/dialog_messages.py:58
+#, fuzzy
+msgid "No Connection Available"
 msgstr "Байланыс қолжетерсіз"
 
-#: gajim/dialog_messages.py:63
+#: gajim/dialog_messages.py:59
 msgid "Your message can not be sent until you are connected."
 msgstr "Хабарламаңыз байланыс орнатпағанша жіберілмейді."
 
-#: gajim/dialog_messages.py:67
-#, fuzzy
-msgid "JID already in list"
-msgstr "Jabber ID тізімде бар болып тұр"
+#: gajim/dialog_messages.py:63
+msgid "XMPP Address Already in List"
+msgstr ""
 
-#: gajim/dialog_messages.py:68
+#: gajim/dialog_messages.py:64
 #, fuzzy
-msgid "The JID you entered is already in the list. Choose another one."
+msgid ""
+"The XMPP Address you entered is already in the list. Please choose another "
+"one."
 msgstr "Сіз енгізген Jabber ID тізімде бар болып тұр. Басқасын таңдаңыз."
 
-#: gajim/dialog_messages.py:72
-msgid "Invalid answer"
+#: gajim/dialog_messages.py:69
+#, fuzzy
+msgid "Invalid Answer"
 msgstr "Қате жауап"
 
-#: gajim/dialog_messages.py:73
+#: gajim/dialog_messages.py:70
 #, python-format
 msgid "Transport %(name)s answered wrongly to register request: %(error)s"
 msgstr " %(name)s қызметі тіркелуге сұранымына қате жауап берген: %(error)s"
 
-#: gajim/dialog_messages.py:78
+#: gajim/dialog_messages.py:75
 #, fuzzy
 msgid "Wrong Custom Hostname"
 msgstr "Пайдаланушы хост аты/порт қолдану"
 
-#: gajim/dialog_messages.py:79
+#: gajim/dialog_messages.py:76
 #, fuzzy, python-format
-msgid "Wrong custom hostname \"%s\". Ignoring it."
+msgid "Custom hostname \"%s\" is wrong. It will be ignored."
 msgstr "Пайдаланушы хост аты/порт қолдану"
 
-#: gajim/dialog_messages.py:83
-msgid "Error while removing privacy list"
+#: gajim/dialog_messages.py:80
+#, fuzzy
+msgid "Error While Removing Privacy List"
 msgstr "Жекелік тізімін өшіру кезінде қате кетті"
 
-#: gajim/dialog_messages.py:84
-#, python-format
+#: gajim/dialog_messages.py:81
+#, fuzzy, python-format
 msgid ""
-"Privacy list %s has not been removed. It is maybe active in one of your "
-"connected resources. Deactivate it and try again."
+"Privacy list %s has not been removed. It is probably active in one of your "
+"connected resources. Please deactivate it and try again."
 msgstr ""
 "%s жекелік тізімі өшірілмеген. Байланысқан ресурстарыңыздың біреу үшін болуы "
 "мүмкін. Оны сөндіріп, қайталар көріңіз."
 
-#: gajim/dialog_messages.py:90
-msgid "Invisibility not supported"
+#: gajim/dialog_messages.py:87
+#, fuzzy
+msgid "Invisibility Not Supported"
 msgstr "Жасырын болуға қолдау жоқ"
 
-#: gajim/dialog_messages.py:91
-#, python-format
-msgid "Account %s doesn't support invisibility."
+#: gajim/dialog_messages.py:88
+#, fuzzy, python-format
+msgid "This account %s doesn't support invisibility."
 msgstr "%s тіркелгісі жасырын болуды қолдамайды."
 
-#: gajim/dialog_messages.py:95
-msgid "Unregister failed"
+#: gajim/dialog_messages.py:92
+#, fuzzy
+msgid "Unregister Failed"
 msgstr "Тіркелгіні өшіру сәтсіз"
 
-#: gajim/dialog_messages.py:96
-#, python-format
-msgid "Unregistration with server %(server)s failed: %(error)s"
+#: gajim/dialog_messages.py:93
+#, fuzzy, python-format
+msgid "Unregistration on server %(server)s failed: %(error)s"
 msgstr "%(server)s серверінен тіркелгіні өшіру сәтсіз: %(error)s"
 
-#: gajim/dialog_messages.py:100
-msgid "Registration succeeded"
+#: gajim/dialog_messages.py:97
+#, fuzzy
+msgid "Registration Succeeded"
 msgstr "Тіркелу сәтті аяқталды"
 
-#: gajim/dialog_messages.py:101
-#, python-format
-msgid "Registration with agent %s succeeded"
+#: gajim/dialog_messages.py:98
+#, fuzzy, python-format
+msgid "Registration with agent %s succeeded."
 msgstr "%s агенті көмегімен тіркелу сәтті аяқталды"
 
-#: gajim/dialog_messages.py:105 gajim/gtk/service_registration.py:215
-msgid "Registration failed"
+#: gajim/dialog_messages.py:102
+#, fuzzy
+msgid "Registration Failed"
 msgstr "Тіркелу сәтсіз"
 
-#: gajim/dialog_messages.py:106
+#: gajim/dialog_messages.py:103
 #, python-format
 msgid ""
 "Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
@@ -2381,16 +2346,17 @@ msgstr ""
 "%(agent)s агенті көмегімен тіркелу %(error)s қатесімен аяқталды: "
 "%(error_msg)s"
 
-#: gajim/dialog_messages.py:111
+#: gajim/dialog_messages.py:108
 #, fuzzy
 msgid "Unable to Join Group Chat"
 msgstr "Чат бөлмесіне кіру мүмкін емес"
 
-#: gajim/dialog_messages.py:116
-msgid "GStreamer error"
+#: gajim/dialog_messages.py:113
+#, fuzzy
+msgid "GStreamer Error"
 msgstr "GStreamer қатесі"
 
-#: gajim/dialog_messages.py:117
+#: gajim/dialog_messages.py:114
 #, fuzzy, python-format
 msgid ""
 "Error: %(error)s\n"
@@ -2399,19 +2365,21 @@ msgstr ""
 "Қате: %s\n"
 "Жөндеу: %s"
 
-#: gajim/dialog_messages.py:121
-msgid "Wrong host"
+#: gajim/dialog_messages.py:118
+#, fuzzy
+msgid "Wrong Host"
 msgstr "Қате хост"
 
-#: gajim/dialog_messages.py:122
+#: gajim/dialog_messages.py:119
 msgid "Invalid local address? :-O"
 msgstr "Жергілікті адрес қате? :-O"
 
-#: gajim/dialog_messages.py:126
-msgid "Avahi error"
+#: gajim/dialog_messages.py:123
+#, fuzzy
+msgid "Avahi Error"
 msgstr "Avahi қатесі"
 
-#: gajim/dialog_messages.py:127
+#: gajim/dialog_messages.py:124
 #, python-format
 msgid ""
 "%s\n"
@@ -2420,66 +2388,66 @@ msgstr ""
 "%s\n"
 "Link-local хабарламалары дұрыс істемеуі мүмкін."
 
-#: gajim/dialog_messages.py:131 gajim/dialog_messages.py:136
+#: gajim/dialog_messages.py:128 gajim/dialog_messages.py:133
 #, fuzzy
-msgid "Could not request upload slot"
+msgid "Could not request upload slot for HTTP File Upload"
 msgstr "Жергілікті қызметті қосу мүмкін емес"
 
-#: gajim/dialog_messages.py:137
-msgid "Got unexpected response from server (see log)"
+#: gajim/dialog_messages.py:134
+msgid "Got unexpected response from server (see log)."
 msgstr ""
 
-#: gajim/dialog_messages.py:141 gajim/dialog_messages.py:146
+#: gajim/dialog_messages.py:138 gajim/dialog_messages.py:143
 #, fuzzy
-msgid "Could not open file"
+msgid "Could not Open File"
 msgstr "Суретті жүктеу мүмкін емес"
 
-#: gajim/dialog_messages.py:142
-msgid "Exception raised while opening file (see log)"
+#: gajim/dialog_messages.py:139
+msgid "Exception raised while trying to open file (see log)."
 msgstr ""
 
-#: gajim/dialog_messages.py:151
-msgid "Unsecure"
-msgstr ""
+#: gajim/dialog_messages.py:148
+#, fuzzy
+msgid "Not Secure"
+msgstr "Басталмаған"
 
-#: gajim/dialog_messages.py:152
+#: gajim/dialog_messages.py:149
 #, fuzzy
-msgid "Server returned unsecure transport (HTTP)"
+msgid "The server returned an insecure transport (HTTP)."
 msgstr "Қызмет қатені қайтарған."
 
-#: gajim/dialog_messages.py:156
+#: gajim/dialog_messages.py:153
 #, fuzzy
-msgid "Could not upload file"
+msgid "Could not Upload File"
 msgstr "Суретті жүктеу мүмкін емес"
 
-#: gajim/dialog_messages.py:157
+#: gajim/dialog_messages.py:154
 #, python-format
 msgid "HTTP response code from server: %s"
 msgstr ""
 
-#: gajim/dialog_messages.py:161
+#: gajim/dialog_messages.py:158
 msgid "Upload Error"
 msgstr ""
 
-#: gajim/dialog_messages.py:166
+#: gajim/dialog_messages.py:163
 msgid "Encryption Error"
 msgstr ""
 
-#: gajim/dialog_messages.py:167
-#, fuzzy
-msgid "For the chosen encryption there is no encryption method available"
-msgstr "Байланыс қолжетерсіз"
+#: gajim/dialog_messages.py:164
+msgid "There is no encryption method available for the chosen encryption."
+msgstr ""
 
-#: gajim/dialog_messages.py:171
+#: gajim/dialog_messages.py:169
 #, fuzzy
-msgid "Avatar upload failed"
+msgid "Avatar Upload Failed"
 msgstr "vCard жариялануы қатемен аяқталды"
 
-#: gajim/privatechat_control.py:204
+#: gajim/privatechat_control.py:207
 msgid "Sending private message failed"
 msgstr "Жеке хабарламаны жіберу сәтсіз"
 
-#: gajim/privatechat_control.py:206
+#: gajim/privatechat_control.py:209
 #, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr ""
@@ -2503,7 +2471,7 @@ msgstr "команда көмегін көрсету"
 
 #: gajim/gajim_remote.py:85
 #, fuzzy
-msgid "Lists all contacts in roster, one for each line"
+msgid "Lists all contacts in the contact list, one for each line"
 msgstr ""
 "Ростердегі бар контакттар тізімін шығарады. Әр контакт бөлек жолда болады"
 
@@ -2585,11 +2553,13 @@ msgstr ""
 
 #: gajim/gajim_remote.py:118
 #, fuzzy
-msgid "Sends new chat message to a contact in the roster. Account is optional."
+msgid ""
+"Sends new chat message to a contact in the contact list. Account is optional."
 msgstr "Контактқа файлды жібереді"
 
 #: gajim/gajim_remote.py:120 gajim/gajim_remote.py:130
-msgid "JID of the contact that will receive the message"
+#, fuzzy
+msgid "XMPP Address of the contact that will receive the message"
 msgstr "Хабарламаны алатын контакттың JID-і"
 
 #: gajim/gajim_remote.py:121 gajim/gajim_remote.py:132
@@ -2603,8 +2573,10 @@ msgid "if specified, the message will be sent using this account"
 msgstr "көрсетілсе, хабарлама бұл тіркелгіні қолданып жіберіледі"
 
 #: gajim/gajim_remote.py:127
-msgid "Sends a chat message to someone on your roster. Account is optional."
-msgstr ""
+#, fuzzy
+msgid ""
+"Sends a chat message to someone on your contact list. Account is optional."
+msgstr "Контактқа файлды жібереді"
 
 #: gajim/gajim_remote.py:131
 msgid "subject"
@@ -2615,11 +2587,13 @@ msgid "message subject"
 msgstr "хабарлама тақырыбы"
 
 #: gajim/gajim_remote.py:138
-msgid "Sends new message to a groupchat you've joined."
+#, fuzzy
+msgid "Sends new message to a group chat you've joined."
 msgstr "Сіз кірген топ чатына жаңа хабарламаны жіберу."
 
 #: gajim/gajim_remote.py:140
-msgid "JID of the room that will receive the message"
+#, fuzzy
+msgid "XMPP Address of the group chat that will receive the message"
 msgstr "хабарламаны алатын бөлменің JID-і"
 
 #: gajim/gajim_remote.py:147
@@ -2628,7 +2602,8 @@ msgstr "Контакттың толық ақпаратын алу"
 
 #: gajim/gajim_remote.py:149 gajim/gajim_remote.py:162
 #: gajim/gajim_remote.py:192
-msgid "JID of the contact"
+#, fuzzy
+msgid "XMPP Address of the contact"
 msgstr "Контакт JID-і"
 
 #: gajim/gajim_remote.py:153
@@ -2689,7 +2664,8 @@ msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Gajim ағымдағы баптауларын .config файлына жазу"
 
 #: gajim/gajim_remote.py:190
-msgid "Removes contact from roster"
+#, fuzzy
+msgid "Removes contact from contact list"
 msgstr "Ростерден контактты өшіреді"
 
 #: gajim/gajim_remote.py:193
@@ -2737,9 +2713,9 @@ msgid "Missing argument \"contact_jid\""
 msgstr "\"contact_jid\" аргументі жоқ"
 
 #: gajim/gajim_remote.py:275
-#, python-format
+#, fuzzy, python-format
 msgid ""
-"'%s' is not in your roster.\n"
+"'%s' is not in your contact list.\n"
 "Please specify account for sending the message."
 msgstr ""
 "'%s' ростеріңізде жоқ.\n"
@@ -2962,12 +2938,12 @@ msgstr "Апта аяғы"
 msgid "Weekend!"
 msgstr "Демалыс!"
 
-#: gajim/common/logger.py:192 gajim/common/logger.py:197
+#: gajim/common/logger.py:189 gajim/common/logger.py:194
 #, python-format
 msgid "%s is a directory but should be a file"
 msgstr "%s бума екен, алайда файл болуы керек еді"
 
-#: gajim/common/logger.py:217
+#: gajim/common/logger.py:214
 #, fuzzy, python-format
 msgid "Creating %s"
 msgstr "Өшірілуде %s"
@@ -3041,22 +3017,21 @@ msgstr "%(nickname)s желіден шықты"
 msgid "Contact Signed Out"
 msgstr "Контакт шықты"
 
-#: gajim/common/contacts.py:455
-msgid "Not in roster"
-msgstr "Ростерде емес"
-
 #: gajim/common/config.py:80
+#, fuzzy
 msgid ""
 "Show desktop notification even when a chat window is opened for this contact "
-"and does not have focus"
-msgstr ""
+"and does not have focus."
+msgstr "Қалқыма/хабарлауды мен _кқ/қж/бе/жасырын болғанда рұқсат ету"
 
 #: gajim/common/config.py:81
-msgid "Play sound when user is busy"
+#, fuzzy
+msgid "Play sound even when being busy."
 msgstr "Пайдаланушы бос емес болса дыбысты ойнату"
 
 #: gajim/common/config.py:83
-msgid "Show only online and free for chat contacts in roster."
+#, fuzzy
+msgid "Show only online and free for chat contacts in the contact list."
 msgstr "Ростерде тек желідегі мен чатқа дайын контакттарды көрсету"
 
 #: gajim/common/config.py:86
@@ -3064,12 +3039,15 @@ msgid "Time in minutes, after which your status changes to away."
 msgstr "Қалып-күйіңіз Кетіп қалғанға ауысу үшін керек уақыт шамасы."
 
 #: gajim/common/config.py:87
-msgid "$S (Away as a result of being idle more than $T min)"
+#, fuzzy
+msgid "$S (Away: Idle more than $T min)"
 msgstr "$S (Кетіп қалған, $T минуттан көп белсенді емес)"
 
 #: gajim/common/config.py:87
 #, fuzzy
-msgid "$S will be replaced by current status message, $T by autoawaytime."
+msgid ""
+"$S will be replaced by current status message, $T by the 'autoawaytime' "
+"value."
 msgstr ""
 "$S ағымдағы күй хабарласымен, ал $T авто қолжетерсіз уақыт шамасымен "
 "алмастырылады."
@@ -3079,74 +3057,79 @@ msgid "Time in minutes, after which your status changes to not available."
 msgstr "Қалып-күйіңіз Қолжетерсізге ауысу үшін керек уақыт шамасы."
 
 #: gajim/common/config.py:90
-msgid "$S (Not available as a result of being idle more than $T min)"
+#, fuzzy
+msgid "$S (Not available: Idle more than $T min)"
 msgstr "$S (Қол жетерсіз, $T минуттан көп белсенді емес)"
 
 #: gajim/common/config.py:90
 #, fuzzy
-msgid "$S will be replaced by current status message, $T by autoxatime."
+msgid ""
+"$S will be replaced by current status message, $T by the 'autoxatime' value."
 msgstr ""
 "$S ағымдағы күй хабарласымен, ал $T авто кеңейтілген қолжетерсізге уақыт "
 "шамасымен алмастырылады."
 
 #: gajim/common/config.py:93
+#, fuzzy
 msgid ""
-"When to show notification area icon. Can be 'never', 'on_event', 'always'."
+"When to show the notification area icon. Can be 'never', 'on_event', and "
+"'always'."
 msgstr ""
 "Жүйелік сөре таңбашасын қашан көрсету керек. Мүмкін мәндері: 'never', "
 "'on_event', 'always'."
 
 #: gajim/common/config.py:94
-msgid "Allow to hide the roster window even if the tray icon is not shown."
+msgid ""
+"Allow to hide the contact list window even if the notification area icon is "
+"not shown."
 msgstr ""
 
 #: gajim/common/config.py:97
 #, fuzzy
-msgid "Contact signed in notification color."
-msgstr "Оқиға_ны жүйелік сөреде көрсету"
+msgid "Notification color for contacts signing in."
+msgstr "Жаңа кір_гендер туралы хабарлау"
 
 #: gajim/common/config.py:98
 #, fuzzy
-msgid "Contact signout notification color"
-msgstr "Оқиға_ны жүйелік сөреде көрсету"
+msgid "Notification color for contacts signing out."
+msgstr "Жаңа _шыққандар туралы хабарлау"
 
 #: gajim/common/config.py:99
 #, fuzzy
-msgid "New message notification color."
+msgid "Notification color for new message notification."
 msgstr "Жаңа хабарламаларды қалқымалы терезеде көрсету керек пе?"
 
 #: gajim/common/config.py:100
 #, fuzzy
-msgid "File transfer request notification color."
-msgstr "Файлдармен алмасуға сұраным"
+msgid "Notification color for file transfer request."
+msgstr "Файлдармен алмасу аяқталға_нда, мені ескерту"
 
 #: gajim/common/config.py:101
 #, fuzzy
-msgid "File transfer error notification color."
-msgstr "Файлдармен алмасу тоқтатылды"
+msgid "Notification color for file transfer errors."
+msgstr "Файлдармен алмасу аяқталға_нда, мені ескерту"
 
 #: gajim/common/config.py:102
-#, fuzzy
-msgid "File transfer complete or stopped notification color."
-msgstr "Файлдармен алмасу аяқталған кезде қалқымалы хабарламаны көрсету"
+msgid "Notification color for stopped or completed file transfers."
+msgstr ""
 
 #: gajim/common/config.py:103
-#, fuzzy
-msgid "Groupchat invitation notification color"
-msgstr "Топ чатына шақыру"
+msgid "Notification color for group chat invitations."
+msgstr ""
 
 #: gajim/common/config.py:104
 #, fuzzy
-msgid "Background color of status changed notification"
+msgid "Notification background color for changed status."
 msgstr "Жаңа кірген контакт аты үшін фон түсі."
 
 #: gajim/common/config.py:105
-msgid "Other dialogs color."
+msgid "Notification color for other dialogs."
 msgstr ""
 
 #: gajim/common/config.py:106
+#, fuzzy
 msgid ""
-"List (space separated) of rows (accounts and groups) that are collapsed."
+"List of rows (accounts and groups) that are collapsed (space separated)."
 msgstr ""
 "Жиналған жолдар (тіркелгілер мен топтар) тізімі (бос аралықпен ажыратылсын)."
 
@@ -3154,8 +3137,10 @@ msgstr ""
 msgid "default"
 msgstr "бастапқысы"
 
-#: gajim/common/config.py:113
-msgid "Language used by speller"
+#: gajim/common/config.py:113 gajim/common/config.py:424
+#: gajim/common/config.py:431
+#, fuzzy
+msgid "Language used for spell checking."
 msgstr "Емле тексеруші қолданатын тілі"
 
 #: gajim/common/config.py:114
@@ -3169,10 +3154,11 @@ msgstr ""
 "'never' - уақытты ешқашан көрсетпеу."
 
 #: gajim/common/config.py:115
+#, fuzzy
 msgid ""
 "Print time in chats using Fuzzy Clock. Value of fuzziness from 1 to 4, or 0 "
-"to disable fuzzyclock. 1 is the most precise clock, 4 the least precise one. "
-"This is used only if print_time is 'sometimes'."
+"to disable Fuzzy Clock. 1 is the most precise clock, 4 the least precise "
+"one. This is used only if 'print_time' is 'sometimes'."
 msgstr ""
 "Чаттарда уақытты Қызық Сағат көмегімен шығару. Қызықтылық мәні 1 мен 4 "
 "арасында, 0 ол сағатты сөндіреді. 1 тура сағат үшін, 4 ең тура емес үшін. "
@@ -3189,16 +3175,18 @@ msgstr "* / _ жұптарын мүмкін пішімдеу таңбалары
 #: gajim/common/config.py:120
 #, fuzzy
 msgid ""
-"If true, do not remove */_ . So *abc* will be bold but with * * not removed."
+"If enabled, do not remove */_ . So *abc* will be bold but with * * not "
+"removed."
 msgstr ""
 "Белсенді болса, */_ өшірілмейді. Мысалы, *abc* жуан қаріппен көрсетіледі, "
 "бірақ * * өшірілмейді."
 
 #: gajim/common/config.py:123
+#, fuzzy
 msgid ""
-"Uses ReStructured text markup to send HTML, plus ascii formatting if "
-"selected. For syntax, see http://docutils.sourceforge.net/docs/ref/rst/"
-"restructuredtext.html (If you want to use this, install docutils)"
+"Uses ReStructured text markup to send HTML, plus ASCII formatting if "
+"selected. Needs docutils installed (for syntax, see http://docutils."
+"sourceforge.net/docs/ref/rst/restructuredtext.html)."
 msgstr ""
 "HTML жіберу үшін ReStructured text markup қолдану, және таңдалған болса, "
 "ascii пішімдеу. Синтаксисі үшін, http://docutils.sourceforge.net/docs/ref/"
@@ -3206,37 +3194,40 @@ msgstr ""
 "орнатыңыз)"
 
 #: gajim/common/config.py:132
+#, fuzzy
 msgid ""
-"Character to add after nickname when using nick completion (tab) in group "
-"chat."
+"Character to add after nickname when using nickname completion (tab) in "
+"group chat."
 msgstr ""
 "Топтық чатта ник аттарын автотолықтыру (tab пернесі) қолдану кезінде ник "
 "атының артына қосылатын таңба."
 
 #: gajim/common/config.py:133
+#, fuzzy
 msgid ""
-"Character to propose to add after desired nickname when desired nickname is "
-"used by someone else in group chat."
+"Character to propose to add after desired nickname when nickname is already "
+"used in group chat."
 msgstr ""
 "Таңдалған ник атын чатта біреу қолданып тұрса, ол ник аты артына қосуға "
 "ұсынылатын таңба."
 
 #: gajim/common/config.py:155
 msgid ""
-"If true, Gajim will save roster position when hiding roster, and restore it "
-"when showing roster."
+"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:161
-msgid "Place the roster on the right in single window mode"
+msgid "Place the contact list on the right in single window mode"
 msgstr ""
 
 #: gajim/common/config.py:167
 #, fuzzy
 msgid ""
-"This option let you customize timestamp that is printed in conversation. For "
-"example \"[%H:%M] \" will show \"[hour:minute] \". See python doc on "
-"strftime for full documentation: http://docs.python.org/lib/module-time.html"
+"This option lets you customize the timestamp that is printed in "
+"conversation. For example '[%H:%M] ' will show '[hour:minute] '. See python "
+"doc on strftime for full documentation (https://docs.python.org/3/library/"
+"time.html)."
 msgstr ""
 "Бұл опция сізге сөйлесулердегі уақыт көрсетілуін баптауға мүмкіндік береді. "
 "Мысалы, \"[%H:%M] \" болса, \"[сағат:минут] \" ретінде көрсетіледі. Көбірек "
@@ -3244,262 +3235,262 @@ msgstr ""
 "python.org/lib/module-time.html"
 
 #: gajim/common/config.py:168
-msgid "Characters that are printed before the nickname in conversations"
+#, fuzzy
+msgid "Characters that are printed before the nickname in conversations."
 msgstr "Сөйлесулерде ник атына дейін қойылатын таңбалар"
 
 #: gajim/common/config.py:169
-msgid "Characters that are printed after the nickname in conversations"
+#, fuzzy
+msgid "Characters that are printed after the nickname in conversations."
 msgstr "Сөйлесулерде ник атынан кейін қойылатын таңбалар"
 
 #: gajim/common/config.py:170
-msgid "Add * and [n] in roster title?"
-msgstr "Ростер атауына * мен [n] қосу керек пе?"
+#, fuzzy
+msgid "If enabled, Gajim will add * and [n] in contact list window title."
+msgstr ""
+"Белгіленген болса, Gajim ростердегі контакттар үшін көңіл-күйін көрсетеді"
 
 #: gajim/common/config.py:171
 #, fuzzy
 msgid ""
-"How many history messages should be restored when a chat tab/window is "
-"reopened?"
+"Number of messages from chat history to be restored when a chat tab/window "
+"is reopened."
 msgstr ""
 "Чат беті/терезесі қайта ашылған кезде алдыңғы сөйлесуден қанша тарих жолын "
 "есте сақтау керек."
 
 #: gajim/common/config.py:172
-msgid "How far back in time (minutes) history is restored. -1 means no limit."
+msgid ""
+"How far back in time (minutes) chat history is restored. -1 means no limit."
 msgstr ""
 
 #: gajim/common/config.py:173
 #, fuzzy
 msgid ""
-"How many lines to request from server when entering a groupchat. -1 means no "
-"limit"
-msgstr "Топ чатына кірген кезде серверден қанша тарих жолын сұрау керек."
-
-#: gajim/common/config.py:174
-#, fuzzy
-msgid ""
-"Minutes of backlog to request when entering a groupchat. -1 means no limit"
-msgstr ""
-"Топ чатына кірген кезде қанша минут бұрынғы сөйлесулердің тарих жолдарын "
-"сұрау керек."
-
-#: gajim/common/config.py:175
-msgid ""
-"How many seconds to wait before trying to autorejoin to a conference you are "
-"being disconnected from. Set to 0 to disable autorejoining."
+"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:176
+#: gajim/common/config.py:174
 #, fuzzy
-msgid "Should autorejoin be activated when kicked from a conference?"
+msgid ""
+"Should automatic rejoin be activated when you were kicked from a group chat?"
 msgstr "Сізді чат бөлмесінен тепкен кезде қайта автокіруді іске қосу керек пе?"
 
-#: gajim/common/config.py:177
-msgid ""
-"Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
-"Client default behaviour)."
+#: gajim/common/config.py:175
+#, fuzzy
+msgid "Send message on Ctrl+Enter and make a new line with Enter."
 msgstr ""
 "Хабарламаларды Ctrl+Enter басқанда жіберу, ал Enter жаңа жолға өтеді "
 "(Mirabilis ICQ клиенті сияқты)."
 
-#: gajim/common/config.py:179
-msgid "How many lines to store for Ctrl+KeyUP."
+#: gajim/common/config.py:177
+#, fuzzy
+msgid "How many lines to store for Ctrl+KeyUP (previously sent messages)."
 msgstr "Ctrl+KeyUP үшін қанша тарих жолын сақтау керек."
 
-#: gajim/common/config.py:182
+#: gajim/common/config.py:180
 #, fuzzy, python-format
 msgid ""
-"Either custom URL with %%s in it where %%s is the word/phrase or "
-"'WIKTIONARY' which means use Wikitionary."
+"Either a custom URL with %%s in it (where %%s is the word/phrase) or "
+"'WIKTIONARY' (which means use Wikitionary)."
 msgstr ""
 "%s бар таңдауыңызша сілтеме, бұл жерде %s - сөз не мәтін, немесе "
 "'WIKTIONARY', яғни, wiktionary қолдану."
 
-#: gajim/common/config.py:185
+#: gajim/common/config.py:183
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr "Белгіленсе, Gajim-ді қашықтан gajim-remote қолданып басқаруға болады."
 
-#: gajim/common/config.py:187
+#: gajim/common/config.py:185
+#, fuzzy
 msgid ""
-"When not printing time for every message (print_time==sometimes), print it "
+"When not printing time for every message ('print_time'==sometimes), print it "
 "every x minutes."
 msgstr ""
 "Әр хабарлама үшін уақытты көрсетпеу кезде (print_time==sometimes), оны әр x "
 "минут сайын көрсету."
 
-#: gajim/common/config.py:188
+#: gajim/common/config.py:186
 msgid "Ask before pasting an image."
 msgstr ""
 
-#: gajim/common/config.py:189
+#: gajim/common/config.py:187
 msgid "Ask before closing a group chat tab/window."
 msgstr "Топ чат беті/терезесін жабу алдында сұрау."
 
-#: gajim/common/config.py:190
+#: gajim/common/config.py:188
 #, fuzzy
 msgid ""
-"Always ask for confirmation before closing groupchats with any of the JIDs "
-"on this space separated list."
+"Always ask for confirmation before closing group chats with any of the XMPP "
+"Addresses on this list (space separated)."
 msgstr ""
 "Бұл тізімдегі бөлмелерді жабу алдында әрқашан сұрау. Бөлмелер бос аралықпен "
 "ажыратылсын."
 
-#: gajim/common/config.py:191
+#: gajim/common/config.py:189
 #, fuzzy
 msgid ""
-"Never ask for confirmation before closing groupchats with any of the JIDs on "
-"this space separated list."
+"Never ask for confirmation before closing group chats with any of the XMPP "
+"Addresses on this list (space separated)."
 msgstr ""
 "Бұл тізімдегі бөлмелерді жабу алдында ешқашан сұрамау. Бөлмелер бос "
 "аралықпен ажыратылсын."
 
-#: gajim/common/config.py:192
+#: gajim/common/config.py:190
 #, fuzzy
 msgid ""
-"Ask before closing tabbed chat window if there are controls that can lose "
-"data (chat, private chat, groupchat that will not be minimized)"
+"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:195
+#: gajim/common/config.py:193
 #, fuzzy
 msgid ""
-"Comma separated list of sent hosts, in addition of local interfaces, for "
-"File Transfer in case of address translation/port forwarding."
+"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:196
+#: gajim/common/config.py:194
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "IEC стандарты КиБ = 1024 байт, ал КБ = 1000 байтқа тең деп айтады."
 
-#: gajim/common/config.py:198
+#: gajim/common/config.py:196
 msgid "Notify of events in the notification area."
 msgstr "Оқиғалар жөнінде жүйелік сөреде хабарлау."
 
-#: gajim/common/config.py:199
+#: gajim/common/config.py:197
 msgid ""
-"If False, Gajim will display a static event icon instead of the blinking "
-"status icon in the notification area when notifying on event."
+"If disabled, Gajim will display a static event icon instead of the blinking "
+"status icon in the notification area when notifying about an event."
 msgstr ""
 
-#: gajim/common/config.py:205
+#: gajim/common/config.py:203
 msgid "Show tab when only one conversation?"
 msgstr "Тек бір сөйлесу бар болса чат терезесінде беттерді көрсету керек пе?"
 
-#: gajim/common/config.py:206
+#: gajim/common/config.py:204
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "Чат терезесінде бет шекарасын көрсету керек пе?"
 
-#: gajim/common/config.py:207
+#: gajim/common/config.py:205
 msgid "Show close button in tab?"
 msgstr "Бет үшін жабу батырмасын көрсету керек пе?"
 
-#: gajim/common/config.py:220
+#: gajim/common/config.py:218
 msgid "Preview new messages in notification popup?"
 msgstr "Жаңа хабарламаларды қалқымалы терезеде көрсету керек пе?"
 
-#: gajim/common/config.py:223
+#: gajim/common/config.py:221
+#, fuzzy
 msgid ""
-"A semicolon-separated list of words that will be highlighted in group chats."
+"A list of words (semicolon separated) that will be highlighted in group "
+"chats."
 msgstr ""
 "Топтық чаттарда түспен ерекшелеу үшін сөздер тізімі, нүктелі үтірмен "
 "ажыратылсын."
 
-#: gajim/common/config.py:224
+#: gajim/common/config.py:222
 #, fuzzy
 msgid ""
-"If true, quits Gajim when X button of Window Manager is clicked. This "
-"setting is taken into account only if notification icon is used."
+"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 "
 "жұмысын өз аяқтайды. Тек жүйелік сөре таңбашасы іске қосулы болу керек."
 
-#: gajim/common/config.py:225
+#: gajim/common/config.py:223
 msgid ""
-"If true, Gajim hides the Roster window on pressing the X button instead of "
-"minimizing into the Dock."
+"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:226
+#: gajim/common/config.py:224
 #, fuzzy
 msgid ""
-"If true, Gajim will display an icon on each tab containing unread messages. "
-"Depending on the theme, this icon may be animated."
+"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:227
+#: gajim/common/config.py:225
 #, fuzzy
 msgid ""
-"If true, Gajim will display the status message, if not empty, for every "
-"contact under the contact name in roster window."
+"If enabled, Gajim will display the status message (if not empty) underneath "
+"the contact name in the contact list window."
 msgstr ""
 "Белгіленген болса, Gajim ростерде әр контакт астында оның қалып-күй "
 "хабарламасын көрсетеді, егер ол бар болса."
 
-#: gajim/common/config.py:233
-msgid "Define the position of the avatar in roster. Can be left or right"
+#: gajim/common/config.py:231
+#, fuzzy
+msgid ""
+"Define the position of avatars in the contact list. Can be 'left' or 'right'."
 msgstr "Ростердегі аватар орналасуын орнатады. left не right бола алады"
 
-#: gajim/common/config.py:234
+#: gajim/common/config.py:232
 #, fuzzy
 msgid ""
-"If False, Gajim will no longer print status line in chats when a contact "
-"changes their status and/or their status message."
+"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/common/config.py:235
+#: gajim/common/config.py:233
 #, fuzzy
 msgid ""
 "Default Setting: Show a status message for every join or leave in a group "
-"chat"
+"chat."
 msgstr "Чат бөлмесіне кіру мүмкін емес"
 
-#: gajim/common/config.py:236
+#: gajim/common/config.py:234
+#, fuzzy
 msgid ""
-"Default Setting: Show a status message for all status (away, dnd, etc.) "
-"changes of users in a group chat"
-msgstr ""
+"Default Setting: Show a status message for all status changes (away, dnd, "
+"etc.) of users in a group chat."
+msgstr "Чат бөлмесіне кіру мүмкін емес"
 
-#: gajim/common/config.py:238
-msgid "Log XHTML messages instead of plain text messages."
+#: gajim/common/config.py:236
+msgid "Store XHTML messages in chat history instead of plain text messages."
 msgstr ""
 
-#: gajim/common/config.py:239
+#: gajim/common/config.py:237
 msgid "Don't show avatar for the transport itself."
 msgstr "Транспорттың өзі үшін аватарды көрсетпеу."
 
-#: gajim/common/config.py:240
-msgid "Don't show roster in the system taskbar."
+#: gajim/common/config.py:238
+#, fuzzy
+msgid "Don't show contact list window in the system taskbar."
 msgstr "Ростерді жүйелік есептер панелінде көрсетпеу."
 
-#: gajim/common/config.py:241
+#: gajim/common/config.py:239
 #, fuzzy
 msgid ""
-"If true, make the window flash (the default behaviour in most Window "
-"Managers) when holding pending events."
+"If enabled, Gajim makes the window flash (the default behaviour in most "
+"Window Managers) when holding pending events."
 msgstr ""
 "Белсенді болса және GTK+ мен PyGTK нұсқалары кем дегенде 2.8 болса, кезекте "
 "оқиға бар болса, терезе шегі жыпылықтайды."
 
-#: gajim/common/config.py:245
+#: gajim/common/config.py:243
 #, fuzzy
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
 "'always_with_roster' - Like 'always' but the messages are in a single window "
-"along with the roster.\n"
+"along with the contact list.\n"
 "'never' - All messages get their own window.\n"
 "'peracct' - Messages for each account are sent to a specific window.\n"
-"'pertype' - Each message type (e.g. chats vs. groupchats) is sent to a "
+"'pertype' - Each message type (e.g. chats vs. group chats) is sent to a "
 "specific window."
 msgstr ""
 "Жаңа хабарламалар көрсетілетін терезені басқару.\n"
@@ -3511,275 +3502,302 @@ msgstr ""
 "'pertype' - Хабарламалар түрі бойынша (мыс. чат не топтық чаттар) терезеге "
 "жіберіледі."
 
-#: gajim/common/config.py:246
+#: gajim/common/config.py:244
 msgid ""
-"Show roster on startup.\n"
-"'always' - Always show roster.\n"
-"'never' - Never show roster.\n"
-"'last_state' - Restore the last state roster."
+"Show contact list window on startup.\n"
+"'always' - Always show contact list window.\n"
+"'never' - Never show contact list window.\n"
+"'last_state' - Restore last state of the contact list window."
 msgstr ""
 
-#: gajim/common/config.py:247
-msgid "If False, you will no longer see the avatar in the chat window."
+#: gajim/common/config.py:245
+#, fuzzy
+msgid "If enabled, Gajim displays the avatar in the chat window."
 msgstr "Сөндірілеген болса, сіз чат терезесінде аватарды көрмейтін боласыз."
 
-#: gajim/common/config.py:248
+#: gajim/common/config.py:246
 #, fuzzy
-msgid "If true, pressing the escape key closes a tab/window."
+msgid "If enabled, pressing Esc closes a tab/window."
 msgstr "Белсенді болса, escape батырмасы бет/терезені жабады"
 
-#: gajim/common/config.py:249
-msgid "Hides the banner in a group chat window"
+#: gajim/common/config.py:247
+#, fuzzy
+msgid "Hides the banner in a group chat window."
 msgstr "Топтық чат терезесінде тақырыпты жасырады"
 
-#: gajim/common/config.py:250
-msgid "Hides the banner in two persons chat window"
-msgstr "Екі адам чат терезесінде тақырыпты жасырады"
+#: gajim/common/config.py:248
+#, fuzzy
+msgid "Hides the banner in a 1:1 chat window."
+msgstr "Топтық чат терезесінде тақырыпты жасырады"
 
-#: gajim/common/config.py:251
-msgid "Hides the group chat occupants list in group chat window."
+#: gajim/common/config.py:249
+#, fuzzy
+msgid "Hides the group chat participants list in a group chat window."
 msgstr "Топтық чат терезесінде мүшелер тізімін жасырады"
 
-#: gajim/common/config.py:252
+#: gajim/common/config.py:250
+#, fuzzy
 msgid ""
 "In a chat, show the nickname at the beginning of a line only when it's not "
-"the same person talking than in previous message."
+"the same person talking as in the previous message."
 msgstr ""
 "Чатта, алдыңғы хабарламадағы адам емес болмаса ғана, жол басынан контакт "
 "атын көрсету."
 
-#: gajim/common/config.py:253
+#: gajim/common/config.py:251
 msgid "Indentation when using merge consecutive nickname."
 msgstr "Біріккен тізбекті ник атын қолдану кезіндегі шегіну."
 
-#: gajim/common/config.py:254
-msgid "Ctrl-Tab go to next composing tab when none is unread."
+#: gajim/common/config.py:252
+#, 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:255
+#: gajim/common/config.py:253
 #, fuzzy
 msgid ""
-"Show the confirm metacontacts creation dialog or not? Empty string means "
-"never show the dialog."
+"Show a confirmation dialog to create metacontacts? Empty string means never "
+"show the dialog."
 msgstr ""
-"Метаконтакттарды жасауды растау сұхбатын көрсету керек пе? Бос жол терезені "
+"Контактты блоктауды растау сұхбатын көрсету керек пе? Бос жол терезені "
 "ешқашан көрсетпеуді белгілейді."
 
-#: gajim/common/config.py:256
+#: gajim/common/config.py:254
 #, fuzzy
 msgid ""
-"Show the confirm block contact dialog or not? Empty string means never show "
+"Show a confirmation dialog to block a contact? Empty string means never show "
 "the dialog."
 msgstr ""
 "Контактты блоктауды растау сұхбатын көрсету керек пе? Бос жол терезені "
 "ешқашан көрсетпеуді белгілейді."
 
-#: gajim/common/config.py:257
+#: gajim/common/config.py:255
 #, fuzzy
 msgid ""
-"Show the confirm custom status dialog or not? Empty string means never show "
-"the dialog."
+"Show a confirmation dialog for a custom status? Empty string means never "
+"show the dialog."
 msgstr ""
 "Таңдауыңызша күйді растау сұхбатын көрсету керек пе? Бос жол терезені "
 "ешқашан көрсетпеуді белгілейді."
 
-#: gajim/common/config.py:258
+#: gajim/common/config.py:256
 #, fuzzy
 msgid ""
-"If true, you will be able to set a negative priority to your account in "
-"account modification window. BE CAREFUL, when you are logged in with a "
-"negative priority, you will NOT receive any message from your server."
+"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:259
+#: gajim/common/config.py:257
 #, fuzzy
 msgid ""
-"If true, Gajim will show number of online and total contacts in account and "
-"group rows."
+"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:260
+#: gajim/common/config.py:258
+#, fuzzy
 msgid ""
-"Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
-"as if they were of this type"
+"Can be empty, 'chat' or 'normal'. If not empty, all incoming messages are "
+"treated as if they were of this type."
 msgstr ""
 "Бос, 'chat' не 'normal' түрде бола алады. Бос емес болса, кірген "
 "хабарламалардың барлығын осы түрде деп есептеу"
 
-#: gajim/common/config.py:261
+#: gajim/common/config.py:259
 #, fuzzy
 msgid ""
-"If true, Gajim will scroll and select the contact who sent you the last "
-"message, if chat window is not already opened."
+"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 сізге соңғы болып хабарламаны жіберген контактты "
 "белгілейді, егер чат терезесі ашылған болмаса."
 
-#: gajim/common/config.py:262
+#: gajim/common/config.py:260
 msgid "Time of inactivity needed before the change status window closes down."
 msgstr ""
 "Күйді өзгерту терезесі жабылу үшін керек белсенді еместік уақыт шамасы."
 
-#: gajim/common/config.py:263
+#: gajim/common/config.py:261
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
 msgstr ""
 "Сөйлесулерде көрсетілетін жолдардың максимал саны. Ескі жолдар өшіріледі."
 
-#: gajim/common/config.py:264
+#: gajim/common/config.py:262
 #, fuzzy
 msgid ""
-"If true, notification windows from notification-daemon will be attached to "
-"notification icon."
+"If enabled, notification windows from notification-daemon will be attached "
+"to the notification area icon."
 msgstr ""
 "Қосулы болса, notification-daemon жіберген хабарламалар терезелері жүйелік "
 "сөреден көрсетіледі."
 
-#: gajim/common/config.py:265
+#: gajim/common/config.py:263
 msgid "Choose interval between 2 checks of idleness."
 msgstr "Белсенді еместігіне екі тексеру арасындағы уақыт."
 
-#: gajim/common/config.py:266
+#: gajim/common/config.py:264
+#, fuzzy
 msgid ""
-"Valid uri schemes. Only schemes in this list will be accepted as \"real\" "
-"uri. (mailto and xmpp are handled separately)"
+"Valid URI schemes. Only schemes in this list will be accepted as 'real' URI "
+"(mailto and xmpp are handled separately)."
 msgstr ""
 "Дұрыс uri схемелары. Тек осы тізімдегі схемалар ғана \"шын\" uri ретінде "
 "қабылданады. (mailto және xmpp бөлек өнделеді)"
 
-#: gajim/common/config.py:267
+#: gajim/common/config.py:265
 #, fuzzy
-msgid "If true, completion in groupchats will be like a shell auto-completion"
+msgid ""
+"If enabled, completion in group chats will be like a shell auto-completion."
 msgstr ""
 "Қосулы тұрса, топ чаттардағы мәтінді автотолықтыру қоршамдағыдай іске асады"
 
-#: gajim/common/config.py:272
-msgid "Optionally fix jingle output video framerate. Example: 10/1 or 25/2"
+#: gajim/common/config.py:270
+#, fuzzy
+msgid "Optionally fix Jingle output video framerate. Example: 10/1 or 25/2."
 msgstr ""
 "Осыған қоса, jingle шығыс видеосының кадр/сек қасиетін автоөзгерту. Мысалы: "
 "10/1 не 25/2"
 
-#: gajim/common/config.py:273
-msgid "Optionally resize jingle output video. Example: 320x240"
+#: gajim/common/config.py:271
+#, fuzzy
+msgid "Optionally resize Jingle output video. Example: 320x240."
 msgstr ""
 "Осыған қоса, jingle шығыс видеосының өлшемін автоөзгерту. Мысалы: 320x240"
 
-#: gajim/common/config.py:274
-msgid "If true, You will also see your webcam"
+#: gajim/common/config.py:272
+msgid "If enabled, you will see your webcam's video stream as well."
 msgstr ""
 
-#: gajim/common/config.py:277
+#: gajim/common/config.py:275
 #, fuzzy
 msgid ""
-"If true, Gajim will try to use a STUN server when using Jingle. The one in "
-"\"stun_server\" option, or the one given by the XMPP server."
+"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 ""
 "Қосулы түрса, jingle қолдану кезде Gajim STUN серверін қолдануға тырысады. "
 "Ол сервер \"stun_server\" опциясында көрсетіледі не оны jabber сервердің өзі "
 "береді."
 
-#: gajim/common/config.py:278
+#: gajim/common/config.py:276
 #, fuzzy
 msgid "STUN server to use when using Jingle"
 msgstr "STUN сервері, jingle қолдану үшін"
 
-#: gajim/common/config.py:279
+#: gajim/common/config.py:277
 #, fuzzy
 msgid ""
-"If true, Gajim will show affiliation of groupchat occupants by adding a "
-"colored square to the status icon"
+"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:280
+#: gajim/common/config.py:278
 msgid ""
 "Proxy used for all outgoing connections if the account does not have a "
-"specific proxy configured"
+"specific proxy configured."
 msgstr ""
 
-#: gajim/common/config.py:281
-msgid "If true, Gajim will ignore incoming attention requests (\"wizz\")."
+#: gajim/common/config.py:279
+msgid "If enabled, Gajim will ignore incoming attention requests ('wizz')."
 msgstr ""
 
-#: gajim/common/config.py:282
+#: gajim/common/config.py:280
 msgid ""
 "If enabled, Gajim will reopen chat windows that were opened last time Gajim "
 "was closed."
 msgstr ""
 
-#: gajim/common/config.py:283
+#: gajim/common/config.py:281
 #, fuzzy
 msgid ""
-"If enabled, Gajim will show an icon to show that sent message has been "
-"received by your contact"
+"If enabled, Gajim will display an icon to show that sent messages have been "
+"received by your contact."
 msgstr ""
 "Қосулы тұрса, Gajim қалып-күй хабарламасын сұрамайды, бастапқы мәндері "
 "қолданылады."
 
-#: gajim/common/config.py:284
-msgid "Show a mini avatar in chat window tabs and in window icon"
+#: gajim/common/config.py:282
+msgid "Show a mini avatar in chat window tabs and as the window's icon."
 msgstr ""
 
-#: gajim/common/config.py:285
+#: gajim/common/config.py:283
 #, fuzzy
-msgid "If true, Gajim will use the Systems Keyring to store account passwords."
+msgid ""
+"If enabled, Gajim will use the System's Keyring to store account passwords."
 msgstr ""
 "Белсенді болса, Gajim тіркелгі парольдерін сақтау үшін Gnome Keyring (егер "
 "қолжетерлік болса) қолданады."
 
+#: gajim/common/config.py:284
+msgid "If enabled, Gajim will execute XEP-0146 Commands."
+msgstr ""
+
+#: gajim/common/config.py:285
+msgid "2: System, 1: Enabled, 0: Disabled"
+msgstr ""
+
 #: gajim/common/config.py:286
-msgid "If true, Gajim will execute XEP-0146 Commands."
+msgid "Options in days which can be chosen in the sync threshold menu"
 msgstr ""
 
 #: gajim/common/config.py:287
-msgid "2: System, 1: Enabled, 0: Disabled"
+msgid ""
+"Maximum history in days we request from a public group chat archive. 0: As "
+"much as possible."
 msgstr ""
 
 #: gajim/common/config.py:288
-msgid "Options in days which can be chosen in the sync threshold menu"
+msgid ""
+"Maximum history in days we request from a private group chat archive. 0: As "
+"much as possible."
 msgstr ""
 
 #: gajim/common/config.py:289
 msgid ""
-"Maximum history in days we request from a public room archive. 0: As much as "
-"possible"
+"If enabled, Gajim shows the group chat subject in the chat window when "
+"joining."
 msgstr ""
 
 #: gajim/common/config.py:290
+#, fuzzy
 msgid ""
-"Maximum history in days we request from a private room archive. 0: As much "
-"as possible"
+"If enabled, the contact row is colored according to the current chat state "
+"of the contact."
 msgstr ""
+"Белгіленген болса, Gajim басқаларға сіздің операциялық жүйеңізді анықтауға "
+"рұқсат етеді"
 
 #: gajim/common/config.py:291
-msgid "If the room subject is shown in chat on join"
+#, fuzzy
+msgid ""
+"If enabled, the tab is colored according to the current chat state of the "
+"contact."
 msgstr ""
+"Белгіленген болса, Gajim басқаларға сіздің операциялық жүйеңізді анықтауға "
+"рұқсат етеді"
 
 #: gajim/common/config.py:292
+#, fuzzy
 msgid ""
-"If the contact row is colored according to the current chatstate of the "
-"contact"
+"Shows a text in the banner that describes the current chat state of the "
+"contact."
 msgstr ""
+"Белгіленген болса, Gajim басқаларға сіздің операциялық жүйеңізді анықтауға "
+"рұқсат етеді"
 
 #: gajim/common/config.py:293
-msgid "If the tab is colored according to the current chatstate of the contact"
-msgstr ""
-
-#: gajim/common/config.py:294
-msgid ""
-"Shows a text in the banner that describes the current chatstate of the "
-"contact"
-msgstr ""
-
-#: gajim/common/config.py:295 gajim/common/config.py:424
 #, fuzzy
 msgid ""
 "Chat state notifications that are sent to contacts. Possible values: all, "
@@ -3788,75 +3806,85 @@ msgstr ""
 "Сөйлесудің күйі туралы хабарлау. Мүмкін нұсқалары: all (барлығы), "
 "composing_only (тек жазу туралы), disabled (сөндірілген)."
 
-#: gajim/common/config.py:296 gajim/common/config.py:438
+#: gajim/common/config.py:294
 #, fuzzy
 msgid ""
 "Chat state notifications that are sent to the group chat. Possible values: "
-"all, composing_only, disabled"
+"'all', 'composing_only', 'disabled'"
 msgstr ""
 "Сөйлесудің күйі туралы хабарлау. Мүмкін нұсқалары: all (барлығы), "
 "composing_only (тек жазу туралы), disabled (сөндірілген)."
 
-#: gajim/common/config.py:312
+#: gajim/common/config.py:297
+msgid "API Preferences. Possible values: 'http', 'iq'"
+msgstr ""
+
+#: gajim/common/config.py:313
+#, fuzzy
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
-"defined in autopriority_* options."
+"defined in 'autopriority_*' options."
 msgstr ""
 "Приоритет күйіңізге сәйкес автоөзгертіледі. Приоритеттер autopriority_* "
 "опцияларында бапталған."
 
-#: gajim/common/config.py:320
+#: gajim/common/config.py:321
+#, fuzzy
 msgid ""
-"Status used to autoconnect as. Can be online, chat, away, xa, dnd, "
-"invisible. NOTE: this option is used only if restore_last_status is disabled"
+"Status to be used automatically when connecting. Can be 'online', 'chat', "
+"'away', 'xa', 'dnd' or 'invisible'. NOTE: This option is used only if "
+"'restore_last_status' is disabled."
 msgstr ""
 "Қайта автоқосылу үшін қолданылатын күйі. Келесіден біреу: желіде, чатқа "
 "дайын, кетіп қалған, кеңейтілген кетіп қалған, мазамды алмаңыз, жасырын. "
 "ЕСКЕРТУ: бұл опция тек restore_last_status опциясы сөндірілген болса ғана "
 "қолданылады"
 
-#: gajim/common/config.py:321
-msgid "If enabled, restore the last status that was used."
+#: gajim/common/config.py:322
+#, fuzzy
+msgid "If enabled, the last status will be restored."
 msgstr "Қосулы тұрса, соңғы қалып-күй қалпына келтіріледі."
 
-#: gajim/common/config.py:322
+#: gajim/common/config.py:323
 #, fuzzy
 msgid ""
-"If true, Contacts requesting authorization will be automatically accepted."
+"If enabled, Contacts requesting authorization will be accepted automatically."
 msgstr "Белсенді болса, жазылуды сұраған контакттар авто қабылданады."
 
-#: gajim/common/config.py:323
+#: gajim/common/config.py:324
+#, fuzzy
 msgid ""
-"If False, this account will be disabled and will not appear in roster window."
+"If disabled, this account will be disabled and will not appear in the "
+"contact list window."
 msgstr ""
 "Сөндірілген болса, бұл тіркелгі сөндіріледі және ростерде көрсетілмейтін "
 "болады."
 
-#: gajim/common/config.py:327
-msgid "Allow plaintext connections"
+#: gajim/common/config.py:328
+msgid "Allow plaintext connections."
 msgstr ""
 
-#: gajim/common/config.py:330
+#: gajim/common/config.py:331
 msgid ""
-"List (space separated) of authentication mechanisms to try. Can contain "
-"ANONYMOUS, EXTERNAL, GSSAPI, SCRAM-SHA-1-PLUS, SCRAM-SHA-1, DIGEST-MD5, "
-"PLAIN, X-MESSENGER-OAUTH2 or XEP-0078"
+"List of authentication mechanisms to try (space separated). Can contain "
+"'ANONYMOUS', 'EXTERNAL', 'GSSAPI', 'SCRAM-SHA-1-PLUS', 'SCRAM-SHA-1', "
+"'DIGEST-MD5', 'PLAIN', 'X-MESSENGER-OAUTH2' or 'XEP-0078'."
 msgstr ""
 
-#: gajim/common/config.py:331
+#: gajim/common/config.py:332
 #, fuzzy
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection. "
-"Can be 'warn', 'connect', 'disconnect'"
+"Can be 'warn', 'connect' or 'disconnect'."
 msgstr ""
 "Парольдерді шифрленбеген байланыс арқылы беру алдында ескерту сұхбатын "
 "көрсету."
 
-#: gajim/common/config.py:332
+#: gajim/common/config.py:333
 msgid "Show a warning dialog before using standard SSL library."
 msgstr "Қалыпты SSL жинығын қолдану алдында ескерту сұхбатын көрсету."
 
-#: gajim/common/config.py:333
+#: gajim/common/config.py:334
 #, fuzzy
 msgid ""
 "Show a warning dialog before sending PLAIN password over a plain connection."
@@ -3864,253 +3892,273 @@ msgstr ""
 "ШИФРЛЕНБЕГЕН парольдерді шифрленбеген байланыс арқылы беру алдында ескерту "
 "сұхбатын көрсету."
 
-#: gajim/common/config.py:334
-msgid "Space separated list of ssl errors to ignore."
-msgstr "Елемеу үшін ssl қателер тізімі, бос аралықпен ажыратылсын."
+#: gajim/common/config.py:335
+msgid "List of SSL errors to ignore (space separated)."
+msgstr ""
 
-#: gajim/common/config.py:340
+#: gajim/common/config.py:341
 msgid ""
-"Space separated list of JIDs for which you do not want to store logs. You "
-"can also add account name to log nothing for this account."
+"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:341
+#: gajim/common/config.py:342
 msgid ""
-"Space separated list of JIDs for which you accept to not log conversations "
-"if he does not want to."
+"List of XMPP Addresses (space separated) for which you accept to not store "
+"chat history if your contact does not want to."
 msgstr ""
 
-#: gajim/common/config.py:343
-msgid "Whitespace sent after inactivity"
+#: gajim/common/config.py:344
+#, fuzzy
+msgid "If enabled, a whitespace is sent after inactivity (keep alive)."
 msgstr "Белсенді еместіктен кейін бос аралық жіберліген"
 
-#: gajim/common/config.py:344
-msgid "XMPP ping sent after inactivity"
+#: gajim/common/config.py:345
+#, fuzzy
+msgid "If enabled, an XMPP ping is sent after inactivity (ping alive)."
 msgstr "Белсенді еместіктен кейін XMPP ping жіберліген"
 
-#: gajim/common/config.py:348
+#: gajim/common/config.py:349
 #, fuzzy
 msgid ""
-"How many seconds to wait for the answer of ping alive packet before trying "
-"to reconnect?"
+"How many seconds to wait for the answer of a ping alive packet before trying "
+"to reconnect."
 msgstr ""
 "Байланысты қайта орнатпас бұрын, ping alive дестесіне жауапты қанша секунд "
 "күту керек."
 
-#: gajim/common/config.py:352
-msgid "Jabberd2 workaround"
+#: gajim/common/config.py:353
+#, fuzzy
+msgid "Jabberd2 workaround."
 msgstr "Jabberd2 жұмысы"
 
-#: gajim/common/config.py:355
+#: gajim/common/config.py:356
+#, fuzzy
 msgid ""
-"If checked, Gajim will use your IP and proxies defined in "
-"file_transfer_proxies option for file transfer."
+"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/common/config.py:356
+#: gajim/common/config.py:357
 msgid ""
-"If true, Gajim will test file transfer proxies on startup to be sure it "
-"works. Openfire's proxies are known to fail this test even if they work."
+"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:369
-msgid "Answer to receipt requests"
-msgstr "Алу сұранымдарына жауап"
-
 #: gajim/common/config.py:370
-msgid "Sent receipt requests"
-msgstr "Алу сұранымы жіберілді"
+#, fuzzy
+msgid "If enabled, Gajim will answer to message receipt requests."
+msgstr ""
+"Қосулы тұрса, Gajim қалып-күй хабарламасын сұрамайды, бастапқы мәндері "
+"қолданылады."
+
+#: gajim/common/config.py:371
+msgid "If enabled, Gajim will send message receipt requests."
+msgstr ""
 
-#: gajim/common/config.py:379
+#: gajim/common/config.py:380
 msgid ""
 "Allow Gajim to send information about the operating system you are running."
 msgstr ""
 "Gajim-ге сіздің операциялық жүйеңіз туралы ақпаратты жіберуге рұқсат ету."
 
-#: gajim/common/config.py:380
+#: gajim/common/config.py:381
 msgid "Allow Gajim to send your local time."
 msgstr "Gajim-ге сіздің жергілікті уақытты жіберуге рұқсат ету."
 
-#: gajim/common/config.py:383
-msgid "Message that is sent to contacts you want to add"
-msgstr "Қосқыңыз келетін контакттарға жіберілетін хабарлама"
-
 #: gajim/common/config.py:384
-msgid ""
-"If enabled, Gajim will send your local IPs so your contact can connect to "
-"your machine to transfer files."
-msgstr ""
+#, fuzzy
+msgid "Message that is sent to contacts you want to add."
+msgstr "Қосқыңыз келетін контакттарға жіберілетін хабарлама"
 
 #: gajim/common/config.py:385
+#, fuzzy
 msgid ""
-"Space separated list of JIDs for which chat window will be re-opened on next "
-"startup."
+"If enabled, Gajim will send your local IP so your contact can connect to "
+"your machine for file transfers."
 msgstr ""
+"Белгіленген болса, Gajim файлдармен алмасулар үшін сіздің IP бен "
+"file_transfer_proxies опциясындағы прокси адрестерін қолданады."
 
-#: gajim/common/config.py:387
-msgid "HTTP Upload: Enable HTTPS Verification"
+#: gajim/common/config.py:386
+msgid ""
+"List of XMPP Addresses (space separated) for which the chat window will be "
+"re-opened on next startup."
 msgstr ""
 
 #: gajim/common/config.py:388
-msgid ""
-"Preferred file transfer mechanism for file drag&drop on chat window. Can be "
-"'httpupload' (default) or 'jingle'"
+msgid "HTTP File Upload: Enable HTTPS Verification."
 msgstr ""
 
 #: gajim/common/config.py:389
-msgid "Allow cert verification with POSH"
+msgid ""
+"Preferred file transfer mechanism for file drag&drop on a chat window. Can "
+"be 'httpupload' (default) or 'jingle'."
 msgstr ""
 
-#: gajim/common/config.py:423 gajim/common/config.py:430
+#: gajim/common/config.py:390
 #, fuzzy
-msgid "Language for which misspelled words will be checked"
-msgstr "Қай тілде емлені тексеру керек"
+msgid "Allow certificate verification with POSH."
+msgstr "SSL сертификат қатесі"
 
-#: gajim/common/config.py:427
-msgid "The currently active encryption for that contact"
+#: gajim/common/config.py:425
+#, fuzzy
+msgid ""
+"Chat state notifications that are sent to contacts. Possible values: 'all', "
+"'composing_only', 'disabled'"
 msgstr ""
+"Сөйлесудің күйі туралы хабарлау. Мүмкін нұсқалары: all (барлығы), "
+"composing_only (тек жазу туралы), disabled (сөндірілген)."
 
-#: gajim/common/config.py:431
+#: gajim/common/config.py:428
 #, fuzzy
-msgid ""
-"How many lines to request from server when entering a groupchat. -1 means no "
-"limit, -2 means global value"
-msgstr "Топ чатына кірген кезде серверден қанша тарих жолын сұрау керек."
+msgid "The currently active encryption for that contact."
+msgstr "Бұл тіркелгі үшін ESessions шифрлеуді іске қосу."
 
 #: gajim/common/config.py:432
-#, fuzzy
 msgid ""
-"Minutes of backlog to request when entering a groupchat. -1 means no limit, "
-"-2 means global value"
+"If enabled, a notification is created for every message in this group chat."
 msgstr ""
-"Топ чатына кірген кезде қанша минут бұрынғы сөйлесулердің тарих жолдарын "
-"сұрау керек."
 
 #: gajim/common/config.py:433
-msgid "State whether a notification is created for every message in this room"
-msgstr ""
-
-#: gajim/common/config.py:434
+#, fuzzy
 msgid ""
-"Show a status message for all status (away, dnd, etc.) changes of users in a "
-"group chat"
-msgstr ""
+"Show a status message for all status changes (away, dnd, etc.) of users in a "
+"group chat."
+msgstr "Чат бөлмесіне кіру мүмкін емес"
 
-#: gajim/common/config.py:435
+#: gajim/common/config.py:434
 #, fuzzy
-msgid "Show a status message for every join or leave in a group chat"
+msgid "Show a status message for every join or leave in a group chat."
 msgstr "Чат бөлмесіне кіру мүмкін емес"
 
+#: gajim/common/config.py:435
+msgid ""
+"If enabled, the group chat is minimized into the contact list when joining "
+"automatically."
+msgstr ""
+
 #: gajim/common/config.py:436
-msgid "If the group chat is minimized into the roster on autojoin"
+msgid ""
+"If enabled, the group chat is minimized into the contact list when closing "
+"it."
 msgstr ""
 
 #: gajim/common/config.py:437
-msgid "If the group chat is minimized into the roster on close"
+#, fuzzy
+msgid ""
+"Chat state notifications that are sent to the group chat. Possible values: "
+"'all', 'composing_only' or 'disabled'."
 msgstr ""
+"Сөйлесудің күйі туралы хабарлау. Мүмкін нұсқалары: all (барлығы), "
+"composing_only (тек жазу туралы), disabled (сөндірілген)."
 
-#: gajim/common/config.py:441
+#: gajim/common/config.py:440
 #, fuzzy
 msgid ""
-"State whether plugins should be activated on startup (this is saved on Gajim "
-"exit). This option SHOULD NOT be used to (de)activate plug-ins. Use GUI "
-"instead."
+"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/common/config.py:446 gajim/common/const.py:281
+#: gajim/common/config.py:445 gajim/common/const.py:315
 msgid "Sleeping"
 msgstr "Ұйқыда"
 
-#: gajim/common/config.py:447
+#: gajim/common/config.py:446
 msgid "Back soon"
 msgstr "Жақында ораламын"
 
-#: gajim/common/config.py:447
+#: gajim/common/config.py:446
 msgid "Back in some minutes."
 msgstr "Бірнеше минутта ораламын."
 
-#: gajim/common/config.py:448 gajim/common/const.py:247
+#: gajim/common/config.py:447 gajim/common/const.py:281
 msgid "Eating"
 msgstr "Тамақ ішуде"
 
-#: gajim/common/config.py:448
-msgid "I'm eating, so leave me a message."
-msgstr "Мен тамақ ішудемін, хабарламаңызды қалдырыңыз."
+#: gajim/common/config.py:447
+#, fuzzy
+msgid "I'm eating."
+msgstr "Мен жұмыс істеп отырмын."
 
-#: gajim/common/config.py:449
+#: gajim/common/config.py:448
 msgid "Movie"
 msgstr "Кино"
 
-#: gajim/common/config.py:449
+#: gajim/common/config.py:448
 msgid "I'm watching a movie."
 msgstr "Кино көрудемін."
 
-#: gajim/common/config.py:450 gajim/common/const.py:314
+#: gajim/common/config.py:449 gajim/common/const.py:348
 msgid "Working"
 msgstr "Жұмыс істеудемін"
 
-#: gajim/common/config.py:450
+#: gajim/common/config.py:449
 msgid "I'm working."
 msgstr "Мен жұмыс істеп отырмын."
 
-#: gajim/common/config.py:451
+#: gajim/common/config.py:450
 msgid "Phone"
 msgstr "Телефон"
 
-#: gajim/common/config.py:451
+#: gajim/common/config.py:450
 msgid "I'm on the phone."
 msgstr "Мен телефонмен сөйлесудемін."
 
-#: gajim/common/config.py:452
+#: gajim/common/config.py:451
 msgid "Out"
 msgstr "Жоқ"
 
-#: gajim/common/config.py:452
+#: gajim/common/config.py:451
 msgid "I'm out enjoying life."
 msgstr "Мен өмірмен рахаттанып отырмын."
 
-#: gajim/common/config.py:463
+#: gajim/common/config.py:462
 msgid "I'm available."
 msgstr "Мен бармын."
 
-#: gajim/common/config.py:464
+#: gajim/common/config.py:463
 msgid "I'm free for chat."
 msgstr "Мен чат үшін дайынмын."
 
-#: gajim/common/config.py:465 gajim/gtk/accounts.py:134
+#: gajim/common/config.py:464 gajim/gtk/accounts.py:133
 msgid "Be right back."
 msgstr "Жақында боламын."
 
-#: gajim/common/config.py:466
+#: gajim/common/config.py:465
 msgid "I'm not available."
 msgstr "Мен жоқпын."
 
-#: gajim/common/config.py:467
+#: gajim/common/config.py:466
 msgid "Do not disturb."
 msgstr "Мазамды алмаңыз."
 
-#: gajim/common/config.py:468 gajim/common/config.py:469
+#: gajim/common/config.py:467 gajim/common/config.py:468
 msgid "Bye!"
 msgstr "Қош!"
 
-#: gajim/common/config.py:480
+#: gajim/common/config.py:479
+#, fuzzy
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
-"muc_highlight_words, or when a group chat message contains your nickname."
+"'muc_highlight_words' your nickname is mentioned."
 msgstr ""
 "Топ чат хабарламасында muc_highlight_words ішінде көрсетілген сөздердің "
 "біреуі не сіздің ник атыңыз кездескен кезде ойналатын дыбыс."
 
-#: gajim/common/config.py:481
-msgid "Sound to play when any MUC message arrives."
+#: gajim/common/config.py:480
+#, fuzzy
+msgid "Sound to play when any group chat message arrives."
 msgstr "MUC хабарламасы келген кезде ойналатын дыбыс."
 
-#: gajim/common/config.py:485
+#: gajim/common/config.py:484
 #, fuzzy
 msgid "Tor"
 msgstr "Оған"
@@ -4120,884 +4168,980 @@ msgstr "Оған"
 msgid "Error: cannot open %s for reading"
 msgstr "Қате: оқу үшін %s ашу мүмкін емес"
 
-#: gajim/common/const.py:214
+#: gajim/common/const.py:216
+#, fuzzy
+msgid "?Group chat name:Team"
+msgstr "?Group Chat Contact Role:Жоқ"
+
+#: gajim/common/const.py:217
+msgid "?Group chat description:Project discussion"
+msgstr ""
+
+#: gajim/common/const.py:218
+#, fuzzy
+msgid "?Group chat address:team"
+msgstr "Топтық чаттар"
+
+#: gajim/common/const.py:219
+#, fuzzy
+msgid "?Group chat name:Family"
+msgstr "Сізді біреу бөлмеде еске алған"
+
+#: gajim/common/const.py:220
+msgid "?Group chat description:Spring gathering"
+msgstr ""
+
+#: gajim/common/const.py:221
+msgid "?Group chat address:family"
+msgstr ""
+
+#: gajim/common/const.py:222
+#, fuzzy
+msgid "?Group chat name:Vacation"
+msgstr "Топ чатына шақыру"
+
+#: gajim/common/const.py:223
+msgid "?Group chat description:Trip planning"
+msgstr ""
+
+#: gajim/common/const.py:224
+#, fuzzy
+msgid "?Group chat address:vacation"
+msgstr "Топ чатына шақыру"
+
+#: gajim/common/const.py:225
+#, fuzzy
+msgid "?Group chat name:Repairs"
+msgstr "_Чат бөлмесі"
+
+#: gajim/common/const.py:226
+msgid "?Group chat description:Local help group"
+msgstr ""
+
+#: gajim/common/const.py:227
+#, fuzzy
+msgid "?Group chat address:repairs"
+msgstr "Топтық чаттар"
+
+#: gajim/common/const.py:228
+#, fuzzy
+msgid "?Group chat name:News"
+msgstr "?Group Chat Contact Role:Жоқ"
+
+#: gajim/common/const.py:229
+#, fuzzy
+msgid "?Group chat description:Local news and reports"
+msgstr "Топтық чаттарды жасау рұқсат етілмеген."
+
+#: gajim/common/const.py:230
+#, fuzzy
+msgid "?Group chat address:news"
+msgstr "Жаңа чат бөлмесі"
+
+#: gajim/common/const.py:235
+#, fuzzy
+msgid "Remote server not found"
+msgstr "Қызмет табылмады"
+
+#: gajim/common/const.py:236
+msgid "Remote server timeout"
+msgstr ""
+
+#: gajim/common/const.py:237 gajim/common/const.py:238
+#: gajim/common/const.py:239
+#, fuzzy
+msgid "Address does not belong to a group chat server"
+msgstr "Бұл топтық чат"
+
+#: gajim/common/const.py:240
+#, fuzzy
+msgid "Group chat already exists"
+msgstr "Local тіркелгісі бар болыр тұр."
+
+#: gajim/common/const.py:241
+#, fuzzy
+msgid "Group chat does not exist"
+msgstr "%s топтық чаты жоқ."
+
+#: gajim/common/const.py:247
 msgid "This message was encrypted with OTR and could not be decrypted."
 msgstr ""
 
-#: gajim/common/const.py:217
+#: gajim/common/const.py:250
 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:221
+#: gajim/common/const.py:254
 msgid ""
-"This message was encrypted with OpenPGP for XMPP and could not be decrypted."
+"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:224
+#: gajim/common/const.py:258
 #, python-format
 msgid "This message was encrypted with %s and could not be decrypted."
 msgstr ""
 
-#: gajim/common/const.py:231
+#: gajim/common/const.py:265
 msgid "Doing Chores"
 msgstr "Күнделікті істер"
 
-#: gajim/common/const.py:232
+#: gajim/common/const.py:266
 msgid "Buying Groceries"
 msgstr "Тамақты сатып алуда"
 
-#: gajim/common/const.py:233
+#: gajim/common/const.py:267
 msgid "Cleaning"
 msgstr "Тазалау"
 
-#: gajim/common/const.py:234
+#: gajim/common/const.py:268
 msgid "Cooking"
 msgstr "Тамақ жасауда"
 
-#: gajim/common/const.py:235
+#: gajim/common/const.py:269
 msgid "Doing Maintenance"
 msgstr "Қызмет көрсетуде"
 
-#: gajim/common/const.py:236
+#: gajim/common/const.py:270
 msgid "Doing the Dishes"
 msgstr "Ыдыс жууда"
 
-#: gajim/common/const.py:237
+#: gajim/common/const.py:271
 msgid "Doing the Laundry"
 msgstr "Кір жууда"
 
-#: gajim/common/const.py:238
+#: gajim/common/const.py:272
 msgid "Gardening"
 msgstr "Бақшамен айналысуда"
 
-#: gajim/common/const.py:239
+#: gajim/common/const.py:273
 msgid "Running an Errand"
 msgstr "Іссапарда"
 
-#: gajim/common/const.py:240
+#: gajim/common/const.py:274
 msgid "Walking the Dog"
 msgstr "Итті қыдыртуда"
 
-#: gajim/common/const.py:242
+#: gajim/common/const.py:276
 msgid "Drinking"
 msgstr "Ішуде"
 
-#: gajim/common/const.py:243
+#: gajim/common/const.py:277
 msgid "Having a Beer"
 msgstr "Сыра ішуде"
 
-#: gajim/common/const.py:244
+#: gajim/common/const.py:278
 msgid "Having Coffee"
 msgstr "Кофе ішуде"
 
-#: gajim/common/const.py:245
+#: gajim/common/const.py:279
 msgid "Having Tea"
 msgstr "Шай ішуде"
 
-#: gajim/common/const.py:248
+#: gajim/common/const.py:282
 msgid "Having a Snack"
 msgstr "Жеңіл тамақтану"
 
-#: gajim/common/const.py:249
+#: gajim/common/const.py:283
 msgid "Having Breakfast"
 msgstr "Таңертеңгі тамақ"
 
-#: gajim/common/const.py:250
+#: gajim/common/const.py:284
 msgid "Having Dinner"
 msgstr "Түскі тамақ"
 
-#: gajim/common/const.py:251
+#: gajim/common/const.py:285
 msgid "Having Lunch"
 msgstr "Ланч"
 
-#: gajim/common/const.py:253
+#: gajim/common/const.py:287
 msgid "Exercising"
 msgstr "Шынығу"
 
-#: gajim/common/const.py:254 gajim/common/const.py:305
+#: gajim/common/const.py:288 gajim/common/const.py:339
 msgid "Cycling"
 msgstr "Велосипед"
 
-#: gajim/common/const.py:255
+#: gajim/common/const.py:289
 msgid "Dancing"
 msgstr "Билеуде"
 
-#: gajim/common/const.py:256
+#: gajim/common/const.py:290
 msgid "Hiking"
 msgstr "Жаяу жүру"
 
-#: gajim/common/const.py:257
+#: gajim/common/const.py:291
 msgid "Jogging"
 msgstr "Жайлап жүгіру"
 
-#: gajim/common/const.py:258
+#: gajim/common/const.py:292
 msgid "Playing Sports"
 msgstr "Спортпен шұғылдануда"
 
-#: gajim/common/const.py:259
+#: gajim/common/const.py:293
 msgid "Running"
 msgstr "Жүгіруде"
 
-#: gajim/common/const.py:260
+#: gajim/common/const.py:294
 msgid "Skiing"
 msgstr "Шаңғы тебу"
 
-#: gajim/common/const.py:261
+#: gajim/common/const.py:295
 msgid "Swimming"
 msgstr "Шомылуда"
 
-#: gajim/common/const.py:262
+#: gajim/common/const.py:296
 msgid "Working out"
 msgstr "Бапталу"
 
-#: gajim/common/const.py:264
+#: gajim/common/const.py:298
 msgid "Grooming"
 msgstr "Өз-өзін күту"
 
-#: gajim/common/const.py:265
+#: gajim/common/const.py:299
 msgid "At the Spa"
 msgstr "Спа ішінде"
 
-#: gajim/common/const.py:266
+#: gajim/common/const.py:300
 msgid "Brushing Teeth"
 msgstr "Тіс жууда"
 
-#: gajim/common/const.py:267
+#: gajim/common/const.py:301
 msgid "Getting a Haircut"
 msgstr "Шаштаразда"
 
-#: gajim/common/const.py:268
+#: gajim/common/const.py:302
 msgid "Shaving"
 msgstr "Қырынуда"
 
-#: gajim/common/const.py:269
+#: gajim/common/const.py:303
 msgid "Taking a Bath"
 msgstr "Ваннада"
 
-#: gajim/common/const.py:270
+#: gajim/common/const.py:304
 msgid "Taking a Shower"
 msgstr "Душта"
 
-#: gajim/common/const.py:272
+#: gajim/common/const.py:306
 msgid "Having an Appointment"
 msgstr "Кездесу"
 
-#: gajim/common/const.py:274
+#: gajim/common/const.py:308
 msgid "Inactive"
 msgstr "Белсенді емес"
 
-#: gajim/common/const.py:275
+#: gajim/common/const.py:309
 msgid "Day Off"
 msgstr "Бос күн"
 
-#: gajim/common/const.py:276
+#: gajim/common/const.py:310
 msgid "Hanging out"
 msgstr "Қыдыруда"
 
-#: gajim/common/const.py:277
+#: gajim/common/const.py:311
 msgid "Hiding"
 msgstr "Жасырылуда"
 
-#: gajim/common/const.py:278
+#: gajim/common/const.py:312
 msgid "On Vacation"
 msgstr "Демалыста"
 
-#: gajim/common/const.py:279
+#: gajim/common/const.py:313
 msgid "Praying"
 msgstr "Сиыну"
 
-#: gajim/common/const.py:280
+#: gajim/common/const.py:314
 msgid "Scheduled Holiday"
 msgstr "Жоспарланған мейрам"
 
-#: gajim/common/const.py:282
+#: gajim/common/const.py:316
 msgid "Thinking"
 msgstr "Ойлауда"
 
-#: gajim/common/const.py:284
+#: gajim/common/const.py:318
 msgid "Relaxing"
 msgstr "Демалу"
 
-#: gajim/common/const.py:285
+#: gajim/common/const.py:319
 msgid "Fishing"
 msgstr "Балық аулауда"
 
-#: gajim/common/const.py:286
+#: gajim/common/const.py:320
 msgid "Gaming"
 msgstr "Ойнауда"
 
-#: gajim/common/const.py:287
+#: gajim/common/const.py:321
 msgid "Going out"
 msgstr "Қыдыруда"
 
-#: gajim/common/const.py:288
+#: gajim/common/const.py:322
 msgid "Partying"
 msgstr "Мереке"
 
-#: gajim/common/const.py:289
+#: gajim/common/const.py:323
 msgid "Reading"
 msgstr "Оқуда"
 
-#: gajim/common/const.py:290
+#: gajim/common/const.py:324
 msgid "Rehearsing"
 msgstr "Репитиция"
 
-#: gajim/common/const.py:291
+#: gajim/common/const.py:325
 msgid "Shopping"
 msgstr "Дүкенде"
 
-#: gajim/common/const.py:292
+#: gajim/common/const.py:326
 msgid "Smoking"
 msgstr "Темекі атуда"
 
-#: gajim/common/const.py:293
+#: gajim/common/const.py:327
 msgid "Socializing"
 msgstr "Адамдармен араласу"
 
-#: gajim/common/const.py:294
+#: gajim/common/const.py:328
 msgid "Sunbathing"
 msgstr "Күнге күю"
 
-#: gajim/common/const.py:295
+#: gajim/common/const.py:329
 msgid "Watching TV"
 msgstr "ТВ көруде"
 
-#: gajim/common/const.py:296
+#: gajim/common/const.py:330
 msgid "Watching a Movie"
 msgstr "Кино көрудемін."
 
-#: gajim/common/const.py:298
+#: gajim/common/const.py:332
 msgid "Talking"
 msgstr "Сөйлеуде"
 
-#: gajim/common/const.py:299
+#: gajim/common/const.py:333
 msgid "In Real Life"
 msgstr "Шын өмірде"
 
-#: gajim/common/const.py:300
+#: gajim/common/const.py:334
 msgid "On the Phone"
 msgstr "Телефонмен сөйлесуде"
 
-#: gajim/common/const.py:301
+#: gajim/common/const.py:335
 msgid "On Video Phone"
 msgstr "Видеофонда"
 
-#: gajim/common/const.py:303
+#: gajim/common/const.py:337
 msgid "Traveling"
 msgstr "Саяхатта"
 
-#: gajim/common/const.py:304
+#: gajim/common/const.py:338
 msgid "Commuting"
 msgstr "Қалыпты сапарда"
 
-#: gajim/common/const.py:306
+#: gajim/common/const.py:340
 msgid "Driving"
 msgstr "Жүргізуде"
 
-#: gajim/common/const.py:307
+#: gajim/common/const.py:341
 msgid "In a Car"
 msgstr "Машинада"
 
-#: gajim/common/const.py:308
+#: gajim/common/const.py:342
 msgid "On a Bus"
 msgstr "Автобуста"
 
-#: gajim/common/const.py:309
+#: gajim/common/const.py:343
 msgid "On a Plane"
 msgstr "Ұшақта"
 
-#: gajim/common/const.py:310
+#: gajim/common/const.py:344
 msgid "On a Train"
 msgstr "Пойызда"
 
-#: gajim/common/const.py:311
+#: gajim/common/const.py:345
 msgid "On a Trip"
 msgstr "Жол үстінде"
 
-#: gajim/common/const.py:312
+#: gajim/common/const.py:346
 msgid "Walking"
 msgstr "Қыдыруда"
 
-#: gajim/common/const.py:315
+#: gajim/common/const.py:349
 msgid "Coding"
 msgstr "Код жазуда"
 
-#: gajim/common/const.py:316
+#: gajim/common/const.py:350
 msgid "In a Meeting"
 msgstr "Кездесуде"
 
-#: gajim/common/const.py:317
+#: gajim/common/const.py:351
 msgid "Studying"
 msgstr "Оқуда"
 
-#: gajim/common/const.py:318
+#: gajim/common/const.py:352
 msgid "Writing"
 msgstr "Жазуда"
 
-#: gajim/common/const.py:321
+#: gajim/common/const.py:355
 msgid "Afraid"
 msgstr "Қорқуда"
 
-#: gajim/common/const.py:322
+#: gajim/common/const.py:356
 msgid "Amazed"
 msgstr "Таң қалған"
 
-#: gajim/common/const.py:323
+#: gajim/common/const.py:357
 msgid "Amorous"
 msgstr "Ғашық"
 
-#: gajim/common/const.py:324
+#: gajim/common/const.py:358
 msgid "Angry"
 msgstr "Ашулы"
 
-#: gajim/common/const.py:325
+#: gajim/common/const.py:359
 msgid "Annoyed"
 msgstr "Тітіркенген"
 
-#: gajim/common/const.py:326
+#: gajim/common/const.py:360
 msgid "Anxious"
 msgstr "Алаңдаған"
 
-#: gajim/common/const.py:327
+#: gajim/common/const.py:361
 msgid "Aroused"
 msgstr "Қоздырылған"
 
-#: gajim/common/const.py:328
+#: gajim/common/const.py:362
 msgid "Ashamed"
 msgstr "Ұялған"
 
-#: gajim/common/const.py:329
+#: gajim/common/const.py:363
 msgid "Bored"
 msgstr "Жалыққан"
 
-#: gajim/common/const.py:330
+#: gajim/common/const.py:364
 msgid "Brave"
 msgstr "Қайсар"
 
-#: gajim/common/const.py:331
+#: gajim/common/const.py:365
 msgid "Calm"
 msgstr "Тыныш"
 
-#: gajim/common/const.py:332
+#: gajim/common/const.py:366
 msgid "Cautious"
 msgstr "Абайлаған"
 
-#: gajim/common/const.py:333
+#: gajim/common/const.py:367
 msgid "Cold"
 msgstr "Суық"
 
-#: gajim/common/const.py:334
+#: gajim/common/const.py:368
 msgid "Confident"
 msgstr "Сенімді"
 
-#: gajim/common/const.py:335
+#: gajim/common/const.py:369
 msgid "Confused"
 msgstr "Шатасқан"
 
-#: gajim/common/const.py:336
+#: gajim/common/const.py:370
 msgid "Contemplative"
 msgstr "Маңырайған"
 
-#: gajim/common/const.py:337
+#: gajim/common/const.py:371
 msgid "Contented"
 msgstr "Мәз"
 
-#: gajim/common/const.py:338
+#: gajim/common/const.py:372
 msgid "Cranky"
 msgstr "Қырсық"
 
-#: gajim/common/const.py:339
+#: gajim/common/const.py:373
 msgid "Crazy"
 msgstr "Жынды"
 
-#: gajim/common/const.py:340
+#: gajim/common/const.py:374
 msgid "Creative"
 msgstr "Жасампаз"
 
-#: gajim/common/const.py:341
+#: gajim/common/const.py:375
 msgid "Curious"
 msgstr "Әуесқой"
 
-#: gajim/common/const.py:342
+#: gajim/common/const.py:376
 msgid "Dejected"
 msgstr "Қапа болған"
 
-#: gajim/common/const.py:343
+#: gajim/common/const.py:377
 msgid "Depressed"
 msgstr "Депрессияда"
 
-#: gajim/common/const.py:344
+#: gajim/common/const.py:378
 msgid "Disappointed"
 msgstr "Түңілген"
 
-#: gajim/common/const.py:345
+#: gajim/common/const.py:379
 msgid "Disgusted"
 msgstr "Жиіркенген"
 
-#: gajim/common/const.py:346
+#: gajim/common/const.py:380
 msgid "Dismayed"
 msgstr "Елегізген"
 
-#: gajim/common/const.py:347
+#: gajim/common/const.py:381
 msgid "Distracted"
 msgstr "Шашыраңқы"
 
-#: gajim/common/const.py:348
+#: gajim/common/const.py:382
 msgid "Embarrassed"
 msgstr "Қымсынған"
 
-#: gajim/common/const.py:349
+#: gajim/common/const.py:383
 msgid "Envious"
 msgstr "Қызғанған"
 
-#: gajim/common/const.py:350
+#: gajim/common/const.py:384
 msgid "Excited"
 msgstr "Қызыққан"
 
-#: gajim/common/const.py:351
+#: gajim/common/const.py:385
 msgid "Flirtatious"
 msgstr "Әсемпаз"
 
-#: gajim/common/const.py:352
+#: gajim/common/const.py:386
 msgid "Frustrated"
 msgstr "Көңілі қайтқан"
 
-#: gajim/common/const.py:353
+#: gajim/common/const.py:387
 msgid "Grateful"
 msgstr "Разы"
 
-#: gajim/common/const.py:354
+#: gajim/common/const.py:388
 msgid "Grieving"
 msgstr "Мұң"
 
-#: gajim/common/const.py:355
+#: gajim/common/const.py:389
 msgid "Grumpy"
 msgstr "Ашулы"
 
-#: gajim/common/const.py:356
+#: gajim/common/const.py:390
 msgid "Guilty"
 msgstr "Кінәлі"
 
-#: gajim/common/const.py:357
+#: gajim/common/const.py:391
 msgid "Happy"
 msgstr "Бақытты"
 
-#: gajim/common/const.py:358
+#: gajim/common/const.py:392
 msgid "Hopeful"
 msgstr "Сенімді"
 
-#: gajim/common/const.py:359
+#: gajim/common/const.py:393
 msgid "Hot"
 msgstr "Ыстық"
 
-#: gajim/common/const.py:360
+#: gajim/common/const.py:394
 msgid "Humbled"
 msgstr "Кемсітілген"
 
-#: gajim/common/const.py:361
+#: gajim/common/const.py:395
 msgid "Humiliated"
 msgstr "Қор болған"
 
-#: gajim/common/const.py:362
+#: gajim/common/const.py:396
 msgid "Hungry"
 msgstr "Аш"
 
-#: gajim/common/const.py:363
+#: gajim/common/const.py:397
 msgid "Hurt"
 msgstr "Жаралы"
 
-#: gajim/common/const.py:364
+#: gajim/common/const.py:398
 msgid "Impressed"
 msgstr "Әсер етілген"
 
-#: gajim/common/const.py:365
+#: gajim/common/const.py:399
 msgid "In Awe"
 msgstr "Қастерлеуде"
 
-#: gajim/common/const.py:366
+#: gajim/common/const.py:400
 msgid "In Love"
 msgstr "Ғашық"
 
-#: gajim/common/const.py:367
+#: gajim/common/const.py:401
 msgid "Indignant"
 msgstr "Ашынған"
 
-#: gajim/common/const.py:368
+#: gajim/common/const.py:402
 msgid "Interested"
 msgstr "Қызыққан"
 
-#: gajim/common/const.py:369
+#: gajim/common/const.py:403
 msgid "Intoxicated"
 msgstr "Мас"
 
-#: gajim/common/const.py:370
+#: gajim/common/const.py:404
 msgid "Invincible"
 msgstr "Жеңілмейтін"
 
-#: gajim/common/const.py:371
+#: gajim/common/const.py:405
 msgid "Jealous"
 msgstr "Қызғаншақ"
 
-#: gajim/common/const.py:372
+#: gajim/common/const.py:406
 msgid "Lonely"
 msgstr "Жалғыз"
 
-#: gajim/common/const.py:373
+#: gajim/common/const.py:407
 msgid "Lost"
 msgstr "Жоғалған"
 
-#: gajim/common/const.py:374
+#: gajim/common/const.py:408
 msgid "Lucky"
 msgstr "Сәтті"
 
-#: gajim/common/const.py:375
+#: gajim/common/const.py:409
 msgid "Mean"
 msgstr "Орташа"
 
-#: gajim/common/const.py:376
+#: gajim/common/const.py:410
 msgid "Moody"
 msgstr "Түнерген"
 
-#: gajim/common/const.py:377
+#: gajim/common/const.py:411
 msgid "Nervous"
 msgstr "Ашушаң"
 
-#: gajim/common/const.py:378
+#: gajim/common/const.py:412
 msgid "Neutral"
 msgstr "Бейтарап"
 
-#: gajim/common/const.py:379
+#: gajim/common/const.py:413
 msgid "Offended"
 msgstr "Ренжіген"
 
-#: gajim/common/const.py:380
+#: gajim/common/const.py:414
 msgid "Outraged"
 msgstr "Қорланған"
 
-#: gajim/common/const.py:381
+#: gajim/common/const.py:415
 msgid "Playful"
 msgstr "Ойнақы"
 
-#: gajim/common/const.py:382
+#: gajim/common/const.py:416
 msgid "Proud"
 msgstr "Мақтанған"
 
-#: gajim/common/const.py:383
+#: gajim/common/const.py:417
 msgid "Relaxed"
 msgstr "Босаң"
 
-#: gajim/common/const.py:384
+#: gajim/common/const.py:418
 msgid "Relieved"
 msgstr "Босатылған"
 
-#: gajim/common/const.py:385
+#: gajim/common/const.py:419
 msgid "Remorseful"
 msgstr "Өкінген"
 
-#: gajim/common/const.py:386
+#: gajim/common/const.py:420
 msgid "Restless"
 msgstr "Тынымсыз"
 
-#: gajim/common/const.py:387
+#: gajim/common/const.py:421
 msgid "Sad"
 msgstr "Көңілі жоқ"
 
-#: gajim/common/const.py:388
+#: gajim/common/const.py:422
 msgid "Sarcastic"
 msgstr "Мысқыл"
 
-#: gajim/common/const.py:389
+#: gajim/common/const.py:423
 msgid "Satisfied"
 msgstr "Қанағат"
 
-#: gajim/common/const.py:390
+#: gajim/common/const.py:424
 msgid "Serious"
 msgstr "Байсалды"
 
-#: gajim/common/const.py:391
+#: gajim/common/const.py:425
 msgid "Shocked"
 msgstr "Шокта"
 
-#: gajim/common/const.py:392
+#: gajim/common/const.py:426
 msgid "Shy"
 msgstr "Ұялшақ"
 
-#: gajim/common/const.py:393
+#: gajim/common/const.py:427
 msgid "Sick"
 msgstr "Ауырған"
 
-#: gajim/common/const.py:394
+#: gajim/common/const.py:428
 msgid "Sleepy"
 msgstr "Ұйқылы"
 
-#: gajim/common/const.py:395
+#: gajim/common/const.py:429
 msgid "Spontaneous"
 msgstr "Спонтанды"
 
-#: gajim/common/const.py:396
+#: gajim/common/const.py:430
 msgid "Stressed"
 msgstr "Қызулы"
 
-#: gajim/common/const.py:397
+#: gajim/common/const.py:431
 msgid "Strong"
 msgstr "Күшті"
 
-#: gajim/common/const.py:398
+#: gajim/common/const.py:432
 msgid "Surprised"
 msgstr "Таң қалған"
 
-#: gajim/common/const.py:399
+#: gajim/common/const.py:433
 msgid "Thankful"
 msgstr "Сыйлаушы"
 
-#: gajim/common/const.py:400
+#: gajim/common/const.py:434
 msgid "Thirsty"
 msgstr "Сусаған"
 
-#: gajim/common/const.py:401
+#: gajim/common/const.py:435
 msgid "Tired"
 msgstr "Шаршаған"
 
-#: gajim/common/const.py:402
+#: gajim/common/const.py:436
 msgid "Undefined"
 msgstr "Тағайындалмаған"
 
-#: gajim/common/const.py:403
+#: gajim/common/const.py:437
 msgid "Weak"
 msgstr "Әлсіз"
 
-#: gajim/common/const.py:404
+#: gajim/common/const.py:438
 msgid "Worried"
 msgstr "Абыржыған"
 
-#: gajim/common/const.py:408
+#: gajim/common/const.py:442
 msgid "accuracy"
 msgstr ""
 
-#: gajim/common/const.py:409
+#: gajim/common/const.py:443
 #, fuzzy
 msgid "alt"
 msgstr "бастапқысы"
 
-#: gajim/common/const.py:410
+#: gajim/common/const.py:444
 msgid "area"
 msgstr ""
 
-#: gajim/common/const.py:411
+#: gajim/common/const.py:445
 #, fuzzy
 msgid "bearing"
 msgstr "marine"
 
-#: gajim/common/const.py:412
+#: gajim/common/const.py:446
 #, fuzzy
 msgid "building"
 msgstr "Жасырылуда"
 
-#: gajim/common/const.py:413
+#: gajim/common/const.py:447
 #, fuzzy
 msgid "country"
 msgstr "Тіркелгі"
 
-#: gajim/common/const.py:414
+#: gajim/common/const.py:448
 #, fuzzy
 msgid "countrycode"
 msgstr "Тіркелгі бағаны"
 
-#: gajim/common/const.py:415
+#: gajim/common/const.py:449
 msgid "datum"
 msgstr ""
 
-#: gajim/common/const.py:416
+#: gajim/common/const.py:450
 #, fuzzy
 msgid "description"
 msgstr "Сипаттамасы"
 
-#: gajim/common/const.py:417
+#: gajim/common/const.py:451
 #, fuzzy
 msgid "error"
 msgstr "Қате"
 
-#: gajim/common/const.py:418
+#: gajim/common/const.py:452
 msgid "floor"
 msgstr ""
 
-#: gajim/common/const.py:419
+#: gajim/common/const.py:453
 msgid "lat"
 msgstr ""
 
-#: gajim/common/const.py:420
+#: gajim/common/const.py:454
 msgid "locality"
 msgstr ""
 
-#: gajim/common/const.py:421
+#: gajim/common/const.py:455
 #, fuzzy
 msgid "lon"
 msgstr "бір"
 
-#: gajim/common/const.py:422
+#: gajim/common/const.py:456
 msgid "postalcode"
 msgstr ""
 
-#: gajim/common/const.py:423
+#: gajim/common/const.py:457
 msgid "region"
 msgstr ""
 
-#: gajim/common/const.py:424
+#: gajim/common/const.py:458
 msgid "room"
 msgstr "бөлме"
 
-#: gajim/common/const.py:425
+#: gajim/common/const.py:459
 msgid "speed"
 msgstr ""
 
-#: gajim/common/const.py:426
+#: gajim/common/const.py:460
 #, fuzzy
 msgid "street"
 msgstr "stream"
 
-#: gajim/common/const.py:427
+#: gajim/common/const.py:461
 msgid "text"
 msgstr ""
 
-#: gajim/common/const.py:428
+#: gajim/common/const.py:462
 msgid "timestamp"
 msgstr ""
 
-#: gajim/common/const.py:429
+#: gajim/common/const.py:463
 msgid "URI"
 msgstr ""
 
-#: gajim/common/const.py:434
+#: gajim/common/const.py:468
 msgid "Unable to get issuer certificate"
 msgstr "Шығарушы сертификатын алу мүмкін емес"
 
-#: gajim/common/const.py:435
+#: gajim/common/const.py:469
 msgid "Unable to get certificate CRL"
 msgstr "Сертификат үшін CRL алу мүмкін емес"
 
-#: gajim/common/const.py:436
+#: gajim/common/const.py:470
 msgid "Unable to decrypt certificate's signature"
 msgstr "Сертификат қолтаңбасын декодалау мүмкін емес"
 
-#: gajim/common/const.py:437
+#: gajim/common/const.py:471
 msgid "Unable to decrypt CRL's signature"
 msgstr "CRL қолтаңбасын декодалау мүмкін емес"
 
-#: gajim/common/const.py:438
+#: gajim/common/const.py:472
 msgid "Unable to decode issuer public key"
 msgstr "Шығарушының ортақ кілтін декодалау мүмкін емес"
 
-#: gajim/common/const.py:439
+#: gajim/common/const.py:473
 msgid "Certificate signature failure"
 msgstr "Сертификат қолтаңба қатесі"
 
-#: gajim/common/const.py:440
+#: gajim/common/const.py:474
 msgid "CRL signature failure"
 msgstr "CRL қолтаңба қатесі"
 
-#: gajim/common/const.py:441
+#: gajim/common/const.py:475
 msgid "Certificate is not yet valid"
 msgstr "Сертификат мерзімі әлі басталмаған"
 
-#: gajim/common/const.py:442
+#: gajim/common/const.py:476
 msgid "Certificate has expired"
 msgstr "Сертификат мерзімі біткен"
 
-#: gajim/common/const.py:443
+#: gajim/common/const.py:477
 msgid "CRL is not yet valid"
 msgstr "CRL мерзімі әлі басталмаған"
 
-#: gajim/common/const.py:444
+#: gajim/common/const.py:478
 msgid "CRL has expired"
 msgstr "CRL мерзімі біткен"
 
-#: gajim/common/const.py:445
+#: gajim/common/const.py:479
 msgid "Format error in certificate's notBefore field"
 msgstr "Сертификаттың notBefore өрісіндегі пішім қатесі"
 
-#: gajim/common/const.py:446
+#: gajim/common/const.py:480
 msgid "Format error in certificate's notAfter field"
 msgstr "Сертификаттың notAfter өрісіндегі пішім қатесі"
 
-#: gajim/common/const.py:447
+#: gajim/common/const.py:481
 msgid "Format error in CRL's lastUpdate field"
 msgstr "CRL lastUpdate өрісіндегі пішім қатесі"
 
-#: gajim/common/const.py:448
+#: gajim/common/const.py:482
 msgid "Format error in CRL's nextUpdate field"
 msgstr "CRL nextUpdate өрісіндегі пішім қатесі"
 
-#: gajim/common/const.py:449
+#: gajim/common/const.py:483
 msgid "Out of memory"
 msgstr "Жады жеткіліксіз"
 
-#: gajim/common/const.py:450
+#: gajim/common/const.py:484
 msgid "Self signed certificate"
 msgstr "Өздігінен қолтаңбасы бар сертификат"
 
-#: gajim/common/const.py:451
+#: gajim/common/const.py:485
 msgid "Self signed certificate in certificate chain"
 msgstr "Сертификаттар тобындағы өздігінен қолтаңбасы бар сертификат"
 
-#: gajim/common/const.py:452
+#: gajim/common/const.py:486
 msgid "Unable to get local issuer certificate"
 msgstr "Жергілікті шығарушы сертификатын алу мүмкін емес"
 
-#: gajim/common/const.py:453
+#: gajim/common/const.py:487
 msgid "Unable to verify the first certificate"
 msgstr "Бірінші сертификатты тексеру мүмкін емес"
 
-#: gajim/common/const.py:454
+#: gajim/common/const.py:488
 msgid "Certificate chain too long"
 msgstr "Сертификаттар тізімі тым үлкен"
 
-#: gajim/common/const.py:455
+#: gajim/common/const.py:489
 msgid "Certificate revoked"
 msgstr "Сертификат қайта шақырылған"
 
-#: gajim/common/const.py:456
+#: gajim/common/const.py:490
 msgid "Invalid CA certificate"
 msgstr "CA қате сертификаты"
 
-#: gajim/common/const.py:457
+#: gajim/common/const.py:491
 msgid "Path length constraint exceeded"
 msgstr "Жол ұзындық шектеуі асырылған"
 
-#: gajim/common/const.py:458
+#: gajim/common/const.py:492
 msgid "Unsupported certificate purpose"
 msgstr "Қолдау жоқ сертификат мақсаты"
 
-#: gajim/common/const.py:459
+#: gajim/common/const.py:493
 msgid "Certificate not trusted"
 msgstr "Сертификатқа сенім жоқ"
 
-#: gajim/common/const.py:460
+#: gajim/common/const.py:494
 msgid "Certificate rejected"
 msgstr "Сертификат тайдырылған"
 
-#: gajim/common/const.py:461
+#: gajim/common/const.py:495
 msgid "Subject issuer mismatch"
 msgstr "Сертификатты ұсынушының сәйкес еместігі"
 
-#: gajim/common/const.py:462
+#: gajim/common/const.py:496
 msgid "Authority and subject key identifier mismatch"
 msgstr ""
 "Сертификаттау орталығы мен иесі кілттерінің идентификаторлары өзара сәйкес "
 "емес"
 
-#: gajim/common/const.py:463
+#: gajim/common/const.py:497
 msgid "Authority and issuer serial number mismatch"
 msgstr ""
 "Сертификаттау орталығы мен ұсынушы кілттерінің идентификаторлары өзара "
 "сәйкес емес"
 
-#: gajim/common/const.py:464
+#: gajim/common/const.py:498
 msgid "Key usage does not include certificate signing"
 msgstr "Кілтті қолдану сертификаттарға қолтаңбаны қою қамтымайды"
 
-#: gajim/common/const.py:465
+#: gajim/common/const.py:499
 msgid "Application verification failure"
 msgstr "Қолданбаны растау қатесі"
 
@@ -5170,262 +5314,262 @@ msgstr "видео кірісі"
 msgid "video output"
 msgstr "видео шығысы"
 
-#: gajim/common/helpers.py:210
+#: gajim/common/helpers.py:216
 #, fuzzy
 msgid "Server must be between 1 and 1023 bytes"
 msgstr "Сервер 1 мен 1023 таңба арасында болуы керек"
 
-#: gajim/common/helpers.py:214
+#: gajim/common/helpers.py:220
 msgid "Invalid character in hostname."
 msgstr "Хост атындағы қате таңба."
 
-#: gajim/common/helpers.py:216
+#: gajim/common/helpers.py:222
 msgid "Server address required."
 msgstr "Сервер адресі керек."
 
-#: gajim/common/helpers.py:220
+#: gajim/common/helpers.py:226
 #, fuzzy
 msgid "Username must be between 1 and 1023 bytes"
 msgstr "Пайдаланушы аты 1 мен 1023 таңба арасында болуы керек"
 
-#: gajim/common/helpers.py:224
+#: gajim/common/helpers.py:230
 msgid "Invalid character in username."
 msgstr "Пайдаланушы атындағы қате таңба."
 
-#: gajim/common/helpers.py:230
+#: gajim/common/helpers.py:236
 #, fuzzy
 msgid "Resource must be between 1 and 1023 bytes"
 msgstr "Сервер 1 мен 1023 таңба арасында болуы керек"
 
-#: gajim/common/helpers.py:234
+#: gajim/common/helpers.py:240
 msgid "Invalid character in resource."
 msgstr "Ресурс атындағы қате таңба."
 
-#: gajim/common/helpers.py:275
+#: gajim/common/helpers.py:281
 msgid "_Busy"
 msgstr "_Бос емес"
 
-#: gajim/common/helpers.py:277 gajim/gtk/tooltips.py:647
+#: gajim/common/helpers.py:283 gajim/gtk/tooltips.py:647
 msgid "Busy"
 msgstr "Бос емес"
 
-#: gajim/common/helpers.py:280
+#: gajim/common/helpers.py:286
 msgid "_Not Available"
 msgstr "Қо_л жетерсіз"
 
-#: gajim/common/helpers.py:282 gajim/gtk/tooltips.py:649
+#: gajim/common/helpers.py:288 gajim/gtk/tooltips.py:649
 msgid "Not Available"
 msgstr "Қол жетерсіз"
 
-#: gajim/common/helpers.py:285
+#: gajim/common/helpers.py:291
 msgid "_Free for Chat"
 msgstr "_Чатқа дайын"
 
-#: gajim/common/helpers.py:287 gajim/gtk/tooltips.py:643
+#: gajim/common/helpers.py:293 gajim/gtk/tooltips.py:643
 msgid "Free for Chat"
 msgstr "Чатқа дайын"
 
-#: gajim/common/helpers.py:290
+#: gajim/common/helpers.py:296
 msgid "?user status:_Available"
 msgstr "?user status:_Осында"
 
-#: gajim/common/helpers.py:292 gajim/gtk/tooltips.py:641
+#: gajim/common/helpers.py:298 gajim/gtk/tooltips.py:641
 msgid "?user status:Available"
 msgstr "?user status:Осында"
 
-#: gajim/common/helpers.py:294
+#: gajim/common/helpers.py:300
 msgid "Connecting"
 msgstr "Байланыс орнату"
 
-#: gajim/common/helpers.py:297 gajim/data/gui/preferences_window.ui:1251
+#: gajim/common/helpers.py:303 gajim/data/gui/preferences_window.ui:1251
 msgid "A_way"
 msgstr "К_етіп қалған"
 
-#: gajim/common/helpers.py:299 gajim/common/modules/adhoc_commands.py:120
-#: gajim/command_system/implementation/standard.py:139
+#: gajim/common/helpers.py:305 gajim/common/modules/adhoc_commands.py:120
+#: gajim/command_system/implementation/standard.py:141
 #: gajim/gtk/tooltips.py:645
 msgid "Away"
 msgstr "Кетіп қалған"
 
-#: gajim/common/helpers.py:302
+#: gajim/common/helpers.py:308
 msgid "_Offline"
 msgstr "Желі_де емес"
 
-#: gajim/common/helpers.py:304 gajim/gtk/tooltips.py:651
+#: gajim/common/helpers.py:310 gajim/gtk/tooltips.py:651
 msgid "Offline"
 msgstr "Желіде емес"
 
-#: gajim/common/helpers.py:307
+#: gajim/common/helpers.py:313
 msgid "_Invisible"
 msgstr "_Жасырын"
 
-#: gajim/common/helpers.py:313
+#: gajim/common/helpers.py:319
 msgid "?contact has status:Unknown"
 msgstr "?контакт күйі:Белгісіз"
 
-#: gajim/common/helpers.py:315
+#: gajim/common/helpers.py:321
 msgid "?contact has status:Has errors"
 msgstr "?контакт күйі:Қателері бар"
 
-#: gajim/common/helpers.py:330
+#: gajim/common/helpers.py:336
 msgid "?Subscription we already have:None"
 msgstr "?Subscription we already have:Жоқ"
 
-#: gajim/common/helpers.py:332
+#: gajim/common/helpers.py:338
 msgid "To"
 msgstr "Оған"
 
-#: gajim/common/helpers.py:334 gajim/data/gui/groups_post_window.ui:33
+#: gajim/common/helpers.py:340 gajim/data/gui/groups_post_window.ui:33
 msgid "From"
 msgstr "Одан"
 
-#: gajim/common/helpers.py:336
+#: gajim/common/helpers.py:342
 msgid "Both"
 msgstr "Екеуі де"
 
-#: gajim/common/helpers.py:338 gajim/gtk/server_info.py:151
+#: gajim/common/helpers.py:344 gajim/gtk/server_info.py:151
 #, fuzzy
 msgid "Unknown"
 msgstr "?ОЖ:Белгісіз"
 
-#: gajim/common/helpers.py:344
+#: gajim/common/helpers.py:350
 msgid "?Ask (for Subscription):None"
 msgstr "?Ask (for Subscription):Жоқ"
 
-#: gajim/common/helpers.py:346
+#: gajim/common/helpers.py:352
 msgid "Subscribe"
 msgstr "Жазылу"
 
-#: gajim/common/helpers.py:355
+#: gajim/common/helpers.py:361
 msgid "?Group Chat Contact Role:None"
 msgstr "?Group Chat Contact Role:Жоқ"
 
-#: gajim/common/helpers.py:358
+#: gajim/common/helpers.py:364
 msgid "Moderators"
 msgstr "Модераторлар"
 
-#: gajim/common/helpers.py:360
+#: gajim/common/helpers.py:366
 msgid "Moderator"
 msgstr "Модератор"
 
-#: gajim/common/helpers.py:363
+#: gajim/common/helpers.py:369 gajim/data/gui/groupchat_info_scrolled.ui:243
 msgid "Participants"
 msgstr "Қатысушылар"
 
-#: gajim/common/helpers.py:365
+#: gajim/common/helpers.py:371
 msgid "Participant"
 msgstr "Қатысушы"
 
-#: gajim/common/helpers.py:368
+#: gajim/common/helpers.py:374
 msgid "Visitors"
 msgstr "Қонақтар"
 
-#: gajim/common/helpers.py:370
+#: gajim/common/helpers.py:376
 msgid "Visitor"
 msgstr "Қонақ"
 
-#: gajim/common/helpers.py:376 gajim/gtk/tooltips.py:253
+#: gajim/common/helpers.py:382 gajim/gtk/tooltips.py:253
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "?Group Chat Contact Affiliation:Жоқ"
 
-#: gajim/common/helpers.py:378 gajim/data/gui/groupchat_config.ui:32
+#: gajim/common/helpers.py:384 gajim/data/gui/groupchat_config.ui:32
 #: gajim/gtk/tooltips.py:259
 msgid "Owner"
 msgstr "Иесі"
 
-#: gajim/common/helpers.py:380 gajim/gtk/tooltips.py:257
+#: gajim/common/helpers.py:386 gajim/gtk/tooltips.py:257
 msgid "Administrator"
 msgstr "Әкімші"
 
-#: gajim/common/helpers.py:382 gajim/data/gui/groupchat_config.ui:40
+#: gajim/common/helpers.py:388 gajim/data/gui/groupchat_config.ui:40
 #: gajim/gtk/tooltips.py:255 gajim/gtk/groupchat_config.py:105
 msgid "Member"
 msgstr "Мүше"
 
-#: gajim/common/helpers.py:421
+#: gajim/common/helpers.py:427
 msgid "is paying attention to the conversation"
 msgstr "хабарламаға көңіл аударды"
 
-#: gajim/common/helpers.py:423
+#: gajim/common/helpers.py:429
 msgid "is doing something else"
 msgstr "басқа нәрсемен айналысуда"
 
-#: gajim/common/helpers.py:425
+#: gajim/common/helpers.py:431
 #, fuzzy
 msgid "is composing a message…"
 msgstr "хабарлама жазып тұр..."
 
-#: gajim/common/helpers.py:428
+#: gajim/common/helpers.py:434
 msgid "paused composing a message"
 msgstr "хабарлама жазуды аялдатқан"
 
-#: gajim/common/helpers.py:430
+#: gajim/common/helpers.py:436
 msgid "has closed the chat window or tab"
 msgstr "чат терезесін не бетін жапты"
 
-#: gajim/common/helpers.py:936 gajim/common/helpers.py:943
+#: gajim/common/helpers.py:942 gajim/common/helpers.py:949
 #, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
 msgstr[0] "%d хабарлама бар"
 msgstr[1] "%d хабарлама бар"
 
-#: gajim/common/helpers.py:950
+#: gajim/common/helpers.py:956
 #, fuzzy, python-format
-msgid "from room %s"
-msgstr " %s бөлмесінен"
+msgid "from group chat %s"
+msgstr "_чат бөлмелерінде"
 
-#: gajim/common/helpers.py:953 gajim/common/helpers.py:970
+#: gajim/common/helpers.py:959 gajim/common/helpers.py:976
 #, fuzzy, python-format
 msgid "from user %s"
 msgstr " %s пайдаланушысынан"
 
-#: gajim/common/helpers.py:955
+#: gajim/common/helpers.py:961
 #, fuzzy, python-format
 msgid "from %s"
 msgstr ", қайдан: %s"
 
-#: gajim/common/helpers.py:962 gajim/common/helpers.py:968
+#: gajim/common/helpers.py:968 gajim/common/helpers.py:974
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
 msgstr[0] "%d оқиға бар"
 msgstr[1] "%d оқиға бар"
 
-#: gajim/common/helpers.py:986 gajim/common/helpers.py:998
+#: gajim/common/helpers.py:992 gajim/common/helpers.py:1004
 #: gajim/data/gui/roster_window.ui:85 data/org.gajim.Gajim.desktop.in:4
 #: data/org.gajim.Gajim.appdata.xml.in:9
 msgid "Gajim"
 msgstr "Gajim"
 
-#: gajim/common/helpers.py:1000
+#: gajim/common/helpers.py:1006
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: gajim/common/helpers.py:1109 gajim/data/gui/add_new_contact_window.ui:25
+#: gajim/common/helpers.py:1115 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:1111
+#: gajim/common/helpers.py:1117
 msgid "Hello, I am $name."
 msgstr "Сәлем, мен - $name."
 
-#: gajim/common/helpers.py:1215 gajim/common/helpers.py:1224
-#: gajim/common/helpers.py:1282
+#: gajim/common/helpers.py:1221 gajim/common/helpers.py:1230
+#: gajim/common/helpers.py:1288
 msgid "Timeout loading image"
 msgstr "Суретті жүктеу уақыты бітті"
 
-#: gajim/common/helpers.py:1234 gajim/common/helpers.py:1280
+#: gajim/common/helpers.py:1240 gajim/common/helpers.py:1286
 msgid "Image is too big"
 msgstr "Сурет тым үлкен"
 
-#: gajim/common/helpers.py:1245
+#: gajim/common/helpers.py:1251
 #, fuzzy
 msgid "PyCURL is not installed"
 msgstr "CRL мерзімі әлі басталмаған"
 
-#: gajim/common/helpers.py:1284
+#: gajim/common/helpers.py:1290
 #, fuzzy
 msgid "Error loading image"
 msgstr "Суретті жүктеу уақыты бітті"
@@ -5605,7 +5749,8 @@ msgstr "Қалып-күй өзгертілді."
 
 #: gajim/common/modules/adhoc_commands.py:202
 #: gajim/common/modules/adhoc_commands.py:239
-msgid "Leave Groupchats"
+#, fuzzy
+msgid "Leave Group Chats"
 msgstr "Топ чаттардан шығу"
 
 #: gajim/common/modules/adhoc_commands.py:228
@@ -5614,15 +5759,18 @@ msgid "%(nickname)s on %(room_jid)s"
 msgstr "%(nickname)s, қайда: %(room_jid)s"
 
 #: gajim/common/modules/adhoc_commands.py:232
-msgid "You have not joined a groupchat."
+#, fuzzy
+msgid "You have not joined a group chat."
 msgstr "Сіз топтық чатқа кірген жоқсыз."
 
 #: gajim/common/modules/adhoc_commands.py:240
-msgid "Choose the groupchats you want to leave"
+#, fuzzy
+msgid "Choose the group chats you want to leave"
 msgstr "Шығу үшін топ чаттарын таңдаңыз"
 
 #: gajim/common/modules/adhoc_commands.py:289
-msgid "You left the following groupchats:"
+#, fuzzy
+msgid "You left the following group chats:"
 msgstr "Келесі топ чаттарынан шығасыз:"
 
 #: gajim/common/modules/roster_item_exchange.py:102
@@ -5638,7 +5786,7 @@ msgstr "Жіберілген контакттар:"
 msgid "Blocked Contacts"
 msgstr "Блокталған контакттар"
 
-#: gajim/data/gui/destroy_muc_dialog.ui:79 gajim/gtk/dialogs.py:736
+#: gajim/data/gui/destroy_muc_dialog.ui:79 gajim/gtk/dialogs.py:563
 msgid "Destroy this group chat permanently?"
 msgstr ""
 
@@ -5647,7 +5795,7 @@ msgstr ""
 msgid "Reason..."
 msgstr "Себебі"
 
-#: gajim/data/gui/destroy_muc_dialog.ui:124 gajim/gtk/dialogs.py:738
+#: gajim/data/gui/destroy_muc_dialog.ui:124 gajim/gtk/dialogs.py:565
 msgid "Where participants should go (optional)"
 msgstr ""
 
@@ -5660,34 +5808,6 @@ msgstr ""
 msgid "_Reason and alternate venue (optional)"
 msgstr "Басқа кездесу орнын көрсете аласыз:"
 
-#: gajim/data/gui/advanced_configuration_window.ui:7
-#: gajim/data/gui/preferences_window.ui:2723
-#, fuzzy
-msgid "Advanced Configuration Editor (ACE)"
-msgstr "Кеңейтілген баптаулар түзетушісі"
-
-#: gajim/data/gui/advanced_configuration_window.ui:52
-#, fuzzy
-msgid "You should restart Gajim for some changes to take effect"
-msgstr ""
-"<b>ЕСКЕРТУ:</b> Кейбір баптаулар іске асу үшін, Gajim-ді қайта қосуыңыз керек"
-
-#: gajim/data/gui/advanced_configuration_window.ui:84
-#, fuzzy
-msgid "_Filter"
-msgstr "Фильтр:"
-
-#: gajim/data/gui/advanced_configuration_window.ui:153
-#: gajim/data/gui/filetransfers_send_file_dialog.ui:15
-#: gajim/gtk/discovery.py:1666
-msgid "Description"
-msgstr "Сипаттамасы"
-
-#: gajim/data/gui/advanced_configuration_window.ui:197
-#, fuzzy
-msgid "_Reset to default"
-msgstr "Бас_тапқы түстерге тастау"
-
 #: gajim/data/gui/join_groupchat_window.ui:56
 #: gajim/data/gui/chat_to_muc_window.ui:67
 #: gajim/data/gui/chat_to_muc_window.ui:78
@@ -5699,9 +5819,8 @@ msgid "Join group chat every time Gajim is started"
 msgstr ""
 
 #: gajim/data/gui/join_groupchat_window.ui:113
-#, fuzzy
-msgid "Auto Join"
-msgstr "А_втокіру"
+msgid "Join Automatically"
+msgstr ""
 
 #: gajim/data/gui/join_groupchat_window.ui:131
 #: gajim/data/gui/profile_window.ui:233
@@ -5710,10 +5829,11 @@ msgstr "Тіркелгі"
 
 #: gajim/data/gui/join_groupchat_window.ui:147
 #, fuzzy
-msgid "Room"
-msgstr "Бөлме:"
+msgid "Group chat"
+msgstr "Топтық чаттар"
 
-#: gajim/data/gui/join_groupchat_window.ui:180 gajim/gtk/accounts.py:886
+#: gajim/data/gui/join_groupchat_window.ui:180 gajim/data/gui/bookmarks.ui:158
+#: gajim/gtk/accounts.py:889
 #, fuzzy
 msgid "Password"
 msgstr "Пароль:"
@@ -5737,90 +5857,11 @@ msgstr "_чат бөлмелерінде"
 msgid "Search group chats on selected server"
 msgstr ""
 
-#: gajim/data/gui/join_groupchat_window.ui:437 gajim/gtk/discovery.py:1271
+#: gajim/data/gui/join_groupchat_window.ui:437 gajim/gtk/discovery.py:1270
 #, fuzzy
 msgid "Join"
 msgstr "_Кіру"
 
-#: gajim/data/gui/manage_proxies_window.ui:12
-msgid "HTTP Connect"
-msgstr "HTTP Connect"
-
-#: gajim/data/gui/manage_proxies_window.ui:15
-msgid "SOCKS5"
-msgstr "SOCKS5"
-
-#: gajim/data/gui/manage_proxies_window.ui:18
-msgid "BOSH"
-msgstr "BOSH"
-
-#: gajim/data/gui/manage_proxies_window.ui:27
-msgid "Manage Proxy Profiles"
-msgstr "Прокси профайлдарын басқару"
-
-#: gajim/data/gui/manage_proxies_window.ui:83
-#, fuzzy
-msgid "Add Proxy"
-msgstr "Прокси:"
-
-#: gajim/data/gui/manage_proxies_window.ui:97
-#, fuzzy
-msgid "Remove Proxy"
-msgstr "Топты өшіру"
-
-#: gajim/data/gui/manage_proxies_window.ui:141
-#, fuzzy
-msgid "Properties"
-msgstr "<b>Қасиеттер</b>"
-
-#: gajim/data/gui/manage_proxies_window.ui:157
-#, fuzzy
-msgid "_Name"
-msgstr "_Аты:"
-
-#: gajim/data/gui/manage_proxies_window.ui:173
-#, fuzzy
-msgid "_Type"
-msgstr "_Түрі:"
-
-#: gajim/data/gui/manage_proxies_window.ui:236
-#, fuzzy
-msgid "_BOSH URL"
-msgstr "BOSH URL-_ы:"
-
-#: gajim/data/gui/manage_proxies_window.ui:261
-msgid "Use HTTP prox_y"
-msgstr "HTTP прокс_и қолдану"
-
-#: gajim/data/gui/manage_proxies_window.ui:280
-#, fuzzy
-msgid "Proxy _Host"
-msgstr "Прокси _хосты:"
-
-#: gajim/data/gui/manage_proxies_window.ui:307
-#, fuzzy
-msgid "Proxy _Port"
-msgstr "Прокс_и порты:"
-
-#: gajim/data/gui/manage_proxies_window.ui:334
-#, fuzzy
-msgid "_Username"
-msgstr "_Пайдаланушы аты:"
-
-#: gajim/data/gui/manage_proxies_window.ui:347
-msgid "Use proxy auth_entication"
-msgstr "Прокси _аутентификациясын қолдану"
-
-#: gajim/data/gui/manage_proxies_window.ui:377
-#, fuzzy
-msgid "Pass_word"
-msgstr "Па_роль:"
-
-#: gajim/data/gui/manage_proxies_window.ui:405 gajim/gtk/adhoc.py:321
-#, fuzzy
-msgid "Settings"
-msgstr "Плагиндер"
-
 #: gajim/data/gui/change_password_dialog.ui:17
 #, fuzzy
 msgid "New Password"
@@ -5851,11 +5892,13 @@ msgid "Status:"
 msgstr "Күйі:"
 
 #: gajim/data/gui/zeroconf_information_window.ui:89
-msgid "_Log conversation history"
+#, fuzzy
+msgid "_Store conversation history"
 msgstr "Чат тарихын _логқа сақтау"
 
 #: gajim/data/gui/zeroconf_information_window.ui:215
 #: gajim/data/gui/vcard_information_window.ui:390
+#: gajim/data/gui/groupchat_info_scrolled.ui:166
 msgid "Contact"
 msgstr "Контакт"
 
@@ -5868,8 +5911,9 @@ msgid "Last Name:"
 msgstr "Фамилиясы:"
 
 #: gajim/data/gui/zeroconf_information_window.ui:260
-msgid "Jabber ID:"
-msgstr "Jabber ID:"
+#, fuzzy
+msgid "XMPP Address:"
+msgstr "AIM адресі:"
 
 #: gajim/data/gui/zeroconf_information_window.ui:273
 msgid "E-Mail:"
@@ -5889,8 +5933,9 @@ msgid "Send _File"
 msgstr "_Файлды жіберу"
 
 #: gajim/data/gui/gc_occupants_menu.ui:29
-msgid "Occupant Actions"
-msgstr "Қатысушы әрекеттері"
+#, fuzzy
+msgid "Participant Actions"
+msgstr "Қатысушылар"
 
 #: gajim/data/gui/gc_occupants_menu.ui:38
 msgid "_Voice"
@@ -5921,8 +5966,9 @@ msgid "_Ban"
 msgstr "_Бан"
 
 #: gajim/data/gui/gc_occupants_menu.ui:124
-msgid "_Add to Roster"
-msgstr "Р_остерге қосу"
+#, fuzzy
+msgid "_Add to Contact List"
+msgstr "_Контакт қосу..."
 
 #: gajim/data/gui/gc_occupants_menu.ui:132
 #, fuzzy
@@ -5962,11 +6008,6 @@ msgstr "Жазылу: "
 msgid "_Status"
 msgstr "Қа_лып-күй"
 
-#: gajim/data/gui/zeroconf_context_menu.ui:26
-#: gajim/data/gui/account_context_menu.ui:79
-msgid "_Modify Account..."
-msgstr "Тіркелгіні тү_зету..."
-
 #: gajim/data/gui/certificate_dialog.ui:66
 #: gajim/data/gui/certificate_dialog.ui:178
 msgid "Common Name (CN)"
@@ -6049,13 +6090,19 @@ msgstr "Соңғы рет өзгертілген:"
 msgid "Next entry"
 msgstr ""
 
+#: gajim/data/gui/filetransfers_send_file_dialog.ui:15
+#: gajim/data/gui/advanced_configuration.ui:143
+#: gajim/data/gui/groupchat_info_scrolled.ui:48 gajim/gtk/discovery.py:1663
+msgid "Description"
+msgstr "Сипаттамасы"
+
 #: gajim/data/gui/filetransfers_send_file_dialog.ui:54
 #, fuzzy
 msgid "_Send Files"
 msgstr "_Файлды жіберу"
 
 #: gajim/data/gui/filetransfers_send_file_dialog.ui:58
-#: gajim/gtk/xml_console.py:90
+#: gajim/gtk/xml_console.py:87
 #, fuzzy
 msgid "Send"
 msgstr "_Жіберу"
@@ -6080,20 +6127,23 @@ msgid "Change _Nickname..."
 msgstr "_Никті өзгерту..."
 
 #: gajim/data/gui/gc_control_popup_menu.ui:20
-msgid "_Manage Room"
-msgstr "_Бөлмені басқару"
+#, fuzzy
+msgid "_Manage Group Chat"
+msgstr "_Жаңа чат бөлмесі"
 
 #: gajim/data/gui/gc_control_popup_menu.ui:31
 msgid "Change _Subject..."
 msgstr "_Тақырыпты өзгерту..."
 
 #: gajim/data/gui/gc_control_popup_menu.ui:38
-msgid "Configure _Room..."
-msgstr "_Бөлмені баптау..."
+#, fuzzy
+msgid "Configure _Group Chat..."
+msgstr "Чат _бөлмесіне кіру..."
 
 #: gajim/data/gui/gc_control_popup_menu.ui:52
-msgid "_Destroy Room"
-msgstr "Бөлме_ні жою"
+#, fuzzy
+msgid "_Destroy Group Chat"
+msgstr "_Жаңа чат бөлмесі"
 
 #: gajim/data/gui/gc_control_popup_menu.ui:64
 msgid "_Minimize on close"
@@ -6104,7 +6154,7 @@ msgstr "_Жабылғанда, ростерге орналастыру"
 msgid "_Request Voice"
 msgstr "_Даусы бар"
 
-#: gajim/data/gui/gc_control_popup_menu.ui:99 gajim/gtk/discovery.py:1704
+#: gajim/data/gui/gc_control_popup_menu.ui:99
 msgid "_Bookmark"
 msgstr "_Бетбелгі"
 
@@ -6156,13 +6206,6 @@ msgstr "Үй парағы:"
 msgid "E-Mail"
 msgstr "E-Mail:"
 
-#: 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/blocking_list.ui:115 gajim/gtk/add_contact.py:30
-#: gajim/gtk/accounts.py:801
-msgid "Jabber ID"
-msgstr "Jabber ID"
-
 #: gajim/data/gui/profile_window.ui:440
 msgid "Main"
 msgstr ""
@@ -6295,36 +6338,44 @@ msgstr "Жұмыс"
 msgid "About"
 msgstr "Өзім туралы"
 
-#: gajim/data/gui/start_chat_dialog.ui:114 gajim/gtk/discovery.py:1658
-msgid "Users"
-msgstr "Пайдаланушылар"
+#: gajim/data/gui/start_chat_dialog.ui:53
+#, fuzzy
+msgid "Global Group Chat Search"
+msgstr "Бөлмеге кіру"
 
-#: gajim/data/gui/start_chat_dialog.ui:185
+#: 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
-msgid "Name:"
-msgstr "Аты:"
+msgid "_Back"
+msgstr "Жақында ораламын"
 
-#: gajim/data/gui/start_chat_dialog.ui:197
-msgid "Description:"
-msgstr "Анықтамасы:"
+#: gajim/data/gui/start_chat_dialog.ui:245
+#: gajim/data/gui/groupchat_control.ui:796
+#: gajim/data/gui/groupchat_control.ui:888 gajim/gtk/discovery.py:1701
+#: gajim/gtk/groupchat_join.py:62
+msgid "_Join"
+msgstr "_Кіру"
 
-#: gajim/data/gui/start_chat_dialog.ui:209
+#: gajim/data/gui/start_chat_dialog.ui:289
 #, fuzzy
-msgid "Address:"
-msgstr "_Адресі:"
+msgid "Select Account"
+msgstr "%s тіркелгісі өшірілуде"
 
-#: gajim/data/gui/start_chat_dialog.ui:246
-msgid ""
-"Semi-Anonymous\n"
-"<span size=\"small\">(Only moderators can see your XMPP-Address)</span>"
-msgstr ""
+#: gajim/data/gui/start_chat_dialog.ui:380
+#, fuzzy
+msgid "_Select"
+msgstr "Тазалау"
 
 #: gajim/data/gui/filetransfers.ui:21
 #, fuzzy
 msgid "Pa_use/Resume"
 msgstr "Жа_лғастыру"
 
-#: gajim/data/gui/filetransfers.ui:30 gajim/gtk/filechoosers.py:178
+#: gajim/data/gui/filetransfers.ui:30 gajim/data/gui/groupchat_control.ui:575
+#: gajim/data/gui/groupchat_control.ui:667
+#: gajim/data/gui/groupchat_control.ui:779
+#: gajim/data/gui/groupchat_control.ui:871 gajim/gtk/filechoosers.py:178
 msgid "_Cancel"
 msgstr "_Бас тарту"
 
@@ -6367,7 +6418,8 @@ msgid "Cancel the selected file transfer and remove incomplete files"
 msgstr "Бұл файлдармен алмасудан бас тарту және толық емес файлдарды өшіру"
 
 #: gajim/data/gui/filetransfers.ui:207
-msgid "Shows a list of file transfers between you and others"
+#, fuzzy
+msgid "Shows a list of file transfers between you and your contacts"
 msgstr "Сіз бен басқалар арасындағы файл алмасуларды көрсетеді"
 
 #: gajim/data/gui/groupchat_control.ui:13 gajim/data/gui/chat_control.ui:277
@@ -6387,7 +6439,6 @@ msgid "Strike"
 msgstr "Сызылған"
 
 #: gajim/data/gui/groupchat_control.ui:54 gajim/data/gui/chat_control.ui:318
-#: gajim/gtk/advanced_config.py:86
 msgid "Color"
 msgstr "Түс"
 
@@ -6400,16 +6451,46 @@ msgstr "Қаріп"
 msgid "Clear formatting"
 msgstr "Пішімдеуді тазарту"
 
-#: gajim/data/gui/groupchat_control.ui:290 gajim/data/gui/chat_control.ui:880
+#: gajim/data/gui/groupchat_control.ui:291 gajim/data/gui/chat_control.ui:880
 #, fuzzy
 msgid "Choose encryption"
 msgstr "Клиент сертификатын таңдау"
 
-#: gajim/data/gui/groupchat_control.ui:336 gajim/data/gui/chat_control.ui:640
+#: gajim/data/gui/groupchat_control.ui:337 gajim/data/gui/chat_control.ui:640
 #, fuzzy
 msgid "Show a list of emojis (Alt+M)"
 msgstr "Смайликтер тізімін көрсету (Alt+M)"
 
+#: gajim/data/gui/groupchat_control.ui:484
+#, fuzzy
+msgid "Joining…"
+msgstr "Блоктау..."
+
+#: gajim/data/gui/groupchat_control.ui:496
+msgid "_Abort"
+msgstr ""
+
+#: gajim/data/gui/groupchat_control.ui:542
+#, fuzzy
+msgid "Enter new nickname"
+msgstr "%s контакты үшін жаңа ник атын енгізіңіз"
+
+#: gajim/data/gui/groupchat_control.ui:592
+#: gajim/data/gui/groupchat_control.ui:684
+#, fuzzy
+msgid "Ch_ange"
+msgstr "_Никті өзгерту..."
+
+#: gajim/data/gui/groupchat_control.ui:761
+#, fuzzy
+msgid "Enter password"
+msgstr "Жаңа парольді енгізіңіз:"
+
+#: gajim/data/gui/groupchat_control.ui:1067
+#, fuzzy
+msgid "_Try again"
+msgstr "Қайтадан растау..."
+
 #: gajim/data/gui/popup_notification_window.ui:42
 msgid "Event Type"
 msgstr "Оқиға түрі"
@@ -6488,8 +6569,8 @@ msgstr "Әрқашан"
 
 #: gajim/data/gui/mam_preferences.ui:18
 #, fuzzy
-msgid "Roster"
-msgstr "_Ростерді көрсету"
+msgid "Contact List"
+msgstr "Контакттар"
 
 #: gajim/data/gui/mam_preferences.ui:22
 #: gajim/data/gui/preferences_window.ui:123
@@ -6513,12 +6594,12 @@ msgid "Add"
 msgstr "Қосу"
 
 #: gajim/data/gui/mam_preferences.ui:194 gajim/data/gui/groupchat_config.ui:151
-#: gajim/gtk/dialogs.py:63 gajim/gtk/accounts.py:381
+#: gajim/gtk/dialogs.py:62 gajim/gtk/accounts.py:384
 #, fuzzy
 msgid "Remove"
 msgstr "Өші_ру"
 
-#: gajim/data/gui/vcard_information_window.ui:72 gajim/gtk/accounts.py:753
+#: gajim/data/gui/vcard_information_window.ui:72 gajim/gtk/accounts.py:756
 #, fuzzy
 msgid "Resource"
 msgstr "Ресурс: "
@@ -6570,6 +6651,7 @@ msgstr "Жазылу: "
 #: gajim/data/gui/vcard_information_window.ui:974
 #: gajim/data/gui/vcard_information_window.ui:993
 #: gajim/data/gui/vcard_information_window.ui:1427
+#: gajim/data/gui/groupchat_info_scrolled.ui:222
 msgid "button"
 msgstr "батырма"
 
@@ -6598,15 +6680,18 @@ msgid "Notify me about it"
 msgstr "Ол туралы маған хабарлау"
 
 #: gajim/data/gui/preferences_window.ui:58
-msgid "Show only in roster"
-msgstr "Тек ростерде көрсету"
+#, fuzzy
+msgid "Show only in contact list"
+msgstr "Те_к белсенді контакттарды көрсету"
 
 #: gajim/data/gui/preferences_window.ui:69
-msgid "Detached roster with detached chats"
+#, fuzzy
+msgid "Detached contact list with detached chats"
 msgstr "Бөлек ростер мен бөлек чаттар"
 
 #: gajim/data/gui/preferences_window.ui:72
-msgid "Detached roster with single chat"
+#, fuzzy
+msgid "Detached contact list with single chat"
 msgstr "Бөлек ростер мен бір чат"
 
 #: gajim/data/gui/preferences_window.ui:75
@@ -6614,11 +6699,13 @@ msgid "Single window for everything"
 msgstr "Барлығы үшін де бір терезе"
 
 #: gajim/data/gui/preferences_window.ui:78
-msgid "Detached roster with chat grouped by account"
+#, fuzzy
+msgid "Detached contact list with chat grouped by account"
 msgstr "Бөлек ростер мен тіркелгі бойынша топталған чаттар"
 
 #: gajim/data/gui/preferences_window.ui:81
-msgid "Detached roster with chat grouped by type"
+#, fuzzy
+msgid "Detached contact list with chat grouped by type"
 msgstr "Бөлек ростер мен түрі бойынша топталған чаттар"
 
 #: gajim/data/gui/preferences_window.ui:92
@@ -6670,7 +6757,7 @@ msgstr "Т_ерезе түрі:"
 
 #: gajim/data/gui/preferences_window.ui:296
 #, fuzzy
-msgid "_Show roster on startup"
+msgid "_Show contact list on startup"
 msgstr "Gajim қосылғанда, байланыс _орнату"
 
 #: gajim/data/gui/preferences_window.ui:311
@@ -6686,12 +6773,12 @@ msgid "_Tabs placement"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:363
-msgid "_Quit Gajim when closing roster window"
+msgid "_Quit Gajim when closing contact list"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:367
 msgid ""
-"If enabled, Gajim will quit when closing the roster window instead of "
+"If enabled, Gajim will quit when closing the contact list window instead of "
 "minimizing to the system's notification area"
 msgstr ""
 
@@ -6701,41 +6788,42 @@ msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:423
 #, fuzzy
-msgid "Show a_vatars of contacts in roster"
+msgid "Show a_vatars of contacts in contact list"
 msgstr "Ростердегі контакттардың а_ватарларын көрсету"
 
 #: gajim/data/gui/preferences_window.ui:427
 #, fuzzy
 msgid ""
-"If checked, avatars of contacts will be shown in the roster window and in "
-"group chats"
+"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
 #, fuzzy
-msgid "Show status _messages of contacts in roster"
+msgid "Show status _messages of contacts in contact list"
 msgstr "Ростердегі _контакттардың қалып-күй хабарламаларын көрсету"
 
 #: gajim/data/gui/preferences_window.ui:445
 #, fuzzy
 msgid ""
 "If checked, status messages of contacts will be shown under the contact's "
-"name, in the roster window, and in group chats"
+"name, in the contact list window, and in group chats"
 msgstr ""
 "Белгіленген болса, Gajim ростердегі мен топ чаттағы контакттар үшін қалып-"
 "күй хабарламаларын көрсетеді"
 
 #: gajim/data/gui/preferences_window.ui:459
 #, fuzzy
-msgid "Show e_xtra information of contacts in roster (mood, activity, ...)"
+msgid ""
+"Show e_xtra information of contacts in contact list (mood, activity, ...)"
 msgstr "Ростерде_гі контакттардың орналасуын көрсету"
 
 #: gajim/data/gui/preferences_window.ui:463
 msgid ""
-"If checked, additional info published by the contact will be shown in "
-"roster. Additional infos (published via PEP) may include e.g. mood, "
+"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 ""
 
@@ -6744,8 +6832,9 @@ msgid "Sort contacts by status"
 msgstr "Контакттарды қалып-күй бойынша сұрыптау"
 
 #: gajim/data/gui/preferences_window.ui:494
-msgid "in _roster"
-msgstr "р_остерде"
+#, fuzzy
+msgid "in _contact list"
+msgstr "Жіберілген контакттар:"
 
 #: gajim/data/gui/preferences_window.ui:511
 msgid "in _group chats"
@@ -6753,8 +6842,8 @@ msgstr "_чат бөлмелерінде"
 
 #: gajim/data/gui/preferences_window.ui:540
 #, fuzzy
-msgid "Roster Appearance"
-msgstr "<b>Ростердің сыртқы түрі</b>"
+msgid "Contact List Appearance"
+msgstr "Ростер элементтерімен алмасу"
 
 #: gajim/data/gui/preferences_window.ui:585
 #, fuzzy
@@ -6820,7 +6909,7 @@ msgstr "Чат бөлмесіне кіру мүмкін емес"
 
 #: gajim/data/gui/preferences_window.ui:660
 #, fuzzy
-msgid "If checked, the room subject will be shown when joining a group chat"
+msgid "If checked, the subject will be shown when joining a group chat"
 msgstr "Чат бөлмесіне кіру мүмкін емес"
 
 #: gajim/data/gui/preferences_window.ui:682
@@ -6835,13 +6924,13 @@ msgstr ""
 #: gajim/data/gui/preferences_window.ui:701
 msgid ""
 "If join/leave status messages are shown in the group chat. This setting can "
-"be overridden in the groupchat menu."
+"be overridden in the group chat menu."
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:720
 msgid ""
 "The default sync threshold for new public group chats. This setting can be "
-"overridden in the groupchat menu."
+"overridden in the group chat menu."
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:722
@@ -6856,7 +6945,7 @@ msgstr "К_онтакттардың күй өзгерісін тарихқа ж�
 #: gajim/data/gui/preferences_window.ui:768
 msgid ""
 "If status change messages are shown in the group chat. This setting can be "
-"overridden in the groupchat menu."
+"overridden in the group chat menu."
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:825
@@ -6875,8 +6964,8 @@ msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:843
 #, fuzzy
-msgid "Show chatstate in roster"
-msgstr "Ростердегі контакттардың а_ватарларын көрсету"
+msgid "Show chatstate in contact list"
+msgstr "Бет үшін жабу батырмасын көрсету керек пе?"
 
 #: gajim/data/gui/preferences_window.ui:847
 msgid ""
@@ -7187,7 +7276,7 @@ msgstr "Видео өлшемі"
 msgid "Vi_ew own video source"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2281 gajim/gtk/accounts.py:352
+#: gajim/data/gui/preferences_window.ui:2281 gajim/gtk/accounts.py:355
 msgid "Connection"
 msgstr "Байланыс"
 
@@ -7245,7 +7334,8 @@ msgid "_Manage..."
 msgstr "_Басқару..."
 
 #: gajim/data/gui/preferences_window.ui:2616
-msgid "_Log status changes of contacts"
+#, fuzzy
+msgid "_Store status changes of contacts in history"
 msgstr "К_онтакттардың күй өзгерісін тарихқа жазу"
 
 #: gajim/data/gui/preferences_window.ui:2633
@@ -7270,10 +7360,15 @@ msgstr ""
 msgid "_Open..."
 msgstr "А_шу..."
 
+#: gajim/data/gui/preferences_window.ui:2723 gajim/gtk/advanced_config.py:84
+#, fuzzy
+msgid "Advanced Configuration Editor (ACE)"
+msgstr "Кеңейтілген баптаулар түзетушісі"
+
 #: gajim/data/gui/groupchat_config.ui:55
 #, fuzzy
 msgid ""
-"<b>Jabber-ID</b>\n"
+"<b>XMPP Address</b>\n"
 "&lt;user@domain/resource&gt; (only that resource matches)\n"
 "&lt;user@domain&gt; (any resource matches)\n"
 "&lt;domain/resource&gt; (only that resource matches)\n"
@@ -7292,7 +7387,8 @@ msgstr ""
 msgid "Only Admins and Owners can modify the affiliation"
 msgstr ""
 
-#: gajim/data/gui/groupchat_config.ui:270 gajim/plugins/gui.py:312
+#: gajim/data/gui/groupchat_config.ui:270
+#: gajim/data/gui/groupchat_info_scrolled.ui:210 gajim/plugins/gui.py:324
 msgid "Configuration"
 msgstr "Баптаулар"
 
@@ -7324,7 +7420,7 @@ msgid "Start _Chat"
 msgstr "_Чатты бастау"
 
 #: gajim/data/gui/contact_context_menu.ui:20
-#: gajim/data/gui/systray_context_menu.ui:36
+#: gajim/data/gui/systray_context_menu.ui:29
 msgid "Send Single _Message..."
 msgstr "Бі_р хабарламаны жіберу..."
 
@@ -7385,17 +7481,44 @@ msgid "_Ignore"
 msgstr "_Елемеу"
 
 #: gajim/data/gui/contact_context_menu.ui:174
-msgid "_Add to Roster..."
-msgstr "Р_остерге қосу..."
+#, fuzzy
+msgid "_Add to Contact List..."
+msgstr "_Контакт қосу..."
+
+#: gajim/data/gui/advanced_configuration.ui:39
+#, fuzzy
+msgid "You should restart Gajim for some changes to take effect"
+msgstr ""
+"<b>ЕСКЕРТУ:</b> Кейбір баптаулар іске асу үшін, Gajim-ді қайта қосуыңыз керек"
+
+#: gajim/data/gui/advanced_configuration.ui:71
+#, fuzzy
+msgid "_Filter"
+msgstr "Фильтр:"
+
+#: gajim/data/gui/advanced_configuration.ui:88
+msgid "Type to search for values..."
+msgstr ""
+
+#: gajim/data/gui/advanced_configuration.ui:180
+#, fuzzy
+msgid "_Reset Value"
+msgstr "Бас_тапқы түстерге тастау"
+
+#: gajim/data/gui/advanced_configuration.ui:185
+#, fuzzy
+msgid "Resets value to default"
+msgstr "Бас_тапқы түстерге тастау"
 
 #: gajim/data/gui/account_creation_wizard_window.ui:43
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim: Тіркелгілерді жасау шебері"
 
 #: gajim/data/gui/account_creation_wizard_window.ui:70
+#, fuzzy
 msgid ""
 "You need to have an account in order to connect\n"
-"to the Jabber network."
+"to the XMPP network."
 msgstr ""
 "Jabber желісіне байланыс орнату үшін сізде\n"
 "тіркелгіңіз болуы керек."
@@ -7417,8 +7540,9 @@ msgid "<b>Please fill in the data for your existing account</b>"
 msgstr "<b>Сізде бар тіркелгі үшін ақпаратты толтырыңыз</b>"
 
 #: gajim/data/gui/account_creation_wizard_window.ui:187
-msgid "_Jabber ID:"
-msgstr "_Jabber ID:"
+#, fuzzy
+msgid "_XMPP Address:"
+msgstr "AIM адресі:"
 
 #: gajim/data/gui/account_creation_wizard_window.ui:239
 #: gajim/data/gui/account_creation_wizard_window.ui:394
@@ -7505,6 +7629,7 @@ msgid "Privacy Lists:"
 msgstr "Жекелік тізімдер:"
 
 #: gajim/data/gui/service_discovery_window.ui:111
+#: gajim/data/gui/groupchat_creation.ui:227
 #, fuzzy
 msgid "_Address"
 msgstr "_Адресі:"
@@ -7522,11 +7647,6 @@ msgstr "Синхрондау : контакттарды таңдау"
 msgid "Select the contacts you want to synchronise"
 msgstr "Синхрондау үшін контакттарды таңдаңыз"
 
-#: gajim/data/gui/groupchat_invitation_received.ui:42
-#, fuzzy
-msgid "Group Chat Invitation"
-msgstr "Топ чатына шақыру"
-
 #: gajim/data/gui/groupchat_invitation_received.ui:111
 #, fuzzy
 msgid "Message..."
@@ -7577,11 +7697,10 @@ msgstr ""
 
 #: gajim/data/gui/add_new_contact_window.ui:84
 #, fuzzy
-msgid "_Jabber ID"
-msgstr "_Jabber ID:"
+msgid "_XMPP Address"
+msgstr "_Адресі:"
 
 #: gajim/data/gui/add_new_contact_window.ui:100
-#: gajim/data/gui/manage_bookmarks_window.ui:192
 #, fuzzy
 msgid "_Nickname"
 msgstr "_Ник аты:"
@@ -7658,7 +7777,7 @@ msgstr "<b>Көңіл-күй:</b>"
 msgid "<b>Message:</b>"
 msgstr "<b>Хабарлама:</b>"
 
-#: gajim/data/gui/plugins_window.ui:10 gajim/data/gui/application_menu.ui:90
+#: gajim/data/gui/plugins_window.ui:10 gajim/data/gui/application_menu.ui:87
 msgid "Plugins"
 msgstr "Плагиндер"
 
@@ -7766,10 +7885,6 @@ msgstr "Рұқсат ету"
 msgid "Deny"
 msgstr "Болдырмау"
 
-#: gajim/data/gui/privacy_list_window.ui:317
-msgid "JabberID"
-msgstr "JabberID"
-
 #: gajim/data/gui/privacy_list_window.ui:358
 msgid "all in the group"
 msgstr "топтағы барлығы"
@@ -7811,7 +7926,7 @@ msgstr "Реті:"
 msgid "Manage sounds"
 msgstr "Тіркелгілерді басқару"
 
-#: gajim/data/gui/manage_sounds_window.ui:55 gajim/plugins/gui.py:100
+#: gajim/data/gui/manage_sounds_window.ui:55 gajim/plugins/gui.py:101
 msgid "Active"
 msgstr "Белсенді"
 
@@ -7849,23 +7964,113 @@ msgstr "Тіркелгіні Gajim _мен серверден өшіру"
 msgid "_Personal Events"
 msgstr "_Жеке әрекеттер"
 
-#: gajim/data/gui/account_context_menu.ui:35
-#: gajim/data/gui/systray_context_menu.ui:28
-msgid "Join _Group Chat"
-msgstr "Чат _бөлмесіне кіру..."
-
-#: gajim/data/gui/account_context_menu.ui:49
+#: gajim/data/gui/account_context_menu.ui:41
 msgid "_Add Contact..."
 msgstr "_Контакт қосу..."
 
-#: gajim/data/gui/account_context_menu.ui:57
+#: gajim/data/gui/account_context_menu.ui:49
 msgid "_Discover Services"
 msgstr "Қы_зметтерді қарап шығу"
 
-#: gajim/data/gui/account_context_menu.ui:65
+#: gajim/data/gui/account_context_menu.ui:57
 msgid "_Execute Command..."
 msgstr "К_оманда орындау..."
 
+#: gajim/data/gui/account_context_menu.ui:65
+#, fuzzy
+msgid "_View Certificate"
+msgstr "Клиент сертификаты"
+
+#: gajim/data/gui/manage_proxies.ui:12
+#, fuzzy
+msgctxt "proxy configuration"
+msgid "HTTP Connect"
+msgstr "HTTP Connect"
+
+#: gajim/data/gui/manage_proxies.ui:15
+#, fuzzy
+msgctxt "proxy configuration"
+msgid "SOCKS5"
+msgstr "SOCKS5"
+
+#: gajim/data/gui/manage_proxies.ui:18
+#, fuzzy
+msgctxt "proxy configuration"
+msgid "BOSH"
+msgstr "BOSH"
+
+#: gajim/data/gui/manage_proxies.ui:68
+#, fuzzy
+msgid "Add Proxy"
+msgstr "Прокси:"
+
+#: gajim/data/gui/manage_proxies.ui:82
+#, fuzzy
+msgid "Remove Proxy"
+msgstr "Топты өшіру"
+
+#: gajim/data/gui/manage_proxies.ui:134
+#, fuzzy
+msgid "Pass_word"
+msgstr "Па_роль:"
+
+#: gajim/data/gui/manage_proxies.ui:159
+msgid "Use proxy auth_entication"
+msgstr "Прокси _аутентификациясын қолдану"
+
+#: gajim/data/gui/manage_proxies.ui:179
+#, fuzzy
+msgid "_Username"
+msgstr "_Пайдаланушы аты:"
+
+#: gajim/data/gui/manage_proxies.ui:209
+#, fuzzy
+msgid "_Port"
+msgstr "_Порт:"
+
+#: gajim/data/gui/manage_proxies.ui:226
+msgid "example.org"
+msgstr ""
+
+#: gajim/data/gui/manage_proxies.ui:240
+#, fuzzy
+msgid "_Host"
+msgstr "_Хост аты:"
+
+#: gajim/data/gui/manage_proxies.ui:254
+msgid "Use HTTP prox_y"
+msgstr "HTTP прокс_и қолдану"
+
+#: gajim/data/gui/manage_proxies.ui:275
+msgid "https://example.org/http-bind/"
+msgstr ""
+
+#: gajim/data/gui/manage_proxies.ui:291
+#, fuzzy
+msgid "_BOSH URL"
+msgstr "BOSH URL-_ы:"
+
+#: gajim/data/gui/manage_proxies.ui:309 gajim/gtk/adhoc.py:322
+#, fuzzy
+msgid "Settings"
+msgstr "Плагиндер"
+
+#: gajim/data/gui/manage_proxies.ui:344
+#, fuzzy
+msgid "_Type"
+msgstr "_Түрі:"
+
+#: gajim/data/gui/manage_proxies.ui:361
+#: gajim/data/gui/groupchat_creation.ui:105
+#, fuzzy
+msgid "_Name"
+msgstr "_Аты:"
+
+#: gajim/data/gui/manage_proxies.ui:391 gajim/gtk/accounts.py:742
+#, fuzzy
+msgid "Proxy"
+msgstr "Прокси:"
+
 #: gajim/data/gui/application_menu.ui:8
 #, fuzzy
 msgid "View"
@@ -7873,8 +8078,8 @@ msgstr "_Түрі"
 
 #: gajim/data/gui/application_menu.ui:11
 #, fuzzy
-msgid "Show Roster"
-msgstr "_Ростерді көрсету"
+msgid "Show Contact List"
+msgstr "Те_к белсенді контакттарды көрсету"
 
 #: gajim/data/gui/application_menu.ui:16
 #, fuzzy
@@ -7915,23 +8120,24 @@ msgstr ""
 msgid "Features"
 msgstr "Мүміндіктері"
 
-#: gajim/data/gui/application_menu.ui:81
+#: gajim/data/gui/application_menu.ui:77
+#: gajim/data/gui/groupchat_creation.ui:81 gajim/gtk/groupchat_creation.py:45
 #, fuzzy
-msgid "Bookmarks"
-msgstr "_Бетбелгі"
+msgid "Create Group Chat"
+msgstr "Топ чаттардан шығу"
 
-#: gajim/data/gui/application_menu.ui:94 gajim/data/gui/shortcuts_window.ui:189
-#: gajim/gtk/preferences.py:59
+#: gajim/data/gui/application_menu.ui:91 gajim/data/gui/shortcuts_window.ui:189
+#: gajim/gtk/preferences.py:58
 msgid "Preferences"
 msgstr "Баптаулар"
 
-#: gajim/data/gui/application_menu.ui:99
+#: gajim/data/gui/application_menu.ui:96
 #, fuzzy
 msgid "Quit"
 msgstr "_Шығу"
 
 #: gajim/data/gui/httpupload_progress_dialog.ui:110
-#: gajim/gtk/filetransfer.py:121
+#: gajim/gtk/filetransfer.py:120
 msgid "Progress"
 msgstr "Барысы"
 
@@ -7948,53 +8154,33 @@ msgstr ""
 msgid "_Cancel Upload"
 msgstr "_Бас тарту"
 
-#: gajim/data/gui/manage_bookmarks_window.ui:13
-#, fuzzy
-msgid "Group Chat Bookmarks"
-msgstr "_Чат бөлмесі"
-
-#: gajim/data/gui/manage_bookmarks_window.ui:68
-#, fuzzy
-msgid "Add Bookmark"
-msgstr "_Бетбелгі"
-
-#: gajim/data/gui/manage_bookmarks_window.ui:82
-#, fuzzy
-msgid "Remove Bookmark"
-msgstr "_Бетбелгі"
-
-#: gajim/data/gui/manage_bookmarks_window.ui:126
-msgid "N_ame"
+#: gajim/data/gui/groupchat_creation.ui:27
+msgid "Public or Private?"
 msgstr ""
 
-#: gajim/data/gui/manage_bookmarks_window.ui:145
-#, fuzzy
-msgid "Bookmark Name"
-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 ""
 
-#: gajim/data/gui/manage_bookmarks_window.ui:160
-#, fuzzy
-msgid "_Server"
-msgstr "_Сервер:"
+#: gajim/data/gui/groupchat_creation.ui:58
+msgid "<b>Public:</b> Anyone who knows the address can join."
+msgstr ""
 
-#: gajim/data/gui/manage_bookmarks_window.ui:223
+#: gajim/data/gui/groupchat_creation.ui:122
 #, fuzzy
-msgid "Roo_m"
-msgstr "Бө_лме:"
+msgid "_Description"
+msgstr "Сипаттамасы"
 
-#: gajim/data/gui/manage_bookmarks_window.ui:253
-#, fuzzy
-msgid "_Password"
-msgstr "_Пароль:"
+#: gajim/data/gui/groupchat_creation.ui:164
+msgid "_Public"
+msgstr ""
 
-#: gajim/data/gui/manage_bookmarks_window.ui:299
+#: gajim/data/gui/groupchat_creation.ui:278
 #, fuzzy
-msgid "Join chat when connected"
-msgstr "Контакт байланыспаған"
-
-#: gajim/data/gui/manage_bookmarks_window.ui:307
-msgid "_Join Automatically"
-msgstr ""
+msgid "_Account"
+msgstr "_Тіркелгілер"
 
 #: gajim/data/gui/exception_dialog.ui:49
 msgid "Sorry, that should not have happened"
@@ -8039,6 +8225,29 @@ msgstr "Контакт сіздің желіде бар болуын білуі
 msgid "Presets"
 msgstr "_Бар болу"
 
+#: gajim/data/gui/groupchat_info_scrolled.ui:32
+#, fuzzy
+msgid "Address"
+msgstr "_Адресі:"
+
+#: gajim/data/gui/groupchat_info_scrolled.ui:64
+msgid "Topic"
+msgstr ""
+
+#: gajim/data/gui/groupchat_info_scrolled.ui:80
+#, fuzzy
+msgid "Author"
+msgstr "Авторлары:"
+
+#: gajim/data/gui/groupchat_info_scrolled.ui:182
+msgid "Discussion Logs"
+msgstr ""
+
+#: gajim/data/gui/groupchat_info_scrolled.ui:260
+#, fuzzy
+msgid "Group Chat Language"
+msgstr "Топ чатына шақыру"
+
 #: gajim/data/gui/emoji_chooser.ui:98
 #, fuzzy
 msgid "No Results Found"
@@ -8051,24 +8260,35 @@ msgstr "Достарды шақыру!"
 #: gajim/data/gui/chat_to_muc_window.ui:39
 #, fuzzy
 msgid ""
-"You are now entering a groupchat.\n"
+"You are now entering a group chat.\n"
 "Select the contacts you want to invite"
 msgstr ""
 "Сіз көп пайдаланушы чатын бастауға дайынсыз.\n"
 "Шақырғыңыз келетін контакттарды таңдаңыз"
 
 #: gajim/data/gui/chat_to_muc_window.ui:112
-msgid "Please select a MUC server."
+#, fuzzy
+msgid "Please select a group chat server."
 msgstr "MUC серверін таңдаңыз"
 
 #: gajim/data/gui/chat_to_muc_window.ui:141
-msgid "MUC server"
-msgstr "MUC сервері"
+#, fuzzy
+msgid "Group chat server"
+msgstr "Топтық чаттар"
 
 #: gajim/data/gui/chat_to_muc_window.ui:176
 msgid "In_vite"
 msgstr "_Шақыру"
 
+#: gajim/data/gui/bookmarks.ui:176
+#, fuzzy
+msgid "Autojoin"
+msgstr "А_втокіру"
+
+#: gajim/data/gui/bookmarks.ui:211
+msgid "_Apply"
+msgstr ""
+
 #: gajim/data/gui/history_manager.ui:11
 #, fuzzy
 msgid "_Export"
@@ -8084,12 +8304,13 @@ msgid "Gajim History Logs Manager"
 msgstr "Gajim тарихы логтар менеджері"
 
 #: gajim/data/gui/history_manager.ui:108
+#, fuzzy
 msgid ""
-"This log manager is not intended for log viewing. If you are looking for "
-"such functionality, use the history window instead.\n"
+"This history manager is not intended for viewing chat history. If you are "
+"looking for such functionality, please use the history window instead.\n"
 "\n"
-"Use this program to delete or export logs. You can select logs from the left "
-"and/or search database from below."
+"You can use this program to delete or export history. Either select logs "
+"from the left or search the database."
 msgstr ""
 "Бұл логтар басқарушысы логтарды қарау үшін арналмаған. Ол үшін тарих "
 "терезесін қолданыңыз.\n"
@@ -8142,8 +8363,9 @@ msgid "Select an emoji"
 msgstr ""
 
 #: gajim/data/gui/shortcuts_window.ui:38
-msgid "Complete a command or a nick"
-msgstr ""
+#, fuzzy
+msgid "Complete a command or a nickname"
+msgstr "Өзіңіз таңдаған аты бар жаңа теманы жасаңыз."
 
 #: gajim/data/gui/shortcuts_window.ui:45
 #, fuzzy
@@ -8183,7 +8405,7 @@ msgstr ""
 msgid "Scroll down"
 msgstr ""
 
-#: gajim/data/gui/shortcuts_window.ui:100 gajim/gtk/xml_console.py:72
+#: gajim/data/gui/shortcuts_window.ui:100 gajim/gtk/xml_console.py:69
 #, fuzzy
 msgid "Clear"
 msgstr "Тазалау"
@@ -8225,8 +8447,9 @@ msgid "Close chat"
 msgstr ""
 
 #: gajim/data/gui/shortcuts_window.ui:173
-msgid "Roster Shortcuts"
-msgstr ""
+#, fuzzy
+msgid "Contact List Shortcuts"
+msgstr "Ростер элементтерімен алмасу"
 
 #: gajim/data/gui/shortcuts_window.ui:196
 #, fuzzy
@@ -8259,7 +8482,7 @@ msgid "Show only active contacts"
 msgstr "Те_к белсенді контакттарды көрсету"
 
 #: gajim/data/gui/shortcuts_window.ui:251
-msgid "Enable roster filtering"
+msgid "Enable contact list filtering"
 msgstr ""
 
 #: gajim/data/gui/shortcuts_window.ui:259
@@ -8306,12 +8529,12 @@ msgstr ""
 
 #: gajim/data/gui/history_window.ui:317
 #, fuzzy
-msgid "Record history for this chat"
+msgid "Store history for this chat"
 msgstr "Бұл сертификат үшін осы қатені елемеу."
 
 #: gajim/data/gui/history_window.ui:332
 #, fuzzy
-msgid "Record History"
+msgid "Store History"
 msgstr "Соңғылар:"
 
 #: gajim/data/gui/history_window.ui:350
@@ -8331,9 +8554,10 @@ msgstr "Жаңа хабарламаны жасау"
 msgid "Fill in the form."
 msgstr "Форманы толтырыңыз."
 
-#: gajim/data/gui/data_form_window.ui:229
-msgid "Room Configuration"
-msgstr "Бөлме баптаулары"
+#: gajim/data/gui/data_form_window.ui:229 gajim/gtk/groupchat_config.py:41
+#, fuzzy
+msgid "Group Chat Configuration"
+msgstr "Топ чатына шақыру"
 
 #: gajim/data/gui/roster_item_exchange_window.ui:39
 #: gajim/gtk/roster_item_exchange.py:35
@@ -8354,15 +8578,15 @@ msgstr "Қалы_п-күй"
 msgid "_Start Chat..."
 msgstr "_Чатты бастау..."
 
-#: gajim/data/gui/systray_context_menu.ui:50
+#: gajim/data/gui/systray_context_menu.ui:43
 msgid "Show All Pending _Events"
 msgstr "Қат_ыспаған оқиғаларды көрсету"
 
-#: gajim/data/gui/systray_context_menu.ui:59
+#: gajim/data/gui/systray_context_menu.ui:52
 msgid "Mute Sounds"
 msgstr "Дыбыстарды сөндіру"
 
-#: gajim/data/gui/systray_context_menu.ui:75
+#: gajim/data/gui/systray_context_menu.ui:68
 #, fuzzy
 msgid "_Preferences"
 msgstr "Баптаулар"
@@ -8454,34 +8678,34 @@ msgstr ""
 msgid "Execute expression inside a shell, send output"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:45
+#: gajim/command_system/implementation/standard.py:47
 msgid ""
 "Show help on a given command or a list of available commands if -a is given"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:73
+#: gajim/command_system/implementation/standard.py:75
 #, fuzzy
 msgid "Send a message to the contact"
 msgstr "Контактқа файлды жібереді"
 
-#: gajim/command_system/implementation/standard.py:78
+#: gajim/command_system/implementation/standard.py:80
 msgid "Send action (in the third person) to the current chat"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:83
+#: gajim/command_system/implementation/standard.py:85
 msgid "Show logged messages which mention given text"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:88
+#: gajim/command_system/implementation/standard.py:90
 #, fuzzy, python-format
 msgid "%s: Nothing found"
 msgstr "%s табылмады"
 
-#: gajim/command_system/implementation/standard.py:94
+#: gajim/command_system/implementation/standard.py:96
 msgid "Limit must be an integer"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:118
+#: gajim/command_system/implementation/standard.py:120
 msgid ""
 "\n"
 "    Set the current status\n"
@@ -8491,125 +8715,128 @@ msgid ""
 "    "
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:136
+#: gajim/command_system/implementation/standard.py:138
 msgid "Set the current status to away"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:150
+#: gajim/command_system/implementation/standard.py:152
 msgid "Set the current status to online"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:153
+#: gajim/command_system/implementation/standard.py:155
 msgid "Available"
 msgstr "Қолжетерлік"
 
-#: gajim/command_system/implementation/standard.py:173
-#: gajim/command_system/implementation/standard.py:250
+#: gajim/command_system/implementation/standard.py:175
+#: gajim/command_system/implementation/standard.py:252
 #, fuzzy
 msgid "Clear the text window"
 msgstr "Терезені жасырады"
 
-#: gajim/command_system/implementation/standard.py:178
-#: gajim/command_system/implementation/standard.py:397
+#: gajim/command_system/implementation/standard.py:180
+#: gajim/command_system/implementation/standard.py:401
 #, fuzzy
 msgid "Send a ping to the contact"
 msgstr "Контактқа файлды жібереді"
 
-#: gajim/command_system/implementation/standard.py:181
-#: gajim/command_system/implementation/standard.py:400
+#: gajim/command_system/implementation/standard.py:183
+#: gajim/command_system/implementation/standard.py:404
 msgid "Command is not supported for zeroconf accounts"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:185
-msgid "Send DTMF sequence through an open audio session"
+#: gajim/command_system/implementation/standard.py:187
+msgid "Send DTMF sequence through an open voice chat"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:188
-msgid "No open audio sessions with the contact"
-msgstr ""
+#: gajim/command_system/implementation/standard.py:190
+#, fuzzy
+msgid "No open voice chats with the contact"
+msgstr " бұл контактпен ашылған терезе/бет"
 
-#: gajim/command_system/implementation/standard.py:191
+#: gajim/command_system/implementation/standard.py:193
 #, fuzzy, python-format
 msgid "%s is not a valid tone"
 msgstr "%s дұрыс loglevel емес"
 
-#: gajim/command_system/implementation/standard.py:198
-msgid "Toggle audio session"
-msgstr "Аудио сессияны ауыстыру"
+#: gajim/command_system/implementation/standard.py:200
+msgid "Toggle Voice Chat"
+msgstr ""
 
-#: gajim/command_system/implementation/standard.py:201
+#: gajim/command_system/implementation/standard.py:203
 #, fuzzy
-msgid "Audio sessions are not available"
+msgid "Voice chats are not available"
 msgstr "Байланыс қолжетерсіз"
 
-#: gajim/command_system/implementation/standard.py:208
-msgid "Toggle video session"
+#: gajim/command_system/implementation/standard.py:210
+#, fuzzy
+msgid "Toggle Video Chat"
 msgstr "Видео сессияны ауыстыру"
 
-#: gajim/command_system/implementation/standard.py:211
+#: gajim/command_system/implementation/standard.py:213
 #, fuzzy
-msgid "Video sessions are not available"
+msgid "Video chats are not available"
 msgstr "Байланыс қолжетерсіз"
 
-#: gajim/command_system/implementation/standard.py:218
+#: gajim/command_system/implementation/standard.py:220
 #, fuzzy
 msgid "Send a message to the contact that will attract their attention"
 msgstr "Контактқа файлды жібереді"
 
-#: gajim/command_system/implementation/standard.py:255
+#: gajim/command_system/implementation/standard.py:257
 #, fuzzy
 msgid "Change your nickname in a group chat"
 msgstr "Сіздің ник атыңызды өзгерту (Ctrl+N)"
 
-#: gajim/command_system/implementation/standard.py:260 gajim/gtk/dialogs.py:674
-#: gajim/gtk/bookmarks.py:272
+#: gajim/command_system/implementation/standard.py:262
 msgid "Invalid nickname"
 msgstr "Ник қате"
 
-#: gajim/command_system/implementation/standard.py:267
+#: gajim/command_system/implementation/standard.py:269
 #, fuzzy
-msgid "Open a private chat window with a specified occupant"
+msgid "Open a private chat window with a specified participant"
 msgstr "Па_йдаланушымен чат терезесін ашу"
 
-#: gajim/command_system/implementation/standard.py:273
-#: gajim/command_system/implementation/standard.py:282
-#: gajim/command_system/implementation/standard.py:332
-#: gajim/command_system/implementation/standard.py:345
-#: gajim/command_system/implementation/standard.py:357
+#: gajim/command_system/implementation/standard.py:275
+#: gajim/command_system/implementation/standard.py:284
+#: gajim/command_system/implementation/standard.py:336
+#: gajim/command_system/implementation/standard.py:349
+#: gajim/command_system/implementation/standard.py:361
 #, fuzzy
 msgid "Nickname not found"
 msgstr "Қолданылатын ник"
 
-#: gajim/command_system/implementation/standard.py:276
+#: gajim/command_system/implementation/standard.py:278
+#, fuzzy
 msgid ""
-"Open a private chat window with a specified occupant and send him a message"
-msgstr ""
+"Open a private chat window with a specified participant and send him a "
+"message"
+msgstr "Па_йдаланушымен чат терезесін ашу"
 
-#: gajim/command_system/implementation/standard.py:285
+#: gajim/command_system/implementation/standard.py:287
 #, fuzzy
 msgid "Display or change a group chat topic"
 msgstr "Топ чат беті/терезесін жабу алдында сұрау."
 
-#: gajim/command_system/implementation/standard.py:294
-msgid "Invite a user to a room for a reason"
+#: gajim/command_system/implementation/standard.py:296
+msgid "Invite a user to a group chat for a reason"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:297
+#: gajim/command_system/implementation/standard.py:299
 #, fuzzy, python-format
 msgid "Invited %(jid)s to %(room_jid)s"
 msgstr "%s қазір %s үшін жіберу"
 
-#: gajim/command_system/implementation/standard.py:301
+#: gajim/command_system/implementation/standard.py:303
 #, fuzzy
-msgid "Join a group chat given by a JID"
+msgid "Join a group chat given by an XMPP Address"
 msgstr "_чат бөлмелерінде"
 
-#: gajim/command_system/implementation/standard.py:309
+#: gajim/command_system/implementation/standard.py:313
 msgid ""
-"Leave the groupchat, optionally giving a reason, and close tab or window"
+"Leave the group chat, optionally giving a reason, and close tab or window"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:314
+#: gajim/command_system/implementation/standard.py:318
 msgid ""
 "\n"
 "    Ban user by a nick or a JID from a groupchat\n"
@@ -8618,46 +8845,46 @@ msgid ""
 "    "
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:329
+#: gajim/command_system/implementation/standard.py:333
 #, fuzzy
-msgid "Kick user by a nick from a groupchat"
+msgid "Kick user by a nick from a group chat"
 msgstr "Сізді топтық чатқа шақырған"
 
-#: gajim/command_system/implementation/standard.py:338
+#: gajim/command_system/implementation/standard.py:342
 msgid ""
-"Set occupant role in group chat.\n"
+"Set participant role in group chat.\n"
 "    Role can be given as one of the following values:\n"
 "    moderator, participant, visitor, none"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:343
+#: gajim/command_system/implementation/standard.py:347
 #, fuzzy
 msgid "Invalid role given"
 msgstr "Сервер қате"
 
-#: gajim/command_system/implementation/standard.py:350
+#: gajim/command_system/implementation/standard.py:354
 msgid ""
-"Set occupant affiliation in group chat.\n"
+"Set participant affiliation in group chat.\n"
 "    Affiliation can be given as one of the following values:\n"
 "    owner, admin, member, outcast, none"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:355
+#: gajim/command_system/implementation/standard.py:359
 #, fuzzy
 msgid "Invalid affiliation given"
 msgstr "қатысуы өзгертілген"
 
-#: gajim/command_system/implementation/standard.py:365
+#: gajim/command_system/implementation/standard.py:369
 #, fuzzy
-msgid "Display names of all group chat occupants"
+msgid "Display names of all group chat participants"
 msgstr "%s топтық чаттың аты емес."
 
-#: gajim/command_system/implementation/standard.py:387
-msgid "Forbid an occupant to send you public or private messages"
+#: gajim/command_system/implementation/standard.py:391
+msgid "Forbid a participant to send you public or private messages"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:392
-msgid "Allow an occupant to send you public or private messages"
+#: gajim/command_system/implementation/standard.py:396
+msgid "Allow a participant to send you public or private messages"
 msgstr ""
 
 #: gajim/command_system/implementation/middleware.py:74
@@ -8668,204 +8895,329 @@ msgstr ""
 msgid "The same as using a doc-string, except it supports translation"
 msgstr ""
 
-#: gajim/gtk/filetransfer.py:91
+#: gajim/gtk/groupchat_info.py:36
+#, fuzzy
+msgid "?Group chat feature:Archiving"
+msgstr "Топ чатына шақыру"
+
+#: gajim/gtk/groupchat_info.py:37
+#, fuzzy
+msgid "Messages are archived on the server"
+msgstr "Бұл сессия серверде САҚТАЛАДЫ"
+
+#: gajim/gtk/groupchat_info.py:40
+#, fuzzy
+msgid "?Group chat feature:Persistent"
+msgstr "Топтық чаттар"
+
+#: gajim/gtk/groupchat_info.py:41
+msgid "This group chat persists even if there are no participants"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:45
+#, fuzzy
+msgid "?Group chat feature:Temporary"
+msgstr "?Group Chat Contact Role:Жоқ"
+
+#: gajim/gtk/groupchat_info.py:46
+msgid "This group chat will be destroyed once the last participant left"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:50
+#, fuzzy
+msgid "?Group chat feature:Moderated"
+msgstr "?Group Chat Contact Role:Жоқ"
+
+#: gajim/gtk/groupchat_info.py:51
+msgid ""
+"Participants entering this group chat need to request permission to send "
+"messages"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:55
+#, fuzzy
+msgid "?Group chat feature:Not Moderated"
+msgstr "Топтық чаттар"
+
+#: gajim/gtk/groupchat_info.py:56
+msgid "Participants entering this group chat are allowed to send messages"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:60
+#, fuzzy
+msgid "?Group chat feature:Open"
+msgstr "?Group Chat Contact Role:Жоқ"
+
+#: gajim/gtk/groupchat_info.py:61
+#, fuzzy
+msgid "Anyone can join this group chat"
+msgstr "%s чат бөлмесіне кірді"
+
+#: gajim/gtk/groupchat_info.py:64
+#, fuzzy
+msgid "?Group chat feature:Members Only"
+msgstr "Сізді біреу бөлмеде еске алған"
+
+#: gajim/gtk/groupchat_info.py:65
+msgid "This group chat is restricted to members only"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:69
+#, fuzzy
+msgid "?Group chat feature:Public"
+msgstr "Сізді біреу бөлмеде еске алған"
+
+#: gajim/gtk/groupchat_info.py:70
+msgid "Group chat can be found via search"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:73
+#, fuzzy
+msgid "?Group chat feature:Hidden"
+msgstr "?Group Chat Contact Role:Жоқ"
+
+#: gajim/gtk/groupchat_info.py:74
+#, fuzzy
+msgid "This group chat can not be found via search"
+msgstr "Қызмет табылмады"
+
+#: gajim/gtk/groupchat_info.py:77
+#, fuzzy
+msgid "?Group chat feature:Not Anonymous"
+msgstr "Топтық чаттар"
+
+#: gajim/gtk/groupchat_info.py:78
+msgid "All other group chat participants can see your XMPP address"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:82
+#, fuzzy
+msgid "?Group chat feature:Semi-Anonymous"
+msgstr "Сізді біреу бөлмеде еске алған"
+
+#: gajim/gtk/groupchat_info.py:83
+msgid "Only moderators can see your XMPP address"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:86
+#, fuzzy
+msgid "?Group chat feature:Password Required"
+msgstr "Топтық чаттар"
+
+#: gajim/gtk/groupchat_info.py:87
+msgid "This group chat does require a password upon entry"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:91
+#, fuzzy
+msgid "?Group chat feature:No Password Required"
+msgstr "Топтық чаттар"
+
+#: gajim/gtk/groupchat_info.py:92
+msgid "This group chat does not require a password upon entry"
+msgstr ""
+
+#: gajim/gtk/filetransfer.py:90
 msgid "File"
 msgstr "Файл"
 
-#: gajim/gtk/filetransfer.py:108
+#: gajim/gtk/filetransfer.py:107
 msgid "Time"
 msgstr "Уақыт"
 
-#: gajim/gtk/filetransfer.py:228
+#: gajim/gtk/filetransfer.py:227
 #, fuzzy, python-format
 msgid "File name: %s"
 msgstr "Файл аты: %s"
 
-#: gajim/gtk/filetransfer.py:229 gajim/gtk/filetransfer.py:464
+#: gajim/gtk/filetransfer.py:228 gajim/gtk/filetransfer.py:469
 #, python-format
 msgid "Size: %s"
 msgstr "Өлшемі: %s"
 
-#: gajim/gtk/filetransfer.py:239
+#: gajim/gtk/filetransfer.py:238
 #, python-format
 msgid "Sender: %s"
 msgstr "Жіберуші: %s"
 
-#: gajim/gtk/filetransfer.py:240 gajim/gtk/filetransfer.py:744
+#: gajim/gtk/filetransfer.py:239 gajim/gtk/filetransfer.py:749
 #: gajim/gtk/tooltips.py:577
 msgid "Recipient: "
 msgstr "Алушы: "
 
-#: gajim/gtk/filetransfer.py:251
+#: gajim/gtk/filetransfer.py:250
 #, python-format
 msgid "Saved in: %s"
 msgstr "Сақталған: %s"
 
-#: gajim/gtk/filetransfer.py:256
+#: gajim/gtk/filetransfer.py:255
 msgid "File transfer completed"
 msgstr "Файлдармен алмасу аяқталды"
 
-#: gajim/gtk/filetransfer.py:276 gajim/gtk/filetransfer.py:285
+#: gajim/gtk/filetransfer.py:275 gajim/gtk/filetransfer.py:284
 #, fuzzy
 msgid "Connection with peer could not be established."
 msgstr "Тораппен байланысты орнату мүмкін емес."
 
-#: gajim/gtk/filetransfer.py:293
+#: gajim/gtk/filetransfer.py:292
 #, python-format
 msgid "Filename: %s"
 msgstr "Файл аты: %s"
 
-#: gajim/gtk/filetransfer.py:294
+#: gajim/gtk/filetransfer.py:293
 #, python-format
 msgid "Recipient: %s"
 msgstr "Алушы: %s"
 
-#: gajim/gtk/filetransfer.py:296
+#: gajim/gtk/filetransfer.py:295
 #, python-format
 msgid "Error message: %s"
 msgstr "Қате хабарламасы: %s"
 
-#: gajim/gtk/filetransfer.py:333
-#, fuzzy
-msgid "File transfer error"
-msgstr "Файл алмасу қатесі"
-
 #: gajim/gtk/filetransfer.py:334
 #, python-format
 msgid ""
-"The file %(file)s has been received, but it seems to have been damaged along "
-"the way.\n"
+"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 ""
 
-#: gajim/gtk/filetransfer.py:350
+#: gajim/gtk/filetransfer.py:340
+#, fuzzy
+msgid "_Download Again"
+msgstr "М_ені қайта сұрамау"
+
+#: gajim/gtk/filetransfer.py:355
 #, fuzzy
 msgid "Gajim can not read this file"
 msgstr "Gajim файлға жете алмайды"
 
-#: gajim/gtk/filetransfer.py:351
+#: gajim/gtk/filetransfer.py:356
 msgid "Another process is using this file."
 msgstr ""
 
-#: gajim/gtk/filetransfer.py:418
+#: gajim/gtk/filetransfer.py:423
 #, fuzzy
 msgid "File Transfer Conflict"
 msgstr "Файлдармен алмасу аяқталды"
 
-#: gajim/gtk/filetransfer.py:419
+#: gajim/gtk/filetransfer.py:424
 msgid "This file already exists"
 msgstr "Бұл файл бар болып тұр"
 
-#: gajim/gtk/filetransfer.py:420
+#: gajim/gtk/filetransfer.py:425
 msgid "Resume download or replace file?"
 msgstr ""
 
-#: gajim/gtk/filetransfer.py:424
+#: gajim/gtk/filetransfer.py:429
 #, fuzzy
 msgid "Replace _File"
 msgstr "Алмаст_ыру"
 
-#: gajim/gtk/filetransfer.py:427
+#: gajim/gtk/filetransfer.py:432
 #, fuzzy
 msgid "Resume _Download"
 msgstr "Беру"
 
-#: gajim/gtk/filetransfer.py:437
+#: gajim/gtk/filetransfer.py:442
 #, fuzzy, python-format
 msgid "Directory '%s' is not writable"
 msgstr "\"%s\" бумасына жазу мүмкін емес"
 
-#: gajim/gtk/filetransfer.py:438
+#: gajim/gtk/filetransfer.py:443
 #, fuzzy
 msgid "You do not have permissions to create files in this directory."
 msgstr "Сізде ол бумада файлдарды жасауға құқығыңыз жоқ."
 
-#: gajim/gtk/filetransfer.py:461
+#: gajim/gtk/filetransfer.py:466
 #, python-format
 msgid "File: %s"
 msgstr "Файл: %s"
 
-#: gajim/gtk/filetransfer.py:467
+#: gajim/gtk/filetransfer.py:472
 #, python-format
 msgid "Type: %s"
 msgstr "Түрі: %s"
 
-#: gajim/gtk/filetransfer.py:469
+#: gajim/gtk/filetransfer.py:474
 #, python-format
 msgid "Description: %s"
 msgstr "Анықтамасы: %s"
 
-#: gajim/gtk/filetransfer.py:480
+#: gajim/gtk/filetransfer.py:485
 #, fuzzy, python-format
 msgid "%s wants to send you a file"
 msgstr "%s сізге файлды жібергісі келеді:"
 
-#: gajim/gtk/filetransfer.py:509
+#: gajim/gtk/filetransfer.py:514
 #, fuzzy
 msgid "Checking file…"
 msgstr "Профайлды жіберу..."
 
-#: gajim/gtk/filetransfer.py:524
+#: gajim/gtk/filetransfer.py:529
 #, fuzzy
 msgid "File error"
 msgstr "Файл алмасу қатесі"
 
-#: gajim/gtk/filetransfer.py:561
+#: gajim/gtk/filetransfer.py:566
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 
-#: gajim/gtk/filetransfer.py:658
+#: gajim/gtk/filetransfer.py:663
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/s)"
 
-#: gajim/gtk/filetransfer.py:711 gajim/gtk/filetransfer.py:715
+#: gajim/gtk/filetransfer.py:716 gajim/gtk/filetransfer.py:720
 msgid "Invalid File"
 msgstr "Қате файл"
 
-#: gajim/gtk/filetransfer.py:711
+#: gajim/gtk/filetransfer.py:716
 msgid "File: "
 msgstr "Файл: "
 
-#: gajim/gtk/filetransfer.py:716
+#: gajim/gtk/filetransfer.py:721
 msgid "It is not possible to send empty files"
 msgstr "Бос файлдарды жіберу мүмкін емес"
 
-#: gajim/gtk/filetransfer.py:742 gajim/gtk/tooltips.py:571
+#: gajim/gtk/filetransfer.py:747 gajim/gtk/tooltips.py:571
 msgid "Sender: "
 msgstr "Жіберуші: "
 
-#: gajim/gtk/filetransfer.py:1038
+#: gajim/gtk/filetransfer.py:1043
 #, fuzzy
 msgid "Choose a File to Send…"
 msgstr "Жіберу үшін файлды таңдаңыз..."
 
 #: gajim/gtk/start_chat.py:51
 #, fuzzy
-msgid "Start new Conversation"
+msgid "Start New Conversation"
 msgstr "Жалғастырылған сөйлесу"
 
-#: gajim/gtk/start_chat.py:424
-#, fuzzy
-msgid "New Groupchat"
-msgstr "Жаңа чат бөлмесі"
+#: gajim/gtk/start_chat.py:260 gajim/gtk/start_chat.py:328
+msgid "You can not join a group chat unless you are connected."
+msgstr "Байланыс орнатпасаңыз, топтық чатқа кіре алмайсыз."
+
+#: gajim/gtk/start_chat.py:603 gajim/gtk/groupchat_join.py:38
+msgid "Join Group Chat"
+msgstr "Бөлмеге кіру"
 
-#: gajim/gtk/start_chat.py:426
+#: gajim/gtk/start_chat.py:605 gajim/gtk/add_contact.py:40
 #, fuzzy
-msgid "New Contact"
-msgstr "Жаңа контакт қосу"
+msgid "Add Contact"
+msgstr "_Контакт қосу..."
 
-#: gajim/gtk/start_chat.py:588
+#: gajim/gtk/start_chat.py:746
 #, fuzzy, python-format
-msgid "%s Group chats found"
+msgid "%s group chats found"
 msgstr "%s табылмады"
 
-#: gajim/gtk/discovery.py:70
+#: gajim/gtk/discovery.py:69
 msgid "This service has not yet responded with detailed information"
 msgstr "Бұл қызмет әлі толық ақпаратпен жауап бермеген"
 
-#: gajim/gtk/discovery.py:71
+#: gajim/gtk/discovery.py:70
 #, fuzzy
 msgid ""
 "This service could not respond with detailed information.\n"
@@ -8874,32 +9226,33 @@ msgstr ""
 "Бұл қызмет толық ақпаратпен жауап бере алмайды.\n"
 "Ол ескірген не сынық сияқты"
 
-#: gajim/gtk/discovery.py:128
+#: gajim/gtk/discovery.py:126
 msgid "Others"
 msgstr "Басқалар"
 
-#: gajim/gtk/discovery.py:131
-msgid "Conference"
-msgstr "Конференция"
+#: gajim/gtk/discovery.py:129
+#, fuzzy
+msgid "Group Chat"
+msgstr "Топтық чаттар"
 
-#: gajim/gtk/discovery.py:519
+#: gajim/gtk/discovery.py:518
 msgid "Without a connection, you can not browse available services"
 msgstr "Байланысты орнатпасаңыз, қолжетерлік қызметтерді қарай алмайсыз"
 
-#: gajim/gtk/discovery.py:606
+#: gajim/gtk/discovery.py:605
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "%s тіркелгісі үшін қызметтерді қарап шығу"
 
-#: gajim/gtk/discovery.py:608
+#: gajim/gtk/discovery.py:607
 msgid "Service Discovery"
 msgstr "Қызметтерді қарап шығу"
 
-#: gajim/gtk/discovery.py:691
+#: gajim/gtk/discovery.py:690
 msgid "The service could not be found"
 msgstr "Қызмет табылмады"
 
-#: gajim/gtk/discovery.py:692
+#: gajim/gtk/discovery.py:691
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -8907,101 +9260,80 @@ msgstr ""
 "Сіз енгізген адресі бойынша қызметтер жоқ, не олар жауап бермейді. Адресті "
 "тексеріп, қайталап көріңіз."
 
-#: gajim/gtk/discovery.py:699 gajim/gtk/discovery.py:1042
+#: gajim/gtk/discovery.py:698 gajim/gtk/discovery.py:1041
 msgid "The service is not browsable"
 msgstr "Қызмет қарау үшін қол жетерсіз"
 
-#: gajim/gtk/discovery.py:700
+#: gajim/gtk/discovery.py:699
 msgid "This type of service does not contain any items to browse."
 msgstr "Қызметтің осы түрінде қарауға болатын ешнәрсе жоқ."
 
-#: gajim/gtk/discovery.py:738 gajim/gtk/discovery.py:747
+#: gajim/gtk/discovery.py:737 gajim/gtk/discovery.py:746
 msgid "Invalid Server Name"
 msgstr "Сервердің аты қате"
 
-#: gajim/gtk/discovery.py:806
+#: gajim/gtk/discovery.py:805
 #, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "%(address)s қарау, %(account)s тіркелгісі"
 
-#: gajim/gtk/discovery.py:851
+#: gajim/gtk/discovery.py:850
 #, fuzzy
 msgid "Browse"
 msgstr "Қара_п шығу"
 
-#: gajim/gtk/discovery.py:1043
+#: gajim/gtk/discovery.py:1042
 msgid "This service does not contain any items to browse."
 msgstr "Бұл қызметте қарап шығуға болатын ешнәрсе жоқ."
 
-#: gajim/gtk/discovery.py:1255
+#: gajim/gtk/discovery.py:1254
 #, fuzzy
 msgid "_Command"
 msgstr "Пәрмендер"
 
-#: gajim/gtk/discovery.py:1264 gajim/gtk/discovery.py:1422
+#: gajim/gtk/discovery.py:1263 gajim/gtk/discovery.py:1420
 msgid "Re_gister"
 msgstr "_Тіркелу"
 
-#: gajim/gtk/discovery.py:1277
+#: gajim/gtk/discovery.py:1276
 msgid "_Search"
 msgstr "І_здеу"
 
-#: gajim/gtk/discovery.py:1420
+#: gajim/gtk/discovery.py:1418
 msgid "_Edit"
 msgstr "Тү_зету"
 
-#: gajim/gtk/discovery.py:1458
+#: gajim/gtk/discovery.py:1456
 #, fuzzy, python-format
 msgid "Scanning %(current)d / %(total)d ..."
 msgstr "Қаралуда %(current)d / %(total)d.."
 
-#: gajim/gtk/discovery.py:1674
+#: gajim/gtk/discovery.py:1655
+msgid "Users"
+msgstr "Пайдаланушылар"
+
+#: gajim/gtk/discovery.py:1671
 msgid "Id"
 msgstr "Id"
 
-#: gajim/gtk/discovery.py:1713
-msgid "_Join"
-msgstr "_Кіру"
-
-#: gajim/gtk/discovery.py:1736
-msgid "Bookmark already set"
-msgstr "Бетбелгі орнатылған болып тұр"
-
-#: gajim/gtk/discovery.py:1737
-#, fuzzy, python-format
-msgid "Group Chat '%s' is already in your bookmarks."
-msgstr "\"%s\" чат бөлмесі бетбелгілеріңізде бар болып тұр."
-
-#: gajim/gtk/discovery.py:1748
-msgid "Bookmark has been added successfully"
-msgstr "Бетбелгі сәтті қосылды"
-
-#: gajim/gtk/discovery.py:1749
-#, fuzzy
-msgid ""
-"You can manage your bookmarks by clicking the Bookmarks menu item in your "
-"contact list."
-msgstr ""
-"Өзіңіздің бетбелгілеріңізді ростердегі Әрекеттер мәзірінен басқара аласыз."
-
-#: gajim/gtk/discovery.py:1950
+#: gajim/gtk/discovery.py:1900
 msgid "Subscribed"
 msgstr "Жазылған"
 
-#: gajim/gtk/discovery.py:1959
+#: gajim/gtk/discovery.py:1909
 msgid "Node"
 msgstr "Node"
 
-#: gajim/gtk/discovery.py:2028
+#: gajim/gtk/discovery.py:1978
 #, fuzzy
 msgid "_New post"
 msgstr "Жаңа хабарлама"
 
-#: gajim/gtk/discovery.py:2037
+#: gajim/gtk/discovery.py:1987
 msgid "_Subscribe"
 msgstr "Жаз_ылу"
 
-#: gajim/gtk/discovery.py:2045
+#: gajim/gtk/discovery.py:1995
 msgid "_Unsubscribe"
 msgstr "Жа_зылудан бас тарту"
 
@@ -9048,7 +9380,7 @@ msgstr "Пішім %s"
 msgid "Characters typed: %s"
 msgstr "Таңба рұқсат етілмеген"
 
-#: gajim/gtk/single_message.py:274 gajim/gtk/xml_console.py:169
+#: gajim/gtk/single_message.py:274 gajim/gtk/xml_console.py:166
 msgid "Connection not available"
 msgstr "Байланыс қолжетерсіз"
 
@@ -9057,6 +9389,12 @@ msgstr "Байланыс қолжетерсіз"
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "\"%s\" үшін байланыс орнатылғанына көз жеткізіңіз."
 
+#: gajim/gtk/single_message.py:306
+#, 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:330
 #, python-format
 msgid "RE: %s"
@@ -9067,28 +9405,28 @@ msgstr "RE: %s"
 msgid "%s wrote:\n"
 msgstr "%s жазған:\n"
 
-#: gajim/gtk/pep_config.py:44
+#: gajim/gtk/pep_config.py:45
 #, fuzzy, python-format
 msgid "PEP Service Configuration (%s)"
 msgstr "PEP қызметтерді басқару"
 
-#: gajim/gtk/pep_config.py:77
+#: gajim/gtk/pep_config.py:78
 #, fuzzy
 msgid "Service"
 msgstr "Сервер"
 
-#: gajim/gtk/pep_config.py:114
+#: gajim/gtk/pep_config.py:115
 msgid "PEP node was not removed"
 msgstr "PEP торабы өшірілген жоқ"
 
-#: gajim/gtk/pep_config.py:115
+#: gajim/gtk/pep_config.py:116
 #, fuzzy, python-format
 msgid ""
 "PEP node %(node)s was not removed:\n"
 "%(message)s"
 msgstr "%(node)s PEP торабы өшірілген жоқ: %(message)s"
 
-#: gajim/gtk/pep_config.py:146
+#: gajim/gtk/pep_config.py:147
 #, python-format
 msgid "Configure %s"
 msgstr "%s баптау"
@@ -9104,17 +9442,21 @@ msgstr "Ті_ркелу"
 msgid "Registration successful"
 msgstr "Тіркелу сәтті аяқталды"
 
-#: gajim/gtk/dialogs.py:54 gajim/gtk/dataform.py:659 gajim/gtk/adhoc.py:85
+#: gajim/gtk/service_registration.py:215
+msgid "Registration failed"
+msgstr "Тіркелу сәтсіз"
+
+#: gajim/gtk/dialogs.py:53 gajim/gtk/dataform.py:668 gajim/gtk/adhoc.py:86
 #, fuzzy
 msgid "Cancel"
 msgstr "_Бас тарту"
 
-#: gajim/gtk/dialogs.py:129
+#: gajim/gtk/dialogs.py:128
 #, fuzzy, python-format
 msgid "Dictionary for language \"%s\" not available"
 msgstr "%s тілі үшін сөздік қолжетерсіз"
 
-#: gajim/gtk/dialogs.py:130
+#: gajim/gtk/dialogs.py:129
 #, fuzzy, python-format
 msgid ""
 "You have to install the dictionary \"%s\" to use spellchecking, or choose "
@@ -9127,11 +9469,11 @@ msgstr ""
 "\n"
 "Қате жазылған сөздерді түспен ерекшелеу мүмкіндігі енді қолданылмайды"
 
-#: gajim/gtk/dialogs.py:410 gajim/gtk/dialogs.py:425
+#: gajim/gtk/dialogs.py:322 gajim/gtk/dialogs.py:337
 msgid "Insecure connection"
 msgstr "Қауіпсіз емес байланыс"
 
-#: gajim/gtk/dialogs.py:411
+#: gajim/gtk/dialogs.py:323
 #, fuzzy, python-format
 msgid ""
 "You are about to connect to the account %(account)s (%(server)s) insecurely. "
@@ -9143,121 +9485,116 @@ msgstr ""
 "барлық сөйлесулеріңіз шифрленбеген түрде жүреді. Осыны жасауды шынымен "
 "қалайсыз ба?"
 
-#: gajim/gtk/dialogs.py:416
+#: gajim/gtk/dialogs.py:328
 msgid "Yes, I really want to connect insecurely"
 msgstr "Иә, қауіпсіз емес байланысты орнатқым келеді"
 
-#: gajim/gtk/dialogs.py:417
+#: gajim/gtk/dialogs.py:329
 msgid "Gajim will NOT connect unless you check this box"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:675
-#, fuzzy
-msgid "The nickname contains invalid characters."
-msgstr "Ник аты ішінде рұқсат етілмеген таңбалар бар."
-
-#: gajim/gtk/dialogs.py:734
+#: gajim/gtk/dialogs.py:561
 #, fuzzy, python-format
 msgid "Destroy %s"
 msgstr "Өшірілуде %s"
 
-#: gajim/gtk/dialogs.py:775
+#: gajim/gtk/dialogs.py:602
 #, fuzzy
 msgid "Certificate"
 msgstr "Клиент сертификаты"
 
-#: gajim/gtk/dialogs.py:786
+#: gajim/gtk/dialogs.py:613
 #, fuzzy, python-format
 msgid ""
 "Certificate for account\n"
 "%s"
 msgstr "%s тіркелгісі үшін"
 
-#: gajim/gtk/dialogs.py:824
+#: gajim/gtk/dialogs.py:651
 msgid "Issued to\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:825 gajim/gtk/dialogs.py:830
+#: gajim/gtk/dialogs.py:652 gajim/gtk/dialogs.py:657
 msgid "Common Name (CN): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:826 gajim/gtk/dialogs.py:831
+#: gajim/gtk/dialogs.py:653 gajim/gtk/dialogs.py:658
 msgid "Organization (O): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:827 gajim/gtk/dialogs.py:832
+#: gajim/gtk/dialogs.py:654 gajim/gtk/dialogs.py:659
 msgid "Organizational Unit (OU): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:828
+#: gajim/gtk/dialogs.py:655
 #, fuzzy
 msgid "Serial Number: "
 msgstr "GG нөмірі:"
 
-#: gajim/gtk/dialogs.py:829
+#: gajim/gtk/dialogs.py:656
 msgid "Issued by\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:833
+#: gajim/gtk/dialogs.py:660
 msgid "Validity\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:834
+#: gajim/gtk/dialogs.py:661
 msgid "Issued on: "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:835
+#: gajim/gtk/dialogs.py:662
 #, fuzzy
 msgid "Expires on: "
 msgstr "expire"
 
-#: gajim/gtk/dialogs.py:836
+#: gajim/gtk/dialogs.py:663
 msgid "SHA-1:"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:838
+#: gajim/gtk/dialogs.py:665
 msgid "SHA-256:"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:852
+#: gajim/gtk/dialogs.py:679
 #, fuzzy
 msgid "View certificate…"
 msgstr "Клиент сертификаты"
 
-#: gajim/gtk/dialogs.py:864 gajim/gtk/accounts.py:893
+#: gajim/gtk/dialogs.py:691 gajim/gtk/accounts.py:896
 msgid "Change Password"
 msgstr "Парольді өзгерту"
 
-#: gajim/gtk/dialogs.py:878
+#: gajim/gtk/dialogs.py:705
 msgid "_OK"
 msgstr "_ОК"
 
-#: gajim/gtk/dialogs.py:891
+#: gajim/gtk/dialogs.py:718
 #, fuzzy
 msgid "You must enter a password"
 msgstr "Парольді енгізуіңіз керек."
 
-#: gajim/gtk/dialogs.py:895
+#: gajim/gtk/dialogs.py:722
 msgid "Passwords do not match"
 msgstr "Парольдер өзара сәйкес келмейді"
 
-#: gajim/gtk/dialogs.py:923
+#: gajim/gtk/dialogs.py:750
 #, fuzzy
 msgid "Group Chat Invitation "
 msgstr "Топ чатына шақыру"
 
-#: gajim/gtk/dialogs.py:948
+#: gajim/gtk/dialogs.py:775
 #, fuzzy, python-format
 msgid "<b>%s</b> has invited you to join a discussion"
 msgstr "$Contact сізді талқылауға қатысуға шақырған"
 
-#: gajim/gtk/dialogs.py:951
+#: gajim/gtk/dialogs.py:778
 #, 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:959
+#: gajim/gtk/dialogs.py:786
 #, python-format
 msgid "Comment: %s"
 msgstr "Түсіндірме: %s"
@@ -9272,11 +9609,6 @@ msgstr "GG нөмірі:"
 msgid "ICQ Number"
 msgstr "ICQ нөмірі:"
 
-#: gajim/gtk/add_contact.py:40
-#, fuzzy
-msgid "Add Contact"
-msgstr "_Контакт қосу..."
-
 #: gajim/gtk/add_contact.py:259
 #, fuzzy, python-format
 msgid "%s Missing"
@@ -9297,7 +9629,8 @@ msgid "The user ID must not contain a resource."
 msgstr "Пайдаланушы ID-і ішінде ресурс болмау керек."
 
 #: gajim/gtk/add_contact.py:299
-msgid "You cannot add yourself to your roster."
+#, fuzzy
+msgid "You cannot add yourself to your contact list."
 msgstr "Өзіңізді өз ростеріңізге қоса алмайсыз."
 
 #: gajim/gtk/add_contact.py:304
@@ -9310,11 +9643,13 @@ msgid "Your account must be online to add new contacts."
 msgstr ""
 
 #: gajim/gtk/add_contact.py:321
-msgid "Contact already in roster"
+#, fuzzy
+msgid "Contact Already in Contact List"
 msgstr "Контакт ростерде бар болып тұр"
 
 #: gajim/gtk/add_contact.py:322
-msgid "This contact is already listed in your roster."
+#, fuzzy
+msgid "This contact is already in your contact list."
 msgstr "Контакт ростердіңізде бар болып тұр."
 
 #: gajim/gtk/add_contact.py:379 gajim/gtk/add_contact.py:417
@@ -9355,14 +9690,14 @@ msgstr "Қалып-күйді өзгерту"
 
 #: gajim/gtk/themes.py:52
 #, fuzzy
-msgid "MUC Tab New Directed Message"
+msgid "Group Chat Tab New Directed Message"
 msgstr ""
 "MUC адрестелген\n"
 "хабарламалары"
 
 #: gajim/gtk/themes.py:56
 #, fuzzy
-msgid "MUC Tab New Message"
+msgid "Group Chat Tab New Message"
 msgstr "Жаңа хабарлама"
 
 #: gajim/gtk/themes.py:60
@@ -9579,13 +9914,13 @@ msgstr "Барлық файлдар"
 msgid "Clear File"
 msgstr "Тазалау"
 
-#: gajim/gtk/settings.py:570
+#: gajim/gtk/settings.py:570 gajim/gtk/proxies.py:32
 #, fuzzy
 msgid "Manage Proxies"
 msgstr "Прокси профайлдарын басқару"
 
-#: gajim/gtk/settings.py:591 gajim/gtk/preferences.py:971
-#: gajim/gtk/preferences.py:984 gajim/gtk/preferences.py:988
+#: gajim/gtk/settings.py:591 gajim/gtk/preferences.py:968
+#: gajim/gtk/preferences.py:982 gajim/gtk/preferences.py:986
 #, fuzzy
 msgid "No Proxy"
 msgstr "Прокси:"
@@ -9665,14 +10000,15 @@ msgid ""
 "        "
 msgstr ""
 
-#: gajim/gtk/about.py:47 data/org.gajim.Gajim.appdata.xml.in:10
+#: gajim/gtk/about.py:47 data/org.gajim.Gajim.desktop.in:6
+#: data/org.gajim.Gajim.appdata.xml.in:10
 #, fuzzy
-msgid "A GTK+ XMPP client"
+msgid "A GTK XMPP client"
 msgstr "GTK+ Jabber қолданбасы"
 
 #: gajim/gtk/about.py:48
 #, fuzzy, python-format
-msgid "GTK+ Version: %s"
+msgid "GTK Version: %s"
 msgstr "GTK+ нұсқасы:"
 
 #: gajim/gtk/about.py:49
@@ -9849,6 +10185,25 @@ msgstr "?transfer status:Аялдатылған"
 msgid "?transfer status:Not started"
 msgstr "?transfer status:Аялдатылған"
 
+#: gajim/gtk/groupchat_creation.py:97 gajim/gtk/groupchat_creation.py:99
+msgid " (optional)..."
+msgstr ""
+
+#: gajim/gtk/groupchat_creation.py:134
+#, fuzzy
+msgid "Invalid Address"
+msgstr "Қате файл"
+
+#: gajim/gtk/groupchat_creation.py:182
+#, fuzzy
+msgid "Not Connected"
+msgstr "Байланысқан"
+
+#: gajim/gtk/groupchat_creation.py:183
+#, fuzzy
+msgid "You have to be connected to create a group chat."
+msgstr "Сіз топтық чатқа кірген жоқсыз."
+
 #: gajim/gtk/sounds.py:39
 msgid "Wav Sounds"
 msgstr "Wav дыбыстары"
@@ -9890,48 +10245,44 @@ msgstr "Сізді біреу бөлмеде еске алған"
 msgid "Group Chat Message Received"
 msgstr "Бөлмеде хабарлама алынды"
 
-#: gajim/gtk/dataform.py:226 gajim/gtk/dataform.py:262
+#: gajim/gtk/dataform.py:232 gajim/gtk/dataform.py:268
 #, fuzzy
 msgid "Required"
 msgstr "require"
 
-#: gajim/gtk/dataform.py:286
+#: gajim/gtk/dataform.py:293
 msgid "Yes"
 msgstr "Иә"
 
-#: gajim/gtk/dataform.py:286
+#: gajim/gtk/dataform.py:293
 msgid "No"
 msgstr "Жоқ"
 
-#: gajim/gtk/dataform.py:661
+#: gajim/gtk/dataform.py:670
 msgid "Submit"
 msgstr ""
 
-#: gajim/gtk/statusicon.py:213
+#: gajim/gtk/statusicon.py:206
 #, fuzzy
 msgid "_Change Status Message…"
 msgstr "Қалып-кү_й хабарламасын өзгерту"
 
-#: gajim/gtk/statusicon.py:247 gajim/gtk/statusicon.py:292
-#: gajim/gtk/statusicon.py:299
+#: gajim/gtk/statusicon.py:258
 #, python-format
 msgid "using account %s"
 msgstr "%s тіркелгісін қолданып"
 
-#: gajim/gtk/statusicon.py:309
+#: gajim/gtk/statusicon.py:269
 #, fuzzy
-msgid "_Manage Bookmarks…"
-msgstr "Бетбелгілерді басқару"
-
-#: gajim/gtk/statusicon.py:325
-msgid "Hide _Roster"
-msgstr "Р_остерді жасыру"
+msgid "Hide _Contact List"
+msgstr "Контакттарды _шақыру"
 
-#: gajim/gtk/statusicon.py:329
-msgid "Show _Roster"
-msgstr "_Ростерді көрсету"
+#: gajim/gtk/statusicon.py:273
+#, fuzzy
+msgid "Show _Contact List"
+msgstr "Те_к белсенді контакттарды көрсету"
 
-#: gajim/gtk/statusicon.py:337
+#: gajim/gtk/statusicon.py:281
 msgid "Hide this menu"
 msgstr "Бұл мәзірді жасыру"
 
@@ -9978,36 +10329,6 @@ msgstr ""
 "Сіз өзіңіздің жеке ақпаратыңызды жариялау кезінде қате кетті, кейін қайталап "
 "көріңіз."
 
-#: gajim/gtk/join_groupchat.py:202
-#, fuzzy
-msgid "Invalid Room"
-msgstr "Қате бөлме"
-
-#: gajim/gtk/join_groupchat.py:203
-msgid "Please choose a room"
-msgstr ""
-
-#: gajim/gtk/join_groupchat.py:222 gajim/gtk/join_groupchat.py:229
-msgid "Invalid Nickname"
-msgstr "Ник аты қате"
-
-#: gajim/gtk/join_groupchat.py:223
-#, fuzzy
-msgid "Please choose a nickname"
-msgstr "Өзіңіз таңдаған аты бар жаңа теманы жасаңыз."
-
-#: gajim/gtk/join_groupchat.py:282 gajim/gtk/join_groupchat.py:288
-#: gajim/gtk/join_groupchat.py:293
-#, fuzzy
-msgid "Wrong server"
-msgstr "Қате uri"
-
-#: gajim/gtk/join_groupchat.py:283 gajim/gtk/join_groupchat.py:289
-#: gajim/gtk/join_groupchat.py:294
-#, fuzzy, python-format
-msgid "%s is not a groupchat server"
-msgstr "Бұл топтық чат"
-
 #: gajim/gtk/mam_preferences.py:38
 #, python-format
 msgid "Archiving Preferences for %s"
@@ -10038,45 +10359,53 @@ msgstr "Алынған ақпарат формасындағы қате"
 msgid "Archiving Preferences Error"
 msgstr "Архивтеу ба_птауларын түзету"
 
-#: gajim/gtk/advanced_config.py:81
+#: gajim/gtk/advanced_config.py:95
 msgid "Activated"
 msgstr "Белсенді"
 
-#: gajim/gtk/advanced_config.py:81
+#: gajim/gtk/advanced_config.py:95
 msgid "Deactivated"
 msgstr "Сөндірілген"
 
-#: gajim/gtk/advanced_config.py:83
-msgid "Boolean"
-msgstr "Boolean"
+#: gajim/gtk/advanced_config.py:97
+msgid "?config type:Boolean"
+msgstr ""
+
+#: gajim/gtk/advanced_config.py:98
+msgid "?config type:Integer"
+msgstr ""
 
-#: gajim/gtk/advanced_config.py:84
-msgid "Integer"
-msgstr "Бүтін сан"
+#: gajim/gtk/advanced_config.py:99
+msgid "?config type:Text"
+msgstr ""
 
-#: gajim/gtk/advanced_config.py:85
-msgid "Text"
-msgstr "Мәтін"
+#: gajim/gtk/advanced_config.py:100
+msgid "?config type:Color"
+msgstr ""
 
-#: gajim/gtk/advanced_config.py:97
-msgid "Preference Name"
+#: gajim/gtk/advanced_config.py:112
+#, fuzzy
+msgid "?config:Preference Name"
 msgstr "Баптау аты"
 
-#: gajim/gtk/advanced_config.py:104
-msgid "Value"
-msgstr "Мәні"
+#: gajim/gtk/advanced_config.py:123
+#, fuzzy
+msgid "?config:Value"
+msgstr "Баптау"
 
-#: gajim/gtk/advanced_config.py:113
-msgid "Type"
-msgstr "Түрі"
+#: gajim/gtk/advanced_config.py:132
+msgid "?config:Type"
+msgstr ""
 
-#: gajim/gtk/advanced_config.py:168
-msgid "(None)"
-msgstr "(Ешнәрсе)"
+#: gajim/gtk/advanced_config.py:187
+#, fuzzy
+msgid "?config description:None"
+msgstr "?Ask (for Subscription):Жоқ"
 
-#: gajim/gtk/advanced_config.py:299
-msgid "Hidden"
-msgstr "Жасырын"
+#: gajim/gtk/advanced_config.py:322
+#, fuzzy
+msgid "?password:Hidden"
+msgstr "Пароль:"
 
 #: gajim/gtk/server_info.py:66
 #, fuzzy
@@ -10088,8 +10417,8 @@ msgstr "_Сілтеме адресін көшіру"
 msgid "%(days)s days, %(hours)s hours"
 msgstr ""
 
-#: gajim/gtk/server_info.py:218 gajim/gtk/accounts.py:749
-#: gajim/gtk/accounts.py:853
+#: gajim/gtk/server_info.py:218 gajim/gtk/accounts.py:752
+#: gajim/gtk/accounts.py:856
 #, fuzzy
 msgid "Hostname"
 msgstr "_Хост аты:"
@@ -10279,11 +10608,6 @@ msgstr "Тізім аты қате"
 msgid "You must enter a name to create a privacy list."
 msgstr "Жекелік тізімін жасау үшін оның атын енгізуіңіз керек."
 
-#: gajim/gtk/groupchat_config.py:41
-#, fuzzy
-msgid "Group Chat Configuration"
-msgstr "Топ чатына шақыру"
-
 #: gajim/gtk/groupchat_config.py:134
 #, fuzzy
 msgid "A Group Chat needs at least one Owner"
@@ -10294,69 +10618,69 @@ msgid "You are not allowed to modify the affiliation of Admins and Owners"
 msgstr ""
 
 #: gajim/gtk/groupchat_config.py:399
-msgid "An entry with this Jabber-ID already exists"
+msgid "An entry with this XMPP Address already exists"
 msgstr ""
 
-#: gajim/gtk/adhoc.py:91
+#: gajim/gtk/adhoc.py:92
 #, fuzzy
 msgid "Finish"
 msgstr "_Аяқтау"
 
-#: gajim/gtk/adhoc.py:97 gajim/gtk/adhoc.py:283
+#: gajim/gtk/adhoc.py:98 gajim/gtk/adhoc.py:284
 #, fuzzy
 msgid "Commands"
 msgstr "Пәрмендер"
 
-#: gajim/gtk/adhoc.py:103
+#: gajim/gtk/adhoc.py:104
 msgid "Next"
 msgstr ""
 
-#: gajim/gtk/adhoc.py:109
+#: gajim/gtk/adhoc.py:110
 #, fuzzy
 msgid "Previous"
 msgstr "Қызғанған"
 
-#: gajim/gtk/adhoc.py:115
+#: gajim/gtk/adhoc.py:116
 #, fuzzy
 msgid "Execute"
 msgstr "К_оманда орындау"
 
-#: gajim/gtk/adhoc.py:195
+#: gajim/gtk/adhoc.py:196
 #, fuzzy
 msgid "No commands available"
 msgstr "Бірде-бір тіркелгі қолжетерсіз"
 
-#: gajim/gtk/adhoc.py:244
+#: gajim/gtk/adhoc.py:245
 #, fuzzy
 msgid "Request Command List"
 msgstr "К_оманда орындау"
 
-#: gajim/gtk/adhoc.py:259
+#: gajim/gtk/adhoc.py:260
 #, fuzzy
 msgid "Executing…"
 msgstr "К_оманда орындау"
 
-#: gajim/gtk/adhoc.py:266
+#: gajim/gtk/adhoc.py:267
 #, fuzzy
 msgid "Command List"
 msgstr "Пәрмендер"
 
-#: gajim/gtk/adhoc.py:384
+#: gajim/gtk/adhoc.py:385
 #, fuzzy
 msgid "Finished"
 msgstr "_Аяқтау"
 
-#: gajim/gtk/adhoc.py:453
+#: gajim/gtk/adhoc.py:454
 #, fuzzy
 msgid "Execution failed"
 msgstr "Байланысу сәтсіз"
 
-#: gajim/gtk/blocking.py:37
+#: gajim/gtk/blocking.py:38
 #, fuzzy, python-format
 msgid "Blocking List for %s"
 msgstr "%s үшін жекелік тізімі"
 
-#: gajim/gtk/blocking.py:71
+#: gajim/gtk/blocking.py:72
 #, fuzzy
 msgid "Error!"
 msgstr "Қате"
@@ -10406,8 +10730,7 @@ msgstr "Пайдаланушы аты қате"
 msgid "You must provide a username to configure this account."
 msgstr "Бұл тіркелгіні баптау үшін пайдаланушы атын көрсетуіңіз керек."
 
-#: gajim/gtk/account_wizard.py:252 gajim/gtk/bookmarks.py:290
-#: gajim/gtk/bookmarks.py:303
+#: gajim/gtk/account_wizard.py:252
 msgid "Invalid server"
 msgstr "Сервер қате"
 
@@ -10423,7 +10746,7 @@ msgstr "Қате мән"
 msgid "Custom port must be a port number."
 msgstr "Таңдауыңызша порт нөмірі түрінде берілуі тиіс."
 
-#: gajim/gtk/account_wizard.py:405
+#: gajim/gtk/account_wizard.py:406
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -10438,15 +10761,15 @@ msgstr ""
 "SSL қатесі: %(error)s\n"
 "Сонда да серверге байланысты орнатуды қалайсыз ба?"
 
-#: gajim/gtk/account_wizard.py:446 gajim/gtk/account_wizard.py:480
+#: gajim/gtk/account_wizard.py:447 gajim/gtk/account_wizard.py:481
 msgid "An error occurred during account creation"
 msgstr "Жасау кезінде қате кетті"
 
-#: gajim/gtk/account_wizard.py:545
+#: gajim/gtk/account_wizard.py:546
 msgid "Account name is in use"
 msgstr "Тіркелгі аты қолдануда"
 
-#: gajim/gtk/account_wizard.py:546
+#: gajim/gtk/account_wizard.py:547
 msgid "You already have an account using this name."
 msgstr "Сізде осы атын қолданып тұрған тіркелгі бар болып тұр."
 
@@ -10473,26 +10796,26 @@ msgstr "%(name)s жіберген %(filename)s файлын алу тоқтат�
 msgid "%(minutes)s min %(seconds)s sec"
 msgstr ""
 
-#: gajim/gtk/xml_console.py:77
+#: gajim/gtk/xml_console.py:74
 #, fuzzy
 msgid "Filter"
 msgstr "Фильтр:"
 
-#: gajim/gtk/xml_console.py:82
+#: gajim/gtk/xml_console.py:79
 #, fuzzy
 msgid "XML Input"
 msgstr "<b>XML енгізу</b>"
 
-#: gajim/gtk/xml_console.py:86
+#: gajim/gtk/xml_console.py:83
 msgid "Paste Last Input"
 msgstr ""
 
-#: gajim/gtk/xml_console.py:170
+#: gajim/gtk/xml_console.py:167
 #, fuzzy, python-format
 msgid "Please make sure you are connected with '%s'."
 msgstr "\"%s\" үшін байланыс орнатылғанына көз жеткізіңіз."
 
-#: gajim/gtk/xml_console.py:182
+#: gajim/gtk/xml_console.py:177
 #, fuzzy
 msgid "Invalid Node"
 msgstr "Қате файл"
@@ -10525,305 +10848,315 @@ msgstr "Іздеу"
 msgid "No results found"
 msgstr "Нәтижесі жоқ"
 
-#: gajim/gtk/preferences.py:358 gajim/gtk/preferences.py:362
+#: gajim/gtk/preferences.py:357 gajim/gtk/preferences.py:361
 msgid "Default"
 msgstr "Бастапқысы"
 
-#: gajim/gtk/preferences.py:801
+#: gajim/gtk/preferences.py:798
 msgid "status message title"
 msgstr "қалып-күй хабарлама атауы"
 
-#: gajim/gtk/preferences.py:802
+#: gajim/gtk/preferences.py:799
 msgid "status message text"
 msgstr "қалып-күй хабарлама мәтіні"
 
+#: gajim/gtk/accounts.py:137
+#, fuzzy
+msgid "Re-Login"
+msgstr "Қазір қайта кіру керек пе?"
+
 #: gajim/gtk/accounts.py:138
-msgid "Relogin now?"
+#, fuzzy
+msgid "Re-Login now?"
 msgstr "Қазір қайта кіру керек пе?"
 
 #: gajim/gtk/accounts.py:139
-msgid "If you want all the changes to apply instantly, you must relogin."
+#, fuzzy
+msgid "To apply all changes instantly, you have to re-login."
 msgstr "Түзетулерді қазір іске асыруды қаласаңыз, қайта кіруіңіз керек."
 
-#: gajim/gtk/accounts.py:191 gajim/gtk/accounts.py:975
+#: gajim/gtk/accounts.py:141
+msgid "_Later"
+msgstr ""
+
+#: gajim/gtk/accounts.py:143
+msgid "_Re-Login"
+msgstr ""
+
+#: gajim/gtk/accounts.py:194 gajim/gtk/accounts.py:978
 #, fuzzy
 msgid "Remove Account"
 msgstr "%s тіркелгісі өшірілуде"
 
-#: gajim/gtk/accounts.py:192
+#: gajim/gtk/accounts.py:195
 #, fuzzy, python-format
 msgid "You still have open chats in your account %s"
 msgstr "Сізде %s тіркелгісінен чаттар ашулы тұр"
 
-#: gajim/gtk/accounts.py:193
+#: gajim/gtk/accounts.py:196
 #, fuzzy
 msgid ""
 "All chat and group chat windows will be closed.\n"
 "Do you want to continue?"
 msgstr "Барлық чаттар мен топ чаттары жабылады. Жалғастыруды қалайсыз ба?"
 
-#: gajim/gtk/accounts.py:424
+#: gajim/gtk/accounts.py:427
 #, fuzzy
 msgid "Back"
 msgstr "Жақында ораламын"
 
-#: gajim/gtk/accounts.py:530
+#: gajim/gtk/accounts.py:533
 #, fuzzy
 msgid "Please check if Bonjour is installed."
 msgstr "Avahi не Bonjour орнатулы тұрғанды тексеріңіз."
 
-#: gajim/gtk/accounts.py:532
+#: gajim/gtk/accounts.py:535
 #, fuzzy
 msgid "Please check if Avahi is installed."
 msgstr "Avahi не Bonjour орнатулы тұрғанды тексеріңіз."
 
-#: gajim/gtk/accounts.py:569
+#: gajim/gtk/accounts.py:572
 #, fuzzy
 msgid "Disable Account"
 msgstr "Қате тіркелгі"
 
-#: gajim/gtk/accounts.py:570
+#: gajim/gtk/accounts.py:573
 #, fuzzy, python-format
 msgid "Account %s is still connected"
 msgstr "\"%s\" тіркелгісі серверге қосылған"
 
-#: gajim/gtk/accounts.py:571
+#: gajim/gtk/accounts.py:574
 #, fuzzy
 msgid ""
 "All chat and group chat windows will be closed. Do you want to continue?"
 msgstr "Барлық чаттар мен топ чаттары жабылады. Жалғастыруды қалайсыз ба?"
 
-#: gajim/gtk/accounts.py:576
+#: gajim/gtk/accounts.py:579
 #, fuzzy
 msgid "_Disable Account"
 msgstr "Қате тіркелгі"
 
-#: gajim/gtk/accounts.py:595
+#: gajim/gtk/accounts.py:598
 #, fuzzy
 msgid "Add Account"
 msgstr "_Контакт қосу..."
 
-#: gajim/gtk/accounts.py:663
+#: gajim/gtk/accounts.py:666
 #, fuzzy
 msgid "Label"
 msgstr "белгі"
 
-#: gajim/gtk/accounts.py:667
+#: gajim/gtk/accounts.py:670
 msgid "Login"
 msgstr ""
 
-#: gajim/gtk/accounts.py:670
+#: gajim/gtk/accounts.py:673
 #, fuzzy
 msgid "Import Contacts"
 msgstr "Контакттарды _шақыру"
 
-#: gajim/gtk/accounts.py:674 gajim/gtk/accounts.py:870
+#: gajim/gtk/accounts.py:677 gajim/gtk/accounts.py:873
 #, fuzzy
 msgid "Client Certificate"
 msgstr "Клиент сертификаты"
 
-#: gajim/gtk/accounts.py:677 gajim/gtk/accounts.py:774
+#: gajim/gtk/accounts.py:680 gajim/gtk/accounts.py:777
 #, fuzzy
 msgid "Connect on startup"
 msgstr "Gajim қосылғанда, байланыс _орнату"
 
-#: gajim/gtk/accounts.py:681 gajim/gtk/accounts.py:779
+#: gajim/gtk/accounts.py:684 gajim/gtk/accounts.py:782
 #, fuzzy
 msgid "Save conversations for all contacts"
 msgstr "Барлық к_онтакттар үшін хабарламалар тарихын сақтау"
 
-#: gajim/gtk/accounts.py:683 gajim/gtk/accounts.py:781
+#: gajim/gtk/accounts.py:686 gajim/gtk/accounts.py:784
 msgid "Store conversations on the harddrive"
 msgstr ""
 
-#: gajim/gtk/accounts.py:685 gajim/gtk/accounts.py:783
+#: gajim/gtk/accounts.py:688 gajim/gtk/accounts.py:786
 #, fuzzy
 msgid "Global Status"
 msgstr "Барлық күйлер"
 
-#: gajim/gtk/accounts.py:687
+#: gajim/gtk/accounts.py:690
 #, fuzzy
 msgid "Synchronise the status of all accounts"
 msgstr "Тіркелгі не тіркелгілердің қалып-күйін өзгерту"
 
-#: gajim/gtk/accounts.py:689
+#: gajim/gtk/accounts.py:692
 msgid "Use file transfer proxies"
 msgstr "Файлдармен алмасу үшін прокси қолдану"
 
-#: gajim/gtk/accounts.py:705
+#: gajim/gtk/accounts.py:708
 #, fuzzy
 msgid "Idle Time"
 msgstr "%s бастап белсенді емес"
 
-#: gajim/gtk/accounts.py:707
+#: gajim/gtk/accounts.py:710
 msgid "Disclose the time of your last activity"
 msgstr ""
 
-#: gajim/gtk/accounts.py:709
+#: gajim/gtk/accounts.py:712
 msgid "Local System Time"
 msgstr ""
 
-#: gajim/gtk/accounts.py:711
+#: gajim/gtk/accounts.py:714
 msgid "Disclose the local system time of the device Gajim runs on"
 msgstr ""
 
-#: gajim/gtk/accounts.py:714
+#: gajim/gtk/accounts.py:717
 #, fuzzy
 msgid "Client / Operating System"
 msgstr "Клиент сертификаты"
 
-#: gajim/gtk/accounts.py:716
+#: gajim/gtk/accounts.py:719
 #, fuzzy
 msgid ""
 "Disclose informations about the client and operating system you currently use"
 msgstr ""
 "Gajim-ге сіздің операциялық жүйеңіз туралы ақпаратты жіберуге рұқсат ету."
 
-#: gajim/gtk/accounts.py:719
+#: gajim/gtk/accounts.py:722
 #, fuzzy
 msgid "Ignore Unknown Contacts"
 msgstr "Контакттарды _шақыру"
 
-#: gajim/gtk/accounts.py:721
+#: gajim/gtk/accounts.py:724
 #, fuzzy
 msgid "Ignore everything from contacts not in your Roster"
 msgstr "_Ростердегі емес контакттардан оқиғаларды елемеу"
 
-#: gajim/gtk/accounts.py:737 gajim/gtk/accounts.py:776
+#: gajim/gtk/accounts.py:740 gajim/gtk/accounts.py:779
 #, fuzzy
 msgid "Use environment variable"
 msgstr "қор_шамның HTTP__PROXY айнымалысын қолдану"
 
-#: gajim/gtk/accounts.py:739
-#, fuzzy
-msgid "Proxy"
-msgstr "Прокси:"
-
-#: gajim/gtk/accounts.py:742
+#: gajim/gtk/accounts.py:745
 #, fuzzy
 msgid "Warn on insecure connection"
 msgstr "Қ_ауіпсіз емес байланыс орнату алдында ескерту"
 
-#: gajim/gtk/accounts.py:746
+#: gajim/gtk/accounts.py:749
 #, fuzzy
 msgid "Send keep-alive packets"
 msgstr "Keep-alive д_естелерін жіберіп отыру"
 
-#: gajim/gtk/accounts.py:750
+#: gajim/gtk/accounts.py:753
 msgid "Manually set the hostname for the server"
 msgstr ""
 
-#: gajim/gtk/accounts.py:756 gajim/gtk/accounts.py:826
-#: gajim/gtk/accounts.py:831
+#: gajim/gtk/accounts.py:759 gajim/gtk/accounts.py:829
+#: gajim/gtk/accounts.py:834
 #, fuzzy
 msgid "Priority"
 msgstr "Приорите_т:"
 
-#: gajim/gtk/accounts.py:785
+#: gajim/gtk/accounts.py:788
 #, fuzzy
 msgid "Synchronize the status of all accounts"
 msgstr "Тіркелгі не тіркелгілердің қалып-күйін өзгерту"
 
-#: gajim/gtk/accounts.py:795
+#: gajim/gtk/accounts.py:798
 #, fuzzy
 msgid "First Name"
 msgstr "Аты:"
 
-#: gajim/gtk/accounts.py:798
+#: gajim/gtk/accounts.py:801
 #, fuzzy
 msgid "Last Name"
 msgstr "Фамилиясы:"
 
-#: gajim/gtk/accounts.py:804
+#: gajim/gtk/accounts.py:807
 #, fuzzy
 msgid "Email"
 msgstr "Жаңа E-mail"
 
-#: gajim/gtk/accounts.py:822
+#: gajim/gtk/accounts.py:825
 #, fuzzy
 msgid "Adjust to status"
 msgstr "Күйге сә_йкес"
 
-#: gajim/gtk/accounts.py:849
+#: gajim/gtk/accounts.py:852
 msgid "Enable"
 msgstr "Қосу"
 
-#: gajim/gtk/accounts.py:857
+#: gajim/gtk/accounts.py:860
 #, fuzzy
 msgid "Port"
 msgstr "_Порт:"
 
-#: gajim/gtk/accounts.py:862
+#: gajim/gtk/accounts.py:865
 #, fuzzy
 msgid "Connection Settings"
 msgstr "Байланыс"
 
-#: gajim/gtk/accounts.py:872
+#: gajim/gtk/accounts.py:875
 msgid "PKCS12 Files"
 msgstr "PKCS12 файлдары"
 
-#: gajim/gtk/accounts.py:874
+#: gajim/gtk/accounts.py:877
 #, fuzzy
 msgid "Encrypted Certificate"
 msgstr "Клиент сертификаты"
 
-#: gajim/gtk/accounts.py:878
+#: gajim/gtk/accounts.py:881
 #, fuzzy
 msgid "Certificate Settings"
 msgstr "Клиент сертификаты"
 
-#: gajim/gtk/accounts.py:890
+#: gajim/gtk/accounts.py:893
 #, fuzzy
 msgid "Save Password"
 msgstr "Парольді сақтау"
 
-#: gajim/gtk/accounts.py:898
+#: gajim/gtk/accounts.py:901
 #, fuzzy
 msgid "Login Settings"
 msgstr "Плагиндер"
 
-#: gajim/gtk/accounts.py:931
+#: gajim/gtk/accounts.py:934
 #, fuzzy, python-format
 msgid "Removing account %s"
 msgstr "%s тіркелгісі өшірілуде"
 
-#: gajim/gtk/accounts.py:946
+#: gajim/gtk/accounts.py:949
 msgid "Account is disabled"
 msgstr "Тіркелгі сөндірулі"
 
-#: gajim/gtk/accounts.py:947
+#: gajim/gtk/accounts.py:950
 #, fuzzy
 msgid "To unregister from a server, the account must be enabled."
 msgstr "Серверден тіркелуді өшіру үшін тіркелгі қосулы тқұру керек."
 
-#: gajim/gtk/accounts.py:962
+#: gajim/gtk/accounts.py:965
 #, fuzzy
 msgid "Password required"
 msgstr "Пароль керек"
 
-#: gajim/gtk/accounts.py:976
+#: gajim/gtk/accounts.py:979
 #, fuzzy, python-format
 msgid "Account '%s' is still connected to the server"
 msgstr "\"%s\" тіркелгісі серверге қосылған"
 
-#: gajim/gtk/accounts.py:978
+#: gajim/gtk/accounts.py:981
 msgid "If you remove it, the connection will be lost."
 msgstr "Оны өшірсеңіз, байланыс жойылады."
 
-#: gajim/gtk/accounts.py:995
+#: gajim/gtk/accounts.py:998
 #, python-format
 msgid "Connection to server %s failed"
 msgstr "%s серверімен байланыс орнату сәтсіз"
 
-#: gajim/gtk/accounts.py:996
+#: gajim/gtk/accounts.py:999
 msgid "What would you like to do?"
 msgstr "Сіз не істегіңіз келеді?"
 
-#: gajim/gtk/accounts.py:997
+#: gajim/gtk/accounts.py:1000
 msgid "Remove only from Gajim"
 msgstr "Тіркелгіні тек Gajim ішінен өшіру"
 
-#: gajim/gtk/accounts.py:998
+#: gajim/gtk/accounts.py:1001
 msgid "Don't remove anything. I'll try again later"
 msgstr "Ешнәрсе өшірмеу. Кейін қайталап көремін"
 
@@ -10848,6 +11181,10 @@ msgstr ""
 msgid "Modify"
 msgstr "Түзету"
 
+#: gajim/gtk/roster_item_exchange.py:80
+msgid "JID"
+msgstr "JID"
+
 #: gajim/gtk/roster_item_exchange.py:86
 msgid "Groups"
 msgstr "Топтар"
@@ -10871,19 +11208,19 @@ msgid_plural "Removed %d contacts"
 msgstr[0] "%s контакт өшірілген"
 msgstr[1] "%s контакт өшірілген"
 
-#: gajim/gtk/util.py:581
+#: gajim/gtk/util.py:583
 msgid "Unknown Artist"
 msgstr "Белгісіз орындаушы"
 
-#: gajim/gtk/util.py:582
+#: gajim/gtk/util.py:584
 msgid "Unknown Title"
 msgstr "Белгісіз атауы"
 
-#: gajim/gtk/util.py:583
+#: gajim/gtk/util.py:585
 msgid "Unknown Source"
 msgstr "Белгісіз көзі"
 
-#: gajim/gtk/util.py:585
+#: gajim/gtk/util.py:587
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
@@ -10892,27 +11229,10 @@ msgstr ""
 "<b>\"%(title)s\"</b>, орындайтыны <i>%(artist)s</i>\n"
 "қайдан: <i>%(source)s</i>"
 
-#: gajim/gtk/bookmarks.py:121
-msgid "New Group Chat"
-msgstr "Жаңа чат бөлмесі"
-
-#: gajim/gtk/bookmarks.py:161
-msgid "This bookmark has invalid data"
-msgstr "Бұл бетбелгінің ақпараты қате"
-
-#: gajim/gtk/bookmarks.py:162
-msgid ""
-"Please be sure to fill out server and room fields or remove this bookmark."
-msgstr "Сервер мен бөлме өрістерін толтырыңыз немесе бетбелгіні өшіріңіз."
-
-#: gajim/gtk/bookmarks.py:273 gajim/gtk/bookmarks.py:291
-#: gajim/gtk/bookmarks.py:304 gajim/gtk/bookmarks.py:335
-msgid "Character not allowed"
-msgstr "Таңба рұқсат етілмеген"
-
-#: gajim/gtk/bookmarks.py:334
-msgid "Invalid room"
-msgstr "Қате бөлме"
+#: gajim/gtk/bookmarks.py:47
+#, fuzzy, python-format
+msgid "Bookmarks for %s"
+msgstr "_Бетбелгі"
 
 #: gajim/plugins/pluginmanager.py:736 gajim/plugins/pluginmanager.py:742
 msgid "Archive corrupted"
@@ -10923,48 +11243,51 @@ msgid "Archive empty"
 msgstr "Архив бос"
 
 #: gajim/plugins/pluginmanager.py:750 gajim/plugins/pluginmanager.py:758
-#: gajim/plugins/gui.py:257
+#: gajim/plugins/gui.py:258
 msgid "Archive is malformed"
 msgstr "Архив қате"
 
-#: gajim/plugins/pluginmanager.py:766 gajim/plugins/gui.py:281
-#: gajim/plugins/gui.py:289
+#: gajim/plugins/pluginmanager.py:766 gajim/plugins/gui.py:288
+#: gajim/plugins/gui.py:301
 msgid "Plugin already exists"
 msgstr "Плагин бар болып тұр"
 
-#: gajim/plugins/gui.py:82
+#: gajim/plugins/gui.py:83
 msgid "Click to view Gajim's wiki page on how to install plugins in Flatpak."
 msgstr ""
 
-#: gajim/plugins/gui.py:89
+#: gajim/plugins/gui.py:90
 msgid "Plugin"
 msgstr "Плагин"
 
-#: gajim/plugins/gui.py:151
+#: gajim/plugins/gui.py:152
 #, fuzzy, python-format
 msgid "Warning: %s"
 msgstr "%s банға жіберу"
 
-#: gajim/plugins/gui.py:206
+#: gajim/plugins/gui.py:207
 msgid "Plugin failed"
 msgstr "Плагин сәтсіз"
 
-#: gajim/plugins/gui.py:245
+#: gajim/plugins/gui.py:246
 msgid "Unable to properly remove the plugin"
 msgstr "Плагинді дұрыс өшіру мүмкін емес"
 
-#: gajim/plugins/gui.py:281
-msgid "Overwrite?"
+#: gajim/plugins/gui.py:287
+#, fuzzy
+msgid "Overwrite Plugin?"
 msgstr "Үстінен жазу керек пе?"
 
+#: gajim/plugins/gui.py:289
+#, fuzzy
+msgid "Do you want to overwrite the currently installed version?"
+msgstr "Шақыруды қабылдайсыз ба?"
+
 #: data/org.gajim.Gajim.desktop.in:5
-msgid "Jabber IM Client"
+#, fuzzy
+msgid "XMPP IM Client"
 msgstr "Jabber IM Клиенті"
 
-#: data/org.gajim.Gajim.desktop.in:6
-msgid "A GTK+ Jabber client"
-msgstr "GTK+ Jabber қолданбасы"
-
 #: data/org.gajim.Gajim.desktop.in:8
 msgid "chat;messaging;im;xmpp;bonjour;voip;"
 msgstr ""
@@ -11016,7 +11339,7 @@ msgid "Easily send pictures, videos or other files to friends and groups"
 msgstr ""
 
 #: data/org.gajim.Gajim.appdata.xml.in:27
-msgid "Chat securely with End-to-End encryption via OMEMO or PGP"
+msgid "Chat securely with End-to-End encryption via OMEMO or OpenPGP"
 msgstr ""
 
 #: data/org.gajim.Gajim.appdata.xml.in:28
@@ -11078,7 +11401,7 @@ msgstr ""
 
 #: data/org.gajim.Gajim.appdata.xml.in:52
 #, fuzzy
-msgid "Roster, list of contacts"
+msgid "Contact list, list of contacts"
 msgstr "К_онтакттардың күй өзгерісін тарихқа жазу"
 
 #: data/org.gajim.Gajim.appdata.xml.in:56
@@ -11100,6 +11423,534 @@ msgstr "Соңғылар:"
 msgid "Plugin manager"
 msgstr "Плагин сәтсіз"
 
+#, fuzzy
+#~ msgid "Configure Services…"
+#~ msgstr "Қызметтерді баптау..."
+
+#, fuzzy
+#~ msgid "Group Chat Bookmarks"
+#~ msgstr "_Чат бөлмесі"
+
+#, fuzzy
+#~ msgid "Add Bookmark"
+#~ msgstr "_Бетбелгі"
+
+#, fuzzy
+#~ msgid "Remove Bookmark"
+#~ msgstr "_Бетбелгі"
+
+#, fuzzy
+#~ msgid "Bookmark Name"
+#~ msgstr "_Бөлмені бетбелгілерге қосу"
+
+#, fuzzy
+#~ msgid "_Server"
+#~ msgstr "_Сервер:"
+
+#, fuzzy
+#~ msgid "Roo_m"
+#~ msgstr "Бө_лме:"
+
+#, fuzzy
+#~ msgid "_Password"
+#~ msgstr "_Пароль:"
+
+#, fuzzy
+#~ msgid "Join chat when connected"
+#~ msgstr "Контакт байланыспаған"
+
+#~ msgid "New Group Chat"
+#~ msgstr "Жаңа чат бөлмесі"
+
+#~ msgid "This bookmark has invalid data"
+#~ msgstr "Бұл бетбелгінің ақпараты қате"
+
+#, fuzzy
+#~ msgid ""
+#~ "Please be sure to fill out server and group chat fields or remove this "
+#~ "bookmark."
+#~ msgstr "Сервер мен бөлме өрістерін толтырыңыз немесе бетбелгіні өшіріңіз."
+
+#~ msgid "Character not allowed"
+#~ msgstr "Таңба рұқсат етілмеген"
+
+#, fuzzy
+#~ msgid "Invalid Group Chat"
+#~ msgstr "Топтық чаттың Jabber ID-і зате"
+
+#~ msgid "Unable to join group chat"
+#~ msgstr "Чат бөлмесіне кіру мүмкін емес"
+
+#, fuzzy
+#~ msgid "You are banned from group chat <b>%s</b>."
+#~ msgstr "Сізді %s топ чатынан бандаған."
+
+#, fuzzy
+#~ msgid "Remote server <b>%s</b> does not exist."
+#~ msgstr "%s топтық чаты жоқ."
+
+#, fuzzy
+#~ msgid "Group chat <b>%s</b> does not exist."
+#~ msgstr "%s топтық чаты жоқ."
+
+#, fuzzy
+#~ msgid "Group chat creation is not permitted."
+#~ msgstr "Топтық чаттарды жасау рұқсат етілмеген."
+
+#, fuzzy
+#~ msgid "You must use your registered nickname in <b>%s</b>."
+#~ msgstr "Сіздің тіркелген ник атыңыз %s топ чатында қолданылуы керек."
+
+#, fuzzy
+#~ msgid "You are not in the members list in group chat %s."
+#~ msgstr "Сіз %s топ чат мүшелері тізімінде емессіз."
+
+#, fuzzy
+#~ msgid "XMPP Address is not a group chat"
+#~ msgstr "Бұл топтық чат"
+
+#~ msgid "This is not a group chat"
+#~ msgstr "Бұл топтық чат"
+
+#, fuzzy
+#~ msgid "Please choose a group chat"
+#~ msgstr "Өзіңіз таңдаған аты бар жаңа теманы жасаңыз."
+
+#~ msgid "Invalid Nickname"
+#~ msgstr "Ник аты қате"
+
+#, fuzzy
+#~ msgid "Please choose a nickname"
+#~ msgstr "Өзіңіз таңдаған аты бар жаңа теманы жасаңыз."
+
+#, fuzzy
+#~ msgid "Wrong server"
+#~ msgstr "Қате uri"
+
+#, fuzzy
+#~ msgid "%s is not a group chat server"
+#~ msgstr "Бұл топтық чат"
+
+#, fuzzy
+#~ msgid ""
+#~ "How many lines to request from server when entering a group chat. -1 "
+#~ "means no limit."
+#~ msgstr "Топ чатына кірген кезде серверден қанша тарих жолын сұрау керек."
+
+#, fuzzy
+#~ msgid ""
+#~ "Minutes of backlog to request when entering a group chat. -1 means no "
+#~ "limit."
+#~ msgstr ""
+#~ "Топ чатына кірген кезде қанша минут бұрынғы сөйлесулердің тарих жолдарын "
+#~ "сұрау керек."
+
+#, fuzzy
+#~ msgid ""
+#~ "How many lines to request from server when entering a group chat. -1 "
+#~ "means no limit, -2 means global value."
+#~ msgstr "Топ чатына кірген кезде серверден қанша тарих жолын сұрау керек."
+
+#, fuzzy
+#~ msgid ""
+#~ "Minutes of backlog to request when entering a group chat. -1 means no "
+#~ "limit, -2 means global value."
+#~ msgstr ""
+#~ "Топ чатына кірген кезде қанша минут бұрынғы сөйлесулердің тарих жолдарын "
+#~ "сұрау керек."
+
+#, fuzzy
+#~ msgid "A Password is required to join the group chat %s. Please type it."
+#~ msgstr "%s бөлмесіне кіру үшін пароль керек. Оны көрсетіңіз."
+
+#~ msgid "Not in Roster"
+#~ msgstr "Ростерде емес"
+
+#~ msgid "I would like to add you to my roster"
+#~ msgstr "Мен өз ростеріме сізді қосқым келеді"
+
+#, fuzzy
+#~ msgid "Add to Roster"
+#~ msgstr "Р_остерге қосу"
+
+#, fuzzy
+#~ msgid "Audio Session"
+#~ msgstr "Аудио сынау"
+
+#, fuzzy
+#~ msgid "Video Session"
+#~ msgstr "Видео сынау"
+
+#, fuzzy
+#~ msgid "Manage Room"
+#~ msgstr "_Бөлмені басқару"
+
+#, fuzzy
+#~ msgid "Configure Room"
+#~ msgstr "_Бөлмені баптау..."
+
+#, fuzzy
+#~ msgid "Destroy Room"
+#~ msgstr "Бөлме_ні жою"
+
+#, fuzzy
+#~ msgid "Change Nick"
+#~ msgstr "_Никті өзгерту..."
+
+#, fuzzy
+#~ msgid "Disconnect"
+#~ msgstr "Ба_йланысты үзу"
+
+#, fuzzy
+#~ msgid "Copy JID"
+#~ msgstr "Бөлме JID-і"
+
+#, fuzzy
+#~ msgid "Add to Roster…"
+#~ msgstr "Р_остерге қосу"
+
+#, fuzzy
+#~ msgid "Copy JID/Email"
+#~ msgstr "JID/Email _адресін көшіру"
+
+#, fuzzy
+#~ msgid "JID: <i>%s</i>"
+#~ msgstr "Jabber ID: <i>%s</i>"
+
+#~ msgid "Changing Subject"
+#~ msgstr "Тақырыпты өзгерту"
+
+#~ msgid "Please specify the new subject:"
+#~ msgstr "Жаңа тақырыпты көрсетіңіз:"
+
+#~ msgid "Room logging is now enabled"
+#~ msgstr "Бөлме тарихын сақтау енді қосулы"
+
+#~ msgid "Room logging is now disabled"
+#~ msgstr "Бөлме тарихын сақтау енді сөндірулі"
+
+#, fuzzy
+#~ msgid "You (%s) joined the room"
+#~ msgstr "%s чат бөлмесіне кірді"
+
+#~ msgid "Room logging is enabled"
+#~ msgstr "Бөлме тарихын сақтау қосулы"
+
+#, fuzzy
+#~ msgid "Unable to join groupchat"
+#~ msgstr "Чат бөлмесіне кіру мүмкін емес"
+
+#~ msgid "Groupchat Invitation"
+#~ msgstr "Топ чатына шақыру"
+
+#, fuzzy
+#~ msgid "%(jid)s has been invited in this room"
+#~ msgstr "%(nick)s бөлімнен шығарылған (%(reason)s)"
+
+#, fuzzy
+#~ msgid "JID is not a Groupchat"
+#~ msgstr "Бұл топтық чат"
+
+#~ msgid "Invalid JID"
+#~ msgstr "Қате JID"
+
+#~ msgid "A connection is not available"
+#~ msgstr "Байланыс қолжетерсіз"
+
+#, fuzzy
+#~ msgid "JID already in list"
+#~ msgstr "Jabber ID тізімде бар болып тұр"
+
+#, fuzzy
+#~ msgid "For the chosen encryption there is no encryption method available"
+#~ msgstr "Байланыс қолжетерсіз"
+
+#~ msgid "Removes contact from roster"
+#~ msgstr "Ростерден контактты өшіреді"
+
+#~ msgid "Not in roster"
+#~ msgstr "Ростерде емес"
+
+#, fuzzy
+#~ msgid "Contact signed in notification color."
+#~ msgstr "Оқиға_ны жүйелік сөреде көрсету"
+
+#, fuzzy
+#~ msgid "Contact signout notification color"
+#~ msgstr "Оқиға_ны жүйелік сөреде көрсету"
+
+#, fuzzy
+#~ msgid "File transfer request notification color."
+#~ msgstr "Файлдармен алмасуға сұраным"
+
+#, fuzzy
+#~ msgid "File transfer error notification color."
+#~ msgstr "Файлдармен алмасу тоқтатылды"
+
+#, fuzzy
+#~ msgid "File transfer complete or stopped notification color."
+#~ msgstr "Файлдармен алмасу аяқталған кезде қалқымалы хабарламаны көрсету"
+
+#, fuzzy
+#~ msgid "Groupchat invitation notification color"
+#~ msgstr "Топ чатына шақыру"
+
+#~ msgid "Add * and [n] in roster title?"
+#~ msgstr "Ростер атауына * мен [n] қосу керек пе?"
+
+#~ msgid "Hides the banner in two persons chat window"
+#~ msgstr "Екі адам чат терезесінде тақырыпты жасырады"
+
+#, fuzzy
+#~ msgid ""
+#~ "Show the confirm metacontacts creation dialog or not? Empty string means "
+#~ "never show the dialog."
+#~ msgstr ""
+#~ "Метаконтакттарды жасауды растау сұхбатын көрсету керек пе? Бос жол "
+#~ "терезені ешқашан көрсетпеуді белгілейді."
+
+#~ msgid "Space separated list of ssl errors to ignore."
+#~ msgstr "Елемеу үшін ssl қателер тізімі, бос аралықпен ажыратылсын."
+
+#~ msgid "Answer to receipt requests"
+#~ msgstr "Алу сұранымдарына жауап"
+
+#~ msgid "Sent receipt requests"
+#~ msgstr "Алу сұранымы жіберілді"
+
+#, fuzzy
+#~ msgid "Language for which misspelled words will be checked"
+#~ msgstr "Қай тілде емлені тексеру керек"
+
+#~ msgid "I'm eating, so leave me a message."
+#~ msgstr "Мен тамақ ішудемін, хабарламаңызды қалдырыңыз."
+
+#, fuzzy
+#~ msgid "from room %s"
+#~ msgstr " %s бөлмесінен"
+
+#~ msgid "Leave Groupchats"
+#~ msgstr "Топ чаттардан шығу"
+
+#, fuzzy
+#~ msgid "Auto Join"
+#~ msgstr "А_втокіру"
+
+#, fuzzy
+#~ msgid "Room"
+#~ msgstr "Бөлме:"
+
+#~ msgid "Jabber ID:"
+#~ msgstr "Jabber ID:"
+
+#~ msgid "Occupant Actions"
+#~ msgstr "Қатысушы әрекеттері"
+
+#~ msgid "_Add to Roster"
+#~ msgstr "Р_остерге қосу"
+
+#~ msgid "_Manage Room"
+#~ msgstr "_Бөлмені басқару"
+
+#~ msgid "Configure _Room..."
+#~ msgstr "_Бөлмені баптау..."
+
+#~ msgid "_Destroy Room"
+#~ msgstr "Бөлме_ні жою"
+
+#~ msgid "Jabber ID"
+#~ msgstr "Jabber ID"
+
+#, fuzzy
+#~ msgid "account"
+#~ msgstr "Тіркелгі"
+
+#, fuzzy
+#~ msgid "Roster"
+#~ msgstr "_Ростерді көрсету"
+
+#~ msgid "Show only in roster"
+#~ msgstr "Тек ростерде көрсету"
+
+#~ msgid "in _roster"
+#~ msgstr "р_остерде"
+
+#, fuzzy
+#~ msgid "Roster Appearance"
+#~ msgstr "<b>Ростердің сыртқы түрі</b>"
+
+#, fuzzy
+#~ msgid "Show chatstate in roster"
+#~ msgstr "Ростердегі контакттардың а_ватарларын көрсету"
+
+#~ msgid "_Add to Roster..."
+#~ msgstr "Р_остерге қосу..."
+
+#~ msgid "_Jabber ID:"
+#~ msgstr "_Jabber ID:"
+
+#, fuzzy
+#~ msgid "_Jabber ID"
+#~ msgstr "_Jabber ID:"
+
+#~ msgid "JabberID"
+#~ msgstr "JabberID"
+
+#, fuzzy
+#~ msgid "Show Roster"
+#~ msgstr "_Ростерді көрсету"
+
+#~ msgid "MUC server"
+#~ msgstr "MUC сервері"
+
+#~ msgid "Room Configuration"
+#~ msgstr "Бөлме баптаулары"
+
+#~ msgid "Join _Group Chat"
+#~ msgstr "Чат _бөлмесіне кіру..."
+
+#~ msgid "Toggle audio session"
+#~ msgstr "Аудио сессияны ауыстыру"
+
+#, fuzzy
+#~ msgid "Audio sessions are not available"
+#~ msgstr "Байланыс қолжетерсіз"
+
+#~ msgid "Conference"
+#~ msgstr "Конференция"
+
+#, fuzzy
+#~ msgid "_Manage Bookmarks…"
+#~ msgstr "Бетбелгілерді басқару"
+
+#~ msgid "Hide _Roster"
+#~ msgstr "Р_остерді жасыру"
+
+#~ msgid "Show _Roster"
+#~ msgstr "_Ростерді көрсету"
+
+#, fuzzy
+#~ msgid "Invalid Room"
+#~ msgstr "Қате бөлме"
+
+#~ msgid "Invalid room"
+#~ msgstr "Қате бөлме"
+
+#~ msgid "A GTK+ Jabber client"
+#~ msgstr "GTK+ Jabber қолданбасы"
+
+#~ msgid "Changing Nickname"
+#~ msgstr "Ник атын өзгерту"
+
+#~ msgid "Please specify the new nickname you want to use:"
+#~ msgstr "Жаңа ник атыңызды енгізіңіз:"
+
+#~ msgid "Bookmark already set"
+#~ msgstr "Бетбелгі орнатылған болып тұр"
+
+#, fuzzy
+#~ msgid "Group Chat '%s' is already in your bookmarks."
+#~ msgstr "\"%s\" чат бөлмесі бетбелгілеріңізде бар болып тұр."
+
+#~ msgid "Bookmark has been added successfully"
+#~ msgstr "Бетбелгі сәтті қосылды"
+
+#, fuzzy
+#~ msgid ""
+#~ "You can manage your bookmarks by clicking the Bookmarks menu item in your "
+#~ "contact list."
+#~ msgstr ""
+#~ "Өзіңіздің бетбелгілеріңізді ростердегі Әрекеттер мәзірінен басқара аласыз."
+
+#, fuzzy
+#~ msgid "The nickname contains invalid characters."
+#~ msgstr "Ник аты ішінде рұқсат етілмеген таңбалар бар."
+
+#, fuzzy
+#~ msgid "Bookmark Room"
+#~ msgstr "_Бөлмені бетбелгілерге қосу"
+
+#~ msgid "_Join New Group Chat"
+#~ msgstr "Жаңа _чат бөлмесіне кіру"
+
+#, fuzzy
+#~ msgid "_Create Group Chat"
+#~ msgstr "Топ чаттардан шығу"
+
+#, fuzzy
+#~ msgid "Name:"
+#~ msgstr "Аты:"
+
+#~ msgid "Description:"
+#~ msgstr "Анықтамасы:"
+
+#, fuzzy
+#~ msgid "Address:"
+#~ msgstr "_Адресі:"
+
+#, fuzzy
+#~ msgid "You can not start a new conversation unless you are connected."
+#~ msgstr "Байланыс орнатпасаңыз, топтық чатқа кіре алмайсыз."
+
+#, fuzzy
+#~ msgid "Occupants"
+#~ msgstr "Қатысушы әрекеттері"
+
+#, fuzzy
+#~ msgid "File transfer error"
+#~ msgstr "Файл алмасу қатесі"
+
+#, fuzzy
+#~ msgid "No Accounts available"
+#~ msgstr "Бірде-бір тіркелгі қолжетерсіз"
+
+#~ msgid "_Modify Account..."
+#~ msgstr "Тіркелгіні тү_зету..."
+
+#~ msgid "Boolean"
+#~ msgstr "Boolean"
+
+#~ msgid "Integer"
+#~ msgstr "Бүтін сан"
+
+#~ msgid "Text"
+#~ msgstr "Мәтін"
+
+#~ msgid "Value"
+#~ msgstr "Мәні"
+
+#~ msgid "Type"
+#~ msgstr "Түрі"
+
+#~ msgid "(None)"
+#~ msgstr "(Ешнәрсе)"
+
+#~ msgid "Hidden"
+#~ msgstr "Жасырын"
+
+#~ msgid "Manage Proxy Profiles"
+#~ msgstr "Прокси профайлдарын басқару"
+
+#, fuzzy
+#~ msgid "Properties"
+#~ msgstr "<b>Қасиеттер</b>"
+
+#, fuzzy
+#~ msgid "Proxy _Host"
+#~ msgstr "Прокси _хосты:"
+
+#, fuzzy
+#~ msgid "Proxy _Port"
+#~ msgstr "Прокс_и порты:"
+
+#, fuzzy
+#~ msgid "New Groupchat"
+#~ msgstr "Жаңа чат бөлмесі"
+
+#, fuzzy
+#~ msgid "New Contact"
+#~ msgstr "Жаңа контакт қосу"
+
 #~ msgid "%s GiB"
 #~ msgstr "%s Гиб"
 
@@ -11185,9 +12036,6 @@ msgstr "Плагин сәтсіз"
 #~ msgid "_Pause"
 #~ msgstr "_Аялдату"
 
-#~ msgid "Clean _up"
-#~ msgstr "Тазарт_у"
-
 #~ msgid "Remove file transfer from the list."
 #~ msgstr "Тізімнен файлдармен алмасуды өшіру."
 
@@ -11208,10 +12056,6 @@ msgstr "Плагин сәтсіз"
 #~ msgid "When a file transfer is complete show a popup notification"
 #~ msgstr "Файлдармен алмасу аяқталған кезде қалқымалы хабарламаны көрсету"
 
-#, fuzzy
-#~ msgid "Select Files"
-#~ msgstr "Тазалау"
-
 #~ msgid "From:"
 #~ msgstr "Кімнен:"
 
@@ -11635,9 +12479,6 @@ msgstr "Плагин сәтсіз"
 #~ msgid "You are invited to a groupchat"
 #~ msgstr "Сізді топтық чатқа шақырған"
 
-#~ msgid "Do you want to accept the invitation?"
-#~ msgstr "Шақыруды қабылдайсыз ба?"
-
 #~ msgid "_Start Chat"
 #~ msgstr "Чатты ба_стау"
 
@@ -11666,10 +12507,6 @@ msgstr "Плагин сәтсіз"
 #~ msgstr ""
 #~ "Ерекшеленген контактпен барлық сөйлесулер тарихын өшіруді қалайсыз ба?"
 
-#, fuzzy
-#~ msgid "This can not be undone."
-#~ msgstr "Қызмет табылмады"
-
 #~ msgid "<b>What do you want to do?</b>"
 #~ msgstr "<b>Сіз не істеуді қалайсыз?</b>"
 
@@ -11848,10 +12685,6 @@ msgstr "Плагин сәтсіз"
 #~ msgid "Nick"
 #~ msgstr "Ник"
 
-#, fuzzy
-#~ msgid "Banning…"
-#~ msgstr "Блоктау..."
-
 #~ msgid ""
 #~ "<b>Whom do you want to ban?</b>\n"
 #~ "\n"
@@ -11932,11 +12765,6 @@ msgstr "Плагин сәтсіз"
 #~ msgid "Filter:"
 #~ msgstr "Фильтр:"
 
-#~ msgid ""
-#~ "If checked, Gajim will display the mood of contacts in the roster window"
-#~ msgstr ""
-#~ "Белгіленген болса, Gajim ростердегі контакттар үшін көңіл-күйін көрсетеді"
-
 #~ msgid "<b>Chat Appearance</b>"
 #~ msgstr "<b>Чаттың сыртқы түрі</b>"
 
@@ -12201,10 +13029,6 @@ msgstr "Плагин сәтсіз"
 #~ msgstr "_Күй хабарламасы:"
 
 #, fuzzy
-#~ msgid "Group chat highlight"
-#~ msgstr "Сізді біреу бөлмеде еске алған"
-
-#, fuzzy
 #~ msgid "Your nickname"
 #~ msgstr "Ник атыңыз:"
 
@@ -12343,9 +13167,6 @@ msgstr "Плагин сәтсіз"
 #~ msgid "The passwords typed in both fields must be identical."
 #~ msgstr "Екі өрістегі де парольдер өзара сәйкес болуы тиіс."
 
-#~ msgid "Enter new password:"
-#~ msgstr "Жаңа парольді енгізіңіз:"
-
 #~ msgid "Enter it again for confirmation:"
 #~ msgstr "Растау үшін қайта енгізіңіз:"
 
@@ -12360,10 +13181,6 @@ msgstr "Плагин сәтсіз"
 #~ msgid "unsubscribe request from %s"
 #~ msgstr "%s жіберген жазылудан бас тарту сұранымы"
 
-#, fuzzy
-#~ msgid "Autojoin"
-#~ msgstr "А_втокіру"
-
 #~ msgid "&lt;empty&gt;"
 #~ msgstr "&lt;бос&gt;"
 
@@ -12474,9 +13291,6 @@ msgstr "Плагин сәтсіз"
 #~ msgid "Forward unread message then disconnect"
 #~ msgstr "Оқылмаған хабарламаны бағдарлау мен шығу"
 
-#~ msgid "AIM Address:"
-#~ msgstr "AIM адресі:"
-
 #~ msgid "MSN Address:"
 #~ msgstr "MSN адресі:"
 
@@ -12527,9 +13341,6 @@ msgstr "Плагин сәтсіз"
 #~ msgid "Session negotiation cancelled"
 #~ msgstr "Сессияны бастаудан бас тартылды"
 
-#~ msgid "This session WILL be archived on server"
-#~ msgstr "Бұл сессия серверде САҚТАЛАДЫ"
-
 #~ msgid "This session WILL NOT be archived on server"
 #~ msgstr "Сессия тарихы серверде АРХИВТЕЛМЕЙДІ"
 
@@ -12859,9 +13670,6 @@ msgstr "Плагин сәтсіз"
 #~ msgid "Server:"
 #~ msgstr "Сервер:"
 
-#~ msgid "Password:"
-#~ msgstr "Пароль:"
-
 #~ msgid "Join this room _automatically when I connect"
 #~ msgstr "Желіге қосылғанда, осы бөлмеге _автокіру"
 
@@ -13203,9 +14011,6 @@ msgstr "Плагин сәтсіз"
 #~ msgid "_Edit Personal Information..."
 #~ msgstr "Ж_еке ақпаратты түзету..."
 
-#~ msgid "Information about you, as stored in the server"
-#~ msgstr "Сіз туралы ақпарат, серверде сақталған түрде"
-
 #~ msgid "<b>Personal Information</b>"
 #~ msgstr "<b>Жеке ақпарат</b>"
 
@@ -13280,9 +14085,6 @@ msgstr "Плагин сәтсіз"
 #~ msgid "Your server can't save your personal information."
 #~ msgstr "Серверіңіз сіздің жеке ақпаратыңызды сақтай алмайды."
 
-#~ msgid "Account Local already exists."
-#~ msgstr "Local тіркелгісі бар болыр тұр."
-
 #~ msgid "Please rename or remove it before enabling link-local messaging."
 #~ msgstr ""
 #~ "Link-local хабарламаларды іске қосу алдында оның атын ауыстырыңыз не "
@@ -13434,10 +14236,6 @@ msgstr "Плагин сәтсіз"
 #~ msgid "The following message was NOT encrypted"
 #~ msgstr "Келесі хабарлама шифрленген ЕМЕС болған"
 
-#, fuzzy
-#~ msgid "Encryption used for this contact."
-#~ msgstr "Бұл тіркелгі үшін ESessions шифрлеуді іске қосу."
-
 #~ msgid "Toggle Open_PGP Encryption"
 #~ msgstr "OpenPGP _шифрлеуін қосу/сөндіру"
 
@@ -13516,10 +14314,6 @@ msgstr "Плагин сәтсіз"
 #~ msgid "Contact's identity verified"
 #~ msgstr "Контакт шынайылығы расталған"
 
-#, fuzzy
-#~ msgid "Verify again…"
-#~ msgstr "Қайтадан растау..."
-
 #~ msgid ""
 #~ "To be certain that <b>only</b> the expected person can read your messages "
 #~ "or send you messages, you need to verify their identity by clicking the "
@@ -13649,9 +14443,6 @@ msgstr "Плагин сәтсіз"
 #~ msgid "Add _Contact..."
 #~ msgstr "_Контакт қосу..."
 
-#~ msgid "_Accounts"
-#~ msgstr "_Тіркелгілер"
-
 #~ msgid "Profile, A_vatar"
 #~ msgstr "Профайл, а_ватар"
 
@@ -13909,12 +14700,6 @@ msgstr "Плагин сәтсіз"
 #~ msgid "Activity: "
 #~ msgstr "Әрекеті:"
 
-#~ msgid "Join _Group Chat..."
-#~ msgstr "Чат _бөлмесіне кіру..."
-
-#~ msgid "_Modify Account"
-#~ msgstr "Тіркелгіні тү_зету"
-
 #~ msgid "Check on startup if Gajim is the _default Jabber client"
 #~ msgstr "Gajim әр рет қосылғанда н_егізгі Jabber клиенті ма, соны тексеру"
 
@@ -13941,9 +14726,6 @@ msgstr "Плагин сәтсіз"
 #~ msgid "The path to the client certificate and key in PKCS#12 format"
 #~ msgstr "PKCS#12 пішіміндегі клиент сертификатына дейінгі жол"
 
-#~ msgid " a window/tab opened with that contact "
-#~ msgstr " бұл контактпен ашылған терезе/бет"
-
 #~ msgid "<b>Actions</b>"
 #~ msgstr "<b>Әрекеттер</b>"
 
diff --git a/po/lt.po b/po/lt.po
index 699e82603..af04d3fd1 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: 2019-07-02 02:06+0000\n"
+"POT-Creation-Date: 2019-08-11 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,69 +17,69 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: gajim/chat_control_base.py:550
+#: gajim/chat_control_base.py:557
 msgid "_Undo"
 msgstr ""
 
-#: gajim/chat_control_base.py:558 gajim/conversation_textview.py:529
+#: gajim/chat_control_base.py:565 gajim/conversation_textview.py:529
 msgid "_Clear"
 msgstr ""
 
-#: gajim/chat_control_base.py:563
+#: gajim/chat_control_base.py:570
 msgid "Paste as quote"
 msgstr ""
 
-#: gajim/chat_control_base.py:613
+#: gajim/chat_control_base.py:620
 #, fuzzy
 msgid "Paste Image"
 msgstr "Choose Image"
 
-#: gajim/chat_control_base.py:614
+#: gajim/chat_control_base.py:621
 msgid "You are trying to paste an image"
 msgstr ""
 
-#: gajim/chat_control_base.py:615
+#: gajim/chat_control_base.py:622
 msgid ""
 "Are you sure you want to paste your clipboard's image into the chat window?"
 msgstr ""
 
-#: gajim/chat_control_base.py:617 gajim/groupchat_control.py:2310
-#: gajim/roster_window.py:2848 gajim/roster_window.py:4167
-#: gajim/message_window.py:252 gajim/gtk/dialogs.py:418
+#: gajim/chat_control_base.py:624 gajim/groupchat_control.py:2218
+#: gajim/roster_window.py:2841 gajim/roster_window.py:4118
+#: gajim/message_window.py:359 gajim/gtk/dialogs.py:330
 #, fuzzy
 msgid "_Do not ask me again"
 msgstr "Do _not ask me again"
 
-#: gajim/chat_control_base.py:620
+#: gajim/chat_control_base.py:627
 msgid "_Paste"
 msgstr ""
 
-#: gajim/chat_control_base.py:1162 gajim/gtk/accounts.py:351
+#: gajim/chat_control_base.py:1169 gajim/gtk/accounts.py:354
 #, fuzzy
 msgid "Privacy"
 msgstr "Privatus sąrašas"
 
-#: gajim/chat_control_base.py:1163
+#: gajim/chat_control_base.py:1170
 #, fuzzy
 msgid "Warning"
 msgstr "Saved in: %s"
 
-#: gajim/chat_control_base.py:1164
+#: gajim/chat_control_base.py:1171
 #, python-format
 msgid "If you send a file to <b>%s</b>, your real JID will be revealed."
 msgstr ""
 
-#: gajim/chat_control_base.py:1169
+#: gajim/chat_control_base.py:1176
 #, fuzzy
 msgid "Continue"
 msgstr "_Tęsti"
 
-#: gajim/gtkgui_helpers.py:163 gajim/gtk/filetransfer.py:393
+#: gajim/gtkgui_helpers.py:163 gajim/gtk/filetransfer.py:398
 #, fuzzy, python-format
 msgid "Cannot overwrite existing file '%s'"
 msgstr "Cannot overwrite existing file \"%s\""
 
-#: gajim/gtkgui_helpers.py:164 gajim/gtk/filetransfer.py:394
+#: gajim/gtkgui_helpers.py:164 gajim/gtk/filetransfer.py:399
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
@@ -173,385 +173,396 @@ msgstr ""
 msgid " resource with priority "
 msgstr " resource with priority "
 
-#: gajim/gui_menu_builder.py:96
-msgid "_New Group Chat"
-msgstr ""
-
-#: gajim/gui_menu_builder.py:289 gajim/gui_menu_builder.py:380
-#: gajim/chat_control.py:303 gajim/roster_window.py:786
-#: gajim/roster_window.py:1719 gajim/roster_window.py:1721
-#: gajim/roster_window.py:2030 gajim/roster_window.py:3336
-#: gajim/roster_window.py:3369 gajim/gui_interface.py:413
-#: gajim/common/contacts.py:206 gajim/common/contacts.py:343
-#: gajim/common/helpers.py:83 gajim/common/helpers.py:311
-#: gajim/gtk/add_contact.py:319 gajim/gtk/subscription_request.py:70
-#: gajim/gtk/subscription_request.py:99 gajim/gtk/roster_item_exchange.py:112
-msgid "Not in Roster"
-msgstr "Ne Sąraše"
+#: gajim/gui_menu_builder.py:251 gajim/gui_menu_builder.py:342
+#: gajim/chat_control.py:305 gajim/roster_window.py:783
+#: gajim/roster_window.py:1716 gajim/roster_window.py:1718
+#: gajim/roster_window.py:2027 gajim/roster_window.py:3292
+#: gajim/roster_window.py:3325 gajim/gui_interface.py:396
+#: gajim/common/contacts.py:222 gajim/common/contacts.py:359
+#: gajim/common/contacts.py:471 gajim/common/helpers.py:86
+#: gajim/common/helpers.py:317 gajim/gtk/add_contact.py:319
+#: gajim/gtk/subscription_request.py:70 gajim/gtk/subscription_request.py:99
+#: gajim/gtk/roster_item_exchange.py:112
+#, fuzzy
+msgid "Not in contact list"
+msgstr "Rodyti _Atsijungusius Asmenis"
 
-#: gajim/gui_menu_builder.py:393
-msgid "I would like to add you to my roster"
-msgstr ""
+#: gajim/gui_menu_builder.py:355
+#, 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:471
+#: gajim/gui_menu_builder.py:433
 #, fuzzy
 msgid "Send Single _Message…"
 msgstr "Siųsti Vieną Ži_nutę"
 
-#: gajim/gui_menu_builder.py:486
+#: gajim/gui_menu_builder.py:448
 #, fuzzy
 msgid "E_xecute Command…"
 msgstr "_Vykdyti komandą"
 
-#: gajim/gui_menu_builder.py:494
+#: gajim/gui_menu_builder.py:456
 msgid "_Manage Transport"
 msgstr "_Valdyti Pernašą"
 
-#: gajim/gui_menu_builder.py:500
+#: gajim/gui_menu_builder.py:462
 msgid "_Modify Transport"
 msgstr "_Keisti Pernašą"
 
-#: gajim/gui_menu_builder.py:507 gajim/roster_window.py:5046
+#: gajim/gui_menu_builder.py:469 gajim/roster_window.py:4985
 #, fuzzy
 msgid "_Rename…"
 msgstr "_Pervadinti"
 
-#: gajim/gui_menu_builder.py:518 gajim/roster_window.py:5062
-#: gajim/roster_window.py:5177 gajim/data/gui/blocked_contacts_window.ui:52
+#: gajim/gui_menu_builder.py:480 gajim/roster_window.py:5001
+#: gajim/roster_window.py:5116 gajim/data/gui/blocked_contacts_window.ui:52
 #: gajim/data/gui/gc_occupants_menu.ui:148
 #: gajim/data/gui/contact_context_menu.ui:143
 msgid "_Unblock"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:521 gajim/roster_window.py:5067
-#: gajim/roster_window.py:5181 gajim/data/gui/gc_occupants_menu.ui:140
+#: gajim/gui_menu_builder.py:483 gajim/roster_window.py:5006
+#: gajim/roster_window.py:5120 gajim/data/gui/gc_occupants_menu.ui:140
 #: gajim/data/gui/contact_context_menu.ui:151
 msgid "_Block"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:529 gajim/roster_window.py:5074
+#: gajim/gui_menu_builder.py:491 gajim/roster_window.py:5013
 #: gajim/data/gui/contact_context_menu.ui:181
 msgid "Remo_ve"
 msgstr "_Trinti"
 
-#: gajim/gui_menu_builder.py:539 gajim/data/gui/contact_context_menu.ui:198
+#: gajim/gui_menu_builder.py:501 gajim/data/gui/contact_context_menu.ui:198
 msgid "_Information"
 msgstr "_Informacija"
 
-#: gajim/gui_menu_builder.py:552
+#: gajim/gui_menu_builder.py:514
 #, fuzzy
 msgid "Save _As"
 msgstr "Turiu "
 
-#: gajim/gui_menu_builder.py:564 gajim/groupchat_control.py:501
-#: gajim/chat_control.py:340
+#: gajim/gui_menu_builder.py:526 gajim/groupchat_control.py:507
+#: gajim/chat_control.py:342
 #, fuzzy
 msgid "Send File…"
 msgstr "Siųsti _Failą"
 
-#: gajim/gui_menu_builder.py:565
+#: gajim/gui_menu_builder.py:527
 #, fuzzy
 msgid "Upload File…"
 msgstr "Save File as..."
 
-#: gajim/gui_menu_builder.py:566
+#: gajim/gui_menu_builder.py:528
 #, fuzzy
 msgid "Send File Directly…"
 msgstr "Save File as..."
 
-#: gajim/gui_menu_builder.py:568 gajim/gui_menu_builder.py:632
+#: gajim/gui_menu_builder.py:530 gajim/gui_menu_builder.py:596
 #, fuzzy
 msgid "Send Chatstate"
 msgstr "Last status: %s"
 
-#: gajim/gui_menu_builder.py:569
+#: gajim/gui_menu_builder.py:531
 #, fuzzy
 msgid "Invite Contacts"
 msgstr "Kviesti Kontaktus"
 
-#: gajim/gui_menu_builder.py:570
+#: gajim/gui_menu_builder.py:532
 #, fuzzy
-msgid "Add to Roster"
-msgstr "Įtr_aukti į kontaktų sąrašą"
+msgid "Add to Contact List"
+msgstr "_Įtraukti asmenį..."
 
-#: gajim/gui_menu_builder.py:571
-msgid "Audio Session"
-msgstr ""
+#: gajim/gui_menu_builder.py:533
+#, fuzzy
+msgid "Voice Chat"
+msgstr "File Transfer Request"
 
-#: gajim/gui_menu_builder.py:572
-msgid "Video Session"
-msgstr ""
+#: gajim/gui_menu_builder.py:534
+#, fuzzy
+msgid "Video Chat"
+msgstr "Private Chat"
 
-#: gajim/gui_menu_builder.py:573
+#: gajim/gui_menu_builder.py:535 gajim/gui_menu_builder.py:582
 #, fuzzy
 msgid "Information"
 msgstr "_Informacija"
 
-#: gajim/gui_menu_builder.py:574 gajim/gui_menu_builder.py:639
+#: gajim/gui_menu_builder.py:536 gajim/gui_menu_builder.py:602
 #: gajim/data/gui/application_menu.ui:37
 #, fuzzy
 msgid "History"
 msgstr "_Istorija"
 
-#: gajim/gui_menu_builder.py:580 gajim/gui_menu_builder.py:687
+#: gajim/gui_menu_builder.py:542 gajim/gui_menu_builder.py:650
 #: gajim/data/gui/preferences_window.ui:1823
 msgid "Disabled"
 msgstr "Disabled"
 
-#: gajim/gui_menu_builder.py:581 gajim/gui_menu_builder.py:688
+#: gajim/gui_menu_builder.py:543 gajim/gui_menu_builder.py:651
 #, fuzzy
 msgid "Composing only"
 msgstr "Kuriama"
 
-#: gajim/gui_menu_builder.py:582 gajim/gui_menu_builder.py:689
+#: gajim/gui_menu_builder.py:544 gajim/gui_menu_builder.py:652
 #, fuzzy
 msgid "All chat states"
 msgstr "Visos būklės"
 
-#: gajim/gui_menu_builder.py:620
+#: gajim/gui_menu_builder.py:583
 #, fuzzy
-msgid "Manage Room"
-msgstr "_Valdyti Kambarį"
+msgid "Manage Group Chat"
+msgstr "Leave Groupchats"
 
-#: gajim/gui_menu_builder.py:621
+#: gajim/gui_menu_builder.py:584 gajim/data/gui/groupchat_control.ui:649
 #, fuzzy
 msgid "Change Subject"
 msgstr "Keisti _Temą..."
 
-#: gajim/gui_menu_builder.py:622
+#: gajim/gui_menu_builder.py:585
 #, fuzzy
-msgid "Configure Room"
-msgstr "Keisti Kambario Nustatymus..."
+msgid "Configure Group Chat"
+msgstr "Leave Groupchats"
 
-#: gajim/gui_menu_builder.py:623
+#: gajim/gui_menu_builder.py:586
 #, fuzzy
 msgid "Upload Avatar…"
 msgstr "Choose Image"
 
-#: gajim/gui_menu_builder.py:624
-msgid "Destroy Room"
-msgstr ""
+#: gajim/gui_menu_builder.py:587
+#, fuzzy
+msgid "Destroy Group Chat"
+msgstr "New Group Chat"
 
-#: gajim/gui_menu_builder.py:626 gajim/data/gui/preferences_window.ui:790
+#: gajim/gui_menu_builder.py:589 gajim/data/gui/preferences_window.ui:790
 #, fuzzy
 msgid "Chat Settings"
 msgstr "Registracija nesėkminga"
 
-#: gajim/gui_menu_builder.py:627
+#: gajim/gui_menu_builder.py:590
 msgid "Show join/leave"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:628
+#: gajim/gui_menu_builder.py:591
 #, fuzzy
 msgid "Show status changes"
 msgstr "_Registruoti asmenų būklės pakitimus"
 
-#: gajim/gui_menu_builder.py:629 gajim/data/gui/gc_control_popup_menu.ui:72
+#: gajim/gui_menu_builder.py:592 gajim/data/gui/gc_control_popup_menu.ui:72
 #, fuzzy
 msgid "Notify on all messages"
 msgstr "Nustatytos žinutės:"
 
-#: gajim/gui_menu_builder.py:630
+#: gajim/gui_menu_builder.py:593
 msgid "Minimize on close"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:631
-msgid "Minimize on autojoin"
+#: gajim/gui_menu_builder.py:595
+msgid "Minimize when joining automatically"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:634
+#: gajim/gui_menu_builder.py:598
 msgid "Sync Threshold"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:635
+#: gajim/gui_menu_builder.py:599
 #, fuzzy
-msgid "Change Nick"
+msgid "Change Nickname"
 msgstr "Keisti _Slapyvardį..."
 
-#: gajim/gui_menu_builder.py:636
-#, fuzzy
-msgid "Bookmark Room"
-msgstr "Žy_mės"
-
-#: gajim/gui_menu_builder.py:637
+#: gajim/gui_menu_builder.py:600
 #, fuzzy
 msgid "Request Voice"
 msgstr "_Balsas"
 
-#: gajim/gui_menu_builder.py:638 gajim/roster_window.py:5246
+#: gajim/gui_menu_builder.py:601 gajim/roster_window.py:5185
 #, fuzzy
 msgid "Execute command"
 msgstr "_Vykdyti komandą"
 
-#: gajim/gui_menu_builder.py:640
-#, fuzzy
-msgid "Disconnect"
-msgstr "Atsijungta"
+#: gajim/gui_menu_builder.py:603
+msgid "Leave"
+msgstr ""
 
-#: gajim/gui_menu_builder.py:678 gajim/gtk/preferences.py:156
+#: gajim/gui_menu_builder.py:641 gajim/gtk/preferences.py:155
 msgid "No threshold"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:680 gajim/gtk/preferences.py:158
+#: gajim/gui_menu_builder.py:643 gajim/gtk/preferences.py:157
 #, 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:709 gajim/gui_menu_builder.py:747
-#: gajim/gtk/join_groupchat.py:43
-msgid "Join Group Chat"
-msgstr "Prisijungti prie pokalbio grupėje"
-
-#: gajim/gui_menu_builder.py:746
+#: gajim/gui_menu_builder.py:672
 #, fuzzy
 msgid "Add Contact…"
 msgstr "_Įtraukti asmenį..."
 
-#: gajim/gui_menu_builder.py:748 gajim/gtk/profile.py:52
-#: gajim/gtk/accounts.py:770 gajim/gtk/accounts.py:808
+#: gajim/gui_menu_builder.py:673 gajim/gtk/profile.py:52
+#: gajim/gtk/accounts.py:773 gajim/gtk/accounts.py:811
 #, fuzzy
 msgid "Profile"
 msgstr "file"
 
-#: gajim/gui_menu_builder.py:749
+#: gajim/gui_menu_builder.py:674
+#, fuzzy
+msgid "Send Single Message…"
+msgstr "Siųsti Vieną Ži_nutę"
+
+#: gajim/gui_menu_builder.py:675
 #, fuzzy
 msgid "Discover Services"
 msgstr "_Ieškoti Paslaugų"
 
-#: gajim/gui_menu_builder.py:750
+#: gajim/gui_menu_builder.py:676 gajim/gtk/server_info.py:36
 #, fuzzy
-msgid "Send Single Message…"
-msgstr "Siųsti Vieną Ži_nutę"
+msgid "Server Info"
+msgstr "Server"
 
-#: gajim/gui_menu_builder.py:751 gajim/data/gui/preferences_window.ui:2741
+#: gajim/gui_menu_builder.py:677 gajim/data/gui/preferences_window.ui:2741
 msgid "Advanced"
 msgstr "Išplėstinis"
 
-#: gajim/gui_menu_builder.py:752 gajim/gtk/mam_preferences.py:88
+#: gajim/gui_menu_builder.py:678 gajim/gtk/mam_preferences.py:88
 #, fuzzy
 msgid "Archiving Preferences"
 msgstr "_Nustatymai"
 
-#: gajim/gui_menu_builder.py:753
+#: gajim/gui_menu_builder.py:679
 #, fuzzy
 msgid "Blocking List"
 msgstr "Ban List"
 
-#: gajim/gui_menu_builder.py:754 gajim/gtk/history_sync.py:108
+#: gajim/gui_menu_builder.py:680
+#, fuzzy
+msgid "Bookmarks"
+msgstr "Žy_mės"
+
+#: gajim/gui_menu_builder.py:681
+#, fuzzy
+msgid "PEP Configuration"
+msgstr "Kambario nustatymai"
+
+#: gajim/gui_menu_builder.py:682 gajim/gtk/history_sync.py:108
 #: gajim/gtk/history_sync.py:186
 #, fuzzy
 msgid "Synchronise History"
 msgstr "Sinchronizuoti kontaktus"
 
-#: gajim/gui_menu_builder.py:755 gajim/gtk/privacy_list.py:427
+#: gajim/gui_menu_builder.py:683 gajim/gtk/privacy_list.py:427
 msgid "Privacy Lists"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:756 gajim/gtk/server_info.py:36
-#, fuzzy
-msgid "Server Info"
-msgstr "Server"
-
-#: gajim/gui_menu_builder.py:757 gajim/gui_menu_builder.py:768
+#: gajim/gui_menu_builder.py:685 gajim/gui_menu_builder.py:696
 #: gajim/data/gui/xml_console_window.ui:77
 msgid "XML Console"
 msgstr "XML Console"
 
-#: gajim/gui_menu_builder.py:759 gajim/data/gui/groupchat_config.ui:36
+#: gajim/gui_menu_builder.py:687 gajim/data/gui/groupchat_config.ui:36
 #, fuzzy
 msgid "Admin"
 msgstr "_Adminas"
 
-#: gajim/gui_menu_builder.py:760
+#: gajim/gui_menu_builder.py:688
 #, fuzzy
 msgid "Send Server Message…"
 msgstr "_Siųsti Žinutę Serveriui..."
 
-#: gajim/gui_menu_builder.py:761
+#: gajim/gui_menu_builder.py:689
 #, fuzzy
 msgid "Set MOTD…"
 msgstr "Nustatyti MOTD..."
 
-#: gajim/gui_menu_builder.py:762
+#: gajim/gui_menu_builder.py:690
 #, fuzzy
 msgid "Update MOTD…"
 msgstr "Atnaujinti MOTD..."
 
-#: gajim/gui_menu_builder.py:763
+#: gajim/gui_menu_builder.py:691
 #, fuzzy
 msgid "Delete MOTD…"
 msgstr "Trinti MOTD"
 
-#: gajim/gui_menu_builder.py:812
+#: gajim/gui_menu_builder.py:736
 #, fuzzy
-msgid "No Accounts available"
-msgstr "No such account available"
+msgid "_Add Account…"
+msgstr "_Įtraukti asmenį..."
 
-#: gajim/gui_menu_builder.py:823 gajim/data/gui/application_menu.ui:5
-#: gajim/data/gui/application_menu.ui:71 gajim/data/gui/shortcuts_window.ui:182
-#: gajim/gtk/accounts.py:58
+#: gajim/gui_menu_builder.py:742
+#, fuzzy
+msgid "_Modify Accounts…"
+msgstr "_Keisti Prieigą"
+
+#: gajim/gui_menu_builder.py:751 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:755 gajim/data/gui/application_menu.ui:5
+#: gajim/data/gui/shortcuts_window.ui:182 gajim/gtk/accounts.py:57
 msgid "Accounts"
 msgstr "Prieiga"
 
-#: gajim/gui_menu_builder.py:881 gajim/gui_menu_builder.py:886
+#: gajim/gui_menu_builder.py:784 gajim/gui_menu_builder.py:789
 #, fuzzy
-msgid "Copy JID"
-msgstr "Kambario JID"
+msgid "Copy XMPP Address"
+msgstr "_Kopijuoti JID/El. pašto adresą"
 
-#: gajim/gui_menu_builder.py:882 gajim/gui_menu_builder.py:914
+#: gajim/gui_menu_builder.py:785 gajim/gui_menu_builder.py:817
 #, fuzzy
 msgid "Join Groupchat"
 msgstr "Prisijungti prie pokalbio grupėje"
 
-#: gajim/gui_menu_builder.py:887 gajim/gui_menu_builder.py:913
-#: gajim/data/gui/application_menu.ui:76
+#: gajim/gui_menu_builder.py:790 gajim/gui_menu_builder.py:816
+#: gajim/data/gui/application_menu.ui:71
 #: gajim/data/gui/subscription_request_window.ui:106
 msgid "Start Chat"
 msgstr "Start Chat"
 
-#: gajim/gui_menu_builder.py:888 gajim/gui_menu_builder.py:915
+#: gajim/gui_menu_builder.py:791 gajim/gui_menu_builder.py:818
 #, fuzzy
-msgid "Add to Roster…"
-msgstr "Įtr_aukti į kontaktų sąrašą"
+msgid "Add to Contact List…"
+msgstr "_Įtraukti asmenį..."
 
-#: gajim/gui_menu_builder.py:893
+#: gajim/gui_menu_builder.py:796
 #, fuzzy
 msgid "Copy Link Location"
 msgstr "_Kopijuoti nuorodos adresą"
 
-#: gajim/gui_menu_builder.py:894
+#: gajim/gui_menu_builder.py:797
 #, fuzzy
 msgid "Open Link in Browser"
 msgstr "_Atverti nuorodą naršyklėje"
 
-#: gajim/gui_menu_builder.py:899
+#: gajim/gui_menu_builder.py:802
 #, fuzzy
 msgid "Copy Email Address"
 msgstr "_Kopijuoti JID/El. pašto adresą"
 
-#: gajim/gui_menu_builder.py:900 gajim/gui_menu_builder.py:912
+#: gajim/gui_menu_builder.py:803 gajim/gui_menu_builder.py:815
 #, fuzzy
 msgid "Open Email Composer"
 msgstr "_Atidaryti el. pašto programą"
 
-#: gajim/gui_menu_builder.py:905
+#: gajim/gui_menu_builder.py:808
 #, fuzzy
 msgid "Copy Location"
 msgstr "_Kopijuoti nuorodos adresą"
 
-#: gajim/gui_menu_builder.py:906
+#: gajim/gui_menu_builder.py:809
 #, fuzzy
 msgid "Show Location"
 msgstr "Padėtis:"
 
-#: gajim/gui_menu_builder.py:911
+#: gajim/gui_menu_builder.py:814
 #, fuzzy
-msgid "Copy JID/Email"
+msgid "Copy XMPP Address/Email"
 msgstr "_Kopijuoti JID/El. pašto adresą"
 
-#: gajim/gui_menu_builder.py:945
+#: gajim/gui_menu_builder.py:852
 #, fuzzy
 msgid "Copy"
 msgstr "Kambario JID"
@@ -574,44 +585,55 @@ msgstr ""
 msgid "Choose folder for logfile"
 msgstr ""
 
-#: gajim/history_manager.py:107
+#: gajim/history_manager.py:106
 msgid "Cannot find history logs database"
 msgstr ""
 
-#: gajim/history_manager.py:108
+#: gajim/history_manager.py:107
 #, fuzzy, python-format
 msgid "%s does not exist."
 msgstr "Tokios grupės pokalbis %s neegzistuoja."
 
-#: gajim/history_manager.py:141 gajim/history_manager.py:195
-#: gajim/gtk/discovery.py:829 gajim/gtk/roster_item_exchange.py:80
-msgid "JID"
-msgstr "JID"
+#: gajim/history_manager.py:140 gajim/history_manager.py:194
+#: 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:30
+#: gajim/gtk/accounts.py:804
+#, fuzzy
+msgid "XMPP Address"
+msgstr "AIM Address:"
 
-#: gajim/history_manager.py:154 gajim/history_manager.py:202
+#: gajim/history_manager.py:153 gajim/history_manager.py:201
 #: gajim/data/gui/history_window.ui:89 gajim/gtk/history.py:108
 msgid "Date"
 msgstr ""
 
-#: gajim/history_manager.py:161 gajim/history_manager.py:225
+#: gajim/history_manager.py:160 gajim/history_manager.py:224
 #: gajim/data/gui/join_groupchat_window.ui:208
 #: gajim/data/gui/profile_window.ui:214
 #: gajim/data/gui/vcard_information_window.ui:443
+#: gajim/data/gui/bookmarks.ui:140
 msgid "Nickname"
 msgstr ""
 
-#: gajim/history_manager.py:172 gajim/history_manager.py:211
+#: gajim/history_manager.py:171 gajim/history_manager.py:210
 #: gajim/data/gui/preferences_window.ui:1344
 #: gajim/data/gui/single_message_window.ui:275 gajim/gtk/history.py:117
 msgid "Message"
 msgstr ""
 
-#: gajim/history_manager.py:180 gajim/history_manager.py:218
+#: gajim/history_manager.py:179 gajim/history_manager.py:217
 #: gajim/data/gui/groups_post_window.ui:49
 #: gajim/data/gui/single_message_window.ui:214
 msgid "Subject"
 msgstr "Tema"
 
+#: gajim/history_manager.py:247
+msgid "Database Cleanup"
+msgstr ""
+
 #: gajim/history_manager.py:248
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
@@ -620,55 +642,53 @@ msgstr ""
 
 #: gajim/history_manager.py:250
 msgid ""
-"Normally allocated database size will not be freed, it will just become "
-"reusable. If you really want to reduce database filesize, click YES, else "
-"click NO.\n"
-"\n"
-"In case you click YES, please wait…"
+"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
-msgid "Database Cleanup"
-msgstr ""
+#, fuzzy
+msgid "_Cleanup"
+msgstr "_Išvalyti"
 
-#: gajim/history_manager.py:519 gajim/gtk/filetransfer.py:238
-#: gajim/gtk/filetransfer.py:248
+#: gajim/history_manager.py:518 gajim/gtk/filetransfer.py:237
+#: gajim/gtk/filetransfer.py:247
 msgid "You"
 msgstr "You"
 
-#: gajim/history_manager.py:531
+#: gajim/history_manager.py:530
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr ""
 
-#: gajim/history_manager.py:568 gajim/history_manager.py:607
-#: gajim/gtk/dialogs.py:58 gajim/gtk/themes.py:319
+#: gajim/history_manager.py:567 gajim/history_manager.py:606
+#: gajim/gtk/dialogs.py:57 gajim/gtk/themes.py:319
 #: gajim/gtk/roster_item_exchange.py:75 gajim/gtk/roster_item_exchange.py:185
 msgid "Delete"
 msgstr "Trinti"
 
-#: gajim/history_manager.py:569
+#: gajim/history_manager.py:568
 #, fuzzy
 msgid "Delete Conversation"
 msgid_plural "Delete Conversations"
 msgstr[0] "Atšaukti sutikimą"
 msgstr[1] "Atšaukti sutikimą"
 
-#: gajim/history_manager.py:570
+#: gajim/history_manager.py:569
 #, 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:608
+#: gajim/history_manager.py:607
 #, fuzzy
 msgid "Delete Message"
 msgid_plural "Delete Messages"
 msgstr[0] "Žinutė pagal nutylėjimą"
 msgstr[1] "Žinutė pagal nutylėjimą"
 
-#: gajim/history_manager.py:609
+#: gajim/history_manager.py:608
 msgid "Do you want to permanently delete this message"
 msgid_plural "Do you want to permanently delete these messages"
 msgstr[0] ""
@@ -680,15 +700,15 @@ msgid "Contact name: <i>%s</i>"
 msgstr "Contact name: <i>%s</i>"
 
 #: gajim/dialogs.py:84
-#, fuzzy, python-format
-msgid "JID: <i>%s</i>"
-msgstr "Jabber ID: <i>%s</i>"
+#, python-format
+msgid "XMPP Address: <i>%s</i>"
+msgstr ""
 
-#: gajim/dialogs.py:115 gajim/dialogs.py:128 gajim/roster_window.py:2901
-#: gajim/roster_window.py:3833 gajim/roster_window.py:5084
-#: gajim/common/contacts.py:157 gajim/common/contacts.py:190
+#: gajim/dialogs.py:115 gajim/dialogs.py:128 gajim/roster_window.py:2894
+#: gajim/roster_window.py:3784 gajim/roster_window.py:5023
+#: gajim/common/contacts.py:157 gajim/common/contacts.py:206
 #: gajim/data/gui/preferences_window.ui:558
-#: gajim/data/gui/shortcuts_window.ui:177 gajim/gtk/accounts.py:349
+#: gajim/data/gui/shortcuts_window.ui:177 gajim/gtk/accounts.py:352
 msgid "General"
 msgstr "Bendros parinktys"
 
@@ -732,7 +752,7 @@ msgstr ""
 msgid "Preset name is already in use. Do you want to overwrite this preset?"
 msgstr ""
 
-#: gajim/dialogs.py:703
+#: gajim/dialogs.py:703 gajim/plugins/gui.py:292
 msgid "_Overwrite"
 msgstr ""
 
@@ -744,9 +764,7 @@ msgstr "Save as Preset Status Message"
 msgid "Please type a name for this status message"
 msgstr "Please type a name for this status message"
 
-#: gajim/dialogs.py:740 gajim/gui_interface.py:1441 gajim/dialog_messages.py:31
-#: gajim/gtk/discovery.py:518 gajim/gtk/profile.py:323
-#: gajim/gtk/join_groupchat.py:234
+#: gajim/dialogs.py:740 gajim/gtk/discovery.py:517 gajim/gtk/profile.py:323
 msgid "You are not connected to the server"
 msgstr "You are not connected to the server"
 
@@ -754,9 +772,11 @@ msgstr "You are not connected to the server"
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr ""
 
-#: gajim/dialogs.py:752 gajim/dialogs.py:823 gajim/gtk/discovery.py:822
-#: gajim/gtk/discovery.py:1648 gajim/gtk/discovery.py:1941
-#: gajim/gtk/history.py:99 gajim/gtk/roster_item_exchange.py:83
+#: gajim/dialogs.py:752 gajim/dialogs.py:823
+#: gajim/data/gui/groupchat_info_scrolled.ui:16 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/gtk/roster_item_exchange.py:83
 msgid "Name"
 msgstr "Name"
 
@@ -776,391 +796,338 @@ msgstr ""
 msgid "Synchronise"
 msgstr ""
 
-#: gajim/dialogs.py:1043
+#: gajim/dialogs.py:1042
 msgid "an audio and video"
 msgstr ""
 
-#: gajim/dialogs.py:1045
+#: gajim/dialogs.py:1044
 msgid "an audio"
 msgstr ""
 
-#: gajim/dialogs.py:1047
+#: gajim/dialogs.py:1046
 msgid "a video"
 msgstr ""
 
-#: gajim/dialogs.py:1051
+#: gajim/dialogs.py:1050
 #, python-format
 msgid ""
-"%(contact)s wants to start %(type)s session with you. Do you want to answer "
+"%(contact)s wants to start a %(type)s chat with you. Do you want to answer "
 "the call?"
 msgstr ""
 
-#: gajim/groupchat_control.py:505
+#: gajim/groupchat_control.py:511
 #, fuzzy, python-format
 msgid "Send File (max. %s MiB)…"
 msgstr "Save File as..."
 
-#: gajim/groupchat_control.py:507 gajim/chat_control.py:342
+#: gajim/groupchat_control.py:513 gajim/chat_control.py:344
 #, fuzzy
 msgid "No File Transfer available"
 msgstr "Failų siuntimai"
 
-#: gajim/groupchat_control.py:630 gajim/groupchat_control.py:2349
-msgid "Changing Subject"
-msgstr ""
-
-#: gajim/groupchat_control.py:631 gajim/groupchat_control.py:2350
-msgid "Please specify the new subject:"
-msgstr ""
-
-#: gajim/groupchat_control.py:638
-msgid "Changing Nickname"
-msgstr ""
-
-#: gajim/groupchat_control.py:639
-msgid "Please specify the new nickname you want to use:"
-msgstr ""
-
-#: gajim/groupchat_control.py:657
+#: gajim/groupchat_control.py:655
 #, fuzzy
-msgid "Invalid group chat JID"
+msgid "Invalid group chat XMPP Address"
 msgstr "Invalid group chat Jabber ID"
 
-#: gajim/groupchat_control.py:658
+#: gajim/groupchat_control.py:656
 #, fuzzy
-msgid "The group chat JID has not allowed characters."
+msgid "The group chat XMPP Address has not allowed characters."
 msgstr "The group chat Jabber ID has invalid characters."
 
-#: gajim/groupchat_control.py:758 gajim/gtk/profile.py:136
+#: gajim/groupchat_control.py:743 gajim/gtk/profile.py:136
 msgid "Could not load image"
 msgstr "Could not load image"
 
-#: gajim/groupchat_control.py:888
+#: gajim/groupchat_control.py:873
 msgid "Insert Nickname"
 msgstr "Insert Nickname"
 
-#: gajim/groupchat_control.py:1056 gajim/chat_control.py:824
+#: gajim/groupchat_control.py:1041 gajim/chat_control.py:848
 msgid "and authenticated"
 msgstr "ir patvirtintas"
 
-#: gajim/groupchat_control.py:1060 gajim/chat_control.py:828
+#: gajim/groupchat_control.py:1045 gajim/chat_control.py:852
 msgid "and NOT authenticated"
 msgstr "ir NEpatvirtintas"
 
-#: gajim/groupchat_control.py:1064
+#: gajim/groupchat_control.py:1049
 #, python-format
 msgid "%(type)s encryption is active %(authenticated)s."
 msgstr ""
 
-#: gajim/groupchat_control.py:1111
+#: gajim/groupchat_control.py:1096
 msgid "Conversation with "
 msgstr "Pokalbis su "
 
-#: gajim/groupchat_control.py:1113
+#: gajim/groupchat_control.py:1098
 msgid "Continued conversation"
 msgstr "Pokalbio tęsinys"
 
-#: gajim/groupchat_control.py:1411
+#: gajim/groupchat_control.py:1357
 #, 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:1433
-msgid "Room now shows unavailable members"
+#: gajim/groupchat_control.py:1374
+msgid "Group chat now shows unavailable members"
 msgstr ""
 
-#: gajim/groupchat_control.py:1436
-msgid "Room now does not show unavailable members"
-msgstr ""
+#: gajim/groupchat_control.py:1377
+#, fuzzy
+msgid "Group chat now does not show unavailable members"
+msgstr "Tokios grupės pokalbis %s neegzistuoja."
 
-#: gajim/groupchat_control.py:1439
+#: gajim/groupchat_control.py:1380
 msgid "A setting not related to privacy has been changed"
 msgstr ""
 
-#: gajim/groupchat_control.py:1446
-msgid "Room logging is now enabled"
-msgstr ""
+#: gajim/groupchat_control.py:1387 gajim/groupchat_control.py:1659
+#, fuzzy
+msgid "Conversations are stored on the server"
+msgstr "You are not connected to the server"
 
-#: gajim/groupchat_control.py:1449
-msgid "Room logging is now disabled"
-msgstr ""
+#: gajim/groupchat_control.py:1390
+#, fuzzy
+msgid "Conversations are not stored on the server"
+msgstr "Informacija apie jus, kur yra išsaugota serveryje"
 
-#: gajim/groupchat_control.py:1452
-msgid "Room is now non-anonymous"
-msgstr ""
+#: gajim/groupchat_control.py:1393
+#, fuzzy
+msgid "Group chat is now non-anonymous"
+msgstr "Groupchats"
 
-#: gajim/groupchat_control.py:1456
-msgid "Room is now semi-anonymous"
-msgstr ""
+#: gajim/groupchat_control.py:1397
+#, fuzzy
+msgid "Group chat is now semi-anonymous"
+msgstr "Group Chat Message Highlight"
 
-#: gajim/groupchat_control.py:1460
-msgid "Room is now fully anonymous"
-msgstr ""
+#: gajim/groupchat_control.py:1401
+#, fuzzy
+msgid "Group chat is now fully anonymous"
+msgstr "Groupchats"
 
-#: gajim/groupchat_control.py:1500
+#: gajim/groupchat_control.py:1439
 #, python-format
 msgid "Ping? (%s)"
 msgstr ""
 
-#: gajim/groupchat_control.py:1503
+#: gajim/groupchat_control.py:1442
 #, python-format
 msgid "Pong! (%(nick)s %(delay)s s.)"
 msgstr ""
 
-#: gajim/groupchat_control.py:1506 gajim/chat_control.py:1213
+#: gajim/groupchat_control.py:1445 gajim/chat_control.py:1237
 #, fuzzy
 msgid "Error."
 msgstr "Avahi error"
 
-#: gajim/groupchat_control.py:1711
-#, python-format
-msgid "You (%s) joined the room"
-msgstr ""
-
-#: gajim/groupchat_control.py:1717
-msgid "Any occupant is allowed to see your full JID"
-msgstr ""
+#: gajim/groupchat_control.py:1650
+#, fuzzy, python-format
+msgid "You (%s) joined the group chat"
+msgstr "You have not joined a groupchat."
 
-#: gajim/groupchat_control.py:1721
-msgid "Room logging is enabled"
+#: gajim/groupchat_control.py:1655
+msgid "Any participant is allowed to see your full XMPP Address"
 msgstr ""
 
-#: gajim/groupchat_control.py:1725
-msgid "The server has assigned or modified your roomnick"
-msgstr ""
+#: gajim/groupchat_control.py:1663
+#, fuzzy
+msgid "The server has assigned or modified your nickname in this group chat"
+msgstr "Usage: /%s <nickname>, changes your nickname in current group chat."
 
-#: gajim/groupchat_control.py:1732
-msgid "A new room has been created"
-msgstr ""
+#: gajim/groupchat_control.py:1671
+#, fuzzy
+msgid "A new group chat has been created"
+msgstr "Your new account has been successfully created"
 
-#: gajim/groupchat_control.py:1740 gajim/privatechat_control.py:112
+#: gajim/groupchat_control.py:1679 gajim/privatechat_control.py:115
 #, python-format
 msgid "You are now known as %s"
 msgstr "You are now known as %s"
 
-#: gajim/groupchat_control.py:1742 gajim/privatechat_control.py:114
+#: gajim/groupchat_control.py:1681 gajim/privatechat_control.py:117
 #, python-brace-format
 msgid "{nick} is now known as {new_nick}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1767 gajim/privatechat_control.py:141
+#: gajim/groupchat_control.py:1706 gajim/privatechat_control.py:144
 #, fuzzy, python-brace-format
 msgid "You are now {show}{status}"
 msgstr "You are now known as %s"
 
-#: gajim/groupchat_control.py:1773 gajim/privatechat_control.py:147
+#: gajim/groupchat_control.py:1712 gajim/privatechat_control.py:150
 #, fuzzy, python-brace-format
 msgid "{nick} is now {show}{status}"
 msgstr "%(nick)s is now %(status)s"
 
-#: gajim/groupchat_control.py:1790 gajim/groupchat_control.py:1819
-#: gajim/groupchat_control.py:1849 gajim/groupchat_control.py:1909
+#: gajim/groupchat_control.py:1729 gajim/groupchat_control.py:1758
+#: gajim/groupchat_control.py:1788 gajim/groupchat_control.py:1848
 #, python-brace-format
 msgid " by {actor}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1793
+#: gajim/groupchat_control.py:1732
 #, python-brace-format
 msgid "** Your Affiliation has been set to {affiliation}{actor}{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1799
+#: gajim/groupchat_control.py:1738
 #, python-brace-format
 msgid "** Affiliation of {nick} has been set to {affiliation}{actor}{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1822
+#: gajim/groupchat_control.py:1761
 #, python-brace-format
 msgid "** Your Role has been set to {role}{actor}{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1827
+#: gajim/groupchat_control.py:1766
 #, python-brace-format
 msgid "** Role of {nick} has been set to {role}{actor}{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1852
+#: gajim/groupchat_control.py:1791
 #, python-brace-format
-msgid "You have been removed from the room{actor}{reason}"
+msgid "You have been removed from the group chat{actor}{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1857
+#: gajim/groupchat_control.py:1796
 #, python-brace-format
 msgid "You have left due to an error{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1863
+#: gajim/groupchat_control.py:1802
 #, python-brace-format
 msgid "You have been kicked{actor}{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1870
+#: gajim/groupchat_control.py:1809
 #, python-brace-format
 msgid "You have been banned{actor}{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1877 gajim/groupchat_control.py:1943
+#: gajim/groupchat_control.py:1816 gajim/groupchat_control.py:1882
 #, fuzzy
 msgid ": Affiliation changed"
 msgstr "Affiliation:"
 
-#: gajim/groupchat_control.py:1883 gajim/groupchat_control.py:1948
-msgid ": Room configuration changed to members-only"
+#: gajim/groupchat_control.py:1822 gajim/groupchat_control.py:1887
+msgid ": Group chat configuration changed to members-only"
 msgstr ""
 
-#: gajim/groupchat_control.py:1912
-#, python-brace-format
-msgid "{nick} has been removed from the room{by}{reason}"
-msgstr ""
+#: gajim/groupchat_control.py:1851
+#, fuzzy, python-brace-format
+msgid "{nick} has been removed from the group chat{by}{reason}"
+msgstr "%(nick)s has been kicked: %(reason)s"
 
-#: gajim/groupchat_control.py:1922
+#: gajim/groupchat_control.py:1861
 #, python-brace-format
 msgid "{nick} has left due to an error{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1928
+#: gajim/groupchat_control.py:1867
 #, fuzzy, python-brace-format
 msgid "{nick} has been kicked{actor}{reason}"
 msgstr "%(nick)s has been kicked: %(reason)s"
 
-#: gajim/groupchat_control.py:1936
+#: gajim/groupchat_control.py:1875
 #, fuzzy, python-brace-format
 msgid "{nick} has been banned{actor}{reason}"
 msgstr "%(nick)s has been banned: %(reason)s"
 
-#: gajim/groupchat_control.py:1953
+#: gajim/groupchat_control.py:1892
 #, python-brace-format
 msgid "{nick} has left{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1970
+#: gajim/groupchat_control.py:1914
 #, python-format
 msgid "%s has joined the group chat"
 msgstr ""
 
-#: gajim/groupchat_control.py:1985 gajim/groupchat_control.py:1990
-#: gajim/groupchat_control.py:1995 gajim/groupchat_control.py:2000
-#: gajim/groupchat_control.py:2011
-msgid "Unable to join group chat"
-msgstr "Unable to join group chat"
+#: gajim/groupchat_control.py:1981
+#, fuzzy
+msgid "Group chat has been destroyed"
+msgstr "Kambarys buvo sunaikintas"
 
 #: gajim/groupchat_control.py:1986
 #, fuzzy, python-format
-msgid "You are banned from group chat <b>%s</b>."
-msgstr "Jūs esate išmestas iš grupės pokalbio %s."
-
-#: gajim/groupchat_control.py:1991
-#, fuzzy, python-format
-msgid "Remote server <b>%s</b> does not exist."
-msgstr "Tokios grupės pokalbis %s neegzistuoja."
-
-#: gajim/groupchat_control.py:1996
-#, fuzzy, python-format
-msgid "Group chat <b>%s</b> does not exist."
-msgstr "Tokios grupės pokalbis %s neegzistuoja."
-
-#: gajim/groupchat_control.py:2001
-#, fuzzy
-msgid "Group chat creation is not permitted."
-msgstr "Group chat creation is restricted."
-
-#: gajim/groupchat_control.py:2005
-#, fuzzy
-msgid "Unable to join groupchat"
+msgid "You can join this group chat instead: xmpp:%s?join"
 msgstr "Unable to join group chat"
 
-#: gajim/groupchat_control.py:2006
-#, fuzzy, python-format
-msgid "You must use your registered nickname in <b>%s</b>."
-msgstr ""
-"Jūsų užregistruotas slapyvardis turi būti naudojamas grupės pokalbyje %s."
-
-#: gajim/groupchat_control.py:2012
-#, python-format
-msgid "You are not in the members list in groupchat %s."
-msgstr "Jūs estate grupės pokalbio %s narių sąraše."
-
-#: gajim/groupchat_control.py:2068
-msgid "Room has been destroyed"
-msgstr "Kambarys buvo sunaikintas"
-
-#: gajim/groupchat_control.py:2073
-#, python-format
-msgid "You can join this room instead: xmpp:%s?join"
-msgstr ""
-
-#: gajim/groupchat_control.py:2306
+#: gajim/groupchat_control.py:2214
 #, fuzzy
 msgid "Leave Group Chat"
 msgstr "Leave Groupchats"
 
-#: gajim/groupchat_control.py:2307
+#: gajim/groupchat_control.py:2215
 msgid "Are you sure you want to leave this group chat?"
 msgstr ""
 
-#: gajim/groupchat_control.py:2308
+#: gajim/groupchat_control.py:2216
 #, python-format
-msgid "If you close this window, you will be disconnected from '%s'."
+msgid "If you close this window, you will leave '%s'."
 msgstr ""
 
-#: gajim/groupchat_control.py:2314
+#: gajim/groupchat_control.py:2222 gajim/roster_window.py:5177
 msgid "_Leave"
 msgstr ""
 
-#: gajim/groupchat_control.py:2377
+#: gajim/groupchat_control.py:2280 gajim/roster_window.py:3008
 #, python-format
 msgid "%(jid)s has been invited to this group chat"
 msgstr ""
 
-#: gajim/groupchat_control.py:2527
+#: gajim/groupchat_control.py:2463
 #, python-format
 msgid "Kicking %s"
 msgstr ""
 
-#: gajim/groupchat_control.py:2528 gajim/groupchat_control.py:2829
+#: gajim/groupchat_control.py:2464 gajim/groupchat_control.py:2765
 msgid "You may specify a reason below:"
 msgstr ""
 
-#: gajim/groupchat_control.py:2828
+#: gajim/groupchat_control.py:2764
 #, python-format
 msgid "Banning %s"
 msgstr ""
 
-#: gajim/chat_control.py:408
+#: gajim/chat_control.py:432
 msgid "Show a list of formattings"
 msgstr "Rodyti formatavimo sąrašą"
 
-#: gajim/chat_control.py:412
+#: gajim/chat_control.py:436
 #, fuzzy
 msgid "This contact does not support HTML"
 msgstr "Šis kontaktas neturi failų siuntimo funkcijos."
 
-#: gajim/chat_control.py:562
+#: gajim/chat_control.py:586
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr ""
 
-#: gajim/chat_control.py:686
+#: gajim/chat_control.py:710
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s from group chat %(room_name)s"
 
-#: gajim/chat_control.py:832
+#: gajim/chat_control.py:856
 #, python-format
 msgid "%(type)s encryption is active %(authenticated)s"
 msgstr ""
 
-#: gajim/chat_control.py:1160 gajim/chat_control.py:1168
+#: gajim/chat_control.py:1184 gajim/chat_control.py:1192
 #, fuzzy
 msgid "Close"
 msgstr "_Išsiųsti "
 
-#: gajim/chat_control.py:1161
+#: gajim/chat_control.py:1185
 #, fuzzy, python-format
 msgid "You just received a new message from %s"
 msgstr "You just received a new message from \"%s\""
 
-#: gajim/chat_control.py:1163
+#: gajim/chat_control.py:1187
 #, fuzzy
 msgid ""
 "If you close this tab while having chat history disabled, this message will "
@@ -1169,16 +1136,16 @@ msgstr ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
 
-#: gajim/chat_control.py:1208
+#: gajim/chat_control.py:1232
 msgid "Ping?"
 msgstr ""
 
-#: gajim/chat_control.py:1211
+#: gajim/chat_control.py:1235
 #, python-format
 msgid "Pong! (%s seconds)"
 msgstr ""
 
-#: gajim/chat_control.py:1308
+#: gajim/chat_control.py:1332
 #, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -1187,298 +1154,306 @@ msgstr ""
 "Tema: %(subject)s\n"
 "%(message)s"
 
-#: gajim/chat_control.py:1416
+#: gajim/chat_control.py:1440
 #, fuzzy, python-format
 msgid "%(name)s is now %(show)s %(status)s"
 msgstr "%(name)s dabar %(status)s"
 
-#: gajim/chat_control.py:1476 gajim/data/gui/application_menu.ui:32
+#: gajim/chat_control.py:1500 gajim/data/gui/application_menu.ui:32
 #: gajim/gtk/http_upload_progress.py:35
 #, fuzzy
 msgid "File Transfer"
 msgstr "Failų siuntimai"
 
-#: gajim/chat_control.py:1480
+#: gajim/chat_control.py:1504
 #, fuzzy
 msgid "Size"
 msgstr "Size: %s"
 
-#: gajim/chat_control.py:1482 gajim/chat_control.py:1546
+#: gajim/chat_control.py:1506 gajim/chat_control.py:1566
+#: gajim/gui_interface.py:190
 #: gajim/data/gui/groupchat_invitation_received.ui:77
-#: gajim/gtk/filetransfer.py:485
+#: gajim/gtk/filetransfer.py:490
 #, fuzzy
 msgid "_Accept"
 msgstr "Priimti"
 
-#: gajim/chat_control.py:1484 gajim/chat_control.py:1548
+#: gajim/chat_control.py:1508 gajim/chat_control.py:1568
 #: gajim/data/gui/groupchat_invitation_received.ui:62
 #, fuzzy
 msgid "_Decline"
 msgstr "A_tsijungęs"
 
-#: gajim/chat_control.py:1506 gajim/gui_interface.py:791
-#: gajim/gui_interface.py:821 gajim/gui_interface.py:847
+#: gajim/chat_control.py:1530 gajim/gui_interface.py:777
+#: gajim/gui_interface.py:807 gajim/gui_interface.py:833
 #: gajim/gtk/notification.py:173 gajim/gtk/notification.py:278
 msgid "File Transfer Completed"
 msgstr "File Transfer Completed"
 
-#: gajim/chat_control.py:1510 gajim/gtk/filetransfer.py:259
+#: gajim/chat_control.py:1534 gajim/gtk/filetransfer.py:258
 #, fuzzy
 msgid "Open _Folder"
 msgstr "_Atidaryti katalogą, kuriame yra failas"
 
-#: gajim/chat_control.py:1512 gajim/chat_control.py:1521
+#: gajim/chat_control.py:1536 gajim/chat_control.py:1545
+#: gajim/data/gui/groupchat_control.ui:962
+#: gajim/data/gui/groupchat_control.ui:1049
+#: gajim/data/gui/groupchat_control.ui:1155
 #, fuzzy
 msgid "_Close"
 msgstr "_Išsiųsti "
 
-#: gajim/chat_control.py:1543 gajim/gui_interface.py:484
+#: gajim/chat_control.py:1563 gajim/gui_interface.py:473
+#: gajim/data/gui/groupchat_invitation_received.ui:42
 #: gajim/gtk/notification.py:174 gajim/gtk/notification.py:195
 #: gajim/gtk/notification.py:281
-msgid "Groupchat Invitation"
+#, fuzzy
+msgid "Group Chat Invitation"
 msgstr "Groupchat Invitation"
 
-#: gajim/chat_control.py:1568 gajim/roster_window.py:1954
+#: gajim/chat_control.py:1588 gajim/roster_window.py:1951
 msgid "Remote contact stopped transfer"
 msgstr ""
 
-#: gajim/chat_control.py:1570 gajim/roster_window.py:1956
+#: gajim/chat_control.py:1590 gajim/roster_window.py:1953
 msgid "Error opening file"
 msgstr ""
 
-#: gajim/chat_control.py:1572 gajim/gtk/filetransfer.py:297
+#: gajim/chat_control.py:1592 gajim/gtk/filetransfer.py:296
 msgid "File transfer stopped"
 msgstr "Failo siuntimas sustabdytas"
 
-#: gajim/chat_control.py:1575 gajim/gtk/filetransfer.py:275
-#: gajim/gtk/filetransfer.py:284
+#: gajim/chat_control.py:1595 gajim/gtk/filetransfer.py:274
+#: gajim/gtk/filetransfer.py:283
 msgid "File transfer cancelled"
 msgstr "File transfer cancelled"
 
-#: gajim/chat_control.py:1576
+#: gajim/chat_control.py:1596
 msgid "Connection with peer cannot be established."
 msgstr "Connection with peer cannot be established."
 
-#: gajim/application.py:72
+#: gajim/application.py:75
 #, fuzzy
 msgid "Show the application's version"
 msgstr "Naudoti piktogramą trėjuje (pranešimų panelės piktograma)"
 
-#: gajim/application.py:79
+#: gajim/application.py:82
 #, fuzzy
 msgid "Show only critical errors"
 msgstr "Rodyti tik kontaktų _sąrašą"
 
-#: gajim/application.py:86
+#: gajim/application.py:89
 msgid "Separate profile files completely (even history database and plugins)"
 msgstr ""
 
-#: gajim/application.py:94
+#: gajim/application.py:97
 msgid "Print XML stanzas and other debug information"
 msgstr ""
 
-#: gajim/application.py:101
+#: gajim/application.py:104
 #, fuzzy
 msgid "Use defined profile in configuration directory"
 msgstr "Išplėstinis konfigūracijos redaktorius"
 
-#: gajim/application.py:109
+#: gajim/application.py:112
 #, fuzzy
 msgid "Set configuration directory"
 msgstr "Kambario nustatymai"
 
-#: gajim/application.py:117
+#: gajim/application.py:120
 msgid "Configure logging system"
 msgstr ""
 
-#: gajim/application.py:125
+#: gajim/application.py:128
 #, fuzzy
 msgid "Show all warnings"
 msgstr "Rodyti Visus Laukiančius Į_vykius"
 
-#: gajim/application.py:132
+#: gajim/application.py:135
 msgid "Open IPython shell"
 msgstr ""
 
-#: gajim/application.py:139
+#: gajim/application.py:142
 msgid "Pops up a window with the next pending event"
 msgstr "Pops up a window with the next pending event"
 
-#: gajim/application.py:145 gajim/data/gui/shortcuts_window.ui:203
+#: gajim/application.py:148 gajim/data/gui/shortcuts_window.ui:203
 #: data/org.gajim.Gajim.desktop.in:21
 #, fuzzy
 msgid "Start a new chat"
 msgstr "Start Chat"
 
-#: gajim/application.py:152
+#: gajim/application.py:155
 msgid "Simulate loss of connectivity"
 msgstr ""
 
-#: gajim/application.py:159
+#: gajim/application.py:162
 msgid "Simulate regaining connectivity"
 msgstr ""
 
-#: gajim/application.py:201 gajim/gui_interface.py:133
+#: gajim/application.py:204 gajim/gui_interface.py:133
 msgid "Database Error"
 msgstr ""
 
-#: gajim/roster_window.py:294 gajim/roster_window.py:1030
+#: gajim/roster_window.py:291 gajim/roster_window.py:1027
 msgid "Merged accounts"
 msgstr "Apjungtos prieigos"
 
-#: gajim/roster_window.py:853 gajim/roster_window.py:1631
-#: gajim/roster_window.py:1664 gajim/roster_window.py:1715
-#: gajim/roster_window.py:1717 gajim/roster_window.py:1872
-#: gajim/roster_window.py:2531 gajim/roster_window.py:5025
-#: gajim/common/contacts.py:188 gajim/common/contacts.py:447
-#: gajim/common/helpers.py:83 gajim/gtk/discovery.py:129
-#: gajim/gtk/discovery.py:130 gajim/gtk/discovery.py:1416
+#: gajim/roster_window.py:850 gajim/roster_window.py:1628
+#: gajim/roster_window.py:1661 gajim/roster_window.py:1712
+#: gajim/roster_window.py:1714 gajim/roster_window.py:1869
+#: gajim/roster_window.py:2528 gajim/roster_window.py:4331
+#: gajim/roster_window.py:4964 gajim/common/contacts.py:204
+#: gajim/common/contacts.py:463 gajim/common/helpers.py:86
+#: gajim/gtk/discovery.py:127 gajim/gtk/discovery.py:128
+#: gajim/gtk/discovery.py:1414
 msgid "Transports"
 msgstr "Transports"
 
-#: gajim/roster_window.py:1723 gajim/roster_window.py:1725
-#: gajim/roster_window.py:4995 gajim/gui_interface.py:1613
-#: gajim/gui_interface.py:1639 gajim/common/contacts.py:186
-#: gajim/common/helpers.py:83 gajim/common/modules/adhoc_commands.py:245
-msgid "Groupchats"
+#: gajim/roster_window.py:1720 gajim/roster_window.py:1722
+#: gajim/roster_window.py:4331 gajim/roster_window.py:4934
+#: gajim/gui_interface.py:1527 gajim/common/contacts.py:202
+#: gajim/common/helpers.py:86 gajim/common/modules/adhoc_commands.py:245
+#, fuzzy
+msgid "Group chats"
 msgstr "Groupchats"
 
-#: gajim/roster_window.py:2012
+#: gajim/roster_window.py:2009
 #, fuzzy
 msgid "Authorization sent"
 msgstr "Authorisation has been sent"
 
-#: gajim/roster_window.py:2013
+#: gajim/roster_window.py:2010
 #, fuzzy, python-format
 msgid "\"%s\" will now see your status."
 msgstr "Dabar \"%s\" žinos apie jūsų būklę."
 
-#: gajim/roster_window.py:2031
+#: gajim/roster_window.py:2028
 msgid "Subscription request has been sent"
 msgstr "Subscription request has been sent"
 
-#: gajim/roster_window.py:2032
-#, python-format
-msgid "If \"%s\" accepts this request you will know his or her status."
+#: gajim/roster_window.py:2029
+#, 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:2046
+#: gajim/roster_window.py:2043
 #, fuzzy
 msgid "Authorization removed"
 msgstr "Authorisation has been removed"
 
-#: gajim/roster_window.py:2047
+#: gajim/roster_window.py:2044
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Now \"%s\" will always see you as offline."
 
-#: gajim/roster_window.py:2250 gajim/roster_window.py:3504
+#: gajim/roster_window.py:2247 gajim/roster_window.py:3460
 msgid "Disconnect for Invisibility"
 msgstr ""
 
-#: gajim/roster_window.py:2251 gajim/roster_window.py:3505
+#: gajim/roster_window.py:2248 gajim/roster_window.py:3461
 msgid "You are participating in one or more group chats"
 msgstr "You are participating in one or more group chats"
 
-#: gajim/roster_window.py:2252 gajim/roster_window.py:3506
+#: gajim/roster_window.py:2249 gajim/roster_window.py:3462
 #, fuzzy
 msgid ""
-"Changing your status to invisible will result in disconnection from those "
-"group chats.\n"
+"Changing your status to invisible will result in you leaving those group "
+"chats.\n"
 "Are you sure you want to go invisible?"
 msgstr ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
 
-#: gajim/roster_window.py:2257 gajim/roster_window.py:3512
-#: gajim/roster_window.py:5238 gajim/data/gui/gc_control_popup_menu.ui:120
+#: gajim/roster_window.py:2254 gajim/roster_window.py:3468
+#: gajim/data/gui/gc_control_popup_menu.ui:120
 msgid "_Disconnect"
 msgstr ""
 
-#: gajim/roster_window.py:2285
+#: gajim/roster_window.py:2282
 #, fuzzy
 msgid "desynced"
 msgstr "Išplėstinis"
 
-#: gajim/roster_window.py:2353 gajim/data/gui/shortcuts_window.ui:224
+#: gajim/roster_window.py:2350 gajim/data/gui/shortcuts_window.ui:224
 #, fuzzy
 msgid "Quit Gajim"
 msgstr "Gajim"
 
-#: gajim/roster_window.py:2354
+#: gajim/roster_window.py:2351
 msgid "You are about to quit Gajim"
 msgstr ""
 
-#: gajim/roster_window.py:2355
+#: gajim/roster_window.py:2352
 msgid "Are you sure you want to quit Gajim?"
 msgstr ""
 
-#: gajim/roster_window.py:2356
+#: gajim/roster_window.py:2353
 msgid "_Always quit when closing Gajim"
 msgstr ""
 
-#: gajim/roster_window.py:2359 gajim/roster_window.py:2455
-#: gajim/roster_window.py:2495 gajim/data/gui/systray_context_menu.ui:90
+#: gajim/roster_window.py:2356 gajim/roster_window.py:2452
+#: gajim/roster_window.py:2492 gajim/data/gui/systray_context_menu.ui:83
 #, fuzzy
 msgid "_Quit"
 msgstr "_Išjungti"
 
-#: gajim/roster_window.py:2448
+#: gajim/roster_window.py:2445
 #, fuzzy
 msgid "Stop File Transfers"
 msgstr "Failų siuntimai"
 
-#: gajim/roster_window.py:2449
+#: gajim/roster_window.py:2446
 #, fuzzy
 msgid "You still have running file transfers"
 msgstr "Atšaukti failo siuntimą"
 
-#: gajim/roster_window.py:2450
+#: gajim/roster_window.py:2447
 msgid ""
 "If you quit now, the file(s) being transferred will be lost.\n"
 "Do you still want to quit?"
 msgstr ""
 
-#: gajim/roster_window.py:2488
+#: gajim/roster_window.py:2485
 #, fuzzy
 msgid "Unread Messages"
 msgstr "Unread events"
 
-#: gajim/roster_window.py:2489
+#: gajim/roster_window.py:2486
 #, fuzzy
 msgid "You still have unread messages"
 msgstr "You have unread messages"
 
-#: gajim/roster_window.py:2490
+#: gajim/roster_window.py:2487
 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 ""
 
-#: gajim/roster_window.py:2760
+#: gajim/roster_window.py:2753
 msgid "You have unread messages"
 msgstr "You have unread messages"
 
-#: gajim/roster_window.py:2761
+#: gajim/roster_window.py:2754
 msgid "You must read them before removing this transport."
 msgstr ""
 
-#: gajim/roster_window.py:2764
+#: gajim/roster_window.py:2757
 #, python-format
 msgid "Transport '%s' will be removed"
 msgstr ""
 
-#: gajim/roster_window.py:2765
+#: gajim/roster_window.py:2758
 msgid ""
 "You will no longer be able to send and receive messages from and to contacts "
 "using this transport."
 msgstr ""
 
-#: gajim/roster_window.py:2768
+#: gajim/roster_window.py:2761
 msgid "Transports will be removed"
 msgstr ""
 
-#: gajim/roster_window.py:2773
+#: gajim/roster_window.py:2766
 #, python-format
 msgid ""
 "You will no longer be able to send and receive messages from and to contacts "
@@ -1486,103 +1461,98 @@ msgid ""
 "%s"
 msgstr ""
 
-#: gajim/roster_window.py:2777
+#: gajim/roster_window.py:2770
 #, fuzzy
 msgid "Remove Transport"
 msgstr "Rodyti _Pernašas"
 
-#: gajim/roster_window.py:2844
+#: gajim/roster_window.py:2837
 #, fuzzy
 msgid "Block Contact"
 msgstr "Užblokuoti Kontaktai"
 
-#: gajim/roster_window.py:2845
+#: gajim/roster_window.py:2838
 #, fuzzy
 msgid "Really block this contact?"
 msgstr "Is OpenPGP enabled for this contact?"
 
-#: gajim/roster_window.py:2846
+#: gajim/roster_window.py:2839
 msgid ""
 "This contact will see you offline and you will not receive any messages sent "
 "to you by this contact."
 msgstr ""
 
-#: gajim/roster_window.py:2851
+#: gajim/roster_window.py:2844
 #, fuzzy
 msgid "_Block Contact"
 msgstr "Užblokuoti Kontaktai"
 
-#: gajim/roster_window.py:2896
+#: gajim/roster_window.py:2889
 msgid "Rename Contact"
 msgstr ""
 
-#: gajim/roster_window.py:2897
+#: gajim/roster_window.py:2890
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr ""
 
-#: gajim/roster_window.py:2904
+#: gajim/roster_window.py:2897
 msgid "Rename Group"
 msgstr ""
 
-#: gajim/roster_window.py:2905
+#: gajim/roster_window.py:2898
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr ""
 
-#: gajim/roster_window.py:2953 gajim/roster_window.py:2954
+#: gajim/roster_window.py:2946 gajim/roster_window.py:2947
 msgid "Remove Group"
 msgstr ""
 
-#: gajim/roster_window.py:2955
+#: gajim/roster_window.py:2948
 #, python-format
 msgid "Do you want to remove %s from the contact list?"
 msgstr ""
 
-#: gajim/roster_window.py:2956
+#: gajim/roster_window.py:2949
 msgid "_Also remove all contacts of this group from contact list"
 msgstr ""
 
-#: gajim/roster_window.py:3044
-#, python-format
-msgid "%(jid)s has been invited in this room"
-msgstr ""
-
-#: gajim/roster_window.py:3353
+#: gajim/roster_window.py:3309
 #, fuzzy
 msgid "Remove Contact"
 msgstr "Removes contact from roster"
 
-#: gajim/roster_window.py:3354
+#: gajim/roster_window.py:3310
 #, fuzzy
 msgid "Remove contact from contact list"
 msgstr "Removes contact from roster"
 
-#: gajim/roster_window.py:3355
+#: gajim/roster_window.py:3311
 #, python-format
 msgid "You are about to remove '%(name)s' (%(jid)s) from your contact list.\n"
 msgstr ""
 
-#: gajim/roster_window.py:3364 gajim/roster_window.py:3384
+#: gajim/roster_window.py:3320 gajim/roster_window.py:3340
 msgid ""
 "By removing this contact you also remove authorization. This means the "
 "contact will see you as offline."
 msgstr ""
 
-#: gajim/roster_window.py:3375
+#: gajim/roster_window.py:3331
 msgid "Do you want to continue?"
 msgstr ""
 
-#: gajim/roster_window.py:3386
+#: gajim/roster_window.py:3342
 msgid "_I want this contact to know my status after removal"
 msgstr ""
 
-#: gajim/roster_window.py:3393
+#: gajim/roster_window.py:3349
 #, fuzzy
 msgid "Remove contacts from contact list"
 msgstr "Removes contact from roster"
 
-#: gajim/roster_window.py:3399
+#: gajim/roster_window.py:3355
 #, python-format
 msgid ""
 "By removing the following contacts, you will also remove authorization. This "
@@ -1591,59 +1561,59 @@ msgid ""
 "%s"
 msgstr ""
 
-#: gajim/roster_window.py:3403
+#: gajim/roster_window.py:3359
 #, fuzzy
 msgid "Remove Contacts"
 msgstr "Removes contact from roster"
 
-#: gajim/roster_window.py:3423
+#: gajim/roster_window.py:3379
 msgid "No account available"
 msgstr ""
 
-#: gajim/roster_window.py:3424
+#: gajim/roster_window.py:3380
 msgid "You must create an account before you can chat with other contacts."
 msgstr ""
 
-#: gajim/roster_window.py:4060
+#: gajim/roster_window.py:4011
 msgid "Metacontacts storage not supported by your server"
 msgstr ""
 
-#: gajim/roster_window.py:4062
+#: gajim/roster_window.py:4013
 msgid ""
 "Your server does not support storing metacontacts information. So this "
 "information will not be saved on next reconnection."
 msgstr ""
 
-#: gajim/roster_window.py:4159
+#: gajim/roster_window.py:4110
 msgid "You are about to create a metacontact"
 msgstr ""
 
-#: gajim/roster_window.py:4160
+#: gajim/roster_window.py:4111
 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:4164
+#: gajim/roster_window.py:4115
 #, fuzzy
 msgid "Create Metacontact"
 msgstr "Pervadinti Prieigą"
 
-#: gajim/roster_window.py:4170
+#: gajim/roster_window.py:4121 gajim/data/gui/groupchat_creation.ui:317
 msgid "_Create"
 msgstr ""
 
-#: gajim/roster_window.py:4287
+#: gajim/roster_window.py:4238
 msgid "Invalid file URI:"
 msgstr ""
 
-#: gajim/roster_window.py:4298
+#: gajim/roster_window.py:4249
 #, fuzzy
 msgid "Send file?"
 msgstr "Siųsti _Failą"
 
-#: gajim/roster_window.py:4299
+#: gajim/roster_window.py:4250
 #, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
@@ -1651,97 +1621,88 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: gajim/roster_window.py:4451
+#: gajim/roster_window.py:4401
 #, python-format
 msgid "Send %(from)s to %(to)s"
 msgstr ""
 
-#: gajim/roster_window.py:4464
+#: gajim/roster_window.py:4414
 #, fuzzy, python-format
 msgid "Make %s first contact"
 msgstr "Sends file to a contact"
 
-#: gajim/roster_window.py:4469
+#: gajim/roster_window.py:4419
 #, python-format
 msgid "Make %(contact1)s and %(contact2)s metacontacts"
 msgstr ""
 
-#: gajim/roster_window.py:4825 gajim/roster_window.py:4923
+#: gajim/roster_window.py:4775 gajim/roster_window.py:4862
 msgid "_Change Status Message"
 msgstr "_Keisti Būklės Žinutę"
 
-#: gajim/roster_window.py:4845
+#: gajim/roster_window.py:4795
 msgid "Publish Tune"
 msgstr ""
 
-#: gajim/roster_window.py:4856
+#: gajim/roster_window.py:4806
 msgid "Publish Location"
 msgstr ""
 
-#: gajim/roster_window.py:4868
-#, fuzzy
-msgid "Configure Services…"
-msgstr "Konfigūruoti Paslaugas..."
-
-#: gajim/roster_window.py:4997
+#: gajim/roster_window.py:4936
 msgid "_Maximize All"
 msgstr ""
 
-#: gajim/roster_window.py:5004 gajim/roster_window.py:5146
+#: gajim/roster_window.py:4943 gajim/roster_window.py:5085
 msgid "Send Group M_essage"
 msgstr ""
 
-#: gajim/roster_window.py:5011
+#: gajim/roster_window.py:4950
 msgid "To all users"
 msgstr "Visiems naudotojams"
 
-#: gajim/roster_window.py:5015
+#: gajim/roster_window.py:4954
 msgid "To all online users"
 msgstr "Visiems prisijungusiems"
 
-#: gajim/roster_window.py:5027 gajim/roster_window.py:5152
+#: gajim/roster_window.py:4966 gajim/roster_window.py:5091
 #: gajim/data/gui/gc_occupants_menu.ui:110
 #: gajim/data/gui/contact_context_menu.ui:36
 msgid "In_vite to"
 msgstr "Pak_viesti į"
 
-#: gajim/roster_window.py:5162
+#: gajim/roster_window.py:5101
 msgid "_Manage Contacts"
 msgstr ""
 
-#: gajim/roster_window.py:5168
+#: gajim/roster_window.py:5107
 #, fuzzy
 msgid "Edit _Groups…"
 msgstr "Redaguoti _Grupes"
 
-#: gajim/roster_window.py:5189 gajim/data/gui/filetransfers.ui:12
+#: gajim/roster_window.py:5128 gajim/data/gui/filetransfers.ui:12
 #: gajim/data/gui/remove_account_window.ui:134
 msgid "_Remove"
 msgstr "_Trinti"
 
-#: gajim/roster_window.py:5226
+#: gajim/roster_window.py:5165
 msgid "_Maximize"
 msgstr ""
 
-#: gajim/roster_window.py:5233
+#: gajim/roster_window.py:5172
 msgid "_Reconnect"
 msgstr ""
 
-#: gajim/roster_window.py:5254 gajim/data/gui/gc_occupants_menu.ui:170
+#: gajim/roster_window.py:5193 gajim/data/gui/gc_occupants_menu.ui:170
 #: gajim/data/gui/gc_control_popup_menu.ui:113
 #: gajim/data/gui/contact_context_menu.ui:205
 msgid "_History"
 msgstr "_Istorija"
 
-#: gajim/roster_window.py:5335 gajim/data/gui/application_menu.ui:86
+#: gajim/roster_window.py:5274 gajim/data/gui/application_menu.ui:83
 #: gajim/data/gui/history_window.ui:57
 msgid "History Manager"
 msgstr "History Manager"
 
-#: gajim/roster_window.py:5343
-msgid "_Join New Group Chat"
-msgstr "_Join New Group Chat"
-
 #: gajim/dataforms_widget.py:585
 #, fuzzy
 msgid "Unable to load image"
@@ -1861,270 +1822,287 @@ msgstr "Subject: %s\n"
 msgid "Write a message…"
 msgstr "New Private Message"
 
-#: gajim/message_window.py:250
+#: gajim/message_window.py:356
+#, fuzzy
+msgid "Close Tabs"
+msgstr "_Išsiųsti "
+
+#: gajim/message_window.py:357
 msgid "You are going to close several tabs"
 msgstr ""
 
-#: gajim/message_window.py:251
+#: gajim/message_window.py:358
 msgid "Do you really want to close them all?"
 msgstr ""
 
-#: gajim/message_window.py:539
+#: gajim/message_window.py:514
 #, fuzzy
 msgid "?Noun:Chats"
 msgstr "Group Chats"
 
-#: gajim/message_window.py:543
+#: gajim/message_window.py:518
 #, fuzzy
 msgid "Group Chats"
 msgstr "Pokalbiai _Grupėje"
 
-#: gajim/message_window.py:547
+#: gajim/message_window.py:522
 msgid "Private Chats"
 msgstr "Private Chats"
 
-#: gajim/message_window.py:553
+#: gajim/message_window.py:528
 msgid "Messages"
 msgstr "Messages"
 
-#: gajim/gui_interface.py:173
+#: gajim/gui_interface.py:170
+#, python-format
+msgid "HTTP (%(method)s) Authorization for %(url)s (ID: %(id)s)"
+msgstr ""
+
+#: gajim/gui_interface.py:175
 msgid "Do you accept this request?"
 msgstr "Do you accept this request?"
 
-#: gajim/gui_interface.py:175
-#, python-format
-msgid "Do you accept this request on account %s?"
-msgstr ""
+#: gajim/gui_interface.py:177
+#, fuzzy, python-format
+msgid "Do you accept this request (account: %s)?"
+msgstr "Do you accept this request?"
 
-#: gajim/gui_interface.py:178
-#, python-format
-msgid "HTTP (%(method)s) Authorization for %(url)s (ID: %(id)s)"
-msgstr ""
+#: gajim/gui_interface.py:182
+#, fuzzy
+msgid "Authorization"
+msgstr "Authorisation has been sent"
+
+#: gajim/gui_interface.py:186 gajim/gui_interface.py:420
+#: gajim/gtk/filetransfer.py:338
+#, fuzzy
+msgid "_No"
+msgstr "Joks"
 
-#: gajim/gui_interface.py:194 gajim/gtk/notification.py:175
+#: gajim/gui_interface.py:205 gajim/gtk/notification.py:175
 #: gajim/gtk/notification.py:197
 msgid "Connection Failed"
 msgstr ""
 
-#: gajim/gui_interface.py:279 gajim/gui_interface.py:529
-msgid "Password Required"
-msgstr "Password Required"
-
-#: gajim/gui_interface.py:280
-#, python-format
-msgid "A Password is required to join the room %s. Please type it."
-msgstr ""
-
-#: gajim/gui_interface.py:342 gajim/gui_interface.py:346
+#: gajim/gui_interface.py:325 gajim/gui_interface.py:329
 #, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr ""
 
-#: gajim/gui_interface.py:357 gajim/gui_interface.py:376
+#: gajim/gui_interface.py:340 gajim/gui_interface.py:359
 #: gajim/common/modules/message.py:122
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr ""
 
-#: gajim/gui_interface.py:401 gajim/gtk/notification.py:175
+#: gajim/gui_interface.py:384 gajim/gtk/notification.py:175
 msgid "Subscription request"
 msgstr "Sutikimo užklausimas"
 
-#: gajim/gui_interface.py:413 gajim/common/contacts.py:184
-#: gajim/common/helpers.py:83
+#: gajim/gui_interface.py:396 gajim/common/contacts.py:200
+#: gajim/common/helpers.py:86
 msgid "Observers"
 msgstr "Observers"
 
-#: gajim/gui_interface.py:422
+#: gajim/gui_interface.py:405
 msgid "Authorization accepted"
 msgstr "Authorisation accepted"
 
-#: gajim/gui_interface.py:423
+#: gajim/gui_interface.py:406
 #, 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:431
-#, python-format
-msgid "Contact \"%s\" removed subscription from you"
+#: gajim/gui_interface.py:415
+#, fuzzy
+msgid "Subscription Removed"
+msgstr "Sutikimo užklausimas"
+
+#: gajim/gui_interface.py:416
+#, fuzzy, python-format
+msgid "Contact '%s' removed subscription from you"
 msgstr "Contact \"%s\" removed subscription from you"
 
-#: gajim/gui_interface.py:432
+#: gajim/gui_interface.py:417
 msgid ""
-"You will always see them as offline.\n"
+"You will always see this contact as offline.\n"
 "Do you want to remove them from your contact list?"
 msgstr ""
 
-#: gajim/gui_interface.py:453 gajim/gtk/notification.py:176
+#: gajim/gui_interface.py:442 gajim/gtk/notification.py:176
 msgid "Unsubscribed"
 msgstr ""
 
-#: gajim/gui_interface.py:465
+#: gajim/gui_interface.py:454
 #, python-format
 msgid "%(jid)s declined the invitation: %(reason)s"
 msgstr ""
 
-#: gajim/gui_interface.py:469
+#: gajim/gui_interface.py:458
 #, python-format
 msgid "%(jid)s declined the invitation"
 msgstr ""
 
-#: gajim/gui_interface.py:485
+#: gajim/gui_interface.py:474
 #, python-brace-format
 msgid "You are invited to {room} by {user}"
 msgstr ""
 
-#: gajim/gui_interface.py:506
+#: gajim/gui_interface.py:495
 #, fuzzy
 msgid "Certificate Passphrase Required"
 msgstr "Passphrase Required"
 
-#: gajim/gui_interface.py:507
+#: gajim/gui_interface.py:496
 #, fuzzy, python-format
 msgid "Enter the certificate passphrase for account %s"
 msgstr "Enter your password for account %s"
 
-#: gajim/gui_interface.py:516 gajim/gtk/accounts.py:963
+#: gajim/gui_interface.py:505 gajim/gtk/accounts.py:966
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Enter your password for account %s"
 
-#: gajim/gui_interface.py:529 gajim/gtk/accounts.py:964
+#: gajim/gui_interface.py:518
+msgid "Password Required"
+msgstr "Password Required"
+
+#: gajim/gui_interface.py:518 gajim/gtk/accounts.py:967
 msgid "Save password"
 msgstr "Save password"
 
-#: gajim/gui_interface.py:601 gajim/gui_interface.py:632
+#: gajim/gui_interface.py:587 gajim/gui_interface.py:618
+#: gajim/gtk/filetransfer.py:332 gajim/gtk/filetransfer.py:333
 #: gajim/gtk/notification.py:173 gajim/gtk/notification.py:276
 msgid "File Transfer Error"
 msgstr "File Transfer Error"
 
-#: gajim/gui_interface.py:666
+#: gajim/gui_interface.py:652
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s wants to send you a file."
 
-#: gajim/gui_interface.py:668 gajim/gtk/filetransfer.py:479
+#: gajim/gui_interface.py:654 gajim/gtk/filetransfer.py:484
 #: gajim/gtk/notification.py:172 gajim/gtk/notification.py:274
 msgid "File Transfer Request"
 msgstr "File Transfer Request"
 
-#: gajim/gui_interface.py:767
+#: gajim/gui_interface.py:753
 #, fuzzy
 msgid "Remote Contact Stopped Transfer"
 msgstr "Removes contact from roster"
 
-#: gajim/gui_interface.py:772
+#: gajim/gui_interface.py:758
 #, fuzzy
 msgid "Error Opening File"
 msgstr "Unable to load idle module"
 
-#: gajim/gui_interface.py:782
+#: gajim/gui_interface.py:768
 #, fuzzy
 msgid "SSL Certificate Error"
 msgstr "Blogas CA sertifikatas"
 
-#: gajim/gui_interface.py:795 gajim/gui_interface.py:826
-#: gajim/gui_interface.py:853 gajim/gtk/notification.py:174
+#: gajim/gui_interface.py:781 gajim/gui_interface.py:812
+#: gajim/gui_interface.py:839 gajim/gtk/notification.py:174
 #: gajim/gtk/notification.py:279
 msgid "File Transfer Stopped"
 msgstr "File Transfer Stopped"
 
-#: gajim/gui_interface.py:799
+#: gajim/gui_interface.py:785
 #, fuzzy
 msgid "File Transfer Failed"
 msgstr "Failų siuntimai"
 
-#: gajim/gui_interface.py:822
+#: gajim/gui_interface.py:808
 #, fuzzy, python-format
 msgid "%(filename)s received from %(name)s."
 msgstr "File transfer of %(filename)s from %(name)s stopped."
 
-#: gajim/gui_interface.py:827
+#: gajim/gui_interface.py:813
 #, 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:833
+#: gajim/gui_interface.py:819
 #, 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:848
+#: gajim/gui_interface.py:834
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "You successfully sent %(filename)s to %(name)s."
 
-#: gajim/gui_interface.py:854
+#: gajim/gui_interface.py:840
 #, 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:860
+#: gajim/gui_interface.py:846
 #, 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:971
+#: gajim/gui_interface.py:957
 msgid "Username Conflict"
 msgstr "Username Conflict"
 
-#: gajim/gui_interface.py:972
+#: gajim/gui_interface.py:958
 msgid "Please type a new username for your local account"
 msgstr "Please type a new username for your local account"
 
-#: gajim/gui_interface.py:995
+#: gajim/gui_interface.py:981
 msgid "Resource Conflict"
 msgstr ""
 
-#: gajim/gui_interface.py:996
+#: gajim/gui_interface.py:982
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
 msgstr ""
 
-#: gajim/gui_interface.py:1053
+#: gajim/gui_interface.py:1039
 #, fuzzy, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s wants to send you a file."
 
-#: gajim/gui_interface.py:1055
+#: gajim/gui_interface.py:1041
 #, fuzzy
 msgid "Voice Chat Request"
 msgstr "File Transfer Request"
 
-#: gajim/gui_interface.py:1123 gajim/gtk/account_wizard.py:312
+#: gajim/gui_interface.py:1109 gajim/gtk/account_wizard.py:312
 msgid "Certificate Already in File"
 msgstr ""
 
-#: gajim/gui_interface.py:1124 gajim/gtk/account_wizard.py:313
+#: gajim/gui_interface.py:1110 gajim/gtk/account_wizard.py:313
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr ""
 
-#: gajim/gui_interface.py:1145
+#: gajim/gui_interface.py:1131
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid"
 msgstr ""
 
-#: gajim/gui_interface.py:1148
+#: gajim/gui_interface.py:1134
 #, python-format
 msgid ""
 "\n"
 "Unknown SSL error: %d"
 msgstr ""
 
-#: gajim/gui_interface.py:1150
+#: gajim/gui_interface.py:1136
 #, python-format
 msgid ""
 "\n"
 "SSL Error: <b>%s</b>"
 msgstr ""
 
-#: gajim/gui_interface.py:1155
+#: gajim/gui_interface.py:1141
 msgid "Error verifying SSL certificate"
 msgstr ""
 
-#: gajim/gui_interface.py:1156
+#: gajim/gui_interface.py:1142
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your XMPP server: "
@@ -2132,7 +2110,7 @@ msgid ""
 "Do you still want to connect to this server?"
 msgstr ""
 
-#: gajim/gui_interface.py:1160 gajim/gtk/account_wizard.py:412
+#: gajim/gui_interface.py:1146 gajim/gtk/account_wizard.py:413
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -2142,203 +2120,196 @@ msgid ""
 "%(sha256)s"
 msgstr ""
 
-#: gajim/gui_interface.py:1166
+#: gajim/gui_interface.py:1152
 msgid "Ignore this error for this certificate."
 msgstr ""
 
-#: gajim/gui_interface.py:1174
+#: gajim/gui_interface.py:1160
 #, fuzzy, python-format
 msgid "SSL Certificate Verification for %s"
 msgstr "Adding Special Notification for %s"
 
-#: gajim/gui_interface.py:1442 gajim/gtk/join_groupchat.py:235
-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/gui_interface.py:1448
-#, fuzzy
-msgid "JID is not a Groupchat"
-msgstr "This is not a group chat"
-
-#: gajim/gui_interface.py:1579
-msgid "This is not a group chat"
-msgstr "This is not a group chat"
-
-#: gajim/gui_interface.py:1580
-#, python-format
-msgid ""
-"%(room_jid)s is already in your roster. Please check if %(room_jid)s is a "
-"correct group chat name. If it is, delete it from your roster and try "
-"joining the group chat again."
-msgstr ""
-
-#: gajim/gui_interface.py:1604 gajim/dialog_messages.py:58
+#: gajim/gui_interface.py:1577
 msgid "You cannot join a group chat while you are invisible"
 msgstr "You cannot join a group chat while you are invisible"
 
-#: gajim/gui_interface.py:2037
+#: gajim/gui_interface.py:1976
 msgid "Could not save your settings and preferences"
 msgstr "Could not save your settings and preferences"
 
-#: gajim/gui_interface.py:2098
+#: gajim/gui_interface.py:2037
 msgid "Gajim: IPython Console"
 msgstr ""
 
-#: gajim/dialog_messages.py:32
+#: gajim/dialog_messages.py:31 gajim/dialog_messages.py:36
+#: gajim/gtk/single_message.py:305 gajim/gtk/account_wizard.py:229
 #, fuzzy
-msgid "You can not start a new conversation unless you are connected."
-msgstr "You can not join a group chat unless you are connected."
-
-#: gajim/dialog_messages.py:36 gajim/dialog_messages.py:41
-#: gajim/gtk/single_message.py:305 gajim/gtk/join_groupchat.py:211
-#: gajim/gtk/account_wizard.py:229
-msgid "Invalid JID"
-msgstr "Invalid JID"
+msgid "Invalid XMPP Address"
+msgstr "Invalid File"
 
-#: gajim/dialog_messages.py:42 gajim/gtk/single_message.py:306
+#: gajim/dialog_messages.py:37
 #, python-format
-msgid "It is not possible to send a message to %s, this JID is not valid."
+msgid ""
+"It is not possible to send a message to %s. This XMPP Address is not valid."
 msgstr ""
 
-#: gajim/dialog_messages.py:47
-msgid "Unread events"
+#: gajim/dialog_messages.py:42
+#, fuzzy
+msgid "Unread Events"
 msgstr "Unread events"
 
-#: gajim/dialog_messages.py:48
-msgid "Read all pending events before removing this account."
+#: gajim/dialog_messages.py:43
+#, fuzzy
+msgid "Read or acknowledge all pending events before removing this account."
 msgstr "Read all pending events before removing this account."
 
-#: gajim/dialog_messages.py:52
+#: gajim/dialog_messages.py:48
 #, fuzzy
 msgid "Invalid Form"
 msgstr "Invalid File"
 
-#: gajim/dialog_messages.py:53
+#: gajim/dialog_messages.py:49
 msgid "The form is not filled correctly."
 msgstr ""
 
-#: gajim/dialog_messages.py:57 gajim/common/helpers.py:309
+#: gajim/dialog_messages.py:53 gajim/common/helpers.py:315
 msgid "Invisible"
 msgstr "Nematomas"
 
-#: gajim/dialog_messages.py:62
+#: gajim/dialog_messages.py:54
 #, fuzzy
-msgid "A connection is not available"
+msgid "You cannot join a group chat while being invisible."
+msgstr "You cannot join a group chat while you are invisible"
+
+#: gajim/dialog_messages.py:58
+#, fuzzy
+msgid "No Connection Available"
 msgstr "Connection not available"
 
-#: gajim/dialog_messages.py:63
+#: gajim/dialog_messages.py:59
 #, fuzzy
 msgid "Your message can not be sent until you are connected."
 msgstr "You can not join a group chat unless you are connected."
 
-#: gajim/dialog_messages.py:67
-#, fuzzy
-msgid "JID already in list"
-msgstr "Contact already in roster"
+#: gajim/dialog_messages.py:63
+msgid "XMPP Address Already in List"
+msgstr ""
 
-#: gajim/dialog_messages.py:68
-msgid "The JID you entered is already in the list. Choose another one."
+#: gajim/dialog_messages.py:64
+#, fuzzy
+msgid ""
+"The XMPP Address you entered is already in the list. Please choose another "
+"one."
 msgstr ""
+"This name is already used by another of your accounts. Please choose another "
+"name."
 
-#: gajim/dialog_messages.py:72
-msgid "Invalid answer"
+#: gajim/dialog_messages.py:69
+#, fuzzy
+msgid "Invalid Answer"
 msgstr "Invalid answer"
 
-#: gajim/dialog_messages.py:73
+#: gajim/dialog_messages.py:70
 #, python-format
 msgid "Transport %(name)s answered wrongly to register request: %(error)s"
 msgstr ""
 "Pernaša %(name)s atsiuntė klaidingą atsakymą į registravimo užklausą: "
 "%(error)s"
 
-#: gajim/dialog_messages.py:78
+#: gajim/dialog_messages.py:75
 #, fuzzy
 msgid "Wrong Custom Hostname"
 msgstr "Naudoti parinktą serverio adresą/prievadą"
 
-#: gajim/dialog_messages.py:79
+#: gajim/dialog_messages.py:76
 #, fuzzy, python-format
-msgid "Wrong custom hostname \"%s\". Ignoring it."
+msgid "Custom hostname \"%s\" is wrong. It will be ignored."
 msgstr "Naudoti parinktą serverio adresą/prievadą"
 
-#: gajim/dialog_messages.py:83
-msgid "Error while removing privacy list"
+#: gajim/dialog_messages.py:80
+#, fuzzy
+msgid "Error While Removing Privacy List"
 msgstr "Error while removing privacy list"
 
-#: gajim/dialog_messages.py:84
+#: gajim/dialog_messages.py:81
 #, python-format
 msgid ""
-"Privacy list %s has not been removed. It is maybe active in one of your "
-"connected resources. Deactivate it and try again."
+"Privacy list %s has not been removed. It is probably active in one of your "
+"connected resources. Please deactivate it and try again."
 msgstr ""
 
-#: gajim/dialog_messages.py:90
-msgid "Invisibility not supported"
+#: gajim/dialog_messages.py:87
+#, fuzzy
+msgid "Invisibility Not Supported"
 msgstr "Nematomumo funkcijos nėra"
 
-#: gajim/dialog_messages.py:91
-#, python-format
-msgid "Account %s doesn't support invisibility."
-msgstr ""
+#: gajim/dialog_messages.py:88
+#, fuzzy, python-format
+msgid "This account %s doesn't support invisibility."
+msgstr "Šis kontaktas neturi failų siuntimo funkcijos."
 
-#: gajim/dialog_messages.py:95
-msgid "Unregister failed"
+#: gajim/dialog_messages.py:92
+#, fuzzy
+msgid "Unregister Failed"
 msgstr "Išsiregistruoti nepavyko"
 
-#: gajim/dialog_messages.py:96
-#, python-format
-msgid "Unregistration with server %(server)s failed: %(error)s"
-msgstr ""
+#: gajim/dialog_messages.py:93
+#, fuzzy, python-format
+msgid "Unregistration on server %(server)s failed: %(error)s"
+msgstr "Nepavyko prisijungti prie proksi"
 
-#: gajim/dialog_messages.py:100
-msgid "Registration succeeded"
+#: gajim/dialog_messages.py:97
+#, fuzzy
+msgid "Registration Succeeded"
 msgstr "Registracija sėkminga"
 
-#: gajim/dialog_messages.py:101
-#, python-format
-msgid "Registration with agent %s succeeded"
-msgstr ""
+#: gajim/dialog_messages.py:98
+#, fuzzy, python-format
+msgid "Registration with agent %s succeeded."
+msgstr "Registracija sėkminga"
 
-#: gajim/dialog_messages.py:105 gajim/gtk/service_registration.py:215
-msgid "Registration failed"
+#: gajim/dialog_messages.py:102
+#, fuzzy
+msgid "Registration Failed"
 msgstr "Registracija nesėkminga"
 
-#: gajim/dialog_messages.py:106
+#: gajim/dialog_messages.py:103
 #, python-format
 msgid ""
 "Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
 msgstr ""
 
-#: gajim/dialog_messages.py:111
+#: gajim/dialog_messages.py:108
 #, fuzzy
 msgid "Unable to Join Group Chat"
 msgstr "Unable to join group chat"
 
-#: gajim/dialog_messages.py:116
-msgid "GStreamer error"
+#: gajim/dialog_messages.py:113
+msgid "GStreamer Error"
 msgstr ""
 
-#: gajim/dialog_messages.py:117
+#: gajim/dialog_messages.py:114
 #, fuzzy, python-format
 msgid ""
 "Error: %(error)s\n"
 "Debug: %(debug)s"
 msgstr "Error message: %s"
 
-#: gajim/dialog_messages.py:121
+#: gajim/dialog_messages.py:118
 #, fuzzy
-msgid "Wrong host"
+msgid "Wrong Host"
 msgstr "MUC serveris"
 
-#: gajim/dialog_messages.py:122
+#: gajim/dialog_messages.py:119
 msgid "Invalid local address? :-O"
 msgstr ""
 
-#: gajim/dialog_messages.py:126
-msgid "Avahi error"
+#: gajim/dialog_messages.py:123
+#, fuzzy
+msgid "Avahi Error"
 msgstr "Avahi error"
 
-#: gajim/dialog_messages.py:127
+#: gajim/dialog_messages.py:124
 #, python-format
 msgid ""
 "%s\n"
@@ -2347,66 +2318,66 @@ msgstr ""
 "%s\n"
 "Link-local messaging might not work properly."
 
-#: gajim/dialog_messages.py:131 gajim/dialog_messages.py:136
+#: gajim/dialog_messages.py:128 gajim/dialog_messages.py:133
 #, fuzzy
-msgid "Could not request upload slot"
+msgid "Could not request upload slot for HTTP File Upload"
 msgstr "Could not start local service"
 
-#: gajim/dialog_messages.py:137
-msgid "Got unexpected response from server (see log)"
+#: gajim/dialog_messages.py:134
+msgid "Got unexpected response from server (see log)."
 msgstr ""
 
-#: gajim/dialog_messages.py:141 gajim/dialog_messages.py:146
+#: gajim/dialog_messages.py:138 gajim/dialog_messages.py:143
 #, fuzzy
-msgid "Could not open file"
+msgid "Could not Open File"
 msgstr "Could not load image"
 
-#: gajim/dialog_messages.py:142
-msgid "Exception raised while opening file (see log)"
+#: gajim/dialog_messages.py:139
+msgid "Exception raised while trying to open file (see log)."
 msgstr ""
 
-#: gajim/dialog_messages.py:151
-msgid "Unsecure"
-msgstr ""
+#: gajim/dialog_messages.py:148
+#, fuzzy
+msgid "Not Secure"
+msgstr "Not in roster"
 
-#: gajim/dialog_messages.py:152
-msgid "Server returned unsecure transport (HTTP)"
+#: gajim/dialog_messages.py:149
+msgid "The server returned an insecure transport (HTTP)."
 msgstr ""
 
-#: gajim/dialog_messages.py:156
+#: gajim/dialog_messages.py:153
 #, fuzzy
-msgid "Could not upload file"
+msgid "Could not Upload File"
 msgstr "Could not load image"
 
-#: gajim/dialog_messages.py:157
+#: gajim/dialog_messages.py:154
 #, python-format
 msgid "HTTP response code from server: %s"
 msgstr ""
 
-#: gajim/dialog_messages.py:161
+#: gajim/dialog_messages.py:158
 msgid "Upload Error"
 msgstr ""
 
-#: gajim/dialog_messages.py:166
+#: gajim/dialog_messages.py:163
 #, fuzzy
 msgid "Encryption Error"
 msgstr "Encryption enabled"
 
-#: gajim/dialog_messages.py:167
-#, fuzzy
-msgid "For the chosen encryption there is no encryption method available"
-msgstr "Connection not available"
+#: gajim/dialog_messages.py:164
+msgid "There is no encryption method available for the chosen encryption."
+msgstr ""
 
-#: gajim/dialog_messages.py:171
+#: gajim/dialog_messages.py:169
 #, fuzzy
-msgid "Avatar upload failed"
+msgid "Avatar Upload Failed"
 msgstr "vCard publication failed"
 
-#: gajim/privatechat_control.py:204
+#: gajim/privatechat_control.py:207
 msgid "Sending private message failed"
 msgstr "Sending private message failed"
 
-#: gajim/privatechat_control.py:206
+#: gajim/privatechat_control.py:209
 #, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr ""
@@ -2429,7 +2400,7 @@ msgstr "show help on command"
 
 #: gajim/gajim_remote.py:85
 #, fuzzy
-msgid "Lists all contacts in roster, one for each line"
+msgid "Lists all contacts in the contact list, one for each line"
 msgstr ""
 "Prints a list of all contacts in the roster. Each contact appears on a "
 "separate line"
@@ -2508,11 +2479,13 @@ msgstr ""
 
 #: gajim/gajim_remote.py:118
 #, fuzzy
-msgid "Sends new chat message to a contact in the roster. Account is optional."
+msgid ""
+"Sends new chat message to a contact in the contact list. Account is optional."
 msgstr "Usage: /%s, hide the chat buttons."
 
 #: gajim/gajim_remote.py:120 gajim/gajim_remote.py:130
-msgid "JID of the contact that will receive the message"
+#, fuzzy
+msgid "XMPP Address of the contact that will receive the message"
 msgstr "JID of the contact that will receive the message"
 
 #: gajim/gajim_remote.py:121 gajim/gajim_remote.py:132
@@ -2526,8 +2499,10 @@ msgid "if specified, the message will be sent using this account"
 msgstr "if specified, the message will be sent using this account"
 
 #: gajim/gajim_remote.py:127
-msgid "Sends a chat message to someone on your roster. Account is optional."
-msgstr ""
+#, fuzzy
+msgid ""
+"Sends a chat message to someone on your contact list. Account is optional."
+msgstr "Usage: /%s, hide the chat buttons."
 
 #: gajim/gajim_remote.py:131
 msgid "subject"
@@ -2538,12 +2513,13 @@ msgid "message subject"
 msgstr "message subject"
 
 #: gajim/gajim_remote.py:138
-msgid "Sends new message to a groupchat you've joined."
+msgid "Sends new message to a group chat you've joined."
 msgstr ""
 
 #: gajim/gajim_remote.py:140
-msgid "JID of the room that will receive the message"
-msgstr ""
+#, fuzzy
+msgid "XMPP Address of the group chat that will receive the message"
+msgstr "JID of the contact that will receive the message"
 
 #: gajim/gajim_remote.py:147
 msgid "Gets detailed info on a contact"
@@ -2551,7 +2527,8 @@ msgstr "Gets detailed info on a contact"
 
 #: gajim/gajim_remote.py:149 gajim/gajim_remote.py:162
 #: gajim/gajim_remote.py:192
-msgid "JID of the contact"
+#, fuzzy
+msgid "XMPP Address of the contact"
 msgstr "JID of the contact"
 
 #: gajim/gajim_remote.py:153
@@ -2612,7 +2589,8 @@ msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Writes the current state of Gajim preferences to the .config file"
 
 #: gajim/gajim_remote.py:190
-msgid "Removes contact from roster"
+#, fuzzy
+msgid "Removes contact from contact list"
 msgstr "Removes contact from roster"
 
 #: gajim/gajim_remote.py:193
@@ -2659,9 +2637,9 @@ msgid "Missing argument \"contact_jid\""
 msgstr "Missing argument \"contact_jid\""
 
 #: gajim/gajim_remote.py:275
-#, python-format
+#, fuzzy, python-format
 msgid ""
-"'%s' is not in your roster.\n"
+"'%s' is not in your contact list.\n"
 "Please specify account for sending the message."
 msgstr ""
 "'%s' is not in your roster.\n"
@@ -2878,12 +2856,12 @@ msgstr ""
 msgid "Weekend!"
 msgstr ""
 
-#: gajim/common/logger.py:192 gajim/common/logger.py:197
+#: gajim/common/logger.py:189 gajim/common/logger.py:194
 #, 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:217
+#: gajim/common/logger.py:214
 #, fuzzy, python-format
 msgid "Creating %s"
 msgstr "creating %s directory"
@@ -2957,34 +2935,36 @@ msgstr "%(nickname)s Signed Out"
 msgid "Contact Signed Out"
 msgstr "Contact Signed Out"
 
-#: gajim/common/contacts.py:455
-msgid "Not in roster"
-msgstr "Not in roster"
-
 #: gajim/common/config.py:80
+#, fuzzy
 msgid ""
 "Show desktop notification even when a chat window is opened for this contact "
-"and does not have focus"
+"and does not have focus."
 msgstr ""
+"Leisti pop-up/informavimą, kai esu _nuėjęs/nepasiekamas/užimtas/namatomas"
 
 #: gajim/common/config.py:81
-msgid "Play sound when user is busy"
+msgid "Play sound even when being busy."
 msgstr ""
 
 #: gajim/common/config.py:83
-msgid "Show only online and free for chat contacts in roster."
-msgstr ""
+#, fuzzy
+msgid "Show only online and free for chat contacts in the contact list."
+msgstr "Norėšiau jus įtraukti į savo kontaktų sąrašą."
 
 #: gajim/common/config.py:86
 msgid "Time in minutes, after which your status changes to away."
 msgstr "Time in minutes, after which your status changes to away."
 
 #: gajim/common/config.py:87
-msgid "$S (Away as a result of being idle more than $T min)"
+#, fuzzy
+msgid "$S (Away: Idle more than $T min)"
 msgstr "$S (Nutolęs, nes nesinaudoja kompiuteriu, daugiau kaip $T min)"
 
 #: gajim/common/config.py:87
-msgid "$S will be replaced by current status message, $T by autoawaytime."
+msgid ""
+"$S will be replaced by current status message, $T by the 'autoawaytime' "
+"value."
 msgstr ""
 
 #: gajim/common/config.py:89
@@ -2992,69 +2972,73 @@ msgid "Time in minutes, after which your status changes to not available."
 msgstr ""
 
 #: gajim/common/config.py:90
-msgid "$S (Not available as a result of being idle more than $T min)"
+#, fuzzy
+msgid "$S (Not available: Idle more than $T min)"
 msgstr "$S (Nepasiekiamas, nes nesinaudoja kompiuteriu daugiau kaip $T min)"
 
 #: gajim/common/config.py:90
-msgid "$S will be replaced by current status message, $T by autoxatime."
+msgid ""
+"$S will be replaced by current status message, $T by the 'autoxatime' value."
 msgstr ""
 
 #: gajim/common/config.py:93
 msgid ""
-"When to show notification area icon. Can be 'never', 'on_event', 'always'."
+"When to show the notification area icon. Can be 'never', 'on_event', and "
+"'always'."
 msgstr ""
 
 #: gajim/common/config.py:94
-msgid "Allow to hide the roster window even if the tray icon is not shown."
+msgid ""
+"Allow to hide the contact list window even if the notification area icon is "
+"not shown."
 msgstr ""
 
 #: gajim/common/config.py:97
 #, fuzzy
-msgid "Contact signed in notification color."
-msgstr "_Rodyti įvykį kontaktų sąraše"
+msgid "Notification color for contacts signing in."
+msgstr "Pranešti apie _prisijungusius kontaktus"
 
 #: gajim/common/config.py:98
 #, fuzzy
-msgid "Contact signout notification color"
-msgstr "_Rodyti įvykį kontaktų sąraše"
+msgid "Notification color for contacts signing out."
+msgstr "Pranešti apie _atsijungusius kontaktus"
 
 #: gajim/common/config.py:99
 #, fuzzy
-msgid "New message notification color."
+msgid "Notification color for new message notification."
 msgstr "_Rodyti įvykį kontaktų sąraše"
 
 #: gajim/common/config.py:100
 #, fuzzy
-msgid "File transfer request notification color."
-msgstr "File Transfer Request"
+msgid "Notification color for file transfer request."
+msgstr "_Pranešti, kai failo siuntimas bus baigtas"
 
 #: gajim/common/config.py:101
 #, fuzzy
-msgid "File transfer error notification color."
-msgstr "File transfer cancelled"
+msgid "Notification color for file transfer errors."
+msgstr "_Pranešti, kai failo siuntimas bus baigtas"
 
 #: gajim/common/config.py:102
-#, fuzzy
-msgid "File transfer complete or stopped notification color."
-msgstr "Rodyti pranešimą iššokstančiame lange, kai failo siuntimas baigsis  "
+msgid "Notification color for stopped or completed file transfers."
+msgstr ""
 
 #: gajim/common/config.py:103
-#, fuzzy
-msgid "Groupchat invitation notification color"
-msgstr "Groupchat Invitation"
+msgid "Notification color for group chat invitations."
+msgstr ""
 
 #: gajim/common/config.py:104
 #, fuzzy
-msgid "Background color of status changed notification"
+msgid "Notification background color for changed status."
 msgstr "Background colour of contacts when they just signed in."
 
 #: gajim/common/config.py:105
-msgid "Other dialogs color."
+msgid "Notification color for other dialogs."
 msgstr ""
 
 #: gajim/common/config.py:106
+#, fuzzy
 msgid ""
-"List (space separated) of rows (accounts and groups) that are collapsed."
+"List of rows (accounts and groups) that are collapsed (space separated)."
 msgstr ""
 "List (space separated) of rows (accounts and groups) that are collapsed."
 
@@ -3062,8 +3046,10 @@ msgstr ""
 msgid "default"
 msgstr "įprastas"
 
-#: gajim/common/config.py:113
-msgid "Language used by speller"
+#: gajim/common/config.py:113 gajim/common/config.py:424
+#: gajim/common/config.py:431
+#, fuzzy
+msgid "Language used for spell checking."
 msgstr "Language used by speller"
 
 #: gajim/common/config.py:114
@@ -3079,8 +3065,8 @@ msgstr ""
 #: gajim/common/config.py:115
 msgid ""
 "Print time in chats using Fuzzy Clock. Value of fuzziness from 1 to 4, or 0 "
-"to disable fuzzyclock. 1 is the most precise clock, 4 the least precise one. "
-"This is used only if print_time is 'sometimes'."
+"to disable Fuzzy Clock. 1 is the most precise clock, 4 the least precise "
+"one. This is used only if 'print_time' is 'sometimes'."
 msgstr ""
 
 #: gajim/common/config.py:117
@@ -3094,546 +3080,573 @@ msgstr "Treat * / _ pairs as possible formatting characters."
 #: gajim/common/config.py:120
 #, fuzzy
 msgid ""
-"If true, do not remove */_ . So *abc* will be bold but with * * not removed."
+"If enabled, do not remove */_ . So *abc* will be bold but with * * not "
+"removed."
 msgstr ""
 "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
 
 #: gajim/common/config.py:123
+#, fuzzy
 msgid ""
-"Uses ReStructured text markup to send HTML, plus ascii formatting if "
-"selected. For syntax, see http://docutils.sourceforge.net/docs/ref/rst/"
-"restructuredtext.html (If you want to use this, install docutils)"
+"Uses ReStructured text markup to send HTML, plus ASCII formatting if "
+"selected. Needs docutils installed (for syntax, see http://docutils."
+"sourceforge.net/docs/ref/rst/restructuredtext.html)."
 msgstr ""
 "Uses ReStructured text markup to send HTML, plus ascii formatting if "
 "selected. For syntax, see http://docutils.sourceforge.net/docs/ref/rst/"
 "restructuredtext.html (If you want to use this, install docutils)"
 
 #: gajim/common/config.py:132
+#, fuzzy
 msgid ""
-"Character to add after nickname when using nick completion (tab) in group "
-"chat."
+"Character to add after nickname when using nickname completion (tab) in "
+"group chat."
 msgstr ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
 
 #: gajim/common/config.py:133
+#, fuzzy
 msgid ""
-"Character to propose to add after desired nickname when desired nickname is "
-"used by someone else in group chat."
+"Character to propose to add after desired nickname when nickname is already "
+"used in group chat."
 msgstr ""
 "Character to propose to add after desired nickname when desired nickname is "
 "used by someone else in group chat."
 
 #: gajim/common/config.py:155
 msgid ""
-"If true, Gajim will save roster position when hiding roster, and restore it "
-"when showing roster."
+"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:161
-msgid "Place the roster on the right in single window mode"
+msgid "Place the contact list on the right in single window mode"
 msgstr ""
 
 #: gajim/common/config.py:167
 #, fuzzy
 msgid ""
-"This option let you customize timestamp that is printed in conversation. For "
-"example \"[%H:%M] \" will show \"[hour:minute] \". See python doc on "
-"strftime for full documentation: http://docs.python.org/lib/module-time.html"
+"This option lets you customize the timestamp that is printed in "
+"conversation. For example '[%H:%M] ' will show '[hour:minute] '. See python "
+"doc on strftime for full documentation (https://docs.python.org/3/library/"
+"time.html)."
 msgstr ""
 "This option let you customize timestamp that is printed in conversation. For "
 "exemple \"[%H:%M] \" will show \"[hour:minute] \". See python doc on "
 "strftime for full documentation: http://docs.python.org/lib/module-time.html"
 
 #: gajim/common/config.py:168
-msgid "Characters that are printed before the nickname in conversations"
+#, 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:169
-msgid "Characters that are printed after the nickname in conversations"
+#, 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:170
-msgid "Add * and [n] in roster title?"
-msgstr "Add * and [n] in roster title?"
+#, 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:171
 #, fuzzy
 msgid ""
-"How many history messages should be restored when a chat tab/window is "
-"reopened?"
+"Number of messages from chat history to be restored when a chat tab/window "
+"is reopened."
 msgstr ""
 "How many lines to remember from previous conversation when a chat tab/window "
 "is reopened."
 
 #: gajim/common/config.py:172
-msgid "How far back in time (minutes) history is restored. -1 means no limit."
+msgid ""
+"How far back in time (minutes) chat history is restored. -1 means no limit."
 msgstr ""
 
 #: gajim/common/config.py:173
 msgid ""
-"How many lines to request from server when entering a groupchat. -1 means no "
-"limit"
+"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:174
 msgid ""
-"Minutes of backlog to request when entering a groupchat. -1 means no limit"
+"Should automatic rejoin be activated when you were kicked from a group chat?"
 msgstr ""
 
 #: gajim/common/config.py:175
-msgid ""
-"How many seconds to wait before trying to autorejoin to a conference you are "
-"being disconnected from. Set to 0 to disable autorejoining."
-msgstr ""
-
-#: gajim/common/config.py:176
-msgid "Should autorejoin be activated when kicked from a conference?"
-msgstr ""
-
-#: gajim/common/config.py:177
-msgid ""
-"Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
-"Client default behaviour)."
+#, 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:179
-msgid "How many lines to store for Ctrl+KeyUP."
+#: gajim/common/config.py:177
+#, 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:182
+#: gajim/common/config.py:180
 #, fuzzy, python-format
 msgid ""
-"Either custom URL with %%s in it where %%s is the word/phrase or "
-"'WIKTIONARY' which means use Wikitionary."
+"Either a custom URL with %%s in it (where %%s is the word/phrase) or "
+"'WIKTIONARY' (which means use Wikitionary)."
 msgstr ""
 "Either custom URL with %s in it where %s is the word/phrase or 'WIKTIONARY' "
 "which means use wiktionary."
 
-#: gajim/common/config.py:185
+#: gajim/common/config.py:183
 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:187
+#: gajim/common/config.py:185
+#, fuzzy
 msgid ""
-"When not printing time for every message (print_time==sometimes), print it "
+"When not printing time for every message ('print_time'==sometimes), print it "
 "every x minutes."
 msgstr ""
 "When not printing time for every message (print_time==sometimes), print it "
 "every x minutes."
 
-#: gajim/common/config.py:188
+#: gajim/common/config.py:186
 msgid "Ask before pasting an image."
 msgstr ""
 
-#: gajim/common/config.py:189
+#: gajim/common/config.py:187
 msgid "Ask before closing a group chat tab/window."
 msgstr "Ask before closing a group chat tab/window."
 
-#: gajim/common/config.py:190
+#: gajim/common/config.py:188
 #, fuzzy
 msgid ""
-"Always ask for confirmation before closing groupchats with any of the JIDs "
-"on this space separated list."
+"Always ask for confirmation before closing group chats with any of the XMPP "
+"Addresses on this list (space separated)."
 msgstr ""
 "Always ask before closing group chat tab/window in this space separated list "
 "of group chat jids."
 
-#: gajim/common/config.py:191
+#: gajim/common/config.py:189
 #, fuzzy
 msgid ""
-"Never ask for confirmation before closing groupchats with any of the JIDs on "
-"this space separated list."
+"Never ask for confirmation before closing group chats with any of the XMPP "
+"Addresses on this list (space separated)."
 msgstr ""
 "Never ask before closing group chat tab/window in this space separated list "
 "of group chat jids."
 
-#: gajim/common/config.py:192
+#: gajim/common/config.py:190
 msgid ""
-"Ask before closing tabbed chat window if there are controls that can lose "
-"data (chat, private chat, groupchat that will not be minimized)"
+"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:195
+#: gajim/common/config.py:193
 msgid ""
-"Comma separated list of sent hosts, in addition of local interfaces, for "
-"File Transfer in case of address translation/port forwarding."
+"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:196
+#: gajim/common/config.py:194
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 
-#: gajim/common/config.py:198
+#: gajim/common/config.py:196
 #, fuzzy
 msgid "Notify of events in the notification area."
 msgstr "Notify of events in the system trayicon."
 
-#: gajim/common/config.py:199
+#: gajim/common/config.py:197
 msgid ""
-"If False, Gajim will display a static event icon instead of the blinking "
-"status icon in the notification area when notifying on event."
+"If disabled, Gajim will display a static event icon instead of the blinking "
+"status icon in the notification area when notifying about an event."
 msgstr ""
 
-#: gajim/common/config.py:205
+#: gajim/common/config.py:203
 msgid "Show tab when only one conversation?"
 msgstr "Show tab when only one conversation?"
 
-#: gajim/common/config.py:206
+#: gajim/common/config.py:204
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "Show tabbed notebook border in chat windows?"
 
-#: gajim/common/config.py:207
+#: gajim/common/config.py:205
 msgid "Show close button in tab?"
 msgstr "Show close button in tab?"
 
-#: gajim/common/config.py:220
+#: gajim/common/config.py:218
 msgid "Preview new messages in notification popup?"
 msgstr ""
 
-#: gajim/common/config.py:223
+#: gajim/common/config.py:221
+#, fuzzy
 msgid ""
-"A semicolon-separated list of words that will be highlighted in group chats."
+"A list of words (semicolon separated) that will be highlighted in group "
+"chats."
 msgstr ""
 "A semicolon-separated list of words that will be highlighted in group chats."
 
-#: gajim/common/config.py:224
+#: gajim/common/config.py:222
 #, fuzzy
 msgid ""
-"If true, quits Gajim when X button of Window Manager is clicked. This "
-"setting is taken into account only if notification icon is used."
+"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 ""
 "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:225
+#: gajim/common/config.py:223
 msgid ""
-"If true, Gajim hides the Roster window on pressing the X button instead of "
-"minimizing into the Dock."
+"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:226
+#: gajim/common/config.py:224
 #, fuzzy
 msgid ""
-"If true, Gajim will display an icon on each tab containing unread messages. "
-"Depending on the theme, this icon may be animated."
+"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:227
+#: gajim/common/config.py:225
 #, fuzzy
 msgid ""
-"If true, Gajim will display the status message, if not empty, for every "
-"contact under the contact name in roster window."
+"If enabled, Gajim will display the status message (if not empty) underneath "
+"the contact name in the contact list window."
 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:233
-msgid "Define the position of the avatar in roster. Can be left or right"
+#: gajim/common/config.py:231
+msgid ""
+"Define the position of avatars in the contact list. Can be 'left' or 'right'."
 msgstr ""
 
-#: gajim/common/config.py:234
+#: gajim/common/config.py:232
 #, fuzzy
 msgid ""
-"If False, Gajim will no longer print status line in chats when a contact "
-"changes their status and/or their status message."
+"If disabled, Gajim will no longer print status messages in chats when a "
+"contact changes their status (and/or their status message)."
 msgstr ""
 "If False, Gajim will no longer print status line in chats when a contact "
 "changes his or her status and/or status message."
 
-#: gajim/common/config.py:235
+#: gajim/common/config.py:233
 #, fuzzy
 msgid ""
 "Default Setting: Show a status message for every join or leave in a group "
-"chat"
+"chat."
 msgstr "Unable to join group chat"
 
-#: gajim/common/config.py:236
+#: gajim/common/config.py:234
+#, fuzzy
 msgid ""
-"Default Setting: Show a status message for all status (away, dnd, etc.) "
-"changes of users in a group chat"
-msgstr ""
+"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:238
-msgid "Log XHTML messages instead of plain text messages."
+#: gajim/common/config.py:236
+msgid "Store XHTML messages in chat history instead of plain text messages."
 msgstr ""
 
-#: gajim/common/config.py:239
+#: gajim/common/config.py:237
 msgid "Don't show avatar for the transport itself."
 msgstr "Don't show avatar for the transport itself."
 
-#: gajim/common/config.py:240
-msgid "Don't show roster in the system taskbar."
+#: gajim/common/config.py:238
+#, 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:241
+#: gajim/common/config.py:239
 #, fuzzy
 msgid ""
-"If true, make the window flash (the default behaviour in most Window "
-"Managers) when holding pending events."
+"If enabled, Gajim makes the window flash (the default behaviour in most "
+"Window Managers) when holding pending events."
 msgstr ""
 "If True and installed GTK+ and PyGTK versions are at least 2.8, make the "
 "window flash (the default behaviour in most Window Managers) when holding "
 "pending events."
 
-#: gajim/common/config.py:245
+#: gajim/common/config.py:243
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
 "'always_with_roster' - Like 'always' but the messages are in a single window "
-"along with the roster.\n"
+"along with the contact list.\n"
 "'never' - All messages get their own window.\n"
 "'peracct' - Messages for each account are sent to a specific window.\n"
-"'pertype' - Each message type (e.g. chats vs. groupchats) is sent to a "
+"'pertype' - Each message type (e.g. chats vs. group chats) is sent to a "
 "specific window."
 msgstr ""
 
-#: gajim/common/config.py:246
+#: gajim/common/config.py:244
 msgid ""
-"Show roster on startup.\n"
-"'always' - Always show roster.\n"
-"'never' - Never show roster.\n"
-"'last_state' - Restore the last state roster."
+"Show contact list window on startup.\n"
+"'always' - Always show contact list window.\n"
+"'never' - Never show contact list window.\n"
+"'last_state' - Restore last state of the contact list window."
 msgstr ""
 
-#: gajim/common/config.py:247
-msgid "If False, you will no longer see the avatar in the chat window."
+#: gajim/common/config.py:245
+#, 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:248
+#: gajim/common/config.py:246
 #, fuzzy
-msgid "If true, pressing the escape key closes a tab/window."
+msgid "If enabled, pressing Esc closes a tab/window."
 msgstr "If True, pressing the escape key closes a tab/window."
 
-#: gajim/common/config.py:249
-msgid "Hides the banner in a group chat window"
+#: gajim/common/config.py:247
+#, fuzzy
+msgid "Hides the banner in a group chat window."
 msgstr "Hides the banner in a group chat window"
 
-#: gajim/common/config.py:250
-msgid "Hides the banner in two persons chat window"
-msgstr "Hides the banner in two persons chat window"
+#: gajim/common/config.py:248
+#, fuzzy
+msgid "Hides the banner in a 1:1 chat window."
+msgstr "Hides the banner in a group chat window"
 
-#: gajim/common/config.py:251
-msgid "Hides the group chat occupants list in group chat window."
+#: gajim/common/config.py:249
+#, 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:252
+#: gajim/common/config.py:250
+#, fuzzy
 msgid ""
 "In a chat, show the nickname at the beginning of a line only when it's not "
-"the same person talking than in previous message."
+"the same person talking as in the previous message."
 msgstr ""
 "In a chat, show the nickname at the beginning of a line only when it's not "
 "the same person talking than in previous message."
 
-#: gajim/common/config.py:253
+#: gajim/common/config.py:251
 msgid "Indentation when using merge consecutive nickname."
 msgstr "Indentation when using merge consecutive nickname."
 
-#: gajim/common/config.py:254
-msgid "Ctrl-Tab go to next composing tab when none is unread."
+#: gajim/common/config.py:252
+#, 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:255
+#: gajim/common/config.py:253
 #, fuzzy
 msgid ""
-"Show the confirm metacontacts creation dialog or not? Empty string means "
-"never show the dialog."
+"Show a confirmation dialog to create metacontacts? Empty string means never "
+"show the dialog."
 msgstr ""
 "Should we show the confirm metacontacts creation dialogue or not? Empty "
 "string means we never show the dialogue."
 
-#: gajim/common/config.py:256
+#: gajim/common/config.py:254
 #, fuzzy
 msgid ""
-"Show the confirm block contact dialog or not? Empty string means never show "
+"Show a confirmation dialog to block a contact? Empty string means never show "
 "the dialog."
 msgstr ""
 "Should we show the confirm metacontacts creation dialogue or not? Empty "
 "string means we never show the dialogue."
 
-#: gajim/common/config.py:257
+#: gajim/common/config.py:255
 #, fuzzy
 msgid ""
-"Show the confirm custom status dialog or not? Empty string means never show "
-"the dialog."
+"Show a confirmation dialog for a custom status? Empty string means never "
+"show the dialog."
 msgstr ""
 "Should we show the confirm metacontacts creation dialogue or not? Empty "
 "string means we never show the dialogue."
 
-#: gajim/common/config.py:258
+#: gajim/common/config.py:256
 #, fuzzy
 msgid ""
-"If true, you will be able to set a negative priority to your account in "
-"account modification window. BE CAREFUL, when you are logged in with a "
-"negative priority, you will NOT receive any message from your server."
+"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 ""
 "If True, you will be able to set a negative priority to your account in "
 "account modification window. BE CAREFUL, when you are logged in with a "
 "negative priority, you will NOT receive any message from your server."
 
-#: gajim/common/config.py:259
+#: gajim/common/config.py:257
 #, fuzzy
 msgid ""
-"If true, Gajim will show number of online and total contacts in account and "
-"group rows."
+"If enabled, Gajim will show both the number of online and total contacts in "
+"account rows as well as in group rows."
 msgstr ""
 "If True, Gajim will show number of online and total contacts in account and "
 "group rows."
 
-#: gajim/common/config.py:260
+#: gajim/common/config.py:258
+#, fuzzy
 msgid ""
-"Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
-"as if they were of this type"
+"Can be empty, 'chat' or 'normal'. If not empty, all incoming messages are "
+"treated as if they were of this type."
 msgstr ""
 "Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
 "as if they were of this type"
 
-#: gajim/common/config.py:261
+#: gajim/common/config.py:259
 msgid ""
-"If true, Gajim will scroll and select the contact who sent you the last "
-"message, if chat window is not already opened."
+"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:262
+#: gajim/common/config.py:260
 msgid "Time of inactivity needed before the change status window closes down."
 msgstr ""
 
-#: gajim/common/config.py:263
+#: gajim/common/config.py:261
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
 msgstr ""
 
-#: gajim/common/config.py:264
+#: gajim/common/config.py:262
 msgid ""
-"If true, notification windows from notification-daemon will be attached to "
-"notification icon."
+"If enabled, notification windows from notification-daemon will be attached "
+"to the notification area icon."
 msgstr ""
 
-#: gajim/common/config.py:265
+#: gajim/common/config.py:263
 msgid "Choose interval between 2 checks of idleness."
 msgstr ""
 
-#: gajim/common/config.py:266
+#: gajim/common/config.py:264
 msgid ""
-"Valid uri schemes. Only schemes in this list will be accepted as \"real\" "
-"uri. (mailto and xmpp are handled separately)"
+"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:267
-msgid "If true, completion in groupchats will be like a shell auto-completion"
+#: gajim/common/config.py:265
+msgid ""
+"If enabled, completion in group chats will be like a shell auto-completion."
+msgstr ""
+
+#: gajim/common/config.py:270
+msgid "Optionally fix Jingle output video framerate. Example: 10/1 or 25/2."
+msgstr ""
+
+#: gajim/common/config.py:271
+msgid "Optionally resize Jingle output video. Example: 320x240."
 msgstr ""
 
 #: gajim/common/config.py:272
-msgid "Optionally fix jingle output video framerate. Example: 10/1 or 25/2"
+msgid "If enabled, you will see your webcam's video stream as well."
 msgstr ""
 
-#: gajim/common/config.py:273
-msgid "Optionally resize jingle output video. Example: 320x240"
+#: gajim/common/config.py:275
+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:274
-msgid "If true, You will also see your webcam"
+#: gajim/common/config.py:276
+msgid "STUN server to use when using Jingle"
 msgstr ""
 
 #: gajim/common/config.py:277
 msgid ""
-"If true, Gajim will try to use a STUN server when using Jingle. The one in "
-"\"stun_server\" option, or the one given by the XMPP server."
+"If enabled, Gajim will show affiliation of group chat participants by adding "
+"a colored square to the status icon."
 msgstr ""
 
 #: gajim/common/config.py:278
-msgid "STUN server to use when using Jingle"
+msgid ""
+"Proxy used for all outgoing connections if the account does not have a "
+"specific proxy configured."
 msgstr ""
 
 #: gajim/common/config.py:279
-msgid ""
-"If true, Gajim will show affiliation of groupchat occupants by adding a "
-"colored square to the status icon"
+msgid "If enabled, Gajim will ignore incoming attention requests ('wizz')."
 msgstr ""
 
 #: gajim/common/config.py:280
 msgid ""
-"Proxy used for all outgoing connections if the account does not have a "
-"specific proxy configured"
+"If enabled, Gajim will reopen chat windows that were opened last time Gajim "
+"was closed."
 msgstr ""
 
 #: gajim/common/config.py:281
-msgid "If true, Gajim will ignore incoming attention requests (\"wizz\")."
+msgid ""
+"If enabled, Gajim will display an icon to show that sent messages have been "
+"received by your contact."
 msgstr ""
 
 #: gajim/common/config.py:282
-msgid ""
-"If enabled, Gajim will reopen chat windows that were opened last time Gajim "
-"was closed."
+msgid "Show a mini avatar in chat window tabs and as the window's icon."
 msgstr ""
 
 #: gajim/common/config.py:283
+#, fuzzy
 msgid ""
-"If enabled, Gajim will show an icon to show that sent message has been "
-"received by your contact"
+"If enabled, Gajim will use the System's Keyring to store account passwords."
 msgstr ""
+"If True, Gajim will use Gnome Keyring (if available) to store account "
+"passwords."
 
 #: gajim/common/config.py:284
-msgid "Show a mini avatar in chat window tabs and in window icon"
+msgid "If enabled, Gajim will execute XEP-0146 Commands."
 msgstr ""
 
 #: gajim/common/config.py:285
-#, fuzzy
-msgid "If true, Gajim will use the Systems Keyring to store account passwords."
+msgid "2: System, 1: Enabled, 0: Disabled"
 msgstr ""
-"If True, Gajim will use Gnome Keyring (if available) to store account "
-"passwords."
 
 #: gajim/common/config.py:286
-msgid "If true, Gajim will execute XEP-0146 Commands."
+msgid "Options in days which can be chosen in the sync threshold menu"
 msgstr ""
 
 #: gajim/common/config.py:287
-msgid "2: System, 1: Enabled, 0: Disabled"
+msgid ""
+"Maximum history in days we request from a public group chat archive. 0: As "
+"much as possible."
 msgstr ""
 
 #: gajim/common/config.py:288
-msgid "Options in days which can be chosen in the sync threshold menu"
+msgid ""
+"Maximum history in days we request from a private group chat archive. 0: As "
+"much as possible."
 msgstr ""
 
 #: gajim/common/config.py:289
 msgid ""
-"Maximum history in days we request from a public room archive. 0: As much as "
-"possible"
+"If enabled, Gajim shows the group chat subject in the chat window when "
+"joining."
 msgstr ""
 
 #: gajim/common/config.py:290
+#, fuzzy
 msgid ""
-"Maximum history in days we request from a private room archive. 0: As much "
-"as possible"
+"If enabled, the contact row is colored according to the current chat state "
+"of the contact."
 msgstr ""
+"Jei pažymėta, Gajim leis kitiems matyti kokią operacijų sistemą naudojate"
 
 #: gajim/common/config.py:291
-msgid "If the room subject is shown in chat on join"
+#, fuzzy
+msgid ""
+"If enabled, the tab is colored according to the current chat state of the "
+"contact."
 msgstr ""
+"Jei pažymėta, Gajim leis kitiems matyti kokią operacijų sistemą naudojate"
 
 #: gajim/common/config.py:292
+#, fuzzy
 msgid ""
-"If the contact row is colored according to the current chatstate of the "
-"contact"
+"Shows a text in the banner that describes the current chat state of the "
+"contact."
 msgstr ""
+"Jei pažymėta, Gajim leis kitiems matyti kokią operacijų sistemą naudojate"
 
 #: gajim/common/config.py:293
-msgid "If the tab is colored according to the current chatstate of the contact"
-msgstr ""
-
-#: gajim/common/config.py:294
-msgid ""
-"Shows a text in the banner that describes the current chatstate of the "
-"contact"
-msgstr ""
-
-#: gajim/common/config.py:295 gajim/common/config.py:424
 #, fuzzy
 msgid ""
 "Chat state notifications that are sent to contacts. Possible values: all, "
@@ -3641,307 +3654,330 @@ msgid ""
 msgstr ""
 "Sent chat state notifications. Can be one of all, composing_only, disabled."
 
-#: gajim/common/config.py:296 gajim/common/config.py:438
+#: gajim/common/config.py:294
 #, fuzzy
 msgid ""
 "Chat state notifications that are sent to the group chat. Possible values: "
-"all, composing_only, disabled"
+"'all', 'composing_only', 'disabled'"
 msgstr ""
 "Sent chat state notifications. Can be one of all, composing_only, disabled."
 
-#: gajim/common/config.py:312
+#: gajim/common/config.py:297
+msgid "API Preferences. Possible values: 'http', 'iq'"
+msgstr ""
+
+#: gajim/common/config.py:313
+#, fuzzy
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
-"defined in autopriority_* options."
+"defined in 'autopriority_*' options."
 msgstr ""
 "Priority will change automatically according to your status. Priorities are "
 "defined in autopriority_* options."
 
-#: gajim/common/config.py:320
+#: gajim/common/config.py:321
 msgid ""
-"Status used to autoconnect as. Can be online, chat, away, xa, dnd, "
-"invisible. NOTE: this option is used only if restore_last_status is disabled"
+"Status to be used automatically when connecting. Can be 'online', 'chat', "
+"'away', 'xa', 'dnd' or 'invisible'. NOTE: This option is used only if "
+"'restore_last_status' is disabled."
 msgstr ""
 
-#: gajim/common/config.py:321
-msgid "If enabled, restore the last status that was used."
+#: gajim/common/config.py:322
+msgid "If enabled, the last status will be restored."
 msgstr ""
 
-#: gajim/common/config.py:322
+#: gajim/common/config.py:323
 msgid ""
-"If true, Contacts requesting authorization will be automatically accepted."
+"If enabled, Contacts requesting authorization will be accepted automatically."
 msgstr ""
 
-#: gajim/common/config.py:323
+#: gajim/common/config.py:324
 msgid ""
-"If False, this account will be disabled and will not appear in roster window."
+"If disabled, this account will be disabled and will not appear in the "
+"contact list window."
 msgstr ""
 
-#: gajim/common/config.py:327
-msgid "Allow plaintext connections"
+#: gajim/common/config.py:328
+msgid "Allow plaintext connections."
 msgstr ""
 
-#: gajim/common/config.py:330
+#: gajim/common/config.py:331
 msgid ""
-"List (space separated) of authentication mechanisms to try. Can contain "
-"ANONYMOUS, EXTERNAL, GSSAPI, SCRAM-SHA-1-PLUS, SCRAM-SHA-1, DIGEST-MD5, "
-"PLAIN, X-MESSENGER-OAUTH2 or XEP-0078"
+"List of authentication mechanisms to try (space separated). Can contain "
+"'ANONYMOUS', 'EXTERNAL', 'GSSAPI', 'SCRAM-SHA-1-PLUS', 'SCRAM-SHA-1', "
+"'DIGEST-MD5', 'PLAIN', 'X-MESSENGER-OAUTH2' or 'XEP-0078'."
 msgstr ""
 
-#: gajim/common/config.py:331
+#: gajim/common/config.py:332
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection. "
-"Can be 'warn', 'connect', 'disconnect'"
+"Can be 'warn', 'connect' or 'disconnect'."
 msgstr ""
 
-#: gajim/common/config.py:332
+#: gajim/common/config.py:333
 msgid "Show a warning dialog before using standard SSL library."
 msgstr ""
 
-#: gajim/common/config.py:333
+#: gajim/common/config.py:334
 msgid ""
 "Show a warning dialog before sending PLAIN password over a plain connection."
 msgstr ""
 
-#: gajim/common/config.py:334
-msgid "Space separated list of ssl errors to ignore."
+#: gajim/common/config.py:335
+msgid "List of SSL errors to ignore (space separated)."
 msgstr ""
 
-#: gajim/common/config.py:340
+#: gajim/common/config.py:341
 msgid ""
-"Space separated list of JIDs for which you do not want to store logs. You "
-"can also add account name to log nothing for this account."
+"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:341
+#: gajim/common/config.py:342
 msgid ""
-"Space separated list of JIDs for which you accept to not log conversations "
-"if he does not want to."
+"List of XMPP Addresses (space separated) for which you accept to not store "
+"chat history if your contact does not want to."
 msgstr ""
 
-#: gajim/common/config.py:343
-msgid "Whitespace sent after inactivity"
+#: gajim/common/config.py:344
+msgid "If enabled, a whitespace is sent after inactivity (keep alive)."
 msgstr ""
 
-#: gajim/common/config.py:344
-msgid "XMPP ping sent after inactivity"
+#: gajim/common/config.py:345
+msgid "If enabled, an XMPP ping is sent after inactivity (ping alive)."
 msgstr ""
 
-#: gajim/common/config.py:348
+#: gajim/common/config.py:349
 msgid ""
-"How many seconds to wait for the answer of ping alive packet before trying "
-"to reconnect?"
+"How many seconds to wait for the answer of a ping alive packet before trying "
+"to reconnect."
 msgstr ""
 
-#: gajim/common/config.py:352
-msgid "Jabberd2 workaround"
+#: gajim/common/config.py:353
+#, fuzzy
+msgid "Jabberd2 workaround."
 msgstr "Jabberd2 workaround"
 
-#: gajim/common/config.py:355
+#: gajim/common/config.py:356
+#, fuzzy
 msgid ""
-"If checked, Gajim will use your IP and proxies defined in "
-"file_transfer_proxies option for file transfer."
+"If enabled, Gajim will use your IP and proxies defined in "
+"'file_transfer_proxies' option for file transfers."
 msgstr ""
 "If ticked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
 
-#: gajim/common/config.py:356
+#: gajim/common/config.py:357
 msgid ""
-"If true, Gajim will test file transfer proxies on startup to be sure it "
-"works. Openfire's proxies are known to fail this test even if they work."
+"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:369
-msgid "Answer to receipt requests"
+#: gajim/common/config.py:370
+msgid "If enabled, Gajim will answer to message receipt requests."
 msgstr ""
 
-#: gajim/common/config.py:370
-msgid "Sent receipt requests"
+#: gajim/common/config.py:371
+msgid "If enabled, Gajim will send message receipt requests."
 msgstr ""
 
-#: gajim/common/config.py:379
+#: gajim/common/config.py:380
 #, 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:380
+#: gajim/common/config.py:381
 #, fuzzy
 msgid "Allow Gajim to send your local time."
 msgstr "%s wants to send you a file."
 
-#: gajim/common/config.py:383
+#: gajim/common/config.py:384
 #, fuzzy
-msgid "Message that is sent to contacts you want to add"
+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:384
-msgid ""
-"If enabled, Gajim will send your local IPs so your contact can connect to "
-"your machine to transfer files."
-msgstr ""
-
 #: gajim/common/config.py:385
+#, fuzzy
 msgid ""
-"Space separated list of JIDs for which chat window will be re-opened on next "
-"startup."
+"If enabled, Gajim will send your local IP so your contact can connect to "
+"your machine for file transfers."
 msgstr ""
+"If ticked, Gajim will use your IP and proxies defined in "
+"file_transfer_proxies option for file transfer."
 
-#: gajim/common/config.py:387
-msgid "HTTP Upload: Enable HTTPS Verification"
+#: gajim/common/config.py:386
+msgid ""
+"List of XMPP Addresses (space separated) for which the chat window will be "
+"re-opened on next startup."
 msgstr ""
 
 #: gajim/common/config.py:388
-msgid ""
-"Preferred file transfer mechanism for file drag&drop on chat window. Can be "
-"'httpupload' (default) or 'jingle'"
+msgid "HTTP File Upload: Enable HTTPS Verification."
 msgstr ""
 
 #: gajim/common/config.py:389
-msgid "Allow cert verification with POSH"
+msgid ""
+"Preferred file transfer mechanism for file drag&drop on a chat window. Can "
+"be 'httpupload' (default) or 'jingle'."
 msgstr ""
 
-#: gajim/common/config.py:423 gajim/common/config.py:430
+#: gajim/common/config.py:390
 #, fuzzy
-msgid "Language for which misspelled words will be checked"
-msgstr "Language for which we want to check misspelt words"
-
-#: gajim/common/config.py:427
-msgid "The currently active encryption for that contact"
-msgstr ""
+msgid "Allow certificate verification with POSH."
+msgstr "Adding Special Notification for %s"
 
-#: gajim/common/config.py:431
+#: gajim/common/config.py:425
+#, fuzzy
 msgid ""
-"How many lines to request from server when entering a groupchat. -1 means no "
-"limit, -2 means global value"
+"Chat state notifications that are sent to contacts. Possible values: 'all', "
+"'composing_only', 'disabled'"
 msgstr ""
+"Sent chat state notifications. Can be one of all, composing_only, disabled."
+
+#: gajim/common/config.py:428
+#, fuzzy
+msgid "The currently active encryption for that contact."
+msgstr "Is OpenPGP enabled for this contact?"
 
 #: gajim/common/config.py:432
 msgid ""
-"Minutes of backlog to request when entering a groupchat. -1 means no limit, "
-"-2 means global value"
+"If enabled, a notification is created for every message in this group chat."
 msgstr ""
 
 #: gajim/common/config.py:433
-msgid "State whether a notification is created for every message in this room"
-msgstr ""
-
-#: gajim/common/config.py:434
+#, fuzzy
 msgid ""
-"Show a status message for all status (away, dnd, etc.) changes of users in a "
-"group chat"
-msgstr ""
+"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:435
+#: gajim/common/config.py:434
 #, fuzzy
-msgid "Show a status message for every join or leave in a group chat"
+msgid "Show a status message for every join or leave in a group chat."
 msgstr "Unable to join group chat"
 
+#: gajim/common/config.py:435
+msgid ""
+"If enabled, the group chat is minimized into the contact list when joining "
+"automatically."
+msgstr ""
+
 #: gajim/common/config.py:436
-msgid "If the group chat is minimized into the roster on autojoin"
+msgid ""
+"If enabled, the group chat is minimized into the contact list when closing "
+"it."
 msgstr ""
 
 #: gajim/common/config.py:437
-msgid "If the group chat is minimized into the roster on close"
+#, fuzzy
+msgid ""
+"Chat state notifications that are sent to the group chat. Possible values: "
+"'all', 'composing_only' or 'disabled'."
 msgstr ""
+"Sent chat state notifications. Can be one of all, composing_only, disabled."
 
-#: gajim/common/config.py:441
+#: gajim/common/config.py:440
 msgid ""
-"State whether plugins should be activated on startup (this is saved on Gajim "
-"exit). This option SHOULD NOT be used to (de)activate plug-ins. Use GUI "
-"instead."
+"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:446 gajim/common/const.py:281
+#: gajim/common/config.py:445 gajim/common/const.py:315
 msgid "Sleeping"
 msgstr "Sleeping"
 
-#: gajim/common/config.py:447
+#: gajim/common/config.py:446
 msgid "Back soon"
 msgstr "Back soon"
 
-#: gajim/common/config.py:447
+#: gajim/common/config.py:446
 msgid "Back in some minutes."
 msgstr "Back in some minutes."
 
-#: gajim/common/config.py:448 gajim/common/const.py:247
+#: gajim/common/config.py:447 gajim/common/const.py:281
 msgid "Eating"
 msgstr "Eating"
 
-#: gajim/common/config.py:448
-msgid "I'm eating, so leave me a message."
-msgstr "I'm eating, so leave me a message."
+#: gajim/common/config.py:447
+#, fuzzy
+msgid "I'm eating."
+msgstr "I'm working."
 
-#: gajim/common/config.py:449
+#: gajim/common/config.py:448
 msgid "Movie"
 msgstr "Movie"
 
-#: gajim/common/config.py:449
+#: gajim/common/config.py:448
 msgid "I'm watching a movie."
 msgstr "I'm watching a movie."
 
-#: gajim/common/config.py:450 gajim/common/const.py:314
+#: gajim/common/config.py:449 gajim/common/const.py:348
 msgid "Working"
 msgstr "Working"
 
-#: gajim/common/config.py:450
+#: gajim/common/config.py:449
 msgid "I'm working."
 msgstr "I'm working."
 
-#: gajim/common/config.py:451
+#: gajim/common/config.py:450
 msgid "Phone"
 msgstr "Phone"
 
-#: gajim/common/config.py:451
+#: gajim/common/config.py:450
 msgid "I'm on the phone."
 msgstr "I'm on the phone."
 
-#: gajim/common/config.py:452
+#: gajim/common/config.py:451
 msgid "Out"
 msgstr "Out"
 
-#: gajim/common/config.py:452
+#: gajim/common/config.py:451
 msgid "I'm out enjoying life."
 msgstr "I'm out enjoying life."
 
-#: gajim/common/config.py:463
+#: gajim/common/config.py:462
 msgid "I'm available."
 msgstr "I'm available."
 
-#: gajim/common/config.py:464
+#: gajim/common/config.py:463
 msgid "I'm free for chat."
 msgstr "I'm free for chat."
 
-#: gajim/common/config.py:465 gajim/gtk/accounts.py:134
+#: gajim/common/config.py:464 gajim/gtk/accounts.py:133
 msgid "Be right back."
 msgstr "Be right back."
 
-#: gajim/common/config.py:466
+#: gajim/common/config.py:465
 msgid "I'm not available."
 msgstr "I'm not available."
 
-#: gajim/common/config.py:467
+#: gajim/common/config.py:466
 msgid "Do not disturb."
 msgstr "Do not disturb."
 
-#: gajim/common/config.py:468 gajim/common/config.py:469
+#: gajim/common/config.py:467 gajim/common/config.py:468
 msgid "Bye!"
 msgstr "Bye!"
 
-#: gajim/common/config.py:480
+#: gajim/common/config.py:479
+#, fuzzy
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
-"muc_highlight_words, or when a group chat message contains your nickname."
+"'muc_highlight_words' your nickname is mentioned."
 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:481
-msgid "Sound to play when any MUC message arrives."
+#: gajim/common/config.py:480
+#, fuzzy
+msgid "Sound to play when any group chat message arrives."
 msgstr "Sound to play when any MUC message arrives."
 
-#: gajim/common/config.py:485
+#: gajim/common/config.py:484
 #, fuzzy
 msgid "Tor"
 msgstr "Kam"
@@ -3951,878 +3987,974 @@ msgstr "Kam"
 msgid "Error: cannot open %s for reading"
 msgstr ""
 
-#: gajim/common/const.py:214
+#: gajim/common/const.py:216
+#, fuzzy
+msgid "?Group chat name:Team"
+msgstr "None"
+
+#: gajim/common/const.py:217
+msgid "?Group chat description:Project discussion"
+msgstr ""
+
+#: gajim/common/const.py:218
+#, fuzzy
+msgid "?Group chat address:team"
+msgstr "Groupchats"
+
+#: gajim/common/const.py:219
+#, fuzzy
+msgid "?Group chat name:Family"
+msgstr "Group Chat Message Highlight"
+
+#: gajim/common/const.py:220
+msgid "?Group chat description:Spring gathering"
+msgstr ""
+
+#: gajim/common/const.py:221
+msgid "?Group chat address:family"
+msgstr ""
+
+#: gajim/common/const.py:222
+#, fuzzy
+msgid "?Group chat name:Vacation"
+msgstr "Groupchat Invitation"
+
+#: gajim/common/const.py:223
+msgid "?Group chat description:Trip planning"
+msgstr ""
+
+#: gajim/common/const.py:224
+#, fuzzy
+msgid "?Group chat address:vacation"
+msgstr "Groupchat Invitation"
+
+#: gajim/common/const.py:225
+#, fuzzy
+msgid "?Group chat name:Repairs"
+msgstr "Group Chat"
+
+#: gajim/common/const.py:226
+msgid "?Group chat description:Local help group"
+msgstr ""
+
+#: gajim/common/const.py:227
+#, fuzzy
+msgid "?Group chat address:repairs"
+msgstr "Groupchats"
+
+#: gajim/common/const.py:228
+#, fuzzy
+msgid "?Group chat name:News"
+msgstr "None"
+
+#: gajim/common/const.py:229
+#, fuzzy
+msgid "?Group chat description:Local news and reports"
+msgstr "Group chat creation is restricted."
+
+#: gajim/common/const.py:230
+#, fuzzy
+msgid "?Group chat address:news"
+msgstr "New Group Chat"
+
+#: gajim/common/const.py:235
+#, fuzzy
+msgid "Remote server not found"
+msgstr "The service could not be found"
+
+#: gajim/common/const.py:236
+msgid "Remote server timeout"
+msgstr ""
+
+#: gajim/common/const.py:237 gajim/common/const.py:238
+#: gajim/common/const.py:239
+#, fuzzy
+msgid "Address does not belong to a group chat server"
+msgstr "This is not a group chat"
+
+#: gajim/common/const.py:240
+#, fuzzy
+msgid "Group chat already exists"
+msgstr "Account Local already exists."
+
+#: gajim/common/const.py:241
+#, fuzzy
+msgid "Group chat does not exist"
+msgstr "Tokios grupės pokalbis %s neegzistuoja."
+
+#: gajim/common/const.py:247
 msgid "This message was encrypted with OTR and could not be decrypted."
 msgstr ""
 
-#: gajim/common/const.py:217
+#: gajim/common/const.py:250
 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:221
+#: gajim/common/const.py:254
 msgid ""
-"This message was encrypted with OpenPGP for XMPP and could not be decrypted."
+"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:224
+#: gajim/common/const.py:258
 #, python-format
 msgid "This message was encrypted with %s and could not be decrypted."
 msgstr ""
 
-#: gajim/common/const.py:231
+#: gajim/common/const.py:265
 msgid "Doing Chores"
 msgstr ""
 
-#: gajim/common/const.py:232
+#: gajim/common/const.py:266
 msgid "Buying Groceries"
 msgstr ""
 
-#: gajim/common/const.py:233
+#: gajim/common/const.py:267
 msgid "Cleaning"
 msgstr ""
 
-#: gajim/common/const.py:234
+#: gajim/common/const.py:268
 msgid "Cooking"
 msgstr ""
 
-#: gajim/common/const.py:235
+#: gajim/common/const.py:269
 msgid "Doing Maintenance"
 msgstr ""
 
-#: gajim/common/const.py:236
+#: gajim/common/const.py:270
 msgid "Doing the Dishes"
 msgstr ""
 
-#: gajim/common/const.py:237
+#: gajim/common/const.py:271
 msgid "Doing the Laundry"
 msgstr ""
 
-#: gajim/common/const.py:238
+#: gajim/common/const.py:272
 msgid "Gardening"
 msgstr ""
 
-#: gajim/common/const.py:239
+#: gajim/common/const.py:273
 msgid "Running an Errand"
 msgstr ""
 
-#: gajim/common/const.py:240
+#: gajim/common/const.py:274
 msgid "Walking the Dog"
 msgstr ""
 
-#: gajim/common/const.py:242
+#: gajim/common/const.py:276
 msgid "Drinking"
 msgstr ""
 
-#: gajim/common/const.py:243
+#: gajim/common/const.py:277
 msgid "Having a Beer"
 msgstr ""
 
-#: gajim/common/const.py:244
+#: gajim/common/const.py:278
 msgid "Having Coffee"
 msgstr ""
 
-#: gajim/common/const.py:245
+#: gajim/common/const.py:279
 msgid "Having Tea"
 msgstr ""
 
-#: gajim/common/const.py:248
+#: gajim/common/const.py:282
 msgid "Having a Snack"
 msgstr ""
 
-#: gajim/common/const.py:249
+#: gajim/common/const.py:283
 msgid "Having Breakfast"
 msgstr ""
 
-#: gajim/common/const.py:250
+#: gajim/common/const.py:284
 msgid "Having Dinner"
 msgstr ""
 
-#: gajim/common/const.py:251
+#: gajim/common/const.py:285
 msgid "Having Lunch"
 msgstr ""
 
-#: gajim/common/const.py:253
+#: gajim/common/const.py:287
 msgid "Exercising"
 msgstr ""
 
-#: gajim/common/const.py:254 gajim/common/const.py:305
+#: gajim/common/const.py:288 gajim/common/const.py:339
 msgid "Cycling"
 msgstr ""
 
-#: gajim/common/const.py:255
+#: gajim/common/const.py:289
 msgid "Dancing"
 msgstr ""
 
-#: gajim/common/const.py:256
+#: gajim/common/const.py:290
 msgid "Hiking"
 msgstr ""
 
-#: gajim/common/const.py:257
+#: gajim/common/const.py:291
 msgid "Jogging"
 msgstr ""
 
-#: gajim/common/const.py:258
+#: gajim/common/const.py:292
 msgid "Playing Sports"
 msgstr ""
 
-#: gajim/common/const.py:259
+#: gajim/common/const.py:293
 msgid "Running"
 msgstr ""
 
-#: gajim/common/const.py:260
+#: gajim/common/const.py:294
 msgid "Skiing"
 msgstr ""
 
-#: gajim/common/const.py:261
+#: gajim/common/const.py:295
 msgid "Swimming"
 msgstr ""
 
-#: gajim/common/const.py:262
+#: gajim/common/const.py:296
 msgid "Working out"
 msgstr ""
 
-#: gajim/common/const.py:264
+#: gajim/common/const.py:298
 msgid "Grooming"
 msgstr ""
 
-#: gajim/common/const.py:265
+#: gajim/common/const.py:299
 msgid "At the Spa"
 msgstr ""
 
-#: gajim/common/const.py:266
+#: gajim/common/const.py:300
 msgid "Brushing Teeth"
 msgstr ""
 
-#: gajim/common/const.py:267
+#: gajim/common/const.py:301
 msgid "Getting a Haircut"
 msgstr ""
 
-#: gajim/common/const.py:268
+#: gajim/common/const.py:302
 msgid "Shaving"
 msgstr ""
 
-#: gajim/common/const.py:269
+#: gajim/common/const.py:303
 msgid "Taking a Bath"
 msgstr ""
 
-#: gajim/common/const.py:270
+#: gajim/common/const.py:304
 msgid "Taking a Shower"
 msgstr ""
 
-#: gajim/common/const.py:272
+#: gajim/common/const.py:306
 msgid "Having an Appointment"
 msgstr ""
 
-#: gajim/common/const.py:274
+#: gajim/common/const.py:308
 msgid "Inactive"
 msgstr "Neaktyvus"
 
-#: gajim/common/const.py:275
+#: gajim/common/const.py:309
 msgid "Day Off"
 msgstr ""
 
-#: gajim/common/const.py:276
+#: gajim/common/const.py:310
 msgid "Hanging out"
 msgstr ""
 
-#: gajim/common/const.py:277
+#: gajim/common/const.py:311
 msgid "Hiding"
 msgstr ""
 
-#: gajim/common/const.py:278
+#: gajim/common/const.py:312
 msgid "On Vacation"
 msgstr ""
 
-#: gajim/common/const.py:279
+#: gajim/common/const.py:313
 msgid "Praying"
 msgstr ""
 
-#: gajim/common/const.py:280
+#: gajim/common/const.py:314
 msgid "Scheduled Holiday"
 msgstr ""
 
-#: gajim/common/const.py:282
+#: gajim/common/const.py:316
 msgid "Thinking"
 msgstr ""
 
-#: gajim/common/const.py:284
+#: gajim/common/const.py:318
 msgid "Relaxing"
 msgstr ""
 
-#: gajim/common/const.py:285
+#: gajim/common/const.py:319
 msgid "Fishing"
 msgstr ""
 
-#: gajim/common/const.py:286
+#: gajim/common/const.py:320
 msgid "Gaming"
 msgstr ""
 
-#: gajim/common/const.py:287
+#: gajim/common/const.py:321
 msgid "Going out"
 msgstr ""
 
-#: gajim/common/const.py:288
+#: gajim/common/const.py:322
 msgid "Partying"
 msgstr ""
 
-#: gajim/common/const.py:289
+#: gajim/common/const.py:323
 msgid "Reading"
 msgstr ""
 
-#: gajim/common/const.py:290
+#: gajim/common/const.py:324
 msgid "Rehearsing"
 msgstr ""
 
-#: gajim/common/const.py:291
+#: gajim/common/const.py:325
 msgid "Shopping"
 msgstr ""
 
-#: gajim/common/const.py:292
+#: gajim/common/const.py:326
 msgid "Smoking"
 msgstr ""
 
-#: gajim/common/const.py:293
+#: gajim/common/const.py:327
 msgid "Socializing"
 msgstr ""
 
-#: gajim/common/const.py:294
+#: gajim/common/const.py:328
 msgid "Sunbathing"
 msgstr ""
 
-#: gajim/common/const.py:295
+#: gajim/common/const.py:329
 msgid "Watching TV"
 msgstr ""
 
-#: gajim/common/const.py:296
+#: gajim/common/const.py:330
 msgid "Watching a Movie"
 msgstr ""
 
-#: gajim/common/const.py:298
+#: gajim/common/const.py:332
 msgid "Talking"
 msgstr ""
 
-#: gajim/common/const.py:299
+#: gajim/common/const.py:333
 msgid "In Real Life"
 msgstr ""
 
-#: gajim/common/const.py:300
+#: gajim/common/const.py:334
 msgid "On the Phone"
 msgstr ""
 
-#: gajim/common/const.py:301
+#: gajim/common/const.py:335
 msgid "On Video Phone"
 msgstr ""
 
-#: gajim/common/const.py:303
+#: gajim/common/const.py:337
 msgid "Traveling"
 msgstr ""
 
-#: gajim/common/const.py:304
+#: gajim/common/const.py:338
 msgid "Commuting"
 msgstr ""
 
-#: gajim/common/const.py:306
+#: gajim/common/const.py:340
 msgid "Driving"
 msgstr ""
 
-#: gajim/common/const.py:307
+#: gajim/common/const.py:341
 msgid "In a Car"
 msgstr ""
 
-#: gajim/common/const.py:308
+#: gajim/common/const.py:342
 msgid "On a Bus"
 msgstr ""
 
-#: gajim/common/const.py:309
+#: gajim/common/const.py:343
 msgid "On a Plane"
 msgstr ""
 
-#: gajim/common/const.py:310
+#: gajim/common/const.py:344
 msgid "On a Train"
 msgstr ""
 
-#: gajim/common/const.py:311
+#: gajim/common/const.py:345
 msgid "On a Trip"
 msgstr ""
 
-#: gajim/common/const.py:312
+#: gajim/common/const.py:346
 msgid "Walking"
 msgstr ""
 
-#: gajim/common/const.py:315
+#: gajim/common/const.py:349
 msgid "Coding"
 msgstr ""
 
-#: gajim/common/const.py:316
+#: gajim/common/const.py:350
 msgid "In a Meeting"
 msgstr ""
 
-#: gajim/common/const.py:317
+#: gajim/common/const.py:351
 msgid "Studying"
 msgstr ""
 
-#: gajim/common/const.py:318
+#: gajim/common/const.py:352
 msgid "Writing"
 msgstr ""
 
-#: gajim/common/const.py:321
+#: gajim/common/const.py:355
 msgid "Afraid"
 msgstr ""
 
-#: gajim/common/const.py:322
+#: gajim/common/const.py:356
 msgid "Amazed"
 msgstr ""
 
-#: gajim/common/const.py:323
+#: gajim/common/const.py:357
 msgid "Amorous"
 msgstr ""
 
-#: gajim/common/const.py:324
+#: gajim/common/const.py:358
 msgid "Angry"
 msgstr ""
 
-#: gajim/common/const.py:325
+#: gajim/common/const.py:359
 msgid "Annoyed"
 msgstr ""
 
-#: gajim/common/const.py:326
+#: gajim/common/const.py:360
 msgid "Anxious"
 msgstr ""
 
-#: gajim/common/const.py:327
+#: gajim/common/const.py:361
 msgid "Aroused"
 msgstr ""
 
-#: gajim/common/const.py:328
+#: gajim/common/const.py:362
 msgid "Ashamed"
 msgstr ""
 
-#: gajim/common/const.py:329
+#: gajim/common/const.py:363
 msgid "Bored"
 msgstr ""
 
-#: gajim/common/const.py:330
+#: gajim/common/const.py:364
 msgid "Brave"
 msgstr ""
 
-#: gajim/common/const.py:331
+#: gajim/common/const.py:365
 msgid "Calm"
 msgstr ""
 
-#: gajim/common/const.py:332
+#: gajim/common/const.py:366
 msgid "Cautious"
 msgstr ""
 
-#: gajim/common/const.py:333
+#: gajim/common/const.py:367
 msgid "Cold"
 msgstr ""
 
-#: gajim/common/const.py:334
+#: gajim/common/const.py:368
 msgid "Confident"
 msgstr ""
 
-#: gajim/common/const.py:335
+#: gajim/common/const.py:369
 msgid "Confused"
 msgstr ""
 
-#: gajim/common/const.py:336
+#: gajim/common/const.py:370
 msgid "Contemplative"
 msgstr ""
 
-#: gajim/common/const.py:337
+#: gajim/common/const.py:371
 msgid "Contented"
 msgstr ""
 
-#: gajim/common/const.py:338
+#: gajim/common/const.py:372
 msgid "Cranky"
 msgstr ""
 
-#: gajim/common/const.py:339
+#: gajim/common/const.py:373
 msgid "Crazy"
 msgstr ""
 
-#: gajim/common/const.py:340
+#: gajim/common/const.py:374
 msgid "Creative"
 msgstr ""
 
-#: gajim/common/const.py:341
+#: gajim/common/const.py:375
 msgid "Curious"
 msgstr ""
 
-#: gajim/common/const.py:342
+#: gajim/common/const.py:376
 msgid "Dejected"
 msgstr ""
 
-#: gajim/common/const.py:343
+#: gajim/common/const.py:377
 msgid "Depressed"
 msgstr ""
 
-#: gajim/common/const.py:344
+#: gajim/common/const.py:378
 msgid "Disappointed"
 msgstr ""
 
-#: gajim/common/const.py:345
+#: gajim/common/const.py:379
 msgid "Disgusted"
 msgstr ""
 
-#: gajim/common/const.py:346
+#: gajim/common/const.py:380
 msgid "Dismayed"
 msgstr ""
 
-#: gajim/common/const.py:347
+#: gajim/common/const.py:381
 msgid "Distracted"
 msgstr ""
 
-#: gajim/common/const.py:348
+#: gajim/common/const.py:382
 msgid "Embarrassed"
 msgstr ""
 
-#: gajim/common/const.py:349
+#: gajim/common/const.py:383
 msgid "Envious"
 msgstr ""
 
-#: gajim/common/const.py:350
+#: gajim/common/const.py:384
 msgid "Excited"
 msgstr ""
 
-#: gajim/common/const.py:351
+#: gajim/common/const.py:385
 msgid "Flirtatious"
 msgstr ""
 
-#: gajim/common/const.py:352
+#: gajim/common/const.py:386
 msgid "Frustrated"
 msgstr ""
 
-#: gajim/common/const.py:353
+#: gajim/common/const.py:387
 msgid "Grateful"
 msgstr ""
 
-#: gajim/common/const.py:354
+#: gajim/common/const.py:388
 msgid "Grieving"
 msgstr ""
 
-#: gajim/common/const.py:355
+#: gajim/common/const.py:389
 msgid "Grumpy"
 msgstr ""
 
-#: gajim/common/const.py:356
+#: gajim/common/const.py:390
 msgid "Guilty"
 msgstr ""
 
-#: gajim/common/const.py:357
+#: gajim/common/const.py:391
 msgid "Happy"
 msgstr ""
 
-#: gajim/common/const.py:358
+#: gajim/common/const.py:392
 msgid "Hopeful"
 msgstr ""
 
-#: gajim/common/const.py:359
+#: gajim/common/const.py:393
 msgid "Hot"
 msgstr ""
 
-#: gajim/common/const.py:360
+#: gajim/common/const.py:394
 msgid "Humbled"
 msgstr ""
 
-#: gajim/common/const.py:361
+#: gajim/common/const.py:395
 msgid "Humiliated"
 msgstr ""
 
-#: gajim/common/const.py:362
+#: gajim/common/const.py:396
 msgid "Hungry"
 msgstr ""
 
-#: gajim/common/const.py:363
+#: gajim/common/const.py:397
 msgid "Hurt"
 msgstr ""
 
-#: gajim/common/const.py:364
+#: gajim/common/const.py:398
 msgid "Impressed"
 msgstr ""
 
-#: gajim/common/const.py:365
+#: gajim/common/const.py:399
 msgid "In Awe"
 msgstr ""
 
-#: gajim/common/const.py:366
+#: gajim/common/const.py:400
 msgid "In Love"
 msgstr ""
 
-#: gajim/common/const.py:367
+#: gajim/common/const.py:401
 msgid "Indignant"
 msgstr ""
 
-#: gajim/common/const.py:368
+#: gajim/common/const.py:402
 msgid "Interested"
 msgstr ""
 
-#: gajim/common/const.py:369
+#: gajim/common/const.py:403
 msgid "Intoxicated"
 msgstr ""
 
-#: gajim/common/const.py:370
+#: gajim/common/const.py:404
 msgid "Invincible"
 msgstr ""
 
-#: gajim/common/const.py:371
+#: gajim/common/const.py:405
 msgid "Jealous"
 msgstr ""
 
-#: gajim/common/const.py:372
+#: gajim/common/const.py:406
 msgid "Lonely"
 msgstr ""
 
-#: gajim/common/const.py:373
+#: gajim/common/const.py:407
 msgid "Lost"
 msgstr ""
 
-#: gajim/common/const.py:374
+#: gajim/common/const.py:408
 msgid "Lucky"
 msgstr ""
 
-#: gajim/common/const.py:375
+#: gajim/common/const.py:409
 msgid "Mean"
 msgstr ""
 
-#: gajim/common/const.py:376
+#: gajim/common/const.py:410
 msgid "Moody"
 msgstr ""
 
-#: gajim/common/const.py:377
+#: gajim/common/const.py:411
 msgid "Nervous"
 msgstr ""
 
-#: gajim/common/const.py:378
+#: gajim/common/const.py:412
 msgid "Neutral"
 msgstr ""
 
-#: gajim/common/const.py:379
+#: gajim/common/const.py:413
 msgid "Offended"
 msgstr ""
 
-#: gajim/common/const.py:380
+#: gajim/common/const.py:414
 msgid "Outraged"
 msgstr ""
 
-#: gajim/common/const.py:381
+#: gajim/common/const.py:415
 msgid "Playful"
 msgstr ""
 
-#: gajim/common/const.py:382
+#: gajim/common/const.py:416
 msgid "Proud"
 msgstr ""
 
-#: gajim/common/const.py:383
+#: gajim/common/const.py:417
 msgid "Relaxed"
 msgstr ""
 
-#: gajim/common/const.py:384
+#: gajim/common/const.py:418
 msgid "Relieved"
 msgstr ""
 
-#: gajim/common/const.py:385
+#: gajim/common/const.py:419
 msgid "Remorseful"
 msgstr ""
 
-#: gajim/common/const.py:386
+#: gajim/common/const.py:420
 msgid "Restless"
 msgstr ""
 
-#: gajim/common/const.py:387
+#: gajim/common/const.py:421
 msgid "Sad"
 msgstr ""
 
-#: gajim/common/const.py:388
+#: gajim/common/const.py:422
 msgid "Sarcastic"
 msgstr ""
 
-#: gajim/common/const.py:389
+#: gajim/common/const.py:423
 msgid "Satisfied"
 msgstr ""
 
-#: gajim/common/const.py:390
+#: gajim/common/const.py:424
 msgid "Serious"
 msgstr ""
 
-#: gajim/common/const.py:391
+#: gajim/common/const.py:425
 msgid "Shocked"
 msgstr ""
 
-#: gajim/common/const.py:392
+#: gajim/common/const.py:426
 msgid "Shy"
 msgstr ""
 
-#: gajim/common/const.py:393
+#: gajim/common/const.py:427
 msgid "Sick"
 msgstr ""
 
-#: gajim/common/const.py:394
+#: gajim/common/const.py:428
 msgid "Sleepy"
 msgstr ""
 
-#: gajim/common/const.py:395
+#: gajim/common/const.py:429
 msgid "Spontaneous"
 msgstr ""
 
-#: gajim/common/const.py:396
+#: gajim/common/const.py:430
 msgid "Stressed"
 msgstr ""
 
-#: gajim/common/const.py:397
+#: gajim/common/const.py:431
 msgid "Strong"
 msgstr ""
 
-#: gajim/common/const.py:398
+#: gajim/common/const.py:432
 msgid "Surprised"
 msgstr ""
 
-#: gajim/common/const.py:399
+#: gajim/common/const.py:433
 msgid "Thankful"
 msgstr ""
 
-#: gajim/common/const.py:400
+#: gajim/common/const.py:434
 msgid "Thirsty"
 msgstr ""
 
-#: gajim/common/const.py:401
+#: gajim/common/const.py:435
 msgid "Tired"
 msgstr ""
 
-#: gajim/common/const.py:402
+#: gajim/common/const.py:436
 msgid "Undefined"
 msgstr ""
 
-#: gajim/common/const.py:403
+#: gajim/common/const.py:437
 msgid "Weak"
 msgstr ""
 
-#: gajim/common/const.py:404
+#: gajim/common/const.py:438
 msgid "Worried"
 msgstr ""
 
-#: gajim/common/const.py:408
+#: gajim/common/const.py:442
 msgid "accuracy"
 msgstr ""
 
-#: gajim/common/const.py:409
+#: gajim/common/const.py:443
 #, fuzzy
 msgid "alt"
 msgstr "įprastas"
 
-#: gajim/common/const.py:410
+#: gajim/common/const.py:444
 msgid "area"
 msgstr ""
 
-#: gajim/common/const.py:411
+#: gajim/common/const.py:445
 #, fuzzy
 msgid "bearing"
 msgstr "marine"
 
-#: gajim/common/const.py:412
+#: gajim/common/const.py:446
 msgid "building"
 msgstr ""
 
-#: gajim/common/const.py:413
+#: gajim/common/const.py:447
 #, fuzzy
 msgid "country"
 msgstr "Šalis:"
 
-#: gajim/common/const.py:414
+#: gajim/common/const.py:448
 #, fuzzy
 msgid "countrycode"
 msgstr "Prieiga"
 
-#: gajim/common/const.py:415
+#: gajim/common/const.py:449
 msgid "datum"
 msgstr ""
 
-#: gajim/common/const.py:416
+#: gajim/common/const.py:450
 #, fuzzy
 msgid "description"
 msgstr "Description"
 
-#: gajim/common/const.py:417
+#: gajim/common/const.py:451
 #, fuzzy
 msgid "error"
 msgstr "Avahi error"
 
-#: gajim/common/const.py:418
+#: gajim/common/const.py:452
 msgid "floor"
 msgstr ""
 
-#: gajim/common/const.py:419
+#: gajim/common/const.py:453
 msgid "lat"
 msgstr ""
 
-#: gajim/common/const.py:420
+#: gajim/common/const.py:454
 msgid "locality"
 msgstr ""
 
-#: gajim/common/const.py:421
+#: gajim/common/const.py:455
 #, fuzzy
 msgid "lon"
 msgstr "vienas"
 
-#: gajim/common/const.py:422
+#: gajim/common/const.py:456
 msgid "postalcode"
 msgstr ""
 
-#: gajim/common/const.py:423
+#: gajim/common/const.py:457
 msgid "region"
 msgstr ""
 
-#: gajim/common/const.py:424
+#: gajim/common/const.py:458
 msgid "room"
 msgstr "room"
 
-#: gajim/common/const.py:425
+#: gajim/common/const.py:459
 msgid "speed"
 msgstr ""
 
-#: gajim/common/const.py:426
+#: gajim/common/const.py:460
 msgid "street"
 msgstr ""
 
-#: gajim/common/const.py:427
+#: gajim/common/const.py:461
 msgid "text"
 msgstr ""
 
-#: gajim/common/const.py:428
+#: gajim/common/const.py:462
 msgid "timestamp"
 msgstr ""
 
-#: gajim/common/const.py:429
+#: gajim/common/const.py:463
 msgid "URI"
 msgstr ""
 
-#: gajim/common/const.py:434
+#: gajim/common/const.py:468
 msgid "Unable to get issuer certificate"
 msgstr ""
 
-#: gajim/common/const.py:435
+#: gajim/common/const.py:469
 msgid "Unable to get certificate CRL"
 msgstr ""
 
-#: gajim/common/const.py:436
+#: gajim/common/const.py:470
 msgid "Unable to decrypt certificate's signature"
 msgstr ""
 
-#: gajim/common/const.py:437
+#: gajim/common/const.py:471
 msgid "Unable to decrypt CRL's signature"
 msgstr ""
 
-#: gajim/common/const.py:438
+#: gajim/common/const.py:472
 msgid "Unable to decode issuer public key"
 msgstr "Nepavyksta iškoduoti siuntėjo viešojo rakto"
 
-#: gajim/common/const.py:439
+#: gajim/common/const.py:473
 msgid "Certificate signature failure"
 msgstr ""
 
-#: gajim/common/const.py:440
+#: gajim/common/const.py:474
 msgid "CRL signature failure"
 msgstr ""
 
-#: gajim/common/const.py:441
+#: gajim/common/const.py:475
 msgid "Certificate is not yet valid"
 msgstr ""
 
-#: gajim/common/const.py:442
+#: gajim/common/const.py:476
 msgid "Certificate has expired"
 msgstr ""
 
-#: gajim/common/const.py:443
+#: gajim/common/const.py:477
 msgid "CRL is not yet valid"
 msgstr ""
 
-#: gajim/common/const.py:444
+#: gajim/common/const.py:478
 msgid "CRL has expired"
 msgstr ""
 
-#: gajim/common/const.py:445
+#: gajim/common/const.py:479
 msgid "Format error in certificate's notBefore field"
 msgstr ""
 
-#: gajim/common/const.py:446
+#: gajim/common/const.py:480
 msgid "Format error in certificate's notAfter field"
 msgstr ""
 
-#: gajim/common/const.py:447
+#: gajim/common/const.py:481
 msgid "Format error in CRL's lastUpdate field"
 msgstr ""
 
-#: gajim/common/const.py:448
+#: gajim/common/const.py:482
 msgid "Format error in CRL's nextUpdate field"
 msgstr ""
 
-#: gajim/common/const.py:449
+#: gajim/common/const.py:483
 msgid "Out of memory"
 msgstr ""
 
-#: gajim/common/const.py:450
+#: gajim/common/const.py:484
 msgid "Self signed certificate"
 msgstr ""
 
-#: gajim/common/const.py:451
+#: gajim/common/const.py:485
 msgid "Self signed certificate in certificate chain"
 msgstr ""
 
-#: gajim/common/const.py:452
+#: gajim/common/const.py:486
 msgid "Unable to get local issuer certificate"
 msgstr ""
 
-#: gajim/common/const.py:453
+#: gajim/common/const.py:487
 msgid "Unable to verify the first certificate"
 msgstr ""
 
-#: gajim/common/const.py:454
+#: gajim/common/const.py:488
 msgid "Certificate chain too long"
 msgstr ""
 
-#: gajim/common/const.py:455
+#: gajim/common/const.py:489
 msgid "Certificate revoked"
 msgstr ""
 
-#: gajim/common/const.py:456
+#: gajim/common/const.py:490
 msgid "Invalid CA certificate"
 msgstr "Blogas CA sertifikatas"
 
-#: gajim/common/const.py:457
+#: gajim/common/const.py:491
 msgid "Path length constraint exceeded"
 msgstr ""
 
-#: gajim/common/const.py:458
+#: gajim/common/const.py:492
 msgid "Unsupported certificate purpose"
 msgstr ""
 
-#: gajim/common/const.py:459
+#: gajim/common/const.py:493
 msgid "Certificate not trusted"
 msgstr ""
 
-#: gajim/common/const.py:460
+#: gajim/common/const.py:494
 msgid "Certificate rejected"
 msgstr ""
 
-#: gajim/common/const.py:461
+#: gajim/common/const.py:495
 msgid "Subject issuer mismatch"
 msgstr ""
 
-#: gajim/common/const.py:462
+#: gajim/common/const.py:496
 msgid "Authority and subject key identifier mismatch"
 msgstr ""
 
-#: gajim/common/const.py:463
+#: gajim/common/const.py:497
 msgid "Authority and issuer serial number mismatch"
 msgstr ""
 
-#: gajim/common/const.py:464
+#: gajim/common/const.py:498
 msgid "Key usage does not include certificate signing"
 msgstr ""
 
-#: gajim/common/const.py:465
+#: gajim/common/const.py:499
 msgid "Application verification failure"
 msgstr ""
 
@@ -4988,221 +5120,221 @@ msgstr ""
 msgid "video output"
 msgstr ""
 
-#: gajim/common/helpers.py:210
+#: gajim/common/helpers.py:216
 msgid "Server must be between 1 and 1023 bytes"
 msgstr ""
 
-#: gajim/common/helpers.py:214
+#: gajim/common/helpers.py:220
 msgid "Invalid character in hostname."
 msgstr ""
 
-#: gajim/common/helpers.py:216
+#: gajim/common/helpers.py:222
 msgid "Server address required."
 msgstr ""
 
-#: gajim/common/helpers.py:220
+#: gajim/common/helpers.py:226
 msgid "Username must be between 1 and 1023 bytes"
 msgstr ""
 
-#: gajim/common/helpers.py:224
+#: gajim/common/helpers.py:230
 msgid "Invalid character in username."
 msgstr ""
 
-#: gajim/common/helpers.py:230
+#: gajim/common/helpers.py:236
 msgid "Resource must be between 1 and 1023 bytes"
 msgstr ""
 
-#: gajim/common/helpers.py:234
+#: gajim/common/helpers.py:240
 msgid "Invalid character in resource."
 msgstr ""
 
-#: gajim/common/helpers.py:275
+#: gajim/common/helpers.py:281
 msgid "_Busy"
 msgstr "_Užimtas"
 
-#: gajim/common/helpers.py:277 gajim/gtk/tooltips.py:647
+#: gajim/common/helpers.py:283 gajim/gtk/tooltips.py:647
 msgid "Busy"
 msgstr "Užimtas"
 
-#: gajim/common/helpers.py:280
+#: gajim/common/helpers.py:286
 msgid "_Not Available"
 msgstr "_Nepasiekiamas"
 
-#: gajim/common/helpers.py:282 gajim/gtk/tooltips.py:649
+#: gajim/common/helpers.py:288 gajim/gtk/tooltips.py:649
 msgid "Not Available"
 msgstr "Esu išėjęs"
 
-#: gajim/common/helpers.py:285
+#: gajim/common/helpers.py:291
 msgid "_Free for Chat"
 msgstr "_Laisvas Pokalbiams"
 
-#: gajim/common/helpers.py:287 gajim/gtk/tooltips.py:643
+#: gajim/common/helpers.py:293 gajim/gtk/tooltips.py:643
 msgid "Free for Chat"
 msgstr "Laisvas Pokalbiams"
 
-#: gajim/common/helpers.py:290
+#: gajim/common/helpers.py:296
 #, fuzzy
 msgid "?user status:_Available"
 msgstr "_Prisijungęs"
 
-#: gajim/common/helpers.py:292 gajim/gtk/tooltips.py:641
+#: gajim/common/helpers.py:298 gajim/gtk/tooltips.py:641
 #, fuzzy
 msgid "?user status:Available"
 msgstr "All"
 
-#: gajim/common/helpers.py:294
+#: gajim/common/helpers.py:300
 msgid "Connecting"
 msgstr "Jungiamasi"
 
-#: gajim/common/helpers.py:297 gajim/data/gui/preferences_window.ui:1251
+#: gajim/common/helpers.py:303 gajim/data/gui/preferences_window.ui:1251
 msgid "A_way"
 msgstr "_Nuėjęs"
 
-#: gajim/common/helpers.py:299 gajim/common/modules/adhoc_commands.py:120
-#: gajim/command_system/implementation/standard.py:139
+#: gajim/common/helpers.py:305 gajim/common/modules/adhoc_commands.py:120
+#: gajim/command_system/implementation/standard.py:141
 #: gajim/gtk/tooltips.py:645
 msgid "Away"
 msgstr "Manęs nėra"
 
-#: gajim/common/helpers.py:302
+#: gajim/common/helpers.py:308
 msgid "_Offline"
 msgstr "A_tsijungęs"
 
-#: gajim/common/helpers.py:304 gajim/gtk/tooltips.py:651
+#: gajim/common/helpers.py:310 gajim/gtk/tooltips.py:651
 msgid "Offline"
 msgstr "Atsijungęs"
 
-#: gajim/common/helpers.py:307
+#: gajim/common/helpers.py:313
 msgid "_Invisible"
 msgstr "N_ematomas"
 
-#: gajim/common/helpers.py:313
+#: gajim/common/helpers.py:319
 msgid "?contact has status:Unknown"
 msgstr "Būklė nežinoma"
 
-#: gajim/common/helpers.py:315
+#: gajim/common/helpers.py:321
 msgid "?contact has status:Has errors"
 msgstr "Būklė klaidinga"
 
-#: gajim/common/helpers.py:330
+#: gajim/common/helpers.py:336
 msgid "?Subscription we already have:None"
 msgstr "Joks"
 
-#: gajim/common/helpers.py:332
+#: gajim/common/helpers.py:338
 msgid "To"
 msgstr "Kam"
 
-#: gajim/common/helpers.py:334 gajim/data/gui/groups_post_window.ui:33
+#: gajim/common/helpers.py:340 gajim/data/gui/groups_post_window.ui:33
 msgid "From"
 msgstr "Nuo"
 
-#: gajim/common/helpers.py:336
+#: gajim/common/helpers.py:342
 msgid "Both"
 msgstr "Abu"
 
-#: gajim/common/helpers.py:338 gajim/gtk/server_info.py:151
+#: gajim/common/helpers.py:344 gajim/gtk/server_info.py:151
 #, fuzzy
 msgid "Unknown"
 msgstr "Klientas:"
 
-#: gajim/common/helpers.py:344
+#: gajim/common/helpers.py:350
 msgid "?Ask (for Subscription):None"
 msgstr "Joks"
 
-#: gajim/common/helpers.py:346
+#: gajim/common/helpers.py:352
 msgid "Subscribe"
 msgstr "Subscribe"
 
-#: gajim/common/helpers.py:355
+#: gajim/common/helpers.py:361
 msgid "?Group Chat Contact Role:None"
 msgstr "None"
 
-#: gajim/common/helpers.py:358
+#: gajim/common/helpers.py:364
 msgid "Moderators"
 msgstr "Moderators"
 
-#: gajim/common/helpers.py:360
+#: gajim/common/helpers.py:366
 msgid "Moderator"
 msgstr "Moderator"
 
-#: gajim/common/helpers.py:363
+#: gajim/common/helpers.py:369 gajim/data/gui/groupchat_info_scrolled.ui:243
 msgid "Participants"
 msgstr "Participants"
 
-#: gajim/common/helpers.py:365
+#: gajim/common/helpers.py:371
 msgid "Participant"
 msgstr "Participant"
 
-#: gajim/common/helpers.py:368
+#: gajim/common/helpers.py:374
 msgid "Visitors"
 msgstr "Visitors"
 
-#: gajim/common/helpers.py:370
+#: gajim/common/helpers.py:376
 msgid "Visitor"
 msgstr "Visitor"
 
-#: gajim/common/helpers.py:376 gajim/gtk/tooltips.py:253
+#: gajim/common/helpers.py:382 gajim/gtk/tooltips.py:253
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "None"
 
-#: gajim/common/helpers.py:378 gajim/data/gui/groupchat_config.ui:32
+#: gajim/common/helpers.py:384 gajim/data/gui/groupchat_config.ui:32
 #: gajim/gtk/tooltips.py:259
 msgid "Owner"
 msgstr "Owner"
 
-#: gajim/common/helpers.py:380 gajim/gtk/tooltips.py:257
+#: gajim/common/helpers.py:386 gajim/gtk/tooltips.py:257
 msgid "Administrator"
 msgstr "Administrator"
 
-#: gajim/common/helpers.py:382 gajim/data/gui/groupchat_config.ui:40
+#: gajim/common/helpers.py:388 gajim/data/gui/groupchat_config.ui:40
 #: gajim/gtk/tooltips.py:255 gajim/gtk/groupchat_config.py:105
 msgid "Member"
 msgstr "Member"
 
-#: gajim/common/helpers.py:421
+#: gajim/common/helpers.py:427
 msgid "is paying attention to the conversation"
 msgstr "is paying attention to the conversation"
 
-#: gajim/common/helpers.py:423
+#: gajim/common/helpers.py:429
 msgid "is doing something else"
 msgstr "is doing something else"
 
-#: gajim/common/helpers.py:425
+#: gajim/common/helpers.py:431
 #, fuzzy
 msgid "is composing a message…"
 msgstr "is composing a message..."
 
-#: gajim/common/helpers.py:428
+#: gajim/common/helpers.py:434
 msgid "paused composing a message"
 msgstr "paused composing a message"
 
-#: gajim/common/helpers.py:430
+#: gajim/common/helpers.py:436
 msgid "has closed the chat window or tab"
 msgstr "has closed the chat window or tab"
 
-#: gajim/common/helpers.py:936 gajim/common/helpers.py:943
+#: gajim/common/helpers.py:942 gajim/common/helpers.py:949
 #, 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:950
-#, python-format
-msgid "from room %s"
-msgstr ""
+#: gajim/common/helpers.py:956
+#, fuzzy, python-format
+msgid "from group chat %s"
+msgstr "pokalbiuose _grupėje"
 
-#: gajim/common/helpers.py:953 gajim/common/helpers.py:970
+#: gajim/common/helpers.py:959 gajim/common/helpers.py:976
 #, python-format
 msgid "from user %s"
 msgstr ""
 
-#: gajim/common/helpers.py:955
+#: gajim/common/helpers.py:961
 #, fuzzy, python-format
 msgid "from %s"
 msgstr "Nuo"
 
-#: gajim/common/helpers.py:962 gajim/common/helpers.py:968
+#: gajim/common/helpers.py:968 gajim/common/helpers.py:974
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
@@ -5210,39 +5342,39 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: gajim/common/helpers.py:986 gajim/common/helpers.py:998
+#: gajim/common/helpers.py:992 gajim/common/helpers.py:1004
 #: gajim/data/gui/roster_window.ui:85 data/org.gajim.Gajim.desktop.in:4
 #: data/org.gajim.Gajim.appdata.xml.in:9
 msgid "Gajim"
 msgstr "Gajim"
 
-#: gajim/common/helpers.py:1000
+#: gajim/common/helpers.py:1006
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: gajim/common/helpers.py:1109 gajim/data/gui/add_new_contact_window.ui:25
+#: gajim/common/helpers.py:1115 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:1111
+#: gajim/common/helpers.py:1117
 msgid "Hello, I am $name."
 msgstr ""
 
-#: gajim/common/helpers.py:1215 gajim/common/helpers.py:1224
-#: gajim/common/helpers.py:1282
+#: gajim/common/helpers.py:1221 gajim/common/helpers.py:1230
+#: gajim/common/helpers.py:1288
 msgid "Timeout loading image"
 msgstr ""
 
-#: gajim/common/helpers.py:1234 gajim/common/helpers.py:1280
+#: gajim/common/helpers.py:1240 gajim/common/helpers.py:1286
 msgid "Image is too big"
 msgstr ""
 
-#: gajim/common/helpers.py:1245
+#: gajim/common/helpers.py:1251
 msgid "PyCURL is not installed"
 msgstr ""
 
-#: gajim/common/helpers.py:1284
+#: gajim/common/helpers.py:1290
 #, fuzzy
 msgid "Error loading image"
 msgstr "Unable to load idle module"
@@ -5420,7 +5552,8 @@ msgstr "The status has been changed."
 
 #: gajim/common/modules/adhoc_commands.py:202
 #: gajim/common/modules/adhoc_commands.py:239
-msgid "Leave Groupchats"
+#, fuzzy
+msgid "Leave Group Chats"
 msgstr "Leave Groupchats"
 
 #: gajim/common/modules/adhoc_commands.py:228
@@ -5429,15 +5562,18 @@ msgid "%(nickname)s on %(room_jid)s"
 msgstr "%(nickname)s on %(room_jid)s"
 
 #: gajim/common/modules/adhoc_commands.py:232
-msgid "You have not joined a groupchat."
+#, fuzzy
+msgid "You have not joined a group chat."
 msgstr "You have not joined a groupchat."
 
 #: gajim/common/modules/adhoc_commands.py:240
-msgid "Choose the groupchats you want to leave"
+#, fuzzy
+msgid "Choose the group chats you want to leave"
 msgstr "Choose the groupchats you want to leave"
 
 #: gajim/common/modules/adhoc_commands.py:289
-msgid "You left the following groupchats:"
+#, fuzzy
+msgid "You left the following group chats:"
 msgstr "Jūs palikote šių grupių pokalbius:"
 
 #: gajim/common/modules/roster_item_exchange.py:102
@@ -5453,7 +5589,7 @@ msgstr "Siųsti kontaktus:"
 msgid "Blocked Contacts"
 msgstr "Užblokuoti Kontaktai"
 
-#: gajim/data/gui/destroy_muc_dialog.ui:79 gajim/gtk/dialogs.py:736
+#: gajim/data/gui/destroy_muc_dialog.ui:79 gajim/gtk/dialogs.py:563
 msgid "Destroy this group chat permanently?"
 msgstr ""
 
@@ -5462,7 +5598,7 @@ msgstr ""
 msgid "Reason..."
 msgstr "Reason"
 
-#: gajim/data/gui/destroy_muc_dialog.ui:124 gajim/gtk/dialogs.py:738
+#: gajim/data/gui/destroy_muc_dialog.ui:124 gajim/gtk/dialogs.py:565
 msgid "Where participants should go (optional)"
 msgstr ""
 
@@ -5474,34 +5610,6 @@ msgstr ""
 msgid "_Reason and alternate venue (optional)"
 msgstr ""
 
-#: gajim/data/gui/advanced_configuration_window.ui:7
-#: gajim/data/gui/preferences_window.ui:2723
-#, fuzzy
-msgid "Advanced Configuration Editor (ACE)"
-msgstr "Išplėstinis konfigūracijos redaktorius"
-
-#: gajim/data/gui/advanced_configuration_window.ui:52
-#, fuzzy
-msgid "You should restart Gajim for some changes to take effect"
-msgstr ""
-"<b>PASTABA:</b> Kad įsigaliotų tam tikri nustatymai turite perkrauti Gajim"
-
-#: gajim/data/gui/advanced_configuration_window.ui:84
-#, fuzzy
-msgid "_Filter"
-msgstr "_Filtras:"
-
-#: gajim/data/gui/advanced_configuration_window.ui:153
-#: gajim/data/gui/filetransfers_send_file_dialog.ui:15
-#: gajim/gtk/discovery.py:1666
-msgid "Description"
-msgstr "Description"
-
-#: gajim/data/gui/advanced_configuration_window.ui:197
-#, fuzzy
-msgid "_Reset to default"
-msgstr "_Grąžinti buvusias spalvas pagal nutylėjimą"
-
 #: gajim/data/gui/join_groupchat_window.ui:56
 #: gajim/data/gui/chat_to_muc_window.ui:67
 #: gajim/data/gui/chat_to_muc_window.ui:78
@@ -5513,9 +5621,8 @@ msgid "Join group chat every time Gajim is started"
 msgstr ""
 
 #: gajim/data/gui/join_groupchat_window.ui:113
-#, fuzzy
-msgid "Auto Join"
-msgstr "Automatinis prsijungimas"
+msgid "Join Automatically"
+msgstr ""
 
 #: gajim/data/gui/join_groupchat_window.ui:131
 #: gajim/data/gui/profile_window.ui:233
@@ -5524,10 +5631,11 @@ msgstr "Prieiga"
 
 #: gajim/data/gui/join_groupchat_window.ui:147
 #, fuzzy
-msgid "Room"
-msgstr "Kambarys:"
+msgid "Group chat"
+msgstr "Groupchats"
 
-#: gajim/data/gui/join_groupchat_window.ui:180 gajim/gtk/accounts.py:886
+#: gajim/data/gui/join_groupchat_window.ui:180 gajim/data/gui/bookmarks.ui:158
+#: gajim/gtk/accounts.py:889
 #, fuzzy
 msgid "Password"
 msgstr "Slaptažodis:"
@@ -5551,90 +5659,11 @@ msgstr "pokalbiuose _grupėje"
 msgid "Search group chats on selected server"
 msgstr ""
 
-#: gajim/data/gui/join_groupchat_window.ui:437 gajim/gtk/discovery.py:1271
+#: gajim/data/gui/join_groupchat_window.ui:437 gajim/gtk/discovery.py:1270
 #, fuzzy
 msgid "Join"
 msgstr "_Jungtis"
 
-#: gajim/data/gui/manage_proxies_window.ui:12
-#, fuzzy
-msgid "HTTP Connect"
-msgstr "Prisijungta"
-
-#: gajim/data/gui/manage_proxies_window.ui:15
-msgid "SOCKS5"
-msgstr ""
-
-#: gajim/data/gui/manage_proxies_window.ui:18
-msgid "BOSH"
-msgstr ""
-
-#: gajim/data/gui/manage_proxies_window.ui:27
-msgid "Manage Proxy Profiles"
-msgstr "Proxi profilių valdymas"
-
-#: gajim/data/gui/manage_proxies_window.ui:83
-#, fuzzy
-msgid "Add Proxy"
-msgstr "Proksis:"
-
-#: gajim/data/gui/manage_proxies_window.ui:97
-#, fuzzy
-msgid "Remove Proxy"
-msgstr "_Trinti"
-
-#: gajim/data/gui/manage_proxies_window.ui:141
-#, fuzzy
-msgid "Properties"
-msgstr "<b>Savybės</b>"
-
-#: gajim/data/gui/manage_proxies_window.ui:157
-#, fuzzy
-msgid "_Name"
-msgstr "_Pavadinimas:"
-
-#: gajim/data/gui/manage_proxies_window.ui:173
-#, fuzzy
-msgid "_Type"
-msgstr "_Tipas:"
-
-#: gajim/data/gui/manage_proxies_window.ui:236
-msgid "_BOSH URL"
-msgstr ""
-
-#: gajim/data/gui/manage_proxies_window.ui:261
-msgid "Use HTTP prox_y"
-msgstr "_Naudoti HTTP proksi"
-
-#: gajim/data/gui/manage_proxies_window.ui:280
-#, fuzzy
-msgid "Proxy _Host"
-msgstr "Proksi _Serveris:"
-
-#: gajim/data/gui/manage_proxies_window.ui:307
-#, fuzzy
-msgid "Proxy _Port"
-msgstr "Proksi _Prievadas:"
-
-#: gajim/data/gui/manage_proxies_window.ui:334
-#, fuzzy
-msgid "_Username"
-msgstr "_Naudotojo vardas:"
-
-#: gajim/data/gui/manage_proxies_window.ui:347
-msgid "Use proxy auth_entication"
-msgstr "Naudoti proksi _autentikaciją"
-
-#: gajim/data/gui/manage_proxies_window.ui:377
-#, fuzzy
-msgid "Pass_word"
-msgstr "_Slaptažodis:"
-
-#: gajim/data/gui/manage_proxies_window.ui:405 gajim/gtk/adhoc.py:321
-#, fuzzy
-msgid "Settings"
-msgstr "Registracija nesėkminga"
-
 #: gajim/data/gui/change_password_dialog.ui:17
 #, fuzzy
 msgid "New Password"
@@ -5665,11 +5694,13 @@ msgid "Status:"
 msgstr "Būklė:"
 
 #: gajim/data/gui/zeroconf_information_window.ui:89
-msgid "_Log conversation history"
+#, fuzzy
+msgid "_Store conversation history"
 msgstr "_Registruoti pokalbio istoriją"
 
 #: gajim/data/gui/zeroconf_information_window.ui:215
 #: gajim/data/gui/vcard_information_window.ui:390
+#: gajim/data/gui/groupchat_info_scrolled.ui:166
 msgid "Contact"
 msgstr "Asmuo"
 
@@ -5682,8 +5713,9 @@ msgid "Last Name:"
 msgstr "Pavardė:"
 
 #: gajim/data/gui/zeroconf_information_window.ui:260
-msgid "Jabber ID:"
-msgstr "Jabber ID:"
+#, fuzzy
+msgid "XMPP Address:"
+msgstr "AIM Address:"
 
 #: gajim/data/gui/zeroconf_information_window.ui:273
 msgid "E-Mail:"
@@ -5703,8 +5735,9 @@ msgid "Send _File"
 msgstr "Siųsti _Failą"
 
 #: gajim/data/gui/gc_occupants_menu.ui:29
-msgid "Occupant Actions"
-msgstr "Valdytojo Veiksmai"
+#, fuzzy
+msgid "Participant Actions"
+msgstr "Participants"
 
 #: gajim/data/gui/gc_occupants_menu.ui:38
 msgid "_Voice"
@@ -5735,8 +5768,9 @@ msgid "_Ban"
 msgstr "_Banas"
 
 #: gajim/data/gui/gc_occupants_menu.ui:124
-msgid "_Add to Roster"
-msgstr "Įtr_aukti į kontaktų sąrašą"
+#, fuzzy
+msgid "_Add to Contact List"
+msgstr "_Įtraukti asmenį..."
 
 #: gajim/data/gui/gc_occupants_menu.ui:132
 #, fuzzy
@@ -5775,11 +5809,6 @@ msgstr "Sutikimas:"
 msgid "_Status"
 msgstr "_Būklė"
 
-#: gajim/data/gui/zeroconf_context_menu.ui:26
-#: gajim/data/gui/account_context_menu.ui:79
-msgid "_Modify Account..."
-msgstr "_Keisti Prieigą..."
-
 #: gajim/data/gui/certificate_dialog.ui:66
 #: gajim/data/gui/certificate_dialog.ui:178
 msgid "Common Name (CN)"
@@ -5861,13 +5890,19 @@ msgstr "Paskutinį kartą keista:"
 msgid "Next entry"
 msgstr ""
 
+#: gajim/data/gui/filetransfers_send_file_dialog.ui:15
+#: gajim/data/gui/advanced_configuration.ui:143
+#: gajim/data/gui/groupchat_info_scrolled.ui:48 gajim/gtk/discovery.py:1663
+msgid "Description"
+msgstr "Description"
+
 #: gajim/data/gui/filetransfers_send_file_dialog.ui:54
 #, fuzzy
 msgid "_Send Files"
 msgstr "Siųsti _Failą"
 
 #: gajim/data/gui/filetransfers_send_file_dialog.ui:58
-#: gajim/gtk/xml_console.py:90
+#: gajim/gtk/xml_console.py:87
 #, fuzzy
 msgid "Send"
 msgstr "_Siųsti"
@@ -5892,20 +5927,23 @@ msgid "Change _Nickname..."
 msgstr "Keisti _Slapyvardį..."
 
 #: gajim/data/gui/gc_control_popup_menu.ui:20
-msgid "_Manage Room"
-msgstr "_Valdyti Kambarį"
+#, fuzzy
+msgid "_Manage Group Chat"
+msgstr "Leave Groupchats"
 
 #: gajim/data/gui/gc_control_popup_menu.ui:31
 msgid "Change _Subject..."
 msgstr "Keisti _Temą..."
 
 #: gajim/data/gui/gc_control_popup_menu.ui:38
-msgid "Configure _Room..."
-msgstr "Keisti Kambario Nustatymus..."
+#, fuzzy
+msgid "Configure _Group Chat..."
+msgstr "Jungtis į _Grupės Pokalbį..."
 
 #: gajim/data/gui/gc_control_popup_menu.ui:52
-msgid "_Destroy Room"
-msgstr ""
+#, fuzzy
+msgid "_Destroy Group Chat"
+msgstr "Leave Groupchats"
 
 #: gajim/data/gui/gc_control_popup_menu.ui:64
 msgid "_Minimize on close"
@@ -5916,7 +5954,7 @@ msgstr ""
 msgid "_Request Voice"
 msgstr "_Balsas"
 
-#: gajim/data/gui/gc_control_popup_menu.ui:99 gajim/gtk/discovery.py:1704
+#: gajim/data/gui/gc_control_popup_menu.ui:99
 msgid "_Bookmark"
 msgstr "Žy_mės"
 
@@ -5968,13 +6006,6 @@ msgstr "<b>Asmeninė svetainė:</b>"
 msgid "E-Mail"
 msgstr "El. paštas:"
 
-#: 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/blocking_list.ui:115 gajim/gtk/add_contact.py:30
-#: gajim/gtk/accounts.py:801
-msgid "Jabber ID"
-msgstr ""
-
 #: gajim/data/gui/profile_window.ui:440
 msgid "Main"
 msgstr ""
@@ -6109,35 +6140,42 @@ msgstr "Darbas"
 msgid "About"
 msgstr "Apie"
 
-#: gajim/data/gui/start_chat_dialog.ui:114 gajim/gtk/discovery.py:1658
-msgid "Users"
-msgstr "Users"
-
-#: gajim/data/gui/start_chat_dialog.ui:185
-msgid "Name:"
-msgstr "Pavadinimas:"
+#: gajim/data/gui/start_chat_dialog.ui:53
+#, fuzzy
+msgid "Global Group Chat Search"
+msgstr "Prisijungti prie pokalbio grupėje"
 
-#: gajim/data/gui/start_chat_dialog.ui:197
+#: 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
-msgid "Description:"
-msgstr "Aprašymas: "
+msgid "_Back"
+msgstr "Back soon"
 
-#: gajim/data/gui/start_chat_dialog.ui:209
+#: gajim/data/gui/start_chat_dialog.ui:245
+#: gajim/data/gui/groupchat_control.ui:796
+#: gajim/data/gui/groupchat_control.ui:888 gajim/gtk/discovery.py:1701
+#: gajim/gtk/groupchat_join.py:62
+msgid "_Join"
+msgstr "_Jungtis"
+
+#: gajim/data/gui/start_chat_dialog.ui:289
 #, fuzzy
-msgid "Address:"
-msgstr "_Adresas:"
+msgid "Select Account"
+msgstr "Gajim account %s"
 
-#: gajim/data/gui/start_chat_dialog.ui:246
-msgid ""
-"Semi-Anonymous\n"
-"<span size=\"small\">(Only moderators can see your XMPP-Address)</span>"
+#: gajim/data/gui/start_chat_dialog.ui:380
+msgid "_Select"
 msgstr ""
 
 #: gajim/data/gui/filetransfers.ui:21
 msgid "Pa_use/Resume"
 msgstr ""
 
-#: gajim/data/gui/filetransfers.ui:30 gajim/gtk/filechoosers.py:178
+#: gajim/data/gui/filetransfers.ui:30 gajim/data/gui/groupchat_control.ui:575
+#: gajim/data/gui/groupchat_control.ui:667
+#: gajim/data/gui/groupchat_control.ui:779
+#: gajim/data/gui/groupchat_control.ui:871 gajim/gtk/filechoosers.py:178
 msgid "_Cancel"
 msgstr "_Atšaukti"
 
@@ -6179,7 +6217,8 @@ msgid "Cancel the selected file transfer and remove incomplete files"
 msgstr "Atšaukti pažymėtų failų siuntimą ir ištrinti nepilnus failus"
 
 #: gajim/data/gui/filetransfers.ui:207
-msgid "Shows a list of file transfers between you and others"
+#, fuzzy
+msgid "Shows a list of file transfers between you and your contacts"
 msgstr "Rodyti failų siuntimų sąrašą tarp jūsų ir kitų"
 
 #: gajim/data/gui/groupchat_control.ui:13 gajim/data/gui/chat_control.ui:277
@@ -6199,7 +6238,6 @@ msgid "Strike"
 msgstr "Perbraukimas"
 
 #: gajim/data/gui/groupchat_control.ui:54 gajim/data/gui/chat_control.ui:318
-#: gajim/gtk/advanced_config.py:86
 msgid "Color"
 msgstr "Colour"
 
@@ -6212,16 +6250,45 @@ msgstr "Šriftas"
 msgid "Clear formatting"
 msgstr "Valyti formatavimą"
 
-#: gajim/data/gui/groupchat_control.ui:290 gajim/data/gui/chat_control.ui:880
+#: gajim/data/gui/groupchat_control.ui:291 gajim/data/gui/chat_control.ui:880
 #, fuzzy
 msgid "Choose encryption"
 msgstr "Choose File to Send..."
 
-#: gajim/data/gui/groupchat_control.ui:336 gajim/data/gui/chat_control.ui:640
+#: gajim/data/gui/groupchat_control.ui:337 gajim/data/gui/chat_control.ui:640
 #, fuzzy
 msgid "Show a list of emojis (Alt+M)"
 msgstr "Rodyti šypsenėlių sąrašą (Alt+M)"
 
+#: gajim/data/gui/groupchat_control.ui:484
+#, fuzzy
+msgid "Joining…"
+msgstr "Banning..."
+
+#: gajim/data/gui/groupchat_control.ui:496
+msgid "_Abort"
+msgstr ""
+
+#: gajim/data/gui/groupchat_control.ui:542
+#, fuzzy
+msgid "Enter new nickname"
+msgstr "A_fter nickname:"
+
+#: gajim/data/gui/groupchat_control.ui:592
+#: gajim/data/gui/groupchat_control.ui:684
+#, fuzzy
+msgid "Ch_ange"
+msgstr "Keisti _Slapyvardį..."
+
+#: gajim/data/gui/groupchat_control.ui:761
+#, fuzzy
+msgid "Enter password"
+msgstr "Įveskite naują slaptažodį:"
+
+#: gajim/data/gui/groupchat_control.ui:1067
+msgid "_Try again"
+msgstr ""
+
 #: gajim/data/gui/popup_notification_window.ui:42
 #, fuzzy
 msgid "Event Type"
@@ -6303,8 +6370,8 @@ msgstr "Manęs nėra"
 
 #: gajim/data/gui/mam_preferences.ui:18
 #, fuzzy
-msgid "Roster"
-msgstr "Rodyk _Kontaktų Sąrašą"
+msgid "Contact List"
+msgstr "Asmuo"
 
 #: gajim/data/gui/mam_preferences.ui:22
 #: gajim/data/gui/preferences_window.ui:123
@@ -6329,12 +6396,12 @@ msgid "Add"
 msgstr "Įtraukti"
 
 #: gajim/data/gui/mam_preferences.ui:194 gajim/data/gui/groupchat_config.ui:151
-#: gajim/gtk/dialogs.py:63 gajim/gtk/accounts.py:381
+#: gajim/gtk/dialogs.py:62 gajim/gtk/accounts.py:384
 #, fuzzy
 msgid "Remove"
 msgstr "_Trinti"
 
-#: gajim/data/gui/vcard_information_window.ui:72 gajim/gtk/accounts.py:753
+#: gajim/data/gui/vcard_information_window.ui:72 gajim/gtk/accounts.py:756
 #, fuzzy
 msgid "Resource"
 msgstr "Šaltinis:"
@@ -6387,6 +6454,7 @@ msgstr "Sutikimas:"
 #: gajim/data/gui/vcard_information_window.ui:974
 #: gajim/data/gui/vcard_information_window.ui:993
 #: gajim/data/gui/vcard_information_window.ui:1427
+#: gajim/data/gui/groupchat_info_scrolled.ui:222
 msgid "button"
 msgstr ""
 
@@ -6419,15 +6487,15 @@ msgstr "_Pranešti man apie tai"
 
 #: gajim/data/gui/preferences_window.ui:58
 #, fuzzy
-msgid "Show only in roster"
-msgstr "Rodyti tik kontaktų _sąrašą"
+msgid "Show only in contact list"
+msgstr "Rodyti Tik _Aktyvius Kontaktus"
 
 #: gajim/data/gui/preferences_window.ui:69
-msgid "Detached roster with detached chats"
+msgid "Detached contact list with detached chats"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:72
-msgid "Detached roster with single chat"
+msgid "Detached contact list with single chat"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:75
@@ -6435,11 +6503,11 @@ msgid "Single window for everything"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:78
-msgid "Detached roster with chat grouped by account"
+msgid "Detached contact list with chat grouped by account"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:81
-msgid "Detached roster with chat grouped by type"
+msgid "Detached contact list with chat grouped by type"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:92
@@ -6490,7 +6558,7 @@ msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:296
 #, fuzzy
-msgid "_Show roster on startup"
+msgid "_Show contact list on startup"
 msgstr "Rodyk _Kontaktų Sąrašą"
 
 #: gajim/data/gui/preferences_window.ui:311
@@ -6506,12 +6574,12 @@ msgid "_Tabs placement"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:363
-msgid "_Quit Gajim when closing roster window"
+msgid "_Quit Gajim when closing contact list"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:367
 msgid ""
-"If enabled, Gajim will quit when closing the roster window instead of "
+"If enabled, Gajim will quit when closing the contact list window instead of "
 "minimizing to the system's notification area"
 msgstr ""
 
@@ -6521,41 +6589,42 @@ msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:423
 #, fuzzy
-msgid "Show a_vatars of contacts in roster"
+msgid "Show a_vatars of contacts in contact list"
 msgstr "Rodyti asmenų _paveiksliukus kontaktų sąraše"
 
 #: gajim/data/gui/preferences_window.ui:427
 #, fuzzy
 msgid ""
-"If checked, avatars of contacts will be shown in the roster window and in "
-"group chats"
+"If checked, avatars of contacts will be shown in the contact list window and "
+"in group chats"
 msgstr ""
 "Jei pažymėta, Gajim rodys asmens paveiksliuką kontaktų sąraše ir pokalbio "
 "lange"
 
 #: gajim/data/gui/preferences_window.ui:441
 #, fuzzy
-msgid "Show status _messages of contacts in roster"
+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
 #, fuzzy
 msgid ""
 "If checked, status messages of contacts will be shown under the contact's "
-"name, in the roster window, and in group chats"
+"name, in the contact list window, and in group chats"
 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
 #, fuzzy
-msgid "Show e_xtra information of contacts in roster (mood, activity, ...)"
+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
 msgid ""
-"If checked, additional info published by the contact will be shown in "
-"roster. Additional infos (published via PEP) may include e.g. mood, "
+"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 ""
 
@@ -6564,8 +6633,9 @@ msgid "Sort contacts by status"
 msgstr "Rūšiuoti kontaktus pagal būklę"
 
 #: gajim/data/gui/preferences_window.ui:494
-msgid "in _roster"
-msgstr "_sąraše"
+#, fuzzy
+msgid "in _contact list"
+msgstr "Siųsti kontaktus:"
 
 #: gajim/data/gui/preferences_window.ui:511
 msgid "in _group chats"
@@ -6573,8 +6643,8 @@ msgstr "pokalbiuose _grupėje"
 
 #: gajim/data/gui/preferences_window.ui:540
 #, fuzzy
-msgid "Roster Appearance"
-msgstr "<b>Pokalbio Išvaizda</b>"
+msgid "Contact List Appearance"
+msgstr "Contact Disconnected"
 
 #: gajim/data/gui/preferences_window.ui:585
 msgid "Enable spell _checking"
@@ -6635,7 +6705,7 @@ msgstr "Unable to join group chat"
 
 #: gajim/data/gui/preferences_window.ui:660
 #, fuzzy
-msgid "If checked, the room subject will be shown when joining a group chat"
+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:682
@@ -6650,13 +6720,13 @@ msgstr ""
 #: gajim/data/gui/preferences_window.ui:701
 msgid ""
 "If join/leave status messages are shown in the group chat. This setting can "
-"be overridden in the groupchat menu."
+"be overridden in the group chat menu."
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:720
 msgid ""
 "The default sync threshold for new public group chats. This setting can be "
-"overridden in the groupchat menu."
+"overridden in the group chat menu."
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:722
@@ -6671,7 +6741,7 @@ msgstr "_Registruoti asmenų būklės pakitimus"
 #: gajim/data/gui/preferences_window.ui:768
 msgid ""
 "If status change messages are shown in the group chat. This setting can be "
-"overridden in the groupchat menu."
+"overridden in the group chat menu."
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:825
@@ -6689,8 +6759,8 @@ msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:843
 #, fuzzy
-msgid "Show chatstate in roster"
-msgstr "Rodyti asmenų _paveiksliukus kontaktų sąraše"
+msgid "Show chatstate in contact list"
+msgstr "Show close button in tab?"
 
 #: gajim/data/gui/preferences_window.ui:847
 msgid ""
@@ -6980,7 +7050,7 @@ msgstr ""
 msgid "Vi_ew own video source"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2281 gajim/gtk/accounts.py:352
+#: gajim/data/gui/preferences_window.ui:2281 gajim/gtk/accounts.py:355
 msgid "Connection"
 msgstr "Prisijungimas"
 
@@ -7033,7 +7103,8 @@ msgid "_Manage..."
 msgstr "_Valdyti..."
 
 #: gajim/data/gui/preferences_window.ui:2616
-msgid "_Log status changes of contacts"
+#, fuzzy
+msgid "_Store status changes of contacts in history"
 msgstr "_Registruoti asmenų būklės pakitimus"
 
 #: gajim/data/gui/preferences_window.ui:2633
@@ -7058,9 +7129,14 @@ msgstr ""
 msgid "_Open..."
 msgstr "_Atidaryti..."
 
+#: gajim/data/gui/preferences_window.ui:2723 gajim/gtk/advanced_config.py:84
+#, fuzzy
+msgid "Advanced Configuration Editor (ACE)"
+msgstr "Išplėstinis konfigūracijos redaktorius"
+
 #: gajim/data/gui/groupchat_config.ui:55
 msgid ""
-"<b>Jabber-ID</b>\n"
+"<b>XMPP Address</b>\n"
 "&lt;user@domain/resource&gt; (only that resource matches)\n"
 "&lt;user@domain&gt; (any resource matches)\n"
 "&lt;domain/resource&gt; (only that resource matches)\n"
@@ -7073,7 +7149,8 @@ msgstr ""
 msgid "Only Admins and Owners can modify the affiliation"
 msgstr ""
 
-#: gajim/data/gui/groupchat_config.ui:270 gajim/plugins/gui.py:312
+#: gajim/data/gui/groupchat_config.ui:270
+#: gajim/data/gui/groupchat_info_scrolled.ui:210 gajim/plugins/gui.py:324
 #, fuzzy
 msgid "Configuration"
 msgstr "Kambario nustatymai"
@@ -7106,7 +7183,7 @@ msgid "Start _Chat"
 msgstr "Pradėti _Pokalbį"
 
 #: gajim/data/gui/contact_context_menu.ui:20
-#: gajim/data/gui/systray_context_menu.ui:36
+#: gajim/data/gui/systray_context_menu.ui:29
 msgid "Send Single _Message..."
 msgstr "Siųsti ži_nutę..."
 
@@ -7167,17 +7244,44 @@ msgid "_Ignore"
 msgstr ""
 
 #: gajim/data/gui/contact_context_menu.ui:174
-msgid "_Add to Roster..."
-msgstr "Įtr_aukti į kontaktų sąrašą..."
+#, fuzzy
+msgid "_Add to Contact List..."
+msgstr "_Įtraukti asmenį..."
+
+#: gajim/data/gui/advanced_configuration.ui:39
+#, fuzzy
+msgid "You should restart Gajim for some changes to take effect"
+msgstr ""
+"<b>PASTABA:</b> Kad įsigaliotų tam tikri nustatymai turite perkrauti Gajim"
+
+#: gajim/data/gui/advanced_configuration.ui:71
+#, fuzzy
+msgid "_Filter"
+msgstr "_Filtras:"
+
+#: gajim/data/gui/advanced_configuration.ui:88
+msgid "Type to search for values..."
+msgstr ""
+
+#: gajim/data/gui/advanced_configuration.ui:180
+#, fuzzy
+msgid "_Reset Value"
+msgstr "_Grąžinti buvusias spalvas pagal nutylėjimą"
+
+#: gajim/data/gui/advanced_configuration.ui:185
+#, fuzzy
+msgid "Resets value to default"
+msgstr "_Grąžinti buvusias spalvas pagal nutylėjimą"
 
 #: gajim/data/gui/account_creation_wizard_window.ui:43
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim: Prieigos kūrimo vedlys"
 
 #: gajim/data/gui/account_creation_wizard_window.ui:70
+#, fuzzy
 msgid ""
 "You need to have an account in order to connect\n"
-"to the Jabber network."
+"to the XMPP network."
 msgstr ""
 "Kad prisijungtumėte privalote turėti prieigą\n"
 "Jabber tinkle."
@@ -7199,8 +7303,9 @@ msgid "<b>Please fill in the data for your existing account</b>"
 msgstr "<b>Įveskite jūsų turimos prieigos duomenis</b>"
 
 #: gajim/data/gui/account_creation_wizard_window.ui:187
-msgid "_Jabber ID:"
-msgstr "_Jabber ID:"
+#, fuzzy
+msgid "_XMPP Address:"
+msgstr "AIM Address:"
 
 #: gajim/data/gui/account_creation_wizard_window.ui:239
 #: gajim/data/gui/account_creation_wizard_window.ui:394
@@ -7285,6 +7390,7 @@ msgid "Privacy Lists:"
 msgstr "Privatūs Sąrašai:"
 
 #: gajim/data/gui/service_discovery_window.ui:111
+#: gajim/data/gui/groupchat_creation.ui:227
 #, fuzzy
 msgid "_Address"
 msgstr "_Adresas:"
@@ -7302,11 +7408,6 @@ msgstr "Sinchronizuoti : pažymėkite kontaktus"
 msgid "Select the contacts you want to synchronise"
 msgstr "Pažymėkite kontaktus kuriuos norėsite sinchronizuoti"
 
-#: gajim/data/gui/groupchat_invitation_received.ui:42
-#, fuzzy
-msgid "Group Chat Invitation"
-msgstr "Groupchat Invitation"
-
 #: gajim/data/gui/groupchat_invitation_received.ui:111
 #, fuzzy
 msgid "Message..."
@@ -7357,11 +7458,10 @@ msgstr ""
 
 #: gajim/data/gui/add_new_contact_window.ui:84
 #, fuzzy
-msgid "_Jabber ID"
-msgstr "_Jabber ID:"
+msgid "_XMPP Address"
+msgstr "_Adresas:"
 
 #: gajim/data/gui/add_new_contact_window.ui:100
-#: gajim/data/gui/manage_bookmarks_window.ui:192
 #, fuzzy
 msgid "_Nickname"
 msgstr "_Slapyvardis:"
@@ -7439,7 +7539,7 @@ msgstr "<b>Nuotaika:</b>"
 msgid "<b>Message:</b>"
 msgstr "<b>Žinutė:</b>"
 
-#: gajim/data/gui/plugins_window.ui:10 gajim/data/gui/application_menu.ui:90
+#: gajim/data/gui/plugins_window.ui:10 gajim/data/gui/application_menu.ui:87
 msgid "Plugins"
 msgstr ""
 
@@ -7546,10 +7646,6 @@ msgstr "Leisti"
 msgid "Deny"
 msgstr "Atmesti"
 
-#: gajim/data/gui/privacy_list_window.ui:317
-msgid "JabberID"
-msgstr "JabberID"
-
 #: gajim/data/gui/privacy_list_window.ui:358
 msgid "all in the group"
 msgstr "visus grupėje"
@@ -7591,7 +7687,7 @@ msgstr "Tvarka:"
 msgid "Manage sounds"
 msgstr "Prieigų valdymas"
 
-#: gajim/data/gui/manage_sounds_window.ui:55 gajim/plugins/gui.py:100
+#: gajim/data/gui/manage_sounds_window.ui:55 gajim/plugins/gui.py:101
 msgid "Active"
 msgstr "Active"
 
@@ -7629,23 +7725,110 @@ msgstr "Pašalinti prieigą ir iš Gajim ir iš _serverio"
 msgid "_Personal Events"
 msgstr "_Asmeniniai Įvykiai"
 
-#: gajim/data/gui/account_context_menu.ui:35
-#: gajim/data/gui/systray_context_menu.ui:28
-msgid "Join _Group Chat"
-msgstr "Prisijungti prie pokalbio grupėje"
-
-#: gajim/data/gui/account_context_menu.ui:49
+#: gajim/data/gui/account_context_menu.ui:41
 msgid "_Add Contact..."
 msgstr "_Įtraukti asmenį..."
 
-#: gajim/data/gui/account_context_menu.ui:57
+#: gajim/data/gui/account_context_menu.ui:49
 msgid "_Discover Services"
 msgstr "_Ieškoti Paslaugų"
 
-#: gajim/data/gui/account_context_menu.ui:65
+#: gajim/data/gui/account_context_menu.ui:57
 msgid "_Execute Command..."
 msgstr "_Vykdyti komandą..."
 
+#: gajim/data/gui/account_context_menu.ui:65
+#, fuzzy
+msgid "_View Certificate"
+msgstr "Blogas CA sertifikatas"
+
+#: gajim/data/gui/manage_proxies.ui:12
+#, fuzzy
+msgctxt "proxy configuration"
+msgid "HTTP Connect"
+msgstr "Prisijungta"
+
+#: gajim/data/gui/manage_proxies.ui:15
+msgctxt "proxy configuration"
+msgid "SOCKS5"
+msgstr ""
+
+#: gajim/data/gui/manage_proxies.ui:18
+msgctxt "proxy configuration"
+msgid "BOSH"
+msgstr ""
+
+#: gajim/data/gui/manage_proxies.ui:68
+#, fuzzy
+msgid "Add Proxy"
+msgstr "Proksis:"
+
+#: gajim/data/gui/manage_proxies.ui:82
+#, fuzzy
+msgid "Remove Proxy"
+msgstr "_Trinti"
+
+#: gajim/data/gui/manage_proxies.ui:134
+#, fuzzy
+msgid "Pass_word"
+msgstr "_Slaptažodis:"
+
+#: gajim/data/gui/manage_proxies.ui:159
+msgid "Use proxy auth_entication"
+msgstr "Naudoti proksi _autentikaciją"
+
+#: gajim/data/gui/manage_proxies.ui:179
+#, fuzzy
+msgid "_Username"
+msgstr "_Naudotojo vardas:"
+
+#: gajim/data/gui/manage_proxies.ui:209
+#, fuzzy
+msgid "_Port"
+msgstr "_Portas:"
+
+#: gajim/data/gui/manage_proxies.ui:226
+msgid "example.org"
+msgstr ""
+
+#: gajim/data/gui/manage_proxies.ui:240
+#, fuzzy
+msgid "_Host"
+msgstr "_Hostas:"
+
+#: gajim/data/gui/manage_proxies.ui:254
+msgid "Use HTTP prox_y"
+msgstr "_Naudoti HTTP proksi"
+
+#: gajim/data/gui/manage_proxies.ui:275
+msgid "https://example.org/http-bind/"
+msgstr ""
+
+#: gajim/data/gui/manage_proxies.ui:291
+msgid "_BOSH URL"
+msgstr ""
+
+#: gajim/data/gui/manage_proxies.ui:309 gajim/gtk/adhoc.py:322
+#, fuzzy
+msgid "Settings"
+msgstr "Registracija nesėkminga"
+
+#: gajim/data/gui/manage_proxies.ui:344
+#, fuzzy
+msgid "_Type"
+msgstr "_Tipas:"
+
+#: gajim/data/gui/manage_proxies.ui:361
+#: gajim/data/gui/groupchat_creation.ui:105
+#, fuzzy
+msgid "_Name"
+msgstr "_Pavadinimas:"
+
+#: gajim/data/gui/manage_proxies.ui:391 gajim/gtk/accounts.py:742
+#, fuzzy
+msgid "Proxy"
+msgstr "Proksis:"
+
 #: gajim/data/gui/application_menu.ui:8
 #, fuzzy
 msgid "View"
@@ -7653,8 +7836,8 @@ msgstr "_Rodinys"
 
 #: gajim/data/gui/application_menu.ui:11
 #, fuzzy
-msgid "Show Roster"
-msgstr "Rodyk _Kontaktų Sąrašą"
+msgid "Show Contact List"
+msgstr "Rodyti Tik _Aktyvius Kontaktus"
 
 #: gajim/data/gui/application_menu.ui:16
 #, fuzzy
@@ -7695,23 +7878,24 @@ msgstr ""
 msgid "Features"
 msgstr "Savybės"
 
-#: gajim/data/gui/application_menu.ui:81
+#: gajim/data/gui/application_menu.ui:77
+#: gajim/data/gui/groupchat_creation.ui:81 gajim/gtk/groupchat_creation.py:45
 #, fuzzy
-msgid "Bookmarks"
-msgstr "Žy_mės"
+msgid "Create Group Chat"
+msgstr "Leave Groupchats"
 
-#: gajim/data/gui/application_menu.ui:94 gajim/data/gui/shortcuts_window.ui:189
-#: gajim/gtk/preferences.py:59
+#: gajim/data/gui/application_menu.ui:91 gajim/data/gui/shortcuts_window.ui:189
+#: gajim/gtk/preferences.py:58
 msgid "Preferences"
 msgstr "Parinktys"
 
-#: gajim/data/gui/application_menu.ui:99
+#: gajim/data/gui/application_menu.ui:96
 #, fuzzy
 msgid "Quit"
 msgstr "_Išjungti"
 
 #: gajim/data/gui/httpupload_progress_dialog.ui:110
-#: gajim/gtk/filetransfer.py:121
+#: gajim/gtk/filetransfer.py:120
 msgid "Progress"
 msgstr "Progress"
 
@@ -7728,52 +7912,33 @@ msgstr ""
 msgid "_Cancel Upload"
 msgstr "_Atšaukti"
 
-#: gajim/data/gui/manage_bookmarks_window.ui:13
-#, fuzzy
-msgid "Group Chat Bookmarks"
-msgstr "Group Chat"
-
-#: gajim/data/gui/manage_bookmarks_window.ui:68
-#, fuzzy
-msgid "Add Bookmark"
-msgstr "Žy_mės"
-
-#: gajim/data/gui/manage_bookmarks_window.ui:82
-#, fuzzy
-msgid "Remove Bookmark"
-msgstr "Žy_mės"
+#: gajim/data/gui/groupchat_creation.ui:27
+msgid "Public or Private?"
+msgstr ""
 
-#: gajim/data/gui/manage_bookmarks_window.ui:126
-msgid "N_ame"
+#: 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 ""
 
-#: gajim/data/gui/manage_bookmarks_window.ui:145
-#, fuzzy
-msgid "Bookmark Name"
-msgstr "Žy_mės"
+#: gajim/data/gui/groupchat_creation.ui:58
+msgid "<b>Public:</b> Anyone who knows the address can join."
+msgstr ""
 
-#: gajim/data/gui/manage_bookmarks_window.ui:160
+#: gajim/data/gui/groupchat_creation.ui:122
 #, fuzzy
-msgid "_Server"
-msgstr "_Serveris:"
+msgid "_Description"
+msgstr "Description"
 
-#: gajim/data/gui/manage_bookmarks_window.ui:223
-msgid "Roo_m"
+#: gajim/data/gui/groupchat_creation.ui:164
+msgid "_Public"
 msgstr ""
 
-#: gajim/data/gui/manage_bookmarks_window.ui:253
+#: gajim/data/gui/groupchat_creation.ui:278
 #, fuzzy
-msgid "_Password"
-msgstr "_Slaptažodis:"
-
-#: gajim/data/gui/manage_bookmarks_window.ui:299
-#, fuzzy
-msgid "Join chat when connected"
-msgstr "Contact Disconnected"
-
-#: gajim/data/gui/manage_bookmarks_window.ui:307
-msgid "_Join Automatically"
-msgstr ""
+msgid "_Account"
+msgstr "_Prieigos"
 
 #: gajim/data/gui/exception_dialog.ui:49
 msgid "Sorry, that should not have happened"
@@ -7817,6 +7982,29 @@ msgstr "Autorizuoti asmenį, kad jis arba ji žinotu kada esate prisijungęs"
 msgid "Presets"
 msgstr "_Buvimas"
 
+#: gajim/data/gui/groupchat_info_scrolled.ui:32
+#, fuzzy
+msgid "Address"
+msgstr "_Adresas:"
+
+#: gajim/data/gui/groupchat_info_scrolled.ui:64
+msgid "Topic"
+msgstr ""
+
+#: gajim/data/gui/groupchat_info_scrolled.ui:80
+#, fuzzy
+msgid "Author"
+msgstr "Au_torizuoti"
+
+#: gajim/data/gui/groupchat_info_scrolled.ui:182
+msgid "Discussion Logs"
+msgstr ""
+
+#: gajim/data/gui/groupchat_info_scrolled.ui:260
+#, fuzzy
+msgid "Group Chat Language"
+msgstr "Groupchat Invitation"
+
 #: gajim/data/gui/emoji_chooser.ui:98
 msgid "No Results Found"
 msgstr ""
@@ -7828,22 +8016,33 @@ msgstr ""
 #: gajim/data/gui/chat_to_muc_window.ui:39
 #, fuzzy
 msgid ""
-"You are now entering a groupchat.\n"
+"You are now entering a group chat.\n"
 "Select the contacts you want to invite"
 msgstr "Pažymėkite kontaktus kuriuos norėsite sinchronizuoti"
 
 #: gajim/data/gui/chat_to_muc_window.ui:112
-msgid "Please select a MUC server."
-msgstr ""
+#, fuzzy
+msgid "Please select a group chat server."
+msgstr "This is not a group chat"
 
 #: gajim/data/gui/chat_to_muc_window.ui:141
-msgid "MUC server"
-msgstr "MUC serveris"
+#, fuzzy
+msgid "Group chat server"
+msgstr "Groupchats"
 
 #: gajim/data/gui/chat_to_muc_window.ui:176
 msgid "In_vite"
 msgstr "Pak_viesti"
 
+#: gajim/data/gui/bookmarks.ui:176
+#, fuzzy
+msgid "Autojoin"
+msgstr "Automatinis prsijungimas"
+
+#: gajim/data/gui/bookmarks.ui:211
+msgid "_Apply"
+msgstr ""
+
 #: gajim/data/gui/history_manager.ui:11
 #, fuzzy
 msgid "_Export"
@@ -7860,11 +8059,11 @@ msgstr "Gajim Istorijos Žurnalų Valdymas"
 
 #: gajim/data/gui/history_manager.ui:108
 msgid ""
-"This log manager is not intended for log viewing. If you are looking for "
-"such functionality, use the history window instead.\n"
+"This history manager is not intended for viewing chat history. If you are "
+"looking for such functionality, please use the history window instead.\n"
 "\n"
-"Use this program to delete or export logs. You can select logs from the left "
-"and/or search database from below."
+"You can use this program to delete or export history. Either select logs "
+"from the left or search the database."
 msgstr ""
 
 #: gajim/data/gui/history_manager.ui:124
@@ -7911,8 +8110,9 @@ msgid "Select an emoji"
 msgstr ""
 
 #: gajim/data/gui/shortcuts_window.ui:38
-msgid "Complete a command or a nick"
-msgstr ""
+#, fuzzy
+msgid "Complete a command or a nickname"
+msgstr "Kurti naują pranešimą"
 
 #: gajim/data/gui/shortcuts_window.ui:45
 #, fuzzy
@@ -7952,7 +8152,7 @@ msgstr ""
 msgid "Scroll down"
 msgstr ""
 
-#: gajim/data/gui/shortcuts_window.ui:100 gajim/gtk/xml_console.py:72
+#: gajim/data/gui/shortcuts_window.ui:100 gajim/gtk/xml_console.py:69
 msgid "Clear"
 msgstr ""
 
@@ -7993,8 +8193,9 @@ msgid "Close chat"
 msgstr ""
 
 #: gajim/data/gui/shortcuts_window.ui:173
-msgid "Roster Shortcuts"
-msgstr ""
+#, fuzzy
+msgid "Contact List Shortcuts"
+msgstr "Contact Disconnected"
 
 #: gajim/data/gui/shortcuts_window.ui:196
 #, fuzzy
@@ -8027,7 +8228,7 @@ msgid "Show only active contacts"
 msgstr "Rodyti Tik _Aktyvius Kontaktus"
 
 #: gajim/data/gui/shortcuts_window.ui:251
-msgid "Enable roster filtering"
+msgid "Enable contact list filtering"
 msgstr ""
 
 #: gajim/data/gui/shortcuts_window.ui:259
@@ -8074,12 +8275,12 @@ msgid "Search selected day only"
 msgstr ""
 
 #: gajim/data/gui/history_window.ui:317
-msgid "Record history for this chat"
+msgid "Store history for this chat"
 msgstr ""
 
 #: gajim/data/gui/history_window.ui:332
 #, fuzzy
-msgid "Record History"
+msgid "Store History"
 msgstr "Nesenai:"
 
 #: gajim/data/gui/history_window.ui:350
@@ -8100,9 +8301,10 @@ msgstr "Kurti naują pranešimą"
 msgid "Fill in the form."
 msgstr "Užpildykite formą."
 
-#: gajim/data/gui/data_form_window.ui:229
-msgid "Room Configuration"
-msgstr "Kambario nustatymai"
+#: gajim/data/gui/data_form_window.ui:229 gajim/gtk/groupchat_config.py:41
+#, fuzzy
+msgid "Group Chat Configuration"
+msgstr "Groupchat Invitation"
 
 #: gajim/data/gui/roster_item_exchange_window.ui:39
 #: gajim/gtk/roster_item_exchange.py:35
@@ -8123,15 +8325,15 @@ msgstr "_Būklė"
 msgid "_Start Chat..."
 msgstr "_Pradėti pokalbį..."
 
-#: gajim/data/gui/systray_context_menu.ui:50
+#: gajim/data/gui/systray_context_menu.ui:43
 msgid "Show All Pending _Events"
 msgstr "Rodyti Visus Laukiančius Į_vykius"
 
-#: gajim/data/gui/systray_context_menu.ui:59
+#: gajim/data/gui/systray_context_menu.ui:52
 msgid "Mute Sounds"
 msgstr "Išjungti Garsus"
 
-#: gajim/data/gui/systray_context_menu.ui:75
+#: gajim/data/gui/systray_context_menu.ui:68
 #, fuzzy
 msgid "_Preferences"
 msgstr "Parinktys"
@@ -8222,34 +8424,34 @@ msgstr ""
 msgid "Execute expression inside a shell, send output"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:45
+#: gajim/command_system/implementation/standard.py:47
 msgid ""
 "Show help on a given command or a list of available commands if -a is given"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:73
+#: gajim/command_system/implementation/standard.py:75
 #, fuzzy
 msgid "Send a message to the contact"
 msgstr "Usage: /%s, hide the chat buttons."
 
-#: gajim/command_system/implementation/standard.py:78
+#: gajim/command_system/implementation/standard.py:80
 msgid "Send action (in the third person) to the current chat"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:83
+#: gajim/command_system/implementation/standard.py:85
 msgid "Show logged messages which mention given text"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:88
+#: gajim/command_system/implementation/standard.py:90
 #, fuzzy, python-format
 msgid "%s: Nothing found"
 msgstr "%s not found"
 
-#: gajim/command_system/implementation/standard.py:94
+#: gajim/command_system/implementation/standard.py:96
 msgid "Limit must be an integer"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:118
+#: gajim/command_system/implementation/standard.py:120
 msgid ""
 "\n"
 "    Set the current status\n"
@@ -8259,132 +8461,132 @@ msgid ""
 "    "
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:136
+#: gajim/command_system/implementation/standard.py:138
 msgid "Set the current status to away"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:150
+#: gajim/command_system/implementation/standard.py:152
 msgid "Set the current status to online"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:153
+#: gajim/command_system/implementation/standard.py:155
 #, fuzzy
 msgid "Available"
 msgstr "Esu išėjęs"
 
-#: gajim/command_system/implementation/standard.py:173
-#: gajim/command_system/implementation/standard.py:250
+#: gajim/command_system/implementation/standard.py:175
+#: gajim/command_system/implementation/standard.py:252
 #, fuzzy
 msgid "Clear the text window"
 msgstr "Usage: /%s, clears the text window."
 
-#: gajim/command_system/implementation/standard.py:178
-#: gajim/command_system/implementation/standard.py:397
+#: gajim/command_system/implementation/standard.py:180
+#: gajim/command_system/implementation/standard.py:401
 #, fuzzy
 msgid "Send a ping to the contact"
 msgstr "Sends file to a contact"
 
-#: gajim/command_system/implementation/standard.py:181
-#: gajim/command_system/implementation/standard.py:400
+#: gajim/command_system/implementation/standard.py:183
+#: gajim/command_system/implementation/standard.py:404
 msgid "Command is not supported for zeroconf accounts"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:185
-msgid "Send DTMF sequence through an open audio session"
+#: gajim/command_system/implementation/standard.py:187
+msgid "Send DTMF sequence through an open voice chat"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:188
+#: gajim/command_system/implementation/standard.py:190
 #, fuzzy
-msgid "No open audio sessions with the contact"
+msgid "No open voice chats with the contact"
 msgstr "Spauskite, kad pamatytumėte buvusius pokalbius su šiuo asmeniu"
 
-#: gajim/command_system/implementation/standard.py:191
+#: gajim/command_system/implementation/standard.py:193
 #, python-format
 msgid "%s is not a valid tone"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:198
-msgid "Toggle audio session"
+#: gajim/command_system/implementation/standard.py:200
+msgid "Toggle Voice Chat"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:201
+#: gajim/command_system/implementation/standard.py:203
 #, fuzzy
-msgid "Audio sessions are not available"
+msgid "Voice chats are not available"
 msgstr "Connection not available"
 
-#: gajim/command_system/implementation/standard.py:208
-msgid "Toggle video session"
+#: gajim/command_system/implementation/standard.py:210
+msgid "Toggle Video Chat"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:211
+#: gajim/command_system/implementation/standard.py:213
 #, fuzzy
-msgid "Video sessions are not available"
+msgid "Video chats are not available"
 msgstr "Connection not available"
 
-#: gajim/command_system/implementation/standard.py:218
+#: gajim/command_system/implementation/standard.py:220
 #, fuzzy
 msgid "Send a message to the contact that will attract their attention"
 msgstr "Usage: /%s, hide the chat buttons."
 
-#: gajim/command_system/implementation/standard.py:255
+#: gajim/command_system/implementation/standard.py:257
 #, fuzzy
 msgid "Change your nickname in a group chat"
 msgstr "Usage: /%s <nickname>, changes your nickname in current group chat."
 
-#: gajim/command_system/implementation/standard.py:260 gajim/gtk/dialogs.py:674
-#: gajim/gtk/bookmarks.py:272
+#: gajim/command_system/implementation/standard.py:262
 msgid "Invalid nickname"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:267
+#: gajim/command_system/implementation/standard.py:269
 #, fuzzy
-msgid "Open a private chat window with a specified occupant"
+msgid "Open a private chat window with a specified participant"
 msgstr ""
 "Usage: /%s <nickname>, opens a private chat window with the specified "
 "occupant."
 
-#: gajim/command_system/implementation/standard.py:273
-#: gajim/command_system/implementation/standard.py:282
-#: gajim/command_system/implementation/standard.py:332
-#: gajim/command_system/implementation/standard.py:345
-#: gajim/command_system/implementation/standard.py:357
+#: gajim/command_system/implementation/standard.py:275
+#: gajim/command_system/implementation/standard.py:284
+#: gajim/command_system/implementation/standard.py:336
+#: gajim/command_system/implementation/standard.py:349
+#: gajim/command_system/implementation/standard.py:361
 #, fuzzy
 msgid "Nickname not found"
 msgstr "Nickname not found: %s"
 
-#: gajim/command_system/implementation/standard.py:276
+#: gajim/command_system/implementation/standard.py:278
 #, fuzzy
 msgid ""
-"Open a private chat window with a specified occupant and send him a message"
+"Open a private chat window with a specified participant and send him a "
+"message"
 msgstr ""
 "Usage: /%s <nickname>, opens a private chat window with the specified "
 "occupant."
 
-#: gajim/command_system/implementation/standard.py:285
+#: gajim/command_system/implementation/standard.py:287
 #, fuzzy
 msgid "Display or change a group chat topic"
 msgstr "Ask before closing a group chat tab/window."
 
-#: gajim/command_system/implementation/standard.py:294
-msgid "Invite a user to a room for a reason"
+#: gajim/command_system/implementation/standard.py:296
+msgid "Invite a user to a group chat for a reason"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:297
+#: gajim/command_system/implementation/standard.py:299
 #, fuzzy, python-format
 msgid "Invited %(jid)s to %(room_jid)s"
 msgstr "Invited %(contact_jid)s to %(room_jid)s."
 
-#: gajim/command_system/implementation/standard.py:301
+#: gajim/command_system/implementation/standard.py:303
 #, fuzzy
-msgid "Join a group chat given by a JID"
+msgid "Join a group chat given by an XMPP Address"
 msgstr "pokalbiuose _grupėje"
 
-#: gajim/command_system/implementation/standard.py:309
+#: gajim/command_system/implementation/standard.py:313
 msgid ""
-"Leave the groupchat, optionally giving a reason, and close tab or window"
+"Leave the group chat, optionally giving a reason, and close tab or window"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:314
+#: gajim/command_system/implementation/standard.py:318
 msgid ""
 "\n"
 "    Ban user by a nick or a JID from a groupchat\n"
@@ -8393,45 +8595,45 @@ msgid ""
 "    "
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:329
+#: gajim/command_system/implementation/standard.py:333
 #, fuzzy
-msgid "Kick user by a nick from a groupchat"
+msgid "Kick user by a nick from a group chat"
 msgstr "Jūs esate išmestas iš grupės pokalbio %s."
 
-#: gajim/command_system/implementation/standard.py:338
+#: gajim/command_system/implementation/standard.py:342
 msgid ""
-"Set occupant role in group chat.\n"
+"Set participant role in group chat.\n"
 "    Role can be given as one of the following values:\n"
 "    moderator, participant, visitor, none"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:343
+#: gajim/command_system/implementation/standard.py:347
 #, fuzzy
 msgid "Invalid role given"
 msgstr "Invalid File"
 
-#: gajim/command_system/implementation/standard.py:350
+#: gajim/command_system/implementation/standard.py:354
 msgid ""
-"Set occupant affiliation in group chat.\n"
+"Set participant affiliation in group chat.\n"
 "    Affiliation can be given as one of the following values:\n"
 "    owner, admin, member, outcast, none"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:355
+#: gajim/command_system/implementation/standard.py:359
 msgid "Invalid affiliation given"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:365
+#: gajim/command_system/implementation/standard.py:369
 #, fuzzy
-msgid "Display names of all group chat occupants"
+msgid "Display names of all group chat participants"
 msgstr "Usage: /%s , display the names of group chat occupants."
 
-#: gajim/command_system/implementation/standard.py:387
-msgid "Forbid an occupant to send you public or private messages"
+#: gajim/command_system/implementation/standard.py:391
+msgid "Forbid a participant to send you public or private messages"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:392
-msgid "Allow an occupant to send you public or private messages"
+#: gajim/command_system/implementation/standard.py:396
+msgid "Allow a participant to send you public or private messages"
 msgstr ""
 
 #: gajim/command_system/implementation/middleware.py:74
@@ -8442,234 +8644,360 @@ msgstr ""
 msgid "The same as using a doc-string, except it supports translation"
 msgstr ""
 
-#: gajim/gtk/filetransfer.py:91
+#: gajim/gtk/groupchat_info.py:36
+#, fuzzy
+msgid "?Group chat feature:Archiving"
+msgstr "Groupchat Invitation"
+
+#: gajim/gtk/groupchat_info.py:37
+#, fuzzy
+msgid "Messages are archived on the server"
+msgstr "You are not connected to the server"
+
+#: gajim/gtk/groupchat_info.py:40
+#, fuzzy
+msgid "?Group chat feature:Persistent"
+msgstr "Groupchats"
+
+#: gajim/gtk/groupchat_info.py:41
+msgid "This group chat persists even if there are no participants"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:45
+#, fuzzy
+msgid "?Group chat feature:Temporary"
+msgstr "None"
+
+#: gajim/gtk/groupchat_info.py:46
+msgid "This group chat will be destroyed once the last participant left"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:50
+#, fuzzy
+msgid "?Group chat feature:Moderated"
+msgstr "None"
+
+#: gajim/gtk/groupchat_info.py:51
+msgid ""
+"Participants entering this group chat need to request permission to send "
+"messages"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:55
+#, fuzzy
+msgid "?Group chat feature:Not Moderated"
+msgstr "Groupchats"
+
+#: gajim/gtk/groupchat_info.py:56
+msgid "Participants entering this group chat are allowed to send messages"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:60
+#, fuzzy
+msgid "?Group chat feature:Open"
+msgstr "None"
+
+#: gajim/gtk/groupchat_info.py:61
+#, fuzzy
+msgid "Anyone can join this group chat"
+msgstr "Unable to join group chat"
+
+#: gajim/gtk/groupchat_info.py:64
+#, fuzzy
+msgid "?Group chat feature:Members Only"
+msgstr "Group Chat Message Highlight"
+
+#: gajim/gtk/groupchat_info.py:65
+msgid "This group chat is restricted to members only"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:69
+#, fuzzy
+msgid "?Group chat feature:Public"
+msgstr "Group Chat Message Highlight"
+
+#: gajim/gtk/groupchat_info.py:70
+msgid "Group chat can be found via search"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:73
+#, fuzzy
+msgid "?Group chat feature:Hidden"
+msgstr "None"
+
+#: gajim/gtk/groupchat_info.py:74
+#, fuzzy
+msgid "This group chat can not be found via search"
+msgstr "This group chat has no subject"
+
+#: gajim/gtk/groupchat_info.py:77
+#, fuzzy
+msgid "?Group chat feature:Not Anonymous"
+msgstr "Groupchats"
+
+#: gajim/gtk/groupchat_info.py:78
+msgid "All other group chat participants can see your XMPP address"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:82
+#, fuzzy
+msgid "?Group chat feature:Semi-Anonymous"
+msgstr "Group Chat Message Highlight"
+
+#: gajim/gtk/groupchat_info.py:83
+msgid "Only moderators can see your XMPP address"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:86
+#, fuzzy
+msgid "?Group chat feature:Password Required"
+msgstr "Groupchats"
+
+#: gajim/gtk/groupchat_info.py:87
+msgid "This group chat does require a password upon entry"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:91
+#, fuzzy
+msgid "?Group chat feature:No Password Required"
+msgstr "Groupchats"
+
+#: gajim/gtk/groupchat_info.py:92
+msgid "This group chat does not require a password upon entry"
+msgstr ""
+
+#: gajim/gtk/filetransfer.py:90
 msgid "File"
 msgstr "File"
 
-#: gajim/gtk/filetransfer.py:108
+#: gajim/gtk/filetransfer.py:107
 msgid "Time"
 msgstr "Time"
 
-#: gajim/gtk/filetransfer.py:228
+#: gajim/gtk/filetransfer.py:227
 #, fuzzy, python-format
 msgid "File name: %s"
 msgstr "Filename: %s"
 
-#: gajim/gtk/filetransfer.py:229 gajim/gtk/filetransfer.py:464
+#: gajim/gtk/filetransfer.py:228 gajim/gtk/filetransfer.py:469
 #, python-format
 msgid "Size: %s"
 msgstr "Size: %s"
 
-#: gajim/gtk/filetransfer.py:239
+#: gajim/gtk/filetransfer.py:238
 #, python-format
 msgid "Sender: %s"
 msgstr "Sender: %s"
 
-#: gajim/gtk/filetransfer.py:240 gajim/gtk/filetransfer.py:744
+#: gajim/gtk/filetransfer.py:239 gajim/gtk/filetransfer.py:749
 #: gajim/gtk/tooltips.py:577
 msgid "Recipient: "
 msgstr "Recipient: "
 
-#: gajim/gtk/filetransfer.py:251
+#: gajim/gtk/filetransfer.py:250
 #, python-format
 msgid "Saved in: %s"
 msgstr "Saved in: %s"
 
-#: gajim/gtk/filetransfer.py:256
+#: gajim/gtk/filetransfer.py:255
 msgid "File transfer completed"
 msgstr "File transfer completed"
 
-#: gajim/gtk/filetransfer.py:276 gajim/gtk/filetransfer.py:285
+#: gajim/gtk/filetransfer.py:275 gajim/gtk/filetransfer.py:284
 #, fuzzy
 msgid "Connection with peer could not be established."
 msgstr "Connection with peer cannot be established."
 
-#: gajim/gtk/filetransfer.py:293
+#: gajim/gtk/filetransfer.py:292
 #, python-format
 msgid "Filename: %s"
 msgstr "Filename: %s"
 
-#: gajim/gtk/filetransfer.py:294
+#: gajim/gtk/filetransfer.py:293
 #, python-format
 msgid "Recipient: %s"
 msgstr "Recipient: %s"
 
-#: gajim/gtk/filetransfer.py:296
+#: gajim/gtk/filetransfer.py:295
 #, python-format
 msgid "Error message: %s"
 msgstr "Error message: %s"
 
-#: gajim/gtk/filetransfer.py:333
-#, fuzzy
-msgid "File transfer error"
-msgstr "File Transfer Error"
-
 #: gajim/gtk/filetransfer.py:334
 #, python-format
 msgid ""
-"The file %(file)s has been received, but it seems to have been damaged along "
-"the way.\n"
+"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 ""
 
-#: gajim/gtk/filetransfer.py:350
+#: gajim/gtk/filetransfer.py:340
+#, fuzzy
+msgid "_Download Again"
+msgstr "Do _not ask me again"
+
+#: gajim/gtk/filetransfer.py:355
 #, fuzzy
 msgid "Gajim can not read this file"
 msgstr "Gajim cannot access this file"
 
-#: gajim/gtk/filetransfer.py:351
+#: gajim/gtk/filetransfer.py:356
 msgid "Another process is using this file."
 msgstr ""
 
-#: gajim/gtk/filetransfer.py:418
+#: gajim/gtk/filetransfer.py:423
 #, fuzzy
 msgid "File Transfer Conflict"
 msgstr "File Transfer Completed"
 
-#: gajim/gtk/filetransfer.py:419
+#: gajim/gtk/filetransfer.py:424
 msgid "This file already exists"
 msgstr "This file already exists"
 
-#: gajim/gtk/filetransfer.py:420
+#: gajim/gtk/filetransfer.py:425
 msgid "Resume download or replace file?"
 msgstr ""
 
-#: gajim/gtk/filetransfer.py:424
+#: gajim/gtk/filetransfer.py:429
 #, fuzzy
 msgid "Replace _File"
 msgstr "Failų siuntimai"
 
-#: gajim/gtk/filetransfer.py:427
+#: gajim/gtk/filetransfer.py:432
 msgid "Resume _Download"
 msgstr ""
 
-#: gajim/gtk/filetransfer.py:437
+#: gajim/gtk/filetransfer.py:442
 #, fuzzy, python-format
 msgid "Directory '%s' is not writable"
 msgstr "Directory \"%s\" is not writable"
 
-#: gajim/gtk/filetransfer.py:438
+#: gajim/gtk/filetransfer.py:443
 #, fuzzy
 msgid "You do not have permissions to create files in this directory."
 msgstr "You do not have permission to create files in this directory."
 
-#: gajim/gtk/filetransfer.py:461
+#: gajim/gtk/filetransfer.py:466
 #, python-format
 msgid "File: %s"
 msgstr "File: %s"
 
-#: gajim/gtk/filetransfer.py:467
+#: gajim/gtk/filetransfer.py:472
 #, python-format
 msgid "Type: %s"
 msgstr "Type: %s"
 
-#: gajim/gtk/filetransfer.py:469
+#: gajim/gtk/filetransfer.py:474
 #, python-format
 msgid "Description: %s"
 msgstr "Description: %s"
 
-#: gajim/gtk/filetransfer.py:480
+#: gajim/gtk/filetransfer.py:485
 #, fuzzy, python-format
 msgid "%s wants to send you a file"
 msgstr "%s wants to send you a file."
 
-#: gajim/gtk/filetransfer.py:509
+#: gajim/gtk/filetransfer.py:514
 #, fuzzy
 msgid "Checking file…"
 msgstr "Sending profile..."
 
-#: gajim/gtk/filetransfer.py:524
+#: gajim/gtk/filetransfer.py:529
 #, fuzzy
 msgid "File error"
 msgstr "File Transfer Error"
 
-#: gajim/gtk/filetransfer.py:561
+#: gajim/gtk/filetransfer.py:566
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 
-#: gajim/gtk/filetransfer.py:658
+#: gajim/gtk/filetransfer.py:663
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/s)"
 
-#: gajim/gtk/filetransfer.py:711 gajim/gtk/filetransfer.py:715
+#: gajim/gtk/filetransfer.py:716 gajim/gtk/filetransfer.py:720
 msgid "Invalid File"
 msgstr "Invalid File"
 
-#: gajim/gtk/filetransfer.py:711
+#: gajim/gtk/filetransfer.py:716
 msgid "File: "
 msgstr "File: "
 
-#: gajim/gtk/filetransfer.py:716
+#: gajim/gtk/filetransfer.py:721
 msgid "It is not possible to send empty files"
 msgstr "It is not possible to send empty files"
 
-#: gajim/gtk/filetransfer.py:742 gajim/gtk/tooltips.py:571
+#: gajim/gtk/filetransfer.py:747 gajim/gtk/tooltips.py:571
 msgid "Sender: "
 msgstr "Sender: "
 
-#: gajim/gtk/filetransfer.py:1038
+#: gajim/gtk/filetransfer.py:1043
 #, fuzzy
 msgid "Choose a File to Send…"
 msgstr "Choose File to Send..."
 
 #: gajim/gtk/start_chat.py:51
 #, fuzzy
-msgid "Start new Conversation"
+msgid "Start New Conversation"
 msgstr "Pokalbio tęsinys"
 
-#: gajim/gtk/start_chat.py:424
-#, fuzzy
-msgid "New Groupchat"
-msgstr "New Group Chat"
+#: gajim/gtk/start_chat.py:260 gajim/gtk/start_chat.py:328
+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:426
+#: gajim/gtk/start_chat.py:603 gajim/gtk/groupchat_join.py:38
+msgid "Join Group Chat"
+msgstr "Prisijungti prie pokalbio grupėje"
+
+#: gajim/gtk/start_chat.py:605 gajim/gtk/add_contact.py:40
 #, fuzzy
-msgid "New Contact"
-msgstr "Prijungti naują asmenį"
+msgid "Add Contact"
+msgstr "_Įtraukti asmenį..."
 
-#: gajim/gtk/start_chat.py:588
+#: gajim/gtk/start_chat.py:746
 #, fuzzy, python-format
-msgid "%s Group chats found"
+msgid "%s group chats found"
 msgstr "%s not found"
 
-#: gajim/gtk/discovery.py:70
+#: gajim/gtk/discovery.py:69
 msgid "This service has not yet responded with detailed information"
 msgstr ""
 
-#: gajim/gtk/discovery.py:71
+#: gajim/gtk/discovery.py:70
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely a legacy service or broken."
 msgstr ""
 
-#: gajim/gtk/discovery.py:128
+#: gajim/gtk/discovery.py:126
 msgid "Others"
 msgstr "Others"
 
-#: gajim/gtk/discovery.py:131
-msgid "Conference"
-msgstr "Conference"
+#: gajim/gtk/discovery.py:129
+#, fuzzy
+msgid "Group Chat"
+msgstr "Pokalbiai _Grupėje"
 
-#: gajim/gtk/discovery.py:519
+#: gajim/gtk/discovery.py:518
 msgid "Without a connection, you can not browse available services"
 msgstr "Without a connection, you can not browse available services"
 
-#: gajim/gtk/discovery.py:606
+#: gajim/gtk/discovery.py:605
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Service Discovery using account %s"
 
-#: gajim/gtk/discovery.py:608
+#: gajim/gtk/discovery.py:607
 msgid "Service Discovery"
 msgstr "Service Discovery"
 
-#: gajim/gtk/discovery.py:691
+#: gajim/gtk/discovery.py:690
 msgid "The service could not be found"
 msgstr "The service could not be found"
 
-#: gajim/gtk/discovery.py:692
+#: gajim/gtk/discovery.py:691
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -8677,100 +9005,80 @@ 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:699 gajim/gtk/discovery.py:1042
+#: gajim/gtk/discovery.py:698 gajim/gtk/discovery.py:1041
 msgid "The service is not browsable"
 msgstr "The service is not browsable"
 
-#: gajim/gtk/discovery.py:700
+#: gajim/gtk/discovery.py:699
 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:738 gajim/gtk/discovery.py:747
+#: gajim/gtk/discovery.py:737 gajim/gtk/discovery.py:746
 msgid "Invalid Server Name"
 msgstr ""
 
-#: gajim/gtk/discovery.py:806
+#: gajim/gtk/discovery.py:805
 #, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr ""
 
-#: gajim/gtk/discovery.py:851
+#: gajim/gtk/discovery.py:850
 #, fuzzy
 msgid "Browse"
 msgstr "_Browse"
 
-#: gajim/gtk/discovery.py:1043
+#: gajim/gtk/discovery.py:1042
 msgid "This service does not contain any items to browse."
 msgstr "This service does not contain any items to browse."
 
-#: gajim/gtk/discovery.py:1255
+#: gajim/gtk/discovery.py:1254
 #, fuzzy
 msgid "_Command"
 msgstr "Commands: %s"
 
-#: gajim/gtk/discovery.py:1264 gajim/gtk/discovery.py:1422
+#: gajim/gtk/discovery.py:1263 gajim/gtk/discovery.py:1420
 msgid "Re_gister"
 msgstr "Re_gister"
 
-#: gajim/gtk/discovery.py:1277
+#: gajim/gtk/discovery.py:1276
 msgid "_Search"
 msgstr "_Ieškoti"
 
-#: gajim/gtk/discovery.py:1420
+#: gajim/gtk/discovery.py:1418
 msgid "_Edit"
 msgstr "_Redaguoti"
 
-#: gajim/gtk/discovery.py:1458
+#: gajim/gtk/discovery.py:1456
 #, python-format
 msgid "Scanning %(current)d / %(total)d ..."
 msgstr ""
 
-#: gajim/gtk/discovery.py:1674
+#: gajim/gtk/discovery.py:1655
+msgid "Users"
+msgstr "Users"
+
+#: gajim/gtk/discovery.py:1671
 msgid "Id"
 msgstr "Id"
 
-#: gajim/gtk/discovery.py:1713
-msgid "_Join"
-msgstr "_Jungtis"
-
-#: gajim/gtk/discovery.py:1736
-msgid "Bookmark already set"
-msgstr "Bookmark already set"
-
-#: gajim/gtk/discovery.py:1737
-#, fuzzy, python-format
-msgid "Group Chat '%s' is already in your bookmarks."
-msgstr "Group Chat \"%s\" is already in your bookmarks."
-
-#: gajim/gtk/discovery.py:1748
-msgid "Bookmark has been added successfully"
-msgstr "Bookmark has been added successfully"
-
-#: gajim/gtk/discovery.py:1749
-#, fuzzy
-msgid ""
-"You can manage your bookmarks by clicking the Bookmarks menu item in your "
-"contact list."
-msgstr "You can manage your bookmarks via Actions menu in your roster."
-
-#: gajim/gtk/discovery.py:1950
+#: gajim/gtk/discovery.py:1900
 msgid "Subscribed"
 msgstr "Subscribed"
 
-#: gajim/gtk/discovery.py:1959
+#: gajim/gtk/discovery.py:1909
 msgid "Node"
 msgstr ""
 
-#: gajim/gtk/discovery.py:2028
+#: gajim/gtk/discovery.py:1978
 #, fuzzy
 msgid "_New post"
 msgstr "Prijungti naują asmenį"
 
-#: gajim/gtk/discovery.py:2037
+#: gajim/gtk/discovery.py:1987
 msgid "_Subscribe"
 msgstr ""
 
-#: gajim/gtk/discovery.py:2045
+#: gajim/gtk/discovery.py:1995
 msgid "_Unsubscribe"
 msgstr ""
 
@@ -8817,7 +9125,7 @@ msgstr "Avahi error"
 msgid "Characters typed: %s"
 msgstr ""
 
-#: gajim/gtk/single_message.py:274 gajim/gtk/xml_console.py:169
+#: gajim/gtk/single_message.py:274 gajim/gtk/xml_console.py:166
 msgid "Connection not available"
 msgstr "Connection not available"
 
@@ -8826,6 +9134,12 @@ msgstr "Connection not available"
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Please make sure you are connected with \"%s\"."
 
+#: gajim/gtk/single_message.py:306
+#, 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:330
 #, python-format
 msgid "RE: %s"
@@ -8836,28 +9150,28 @@ msgstr "RE: %s"
 msgid "%s wrote:\n"
 msgstr "%s wrote:\n"
 
-#: gajim/gtk/pep_config.py:44
+#: gajim/gtk/pep_config.py:45
 #, fuzzy, python-format
 msgid "PEP Service Configuration (%s)"
 msgstr "PEP Paslaugos Konfigūracija"
 
-#: gajim/gtk/pep_config.py:77
+#: gajim/gtk/pep_config.py:78
 #, fuzzy
 msgid "Service"
 msgstr "Server"
 
-#: gajim/gtk/pep_config.py:114
+#: gajim/gtk/pep_config.py:115
 msgid "PEP node was not removed"
 msgstr ""
 
-#: gajim/gtk/pep_config.py:115
+#: gajim/gtk/pep_config.py:116
 #, python-format
 msgid ""
 "PEP node %(node)s was not removed:\n"
 "%(message)s"
 msgstr ""
 
-#: gajim/gtk/pep_config.py:146
+#: gajim/gtk/pep_config.py:147
 #, fuzzy, python-format
 msgid "Configure %s"
 msgstr "_Konfigūruoti"
@@ -8873,17 +9187,21 @@ msgstr "_Registracija"
 msgid "Registration successful"
 msgstr "Registracija sėkminga"
 
-#: gajim/gtk/dialogs.py:54 gajim/gtk/dataform.py:659 gajim/gtk/adhoc.py:85
+#: gajim/gtk/service_registration.py:215
+msgid "Registration failed"
+msgstr "Registracija nesėkminga"
+
+#: gajim/gtk/dialogs.py:53 gajim/gtk/dataform.py:668 gajim/gtk/adhoc.py:86
 #, fuzzy
 msgid "Cancel"
 msgstr "_Atšaukti"
 
-#: gajim/gtk/dialogs.py:129
+#: gajim/gtk/dialogs.py:128
 #, fuzzy, python-format
 msgid "Dictionary for language \"%s\" not available"
 msgstr "Dictionary for lang %s not available"
 
-#: gajim/gtk/dialogs.py:130
+#: gajim/gtk/dialogs.py:129
 #, fuzzy, python-format
 msgid ""
 "You have to install the dictionary \"%s\" to use spellchecking, or choose "
@@ -8894,11 +9212,11 @@ msgstr ""
 "You have to install %s dictionary to use spellchecking, or choose another "
 "language by setting the speller_language option."
 
-#: gajim/gtk/dialogs.py:410 gajim/gtk/dialogs.py:425
+#: gajim/gtk/dialogs.py:322 gajim/gtk/dialogs.py:337
 msgid "Insecure connection"
 msgstr "Nesaugus ryšys"
 
-#: gajim/gtk/dialogs.py:411
+#: gajim/gtk/dialogs.py:323
 #, python-format
 msgid ""
 "You are about to connect to the account %(account)s (%(server)s) insecurely. "
@@ -8907,119 +9225,115 @@ msgid ""
 "Are you sure you want to do that?"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:416
+#: gajim/gtk/dialogs.py:328
 msgid "Yes, I really want to connect insecurely"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:417
+#: gajim/gtk/dialogs.py:329
 msgid "Gajim will NOT connect unless you check this box"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:675
-msgid "The nickname contains invalid characters."
-msgstr ""
-
-#: gajim/gtk/dialogs.py:734
+#: gajim/gtk/dialogs.py:561
 #, python-format
 msgid "Destroy %s"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:775
+#: gajim/gtk/dialogs.py:602
 #, fuzzy
 msgid "Certificate"
 msgstr "Blogas CA sertifikatas"
 
-#: gajim/gtk/dialogs.py:786
+#: gajim/gtk/dialogs.py:613
 #, fuzzy, python-format
 msgid ""
 "Certificate for account\n"
 "%s"
 msgstr "Įveskite naują prieigos %s pavadinimą"
 
-#: gajim/gtk/dialogs.py:824
+#: gajim/gtk/dialogs.py:651
 msgid "Issued to\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:825 gajim/gtk/dialogs.py:830
+#: gajim/gtk/dialogs.py:652 gajim/gtk/dialogs.py:657
 msgid "Common Name (CN): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:826 gajim/gtk/dialogs.py:831
+#: gajim/gtk/dialogs.py:653 gajim/gtk/dialogs.py:658
 msgid "Organization (O): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:827 gajim/gtk/dialogs.py:832
+#: gajim/gtk/dialogs.py:654 gajim/gtk/dialogs.py:659
 msgid "Organizational Unit (OU): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:828
+#: gajim/gtk/dialogs.py:655
 #, fuzzy
 msgid "Serial Number: "
 msgstr "GG Number:"
 
-#: gajim/gtk/dialogs.py:829
+#: gajim/gtk/dialogs.py:656
 msgid "Issued by\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:833
+#: gajim/gtk/dialogs.py:660
 msgid "Validity\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:834
+#: gajim/gtk/dialogs.py:661
 msgid "Issued on: "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:835
+#: gajim/gtk/dialogs.py:662
 msgid "Expires on: "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:836
+#: gajim/gtk/dialogs.py:663
 msgid "SHA-1:"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:838
+#: gajim/gtk/dialogs.py:665
 msgid "SHA-256:"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:852
+#: gajim/gtk/dialogs.py:679
 #, fuzzy
 msgid "View certificate…"
 msgstr "Blogas CA sertifikatas"
 
-#: gajim/gtk/dialogs.py:864 gajim/gtk/accounts.py:893
+#: gajim/gtk/dialogs.py:691 gajim/gtk/accounts.py:896
 msgid "Change Password"
 msgstr "Keisti slaptažodį"
 
-#: gajim/gtk/dialogs.py:878
+#: gajim/gtk/dialogs.py:705
 msgid "_OK"
 msgstr "_OK"
 
-#: gajim/gtk/dialogs.py:891
+#: gajim/gtk/dialogs.py:718
 #, fuzzy
 msgid "You must enter a password"
 msgstr "You must enter a password."
 
-#: gajim/gtk/dialogs.py:895
+#: gajim/gtk/dialogs.py:722
 msgid "Passwords do not match"
 msgstr "Passwords do not match"
 
-#: gajim/gtk/dialogs.py:923
+#: gajim/gtk/dialogs.py:750
 #, fuzzy
 msgid "Group Chat Invitation "
 msgstr "Groupchat Invitation"
 
-#: gajim/gtk/dialogs.py:948
+#: gajim/gtk/dialogs.py:775
 #, python-format
 msgid "<b>%s</b> has invited you to join a discussion"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:951
+#: gajim/gtk/dialogs.py:778
 #, python-format
 msgid ""
 "<b>%(contact)s</b> has invited you to the group chat <b>%(room_jid)s</b>"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:959
+#: gajim/gtk/dialogs.py:786
 #, python-format
 msgid "Comment: %s"
 msgstr ""
@@ -9034,11 +9348,6 @@ msgstr "GG Number:"
 msgid "ICQ Number"
 msgstr "ICQ Number:"
 
-#: gajim/gtk/add_contact.py:40
-#, fuzzy
-msgid "Add Contact"
-msgstr "_Įtraukti asmenį..."
-
 #: gajim/gtk/add_contact.py:259
 #, fuzzy, python-format
 msgid "%s Missing"
@@ -9059,8 +9368,9 @@ msgid "The user ID must not contain a resource."
 msgstr "The user ID must not contain a resource."
 
 #: gajim/gtk/add_contact.py:299
-msgid "You cannot add yourself to your roster."
-msgstr ""
+#, fuzzy
+msgid "You cannot add yourself to your contact list."
+msgstr "Norėšiau jus įtraukti į savo kontaktų sąrašą."
 
 #: gajim/gtk/add_contact.py:304
 #, fuzzy
@@ -9072,11 +9382,13 @@ msgid "Your account must be online to add new contacts."
 msgstr ""
 
 #: gajim/gtk/add_contact.py:321
-msgid "Contact already in roster"
+#, fuzzy
+msgid "Contact Already in Contact List"
 msgstr "Contact already in roster"
 
 #: gajim/gtk/add_contact.py:322
-msgid "This contact is already listed in your roster."
+#, fuzzy
+msgid "This contact is already in your contact list."
 msgstr "This contact is already listed in your roster."
 
 #: gajim/gtk/add_contact.py:379 gajim/gtk/add_contact.py:417
@@ -9117,14 +9429,14 @@ msgstr "Change status"
 
 #: gajim/gtk/themes.py:52
 #, fuzzy
-msgid "MUC Tab New Directed Message"
+msgid "Group Chat Tab New Directed Message"
 msgstr ""
 "MUC skirtos\n"
 "Žinutės"
 
 #: gajim/gtk/themes.py:56
 #, fuzzy
-msgid "MUC Tab New Message"
+msgid "Group Chat Tab New Message"
 msgstr "New Message"
 
 #: gajim/gtk/themes.py:60
@@ -9340,13 +9652,13 @@ msgstr "All files"
 msgid "Clear File"
 msgstr "Failų siuntimai"
 
-#: gajim/gtk/settings.py:570
+#: gajim/gtk/settings.py:570 gajim/gtk/proxies.py:32
 #, fuzzy
 msgid "Manage Proxies"
 msgstr "Proxi profilių valdymas"
 
-#: gajim/gtk/settings.py:591 gajim/gtk/preferences.py:971
-#: gajim/gtk/preferences.py:984 gajim/gtk/preferences.py:988
+#: gajim/gtk/settings.py:591 gajim/gtk/preferences.py:968
+#: gajim/gtk/preferences.py:982 gajim/gtk/preferences.py:986
 #, fuzzy
 msgid "No Proxy"
 msgstr "Proksis:"
@@ -9426,14 +9738,15 @@ msgid ""
 "        "
 msgstr ""
 
-#: gajim/gtk/about.py:47 data/org.gajim.Gajim.appdata.xml.in:10
+#: gajim/gtk/about.py:47 data/org.gajim.Gajim.desktop.in:6
+#: data/org.gajim.Gajim.appdata.xml.in:10
 #, fuzzy
-msgid "A GTK+ XMPP client"
+msgid "A GTK XMPP client"
 msgstr "GTK+ Jabber klientas"
 
 #: gajim/gtk/about.py:48
 #, fuzzy, python-format
-msgid "GTK+ Version: %s"
+msgid "GTK Version: %s"
 msgstr "GTK+ Version:"
 
 #: gajim/gtk/about.py:49
@@ -9611,6 +9924,25 @@ msgstr "All"
 msgid "?transfer status:Not started"
 msgstr "All"
 
+#: gajim/gtk/groupchat_creation.py:97 gajim/gtk/groupchat_creation.py:99
+msgid " (optional)..."
+msgstr ""
+
+#: gajim/gtk/groupchat_creation.py:134
+#, fuzzy
+msgid "Invalid Address"
+msgstr "Invalid File"
+
+#: gajim/gtk/groupchat_creation.py:182
+#, fuzzy
+msgid "Not Connected"
+msgstr "Prisijungta"
+
+#: gajim/gtk/groupchat_creation.py:183
+#, fuzzy
+msgid "You have to be connected to create a group chat."
+msgstr "You have not joined a groupchat."
+
 #: gajim/gtk/sounds.py:39
 msgid "Wav Sounds"
 msgstr "Wav Sounds"
@@ -9652,50 +9984,45 @@ msgstr "Group Chat Message Highlight"
 msgid "Group Chat Message Received"
 msgstr "Group Chat Message Received"
 
-#: gajim/gtk/dataform.py:226 gajim/gtk/dataform.py:262
+#: gajim/gtk/dataform.py:232 gajim/gtk/dataform.py:268
 #, fuzzy
 msgid "Required"
 msgstr "Password Required"
 
-#: gajim/gtk/dataform.py:286
+#: gajim/gtk/dataform.py:293
 msgid "Yes"
 msgstr ""
 
-#: gajim/gtk/dataform.py:286
+#: gajim/gtk/dataform.py:293
 #, fuzzy
 msgid "No"
 msgstr "Joks"
 
-#: gajim/gtk/dataform.py:661
+#: gajim/gtk/dataform.py:670
 msgid "Submit"
 msgstr ""
 
-#: gajim/gtk/statusicon.py:213
+#: gajim/gtk/statusicon.py:206
 #, fuzzy
 msgid "_Change Status Message…"
 msgstr "_Keisti Būklės Žinutę"
 
-#: gajim/gtk/statusicon.py:247 gajim/gtk/statusicon.py:292
-#: gajim/gtk/statusicon.py:299
+#: gajim/gtk/statusicon.py:258
 #, python-format
 msgid "using account %s"
 msgstr ""
 
-#: gajim/gtk/statusicon.py:309
+#: gajim/gtk/statusicon.py:269
 #, fuzzy
-msgid "_Manage Bookmarks…"
-msgstr "Žymių valdymas"
+msgid "Hide _Contact List"
+msgstr "Kviesti Kontaktus"
 
-#: gajim/gtk/statusicon.py:325
+#: gajim/gtk/statusicon.py:273
 #, fuzzy
-msgid "Hide _Roster"
-msgstr "_sąraše"
-
-#: gajim/gtk/statusicon.py:329
-msgid "Show _Roster"
-msgstr "Rodyk _Kontaktų Sąrašą"
+msgid "Show _Contact List"
+msgstr "Rodyti Tik _Aktyvius Kontaktus"
 
-#: gajim/gtk/statusicon.py:337
+#: gajim/gtk/statusicon.py:281
 msgid "Hide this menu"
 msgstr "Hide this menu"
 
@@ -9744,36 +10071,6 @@ msgstr ""
 "There was an error while publishing your personal information, try again "
 "later."
 
-#: gajim/gtk/join_groupchat.py:202
-#, fuzzy
-msgid "Invalid Room"
-msgstr "Invalid File"
-
-#: gajim/gtk/join_groupchat.py:203
-msgid "Please choose a room"
-msgstr ""
-
-#: gajim/gtk/join_groupchat.py:222 gajim/gtk/join_groupchat.py:229
-msgid "Invalid Nickname"
-msgstr ""
-
-#: gajim/gtk/join_groupchat.py:223
-#, fuzzy
-msgid "Please choose a nickname"
-msgstr "Kurti naują pranešimą"
-
-#: gajim/gtk/join_groupchat.py:282 gajim/gtk/join_groupchat.py:288
-#: gajim/gtk/join_groupchat.py:293
-#, fuzzy
-msgid "Wrong server"
-msgstr "MUC serveris"
-
-#: gajim/gtk/join_groupchat.py:283 gajim/gtk/join_groupchat.py:289
-#: gajim/gtk/join_groupchat.py:294
-#, fuzzy, python-format
-msgid "%s is not a groupchat server"
-msgstr "This is not a group chat"
-
 #: gajim/gtk/mam_preferences.py:38
 #, python-format
 msgid "Archiving Preferences for %s"
@@ -9804,45 +10101,53 @@ msgstr "Jūs gavote naują įrašą:"
 msgid "Archiving Preferences Error"
 msgstr "_Nustatymai"
 
-#: gajim/gtk/advanced_config.py:81
+#: gajim/gtk/advanced_config.py:95
 msgid "Activated"
 msgstr "Activated"
 
-#: gajim/gtk/advanced_config.py:81
+#: gajim/gtk/advanced_config.py:95
 msgid "Deactivated"
 msgstr "Deactivated"
 
-#: gajim/gtk/advanced_config.py:83
-msgid "Boolean"
-msgstr "Boolean"
+#: gajim/gtk/advanced_config.py:97
+msgid "?config type:Boolean"
+msgstr ""
 
-#: gajim/gtk/advanced_config.py:84
-msgid "Integer"
-msgstr "Integer"
+#: gajim/gtk/advanced_config.py:98
+msgid "?config type:Integer"
+msgstr ""
 
-#: gajim/gtk/advanced_config.py:85
-msgid "Text"
-msgstr "Text"
+#: gajim/gtk/advanced_config.py:99
+msgid "?config type:Text"
+msgstr ""
 
-#: gajim/gtk/advanced_config.py:97
-msgid "Preference Name"
+#: gajim/gtk/advanced_config.py:100
+msgid "?config type:Color"
+msgstr ""
+
+#: gajim/gtk/advanced_config.py:112
+#, fuzzy
+msgid "?config:Preference Name"
 msgstr "Preference Name"
 
-#: gajim/gtk/advanced_config.py:104
-msgid "Value"
-msgstr "Value"
+#: gajim/gtk/advanced_config.py:123
+#, fuzzy
+msgid "?config:Value"
+msgstr "_Konfigūruoti"
 
-#: gajim/gtk/advanced_config.py:113
-msgid "Type"
-msgstr "Type"
+#: gajim/gtk/advanced_config.py:132
+msgid "?config:Type"
+msgstr ""
 
-#: gajim/gtk/advanced_config.py:168
-msgid "(None)"
-msgstr "(None)"
+#: gajim/gtk/advanced_config.py:187
+#, fuzzy
+msgid "?config description:None"
+msgstr "Joks"
 
-#: gajim/gtk/advanced_config.py:299
-msgid "Hidden"
-msgstr "Hidden"
+#: gajim/gtk/advanced_config.py:322
+#, fuzzy
+msgid "?password:Hidden"
+msgstr "Slaptažodis:"
 
 #: gajim/gtk/server_info.py:66
 #, fuzzy
@@ -9854,8 +10159,8 @@ msgstr "_Kopijuoti nuorodos adresą"
 msgid "%(days)s days, %(hours)s hours"
 msgstr ""
 
-#: gajim/gtk/server_info.py:218 gajim/gtk/accounts.py:749
-#: gajim/gtk/accounts.py:853
+#: gajim/gtk/server_info.py:218 gajim/gtk/accounts.py:752
+#: gajim/gtk/accounts.py:856
 #, fuzzy
 msgid "Hostname"
 msgstr "_Serverio adresas: "
@@ -10033,11 +10338,6 @@ msgstr ""
 msgid "You must enter a name to create a privacy list."
 msgstr ""
 
-#: gajim/gtk/groupchat_config.py:41
-#, fuzzy
-msgid "Group Chat Configuration"
-msgstr "Groupchat Invitation"
-
 #: gajim/gtk/groupchat_config.py:134
 #, fuzzy
 msgid "A Group Chat needs at least one Owner"
@@ -10048,68 +10348,68 @@ msgid "You are not allowed to modify the affiliation of Admins and Owners"
 msgstr ""
 
 #: gajim/gtk/groupchat_config.py:399
-msgid "An entry with this Jabber-ID already exists"
+msgid "An entry with this XMPP Address already exists"
 msgstr ""
 
-#: gajim/gtk/adhoc.py:91
+#: gajim/gtk/adhoc.py:92
 #, fuzzy
 msgid "Finish"
 msgstr "_Baigti"
 
-#: gajim/gtk/adhoc.py:97 gajim/gtk/adhoc.py:283
+#: gajim/gtk/adhoc.py:98 gajim/gtk/adhoc.py:284
 #, fuzzy
 msgid "Commands"
 msgstr "Commands: %s"
 
-#: gajim/gtk/adhoc.py:103
+#: gajim/gtk/adhoc.py:104
 msgid "Next"
 msgstr ""
 
-#: gajim/gtk/adhoc.py:109
+#: gajim/gtk/adhoc.py:110
 msgid "Previous"
 msgstr ""
 
-#: gajim/gtk/adhoc.py:115
+#: gajim/gtk/adhoc.py:116
 #, fuzzy
 msgid "Execute"
 msgstr "_Vykdyti komandą"
 
-#: gajim/gtk/adhoc.py:195
+#: gajim/gtk/adhoc.py:196
 #, fuzzy
 msgid "No commands available"
 msgstr "No such account available"
 
-#: gajim/gtk/adhoc.py:244
+#: gajim/gtk/adhoc.py:245
 #, fuzzy
 msgid "Request Command List"
 msgstr "_Vykdyti komandą"
 
-#: gajim/gtk/adhoc.py:259
+#: gajim/gtk/adhoc.py:260
 #, fuzzy
 msgid "Executing…"
 msgstr "_Vykdyti komandą"
 
-#: gajim/gtk/adhoc.py:266
+#: gajim/gtk/adhoc.py:267
 #, fuzzy
 msgid "Command List"
 msgstr "Commands: %s"
 
-#: gajim/gtk/adhoc.py:384
+#: gajim/gtk/adhoc.py:385
 #, fuzzy
 msgid "Finished"
 msgstr "_Baigti"
 
-#: gajim/gtk/adhoc.py:453
+#: gajim/gtk/adhoc.py:454
 #, fuzzy
 msgid "Execution failed"
 msgstr "Registracija nesėkminga"
 
-#: gajim/gtk/blocking.py:37
+#: gajim/gtk/blocking.py:38
 #, fuzzy, python-format
 msgid "Blocking List for %s"
 msgstr "Privacy List for %s"
 
-#: gajim/gtk/blocking.py:71
+#: gajim/gtk/blocking.py:72
 #, fuzzy
 msgid "Error!"
 msgstr "Avahi error"
@@ -10155,8 +10455,7 @@ msgstr "Invalid username"
 msgid "You must provide a username to configure this account."
 msgstr "You must provide a username to configure this account."
 
-#: gajim/gtk/account_wizard.py:252 gajim/gtk/bookmarks.py:290
-#: gajim/gtk/bookmarks.py:303
+#: gajim/gtk/account_wizard.py:252
 msgid "Invalid server"
 msgstr ""
 
@@ -10172,7 +10471,7 @@ msgstr "Invalid entry"
 msgid "Custom port must be a port number."
 msgstr "Custom port must be a port number."
 
-#: gajim/gtk/account_wizard.py:405
+#: gajim/gtk/account_wizard.py:406
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -10182,15 +10481,15 @@ msgid ""
 "Do you still want to connect to this server?"
 msgstr ""
 
-#: gajim/gtk/account_wizard.py:446 gajim/gtk/account_wizard.py:480
+#: gajim/gtk/account_wizard.py:447 gajim/gtk/account_wizard.py:481
 msgid "An error occurred during account creation"
 msgstr "An error occurred during account creation"
 
-#: gajim/gtk/account_wizard.py:545
+#: gajim/gtk/account_wizard.py:546
 msgid "Account name is in use"
 msgstr "Account name is in use"
 
-#: gajim/gtk/account_wizard.py:546
+#: gajim/gtk/account_wizard.py:547
 msgid "You already have an account using this name."
 msgstr "You already have an account using this name."
 
@@ -10217,26 +10516,26 @@ msgstr "File transfer of %(filename)s from %(name)s stopped."
 msgid "%(minutes)s min %(seconds)s sec"
 msgstr ""
 
-#: gajim/gtk/xml_console.py:77
+#: gajim/gtk/xml_console.py:74
 #, fuzzy
 msgid "Filter"
 msgstr "Filtras:"
 
-#: gajim/gtk/xml_console.py:82
+#: gajim/gtk/xml_console.py:79
 #, fuzzy
 msgid "XML Input"
 msgstr "<b>XML Įvestis</b>"
 
-#: gajim/gtk/xml_console.py:86
+#: gajim/gtk/xml_console.py:83
 msgid "Paste Last Input"
 msgstr ""
 
-#: gajim/gtk/xml_console.py:170
+#: gajim/gtk/xml_console.py:167
 #, fuzzy, python-format
 msgid "Please make sure you are connected with '%s'."
 msgstr "Please make sure you are connected with \"%s\"."
 
-#: gajim/gtk/xml_console.py:182
+#: gajim/gtk/xml_console.py:177
 #, fuzzy
 msgid "Invalid Node"
 msgstr "Invalid File"
@@ -10269,37 +10568,52 @@ msgstr "Ieškoti"
 msgid "No results found"
 msgstr "%s not found"
 
-#: gajim/gtk/preferences.py:358 gajim/gtk/preferences.py:362
+#: gajim/gtk/preferences.py:357 gajim/gtk/preferences.py:361
 msgid "Default"
 msgstr "Default"
 
-#: gajim/gtk/preferences.py:801
+#: gajim/gtk/preferences.py:798
 msgid "status message title"
 msgstr "status message title"
 
-#: gajim/gtk/preferences.py:802
+#: gajim/gtk/preferences.py:799
 msgid "status message text"
 msgstr "status message text"
 
+#: gajim/gtk/accounts.py:137
+#, fuzzy
+msgid "Re-Login"
+msgstr "Relogin now?"
+
 #: gajim/gtk/accounts.py:138
-msgid "Relogin now?"
+#, fuzzy
+msgid "Re-Login now?"
 msgstr "Relogin now?"
 
 #: gajim/gtk/accounts.py:139
-msgid "If you want all the changes to apply instantly, you must relogin."
+#, 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:191 gajim/gtk/accounts.py:975
+#: gajim/gtk/accounts.py:141
+msgid "_Later"
+msgstr ""
+
+#: gajim/gtk/accounts.py:143
+msgid "_Re-Login"
+msgstr ""
+
+#: gajim/gtk/accounts.py:194 gajim/gtk/accounts.py:978
 #, fuzzy
 msgid "Remove Account"
 msgstr "Gajim account %s"
 
-#: gajim/gtk/accounts.py:192
+#: gajim/gtk/accounts.py:195
 #, fuzzy, python-format
 msgid "You still have open chats in your account %s"
 msgstr "You have opened chat in account %s"
 
-#: gajim/gtk/accounts.py:193
+#: gajim/gtk/accounts.py:196
 #, fuzzy
 msgid ""
 "All chat and group chat windows will be closed.\n"
@@ -10307,269 +10621,264 @@ msgid ""
 msgstr ""
 "All chat and groupchat windows will be closed. Do you want to continue?"
 
-#: gajim/gtk/accounts.py:424
+#: gajim/gtk/accounts.py:427
 #, fuzzy
 msgid "Back"
 msgstr "Back soon"
 
-#: gajim/gtk/accounts.py:530
+#: gajim/gtk/accounts.py:533
 #, fuzzy
 msgid "Please check if Bonjour is installed."
 msgstr "Please check if avahi-daemon is running."
 
-#: gajim/gtk/accounts.py:532
+#: gajim/gtk/accounts.py:535
 #, fuzzy
 msgid "Please check if Avahi is installed."
 msgstr "Please check if avahi-daemon is running."
 
-#: gajim/gtk/accounts.py:569
+#: gajim/gtk/accounts.py:572
 #, fuzzy
 msgid "Disable Account"
 msgstr "Prieiga"
 
-#: gajim/gtk/accounts.py:570
+#: gajim/gtk/accounts.py:573
 #, fuzzy, python-format
 msgid "Account %s is still connected"
 msgstr "Account \"%s\" is connected to the server"
 
-#: gajim/gtk/accounts.py:571
+#: gajim/gtk/accounts.py:574
 #, fuzzy
 msgid ""
 "All chat and group chat windows will be closed. Do you want to continue?"
 msgstr ""
 "All chat and groupchat windows will be closed. Do you want to continue?"
 
-#: gajim/gtk/accounts.py:576
+#: gajim/gtk/accounts.py:579
 #, fuzzy
 msgid "_Disable Account"
 msgstr "Prieiga"
 
-#: gajim/gtk/accounts.py:595
+#: gajim/gtk/accounts.py:598
 #, fuzzy
 msgid "Add Account"
 msgstr "_Įtraukti asmenį..."
 
-#: gajim/gtk/accounts.py:663
+#: gajim/gtk/accounts.py:666
 msgid "Label"
 msgstr ""
 
-#: gajim/gtk/accounts.py:667
+#: gajim/gtk/accounts.py:670
 msgid "Login"
 msgstr ""
 
-#: gajim/gtk/accounts.py:670
+#: gajim/gtk/accounts.py:673
 #, fuzzy
 msgid "Import Contacts"
 msgstr "Kviesti Kontaktus"
 
-#: gajim/gtk/accounts.py:674 gajim/gtk/accounts.py:870
+#: gajim/gtk/accounts.py:677 gajim/gtk/accounts.py:873
 #, fuzzy
 msgid "Client Certificate"
 msgstr "Blogas CA sertifikatas"
 
-#: gajim/gtk/accounts.py:677 gajim/gtk/accounts.py:774
+#: gajim/gtk/accounts.py:680 gajim/gtk/accounts.py:777
 #, fuzzy
 msgid "Connect on startup"
 msgstr "_Prisijungti, kai Gajim pasileis"
 
-#: gajim/gtk/accounts.py:681 gajim/gtk/accounts.py:779
+#: gajim/gtk/accounts.py:684 gajim/gtk/accounts.py:782
 #, fuzzy
 msgid "Save conversations for all contacts"
 msgstr "Saugoti visų asmenų pokalbių žurnalus"
 
-#: gajim/gtk/accounts.py:683 gajim/gtk/accounts.py:781
+#: gajim/gtk/accounts.py:686 gajim/gtk/accounts.py:784
 msgid "Store conversations on the harddrive"
 msgstr ""
 
-#: gajim/gtk/accounts.py:685 gajim/gtk/accounts.py:783
+#: gajim/gtk/accounts.py:688 gajim/gtk/accounts.py:786
 #, fuzzy
 msgid "Global Status"
 msgstr "Visos būklės"
 
-#: gajim/gtk/accounts.py:687
+#: gajim/gtk/accounts.py:690
 #, fuzzy
 msgid "Synchronise the status of all accounts"
 msgstr "Changes the status of account or accounts"
 
-#: gajim/gtk/accounts.py:689
+#: gajim/gtk/accounts.py:692
 msgid "Use file transfer proxies"
 msgstr "Naudoti failų siuntimo proksius"
 
-#: gajim/gtk/accounts.py:705
+#: gajim/gtk/accounts.py:708
 #, fuzzy
 msgid "Idle Time"
 msgstr " since %s"
 
-#: gajim/gtk/accounts.py:707
+#: gajim/gtk/accounts.py:710
 msgid "Disclose the time of your last activity"
 msgstr ""
 
-#: gajim/gtk/accounts.py:709
+#: gajim/gtk/accounts.py:712
 msgid "Local System Time"
 msgstr ""
 
-#: gajim/gtk/accounts.py:711
+#: gajim/gtk/accounts.py:714
 msgid "Disclose the local system time of the device Gajim runs on"
 msgstr ""
 
-#: gajim/gtk/accounts.py:714
+#: gajim/gtk/accounts.py:717
 #, fuzzy
 msgid "Client / Operating System"
 msgstr "Blogas CA sertifikatas"
 
-#: gajim/gtk/accounts.py:716
+#: gajim/gtk/accounts.py:719
 #, fuzzy
 msgid ""
 "Disclose informations 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:719
+#: gajim/gtk/accounts.py:722
 #, fuzzy
 msgid "Ignore Unknown Contacts"
 msgstr "Kviesti Kontaktus"
 
-#: gajim/gtk/accounts.py:721
+#: gajim/gtk/accounts.py:724
 #, 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:737 gajim/gtk/accounts.py:776
+#: gajim/gtk/accounts.py:740 gajim/gtk/accounts.py:779
 #, fuzzy
 msgid "Use environment variable"
 msgstr "Connection not available"
 
-#: gajim/gtk/accounts.py:739
-#, fuzzy
-msgid "Proxy"
-msgstr "Proksis:"
-
-#: gajim/gtk/accounts.py:742
+#: gajim/gtk/accounts.py:745
 #, fuzzy
 msgid "Warn on insecure connection"
 msgstr "Nesaugus ryšys"
 
-#: gajim/gtk/accounts.py:746
+#: gajim/gtk/accounts.py:749
 msgid "Send keep-alive packets"
 msgstr "Siųsti „aš-gyvas“ paketus"
 
-#: gajim/gtk/accounts.py:750
+#: gajim/gtk/accounts.py:753
 msgid "Manually set the hostname for the server"
 msgstr ""
 
-#: gajim/gtk/accounts.py:756 gajim/gtk/accounts.py:826
-#: gajim/gtk/accounts.py:831
+#: gajim/gtk/accounts.py:759 gajim/gtk/accounts.py:829
+#: gajim/gtk/accounts.py:834
 #, fuzzy
 msgid "Priority"
 msgstr "_Prioritetas:"
 
-#: gajim/gtk/accounts.py:785
+#: gajim/gtk/accounts.py:788
 #, fuzzy
 msgid "Synchronize the status of all accounts"
 msgstr "Changes the status of account or accounts"
 
-#: gajim/gtk/accounts.py:795
+#: gajim/gtk/accounts.py:798
 #, fuzzy
 msgid "First Name"
 msgstr "Vardas:"
 
-#: gajim/gtk/accounts.py:798
+#: gajim/gtk/accounts.py:801
 #, fuzzy
 msgid "Last Name"
 msgstr "Pavardė:"
 
-#: gajim/gtk/accounts.py:804
+#: gajim/gtk/accounts.py:807
 #, fuzzy
 msgid "Email"
 msgstr "New E-mail"
 
-#: gajim/gtk/accounts.py:822
+#: gajim/gtk/accounts.py:825
 #, fuzzy
 msgid "Adjust to status"
 msgstr "_Nustatyti būklei"
 
-#: gajim/gtk/accounts.py:849
+#: gajim/gtk/accounts.py:852
 msgid "Enable"
 msgstr "Įjungti"
 
-#: gajim/gtk/accounts.py:857
+#: gajim/gtk/accounts.py:860
 #, fuzzy
 msgid "Port"
 msgstr "_Portas:"
 
-#: gajim/gtk/accounts.py:862
+#: gajim/gtk/accounts.py:865
 #, fuzzy
 msgid "Connection Settings"
 msgstr "Prisijungimas"
 
-#: gajim/gtk/accounts.py:872
+#: gajim/gtk/accounts.py:875
 msgid "PKCS12 Files"
 msgstr ""
 
-#: gajim/gtk/accounts.py:874
+#: gajim/gtk/accounts.py:877
 #, fuzzy
 msgid "Encrypted Certificate"
 msgstr "Blogas CA sertifikatas"
 
-#: gajim/gtk/accounts.py:878
+#: gajim/gtk/accounts.py:881
 #, fuzzy
 msgid "Certificate Settings"
 msgstr "Blogas CA sertifikatas"
 
-#: gajim/gtk/accounts.py:890
+#: gajim/gtk/accounts.py:893
 #, fuzzy
 msgid "Save Password"
 msgstr "Save password"
 
-#: gajim/gtk/accounts.py:898
+#: gajim/gtk/accounts.py:901
 #, fuzzy
 msgid "Login Settings"
 msgstr "Registracija nesėkminga"
 
-#: gajim/gtk/accounts.py:931
+#: gajim/gtk/accounts.py:934
 #, fuzzy, python-format
 msgid "Removing account %s"
 msgstr "Gajim account %s"
 
-#: gajim/gtk/accounts.py:946
+#: gajim/gtk/accounts.py:949
 #, fuzzy
 msgid "Account is disabled"
 msgstr "Account name is in use"
 
-#: gajim/gtk/accounts.py:947
+#: gajim/gtk/accounts.py:950
 msgid "To unregister from a server, the account must be enabled."
 msgstr ""
 
-#: gajim/gtk/accounts.py:962
+#: gajim/gtk/accounts.py:965
 #, fuzzy
 msgid "Password required"
 msgstr "Password Required"
 
-#: gajim/gtk/accounts.py:976
+#: gajim/gtk/accounts.py:979
 #, fuzzy, python-format
 msgid "Account '%s' is still connected to the server"
 msgstr "Account \"%s\" is connected to the server"
 
-#: gajim/gtk/accounts.py:978
+#: gajim/gtk/accounts.py:981
 msgid "If you remove it, the connection will be lost."
 msgstr "If you remove it, the connection will be lost."
 
-#: gajim/gtk/accounts.py:995
+#: gajim/gtk/accounts.py:998
 #, fuzzy, python-format
 msgid "Connection to server %s failed"
 msgstr "Nepavyko prisijungti prie proksi"
 
-#: gajim/gtk/accounts.py:996
+#: gajim/gtk/accounts.py:999
 #, fuzzy
 msgid "What would you like to do?"
 msgstr "What do you want to do?"
 
-#: gajim/gtk/accounts.py:997
+#: gajim/gtk/accounts.py:1000
 #, fuzzy
 msgid "Remove only from Gajim"
 msgstr "Pašalinti prieigą, _tik iš Gajim"
 
-#: gajim/gtk/accounts.py:998
+#: gajim/gtk/accounts.py:1001
 msgid "Don't remove anything. I'll try again later"
 msgstr ""
 
@@ -10592,6 +10901,10 @@ msgstr "Norėšiau jus įtraukti į savo kontaktų sąrašą."
 msgid "Modify"
 msgstr "Keisti"
 
+#: gajim/gtk/roster_item_exchange.py:80
+msgid "JID"
+msgstr "JID"
+
 #: gajim/gtk/roster_item_exchange.py:86
 msgid "Groups"
 msgstr "Grupės"
@@ -10615,47 +10928,29 @@ msgid_plural "Removed %d contacts"
 msgstr[0] "Removes contact from roster"
 msgstr[1] "Removes contact from roster"
 
-#: gajim/gtk/util.py:581
+#: gajim/gtk/util.py:583
 msgid "Unknown Artist"
 msgstr ""
 
-#: gajim/gtk/util.py:582
+#: gajim/gtk/util.py:584
 msgid "Unknown Title"
 msgstr ""
 
-#: gajim/gtk/util.py:583
+#: gajim/gtk/util.py:585
 msgid "Unknown Source"
 msgstr ""
 
-#: gajim/gtk/util.py:585
+#: gajim/gtk/util.py:587
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
 "from <i>%(source)s</i>"
 msgstr ""
 
-#: gajim/gtk/bookmarks.py:121
-msgid "New Group Chat"
-msgstr "New Group Chat"
-
-#: gajim/gtk/bookmarks.py:161
-msgid "This bookmark has invalid data"
-msgstr "This bookmark has invalid data"
-
-#: gajim/gtk/bookmarks.py:162
-msgid ""
-"Please be sure to fill out server and room fields or remove this bookmark."
-msgstr ""
-"Please be sure to fill out server and room fields or remove this bookmark."
-
-#: gajim/gtk/bookmarks.py:273 gajim/gtk/bookmarks.py:291
-#: gajim/gtk/bookmarks.py:304 gajim/gtk/bookmarks.py:335
-msgid "Character not allowed"
-msgstr ""
-
-#: gajim/gtk/bookmarks.py:334
-msgid "Invalid room"
-msgstr ""
+#: gajim/gtk/bookmarks.py:47
+#, fuzzy, python-format
+msgid "Bookmarks for %s"
+msgstr "Žy_mės"
 
 #: gajim/plugins/pluginmanager.py:736 gajim/plugins/pluginmanager.py:742
 msgid "Archive corrupted"
@@ -10666,50 +10961,51 @@ msgid "Archive empty"
 msgstr ""
 
 #: gajim/plugins/pluginmanager.py:750 gajim/plugins/pluginmanager.py:758
-#: gajim/plugins/gui.py:257
+#: gajim/plugins/gui.py:258
 msgid "Archive is malformed"
 msgstr ""
 
-#: gajim/plugins/pluginmanager.py:766 gajim/plugins/gui.py:281
-#: gajim/plugins/gui.py:289
+#: gajim/plugins/pluginmanager.py:766 gajim/plugins/gui.py:288
+#: gajim/plugins/gui.py:301
 #, fuzzy
 msgid "Plugin already exists"
 msgstr "This file already exists"
 
-#: gajim/plugins/gui.py:82
+#: gajim/plugins/gui.py:83
 msgid "Click to view Gajim's wiki page on how to install plugins in Flatpak."
 msgstr ""
 
-#: gajim/plugins/gui.py:89
+#: gajim/plugins/gui.py:90
 msgid "Plugin"
 msgstr ""
 
-#: gajim/plugins/gui.py:151
+#: gajim/plugins/gui.py:152
 #, fuzzy, python-format
 msgid "Warning: %s"
 msgstr "Saved in: %s"
 
-#: gajim/plugins/gui.py:206
+#: gajim/plugins/gui.py:207
 #, fuzzy
 msgid "Plugin failed"
 msgstr "Registracija nesėkminga"
 
-#: gajim/plugins/gui.py:245
+#: gajim/plugins/gui.py:246
 msgid "Unable to properly remove the plugin"
 msgstr ""
 
-#: gajim/plugins/gui.py:281
-msgid "Overwrite?"
+#: gajim/plugins/gui.py:287
+msgid "Overwrite Plugin?"
+msgstr ""
+
+#: gajim/plugins/gui.py:289
+msgid "Do you want to overwrite the currently installed version?"
 msgstr ""
 
 #: data/org.gajim.Gajim.desktop.in:5
-msgid "Jabber IM Client"
+#, fuzzy
+msgid "XMPP IM Client"
 msgstr "Jabber IM Klientas"
 
-#: data/org.gajim.Gajim.desktop.in:6
-msgid "A GTK+ Jabber client"
-msgstr "GTK+ Jabber klientas"
-
 #: data/org.gajim.Gajim.desktop.in:8
 msgid "chat;messaging;im;xmpp;bonjour;voip;"
 msgstr ""
@@ -10761,7 +11057,7 @@ msgid "Easily send pictures, videos or other files to friends and groups"
 msgstr ""
 
 #: data/org.gajim.Gajim.appdata.xml.in:27
-msgid "Chat securely with End-to-End encryption via OMEMO or PGP"
+msgid "Chat securely with End-to-End encryption via OMEMO or OpenPGP"
 msgstr ""
 
 #: data/org.gajim.Gajim.appdata.xml.in:28
@@ -10822,7 +11118,7 @@ msgstr ""
 
 #: data/org.gajim.Gajim.appdata.xml.in:52
 #, fuzzy
-msgid "Roster, list of contacts"
+msgid "Contact list, list of contacts"
 msgstr "_Registruoti asmenų būklės pakitimus"
 
 #: data/org.gajim.Gajim.appdata.xml.in:56
@@ -10844,6 +11140,420 @@ msgstr "Nesenai:"
 msgid "Plugin manager"
 msgstr "Registracija nesėkminga"
 
+#, fuzzy
+#~ msgid "Configure Services…"
+#~ msgstr "Konfigūruoti Paslaugas..."
+
+#, fuzzy
+#~ msgid "Group Chat Bookmarks"
+#~ msgstr "Group Chat"
+
+#, fuzzy
+#~ msgid "Add Bookmark"
+#~ msgstr "Žy_mės"
+
+#, fuzzy
+#~ msgid "Remove Bookmark"
+#~ msgstr "Žy_mės"
+
+#, fuzzy
+#~ msgid "Bookmark Name"
+#~ msgstr "Žy_mės"
+
+#, fuzzy
+#~ msgid "_Server"
+#~ msgstr "_Serveris:"
+
+#, fuzzy
+#~ msgid "_Password"
+#~ msgstr "_Slaptažodis:"
+
+#, fuzzy
+#~ msgid "Join chat when connected"
+#~ msgstr "Contact Disconnected"
+
+#~ msgid "New Group Chat"
+#~ msgstr "New Group Chat"
+
+#~ msgid "This bookmark has invalid data"
+#~ msgstr "This bookmark has invalid data"
+
+#, fuzzy
+#~ msgid ""
+#~ "Please be sure to fill out server and group chat fields or remove this "
+#~ "bookmark."
+#~ msgstr ""
+#~ "Please be sure to fill out server and room fields or remove this bookmark."
+
+#, fuzzy
+#~ msgid "Invalid Group Chat"
+#~ msgstr "Invalid group chat Jabber ID"
+
+#~ msgid "Unable to join group chat"
+#~ msgstr "Unable to join group chat"
+
+#, fuzzy
+#~ msgid "You are banned from group chat <b>%s</b>."
+#~ msgstr "Jūs esate išmestas iš grupės pokalbio %s."
+
+#, fuzzy
+#~ msgid "Remote server <b>%s</b> does not exist."
+#~ msgstr "Tokios grupės pokalbis %s neegzistuoja."
+
+#, fuzzy
+#~ msgid "Group chat <b>%s</b> does not exist."
+#~ msgstr "Tokios grupės pokalbis %s neegzistuoja."
+
+#, fuzzy
+#~ msgid "Group chat creation is not permitted."
+#~ msgstr "Group chat creation is restricted."
+
+#, fuzzy
+#~ msgid "You must use your registered nickname in <b>%s</b>."
+#~ msgstr ""
+#~ "Jūsų užregistruotas slapyvardis turi būti naudojamas grupės pokalbyje %s."
+
+#, fuzzy
+#~ msgid "You are not in the members list in group chat %s."
+#~ msgstr "Jūs estate grupės pokalbio %s narių sąraše."
+
+#, fuzzy
+#~ msgid "XMPP Address is not a group chat"
+#~ msgstr "This is not a group chat"
+
+#~ msgid "This is not a group chat"
+#~ msgstr "This is not a group chat"
+
+#, fuzzy
+#~ msgid "Please choose a group chat"
+#~ msgstr "Kurti naują pranešimą"
+
+#, fuzzy
+#~ msgid "Please choose a nickname"
+#~ msgstr "Kurti naują pranešimą"
+
+#, fuzzy
+#~ msgid "Wrong server"
+#~ msgstr "MUC serveris"
+
+#, fuzzy
+#~ msgid "%s is not a group chat server"
+#~ msgstr "This is not a group chat"
+
+#~ msgid "Not in Roster"
+#~ msgstr "Ne Sąraše"
+
+#, fuzzy
+#~ msgid "Add to Roster"
+#~ msgstr "Įtr_aukti į kontaktų sąrašą"
+
+#, fuzzy
+#~ msgid "Manage Room"
+#~ msgstr "_Valdyti Kambarį"
+
+#, fuzzy
+#~ msgid "Configure Room"
+#~ msgstr "Keisti Kambario Nustatymus..."
+
+#, fuzzy
+#~ msgid "Change Nick"
+#~ msgstr "Keisti _Slapyvardį..."
+
+#, fuzzy
+#~ msgid "Disconnect"
+#~ msgstr "Atsijungta"
+
+#, fuzzy
+#~ msgid "Copy JID"
+#~ msgstr "Kambario JID"
+
+#, fuzzy
+#~ msgid "Add to Roster…"
+#~ msgstr "Įtr_aukti į kontaktų sąrašą"
+
+#, fuzzy
+#~ msgid "Copy JID/Email"
+#~ msgstr "_Kopijuoti JID/El. pašto adresą"
+
+#, fuzzy
+#~ msgid "JID: <i>%s</i>"
+#~ msgstr "Jabber ID: <i>%s</i>"
+
+#, fuzzy
+#~ msgid "Unable to join groupchat"
+#~ msgstr "Unable to join group chat"
+
+#~ msgid "Groupchat Invitation"
+#~ msgstr "Groupchat Invitation"
+
+#, fuzzy
+#~ msgid "JID is not a Groupchat"
+#~ msgstr "This is not a group chat"
+
+#~ msgid "Invalid JID"
+#~ msgstr "Invalid JID"
+
+#, fuzzy
+#~ msgid "A connection is not available"
+#~ msgstr "Connection not available"
+
+#, fuzzy
+#~ msgid "JID already in list"
+#~ msgstr "Contact already in roster"
+
+#, fuzzy
+#~ msgid "For the chosen encryption there is no encryption method available"
+#~ msgstr "Connection not available"
+
+#~ msgid "Removes contact from roster"
+#~ msgstr "Removes contact from roster"
+
+#~ msgid "Not in roster"
+#~ msgstr "Not in roster"
+
+#, fuzzy
+#~ msgid "Contact signed in notification color."
+#~ msgstr "_Rodyti įvykį kontaktų sąraše"
+
+#, fuzzy
+#~ msgid "Contact signout notification color"
+#~ msgstr "_Rodyti įvykį kontaktų sąraše"
+
+#, fuzzy
+#~ msgid "File transfer request notification color."
+#~ msgstr "File Transfer Request"
+
+#, fuzzy
+#~ msgid "File transfer error notification color."
+#~ msgstr "File transfer cancelled"
+
+#, fuzzy
+#~ msgid "File transfer complete or stopped notification color."
+#~ msgstr ""
+#~ "Rodyti pranešimą iššokstančiame lange, kai failo siuntimas baigsis  "
+
+#, fuzzy
+#~ msgid "Groupchat invitation notification color"
+#~ msgstr "Groupchat Invitation"
+
+#~ msgid "Add * and [n] in roster title?"
+#~ msgstr "Add * and [n] in roster title?"
+
+#~ msgid "Hides the banner in two persons chat window"
+#~ msgstr "Hides the banner in two persons chat window"
+
+#, fuzzy
+#~ msgid ""
+#~ "Show the confirm metacontacts creation dialog or not? Empty string means "
+#~ "never show the dialog."
+#~ msgstr ""
+#~ "Should we show the confirm metacontacts creation dialogue or not? Empty "
+#~ "string means we never show the dialogue."
+
+#, fuzzy
+#~ msgid "Language for which misspelled words will be checked"
+#~ msgstr "Language for which we want to check misspelt words"
+
+#~ msgid "I'm eating, so leave me a message."
+#~ msgstr "I'm eating, so leave me a message."
+
+#~ msgid "Leave Groupchats"
+#~ msgstr "Leave Groupchats"
+
+#, fuzzy
+#~ msgid "Auto Join"
+#~ msgstr "Automatinis prsijungimas"
+
+#, fuzzy
+#~ msgid "Room"
+#~ msgstr "Kambarys:"
+
+#~ msgid "Jabber ID:"
+#~ msgstr "Jabber ID:"
+
+#~ msgid "Occupant Actions"
+#~ msgstr "Valdytojo Veiksmai"
+
+#~ msgid "_Add to Roster"
+#~ msgstr "Įtr_aukti į kontaktų sąrašą"
+
+#~ msgid "_Manage Room"
+#~ msgstr "_Valdyti Kambarį"
+
+#~ msgid "Configure _Room..."
+#~ msgstr "Keisti Kambario Nustatymus..."
+
+#, fuzzy
+#~ msgid "account"
+#~ msgstr "Prieiga"
+
+#, fuzzy
+#~ msgid "Roster"
+#~ msgstr "Rodyk _Kontaktų Sąrašą"
+
+#, fuzzy
+#~ msgid "Show only in roster"
+#~ msgstr "Rodyti tik kontaktų _sąrašą"
+
+#~ msgid "in _roster"
+#~ msgstr "_sąraše"
+
+#, fuzzy
+#~ msgid "Roster Appearance"
+#~ msgstr "<b>Pokalbio Išvaizda</b>"
+
+#, fuzzy
+#~ msgid "Show chatstate in roster"
+#~ msgstr "Rodyti asmenų _paveiksliukus kontaktų sąraše"
+
+#~ msgid "_Add to Roster..."
+#~ msgstr "Įtr_aukti į kontaktų sąrašą..."
+
+#~ msgid "_Jabber ID:"
+#~ msgstr "_Jabber ID:"
+
+#, fuzzy
+#~ msgid "_Jabber ID"
+#~ msgstr "_Jabber ID:"
+
+#~ msgid "JabberID"
+#~ msgstr "JabberID"
+
+#, fuzzy
+#~ msgid "Show Roster"
+#~ msgstr "Rodyk _Kontaktų Sąrašą"
+
+#~ msgid "MUC server"
+#~ msgstr "MUC serveris"
+
+#~ msgid "Room Configuration"
+#~ msgstr "Kambario nustatymai"
+
+#~ msgid "Join _Group Chat"
+#~ msgstr "Prisijungti prie pokalbio grupėje"
+
+#, fuzzy
+#~ msgid "Audio sessions are not available"
+#~ msgstr "Connection not available"
+
+#~ msgid "Conference"
+#~ msgstr "Conference"
+
+#, fuzzy
+#~ msgid "_Manage Bookmarks…"
+#~ msgstr "Žymių valdymas"
+
+#, fuzzy
+#~ msgid "Hide _Roster"
+#~ msgstr "_sąraše"
+
+#~ msgid "Show _Roster"
+#~ msgstr "Rodyk _Kontaktų Sąrašą"
+
+#, fuzzy
+#~ msgid "Invalid Room"
+#~ msgstr "Invalid File"
+
+#~ msgid "A GTK+ Jabber client"
+#~ msgstr "GTK+ Jabber klientas"
+
+#~ msgid "Bookmark already set"
+#~ msgstr "Bookmark already set"
+
+#, fuzzy
+#~ msgid "Group Chat '%s' is already in your bookmarks."
+#~ msgstr "Group Chat \"%s\" is already in your bookmarks."
+
+#~ msgid "Bookmark has been added successfully"
+#~ msgstr "Bookmark has been added successfully"
+
+#, fuzzy
+#~ msgid ""
+#~ "You can manage your bookmarks by clicking the Bookmarks menu item in your "
+#~ "contact list."
+#~ msgstr "You can manage your bookmarks via Actions menu in your roster."
+
+#, fuzzy
+#~ msgid "Bookmark Room"
+#~ msgstr "Žy_mės"
+
+#~ msgid "_Join New Group Chat"
+#~ msgstr "_Join New Group Chat"
+
+#~ msgid "Name:"
+#~ msgstr "Pavadinimas:"
+
+#, fuzzy
+#~ msgid "Description:"
+#~ msgstr "Aprašymas: "
+
+#, fuzzy
+#~ msgid "Address:"
+#~ msgstr "_Adresas:"
+
+#, fuzzy
+#~ msgid "You can not start a new conversation unless you are connected."
+#~ msgstr "You can not join a group chat unless you are connected."
+
+#, fuzzy
+#~ msgid "Occupants"
+#~ msgstr "Valdytojo Veiksmai"
+
+#, fuzzy
+#~ msgid "File transfer error"
+#~ msgstr "File Transfer Error"
+
+#, fuzzy
+#~ msgid "No Accounts available"
+#~ msgstr "No such account available"
+
+#~ msgid "_Modify Account..."
+#~ msgstr "_Keisti Prieigą..."
+
+#~ msgid "Boolean"
+#~ msgstr "Boolean"
+
+#~ msgid "Integer"
+#~ msgstr "Integer"
+
+#~ msgid "Text"
+#~ msgstr "Text"
+
+#~ msgid "Value"
+#~ msgstr "Value"
+
+#~ msgid "Type"
+#~ msgstr "Type"
+
+#~ msgid "(None)"
+#~ msgstr "(None)"
+
+#~ msgid "Hidden"
+#~ msgstr "Hidden"
+
+#~ msgid "Manage Proxy Profiles"
+#~ msgstr "Proxi profilių valdymas"
+
+#, fuzzy
+#~ msgid "Properties"
+#~ msgstr "<b>Savybės</b>"
+
+#, fuzzy
+#~ msgid "Proxy _Host"
+#~ msgstr "Proksi _Serveris:"
+
+#, fuzzy
+#~ msgid "Proxy _Port"
+#~ msgstr "Proksi _Prievadas:"
+
+#, fuzzy
+#~ msgid "New Groupchat"
+#~ msgstr "New Group Chat"
+
+#, fuzzy
+#~ msgid "New Contact"
+#~ msgstr "Prijungti naują asmenį"
+
 #~ msgid "%s GiB"
 #~ msgstr "%s GiB"
 
@@ -10892,9 +11602,6 @@ msgstr "Registracija nesėkminga"
 #~ msgid "_Pause"
 #~ msgstr "_Pauzė"
 
-#~ msgid "Clean _up"
-#~ msgstr "_Išvalyti"
-
 #~ msgid "Remove file transfer from the list."
 #~ msgstr "Pašalinti failo siuntimą iš sąrašo."
 
@@ -11346,10 +12053,6 @@ msgstr "Registracija nesėkminga"
 #~ msgid "Nick"
 #~ msgstr "Nick"
 
-#, fuzzy
-#~ msgid "Banning…"
-#~ msgstr "Banning..."
-
 #~ msgid ""
 #~ "<b>Whom do you want to ban?</b>\n"
 #~ "\n"
@@ -11403,10 +12106,6 @@ msgstr "Registracija nesėkminga"
 #~ msgid "Filter:"
 #~ msgstr "Filtras:"
 
-#~ msgid ""
-#~ "If checked, Gajim will display the mood of contacts in the roster window"
-#~ msgstr "Jei pažymėta, Gajim rodys kontaktų nuotaiką sąrašo lange"
-
 #~ msgid "<b>Chat Appearance</b>"
 #~ msgstr "<b>Pokalbio Išvaizda</b>"
 
@@ -11615,10 +12314,6 @@ msgstr "Registracija nesėkminga"
 #~ msgstr "_Būklės pranešimas:"
 
 #, fuzzy
-#~ msgid "Group chat highlight"
-#~ msgstr "Group Chat Message Highlight"
-
-#, fuzzy
 #~ msgid "Your nickname"
 #~ msgstr "B_efore nickname:"
 
@@ -11744,9 +12439,6 @@ msgstr "Registracija nesėkminga"
 #~ msgid "The passwords typed in both fields must be identical."
 #~ msgstr "The passwords typed in both fields must be identical."
 
-#~ msgid "Enter new password:"
-#~ msgstr "Įveskite naują slaptažodį:"
-
 #~ msgid "Enter it again for confirmation:"
 #~ msgstr "Įveskite jį dar kartą, dėl patvirtinimo:"
 
@@ -11761,10 +12453,6 @@ msgstr "Registracija nesėkminga"
 #~ msgstr "unsubscribe request from %s"
 
 #, fuzzy
-#~ msgid "Autojoin"
-#~ msgstr "Automatinis prsijungimas"
-
-#, fuzzy
 #~ msgid "Homepage:"
 #~ msgstr "<b>Asmeninė svetainė:</b>"
 
@@ -11854,9 +12542,6 @@ msgstr "Registracija nesėkminga"
 #~ msgid "Forward unread message then disconnect"
 #~ msgstr "Persiųsti neskaitytas žinutes"
 
-#~ msgid "AIM Address:"
-#~ msgstr "AIM Address:"
-
 #~ msgid "MSN Address:"
 #~ msgstr "MSN Address:"
 
@@ -12017,9 +12702,6 @@ msgstr "Registracija nesėkminga"
 #~ msgid "Server:"
 #~ msgstr "Serveris:"
 
-#~ msgid "Password:"
-#~ msgstr "Slaptažodis:"
-
 #, fuzzy
 #~ msgid "Join this room _automatically when I connect"
 #~ msgstr "Prisijungti prie šio kambario automatiškai."
@@ -12028,9 +12710,6 @@ msgstr "Registracija nesėkminga"
 #~ msgid "Bro_wse Rooms"
 #~ msgstr "_Browse"
 
-#~ msgid "This contact does not support file transfer."
-#~ msgstr "Šis kontaktas neturi failų siuntimo funkcijos."
-
 #~ msgid "Hides the buttons in chat windows."
 #~ msgstr "Paslėps mygtukus pokalbių languose."
 
@@ -12262,9 +12941,6 @@ msgstr "Registracija nesėkminga"
 #~ msgid "_Edit Personal Information..."
 #~ msgstr "_Keisti Asmeninę Informaciją..."
 
-#~ msgid "Information about you, as stored in the server"
-#~ msgstr "Informacija apie jus, kur yra išsaugota serveryje"
-
 #~ msgid "<b>Personal Information</b>"
 #~ msgstr "<b>Asmeninė informacija</b>"
 
@@ -12298,13 +12974,6 @@ msgstr "Registracija nesėkminga"
 #~ msgid "Account Name Already Used"
 #~ msgstr "Account Name Already Used"
 
-#~ msgid ""
-#~ "This name is already used by another of your accounts. Please choose "
-#~ "another name."
-#~ msgstr ""
-#~ "This name is already used by another of your accounts. Please choose "
-#~ "another name."
-
 #~ msgid "Invalid account name"
 #~ msgstr "Invalid account name"
 
@@ -12339,9 +13008,6 @@ msgstr "Registracija nesėkminga"
 #~ msgid "Your server can't save your personal information."
 #~ msgstr "Your server can't save your personal information."
 
-#~ msgid "Account Local already exists."
-#~ msgstr "Account Local already exists."
-
 #~ msgid "Please rename or remove it before enabling link-local messaging."
 #~ msgstr "Please rename or remove it before enabling link-local messaging."
 
@@ -12404,10 +13070,6 @@ msgstr "Registracija nesėkminga"
 #~ msgid "The following message was NOT encrypted"
 #~ msgstr "Ši žinutė NEBUVO šifruota"
 
-#, fuzzy
-#~ msgid "Encryption used for this contact."
-#~ msgstr "Is OpenPGP enabled for this contact?"
-
 #~ msgid "Toggle Open_PGP Encryption"
 #~ msgstr "Įjungti Open_PGP kodavimą"
 
@@ -12467,9 +13129,6 @@ msgstr "Registracija nesėkminga"
 #~ msgid "Add _Contact..."
 #~ msgstr "Įtraukti _Kontaktą..."
 
-#~ msgid "_Accounts"
-#~ msgstr "_Prieigos"
-
 #~ msgid "Profile, A_vatar"
 #~ msgstr "Profilis, At_vaizdas"
 
@@ -12607,12 +13266,6 @@ msgstr "Registracija nesėkminga"
 #~ msgid "Activity: "
 #~ msgstr "Aktyvumas:"
 
-#~ msgid "Join _Group Chat..."
-#~ msgstr "Jungtis į _Grupės Pokalbį..."
-
-#~ msgid "_Modify Account"
-#~ msgstr "_Keisti Prieigą"
-
 #~ msgid "Check on startup if Gajim is the _default Jabber client"
 #~ msgstr "Startuojant tikrinti ar Gajim yra pagrindinis Jabber klientas"
 
@@ -13009,9 +13662,6 @@ msgstr "Registracija nesėkminga"
 #~ msgid "Nickname not found: %s"
 #~ msgstr "Nickname not found: %s"
 
-#~ msgid "This group chat has no subject"
-#~ msgstr "This group chat has no subject"
-
 #, fuzzy
 #~ msgid ""
 #~ "Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
@@ -13079,9 +13729,6 @@ msgstr "Registracija nesėkminga"
 #~ msgid "Click to see features (like MSN, ICQ transports) of jabber servers"
 #~ msgstr "Jabber serverių paslaugų sąrašas (tokių, kaip: MSN, ICQ pernašos)"
 
-#~ msgid "_Host:"
-#~ msgstr "_Hostas:"
-
 #~ msgid "Modify Account"
 #~ msgstr "Keisti Prieigą"
 
@@ -13387,9 +14034,6 @@ msgstr "Registracija nesėkminga"
 #~ msgstr[0] " %d unread private message"
 #~ msgstr[1] " %d unread private messages"
 
-#~ msgid "Private Chat"
-#~ msgstr "Private Chat"
-
 #~ msgid "invisible"
 #~ msgstr "invisible"
 
@@ -13405,9 +14049,6 @@ msgstr "Registracija nesėkminga"
 #~ msgid "Soliloquy"
 #~ msgstr "Soliloquy"
 
-#~ msgid "A_fter nickname:"
-#~ msgstr "A_fter nickname:"
-
 #~ msgid "_After time:"
 #~ msgstr "_After time:"
 
diff --git a/po/nb_NO.po b/po/nb_NO.po
index 0b3f1227c..6171716e2 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: 2019-07-02 02:06+0000\n"
+"POT-Creation-Date: 2019-08-11 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,70 +17,70 @@ 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:550
+#: gajim/chat_control_base.py:557
 msgid "_Undo"
 msgstr "_Angre"
 
-#: gajim/chat_control_base.py:558 gajim/conversation_textview.py:529
+#: gajim/chat_control_base.py:565 gajim/conversation_textview.py:529
 msgid "_Clear"
 msgstr "_Tøm"
 
-#: gajim/chat_control_base.py:563
+#: gajim/chat_control_base.py:570
 msgid "Paste as quote"
 msgstr ""
 
-#: gajim/chat_control_base.py:613
+#: gajim/chat_control_base.py:620
 #, fuzzy
 msgid "Paste Image"
 msgstr "Velg bilde"
 
-#: gajim/chat_control_base.py:614
+#: gajim/chat_control_base.py:621
 #, fuzzy
 msgid "You are trying to paste an image"
 msgstr "Du er i ferd med å lokke flerfoldige faner"
 
-#: gajim/chat_control_base.py:615
+#: gajim/chat_control_base.py:622
 #, 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:617 gajim/groupchat_control.py:2310
-#: gajim/roster_window.py:2848 gajim/roster_window.py:4167
-#: gajim/message_window.py:252 gajim/gtk/dialogs.py:418
+#: gajim/chat_control_base.py:624 gajim/groupchat_control.py:2218
+#: gajim/roster_window.py:2841 gajim/roster_window.py:4118
+#: gajim/message_window.py:359 gajim/gtk/dialogs.py:330
 msgid "_Do not ask me again"
 msgstr "_Ikke spør meg igjen"
 
-#: gajim/chat_control_base.py:620
+#: gajim/chat_control_base.py:627
 msgid "_Paste"
 msgstr ""
 
-#: gajim/chat_control_base.py:1162 gajim/gtk/accounts.py:351
+#: gajim/chat_control_base.py:1169 gajim/gtk/accounts.py:354
 #, fuzzy
 msgid "Privacy"
 msgstr "Personverns-liste"
 
-#: gajim/chat_control_base.py:1163
+#: gajim/chat_control_base.py:1170
 #, fuzzy
 msgid "Warning"
 msgstr "Advarsel: %s"
 
-#: gajim/chat_control_base.py:1164
+#: gajim/chat_control_base.py:1171
 #, fuzzy, python-format
 msgid "If you send a file to <b>%s</b>, your real JID will be revealed."
 msgstr "Dersom du sender en fil til %s, vil vedkommende kjenne din ekte JID."
 
-#: gajim/chat_control_base.py:1169
+#: gajim/chat_control_base.py:1176
 #, fuzzy
 msgid "Continue"
 msgstr "_Fortsett"
 
-#: gajim/gtkgui_helpers.py:163 gajim/gtk/filetransfer.py:393
+#: gajim/gtkgui_helpers.py:163 gajim/gtk/filetransfer.py:398
 #, fuzzy, python-format
 msgid "Cannot overwrite existing file '%s'"
 msgstr "Kan ikke overskrive eksisterende fil \"%s\""
 
-#: gajim/gtkgui_helpers.py:164 gajim/gtk/filetransfer.py:394
+#: gajim/gtkgui_helpers.py:164 gajim/gtk/filetransfer.py:399
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
@@ -170,359 +170,376 @@ msgstr "Ingen ventende abonnementsforespørsel."
 msgid " resource with priority "
 msgstr " ressurs med prioritet "
 
-#: gajim/gui_menu_builder.py:96
-msgid "_New Group Chat"
-msgstr "_Ny gruppesamtale"
+#: gajim/gui_menu_builder.py:251 gajim/gui_menu_builder.py:342
+#: gajim/chat_control.py:305 gajim/roster_window.py:783
+#: gajim/roster_window.py:1716 gajim/roster_window.py:1718
+#: gajim/roster_window.py:2027 gajim/roster_window.py:3292
+#: gajim/roster_window.py:3325 gajim/gui_interface.py:396
+#: gajim/common/contacts.py:222 gajim/common/contacts.py:359
+#: gajim/common/contacts.py:471 gajim/common/helpers.py:86
+#: gajim/common/helpers.py:317 gajim/gtk/add_contact.py:319
+#: gajim/gtk/subscription_request.py:70 gajim/gtk/subscription_request.py:99
+#: gajim/gtk/roster_item_exchange.py:112
+#, fuzzy
+msgid "Not in contact list"
+msgstr "Vis _frakoblede kontakter"
+
+#: gajim/gui_menu_builder.py:355
+#, 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:289 gajim/gui_menu_builder.py:380
-#: gajim/chat_control.py:303 gajim/roster_window.py:786
-#: gajim/roster_window.py:1719 gajim/roster_window.py:1721
-#: gajim/roster_window.py:2030 gajim/roster_window.py:3336
-#: gajim/roster_window.py:3369 gajim/gui_interface.py:413
-#: gajim/common/contacts.py:206 gajim/common/contacts.py:343
-#: gajim/common/helpers.py:83 gajim/common/helpers.py:311
-#: gajim/gtk/add_contact.py:319 gajim/gtk/subscription_request.py:70
-#: gajim/gtk/subscription_request.py:99 gajim/gtk/roster_item_exchange.py:112
-msgid "Not in Roster"
-msgstr "Ikke i kontaktliste"
-
-#: gajim/gui_menu_builder.py:393
-msgid "I would like to add you to my roster"
-msgstr "Jeg ønsker å legge deg til på min kontaktliste"
-
-#: gajim/gui_menu_builder.py:471
+#: gajim/gui_menu_builder.py:433
 msgid "Send Single _Message…"
 msgstr "Send enkelt_melding…"
 
-#: gajim/gui_menu_builder.py:486
+#: gajim/gui_menu_builder.py:448
 msgid "E_xecute Command…"
 msgstr "K_jør Kommando…"
 
-#: gajim/gui_menu_builder.py:494
+#: gajim/gui_menu_builder.py:456
 msgid "_Manage Transport"
 msgstr "_Behandle transport"
 
-#: gajim/gui_menu_builder.py:500
+#: gajim/gui_menu_builder.py:462
 msgid "_Modify Transport"
 msgstr "_Endre transport"
 
-#: gajim/gui_menu_builder.py:507 gajim/roster_window.py:5046
+#: gajim/gui_menu_builder.py:469 gajim/roster_window.py:4985
 msgid "_Rename…"
 msgstr "_Gi nytt navn…"
 
-#: gajim/gui_menu_builder.py:518 gajim/roster_window.py:5062
-#: gajim/roster_window.py:5177 gajim/data/gui/blocked_contacts_window.ui:52
+#: gajim/gui_menu_builder.py:480 gajim/roster_window.py:5001
+#: gajim/roster_window.py:5116 gajim/data/gui/blocked_contacts_window.ui:52
 #: gajim/data/gui/gc_occupants_menu.ui:148
 #: gajim/data/gui/contact_context_menu.ui:143
 msgid "_Unblock"
 msgstr "_Frigi"
 
-#: gajim/gui_menu_builder.py:521 gajim/roster_window.py:5067
-#: gajim/roster_window.py:5181 gajim/data/gui/gc_occupants_menu.ui:140
+#: gajim/gui_menu_builder.py:483 gajim/roster_window.py:5006
+#: gajim/roster_window.py:5120 gajim/data/gui/gc_occupants_menu.ui:140
 #: gajim/data/gui/contact_context_menu.ui:151
 msgid "_Block"
 msgstr "_Blokker"
 
-#: gajim/gui_menu_builder.py:529 gajim/roster_window.py:5074
+#: gajim/gui_menu_builder.py:491 gajim/roster_window.py:5013
 #: gajim/data/gui/contact_context_menu.ui:181
 msgid "Remo_ve"
 msgstr "_Fjern"
 
-#: gajim/gui_menu_builder.py:539 gajim/data/gui/contact_context_menu.ui:198
+#: gajim/gui_menu_builder.py:501 gajim/data/gui/contact_context_menu.ui:198
 msgid "_Information"
 msgstr "_Informasjon"
 
-#: gajim/gui_menu_builder.py:552
+#: gajim/gui_menu_builder.py:514
 msgid "Save _As"
 msgstr "Lagre _som"
 
-#: gajim/gui_menu_builder.py:564 gajim/groupchat_control.py:501
-#: gajim/chat_control.py:340
+#: gajim/gui_menu_builder.py:526 gajim/groupchat_control.py:507
+#: gajim/chat_control.py:342
 #, fuzzy
 msgid "Send File…"
 msgstr "Send _fil"
 
-#: gajim/gui_menu_builder.py:565
+#: gajim/gui_menu_builder.py:527
 #, fuzzy
 msgid "Upload File…"
 msgstr "Lagre fil som…"
 
-#: gajim/gui_menu_builder.py:566
+#: gajim/gui_menu_builder.py:528
 #, fuzzy
 msgid "Send File Directly…"
 msgstr "Lagre fil som…"
 
-#: gajim/gui_menu_builder.py:568 gajim/gui_menu_builder.py:632
+#: gajim/gui_menu_builder.py:530 gajim/gui_menu_builder.py:596
 #, fuzzy
 msgid "Send Chatstate"
 msgstr "Siste tilstand"
 
-#: gajim/gui_menu_builder.py:569
+#: gajim/gui_menu_builder.py:531
 msgid "Invite Contacts"
 msgstr "Inviter _kontakter"
 
-#: gajim/gui_menu_builder.py:570
-msgid "Add to Roster"
-msgstr "Legg til i kontaktliste"
+#: gajim/gui_menu_builder.py:532
+#, fuzzy
+msgid "Add to Contact List"
+msgstr "Legg til kontakt…"
 
-#: gajim/gui_menu_builder.py:571
-msgid "Audio Session"
-msgstr "Lydøkt"
+#: gajim/gui_menu_builder.py:533
+#, fuzzy
+msgid "Voice Chat"
+msgstr "Forespørsel om lydsamtale"
 
-#: gajim/gui_menu_builder.py:572
-msgid "Video Session"
-msgstr "Videoøkt"
+#: gajim/gui_menu_builder.py:534
+#, fuzzy
+msgid "Video Chat"
+msgstr "Videotest"
 
-#: gajim/gui_menu_builder.py:573
+#: gajim/gui_menu_builder.py:535 gajim/gui_menu_builder.py:582
 msgid "Information"
 msgstr "Informasjon"
 
-#: gajim/gui_menu_builder.py:574 gajim/gui_menu_builder.py:639
+#: gajim/gui_menu_builder.py:536 gajim/gui_menu_builder.py:602
 #: gajim/data/gui/application_menu.ui:37
 msgid "History"
 msgstr "Historikk"
 
-#: gajim/gui_menu_builder.py:580 gajim/gui_menu_builder.py:687
+#: gajim/gui_menu_builder.py:542 gajim/gui_menu_builder.py:650
 #: gajim/data/gui/preferences_window.ui:1823
 msgid "Disabled"
 msgstr "Avskrudd"
 
-#: gajim/gui_menu_builder.py:581 gajim/gui_menu_builder.py:688
+#: gajim/gui_menu_builder.py:543 gajim/gui_menu_builder.py:651
 msgid "Composing only"
 msgstr "Bare skrivning"
 
-#: gajim/gui_menu_builder.py:582 gajim/gui_menu_builder.py:689
+#: gajim/gui_menu_builder.py:544 gajim/gui_menu_builder.py:652
 msgid "All chat states"
 msgstr "Alle samtalestatuser"
 
-#: gajim/gui_menu_builder.py:620
-msgid "Manage Room"
-msgstr "Behandle rom"
+#: gajim/gui_menu_builder.py:583
+#, fuzzy
+msgid "Manage Group Chat"
+msgstr "Forlat gruppesamtaler"
 
-#: gajim/gui_menu_builder.py:621
+#: gajim/gui_menu_builder.py:584 gajim/data/gui/groupchat_control.ui:649
 msgid "Change Subject"
 msgstr "Endre emne"
 
-#: gajim/gui_menu_builder.py:622
-msgid "Configure Room"
-msgstr "Sett opp rom"
+#: gajim/gui_menu_builder.py:585
+#, fuzzy
+msgid "Configure Group Chat"
+msgstr "Forlat gruppesamtaler"
 
-#: gajim/gui_menu_builder.py:623
+#: gajim/gui_menu_builder.py:586
 #, fuzzy
 msgid "Upload Avatar…"
 msgstr "Velg arkiv"
 
-#: gajim/gui_menu_builder.py:624
-msgid "Destroy Room"
-msgstr "Ødelegg rom"
+#: gajim/gui_menu_builder.py:587
+#, fuzzy
+msgid "Destroy Group Chat"
+msgstr "Ny gruppesamtale"
 
-#: gajim/gui_menu_builder.py:626 gajim/data/gui/preferences_window.ui:790
+#: gajim/gui_menu_builder.py:589 gajim/data/gui/preferences_window.ui:790
 #, fuzzy
 msgid "Chat Settings"
 msgstr "Sludresnarveier"
 
-#: gajim/gui_menu_builder.py:627
+#: gajim/gui_menu_builder.py:590
 msgid "Show join/leave"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:628
+#: gajim/gui_menu_builder.py:591
 #, fuzzy
 msgid "Show status changes"
 msgstr "_Vis statusendringer"
 
-#: gajim/gui_menu_builder.py:629 gajim/data/gui/gc_control_popup_menu.ui:72
+#: gajim/gui_menu_builder.py:592 gajim/data/gui/gc_control_popup_menu.ui:72
 msgid "Notify on all messages"
 msgstr "Merknad ved alle meldinger"
 
-#: gajim/gui_menu_builder.py:630
+#: gajim/gui_menu_builder.py:593
 msgid "Minimize on close"
 msgstr "Minimer ved lukking"
 
-#: gajim/gui_menu_builder.py:631
+#: gajim/gui_menu_builder.py:595
 #, fuzzy
-msgid "Minimize on autojoin"
+msgid "Minimize when joining automatically"
 msgstr "Mini_mer ved automatisk deltakelse"
 
-#: gajim/gui_menu_builder.py:634
+#: gajim/gui_menu_builder.py:598
 msgid "Sync Threshold"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:635
-msgid "Change Nick"
-msgstr "Endre kallenavn"
-
-#: gajim/gui_menu_builder.py:636
-msgid "Bookmark Room"
-msgstr "Bokmerk rommet"
+#: gajim/gui_menu_builder.py:599
+#, fuzzy
+msgid "Change Nickname"
+msgstr "Endre _kallenavn…"
 
-#: gajim/gui_menu_builder.py:637
+#: gajim/gui_menu_builder.py:600
 msgid "Request Voice"
 msgstr "Forespør stemme"
 
-#: gajim/gui_menu_builder.py:638 gajim/roster_window.py:5246
+#: gajim/gui_menu_builder.py:601 gajim/roster_window.py:5185
 msgid "Execute command"
 msgstr "Kjør kommando"
 
-#: gajim/gui_menu_builder.py:640
-msgid "Disconnect"
-msgstr "Koble fra"
+#: gajim/gui_menu_builder.py:603
+msgid "Leave"
+msgstr ""
 
-#: gajim/gui_menu_builder.py:678 gajim/gtk/preferences.py:156
+#: gajim/gui_menu_builder.py:641 gajim/gtk/preferences.py:155
 msgid "No threshold"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:680 gajim/gtk/preferences.py:158
+#: gajim/gui_menu_builder.py:643 gajim/gtk/preferences.py:157
 #, 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:709 gajim/gui_menu_builder.py:747
-#: gajim/gtk/join_groupchat.py:43
-msgid "Join Group Chat"
-msgstr "Ta del i gruppesamtale"
-
-#: gajim/gui_menu_builder.py:746
+#: gajim/gui_menu_builder.py:672
 #, fuzzy
 msgid "Add Contact…"
 msgstr "Legg til kontakt…"
 
-#: gajim/gui_menu_builder.py:748 gajim/gtk/profile.py:52
-#: gajim/gtk/accounts.py:770 gajim/gtk/accounts.py:808
+#: gajim/gui_menu_builder.py:673 gajim/gtk/profile.py:52
+#: gajim/gtk/accounts.py:773 gajim/gtk/accounts.py:811
 msgid "Profile"
 msgstr "Profil"
 
-#: gajim/gui_menu_builder.py:749
-msgid "Discover Services"
-msgstr "Oppdag tjenester"
-
-#: gajim/gui_menu_builder.py:750
+#: gajim/gui_menu_builder.py:674
 #, fuzzy
 msgid "Send Single Message…"
 msgstr "Send enkelt_melding…"
 
-#: gajim/gui_menu_builder.py:751 gajim/data/gui/preferences_window.ui:2741
+#: gajim/gui_menu_builder.py:675
+msgid "Discover Services"
+msgstr "Oppdag tjenester"
+
+#: gajim/gui_menu_builder.py:676 gajim/gtk/server_info.py:36
+msgid "Server Info"
+msgstr "Tjenerinfo"
+
+#: gajim/gui_menu_builder.py:677 gajim/data/gui/preferences_window.ui:2741
 msgid "Advanced"
 msgstr "Avansert"
 
-#: gajim/gui_menu_builder.py:752 gajim/gtk/mam_preferences.py:88
+#: gajim/gui_menu_builder.py:678 gajim/gtk/mam_preferences.py:88
 msgid "Archiving Preferences"
 msgstr "Arkiveringsinnstillinger"
 
-#: gajim/gui_menu_builder.py:753
+#: gajim/gui_menu_builder.py:679
 #, fuzzy
 msgid "Blocking List"
 msgstr "Liste over bannlyste"
 
-#: gajim/gui_menu_builder.py:754 gajim/gtk/history_sync.py:108
+#: gajim/gui_menu_builder.py:680
+msgid "Bookmarks"
+msgstr "Bokmerker"
+
+#: gajim/gui_menu_builder.py:681
+#, fuzzy
+msgid "PEP Configuration"
+msgstr "Oppsett"
+
+#: gajim/gui_menu_builder.py:682 gajim/gtk/history_sync.py:108
 #: gajim/gtk/history_sync.py:186
 msgid "Synchronise History"
 msgstr "Synkroniser historikk"
 
-#: gajim/gui_menu_builder.py:755 gajim/gtk/privacy_list.py:427
+#: gajim/gui_menu_builder.py:683 gajim/gtk/privacy_list.py:427
 msgid "Privacy Lists"
 msgstr "Personvernslister"
 
-#: gajim/gui_menu_builder.py:756 gajim/gtk/server_info.py:36
-msgid "Server Info"
-msgstr "Tjenerinfo"
-
-#: gajim/gui_menu_builder.py:757 gajim/gui_menu_builder.py:768
+#: gajim/gui_menu_builder.py:685 gajim/gui_menu_builder.py:696
 #: gajim/data/gui/xml_console_window.ui:77
 msgid "XML Console"
 msgstr "XML-konsoll"
 
-#: gajim/gui_menu_builder.py:759 gajim/data/gui/groupchat_config.ui:36
+#: gajim/gui_menu_builder.py:687 gajim/data/gui/groupchat_config.ui:36
 msgid "Admin"
 msgstr "Admin"
 
-#: gajim/gui_menu_builder.py:760
+#: gajim/gui_menu_builder.py:688
 #, fuzzy
 msgid "Send Server Message…"
 msgstr "_Send tjenermelding…"
 
-#: gajim/gui_menu_builder.py:761
+#: gajim/gui_menu_builder.py:689
 #, fuzzy
 msgid "Set MOTD…"
 msgstr "Sett MOTD…"
 
-#: gajim/gui_menu_builder.py:762
+#: gajim/gui_menu_builder.py:690
 #, fuzzy
 msgid "Update MOTD…"
 msgstr "Oppdater MOTD…"
 
-#: gajim/gui_menu_builder.py:763
+#: gajim/gui_menu_builder.py:691
 #, fuzzy
 msgid "Delete MOTD…"
 msgstr "Slett MFD (MOTD)…"
 
-#: gajim/gui_menu_builder.py:812
-msgid "No Accounts available"
-msgstr "Ingen kontoer tilgjengelig"
+#: gajim/gui_menu_builder.py:736
+#, fuzzy
+msgid "_Add Account…"
+msgstr "Legg til kontakt…"
+
+#: gajim/gui_menu_builder.py:742
+#, fuzzy
+msgid "_Modify Accounts…"
+msgstr "_Rediger Konto"
+
+#: gajim/gui_menu_builder.py:751 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:823 gajim/data/gui/application_menu.ui:5
-#: gajim/data/gui/application_menu.ui:71 gajim/data/gui/shortcuts_window.ui:182
-#: gajim/gtk/accounts.py:58
+#: gajim/gui_menu_builder.py:755 gajim/data/gui/application_menu.ui:5
+#: gajim/data/gui/shortcuts_window.ui:182 gajim/gtk/accounts.py:57
 msgid "Accounts"
 msgstr "Kontoer"
 
-#: gajim/gui_menu_builder.py:881 gajim/gui_menu_builder.py:886
+#: gajim/gui_menu_builder.py:784 gajim/gui_menu_builder.py:789
 #, fuzzy
-msgid "Copy JID"
-msgstr "Rom-JID"
+msgid "Copy XMPP Address"
+msgstr "_Kopier JID/E-postadresse"
 
-#: gajim/gui_menu_builder.py:882 gajim/gui_menu_builder.py:914
+#: gajim/gui_menu_builder.py:785 gajim/gui_menu_builder.py:817
 msgid "Join Groupchat"
 msgstr "Ta del i gruppesludring"
 
-#: gajim/gui_menu_builder.py:887 gajim/gui_menu_builder.py:913
-#: gajim/data/gui/application_menu.ui:76
+#: gajim/gui_menu_builder.py:790 gajim/gui_menu_builder.py:816
+#: gajim/data/gui/application_menu.ui:71
 #: gajim/data/gui/subscription_request_window.ui:106
 msgid "Start Chat"
 msgstr "Start samtale"
 
-#: gajim/gui_menu_builder.py:888 gajim/gui_menu_builder.py:915
+#: gajim/gui_menu_builder.py:791 gajim/gui_menu_builder.py:818
 #, fuzzy
-msgid "Add to Roster…"
-msgstr "Legg til i kontaktliste"
+msgid "Add to Contact List…"
+msgstr "Legg til kontakt…"
 
-#: gajim/gui_menu_builder.py:893
+#: gajim/gui_menu_builder.py:796
 #, fuzzy
 msgid "Copy Link Location"
 msgstr "_Kopier lenke-plassering"
 
-#: gajim/gui_menu_builder.py:894
+#: gajim/gui_menu_builder.py:797
 #, fuzzy
 msgid "Open Link in Browser"
 msgstr "_Åpne lenke i nettleser"
 
-#: gajim/gui_menu_builder.py:899
+#: gajim/gui_menu_builder.py:802
 #, fuzzy
 msgid "Copy Email Address"
 msgstr "_Kopier JID/E-postadresse"
 
-#: gajim/gui_menu_builder.py:900 gajim/gui_menu_builder.py:912
+#: gajim/gui_menu_builder.py:803 gajim/gui_menu_builder.py:815
 #, fuzzy
 msgid "Open Email Composer"
 msgstr "_Åpne E-post-behandler"
 
-#: gajim/gui_menu_builder.py:905
+#: gajim/gui_menu_builder.py:808
 #, fuzzy
 msgid "Copy Location"
 msgstr "_Kopier lenke-plassering"
 
-#: gajim/gui_menu_builder.py:906
+#: gajim/gui_menu_builder.py:809
 #, fuzzy
 msgid "Show Location"
 msgstr "Plassering:"
 
-#: gajim/gui_menu_builder.py:911
+#: gajim/gui_menu_builder.py:814
 #, fuzzy
-msgid "Copy JID/Email"
+msgid "Copy XMPP Address/Email"
 msgstr "_Kopier JID/E-postadresse"
 
-#: gajim/gui_menu_builder.py:945
+#: gajim/gui_menu_builder.py:852
 #, fuzzy
 msgid "Copy"
 msgstr "Rom-JID"
@@ -543,44 +560,55 @@ msgstr "Vis denne hjelpemeldingen og avslutt"
 msgid "Choose folder for logfile"
 msgstr "Velg mappe for loggføring"
 
-#: gajim/history_manager.py:107
+#: gajim/history_manager.py:106
 msgid "Cannot find history logs database"
 msgstr "Finner ikke loggføringsdatabasen for historikk"
 
-#: gajim/history_manager.py:108
+#: gajim/history_manager.py:107
 #, fuzzy, python-format
 msgid "%s does not exist."
 msgstr "Fila finnes ikke"
 
-#: gajim/history_manager.py:141 gajim/history_manager.py:195
-#: gajim/gtk/discovery.py:829 gajim/gtk/roster_item_exchange.py:80
-msgid "JID"
-msgstr "JID"
+#: gajim/history_manager.py:140 gajim/history_manager.py:194
+#: 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:30
+#: gajim/gtk/accounts.py:804
+#, fuzzy
+msgid "XMPP Address"
+msgstr "AIM-adresse:"
 
-#: gajim/history_manager.py:154 gajim/history_manager.py:202
+#: gajim/history_manager.py:153 gajim/history_manager.py:201
 #: gajim/data/gui/history_window.ui:89 gajim/gtk/history.py:108
 msgid "Date"
 msgstr "Dato"
 
-#: gajim/history_manager.py:161 gajim/history_manager.py:225
+#: gajim/history_manager.py:160 gajim/history_manager.py:224
 #: gajim/data/gui/join_groupchat_window.ui:208
 #: gajim/data/gui/profile_window.ui:214
 #: gajim/data/gui/vcard_information_window.ui:443
+#: gajim/data/gui/bookmarks.ui:140
 msgid "Nickname"
 msgstr "Kallenavn"
 
-#: gajim/history_manager.py:172 gajim/history_manager.py:211
+#: gajim/history_manager.py:171 gajim/history_manager.py:210
 #: gajim/data/gui/preferences_window.ui:1344
 #: gajim/data/gui/single_message_window.ui:275 gajim/gtk/history.py:117
 msgid "Message"
 msgstr "Melding"
 
-#: gajim/history_manager.py:180 gajim/history_manager.py:218
+#: gajim/history_manager.py:179 gajim/history_manager.py:217
 #: gajim/data/gui/groups_post_window.ui:49
 #: gajim/data/gui/single_message_window.ui:214
 msgid "Subject"
 msgstr "Tema"
 
+#: gajim/history_manager.py:247
+msgid "Database Cleanup"
+msgstr "Opprenskning av database"
+
 #: gajim/history_manager.py:248
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
@@ -588,12 +616,10 @@ msgid ""
 msgstr "Ønsker du å renske opp i databasen? (FRARÅDES STERKT NÅR GAJIM KJØRER)"
 
 #: gajim/history_manager.py:250
+#, fuzzy
 msgid ""
-"Normally allocated database size will not be freed, it will just become "
-"reusable. If you really want to reduce database filesize, click YES, else "
-"click NO.\n"
-"\n"
-"In case you click YES, please wait…"
+"Normally, the allocated database size will not be freed, it will just become "
+"reusable. This operation may take a while."
 msgstr ""
 "Normalt vil tildelt databaseplass ikke frigjøres, den vil bare be merket som "
 "ledig. Dersom du virkelig ønsker å redusere filstørrelsen klikker du JA, "
@@ -602,47 +628,48 @@ msgstr ""
 "I tilfelle du klikker JA, vent..."
 
 #: gajim/history_manager.py:255
-msgid "Database Cleanup"
-msgstr "Opprenskning av database"
+#, fuzzy
+msgid "_Cleanup"
+msgstr "Rydd _opp"
 
-#: gajim/history_manager.py:519 gajim/gtk/filetransfer.py:238
-#: gajim/gtk/filetransfer.py:248
+#: gajim/history_manager.py:518 gajim/gtk/filetransfer.py:237
+#: gajim/gtk/filetransfer.py:247
 msgid "You"
 msgstr "Du"
 
-#: gajim/history_manager.py:531
+#: gajim/history_manager.py:530
 #, 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:568 gajim/history_manager.py:607
-#: gajim/gtk/dialogs.py:58 gajim/gtk/themes.py:319
+#: gajim/history_manager.py:567 gajim/history_manager.py:606
+#: gajim/gtk/dialogs.py:57 gajim/gtk/themes.py:319
 #: gajim/gtk/roster_item_exchange.py:75 gajim/gtk/roster_item_exchange.py:185
 msgid "Delete"
 msgstr "Slett"
 
-#: gajim/history_manager.py:569
+#: gajim/history_manager.py:568
 #, fuzzy
 msgid "Delete Conversation"
 msgid_plural "Delete Conversations"
 msgstr[0] "Bekreftelse av sletting"
 msgstr[1] "Bekreftelse av sletting"
 
-#: gajim/history_manager.py:570
+#: gajim/history_manager.py:569
 #, 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:608
+#: gajim/history_manager.py:607
 #, fuzzy
 msgid "Delete Message"
 msgid_plural "Delete Messages"
 msgstr[0] "Forvalgt melding"
 msgstr[1] "Forvalgt melding"
 
-#: gajim/history_manager.py:609
+#: gajim/history_manager.py:608
 #, fuzzy
 msgid "Do you want to permanently delete this message"
 msgid_plural "Do you want to permanently delete these messages"
@@ -656,14 +683,14 @@ msgstr "Kontaktnavn: <i>%s</i>"
 
 #: gajim/dialogs.py:84
 #, python-format
-msgid "JID: <i>%s</i>"
-msgstr "JID: <i>%s</i>"
+msgid "XMPP Address: <i>%s</i>"
+msgstr ""
 
-#: gajim/dialogs.py:115 gajim/dialogs.py:128 gajim/roster_window.py:2901
-#: gajim/roster_window.py:3833 gajim/roster_window.py:5084
-#: gajim/common/contacts.py:157 gajim/common/contacts.py:190
+#: gajim/dialogs.py:115 gajim/dialogs.py:128 gajim/roster_window.py:2894
+#: gajim/roster_window.py:3784 gajim/roster_window.py:5023
+#: gajim/common/contacts.py:157 gajim/common/contacts.py:206
 #: gajim/data/gui/preferences_window.ui:558
-#: gajim/data/gui/shortcuts_window.ui:177 gajim/gtk/accounts.py:349
+#: gajim/data/gui/shortcuts_window.ui:177 gajim/gtk/accounts.py:352
 msgid "General"
 msgstr "Generelt"
 
@@ -711,7 +738,7 @@ msgstr ""
 "Dette navnet er allerede i bruk. Ønsker du å overskrive denne "
 "statusmeldingen?"
 
-#: gajim/dialogs.py:703
+#: gajim/dialogs.py:703 gajim/plugins/gui.py:292
 #, fuzzy
 msgid "_Overwrite"
 msgstr "Overskriv?"
@@ -724,9 +751,7 @@ msgstr "Lagre som forvalgt statusmelding"
 msgid "Please type a name for this status message"
 msgstr "Skriv inn et navn for denne statusmeldingen"
 
-#: gajim/dialogs.py:740 gajim/gui_interface.py:1441 gajim/dialog_messages.py:31
-#: gajim/gtk/discovery.py:518 gajim/gtk/profile.py:323
-#: gajim/gtk/join_groupchat.py:234
+#: gajim/dialogs.py:740 gajim/gtk/discovery.py:517 gajim/gtk/profile.py:323
 msgid "You are not connected to the server"
 msgstr "Du er ikke tilkoblet tjeneren"
 
@@ -734,9 +759,11 @@ msgstr "Du er ikke tilkoblet tjeneren"
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Du kan ikke flette kontakter uten å være tilkoblet."
 
-#: gajim/dialogs.py:752 gajim/dialogs.py:823 gajim/gtk/discovery.py:822
-#: gajim/gtk/discovery.py:1648 gajim/gtk/discovery.py:1941
-#: gajim/gtk/history.py:99 gajim/gtk/roster_item_exchange.py:83
+#: gajim/dialogs.py:752 gajim/dialogs.py:823
+#: gajim/data/gui/groupchat_info_scrolled.ui:16 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/gtk/roster_item_exchange.py:83
 msgid "Name"
 msgstr "Navn"
 
@@ -756,389 +783,343 @@ msgstr "Du kan ikke flette med en konto uten å være tilkoblet."
 msgid "Synchronise"
 msgstr "Flett"
 
-#: gajim/dialogs.py:1043
+#: gajim/dialogs.py:1042
 msgid "an audio and video"
 msgstr "en lyd og video"
 
-#: gajim/dialogs.py:1045
+#: gajim/dialogs.py:1044
 msgid "an audio"
 msgstr "en lyd"
 
-#: gajim/dialogs.py:1047
+#: gajim/dialogs.py:1046
 msgid "a video"
 msgstr "en video"
 
-#: gajim/dialogs.py:1051
-#, python-format
+#: gajim/dialogs.py:1050
+#, fuzzy, python-format
 msgid ""
-"%(contact)s wants to start %(type)s session with you. Do you want to answer "
+"%(contact)s wants to start a %(type)s chat with you. Do you want to answer "
 "the call?"
 msgstr ""
 "%(contact)s ønsker å starte %(type)s økt med deg. Ønsker du å besvare denne "
 "forespørselen?"
 
-#: gajim/groupchat_control.py:505
+#: gajim/groupchat_control.py:511
 #, fuzzy, python-format
 msgid "Send File (max. %s MiB)…"
 msgstr "Lagre fil som…"
 
-#: gajim/groupchat_control.py:507 gajim/chat_control.py:342
+#: gajim/groupchat_control.py:513 gajim/chat_control.py:344
 msgid "No File Transfer available"
 msgstr "Ingen filoverføringer tilgjengelig"
 
-#: gajim/groupchat_control.py:630 gajim/groupchat_control.py:2349
-msgid "Changing Subject"
-msgstr "Endrer tema"
-
-#: gajim/groupchat_control.py:631 gajim/groupchat_control.py:2350
-msgid "Please specify the new subject:"
-msgstr "Skriv inn nytt tema:"
-
-#: gajim/groupchat_control.py:638
-msgid "Changing Nickname"
-msgstr "Endrer kallenavn"
-
-#: gajim/groupchat_control.py:639
-msgid "Please specify the new nickname you want to use:"
-msgstr "Velg hvilket nye kallenavn du ønsker å bruke:"
-
-#: gajim/groupchat_control.py:657
-msgid "Invalid group chat JID"
+#: gajim/groupchat_control.py:655
+#, fuzzy
+msgid "Invalid group chat XMPP Address"
 msgstr "Ugyldig gruppesludrings-JID"
 
-#: gajim/groupchat_control.py:658
-msgid "The group chat JID has not allowed characters."
+#: gajim/groupchat_control.py:656
+#, fuzzy
+msgid "The group chat XMPP Address has not allowed characters."
 msgstr "Gruppesludrings-JID-en inneholder ulovlige symboler."
 
-#: gajim/groupchat_control.py:758 gajim/gtk/profile.py:136
+#: gajim/groupchat_control.py:743 gajim/gtk/profile.py:136
 msgid "Could not load image"
 msgstr "Kunne ikke laste inn bilde"
 
-#: gajim/groupchat_control.py:888
+#: gajim/groupchat_control.py:873
 msgid "Insert Nickname"
 msgstr "Skriv inn kallenavn"
 
-#: gajim/groupchat_control.py:1056 gajim/chat_control.py:824
+#: gajim/groupchat_control.py:1041 gajim/chat_control.py:848
 msgid "and authenticated"
 msgstr "og identitetsbekreftet"
 
-#: gajim/groupchat_control.py:1060 gajim/chat_control.py:828
+#: gajim/groupchat_control.py:1045 gajim/chat_control.py:852
 msgid "and NOT authenticated"
 msgstr "og IKKE identitetsbekreftet"
 
-#: gajim/groupchat_control.py:1064
+#: gajim/groupchat_control.py:1049
 #, python-format
 msgid "%(type)s encryption is active %(authenticated)s."
 msgstr "%(type)s kryptering er aktiv %(authenticated)s."
 
-#: gajim/groupchat_control.py:1111
+#: gajim/groupchat_control.py:1096
 msgid "Conversation with "
 msgstr "Samtale med "
 
-#: gajim/groupchat_control.py:1113
+#: gajim/groupchat_control.py:1098
 msgid "Continued conversation"
 msgstr "Fortsatt samtale"
 
-#: gajim/groupchat_control.py:1411
+#: gajim/groupchat_control.py:1357
 #, python-format
 msgid "%(nick)s has set the subject to %(subject)s"
 msgstr "%(nick)s satt temaet til %(subject)s"
 
-#: gajim/groupchat_control.py:1433
-msgid "Room now shows unavailable members"
+#: gajim/groupchat_control.py:1374
+#, fuzzy
+msgid "Group chat now shows unavailable members"
 msgstr "Rommet viser nå utilgjengelige medlemmer"
 
-#: gajim/groupchat_control.py:1436
-msgid "Room now does not show unavailable members"
+#: gajim/groupchat_control.py:1377
+#, fuzzy
+msgid "Group chat now does not show unavailable members"
 msgstr "Rommet viser nå utilgjengelige medlemmer"
 
-#: gajim/groupchat_control.py:1439
+#: gajim/groupchat_control.py:1380
 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:1446
-msgid "Room logging is now enabled"
-msgstr "Romlogging er nå aktivert"
+#: gajim/groupchat_control.py:1387 gajim/groupchat_control.py:1659
+#, fuzzy
+msgid "Conversations are stored on the server"
+msgstr "Denne økta VIL bli arkivert på tjeneren"
 
-#: gajim/groupchat_control.py:1449
-msgid "Room logging is now disabled"
-msgstr "Romlogging er nå avskrudd"
+#: gajim/groupchat_control.py:1390
+#, fuzzy
+msgid "Conversations are not stored on the server"
+msgstr "Informasjon om deg, slik som den er lagret på tjeneren"
 
-#: gajim/groupchat_control.py:1452
-msgid "Room is now non-anonymous"
+#: gajim/groupchat_control.py:1393
+#, fuzzy
+msgid "Group chat is now non-anonymous"
 msgstr "Rommet er nå ikke-anonymt"
 
-#: gajim/groupchat_control.py:1456
-msgid "Room is now semi-anonymous"
+#: gajim/groupchat_control.py:1397
+#, fuzzy
+msgid "Group chat is now semi-anonymous"
 msgstr "Rommet er nå semi-anonymt"
 
-#: gajim/groupchat_control.py:1460
-msgid "Room is now fully anonymous"
+#: gajim/groupchat_control.py:1401
+#, fuzzy
+msgid "Group chat is now fully anonymous"
 msgstr "Rommet er nå helt anonymt"
 
-#: gajim/groupchat_control.py:1500
+#: gajim/groupchat_control.py:1439
 #, fuzzy, python-format
 msgid "Ping? (%s)"
 msgstr "Pong! (%s s.)"
 
-#: gajim/groupchat_control.py:1503
+#: gajim/groupchat_control.py:1442
 #, python-format
 msgid "Pong! (%(nick)s %(delay)s s.)"
 msgstr "Pong! (%(nick)s %(delay)s s.)"
 
-#: gajim/groupchat_control.py:1506 gajim/chat_control.py:1213
+#: gajim/groupchat_control.py:1445 gajim/chat_control.py:1237
 msgid "Error."
 msgstr "Feil."
 
-#: gajim/groupchat_control.py:1711
+#: gajim/groupchat_control.py:1650
 #, fuzzy, python-format
-msgid "You (%s) joined the room"
+msgid "You (%s) joined the group chat"
 msgstr "%s har tatt del i gruppesamtalen"
 
-#: gajim/groupchat_control.py:1717
-msgid "Any occupant is allowed to see your full JID"
+#: gajim/groupchat_control.py:1655
+#, fuzzy
+msgid "Any participant is allowed to see your full XMPP Address"
 msgstr "Enhver samtaledeltager kan se hele JID-en din"
 
-#: gajim/groupchat_control.py:1721
-msgid "Room logging is enabled"
-msgstr "Romlogging er nå påskrudd"
-
-#: gajim/groupchat_control.py:1725
-msgid "The server has assigned or modified your roomnick"
+#: gajim/groupchat_control.py:1663
+#, fuzzy
+msgid "The server has assigned or modified your nickname in this group chat"
 msgstr "Tjeneren har tildelt eller endret ditt kallenavn i dette rommet"
 
-#: gajim/groupchat_control.py:1732
-msgid "A new room has been created"
+#: gajim/groupchat_control.py:1671
+#, fuzzy
+msgid "A new group chat has been created"
 msgstr "Et nytt rom har blitt opprettet"
 
-#: gajim/groupchat_control.py:1740 gajim/privatechat_control.py:112
+#: gajim/groupchat_control.py:1679 gajim/privatechat_control.py:115
 #, python-format
 msgid "You are now known as %s"
 msgstr "Du går nå under navnet %s"
 
-#: gajim/groupchat_control.py:1742 gajim/privatechat_control.py:114
+#: gajim/groupchat_control.py:1681 gajim/privatechat_control.py:117
 #, 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:1767 gajim/privatechat_control.py:141
+#: gajim/groupchat_control.py:1706 gajim/privatechat_control.py:144
 #, fuzzy, python-brace-format
 msgid "You are now {show}{status}"
 msgstr "Du går nå under navnet %s"
 
-#: gajim/groupchat_control.py:1773 gajim/privatechat_control.py:147
+#: gajim/groupchat_control.py:1712 gajim/privatechat_control.py:150
 #, fuzzy, python-brace-format
 msgid "{nick} is now {show}{status}"
 msgstr "%(nick)s er nå %(status)s"
 
-#: gajim/groupchat_control.py:1790 gajim/groupchat_control.py:1819
-#: gajim/groupchat_control.py:1849 gajim/groupchat_control.py:1909
+#: gajim/groupchat_control.py:1729 gajim/groupchat_control.py:1758
+#: gajim/groupchat_control.py:1788 gajim/groupchat_control.py:1848
 #, python-brace-format
 msgid " by {actor}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1793
+#: gajim/groupchat_control.py:1732
 #, fuzzy, python-brace-format
 msgid "** Your Affiliation has been set to {affiliation}{actor}{reason}"
 msgstr ""
 "** Tilhørighet for %(nick)s har blitt satt til %(affiliation)s av %(actor)s"
 
-#: gajim/groupchat_control.py:1799
+#: gajim/groupchat_control.py:1738
 #, fuzzy, python-brace-format
 msgid "** Affiliation of {nick} has been set to {affiliation}{actor}{reason}"
 msgstr "** Tilhørigheten til %(nick)s har blitt satt til %(affiliation)s"
 
-#: gajim/groupchat_control.py:1822
+#: gajim/groupchat_control.py:1761
 #, fuzzy, python-brace-format
 msgid "** Your Role has been set to {role}{actor}{reason}"
 msgstr "** Rollen til %(nick)s har blitt satt til %(role)s av %(actor)s"
 
-#: gajim/groupchat_control.py:1827
+#: gajim/groupchat_control.py:1766
 #, fuzzy, python-brace-format
 msgid "** Role of {nick} has been set to {role}{actor}{reason}"
 msgstr "** Rollen til %(nick)s har blitt satt til %(role)s av %(actor)s"
 
-#: gajim/groupchat_control.py:1852
+#: gajim/groupchat_control.py:1791
 #, fuzzy, python-brace-format
-msgid "You have been removed from the room{actor}{reason}"
+msgid "You have been removed from the group chat{actor}{reason}"
 msgstr "%(nick)s har blitt fjernet fra rommet (%(reason)s)"
 
-#: gajim/groupchat_control.py:1857
+#: gajim/groupchat_control.py:1796
 #, python-brace-format
 msgid "You have left due to an error{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1863
+#: gajim/groupchat_control.py:1802
 #, python-brace-format
 msgid "You have been kicked{actor}{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1870
+#: gajim/groupchat_control.py:1809
 #, python-brace-format
 msgid "You have been banned{actor}{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1877 gajim/groupchat_control.py:1943
+#: gajim/groupchat_control.py:1816 gajim/groupchat_control.py:1882
 #, fuzzy
 msgid ": Affiliation changed"
 msgstr "tilhørighet endret"
 
-#: gajim/groupchat_control.py:1883 gajim/groupchat_control.py:1948
+#: gajim/groupchat_control.py:1822 gajim/groupchat_control.py:1887
 #, fuzzy
-msgid ": Room configuration changed to members-only"
+msgid ": Group chat configuration changed to members-only"
 msgstr "romoppsett endret til kun medlemmer"
 
-#: gajim/groupchat_control.py:1912
+#: gajim/groupchat_control.py:1851
 #, fuzzy, python-brace-format
-msgid "{nick} has been removed from the room{by}{reason}"
+msgid "{nick} has been removed from the group chat{by}{reason}"
 msgstr "%(nick)s har blitt fjernet fra rommet (%(reason)s)"
 
-#: gajim/groupchat_control.py:1922
+#: gajim/groupchat_control.py:1861
 #, python-brace-format
 msgid "{nick} has left due to an error{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1928
+#: gajim/groupchat_control.py:1867
 #, fuzzy, python-brace-format
 msgid "{nick} has been kicked{actor}{reason}"
 msgstr "%(nick)s har blitt kastet ut: %(reason)s"
 
-#: gajim/groupchat_control.py:1936
+#: gajim/groupchat_control.py:1875
 #, fuzzy, python-brace-format
 msgid "{nick} has been banned{actor}{reason}"
 msgstr "%(nick)s har blitt bannlyst: %(reason)s"
 
-#: gajim/groupchat_control.py:1953
+#: gajim/groupchat_control.py:1892
 #, python-brace-format
 msgid "{nick} has left{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1970
+#: gajim/groupchat_control.py:1914
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s har tatt del i gruppesamtalen"
 
-#: gajim/groupchat_control.py:1985 gajim/groupchat_control.py:1990
-#: gajim/groupchat_control.py:1995 gajim/groupchat_control.py:2000
-#: gajim/groupchat_control.py:2011
-msgid "Unable to join group chat"
-msgstr "Kunne ikke ta del i gruppesamtale"
-
-#: gajim/groupchat_control.py:1986
-#, python-format
-msgid "You are banned from group chat <b>%s</b>."
-msgstr "Du er bannlyst fra gruppesamtalen <b>%s</b>."
-
-#: gajim/groupchat_control.py:1991
-#, python-format
-msgid "Remote server <b>%s</b> does not exist."
-msgstr "Fjerntjeneren <b>%s</b> finnes ikke."
-
-#: gajim/groupchat_control.py:1996
-#, python-format
-msgid "Group chat <b>%s</b> does not exist."
-msgstr "Gruppesamtalen <b>%s</b> finnes ikke."
-
-#: gajim/groupchat_control.py:2001
-msgid "Group chat creation is not permitted."
-msgstr "Oppretting av gruppesludring tillates ikke."
-
-#: gajim/groupchat_control.py:2005
-msgid "Unable to join groupchat"
-msgstr "Kunne ikke ta del i gruppesludring"
-
-#: gajim/groupchat_control.py:2006
-#, python-format
-msgid "You must use your registered nickname in <b>%s</b>."
-msgstr "Ditt registrerte kallenavn må brukes i <b>%s</b>."
-
-#: gajim/groupchat_control.py:2012
-#, python-format
-msgid "You are not in the members list in groupchat %s."
-msgstr "Du er ikke på medlemslista for gruppesamtalen %s."
-
-#: gajim/groupchat_control.py:2068
-msgid "Room has been destroyed"
+#: gajim/groupchat_control.py:1981
+#, fuzzy
+msgid "Group chat has been destroyed"
 msgstr "Rommet har blitt kansellert"
 
-#: gajim/groupchat_control.py:2073
+#: gajim/groupchat_control.py:1986
 #, fuzzy, python-format
-msgid "You can join this room instead: xmpp:%s?join"
+msgid "You can join this group chat instead: xmpp:%s?join"
 msgstr "Du kan bli med i dette rommet i steden for: %s"
 
-#: gajim/groupchat_control.py:2306
+#: gajim/groupchat_control.py:2214
 #, fuzzy
 msgid "Leave Group Chat"
 msgstr "Forlat gruppesamtaler"
 
-#: gajim/groupchat_control.py:2307
+#: gajim/groupchat_control.py:2215
 #, fuzzy
 msgid "Are you sure you want to leave this group chat?"
 msgstr "Er du sikker på at du vil forlate gruppesamtalen \"%s\"?"
 
-#: gajim/groupchat_control.py:2308
+#: gajim/groupchat_control.py:2216
 #, fuzzy, python-format
-msgid "If you close this window, you will be disconnected from '%s'."
+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:2314
+#: gajim/groupchat_control.py:2222 gajim/roster_window.py:5177
 msgid "_Leave"
 msgstr ""
 
-#: gajim/groupchat_control.py:2377
+#: gajim/groupchat_control.py:2280 gajim/roster_window.py:3008
 #, fuzzy, python-format
 msgid "%(jid)s has been invited to this group chat"
 msgstr "%(jid)s har blitt invitert til dette rommet"
 
-#: gajim/groupchat_control.py:2527
+#: gajim/groupchat_control.py:2463
 #, python-format
 msgid "Kicking %s"
 msgstr "Kaster ut %s"
 
-#: gajim/groupchat_control.py:2528 gajim/groupchat_control.py:2829
+#: gajim/groupchat_control.py:2464 gajim/groupchat_control.py:2765
 msgid "You may specify a reason below:"
 msgstr "Du kan oppgi en grunn nedenfor:"
 
-#: gajim/groupchat_control.py:2828
+#: gajim/groupchat_control.py:2764
 #, python-format
 msgid "Banning %s"
 msgstr "Bannlyser %s"
 
-#: gajim/chat_control.py:408
+#: gajim/chat_control.py:432
 msgid "Show a list of formattings"
 msgstr "Vis formateringsliste"
 
-#: gajim/chat_control.py:412
+#: gajim/chat_control.py:436
 msgid "This contact does not support HTML"
 msgstr "Denne kontakten støtter ikke HTML"
 
-#: gajim/chat_control.py:562
+#: gajim/chat_control.py:586
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr "%(type)s tilstand : %(state)s, grunn: %(reason)s"
 
-#: gajim/chat_control.py:686
+#: gajim/chat_control.py:710
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s fra gruppesamtale %(room_name)s"
 
-#: gajim/chat_control.py:832
+#: gajim/chat_control.py:856
 #, fuzzy, python-format
 msgid "%(type)s encryption is active %(authenticated)s"
 msgstr "%(type)s kryptering er aktiv %(authenticated)s."
 
-#: gajim/chat_control.py:1160 gajim/chat_control.py:1168
+#: gajim/chat_control.py:1184 gajim/chat_control.py:1192
 #, fuzzy
 msgid "Close"
 msgstr "_Lukk"
 
-#: gajim/chat_control.py:1161
+#: gajim/chat_control.py:1185
 #, fuzzy, python-format
 msgid "You just received a new message from %s"
 msgstr "Du fikk akkurat en ny melding fra \"%s\""
 
-#: gajim/chat_control.py:1163
+#: gajim/chat_control.py:1187
 #, fuzzy
 msgid ""
 "If you close this tab while having chat history disabled, this message will "
@@ -1146,16 +1127,16 @@ msgid ""
 msgstr ""
 "Dersom du lukker vinduet og du har slått av historikk, vil meldingen gå tapt."
 
-#: gajim/chat_control.py:1208
+#: gajim/chat_control.py:1232
 msgid "Ping?"
 msgstr "Ping?"
 
-#: gajim/chat_control.py:1211
+#: gajim/chat_control.py:1235
 #, fuzzy, python-format
 msgid "Pong! (%s seconds)"
 msgstr "Pong! (%s s.)"
 
-#: gajim/chat_control.py:1308
+#: gajim/chat_control.py:1332
 #, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -1164,245 +1145,253 @@ msgstr ""
 "Emne: %(subject)s\n"
 "%(message)s"
 
-#: gajim/chat_control.py:1416
+#: gajim/chat_control.py:1440
 #, python-format
 msgid "%(name)s is now %(show)s %(status)s"
 msgstr "%(name)s er nå %(show)s %(status)s"
 
-#: gajim/chat_control.py:1476 gajim/data/gui/application_menu.ui:32
+#: gajim/chat_control.py:1500 gajim/data/gui/application_menu.ui:32
 #: gajim/gtk/http_upload_progress.py:35
 msgid "File Transfer"
 msgstr "Filoverføring"
 
-#: gajim/chat_control.py:1480
+#: gajim/chat_control.py:1504
 msgid "Size"
 msgstr "Størrelse"
 
-#: gajim/chat_control.py:1482 gajim/chat_control.py:1546
+#: gajim/chat_control.py:1506 gajim/chat_control.py:1566
+#: gajim/gui_interface.py:190
 #: gajim/data/gui/groupchat_invitation_received.ui:77
-#: gajim/gtk/filetransfer.py:485
+#: gajim/gtk/filetransfer.py:490
 #, fuzzy
 msgid "_Accept"
 msgstr "_Godkjenn"
 
-#: gajim/chat_control.py:1484 gajim/chat_control.py:1548
+#: gajim/chat_control.py:1508 gajim/chat_control.py:1568
 #: gajim/data/gui/groupchat_invitation_received.ui:62
 #, fuzzy
 msgid "_Decline"
 msgstr "_Frakoblet"
 
-#: gajim/chat_control.py:1506 gajim/gui_interface.py:791
-#: gajim/gui_interface.py:821 gajim/gui_interface.py:847
+#: gajim/chat_control.py:1530 gajim/gui_interface.py:777
+#: gajim/gui_interface.py:807 gajim/gui_interface.py:833
 #: gajim/gtk/notification.py:173 gajim/gtk/notification.py:278
 msgid "File Transfer Completed"
 msgstr "Filoverføring fullført"
 
-#: gajim/chat_control.py:1510 gajim/gtk/filetransfer.py:259
+#: gajim/chat_control.py:1534 gajim/gtk/filetransfer.py:258
 #, fuzzy
 msgid "Open _Folder"
 msgstr "Åpne _inneholdende mappe"
 
-#: gajim/chat_control.py:1512 gajim/chat_control.py:1521
+#: gajim/chat_control.py:1536 gajim/chat_control.py:1545
+#: gajim/data/gui/groupchat_control.ui:962
+#: gajim/data/gui/groupchat_control.ui:1049
+#: gajim/data/gui/groupchat_control.ui:1155
 msgid "_Close"
 msgstr "_Lukk"
 
-#: gajim/chat_control.py:1543 gajim/gui_interface.py:484
+#: gajim/chat_control.py:1563 gajim/gui_interface.py:473
+#: gajim/data/gui/groupchat_invitation_received.ui:42
 #: gajim/gtk/notification.py:174 gajim/gtk/notification.py:195
 #: gajim/gtk/notification.py:281
-msgid "Groupchat Invitation"
+#, fuzzy
+msgid "Group Chat Invitation"
 msgstr "Invitasjon til gruppesamtale"
 
-#: gajim/chat_control.py:1568 gajim/roster_window.py:1954
+#: gajim/chat_control.py:1588 gajim/roster_window.py:1951
 msgid "Remote contact stopped transfer"
 msgstr "Kontakten stoppet overføringen"
 
-#: gajim/chat_control.py:1570 gajim/roster_window.py:1956
+#: gajim/chat_control.py:1590 gajim/roster_window.py:1953
 msgid "Error opening file"
 msgstr "Feil under åpning av fil"
 
-#: gajim/chat_control.py:1572 gajim/gtk/filetransfer.py:297
+#: gajim/chat_control.py:1592 gajim/gtk/filetransfer.py:296
 msgid "File transfer stopped"
 msgstr "Filoverføring stoppet"
 
-#: gajim/chat_control.py:1575 gajim/gtk/filetransfer.py:275
-#: gajim/gtk/filetransfer.py:284
+#: gajim/chat_control.py:1595 gajim/gtk/filetransfer.py:274
+#: gajim/gtk/filetransfer.py:283
 msgid "File transfer cancelled"
 msgstr "Filoverføring avbrutt"
 
-#: gajim/chat_control.py:1576
+#: gajim/chat_control.py:1596
 msgid "Connection with peer cannot be established."
 msgstr "Tilkoblingen med likemann kan ikke opprettes."
 
-#: gajim/application.py:72
+#: gajim/application.py:75
 msgid "Show the application's version"
 msgstr "Vis programversjon"
 
-#: gajim/application.py:79
+#: gajim/application.py:82
 msgid "Show only critical errors"
 msgstr "Bare vis kritiske feil"
 
-#: gajim/application.py:86
+#: gajim/application.py:89
 #, fuzzy
 msgid "Separate profile files completely (even history database and plugins)"
 msgstr "Del profilene helt (selv historikkdatabase og programtillegg)"
 
-#: gajim/application.py:94
+#: gajim/application.py:97
 msgid "Print XML stanzas and other debug information"
 msgstr "Skriv ut XML-stanza-er og annen feilrettingsinformasjon"
 
-#: gajim/application.py:101
+#: gajim/application.py:104
 msgid "Use defined profile in configuration directory"
 msgstr "Bruk definert profil i oppsettsmappe"
 
-#: gajim/application.py:109
+#: gajim/application.py:112
 msgid "Set configuration directory"
 msgstr "Velg oppsettsmappe"
 
-#: gajim/application.py:117
+#: gajim/application.py:120
 msgid "Configure logging system"
 msgstr "Sett opp loggføringssystem"
 
-#: gajim/application.py:125
+#: gajim/application.py:128
 msgid "Show all warnings"
 msgstr "Vis alle advarsler"
 
-#: gajim/application.py:132
+#: gajim/application.py:135
 msgid "Open IPython shell"
 msgstr ""
 
-#: gajim/application.py:139
+#: gajim/application.py:142
 msgid "Pops up a window with the next pending event"
 msgstr "Viser et oppsprettsvindu med neste ventende hendelse"
 
-#: gajim/application.py:145 gajim/data/gui/shortcuts_window.ui:203
+#: gajim/application.py:148 gajim/data/gui/shortcuts_window.ui:203
 #: data/org.gajim.Gajim.desktop.in:21
 msgid "Start a new chat"
 msgstr "Start ny samtale"
 
-#: gajim/application.py:152
+#: gajim/application.py:155
 msgid "Simulate loss of connectivity"
 msgstr ""
 
-#: gajim/application.py:159
+#: gajim/application.py:162
 msgid "Simulate regaining connectivity"
 msgstr ""
 
-#: gajim/application.py:201 gajim/gui_interface.py:133
+#: gajim/application.py:204 gajim/gui_interface.py:133
 msgid "Database Error"
 msgstr "Database-feil"
 
-#: gajim/roster_window.py:294 gajim/roster_window.py:1030
+#: gajim/roster_window.py:291 gajim/roster_window.py:1027
 msgid "Merged accounts"
 msgstr "Flettede kontoer"
 
-#: gajim/roster_window.py:853 gajim/roster_window.py:1631
-#: gajim/roster_window.py:1664 gajim/roster_window.py:1715
-#: gajim/roster_window.py:1717 gajim/roster_window.py:1872
-#: gajim/roster_window.py:2531 gajim/roster_window.py:5025
-#: gajim/common/contacts.py:188 gajim/common/contacts.py:447
-#: gajim/common/helpers.py:83 gajim/gtk/discovery.py:129
-#: gajim/gtk/discovery.py:130 gajim/gtk/discovery.py:1416
+#: gajim/roster_window.py:850 gajim/roster_window.py:1628
+#: gajim/roster_window.py:1661 gajim/roster_window.py:1712
+#: gajim/roster_window.py:1714 gajim/roster_window.py:1869
+#: gajim/roster_window.py:2528 gajim/roster_window.py:4331
+#: gajim/roster_window.py:4964 gajim/common/contacts.py:204
+#: gajim/common/contacts.py:463 gajim/common/helpers.py:86
+#: gajim/gtk/discovery.py:127 gajim/gtk/discovery.py:128
+#: gajim/gtk/discovery.py:1414
 msgid "Transports"
 msgstr "Transporter"
 
-#: gajim/roster_window.py:1723 gajim/roster_window.py:1725
-#: gajim/roster_window.py:4995 gajim/gui_interface.py:1613
-#: gajim/gui_interface.py:1639 gajim/common/contacts.py:186
-#: gajim/common/helpers.py:83 gajim/common/modules/adhoc_commands.py:245
-msgid "Groupchats"
+#: gajim/roster_window.py:1720 gajim/roster_window.py:1722
+#: gajim/roster_window.py:4331 gajim/roster_window.py:4934
+#: gajim/gui_interface.py:1527 gajim/common/contacts.py:202
+#: gajim/common/helpers.py:86 gajim/common/modules/adhoc_commands.py:245
+#, fuzzy
+msgid "Group chats"
 msgstr "Gruppesamtaler"
 
-#: gajim/roster_window.py:2012
+#: gajim/roster_window.py:2009
 msgid "Authorization sent"
 msgstr "Godkjenning sendt"
 
-#: gajim/roster_window.py:2013
+#: gajim/roster_window.py:2010
 #, python-format
 msgid "\"%s\" will now see your status."
 msgstr "\"%s\" vil nå kunne se din status."
 
-#: gajim/roster_window.py:2031
+#: gajim/roster_window.py:2028
 msgid "Subscription request has been sent"
 msgstr "Abonnementsforespørselen har blitt sendt"
 
-#: gajim/roster_window.py:2032
-#, python-format
-msgid "If \"%s\" accepts this request you will know his or her status."
+#: gajim/roster_window.py:2029
+#, 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:2046
+#: gajim/roster_window.py:2043
 msgid "Authorization removed"
 msgstr "Godkjenning fjernet"
 
-#: gajim/roster_window.py:2047
+#: gajim/roster_window.py:2044
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Nå vil \"%s\" se deg som frakoblet."
 
-#: gajim/roster_window.py:2250 gajim/roster_window.py:3504
+#: gajim/roster_window.py:2247 gajim/roster_window.py:3460
 msgid "Disconnect for Invisibility"
 msgstr ""
 
-#: gajim/roster_window.py:2251 gajim/roster_window.py:3505
+#: gajim/roster_window.py:2248 gajim/roster_window.py:3461
 msgid "You are participating in one or more group chats"
 msgstr "Du deltar i én eller flere gruppesamtaler"
 
-#: gajim/roster_window.py:2252 gajim/roster_window.py:3506
+#: gajim/roster_window.py:2249 gajim/roster_window.py:3462
 #, fuzzy
 msgid ""
-"Changing your status to invisible will result in disconnection from those "
-"group chats.\n"
+"Changing your status to invisible will result in you leaving those group "
+"chats.\n"
 "Are you sure you want to go invisible?"
 msgstr ""
 "Endring av status til usynlig vil medføre frakobling fra de gruppesamtalene. "
 "Er du sikker på at du vil bli usynlig?"
 
-#: gajim/roster_window.py:2257 gajim/roster_window.py:3512
-#: gajim/roster_window.py:5238 gajim/data/gui/gc_control_popup_menu.ui:120
+#: gajim/roster_window.py:2254 gajim/roster_window.py:3468
+#: gajim/data/gui/gc_control_popup_menu.ui:120
 msgid "_Disconnect"
 msgstr "_Koble fra"
 
-#: gajim/roster_window.py:2285
+#: gajim/roster_window.py:2282
 #, fuzzy
 msgid "desynced"
 msgstr "usynkronisert"
 
-#: gajim/roster_window.py:2353 gajim/data/gui/shortcuts_window.ui:224
+#: gajim/roster_window.py:2350 gajim/data/gui/shortcuts_window.ui:224
 msgid "Quit Gajim"
 msgstr "Avslutt Gajim"
 
-#: gajim/roster_window.py:2354
+#: gajim/roster_window.py:2351
 #, fuzzy
 msgid "You are about to quit Gajim"
 msgstr "Bekreft lukking av Gajim."
 
-#: gajim/roster_window.py:2355
+#: gajim/roster_window.py:2352
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Bekreft lukking av Gajim."
 
-#: gajim/roster_window.py:2356
+#: gajim/roster_window.py:2353
 #, fuzzy
 msgid "_Always quit when closing Gajim"
 msgstr "Alltid lukk Gajim"
 
-#: gajim/roster_window.py:2359 gajim/roster_window.py:2455
-#: gajim/roster_window.py:2495 gajim/data/gui/systray_context_menu.ui:90
+#: gajim/roster_window.py:2356 gajim/roster_window.py:2452
+#: gajim/roster_window.py:2492 gajim/data/gui/systray_context_menu.ui:83
 msgid "_Quit"
 msgstr "_Avslutt"
 
-#: gajim/roster_window.py:2448
+#: gajim/roster_window.py:2445
 #, fuzzy
 msgid "Stop File Transfers"
 msgstr "Filoverføringer"
 
-#: gajim/roster_window.py:2449
+#: gajim/roster_window.py:2446
 #, fuzzy
 msgid "You still have running file transfers"
 msgstr "Du har filoverføringer underveis"
 
-#: gajim/roster_window.py:2450
+#: gajim/roster_window.py:2447
 #, fuzzy
 msgid ""
 "If you quit now, the file(s) being transferred will be lost.\n"
@@ -1411,17 +1400,17 @@ msgstr ""
 "Hvis du avslutter nå, vil fil(ene) som er underveis bli stoppet. Ønsker du "
 "fremdeles å avslutte?"
 
-#: gajim/roster_window.py:2488
+#: gajim/roster_window.py:2485
 #, fuzzy
 msgid "Unread Messages"
 msgstr "Uleste hendelser"
 
-#: gajim/roster_window.py:2489
+#: gajim/roster_window.py:2486
 #, fuzzy
 msgid "You still have unread messages"
 msgstr "Du har uleste meldinger"
 
-#: gajim/roster_window.py:2490
+#: gajim/roster_window.py:2487
 #, fuzzy
 msgid ""
 "Messages will only be available for reading them later if storing chat "
@@ -1430,20 +1419,20 @@ msgstr ""
 "Meldinger vil kun være tilgjengelig for senere lesning hvis du har historikk "
 "påskrudd og kontakten er å finne på din kontaktliste."
 
-#: gajim/roster_window.py:2760
+#: gajim/roster_window.py:2753
 msgid "You have unread messages"
 msgstr "Du har uleste meldinger"
 
-#: gajim/roster_window.py:2761
+#: gajim/roster_window.py:2754
 msgid "You must read them before removing this transport."
 msgstr "Du må lese dem før du fjerner denne transporten."
 
-#: gajim/roster_window.py:2764
+#: gajim/roster_window.py:2757
 #, fuzzy, python-format
 msgid "Transport '%s' will be removed"
 msgstr "Transporten \"%s\" vil bli fjernet"
 
-#: gajim/roster_window.py:2765
+#: gajim/roster_window.py:2758
 #, fuzzy
 msgid ""
 "You will no longer be able to send and receive messages from and to contacts "
@@ -1452,11 +1441,11 @@ msgstr ""
 "Du vil ikke lenger kunne sende og motta meldinger fra kontakter som bruker "
 "denne transporten."
 
-#: gajim/roster_window.py:2768
+#: gajim/roster_window.py:2761
 msgid "Transports will be removed"
 msgstr "Transporter vil bli fjernet"
 
-#: gajim/roster_window.py:2773
+#: gajim/roster_window.py:2766
 #, fuzzy, python-format
 msgid ""
 "You will no longer be able to send and receive messages from and to contacts "
@@ -1466,22 +1455,22 @@ msgstr ""
 "Du vil ikke lenger kunne sende og motta meldinger fra kontakter som bruker "
 "denne transporten."
 
-#: gajim/roster_window.py:2777
+#: gajim/roster_window.py:2770
 #, fuzzy
 msgid "Remove Transport"
 msgstr "Vis transporter"
 
-#: gajim/roster_window.py:2844
+#: gajim/roster_window.py:2837
 #, fuzzy
 msgid "Block Contact"
 msgstr "Blokkerte kontakter"
 
-#: gajim/roster_window.py:2845
+#: gajim/roster_window.py:2838
 #, fuzzy
 msgid "Really block this contact?"
 msgstr "Er OpenPGP tilgjengelig for denne kontakten?"
 
-#: gajim/roster_window.py:2846
+#: gajim/roster_window.py:2839
 #, fuzzy
 msgid ""
 "This contact will see you offline and you will not receive any messages sent "
@@ -1490,65 +1479,60 @@ msgstr ""
 "Denne kontakten vil se deg som frakoblet og du vil ikke motta meldinger "
 "vedkommende sender deg."
 
-#: gajim/roster_window.py:2851
+#: gajim/roster_window.py:2844
 #, fuzzy
 msgid "_Block Contact"
 msgstr "Blokkerte kontakter"
 
-#: gajim/roster_window.py:2896
+#: gajim/roster_window.py:2889
 msgid "Rename Contact"
 msgstr "Gi kontakt nytt navn"
 
-#: gajim/roster_window.py:2897
+#: gajim/roster_window.py:2890
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Skriv inn kallenavn for kontakten %s"
 
-#: gajim/roster_window.py:2904
+#: gajim/roster_window.py:2897
 msgid "Rename Group"
 msgstr "Gi gruppe nytt navn"
 
-#: gajim/roster_window.py:2905
+#: gajim/roster_window.py:2898
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Skriv inn nytt navn på gruppen %s"
 
-#: gajim/roster_window.py:2953 gajim/roster_window.py:2954
+#: gajim/roster_window.py:2946 gajim/roster_window.py:2947
 msgid "Remove Group"
 msgstr "Fjern gruppe"
 
-#: gajim/roster_window.py:2955
+#: gajim/roster_window.py:2948
 #, fuzzy, python-format
 msgid "Do you want to remove %s from the contact list?"
 msgstr "Ønsker du å fjerne gruppen %s fra kontaktlista?"
 
-#: gajim/roster_window.py:2956
+#: gajim/roster_window.py:2949
 #, fuzzy
 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:3044
-#, python-format
-msgid "%(jid)s has been invited in this room"
-msgstr "%(jid)s har blitt invitert til dette rommet"
-
-#: gajim/roster_window.py:3353
+#: gajim/roster_window.py:3309
 #, fuzzy
 msgid "Remove Contact"
 msgstr "Gi kontakt nytt navn"
 
-#: gajim/roster_window.py:3354
+#: gajim/roster_window.py:3310
 #, fuzzy
 msgid "Remove contact from contact list"
 msgstr "Fjerner kontakt fra kontaktliste"
 
-#: gajim/roster_window.py:3355
+#: gajim/roster_window.py:3311
 #, 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:3364 gajim/roster_window.py:3384
+#: gajim/roster_window.py:3320 gajim/roster_window.py:3340
 #, fuzzy
 msgid ""
 "By removing this contact you also remove authorization. This means the "
@@ -1557,21 +1541,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:3375
+#: gajim/roster_window.py:3331
 msgid "Do you want to continue?"
 msgstr "Ønsker du å fortsette?"
 
-#: gajim/roster_window.py:3386
+#: gajim/roster_window.py:3342
 #, 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:3393
+#: gajim/roster_window.py:3349
 #, fuzzy
 msgid "Remove contacts from contact list"
 msgstr "Fjerner kontakt fra kontaktliste"
 
-#: gajim/roster_window.py:3399
+#: gajim/roster_window.py:3355
 #, fuzzy, python-format
 msgid ""
 "By removing the following contacts, you will also remove authorization. This "
@@ -1582,24 +1566,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:3403
+#: gajim/roster_window.py:3359
 #, fuzzy
 msgid "Remove Contacts"
 msgstr "Gi kontakt nytt navn"
 
-#: gajim/roster_window.py:3423
+#: gajim/roster_window.py:3379
 msgid "No account available"
 msgstr "Ingen konto tilgjengelig"
 
-#: gajim/roster_window.py:3424
+#: gajim/roster_window.py:3380
 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:4060
+#: gajim/roster_window.py:4011
 msgid "Metacontacts storage not supported by your server"
 msgstr "Du mangler støtte for lagring av metakontakter på tjeneren din"
 
-#: gajim/roster_window.py:4062
+#: gajim/roster_window.py:4013
 msgid ""
 "Your server does not support storing metacontacts information. So this "
 "information will not be saved on next reconnection."
@@ -1607,14 +1591,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:4159
+#: gajim/roster_window.py:4110
 #, 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:4160
+#: gajim/roster_window.py:4111
 #, fuzzy
 msgid ""
 "Metacontacts are a way to regroup several contacts in one single contact. "
@@ -1624,121 +1608,113 @@ 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:4164
+#: gajim/roster_window.py:4115
 #, fuzzy
 msgid "Create Metacontact"
 msgstr "Gi kontakt nytt navn"
 
-#: gajim/roster_window.py:4170
+#: gajim/roster_window.py:4121 gajim/data/gui/groupchat_creation.ui:317
 #, fuzzy
 msgid "_Create"
 msgstr "Kreativ"
 
-#: gajim/roster_window.py:4287
+#: gajim/roster_window.py:4238
 msgid "Invalid file URI:"
 msgstr "Ugyldig fil-URI:"
 
-#: gajim/roster_window.py:4298
+#: gajim/roster_window.py:4249
 #, fuzzy
 msgid "Send file?"
 msgstr "Send _fil"
 
-#: gajim/roster_window.py:4299
+#: gajim/roster_window.py:4250
 #, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
 msgstr[0] "Ønsker du å sende denne fila til %s:"
 msgstr[1] "Ønsker du å sende disse filene til %s:"
 
-#: gajim/roster_window.py:4451
+#: gajim/roster_window.py:4401
 #, python-format
 msgid "Send %(from)s to %(to)s"
 msgstr "Send %(from)s til %(to)s"
 
-#: gajim/roster_window.py:4464
+#: gajim/roster_window.py:4414
 #, python-format
 msgid "Make %s first contact"
 msgstr "Gjør %s til første kontakt"
 
-#: gajim/roster_window.py:4469
+#: gajim/roster_window.py:4419
 #, python-format
 msgid "Make %(contact1)s and %(contact2)s metacontacts"
 msgstr "Gjør %(contact1)s og %(contact2)s til metakontakter"
 
-#: gajim/roster_window.py:4825 gajim/roster_window.py:4923
+#: gajim/roster_window.py:4775 gajim/roster_window.py:4862
 msgid "_Change Status Message"
 msgstr "_Endre statusmelding"
 
-#: gajim/roster_window.py:4845
+#: gajim/roster_window.py:4795
 msgid "Publish Tune"
 msgstr "Offentliggjør melodi"
 
-#: gajim/roster_window.py:4856
+#: gajim/roster_window.py:4806
 msgid "Publish Location"
 msgstr "Offentliggjør plassering"
 
-#: gajim/roster_window.py:4868
-msgid "Configure Services…"
-msgstr "Sett opp tjenester…"
-
-#: gajim/roster_window.py:4997
+#: gajim/roster_window.py:4936
 msgid "_Maximize All"
 msgstr "_Maksimer alle"
 
-#: gajim/roster_window.py:5004 gajim/roster_window.py:5146
+#: gajim/roster_window.py:4943 gajim/roster_window.py:5085
 msgid "Send Group M_essage"
 msgstr "Send gruppe_melding"
 
-#: gajim/roster_window.py:5011
+#: gajim/roster_window.py:4950
 msgid "To all users"
 msgstr "Til alle brukere"
 
-#: gajim/roster_window.py:5015
+#: gajim/roster_window.py:4954
 msgid "To all online users"
 msgstr "Til alle påloggede brukere"
 
-#: gajim/roster_window.py:5027 gajim/roster_window.py:5152
+#: gajim/roster_window.py:4966 gajim/roster_window.py:5091
 #: gajim/data/gui/gc_occupants_menu.ui:110
 #: gajim/data/gui/contact_context_menu.ui:36
 msgid "In_vite to"
 msgstr "In_viter til"
 
-#: gajim/roster_window.py:5162
+#: gajim/roster_window.py:5101
 msgid "_Manage Contacts"
 msgstr "_Behandle kontakter"
 
-#: gajim/roster_window.py:5168
+#: gajim/roster_window.py:5107
 msgid "Edit _Groups…"
 msgstr "Rediger _grupper…"
 
-#: gajim/roster_window.py:5189 gajim/data/gui/filetransfers.ui:12
+#: gajim/roster_window.py:5128 gajim/data/gui/filetransfers.ui:12
 #: gajim/data/gui/remove_account_window.ui:134
 msgid "_Remove"
 msgstr "_Fjern"
 
-#: gajim/roster_window.py:5226
+#: gajim/roster_window.py:5165
 msgid "_Maximize"
 msgstr "__Maksimer"
 
-#: gajim/roster_window.py:5233
+#: gajim/roster_window.py:5172
 msgid "_Reconnect"
 msgstr "_Koble til på ny"
 
-#: gajim/roster_window.py:5254 gajim/data/gui/gc_occupants_menu.ui:170
+#: gajim/roster_window.py:5193 gajim/data/gui/gc_occupants_menu.ui:170
 #: gajim/data/gui/gc_control_popup_menu.ui:113
 #: gajim/data/gui/contact_context_menu.ui:205
 msgid "_History"
 msgstr "_Historikk"
 
-#: gajim/roster_window.py:5335 gajim/data/gui/application_menu.ui:86
+#: gajim/roster_window.py:5274 gajim/data/gui/application_menu.ui:83
 #: gajim/data/gui/history_window.ui:57
 msgid "History Manager"
 msgstr "Historikk-behandler"
 
-#: gajim/roster_window.py:5343
-msgid "_Join New Group Chat"
-msgstr "_Ta del i ny gruppesamtale"
-
 #: gajim/dataforms_widget.py:585
 msgid "Unable to load image"
 msgstr "Bilde kunne ikke lastes inn"
@@ -1861,252 +1837,270 @@ msgstr "Tema: %s\n"
 msgid "Write a message…"
 msgstr "Skriv en melding…"
 
-#: gajim/message_window.py:250
+#: gajim/message_window.py:356
+#, fuzzy
+msgid "Close Tabs"
+msgstr "Lukk sludring"
+
+#: gajim/message_window.py:357
 msgid "You are going to close several tabs"
 msgstr "Du er i ferd med å lokke flerfoldige faner"
 
-#: gajim/message_window.py:251
+#: gajim/message_window.py:358
 msgid "Do you really want to close them all?"
 msgstr "Ønsker du å lukke alle sammen?"
 
-#: gajim/message_window.py:539
+#: gajim/message_window.py:514
 msgid "?Noun:Chats"
 msgstr "?Noun:Sludringer"
 
-#: gajim/message_window.py:543
+#: gajim/message_window.py:518
 #, fuzzy
 msgid "Group Chats"
 msgstr "_Gruppe Samtale"
 
-#: gajim/message_window.py:547
+#: gajim/message_window.py:522
 msgid "Private Chats"
 msgstr "Private samtaler"
 
-#: gajim/message_window.py:553
+#: gajim/message_window.py:528
 msgid "Messages"
 msgstr "Meldinger"
 
-#: gajim/gui_interface.py:173
+#: gajim/gui_interface.py:170
+#, 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:175
 msgid "Do you accept this request?"
 msgstr "Godtar du denne forespørselen?"
 
-#: gajim/gui_interface.py:175
-#, python-format
-msgid "Do you accept this request on account %s?"
+#: gajim/gui_interface.py:177
+#, fuzzy, python-format
+msgid "Do you accept this request (account: %s)?"
 msgstr "Godtar du denne forespørselen på %s-kontoen?"
 
-#: gajim/gui_interface.py:178
-#, 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:182
+#, fuzzy
+msgid "Authorization"
+msgstr "Godkjenning sendt"
 
-#: gajim/gui_interface.py:194 gajim/gtk/notification.py:175
+#: gajim/gui_interface.py:186 gajim/gui_interface.py:420
+#: gajim/gtk/filetransfer.py:338
+#, fuzzy
+msgid "_No"
+msgstr "Ingen"
+
+#: gajim/gui_interface.py:205 gajim/gtk/notification.py:175
 #: gajim/gtk/notification.py:197
 msgid "Connection Failed"
 msgstr "Tilkobling mislyktes"
 
-#: gajim/gui_interface.py:279 gajim/gui_interface.py:529
-msgid "Password Required"
-msgstr "Passord påkrevd"
-
-#: gajim/gui_interface.py:280
-#, python-format
-msgid "A Password is required to join the room %s. Please type it."
-msgstr "Et passord kreves for å ta del i rommet %s. Skriv det inn."
-
-#: gajim/gui_interface.py:342 gajim/gui_interface.py:346
+#: gajim/gui_interface.py:325 gajim/gui_interface.py:329
 #, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr "Feil %(code)s: %(msg)s"
 
-#: gajim/gui_interface.py:357 gajim/gui_interface.py:376
+#: gajim/gui_interface.py:340 gajim/gui_interface.py:359
 #: gajim/common/modules/message.py:122
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "feil ved forsendelse av %(message)s ( %(error)s )"
 
-#: gajim/gui_interface.py:401 gajim/gtk/notification.py:175
+#: gajim/gui_interface.py:384 gajim/gtk/notification.py:175
 msgid "Subscription request"
 msgstr "Abonnementsforespørsel"
 
-#: gajim/gui_interface.py:413 gajim/common/contacts.py:184
-#: gajim/common/helpers.py:83
+#: gajim/gui_interface.py:396 gajim/common/contacts.py:200
+#: gajim/common/helpers.py:86
 msgid "Observers"
 msgstr "Observatører"
 
-#: gajim/gui_interface.py:422
+#: gajim/gui_interface.py:405
 msgid "Authorization accepted"
 msgstr "Godkjenning godtatt"
 
-#: gajim/gui_interface.py:423
+#: gajim/gui_interface.py:406
 #, 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:431
-#, python-format
-msgid "Contact \"%s\" removed subscription from you"
+#: gajim/gui_interface.py:415
+#, fuzzy
+msgid "Subscription Removed"
+msgstr "Abonnements-forespørsel"
+
+#: gajim/gui_interface.py:416
+#, fuzzy, python-format
+msgid "Contact '%s' removed subscription from you"
 msgstr "Kontakten \"%s\" abonnerer ikke lengre på deg"
 
-#: gajim/gui_interface.py:432
+#: gajim/gui_interface.py:417
+#, fuzzy
 msgid ""
-"You will always see them as offline.\n"
+"You will always see this contact as offline.\n"
 "Do you want to remove them from your contact list?"
 msgstr ""
 "Du vil alltid se dem som frakoblet.\n"
 "Ønsker du å fjerne dem fra kontaktlisten din?"
 
-#: gajim/gui_interface.py:453 gajim/gtk/notification.py:176
+#: gajim/gui_interface.py:442 gajim/gtk/notification.py:176
 msgid "Unsubscribed"
 msgstr "Abonnement opphevet"
 
-#: gajim/gui_interface.py:465
+#: gajim/gui_interface.py:454
 #, python-format
 msgid "%(jid)s declined the invitation: %(reason)s"
 msgstr "%(jid)s avslo invitasjonen: %(reason)s"
 
-#: gajim/gui_interface.py:469
+#: gajim/gui_interface.py:458
 #, python-format
 msgid "%(jid)s declined the invitation"
 msgstr "%(jid)s avslo invitasjonen"
 
-#: gajim/gui_interface.py:485
+#: gajim/gui_interface.py:474
 #, python-brace-format
 msgid "You are invited to {room} by {user}"
 msgstr "Du er invitert {room} av {user}"
 
-#: gajim/gui_interface.py:506
+#: gajim/gui_interface.py:495
 msgid "Certificate Passphrase Required"
 msgstr "Sertifikat-passord kreves"
 
-#: gajim/gui_interface.py:507
+#: gajim/gui_interface.py:496
 #, python-format
 msgid "Enter the certificate passphrase for account %s"
 msgstr "Skriv in sertifikatspassordet for kontoen %s"
 
-#: gajim/gui_interface.py:516 gajim/gtk/accounts.py:963
+#: gajim/gui_interface.py:505 gajim/gtk/accounts.py:966
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Skriv inn passord for kontoen %s"
 
-#: gajim/gui_interface.py:529 gajim/gtk/accounts.py:964
+#: gajim/gui_interface.py:518
+msgid "Password Required"
+msgstr "Passord påkrevd"
+
+#: gajim/gui_interface.py:518 gajim/gtk/accounts.py:967
 msgid "Save password"
 msgstr "Lagre passord"
 
-#: gajim/gui_interface.py:601 gajim/gui_interface.py:632
+#: gajim/gui_interface.py:587 gajim/gui_interface.py:618
+#: gajim/gtk/filetransfer.py:332 gajim/gtk/filetransfer.py:333
 #: gajim/gtk/notification.py:173 gajim/gtk/notification.py:276
 msgid "File Transfer Error"
 msgstr "Filoverføring feilet"
 
-#: gajim/gui_interface.py:666
+#: gajim/gui_interface.py:652
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s ønsker å sende deg ei fil."
 
-#: gajim/gui_interface.py:668 gajim/gtk/filetransfer.py:479
+#: gajim/gui_interface.py:654 gajim/gtk/filetransfer.py:484
 #: gajim/gtk/notification.py:172 gajim/gtk/notification.py:274
 msgid "File Transfer Request"
 msgstr "Filoverføringsforespørsel"
 
-#: gajim/gui_interface.py:767
+#: gajim/gui_interface.py:753
 #, fuzzy
 msgid "Remote Contact Stopped Transfer"
 msgstr "Kontakten stoppet overføringen"
 
-#: gajim/gui_interface.py:772
+#: gajim/gui_interface.py:758
 #, fuzzy
 msgid "Error Opening File"
 msgstr "Feil under åpning av fil"
 
-#: gajim/gui_interface.py:782
+#: gajim/gui_interface.py:768
 #, fuzzy
 msgid "SSL Certificate Error"
 msgstr "Feil med SSL-sertifikat"
 
-#: gajim/gui_interface.py:795 gajim/gui_interface.py:826
-#: gajim/gui_interface.py:853 gajim/gtk/notification.py:174
+#: gajim/gui_interface.py:781 gajim/gui_interface.py:812
+#: gajim/gui_interface.py:839 gajim/gtk/notification.py:174
 #: gajim/gtk/notification.py:279
 msgid "File Transfer Stopped"
 msgstr "Filoverføring stoppet"
 
-#: gajim/gui_interface.py:799
+#: gajim/gui_interface.py:785
 msgid "File Transfer Failed"
 msgstr "Filoverføring mislyktes"
 
-#: gajim/gui_interface.py:822
+#: gajim/gui_interface.py:808
 #, python-format
 msgid "%(filename)s received from %(name)s."
 msgstr "%(filename)s mottatt fra %(name)s."
 
-#: gajim/gui_interface.py:827
+#: gajim/gui_interface.py:813
 #, 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:833
+#: gajim/gui_interface.py:819
 #, 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:848
+#: gajim/gui_interface.py:834
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Du har sendt %(filename)s til %(name)s."
 
-#: gajim/gui_interface.py:854
+#: gajim/gui_interface.py:840
 #, 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:860
+#: gajim/gui_interface.py:846
 #, 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:971
+#: gajim/gui_interface.py:957
 msgid "Username Conflict"
 msgstr "Brukernavn-konflikt"
 
-#: gajim/gui_interface.py:972
+#: gajim/gui_interface.py:958
 msgid "Please type a new username for your local account"
 msgstr "Skriv inn nytt brukernavn for din lokale konto"
 
-#: gajim/gui_interface.py:995
+#: gajim/gui_interface.py:981
 msgid "Resource Conflict"
 msgstr "Ressurskonflikt"
 
-#: gajim/gui_interface.py:996
+#: gajim/gui_interface.py:982
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
 msgstr ""
 "Du er allerede tilkoblet denne kontoen med samme ressurs. Skriv in en ny en"
 
-#: gajim/gui_interface.py:1053
+#: gajim/gui_interface.py:1039
 #, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s ønsker å starte en lydsamtale."
 
-#: gajim/gui_interface.py:1055
+#: gajim/gui_interface.py:1041
 msgid "Voice Chat Request"
 msgstr "Forespørsel om lydsamtale"
 
-#: gajim/gui_interface.py:1123 gajim/gtk/account_wizard.py:312
+#: gajim/gui_interface.py:1109 gajim/gtk/account_wizard.py:312
 msgid "Certificate Already in File"
 msgstr "Sertifikatet finnes allerede i fila"
 
-#: gajim/gui_interface.py:1124 gajim/gtk/account_wizard.py:313
+#: gajim/gui_interface.py:1110 gajim/gtk/account_wizard.py:313
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr ""
 "Dette sertifikatet er allerede i fila %s, så det legges ikke til igjen."
 
-#: gajim/gui_interface.py:1145
+#: gajim/gui_interface.py:1131
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid"
 msgstr "Gyldigheten til %s-sertifikatet kan være ugyldig"
 
-#: gajim/gui_interface.py:1148
+#: gajim/gui_interface.py:1134
 #, python-format
 msgid ""
 "\n"
@@ -2115,7 +2109,7 @@ msgstr ""
 "\n"
 "Ukjent SSL-feil: %d"
 
-#: gajim/gui_interface.py:1150
+#: gajim/gui_interface.py:1136
 #, python-format
 msgid ""
 "\n"
@@ -2124,11 +2118,11 @@ msgstr ""
 "\n"
 "SSL-feil: <b>%s</b>"
 
-#: gajim/gui_interface.py:1155
+#: gajim/gui_interface.py:1141
 msgid "Error verifying SSL certificate"
 msgstr "Feil ved bekreftelse av SSL-sertifikat"
 
-#: gajim/gui_interface.py:1156
+#: gajim/gui_interface.py:1142
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your XMPP server: "
@@ -2139,7 +2133,7 @@ msgstr ""
 "%(error)s\n"
 "Ønsker du fortsatt å koble til denne tjeneren?"
 
-#: gajim/gui_interface.py:1160 gajim/gtk/account_wizard.py:412
+#: gajim/gui_interface.py:1146 gajim/gtk/account_wizard.py:413
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -2154,165 +2148,156 @@ msgstr ""
 "SHA-256 -fingeravtrykk av sertifikatet:\n"
 "%(sha256)s"
 
-#: gajim/gui_interface.py:1166
+#: gajim/gui_interface.py:1152
 msgid "Ignore this error for this certificate."
 msgstr "Se bort fra denne feilen for dette sertifikatet."
 
-#: gajim/gui_interface.py:1174
+#: gajim/gui_interface.py:1160
 #, python-format
 msgid "SSL Certificate Verification for %s"
 msgstr "Bekreftelse av SSL-sertifikat for %s"
 
-#: gajim/gui_interface.py:1442 gajim/gtk/join_groupchat.py:235
-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/gui_interface.py:1448
-msgid "JID is not a Groupchat"
-msgstr "JID-en er ikke en gruppesludring"
-
-#: gajim/gui_interface.py:1579
-msgid "This is not a group chat"
-msgstr "Dette er ikke en samtalegruppe"
-
-#: gajim/gui_interface.py:1580
-#, python-format
-msgid ""
-"%(room_jid)s is already in your roster. Please check if %(room_jid)s is a "
-"correct group chat name. If it is, delete it from your roster and try "
-"joining the group chat again."
-msgstr ""
-"%(room_jid)s er allerede i kontaktlisten din. Sjekk at %(room_jid)s er et "
-"korrekt gruppesludringsnavn. Hvis det er det, slett det fra listen og prøv å "
-"ta del i gruppesludringen igjen."
-
-#: gajim/gui_interface.py:1604 gajim/dialog_messages.py:58
+#: gajim/gui_interface.py:1577
 msgid "You cannot join a group chat while you are invisible"
 msgstr "Du kan ikke ta del i en gruppesamtale når du er usynlig"
 
-#: gajim/gui_interface.py:2037
+#: gajim/gui_interface.py:1976
 msgid "Could not save your settings and preferences"
 msgstr "Kunne ikke lagre innstillinger"
 
-#: gajim/gui_interface.py:2098
+#: gajim/gui_interface.py:2037
 msgid "Gajim: IPython Console"
 msgstr ""
 
-#: gajim/dialog_messages.py:32
-msgid "You can not start a new conversation unless you are connected."
-msgstr "Du kan ikke starte en ny samtale uten å være tilkoblet."
-
-#: gajim/dialog_messages.py:36 gajim/dialog_messages.py:41
-#: gajim/gtk/single_message.py:305 gajim/gtk/join_groupchat.py:211
-#: gajim/gtk/account_wizard.py:229
-msgid "Invalid JID"
-msgstr "Ugyldig JID"
+#: gajim/dialog_messages.py:31 gajim/dialog_messages.py:36
+#: gajim/gtk/single_message.py:305 gajim/gtk/account_wizard.py:229
+#, fuzzy
+msgid "Invalid XMPP Address"
+msgstr "Ugyldig fil"
 
-#: gajim/dialog_messages.py:42 gajim/gtk/single_message.py:306
-#, python-format
-msgid "It is not possible to send a message to %s, this JID is not valid."
+#: gajim/dialog_messages.py:37
+#, 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/dialog_messages.py:47
-msgid "Unread events"
+#: gajim/dialog_messages.py:42
+#, fuzzy
+msgid "Unread Events"
 msgstr "Uleste hendelser"
 
-#: gajim/dialog_messages.py:48
-msgid "Read all pending events before removing this account."
+#: gajim/dialog_messages.py:43
+#, fuzzy
+msgid "Read or acknowledge all pending events before removing this account."
 msgstr "Les alle ventende meldinger før du fjerner denne kontoen."
 
-#: gajim/dialog_messages.py:52
+#: gajim/dialog_messages.py:48
 msgid "Invalid Form"
 msgstr "Ugyldig skjema"
 
-#: gajim/dialog_messages.py:53
+#: gajim/dialog_messages.py:49
 msgid "The form is not filled correctly."
 msgstr "Skjemaet ble ikke fylt ut rett."
 
-#: gajim/dialog_messages.py:57 gajim/common/helpers.py:309
+#: gajim/dialog_messages.py:53 gajim/common/helpers.py:315
 msgid "Invisible"
 msgstr "Usynlig"
 
-#: gajim/dialog_messages.py:62
-msgid "A connection is not available"
+#: gajim/dialog_messages.py:54
+#, fuzzy
+msgid "You cannot join a group chat while being invisible."
+msgstr "Du kan ikke ta del i en gruppesamtale når du er usynlig"
+
+#: gajim/dialog_messages.py:58
+#, fuzzy
+msgid "No Connection Available"
 msgstr "Tilkobling ikke tilgjengelig"
 
-#: gajim/dialog_messages.py:63
+#: gajim/dialog_messages.py:59
 msgid "Your message can not be sent until you are connected."
 msgstr "Meldingen din kan ikke sendes før du er tilkoblet."
 
-#: gajim/dialog_messages.py:67
-msgid "JID already in list"
-msgstr "JID-en er allerede i listen"
+#: gajim/dialog_messages.py:63
+msgid "XMPP Address Already in List"
+msgstr ""
 
-#: gajim/dialog_messages.py:68
-msgid "The JID you entered is already in the list. Choose another one."
+#: gajim/dialog_messages.py:64
+#, fuzzy
+msgid ""
+"The XMPP Address you entered is already in the list. Please choose another "
+"one."
 msgstr "JID-en du skrev inn er allerede i listen. Velg en annen."
 
-#: gajim/dialog_messages.py:72
-msgid "Invalid answer"
+#: gajim/dialog_messages.py:69
+#, fuzzy
+msgid "Invalid Answer"
 msgstr "Ugyldig svar"
 
-#: gajim/dialog_messages.py:73
+#: gajim/dialog_messages.py:70
 #, python-format
 msgid "Transport %(name)s answered wrongly to register request: %(error)s"
 msgstr ""
 "Transporten %(name)s svarte feil på registreringsforespørselen: %(error)s"
 
-#: gajim/dialog_messages.py:78
+#: gajim/dialog_messages.py:75
 msgid "Wrong Custom Hostname"
 msgstr "Feil egendefinert vertsnavn"
 
-#: gajim/dialog_messages.py:79
-#, python-format
-msgid "Wrong custom hostname \"%s\". Ignoring it."
+#: gajim/dialog_messages.py:76
+#, fuzzy, python-format
+msgid "Custom hostname \"%s\" is wrong. It will be ignored."
 msgstr "Feil egendefinert vertsnavn \"%s\". Ignorerer."
 
-#: gajim/dialog_messages.py:83
-msgid "Error while removing privacy list"
+#: gajim/dialog_messages.py:80
+#, fuzzy
+msgid "Error While Removing Privacy List"
 msgstr "Feil ved fjerning av personvernsliste"
 
-#: gajim/dialog_messages.py:84
-#, python-format
+#: gajim/dialog_messages.py:81
+#, fuzzy, python-format
 msgid ""
-"Privacy list %s has not been removed. It is maybe active in one of your "
-"connected resources. Deactivate it and try again."
+"Privacy list %s has not been removed. It is probably active in one of your "
+"connected resources. Please deactivate it and try again."
 msgstr ""
 "Personvernslisten %s har ikke blitt fjernet. Den er kanskje i bruk i en av "
 "dine tilkoblede ressurser. Skru den av og prøv igjen."
 
-#: gajim/dialog_messages.py:90
-msgid "Invisibility not supported"
+#: gajim/dialog_messages.py:87
+#, fuzzy
+msgid "Invisibility Not Supported"
 msgstr "Usynlighet støttes ikke"
 
-#: gajim/dialog_messages.py:91
-#, python-format
-msgid "Account %s doesn't support invisibility."
+#: gajim/dialog_messages.py:88
+#, fuzzy, python-format
+msgid "This account %s doesn't support invisibility."
 msgstr "%s-kontoen støtter ikke usynlighet."
 
-#: gajim/dialog_messages.py:95
-msgid "Unregister failed"
+#: gajim/dialog_messages.py:92
+#, fuzzy
+msgid "Unregister Failed"
 msgstr "Avregistrering feilet"
 
-#: gajim/dialog_messages.py:96
-#, python-format
-msgid "Unregistration with server %(server)s failed: %(error)s"
+#: gajim/dialog_messages.py:93
+#, fuzzy, python-format
+msgid "Unregistration on server %(server)s failed: %(error)s"
 msgstr "Avregistrering med tjeneren %(server)s feilet: %(error)s"
 
-#: gajim/dialog_messages.py:100
-msgid "Registration succeeded"
+#: gajim/dialog_messages.py:97
+#, fuzzy
+msgid "Registration Succeeded"
 msgstr "Registrert"
 
-#: gajim/dialog_messages.py:101
-#, python-format
-msgid "Registration with agent %s succeeded"
+#: gajim/dialog_messages.py:98
+#, fuzzy, python-format
+msgid "Registration with agent %s succeeded."
 msgstr "Vellykket registrering med agenten %s"
 
-#: gajim/dialog_messages.py:105 gajim/gtk/service_registration.py:215
-msgid "Registration failed"
+#: gajim/dialog_messages.py:102
+#, fuzzy
+msgid "Registration Failed"
 msgstr "Registrering feilet"
 
-#: gajim/dialog_messages.py:106
+#: gajim/dialog_messages.py:103
 #, python-format
 msgid ""
 "Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
@@ -2320,16 +2305,17 @@ msgstr ""
 "Registrering med agenten %(agent)s feilet med meldingen %(error)s: "
 "%(error_msg)s"
 
-#: gajim/dialog_messages.py:111
+#: gajim/dialog_messages.py:108
 #, fuzzy
 msgid "Unable to Join Group Chat"
 msgstr "Klarte ikke å ta del i gruppesludring"
 
-#: gajim/dialog_messages.py:116
-msgid "GStreamer error"
+#: gajim/dialog_messages.py:113
+#, fuzzy
+msgid "GStreamer Error"
 msgstr "GStreamer-feil"
 
-#: gajim/dialog_messages.py:117
+#: gajim/dialog_messages.py:114
 #, python-format
 msgid ""
 "Error: %(error)s\n"
@@ -2338,19 +2324,21 @@ msgstr ""
 "Feil: %(error)s\n"
 "Feilretting: %(debug)s"
 
-#: gajim/dialog_messages.py:121
-msgid "Wrong host"
+#: gajim/dialog_messages.py:118
+#, fuzzy
+msgid "Wrong Host"
 msgstr "Feil maskinnavn"
 
-#: gajim/dialog_messages.py:122
+#: gajim/dialog_messages.py:119
 msgid "Invalid local address? :-O"
 msgstr "Ugyldig lokal adresse? :-O"
 
-#: gajim/dialog_messages.py:126
-msgid "Avahi error"
+#: gajim/dialog_messages.py:123
+#, fuzzy
+msgid "Avahi Error"
 msgstr "Avahi-feil"
 
-#: gajim/dialog_messages.py:127
+#: gajim/dialog_messages.py:124
 #, python-format
 msgid ""
 "%s\n"
@@ -2359,64 +2347,68 @@ msgstr ""
 "%s\n"
 "Link-lokal -meldinger fungerer muligens ikke riktig."
 
-#: gajim/dialog_messages.py:131 gajim/dialog_messages.py:136
-msgid "Could not request upload slot"
+#: gajim/dialog_messages.py:128 gajim/dialog_messages.py:133
+#, fuzzy
+msgid "Could not request upload slot for HTTP File Upload"
 msgstr "Kunne ikke forespørre opplastingsplass"
 
-#: gajim/dialog_messages.py:137
-msgid "Got unexpected response from server (see log)"
+#: gajim/dialog_messages.py:134
+#, fuzzy
+msgid "Got unexpected response from server (see log)."
 msgstr "Uventet svar fra tjener mottatt (sjekk loggføring)"
 
-#: gajim/dialog_messages.py:141 gajim/dialog_messages.py:146
-msgid "Could not open file"
+#: gajim/dialog_messages.py:138 gajim/dialog_messages.py:143
+#, fuzzy
+msgid "Could not Open File"
 msgstr "Kunne ikke åpne fil"
 
-#: gajim/dialog_messages.py:142
-msgid "Exception raised while opening file (see log)"
+#: gajim/dialog_messages.py:139
+#, fuzzy
+msgid "Exception raised while trying to open file (see log)."
 msgstr "Unntak oppsto under åpning av fil (sjekk loggføring)"
 
-#: gajim/dialog_messages.py:151
-msgid "Unsecure"
-msgstr "Usikker"
+#: gajim/dialog_messages.py:148
+#, fuzzy
+msgid "Not Secure"
+msgstr "Ikke startet"
 
-#: gajim/dialog_messages.py:152
+#: gajim/dialog_messages.py:149
 #, fuzzy
-msgid "Server returned unsecure transport (HTTP)"
+msgid "The server returned an insecure transport (HTTP)."
 msgstr "Tjenesten returnerte en usikker transport (HTTP)"
 
-#: gajim/dialog_messages.py:156
-msgid "Could not upload file"
+#: gajim/dialog_messages.py:153
+#, fuzzy
+msgid "Could not Upload File"
 msgstr "Kunne ikke laste opp fil"
 
-#: gajim/dialog_messages.py:157
+#: gajim/dialog_messages.py:154
 #, python-format
 msgid "HTTP response code from server: %s"
 msgstr "HTTP-svarkode fra tjener: %s"
 
-#: gajim/dialog_messages.py:161
+#: gajim/dialog_messages.py:158
 msgid "Upload Error"
 msgstr "Opplastingsfeil"
 
-#: gajim/dialog_messages.py:166
+#: gajim/dialog_messages.py:163
 msgid "Encryption Error"
 msgstr "Krypteringsfeil"
 
-#: gajim/dialog_messages.py:167
-#, fuzzy
-msgid "For the chosen encryption there is no encryption method available"
+#: gajim/dialog_messages.py:164
+msgid "There is no encryption method available for the chosen encryption."
 msgstr ""
-"For valgt kryptering finnes det ikke noen tilgjengelig krypteringsmetode"
 
-#: gajim/dialog_messages.py:171
+#: gajim/dialog_messages.py:169
 #, fuzzy
-msgid "Avatar upload failed"
+msgid "Avatar Upload Failed"
 msgstr "vCard-publisering mislyktes"
 
-#: gajim/privatechat_control.py:204
+#: gajim/privatechat_control.py:207
 msgid "Sending private message failed"
 msgstr "Forsendelse av privat melding mislyktes"
 
-#: gajim/privatechat_control.py:206
+#: gajim/privatechat_control.py:209
 #, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr ""
@@ -2440,7 +2432,8 @@ msgid "show help on command"
 msgstr "vis hjelp på kommando"
 
 #: gajim/gajim_remote.py:85
-msgid "Lists all contacts in roster, one for each line"
+#, fuzzy
+msgid "Lists all contacts in the contact list, one for each line"
 msgstr "Lister opp alle kontakter i kontaktliste, én på hver linje"
 
 #: gajim/gajim_remote.py:87 gajim/gajim_remote.py:102 gajim/gajim_remote.py:112
@@ -2514,11 +2507,13 @@ msgstr ""
 
 #: gajim/gajim_remote.py:118
 #, fuzzy
-msgid "Sends new chat message to a contact in the roster. Account is optional."
+msgid ""
+"Sends new chat message to a contact in the contact list. Account is optional."
 msgstr "Send en melding til kontakten som påkaller vedkommendes oppmerksomhet"
 
 #: gajim/gajim_remote.py:120 gajim/gajim_remote.py:130
-msgid "JID of the contact that will receive the message"
+#, fuzzy
+msgid "XMPP Address of the contact that will receive the message"
 msgstr "JID-en til kontakten som vil motta meldingen"
 
 #: gajim/gajim_remote.py:121 gajim/gajim_remote.py:132
@@ -2532,8 +2527,10 @@ msgid "if specified, the message will be sent using this account"
 msgstr "hvis oppgitt, vil meldingen bli sendt ved bruk av denne kontoen"
 
 #: gajim/gajim_remote.py:127
-msgid "Sends a chat message to someone on your roster. Account is optional."
-msgstr ""
+#, fuzzy
+msgid ""
+"Sends a chat message to someone on your contact list. Account is optional."
+msgstr "Send en melding til kontakten som påkaller vedkommendes oppmerksomhet"
 
 #: gajim/gajim_remote.py:131
 msgid "subject"
@@ -2544,11 +2541,13 @@ msgid "message subject"
 msgstr "meldingstema"
 
 #: gajim/gajim_remote.py:138
-msgid "Sends new message to a groupchat you've joined."
+#, fuzzy
+msgid "Sends new message to a group chat you've joined."
 msgstr "Sender en ny melding til en gruppesamtale du er i."
 
 #: gajim/gajim_remote.py:140
-msgid "JID of the room that will receive the message"
+#, fuzzy
+msgid "XMPP Address of the group chat that will receive the message"
 msgstr "JID-en til rommet som mottar meldingen"
 
 #: gajim/gajim_remote.py:147
@@ -2557,7 +2556,8 @@ msgstr "Henter detaljert info om en kontakt"
 
 #: gajim/gajim_remote.py:149 gajim/gajim_remote.py:162
 #: gajim/gajim_remote.py:192
-msgid "JID of the contact"
+#, fuzzy
+msgid "XMPP Address of the contact"
 msgstr "JID-en til kontakten"
 
 #: gajim/gajim_remote.py:153
@@ -2617,7 +2617,8 @@ msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Skriver nåværende tilstand for Gajim-egenskaper til .config-fila"
 
 #: gajim/gajim_remote.py:190
-msgid "Removes contact from roster"
+#, fuzzy
+msgid "Removes contact from contact list"
 msgstr "Fjerner kontakt fra kontaktliste"
 
 #: gajim/gajim_remote.py:193
@@ -2665,9 +2666,9 @@ msgid "Missing argument \"contact_jid\""
 msgstr "Mangler argumentet \"contact_jid\""
 
 #: gajim/gajim_remote.py:275
-#, python-format
+#, fuzzy, python-format
 msgid ""
-"'%s' is not in your roster.\n"
+"'%s' is not in your contact list.\n"
 "Please specify account for sending the message."
 msgstr ""
 "'%s' er ikke å finne på din kontaktliste.\n"
@@ -2892,12 +2893,12 @@ msgstr "Slutten av uka"
 msgid "Weekend!"
 msgstr "Helg!"
 
-#: gajim/common/logger.py:192 gajim/common/logger.py:197
+#: gajim/common/logger.py:189 gajim/common/logger.py:194
 #, 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:217
+#: gajim/common/logger.py:214
 #, fuzzy, python-format
 msgid "Creating %s"
 msgstr "Ødelegger %s"
@@ -2971,24 +2972,23 @@ msgstr "%(nickname)s logget ut"
 msgid "Contact Signed Out"
 msgstr "En kontakt logget ut"
 
-#: gajim/common/contacts.py:455
-msgid "Not in roster"
-msgstr "Ikke i kontaktliste"
-
 #: gajim/common/config.py:80
+#, fuzzy
 msgid ""
 "Show desktop notification even when a chat window is opened for this contact "
-"and does not have focus"
+"and does not have focus."
 msgstr ""
 "Vis skrivebordsmerknad selv når et sludrevindu åpnes for denne kontakten og "
 "ikke har fokus"
 
 #: gajim/common/config.py:81
-msgid "Play sound when user is busy"
+#, fuzzy
+msgid "Play sound even when being busy."
 msgstr "Lag lyd når brukeren er opptatt"
 
 #: gajim/common/config.py:83
-msgid "Show only online and free for chat contacts in roster."
+#, fuzzy
+msgid "Show only online and free for chat contacts in the contact list."
 msgstr "Vis bare tilkoblede og kontakter ledig for prat i kontaktlisten."
 
 #: gajim/common/config.py:86
@@ -2996,11 +2996,15 @@ msgid "Time in minutes, after which your status changes to away."
 msgstr "Tid i minutter før status endres til borte."
 
 #: gajim/common/config.py:87
-msgid "$S (Away as a result of being idle more than $T min)"
+#, fuzzy
+msgid "$S (Away: Idle more than $T min)"
 msgstr "$S (Borte på grunn av uvirksomhet i mer enn $T min)"
 
 #: gajim/common/config.py:87
-msgid "$S will be replaced by current status message, $T by autoawaytime."
+#, fuzzy
+msgid ""
+"$S will be replaced by current status message, $T by the 'autoawaytime' "
+"value."
 msgstr ""
 "$S vil bli erstattet av gjeldende statusmelding, $T av automatisk borte-tid."
 
@@ -3009,65 +3013,80 @@ msgid "Time in minutes, after which your status changes to not available."
 msgstr "Tid i minutter før status endres til 'Ikke tilgjengelig'."
 
 #: gajim/common/config.py:90
-msgid "$S (Not available as a result of being idle more than $T min)"
+#, fuzzy
+msgid "$S (Not available: Idle more than $T min)"
 msgstr "$S (Ikke tilgjengelig på grunn av uvirksomhet i mer enn $T min)"
 
 #: gajim/common/config.py:90
-msgid "$S will be replaced by current status message, $T by autoxatime."
+#, fuzzy
+msgid ""
+"$S will be replaced by current status message, $T by the 'autoxatime' value."
 msgstr "$S vil erstattes av gjeldende statusmelding, $T av lengre tids fravær."
 
 #: gajim/common/config.py:93
+#, fuzzy
 msgid ""
-"When to show notification area icon. Can be 'never', 'on_event', 'always'."
+"When to show the notification area icon. Can be 'never', 'on_event', and "
+"'always'."
 msgstr ""
 "Når skal merknad i merknadsfelt vises. Kan være 'aldri', 'ved_hendelse', "
 "'alltid'."
 
 #: gajim/common/config.py:94
-msgid "Allow to hide the roster window even if the tray icon is not shown."
+#, fuzzy
+msgid ""
+"Allow to hide the contact list window even if the notification area icon is "
+"not shown."
 msgstr ""
 "Tillat skjuling av kontaktvindu selv når systemkurv-miniatyrbildet ikke "
 "vises."
 
 #: gajim/common/config.py:97
-msgid "Contact signed in notification color."
-msgstr "Merknadsfarge for kontaktinnlogging."
+#, fuzzy
+msgid "Notification color for contacts signing in."
+msgstr "Varsle meg om kontakter som logger _inn"
 
 #: gajim/common/config.py:98
-msgid "Contact signout notification color"
-msgstr "Merknadsfarge for kontaktavlogging"
+#, fuzzy
+msgid "Notification color for contacts signing out."
+msgstr "Varsle meg om kontakter som logger _ut"
 
 #: gajim/common/config.py:99
-msgid "New message notification color."
+#, fuzzy
+msgid "Notification color for new message notification."
 msgstr "Ny meldingsmerknadsfarge."
 
 #: gajim/common/config.py:100
-msgid "File transfer request notification color."
-msgstr "Merknadsfarge for filoverføringsforespørsler."
+#, fuzzy
+msgid "Notification color for file transfer request."
+msgstr "_Gi meg beskjed når ei filoverføring er fullført"
 
 #: gajim/common/config.py:101
-msgid "File transfer error notification color."
-msgstr "Merknadsfarge for filoverføringsfeil."
+#, fuzzy
+msgid "Notification color for file transfer errors."
+msgstr "_Gi meg beskjed når ei filoverføring er fullført"
 
 #: gajim/common/config.py:102
-msgid "File transfer complete or stopped notification color."
-msgstr "Merknadsfarge når overføring fullføres eller stoppes."
+msgid "Notification color for stopped or completed file transfers."
+msgstr ""
 
 #: gajim/common/config.py:103
-msgid "Groupchat invitation notification color"
-msgstr "Merknadsfarge for invitasjon til gruppesamtale"
+msgid "Notification color for group chat invitations."
+msgstr ""
 
 #: gajim/common/config.py:104
-msgid "Background color of status changed notification"
+#, fuzzy
+msgid "Notification background color for changed status."
 msgstr "Bakgrunnsfargen for kontakter når de akkurat har logget på"
 
 #: gajim/common/config.py:105
-msgid "Other dialogs color."
-msgstr "Farge for andre dialoger."
+msgid "Notification color for other dialogs."
+msgstr ""
 
 #: gajim/common/config.py:106
+#, fuzzy
 msgid ""
-"List (space separated) of rows (accounts and groups) that are collapsed."
+"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."
@@ -3076,8 +3095,10 @@ msgstr ""
 msgid "default"
 msgstr "forvalg"
 
-#: gajim/common/config.py:113
-msgid "Language used by speller"
+#: gajim/common/config.py:113 gajim/common/config.py:424
+#: gajim/common/config.py:431
+#, fuzzy
+msgid "Language used for spell checking."
 msgstr "Språk brukt av staveren"
 
 #: gajim/common/config.py:114
@@ -3091,10 +3112,11 @@ msgstr ""
 "'aldri' - aldri vis klokkeslett."
 
 #: gajim/common/config.py:115
+#, fuzzy
 msgid ""
 "Print time in chats using Fuzzy Clock. Value of fuzziness from 1 to 4, or 0 "
-"to disable fuzzyclock. 1 is the most precise clock, 4 the least precise one. "
-"This is used only if print_time is 'sometimes'."
+"to disable Fuzzy Clock. 1 is the most precise clock, 4 the least precise "
+"one. This is used only if 'print_time' is 'sometimes'."
 msgstr ""
 "Skriv klokkeslett i samtaler med fuzzyclock. Verdien av fuzziness oppgis fra "
 "1 til 4, eller 0 for å skru av fuzzyclock. 1 er den mest presise klokken, 4 "
@@ -3111,16 +3133,18 @@ msgstr "Behandle * / _-par som mulig inndeling av formateringstegn."
 #: gajim/common/config.py:120
 #, fuzzy
 msgid ""
-"If true, do not remove */_ . So *abc* will be bold but with * * not removed."
+"If enabled, do not remove */_ . So *abc* will be bold but with * * not "
+"removed."
 msgstr ""
 "Dersom sant, ikke fjern */_ . Slik at *abc* vil bli uthevet men * * ikke "
 "fjernet."
 
 #: gajim/common/config.py:123
+#, fuzzy
 msgid ""
-"Uses ReStructured text markup to send HTML, plus ascii formatting if "
-"selected. For syntax, see http://docutils.sourceforge.net/docs/ref/rst/"
-"restructuredtext.html (If you want to use this, install docutils)"
+"Uses ReStructured text markup to send HTML, plus ASCII formatting if "
+"selected. Needs docutils installed (for syntax, see http://docutils."
+"sourceforge.net/docs/ref/rst/restructuredtext.html)."
 msgstr ""
 "Bruker ReStrukturert tekstoppmerking for å sende HTML, samt ASCII-"
 "formatering, dersom valgt. For syntaks, se http://docutils.sourceforge.net/"
@@ -3128,17 +3152,19 @@ msgstr ""
 "installere docutils)"
 
 #: gajim/common/config.py:132
+#, fuzzy
 msgid ""
-"Character to add after nickname when using nick completion (tab) in group "
-"chat."
+"Character to add after nickname when using nickname completion (tab) in "
+"group chat."
 msgstr ""
 "Tegn å legge til etter kallenavn ved bruk av kallenavns-fullføring (tab) i "
 "gruppesamtaler."
 
 #: gajim/common/config.py:133
+#, fuzzy
 msgid ""
-"Character to propose to add after desired nickname when desired nickname is "
-"used by someone else in group chat."
+"Character to propose to add after desired nickname when nickname is already "
+"used in group chat."
 msgstr ""
 "Tegnforslag å legge til etter ønsket kallenavn når det ønskede kallenavnet "
 "brukes av noen andre i samtalegruppen."
@@ -3146,22 +3172,24 @@ msgstr ""
 #: gajim/common/config.py:155
 #, fuzzy
 msgid ""
-"If true, Gajim will save roster position when hiding roster, and restore it "
-"when showing roster."
+"If enabled, Gajim will save the contact list window position when hiding it, "
+"and restore it when showing the contact list window again."
 msgstr ""
 "Hvis sant vil Gajim lagre kontaktlisteposisjon når den blir skjult, og "
 "gjennoprette den når den vises."
 
 #: gajim/common/config.py:161
-msgid "Place the roster on the right in single window mode"
+#, 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:167
 #, fuzzy
 msgid ""
-"This option let you customize timestamp that is printed in conversation. For "
-"example \"[%H:%M] \" will show \"[hour:minute] \". See python doc on "
-"strftime for full documentation: http://docs.python.org/lib/module-time.html"
+"This option lets you customize the timestamp that is printed in "
+"conversation. For example '[%H:%M] ' will show '[hour:minute] '. See python "
+"doc on strftime for full documentation (https://docs.python.org/3/library/"
+"time.html)."
 msgstr ""
 "Dette valget lar deg endre tidsformatet som stemples i samtaler. For "
 "eksempel \"[%H:%M] \" vil vise \"[time:minutt] \". Se python-dokumentasjon "
@@ -3169,271 +3197,278 @@ msgstr ""
 "module-time.html"
 
 #: gajim/common/config.py:168
-msgid "Characters that are printed before the nickname in conversations"
+#, fuzzy
+msgid "Characters that are printed before the nickname in conversations."
 msgstr "Tegn som skrives før kallenavnet i samtaler"
 
 #: gajim/common/config.py:169
-msgid "Characters that are printed after the nickname in conversations"
+#, fuzzy
+msgid "Characters that are printed after the nickname in conversations."
 msgstr "Tegn som skrives etter kallenavnet i samtaler"
 
 #: gajim/common/config.py:170
-msgid "Add * and [n] in roster title?"
-msgstr "Legg til * og [n] i kontaktlistens tittel?"
+#, 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:171
+#, fuzzy
 msgid ""
-"How many history messages should be restored when a chat tab/window is "
-"reopened?"
+"Number of messages from chat history to be restored when a chat tab/window "
+"is reopened."
 msgstr ""
 "Hvor mange meldinger skal gjenopprettes fra historikk når en samtale "
 "gjenåpnes?"
 
 #: gajim/common/config.py:172
-msgid "How far back in time (minutes) history is restored. -1 means no limit."
+#, fuzzy
+msgid ""
+"How far back in time (minutes) chat history is restored. -1 means no limit."
 msgstr ""
 "Hvor langt tilbake (i minutter) historikk skal gjenopprettes. -1 betyr ingen "
 "grense."
 
 #: gajim/common/config.py:173
+#, fuzzy
 msgid ""
-"How many lines to request from server when entering a groupchat. -1 means no "
-"limit"
-msgstr ""
-"Hvor mange linjer skal etterspørres når man går inn i en gruppesamtale. -1 "
-"betyr ingen øvre grense"
-
-#: gajim/common/config.py:174
-msgid ""
-"Minutes of backlog to request when entering a groupchat. -1 means no limit"
-msgstr ""
-"Hvor mange minutter med logg skal forespørres ved inntreden i "
-"gruppesludring. -1 betyr ingen grense"
-
-#: gajim/common/config.py:175
-msgid ""
-"How many seconds to wait before trying to autorejoin to a conference you are "
-"being disconnected from. Set to 0 to disable autorejoining."
+"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 ""
 "Hvor mange sekunder skal man vente før automatisk ny tilkobling til en "
 "samtale som du har blitt koblet fra forsøkes. Sett til 0 for å skru av "
 "automatisk ny tilkobling."
 
-#: gajim/common/config.py:176
+#: gajim/common/config.py:174
 #, fuzzy
-msgid "Should autorejoin be activated when kicked from a conference?"
+msgid ""
+"Should automatic rejoin be activated when you were kicked from a group chat?"
 msgstr ""
 "Burde automatisk deltagelse bli påslått når du kastes ut av en konferanse?"
 
-#: gajim/common/config.py:177
-msgid ""
-"Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
-"Client default behaviour)."
+#: gajim/common/config.py:175
+#, 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:179
-msgid "How many lines to store for Ctrl+KeyUP."
+#: gajim/common/config.py:177
+#, 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:182
+#: gajim/common/config.py:180
 #, fuzzy, python-format
 msgid ""
-"Either custom URL with %%s in it where %%s is the word/phrase or "
-"'WIKTIONARY' which means use Wikitionary."
+"Either a custom URL with %%s in it (where %%s is the word/phrase) or "
+"'WIKTIONARY' (which means use Wikitionary)."
 msgstr ""
 "Enten bruk egendefinert nettadresse med %s i seg, hvor %s er ordet/frasen "
 "eller 'WIKTIONARY' som betyr bruk Wiktionary."
 
-#: gajim/common/config.py:185
+#: gajim/common/config.py:183
 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:187
+#: gajim/common/config.py:185
+#, fuzzy
 msgid ""
-"When not printing time for every message (print_time==sometimes), print it "
+"When not printing time for every message ('print_time'==sometimes), print it "
 "every x minutes."
 msgstr ""
 "Når man ikke viser klokkeslett for hver melding (print_time==av-og-til), vis "
 "det hvert x minutt."
 
-#: gajim/common/config.py:188
+#: gajim/common/config.py:186
 msgid "Ask before pasting an image."
 msgstr ""
 
-#: gajim/common/config.py:189
+#: gajim/common/config.py:187
 msgid "Ask before closing a group chat tab/window."
 msgstr "Spør før lukking av gruppesamtale fane/vindu."
 
-#: gajim/common/config.py:190
+#: gajim/common/config.py:188
+#, fuzzy
 msgid ""
-"Always ask for confirmation before closing groupchats with any of the JIDs "
-"on this space separated list."
+"Always ask for confirmation before closing group chats with any of the XMPP "
+"Addresses on this list (space separated)."
 msgstr ""
 "Alltid spør om bekreftelse før gruppesludringer med noen av JID-ene på denne "
 "mellomromsinndelte listen lukkes."
 
-#: gajim/common/config.py:191
+#: gajim/common/config.py:189
+#, fuzzy
 msgid ""
-"Never ask for confirmation before closing groupchats with any of the JIDs on "
-"this space separated list."
+"Never ask for confirmation before closing group chats with any of the XMPP "
+"Addresses on this list (space separated)."
 msgstr ""
 "Aldri spør om bekreftelse før gruppesludringer med noen av JID-ene på denne "
 "mellomromsinndelte listen lukkes."
 
-#: gajim/common/config.py:192
+#: gajim/common/config.py:190
+#, fuzzy
 msgid ""
-"Ask before closing tabbed chat window if there are controls that can lose "
-"data (chat, private chat, groupchat that will not be minimized)"
+"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 ""
 "Spør før samtalefaner lukkes hvis data kan gå tapt (samtaler, private "
 "samtaler, gruppesamtaler som ikke minimeres)"
 
-#: gajim/common/config.py:195
+#: gajim/common/config.py:193
 #, fuzzy
 msgid ""
-"Comma separated list of sent hosts, in addition of local interfaces, for "
-"File Transfer in case of address translation/port forwarding."
+"List of send hosts (comma separated) in addition to local interfaces for "
+"file transfers (in case of address translation/port forwarding)."
 msgstr ""
 "Komma-inndelt liste over maskiner som vi sender, i tillegg til lokale "
 "grensesnitt, for filoverføring i tilfelle adresseoversetting/port-"
 "videresending."
 
-#: gajim/common/config.py:196
+#: gajim/common/config.py:194
 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:198
+#: gajim/common/config.py:196
 msgid "Notify of events in the notification area."
 msgstr "Varsle om hendelser i system-statusfeltområdet."
 
-#: gajim/common/config.py:199
+#: gajim/common/config.py:197
+#, fuzzy
 msgid ""
-"If False, Gajim will display a static event icon instead of the blinking "
-"status icon in the notification area when notifying on event."
+"If disabled, Gajim will display a static event icon instead of the blinking "
+"status icon in the notification area when notifying about an event."
 msgstr ""
 "Hvis usant, vil Gajim vise et satisk hendelsesminiatyrbilde, i steden for "
 "blinkende status i merknadsområdet når det blir gjort oppmerksom på en "
 "hendelse."
 
-#: gajim/common/config.py:205
+#: gajim/common/config.py:203
 msgid "Show tab when only one conversation?"
 msgstr "Vis fane når du har bare én samtale?"
 
-#: gajim/common/config.py:206
+#: gajim/common/config.py:204
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "Vis fanet notatblokk i samtalevinduer?"
 
-#: gajim/common/config.py:207
+#: gajim/common/config.py:205
 msgid "Show close button in tab?"
 msgstr "Vis lukkingsknapp på fanen?"
 
-#: gajim/common/config.py:220
+#: gajim/common/config.py:218
 msgid "Preview new messages in notification popup?"
 msgstr "Forhåndsvis nye meldinger i oppsprettsvindu?"
 
-#: gajim/common/config.py:223
+#: gajim/common/config.py:221
+#, fuzzy
 msgid ""
-"A semicolon-separated list of words that will be highlighted in group chats."
+"A list of words (semicolon separated) that will be highlighted in group "
+"chats."
 msgstr ""
 "En semikoloninndelt liste over ord som vil bli uthevet i gruppesamtaler."
 
-#: gajim/common/config.py:224
+#: gajim/common/config.py:222
 #, fuzzy
 msgid ""
-"If true, quits Gajim when X button of Window Manager is clicked. This "
-"setting is taken into account only if notification icon is used."
+"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 ""
 "Dersom sant vil Gajim avslutte når X-knappen i vindusbehandleren blir "
 "trykket. Det blir kun tatt hensyn til dette dersom systemstatus-"
 "miniatyrbilde er i bruk."
 
-#: gajim/common/config.py:225
+#: gajim/common/config.py:223
 #, fuzzy
 msgid ""
-"If true, Gajim hides the Roster window on pressing the X button instead of "
-"minimizing into the Dock."
+"If enabled, Gajim hides the contact list window when pressing the X button "
+"instead of minimizing into the notification area."
 msgstr ""
 "Skjuler kontaktlistevinduet i Gajim ved å trykke på X-knappen istedenfor "
 "minimering til dokken."
 
-#: gajim/common/config.py:226
+#: gajim/common/config.py:224
 #, fuzzy
 msgid ""
-"If true, Gajim will display an icon on each tab containing unread messages. "
-"Depending on the theme, this icon may be animated."
+"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:227
+#: gajim/common/config.py:225
 #, fuzzy
 msgid ""
-"If true, Gajim will display the status message, if not empty, for every "
-"contact under the contact name in roster window."
+"If enabled, Gajim will display the status message (if not empty) underneath "
+"the contact name in the contact list window."
 msgstr ""
 "Hvis sant vil Gajim vise statusmeldingen, om den ikke er tom, for hver "
 "kontakt under kontaktens navn i kontaktlistevinduet."
 
-#: gajim/common/config.py:233
-msgid "Define the position of the avatar in roster. Can be left or right"
+#: gajim/common/config.py:231
+#, fuzzy
+msgid ""
+"Define the position of avatars in the contact list. Can be 'left' or 'right'."
 msgstr ""
 "Bestemmer posisjon for avataren i kontaktlisten. Kan være til venste eller "
 "høyre"
 
-#: gajim/common/config.py:234
+#: gajim/common/config.py:232
 #, fuzzy
 msgid ""
-"If False, Gajim will no longer print status line in chats when a contact "
-"changes their status and/or their status message."
+"If disabled, Gajim will no longer print status messages in chats when a "
+"contact changes their status (and/or their status message)."
 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:235
+#: gajim/common/config.py:233
 #, fuzzy
 msgid ""
 "Default Setting: Show a status message for every join or leave in a group "
-"chat"
+"chat."
 msgstr "Kunne ikke ta del i gruppesamtale"
 
-#: gajim/common/config.py:236
+#: gajim/common/config.py:234
+#, fuzzy
 msgid ""
-"Default Setting: Show a status message for all status (away, dnd, etc.) "
-"changes of users in a group chat"
-msgstr ""
+"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:238
-msgid "Log XHTML messages instead of plain text messages."
+#: gajim/common/config.py:236
+#, fuzzy
+msgid "Store XHTML messages in chat history instead of plain text messages."
 msgstr "Loggfør XHTML-meldinger isteden for klartekst-meldinger."
 
-#: gajim/common/config.py:239
+#: gajim/common/config.py:237
 msgid "Don't show avatar for the transport itself."
 msgstr "Ikke vis avatar for selve transporten."
 
-#: gajim/common/config.py:240
-msgid "Don't show roster in the system taskbar."
+#: gajim/common/config.py:238
+#, fuzzy
+msgid "Don't show contact list window in the system taskbar."
 msgstr "Ikke vis kontaktlisten i systemstatus-feltet."
 
-#: gajim/common/config.py:241
+#: gajim/common/config.py:239
 #, fuzzy
 msgid ""
-"If true, make the window flash (the default behaviour in most Window "
-"Managers) when holding pending events."
+"If enabled, Gajim makes the window flash (the default behaviour in most "
+"Window Managers) when holding pending events."
 msgstr ""
 "Hvis sant og de installerte GTK+ og PyGTK-versjonene er minst 2.8, vil "
 "vindusbehandleren blinke (vanlig oppførsel i de fleste vindusbehandlere) når "
 "det er hendelser på vent."
 
-#: gajim/common/config.py:245
+#: gajim/common/config.py:243
+#, fuzzy
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
 "'always_with_roster' - Like 'always' but the messages are in a single window "
-"along with the roster.\n"
+"along with the contact list.\n"
 "'never' - All messages get their own window.\n"
 "'peracct' - Messages for each account are sent to a specific window.\n"
-"'pertype' - Each message type (e.g. chats vs. groupchats) is sent to a "
+"'pertype' - Each message type (e.g. chats vs. group chats) is sent to a "
 "specific window."
 msgstr ""
 "Kontrollerer vinduet der nye meldinger plasseres.\n"
@@ -3445,283 +3480,313 @@ msgstr ""
 "'pertype' - Hver meldingstype (f.eks. sludreøkter, men ikke "
 "gruppesludringsøkter) blir sendt til et spesifikt vindu."
 
-#: gajim/common/config.py:246
+#: gajim/common/config.py:244
+#, fuzzy
 msgid ""
-"Show roster on startup.\n"
-"'always' - Always show roster.\n"
-"'never' - Never show roster.\n"
-"'last_state' - Restore the last state roster."
+"Show contact list window on startup.\n"
+"'always' - Always show contact list window.\n"
+"'never' - Never show contact list window.\n"
+"'last_state' - Restore last state of the contact list window."
 msgstr ""
 "Vis kontaktliste ved oppstart.\n"
 "'alltid' - Aldri vis kontaktliste.\n"
 "'aldri' - Never show roster.\n"
 "'siste_tilstand' - Gjenopprett kontaktlisten i siste tilstand."
 
-#: gajim/common/config.py:247
-msgid "If False, you will no longer see the avatar in the chat window."
+#: gajim/common/config.py:245
+#, 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:248
+#: gajim/common/config.py:246
 #, fuzzy
-msgid "If true, pressing the escape key closes a tab/window."
+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:249
-msgid "Hides the banner in a group chat window"
+#: gajim/common/config.py:247
+#, fuzzy
+msgid "Hides the banner in a group chat window."
 msgstr "Gjemmer tittelbanneret i gruppesamtalevinduer"
 
-#: gajim/common/config.py:250
-msgid "Hides the banner in two persons chat window"
-msgstr "Gjemmer tittelbanneret i samtalevindu mellom to parter"
+#: gajim/common/config.py:248
+#, fuzzy
+msgid "Hides the banner in a 1:1 chat window."
+msgstr "Gjemmer tittelbanneret i gruppesamtalevinduer"
 
-#: gajim/common/config.py:251
-msgid "Hides the group chat occupants list in group chat window."
+#: gajim/common/config.py:249
+#, fuzzy
+msgid "Hides the group chat participants list in a group chat window."
 msgstr "Gjemmer rommets deltagerliste i gruppesamtalevinduet."
 
-#: gajim/common/config.py:252
+#: gajim/common/config.py:250
+#, fuzzy
 msgid ""
 "In a chat, show the nickname at the beginning of a line only when it's not "
-"the same person talking than in previous message."
+"the same person talking as in the previous message."
 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:253
+#: gajim/common/config.py:251
 msgid "Indentation when using merge consecutive nickname."
 msgstr "Innrykk når man bruker sammenslåing av påfallende kallenavn."
 
-#: gajim/common/config.py:254
-msgid "Ctrl-Tab go to next composing tab when none is unread."
+#: gajim/common/config.py:252
+#, 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:255
+#: gajim/common/config.py:253
 #, fuzzy
 msgid ""
-"Show the confirm metacontacts creation dialog or not? Empty string means "
-"never show the dialog."
+"Show a confirmation dialog to create metacontacts? Empty string means never "
+"show the dialog."
 msgstr ""
-"Skal bekreftelse av metakontaktopprettings-dialog vises eller ei? Tomt "
-"innhold betyr at dialogen aldri vises."
+"Skal bekreftelse av kontaktblokkering vises eller ei? Tomt innhold betyr at "
+"dialogen aldri vises."
 
-#: gajim/common/config.py:256
+#: gajim/common/config.py:254
 #, fuzzy
 msgid ""
-"Show the confirm block contact dialog or not? Empty string means never show "
+"Show a confirmation dialog to block a contact? Empty string means never show "
 "the dialog."
 msgstr ""
 "Skal bekreftelse av kontaktblokkering vises eller ei? Tomt innhold betyr at "
 "dialogen aldri vises."
 
-#: gajim/common/config.py:257
+#: gajim/common/config.py:255
 #, fuzzy
 msgid ""
-"Show the confirm custom status dialog or not? Empty string means never show "
-"the dialog."
+"Show a confirmation dialog for a custom status? Empty string means never "
+"show the dialog."
 msgstr ""
 "Skal bekreftelse av egendefinert status -dialog vises eller ei? Tomt innhold "
 "betyr at dialogen aldri vises."
 
-#: gajim/common/config.py:258
+#: gajim/common/config.py:256
 #, fuzzy
 msgid ""
-"If true, you will be able to set a negative priority to your account in "
-"account modification window. BE CAREFUL, when you are logged in with a "
-"negative priority, you will NOT receive any message from your server."
+"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 ""
 "Hvis sant vil du kunne sette negativ prioritet for din konto i "
 "kontoinnstillingene. VÆR FORSIKTIG, når du er logget inn med en negativ "
 "prioritet vil du ikke motta noen meldinger fra din tjener."
 
-#: gajim/common/config.py:259
+#: gajim/common/config.py:257
 #, fuzzy
 msgid ""
-"If true, Gajim will show number of online and total contacts in account and "
-"group rows."
+"If enabled, Gajim will show both the number of online and total contacts in "
+"account rows as well as in group rows."
 msgstr ""
 "Hvis sant vil Gajim vise antall tilgjengelige og totalt antall kontakter og "
 "grupperader."
 
-#: gajim/common/config.py:260
+#: gajim/common/config.py:258
+#, fuzzy
 msgid ""
-"Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
-"as if they were of this type"
+"Can be empty, 'chat' or 'normal'. If not empty, all incoming messages are "
+"treated as if they were of this type."
 msgstr ""
 "Kan være tom, 'samtale' eller 'normal'. Dersom den ikke er tom, behandles "
 "alle innkommende meldinger som om de var av denne typen."
 
-#: gajim/common/config.py:261
+#: gajim/common/config.py:259
 #, fuzzy
 msgid ""
-"If true, Gajim will scroll and select the contact who sent you the last "
-"message, if chat window is not already opened."
+"If enabled, Gajim will scroll and select the contact who sent you the last "
+"message, if the chat window is not already opened."
 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:262
+#: gajim/common/config.py:260
 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:263
+#: gajim/common/config.py:261
 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:264
+#: gajim/common/config.py:262
 #, fuzzy
 msgid ""
-"If true, notification windows from notification-daemon will be attached to "
-"notification icon."
+"If enabled, notification windows from notification-daemon will be attached "
+"to the notification area icon."
 msgstr ""
 "Hvis sant vil kunngjøringsvinduer fra merknads-nissen bli festet til "
 "miniatyrbildet i systemkurven."
 
-#: gajim/common/config.py:265
+#: gajim/common/config.py:263
 msgid "Choose interval between 2 checks of idleness."
 msgstr "Velg intervall mellom to uvirksomhetssjekker."
 
-#: gajim/common/config.py:266
+#: gajim/common/config.py:264
+#, fuzzy
 msgid ""
-"Valid uri schemes. Only schemes in this list will be accepted as \"real\" "
-"uri. (mailto and xmpp are handled separately)"
+"Valid URI schemes. Only schemes in this list will be accepted as 'real' URI "
+"(mailto and xmpp are handled separately)."
 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:267
+#: gajim/common/config.py:265
 #, fuzzy
-msgid "If true, completion in groupchats will be like a shell auto-completion"
+msgid ""
+"If enabled, completion in group chats will be like a shell auto-completion."
 msgstr ""
 "Hvis sant vil komplettering i samtalerom gjøres slik som i skallbasert "
 "variant"
 
-#: gajim/common/config.py:272
-msgid "Optionally fix jingle output video framerate. Example: 10/1 or 25/2"
+#: gajim/common/config.py:270
+#, 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:273
-msgid "Optionally resize jingle output video. Example: 320x240"
+#: gajim/common/config.py:271
+#, fuzzy
+msgid "Optionally resize Jingle output video. Example: 320x240."
 msgstr ""
 "Alternativ justering av oppløsning for utdata-video. Eksempelvis: 320x240"
 
-#: gajim/common/config.py:274
-#, fuzzy
-msgid "If true, You will also see your webcam"
-msgstr "Hvis sant, vil også du se ditt nettkamera"
+#: gajim/common/config.py:272
+msgid "If enabled, you will see your webcam's video stream as well."
+msgstr ""
 
-#: gajim/common/config.py:277
+#: gajim/common/config.py:275
 #, fuzzy
 msgid ""
-"If true, Gajim will try to use a STUN server when using Jingle. The one in "
-"\"stun_server\" option, or the one given by the XMPP server."
+"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 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:278
+#: gajim/common/config.py:276
 msgid "STUN server to use when using Jingle"
 msgstr "STUN-tjener til bruk med Jingle"
 
-#: gajim/common/config.py:279
+#: gajim/common/config.py:277
 #, fuzzy
 msgid ""
-"If true, Gajim will show affiliation of groupchat occupants by adding a "
-"colored square to the status icon"
+"If enabled, Gajim will show affiliation of group chat participants by adding "
+"a colored square to the status icon."
 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:280
+#: gajim/common/config.py:278
+#, fuzzy
 msgid ""
 "Proxy used for all outgoing connections if the account does not have a "
-"specific proxy configured"
+"specific proxy configured."
 msgstr ""
 "Mellomtjenere brukt for utgående tilkoblinger, hvis kontoen ikke har satt "
 "opp en spesifikk mellomtjener"
 
-#: gajim/common/config.py:281
+#: gajim/common/config.py:279
 #, fuzzy
-msgid "If true, Gajim will ignore incoming attention requests (\"wizz\")."
+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:282
+#: gajim/common/config.py:280
 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:283
+#: gajim/common/config.py:281
+#, fuzzy
 msgid ""
-"If enabled, Gajim will show an icon to show that sent message has been "
-"received by your contact"
+"If enabled, Gajim will display an icon to show that sent messages have been "
+"received by your contact."
 msgstr ""
 "Hvis valgt vil Gajim vise et ikon for å gjøre oppmerksom på at sendt melding "
 "har ankommet kontakt"
 
-#: gajim/common/config.py:284
-msgid "Show a mini avatar in chat window tabs and in window icon"
+#: gajim/common/config.py:282
+#, 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:285
+#: gajim/common/config.py:283
 #, fuzzy
-msgid "If true, Gajim will use the Systems Keyring to store account passwords."
+msgid ""
+"If enabled, Gajim will use the System's Keyring to store account passwords."
 msgstr ""
 "Dersom sant vil Gajim bruke Gnome-nøkkelringen (dersom tilgjengelig) til å "
 "lagre kontopassord."
 
-#: gajim/common/config.py:286
+#: gajim/common/config.py:284
 #, fuzzy
-msgid "If true, Gajim will execute XEP-0146 Commands."
+msgid "If enabled, Gajim will execute XEP-0146 Commands."
 msgstr "Kjøring av XEP-0146-kommandoer i Gajim."
 
-#: gajim/common/config.py:287
+#: gajim/common/config.py:285
 msgid "2: System, 1: Enabled, 0: Disabled"
 msgstr ""
 
-#: gajim/common/config.py:288
+#: gajim/common/config.py:286
 msgid "Options in days which can be chosen in the sync threshold menu"
 msgstr ""
 
-#: gajim/common/config.py:289
+#: gajim/common/config.py:287
 msgid ""
-"Maximum history in days we request from a public room archive. 0: As much as "
-"possible"
+"Maximum history in days we request from a public group chat archive. 0: As "
+"much as possible."
 msgstr ""
 
-#: gajim/common/config.py:290
+#: gajim/common/config.py:288
 msgid ""
-"Maximum history in days we request from a private room archive. 0: As much "
-"as possible"
+"Maximum history in days we request from a private group chat archive. 0: As "
+"much as possible."
 msgstr ""
 
-#: gajim/common/config.py:291
-msgid "If the room subject is shown in chat on join"
+#: gajim/common/config.py:289
+msgid ""
+"If enabled, Gajim shows the group chat subject in the chat window when "
+"joining."
 msgstr ""
 
-#: gajim/common/config.py:292
+#: gajim/common/config.py:290
+#, fuzzy
 msgid ""
-"If the contact row is colored according to the current chatstate of the "
-"contact"
+"If enabled, the contact row is colored according to the current chat state "
+"of the contact."
 msgstr ""
+"Hvis avkrysset vil Gajim tillate at andre ser hvilket operativsystem du "
+"bruker"
 
-#: gajim/common/config.py:293
-msgid "If the tab is colored according to the current chatstate of the contact"
+#: gajim/common/config.py:291
+#, fuzzy
+msgid ""
+"If enabled, the tab is colored according to the current chat state of the "
+"contact."
 msgstr ""
+"Hvis avkrysset vil Gajim tillate at andre ser hvilket operativsystem du "
+"bruker"
 
-#: gajim/common/config.py:294
+#: gajim/common/config.py:292
+#, fuzzy
 msgid ""
-"Shows a text in the banner that describes the current chatstate of the "
-"contact"
+"Shows a text in the banner that describes the current chat state of the "
+"contact."
 msgstr ""
+"Hvis avkrysset vil Gajim tillate at andre ser hvilket operativsystem du "
+"bruker"
 
-#: gajim/common/config.py:295 gajim/common/config.py:424
+#: gajim/common/config.py:293
 #, fuzzy
 msgid ""
 "Chat state notifications that are sent to contacts. Possible values: all, "
@@ -3730,346 +3795,382 @@ msgstr ""
 "Sendt merknad for samtalestatus. Kan være 'alle', 'bare_skriving' eller "
 "'avslått'."
 
-#: gajim/common/config.py:296 gajim/common/config.py:438
+#: gajim/common/config.py:294
 #, fuzzy
 msgid ""
 "Chat state notifications that are sent to the group chat. Possible values: "
-"all, composing_only, disabled"
+"'all', 'composing_only', 'disabled'"
 msgstr ""
 "Sendt merknad for samtalestatus. Kan være 'alle', 'bare_skriving' eller "
 "'avslått'."
 
-#: gajim/common/config.py:312
+#: gajim/common/config.py:297
+msgid "API Preferences. Possible values: 'http', 'iq'"
+msgstr ""
+
+#: gajim/common/config.py:313
+#, fuzzy
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
-"defined in autopriority_* options."
+"defined in 'autopriority_*' options."
 msgstr ""
 "Prioritet vil endres automatisk i følge med din status. Prioritet bestemmes "
 "i autopriority_*-valgene."
 
-#: gajim/common/config.py:320
+#: gajim/common/config.py:321
+#, fuzzy
 msgid ""
-"Status used to autoconnect as. Can be online, chat, away, xa, dnd, "
-"invisible. NOTE: this option is used only if restore_last_status is disabled"
+"Status to be used automatically when connecting. Can be 'online', 'chat', "
+"'away', 'xa', 'dnd' or 'invisible'. NOTE: This option is used only if "
+"'restore_last_status' is disabled."
 msgstr ""
 "Status man automatisk tilkobles som. Kan være 'pålogget', 'i samtale', "
 "'borte', 'lengre tids fravær', 'ikke forstyrr' eller 'usynlig'. MERK: dette "
 "valget brukes bare dersom restore_last_status er avskrudd"
 
-#: gajim/common/config.py:321
-msgid "If enabled, restore the last status that was used."
+#: gajim/common/config.py:322
+#, fuzzy
+msgid "If enabled, the last status will be restored."
 msgstr "Dersom valgt, gjenopprett sist brukte status."
 
-#: gajim/common/config.py:322
+#: gajim/common/config.py:323
 #, fuzzy
 msgid ""
-"If true, Contacts requesting authorization will be automatically accepted."
+"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:323
+#: gajim/common/config.py:324
+#, fuzzy
 msgid ""
-"If False, this account will be disabled and will not appear in roster window."
+"If disabled, this account will be disabled and will not appear in the "
+"contact list window."
 msgstr ""
 "Dersom usant vil bildeikoner bli slått av og ikke vises i "
 "kontaktlistevinduet."
 
-#: gajim/common/config.py:327
-msgid "Allow plaintext connections"
+#: gajim/common/config.py:328
+#, fuzzy
+msgid "Allow plaintext connections."
 msgstr "Tillat klarteksttilkoblinger"
 
-#: gajim/common/config.py:330
+#: gajim/common/config.py:331
+#, fuzzy
 msgid ""
-"List (space separated) of authentication mechanisms to try. Can contain "
-"ANONYMOUS, EXTERNAL, GSSAPI, SCRAM-SHA-1-PLUS, SCRAM-SHA-1, DIGEST-MD5, "
-"PLAIN, X-MESSENGER-OAUTH2 or XEP-0078"
+"List of authentication mechanisms to try (space separated). Can contain "
+"'ANONYMOUS', 'EXTERNAL', 'GSSAPI', 'SCRAM-SHA-1-PLUS', 'SCRAM-SHA-1', "
+"'DIGEST-MD5', 'PLAIN', 'X-MESSENGER-OAUTH2' or 'XEP-0078'."
 msgstr ""
 "Mellomromsinndelt liste over godkjennelsesmekanismer å prøve. Kan inneholde "
 "ANONYMOUS, EXTERNAL, GSSAPI, SCRAM-SHA-1-PLUS, SCRAM-SHA-1, DIGEST-MD5, "
 "PLAIN, X-MESSENGER-OAUTH2 eller XEP-0078"
 
-#: gajim/common/config.py:331
+#: gajim/common/config.py:332
+#, fuzzy
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection. "
-"Can be 'warn', 'connect', 'disconnect'"
+"Can be 'warn', 'connect' or 'disconnect'."
 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:332
+#: gajim/common/config.py:333
 msgid "Show a warning dialog before using standard SSL library."
 msgstr "Vis en advarselsdialog før bruk av standard SSL-bibliotek."
 
-#: gajim/common/config.py:333
+#: gajim/common/config.py:334
 msgid ""
 "Show a warning dialog before sending PLAIN password over a plain connection."
 msgstr ""
 "Vis en advarselsdialog før forsendelse av passord i KLARTEKST over ukryptert "
 "tilkobling."
 
-#: gajim/common/config.py:334
-msgid "Space separated list of ssl errors to ignore."
-msgstr "Mellomromsinndelt liste av SSL-feilmeldinger som skal ignoreres."
+#: gajim/common/config.py:335
+msgid "List of SSL errors to ignore (space separated)."
+msgstr ""
 
-#: gajim/common/config.py:340
+#: gajim/common/config.py:341
+#, fuzzy
 msgid ""
-"Space separated list of JIDs for which you do not want to store logs. You "
-"can also add account name to log nothing for this account."
+"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 ""
 "Mellomromsinndelt liste over JID-er du ikke ønsker å logge. Du kan også "
 "legge til kontonavn for å ikke logge denne kontoen."
 
-#: gajim/common/config.py:341
+#: gajim/common/config.py:342
+#, fuzzy
 msgid ""
-"Space separated list of JIDs for which you accept to not log conversations "
-"if he does not want to."
+"List of XMPP Addresses (space separated) for which you accept to not store "
+"chat history if your contact does not want to."
 msgstr ""
 "Mellomromsinndelt liste over JID-er du godtar å ikke logge samtaler med hvis "
 "vedkommende ikke ønsker det."
 
-#: gajim/common/config.py:343
-msgid "Whitespace sent after inactivity"
+#: gajim/common/config.py:344
+#, fuzzy
+msgid "If enabled, a whitespace is sent after inactivity (keep alive)."
 msgstr "Mellomrom sendt etter inaktivitet"
 
-#: gajim/common/config.py:344
-msgid "XMPP ping sent after inactivity"
+#: gajim/common/config.py:345
+#, fuzzy
+msgid "If enabled, an XMPP ping is sent after inactivity (ping alive)."
 msgstr "XMPP-ping sendt etter inaktivitet"
 
-#: gajim/common/config.py:348
+#: gajim/common/config.py:349
 #, fuzzy
 msgid ""
-"How many seconds to wait for the answer of ping alive packet before trying "
-"to reconnect?"
+"How many seconds to wait for the answer of a ping alive packet before trying "
+"to reconnect."
 msgstr ""
 "Hvor mange sekunder skal det ventes på svar fra livstegns-ping før "
 "gjentilkobling?"
 
-#: gajim/common/config.py:352
-msgid "Jabberd2 workaround"
+#: gajim/common/config.py:353
+#, fuzzy
+msgid "Jabberd2 workaround."
 msgstr "Jabberd2-omvei"
 
-#: gajim/common/config.py:355
+#: gajim/common/config.py:356
+#, fuzzy
 msgid ""
-"If checked, Gajim will use your IP and proxies defined in "
-"file_transfer_proxies option for file transfer."
+"If enabled, Gajim will use your IP and proxies defined in "
+"'file_transfer_proxies' option for file transfers."
 msgstr ""
 "Dersom valgt vil Gajim bruke din IP og mellomtjenere bestemt i "
 "file_transfer_proxies-valget for filoverføring."
 
-#: gajim/common/config.py:356
+#: gajim/common/config.py:357
 #, fuzzy
 msgid ""
-"If true, Gajim will test file transfer proxies on startup to be sure it "
-"works. Openfire's proxies are known to fail this test even if they work."
+"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 ""
 "Hvis sant, vil Gajim teste filoverførings-mellomtjenere ved oppstart for å "
 "forsikre seg om at de virker. Openfire sine mellomtjenere feiler denne "
 "testen selv om de virker."
 
-#: gajim/common/config.py:369
-msgid "Answer to receipt requests"
-msgstr "Svar på kvitteringsforespørsler"
-
 #: gajim/common/config.py:370
-msgid "Sent receipt requests"
-msgstr "Sendte kvitteringsforespørsler"
+#, 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:371
+msgid "If enabled, Gajim will send message receipt requests."
+msgstr ""
 
-#: gajim/common/config.py:379
+#: gajim/common/config.py:380
 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:380
+#: gajim/common/config.py:381
 msgid "Allow Gajim to send your local time."
 msgstr "Tillat Gajim å sende din lokale tid."
 
-#: gajim/common/config.py:383
-msgid "Message that is sent to contacts you want to add"
+#: gajim/common/config.py:384
+#, 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:384
+#: gajim/common/config.py:385
+#, fuzzy
 msgid ""
-"If enabled, Gajim will send your local IPs so your contact can connect to "
-"your machine to transfer files."
+"If enabled, Gajim will send your local IP so your contact can connect to "
+"your machine for file transfers."
 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:385
+#: gajim/common/config.py:386
 #, fuzzy
 msgid ""
-"Space separated list of JIDs for which chat window will be re-opened on next "
-"startup."
+"List of XMPP Addresses (space separated) for which the chat window will be "
+"re-opened on next startup."
 msgstr ""
 "Mellomromsinndelt liste over JID-er du vil gjenåpne samtalevindu med ved "
 "neste oppstart."
 
-#: gajim/common/config.py:387
-msgid "HTTP Upload: Enable HTTPS Verification"
+#: gajim/common/config.py:388
+#, fuzzy
+msgid "HTTP File Upload: Enable HTTPS Verification."
 msgstr "HTTP-opplasting: Skru på HTTPS-bekrefting"
 
-#: gajim/common/config.py:388
+#: gajim/common/config.py:389
+#, fuzzy
 msgid ""
-"Preferred file transfer mechanism for file drag&drop on chat window. Can be "
-"'httpupload' (default) or 'jingle'"
+"Preferred file transfer mechanism for file drag&drop on a chat window. Can "
+"be 'httpupload' (default) or 'jingle'."
 msgstr ""
 "Foretrukket filoverføringsmekanisme for dra-og-slipp -funksjonalitet i "
 "sludrevinduet. Kan være 'httpupload' (forvalg) eller 'jingle'"
 
-#: gajim/common/config.py:389
-msgid "Allow cert verification with POSH"
-msgstr ""
-
-#: gajim/common/config.py:423 gajim/common/config.py:430
+#: gajim/common/config.py:390
 #, fuzzy
-msgid "Language for which misspelled words will be checked"
-msgstr "Språk brukt til å sjekke feilstavede ord"
-
-#: gajim/common/config.py:427
-msgid "The currently active encryption for that contact"
-msgstr "Nåværende aktiv kryptering for nevnte kontakt"
+msgid "Allow certificate verification with POSH."
+msgstr "Bekreftelse av SSL-sertifikat for %s"
 
-#: gajim/common/config.py:431
+#: gajim/common/config.py:425
+#, fuzzy
 msgid ""
-"How many lines to request from server when entering a groupchat. -1 means no "
-"limit, -2 means global value"
+"Chat state notifications that are sent to contacts. Possible values: 'all', "
+"'composing_only', 'disabled'"
 msgstr ""
-"Hvor mange linjer skal etterspørres når man går inn i en gruppesamtale. -1 "
-"betyr ingen grense, -2 betyr global verdi"
+"Sendt merknad for samtalestatus. Kan være 'alle', 'bare_skriving' eller "
+"'avslått'."
+
+#: gajim/common/config.py:428
+#, fuzzy
+msgid "The currently active encryption for that contact."
+msgstr "Nåværende aktiv kryptering for nevnte kontakt"
 
 #: gajim/common/config.py:432
+#, fuzzy
 msgid ""
-"Minutes of backlog to request when entering a groupchat. -1 means no limit, "
-"-2 means global value"
+"If enabled, a notification is created for every message in this group chat."
 msgstr ""
-"Hvor mange minutter med logg som skal forespørres ved inntreden i "
-"gruppesludring. -1 betyr ingen grense, -2 betyr global verdi"
+"Hvorvidt det er ønskelig med en merknad for hver melding i dette rommet"
 
 #: gajim/common/config.py:433
 #, fuzzy
-msgid "State whether a notification is created for every message in this room"
-msgstr ""
-"Hvorvidt det er ønskelig med en merknad for hver melding i dette rommet"
-
-#: gajim/common/config.py:434
 msgid ""
-"Show a status message for all status (away, dnd, etc.) changes of users in a "
-"group chat"
-msgstr ""
+"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:435
+#: gajim/common/config.py:434
 #, fuzzy
-msgid "Show a status message for every join or leave in a group chat"
+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:435
+msgid ""
+"If enabled, the group chat is minimized into the contact list when joining "
+"automatically."
+msgstr ""
+
 #: gajim/common/config.py:436
-msgid "If the group chat is minimized into the roster on autojoin"
+msgid ""
+"If enabled, the group chat is minimized into the contact list when closing "
+"it."
 msgstr ""
 
 #: gajim/common/config.py:437
-msgid "If the group chat is minimized into the roster on close"
+#, fuzzy
+msgid ""
+"Chat state notifications that are sent to the group chat. Possible values: "
+"'all', 'composing_only' or 'disabled'."
 msgstr ""
+"Sendt merknad for samtalestatus. Kan være 'alle', 'bare_skriving' eller "
+"'avslått'."
 
-#: gajim/common/config.py:441
+#: gajim/common/config.py:440
+#, fuzzy
 msgid ""
-"State whether plugins should be activated on startup (this is saved on Gajim "
-"exit). This option SHOULD NOT be used to (de)activate plug-ins. Use GUI "
-"instead."
+"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 ""
 "Bestem hvorvidt tillegg skal skrus på ved oppstart (dette lagres når Gajim "
 "skrus av). Dette valget SKAL IKKE brukes til å (de)aktivere tillegg. Bruk "
 "GUI i steden for."
 
-#: gajim/common/config.py:446 gajim/common/const.py:281
+#: gajim/common/config.py:445 gajim/common/const.py:315
 msgid "Sleeping"
 msgstr "Sover"
 
-#: gajim/common/config.py:447
+#: gajim/common/config.py:446
 msgid "Back soon"
 msgstr "Straks tilbake"
 
-#: gajim/common/config.py:447
+#: gajim/common/config.py:446
 msgid "Back in some minutes."
 msgstr "Tilbake om noen minutter."
 
-#: gajim/common/config.py:448 gajim/common/const.py:247
+#: gajim/common/config.py:447 gajim/common/const.py:281
 msgid "Eating"
 msgstr "Spiser"
 
-#: gajim/common/config.py:448
-msgid "I'm eating, so leave me a message."
-msgstr "Jeg spiser, legg igjen en beskjed."
+#: gajim/common/config.py:447
+#, fuzzy
+msgid "I'm eating."
+msgstr "Jeg jobber."
 
-#: gajim/common/config.py:449
+#: gajim/common/config.py:448
 msgid "Movie"
 msgstr "Film"
 
-#: gajim/common/config.py:449
+#: gajim/common/config.py:448
 msgid "I'm watching a movie."
 msgstr "Ser på en film."
 
-#: gajim/common/config.py:450 gajim/common/const.py:314
+#: gajim/common/config.py:449 gajim/common/const.py:348
 msgid "Working"
 msgstr "Jobber"
 
-#: gajim/common/config.py:450
+#: gajim/common/config.py:449
 msgid "I'm working."
 msgstr "Jeg jobber."
 
-#: gajim/common/config.py:451
+#: gajim/common/config.py:450
 msgid "Phone"
 msgstr "Telefon"
 
-#: gajim/common/config.py:451
+#: gajim/common/config.py:450
 msgid "I'm on the phone."
 msgstr "Sitter i telefonen."
 
-#: gajim/common/config.py:452
+#: gajim/common/config.py:451
 msgid "Out"
 msgstr "Ute"
 
-#: gajim/common/config.py:452
+#: gajim/common/config.py:451
 msgid "I'm out enjoying life."
 msgstr "Ute og lever livet."
 
-#: gajim/common/config.py:463
+#: gajim/common/config.py:462
 msgid "I'm available."
 msgstr "Jeg er tilgjengelig."
 
-#: gajim/common/config.py:464
+#: gajim/common/config.py:463
 msgid "I'm free for chat."
 msgstr "Ledig for prat."
 
-#: gajim/common/config.py:465 gajim/gtk/accounts.py:134
+#: gajim/common/config.py:464 gajim/gtk/accounts.py:133
 msgid "Be right back."
 msgstr "Snart tilbake."
 
-#: gajim/common/config.py:466
+#: gajim/common/config.py:465
 msgid "I'm not available."
 msgstr "Jeg er ikke tilgjengelig."
 
-#: gajim/common/config.py:467
+#: gajim/common/config.py:466
 msgid "Do not disturb."
 msgstr "Ikke forstyrr."
 
-#: gajim/common/config.py:468 gajim/common/config.py:469
+#: gajim/common/config.py:467 gajim/common/config.py:468
 msgid "Bye!"
 msgstr "Adjø!"
 
-#: gajim/common/config.py:480
+#: gajim/common/config.py:479
+#, fuzzy
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
-"muc_highlight_words, or when a group chat message contains your nickname."
+"'muc_highlight_words' your nickname is mentioned."
 msgstr ""
 "Lyd som spilles når en melding i et samtalerom inneholder et av ordene i "
 "muc_highlight_words, eller når en melding i et samtalerom inneholder "
 "kallenavnet ditt."
 
-#: gajim/common/config.py:481
-msgid "Sound to play when any MUC message arrives."
+#: gajim/common/config.py:480
+#, 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:485
+#: gajim/common/config.py:484
 msgid "Tor"
 msgstr "Tor"
 
@@ -4078,11 +4179,106 @@ msgstr "Tor"
 msgid "Error: cannot open %s for reading"
 msgstr "Feil: kan ikke åpne %s for lesing"
 
-#: gajim/common/const.py:214
+#: gajim/common/const.py:216
+#, fuzzy
+msgid "?Group chat name:Team"
+msgstr "?Group Chat Contact Role:Ingen"
+
+#: gajim/common/const.py:217
+msgid "?Group chat description:Project discussion"
+msgstr ""
+
+#: gajim/common/const.py:218
+#, fuzzy
+msgid "?Group chat address:team"
+msgstr "Gruppesludringsstøtte"
+
+#: gajim/common/const.py:219
+#, fuzzy
+msgid "?Group chat name:Family"
+msgstr "Fremheving av gruppesamtale:"
+
+#: gajim/common/const.py:220
+msgid "?Group chat description:Spring gathering"
+msgstr ""
+
+#: gajim/common/const.py:221
+msgid "?Group chat address:family"
+msgstr ""
+
+#: gajim/common/const.py:222
+#, fuzzy
+msgid "?Group chat name:Vacation"
+msgstr "Invitasjon til gruppesamtale"
+
+#: gajim/common/const.py:223
+msgid "?Group chat description:Trip planning"
+msgstr ""
+
+#: gajim/common/const.py:224
+#, fuzzy
+msgid "?Group chat address:vacation"
+msgstr "Invitasjon til gruppesamtale"
+
+#: gajim/common/const.py:225
+#, fuzzy
+msgid "?Group chat name:Repairs"
+msgstr "Gruppe Samtale"
+
+#: gajim/common/const.py:226
+msgid "?Group chat description:Local help group"
+msgstr ""
+
+#: gajim/common/const.py:227
+#, fuzzy
+msgid "?Group chat address:repairs"
+msgstr "Gruppesludringsstøtte"
+
+#: gajim/common/const.py:228
+#, fuzzy
+msgid "?Group chat name:News"
+msgstr "?Group Chat Contact Role:Ingen"
+
+#: gajim/common/const.py:229
+#, fuzzy
+msgid "?Group chat description:Local news and reports"
+msgstr "Oppretting av gruppesludring tillates ikke."
+
+#: gajim/common/const.py:230
+#, fuzzy
+msgid "?Group chat address:news"
+msgstr "Ny gruppesamtale"
+
+#: gajim/common/const.py:235
+#, fuzzy
+msgid "Remote server not found"
+msgstr "Tjenesten ble ikke funnet"
+
+#: gajim/common/const.py:236
+msgid "Remote server timeout"
+msgstr ""
+
+#: gajim/common/const.py:237 gajim/common/const.py:238
+#: gajim/common/const.py:239
+#, fuzzy
+msgid "Address does not belong to a group chat server"
+msgstr "%s er ikke en gruppesamtale-tjener"
+
+#: gajim/common/const.py:240
+#, fuzzy
+msgid "Group chat already exists"
+msgstr "Lokal konto eksisterer allerede."
+
+#: gajim/common/const.py:241
+#, fuzzy
+msgid "Group chat does not exist"
+msgstr "Gruppesamtalen <b>%s</b> finnes ikke."
+
+#: gajim/common/const.py:247
 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:217
+#: gajim/common/const.py:250
 msgid ""
 "This message was encrypted with Legacy OpenPGP and could not be decrypted. "
 "You can install the PGP plugin to handle those messages."
@@ -4091,862 +4287,866 @@ msgstr ""
 "dekrypteres. Du kan installere PGP-programtillegget for å håndtere de "
 "meldingene."
 
-#: gajim/common/const.py:221
+#: gajim/common/const.py:254
+#, fuzzy
 msgid ""
-"This message was encrypted with OpenPGP for XMPP and could not be decrypted."
+"This message was encrypted with OpenPGP for XMPP and could not be decrypted. "
+"You can install the OpenPGP plugin to handle those messages."
 msgstr ""
-"Meldingen har blitt kryptert med OpenPGP for XMPP, og kunne ikke dekrypteres."
+"Meldingen har blitt kryptert med foreldet OpenPGP, og kunne ikke "
+"dekrypteres. Du kan installere PGP-programtillegget for å håndtere de "
+"meldingene."
 
-#: gajim/common/const.py:224
+#: gajim/common/const.py:258
 #, 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:231
+#: gajim/common/const.py:265
 msgid "Doing Chores"
 msgstr "Utfører gjøremål"
 
-#: gajim/common/const.py:232
+#: gajim/common/const.py:266
 msgid "Buying Groceries"
 msgstr "Kjøper mat"
 
-#: gajim/common/const.py:233
+#: gajim/common/const.py:267
 msgid "Cleaning"
 msgstr "Vasker"
 
-#: gajim/common/const.py:234
+#: gajim/common/const.py:268
 msgid "Cooking"
 msgstr "Lager mat"
 
-#: gajim/common/const.py:235
+#: gajim/common/const.py:269
 msgid "Doing Maintenance"
 msgstr "Driver vedlikehold"
 
-#: gajim/common/const.py:236
+#: gajim/common/const.py:270
 msgid "Doing the Dishes"
 msgstr "Tar oppvasken"
 
-#: gajim/common/const.py:237
+#: gajim/common/const.py:271
 msgid "Doing the Laundry"
 msgstr "Vasker klær"
 
-#: gajim/common/const.py:238
+#: gajim/common/const.py:272
 msgid "Gardening"
 msgstr "Gjør hagearbeid"
 
-#: gajim/common/const.py:239
+#: gajim/common/const.py:273
 msgid "Running an Errand"
 msgstr "Løper et ærend"
 
-#: gajim/common/const.py:240
+#: gajim/common/const.py:274
 msgid "Walking the Dog"
 msgstr "Går tur med hunden"
 
-#: gajim/common/const.py:242
+#: gajim/common/const.py:276
 msgid "Drinking"
 msgstr "Drikker"
 
-#: gajim/common/const.py:243
+#: gajim/common/const.py:277
 msgid "Having a Beer"
 msgstr "Tar seg en øl"
 
-#: gajim/common/const.py:244
+#: gajim/common/const.py:278
 msgid "Having Coffee"
 msgstr "Tar seg en kaffe"
 
-#: gajim/common/const.py:245
+#: gajim/common/const.py:279
 msgid "Having Tea"
 msgstr "Tar seg en kopp té"
 
-#: gajim/common/const.py:248
+#: gajim/common/const.py:282
 msgid "Having a Snack"
 msgstr "Tar seg en matbit"
 
-#: gajim/common/const.py:249
+#: gajim/common/const.py:283
 msgid "Having Breakfast"
 msgstr "Spiser frokost"
 
-#: gajim/common/const.py:250
+#: gajim/common/const.py:284
 msgid "Having Dinner"
 msgstr "Spiser middag"
 
-#: gajim/common/const.py:251
+#: gajim/common/const.py:285
 msgid "Having Lunch"
 msgstr "Spiser lunsj"
 
-#: gajim/common/const.py:253
+#: gajim/common/const.py:287
 msgid "Exercising"
 msgstr "Trimmer"
 
-#: gajim/common/const.py:254 gajim/common/const.py:305
+#: gajim/common/const.py:288 gajim/common/const.py:339
 msgid "Cycling"
 msgstr "Sykler"
 
-#: gajim/common/const.py:255
+#: gajim/common/const.py:289
 msgid "Dancing"
 msgstr "Danser"
 
-#: gajim/common/const.py:256
+#: gajim/common/const.py:290
 msgid "Hiking"
 msgstr "På tursti"
 
-#: gajim/common/const.py:257
+#: gajim/common/const.py:291
 msgid "Jogging"
 msgstr "Jogger"
 
-#: gajim/common/const.py:258
+#: gajim/common/const.py:292
 msgid "Playing Sports"
 msgstr "Bedriver sport"
 
-#: gajim/common/const.py:259
+#: gajim/common/const.py:293
 msgid "Running"
 msgstr "Løper"
 
-#: gajim/common/const.py:260
+#: gajim/common/const.py:294
 msgid "Skiing"
 msgstr "Går på ski"
 
-#: gajim/common/const.py:261
+#: gajim/common/const.py:295
 msgid "Swimming"
 msgstr "Svømmer"
 
-#: gajim/common/const.py:262
+#: gajim/common/const.py:296
 msgid "Working out"
 msgstr "Trener"
 
-#: gajim/common/const.py:264
+#: gajim/common/const.py:298
 msgid "Grooming"
 msgstr "Steller seg"
 
-#: gajim/common/const.py:265
+#: gajim/common/const.py:299
 msgid "At the Spa"
 msgstr "Er på spa"
 
-#: gajim/common/const.py:266
+#: gajim/common/const.py:300
 msgid "Brushing Teeth"
 msgstr "Pusser tenner"
 
-#: gajim/common/const.py:267
+#: gajim/common/const.py:301
 msgid "Getting a Haircut"
 msgstr "Klipper håret"
 
-#: gajim/common/const.py:268
+#: gajim/common/const.py:302
 msgid "Shaving"
 msgstr "Barberer seg"
 
-#: gajim/common/const.py:269
+#: gajim/common/const.py:303
 msgid "Taking a Bath"
 msgstr "Tar et bad"
 
-#: gajim/common/const.py:270
+#: gajim/common/const.py:304
 msgid "Taking a Shower"
 msgstr "Tar seg en dusj"
 
-#: gajim/common/const.py:272
+#: gajim/common/const.py:306
 msgid "Having an Appointment"
 msgstr "Har en avtale"
 
-#: gajim/common/const.py:274
+#: gajim/common/const.py:308
 msgid "Inactive"
 msgstr "Inaktiv"
 
-#: gajim/common/const.py:275
+#: gajim/common/const.py:309
 msgid "Day Off"
 msgstr "Fridag"
 
-#: gajim/common/const.py:276
+#: gajim/common/const.py:310
 msgid "Hanging out"
 msgstr "Slapper av"
 
-#: gajim/common/const.py:277
+#: gajim/common/const.py:311
 msgid "Hiding"
 msgstr "Gjemmer seg"
 
-#: gajim/common/const.py:278
+#: gajim/common/const.py:312
 msgid "On Vacation"
 msgstr "På ferie"
 
-#: gajim/common/const.py:279
+#: gajim/common/const.py:313
 msgid "Praying"
 msgstr "Ber"
 
-#: gajim/common/const.py:280
+#: gajim/common/const.py:314
 msgid "Scheduled Holiday"
 msgstr "Planlagt ferie"
 
-#: gajim/common/const.py:282
+#: gajim/common/const.py:316
 msgid "Thinking"
 msgstr "Tenker"
 
-#: gajim/common/const.py:284
+#: gajim/common/const.py:318
 msgid "Relaxing"
 msgstr "Slapper av"
 
-#: gajim/common/const.py:285
+#: gajim/common/const.py:319
 msgid "Fishing"
 msgstr "Fisker"
 
-#: gajim/common/const.py:286
+#: gajim/common/const.py:320
 msgid "Gaming"
 msgstr "Spiller"
 
-#: gajim/common/const.py:287
+#: gajim/common/const.py:321
 msgid "Going out"
 msgstr "Går ut"
 
-#: gajim/common/const.py:288
+#: gajim/common/const.py:322
 msgid "Partying"
 msgstr "Fester"
 
-#: gajim/common/const.py:289
+#: gajim/common/const.py:323
 msgid "Reading"
 msgstr "Leser"
 
-#: gajim/common/const.py:290
+#: gajim/common/const.py:324
 msgid "Rehearsing"
 msgstr "Øver"
 
-#: gajim/common/const.py:291
+#: gajim/common/const.py:325
 msgid "Shopping"
 msgstr "Sover"
 
-#: gajim/common/const.py:292
+#: gajim/common/const.py:326
 msgid "Smoking"
 msgstr "Røyker"
 
-#: gajim/common/const.py:293
+#: gajim/common/const.py:327
 msgid "Socializing"
 msgstr "Sosialiserer"
 
-#: gajim/common/const.py:294
+#: gajim/common/const.py:328
 msgid "Sunbathing"
 msgstr "Soler seg"
 
-#: gajim/common/const.py:295
+#: gajim/common/const.py:329
 msgid "Watching TV"
 msgstr "Ser på TV"
 
-#: gajim/common/const.py:296
+#: gajim/common/const.py:330
 msgid "Watching a Movie"
 msgstr "Ser på film"
 
-#: gajim/common/const.py:298
+#: gajim/common/const.py:332
 msgid "Talking"
 msgstr "Snakker"
 
-#: gajim/common/const.py:299
+#: gajim/common/const.py:333
 msgid "In Real Life"
 msgstr "I det virkelige liv"
 
-#: gajim/common/const.py:300
+#: gajim/common/const.py:334
 msgid "On the Phone"
 msgstr "Sitter i telefonen"
 
-#: gajim/common/const.py:301
+#: gajim/common/const.py:335
 msgid "On Video Phone"
 msgstr "På videotelefon"
 
-#: gajim/common/const.py:303
+#: gajim/common/const.py:337
 msgid "Traveling"
 msgstr "Reiser"
 
-#: gajim/common/const.py:304
+#: gajim/common/const.py:338
 msgid "Commuting"
 msgstr "Pendler"
 
-#: gajim/common/const.py:306
+#: gajim/common/const.py:340
 msgid "Driving"
 msgstr "Kjører"
 
-#: gajim/common/const.py:307
+#: gajim/common/const.py:341
 msgid "In a Car"
 msgstr "I en bil"
 
-#: gajim/common/const.py:308
+#: gajim/common/const.py:342
 msgid "On a Bus"
 msgstr "På bussen"
 
-#: gajim/common/const.py:309
+#: gajim/common/const.py:343
 msgid "On a Plane"
 msgstr "Flyr"
 
-#: gajim/common/const.py:310
+#: gajim/common/const.py:344
 msgid "On a Train"
 msgstr "På toget"
 
-#: gajim/common/const.py:311
+#: gajim/common/const.py:345
 msgid "On a Trip"
 msgstr "På reise"
 
-#: gajim/common/const.py:312
+#: gajim/common/const.py:346
 msgid "Walking"
 msgstr "Spaserer"
 
-#: gajim/common/const.py:315
+#: gajim/common/const.py:349
 msgid "Coding"
 msgstr "Koder"
 
-#: gajim/common/const.py:316
+#: gajim/common/const.py:350
 msgid "In a Meeting"
 msgstr "I et møte"
 
-#: gajim/common/const.py:317
+#: gajim/common/const.py:351
 msgid "Studying"
 msgstr "Studerer"
 
-#: gajim/common/const.py:318
+#: gajim/common/const.py:352
 msgid "Writing"
 msgstr "Skriver"
 
-#: gajim/common/const.py:321
+#: gajim/common/const.py:355
 msgid "Afraid"
 msgstr "Redd"
 
-#: gajim/common/const.py:322
+#: gajim/common/const.py:356
 msgid "Amazed"
 msgstr "Forbløffet"
 
-#: gajim/common/const.py:323
+#: gajim/common/const.py:357
 msgid "Amorous"
 msgstr "Amorøs"
 
-#: gajim/common/const.py:324
+#: gajim/common/const.py:358
 msgid "Angry"
 msgstr "Er Bjørn Sundquist"
 
-#: gajim/common/const.py:325
+#: gajim/common/const.py:359
 msgid "Annoyed"
 msgstr "Irritert"
 
-#: gajim/common/const.py:326
+#: gajim/common/const.py:360
 msgid "Anxious"
 msgstr "Engstelig"
 
-#: gajim/common/const.py:327
+#: gajim/common/const.py:361
 msgid "Aroused"
 msgstr "Opphisset"
 
-#: gajim/common/const.py:328
+#: gajim/common/const.py:362
 msgid "Ashamed"
 msgstr "Skamfull"
 
-#: gajim/common/const.py:329
+#: gajim/common/const.py:363
 msgid "Bored"
 msgstr "Kjeder seg"
 
-#: gajim/common/const.py:330
+#: gajim/common/const.py:364
 msgid "Brave"
 msgstr "Modig"
 
-#: gajim/common/const.py:331
+#: gajim/common/const.py:365
 msgid "Calm"
 msgstr "Rolig"
 
-#: gajim/common/const.py:332
+#: gajim/common/const.py:366
 msgid "Cautious"
 msgstr "Forsiktig"
 
-#: gajim/common/const.py:333
+#: gajim/common/const.py:367
 msgid "Cold"
 msgstr "Kald"
 
-#: gajim/common/const.py:334
+#: gajim/common/const.py:368
 msgid "Confident"
 msgstr "Selvsikker"
 
-#: gajim/common/const.py:335
+#: gajim/common/const.py:369
 msgid "Confused"
 msgstr "Forvirret"
 
-#: gajim/common/const.py:336
+#: gajim/common/const.py:370
 msgid "Contemplative"
 msgstr "Overveiende"
 
-#: gajim/common/const.py:337
+#: gajim/common/const.py:371
 msgid "Contented"
 msgstr "Utfordrende"
 
-#: gajim/common/const.py:338
+#: gajim/common/const.py:372
 msgid "Cranky"
 msgstr "Gretten"
 
-#: gajim/common/const.py:339
+#: gajim/common/const.py:373
 msgid "Crazy"
 msgstr "Gal"
 
-#: gajim/common/const.py:340
+#: gajim/common/const.py:374
 msgid "Creative"
 msgstr "Kreativ"
 
-#: gajim/common/const.py:341
+#: gajim/common/const.py:375
 msgid "Curious"
 msgstr "Nysgjerrig"
 
-#: gajim/common/const.py:342
+#: gajim/common/const.py:376
 msgid "Dejected"
 msgstr "Nedslått"
 
-#: gajim/common/const.py:343
+#: gajim/common/const.py:377
 msgid "Depressed"
 msgstr "Deprimert"
 
-#: gajim/common/const.py:344
+#: gajim/common/const.py:378
 msgid "Disappointed"
 msgstr "Skuffet"
 
-#: gajim/common/const.py:345
+#: gajim/common/const.py:379
 msgid "Disgusted"
 msgstr "Vemmes"
 
-#: gajim/common/const.py:346
+#: gajim/common/const.py:380
 msgid "Dismayed"
 msgstr "Forferdet"
 
-#: gajim/common/const.py:347
+#: gajim/common/const.py:381
 msgid "Distracted"
 msgstr "Distrahert"
 
-#: gajim/common/const.py:348
+#: gajim/common/const.py:382
 msgid "Embarrassed"
 msgstr "Forlegen"
 
-#: gajim/common/const.py:349
+#: gajim/common/const.py:383
 msgid "Envious"
 msgstr "Misunnelig"
 
-#: gajim/common/const.py:350
+#: gajim/common/const.py:384
 msgid "Excited"
 msgstr "Begeistret"
 
-#: gajim/common/const.py:351
+#: gajim/common/const.py:385
 msgid "Flirtatious"
 msgstr "Flørtende"
 
-#: gajim/common/const.py:352
+#: gajim/common/const.py:386
 msgid "Frustrated"
 msgstr "Frustrert"
 
-#: gajim/common/const.py:353
+#: gajim/common/const.py:387
 msgid "Grateful"
 msgstr "Takknemlig"
 
-#: gajim/common/const.py:354
+#: gajim/common/const.py:388
 msgid "Grieving"
 msgstr "Sørgende"
 
-#: gajim/common/const.py:355
+#: gajim/common/const.py:389
 msgid "Grumpy"
 msgstr "Gretten"
 
-#: gajim/common/const.py:356
+#: gajim/common/const.py:390
 msgid "Guilty"
 msgstr "Skyldig"
 
-#: gajim/common/const.py:357
+#: gajim/common/const.py:391
 msgid "Happy"
 msgstr "Glad"
 
-#: gajim/common/const.py:358
+#: gajim/common/const.py:392
 msgid "Hopeful"
 msgstr "Håpefull"
 
-#: gajim/common/const.py:359
+#: gajim/common/const.py:393
 msgid "Hot"
 msgstr "Varm"
 
-#: gajim/common/const.py:360
+#: gajim/common/const.py:394
 msgid "Humbled"
 msgstr "Ydmyk"
 
-#: gajim/common/const.py:361
+#: gajim/common/const.py:395
 msgid "Humiliated"
 msgstr "Ydmyket"
 
-#: gajim/common/const.py:362
+#: gajim/common/const.py:396
 msgid "Hungry"
 msgstr "Sulten"
 
-#: gajim/common/const.py:363
+#: gajim/common/const.py:397
 msgid "Hurt"
 msgstr "Såret"
 
-#: gajim/common/const.py:364
+#: gajim/common/const.py:398
 msgid "Impressed"
 msgstr "Imponert"
 
-#: gajim/common/const.py:365
+#: gajim/common/const.py:399
 msgid "In Awe"
 msgstr "Ærefrykt"
 
-#: gajim/common/const.py:366
+#: gajim/common/const.py:400
 msgid "In Love"
 msgstr "Forelsket"
 
-#: gajim/common/const.py:367
+#: gajim/common/const.py:401
 msgid "Indignant"
 msgstr "Indignert"
 
-#: gajim/common/const.py:368
+#: gajim/common/const.py:402
 msgid "Interested"
 msgstr "Interessert"
 
-#: gajim/common/const.py:369
+#: gajim/common/const.py:403
 msgid "Intoxicated"
 msgstr "Beruset"
 
-#: gajim/common/const.py:370
+#: gajim/common/const.py:404
 msgid "Invincible"
 msgstr "Uovervinnelig"
 
-#: gajim/common/const.py:371
+#: gajim/common/const.py:405
 msgid "Jealous"
 msgstr "Sjalu"
 
-#: gajim/common/const.py:372
+#: gajim/common/const.py:406
 msgid "Lonely"
 msgstr "Ensom"
 
-#: gajim/common/const.py:373
+#: gajim/common/const.py:407
 msgid "Lost"
 msgstr "Bortkommet"
 
-#: gajim/common/const.py:374
+#: gajim/common/const.py:408
 msgid "Lucky"
 msgstr "Heldig"
 
-#: gajim/common/const.py:375
+#: gajim/common/const.py:409
 msgid "Mean"
 msgstr "Slem"
 
-#: gajim/common/const.py:376
+#: gajim/common/const.py:410
 msgid "Moody"
 msgstr "Humørsyk"
 
-#: gajim/common/const.py:377
+#: gajim/common/const.py:411
 msgid "Nervous"
 msgstr "Nervøs"
 
-#: gajim/common/const.py:378
+#: gajim/common/const.py:412
 msgid "Neutral"
 msgstr "Nøytral"
 
-#: gajim/common/const.py:379
+#: gajim/common/const.py:413
 msgid "Offended"
 msgstr "Fornærmet"
 
-#: gajim/common/const.py:380
+#: gajim/common/const.py:414
 msgid "Outraged"
 msgstr "Opprørt"
 
-#: gajim/common/const.py:381
+#: gajim/common/const.py:415
 msgid "Playful"
 msgstr "Leken"
 
-#: gajim/common/const.py:382
+#: gajim/common/const.py:416
 msgid "Proud"
 msgstr "Stolt"
 
-#: gajim/common/const.py:383
+#: gajim/common/const.py:417
 msgid "Relaxed"
 msgstr "Avslappet"
 
-#: gajim/common/const.py:384
+#: gajim/common/const.py:418
 msgid "Relieved"
 msgstr "Lettet"
 
-#: gajim/common/const.py:385
+#: gajim/common/const.py:419
 msgid "Remorseful"
 msgstr "Angrende"
 
-#: gajim/common/const.py:386
+#: gajim/common/const.py:420
 msgid "Restless"
 msgstr "Rastløs"
 
-#: gajim/common/const.py:387
+#: gajim/common/const.py:421
 msgid "Sad"
 msgstr "Lei seg"
 
-#: gajim/common/const.py:388
+#: gajim/common/const.py:422
 msgid "Sarcastic"
 msgstr "Sarkastisk"
 
-#: gajim/common/const.py:389
+#: gajim/common/const.py:423
 msgid "Satisfied"
 msgstr "Tilfreds"
 
-#: gajim/common/const.py:390
+#: gajim/common/const.py:424
 msgid "Serious"
 msgstr "Seriøs"
 
-#: gajim/common/const.py:391
+#: gajim/common/const.py:425
 msgid "Shocked"
 msgstr "Sjokkert"
 
-#: gajim/common/const.py:392
+#: gajim/common/const.py:426
 msgid "Shy"
 msgstr "Blyg"
 
-#: gajim/common/const.py:393
+#: gajim/common/const.py:427
 msgid "Sick"
 msgstr "Syk"
 
-#: gajim/common/const.py:394
+#: gajim/common/const.py:428
 msgid "Sleepy"
 msgstr "Søvnig"
 
-#: gajim/common/const.py:395
+#: gajim/common/const.py:429
 msgid "Spontaneous"
 msgstr "Spontan"
 
-#: gajim/common/const.py:396
+#: gajim/common/const.py:430
 msgid "Stressed"
 msgstr "Stresset"
 
-#: gajim/common/const.py:397
+#: gajim/common/const.py:431
 msgid "Strong"
 msgstr "Sterk"
 
-#: gajim/common/const.py:398
+#: gajim/common/const.py:432
 msgid "Surprised"
 msgstr "Overrasket"
 
-#: gajim/common/const.py:399
+#: gajim/common/const.py:433
 msgid "Thankful"
 msgstr "Takknemlig"
 
-#: gajim/common/const.py:400
+#: gajim/common/const.py:434
 msgid "Thirsty"
 msgstr "Tørst"
 
-#: gajim/common/const.py:401
+#: gajim/common/const.py:435
 msgid "Tired"
 msgstr "Trøtt"
 
-#: gajim/common/const.py:402
+#: gajim/common/const.py:436
 msgid "Undefined"
 msgstr "Udefinert"
 
-#: gajim/common/const.py:403
+#: gajim/common/const.py:437
 msgid "Weak"
 msgstr "Svak"
 
-#: gajim/common/const.py:404
+#: gajim/common/const.py:438
 msgid "Worried"
 msgstr "Bekymret"
 
-#: gajim/common/const.py:408
+#: gajim/common/const.py:442
 msgid "accuracy"
 msgstr "nøyaktighet"
 
-#: gajim/common/const.py:409
+#: gajim/common/const.py:443
 msgid "alt"
 msgstr "alt"
 
-#: gajim/common/const.py:410
+#: gajim/common/const.py:444
 msgid "area"
 msgstr "område"
 
-#: gajim/common/const.py:411
+#: gajim/common/const.py:445
 msgid "bearing"
 msgstr "kurs"
 
-#: gajim/common/const.py:412
+#: gajim/common/const.py:446
 msgid "building"
 msgstr "bygning"
 
-#: gajim/common/const.py:413
+#: gajim/common/const.py:447
 msgid "country"
 msgstr "land"
 
-#: gajim/common/const.py:414
+#: gajim/common/const.py:448
 msgid "countrycode"
 msgstr "landskode"
 
-#: gajim/common/const.py:415
+#: gajim/common/const.py:449
 msgid "datum"
 msgstr "dato"
 
-#: gajim/common/const.py:416
+#: gajim/common/const.py:450
 msgid "description"
 msgstr "Beskrivelse"
 
-#: gajim/common/const.py:417
+#: gajim/common/const.py:451
 msgid "error"
 msgstr "feil"
 
-#: gajim/common/const.py:418
+#: gajim/common/const.py:452
 msgid "floor"
 msgstr "etasje"
 
-#: gajim/common/const.py:419
+#: gajim/common/const.py:453
 msgid "lat"
 msgstr "breddegrad"
 
-#: gajim/common/const.py:420
+#: gajim/common/const.py:454
 msgid "locality"
 msgstr "samhold"
 
-#: gajim/common/const.py:421
+#: gajim/common/const.py:455
 msgid "lon"
 msgstr "lengdegrad"
 
-#: gajim/common/const.py:422
+#: gajim/common/const.py:456
 msgid "postalcode"
 msgstr "postnummer"
 
-#: gajim/common/const.py:423
+#: gajim/common/const.py:457
 msgid "region"
 msgstr "fylke"
 
-#: gajim/common/const.py:424
+#: gajim/common/const.py:458
 msgid "room"
 msgstr "rom"
 
-#: gajim/common/const.py:425
+#: gajim/common/const.py:459
 msgid "speed"
 msgstr "hastighet"
 
-#: gajim/common/const.py:426
+#: gajim/common/const.py:460
 msgid "street"
 msgstr "gate"
 
-#: gajim/common/const.py:427
+#: gajim/common/const.py:461
 msgid "text"
 msgstr "tekst"
 
-#: gajim/common/const.py:428
+#: gajim/common/const.py:462
 msgid "timestamp"
 msgstr "tidsstempel"
 
-#: gajim/common/const.py:429
+#: gajim/common/const.py:463
 msgid "URI"
 msgstr ""
 
-#: gajim/common/const.py:434
+#: gajim/common/const.py:468
 msgid "Unable to get issuer certificate"
 msgstr "Ikke i stand til innhente utsteders sertifikat"
 
-#: gajim/common/const.py:435
+#: gajim/common/const.py:469
 msgid "Unable to get certificate CRL"
 msgstr "Ikke i stand til å skaffe sertifikatets CRL"
 
-#: gajim/common/const.py:436
+#: gajim/common/const.py:470
 msgid "Unable to decrypt certificate's signature"
 msgstr "Ikke i stand til å dekryptere sertifikatets signatur"
 
-#: gajim/common/const.py:437
+#: gajim/common/const.py:471
 msgid "Unable to decrypt CRL's signature"
 msgstr "Ikke i stand til å dekryptere CRL-ens signatur"
 
-#: gajim/common/const.py:438
+#: gajim/common/const.py:472
 msgid "Unable to decode issuer public key"
 msgstr "Klarer ikke å dekode usteders offentlige nøkkel"
 
-#: gajim/common/const.py:439
+#: gajim/common/const.py:473
 msgid "Certificate signature failure"
 msgstr "Sertifikat-signaturfeil"
 
-#: gajim/common/const.py:440
+#: gajim/common/const.py:474
 msgid "CRL signature failure"
 msgstr "CRL-signaturfeil"
 
-#: gajim/common/const.py:441
+#: gajim/common/const.py:475
 msgid "Certificate is not yet valid"
 msgstr "Sertifikatet er ikke gylig enda"
 
-#: gajim/common/const.py:442
+#: gajim/common/const.py:476
 msgid "Certificate has expired"
 msgstr "Sertifikatet har utløpt"
 
-#: gajim/common/const.py:443
+#: gajim/common/const.py:477
 msgid "CRL is not yet valid"
 msgstr "CRL er ikke gyldig enda"
 
-#: gajim/common/const.py:444
+#: gajim/common/const.py:478
 msgid "CRL has expired"
 msgstr "CRL har utgått"
 
-#: gajim/common/const.py:445
+#: gajim/common/const.py:479
 msgid "Format error in certificate's notBefore field"
 msgstr "Formateringsfeil i sertifkatets ikkeFør-felt"
 
-#: gajim/common/const.py:446
+#: gajim/common/const.py:480
 msgid "Format error in certificate's notAfter field"
 msgstr "Formateringsfeil i sertifikatets ikkeEtter-felt"
 
-#: gajim/common/const.py:447
+#: gajim/common/const.py:481
 msgid "Format error in CRL's lastUpdate field"
 msgstr "Formateringsfeil i CRL-ens sisteOppdatering-s-felt"
 
-#: gajim/common/const.py:448
+#: gajim/common/const.py:482
 msgid "Format error in CRL's nextUpdate field"
 msgstr "Formateringsfeil i CRL-ens nesteOppdatering-s-felt"
 
-#: gajim/common/const.py:449
+#: gajim/common/const.py:483
 msgid "Out of memory"
 msgstr "Tom for minne"
 
-#: gajim/common/const.py:450
+#: gajim/common/const.py:484
 msgid "Self signed certificate"
 msgstr "Selvsignert sertifikat"
 
-#: gajim/common/const.py:451
+#: gajim/common/const.py:485
 msgid "Self signed certificate in certificate chain"
 msgstr "Selvsignert sertifikat i sertifikatkjeden"
 
-#: gajim/common/const.py:452
+#: gajim/common/const.py:486
 msgid "Unable to get local issuer certificate"
 msgstr "Ute av stand til å få tak i lokal utsteders sertifikat"
 
-#: gajim/common/const.py:453
+#: gajim/common/const.py:487
 msgid "Unable to verify the first certificate"
 msgstr "Ute av stand til å bekrefte det første sertifikatet"
 
-#: gajim/common/const.py:454
+#: gajim/common/const.py:488
 msgid "Certificate chain too long"
 msgstr "Sertifikatskjeden er for lang"
 
-#: gajim/common/const.py:455
+#: gajim/common/const.py:489
 msgid "Certificate revoked"
 msgstr "Sertifikat tilbakekallt"
 
-#: gajim/common/const.py:456
+#: gajim/common/const.py:490
 msgid "Invalid CA certificate"
 msgstr "Ugyldig CA-sertifikat"
 
-#: gajim/common/const.py:457
+#: gajim/common/const.py:491
 msgid "Path length constraint exceeded"
 msgstr "Stilengde-begrensning overskredet"
 
-#: gajim/common/const.py:458
+#: gajim/common/const.py:492
 msgid "Unsupported certificate purpose"
 msgstr "Ikke støttet sertifkats-hensikt"
 
-#: gajim/common/const.py:459
+#: gajim/common/const.py:493
 msgid "Certificate not trusted"
 msgstr "Sertifikatet er ikke tiltrodd"
 
-#: gajim/common/const.py:460
+#: gajim/common/const.py:494
 msgid "Certificate rejected"
 msgstr "Sertifikat avvist"
 
-#: gajim/common/const.py:461
+#: gajim/common/const.py:495
 msgid "Subject issuer mismatch"
 msgstr "Emne-utsteder samsvarer ikke"
 
-#: gajim/common/const.py:462
+#: gajim/common/const.py:496
 msgid "Authority and subject key identifier mismatch"
 msgstr "Autoritet og emne-nøkkel-identifikator samsvarer ikke"
 
-#: gajim/common/const.py:463
+#: gajim/common/const.py:497
 msgid "Authority and issuer serial number mismatch"
 msgstr "Autoritet og utsteders seriernummer samsvarer ikke"
 
-#: gajim/common/const.py:464
+#: gajim/common/const.py:498
 msgid "Key usage does not include certificate signing"
 msgstr "Nøkkelbruk inkluderer ikke sertifikatssignering"
 
-#: gajim/common/const.py:465
+#: gajim/common/const.py:499
 msgid "Application verification failure"
 msgstr "Programbekreftelsesfeil"
 
@@ -5116,258 +5316,258 @@ msgstr "videoinndata"
 msgid "video output"
 msgstr "videoutdata"
 
-#: gajim/common/helpers.py:210
+#: gajim/common/helpers.py:216
 msgid "Server must be between 1 and 1023 bytes"
 msgstr "Tjeneren må være mellom 1 og 1023 byte"
 
-#: gajim/common/helpers.py:214
+#: gajim/common/helpers.py:220
 msgid "Invalid character in hostname."
 msgstr "Ugyldig tegn i vertsnavn."
 
-#: gajim/common/helpers.py:216
+#: gajim/common/helpers.py:222
 msgid "Server address required."
 msgstr "Tjener-adresse kreves."
 
-#: gajim/common/helpers.py:220
+#: gajim/common/helpers.py:226
 msgid "Username must be between 1 and 1023 bytes"
 msgstr "Brukernavnet må være mellom 1 og 1023 byte"
 
-#: gajim/common/helpers.py:224
+#: gajim/common/helpers.py:230
 msgid "Invalid character in username."
 msgstr "Ugyldig tegn i brukernavn."
 
-#: gajim/common/helpers.py:230
+#: gajim/common/helpers.py:236
 msgid "Resource must be between 1 and 1023 bytes"
 msgstr "Ressursen må være mellom 1 og 1023 byte"
 
-#: gajim/common/helpers.py:234
+#: gajim/common/helpers.py:240
 msgid "Invalid character in resource."
 msgstr "Ugyldig tegn i ressurs."
 
-#: gajim/common/helpers.py:275
+#: gajim/common/helpers.py:281
 msgid "_Busy"
 msgstr "_Opptatt"
 
-#: gajim/common/helpers.py:277 gajim/gtk/tooltips.py:647
+#: gajim/common/helpers.py:283 gajim/gtk/tooltips.py:647
 msgid "Busy"
 msgstr "Opptatt"
 
-#: gajim/common/helpers.py:280
+#: gajim/common/helpers.py:286
 msgid "_Not Available"
 msgstr "_Ikke tilgjengelig"
 
-#: gajim/common/helpers.py:282 gajim/gtk/tooltips.py:649
+#: gajim/common/helpers.py:288 gajim/gtk/tooltips.py:649
 msgid "Not Available"
 msgstr "Ikke tilgjengelig"
 
-#: gajim/common/helpers.py:285
+#: gajim/common/helpers.py:291
 msgid "_Free for Chat"
 msgstr "_Ledig for prat"
 
-#: gajim/common/helpers.py:287 gajim/gtk/tooltips.py:643
+#: gajim/common/helpers.py:293 gajim/gtk/tooltips.py:643
 msgid "Free for Chat"
 msgstr "Ledig for prat"
 
-#: gajim/common/helpers.py:290
+#: gajim/common/helpers.py:296
 msgid "?user status:_Available"
 msgstr "?user status:_Tilgjengelig"
 
-#: gajim/common/helpers.py:292 gajim/gtk/tooltips.py:641
+#: gajim/common/helpers.py:298 gajim/gtk/tooltips.py:641
 msgid "?user status:Available"
 msgstr "?user status:Tilgjengelig"
 
-#: gajim/common/helpers.py:294
+#: gajim/common/helpers.py:300
 msgid "Connecting"
 msgstr "Kobler til"
 
-#: gajim/common/helpers.py:297 gajim/data/gui/preferences_window.ui:1251
+#: gajim/common/helpers.py:303 gajim/data/gui/preferences_window.ui:1251
 msgid "A_way"
 msgstr "B_orte"
 
-#: gajim/common/helpers.py:299 gajim/common/modules/adhoc_commands.py:120
-#: gajim/command_system/implementation/standard.py:139
+#: gajim/common/helpers.py:305 gajim/common/modules/adhoc_commands.py:120
+#: gajim/command_system/implementation/standard.py:141
 #: gajim/gtk/tooltips.py:645
 msgid "Away"
 msgstr "Borte"
 
-#: gajim/common/helpers.py:302
+#: gajim/common/helpers.py:308
 msgid "_Offline"
 msgstr "_Frakoblet"
 
-#: gajim/common/helpers.py:304 gajim/gtk/tooltips.py:651
+#: gajim/common/helpers.py:310 gajim/gtk/tooltips.py:651
 msgid "Offline"
 msgstr "Frakoblet"
 
-#: gajim/common/helpers.py:307
+#: gajim/common/helpers.py:313
 msgid "_Invisible"
 msgstr "_Usynlig"
 
-#: gajim/common/helpers.py:313
+#: gajim/common/helpers.py:319
 msgid "?contact has status:Unknown"
 msgstr "?contact has status:Ukjent"
 
-#: gajim/common/helpers.py:315
+#: gajim/common/helpers.py:321
 msgid "?contact has status:Has errors"
 msgstr "?contact has status:Har feil"
 
-#: gajim/common/helpers.py:330
+#: gajim/common/helpers.py:336
 msgid "?Subscription we already have:None"
 msgstr "?Subscription we already have:Ingen"
 
-#: gajim/common/helpers.py:332
+#: gajim/common/helpers.py:338
 msgid "To"
 msgstr "Til"
 
-#: gajim/common/helpers.py:334 gajim/data/gui/groups_post_window.ui:33
+#: gajim/common/helpers.py:340 gajim/data/gui/groups_post_window.ui:33
 msgid "From"
 msgstr "Fra"
 
-#: gajim/common/helpers.py:336
+#: gajim/common/helpers.py:342
 msgid "Both"
 msgstr "Begge"
 
-#: gajim/common/helpers.py:338 gajim/gtk/server_info.py:151
+#: gajim/common/helpers.py:344 gajim/gtk/server_info.py:151
 #, fuzzy
 msgid "Unknown"
 msgstr "?OS:Ukjent"
 
-#: gajim/common/helpers.py:344
+#: gajim/common/helpers.py:350
 msgid "?Ask (for Subscription):None"
 msgstr "?Ask (for Subscription):Ingen"
 
-#: gajim/common/helpers.py:346
+#: gajim/common/helpers.py:352
 msgid "Subscribe"
 msgstr "Abonner"
 
-#: gajim/common/helpers.py:355
+#: gajim/common/helpers.py:361
 msgid "?Group Chat Contact Role:None"
 msgstr "?Group Chat Contact Role:Ingen"
 
-#: gajim/common/helpers.py:358
+#: gajim/common/helpers.py:364
 msgid "Moderators"
 msgstr "Moderatorer"
 
-#: gajim/common/helpers.py:360
+#: gajim/common/helpers.py:366
 msgid "Moderator"
 msgstr "Moderator"
 
-#: gajim/common/helpers.py:363
+#: gajim/common/helpers.py:369 gajim/data/gui/groupchat_info_scrolled.ui:243
 msgid "Participants"
 msgstr "Deltakere"
 
-#: gajim/common/helpers.py:365
+#: gajim/common/helpers.py:371
 msgid "Participant"
 msgstr "Deltaker"
 
-#: gajim/common/helpers.py:368
+#: gajim/common/helpers.py:374
 msgid "Visitors"
 msgstr "Besøkende"
 
-#: gajim/common/helpers.py:370
+#: gajim/common/helpers.py:376
 msgid "Visitor"
 msgstr "Besøk"
 
-#: gajim/common/helpers.py:376 gajim/gtk/tooltips.py:253
+#: gajim/common/helpers.py:382 gajim/gtk/tooltips.py:253
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "?Group Chat Contact Affiliation:Ingen"
 
-#: gajim/common/helpers.py:378 gajim/data/gui/groupchat_config.ui:32
+#: gajim/common/helpers.py:384 gajim/data/gui/groupchat_config.ui:32
 #: gajim/gtk/tooltips.py:259
 msgid "Owner"
 msgstr "Eier"
 
-#: gajim/common/helpers.py:380 gajim/gtk/tooltips.py:257
+#: gajim/common/helpers.py:386 gajim/gtk/tooltips.py:257
 msgid "Administrator"
 msgstr "Administrator"
 
-#: gajim/common/helpers.py:382 gajim/data/gui/groupchat_config.ui:40
+#: gajim/common/helpers.py:388 gajim/data/gui/groupchat_config.ui:40
 #: gajim/gtk/tooltips.py:255 gajim/gtk/groupchat_config.py:105
 msgid "Member"
 msgstr "Medlem"
 
-#: gajim/common/helpers.py:421
+#: gajim/common/helpers.py:427
 msgid "is paying attention to the conversation"
 msgstr "fokuserer på samtalen"
 
-#: gajim/common/helpers.py:423
+#: gajim/common/helpers.py:429
 msgid "is doing something else"
 msgstr "gjør noe annet"
 
-#: gajim/common/helpers.py:425
+#: gajim/common/helpers.py:431
 msgid "is composing a message…"
 msgstr ""
 "tilkjennegir blodets hvisken og benpipernes bøn fra det ubevisste sjeleliv…"
 
-#: gajim/common/helpers.py:428
+#: gajim/common/helpers.py:434
 msgid "paused composing a message"
 msgstr "tok pause i meldingsskrivingen"
 
-#: gajim/common/helpers.py:430
+#: gajim/common/helpers.py:436
 msgid "has closed the chat window or tab"
 msgstr "har lukket samtalevinduet eller fanen"
 
-#: gajim/common/helpers.py:936 gajim/common/helpers.py:943
+#: gajim/common/helpers.py:942 gajim/common/helpers.py:949
 #, 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:950
-#, python-format
-msgid "from room %s"
-msgstr "fra rommet %s"
+#: gajim/common/helpers.py:956
+#, fuzzy, python-format
+msgid "from group chat %s"
+msgstr "i _gruppesamtaler"
 
-#: gajim/common/helpers.py:953 gajim/common/helpers.py:970
+#: gajim/common/helpers.py:959 gajim/common/helpers.py:976
 #, python-format
 msgid "from user %s"
 msgstr "fra brukeren %s"
 
-#: gajim/common/helpers.py:955
+#: gajim/common/helpers.py:961
 #, python-format
 msgid "from %s"
 msgstr "fra %s"
 
-#: gajim/common/helpers.py:962 gajim/common/helpers.py:968
+#: gajim/common/helpers.py:968 gajim/common/helpers.py:974
 #, 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:986 gajim/common/helpers.py:998
+#: gajim/common/helpers.py:992 gajim/common/helpers.py:1004
 #: gajim/data/gui/roster_window.ui:85 data/org.gajim.Gajim.desktop.in:4
 #: data/org.gajim.Gajim.appdata.xml.in:9
 msgid "Gajim"
 msgstr "Gajim"
 
-#: gajim/common/helpers.py:1000
+#: gajim/common/helpers.py:1006
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: gajim/common/helpers.py:1109 gajim/data/gui/add_new_contact_window.ui:25
+#: gajim/common/helpers.py:1115 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:1111
+#: gajim/common/helpers.py:1117
 msgid "Hello, I am $name."
 msgstr "Hei, jeg er $name."
 
-#: gajim/common/helpers.py:1215 gajim/common/helpers.py:1224
-#: gajim/common/helpers.py:1282
+#: gajim/common/helpers.py:1221 gajim/common/helpers.py:1230
+#: gajim/common/helpers.py:1288
 msgid "Timeout loading image"
 msgstr "Tidsavbrudd ved innlasting av bilde"
 
-#: gajim/common/helpers.py:1234 gajim/common/helpers.py:1280
+#: gajim/common/helpers.py:1240 gajim/common/helpers.py:1286
 msgid "Image is too big"
 msgstr "Bildet er for stort"
 
-#: gajim/common/helpers.py:1245
+#: gajim/common/helpers.py:1251
 msgid "PyCURL is not installed"
 msgstr "PyCURL er ikke intallert"
 
-#: gajim/common/helpers.py:1284
+#: gajim/common/helpers.py:1290
 msgid "Error loading image"
 msgstr "Feil ved innlasting av bilde"
 
@@ -5548,7 +5748,8 @@ msgstr "Statusen har blitt endret."
 
 #: gajim/common/modules/adhoc_commands.py:202
 #: gajim/common/modules/adhoc_commands.py:239
-msgid "Leave Groupchats"
+#, fuzzy
+msgid "Leave Group Chats"
 msgstr "Forlat gruppesamtaler"
 
 #: gajim/common/modules/adhoc_commands.py:228
@@ -5557,15 +5758,18 @@ msgid "%(nickname)s on %(room_jid)s"
 msgstr "%(nickname)s fra %(room_jid)s"
 
 #: gajim/common/modules/adhoc_commands.py:232
-msgid "You have not joined a groupchat."
+#, fuzzy
+msgid "You have not joined a group chat."
 msgstr "Du har ikke tatt del i en gruppesamtale."
 
 #: gajim/common/modules/adhoc_commands.py:240
-msgid "Choose the groupchats you want to leave"
+#, fuzzy
+msgid "Choose the group chats you want to leave"
 msgstr "Velg hvilke samtalegrupper du ønsker å forlate"
 
 #: gajim/common/modules/adhoc_commands.py:289
-msgid "You left the following groupchats:"
+#, fuzzy
+msgid "You left the following group chats:"
 msgstr "Du gikk ut av følgende gruppesamtaler:"
 
 #: gajim/common/modules/roster_item_exchange.py:102
@@ -5581,7 +5785,7 @@ msgstr "Sendte kontakter:"
 msgid "Blocked Contacts"
 msgstr "Blokkerte kontakter"
 
-#: gajim/data/gui/destroy_muc_dialog.ui:79 gajim/gtk/dialogs.py:736
+#: gajim/data/gui/destroy_muc_dialog.ui:79 gajim/gtk/dialogs.py:563
 msgid "Destroy this group chat permanently?"
 msgstr ""
 
@@ -5590,7 +5794,7 @@ msgstr ""
 msgid "Reason..."
 msgstr "Grunn"
 
-#: gajim/data/gui/destroy_muc_dialog.ui:124 gajim/gtk/dialogs.py:738
+#: gajim/data/gui/destroy_muc_dialog.ui:124 gajim/gtk/dialogs.py:565
 msgid "Where participants should go (optional)"
 msgstr ""
 
@@ -5603,34 +5807,6 @@ msgstr ""
 msgid "_Reason and alternate venue (optional)"
 msgstr "Du kan også skrive inn et alternativt møtested:"
 
-#: gajim/data/gui/advanced_configuration_window.ui:7
-#: gajim/data/gui/preferences_window.ui:2723
-#, fuzzy
-msgid "Advanced Configuration Editor (ACE)"
-msgstr "Avansert oppsettsbehandlder"
-
-#: gajim/data/gui/advanced_configuration_window.ui:52
-#, fuzzy
-msgid "You should restart Gajim for some changes to take effect"
-msgstr ""
-"<b>MERK:</b> Du bør starte Gajim på nytt for at noen instillinger skal "
-"aktiveres"
-
-#: gajim/data/gui/advanced_configuration_window.ui:84
-#, fuzzy
-msgid "_Filter"
-msgstr "_Filter:"
-
-#: gajim/data/gui/advanced_configuration_window.ui:153
-#: gajim/data/gui/filetransfers_send_file_dialog.ui:15
-#: gajim/gtk/discovery.py:1666
-msgid "Description"
-msgstr "Beskrivelse"
-
-#: gajim/data/gui/advanced_configuration_window.ui:197
-msgid "_Reset to default"
-msgstr "_Tilbakestill til forvalg"
-
 #: gajim/data/gui/join_groupchat_window.ui:56
 #: gajim/data/gui/chat_to_muc_window.ui:67
 #: gajim/data/gui/chat_to_muc_window.ui:78
@@ -5643,9 +5819,8 @@ msgid "Join group chat every time Gajim is started"
 msgstr "Ta del i denne gruppesludringen hver gang Gajim startes"
 
 #: gajim/data/gui/join_groupchat_window.ui:113
-#, fuzzy
-msgid "Auto Join"
-msgstr "A_utomatisk deltagelse"
+msgid "Join Automatically"
+msgstr ""
 
 #: gajim/data/gui/join_groupchat_window.ui:131
 #: gajim/data/gui/profile_window.ui:233
@@ -5653,10 +5828,12 @@ msgid "Account"
 msgstr "Konto"
 
 #: gajim/data/gui/join_groupchat_window.ui:147
-msgid "Room"
-msgstr "Rom"
+#, fuzzy
+msgid "Group chat"
+msgstr "Gruppesamtaler"
 
-#: gajim/data/gui/join_groupchat_window.ui:180 gajim/gtk/accounts.py:886
+#: gajim/data/gui/join_groupchat_window.ui:180 gajim/data/gui/bookmarks.ui:158
+#: gajim/gtk/accounts.py:889
 msgid "Password"
 msgstr "Passord"
 
@@ -5679,89 +5856,10 @@ 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:1271
+#: gajim/data/gui/join_groupchat_window.ui:437 gajim/gtk/discovery.py:1270
 msgid "Join"
 msgstr "Ta del"
 
-#: gajim/data/gui/manage_proxies_window.ui:12
-msgid "HTTP Connect"
-msgstr "HTTP-tilkobling"
-
-#: gajim/data/gui/manage_proxies_window.ui:15
-msgid "SOCKS5"
-msgstr "SOCKS5"
-
-#: gajim/data/gui/manage_proxies_window.ui:18
-msgid "BOSH"
-msgstr "BOSH"
-
-#: gajim/data/gui/manage_proxies_window.ui:27
-msgid "Manage Proxy Profiles"
-msgstr "Behandle mellomtjener-profiler"
-
-#: gajim/data/gui/manage_proxies_window.ui:83
-#, fuzzy
-msgid "Add Proxy"
-msgstr "Mellomtjener"
-
-#: gajim/data/gui/manage_proxies_window.ui:97
-#, fuzzy
-msgid "Remove Proxy"
-msgstr "Fjern gruppe"
-
-#: gajim/data/gui/manage_proxies_window.ui:141
-#, fuzzy
-msgid "Properties"
-msgstr "<b>Egenskaper</b>"
-
-#: gajim/data/gui/manage_proxies_window.ui:157
-#, fuzzy
-msgid "_Name"
-msgstr "_Navn:"
-
-#: gajim/data/gui/manage_proxies_window.ui:173
-#, fuzzy
-msgid "_Type"
-msgstr "_Skriv:"
-
-#: gajim/data/gui/manage_proxies_window.ui:236
-#, fuzzy
-msgid "_BOSH URL"
-msgstr "_BOSH-nettadresse:"
-
-#: gajim/data/gui/manage_proxies_window.ui:261
-msgid "Use HTTP prox_y"
-msgstr "Bruk HTTP-mellomtjene_r"
-
-#: gajim/data/gui/manage_proxies_window.ui:280
-#, fuzzy
-msgid "Proxy _Host"
-msgstr "_Vert for mellomtjener:"
-
-#: gajim/data/gui/manage_proxies_window.ui:307
-#, fuzzy
-msgid "Proxy _Port"
-msgstr "Mellomtjener-_port:"
-
-#: gajim/data/gui/manage_proxies_window.ui:334
-#, fuzzy
-msgid "_Username"
-msgstr "_Brukernavn:"
-
-#: gajim/data/gui/manage_proxies_window.ui:347
-msgid "Use proxy auth_entication"
-msgstr "Bruk bekreft_else av mellomtjener"
-
-#: gajim/data/gui/manage_proxies_window.ui:377
-#, fuzzy
-msgid "Pass_word"
-msgstr "Pass_ord:"
-
-#: gajim/data/gui/manage_proxies_window.ui:405 gajim/gtk/adhoc.py:321
-#, fuzzy
-msgid "Settings"
-msgstr "Sludresnarveier"
-
 #: gajim/data/gui/change_password_dialog.ui:17
 #, fuzzy
 msgid "New Password"
@@ -5792,11 +5890,13 @@ msgid "Status:"
 msgstr "Status:"
 
 #: gajim/data/gui/zeroconf_information_window.ui:89
-msgid "_Log conversation history"
+#, fuzzy
+msgid "_Store conversation history"
 msgstr "_Loggfør samtalehistorikk"
 
 #: gajim/data/gui/zeroconf_information_window.ui:215
 #: gajim/data/gui/vcard_information_window.ui:390
+#: gajim/data/gui/groupchat_info_scrolled.ui:166
 msgid "Contact"
 msgstr "Kontakt"
 
@@ -5809,8 +5909,9 @@ msgid "Last Name:"
 msgstr "Etternavn:"
 
 #: gajim/data/gui/zeroconf_information_window.ui:260
-msgid "Jabber ID:"
-msgstr "XMPP-ID:"
+#, fuzzy
+msgid "XMPP Address:"
+msgstr "AIM-adresse:"
 
 #: gajim/data/gui/zeroconf_information_window.ui:273
 msgid "E-Mail:"
@@ -5830,8 +5931,9 @@ msgid "Send _File"
 msgstr "Send _fil"
 
 #: gajim/data/gui/gc_occupants_menu.ui:29
-msgid "Occupant Actions"
-msgstr "Deltager-handlinger"
+#, fuzzy
+msgid "Participant Actions"
+msgstr "Deltakere"
 
 #: gajim/data/gui/gc_occupants_menu.ui:38
 msgid "_Voice"
@@ -5862,8 +5964,9 @@ msgid "_Ban"
 msgstr "_Bannlys"
 
 #: gajim/data/gui/gc_occupants_menu.ui:124
-msgid "_Add to Roster"
-msgstr "_Legg til i kontaktliste"
+#, fuzzy
+msgid "_Add to Contact List"
+msgstr "Legg til kontakt…"
 
 #: gajim/data/gui/gc_occupants_menu.ui:132
 msgid "_Execute command"
@@ -5898,11 +6001,6 @@ msgstr "Abonnement:"
 msgid "_Status"
 msgstr "_Status"
 
-#: gajim/data/gui/zeroconf_context_menu.ui:26
-#: gajim/data/gui/account_context_menu.ui:79
-msgid "_Modify Account..."
-msgstr "_Endre konto…"
-
 #: gajim/data/gui/certificate_dialog.ui:66
 #: gajim/data/gui/certificate_dialog.ui:178
 msgid "Common Name (CN)"
@@ -5984,13 +6082,19 @@ msgstr "Sist endret:"
 msgid "Next entry"
 msgstr "Neste oppføring"
 
+#: gajim/data/gui/filetransfers_send_file_dialog.ui:15
+#: gajim/data/gui/advanced_configuration.ui:143
+#: gajim/data/gui/groupchat_info_scrolled.ui:48 gajim/gtk/discovery.py:1663
+msgid "Description"
+msgstr "Beskrivelse"
+
 #: gajim/data/gui/filetransfers_send_file_dialog.ui:54
 #, fuzzy
 msgid "_Send Files"
 msgstr "Send _fil"
 
 #: gajim/data/gui/filetransfers_send_file_dialog.ui:58
-#: gajim/gtk/xml_console.py:90
+#: gajim/gtk/xml_console.py:87
 msgid "Send"
 msgstr "Send"
 
@@ -6014,20 +6118,23 @@ msgid "Change _Nickname..."
 msgstr "Endre _kallenavn…"
 
 #: gajim/data/gui/gc_control_popup_menu.ui:20
-msgid "_Manage Room"
-msgstr "_Valg for rom"
+#, fuzzy
+msgid "_Manage Group Chat"
+msgstr "_Ny gruppesamtale"
 
 #: gajim/data/gui/gc_control_popup_menu.ui:31
 msgid "Change _Subject..."
 msgstr "Endre _tema…"
 
 #: gajim/data/gui/gc_control_popup_menu.ui:38
-msgid "Configure _Room..."
-msgstr "Sett opp _rom…"
+#, fuzzy
+msgid "Configure _Group Chat..."
+msgstr "Bli med i _Gruppe Samtale..."
 
 #: gajim/data/gui/gc_control_popup_menu.ui:52
-msgid "_Destroy Room"
-msgstr "_Kanseller rom"
+#, fuzzy
+msgid "_Destroy Group Chat"
+msgstr "_Ny gruppesamtale"
 
 #: gajim/data/gui/gc_control_popup_menu.ui:64
 msgid "_Minimize on close"
@@ -6037,7 +6144,7 @@ msgstr "_Minimer ved lukking"
 msgid "_Request Voice"
 msgstr "_Forespør stemmegratiale"
 
-#: gajim/data/gui/gc_control_popup_menu.ui:99 gajim/gtk/discovery.py:1704
+#: gajim/data/gui/gc_control_popup_menu.ui:99
 msgid "_Bookmark"
 msgstr "_Bokmerke"
 
@@ -6087,13 +6194,6 @@ msgstr "Hjemmeside:"
 msgid "E-Mail"
 msgstr "E-post:"
 
-#: 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/blocking_list.ui:115 gajim/gtk/add_contact.py:30
-#: gajim/gtk/accounts.py:801
-msgid "Jabber ID"
-msgstr "XMPP-ID"
-
 #: gajim/data/gui/profile_window.ui:440
 msgid "Main"
 msgstr ""
@@ -6225,35 +6325,44 @@ msgstr "Jobb"
 msgid "About"
 msgstr "Om"
 
-#: gajim/data/gui/start_chat_dialog.ui:114 gajim/gtk/discovery.py:1658
-msgid "Users"
-msgstr "Brukere"
+#: gajim/data/gui/start_chat_dialog.ui:53
+#, fuzzy
+msgid "Global Group Chat Search"
+msgstr "Ta del i gruppesamtale"
 
-#: gajim/data/gui/start_chat_dialog.ui:185
-msgid "Name:"
-msgstr "Navn:"
+#: 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
+msgid "_Back"
+msgstr "Straks tilbake"
 
-#: gajim/data/gui/start_chat_dialog.ui:197
-msgid "Description:"
-msgstr "Beskrivelse:"
+#: gajim/data/gui/start_chat_dialog.ui:245
+#: gajim/data/gui/groupchat_control.ui:796
+#: gajim/data/gui/groupchat_control.ui:888 gajim/gtk/discovery.py:1701
+#: gajim/gtk/groupchat_join.py:62
+msgid "_Join"
+msgstr "_Delta"
 
-#: gajim/data/gui/start_chat_dialog.ui:209
+#: gajim/data/gui/start_chat_dialog.ui:289
 #, fuzzy
-msgid "Address:"
-msgstr "_Adresse:"
+msgid "Select Account"
+msgstr "Fjerner kontoen %s"
 
-#: gajim/data/gui/start_chat_dialog.ui:246
-msgid ""
-"Semi-Anonymous\n"
-"<span size=\"small\">(Only moderators can see your XMPP-Address)</span>"
-msgstr ""
+#: gajim/data/gui/start_chat_dialog.ui:380
+#, fuzzy
+msgid "_Select"
+msgstr "Tøm fil"
 
 #: gajim/data/gui/filetransfers.ui:21
 #, fuzzy
 msgid "Pa_use/Resume"
 msgstr "_Fortsett"
 
-#: gajim/data/gui/filetransfers.ui:30 gajim/gtk/filechoosers.py:178
+#: gajim/data/gui/filetransfers.ui:30 gajim/data/gui/groupchat_control.ui:575
+#: gajim/data/gui/groupchat_control.ui:667
+#: gajim/data/gui/groupchat_control.ui:779
+#: gajim/data/gui/groupchat_control.ui:871 gajim/gtk/filechoosers.py:178
 msgid "_Cancel"
 msgstr "_Avbryt"
 
@@ -6295,7 +6404,8 @@ msgid "Cancel the selected file transfer and remove incomplete files"
 msgstr "Avbryter valgte overføringer og fjerner uferdige filer"
 
 #: gajim/data/gui/filetransfers.ui:207
-msgid "Shows a list of file transfers between you and others"
+#, fuzzy
+msgid "Shows a list of file transfers between you and your contacts"
 msgstr "Viser en liste over filoverføringer mellom deg og andre"
 
 #: gajim/data/gui/groupchat_control.ui:13 gajim/data/gui/chat_control.ui:277
@@ -6315,7 +6425,6 @@ msgid "Strike"
 msgstr "Gjennomstrek"
 
 #: gajim/data/gui/groupchat_control.ui:54 gajim/data/gui/chat_control.ui:318
-#: gajim/gtk/advanced_config.py:86
 msgid "Color"
 msgstr "Farge"
 
@@ -6327,16 +6436,46 @@ msgstr "Skrift"
 msgid "Clear formatting"
 msgstr "Fjern formatering"
 
-#: gajim/data/gui/groupchat_control.ui:290 gajim/data/gui/chat_control.ui:880
+#: gajim/data/gui/groupchat_control.ui:291 gajim/data/gui/chat_control.ui:880
 #, fuzzy
 msgid "Choose encryption"
 msgstr "Velg kryptering"
 
-#: gajim/data/gui/groupchat_control.ui:336 gajim/data/gui/chat_control.ui:640
+#: gajim/data/gui/groupchat_control.ui:337 gajim/data/gui/chat_control.ui:640
 #, fuzzy
 msgid "Show a list of emojis (Alt+M)"
 msgstr "Vis en liste over smilefjes (Alt+M)"
 
+#: gajim/data/gui/groupchat_control.ui:484
+#, fuzzy
+msgid "Joining…"
+msgstr "Bannlyser…"
+
+#: gajim/data/gui/groupchat_control.ui:496
+msgid "_Abort"
+msgstr ""
+
+#: gajim/data/gui/groupchat_control.ui:542
+#, fuzzy
+msgid "Enter new nickname"
+msgstr "E_tter kallenavn:"
+
+#: gajim/data/gui/groupchat_control.ui:592
+#: gajim/data/gui/groupchat_control.ui:684
+#, fuzzy
+msgid "Ch_ange"
+msgstr "Endre kallenavn"
+
+#: gajim/data/gui/groupchat_control.ui:761
+#, fuzzy
+msgid "Enter password"
+msgstr "Skriv inn nytt passord:"
+
+#: gajim/data/gui/groupchat_control.ui:1067
+#, fuzzy
+msgid "_Try again"
+msgstr "Bekreft igjen…"
+
 #: gajim/data/gui/popup_notification_window.ui:42
 msgid "Event Type"
 msgstr "Hendelsestype"
@@ -6404,8 +6543,9 @@ msgid "Always"
 msgstr "Alltid"
 
 #: gajim/data/gui/mam_preferences.ui:18
-msgid "Roster"
-msgstr "Kontaktliste"
+#, fuzzy
+msgid "Contact List"
+msgstr "Kontakter"
 
 #: gajim/data/gui/mam_preferences.ui:22
 #: gajim/data/gui/preferences_window.ui:123
@@ -6429,11 +6569,11 @@ msgid "Add"
 msgstr "Legg til"
 
 #: gajim/data/gui/mam_preferences.ui:194 gajim/data/gui/groupchat_config.ui:151
-#: gajim/gtk/dialogs.py:63 gajim/gtk/accounts.py:381
+#: gajim/gtk/dialogs.py:62 gajim/gtk/accounts.py:384
 msgid "Remove"
 msgstr "Fjern"
 
-#: gajim/data/gui/vcard_information_window.ui:72 gajim/gtk/accounts.py:753
+#: gajim/data/gui/vcard_information_window.ui:72 gajim/gtk/accounts.py:756
 msgid "Resource"
 msgstr "Ressurs"
 
@@ -6482,6 +6622,7 @@ msgstr "Abonnement:"
 #: gajim/data/gui/vcard_information_window.ui:974
 #: gajim/data/gui/vcard_information_window.ui:993
 #: gajim/data/gui/vcard_information_window.ui:1427
+#: gajim/data/gui/groupchat_info_scrolled.ui:222
 msgid "button"
 msgstr "knapp"
 
@@ -6510,15 +6651,18 @@ msgid "Notify me about it"
 msgstr "Gi meg beskjed om det"
 
 #: gajim/data/gui/preferences_window.ui:58
-msgid "Show only in roster"
-msgstr "Vis bare i kontaktliste"
+#, fuzzy
+msgid "Show only in contact list"
+msgstr "Kun vis aktive kontakter"
 
 #: gajim/data/gui/preferences_window.ui:69
-msgid "Detached roster with detached chats"
+#, fuzzy
+msgid "Detached contact list with detached chats"
 msgstr "Avhektet kontaktliste med avhektede samtaler"
 
 #: gajim/data/gui/preferences_window.ui:72
-msgid "Detached roster with single chat"
+#, fuzzy
+msgid "Detached contact list with single chat"
 msgstr "Avhektet kontaktliste med enkeltsående samtale"
 
 #: gajim/data/gui/preferences_window.ui:75
@@ -6526,11 +6670,13 @@ msgid "Single window for everything"
 msgstr "Ett enkelt vindu for alt"
 
 #: gajim/data/gui/preferences_window.ui:78
-msgid "Detached roster with chat grouped by account"
+#, fuzzy
+msgid "Detached contact list with chat grouped by account"
 msgstr "Avhektet kontaktliste med samtaler gruppert etter konto"
 
 #: gajim/data/gui/preferences_window.ui:81
-msgid "Detached roster with chat grouped by type"
+#, fuzzy
+msgid "Detached contact list with chat grouped by type"
 msgstr "Avhektet kontaktliste med samtaler gruppert etter type"
 
 #: gajim/data/gui/preferences_window.ui:92
@@ -6581,7 +6727,7 @@ msgstr "_Vindusoppførsel:"
 
 #: gajim/data/gui/preferences_window.ui:296
 #, fuzzy
-msgid "_Show roster on startup"
+msgid "_Show contact list on startup"
 msgstr "_Vis kontaktliste ved oppstart:"
 
 #: gajim/data/gui/preferences_window.ui:311
@@ -6598,12 +6744,12 @@ msgid "_Tabs placement"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:363
-msgid "_Quit Gajim when closing roster window"
+msgid "_Quit Gajim when closing contact list"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:367
 msgid ""
-"If enabled, Gajim will quit when closing the roster window instead of "
+"If enabled, Gajim will quit when closing the contact list window instead of "
 "minimizing to the system's notification area"
 msgstr ""
 
@@ -6613,42 +6759,43 @@ msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:423
 #, fuzzy
-msgid "Show a_vatars of contacts in roster"
+msgid "Show a_vatars of contacts in contact list"
 msgstr "Viser a_vatarer for kontakter i kontaktlisten"
 
 #: gajim/data/gui/preferences_window.ui:427
 #, fuzzy
 msgid ""
-"If checked, avatars of contacts will be shown in the roster window and in "
-"group chats"
+"If checked, avatars of contacts will be shown in the contact list window and "
+"in group chats"
 msgstr ""
 "Dersom valgt vil Gajim vise avatarer for kontakter i kontaktlistevinduet og "
 "i gruppesamtaler"
 
 #: gajim/data/gui/preferences_window.ui:441
 #, fuzzy
-msgid "Show status _messages of contacts in roster"
+msgid "Show status _messages of contacts in contact list"
 msgstr "Viser status_meldinger for kontakter i kontaktlisten"
 
 #: gajim/data/gui/preferences_window.ui:445
 #, fuzzy
 msgid ""
 "If checked, status messages of contacts will be shown under the contact's "
-"name, in the roster window, and in group chats"
+"name, in the contact list window, and in group chats"
 msgstr ""
 "Dersom valgt vil Gajim vise statusmelding tilhørende kontakter under "
 "kontaktnavnet i kontaktlistevinduet og i gruppesludringer"
 
 #: gajim/data/gui/preferences_window.ui:459
 #, fuzzy
-msgid "Show e_xtra information of contacts in roster (mood, activity, ...)"
+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
 msgid ""
-"If checked, additional info published by the contact will be shown in "
-"roster. Additional infos (published via PEP) may include e.g. mood, "
+"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 ""
 
@@ -6657,8 +6804,9 @@ msgid "Sort contacts by status"
 msgstr "Sorter kontakter etter status"
 
 #: gajim/data/gui/preferences_window.ui:494
-msgid "in _roster"
-msgstr "i _kontaktliste"
+#, fuzzy
+msgid "in _contact list"
+msgstr "Sendte kontakter:"
 
 #: gajim/data/gui/preferences_window.ui:511
 msgid "in _group chats"
@@ -6666,8 +6814,8 @@ msgstr "i _gruppesamtaler"
 
 #: gajim/data/gui/preferences_window.ui:540
 #, fuzzy
-msgid "Roster Appearance"
-msgstr "<b>Kontaktlistevisning</b>"
+msgid "Contact List Appearance"
+msgstr "Utveksling av kontaktlisteelement"
 
 #: gajim/data/gui/preferences_window.ui:585
 #, fuzzy
@@ -6733,7 +6881,7 @@ msgstr "Kunne ikke ta del i gruppesamtale"
 
 #: gajim/data/gui/preferences_window.ui:660
 #, fuzzy
-msgid "If checked, the room subject will be shown when joining a group chat"
+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:682
@@ -6748,13 +6896,13 @@ msgstr ""
 #: gajim/data/gui/preferences_window.ui:701
 msgid ""
 "If join/leave status messages are shown in the group chat. This setting can "
-"be overridden in the groupchat menu."
+"be overridden in the group chat menu."
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:720
 msgid ""
 "The default sync threshold for new public group chats. This setting can be "
-"overridden in the groupchat menu."
+"overridden in the group chat menu."
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:722
@@ -6769,7 +6917,7 @@ msgstr "_Vis statusendringer"
 #: gajim/data/gui/preferences_window.ui:768
 msgid ""
 "If status change messages are shown in the group chat. This setting can be "
-"overridden in the groupchat menu."
+"overridden in the group chat menu."
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:825
@@ -6788,8 +6936,8 @@ msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:843
 #, fuzzy
-msgid "Show chatstate in roster"
-msgstr "Viser a_vatarer for kontakter i kontaktlisten"
+msgid "Show chatstate in contact list"
+msgstr "Vis lukkingsknapp på fanen?"
 
 #: gajim/data/gui/preferences_window.ui:847
 msgid ""
@@ -7104,7 +7252,7 @@ msgstr "Videostørrelse"
 msgid "Vi_ew own video source"
 msgstr "Vis egen videokilde"
 
-#: gajim/data/gui/preferences_window.ui:2281 gajim/gtk/accounts.py:352
+#: gajim/data/gui/preferences_window.ui:2281 gajim/gtk/accounts.py:355
 msgid "Connection"
 msgstr "Tilkobling"
 
@@ -7163,7 +7311,8 @@ msgid "_Manage..."
 msgstr "_Behandle…"
 
 #: gajim/data/gui/preferences_window.ui:2616
-msgid "_Log status changes of contacts"
+#, fuzzy
+msgid "_Store status changes of contacts in history"
 msgstr "_Loggfør statusendringer tilhørende kontakter"
 
 #: gajim/data/gui/preferences_window.ui:2633
@@ -7189,10 +7338,15 @@ msgstr ""
 msgid "_Open..."
 msgstr "_Åpne…"
 
+#: gajim/data/gui/preferences_window.ui:2723 gajim/gtk/advanced_config.py:84
+#, fuzzy
+msgid "Advanced Configuration Editor (ACE)"
+msgstr "Avansert oppsettsbehandlder"
+
 #: gajim/data/gui/groupchat_config.ui:55
 #, fuzzy
 msgid ""
-"<b>Jabber-ID</b>\n"
+"<b>XMPP Address</b>\n"
 "&lt;user@domain/resource&gt; (only that resource matches)\n"
 "&lt;user@domain&gt; (any resource matches)\n"
 "&lt;domain/resource&gt; (only that resource matches)\n"
@@ -7211,7 +7365,8 @@ msgstr ""
 msgid "Only Admins and Owners can modify the affiliation"
 msgstr ""
 
-#: gajim/data/gui/groupchat_config.ui:270 gajim/plugins/gui.py:312
+#: gajim/data/gui/groupchat_config.ui:270
+#: gajim/data/gui/groupchat_info_scrolled.ui:210 gajim/plugins/gui.py:324
 msgid "Configuration"
 msgstr "Oppsett"
 
@@ -7243,7 +7398,7 @@ msgid "Start _Chat"
 msgstr "Start _samtale"
 
 #: gajim/data/gui/contact_context_menu.ui:20
-#: gajim/data/gui/systray_context_menu.ui:36
+#: gajim/data/gui/systray_context_menu.ui:29
 msgid "Send Single _Message..."
 msgstr "Send enkeltstående _melding…"
 
@@ -7300,17 +7455,45 @@ msgid "_Ignore"
 msgstr "_Ignorer"
 
 #: gajim/data/gui/contact_context_menu.ui:174
-msgid "_Add to Roster..."
-msgstr "_Legg til i kontaktliste…"
+#, fuzzy
+msgid "_Add to Contact List..."
+msgstr "_Legg til kontakt…"
+
+#: gajim/data/gui/advanced_configuration.ui:39
+#, fuzzy
+msgid "You should restart Gajim for some changes to take effect"
+msgstr ""
+"<b>MERK:</b> Du bør starte Gajim på nytt for at noen instillinger skal "
+"aktiveres"
+
+#: gajim/data/gui/advanced_configuration.ui:71
+#, fuzzy
+msgid "_Filter"
+msgstr "_Filter:"
+
+#: gajim/data/gui/advanced_configuration.ui:88
+msgid "Type to search for values..."
+msgstr ""
+
+#: gajim/data/gui/advanced_configuration.ui:180
+#, fuzzy
+msgid "_Reset Value"
+msgstr "_Tilbakestill til forvalg"
+
+#: gajim/data/gui/advanced_configuration.ui:185
+#, fuzzy
+msgid "Resets value to default"
+msgstr "_Tilbakestill til forvalg"
 
 #: gajim/data/gui/account_creation_wizard_window.ui:43
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim: Veiviser for konto-opprettelse"
 
 #: gajim/data/gui/account_creation_wizard_window.ui:70
+#, fuzzy
 msgid ""
 "You need to have an account in order to connect\n"
-"to the Jabber network."
+"to the XMPP network."
 msgstr ""
 "En konto kreves for tilkobling\n"
 "til XMPP-nettverket."
@@ -7332,8 +7515,9 @@ msgid "<b>Please fill in the data for your existing account</b>"
 msgstr "<b>Fyll in detaljer for eksisterende konto</b>"
 
 #: gajim/data/gui/account_creation_wizard_window.ui:187
-msgid "_Jabber ID:"
-msgstr "_XMPP-ID:"
+#, fuzzy
+msgid "_XMPP Address:"
+msgstr "AIM-adresse:"
 
 #: gajim/data/gui/account_creation_wizard_window.ui:239
 #: gajim/data/gui/account_creation_wizard_window.ui:394
@@ -7420,6 +7604,7 @@ msgid "Privacy Lists:"
 msgstr "Personverns-lister:"
 
 #: gajim/data/gui/service_discovery_window.ui:111
+#: gajim/data/gui/groupchat_creation.ui:227
 #, fuzzy
 msgid "_Address"
 msgstr "_Adresse:"
@@ -7437,11 +7622,6 @@ msgstr "Samkjøring : velg kontakter"
 msgid "Select the contacts you want to synchronise"
 msgstr "Velg kontaktene du ønsker å flette"
 
-#: gajim/data/gui/groupchat_invitation_received.ui:42
-#, fuzzy
-msgid "Group Chat Invitation"
-msgstr "Invitasjon til gruppesamtale"
-
 #: gajim/data/gui/groupchat_invitation_received.ui:111
 #, fuzzy
 msgid "Message..."
@@ -7494,11 +7674,10 @@ msgstr "<b><big>Innkommende samtale</big></b>"
 
 #: gajim/data/gui/add_new_contact_window.ui:84
 #, fuzzy
-msgid "_Jabber ID"
-msgstr "_XMPP-ID:"
+msgid "_XMPP Address"
+msgstr "_Adresse:"
 
 #: gajim/data/gui/add_new_contact_window.ui:100
-#: gajim/data/gui/manage_bookmarks_window.ui:192
 #, fuzzy
 msgid "_Nickname"
 msgstr "_Kallenavn:"
@@ -7574,7 +7753,7 @@ msgstr "<b>Humør:</b>"
 msgid "<b>Message:</b>"
 msgstr "<b>Melding:</b>"
 
-#: gajim/data/gui/plugins_window.ui:10 gajim/data/gui/application_menu.ui:90
+#: gajim/data/gui/plugins_window.ui:10 gajim/data/gui/application_menu.ui:87
 msgid "Plugins"
 msgstr "Tillegg"
 
@@ -7682,10 +7861,6 @@ msgstr "Tillat"
 msgid "Deny"
 msgstr "Nekt"
 
-#: gajim/data/gui/privacy_list_window.ui:317
-msgid "JabberID"
-msgstr "XMPP-ID"
-
 #: gajim/data/gui/privacy_list_window.ui:358
 msgid "all in the group"
 msgstr "alle i gruppen"
@@ -7726,7 +7901,7 @@ msgstr "Rekkefølge:"
 msgid "Manage sounds"
 msgstr "Behandle lyder"
 
-#: gajim/data/gui/manage_sounds_window.ui:55 gajim/plugins/gui.py:100
+#: gajim/data/gui/manage_sounds_window.ui:55 gajim/plugins/gui.py:101
 msgid "Active"
 msgstr "Påslått"
 
@@ -7764,30 +7939,120 @@ msgstr "Fjern konto fra Gajim og fra _tjeneren"
 msgid "_Personal Events"
 msgstr "_Personlige hendelser"
 
-#: gajim/data/gui/account_context_menu.ui:35
-#: gajim/data/gui/systray_context_menu.ui:28
-msgid "Join _Group Chat"
-msgstr "Ta del i en _gruppesamtale"
-
-#: gajim/data/gui/account_context_menu.ui:49
+#: gajim/data/gui/account_context_menu.ui:41
 msgid "_Add Contact..."
 msgstr "_Legg til kontakt…"
 
-#: gajim/data/gui/account_context_menu.ui:57
+#: gajim/data/gui/account_context_menu.ui:49
 msgid "_Discover Services"
 msgstr "_Oppdag tjenester"
 
-#: gajim/data/gui/account_context_menu.ui:65
+#: gajim/data/gui/account_context_menu.ui:57
 msgid "_Execute Command..."
 msgstr "_Kjør kommando…"
 
+#: gajim/data/gui/account_context_menu.ui:65
+#, fuzzy
+msgid "_View Certificate"
+msgstr "Vis sertifikat…"
+
+#: gajim/data/gui/manage_proxies.ui:12
+#, fuzzy
+msgctxt "proxy configuration"
+msgid "HTTP Connect"
+msgstr "HTTP-tilkobling"
+
+#: gajim/data/gui/manage_proxies.ui:15
+#, fuzzy
+msgctxt "proxy configuration"
+msgid "SOCKS5"
+msgstr "SOCKS5"
+
+#: gajim/data/gui/manage_proxies.ui:18
+#, fuzzy
+msgctxt "proxy configuration"
+msgid "BOSH"
+msgstr "BOSH"
+
+#: gajim/data/gui/manage_proxies.ui:68
+#, fuzzy
+msgid "Add Proxy"
+msgstr "Mellomtjener"
+
+#: gajim/data/gui/manage_proxies.ui:82
+#, fuzzy
+msgid "Remove Proxy"
+msgstr "Fjern gruppe"
+
+#: gajim/data/gui/manage_proxies.ui:134
+#, fuzzy
+msgid "Pass_word"
+msgstr "Pass_ord:"
+
+#: gajim/data/gui/manage_proxies.ui:159
+msgid "Use proxy auth_entication"
+msgstr "Bruk bekreft_else av mellomtjener"
+
+#: gajim/data/gui/manage_proxies.ui:179
+#, fuzzy
+msgid "_Username"
+msgstr "_Brukernavn:"
+
+#: gajim/data/gui/manage_proxies.ui:209
+#, fuzzy
+msgid "_Port"
+msgstr "_Port:"
+
+#: gajim/data/gui/manage_proxies.ui:226
+msgid "example.org"
+msgstr ""
+
+#: gajim/data/gui/manage_proxies.ui:240
+#, fuzzy
+msgid "_Host"
+msgstr "_Maskin:"
+
+#: gajim/data/gui/manage_proxies.ui:254
+msgid "Use HTTP prox_y"
+msgstr "Bruk HTTP-mellomtjene_r"
+
+#: gajim/data/gui/manage_proxies.ui:275
+msgid "https://example.org/http-bind/"
+msgstr ""
+
+#: gajim/data/gui/manage_proxies.ui:291
+#, fuzzy
+msgid "_BOSH URL"
+msgstr "_BOSH-nettadresse:"
+
+#: gajim/data/gui/manage_proxies.ui:309 gajim/gtk/adhoc.py:322
+#, fuzzy
+msgid "Settings"
+msgstr "Sludresnarveier"
+
+#: gajim/data/gui/manage_proxies.ui:344
+#, fuzzy
+msgid "_Type"
+msgstr "_Skriv:"
+
+#: gajim/data/gui/manage_proxies.ui:361
+#: gajim/data/gui/groupchat_creation.ui:105
+#, fuzzy
+msgid "_Name"
+msgstr "_Navn:"
+
+#: gajim/data/gui/manage_proxies.ui:391 gajim/gtk/accounts.py:742
+msgid "Proxy"
+msgstr "Mellomtjener"
+
 #: gajim/data/gui/application_menu.ui:8
 msgid "View"
 msgstr "Vis"
 
 #: gajim/data/gui/application_menu.ui:11
-msgid "Show Roster"
-msgstr "Vis _kontaktliste"
+#, fuzzy
+msgid "Show Contact List"
+msgstr "Vis aktive kontakter"
 
 #: gajim/data/gui/application_menu.ui:16
 msgid "Show Offline Contacts"
@@ -7822,21 +8087,23 @@ msgstr "Tastatursnarveier"
 msgid "Features"
 msgstr "Funksjonalitet"
 
-#: gajim/data/gui/application_menu.ui:81
-msgid "Bookmarks"
-msgstr "Bokmerker"
+#: gajim/data/gui/application_menu.ui:77
+#: gajim/data/gui/groupchat_creation.ui:81 gajim/gtk/groupchat_creation.py:45
+#, fuzzy
+msgid "Create Group Chat"
+msgstr "Forlat gruppesamtaler"
 
-#: gajim/data/gui/application_menu.ui:94 gajim/data/gui/shortcuts_window.ui:189
-#: gajim/gtk/preferences.py:59
+#: gajim/data/gui/application_menu.ui:91 gajim/data/gui/shortcuts_window.ui:189
+#: gajim/gtk/preferences.py:58
 msgid "Preferences"
 msgstr "Tilstedeværelse"
 
-#: gajim/data/gui/application_menu.ui:99
+#: gajim/data/gui/application_menu.ui:96
 msgid "Quit"
 msgstr "Avslutt"
 
 #: gajim/data/gui/httpupload_progress_dialog.ui:110
-#: gajim/gtk/filetransfer.py:121
+#: gajim/gtk/filetransfer.py:120
 msgid "Progress"
 msgstr "Fremdrift"
 
@@ -7854,53 +8121,33 @@ msgstr ""
 msgid "_Cancel Upload"
 msgstr "_Avbryt"
 
-#: gajim/data/gui/manage_bookmarks_window.ui:13
-#, fuzzy
-msgid "Group Chat Bookmarks"
-msgstr "Gruppe Samtale"
-
-#: gajim/data/gui/manage_bookmarks_window.ui:68
-#, fuzzy
-msgid "Add Bookmark"
-msgstr "Bokmerke"
-
-#: gajim/data/gui/manage_bookmarks_window.ui:82
-#, fuzzy
-msgid "Remove Bookmark"
-msgstr "Bokmerke"
-
-#: gajim/data/gui/manage_bookmarks_window.ui:126
-msgid "N_ame"
+#: gajim/data/gui/groupchat_creation.ui:27
+msgid "Public or Private?"
 msgstr ""
 
-#: gajim/data/gui/manage_bookmarks_window.ui:145
-#, fuzzy
-msgid "Bookmark Name"
-msgstr "Bokmerk rommet"
+#: 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 ""
 
-#: gajim/data/gui/manage_bookmarks_window.ui:160
-#, fuzzy
-msgid "_Server"
-msgstr "_Tjener:"
+#: gajim/data/gui/groupchat_creation.ui:58
+msgid "<b>Public:</b> Anyone who knows the address can join."
+msgstr ""
 
-#: gajim/data/gui/manage_bookmarks_window.ui:223
+#: gajim/data/gui/groupchat_creation.ui:122
 #, fuzzy
-msgid "Roo_m"
-msgstr "Ro_m:"
+msgid "_Description"
+msgstr "Beskrivelse"
 
-#: gajim/data/gui/manage_bookmarks_window.ui:253
-#, fuzzy
-msgid "_Password"
-msgstr "_Passord:"
+#: gajim/data/gui/groupchat_creation.ui:164
+msgid "_Public"
+msgstr ""
 
-#: gajim/data/gui/manage_bookmarks_window.ui:299
+#: gajim/data/gui/groupchat_creation.ui:278
 #, fuzzy
-msgid "Join chat when connected"
-msgstr "Kontakt frakoblet"
-
-#: gajim/data/gui/manage_bookmarks_window.ui:307
-msgid "_Join Automatically"
-msgstr ""
+msgid "_Account"
+msgstr "_Kontoer"
 
 #: gajim/data/gui/exception_dialog.ui:49
 msgid "Sorry, that should not have happened"
@@ -7944,6 +8191,28 @@ msgstr "Godkjenn kontakt slik at vedkommende kan vite når du er tilkoblet"
 msgid "Presets"
 msgstr "Forvalg"
 
+#: gajim/data/gui/groupchat_info_scrolled.ui:32
+msgid "Address"
+msgstr "Adresse"
+
+#: gajim/data/gui/groupchat_info_scrolled.ui:64
+msgid "Topic"
+msgstr ""
+
+#: gajim/data/gui/groupchat_info_scrolled.ui:80
+#, fuzzy
+msgid "Author"
+msgstr "Utviklere:"
+
+#: gajim/data/gui/groupchat_info_scrolled.ui:182
+msgid "Discussion Logs"
+msgstr ""
+
+#: gajim/data/gui/groupchat_info_scrolled.ui:260
+#, fuzzy
+msgid "Group Chat Language"
+msgstr "Invitasjon til gruppesamtale"
+
 #: gajim/data/gui/emoji_chooser.ui:98
 #, fuzzy
 msgid "No Results Found"
@@ -7954,25 +8223,36 @@ msgid "Invite Friends!"
 msgstr "Inviter venner!"
 
 #: gajim/data/gui/chat_to_muc_window.ui:39
+#, fuzzy
 msgid ""
-"You are now entering a groupchat.\n"
+"You are now entering a group chat.\n"
 "Select the contacts you want to invite"
 msgstr ""
 "Du tar nå del i en gruppesludring.\n"
 "Velg kontaktene du ønsker å invitere"
 
 #: gajim/data/gui/chat_to_muc_window.ui:112
-msgid "Please select a MUC server."
+#, fuzzy
+msgid "Please select a group chat server."
 msgstr "Velg en MUC-tjener."
 
 #: gajim/data/gui/chat_to_muc_window.ui:141
-msgid "MUC server"
-msgstr "MUC-tjener"
+#, fuzzy
+msgid "Group chat server"
+msgstr "Gruppesludringsstøtte"
 
 #: gajim/data/gui/chat_to_muc_window.ui:176
 msgid "In_vite"
 msgstr "In_viter"
 
+#: gajim/data/gui/bookmarks.ui:176
+msgid "Autojoin"
+msgstr "Bli med automatisk"
+
+#: gajim/data/gui/bookmarks.ui:211
+msgid "_Apply"
+msgstr ""
+
 #: gajim/data/gui/history_manager.ui:11
 msgid "_Export"
 msgstr "_Eksporter"
@@ -7987,12 +8267,13 @@ msgid "Gajim History Logs Manager"
 msgstr "Behandling av logghistorikk i Gajim"
 
 #: gajim/data/gui/history_manager.ui:108
+#, fuzzy
 msgid ""
-"This log manager is not intended for log viewing. If you are looking for "
-"such functionality, use the history window instead.\n"
+"This history manager is not intended for viewing chat history. If you are "
+"looking for such functionality, please use the history window instead.\n"
 "\n"
-"Use this program to delete or export logs. You can select logs from the left "
-"and/or search database from below."
+"You can use this program to delete or export history. Either select logs "
+"from the left or search the database."
 msgstr ""
 "Denne logg-behandleren er ikke ment for logg-visning. Dersom du er på utkikk "
 "etter slik funksjonalitet må du bruke historikk-vinduet.\n"
@@ -8043,7 +8324,8 @@ msgid "Select an emoji"
 msgstr "Velg et humørfjes"
 
 #: gajim/data/gui/shortcuts_window.ui:38
-msgid "Complete a command or a nick"
+#, fuzzy
+msgid "Complete a command or a nickname"
 msgstr "Fullfør en kommando eller et kallenavn"
 
 #: gajim/data/gui/shortcuts_window.ui:45
@@ -8079,7 +8361,7 @@ msgstr "Rull oppover"
 msgid "Scroll down"
 msgstr "Rull nedover"
 
-#: gajim/data/gui/shortcuts_window.ui:100 gajim/gtk/xml_console.py:72
+#: gajim/data/gui/shortcuts_window.ui:100 gajim/gtk/xml_console.py:69
 msgid "Clear"
 msgstr "Tøm"
 
@@ -8120,8 +8402,9 @@ msgid "Close chat"
 msgstr "Lukk sludring"
 
 #: gajim/data/gui/shortcuts_window.ui:173
-msgid "Roster Shortcuts"
-msgstr "Kontaktlistesnarveier"
+#, fuzzy
+msgid "Contact List Shortcuts"
+msgstr "Sludresnarveier"
 
 #: gajim/data/gui/shortcuts_window.ui:196
 msgid "File transfers"
@@ -8148,7 +8431,8 @@ msgid "Show only active contacts"
 msgstr "Kun vis aktive kontakter"
 
 #: gajim/data/gui/shortcuts_window.ui:251
-msgid "Enable roster filtering"
+#, fuzzy
+msgid "Enable contact list filtering"
 msgstr "Skru på kontaktlistefiltrering"
 
 #: gajim/data/gui/shortcuts_window.ui:259
@@ -8193,12 +8477,12 @@ msgstr "Søker kun innen valgt dag"
 
 #: gajim/data/gui/history_window.ui:317
 #, fuzzy
-msgid "Record history for this chat"
+msgid "Store history for this chat"
 msgstr "Se bort fra denne feilen for dette sertifikatet."
 
 #: gajim/data/gui/history_window.ui:332
 #, fuzzy
-msgid "Record History"
+msgid "Store History"
 msgstr "Nylig historikk"
 
 #: gajim/data/gui/history_window.ui:350
@@ -8218,9 +8502,10 @@ msgstr "Lag en ny post"
 msgid "Fill in the form."
 msgstr "Fyll inn skjemaet."
 
-#: gajim/data/gui/data_form_window.ui:229
-msgid "Room Configuration"
-msgstr "Rom-innstillinger"
+#: gajim/data/gui/data_form_window.ui:229 gajim/gtk/groupchat_config.py:41
+#, fuzzy
+msgid "Group Chat Configuration"
+msgstr "Invitasjon til gruppesamtale"
 
 #: gajim/data/gui/roster_item_exchange_window.ui:39
 #: gajim/gtk/roster_item_exchange.py:35
@@ -8241,15 +8526,15 @@ msgstr "Sta_tus"
 msgid "_Start Chat..."
 msgstr "_Start samtale…"
 
-#: gajim/data/gui/systray_context_menu.ui:50
+#: gajim/data/gui/systray_context_menu.ui:43
 msgid "Show All Pending _Events"
 msgstr "Vis alle _handlinger på vent"
 
-#: gajim/data/gui/systray_context_menu.ui:59
+#: gajim/data/gui/systray_context_menu.ui:52
 msgid "Mute Sounds"
 msgstr "Slå av lyder"
 
-#: gajim/data/gui/systray_context_menu.ui:75
+#: gajim/data/gui/systray_context_menu.ui:68
 msgid "_Preferences"
 msgstr "_Innstillinger"
 
@@ -8338,35 +8623,35 @@ msgstr "Kjør uttrykk i et skall, vis utdata"
 msgid "Execute expression inside a shell, send output"
 msgstr "Kjør uttrykk i et skall, send utdata"
 
-#: gajim/command_system/implementation/standard.py:45
+#: gajim/command_system/implementation/standard.py:47
 msgid ""
 "Show help on a given command or a list of available commands if -a is given"
 msgstr ""
 "Viser hjelp for en gitt kommando eller en liste over tilgjengelige "
 "kommandoer hvis -a blir lagt til"
 
-#: gajim/command_system/implementation/standard.py:73
+#: gajim/command_system/implementation/standard.py:75
 msgid "Send a message to the contact"
 msgstr "Send en melding til kontakten"
 
-#: gajim/command_system/implementation/standard.py:78
+#: gajim/command_system/implementation/standard.py:80
 msgid "Send action (in the third person) to the current chat"
 msgstr "Send handling (i tredjeperson) til gjeldende samtale"
 
-#: gajim/command_system/implementation/standard.py:83
+#: gajim/command_system/implementation/standard.py:85
 msgid "Show logged messages which mention given text"
 msgstr "Vis loggførte meldinger som siterer angitt tekst"
 
-#: gajim/command_system/implementation/standard.py:88
+#: gajim/command_system/implementation/standard.py:90
 #, python-format
 msgid "%s: Nothing found"
 msgstr "%s: Fant ikke noe"
 
-#: gajim/command_system/implementation/standard.py:94
+#: gajim/command_system/implementation/standard.py:96
 msgid "Limit must be an integer"
 msgstr "Avgrensningen må være et heltall"
 
-#: gajim/command_system/implementation/standard.py:118
+#: gajim/command_system/implementation/standard.py:120
 msgid ""
 "\n"
 "    Set the current status\n"
@@ -8382,120 +8667,129 @@ msgstr ""
 "    'Pålogget', 'Borte', 'Prater', 'Ikke tilgjengelig', Ikke forstyrr'.\n"
 "    "
 
-#: gajim/command_system/implementation/standard.py:136
+#: gajim/command_system/implementation/standard.py:138
 msgid "Set the current status to away"
 msgstr "Sett gjeldende status til 'Borte'"
 
-#: gajim/command_system/implementation/standard.py:150
+#: gajim/command_system/implementation/standard.py:152
 msgid "Set the current status to online"
 msgstr "Sett gjeldende status til 'Pålogget'"
 
-#: gajim/command_system/implementation/standard.py:153
+#: gajim/command_system/implementation/standard.py:155
 msgid "Available"
 msgstr "Tilgjengelig"
 
-#: gajim/command_system/implementation/standard.py:173
-#: gajim/command_system/implementation/standard.py:250
+#: gajim/command_system/implementation/standard.py:175
+#: gajim/command_system/implementation/standard.py:252
 msgid "Clear the text window"
 msgstr "Tøm tekstvinduet"
 
-#: gajim/command_system/implementation/standard.py:178
-#: gajim/command_system/implementation/standard.py:397
+#: gajim/command_system/implementation/standard.py:180
+#: gajim/command_system/implementation/standard.py:401
 msgid "Send a ping to the contact"
 msgstr "Send et ping til kontakten"
 
-#: gajim/command_system/implementation/standard.py:181
-#: gajim/command_system/implementation/standard.py:400
+#: gajim/command_system/implementation/standard.py:183
+#: gajim/command_system/implementation/standard.py:404
 msgid "Command is not supported for zeroconf accounts"
 msgstr "Kommando støttes ikke for zeroconf-kontoer"
 
-#: gajim/command_system/implementation/standard.py:185
-msgid "Send DTMF sequence through an open audio session"
+#: gajim/command_system/implementation/standard.py:187
+#, fuzzy
+msgid "Send DTMF sequence through an open voice chat"
 msgstr "Send DTMF-sekvens gjennom en åpen lydøkt"
 
-#: gajim/command_system/implementation/standard.py:188
-msgid "No open audio sessions with the contact"
+#: gajim/command_system/implementation/standard.py:190
+#, fuzzy
+msgid "No open voice chats with the contact"
 msgstr "Ingen åpne lydsamtaler med denne kontakten"
 
-#: gajim/command_system/implementation/standard.py:191
+#: gajim/command_system/implementation/standard.py:193
 #, python-format
 msgid "%s is not a valid tone"
 msgstr "%s er ikke en gyldig tone"
 
-#: gajim/command_system/implementation/standard.py:198
-msgid "Toggle audio session"
-msgstr "Veksle lydøkt"
+#: gajim/command_system/implementation/standard.py:200
+msgid "Toggle Voice Chat"
+msgstr ""
 
-#: gajim/command_system/implementation/standard.py:201
-msgid "Audio sessions are not available"
-msgstr "Lydøkter er ikke tilgjengelige"
+#: gajim/command_system/implementation/standard.py:203
+#, fuzzy
+msgid "Voice chats are not available"
+msgstr "Videoøkter er ikke tilgjengelige"
 
-#: gajim/command_system/implementation/standard.py:208
-msgid "Toggle video session"
+#: gajim/command_system/implementation/standard.py:210
+#, fuzzy
+msgid "Toggle Video Chat"
 msgstr "Veksle videoøkt"
 
-#: gajim/command_system/implementation/standard.py:211
-msgid "Video sessions are not available"
+#: gajim/command_system/implementation/standard.py:213
+#, fuzzy
+msgid "Video chats are not available"
 msgstr "Videoøkter er ikke tilgjengelige"
 
-#: gajim/command_system/implementation/standard.py:218
+#: gajim/command_system/implementation/standard.py:220
 #, fuzzy
 msgid "Send a message to the contact that will attract their attention"
 msgstr "Send en melding til kontakten som påkaller vedkommendes oppmerksomhet"
 
-#: gajim/command_system/implementation/standard.py:255
+#: gajim/command_system/implementation/standard.py:257
 msgid "Change your nickname in a group chat"
 msgstr "Endre kallenavnet ditt i en gruppesamtale"
 
-#: gajim/command_system/implementation/standard.py:260 gajim/gtk/dialogs.py:674
-#: gajim/gtk/bookmarks.py:272
+#: gajim/command_system/implementation/standard.py:262
 msgid "Invalid nickname"
 msgstr "Ugyldig kallenavn"
 
-#: gajim/command_system/implementation/standard.py:267
-msgid "Open a private chat window with a specified occupant"
+#: gajim/command_system/implementation/standard.py:269
+#, fuzzy
+msgid "Open a private chat window with a specified participant"
 msgstr "Åpne privat samtalevindu med gitt deltager"
 
-#: gajim/command_system/implementation/standard.py:273
-#: gajim/command_system/implementation/standard.py:282
-#: gajim/command_system/implementation/standard.py:332
-#: gajim/command_system/implementation/standard.py:345
-#: gajim/command_system/implementation/standard.py:357
+#: gajim/command_system/implementation/standard.py:275
+#: gajim/command_system/implementation/standard.py:284
+#: gajim/command_system/implementation/standard.py:336
+#: gajim/command_system/implementation/standard.py:349
+#: gajim/command_system/implementation/standard.py:361
 msgid "Nickname not found"
 msgstr "Fant ikke kallenavnet"
 
-#: gajim/command_system/implementation/standard.py:276
+#: gajim/command_system/implementation/standard.py:278
+#, fuzzy
 msgid ""
-"Open a private chat window with a specified occupant and send him a message"
+"Open a private chat window with a specified participant and send him a "
+"message"
 msgstr ""
 "Åpne privat samtalevindu med en gitt deltager og send vedkommende en melding"
 
-#: gajim/command_system/implementation/standard.py:285
+#: gajim/command_system/implementation/standard.py:287
 msgid "Display or change a group chat topic"
 msgstr "Vis eller endre gruppens samtaletema"
 
-#: gajim/command_system/implementation/standard.py:294
-msgid "Invite a user to a room for a reason"
+#: gajim/command_system/implementation/standard.py:296
+#, fuzzy
+msgid "Invite a user to a group chat for a reason"
 msgstr "Inviter en bruker til et rom av en grunn"
 
-#: gajim/command_system/implementation/standard.py:297
+#: gajim/command_system/implementation/standard.py:299
 #, python-format
 msgid "Invited %(jid)s to %(room_jid)s"
 msgstr "Inviterte %(jid)s til %(room_jid)s"
 
-#: gajim/command_system/implementation/standard.py:301
+#: gajim/command_system/implementation/standard.py:303
 #, fuzzy
-msgid "Join a group chat given by a JID"
+msgid "Join a group chat given by an XMPP Address"
 msgstr "Ta del i gruppesludring gitt av JID"
 
-#: gajim/command_system/implementation/standard.py:309
+#: gajim/command_system/implementation/standard.py:313
+#, fuzzy
 msgid ""
-"Leave the groupchat, optionally giving a reason, and close tab or window"
+"Leave the group chat, optionally giving a reason, and close tab or window"
 msgstr ""
 "Forlat gruppesamtalen, alternativt ved å oppgi en grunn, og lukk fanen eller "
 "vinduet"
 
-#: gajim/command_system/implementation/standard.py:314
+#: gajim/command_system/implementation/standard.py:318
 #, fuzzy
 msgid ""
 "\n"
@@ -8510,13 +8804,15 @@ msgstr ""
 "    Hvis oppgitt kallenavn finnes vil det bli behandlet som en JID.\n"
 "    "
 
-#: gajim/command_system/implementation/standard.py:329
-msgid "Kick user by a nick from a groupchat"
+#: gajim/command_system/implementation/standard.py:333
+#, fuzzy
+msgid "Kick user by a nick from a group chat"
 msgstr "Kast ut bruker fra gruppesamtale etter kallenavn"
 
-#: gajim/command_system/implementation/standard.py:338
+#: gajim/command_system/implementation/standard.py:342
+#, fuzzy
 msgid ""
-"Set occupant role in group chat.\n"
+"Set participant role in group chat.\n"
 "    Role can be given as one of the following values:\n"
 "    moderator, participant, visitor, none"
 msgstr ""
@@ -8524,13 +8820,14 @@ msgstr ""
 "    Rolle kan være en av følgende verdier:\n"
 "    'moderator','deltager','besøkende' eller 'ingen'"
 
-#: gajim/command_system/implementation/standard.py:343
+#: gajim/command_system/implementation/standard.py:347
 msgid "Invalid role given"
 msgstr "Ugyldig rolle oppgitt"
 
-#: gajim/command_system/implementation/standard.py:350
+#: gajim/command_system/implementation/standard.py:354
+#, fuzzy
 msgid ""
-"Set occupant affiliation in group chat.\n"
+"Set participant affiliation in group chat.\n"
 "    Affiliation can be given as one of the following values:\n"
 "    owner, admin, member, outcast, none"
 msgstr ""
@@ -8538,20 +8835,23 @@ msgstr ""
 "    Tilhørighet kan oppgis som én av følgende verdier:\n"
 "    'eier', 'admin', 'medlem', 'einstøing', 'ingen'"
 
-#: gajim/command_system/implementation/standard.py:355
+#: gajim/command_system/implementation/standard.py:359
 msgid "Invalid affiliation given"
 msgstr "Ugyldig tilhørighet angitt"
 
-#: gajim/command_system/implementation/standard.py:365
-msgid "Display names of all group chat occupants"
+#: gajim/command_system/implementation/standard.py:369
+#, fuzzy
+msgid "Display names of all group chat participants"
 msgstr "Vis navnene til hele gruppens samtaledeltagere"
 
-#: gajim/command_system/implementation/standard.py:387
-msgid "Forbid an occupant to send you public or private messages"
+#: gajim/command_system/implementation/standard.py:391
+#, fuzzy
+msgid "Forbid a participant to send you public or private messages"
 msgstr "Forby en deltager fra å sende deg offentlige eller private meldinger"
 
-#: gajim/command_system/implementation/standard.py:392
-msgid "Allow an occupant to send you public or private messages"
+#: gajim/command_system/implementation/standard.py:396
+#, fuzzy
+msgid "Allow a participant to send you public or private messages"
 msgstr "Tillat en deltager å sende deg offentlige eller private meldinger"
 
 #: gajim/command_system/implementation/middleware.py:74
@@ -8563,201 +8863,329 @@ msgid "The same as using a doc-string, except it supports translation"
 msgstr ""
 "Det samme som å bruke en doc-streng, bortsett fra at det støtter oversetting"
 
-#: gajim/gtk/filetransfer.py:91
+#: gajim/gtk/groupchat_info.py:36
+#, fuzzy
+msgid "?Group chat feature:Archiving"
+msgstr "Invitasjon til gruppesamtale"
+
+#: gajim/gtk/groupchat_info.py:37
+#, fuzzy
+msgid "Messages are archived on the server"
+msgstr "Denne økta VIL bli arkivert på tjeneren"
+
+#: gajim/gtk/groupchat_info.py:40
+#, fuzzy
+msgid "?Group chat feature:Persistent"
+msgstr "Gruppesludringsstøtte"
+
+#: gajim/gtk/groupchat_info.py:41
+msgid "This group chat persists even if there are no participants"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:45
+#, fuzzy
+msgid "?Group chat feature:Temporary"
+msgstr "?Group Chat Contact Role:Ingen"
+
+#: gajim/gtk/groupchat_info.py:46
+msgid "This group chat will be destroyed once the last participant left"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:50
+#, fuzzy
+msgid "?Group chat feature:Moderated"
+msgstr "?Group Chat Contact Role:Ingen"
+
+#: gajim/gtk/groupchat_info.py:51
+msgid ""
+"Participants entering this group chat need to request permission to send "
+"messages"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:55
+#, fuzzy
+msgid "?Group chat feature:Not Moderated"
+msgstr "Gruppesludringsstøtte"
+
+#: gajim/gtk/groupchat_info.py:56
+msgid "Participants entering this group chat are allowed to send messages"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:60
+#, fuzzy
+msgid "?Group chat feature:Open"
+msgstr "?Group Chat Contact Role:Ingen"
+
+#: gajim/gtk/groupchat_info.py:61
+#, fuzzy
+msgid "Anyone can join this group chat"
+msgstr "%s har tatt del i gruppesamtalen"
+
+#: gajim/gtk/groupchat_info.py:64
+#, fuzzy
+msgid "?Group chat feature:Members Only"
+msgstr "Fremheving av gruppesamtale:"
+
+#: gajim/gtk/groupchat_info.py:65
+msgid "This group chat is restricted to members only"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:69
+#, fuzzy
+msgid "?Group chat feature:Public"
+msgstr "Fremheving av gruppesamtale:"
+
+#: gajim/gtk/groupchat_info.py:70
+msgid "Group chat can be found via search"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:73
+#, fuzzy
+msgid "?Group chat feature:Hidden"
+msgstr "?Group Chat Contact Role:Ingen"
+
+#: gajim/gtk/groupchat_info.py:74
+#, fuzzy
+msgid "This group chat can not be found via search"
+msgstr "Dette gruppesamtalerommet har ikke tittel"
+
+#: gajim/gtk/groupchat_info.py:77
+#, fuzzy
+msgid "?Group chat feature:Not Anonymous"
+msgstr "Gruppesludringsstøtte"
+
+#: gajim/gtk/groupchat_info.py:78
+msgid "All other group chat participants can see your XMPP address"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:82
+#, fuzzy
+msgid "?Group chat feature:Semi-Anonymous"
+msgstr "Fremheving av gruppesamtale:"
+
+#: gajim/gtk/groupchat_info.py:83
+msgid "Only moderators can see your XMPP address"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:86
+#, fuzzy
+msgid "?Group chat feature:Password Required"
+msgstr "Gruppesludringsstøtte"
+
+#: gajim/gtk/groupchat_info.py:87
+msgid "This group chat does require a password upon entry"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:91
+#, fuzzy
+msgid "?Group chat feature:No Password Required"
+msgstr "Gruppesludringsstøtte"
+
+#: gajim/gtk/groupchat_info.py:92
+msgid "This group chat does not require a password upon entry"
+msgstr ""
+
+#: gajim/gtk/filetransfer.py:90
 msgid "File"
 msgstr "Fil"
 
-#: gajim/gtk/filetransfer.py:108
+#: gajim/gtk/filetransfer.py:107
 msgid "Time"
 msgstr "Tid"
 
-#: gajim/gtk/filetransfer.py:228
+#: gajim/gtk/filetransfer.py:227
 #, fuzzy, python-format
 msgid "File name: %s"
 msgstr "Filnavn: %s"
 
-#: gajim/gtk/filetransfer.py:229 gajim/gtk/filetransfer.py:464
+#: gajim/gtk/filetransfer.py:228 gajim/gtk/filetransfer.py:469
 #, python-format
 msgid "Size: %s"
 msgstr "Størrelse: %s"
 
-#: gajim/gtk/filetransfer.py:239
+#: gajim/gtk/filetransfer.py:238
 #, python-format
 msgid "Sender: %s"
 msgstr "Avsender: %s"
 
-#: gajim/gtk/filetransfer.py:240 gajim/gtk/filetransfer.py:744
+#: gajim/gtk/filetransfer.py:239 gajim/gtk/filetransfer.py:749
 #: gajim/gtk/tooltips.py:577
 msgid "Recipient: "
 msgstr "Mottaker: "
 
-#: gajim/gtk/filetransfer.py:251
+#: gajim/gtk/filetransfer.py:250
 #, python-format
 msgid "Saved in: %s"
 msgstr "Lagret i: %s"
 
-#: gajim/gtk/filetransfer.py:256
+#: gajim/gtk/filetransfer.py:255
 msgid "File transfer completed"
 msgstr "Filoverføring fullført"
 
-#: gajim/gtk/filetransfer.py:276 gajim/gtk/filetransfer.py:285
+#: gajim/gtk/filetransfer.py:275 gajim/gtk/filetransfer.py:284
 #, fuzzy
 msgid "Connection with peer could not be established."
 msgstr "Tilkoblingen med likemann kan ikke opprettes."
 
-#: gajim/gtk/filetransfer.py:293
+#: gajim/gtk/filetransfer.py:292
 #, python-format
 msgid "Filename: %s"
 msgstr "Filnavn: %s"
 
-#: gajim/gtk/filetransfer.py:294
+#: gajim/gtk/filetransfer.py:293
 #, python-format
 msgid "Recipient: %s"
 msgstr "Mottaker: %s"
 
-#: gajim/gtk/filetransfer.py:296
+#: gajim/gtk/filetransfer.py:295
 #, python-format
 msgid "Error message: %s"
 msgstr "Feilmelding: %s"
 
-#: gajim/gtk/filetransfer.py:333
-#, fuzzy
-msgid "File transfer error"
-msgstr "Filoverføring feilet"
-
 #: gajim/gtk/filetransfer.py:334
-#, python-format
+#, fuzzy, python-format
 msgid ""
-"The file %(file)s has been received, but it seems to have been damaged along "
-"the way.\n"
+"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 ""
 "Fila %(file)s har blitt mottatt, men den later til å ha blitt skadet på "
 "veien.\n"
 "Ønsker du å laste den ned igjen?"
 
-#: gajim/gtk/filetransfer.py:350
+#: gajim/gtk/filetransfer.py:340
+#, fuzzy
+msgid "_Download Again"
+msgstr "_Ikke spør meg igjen"
+
+#: gajim/gtk/filetransfer.py:355
 msgid "Gajim can not read this file"
 msgstr "Gajim kan ikke lese denne filen"
 
-#: gajim/gtk/filetransfer.py:351
+#: gajim/gtk/filetransfer.py:356
 msgid "Another process is using this file."
 msgstr "En annen prosess bruker denne fila."
 
-#: gajim/gtk/filetransfer.py:418
+#: gajim/gtk/filetransfer.py:423
 #, fuzzy
 msgid "File Transfer Conflict"
 msgstr "Filoverføring fullført"
 
-#: gajim/gtk/filetransfer.py:419
+#: gajim/gtk/filetransfer.py:424
 msgid "This file already exists"
 msgstr "Denne fila finnes allerede"
 
-#: gajim/gtk/filetransfer.py:420
+#: gajim/gtk/filetransfer.py:425
 msgid "Resume download or replace file?"
 msgstr ""
 
-#: gajim/gtk/filetransfer.py:424
+#: gajim/gtk/filetransfer.py:429
 #, fuzzy
 msgid "Replace _File"
 msgstr "Ers_tatt"
 
-#: gajim/gtk/filetransfer.py:427
+#: gajim/gtk/filetransfer.py:432
 #, fuzzy
 msgid "Resume _Download"
 msgstr "?Noun:Nedlasting"
 
-#: gajim/gtk/filetransfer.py:437
+#: gajim/gtk/filetransfer.py:442
 #, fuzzy, python-format
 msgid "Directory '%s' is not writable"
 msgstr "Mappa \"%s\" er ikke skrivbar"
 
-#: gajim/gtk/filetransfer.py:438
+#: gajim/gtk/filetransfer.py:443
 #, fuzzy
 msgid "You do not have permissions to create files in this directory."
 msgstr "Du har ikke tilgang til å opprette filer i denne mappa."
 
-#: gajim/gtk/filetransfer.py:461
+#: gajim/gtk/filetransfer.py:466
 #, python-format
 msgid "File: %s"
 msgstr "Fil: %s"
 
-#: gajim/gtk/filetransfer.py:467
+#: gajim/gtk/filetransfer.py:472
 #, python-format
 msgid "Type: %s"
 msgstr "Type: %s"
 
-#: gajim/gtk/filetransfer.py:469
+#: gajim/gtk/filetransfer.py:474
 #, python-format
 msgid "Description: %s"
 msgstr "Beskrivelse: %s"
 
-#: gajim/gtk/filetransfer.py:480
+#: gajim/gtk/filetransfer.py:485
 #, fuzzy, python-format
 msgid "%s wants to send you a file"
 msgstr "%s ønsker å sende deg ei fil."
 
-#: gajim/gtk/filetransfer.py:509
+#: gajim/gtk/filetransfer.py:514
 msgid "Checking file…"
 msgstr "Sjekker fil…"
 
-#: gajim/gtk/filetransfer.py:524
+#: gajim/gtk/filetransfer.py:529
 msgid "File error"
 msgstr "Feil med fil"
 
-#: gajim/gtk/filetransfer.py:561
+#: gajim/gtk/filetransfer.py:566
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 
-#: gajim/gtk/filetransfer.py:658
+#: gajim/gtk/filetransfer.py:663
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/s)"
 
-#: gajim/gtk/filetransfer.py:711 gajim/gtk/filetransfer.py:715
+#: gajim/gtk/filetransfer.py:716 gajim/gtk/filetransfer.py:720
 msgid "Invalid File"
 msgstr "Ugyldig fil"
 
-#: gajim/gtk/filetransfer.py:711
+#: gajim/gtk/filetransfer.py:716
 msgid "File: "
 msgstr "Fil: "
 
-#: gajim/gtk/filetransfer.py:716
+#: gajim/gtk/filetransfer.py:721
 msgid "It is not possible to send empty files"
 msgstr "Det er ikke mulig å sende tomme filer"
 
-#: gajim/gtk/filetransfer.py:742 gajim/gtk/tooltips.py:571
+#: gajim/gtk/filetransfer.py:747 gajim/gtk/tooltips.py:571
 msgid "Sender: "
 msgstr "Avsender: "
 
-#: gajim/gtk/filetransfer.py:1038
+#: gajim/gtk/filetransfer.py:1043
 #, fuzzy
 msgid "Choose a File to Send…"
 msgstr "Velg fil å sende…"
 
 #: gajim/gtk/start_chat.py:51
-msgid "Start new Conversation"
+#, fuzzy
+msgid "Start New Conversation"
 msgstr "Start ny samtale"
 
-#: gajim/gtk/start_chat.py:424
-msgid "New Groupchat"
-msgstr "Ny gruppesludring"
+#: gajim/gtk/start_chat.py:260 gajim/gtk/start_chat.py:328
+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:426
-msgid "New Contact"
-msgstr "Ny kontakt"
+#: gajim/gtk/start_chat.py:603 gajim/gtk/groupchat_join.py:38
+msgid "Join Group Chat"
+msgstr "Ta del i gruppesamtale"
+
+#: gajim/gtk/start_chat.py:605 gajim/gtk/add_contact.py:40
+#, fuzzy
+msgid "Add Contact"
+msgstr "Legg til kontakt…"
 
-#: gajim/gtk/start_chat.py:588
+#: gajim/gtk/start_chat.py:746
 #, fuzzy, python-format
-msgid "%s Group chats found"
+msgid "%s group chats found"
 msgstr "%s ikke funnet"
 
-#: gajim/gtk/discovery.py:70
+#: gajim/gtk/discovery.py:69
 msgid "This service has not yet responded with detailed information"
 msgstr "Denne tjenesten har ikke svart med detaljert informasjon"
 
-#: gajim/gtk/discovery.py:71
+#: gajim/gtk/discovery.py:70
 #, fuzzy
 msgid ""
 "This service could not respond with detailed information.\n"
@@ -8766,32 +9194,33 @@ msgstr ""
 "Denne tjenesten kunne ikke svare med detaljert informasjon.\n"
 "Den er mest sannsynlig foreldet eller på en snurr."
 
-#: gajim/gtk/discovery.py:128
+#: gajim/gtk/discovery.py:126
 msgid "Others"
 msgstr "Andre"
 
-#: gajim/gtk/discovery.py:131
-msgid "Conference"
-msgstr "Konferanse"
+#: gajim/gtk/discovery.py:129
+#, fuzzy
+msgid "Group Chat"
+msgstr "_Gruppe Samtale"
 
-#: gajim/gtk/discovery.py:519
+#: gajim/gtk/discovery.py:518
 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:606
+#: gajim/gtk/discovery.py:605
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Se etter tjenester med %s-kontoen"
 
-#: gajim/gtk/discovery.py:608
+#: gajim/gtk/discovery.py:607
 msgid "Service Discovery"
 msgstr "Se etter tjenester"
 
-#: gajim/gtk/discovery.py:691
+#: gajim/gtk/discovery.py:690
 msgid "The service could not be found"
 msgstr "Tjenesten ble ikke funnet"
 
-#: gajim/gtk/discovery.py:692
+#: gajim/gtk/discovery.py:691
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -8799,99 +9228,79 @@ msgstr ""
 "Det er ingen tjenestetilbud på adressen du oppgav, eller den svarer ikke. "
 "Sjekk adressen og prøv igjen."
 
-#: gajim/gtk/discovery.py:699 gajim/gtk/discovery.py:1042
+#: gajim/gtk/discovery.py:698 gajim/gtk/discovery.py:1041
 msgid "The service is not browsable"
 msgstr "Ikke mulig å utforske tjeneste"
 
-#: gajim/gtk/discovery.py:700
+#: gajim/gtk/discovery.py:699
 msgid "This type of service does not contain any items to browse."
 msgstr "Denne typen tjeneste inneholder ingen elementer å utforske."
 
-#: gajim/gtk/discovery.py:738 gajim/gtk/discovery.py:747
+#: gajim/gtk/discovery.py:737 gajim/gtk/discovery.py:746
 msgid "Invalid Server Name"
 msgstr "Ugyldig tjenernavn"
 
-#: gajim/gtk/discovery.py:806
+#: gajim/gtk/discovery.py:805
 #, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Utforsker %(address)s med kontoen %(account)s"
 
-#: gajim/gtk/discovery.py:851
+#: gajim/gtk/discovery.py:850
 msgid "Browse"
 msgstr "Utforsk"
 
-#: gajim/gtk/discovery.py:1043
+#: gajim/gtk/discovery.py:1042
 msgid "This service does not contain any items to browse."
 msgstr "Denne tjenesten innholder ingen elementer å utforske."
 
-#: gajim/gtk/discovery.py:1255
+#: gajim/gtk/discovery.py:1254
 #, fuzzy
 msgid "_Command"
 msgstr "Kommandoer: %s"
 
-#: gajim/gtk/discovery.py:1264 gajim/gtk/discovery.py:1422
+#: gajim/gtk/discovery.py:1263 gajim/gtk/discovery.py:1420
 msgid "Re_gister"
 msgstr "Re_gistrer"
 
-#: gajim/gtk/discovery.py:1277
+#: gajim/gtk/discovery.py:1276
 msgid "_Search"
 msgstr "_Søk"
 
-#: gajim/gtk/discovery.py:1420
+#: gajim/gtk/discovery.py:1418
 msgid "_Edit"
 msgstr "_Rediger"
 
-#: gajim/gtk/discovery.py:1458
+#: gajim/gtk/discovery.py:1456
 #, fuzzy, python-format
 msgid "Scanning %(current)d / %(total)d ..."
 msgstr "Skanner %(current)d / %(total)d.."
 
-#: gajim/gtk/discovery.py:1674
+#: gajim/gtk/discovery.py:1655
+msgid "Users"
+msgstr "Brukere"
+
+#: gajim/gtk/discovery.py:1671
 msgid "Id"
 msgstr "ID"
 
-#: gajim/gtk/discovery.py:1713
-msgid "_Join"
-msgstr "_Delta"
-
-#: gajim/gtk/discovery.py:1736
-msgid "Bookmark already set"
-msgstr "Allerede bokmerket"
-
-#: gajim/gtk/discovery.py:1737
-#, fuzzy, python-format
-msgid "Group Chat '%s' is already in your bookmarks."
-msgstr "Gruppesamtalen \"%s\" er allerede bokmerket."
-
-#: gajim/gtk/discovery.py:1748
-msgid "Bookmark has been added successfully"
-msgstr "Bokmerke lagt til"
-
-#: gajim/gtk/discovery.py:1749
-#, fuzzy
-msgid ""
-"You can manage your bookmarks by clicking the Bookmarks menu item in your "
-"contact list."
-msgstr "Du kan behandle bokmerkene dine fra Handlinger-menyen i kontaktlisten."
-
-#: gajim/gtk/discovery.py:1950
+#: gajim/gtk/discovery.py:1900
 msgid "Subscribed"
 msgstr "Abonnerte"
 
-#: gajim/gtk/discovery.py:1959
+#: gajim/gtk/discovery.py:1909
 msgid "Node"
 msgstr "Node"
 
-#: gajim/gtk/discovery.py:2028
+#: gajim/gtk/discovery.py:1978
 #, fuzzy
 msgid "_New post"
 msgstr "Ny post"
 
-#: gajim/gtk/discovery.py:2037
+#: gajim/gtk/discovery.py:1987
 msgid "_Subscribe"
 msgstr "_Abonner"
 
-#: gajim/gtk/discovery.py:2045
+#: gajim/gtk/discovery.py:1995
 msgid "_Unsubscribe"
 msgstr "_Fjern abonnement"
 
@@ -8938,7 +9347,7 @@ msgstr "Skjema %s"
 msgid "Characters typed: %s"
 msgstr "Ulovlig tegn"
 
-#: gajim/gtk/single_message.py:274 gajim/gtk/xml_console.py:169
+#: gajim/gtk/single_message.py:274 gajim/gtk/xml_console.py:166
 msgid "Connection not available"
 msgstr "Tilkobling ikke tilgjengelig"
 
@@ -8947,6 +9356,12 @@ msgstr "Tilkobling ikke tilgjengelig"
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Sjekk at du er tilkoblet \"%s\"."
 
+#: gajim/gtk/single_message.py:306
+#, 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:330
 #, python-format
 msgid "RE: %s"
@@ -8957,28 +9372,28 @@ msgstr "SV: %s"
 msgid "%s wrote:\n"
 msgstr "%s skrev:\n"
 
-#: gajim/gtk/pep_config.py:44
+#: gajim/gtk/pep_config.py:45
 #, fuzzy, python-format
 msgid "PEP Service Configuration (%s)"
 msgstr "PEP-tjenesteoppsett"
 
-#: gajim/gtk/pep_config.py:77
+#: gajim/gtk/pep_config.py:78
 #, fuzzy
 msgid "Service"
 msgstr "Tjener"
 
-#: gajim/gtk/pep_config.py:114
+#: gajim/gtk/pep_config.py:115
 msgid "PEP node was not removed"
 msgstr "PEP-noden ble ikke fjernet"
 
-#: gajim/gtk/pep_config.py:115
+#: gajim/gtk/pep_config.py:116
 #, fuzzy, python-format
 msgid ""
 "PEP node %(node)s was not removed:\n"
 "%(message)s"
 msgstr "PEP-noden %(node)s ble ikke fjernet: %(message)s"
 
-#: gajim/gtk/pep_config.py:146
+#: gajim/gtk/pep_config.py:147
 #, python-format
 msgid "Configure %s"
 msgstr "Sett opp %s"
@@ -8994,17 +9409,21 @@ msgstr "_Registrer"
 msgid "Registration successful"
 msgstr "Registrert"
 
-#: gajim/gtk/dialogs.py:54 gajim/gtk/dataform.py:659 gajim/gtk/adhoc.py:85
+#: gajim/gtk/service_registration.py:215
+msgid "Registration failed"
+msgstr "Registrering feilet"
+
+#: gajim/gtk/dialogs.py:53 gajim/gtk/dataform.py:668 gajim/gtk/adhoc.py:86
 #, fuzzy
 msgid "Cancel"
 msgstr "_Avbryt"
 
-#: gajim/gtk/dialogs.py:129
+#: gajim/gtk/dialogs.py:128
 #, python-format
 msgid "Dictionary for language \"%s\" not available"
 msgstr "Ordliste for språket \"%s\" er ikke tilgjengelig"
 
-#: gajim/gtk/dialogs.py:130
+#: gajim/gtk/dialogs.py:129
 #, python-format
 msgid ""
 "You have to install the dictionary \"%s\" to use spellchecking, or choose "
@@ -9017,11 +9436,11 @@ msgstr ""
 "\n"
 "Funksjonen for utheving av feilstavede ord vil ikke bli brukt"
 
-#: gajim/gtk/dialogs.py:410 gajim/gtk/dialogs.py:425
+#: gajim/gtk/dialogs.py:322 gajim/gtk/dialogs.py:337
 msgid "Insecure connection"
 msgstr "Usikker tilkobling"
 
-#: gajim/gtk/dialogs.py:411
+#: gajim/gtk/dialogs.py:323
 #, python-format
 msgid ""
 "You are about to connect to the account %(account)s (%(server)s) insecurely. "
@@ -9033,120 +9452,116 @@ 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/gtk/dialogs.py:416
+#: gajim/gtk/dialogs.py:328
 msgid "Yes, I really want to connect insecurely"
 msgstr "Ja, jeg ønsker virkelig å koble til på usikkert vis"
 
-#: gajim/gtk/dialogs.py:417
+#: gajim/gtk/dialogs.py:329
 msgid "Gajim will NOT connect unless you check this box"
 msgstr ""
 "Gajim vil IKKE koble til, med mindre du huker av denne avkryssningsboksen"
 
-#: gajim/gtk/dialogs.py:675
-msgid "The nickname contains invalid characters."
-msgstr "Kallenavnet inneholder ugyldige tegn."
-
-#: gajim/gtk/dialogs.py:734
+#: gajim/gtk/dialogs.py:561
 #, fuzzy, python-format
 msgid "Destroy %s"
 msgstr "Ødelegger %s"
 
-#: gajim/gtk/dialogs.py:775
+#: gajim/gtk/dialogs.py:602
 #, fuzzy
 msgid "Certificate"
 msgstr "Klientsertifikat"
 
-#: gajim/gtk/dialogs.py:786
+#: gajim/gtk/dialogs.py:613
 #, fuzzy, python-format
 msgid ""
 "Certificate for account\n"
 "%s"
 msgstr "Sertifikat for kontoen %s"
 
-#: gajim/gtk/dialogs.py:824
+#: gajim/gtk/dialogs.py:651
 msgid "Issued to\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:825 gajim/gtk/dialogs.py:830
+#: gajim/gtk/dialogs.py:652 gajim/gtk/dialogs.py:657
 msgid "Common Name (CN): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:826 gajim/gtk/dialogs.py:831
+#: gajim/gtk/dialogs.py:653 gajim/gtk/dialogs.py:658
 msgid "Organization (O): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:827 gajim/gtk/dialogs.py:832
+#: gajim/gtk/dialogs.py:654 gajim/gtk/dialogs.py:659
 msgid "Organizational Unit (OU): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:828
+#: gajim/gtk/dialogs.py:655
 #, fuzzy
 msgid "Serial Number: "
 msgstr "GG-nummer:"
 
-#: gajim/gtk/dialogs.py:829
+#: gajim/gtk/dialogs.py:656
 msgid "Issued by\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:833
+#: gajim/gtk/dialogs.py:660
 msgid "Validity\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:834
+#: gajim/gtk/dialogs.py:661
 msgid "Issued on: "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:835
+#: gajim/gtk/dialogs.py:662
 msgid "Expires on: "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:836
+#: gajim/gtk/dialogs.py:663
 msgid "SHA-1:"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:838
+#: gajim/gtk/dialogs.py:665
 msgid "SHA-256:"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:852
+#: gajim/gtk/dialogs.py:679
 #, fuzzy
 msgid "View certificate…"
 msgstr "Vis sertifikat…"
 
-#: gajim/gtk/dialogs.py:864 gajim/gtk/accounts.py:893
+#: gajim/gtk/dialogs.py:691 gajim/gtk/accounts.py:896
 msgid "Change Password"
 msgstr "Endre passord"
 
-#: gajim/gtk/dialogs.py:878
+#: gajim/gtk/dialogs.py:705
 msgid "_OK"
 msgstr "_OK"
 
-#: gajim/gtk/dialogs.py:891
+#: gajim/gtk/dialogs.py:718
 #, fuzzy
 msgid "You must enter a password"
 msgstr "Du må skrive inn et passord."
 
-#: gajim/gtk/dialogs.py:895
+#: gajim/gtk/dialogs.py:722
 msgid "Passwords do not match"
 msgstr "Passordene samsvarer ikke"
 
-#: gajim/gtk/dialogs.py:923
+#: gajim/gtk/dialogs.py:750
 #, fuzzy
 msgid "Group Chat Invitation "
 msgstr "Invitasjon til gruppesamtale"
 
-#: gajim/gtk/dialogs.py:948
+#: gajim/gtk/dialogs.py:775
 #, fuzzy, python-format
 msgid "<b>%s</b> has invited you to join a discussion"
 msgstr "$Contact har invitert deg til en gruppesamtale"
 
-#: gajim/gtk/dialogs.py:951
+#: gajim/gtk/dialogs.py:778
 #, 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:959
+#: gajim/gtk/dialogs.py:786
 #, python-format
 msgid "Comment: %s"
 msgstr "Kommentar: %s"
@@ -9161,11 +9576,6 @@ msgstr "GG-nummer:"
 msgid "ICQ Number"
 msgstr "ICQ-nummer:"
 
-#: gajim/gtk/add_contact.py:40
-#, fuzzy
-msgid "Add Contact"
-msgstr "Legg til kontakt…"
-
 #: gajim/gtk/add_contact.py:259
 #, fuzzy, python-format
 msgid "%s Missing"
@@ -9186,7 +9596,8 @@ msgid "The user ID must not contain a resource."
 msgstr "Bruker-ID-en kan ikke inneholde en ressurs."
 
 #: gajim/gtk/add_contact.py:299
-msgid "You cannot add yourself to your roster."
+#, fuzzy
+msgid "You cannot add yourself to your contact list."
 msgstr "Du kan ikke legge til deg selv i egen kontaktliste."
 
 #: gajim/gtk/add_contact.py:304
@@ -9199,11 +9610,13 @@ msgid "Your account must be online to add new contacts."
 msgstr ""
 
 #: gajim/gtk/add_contact.py:321
-msgid "Contact already in roster"
+#, fuzzy
+msgid "Contact Already in Contact List"
 msgstr "Kontakt allerede i kontaktliste"
 
 #: gajim/gtk/add_contact.py:322
-msgid "This contact is already listed in your roster."
+#, fuzzy
+msgid "This contact is already in your contact list."
 msgstr "Kontakten er allerede opplistet i din kontaktliste."
 
 #: gajim/gtk/add_contact.py:379 gajim/gtk/add_contact.py:417
@@ -9246,12 +9659,12 @@ msgstr "Endre status"
 
 #: gajim/gtk/themes.py:52
 #, fuzzy
-msgid "MUC Tab New Directed Message"
+msgid "Group Chat Tab New Directed Message"
 msgstr "MUC-fane ny dirigert melding"
 
 #: gajim/gtk/themes.py:56
 #, fuzzy
-msgid "MUC Tab New Message"
+msgid "Group Chat Tab New Message"
 msgstr "Ny melding"
 
 #: gajim/gtk/themes.py:60
@@ -9466,12 +9879,12 @@ msgstr "Alle filer"
 msgid "Clear File"
 msgstr "Tøm fil"
 
-#: gajim/gtk/settings.py:570
+#: gajim/gtk/settings.py:570 gajim/gtk/proxies.py:32
 msgid "Manage Proxies"
 msgstr "Behandle mellomtjenere"
 
-#: gajim/gtk/settings.py:591 gajim/gtk/preferences.py:971
-#: gajim/gtk/preferences.py:984 gajim/gtk/preferences.py:988
+#: gajim/gtk/settings.py:591 gajim/gtk/preferences.py:968
+#: gajim/gtk/preferences.py:982 gajim/gtk/preferences.py:986
 #, fuzzy
 msgid "No Proxy"
 msgstr "Mellomtjener"
@@ -9560,13 +9973,15 @@ msgstr ""
 "        underveis. Prøv igjen senere.\n"
 "        "
 
-#: gajim/gtk/about.py:47 data/org.gajim.Gajim.appdata.xml.in:10
-msgid "A GTK+ XMPP client"
+#: gajim/gtk/about.py:47 data/org.gajim.Gajim.desktop.in:6
+#: data/org.gajim.Gajim.appdata.xml.in:10
+#, fuzzy
+msgid "A GTK XMPP client"
 msgstr "En GTK+ -XMPP-klient"
 
 #: gajim/gtk/about.py:48
-#, python-format
-msgid "GTK+ Version: %s"
+#, fuzzy, python-format
+msgid "GTK Version: %s"
 msgstr "GTK+versjon: %s"
 
 #: gajim/gtk/about.py:49
@@ -9738,6 +10153,25 @@ msgstr "?transfer status:Pauset"
 msgid "?transfer status:Not started"
 msgstr "?transfer status:Pauset"
 
+#: gajim/gtk/groupchat_creation.py:97 gajim/gtk/groupchat_creation.py:99
+msgid " (optional)..."
+msgstr ""
+
+#: gajim/gtk/groupchat_creation.py:134
+#, fuzzy
+msgid "Invalid Address"
+msgstr "Ugyldig fil"
+
+#: gajim/gtk/groupchat_creation.py:182
+#, fuzzy
+msgid "Not Connected"
+msgstr "Tilkoblet"
+
+#: gajim/gtk/groupchat_creation.py:183
+#, fuzzy
+msgid "You have to be connected to create a group chat."
+msgstr "Du har ikke tatt del i en gruppesamtale."
+
 #: gajim/gtk/sounds.py:39
 msgid "Wav Sounds"
 msgstr "Wav-lyder"
@@ -9778,46 +10212,43 @@ msgstr "Utheving av Gruppesamtale-melding"
 msgid "Group Chat Message Received"
 msgstr "Gruppesamtale-melding motatt"
 
-#: gajim/gtk/dataform.py:226 gajim/gtk/dataform.py:262
+#: gajim/gtk/dataform.py:232 gajim/gtk/dataform.py:268
 #, fuzzy
 msgid "Required"
 msgstr "Passord påkrevd"
 
-#: gajim/gtk/dataform.py:286
+#: gajim/gtk/dataform.py:293
 msgid "Yes"
 msgstr ""
 
-#: gajim/gtk/dataform.py:286
+#: gajim/gtk/dataform.py:293
 msgid "No"
 msgstr "Ingen"
 
-#: gajim/gtk/dataform.py:661
+#: gajim/gtk/dataform.py:670
 msgid "Submit"
 msgstr ""
 
-#: gajim/gtk/statusicon.py:213
+#: gajim/gtk/statusicon.py:206
 msgid "_Change Status Message…"
 msgstr "_Endre statusmelding…"
 
-#: gajim/gtk/statusicon.py:247 gajim/gtk/statusicon.py:292
-#: gajim/gtk/statusicon.py:299
+#: gajim/gtk/statusicon.py:258
 #, python-format
 msgid "using account %s"
 msgstr "bruker kontoen %s"
 
-#: gajim/gtk/statusicon.py:309
-msgid "_Manage Bookmarks…"
-msgstr "_Behandle Bokmerker…"
-
-#: gajim/gtk/statusicon.py:325
-msgid "Hide _Roster"
-msgstr "Skjul _kontaktliste"
+#: gajim/gtk/statusicon.py:269
+#, fuzzy
+msgid "Hide _Contact List"
+msgstr "Inviter _kontakter"
 
-#: gajim/gtk/statusicon.py:329
-msgid "Show _Roster"
-msgstr "Vis _kontaktliste"
+#: gajim/gtk/statusicon.py:273
+#, fuzzy
+msgid "Show _Contact List"
+msgstr "Vis aktive kontakter"
 
-#: gajim/gtk/statusicon.py:337
+#: gajim/gtk/statusicon.py:281
 msgid "Hide this menu"
 msgstr "Skjul denne menyen"
 
@@ -9859,33 +10290,6 @@ msgid ""
 "later."
 msgstr "Feil under publisering av personlig informasjon, prøv igjen senere."
 
-#: gajim/gtk/join_groupchat.py:202
-msgid "Invalid Room"
-msgstr "Ugyldig rom"
-
-#: gajim/gtk/join_groupchat.py:203
-msgid "Please choose a room"
-msgstr "Velt et rom"
-
-#: gajim/gtk/join_groupchat.py:222 gajim/gtk/join_groupchat.py:229
-msgid "Invalid Nickname"
-msgstr "Ugyldig kallenavn"
-
-#: gajim/gtk/join_groupchat.py:223
-msgid "Please choose a nickname"
-msgstr "Velg et kallenavn"
-
-#: gajim/gtk/join_groupchat.py:282 gajim/gtk/join_groupchat.py:288
-#: gajim/gtk/join_groupchat.py:293
-msgid "Wrong server"
-msgstr "Feil tjener"
-
-#: gajim/gtk/join_groupchat.py:283 gajim/gtk/join_groupchat.py:289
-#: gajim/gtk/join_groupchat.py:294
-#, python-format
-msgid "%s is not a groupchat server"
-msgstr "%s er ikke en gruppesamtale-tjener"
-
 #: gajim/gtk/mam_preferences.py:38
 #, python-format
 msgid "Archiving Preferences for %s"
@@ -9915,45 +10319,53 @@ msgstr "Feil i mottatt: {}"
 msgid "Archiving Preferences Error"
 msgstr "Arkiveringsinnstillinger"
 
-#: gajim/gtk/advanced_config.py:81
+#: gajim/gtk/advanced_config.py:95
 msgid "Activated"
 msgstr "Påskrudd"
 
-#: gajim/gtk/advanced_config.py:81
+#: gajim/gtk/advanced_config.py:95
 msgid "Deactivated"
 msgstr "Avskrudd"
 
-#: gajim/gtk/advanced_config.py:83
-msgid "Boolean"
-msgstr "Boolsk"
+#: gajim/gtk/advanced_config.py:97
+msgid "?config type:Boolean"
+msgstr ""
 
-#: gajim/gtk/advanced_config.py:84
-msgid "Integer"
-msgstr "Heltall"
+#: gajim/gtk/advanced_config.py:98
+msgid "?config type:Integer"
+msgstr ""
 
-#: gajim/gtk/advanced_config.py:85
-msgid "Text"
-msgstr "Tekst"
+#: gajim/gtk/advanced_config.py:99
+msgid "?config type:Text"
+msgstr ""
 
-#: gajim/gtk/advanced_config.py:97
-msgid "Preference Name"
+#: gajim/gtk/advanced_config.py:100
+msgid "?config type:Color"
+msgstr ""
+
+#: gajim/gtk/advanced_config.py:112
+#, fuzzy
+msgid "?config:Preference Name"
 msgstr "Foretrukket navn"
 
-#: gajim/gtk/advanced_config.py:104
-msgid "Value"
-msgstr "Verdi"
+#: gajim/gtk/advanced_config.py:123
+#, fuzzy
+msgid "?config:Value"
+msgstr "_Sett opp"
 
-#: gajim/gtk/advanced_config.py:113
-msgid "Type"
-msgstr "Skriv"
+#: gajim/gtk/advanced_config.py:132
+msgid "?config:Type"
+msgstr ""
 
-#: gajim/gtk/advanced_config.py:168
-msgid "(None)"
-msgstr "(Ingen)"
+#: gajim/gtk/advanced_config.py:187
+#, fuzzy
+msgid "?config description:None"
+msgstr "?Ask (for Subscription):Ingen"
 
-#: gajim/gtk/advanced_config.py:299
-msgid "Hidden"
-msgstr "Gjemt"
+#: gajim/gtk/advanced_config.py:322
+#, fuzzy
+msgid "?password:Hidden"
+msgstr "Passord:"
 
 #: gajim/gtk/server_info.py:66
 #, fuzzy
@@ -9965,8 +10377,8 @@ msgstr "_Kopier lenke-plassering"
 msgid "%(days)s days, %(hours)s hours"
 msgstr "%(days)s dager, %(hours)s timer"
 
-#: gajim/gtk/server_info.py:218 gajim/gtk/accounts.py:749
-#: gajim/gtk/accounts.py:853
+#: gajim/gtk/server_info.py:218 gajim/gtk/accounts.py:752
+#: gajim/gtk/accounts.py:856
 msgid "Hostname"
 msgstr "Vertsnavn"
 
@@ -10162,11 +10574,6 @@ 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_config.py:41
-#, fuzzy
-msgid "Group Chat Configuration"
-msgstr "Invitasjon til gruppesamtale"
-
 #: gajim/gtk/groupchat_config.py:134
 #, fuzzy
 msgid "A Group Chat needs at least one Owner"
@@ -10177,69 +10584,69 @@ msgid "You are not allowed to modify the affiliation of Admins and Owners"
 msgstr ""
 
 #: gajim/gtk/groupchat_config.py:399
-msgid "An entry with this Jabber-ID already exists"
+msgid "An entry with this XMPP Address already exists"
 msgstr ""
 
-#: gajim/gtk/adhoc.py:91
+#: gajim/gtk/adhoc.py:92
 #, fuzzy
 msgid "Finish"
 msgstr "_Avslutt"
 
-#: gajim/gtk/adhoc.py:97 gajim/gtk/adhoc.py:283
+#: gajim/gtk/adhoc.py:98 gajim/gtk/adhoc.py:284
 #, fuzzy
 msgid "Commands"
 msgstr "Kommandoer: %s"
 
-#: gajim/gtk/adhoc.py:103
+#: gajim/gtk/adhoc.py:104
 msgid "Next"
 msgstr ""
 
-#: gajim/gtk/adhoc.py:109
+#: gajim/gtk/adhoc.py:110
 #, fuzzy
 msgid "Previous"
 msgstr "Misunnelig"
 
-#: gajim/gtk/adhoc.py:115
+#: gajim/gtk/adhoc.py:116
 #, fuzzy
 msgid "Execute"
 msgstr "Kjør kommando"
 
-#: gajim/gtk/adhoc.py:195
+#: gajim/gtk/adhoc.py:196
 #, fuzzy
 msgid "No commands available"
 msgstr "Ingen kontoer tilgjengelig"
 
-#: gajim/gtk/adhoc.py:244
+#: gajim/gtk/adhoc.py:245
 #, fuzzy
 msgid "Request Command List"
 msgstr "Kjør kommando"
 
-#: gajim/gtk/adhoc.py:259
+#: gajim/gtk/adhoc.py:260
 #, fuzzy
 msgid "Executing…"
 msgstr "K_jør Kommando…"
 
-#: gajim/gtk/adhoc.py:266
+#: gajim/gtk/adhoc.py:267
 #, fuzzy
 msgid "Command List"
 msgstr "Kommandoer: %s"
 
-#: gajim/gtk/adhoc.py:384
+#: gajim/gtk/adhoc.py:385
 #, fuzzy
 msgid "Finished"
 msgstr "_Avslutt"
 
-#: gajim/gtk/adhoc.py:453
+#: gajim/gtk/adhoc.py:454
 #, fuzzy
 msgid "Execution failed"
 msgstr "Tilkobling mislyktes"
 
-#: gajim/gtk/blocking.py:37
+#: gajim/gtk/blocking.py:38
 #, fuzzy, python-format
 msgid "Blocking List for %s"
 msgstr "Personvernsliste for %s"
 
-#: gajim/gtk/blocking.py:71
+#: gajim/gtk/blocking.py:72
 msgid "Error!"
 msgstr "Feil!"
 
@@ -10287,8 +10694,7 @@ msgstr "Ugyldig brukernavn"
 msgid "You must provide a username to configure this account."
 msgstr "Du må oppgi et brukernavn for å sette opp denne kontoen."
 
-#: gajim/gtk/account_wizard.py:252 gajim/gtk/bookmarks.py:290
-#: gajim/gtk/bookmarks.py:303
+#: gajim/gtk/account_wizard.py:252
 msgid "Invalid server"
 msgstr "Ugyldig tjener"
 
@@ -10304,7 +10710,7 @@ msgstr "Ugyldig oppføring"
 msgid "Custom port must be a port number."
 msgstr "Egendefinert port må være et portnummer"
 
-#: gajim/gtk/account_wizard.py:405
+#: gajim/gtk/account_wizard.py:406
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -10319,15 +10725,15 @@ msgstr ""
 "SSL-feil: %(error)s\n"
 "Ønsker du fortsatt å koble til denne tjeneren?"
 
-#: gajim/gtk/account_wizard.py:446 gajim/gtk/account_wizard.py:480
+#: gajim/gtk/account_wizard.py:447 gajim/gtk/account_wizard.py:481
 msgid "An error occurred during account creation"
 msgstr "Det skjedde en feil under oppretting av kontoen"
 
-#: gajim/gtk/account_wizard.py:545
+#: gajim/gtk/account_wizard.py:546
 msgid "Account name is in use"
 msgstr "Kontonavnet er i bruk"
 
-#: gajim/gtk/account_wizard.py:546
+#: gajim/gtk/account_wizard.py:547
 msgid "You already have an account using this name."
 msgstr "Du har allerede en konto med dette navnet."
 
@@ -10356,24 +10762,24 @@ msgstr "%(received)s av %(max)s"
 msgid "%(minutes)s min %(seconds)s sec"
 msgstr ""
 
-#: gajim/gtk/xml_console.py:77
+#: gajim/gtk/xml_console.py:74
 msgid "Filter"
 msgstr "Filter"
 
-#: gajim/gtk/xml_console.py:82
+#: gajim/gtk/xml_console.py:79
 msgid "XML Input"
 msgstr "XML-inndata"
 
-#: gajim/gtk/xml_console.py:86
+#: gajim/gtk/xml_console.py:83
 msgid "Paste Last Input"
 msgstr ""
 
-#: gajim/gtk/xml_console.py:170
+#: gajim/gtk/xml_console.py:167
 #, fuzzy, python-format
 msgid "Please make sure you are connected with '%s'."
 msgstr "Sjekk at du er tilkoblet \"%s\"."
 
-#: gajim/gtk/xml_console.py:182
+#: gajim/gtk/xml_console.py:177
 #, fuzzy
 msgid "Invalid Node"
 msgstr "Ugyldig fil"
@@ -10406,286 +10812,298 @@ msgstr "Søk"
 msgid "No results found"
 msgstr "Inget resultat"
 
-#: gajim/gtk/preferences.py:358 gajim/gtk/preferences.py:362
+#: gajim/gtk/preferences.py:357 gajim/gtk/preferences.py:361
 msgid "Default"
 msgstr "Forvalg"
 
-#: gajim/gtk/preferences.py:801
+#: gajim/gtk/preferences.py:798
 msgid "status message title"
 msgstr "status-meldingstittel"
 
-#: gajim/gtk/preferences.py:802
+#: gajim/gtk/preferences.py:799
 msgid "status message text"
 msgstr "statusmeldings-tekst"
 
+#: gajim/gtk/accounts.py:137
+#, fuzzy
+msgid "Re-Login"
+msgstr "Innlogging"
+
 #: gajim/gtk/accounts.py:138
-msgid "Relogin now?"
+#, fuzzy
+msgid "Re-Login now?"
 msgstr "Logge inn på nytt nå?"
 
 #: gajim/gtk/accounts.py:139
-msgid "If you want all the changes to apply instantly, you must relogin."
+#, 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:191 gajim/gtk/accounts.py:975
+#: gajim/gtk/accounts.py:141
+msgid "_Later"
+msgstr ""
+
+#: gajim/gtk/accounts.py:143
+#, fuzzy
+msgid "_Re-Login"
+msgstr "Innlogging"
+
+#: gajim/gtk/accounts.py:194 gajim/gtk/accounts.py:978
 #, fuzzy
 msgid "Remove Account"
 msgstr "Fjerner kontoen %s"
 
-#: gajim/gtk/accounts.py:192
+#: gajim/gtk/accounts.py:195
 #, fuzzy, python-format
 msgid "You still have open chats in your account %s"
 msgstr "Du har åpne samtaler på %s-kontoen"
 
-#: gajim/gtk/accounts.py:193
+#: gajim/gtk/accounts.py:196
 #, fuzzy
 msgid ""
 "All chat and group chat windows will be closed.\n"
 "Do you want to continue?"
 msgstr "Alle samtaler og gruppesamtaler vil bli lukket. Ønsker du å fortsette?"
 
-#: gajim/gtk/accounts.py:424
+#: gajim/gtk/accounts.py:427
 #, fuzzy
 msgid "Back"
 msgstr "Straks tilbake"
 
-#: gajim/gtk/accounts.py:530
+#: gajim/gtk/accounts.py:533
 #, fuzzy
 msgid "Please check if Bonjour is installed."
 msgstr "Sjekk om Avahi eller Bonjour er installert."
 
-#: gajim/gtk/accounts.py:532
+#: gajim/gtk/accounts.py:535
 #, fuzzy
 msgid "Please check if Avahi is installed."
 msgstr "Sjekk om Avahi eller Bonjour er installert."
 
-#: gajim/gtk/accounts.py:569
+#: gajim/gtk/accounts.py:572
 #, fuzzy
 msgid "Disable Account"
 msgstr "Ugyldig konto"
 
-#: gajim/gtk/accounts.py:570
+#: gajim/gtk/accounts.py:573
 #, fuzzy, python-format
 msgid "Account %s is still connected"
 msgstr "Kontoen \"%s\" er tilkoblet tjeneren"
 
-#: gajim/gtk/accounts.py:571
+#: gajim/gtk/accounts.py:574
 #, fuzzy
 msgid ""
 "All chat and group chat windows will be closed. Do you want to continue?"
 msgstr "Alle samtaler og gruppesamtaler vil bli lukket. Ønsker du å fortsette?"
 
-#: gajim/gtk/accounts.py:576
+#: gajim/gtk/accounts.py:579
 #, fuzzy
 msgid "_Disable Account"
 msgstr "Ugyldig konto"
 
-#: gajim/gtk/accounts.py:595
+#: gajim/gtk/accounts.py:598
 #, fuzzy
 msgid "Add Account"
 msgstr "Legg til kontakt…"
 
-#: gajim/gtk/accounts.py:663
+#: gajim/gtk/accounts.py:666
 msgid "Label"
 msgstr ""
 
-#: gajim/gtk/accounts.py:667
+#: gajim/gtk/accounts.py:670
 msgid "Login"
 msgstr "Innlogging"
 
-#: gajim/gtk/accounts.py:670
+#: gajim/gtk/accounts.py:673
 msgid "Import Contacts"
 msgstr "Importer kontakter"
 
-#: gajim/gtk/accounts.py:674 gajim/gtk/accounts.py:870
+#: gajim/gtk/accounts.py:677 gajim/gtk/accounts.py:873
 msgid "Client Certificate"
 msgstr "Klientsertifikat"
 
-#: gajim/gtk/accounts.py:677 gajim/gtk/accounts.py:774
+#: gajim/gtk/accounts.py:680 gajim/gtk/accounts.py:777
 msgid "Connect on startup"
 msgstr "Koble til ved oppstart"
 
-#: gajim/gtk/accounts.py:681 gajim/gtk/accounts.py:779
+#: gajim/gtk/accounts.py:684 gajim/gtk/accounts.py:782
 msgid "Save conversations for all contacts"
 msgstr "Lagre alle samtaler ført med kontakter"
 
-#: gajim/gtk/accounts.py:683 gajim/gtk/accounts.py:781
+#: gajim/gtk/accounts.py:686 gajim/gtk/accounts.py:784
 msgid "Store conversations on the harddrive"
 msgstr "Lagre samtaler på harddisken"
 
-#: gajim/gtk/accounts.py:685 gajim/gtk/accounts.py:783
+#: gajim/gtk/accounts.py:688 gajim/gtk/accounts.py:786
 msgid "Global Status"
 msgstr "Global status"
 
-#: gajim/gtk/accounts.py:687
+#: gajim/gtk/accounts.py:690
 msgid "Synchronise the status of all accounts"
 msgstr "Synkroniser statusen for alle kontoer"
 
-#: gajim/gtk/accounts.py:689
+#: gajim/gtk/accounts.py:692
 msgid "Use file transfer proxies"
 msgstr "Bruk filoverførings-mellomtjenere"
 
-#: gajim/gtk/accounts.py:705
+#: gajim/gtk/accounts.py:708
 #, fuzzy
 msgid "Idle Time"
 msgstr "Uvirksom siden:"
 
-#: gajim/gtk/accounts.py:707
+#: gajim/gtk/accounts.py:710
 msgid "Disclose the time of your last activity"
 msgstr ""
 
-#: gajim/gtk/accounts.py:709
+#: gajim/gtk/accounts.py:712
 msgid "Local System Time"
 msgstr ""
 
-#: gajim/gtk/accounts.py:711
+#: gajim/gtk/accounts.py:714
 msgid "Disclose the local system time of the device Gajim runs on"
 msgstr ""
 
-#: gajim/gtk/accounts.py:714
+#: gajim/gtk/accounts.py:717
 #, fuzzy
 msgid "Client / Operating System"
 msgstr "Klientsertifikat"
 
-#: gajim/gtk/accounts.py:716
+#: gajim/gtk/accounts.py:719
 #, fuzzy
 msgid ""
 "Disclose informations about the client and operating system you currently use"
 msgstr "Tillat Gajim å sende informasjon om hvilket operativsystem du bruker."
 
-#: gajim/gtk/accounts.py:719
+#: gajim/gtk/accounts.py:722
 #, fuzzy
 msgid "Ignore Unknown Contacts"
 msgstr "Inviter _kontakter"
 
-#: gajim/gtk/accounts.py:721
+#: gajim/gtk/accounts.py:724
 #, fuzzy
 msgid "Ignore everything from contacts not in your Roster"
 msgstr "_Ignorer hendelser fra kontakter som ikke er i kontaktlisten"
 
-#: gajim/gtk/accounts.py:737 gajim/gtk/accounts.py:776
+#: gajim/gtk/accounts.py:740 gajim/gtk/accounts.py:779
 msgid "Use environment variable"
 msgstr "Bruk miljøvariabel"
 
-#: gajim/gtk/accounts.py:739
-msgid "Proxy"
-msgstr "Mellomtjener"
-
-#: gajim/gtk/accounts.py:742
+#: gajim/gtk/accounts.py:745
 msgid "Warn on insecure connection"
 msgstr "Advar ved usikker tilknytning"
 
-#: gajim/gtk/accounts.py:746
+#: gajim/gtk/accounts.py:749
 msgid "Send keep-alive packets"
 msgstr "Send hold-i-live meldinger"
 
-#: gajim/gtk/accounts.py:750
+#: gajim/gtk/accounts.py:753
 msgid "Manually set the hostname for the server"
 msgstr "Sett vertsnavnet for tjeneren manuelt"
 
-#: gajim/gtk/accounts.py:756 gajim/gtk/accounts.py:826
-#: gajim/gtk/accounts.py:831
+#: gajim/gtk/accounts.py:759 gajim/gtk/accounts.py:829
+#: gajim/gtk/accounts.py:834
 msgid "Priority"
 msgstr "Prioritet"
 
-#: gajim/gtk/accounts.py:785
+#: gajim/gtk/accounts.py:788
 msgid "Synchronize the status of all accounts"
 msgstr "Synkroniser statusen for alle kontoer"
 
-#: gajim/gtk/accounts.py:795
+#: gajim/gtk/accounts.py:798
 msgid "First Name"
 msgstr "Fornavn"
 
-#: gajim/gtk/accounts.py:798
+#: gajim/gtk/accounts.py:801
 msgid "Last Name"
 msgstr "Etternavn"
 
-#: gajim/gtk/accounts.py:804
+#: gajim/gtk/accounts.py:807
 msgid "Email"
 msgstr "E-post"
 
-#: gajim/gtk/accounts.py:822
+#: gajim/gtk/accounts.py:825
 msgid "Adjust to status"
 msgstr "Juster til status"
 
-#: gajim/gtk/accounts.py:849
+#: gajim/gtk/accounts.py:852
 msgid "Enable"
 msgstr "Slå på"
 
-#: gajim/gtk/accounts.py:857
+#: gajim/gtk/accounts.py:860
 msgid "Port"
 msgstr "Port"
 
-#: gajim/gtk/accounts.py:862
+#: gajim/gtk/accounts.py:865
 #, fuzzy
 msgid "Connection Settings"
 msgstr "Tilkoblingsvalg"
 
-#: gajim/gtk/accounts.py:872
+#: gajim/gtk/accounts.py:875
 msgid "PKCS12 Files"
 msgstr "PCKS12-filer"
 
-#: gajim/gtk/accounts.py:874
+#: gajim/gtk/accounts.py:877
 msgid "Encrypted Certificate"
 msgstr "Kryptert sertifikat"
 
-#: gajim/gtk/accounts.py:878
+#: gajim/gtk/accounts.py:881
 #, fuzzy
 msgid "Certificate Settings"
 msgstr "Sertifikatsvalg"
 
-#: gajim/gtk/accounts.py:890
+#: gajim/gtk/accounts.py:893
 msgid "Save Password"
 msgstr "Lagre passord"
 
-#: gajim/gtk/accounts.py:898
+#: gajim/gtk/accounts.py:901
 #, fuzzy
 msgid "Login Settings"
 msgstr "Tillegg"
 
-#: gajim/gtk/accounts.py:931
+#: gajim/gtk/accounts.py:934
 #, fuzzy, python-format
 msgid "Removing account %s"
 msgstr "Fjerner kontoen %s"
 
-#: gajim/gtk/accounts.py:946
+#: gajim/gtk/accounts.py:949
 msgid "Account is disabled"
 msgstr "Konto avskrudd"
 
-#: gajim/gtk/accounts.py:947
+#: gajim/gtk/accounts.py:950
 #, fuzzy
 msgid "To unregister from a server, the account must be enabled."
 msgstr "For å avregistrere fra en tjener, må kontoen være påskrudd"
 
-#: gajim/gtk/accounts.py:962
+#: gajim/gtk/accounts.py:965
 #, fuzzy
 msgid "Password required"
 msgstr "Passord påkrevd"
 
-#: gajim/gtk/accounts.py:976
+#: gajim/gtk/accounts.py:979
 #, fuzzy, python-format
 msgid "Account '%s' is still connected to the server"
 msgstr "Kontoen \"%s\" er tilkoblet tjeneren"
 
-#: gajim/gtk/accounts.py:978
+#: gajim/gtk/accounts.py:981
 msgid "If you remove it, the connection will be lost."
 msgstr "Dersom du fjerner den vil tilkoblingen feile."
 
-#: gajim/gtk/accounts.py:995
+#: gajim/gtk/accounts.py:998
 #, python-format
 msgid "Connection to server %s failed"
 msgstr "Tilkobling til tjeneren %s feilet"
 
-#: gajim/gtk/accounts.py:996
+#: gajim/gtk/accounts.py:999
 msgid "What would you like to do?"
 msgstr "Hva ønsker du å gjøre?"
 
-#: gajim/gtk/accounts.py:997
+#: gajim/gtk/accounts.py:1000
 msgid "Remove only from Gajim"
 msgstr "Bare fjern fra Gajim"
 
-#: gajim/gtk/accounts.py:998
+#: gajim/gtk/accounts.py:1001
 msgid "Don't remove anything. I'll try again later"
 msgstr "Ikke fjern noe. Jeg vil prøve igjen senere"
 
@@ -10712,6 +11130,10 @@ msgstr ""
 msgid "Modify"
 msgstr "Endre"
 
+#: gajim/gtk/roster_item_exchange.py:80
+msgid "JID"
+msgstr "JID"
+
 #: gajim/gtk/roster_item_exchange.py:86
 msgid "Groups"
 msgstr "Grupper"
@@ -10735,19 +11157,19 @@ msgid_plural "Removed %d contacts"
 msgstr[0] "Fjernet %d kontakt"
 msgstr[1] "Fjernet %d kontakter"
 
-#: gajim/gtk/util.py:581
+#: gajim/gtk/util.py:583
 msgid "Unknown Artist"
 msgstr "Ukjent artist"
 
-#: gajim/gtk/util.py:582
+#: gajim/gtk/util.py:584
 msgid "Unknown Title"
 msgstr "Ukjent tittel"
 
-#: gajim/gtk/util.py:583
+#: gajim/gtk/util.py:585
 msgid "Unknown Source"
 msgstr "Ukjent kilde"
 
-#: gajim/gtk/util.py:585
+#: gajim/gtk/util.py:587
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
@@ -10756,27 +11178,10 @@ msgstr ""
 "<b>\"%(title)s\"</b> etter <i>%(artist)s</i>\n"
 "fra <i>%(source)s</i>"
 
-#: gajim/gtk/bookmarks.py:121
-msgid "New Group Chat"
-msgstr "Ny gruppesamtale"
-
-#: gajim/gtk/bookmarks.py:161
-msgid "This bookmark has invalid data"
-msgstr "Dette bokmerket har ugyldig innhold"
-
-#: gajim/gtk/bookmarks.py:162
-msgid ""
-"Please be sure to fill out server and room fields or remove this bookmark."
-msgstr "Fyll inn tjener- og rom -felt eller fjern dette bokmerket."
-
-#: gajim/gtk/bookmarks.py:273 gajim/gtk/bookmarks.py:291
-#: gajim/gtk/bookmarks.py:304 gajim/gtk/bookmarks.py:335
-msgid "Character not allowed"
-msgstr "Ulovlig tegn"
-
-#: gajim/gtk/bookmarks.py:334
-msgid "Invalid room"
-msgstr "Ugyldig rom"
+#: gajim/gtk/bookmarks.py:47
+#, fuzzy, python-format
+msgid "Bookmarks for %s"
+msgstr "Bokmerker"
 
 #: gajim/plugins/pluginmanager.py:736 gajim/plugins/pluginmanager.py:742
 msgid "Archive corrupted"
@@ -10787,48 +11192,51 @@ msgid "Archive empty"
 msgstr "Arkiv tomt"
 
 #: gajim/plugins/pluginmanager.py:750 gajim/plugins/pluginmanager.py:758
-#: gajim/plugins/gui.py:257
+#: gajim/plugins/gui.py:258
 msgid "Archive is malformed"
 msgstr "Arkivet er skadet"
 
-#: gajim/plugins/pluginmanager.py:766 gajim/plugins/gui.py:281
-#: gajim/plugins/gui.py:289
+#: gajim/plugins/pluginmanager.py:766 gajim/plugins/gui.py:288
+#: gajim/plugins/gui.py:301
 msgid "Plugin already exists"
 msgstr "Programtillegget finnes allerede"
 
-#: gajim/plugins/gui.py:82
+#: gajim/plugins/gui.py:83
 msgid "Click to view Gajim's wiki page on how to install plugins in Flatpak."
 msgstr ""
 
-#: gajim/plugins/gui.py:89
+#: gajim/plugins/gui.py:90
 msgid "Plugin"
 msgstr "Programtillegg"
 
-#: gajim/plugins/gui.py:151
+#: gajim/plugins/gui.py:152
 #, python-format
 msgid "Warning: %s"
 msgstr "Advarsel: %s"
 
-#: gajim/plugins/gui.py:206
+#: gajim/plugins/gui.py:207
 msgid "Plugin failed"
 msgstr "Programtillegg kræsjet"
 
-#: gajim/plugins/gui.py:245
+#: gajim/plugins/gui.py:246
 msgid "Unable to properly remove the plugin"
 msgstr "Fikk ikke til å fjerne programtillegget på rett måte"
 
-#: gajim/plugins/gui.py:281
-msgid "Overwrite?"
+#: gajim/plugins/gui.py:287
+#, fuzzy
+msgid "Overwrite Plugin?"
 msgstr "Overskriv?"
 
+#: gajim/plugins/gui.py:289
+#, fuzzy
+msgid "Do you want to overwrite the currently installed version?"
+msgstr "Ønsker du å akseptere invitasjonen?"
+
 #: data/org.gajim.Gajim.desktop.in:5
-msgid "Jabber IM Client"
+#, fuzzy
+msgid "XMPP IM Client"
 msgstr "XMPP-lynmeldingsklient"
 
-#: data/org.gajim.Gajim.desktop.in:6
-msgid "A GTK+ Jabber client"
-msgstr "En GTK+ -XMPP-klient"
-
 #: data/org.gajim.Gajim.desktop.in:8
 msgid "chat;messaging;im;xmpp;bonjour;voip;"
 msgstr "sludring;meldingsforsendelse;lynmeldinger;xmpp;bonjour;voip;"
@@ -10879,7 +11287,7 @@ msgid "Easily send pictures, videos or other files to friends and groups"
 msgstr ""
 
 #: data/org.gajim.Gajim.appdata.xml.in:27
-msgid "Chat securely with End-to-End encryption via OMEMO or PGP"
+msgid "Chat securely with End-to-End encryption via OMEMO or OpenPGP"
 msgstr ""
 
 #: data/org.gajim.Gajim.appdata.xml.in:28
@@ -10942,7 +11350,8 @@ msgid "Even more features via plugins"
 msgstr "Andre funksjoner via programtillegg"
 
 #: data/org.gajim.Gajim.appdata.xml.in:52
-msgid "Roster, list of contacts"
+#, fuzzy
+msgid "Contact list, list of contacts"
 msgstr "Kontaktliste, liste over kontakter"
 
 #: data/org.gajim.Gajim.appdata.xml.in:56
@@ -10961,6 +11370,532 @@ msgstr "Sludrehistorikk"
 msgid "Plugin manager"
 msgstr "Programtilleggsbehandler"
 
+#~ msgid "Configure Services…"
+#~ msgstr "Sett opp tjenester…"
+
+#, fuzzy
+#~ msgid "Group Chat Bookmarks"
+#~ msgstr "Gruppe Samtale"
+
+#, fuzzy
+#~ msgid "Add Bookmark"
+#~ msgstr "Bokmerke"
+
+#, fuzzy
+#~ msgid "Remove Bookmark"
+#~ msgstr "Bokmerke"
+
+#, fuzzy
+#~ msgid "Bookmark Name"
+#~ msgstr "Bokmerk rommet"
+
+#, fuzzy
+#~ msgid "_Server"
+#~ msgstr "_Tjener:"
+
+#, fuzzy
+#~ msgid "Roo_m"
+#~ msgstr "Ro_m:"
+
+#, fuzzy
+#~ msgid "_Password"
+#~ msgstr "_Passord:"
+
+#, fuzzy
+#~ msgid "Join chat when connected"
+#~ msgstr "Kontakt frakoblet"
+
+#~ msgid "New Group Chat"
+#~ msgstr "Ny gruppesamtale"
+
+#~ msgid "This bookmark has invalid data"
+#~ msgstr "Dette bokmerket har ugyldig innhold"
+
+#, fuzzy
+#~ msgid ""
+#~ "Please be sure to fill out server and group chat fields or remove this "
+#~ "bookmark."
+#~ msgstr "Fyll inn tjener- og rom -felt eller fjern dette bokmerket."
+
+#~ msgid "Character not allowed"
+#~ msgstr "Ulovlig tegn"
+
+#, fuzzy
+#~ msgid "Invalid Group Chat"
+#~ msgstr "Ugyldig gruppesludrings-JID"
+
+#~ msgid "Unable to join group chat"
+#~ msgstr "Kunne ikke ta del i gruppesamtale"
+
+#~ msgid "You are banned from group chat <b>%s</b>."
+#~ msgstr "Du er bannlyst fra gruppesamtalen <b>%s</b>."
+
+#~ msgid "Remote server <b>%s</b> does not exist."
+#~ msgstr "Fjerntjeneren <b>%s</b> finnes ikke."
+
+#~ msgid "Group chat <b>%s</b> does not exist."
+#~ msgstr "Gruppesamtalen <b>%s</b> finnes ikke."
+
+#~ msgid "Group chat creation is not permitted."
+#~ msgstr "Oppretting av gruppesludring tillates ikke."
+
+#~ msgid "You must use your registered nickname in <b>%s</b>."
+#~ msgstr "Ditt registrerte kallenavn må brukes i <b>%s</b>."
+
+#, fuzzy
+#~ msgid "You are not in the members list in group chat %s."
+#~ msgstr "Du er ikke på medlemslista for gruppesamtalen %s."
+
+#, fuzzy
+#~ msgid "XMPP Address is not a group chat"
+#~ msgstr "Dette er ikke en samtalegruppe"
+
+#~ msgid "This is not a group chat"
+#~ msgstr "Dette er ikke en samtalegruppe"
+
+#, fuzzy
+#~ msgid ""
+#~ "%(room_jid)s is already in your contact list. Please check if "
+#~ "%(room_jid)s is a correct group chat name. If it is, delete it from your "
+#~ "contact list and try joining the group chat again."
+#~ msgstr ""
+#~ "%(room_jid)s er allerede i kontaktlisten din. Sjekk at %(room_jid)s er et "
+#~ "korrekt gruppesludringsnavn. Hvis det er det, slett det fra listen og "
+#~ "prøv å ta del i gruppesludringen igjen."
+
+#, fuzzy
+#~ msgid "Please choose a group chat"
+#~ msgstr "Velt et rom"
+
+#~ msgid "Invalid Nickname"
+#~ msgstr "Ugyldig kallenavn"
+
+#~ msgid "Please choose a nickname"
+#~ msgstr "Velg et kallenavn"
+
+#~ msgid "Wrong server"
+#~ msgstr "Feil tjener"
+
+#, fuzzy
+#~ msgid "%s is not a group chat server"
+#~ msgstr "%s er ikke en gruppesamtale-tjener"
+
+#, fuzzy
+#~ msgid ""
+#~ "How many lines to request from server when entering a group chat. -1 "
+#~ "means no limit."
+#~ msgstr ""
+#~ "Hvor mange linjer skal etterspørres når man går inn i en gruppesamtale. "
+#~ "-1 betyr ingen øvre grense"
+
+#, fuzzy
+#~ msgid ""
+#~ "Minutes of backlog to request when entering a group chat. -1 means no "
+#~ "limit."
+#~ msgstr ""
+#~ "Hvor mange minutter med logg skal forespørres ved inntreden i "
+#~ "gruppesludring. -1 betyr ingen grense"
+
+#, fuzzy
+#~ msgid ""
+#~ "How many lines to request from server when entering a group chat. -1 "
+#~ "means no limit, -2 means global value."
+#~ msgstr ""
+#~ "Hvor mange linjer skal etterspørres når man går inn i en gruppesamtale. "
+#~ "-1 betyr ingen grense, -2 betyr global verdi"
+
+#, fuzzy
+#~ msgid ""
+#~ "Minutes of backlog to request when entering a group chat. -1 means no "
+#~ "limit, -2 means global value."
+#~ msgstr ""
+#~ "Hvor mange minutter med logg som skal forespørres ved inntreden i "
+#~ "gruppesludring. -1 betyr ingen grense, -2 betyr global verdi"
+
+#, fuzzy
+#~ msgid "A Password is required to join the group chat %s. Please type it."
+#~ msgstr "Et passord kreves for å ta del i rommet %s. Skriv det inn."
+
+#~ msgid "Not in Roster"
+#~ msgstr "Ikke i kontaktliste"
+
+#~ msgid "I would like to add you to my roster"
+#~ msgstr "Jeg ønsker å legge deg til på min kontaktliste"
+
+#~ msgid "Add to Roster"
+#~ msgstr "Legg til i kontaktliste"
+
+#~ msgid "Audio Session"
+#~ msgstr "Lydøkt"
+
+#~ msgid "Video Session"
+#~ msgstr "Videoøkt"
+
+#~ msgid "Manage Room"
+#~ msgstr "Behandle rom"
+
+#~ msgid "Configure Room"
+#~ msgstr "Sett opp rom"
+
+#~ msgid "Destroy Room"
+#~ msgstr "Ødelegg rom"
+
+#~ msgid "Change Nick"
+#~ msgstr "Endre kallenavn"
+
+#~ msgid "Disconnect"
+#~ msgstr "Koble fra"
+
+#, fuzzy
+#~ msgid "Copy JID"
+#~ msgstr "Rom-JID"
+
+#, fuzzy
+#~ msgid "Add to Roster…"
+#~ msgstr "Legg til i kontaktliste"
+
+#, fuzzy
+#~ msgid "Copy JID/Email"
+#~ msgstr "_Kopier JID/E-postadresse"
+
+#~ msgid "JID: <i>%s</i>"
+#~ msgstr "JID: <i>%s</i>"
+
+#~ msgid "Changing Subject"
+#~ msgstr "Endrer tema"
+
+#~ msgid "Please specify the new subject:"
+#~ msgstr "Skriv inn nytt tema:"
+
+#~ msgid "Room logging is now enabled"
+#~ msgstr "Romlogging er nå aktivert"
+
+#~ msgid "Room logging is now disabled"
+#~ msgstr "Romlogging er nå avskrudd"
+
+#, fuzzy
+#~ msgid "You (%s) joined the room"
+#~ msgstr "%s har tatt del i gruppesamtalen"
+
+#~ msgid "Room logging is enabled"
+#~ msgstr "Romlogging er nå påskrudd"
+
+#~ msgid "Unable to join groupchat"
+#~ msgstr "Kunne ikke ta del i gruppesludring"
+
+#~ msgid "Groupchat Invitation"
+#~ msgstr "Invitasjon til gruppesamtale"
+
+#~ msgid "%(jid)s has been invited in this room"
+#~ msgstr "%(jid)s har blitt invitert til dette rommet"
+
+#~ msgid "JID is not a Groupchat"
+#~ msgstr "JID-en er ikke en gruppesludring"
+
+#~ msgid "Invalid JID"
+#~ msgstr "Ugyldig JID"
+
+#~ msgid "A connection is not available"
+#~ msgstr "Tilkobling ikke tilgjengelig"
+
+#~ msgid "JID already in list"
+#~ msgstr "JID-en er allerede i listen"
+
+#~ msgid "Unsecure"
+#~ msgstr "Usikker"
+
+#, fuzzy
+#~ msgid "For the chosen encryption there is no encryption method available"
+#~ msgstr ""
+#~ "For valgt kryptering finnes det ikke noen tilgjengelig krypteringsmetode"
+
+#~ msgid "Removes contact from roster"
+#~ msgstr "Fjerner kontakt fra kontaktliste"
+
+#~ msgid "Not in roster"
+#~ msgstr "Ikke i kontaktliste"
+
+#~ msgid "Contact signed in notification color."
+#~ msgstr "Merknadsfarge for kontaktinnlogging."
+
+#~ msgid "Contact signout notification color"
+#~ msgstr "Merknadsfarge for kontaktavlogging"
+
+#~ msgid "File transfer request notification color."
+#~ msgstr "Merknadsfarge for filoverføringsforespørsler."
+
+#~ msgid "File transfer error notification color."
+#~ msgstr "Merknadsfarge for filoverføringsfeil."
+
+#~ msgid "File transfer complete or stopped notification color."
+#~ msgstr "Merknadsfarge når overføring fullføres eller stoppes."
+
+#~ msgid "Groupchat invitation notification color"
+#~ msgstr "Merknadsfarge for invitasjon til gruppesamtale"
+
+#~ msgid "Other dialogs color."
+#~ msgstr "Farge for andre dialoger."
+
+#~ msgid "Add * and [n] in roster title?"
+#~ msgstr "Legg til * og [n] i kontaktlistens tittel?"
+
+#~ msgid "Hides the banner in two persons chat window"
+#~ msgstr "Gjemmer tittelbanneret i samtalevindu mellom to parter"
+
+#, fuzzy
+#~ msgid ""
+#~ "Show the confirm metacontacts creation dialog or not? Empty string means "
+#~ "never show the dialog."
+#~ msgstr ""
+#~ "Skal bekreftelse av metakontaktopprettings-dialog vises eller ei? Tomt "
+#~ "innhold betyr at dialogen aldri vises."
+
+#, fuzzy
+#~ msgid "If true, You will also see your webcam"
+#~ msgstr "Hvis sant, vil også du se ditt nettkamera"
+
+#~ msgid "Space separated list of ssl errors to ignore."
+#~ msgstr "Mellomromsinndelt liste av SSL-feilmeldinger som skal ignoreres."
+
+#~ msgid "Answer to receipt requests"
+#~ msgstr "Svar på kvitteringsforespørsler"
+
+#~ msgid "Sent receipt requests"
+#~ msgstr "Sendte kvitteringsforespørsler"
+
+#, fuzzy
+#~ msgid "Language for which misspelled words will be checked"
+#~ msgstr "Språk brukt til å sjekke feilstavede ord"
+
+#~ msgid "I'm eating, so leave me a message."
+#~ msgstr "Jeg spiser, legg igjen en beskjed."
+
+#~ msgid ""
+#~ "This message was encrypted with OpenPGP for XMPP and could not be "
+#~ "decrypted."
+#~ msgstr ""
+#~ "Meldingen har blitt kryptert med OpenPGP for XMPP, og kunne ikke "
+#~ "dekrypteres."
+
+#~ msgid "from room %s"
+#~ msgstr "fra rommet %s"
+
+#~ msgid "Leave Groupchats"
+#~ msgstr "Forlat gruppesamtaler"
+
+#, fuzzy
+#~ msgid "Auto Join"
+#~ msgstr "A_utomatisk deltagelse"
+
+#~ msgid "Room"
+#~ msgstr "Rom"
+
+#~ msgid "Jabber ID:"
+#~ msgstr "XMPP-ID:"
+
+#~ msgid "Occupant Actions"
+#~ msgstr "Deltager-handlinger"
+
+#~ msgid "_Add to Roster"
+#~ msgstr "_Legg til i kontaktliste"
+
+#~ msgid "_Manage Room"
+#~ msgstr "_Valg for rom"
+
+#~ msgid "Configure _Room..."
+#~ msgstr "Sett opp _rom…"
+
+#~ msgid "_Destroy Room"
+#~ msgstr "_Kanseller rom"
+
+#~ msgid "Jabber ID"
+#~ msgstr "XMPP-ID"
+
+#, fuzzy
+#~ msgid "icon"
+#~ msgstr "Trayicon"
+
+#, fuzzy
+#~ msgid "account"
+#~ msgstr "konto:"
+
+#~ msgid "Roster"
+#~ msgstr "Kontaktliste"
+
+#~ msgid "Show only in roster"
+#~ msgstr "Vis bare i kontaktliste"
+
+#~ msgid "in _roster"
+#~ msgstr "i _kontaktliste"
+
+#, fuzzy
+#~ msgid "Roster Appearance"
+#~ msgstr "<b>Kontaktlistevisning</b>"
+
+#, fuzzy
+#~ msgid "Show chatstate in roster"
+#~ msgstr "Viser a_vatarer for kontakter i kontaktlisten"
+
+#~ msgid "_Add to Roster..."
+#~ msgstr "_Legg til i kontaktliste…"
+
+#~ msgid "_Jabber ID:"
+#~ msgstr "_XMPP-ID:"
+
+#, fuzzy
+#~ msgid "_Jabber ID"
+#~ msgstr "_XMPP-ID:"
+
+#~ msgid "JabberID"
+#~ msgstr "XMPP-ID"
+
+#~ msgid "Show Roster"
+#~ msgstr "Vis _kontaktliste"
+
+#~ msgid "MUC server"
+#~ msgstr "MUC-tjener"
+
+#~ msgid "Roster Shortcuts"
+#~ msgstr "Kontaktlistesnarveier"
+
+#~ msgid "Room Configuration"
+#~ msgstr "Rom-innstillinger"
+
+#~ msgid "Join _Group Chat"
+#~ msgstr "Ta del i en _gruppesamtale"
+
+#~ msgid "Toggle audio session"
+#~ msgstr "Veksle lydøkt"
+
+#~ msgid "Audio sessions are not available"
+#~ msgstr "Lydøkter er ikke tilgjengelige"
+
+#~ msgid "Conference"
+#~ msgstr "Konferanse"
+
+#~ msgid "_Manage Bookmarks…"
+#~ msgstr "_Behandle Bokmerker…"
+
+#~ msgid "Hide _Roster"
+#~ msgstr "Skjul _kontaktliste"
+
+#~ msgid "Show _Roster"
+#~ msgstr "Vis _kontaktliste"
+
+#~ msgid "Invalid Room"
+#~ msgstr "Ugyldig rom"
+
+#~ msgid "Invalid room"
+#~ msgstr "Ugyldig rom"
+
+#~ msgid "A GTK+ Jabber client"
+#~ msgstr "En GTK+ -XMPP-klient"
+
+#~ msgid "Changing Nickname"
+#~ msgstr "Endrer kallenavn"
+
+#~ msgid "Please specify the new nickname you want to use:"
+#~ msgstr "Velg hvilket nye kallenavn du ønsker å bruke:"
+
+#~ msgid "Bookmark already set"
+#~ msgstr "Allerede bokmerket"
+
+#, fuzzy
+#~ msgid "Group Chat '%s' is already in your bookmarks."
+#~ msgstr "Gruppesamtalen \"%s\" er allerede bokmerket."
+
+#~ msgid "Bookmark has been added successfully"
+#~ msgstr "Bokmerke lagt til"
+
+#, fuzzy
+#~ msgid ""
+#~ "You can manage your bookmarks by clicking the Bookmarks menu item in your "
+#~ "contact list."
+#~ msgstr ""
+#~ "Du kan behandle bokmerkene dine fra Handlinger-menyen i kontaktlisten."
+
+#~ msgid "The nickname contains invalid characters."
+#~ msgstr "Kallenavnet inneholder ugyldige tegn."
+
+#~ msgid "Bookmark Room"
+#~ msgstr "Bokmerk rommet"
+
+#~ msgid "_Join New Group Chat"
+#~ msgstr "_Ta del i ny gruppesamtale"
+
+#, fuzzy
+#~ msgid "_Create Group Chat"
+#~ msgstr "Forlat gruppesamtaler"
+
+#~ msgid "Name:"
+#~ msgstr "Navn:"
+
+#~ msgid "Description:"
+#~ msgstr "Beskrivelse:"
+
+#, fuzzy
+#~ msgid "Address:"
+#~ msgstr "_Adresse:"
+
+#~ msgid "You can not start a new conversation unless you are connected."
+#~ msgstr "Du kan ikke starte en ny samtale uten å være tilkoblet."
+
+#, fuzzy
+#~ msgid "Occupants"
+#~ msgstr "Deltager-handlinger"
+
+#, fuzzy
+#~ msgid "File transfer error"
+#~ msgstr "Filoverføring feilet"
+
+#~ msgid "No Accounts available"
+#~ msgstr "Ingen kontoer tilgjengelig"
+
+#~ msgid "_Modify Account..."
+#~ msgstr "_Endre konto…"
+
+#~ msgid "Boolean"
+#~ msgstr "Boolsk"
+
+#~ msgid "Integer"
+#~ msgstr "Heltall"
+
+#~ msgid "Text"
+#~ msgstr "Tekst"
+
+#~ msgid "Value"
+#~ msgstr "Verdi"
+
+#~ msgid "Type"
+#~ msgstr "Skriv"
+
+#~ msgid "(None)"
+#~ msgstr "(Ingen)"
+
+#~ msgid "Hidden"
+#~ msgstr "Gjemt"
+
+#~ msgid "Manage Proxy Profiles"
+#~ msgstr "Behandle mellomtjener-profiler"
+
+#, fuzzy
+#~ msgid "Properties"
+#~ msgstr "<b>Egenskaper</b>"
+
+#, fuzzy
+#~ msgid "Proxy _Host"
+#~ msgstr "_Vert for mellomtjener:"
+
+#, fuzzy
+#~ msgid "Proxy _Port"
+#~ msgstr "Mellomtjener-_port:"
+
+#~ msgid "New Groupchat"
+#~ msgstr "Ny gruppesludring"
+
+#~ msgid "New Contact"
+#~ msgstr "Ny kontakt"
+
 #~ msgid "%s GiB"
 #~ msgstr "%s GiB"
 
@@ -11050,9 +11985,6 @@ msgstr "Programtilleggsbehandler"
 #~ msgid "_Pause"
 #~ msgstr "_Pause"
 
-#~ msgid "Clean _up"
-#~ msgstr "Rydd _opp"
-
 #~ msgid "Remove file transfer from the list."
 #~ msgstr "Fjern filoverføringen fra listen."
 
@@ -11073,10 +12005,6 @@ msgstr "Programtilleggsbehandler"
 #~ msgid "When a file transfer is complete show a popup notification"
 #~ msgstr "Vis oppsprettsvarsel når ei filoverføring er fullført"
 
-#, fuzzy
-#~ msgid "Select Files"
-#~ msgstr "Tøm fil"
-
 #~ msgid "From:"
 #~ msgstr "Fra:"
 
@@ -11528,9 +12456,6 @@ msgstr "Programtilleggsbehandler"
 #~ msgid "You are invited to a groupchat"
 #~ msgstr "Du er invitert til en gruppesamtale"
 
-#~ msgid "Do you want to accept the invitation?"
-#~ msgstr "Ønsker du å akseptere invitasjonen?"
-
 #, fuzzy
 #~ msgid ""
 #~ "<b>Issued to:</b>\n"
@@ -11793,9 +12718,6 @@ msgstr "Programtilleggsbehandler"
 #~ msgid "Nick"
 #~ msgstr "Kallenavn"
 
-#~ msgid "Banning…"
-#~ msgstr "Bannlyser…"
-
 #~ msgid ""
 #~ "<b>Whom do you want to ban?</b>\n"
 #~ "\n"
@@ -11879,11 +12801,6 @@ msgstr "Programtilleggsbehandler"
 #~ msgid "Filter:"
 #~ msgstr "Filter:"
 
-#~ msgid ""
-#~ "If checked, Gajim will display the mood of contacts in the roster window"
-#~ msgstr ""
-#~ "Dersom valgt vil Gajim vise humør for kontakter i kontaktlistevinduet"
-
 #, fuzzy
 #~ msgid "Spell _checker"
 #~ msgstr "Stavekontroll"
@@ -12195,10 +13112,6 @@ msgstr "Programtilleggsbehandler"
 #~ msgstr "_Statusmelding:"
 
 #, fuzzy
-#~ msgid "Group chat highlight"
-#~ msgstr "Fremheving av gruppesamtale:"
-
-#, fuzzy
 #~ msgid "Your nickname"
 #~ msgstr "Ditt kallenavn:"
 
@@ -12342,9 +13255,6 @@ msgstr "Programtilleggsbehandler"
 #~ msgid "The passwords typed in both fields must be identical."
 #~ msgstr "Passordene du skriver inn i begge felt må være identiske."
 
-#~ msgid "Enter new password:"
-#~ msgstr "Skriv inn nytt passord:"
-
 #~ msgid "Enter it again for confirmation:"
 #~ msgstr "Skriv inn én gang til å bekrefte:"
 
@@ -12359,9 +13269,6 @@ msgstr "Programtilleggsbehandler"
 #~ msgid "unsubscribe request from %s"
 #~ msgstr "frakoblingsforespørsel fra %s"
 
-#~ msgid "Autojoin"
-#~ msgstr "Bli med automatisk"
-
 #~ msgid "&lt;empty&gt;"
 #~ msgstr "&lt;empty&gt;"
 
@@ -12468,9 +13375,6 @@ msgstr "Programtilleggsbehandler"
 #~ msgid "Forward unread message then disconnect"
 #~ msgstr "Videresend uleste meldinger for så å koble fra"
 
-#~ msgid "AIM Address:"
-#~ msgstr "AIM-adresse:"
-
 #~ msgid "MSN Address:"
 #~ msgstr "MSN-adresse:"
 
@@ -12518,9 +13422,6 @@ msgstr "Programtilleggsbehandler"
 #~ msgid "Session negotiation cancelled"
 #~ msgstr "Øktforhandlinger avbrutt"
 
-#~ msgid "This session WILL be archived on server"
-#~ msgstr "Denne økta VIL bli arkivert på tjeneren"
-
 #~ msgid "This session WILL NOT be archived on server"
 #~ msgstr "Denne økta VIL IKKE bli arkivert på tjeneren"
 
@@ -12890,9 +13791,6 @@ msgstr "Programtilleggsbehandler"
 #~ msgid "Server:"
 #~ msgstr "Tjener:"
 
-#~ msgid "Password:"
-#~ msgstr "Passord:"
-
 #~ msgid "Join this room _automatically when I connect"
 #~ msgstr "Ta del i dette rommet _automatisk ved tilkobling"
 
@@ -13215,9 +14113,6 @@ msgstr "Programtilleggsbehandler"
 #~ msgid "_Edit Personal Information..."
 #~ msgstr "_Endre personalia…"
 
-#~ msgid "Information about you, as stored in the server"
-#~ msgstr "Informasjon om deg, slik som den er lagret på tjeneren"
-
 #~ msgid "<b>Personal Information</b>"
 #~ msgstr "<b>Personlig informasjon</b>"
 
@@ -13294,9 +14189,6 @@ msgstr "Programtilleggsbehandler"
 #~ msgid "Your server can't save your personal information."
 #~ msgstr "Tjeneren din kan ikke lagre personalia."
 
-#~ msgid "Account Local already exists."
-#~ msgstr "Lokal konto eksisterer allerede."
-
 #~ msgid "Please rename or remove it before enabling link-local messaging."
 #~ msgstr "Gi nytt navn eller fjern den før du slår på link-lokal -meldinger."
 
@@ -13366,9 +14258,6 @@ msgstr "Programtilleggsbehandler"
 #~ msgid "Add _Contact..."
 #~ msgstr "Legg til _kontakt…"
 
-#~ msgid "_Accounts"
-#~ msgstr "_Kontoer"
-
 #~ msgid "Profile, A_vatar"
 #~ msgstr "Profil, a_vatar"
 
@@ -13521,9 +14410,6 @@ msgstr "Programtilleggsbehandler"
 #~ msgid "Contact's identity verified"
 #~ msgstr "Kontaktens identitet er bekreftet"
 
-#~ msgid "Verify again..."
-#~ msgstr "Bekreft igjen…"
-
 #~ msgid ""
 #~ "To be certain that <b>only</b> the expected person can read your messages "
 #~ "or send you messages, you need to verify their identity by clicking the "
@@ -13804,12 +14690,6 @@ msgstr "Programtilleggsbehandler"
 #~ msgid "Activity: "
 #~ msgstr "Aktivitet: "
 
-#~ msgid "Join _Group Chat..."
-#~ msgstr "Bli med i _Gruppe Samtale..."
-
-#~ msgid "_Modify Account"
-#~ msgstr "_Rediger Konto"
-
 #~ msgid "Check on startup if Gajim is the _default Jabber client"
 #~ msgstr "Sjekk ved oppstart om Gajim er _standard Jabber klient"
 
@@ -14437,9 +15317,6 @@ msgstr "Programtilleggsbehandler"
 #~ msgid "[This message is encrypted]"
 #~ msgstr "[Denne meldingen er kryptert]"
 
-#~ msgid "Trayicon"
-#~ msgstr "Trayicon"
-
 #~ msgid "A icon in systemtray reflecting the current presence."
 #~ msgstr "Et ikon i systemtray som viser gjeldende tilkoblingsstatus."
 
@@ -14478,9 +15355,6 @@ msgstr "Programtilleggsbehandler"
 #~ msgid "Nickname not found: %s"
 #~ msgstr "Kallenavn ikke funnet: %s"
 
-#~ msgid "This group chat has no subject"
-#~ msgstr "Dette gruppesamtalerommet har ikke tittel"
-
 #, fuzzy
 #~ msgid ""
 #~ "Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
@@ -14558,9 +15432,6 @@ msgstr "Programtilleggsbehandler"
 #~ msgstr ""
 #~ "Klikk for å se tjenester (som MSN og ICQ transporter) på jabber serveren"
 
-#~ msgid "_Host:"
-#~ msgstr "_Maskin:"
-
 #~ msgid "Select the account with which to synchronise"
 #~ msgstr "Velg hvilken konto du skal synkronisere med"
 
@@ -14792,9 +15663,6 @@ msgstr "Programtilleggsbehandler"
 #~ msgid "_Player:"
 #~ msgstr "_Spiller:"
 
-#~ msgid "Address"
-#~ msgstr "Adresse"
-
 #~ msgid "Role:"
 #~ msgstr "Rolle:"
 
@@ -14913,9 +15781,6 @@ msgstr "Programtilleggsbehandler"
 #~ msgid "Connection to host could not be established"
 #~ msgstr "Tilkobling til maskin kunne ikke opprettes"
 
-#~ msgid "A_fter nickname:"
-#~ msgstr "E_tter kallenavn:"
-
 #~ msgid "_After time:"
 #~ msgstr "_Etter tid:"
 
@@ -15051,9 +15916,6 @@ msgstr "Programtilleggsbehandler"
 #~ msgid "Timeout"
 #~ msgstr "Tidsavbrudd"
 
-#~ msgid "account: "
-#~ msgstr "konto:"
-
 #~ msgid "Activate/Disable notification for when a file transfer is complete"
 #~ msgstr "Aktiver/Deaktiver melding om at filoverføring er komplett"
 
diff --git a/po/nl.po b/po/nl.po
index 4c88e409b..506521f13 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: 2019-07-02 02:06+0000\n"
+"POT-Creation-Date: 2019-08-11 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,68 +20,68 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Poedit 1.5.4\n"
 
-#: gajim/chat_control_base.py:550
+#: gajim/chat_control_base.py:557
 msgid "_Undo"
 msgstr "_Ongedaan maken"
 
-#: gajim/chat_control_base.py:558 gajim/conversation_textview.py:529
+#: gajim/chat_control_base.py:565 gajim/conversation_textview.py:529
 msgid "_Clear"
 msgstr "_Wissen"
 
-#: gajim/chat_control_base.py:563
+#: gajim/chat_control_base.py:570
 msgid "Paste as quote"
 msgstr ""
 
-#: gajim/chat_control_base.py:613
+#: gajim/chat_control_base.py:620
 #, fuzzy
 msgid "Paste Image"
 msgstr "Kies afbeelding"
 
-#: gajim/chat_control_base.py:614
+#: gajim/chat_control_base.py:621
 #, fuzzy
 msgid "You are trying to paste an image"
 msgstr "Je staat op het punt meerdere tabbladen te sluiten"
 
-#: gajim/chat_control_base.py:615
+#: gajim/chat_control_base.py:622
 #, 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:617 gajim/groupchat_control.py:2310
-#: gajim/roster_window.py:2848 gajim/roster_window.py:4167
-#: gajim/message_window.py:252 gajim/gtk/dialogs.py:418
+#: gajim/chat_control_base.py:624 gajim/groupchat_control.py:2218
+#: gajim/roster_window.py:2841 gajim/roster_window.py:4118
+#: gajim/message_window.py:359 gajim/gtk/dialogs.py:330
 msgid "_Do not ask me again"
 msgstr "Vraag mij _dit niet nogmaals"
 
-#: gajim/chat_control_base.py:620
+#: gajim/chat_control_base.py:627
 msgid "_Paste"
 msgstr ""
 
-#: gajim/chat_control_base.py:1162 gajim/gtk/accounts.py:351
+#: gajim/chat_control_base.py:1169 gajim/gtk/accounts.py:354
 msgid "Privacy"
 msgstr "Privacy"
 
-#: gajim/chat_control_base.py:1163
+#: gajim/chat_control_base.py:1170
 msgid "Warning"
 msgstr "Waarschuwing"
 
-#: gajim/chat_control_base.py:1164
+#: gajim/chat_control_base.py:1171
 #, python-format
 msgid "If you send a file to <b>%s</b>, your real JID 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:1169
+#: gajim/chat_control_base.py:1176
 msgid "Continue"
 msgstr "Doorgaan"
 
-#: gajim/gtkgui_helpers.py:163 gajim/gtk/filetransfer.py:393
+#: gajim/gtkgui_helpers.py:163 gajim/gtk/filetransfer.py:398
 #, fuzzy, python-format
 msgid "Cannot overwrite existing file '%s'"
 msgstr "Kan bestaand bestand ‘%s’ niet overschrijven"
 
-#: gajim/gtkgui_helpers.py:164 gajim/gtk/filetransfer.py:394
+#: gajim/gtkgui_helpers.py:164 gajim/gtk/filetransfer.py:399
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
@@ -172,337 +172,358 @@ msgstr "Er is geen lopend abonneringsverzoek."
 msgid " resource with priority "
 msgstr " bron met prioriteit "
 
-#: gajim/gui_menu_builder.py:96
-msgid "_New Group Chat"
-msgstr "_Nieuw groepsgesprek"
+#: gajim/gui_menu_builder.py:251 gajim/gui_menu_builder.py:342
+#: gajim/chat_control.py:305 gajim/roster_window.py:783
+#: gajim/roster_window.py:1716 gajim/roster_window.py:1718
+#: gajim/roster_window.py:2027 gajim/roster_window.py:3292
+#: gajim/roster_window.py:3325 gajim/gui_interface.py:396
+#: gajim/common/contacts.py:222 gajim/common/contacts.py:359
+#: gajim/common/contacts.py:471 gajim/common/helpers.py:86
+#: gajim/common/helpers.py:317 gajim/gtk/add_contact.py:319
+#: gajim/gtk/subscription_request.py:70 gajim/gtk/subscription_request.py:99
+#: gajim/gtk/roster_item_exchange.py:112
+#, fuzzy
+msgid "Not in contact list"
+msgstr "Offline contacten weergeven"
 
-#: gajim/gui_menu_builder.py:289 gajim/gui_menu_builder.py:380
-#: gajim/chat_control.py:303 gajim/roster_window.py:786
-#: gajim/roster_window.py:1719 gajim/roster_window.py:1721
-#: gajim/roster_window.py:2030 gajim/roster_window.py:3336
-#: gajim/roster_window.py:3369 gajim/gui_interface.py:413
-#: gajim/common/contacts.py:206 gajim/common/contacts.py:343
-#: gajim/common/helpers.py:83 gajim/common/helpers.py:311
-#: gajim/gtk/add_contact.py:319 gajim/gtk/subscription_request.py:70
-#: gajim/gtk/subscription_request.py:99 gajim/gtk/roster_item_exchange.py:112
-msgid "Not in Roster"
-msgstr "Niet in het rooster"
-
-#: gajim/gui_menu_builder.py:393
-msgid "I would like to add you to my roster"
-msgstr "Ik zou je graag aan mijn rooster willen toevoegen"
-
-#: gajim/gui_menu_builder.py:471
+#: gajim/gui_menu_builder.py:355
+#, 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:433
 msgid "Send Single _Message…"
 msgstr "Enkel _bericht verzenden…"
 
-#: gajim/gui_menu_builder.py:486
+#: gajim/gui_menu_builder.py:448
 msgid "E_xecute Command…"
 msgstr "Opdra_cht uitvoeren…"
 
-#: gajim/gui_menu_builder.py:494
+#: gajim/gui_menu_builder.py:456
 msgid "_Manage Transport"
 msgstr "Transport _beheren"
 
-#: gajim/gui_menu_builder.py:500
+#: gajim/gui_menu_builder.py:462
 msgid "_Modify Transport"
 msgstr "Transport b_ewerken"
 
-#: gajim/gui_menu_builder.py:507 gajim/roster_window.py:5046
+#: gajim/gui_menu_builder.py:469 gajim/roster_window.py:4985
 msgid "_Rename…"
 msgstr "_Hernoemen…"
 
-#: gajim/gui_menu_builder.py:518 gajim/roster_window.py:5062
-#: gajim/roster_window.py:5177 gajim/data/gui/blocked_contacts_window.ui:52
+#: gajim/gui_menu_builder.py:480 gajim/roster_window.py:5001
+#: gajim/roster_window.py:5116 gajim/data/gui/blocked_contacts_window.ui:52
 #: gajim/data/gui/gc_occupants_menu.ui:148
 #: gajim/data/gui/contact_context_menu.ui:143
 msgid "_Unblock"
 msgstr "_Deblokkeren"
 
-#: gajim/gui_menu_builder.py:521 gajim/roster_window.py:5067
-#: gajim/roster_window.py:5181 gajim/data/gui/gc_occupants_menu.ui:140
+#: gajim/gui_menu_builder.py:483 gajim/roster_window.py:5006
+#: gajim/roster_window.py:5120 gajim/data/gui/gc_occupants_menu.ui:140
 #: gajim/data/gui/contact_context_menu.ui:151
 msgid "_Block"
 msgstr "_Blokkeren"
 
-#: gajim/gui_menu_builder.py:529 gajim/roster_window.py:5074
+#: gajim/gui_menu_builder.py:491 gajim/roster_window.py:5013
 #: gajim/data/gui/contact_context_menu.ui:181
 msgid "Remo_ve"
 msgstr "_Verwijderen"
 
-#: gajim/gui_menu_builder.py:539 gajim/data/gui/contact_context_menu.ui:198
+#: gajim/gui_menu_builder.py:501 gajim/data/gui/contact_context_menu.ui:198
 msgid "_Information"
 msgstr "_Informatie"
 
-#: gajim/gui_menu_builder.py:552
+#: gajim/gui_menu_builder.py:514
 msgid "Save _As"
 msgstr "Opslaan _als"
 
-#: gajim/gui_menu_builder.py:564 gajim/groupchat_control.py:501
-#: gajim/chat_control.py:340
+#: gajim/gui_menu_builder.py:526 gajim/groupchat_control.py:507
+#: gajim/chat_control.py:342
 msgid "Send File…"
 msgstr "Bestand verzenden…"
 
-#: gajim/gui_menu_builder.py:565
+#: gajim/gui_menu_builder.py:527
 msgid "Upload File…"
 msgstr "Bestand uploaden…"
 
-#: gajim/gui_menu_builder.py:566
+#: gajim/gui_menu_builder.py:528
 msgid "Send File Directly…"
 msgstr "Bestand rechtstreeks verzenden…"
 
-#: gajim/gui_menu_builder.py:568 gajim/gui_menu_builder.py:632
+#: gajim/gui_menu_builder.py:530 gajim/gui_menu_builder.py:596
 msgid "Send Chatstate"
 msgstr "Chatstatus verzenden"
 
-#: gajim/gui_menu_builder.py:569
+#: gajim/gui_menu_builder.py:531
 msgid "Invite Contacts"
 msgstr "Contacten uitnodigen"
 
-#: gajim/gui_menu_builder.py:570
-msgid "Add to Roster"
-msgstr "Toevoegen aan rooster"
+#: gajim/gui_menu_builder.py:532
+#, fuzzy
+msgid "Add to Contact List"
+msgstr "Contact toevoegen"
 
-#: gajim/gui_menu_builder.py:571
-msgid "Audio Session"
-msgstr "Audiosessie"
+#: gajim/gui_menu_builder.py:533
+#, fuzzy
+msgid "Voice Chat"
+msgstr "Audiogespreksverzoek"
 
-#: gajim/gui_menu_builder.py:572
-msgid "Video Session"
-msgstr "Videosessie"
+#: gajim/gui_menu_builder.py:534
+#, fuzzy
+msgid "Video Chat"
+msgstr "Videotest"
 
-#: gajim/gui_menu_builder.py:573
+#: gajim/gui_menu_builder.py:535 gajim/gui_menu_builder.py:582
 msgid "Information"
 msgstr "Informatie"
 
-#: gajim/gui_menu_builder.py:574 gajim/gui_menu_builder.py:639
+#: gajim/gui_menu_builder.py:536 gajim/gui_menu_builder.py:602
 #: gajim/data/gui/application_menu.ui:37
 msgid "History"
 msgstr "Geschiedenis"
 
-#: gajim/gui_menu_builder.py:580 gajim/gui_menu_builder.py:687
+#: gajim/gui_menu_builder.py:542 gajim/gui_menu_builder.py:650
 #: gajim/data/gui/preferences_window.ui:1823
 msgid "Disabled"
 msgstr "Uitgeschakeld"
 
-#: gajim/gui_menu_builder.py:581 gajim/gui_menu_builder.py:688
+#: gajim/gui_menu_builder.py:543 gajim/gui_menu_builder.py:651
 msgid "Composing only"
 msgstr "Alleen ‘aan het typen’"
 
-#: gajim/gui_menu_builder.py:582 gajim/gui_menu_builder.py:689
+#: gajim/gui_menu_builder.py:544 gajim/gui_menu_builder.py:652
 msgid "All chat states"
 msgstr "Alle gesprekstoestanden"
 
-#: gajim/gui_menu_builder.py:620
-msgid "Manage Room"
-msgstr "Beheer ruimte"
+#: gajim/gui_menu_builder.py:583
+#, fuzzy
+msgid "Manage Group Chat"
+msgstr "Groepsgesprekken verlaten"
 
-#: gajim/gui_menu_builder.py:621
+#: gajim/gui_menu_builder.py:584 gajim/data/gui/groupchat_control.ui:649
 msgid "Change Subject"
 msgstr "Onderwerp veranderen"
 
-#: gajim/gui_menu_builder.py:622
-msgid "Configure Room"
-msgstr "Groepsgesprek configureren"
+#: gajim/gui_menu_builder.py:585
+#, fuzzy
+msgid "Configure Group Chat"
+msgstr "Groepsgesprekken verlaten"
 
-#: gajim/gui_menu_builder.py:623
+#: gajim/gui_menu_builder.py:586
 msgid "Upload Avatar…"
 msgstr "Avatar uploaden…"
 
-#: gajim/gui_menu_builder.py:624
-msgid "Destroy Room"
-msgstr "Groepsgesprek vernietigen"
+#: gajim/gui_menu_builder.py:587
+#, fuzzy
+msgid "Destroy Group Chat"
+msgstr "Nieuw groepsgesprek"
 
-#: gajim/gui_menu_builder.py:626 gajim/data/gui/preferences_window.ui:790
+#: gajim/gui_menu_builder.py:589 gajim/data/gui/preferences_window.ui:790
 msgid "Chat Settings"
 msgstr "Gespreksinstellingen"
 
-#: gajim/gui_menu_builder.py:627
+#: gajim/gui_menu_builder.py:590
 msgid "Show join/leave"
 msgstr "Berichten over deelnemen/verlaten tonen"
 
-#: gajim/gui_menu_builder.py:628
+#: gajim/gui_menu_builder.py:591
 msgid "Show status changes"
 msgstr "Statusveranderingen tonen"
 
-#: gajim/gui_menu_builder.py:629 gajim/data/gui/gc_control_popup_menu.ui:72
+#: gajim/gui_menu_builder.py:592 gajim/data/gui/gc_control_popup_menu.ui:72
 msgid "Notify on all messages"
 msgstr "Melding bij alle berichten"
 
-#: gajim/gui_menu_builder.py:630
+#: gajim/gui_menu_builder.py:593
 msgid "Minimize on close"
 msgstr "Minimaliseren bij sluiten"
 
-#: gajim/gui_menu_builder.py:631
-msgid "Minimize on autojoin"
+#: gajim/gui_menu_builder.py:595
+#, fuzzy
+msgid "Minimize when joining automatically"
 msgstr "Minimaliseren bij automatisch deelnemen"
 
-#: gajim/gui_menu_builder.py:634
+#: gajim/gui_menu_builder.py:598
 msgid "Sync Threshold"
 msgstr "Drempelwaarde voor synchronisatie"
 
-#: gajim/gui_menu_builder.py:635
-msgid "Change Nick"
-msgstr "Bijnaam veranderen"
-
-#: gajim/gui_menu_builder.py:636
-msgid "Bookmark Room"
-msgstr "Groepsgesprek toevoegen aan bladwijzers"
+#: gajim/gui_menu_builder.py:599
+#, fuzzy
+msgid "Change Nickname"
+msgstr "Bij_naam veranderen…"
 
-#: gajim/gui_menu_builder.py:637
+#: gajim/gui_menu_builder.py:600
 msgid "Request Voice"
 msgstr "Stem aanvragen"
 
-#: gajim/gui_menu_builder.py:638 gajim/roster_window.py:5246
+#: gajim/gui_menu_builder.py:601 gajim/roster_window.py:5185
 msgid "Execute command"
 msgstr "Opdracht uitvoeren"
 
-#: gajim/gui_menu_builder.py:640
-msgid "Disconnect"
-msgstr "Verbinding verbreken"
+#: gajim/gui_menu_builder.py:603
+msgid "Leave"
+msgstr ""
 
-#: gajim/gui_menu_builder.py:678 gajim/gtk/preferences.py:156
+#: gajim/gui_menu_builder.py:641 gajim/gtk/preferences.py:155
 msgid "No threshold"
 msgstr "Geen drempelwaarde"
 
-#: gajim/gui_menu_builder.py:680 gajim/gtk/preferences.py:158
+#: gajim/gui_menu_builder.py:643 gajim/gtk/preferences.py:157
 #, python-format
 msgid "%i day"
 msgid_plural "%i days"
 msgstr[0] "%i dag"
 msgstr[1] "%i dagen"
 
-#: gajim/gui_menu_builder.py:709 gajim/gui_menu_builder.py:747
-#: gajim/gtk/join_groupchat.py:43
-msgid "Join Group Chat"
-msgstr "Deelnemen aan groepsgesprek"
-
-#: gajim/gui_menu_builder.py:746
+#: gajim/gui_menu_builder.py:672
 msgid "Add Contact…"
 msgstr "Contact toevoegen…"
 
-#: gajim/gui_menu_builder.py:748 gajim/gtk/profile.py:52
-#: gajim/gtk/accounts.py:770 gajim/gtk/accounts.py:808
+#: gajim/gui_menu_builder.py:673 gajim/gtk/profile.py:52
+#: gajim/gtk/accounts.py:773 gajim/gtk/accounts.py:811
 msgid "Profile"
 msgstr "Profiel"
 
-#: gajim/gui_menu_builder.py:749
+#: gajim/gui_menu_builder.py:674
+msgid "Send Single Message…"
+msgstr "Enkel bericht verzenden…"
+
+#: gajim/gui_menu_builder.py:675
 msgid "Discover Services"
 msgstr "Diensten ontdekken"
 
-#: gajim/gui_menu_builder.py:750
-msgid "Send Single Message…"
-msgstr "Enkel bericht verzenden…"
+#: gajim/gui_menu_builder.py:676 gajim/gtk/server_info.py:36
+msgid "Server Info"
+msgstr "Serverinfo"
 
-#: gajim/gui_menu_builder.py:751 gajim/data/gui/preferences_window.ui:2741
+#: gajim/gui_menu_builder.py:677 gajim/data/gui/preferences_window.ui:2741
 msgid "Advanced"
 msgstr "Geavanceerd"
 
-#: gajim/gui_menu_builder.py:752 gajim/gtk/mam_preferences.py:88
+#: gajim/gui_menu_builder.py:678 gajim/gtk/mam_preferences.py:88
 msgid "Archiving Preferences"
 msgstr "Archiefvoorkeuren"
 
-#: gajim/gui_menu_builder.py:753
+#: gajim/gui_menu_builder.py:679
 msgid "Blocking List"
 msgstr "Blokkeringslijst"
 
-#: gajim/gui_menu_builder.py:754 gajim/gtk/history_sync.py:108
+#: gajim/gui_menu_builder.py:680
+msgid "Bookmarks"
+msgstr "Bladwijzers"
+
+#: gajim/gui_menu_builder.py:681
+#, fuzzy
+msgid "PEP Configuration"
+msgstr "Configuratie"
+
+#: gajim/gui_menu_builder.py:682 gajim/gtk/history_sync.py:108
 #: gajim/gtk/history_sync.py:186
 msgid "Synchronise History"
 msgstr "Geschiedenis synchroniseren"
 
-#: gajim/gui_menu_builder.py:755 gajim/gtk/privacy_list.py:427
+#: gajim/gui_menu_builder.py:683 gajim/gtk/privacy_list.py:427
 msgid "Privacy Lists"
 msgstr "Privacylijsten"
 
-#: gajim/gui_menu_builder.py:756 gajim/gtk/server_info.py:36
-msgid "Server Info"
-msgstr "Serverinfo"
-
-#: gajim/gui_menu_builder.py:757 gajim/gui_menu_builder.py:768
+#: gajim/gui_menu_builder.py:685 gajim/gui_menu_builder.py:696
 #: gajim/data/gui/xml_console_window.ui:77
 msgid "XML Console"
 msgstr "XML-console"
 
-#: gajim/gui_menu_builder.py:759 gajim/data/gui/groupchat_config.ui:36
+#: gajim/gui_menu_builder.py:687 gajim/data/gui/groupchat_config.ui:36
 msgid "Admin"
 msgstr "Admin"
 
-#: gajim/gui_menu_builder.py:760
+#: gajim/gui_menu_builder.py:688
 msgid "Send Server Message…"
 msgstr "Serverbericht verzenden…"
 
-#: gajim/gui_menu_builder.py:761
+#: gajim/gui_menu_builder.py:689
 msgid "Set MOTD…"
 msgstr "MOTD instellen…"
 
-#: gajim/gui_menu_builder.py:762
+#: gajim/gui_menu_builder.py:690
 msgid "Update MOTD…"
 msgstr "MOTD bijwerken…"
 
-#: gajim/gui_menu_builder.py:763
+#: gajim/gui_menu_builder.py:691
 msgid "Delete MOTD…"
 msgstr "MOTD verwijderen…"
 
-#: gajim/gui_menu_builder.py:812
-msgid "No Accounts available"
-msgstr "Geen accounts beschikbaar"
+#: gajim/gui_menu_builder.py:736
+#, fuzzy
+msgid "_Add Account…"
+msgstr "Account toevoegen…"
+
+#: gajim/gui_menu_builder.py:742
+#, fuzzy
+msgid "_Modify Accounts…"
+msgstr "Account Be_werken..."
+
+#: gajim/gui_menu_builder.py:751 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:823 gajim/data/gui/application_menu.ui:5
-#: gajim/data/gui/application_menu.ui:71 gajim/data/gui/shortcuts_window.ui:182
-#: gajim/gtk/accounts.py:58
+#: gajim/gui_menu_builder.py:755 gajim/data/gui/application_menu.ui:5
+#: gajim/data/gui/shortcuts_window.ui:182 gajim/gtk/accounts.py:57
 msgid "Accounts"
 msgstr "Accounts"
 
-#: gajim/gui_menu_builder.py:881 gajim/gui_menu_builder.py:886
-msgid "Copy JID"
-msgstr "JID kopiëren"
+#: gajim/gui_menu_builder.py:784 gajim/gui_menu_builder.py:789
+#, fuzzy
+msgid "Copy XMPP Address"
+msgstr "E-mailadres kopiëren"
 
-#: gajim/gui_menu_builder.py:882 gajim/gui_menu_builder.py:914
+#: gajim/gui_menu_builder.py:785 gajim/gui_menu_builder.py:817
 msgid "Join Groupchat"
 msgstr "Deelnemen aan groepsgesprek"
 
-#: gajim/gui_menu_builder.py:887 gajim/gui_menu_builder.py:913
-#: gajim/data/gui/application_menu.ui:76
+#: gajim/gui_menu_builder.py:790 gajim/gui_menu_builder.py:816
+#: gajim/data/gui/application_menu.ui:71
 #: gajim/data/gui/subscription_request_window.ui:106
 msgid "Start Chat"
 msgstr "Gesprek beginnen"
 
-#: gajim/gui_menu_builder.py:888 gajim/gui_menu_builder.py:915
-msgid "Add to Roster…"
-msgstr "Toevoegen aan rooster…"
+#: gajim/gui_menu_builder.py:791 gajim/gui_menu_builder.py:818
+#, fuzzy
+msgid "Add to Contact List…"
+msgstr "Contact toevoegen…"
 
-#: gajim/gui_menu_builder.py:893
+#: gajim/gui_menu_builder.py:796
 msgid "Copy Link Location"
 msgstr "Verwijzingslocatie kopiëren"
 
-#: gajim/gui_menu_builder.py:894
+#: gajim/gui_menu_builder.py:797
 msgid "Open Link in Browser"
 msgstr "Verwijzing openen in browser"
 
-#: gajim/gui_menu_builder.py:899
+#: gajim/gui_menu_builder.py:802
 msgid "Copy Email Address"
 msgstr "E-mailadres kopiëren"
 
-#: gajim/gui_menu_builder.py:900 gajim/gui_menu_builder.py:912
+#: gajim/gui_menu_builder.py:803 gajim/gui_menu_builder.py:815
 msgid "Open Email Composer"
 msgstr "E-mailopsteller openen"
 
-#: gajim/gui_menu_builder.py:905
+#: gajim/gui_menu_builder.py:808
 #, fuzzy
 msgid "Copy Location"
 msgstr "Verwijzingslocatie kopiëren"
 
-#: gajim/gui_menu_builder.py:906
+#: gajim/gui_menu_builder.py:809
 #, fuzzy
 msgid "Show Location"
 msgstr "Locatie:"
 
-#: gajim/gui_menu_builder.py:911
-msgid "Copy JID/Email"
-msgstr "JID/e-mailadres kopiëren"
+#: gajim/gui_menu_builder.py:814
+#, fuzzy
+msgid "Copy XMPP Address/Email"
+msgstr "E-mailadres kopiëren"
 
-#: gajim/gui_menu_builder.py:945
+#: gajim/gui_menu_builder.py:852
 #, fuzzy
 msgid "Copy"
 msgstr "JID kopiëren"
@@ -523,44 +544,55 @@ msgstr "Dit hulpbericht weergeven en afsluiten"
 msgid "Choose folder for logfile"
 msgstr "Kies map voor logboekbestand"
 
-#: gajim/history_manager.py:107
+#: gajim/history_manager.py:106
 msgid "Cannot find history logs database"
 msgstr "Kan logboekdatabase niet vinden"
 
-#: gajim/history_manager.py:108
+#: gajim/history_manager.py:107
 #, fuzzy, python-format
 msgid "%s does not exist."
 msgstr "Bestand bestaat niet"
 
-#: gajim/history_manager.py:141 gajim/history_manager.py:195
-#: gajim/gtk/discovery.py:829 gajim/gtk/roster_item_exchange.py:80
-msgid "JID"
-msgstr "JID"
+#: gajim/history_manager.py:140 gajim/history_manager.py:194
+#: 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:30
+#: gajim/gtk/accounts.py:804
+#, fuzzy
+msgid "XMPP Address"
+msgstr "AIM-adres:"
 
-#: gajim/history_manager.py:154 gajim/history_manager.py:202
+#: gajim/history_manager.py:153 gajim/history_manager.py:201
 #: gajim/data/gui/history_window.ui:89 gajim/gtk/history.py:108
 msgid "Date"
 msgstr "Datum"
 
-#: gajim/history_manager.py:161 gajim/history_manager.py:225
+#: gajim/history_manager.py:160 gajim/history_manager.py:224
 #: gajim/data/gui/join_groupchat_window.ui:208
 #: gajim/data/gui/profile_window.ui:214
 #: gajim/data/gui/vcard_information_window.ui:443
+#: gajim/data/gui/bookmarks.ui:140
 msgid "Nickname"
 msgstr "Bijnaam"
 
-#: gajim/history_manager.py:172 gajim/history_manager.py:211
+#: gajim/history_manager.py:171 gajim/history_manager.py:210
 #: gajim/data/gui/preferences_window.ui:1344
 #: gajim/data/gui/single_message_window.ui:275 gajim/gtk/history.py:117
 msgid "Message"
 msgstr "Bericht"
 
-#: gajim/history_manager.py:180 gajim/history_manager.py:218
+#: gajim/history_manager.py:179 gajim/history_manager.py:217
 #: gajim/data/gui/groups_post_window.ui:49
 #: gajim/data/gui/single_message_window.ui:214
 msgid "Subject"
 msgstr "Onderwerp"
 
+#: gajim/history_manager.py:247
+msgid "Database Cleanup"
+msgstr "Database opschonen"
+
 #: gajim/history_manager.py:248
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
@@ -568,12 +600,10 @@ msgid ""
 msgstr "Wil je de database opschonen? (STERK AFGERADEN ALS GAJIM DRAAIT)"
 
 #: gajim/history_manager.py:250
+#, fuzzy
 msgid ""
-"Normally allocated database size will not be freed, it will just become "
-"reusable. If you really want to reduce database filesize, click YES, else "
-"click NO.\n"
-"\n"
-"In case you click YES, please wait…"
+"Normally, the allocated database size will not be freed, it will just become "
+"reusable. This operation may take a while."
 msgstr ""
 "Normaal gezien wordt toegewezen databasegrootte niet bevrijd, ze wordt enkel "
 "weer bruikbaar. Als je de databasebestandsgrootte echt wil verkleinen, klik "
@@ -582,45 +612,46 @@ msgstr ""
 "Als je op JA klikt, even geduld…"
 
 #: gajim/history_manager.py:255
-msgid "Database Cleanup"
-msgstr "Database opschonen"
+#, fuzzy
+msgid "_Cleanup"
+msgstr "Ruim _op"
 
-#: gajim/history_manager.py:519 gajim/gtk/filetransfer.py:238
-#: gajim/gtk/filetransfer.py:248
+#: gajim/history_manager.py:518 gajim/gtk/filetransfer.py:237
+#: gajim/gtk/filetransfer.py:247
 msgid "You"
 msgstr "Jij"
 
-#: gajim/history_manager.py:531
+#: gajim/history_manager.py:530
 #, 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:568 gajim/history_manager.py:607
-#: gajim/gtk/dialogs.py:58 gajim/gtk/themes.py:319
+#: gajim/history_manager.py:567 gajim/history_manager.py:606
+#: gajim/gtk/dialogs.py:57 gajim/gtk/themes.py:319
 #: gajim/gtk/roster_item_exchange.py:75 gajim/gtk/roster_item_exchange.py:185
 msgid "Delete"
 msgstr "Verwijderen"
 
-#: gajim/history_manager.py:569
+#: gajim/history_manager.py:568
 msgid "Delete Conversation"
 msgid_plural "Delete Conversations"
 msgstr[0] "Gesprek verwijderen"
 msgstr[1] "Gesprekken verwijderen"
 
-#: gajim/history_manager.py:570
+#: gajim/history_manager.py:569
 #, 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:608
+#: gajim/history_manager.py:607
 msgid "Delete Message"
 msgid_plural "Delete Messages"
 msgstr[0] "Bericht verwijderen"
 msgstr[1] "Berichten verwijderen"
 
-#: gajim/history_manager.py:609
+#: gajim/history_manager.py:608
 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"
@@ -633,14 +664,14 @@ msgstr "Contactnaam: <i>%s</i>"
 
 #: gajim/dialogs.py:84
 #, python-format
-msgid "JID: <i>%s</i>"
-msgstr "JID: <i>%s</i>"
+msgid "XMPP Address: <i>%s</i>"
+msgstr ""
 
-#: gajim/dialogs.py:115 gajim/dialogs.py:128 gajim/roster_window.py:2901
-#: gajim/roster_window.py:3833 gajim/roster_window.py:5084
-#: gajim/common/contacts.py:157 gajim/common/contacts.py:190
+#: gajim/dialogs.py:115 gajim/dialogs.py:128 gajim/roster_window.py:2894
+#: gajim/roster_window.py:3784 gajim/roster_window.py:5023
+#: gajim/common/contacts.py:157 gajim/common/contacts.py:206
 #: gajim/data/gui/preferences_window.ui:558
-#: gajim/data/gui/shortcuts_window.ui:177 gajim/gtk/accounts.py:349
+#: gajim/data/gui/shortcuts_window.ui:177 gajim/gtk/accounts.py:352
 msgid "General"
 msgstr "Algemeen"
 
@@ -686,7 +717,7 @@ msgstr "Statusbericht overschrijven?"
 msgid "Preset 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:703
+#: gajim/dialogs.py:703 gajim/plugins/gui.py:292
 #, fuzzy
 msgid "_Overwrite"
 msgstr "Overschrijven?"
@@ -699,9 +730,7 @@ msgstr "Opslaan als vooraf ingesteld statusbericht"
 msgid "Please type a name for this status message"
 msgstr "Geef een nieuwe naam in voor dit statusbericht"
 
-#: gajim/dialogs.py:740 gajim/gui_interface.py:1441 gajim/dialog_messages.py:31
-#: gajim/gtk/discovery.py:518 gajim/gtk/profile.py:323
-#: gajim/gtk/join_groupchat.py:234
+#: gajim/dialogs.py:740 gajim/gtk/discovery.py:517 gajim/gtk/profile.py:323
 msgid "You are not connected to the server"
 msgstr "Er is geen verbinding met de server"
 
@@ -709,9 +738,11 @@ msgstr "Er is geen verbinding met de server"
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Zonder verbinding is het niet mogelijk je contacten te synchroniseren."
 
-#: gajim/dialogs.py:752 gajim/dialogs.py:823 gajim/gtk/discovery.py:822
-#: gajim/gtk/discovery.py:1648 gajim/gtk/discovery.py:1941
-#: gajim/gtk/history.py:99 gajim/gtk/roster_item_exchange.py:83
+#: gajim/dialogs.py:752 gajim/dialogs.py:823
+#: gajim/data/gui/groupchat_info_scrolled.ui:16 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/gtk/roster_item_exchange.py:83
 msgid "Name"
 msgstr "Naam"
 
@@ -733,385 +764,340 @@ msgstr ""
 msgid "Synchronise"
 msgstr "Synchroniseren"
 
-#: gajim/dialogs.py:1043
+#: gajim/dialogs.py:1042
 msgid "an audio and video"
 msgstr "een audio- en video-"
 
-#: gajim/dialogs.py:1045
+#: gajim/dialogs.py:1044
 msgid "an audio"
 msgstr "een audio-"
 
-#: gajim/dialogs.py:1047
+#: gajim/dialogs.py:1046
 msgid "a video"
 msgstr "een video-"
 
-#: gajim/dialogs.py:1051
-#, python-format
+#: gajim/dialogs.py:1050
+#, fuzzy, python-format
 msgid ""
-"%(contact)s wants to start %(type)s session with you. Do you want to answer "
+"%(contact)s wants to start a %(type)s chat with you. Do you want to answer "
 "the call?"
 msgstr ""
 "%(contact)s wil een %(type)s sessie met je beginnen. Wil je de oproep "
 "beantwoorden?"
 
-#: gajim/groupchat_control.py:505
+#: gajim/groupchat_control.py:511
 #, fuzzy, python-format
 msgid "Send File (max. %s MiB)…"
 msgstr "Bestand opslaan als…"
 
-#: gajim/groupchat_control.py:507 gajim/chat_control.py:342
+#: gajim/groupchat_control.py:513 gajim/chat_control.py:344
 msgid "No File Transfer available"
 msgstr "Geen bestandsoverdracht beschikbaar"
 
-#: gajim/groupchat_control.py:630 gajim/groupchat_control.py:2349
-msgid "Changing Subject"
-msgstr "Onderwerp veranderen"
-
-#: gajim/groupchat_control.py:631 gajim/groupchat_control.py:2350
-msgid "Please specify the new subject:"
-msgstr "Geef het nieuwe onderwerp op:"
-
-#: gajim/groupchat_control.py:638
-msgid "Changing Nickname"
-msgstr "Bijnaam veranderen"
-
-#: gajim/groupchat_control.py:639
-msgid "Please specify the new nickname you want to use:"
-msgstr "Geef de nieuwe bijnaam op die je wilt gebruiken:"
-
-#: gajim/groupchat_control.py:657
-msgid "Invalid group chat JID"
+#: gajim/groupchat_control.py:655
+#, fuzzy
+msgid "Invalid group chat XMPP Address"
 msgstr "Ongeldige JID voor groepsgesprek"
 
-#: gajim/groupchat_control.py:658
-msgid "The group chat JID has not allowed characters."
+#: gajim/groupchat_control.py:656
+#, fuzzy
+msgid "The group chat XMPP Address has not allowed characters."
 msgstr "De JID van het groepsgesprek heeft niet toegelaten tekens."
 
-#: gajim/groupchat_control.py:758 gajim/gtk/profile.py:136
+#: gajim/groupchat_control.py:743 gajim/gtk/profile.py:136
 msgid "Could not load image"
 msgstr "Kon afbeelding niet laden"
 
-#: gajim/groupchat_control.py:888
+#: gajim/groupchat_control.py:873
 msgid "Insert Nickname"
 msgstr "Bijnaam invoeren"
 
-#: gajim/groupchat_control.py:1056 gajim/chat_control.py:824
+#: gajim/groupchat_control.py:1041 gajim/chat_control.py:848
 msgid "and authenticated"
 msgstr "en geauthenticeerd"
 
-#: gajim/groupchat_control.py:1060 gajim/chat_control.py:828
+#: gajim/groupchat_control.py:1045 gajim/chat_control.py:852
 msgid "and NOT authenticated"
 msgstr "en NIET geauthenticeerd"
 
-#: gajim/groupchat_control.py:1064
+#: gajim/groupchat_control.py:1049
 #, python-format
 msgid "%(type)s encryption is active %(authenticated)s."
 msgstr "%(type)s-versleuteling is actief %(authenticated)s."
 
-#: gajim/groupchat_control.py:1111
+#: gajim/groupchat_control.py:1096
 msgid "Conversation with "
 msgstr "Gesprek met "
 
-#: gajim/groupchat_control.py:1113
+#: gajim/groupchat_control.py:1098
 msgid "Continued conversation"
 msgstr "Verdergezet gesprek"
 
-#: gajim/groupchat_control.py:1411
+#: gajim/groupchat_control.py:1357
 #, 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:1433
-msgid "Room now shows unavailable members"
+#: gajim/groupchat_control.py:1374
+#, fuzzy
+msgid "Group chat now shows unavailable members"
 msgstr "Groepsgesprek toont nu niet beschikbare leden"
 
-#: gajim/groupchat_control.py:1436
-msgid "Room now does not show unavailable members"
+#: gajim/groupchat_control.py:1377
+#, fuzzy
+msgid "Group chat now does not show unavailable members"
 msgstr "Groepsgesprek verbergt nu niet-beschikbare leden"
 
-#: gajim/groupchat_control.py:1439
+#: gajim/groupchat_control.py:1380
 msgid "A setting not related to privacy has been changed"
 msgstr "Een instelling is gewijzigd, niet gerelateerd aan privacy"
 
-#: gajim/groupchat_control.py:1446
-msgid "Room logging is now enabled"
-msgstr "Opslaan van berichten in groepsgesprek is nu ingeschakeld"
+#: gajim/groupchat_control.py:1387 gajim/groupchat_control.py:1659
+#, fuzzy
+msgid "Conversations are stored on the server"
+msgstr "Deze sessie ZAL gearchiveerd worden op de server"
 
-#: gajim/groupchat_control.py:1449
-msgid "Room logging is now disabled"
-msgstr "Opslaan van berichten in groepsgesprek is nu uitgeschakeld"
+#: gajim/groupchat_control.py:1390
+#, fuzzy
+msgid "Conversations are not stored on the server"
+msgstr "Informatie over jou, zoals op de server opgeslagen"
 
-#: gajim/groupchat_control.py:1452
-msgid "Room is now non-anonymous"
+#: gajim/groupchat_control.py:1393
+#, fuzzy
+msgid "Group chat is now non-anonymous"
 msgstr "Groepsgesprek is nu niet-anoniem"
 
-#: gajim/groupchat_control.py:1456
-msgid "Room is now semi-anonymous"
+#: gajim/groupchat_control.py:1397
+#, fuzzy
+msgid "Group chat is now semi-anonymous"
 msgstr "Groepsgesprek is nu semi-anoniem"
 
-#: gajim/groupchat_control.py:1460
-msgid "Room is now fully anonymous"
+#: gajim/groupchat_control.py:1401
+#, fuzzy
+msgid "Group chat is now fully anonymous"
 msgstr "Groepsgesprek is nu volledig anoniem"
 
-#: gajim/groupchat_control.py:1500
+#: gajim/groupchat_control.py:1439
 #, python-format
 msgid "Ping? (%s)"
 msgstr "Ping? (%s)"
 
-#: gajim/groupchat_control.py:1503
+#: gajim/groupchat_control.py:1442
 #, python-format
 msgid "Pong! (%(nick)s %(delay)s s.)"
 msgstr "Pong! (%(nick)s %(delay)s s.)"
 
-#: gajim/groupchat_control.py:1506 gajim/chat_control.py:1213
+#: gajim/groupchat_control.py:1445 gajim/chat_control.py:1237
 msgid "Error."
 msgstr "Fout."
 
-#: gajim/groupchat_control.py:1711
-#, python-format
-msgid "You (%s) joined the room"
-msgstr "Je (%s) neemt nu deel aan het groepsgesprek"
+#: gajim/groupchat_control.py:1650
+#, fuzzy, python-format
+msgid "You (%s) joined the group chat"
+msgstr "%s neemt nu deel aan het groepsgesprek"
 
-#: gajim/groupchat_control.py:1717
-msgid "Any occupant is allowed to see your full JID"
+#: gajim/groupchat_control.py:1655
+#, fuzzy
+msgid "Any participant is allowed to see your full XMPP Address"
 msgstr "Elke deelnemer kan je volledige JID te zien"
 
-#: gajim/groupchat_control.py:1721
-msgid "Room logging is enabled"
-msgstr "Opslaan van berichten in groepsgesprek is ingeschakeld"
-
-#: gajim/groupchat_control.py:1725
-msgid "The server has assigned or modified your roomnick"
+#: gajim/groupchat_control.py:1663
+#, fuzzy
+msgid "The server has assigned or modified your nickname in this group chat"
 msgstr "De server heeft je bijnaam toegewezen of aangepast"
 
-#: gajim/groupchat_control.py:1732
-msgid "A new room has been created"
+#: gajim/groupchat_control.py:1671
+#, fuzzy
+msgid "A new group chat has been created"
 msgstr "Een nieuw groepsgesprek is aangemaakt"
 
-#: gajim/groupchat_control.py:1740 gajim/privatechat_control.py:112
+#: gajim/groupchat_control.py:1679 gajim/privatechat_control.py:115
 #, python-format
 msgid "You are now known as %s"
 msgstr "Je staat nu bekend als %s"
 
-#: gajim/groupchat_control.py:1742 gajim/privatechat_control.py:114
+#: gajim/groupchat_control.py:1681 gajim/privatechat_control.py:117
 #, python-brace-format
 msgid "{nick} is now known as {new_nick}"
 msgstr "{nick} is nu bekend als {new_nick}"
 
-#: gajim/groupchat_control.py:1767 gajim/privatechat_control.py:141
+#: gajim/groupchat_control.py:1706 gajim/privatechat_control.py:144
 #, python-brace-format
 msgid "You are now {show}{status}"
 msgstr "Je bent nu {show}{status}"
 
-#: gajim/groupchat_control.py:1773 gajim/privatechat_control.py:147
+#: gajim/groupchat_control.py:1712 gajim/privatechat_control.py:150
 #, python-brace-format
 msgid "{nick} is now {show}{status}"
 msgstr "{nick} is nu {show}{status}"
 
-#: gajim/groupchat_control.py:1790 gajim/groupchat_control.py:1819
-#: gajim/groupchat_control.py:1849 gajim/groupchat_control.py:1909
+#: gajim/groupchat_control.py:1729 gajim/groupchat_control.py:1758
+#: gajim/groupchat_control.py:1788 gajim/groupchat_control.py:1848
 #, python-brace-format
 msgid " by {actor}"
 msgstr " door {actor}"
 
-#: gajim/groupchat_control.py:1793
+#: gajim/groupchat_control.py:1732
 #, python-brace-format
 msgid "** Your Affiliation has been set to {affiliation}{actor}{reason}"
 msgstr "** Je aansluiting is ingesteld op {affiliation}{actor}{reason}"
 
-#: gajim/groupchat_control.py:1799
+#: gajim/groupchat_control.py:1738
 #, python-brace-format
 msgid "** Affiliation of {nick} has been set to {affiliation}{actor}{reason}"
 msgstr "** Aansluiting van {nick} is ingesteld op {affiliation}{actor}{reason}"
 
-#: gajim/groupchat_control.py:1822
+#: gajim/groupchat_control.py:1761
 #, python-brace-format
 msgid "** Your Role has been set to {role}{actor}{reason}"
 msgstr "** Je rol is ingesteld op {role}{actor}{reason}"
 
-#: gajim/groupchat_control.py:1827
+#: gajim/groupchat_control.py:1766
 #, python-brace-format
 msgid "** Role of {nick} has been set to {role}{actor}{reason}"
 msgstr "** Rol van {nick} is ingesteld op {role}{actor}{reason}"
 
-#: gajim/groupchat_control.py:1852
-#, python-brace-format
-msgid "You have been removed from the room{actor}{reason}"
+#: gajim/groupchat_control.py:1791
+#, fuzzy, python-brace-format
+msgid "You have been removed from the group chat{actor}{reason}"
 msgstr "Je bent uit het gesprek verwijderd{actor}{reason}"
 
-#: gajim/groupchat_control.py:1857
+#: gajim/groupchat_control.py:1796
 #, python-brace-format
 msgid "You have left due to an error{reason}"
 msgstr "Je hebt het gesprek verlaten vanwege een fout{reason}"
 
-#: gajim/groupchat_control.py:1863
+#: gajim/groupchat_control.py:1802
 #, python-brace-format
 msgid "You have been kicked{actor}{reason}"
 msgstr "Je bent uit het gesprek geschopt{actor}{reason}"
 
-#: gajim/groupchat_control.py:1870
+#: gajim/groupchat_control.py:1809
 #, python-brace-format
 msgid "You have been banned{actor}{reason}"
 msgstr "Je bent uit het gesprek verbannen{actor}{reason}"
 
-#: gajim/groupchat_control.py:1877 gajim/groupchat_control.py:1943
+#: gajim/groupchat_control.py:1816 gajim/groupchat_control.py:1882
 msgid ": Affiliation changed"
 msgstr ": aansluiting veranderd"
 
-#: gajim/groupchat_control.py:1883 gajim/groupchat_control.py:1948
-msgid ": Room configuration changed to members-only"
+#: gajim/groupchat_control.py:1822 gajim/groupchat_control.py:1887
+#, fuzzy
+msgid ": Group chat configuration changed to members-only"
 msgstr ": gespreksconfiguratie veranderd naar alleen-leden"
 
-#: gajim/groupchat_control.py:1912
-#, python-brace-format
-msgid "{nick} has been removed from the room{by}{reason}"
+#: gajim/groupchat_control.py:1851
+#, fuzzy, python-brace-format
+msgid "{nick} has been removed from the group chat{by}{reason}"
 msgstr "{nick} is uit het gesprek verwijderd{by}{reason}"
 
-#: gajim/groupchat_control.py:1922
+#: gajim/groupchat_control.py:1861
 #, python-brace-format
 msgid "{nick} has left due to an error{reason}"
 msgstr "{nick} heeft het gesprek verlaten vanwege een fout{reason}"
 
-#: gajim/groupchat_control.py:1928
+#: gajim/groupchat_control.py:1867
 #, python-brace-format
 msgid "{nick} has been kicked{actor}{reason}"
 msgstr "{nick} is uit het gesprek geschopt{actor}{reason}"
 
-#: gajim/groupchat_control.py:1936
+#: gajim/groupchat_control.py:1875
 #, python-brace-format
 msgid "{nick} has been banned{actor}{reason}"
 msgstr "{nick} is uit het gesprek verbannen{actor}{reason}"
 
-#: gajim/groupchat_control.py:1953
+#: gajim/groupchat_control.py:1892
 #, python-brace-format
 msgid "{nick} has left{reason}"
 msgstr "{nick} heeft het gesprek verlaten{reason}"
 
-#: gajim/groupchat_control.py:1970
+#: gajim/groupchat_control.py:1914
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s neemt nu deel aan het groepsgesprek"
 
-#: gajim/groupchat_control.py:1985 gajim/groupchat_control.py:1990
-#: gajim/groupchat_control.py:1995 gajim/groupchat_control.py:2000
-#: gajim/groupchat_control.py:2011
-msgid "Unable to join group chat"
-msgstr "Kan niet deelnemen aan het groepsgesprek"
-
-#: gajim/groupchat_control.py:1986
-#, python-format
-msgid "You are banned from group chat <b>%s</b>."
-msgstr "Je bent verbannen uit groepsgesprek <b>%s</b>."
-
-#: gajim/groupchat_control.py:1991
-#, python-format
-msgid "Remote server <b>%s</b> does not exist."
-msgstr "Externe server <b>%s</b> bestaat niet."
-
-#: gajim/groupchat_control.py:1996
-#, python-format
-msgid "Group chat <b>%s</b> does not exist."
-msgstr "Groepsgesprek <b>%s</b> bestaat niet."
-
-#: gajim/groupchat_control.py:2001
-msgid "Group chat creation is not permitted."
-msgstr "Aanmaken van groepsgesprekken is niet toegestaan."
-
-#: gajim/groupchat_control.py:2005
-msgid "Unable to join groupchat"
-msgstr "Kan niet deelnemen aan het groepsgesprek"
-
-#: gajim/groupchat_control.py:2006
-#, python-format
-msgid "You must use your registered nickname in <b>%s</b>."
-msgstr "Je geregistreerde bijnaam moet gebruikt worden in <b>%s</b>."
-
-#: gajim/groupchat_control.py:2012
-#, python-format
-msgid "You are not in the members list in groupchat %s."
-msgstr "Je staat niet in de ledenlijst van groepsgesprek %s."
-
-#: gajim/groupchat_control.py:2068
-msgid "Room has been destroyed"
+#: gajim/groupchat_control.py:1981
+#, fuzzy
+msgid "Group chat has been destroyed"
 msgstr "Groepsgesprek is verwijderd"
 
-#: gajim/groupchat_control.py:2073
-#, python-format
-msgid "You can join this room instead: xmpp:%s?join"
+#: gajim/groupchat_control.py:1986
+#, fuzzy, python-format
+msgid "You can join this group chat instead: xmpp:%s?join"
 msgstr "Je kan in plaats daarvan aan dit groepsgesprek deelnemen: xmpp:%s?join"
 
-#: gajim/groupchat_control.py:2306
+#: gajim/groupchat_control.py:2214
 #, fuzzy
 msgid "Leave Group Chat"
 msgstr "Groepsgesprekken verlaten"
 
-#: gajim/groupchat_control.py:2307
+#: gajim/groupchat_control.py:2215
 #, fuzzy
 msgid "Are you sure you want to leave this group chat?"
 msgstr "Weet je zeker dat je het groepsgesprek ‘%s’ wil verlaten?"
 
-#: gajim/groupchat_control.py:2308
+#: gajim/groupchat_control.py:2216
 #, fuzzy, python-format
-msgid "If you close this window, you will be disconnected from '%s'."
+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:2314
+#: gajim/groupchat_control.py:2222 gajim/roster_window.py:5177
 msgid "_Leave"
 msgstr ""
 
-#: gajim/groupchat_control.py:2377
+#: gajim/groupchat_control.py:2280 gajim/roster_window.py:3008
 #, fuzzy, python-format
 msgid "%(jid)s has been invited to this group chat"
 msgstr "%(jid)s is in dit groepsgesprek uitgenodigd"
 
-#: gajim/groupchat_control.py:2527
+#: gajim/groupchat_control.py:2463
 #, python-format
 msgid "Kicking %s"
 msgstr "%s uit de ruimte schoppen"
 
-#: gajim/groupchat_control.py:2528 gajim/groupchat_control.py:2829
+#: gajim/groupchat_control.py:2464 gajim/groupchat_control.py:2765
 msgid "You may specify a reason below:"
 msgstr "Je kan hieronder een reden opgeven:"
 
-#: gajim/groupchat_control.py:2828
+#: gajim/groupchat_control.py:2764
 #, python-format
 msgid "Banning %s"
 msgstr "%s verbannen"
 
-#: gajim/chat_control.py:408
+#: gajim/chat_control.py:432
 msgid "Show a list of formattings"
 msgstr "Toon een lijst van opmaakstijlen"
 
-#: gajim/chat_control.py:412
+#: gajim/chat_control.py:436
 msgid "This contact does not support HTML"
 msgstr "Dit contact ondersteunt geen HTML"
 
-#: gajim/chat_control.py:562
+#: gajim/chat_control.py:586
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr "%(type)s toestand : %(state)s, reden: %(reason)s"
 
-#: gajim/chat_control.py:686
+#: gajim/chat_control.py:710
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s van groepsgesprek %(room_name)s"
 
-#: gajim/chat_control.py:832
+#: gajim/chat_control.py:856
 #, fuzzy, python-format
 msgid "%(type)s encryption is active %(authenticated)s"
 msgstr "%(type)s-versleuteling is actief %(authenticated)s."
 
-#: gajim/chat_control.py:1160 gajim/chat_control.py:1168
+#: gajim/chat_control.py:1184 gajim/chat_control.py:1192
 msgid "Close"
 msgstr "Sluiten"
 
-#: gajim/chat_control.py:1161
+#: gajim/chat_control.py:1185
 #, python-format
 msgid "You just received a new message from %s"
 msgstr "Je hebt zonet een nieuw bericht ontvangen van %s"
 
-#: gajim/chat_control.py:1163
+#: gajim/chat_control.py:1187
 #, fuzzy
 msgid ""
 "If you close this tab while having chat history disabled, this message will "
@@ -1120,17 +1106,17 @@ msgstr ""
 "Als je deze tab sluit en geschiedenis uitgeschakeld hebt zal dit bericht "
 "verlorgen gaan."
 
-#: gajim/chat_control.py:1208
+#: gajim/chat_control.py:1232
 msgid "Ping?"
 msgstr "Ping?"
 
-#: gajim/chat_control.py:1211
+#: gajim/chat_control.py:1235
 #, python-format
 msgid "Pong! (%s seconds)"
 msgstr "Pong! (%s seconden)"
 
 # .
-#: gajim/chat_control.py:1308
+#: gajim/chat_control.py:1332
 #, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -1139,242 +1125,249 @@ msgstr ""
 "Onderwerp: %(subject)s\n"
 "%(message)s"
 
-#: gajim/chat_control.py:1416
+#: gajim/chat_control.py:1440
 #, python-format
 msgid "%(name)s is now %(show)s %(status)s"
 msgstr "%(name)s is nu %(show)s %(status)s"
 
-#: gajim/chat_control.py:1476 gajim/data/gui/application_menu.ui:32
+#: gajim/chat_control.py:1500 gajim/data/gui/application_menu.ui:32
 #: gajim/gtk/http_upload_progress.py:35
 msgid "File Transfer"
 msgstr "Bestandsoverdracht"
 
-#: gajim/chat_control.py:1480
+#: gajim/chat_control.py:1504
 msgid "Size"
 msgstr "Grootte"
 
-#: gajim/chat_control.py:1482 gajim/chat_control.py:1546
+#: gajim/chat_control.py:1506 gajim/chat_control.py:1566
+#: gajim/gui_interface.py:190
 #: gajim/data/gui/groupchat_invitation_received.ui:77
-#: gajim/gtk/filetransfer.py:485
+#: gajim/gtk/filetransfer.py:490
 msgid "_Accept"
 msgstr "_Accepteren"
 
-#: gajim/chat_control.py:1484 gajim/chat_control.py:1548
+#: gajim/chat_control.py:1508 gajim/chat_control.py:1568
 #: gajim/data/gui/groupchat_invitation_received.ui:62
 msgid "_Decline"
 msgstr "_Weigeren"
 
-#: gajim/chat_control.py:1506 gajim/gui_interface.py:791
-#: gajim/gui_interface.py:821 gajim/gui_interface.py:847
+#: gajim/chat_control.py:1530 gajim/gui_interface.py:777
+#: gajim/gui_interface.py:807 gajim/gui_interface.py:833
 #: gajim/gtk/notification.py:173 gajim/gtk/notification.py:278
 msgid "File Transfer Completed"
 msgstr "Bestandsoverdracht voltooid"
 
-#: gajim/chat_control.py:1510 gajim/gtk/filetransfer.py:259
+#: gajim/chat_control.py:1534 gajim/gtk/filetransfer.py:258
 #, fuzzy
 msgid "Open _Folder"
 msgstr "_Bovenliggende map openen"
 
-#: gajim/chat_control.py:1512 gajim/chat_control.py:1521
+#: gajim/chat_control.py:1536 gajim/chat_control.py:1545
+#: gajim/data/gui/groupchat_control.ui:962
+#: gajim/data/gui/groupchat_control.ui:1049
+#: gajim/data/gui/groupchat_control.ui:1155
 msgid "_Close"
 msgstr "S_luiten"
 
-#: gajim/chat_control.py:1543 gajim/gui_interface.py:484
+#: gajim/chat_control.py:1563 gajim/gui_interface.py:473
+#: gajim/data/gui/groupchat_invitation_received.ui:42
 #: gajim/gtk/notification.py:174 gajim/gtk/notification.py:195
 #: gajim/gtk/notification.py:281
-msgid "Groupchat Invitation"
+msgid "Group Chat Invitation"
 msgstr "Uitnodiging voor groepsgesprek"
 
-#: gajim/chat_control.py:1568 gajim/roster_window.py:1954
+#: gajim/chat_control.py:1588 gajim/roster_window.py:1951
 msgid "Remote contact stopped transfer"
 msgstr "Contact heeft de overdracht gestopt"
 
-#: gajim/chat_control.py:1570 gajim/roster_window.py:1956
+#: gajim/chat_control.py:1590 gajim/roster_window.py:1953
 msgid "Error opening file"
 msgstr "Fout bij openen van bestand"
 
-#: gajim/chat_control.py:1572 gajim/gtk/filetransfer.py:297
+#: gajim/chat_control.py:1592 gajim/gtk/filetransfer.py:296
 msgid "File transfer stopped"
 msgstr "Bestandsoverdracht gestopt"
 
-#: gajim/chat_control.py:1575 gajim/gtk/filetransfer.py:275
-#: gajim/gtk/filetransfer.py:284
+#: gajim/chat_control.py:1595 gajim/gtk/filetransfer.py:274
+#: gajim/gtk/filetransfer.py:283
 msgid "File transfer cancelled"
 msgstr "Bestandsoverdracht geannuleerd"
 
-#: gajim/chat_control.py:1576
+#: gajim/chat_control.py:1596
 msgid "Connection with peer cannot be established."
 msgstr "Kon geen verbinding maken met gebruiker."
 
-#: gajim/application.py:72
+#: gajim/application.py:75
 msgid "Show the application's version"
 msgstr "Toepassingsversie weergeven"
 
-#: gajim/application.py:79
+#: gajim/application.py:82
 msgid "Show only critical errors"
 msgstr "Alleen kritieke fouten weergeven"
 
-#: gajim/application.py:86
+#: gajim/application.py:89
 msgid "Separate profile files completely (even history database and plugins)"
 msgstr ""
 "Profielbestanden volledig scheiden (zelfs geschiedenisdatabase en plug-ins)"
 
-#: gajim/application.py:94
+#: gajim/application.py:97
 msgid "Print XML stanzas and other debug information"
 msgstr "XML-stanza’s en andere debuginformatie afdrukken"
 
-#: gajim/application.py:101
+#: gajim/application.py:104
 msgid "Use defined profile in configuration directory"
 msgstr "Gebruik opgegeven profiel in configuratiemap"
 
-#: gajim/application.py:109
+#: gajim/application.py:112
 msgid "Set configuration directory"
 msgstr "Configuratiemap instellen"
 
-#: gajim/application.py:117
+#: gajim/application.py:120
 msgid "Configure logging system"
 msgstr "Logboeksysteem configureren"
 
-#: gajim/application.py:125
+#: gajim/application.py:128
 msgid "Show all warnings"
 msgstr "Alle waarschuwingen weergeven"
 
-#: gajim/application.py:132
+#: gajim/application.py:135
 msgid "Open IPython shell"
 msgstr "IPython-shell openen"
 
-#: gajim/application.py:139
+#: gajim/application.py:142
 msgid "Pops up a window with the next pending event"
 msgstr "Toont een venster met de volgende lopende gebeurtenis"
 
-#: gajim/application.py:145 gajim/data/gui/shortcuts_window.ui:203
+#: gajim/application.py:148 gajim/data/gui/shortcuts_window.ui:203
 #: data/org.gajim.Gajim.desktop.in:21
 msgid "Start a new chat"
 msgstr "Nieuw gesprek beginnen"
 
-#: gajim/application.py:152
+#: gajim/application.py:155
 msgid "Simulate loss of connectivity"
 msgstr "Verbroken verbinding simuleren"
 
-#: gajim/application.py:159
+#: gajim/application.py:162
 msgid "Simulate regaining connectivity"
 msgstr "Herstellen van verbinding simuleren"
 
-#: gajim/application.py:201 gajim/gui_interface.py:133
+#: gajim/application.py:204 gajim/gui_interface.py:133
 msgid "Database Error"
 msgstr "Databasefout"
 
-#: gajim/roster_window.py:294 gajim/roster_window.py:1030
+#: gajim/roster_window.py:291 gajim/roster_window.py:1027
 msgid "Merged accounts"
 msgstr "Samengevoegde accounts"
 
-#: gajim/roster_window.py:853 gajim/roster_window.py:1631
-#: gajim/roster_window.py:1664 gajim/roster_window.py:1715
-#: gajim/roster_window.py:1717 gajim/roster_window.py:1872
-#: gajim/roster_window.py:2531 gajim/roster_window.py:5025
-#: gajim/common/contacts.py:188 gajim/common/contacts.py:447
-#: gajim/common/helpers.py:83 gajim/gtk/discovery.py:129
-#: gajim/gtk/discovery.py:130 gajim/gtk/discovery.py:1416
+#: gajim/roster_window.py:850 gajim/roster_window.py:1628
+#: gajim/roster_window.py:1661 gajim/roster_window.py:1712
+#: gajim/roster_window.py:1714 gajim/roster_window.py:1869
+#: gajim/roster_window.py:2528 gajim/roster_window.py:4331
+#: gajim/roster_window.py:4964 gajim/common/contacts.py:204
+#: gajim/common/contacts.py:463 gajim/common/helpers.py:86
+#: gajim/gtk/discovery.py:127 gajim/gtk/discovery.py:128
+#: gajim/gtk/discovery.py:1414
 msgid "Transports"
 msgstr "Transporten"
 
-#: gajim/roster_window.py:1723 gajim/roster_window.py:1725
-#: gajim/roster_window.py:4995 gajim/gui_interface.py:1613
-#: gajim/gui_interface.py:1639 gajim/common/contacts.py:186
-#: gajim/common/helpers.py:83 gajim/common/modules/adhoc_commands.py:245
-msgid "Groupchats"
+#: gajim/roster_window.py:1720 gajim/roster_window.py:1722
+#: gajim/roster_window.py:4331 gajim/roster_window.py:4934
+#: gajim/gui_interface.py:1527 gajim/common/contacts.py:202
+#: gajim/common/helpers.py:86 gajim/common/modules/adhoc_commands.py:245
+#, fuzzy
+msgid "Group chats"
 msgstr "Groepsgesprekken"
 
-#: gajim/roster_window.py:2012
+#: gajim/roster_window.py:2009
 msgid "Authorization sent"
 msgstr "Machtiging verzonden"
 
-#: gajim/roster_window.py:2013
+#: gajim/roster_window.py:2010
 #, python-format
 msgid "\"%s\" will now see your status."
 msgstr "‘%s’ zal nu je status zien."
 
-#: gajim/roster_window.py:2031
+#: gajim/roster_window.py:2028
 msgid "Subscription request has been sent"
 msgstr "Abonneringsverzoek is verzonden"
 
-#: gajim/roster_window.py:2032
-#, python-format
-msgid "If \"%s\" accepts this request you will know his or her status."
+#: gajim/roster_window.py:2029
+#, 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:2046
+#: gajim/roster_window.py:2043
 msgid "Authorization removed"
 msgstr "Machtiging verwijderd"
 
-#: gajim/roster_window.py:2047
+#: gajim/roster_window.py:2044
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "‘%s’ zal je nu altijd als offline zien."
 
-#: gajim/roster_window.py:2250 gajim/roster_window.py:3504
+#: gajim/roster_window.py:2247 gajim/roster_window.py:3460
 msgid "Disconnect for Invisibility"
 msgstr ""
 
-#: gajim/roster_window.py:2251 gajim/roster_window.py:3505
+#: gajim/roster_window.py:2248 gajim/roster_window.py:3461
 msgid "You are participating in one or more group chats"
 msgstr "Je neem deel aan een of meerdere groepsgesprekken"
 
-#: gajim/roster_window.py:2252 gajim/roster_window.py:3506
+#: gajim/roster_window.py:2249 gajim/roster_window.py:3462
 #, fuzzy
 msgid ""
-"Changing your status to invisible will result in disconnection from those "
-"group chats.\n"
+"Changing your status to invisible will result in you leaving those group "
+"chats.\n"
 "Are you sure you want to go invisible?"
 msgstr ""
 "Door je status naar onzichtbaar te veranderen zal de verbinding met "
 "groepsgesprekken verbroken worden. Weet je zeker dat je naar onzichtbaar "
 "wilt gaan?"
 
-#: gajim/roster_window.py:2257 gajim/roster_window.py:3512
-#: gajim/roster_window.py:5238 gajim/data/gui/gc_control_popup_menu.ui:120
+#: gajim/roster_window.py:2254 gajim/roster_window.py:3468
+#: gajim/data/gui/gc_control_popup_menu.ui:120
 msgid "_Disconnect"
 msgstr "Verbin_ding verbreken"
 
-#: gajim/roster_window.py:2285
+#: gajim/roster_window.py:2282
 msgid "desynced"
 msgstr "gedesynchroniseerd"
 
-#: gajim/roster_window.py:2353 gajim/data/gui/shortcuts_window.ui:224
+#: gajim/roster_window.py:2350 gajim/data/gui/shortcuts_window.ui:224
 msgid "Quit Gajim"
 msgstr "Gajim afsluiten"
 
-#: gajim/roster_window.py:2354
+#: gajim/roster_window.py:2351
 #, fuzzy
 msgid "You are about to quit Gajim"
 msgstr "Weet je zeker dat je Gajim wil afsluiten?"
 
-#: gajim/roster_window.py:2355
+#: gajim/roster_window.py:2352
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Weet je zeker dat je Gajim wil afsluiten?"
 
-#: gajim/roster_window.py:2356
+#: gajim/roster_window.py:2353
 #, fuzzy
 msgid "_Always quit when closing Gajim"
 msgstr "Gajim altijd sluiten"
 
-#: gajim/roster_window.py:2359 gajim/roster_window.py:2455
-#: gajim/roster_window.py:2495 gajim/data/gui/systray_context_menu.ui:90
+#: gajim/roster_window.py:2356 gajim/roster_window.py:2452
+#: gajim/roster_window.py:2492 gajim/data/gui/systray_context_menu.ui:83
 msgid "_Quit"
 msgstr "_Afsluiten"
 
-#: gajim/roster_window.py:2448
+#: gajim/roster_window.py:2445
 #, fuzzy
 msgid "Stop File Transfers"
 msgstr "Bestandsoverdrachten"
 
-#: gajim/roster_window.py:2449
+#: gajim/roster_window.py:2446
 #, fuzzy
 msgid "You still have running file transfers"
 msgstr "Je hebt lopende bestandsoverdrachten"
 
-#: gajim/roster_window.py:2450
+#: gajim/roster_window.py:2447
 #, fuzzy
 msgid ""
 "If you quit now, the file(s) being transferred will be lost.\n"
@@ -1383,17 +1376,17 @@ msgstr ""
 "Als je nu afsluit zullen de momenteel bezige bestandsoverdrachten worden "
 "stopgezet. Wil je nog steeds afsluiten?"
 
-#: gajim/roster_window.py:2488
+#: gajim/roster_window.py:2485
 #, fuzzy
 msgid "Unread Messages"
 msgstr "Ongelezen gebeurtenissen"
 
-#: gajim/roster_window.py:2489
+#: gajim/roster_window.py:2486
 #, fuzzy
 msgid "You still have unread messages"
 msgstr "Je hebt ongelezen berichten"
 
-#: gajim/roster_window.py:2490
+#: gajim/roster_window.py:2487
 #, fuzzy
 msgid ""
 "Messages will only be available for reading them later if storing chat "
@@ -1402,20 +1395,20 @@ msgstr ""
 "Berichten zullen alleen voor later beschikbaar zijn als je geschiedenis "
 "ingeschakeld hebt en het contact in je rooster staat."
 
-#: gajim/roster_window.py:2760
+#: gajim/roster_window.py:2753
 msgid "You have unread messages"
 msgstr "Je hebt ongelezen berichten"
 
-#: gajim/roster_window.py:2761
+#: gajim/roster_window.py:2754
 msgid "You must read them before removing this transport."
 msgstr "You moet ze lezen voor je dit transport verwijdert."
 
-#: gajim/roster_window.py:2764
+#: gajim/roster_window.py:2757
 #, fuzzy, python-format
 msgid "Transport '%s' will be removed"
 msgstr "Transport ‘%s’ zal worden verwijderd"
 
-#: gajim/roster_window.py:2765
+#: gajim/roster_window.py:2758
 #, fuzzy
 msgid ""
 "You will no longer be able to send and receive messages from and to contacts "
@@ -1424,11 +1417,11 @@ msgstr ""
 "Het zal niet meer mogelijk zijn berichten te sturen en ontvangen van "
 "contacten via dit transport."
 
-#: gajim/roster_window.py:2768
+#: gajim/roster_window.py:2761
 msgid "Transports will be removed"
 msgstr "Transporten zullen worden verwijderd"
 
-#: gajim/roster_window.py:2773
+#: gajim/roster_window.py:2766
 #, fuzzy, python-format
 msgid ""
 "You will no longer be able to send and receive messages from and to contacts "
@@ -1438,22 +1431,22 @@ msgstr ""
 "Het zal niet meer mogelijk zijn berichten te sturen en ontvangen van "
 "contacten via dit transport."
 
-#: gajim/roster_window.py:2777
+#: gajim/roster_window.py:2770
 #, fuzzy
 msgid "Remove Transport"
 msgstr "Transporten weergeven"
 
-#: gajim/roster_window.py:2844
+#: gajim/roster_window.py:2837
 #, fuzzy
 msgid "Block Contact"
 msgstr "Geblokkeerde contacten"
 
-#: gajim/roster_window.py:2845
+#: gajim/roster_window.py:2838
 #, fuzzy
 msgid "Really block this contact?"
 msgstr "Is OpenPGP ingeschakeld voor dit contact?"
 
-#: gajim/roster_window.py:2846
+#: gajim/roster_window.py:2839
 #, fuzzy
 msgid ""
 "This contact will see you offline and you will not receive any messages sent "
@@ -1461,65 +1454,60 @@ msgid ""
 msgstr ""
 "Dit contact zal je offline zien en je zal er geen berichten van ontvangen."
 
-#: gajim/roster_window.py:2851
+#: gajim/roster_window.py:2844
 #, fuzzy
 msgid "_Block Contact"
 msgstr "Geblokkeerde contacten"
 
-#: gajim/roster_window.py:2896
+#: gajim/roster_window.py:2889
 msgid "Rename Contact"
 msgstr "Contact hernoemen"
 
-#: gajim/roster_window.py:2897
+#: gajim/roster_window.py:2890
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Voer een nieuwe bijnaam in voor contact %s"
 
-#: gajim/roster_window.py:2904
+#: gajim/roster_window.py:2897
 msgid "Rename Group"
 msgstr "Groep hernoemen"
 
-#: gajim/roster_window.py:2905
+#: gajim/roster_window.py:2898
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Voer een nieuwe naam in voor groep %s"
 
-#: gajim/roster_window.py:2953 gajim/roster_window.py:2954
+#: gajim/roster_window.py:2946 gajim/roster_window.py:2947
 msgid "Remove Group"
 msgstr "Groep verwijderen"
 
-#: gajim/roster_window.py:2955
+#: gajim/roster_window.py:2948
 #, fuzzy, python-format
 msgid "Do you want to remove %s from the contact list?"
 msgstr "Wil je groep %s zeker uit het rooster verwijderen?"
 
-#: gajim/roster_window.py:2956
+#: gajim/roster_window.py:2949
 #, fuzzy
 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:3044
-#, python-format
-msgid "%(jid)s has been invited in this room"
-msgstr "%(jid)s is in dit groepsgesprek uitgenodigd"
-
-#: gajim/roster_window.py:3353
+#: gajim/roster_window.py:3309
 #, fuzzy
 msgid "Remove Contact"
 msgstr "Contact hernoemen"
 
-#: gajim/roster_window.py:3354
+#: gajim/roster_window.py:3310
 #, fuzzy
 msgid "Remove contact from contact list"
 msgstr "Verwijdert contact van rooster"
 
-#: gajim/roster_window.py:3355
+#: gajim/roster_window.py:3311
 #, 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:3364 gajim/roster_window.py:3384
+#: gajim/roster_window.py:3320 gajim/roster_window.py:3340
 #, fuzzy
 msgid ""
 "By removing this contact you also remove authorization. This means the "
@@ -1528,20 +1516,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:3375
+#: gajim/roster_window.py:3331
 msgid "Do you want to continue?"
 msgstr "Wil je doorgaan?"
 
-#: gajim/roster_window.py:3386
+#: gajim/roster_window.py:3342
 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:3393
+#: gajim/roster_window.py:3349
 #, fuzzy
 msgid "Remove contacts from contact list"
 msgstr "Verwijdert contact van rooster"
 
-#: gajim/roster_window.py:3399
+#: gajim/roster_window.py:3355
 #, fuzzy, python-format
 msgid ""
 "By removing the following contacts, you will also remove authorization. This "
@@ -1552,26 +1540,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:3403
+#: gajim/roster_window.py:3359
 #, fuzzy
 msgid "Remove Contacts"
 msgstr "Contact hernoemen"
 
-#: gajim/roster_window.py:3423
+#: gajim/roster_window.py:3379
 msgid "No account available"
 msgstr "Geen account beschikbaar"
 
-#: gajim/roster_window.py:3424
+#: gajim/roster_window.py:3380
 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:4060
+#: gajim/roster_window.py:4011
 msgid "Metacontacts storage not supported by your server"
 msgstr "Metacontactenopslag wordt niet ondersteund door je server"
 
-#: gajim/roster_window.py:4062
+#: gajim/roster_window.py:4013
 msgid ""
 "Your server does not support storing metacontacts information. So this "
 "information will not be saved on next reconnection."
@@ -1580,12 +1568,12 @@ msgstr ""
 "metacontacteninformatie, deze informatie zal dus niet opgeslagen worden bij "
 "de volgende verbinding."
 
-#: gajim/roster_window.py:4159
+#: gajim/roster_window.py:4110
 #, 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:4160
+#: gajim/roster_window.py:4111
 #, fuzzy
 msgid ""
 "Metacontacts are a way to regroup several contacts in one single contact. "
@@ -1596,120 +1584,112 @@ msgstr ""
 "hergroeperen. Het wordt meestal gebruikt wanneer dezelfde persoon meerdere "
 "XMPP- of transportaccounts heeft."
 
-#: gajim/roster_window.py:4164
+#: gajim/roster_window.py:4115
 #, fuzzy
 msgid "Create Metacontact"
 msgstr "Contact hernoemen"
 
-#: gajim/roster_window.py:4170
+#: gajim/roster_window.py:4121 gajim/data/gui/groupchat_creation.ui:317
 #, fuzzy
 msgid "_Create"
 msgstr "Creatief"
 
-#: gajim/roster_window.py:4287
+#: gajim/roster_window.py:4238
 msgid "Invalid file URI:"
 msgstr "Ongeldige bestands-URI:"
 
-#: gajim/roster_window.py:4298
+#: gajim/roster_window.py:4249
 msgid "Send file?"
 msgstr "Bestand verzenden?"
 
-#: gajim/roster_window.py:4299
+#: gajim/roster_window.py:4250
 #, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
 msgstr[0] "Wil je dit bestand sturen naar %s:"
 msgstr[1] "Wil je deze bestanden sturen naar %s:"
 
-#: gajim/roster_window.py:4451
+#: gajim/roster_window.py:4401
 #, python-format
 msgid "Send %(from)s to %(to)s"
 msgstr "Stuur %(from)s naar %(to)s"
 
-#: gajim/roster_window.py:4464
+#: gajim/roster_window.py:4414
 #, python-format
 msgid "Make %s first contact"
 msgstr "%s instellen als hoofdcontact"
 
-#: gajim/roster_window.py:4469
+#: gajim/roster_window.py:4419
 #, python-format
 msgid "Make %(contact1)s and %(contact2)s metacontacts"
 msgstr "%(contact1)s en %(contact2)s instellen als metacontacten"
 
-#: gajim/roster_window.py:4825 gajim/roster_window.py:4923
+#: gajim/roster_window.py:4775 gajim/roster_window.py:4862
 msgid "_Change Status Message"
 msgstr "_Wijzig statusbericht"
 
-#: gajim/roster_window.py:4845
+#: gajim/roster_window.py:4795
 msgid "Publish Tune"
 msgstr "Deuntje publiceren"
 
-#: gajim/roster_window.py:4856
+#: gajim/roster_window.py:4806
 msgid "Publish Location"
 msgstr "Locatie publiceren"
 
-#: gajim/roster_window.py:4868
-msgid "Configure Services…"
-msgstr "Diensten configureren…"
-
-#: gajim/roster_window.py:4997
+#: gajim/roster_window.py:4936
 msgid "_Maximize All"
 msgstr "Alles _maximaliseren"
 
-#: gajim/roster_window.py:5004 gajim/roster_window.py:5146
+#: gajim/roster_window.py:4943 gajim/roster_window.py:5085
 msgid "Send Group M_essage"
 msgstr "Groepsb_ericht versturen"
 
-#: gajim/roster_window.py:5011
+#: gajim/roster_window.py:4950
 msgid "To all users"
 msgstr "Aan alle gebruikers"
 
-#: gajim/roster_window.py:5015
+#: gajim/roster_window.py:4954
 msgid "To all online users"
 msgstr "Aan alle beschikbare gebruikers"
 
-#: gajim/roster_window.py:5027 gajim/roster_window.py:5152
+#: gajim/roster_window.py:4966 gajim/roster_window.py:5091
 #: gajim/data/gui/gc_occupants_menu.ui:110
 #: gajim/data/gui/contact_context_menu.ui:36
 msgid "In_vite to"
 msgstr "_Uitnodigen voor"
 
-#: gajim/roster_window.py:5162
+#: gajim/roster_window.py:5101
 msgid "_Manage Contacts"
 msgstr "Contacten _beheren"
 
-#: gajim/roster_window.py:5168
+#: gajim/roster_window.py:5107
 msgid "Edit _Groups…"
 msgstr "_Groepen bewerken…"
 
-#: gajim/roster_window.py:5189 gajim/data/gui/filetransfers.ui:12
+#: gajim/roster_window.py:5128 gajim/data/gui/filetransfers.ui:12
 #: gajim/data/gui/remove_account_window.ui:134
 msgid "_Remove"
 msgstr "_Verwijderen"
 
-#: gajim/roster_window.py:5226
+#: gajim/roster_window.py:5165
 msgid "_Maximize"
 msgstr "_Maximaliseren"
 
-#: gajim/roster_window.py:5233
+#: gajim/roster_window.py:5172
 msgid "_Reconnect"
 msgstr "Opnieuw ve_rbinden"
 
-#: gajim/roster_window.py:5254 gajim/data/gui/gc_occupants_menu.ui:170
+#: gajim/roster_window.py:5193 gajim/data/gui/gc_occupants_menu.ui:170
 #: gajim/data/gui/gc_control_popup_menu.ui:113
 #: gajim/data/gui/contact_context_menu.ui:205
 msgid "_History"
 msgstr "_Geschiedenis"
 
-#: gajim/roster_window.py:5335 gajim/data/gui/application_menu.ui:86
+#: gajim/roster_window.py:5274 gajim/data/gui/application_menu.ui:83
 #: gajim/data/gui/history_window.ui:57
 msgid "History Manager"
 msgstr "Geschiedenisbeheer"
 
-#: gajim/roster_window.py:5343
-msgid "_Join New Group Chat"
-msgstr "Deelnemen aan n_ieuw groepsgesprek"
-
 #: gajim/dataforms_widget.py:585
 msgid "Unable to load image"
 msgstr "Kan afbeelding niet laden"
@@ -1828,254 +1808,271 @@ msgstr "Onderwerp: %s\n"
 msgid "Write a message…"
 msgstr "Schrijf een bericht…"
 
-#: gajim/message_window.py:250
+#: gajim/message_window.py:356
+#, fuzzy
+msgid "Close Tabs"
+msgstr "Gesprek sluiten"
+
+#: gajim/message_window.py:357
 msgid "You are going to close several tabs"
 msgstr "Je staat op het punt meerdere tabbladen te sluiten"
 
-#: gajim/message_window.py:251
+#: gajim/message_window.py:358
 msgid "Do you really want to close them all?"
 msgstr "Wil je ze echt allemaal sluiten?"
 
-#: gajim/message_window.py:539
+#: gajim/message_window.py:514
 msgid "?Noun:Chats"
 msgstr "?Znw:Gesprekken"
 
-#: gajim/message_window.py:543
+#: gajim/message_window.py:518
 #, fuzzy
 msgid "Group Chats"
 msgstr "_Groupsgesprek"
 
-#: gajim/message_window.py:547
+#: gajim/message_window.py:522
 msgid "Private Chats"
 msgstr "Privégesprekken"
 
-#: gajim/message_window.py:553
+#: gajim/message_window.py:528
 msgid "Messages"
 msgstr "Berichten"
 
-#: gajim/gui_interface.py:173
+#: gajim/gui_interface.py:170
+#, 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:175
 msgid "Do you accept this request?"
 msgstr "Accepteer je dit verzoek?"
 
-#: gajim/gui_interface.py:175
-#, python-format
-msgid "Do you accept this request on account %s?"
+#: gajim/gui_interface.py:177
+#, fuzzy, python-format
+msgid "Do you accept this request (account: %s)?"
 msgstr "Accepteer je dit verzoek op account %s?"
 
-#: gajim/gui_interface.py:178
-#, 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:182
+#, fuzzy
+msgid "Authorization"
+msgstr "Machtiging verzonden"
+
+#: gajim/gui_interface.py:186 gajim/gui_interface.py:420
+#: gajim/gtk/filetransfer.py:338
+#, fuzzy
+msgid "_No"
+msgstr "Nee"
 
-#: gajim/gui_interface.py:194 gajim/gtk/notification.py:175
+#: gajim/gui_interface.py:205 gajim/gtk/notification.py:175
 #: gajim/gtk/notification.py:197
 msgid "Connection Failed"
 msgstr "Verbinding mislukt"
 
-#: gajim/gui_interface.py:279 gajim/gui_interface.py:529
-msgid "Password Required"
-msgstr "Wachtwoord vereist"
-
-#: gajim/gui_interface.py:280
-#, python-format
-msgid "A Password is required to join the room %s. Please type it."
-msgstr ""
-"Een wachtwoord is vereist om groepsgesprek %s binnen te komen, voer het in."
-
-#: gajim/gui_interface.py:342 gajim/gui_interface.py:346
+#: gajim/gui_interface.py:325 gajim/gui_interface.py:329
 #, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr "Fout %(code)s: %(msg)s"
 
-#: gajim/gui_interface.py:357 gajim/gui_interface.py:376
+#: gajim/gui_interface.py:340 gajim/gui_interface.py:359
 #: gajim/common/modules/message.py:122
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "fout bij versturen van %(message)s ( %(error)s )"
 
-#: gajim/gui_interface.py:401 gajim/gtk/notification.py:175
+#: gajim/gui_interface.py:384 gajim/gtk/notification.py:175
 msgid "Subscription request"
 msgstr "Abonneringsverzoek"
 
-#: gajim/gui_interface.py:413 gajim/common/contacts.py:184
-#: gajim/common/helpers.py:83
+#: gajim/gui_interface.py:396 gajim/common/contacts.py:200
+#: gajim/common/helpers.py:86
 msgid "Observers"
 msgstr "Waarnemers"
 
-#: gajim/gui_interface.py:422
+#: gajim/gui_interface.py:405
 msgid "Authorization accepted"
 msgstr "Machtiging geaccepteerd"
 
-#: gajim/gui_interface.py:423
+#: gajim/gui_interface.py:406
 #, 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:431
-#, python-format
-msgid "Contact \"%s\" removed subscription from you"
+#: gajim/gui_interface.py:415
+#, fuzzy
+msgid "Subscription Removed"
+msgstr "Abonneringsverzoek"
+
+#: gajim/gui_interface.py:416
+#, fuzzy, python-format
+msgid "Contact '%s' removed subscription from you"
 msgstr "Contact ‘%s’ heeft het abonnement op jou opgezegd"
 
-#: gajim/gui_interface.py:432
+#: gajim/gui_interface.py:417
+#, fuzzy
 msgid ""
-"You will always see them as offline.\n"
+"You will always see this contact as offline.\n"
 "Do you want to remove them from your contact list?"
 msgstr ""
 "Je zal hem of haar altijd als offline zien.\n"
 "Wil je hem of haar uit je contacten verwijderen?"
 
-#: gajim/gui_interface.py:453 gajim/gtk/notification.py:176
+#: gajim/gui_interface.py:442 gajim/gtk/notification.py:176
 msgid "Unsubscribed"
 msgstr "Abonnement opgezegd"
 
-#: gajim/gui_interface.py:465
+#: gajim/gui_interface.py:454
 #, python-format
 msgid "%(jid)s declined the invitation: %(reason)s"
 msgstr "%(jid)s heeft de uitnodiging geweigerd: %(reason)s"
 
-#: gajim/gui_interface.py:469
+#: gajim/gui_interface.py:458
 #, python-format
 msgid "%(jid)s declined the invitation"
 msgstr "%(jid)s heeft de uitnodiging geweigerd"
 
-#: gajim/gui_interface.py:485
+#: gajim/gui_interface.py:474
 #, python-brace-format
 msgid "You are invited to {room} by {user}"
 msgstr "Je bent door {user} uitgenodigd in {room}"
 
-#: gajim/gui_interface.py:506
+#: gajim/gui_interface.py:495
 msgid "Certificate Passphrase Required"
 msgstr "Certificaatwachtwoord vereist"
 
-#: gajim/gui_interface.py:507
+#: gajim/gui_interface.py:496
 #, 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:516 gajim/gtk/accounts.py:963
+#: gajim/gui_interface.py:505 gajim/gtk/accounts.py:966
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Voer je wachtwoord voor account %s in"
 
-#: gajim/gui_interface.py:529 gajim/gtk/accounts.py:964
+#: gajim/gui_interface.py:518
+msgid "Password Required"
+msgstr "Wachtwoord vereist"
+
+#: gajim/gui_interface.py:518 gajim/gtk/accounts.py:967
 msgid "Save password"
 msgstr "Wachtwoord opslaan"
 
-#: gajim/gui_interface.py:601 gajim/gui_interface.py:632
+#: gajim/gui_interface.py:587 gajim/gui_interface.py:618
+#: gajim/gtk/filetransfer.py:332 gajim/gtk/filetransfer.py:333
 #: gajim/gtk/notification.py:173 gajim/gtk/notification.py:276
 msgid "File Transfer Error"
 msgstr "Fout bij bestandsoverdracht"
 
-#: gajim/gui_interface.py:666
+#: gajim/gui_interface.py:652
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s wil je een bestand sturen."
 
-#: gajim/gui_interface.py:668 gajim/gtk/filetransfer.py:479
+#: gajim/gui_interface.py:654 gajim/gtk/filetransfer.py:484
 #: gajim/gtk/notification.py:172 gajim/gtk/notification.py:274
 msgid "File Transfer Request"
 msgstr "Verzoek voor bestandsoverdracht"
 
-#: gajim/gui_interface.py:767
+#: gajim/gui_interface.py:753
 #, fuzzy
 msgid "Remote Contact Stopped Transfer"
 msgstr "Contact heeft de overdracht gestopt"
 
-#: gajim/gui_interface.py:772
+#: gajim/gui_interface.py:758
 #, fuzzy
 msgid "Error Opening File"
 msgstr "Fout bij openen van bestand"
 
-#: gajim/gui_interface.py:782
+#: gajim/gui_interface.py:768
 #, fuzzy
 msgid "SSL Certificate Error"
 msgstr "SSL-certificaatfout"
 
-#: gajim/gui_interface.py:795 gajim/gui_interface.py:826
-#: gajim/gui_interface.py:853 gajim/gtk/notification.py:174
+#: gajim/gui_interface.py:781 gajim/gui_interface.py:812
+#: gajim/gui_interface.py:839 gajim/gtk/notification.py:174
 #: gajim/gtk/notification.py:279
 msgid "File Transfer Stopped"
 msgstr "Bestandsoverdracht gestopt"
 
-#: gajim/gui_interface.py:799
+#: gajim/gui_interface.py:785
 msgid "File Transfer Failed"
 msgstr "Bestandsoverdracht mislukt"
 
-#: gajim/gui_interface.py:822
+#: gajim/gui_interface.py:808
 #, python-format
 msgid "%(filename)s received from %(name)s."
 msgstr "%(filename)s ontvangen van %(name)s."
 
-#: gajim/gui_interface.py:827
+#: gajim/gui_interface.py:813
 #, 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:833
+#: gajim/gui_interface.py:819
 #, 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:848
+#: gajim/gui_interface.py:834
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Je hebt %(filename)s naar %(name)s gestuurd."
 
-#: gajim/gui_interface.py:854
+#: gajim/gui_interface.py:840
 #, 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:860
+#: gajim/gui_interface.py:846
 #, 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:971
+#: gajim/gui_interface.py:957
 msgid "Username Conflict"
 msgstr "Gebruikersnaamconflict"
 
-#: gajim/gui_interface.py:972
+#: gajim/gui_interface.py:958
 msgid "Please type a new username for your local account"
 msgstr "Voer een nieuwe gebruikersnaam in voor je lokale account"
 
-#: gajim/gui_interface.py:995
+#: gajim/gui_interface.py:981
 msgid "Resource Conflict"
 msgstr "Bronconflict"
 
-#: gajim/gui_interface.py:996
+#: gajim/gui_interface.py:982
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
 msgstr ""
 "Je bent al verbonden met deze account van dezelfde bron. Voer een andere in"
 
-#: gajim/gui_interface.py:1053
+#: gajim/gui_interface.py:1039
 #, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s wil een audiogesprek starten."
 
-#: gajim/gui_interface.py:1055
+#: gajim/gui_interface.py:1041
 msgid "Voice Chat Request"
 msgstr "Audiogespreksverzoek"
 
-#: gajim/gui_interface.py:1123 gajim/gtk/account_wizard.py:312
+#: gajim/gui_interface.py:1109 gajim/gtk/account_wizard.py:312
 msgid "Certificate Already in File"
 msgstr "Certificaat al in bestand"
 
-#: gajim/gui_interface.py:1124 gajim/gtk/account_wizard.py:313
+#: gajim/gui_interface.py:1110 gajim/gtk/account_wizard.py:313
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr ""
 "Dit certificaat bevindt zich al in bestand %s en wordt niet opnieuw "
 "toegevoegd."
 
-#: gajim/gui_interface.py:1145
+#: gajim/gui_interface.py:1131
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid"
 msgstr "De authenticiteit van het %s certificaat zou ongeldig kunnen zijn"
 
-#: gajim/gui_interface.py:1148
+#: gajim/gui_interface.py:1134
 #, python-format
 msgid ""
 "\n"
@@ -2084,7 +2081,7 @@ msgstr ""
 "\n"
 "Onbekende SSL-fout: %d"
 
-#: gajim/gui_interface.py:1150
+#: gajim/gui_interface.py:1136
 #, python-format
 msgid ""
 "\n"
@@ -2093,11 +2090,11 @@ msgstr ""
 "\n"
 "SSL-fout: <b>%s</b>"
 
-#: gajim/gui_interface.py:1155
+#: gajim/gui_interface.py:1141
 msgid "Error verifying SSL certificate"
 msgstr "Fout bij verifiëren van SSL-certificaat"
 
-#: gajim/gui_interface.py:1156
+#: gajim/gui_interface.py:1142
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your XMPP server: "
@@ -2108,7 +2105,7 @@ msgstr ""
 "server: %(error)s\n"
 "Wil je nog steeds met deze server verbinden?"
 
-#: gajim/gui_interface.py:1160 gajim/gtk/account_wizard.py:412
+#: gajim/gui_interface.py:1146 gajim/gtk/account_wizard.py:413
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -2123,185 +2120,175 @@ msgstr ""
 "SHA-256-vingerafdruk van het certificaat:\n"
 "%(sha256)s"
 
-#: gajim/gui_interface.py:1166
+#: gajim/gui_interface.py:1152
 msgid "Ignore this error for this certificate."
 msgstr "Negeer deze fout voor dit certificaat."
 
-#: gajim/gui_interface.py:1174
+#: gajim/gui_interface.py:1160
 #, python-format
 msgid "SSL Certificate Verification for %s"
 msgstr "SSL-certificaatverificatie voor %s"
 
-#: gajim/gui_interface.py:1442 gajim/gtk/join_groupchat.py:235
-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/gui_interface.py:1448
-msgid "JID is not a Groupchat"
-msgstr "Deze JID is geen groepsgesprek"
-
-#: gajim/gui_interface.py:1579
-msgid "This is not a group chat"
-msgstr "Dit is geen groepsgesprek"
-
-#: gajim/gui_interface.py:1580
-#, python-format
-msgid ""
-"%(room_jid)s is already in your roster. Please check if %(room_jid)s is a "
-"correct group chat name. If it is, delete it from your roster and try "
-"joining the group chat again."
-msgstr ""
-"%(room_jid)s staat al in je rooster. Controleer of %(room_jid)s een correcte "
-"groepsgespreksnaam is. Zo ja, verwijder het van je rooster en probeer "
-"opnieuw deel te nemen aan het groepsgesprek."
-
-#: gajim/gui_interface.py:1604 gajim/dialog_messages.py:58
+#: gajim/gui_interface.py:1577
 msgid "You cannot join a group chat while you are invisible"
 msgstr ""
 "Je kan niet deelnemen aan een groepsgesprek terwijl je onzichtbaar bent"
 
-#: gajim/gui_interface.py:2037
+#: gajim/gui_interface.py:1976
 msgid "Could not save your settings and preferences"
 msgstr "Kan je instellingen en voorkeuren niet opslaan"
 
-#: gajim/gui_interface.py:2098
+#: gajim/gui_interface.py:2037
 msgid "Gajim: IPython Console"
 msgstr ""
 
-#: gajim/dialog_messages.py:32
-msgid "You can not start a new conversation unless you are connected."
-msgstr ""
-"Het is niet mogelijk een nieuw gesprek te starten zonder verbonden te zijn."
-
-#: gajim/dialog_messages.py:36 gajim/dialog_messages.py:41
-#: gajim/gtk/single_message.py:305 gajim/gtk/join_groupchat.py:211
-#: gajim/gtk/account_wizard.py:229
-msgid "Invalid JID"
-msgstr "Ongeldige JID"
+#: gajim/dialog_messages.py:31 gajim/dialog_messages.py:36
+#: gajim/gtk/single_message.py:305 gajim/gtk/account_wizard.py:229
+#, fuzzy
+msgid "Invalid XMPP Address"
+msgstr "Ongeldig knooppunt"
 
-#: gajim/dialog_messages.py:42 gajim/gtk/single_message.py:306
-#, python-format
-msgid "It is not possible to send a message to %s, this JID is not valid."
+#: gajim/dialog_messages.py:37
+#, 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/dialog_messages.py:47
-msgid "Unread events"
+#: gajim/dialog_messages.py:42
+#, fuzzy
+msgid "Unread Events"
 msgstr "Ongelezen gebeurtenissen"
 
-#: gajim/dialog_messages.py:48
-msgid "Read all pending events before removing this account."
+#: gajim/dialog_messages.py:43
+#, fuzzy
+msgid "Read or acknowledge all pending events before removing this account."
 msgstr "Lees alle lopende gebeurtenissen voor deze account te verwijderen."
 
-#: gajim/dialog_messages.py:52
+#: gajim/dialog_messages.py:48
 msgid "Invalid Form"
 msgstr "Ongeldige invoer"
 
-#: gajim/dialog_messages.py:53
+#: gajim/dialog_messages.py:49
 msgid "The form is not filled correctly."
 msgstr "Het formulier is niet correct ingevuld."
 
-#: gajim/dialog_messages.py:57 gajim/common/helpers.py:309
+#: gajim/dialog_messages.py:53 gajim/common/helpers.py:315
 msgid "Invisible"
 msgstr "Onzichtbaar"
 
-#: gajim/dialog_messages.py:62
-msgid "A connection is not available"
-msgstr "Er is geen verbinding beschikbaar"
+#: gajim/dialog_messages.py:54
+#, fuzzy
+msgid "You cannot join a group chat while being invisible."
+msgstr ""
+"Je kan niet deelnemen aan een groepsgesprek terwijl je onzichtbaar bent"
 
-#: gajim/dialog_messages.py:63
+#: gajim/dialog_messages.py:58
+#, fuzzy
+msgid "No Connection Available"
+msgstr "Verbinding niet beschikbaar"
+
+#: gajim/dialog_messages.py:59
 msgid "Your message can not be sent until you are connected."
 msgstr "Je bericht kan niet worden verzonden totdat je verbinding hebt."
 
-#: gajim/dialog_messages.py:67
-msgid "JID already in list"
-msgstr "JID al in lijst"
+#: gajim/dialog_messages.py:63
+msgid "XMPP Address Already in List"
+msgstr ""
 
-#: gajim/dialog_messages.py:68
-msgid "The JID you entered is already in the list. Choose another one."
+#: gajim/dialog_messages.py:64
+#, fuzzy
+msgid ""
+"The XMPP Address you entered is already in the list. Please choose another "
+"one."
 msgstr "De JID die je opgaf staat al in de lijst. Kies een andere."
 
-#: gajim/dialog_messages.py:72
-msgid "Invalid answer"
+#: gajim/dialog_messages.py:69
+#, fuzzy
+msgid "Invalid Answer"
 msgstr "Ongeldig antwoord"
 
-#: gajim/dialog_messages.py:73
+#: gajim/dialog_messages.py:70
 #, python-format
 msgid "Transport %(name)s answered wrongly to register request: %(error)s"
 msgstr ""
 "Transport %(name)s antwoordde verkeerd op registratieverzoek: %(error)s"
 
-#: gajim/dialog_messages.py:78
+#: gajim/dialog_messages.py:75
 msgid "Wrong Custom Hostname"
 msgstr "Verkeerde aangepaste hostnaam"
 
-#: gajim/dialog_messages.py:79
-#, python-format
-msgid "Wrong custom hostname \"%s\". Ignoring it."
+#: gajim/dialog_messages.py:76
+#, fuzzy, python-format
+msgid "Custom hostname \"%s\" is wrong. It will be ignored."
 msgstr "Verkeerde aangepaste hostnaam ‘%s’ wordt genegeerd."
 
-#: gajim/dialog_messages.py:83
-msgid "Error while removing privacy list"
+#: gajim/dialog_messages.py:80
+#, fuzzy
+msgid "Error While Removing Privacy List"
 msgstr "Fout bij verwijderen van privacylijst"
 
-#: gajim/dialog_messages.py:84
-#, python-format
+#: gajim/dialog_messages.py:81
+#, fuzzy, python-format
 msgid ""
-"Privacy list %s has not been removed. It is maybe active in one of your "
-"connected resources. Deactivate it and try again."
+"Privacy list %s has not been removed. It is probably active in one of your "
+"connected resources. Please deactivate it and try again."
 msgstr ""
 "Privacylijst %s is niet verwijderd. Deze is misschien actief in een van je "
 "verbonden bronnen. Schakel deze bron uit en probeer het opnieuw."
 
-#: gajim/dialog_messages.py:90
-msgid "Invisibility not supported"
+#: gajim/dialog_messages.py:87
+#, fuzzy
+msgid "Invisibility Not Supported"
 msgstr "Onzichtbaarheid niet ondersteund"
 
-#: gajim/dialog_messages.py:91
-#, python-format
-msgid "Account %s doesn't support invisibility."
+#: gajim/dialog_messages.py:88
+#, fuzzy, python-format
+msgid "This account %s doesn't support invisibility."
 msgstr "Account %s ondersteunt geen onzichtbaarheid."
 
-#: gajim/dialog_messages.py:95
-msgid "Unregister failed"
+#: gajim/dialog_messages.py:92
+#, fuzzy
+msgid "Unregister Failed"
 msgstr "Ontregistreren mislukt"
 
-#: gajim/dialog_messages.py:96
-#, python-format
-msgid "Unregistration with server %(server)s failed: %(error)s"
+#: gajim/dialog_messages.py:93
+#, fuzzy, python-format
+msgid "Unregistration on server %(server)s failed: %(error)s"
 msgstr "Ontregistratie bij server %(server)s mislukt: %(error)s"
 
-#: gajim/dialog_messages.py:100
-msgid "Registration succeeded"
+#: gajim/dialog_messages.py:97
+#, fuzzy
+msgid "Registration Succeeded"
 msgstr "Registratie geslaagd"
 
-#: gajim/dialog_messages.py:101
-#, python-format
-msgid "Registration with agent %s succeeded"
+#: gajim/dialog_messages.py:98
+#, fuzzy, python-format
+msgid "Registration with agent %s succeeded."
 msgstr "Registratie bij %s geslaagd"
 
-#: gajim/dialog_messages.py:105 gajim/gtk/service_registration.py:215
-msgid "Registration failed"
+#: gajim/dialog_messages.py:102
+#, fuzzy
+msgid "Registration Failed"
 msgstr "Registratie mislukt"
 
-#: gajim/dialog_messages.py:106
+#: gajim/dialog_messages.py:103
 #, python-format
 msgid ""
 "Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
 msgstr "Registratie bij %(agent)s mislukt met fout %(error)s: %(error_msg)s"
 
-#: gajim/dialog_messages.py:111
+#: gajim/dialog_messages.py:108
 #, fuzzy
 msgid "Unable to Join Group Chat"
 msgstr "Kan niet deelnemen aan het groepsgesprek"
 
-#: gajim/dialog_messages.py:116
-msgid "GStreamer error"
+#: gajim/dialog_messages.py:113
+#, fuzzy
+msgid "GStreamer Error"
 msgstr "GStreamer-fout"
 
-#: gajim/dialog_messages.py:117
+#: gajim/dialog_messages.py:114
 #, python-format
 msgid ""
 "Error: %(error)s\n"
@@ -2310,19 +2297,21 @@ msgstr ""
 "Fout: %(error)s\n"
 "Debug: %(debug)s"
 
-#: gajim/dialog_messages.py:121
-msgid "Wrong host"
+#: gajim/dialog_messages.py:118
+#, fuzzy
+msgid "Wrong Host"
 msgstr "Verkeerde host"
 
-#: gajim/dialog_messages.py:122
+#: gajim/dialog_messages.py:119
 msgid "Invalid local address? :-O"
 msgstr "Ongeldig lokaal adres? :-O"
 
-#: gajim/dialog_messages.py:126
-msgid "Avahi error"
+#: gajim/dialog_messages.py:123
+#, fuzzy
+msgid "Avahi Error"
 msgstr "Avahifout"
 
-#: gajim/dialog_messages.py:127
+#: gajim/dialog_messages.py:124
 #, python-format
 msgid ""
 "%s\n"
@@ -2331,61 +2320,68 @@ msgstr ""
 "%s\n"
 "Link-lokaal-berichten werken mogelijk niet goed."
 
-#: gajim/dialog_messages.py:131 gajim/dialog_messages.py:136
-msgid "Could not request upload slot"
+#: gajim/dialog_messages.py:128 gajim/dialog_messages.py:133
+#, fuzzy
+msgid "Could not request upload slot for HTTP File Upload"
 msgstr "Kon uploadslot niet opvragen"
 
-#: gajim/dialog_messages.py:137
-msgid "Got unexpected response from server (see log)"
+#: gajim/dialog_messages.py:134
+#, fuzzy
+msgid "Got unexpected response from server (see log)."
 msgstr "Onverwacht antwoord ontvangen van server (zie log)"
 
-#: gajim/dialog_messages.py:141 gajim/dialog_messages.py:146
-msgid "Could not open file"
+#: gajim/dialog_messages.py:138 gajim/dialog_messages.py:143
+#, fuzzy
+msgid "Could not Open File"
 msgstr "Kon bestand niet openen"
 
-#: gajim/dialog_messages.py:142
-msgid "Exception raised while opening file (see log)"
+#: gajim/dialog_messages.py:139
+#, fuzzy
+msgid "Exception raised while trying to open file (see log)."
 msgstr "Uitzondering bij openen van bestand (zie log)"
 
-#: gajim/dialog_messages.py:151
-msgid "Unsecure"
-msgstr "Onveilig"
+#: gajim/dialog_messages.py:148
+#, fuzzy
+msgid "Not Secure"
+msgstr "Niet versleuteld"
 
-#: gajim/dialog_messages.py:152
-msgid "Server returned unsecure transport (HTTP)"
+#: gajim/dialog_messages.py:149
+#, fuzzy
+msgid "The server returned an insecure transport (HTTP)."
 msgstr "Server gaf een onveilig transport weer (HTTP)"
 
-#: gajim/dialog_messages.py:156
-msgid "Could not upload file"
+#: gajim/dialog_messages.py:153
+#, fuzzy
+msgid "Could not Upload File"
 msgstr "Kon bestand niet uploaden"
 
-#: gajim/dialog_messages.py:157
+#: gajim/dialog_messages.py:154
 #, python-format
 msgid "HTTP response code from server: %s"
 msgstr "HTTP-antwoordcode van server: %s"
 
-#: gajim/dialog_messages.py:161
+#: gajim/dialog_messages.py:158
 msgid "Upload Error"
 msgstr "Uploadfout"
 
-#: gajim/dialog_messages.py:166
+#: gajim/dialog_messages.py:163
 msgid "Encryption Error"
 msgstr "Versleutelingsfout"
 
-#: gajim/dialog_messages.py:167
-msgid "For the chosen encryption there is no encryption method available"
+#: gajim/dialog_messages.py:164
+msgid "There is no encryption method available for the chosen encryption."
 msgstr ""
-"Er is geen versleutelingsmethode beschikbaar voor de gekozen versleuteling"
 
-#: gajim/dialog_messages.py:171
-msgid "Avatar upload failed"
+#: gajim/dialog_messages.py:169
+#, fuzzy
+msgid "Avatar Upload Failed"
 msgstr "Uploaden van avatar is mislukt"
 
-#: gajim/privatechat_control.py:204
+#: gajim/privatechat_control.py:207
 msgid "Sending private message failed"
 msgstr "Sturen van privébericht mislukt"
 
-#: gajim/privatechat_control.py:206
+#: gajim/privatechat_control.py:209
 #, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr ""
@@ -2409,7 +2405,8 @@ msgid "show help on command"
 msgstr "toont hulp bij opdracht"
 
 #: gajim/gajim_remote.py:85
-msgid "Lists all contacts in roster, one for each line"
+#, fuzzy
+msgid "Lists all contacts in the contact list, one for each line"
 msgstr ""
 "Lijst alle contacten in het rooster op, elk contact komt op een aparte regel"
 
@@ -2487,11 +2484,13 @@ msgstr ""
 
 #: gajim/gajim_remote.py:118
 #, fuzzy
-msgid "Sends new chat message to a contact in the roster. Account is optional."
+msgid ""
+"Sends new chat message to a contact in the contact list. Account is optional."
 msgstr "Stuur een bericht naar het contact dat zijn/haar aandacht zal trekken"
 
 #: gajim/gajim_remote.py:120 gajim/gajim_remote.py:130
-msgid "JID of the contact that will receive the message"
+#, fuzzy
+msgid "XMPP Address of the contact that will receive the message"
 msgstr "JID of contact die het bericht zal ontvangen"
 
 #: gajim/gajim_remote.py:121 gajim/gajim_remote.py:132
@@ -2505,8 +2504,10 @@ msgid "if specified, the message will be sent using this account"
 msgstr "indien opgegeven zal het bericht verzonden worden met deze account"
 
 #: gajim/gajim_remote.py:127
-msgid "Sends a chat message to someone on your roster. Account is optional."
-msgstr ""
+#, fuzzy
+msgid ""
+"Sends a chat message to someone on your contact list. Account is optional."
+msgstr "Stuur een bericht naar het contact dat zijn/haar aandacht zal trekken"
 
 #: gajim/gajim_remote.py:131
 msgid "subject"
@@ -2518,11 +2519,13 @@ msgstr "berichtonderwerp"
 
 # Kan beter vertaald worden
 #: gajim/gajim_remote.py:138
-msgid "Sends new message to a groupchat you've joined."
+#, fuzzy
+msgid "Sends new message to a group chat you've joined."
 msgstr "Stuurt een nieuw bericht in een groepsgesprek waaraan je deelneemt."
 
 #: gajim/gajim_remote.py:140
-msgid "JID of the room that will receive the message"
+#, fuzzy
+msgid "XMPP Address of the group chat that will receive the message"
 msgstr "JID van het groepsgesprek dat het bericht zal ontvangen"
 
 #: gajim/gajim_remote.py:147
@@ -2531,7 +2534,8 @@ msgstr "Haalt gedetailleerde informatie op over een contact"
 
 #: gajim/gajim_remote.py:149 gajim/gajim_remote.py:162
 #: gajim/gajim_remote.py:192
-msgid "JID of the contact"
+#, fuzzy
+msgid "XMPP Address of the contact"
 msgstr "JID van contact"
 
 #: gajim/gajim_remote.py:153
@@ -2595,7 +2599,8 @@ msgstr ""
 "bestand"
 
 #: gajim/gajim_remote.py:190
-msgid "Removes contact from roster"
+#, fuzzy
+msgid "Removes contact from contact list"
 msgstr "Verwijdert contact van rooster"
 
 #: gajim/gajim_remote.py:193
@@ -2646,9 +2651,9 @@ msgid "Missing argument \"contact_jid\""
 msgstr "Parameter ‘contact_jid’ ontbreekt"
 
 #: gajim/gajim_remote.py:275
-#, python-format
+#, fuzzy, python-format
 msgid ""
-"'%s' is not in your roster.\n"
+"'%s' is not in your contact list.\n"
 "Please specify account for sending the message."
 msgstr ""
 "‘%s’ staat niet in je rooster.\n"
@@ -2876,12 +2881,12 @@ msgstr "Eind van de week"
 msgid "Weekend!"
 msgstr "Weekend!"
 
-#: gajim/common/logger.py:192 gajim/common/logger.py:197
+#: gajim/common/logger.py:189 gajim/common/logger.py:194
 #, 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:217
+#: gajim/common/logger.py:214
 #, python-format
 msgid "Creating %s"
 msgstr "%s aanmaken"
@@ -2954,24 +2959,23 @@ msgstr "%(nickname)s is uitgelogd"
 msgid "Contact Signed Out"
 msgstr "Contact is uitgelogd"
 
-#: gajim/common/contacts.py:455
-msgid "Not in roster"
-msgstr "Niet in rooster"
-
 #: gajim/common/config.py:80
+#, fuzzy
 msgid ""
 "Show desktop notification even when a chat window is opened for this contact "
-"and does not have focus"
+"and does not have focus."
 msgstr ""
 "Toon bureaubladmelding zelfs wanneer gespreksvenster voor dit contact "
 "geopend en niet gefocust is"
 
 #: gajim/common/config.py:81
-msgid "Play sound when user is busy"
+#, fuzzy
+msgid "Play sound even when being busy."
 msgstr "Geluid afspelen wanneer gebruiker bezig is"
 
 #: gajim/common/config.py:83
-msgid "Show only online and free for chat contacts in roster."
+#, fuzzy
+msgid "Show only online and free for chat contacts in the contact list."
 msgstr "Enkel online en beschikbare contacten weergeven in rooster."
 
 #: gajim/common/config.py:86
@@ -2979,11 +2983,15 @@ msgid "Time in minutes, after which your status changes to away."
 msgstr "Tijd in minuten waarna je statusbericht op afwezig ingesteld wordt."
 
 #: gajim/common/config.py:87
-msgid "$S (Away as a result of being idle more than $T min)"
+#, fuzzy
+msgid "$S (Away: Idle more than $T min)"
 msgstr "$S (afwezig na gebrek aan activiteit voor meer dan $T min)"
 
 #: gajim/common/config.py:87
-msgid "$S will be replaced by current status message, $T by autoawaytime."
+#, fuzzy
+msgid ""
+"$S will be replaced by current status message, $T by the 'autoawaytime' "
+"value."
 msgstr ""
 "$S zal vervangen worden door het huidige statusbericht, $T door autoawaytime."
 
@@ -2993,66 +3001,81 @@ msgstr ""
 "Tijd in minuten waarna je statusbericht op niet beschikbaar ingesteld wordt."
 
 #: gajim/common/config.py:90
-msgid "$S (Not available as a result of being idle more than $T min)"
+#, fuzzy
+msgid "$S (Not available: Idle more than $T min)"
 msgstr "$S (niet beschikbaar na gebrek aan activiteit voor meer dan $T min)"
 
 #: gajim/common/config.py:90
-msgid "$S will be replaced by current status message, $T by autoxatime."
+#, fuzzy
+msgid ""
+"$S will be replaced by current status message, $T by the 'autoxatime' value."
 msgstr ""
 "$S zal vervangen worden door het huidige statusbericht, $T door autoxatime."
 
 #: gajim/common/config.py:93
+#, fuzzy
 msgid ""
-"When to show notification area icon. Can be 'never', 'on_event', 'always'."
+"When to show the notification area icon. Can be 'never', 'on_event', and "
+"'always'."
 msgstr ""
 "Wanneer systeemvakpictogram weer te geven. Kan ‘never’ (nooit), "
 "‘on_event’ (bij gebeurtenis) of ‘always’ (altijd) zijn."
 
 #: gajim/common/config.py:94
-msgid "Allow to hide the roster window even if the tray icon is not shown."
+#, fuzzy
+msgid ""
+"Allow to hide the contact list window even if the notification area icon is "
+"not shown."
 msgstr ""
 "Laat toe het roostervenster te verbergen zelfs als het systeemvakpictogram "
 "niet weergegeven wordt."
 
 #: gajim/common/config.py:97
-msgid "Contact signed in notification color."
-msgstr "Meldingskleur voor ingelogd contact."
+#, fuzzy
+msgid "Notification color for contacts signing in."
+msgstr "Geef mij bericht over contacten die _inloggen"
 
 #: gajim/common/config.py:98
-msgid "Contact signout notification color"
-msgstr "Meldingskleur voor uitgelogd contact"
+#, fuzzy
+msgid "Notification color for contacts signing out."
+msgstr "Geef mij bericht over contacten die uitl_oggen"
 
 #: gajim/common/config.py:99
-msgid "New message notification color."
+#, fuzzy
+msgid "Notification color for new message notification."
 msgstr "Meldingskleur voor nieuw bericht."
 
 #: gajim/common/config.py:100
-msgid "File transfer request notification color."
-msgstr "Meldingskleur voor bestandsoverdrachtsverzoek."
+#, fuzzy
+msgid "Notification color for file transfer request."
+msgstr "_Stel mij op de hoogte als een bestandsoverdracht voltooid is"
 
 #: gajim/common/config.py:101
-msgid "File transfer error notification color."
-msgstr "Meldingskleur voor bestandsoverdrachtsfout."
+#, fuzzy
+msgid "Notification color for file transfer errors."
+msgstr "_Stel mij op de hoogte als een bestandsoverdracht voltooid is"
 
 #: gajim/common/config.py:102
-msgid "File transfer complete or stopped notification color."
-msgstr "Meldingskleur voor voltooide of gestopte bestandsoverdracht."
+msgid "Notification color for stopped or completed file transfers."
+msgstr ""
 
 #: gajim/common/config.py:103
-msgid "Groupchat invitation notification color"
-msgstr "Meldingskleur voor uitnodiging voor groepsgesprek"
+msgid "Notification color for group chat invitations."
+msgstr ""
 
 #: gajim/common/config.py:104
-msgid "Background color of status changed notification"
+#, fuzzy
+msgid "Notification background color for changed status."
 msgstr "Achtergrondkleur statuswijzigingsmelding"
 
 #: gajim/common/config.py:105
-msgid "Other dialogs color."
-msgstr "Kleur van andere dialogen."
+msgid "Notification color for other dialogs."
+msgstr ""
 
 #: gajim/common/config.py:106
+#, fuzzy
 msgid ""
-"List (space separated) of rows (accounts and groups) that are collapsed."
+"List of rows (accounts and groups) that are collapsed (space separated)."
 msgstr ""
 "Lijst (door spaties gescheiden) van rijen (accounts en groepen) die "
 "ingevouwen zijn."
@@ -3061,8 +3084,10 @@ msgstr ""
 msgid "default"
 msgstr "standaard"
 
-#: gajim/common/config.py:113
-msgid "Language used by speller"
+#: gajim/common/config.py:113 gajim/common/config.py:424
+#: gajim/common/config.py:431
+#, fuzzy
+msgid "Language used for spell checking."
 msgstr "Taal gebruikt door spellingscontrole"
 
 #: gajim/common/config.py:114
@@ -3076,10 +3101,11 @@ msgstr ""
 "‘never’ - toon tijd nooit."
 
 #: gajim/common/config.py:115
+#, fuzzy
 msgid ""
 "Print time in chats using Fuzzy Clock. Value of fuzziness from 1 to 4, or 0 "
-"to disable fuzzyclock. 1 is the most precise clock, 4 the least precise one. "
-"This is used only if print_time is 'sometimes'."
+"to disable Fuzzy Clock. 1 is the most precise clock, 4 the least precise "
+"one. This is used only if 'print_time' is 'sometimes'."
 msgstr ""
 "Toon tijd in gesprekken met een vage klok. Waarde van vaagheid van 1 tot 4, "
 "of 0 om vage klok uit te schakelen. 1 is meest precies, 4 minst. Wordt enkel "
@@ -3095,17 +3121,20 @@ msgid "Treat * / _ pairs as possible formatting characters."
 msgstr "Behandel koppels * / _ als mogelijke formatteringstekens."
 
 #: gajim/common/config.py:120
+#, fuzzy
 msgid ""
-"If true, do not remove */_ . So *abc* will be bold but with * * not removed."
+"If enabled, do not remove */_ . So *abc* will be bold but with * * not "
+"removed."
 msgstr ""
 "Indien ingeschakeld worden */_ niet verwijderd, zodat *abc* vetgedrukt "
 "wordt, maar zonder dat * * verwijderd wordt."
 
 #: gajim/common/config.py:123
+#, fuzzy
 msgid ""
-"Uses ReStructured text markup to send HTML, plus ascii formatting if "
-"selected. For syntax, see http://docutils.sourceforge.net/docs/ref/rst/"
-"restructuredtext.html (If you want to use this, install docutils)"
+"Uses ReStructured text markup to send HTML, plus ASCII formatting if "
+"selected. Needs docutils installed (for syntax, see http://docutils."
+"sourceforge.net/docs/ref/rst/restructuredtext.html)."
 msgstr ""
 "Gebruikt ReStructured-tekstopmaak om HTML te verzenden, plus ASCII-"
 "formattering indien geselecteerd. Zie http://docutils.sourceforge.net/docs/"
@@ -3113,38 +3142,44 @@ msgstr ""
 "wil gebruiken)"
 
 #: gajim/common/config.py:132
+#, fuzzy
 msgid ""
-"Character to add after nickname when using nick completion (tab) in group "
-"chat."
+"Character to add after nickname when using nickname completion (tab) in "
+"group chat."
 msgstr ""
 "Teken om achter bijnaam in te voegen bij gebruik van bijnaamaanvulling (tab) "
 "in groepsgesprekken."
 
 #: gajim/common/config.py:133
+#, fuzzy
 msgid ""
-"Character to propose to add after desired nickname when desired nickname is "
-"used by someone else in group chat."
+"Character to propose to add after desired nickname when nickname is already "
+"used in group chat."
 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:155
+#, fuzzy
 msgid ""
-"If true, Gajim will save roster position when hiding roster, and restore it "
-"when showing roster."
+"If enabled, Gajim will save the contact list window position when hiding it, "
+"and restore it when showing the contact list window again."
 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:161
-msgid "Place the roster on the right in single window mode"
+#, 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:167
+#, fuzzy
 msgid ""
-"This option let you customize timestamp that is printed in conversation. For "
-"example \"[%H:%M] \" will show \"[hour:minute] \". See python doc on "
-"strftime for full documentation: http://docs.python.org/lib/module-time.html"
+"This option lets you customize the timestamp that is printed in "
+"conversation. For example '[%H:%M] ' will show '[hour:minute] '. See python "
+"doc on strftime for full documentation (https://docs.python.org/3/library/"
+"time.html)."
 msgstr ""
 "Deze optie laat je de tijdstempel die in een gesprek afgedrukt wordt "
 "aanpassen. Bijvoorbeeld ‘[%H:%M]’ zal ‘[uur:minuut]’ tonen. Bekijk de Python-"
@@ -3152,267 +3187,285 @@ msgstr ""
 "python.org/lib/module-time.html"
 
 #: gajim/common/config.py:168
-msgid "Characters that are printed before the nickname in conversations"
+#, 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:169
-msgid "Characters that are printed after the nickname in conversations"
+#, 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:170
-msgid "Add * and [n] in roster title?"
-msgstr "* en [n] toevoegen aan roster titel?"
+#, 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:171
+#, fuzzy
 msgid ""
-"How many history messages should be restored when a chat tab/window is "
-"reopened?"
+"Number of messages from chat history to be restored when a chat tab/window "
+"is reopened."
 msgstr ""
 "Hoeveel regels van het vorige gesprek moeten worden weergegeven in een nieuw "
 "gesprekstabblad of -venster?"
 
 #: gajim/common/config.py:172
-msgid "How far back in time (minutes) history is restored. -1 means no limit."
+#, fuzzy
+msgid ""
+"How far back in time (minutes) chat history is restored. -1 means no limit."
 msgstr ""
 "Hoe ver terug in te de tijd (in minuten) geschiedenis wordt hersteld. -1 "
 "betekent geen limiet."
 
 #: gajim/common/config.py:173
+#, fuzzy
 msgid ""
-"How many lines to request from server when entering a groupchat. -1 means no "
-"limit"
-msgstr ""
-"Hoeveel lijnen op te vragen van server bij deelnemen aan groepsgesprek. -1 "
-"betekent geen limiet"
-
-#: gajim/common/config.py:174
-msgid ""
-"Minutes of backlog to request when entering a groupchat. -1 means no limit"
-msgstr ""
-"Aantal voorafgaande minuten van groepsgesprekken die opgevraagd moeten "
-"worden bij inloggen/deelnemen. -1 betekent geen limiet"
-
-#: gajim/common/config.py:175
-msgid ""
-"How many seconds to wait before trying to autorejoin to a conference you are "
-"being disconnected from. Set to 0 to disable autorejoining."
+"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 ""
 "Aantal seconden vooraleer geprobeerd moet worden opnieuw deel te nemen aan "
 "een groepsgesprek waarmee je verbinding verbroken wordt. Stel dit in op 0 om "
 "automatisch opnieuw deelnemen uit te schakelen."
 
-#: gajim/common/config.py:176
-msgid "Should autorejoin be activated when kicked from a conference?"
+#: gajim/common/config.py:174
+#, fuzzy
+msgid ""
+"Should automatic rejoin be activated when you were kicked from a group chat?"
 msgstr ""
 "Moet automatisch opnieuw deelnemen worden ingeschakeld wanneer je uit een "
 "groepsgesprek geschopt wordt?"
 
-#: gajim/common/config.py:177
-msgid ""
-"Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
-"Client default behaviour)."
+#: gajim/common/config.py:175
+#, 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:179
-msgid "How many lines to store for Ctrl+KeyUP."
+#: gajim/common/config.py:177
+#, 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:182
-#, python-format
+#: gajim/common/config.py:180
+#, fuzzy, python-format
 msgid ""
-"Either custom URL with %%s in it where %%s is the word/phrase or "
-"'WIKTIONARY' which means use Wikitionary."
+"Either a custom URL with %%s in it (where %%s is the word/phrase) or "
+"'WIKTIONARY' (which means use Wikitionary)."
 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:185
+#: gajim/common/config.py:183
 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:187
+#: gajim/common/config.py:185
+#, fuzzy
 msgid ""
-"When not printing time for every message (print_time==sometimes), print it "
+"When not printing time for every message ('print_time'==sometimes), print it "
 "every x minutes."
 msgstr ""
 "Wanneer de tijdstempel niet voor elk bericht wordt weergegeven "
 "(print_time==sometimes), geef ze dan elke x minuten weer."
 
-#: gajim/common/config.py:188
+#: gajim/common/config.py:186
 msgid "Ask before pasting an image."
 msgstr ""
 
-#: gajim/common/config.py:189
+#: gajim/common/config.py:187
 msgid "Ask before closing a group chat tab/window."
 msgstr ""
 "Vraag bevestiging voor het sluiten van een groepsgespreksvenster of -tab."
 
-#: gajim/common/config.py:190
+#: gajim/common/config.py:188
+#, fuzzy
 msgid ""
-"Always ask for confirmation before closing groupchats with any of the JIDs "
-"on this space separated list."
+"Always ask for confirmation before closing group chats with any of the XMPP "
+"Addresses on this list (space separated)."
 msgstr ""
 "Vraag bevestiging voor het sluiten van een groepsgespreksvenster met een van "
 "de JID’s op deze door spaties gescheiden lijst."
 
-#: gajim/common/config.py:191
+#: gajim/common/config.py:189
+#, fuzzy
 msgid ""
-"Never ask for confirmation before closing groupchats with any of the JIDs on "
-"this space separated list."
+"Never ask for confirmation before closing group chats with any of the XMPP "
+"Addresses on this list (space separated)."
 msgstr ""
 "Vraag nooit om bevestiging voor het sluiten van een groepsgesprek met een "
 "van de JID’s op deze door spaties gescheiden lijst."
 
-#: gajim/common/config.py:192
+#: gajim/common/config.py:190
+#, fuzzy
 msgid ""
-"Ask before closing tabbed chat window if there are controls that can lose "
-"data (chat, private chat, groupchat that will not be minimized)"
+"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 ""
 "Vraag bevestiging voor sluiten van gespreksvenster met tabbladen als er "
 "mogelijk gegevens verloren zouden gaan (in gesprekken, privégesprekken en "
 "groepsgesprekken die niet geminimaliseerd worden)"
 
-#: gajim/common/config.py:195
+#: gajim/common/config.py:193
+#, fuzzy
 msgid ""
-"Comma separated list of sent hosts, in addition of local interfaces, for "
-"File Transfer in case of address translation/port forwarding."
+"List of send hosts (comma separated) in addition to local interfaces for "
+"file transfers (in case of address translation/port forwarding)."
 msgstr ""
 "Door komma’s gescheiden lijst van hosts die we verzenden, samen met lokale "
 "interfaces, voor bestandsoverdrachten in het geval van adresvertaling of "
 "port forwarding."
 
-#: gajim/common/config.py:196
+#: gajim/common/config.py:194
 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:198
+#: gajim/common/config.py:196
 msgid "Notify of events in the notification area."
 msgstr "Meldingen van gebeurtenissen weergeven in het systeemvak."
 
-#: gajim/common/config.py:199
+#: gajim/common/config.py:197
+#, fuzzy
 msgid ""
-"If False, Gajim will display a static event icon instead of the blinking "
-"status icon in the notification area when notifying on event."
+"If disabled, Gajim will display a static event icon instead of the blinking "
+"status icon in the notification area when notifying about an event."
 msgstr ""
 "Indien uitgeschakeld zal Gajim bij melding van een gebeurtenis een statisch "
 "gebeurtenispictogram weergeven in het systeemvak, in plaats van het "
 "blinkende statuspictogram."
 
-#: gajim/common/config.py:205
+#: gajim/common/config.py:203
 msgid "Show tab when only one conversation?"
 msgstr "Laat tabs zien bij slechts één gesprek?"
 
-#: gajim/common/config.py:206
+#: gajim/common/config.py:204
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "Notebookrand met tabbladen tonen in gespreksvensters?"
 
-#: gajim/common/config.py:207
+#: gajim/common/config.py:205
 msgid "Show close button in tab?"
 msgstr "Laat sluit knop zien in tabs?"
 
-#: gajim/common/config.py:220
+#: gajim/common/config.py:218
 msgid "Preview new messages in notification popup?"
 msgstr "Nieuwe berichten in meldingspop-up weergeven?"
 
-#: gajim/common/config.py:223
+#: gajim/common/config.py:221
+#, fuzzy
 msgid ""
-"A semicolon-separated list of words that will be highlighted in group chats."
+"A list of words (semicolon separated) that will be highlighted in group "
+"chats."
 msgstr ""
 "Een puntkomma-onderbroken lijst van woorden die gemarkeerd worden in een "
 "groepsgesprek."
 
-#: gajim/common/config.py:224
+#: gajim/common/config.py:222
+#, fuzzy
 msgid ""
-"If true, quits Gajim when X button of Window Manager is clicked. This "
-"setting is taken into account only if notification icon is used."
+"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 ""
 "Indien ingeschakeld stopt Gajim zodra het venster gesloten wordt. Deze "
 "instelling is alleen geldig als het systeemvakpictogram gebruikt wordt."
 
-#: gajim/common/config.py:225
+#: gajim/common/config.py:223
+#, fuzzy
 msgid ""
-"If true, Gajim hides the Roster window on pressing the X button instead of "
-"minimizing into the Dock."
+"If enabled, Gajim hides the contact list window when pressing the X button "
+"instead of minimizing into the notification area."
 msgstr ""
 "Indien ingeschakeld verbergt Gajim het roostervenster wanneer dit wordt "
 "gesloten, in plaats van te minimaliseren naar het Dock."
 
-#: gajim/common/config.py:226
+#: gajim/common/config.py:224
+#, fuzzy
 msgid ""
-"If true, Gajim will display an icon on each tab containing unread messages. "
-"Depending on the theme, this icon may be animated."
+"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:227
+#: gajim/common/config.py:225
+#, fuzzy
 msgid ""
-"If true, Gajim will display the status message, if not empty, for every "
-"contact under the contact name in roster window."
+"If enabled, Gajim will display the status message (if not empty) underneath "
+"the contact name in the contact list window."
 msgstr ""
 "Indien ingeschakeld zal Gajim het statusbericht van contacten weergeven "
 "onder hun naam in het roostervenster."
 
-#: gajim/common/config.py:233
-msgid "Define the position of the avatar in roster. Can be left or right"
+#: gajim/common/config.py:231
+#, 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:234
+#: gajim/common/config.py:232
+#, fuzzy
 msgid ""
-"If False, Gajim will no longer print status line in chats when a contact "
-"changes their status and/or their status message."
+"If disabled, Gajim will no longer print status messages in chats when a "
+"contact changes their status (and/or their status message)."
 msgstr ""
 "Indien uitgeschakeld zullen geen statusberichten worden weergegeven in "
 "gesprekken wanneer een contact zijn/haar status en/of statusbericht aanpast."
 
-#: gajim/common/config.py:235
+#: gajim/common/config.py:233
+#, fuzzy
 msgid ""
 "Default Setting: Show a status message for every join or leave in a group "
-"chat"
+"chat."
 msgstr ""
 "Standaardinstelling: toon een statusbericht voor alle deelnemen/verlaten in "
 "een groepsgesprek"
 
-#: gajim/common/config.py:236
+#: gajim/common/config.py:234
+#, fuzzy
 msgid ""
-"Default Setting: Show a status message for all status (away, dnd, etc.) "
-"changes of users in a group chat"
+"Default Setting: Show a status message for all status changes (away, dnd, "
+"etc.) of users in a group chat."
 msgstr ""
 "Standaardinstelling: toon een statusbericht voor alle statuswijzigingen "
 "(afwezig, dnd, enz.) van gebruikers in een groepsgesprek"
 
-#: gajim/common/config.py:238
-msgid "Log XHTML messages instead of plain text messages."
+#: gajim/common/config.py:236
+#, fuzzy
+msgid "Store XHTML messages in chat history instead of plain text messages."
 msgstr "Berichten opslaan als XHTML in plaats van platte tekst."
 
-#: gajim/common/config.py:239
+#: gajim/common/config.py:237
 msgid "Don't show avatar for the transport itself."
 msgstr "Avatar niet weergeven voor transport zelf."
 
-#: gajim/common/config.py:240
-msgid "Don't show roster in the system taskbar."
+#: gajim/common/config.py:238
+#, fuzzy
+msgid "Don't show contact list window in the system taskbar."
 msgstr "Rooster niet weergeven in systeemvak."
 
-#: gajim/common/config.py:241
+#: gajim/common/config.py:239
+#, fuzzy
 msgid ""
-"If true, make the window flash (the default behaviour in most Window "
-"Managers) when holding pending events."
+"If enabled, Gajim makes the window flash (the default behaviour in most "
+"Window Managers) when holding pending events."
 msgstr ""
 "Indien ingeschakeld flikkert het venster (standaardgedrag bij de meeste "
 "vensterbeheerders) wanneer er lopende gebeurtenissen zijn."
 
-#: gajim/common/config.py:245
+#: gajim/common/config.py:243
+#, fuzzy
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
 "'always_with_roster' - Like 'always' but the messages are in a single window "
-"along with the roster.\n"
+"along with the contact list.\n"
 "'never' - All messages get their own window.\n"
 "'peracct' - Messages for each account are sent to a specific window.\n"
-"'pertype' - Each message type (e.g. chats vs. groupchats) is sent to a "
+"'pertype' - Each message type (e.g. chats vs. group chats) is sent to a "
 "specific window."
 msgstr ""
 "Beheert het venster waar nieuwe berichten geplaatst worden.\n"
@@ -3424,125 +3477,141 @@ msgstr ""
 "‘pertype’ - elk berichttype (bv. gesprekken of groepsgesprekken) krijgt een "
 "eigen berichtvenster."
 
-#: gajim/common/config.py:246
+#: gajim/common/config.py:244
+#, fuzzy
 msgid ""
-"Show roster on startup.\n"
-"'always' - Always show roster.\n"
-"'never' - Never show roster.\n"
-"'last_state' - Restore the last state roster."
+"Show contact list window on startup.\n"
+"'always' - Always show contact list window.\n"
+"'never' - Never show contact list window.\n"
+"'last_state' - Restore last state of the contact list window."
 msgstr ""
 "Rooster weergeven bij opstarten.\n"
 "‘always’ - Rooster altijd weergeven.\n"
 "‘never’ - Rooster nooit weergeven.\n"
 "‘last_state’ - Laaste toestand van rooster herstellen."
 
-#: gajim/common/config.py:247
-msgid "If False, you will no longer see the avatar in the chat window."
+#: gajim/common/config.py:245
+#, 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:248
-msgid "If true, pressing the escape key closes a tab/window."
+#: gajim/common/config.py:246
+#, 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:249
-msgid "Hides the banner in a group chat window"
+#: gajim/common/config.py:247
+#, fuzzy
+msgid "Hides the banner in a group chat window."
 msgstr "Verbergt de banner in een groepsgespreksvenster"
 
-#: gajim/common/config.py:250
-msgid "Hides the banner in two persons chat window"
-msgstr "Verbergt de banner in een gespreksvenster met twee personen"
+#: gajim/common/config.py:248
+#, fuzzy
+msgid "Hides the banner in a 1:1 chat window."
+msgstr "Verbergt de banner in een groepsgespreksvenster"
 
-#: gajim/common/config.py:251
-msgid "Hides the group chat occupants list in group chat window."
+#: gajim/common/config.py:249
+#, 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:252
+#: gajim/common/config.py:250
+#, fuzzy
 msgid ""
 "In a chat, show the nickname at the beginning of a line only when it's not "
-"the same person talking than in previous message."
+"the same person talking as in the previous message."
 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:253
+#: gajim/common/config.py:251
 msgid "Indentation when using merge consecutive nickname."
 msgstr "Inspringwaarde bij samenvoegen van opeenvolgende bijnaam."
 
-#: gajim/common/config.py:254
-msgid "Ctrl-Tab go to next composing tab when none is unread."
+#: gajim/common/config.py:252
+#, fuzzy
+msgid ""
+"Ctrl+Tab switches to the next composing tab when there are no tabs with "
+"messages pending."
 msgstr ""
 "Ctrl-Tab gaat naar het volgende opsteltabblad wanneer er geen ongelezen "
 "berichten zijn."
 
-#: gajim/common/config.py:255
+#: gajim/common/config.py:253
+#, fuzzy
 msgid ""
-"Show the confirm metacontacts creation dialog or not? Empty string means "
-"never show the dialog."
+"Show a confirmation dialog to create metacontacts? Empty string means never "
+"show the dialog."
 msgstr ""
-"Moet de dialoog voor het bevestigen van het aanmaken van metacontacten "
-"worden getoond? Een lege tekenreeks betekent dat de dialoog nooit wordt "
-"getoond."
+"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:256
+#: gajim/common/config.py:254
+#, fuzzy
 msgid ""
-"Show the confirm block contact dialog or not? Empty string means never show "
+"Show a confirmation dialog to block a contact? Empty string means never show "
 "the dialog."
 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:257
+#: gajim/common/config.py:255
+#, fuzzy
 msgid ""
-"Show the confirm custom status dialog or not? Empty string means never show "
-"the dialog."
+"Show a confirmation dialog for a custom status? Empty string means never "
+"show the dialog."
 msgstr ""
 "Moet de dialoog voor het bevestigen van de aangepaste status worden getoond? "
 "Een lege tekenreeks betekent dat de dialoog nooit wordt getoond."
 
-#: gajim/common/config.py:258
+#: gajim/common/config.py:256
+#, fuzzy
 msgid ""
-"If true, you will be able to set a negative priority to your account in "
-"account modification window. BE CAREFUL, when you are logged in with a "
-"negative priority, you will NOT receive any message from your server."
+"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 ""
 "Indien ingeschakeld zal je een negatieve prioriteit kunnen instellen voor je "
 "account. LET OP, wanneer je ingelogd bent met een negatieve prioriteit zal "
 "je GEEN ENKEL bericht van je server ontvangen."
 
-#: gajim/common/config.py:259
+#: gajim/common/config.py:257
+#, fuzzy
 msgid ""
-"If true, Gajim will show number of online and total contacts in account and "
-"group rows."
+"If enabled, Gajim will show both the number of online and total contacts in "
+"account rows as well as in group rows."
 msgstr ""
 "Indien ingeschakeld zal Gajim het aantal online en het totale aantal "
 "contacten weergeven in account- en groeprijen."
 
-#: gajim/common/config.py:260
+#: gajim/common/config.py:258
+#, fuzzy
 msgid ""
-"Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
-"as if they were of this type"
+"Can be empty, 'chat' or 'normal'. If not empty, all incoming messages are "
+"treated as if they were of this type."
 msgstr ""
 "Kan leeg, ‘chat’ (gesprek) of ‘normal’ (normaal) zijn. Indien niet leeg "
 "worden alle inkomende berichten behandeld als waren ze van dit type"
 
-#: gajim/common/config.py:261
+#: gajim/common/config.py:259
+#, fuzzy
 msgid ""
-"If true, Gajim will scroll and select the contact who sent you the last "
-"message, if chat window is not already opened."
+"If enabled, Gajim will scroll and select the contact who sent you the last "
+"message, if the chat window is not already opened."
 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:262
+#: gajim/common/config.py:260
 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:263
+#: gajim/common/config.py:261
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
@@ -3550,81 +3619,91 @@ msgstr ""
 "Maximum aantal regels die weergegeven worden in gesprekken. Oudere regels "
 "worden gewist."
 
-#: gajim/common/config.py:264
+#: gajim/common/config.py:262
+#, fuzzy
 msgid ""
-"If true, notification windows from notification-daemon will be attached to "
-"notification icon."
+"If enabled, notification windows from notification-daemon will be attached "
+"to the notification area icon."
 msgstr ""
 "Indien ingeschakeld worden meldingsvensters van notification-daemon "
 "vastgemaakt aan het meldingspictogram."
 
-#: gajim/common/config.py:265
+#: gajim/common/config.py:263
 msgid "Choose interval between 2 checks of idleness."
 msgstr "Kies interval tussen 2 controles van inactiviteit."
 
-#: gajim/common/config.py:266
+#: gajim/common/config.py:264
+#, fuzzy
 msgid ""
-"Valid uri schemes. Only schemes in this list will be accepted as \"real\" "
-"uri. (mailto and xmpp are handled separately)"
+"Valid URI schemes. Only schemes in this list will be accepted as 'real' URI "
+"(mailto and xmpp are handled separately)."
 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:267
-msgid "If true, completion in groupchats will be like a shell auto-completion"
+#: gajim/common/config.py:265
+#, fuzzy
+msgid ""
+"If enabled, completion in group chats will be like a shell auto-completion."
 msgstr ""
 "Indien ingeschakeld werkt aanvulling in groepsgesprekken als shell-auto-"
 "aanvulling"
 
-#: gajim/common/config.py:272
-msgid "Optionally fix jingle output video framerate. Example: 10/1 or 25/2"
+#: gajim/common/config.py:270
+#, 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:273
-msgid "Optionally resize jingle output video. Example: 320x240"
+#: gajim/common/config.py:271
+#, fuzzy
+msgid "Optionally resize Jingle output video. Example: 320x240."
 msgstr "Jingle-video-uitvoer optioneel schalen. Bijvoorbeeld: 320x240"
 
-#: gajim/common/config.py:274
-msgid "If true, You will also see your webcam"
-msgstr "Indien ingeschakeld zal je ook je eigen webcam zien"
+#: gajim/common/config.py:272
+msgid "If enabled, you will see your webcam's video stream as well."
+msgstr ""
 
-#: gajim/common/config.py:277
+#: gajim/common/config.py:275
+#, fuzzy
 msgid ""
-"If true, Gajim will try to use a STUN server when using Jingle. The one in "
-"\"stun_server\" option, or the one given by the XMPP server."
+"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 ""
 "Indien ingeschakeld zal Gajim een STUN-server proberen gebruiken bij gebruik "
 "van Jingle, ofwel die in de optie ‘stun_server’, ofwel die gegeven door de "
 "XMPP-server."
 
-#: gajim/common/config.py:278
+#: gajim/common/config.py:276
 msgid "STUN server to use when using Jingle"
 msgstr "Te gebruiken STUN-server bij gebruik van Jingle"
 
-#: gajim/common/config.py:279
+#: gajim/common/config.py:277
+#, fuzzy
 msgid ""
-"If true, Gajim will show affiliation of groupchat occupants by adding a "
-"colored square to the status icon"
+"If enabled, Gajim will show affiliation of group chat participants by adding "
+"a colored square to the status icon."
 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:280
+#: gajim/common/config.py:278
+#, fuzzy
 msgid ""
 "Proxy used for all outgoing connections if the account does not have a "
-"specific proxy configured"
+"specific proxy configured."
 msgstr ""
 "Proxy gebruikt voor alle uitgaande verbindingen, als de account geen "
 "specifieke proxy heeft ingesteld"
 
-#: gajim/common/config.py:281
-msgid "If true, Gajim will ignore incoming attention requests (\"wizz\")."
+#: gajim/common/config.py:279
+#, fuzzy
+msgid "If enabled, Gajim will ignore incoming attention requests ('wizz')."
 msgstr ""
 "Indien ingeschakeld zal Gajim inkomende aandachtsverzoeken negeren (‘wizz’)."
 
-#: gajim/common/config.py:282
+#: gajim/common/config.py:280
 msgid ""
 "If enabled, Gajim will reopen chat windows that were opened last time Gajim "
 "was closed."
@@ -3632,83 +3711,95 @@ msgstr ""
 "Indien ingeschakeld zal Gajim de geopende gespreksvensters voor het laatste "
 "afsluiten van Gajim opnieuw openen."
 
-#: gajim/common/config.py:283
+#: gajim/common/config.py:281
+#, fuzzy
 msgid ""
-"If enabled, Gajim will show an icon to show that sent message has been "
-"received by your contact"
+"If enabled, Gajim will display an icon to show that sent messages have been "
+"received by your contact."
 msgstr ""
 "Indien ingeschakeld zal Gajim een pictogram weergeven om te tonen dat een "
 "verzonden bericht ontvangen is door je contact"
 
-#: gajim/common/config.py:284
-msgid "Show a mini avatar in chat window tabs and in window icon"
+#: gajim/common/config.py:282
+#, 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:285
-msgid "If true, Gajim will use the Systems Keyring to store account passwords."
+#: gajim/common/config.py:283
+#, fuzzy
+msgid ""
+"If enabled, Gajim will use the System's Keyring to store account passwords."
 msgstr ""
 "Indien ingeschakeld zal Gajim de sleutelbos van het systeem gebruiken om "
 "accountwachtwoorden op te slaan."
 
-#: gajim/common/config.py:286
-msgid "If true, Gajim will execute XEP-0146 Commands."
+#: gajim/common/config.py:284
+#, fuzzy
+msgid "If enabled, Gajim will execute XEP-0146 Commands."
 msgstr "Indien ingeschakeld zal Gajim XEP-0146-opdrachten uitvoeren."
 
-#: gajim/common/config.py:287
+#: gajim/common/config.py:285
 msgid "2: System, 1: Enabled, 0: Disabled"
 msgstr "2: Systeem, 1: ingeschakeld, 0: uitgeschakeld"
 
-#: gajim/common/config.py:288
+#: gajim/common/config.py:286
 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:289
+#: gajim/common/config.py:287
+#, fuzzy
 msgid ""
-"Maximum history in days we request from a public room archive. 0: As much as "
-"possible"
+"Maximum history in days we request from a public group chat archive. 0: As "
+"much as possible."
 msgstr ""
 "Maximale geschiedenis in dagen die we van een openbaar groepsgespreksarchief "
 "opvragen. 0: zo veel mogelijk"
 
-#: gajim/common/config.py:290
+#: gajim/common/config.py:288
+#, fuzzy
 msgid ""
-"Maximum history in days we request from a private room archive. 0: As much "
-"as possible"
+"Maximum history in days we request from a private group chat archive. 0: As "
+"much as possible."
 msgstr ""
 "Maximale geschiedenis in dagen die we van een privégroepsgespreksarchief "
 "opvragen. 0: zo veel mogelijk"
 
-#: gajim/common/config.py:291
-msgid "If the room subject is shown in chat on join"
+#: gajim/common/config.py:289
+msgid ""
+"If enabled, Gajim shows the group chat subject in the chat window when "
+"joining."
 msgstr ""
-"Of het onderwerp van het groepsgesprek in het gesprek wordt weergegeven bij "
-"deelname"
 
-#: gajim/common/config.py:292
+#: gajim/common/config.py:290
+#, fuzzy
 msgid ""
-"If the contact row is colored according to the current chatstate of the "
-"contact"
+"If enabled, the contact row is colored according to the current chat state "
+"of the contact."
 msgstr ""
 "Of de contactrij gekleurd moet worden naargelang de huidige chatstatus van "
 "het contact"
 
-#: gajim/common/config.py:293
-msgid "If the tab is colored according to the current chatstate of the contact"
+#: gajim/common/config.py:291
+#, fuzzy
+msgid ""
+"If enabled, the tab is colored according to the current chat state of the "
+"contact."
 msgstr ""
 "Of het tabblad gekleurd moet worden naargelang de huidige chatstatus van het "
 "contact"
 
-#: gajim/common/config.py:294
+#: gajim/common/config.py:292
+#, fuzzy
 msgid ""
-"Shows a text in the banner that describes the current chatstate of the "
-"contact"
+"Shows a text in the banner that describes the current chat state of the "
+"contact."
 msgstr ""
 "Toon tekst in de banier die de huidige chatstatus van het contact beschrijft"
 
-#: gajim/common/config.py:295 gajim/common/config.py:424
+#: gajim/common/config.py:293
 #, fuzzy
 msgid ""
 "Chat state notifications that are sent to contacts. Possible values: all, "
@@ -3718,355 +3809,401 @@ msgstr ""
 "Mogelijke waarden: all (alle), composing_only (alleen ‘aan het typen’), "
 "disabled (uitgeschakeld)"
 
-#: gajim/common/config.py:296 gajim/common/config.py:438
+#: gajim/common/config.py:294
+#, fuzzy
 msgid ""
 "Chat state notifications that are sent to the group chat. Possible values: "
-"all, composing_only, disabled"
+"'all', 'composing_only', 'disabled'"
 msgstr ""
 "Gesprekstoestandsmeldingen die verzonden worden naar het groepsgesprek. "
 "Mogelijke waarden: all (alle), composing_only (alleen ‘aan het typen’), "
 "disabled (uitgeschakeld)"
 
-#: gajim/common/config.py:312
+#: gajim/common/config.py:297
+msgid "API Preferences. Possible values: 'http', 'iq'"
+msgstr ""
+
+#: gajim/common/config.py:313
+#, fuzzy
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
-"defined in autopriority_* options."
+"defined in 'autopriority_*' options."
 msgstr ""
 "Prioriteit zal automatisch veranderen naargelang je status. Prioriteiten "
 "worden gedefinieerd in de autopriority_*-opties."
 
-#: gajim/common/config.py:320
+#: gajim/common/config.py:321
+#, fuzzy
 msgid ""
-"Status used to autoconnect as. Can be online, chat, away, xa, dnd, "
-"invisible. NOTE: this option is used only if restore_last_status is disabled"
+"Status to be used automatically when connecting. Can be 'online', 'chat', "
+"'away', 'xa', 'dnd' or 'invisible'. NOTE: This option is used only if "
+"'restore_last_status' is disabled."
 msgstr ""
 "Status om automatisch opnieuw mee te verbinden. Kan ‘online’, ‘chat’, "
 "‘away’, ‘xa’, ‘dnd’ of ‘invisible’ zijn. LET OP: deze optie wordt enkel "
 "gebruikt als restore_last_status is uitgeschakeld"
 
-#: gajim/common/config.py:321
-msgid "If enabled, restore the last status that was used."
+#: gajim/common/config.py:322
+#, fuzzy
+msgid "If enabled, the last status will be restored."
 msgstr "Indien ingeschakeld wordt de laatst gebruikte status hersteld."
 
-#: gajim/common/config.py:322
+#: gajim/common/config.py:323
+#, fuzzy
 msgid ""
-"If true, Contacts requesting authorization will be automatically accepted."
+"If enabled, Contacts requesting authorization will be accepted automatically."
 msgstr ""
 "Indien ingeschakeld worden contacten die machtiging aanvragen automatisch "
 "geaccepteerd."
 
-#: gajim/common/config.py:323
+#: gajim/common/config.py:324
+#, fuzzy
 msgid ""
-"If False, this account will be disabled and will not appear in roster window."
+"If disabled, this account will be disabled and will not appear in the "
+"contact list window."
 msgstr ""
 "Indien uitgeschakeld zal deze account uitgeschakeld worden en niet "
 "weergegeven worden in het roostervenster."
 
-#: gajim/common/config.py:327
-msgid "Allow plaintext connections"
+#: gajim/common/config.py:328
+#, fuzzy
+msgid "Allow plaintext connections."
 msgstr "Onversleutelde verbindingen toestaan"
 
-#: gajim/common/config.py:330
+#: gajim/common/config.py:331
+#, fuzzy
 msgid ""
-"List (space separated) of authentication mechanisms to try. Can contain "
-"ANONYMOUS, EXTERNAL, GSSAPI, SCRAM-SHA-1-PLUS, SCRAM-SHA-1, DIGEST-MD5, "
-"PLAIN, X-MESSENGER-OAUTH2 or XEP-0078"
+"List of authentication mechanisms to try (space separated). Can contain "
+"'ANONYMOUS', 'EXTERNAL', 'GSSAPI', 'SCRAM-SHA-1-PLUS', 'SCRAM-SHA-1', "
+"'DIGEST-MD5', 'PLAIN', 'X-MESSENGER-OAUTH2' or 'XEP-0078'."
 msgstr ""
 "Door spaties gescheiden lijst van te proberen authenticatiemechanismen. Kan "
 "bevatten: ANONYMOUS, EXTERNAL, GSSAPI, SCRAM-SHA-1-PLUS, SCRAM-SHA-1, DIGEST-"
 "MD5, PLAIN, X-MESSENGER-OAUTH2 of XEP-0078"
 
-#: gajim/common/config.py:331
+#: gajim/common/config.py:332
+#, fuzzy
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection. "
-"Can be 'warn', 'connect', 'disconnect'"
+"Can be 'warn', 'connect' or 'disconnect'."
 msgstr ""
 "Geeft een waarschuwingsdialoog weer voor het versturen van een wachtwoord "
 "over een niet-beveiligde verbinding. Kan ‘warn’ (waarschuwen), "
 "‘connect’ (verbinden) of ‘disconnect’ (verbinding verbreken) zijn"
 
-#: gajim/common/config.py:332
+#: gajim/common/config.py:333
 msgid "Show a warning dialog before using standard SSL library."
 msgstr ""
 "Geeft een waarschuwingsdialoog weer voor het gebruiken van een standaard SSL-"
 "bibliotheek."
 
-#: gajim/common/config.py:333
+#: gajim/common/config.py:334
 msgid ""
 "Show a warning dialog before sending PLAIN password over a plain connection."
 msgstr ""
 "Geeft een waarschuwingsdialoog weer voor het versturen van een PLAIN (platte "
 "tekst) wachtwoord over een plain (niet beveiligde) verbinding."
 
-#: gajim/common/config.py:334
-msgid "Space separated list of ssl errors to ignore."
-msgstr "Door spaties gescheiden lijst van te negeren SSL-fouten."
+#: gajim/common/config.py:335
+msgid "List of SSL errors to ignore (space separated)."
+msgstr ""
 
-#: gajim/common/config.py:340
+#: gajim/common/config.py:341
+#, fuzzy
 msgid ""
-"Space separated list of JIDs for which you do not want to store logs. You "
-"can also add account name to log nothing for this account."
+"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 ""
 "Door spaties gescheiden lijst van JID’s waarmee je je gesprekken niet wilt "
 "opslaan. Je kan ook je eigen accountnaam toevoegen om niets van die account "
 "op te slaan."
 
-#: gajim/common/config.py:341
+#: gajim/common/config.py:342
+#, fuzzy
 msgid ""
-"Space separated list of JIDs for which you accept to not log conversations "
-"if he does not want to."
+"List of XMPP Addresses (space separated) for which you accept to not store "
+"chat history if your contact does not want to."
 msgstr ""
 "Door spaties gescheiden lijst van JID’s waarvoor je accepteert je gesprekken "
 "niet op te slaan als zij dat niet willen."
 
-#: gajim/common/config.py:343
-msgid "Whitespace sent after inactivity"
+#: gajim/common/config.py:344
+#, fuzzy
+msgid "If enabled, a whitespace is sent after inactivity (keep alive)."
 msgstr "Witruimte verzonden na inactiviteit"
 
-#: gajim/common/config.py:344
-msgid "XMPP ping sent after inactivity"
+#: gajim/common/config.py:345
+#, fuzzy
+msgid "If enabled, an XMPP ping is sent after inactivity (ping alive)."
 msgstr "XMPP-ping verzonden na inactiviteit"
 
-#: gajim/common/config.py:348
+#: gajim/common/config.py:349
+#, fuzzy
 msgid ""
-"How many seconds to wait for the answer of ping alive packet before trying "
-"to reconnect?"
+"How many seconds to wait for the answer of a ping alive packet before trying "
+"to reconnect."
 msgstr ""
 "Aantal seconden te wachten op antwoord van ping-alive-pakket vooraleer "
 "poging tot opnieuw verbinden?"
 
-#: gajim/common/config.py:352
-msgid "Jabberd2 workaround"
+#: gajim/common/config.py:353
+#, fuzzy
+msgid "Jabberd2 workaround."
 msgstr "Tijdelijke oplossing voor jabberd2"
 
-#: gajim/common/config.py:355
+#: gajim/common/config.py:356
+#, fuzzy
 msgid ""
-"If checked, Gajim will use your IP and proxies defined in "
-"file_transfer_proxies option for file transfer."
+"If enabled, Gajim will use your IP and proxies defined in "
+"'file_transfer_proxies' option for file transfers."
 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:356
+#: gajim/common/config.py:357
+#, fuzzy
 msgid ""
-"If true, Gajim will test file transfer proxies on startup to be sure it "
-"works. Openfire's proxies are known to fail this test even if they work."
+"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 ""
 "Indien ingeschakeld zal Gajim bestandsoverdrachtproxy’s testen bij "
 "opstarten. De proxy’s van Openfire slagen vaak niet in deze test, zelfs als "
 "ze wel werken."
 
-#: gajim/common/config.py:369
-msgid "Answer to receipt requests"
-msgstr "Antwoorden op ontvangsbevestigingen"
-
 #: gajim/common/config.py:370
-msgid "Sent receipt requests"
-msgstr "Verzonden ontvangstbevestigingen"
+#, 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:371
+msgid "If enabled, Gajim will send message receipt requests."
+msgstr ""
 
-#: gajim/common/config.py:379
+#: gajim/common/config.py:380
 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:380
+#: gajim/common/config.py:381
 msgid "Allow Gajim to send your local time."
 msgstr "Gajim toelaten je lokale tijd te sturen."
 
-#: gajim/common/config.py:383
-msgid "Message that is sent to contacts you want to add"
+#: gajim/common/config.py:384
+#, 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:384
+#: gajim/common/config.py:385
+#, fuzzy
 msgid ""
-"If enabled, Gajim will send your local IPs so your contact can connect to "
-"your machine to transfer files."
+"If enabled, Gajim will send your local IP so your contact can connect to "
+"your machine for file transfers."
 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:385
+#: gajim/common/config.py:386
+#, fuzzy
 msgid ""
-"Space separated list of JIDs for which chat window will be re-opened on next "
-"startup."
+"List of XMPP Addresses (space separated) for which the chat window will be "
+"re-opened on next startup."
 msgstr ""
 "Door spaties gescheiden lijst van JID’s waarmee bij volgend opstarten "
 "automatisch een gespreksvenster geopend moet worden."
 
-#: gajim/common/config.py:387
-msgid "HTTP Upload: Enable HTTPS Verification"
+#: gajim/common/config.py:388
+#, fuzzy
+msgid "HTTP File Upload: Enable HTTPS Verification."
 msgstr "HTTP-upload: schakel HTTPS-verificatie in"
 
-#: gajim/common/config.py:388
+#: gajim/common/config.py:389
+#, fuzzy
 msgid ""
-"Preferred file transfer mechanism for file drag&drop on chat window. Can be "
-"'httpupload' (default) or 'jingle'"
+"Preferred file transfer mechanism for file drag&drop on a chat window. Can "
+"be 'httpupload' (default) or 'jingle'."
 msgstr ""
 "Voorkeursmechanisme voor bestandsoverdracht bij verslepen en neerzetten van "
 "bestand op gespreksvenster. Kan ‘httpupload’ (standaard) of ‘jingle’ zijn"
 
-#: gajim/common/config.py:389
-msgid "Allow cert verification with POSH"
+#: gajim/common/config.py:390
+#, fuzzy
+msgid "Allow certificate verification with POSH."
 msgstr "Certificaatverificatie met POSH toestaan"
 
-#: gajim/common/config.py:423 gajim/common/config.py:430
-msgid "Language for which misspelled words will be checked"
-msgstr "Taal waarvoor gecontroleerd moet worden op verkeerd gespelde woorden"
-
-#: gajim/common/config.py:427
-msgid "The currently active encryption for that contact"
-msgstr "De momenteel actieve versleuteling voor dat contact"
-
-#: gajim/common/config.py:431
+#: gajim/common/config.py:425
+#, fuzzy
 msgid ""
-"How many lines to request from server when entering a groupchat. -1 means no "
-"limit, -2 means global value"
+"Chat state notifications that are sent to contacts. Possible values: 'all', "
+"'composing_only', 'disabled'"
 msgstr ""
-"Aantal voorafgaande berichten van groepsgesprekken die opgevraagd moeten "
-"worden bij inloggen/deelnemen. -1 betekent geen limiet, -2 betekent globale "
-"instelling"
+"Gesprekstoestandsmeldingen die verzonden worden naar het groepsgesprek. "
+"Mogelijke waarden: all (alle), composing_only (alleen ‘aan het typen’), "
+"disabled (uitgeschakeld)"
+
+#: gajim/common/config.py:428
+#, fuzzy
+msgid "The currently active encryption for that contact."
+msgstr "De momenteel actieve versleuteling voor dat contact"
 
 #: gajim/common/config.py:432
+#, fuzzy
 msgid ""
-"Minutes of backlog to request when entering a groupchat. -1 means no limit, "
-"-2 means global value"
-msgstr ""
-"Aantal voorafgaande minuten van groepsgesprekken die opgevraagd moeten "
-"worden bij inloggen/deelnemen. -1 betekent geen limiet, -2 betekent globale "
-"instelling"
-
-#: gajim/common/config.py:433
-msgid "State whether a notification is created for every message in this room"
+"If enabled, a notification is created for every message in this group chat."
 msgstr ""
 "Stel in of er voor elk bericht in dit groepsgesprek een melding moet worden "
 "getoond"
 
-#: gajim/common/config.py:434
+#: gajim/common/config.py:433
+#, fuzzy
 msgid ""
-"Show a status message for all status (away, dnd, etc.) changes of users in a "
-"group chat"
+"Show a status message for all status changes (away, dnd, etc.) of users in a "
+"group chat."
 msgstr ""
 "Toon een statusbericht voor alle statuswijzigingen (afwezig, dnd, enz.) van "
 "gebruikers in een groepsgesprek"
 
-#: gajim/common/config.py:435
-msgid "Show a status message for every join or leave in a group chat"
+#: gajim/common/config.py:434
+#, 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:436
-msgid "If the group chat is minimized into the roster on autojoin"
+#: gajim/common/config.py:435
+#, fuzzy
+msgid ""
+"If enabled, the group chat is minimized into the contact list when joining "
+"automatically."
 msgstr ""
 "Of het groepsgesprek geminimaliseerd wordt naar het rooster bij automatische "
 "deelname"
 
-#: gajim/common/config.py:437
-msgid "If the group chat is minimized into the roster on close"
+#: gajim/common/config.py:436
+#, fuzzy
+msgid ""
+"If enabled, the group chat is minimized into the contact list when closing "
+"it."
 msgstr ""
 "Of het groepsgesprek geminimaliseerd wordt naar het rooster bij sluiten"
 
-#: gajim/common/config.py:441
+#: gajim/common/config.py:437
+#, fuzzy
+msgid ""
+"Chat state notifications that are sent to the group chat. Possible values: "
+"'all', 'composing_only' or 'disabled'."
+msgstr ""
+"Gesprekstoestandsmeldingen die verzonden worden naar het groepsgesprek. "
+"Mogelijke waarden: all (alle), composing_only (alleen ‘aan het typen’), "
+"disabled (uitgeschakeld)"
+
+#: gajim/common/config.py:440
+#, fuzzy
 msgid ""
-"State whether plugins should be activated on startup (this is saved on Gajim "
-"exit). This option SHOULD NOT be used to (de)activate plug-ins. Use GUI "
-"instead."
+"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 ""
 "Stel in of plug-ins bij opstarten ingeschakeld moeten worden (dit wordt "
 "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:446 gajim/common/const.py:281
+#: gajim/common/config.py:445 gajim/common/const.py:315
 msgid "Sleeping"
 msgstr "Slapen"
 
-#: gajim/common/config.py:447
+#: gajim/common/config.py:446
 msgid "Back soon"
 msgstr "Zo terug"
 
-#: gajim/common/config.py:447
+#: gajim/common/config.py:446
 msgid "Back in some minutes."
 msgstr "In een paar minuten terug."
 
-#: gajim/common/config.py:448 gajim/common/const.py:247
+#: gajim/common/config.py:447 gajim/common/const.py:281
 msgid "Eating"
 msgstr "Eten"
 
-#: gajim/common/config.py:448
-msgid "I'm eating, so leave me a message."
-msgstr "Ik ben aan het eten, laat een bericht achter."
+#: gajim/common/config.py:447
+#, fuzzy
+msgid "I'm eating."
+msgstr "Ik ben aan het werk."
 
-#: gajim/common/config.py:449
+#: gajim/common/config.py:448
 msgid "Movie"
 msgstr "Film"
 
-#: gajim/common/config.py:449
+#: gajim/common/config.py:448
 msgid "I'm watching a movie."
 msgstr "Ik been een film aan het kijken."
 
-#: gajim/common/config.py:450 gajim/common/const.py:314
+#: gajim/common/config.py:449 gajim/common/const.py:348
 msgid "Working"
 msgstr "Werken"
 
-#: gajim/common/config.py:450
+#: gajim/common/config.py:449
 msgid "I'm working."
 msgstr "Ik ben aan het werk."
 
-#: gajim/common/config.py:451
+#: gajim/common/config.py:450
 msgid "Phone"
 msgstr "Telefoon"
 
-#: gajim/common/config.py:451
+#: gajim/common/config.py:450
 msgid "I'm on the phone."
 msgstr "Ik ben aan het telefoneren."
 
-#: gajim/common/config.py:452
+#: gajim/common/config.py:451
 msgid "Out"
 msgstr "Uit"
 
-#: gajim/common/config.py:452
+#: gajim/common/config.py:451
 msgid "I'm out enjoying life."
 msgstr "Ik ben buiten van het leven aan het genieten."
 
-#: gajim/common/config.py:463
+#: gajim/common/config.py:462
 msgid "I'm available."
 msgstr "Ik ben aanwezig."
 
-#: gajim/common/config.py:464
+#: gajim/common/config.py:463
 msgid "I'm free for chat."
 msgstr "Ik sta open voor gesprekken."
 
-#: gajim/common/config.py:465 gajim/gtk/accounts.py:134
+#: gajim/common/config.py:464 gajim/gtk/accounts.py:133
 msgid "Be right back."
 msgstr "Zo terug."
 
-#: gajim/common/config.py:466
+#: gajim/common/config.py:465
 msgid "I'm not available."
 msgstr "Ik ben niet beschikbaar."
 
-#: gajim/common/config.py:467
+#: gajim/common/config.py:466
 msgid "Do not disturb."
 msgstr "Niet storen."
 
-#: gajim/common/config.py:468 gajim/common/config.py:469
+#: gajim/common/config.py:467 gajim/common/config.py:468
 msgid "Bye!"
 msgstr "Tot ziens!"
 
-#: gajim/common/config.py:480
+#: gajim/common/config.py:479
+#, fuzzy
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
-"muc_highlight_words, or when a group chat message contains your nickname."
+"'muc_highlight_words' your nickname is mentioned."
 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:481
-msgid "Sound to play when any MUC message arrives."
+#: gajim/common/config.py:480
+#, 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:485
+#: gajim/common/config.py:484
 msgid "Tor"
 msgstr "Tor"
 
@@ -4075,11 +4212,106 @@ msgstr "Tor"
 msgid "Error: cannot open %s for reading"
 msgstr "Fout: kan %s niet voor lezen openen"
 
-#: gajim/common/const.py:214
+#: gajim/common/const.py:216
+#, fuzzy
+msgid "?Group chat name:Team"
+msgstr "?Contactrol voor groepsgesprek:Geen"
+
+#: gajim/common/const.py:217
+msgid "?Group chat description:Project discussion"
+msgstr ""
+
+#: gajim/common/const.py:218
+#, fuzzy
+msgid "?Group chat address:team"
+msgstr "Ondersteuning voor groepsgesprekken"
+
+#: gajim/common/const.py:219
+#, fuzzy
+msgid "?Group chat name:Family"
+msgstr "Markering in groepsgesprek"
+
+#: gajim/common/const.py:220
+msgid "?Group chat description:Spring gathering"
+msgstr ""
+
+#: gajim/common/const.py:221
+msgid "?Group chat address:family"
+msgstr ""
+
+#: gajim/common/const.py:222
+#, fuzzy
+msgid "?Group chat name:Vacation"
+msgstr "Uitnodiging voor groepsgesprek"
+
+#: gajim/common/const.py:223
+msgid "?Group chat description:Trip planning"
+msgstr ""
+
+#: gajim/common/const.py:224
+#, fuzzy
+msgid "?Group chat address:vacation"
+msgstr "Uitnodiging voor groepsgesprek"
+
+#: gajim/common/const.py:225
+#, fuzzy
+msgid "?Group chat name:Repairs"
+msgstr "Groepsgesprekbladwijzers"
+
+#: gajim/common/const.py:226
+msgid "?Group chat description:Local help group"
+msgstr ""
+
+#: gajim/common/const.py:227
+#, fuzzy
+msgid "?Group chat address:repairs"
+msgstr "Ondersteuning voor groepsgesprekken"
+
+#: gajim/common/const.py:228
+#, fuzzy
+msgid "?Group chat name:News"
+msgstr "?Contactrol voor groepsgesprek:Geen"
+
+#: gajim/common/const.py:229
+#, fuzzy
+msgid "?Group chat description:Local news and reports"
+msgstr "Aanmaken van groepsgesprekken is niet toegestaan."
+
+#: gajim/common/const.py:230
+#, fuzzy
+msgid "?Group chat address:news"
+msgstr "Nieuw bericht in groepsgesprek"
+
+#: gajim/common/const.py:235
+#, fuzzy
+msgid "Remote server not found"
+msgstr "De dienst kon niet gevonden worden"
+
+#: gajim/common/const.py:236
+msgid "Remote server timeout"
+msgstr ""
+
+#: gajim/common/const.py:237 gajim/common/const.py:238
+#: gajim/common/const.py:239
+#, fuzzy
+msgid "Address does not belong to a group chat server"
+msgstr "%s is geen groepsgespreksserver"
+
+#: gajim/common/const.py:240
+#, fuzzy
+msgid "Group chat already exists"
+msgstr "Account ‘Lokaal’ bestaat al."
+
+#: gajim/common/const.py:241
+#, fuzzy
+msgid "Group chat does not exist"
+msgstr "Groepsgesprek <b>%s</b> bestaat niet."
+
+#: gajim/common/const.py:247
 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:217
+#: gajim/common/const.py:250
 msgid ""
 "This message was encrypted with Legacy OpenPGP and could not be decrypted. "
 "You can install the PGP plugin to handle those messages."
@@ -4087,863 +4319,865 @@ 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:221
+#: gajim/common/const.py:254
+#, fuzzy
 msgid ""
-"This message was encrypted with OpenPGP for XMPP and could not be decrypted."
+"This message was encrypted with OpenPGP for XMPP and could not be decrypted. "
+"You can install the OpenPGP plugin to handle those messages."
 msgstr ""
-"Dit bericht is versleuteld met OpenPGP voor XMPP en kon niet ontsleuteld "
-"worden."
+"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:224
+#: gajim/common/const.py:258
 #, 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:231
+#: gajim/common/const.py:265
 msgid "Doing Chores"
 msgstr "Klusjes doen"
 
-#: gajim/common/const.py:232
+#: gajim/common/const.py:266
 msgid "Buying Groceries"
 msgstr "Boodschappen doen"
 
-#: gajim/common/const.py:233
+#: gajim/common/const.py:267
 msgid "Cleaning"
 msgstr "Schoonmaken"
 
-#: gajim/common/const.py:234
+#: gajim/common/const.py:268
 msgid "Cooking"
 msgstr "Koken"
 
-#: gajim/common/const.py:235
+#: gajim/common/const.py:269
 msgid "Doing Maintenance"
 msgstr "Onderhoud"
 
-#: gajim/common/const.py:236
+#: gajim/common/const.py:270
 msgid "Doing the Dishes"
 msgstr "Afwas doen"
 
-#: gajim/common/const.py:237
+#: gajim/common/const.py:271
 msgid "Doing the Laundry"
 msgstr "Was doen"
 
-#: gajim/common/const.py:238
+#: gajim/common/const.py:272
 msgid "Gardening"
 msgstr "Tuinieren"
 
-#: gajim/common/const.py:239
+#: gajim/common/const.py:273
 msgid "Running an Errand"
 msgstr "Opdracht uitvoeren"
 
-#: gajim/common/const.py:240
+#: gajim/common/const.py:274
 msgid "Walking the Dog"
 msgstr "Wandelen met de hond"
 
-#: gajim/common/const.py:242
+#: gajim/common/const.py:276
 msgid "Drinking"
 msgstr "Drinken"
 
-#: gajim/common/const.py:243
+#: gajim/common/const.py:277
 msgid "Having a Beer"
 msgstr "Bier drinken"
 
-#: gajim/common/const.py:244
+#: gajim/common/const.py:278
 msgid "Having Coffee"
 msgstr "Koffie drinken"
 
-#: gajim/common/const.py:245
+#: gajim/common/const.py:279
 msgid "Having Tea"
 msgstr "Thee drinken"
 
-#: gajim/common/const.py:248
+#: gajim/common/const.py:282
 msgid "Having a Snack"
 msgstr "Een snack eten"
 
-#: gajim/common/const.py:249
+#: gajim/common/const.py:283
 msgid "Having Breakfast"
 msgstr "Ontbijten"
 
-#: gajim/common/const.py:250
+#: gajim/common/const.py:284
 msgid "Having Dinner"
 msgstr "Dineren"
 
-#: gajim/common/const.py:251
+#: gajim/common/const.py:285
 msgid "Having Lunch"
 msgstr "Lunchen"
 
-#: gajim/common/const.py:253
+#: gajim/common/const.py:287
 msgid "Exercising"
 msgstr "Sporten"
 
-#: gajim/common/const.py:254 gajim/common/const.py:305
+#: gajim/common/const.py:288 gajim/common/const.py:339
 msgid "Cycling"
 msgstr "Fietsen"
 
-#: gajim/common/const.py:255
+#: gajim/common/const.py:289
 msgid "Dancing"
 msgstr "Dansen"
 
-#: gajim/common/const.py:256
+#: gajim/common/const.py:290
 msgid "Hiking"
 msgstr "Wandelen"
 
-#: gajim/common/const.py:257
+#: gajim/common/const.py:291
 msgid "Jogging"
 msgstr "Joggen"
 
-#: gajim/common/const.py:258
+#: gajim/common/const.py:292
 msgid "Playing Sports"
 msgstr "Sporten"
 
-#: gajim/common/const.py:259
+#: gajim/common/const.py:293
 msgid "Running"
 msgstr "Lopen"
 
-#: gajim/common/const.py:260
+#: gajim/common/const.py:294
 msgid "Skiing"
 msgstr "Skiën"
 
-#: gajim/common/const.py:261
+#: gajim/common/const.py:295
 msgid "Swimming"
 msgstr "Zwemmen"
 
-#: gajim/common/const.py:262
+#: gajim/common/const.py:296
 msgid "Working out"
 msgstr "Trainen"
 
-#: gajim/common/const.py:264
+#: gajim/common/const.py:298
 msgid "Grooming"
 msgstr "Verzorgen"
 
-#: gajim/common/const.py:265
+#: gajim/common/const.py:299
 msgid "At the Spa"
 msgstr "In de spa"
 
-#: gajim/common/const.py:266
+#: gajim/common/const.py:300
 msgid "Brushing Teeth"
 msgstr "Tanden poetsen"
 
-#: gajim/common/const.py:267
+#: gajim/common/const.py:301
 msgid "Getting a Haircut"
 msgstr "Bij de kapper"
 
-#: gajim/common/const.py:268
+#: gajim/common/const.py:302
 msgid "Shaving"
 msgstr "Scheren"
 
-#: gajim/common/const.py:269
+#: gajim/common/const.py:303
 msgid "Taking a Bath"
 msgstr "Een bad nemen"
 
-#: gajim/common/const.py:270
+#: gajim/common/const.py:304
 msgid "Taking a Shower"
 msgstr "Een douche nemen"
 
-#: gajim/common/const.py:272
+#: gajim/common/const.py:306
 msgid "Having an Appointment"
 msgstr "Afspraak"
 
-#: gajim/common/const.py:274
+#: gajim/common/const.py:308
 msgid "Inactive"
 msgstr "Inactief"
 
-#: gajim/common/const.py:275
+#: gajim/common/const.py:309
 msgid "Day Off"
 msgstr "Dagje vrij"
 
-#: gajim/common/const.py:276
+#: gajim/common/const.py:310
 msgid "Hanging out"
 msgstr "Rondhangen"
 
-#: gajim/common/const.py:277
+#: gajim/common/const.py:311
 msgid "Hiding"
 msgstr "Verstopt"
 
-#: gajim/common/const.py:278
+#: gajim/common/const.py:312
 msgid "On Vacation"
 msgstr "Vakantie"
 
-#: gajim/common/const.py:279
+#: gajim/common/const.py:313
 msgid "Praying"
 msgstr "Bidden"
 
-#: gajim/common/const.py:280
+#: gajim/common/const.py:314
 msgid "Scheduled Holiday"
 msgstr "Geplande vakantie"
 
-#: gajim/common/const.py:282
+#: gajim/common/const.py:316
 msgid "Thinking"
 msgstr "Denken"
 
-#: gajim/common/const.py:284
+#: gajim/common/const.py:318
 msgid "Relaxing"
 msgstr "Ontspannen"
 
-#: gajim/common/const.py:285
+#: gajim/common/const.py:319
 msgid "Fishing"
 msgstr "Vissen"
 
-#: gajim/common/const.py:286
+#: gajim/common/const.py:320
 msgid "Gaming"
 msgstr "Gamen"
 
-#: gajim/common/const.py:287
+#: gajim/common/const.py:321
 msgid "Going out"
 msgstr "Uitgaan"
 
-#: gajim/common/const.py:288
+#: gajim/common/const.py:322
 msgid "Partying"
 msgstr "Feesten"
 
-#: gajim/common/const.py:289
+#: gajim/common/const.py:323
 msgid "Reading"
 msgstr "Lezen"
 
-#: gajim/common/const.py:290
+#: gajim/common/const.py:324
 msgid "Rehearsing"
 msgstr "Oefenen"
 
-#: gajim/common/const.py:291
+#: gajim/common/const.py:325
 msgid "Shopping"
 msgstr "Winkelen"
 
-#: gajim/common/const.py:292
+#: gajim/common/const.py:326
 msgid "Smoking"
 msgstr "Roken"
 
-#: gajim/common/const.py:293
+#: gajim/common/const.py:327
 msgid "Socializing"
 msgstr "Socialiseren"
 
-#: gajim/common/const.py:294
+#: gajim/common/const.py:328
 msgid "Sunbathing"
 msgstr "Zonnebaden"
 
-#: gajim/common/const.py:295
+#: gajim/common/const.py:329
 msgid "Watching TV"
 msgstr "TV kijken"
 
-#: gajim/common/const.py:296
+#: gajim/common/const.py:330
 msgid "Watching a Movie"
 msgstr "Film kijken"
 
-#: gajim/common/const.py:298
+#: gajim/common/const.py:332
 msgid "Talking"
 msgstr "Praten"
 
-#: gajim/common/const.py:299
+#: gajim/common/const.py:333
 msgid "In Real Life"
 msgstr "In het echte leven"
 
-#: gajim/common/const.py:300
+#: gajim/common/const.py:334
 msgid "On the Phone"
 msgstr "Bellen"
 
-#: gajim/common/const.py:301
+#: gajim/common/const.py:335
 msgid "On Video Phone"
 msgstr "Op een videofoon"
 
-#: gajim/common/const.py:303
+#: gajim/common/const.py:337
 msgid "Traveling"
 msgstr "Reizen"
 
-#: gajim/common/const.py:304
+#: gajim/common/const.py:338
 msgid "Commuting"
 msgstr "Pendelen"
 
-#: gajim/common/const.py:306
+#: gajim/common/const.py:340
 msgid "Driving"
 msgstr "Rijden"
 
-#: gajim/common/const.py:307
+#: gajim/common/const.py:341
 msgid "In a Car"
 msgstr "In een auto"
 
-#: gajim/common/const.py:308
+#: gajim/common/const.py:342
 msgid "On a Bus"
 msgstr "Op een bus"
 
-#: gajim/common/const.py:309
+#: gajim/common/const.py:343
 msgid "On a Plane"
 msgstr "Op een vliegtuig"
 
-#: gajim/common/const.py:310
+#: gajim/common/const.py:344
 msgid "On a Train"
 msgstr "Op een trein"
 
-#: gajim/common/const.py:311
+#: gajim/common/const.py:345
 msgid "On a Trip"
 msgstr "Op reis"
 
-#: gajim/common/const.py:312
+#: gajim/common/const.py:346
 msgid "Walking"
 msgstr "Wandelen"
 
-#: gajim/common/const.py:315
+#: gajim/common/const.py:349
 msgid "Coding"
 msgstr "Programmeren"
 
-#: gajim/common/const.py:316
+#: gajim/common/const.py:350
 msgid "In a Meeting"
 msgstr "In een vergadering"
 
-#: gajim/common/const.py:317
+#: gajim/common/const.py:351
 msgid "Studying"
 msgstr "Studeren"
 
-#: gajim/common/const.py:318
+#: gajim/common/const.py:352
 msgid "Writing"
 msgstr "Schrijven"
 
-#: gajim/common/const.py:321
+#: gajim/common/const.py:355
 msgid "Afraid"
 msgstr "Bang"
 
-#: gajim/common/const.py:322
+#: gajim/common/const.py:356
 msgid "Amazed"
 msgstr "Verwonderd"
 
-#: gajim/common/const.py:323
+#: gajim/common/const.py:357
 msgid "Amorous"
 msgstr "Amoureus"
 
-#: gajim/common/const.py:324
+#: gajim/common/const.py:358
 msgid "Angry"
 msgstr "Boos"
 
-#: gajim/common/const.py:325
+#: gajim/common/const.py:359
 msgid "Annoyed"
 msgstr "Geïrriteerd"
 
-#: gajim/common/const.py:326
+#: gajim/common/const.py:360
 msgid "Anxious"
 msgstr "Gespannen"
 
-#: gajim/common/const.py:327
+#: gajim/common/const.py:361
 msgid "Aroused"
 msgstr "Opgewonden"
 
-#: gajim/common/const.py:328
+#: gajim/common/const.py:362
 msgid "Ashamed"
 msgstr "Beschaamd"
 
-#: gajim/common/const.py:329
+#: gajim/common/const.py:363
 msgid "Bored"
 msgstr "Verveeld"
 
-#: gajim/common/const.py:330
+#: gajim/common/const.py:364
 msgid "Brave"
 msgstr "Moedig"
 
-#: gajim/common/const.py:331
+#: gajim/common/const.py:365
 msgid "Calm"
 msgstr "Kalm"
 
-#: gajim/common/const.py:332
+#: gajim/common/const.py:366
 msgid "Cautious"
 msgstr "Voorzichtig"
 
-#: gajim/common/const.py:333
+#: gajim/common/const.py:367
 msgid "Cold"
 msgstr "Koud"
 
-#: gajim/common/const.py:334
+#: gajim/common/const.py:368
 msgid "Confident"
 msgstr "Zelfverzekerd"
 
-#: gajim/common/const.py:335
+#: gajim/common/const.py:369
 msgid "Confused"
 msgstr "Verward"
 
-#: gajim/common/const.py:336
+#: gajim/common/const.py:370
 msgid "Contemplative"
 msgstr "Contemplatief"
 
-#: gajim/common/const.py:337
+#: gajim/common/const.py:371
 msgid "Contented"
 msgstr "Tevreden"
 
-#: gajim/common/const.py:338
+#: gajim/common/const.py:372
 msgid "Cranky"
 msgstr "Chagrijnig"
 
-#: gajim/common/const.py:339
+#: gajim/common/const.py:373
 msgid "Crazy"
 msgstr "Gek"
 
-#: gajim/common/const.py:340
+#: gajim/common/const.py:374
 msgid "Creative"
 msgstr "Creatief"
 
-#: gajim/common/const.py:341
+#: gajim/common/const.py:375
 msgid "Curious"
 msgstr "Nieuwsgierig"
 
-#: gajim/common/const.py:342
+#: gajim/common/const.py:376
 msgid "Dejected"
 msgstr "Neerslachtig"
 
-#: gajim/common/const.py:343
+#: gajim/common/const.py:377
 msgid "Depressed"
 msgstr "Depressief"
 
-#: gajim/common/const.py:344
+#: gajim/common/const.py:378
 msgid "Disappointed"
 msgstr "Teleurgesteld"
 
-#: gajim/common/const.py:345
+#: gajim/common/const.py:379
 msgid "Disgusted"
 msgstr "Walgend"
 
-#: gajim/common/const.py:346
+#: gajim/common/const.py:380
 msgid "Dismayed"
 msgstr "Ontzet"
 
-#: gajim/common/const.py:347
+#: gajim/common/const.py:381
 msgid "Distracted"
 msgstr "Afgeleid"
 
-#: gajim/common/const.py:348
+#: gajim/common/const.py:382
 msgid "Embarrassed"
 msgstr "Beschaamd"
 
-#: gajim/common/const.py:349
+#: gajim/common/const.py:383
 msgid "Envious"
 msgstr "Jaloers"
 
-#: gajim/common/const.py:350
+#: gajim/common/const.py:384
 msgid "Excited"
 msgstr "Enthousiast"
 
-#: gajim/common/const.py:351
+#: gajim/common/const.py:385
 msgid "Flirtatious"
 msgstr "Flirterig"
 
-#: gajim/common/const.py:352
+#: gajim/common/const.py:386
 msgid "Frustrated"
 msgstr "Gefrustreerd"
 
-#: gajim/common/const.py:353
+#: gajim/common/const.py:387
 msgid "Grateful"
 msgstr "Dankbaar"
 
-#: gajim/common/const.py:354
+#: gajim/common/const.py:388
 msgid "Grieving"
 msgstr "Rouwen"
 
-#: gajim/common/const.py:355
+#: gajim/common/const.py:389
 msgid "Grumpy"
 msgstr "Knorrig"
 
-#: gajim/common/const.py:356
+#: gajim/common/const.py:390
 msgid "Guilty"
 msgstr "Schuldig"
 
-#: gajim/common/const.py:357
+#: gajim/common/const.py:391
 msgid "Happy"
 msgstr "Blij"
 
-#: gajim/common/const.py:358
+#: gajim/common/const.py:392
 msgid "Hopeful"
 msgstr "Hoopvol"
 
-#: gajim/common/const.py:359
+#: gajim/common/const.py:393
 msgid "Hot"
 msgstr "Heet"
 
-#: gajim/common/const.py:360
+#: gajim/common/const.py:394
 msgid "Humbled"
 msgstr "Vernederd"
 
-#: gajim/common/const.py:361
+#: gajim/common/const.py:395
 msgid "Humiliated"
 msgstr "Vernederd"
 
-#: gajim/common/const.py:362
+#: gajim/common/const.py:396
 msgid "Hungry"
 msgstr "Hongerig"
 
-#: gajim/common/const.py:363
+#: gajim/common/const.py:397
 msgid "Hurt"
 msgstr "Gekwetst"
 
-#: gajim/common/const.py:364
+#: gajim/common/const.py:398
 msgid "Impressed"
 msgstr "Onder de indruk"
 
-#: gajim/common/const.py:365
+#: gajim/common/const.py:399
 msgid "In Awe"
 msgstr "In ontzag"
 
-#: gajim/common/const.py:366
+#: gajim/common/const.py:400
 msgid "In Love"
 msgstr "Verliefd"
 
-#: gajim/common/const.py:367
+#: gajim/common/const.py:401
 msgid "Indignant"
 msgstr "Verontwaardigd"
 
-#: gajim/common/const.py:368
+#: gajim/common/const.py:402
 msgid "Interested"
 msgstr "Geïnteresseerd"
 
-#: gajim/common/const.py:369
+#: gajim/common/const.py:403
 msgid "Intoxicated"
 msgstr "Bedwelmd"
 
-#: gajim/common/const.py:370
+#: gajim/common/const.py:404
 msgid "Invincible"
 msgstr "Onoverwinnelijk"
 
-#: gajim/common/const.py:371
+#: gajim/common/const.py:405
 msgid "Jealous"
 msgstr "Jaloers"
 
-#: gajim/common/const.py:372
+#: gajim/common/const.py:406
 msgid "Lonely"
 msgstr "Eenzaam"
 
-#: gajim/common/const.py:373
+#: gajim/common/const.py:407
 msgid "Lost"
 msgstr "Verloren"
 
-#: gajim/common/const.py:374
+#: gajim/common/const.py:408
 msgid "Lucky"
 msgstr "Gelukkig"
 
-#: gajim/common/const.py:375
+#: gajim/common/const.py:409
 msgid "Mean"
 msgstr "Gemeen"
 
-#: gajim/common/const.py:376
+#: gajim/common/const.py:410
 msgid "Moody"
 msgstr "Humeurig"
 
-#: gajim/common/const.py:377
+#: gajim/common/const.py:411
 msgid "Nervous"
 msgstr "Nerveus"
 
-#: gajim/common/const.py:378
+#: gajim/common/const.py:412
 msgid "Neutral"
 msgstr "Neutraal"
 
-#: gajim/common/const.py:379
+#: gajim/common/const.py:413
 msgid "Offended"
 msgstr "Beledigd"
 
-#: gajim/common/const.py:380
+#: gajim/common/const.py:414
 msgid "Outraged"
 msgstr "Woedend"
 
-#: gajim/common/const.py:381
+#: gajim/common/const.py:415
 msgid "Playful"
 msgstr "Speels"
 
-#: gajim/common/const.py:382
+#: gajim/common/const.py:416
 msgid "Proud"
 msgstr "Trots"
 
-#: gajim/common/const.py:383
+#: gajim/common/const.py:417
 msgid "Relaxed"
 msgstr "Ontspannen"
 
-#: gajim/common/const.py:384
+#: gajim/common/const.py:418
 msgid "Relieved"
 msgstr "Opgelucht"
 
-#: gajim/common/const.py:385
+#: gajim/common/const.py:419
 msgid "Remorseful"
 msgstr "Spijt"
 
-#: gajim/common/const.py:386
+#: gajim/common/const.py:420
 msgid "Restless"
 msgstr "Rusteloos"
 
-#: gajim/common/const.py:387
+#: gajim/common/const.py:421
 msgid "Sad"
 msgstr "Triest"
 
-#: gajim/common/const.py:388
+#: gajim/common/const.py:422
 msgid "Sarcastic"
 msgstr "Sarcastisch"
 
-#: gajim/common/const.py:389
+#: gajim/common/const.py:423
 msgid "Satisfied"
 msgstr "Tevreden"
 
-#: gajim/common/const.py:390
+#: gajim/common/const.py:424
 msgid "Serious"
 msgstr "Serieus"
 
-#: gajim/common/const.py:391
+#: gajim/common/const.py:425
 msgid "Shocked"
 msgstr "Geschokt"
 
-#: gajim/common/const.py:392
+#: gajim/common/const.py:426
 msgid "Shy"
 msgstr "Verlegen"
 
-#: gajim/common/const.py:393
+#: gajim/common/const.py:427
 msgid "Sick"
 msgstr "Ziek"
 
-#: gajim/common/const.py:394
+#: gajim/common/const.py:428
 msgid "Sleepy"
 msgstr "Slaperig"
 
-#: gajim/common/const.py:395
+#: gajim/common/const.py:429
 msgid "Spontaneous"
 msgstr "Spontaan"
 
-#: gajim/common/const.py:396
+#: gajim/common/const.py:430
 msgid "Stressed"
 msgstr "Gestresseerd"
 
-#: gajim/common/const.py:397
+#: gajim/common/const.py:431
 msgid "Strong"
 msgstr "Sterk"
 
-#: gajim/common/const.py:398
+#: gajim/common/const.py:432
 msgid "Surprised"
 msgstr "Verrast"
 
-#: gajim/common/const.py:399
+#: gajim/common/const.py:433
 msgid "Thankful"
 msgstr "Dankbaar"
 
-#: gajim/common/const.py:400
+#: gajim/common/const.py:434
 msgid "Thirsty"
 msgstr "Dorstig"
 
-#: gajim/common/const.py:401
+#: gajim/common/const.py:435
 msgid "Tired"
 msgstr "Moe"
 
-#: gajim/common/const.py:402
+#: gajim/common/const.py:436
 msgid "Undefined"
 msgstr "Niet gedefinieerd"
 
-#: gajim/common/const.py:403
+#: gajim/common/const.py:437
 msgid "Weak"
 msgstr "Zwak"
 
-#: gajim/common/const.py:404
+#: gajim/common/const.py:438
 msgid "Worried"
 msgstr "Bezorgd"
 
-#: gajim/common/const.py:408
+#: gajim/common/const.py:442
 msgid "accuracy"
 msgstr "precisie"
 
-#: gajim/common/const.py:409
+#: gajim/common/const.py:443
 msgid "alt"
 msgstr "alt"
 
-#: gajim/common/const.py:410
+#: gajim/common/const.py:444
 msgid "area"
 msgstr "gebied"
 
-#: gajim/common/const.py:411
+#: gajim/common/const.py:445
 msgid "bearing"
 msgstr "lager"
 
-#: gajim/common/const.py:412
+#: gajim/common/const.py:446
 msgid "building"
 msgstr "bouwen"
 
-#: gajim/common/const.py:413
+#: gajim/common/const.py:447
 msgid "country"
 msgstr "land"
 
-#: gajim/common/const.py:414
+#: gajim/common/const.py:448
 msgid "countrycode"
 msgstr "landcode"
 
-#: gajim/common/const.py:415
+#: gajim/common/const.py:449
 msgid "datum"
 msgstr "datum"
 
-#: gajim/common/const.py:416
+#: gajim/common/const.py:450
 msgid "description"
 msgstr "beschrijving"
 
-#: gajim/common/const.py:417
+#: gajim/common/const.py:451
 msgid "error"
 msgstr "fout"
 
-#: gajim/common/const.py:418
+#: gajim/common/const.py:452
 msgid "floor"
 msgstr "verdiep"
 
-#: gajim/common/const.py:419
+#: gajim/common/const.py:453
 msgid "lat"
 msgstr "breedte"
 
-#: gajim/common/const.py:420
+#: gajim/common/const.py:454
 msgid "locality"
 msgstr "plaats"
 
-#: gajim/common/const.py:421
+#: gajim/common/const.py:455
 msgid "lon"
 msgstr "lengte"
 
-#: gajim/common/const.py:422
+#: gajim/common/const.py:456
 msgid "postalcode"
 msgstr "postcode"
 
-#: gajim/common/const.py:423
+#: gajim/common/const.py:457
 msgid "region"
 msgstr "regio"
 
-#: gajim/common/const.py:424
+#: gajim/common/const.py:458
 msgid "room"
 msgstr "groepsgesprek"
 
-#: gajim/common/const.py:425
+#: gajim/common/const.py:459
 msgid "speed"
 msgstr "snelheid"
 
-#: gajim/common/const.py:426
+#: gajim/common/const.py:460
 msgid "street"
 msgstr "straat"
 
-#: gajim/common/const.py:427
+#: gajim/common/const.py:461
 msgid "text"
 msgstr "tekst"
 
-#: gajim/common/const.py:428
+#: gajim/common/const.py:462
 msgid "timestamp"
 msgstr "tijdsaanduiding"
 
-#: gajim/common/const.py:429
+#: gajim/common/const.py:463
 msgid "URI"
 msgstr "URI"
 
-#: gajim/common/const.py:434
+#: gajim/common/const.py:468
 msgid "Unable to get issuer certificate"
 msgstr "Kan uitgever van certificaat niet ophalen"
 
-#: gajim/common/const.py:435
+#: gajim/common/const.py:469
 msgid "Unable to get certificate CRL"
 msgstr "Kan CRL van certificaat niet ophalen"
 
-#: gajim/common/const.py:436
+#: gajim/common/const.py:470
 msgid "Unable to decrypt certificate's signature"
 msgstr "Kan certificaatsondertekening niet ontsleutelen"
 
-#: gajim/common/const.py:437
+#: gajim/common/const.py:471
 msgid "Unable to decrypt CRL's signature"
 msgstr "Kan CRL-ondertekening niet ontsleutelen"
 
-#: gajim/common/const.py:438
+#: gajim/common/const.py:472
 msgid "Unable to decode issuer public key"
 msgstr "Kan publieke sleutel van uitgever niet ontcijferen"
 
-#: gajim/common/const.py:439
+#: gajim/common/const.py:473
 msgid "Certificate signature failure"
 msgstr "Certificaatsondertekeningsfout"
 
-#: gajim/common/const.py:440
+#: gajim/common/const.py:474
 msgid "CRL signature failure"
 msgstr "CRL-handtekeningsfout"
 
-#: gajim/common/const.py:441
+#: gajim/common/const.py:475
 msgid "Certificate is not yet valid"
 msgstr "Certificaat is nog niet geldig"
 
-#: gajim/common/const.py:442
+#: gajim/common/const.py:476
 msgid "Certificate has expired"
 msgstr "Certificaat is verlopen"
 
-#: gajim/common/const.py:443
+#: gajim/common/const.py:477
 msgid "CRL is not yet valid"
 msgstr "CRL is nog niet geldig"
 
-#: gajim/common/const.py:444
+#: gajim/common/const.py:478
 msgid "CRL has expired"
 msgstr "CRL is verlopen"
 
-#: gajim/common/const.py:445
+#: gajim/common/const.py:479
 msgid "Format error in certificate's notBefore field"
 msgstr "Formatteringsfout in notBefore-veld van certificaat"
 
-#: gajim/common/const.py:446
+#: gajim/common/const.py:480
 msgid "Format error in certificate's notAfter field"
 msgstr "Formatteringsfout in notAfter-veld van certificaat"
 
-#: gajim/common/const.py:447
+#: gajim/common/const.py:481
 msgid "Format error in CRL's lastUpdate field"
 msgstr "Formatteringsfout in lastUpdate-veld van CRL"
 
-#: gajim/common/const.py:448
+#: gajim/common/const.py:482
 msgid "Format error in CRL's nextUpdate field"
 msgstr "Formatteringsfout in nextUpdate-veld van CRL"
 
-#: gajim/common/const.py:449
+#: gajim/common/const.py:483
 msgid "Out of memory"
 msgstr "Geheugentekort"
 
-#: gajim/common/const.py:450
+#: gajim/common/const.py:484
 msgid "Self signed certificate"
 msgstr "Zelfgetekend certificaat"
 
-#: gajim/common/const.py:451
+#: gajim/common/const.py:485
 msgid "Self signed certificate in certificate chain"
 msgstr "Zelfgetekend certificaat in certificaatsketen"
 
-#: gajim/common/const.py:452
+#: gajim/common/const.py:486
 msgid "Unable to get local issuer certificate"
 msgstr "Kan lokale uitgever van certificaat niet ophalen"
 
-#: gajim/common/const.py:453
+#: gajim/common/const.py:487
 msgid "Unable to verify the first certificate"
 msgstr "Kan het eerste certificaat niet verifiëren"
 
-#: gajim/common/const.py:454
+#: gajim/common/const.py:488
 msgid "Certificate chain too long"
 msgstr "Certificaatketen te lang"
 
-#: gajim/common/const.py:455
+#: gajim/common/const.py:489
 msgid "Certificate revoked"
 msgstr "Certificaat ingetrokken"
 
-#: gajim/common/const.py:456
+#: gajim/common/const.py:490
 msgid "Invalid CA certificate"
 msgstr "Ongeldig CA-certificaat"
 
-#: gajim/common/const.py:457
+#: gajim/common/const.py:491
 msgid "Path length constraint exceeded"
 msgstr "Padlengtelimiet overschreden"
 
-#: gajim/common/const.py:458
+#: gajim/common/const.py:492
 msgid "Unsupported certificate purpose"
 msgstr "Niet-ondersteund certificaatsdoel"
 
-#: gajim/common/const.py:459
+#: gajim/common/const.py:493
 msgid "Certificate not trusted"
 msgstr "Certificaat niet vertrouwd"
 
-#: gajim/common/const.py:460
+#: gajim/common/const.py:494
 msgid "Certificate rejected"
 msgstr "Certificaat geweigerd"
 
-#: gajim/common/const.py:461
+#: gajim/common/const.py:495
 msgid "Subject issuer mismatch"
 msgstr "Subjectuitgever komt niet overeen"
 
-#: gajim/common/const.py:462
+#: gajim/common/const.py:496
 msgid "Authority and subject key identifier mismatch"
 msgstr "Autoriteit en subjectsleutelidentificatie komen niet overeen"
 
-#: gajim/common/const.py:463
+#: gajim/common/const.py:497
 msgid "Authority and issuer serial number mismatch"
 msgstr "Autoriteit en uitgeverserienummer komen niet overeen"
 
-#: gajim/common/const.py:464
+#: gajim/common/const.py:498
 msgid "Key usage does not include certificate signing"
 msgstr "Sleutelgebruik bevat geen certificaatondertekening"
 
-#: gajim/common/const.py:465
+#: gajim/common/const.py:499
 msgid "Application verification failure"
 msgstr "Toepassingsverificatie mislukt"
 
@@ -5115,257 +5349,257 @@ msgstr "video-invoer"
 msgid "video output"
 msgstr "video-uitvoer"
 
-#: gajim/common/helpers.py:210
+#: gajim/common/helpers.py:216
 msgid "Server must be between 1 and 1023 bytes"
 msgstr "Server moet tussen 1 en 1023 bytes lang zijn"
 
-#: gajim/common/helpers.py:214
+#: gajim/common/helpers.py:220
 msgid "Invalid character in hostname."
 msgstr "Ongeldig teken in hostnaam."
 
-#: gajim/common/helpers.py:216
+#: gajim/common/helpers.py:222
 msgid "Server address required."
 msgstr "Server adres vereist."
 
-#: gajim/common/helpers.py:220
+#: gajim/common/helpers.py:226
 msgid "Username must be between 1 and 1023 bytes"
 msgstr "Gebruikersnaam moet tussen 1 en 1023 bytes lang zijn"
 
-#: gajim/common/helpers.py:224
+#: gajim/common/helpers.py:230
 msgid "Invalid character in username."
 msgstr "Ongeldig teken in gebruikersnaam."
 
-#: gajim/common/helpers.py:230
+#: gajim/common/helpers.py:236
 msgid "Resource must be between 1 and 1023 bytes"
 msgstr "Bron moet tussen 1 en 1023 bytes lang zijn"
 
-#: gajim/common/helpers.py:234
+#: gajim/common/helpers.py:240
 msgid "Invalid character in resource."
 msgstr "Ongeldig teken in bron."
 
-#: gajim/common/helpers.py:275
+#: gajim/common/helpers.py:281
 msgid "_Busy"
 msgstr "_Bezig"
 
-#: gajim/common/helpers.py:277 gajim/gtk/tooltips.py:647
+#: gajim/common/helpers.py:283 gajim/gtk/tooltips.py:647
 msgid "Busy"
 msgstr "Bezig"
 
-#: gajim/common/helpers.py:280
+#: gajim/common/helpers.py:286
 msgid "_Not Available"
 msgstr "_Niet beschikbaar"
 
-#: gajim/common/helpers.py:282 gajim/gtk/tooltips.py:649
+#: gajim/common/helpers.py:288 gajim/gtk/tooltips.py:649
 msgid "Not Available"
 msgstr "Niet beschikbaar"
 
-#: gajim/common/helpers.py:285
+#: gajim/common/helpers.py:291
 msgid "_Free for Chat"
 msgstr "Open voor _gesprek"
 
-#: gajim/common/helpers.py:287 gajim/gtk/tooltips.py:643
+#: gajim/common/helpers.py:293 gajim/gtk/tooltips.py:643
 msgid "Free for Chat"
 msgstr "Open voor gesprek"
 
-#: gajim/common/helpers.py:290
+#: gajim/common/helpers.py:296
 msgid "?user status:_Available"
 msgstr "?gebruikersstatus:_Aanwezig"
 
-#: gajim/common/helpers.py:292 gajim/gtk/tooltips.py:641
+#: gajim/common/helpers.py:298 gajim/gtk/tooltips.py:641
 msgid "?user status:Available"
 msgstr "?gebruikersstatus:Aanwezig"
 
-#: gajim/common/helpers.py:294
+#: gajim/common/helpers.py:300
 msgid "Connecting"
 msgstr "Bezig met verbinden"
 
-#: gajim/common/helpers.py:297 gajim/data/gui/preferences_window.ui:1251
+#: gajim/common/helpers.py:303 gajim/data/gui/preferences_window.ui:1251
 msgid "A_way"
 msgstr "Af_wezig"
 
-#: gajim/common/helpers.py:299 gajim/common/modules/adhoc_commands.py:120
-#: gajim/command_system/implementation/standard.py:139
+#: gajim/common/helpers.py:305 gajim/common/modules/adhoc_commands.py:120
+#: gajim/command_system/implementation/standard.py:141
 #: gajim/gtk/tooltips.py:645
 msgid "Away"
 msgstr "Afwezig"
 
-#: gajim/common/helpers.py:302
+#: gajim/common/helpers.py:308
 msgid "_Offline"
 msgstr "_Offline"
 
-#: gajim/common/helpers.py:304 gajim/gtk/tooltips.py:651
+#: gajim/common/helpers.py:310 gajim/gtk/tooltips.py:651
 msgid "Offline"
 msgstr "Offline"
 
-#: gajim/common/helpers.py:307
+#: gajim/common/helpers.py:313
 msgid "_Invisible"
 msgstr "Onz_ichtbaar"
 
-#: gajim/common/helpers.py:313
+#: gajim/common/helpers.py:319
 msgid "?contact has status:Unknown"
 msgstr "?contact heeft status:Onbekend"
 
-#: gajim/common/helpers.py:315
+#: gajim/common/helpers.py:321
 msgid "?contact has status:Has errors"
 msgstr "?contact heeft status:Heeft fouten"
 
-#: gajim/common/helpers.py:330
+#: gajim/common/helpers.py:336
 msgid "?Subscription we already have:None"
 msgstr "?Abonnement dat we al hebben:Geen"
 
-#: gajim/common/helpers.py:332
+#: gajim/common/helpers.py:338
 msgid "To"
 msgstr "Aan"
 
-#: gajim/common/helpers.py:334 gajim/data/gui/groups_post_window.ui:33
+#: gajim/common/helpers.py:340 gajim/data/gui/groups_post_window.ui:33
 msgid "From"
 msgstr "Van"
 
-#: gajim/common/helpers.py:336
+#: gajim/common/helpers.py:342
 msgid "Both"
 msgstr "Beide"
 
-#: gajim/common/helpers.py:338 gajim/gtk/server_info.py:151
+#: gajim/common/helpers.py:344 gajim/gtk/server_info.py:151
 msgid "Unknown"
 msgstr "Onbekend"
 
-#: gajim/common/helpers.py:344
+#: gajim/common/helpers.py:350
 msgid "?Ask (for Subscription):None"
 msgstr "?Vragen (voor abonnering):Geen"
 
-#: gajim/common/helpers.py:346
+#: gajim/common/helpers.py:352
 msgid "Subscribe"
 msgstr "Abonneren"
 
-#: gajim/common/helpers.py:355
+#: gajim/common/helpers.py:361
 msgid "?Group Chat Contact Role:None"
 msgstr "?Contactrol voor groepsgesprek:Geen"
 
-#: gajim/common/helpers.py:358
+#: gajim/common/helpers.py:364
 msgid "Moderators"
 msgstr "Beheerders"
 
-#: gajim/common/helpers.py:360
+#: gajim/common/helpers.py:366
 msgid "Moderator"
 msgstr "Beheerder"
 
-#: gajim/common/helpers.py:363
+#: gajim/common/helpers.py:369 gajim/data/gui/groupchat_info_scrolled.ui:243
 msgid "Participants"
 msgstr "Deelnemers"
 
-#: gajim/common/helpers.py:365
+#: gajim/common/helpers.py:371
 msgid "Participant"
 msgstr "Deelnemer"
 
-#: gajim/common/helpers.py:368
+#: gajim/common/helpers.py:374
 msgid "Visitors"
 msgstr "Bezoekers"
 
-#: gajim/common/helpers.py:370
+#: gajim/common/helpers.py:376
 msgid "Visitor"
 msgstr "Bezoeker"
 
-#: gajim/common/helpers.py:376 gajim/gtk/tooltips.py:253
+#: gajim/common/helpers.py:382 gajim/gtk/tooltips.py:253
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "?Aansluiting van contact in groepsgesprek:Geen"
 
-#: gajim/common/helpers.py:378 gajim/data/gui/groupchat_config.ui:32
+#: gajim/common/helpers.py:384 gajim/data/gui/groupchat_config.ui:32
 #: gajim/gtk/tooltips.py:259
 msgid "Owner"
 msgstr "Eigenaar"
 
-#: gajim/common/helpers.py:380 gajim/gtk/tooltips.py:257
+#: gajim/common/helpers.py:386 gajim/gtk/tooltips.py:257
 msgid "Administrator"
 msgstr "Administrator"
 
-#: gajim/common/helpers.py:382 gajim/data/gui/groupchat_config.ui:40
+#: gajim/common/helpers.py:388 gajim/data/gui/groupchat_config.ui:40
 #: gajim/gtk/tooltips.py:255 gajim/gtk/groupchat_config.py:105
 msgid "Member"
 msgstr "Lid"
 
-#: gajim/common/helpers.py:421
+#: gajim/common/helpers.py:427
 msgid "is paying attention to the conversation"
 msgstr "let op deze conversatie"
 
-#: gajim/common/helpers.py:423
+#: gajim/common/helpers.py:429
 msgid "is doing something else"
 msgstr "is met iets anders bezig"
 
-#: gajim/common/helpers.py:425
+#: gajim/common/helpers.py:431
 msgid "is composing a message…"
 msgstr "is een bericht aan het typen…"
 
-#: gajim/common/helpers.py:428
+#: gajim/common/helpers.py:434
 msgid "paused composing a message"
 msgstr "pauzeert tijdens het typen van een bericht"
 
-#: gajim/common/helpers.py:430
+#: gajim/common/helpers.py:436
 msgid "has closed the chat window or tab"
 msgstr "heeft het gespreksvenster of -tabblad gesloten"
 
 # Kan beter.
-#: gajim/common/helpers.py:936 gajim/common/helpers.py:943
+#: gajim/common/helpers.py:942 gajim/common/helpers.py:949
 #, 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:950
-#, python-format
-msgid "from room %s"
-msgstr "van groepsgesprek %s"
+#: gajim/common/helpers.py:956
+#, fuzzy, python-format
+msgid "from group chat %s"
+msgstr "in _groepsgesprekken"
 
-#: gajim/common/helpers.py:953 gajim/common/helpers.py:970
+#: gajim/common/helpers.py:959 gajim/common/helpers.py:976
 #, python-format
 msgid "from user %s"
 msgstr "van gebruiker %s"
 
-#: gajim/common/helpers.py:955
+#: gajim/common/helpers.py:961
 #, python-format
 msgid "from %s"
 msgstr "van %s"
 
-#: gajim/common/helpers.py:962 gajim/common/helpers.py:968
+#: gajim/common/helpers.py:968 gajim/common/helpers.py:974
 #, 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:986 gajim/common/helpers.py:998
+#: gajim/common/helpers.py:992 gajim/common/helpers.py:1004
 #: gajim/data/gui/roster_window.ui:85 data/org.gajim.Gajim.desktop.in:4
 #: data/org.gajim.Gajim.appdata.xml.in:9
 msgid "Gajim"
 msgstr "Gajim"
 
-#: gajim/common/helpers.py:1000
+#: gajim/common/helpers.py:1006
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: gajim/common/helpers.py:1109 gajim/data/gui/add_new_contact_window.ui:25
+#: gajim/common/helpers.py:1115 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:1111
+#: gajim/common/helpers.py:1117
 msgid "Hello, I am $name."
 msgstr "Hallo, ik ben $name."
 
-#: gajim/common/helpers.py:1215 gajim/common/helpers.py:1224
-#: gajim/common/helpers.py:1282
+#: gajim/common/helpers.py:1221 gajim/common/helpers.py:1230
+#: gajim/common/helpers.py:1288
 msgid "Timeout loading image"
 msgstr "Time-out bij laden van afbeelding"
 
-#: gajim/common/helpers.py:1234 gajim/common/helpers.py:1280
+#: gajim/common/helpers.py:1240 gajim/common/helpers.py:1286
 msgid "Image is too big"
 msgstr "Afbeelding is te groot"
 
-#: gajim/common/helpers.py:1245
+#: gajim/common/helpers.py:1251
 msgid "PyCURL is not installed"
 msgstr "PyCURL is niet geïnstalleerd"
 
-#: gajim/common/helpers.py:1284
+#: gajim/common/helpers.py:1290
 msgid "Error loading image"
 msgstr "Fout bij laden van afbeelding"
 
@@ -5544,7 +5778,8 @@ msgstr "De status is veranderd."
 
 #: gajim/common/modules/adhoc_commands.py:202
 #: gajim/common/modules/adhoc_commands.py:239
-msgid "Leave Groupchats"
+#, fuzzy
+msgid "Leave Group Chats"
 msgstr "Groepsgesprekken verlaten"
 
 #: gajim/common/modules/adhoc_commands.py:228
@@ -5553,15 +5788,18 @@ msgid "%(nickname)s on %(room_jid)s"
 msgstr "%(nickname)s in %(room_jid)s"
 
 #: gajim/common/modules/adhoc_commands.py:232
-msgid "You have not joined a groupchat."
+#, fuzzy
+msgid "You have not joined a group chat."
 msgstr "Je neemt niet deel aan een groepsgesprek."
 
 #: gajim/common/modules/adhoc_commands.py:240
-msgid "Choose the groupchats you want to leave"
+#, fuzzy
+msgid "Choose the group chats you want to leave"
 msgstr "Kies de groepsgesprekken die je wil verlaten"
 
 #: gajim/common/modules/adhoc_commands.py:289
-msgid "You left the following groupchats:"
+#, fuzzy
+msgid "You left the following group chats:"
 msgstr "Je hebt deze groepsgesprekken verlaten:"
 
 #: gajim/common/modules/roster_item_exchange.py:102
@@ -5578,7 +5816,7 @@ msgstr "Verzonden contacten:"
 msgid "Blocked Contacts"
 msgstr "Geblokkeerde contacten"
 
-#: gajim/data/gui/destroy_muc_dialog.ui:79 gajim/gtk/dialogs.py:736
+#: gajim/data/gui/destroy_muc_dialog.ui:79 gajim/gtk/dialogs.py:563
 msgid "Destroy this group chat permanently?"
 msgstr ""
 
@@ -5587,7 +5825,7 @@ msgstr ""
 msgid "Reason..."
 msgstr "Reden"
 
-#: gajim/data/gui/destroy_muc_dialog.ui:124 gajim/gtk/dialogs.py:738
+#: gajim/data/gui/destroy_muc_dialog.ui:124 gajim/gtk/dialogs.py:565
 msgid "Where participants should go (optional)"
 msgstr ""
 
@@ -5600,30 +5838,6 @@ msgstr ""
 msgid "_Reason and alternate venue (optional)"
 msgstr "Je kan ook een andere locatie opgeven:"
 
-#: gajim/data/gui/advanced_configuration_window.ui:7
-#: gajim/data/gui/preferences_window.ui:2723
-msgid "Advanced Configuration Editor (ACE)"
-msgstr "Geavanceerde configuratie (ACE)"
-
-#: gajim/data/gui/advanced_configuration_window.ui:52
-msgid "You should restart Gajim for some changes to take effect"
-msgstr ""
-"Je moet Gajim herstarten vooraleer sommige instellingen in werking treden"
-
-#: gajim/data/gui/advanced_configuration_window.ui:84
-msgid "_Filter"
-msgstr "_Filter"
-
-#: gajim/data/gui/advanced_configuration_window.ui:153
-#: gajim/data/gui/filetransfers_send_file_dialog.ui:15
-#: gajim/gtk/discovery.py:1666
-msgid "Description"
-msgstr "Beschrijving"
-
-#: gajim/data/gui/advanced_configuration_window.ui:197
-msgid "_Reset to default"
-msgstr "He_rstellen naar standaardwaarden"
-
 #: gajim/data/gui/join_groupchat_window.ui:56
 #: gajim/data/gui/chat_to_muc_window.ui:67
 #: gajim/data/gui/chat_to_muc_window.ui:78
@@ -5635,8 +5849,8 @@ msgid "Join group chat every time Gajim is started"
 msgstr "Deelnemen aan groepsgesprek bij opstarten van Gajim"
 
 #: gajim/data/gui/join_groupchat_window.ui:113
-msgid "Auto Join"
-msgstr "Automatisch deelnemen"
+msgid "Join Automatically"
+msgstr ""
 
 #: gajim/data/gui/join_groupchat_window.ui:131
 #: gajim/data/gui/profile_window.ui:233
@@ -5644,10 +5858,12 @@ msgid "Account"
 msgstr "Account"
 
 #: gajim/data/gui/join_groupchat_window.ui:147
-msgid "Room"
-msgstr "Groepsgesprek"
+#, fuzzy
+msgid "Group chat"
+msgstr "Groepsgesprekken"
 
-#: gajim/data/gui/join_groupchat_window.ui:180 gajim/gtk/accounts.py:886
+#: gajim/data/gui/join_groupchat_window.ui:180 gajim/data/gui/bookmarks.ui:158
+#: gajim/gtk/accounts.py:889
 msgid "Password"
 msgstr "Wachtwoord"
 
@@ -5667,78 +5883,10 @@ 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:1271
+#: gajim/data/gui/join_groupchat_window.ui:437 gajim/gtk/discovery.py:1270
 msgid "Join"
 msgstr "Lid worden"
 
-#: gajim/data/gui/manage_proxies_window.ui:12
-msgid "HTTP Connect"
-msgstr "HTTP verbinden"
-
-#: gajim/data/gui/manage_proxies_window.ui:15
-msgid "SOCKS5"
-msgstr "SOCKS5"
-
-#: gajim/data/gui/manage_proxies_window.ui:18
-msgid "BOSH"
-msgstr "BOSH"
-
-#: gajim/data/gui/manage_proxies_window.ui:27
-msgid "Manage Proxy Profiles"
-msgstr "Beheer Proxy Profielen"
-
-#: gajim/data/gui/manage_proxies_window.ui:83
-msgid "Add Proxy"
-msgstr "Proxy toevoegen"
-
-#: gajim/data/gui/manage_proxies_window.ui:97
-msgid "Remove Proxy"
-msgstr "Proxy verwijderen"
-
-#: gajim/data/gui/manage_proxies_window.ui:141
-msgid "Properties"
-msgstr "Eigenschappen"
-
-#: gajim/data/gui/manage_proxies_window.ui:157
-msgid "_Name"
-msgstr "_Naam"
-
-#: gajim/data/gui/manage_proxies_window.ui:173
-msgid "_Type"
-msgstr "_Type"
-
-#: gajim/data/gui/manage_proxies_window.ui:236
-msgid "_BOSH URL"
-msgstr "_BOSH-URL"
-
-#: gajim/data/gui/manage_proxies_window.ui:261
-msgid "Use HTTP prox_y"
-msgstr "Gebruik HTTP-prox_y"
-
-#: gajim/data/gui/manage_proxies_window.ui:280
-msgid "Proxy _Host"
-msgstr "Proxy_host"
-
-#: gajim/data/gui/manage_proxies_window.ui:307
-msgid "Proxy _Port"
-msgstr "Proxy_poort"
-
-#: gajim/data/gui/manage_proxies_window.ui:334
-msgid "_Username"
-msgstr "Gebr_uikersnaam"
-
-#: gajim/data/gui/manage_proxies_window.ui:347
-msgid "Use proxy auth_entication"
-msgstr "Gebruik proxy-auth_enticatie"
-
-#: gajim/data/gui/manage_proxies_window.ui:377
-msgid "Pass_word"
-msgstr "_Wachtwoord"
-
-#: gajim/data/gui/manage_proxies_window.ui:405 gajim/gtk/adhoc.py:321
-msgid "Settings"
-msgstr "Instellingen"
-
 #: gajim/data/gui/change_password_dialog.ui:17
 msgid "New Password"
 msgstr "Nieuw wachtwoord"
@@ -5767,11 +5915,13 @@ msgid "Status:"
 msgstr "Status:"
 
 #: gajim/data/gui/zeroconf_information_window.ui:89
-msgid "_Log conversation history"
+#, fuzzy
+msgid "_Store conversation history"
 msgstr "Gespreksgeschiedenis"
 
 #: gajim/data/gui/zeroconf_information_window.ui:215
 #: gajim/data/gui/vcard_information_window.ui:390
+#: gajim/data/gui/groupchat_info_scrolled.ui:166
 msgid "Contact"
 msgstr "Contact"
 
@@ -5784,8 +5934,9 @@ msgid "Last Name:"
 msgstr "Achternaam:"
 
 #: gajim/data/gui/zeroconf_information_window.ui:260
-msgid "Jabber ID:"
-msgstr "Jabber-ID:"
+#, fuzzy
+msgid "XMPP Address:"
+msgstr "AIM-adres:"
 
 #: gajim/data/gui/zeroconf_information_window.ui:273
 msgid "E-Mail:"
@@ -5805,8 +5956,9 @@ msgid "Send _File"
 msgstr "_Bestand Verzenden"
 
 #: gajim/data/gui/gc_occupants_menu.ui:29
-msgid "Occupant Actions"
-msgstr "Deelnemeracties"
+#, fuzzy
+msgid "Participant Actions"
+msgstr "Deelnemers"
 
 #: gajim/data/gui/gc_occupants_menu.ui:38
 msgid "_Voice"
@@ -5837,8 +5989,9 @@ msgid "_Ban"
 msgstr "Ver_bannen"
 
 #: gajim/data/gui/gc_occupants_menu.ui:124
-msgid "_Add to Roster"
-msgstr "Toevoegen _aan roster"
+#, fuzzy
+msgid "_Add to Contact List"
+msgstr "Contact toevoegen"
 
 #: gajim/data/gui/gc_occupants_menu.ui:132
 msgid "_Execute command"
@@ -5873,11 +6026,6 @@ msgstr "Abonnement:"
 msgid "_Status"
 msgstr "_Status"
 
-#: gajim/data/gui/zeroconf_context_menu.ui:26
-#: gajim/data/gui/account_context_menu.ui:79
-msgid "_Modify Account..."
-msgstr "Account be_werken…"
-
 #: gajim/data/gui/certificate_dialog.ui:66
 #: gajim/data/gui/certificate_dialog.ui:178
 msgid "Common Name (CN)"
@@ -5958,13 +6106,19 @@ msgstr "Laatst gewijzigd:"
 msgid "Next entry"
 msgstr "Volgend item"
 
+#: gajim/data/gui/filetransfers_send_file_dialog.ui:15
+#: gajim/data/gui/advanced_configuration.ui:143
+#: gajim/data/gui/groupchat_info_scrolled.ui:48 gajim/gtk/discovery.py:1663
+msgid "Description"
+msgstr "Beschrijving"
+
 #: gajim/data/gui/filetransfers_send_file_dialog.ui:54
 #, fuzzy
 msgid "_Send Files"
 msgstr "_Bestand Verzenden"
 
 #: gajim/data/gui/filetransfers_send_file_dialog.ui:58
-#: gajim/gtk/xml_console.py:90
+#: gajim/gtk/xml_console.py:87
 msgid "Send"
 msgstr "Verzenden"
 
@@ -5988,20 +6142,23 @@ msgid "Change _Nickname..."
 msgstr "Bij_naam veranderen…"
 
 #: gajim/data/gui/gc_control_popup_menu.ui:20
-msgid "_Manage Room"
-msgstr "Beheer rui_mte"
+#, fuzzy
+msgid "_Manage Group Chat"
+msgstr "_Nieuw groepsgesprek"
 
 #: gajim/data/gui/gc_control_popup_menu.ui:31
 msgid "Change _Subject..."
 msgstr "_Onderwerp veranderen…"
 
 #: gajim/data/gui/gc_control_popup_menu.ui:38
-msgid "Configure _Room..."
-msgstr "G_roepsgesprek configureren…"
+#, fuzzy
+msgid "Configure _Group Chat..."
+msgstr "Neem deel aan _Groepsgesprek"
 
 #: gajim/data/gui/gc_control_popup_menu.ui:52
-msgid "_Destroy Room"
-msgstr "Groepsgesprek _vernietigen"
+#, fuzzy
+msgid "_Destroy Group Chat"
+msgstr "_Nieuw groepsgesprek"
 
 #: gajim/data/gui/gc_control_popup_menu.ui:64
 msgid "_Minimize on close"
@@ -6011,7 +6168,7 @@ msgstr "_Minimaliseren bij sluiten"
 msgid "_Request Voice"
 msgstr "Stem aanv_ragen"
 
-#: gajim/data/gui/gc_control_popup_menu.ui:99 gajim/gtk/discovery.py:1704
+#: gajim/data/gui/gc_control_popup_menu.ui:99
 msgid "_Bookmark"
 msgstr "Toevoegen aan _bladwijzers"
 
@@ -6056,13 +6213,6 @@ msgstr "Website"
 msgid "E-Mail"
 msgstr "E-mailadres"
 
-#: 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/blocking_list.ui:115 gajim/gtk/add_contact.py:30
-#: gajim/gtk/accounts.py:801
-msgid "Jabber ID"
-msgstr "Jabber-ID"
-
 #: gajim/data/gui/profile_window.ui:440
 msgid "Main"
 msgstr "Standaard"
@@ -6181,36 +6331,44 @@ msgstr "Werk"
 msgid "About"
 msgstr "Info"
 
-#: gajim/data/gui/start_chat_dialog.ui:114 gajim/gtk/discovery.py:1658
-msgid "Users"
-msgstr "Gebruikers"
+#: gajim/data/gui/start_chat_dialog.ui:53
+#, fuzzy
+msgid "Global Group Chat Search"
+msgstr "Deelnemen aan groepsgesprek"
 
-#: gajim/data/gui/start_chat_dialog.ui:185
-msgid "Name:"
-msgstr "Naam:"
+#: 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
+msgid "_Back"
+msgstr "Zo terug"
 
-#: gajim/data/gui/start_chat_dialog.ui:197
-msgid "Description:"
-msgstr "Beschrijving:"
+#: gajim/data/gui/start_chat_dialog.ui:245
+#: gajim/data/gui/groupchat_control.ui:796
+#: gajim/data/gui/groupchat_control.ui:888 gajim/gtk/discovery.py:1701
+#: gajim/gtk/groupchat_join.py:62
+msgid "_Join"
+msgstr "_Binnengaan"
 
-#: gajim/data/gui/start_chat_dialog.ui:209
-msgid "Address:"
-msgstr "Adres:"
+#: gajim/data/gui/start_chat_dialog.ui:289
+#, fuzzy
+msgid "Select Account"
+msgstr "Account %s wordt verwijderd"
 
-#: gajim/data/gui/start_chat_dialog.ui:246
-msgid ""
-"Semi-Anonymous\n"
-"<span size=\"small\">(Only moderators can see your XMPP-Address)</span>"
-msgstr ""
-"Semi-anoniem\n"
-"<span size=\"small\">(Enkel moderators kunnen je XMPP-adres zien)</span>"
+#: gajim/data/gui/start_chat_dialog.ui:380
+#, fuzzy
+msgid "_Select"
+msgstr "Selecteer bestanden"
 
 #: gajim/data/gui/filetransfers.ui:21
 #, fuzzy
 msgid "Pa_use/Resume"
 msgstr "He_rvatten"
 
-#: gajim/data/gui/filetransfers.ui:30 gajim/gtk/filechoosers.py:178
+#: gajim/data/gui/filetransfers.ui:30 gajim/data/gui/groupchat_control.ui:575
+#: gajim/data/gui/groupchat_control.ui:667
+#: gajim/data/gui/groupchat_control.ui:779
+#: gajim/data/gui/groupchat_control.ui:871 gajim/gtk/filechoosers.py:178
 msgid "_Cancel"
 msgstr "_Annuleren"
 
@@ -6254,7 +6412,8 @@ msgstr ""
 "verwijderen"
 
 #: gajim/data/gui/filetransfers.ui:207
-msgid "Shows a list of file transfers between you and others"
+#, fuzzy
+msgid "Shows a list of file transfers between you and your contacts"
 msgstr "Laat een lijst met bestandsoverdrachten zien tussen jou en anderen"
 
 #: gajim/data/gui/groupchat_control.ui:13 gajim/data/gui/chat_control.ui:277
@@ -6274,7 +6433,6 @@ msgid "Strike"
 msgstr "Doorstrepen"
 
 #: gajim/data/gui/groupchat_control.ui:54 gajim/data/gui/chat_control.ui:318
-#: gajim/gtk/advanced_config.py:86
 msgid "Color"
 msgstr "Kleur"
 
@@ -6286,14 +6444,45 @@ msgstr "Lettertype"
 msgid "Clear formatting"
 msgstr "Opmaak wissen"
 
-#: gajim/data/gui/groupchat_control.ui:290 gajim/data/gui/chat_control.ui:880
+#: gajim/data/gui/groupchat_control.ui:291 gajim/data/gui/chat_control.ui:880
 msgid "Choose encryption"
 msgstr "Kies een versleutelingstype"
 
-#: gajim/data/gui/groupchat_control.ui:336 gajim/data/gui/chat_control.ui:640
+#: gajim/data/gui/groupchat_control.ui:337 gajim/data/gui/chat_control.ui:640
 msgid "Show a list of emojis (Alt+M)"
 msgstr "Een lijst van emoji’s weergeven (Alt+M)"
 
+#: gajim/data/gui/groupchat_control.ui:484
+#, fuzzy
+msgid "Joining…"
+msgstr "Wordt verbannen…"
+
+#: gajim/data/gui/groupchat_control.ui:496
+#, fuzzy
+msgid "_Abort"
+msgstr "Afgebroken"
+
+#: gajim/data/gui/groupchat_control.ui:542
+#, fuzzy
+msgid "Enter new nickname"
+msgstr "Na bijnaam:"
+
+#: gajim/data/gui/groupchat_control.ui:592
+#: gajim/data/gui/groupchat_control.ui:684
+#, fuzzy
+msgid "Ch_ange"
+msgstr "Bijnaam veranderen"
+
+#: gajim/data/gui/groupchat_control.ui:761
+#, fuzzy
+msgid "Enter password"
+msgstr "Voer nieuw wachtwoord in:"
+
+#: gajim/data/gui/groupchat_control.ui:1067
+#, fuzzy
+msgid "_Try again"
+msgstr "Opnieuw verifiëren…"
+
 #: gajim/data/gui/popup_notification_window.ui:42
 msgid "Event Type"
 msgstr "Gebeurtenistype"
@@ -6361,8 +6550,9 @@ msgid "Always"
 msgstr "Altijd"
 
 #: gajim/data/gui/mam_preferences.ui:18
-msgid "Roster"
-msgstr "Rooster"
+#, fuzzy
+msgid "Contact List"
+msgstr "Contacten"
 
 #: gajim/data/gui/mam_preferences.ui:22
 #: gajim/data/gui/preferences_window.ui:123
@@ -6385,11 +6575,11 @@ msgid "Add"
 msgstr "Toevoegen"
 
 #: gajim/data/gui/mam_preferences.ui:194 gajim/data/gui/groupchat_config.ui:151
-#: gajim/gtk/dialogs.py:63 gajim/gtk/accounts.py:381
+#: gajim/gtk/dialogs.py:62 gajim/gtk/accounts.py:384
 msgid "Remove"
 msgstr "Verwijderen"
 
-#: gajim/data/gui/vcard_information_window.ui:72 gajim/gtk/accounts.py:753
+#: gajim/data/gui/vcard_information_window.ui:72 gajim/gtk/accounts.py:756
 msgid "Resource"
 msgstr "Bron"
 
@@ -6434,6 +6624,7 @@ msgstr "Abonnement"
 #: gajim/data/gui/vcard_information_window.ui:974
 #: gajim/data/gui/vcard_information_window.ui:993
 #: gajim/data/gui/vcard_information_window.ui:1427
+#: gajim/data/gui/groupchat_info_scrolled.ui:222
 msgid "button"
 msgstr "knop"
 
@@ -6462,15 +6653,18 @@ msgid "Notify me about it"
 msgstr "Stel mij ervan op de hoogte"
 
 #: gajim/data/gui/preferences_window.ui:58
-msgid "Show only in roster"
-msgstr "Alleen in rooster weergeven"
+#, fuzzy
+msgid "Show only in contact list"
+msgstr "Alleen actieve contacten weergeven"
 
 #: gajim/data/gui/preferences_window.ui:69
-msgid "Detached roster with detached chats"
+#, fuzzy
+msgid "Detached contact list with detached chats"
 msgstr "Apart rooster met aparte gesprekken"
 
 #: gajim/data/gui/preferences_window.ui:72
-msgid "Detached roster with single chat"
+#, fuzzy
+msgid "Detached contact list with single chat"
 msgstr "Apart rooster met enkel gesprek"
 
 #: gajim/data/gui/preferences_window.ui:75
@@ -6478,11 +6672,13 @@ msgid "Single window for everything"
 msgstr "Enkel venster voor alles"
 
 #: gajim/data/gui/preferences_window.ui:78
-msgid "Detached roster with chat grouped by account"
+#, fuzzy
+msgid "Detached contact list with chat grouped by account"
 msgstr "Apart rooster met gesprekken gegroepeerd per account"
 
 #: gajim/data/gui/preferences_window.ui:81
-msgid "Detached roster with chat grouped by type"
+#, fuzzy
+msgid "Detached contact list with chat grouped by type"
 msgstr "Apart venster met gesprekken gegroepeerd per type"
 
 #: gajim/data/gui/preferences_window.ui:92
@@ -6526,7 +6722,8 @@ msgid "_Window behavior"
 msgstr "_Venstergedrag"
 
 #: gajim/data/gui/preferences_window.ui:296
-msgid "_Show roster on startup"
+#, fuzzy
+msgid "_Show contact list on startup"
 msgstr "Roo_ster weergeven bij opstarten"
 
 #: gajim/data/gui/preferences_window.ui:311
@@ -6544,12 +6741,14 @@ msgid "_Tabs placement"
 msgstr "_Tabbladplaatsing"
 
 #: gajim/data/gui/preferences_window.ui:363
-msgid "_Quit Gajim when closing roster window"
+#, fuzzy
+msgid "_Quit Gajim when closing contact list"
 msgstr "Gajim af_sluiten bij sluiten van roostervenster"
 
 #: gajim/data/gui/preferences_window.ui:367
+#, fuzzy
 msgid ""
-"If enabled, Gajim will quit when closing the roster window instead of "
+"If enabled, Gajim will quit when closing the contact list window instead of "
 "minimizing to the system's notification area"
 msgstr ""
 "Indien ingeschakeld zal Gajim zichzelf afsluiten bij het sluiten van het "
@@ -6560,39 +6759,46 @@ msgid "Behavior of Windows and Tabs"
 msgstr "Gedrag van vensters en tabbladen"
 
 #: gajim/data/gui/preferences_window.ui:423
-msgid "Show a_vatars of contacts in roster"
+#, 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
+#, fuzzy
 msgid ""
-"If checked, avatars of contacts will be shown in the roster window and in "
-"group chats"
+"If checked, avatars of contacts will be shown in the contact list window and "
+"in group chats"
 msgstr ""
 "Indien aangevinkt zal Gajim contactavatars in het roostervenster en in "
 "groepsgesprekken weergeven"
 
 #: gajim/data/gui/preferences_window.ui:441
-msgid "Show status _messages of contacts in roster"
+#, 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
+#, fuzzy
 msgid ""
 "If checked, status messages of contacts will be shown under the contact's "
-"name, in the roster window, and in group chats"
+"name, in the contact list window, and in group chats"
 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
-msgid "Show e_xtra information of contacts in roster (mood, activity, ...)"
+#, fuzzy
+msgid ""
+"Show e_xtra information of contacts in contact list (mood, activity, ...)"
 msgstr ""
 "E_xtra informatie over contacten in rooster weergeven (stemming, activiteit, "
 "…)"
 
 #: gajim/data/gui/preferences_window.ui:463
+#, fuzzy
 msgid ""
-"If checked, additional info published by the contact will be shown in "
-"roster. Additional infos (published via PEP) may include e.g. mood, "
+"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 ""
 "Indien ingeschakeld zal extra informatie aangeboden door een contact in het "
@@ -6603,17 +6809,20 @@ msgstr ""
 msgid "Sort contacts by status"
 msgstr "Sorteer contacten op status"
 
+# Verzonden aan contacten?
 #: gajim/data/gui/preferences_window.ui:494
-msgid "in _roster"
-msgstr "in _rooster"
+#, fuzzy
+msgid "in _contact list"
+msgstr "Verzonden contacten:"
 
 #: gajim/data/gui/preferences_window.ui:511
 msgid "in _group chats"
 msgstr "in _groepsgesprekken"
 
 #: gajim/data/gui/preferences_window.ui:540
-msgid "Roster Appearance"
-msgstr "Roosteruiterlijk"
+#, fuzzy
+msgid "Contact List Appearance"
+msgstr "Roosteritemuitwisseling"
 
 #: gajim/data/gui/preferences_window.ui:585
 msgid "Enable spell _checking"
@@ -6674,7 +6883,8 @@ msgid "Show subject after _joining a group chat"
 msgstr "Onderwerp weergeven bi_j deelnemen aan groepsgesprek"
 
 #: gajim/data/gui/preferences_window.ui:660
-msgid "If checked, the room subject will be shown when joining a group chat"
+#, 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"
@@ -6688,18 +6898,20 @@ msgid "Show join/leave (Default)"
 msgstr "Deelnemen/verlaten tonen (standaard)"
 
 #: gajim/data/gui/preferences_window.ui:701
+#, fuzzy
 msgid ""
 "If join/leave status messages are shown in the group chat. This setting can "
-"be overridden in the groupchat menu."
+"be overridden in the group chat menu."
 msgstr ""
 "Of statusberichten voor deelnemen/verlaten in het groepsgesprek worden "
 "weergegeven. Deze instelling kan in het groepsgespreksmenu worden "
 "overschreven."
 
 #: gajim/data/gui/preferences_window.ui:720
+#, fuzzy
 msgid ""
 "The default sync threshold for new public group chats. This setting can be "
-"overridden in the groupchat menu."
+"overridden in the group chat menu."
 msgstr ""
 "De standaarddrempelwaarde voor synchronisatie voor nieuwe openbare "
 "groepsgesprekken. Deze instelling kan in het groepsgespreksmenu worden "
@@ -6714,9 +6926,10 @@ msgid "Show status changes (Default)"
 msgstr "Statusveranderingen tonen (standaard)"
 
 #: gajim/data/gui/preferences_window.ui:768
+#, fuzzy
 msgid ""
 "If status change messages are shown in the group chat. This setting can be "
-"overridden in the groupchat menu."
+"overridden in the group chat menu."
 msgstr ""
 "Of berichten over statuswijzigingen in het groepsgesprek worden weergegeven. "
 "Deze instelling kan in het groepsgespreksmenu worden overschreven."
@@ -6734,8 +6947,9 @@ msgstr ""
 "chatstatus van het contact"
 
 #: gajim/data/gui/preferences_window.ui:843
-msgid "Show chatstate in roster"
-msgstr "Chatstatus tonen in rooster"
+#, fuzzy
+msgid "Show chatstate in contact list"
+msgstr "Chatstatus tonen in tabbladen"
 
 #: gajim/data/gui/preferences_window.ui:847
 msgid ""
@@ -7022,7 +7236,7 @@ msgstr "Video_grootte"
 msgid "Vi_ew own video source"
 msgstr "_Eigen videobron weergeven"
 
-#: gajim/data/gui/preferences_window.ui:2281 gajim/gtk/accounts.py:352
+#: gajim/data/gui/preferences_window.ui:2281 gajim/gtk/accounts.py:355
 msgid "Connection"
 msgstr "Verbinding"
 
@@ -7072,7 +7286,8 @@ msgid "_Manage..."
 msgstr "_Beheren…"
 
 #: gajim/data/gui/preferences_window.ui:2616
-msgid "_Log status changes of contacts"
+#, fuzzy
+msgid "_Store status changes of contacts in history"
 msgstr "Houdt statuswijzigingen van contacten bij in het logboek"
 
 #: gajim/data/gui/preferences_window.ui:2633
@@ -7095,9 +7310,14 @@ msgstr "Let op: wees voorzichtig in het gebruik van deze opties!"
 msgid "_Open..."
 msgstr "_Openen…"
 
+#: gajim/data/gui/preferences_window.ui:2723 gajim/gtk/advanced_config.py:84
+msgid "Advanced Configuration Editor (ACE)"
+msgstr "Geavanceerde configuratie (ACE)"
+
 #: gajim/data/gui/groupchat_config.ui:55
+#, fuzzy
 msgid ""
-"<b>Jabber-ID</b>\n"
+"<b>XMPP Address</b>\n"
 "&lt;user@domain/resource&gt; (only that resource matches)\n"
 "&lt;user@domain&gt; (any resource matches)\n"
 "&lt;domain/resource&gt; (only that resource matches)\n"
@@ -7116,7 +7336,8 @@ msgstr ""
 msgid "Only Admins and Owners can modify the affiliation"
 msgstr "Enkel administrators en eigenaars kunnen de aansluiting wijzigen"
 
-#: gajim/data/gui/groupchat_config.ui:270 gajim/plugins/gui.py:312
+#: gajim/data/gui/groupchat_config.ui:270
+#: gajim/data/gui/groupchat_info_scrolled.ui:210 gajim/plugins/gui.py:324
 msgid "Configuration"
 msgstr "Configuratie"
 
@@ -7145,7 +7366,7 @@ msgid "Start _Chat"
 msgstr "_Gesprek beginnen"
 
 #: gajim/data/gui/contact_context_menu.ui:20
-#: gajim/data/gui/systray_context_menu.ui:36
+#: gajim/data/gui/systray_context_menu.ui:29
 msgid "Send Single _Message..."
 msgstr "Enkel _bericht verzenden…"
 
@@ -7202,17 +7423,42 @@ msgid "_Ignore"
 msgstr "_Negeren"
 
 #: gajim/data/gui/contact_context_menu.ui:174
-msgid "_Add to Roster..."
-msgstr "Toevoegen _aan rooster…"
+#, fuzzy
+msgid "_Add to Contact List..."
+msgstr "Cont_act toevoegen…"
+
+#: gajim/data/gui/advanced_configuration.ui:39
+msgid "You should restart Gajim for some changes to take effect"
+msgstr ""
+"Je moet Gajim herstarten vooraleer sommige instellingen in werking treden"
+
+#: gajim/data/gui/advanced_configuration.ui:71
+msgid "_Filter"
+msgstr "_Filter"
+
+#: gajim/data/gui/advanced_configuration.ui:88
+msgid "Type to search for values..."
+msgstr ""
+
+#: gajim/data/gui/advanced_configuration.ui:180
+#, fuzzy
+msgid "_Reset Value"
+msgstr "He_rstellen naar standaardwaarden"
+
+#: gajim/data/gui/advanced_configuration.ui:185
+#, fuzzy
+msgid "Resets value to default"
+msgstr "He_rstellen naar standaardwaarden"
 
 #: gajim/data/gui/account_creation_wizard_window.ui:43
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim: wizard account aanmaken"
 
 #: gajim/data/gui/account_creation_wizard_window.ui:70
+#, fuzzy
 msgid ""
 "You need to have an account in order to connect\n"
-"to the Jabber network."
+"to the XMPP network."
 msgstr ""
 "Je hebt een account nodig om verbinding te maken\n"
 "met het Jabber-netwerk."
@@ -7234,8 +7480,9 @@ msgid "<b>Please fill in the data for your existing account</b>"
 msgstr "<b>Vul de informatie in voor je bestaande account</b>"
 
 #: gajim/data/gui/account_creation_wizard_window.ui:187
-msgid "_Jabber ID:"
-msgstr "_Jabber-ID:"
+#, fuzzy
+msgid "_XMPP Address:"
+msgstr "AIM-adres:"
 
 #: gajim/data/gui/account_creation_wizard_window.ui:239
 #: gajim/data/gui/account_creation_wizard_window.ui:394
@@ -7322,6 +7569,7 @@ msgid "Privacy Lists:"
 msgstr "Privacylijsten:"
 
 #: gajim/data/gui/service_discovery_window.ui:111
+#: gajim/data/gui/groupchat_creation.ui:227
 #, fuzzy
 msgid "_Address"
 msgstr "_Adres:"
@@ -7339,10 +7587,6 @@ msgstr "Synchroniseren: selecteer contacten"
 msgid "Select the contacts you want to synchronise"
 msgstr "Selecteer de contacten die je wil synchroniseren"
 
-#: gajim/data/gui/groupchat_invitation_received.ui:42
-msgid "Group Chat Invitation"
-msgstr "Uitnodiging voor groepsgesprek"
-
 #: gajim/data/gui/groupchat_invitation_received.ui:111
 msgid "Message..."
 msgstr "Bericht…"
@@ -7388,11 +7632,11 @@ msgid "<b><big>Incoming call</big></b>"
 msgstr "<b><big>Inkomende oproep</big></b>"
 
 #: gajim/data/gui/add_new_contact_window.ui:84
-msgid "_Jabber ID"
-msgstr "_Jabber-ID"
+#, fuzzy
+msgid "_XMPP Address"
+msgstr "_Adres:"
 
 #: gajim/data/gui/add_new_contact_window.ui:100
-#: gajim/data/gui/manage_bookmarks_window.ui:192
 msgid "_Nickname"
 msgstr "Bij_naam"
 
@@ -7462,7 +7706,7 @@ msgstr "<b>Stemming:</b>"
 msgid "<b>Message:</b>"
 msgstr "<b>Bericht:</b>"
 
-#: gajim/data/gui/plugins_window.ui:10 gajim/data/gui/application_menu.ui:90
+#: gajim/data/gui/plugins_window.ui:10 gajim/data/gui/application_menu.ui:87
 msgid "Plugins"
 msgstr "Plug-ins"
 
@@ -7563,10 +7807,6 @@ msgstr "Toestaan"
 msgid "Deny"
 msgstr "Weigeren"
 
-#: gajim/data/gui/privacy_list_window.ui:317
-msgid "JabberID"
-msgstr "JabberID"
-
 #: gajim/data/gui/privacy_list_window.ui:358
 msgid "all in the group"
 msgstr "alle in de groep"
@@ -7607,7 +7847,7 @@ msgstr "Volgorde:"
 msgid "Manage sounds"
 msgstr "Beheer geluiden"
 
-#: gajim/data/gui/manage_sounds_window.ui:55 gajim/plugins/gui.py:100
+#: gajim/data/gui/manage_sounds_window.ui:55 gajim/plugins/gui.py:101
 msgid "Active"
 msgstr "Actief"
 
@@ -7643,30 +7883,113 @@ msgstr "Verwijder account van Gajim en van de server"
 msgid "_Personal Events"
 msgstr "_Persoonlijke gebeurtenissen"
 
-#: gajim/data/gui/account_context_menu.ui:35
-#: gajim/data/gui/systray_context_menu.ui:28
-msgid "Join _Group Chat"
-msgstr "Deelnemen aan _groepsgesprek"
-
-#: gajim/data/gui/account_context_menu.ui:49
+#: gajim/data/gui/account_context_menu.ui:41
 msgid "_Add Contact..."
 msgstr "Cont_act toevoegen…"
 
-#: gajim/data/gui/account_context_menu.ui:57
+#: gajim/data/gui/account_context_menu.ui:49
 msgid "_Discover Services"
 msgstr "Ontdek diensten"
 
-#: gajim/data/gui/account_context_menu.ui:65
+#: gajim/data/gui/account_context_menu.ui:57
 msgid "_Execute Command..."
 msgstr "Opdracht uitvoer_en…"
 
+#: gajim/data/gui/account_context_menu.ui:65
+#, fuzzy
+msgid "_View Certificate"
+msgstr "Certificaat bekijken…"
+
+#: gajim/data/gui/manage_proxies.ui:12
+#, fuzzy
+msgctxt "proxy configuration"
+msgid "HTTP Connect"
+msgstr "HTTP verbinden"
+
+#: gajim/data/gui/manage_proxies.ui:15
+#, fuzzy
+msgctxt "proxy configuration"
+msgid "SOCKS5"
+msgstr "SOCKS5"
+
+#: gajim/data/gui/manage_proxies.ui:18
+#, fuzzy
+msgctxt "proxy configuration"
+msgid "BOSH"
+msgstr "BOSH"
+
+#: gajim/data/gui/manage_proxies.ui:68
+msgid "Add Proxy"
+msgstr "Proxy toevoegen"
+
+#: gajim/data/gui/manage_proxies.ui:82
+msgid "Remove Proxy"
+msgstr "Proxy verwijderen"
+
+#: gajim/data/gui/manage_proxies.ui:134
+msgid "Pass_word"
+msgstr "_Wachtwoord"
+
+#: gajim/data/gui/manage_proxies.ui:159
+msgid "Use proxy auth_entication"
+msgstr "Gebruik proxy-auth_enticatie"
+
+#: gajim/data/gui/manage_proxies.ui:179
+msgid "_Username"
+msgstr "Gebr_uikersnaam"
+
+#: gajim/data/gui/manage_proxies.ui:209
+#, fuzzy
+msgid "_Port"
+msgstr "_Poort:"
+
+#: gajim/data/gui/manage_proxies.ui:226
+#, fuzzy
+msgid "example.org"
+msgstr "gebruiker@voorbeeld.nl"
+
+#: gajim/data/gui/manage_proxies.ui:240
+#, fuzzy
+msgid "_Host"
+msgstr "_Host:"
+
+#: gajim/data/gui/manage_proxies.ui:254
+msgid "Use HTTP prox_y"
+msgstr "Gebruik HTTP-prox_y"
+
+#: gajim/data/gui/manage_proxies.ui:275
+msgid "https://example.org/http-bind/"
+msgstr ""
+
+#: gajim/data/gui/manage_proxies.ui:291
+msgid "_BOSH URL"
+msgstr "_BOSH-URL"
+
+#: gajim/data/gui/manage_proxies.ui:309 gajim/gtk/adhoc.py:322
+msgid "Settings"
+msgstr "Instellingen"
+
+#: gajim/data/gui/manage_proxies.ui:344
+msgid "_Type"
+msgstr "_Type"
+
+#: gajim/data/gui/manage_proxies.ui:361
+#: gajim/data/gui/groupchat_creation.ui:105
+msgid "_Name"
+msgstr "_Naam"
+
+#: gajim/data/gui/manage_proxies.ui:391 gajim/gtk/accounts.py:742
+msgid "Proxy"
+msgstr "Proxy"
+
 #: gajim/data/gui/application_menu.ui:8
 msgid "View"
 msgstr "Weergeven"
 
 #: gajim/data/gui/application_menu.ui:11
-msgid "Show Roster"
-msgstr "Rooster weergeven"
+#, fuzzy
+msgid "Show Contact List"
+msgstr "Alleen actieve contacten weergeven"
 
 #: gajim/data/gui/application_menu.ui:16
 msgid "Show Offline Contacts"
@@ -7701,21 +8024,23 @@ msgstr "Sneltoetsen"
 msgid "Features"
 msgstr "Functies"
 
-#: gajim/data/gui/application_menu.ui:81
-msgid "Bookmarks"
-msgstr "Bladwijzers"
+#: gajim/data/gui/application_menu.ui:77
+#: gajim/data/gui/groupchat_creation.ui:81 gajim/gtk/groupchat_creation.py:45
+#, fuzzy
+msgid "Create Group Chat"
+msgstr "Groepsgesprekken verlaten"
 
-#: gajim/data/gui/application_menu.ui:94 gajim/data/gui/shortcuts_window.ui:189
-#: gajim/gtk/preferences.py:59
+#: gajim/data/gui/application_menu.ui:91 gajim/data/gui/shortcuts_window.ui:189
+#: gajim/gtk/preferences.py:58
 msgid "Preferences"
 msgstr "Voorkeuren"
 
-#: gajim/data/gui/application_menu.ui:99
+#: gajim/data/gui/application_menu.ui:96
 msgid "Quit"
 msgstr "Afsluiten"
 
 #: gajim/data/gui/httpupload_progress_dialog.ui:110
-#: gajim/gtk/filetransfer.py:121
+#: gajim/gtk/filetransfer.py:120
 msgid "Progress"
 msgstr "Voortgang"
 
@@ -7733,48 +8058,34 @@ msgstr ""
 msgid "_Cancel Upload"
 msgstr "Upload annuleren"
 
-#: gajim/data/gui/manage_bookmarks_window.ui:13
-msgid "Group Chat Bookmarks"
-msgstr "Groepsgesprekbladwijzers"
-
-#: gajim/data/gui/manage_bookmarks_window.ui:68
-#, fuzzy
-msgid "Add Bookmark"
-msgstr "Toevoegen aan bladwijzers"
-
-#: gajim/data/gui/manage_bookmarks_window.ui:82
-#, fuzzy
-msgid "Remove Bookmark"
-msgstr "Toevoegen aan bladwijzers"
-
-#: gajim/data/gui/manage_bookmarks_window.ui:126
-msgid "N_ame"
+#: gajim/data/gui/groupchat_creation.ui:27
+msgid "Public or Private?"
 msgstr ""
 
-#: gajim/data/gui/manage_bookmarks_window.ui:145
-msgid "Bookmark Name"
-msgstr "Bladwijzernaam"
-
-#: gajim/data/gui/manage_bookmarks_window.ui:160
-msgid "_Server"
-msgstr "_Server"
-
-#: gajim/data/gui/manage_bookmarks_window.ui:223
-msgid "Roo_m"
-msgstr "Groe_psgesprek"
+#: 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 ""
 
-#: gajim/data/gui/manage_bookmarks_window.ui:253
-msgid "_Password"
-msgstr "_Wachtwoord"
+#: gajim/data/gui/groupchat_creation.ui:58
+msgid "<b>Public:</b> Anyone who knows the address can join."
+msgstr ""
 
-#: gajim/data/gui/manage_bookmarks_window.ui:299
-msgid "Join chat when connected"
-msgstr "Deelnemen bij verbinden"
+#: gajim/data/gui/groupchat_creation.ui:122
+#, fuzzy
+msgid "_Description"
+msgstr "Beschrijving"
 
-#: gajim/data/gui/manage_bookmarks_window.ui:307
-msgid "_Join Automatically"
+#: gajim/data/gui/groupchat_creation.ui:164
+msgid "_Public"
 msgstr ""
 
+#: gajim/data/gui/groupchat_creation.ui:278
+#, fuzzy
+msgid "_Account"
+msgstr "_Accounts"
+
 #: gajim/data/gui/exception_dialog.ui:49
 msgid "Sorry, that should not have happened"
 msgstr "Sorry, dat zou niet mogen gebeuren"
@@ -7813,6 +8124,28 @@ msgstr "Geef contact toestemming om te zien of je online bent"
 msgid "Presets"
 msgstr "Voorinstellingen"
 
+#: gajim/data/gui/groupchat_info_scrolled.ui:32
+msgid "Address"
+msgstr "Adres"
+
+#: gajim/data/gui/groupchat_info_scrolled.ui:64
+msgid "Topic"
+msgstr ""
+
+#: gajim/data/gui/groupchat_info_scrolled.ui:80
+#, fuzzy
+msgid "Author"
+msgstr "Auteurs"
+
+#: gajim/data/gui/groupchat_info_scrolled.ui:182
+msgid "Discussion Logs"
+msgstr ""
+
+#: gajim/data/gui/groupchat_info_scrolled.ui:260
+#, fuzzy
+msgid "Group Chat Language"
+msgstr "Groepsgespreksconfiguratie"
+
 #: gajim/data/gui/emoji_chooser.ui:98
 msgid "No Results Found"
 msgstr "Geen resultaten gevonden"
@@ -7822,25 +8155,36 @@ msgid "Invite Friends!"
 msgstr "Nodig vrienden uit!"
 
 #: gajim/data/gui/chat_to_muc_window.ui:39
+#, fuzzy
 msgid ""
-"You are now entering a groupchat.\n"
+"You are now entering a group chat.\n"
 "Select the contacts you want to invite"
 msgstr ""
 "Je staat op het punt een groepsgesprek binnen te gaan.\n"
 "Kies de contacten die je wil uitnodigen"
 
 #: gajim/data/gui/chat_to_muc_window.ui:112
-msgid "Please select a MUC server."
+#, fuzzy
+msgid "Please select a group chat server."
 msgstr "Kies een MUC-server."
 
 #: gajim/data/gui/chat_to_muc_window.ui:141
-msgid "MUC server"
-msgstr "MUC-server"
+#, fuzzy
+msgid "Group chat server"
+msgstr "Ondersteuning voor groepsgesprekken"
 
 #: gajim/data/gui/chat_to_muc_window.ui:176
 msgid "In_vite"
 msgstr "Uit_nodigen"
 
+#: gajim/data/gui/bookmarks.ui:176
+msgid "Autojoin"
+msgstr "Automatisch deelnemen"
+
+#: gajim/data/gui/bookmarks.ui:211
+msgid "_Apply"
+msgstr ""
+
 #: gajim/data/gui/history_manager.ui:11
 msgid "_Export"
 msgstr "_Exporteren"
@@ -7855,12 +8199,13 @@ msgid "Gajim History Logs Manager"
 msgstr "Gajim-logboekbeheer"
 
 #: gajim/data/gui/history_manager.ui:108
+#, fuzzy
 msgid ""
-"This log manager is not intended for log viewing. If you are looking for "
-"such functionality, use the history window instead.\n"
+"This history manager is not intended for viewing chat history. If you are "
+"looking for such functionality, please use the history window instead.\n"
 "\n"
-"Use this program to delete or export logs. You can select logs from the left "
-"and/or search database from below."
+"You can use this program to delete or export history. Either select logs "
+"from the left or search the database."
 msgstr ""
 "Deze logbeheerder is niet bedoeld voor het bekijken van logboeken. Als je "
 "naar die functie op zoek bent, gebruik dan het geschiedenisvenster.\n"
@@ -7908,7 +8253,8 @@ msgid "Select an emoji"
 msgstr "Selecteer een emoji"
 
 #: gajim/data/gui/shortcuts_window.ui:38
-msgid "Complete a command or a nick"
+#, fuzzy
+msgid "Complete a command or a nickname"
 msgstr "Opdracht of bijnaam aanvullen"
 
 #: gajim/data/gui/shortcuts_window.ui:45
@@ -7943,7 +8289,7 @@ msgstr "Omhoog scrollen"
 msgid "Scroll down"
 msgstr "Omlaag scrollen"
 
-#: gajim/data/gui/shortcuts_window.ui:100 gajim/gtk/xml_console.py:72
+#: gajim/data/gui/shortcuts_window.ui:100 gajim/gtk/xml_console.py:69
 msgid "Clear"
 msgstr "Wissen"
 
@@ -7984,8 +8330,9 @@ msgid "Close chat"
 msgstr "Gesprek sluiten"
 
 #: gajim/data/gui/shortcuts_window.ui:173
-msgid "Roster Shortcuts"
-msgstr "Roostersneltoetsen"
+#, fuzzy
+msgid "Contact List Shortcuts"
+msgstr "Gesprekssneltoetsen"
 
 #: gajim/data/gui/shortcuts_window.ui:196
 msgid "File transfers"
@@ -8012,7 +8359,8 @@ msgid "Show only active contacts"
 msgstr "Alleen actieve contacten weergeven"
 
 #: gajim/data/gui/shortcuts_window.ui:251
-msgid "Enable roster filtering"
+#, fuzzy
+msgid "Enable contact list filtering"
 msgstr "Roosterfilters inschakelen"
 
 #: gajim/data/gui/shortcuts_window.ui:259
@@ -8052,11 +8400,13 @@ msgid "Search selected day only"
 msgstr "Enkel geselecteerde dag doorzoeken"
 
 #: gajim/data/gui/history_window.ui:317
-msgid "Record history for this chat"
+#, fuzzy
+msgid "Store history for this chat"
 msgstr "Geschiedenis bijhouden voor dit gesprek"
 
 #: gajim/data/gui/history_window.ui:332
-msgid "Record History"
+#, fuzzy
+msgid "Store History"
 msgstr "Geschiedenis bijhouden"
 
 #: gajim/data/gui/history_window.ui:350
@@ -8075,8 +8425,8 @@ msgstr "Nieuwe post maken"
 msgid "Fill in the form."
 msgstr "Vul het formulier in."
 
-#: gajim/data/gui/data_form_window.ui:229
-msgid "Room Configuration"
+#: gajim/data/gui/data_form_window.ui:229 gajim/gtk/groupchat_config.py:41
+msgid "Group Chat Configuration"
 msgstr "Groepsgespreksconfiguratie"
 
 #: gajim/data/gui/roster_item_exchange_window.ui:39
@@ -8098,15 +8448,15 @@ msgstr "Sta_tus"
 msgid "_Start Chat..."
 msgstr "Ge_sprek beginnen…"
 
-#: gajim/data/gui/systray_context_menu.ui:50
+#: gajim/data/gui/systray_context_menu.ui:43
 msgid "Show All Pending _Events"
 msgstr "Toon alle wachtende gebeurt_enissen"
 
-#: gajim/data/gui/systray_context_menu.ui:59
+#: gajim/data/gui/systray_context_menu.ui:52
 msgid "Mute Sounds"
 msgstr "Geluiden dempen"
 
-#: gajim/data/gui/systray_context_menu.ui:75
+#: gajim/data/gui/systray_context_menu.ui:68
 msgid "_Preferences"
 msgstr "_Voorkeuren"
 
@@ -8195,35 +8545,35 @@ msgstr "Expressie uitvoeren in een shell, uitvoer tonen"
 msgid "Execute expression inside a shell, send output"
 msgstr "Expressie uitvoeren in een shell, uitvoer sturen"
 
-#: gajim/command_system/implementation/standard.py:45
+#: gajim/command_system/implementation/standard.py:47
 msgid ""
 "Show help on a given command or a list of available commands if -a is given"
 msgstr ""
 "Toon hulp voor een gegeven opdracht, of een lijst van beschikbare opdrachten "
 "indien ‘-a’ opgegeven is"
 
-#: gajim/command_system/implementation/standard.py:73
+#: gajim/command_system/implementation/standard.py:75
 msgid "Send a message to the contact"
 msgstr "Een bericht naar het contact sturen"
 
-#: gajim/command_system/implementation/standard.py:78
+#: gajim/command_system/implementation/standard.py:80
 msgid "Send action (in the third person) to the current chat"
 msgstr "Stuur actie (in de derde persoon) naar het huidige gesprek"
 
-#: gajim/command_system/implementation/standard.py:83
+#: gajim/command_system/implementation/standard.py:85
 msgid "Show logged messages which mention given text"
 msgstr "Opgeslagen berichten waarin de opgegeven tekst voorkomt weergeven"
 
-#: gajim/command_system/implementation/standard.py:88
+#: gajim/command_system/implementation/standard.py:90
 #, python-format
 msgid "%s: Nothing found"
 msgstr "%s: niets gevonden"
 
-#: gajim/command_system/implementation/standard.py:94
+#: gajim/command_system/implementation/standard.py:96
 msgid "Limit must be an integer"
 msgstr "Limiet moet een geheel getal zijn"
 
-#: gajim/command_system/implementation/standard.py:118
+#: gajim/command_system/implementation/standard.py:120
 msgid ""
 "\n"
 "    Set the current status\n"
@@ -8239,119 +8589,129 @@ msgstr ""
 "    online, away, chat, xa, dnd.\n"
 "    "
 
-#: gajim/command_system/implementation/standard.py:136
+#: gajim/command_system/implementation/standard.py:138
 msgid "Set the current status to away"
 msgstr "Stel de huidige status in als even weg"
 
-#: gajim/command_system/implementation/standard.py:150
+#: gajim/command_system/implementation/standard.py:152
 msgid "Set the current status to online"
 msgstr "Stel de huidige status in als beschikbaar"
 
-#: gajim/command_system/implementation/standard.py:153
+#: gajim/command_system/implementation/standard.py:155
 msgid "Available"
 msgstr "Beschikbaar"
 
-#: gajim/command_system/implementation/standard.py:173
-#: gajim/command_system/implementation/standard.py:250
+#: gajim/command_system/implementation/standard.py:175
+#: gajim/command_system/implementation/standard.py:252
 msgid "Clear the text window"
 msgstr "Wis het tekstvenster"
 
-#: gajim/command_system/implementation/standard.py:178
-#: gajim/command_system/implementation/standard.py:397
+#: gajim/command_system/implementation/standard.py:180
+#: gajim/command_system/implementation/standard.py:401
 msgid "Send a ping to the contact"
 msgstr "Stuur een ping naar het contact"
 
-#: gajim/command_system/implementation/standard.py:181
-#: gajim/command_system/implementation/standard.py:400
+#: gajim/command_system/implementation/standard.py:183
+#: gajim/command_system/implementation/standard.py:404
 msgid "Command is not supported for zeroconf accounts"
 msgstr "Opdracht wordt niet ondersteund voor zeroconf-accounts"
 
-#: gajim/command_system/implementation/standard.py:185
-msgid "Send DTMF sequence through an open audio session"
+#: gajim/command_system/implementation/standard.py:187
+#, fuzzy
+msgid "Send DTMF sequence through an open voice chat"
 msgstr "DTMF-sequentie sturen via een open audiosessie"
 
-#: gajim/command_system/implementation/standard.py:188
-msgid "No open audio sessions with the contact"
+#: gajim/command_system/implementation/standard.py:190
+#, fuzzy
+msgid "No open voice chats with the contact"
 msgstr "Geen open audiosessies met het contact"
 
-#: gajim/command_system/implementation/standard.py:191
+#: gajim/command_system/implementation/standard.py:193
 #, python-format
 msgid "%s is not a valid tone"
 msgstr "%s is geen geldige toon"
 
-#: gajim/command_system/implementation/standard.py:198
-msgid "Toggle audio session"
-msgstr "Audiosessie in-/uitschakelen"
+#: gajim/command_system/implementation/standard.py:200
+msgid "Toggle Voice Chat"
+msgstr ""
 
-#: gajim/command_system/implementation/standard.py:201
-msgid "Audio sessions are not available"
-msgstr "Audiosessies zijn niet beschikbaar"
+#: gajim/command_system/implementation/standard.py:203
+#, fuzzy
+msgid "Voice chats are not available"
+msgstr "Videosessies zijn niet beschikbaar"
 
-#: gajim/command_system/implementation/standard.py:208
-msgid "Toggle video session"
+#: gajim/command_system/implementation/standard.py:210
+#, fuzzy
+msgid "Toggle Video Chat"
 msgstr "Videosessie in-/uitschakelen"
 
-#: gajim/command_system/implementation/standard.py:211
-msgid "Video sessions are not available"
+#: gajim/command_system/implementation/standard.py:213
+#, fuzzy
+msgid "Video chats are not available"
 msgstr "Videosessies zijn niet beschikbaar"
 
-#: gajim/command_system/implementation/standard.py:218
+#: gajim/command_system/implementation/standard.py:220
 msgid "Send a message to the contact that will attract their attention"
 msgstr "Stuur een bericht naar het contact dat zijn/haar aandacht zal trekken"
 
-#: gajim/command_system/implementation/standard.py:255
+#: gajim/command_system/implementation/standard.py:257
 msgid "Change your nickname in a group chat"
 msgstr "Je bijnaam veranderen in een groepsgesprek"
 
-#: gajim/command_system/implementation/standard.py:260 gajim/gtk/dialogs.py:674
-#: gajim/gtk/bookmarks.py:272
+#: gajim/command_system/implementation/standard.py:262
 msgid "Invalid nickname"
 msgstr "Ongeldige bijnaam"
 
-#: gajim/command_system/implementation/standard.py:267
-msgid "Open a private chat window with a specified occupant"
+#: gajim/command_system/implementation/standard.py:269
+#, fuzzy
+msgid "Open a private chat window with a specified participant"
 msgstr "Open een privé-gespreksvenster met opgegeven lid"
 
-#: gajim/command_system/implementation/standard.py:273
-#: gajim/command_system/implementation/standard.py:282
-#: gajim/command_system/implementation/standard.py:332
-#: gajim/command_system/implementation/standard.py:345
-#: gajim/command_system/implementation/standard.py:357
+#: gajim/command_system/implementation/standard.py:275
+#: gajim/command_system/implementation/standard.py:284
+#: gajim/command_system/implementation/standard.py:336
+#: gajim/command_system/implementation/standard.py:349
+#: gajim/command_system/implementation/standard.py:361
 msgid "Nickname not found"
 msgstr "Bijnaam niet gevonden"
 
-#: gajim/command_system/implementation/standard.py:276
+#: gajim/command_system/implementation/standard.py:278
+#, fuzzy
 msgid ""
-"Open a private chat window with a specified occupant and send him a message"
+"Open a private chat window with a specified participant and send him a "
+"message"
 msgstr ""
 "Open een privé-gespreksvenster met opgegeven lid en stuur hem/haar een "
 "bericht"
 
-#: gajim/command_system/implementation/standard.py:285
+#: gajim/command_system/implementation/standard.py:287
 msgid "Display or change a group chat topic"
 msgstr "Onderwerp van groepsgesprek weergeven of wijzigen"
 
-#: gajim/command_system/implementation/standard.py:294
-msgid "Invite a user to a room for a reason"
+#: gajim/command_system/implementation/standard.py:296
+#, fuzzy
+msgid "Invite a user to a group chat for a reason"
 msgstr "Nodig een gebruiker uit in een groepsgesprek voor een reden"
 
-#: gajim/command_system/implementation/standard.py:297
+#: gajim/command_system/implementation/standard.py:299
 #, python-format
 msgid "Invited %(jid)s to %(room_jid)s"
 msgstr "%(jid)s uitgenodigd in %(room_jid)s"
 
-#: gajim/command_system/implementation/standard.py:301
-msgid "Join a group chat given by a JID"
+#: gajim/command_system/implementation/standard.py:303
+#, fuzzy
+msgid "Join a group chat given by an XMPP Address"
 msgstr "Deelnemen aan groepsgesprek met JID"
 
-#: gajim/command_system/implementation/standard.py:309
+#: gajim/command_system/implementation/standard.py:313
+#, fuzzy
 msgid ""
-"Leave the groupchat, optionally giving a reason, and close tab or window"
+"Leave the group chat, optionally giving a reason, and close tab or window"
 msgstr ""
 "Verlaat het groepsgesprek, geef indien gewenst een reden en sluit het "
 "tabblad of venster"
 
-#: gajim/command_system/implementation/standard.py:314
+#: gajim/command_system/implementation/standard.py:318
 msgid ""
 "\n"
 "    Ban user by a nick or a JID from a groupchat\n"
@@ -8367,13 +8727,15 @@ msgstr ""
 "worden.\n"
 "    "
 
-#: gajim/command_system/implementation/standard.py:329
-msgid "Kick user by a nick from a groupchat"
+#: gajim/command_system/implementation/standard.py:333
+#, fuzzy
+msgid "Kick user by a nick from a group chat"
 msgstr "Schop gebruiker met bijnaam uit een groepsgesprek"
 
-#: gajim/command_system/implementation/standard.py:338
+#: gajim/command_system/implementation/standard.py:342
+#, fuzzy
 msgid ""
-"Set occupant role in group chat.\n"
+"Set participant role in group chat.\n"
 "    Role can be given as one of the following values:\n"
 "    moderator, participant, visitor, none"
 msgstr ""
@@ -8381,13 +8743,14 @@ msgstr ""
 "    Rol kan een van volgende waarden zijn:\n"
 "    moderator, participant, visitor, none"
 
-#: gajim/command_system/implementation/standard.py:343
+#: gajim/command_system/implementation/standard.py:347
 msgid "Invalid role given"
 msgstr "Ongeldige gegeven rol"
 
-#: gajim/command_system/implementation/standard.py:350
+#: gajim/command_system/implementation/standard.py:354
+#, fuzzy
 msgid ""
-"Set occupant affiliation in group chat.\n"
+"Set participant affiliation in group chat.\n"
 "    Affiliation can be given as one of the following values:\n"
 "    owner, admin, member, outcast, none"
 msgstr ""
@@ -8396,20 +8759,23 @@ msgstr ""
 "    owner (eigenaar), admin (administrator), member (lid), outcast "
 "(verschoppeling), none (geen)"
 
-#: gajim/command_system/implementation/standard.py:355
+#: gajim/command_system/implementation/standard.py:359
 msgid "Invalid affiliation given"
 msgstr "Ongeldige aansluiting gegeven"
 
-#: gajim/command_system/implementation/standard.py:365
-msgid "Display names of all group chat occupants"
+#: gajim/command_system/implementation/standard.py:369
+#, fuzzy
+msgid "Display names of all group chat participants"
 msgstr "Namen van alle deelnemers aan het groepsgesprek weergeven"
 
-#: gajim/command_system/implementation/standard.py:387
-msgid "Forbid an occupant to send you public or private messages"
+#: gajim/command_system/implementation/standard.py:391
+#, fuzzy
+msgid "Forbid a participant to send you public or private messages"
 msgstr "Verbied een deelnemer van je openbare of privéberichten te sturen"
 
-#: gajim/command_system/implementation/standard.py:392
-msgid "Allow an occupant to send you public or private messages"
+#: gajim/command_system/implementation/standard.py:396
+#, fuzzy
+msgid "Allow a participant to send you public or private messages"
 msgstr "Laat een deelnemer toe je openbare of privéberichten te sturen"
 
 #: gajim/command_system/implementation/middleware.py:74
@@ -8420,199 +8786,336 @@ msgstr "Fout tijdens uitvoeren van commando!"
 msgid "The same as using a doc-string, except it supports translation"
 msgstr "The same as using a doc-string, except it supports translation"
 
-#: gajim/gtk/filetransfer.py:91
+#: gajim/gtk/groupchat_info.py:36
+#, fuzzy
+msgid "?Group chat feature:Archiving"
+msgstr "Uitnodiging voor groepsgesprek"
+
+#: gajim/gtk/groupchat_info.py:37
+#, fuzzy
+msgid "Messages are archived on the server"
+msgstr "Deze sessie ZAL gearchiveerd worden op de server"
+
+#: gajim/gtk/groupchat_info.py:40
+#, fuzzy
+msgid "?Group chat feature:Persistent"
+msgstr "Ondersteuning voor groepsgesprekken"
+
+#: gajim/gtk/groupchat_info.py:41
+msgid "This group chat persists even if there are no participants"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:45
+#, fuzzy
+msgid "?Group chat feature:Temporary"
+msgstr "?Contactrol voor groepsgesprek:Geen"
+
+#: gajim/gtk/groupchat_info.py:46
+msgid "This group chat will be destroyed once the last participant left"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:50
+#, fuzzy
+msgid "?Group chat feature:Moderated"
+msgstr "?Contactrol voor groepsgesprek:Geen"
+
+#: gajim/gtk/groupchat_info.py:51
+msgid ""
+"Participants entering this group chat need to request permission to send "
+"messages"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:55
+#, fuzzy
+msgid "?Group chat feature:Not Moderated"
+msgstr "Ondersteuning voor groepsgesprekken"
+
+#: gajim/gtk/groupchat_info.py:56
+msgid "Participants entering this group chat are allowed to send messages"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:60
+#, fuzzy
+msgid "?Group chat feature:Open"
+msgstr "?Contactrol voor groepsgesprek:Geen"
+
+#: gajim/gtk/groupchat_info.py:61
+#, fuzzy
+msgid "Anyone can join this group chat"
+msgstr "%s neemt nu deel aan het groepsgesprek"
+
+#: gajim/gtk/groupchat_info.py:64
+#, fuzzy
+msgid "?Group chat feature:Members Only"
+msgstr "Markering in groepsgesprek"
+
+#: gajim/gtk/groupchat_info.py:65
+#, 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:69
+#, fuzzy
+msgid "?Group chat feature:Public"
+msgstr "Markering in groepsgesprek"
+
+#: gajim/gtk/groupchat_info.py:70
+msgid "Group chat can be found via search"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:73
+#, fuzzy
+msgid "?Group chat feature:Hidden"
+msgstr "?Contactrol voor groepsgesprek:Geen"
+
+#: gajim/gtk/groupchat_info.py:74
+#, fuzzy
+msgid "This group chat can not be found via search"
+msgstr "Deze ruimte heeft geen onderwerp"
+
+#: gajim/gtk/groupchat_info.py:77
+#, fuzzy
+msgid "?Group chat feature:Not Anonymous"
+msgstr "Ondersteuning voor groepsgesprekken"
+
+#: gajim/gtk/groupchat_info.py:78
+#, 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:82
+#, fuzzy
+msgid "?Group chat feature:Semi-Anonymous"
+msgstr "Markering in groepsgesprek"
+
+#: gajim/gtk/groupchat_info.py:83
+#, 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:86
+#, fuzzy
+msgid "?Group chat feature:Password Required"
+msgstr "Ondersteuning voor groepsgesprekken"
+
+#: gajim/gtk/groupchat_info.py:87
+msgid "This group chat does require a password upon entry"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:91
+#, fuzzy
+msgid "?Group chat feature:No Password Required"
+msgstr "Ondersteuning voor groepsgesprekken"
+
+#: gajim/gtk/groupchat_info.py:92
+msgid "This group chat does not require a password upon entry"
+msgstr ""
+
+#: gajim/gtk/filetransfer.py:90
 msgid "File"
 msgstr "Bestand"
 
-#: gajim/gtk/filetransfer.py:108
+#: gajim/gtk/filetransfer.py:107
 msgid "Time"
 msgstr "Duur"
 
-#: gajim/gtk/filetransfer.py:228
+#: gajim/gtk/filetransfer.py:227
 #, fuzzy, python-format
 msgid "File name: %s"
 msgstr "Bestandsnaam: %s"
 
-#: gajim/gtk/filetransfer.py:229 gajim/gtk/filetransfer.py:464
+#: gajim/gtk/filetransfer.py:228 gajim/gtk/filetransfer.py:469
 #, python-format
 msgid "Size: %s"
 msgstr "Grootte: %s"
 
-#: gajim/gtk/filetransfer.py:239
+#: gajim/gtk/filetransfer.py:238
 #, python-format
 msgid "Sender: %s"
 msgstr "Afzender: %s"
 
-#: gajim/gtk/filetransfer.py:240 gajim/gtk/filetransfer.py:744
+#: gajim/gtk/filetransfer.py:239 gajim/gtk/filetransfer.py:749
 #: gajim/gtk/tooltips.py:577
 msgid "Recipient: "
 msgstr "Ontvanger: "
 
-#: gajim/gtk/filetransfer.py:251
+#: gajim/gtk/filetransfer.py:250
 #, python-format
 msgid "Saved in: %s"
 msgstr "Opgeslagen in: %s"
 
-#: gajim/gtk/filetransfer.py:256
+#: gajim/gtk/filetransfer.py:255
 msgid "File transfer completed"
 msgstr "Bestandsoverdracht afgerond"
 
-#: gajim/gtk/filetransfer.py:276 gajim/gtk/filetransfer.py:285
+#: gajim/gtk/filetransfer.py:275 gajim/gtk/filetransfer.py:284
 #, fuzzy
 msgid "Connection with peer could not be established."
 msgstr "Kon geen verbinding maken met gebruiker."
 
-#: gajim/gtk/filetransfer.py:293
+#: gajim/gtk/filetransfer.py:292
 #, python-format
 msgid "Filename: %s"
 msgstr "Bestandsnaam: %s"
 
-#: gajim/gtk/filetransfer.py:294
+#: gajim/gtk/filetransfer.py:293
 #, python-format
 msgid "Recipient: %s"
 msgstr "Ontvanger: %s"
 
-#: gajim/gtk/filetransfer.py:296
+#: gajim/gtk/filetransfer.py:295
 #, python-format
 msgid "Error message: %s"
 msgstr "Foutbericht: %s"
 
-#: gajim/gtk/filetransfer.py:333
-#, fuzzy
-msgid "File transfer error"
-msgstr "Fout bij bestandsoverdracht"
-
 #: gajim/gtk/filetransfer.py:334
-#, python-format
+#, fuzzy, python-format
 msgid ""
-"The file %(file)s has been received, but it seems to have been damaged along "
-"the way.\n"
+"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 ""
 "Het bestand %(file)s is ontvangen, maar lijkt onderweg beschadigd te zijn.\n"
 "Wil je het opnieuw downloaden?"
 
-#: gajim/gtk/filetransfer.py:350
+#: gajim/gtk/filetransfer.py:340
+#, fuzzy
+msgid "_Download Again"
+msgstr "Vraag mij _dit niet nogmaals"
+
+#: gajim/gtk/filetransfer.py:355
 msgid "Gajim can not read this file"
 msgstr "Gajim kan dit bestand niet lezen"
 
-#: gajim/gtk/filetransfer.py:351
+#: gajim/gtk/filetransfer.py:356
 msgid "Another process is using this file."
 msgstr "Dit bestand is in gebruik door een ander proces."
 
-#: gajim/gtk/filetransfer.py:418
+#: gajim/gtk/filetransfer.py:423
 #, fuzzy
 msgid "File Transfer Conflict"
 msgstr "Bestandsoverdracht voltooid"
 
-#: gajim/gtk/filetransfer.py:419
+#: gajim/gtk/filetransfer.py:424
 msgid "This file already exists"
 msgstr "Dit bestands bestaat al"
 
-#: gajim/gtk/filetransfer.py:420
+#: gajim/gtk/filetransfer.py:425
 msgid "Resume download or replace file?"
 msgstr ""
 
-#: gajim/gtk/filetransfer.py:424
+#: gajim/gtk/filetransfer.py:429
 #, fuzzy
 msgid "Replace _File"
 msgstr "Ver_vangen"
 
-#: gajim/gtk/filetransfer.py:427
+#: gajim/gtk/filetransfer.py:432
 #, fuzzy
 msgid "Resume _Download"
 msgstr "?Znw:Download"
 
-#: gajim/gtk/filetransfer.py:437
+#: gajim/gtk/filetransfer.py:442
 #, fuzzy, python-format
 msgid "Directory '%s' is not writable"
 msgstr "Map ‘%s’ is niet schrijfbaar"
 
-#: gajim/gtk/filetransfer.py:438
+#: gajim/gtk/filetransfer.py:443
 #, fuzzy
 msgid "You do not have permissions to create files in this directory."
 msgstr "Je hebt geen toestemming om bestanden aan te maken in deze map."
 
-#: gajim/gtk/filetransfer.py:461
+#: gajim/gtk/filetransfer.py:466
 #, python-format
 msgid "File: %s"
 msgstr "Bestand: %s"
 
-#: gajim/gtk/filetransfer.py:467
+#: gajim/gtk/filetransfer.py:472
 #, python-format
 msgid "Type: %s"
 msgstr "Type: %s"
 
-#: gajim/gtk/filetransfer.py:469
+#: gajim/gtk/filetransfer.py:474
 #, python-format
 msgid "Description: %s"
 msgstr "Beschrijving: %s"
 
-#: gajim/gtk/filetransfer.py:480
+#: gajim/gtk/filetransfer.py:485
 #, fuzzy, python-format
 msgid "%s wants to send you a file"
 msgstr "%s wil je een bestand sturen."
 
-#: gajim/gtk/filetransfer.py:509
+#: gajim/gtk/filetransfer.py:514
 msgid "Checking file…"
 msgstr "Bestand wordt gecontroleerd…"
 
-#: gajim/gtk/filetransfer.py:524
+#: gajim/gtk/filetransfer.py:529
 msgid "File error"
 msgstr "Bestandsfout"
 
-#: gajim/gtk/filetransfer.py:561
+#: gajim/gtk/filetransfer.py:566
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 
-#: gajim/gtk/filetransfer.py:658
+#: gajim/gtk/filetransfer.py:663
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/s)"
 
-#: gajim/gtk/filetransfer.py:711 gajim/gtk/filetransfer.py:715
+#: gajim/gtk/filetransfer.py:716 gajim/gtk/filetransfer.py:720
 msgid "Invalid File"
 msgstr "Ongeldig bestand"
 
-#: gajim/gtk/filetransfer.py:711
+#: gajim/gtk/filetransfer.py:716
 msgid "File: "
 msgstr "Bestand: "
 
-#: gajim/gtk/filetransfer.py:716
+#: gajim/gtk/filetransfer.py:721
 msgid "It is not possible to send empty files"
 msgstr "Het is onmogelijk lege bestanden te sturen"
 
-#: gajim/gtk/filetransfer.py:742 gajim/gtk/tooltips.py:571
+#: gajim/gtk/filetransfer.py:747 gajim/gtk/tooltips.py:571
 msgid "Sender: "
 msgstr "Afzender: "
 
-#: gajim/gtk/filetransfer.py:1038
+#: gajim/gtk/filetransfer.py:1043
 msgid "Choose a File to Send…"
 msgstr "Kies een bestand om te verzenden…"
 
 #: gajim/gtk/start_chat.py:51
-msgid "Start new Conversation"
+#, fuzzy
+msgid "Start New Conversation"
 msgstr "Nieuw gesprek starten"
 
-#: gajim/gtk/start_chat.py:424
-msgid "New Groupchat"
-msgstr "Nieuw groepsgesprek"
+#: gajim/gtk/start_chat.py:260 gajim/gtk/start_chat.py:328
+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:426
-msgid "New Contact"
-msgstr "Nieuw contact"
+#: gajim/gtk/start_chat.py:603 gajim/gtk/groupchat_join.py:38
+msgid "Join Group Chat"
+msgstr "Deelnemen aan groepsgesprek"
 
-#: gajim/gtk/start_chat.py:588
-#, python-format
-msgid "%s Group chats found"
+#: gajim/gtk/start_chat.py:605 gajim/gtk/add_contact.py:40
+msgid "Add Contact"
+msgstr "Contact toevoegen"
+
+#: gajim/gtk/start_chat.py:746
+#, fuzzy, python-format
+msgid "%s group chats found"
 msgstr "%s groepsgesprekken gevonden"
 
-#: gajim/gtk/discovery.py:70
+#: gajim/gtk/discovery.py:69
 msgid "This service has not yet responded with detailed information"
 msgstr "Deze dienst heeft nog niet geantwoord met gedetailleerde informatie"
 
-#: gajim/gtk/discovery.py:71
+#: gajim/gtk/discovery.py:70
 #, fuzzy
 msgid ""
 "This service could not respond with detailed information.\n"
@@ -8621,33 +9124,34 @@ msgstr ""
 "Deze dienst kon niet antwoorden met gedetailleerde informatie.\n"
 "Het is waarschijnlijk verouderd of kapot"
 
-#: gajim/gtk/discovery.py:128
+#: gajim/gtk/discovery.py:126
 msgid "Others"
 msgstr "Overigen"
 
-#: gajim/gtk/discovery.py:131
-msgid "Conference"
-msgstr "Groepsgesprek"
+#: gajim/gtk/discovery.py:129
+#, fuzzy
+msgid "Group Chat"
+msgstr "_Groupsgesprek"
 
-#: gajim/gtk/discovery.py:519
+#: gajim/gtk/discovery.py:518
 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:606
+#: gajim/gtk/discovery.py:605
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Dienstontdekking met account %s"
 
-#: gajim/gtk/discovery.py:608
+#: gajim/gtk/discovery.py:607
 msgid "Service Discovery"
 msgstr "Dienstontdekking"
 
-#: gajim/gtk/discovery.py:691
+#: gajim/gtk/discovery.py:690
 msgid "The service could not be found"
 msgstr "De dienst kon niet gevonden worden"
 
-#: gajim/gtk/discovery.py:692
+#: gajim/gtk/discovery.py:691
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -8655,99 +9159,79 @@ 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:699 gajim/gtk/discovery.py:1042
+#: gajim/gtk/discovery.py:698 gajim/gtk/discovery.py:1041
 msgid "The service is not browsable"
 msgstr "De dienst kan niet worden doorbladerd"
 
-#: gajim/gtk/discovery.py:700
+#: gajim/gtk/discovery.py:699
 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:738 gajim/gtk/discovery.py:747
+#: gajim/gtk/discovery.py:737 gajim/gtk/discovery.py:746
 msgid "Invalid Server Name"
 msgstr "Ongeldige servernaam"
 
-#: gajim/gtk/discovery.py:806
+#: gajim/gtk/discovery.py:805
 #, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Bladeren op %(address)s met account %(account)s"
 
-#: gajim/gtk/discovery.py:851
+#: gajim/gtk/discovery.py:850
 msgid "Browse"
 msgstr "Bladeren"
 
-#: gajim/gtk/discovery.py:1043
+#: gajim/gtk/discovery.py:1042
 msgid "This service does not contain any items to browse."
 msgstr "Deze dienst heeft geen items om te doorbladeren."
 
-#: gajim/gtk/discovery.py:1255
+#: gajim/gtk/discovery.py:1254
 #, fuzzy
 msgid "_Command"
 msgstr "Opdrachten"
 
-#: gajim/gtk/discovery.py:1264 gajim/gtk/discovery.py:1422
+#: gajim/gtk/discovery.py:1263 gajim/gtk/discovery.py:1420
 msgid "Re_gister"
 msgstr "Re_gistreren"
 
-#: gajim/gtk/discovery.py:1277
+#: gajim/gtk/discovery.py:1276
 msgid "_Search"
 msgstr "_Zoeken"
 
-#: gajim/gtk/discovery.py:1420
+#: gajim/gtk/discovery.py:1418
 msgid "_Edit"
 msgstr "B_ewerken"
 
-#: gajim/gtk/discovery.py:1458
+#: gajim/gtk/discovery.py:1456
 #, fuzzy, python-format
 msgid "Scanning %(current)d / %(total)d ..."
 msgstr "Onderzoeken van %(current)d / %(total)d…"
 
-#: gajim/gtk/discovery.py:1674
+#: gajim/gtk/discovery.py:1655
+msgid "Users"
+msgstr "Gebruikers"
+
+#: gajim/gtk/discovery.py:1671
 msgid "Id"
 msgstr "ID"
 
-#: gajim/gtk/discovery.py:1713
-msgid "_Join"
-msgstr "_Binnengaan"
-
-#: gajim/gtk/discovery.py:1736
-msgid "Bookmark already set"
-msgstr "Bladwijzer bestaat al"
-
-#: gajim/gtk/discovery.py:1737
-#, fuzzy, python-format
-msgid "Group Chat '%s' is already in your bookmarks."
-msgstr "Groepsgesprek ‘%s’ heeft al een bladwijzer."
-
-#: gajim/gtk/discovery.py:1748
-msgid "Bookmark has been added successfully"
-msgstr "Bladwijzer is met succes toegevoegd"
-
-#: gajim/gtk/discovery.py:1749
-#, fuzzy
-msgid ""
-"You can manage your bookmarks by clicking the Bookmarks menu item in your "
-"contact list."
-msgstr "Je kan bladwijzers beheren via het menu ‘Acties’ in je rooster."
-
-#: gajim/gtk/discovery.py:1950
+#: gajim/gtk/discovery.py:1900
 msgid "Subscribed"
 msgstr "Geabonneerd"
 
-#: gajim/gtk/discovery.py:1959
+#: gajim/gtk/discovery.py:1909
 msgid "Node"
 msgstr "Knooppunt"
 
-#: gajim/gtk/discovery.py:2028
+#: gajim/gtk/discovery.py:1978
 #, fuzzy
 msgid "_New post"
 msgstr "Nieuwe post"
 
-#: gajim/gtk/discovery.py:2037
+#: gajim/gtk/discovery.py:1987
 msgid "_Subscribe"
 msgstr "_Abonneer"
 
-#: gajim/gtk/discovery.py:2045
+#: gajim/gtk/discovery.py:1995
 msgid "_Unsubscribe"
 msgstr "Abonnement _opzeggen"
 
@@ -8795,7 +9279,7 @@ msgstr "Formulier %s"
 msgid "Characters typed: %s"
 msgstr "Teken niet toegestaan"
 
-#: gajim/gtk/single_message.py:274 gajim/gtk/xml_console.py:169
+#: gajim/gtk/single_message.py:274 gajim/gtk/xml_console.py:166
 msgid "Connection not available"
 msgstr "Verbinding niet beschikbaar"
 
@@ -8804,6 +9288,13 @@ msgstr "Verbinding niet beschikbaar"
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Zorg ervoor dat je verbinding hebt met ‘%s’."
 
+#: gajim/gtk/single_message.py:306
+#, 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:330
 #, python-format
 msgid "RE: %s"
@@ -8814,28 +9305,28 @@ msgstr "RE: %s"
 msgid "%s wrote:\n"
 msgstr "%s schreef:\n"
 
-#: gajim/gtk/pep_config.py:44
+#: gajim/gtk/pep_config.py:45
 #, fuzzy, python-format
 msgid "PEP Service Configuration (%s)"
 msgstr "PEP-dienstconfiguratie"
 
-#: gajim/gtk/pep_config.py:77
+#: gajim/gtk/pep_config.py:78
 #, fuzzy
 msgid "Service"
 msgstr "Server"
 
-#: gajim/gtk/pep_config.py:114
+#: gajim/gtk/pep_config.py:115
 msgid "PEP node was not removed"
 msgstr "PEP-knooppunt niet verwijderd"
 
-#: gajim/gtk/pep_config.py:115
+#: gajim/gtk/pep_config.py:116
 #, fuzzy, python-format
 msgid ""
 "PEP node %(node)s was not removed:\n"
 "%(message)s"
 msgstr "PEP-knooppunt %(node)s niet verwijderd: %(message)s"
 
-#: gajim/gtk/pep_config.py:146
+#: gajim/gtk/pep_config.py:147
 #, python-format
 msgid "Configure %s"
 msgstr "%s configureren"
@@ -8849,16 +9340,20 @@ msgstr "Registreren"
 msgid "Registration successful"
 msgstr "Registratie geslaagd"
 
-#: gajim/gtk/dialogs.py:54 gajim/gtk/dataform.py:659 gajim/gtk/adhoc.py:85
+#: gajim/gtk/service_registration.py:215
+msgid "Registration failed"
+msgstr "Registratie mislukt"
+
+#: gajim/gtk/dialogs.py:53 gajim/gtk/dataform.py:668 gajim/gtk/adhoc.py:86
 msgid "Cancel"
 msgstr "Annuleren"
 
-#: gajim/gtk/dialogs.py:129
+#: gajim/gtk/dialogs.py:128
 #, python-format
 msgid "Dictionary for language \"%s\" not available"
 msgstr "Woordenboek voor taal ‘%s’ niet beschikbaar"
 
-#: gajim/gtk/dialogs.py:130
+#: gajim/gtk/dialogs.py:129
 #, python-format
 msgid ""
 "You have to install the dictionary \"%s\" to use spellchecking, or choose "
@@ -8871,11 +9366,11 @@ msgstr ""
 "\n"
 "Functie voor markeren van verkeerd gespelde woorden zal niet gebruikt worden"
 
-#: gajim/gtk/dialogs.py:410 gajim/gtk/dialogs.py:425
+#: gajim/gtk/dialogs.py:322 gajim/gtk/dialogs.py:337
 msgid "Insecure connection"
 msgstr "Onveilige verbinding"
 
-#: gajim/gtk/dialogs.py:411
+#: gajim/gtk/dialogs.py:323
 #, python-format
 msgid ""
 "You are about to connect to the account %(account)s (%(server)s) insecurely. "
@@ -8888,28 +9383,24 @@ msgstr ""
 "onversleuteld worden verstuurd. Dit soort verbinding wordt sterk afgeraden.\n"
 "Ben je zeker dat je wil doorgaan?"
 
-#: gajim/gtk/dialogs.py:416
+#: gajim/gtk/dialogs.py:328
 msgid "Yes, I really want to connect insecurely"
 msgstr "Ja, ik wil echt onveilig verbinden"
 
-#: gajim/gtk/dialogs.py:417
+#: gajim/gtk/dialogs.py:329
 msgid "Gajim will NOT connect unless you check this box"
 msgstr "Gajim zal NIET verbinden tenzij je dit aanvinkt"
 
-#: gajim/gtk/dialogs.py:675
-msgid "The nickname contains invalid characters."
-msgstr "De bijnaam bevat ongeldige tekens."
-
-#: gajim/gtk/dialogs.py:734
+#: gajim/gtk/dialogs.py:561
 #, fuzzy, python-format
 msgid "Destroy %s"
 msgstr "%s vernietigen"
 
-#: gajim/gtk/dialogs.py:775
+#: gajim/gtk/dialogs.py:602
 msgid "Certificate"
 msgstr "Certificaat"
 
-#: gajim/gtk/dialogs.py:786
+#: gajim/gtk/dialogs.py:613
 #, python-format
 msgid ""
 "Certificate for account\n"
@@ -8918,98 +9409,98 @@ msgstr ""
 "Certificaat voor account\n"
 "%s"
 
-#: gajim/gtk/dialogs.py:824
+#: gajim/gtk/dialogs.py:651
 #, fuzzy
 msgid "Issued to\n"
 msgstr "Uitgegeven aan"
 
-#: gajim/gtk/dialogs.py:825 gajim/gtk/dialogs.py:830
+#: gajim/gtk/dialogs.py:652 gajim/gtk/dialogs.py:657
 #, fuzzy
 msgid "Common Name (CN): "
 msgstr "Algemene naam (CN)"
 
-#: gajim/gtk/dialogs.py:826 gajim/gtk/dialogs.py:831
+#: gajim/gtk/dialogs.py:653 gajim/gtk/dialogs.py:658
 #, fuzzy
 msgid "Organization (O): "
 msgstr "Organisatie (O)"
 
-#: gajim/gtk/dialogs.py:827 gajim/gtk/dialogs.py:832
+#: gajim/gtk/dialogs.py:654 gajim/gtk/dialogs.py:659
 #, fuzzy
 msgid "Organizational Unit (OU): "
 msgstr "Organisatorische eenheid (OU)"
 
-#: gajim/gtk/dialogs.py:828
+#: gajim/gtk/dialogs.py:655
 #, fuzzy
 msgid "Serial Number: "
 msgstr "Serienummer"
 
-#: gajim/gtk/dialogs.py:829
+#: gajim/gtk/dialogs.py:656
 #, fuzzy
 msgid "Issued by\n"
 msgstr "Uitgegeven door"
 
-#: gajim/gtk/dialogs.py:833
+#: gajim/gtk/dialogs.py:660
 #, fuzzy
 msgid "Validity\n"
 msgstr "Geldigheid"
 
-#: gajim/gtk/dialogs.py:834
+#: gajim/gtk/dialogs.py:661
 #, fuzzy
 msgid "Issued on: "
 msgstr "Uitgegeven op"
 
-#: gajim/gtk/dialogs.py:835
+#: gajim/gtk/dialogs.py:662
 #, fuzzy
 msgid "Expires on: "
 msgstr "Verloopt op"
 
-#: gajim/gtk/dialogs.py:836
+#: gajim/gtk/dialogs.py:663
 #, fuzzy
 msgid "SHA-1:"
 msgstr "SHA-1"
 
-#: gajim/gtk/dialogs.py:838
+#: gajim/gtk/dialogs.py:665
 #, fuzzy
 msgid "SHA-256:"
 msgstr "SHA-256"
 
-#: gajim/gtk/dialogs.py:852
+#: gajim/gtk/dialogs.py:679
 msgid "View certificate…"
 msgstr "Certificaat bekijken…"
 
-#: gajim/gtk/dialogs.py:864 gajim/gtk/accounts.py:893
+#: gajim/gtk/dialogs.py:691 gajim/gtk/accounts.py:896
 msgid "Change Password"
 msgstr "Verander wachtwoord"
 
-#: gajim/gtk/dialogs.py:878
+#: gajim/gtk/dialogs.py:705
 msgid "_OK"
 msgstr "_Oké"
 
-#: gajim/gtk/dialogs.py:891
+#: gajim/gtk/dialogs.py:718
 msgid "You must enter a password"
 msgstr "Je moet een wachtwoord opgeven"
 
-#: gajim/gtk/dialogs.py:895
+#: gajim/gtk/dialogs.py:722
 msgid "Passwords do not match"
 msgstr "Wachtwoord komt niet overeen"
 
-#: gajim/gtk/dialogs.py:923
+#: gajim/gtk/dialogs.py:750
 msgid "Group Chat Invitation "
 msgstr "Uitnodiging voor groepsgesprek"
 
-#: gajim/gtk/dialogs.py:948
+#: gajim/gtk/dialogs.py:775
 #, python-format
 msgid "<b>%s</b> has invited you to join a discussion"
 msgstr "<b>%s</b> heeft u uitgenodigd voor een gesprek"
 
-#: gajim/gtk/dialogs.py:951
+#: gajim/gtk/dialogs.py:778
 #, 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:959
+#: gajim/gtk/dialogs.py:786
 #, python-format
 msgid "Comment: %s"
 msgstr "Commentaar: %s"
@@ -9022,10 +9513,6 @@ msgstr "GG-nummer"
 msgid "ICQ Number"
 msgstr "ICQ-nummer"
 
-#: gajim/gtk/add_contact.py:40
-msgid "Add Contact"
-msgstr "Contact toevoegen"
-
 #: gajim/gtk/add_contact.py:259
 #, python-format
 msgid "%s Missing"
@@ -9046,7 +9533,8 @@ msgid "The user ID must not contain a resource."
 msgstr "De gebruikers-ID kan geen bron bevatten."
 
 #: gajim/gtk/add_contact.py:299
-msgid "You cannot add yourself to your roster."
+#, fuzzy
+msgid "You cannot add yourself to your contact list."
 msgstr "Je kan jezelf niet aan je rooster toevoegen."
 
 #: gajim/gtk/add_contact.py:304
@@ -9058,11 +9546,13 @@ msgid "Your account must be online to add new contacts."
 msgstr "Je account moet online zijn om nieuwe contacten toe te kunnen voegen"
 
 #: gajim/gtk/add_contact.py:321
-msgid "Contact already in roster"
+#, fuzzy
+msgid "Contact Already in Contact List"
 msgstr "Contact staat al in het rooster"
 
 #: gajim/gtk/add_contact.py:322
-msgid "This contact is already listed in your roster."
+#, fuzzy
+msgid "This contact is already in your contact list."
 msgstr "Dit contact staat al in je rooster."
 
 #: gajim/gtk/add_contact.py:379 gajim/gtk/add_contact.py:417
@@ -9102,11 +9592,13 @@ msgid "Chatstate Paused"
 msgstr "Chatstatus: gepauzeerd"
 
 #: gajim/gtk/themes.py:52
-msgid "MUC Tab New Directed Message"
+#, fuzzy
+msgid "Group Chat Tab New Directed Message"
 msgstr "MUC-tabblad nieuw gericht bericht"
 
 #: gajim/gtk/themes.py:56
-msgid "MUC Tab New Message"
+#, fuzzy
+msgid "Group Chat Tab New Message"
 msgstr "MUC-tabblad nieuw bericht"
 
 #: gajim/gtk/themes.py:60
@@ -9300,12 +9792,12 @@ msgstr "Alle bestanden"
 msgid "Clear File"
 msgstr "Bestand wissen"
 
-#: gajim/gtk/settings.py:570
+#: gajim/gtk/settings.py:570 gajim/gtk/proxies.py:32
 msgid "Manage Proxies"
 msgstr "Proxy’s beheren"
 
-#: gajim/gtk/settings.py:591 gajim/gtk/preferences.py:971
-#: gajim/gtk/preferences.py:984 gajim/gtk/preferences.py:988
+#: gajim/gtk/settings.py:591 gajim/gtk/preferences.py:968
+#: gajim/gtk/preferences.py:982 gajim/gtk/preferences.py:986
 msgid "No Proxy"
 msgstr "Geen proxy"
 
@@ -9395,13 +9887,15 @@ 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:47 data/org.gajim.Gajim.appdata.xml.in:10
-msgid "A GTK+ XMPP client"
+#: gajim/gtk/about.py:47 data/org.gajim.Gajim.desktop.in:6
+#: data/org.gajim.Gajim.appdata.xml.in:10
+#, fuzzy
+msgid "A GTK XMPP client"
 msgstr "Een GTK+ XMPP-cliënt"
 
 #: gajim/gtk/about.py:48
-#, python-format
-msgid "GTK+ Version: %s"
+#, fuzzy, python-format
+msgid "GTK Version: %s"
 msgstr "GTK+-versie: %s"
 
 #: gajim/gtk/about.py:49
@@ -9567,6 +10061,25 @@ msgstr "?overdrachtstatus:Gepauzeerd"
 msgid "?transfer status:Not started"
 msgstr "?overdrachtstatus:Gepauzeerd"
 
+#: gajim/gtk/groupchat_creation.py:97 gajim/gtk/groupchat_creation.py:99
+msgid " (optional)..."
+msgstr ""
+
+#: gajim/gtk/groupchat_creation.py:134
+#, fuzzy
+msgid "Invalid Address"
+msgstr "Ongeldig knooppunt"
+
+#: gajim/gtk/groupchat_creation.py:182
+#, fuzzy
+msgid "Not Connected"
+msgstr "Verbonden"
+
+#: gajim/gtk/groupchat_creation.py:183
+#, fuzzy
+msgid "You have to be connected to create a group chat."
+msgstr "Je neemt niet deel aan een groepsgesprek."
+
 #: gajim/gtk/sounds.py:39
 msgid "Wav Sounds"
 msgstr "WAV-geluiden"
@@ -9608,45 +10121,42 @@ msgstr "Vermeld in groepsgesprek"
 msgid "Group Chat Message Received"
 msgstr "Bericht ontvangen in groepsgesprek"
 
-#: gajim/gtk/dataform.py:226 gajim/gtk/dataform.py:262
+#: gajim/gtk/dataform.py:232 gajim/gtk/dataform.py:268
 msgid "Required"
 msgstr "Vereist"
 
-#: gajim/gtk/dataform.py:286
+#: gajim/gtk/dataform.py:293
 msgid "Yes"
 msgstr "Ja"
 
-#: gajim/gtk/dataform.py:286
+#: gajim/gtk/dataform.py:293
 msgid "No"
 msgstr "Nee"
 
-#: gajim/gtk/dataform.py:661
+#: gajim/gtk/dataform.py:670
 msgid "Submit"
 msgstr ""
 
-#: gajim/gtk/statusicon.py:213
+#: gajim/gtk/statusicon.py:206
 msgid "_Change Status Message…"
 msgstr "_Statusbericht wijzigen…"
 
-#: gajim/gtk/statusicon.py:247 gajim/gtk/statusicon.py:292
-#: gajim/gtk/statusicon.py:299
+#: gajim/gtk/statusicon.py:258
 #, python-format
 msgid "using account %s"
 msgstr "via account %s"
 
-#: gajim/gtk/statusicon.py:309
-msgid "_Manage Bookmarks…"
-msgstr "_Bladwijzers beheren…"
-
-#: gajim/gtk/statusicon.py:325
-msgid "Hide _Roster"
-msgstr "_Rooster verbergen"
+#: gajim/gtk/statusicon.py:269
+#, fuzzy
+msgid "Hide _Contact List"
+msgstr "_Contacten uitnodigen"
 
-#: gajim/gtk/statusicon.py:329
-msgid "Show _Roster"
-msgstr "_Rooster weergeven"
+#: gajim/gtk/statusicon.py:273
+#, fuzzy
+msgid "Show _Contact List"
+msgstr "Alleen actieve contacten weergeven"
 
-#: gajim/gtk/statusicon.py:337
+#: gajim/gtk/statusicon.py:281
 msgid "Hide this menu"
 msgstr "Verberg dit menu"
 
@@ -9691,33 +10201,6 @@ msgstr ""
 "Er trad een fout up bij het publiceren van je persoonlijke informatie, "
 "probeer het later opnieuw."
 
-#: gajim/gtk/join_groupchat.py:202
-msgid "Invalid Room"
-msgstr "Ongeldig groepsgesprek"
-
-#: gajim/gtk/join_groupchat.py:203
-msgid "Please choose a room"
-msgstr "Kies een groepsgesprek"
-
-#: gajim/gtk/join_groupchat.py:222 gajim/gtk/join_groupchat.py:229
-msgid "Invalid Nickname"
-msgstr "Ongeldige bijnaam"
-
-#: gajim/gtk/join_groupchat.py:223
-msgid "Please choose a nickname"
-msgstr "Kies een bijnaam"
-
-#: gajim/gtk/join_groupchat.py:282 gajim/gtk/join_groupchat.py:288
-#: gajim/gtk/join_groupchat.py:293
-msgid "Wrong server"
-msgstr "Verkeerde server"
-
-#: gajim/gtk/join_groupchat.py:283 gajim/gtk/join_groupchat.py:289
-#: gajim/gtk/join_groupchat.py:294
-#, python-format
-msgid "%s is not a groupchat server"
-msgstr "%s is geen groepsgespreksserver"
-
 #: gajim/gtk/mam_preferences.py:38
 #, python-format
 msgid "Archiving Preferences for %s"
@@ -9746,45 +10229,53 @@ msgstr "Fout ontvangen: {}"
 msgid "Archiving Preferences Error"
 msgstr "Archiefvoorkeuren"
 
-#: gajim/gtk/advanced_config.py:81
+#: gajim/gtk/advanced_config.py:95
 msgid "Activated"
 msgstr "Ingeschakeld"
 
-#: gajim/gtk/advanced_config.py:81
+#: gajim/gtk/advanced_config.py:95
 msgid "Deactivated"
 msgstr "Uitgeschakeld"
 
-#: gajim/gtk/advanced_config.py:83
-msgid "Boolean"
-msgstr "Boolean"
+#: gajim/gtk/advanced_config.py:97
+msgid "?config type:Boolean"
+msgstr ""
 
-#: gajim/gtk/advanced_config.py:84
-msgid "Integer"
-msgstr "Geheel getal"
+#: gajim/gtk/advanced_config.py:98
+msgid "?config type:Integer"
+msgstr ""
 
-#: gajim/gtk/advanced_config.py:85
-msgid "Text"
-msgstr "Tekst"
+#: gajim/gtk/advanced_config.py:99
+msgid "?config type:Text"
+msgstr ""
 
-#: gajim/gtk/advanced_config.py:97
-msgid "Preference Name"
+#: gajim/gtk/advanced_config.py:100
+msgid "?config type:Color"
+msgstr ""
+
+#: gajim/gtk/advanced_config.py:112
+#, fuzzy
+msgid "?config:Preference Name"
 msgstr "Voorkeurnaam"
 
-#: gajim/gtk/advanced_config.py:104
-msgid "Value"
-msgstr "Waarde"
+#: gajim/gtk/advanced_config.py:123
+#, fuzzy
+msgid "?config:Value"
+msgstr "Configureren"
 
-#: gajim/gtk/advanced_config.py:113
-msgid "Type"
-msgstr "Type"
+#: gajim/gtk/advanced_config.py:132
+msgid "?config:Type"
+msgstr ""
 
-#: gajim/gtk/advanced_config.py:168
-msgid "(None)"
-msgstr "(Niets)"
+#: gajim/gtk/advanced_config.py:187
+#, fuzzy
+msgid "?config description:None"
+msgstr "?Vragen (voor abonnering):Geen"
 
-#: gajim/gtk/advanced_config.py:299
-msgid "Hidden"
-msgstr "Verborgen"
+#: gajim/gtk/advanced_config.py:322
+#, fuzzy
+msgid "?password:Hidden"
+msgstr "Wachtwoord:"
 
 #: gajim/gtk/server_info.py:66
 msgid "Copy info to clipboard"
@@ -9795,8 +10286,8 @@ msgstr "Info kopiëren naar klembord"
 msgid "%(days)s days, %(hours)s hours"
 msgstr "%(days)s dagen, %(hours)s uur"
 
-#: gajim/gtk/server_info.py:218 gajim/gtk/accounts.py:749
-#: gajim/gtk/accounts.py:853
+#: gajim/gtk/server_info.py:218 gajim/gtk/accounts.py:752
+#: gajim/gtk/accounts.py:856
 msgid "Hostname"
 msgstr "Hostnaam"
 
@@ -9988,10 +10479,6 @@ 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_config.py:41
-msgid "Group Chat Configuration"
-msgstr "Groepsgespreksconfiguratie"
-
 #: gajim/gtk/groupchat_config.py:134
 msgid "A Group Chat needs at least one Owner"
 msgstr "Een groepsgesprek heeft minstens één eigenaar nodig"
@@ -10003,60 +10490,61 @@ msgstr ""
 "aan te passen"
 
 #: gajim/gtk/groupchat_config.py:399
-msgid "An entry with this Jabber-ID already exists"
+#, fuzzy
+msgid "An entry with this XMPP Address already exists"
 msgstr "Er bestaat al een item met deze Jabber-ID"
 
-#: gajim/gtk/adhoc.py:91
+#: gajim/gtk/adhoc.py:92
 msgid "Finish"
 msgstr "Voltooien"
 
-#: gajim/gtk/adhoc.py:97 gajim/gtk/adhoc.py:283
+#: gajim/gtk/adhoc.py:98 gajim/gtk/adhoc.py:284
 msgid "Commands"
 msgstr "Opdrachten"
 
-#: gajim/gtk/adhoc.py:103
+#: gajim/gtk/adhoc.py:104
 msgid "Next"
 msgstr "Volgende"
 
-#: gajim/gtk/adhoc.py:109
+#: gajim/gtk/adhoc.py:110
 msgid "Previous"
 msgstr "Vorige"
 
-#: gajim/gtk/adhoc.py:115
+#: gajim/gtk/adhoc.py:116
 msgid "Execute"
 msgstr "Uitvoeren"
 
-#: gajim/gtk/adhoc.py:195
+#: gajim/gtk/adhoc.py:196
 #, fuzzy
 msgid "No commands available"
 msgstr "Geen accounts beschikbaar"
 
-#: gajim/gtk/adhoc.py:244
+#: gajim/gtk/adhoc.py:245
 msgid "Request Command List"
 msgstr "Opdrachtlijst opvragen"
 
-#: gajim/gtk/adhoc.py:259
+#: gajim/gtk/adhoc.py:260
 msgid "Executing…"
 msgstr "Uitvoeren…"
 
-#: gajim/gtk/adhoc.py:266
+#: gajim/gtk/adhoc.py:267
 msgid "Command List"
 msgstr "Opdrachtlijst"
 
-#: gajim/gtk/adhoc.py:384
+#: gajim/gtk/adhoc.py:385
 msgid "Finished"
 msgstr "Voltooid"
 
-#: gajim/gtk/adhoc.py:453
+#: gajim/gtk/adhoc.py:454
 msgid "Execution failed"
 msgstr "Uitvoeren mislukt"
 
-#: gajim/gtk/blocking.py:37
+#: gajim/gtk/blocking.py:38
 #, python-format
 msgid "Blocking List for %s"
 msgstr "Blokkeringslijst voor %s"
 
-#: gajim/gtk/blocking.py:71
+#: gajim/gtk/blocking.py:72
 msgid "Error!"
 msgstr "Fout!"
 
@@ -10103,8 +10591,7 @@ msgstr "Ongeldige gebruikersnaam"
 msgid "You must provide a username to configure this account."
 msgstr "Je moet een gebruikersnaam invullen om deze account te configureren."
 
-#: gajim/gtk/account_wizard.py:252 gajim/gtk/bookmarks.py:290
-#: gajim/gtk/bookmarks.py:303
+#: gajim/gtk/account_wizard.py:252
 msgid "Invalid server"
 msgstr "Ongeldige server"
 
@@ -10120,7 +10607,7 @@ msgstr "Ongeldige invoer"
 msgid "Custom port must be a port number."
 msgstr "Aangepaste poort moet een geldig poortnummer zijn."
 
-#: gajim/gtk/account_wizard.py:405
+#: gajim/gtk/account_wizard.py:406
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -10135,15 +10622,15 @@ msgstr ""
 "SSL-fout: %(error)s\n"
 "Wil je nog steeds verbinden met deze server?"
 
-#: gajim/gtk/account_wizard.py:446 gajim/gtk/account_wizard.py:480
+#: gajim/gtk/account_wizard.py:447 gajim/gtk/account_wizard.py:481
 msgid "An error occurred during account creation"
 msgstr "Er is een fout opgetreden bij het aanmaken van de account"
 
-#: gajim/gtk/account_wizard.py:545
+#: gajim/gtk/account_wizard.py:546
 msgid "Account name is in use"
 msgstr "Accountnaam is al in gebruik"
 
-#: gajim/gtk/account_wizard.py:546
+#: gajim/gtk/account_wizard.py:547
 msgid "You already have an account using this name."
 msgstr "Je hebt al een account met deze naam."
 
@@ -10171,24 +10658,24 @@ msgstr "%(progress)s van %(total)s MiB verzonden"
 msgid "%(minutes)s min %(seconds)s sec"
 msgstr ""
 
-#: gajim/gtk/xml_console.py:77
+#: gajim/gtk/xml_console.py:74
 msgid "Filter"
 msgstr "Filteren"
 
-#: gajim/gtk/xml_console.py:82
+#: gajim/gtk/xml_console.py:79
 msgid "XML Input"
 msgstr "XML-invoer"
 
-#: gajim/gtk/xml_console.py:86
+#: gajim/gtk/xml_console.py:83
 msgid "Paste Last Input"
 msgstr ""
 
-#: gajim/gtk/xml_console.py:170
+#: gajim/gtk/xml_console.py:167
 #, fuzzy, python-format
 msgid "Please make sure you are connected with '%s'."
 msgstr "Zorg ervoor dat je verbinding hebt met ‘%s’."
 
-#: gajim/gtk/xml_console.py:182
+#: gajim/gtk/xml_console.py:177
 msgid "Invalid Node"
 msgstr "Ongeldig knooppunt"
 
@@ -10220,38 +10707,54 @@ msgstr "Zoeken"
 msgid "No results found"
 msgstr "Geen resultaten gevonden"
 
-#: gajim/gtk/preferences.py:358 gajim/gtk/preferences.py:362
+#: gajim/gtk/preferences.py:357 gajim/gtk/preferences.py:361
 msgid "Default"
 msgstr "Standaard"
 
-#: gajim/gtk/preferences.py:801
+#: gajim/gtk/preferences.py:798
 msgid "status message title"
 msgstr "statusberichttitel"
 
-#: gajim/gtk/preferences.py:802
+#: gajim/gtk/preferences.py:799
 msgid "status message text"
 msgstr "statusberichttekst"
 
+#: gajim/gtk/accounts.py:137
+#, fuzzy
+msgid "Re-Login"
+msgstr "Inloggen"
+
 #: gajim/gtk/accounts.py:138
-msgid "Relogin now?"
+#, fuzzy
+msgid "Re-Login now?"
 msgstr "Nu opnieuw inloggen?"
 
 #: gajim/gtk/accounts.py:139
-msgid "If you want all the changes to apply instantly, you must relogin."
+#, 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:191 gajim/gtk/accounts.py:975
+#: gajim/gtk/accounts.py:141
+msgid "_Later"
+msgstr ""
+
+#: gajim/gtk/accounts.py:143
+#, fuzzy
+msgid "_Re-Login"
+msgstr "Inloggen"
+
+#: gajim/gtk/accounts.py:194 gajim/gtk/accounts.py:978
 #, fuzzy
 msgid "Remove Account"
 msgstr "Account %s wordt verwijderd"
 
-#: gajim/gtk/accounts.py:192
+#: gajim/gtk/accounts.py:195
 #, fuzzy, python-format
 msgid "You still have open chats in your account %s"
 msgstr "Je hebt een gesprek geopend in account %s"
 
-#: gajim/gtk/accounts.py:193
+#: gajim/gtk/accounts.py:196
 #, fuzzy
 msgid ""
 "All chat and group chat windows will be closed.\n"
@@ -10260,110 +10763,110 @@ msgstr ""
 "Alle gespreks- en groepsgespreksvensters zullen worden gesloten. Wil je "
 "doorgaan?"
 
-#: gajim/gtk/accounts.py:424
+#: gajim/gtk/accounts.py:427
 #, fuzzy
 msgid "Back"
 msgstr "Zo terug"
 
-#: gajim/gtk/accounts.py:530
+#: gajim/gtk/accounts.py:533
 #, fuzzy
 msgid "Please check if Bonjour is installed."
 msgstr "Controleer of Avahi of Bonjour is geïnstalleerd."
 
-#: gajim/gtk/accounts.py:532
+#: gajim/gtk/accounts.py:535
 #, fuzzy
 msgid "Please check if Avahi is installed."
 msgstr "Controleer of Avahi of Bonjour is geïnstalleerd."
 
-#: gajim/gtk/accounts.py:569
+#: gajim/gtk/accounts.py:572
 msgid "Disable Account"
 msgstr "Account uitschakelen"
 
-#: gajim/gtk/accounts.py:570
+#: gajim/gtk/accounts.py:573
 #, python-format
 msgid "Account %s is still connected"
 msgstr "Account %s is nog verbonden"
 
-#: gajim/gtk/accounts.py:571
+#: gajim/gtk/accounts.py:574
 msgid ""
 "All chat and group chat windows will be closed. Do you want to continue?"
 msgstr ""
 "Alle gespreks- en groepsgespreksvensters zullen worden gesloten. Wil je "
 "doorgaan?"
 
-#: gajim/gtk/accounts.py:576
+#: gajim/gtk/accounts.py:579
 #, fuzzy
 msgid "_Disable Account"
 msgstr "Account uitschakelen"
 
-#: gajim/gtk/accounts.py:595
+#: gajim/gtk/accounts.py:598
 #, fuzzy
 msgid "Add Account"
 msgstr "Account toevoegen…"
 
-#: gajim/gtk/accounts.py:663
+#: gajim/gtk/accounts.py:666
 msgid "Label"
 msgstr "Label"
 
-#: gajim/gtk/accounts.py:667
+#: gajim/gtk/accounts.py:670
 msgid "Login"
 msgstr "Inloggen"
 
-#: gajim/gtk/accounts.py:670
+#: gajim/gtk/accounts.py:673
 msgid "Import Contacts"
 msgstr "Contacten importeren"
 
-#: gajim/gtk/accounts.py:674 gajim/gtk/accounts.py:870
+#: gajim/gtk/accounts.py:677 gajim/gtk/accounts.py:873
 msgid "Client Certificate"
 msgstr "Cliëntcertificaat"
 
-#: gajim/gtk/accounts.py:677 gajim/gtk/accounts.py:774
+#: gajim/gtk/accounts.py:680 gajim/gtk/accounts.py:777
 msgid "Connect on startup"
 msgstr "Verbinding maken bij opstarten"
 
-#: gajim/gtk/accounts.py:681 gajim/gtk/accounts.py:779
+#: gajim/gtk/accounts.py:684 gajim/gtk/accounts.py:782
 msgid "Save conversations for all contacts"
 msgstr "Gesprekken opslaan voor alle contacten"
 
-#: gajim/gtk/accounts.py:683 gajim/gtk/accounts.py:781
+#: gajim/gtk/accounts.py:686 gajim/gtk/accounts.py:784
 msgid "Store conversations on the harddrive"
 msgstr "Berichten opslaan op harde schijf"
 
-#: gajim/gtk/accounts.py:685 gajim/gtk/accounts.py:783
+#: gajim/gtk/accounts.py:688 gajim/gtk/accounts.py:786
 msgid "Global Status"
 msgstr "Globale status"
 
-#: gajim/gtk/accounts.py:687
+#: gajim/gtk/accounts.py:690
 msgid "Synchronise the status of all accounts"
 msgstr "Status van alle accounts synchroniseren"
 
-#: gajim/gtk/accounts.py:689
+#: gajim/gtk/accounts.py:692
 msgid "Use file transfer proxies"
 msgstr "Gebruik bestandsoverdrachtsproxies"
 
-#: gajim/gtk/accounts.py:705
+#: gajim/gtk/accounts.py:708
 #, fuzzy
 msgid "Idle Time"
 msgstr "Inactief sinds:"
 
-#: gajim/gtk/accounts.py:707
+#: gajim/gtk/accounts.py:710
 msgid "Disclose the time of your last activity"
 msgstr ""
 
-#: gajim/gtk/accounts.py:709
+#: gajim/gtk/accounts.py:712
 msgid "Local System Time"
 msgstr ""
 
-#: gajim/gtk/accounts.py:711
+#: gajim/gtk/accounts.py:714
 msgid "Disclose the local system time of the device Gajim runs on"
 msgstr ""
 
-#: gajim/gtk/accounts.py:714
+#: gajim/gtk/accounts.py:717
 #, fuzzy
 msgid "Client / Operating System"
 msgstr "Cliëntcertificaat"
 
-#: gajim/gtk/accounts.py:716
+#: gajim/gtk/accounts.py:719
 #, fuzzy
 msgid ""
 "Disclose informations about the client and operating system you currently use"
@@ -10371,138 +10874,134 @@ msgstr ""
 "Laat Gajim toe informatie te versturen over het besturingssysteem dat je "
 "gebruikt."
 
-#: gajim/gtk/accounts.py:719
+#: gajim/gtk/accounts.py:722
 #, fuzzy
 msgid "Ignore Unknown Contacts"
 msgstr "Contacten uitnodigen"
 
-#: gajim/gtk/accounts.py:721
+#: gajim/gtk/accounts.py:724
 #, 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:737 gajim/gtk/accounts.py:776
+#: gajim/gtk/accounts.py:740 gajim/gtk/accounts.py:779
 msgid "Use environment variable"
 msgstr "Omgevingsvariabele gebruiken"
 
-#: gajim/gtk/accounts.py:739
-msgid "Proxy"
-msgstr "Proxy"
-
-#: gajim/gtk/accounts.py:742
+#: gajim/gtk/accounts.py:745
 msgid "Warn on insecure connection"
 msgstr "Waarschuwen vooraleer onbeveiligde verbinding te gebruiken"
 
-#: gajim/gtk/accounts.py:746
+#: gajim/gtk/accounts.py:749
 msgid "Send keep-alive packets"
 msgstr "Keep-alive-pakketten verzenden"
 
-#: gajim/gtk/accounts.py:750
+#: gajim/gtk/accounts.py:753
 msgid "Manually set the hostname for the server"
 msgstr "Hostnaam voor server handmatig instellen"
 
-#: gajim/gtk/accounts.py:756 gajim/gtk/accounts.py:826
-#: gajim/gtk/accounts.py:831
+#: gajim/gtk/accounts.py:759 gajim/gtk/accounts.py:829
+#: gajim/gtk/accounts.py:834
 msgid "Priority"
 msgstr "Prioriteit"
 
-#: gajim/gtk/accounts.py:785
+#: gajim/gtk/accounts.py:788
 msgid "Synchronize the status of all accounts"
 msgstr "Status van alle accounts synchroniseren"
 
-#: gajim/gtk/accounts.py:795
+#: gajim/gtk/accounts.py:798
 msgid "First Name"
 msgstr "Voornaam"
 
-#: gajim/gtk/accounts.py:798
+#: gajim/gtk/accounts.py:801
 msgid "Last Name"
 msgstr "Achternaam"
 
-#: gajim/gtk/accounts.py:804
+#: gajim/gtk/accounts.py:807
 msgid "Email"
 msgstr "E-mail"
 
-#: gajim/gtk/accounts.py:822
+#: gajim/gtk/accounts.py:825
 msgid "Adjust to status"
 msgstr "Aanpassen aan status"
 
-#: gajim/gtk/accounts.py:849
+#: gajim/gtk/accounts.py:852
 msgid "Enable"
 msgstr "Inschakelen"
 
-#: gajim/gtk/accounts.py:857
+#: gajim/gtk/accounts.py:860
 msgid "Port"
 msgstr "Poort"
 
-#: gajim/gtk/accounts.py:862
+#: gajim/gtk/accounts.py:865
 #, fuzzy
 msgid "Connection Settings"
 msgstr "Verbindingsopties"
 
-#: gajim/gtk/accounts.py:872
+#: gajim/gtk/accounts.py:875
 msgid "PKCS12 Files"
 msgstr "PKCS12-bestanden"
 
-#: gajim/gtk/accounts.py:874
+#: gajim/gtk/accounts.py:877
 msgid "Encrypted Certificate"
 msgstr "Versleuteld certificaat"
 
-#: gajim/gtk/accounts.py:878
+#: gajim/gtk/accounts.py:881
 #, fuzzy
 msgid "Certificate Settings"
 msgstr "Certificaatopties"
 
-#: gajim/gtk/accounts.py:890
+#: gajim/gtk/accounts.py:893
 msgid "Save Password"
 msgstr "Wachtwoord opslaan"
 
-#: gajim/gtk/accounts.py:898
+#: gajim/gtk/accounts.py:901
 #, fuzzy
 msgid "Login Settings"
 msgstr "Plug-in-instellingen"
 
-#: gajim/gtk/accounts.py:931
+#: gajim/gtk/accounts.py:934
 #, python-format
 msgid "Removing account %s"
 msgstr "Account %s wordt verwijderd"
 
-#: gajim/gtk/accounts.py:946
+#: gajim/gtk/accounts.py:949
 msgid "Account is disabled"
 msgstr "Account is uitgeschakeld"
 
-#: gajim/gtk/accounts.py:947
+#: gajim/gtk/accounts.py:950
 msgid "To unregister from a server, the account must be enabled."
 msgstr ""
 "Om de registratie van een account bij een server ongedaan te maken, moet "
 "deze eerst ingeschakeld zijn."
 
-#: gajim/gtk/accounts.py:962
+#: gajim/gtk/accounts.py:965
 msgid "Password required"
 msgstr "Wachtwoord vereist"
 
-#: gajim/gtk/accounts.py:976
+#: gajim/gtk/accounts.py:979
 #, fuzzy, python-format
 msgid "Account '%s' is still connected to the server"
 msgstr "Account ‘%s’ is verbonden met de server"
 
-#: gajim/gtk/accounts.py:978
+#: gajim/gtk/accounts.py:981
 msgid "If you remove it, the connection will be lost."
 msgstr "Als je ze verwijdert, wordt de verbinding verbroken."
 
-#: gajim/gtk/accounts.py:995
+#: gajim/gtk/accounts.py:998
 #, python-format
 msgid "Connection to server %s failed"
 msgstr "Verbinding met server %s mislukt"
 
-#: gajim/gtk/accounts.py:996
+#: gajim/gtk/accounts.py:999
 msgid "What would you like to do?"
 msgstr "Wat zou je willen doen?"
 
-#: gajim/gtk/accounts.py:997
+#: gajim/gtk/accounts.py:1000
 msgid "Remove only from Gajim"
 msgstr "Alleen verwijderen van Gajim"
 
-#: gajim/gtk/accounts.py:998
+#: gajim/gtk/accounts.py:1001
 msgid "Don't remove anything. I'll try again later"
 msgstr "Niets verwijderen. Ik probeer het later opnieuw"
 
@@ -10525,6 +11024,10 @@ msgstr "<b>%(jid)s</b> wil dat je enkele contacten zou <b>%(action)s</b>."
 msgid "Modify"
 msgstr "Bewerken"
 
+#: gajim/gtk/roster_item_exchange.py:80
+msgid "JID"
+msgstr "JID"
+
 #: gajim/gtk/roster_item_exchange.py:86
 msgid "Groups"
 msgstr "Groepen"
@@ -10548,19 +11051,19 @@ msgid_plural "Removed %d contacts"
 msgstr[0] "%d contact verwijderd"
 msgstr[1] "%d contacten verwijderd"
 
-#: gajim/gtk/util.py:581
+#: gajim/gtk/util.py:583
 msgid "Unknown Artist"
 msgstr "Onbekende artiest"
 
-#: gajim/gtk/util.py:582
+#: gajim/gtk/util.py:584
 msgid "Unknown Title"
 msgstr "Onbekend nummer"
 
-#: gajim/gtk/util.py:583
+#: gajim/gtk/util.py:585
 msgid "Unknown Source"
 msgstr "Onbekende bron"
 
-#: gajim/gtk/util.py:585
+#: gajim/gtk/util.py:587
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
@@ -10569,29 +11072,10 @@ msgstr ""
 "<b>‘%(title)s’</b> door <i>%(artist)s</i>\n"
 "van <i>%(source)s</i>"
 
-#: gajim/gtk/bookmarks.py:121
-msgid "New Group Chat"
-msgstr "Nieuw groepsgesprek"
-
-#: gajim/gtk/bookmarks.py:161
-msgid "This bookmark has invalid data"
-msgstr "Deze bladwijzer bevat ongeldige informatie"
-
-#: gajim/gtk/bookmarks.py:162
-msgid ""
-"Please be sure to fill out server and room fields or remove this bookmark."
-msgstr ""
-"Zorg ervoor dat de server- en groepsgespreksvelden ingevuld zijn, of "
-"verwijder deze bladwijzer."
-
-#: gajim/gtk/bookmarks.py:273 gajim/gtk/bookmarks.py:291
-#: gajim/gtk/bookmarks.py:304 gajim/gtk/bookmarks.py:335
-msgid "Character not allowed"
-msgstr "Teken niet toegestaan"
-
-#: gajim/gtk/bookmarks.py:334
-msgid "Invalid room"
-msgstr "Ongeldig groepsgesprek"
+#: gajim/gtk/bookmarks.py:47
+#, fuzzy, python-format
+msgid "Bookmarks for %s"
+msgstr "Bladwijzers"
 
 #: gajim/plugins/pluginmanager.py:736 gajim/plugins/pluginmanager.py:742
 msgid "Archive corrupted"
@@ -10602,52 +11086,53 @@ msgid "Archive empty"
 msgstr "Leeg archief"
 
 #: gajim/plugins/pluginmanager.py:750 gajim/plugins/pluginmanager.py:758
-#: gajim/plugins/gui.py:257
+#: gajim/plugins/gui.py:258
 msgid "Archive is malformed"
 msgstr "Archief is misvormd"
 
-#: gajim/plugins/pluginmanager.py:766 gajim/plugins/gui.py:281
-#: gajim/plugins/gui.py:289
+#: gajim/plugins/pluginmanager.py:766 gajim/plugins/gui.py:288
+#: gajim/plugins/gui.py:301
 msgid "Plugin already exists"
 msgstr "Plug-in bestaat al"
 
-#: gajim/plugins/gui.py:82
+#: gajim/plugins/gui.py:83
 msgid "Click to view Gajim's wiki page on how to install plugins in Flatpak."
 msgstr ""
 "Klik voor meer informatie over het installeren van Gajim-plug-ins met "
 "Flatpak."
 
-#: gajim/plugins/gui.py:89
+#: gajim/plugins/gui.py:90
 msgid "Plugin"
 msgstr "Plug-in"
 
-#: gajim/plugins/gui.py:151
+#: gajim/plugins/gui.py:152
 #, python-format
 msgid "Warning: %s"
 msgstr "Waarschuwing: %s"
 
-#: gajim/plugins/gui.py:206
+#: gajim/plugins/gui.py:207
 msgid "Plugin failed"
 msgstr "Plug-in mislukt"
 
-#: gajim/plugins/gui.py:245
+#: gajim/plugins/gui.py:246
 msgid "Unable to properly remove the plugin"
 msgstr "Kon plug-in niet correct verwijderen"
 
-#: gajim/plugins/gui.py:281
-msgid "Overwrite?"
+#: gajim/plugins/gui.py:287
+#, fuzzy
+msgid "Overwrite Plugin?"
 msgstr "Overschrijven?"
 
+#: gajim/plugins/gui.py:289
+#, fuzzy
+msgid "Do you want to overwrite the currently installed version?"
+msgstr "Wil je de uitnodiging accepteren?"
+
 #: data/org.gajim.Gajim.desktop.in:5
-msgid "Jabber IM Client"
+#, fuzzy
+msgid "XMPP IM Client"
 msgstr "Jabber-IM-cliënt"
 
-# TODO: Loop alles na, zet zinnen in de goede vorm, volg GNOME NL richtlijnen,
-#       ruim mnemonics op. Zie ook: http://nl.gnome.org/
-#: data/org.gajim.Gajim.desktop.in:6
-msgid "A GTK+ Jabber client"
-msgstr "Een GTK+-Jabber-cliënt"
-
 #: data/org.gajim.Gajim.desktop.in:8
 msgid "chat;messaging;im;xmpp;bonjour;voip;"
 msgstr "chat;messaging;berichten;gesprekken;im;xmpp;bonjour;voip;"
@@ -10704,7 +11189,8 @@ 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:27
-msgid "Chat securely with End-to-End encryption via OMEMO or PGP"
+#, 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:28
@@ -10771,7 +11257,8 @@ msgid "Even more features via plugins"
 msgstr "Nog meer functies via plug-ins"
 
 #: data/org.gajim.Gajim.appdata.xml.in:52
-msgid "Roster, list of contacts"
+#, fuzzy
+msgid "Contact list, list of contacts"
 msgstr "Rooster, contactenlijst"
 
 #: data/org.gajim.Gajim.appdata.xml.in:56
@@ -10790,6 +11277,529 @@ msgstr "Gespreksgeschiedenis"
 msgid "Plugin manager"
 msgstr "Plug-inbeheer"
 
+#~ msgid "Configure Services…"
+#~ msgstr "Diensten configureren…"
+
+#~ msgid "Group Chat Bookmarks"
+#~ msgstr "Groepsgesprekbladwijzers"
+
+#, fuzzy
+#~ msgid "Add Bookmark"
+#~ msgstr "Toevoegen aan bladwijzers"
+
+#, fuzzy
+#~ msgid "Remove Bookmark"
+#~ msgstr "Toevoegen aan bladwijzers"
+
+#~ msgid "Bookmark Name"
+#~ msgstr "Bladwijzernaam"
+
+#~ msgid "_Server"
+#~ msgstr "_Server"
+
+#~ msgid "Roo_m"
+#~ msgstr "Groe_psgesprek"
+
+#~ msgid "_Password"
+#~ msgstr "_Wachtwoord"
+
+#~ msgid "Join chat when connected"
+#~ msgstr "Deelnemen bij verbinden"
+
+#~ msgid "New Group Chat"
+#~ msgstr "Nieuw groepsgesprek"
+
+#~ msgid "This bookmark has invalid data"
+#~ msgstr "Deze bladwijzer bevat ongeldige informatie"
+
+#, fuzzy
+#~ msgid ""
+#~ "Please be sure to fill out server and group chat fields or remove this "
+#~ "bookmark."
+#~ msgstr ""
+#~ "Zorg ervoor dat de server- en groepsgespreksvelden ingevuld zijn, of "
+#~ "verwijder deze bladwijzer."
+
+#~ msgid "Character not allowed"
+#~ msgstr "Teken niet toegestaan"
+
+#, fuzzy
+#~ msgid "Invalid Group Chat"
+#~ msgstr "Ongeldige JID voor groepsgesprek"
+
+#~ msgid "Unable to join group chat"
+#~ msgstr "Kan niet deelnemen aan het groepsgesprek"
+
+#~ msgid "You are banned from group chat <b>%s</b>."
+#~ msgstr "Je bent verbannen uit groepsgesprek <b>%s</b>."
+
+#~ msgid "Remote server <b>%s</b> does not exist."
+#~ msgstr "Externe server <b>%s</b> bestaat niet."
+
+#~ msgid "Group chat <b>%s</b> does not exist."
+#~ msgstr "Groepsgesprek <b>%s</b> bestaat niet."
+
+#~ msgid "Group chat creation is not permitted."
+#~ msgstr "Aanmaken van groepsgesprekken is niet toegestaan."
+
+#~ msgid "You must use your registered nickname in <b>%s</b>."
+#~ msgstr "Je geregistreerde bijnaam moet gebruikt worden in <b>%s</b>."
+
+#, fuzzy
+#~ msgid "You are not in the members list in group chat %s."
+#~ msgstr "Je staat niet in de ledenlijst van groepsgesprek %s."
+
+#, fuzzy
+#~ msgid "XMPP Address is not a group chat"
+#~ msgstr "Dit is geen groepsgesprek"
+
+#~ msgid "This is not a group chat"
+#~ msgstr "Dit is geen groepsgesprek"
+
+#, fuzzy
+#~ msgid ""
+#~ "%(room_jid)s is already in your contact list. Please check if "
+#~ "%(room_jid)s is a correct group chat name. If it is, delete it from your "
+#~ "contact list and try joining the group chat again."
+#~ msgstr ""
+#~ "%(room_jid)s staat al in je rooster. Controleer of %(room_jid)s een "
+#~ "correcte groepsgespreksnaam is. Zo ja, verwijder het van je rooster en "
+#~ "probeer opnieuw deel te nemen aan het groepsgesprek."
+
+#, fuzzy
+#~ msgid "Please choose a group chat"
+#~ msgstr "Kies een groepsgesprek"
+
+#~ msgid "Invalid Nickname"
+#~ msgstr "Ongeldige bijnaam"
+
+#~ msgid "Please choose a nickname"
+#~ msgstr "Kies een bijnaam"
+
+#~ msgid "Wrong server"
+#~ msgstr "Verkeerde server"
+
+#, fuzzy
+#~ msgid "%s is not a group chat server"
+#~ msgstr "%s is geen groepsgespreksserver"
+
+#, fuzzy
+#~ msgid ""
+#~ "How many lines to request from server when entering a group chat. -1 "
+#~ "means no limit."
+#~ msgstr ""
+#~ "Hoeveel lijnen op te vragen van server bij deelnemen aan groepsgesprek. "
+#~ "-1 betekent geen limiet"
+
+#, fuzzy
+#~ msgid ""
+#~ "Minutes of backlog to request when entering a group chat. -1 means no "
+#~ "limit."
+#~ msgstr ""
+#~ "Aantal voorafgaande minuten van groepsgesprekken die opgevraagd moeten "
+#~ "worden bij inloggen/deelnemen. -1 betekent geen limiet"
+
+#, fuzzy
+#~ msgid ""
+#~ "How many lines to request from server when entering a group chat. -1 "
+#~ "means no limit, -2 means global value."
+#~ msgstr ""
+#~ "Aantal voorafgaande berichten van groepsgesprekken die opgevraagd moeten "
+#~ "worden bij inloggen/deelnemen. -1 betekent geen limiet, -2 betekent "
+#~ "globale instelling"
+
+#, fuzzy
+#~ msgid ""
+#~ "Minutes of backlog to request when entering a group chat. -1 means no "
+#~ "limit, -2 means global value."
+#~ msgstr ""
+#~ "Aantal voorafgaande minuten van groepsgesprekken die opgevraagd moeten "
+#~ "worden bij inloggen/deelnemen. -1 betekent geen limiet, -2 betekent "
+#~ "globale instelling"
+
+#, fuzzy
+#~ msgid "A Password is required to join the group chat %s. Please type it."
+#~ msgstr ""
+#~ "Een wachtwoord is vereist om groepsgesprek %s binnen te komen, voer het "
+#~ "in."
+
+#~ msgid "Not in Roster"
+#~ msgstr "Niet in het rooster"
+
+#~ msgid "I would like to add you to my roster"
+#~ msgstr "Ik zou je graag aan mijn rooster willen toevoegen"
+
+#~ msgid "Add to Roster"
+#~ msgstr "Toevoegen aan rooster"
+
+#~ msgid "Audio Session"
+#~ msgstr "Audiosessie"
+
+#~ msgid "Video Session"
+#~ msgstr "Videosessie"
+
+#~ msgid "Manage Room"
+#~ msgstr "Beheer ruimte"
+
+#~ msgid "Configure Room"
+#~ msgstr "Groepsgesprek configureren"
+
+#~ msgid "Destroy Room"
+#~ msgstr "Groepsgesprek vernietigen"
+
+#~ msgid "Change Nick"
+#~ msgstr "Bijnaam veranderen"
+
+#~ msgid "Disconnect"
+#~ msgstr "Verbinding verbreken"
+
+#~ msgid "Copy JID"
+#~ msgstr "JID kopiëren"
+
+#~ msgid "Add to Roster…"
+#~ msgstr "Toevoegen aan rooster…"
+
+#~ msgid "Copy JID/Email"
+#~ msgstr "JID/e-mailadres kopiëren"
+
+#~ msgid "JID: <i>%s</i>"
+#~ msgstr "JID: <i>%s</i>"
+
+#~ msgid "Changing Subject"
+#~ msgstr "Onderwerp veranderen"
+
+#~ msgid "Please specify the new subject:"
+#~ msgstr "Geef het nieuwe onderwerp op:"
+
+#~ msgid "Room logging is now enabled"
+#~ msgstr "Opslaan van berichten in groepsgesprek is nu ingeschakeld"
+
+#~ msgid "Room logging is now disabled"
+#~ msgstr "Opslaan van berichten in groepsgesprek is nu uitgeschakeld"
+
+#~ msgid "You (%s) joined the room"
+#~ msgstr "Je (%s) neemt nu deel aan het groepsgesprek"
+
+#~ msgid "Room logging is enabled"
+#~ msgstr "Opslaan van berichten in groepsgesprek is ingeschakeld"
+
+#~ msgid "Unable to join groupchat"
+#~ msgstr "Kan niet deelnemen aan het groepsgesprek"
+
+#~ msgid "Groupchat Invitation"
+#~ msgstr "Uitnodiging voor groepsgesprek"
+
+#~ msgid "%(jid)s has been invited in this room"
+#~ msgstr "%(jid)s is in dit groepsgesprek uitgenodigd"
+
+#~ msgid "JID is not a Groupchat"
+#~ msgstr "Deze JID is geen groepsgesprek"
+
+#~ msgid "Invalid JID"
+#~ msgstr "Ongeldige JID"
+
+#~ msgid "A connection is not available"
+#~ msgstr "Er is geen verbinding beschikbaar"
+
+#~ msgid "JID already in list"
+#~ msgstr "JID al in lijst"
+
+#~ msgid "Unsecure"
+#~ msgstr "Onveilig"
+
+#~ msgid "For the chosen encryption there is no encryption method available"
+#~ msgstr ""
+#~ "Er is geen versleutelingsmethode beschikbaar voor de gekozen versleuteling"
+
+#~ msgid "Removes contact from roster"
+#~ msgstr "Verwijdert contact van rooster"
+
+#~ msgid "Not in roster"
+#~ msgstr "Niet in rooster"
+
+#~ msgid "Contact signed in notification color."
+#~ msgstr "Meldingskleur voor ingelogd contact."
+
+#~ msgid "Contact signout notification color"
+#~ msgstr "Meldingskleur voor uitgelogd contact"
+
+#~ msgid "File transfer request notification color."
+#~ msgstr "Meldingskleur voor bestandsoverdrachtsverzoek."
+
+#~ msgid "File transfer error notification color."
+#~ msgstr "Meldingskleur voor bestandsoverdrachtsfout."
+
+#~ msgid "File transfer complete or stopped notification color."
+#~ msgstr "Meldingskleur voor voltooide of gestopte bestandsoverdracht."
+
+#~ msgid "Groupchat invitation notification color"
+#~ msgstr "Meldingskleur voor uitnodiging voor groepsgesprek"
+
+#~ msgid "Other dialogs color."
+#~ msgstr "Kleur van andere dialogen."
+
+#~ msgid "Add * and [n] in roster title?"
+#~ msgstr "* en [n] toevoegen aan roster titel?"
+
+#~ msgid "Hides the banner in two persons chat window"
+#~ msgstr "Verbergt de banner in een gespreksvenster met twee personen"
+
+#~ msgid ""
+#~ "Show the confirm metacontacts creation dialog or not? Empty string means "
+#~ "never show the dialog."
+#~ msgstr ""
+#~ "Moet de dialoog voor het bevestigen van het aanmaken van metacontacten "
+#~ "worden getoond? Een lege tekenreeks betekent dat de dialoog nooit wordt "
+#~ "getoond."
+
+#~ msgid "If true, You will also see your webcam"
+#~ msgstr "Indien ingeschakeld zal je ook je eigen webcam zien"
+
+#~ msgid "If the room subject is shown in chat on join"
+#~ msgstr ""
+#~ "Of het onderwerp van het groepsgesprek in het gesprek wordt weergegeven "
+#~ "bij deelname"
+
+#~ msgid "Space separated list of ssl errors to ignore."
+#~ msgstr "Door spaties gescheiden lijst van te negeren SSL-fouten."
+
+#~ msgid "Answer to receipt requests"
+#~ msgstr "Antwoorden op ontvangsbevestigingen"
+
+#~ msgid "Sent receipt requests"
+#~ msgstr "Verzonden ontvangstbevestigingen"
+
+#~ msgid "Language for which misspelled words will be checked"
+#~ msgstr ""
+#~ "Taal waarvoor gecontroleerd moet worden op verkeerd gespelde woorden"
+
+#~ msgid "I'm eating, so leave me a message."
+#~ msgstr "Ik ben aan het eten, laat een bericht achter."
+
+#~ msgid ""
+#~ "This message was encrypted with OpenPGP for XMPP and could not be "
+#~ "decrypted."
+#~ msgstr ""
+#~ "Dit bericht is versleuteld met OpenPGP voor XMPP en kon niet ontsleuteld "
+#~ "worden."
+
+#~ msgid "from room %s"
+#~ msgstr "van groepsgesprek %s"
+
+#~ msgid "Leave Groupchats"
+#~ msgstr "Groepsgesprekken verlaten"
+
+#~ msgid "Auto Join"
+#~ msgstr "Automatisch deelnemen"
+
+#~ msgid "Room"
+#~ msgstr "Groepsgesprek"
+
+#~ msgid "Jabber ID:"
+#~ msgstr "Jabber-ID:"
+
+#~ msgid "Occupant Actions"
+#~ msgstr "Deelnemeracties"
+
+#~ msgid "_Add to Roster"
+#~ msgstr "Toevoegen _aan roster"
+
+#~ msgid "_Manage Room"
+#~ msgstr "Beheer rui_mte"
+
+#~ msgid "Configure _Room..."
+#~ msgstr "G_roepsgesprek configureren…"
+
+#~ msgid "_Destroy Room"
+#~ msgstr "Groepsgesprek _vernietigen"
+
+#~ msgid "Jabber ID"
+#~ msgstr "Jabber-ID"
+
+#, fuzzy
+#~ msgid "account"
+#~ msgstr "account: "
+
+#~ msgid "Roster"
+#~ msgstr "Rooster"
+
+#~ msgid "Show only in roster"
+#~ msgstr "Alleen in rooster weergeven"
+
+#~ msgid "in _roster"
+#~ msgstr "in _rooster"
+
+#~ msgid "Roster Appearance"
+#~ msgstr "Roosteruiterlijk"
+
+#~ msgid "Show chatstate in roster"
+#~ msgstr "Chatstatus tonen in rooster"
+
+#~ msgid "_Add to Roster..."
+#~ msgstr "Toevoegen _aan rooster…"
+
+#~ msgid "_Jabber ID:"
+#~ msgstr "_Jabber-ID:"
+
+#~ msgid "_Jabber ID"
+#~ msgstr "_Jabber-ID"
+
+#~ msgid "JabberID"
+#~ msgstr "JabberID"
+
+#~ msgid "Show Roster"
+#~ msgstr "Rooster weergeven"
+
+#~ msgid "MUC server"
+#~ msgstr "MUC-server"
+
+#~ msgid "Roster Shortcuts"
+#~ msgstr "Roostersneltoetsen"
+
+#~ msgid "Room Configuration"
+#~ msgstr "Groepsgespreksconfiguratie"
+
+#~ msgid "Join _Group Chat"
+#~ msgstr "Deelnemen aan _groepsgesprek"
+
+#~ msgid "Toggle audio session"
+#~ msgstr "Audiosessie in-/uitschakelen"
+
+#~ msgid "Audio sessions are not available"
+#~ msgstr "Audiosessies zijn niet beschikbaar"
+
+#~ msgid "Conference"
+#~ msgstr "Groepsgesprek"
+
+#~ msgid "_Manage Bookmarks…"
+#~ msgstr "_Bladwijzers beheren…"
+
+#~ msgid "Hide _Roster"
+#~ msgstr "_Rooster verbergen"
+
+#~ msgid "Show _Roster"
+#~ msgstr "_Rooster weergeven"
+
+#~ msgid "Invalid Room"
+#~ msgstr "Ongeldig groepsgesprek"
+
+#~ msgid "Invalid room"
+#~ msgstr "Ongeldig groepsgesprek"
+
+# TODO: Loop alles na, zet zinnen in de goede vorm, volg GNOME NL richtlijnen,
+#       ruim mnemonics op. Zie ook: http://nl.gnome.org/
+#~ msgid "A GTK+ Jabber client"
+#~ msgstr "Een GTK+-Jabber-cliënt"
+
+#~ msgid "Changing Nickname"
+#~ msgstr "Bijnaam veranderen"
+
+#~ msgid "Please specify the new nickname you want to use:"
+#~ msgstr "Geef de nieuwe bijnaam op die je wilt gebruiken:"
+
+#~ msgid "Bookmark already set"
+#~ msgstr "Bladwijzer bestaat al"
+
+#, fuzzy
+#~ msgid "Group Chat '%s' is already in your bookmarks."
+#~ msgstr "Groepsgesprek ‘%s’ heeft al een bladwijzer."
+
+#~ msgid "Bookmark has been added successfully"
+#~ msgstr "Bladwijzer is met succes toegevoegd"
+
+#, fuzzy
+#~ msgid ""
+#~ "You can manage your bookmarks by clicking the Bookmarks menu item in your "
+#~ "contact list."
+#~ msgstr "Je kan bladwijzers beheren via het menu ‘Acties’ in je rooster."
+
+#~ msgid "The nickname contains invalid characters."
+#~ msgstr "De bijnaam bevat ongeldige tekens."
+
+#~ msgid "Bookmark Room"
+#~ msgstr "Groepsgesprek toevoegen aan bladwijzers"
+
+#~ msgid "_Join New Group Chat"
+#~ msgstr "Deelnemen aan n_ieuw groepsgesprek"
+
+#, fuzzy
+#~ msgid "_Create Group Chat"
+#~ msgstr "Groepsgesprekken verlaten"
+
+#~ msgid "Name:"
+#~ msgstr "Naam:"
+
+#~ msgid "Description:"
+#~ msgstr "Beschrijving:"
+
+#~ msgid "Address:"
+#~ msgstr "Adres:"
+
+#~ msgid ""
+#~ "Semi-Anonymous\n"
+#~ "<span size=\"small\">(Only moderators can see your XMPP-Address)</span>"
+#~ msgstr ""
+#~ "Semi-anoniem\n"
+#~ "<span size=\"small\">(Enkel moderators kunnen je XMPP-adres zien)</span>"
+
+#~ msgid "You can not start a new conversation unless you are connected."
+#~ msgstr ""
+#~ "Het is niet mogelijk een nieuw gesprek te starten zonder verbonden te "
+#~ "zijn."
+
+#, fuzzy
+#~ msgid "Occupants"
+#~ msgstr "Deelnemeracties"
+
+#, fuzzy
+#~ msgid "File transfer error"
+#~ msgstr "Fout bij bestandsoverdracht"
+
+#~ msgid "No Accounts available"
+#~ msgstr "Geen accounts beschikbaar"
+
+#~ msgid "_Modify Account..."
+#~ msgstr "Account be_werken…"
+
+#~ msgid "Boolean"
+#~ msgstr "Boolean"
+
+#~ msgid "Integer"
+#~ msgstr "Geheel getal"
+
+#~ msgid "Text"
+#~ msgstr "Tekst"
+
+#~ msgid "Value"
+#~ msgstr "Waarde"
+
+#~ msgid "Type"
+#~ msgstr "Type"
+
+#~ msgid "(None)"
+#~ msgstr "(Niets)"
+
+#~ msgid "Hidden"
+#~ msgstr "Verborgen"
+
+#~ msgid "Manage Proxy Profiles"
+#~ msgstr "Beheer Proxy Profielen"
+
+#~ msgid "Properties"
+#~ msgstr "Eigenschappen"
+
+#~ msgid "Proxy _Host"
+#~ msgstr "Proxy_host"
+
+#~ msgid "Proxy _Port"
+#~ msgstr "Proxy_poort"
+
+#~ msgid "New Groupchat"
+#~ msgstr "Nieuw groepsgesprek"
+
+#~ msgid "New Contact"
+#~ msgstr "Nieuw contact"
+
 #~ msgid "%s GiB"
 #~ msgstr "%s GiB"
 
@@ -10878,9 +11888,6 @@ msgstr "Plug-inbeheer"
 #~ msgid "_Pause"
 #~ msgstr "_Pauze"
 
-#~ msgid "Clean _up"
-#~ msgstr "Ruim _op"
-
 #~ msgid "Remove file transfer from the list."
 #~ msgstr "Verwijder bestandsoverdracht van de lijst."
 
@@ -10900,9 +11907,6 @@ msgstr "Plug-inbeheer"
 #~ msgid "When a file transfer is complete show a popup notification"
 #~ msgstr "Laat een pop-up zien als een bestandsoverdracht voltooid is"
 
-#~ msgid "Select Files"
-#~ msgstr "Selecteer bestanden"
-
 #~ msgid "From:"
 #~ msgstr "Van:"
 
@@ -10933,9 +11937,6 @@ msgstr "Plug-inbeheer"
 #~ msgid "Status: "
 #~ msgstr "Status: "
 
-#~ msgid "Aborted"
-#~ msgstr "Afgebroken"
-
 #~ msgid "Completed"
 #~ msgstr "Afgerond"
 
@@ -11352,9 +12353,6 @@ msgstr "Plug-inbeheer"
 #~ msgid "You are invited to a groupchat"
 #~ msgstr "Je bent uitgenodigd in een groepsgesprek"
 
-#~ msgid "Do you want to accept the invitation?"
-#~ msgstr "Wil je de uitnodiging accepteren?"
-
 #~ msgid ""
 #~ "<b>Issued to:</b>\n"
 #~ "Common Name (CN): %(scn)s\n"
@@ -11617,9 +12615,6 @@ msgstr "Plug-inbeheer"
 #~ msgid "Nick"
 #~ msgstr "Bijnaam"
 
-#~ msgid "Banning…"
-#~ msgstr "Wordt verbannen…"
-
 #~ msgid ""
 #~ "<b>Whom do you want to ban?</b>\n"
 #~ "\n"
@@ -11703,12 +12698,6 @@ msgstr "Plug-inbeheer"
 #~ msgid "Filter:"
 #~ msgstr "Filter:"
 
-#~ msgid ""
-#~ "If checked, Gajim will display the mood of contacts in the roster window"
-#~ msgstr ""
-#~ "Indien aangevinkt zal Gajim de stemming van contacten in het "
-#~ "roostervenster laten zien"
-
 #~ msgid "Spell _checker"
 #~ msgstr "Spellings_controle"
 
@@ -12020,9 +13009,6 @@ msgstr "Plug-inbeheer"
 #~ msgid "_Status message"
 #~ msgstr "_Statusbericht"
 
-#~ msgid "Group chat highlight"
-#~ msgstr "Markering in groepsgesprek"
-
 #~ msgid "Your nickname"
 #~ msgstr "Je bijnaam"
 
@@ -12165,9 +13151,6 @@ msgstr "Plug-inbeheer"
 #~ msgid "The passwords typed in both fields must be identical."
 #~ msgstr "De wachtwoorden in beide velden moeten identiek zijn."
 
-#~ msgid "Enter new password:"
-#~ msgstr "Voer nieuw wachtwoord in:"
-
 #~ msgid "Enter it again for confirmation:"
 #~ msgstr "Voer opnieuw in ter bevestiging:"
 
@@ -12182,9 +13165,6 @@ msgstr "Plug-inbeheer"
 #~ msgid "unsubscribe request from %s"
 #~ msgstr "afmelding verzocht van %s"
 
-#~ msgid "Autojoin"
-#~ msgstr "Automatisch deelnemen"
-
 #~ msgid "&lt;empty&gt;"
 #~ msgstr "&lt;leeg&gt;"
 
@@ -12294,9 +13274,6 @@ msgstr "Plug-inbeheer"
 #~ msgid "Forward unread message then disconnect"
 #~ msgstr "Ongelezen berichten doorsturen en daarna de verbinding verbreken"
 
-#~ msgid "AIM Address:"
-#~ msgstr "AIM-adres:"
-
 #~ msgid "MSN Address:"
 #~ msgstr "MSN-adres:"
 
@@ -12344,9 +13321,6 @@ msgstr "Plug-inbeheer"
 #~ msgid "Session negotiation cancelled"
 #~ msgstr "Sessie-onderhandeling geannuleerd"
 
-#~ msgid "This session WILL be archived on server"
-#~ msgstr "Deze sessie ZAL gearchiveerd worden op de server"
-
 #~ msgid "This session WILL NOT be archived on server"
 #~ msgstr "Deze sessie ZAL NIET gearchiveerd worden op de server"
 
@@ -12722,9 +13696,6 @@ msgstr "Plug-inbeheer"
 #~ msgid "Server:"
 #~ msgstr "Server:"
 
-#~ msgid "Password:"
-#~ msgstr "Wachtwoord:"
-
 #~ msgid "Join this room _automatically when I connect"
 #~ msgstr "Automatisch dit groepsgesprek binnengaan wanneer ik verbinding maak"
 
@@ -13092,9 +14063,6 @@ msgstr "Plug-inbeheer"
 #~ msgid "_Edit Personal Information..."
 #~ msgstr "Persoonlijke informatie b_ewerken…"
 
-#~ msgid "Information about you, as stored in the server"
-#~ msgstr "Informatie over jou, zoals op de server opgeslagen"
-
 #~ msgid "<b>Personal Information</b>"
 #~ msgstr "<b>Persoonlijke informatie</b>"
 
@@ -13174,9 +14142,6 @@ msgstr "Plug-inbeheer"
 #~ msgid "Your server can't save your personal information."
 #~ msgstr "Je server kan geen persoonlijke informatie opslaan."
 
-#~ msgid "Account Local already exists."
-#~ msgstr "Account ‘Lokaal’ bestaat al."
-
 #~ msgid "Please rename or remove it before enabling link-local messaging."
 #~ msgstr ""
 #~ "Hernoem of verwijder het vooraleer je link-lokaal-berichten inschakelt."
@@ -13396,9 +14361,6 @@ msgstr "Plug-inbeheer"
 #~ msgid "Contact's identity verified"
 #~ msgstr "Identiteit van contact geverifieerd"
 
-#~ msgid "Verify again…"
-#~ msgstr "Opnieuw verifiëren…"
-
 #~ msgid ""
 #~ "To be certain that <b>only</b> the expected person can read your messages "
 #~ "or send you messages, you need to verify their identity by clicking the "
@@ -13513,9 +14475,6 @@ msgstr "Plug-inbeheer"
 #~ msgid "Add _Contact..."
 #~ msgstr "_Contact toevoegen…"
 
-#~ msgid "_Accounts"
-#~ msgstr "_Accounts"
-
 #~ msgid "Profile, A_vatar"
 #~ msgstr "Profiel, a_vatar"
 
@@ -13782,14 +14741,6 @@ msgstr "Plug-inbeheer"
 #~ "Controleer bij opstarten altijd of Gajim de standaard Jabbercliënt is"
 
 #, fuzzy
-#~ msgid "Join _Group Chat..."
-#~ msgstr "Neem deel aan _Groepsgesprek"
-
-#, fuzzy
-#~ msgid "_Modify Account"
-#~ msgstr "Account Be_werken..."
-
-#, fuzzy
 #~ msgid "<b>Actions</b>"
 #~ msgstr "<b>Toepassingen</b>"
 
@@ -14148,10 +15099,6 @@ msgstr "Plug-inbeheer"
 #~ msgstr "Bijnaam niet gevonden: %s"
 
 #, fuzzy
-#~ msgid "This group chat has no subject"
-#~ msgstr "Deze ruimte heeft geen onderwerp"
-
-#, fuzzy
 #~ msgid ""
 #~ "Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
 #~ "nickname of an occupant may be substituted, but not if it contains \"@\". "
@@ -14229,9 +15176,6 @@ msgstr "Plug-inbeheer"
 #~ "Klik om mogelijkheden (zoals MSN, ICQ transporten) van jabber servers te "
 #~ "zien"
 
-#~ msgid "_Host:"
-#~ msgstr "_Host:"
-
 #, fuzzy
 #~ msgid "Modify Account"
 #~ msgstr "Account Be_werken..."
@@ -14302,10 +15246,6 @@ msgstr "Plug-inbeheer"
 #~ msgid "<b>Interface Customization</b>"
 #~ msgstr "<b>Interface Aanpassingen</b>"
 
-#, fuzzy
-#~ msgid "A_fter nickname:"
-#~ msgstr "Na bijnaam:"
-
 #~ msgid "Also known as iChat style"
 #~ msgstr "Ook bekend als iChat-stijl"
 
@@ -14380,9 +15320,6 @@ msgstr "Plug-inbeheer"
 #~ msgid "_Player:"
 #~ msgstr "_Speler:"
 
-#~ msgid "Address"
-#~ msgstr "Adres"
-
 #~ msgid "Role:"
 #~ msgstr "Rol:"
 
@@ -14631,9 +15568,6 @@ msgstr "Plug-inbeheer"
 #~ msgid "Timeout"
 #~ msgstr "Timeout"
 
-#~ msgid "account: "
-#~ msgstr "account: "
-
 #~ msgid "Activate/Disable notification for when a file transfer is complete"
 #~ msgstr ""
 #~ "In-/Uitschakelen berichtgeving als een bestandsoverdracht voltooid is"
diff --git a/po/pl.po b/po/pl.po
index 3960a2d93..b930f00d5 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: 2019-07-02 02:06+0000\n"
+"POT-Creation-Date: 2019-08-11 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,67 +23,66 @@ msgstr ""
 "X-Poedit-Language: Polish\n"
 "X-Poedit-Country: POLAND\n"
 
-#: gajim/chat_control_base.py:550
+#: gajim/chat_control_base.py:557
 msgid "_Undo"
 msgstr "_Cofnij"
 
-#: gajim/chat_control_base.py:558 gajim/conversation_textview.py:529
+#: gajim/chat_control_base.py:565 gajim/conversation_textview.py:529
 msgid "_Clear"
 msgstr "_Wyczyść"
 
-#: gajim/chat_control_base.py:563
+#: gajim/chat_control_base.py:570
 msgid "Paste as quote"
 msgstr "Wklej jako cytat"
 
-#: gajim/chat_control_base.py:613
+#: gajim/chat_control_base.py:620
 msgid "Paste Image"
 msgstr "Wklej obraz"
 
-#: gajim/chat_control_base.py:614
+#: gajim/chat_control_base.py:621
 msgid "You are trying to paste an image"
 msgstr "Próbujesz wkleić obraz"
 
-#: gajim/chat_control_base.py:615
+#: gajim/chat_control_base.py:622
 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?"
 
-#: gajim/chat_control_base.py:617 gajim/groupchat_control.py:2310
-#: gajim/roster_window.py:2848 gajim/roster_window.py:4167
-#: gajim/message_window.py:252 gajim/gtk/dialogs.py:418
+#: gajim/chat_control_base.py:624 gajim/groupchat_control.py:2218
+#: gajim/roster_window.py:2841 gajim/roster_window.py:4118
+#: gajim/message_window.py:359 gajim/gtk/dialogs.py:330
 #, fuzzy
 msgid "_Do not ask me again"
 msgstr "_Nie pytaj mnie o to ponownie"
 
-#: gajim/chat_control_base.py:620
+#: gajim/chat_control_base.py:627
 msgid "_Paste"
 msgstr "_Wklej"
 
-#: gajim/chat_control_base.py:1162 gajim/gtk/accounts.py:351
+#: gajim/chat_control_base.py:1169 gajim/gtk/accounts.py:354
 msgid "Privacy"
 msgstr "Prywatność"
 
-#: gajim/chat_control_base.py:1163
-#, fuzzy
+#: gajim/chat_control_base.py:1170
 msgid "Warning"
-msgstr "Zabanuj %s"
+msgstr "Ostrzeżenie"
 
-#: gajim/chat_control_base.py:1164
+#: gajim/chat_control_base.py:1171
 #, python-format
 msgid "If you send a file to <b>%s</b>, your real JID will be revealed."
 msgstr "Jeżeli wyślesz plik do <b>%s</b>, pozna on/ona twój pełny JID."
 
-#: gajim/chat_control_base.py:1169
+#: gajim/chat_control_base.py:1176
 #, fuzzy
 msgid "Continue"
 msgstr "_Kontynuuj"
 
-#: gajim/gtkgui_helpers.py:163 gajim/gtk/filetransfer.py:393
+#: gajim/gtkgui_helpers.py:163 gajim/gtk/filetransfer.py:398
 #, fuzzy, python-format
 msgid "Cannot overwrite existing file '%s'"
 msgstr "Nie można nadpisać pliku \"%s\""
 
-#: gajim/gtkgui_helpers.py:164 gajim/gtk/filetransfer.py:394
+#: gajim/gtkgui_helpers.py:164 gajim/gtk/filetransfer.py:399
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
@@ -91,9 +90,8 @@ msgstr ""
 "Istnieje już plik o tej nazwie a Ty nie masz uprawnień do jego nadpisania."
 
 #: gajim/gtkgui_helpers.py:196
-#, fuzzy
 msgid "Error While Saving"
-msgstr "Błąd przy dodawaniu usługi %s"
+msgstr "Wystąpił błąd podczas zapisywania"
 
 #: gajim/gtkgui_helpers.py:197
 msgid "Extension not supported"
@@ -174,221 +172,216 @@ msgstr "Nie ma oczekujących żądań autoryzacji."
 msgid " resource with priority "
 msgstr " zasób o wysokim priorytecie "
 
-#: gajim/gui_menu_builder.py:96
-msgid "_New Group Chat"
-msgstr "_Nowa rozmowa grupowa"
+#: gajim/gui_menu_builder.py:251 gajim/gui_menu_builder.py:342
+#: gajim/chat_control.py:305 gajim/roster_window.py:783
+#: gajim/roster_window.py:1716 gajim/roster_window.py:1718
+#: gajim/roster_window.py:2027 gajim/roster_window.py:3292
+#: gajim/roster_window.py:3325 gajim/gui_interface.py:396
+#: gajim/common/contacts.py:222 gajim/common/contacts.py:359
+#: gajim/common/contacts.py:471 gajim/common/helpers.py:86
+#: gajim/common/helpers.py:317 gajim/gtk/add_contact.py:319
+#: gajim/gtk/subscription_request.py:70 gajim/gtk/subscription_request.py:99
+#: gajim/gtk/roster_item_exchange.py:112
+#, fuzzy
+msgid "Not in contact list"
+msgstr "Wyświetlanie kontaktów offline"
 
-#: gajim/gui_menu_builder.py:289 gajim/gui_menu_builder.py:380
-#: gajim/chat_control.py:303 gajim/roster_window.py:786
-#: gajim/roster_window.py:1719 gajim/roster_window.py:1721
-#: gajim/roster_window.py:2030 gajim/roster_window.py:3336
-#: gajim/roster_window.py:3369 gajim/gui_interface.py:413
-#: gajim/common/contacts.py:206 gajim/common/contacts.py:343
-#: gajim/common/helpers.py:83 gajim/common/helpers.py:311
-#: gajim/gtk/add_contact.py:319 gajim/gtk/subscription_request.py:70
-#: gajim/gtk/subscription_request.py:99 gajim/gtk/roster_item_exchange.py:112
-msgid "Not in Roster"
-msgstr "spoza listy kontaktów"
-
-#: gajim/gui_menu_builder.py:393
-msgid "I would like to add you to my roster"
-msgstr "Chciałbym dodać Cię do listy kontaktów"
-
-#: gajim/gui_menu_builder.py:471
+#: gajim/gui_menu_builder.py:355
+#, fuzzy
+msgid "I would like to add you to my contact list"
+msgstr "Chciałbym dodać Cię do listy kontaktów."
+
+#: gajim/gui_menu_builder.py:433
 msgid "Send Single _Message…"
 msgstr "Wyślij pojedynczą wiadomość..."
 
-#: gajim/gui_menu_builder.py:486
+#: gajim/gui_menu_builder.py:448
 #, fuzzy
 msgid "E_xecute Command…"
 msgstr "_Wykonaj komendę"
 
-#: gajim/gui_menu_builder.py:494
+#: gajim/gui_menu_builder.py:456
 msgid "_Manage Transport"
 msgstr "_Zarządzaj transportami"
 
-#: gajim/gui_menu_builder.py:500
+#: gajim/gui_menu_builder.py:462
 msgid "_Modify Transport"
 msgstr "_Modyfikuj transport"
 
-#: gajim/gui_menu_builder.py:507 gajim/roster_window.py:5046
+#: gajim/gui_menu_builder.py:469 gajim/roster_window.py:4985
 #, fuzzy
 msgid "_Rename…"
 msgstr "_Zmień nazwę"
 
-#: gajim/gui_menu_builder.py:518 gajim/roster_window.py:5062
-#: gajim/roster_window.py:5177 gajim/data/gui/blocked_contacts_window.ui:52
+#: gajim/gui_menu_builder.py:480 gajim/roster_window.py:5001
+#: gajim/roster_window.py:5116 gajim/data/gui/blocked_contacts_window.ui:52
 #: gajim/data/gui/gc_occupants_menu.ui:148
 #: gajim/data/gui/contact_context_menu.ui:143
 msgid "_Unblock"
 msgstr "_Cofnij blokadę"
 
-#: gajim/gui_menu_builder.py:521 gajim/roster_window.py:5067
-#: gajim/roster_window.py:5181 gajim/data/gui/gc_occupants_menu.ui:140
+#: gajim/gui_menu_builder.py:483 gajim/roster_window.py:5006
+#: gajim/roster_window.py:5120 gajim/data/gui/gc_occupants_menu.ui:140
 #: gajim/data/gui/contact_context_menu.ui:151
 msgid "_Block"
 msgstr "_Zablokuj"
 
-#: gajim/gui_menu_builder.py:529 gajim/roster_window.py:5074
+#: gajim/gui_menu_builder.py:491 gajim/roster_window.py:5013
 #: gajim/data/gui/contact_context_menu.ui:181
 msgid "Remo_ve"
 msgstr "Us_uń"
 
-#: gajim/gui_menu_builder.py:539 gajim/data/gui/contact_context_menu.ui:198
+#: gajim/gui_menu_builder.py:501 gajim/data/gui/contact_context_menu.ui:198
 msgid "_Information"
 msgstr "Informacje o kontakcie"
 
-#: gajim/gui_menu_builder.py:552
+#: gajim/gui_menu_builder.py:514
 msgid "Save _As"
 msgstr "Zapisz _jako"
 
-#: gajim/gui_menu_builder.py:564 gajim/groupchat_control.py:501
-#: gajim/chat_control.py:340
+#: gajim/gui_menu_builder.py:526 gajim/groupchat_control.py:507
+#: gajim/chat_control.py:342
 msgid "Send File…"
 msgstr "Wyślij plik..."
 
-#: gajim/gui_menu_builder.py:565
+#: gajim/gui_menu_builder.py:527
 msgid "Upload File…"
 msgstr "Wyślij plik..."
 
-#: gajim/gui_menu_builder.py:566
+#: gajim/gui_menu_builder.py:528
 msgid "Send File Directly…"
 msgstr "Wyślij plik jako..."
 
-#: gajim/gui_menu_builder.py:568 gajim/gui_menu_builder.py:632
+#: gajim/gui_menu_builder.py:530 gajim/gui_menu_builder.py:596
 #, fuzzy
 msgid "Send Chatstate"
 msgstr "Ostatni status %s"
 
-#: gajim/gui_menu_builder.py:569
+#: gajim/gui_menu_builder.py:531
 #, fuzzy
 msgid "Invite Contacts"
 msgstr "Zaproś kontakty"
 
-#: gajim/gui_menu_builder.py:570
-msgid "Add to Roster"
-msgstr "Dodaj do listy kontaktów"
+#: gajim/gui_menu_builder.py:532
+#, fuzzy
+msgid "Add to Contact List"
+msgstr "_Dodaj kontakt..."
 
-#: gajim/gui_menu_builder.py:571
+#: gajim/gui_menu_builder.py:533
 #, fuzzy
-msgid "Audio Session"
-msgstr "Test audio"
+msgid "Voice Chat"
+msgstr "Prośba o rozmowę głosową"
 
-#: gajim/gui_menu_builder.py:572
+#: gajim/gui_menu_builder.py:534
 #, fuzzy
-msgid "Video Session"
+msgid "Video Chat"
 msgstr "Video test"
 
-#: gajim/gui_menu_builder.py:573
+#: gajim/gui_menu_builder.py:535 gajim/gui_menu_builder.py:582
 #, fuzzy
 msgid "Information"
 msgstr "Informacje o kontakcie"
 
-#: gajim/gui_menu_builder.py:574 gajim/gui_menu_builder.py:639
+#: gajim/gui_menu_builder.py:536 gajim/gui_menu_builder.py:602
 #: gajim/data/gui/application_menu.ui:37
 #, fuzzy
 msgid "History"
 msgstr "_Historia"
 
-#: gajim/gui_menu_builder.py:580 gajim/gui_menu_builder.py:687
+#: gajim/gui_menu_builder.py:542 gajim/gui_menu_builder.py:650
 #: gajim/data/gui/preferences_window.ui:1823
 msgid "Disabled"
 msgstr "Wyłączone"
 
-#: gajim/gui_menu_builder.py:581 gajim/gui_menu_builder.py:688
+#: gajim/gui_menu_builder.py:543 gajim/gui_menu_builder.py:651
 msgid "Composing only"
 msgstr "Tylko o pisaniu"
 
-#: gajim/gui_menu_builder.py:582 gajim/gui_menu_builder.py:689
+#: gajim/gui_menu_builder.py:544 gajim/gui_menu_builder.py:652
 msgid "All chat states"
 msgstr "Wszystkie stany rozmowy"
 
-#: gajim/gui_menu_builder.py:620
+#: gajim/gui_menu_builder.py:583
 #, fuzzy
-msgid "Manage Room"
-msgstr "Zarządzaj pokojem"
+msgid "Manage Group Chat"
+msgstr "Opuść pokoje"
 
-#: gajim/gui_menu_builder.py:621
+#: gajim/gui_menu_builder.py:584 gajim/data/gui/groupchat_control.ui:649
 #, fuzzy
 msgid "Change Subject"
 msgstr "Zmień _temat..."
 
-#: gajim/gui_menu_builder.py:622
+#: gajim/gui_menu_builder.py:585
 #, fuzzy
-msgid "Configure Room"
-msgstr "Konfiguruj _pokój..."
+msgid "Configure Group Chat"
+msgstr "Opuść pokoje"
 
-#: gajim/gui_menu_builder.py:623
+#: gajim/gui_menu_builder.py:586
 #, fuzzy
 msgid "Upload Avatar…"
 msgstr "Wybierz archiwum"
 
-#: gajim/gui_menu_builder.py:624
+#: gajim/gui_menu_builder.py:587
 #, fuzzy
-msgid "Destroy Room"
-msgstr "_Zlikwiduj pokój"
+msgid "Destroy Group Chat"
+msgstr "Nowa rozmowa grupowa"
 
-#: gajim/gui_menu_builder.py:626 gajim/data/gui/preferences_window.ui:790
+#: gajim/gui_menu_builder.py:589 gajim/data/gui/preferences_window.ui:790
 #, fuzzy
 msgid "Chat Settings"
 msgstr "Wtyczki"
 
-#: gajim/gui_menu_builder.py:627
+#: gajim/gui_menu_builder.py:590
 msgid "Show join/leave"
 msgstr "Pokaż Dołącz/Opuść"
 
-#: gajim/gui_menu_builder.py:628
+#: gajim/gui_menu_builder.py:591
 #, fuzzy
 msgid "Show status changes"
 msgstr "_Zapisuj w logach zmiany statusów kontaktów"
 
-#: gajim/gui_menu_builder.py:629 gajim/data/gui/gc_control_popup_menu.ui:72
+#: gajim/gui_menu_builder.py:592 gajim/data/gui/gc_control_popup_menu.ui:72
 msgid "Notify on all messages"
 msgstr "Powiadamianie o wszystkich wiadomościach"
 
-#: gajim/gui_menu_builder.py:630
+#: gajim/gui_menu_builder.py:593
 msgid "Minimize on close"
 msgstr "_Minimalizuj przy zamknięciu"
 
-#: gajim/gui_menu_builder.py:631
+#: gajim/gui_menu_builder.py:595
 #, fuzzy
-msgid "Minimize on autojoin"
+msgid "Minimize when joining automatically"
 msgstr "Minimalizuj po automatycznym wejściu"
 
-#: gajim/gui_menu_builder.py:634
+#: gajim/gui_menu_builder.py:598
 msgid "Sync Threshold"
 msgstr "Próg synchronizacji"
 
-#: gajim/gui_menu_builder.py:635
+#: gajim/gui_menu_builder.py:599
 #, fuzzy
-msgid "Change Nick"
+msgid "Change Nickname"
 msgstr "Zmień pseudo_nim..."
 
-#: gajim/gui_menu_builder.py:636
-#, fuzzy
-msgid "Bookmark Room"
-msgstr "_Dodaj zakładkę do tego pokoju"
-
-#: gajim/gui_menu_builder.py:637
+#: gajim/gui_menu_builder.py:600
 #, fuzzy
 msgid "Request Voice"
 msgstr "_Głos"
 
-#: gajim/gui_menu_builder.py:638 gajim/roster_window.py:5246
+#: gajim/gui_menu_builder.py:601 gajim/roster_window.py:5185
 #, fuzzy
 msgid "Execute command"
 msgstr "_Wykonaj komendę"
 
-#: gajim/gui_menu_builder.py:640
+#: gajim/gui_menu_builder.py:603
 #, fuzzy
-msgid "Disconnect"
-msgstr "_Rozłącz"
+msgid "Leave"
+msgstr "_Opuść"
 
-#: gajim/gui_menu_builder.py:678 gajim/gtk/preferences.py:156
+#: gajim/gui_menu_builder.py:641 gajim/gtk/preferences.py:155
 msgid "No threshold"
 msgstr "Brak progu"
 
-#: gajim/gui_menu_builder.py:680 gajim/gtk/preferences.py:158
+#: gajim/gui_menu_builder.py:643 gajim/gtk/preferences.py:157
 #, fuzzy, python-format
 msgid "%i day"
 msgid_plural "%i days"
@@ -396,152 +389,167 @@ msgstr[0] "%i dni temu"
 msgstr[1] "%i dni temu"
 msgstr[2] "%i dni temu"
 
-#: gajim/gui_menu_builder.py:709 gajim/gui_menu_builder.py:747
-#: gajim/gtk/join_groupchat.py:43
-msgid "Join Group Chat"
-msgstr "Dołącz do pokoju"
-
-#: gajim/gui_menu_builder.py:746
+#: gajim/gui_menu_builder.py:672
 #, fuzzy
 msgid "Add Contact…"
 msgstr "_Dodaj kontakt..."
 
-#: gajim/gui_menu_builder.py:748 gajim/gtk/profile.py:52
-#: gajim/gtk/accounts.py:770 gajim/gtk/accounts.py:808
+#: gajim/gui_menu_builder.py:673 gajim/gtk/profile.py:52
+#: gajim/gtk/accounts.py:773 gajim/gtk/accounts.py:811
 msgid "Profile"
 msgstr "Profil"
 
-#: gajim/gui_menu_builder.py:749
+#: gajim/gui_menu_builder.py:674
+msgid "Send Single Message…"
+msgstr "Wyślij pojedynczą wiadomość..."
+
+#: gajim/gui_menu_builder.py:675
 msgid "Discover Services"
 msgstr "Wyszukuj usługi"
 
-#: gajim/gui_menu_builder.py:750
-msgid "Send Single Message…"
-msgstr "Wyślij pojedynczą wiadomość..."
+#: gajim/gui_menu_builder.py:676 gajim/gtk/server_info.py:36
+#, fuzzy
+msgid "Server Info"
+msgstr "Serwer"
 
-#: gajim/gui_menu_builder.py:751 gajim/data/gui/preferences_window.ui:2741
+#: gajim/gui_menu_builder.py:677 gajim/data/gui/preferences_window.ui:2741
 msgid "Advanced"
 msgstr "Zaawansowane"
 
-#: gajim/gui_menu_builder.py:752 gajim/gtk/mam_preferences.py:88
+#: gajim/gui_menu_builder.py:678 gajim/gtk/mam_preferences.py:88
 #, fuzzy
 msgid "Archiving Preferences"
 msgstr "_Ustawienia"
 
-#: gajim/gui_menu_builder.py:753
+#: gajim/gui_menu_builder.py:679
 #, fuzzy
 msgid "Blocking List"
 msgstr "Lista kontaktów zablokowanych"
 
-#: gajim/gui_menu_builder.py:754 gajim/gtk/history_sync.py:108
+#: gajim/gui_menu_builder.py:680
+msgid "Bookmarks"
+msgstr "Zakładki"
+
+#: gajim/gui_menu_builder.py:681
+#, fuzzy
+msgid "PEP Configuration"
+msgstr "Konfiguracja pokoju"
+
+#: gajim/gui_menu_builder.py:682 gajim/gtk/history_sync.py:108
 #: gajim/gtk/history_sync.py:186
 #, fuzzy
 msgid "Synchronise History"
 msgstr "Synchronizuj"
 
-#: gajim/gui_menu_builder.py:755 gajim/gtk/privacy_list.py:427
+#: gajim/gui_menu_builder.py:683 gajim/gtk/privacy_list.py:427
 msgid "Privacy Lists"
 msgstr "Listy prywatności"
 
-#: gajim/gui_menu_builder.py:756 gajim/gtk/server_info.py:36
-#, fuzzy
-msgid "Server Info"
-msgstr "Serwer"
-
-#: gajim/gui_menu_builder.py:757 gajim/gui_menu_builder.py:768
+#: gajim/gui_menu_builder.py:685 gajim/gui_menu_builder.py:696
 #: gajim/data/gui/xml_console_window.ui:77
 msgid "XML Console"
 msgstr "Konsola XML"
 
-#: gajim/gui_menu_builder.py:759 gajim/data/gui/groupchat_config.ui:36
+#: gajim/gui_menu_builder.py:687 gajim/data/gui/groupchat_config.ui:36
 #, fuzzy
 msgid "Admin"
 msgstr "_Administrator"
 
-#: gajim/gui_menu_builder.py:760
+#: gajim/gui_menu_builder.py:688
 msgid "Send Server Message…"
 msgstr "Wyślij wiadomość z serwera..."
 
-#: gajim/gui_menu_builder.py:761
+#: gajim/gui_menu_builder.py:689
 #, fuzzy
 msgid "Set MOTD…"
 msgstr "Ustaw MOTD"
 
-#: gajim/gui_menu_builder.py:762
+#: gajim/gui_menu_builder.py:690
 msgid "Update MOTD…"
 msgstr "Uaktualnij MOTD..."
 
-#: gajim/gui_menu_builder.py:763
+#: gajim/gui_menu_builder.py:691
 msgid "Delete MOTD…"
 msgstr "Usuń MOTD"
 
-#: gajim/gui_menu_builder.py:812
+#: gajim/gui_menu_builder.py:736
 #, fuzzy
-msgid "No Accounts available"
-msgstr "Żadne konto nie jest dostępne"
+msgid "_Add Account…"
+msgstr "_Dodaj kontakt..."
+
+#: gajim/gui_menu_builder.py:742
+#, fuzzy
+msgid "_Modify Accounts…"
+msgstr "_Modyfikuj konto"
 
-#: gajim/gui_menu_builder.py:823 gajim/data/gui/application_menu.ui:5
-#: gajim/data/gui/application_menu.ui:71 gajim/data/gui/shortcuts_window.ui:182
-#: gajim/gtk/accounts.py:58
+#: gajim/gui_menu_builder.py:751 gajim/data/gui/zeroconf_context_menu.ui:26
+#: gajim/data/gui/account_context_menu.ui:79
+#, fuzzy
+msgid "_Modify Account…"
+msgstr "_Modyfikuj konto"
+
+#: gajim/gui_menu_builder.py:755 gajim/data/gui/application_menu.ui:5
+#: gajim/data/gui/shortcuts_window.ui:182 gajim/gtk/accounts.py:57
 msgid "Accounts"
 msgstr "Konta"
 
-#: gajim/gui_menu_builder.py:881 gajim/gui_menu_builder.py:886
-msgid "Copy JID"
-msgstr "Kopiuj JID"
+#: gajim/gui_menu_builder.py:784 gajim/gui_menu_builder.py:789
+#, fuzzy
+msgid "Copy XMPP Address"
+msgstr "_Kopiuj JID/Adres e-mail"
 
-#: gajim/gui_menu_builder.py:882 gajim/gui_menu_builder.py:914
+#: gajim/gui_menu_builder.py:785 gajim/gui_menu_builder.py:817
 #, fuzzy
 msgid "Join Groupchat"
 msgstr "Dołącz do pokoju"
 
-#: gajim/gui_menu_builder.py:887 gajim/gui_menu_builder.py:913
-#: gajim/data/gui/application_menu.ui:76
+#: gajim/gui_menu_builder.py:790 gajim/gui_menu_builder.py:816
+#: gajim/data/gui/application_menu.ui:71
 #: gajim/data/gui/subscription_request_window.ui:106
 msgid "Start Chat"
 msgstr "Rozpocznij rozmowę"
 
-#: gajim/gui_menu_builder.py:888 gajim/gui_menu_builder.py:915
+#: gajim/gui_menu_builder.py:791 gajim/gui_menu_builder.py:818
 #, fuzzy
-msgid "Add to Roster…"
-msgstr "Dodaj do listy kontaktów"
+msgid "Add to Contact List…"
+msgstr "_Dodaj kontakt..."
 
-#: gajim/gui_menu_builder.py:893
+#: gajim/gui_menu_builder.py:796
 #, fuzzy
 msgid "Copy Link Location"
 msgstr "_Kopiuj adres odnośnika"
 
-#: gajim/gui_menu_builder.py:894
+#: gajim/gui_menu_builder.py:797
 #, fuzzy
 msgid "Open Link in Browser"
 msgstr "_Otwórz Link w przeglądarce"
 
-#: gajim/gui_menu_builder.py:899
+#: gajim/gui_menu_builder.py:802
 #, fuzzy
 msgid "Copy Email Address"
 msgstr "_Kopiuj JID/Adres e-mail"
 
-#: gajim/gui_menu_builder.py:900 gajim/gui_menu_builder.py:912
+#: gajim/gui_menu_builder.py:803 gajim/gui_menu_builder.py:815
 #, fuzzy
 msgid "Open Email Composer"
 msgstr "_Otwórz Klienta Poczty"
 
-#: gajim/gui_menu_builder.py:905
+#: gajim/gui_menu_builder.py:808
 #, fuzzy
 msgid "Copy Location"
 msgstr "_Kopiuj adres odnośnika"
 
-#: gajim/gui_menu_builder.py:906
+#: gajim/gui_menu_builder.py:809
 #, fuzzy
 msgid "Show Location"
 msgstr "Powiadomienia"
 
-#: gajim/gui_menu_builder.py:911
+#: gajim/gui_menu_builder.py:814
 #, fuzzy
-msgid "Copy JID/Email"
+msgid "Copy XMPP Address/Email"
 msgstr "_Kopiuj JID/Adres e-mail"
 
-#: gajim/gui_menu_builder.py:945
+#: gajim/gui_menu_builder.py:852
 #, fuzzy
 msgid "Copy"
 msgstr "Pokój:"
@@ -564,44 +572,55 @@ msgstr "Pokaż ten tekst pomocy i wyjdź"
 msgid "Choose folder for logfile"
 msgstr "Wybierz folder dla pliku logu"
 
-#: gajim/history_manager.py:107
+#: gajim/history_manager.py:106
 msgid "Cannot find history logs database"
 msgstr "Nie można odnaleźć bazy danych z historią rozmów"
 
-#: gajim/history_manager.py:108
-#, fuzzy, python-format
+#: gajim/history_manager.py:107
+#, python-format
 msgid "%s does not exist."
-msgstr "Plik nie istnieje."
+msgstr "%s nie istnieje."
 
-#: gajim/history_manager.py:141 gajim/history_manager.py:195
-#: gajim/gtk/discovery.py:829 gajim/gtk/roster_item_exchange.py:80
-msgid "JID"
-msgstr "JID"
+#: gajim/history_manager.py:140 gajim/history_manager.py:194
+#: 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:30
+#: gajim/gtk/accounts.py:804
+msgid "XMPP Address"
+msgstr "Adres XMPP"
 
-#: gajim/history_manager.py:154 gajim/history_manager.py:202
+#: gajim/history_manager.py:153 gajim/history_manager.py:201
 #: gajim/data/gui/history_window.ui:89 gajim/gtk/history.py:108
 msgid "Date"
 msgstr "Data"
 
-#: gajim/history_manager.py:161 gajim/history_manager.py:225
+#: gajim/history_manager.py:160 gajim/history_manager.py:224
 #: gajim/data/gui/join_groupchat_window.ui:208
 #: gajim/data/gui/profile_window.ui:214
 #: gajim/data/gui/vcard_information_window.ui:443
+#: gajim/data/gui/bookmarks.ui:140
 msgid "Nickname"
 msgstr "Pseudonim"
 
-#: gajim/history_manager.py:172 gajim/history_manager.py:211
+#: gajim/history_manager.py:171 gajim/history_manager.py:210
 #: gajim/data/gui/preferences_window.ui:1344
 #: gajim/data/gui/single_message_window.ui:275 gajim/gtk/history.py:117
 msgid "Message"
 msgstr "Wiadomość"
 
-#: gajim/history_manager.py:180 gajim/history_manager.py:218
+#: gajim/history_manager.py:179 gajim/history_manager.py:217
 #: gajim/data/gui/groups_post_window.ui:49
 #: gajim/data/gui/single_message_window.ui:214
 msgid "Subject"
 msgstr "Temat"
 
+#: gajim/history_manager.py:247
+#, fuzzy
+msgid "Database Cleanup"
+msgstr "Błąd bazy danych"
+
 #: gajim/history_manager.py:248
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
@@ -612,41 +631,36 @@ msgstr ""
 
 #: gajim/history_manager.py:250
 msgid ""
-"Normally allocated database size will not be freed, it will just become "
-"reusable. If you really want to reduce database filesize, click YES, else "
-"click NO.\n"
-"\n"
-"In case you click YES, please wait…"
+"Normally, the allocated database size will not be freed, it will just become "
+"reusable. This operation may take a while."
 msgstr ""
 "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 zminejszyć rozmiar bazy danych kliknij TAK, w "
-"przeciwnym wypadku wybierz NIE.\n"
-"\n"
-"Jeżeli kliknąłeś TAK, musisz teraz poczekać..."
+"Jeżeli naprawdę chcesz zmniejszyć rozmiar bazy danych kliknij TAK, w "
+"przeciwnym wypadku wybierz NIE.Jeżeli kliknąłeś TAK, musisz teraz poczekać..."
 
 #: gajim/history_manager.py:255
 #, fuzzy
-msgid "Database Cleanup"
-msgstr "Błąd bazy danych"
+msgid "_Cleanup"
+msgstr "Wyczy_ść"
 
-#: gajim/history_manager.py:519 gajim/gtk/filetransfer.py:238
-#: gajim/gtk/filetransfer.py:248
+#: gajim/history_manager.py:518 gajim/gtk/filetransfer.py:237
+#: gajim/gtk/filetransfer.py:247
 msgid "You"
 msgstr "Ty"
 
-#: gajim/history_manager.py:531
+#: gajim/history_manager.py:530
 #, 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:568 gajim/history_manager.py:607
-#: gajim/gtk/dialogs.py:58 gajim/gtk/themes.py:319
+#: gajim/history_manager.py:567 gajim/history_manager.py:606
+#: gajim/gtk/dialogs.py:57 gajim/gtk/themes.py:319
 #: gajim/gtk/roster_item_exchange.py:75 gajim/gtk/roster_item_exchange.py:185
 msgid "Delete"
 msgstr "Usuń"
 
-#: gajim/history_manager.py:569
+#: gajim/history_manager.py:568
 #, fuzzy
 msgid "Delete Conversation"
 msgid_plural "Delete Conversations"
@@ -654,7 +668,7 @@ msgstr[0] "Potwierdzenie usunięcia"
 msgstr[1] "Potwierdzenie usunięcia"
 msgstr[2] "Potwierdzenie usunięcia"
 
-#: gajim/history_manager.py:570
+#: gajim/history_manager.py:569
 #, 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?"
@@ -662,7 +676,7 @@ msgstr[0] "Czy na pewno chcesz trwale usunąć rozmowy z <b>%s</b>?"
 msgstr[1] "Czy na pewno chcesz trwale usunąć te rozmowy?"
 msgstr[2] ""
 
-#: gajim/history_manager.py:608
+#: gajim/history_manager.py:607
 #, fuzzy
 msgid "Delete Message"
 msgid_plural "Delete Messages"
@@ -670,7 +684,7 @@ msgstr[0] "Domyśla wiadomość"
 msgstr[1] "Domyśla wiadomość"
 msgstr[2] "Domyśla wiadomość"
 
-#: gajim/history_manager.py:609
+#: gajim/history_manager.py:608
 #, fuzzy
 msgid "Do you want to permanently delete this message"
 msgid_plural "Do you want to permanently delete these messages"
@@ -684,15 +698,15 @@ msgid "Contact name: <i>%s</i>"
 msgstr "Nazwa kontaktu: <i>%s</i>"
 
 #: gajim/dialogs.py:84
-#, fuzzy, python-format
-msgid "JID: <i>%s</i>"
-msgstr "JID : <i>%s</i>"
+#, python-format
+msgid "XMPP Address: <i>%s</i>"
+msgstr ""
 
-#: gajim/dialogs.py:115 gajim/dialogs.py:128 gajim/roster_window.py:2901
-#: gajim/roster_window.py:3833 gajim/roster_window.py:5084
-#: gajim/common/contacts.py:157 gajim/common/contacts.py:190
+#: gajim/dialogs.py:115 gajim/dialogs.py:128 gajim/roster_window.py:2894
+#: gajim/roster_window.py:3784 gajim/roster_window.py:5023
+#: gajim/common/contacts.py:157 gajim/common/contacts.py:206
 #: gajim/data/gui/preferences_window.ui:558
-#: gajim/data/gui/shortcuts_window.ui:177 gajim/gtk/accounts.py:349
+#: gajim/data/gui/shortcuts_window.ui:177 gajim/gtk/accounts.py:352
 msgid "General"
 msgstr "Ogólne"
 
@@ -738,7 +752,7 @@ msgstr "Zmienić opis statusu?"
 msgid "Preset 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ć?"
 
-#: gajim/dialogs.py:703
+#: gajim/dialogs.py:703 gajim/plugins/gui.py:292
 #, fuzzy
 msgid "_Overwrite"
 msgstr "Nadpisać?"
@@ -751,9 +765,7 @@ msgstr "Szablony opisów"
 msgid "Please type a name for this status message"
 msgstr "Podaj nazwę dla tego szablonu"
 
-#: gajim/dialogs.py:740 gajim/gui_interface.py:1441 gajim/dialog_messages.py:31
-#: gajim/gtk/discovery.py:518 gajim/gtk/profile.py:323
-#: gajim/gtk/join_groupchat.py:234
+#: gajim/dialogs.py:740 gajim/gtk/discovery.py:517 gajim/gtk/profile.py:323
 msgid "You are not connected to the server"
 msgstr "Nie jesteś połączony z serwerem"
 
@@ -761,9 +773,11 @@ msgstr "Nie jesteś połączony z serwerem"
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Nie możesz zsynchronizować kontaktów przy niektywnym połączeniu."
 
-#: gajim/dialogs.py:752 gajim/dialogs.py:823 gajim/gtk/discovery.py:822
-#: gajim/gtk/discovery.py:1648 gajim/gtk/discovery.py:1941
-#: gajim/gtk/history.py:99 gajim/gtk/roster_item_exchange.py:83
+#: gajim/dialogs.py:752 gajim/dialogs.py:823
+#: gajim/data/gui/groupchat_info_scrolled.ui:16 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/gtk/roster_item_exchange.py:83
 msgid "Name"
 msgstr "Nazwa"
 
@@ -784,397 +798,343 @@ msgstr ""
 msgid "Synchronise"
 msgstr "Synchronizuj"
 
-#: gajim/dialogs.py:1043
+#: gajim/dialogs.py:1042
 msgid "an audio and video"
 msgstr "wideo-głosową"
 
-#: gajim/dialogs.py:1045
+#: gajim/dialogs.py:1044
 msgid "an audio"
 msgstr "głosową"
 
-#: gajim/dialogs.py:1047
+#: gajim/dialogs.py:1046
 msgid "a video"
 msgstr "wideo"
 
-#: gajim/dialogs.py:1051
-#, python-format
+#: gajim/dialogs.py:1050
+#, fuzzy, python-format
 msgid ""
-"%(contact)s wants to start %(type)s session with you. Do you want to answer "
+"%(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:505
-#, fuzzy, python-format
+#: gajim/groupchat_control.py:511
+#, python-format
 msgid "Send File (max. %s MiB)…"
-msgstr "Zapisz obraz jako..."
+msgstr "Wyślij Plik (max. %s MiB)"
 
-#: gajim/groupchat_control.py:507 gajim/chat_control.py:342
+#: gajim/groupchat_control.py:513 gajim/chat_control.py:344
 #, fuzzy
 msgid "No File Transfer available"
 msgstr "Przesyłane pliki"
 
-#: gajim/groupchat_control.py:630 gajim/groupchat_control.py:2349
-msgid "Changing Subject"
-msgstr "Zmiana tematu"
-
-#: gajim/groupchat_control.py:631 gajim/groupchat_control.py:2350
-msgid "Please specify the new subject:"
-msgstr "Wpisz nowy temat:"
-
-#: gajim/groupchat_control.py:638
-msgid "Changing Nickname"
-msgstr "Zmiana pseudonimu"
-
-#: gajim/groupchat_control.py:639
-msgid "Please specify the new nickname you want to use:"
-msgstr "Wpisz nowy pseudonim, którego chcesz używać:"
-
-#: gajim/groupchat_control.py:657
+#: gajim/groupchat_control.py:655
 #, fuzzy
-msgid "Invalid group chat JID"
+msgid "Invalid group chat XMPP Address"
 msgstr "Niepoprawny Jabber ID"
 
-#: gajim/groupchat_control.py:658
+#: gajim/groupchat_control.py:656
 #, fuzzy
-msgid "The group chat JID has not allowed characters."
+msgid "The group chat XMPP Address has not allowed characters."
 msgstr "Używane przez ciebie Jabber ID zawiera niedozwolone znaki."
 
-#: gajim/groupchat_control.py:758 gajim/gtk/profile.py:136
+#: gajim/groupchat_control.py:743 gajim/gtk/profile.py:136
 msgid "Could not load image"
 msgstr "Nie można załadować obrazka."
 
-#: gajim/groupchat_control.py:888
+#: gajim/groupchat_control.py:873
 msgid "Insert Nickname"
 msgstr "Wstaw pseudonim"
 
-#: gajim/groupchat_control.py:1056 gajim/chat_control.py:824
+#: gajim/groupchat_control.py:1041 gajim/chat_control.py:848
 msgid "and authenticated"
 msgstr "oraz autoryzowana"
 
-#: gajim/groupchat_control.py:1060 gajim/chat_control.py:828
+#: gajim/groupchat_control.py:1045 gajim/chat_control.py:852
 msgid "and NOT authenticated"
 msgstr "oraz NIE autoryzowana"
 
-#: gajim/groupchat_control.py:1064
+#: gajim/groupchat_control.py:1049
 #, python-format
 msgid "%(type)s encryption is active %(authenticated)s."
 msgstr "%(type)s szyfrowanie jest aktywne %(authenticated)s."
 
-#: gajim/groupchat_control.py:1111
+#: gajim/groupchat_control.py:1096
 msgid "Conversation with "
 msgstr "Rozmowa z"
 
-#: gajim/groupchat_control.py:1113
+#: gajim/groupchat_control.py:1098
 msgid "Continued conversation"
 msgstr "Kontynuacja rozmowy"
 
-#: gajim/groupchat_control.py:1411
-#, fuzzy, python-format
+#: gajim/groupchat_control.py:1357
+#, python-format
 msgid "%(nick)s has set the subject to %(subject)s"
-msgstr "%(jid)s ustawił temat na %(subject)s"
+msgstr "%(nick)s ustawił temat na %(subject)s"
 
-#: gajim/groupchat_control.py:1433
+#: gajim/groupchat_control.py:1374
 #, fuzzy
-msgid "Room now shows unavailable members"
+msgid "Group chat now shows unavailable members"
 msgstr "Lista zawiera teraz niedostępnych uczestników"
 
-#: gajim/groupchat_control.py:1436
+#: gajim/groupchat_control.py:1377
 #, fuzzy
-msgid "Room now does not show unavailable members"
+msgid "Group chat now does not show unavailable members"
 msgstr "lista nie zawiera teraz niedostępnych użytkowników"
 
-#: gajim/groupchat_control.py:1439
+#: gajim/groupchat_control.py:1380
 msgid "A setting not related to privacy has been changed"
 msgstr "Ustawienie niezwiązane z prywatnością zostały zmienione."
 
-#: gajim/groupchat_control.py:1446
-msgid "Room logging is now enabled"
-msgstr "Logowanie rozmów prowadzonych w pokoju jest teraz włączone"
+#: gajim/groupchat_control.py:1387 gajim/groupchat_control.py:1659
+#, fuzzy
+msgid "Conversations are stored on the server"
+msgstr "Obecna sesja zostanie zachowania w archiwum na serwerze"
 
-#: gajim/groupchat_control.py:1449
-msgid "Room logging is now disabled"
-msgstr "Logowanie rozmów prowadzonych w pokoju jest teraz wyłączone"
+#: gajim/groupchat_control.py:1390
+#, fuzzy
+msgid "Conversations are not stored on the server"
+msgstr "Informacje o Tobie, takie jakie są przechowywane na serwerze"
 
-#: gajim/groupchat_control.py:1452
-msgid "Room is now non-anonymous"
+#: gajim/groupchat_control.py:1393
+#, fuzzy
+msgid "Group chat is now non-anonymous"
 msgstr "Pokój nie jest już anonimowy"
 
-#: gajim/groupchat_control.py:1456
-msgid "Room is now semi-anonymous"
+#: gajim/groupchat_control.py:1397
+#, fuzzy
+msgid "Group chat is now semi-anonymous"
 msgstr "Pokój jest teraz quasi-anonimowy"
 
-#: gajim/groupchat_control.py:1460
+#: gajim/groupchat_control.py:1401
 #, fuzzy
-msgid "Room is now fully anonymous"
+msgid "Group chat is now fully anonymous"
 msgstr "Pokój jest teraz w pełni anonimowy"
 
-#: gajim/groupchat_control.py:1500
+#: gajim/groupchat_control.py:1439
 #, fuzzy, python-format
 msgid "Ping? (%s)"
 msgstr "Pong! (%s s.)"
 
-#: gajim/groupchat_control.py:1503
-#, fuzzy, python-format
+#: gajim/groupchat_control.py:1442
+#, python-format
 msgid "Pong! (%(nick)s %(delay)s s.)"
-msgstr "Pong! (%s s.)"
+msgstr "Pong! (%(nick)s %(delay)s s.)"
 
-#: gajim/groupchat_control.py:1506 gajim/chat_control.py:1213
+#: gajim/groupchat_control.py:1445 gajim/chat_control.py:1237
 msgid "Error."
 msgstr "Błąd."
 
-#: gajim/groupchat_control.py:1711
+#: gajim/groupchat_control.py:1650
 #, fuzzy, python-format
-msgid "You (%s) joined the room"
+msgid "You (%s) joined the group chat"
 msgstr "%s dołączył do pokoju"
 
-#: gajim/groupchat_control.py:1717
-msgid "Any occupant is allowed to see your full JID"
+#: gajim/groupchat_control.py:1655
+#, fuzzy
+msgid "Any participant is allowed to see your full XMPP Address"
 msgstr "Każdy uczestnik może zobaczyć twój pełny JID"
 
-#: gajim/groupchat_control.py:1721
-msgid "Room logging is enabled"
-msgstr "Zapisywanie rozmów prowadzonych w pokoju jest włączone"
-
-#: gajim/groupchat_control.py:1725
-msgid "The server has assigned or modified your roomnick"
+#: gajim/groupchat_control.py:1663
+#, 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"
 
-#: gajim/groupchat_control.py:1732
-msgid "A new room has been created"
+#: gajim/groupchat_control.py:1671
+#, fuzzy
+msgid "A new group chat has been created"
 msgstr "Został utworzony nowy pokój"
 
-#: gajim/groupchat_control.py:1740 gajim/privatechat_control.py:112
+#: gajim/groupchat_control.py:1679 gajim/privatechat_control.py:115
 #, python-format
 msgid "You are now known as %s"
 msgstr "Występujesz teraz jako %s"
 
-#: gajim/groupchat_control.py:1742 gajim/privatechat_control.py:114
+#: gajim/groupchat_control.py:1681 gajim/privatechat_control.py:117
 #, python-brace-format
 msgid "{nick} is now known as {new_nick}"
 msgstr "{nick} występuje teraz jako {new_nick}"
 
-#: gajim/groupchat_control.py:1767 gajim/privatechat_control.py:141
+#: gajim/groupchat_control.py:1706 gajim/privatechat_control.py:144
 #, python-brace-format
 msgid "You are now {show}{status}"
 msgstr "Występujesz teraz jako {show}{status}"
 
-#: gajim/groupchat_control.py:1773 gajim/privatechat_control.py:147
+#: gajim/groupchat_control.py:1712 gajim/privatechat_control.py:150
 #, python-brace-format
 msgid "{nick} is now {show}{status}"
 msgstr "{nick} ma teraz status {show}{status}"
 
-#: gajim/groupchat_control.py:1790 gajim/groupchat_control.py:1819
-#: gajim/groupchat_control.py:1849 gajim/groupchat_control.py:1909
+#: gajim/groupchat_control.py:1729 gajim/groupchat_control.py:1758
+#: gajim/groupchat_control.py:1788 gajim/groupchat_control.py:1848
 #, python-brace-format
 msgid " by {actor}"
 msgstr " przez {actor}"
 
-#: gajim/groupchat_control.py:1793
+#: gajim/groupchat_control.py:1732
 #, python-brace-format
 msgid "** Your Affiliation has been set to {affiliation}{actor}{reason}"
 msgstr "** Grupa użytkownika została ustawiona na {affiliation}{actor}{reason}"
 
-#: gajim/groupchat_control.py:1799
+#: gajim/groupchat_control.py:1738
 #, 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}"
 
-#: gajim/groupchat_control.py:1822
+#: gajim/groupchat_control.py:1761
 #, python-brace-format
 msgid "** Your Role has been set to {role}{actor}{reason}"
 msgstr "** Uprawnienia użytkownika zostały zmienione na {role}{actor}{reason}"
 
-#: gajim/groupchat_control.py:1827
+#: gajim/groupchat_control.py:1766
 #, 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}"
 
-#: gajim/groupchat_control.py:1852
-#, python-brace-format
-msgid "You have been removed from the room{actor}{reason}"
+#: gajim/groupchat_control.py:1791
+#, fuzzy, python-brace-format
+msgid "You have been removed from the group chat{actor}{reason}"
 msgstr "Zostałeś wyrzucony z pokoju: {actor}{reason}"
 
-#: gajim/groupchat_control.py:1857
+#: gajim/groupchat_control.py:1796
 #, python-brace-format
 msgid "You have left due to an error{reason}"
 msgstr "Zostałeś rozłączony z powodu błędu{reason}"
 
-#: gajim/groupchat_control.py:1863
+#: gajim/groupchat_control.py:1802
 #, python-brace-format
 msgid "You have been kicked{actor}{reason}"
 msgstr "Zostałeś zablokowany{actor}{reason}"
 
-#: gajim/groupchat_control.py:1870
+#: gajim/groupchat_control.py:1809
 #, python-brace-format
 msgid "You have been banned{actor}{reason}"
 msgstr "Zostałeś zablokowany{actor}{reason}"
 
-#: gajim/groupchat_control.py:1877 gajim/groupchat_control.py:1943
+#: gajim/groupchat_control.py:1816 gajim/groupchat_control.py:1882
 #, fuzzy
 msgid ": Affiliation changed"
 msgstr "afiliacja została zmieniona "
 
-#: gajim/groupchat_control.py:1883 gajim/groupchat_control.py:1948
+#: gajim/groupchat_control.py:1822 gajim/groupchat_control.py:1887
 #, fuzzy
-msgid ": Room configuration changed to members-only"
+msgid ": Group chat configuration changed to members-only"
 msgstr "konfiguracja pokoju zmieniona na 'tylko dla członków'"
 
-#: gajim/groupchat_control.py:1912
-#, python-brace-format
-msgid "{nick} has been removed from the room{by}{reason}"
+#: gajim/groupchat_control.py:1851
+#, fuzzy, python-brace-format
+msgid "{nick} has been removed from the group chat{by}{reason}"
 msgstr "{nick} został wyrzucony z pokoju: {by}{reason}"
 
-#: gajim/groupchat_control.py:1922
+#: gajim/groupchat_control.py:1861
 #, python-brace-format
 msgid "{nick} has left due to an error{reason}"
 msgstr "{nick} został rozłączony z powodu błędu{reason}"
 
-#: gajim/groupchat_control.py:1928
+#: gajim/groupchat_control.py:1867
 #, python-brace-format
 msgid "{nick} has been kicked{actor}{reason}"
 msgstr "{nick} został wyrzucony: {actor}{reason}"
 
-#: gajim/groupchat_control.py:1936
+#: gajim/groupchat_control.py:1875
 #, python-brace-format
 msgid "{nick} has been banned{actor}{reason}"
 msgstr "{nick} został zabanowany: {actor}{reason}"
 
-#: gajim/groupchat_control.py:1953
+#: gajim/groupchat_control.py:1892
 #, python-brace-format
 msgid "{nick} has left{reason}"
 msgstr "{nick} wyszedł{reason}"
 
-#: gajim/groupchat_control.py:1970
+#: gajim/groupchat_control.py:1914
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s dołączył do pokoju"
 
-#: gajim/groupchat_control.py:1985 gajim/groupchat_control.py:1990
-#: gajim/groupchat_control.py:1995 gajim/groupchat_control.py:2000
-#: gajim/groupchat_control.py:2011
-msgid "Unable to join group chat"
-msgstr "Nie można dołączyć do pokoju"
-
-#: gajim/groupchat_control.py:1986
-#, python-format
-msgid "You are banned from group chat <b>%s</b>."
-msgstr "Zostałeś zbanowany w pokoju <b>%s</b>."
-
-#: gajim/groupchat_control.py:1991
-#, python-format
-msgid "Remote server <b>%s</b> does not exist."
-msgstr "Serwer zdalny <b>%s</b> nie istnieje"
-
-#: gajim/groupchat_control.py:1996
-#, python-format
-msgid "Group chat <b>%s</b> does not exist."
-msgstr "Pokój <b>%s</b> nie istnieje."
-
-#: gajim/groupchat_control.py:2001
-#, fuzzy
-msgid "Group chat creation is not permitted."
-msgstr "Tworzenie pokoi jest ograniczone."
-
-#: gajim/groupchat_control.py:2005
+#: gajim/groupchat_control.py:1981
 #, fuzzy
-msgid "Unable to join groupchat"
-msgstr "Nie można dołączyć do pokoju"
-
-#: gajim/groupchat_control.py:2006
-#, python-format
-msgid "You must use your registered nickname in <b>%s</b>."
-msgstr "Twój zarejestrowany pseudonim musi być używany w pokoju <b>%s</b>."
-
-#: gajim/groupchat_control.py:2012
-#, python-format
-msgid "You are not in the members list in groupchat %s."
-msgstr "Nie jesteś na liście uczestników rozmów w pokoju %s."
-
-#: gajim/groupchat_control.py:2068
-msgid "Room has been destroyed"
+msgid "Group chat has been destroyed"
 msgstr "Pokój został usunięty"
 
-#: gajim/groupchat_control.py:2073
+#: gajim/groupchat_control.py:1986
 #, fuzzy, python-format
-msgid "You can join this room instead: xmpp:%s?join"
+msgid "You can join this group chat instead: xmpp:%s?join"
 msgstr "W zamian możesz dołączyć do pokoju %s"
 
-#: gajim/groupchat_control.py:2306
+#: gajim/groupchat_control.py:2214
 #, fuzzy
 msgid "Leave Group Chat"
 msgstr "Opuść pokoje"
 
-#: gajim/groupchat_control.py:2307
-#, fuzzy
+#: gajim/groupchat_control.py:2215
 msgid "Are you sure you want to leave this group chat?"
-msgstr "Czy jesteś pewien, że chcesz opuścić pokój \"%s\"?"
+msgstr "Czy jesteś pewien, że chcesz opuścić rozmowę grupową?"
 
-#: gajim/groupchat_control.py:2308
-#, fuzzy, python-format
-msgid "If you close this window, you will be disconnected from '%s'."
-msgstr "Jeśli zamkniesz to okno, połączenie z tym pokojem zostanie zerwane."
+#: gajim/groupchat_control.py:2216
+#, python-format
+msgid "If you close this window, you will leave '%s'."
+msgstr "Zamknięcie tego okna spowoduje opuszczenie rozmowy grupowej '%s'."
 
-#: gajim/groupchat_control.py:2314
+#: gajim/groupchat_control.py:2222 gajim/roster_window.py:5177
 msgid "_Leave"
 msgstr "_Opuść"
 
-#: gajim/groupchat_control.py:2377
+#: gajim/groupchat_control.py:2280 gajim/roster_window.py:3008
 #, fuzzy, python-format
 msgid "%(jid)s has been invited to this group chat"
 msgstr "%(jid)s został zaproszony w tym pokoju"
 
-#: gajim/groupchat_control.py:2527
+#: gajim/groupchat_control.py:2463
 #, python-format
 msgid "Kicking %s"
 msgstr "Wyrzuć %s"
 
-#: gajim/groupchat_control.py:2528 gajim/groupchat_control.py:2829
+#: gajim/groupchat_control.py:2464 gajim/groupchat_control.py:2765
 msgid "You may specify a reason below:"
 msgstr "Podaj przyczynę:"
 
-#: gajim/groupchat_control.py:2828
+#: gajim/groupchat_control.py:2764
 #, python-format
 msgid "Banning %s"
 msgstr "Zabanuj %s"
 
-#: gajim/chat_control.py:408
+#: gajim/chat_control.py:432
 msgid "Show a list of formattings"
 msgstr "Pokaż formatowanie tekstu"
 
-#: gajim/chat_control.py:412
+#: gajim/chat_control.py:436
 #, fuzzy
 msgid "This contact does not support HTML"
 msgstr "Ten kontakt nie może przesyłać i odbierać plików."
 
-#: gajim/chat_control.py:562
+#: gajim/chat_control.py:586
 #, 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:686
+#: gajim/chat_control.py:710
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s z pokoju %(room_name)s"
 
-#: gajim/chat_control.py:832
+#: gajim/chat_control.py:856
 #, python-format
 msgid "%(type)s encryption is active %(authenticated)s"
 msgstr "%(type)s szyfrowanie jest aktywne %(authenticated)s"
 
-#: gajim/chat_control.py:1160 gajim/chat_control.py:1168
+#: gajim/chat_control.py:1184 gajim/chat_control.py:1192
 #, fuzzy
 msgid "Close"
 msgstr "_Wyślij i zamknij"
 
-#: gajim/chat_control.py:1161
+#: gajim/chat_control.py:1185
 #, fuzzy, python-format
 msgid "You just received a new message from %s"
 msgstr "Właśnie otrzymałeś nową wiadomość od \"%s\""
 
-#: gajim/chat_control.py:1163
+#: gajim/chat_control.py:1187
 #, fuzzy
 msgid ""
 "If you close this tab while having chat history disabled, this message will "
@@ -1183,16 +1143,16 @@ msgstr ""
 "Jeśli zamkniesz tę kartę, a nie masz uaktywnionej opcji historii, to "
 "utracisz tę wiadomość."
 
-#: gajim/chat_control.py:1208
+#: gajim/chat_control.py:1232
 msgid "Ping?"
 msgstr "Ping?"
 
-#: gajim/chat_control.py:1211
+#: gajim/chat_control.py:1235
 #, fuzzy, python-format
 msgid "Pong! (%s seconds)"
 msgstr "Pong! (%s s.)"
 
-#: gajim/chat_control.py:1308
+#: gajim/chat_control.py:1332
 #, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -1201,252 +1161,260 @@ msgstr ""
 "Temat: %(subject)s\n"
 "%(message)s"
 
-#: gajim/chat_control.py:1416
+#: gajim/chat_control.py:1440
 #, python-format
 msgid "%(name)s is now %(show)s %(status)s"
-msgstr "%(name)s ma teraz status %(status)s"
+msgstr "%(name)s ma teraz status %(show)s %(status)s"
 
-#: gajim/chat_control.py:1476 gajim/data/gui/application_menu.ui:32
+#: gajim/chat_control.py:1500 gajim/data/gui/application_menu.ui:32
 #: gajim/gtk/http_upload_progress.py:35
 #, fuzzy
 msgid "File Transfer"
 msgstr "Przesyłane pliki"
 
-#: gajim/chat_control.py:1480
+#: gajim/chat_control.py:1504
 msgid "Size"
-msgstr "Rozmiar: %s"
+msgstr "Rozmiar"
 
-#: gajim/chat_control.py:1482 gajim/chat_control.py:1546
+#: gajim/chat_control.py:1506 gajim/chat_control.py:1566
+#: gajim/gui_interface.py:190
 #: gajim/data/gui/groupchat_invitation_received.ui:77
-#: gajim/gtk/filetransfer.py:485
+#: gajim/gtk/filetransfer.py:490
 #, fuzzy
 msgid "_Accept"
 msgstr "Akceptuj"
 
-#: gajim/chat_control.py:1484 gajim/chat_control.py:1548
+#: gajim/chat_control.py:1508 gajim/chat_control.py:1568
 #: gajim/data/gui/groupchat_invitation_received.ui:62
 #, fuzzy
 msgid "_Decline"
 msgstr "R_ozłączony"
 
-#: gajim/chat_control.py:1506 gajim/gui_interface.py:791
-#: gajim/gui_interface.py:821 gajim/gui_interface.py:847
+#: gajim/chat_control.py:1530 gajim/gui_interface.py:777
+#: gajim/gui_interface.py:807 gajim/gui_interface.py:833
 #: gajim/gtk/notification.py:173 gajim/gtk/notification.py:278
 msgid "File Transfer Completed"
 msgstr "Zakończono przesyłanie pliku"
 
-#: gajim/chat_control.py:1510 gajim/gtk/filetransfer.py:259
+#: gajim/chat_control.py:1534 gajim/gtk/filetransfer.py:258
 #, fuzzy
 msgid "Open _Folder"
 msgstr "_Otwórz katalog zawierający ten plik"
 
-#: gajim/chat_control.py:1512 gajim/chat_control.py:1521
+#: gajim/chat_control.py:1536 gajim/chat_control.py:1545
+#: gajim/data/gui/groupchat_control.ui:962
+#: gajim/data/gui/groupchat_control.ui:1049
+#: gajim/data/gui/groupchat_control.ui:1155
 #, fuzzy
 msgid "_Close"
 msgstr "_Wyślij i zamknij"
 
-#: gajim/chat_control.py:1543 gajim/gui_interface.py:484
+#: gajim/chat_control.py:1563 gajim/gui_interface.py:473
+#: gajim/data/gui/groupchat_invitation_received.ui:42
 #: gajim/gtk/notification.py:174 gajim/gtk/notification.py:195
 #: gajim/gtk/notification.py:281
-msgid "Groupchat Invitation"
+#, fuzzy
+msgid "Group Chat Invitation"
 msgstr "Zaproszenie na czat"
 
-#: gajim/chat_control.py:1568 gajim/roster_window.py:1954
+#: gajim/chat_control.py:1588 gajim/roster_window.py:1951
 msgid "Remote contact stopped transfer"
 msgstr "Druga strona przerwała transfer"
 
-#: gajim/chat_control.py:1570 gajim/roster_window.py:1956
+#: gajim/chat_control.py:1590 gajim/roster_window.py:1953
 msgid "Error opening file"
 msgstr "Błąd odczytu pliku"
 
-#: gajim/chat_control.py:1572 gajim/gtk/filetransfer.py:297
+#: gajim/chat_control.py:1592 gajim/gtk/filetransfer.py:296
 msgid "File transfer stopped"
 msgstr "Przesyłanie pliku zatrzymane"
 
-#: gajim/chat_control.py:1575 gajim/gtk/filetransfer.py:275
-#: gajim/gtk/filetransfer.py:284
+#: gajim/chat_control.py:1595 gajim/gtk/filetransfer.py:274
+#: gajim/gtk/filetransfer.py:283
 msgid "File transfer cancelled"
 msgstr "Przesyłanie pliku anulowane"
 
-#: gajim/chat_control.py:1576
+#: gajim/chat_control.py:1596
 msgid "Connection with peer cannot be established."
 msgstr "Nie można ustanowić połączenia z drugą stroną."
 
-#: gajim/application.py:72
+#: gajim/application.py:75
 #, fuzzy
 msgid "Show the application's version"
 msgstr "Pokaż ikonę w obszarze powiadomienia:"
 
-#: gajim/application.py:79
+#: gajim/application.py:82
 #, fuzzy
 msgid "Show only critical errors"
 msgstr "Pokaż tylko na liście kontaktów"
 
-#: gajim/application.py:86
+#: gajim/application.py:89
 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:94
+#: gajim/application.py:97
 msgid "Print XML stanzas and other debug information"
 msgstr "Drukuj zwrotki XML i inne informacje debugowania"
 
-#: gajim/application.py:101
+#: gajim/application.py:104
 msgid "Use defined profile in configuration directory"
 msgstr "Edytor zaawansowanych ustawień"
 
-#: gajim/application.py:109
-#, fuzzy
+#: gajim/application.py:112
 msgid "Set configuration directory"
-msgstr "%s błąd konfiguracji"
+msgstr "Ustaw folder konfiguracyjny"
 
-#: gajim/application.py:117
+#: gajim/application.py:120
 #, fuzzy
 msgid "Configure logging system"
 msgstr "Konfiguruj"
 
-#: gajim/application.py:125
+#: gajim/application.py:128
 #, fuzzy
 msgid "Show all warnings"
 msgstr "Pokaż wszystkie oczekujące _zdarzenia"
 
-#: gajim/application.py:132
+#: gajim/application.py:135
 msgid "Open IPython shell"
 msgstr "Otwórz powłokę IPython"
 
-#: gajim/application.py:139
+#: gajim/application.py:142
 msgid "Pops up a window with the next pending event"
 msgstr "Pokazuje okno z następną nieprzeczytaną wiadomością"
 
-#: gajim/application.py:145 gajim/data/gui/shortcuts_window.ui:203
+#: gajim/application.py:148 gajim/data/gui/shortcuts_window.ui:203
 #: data/org.gajim.Gajim.desktop.in:21
 #, fuzzy
 msgid "Start a new chat"
 msgstr "Rozpocznij rozmowę"
 
-#: gajim/application.py:152
+#: gajim/application.py:155
 msgid "Simulate loss of connectivity"
 msgstr "Symuluj utratę połączenia"
 
-#: gajim/application.py:159
+#: gajim/application.py:162
 msgid "Simulate regaining connectivity"
 msgstr "Symuluj powrót połączenia"
 
-#: gajim/application.py:201 gajim/gui_interface.py:133
+#: gajim/application.py:204 gajim/gui_interface.py:133
 msgid "Database Error"
 msgstr "Błąd bazy danych"
 
-#: gajim/roster_window.py:294 gajim/roster_window.py:1030
+#: gajim/roster_window.py:291 gajim/roster_window.py:1027
 msgid "Merged accounts"
 msgstr "Połączone konta"
 
-#: gajim/roster_window.py:853 gajim/roster_window.py:1631
-#: gajim/roster_window.py:1664 gajim/roster_window.py:1715
-#: gajim/roster_window.py:1717 gajim/roster_window.py:1872
-#: gajim/roster_window.py:2531 gajim/roster_window.py:5025
-#: gajim/common/contacts.py:188 gajim/common/contacts.py:447
-#: gajim/common/helpers.py:83 gajim/gtk/discovery.py:129
-#: gajim/gtk/discovery.py:130 gajim/gtk/discovery.py:1416
+#: gajim/roster_window.py:850 gajim/roster_window.py:1628
+#: gajim/roster_window.py:1661 gajim/roster_window.py:1712
+#: gajim/roster_window.py:1714 gajim/roster_window.py:1869
+#: gajim/roster_window.py:2528 gajim/roster_window.py:4331
+#: gajim/roster_window.py:4964 gajim/common/contacts.py:204
+#: gajim/common/contacts.py:463 gajim/common/helpers.py:86
+#: gajim/gtk/discovery.py:127 gajim/gtk/discovery.py:128
+#: gajim/gtk/discovery.py:1414
 msgid "Transports"
 msgstr "Transporty"
 
-#: gajim/roster_window.py:1723 gajim/roster_window.py:1725
-#: gajim/roster_window.py:4995 gajim/gui_interface.py:1613
-#: gajim/gui_interface.py:1639 gajim/common/contacts.py:186
-#: gajim/common/helpers.py:83 gajim/common/modules/adhoc_commands.py:245
-msgid "Groupchats"
+#: gajim/roster_window.py:1720 gajim/roster_window.py:1722
+#: gajim/roster_window.py:4331 gajim/roster_window.py:4934
+#: gajim/gui_interface.py:1527 gajim/common/contacts.py:202
+#: gajim/common/helpers.py:86 gajim/common/modules/adhoc_commands.py:245
+#, fuzzy
+msgid "Group chats"
 msgstr "Pokoje"
 
-#: gajim/roster_window.py:2012
+#: gajim/roster_window.py:2009
 #, fuzzy
 msgid "Authorization sent"
 msgstr "Autoryzacja została wysłana"
 
-#: gajim/roster_window.py:2013
+#: gajim/roster_window.py:2010
 #, fuzzy, python-format
 msgid "\"%s\" will now see your status."
 msgstr "Teraz \"%s\" będzie znał Twój status."
 
-#: gajim/roster_window.py:2031
+#: gajim/roster_window.py:2028
 msgid "Subscription request has been sent"
 msgstr "Prośba o autoryzację została wysłana"
 
-#: gajim/roster_window.py:2032
-#, python-format
-msgid "If \"%s\" accepts this request you will know his or her status."
+#: gajim/roster_window.py:2029
+#, fuzzy, 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."
 
-#: gajim/roster_window.py:2046
+#: gajim/roster_window.py:2043
 #, fuzzy
 msgid "Authorization removed"
 msgstr "Autoryzacja została cofnięta"
 
-#: gajim/roster_window.py:2047
+#: gajim/roster_window.py:2044
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Teraz \"%s\" zawsze będzie cię widział jako rozłączonego."
 
-#: gajim/roster_window.py:2250 gajim/roster_window.py:3504
+#: gajim/roster_window.py:2247 gajim/roster_window.py:3460
 msgid "Disconnect for Invisibility"
 msgstr "Rozłączony dla Niewidoczności"
 
-#: gajim/roster_window.py:2251 gajim/roster_window.py:3505
+#: gajim/roster_window.py:2248 gajim/roster_window.py:3461
 msgid "You are participating in one or more group chats"
 msgstr "Znajdujesz się w jednym lub kilku pokojach"
 
-#: gajim/roster_window.py:2252 gajim/roster_window.py:3506
+#: gajim/roster_window.py:2249 gajim/roster_window.py:3462
+#, fuzzy
 msgid ""
-"Changing your status to invisible will result in disconnection from those "
-"group chats.\n"
+"Changing your status to invisible will result in you leaving those group "
+"chats.\n"
 "Are you sure you want to go invisible?"
 msgstr ""
 "Zmiana statusu na Niewidoczny spowoduje rozłączenie z tym pokojami.\n"
 "Czy na pewno chcesz stać się niewidoczny?"
 
-#: gajim/roster_window.py:2257 gajim/roster_window.py:3512
-#: gajim/roster_window.py:5238 gajim/data/gui/gc_control_popup_menu.ui:120
+#: gajim/roster_window.py:2254 gajim/roster_window.py:3468
+#: gajim/data/gui/gc_control_popup_menu.ui:120
 msgid "_Disconnect"
 msgstr "_Rozłącz"
 
-#: gajim/roster_window.py:2285
+#: gajim/roster_window.py:2282
 #, fuzzy
 msgid "desynced"
 msgstr "rozsynchronizowany"
 
-#: gajim/roster_window.py:2353 gajim/data/gui/shortcuts_window.ui:224
+#: gajim/roster_window.py:2350 gajim/data/gui/shortcuts_window.ui:224
 msgid "Quit Gajim"
 msgstr "Zamknij Gajim"
 
-#: gajim/roster_window.py:2354
+#: gajim/roster_window.py:2351
 msgid "You are about to quit Gajim"
 msgstr "Zamierzasz zamknąć Gajim"
 
-#: gajim/roster_window.py:2355
+#: gajim/roster_window.py:2352
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Na pewno chcesz zamknąć Gajim?"
 
-#: gajim/roster_window.py:2356
+#: gajim/roster_window.py:2353
 msgid "_Always quit when closing Gajim"
 msgstr "_Zawsze zamykaj Gajima"
 
-#: gajim/roster_window.py:2359 gajim/roster_window.py:2455
-#: gajim/roster_window.py:2495 gajim/data/gui/systray_context_menu.ui:90
+#: gajim/roster_window.py:2356 gajim/roster_window.py:2452
+#: gajim/roster_window.py:2492 gajim/data/gui/systray_context_menu.ui:83
 msgid "_Quit"
 msgstr "_Zakończ"
 
-#: gajim/roster_window.py:2448
+#: gajim/roster_window.py:2445
 #, fuzzy
 msgid "Stop File Transfers"
 msgstr "Przesyłane pliki"
 
-#: gajim/roster_window.py:2449
+#: gajim/roster_window.py:2446
 #, fuzzy
 msgid "You still have running file transfers"
 msgstr "Usuwa transfer pliku"
 
-#: gajim/roster_window.py:2450
+#: gajim/roster_window.py:2447
 msgid ""
 "If you quit now, the file(s) being transferred will be lost.\n"
 "Do you still want to quit?"
@@ -1454,17 +1422,17 @@ msgstr ""
 "Jeśli zamkniesz teraz, pobieranie plików zostanie zatrzymane.\n"
 "Czy nadal chcesz zakończyć pracę?"
 
-#: gajim/roster_window.py:2488
+#: gajim/roster_window.py:2485
 #, fuzzy
 msgid "Unread Messages"
 msgstr "Nieprzeczytane wiadomości"
 
-#: gajim/roster_window.py:2489
+#: gajim/roster_window.py:2486
 #, fuzzy
 msgid "You still have unread messages"
 msgstr "Masz nieprzeczytane wiadomości"
 
-#: gajim/roster_window.py:2490
+#: gajim/roster_window.py:2487
 #, fuzzy
 msgid ""
 "Messages will only be available for reading them later if storing chat "
@@ -1473,20 +1441,20 @@ msgstr ""
 "Wiadomości będą dostępne do odczytania ich później, tylko wtedy, gdy masz "
 "włączoną obsługę historii."
 
-#: gajim/roster_window.py:2760
+#: gajim/roster_window.py:2753
 msgid "You have unread messages"
 msgstr "Masz nieprzeczytane wiadomości"
 
-#: gajim/roster_window.py:2761
+#: gajim/roster_window.py:2754
 msgid "You must read them before removing this transport."
 msgstr "Przejrzyj je wszystkie przed usunięciem tego transportu."
 
-#: gajim/roster_window.py:2764
+#: gajim/roster_window.py:2757
 #, fuzzy, python-format
 msgid "Transport '%s' will be removed"
 msgstr "Transport \"%s\" zostanie usunięty"
 
-#: gajim/roster_window.py:2765
+#: gajim/roster_window.py:2758
 #, fuzzy
 msgid ""
 "You will no longer be able to send and receive messages from and to contacts "
@@ -1495,11 +1463,11 @@ msgstr ""
 "Nie będziesz już mógł wysyłać i odbierać wiadomości od kontaktów za pomocą "
 "tego transportu."
 
-#: gajim/roster_window.py:2768
+#: gajim/roster_window.py:2761
 msgid "Transports will be removed"
 msgstr "Transporty zostaną usunięte"
 
-#: gajim/roster_window.py:2773
+#: gajim/roster_window.py:2766
 #, python-format
 msgid ""
 "You will no longer be able to send and receive messages from and to contacts "
@@ -1510,22 +1478,21 @@ msgstr ""
 "tego transportu:\n"
 "%s"
 
-#: gajim/roster_window.py:2777
-#, fuzzy
+#: gajim/roster_window.py:2770
 msgid "Remove Transport"
-msgstr "Pokaż trans_porty"
+msgstr "Usuń transport"
 
-#: gajim/roster_window.py:2844
+#: gajim/roster_window.py:2837
 #, fuzzy
 msgid "Block Contact"
 msgstr "Zablokowane kontakty"
 
-#: gajim/roster_window.py:2845
+#: gajim/roster_window.py:2838
 #, fuzzy
 msgid "Really block this contact?"
 msgstr "Czy OpenPGP jest włączone dla tego kontaktu?"
 
-#: gajim/roster_window.py:2846
+#: gajim/roster_window.py:2839
 #, fuzzy
 msgid ""
 "This contact will see you offline and you will not receive any messages sent "
@@ -1534,65 +1501,60 @@ msgstr ""
 "Ten kontakt będzie Cię widział jako rozłączonego. Nie otrzymasz też od niego "
 "żadnych komunikatów."
 
-#: gajim/roster_window.py:2851
+#: gajim/roster_window.py:2844
 #, fuzzy
 msgid "_Block Contact"
 msgstr "Zablokowane kontakty"
 
-#: gajim/roster_window.py:2896
+#: gajim/roster_window.py:2889
 msgid "Rename Contact"
 msgstr "Zmień nazwę dla kontaktu"
 
-#: gajim/roster_window.py:2897
+#: gajim/roster_window.py:2890
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Wpisz nazwę dla kontaktu %s."
 
-#: gajim/roster_window.py:2904
+#: gajim/roster_window.py:2897
 msgid "Rename Group"
 msgstr "Zmień nazwę grupy"
 
-#: gajim/roster_window.py:2905
+#: gajim/roster_window.py:2898
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Wpisz nową nazwę dla grupy %s."
 
-#: gajim/roster_window.py:2953 gajim/roster_window.py:2954
+#: gajim/roster_window.py:2946 gajim/roster_window.py:2947
 msgid "Remove Group"
 msgstr "Usuń grupę"
 
-#: gajim/roster_window.py:2955
+#: gajim/roster_window.py:2948
 #, fuzzy, python-format
 msgid "Do you want to remove %s from the contact list?"
 msgstr "Czy chcesz usunąć z rostera grupę %s?"
 
-#: gajim/roster_window.py:2956
+#: gajim/roster_window.py:2949
 #, fuzzy
 msgid "_Also remove all contacts of this group from contact list"
 msgstr "Usuń z rostera wszystkie kontakty należące do tej grupy"
 
-#: gajim/roster_window.py:3044
-#, python-format
-msgid "%(jid)s has been invited in this room"
-msgstr "%(jid)s został zaproszony w tym pokoju"
-
-#: gajim/roster_window.py:3353
+#: gajim/roster_window.py:3309
 #, fuzzy
 msgid "Remove Contact"
 msgstr "Zmień nazwę dla kontaktu"
 
-#: gajim/roster_window.py:3354
+#: gajim/roster_window.py:3310
 #, fuzzy
 msgid "Remove contact from contact list"
 msgstr "Usuwa kontakt z listy kontaktów"
 
-#: gajim/roster_window.py:3355
+#: gajim/roster_window.py:3311
 #, fuzzy, 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"
 
-#: gajim/roster_window.py:3364 gajim/roster_window.py:3384
+#: gajim/roster_window.py:3320 gajim/roster_window.py:3340
 #, fuzzy
 msgid ""
 "By removing this contact you also remove authorization. This means the "
@@ -1601,21 +1563,21 @@ msgstr ""
 "Usuwając ten kontakt, usuwasz również autoryzację, która spowoduje, że "
 "zawsze będziesz widoczny jako offline."
 
-#: gajim/roster_window.py:3375
+#: gajim/roster_window.py:3331
 msgid "Do you want to continue?"
 msgstr "Czy chcesz kontynuować?"
 
-#: gajim/roster_window.py:3386
+#: gajim/roster_window.py:3342
 #, fuzzy
 msgid "_I want this contact to know my status after removal"
 msgstr "Chcę żeby po usunięciu ten kontakt znał mój status"
 
-#: gajim/roster_window.py:3393
+#: gajim/roster_window.py:3349
 #, fuzzy
 msgid "Remove contacts from contact list"
 msgstr "Usuwa kontakt z listy kontaktów"
 
-#: gajim/roster_window.py:3399
+#: gajim/roster_window.py:3355
 #, python-format
 msgid ""
 "By removing the following contacts, you will also remove authorization. This "
@@ -1628,24 +1590,24 @@ msgstr ""
 "\n"
 "%s"
 
-#: gajim/roster_window.py:3403
+#: gajim/roster_window.py:3359
 #, fuzzy
 msgid "Remove Contacts"
 msgstr "Zmień nazwę dla kontaktu"
 
-#: gajim/roster_window.py:3423
+#: gajim/roster_window.py:3379
 msgid "No account available"
 msgstr "Żadne konto nie jest dostępne"
 
-#: gajim/roster_window.py:3424
+#: gajim/roster_window.py:3380
 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."
 
-#: gajim/roster_window.py:4060
+#: gajim/roster_window.py:4011
 msgid "Metacontacts storage not supported by your server"
 msgstr "Twój serwer uniemożliwia przechowywanie metakontaktów"
 
-#: gajim/roster_window.py:4062
+#: gajim/roster_window.py:4013
 #, fuzzy
 msgid ""
 "Your server does not support storing metacontacts information. So this "
@@ -1654,12 +1616,12 @@ msgstr ""
 "Twój serwer uniemożliwia przechowywanie metakontaktów. Informacja ta nie "
 "zostanie przywrócona podczas następnego połączenia."
 
-#: gajim/roster_window.py:4159
+#: gajim/roster_window.py:4110
 #, fuzzy
 msgid "You are about to create a metacontact"
 msgstr "Chcesz utworzyć metakontakt. Kontynuować?"
 
-#: gajim/roster_window.py:4160
+#: gajim/roster_window.py:4111
 #, fuzzy
 msgid ""
 "Metacontacts are a way to regroup several contacts in one single contact. "
@@ -1670,26 +1632,26 @@ msgstr ""
 "rostera. Używa się ich przede wszystkim wtedy, gdy jedna osoba ma kilka kont "
 "Jabbera lub zarejestrowana jest w kilku transportach."
 
-#: gajim/roster_window.py:4164
+#: gajim/roster_window.py:4115
 #, fuzzy
 msgid "Create Metacontact"
 msgstr "Zmień nazwę dla kontaktu"
 
-#: gajim/roster_window.py:4170
+#: gajim/roster_window.py:4121 gajim/data/gui/groupchat_creation.ui:317
 #, fuzzy
 msgid "_Create"
 msgstr "Twórczy"
 
-#: gajim/roster_window.py:4287
+#: gajim/roster_window.py:4238
 msgid "Invalid file URI:"
 msgstr "Niepoprawny adres pliku:"
 
-#: gajim/roster_window.py:4298
+#: gajim/roster_window.py:4249
 #, fuzzy
 msgid "Send file?"
 msgstr "Wyślij _plik"
 
-#: gajim/roster_window.py:4299
+#: gajim/roster_window.py:4250
 #, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
@@ -1697,98 +1659,89 @@ 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:"
 
-#: gajim/roster_window.py:4451
+#: gajim/roster_window.py:4401
 #, fuzzy, python-format
 msgid "Send %(from)s to %(to)s"
 msgstr "Wyślij %s do %s"
 
-#: gajim/roster_window.py:4464
+#: gajim/roster_window.py:4414
 #, fuzzy, python-format
 msgid "Make %s first contact"
 msgstr "Przekształć %s oraz %s w metakontakty"
 
-#: gajim/roster_window.py:4469
+#: gajim/roster_window.py:4419
 #, fuzzy, python-format
 msgid "Make %(contact1)s and %(contact2)s metacontacts"
 msgstr "Przekształć %s oraz %s w metakontakty"
 
-#: gajim/roster_window.py:4825 gajim/roster_window.py:4923
+#: gajim/roster_window.py:4775 gajim/roster_window.py:4862
 msgid "_Change Status Message"
 msgstr "_Zmień opis statusu"
 
-#: gajim/roster_window.py:4845
+#: gajim/roster_window.py:4795
 msgid "Publish Tune"
 msgstr "_Publikuj Utwór"
 
-#: gajim/roster_window.py:4856
+#: gajim/roster_window.py:4806
 #, fuzzy
 msgid "Publish Location"
 msgstr "_Publikuj Utwór"
 
-#: gajim/roster_window.py:4868
-#, fuzzy
-msgid "Configure Services…"
-msgstr "Konfiguruj Usługi..."
-
-#: gajim/roster_window.py:4997
+#: gajim/roster_window.py:4936
 msgid "_Maximize All"
 msgstr "_Maksymalizuj wszystkie"
 
-#: gajim/roster_window.py:5004 gajim/roster_window.py:5146
+#: gajim/roster_window.py:4943 gajim/roster_window.py:5085
 msgid "Send Group M_essage"
 msgstr "_Wyślij wiadomość grupową"
 
-#: gajim/roster_window.py:5011
+#: gajim/roster_window.py:4950
 msgid "To all users"
 msgstr "Do wszystkich użytkowników"
 
-#: gajim/roster_window.py:5015
+#: gajim/roster_window.py:4954
 msgid "To all online users"
 msgstr "Do wszystkich połączonych użytkowników"
 
-#: gajim/roster_window.py:5027 gajim/roster_window.py:5152
+#: gajim/roster_window.py:4966 gajim/roster_window.py:5091
 #: gajim/data/gui/gc_occupants_menu.ui:110
 #: gajim/data/gui/contact_context_menu.ui:36
 msgid "In_vite to"
 msgstr "Za_proś do"
 
-#: gajim/roster_window.py:5162
+#: gajim/roster_window.py:5101
 msgid "_Manage Contacts"
 msgstr "_Zarządzaj kontaktami"
 
-#: gajim/roster_window.py:5168
+#: gajim/roster_window.py:5107
 #, fuzzy
 msgid "Edit _Groups…"
 msgstr "Modyfikuj _grupy"
 
-#: gajim/roster_window.py:5189 gajim/data/gui/filetransfers.ui:12
+#: gajim/roster_window.py:5128 gajim/data/gui/filetransfers.ui:12
 #: gajim/data/gui/remove_account_window.ui:134
 msgid "_Remove"
 msgstr "_Usuń"
 
-#: gajim/roster_window.py:5226
+#: gajim/roster_window.py:5165
 msgid "_Maximize"
 msgstr "_Maksymalizuj"
 
-#: gajim/roster_window.py:5233
+#: gajim/roster_window.py:5172
 msgid "_Reconnect"
 msgstr "_Połącz ponownie"
 
-#: gajim/roster_window.py:5254 gajim/data/gui/gc_occupants_menu.ui:170
+#: gajim/roster_window.py:5193 gajim/data/gui/gc_occupants_menu.ui:170
 #: gajim/data/gui/gc_control_popup_menu.ui:113
 #: gajim/data/gui/contact_context_menu.ui:205
 msgid "_History"
 msgstr "_Historia"
 
-#: gajim/roster_window.py:5335 gajim/data/gui/application_menu.ui:86
+#: gajim/roster_window.py:5274 gajim/data/gui/application_menu.ui:83
 #: gajim/data/gui/history_window.ui:57
 msgid "History Manager"
 msgstr "Historia rozmów"
 
-#: gajim/roster_window.py:5343
-msgid "_Join New Group Chat"
-msgstr "_Dołącz do pokoju"
-
 #: gajim/dataforms_widget.py:585
 msgid "Unable to load image"
 msgstr "Nie można załadować obrazka"
@@ -1913,225 +1866,242 @@ msgstr "Temat: %s\n"
 msgid "Write a message…"
 msgstr "Odbierz wiadomość"
 
-#: gajim/message_window.py:250
+#: gajim/message_window.py:356
+#, fuzzy
+msgid "Close Tabs"
+msgstr "Zamknij"
+
+#: gajim/message_window.py:357
 msgid "You are going to close several tabs"
 msgstr "Ty zamierzasz zamknąć wszystkie zakładki"
 
-#: gajim/message_window.py:251
+#: gajim/message_window.py:358
 msgid "Do you really want to close them all?"
 msgstr "Czy na pewno chcesz zamknąć wszystkie?"
 
-#: gajim/message_window.py:539
+#: gajim/message_window.py:514
 #, fuzzy
 msgid "?Noun:Chats"
 msgstr "Czaty"
 
-#: gajim/message_window.py:543
+#: gajim/message_window.py:518
 #, fuzzy
 msgid "Group Chats"
 msgstr "_Pokój"
 
-#: gajim/message_window.py:547
+#: gajim/message_window.py:522
 msgid "Private Chats"
 msgstr "Rozmowy prywatne"
 
-#: gajim/message_window.py:553
+#: gajim/message_window.py:528
 msgid "Messages"
 msgstr "Wiadomości"
 
-#: gajim/gui_interface.py:173
+#: gajim/gui_interface.py:170
+#, fuzzy, python-format
+msgid "HTTP (%(method)s) Authorization for %(url)s (ID: %(id)s)"
+msgstr "Autoryzacja HTTP (%(method)s) dla %(url)s (id: %(id)s)"
+
+#: gajim/gui_interface.py:175
 msgid "Do you accept this request?"
 msgstr "Czy akceptujesz tę prośbę?"
 
-#: gajim/gui_interface.py:175
-#, python-format
-msgid "Do you accept this request on account %s?"
+#: gajim/gui_interface.py:177
+#, fuzzy, python-format
+msgid "Do you accept this request (account: %s)?"
 msgstr "Czy akceptujesz tę prośbę na koncie %s?"
 
-#: gajim/gui_interface.py:178
-#, fuzzy, python-format
-msgid "HTTP (%(method)s) Authorization for %(url)s (ID: %(id)s)"
-msgstr "Autoryzacja HTTP (%(method)s) dla %(url)s (id: %(id)s)"
+#: gajim/gui_interface.py:182
+#, fuzzy
+msgid "Authorization"
+msgstr "Autoryzacja została wysłana"
+
+#: gajim/gui_interface.py:186 gajim/gui_interface.py:420
+#: gajim/gtk/filetransfer.py:338
+#, fuzzy
+msgid "_No"
+msgstr "Żaden"
 
-#: gajim/gui_interface.py:194 gajim/gtk/notification.py:175
+#: gajim/gui_interface.py:205 gajim/gtk/notification.py:175
 #: gajim/gtk/notification.py:197
 msgid "Connection Failed"
 msgstr "Połączenie nie powiodło się"
 
-#: gajim/gui_interface.py:279 gajim/gui_interface.py:529
-msgid "Password Required"
-msgstr "Hasło wymagane"
-
-#: gajim/gui_interface.py:280
-#, python-format
-msgid "A Password is required to join the room %s. Please type it."
-msgstr "Aby dołączyć do pokoju %s wymagane jest hasło. Proszę je wpisać"
-
-#: gajim/gui_interface.py:342 gajim/gui_interface.py:346
+#: gajim/gui_interface.py:325 gajim/gui_interface.py:329
 #, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr "Błąd %(code)s: %(msg)s"
 
-#: gajim/gui_interface.py:357 gajim/gui_interface.py:376
+#: gajim/gui_interface.py:340 gajim/gui_interface.py:359
 #: gajim/common/modules/message.py:122
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "błąd przy wysyłaniu %(message)s ( %(error)s )"
 
-#: gajim/gui_interface.py:401 gajim/gtk/notification.py:175
+#: gajim/gui_interface.py:384 gajim/gtk/notification.py:175
 msgid "Subscription request"
 msgstr "Prośba o autoryzację"
 
-#: gajim/gui_interface.py:413 gajim/common/contacts.py:184
-#: gajim/common/helpers.py:83
+#: gajim/gui_interface.py:396 gajim/common/contacts.py:200
+#: gajim/common/helpers.py:86
 msgid "Observers"
 msgstr "Obserwatorzy"
 
-#: gajim/gui_interface.py:422
+#: gajim/gui_interface.py:405
 msgid "Authorization accepted"
 msgstr "Autoryzacja przyjęta"
 
-#: gajim/gui_interface.py:423
+#: gajim/gui_interface.py:406
 #, fuzzy, 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."
 
-#: gajim/gui_interface.py:431
-#, python-format
-msgid "Contact \"%s\" removed subscription from you"
+#: gajim/gui_interface.py:415
+#, fuzzy
+msgid "Subscription Removed"
+msgstr "Prośba o autoryzację"
+
+#: gajim/gui_interface.py:416
+#, fuzzy, python-format
+msgid "Contact '%s' removed subscription from you"
 msgstr "Kontakt \"%s\" cofnął Ci autoryzację"
 
-#: gajim/gui_interface.py:432
+#: gajim/gui_interface.py:417
 #, fuzzy
 msgid ""
-"You will always see them as offline.\n"
+"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"
 "Czy chcesz go usunąć z listy kontaktów?"
 
-#: gajim/gui_interface.py:453 gajim/gtk/notification.py:176
+#: gajim/gui_interface.py:442 gajim/gtk/notification.py:176
 msgid "Unsubscribed"
 msgstr "Cofnij autoryzację"
 
-#: gajim/gui_interface.py:465
+#: gajim/gui_interface.py:454
 #, python-format
 msgid "%(jid)s declined the invitation: %(reason)s"
 msgstr "%(jid)s odrzucił zaproszenie: %(reason)s"
 
-#: gajim/gui_interface.py:469
+#: gajim/gui_interface.py:458
 #, python-format
 msgid "%(jid)s declined the invitation"
 msgstr "%(jid)s odrzucił zaproszenie"
 
-#: gajim/gui_interface.py:485
+#: gajim/gui_interface.py:474
 #, python-brace-format
 msgid "You are invited to {room} by {user}"
 msgstr "Zostałeś zaproszony do rozmowy grupowej w pokoju {room} przez {user}"
 
-#: gajim/gui_interface.py:506
+#: gajim/gui_interface.py:495
 #, fuzzy
 msgid "Certificate Passphrase Required"
 msgstr "Certyfikat wygasł"
 
-#: gajim/gui_interface.py:507
+#: gajim/gui_interface.py:496
 #, fuzzy, python-format
 msgid "Enter the certificate passphrase for account %s"
 msgstr "Wprowadź hasło dla klucza GPG %(keyid)s (konto %(account)s)."
 
-#: gajim/gui_interface.py:516 gajim/gtk/accounts.py:963
+#: gajim/gui_interface.py:505 gajim/gtk/accounts.py:966
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Wpisz swoje hasło dla konta %s"
 
-#: gajim/gui_interface.py:529 gajim/gtk/accounts.py:964
+#: gajim/gui_interface.py:518
+msgid "Password Required"
+msgstr "Hasło wymagane"
+
+#: gajim/gui_interface.py:518 gajim/gtk/accounts.py:967
 msgid "Save password"
 msgstr "Zapisz hasło"
 
-#: gajim/gui_interface.py:601 gajim/gui_interface.py:632
+#: gajim/gui_interface.py:587 gajim/gui_interface.py:618
+#: gajim/gtk/filetransfer.py:332 gajim/gtk/filetransfer.py:333
 #: gajim/gtk/notification.py:173 gajim/gtk/notification.py:276
 msgid "File Transfer Error"
 msgstr "Błąd przesyłania pliku"
 
-#: gajim/gui_interface.py:666
+#: gajim/gui_interface.py:652
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s chce przesłać ci plik."
 
-#: gajim/gui_interface.py:668 gajim/gtk/filetransfer.py:479
+#: gajim/gui_interface.py:654 gajim/gtk/filetransfer.py:484
 #: gajim/gtk/notification.py:172 gajim/gtk/notification.py:274
 msgid "File Transfer Request"
 msgstr "Pytanie o przysłanie pliku"
 
-#: gajim/gui_interface.py:767
+#: gajim/gui_interface.py:753
 #, fuzzy
 msgid "Remote Contact Stopped Transfer"
 msgstr "Druga strona przerwała transfer"
 
-#: gajim/gui_interface.py:772
+#: gajim/gui_interface.py:758
 #, fuzzy
 msgid "Error Opening File"
 msgstr "Błąd odczytu pliku"
 
-#: gajim/gui_interface.py:782
+#: gajim/gui_interface.py:768
 #, fuzzy
 msgid "SSL Certificate Error"
 msgstr "Błąd certyfikatu SSL"
 
-#: gajim/gui_interface.py:795 gajim/gui_interface.py:826
-#: gajim/gui_interface.py:853 gajim/gtk/notification.py:174
+#: gajim/gui_interface.py:781 gajim/gui_interface.py:812
+#: gajim/gui_interface.py:839 gajim/gtk/notification.py:174
 #: gajim/gtk/notification.py:279
 msgid "File Transfer Stopped"
 msgstr "Przesyłanie pliku zatrzymane"
 
-#: gajim/gui_interface.py:799
+#: gajim/gui_interface.py:785
 #, fuzzy
 msgid "File Transfer Failed"
 msgstr "Przesyłane pliki"
 
-#: gajim/gui_interface.py:822
+#: gajim/gui_interface.py:808
 #, fuzzy, python-format
 msgid "%(filename)s received from %(name)s."
 msgstr "Przesyłanie pliku %(filename)s od %(name)s zostało zatrzymane."
 
-#: gajim/gui_interface.py:827
+#: gajim/gui_interface.py:813
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Przesyłanie pliku %(filename)s od %(name)s zostało zatrzymane."
 
-#: gajim/gui_interface.py:833
+#: gajim/gui_interface.py:819
 #, fuzzy, python-format
 msgid "File transfer of %(filename)s from %(name)s failed."
 msgstr "Przesyłanie pliku %(filename)s od %(name)s zostało zatrzymane."
 
-#: gajim/gui_interface.py:848
+#: gajim/gui_interface.py:834
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Przesłałeś plik %(filename)s do %(name)s."
 
-#: gajim/gui_interface.py:854
+#: gajim/gui_interface.py:840
 #, 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:860
+#: gajim/gui_interface.py:846
 #, fuzzy, python-format
 msgid "File transfer of %(filename)s to %(name)s failed."
 msgstr "Przesyłanie pliku %(filename)s do %(name)s zostało zatrzymane."
 
-#: gajim/gui_interface.py:971
+#: gajim/gui_interface.py:957
 msgid "Username Conflict"
 msgstr "Konflikt nazw użytkownika"
 
-#: gajim/gui_interface.py:972
+#: gajim/gui_interface.py:958
 msgid "Please type a new username for your local account"
 msgstr "Podaj nazwę użytkownika dla nowego konta lokalnego"
 
-#: gajim/gui_interface.py:995
+#: gajim/gui_interface.py:981
 msgid "Resource Conflict"
 msgstr "Konflikt zasobów"
 
-#: gajim/gui_interface.py:996
+#: gajim/gui_interface.py:982
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
@@ -2139,32 +2109,32 @@ msgstr ""
 "Jesteś już połączony z tym kontem przy użyciu tego samego zasobu.Proszę "
 "podać nowy zasób"
 
-#: gajim/gui_interface.py:1053
+#: gajim/gui_interface.py:1039
 #, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s chce rozpocząć rozmowę głosową."
 
-#: gajim/gui_interface.py:1055
+#: gajim/gui_interface.py:1041
 msgid "Voice Chat Request"
 msgstr "Prośba o rozmowę głosową"
 
-#: gajim/gui_interface.py:1123 gajim/gtk/account_wizard.py:312
+#: gajim/gui_interface.py:1109 gajim/gtk/account_wizard.py:312
 msgid "Certificate Already in File"
 msgstr "Certyfikat znajduje się już w pliku"
 
-#: gajim/gui_interface.py:1124 gajim/gtk/account_wizard.py:313
+#: gajim/gui_interface.py:1110 gajim/gtk/account_wizard.py:313
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr ""
 "Ten certyfikat znajduje się już w pliku %s, więc nie zostanie ponownie "
 "dodany."
 
-#: gajim/gui_interface.py:1145
+#: gajim/gui_interface.py:1131
 #, fuzzy, python-format
 msgid "The authenticity of the %s certificate could be invalid"
 msgstr "Nie można potwierdzić autentyczności certyfikatu %s."
 
-#: gajim/gui_interface.py:1148
+#: gajim/gui_interface.py:1134
 #, python-format
 msgid ""
 "\n"
@@ -2173,7 +2143,7 @@ msgstr ""
 "\n"
 "Nieznany błąd SSL: %d"
 
-#: gajim/gui_interface.py:1150
+#: gajim/gui_interface.py:1136
 #, python-format
 msgid ""
 "\n"
@@ -2182,11 +2152,11 @@ msgstr ""
 "\n"
 "Błąd SSL: <b>%s</b>"
 
-#: gajim/gui_interface.py:1155
+#: gajim/gui_interface.py:1141
 msgid "Error verifying SSL certificate"
 msgstr "Błąd podczas weryfikacji certyfikatu SSL"
 
-#: gajim/gui_interface.py:1156
+#: gajim/gui_interface.py:1142
 #, fuzzy, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your XMPP server: "
@@ -2197,7 +2167,7 @@ msgstr ""
 "%(error)s\n"
 "Czy ciagle chcesz się połączyć z serwerem?"
 
-#: gajim/gui_interface.py:1160 gajim/gtk/account_wizard.py:412
+#: gajim/gui_interface.py:1146 gajim/gtk/account_wizard.py:413
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -2212,190 +2182,177 @@ msgstr ""
 "Odcisk klucza SHA-256 certyfikatu:\n"
 "%(sha256)s"
 
-#: gajim/gui_interface.py:1166
+#: gajim/gui_interface.py:1152
 msgid "Ignore this error for this certificate."
 msgstr "Ignoruj komunikat o tym błędzie."
 
-#: gajim/gui_interface.py:1174
+#: gajim/gui_interface.py:1160
 #, fuzzy, python-format
 msgid "SSL Certificate Verification for %s"
 msgstr "Błąd certyfikatu SSL"
 
-#: gajim/gui_interface.py:1442 gajim/gtk/join_groupchat.py:235
-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/gui_interface.py:1448
-#, fuzzy
-msgid "JID is not a Groupchat"
-msgstr "To nie jest czat"
-
-#: gajim/gui_interface.py:1579
-msgid "This is not a group chat"
-msgstr "To nie jest czat"
-
-#: gajim/gui_interface.py:1580
-#, python-format
-msgid ""
-"%(room_jid)s is already in your roster. Please check if %(room_jid)s is a "
-"correct group chat name. If it is, delete it from your roster and try "
-"joining the group chat again."
-msgstr ""
-"%(room_jid)s już jest w Twoim rosterze. Sprawdź, czy %(room_jid)s jest "
-"poprawną nazwą dla czatu grupowego. Jeżeli tak, skasuj go z rostera i "
-"spróbuj ponownie dołączyć."
-
-#: gajim/gui_interface.py:1604 gajim/dialog_messages.py:58
+#: gajim/gui_interface.py:1577
 msgid "You cannot join a group chat while you are invisible"
 msgstr "Nie możesz dołączyć do pokoju gdy jesteś niewidoczny"
 
-#: gajim/gui_interface.py:2037
+#: gajim/gui_interface.py:1976
 msgid "Could not save your settings and preferences"
 msgstr "Nie można zapisać twoich ustawień i opcji"
 
-#: gajim/gui_interface.py:2098
+#: gajim/gui_interface.py:2037
 msgid "Gajim: IPython Console"
 msgstr "Gajim: Konsola IPython"
 
-#: gajim/dialog_messages.py:32
-#, fuzzy
-msgid "You can not start a new conversation unless you are connected."
-msgstr "Nie możesz dołączyć do pokoju gdy nie jesteś połączony."
-
-#: gajim/dialog_messages.py:36 gajim/dialog_messages.py:41
-#: gajim/gtk/single_message.py:305 gajim/gtk/join_groupchat.py:211
-#: gajim/gtk/account_wizard.py:229
-msgid "Invalid JID"
-msgstr "Niepoprawny JID"
+#: gajim/dialog_messages.py:31 gajim/dialog_messages.py:36
+#: gajim/gtk/single_message.py:305 gajim/gtk/account_wizard.py:229
+msgid "Invalid XMPP Address"
+msgstr "Niepoprawny adres XMPP"
 
-#: gajim/dialog_messages.py:42 gajim/gtk/single_message.py:306
-#, python-format
-msgid "It is not possible to send a message to %s, this JID is not valid."
+#: gajim/dialog_messages.py:37
+#, 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/dialog_messages.py:47
-msgid "Unread events"
+#: gajim/dialog_messages.py:42
+#, fuzzy
+msgid "Unread Events"
 msgstr "Nieprzeczytane wiadomości"
 
-#: gajim/dialog_messages.py:48
-msgid "Read all pending events before removing this account."
+#: 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."
 
-#: gajim/dialog_messages.py:52
+#: gajim/dialog_messages.py:48
 #, fuzzy
 msgid "Invalid Form"
 msgstr "Niepoprawny pokój"
 
-#: gajim/dialog_messages.py:53
+#: gajim/dialog_messages.py:49
 #, fuzzy
 msgid "The form is not filled correctly."
 msgstr "Używany przez ciebie pseudonim zawiera niedozwolone znaki."
 
-#: gajim/dialog_messages.py:57 gajim/common/helpers.py:309
+#: gajim/dialog_messages.py:53 gajim/common/helpers.py:315
 msgid "Invisible"
 msgstr "Niewidoczny"
 
-#: gajim/dialog_messages.py:62
-msgid "A connection is not available"
-msgstr "Połączenie jest niemożliwe"
+#: gajim/dialog_messages.py:54
+#, fuzzy
+msgid "You cannot join a group chat while being invisible."
+msgstr "Nie możesz dołączyć do pokoju gdy jesteś niewidoczny"
 
-#: gajim/dialog_messages.py:63
+#: gajim/dialog_messages.py:58
+#, fuzzy
+msgid "No Connection Available"
+msgstr "Połączenie jest niedostępne"
+
+#: gajim/dialog_messages.py:59
 msgid "Your message can not be sent until you are connected."
 msgstr "Nie możesz wysłać wiadomości dopóki nie będziesz połączony."
 
-#: gajim/dialog_messages.py:67
-#, fuzzy
-msgid "JID already in list"
-msgstr "Ten JID jest już na liście"
+#: gajim/dialog_messages.py:63
+msgid "XMPP Address Already in List"
+msgstr ""
 
-#: gajim/dialog_messages.py:68
+#: gajim/dialog_messages.py:64
 #, fuzzy
-msgid "The JID you entered is already in the list. Choose another one."
+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."
 
-#: gajim/dialog_messages.py:72
-msgid "Invalid answer"
+#: gajim/dialog_messages.py:69
+#, fuzzy
+msgid "Invalid Answer"
 msgstr "Niepoprawna odpowiedź"
 
-#: gajim/dialog_messages.py:73
+#: gajim/dialog_messages.py:70
 #, 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"
 
-#: gajim/dialog_messages.py:78
+#: gajim/dialog_messages.py:75
 #, fuzzy
 msgid "Wrong Custom Hostname"
 msgstr "Użyj własnej nazwy hosta/portu"
 
-#: gajim/dialog_messages.py:79
+#: gajim/dialog_messages.py:76
 #, fuzzy, python-format
-msgid "Wrong custom hostname \"%s\". Ignoring it."
+msgid "Custom hostname \"%s\" is wrong. It will be ignored."
 msgstr "Użyj własnej nazwy hosta/portu"
 
-#: gajim/dialog_messages.py:83
-msgid "Error while removing privacy list"
+#: gajim/dialog_messages.py:80
+#, fuzzy
+msgid "Error While Removing Privacy List"
 msgstr "Błąd usuwaniu listy prywatności"
 
-#: gajim/dialog_messages.py:84
-#, python-format
+#: gajim/dialog_messages.py:81
+#, fuzzy, python-format
 msgid ""
-"Privacy list %s has not been removed. It is maybe active in one of your "
-"connected resources. Deactivate it and try again."
+"Privacy list %s has not been removed. It is probably active in one of your "
+"connected resources. Please deactivate it and try again."
 msgstr ""
 "Lista prywatności %s nie została usunięta. Prawdopodobnie jest aktywna w "
 "jednym z połączonych zasobów. Wyłącz ją i spróbuj ponownie."
 
-#: gajim/dialog_messages.py:90
-msgid "Invisibility not supported"
+#: gajim/dialog_messages.py:87
+#, fuzzy
+msgid "Invisibility Not Supported"
 msgstr "Niewidoczność nie jest obsługiwana"
 
-#: gajim/dialog_messages.py:91
-#, python-format
-msgid "Account %s doesn't support invisibility."
+#: gajim/dialog_messages.py:88
+#, fuzzy, python-format
+msgid "This account %s doesn't support invisibility."
 msgstr "Konto %s nie obsługuje niewidoczności."
 
-#: gajim/dialog_messages.py:95
-msgid "Unregister failed"
+#: gajim/dialog_messages.py:92
+#, fuzzy
+msgid "Unregister Failed"
 msgstr "Błąd przy usuwaniu konta"
 
-#: gajim/dialog_messages.py:96
-#, python-format
-msgid "Unregistration with server %(server)s failed: %(error)s"
+#: gajim/dialog_messages.py:93
+#, fuzzy, python-format
+msgid "Unregistration on server %(server)s failed: %(error)s"
 msgstr "Wypisanie się z serwera %(server)s nie powiodło się: %(error)s"
 
-#: gajim/dialog_messages.py:100
-msgid "Registration succeeded"
+#: gajim/dialog_messages.py:97
+#, fuzzy
+msgid "Registration Succeeded"
 msgstr "Rejestracja zakończyła się sukcesem"
 
-#: gajim/dialog_messages.py:101
-#, python-format
-msgid "Registration with agent %s succeeded"
+#: gajim/dialog_messages.py:98
+#, fuzzy, python-format
+msgid "Registration with agent %s succeeded."
 msgstr "Rejestracja z %s zakończyła się sukcesem"
 
-#: gajim/dialog_messages.py:105 gajim/gtk/service_registration.py:215
-msgid "Registration failed"
+#: gajim/dialog_messages.py:102
+#, fuzzy
+msgid "Registration Failed"
 msgstr "Rejestracja nie powiodła się"
 
-#: gajim/dialog_messages.py:106
+#: gajim/dialog_messages.py:103
 #, python-format
 msgid ""
 "Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
 msgstr ""
 "Rejestracja z %(agent)s nie powiodła się, błąd %(error)s: %(error_msg)s"
 
-#: gajim/dialog_messages.py:111
+#: gajim/dialog_messages.py:108
 #, fuzzy
 msgid "Unable to Join Group Chat"
 msgstr "Nie można dołączyć do pokoju"
 
-#: gajim/dialog_messages.py:116
-msgid "GStreamer error"
+#: gajim/dialog_messages.py:113
+#, fuzzy
+msgid "GStreamer Error"
 msgstr "błąd GStreamera"
 
-#: gajim/dialog_messages.py:117
+#: gajim/dialog_messages.py:114
 #, python-format
 msgid ""
 "Error: %(error)s\n"
@@ -2404,19 +2361,21 @@ msgstr ""
 "Komunikat błędu: %(error)s\n"
 "Szczegóły: %(debug)s"
 
-#: gajim/dialog_messages.py:121
-msgid "Wrong host"
+#: gajim/dialog_messages.py:118
+#, fuzzy
+msgid "Wrong Host"
 msgstr "Błędna nazwa hosta"
 
-#: gajim/dialog_messages.py:122
+#: gajim/dialog_messages.py:119
 msgid "Invalid local address? :-O"
 msgstr "Niepoprawny adres lokalny? :-O"
 
-#: gajim/dialog_messages.py:126
-msgid "Avahi error"
+#: gajim/dialog_messages.py:123
+#, fuzzy
+msgid "Avahi Error"
 msgstr "Błąd Avahi"
 
-#: gajim/dialog_messages.py:127
+#: gajim/dialog_messages.py:124
 #, python-format
 msgid ""
 "%s\n"
@@ -2425,67 +2384,69 @@ msgstr ""
 "%s\n"
 "Przesyłanie wiadomości między adresami link-local może nie działać poprawnie."
 
-#: gajim/dialog_messages.py:131 gajim/dialog_messages.py:136
+#: gajim/dialog_messages.py:128 gajim/dialog_messages.py:133
 #, fuzzy
-msgid "Could not request upload slot"
+msgid "Could not request upload slot for HTTP File Upload"
 msgstr "Nie można uruchomić usługi lokalnej"
 
-#: gajim/dialog_messages.py:137
-msgid "Got unexpected response from server (see log)"
+#: gajim/dialog_messages.py:134
+#, fuzzy
+msgid "Got unexpected response from server (see log)."
 msgstr "Nieoczekiwana odpowiedź serwera (zobacz log)"
 
-#: gajim/dialog_messages.py:141 gajim/dialog_messages.py:146
+#: gajim/dialog_messages.py:138 gajim/dialog_messages.py:143
 #, fuzzy
-msgid "Could not open file"
+msgid "Could not Open File"
 msgstr "Nie można załadować obrazka."
 
-#: gajim/dialog_messages.py:142
-msgid "Exception raised while opening file (see log)"
+#: gajim/dialog_messages.py:139
+#, fuzzy
+msgid "Exception raised while trying to open file (see log)."
 msgstr "Wyjątek podczas otwierania pliku (zobacz log)"
 
-#: gajim/dialog_messages.py:151
-msgid "Unsecure"
-msgstr "Niezabezpieczone"
+#: gajim/dialog_messages.py:148
+#, fuzzy
+msgid "Not Secure"
+msgstr "Nie włączony"
 
-#: gajim/dialog_messages.py:152
+#: gajim/dialog_messages.py:149
 #, fuzzy
-msgid "Server returned unsecure transport (HTTP)"
+msgid "The server returned an insecure transport (HTTP)."
 msgstr "Usługa zwróciła komunikat błędu."
 
-#: gajim/dialog_messages.py:156
+#: gajim/dialog_messages.py:153
 #, fuzzy
-msgid "Could not upload file"
+msgid "Could not Upload File"
 msgstr "Nie można załadować obrazka."
 
-#: gajim/dialog_messages.py:157
+#: gajim/dialog_messages.py:154
 #, python-format
 msgid "HTTP response code from server: %s"
 msgstr "Kod odpowiedzi HTTP z serwera: %s"
 
-#: gajim/dialog_messages.py:161
+#: gajim/dialog_messages.py:158
 msgid "Upload Error"
 msgstr "Błąd wczytywania"
 
-#: gajim/dialog_messages.py:166
+#: gajim/dialog_messages.py:163
 #, fuzzy
 msgid "Encryption Error"
 msgstr "Szyfrowanie E2E włączone"
 
-#: gajim/dialog_messages.py:167
-#, fuzzy
-msgid "For the chosen encryption there is no encryption method available"
-msgstr "Połączenie jest niemożliwe"
+#: gajim/dialog_messages.py:164
+msgid "There is no encryption method available for the chosen encryption."
+msgstr ""
 
-#: gajim/dialog_messages.py:171
+#: gajim/dialog_messages.py:169
 #, fuzzy
-msgid "Avatar upload failed"
+msgid "Avatar Upload Failed"
 msgstr "Publikacja vCard nie powiodła się"
 
-#: gajim/privatechat_control.py:204
+#: gajim/privatechat_control.py:207
 msgid "Sending private message failed"
 msgstr "Wysyłanie prywatnej wiadomości nie powiodło się"
 
-#: gajim/privatechat_control.py:206
+#: gajim/privatechat_control.py:209
 #, 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."
@@ -2508,7 +2469,7 @@ msgstr "pokaż pomoc polecenia"
 
 #: gajim/gajim_remote.py:85
 #, fuzzy
-msgid "Lists all contacts in roster, one for each line"
+msgid "Lists all contacts in the contact list, one for each line"
 msgstr ""
 "Wyświetla listę wszystkich kontaktów. Każdy kontakt zostanie wyświetlony w "
 "osobnej linii"
@@ -2592,11 +2553,13 @@ msgstr ""
 
 #: gajim/gajim_remote.py:118
 #, fuzzy
-msgid "Sends new chat message to a contact in the roster. Account is optional."
+msgid ""
+"Sends new chat message to a contact in the contact list. Account is optional."
 msgstr "Użycie: /%s wysyła wiadomość do kontaktu"
 
 #: gajim/gajim_remote.py:120 gajim/gajim_remote.py:130
-msgid "JID of the contact that will receive the message"
+#, fuzzy
+msgid "XMPP Address of the contact that will receive the message"
 msgstr "JID osoby, która otrzyma wiadomość"
 
 #: gajim/gajim_remote.py:121 gajim/gajim_remote.py:132
@@ -2610,7 +2573,9 @@ msgid "if specified, the message will be sent using this account"
 msgstr "jeśli jest podane, to wiadomość zostanie wysłana z tego konta"
 
 #: gajim/gajim_remote.py:127
-msgid "Sends a chat message to someone on your roster. Account is optional."
+#, fuzzy
+msgid ""
+"Sends a chat message to someone on your contact list. Account is optional."
 msgstr "Wyślij wiadomość do kogoś na swoim rosterze. Konto jest opcjonalne."
 
 #: gajim/gajim_remote.py:131
@@ -2622,11 +2587,13 @@ msgid "message subject"
 msgstr "temat wiadomości"
 
 #: gajim/gajim_remote.py:138
-msgid "Sends new message to a groupchat you've joined."
+#, fuzzy
+msgid "Sends new message to a group chat you've joined."
 msgstr "Wysyła nową wiadomość na czat, w którym uczestniczysz."
 
 #: gajim/gajim_remote.py:140
-msgid "JID of the room that will receive the message"
+#, fuzzy
+msgid "XMPP Address of the group chat that will receive the message"
 msgstr "JID pokoju, do którego zostanie wysłana wiadomość"
 
 #: gajim/gajim_remote.py:147
@@ -2635,7 +2602,8 @@ msgstr "Pobiera szczegółowe informacje o kontakcie"
 
 #: gajim/gajim_remote.py:149 gajim/gajim_remote.py:162
 #: gajim/gajim_remote.py:192
-msgid "JID of the contact"
+#, fuzzy
+msgid "XMPP Address of the contact"
 msgstr "JID kontaktu"
 
 #: gajim/gajim_remote.py:153
@@ -2696,7 +2664,8 @@ msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Zapisuje obecny stan opcji Gajima do pliku .config"
 
 #: gajim/gajim_remote.py:190
-msgid "Removes contact from roster"
+#, fuzzy
+msgid "Removes contact from contact list"
 msgstr "Usuwa kontakt z listy kontaktów"
 
 #: gajim/gajim_remote.py:193
@@ -2743,9 +2712,9 @@ msgid "Missing argument \"contact_jid\""
 msgstr "Brak argumentu \"contact_jid\""
 
 #: gajim/gajim_remote.py:275
-#, python-format
+#, fuzzy, python-format
 msgid ""
-"'%s' is not in your roster.\n"
+"'%s' is not in your contact list.\n"
 "Please specify account for sending the message."
 msgstr ""
 "'%s' nie znajduje się na twojej liście kontaktów.\n"
@@ -2973,12 +2942,12 @@ msgstr "Koniec tygodnia"
 msgid "Weekend!"
 msgstr "Weekend!"
 
-#: gajim/common/logger.py:192 gajim/common/logger.py:197
+#: gajim/common/logger.py:189 gajim/common/logger.py:194
 #, python-format
 msgid "%s is a directory but should be a file"
 msgstr "%s jest katalogiem choć powinien być plikiem"
 
-#: gajim/common/logger.py:217
+#: gajim/common/logger.py:214
 #, fuzzy, python-format
 msgid "Creating %s"
 msgstr "jem"
@@ -3053,24 +3022,23 @@ msgstr "%(nickname)s rozłączył(a) się"
 msgid "Contact Signed Out"
 msgstr "Kontakt rozłączył się"
 
-#: gajim/common/contacts.py:455
-msgid "Not in roster"
-msgstr "Spoza listy kontaktów"
-
 #: gajim/common/config.py:80
+#, fuzzy
 msgid ""
 "Show desktop notification even when a chat window is opened for this contact "
-"and does not have focus"
+"and does not have focus."
 msgstr ""
 "Pokazu notyfikacje na pulpicie, nawet jeżeli okno czatu jest otwarte dla "
 "tego kontaktu i nieaktywne"
 
 #: gajim/common/config.py:81
-msgid "Play sound when user is busy"
+#, fuzzy
+msgid "Play sound even when being busy."
 msgstr "Włącz dźwięki, kiedy użytkownik jest zajęty"
 
 #: gajim/common/config.py:83
-msgid "Show only online and free for chat contacts in roster."
+#, fuzzy
+msgid "Show only online and free for chat contacts in the contact list."
 msgstr "Pokaż tylko połączone i chętne do rozmowy kontakty."
 
 #: gajim/common/config.py:86
@@ -3079,12 +3047,15 @@ msgstr ""
 "Czas w minutach, po którym twój status zostanie zmieniona na Zaraz wracam."
 
 #: gajim/common/config.py:87
-msgid "$S (Away as a result of being idle more than $T min)"
+#, fuzzy
+msgid "$S (Away: Idle more than $T min)"
 msgstr "$S (Zaraz wracam z powodu braku aktywności przez $T min.)"
 
 #: gajim/common/config.py:87
 #, fuzzy
-msgid "$S will be replaced by current status message, $T by autoawaytime."
+msgid ""
+"$S will be replaced by current status message, $T by the 'autoawaytime' "
+"value."
 msgstr ""
 "$S zostanie zastąpiony bieżącym opisem stanu, $T przez czas bezczynności"
 
@@ -3094,82 +3065,89 @@ msgstr ""
 "Czas w minutach, po którym twój status zostanie zmieniony na Niedostępny."
 
 #: gajim/common/config.py:90
-msgid "$S (Not available as a result of being idle more than $T min)"
+#, fuzzy
+msgid "$S (Not available: Idle more than $T min)"
 msgstr "$S (Status Nieobecny z powodu bezczynności programu powyżej $T min.)"
 
 #: gajim/common/config.py:90
 #, fuzzy
-msgid "$S will be replaced by current status message, $T by autoxatime."
+msgid ""
+"$S will be replaced by current status message, $T by the 'autoxatime' value."
 msgstr ""
 "$S zostanie zastąpiony bieżącym opisem stanu, $T przez czas nieobecności"
 
 #: gajim/common/config.py:93
 #, fuzzy
 msgid ""
-"When to show notification area icon. Can be 'never', 'on_event', 'always'."
+"When to show the notification area icon. Can be 'never', 'on_event', and "
+"'always'."
 msgstr ""
 "Kiedy pokazać ikonę w obszarze powiadomienia. Dostępne wartości to "
 "'never' (nigdy), 'on_event' (podczas zdarzenia), 'always' (zawsze)."
 
 #: gajim/common/config.py:94
-msgid "Allow to hide the roster window even if the tray icon is not shown."
+#, fuzzy
+msgid ""
+"Allow to hide the contact list window even if the notification area icon is "
+"not shown."
 msgstr "Pozwól ukryć okno rostera, nawet jeżeli ikona systemowa jest ukryta."
 
 #: gajim/common/config.py:97
 #, fuzzy
-msgid "Contact signed in notification color."
-msgstr "_Pokaż zdarzenie w obszarze powiadomienia"
+msgid "Notification color for contacts signing in."
+msgstr "Powiadom mnie o kontaktach, które się _logują"
 
 #: gajim/common/config.py:98
 #, fuzzy
-msgid "Contact signout notification color"
-msgstr "_Pokaż zdarzenie w obszarze powiadomienia"
+msgid "Notification color for contacts signing out."
+msgstr "Powiadom mnie o kontaktach, które się _wylogowują "
 
 #: gajim/common/config.py:99
 #, fuzzy
-msgid "New message notification color."
+msgid "Notification color for new message notification."
 msgstr "Podgląd nowych wiadomości w oknie powiadomienia?"
 
 #: gajim/common/config.py:100
 #, fuzzy
-msgid "File transfer request notification color."
-msgstr "Pytanie o przysłanie pliku"
+msgid "Notification color for file transfer request."
+msgstr "_Powiadom mnie gdy przesyłanie pliku dobiegnie końca"
 
 #: gajim/common/config.py:101
 #, fuzzy
-msgid "File transfer error notification color."
-msgstr "Przesyłanie pliku anulowane"
+msgid "Notification color for file transfer errors."
+msgstr "_Powiadom mnie gdy przesyłanie pliku dobiegnie końca"
 
 #: gajim/common/config.py:102
-#, fuzzy
-msgid "File transfer complete or stopped notification color."
-msgstr "Gdy plik w całości zostanie przesłany, wyświetl okno powiadomienia"
+msgid "Notification color for stopped or completed file transfers."
+msgstr ""
 
 #: gajim/common/config.py:103
-#, fuzzy
-msgid "Groupchat invitation notification color"
-msgstr "Zaproszenie na czat"
+msgid "Notification color for group chat invitations."
+msgstr ""
 
 #: gajim/common/config.py:104
 #, fuzzy
-msgid "Background color of status changed notification"
+msgid "Notification background color for changed status."
 msgstr "Kolor tła dla logujących się kontaktów."
 
 #: gajim/common/config.py:105
-msgid "Other dialogs color."
-msgstr "Kolory innych teskstów."
+msgid "Notification color for other dialogs."
+msgstr ""
 
 #: gajim/common/config.py:106
+#, fuzzy
 msgid ""
-"List (space separated) of rows (accounts and groups) that are collapsed."
+"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:107
 msgid "default"
 msgstr "domyślny"
 
-#: gajim/common/config.py:113
-msgid "Language used by speller"
+#: gajim/common/config.py:113 gajim/common/config.py:424
+#: gajim/common/config.py:431
+#, fuzzy
+msgid "Language used for spell checking."
 msgstr "Język używany przez słownik"
 
 #: gajim/common/config.py:114
@@ -3184,10 +3162,11 @@ msgstr ""
 "'never' - nigdy nie wyświetlaj czasu."
 
 #: gajim/common/config.py:115
+#, fuzzy
 msgid ""
 "Print time in chats using Fuzzy Clock. Value of fuzziness from 1 to 4, or 0 "
-"to disable fuzzyclock. 1 is the most precise clock, 4 the least precise one. "
-"This is used only if print_time is 'sometimes'."
+"to disable Fuzzy Clock. 1 is the most precise clock, 4 the least precise "
+"one. This is used only if 'print_time' is 'sometimes'."
 msgstr ""
 "Wartość \"niedokładności\" od 1 do 4 (0 wyłącza \"okołozegarek"
 "\" [fuzzyclock]). 1 oznacza najbardziej precyzyjne wskazania zegara, 4 "
@@ -3207,55 +3186,62 @@ msgstr "Traktuj pary znaków * / _ jako znaki formatujące."
 #: gajim/common/config.py:120
 #, fuzzy
 msgid ""
-"If true, do not remove */_ . So *abc* will be bold but with * * not removed."
+"If enabled, do not remove */_ . So *abc* will be bold but with * * not "
+"removed."
 msgstr ""
 "Jeśli ma wartość True, to */_ nie będą usuwane. Zatem napis *abc* będzie "
 "pogrubiony ale bez usuniętych znaków * *."
 
 #: gajim/common/config.py:123
+#, fuzzy
 msgid ""
-"Uses ReStructured text markup to send HTML, plus ascii formatting if "
-"selected. For syntax, see http://docutils.sourceforge.net/docs/ref/rst/"
-"restructuredtext.html (If you want to use this, install docutils)"
+"Uses ReStructured text markup to send HTML, plus ASCII formatting if "
+"selected. Needs docutils installed (for syntax, see http://docutils."
+"sourceforge.net/docs/ref/rst/restructuredtext.html)."
 msgstr ""
 "Używa znaczników ReStructured oraz formatowania ASCII. Musisz mieć "
 "zainstalowany pakiet docutils. Wyjaśnienie składni dostępne na stronie "
 "http://docutils.sourceforge.net/docs/ref/rst/"
 
 #: gajim/common/config.py:132
+#, fuzzy
 msgid ""
-"Character to add after nickname when using nick completion (tab) in group "
-"chat."
+"Character to add after nickname when using nickname completion (tab) in "
+"group chat."
 msgstr ""
 "Znak dodawany do nicka przy użyciu autouzupełniania klawiszem TAB (tylko "
 "czat)"
 
 #: gajim/common/config.py:133
+#, fuzzy
 msgid ""
-"Character to propose to add after desired nickname when desired nickname is "
-"used by someone else in group chat."
+"Character to propose to add after desired nickname when nickname is already "
+"used in group chat."
 msgstr ""
 "Znak proponowany do dodania do nicka w sytuacji, gdy dany nick jest już "
 "używany przez innego uzytkownika czatu"
 
 #: gajim/common/config.py:155
+#, fuzzy
 msgid ""
-"If true, Gajim will save roster position when hiding roster, and restore it "
-"when showing roster."
+"If enabled, Gajim will save the contact list window position when hiding it, "
+"and restore it when showing the contact list window again."
 msgstr ""
 "Jeżeli True, Gajim zapisze pozycje rostera podczas jego chowania, oraz "
 "przywróci ją po ponownym wyświetleniu."
 
 #: gajim/common/config.py:161
-msgid "Place the roster on the right in single window mode"
+#, 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:167
 #, fuzzy
 msgid ""
-"This option let you customize timestamp that is printed in conversation. For "
-"example \"[%H:%M] \" will show \"[hour:minute] \". See python doc on "
-"strftime for full documentation: http://docs.python.org/lib/module-time.html"
+"This option lets you customize the timestamp that is printed in "
+"conversation. For example '[%H:%M] ' will show '[hour:minute] '. See python "
+"doc on strftime for full documentation (https://docs.python.org/3/library/"
+"time.html)."
 msgstr ""
 "Ta opcja pozwala na zdefiniowanie formatu czasu wyświetlanego w oknie "
 "rozmowy. Na przykład \"[%H:%M] \" spowoduje wyświetlenie szablonu \"[godzina:"
@@ -3263,281 +3249,287 @@ msgstr ""
 "http://docs.python.org/lib/module-time.html"
 
 #: gajim/common/config.py:168
-msgid "Characters that are printed before the nickname in conversations"
+#, 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:169
-msgid "Characters that are printed after the nickname in conversations"
+#, 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:170
-msgid "Add * and [n] in roster title?"
-msgstr "Dodać * i [n] do tytułu listy kontaktów?"
+#, 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:171
 #, fuzzy
 msgid ""
-"How many history messages should be restored when a chat tab/window is "
-"reopened?"
+"Number of messages from chat history to be restored when a chat tab/window "
+"is reopened."
 msgstr ""
 "Ile linii z poprzedniej rozmowy powinno zostać zapamiętanych gdy okno/karta "
 "rozmowy zostanie ponownie otwarta."
 
 #: gajim/common/config.py:172
-msgid "How far back in time (minutes) history is restored. -1 means no limit."
+#, fuzzy
+msgid ""
+"How far back in time (minutes) chat history is restored. -1 means no limit."
 msgstr ""
 "Jak daleko w stecz (w minutach) zostanie odzyskana historia. -1 oznacza brak "
 "limitu."
 
 #: gajim/common/config.py:173
+#, fuzzy
 msgid ""
-"How many lines to request from server when entering a groupchat. -1 means no "
-"limit"
-msgstr ""
-"Ile linii żądać od serwera przy dołączaniu do czatu grupowego. -1 oznacza "
-"brak limitu"
-
-#: gajim/common/config.py:174
-msgid ""
-"Minutes of backlog to request when entering a groupchat. -1 means no limit"
-msgstr ""
-"Ile minut backloga żądać przy dołączania do czatu grupowego. -1 oznacza brak "
-"limitu"
-
-#: gajim/common/config.py:175
-msgid ""
-"How many seconds to wait before trying to autorejoin to a conference you are "
-"being disconnected from. Set to 0 to disable autorejoining."
+"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 ""
 "Ile sekund czekać przed próbą ponownego, automatycznego dołączenia do "
 "konferencji, z której zostałeś rozłączony. Wybierz 0 aby wyłączyć ponowne, "
 "automatyczne podłączanie."
 
-#: gajim/common/config.py:176
-msgid "Should autorejoin be activated when kicked from a conference?"
+#: gajim/common/config.py:174
+#, fuzzy
+msgid ""
+"Should automatic rejoin be activated when you were kicked from a group chat?"
 msgstr ""
 "Czy automatyczne, ponowne podłączenia ma być aktywne, kiedy zostałeś "
 "wyrzucony z konferencji?"
 
-#: gajim/common/config.py:177
-msgid ""
-"Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
-"Client default behaviour)."
+#: gajim/common/config.py:175
+#, 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:179
-msgid "How many lines to store for Ctrl+KeyUP."
+#: gajim/common/config.py:177
+#, 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:182
+#: gajim/common/config.py:180
 #, fuzzy, python-format
 msgid ""
-"Either custom URL with %%s in it where %%s is the word/phrase or "
-"'WIKTIONARY' which means use Wikitionary."
+"Either a custom URL with %%s in it (where %%s is the word/phrase) or "
+"'WIKTIONARY' (which means use Wikitionary)."
 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:185
+#: gajim/common/config.py:183
 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:187
+#: gajim/common/config.py:185
+#, fuzzy
 msgid ""
-"When not printing time for every message (print_time==sometimes), print it "
+"When not printing time for every message ('print_time'==sometimes), print it "
 "every x minutes."
 msgstr ""
 "W przypadku wybrania wyświetlania czasu nie dla każdej wiadomości "
 "(print_time==sometimes), zmienna określa co ile minut Gajim ma wyświetlać "
 "czas nadejścia nowej wiadomości."
 
-#: gajim/common/config.py:188
+#: gajim/common/config.py:186
 msgid "Ask before pasting an image."
 msgstr "Pytaj przed wklejeniem obrazu."
 
-#: gajim/common/config.py:189
+#: gajim/common/config.py:187
 msgid "Ask before closing a group chat tab/window."
 msgstr "Zapytaj przed zamknięciem karty/okna rozmowy grupowej."
 
-#: gajim/common/config.py:190
+#: gajim/common/config.py:188
 #, fuzzy
 msgid ""
-"Always ask for confirmation before closing groupchats with any of the JIDs "
-"on this space separated list."
+"Always ask for confirmation before closing group chats with any of the XMPP "
+"Addresses on this list (space separated)."
 msgstr ""
 "Zapytaj przed zamknięciem karty/okna rozmowy grupowej, która prowadzona jest "
 "na każdym z pokojów wymienionych na liście (nazwy pokojów rozdzielone "
 "spacją)."
 
-#: gajim/common/config.py:191
+#: gajim/common/config.py:189
 #, fuzzy
 msgid ""
-"Never ask for confirmation before closing groupchats with any of the JIDs on "
-"this space separated list."
+"Never ask for confirmation before closing group chats with any of the XMPP "
+"Addresses on this list (space separated)."
 msgstr ""
 "Nigdy nie pytaj przed zamknięciem karty/okna rozmowy grupowej, która "
 "prowadzona jest na dowolnym pokoju obecnym na tej liście (nazwy pokojów "
 "rozdzielone spacją)."
 
-#: gajim/common/config.py:192
+#: gajim/common/config.py:190
 #, fuzzy
 msgid ""
-"Ask before closing tabbed chat window if there are controls that can lose "
-"data (chat, private chat, groupchat that will not be minimized)"
+"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 ""
 "Spytaj przed zamknięciem zakładki, jeśli po zamknięciu mogą zostać stracone "
 "pewne dane(rozmowy, prywatne rozmowy, grupowe rozmowy, które nie zostaną "
 "zminimalizowane)"
 
-#: gajim/common/config.py:195
+#: gajim/common/config.py:193
 #, fuzzy
 msgid ""
-"Comma separated list of sent hosts, in addition of local interfaces, for "
-"File Transfer in case of address translation/port forwarding."
+"List of send hosts (comma separated) in addition to local interfaces for "
+"file transfers (in case of address translation/port forwarding)."
 msgstr ""
 "Oddzielona przecinkami lista hostów, którą wysyłamy w celu przesyłania "
 "plików, w przypadku tłumaczenia adresu/przekierowania portu."
 
-#: gajim/common/config.py:196
+#: gajim/common/config.py:194
 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:198
+#: gajim/common/config.py:196
 msgid "Notify of events in the notification area."
 msgstr "Powiadamiaj o zdarzeniach w obszarze powiadamiania."
 
-#: gajim/common/config.py:199
+#: gajim/common/config.py:197
+#, fuzzy
 msgid ""
-"If False, Gajim will display a static event icon instead of the blinking "
-"status icon in the notification area when notifying on event."
+"If disabled, Gajim will display a static event icon instead of the blinking "
+"status icon in the notification area when notifying about an event."
 msgstr ""
 "Jeżeli Fałsz, Gajim będzie wyświetlał statyczną ikonę zdarzenia, zamiast "
 "migającej w panelu powiadomień po wystąpieniu zdarzenia."
 
-#: gajim/common/config.py:205
+#: gajim/common/config.py:203
 msgid "Show tab when only one conversation?"
 msgstr "Czy pokazywać kartę gdy otwarta jest tylko jedna rozmowa?"
 
-#: gajim/common/config.py:206
+#: gajim/common/config.py:204
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "Czy pokazywać rozgraniczenie kart w oknie czatu?"
 
-#: gajim/common/config.py:207
+#: gajim/common/config.py:205
 msgid "Show close button in tab?"
 msgstr "Czy pokazywać przycisk zamknięcia na karcie?"
 
-#: gajim/common/config.py:220
+#: gajim/common/config.py:218
 msgid "Preview new messages in notification popup?"
 msgstr "Podgląd nowych wiadomości w oknie powiadomienia?"
 
-#: gajim/common/config.py:223
+#: gajim/common/config.py:221
+#, fuzzy
 msgid ""
-"A semicolon-separated list of words that will be highlighted in group chats."
+"A list of words (semicolon separated) that will be highlighted in group "
+"chats."
 msgstr ""
 "Lista słów oddzielonych średnikami, które będą podświetlane w trakcie "
 "rozmowy w pokoju."
 
-#: gajim/common/config.py:224
+#: gajim/common/config.py:222
 #, fuzzy
 msgid ""
-"If true, quits Gajim when X button of Window Manager is clicked. This "
-"setting is taken into account only if notification icon is used."
+"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 ""
 "Jeśli ma wartość True, to Gajim jest zamykany po wciśnięciu przycisku X "
 "Menadżera Okien. Ta opcja jest brana pod uwagę tylko gdy używana jest tacka "
 "systemowa."
 
-#: gajim/common/config.py:225
+#: gajim/common/config.py:223
+#, fuzzy
 msgid ""
-"If true, Gajim hides the Roster window on pressing the X button instead of "
-"minimizing into the Dock."
+"If enabled, Gajim hides the contact list window when pressing the X button "
+"instead of minimizing into the notification area."
 msgstr ""
 "Jeżeli Prawda, Gajim showa okno rostera po naciśnięciu na przycisk X zamiast "
 "minimalizacji do paska zadań."
 
-#: gajim/common/config.py:226
+#: gajim/common/config.py:224
 #, fuzzy
 msgid ""
-"If true, Gajim will display an icon on each tab containing unread messages. "
-"Depending on the theme, this icon may be animated."
+"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:227
+#: gajim/common/config.py:225
 #, fuzzy
 msgid ""
-"If true, Gajim will display the status message, if not empty, for every "
-"contact under the contact name in roster window."
+"If enabled, Gajim will display the status message (if not empty) underneath "
+"the contact name in the contact list window."
 msgstr ""
 "Jeśli ma wartość True, Gajim wyświetli opis statusu, jeśli nie jest on "
 "pusty, dla każdego kontaktu pod jego nazwą w oknie listy kontaktów."
 
-#: gajim/common/config.py:233
-msgid "Define the position of the avatar in roster. Can be left or right"
+#: gajim/common/config.py:231
+#, 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:234
+#: gajim/common/config.py:232
 #, fuzzy
 msgid ""
-"If False, Gajim will no longer print status line in chats when a contact "
-"changes their status and/or their status message."
+"If disabled, Gajim will no longer print status messages in chats when a "
+"contact changes their status (and/or their status message)."
 msgstr ""
 "Jeśli ma wartość False, to nie będziesz informowany o zmianie statusu lub "
 "opisu statusu przez kontakt, z którym rozmawiasz."
 
-#: gajim/common/config.py:235
+#: gajim/common/config.py:233
 #, fuzzy
 msgid ""
 "Default Setting: Show a status message for every join or leave in a group "
-"chat"
+"chat."
 msgstr "Nie można dołączyć do pokoju"
 
-#: gajim/common/config.py:236
+#: gajim/common/config.py:234
+#, fuzzy
 msgid ""
-"Default Setting: Show a status message for all status (away, dnd, etc.) "
-"changes of users in a group chat"
+"Default Setting: Show a status message for all status changes (away, dnd, "
+"etc.) of users in a group chat."
 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:238
-msgid "Log XHTML messages instead of plain text messages."
+#: gajim/common/config.py:236
+#, fuzzy
+msgid "Store XHTML messages in chat history instead of plain text messages."
 msgstr "Loguj wiadomości XHTML zamiast zwykłych wiadomości tekstowych."
 
-#: gajim/common/config.py:239
+#: gajim/common/config.py:237
 msgid "Don't show avatar for the transport itself."
 msgstr "Nie pokazuj awatarów transportów."
 
-#: gajim/common/config.py:240
-msgid "Don't show roster in the system taskbar."
+#: gajim/common/config.py:238
+#, fuzzy
+msgid "Don't show contact list window in the system taskbar."
 msgstr "Nie pokazuj okna rostera na pasku zadań."
 
-#: gajim/common/config.py:241
+#: gajim/common/config.py:239
 #, fuzzy
 msgid ""
-"If true, make the window flash (the default behaviour in most Window "
-"Managers) when holding pending events."
+"If enabled, Gajim makes the window flash (the default behaviour in most "
+"Window Managers) when holding pending events."
 msgstr ""
 "Jeżeli opcja ta jest aktywna oraz zainstalowano GTK+ i PyGTK w wersji nie "
 "niższej niż 2.8, odebrane a nie przeczytane wiadomości spowodują miganie "
 "okna programu."
 
-#: gajim/common/config.py:245
+#: gajim/common/config.py:243
 #, fuzzy
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
 "'always_with_roster' - Like 'always' but the messages are in a single window "
-"along with the roster.\n"
+"along with the contact list.\n"
 "'never' - All messages get their own window.\n"
 "'peracct' - Messages for each account are sent to a specific window.\n"
-"'pertype' - Each message type (e.g. chats vs. groupchats) is sent to a "
+"'pertype' - Each message type (e.g. chats vs. group chats) is sent to a "
 "specific window."
 msgstr ""
 "Kontroluje zachowanie okna z nowymi wiadomościami.\n"
@@ -3550,136 +3542,146 @@ msgstr ""
 "wspólne okno. Aby uaktywnić dokonane w tej opcji zmiany, trzeba ponownie "
 "uruchomić program."
 
-#: gajim/common/config.py:246
+#: gajim/common/config.py:244
+#, fuzzy
 msgid ""
-"Show roster on startup.\n"
-"'always' - Always show roster.\n"
-"'never' - Never show roster.\n"
-"'last_state' - Restore the last state roster."
+"Show contact list window on startup.\n"
+"'always' - Always show contact list window.\n"
+"'never' - Never show contact list window.\n"
+"'last_state' - Restore last state of the contact list window."
 msgstr ""
 "Pokazuj roster podczas startu.\n"
 "'zawsze' - Zawsze pokazuj.\n"
 "'nigdy' - Nigdy nie pokazuj.\n"
 "'ostatni_stan' - Przywróć ostatni stan"
 
-#: gajim/common/config.py:247
-msgid "If False, you will no longer see the avatar in the chat window."
+#: gajim/common/config.py:245
+#, 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:248
+#: gajim/common/config.py:246
 #, fuzzy
-msgid "If true, pressing the escape key closes a tab/window."
+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:249
-msgid "Hides the banner in a group chat window"
+#: gajim/common/config.py:247
+#, fuzzy
+msgid "Hides the banner in a group chat window."
 msgstr "Ukrywa banner w oknie czatu"
 
-#: gajim/common/config.py:250
-msgid "Hides the banner in two persons chat window"
-msgstr "Usuwa banner podczas rozmowy dwóch osób"
+#: gajim/common/config.py:248
+#, fuzzy
+msgid "Hides the banner in a 1:1 chat window."
+msgstr "Ukrywa banner w oknie czatu"
 
-#: gajim/common/config.py:251
-msgid "Hides the group chat occupants list in group chat window."
+#: gajim/common/config.py:249
+#, 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:252
+#: gajim/common/config.py:250
+#, fuzzy
 msgid ""
 "In a chat, show the nickname at the beginning of a line only when it's not "
-"the same person talking than in previous message."
+"the same person talking as in the previous message."
 msgstr ""
 "Podczas rozmowy grupowej, pokaż nazwę rozmówcy na początku linii tylko "
 "wówczas, gdy poprzednią wiadomość wysłała inna osoba."
 
-#: gajim/common/config.py:253
+#: gajim/common/config.py:251
 msgid "Indentation when using merge consecutive nickname."
 msgstr "Wcięcie stosowane przy łaczeniu tych samych nicków."
 
-#: gajim/common/config.py:254
-msgid "Ctrl-Tab go to next composing tab when none is unread."
+#: gajim/common/config.py:252
+#, fuzzy
+msgid ""
+"Ctrl+Tab switches to the next composing tab when there are no tabs with "
+"messages pending."
 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:255
+#: gajim/common/config.py:253
 #, fuzzy
 msgid ""
-"Show the confirm metacontacts creation dialog or not? Empty string means "
-"never show the dialog."
+"Show a confirmation dialog to create metacontacts? Empty string means never "
+"show the dialog."
 msgstr ""
-"Czy program powinien potwierdzać za każdym razem utworzenie metakontaktu? "
-"Pusty ciąg spowoduje, że okno dialogowe nie będzie wyświetlane."
+"Wyświetlać potwierdzenie blokowania kontaktu? Pusta linia oznacza, że "
+"potwierdzenie nie będzie wyświetlane."
 
-#: gajim/common/config.py:256
+#: gajim/common/config.py:254
 #, fuzzy
 msgid ""
-"Show the confirm block contact dialog or not? Empty string means never show "
+"Show a confirmation dialog to block a contact? Empty string means never show "
 "the dialog."
 msgstr ""
 "Wyświetlać potwierdzenie blokowania kontaktu? Pusta linia oznacza, że "
 "potwierdzenie nie będzie wyświetlane."
 
-#: gajim/common/config.py:257
+#: gajim/common/config.py:255
 #, fuzzy
 msgid ""
-"Show the confirm custom status dialog or not? Empty string means never show "
-"the dialog."
+"Show a confirmation dialog for a custom status? Empty string means never "
+"show the dialog."
 msgstr ""
 "Wyświetlać potwierdzenie statusu indywidualnego? Pusta linia oznacza, że "
 "potwierdzenie nie będzie wyświetlane."
 
-#: gajim/common/config.py:258
+#: gajim/common/config.py:256
 #, fuzzy
 msgid ""
-"If true, you will be able to set a negative priority to your account in "
-"account modification window. BE CAREFUL, when you are logged in with a "
-"negative priority, you will NOT receive any message from your server."
+"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 ""
 "Jeżeli opcja ustawiona jest na True, w oknie modyfikacji właściwości konta "
 "będziesz mógł korzystać z ujemnych priorytetów. Zauważ, że po zalogowaniu z "
 "ujemnym priorytetem nie będziesz otrzymywał żadnych wiadomości z twojego "
 "serwera."
 
-#: gajim/common/config.py:259
+#: gajim/common/config.py:257
 #, fuzzy
 msgid ""
-"If true, Gajim will show number of online and total contacts in account and "
-"group rows."
+"If enabled, Gajim will show both the number of online and total contacts in "
+"account rows as well as in group rows."
 msgstr ""
 "Jeśli opcja ustawiona jest na True, Gajim będzie wyświetlał liczbę "
 "połączonych kontaktów oraz ogólną liczbę kontaktów dla każdego konta oraz "
 "grupy"
 
-#: gajim/common/config.py:260
+#: gajim/common/config.py:258
+#, fuzzy
 msgid ""
-"Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
-"as if they were of this type"
+"Can be empty, 'chat' or 'normal'. If not empty, all incoming messages are "
+"treated as if they were of this type."
 msgstr ""
 "Przyjmuje wartość pustą, 'chat' lub 'normal'. Dwie ostatnie określają czy "
 "Gajim będzie traktował każdą przychodzącą wiadomość jako czat lub pojedynczą "
 "wiadomość"
 
-#: gajim/common/config.py:261
+#: gajim/common/config.py:259
 #, fuzzy
 msgid ""
-"If true, Gajim will scroll and select the contact who sent you the last "
-"message, if chat window is not already opened."
+"If enabled, Gajim will scroll and select the contact who sent you the last "
+"message, if the chat window is not already opened."
 msgstr ""
 "Jeżeli ustawiono na 'True', Gajim przewinie listę kontaktów i wybierze ten "
 "kontakt, który wysłał ci ostatnią wiadomość, ale tylko wtedy gdy okno czatu "
 "nie jest już otwarte."
 
-#: gajim/common/config.py:262
+#: gajim/common/config.py:260
 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:263
+#: gajim/common/config.py:261
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
@@ -3687,78 +3689,82 @@ msgstr ""
 "Maksymalna ilość linii, jaka jest wyświetlana podczas rozmów. Najstarsze są "
 "usuwane."
 
-#: gajim/common/config.py:264
+#: gajim/common/config.py:262
 #, fuzzy
 msgid ""
-"If true, notification windows from notification-daemon will be attached to "
-"notification icon."
+"If enabled, notification windows from notification-daemon will be attached "
+"to the notification area icon."
 msgstr ""
 "Po nadaniu wartości True okna powiadomień będą połączone z obszarem "
 "powiadomień."
 
-#: gajim/common/config.py:265
+#: gajim/common/config.py:263
 msgid "Choose interval between 2 checks of idleness."
 msgstr "Wybierz odstęp czasu pomiędzy dwoma sprawdzeniami bezczynności."
 
-#: gajim/common/config.py:266
+#: gajim/common/config.py:264
+#, fuzzy
 msgid ""
-"Valid uri schemes. Only schemes in this list will be accepted as \"real\" "
-"uri. (mailto and xmpp are handled separately)"
+"Valid URI schemes. Only schemes in this list will be accepted as 'real' URI "
+"(mailto and xmpp are handled separately)."
 msgstr ""
 "Wzorce ważnych uri. Tylko wzorce z tej listy będzie przyjmowane jako "
 "\"prawdziwe\" uri. (mailto i xmpp są traktowane oddzielnie)"
 
-#: gajim/common/config.py:267
+#: gajim/common/config.py:265
 #, fuzzy
-msgid "If true, completion in groupchats will be like a shell auto-completion"
+msgid ""
+"If enabled, completion in group chats will be like a shell auto-completion."
 msgstr ""
 "Jeśli włączony, uzupełnianie w konferencjach będzie działać tak samo, jak w "
 "konsoli."
 
-#: gajim/common/config.py:272
-msgid "Optionally fix jingle output video framerate. Example: 10/1 or 25/2"
+#: gajim/common/config.py:270
+msgid "Optionally fix Jingle output video framerate. Example: 10/1 or 25/2."
 msgstr ""
 
-#: gajim/common/config.py:273
-msgid "Optionally resize jingle output video. Example: 320x240"
+#: gajim/common/config.py:271
+msgid "Optionally resize Jingle output video. Example: 320x240."
 msgstr ""
 
-#: gajim/common/config.py:274
-msgid "If true, You will also see your webcam"
-msgstr "Jeżeli Prawda, będziesz widział obraz ze swojej kamery"
+#: gajim/common/config.py:272
+msgid "If enabled, you will see your webcam's video stream as well."
+msgstr ""
 
-#: gajim/common/config.py:277
+#: gajim/common/config.py:275
+#, fuzzy
 msgid ""
-"If true, Gajim will try to use a STUN server when using Jingle. The one in "
-"\"stun_server\" option, or the one given by the XMPP server."
+"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 ""
 "Jeżeli Prawda, Gajim będzie próbował używać serwera STUN podczas używania "
 "Jingle. Serwer zostanie wykorzystany z opcji \"stun_server\" lub z ustawień "
 "serwera XMPP."
 
-#: gajim/common/config.py:278
+#: gajim/common/config.py:276
 msgid "STUN server to use when using Jingle"
 msgstr "Serwer STUN do wykorzystania podczas korzystania z Jingle"
 
-#: gajim/common/config.py:279
+#: gajim/common/config.py:277
 msgid ""
-"If true, Gajim will show affiliation of groupchat occupants by adding a "
-"colored square to the status icon"
+"If enabled, Gajim will show affiliation of group chat participants by adding "
+"a colored square to the status icon."
 msgstr ""
 
-#: gajim/common/config.py:280
+#: gajim/common/config.py:278
+#, fuzzy
 msgid ""
 "Proxy used for all outgoing connections if the account does not have a "
-"specific proxy configured"
+"specific proxy configured."
 msgstr ""
 "Proxy używane do wszystkich połączeń wychodzących, jeżeli konta nie mają "
 "skonfigurowanego konkretnego proxy."
 
-#: gajim/common/config.py:281
-msgid "If true, Gajim will ignore incoming attention requests (\"wizz\")."
+#: gajim/common/config.py:279
+msgid "If enabled, Gajim will ignore incoming attention requests ('wizz')."
 msgstr ""
 
-#: gajim/common/config.py:282
+#: gajim/common/config.py:280
 msgid ""
 "If enabled, Gajim will reopen chat windows that were opened last time Gajim "
 "was closed."
@@ -3766,75 +3772,93 @@ msgstr ""
 "Jeżeli włączone, Gajim ponownie otworzy okna czatu, które były otwarte "
 "podczas zamykania Gajima."
 
-#: gajim/common/config.py:283
+#: gajim/common/config.py:281
 #, fuzzy
 msgid ""
-"If enabled, Gajim will show an icon to show that sent message has been "
-"received by your contact"
+"If enabled, Gajim will display an icon to show that sent messages have been "
+"received by your contact."
 msgstr ""
 "Po uaktywnieniu tej opcji Gajim nie będzie prosił o opis statusu. Zostanie "
 "użyty opis domyślny."
 
-#: gajim/common/config.py:284
-msgid "Show a mini avatar in chat window tabs and in window icon"
+#: gajim/common/config.py:282
+#, 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:285
+#: gajim/common/config.py:283
 #, fuzzy
-msgid "If true, Gajim will use the Systems Keyring to store account passwords."
+msgid ""
+"If enabled, Gajim will use the System's Keyring to store account passwords."
 msgstr ""
 "Jeśli opcja ta ustawiona jest na True, do przechowywania haseł Gajim będzie "
 "używał Menedżera bazy kluczy GNOME."
 
-#: gajim/common/config.py:286
-msgid "If true, Gajim will execute XEP-0146 Commands."
+#: gajim/common/config.py:284
+#, 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:287
+#: gajim/common/config.py:285
 msgid "2: System, 1: Enabled, 0: Disabled"
 msgstr "2: System, 1: Włączony, 0: Wyłączony"
 
-#: gajim/common/config.py:288
+#: gajim/common/config.py:286
 msgid "Options in days which can be chosen in the sync threshold menu"
 msgstr ""
 
-#: gajim/common/config.py:289
+#: gajim/common/config.py:287
+#, fuzzy
 msgid ""
-"Maximum history in days we request from a public room archive. 0: As much as "
-"possible"
+"Maximum history in days we request from a public group chat archive. 0: As "
+"much as possible."
 msgstr ""
 "Maksymalny okres historii wyrażony w dniach, o który prosimy archiwum pokoju "
 "publicznej. 0: Tyle ile możliwe"
 
-#: gajim/common/config.py:290
+#: gajim/common/config.py:288
+#, fuzzy
 msgid ""
-"Maximum history in days we request from a private room archive. 0: As much "
-"as possible"
+"Maximum history in days we request from a private group chat archive. 0: As "
+"much as possible."
 msgstr ""
 "Maksymalny okres historii wyrażony w dniach, o który prosimy archiwum pokoju "
 "prywatnego. 0: Tyle ile możliwe"
 
-#: gajim/common/config.py:291
-msgid "If the room subject is shown in chat on join"
+#: gajim/common/config.py:289
+msgid ""
+"If enabled, Gajim shows the group chat subject in the chat window when "
+"joining."
 msgstr ""
 
-#: gajim/common/config.py:292
+#: gajim/common/config.py:290
+#, fuzzy
 msgid ""
-"If the contact row is colored according to the current chatstate of the "
-"contact"
+"If enabled, the contact row is colored according to the current chat state "
+"of the contact."
 msgstr ""
+"Zaznaczenie tej opcji umożliwi innym wykrywanie jakiego systemu operacyjnego "
+"używasz"
 
-#: gajim/common/config.py:293
-msgid "If the tab is colored according to the current chatstate of the contact"
+#: gajim/common/config.py:291
+#, fuzzy
+msgid ""
+"If enabled, the tab is colored according to the current chat state of the "
+"contact."
 msgstr ""
+"Zaznaczenie tej opcji umożliwi innym wykrywanie jakiego systemu operacyjnego "
+"używasz"
 
-#: gajim/common/config.py:294
+#: gajim/common/config.py:292
+#, fuzzy
 msgid ""
-"Shows a text in the banner that describes the current chatstate of the "
-"contact"
+"Shows a text in the banner that describes the current chat state of the "
+"contact."
 msgstr ""
+"Zaznaczenie tej opcji umożliwi innym wykrywanie jakiego systemu operacyjnego "
+"używasz"
 
-#: gajim/common/config.py:295 gajim/common/config.py:424
+#: gajim/common/config.py:293
 #, fuzzy
 msgid ""
 "Chat state notifications that are sent to contacts. Possible values: all, "
@@ -3843,140 +3867,158 @@ msgstr ""
 "Wysyłaj informacje o twoim statusie podczas prowadzenia rozmowy. Może "
 "przyjmować wartości all, composing_only, disabled."
 
-#: gajim/common/config.py:296 gajim/common/config.py:438
+#: gajim/common/config.py:294
 #, fuzzy
 msgid ""
 "Chat state notifications that are sent to the group chat. Possible values: "
-"all, composing_only, disabled"
+"'all', 'composing_only', 'disabled'"
 msgstr ""
 "Wysyłaj informacje o twoim statusie podczas prowadzenia rozmowy. Może "
 "przyjmować wartości all, composing_only, disabled."
 
-#: gajim/common/config.py:312
+#: gajim/common/config.py:297
+msgid "API Preferences. Possible values: 'http', 'iq'"
+msgstr ""
+
+#: gajim/common/config.py:313
+#, fuzzy
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
-"defined in autopriority_* options."
+"defined in 'autopriority_*' options."
 msgstr ""
 "Priorytet ulegnie automatycznej zmianie, wraz ze zmianą statusu. Priorytety "
 "zdefiniowane są opcjach rozpoczynających się od autopriority_*."
 
-#: gajim/common/config.py:320
+#: gajim/common/config.py:321
+#, fuzzy
 msgid ""
-"Status used to autoconnect as. Can be online, chat, away, xa, dnd, "
-"invisible. NOTE: this option is used only if restore_last_status is disabled"
+"Status to be used automatically when connecting. Can be 'online', 'chat', "
+"'away', 'xa', 'dnd' or 'invisible'. NOTE: This option is used only if "
+"'restore_last_status' is disabled."
 msgstr ""
 "Status używany przy automatycznym połączeniu. Może być: dostępny, chętny do "
 "rozmowy, zaraz wracam, nieobecny, nie przeszkadzać, niewidoczny. UWAGA: ta "
 "opcja będzie używana tylko jeśli restore_last_status będzie wyłączone"
 
-#: gajim/common/config.py:321
-msgid "If enabled, restore the last status that was used."
+#: gajim/common/config.py:322
+#, 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:322
+#: gajim/common/config.py:323
 #, fuzzy
 msgid ""
-"If true, Contacts requesting authorization will be automatically accepted."
+"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:323
+#: gajim/common/config.py:324
+#, fuzzy
 msgid ""
-"If False, this account will be disabled and will not appear in roster window."
+"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:327
-msgid "Allow plaintext connections"
+#: gajim/common/config.py:328
+#, fuzzy
+msgid "Allow plaintext connections."
 msgstr "Pozwól na połączenia otwartym tekstem"
 
-#: gajim/common/config.py:330
+#: gajim/common/config.py:331
+#, fuzzy
 msgid ""
-"List (space separated) of authentication mechanisms to try. Can contain "
-"ANONYMOUS, EXTERNAL, GSSAPI, SCRAM-SHA-1-PLUS, SCRAM-SHA-1, DIGEST-MD5, "
-"PLAIN, X-MESSENGER-OAUTH2 or XEP-0078"
+"List of authentication mechanisms to try (space separated). Can contain "
+"'ANONYMOUS', 'EXTERNAL', 'GSSAPI', 'SCRAM-SHA-1-PLUS', 'SCRAM-SHA-1', "
+"'DIGEST-MD5', 'PLAIN', 'X-MESSENGER-OAUTH2' or 'XEP-0078'."
 msgstr ""
 "Lista (oddzielona spacjami) metod autentykacji do sprawdzenia. Może zawierać "
 "ANONYMOUS, EXTERNAL, GSSAPI, SCRAM-SHA-1-PLUS, SCRAM-SHA-1, DIGEST-MD5, "
 "PLAIN, X-MESSENGER-OAUTH2 lub XEP-0078"
 
-#: gajim/common/config.py:331
+#: gajim/common/config.py:332
 #, fuzzy
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection. "
-"Can be 'warn', 'connect', 'disconnect'"
+"Can be 'warn', 'connect' or 'disconnect'."
 msgstr "Pokaż ostrzeżenie przed wysłaniem hasła nieszyfrowanym połączeniem."
 
-#: gajim/common/config.py:332
+#: gajim/common/config.py:333
 msgid "Show a warning dialog before using standard SSL library."
 msgstr "Pokaż ostrzeżenie przed użyciem standardowej biblioteki SSL."
 
-#: gajim/common/config.py:333
+#: gajim/common/config.py:334
 #, fuzzy
 msgid ""
 "Show a warning dialog before sending PLAIN password over a plain connection."
 msgstr "Pokaż ostrzeżenie przed wysłaniem hasła nieszyfrowanym połączeniem."
 
-#: gajim/common/config.py:334
-msgid "Space separated list of ssl errors to ignore."
+#: gajim/common/config.py:335
+msgid "List of SSL errors to ignore (space separated)."
 msgstr ""
-"Lista błędów (rozdzielona spacjami) zawierająca wykaz błędów ssl, które "
-"program będzie ignorował."
 
-#: gajim/common/config.py:340
+#: gajim/common/config.py:341
 msgid ""
-"Space separated list of JIDs for which you do not want to store logs. You "
-"can also add account name to log nothing for this account."
+"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:341
+#: gajim/common/config.py:342
 msgid ""
-"Space separated list of JIDs for which you accept to not log conversations "
-"if he does not want to."
+"List of XMPP Addresses (space separated) for which you accept to not store "
+"chat history if your contact does not want to."
 msgstr ""
 
-#: gajim/common/config.py:343
-msgid "Whitespace sent after inactivity"
+#: gajim/common/config.py:344
+#, fuzzy
+msgid "If enabled, a whitespace is sent after inactivity (keep alive)."
 msgstr "Wysyłanie białych znaków po nieaktywności"
 
-#: gajim/common/config.py:344
-msgid "XMPP ping sent after inactivity"
+#: gajim/common/config.py:345
+#, fuzzy
+msgid "If enabled, an XMPP ping is sent after inactivity (ping alive)."
 msgstr "Wysyłanie pingu XMPP po nieaktywności"
 
-#: gajim/common/config.py:348
+#: gajim/common/config.py:349
 #, fuzzy
 msgid ""
-"How many seconds to wait for the answer of ping alive packet before trying "
-"to reconnect?"
+"How many seconds to wait for the answer of a ping alive packet before trying "
+"to reconnect."
 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:352
-msgid "Jabberd2 workaround"
+#: gajim/common/config.py:353
+#, fuzzy
+msgid "Jabberd2 workaround."
 msgstr "Obejście dla Jabberd2"
 
-#: gajim/common/config.py:355
+#: gajim/common/config.py:356
+#, fuzzy
 msgid ""
-"If checked, Gajim will use your IP and proxies defined in "
-"file_transfer_proxies option for file transfer."
+"If enabled, Gajim will use your IP and proxies defined in "
+"'file_transfer_proxies' option for file transfers."
 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:356
+#: gajim/common/config.py:357
 msgid ""
-"If true, Gajim will test file transfer proxies on startup to be sure it "
-"works. Openfire's proxies are known to fail this test even if they work."
+"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:369
-msgid "Answer to receipt requests"
-msgstr "Odpowiedź na żądanie potwierdzenia"
-
 #: gajim/common/config.py:370
-msgid "Sent receipt requests"
-msgstr "Wyślij żądanie potwierdzenia"
+#, 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:371
+msgid "If enabled, Gajim will send message receipt requests."
+msgstr ""
 
-#: gajim/common/config.py:379
+#: gajim/common/config.py:380
 #, fuzzy
 msgid ""
 "Allow Gajim to send information about the operating system you are running."
@@ -3984,183 +4026,200 @@ msgstr ""
 "Zaznaczenie tej opcji umożliwi innym wykrywanie jakiego systemu operacyjnego "
 "używasz"
 
-#: gajim/common/config.py:380
+#: gajim/common/config.py:381
 #, fuzzy
 msgid "Allow Gajim to send your local time."
 msgstr "%s chce przesłać ci plik."
 
-#: gajim/common/config.py:383
+#: gajim/common/config.py:384
 #, fuzzy
-msgid "Message that is sent to contacts you want to add"
+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:384
+#: gajim/common/config.py:385
+#, fuzzy
 msgid ""
-"If enabled, Gajim will send your local IPs so your contact can connect to "
-"your machine to transfer files."
+"If enabled, Gajim will send your local IP so your contact can connect to "
+"your machine for file transfers."
 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:385
+#: gajim/common/config.py:386
 msgid ""
-"Space separated list of JIDs for which chat window will be re-opened on next "
-"startup."
+"List of XMPP Addresses (space separated) for which the chat window will be "
+"re-opened on next startup."
 msgstr ""
 
-#: gajim/common/config.py:387
-msgid "HTTP Upload: Enable HTTPS Verification"
+#: gajim/common/config.py:388
+msgid "HTTP File Upload: Enable HTTPS Verification."
 msgstr ""
 
-#: gajim/common/config.py:388
+#: gajim/common/config.py:389
 msgid ""
-"Preferred file transfer mechanism for file drag&drop on chat window. Can be "
-"'httpupload' (default) or 'jingle'"
+"Preferred file transfer mechanism for file drag&drop on a chat window. Can "
+"be 'httpupload' (default) or 'jingle'."
 msgstr ""
 
-#: gajim/common/config.py:389
-msgid "Allow cert verification with POSH"
+#: gajim/common/config.py:390
+#, fuzzy
+msgid "Allow certificate verification with POSH."
 msgstr "Zezwól na weryfikacji certyfikatu POSH"
 
-#: gajim/common/config.py:423 gajim/common/config.py:430
+#: gajim/common/config.py:425
 #, fuzzy
-msgid "Language for which misspelled words will be checked"
-msgstr "Język, którego używa słownik przy sprawdzaniu pisowni"
-
-#: gajim/common/config.py:427
-msgid "The currently active encryption for that contact"
-msgstr "Aktywne szyfrowanie dla tego kontaktu"
-
-#: gajim/common/config.py:431
 msgid ""
-"How many lines to request from server when entering a groupchat. -1 means no "
-"limit, -2 means global value"
+"Chat state notifications that are sent to contacts. Possible values: 'all', "
+"'composing_only', 'disabled'"
 msgstr ""
+"Wysyłaj informacje o twoim statusie podczas prowadzenia rozmowy. Może "
+"przyjmować wartości all, composing_only, disabled."
+
+#: gajim/common/config.py:428
+#, fuzzy
+msgid "The currently active encryption for that contact."
+msgstr "Aktywne szyfrowanie dla tego kontaktu"
 
 #: gajim/common/config.py:432
 msgid ""
-"Minutes of backlog to request when entering a groupchat. -1 means no limit, "
-"-2 means global value"
+"If enabled, a notification is created for every message in this group chat."
 msgstr ""
 
 #: gajim/common/config.py:433
-msgid "State whether a notification is created for every message in this room"
-msgstr ""
-
-#: gajim/common/config.py:434
+#, fuzzy
 msgid ""
-"Show a status message for all status (away, dnd, etc.) changes of users in a "
-"group chat"
+"Show a status message for all status changes (away, dnd, etc.) of users in a "
+"group chat."
 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:435
+#: gajim/common/config.py:434
 #, fuzzy
-msgid "Show a status message for every join or leave in a group chat"
+msgid "Show a status message for every join or leave in a group chat."
 msgstr "Nie można dołączyć do pokoju"
 
+#: gajim/common/config.py:435
+msgid ""
+"If enabled, the group chat is minimized into the contact list when joining "
+"automatically."
+msgstr ""
+
 #: gajim/common/config.py:436
-msgid "If the group chat is minimized into the roster on autojoin"
+msgid ""
+"If enabled, the group chat is minimized into the contact list when closing "
+"it."
 msgstr ""
 
 #: gajim/common/config.py:437
-msgid "If the group chat is minimized into the roster on close"
+#, fuzzy
+msgid ""
+"Chat state notifications that are sent to the group chat. Possible values: "
+"'all', 'composing_only' or 'disabled'."
 msgstr ""
+"Wysyłaj informacje o twoim statusie podczas prowadzenia rozmowy. Może "
+"przyjmować wartości all, composing_only, disabled."
 
-#: gajim/common/config.py:441
+#: gajim/common/config.py:440
 msgid ""
-"State whether plugins should be activated on startup (this is saved on Gajim "
-"exit). This option SHOULD NOT be used to (de)activate plug-ins. Use GUI "
-"instead."
+"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:446 gajim/common/const.py:281
+#: gajim/common/config.py:445 gajim/common/const.py:315
 msgid "Sleeping"
 msgstr "Śpię"
 
-#: gajim/common/config.py:447
+#: gajim/common/config.py:446
 msgid "Back soon"
 msgstr "Niedługo wrócę"
 
-#: gajim/common/config.py:447
+#: gajim/common/config.py:446
 msgid "Back in some minutes."
 msgstr "Wrócę za jakiś czas."
 
-#: gajim/common/config.py:448 gajim/common/const.py:247
+#: gajim/common/config.py:447 gajim/common/const.py:281
 msgid "Eating"
 msgstr "Jem"
 
-#: gajim/common/config.py:448
-msgid "I'm eating, so leave me a message."
-msgstr "Jem. Zostaw wiadomość."
+#: gajim/common/config.py:447
+#, fuzzy
+msgid "I'm eating."
+msgstr "Pracuję."
 
-#: gajim/common/config.py:449
+#: gajim/common/config.py:448
 msgid "Movie"
 msgstr "Film"
 
-#: gajim/common/config.py:449
+#: gajim/common/config.py:448
 msgid "I'm watching a movie."
 msgstr "Oglądam film."
 
-#: gajim/common/config.py:450 gajim/common/const.py:314
+#: gajim/common/config.py:449 gajim/common/const.py:348
 msgid "Working"
 msgstr "Praca"
 
-#: gajim/common/config.py:450
+#: gajim/common/config.py:449
 msgid "I'm working."
 msgstr "Pracuję."
 
-#: gajim/common/config.py:451
+#: gajim/common/config.py:450
 msgid "Phone"
 msgstr "Telefon"
 
-#: gajim/common/config.py:451
+#: gajim/common/config.py:450
 msgid "I'm on the phone."
 msgstr "Rozmawiam przez telefon."
 
-#: gajim/common/config.py:452
+#: gajim/common/config.py:451
 msgid "Out"
 msgstr "Wyszedłem"
 
-#: gajim/common/config.py:452
+#: gajim/common/config.py:451
 msgid "I'm out enjoying life."
 msgstr "Wyszedłem cieszyć się życiem."
 
-#: gajim/common/config.py:463
+#: gajim/common/config.py:462
 msgid "I'm available."
 msgstr "Dostępny."
 
-#: gajim/common/config.py:464
+#: gajim/common/config.py:463
 msgid "I'm free for chat."
 msgstr "Chętny do rozmowy."
 
-#: gajim/common/config.py:465 gajim/gtk/accounts.py:134
+#: gajim/common/config.py:464 gajim/gtk/accounts.py:133
 msgid "Be right back."
 msgstr "Zaraz wracam."
 
-#: gajim/common/config.py:466
+#: gajim/common/config.py:465
 msgid "I'm not available."
 msgstr "Nieobecny."
 
-#: gajim/common/config.py:467
+#: gajim/common/config.py:466
 msgid "Do not disturb."
 msgstr "Nie przeszkadzać."
 
-#: gajim/common/config.py:468 gajim/common/config.py:469
+#: gajim/common/config.py:467 gajim/common/config.py:468
 msgid "Bye!"
 msgstr "Żegnaj!"
 
-#: gajim/common/config.py:480
+#: gajim/common/config.py:479
+#, fuzzy
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
-"muc_highlight_words, or when a group chat message contains your nickname."
+"'muc_highlight_words' your nickname is mentioned."
 msgstr ""
 "Dźwięk, który zostanie odtworzony, gdy wiadomość MUC będzie zawierać jeden z "
 "wyrazów ze zmiennej muc_highlight_words lub gdy wiadomość MUC zawierać "
 "będzie twój pseudonim."
 
-#: gajim/common/config.py:481
-msgid "Sound to play when any MUC message arrives."
+#: gajim/common/config.py:480
+#, 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:485
+#: gajim/common/config.py:484
 #, fuzzy
 msgid "Tor"
 msgstr "Do"
@@ -4170,879 +4229,975 @@ msgstr "Do"
 msgid "Error: cannot open %s for reading"
 msgstr "błąd: nie można otworzyć %s do odczytu"
 
-#: gajim/common/const.py:214
+#: gajim/common/const.py:216
+#, fuzzy
+msgid "?Group chat name:Team"
+msgstr "?Funkcja kontaktu w pokoju: Brak"
+
+#: gajim/common/const.py:217
+msgid "?Group chat description:Project discussion"
+msgstr ""
+
+#: gajim/common/const.py:218
+#, fuzzy
+msgid "?Group chat address:team"
+msgstr "Pokoje"
+
+#: gajim/common/const.py:219
+#, fuzzy
+msgid "?Group chat name:Family"
+msgstr "Podświetlenie wiadomości z czatu"
+
+#: gajim/common/const.py:220
+msgid "?Group chat description:Spring gathering"
+msgstr ""
+
+#: gajim/common/const.py:221
+msgid "?Group chat address:family"
+msgstr ""
+
+#: gajim/common/const.py:222
+#, fuzzy
+msgid "?Group chat name:Vacation"
+msgstr "Zaproszenie na czat"
+
+#: gajim/common/const.py:223
+msgid "?Group chat description:Trip planning"
+msgstr ""
+
+#: gajim/common/const.py:224
+#, fuzzy
+msgid "?Group chat address:vacation"
+msgstr "Zaproszenie na czat"
+
+#: gajim/common/const.py:225
+#, fuzzy
+msgid "?Group chat name:Repairs"
+msgstr "Pokój"
+
+#: gajim/common/const.py:226
+msgid "?Group chat description:Local help group"
+msgstr ""
+
+#: gajim/common/const.py:227
+#, fuzzy
+msgid "?Group chat address:repairs"
+msgstr "Pokoje"
+
+#: gajim/common/const.py:228
+#, fuzzy
+msgid "?Group chat name:News"
+msgstr "?Funkcja kontaktu w pokoju: Brak"
+
+#: gajim/common/const.py:229
+#, fuzzy
+msgid "?Group chat description:Local news and reports"
+msgstr "Tworzenie pokoi jest ograniczone."
+
+#: gajim/common/const.py:230
+#, fuzzy
+msgid "?Group chat address:news"
+msgstr "Nowa rozmowa grupowa"
+
+#: gajim/common/const.py:235
+#, fuzzy
+msgid "Remote server not found"
+msgstr "Nie można odnaleźć usługi"
+
+#: gajim/common/const.py:236
+msgid "Remote server timeout"
+msgstr ""
+
+#: gajim/common/const.py:237 gajim/common/const.py:238
+#: gajim/common/const.py:239
+#, fuzzy
+msgid "Address does not belong to a group chat server"
+msgstr "To nie jest czat"
+
+#: gajim/common/const.py:240
+#, fuzzy
+msgid "Group chat already exists"
+msgstr "Konto o takiej nazwie już istnieje."
+
+#: gajim/common/const.py:241
+#, fuzzy
+msgid "Group chat does not exist"
+msgstr "Pokój <b>%s</b> nie istnieje."
+
+#: gajim/common/const.py:247
 msgid "This message was encrypted with OTR and could not be decrypted."
 msgstr ""
 
-#: gajim/common/const.py:217
+#: gajim/common/const.py:250
 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:221
+#: gajim/common/const.py:254
 msgid ""
-"This message was encrypted with OpenPGP for XMPP and could not be decrypted."
+"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:224
+#: gajim/common/const.py:258
 #, python-format
 msgid "This message was encrypted with %s and could not be decrypted."
 msgstr ""
 
-#: gajim/common/const.py:231
+#: gajim/common/const.py:265
 msgid "Doing Chores"
 msgstr "Krzątam się"
 
-#: gajim/common/const.py:232
+#: gajim/common/const.py:266
 msgid "Buying Groceries"
 msgstr "Na zakupach"
 
-#: gajim/common/const.py:233
+#: gajim/common/const.py:267
 msgid "Cleaning"
 msgstr "Sprzątam"
 
-#: gajim/common/const.py:234
+#: gajim/common/const.py:268
 msgid "Cooking"
 msgstr "Gotuję"
 
-#: gajim/common/const.py:235
+#: gajim/common/const.py:269
 msgid "Doing Maintenance"
 msgstr "Naprawiam"
 
-#: gajim/common/const.py:236
+#: gajim/common/const.py:270
 msgid "Doing the Dishes"
 msgstr "Zmywam naczynia"
 
-#: gajim/common/const.py:237
+#: gajim/common/const.py:271
 msgid "Doing the Laundry"
 msgstr "Piorę"
 
-#: gajim/common/const.py:238
+#: gajim/common/const.py:272
 msgid "Gardening"
 msgstr "Pracuję w ogrodzie"
 
-#: gajim/common/const.py:239
+#: gajim/common/const.py:273
 msgid "Running an Errand"
 msgstr "Biegam na posyłki"
 
-#: gajim/common/const.py:240
+#: gajim/common/const.py:274
 msgid "Walking the Dog"
 msgstr "Wyprowadzam psa"
 
-#: gajim/common/const.py:242
+#: gajim/common/const.py:276
 msgid "Drinking"
 msgstr "Piję"
 
-#: gajim/common/const.py:243
+#: gajim/common/const.py:277
 msgid "Having a Beer"
 msgstr "Piję piwo"
 
-#: gajim/common/const.py:244
+#: gajim/common/const.py:278
 msgid "Having Coffee"
 msgstr "Piję kawę"
 
-#: gajim/common/const.py:245
+#: gajim/common/const.py:279
 msgid "Having Tea"
 msgstr "Piję herbatę"
 
-#: gajim/common/const.py:248
+#: gajim/common/const.py:282
 msgid "Having a Snack"
 msgstr "Coś  przegryzam"
 
-#: gajim/common/const.py:249
+#: gajim/common/const.py:283
 msgid "Having Breakfast"
 msgstr "Jem śniadanie"
 
-#: gajim/common/const.py:250
+#: gajim/common/const.py:284
 msgid "Having Dinner"
 msgstr "Jem obiad"
 
-#: gajim/common/const.py:251
+#: gajim/common/const.py:285
 msgid "Having Lunch"
 msgstr "Jem lunch"
 
-#: gajim/common/const.py:253
+#: gajim/common/const.py:287
 msgid "Exercising"
 msgstr "Ćwiczę"
 
-#: gajim/common/const.py:254 gajim/common/const.py:305
+#: gajim/common/const.py:288 gajim/common/const.py:339
 msgid "Cycling"
 msgstr "Jeżdżę na rowerze"
 
-#: gajim/common/const.py:255
+#: gajim/common/const.py:289
 msgid "Dancing"
 msgstr "Tańczę"
 
-#: gajim/common/const.py:256
+#: gajim/common/const.py:290
 msgid "Hiking"
 msgstr "Wspinam się"
 
-#: gajim/common/const.py:257
+#: gajim/common/const.py:291
 msgid "Jogging"
 msgstr "Jogging"
 
-#: gajim/common/const.py:258
+#: gajim/common/const.py:292
 msgid "Playing Sports"
 msgstr "Uprawiam sport"
 
-#: gajim/common/const.py:259
+#: gajim/common/const.py:293
 msgid "Running"
 msgstr "Biegam"
 
-#: gajim/common/const.py:260
+#: gajim/common/const.py:294
 msgid "Skiing"
 msgstr "Na nartach"
 
-#: gajim/common/const.py:261
+#: gajim/common/const.py:295
 msgid "Swimming"
 msgstr "Pływam"
 
-#: gajim/common/const.py:262
+#: gajim/common/const.py:296
 msgid "Working out"
 msgstr "Wyciskam"
 
-#: gajim/common/const.py:264
+#: gajim/common/const.py:298
 msgid "Grooming"
 msgstr "Dbam o urodę"
 
-#: gajim/common/const.py:265
+#: gajim/common/const.py:299
 msgid "At the Spa"
 msgstr "W salonie Spa"
 
-#: gajim/common/const.py:266
+#: gajim/common/const.py:300
 msgid "Brushing Teeth"
 msgstr "Myję zęby"
 
-#: gajim/common/const.py:267
+#: gajim/common/const.py:301
 msgid "Getting a Haircut"
 msgstr "U fryzjera"
 
-#: gajim/common/const.py:268
+#: gajim/common/const.py:302
 msgid "Shaving"
 msgstr "Golę się"
 
-#: gajim/common/const.py:269
+#: gajim/common/const.py:303
 msgid "Taking a Bath"
 msgstr "Biorę kąpiel"
 
-#: gajim/common/const.py:270
+#: gajim/common/const.py:304
 msgid "Taking a Shower"
 msgstr "Biorę prysznic"
 
-#: gajim/common/const.py:272
+#: gajim/common/const.py:306
 msgid "Having an Appointment"
 msgstr "Na spotkaniu"
 
-#: gajim/common/const.py:274
+#: gajim/common/const.py:308
 msgid "Inactive"
 msgstr "Nieaktywny"
 
-#: gajim/common/const.py:275
+#: gajim/common/const.py:309
 msgid "Day Off"
 msgstr "Dzień wolny"
 
-#: gajim/common/const.py:276
+#: gajim/common/const.py:310
 msgid "Hanging out"
 msgstr "Wałęsam się"
 
-#: gajim/common/const.py:277
+#: gajim/common/const.py:311
 msgid "Hiding"
 msgstr "Ukrywam się"
 
-#: gajim/common/const.py:278
+#: gajim/common/const.py:312
 msgid "On Vacation"
 msgstr "Na wakacjach"
 
-#: gajim/common/const.py:279
+#: gajim/common/const.py:313
 msgid "Praying"
 msgstr "Modlę się"
 
-#: gajim/common/const.py:280
+#: gajim/common/const.py:314
 msgid "Scheduled Holiday"
 msgstr "Zaplanowane wakacje"
 
-#: gajim/common/const.py:282
+#: gajim/common/const.py:316
 msgid "Thinking"
 msgstr "Myślę"
 
-#: gajim/common/const.py:284
+#: gajim/common/const.py:318
 msgid "Relaxing"
 msgstr "Odpoczywam"
 
-#: gajim/common/const.py:285
+#: gajim/common/const.py:319
 msgid "Fishing"
 msgstr "Łowię ryby"
 
-#: gajim/common/const.py:286
+#: gajim/common/const.py:320
 msgid "Gaming"
 msgstr "Gram"
 
-#: gajim/common/const.py:287
+#: gajim/common/const.py:321
 msgid "Going out"
 msgstr "Wychodzę"
 
-#: gajim/common/const.py:288
+#: gajim/common/const.py:322
 msgid "Partying"
 msgstr "Imprezuję"
 
-#: gajim/common/const.py:289
+#: gajim/common/const.py:323
 msgid "Reading"
 msgstr "Czytam"
 
-#: gajim/common/const.py:290
+#: gajim/common/const.py:324
 msgid "Rehearsing"
 msgstr "Na próbie"
 
-#: gajim/common/const.py:291
+#: gajim/common/const.py:325
 msgid "Shopping"
 msgstr "Na zakupach"
 
-#: gajim/common/const.py:292
+#: gajim/common/const.py:326
 msgid "Smoking"
 msgstr "Palę"
 
-#: gajim/common/const.py:293
+#: gajim/common/const.py:327
 msgid "Socializing"
 msgstr "Udzielam się towarzysko"
 
-#: gajim/common/const.py:294
+#: gajim/common/const.py:328
 msgid "Sunbathing"
 msgstr "Opalam się"
 
-#: gajim/common/const.py:295
+#: gajim/common/const.py:329
 msgid "Watching TV"
 msgstr "Oglądam TV"
 
-#: gajim/common/const.py:296
+#: gajim/common/const.py:330
 msgid "Watching a Movie"
 msgstr "Oglądam film"
 
-#: gajim/common/const.py:298
+#: gajim/common/const.py:332
 msgid "Talking"
 msgstr "Rozmawiam"
 
-#: gajim/common/const.py:299
+#: gajim/common/const.py:333
 msgid "In Real Life"
 msgstr "W rzeczywistości"
 
-#: gajim/common/const.py:300
+#: gajim/common/const.py:334
 msgid "On the Phone"
 msgstr "Rozmawiam przez telefon"
 
-#: gajim/common/const.py:301
+#: gajim/common/const.py:335
 msgid "On Video Phone"
 msgstr "Wideokonferencja"
 
-#: gajim/common/const.py:303
+#: gajim/common/const.py:337
 msgid "Traveling"
 msgstr "W podróży"
 
-#: gajim/common/const.py:304
+#: gajim/common/const.py:338
 msgid "Commuting"
 msgstr "W drodze do pracy"
 
-#: gajim/common/const.py:306
+#: gajim/common/const.py:340
 msgid "Driving"
 msgstr "Prowadzę samochód"
 
-#: gajim/common/const.py:307
+#: gajim/common/const.py:341
 msgid "In a Car"
 msgstr "W samochodzie"
 
-#: gajim/common/const.py:308
+#: gajim/common/const.py:342
 msgid "On a Bus"
 msgstr "W autobusie"
 
-#: gajim/common/const.py:309
+#: gajim/common/const.py:343
 msgid "On a Plane"
 msgstr "W samolocie"
 
-#: gajim/common/const.py:310
+#: gajim/common/const.py:344
 msgid "On a Train"
 msgstr "W pociągu"
 
-#: gajim/common/const.py:311
+#: gajim/common/const.py:345
 msgid "On a Trip"
 msgstr "Na wyciecze"
 
-#: gajim/common/const.py:312
+#: gajim/common/const.py:346
 msgid "Walking"
 msgstr "Spaceruję"
 
-#: gajim/common/const.py:315
+#: gajim/common/const.py:349
 msgid "Coding"
 msgstr "Programuję"
 
-#: gajim/common/const.py:316
+#: gajim/common/const.py:350
 msgid "In a Meeting"
 msgstr "Na spotkaniu"
 
-#: gajim/common/const.py:317
+#: gajim/common/const.py:351
 msgid "Studying"
 msgstr "Uczę się"
 
-#: gajim/common/const.py:318
+#: gajim/common/const.py:352
 msgid "Writing"
 msgstr "Piszę"
 
-#: gajim/common/const.py:321
+#: gajim/common/const.py:355
 msgid "Afraid"
 msgstr "Przestraszony"
 
-#: gajim/common/const.py:322
+#: gajim/common/const.py:356
 msgid "Amazed"
 msgstr "Zadziwiony"
 
-#: gajim/common/const.py:323
+#: gajim/common/const.py:357
 msgid "Amorous"
 msgstr "Kochliwy"
 
-#: gajim/common/const.py:324
+#: gajim/common/const.py:358
 msgid "Angry"
 msgstr "Zły"
 
-#: gajim/common/const.py:325
+#: gajim/common/const.py:359
 msgid "Annoyed"
 msgstr "Zirytowany"
 
-#: gajim/common/const.py:326
+#: gajim/common/const.py:360
 msgid "Anxious"
 msgstr "Niespokojny"
 
-#: gajim/common/const.py:327
+#: gajim/common/const.py:361
 msgid "Aroused"
 msgstr "Podniecony"
 
-#: gajim/common/const.py:328
+#: gajim/common/const.py:362
 msgid "Ashamed"
 msgstr "Zawstydzony"
 
-#: gajim/common/const.py:329
+#: gajim/common/const.py:363
 msgid "Bored"
 msgstr "Znudzony"
 
-#: gajim/common/const.py:330
+#: gajim/common/const.py:364
 msgid "Brave"
 msgstr "Odważny"
 
-#: gajim/common/const.py:331
+#: gajim/common/const.py:365
 msgid "Calm"
 msgstr "Spokojny"
 
-#: gajim/common/const.py:332
+#: gajim/common/const.py:366
 msgid "Cautious"
 msgstr "Ostrożny"
 
-#: gajim/common/const.py:333
+#: gajim/common/const.py:367
 msgid "Cold"
 msgstr "Zziębnięty"
 
-#: gajim/common/const.py:334
+#: gajim/common/const.py:368
 msgid "Confident"
 msgstr "Pewny siebie"
 
-#: gajim/common/const.py:335
+#: gajim/common/const.py:369
 msgid "Confused"
 msgstr "Zmieszany"
 
-#: gajim/common/const.py:336
+#: gajim/common/const.py:370
 msgid "Contemplative"
 msgstr "Zamyślony"
 
-#: gajim/common/const.py:337
+#: gajim/common/const.py:371
 msgid "Contented"
 msgstr "Zadowolony"
 
-#: gajim/common/const.py:338
+#: gajim/common/const.py:372
 msgid "Cranky"
 msgstr "Nawiedzony"
 
-#: gajim/common/const.py:339
+#: gajim/common/const.py:373
 msgid "Crazy"
 msgstr "Szalony"
 
-#: gajim/common/const.py:340
+#: gajim/common/const.py:374
 msgid "Creative"
 msgstr "Twórczy"
 
-#: gajim/common/const.py:341
+#: gajim/common/const.py:375
 msgid "Curious"
 msgstr "Ciekawy"
 
-#: gajim/common/const.py:342
+#: gajim/common/const.py:376
 msgid "Dejected"
 msgstr "Ponury"
 
-#: gajim/common/const.py:343
+#: gajim/common/const.py:377
 msgid "Depressed"
 msgstr "Zdołowany"
 
-#: gajim/common/const.py:344
+#: gajim/common/const.py:378
 msgid "Disappointed"
 msgstr "Rozczarowany"
 
-#: gajim/common/const.py:345
+#: gajim/common/const.py:379
 msgid "Disgusted"
 msgstr "Zniesmaczony"
 
-#: gajim/common/const.py:346
+#: gajim/common/const.py:380
 msgid "Dismayed"
 msgstr "Zaniepokojony"
 
-#: gajim/common/const.py:347
+#: gajim/common/const.py:381
 msgid "Distracted"
 msgstr "Roztargniony"
 
-#: gajim/common/const.py:348
+#: gajim/common/const.py:382
 msgid "Embarrassed"
 msgstr "Zawstydzony"
 
-#: gajim/common/const.py:349
+#: gajim/common/const.py:383
 msgid "Envious"
 msgstr "Zawistny"
 
-#: gajim/common/const.py:350
+#: gajim/common/const.py:384
 msgid "Excited"
 msgstr "Podekscytowany"
 
-#: gajim/common/const.py:351
+#: gajim/common/const.py:385
 msgid "Flirtatious"
 msgstr "Flirciarski"
 
-#: gajim/common/const.py:352
+#: gajim/common/const.py:386
 msgid "Frustrated"
 msgstr "Sfrustrowany"
 
-#: gajim/common/const.py:353
+#: gajim/common/const.py:387
 msgid "Grateful"
 msgstr "Wdzięczny"
 
-#: gajim/common/const.py:354
+#: gajim/common/const.py:388
 msgid "Grieving"
 msgstr "Zasmucony"
 
-#: gajim/common/const.py:355
+#: gajim/common/const.py:389
 msgid "Grumpy"
 msgstr "Marudny"
 
-#: gajim/common/const.py:356
+#: gajim/common/const.py:390
 msgid "Guilty"
 msgstr "Winny"
 
-#: gajim/common/const.py:357
+#: gajim/common/const.py:391
 msgid "Happy"
 msgstr "Wesoły"
 
-#: gajim/common/const.py:358
+#: gajim/common/const.py:392
 msgid "Hopeful"
 msgstr "Pełen nadziei"
 
-#: gajim/common/const.py:359
+#: gajim/common/const.py:393
 msgid "Hot"
 msgstr "Gorący"
 
-#: gajim/common/const.py:360
+#: gajim/common/const.py:394
 msgid "Humbled"
 msgstr "Upokorzony"
 
-#: gajim/common/const.py:361
+#: gajim/common/const.py:395
 msgid "Humiliated"
 msgstr "Poniżony"
 
-#: gajim/common/const.py:362
+#: gajim/common/const.py:396
 msgid "Hungry"
 msgstr "Głodny"
 
-#: gajim/common/const.py:363
+#: gajim/common/const.py:397
 msgid "Hurt"
 msgstr "Zraniony"
 
-#: gajim/common/const.py:364
+#: gajim/common/const.py:398
 msgid "Impressed"
 msgstr "pod wrażeniem"
 
-#: gajim/common/const.py:365
+#: gajim/common/const.py:399
 msgid "In Awe"
 msgstr "Bojaźliwy"
 
-#: gajim/common/const.py:366
+#: gajim/common/const.py:400
 msgid "In Love"
 msgstr "Zakochany"
 
-#: gajim/common/const.py:367
+#: gajim/common/const.py:401
 msgid "Indignant"
 msgstr "Oburzony"
 
-#: gajim/common/const.py:368
+#: gajim/common/const.py:402
 msgid "Interested"
 msgstr "zainteresowany"
 
-#: gajim/common/const.py:369
+#: gajim/common/const.py:403
 msgid "Intoxicated"
 msgstr "Odurzony"
 
-#: gajim/common/const.py:370
+#: gajim/common/const.py:404
 msgid "Invincible"
 msgstr "Niepokonany"
 
-#: gajim/common/const.py:371
+#: gajim/common/const.py:405
 msgid "Jealous"
 msgstr "Zazdrosny"
 
-#: gajim/common/const.py:372
+#: gajim/common/const.py:406
 msgid "Lonely"
 msgstr "Samotny"
 
-#: gajim/common/const.py:373
+#: gajim/common/const.py:407
 msgid "Lost"
 msgstr "Zagubiony"
 
-#: gajim/common/const.py:374
+#: gajim/common/const.py:408
 msgid "Lucky"
 msgstr "Szczęśliwy"
 
-#: gajim/common/const.py:375
+#: gajim/common/const.py:409
 msgid "Mean"
 msgstr "Okrutny"
 
-#: gajim/common/const.py:376
+#: gajim/common/const.py:410
 msgid "Moody"
 msgstr "Markotny"
 
-#: gajim/common/const.py:377
+#: gajim/common/const.py:411
 msgid "Nervous"
 msgstr "Nerwowy"
 
-#: gajim/common/const.py:378
+#: gajim/common/const.py:412
 msgid "Neutral"
 msgstr "Neutralny"
 
-#: gajim/common/const.py:379
+#: gajim/common/const.py:413
 msgid "Offended"
 msgstr "Obrażony"
 
-#: gajim/common/const.py:380
+#: gajim/common/const.py:414
 msgid "Outraged"
 msgstr "Znieważony"
 
-#: gajim/common/const.py:381
+#: gajim/common/const.py:415
 msgid "Playful"
 msgstr "Filuterny"
 
-#: gajim/common/const.py:382
+#: gajim/common/const.py:416
 msgid "Proud"
 msgstr "Dumny"
 
-#: gajim/common/const.py:383
+#: gajim/common/const.py:417
 msgid "Relaxed"
 msgstr "Odprężony"
 
-#: gajim/common/const.py:384
+#: gajim/common/const.py:418
 msgid "Relieved"
 msgstr "Podniesiony na duchu"
 
-#: gajim/common/const.py:385
+#: gajim/common/const.py:419
 msgid "Remorseful"
 msgstr "Skruszony"
 
-#: gajim/common/const.py:386
+#: gajim/common/const.py:420
 msgid "Restless"
 msgstr "Niespokojny"
 
-#: gajim/common/const.py:387
+#: gajim/common/const.py:421
 msgid "Sad"
 msgstr "Smutny"
 
-#: gajim/common/const.py:388
+#: gajim/common/const.py:422
 msgid "Sarcastic"
 msgstr "Sarkastyczny"
 
-#: gajim/common/const.py:389
+#: gajim/common/const.py:423
 msgid "Satisfied"
 msgstr "Zadowolony"
 
-#: gajim/common/const.py:390
+#: gajim/common/const.py:424
 msgid "Serious"
 msgstr "Poważny"
 
-#: gajim/common/const.py:391
+#: gajim/common/const.py:425
 msgid "Shocked"
 msgstr "Wstrząśnięty"
 
-#: gajim/common/const.py:392
+#: gajim/common/const.py:426
 msgid "Shy"
 msgstr "Nieśmiały"
 
-#: gajim/common/const.py:393
+#: gajim/common/const.py:427
 msgid "Sick"
 msgstr "Chory"
 
-#: gajim/common/const.py:394
+#: gajim/common/const.py:428
 msgid "Sleepy"
 msgstr "Senny"
 
-#: gajim/common/const.py:395
+#: gajim/common/const.py:429
 msgid "Spontaneous"
 msgstr "Żywiołowy"
 
-#: gajim/common/const.py:396
+#: gajim/common/const.py:430
 msgid "Stressed"
 msgstr "Zestresowany"
 
-#: gajim/common/const.py:397
+#: gajim/common/const.py:431
 msgid "Strong"
 msgstr "Silny"
 
-#: gajim/common/const.py:398
+#: gajim/common/const.py:432
 msgid "Surprised"
 msgstr "Zaskoczony"
 
-#: gajim/common/const.py:399
+#: gajim/common/const.py:433
 msgid "Thankful"
 msgstr "Wdzięczny"
 
-#: gajim/common/const.py:400
+#: gajim/common/const.py:434
 msgid "Thirsty"
 msgstr "Spragniony"
 
-#: gajim/common/const.py:401
+#: gajim/common/const.py:435
 msgid "Tired"
 msgstr "Zmęczony"
 
-#: gajim/common/const.py:402
+#: gajim/common/const.py:436
 msgid "Undefined"
 msgstr "Niezdefiniowany"
 
-#: gajim/common/const.py:403
+#: gajim/common/const.py:437
 msgid "Weak"
 msgstr "Słaby"
 
-#: gajim/common/const.py:404
+#: gajim/common/const.py:438
 msgid "Worried"
 msgstr "Zmartwiony"
 
-#: gajim/common/const.py:408
+#: gajim/common/const.py:442
 msgid "accuracy"
 msgstr "dokładność"
 
-#: gajim/common/const.py:409
+#: gajim/common/const.py:443
 #, fuzzy
 msgid "alt"
 msgstr "domyślny"
 
-#: gajim/common/const.py:410
+#: gajim/common/const.py:444
 msgid "area"
 msgstr ""
 
-#: gajim/common/const.py:411
+#: gajim/common/const.py:445
 #, fuzzy
 msgid "bearing"
 msgstr "morski"
 
-#: gajim/common/const.py:412
+#: gajim/common/const.py:446
 #, fuzzy
 msgid "building"
 msgstr "Ukrywam się"
 
-#: gajim/common/const.py:413
+#: gajim/common/const.py:447
 #, fuzzy
 msgid "country"
 msgstr "Kraj:"
 
-#: gajim/common/const.py:414
+#: gajim/common/const.py:448
 #, fuzzy
 msgid "countrycode"
 msgstr "Konto"
 
-#: gajim/common/const.py:415
+#: gajim/common/const.py:449
 msgid "datum"
 msgstr ""
 
-#: gajim/common/const.py:416
+#: gajim/common/const.py:450
 #, fuzzy
 msgid "description"
 msgstr "Opis"
 
-#: gajim/common/const.py:417
+#: gajim/common/const.py:451
 #, fuzzy
 msgid "error"
 msgstr "Błąd"
 
-#: gajim/common/const.py:418
+#: gajim/common/const.py:452
 msgid "floor"
 msgstr ""
 
-#: gajim/common/const.py:419
+#: gajim/common/const.py:453
 msgid "lat"
 msgstr ""
 
-#: gajim/common/const.py:420
+#: gajim/common/const.py:454
 msgid "locality"
 msgstr "region"
 
-#: gajim/common/const.py:421
+#: gajim/common/const.py:455
 #, fuzzy
 msgid "lon"
 msgstr "pierwsza"
 
-#: gajim/common/const.py:422
+#: gajim/common/const.py:456
 msgid "postalcode"
 msgstr "kod pocztowy"
 
-#: gajim/common/const.py:423
+#: gajim/common/const.py:457
 msgid "region"
 msgstr "region"
 
-#: gajim/common/const.py:424
+#: gajim/common/const.py:458
 msgid "room"
 msgstr "pokój"
 
-#: gajim/common/const.py:425
+#: gajim/common/const.py:459
 msgid "speed"
 msgstr "prędkość"
 
-#: gajim/common/const.py:426
+#: gajim/common/const.py:460
 msgid "street"
 msgstr "ulica"
 
-#: gajim/common/const.py:427
+#: gajim/common/const.py:461
 msgid "text"
 msgstr "tekst"
 
-#: gajim/common/const.py:428
+#: gajim/common/const.py:462
 msgid "timestamp"
 msgstr ""
 
-#: gajim/common/const.py:429
+#: gajim/common/const.py:463
 msgid "URI"
 msgstr "Adres URIURI"
 
-#: gajim/common/const.py:434
+#: gajim/common/const.py:468
 msgid "Unable to get issuer certificate"
 msgstr "Nie można uzyskać certyfikatu wystawcy"
 
-#: gajim/common/const.py:435
+#: gajim/common/const.py:469
 msgid "Unable to get certificate CRL"
 msgstr "Nie można uzyskać CRL"
 
-#: gajim/common/const.py:436
+#: gajim/common/const.py:470
 msgid "Unable to decrypt certificate's signature"
 msgstr "Nie można odszyfrować podpisu certyfikatu"
 
-#: gajim/common/const.py:437
+#: gajim/common/const.py:471
 msgid "Unable to decrypt CRL's signature"
 msgstr "Nie można odszyfrować podpisu CRL"
 
-#: gajim/common/const.py:438
+#: gajim/common/const.py:472
 msgid "Unable to decode issuer public key"
 msgstr "Nie można odkodować klucza publicznego wystawcy"
 
-#: gajim/common/const.py:439
+#: gajim/common/const.py:473
 msgid "Certificate signature failure"
 msgstr "Błąd podpisu certyfikatu"
 
-#: gajim/common/const.py:440
+#: gajim/common/const.py:474
 msgid "CRL signature failure"
 msgstr "Błąd podpisu CRL"
 
-#: gajim/common/const.py:441
+#: gajim/common/const.py:475
 msgid "Certificate is not yet valid"
 msgstr "Certyfikat nie jest prawidłowy"
 
-#: gajim/common/const.py:442
+#: gajim/common/const.py:476
 msgid "Certificate has expired"
 msgstr "Certyfikat wygasł"
 
-#: gajim/common/const.py:443
+#: gajim/common/const.py:477
 msgid "CRL is not yet valid"
 msgstr "CRL nie jest prawidłowy"
 
-#: gajim/common/const.py:444
+#: gajim/common/const.py:478
 msgid "CRL has expired"
 msgstr "CRL wygasł"
 
-#: gajim/common/const.py:445
+#: gajim/common/const.py:479
 msgid "Format error in certificate's notBefore field"
 msgstr "Błąd w polu notBefore certyfikatu"
 
-#: gajim/common/const.py:446
+#: gajim/common/const.py:480
 msgid "Format error in certificate's notAfter field"
 msgstr "Błąd w polu notAfter certyfikatu"
 
-#: gajim/common/const.py:447
+#: gajim/common/const.py:481
 msgid "Format error in CRL's lastUpdate field"
 msgstr "Błąd w polu lastUpdate CRL"
 
-#: gajim/common/const.py:448
+#: gajim/common/const.py:482
 msgid "Format error in CRL's nextUpdate field"
 msgstr "Błąd w polu nextUpdate CRL"
 
-#: gajim/common/const.py:449
+#: gajim/common/const.py:483
 msgid "Out of memory"
 msgstr "Brak pamięci"
 
-#: gajim/common/const.py:450
+#: gajim/common/const.py:484
 msgid "Self signed certificate"
 msgstr "Certyfikat podpisany przez wystawcę"
 
-#: gajim/common/const.py:451
+#: gajim/common/const.py:485
 msgid "Self signed certificate in certificate chain"
 msgstr "W łańcuchu certyfikatów znaleziono certyfikat podpisany przez wystawcę"
 
-#: gajim/common/const.py:452
+#: gajim/common/const.py:486
 msgid "Unable to get local issuer certificate"
 msgstr "Nie można pobrać lokalnego certyfikatu wystawcy"
 
-#: gajim/common/const.py:453
+#: gajim/common/const.py:487
 msgid "Unable to verify the first certificate"
 msgstr "Nie można zweryfikować pierwszego certyfikatu"
 
-#: gajim/common/const.py:454
+#: gajim/common/const.py:488
 msgid "Certificate chain too long"
 msgstr "Za długi łańcuch certyfikatów"
 
-#: gajim/common/const.py:455
+#: gajim/common/const.py:489
 msgid "Certificate revoked"
 msgstr "Certyfikat został unieważniony"
 
-#: gajim/common/const.py:456
+#: gajim/common/const.py:490
 msgid "Invalid CA certificate"
 msgstr "Niepoprawny certyfikat CA"
 
-#: gajim/common/const.py:457
+#: gajim/common/const.py:491
 msgid "Path length constraint exceeded"
 msgstr "Stała długości ścieżki przekroczona"
 
-#: gajim/common/const.py:458
+#: gajim/common/const.py:492
 msgid "Unsupported certificate purpose"
 msgstr "Nieznany cel certyfikatu"
 
-#: gajim/common/const.py:459
+#: gajim/common/const.py:493
 msgid "Certificate not trusted"
 msgstr "Certyfikat niezaufany"
 
-#: gajim/common/const.py:460
+#: gajim/common/const.py:494
 msgid "Certificate rejected"
 msgstr "Certyfikat odrzucony"
 
-#: gajim/common/const.py:461
+#: gajim/common/const.py:495
 msgid "Subject issuer mismatch"
 msgstr "Niezgodność subject/issuer"
 
-#: gajim/common/const.py:462
+#: gajim/common/const.py:496
 msgid "Authority and subject key identifier mismatch"
 msgstr "Authority and subject key identifier mismatch"
 
-#: gajim/common/const.py:463
+#: gajim/common/const.py:497
 msgid "Authority and issuer serial number mismatch"
 msgstr "Authority and issuer serial number mismatch"
 
-#: gajim/common/const.py:464
+#: gajim/common/const.py:498
 msgid "Key usage does not include certificate signing"
 msgstr "Tym kluczem nie można podpisywać certyfikatu"
 
-#: gajim/common/const.py:465
+#: gajim/common/const.py:499
 msgid "Application verification failure"
 msgstr "Błąd weryfikacji aplikacji"
 
@@ -5218,200 +5373,200 @@ msgstr "wejście wideo"
 msgid "video output"
 msgstr "wyjście wideo"
 
-#: gajim/common/helpers.py:210
+#: gajim/common/helpers.py:216
 #, fuzzy
 msgid "Server must be between 1 and 1023 bytes"
 msgstr "Serwer winien mieć od 1 do 1023 znaków"
 
-#: gajim/common/helpers.py:214
+#: gajim/common/helpers.py:220
 msgid "Invalid character in hostname."
 msgstr "Niepoprawna litera w nazwie hosta."
 
-#: gajim/common/helpers.py:216
+#: gajim/common/helpers.py:222
 msgid "Server address required."
 msgstr "Wymagany adres serwera."
 
-#: gajim/common/helpers.py:220
+#: gajim/common/helpers.py:226
 #, 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:224
+#: gajim/common/helpers.py:230
 msgid "Invalid character in username."
 msgstr "Niepoprawna litera w nazwie użytkownika."
 
-#: gajim/common/helpers.py:230
+#: gajim/common/helpers.py:236
 #, 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:234
+#: gajim/common/helpers.py:240
 msgid "Invalid character in resource."
 msgstr "Niepoprawna litera w zasobach."
 
-#: gajim/common/helpers.py:275
+#: gajim/common/helpers.py:281
 msgid "_Busy"
 msgstr "_Zajęty"
 
-#: gajim/common/helpers.py:277 gajim/gtk/tooltips.py:647
+#: gajim/common/helpers.py:283 gajim/gtk/tooltips.py:647
 msgid "Busy"
 msgstr "Zajęty"
 
-#: gajim/common/helpers.py:280
+#: gajim/common/helpers.py:286
 msgid "_Not Available"
 msgstr "Nie_obecny"
 
-#: gajim/common/helpers.py:282 gajim/gtk/tooltips.py:649
+#: gajim/common/helpers.py:288 gajim/gtk/tooltips.py:649
 msgid "Not Available"
 msgstr "Nieobecny"
 
-#: gajim/common/helpers.py:285
+#: gajim/common/helpers.py:291
 msgid "_Free for Chat"
 msgstr "_Chętny do rozmowy"
 
-#: gajim/common/helpers.py:287 gajim/gtk/tooltips.py:643
+#: gajim/common/helpers.py:293 gajim/gtk/tooltips.py:643
 msgid "Free for Chat"
 msgstr "Chętny do rozmowy"
 
-#: gajim/common/helpers.py:290
+#: gajim/common/helpers.py:296
 msgid "?user status:_Available"
 msgstr "?user status:_Dostępny"
 
-#: gajim/common/helpers.py:292 gajim/gtk/tooltips.py:641
+#: gajim/common/helpers.py:298 gajim/gtk/tooltips.py:641
 msgid "?user status:Available"
 msgstr "?user status:Dostępny"
 
-#: gajim/common/helpers.py:294
+#: gajim/common/helpers.py:300
 msgid "Connecting"
 msgstr "Łączę się"
 
-#: gajim/common/helpers.py:297 gajim/data/gui/preferences_window.ui:1251
+#: gajim/common/helpers.py:303 gajim/data/gui/preferences_window.ui:1251
 msgid "A_way"
 msgstr "Zaraz _wracam"
 
-#: gajim/common/helpers.py:299 gajim/common/modules/adhoc_commands.py:120
-#: gajim/command_system/implementation/standard.py:139
+#: gajim/common/helpers.py:305 gajim/common/modules/adhoc_commands.py:120
+#: gajim/command_system/implementation/standard.py:141
 #: gajim/gtk/tooltips.py:645
 msgid "Away"
 msgstr "Zaraz wracam"
 
-#: gajim/common/helpers.py:302
+#: gajim/common/helpers.py:308
 msgid "_Offline"
 msgstr "R_ozłączony"
 
-#: gajim/common/helpers.py:304 gajim/gtk/tooltips.py:651
+#: gajim/common/helpers.py:310 gajim/gtk/tooltips.py:651
 msgid "Offline"
 msgstr "Rozłączony"
 
-#: gajim/common/helpers.py:307
+#: gajim/common/helpers.py:313
 msgid "_Invisible"
 msgstr "N_iewidoczny"
 
-#: gajim/common/helpers.py:313
+#: gajim/common/helpers.py:319
 msgid "?contact has status:Unknown"
 msgstr "?contact ma status: Nieznany"
 
-#: gajim/common/helpers.py:315
+#: gajim/common/helpers.py:321
 msgid "?contact has status:Has errors"
 msgstr "?contact ma status: Wystąpiły błędy"
 
-#: gajim/common/helpers.py:330
+#: gajim/common/helpers.py:336
 msgid "?Subscription we already have:None"
 msgstr "?Posiadane autoryzacje: Brak"
 
-#: gajim/common/helpers.py:332
+#: gajim/common/helpers.py:338
 msgid "To"
 msgstr "Do"
 
-#: gajim/common/helpers.py:334 gajim/data/gui/groups_post_window.ui:33
+#: gajim/common/helpers.py:340 gajim/data/gui/groups_post_window.ui:33
 msgid "From"
 msgstr "Od"
 
-#: gajim/common/helpers.py:336
+#: gajim/common/helpers.py:342
 msgid "Both"
 msgstr "Obustronna"
 
-#: gajim/common/helpers.py:338 gajim/gtk/server_info.py:151
+#: gajim/common/helpers.py:344 gajim/gtk/server_info.py:151
 #, fuzzy
 msgid "Unknown"
 msgstr "?System operacyjny: Nieznany"
 
-#: gajim/common/helpers.py:344
+#: gajim/common/helpers.py:350
 msgid "?Ask (for Subscription):None"
 msgstr "?Poproś (o autoryzację): Brak"
 
-#: gajim/common/helpers.py:346
+#: gajim/common/helpers.py:352
 msgid "Subscribe"
 msgstr "Autoryzuj"
 
-#: gajim/common/helpers.py:355
+#: gajim/common/helpers.py:361
 msgid "?Group Chat Contact Role:None"
 msgstr "?Funkcja kontaktu w pokoju: Brak"
 
-#: gajim/common/helpers.py:358
+#: gajim/common/helpers.py:364
 msgid "Moderators"
 msgstr "Moderatorzy"
 
-#: gajim/common/helpers.py:360
+#: gajim/common/helpers.py:366
 msgid "Moderator"
 msgstr "Moderator"
 
-#: gajim/common/helpers.py:363
+#: gajim/common/helpers.py:369 gajim/data/gui/groupchat_info_scrolled.ui:243
 msgid "Participants"
 msgstr "Uczestnicy"
 
-#: gajim/common/helpers.py:365
+#: gajim/common/helpers.py:371
 msgid "Participant"
 msgstr "Uczestnik"
 
-#: gajim/common/helpers.py:368
+#: gajim/common/helpers.py:374
 msgid "Visitors"
 msgstr "Goście"
 
-#: gajim/common/helpers.py:370
+#: gajim/common/helpers.py:376
 msgid "Visitor"
 msgstr "Gość"
 
-#: gajim/common/helpers.py:376 gajim/gtk/tooltips.py:253
+#: gajim/common/helpers.py:382 gajim/gtk/tooltips.py:253
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "?Powiązanie kontaktu z czata: brak"
 
-#: gajim/common/helpers.py:378 gajim/data/gui/groupchat_config.ui:32
+#: gajim/common/helpers.py:384 gajim/data/gui/groupchat_config.ui:32
 #: gajim/gtk/tooltips.py:259
 msgid "Owner"
 msgstr "Właściciel"
 
-#: gajim/common/helpers.py:380 gajim/gtk/tooltips.py:257
+#: gajim/common/helpers.py:386 gajim/gtk/tooltips.py:257
 msgid "Administrator"
 msgstr "Administrator"
 
-#: gajim/common/helpers.py:382 gajim/data/gui/groupchat_config.ui:40
+#: gajim/common/helpers.py:388 gajim/data/gui/groupchat_config.ui:40
 #: gajim/gtk/tooltips.py:255 gajim/gtk/groupchat_config.py:105
 msgid "Member"
 msgstr "Uczestnik"
 
-#: gajim/common/helpers.py:421
+#: gajim/common/helpers.py:427
 msgid "is paying attention to the conversation"
 msgstr "jest skupiony na rozmowie"
 
-#: gajim/common/helpers.py:423
+#: gajim/common/helpers.py:429
 msgid "is doing something else"
 msgstr "robi coś innego"
 
-#: gajim/common/helpers.py:425
+#: gajim/common/helpers.py:431
 #, fuzzy
 msgid "is composing a message…"
 msgstr "pisze wiadomość..."
 
-#: gajim/common/helpers.py:428
+#: gajim/common/helpers.py:434
 msgid "paused composing a message"
 msgstr "przerwał pisanie wiadomości"
 
-#: gajim/common/helpers.py:430
+#: gajim/common/helpers.py:436
 msgid "has closed the chat window or tab"
 msgstr "zamknął okno lub kartę rozmowy"
 
-#: gajim/common/helpers.py:936 gajim/common/helpers.py:943
+#: gajim/common/helpers.py:942 gajim/common/helpers.py:949
 #, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
@@ -5419,22 +5574,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:950
+#: gajim/common/helpers.py:956
 #, fuzzy, python-format
-msgid "from room %s"
-msgstr " z pokoju %s"
+msgid "from group chat %s"
+msgstr "w _konferencji"
 
-#: gajim/common/helpers.py:953 gajim/common/helpers.py:970
+#: gajim/common/helpers.py:959 gajim/common/helpers.py:976
 #, fuzzy, python-format
 msgid "from user %s"
 msgstr " od użytkownika %s"
 
-#: gajim/common/helpers.py:955
+#: gajim/common/helpers.py:961
 #, fuzzy, python-format
 msgid "from %s"
 msgstr " od %s"
 
-#: gajim/common/helpers.py:962 gajim/common/helpers.py:968
+#: gajim/common/helpers.py:968 gajim/common/helpers.py:974
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
@@ -5442,40 +5597,40 @@ msgstr[0] "%d oczekująca wiadomość"
 msgstr[1] "%d oczekujące wiadomości"
 msgstr[2] "%d oczekujących wiadomości"
 
-#: gajim/common/helpers.py:986 gajim/common/helpers.py:998
+#: gajim/common/helpers.py:992 gajim/common/helpers.py:1004
 #: gajim/data/gui/roster_window.ui:85 data/org.gajim.Gajim.desktop.in:4
 #: data/org.gajim.Gajim.appdata.xml.in:9
 msgid "Gajim"
 msgstr "Gajim"
 
-#: gajim/common/helpers.py:1000
+#: gajim/common/helpers.py:1006
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: gajim/common/helpers.py:1109 gajim/data/gui/add_new_contact_window.ui:25
+#: gajim/common/helpers.py:1115 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:1111
+#: gajim/common/helpers.py:1117
 msgid "Hello, I am $name."
 msgstr "Cześć, jestem $name."
 
-#: gajim/common/helpers.py:1215 gajim/common/helpers.py:1224
-#: gajim/common/helpers.py:1282
+#: gajim/common/helpers.py:1221 gajim/common/helpers.py:1230
+#: gajim/common/helpers.py:1288
 msgid "Timeout loading image"
 msgstr "Przekroczono czas ładowania obrazu"
 
-#: gajim/common/helpers.py:1234 gajim/common/helpers.py:1280
+#: gajim/common/helpers.py:1240 gajim/common/helpers.py:1286
 msgid "Image is too big"
 msgstr "Obraz jest za duży"
 
-#: gajim/common/helpers.py:1245
+#: gajim/common/helpers.py:1251
 #, fuzzy
 msgid "PyCURL is not installed"
 msgstr "CRL nie jest prawidłowy"
 
-#: gajim/common/helpers.py:1284
+#: gajim/common/helpers.py:1290
 #, fuzzy
 msgid "Error loading image"
 msgstr "Przekroczono czas ładowania obrazu"
@@ -5656,7 +5811,8 @@ msgstr "Status został zmieniony."
 
 #: gajim/common/modules/adhoc_commands.py:202
 #: gajim/common/modules/adhoc_commands.py:239
-msgid "Leave Groupchats"
+#, fuzzy
+msgid "Leave Group Chats"
 msgstr "Opuść pokoje"
 
 #: gajim/common/modules/adhoc_commands.py:228
@@ -5665,15 +5821,18 @@ msgid "%(nickname)s on %(room_jid)s"
 msgstr "%(nickname)s z pokoju %(room_jid)s"
 
 #: gajim/common/modules/adhoc_commands.py:232
-msgid "You have not joined a groupchat."
+#, fuzzy
+msgid "You have not joined a group chat."
 msgstr "Nie dołączyłeś do pokoju."
 
 #: gajim/common/modules/adhoc_commands.py:240
-msgid "Choose the groupchats you want to leave"
+#, fuzzy
+msgid "Choose the group chats you want to leave"
 msgstr "Wybierz pokoje, które chcesz opuścić"
 
 #: gajim/common/modules/adhoc_commands.py:289
-msgid "You left the following groupchats:"
+#, fuzzy
+msgid "You left the following group chats:"
 msgstr "Opuściłeś pokoje:"
 
 #: gajim/common/modules/roster_item_exchange.py:102
@@ -5689,7 +5848,7 @@ msgstr "Wyślij kontakty:"
 msgid "Blocked Contacts"
 msgstr "Zablokowane kontakty"
 
-#: gajim/data/gui/destroy_muc_dialog.ui:79 gajim/gtk/dialogs.py:736
+#: gajim/data/gui/destroy_muc_dialog.ui:79 gajim/gtk/dialogs.py:563
 msgid "Destroy this group chat permanently?"
 msgstr ""
 
@@ -5698,7 +5857,7 @@ msgstr ""
 msgid "Reason..."
 msgstr "Powód"
 
-#: gajim/data/gui/destroy_muc_dialog.ui:124 gajim/gtk/dialogs.py:738
+#: gajim/data/gui/destroy_muc_dialog.ui:124 gajim/gtk/dialogs.py:565
 msgid "Where participants should go (optional)"
 msgstr ""
 
@@ -5711,34 +5870,6 @@ msgstr ""
 msgid "_Reason and alternate venue (optional)"
 msgstr "Możesz również podać alternatywne miejsce spotkań:"
 
-#: gajim/data/gui/advanced_configuration_window.ui:7
-#: gajim/data/gui/preferences_window.ui:2723
-#, fuzzy
-msgid "Advanced Configuration Editor (ACE)"
-msgstr "Edytor zaawansowanych ustawień"
-
-#: gajim/data/gui/advanced_configuration_window.ui:52
-msgid "You should restart Gajim for some changes to take effect"
-msgstr ""
-"UWAGA: Powinieneś ponownie uruchomić program by zastosować ostatnie "
-"ustawienia"
-
-#: gajim/data/gui/advanced_configuration_window.ui:84
-#, fuzzy
-msgid "_Filter"
-msgstr "_Filtr:"
-
-#: gajim/data/gui/advanced_configuration_window.ui:153
-#: gajim/data/gui/filetransfers_send_file_dialog.ui:15
-#: gajim/gtk/discovery.py:1666
-msgid "Description"
-msgstr "Opis"
-
-#: gajim/data/gui/advanced_configuration_window.ui:197
-#, fuzzy
-msgid "_Reset to default"
-msgstr "Wróć do kolorów _domyślnych"
-
 #: gajim/data/gui/join_groupchat_window.ui:56
 #: gajim/data/gui/chat_to_muc_window.ui:67
 #: gajim/data/gui/chat_to_muc_window.ui:78
@@ -5750,9 +5881,8 @@ msgid "Join group chat every time Gajim is started"
 msgstr ""
 
 #: gajim/data/gui/join_groupchat_window.ui:113
-#, fuzzy
-msgid "Auto Join"
-msgstr "Połącz automatycznie"
+msgid "Join Automatically"
+msgstr ""
 
 #: gajim/data/gui/join_groupchat_window.ui:131
 #: gajim/data/gui/profile_window.ui:233
@@ -5761,10 +5891,11 @@ msgstr "Konto"
 
 #: gajim/data/gui/join_groupchat_window.ui:147
 #, fuzzy
-msgid "Room"
-msgstr "Pokój:"
+msgid "Group chat"
+msgstr "Pokoje"
 
-#: gajim/data/gui/join_groupchat_window.ui:180 gajim/gtk/accounts.py:886
+#: gajim/data/gui/join_groupchat_window.ui:180 gajim/data/gui/bookmarks.ui:158
+#: gajim/gtk/accounts.py:889
 #, fuzzy
 msgid "Password"
 msgstr "Hasło:"
@@ -5788,89 +5919,11 @@ msgstr "w _konferencji"
 msgid "Search group chats on selected server"
 msgstr ""
 
-#: gajim/data/gui/join_groupchat_window.ui:437 gajim/gtk/discovery.py:1271
+#: gajim/data/gui/join_groupchat_window.ui:437 gajim/gtk/discovery.py:1270
 #, fuzzy
 msgid "Join"
 msgstr "_Dołącz"
 
-#: gajim/data/gui/manage_proxies_window.ui:12
-msgid "HTTP Connect"
-msgstr "Połączenie HTTP"
-
-#: gajim/data/gui/manage_proxies_window.ui:15
-msgid "SOCKS5"
-msgstr "SOCKS5"
-
-#: gajim/data/gui/manage_proxies_window.ui:18
-msgid "BOSH"
-msgstr ""
-
-#: gajim/data/gui/manage_proxies_window.ui:27
-msgid "Manage Proxy Profiles"
-msgstr "Zarządzaj Profilami Proxy"
-
-#: gajim/data/gui/manage_proxies_window.ui:83
-#, fuzzy
-msgid "Add Proxy"
-msgstr "Serwer Proxy:"
-
-#: gajim/data/gui/manage_proxies_window.ui:97
-#, fuzzy
-msgid "Remove Proxy"
-msgstr "Usuń grupę"
-
-#: gajim/data/gui/manage_proxies_window.ui:141
-msgid "Properties"
-msgstr "Właściwości"
-
-#: gajim/data/gui/manage_proxies_window.ui:157
-#, fuzzy
-msgid "_Name"
-msgstr "_Nazwa: "
-
-#: gajim/data/gui/manage_proxies_window.ui:173
-#, fuzzy
-msgid "_Type"
-msgstr "_Typ:"
-
-#: gajim/data/gui/manage_proxies_window.ui:236
-#, fuzzy
-msgid "_BOSH URL"
-msgstr "_BOSH URL:"
-
-#: gajim/data/gui/manage_proxies_window.ui:261
-msgid "Use HTTP prox_y"
-msgstr "Korzystaj z pośrednik_a HTTP"
-
-#: gajim/data/gui/manage_proxies_window.ui:280
-#, fuzzy
-msgid "Proxy _Host"
-msgstr "_Serwer Proxy:"
-
-#: gajim/data/gui/manage_proxies_window.ui:307
-#, fuzzy
-msgid "Proxy _Port"
-msgstr "_Port Proxy"
-
-#: gajim/data/gui/manage_proxies_window.ui:334
-#, fuzzy
-msgid "_Username"
-msgstr "_Nazwa użytkownika:"
-
-#: gajim/data/gui/manage_proxies_window.ui:347
-msgid "Use proxy auth_entication"
-msgstr "Używaj aut_oryzacji serwera proxy"
-
-#: gajim/data/gui/manage_proxies_window.ui:377
-#, fuzzy
-msgid "Pass_word"
-msgstr "_Hasło:"
-
-#: gajim/data/gui/manage_proxies_window.ui:405 gajim/gtk/adhoc.py:321
-#, fuzzy
-msgid "Settings"
-msgstr "Wtyczki"
-
 #: gajim/data/gui/change_password_dialog.ui:17
 #, fuzzy
 msgid "New Password"
@@ -5901,11 +5954,13 @@ msgid "Status:"
 msgstr "Status:"
 
 #: gajim/data/gui/zeroconf_information_window.ui:89
-msgid "_Log conversation history"
+#, fuzzy
+msgid "_Store conversation history"
 msgstr "_Zapisuj historię rozmowy"
 
 #: gajim/data/gui/zeroconf_information_window.ui:215
 #: gajim/data/gui/vcard_information_window.ui:390
+#: gajim/data/gui/groupchat_info_scrolled.ui:166
 msgid "Contact"
 msgstr "Kontakt"
 
@@ -5918,8 +5973,9 @@ msgid "Last Name:"
 msgstr "Nazwisko:"
 
 #: gajim/data/gui/zeroconf_information_window.ui:260
-msgid "Jabber ID:"
-msgstr "Jabber ID:"
+#, fuzzy
+msgid "XMPP Address:"
+msgstr "_Adres AIM:"
 
 #: gajim/data/gui/zeroconf_information_window.ui:273
 msgid "E-Mail:"
@@ -5939,8 +5995,9 @@ msgid "Send _File"
 msgstr "Wyślij _plik"
 
 #: gajim/data/gui/gc_occupants_menu.ui:29
-msgid "Occupant Actions"
-msgstr "Działania użytk_ownika"
+#, fuzzy
+msgid "Participant Actions"
+msgstr "Uczestnicy"
 
 #: gajim/data/gui/gc_occupants_menu.ui:38
 msgid "_Voice"
@@ -5971,8 +6028,9 @@ msgid "_Ban"
 msgstr "Za_banuj"
 
 #: gajim/data/gui/gc_occupants_menu.ui:124
-msgid "_Add to Roster"
-msgstr "Dod_aj do listy kontaktów"
+#, fuzzy
+msgid "_Add to Contact List"
+msgstr "_Dodaj kontakt..."
 
 #: gajim/data/gui/gc_occupants_menu.ui:132
 #, fuzzy
@@ -6011,11 +6069,6 @@ msgstr "Autoryzacja:"
 msgid "_Status"
 msgstr "_Status"
 
-#: gajim/data/gui/zeroconf_context_menu.ui:26
-#: gajim/data/gui/account_context_menu.ui:79
-msgid "_Modify Account..."
-msgstr "_Modyfikuj konto..."
-
 #: gajim/data/gui/certificate_dialog.ui:66
 #: gajim/data/gui/certificate_dialog.ui:178
 msgid "Common Name (CN)"
@@ -6098,13 +6151,19 @@ msgstr "Ostatnio zmodyfikowany:"
 msgid "Next entry"
 msgstr "Następny wpis"
 
+#: gajim/data/gui/filetransfers_send_file_dialog.ui:15
+#: gajim/data/gui/advanced_configuration.ui:143
+#: gajim/data/gui/groupchat_info_scrolled.ui:48 gajim/gtk/discovery.py:1663
+msgid "Description"
+msgstr "Opis"
+
 #: gajim/data/gui/filetransfers_send_file_dialog.ui:54
 #, fuzzy
 msgid "_Send Files"
 msgstr "Wyślij _plik"
 
 #: gajim/data/gui/filetransfers_send_file_dialog.ui:58
-#: gajim/gtk/xml_console.py:90
+#: gajim/gtk/xml_console.py:87
 msgid "Send"
 msgstr "Wyślij"
 
@@ -6128,20 +6187,23 @@ msgid "Change _Nickname..."
 msgstr "Zmień pseudo_nim..."
 
 #: gajim/data/gui/gc_control_popup_menu.ui:20
-msgid "_Manage Room"
-msgstr "Zarządzaj pokojem"
+#, fuzzy
+msgid "_Manage Group Chat"
+msgstr "_Nowa rozmowa grupowa"
 
 #: gajim/data/gui/gc_control_popup_menu.ui:31
 msgid "Change _Subject..."
 msgstr "Zmień _temat..."
 
 #: gajim/data/gui/gc_control_popup_menu.ui:38
-msgid "Configure _Room..."
-msgstr "Konfiguruj _pokój..."
+#, fuzzy
+msgid "Configure _Group Chat..."
+msgstr "Dołącz do _pokoju"
 
 #: gajim/data/gui/gc_control_popup_menu.ui:52
-msgid "_Destroy Room"
-msgstr "_Zlikwiduj pokój"
+#, fuzzy
+msgid "_Destroy Group Chat"
+msgstr "_Nowa rozmowa grupowa"
 
 #: gajim/data/gui/gc_control_popup_menu.ui:64
 msgid "_Minimize on close"
@@ -6152,7 +6214,7 @@ msgstr "_Minimalizuj przy zamknięciu"
 msgid "_Request Voice"
 msgstr "_Głos"
 
-#: gajim/data/gui/gc_control_popup_menu.ui:99 gajim/gtk/discovery.py:1704
+#: gajim/data/gui/gc_control_popup_menu.ui:99
 msgid "_Bookmark"
 msgstr "Dodaj _zakładkę dla tego pokoju"
 
@@ -6202,13 +6264,6 @@ msgstr "Strona domowa:"
 msgid "E-Mail"
 msgstr "Adres e-mail:"
 
-#: 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/blocking_list.ui:115 gajim/gtk/add_contact.py:30
-#: gajim/gtk/accounts.py:801
-msgid "Jabber ID"
-msgstr "Jabber ID"
-
 #: gajim/data/gui/profile_window.ui:440
 msgid "Main"
 msgstr "Główny"
@@ -6340,36 +6395,44 @@ msgstr "Praca"
 msgid "About"
 msgstr "Informacje"
 
-#: gajim/data/gui/start_chat_dialog.ui:114 gajim/gtk/discovery.py:1658
-msgid "Users"
-msgstr "Użytkownicy"
-
-#: gajim/data/gui/start_chat_dialog.ui:185
-msgid "Name:"
-msgstr "Nazwa:"
+#: gajim/data/gui/start_chat_dialog.ui:53
+#, fuzzy
+msgid "Global Group Chat Search"
+msgstr "Dołącz do pokoju"
 
-#: gajim/data/gui/start_chat_dialog.ui:197
+#: 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
-msgid "Description:"
-msgstr "Opis: "
+msgid "_Back"
+msgstr "Niedługo wrócę"
 
-#: gajim/data/gui/start_chat_dialog.ui:209
+#: gajim/data/gui/start_chat_dialog.ui:245
+#: gajim/data/gui/groupchat_control.ui:796
+#: gajim/data/gui/groupchat_control.ui:888 gajim/gtk/discovery.py:1701
+#: gajim/gtk/groupchat_join.py:62
+msgid "_Join"
+msgstr "_Dołącz"
+
+#: gajim/data/gui/start_chat_dialog.ui:289
 #, fuzzy
-msgid "Address:"
-msgstr "_Adres:"
+msgid "Select Account"
+msgstr "Usuwanie konta %s"
 
-#: gajim/data/gui/start_chat_dialog.ui:246
-msgid ""
-"Semi-Anonymous\n"
-"<span size=\"small\">(Only moderators can see your XMPP-Address)</span>"
-msgstr ""
+#: gajim/data/gui/start_chat_dialog.ui:380
+#, fuzzy
+msgid "_Select"
+msgstr "Sprzątam"
 
 #: gajim/data/gui/filetransfers.ui:21
 #, fuzzy
 msgid "Pa_use/Resume"
 msgstr "_Przywróć"
 
-#: gajim/data/gui/filetransfers.ui:30 gajim/gtk/filechoosers.py:178
+#: gajim/data/gui/filetransfers.ui:30 gajim/data/gui/groupchat_control.ui:575
+#: gajim/data/gui/groupchat_control.ui:667
+#: gajim/data/gui/groupchat_control.ui:779
+#: gajim/data/gui/groupchat_control.ui:871 gajim/gtk/filechoosers.py:178
 msgid "_Cancel"
 msgstr "_Anuluj"
 
@@ -6411,7 +6474,8 @@ msgid "Cancel the selected file transfer and remove incomplete files"
 msgstr "Usuwa wybrany transfer pliku i usuwa niedokończony plik"
 
 #: gajim/data/gui/filetransfers.ui:207
-msgid "Shows a list of file transfers between you and others"
+#, fuzzy
+msgid "Shows a list of file transfers between you and your contacts"
 msgstr "Wyświetla listę przesłanych plików"
 
 #: gajim/data/gui/groupchat_control.ui:13 gajim/data/gui/chat_control.ui:277
@@ -6431,7 +6495,6 @@ msgid "Strike"
 msgstr "Przekreślenie"
 
 #: gajim/data/gui/groupchat_control.ui:54 gajim/data/gui/chat_control.ui:318
-#: gajim/gtk/advanced_config.py:86
 msgid "Color"
 msgstr "Kolor"
 
@@ -6444,16 +6507,46 @@ msgstr "Czcionka:"
 msgid "Clear formatting"
 msgstr "Usuń formatowanie"
 
-#: gajim/data/gui/groupchat_control.ui:290 gajim/data/gui/chat_control.ui:880
+#: gajim/data/gui/groupchat_control.ui:291 gajim/data/gui/chat_control.ui:880
 #, fuzzy
 msgid "Choose encryption"
 msgstr "Wybierz plik do wysłania..."
 
-#: gajim/data/gui/groupchat_control.ui:336 gajim/data/gui/chat_control.ui:640
+#: gajim/data/gui/groupchat_control.ui:337 gajim/data/gui/chat_control.ui:640
 #, fuzzy
 msgid "Show a list of emojis (Alt+M)"
 msgstr "Kliknij by wyświetlić listę emotikon (Alt+M)"
 
+#: gajim/data/gui/groupchat_control.ui:484
+#, fuzzy
+msgid "Joining…"
+msgstr "Blokuję użytkownika..."
+
+#: gajim/data/gui/groupchat_control.ui:496
+msgid "_Abort"
+msgstr ""
+
+#: gajim/data/gui/groupchat_control.ui:542
+#, fuzzy
+msgid "Enter new nickname"
+msgstr "_Za pseudonimem:"
+
+#: gajim/data/gui/groupchat_control.ui:592
+#: gajim/data/gui/groupchat_control.ui:684
+#, fuzzy
+msgid "Ch_ange"
+msgstr "Zmień pseudo_nim..."
+
+#: gajim/data/gui/groupchat_control.ui:761
+#, fuzzy
+msgid "Enter password"
+msgstr "Wpisz nowe hasło:"
+
+#: gajim/data/gui/groupchat_control.ui:1067
+#, fuzzy
+msgid "_Try again"
+msgstr "Ponowna weryfikacja..."
+
 #: gajim/data/gui/popup_notification_window.ui:42
 #, fuzzy
 msgid "Event Type"
@@ -6534,8 +6627,8 @@ msgstr "Zawsze"
 
 #: gajim/data/gui/mam_preferences.ui:18
 #, fuzzy
-msgid "Roster"
-msgstr "Pokaż _listę kontaktów"
+msgid "Contact List"
+msgstr "Kontakty"
 
 #: gajim/data/gui/mam_preferences.ui:22
 #: gajim/data/gui/preferences_window.ui:123
@@ -6559,12 +6652,12 @@ msgid "Add"
 msgstr "Dodaj"
 
 #: gajim/data/gui/mam_preferences.ui:194 gajim/data/gui/groupchat_config.ui:151
-#: gajim/gtk/dialogs.py:63 gajim/gtk/accounts.py:381
+#: gajim/gtk/dialogs.py:62 gajim/gtk/accounts.py:384
 #, fuzzy
 msgid "Remove"
 msgstr "_Usuń"
 
-#: gajim/data/gui/vcard_information_window.ui:72 gajim/gtk/accounts.py:753
+#: gajim/data/gui/vcard_information_window.ui:72 gajim/gtk/accounts.py:756
 #, fuzzy
 msgid "Resource"
 msgstr "Zasoby:"
@@ -6614,6 +6707,7 @@ msgstr "Autoryzacja:"
 #: gajim/data/gui/vcard_information_window.ui:974
 #: gajim/data/gui/vcard_information_window.ui:993
 #: gajim/data/gui/vcard_information_window.ui:1427
+#: gajim/data/gui/groupchat_info_scrolled.ui:222
 msgid "button"
 msgstr "przycisk"
 
@@ -6635,22 +6729,23 @@ msgstr "Własne"
 
 #: gajim/data/gui/preferences_window.ui:52
 msgid "Pop it up"
-msgstr "Pokaż wyskakujące okno"
+msgstr "pokaż"
 
 #: gajim/data/gui/preferences_window.ui:55
 msgid "Notify me about it"
 msgstr "Wyświetl powiadomienie"
 
 #: gajim/data/gui/preferences_window.ui:58
-msgid "Show only in roster"
-msgstr "Pokaż tylko na liście kontaktów"
+#, fuzzy
+msgid "Show only in contact list"
+msgstr "Pokaż kontakty _połączone"
 
 #: gajim/data/gui/preferences_window.ui:69
-msgid "Detached roster with detached chats"
-msgstr ""
+msgid "Detached contact list with detached chats"
+msgstr "Oddzielne okno dla rozmów i listy kontaktów"
 
 #: gajim/data/gui/preferences_window.ui:72
-msgid "Detached roster with single chat"
+msgid "Detached contact list with single chat"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:75
@@ -6658,11 +6753,11 @@ msgid "Single window for everything"
 msgstr "Jedno okno do wszystkiego"
 
 #: gajim/data/gui/preferences_window.ui:78
-msgid "Detached roster with chat grouped by account"
-msgstr ""
+msgid "Detached contact list with chat grouped by account"
+msgstr "Oddzielna lista kontaktów z jednym oknem rozmów grupowych"
 
 #: gajim/data/gui/preferences_window.ui:81
-msgid "Detached roster with chat grouped by type"
+msgid "Detached contact list with chat grouped by type"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:92
@@ -6714,7 +6809,7 @@ msgstr "_Zachowanie okna:"
 
 #: gajim/data/gui/preferences_window.ui:296
 #, fuzzy
-msgid "_Show roster on startup"
+msgid "_Show contact list on startup"
 msgstr "Pokaż _listę kontaktów"
 
 #: gajim/data/gui/preferences_window.ui:311
@@ -6730,12 +6825,12 @@ msgid "_Tabs placement"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:363
-msgid "_Quit Gajim when closing roster window"
+msgid "_Quit Gajim when closing contact list"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:367
 msgid ""
-"If enabled, Gajim will quit when closing the roster window instead of "
+"If enabled, Gajim will quit when closing the contact list window instead of "
 "minimizing to the system's notification area"
 msgstr ""
 
@@ -6745,41 +6840,42 @@ msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:423
 #, fuzzy
-msgid "Show a_vatars of contacts in roster"
+msgid "Show a_vatars of contacts in contact list"
 msgstr "Wyświetlaj awatary kontaktów z listy"
 
 #: gajim/data/gui/preferences_window.ui:427
 #, fuzzy
 msgid ""
-"If checked, avatars of contacts will be shown in the roster window and in "
-"group chats"
+"If checked, avatars of contacts will be shown in the contact list window and "
+"in group chats"
 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
 #, fuzzy
-msgid "Show status _messages of contacts in roster"
+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
 #, fuzzy
 msgid ""
 "If checked, status messages of contacts will be shown under the contact's "
-"name, in the roster window, and in group chats"
+"name, in the contact list window, and in group chats"
 msgstr ""
 "Jeśli jest zaznaczone, Gajim będzie wyświetlał opis statusu kontaktu pod "
 "jego nazwą na liście kontaktów"
 
 #: gajim/data/gui/preferences_window.ui:459
 #, fuzzy
-msgid "Show e_xtra information of contacts in roster (mood, activity, ...)"
+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
 msgid ""
-"If checked, additional info published by the contact will be shown in "
-"roster. Additional infos (published via PEP) may include e.g. mood, "
+"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 ""
 
@@ -6788,16 +6884,18 @@ msgid "Sort contacts by status"
 msgstr "Sortuj kontakty według statusu"
 
 #: gajim/data/gui/preferences_window.ui:494
-msgid "in _roster"
-msgstr "w _liście kontaktów"
+#, fuzzy
+msgid "in _contact list"
+msgstr "Wyślij kontakty:"
 
 #: gajim/data/gui/preferences_window.ui:511
 msgid "in _group chats"
 msgstr "w _konferencji"
 
 #: gajim/data/gui/preferences_window.ui:540
-msgid "Roster Appearance"
-msgstr "Tożsamość na rosterze"
+#, fuzzy
+msgid "Contact List Appearance"
+msgstr "Kontakt rozłączył się"
 
 #: gajim/data/gui/preferences_window.ui:585
 #, fuzzy
@@ -6864,7 +6962,7 @@ msgstr "Nie można dołączyć do pokoju"
 
 #: gajim/data/gui/preferences_window.ui:660
 #, fuzzy
-msgid "If checked, the room subject will be shown when joining a group chat"
+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:682
@@ -6879,13 +6977,13 @@ msgstr ""
 #: gajim/data/gui/preferences_window.ui:701
 msgid ""
 "If join/leave status messages are shown in the group chat. This setting can "
-"be overridden in the groupchat menu."
+"be overridden in the group chat menu."
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:720
 msgid ""
 "The default sync threshold for new public group chats. This setting can be "
-"overridden in the groupchat menu."
+"overridden in the group chat menu."
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:722
@@ -6900,7 +6998,7 @@ msgstr "_Zapisuj w logach zmiany statusów kontaktów"
 #: gajim/data/gui/preferences_window.ui:768
 msgid ""
 "If status change messages are shown in the group chat. This setting can be "
-"overridden in the groupchat menu."
+"overridden in the group chat menu."
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:825
@@ -6919,8 +7017,8 @@ msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:843
 #, fuzzy
-msgid "Show chatstate in roster"
-msgstr "Wyświetlaj awatary kontaktów z listy"
+msgid "Show chatstate in contact list"
+msgstr "Czy pokazywać przycisk zamknięcia na karcie?"
 
 #: gajim/data/gui/preferences_window.ui:847
 msgid ""
@@ -7237,7 +7335,7 @@ msgstr "Rozmiar obrazu"
 msgid "Vi_ew own video source"
 msgstr "Zobacz własne  źródło filmu"
 
-#: gajim/data/gui/preferences_window.ui:2281 gajim/gtk/accounts.py:352
+#: gajim/data/gui/preferences_window.ui:2281 gajim/gtk/accounts.py:355
 msgid "Connection"
 msgstr "Połączenie"
 
@@ -7295,7 +7393,8 @@ msgid "_Manage..."
 msgstr "Zarządzaj..."
 
 #: gajim/data/gui/preferences_window.ui:2616
-msgid "_Log status changes of contacts"
+#, fuzzy
+msgid "_Store status changes of contacts in history"
 msgstr "_Zapisuj w logach zmiany statusów kontaktów"
 
 #: gajim/data/gui/preferences_window.ui:2633
@@ -7319,9 +7418,15 @@ msgstr ""
 msgid "_Open..."
 msgstr "_Otwórz..."
 
+#: gajim/data/gui/preferences_window.ui:2723 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>Jabber-ID</b>\n"
+"<b>XMPP Address</b>\n"
 "&lt;user@domain/resource&gt; (only that resource matches)\n"
 "&lt;user@domain&gt; (any resource matches)\n"
 "&lt;domain/resource&gt; (only that resource matches)\n"
@@ -7340,7 +7445,8 @@ msgstr ""
 msgid "Only Admins and Owners can modify the affiliation"
 msgstr ""
 
-#: gajim/data/gui/groupchat_config.ui:270 gajim/plugins/gui.py:312
+#: gajim/data/gui/groupchat_config.ui:270
+#: gajim/data/gui/groupchat_info_scrolled.ui:210 gajim/plugins/gui.py:324
 #, fuzzy
 msgid "Configuration"
 msgstr "Konfiguracja pokoju"
@@ -7373,7 +7479,7 @@ msgid "Start _Chat"
 msgstr "Rozpocznij _rozmowę"
 
 #: gajim/data/gui/contact_context_menu.ui:20
-#: gajim/data/gui/systray_context_menu.ui:36
+#: gajim/data/gui/systray_context_menu.ui:29
 msgid "Send Single _Message..."
 msgstr "Wyślij pojedynczą wiadomość..."
 
@@ -7434,17 +7540,44 @@ msgid "_Ignore"
 msgstr "Ignoruj"
 
 #: gajim/data/gui/contact_context_menu.ui:174
-msgid "_Add to Roster..."
-msgstr "Dod_aj do listy kontaktów..."
+#, fuzzy
+msgid "_Add to Contact List..."
+msgstr "_Dodaj kontakt..."
+
+#: gajim/data/gui/advanced_configuration.ui:39
+msgid "You should restart Gajim for some changes to take effect"
+msgstr ""
+"UWAGA: Powinieneś ponownie uruchomić program by zastosować ostatnie "
+"ustawienia"
+
+#: gajim/data/gui/advanced_configuration.ui:71
+#, fuzzy
+msgid "_Filter"
+msgstr "_Filtr:"
+
+#: gajim/data/gui/advanced_configuration.ui:88
+msgid "Type to search for values..."
+msgstr ""
+
+#: gajim/data/gui/advanced_configuration.ui:180
+#, fuzzy
+msgid "_Reset Value"
+msgstr "Wróć do kolorów _domyślnych"
+
+#: gajim/data/gui/advanced_configuration.ui:185
+#, fuzzy
+msgid "Resets value to default"
+msgstr "Wróć do kolorów _domyślnych"
 
 #: gajim/data/gui/account_creation_wizard_window.ui:43
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim: Kreator Konta"
 
 #: gajim/data/gui/account_creation_wizard_window.ui:70
+#, fuzzy
 msgid ""
 "You need to have an account in order to connect\n"
-"to the Jabber network."
+"to the XMPP network."
 msgstr ""
 "Musisz posiadać konto aby połączyć się\n"
 " z siecią Jabber."
@@ -7466,8 +7599,9 @@ msgid "<b>Please fill in the data for your existing account</b>"
 msgstr "<b>Uzupełnij proszę dane swojego konta</b>"
 
 #: gajim/data/gui/account_creation_wizard_window.ui:187
-msgid "_Jabber ID:"
-msgstr "_Jabber ID:"
+#, fuzzy
+msgid "_XMPP Address:"
+msgstr "_Adres AIM:"
 
 #: gajim/data/gui/account_creation_wizard_window.ui:239
 #: gajim/data/gui/account_creation_wizard_window.ui:394
@@ -7554,6 +7688,7 @@ msgid "Privacy Lists:"
 msgstr "Poufne listy:"
 
 #: gajim/data/gui/service_discovery_window.ui:111
+#: gajim/data/gui/groupchat_creation.ui:227
 #, fuzzy
 msgid "_Address"
 msgstr "_Adres:"
@@ -7571,11 +7706,6 @@ msgstr "Synchronizacja: wybierz kontakty"
 msgid "Select the contacts you want to synchronise"
 msgstr "Wybierz kontakty, które chcesz zsynchronizować"
 
-#: gajim/data/gui/groupchat_invitation_received.ui:42
-#, fuzzy
-msgid "Group Chat Invitation"
-msgstr "Zaproszenie na czat"
-
 #: gajim/data/gui/groupchat_invitation_received.ui:111
 #, fuzzy
 msgid "Message..."
@@ -7626,11 +7756,10 @@ msgstr ""
 
 #: gajim/data/gui/add_new_contact_window.ui:84
 #, fuzzy
-msgid "_Jabber ID"
-msgstr "_Jabber ID:"
+msgid "_XMPP Address"
+msgstr "_Adres:"
 
 #: gajim/data/gui/add_new_contact_window.ui:100
-#: gajim/data/gui/manage_bookmarks_window.ui:192
 #, fuzzy
 msgid "_Nickname"
 msgstr "_Pseudonim:"
@@ -7707,7 +7836,7 @@ msgstr "<b>Nastrój</b>"
 msgid "<b>Message:</b>"
 msgstr "<b>Wiadomość:</b>"
 
-#: gajim/data/gui/plugins_window.ui:10 gajim/data/gui/application_menu.ui:90
+#: gajim/data/gui/plugins_window.ui:10 gajim/data/gui/application_menu.ui:87
 msgid "Plugins"
 msgstr "Wtyczki"
 
@@ -7815,10 +7944,6 @@ msgstr "Zezwól"
 msgid "Deny"
 msgstr "Odmów"
 
-#: gajim/data/gui/privacy_list_window.ui:317
-msgid "JabberID"
-msgstr "JID"
-
 #: gajim/data/gui/privacy_list_window.ui:358
 msgid "all in the group"
 msgstr "według grupy"
@@ -7859,7 +7984,7 @@ msgstr "Kolejność:"
 msgid "Manage sounds"
 msgstr "Zarządzaj dźwiękami"
 
-#: gajim/data/gui/manage_sounds_window.ui:55 gajim/plugins/gui.py:100
+#: gajim/data/gui/manage_sounds_window.ui:55 gajim/plugins/gui.py:101
 msgid "Active"
 msgstr "Aktywny"
 
@@ -7897,23 +8022,113 @@ msgstr "Usuń konto z Gajima i z _serwera"
 msgid "_Personal Events"
 msgstr "_Zdarzenia"
 
-#: gajim/data/gui/account_context_menu.ui:35
-#: gajim/data/gui/systray_context_menu.ui:28
-msgid "Join _Group Chat"
-msgstr "Dołącz do _pokoju"
-
-#: gajim/data/gui/account_context_menu.ui:49
+#: gajim/data/gui/account_context_menu.ui:41
 msgid "_Add Contact..."
 msgstr "_Dodaj kontakt..."
 
-#: gajim/data/gui/account_context_menu.ui:57
+#: gajim/data/gui/account_context_menu.ui:49
 msgid "_Discover Services"
 msgstr "Wyszukuj usługi"
 
-#: gajim/data/gui/account_context_menu.ui:65
+#: gajim/data/gui/account_context_menu.ui:57
 msgid "_Execute Command..."
 msgstr "_Wykonaj komendę"
 
+#: gajim/data/gui/account_context_menu.ui:65
+#, fuzzy
+msgid "_View Certificate"
+msgstr "Pokaż certyfikat..."
+
+#: gajim/data/gui/manage_proxies.ui:12
+#, fuzzy
+msgctxt "proxy configuration"
+msgid "HTTP Connect"
+msgstr "Połączenie HTTP"
+
+#: gajim/data/gui/manage_proxies.ui:15
+#, fuzzy
+msgctxt "proxy configuration"
+msgid "SOCKS5"
+msgstr "SOCKS5"
+
+#: gajim/data/gui/manage_proxies.ui:18
+#, fuzzy
+msgctxt "proxy configuration"
+msgid "BOSH"
+msgstr "_BOSH URL:"
+
+#: gajim/data/gui/manage_proxies.ui:68
+#, fuzzy
+msgid "Add Proxy"
+msgstr "Serwer Proxy:"
+
+#: gajim/data/gui/manage_proxies.ui:82
+#, fuzzy
+msgid "Remove Proxy"
+msgstr "Usuń grupę"
+
+#: gajim/data/gui/manage_proxies.ui:134
+#, fuzzy
+msgid "Pass_word"
+msgstr "_Hasło:"
+
+#: gajim/data/gui/manage_proxies.ui:159
+msgid "Use proxy auth_entication"
+msgstr "Używaj aut_oryzacji serwera proxy"
+
+#: gajim/data/gui/manage_proxies.ui:179
+#, fuzzy
+msgid "_Username"
+msgstr "_Nazwa użytkownika:"
+
+#: gajim/data/gui/manage_proxies.ui:209
+#, fuzzy
+msgid "_Port"
+msgstr "_Port:"
+
+#: gajim/data/gui/manage_proxies.ui:226
+msgid "example.org"
+msgstr ""
+
+#: gajim/data/gui/manage_proxies.ui:240
+#, fuzzy
+msgid "_Host"
+msgstr "_Host:"
+
+#: gajim/data/gui/manage_proxies.ui:254
+msgid "Use HTTP prox_y"
+msgstr "Korzystaj z pośrednik_a HTTP"
+
+#: gajim/data/gui/manage_proxies.ui:275
+msgid "https://example.org/http-bind/"
+msgstr ""
+
+#: gajim/data/gui/manage_proxies.ui:291
+#, fuzzy
+msgid "_BOSH URL"
+msgstr "_BOSH URL:"
+
+#: gajim/data/gui/manage_proxies.ui:309 gajim/gtk/adhoc.py:322
+#, fuzzy
+msgid "Settings"
+msgstr "Wtyczki"
+
+#: gajim/data/gui/manage_proxies.ui:344
+#, fuzzy
+msgid "_Type"
+msgstr "_Typ:"
+
+#: gajim/data/gui/manage_proxies.ui:361
+#: gajim/data/gui/groupchat_creation.ui:105
+#, fuzzy
+msgid "_Name"
+msgstr "_Nazwa: "
+
+#: gajim/data/gui/manage_proxies.ui:391 gajim/gtk/accounts.py:742
+#, fuzzy
+msgid "Proxy"
+msgstr "Serwer Proxy:"
+
 #: gajim/data/gui/application_menu.ui:8
 #, fuzzy
 msgid "View"
@@ -7921,8 +8136,8 @@ msgstr "_Widok"
 
 #: gajim/data/gui/application_menu.ui:11
 #, fuzzy
-msgid "Show Roster"
-msgstr "Pokaż _listę kontaktów"
+msgid "Show Contact List"
+msgstr "Pokaż kontakty _połączone"
 
 #: gajim/data/gui/application_menu.ui:16
 msgid "Show Offline Contacts"
@@ -7962,23 +8177,23 @@ msgstr ""
 msgid "Features"
 msgstr "Możliwości programu"
 
-#: gajim/data/gui/application_menu.ui:81
-#, fuzzy
-msgid "Bookmarks"
-msgstr "Dodaj _zakładkę dla tego pokoju"
+#: gajim/data/gui/application_menu.ui:77
+#: 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/application_menu.ui:94 gajim/data/gui/shortcuts_window.ui:189
-#: gajim/gtk/preferences.py:59
+#: gajim/data/gui/application_menu.ui:91 gajim/data/gui/shortcuts_window.ui:189
+#: gajim/gtk/preferences.py:58
 msgid "Preferences"
 msgstr "Ustawienia"
 
-#: gajim/data/gui/application_menu.ui:99
+#: gajim/data/gui/application_menu.ui:96
 #, fuzzy
 msgid "Quit"
 msgstr "_Zakończ"
 
 #: gajim/data/gui/httpupload_progress_dialog.ui:110
-#: gajim/gtk/filetransfer.py:121
+#: gajim/gtk/filetransfer.py:120
 msgid "Progress"
 msgstr "Postęp"
 
@@ -7996,53 +8211,33 @@ msgstr ""
 msgid "_Cancel Upload"
 msgstr "_Anuluj"
 
-#: gajim/data/gui/manage_bookmarks_window.ui:13
-#, fuzzy
-msgid "Group Chat Bookmarks"
-msgstr "Pokój"
-
-#: gajim/data/gui/manage_bookmarks_window.ui:68
-#, fuzzy
-msgid "Add Bookmark"
-msgstr "Dodaj _zakładkę dla tego pokoju"
-
-#: gajim/data/gui/manage_bookmarks_window.ui:82
-#, fuzzy
-msgid "Remove Bookmark"
-msgstr "Dodaj _zakładkę dla tego pokoju"
+#: gajim/data/gui/groupchat_creation.ui:27
+msgid "Public or Private?"
+msgstr ""
 
-#: gajim/data/gui/manage_bookmarks_window.ui:126
-msgid "N_ame"
+#: 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 ""
 
-#: gajim/data/gui/manage_bookmarks_window.ui:145
-#, fuzzy
-msgid "Bookmark Name"
-msgstr "_Dodaj zakładkę do tego pokoju"
+#: gajim/data/gui/groupchat_creation.ui:58
+msgid "<b>Public:</b> Anyone who knows the address can join."
+msgstr ""
 
-#: gajim/data/gui/manage_bookmarks_window.ui:160
+#: gajim/data/gui/groupchat_creation.ui:122
 #, fuzzy
-msgid "_Server"
-msgstr "_Serwer:"
+msgid "_Description"
+msgstr "Opis"
 
-#: gajim/data/gui/manage_bookmarks_window.ui:223
-#, fuzzy
-msgid "Roo_m"
-msgstr "_Pokój"
+#: gajim/data/gui/groupchat_creation.ui:164
+msgid "_Public"
+msgstr ""
 
-#: gajim/data/gui/manage_bookmarks_window.ui:253
+#: gajim/data/gui/groupchat_creation.ui:278
 #, fuzzy
-msgid "_Password"
-msgstr "_Hasło:"
-
-#: gajim/data/gui/manage_bookmarks_window.ui:299
-#, fuzzy
-msgid "Join chat when connected"
-msgstr "Kontakt rozłączył się"
-
-#: gajim/data/gui/manage_bookmarks_window.ui:307
-msgid "_Join Automatically"
-msgstr ""
+msgid "_Account"
+msgstr "_Konta"
 
 #: gajim/data/gui/exception_dialog.ui:49
 msgid "Sorry, that should not have happened"
@@ -8087,6 +8282,29 @@ msgstr "Autoryzuj kontakt - będzie wówczas wiedział, kiedy jesteś połączon
 msgid "Presets"
 msgstr "_Obecność"
 
+#: gajim/data/gui/groupchat_info_scrolled.ui:32
+#, fuzzy
+msgid "Address"
+msgstr "_Adres:"
+
+#: gajim/data/gui/groupchat_info_scrolled.ui:64
+msgid "Topic"
+msgstr ""
+
+#: gajim/data/gui/groupchat_info_scrolled.ui:80
+#, fuzzy
+msgid "Author"
+msgstr "Autorzy:"
+
+#: gajim/data/gui/groupchat_info_scrolled.ui:182
+msgid "Discussion Logs"
+msgstr ""
+
+#: gajim/data/gui/groupchat_info_scrolled.ui:260
+#, fuzzy
+msgid "Group Chat Language"
+msgstr "Zaproszenie na czat"
+
 #: gajim/data/gui/emoji_chooser.ui:98
 #, fuzzy
 msgid "No Results Found"
@@ -8099,24 +8317,35 @@ msgstr "Zaproś przyjaciół!"
 #: gajim/data/gui/chat_to_muc_window.ui:39
 #, fuzzy
 msgid ""
-"You are now entering a groupchat.\n"
+"You are now entering a group chat.\n"
 "Select the contacts you want to invite"
 msgstr ""
 "Zamierzasz rozpocząć czat.\n"
 "Wybierz kontakty, które chcesz do niego zaprosić"
 
 #: gajim/data/gui/chat_to_muc_window.ui:112
-msgid "Please select a MUC server."
+#, fuzzy
+msgid "Please select a group chat server."
 msgstr "Proszę wybrać serwer MUC."
 
 #: gajim/data/gui/chat_to_muc_window.ui:141
-msgid "MUC server"
-msgstr "Serwer MUC"
+#, fuzzy
+msgid "Group chat server"
+msgstr "Pokoje"
 
 #: gajim/data/gui/chat_to_muc_window.ui:176
 msgid "In_vite"
 msgstr "_Zaproś"
 
+#: gajim/data/gui/bookmarks.ui:176
+#, fuzzy
+msgid "Autojoin"
+msgstr "Połącz automatycznie"
+
+#: gajim/data/gui/bookmarks.ui:211
+msgid "_Apply"
+msgstr ""
+
 #: gajim/data/gui/history_manager.ui:11
 #, fuzzy
 msgid "_Export"
@@ -8132,12 +8361,13 @@ msgid "Gajim History Logs Manager"
 msgstr "Historia rozmów"
 
 #: gajim/data/gui/history_manager.ui:108
+#, fuzzy
 msgid ""
-"This log manager is not intended for log viewing. If you are looking for "
-"such functionality, use the history window instead.\n"
+"This history manager is not intended for viewing chat history. If you are "
+"looking for such functionality, please use the history window instead.\n"
 "\n"
-"Use this program to delete or export logs. You can select logs from the left "
-"and/or search database from below."
+"You can use this program to delete or export history. Either select logs "
+"from the left or search the database."
 msgstr ""
 "Menedżer logów nie powinien być używany do przeglądania logów. Jeżeli "
 "szukasz tej funkcjonalności, użyj okna historii rozmów.\n"
@@ -8191,8 +8421,9 @@ msgid "Select an emoji"
 msgstr ""
 
 #: gajim/data/gui/shortcuts_window.ui:38
-msgid "Complete a command or a nick"
-msgstr ""
+#, fuzzy
+msgid "Complete a command or a nickname"
+msgstr "Proszę utworzyć nowy temat i nadać mu nazwę."
 
 #: gajim/data/gui/shortcuts_window.ui:45
 #, fuzzy
@@ -8232,7 +8463,7 @@ msgstr ""
 msgid "Scroll down"
 msgstr ""
 
-#: gajim/data/gui/shortcuts_window.ui:100 gajim/gtk/xml_console.py:72
+#: gajim/data/gui/shortcuts_window.ui:100 gajim/gtk/xml_console.py:69
 msgid "Clear"
 msgstr "Wyczyść"
 
@@ -8274,8 +8505,9 @@ msgid "Close chat"
 msgstr "Zamknij"
 
 #: gajim/data/gui/shortcuts_window.ui:173
-msgid "Roster Shortcuts"
-msgstr ""
+#, fuzzy
+msgid "Contact List Shortcuts"
+msgstr "Kontakt rozłączył się"
 
 #: gajim/data/gui/shortcuts_window.ui:196
 #, fuzzy
@@ -8306,7 +8538,7 @@ msgid "Show only active contacts"
 msgstr "Pokaż kontakty _połączone"
 
 #: gajim/data/gui/shortcuts_window.ui:251
-msgid "Enable roster filtering"
+msgid "Enable contact list filtering"
 msgstr ""
 
 #: gajim/data/gui/shortcuts_window.ui:259
@@ -8353,12 +8585,12 @@ msgstr ""
 
 #: gajim/data/gui/history_window.ui:317
 #, fuzzy
-msgid "Record history for this chat"
+msgid "Store history for this chat"
 msgstr "Ignoruj komunikat o tym błędzie."
 
 #: gajim/data/gui/history_window.ui:332
 #, fuzzy
-msgid "Record History"
+msgid "Store History"
 msgstr "Ostatnio:"
 
 #: gajim/data/gui/history_window.ui:350
@@ -8379,9 +8611,10 @@ msgstr "Utwórz nowy wpis"
 msgid "Fill in the form."
 msgstr "Wypełnij formularz."
 
-#: gajim/data/gui/data_form_window.ui:229
-msgid "Room Configuration"
-msgstr "Konfiguracja pokoju"
+#: gajim/data/gui/data_form_window.ui:229 gajim/gtk/groupchat_config.py:41
+#, fuzzy
+msgid "Group Chat Configuration"
+msgstr "Zaproszenie na czat"
 
 #: gajim/data/gui/roster_item_exchange_window.ui:39
 #: gajim/gtk/roster_item_exchange.py:35
@@ -8402,15 +8635,15 @@ msgstr "Sta_tus"
 msgid "_Start Chat..."
 msgstr "_Rozpocznij rozmowę"
 
-#: gajim/data/gui/systray_context_menu.ui:50
+#: gajim/data/gui/systray_context_menu.ui:43
 msgid "Show All Pending _Events"
 msgstr "Pokaż wszystkie oczekujące _zdarzenia"
 
-#: gajim/data/gui/systray_context_menu.ui:59
+#: gajim/data/gui/systray_context_menu.ui:52
 msgid "Mute Sounds"
 msgstr "Wyłącz dźwięki"
 
-#: gajim/data/gui/systray_context_menu.ui:75
+#: gajim/data/gui/systray_context_menu.ui:68
 #, fuzzy
 msgid "_Preferences"
 msgstr "Ustawienia"
@@ -8502,34 +8735,34 @@ msgstr ""
 msgid "Execute expression inside a shell, send output"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:45
+#: gajim/command_system/implementation/standard.py:47
 msgid ""
 "Show help on a given command or a list of available commands if -a is given"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:73
+#: gajim/command_system/implementation/standard.py:75
 #, fuzzy
 msgid "Send a message to the contact"
 msgstr "Użycie: /%s wysyła wiadomość do kontaktu"
 
-#: gajim/command_system/implementation/standard.py:78
+#: gajim/command_system/implementation/standard.py:80
 msgid "Send action (in the third person) to the current chat"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:83
+#: gajim/command_system/implementation/standard.py:85
 msgid "Show logged messages which mention given text"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:88
+#: gajim/command_system/implementation/standard.py:90
 #, fuzzy, python-format
 msgid "%s: Nothing found"
 msgstr "Nie znaleziono %s"
 
-#: gajim/command_system/implementation/standard.py:94
+#: gajim/command_system/implementation/standard.py:96
 msgid "Limit must be an integer"
 msgstr "Limit musi być wartością integer"
 
-#: gajim/command_system/implementation/standard.py:118
+#: gajim/command_system/implementation/standard.py:120
 msgid ""
 "\n"
 "    Set the current status\n"
@@ -8545,127 +8778,130 @@ msgstr ""
 "    online, away, chat, xa, dnd.\n"
 "    "
 
-#: gajim/command_system/implementation/standard.py:136
+#: gajim/command_system/implementation/standard.py:138
 msgid "Set the current status to away"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:150
+#: gajim/command_system/implementation/standard.py:152
 msgid "Set the current status to online"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:153
+#: gajim/command_system/implementation/standard.py:155
 #, fuzzy
 msgid "Available"
 msgstr "Dostępny"
 
-#: gajim/command_system/implementation/standard.py:173
-#: gajim/command_system/implementation/standard.py:250
+#: gajim/command_system/implementation/standard.py:175
+#: gajim/command_system/implementation/standard.py:252
 #, fuzzy
 msgid "Clear the text window"
 msgstr "Użycie: /%s czyście okno tekstowe."
 
-#: gajim/command_system/implementation/standard.py:178
-#: gajim/command_system/implementation/standard.py:397
+#: gajim/command_system/implementation/standard.py:180
+#: gajim/command_system/implementation/standard.py:401
 #, fuzzy
 msgid "Send a ping to the contact"
 msgstr "Uzycie: /%s, wysyła sygnał ping do kontaktu"
 
-#: gajim/command_system/implementation/standard.py:181
-#: gajim/command_system/implementation/standard.py:400
+#: gajim/command_system/implementation/standard.py:183
+#: gajim/command_system/implementation/standard.py:404
 #, fuzzy
 msgid "Command is not supported for zeroconf accounts"
 msgstr "Komenda nie jest wspierana dla konta zeroconf."
 
-#: gajim/command_system/implementation/standard.py:185
-msgid "Send DTMF sequence through an open audio session"
+#: gajim/command_system/implementation/standard.py:187
+msgid "Send DTMF sequence through an open voice chat"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:188
+#: gajim/command_system/implementation/standard.py:190
 #, fuzzy
-msgid "No open audio sessions with the contact"
+msgid "No open voice chats with the contact"
 msgstr "Kliknij by zobaczyć poprzednie rozmowy z tym kontaktem"
 
-#: gajim/command_system/implementation/standard.py:191
+#: gajim/command_system/implementation/standard.py:193
 #, fuzzy, python-format
 msgid "%s is not a valid tone"
 msgstr "%s nie jest prawidłowym poziomem logowania"
 
-#: gajim/command_system/implementation/standard.py:198
-msgid "Toggle audio session"
-msgstr "Przełącz sesję audio"
+#: gajim/command_system/implementation/standard.py:200
+msgid "Toggle Voice Chat"
+msgstr ""
 
-#: gajim/command_system/implementation/standard.py:201
+#: gajim/command_system/implementation/standard.py:203
 #, fuzzy
-msgid "Audio sessions are not available"
-msgstr "Połączenie jest niemożliwe"
+msgid "Voice chats are not available"
+msgstr "Połączenie jest niedostępne"
 
-#: gajim/command_system/implementation/standard.py:208
-msgid "Toggle video session"
+#: gajim/command_system/implementation/standard.py:210
+#, fuzzy
+msgid "Toggle Video Chat"
 msgstr "Przełącz sesję wideo"
 
-#: gajim/command_system/implementation/standard.py:211
+#: gajim/command_system/implementation/standard.py:213
 #, fuzzy
-msgid "Video sessions are not available"
+msgid "Video chats are not available"
 msgstr "Połączenie jest niedostępne"
 
-#: gajim/command_system/implementation/standard.py:218
+#: gajim/command_system/implementation/standard.py:220
 #, fuzzy
 msgid "Send a message to the contact that will attract their attention"
 msgstr "Użycie: /%s wysyła wiadomość do kontaktu"
 
-#: gajim/command_system/implementation/standard.py:255
+#: gajim/command_system/implementation/standard.py:257
 #, fuzzy
 msgid "Change your nickname in a group chat"
 msgstr "Zmień swoją nazwę (Ctrl+N)"
 
-#: gajim/command_system/implementation/standard.py:260 gajim/gtk/dialogs.py:674
-#: gajim/gtk/bookmarks.py:272
+#: gajim/command_system/implementation/standard.py:262
 msgid "Invalid nickname"
 msgstr "Niepoprawny pseudonim"
 
-#: gajim/command_system/implementation/standard.py:267
-msgid "Open a private chat window with a specified occupant"
+#: gajim/command_system/implementation/standard.py:269
+#, fuzzy
+msgid "Open a private chat window with a specified participant"
 msgstr "Otwiera okno prywatnej rozmowy z tą osobą."
 
-#: gajim/command_system/implementation/standard.py:273
-#: gajim/command_system/implementation/standard.py:282
-#: gajim/command_system/implementation/standard.py:332
-#: gajim/command_system/implementation/standard.py:345
-#: gajim/command_system/implementation/standard.py:357
+#: gajim/command_system/implementation/standard.py:275
+#: gajim/command_system/implementation/standard.py:284
+#: gajim/command_system/implementation/standard.py:336
+#: gajim/command_system/implementation/standard.py:349
+#: gajim/command_system/implementation/standard.py:361
 #, fuzzy
 msgid "Nickname not found"
 msgstr "Pseudonim nie został odnaleziony: %s"
 
-#: gajim/command_system/implementation/standard.py:276
+#: gajim/command_system/implementation/standard.py:278
+#, fuzzy
 msgid ""
-"Open a private chat window with a specified occupant and send him a message"
+"Open a private chat window with a specified participant and send him a "
+"message"
 msgstr "Otwiera okno prywatnej rozmowy z tą osobą i wysyła wiadomość"
 
-#: gajim/command_system/implementation/standard.py:285
+#: gajim/command_system/implementation/standard.py:287
 #, fuzzy
 msgid "Display or change a group chat topic"
 msgstr "Zapytaj przed zamknięciem karty/okna rozmowy grupowej."
 
-#: gajim/command_system/implementation/standard.py:294
-msgid "Invite a user to a room for a reason"
+#: gajim/command_system/implementation/standard.py:296
+msgid "Invite a user to a group chat for a reason"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:297
+#: gajim/command_system/implementation/standard.py:299
 #, fuzzy, python-format
 msgid "Invited %(jid)s to %(room_jid)s"
 msgstr "%(contact_jid)s zaproszony do %(room_jid)s."
 
-#: gajim/command_system/implementation/standard.py:301
+#: gajim/command_system/implementation/standard.py:303
 #, fuzzy
-msgid "Join a group chat given by a JID"
+msgid "Join a group chat given by an XMPP Address"
 msgstr "w _konferencji"
 
-#: gajim/command_system/implementation/standard.py:309
+#: gajim/command_system/implementation/standard.py:313
 msgid ""
-"Leave the groupchat, optionally giving a reason, and close tab or window"
+"Leave the group chat, optionally giving a reason, and close tab or window"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:314
+#: gajim/command_system/implementation/standard.py:318
 msgid ""
 "\n"
 "    Ban user by a nick or a JID from a groupchat\n"
@@ -8674,46 +8910,60 @@ msgid ""
 "    "
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:329
+#: gajim/command_system/implementation/standard.py:333
 #, fuzzy
-msgid "Kick user by a nick from a groupchat"
+msgid "Kick user by a nick from a group chat"
 msgstr "Jestes zaproszony do rozmowy grupowej"
 
-#: gajim/command_system/implementation/standard.py:338
+#: gajim/command_system/implementation/standard.py:342
+#, fuzzy
 msgid ""
-"Set occupant role in group chat.\n"
+"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"
+"    "
 
-#: gajim/command_system/implementation/standard.py:343
+#: gajim/command_system/implementation/standard.py:347
 #, fuzzy
 msgid "Invalid role given"
 msgstr "Niepoprawna nazwa serwera"
 
-#: gajim/command_system/implementation/standard.py:350
+#: gajim/command_system/implementation/standard.py:354
+#, fuzzy
 msgid ""
-"Set occupant affiliation in group chat.\n"
+"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"
+"    "
 
-#: gajim/command_system/implementation/standard.py:355
+#: gajim/command_system/implementation/standard.py:359
 #, fuzzy
 msgid "Invalid affiliation given"
 msgstr "afiliacja została zmieniona "
 
-#: gajim/command_system/implementation/standard.py:365
+#: gajim/command_system/implementation/standard.py:369
 #, fuzzy
-msgid "Display names of all group chat occupants"
+msgid "Display names of all group chat participants"
 msgstr "Użycie: /%s , wyświetla osoby obecne w danym pokoju."
 
-#: gajim/command_system/implementation/standard.py:387
-msgid "Forbid an occupant to send you public or private messages"
+#: gajim/command_system/implementation/standard.py:391
+msgid "Forbid a participant to send you public or private messages"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:392
-msgid "Allow an occupant to send you public or private messages"
+#: gajim/command_system/implementation/standard.py:396
+msgid "Allow a participant to send you public or private messages"
 msgstr ""
 
 #: gajim/command_system/implementation/middleware.py:74
@@ -8724,200 +8974,328 @@ msgstr "Błąd podczas wykonywania polecenia"
 msgid "The same as using a doc-string, except it supports translation"
 msgstr ""
 
-#: gajim/gtk/filetransfer.py:91
+#: gajim/gtk/groupchat_info.py:36
+#, fuzzy
+msgid "?Group chat feature:Archiving"
+msgstr "Zaproszenie na czat"
+
+#: gajim/gtk/groupchat_info.py:37
+#, fuzzy
+msgid "Messages are archived on the server"
+msgstr "Obecna sesja zostanie zachowania w archiwum na serwerze"
+
+#: gajim/gtk/groupchat_info.py:40
+#, fuzzy
+msgid "?Group chat feature:Persistent"
+msgstr "Pokoje"
+
+#: gajim/gtk/groupchat_info.py:41
+msgid "This group chat persists even if there are no participants"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:45
+#, fuzzy
+msgid "?Group chat feature:Temporary"
+msgstr "?Funkcja kontaktu w pokoju: Brak"
+
+#: gajim/gtk/groupchat_info.py:46
+msgid "This group chat will be destroyed once the last participant left"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:50
+#, fuzzy
+msgid "?Group chat feature:Moderated"
+msgstr "?Funkcja kontaktu w pokoju: Brak"
+
+#: gajim/gtk/groupchat_info.py:51
+msgid ""
+"Participants entering this group chat need to request permission to send "
+"messages"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:55
+#, fuzzy
+msgid "?Group chat feature:Not Moderated"
+msgstr "Pokoje"
+
+#: gajim/gtk/groupchat_info.py:56
+msgid "Participants entering this group chat are allowed to send messages"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:60
+#, fuzzy
+msgid "?Group chat feature:Open"
+msgstr "?Funkcja kontaktu w pokoju: Brak"
+
+#: gajim/gtk/groupchat_info.py:61
+#, fuzzy
+msgid "Anyone can join this group chat"
+msgstr "%s dołączył do pokoju"
+
+#: gajim/gtk/groupchat_info.py:64
+#, fuzzy
+msgid "?Group chat feature:Members Only"
+msgstr "Podświetlenie wiadomości z czatu"
+
+#: gajim/gtk/groupchat_info.py:65
+msgid "This group chat is restricted to members only"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:69
+#, fuzzy
+msgid "?Group chat feature:Public"
+msgstr "Podświetlenie wiadomości z czatu"
+
+#: gajim/gtk/groupchat_info.py:70
+msgid "Group chat can be found via search"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:73
+#, fuzzy
+msgid "?Group chat feature:Hidden"
+msgstr "?Funkcja kontaktu w pokoju: Brak"
+
+#: gajim/gtk/groupchat_info.py:74
+#, fuzzy
+msgid "This group chat can not be found via search"
+msgstr "Ten pokój nie ma tematu"
+
+#: gajim/gtk/groupchat_info.py:77
+#, fuzzy
+msgid "?Group chat feature:Not Anonymous"
+msgstr "Pokoje"
+
+#: gajim/gtk/groupchat_info.py:78
+msgid "All other group chat participants can see your XMPP address"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:82
+#, fuzzy
+msgid "?Group chat feature:Semi-Anonymous"
+msgstr "Podświetlenie wiadomości z czatu"
+
+#: gajim/gtk/groupchat_info.py:83
+msgid "Only moderators can see your XMPP address"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:86
+#, fuzzy
+msgid "?Group chat feature:Password Required"
+msgstr "Pokoje"
+
+#: gajim/gtk/groupchat_info.py:87
+msgid "This group chat does require a password upon entry"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:91
+#, fuzzy
+msgid "?Group chat feature:No Password Required"
+msgstr "Pokoje"
+
+#: gajim/gtk/groupchat_info.py:92
+msgid "This group chat does not require a password upon entry"
+msgstr ""
+
+#: gajim/gtk/filetransfer.py:90
 msgid "File"
 msgstr "Plik"
 
-#: gajim/gtk/filetransfer.py:108
+#: gajim/gtk/filetransfer.py:107
 msgid "Time"
 msgstr "Czas"
 
-#: gajim/gtk/filetransfer.py:228
+#: gajim/gtk/filetransfer.py:227
 #, fuzzy, python-format
 msgid "File name: %s"
 msgstr "Nazwa pliku: %s"
 
-#: gajim/gtk/filetransfer.py:229 gajim/gtk/filetransfer.py:464
+#: gajim/gtk/filetransfer.py:228 gajim/gtk/filetransfer.py:469
 #, python-format
 msgid "Size: %s"
 msgstr "Rozmiar: %s"
 
-#: gajim/gtk/filetransfer.py:239
+#: gajim/gtk/filetransfer.py:238
 #, python-format
 msgid "Sender: %s"
 msgstr "Nadawca: %s"
 
-#: gajim/gtk/filetransfer.py:240 gajim/gtk/filetransfer.py:744
+#: gajim/gtk/filetransfer.py:239 gajim/gtk/filetransfer.py:749
 #: gajim/gtk/tooltips.py:577
 msgid "Recipient: "
 msgstr "Odbiorca: "
 
-#: gajim/gtk/filetransfer.py:251
+#: gajim/gtk/filetransfer.py:250
 #, python-format
 msgid "Saved in: %s"
 msgstr "Zapisane w: %s"
 
-#: gajim/gtk/filetransfer.py:256
+#: gajim/gtk/filetransfer.py:255
 msgid "File transfer completed"
 msgstr "Zakończono przesyłanie pliku"
 
-#: gajim/gtk/filetransfer.py:276 gajim/gtk/filetransfer.py:285
+#: gajim/gtk/filetransfer.py:275 gajim/gtk/filetransfer.py:284
 #, fuzzy
 msgid "Connection with peer could not be established."
 msgstr "Nie można ustanowić połączenia z drugą stroną."
 
-#: gajim/gtk/filetransfer.py:293
+#: gajim/gtk/filetransfer.py:292
 #, python-format
 msgid "Filename: %s"
 msgstr "Nazwa pliku: %s"
 
-#: gajim/gtk/filetransfer.py:294
+#: gajim/gtk/filetransfer.py:293
 #, python-format
 msgid "Recipient: %s"
 msgstr "Odbiorca: %s"
 
-#: gajim/gtk/filetransfer.py:296
+#: gajim/gtk/filetransfer.py:295
 #, python-format
 msgid "Error message: %s"
 msgstr "Komunikat błędu: %s"
 
-#: gajim/gtk/filetransfer.py:333
-#, fuzzy
-msgid "File transfer error"
-msgstr "Błąd przesyłania pliku"
-
 #: gajim/gtk/filetransfer.py:334
-#, python-format
+#, fuzzy, python-format
 msgid ""
-"The file %(file)s has been received, but it seems to have been damaged along "
-"the way.\n"
+"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ć?"
 
-#: gajim/gtk/filetransfer.py:350
+#: gajim/gtk/filetransfer.py:340
+#, fuzzy
+msgid "_Download Again"
+msgstr "_Nie pytaj mnie o to ponownie"
+
+#: gajim/gtk/filetransfer.py:355
 msgid "Gajim can not read this file"
 msgstr "Gajim nie może uzyskać dostępu do tego pliku"
 
-#: gajim/gtk/filetransfer.py:351
+#: gajim/gtk/filetransfer.py:356
 msgid "Another process is using this file."
 msgstr "Inny proces używa tego pliku."
 
-#: gajim/gtk/filetransfer.py:418
+#: gajim/gtk/filetransfer.py:423
 #, fuzzy
 msgid "File Transfer Conflict"
 msgstr "Zakończono przesyłanie pliku"
 
-#: gajim/gtk/filetransfer.py:419
+#: gajim/gtk/filetransfer.py:424
 msgid "This file already exists"
 msgstr "Ten plik już istnieje"
 
-#: gajim/gtk/filetransfer.py:420
+#: gajim/gtk/filetransfer.py:425
 msgid "Resume download or replace file?"
 msgstr ""
 
-#: gajim/gtk/filetransfer.py:424
+#: gajim/gtk/filetransfer.py:429
 #, fuzzy
 msgid "Replace _File"
 msgstr "Zastąp"
 
-#: gajim/gtk/filetransfer.py:427
+#: gajim/gtk/filetransfer.py:432
 #, fuzzy
 msgid "Resume _Download"
 msgstr "Pobieranie"
 
-#: gajim/gtk/filetransfer.py:437
+#: gajim/gtk/filetransfer.py:442
 #, fuzzy, python-format
 msgid "Directory '%s' is not writable"
 msgstr "Nie masz uprawnień do zapisu w folderze \"%s\""
 
-#: gajim/gtk/filetransfer.py:438
+#: gajim/gtk/filetransfer.py:443
 #, fuzzy
 msgid "You do not have permissions to create files in this directory."
 msgstr "Nie masz uprawnień do tworzenia plików w tym folderze."
 
-#: gajim/gtk/filetransfer.py:461
+#: gajim/gtk/filetransfer.py:466
 #, python-format
 msgid "File: %s"
 msgstr "Plik: %s"
 
-#: gajim/gtk/filetransfer.py:467
+#: gajim/gtk/filetransfer.py:472
 #, python-format
 msgid "Type: %s"
 msgstr "Typ: %s"
 
-#: gajim/gtk/filetransfer.py:469
+#: gajim/gtk/filetransfer.py:474
 #, python-format
 msgid "Description: %s"
 msgstr "Opis: %s"
 
-#: gajim/gtk/filetransfer.py:480
+#: gajim/gtk/filetransfer.py:485
 #, fuzzy, python-format
 msgid "%s wants to send you a file"
 msgstr "%s chce przesłać ci plik."
 
-#: gajim/gtk/filetransfer.py:509
+#: gajim/gtk/filetransfer.py:514
 msgid "Checking file…"
 msgstr "sprawdzanie sum kontrolnych…"
 
-#: gajim/gtk/filetransfer.py:524
+#: gajim/gtk/filetransfer.py:529
 msgid "File error"
 msgstr "Błąd przesyłania pliku"
 
-#: gajim/gtk/filetransfer.py:561
+#: gajim/gtk/filetransfer.py:566
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 
-#: gajim/gtk/filetransfer.py:658
+#: gajim/gtk/filetransfer.py:663
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/ów)"
 
-#: gajim/gtk/filetransfer.py:711 gajim/gtk/filetransfer.py:715
+#: gajim/gtk/filetransfer.py:716 gajim/gtk/filetransfer.py:720
 msgid "Invalid File"
 msgstr "Niepoprawny plik"
 
-#: gajim/gtk/filetransfer.py:711
+#: gajim/gtk/filetransfer.py:716
 msgid "File: "
 msgstr "Plik: "
 
-#: gajim/gtk/filetransfer.py:716
+#: gajim/gtk/filetransfer.py:721
 msgid "It is not possible to send empty files"
 msgstr "Nie można wysłać pustego pliku"
 
-#: gajim/gtk/filetransfer.py:742 gajim/gtk/tooltips.py:571
+#: gajim/gtk/filetransfer.py:747 gajim/gtk/tooltips.py:571
 msgid "Sender: "
 msgstr "Nadawca: "
 
-#: gajim/gtk/filetransfer.py:1038
+#: gajim/gtk/filetransfer.py:1043
 msgid "Choose a File to Send…"
 msgstr "Wybierz plik do wysłania..."
 
 #: gajim/gtk/start_chat.py:51
-msgid "Start new Conversation"
+#, fuzzy
+msgid "Start New Conversation"
 msgstr "Rozpocznij nową konwersację"
 
-#: gajim/gtk/start_chat.py:424
-msgid "New Groupchat"
-msgstr "Nowa rozmowa grupowa"
+#: gajim/gtk/start_chat.py:260 gajim/gtk/start_chat.py:328
+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:426
-msgid "New Contact"
-msgstr "Dodaj nowy kontakt"
+#: gajim/gtk/start_chat.py:603 gajim/gtk/groupchat_join.py:38
+msgid "Join Group Chat"
+msgstr "Dołącz do pokoju"
+
+#: gajim/gtk/start_chat.py:605 gajim/gtk/add_contact.py:40
+#, fuzzy
+msgid "Add Contact"
+msgstr "_Dodaj kontakt..."
 
-#: gajim/gtk/start_chat.py:588
+#: gajim/gtk/start_chat.py:746
 #, fuzzy, python-format
-msgid "%s Group chats found"
+msgid "%s group chats found"
 msgstr "Nie znaleziono %s"
 
-#: gajim/gtk/discovery.py:70
+#: gajim/gtk/discovery.py:69
 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:71
+#: gajim/gtk/discovery.py:70
 #, fuzzy
 msgid ""
 "This service could not respond with detailed information.\n"
@@ -8926,32 +9304,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:128
+#: gajim/gtk/discovery.py:126
 msgid "Others"
 msgstr "Inni"
 
-#: gajim/gtk/discovery.py:131
-msgid "Conference"
-msgstr "Konferencja"
+#: gajim/gtk/discovery.py:129
+#, fuzzy
+msgid "Group Chat"
+msgstr "_Pokój"
 
-#: gajim/gtk/discovery.py:519
+#: gajim/gtk/discovery.py:518
 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:606
+#: gajim/gtk/discovery.py:605
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Przeglądanie usług przy użyciu konta %s"
 
-#: gajim/gtk/discovery.py:608
+#: gajim/gtk/discovery.py:607
 msgid "Service Discovery"
 msgstr "Przeglądanie usług"
 
-#: gajim/gtk/discovery.py:691
+#: gajim/gtk/discovery.py:690
 msgid "The service could not be found"
 msgstr "Nie można odnaleźć usługi"
 
-#: gajim/gtk/discovery.py:692
+#: gajim/gtk/discovery.py:691
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -8959,100 +9338,80 @@ msgstr ""
 "Pod wpisanym adresem nie ma żadnych usług lub one nie odpowiadają. Sprawdź "
 "adres i spróbuj ponownie."
 
-#: gajim/gtk/discovery.py:699 gajim/gtk/discovery.py:1042
+#: gajim/gtk/discovery.py:698 gajim/gtk/discovery.py:1041
 msgid "The service is not browsable"
 msgstr "Tej usługi nie można przeglądać"
 
-#: gajim/gtk/discovery.py:700
+#: gajim/gtk/discovery.py:699
 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:738 gajim/gtk/discovery.py:747
+#: gajim/gtk/discovery.py:737 gajim/gtk/discovery.py:746
 msgid "Invalid Server Name"
 msgstr "Niepoprawna nazwa serwera"
 
-#: gajim/gtk/discovery.py:806
+#: gajim/gtk/discovery.py:805
 #, 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:851
+#: gajim/gtk/discovery.py:850
 #, fuzzy
 msgid "Browse"
 msgstr "Prze_glądaj"
 
-#: gajim/gtk/discovery.py:1043
+#: gajim/gtk/discovery.py:1042
 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:1255
+#: gajim/gtk/discovery.py:1254
 #, fuzzy
 msgid "_Command"
 msgstr "Polecenia: %s"
 
-#: gajim/gtk/discovery.py:1264 gajim/gtk/discovery.py:1422
+#: gajim/gtk/discovery.py:1263 gajim/gtk/discovery.py:1420
 msgid "Re_gister"
 msgstr "Za_rejestruj"
 
-#: gajim/gtk/discovery.py:1277
+#: gajim/gtk/discovery.py:1276
 msgid "_Search"
 msgstr "_Szukaj"
 
-#: gajim/gtk/discovery.py:1420
+#: gajim/gtk/discovery.py:1418
 msgid "_Edit"
 msgstr "_Edycja"
 
-#: gajim/gtk/discovery.py:1458
+#: gajim/gtk/discovery.py:1456
 #, fuzzy, python-format
 msgid "Scanning %(current)d / %(total)d ..."
 msgstr "Skanowanie %(current)d / %(total)d.."
 
-#: gajim/gtk/discovery.py:1674
+#: gajim/gtk/discovery.py:1655
+msgid "Users"
+msgstr "Użytkownicy"
+
+#: gajim/gtk/discovery.py:1671
 msgid "Id"
 msgstr "Id"
 
-#: gajim/gtk/discovery.py:1713
-msgid "_Join"
-msgstr "_Dołącz"
-
-#: gajim/gtk/discovery.py:1736
-msgid "Bookmark already set"
-msgstr "Zakładka została już dodana"
-
-#: gajim/gtk/discovery.py:1737
-#, fuzzy, python-format
-msgid "Group Chat '%s' is already in your bookmarks."
-msgstr "Pokój \"%s\" jest już w Twoich zakładkach."
-
-#: gajim/gtk/discovery.py:1748
-msgid "Bookmark has been added successfully"
-msgstr "Zakładka została dodana"
-
-#: gajim/gtk/discovery.py:1749
-#, fuzzy
-msgid ""
-"You can manage your bookmarks by clicking the Bookmarks menu item in your "
-"contact list."
-msgstr "Możesz zarządzać zakładkami poprzez menu Działania w oknie kontaktów."
-
-#: gajim/gtk/discovery.py:1950
+#: gajim/gtk/discovery.py:1900
 msgid "Subscribed"
 msgstr "Zasubskrybowano"
 
-#: gajim/gtk/discovery.py:1959
+#: gajim/gtk/discovery.py:1909
 msgid "Node"
 msgstr "Węzeł"
 
-#: gajim/gtk/discovery.py:2028
+#: gajim/gtk/discovery.py:1978
 #, fuzzy
 msgid "_New post"
 msgstr "Nowy wpis"
 
-#: gajim/gtk/discovery.py:2037
+#: gajim/gtk/discovery.py:1987
 msgid "_Subscribe"
 msgstr "_Autoryzuj"
 
-#: gajim/gtk/discovery.py:2045
+#: gajim/gtk/discovery.py:1995
 msgid "_Unsubscribe"
 msgstr "_Cofnij autoryzację"
 
@@ -9099,7 +9458,7 @@ msgstr "Od %s"
 msgid "Characters typed: %s"
 msgstr "Niedozwolony znak"
 
-#: gajim/gtk/single_message.py:274 gajim/gtk/xml_console.py:169
+#: gajim/gtk/single_message.py:274 gajim/gtk/xml_console.py:166
 msgid "Connection not available"
 msgstr "Połączenie jest niedostępne"
 
@@ -9108,6 +9467,12 @@ msgstr "Połączenie jest niedostępne"
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Sprawdź, czy jesteś połączony z \"%s\"."
 
+#: gajim/gtk/single_message.py:306
+#, 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:330
 #, python-format
 msgid "RE: %s"
@@ -9118,21 +9483,21 @@ msgstr "RE: %s"
 msgid "%s wrote:\n"
 msgstr "%s napisał:\n"
 
-#: gajim/gtk/pep_config.py:44
+#: gajim/gtk/pep_config.py:45
 #, fuzzy, python-format
 msgid "PEP Service Configuration (%s)"
 msgstr "Konfiguracja usługi PEP"
 
-#: gajim/gtk/pep_config.py:77
+#: gajim/gtk/pep_config.py:78
 #, fuzzy
 msgid "Service"
 msgstr "Serwer"
 
-#: gajim/gtk/pep_config.py:114
+#: gajim/gtk/pep_config.py:115
 msgid "PEP node was not removed"
 msgstr "Węzeł PEP nie został usunięty"
 
-#: gajim/gtk/pep_config.py:115
+#: gajim/gtk/pep_config.py:116
 #, python-format
 msgid ""
 "PEP node %(node)s was not removed:\n"
@@ -9141,7 +9506,7 @@ msgstr ""
 "Węzeł PEP %(node)s nie został usunięty:\n"
 "%(message)s"
 
-#: gajim/gtk/pep_config.py:146
+#: gajim/gtk/pep_config.py:147
 #, fuzzy, python-format
 msgid "Configure %s"
 msgstr "Konfiguruj"
@@ -9157,17 +9522,21 @@ msgstr "Za_rejestruj"
 msgid "Registration successful"
 msgstr "Rejestracja zakończyła się sukcesem"
 
-#: gajim/gtk/dialogs.py:54 gajim/gtk/dataform.py:659 gajim/gtk/adhoc.py:85
+#: gajim/gtk/service_registration.py:215
+msgid "Registration failed"
+msgstr "Rejestracja nie powiodła się"
+
+#: gajim/gtk/dialogs.py:53 gajim/gtk/dataform.py:668 gajim/gtk/adhoc.py:86
 #, fuzzy
 msgid "Cancel"
 msgstr "_Anuluj"
 
-#: gajim/gtk/dialogs.py:129
+#: gajim/gtk/dialogs.py:128
 #, fuzzy, python-format
 msgid "Dictionary for language \"%s\" not available"
 msgstr "Brak słownika dla tego języka (%s)"
 
-#: gajim/gtk/dialogs.py:130
+#: gajim/gtk/dialogs.py:129
 #, python-format
 msgid ""
 "You have to install the dictionary \"%s\" to use spellchecking, or choose "
@@ -9180,11 +9549,11 @@ msgstr ""
 "\n"
 "Bez tego podświetlanie błędnie napisanych słów nie będzie działać."
 
-#: gajim/gtk/dialogs.py:410 gajim/gtk/dialogs.py:425
+#: gajim/gtk/dialogs.py:322 gajim/gtk/dialogs.py:337
 msgid "Insecure connection"
 msgstr "Niezabezpieczone połączenie"
 
-#: gajim/gtk/dialogs.py:411
+#: gajim/gtk/dialogs.py:323
 #, python-format
 msgid ""
 "You are about to connect to the account %(account)s (%(server)s) insecurely. "
@@ -9197,30 +9566,25 @@ msgstr ""
 "szyfrowane i jest zdecydowanie odradzane. \n"
 "Czy na pewno chcesz to zrobić?"
 
-#: gajim/gtk/dialogs.py:416
+#: gajim/gtk/dialogs.py:328
 msgid "Yes, I really want to connect insecurely"
 msgstr "Tak, na prawdę chce się połączyć w trybie niezaszyfrowanym"
 
-#: gajim/gtk/dialogs.py:417
+#: gajim/gtk/dialogs.py:329
 msgid "Gajim will NOT connect unless you check this box"
 msgstr "Gajim nie nawiąże połączenia, jeżeli nie będzie zaznaczone to pole"
 
-#: gajim/gtk/dialogs.py:675
-#, fuzzy
-msgid "The nickname contains invalid characters."
-msgstr "Używany przez ciebie pseudonim zawiera niedozwolone znaki."
-
-#: gajim/gtk/dialogs.py:734
+#: gajim/gtk/dialogs.py:561
 #, fuzzy, python-format
 msgid "Destroy %s"
 msgstr "Usuwam pokój %s"
 
-#: gajim/gtk/dialogs.py:775
+#: gajim/gtk/dialogs.py:602
 #, fuzzy
 msgid "Certificate"
 msgstr "Certyfikat klienta"
 
-#: gajim/gtk/dialogs.py:786
+#: gajim/gtk/dialogs.py:613
 #, python-format
 msgid ""
 "Certificate for account\n"
@@ -9229,91 +9593,91 @@ msgstr ""
 "Certyfikat dla konta\n"
 "%s"
 
-#: gajim/gtk/dialogs.py:824
+#: gajim/gtk/dialogs.py:651
 msgid "Issued to\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:825 gajim/gtk/dialogs.py:830
+#: gajim/gtk/dialogs.py:652 gajim/gtk/dialogs.py:657
 msgid "Common Name (CN): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:826 gajim/gtk/dialogs.py:831
+#: gajim/gtk/dialogs.py:653 gajim/gtk/dialogs.py:658
 msgid "Organization (O): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:827 gajim/gtk/dialogs.py:832
+#: gajim/gtk/dialogs.py:654 gajim/gtk/dialogs.py:659
 msgid "Organizational Unit (OU): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:828
+#: gajim/gtk/dialogs.py:655
 #, fuzzy
 msgid "Serial Number: "
 msgstr "Numer GG:"
 
-#: gajim/gtk/dialogs.py:829
+#: gajim/gtk/dialogs.py:656
 msgid "Issued by\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:833
+#: gajim/gtk/dialogs.py:660
 msgid "Validity\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:834
+#: gajim/gtk/dialogs.py:661
 msgid "Issued on: "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:835
+#: gajim/gtk/dialogs.py:662
 #, fuzzy
 msgid "Expires on: "
 msgstr "przedawnione"
 
-#: gajim/gtk/dialogs.py:836
+#: gajim/gtk/dialogs.py:663
 msgid "SHA-1:"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:838
+#: gajim/gtk/dialogs.py:665
 msgid "SHA-256:"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:852
+#: gajim/gtk/dialogs.py:679
 #, fuzzy
 msgid "View certificate…"
 msgstr "Pokaż certyfikat..."
 
-#: gajim/gtk/dialogs.py:864 gajim/gtk/accounts.py:893
+#: gajim/gtk/dialogs.py:691 gajim/gtk/accounts.py:896
 msgid "Change Password"
 msgstr "Zmień hasło"
 
-#: gajim/gtk/dialogs.py:878
+#: gajim/gtk/dialogs.py:705
 msgid "_OK"
 msgstr "_OK"
 
-#: gajim/gtk/dialogs.py:891
+#: gajim/gtk/dialogs.py:718
 #, fuzzy
 msgid "You must enter a password"
 msgstr "Musisz wpisać hasło."
 
-#: gajim/gtk/dialogs.py:895
+#: gajim/gtk/dialogs.py:722
 msgid "Passwords do not match"
 msgstr "Hasła nie zgadzają się"
 
-#: gajim/gtk/dialogs.py:923
+#: gajim/gtk/dialogs.py:750
 #, fuzzy
 msgid "Group Chat Invitation "
 msgstr "Zaproszenie na czat"
 
-#: gajim/gtk/dialogs.py:948
+#: gajim/gtk/dialogs.py:775
 #, python-format
 msgid "<b>%s</b> has invited you to join a discussion"
 msgstr "<b>%s</b> zaprasza cię do rozmowy"
 
-#: gajim/gtk/dialogs.py:951
+#: gajim/gtk/dialogs.py:778
 #, 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:959
+#: gajim/gtk/dialogs.py:786
 #, python-format
 msgid "Comment: %s"
 msgstr "Komentarz: %s"
@@ -9328,11 +9692,6 @@ msgstr "Numer GG:"
 msgid "ICQ Number"
 msgstr "Numer ICQ:"
 
-#: gajim/gtk/add_contact.py:40
-#, fuzzy
-msgid "Add Contact"
-msgstr "_Dodaj kontakt..."
-
 #: gajim/gtk/add_contact.py:259
 #, fuzzy, python-format
 msgid "%s Missing"
@@ -9353,7 +9712,8 @@ msgid "The user ID must not contain a resource."
 msgstr "ID użytkownika nie może zawierać zasobu."
 
 #: gajim/gtk/add_contact.py:299
-msgid "You cannot add yourself to your roster."
+#, fuzzy
+msgid "You cannot add yourself to your contact list."
 msgstr "Ty nie możesz dodać siebie do swojej listy kontaktów."
 
 #: gajim/gtk/add_contact.py:304
@@ -9366,11 +9726,13 @@ msgid "Your account must be online to add new contacts."
 msgstr ""
 
 #: gajim/gtk/add_contact.py:321
-msgid "Contact already in roster"
+#, fuzzy
+msgid "Contact Already in Contact List"
 msgstr "Kontakt jest już na liście kontaktów"
 
 #: gajim/gtk/add_contact.py:322
-msgid "This contact is already listed in your roster."
+#, fuzzy
+msgid "This contact is already in your contact list."
 msgstr "Ten kontakt znajduje się już na twojej liście kontaktów."
 
 #: gajim/gtk/add_contact.py:379 gajim/gtk/add_contact.py:417
@@ -9413,12 +9775,13 @@ msgid "Chatstate Paused"
 msgstr "Zmień status"
 
 #: gajim/gtk/themes.py:52
-msgid "MUC Tab New Directed Message"
+#, fuzzy
+msgid "Group Chat Tab New Directed Message"
 msgstr "Zakładka MUC Nowa Wiadomość Bezpośrednia"
 
 #: gajim/gtk/themes.py:56
 #, fuzzy
-msgid "MUC Tab New Message"
+msgid "Group Chat Tab New Message"
 msgstr "Nowa wiadomość"
 
 #: gajim/gtk/themes.py:60
@@ -9635,13 +9998,13 @@ msgstr "Wszystkie pliki"
 msgid "Clear File"
 msgstr "Sprzątam"
 
-#: gajim/gtk/settings.py:570
+#: gajim/gtk/settings.py:570 gajim/gtk/proxies.py:32
 #, fuzzy
 msgid "Manage Proxies"
 msgstr "Zarządzaj Profilami Proxy"
 
-#: gajim/gtk/settings.py:591 gajim/gtk/preferences.py:971
-#: gajim/gtk/preferences.py:984 gajim/gtk/preferences.py:988
+#: gajim/gtk/settings.py:591 gajim/gtk/preferences.py:968
+#: gajim/gtk/preferences.py:982 gajim/gtk/preferences.py:986
 #, fuzzy
 msgid "No Proxy"
 msgstr "Serwer Proxy:"
@@ -9720,13 +10083,15 @@ msgid ""
 "        "
 msgstr ""
 
-#: gajim/gtk/about.py:47 data/org.gajim.Gajim.appdata.xml.in:10
-msgid "A GTK+ XMPP client"
+#: gajim/gtk/about.py:47 data/org.gajim.Gajim.desktop.in:6
+#: data/org.gajim.Gajim.appdata.xml.in:10
+#, fuzzy
+msgid "A GTK XMPP client"
 msgstr "Klient Jabbera w GTK+"
 
 #: gajim/gtk/about.py:48
-#, python-format
-msgid "GTK+ Version: %s"
+#, fuzzy, python-format
+msgid "GTK Version: %s"
 msgstr "Wersja GTK+: %s"
 
 #: gajim/gtk/about.py:49
@@ -9911,6 +10276,25 @@ msgstr "?status transferu:wstrzymany"
 msgid "?transfer status:Not started"
 msgstr "?status transferu:wstrzymany"
 
+#: gajim/gtk/groupchat_creation.py:97 gajim/gtk/groupchat_creation.py:99
+msgid " (optional)..."
+msgstr ""
+
+#: gajim/gtk/groupchat_creation.py:134
+#, fuzzy
+msgid "Invalid Address"
+msgstr "Niepoprawny plik"
+
+#: gajim/gtk/groupchat_creation.py:182
+#, fuzzy
+msgid "Not Connected"
+msgstr "Połączony"
+
+#: gajim/gtk/groupchat_creation.py:183
+#, fuzzy
+msgid "You have to be connected to create a group chat."
+msgstr "Nie dołączyłeś do pokoju."
+
 #: gajim/gtk/sounds.py:39
 msgid "Wav Sounds"
 msgstr "Dźwięki w Wav"
@@ -9952,49 +10336,45 @@ msgstr "Podświetlenie wiadomości z czatu"
 msgid "Group Chat Message Received"
 msgstr "Otrzymano wiadomość na czacie"
 
-#: gajim/gtk/dataform.py:226 gajim/gtk/dataform.py:262
+#: gajim/gtk/dataform.py:232 gajim/gtk/dataform.py:268
 #, fuzzy
 msgid "Required"
 msgstr "wymagane"
 
-#: gajim/gtk/dataform.py:286
+#: gajim/gtk/dataform.py:293
 msgid "Yes"
 msgstr ""
 
-#: gajim/gtk/dataform.py:286
+#: gajim/gtk/dataform.py:293
 #, fuzzy
 msgid "No"
 msgstr "Żaden"
 
-#: gajim/gtk/dataform.py:661
+#: gajim/gtk/dataform.py:670
 msgid "Submit"
 msgstr ""
 
-#: gajim/gtk/statusicon.py:213
+#: gajim/gtk/statusicon.py:206
 #, fuzzy
 msgid "_Change Status Message…"
 msgstr "_Zmień opis statusu"
 
-#: gajim/gtk/statusicon.py:247 gajim/gtk/statusicon.py:292
-#: gajim/gtk/statusicon.py:299
+#: gajim/gtk/statusicon.py:258
 #, python-format
 msgid "using account %s"
 msgstr "używając konta %s"
 
-#: gajim/gtk/statusicon.py:309
+#: gajim/gtk/statusicon.py:269
 #, fuzzy
-msgid "_Manage Bookmarks…"
-msgstr "Zarządzaj zakładkami"
-
-#: gajim/gtk/statusicon.py:325
-msgid "Hide _Roster"
-msgstr "Ukryj _listę kontaktów"
+msgid "Hide _Contact List"
+msgstr "Zaproś kontakty"
 
-#: gajim/gtk/statusicon.py:329
-msgid "Show _Roster"
-msgstr "Pokaż _listę kontaktów"
+#: gajim/gtk/statusicon.py:273
+#, fuzzy
+msgid "Show _Contact List"
+msgstr "Pokaż kontakty _połączone"
 
-#: gajim/gtk/statusicon.py:337
+#: gajim/gtk/statusicon.py:281
 msgid "Hide this menu"
 msgstr "Ukryj to menu"
 
@@ -10039,36 +10419,6 @@ msgstr ""
 "W czasie publikowanie informacji o tobie wystąpił błąd, spróbuj ponownie "
 "później."
 
-#: gajim/gtk/join_groupchat.py:202
-#, fuzzy
-msgid "Invalid Room"
-msgstr "Niepoprawny pokój"
-
-#: gajim/gtk/join_groupchat.py:203
-msgid "Please choose a room"
-msgstr "Proszę wybrać pokój"
-
-#: gajim/gtk/join_groupchat.py:222 gajim/gtk/join_groupchat.py:229
-msgid "Invalid Nickname"
-msgstr "Niepoprawny pseudonim"
-
-#: gajim/gtk/join_groupchat.py:223
-#, fuzzy
-msgid "Please choose a nickname"
-msgstr "Proszę utworzyć nowy temat i nadać mu nazwę."
-
-#: gajim/gtk/join_groupchat.py:282 gajim/gtk/join_groupchat.py:288
-#: gajim/gtk/join_groupchat.py:293
-#, fuzzy
-msgid "Wrong server"
-msgstr "Błędny adres URI"
-
-#: gajim/gtk/join_groupchat.py:283 gajim/gtk/join_groupchat.py:289
-#: gajim/gtk/join_groupchat.py:294
-#, fuzzy, python-format
-msgid "%s is not a groupchat server"
-msgstr "To nie jest czat"
-
 #: gajim/gtk/mam_preferences.py:38
 #, python-format
 msgid "Archiving Preferences for %s"
@@ -10098,45 +10448,53 @@ msgstr "Odebrany błąd: {}"
 msgid "Archiving Preferences Error"
 msgstr "_Ustawienia"
 
-#: gajim/gtk/advanced_config.py:81
+#: gajim/gtk/advanced_config.py:95
 msgid "Activated"
 msgstr "Aktywny"
 
-#: gajim/gtk/advanced_config.py:81
+#: gajim/gtk/advanced_config.py:95
 msgid "Deactivated"
 msgstr "Nieaktywny"
 
-#: gajim/gtk/advanced_config.py:83
-msgid "Boolean"
-msgstr "Zmienna logiczna"
+#: gajim/gtk/advanced_config.py:97
+msgid "?config type:Boolean"
+msgstr ""
 
-#: gajim/gtk/advanced_config.py:84
-msgid "Integer"
-msgstr "Liczba całkowita"
+#: gajim/gtk/advanced_config.py:98
+msgid "?config type:Integer"
+msgstr ""
 
-#: gajim/gtk/advanced_config.py:85
-msgid "Text"
-msgstr "Tekst"
+#: gajim/gtk/advanced_config.py:99
+msgid "?config type:Text"
+msgstr ""
 
-#: gajim/gtk/advanced_config.py:97
-msgid "Preference Name"
+#: gajim/gtk/advanced_config.py:100
+msgid "?config type:Color"
+msgstr ""
+
+#: gajim/gtk/advanced_config.py:112
+#, fuzzy
+msgid "?config:Preference Name"
 msgstr "Nazwa opcji"
 
-#: gajim/gtk/advanced_config.py:104
-msgid "Value"
-msgstr "Wartość"
+#: gajim/gtk/advanced_config.py:123
+#, fuzzy
+msgid "?config:Value"
+msgstr "Konfiguruj"
 
-#: gajim/gtk/advanced_config.py:113
-msgid "Type"
-msgstr "Typ"
+#: gajim/gtk/advanced_config.py:132
+msgid "?config:Type"
+msgstr ""
 
-#: gajim/gtk/advanced_config.py:168
-msgid "(None)"
-msgstr "(Brak)"
+#: gajim/gtk/advanced_config.py:187
+#, fuzzy
+msgid "?config description:None"
+msgstr "?Poproś (o autoryzację): Brak"
 
-#: gajim/gtk/advanced_config.py:299
-msgid "Hidden"
-msgstr "Ukryte"
+#: gajim/gtk/advanced_config.py:322
+#, fuzzy
+msgid "?password:Hidden"
+msgstr "Hasło:"
 
 #: gajim/gtk/server_info.py:66
 #, fuzzy
@@ -10148,8 +10506,8 @@ msgstr "_Kopiuj adres odnośnika"
 msgid "%(days)s days, %(hours)s hours"
 msgstr ""
 
-#: gajim/gtk/server_info.py:218 gajim/gtk/accounts.py:749
-#: gajim/gtk/accounts.py:853
+#: gajim/gtk/server_info.py:218 gajim/gtk/accounts.py:752
+#: gajim/gtk/accounts.py:856
 #, fuzzy
 msgid "Hostname"
 msgstr "_Nazwa hosta: "
@@ -10344,11 +10702,6 @@ 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_config.py:41
-#, fuzzy
-msgid "Group Chat Configuration"
-msgstr "Zaproszenie na czat"
-
 #: gajim/gtk/groupchat_config.py:134
 #, fuzzy
 msgid "A Group Chat needs at least one Owner"
@@ -10359,69 +10712,69 @@ msgid "You are not allowed to modify the affiliation of Admins and Owners"
 msgstr ""
 
 #: gajim/gtk/groupchat_config.py:399
-msgid "An entry with this Jabber-ID already exists"
+msgid "An entry with this XMPP Address already exists"
 msgstr ""
 
-#: gajim/gtk/adhoc.py:91
+#: gajim/gtk/adhoc.py:92
 #, fuzzy
 msgid "Finish"
 msgstr "_Zakończ"
 
-#: gajim/gtk/adhoc.py:97 gajim/gtk/adhoc.py:283
+#: gajim/gtk/adhoc.py:98 gajim/gtk/adhoc.py:284
 #, fuzzy
 msgid "Commands"
 msgstr "Polecenia: %s"
 
-#: gajim/gtk/adhoc.py:103
+#: gajim/gtk/adhoc.py:104
 msgid "Next"
 msgstr ""
 
-#: gajim/gtk/adhoc.py:109
+#: gajim/gtk/adhoc.py:110
 #, fuzzy
 msgid "Previous"
 msgstr "Zawistny"
 
-#: gajim/gtk/adhoc.py:115
+#: gajim/gtk/adhoc.py:116
 #, fuzzy
 msgid "Execute"
 msgstr "_Wykonaj komendę"
 
-#: gajim/gtk/adhoc.py:195
+#: gajim/gtk/adhoc.py:196
 #, fuzzy
 msgid "No commands available"
 msgstr "Żadne konto nie jest dostępne"
 
-#: gajim/gtk/adhoc.py:244
+#: gajim/gtk/adhoc.py:245
 #, fuzzy
 msgid "Request Command List"
 msgstr "_Wykonaj komendę"
 
-#: gajim/gtk/adhoc.py:259
+#: gajim/gtk/adhoc.py:260
 #, fuzzy
 msgid "Executing…"
 msgstr "_Wykonaj komendę"
 
-#: gajim/gtk/adhoc.py:266
+#: gajim/gtk/adhoc.py:267
 #, fuzzy
 msgid "Command List"
 msgstr "Polecenia: %s"
 
-#: gajim/gtk/adhoc.py:384
+#: gajim/gtk/adhoc.py:385
 #, fuzzy
 msgid "Finished"
 msgstr "_Zakończ"
 
-#: gajim/gtk/adhoc.py:453
+#: gajim/gtk/adhoc.py:454
 #, fuzzy
 msgid "Execution failed"
 msgstr "Połączenie nie powiodło się"
 
-#: gajim/gtk/blocking.py:37
+#: gajim/gtk/blocking.py:38
 #, fuzzy, python-format
 msgid "Blocking List for %s"
 msgstr "Lista prywatności dla %s"
 
-#: gajim/gtk/blocking.py:71
+#: gajim/gtk/blocking.py:72
 #, fuzzy
 msgid "Error!"
 msgstr "Błąd"
@@ -10470,8 +10823,7 @@ msgstr "Niepoprawna nazwa użytkownika"
 msgid "You must provide a username to configure this account."
 msgstr "Musisz wpisać nazwę użytkownika aby skonfigurować to konto."
 
-#: gajim/gtk/account_wizard.py:252 gajim/gtk/bookmarks.py:290
-#: gajim/gtk/bookmarks.py:303
+#: gajim/gtk/account_wizard.py:252
 msgid "Invalid server"
 msgstr "Niepoprawna nazwa serwera"
 
@@ -10487,7 +10839,7 @@ msgstr "Niepoprawny wpis"
 msgid "Custom port must be a port number."
 msgstr "Wybrany port musi być numerem portu."
 
-#: gajim/gtk/account_wizard.py:405
+#: gajim/gtk/account_wizard.py:406
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -10502,15 +10854,15 @@ msgstr ""
 "Błąd SSL: %(error)s\n"
 "Czy nadal chcesz się połączyć z tym serwerem?"
 
-#: gajim/gtk/account_wizard.py:446 gajim/gtk/account_wizard.py:480
+#: gajim/gtk/account_wizard.py:447 gajim/gtk/account_wizard.py:481
 msgid "An error occurred during account creation"
 msgstr "Wystąpił błąd w trakcie tworzenia konta"
 
-#: gajim/gtk/account_wizard.py:545
+#: gajim/gtk/account_wizard.py:546
 msgid "Account name is in use"
 msgstr "Nazwa konta jest już zajęta"
 
-#: gajim/gtk/account_wizard.py:546
+#: gajim/gtk/account_wizard.py:547
 msgid "You already have an account using this name."
 msgstr "Masz już konto o takiej nazwie."
 
@@ -10539,24 +10891,24 @@ msgstr "Przesyłanie pliku %(filename)s od %(name)s zostało zatrzymane."
 msgid "%(minutes)s min %(seconds)s sec"
 msgstr ""
 
-#: gajim/gtk/xml_console.py:77
+#: gajim/gtk/xml_console.py:74
 msgid "Filter"
 msgstr "Filtr:"
 
-#: gajim/gtk/xml_console.py:82
+#: gajim/gtk/xml_console.py:79
 msgid "XML Input"
 msgstr "Wejście XML"
 
-#: gajim/gtk/xml_console.py:86
+#: gajim/gtk/xml_console.py:83
 msgid "Paste Last Input"
 msgstr ""
 
-#: gajim/gtk/xml_console.py:170
+#: gajim/gtk/xml_console.py:167
 #, fuzzy, python-format
 msgid "Please make sure you are connected with '%s'."
 msgstr "Sprawdź, czy jesteś połączony z \"%s\"."
 
-#: gajim/gtk/xml_console.py:182
+#: gajim/gtk/xml_console.py:177
 #, fuzzy
 msgid "Invalid Node"
 msgstr "Niepoprawny plik"
@@ -10589,39 +10941,54 @@ msgstr "Szukaj"
 msgid "No results found"
 msgstr "Brak wyników"
 
-#: gajim/gtk/preferences.py:358 gajim/gtk/preferences.py:362
+#: gajim/gtk/preferences.py:357 gajim/gtk/preferences.py:361
 msgid "Default"
 msgstr "Domyślny"
 
-#: gajim/gtk/preferences.py:801
+#: gajim/gtk/preferences.py:798
 msgid "status message title"
 msgstr "nagłówek informacji o statusie"
 
-#: gajim/gtk/preferences.py:802
+#: gajim/gtk/preferences.py:799
 msgid "status message text"
 msgstr "treść informacji o statusie"
 
+#: gajim/gtk/accounts.py:137
+#, fuzzy
+msgid "Re-Login"
+msgstr "Czy zalogować się ponownie?"
+
 #: gajim/gtk/accounts.py:138
-msgid "Relogin now?"
+#, fuzzy
+msgid "Re-Login now?"
 msgstr "Czy zalogować się ponownie?"
 
 #: gajim/gtk/accounts.py:139
-msgid "If you want all the changes to apply instantly, you must relogin."
+#, 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:191 gajim/gtk/accounts.py:975
+#: gajim/gtk/accounts.py:141
+msgid "_Later"
+msgstr ""
+
+#: gajim/gtk/accounts.py:143
+msgid "_Re-Login"
+msgstr ""
+
+#: gajim/gtk/accounts.py:194 gajim/gtk/accounts.py:978
 #, fuzzy
 msgid "Remove Account"
 msgstr "Usuwanie konta %s"
 
-#: gajim/gtk/accounts.py:192
+#: gajim/gtk/accounts.py:195
 #, fuzzy, python-format
 msgid "You still have open chats in your account %s"
 msgstr "Masz otwarte okno rozmowy na koncie %s"
 
-#: gajim/gtk/accounts.py:193
+#: gajim/gtk/accounts.py:196
 msgid ""
 "All chat and group chat windows will be closed.\n"
 "Do you want to continue?"
@@ -10629,117 +10996,117 @@ msgstr ""
 "Wszystkie otwarte zakładki rozmów i czatów zostaną zamknięte. \n"
 "Kontynuować?"
 
-#: gajim/gtk/accounts.py:424
+#: gajim/gtk/accounts.py:427
 #, fuzzy
 msgid "Back"
 msgstr "Niedługo wrócę"
 
-#: gajim/gtk/accounts.py:530
+#: gajim/gtk/accounts.py:533
 #, fuzzy
 msgid "Please check if Bonjour is installed."
 msgstr "Proszę sprawdzić czy zainstalowano Avahi lub Bonjour"
 
-#: gajim/gtk/accounts.py:532
+#: gajim/gtk/accounts.py:535
 #, fuzzy
 msgid "Please check if Avahi is installed."
 msgstr "Proszę sprawdzić czy zainstalowano Avahi lub Bonjour"
 
-#: gajim/gtk/accounts.py:569
+#: gajim/gtk/accounts.py:572
 #, fuzzy
 msgid "Disable Account"
 msgstr "Niepoprawne konto"
 
-#: gajim/gtk/accounts.py:570
+#: gajim/gtk/accounts.py:573
 #, fuzzy, python-format
 msgid "Account %s is still connected"
 msgstr "Konto \"%s\" jest połączone z serwerem."
 
-#: gajim/gtk/accounts.py:571
+#: gajim/gtk/accounts.py:574
 #, fuzzy
 msgid ""
 "All chat and group chat windows will be closed. Do you want to continue?"
 msgstr ""
 "Wszystkie otwarte zakładki rozmów i czatów zostaną zamknięte. Kontynuować?"
 
-#: gajim/gtk/accounts.py:576
+#: gajim/gtk/accounts.py:579
 #, fuzzy
 msgid "_Disable Account"
 msgstr "Niepoprawne konto"
 
-#: gajim/gtk/accounts.py:595
+#: gajim/gtk/accounts.py:598
 #, fuzzy
 msgid "Add Account"
 msgstr "_Dodaj kontakt..."
 
-#: gajim/gtk/accounts.py:663
+#: gajim/gtk/accounts.py:666
 msgid "Label"
 msgstr ""
 
-#: gajim/gtk/accounts.py:667
+#: gajim/gtk/accounts.py:670
 msgid "Login"
 msgstr ""
 
-#: gajim/gtk/accounts.py:670
+#: gajim/gtk/accounts.py:673
 #, fuzzy
 msgid "Import Contacts"
 msgstr "Zaproś kontakty"
 
-#: gajim/gtk/accounts.py:674 gajim/gtk/accounts.py:870
+#: gajim/gtk/accounts.py:677 gajim/gtk/accounts.py:873
 #, fuzzy
 msgid "Client Certificate"
 msgstr "Certyfikat klienta"
 
-#: gajim/gtk/accounts.py:677 gajim/gtk/accounts.py:774
+#: gajim/gtk/accounts.py:680 gajim/gtk/accounts.py:777
 #, fuzzy
 msgid "Connect on startup"
 msgstr "P_ołącz przy starcie programu"
 
-#: gajim/gtk/accounts.py:681 gajim/gtk/accounts.py:779
+#: gajim/gtk/accounts.py:684 gajim/gtk/accounts.py:782
 #, fuzzy
 msgid "Save conversations for all contacts"
 msgstr "Zapisz _logi rozmów dla wszystkich kontaktów"
 
-#: gajim/gtk/accounts.py:683 gajim/gtk/accounts.py:781
+#: gajim/gtk/accounts.py:686 gajim/gtk/accounts.py:784
 msgid "Store conversations on the harddrive"
 msgstr ""
 
-#: gajim/gtk/accounts.py:685 gajim/gtk/accounts.py:783
+#: gajim/gtk/accounts.py:688 gajim/gtk/accounts.py:786
 #, fuzzy
 msgid "Global Status"
 msgstr "Dowolny status"
 
-#: gajim/gtk/accounts.py:687
+#: gajim/gtk/accounts.py:690
 #, fuzzy
 msgid "Synchronise the status of all accounts"
 msgstr "Zmienia status kont lub kont"
 
-#: gajim/gtk/accounts.py:689
+#: gajim/gtk/accounts.py:692
 msgid "Use file transfer proxies"
 msgstr "Używaj serwerów proxy do przesyłania plików"
 
-#: gajim/gtk/accounts.py:705
+#: gajim/gtk/accounts.py:708
 #, fuzzy
 msgid "Idle Time"
 msgstr "Bezczynny od %s"
 
-#: gajim/gtk/accounts.py:707
+#: gajim/gtk/accounts.py:710
 msgid "Disclose the time of your last activity"
 msgstr ""
 
-#: gajim/gtk/accounts.py:709
+#: gajim/gtk/accounts.py:712
 msgid "Local System Time"
 msgstr ""
 
-#: gajim/gtk/accounts.py:711
+#: gajim/gtk/accounts.py:714
 msgid "Disclose the local system time of the device Gajim runs on"
 msgstr ""
 
-#: gajim/gtk/accounts.py:714
+#: gajim/gtk/accounts.py:717
 #, fuzzy
 msgid "Client / Operating System"
 msgstr "Certyfikat klienta"
 
-#: gajim/gtk/accounts.py:716
+#: gajim/gtk/accounts.py:719
 #, fuzzy
 msgid ""
 "Disclose informations about the client and operating system you currently use"
@@ -10747,150 +11114,145 @@ msgstr ""
 "Zaznaczenie tej opcji umożliwi innym wykrywanie jakiego systemu operacyjnego "
 "używasz"
 
-#: gajim/gtk/accounts.py:719
+#: gajim/gtk/accounts.py:722
 #, fuzzy
 msgid "Ignore Unknown Contacts"
 msgstr "Zaproś kontakty"
 
-#: gajim/gtk/accounts.py:721
+#: gajim/gtk/accounts.py:724
 #, 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:737 gajim/gtk/accounts.py:776
+#: gajim/gtk/accounts.py:740 gajim/gtk/accounts.py:779
 #, fuzzy
 msgid "Use environment variable"
 msgstr "_używaj zmiennej środowiskowej HTTP__PROXY"
 
-#: gajim/gtk/accounts.py:739
-#, fuzzy
-msgid "Proxy"
-msgstr "Serwer Proxy:"
-
-#: gajim/gtk/accounts.py:742
+#: gajim/gtk/accounts.py:745
 #, fuzzy
 msgid "Warn on insecure connection"
 msgstr "_Ostrzegaj przed użyciem niezaszyfrowanego połączenia"
 
-#: gajim/gtk/accounts.py:746
+#: gajim/gtk/accounts.py:749
 msgid "Send keep-alive packets"
 msgstr "Wysyłaj pakiety podtrzymujące"
 
-#: gajim/gtk/accounts.py:750
+#: gajim/gtk/accounts.py:753
 msgid "Manually set the hostname for the server"
 msgstr ""
 
-#: gajim/gtk/accounts.py:756 gajim/gtk/accounts.py:826
-#: gajim/gtk/accounts.py:831
+#: gajim/gtk/accounts.py:759 gajim/gtk/accounts.py:829
+#: gajim/gtk/accounts.py:834
 #, fuzzy
 msgid "Priority"
 msgstr "Priory_tet:"
 
-#: gajim/gtk/accounts.py:785
+#: gajim/gtk/accounts.py:788
 #, fuzzy
 msgid "Synchronize the status of all accounts"
 msgstr "Zmienia status kont lub kont"
 
-#: gajim/gtk/accounts.py:795
+#: gajim/gtk/accounts.py:798
 #, fuzzy
 msgid "First Name"
 msgstr "Imię:"
 
-#: gajim/gtk/accounts.py:798
+#: gajim/gtk/accounts.py:801
 #, fuzzy
 msgid "Last Name"
 msgstr "Nazwisko:"
 
-#: gajim/gtk/accounts.py:804
+#: gajim/gtk/accounts.py:807
 #, fuzzy
 msgid "Email"
 msgstr "Nowy adres e-mail"
 
-#: gajim/gtk/accounts.py:822
+#: gajim/gtk/accounts.py:825
 #, fuzzy
 msgid "Adjust to status"
 msgstr "_Dostosuj do statusu"
 
-#: gajim/gtk/accounts.py:849
+#: gajim/gtk/accounts.py:852
 msgid "Enable"
 msgstr "Włącz"
 
-#: gajim/gtk/accounts.py:857
+#: gajim/gtk/accounts.py:860
 #, fuzzy
 msgid "Port"
 msgstr "_Port:"
 
-#: gajim/gtk/accounts.py:862
+#: gajim/gtk/accounts.py:865
 #, fuzzy
 msgid "Connection Settings"
 msgstr "Połączenie"
 
-#: gajim/gtk/accounts.py:872
+#: gajim/gtk/accounts.py:875
 msgid "PKCS12 Files"
 msgstr "Pliki PKCS12"
 
-#: gajim/gtk/accounts.py:874
+#: gajim/gtk/accounts.py:877
 #, fuzzy
 msgid "Encrypted Certificate"
 msgstr "Certyfikat klienta"
 
-#: gajim/gtk/accounts.py:878
+#: gajim/gtk/accounts.py:881
 #, fuzzy
 msgid "Certificate Settings"
 msgstr "Certyfikat klienta"
 
-#: gajim/gtk/accounts.py:890
+#: gajim/gtk/accounts.py:893
 #, fuzzy
 msgid "Save Password"
 msgstr "Zapisz hasło"
 
-#: gajim/gtk/accounts.py:898
+#: gajim/gtk/accounts.py:901
 #, fuzzy
 msgid "Login Settings"
 msgstr "Wtyczki"
 
-#: gajim/gtk/accounts.py:931
+#: gajim/gtk/accounts.py:934
 #, fuzzy, python-format
 msgid "Removing account %s"
 msgstr "Usuwanie konta %s"
 
-#: gajim/gtk/accounts.py:946
+#: gajim/gtk/accounts.py:949
 msgid "Account is disabled"
 msgstr "Konto jest wyłączone"
 
-#: gajim/gtk/accounts.py:947
+#: gajim/gtk/accounts.py:950
 #, fuzzy
 msgid "To unregister from a server, the account must be enabled."
 msgstr "Aby wyrejestrować się z serwera, konto musi być włączone."
 
-#: gajim/gtk/accounts.py:962
+#: gajim/gtk/accounts.py:965
 #, fuzzy
 msgid "Password required"
 msgstr "Hasło wymagane"
 
-#: gajim/gtk/accounts.py:976
+#: gajim/gtk/accounts.py:979
 #, fuzzy, python-format
 msgid "Account '%s' is still connected to the server"
 msgstr "Konto \"%s\" jest połączone z serwerem."
 
-#: gajim/gtk/accounts.py:978
+#: gajim/gtk/accounts.py:981
 msgid "If you remove it, the connection will be lost."
 msgstr "Jeśli to usuniesz, połączenie zostanie zerwane."
 
-#: gajim/gtk/accounts.py:995
+#: gajim/gtk/accounts.py:998
 #, python-format
 msgid "Connection to server %s failed"
 msgstr "Połączenie z serwerem %s nie powiodło się"
 
-#: gajim/gtk/accounts.py:996
+#: gajim/gtk/accounts.py:999
 msgid "What would you like to do?"
 msgstr "Co zrobić?"
 
-#: gajim/gtk/accounts.py:997
+#: gajim/gtk/accounts.py:1000
 msgid "Remove only from Gajim"
 msgstr "Usuń tylko z Gajima"
 
-#: gajim/gtk/accounts.py:998
+#: gajim/gtk/accounts.py:1001
 msgid "Don't remove anything. I'll try again later"
 msgstr "Nic nie usuwaj. Spróbuję ponownie później"
 
@@ -10913,6 +11275,10 @@ msgstr "<b>%s</b> chciałby usunąć kontakty z Twojej listy kontaktów."
 msgid "Modify"
 msgstr "Edytuj"
 
+#: gajim/gtk/roster_item_exchange.py:80
+msgid "JID"
+msgstr "JID"
+
 #: gajim/gtk/roster_item_exchange.py:86
 msgid "Groups"
 msgstr "Grupy"
@@ -10938,19 +11304,19 @@ msgstr[0] "Usunięto %s z kontaktów"
 msgstr[1] "Usunięto %s z kontaktów"
 msgstr[2] "Usunięto %s z kontaktów"
 
-#: gajim/gtk/util.py:581
+#: gajim/gtk/util.py:583
 msgid "Unknown Artist"
 msgstr "Nieznany wykonawca"
 
-#: gajim/gtk/util.py:582
+#: gajim/gtk/util.py:584
 msgid "Unknown Title"
 msgstr "Nieznany tytuł"
 
-#: gajim/gtk/util.py:583
+#: gajim/gtk/util.py:585
 msgid "Unknown Source"
 msgstr "Nieznany album"
 
-#: gajim/gtk/util.py:585
+#: gajim/gtk/util.py:587
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
@@ -10959,27 +11325,10 @@ msgstr ""
 "<b>\"%(title)s\"</b> w wykonaniu <i>%(artist)s</i>\n"
 "z <i>%(source)s</i>"
 
-#: gajim/gtk/bookmarks.py:121
-msgid "New Group Chat"
-msgstr "Nowa rozmowa grupowa"
-
-#: gajim/gtk/bookmarks.py:161
-msgid "This bookmark has invalid data"
-msgstr "Ta zakładka zawiera niepoprawne dane"
-
-#: gajim/gtk/bookmarks.py:162
-msgid ""
-"Please be sure to fill out server and room fields or remove this bookmark."
-msgstr "Upewnij się, że wypełniłeś pola serwer i pokój lub usuń tę zakładkę."
-
-#: gajim/gtk/bookmarks.py:273 gajim/gtk/bookmarks.py:291
-#: gajim/gtk/bookmarks.py:304 gajim/gtk/bookmarks.py:335
-msgid "Character not allowed"
-msgstr "Niedozwolony znak"
-
-#: gajim/gtk/bookmarks.py:334
-msgid "Invalid room"
-msgstr "Niepoprawny pokój"
+#: gajim/gtk/bookmarks.py:47
+#, fuzzy, python-format
+msgid "Bookmarks for %s"
+msgstr "Zakładki"
 
 #: gajim/plugins/pluginmanager.py:736 gajim/plugins/pluginmanager.py:742
 msgid "Archive corrupted"
@@ -10991,52 +11340,55 @@ msgid "Archive empty"
 msgstr "Plik jest pusty"
 
 #: gajim/plugins/pluginmanager.py:750 gajim/plugins/pluginmanager.py:758
-#: gajim/plugins/gui.py:257
+#: gajim/plugins/gui.py:258
 #, fuzzy
 msgid "Archive is malformed"
 msgstr "Usługa wysłała niepoprawne dane"
 
-#: gajim/plugins/pluginmanager.py:766 gajim/plugins/gui.py:281
-#: gajim/plugins/gui.py:289
+#: gajim/plugins/pluginmanager.py:766 gajim/plugins/gui.py:288
+#: gajim/plugins/gui.py:301
 #, fuzzy
 msgid "Plugin already exists"
 msgstr "Ten plik już istnieje"
 
-#: gajim/plugins/gui.py:82
+#: gajim/plugins/gui.py:83
 msgid "Click to view Gajim's wiki page on how to install plugins in Flatpak."
 msgstr ""
 
-#: gajim/plugins/gui.py:89
+#: gajim/plugins/gui.py:90
 #, fuzzy
 msgid "Plugin"
 msgstr "_Wtyczki"
 
-#: gajim/plugins/gui.py:151
+#: gajim/plugins/gui.py:152
 #, fuzzy, python-format
 msgid "Warning: %s"
 msgstr "Zabanuj %s"
 
-#: gajim/plugins/gui.py:206
+#: gajim/plugins/gui.py:207
 #, fuzzy
 msgid "Plugin failed"
 msgstr "Rejestracja nie powiodła się"
 
-#: gajim/plugins/gui.py:245
+#: gajim/plugins/gui.py:246
 msgid "Unable to properly remove the plugin"
 msgstr "Nie można poprawnie usunąć wtyczki"
 
-#: gajim/plugins/gui.py:281
-msgid "Overwrite?"
+#: gajim/plugins/gui.py:287
+#, fuzzy
+msgid "Overwrite Plugin?"
 msgstr "Nadpisać?"
 
+#: gajim/plugins/gui.py:289
+#, fuzzy
+msgid "Do you want to overwrite the currently installed version?"
+msgstr "Czy chcesz zaakceptować zaproszenie?"
+
 #: data/org.gajim.Gajim.desktop.in:5
-msgid "Jabber IM Client"
+#, fuzzy
+msgid "XMPP IM Client"
 msgstr "Klient komunikatora Jabber"
 
-#: data/org.gajim.Gajim.desktop.in:6
-msgid "A GTK+ Jabber client"
-msgstr "Klient Jabbera w GTK+"
-
 #: data/org.gajim.Gajim.desktop.in:8
 msgid "chat;messaging;im;xmpp;bonjour;voip;"
 msgstr ""
@@ -11088,7 +11440,7 @@ msgid "Easily send pictures, videos or other files to friends and groups"
 msgstr ""
 
 #: data/org.gajim.Gajim.appdata.xml.in:27
-msgid "Chat securely with End-to-End encryption via OMEMO or PGP"
+msgid "Chat securely with End-to-End encryption via OMEMO or OpenPGP"
 msgstr ""
 
 #: data/org.gajim.Gajim.appdata.xml.in:28
@@ -11150,7 +11502,7 @@ msgstr ""
 
 #: data/org.gajim.Gajim.appdata.xml.in:52
 #, fuzzy
-msgid "Roster, list of contacts"
+msgid "Contact list, list of contacts"
 msgstr "_Zapisuj w logach zmiany statusów kontaktów"
 
 #: data/org.gajim.Gajim.appdata.xml.in:56
@@ -11172,6 +11524,553 @@ msgstr "Ostatnio:"
 msgid "Plugin manager"
 msgstr "Rejestracja nie powiodła się"
 
+#, fuzzy
+#~ msgid "Configure Services…"
+#~ msgstr "Konfiguruj Usługi..."
+
+#, fuzzy
+#~ msgid "Group Chat Bookmarks"
+#~ msgstr "Pokój"
+
+#, fuzzy
+#~ msgid "Add Bookmark"
+#~ msgstr "Dodaj _zakładkę dla tego pokoju"
+
+#, fuzzy
+#~ msgid "Remove Bookmark"
+#~ msgstr "Dodaj _zakładkę dla tego pokoju"
+
+#, fuzzy
+#~ msgid "Bookmark Name"
+#~ msgstr "_Dodaj zakładkę do tego pokoju"
+
+#, fuzzy
+#~ msgid "_Server"
+#~ msgstr "_Serwer:"
+
+#, fuzzy
+#~ msgid "Roo_m"
+#~ msgstr "_Pokój"
+
+#, fuzzy
+#~ msgid "_Password"
+#~ msgstr "_Hasło:"
+
+#, fuzzy
+#~ msgid "Join chat when connected"
+#~ msgstr "Kontakt rozłączył się"
+
+#~ msgid "New Group Chat"
+#~ msgstr "Nowa rozmowa grupowa"
+
+#~ msgid "This bookmark has invalid data"
+#~ msgstr "Ta zakładka zawiera niepoprawne dane"
+
+#, fuzzy
+#~ msgid ""
+#~ "Please be sure to fill out server and group chat fields or remove this "
+#~ "bookmark."
+#~ msgstr ""
+#~ "Upewnij się, że wypełniłeś pola serwer i pokój lub usuń tę zakładkę."
+
+#~ msgid "Character not allowed"
+#~ msgstr "Niedozwolony znak"
+
+#, fuzzy
+#~ msgid "Invalid Group Chat"
+#~ msgstr "Niepoprawny Jabber ID"
+
+#~ msgid "Unable to join group chat"
+#~ msgstr "Nie można dołączyć do pokoju"
+
+#~ msgid "You are banned from group chat <b>%s</b>."
+#~ msgstr "Zostałeś zbanowany w pokoju <b>%s</b>."
+
+#~ msgid "Remote server <b>%s</b> does not exist."
+#~ msgstr "Serwer zdalny <b>%s</b> nie istnieje"
+
+#~ msgid "Group chat <b>%s</b> does not exist."
+#~ msgstr "Pokój <b>%s</b> nie istnieje."
+
+#, fuzzy
+#~ msgid "Group chat creation is not permitted."
+#~ msgstr "Tworzenie pokoi jest ograniczone."
+
+#~ msgid "You must use your registered nickname in <b>%s</b>."
+#~ msgstr "Twój zarejestrowany pseudonim musi być używany w pokoju <b>%s</b>."
+
+#, fuzzy
+#~ msgid "You are not in the members list in group chat %s."
+#~ msgstr "Nie jesteś na liście uczestników rozmów w pokoju %s."
+
+#, fuzzy
+#~ msgid "XMPP Address is not a group chat"
+#~ msgstr "To nie jest czat"
+
+#~ msgid "This is not a group chat"
+#~ msgstr "To nie jest czat"
+
+#, fuzzy
+#~ msgid ""
+#~ "%(room_jid)s is already in your contact list. Please check if "
+#~ "%(room_jid)s is a correct group chat name. If it is, delete it from your "
+#~ "contact list and try joining the group chat again."
+#~ msgstr ""
+#~ "%(room_jid)s już jest w Twoim rosterze. Sprawdź, czy %(room_jid)s jest "
+#~ "poprawną nazwą dla czatu grupowego. Jeżeli tak, skasuj go z rostera i "
+#~ "spróbuj ponownie dołączyć."
+
+#, fuzzy
+#~ msgid "Please choose a group chat"
+#~ msgstr "Proszę wybrać pokój"
+
+#~ msgid "Invalid Nickname"
+#~ msgstr "Niepoprawny pseudonim"
+
+#, fuzzy
+#~ msgid "Please choose a nickname"
+#~ msgstr "Proszę utworzyć nowy temat i nadać mu nazwę."
+
+#, fuzzy
+#~ msgid "Wrong server"
+#~ msgstr "Błędny adres URI"
+
+#, fuzzy
+#~ msgid "%s is not a group chat server"
+#~ msgstr "To nie jest czat"
+
+#, fuzzy
+#~ msgid ""
+#~ "How many lines to request from server when entering a group chat. -1 "
+#~ "means no limit."
+#~ msgstr ""
+#~ "Ile linii żądać od serwera przy dołączaniu do czatu grupowego. -1 oznacza "
+#~ "brak limitu"
+
+#, fuzzy
+#~ msgid ""
+#~ "Minutes of backlog to request when entering a group chat. -1 means no "
+#~ "limit."
+#~ msgstr ""
+#~ "Ile minut backloga żądać przy dołączania do czatu grupowego. -1 oznacza "
+#~ "brak limitu"
+
+#, fuzzy
+#~ msgid ""
+#~ "How many lines to request from server when entering a group chat. -1 "
+#~ "means no limit, -2 means global value."
+#~ msgstr ""
+#~ "Ile linii żądać od serwera przy dołączaniu do czatu grupowego. -1 oznacza "
+#~ "brak limitu"
+
+#, fuzzy
+#~ msgid ""
+#~ "Minutes of backlog to request when entering a group chat. -1 means no "
+#~ "limit, -2 means global value."
+#~ msgstr ""
+#~ "Ile minut backloga żądać przy dołączania do czatu grupowego. -1 oznacza "
+#~ "brak limitu"
+
+#, fuzzy
+#~ msgid "A Password is required to join the group chat %s. Please type it."
+#~ msgstr "Aby dołączyć do pokoju %s wymagane jest hasło. Proszę je wpisać"
+
+#~ msgid "Not in Roster"
+#~ msgstr "spoza listy kontaktów"
+
+#~ msgid "I would like to add you to my roster"
+#~ msgstr "Chciałbym dodać Cię do listy kontaktów"
+
+#~ msgid "Add to Roster"
+#~ msgstr "Dodaj do listy kontaktów"
+
+#, fuzzy
+#~ msgid "Audio Session"
+#~ msgstr "Test audio"
+
+#, fuzzy
+#~ msgid "Video Session"
+#~ msgstr "Video test"
+
+#, fuzzy
+#~ msgid "Manage Room"
+#~ msgstr "Zarządzaj pokojem"
+
+#, fuzzy
+#~ msgid "Configure Room"
+#~ msgstr "Konfiguruj _pokój..."
+
+#, fuzzy
+#~ msgid "Destroy Room"
+#~ msgstr "_Zlikwiduj pokój"
+
+#, fuzzy
+#~ msgid "Change Nick"
+#~ msgstr "Zmień pseudo_nim..."
+
+#, fuzzy
+#~ msgid "Disconnect"
+#~ msgstr "_Rozłącz"
+
+#~ msgid "Copy JID"
+#~ msgstr "Kopiuj JID"
+
+#, fuzzy
+#~ msgid "Add to Roster…"
+#~ msgstr "Dodaj do listy kontaktów"
+
+#, fuzzy
+#~ msgid "Copy JID/Email"
+#~ msgstr "_Kopiuj JID/Adres e-mail"
+
+#, fuzzy
+#~ msgid "JID: <i>%s</i>"
+#~ msgstr "JID : <i>%s</i>"
+
+#~ msgid "Changing Subject"
+#~ msgstr "Zmiana tematu"
+
+#~ msgid "Please specify the new subject:"
+#~ msgstr "Wpisz nowy temat:"
+
+#~ msgid "Room logging is now enabled"
+#~ msgstr "Logowanie rozmów prowadzonych w pokoju jest teraz włączone"
+
+#~ msgid "Room logging is now disabled"
+#~ msgstr "Logowanie rozmów prowadzonych w pokoju jest teraz wyłączone"
+
+#, fuzzy
+#~ msgid "You (%s) joined the room"
+#~ msgstr "%s dołączył do pokoju"
+
+#~ msgid "Room logging is enabled"
+#~ msgstr "Zapisywanie rozmów prowadzonych w pokoju jest włączone"
+
+#, fuzzy
+#~ msgid "Unable to join groupchat"
+#~ msgstr "Nie można dołączyć do pokoju"
+
+#~ msgid "Groupchat Invitation"
+#~ msgstr "Zaproszenie na czat"
+
+#~ msgid "%(jid)s has been invited in this room"
+#~ msgstr "%(jid)s został zaproszony w tym pokoju"
+
+#, fuzzy
+#~ msgid "JID is not a Groupchat"
+#~ msgstr "To nie jest czat"
+
+#~ msgid "Invalid JID"
+#~ msgstr "Niepoprawny JID"
+
+#~ msgid "A connection is not available"
+#~ msgstr "Połączenie jest niemożliwe"
+
+#, fuzzy
+#~ msgid "JID already in list"
+#~ msgstr "Ten JID jest już na liście"
+
+#~ msgid "Unsecure"
+#~ msgstr "Niezabezpieczone"
+
+#, fuzzy
+#~ msgid "For the chosen encryption there is no encryption method available"
+#~ msgstr "Połączenie jest niemożliwe"
+
+#~ msgid "Removes contact from roster"
+#~ msgstr "Usuwa kontakt z listy kontaktów"
+
+#~ msgid "Not in roster"
+#~ msgstr "Spoza listy kontaktów"
+
+#, fuzzy
+#~ msgid "Contact signed in notification color."
+#~ msgstr "_Pokaż zdarzenie w obszarze powiadomienia"
+
+#, fuzzy
+#~ msgid "Contact signout notification color"
+#~ msgstr "_Pokaż zdarzenie w obszarze powiadomienia"
+
+#, fuzzy
+#~ msgid "File transfer request notification color."
+#~ msgstr "Pytanie o przysłanie pliku"
+
+#, fuzzy
+#~ msgid "File transfer error notification color."
+#~ msgstr "Przesyłanie pliku anulowane"
+
+#, fuzzy
+#~ msgid "File transfer complete or stopped notification color."
+#~ msgstr "Gdy plik w całości zostanie przesłany, wyświetl okno powiadomienia"
+
+#, fuzzy
+#~ msgid "Groupchat invitation notification color"
+#~ msgstr "Zaproszenie na czat"
+
+#~ msgid "Other dialogs color."
+#~ msgstr "Kolory innych teskstów."
+
+#~ msgid "Add * and [n] in roster title?"
+#~ msgstr "Dodać * i [n] do tytułu listy kontaktów?"
+
+#~ msgid "Hides the banner in two persons chat window"
+#~ msgstr "Usuwa banner podczas rozmowy dwóch osób"
+
+#, fuzzy
+#~ msgid ""
+#~ "Show the confirm metacontacts creation dialog or not? Empty string means "
+#~ "never show the dialog."
+#~ msgstr ""
+#~ "Czy program powinien potwierdzać za każdym razem utworzenie metakontaktu? "
+#~ "Pusty ciąg spowoduje, że okno dialogowe nie będzie wyświetlane."
+
+#~ msgid "If true, You will also see your webcam"
+#~ msgstr "Jeżeli Prawda, będziesz widział obraz ze swojej kamery"
+
+#~ msgid "Space separated list of ssl errors to ignore."
+#~ msgstr ""
+#~ "Lista błędów (rozdzielona spacjami) zawierająca wykaz błędów ssl, które "
+#~ "program będzie ignorował."
+
+#~ msgid "Answer to receipt requests"
+#~ msgstr "Odpowiedź na żądanie potwierdzenia"
+
+#~ msgid "Sent receipt requests"
+#~ msgstr "Wyślij żądanie potwierdzenia"
+
+#, fuzzy
+#~ msgid "Language for which misspelled words will be checked"
+#~ msgstr "Język, którego używa słownik przy sprawdzaniu pisowni"
+
+#~ msgid "I'm eating, so leave me a message."
+#~ msgstr "Jem. Zostaw wiadomość."
+
+#, fuzzy
+#~ msgid "from room %s"
+#~ msgstr " z pokoju %s"
+
+#~ msgid "Leave Groupchats"
+#~ msgstr "Opuść pokoje"
+
+#, fuzzy
+#~ msgid "Auto Join"
+#~ msgstr "Połącz automatycznie"
+
+#, fuzzy
+#~ msgid "Room"
+#~ msgstr "Pokój:"
+
+#~ msgid "Jabber ID:"
+#~ msgstr "Jabber ID:"
+
+#~ msgid "Occupant Actions"
+#~ msgstr "Działania użytk_ownika"
+
+#~ msgid "_Add to Roster"
+#~ msgstr "Dod_aj do listy kontaktów"
+
+#~ msgid "_Manage Room"
+#~ msgstr "Zarządzaj pokojem"
+
+#~ msgid "Configure _Room..."
+#~ msgstr "Konfiguruj _pokój..."
+
+#~ msgid "_Destroy Room"
+#~ msgstr "_Zlikwiduj pokój"
+
+#~ msgid "Jabber ID"
+#~ msgstr "Jabber ID"
+
+#, fuzzy
+#~ msgid "icon"
+#~ msgstr "Ikona w obszarze powiadamiania"
+
+#, fuzzy
+#~ msgid "account"
+#~ msgstr "Konto"
+
+#, fuzzy
+#~ msgid "Roster"
+#~ msgstr "Pokaż _listę kontaktów"
+
+#~ msgid "Show only in roster"
+#~ msgstr "Pokaż tylko na liście kontaktów"
+
+#~ msgid "in _roster"
+#~ msgstr "w _liście kontaktów"
+
+#~ msgid "Roster Appearance"
+#~ msgstr "Tożsamość na rosterze"
+
+#, fuzzy
+#~ msgid "Show chatstate in roster"
+#~ msgstr "Wyświetlaj awatary kontaktów z listy"
+
+#~ msgid "_Add to Roster..."
+#~ msgstr "Dod_aj do listy kontaktów..."
+
+#~ msgid "_Jabber ID:"
+#~ msgstr "_Jabber ID:"
+
+#, fuzzy
+#~ msgid "_Jabber ID"
+#~ msgstr "_Jabber ID:"
+
+#~ msgid "JabberID"
+#~ msgstr "JID"
+
+#, fuzzy
+#~ msgid "Show Roster"
+#~ msgstr "Pokaż _listę kontaktów"
+
+#~ msgid "MUC server"
+#~ msgstr "Serwer MUC"
+
+#~ msgid "Room Configuration"
+#~ msgstr "Konfiguracja pokoju"
+
+#~ msgid "Join _Group Chat"
+#~ msgstr "Dołącz do _pokoju"
+
+#~ msgid "Toggle audio session"
+#~ msgstr "Przełącz sesję audio"
+
+#, fuzzy
+#~ msgid "Audio sessions are not available"
+#~ msgstr "Połączenie jest niemożliwe"
+
+#~ msgid "Conference"
+#~ msgstr "Konferencja"
+
+#, fuzzy
+#~ msgid "_Manage Bookmarks…"
+#~ msgstr "Zarządzaj zakładkami"
+
+#~ msgid "Hide _Roster"
+#~ msgstr "Ukryj _listę kontaktów"
+
+#~ msgid "Show _Roster"
+#~ msgstr "Pokaż _listę kontaktów"
+
+#, fuzzy
+#~ msgid "Invalid Room"
+#~ msgstr "Niepoprawny pokój"
+
+#~ msgid "Invalid room"
+#~ msgstr "Niepoprawny pokój"
+
+#~ msgid "A GTK+ Jabber client"
+#~ msgstr "Klient Jabbera w GTK+"
+
+#~ msgid "Changing Nickname"
+#~ msgstr "Zmiana pseudonimu"
+
+#~ msgid "Please specify the new nickname you want to use:"
+#~ msgstr "Wpisz nowy pseudonim, którego chcesz używać:"
+
+#~ msgid "Bookmark already set"
+#~ msgstr "Zakładka została już dodana"
+
+#, fuzzy
+#~ msgid "Group Chat '%s' is already in your bookmarks."
+#~ msgstr "Pokój \"%s\" jest już w Twoich zakładkach."
+
+#~ msgid "Bookmark has been added successfully"
+#~ msgstr "Zakładka została dodana"
+
+#, fuzzy
+#~ msgid ""
+#~ "You can manage your bookmarks by clicking the Bookmarks menu item in your "
+#~ "contact list."
+#~ msgstr ""
+#~ "Możesz zarządzać zakładkami poprzez menu Działania w oknie kontaktów."
+
+#, fuzzy
+#~ msgid "The nickname contains invalid characters."
+#~ msgstr "Używany przez ciebie pseudonim zawiera niedozwolone znaki."
+
+#, fuzzy
+#~ msgid "Bookmark Room"
+#~ msgstr "_Dodaj zakładkę do tego pokoju"
+
+#~ msgid "_Join New Group Chat"
+#~ msgstr "_Dołącz do pokoju"
+
+#, fuzzy
+#~ msgid "_Create Group Chat"
+#~ msgstr "Opuść pokoje"
+
+#~ msgid "Name:"
+#~ msgstr "Nazwa:"
+
+#, fuzzy
+#~ msgid "Description:"
+#~ msgstr "Opis: "
+
+#, fuzzy
+#~ msgid "Address:"
+#~ msgstr "_Adres:"
+
+#, fuzzy
+#~ msgid "You can not start a new conversation unless you are connected."
+#~ msgstr "Nie możesz dołączyć do pokoju gdy nie jesteś połączony."
+
+#, fuzzy
+#~ msgid "Occupants"
+#~ msgstr "Działania użytk_ownika"
+
+#, fuzzy
+#~ msgid "File transfer error"
+#~ msgstr "Błąd przesyłania pliku"
+
+#, fuzzy
+#~ msgid "No Accounts available"
+#~ msgstr "Żadne konto nie jest dostępne"
+
+#~ msgid "_Modify Account..."
+#~ msgstr "_Modyfikuj konto..."
+
+#~ msgid "Boolean"
+#~ msgstr "Zmienna logiczna"
+
+#~ msgid "Integer"
+#~ msgstr "Liczba całkowita"
+
+#~ msgid "Text"
+#~ msgstr "Tekst"
+
+#~ msgid "Value"
+#~ msgstr "Wartość"
+
+#~ msgid "Type"
+#~ msgstr "Typ"
+
+#~ msgid "(None)"
+#~ msgstr "(Brak)"
+
+#~ msgid "Hidden"
+#~ msgstr "Ukryte"
+
+#~ msgid "Manage Proxy Profiles"
+#~ msgstr "Zarządzaj Profilami Proxy"
+
+#~ msgid "Properties"
+#~ msgstr "Właściwości"
+
+#, fuzzy
+#~ msgid "Proxy _Host"
+#~ msgstr "_Serwer Proxy:"
+
+#, fuzzy
+#~ msgid "Proxy _Port"
+#~ msgstr "_Port Proxy"
+
+#~ msgid "New Groupchat"
+#~ msgstr "Nowa rozmowa grupowa"
+
+#~ msgid "New Contact"
+#~ msgstr "Dodaj nowy kontakt"
+
 #~ msgid "%s GiB"
 #~ msgstr "%s GiB"
 
@@ -11253,9 +12152,6 @@ msgstr "Rejestracja nie powiodła się"
 #~ msgid "_Pause"
 #~ msgstr "_Zatrzymaj"
 
-#~ msgid "Clean _up"
-#~ msgstr "Wyczy_ść"
-
 #~ msgid "Remove file transfer from the list."
 #~ msgstr "Usuń przesyłanie tego pliku z listy."
 
@@ -11276,10 +12172,6 @@ msgstr "Rejestracja nie powiodła się"
 #~ msgid "When a file transfer is complete show a popup notification"
 #~ msgstr "Gdy plik w całości zostanie przesłany, wyświetl okno powiadomienia"
 
-#, fuzzy
-#~ msgid "Select Files"
-#~ msgstr "Sprzątam"
-
 #~ msgid "From:"
 #~ msgstr "Od:"
 
@@ -11707,9 +12599,6 @@ msgstr "Rejestracja nie powiodła się"
 #~ msgid "You are invited to a groupchat"
 #~ msgstr "Jestes zaproszony do rozmowy grupowej"
 
-#~ msgid "Do you want to accept the invitation?"
-#~ msgstr "Czy chcesz zaakceptować zaproszenie?"
-
 #~ msgid "_Start Chat"
 #~ msgstr "_Rozpocznij rozmowę"
 
@@ -11919,10 +12808,6 @@ msgstr "Rejestracja nie powiodła się"
 #~ msgid "Nick"
 #~ msgstr "Nick"
 
-#, fuzzy
-#~ msgid "Banning…"
-#~ msgstr "Blokuję użytkownika..."
-
 #~ msgid ""
 #~ "<b>Whom do you want to ban?</b>\n"
 #~ "\n"
@@ -12006,12 +12891,6 @@ msgstr "Rejestracja nie powiodła się"
 #~ msgid "Filter:"
 #~ msgstr "Filtr:"
 
-#~ msgid ""
-#~ "If checked, Gajim will display the mood of contacts in the roster window"
-#~ msgstr ""
-#~ "Zaznaczenie tej opcji spowoduje wyświetlanie nastrojów w oknie listy "
-#~ "kontaktów (roster oraz okno czatu)"
-
 #~ msgid "<b>Chat Appearance</b>"
 #~ msgstr "<b>Tożsamość na czacie</b>"
 
@@ -12275,10 +13154,6 @@ msgstr "Rejestracja nie powiodła się"
 #~ msgstr "_Informacja o statusie:"
 
 #, fuzzy
-#~ msgid "Group chat highlight"
-#~ msgstr "Podświetlenie wiadomości z czatu"
-
-#, fuzzy
 #~ msgid "Your nickname"
 #~ msgstr "Twój pseudonim:"
 
@@ -12420,9 +13295,6 @@ msgstr "Rejestracja nie powiodła się"
 #~ msgid "The passwords typed in both fields must be identical."
 #~ msgstr "Hasła wpisane w obydwu polach muszą być identyczne."
 
-#~ msgid "Enter new password:"
-#~ msgstr "Wpisz nowe hasło:"
-
 #~ msgid "Enter it again for confirmation:"
 #~ msgstr "Wpisz ponownie nowe hasło:"
 
@@ -12437,10 +13309,6 @@ msgstr "Rejestracja nie powiodła się"
 #~ msgid "unsubscribe request from %s"
 #~ msgstr "Prośba o cofnięcie autoryzacji od %s"
 
-#, fuzzy
-#~ msgid "Autojoin"
-#~ msgstr "Połącz automatycznie"
-
 #~ msgid "&lt;empty&gt;"
 #~ msgstr "&lt;empty&gt;"
 
@@ -12555,9 +13423,6 @@ msgstr "Rejestracja nie powiodła się"
 #~ msgid "Forward unread message then disconnect"
 #~ msgstr "Prześlij dalej nieprzeczytane wiadomości"
 
-#~ msgid "AIM Address:"
-#~ msgstr "_Adres AIM:"
-
 #~ msgid "MSN Address:"
 #~ msgstr "_Adres MSN:"
 
@@ -12608,9 +13473,6 @@ msgstr "Rejestracja nie powiodła się"
 #~ msgid "Session negotiation cancelled"
 #~ msgstr "Negocjowanie sesji zostało przerwane"
 
-#~ msgid "This session WILL be archived on server"
-#~ msgstr "Obecna sesja zostanie zachowania w archiwum na serwerze"
-
 #, fuzzy
 #~ msgid "This session WILL NOT be archived on server"
 #~ msgstr "Ta sesja NIE BĘDZIE archiwizowana na serwerze"
@@ -12949,9 +13811,6 @@ msgstr "Rejestracja nie powiodła się"
 #~ msgid "Server:"
 #~ msgstr "Serwer:"
 
-#~ msgid "Password:"
-#~ msgstr "Hasło:"
-
 #~ msgid "Join this room _automatically when I connect"
 #~ msgstr "_Automatycznie dołącz do tego pokoju po uzyskaniu połączenia"
 
@@ -13306,9 +14165,6 @@ msgstr "Rejestracja nie powiodła się"
 #~ msgid "_Edit Personal Information..."
 #~ msgstr "_Zmień informacje o sobie..."
 
-#~ msgid "Information about you, as stored in the server"
-#~ msgstr "Informacje o Tobie, takie jakie są przechowywane na serwerze"
-
 #~ msgid "<b>Personal Information</b>"
 #~ msgstr "<b>Informacje o sobie</b>"
 
@@ -13384,9 +14240,6 @@ msgstr "Rejestracja nie powiodła się"
 #~ msgid "Your server can't save your personal information."
 #~ msgstr "Twój serwer nie potrafi zapisać informacji osobistych."
 
-#~ msgid "Account Local already exists."
-#~ msgstr "Konto o takiej nazwie już istnieje."
-
 #~ msgid "Please rename or remove it before enabling link-local messaging."
 #~ msgstr ""
 #~ "Proszę go zmienić lub usunąć przed uaktywnieniem komunikacji link-local."
@@ -13587,10 +14440,6 @@ msgstr "Rejestracja nie powiodła się"
 #~ msgid "Contact's identity verified"
 #~ msgstr "Tożsamość rozmówcy zweryfikowana"
 
-#, fuzzy
-#~ msgid "Verify again…"
-#~ msgstr "Ponowna weryfikacja..."
-
 #~ msgid ""
 #~ "To be certain that <b>only</b> the expected person can read your messages "
 #~ "or send you messages, you need to verify their identity by clicking the "
@@ -13718,9 +14567,6 @@ msgstr "Rejestracja nie powiodła się"
 #~ msgid "Add _Contact..."
 #~ msgstr "Dodaj _kontakt..."
 
-#~ msgid "_Accounts"
-#~ msgstr "_Konta"
-
 #~ msgid "Profile, A_vatar"
 #~ msgstr "Profil, _Awatar"
 
@@ -13986,12 +14832,6 @@ msgstr "Rejestracja nie powiodła się"
 #~ msgid "Activity: "
 #~ msgstr "Aktywność:"
 
-#~ msgid "Join _Group Chat..."
-#~ msgstr "Dołącz do _pokoju"
-
-#~ msgid "_Modify Account"
-#~ msgstr "_Modyfikuj konto"
-
 #~ msgid "Check on startup if Gajim is the _default Jabber client"
 #~ msgstr ""
 #~ "Przy starcie zawsze sprawdzaj czy Gajim jest _domyślnym klientem Jabbera"
@@ -14608,9 +15448,6 @@ msgstr "Rejestracja nie powiodła się"
 #~ msgid "[This message is encrypted]"
 #~ msgstr "[Ta wiadomość jest zaszyfrowana]"
 
-#~ msgid "Trayicon"
-#~ msgstr "Ikona w obszarze powiadamiania"
-
 #~ msgid "A icon in systemtray reflecting the current presence."
 #~ msgstr "Ikona w obszarze powiadamiania odzwierciedla aktualny status."
 
@@ -14647,9 +15484,6 @@ msgstr "Rejestracja nie powiodła się"
 #~ msgid "Nickname not found: %s"
 #~ msgstr "Pseudonim nie został odnaleziony: %s"
 
-#~ msgid "This group chat has no subject"
-#~ msgstr "Ten pokój nie ma tematu"
-
 #, fuzzy
 #~ msgid ""
 #~ "Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
@@ -14740,9 +15574,6 @@ msgstr "Rejestracja nie powiodła się"
 #~ msgid "Your JID:"
 #~ msgstr "Twój JID:"
 
-#~ msgid "_Host:"
-#~ msgstr "_Host:"
-
 #~ msgid "Modify Account"
 #~ msgstr "Modyfikuj konto"
 
@@ -15260,9 +16091,6 @@ msgstr "Rejestracja nie powiodła się"
 #~ msgid "I'm %s"
 #~ msgstr "Jestem %s"
 
-#~ msgid "A_fter nickname:"
-#~ msgstr "_Za pseudonimem:"
-
 #~ msgid "_After time:"
 #~ msgstr "_Po czasie:"
 
diff --git a/po/pt.po b/po/pt.po
index d456cf273..e9ccdf97b 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: 2019-07-02 02:06+0000\n"
+"POT-Creation-Date: 2019-08-11 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,71 +16,71 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: gajim/chat_control_base.py:550
+#: gajim/chat_control_base.py:557
 msgid "_Undo"
 msgstr ""
 
-#: gajim/chat_control_base.py:558 gajim/conversation_textview.py:529
+#: gajim/chat_control_base.py:565 gajim/conversation_textview.py:529
 msgid "_Clear"
 msgstr ""
 
-#: gajim/chat_control_base.py:563
+#: gajim/chat_control_base.py:570
 msgid "Paste as quote"
 msgstr ""
 
-#: gajim/chat_control_base.py:613
+#: gajim/chat_control_base.py:620
 #, fuzzy
 msgid "Paste Image"
 msgstr "Escolha chave"
 
-#: gajim/chat_control_base.py:614
+#: gajim/chat_control_base.py:621
 #, fuzzy
 msgid "You are trying to paste an image"
 msgstr "Não está ligado ao servidor"
 
-#: gajim/chat_control_base.py:615
+#: gajim/chat_control_base.py:622
 #, 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:617 gajim/groupchat_control.py:2310
-#: gajim/roster_window.py:2848 gajim/roster_window.py:4167
-#: gajim/message_window.py:252 gajim/gtk/dialogs.py:418
+#: gajim/chat_control_base.py:624 gajim/groupchat_control.py:2218
+#: gajim/roster_window.py:2841 gajim/roster_window.py:4118
+#: gajim/message_window.py:359 gajim/gtk/dialogs.py:330
 #, fuzzy
 msgid "_Do not ask me again"
 msgstr "_Não voltar a perguntar"
 
-#: gajim/chat_control_base.py:620
+#: gajim/chat_control_base.py:627
 msgid "_Paste"
 msgstr ""
 
-#: gajim/chat_control_base.py:1162 gajim/gtk/accounts.py:351
+#: gajim/chat_control_base.py:1169 gajim/gtk/accounts.py:354
 #, fuzzy
 msgid "Privacy"
 msgstr "Iniciar Conversa"
 
-#: gajim/chat_control_base.py:1163
+#: gajim/chat_control_base.py:1170
 #, fuzzy
 msgid "Warning"
 msgstr "Banindo %s"
 
-#: gajim/chat_control_base.py:1164
+#: gajim/chat_control_base.py:1171
 #, python-format
 msgid "If you send a file to <b>%s</b>, your real JID will be revealed."
 msgstr ""
 
-#: gajim/chat_control_base.py:1169
+#: gajim/chat_control_base.py:1176
 #, fuzzy
 msgid "Continue"
 msgstr "_Continuar"
 
-#: gajim/gtkgui_helpers.py:163 gajim/gtk/filetransfer.py:393
+#: gajim/gtkgui_helpers.py:163 gajim/gtk/filetransfer.py:398
 #, python-format
 msgid "Cannot overwrite existing file '%s'"
 msgstr ""
 
-#: gajim/gtkgui_helpers.py:164 gajim/gtk/filetransfer.py:394
+#: gajim/gtkgui_helpers.py:164 gajim/gtk/filetransfer.py:399
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
@@ -173,391 +173,400 @@ msgstr ""
 msgid " resource with priority "
 msgstr " recurso com prioridade "
 
-#: gajim/gui_menu_builder.py:96
-#, fuzzy
-msgid "_New Group Chat"
-msgstr "Chat"
+#: gajim/gui_menu_builder.py:251 gajim/gui_menu_builder.py:342
+#: gajim/chat_control.py:305 gajim/roster_window.py:783
+#: gajim/roster_window.py:1716 gajim/roster_window.py:1718
+#: gajim/roster_window.py:2027 gajim/roster_window.py:3292
+#: gajim/roster_window.py:3325 gajim/gui_interface.py:396
+#: gajim/common/contacts.py:222 gajim/common/contacts.py:359
+#: gajim/common/contacts.py:471 gajim/common/helpers.py:86
+#: gajim/common/helpers.py:317 gajim/gtk/add_contact.py:319
+#: gajim/gtk/subscription_request.py:70 gajim/gtk/subscription_request.py:99
+#: gajim/gtk/roster_item_exchange.py:112
+#, fuzzy
+msgid "Not in contact list"
+msgstr "Mostrar Contactos _Offline"
 
-#: gajim/gui_menu_builder.py:289 gajim/gui_menu_builder.py:380
-#: gajim/chat_control.py:303 gajim/roster_window.py:786
-#: gajim/roster_window.py:1719 gajim/roster_window.py:1721
-#: gajim/roster_window.py:2030 gajim/roster_window.py:3336
-#: gajim/roster_window.py:3369 gajim/gui_interface.py:413
-#: gajim/common/contacts.py:206 gajim/common/contacts.py:343
-#: gajim/common/helpers.py:83 gajim/common/helpers.py:311
-#: gajim/gtk/add_contact.py:319 gajim/gtk/subscription_request.py:70
-#: gajim/gtk/subscription_request.py:99 gajim/gtk/roster_item_exchange.py:112
-msgid "Not in Roster"
-msgstr "Fora da lista"
-
-#: gajim/gui_menu_builder.py:393
-msgid "I would like to add you to my roster"
-msgstr "Eu gostaria de o adicionar à minha lista"
+#: gajim/gui_menu_builder.py:355
+#, 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:471
+#: gajim/gui_menu_builder.py:433
 #, fuzzy
 msgid "Send Single _Message…"
 msgstr "Enviar _Mensagem Simples"
 
-#: gajim/gui_menu_builder.py:486
+#: gajim/gui_menu_builder.py:448
 #, fuzzy
 msgid "E_xecute Command…"
 msgstr "comando"
 
-#: gajim/gui_menu_builder.py:494
+#: gajim/gui_menu_builder.py:456
 #, fuzzy
 msgid "_Manage Transport"
 msgstr "Transportes"
 
-#: gajim/gui_menu_builder.py:500
+#: gajim/gui_menu_builder.py:462
 #, fuzzy
 msgid "_Modify Transport"
 msgstr "Transportes"
 
-#: gajim/gui_menu_builder.py:507 gajim/roster_window.py:5046
+#: gajim/gui_menu_builder.py:469 gajim/roster_window.py:4985
 #, fuzzy
 msgid "_Rename…"
 msgstr "_Renomear"
 
-#: gajim/gui_menu_builder.py:518 gajim/roster_window.py:5062
-#: gajim/roster_window.py:5177 gajim/data/gui/blocked_contacts_window.ui:52
+#: gajim/gui_menu_builder.py:480 gajim/roster_window.py:5001
+#: gajim/roster_window.py:5116 gajim/data/gui/blocked_contacts_window.ui:52
 #: gajim/data/gui/gc_occupants_menu.ui:148
 #: gajim/data/gui/contact_context_menu.ui:143
 msgid "_Unblock"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:521 gajim/roster_window.py:5067
-#: gajim/roster_window.py:5181 gajim/data/gui/gc_occupants_menu.ui:140
+#: gajim/gui_menu_builder.py:483 gajim/roster_window.py:5006
+#: gajim/roster_window.py:5120 gajim/data/gui/gc_occupants_menu.ui:140
 #: gajim/data/gui/contact_context_menu.ui:151
 msgid "_Block"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:529 gajim/roster_window.py:5074
+#: gajim/gui_menu_builder.py:491 gajim/roster_window.py:5013
 #: gajim/data/gui/contact_context_menu.ui:181
 #, fuzzy
 msgid "Remo_ve"
 msgstr "_Remover"
 
-#: gajim/gui_menu_builder.py:539 gajim/data/gui/contact_context_menu.ui:198
+#: gajim/gui_menu_builder.py:501 gajim/data/gui/contact_context_menu.ui:198
 #, fuzzy
 msgid "_Information"
 msgstr "Informações do Contacto"
 
-#: gajim/gui_menu_builder.py:552
+#: gajim/gui_menu_builder.py:514
 #, fuzzy
 msgid "Save _As"
 msgstr "Guardado em: %s"
 
-#: gajim/gui_menu_builder.py:564 gajim/groupchat_control.py:501
-#: gajim/chat_control.py:340
+#: gajim/gui_menu_builder.py:526 gajim/groupchat_control.py:507
+#: gajim/chat_control.py:342
 #, fuzzy
 msgid "Send File…"
 msgstr "Enviar _Ficheiro"
 
-#: gajim/gui_menu_builder.py:565
+#: gajim/gui_menu_builder.py:527
 #, fuzzy
 msgid "Upload File…"
 msgstr "Guardar Ficheiro como..."
 
-#: gajim/gui_menu_builder.py:566
+#: gajim/gui_menu_builder.py:528
 #, fuzzy
 msgid "Send File Directly…"
 msgstr "Guardar Ficheiro como..."
 
-#: gajim/gui_menu_builder.py:568 gajim/gui_menu_builder.py:632
+#: gajim/gui_menu_builder.py:530 gajim/gui_menu_builder.py:596
 #, fuzzy
 msgid "Send Chatstate"
 msgstr "Iconset de _estados padrão:"
 
-#: gajim/gui_menu_builder.py:569
+#: gajim/gui_menu_builder.py:531
 #, fuzzy
 msgid "Invite Contacts"
 msgstr "Contacto:"
 
-#: gajim/gui_menu_builder.py:570
+#: gajim/gui_menu_builder.py:532
 #, fuzzy
-msgid "Add to Roster"
-msgstr "_Adicionar à Lista"
+msgid "Add to Contact List"
+msgstr "_Adicionar Contacto"
 
-#: gajim/gui_menu_builder.py:571
-msgid "Audio Session"
-msgstr ""
+#: gajim/gui_menu_builder.py:533
+#, fuzzy
+msgid "Voice Chat"
+msgstr "Pedido de Transferência de Ficheiro"
 
-#: gajim/gui_menu_builder.py:572
-msgid "Video Session"
-msgstr ""
+#: gajim/gui_menu_builder.py:534
+#, fuzzy
+msgid "Video Chat"
+msgstr "Iniciar Conversa"
 
-#: gajim/gui_menu_builder.py:573
+#: gajim/gui_menu_builder.py:535 gajim/gui_menu_builder.py:582
 #, fuzzy
 msgid "Information"
 msgstr "Informações do Contacto"
 
-#: gajim/gui_menu_builder.py:574 gajim/gui_menu_builder.py:639
+#: gajim/gui_menu_builder.py:536 gajim/gui_menu_builder.py:602
 #: gajim/data/gui/application_menu.ui:37
 #, fuzzy
 msgid "History"
 msgstr "_Histórico"
 
-#: gajim/gui_menu_builder.py:580 gajim/gui_menu_builder.py:687
+#: gajim/gui_menu_builder.py:542 gajim/gui_menu_builder.py:650
 #: gajim/data/gui/preferences_window.ui:1823
 msgid "Disabled"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:581 gajim/gui_menu_builder.py:688
+#: gajim/gui_menu_builder.py:543 gajim/gui_menu_builder.py:651
 msgid "Composing only"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:582 gajim/gui_menu_builder.py:689
+#: gajim/gui_menu_builder.py:544 gajim/gui_menu_builder.py:652
 #, fuzzy
 msgid "All chat states"
 msgstr "Estado: "
 
-#: gajim/gui_menu_builder.py:620
+#: gajim/gui_menu_builder.py:583
 #, fuzzy
-msgid "Manage Room"
-msgstr "Gerir Bookmarks"
+msgid "Manage Group Chat"
+msgstr "Chat"
 
-#: gajim/gui_menu_builder.py:621
+#: gajim/gui_menu_builder.py:584 gajim/data/gui/groupchat_control.ui:649
 #, fuzzy
 msgid "Change Subject"
 msgstr "Muda A_ssunto"
 
-#: gajim/gui_menu_builder.py:622
+#: gajim/gui_menu_builder.py:585
 #, fuzzy
-msgid "Configure Room"
-msgstr "Configurar _Sala"
+msgid "Configure Group Chat"
+msgstr "Chat"
 
-#: gajim/gui_menu_builder.py:623
+#: gajim/gui_menu_builder.py:586
 #, fuzzy
 msgid "Upload Avatar…"
 msgstr "Escolha chave"
 
-#: gajim/gui_menu_builder.py:624
+#: gajim/gui_menu_builder.py:587
 #, fuzzy
-msgid "Destroy Room"
-msgstr "Descrição: %s"
+msgid "Destroy Group Chat"
+msgstr "Chat"
 
-#: gajim/gui_menu_builder.py:626 gajim/data/gui/preferences_window.ui:790
+#: gajim/gui_menu_builder.py:589 gajim/data/gui/preferences_window.ui:790
 #, fuzzy
 msgid "Chat Settings"
 msgstr "Publicação vCard falhou"
 
-#: gajim/gui_menu_builder.py:627
+#: gajim/gui_menu_builder.py:590
 msgid "Show join/leave"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:628
+#: gajim/gui_menu_builder.py:591
 #, fuzzy
 msgid "Show status changes"
 msgstr "_Arquivar mudanças de estado dos contactos"
 
-#: gajim/gui_menu_builder.py:629 gajim/data/gui/gc_control_popup_menu.ui:72
+#: gajim/gui_menu_builder.py:592 gajim/data/gui/gc_control_popup_menu.ui:72
 #, fuzzy
 msgid "Notify on all messages"
 msgstr "mensagem de estado:"
 
-#: gajim/gui_menu_builder.py:630
+#: gajim/gui_menu_builder.py:593
 msgid "Minimize on close"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:631
-msgid "Minimize on autojoin"
+#: gajim/gui_menu_builder.py:595
+msgid "Minimize when joining automatically"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:634
+#: gajim/gui_menu_builder.py:598
 msgid "Sync Threshold"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:635
+#: gajim/gui_menu_builder.py:599
 #, fuzzy
-msgid "Change Nick"
+msgid "Change Nickname"
 msgstr "Muda Alcu_nha"
 
-#: gajim/gui_menu_builder.py:636
-#, fuzzy
-msgid "Bookmark Room"
-msgstr "Adicionar esta Sala aos _Bookmarks"
-
-#: gajim/gui_menu_builder.py:637
+#: gajim/gui_menu_builder.py:600
 #, fuzzy
 msgid "Request Voice"
 msgstr "_Voz"
 
-#: gajim/gui_menu_builder.py:638 gajim/roster_window.py:5246
+#: gajim/gui_menu_builder.py:601 gajim/roster_window.py:5185
 #, fuzzy
 msgid "Execute command"
 msgstr "comando"
 
-#: gajim/gui_menu_builder.py:640
-#, fuzzy
-msgid "Disconnect"
-msgstr "Contacto Entrou"
+#: gajim/gui_menu_builder.py:603
+msgid "Leave"
+msgstr ""
 
-#: gajim/gui_menu_builder.py:678 gajim/gtk/preferences.py:156
+#: gajim/gui_menu_builder.py:641 gajim/gtk/preferences.py:155
 msgid "No threshold"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:680 gajim/gtk/preferences.py:158
+#: gajim/gui_menu_builder.py:643 gajim/gtk/preferences.py:157
 #, 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:709 gajim/gui_menu_builder.py:747
-#: gajim/gtk/join_groupchat.py:43
-msgid "Join Group Chat"
-msgstr "Entrar num Chat"
-
-#: gajim/gui_menu_builder.py:746
+#: gajim/gui_menu_builder.py:672
 #, fuzzy
 msgid "Add Contact…"
 msgstr "_Adicionar Contacto"
 
-#: gajim/gui_menu_builder.py:748 gajim/gtk/profile.py:52
-#: gajim/gtk/accounts.py:770 gajim/gtk/accounts.py:808
+#: gajim/gui_menu_builder.py:673 gajim/gtk/profile.py:52
+#: gajim/gtk/accounts.py:773 gajim/gtk/accounts.py:811
 #, fuzzy
 msgid "Profile"
 msgstr "Ficheiro"
 
-#: gajim/gui_menu_builder.py:749
+#: gajim/gui_menu_builder.py:674
+#, fuzzy
+msgid "Send Single Message…"
+msgstr "Enviar _Mensagem Simples"
+
+#: gajim/gui_menu_builder.py:675
 #, fuzzy
 msgid "Discover Services"
 msgstr "_Descobrir Recursos"
 
-#: gajim/gui_menu_builder.py:750
+#: gajim/gui_menu_builder.py:676 gajim/gtk/server_info.py:36
 #, fuzzy
-msgid "Send Single Message…"
-msgstr "Enviar _Mensagem Simples"
+msgid "Server Info"
+msgstr "Servidor"
 
-#: gajim/gui_menu_builder.py:751 gajim/data/gui/preferences_window.ui:2741
+#: gajim/gui_menu_builder.py:677 gajim/data/gui/preferences_window.ui:2741
 msgid "Advanced"
 msgstr "Avançado"
 
-#: gajim/gui_menu_builder.py:752 gajim/gtk/mam_preferences.py:88
+#: gajim/gui_menu_builder.py:678 gajim/gtk/mam_preferences.py:88
 #, fuzzy
 msgid "Archiving Preferences"
 msgstr "_Preferências"
 
-#: gajim/gui_menu_builder.py:753
+#: gajim/gui_menu_builder.py:679
 #, fuzzy
 msgid "Blocking List"
 msgstr "Expulsando %s"
 
-#: gajim/gui_menu_builder.py:754 gajim/gtk/history_sync.py:108
+#: gajim/gui_menu_builder.py:680
+#, fuzzy
+msgid "Bookmarks"
+msgstr "Adicionar esta Sala aos _Bookmarks"
+
+#: gajim/gui_menu_builder.py:681
+#, fuzzy
+msgid "PEP Configuration"
+msgstr "Configuração da Sala"
+
+#: gajim/gui_menu_builder.py:682 gajim/gtk/history_sync.py:108
 #: gajim/gtk/history_sync.py:186
 #, fuzzy
 msgid "Synchronise History"
 msgstr "Mostrar Contactos _Offline"
 
-#: gajim/gui_menu_builder.py:755 gajim/gtk/privacy_list.py:427
+#: gajim/gui_menu_builder.py:683 gajim/gtk/privacy_list.py:427
 #, fuzzy
 msgid "Privacy Lists"
 msgstr "Iniciar Conversa"
 
-#: gajim/gui_menu_builder.py:756 gajim/gtk/server_info.py:36
-#, fuzzy
-msgid "Server Info"
-msgstr "Servidor"
-
-#: gajim/gui_menu_builder.py:757 gajim/gui_menu_builder.py:768
+#: gajim/gui_menu_builder.py:685 gajim/gui_menu_builder.py:696
 #: gajim/data/gui/xml_console_window.ui:77
 msgid "XML Console"
 msgstr "Consola XML"
 
-#: gajim/gui_menu_builder.py:759 gajim/data/gui/groupchat_config.ui:36
+#: gajim/gui_menu_builder.py:687 gajim/data/gui/groupchat_config.ui:36
 #, fuzzy
 msgid "Admin"
 msgstr "_Admin"
 
-#: gajim/gui_menu_builder.py:760
+#: gajim/gui_menu_builder.py:688
 #, fuzzy
 msgid "Send Server Message…"
 msgstr "E_nviar Mensagem de Servidor"
 
-#: gajim/gui_menu_builder.py:761
+#: gajim/gui_menu_builder.py:689
 #, fuzzy
 msgid "Set MOTD…"
 msgstr "Definir MOTD"
 
-#: gajim/gui_menu_builder.py:762
+#: gajim/gui_menu_builder.py:690
 #, fuzzy
 msgid "Update MOTD…"
 msgstr "Actualizar MOTD"
 
-#: gajim/gui_menu_builder.py:763
+#: gajim/gui_menu_builder.py:691
 #, fuzzy
 msgid "Delete MOTD…"
 msgstr "Apagar MOTD"
 
-#: gajim/gui_menu_builder.py:812
+#: gajim/gui_menu_builder.py:736
 #, fuzzy
-msgid "No Accounts available"
-msgstr "Nenhuma conta disponível"
+msgid "_Add Account…"
+msgstr "_Adicionar Contacto"
+
+#: gajim/gui_menu_builder.py:742
+#, fuzzy
+msgid "_Modify Accounts…"
+msgstr "_Modificar Conta..."
+
+#: gajim/gui_menu_builder.py:751 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:823 gajim/data/gui/application_menu.ui:5
-#: gajim/data/gui/application_menu.ui:71 gajim/data/gui/shortcuts_window.ui:182
-#: gajim/gtk/accounts.py:58
+#: gajim/gui_menu_builder.py:755 gajim/data/gui/application_menu.ui:5
+#: gajim/data/gui/shortcuts_window.ui:182 gajim/gtk/accounts.py:57
 msgid "Accounts"
 msgstr "Contas"
 
-#: gajim/gui_menu_builder.py:881 gajim/gui_menu_builder.py:886
+#: gajim/gui_menu_builder.py:784 gajim/gui_menu_builder.py:789
 #, fuzzy
-msgid "Copy JID"
-msgstr "Sala:"
+msgid "Copy XMPP Address"
+msgstr "_Copiar JID/Endereço de Email"
 
-#: gajim/gui_menu_builder.py:882 gajim/gui_menu_builder.py:914
+#: gajim/gui_menu_builder.py:785 gajim/gui_menu_builder.py:817
 #, fuzzy
 msgid "Join Groupchat"
 msgstr "Entrar num Chat"
 
-#: gajim/gui_menu_builder.py:887 gajim/gui_menu_builder.py:913
-#: gajim/data/gui/application_menu.ui:76
+#: gajim/gui_menu_builder.py:790 gajim/gui_menu_builder.py:816
+#: gajim/data/gui/application_menu.ui:71
 #: gajim/data/gui/subscription_request_window.ui:106
 msgid "Start Chat"
 msgstr "Iniciar Conversa"
 
-#: gajim/gui_menu_builder.py:888 gajim/gui_menu_builder.py:915
+#: gajim/gui_menu_builder.py:791 gajim/gui_menu_builder.py:818
 #, fuzzy
-msgid "Add to Roster…"
-msgstr "_Adicionar à Lista"
+msgid "Add to Contact List…"
+msgstr "_Adicionar Contacto"
 
-#: gajim/gui_menu_builder.py:893
+#: gajim/gui_menu_builder.py:796
 #, fuzzy
 msgid "Copy Link Location"
 msgstr "_Copiar Localização do Link"
 
-#: gajim/gui_menu_builder.py:894
+#: gajim/gui_menu_builder.py:797
 #, fuzzy
 msgid "Open Link in Browser"
 msgstr "_Abrir Link no Navegador"
 
-#: gajim/gui_menu_builder.py:899
+#: gajim/gui_menu_builder.py:802
 #, fuzzy
 msgid "Copy Email Address"
 msgstr "_Copiar JID/Endereço de Email"
 
-#: gajim/gui_menu_builder.py:900 gajim/gui_menu_builder.py:912
+#: gajim/gui_menu_builder.py:803 gajim/gui_menu_builder.py:815
 #, fuzzy
 msgid "Open Email Composer"
 msgstr "_Abrir Compositor de Email"
 
-#: gajim/gui_menu_builder.py:905
+#: gajim/gui_menu_builder.py:808
 #, fuzzy
 msgid "Copy Location"
 msgstr "_Copiar Localização do Link"
 
-#: gajim/gui_menu_builder.py:906
+#: gajim/gui_menu_builder.py:809
 #, fuzzy
 msgid "Show Location"
 msgstr "Modificação da Conta"
 
-#: gajim/gui_menu_builder.py:911
+#: gajim/gui_menu_builder.py:814
 #, fuzzy
-msgid "Copy JID/Email"
+msgid "Copy XMPP Address/Email"
 msgstr "_Copiar JID/Endereço de Email"
 
-#: gajim/gui_menu_builder.py:945
+#: gajim/gui_menu_builder.py:852
 #, fuzzy
 msgid "Copy"
 msgstr "Sala:"
@@ -580,47 +589,58 @@ msgstr ""
 msgid "Choose folder for logfile"
 msgstr ""
 
-#: gajim/history_manager.py:107
+#: gajim/history_manager.py:106
 #, fuzzy
 msgid "Cannot find history logs database"
 msgstr "a criar base de dados dos logs"
 
-#: gajim/history_manager.py:108
+#: gajim/history_manager.py:107
 #, fuzzy, python-format
 msgid "%s does not exist."
 msgstr "Tal sala não existe."
 
-#: gajim/history_manager.py:141 gajim/history_manager.py:195
-#: gajim/gtk/discovery.py:829 gajim/gtk/roster_item_exchange.py:80
-msgid "JID"
-msgstr "JID"
+#: gajim/history_manager.py:140 gajim/history_manager.py:194
+#: 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:30
+#: gajim/gtk/accounts.py:804
+#, fuzzy
+msgid "XMPP Address"
+msgstr "_Endereço:"
 
-#: gajim/history_manager.py:154 gajim/history_manager.py:202
+#: gajim/history_manager.py:153 gajim/history_manager.py:201
 #: gajim/data/gui/history_window.ui:89 gajim/gtk/history.py:108
 msgid "Date"
 msgstr "Data:"
 
-#: gajim/history_manager.py:161 gajim/history_manager.py:225
+#: gajim/history_manager.py:160 gajim/history_manager.py:224
 #: gajim/data/gui/join_groupchat_window.ui:208
 #: gajim/data/gui/profile_window.ui:214
 #: gajim/data/gui/vcard_information_window.ui:443
+#: gajim/data/gui/bookmarks.ui:140
 #, fuzzy
 msgid "Nickname"
 msgstr "Alcunha:"
 
-#: gajim/history_manager.py:172 gajim/history_manager.py:211
+#: gajim/history_manager.py:171 gajim/history_manager.py:210
 #: gajim/data/gui/preferences_window.ui:1344
 #: gajim/data/gui/single_message_window.ui:275 gajim/gtk/history.py:117
 msgid "Message"
 msgstr "Mensagem"
 
-#: gajim/history_manager.py:180 gajim/history_manager.py:218
+#: gajim/history_manager.py:179 gajim/history_manager.py:217
 #: gajim/data/gui/groups_post_window.ui:49
 #: gajim/data/gui/single_message_window.ui:214
 #, fuzzy
 msgid "Subject"
 msgstr "Assunto:"
 
+#: gajim/history_manager.py:247
+msgid "Database Cleanup"
+msgstr ""
+
 #: gajim/history_manager.py:248
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
@@ -629,56 +649,54 @@ msgstr ""
 
 #: gajim/history_manager.py:250
 msgid ""
-"Normally allocated database size will not be freed, it will just become "
-"reusable. If you really want to reduce database filesize, click YES, else "
-"click NO.\n"
-"\n"
-"In case you click YES, please wait…"
+"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
-msgid "Database Cleanup"
-msgstr ""
+#, fuzzy
+msgid "_Cleanup"
+msgstr "_Limpar"
 
-#: gajim/history_manager.py:519 gajim/gtk/filetransfer.py:238
-#: gajim/gtk/filetransfer.py:248
+#: gajim/history_manager.py:518 gajim/gtk/filetransfer.py:237
+#: gajim/gtk/filetransfer.py:247
 msgid "You"
 msgstr "Você"
 
-#: gajim/history_manager.py:531
+#: gajim/history_manager.py:530
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr ""
 
-#: gajim/history_manager.py:568 gajim/history_manager.py:607
-#: gajim/gtk/dialogs.py:58 gajim/gtk/themes.py:319
+#: gajim/history_manager.py:567 gajim/history_manager.py:606
+#: gajim/gtk/dialogs.py:57 gajim/gtk/themes.py:319
 #: gajim/gtk/roster_item_exchange.py:75 gajim/gtk/roster_item_exchange.py:185
 #, fuzzy
 msgid "Delete"
 msgstr "Apagar MOTD"
 
-#: gajim/history_manager.py:569
+#: gajim/history_manager.py:568
 #, fuzzy
 msgid "Delete Conversation"
 msgid_plural "Delete Conversations"
 msgstr[0] "Informações do Contacto"
 msgstr[1] "Informações do Contacto"
 
-#: gajim/history_manager.py:570
+#: gajim/history_manager.py:569
 #, 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:608
+#: gajim/history_manager.py:607
 #, fuzzy
 msgid "Delete Message"
 msgid_plural "Delete Messages"
 msgstr[0] "Mensagem de Estado"
 msgstr[1] "Mensagem de Estado"
 
-#: gajim/history_manager.py:609
+#: gajim/history_manager.py:608
 #, fuzzy
 msgid "Do you want to permanently delete this message"
 msgid_plural "Do you want to permanently delete these messages"
@@ -691,15 +709,15 @@ msgid "Contact name: <i>%s</i>"
 msgstr "Nome do Contacto <i>%s</i>"
 
 #: gajim/dialogs.py:84
-#, fuzzy, python-format
-msgid "JID: <i>%s</i>"
-msgstr "JID: <i>%s</i>"
+#, python-format
+msgid "XMPP Address: <i>%s</i>"
+msgstr ""
 
-#: gajim/dialogs.py:115 gajim/dialogs.py:128 gajim/roster_window.py:2901
-#: gajim/roster_window.py:3833 gajim/roster_window.py:5084
-#: gajim/common/contacts.py:157 gajim/common/contacts.py:190
+#: gajim/dialogs.py:115 gajim/dialogs.py:128 gajim/roster_window.py:2894
+#: gajim/roster_window.py:3784 gajim/roster_window.py:5023
+#: gajim/common/contacts.py:157 gajim/common/contacts.py:206
 #: gajim/data/gui/preferences_window.ui:558
-#: gajim/data/gui/shortcuts_window.ui:177 gajim/gtk/accounts.py:349
+#: gajim/data/gui/shortcuts_window.ui:177 gajim/gtk/accounts.py:352
 msgid "General"
 msgstr "Geral"
 
@@ -745,7 +763,7 @@ msgstr "Mensagem de Estado"
 msgid "Preset name is already in use. Do you want to overwrite this preset?"
 msgstr ""
 
-#: gajim/dialogs.py:703
+#: gajim/dialogs.py:703 gajim/plugins/gui.py:292
 msgid "_Overwrite"
 msgstr ""
 
@@ -758,9 +776,7 @@ msgstr "Guardar como Mensagem de Estado Pré-definida"
 msgid "Please type a name for this status message"
 msgstr "Escreva a sua nova mensagem de estado:"
 
-#: gajim/dialogs.py:740 gajim/gui_interface.py:1441 gajim/dialog_messages.py:31
-#: gajim/gtk/discovery.py:518 gajim/gtk/profile.py:323
-#: gajim/gtk/join_groupchat.py:234
+#: gajim/dialogs.py:740 gajim/gtk/discovery.py:517 gajim/gtk/profile.py:323
 msgid "You are not connected to the server"
 msgstr "Não está ligado ao servidor"
 
@@ -769,9 +785,11 @@ msgstr "Não está ligado ao servidor"
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Tem de estar ligado para poder mudar a sua senha."
 
-#: gajim/dialogs.py:752 gajim/dialogs.py:823 gajim/gtk/discovery.py:822
-#: gajim/gtk/discovery.py:1648 gajim/gtk/discovery.py:1941
-#: gajim/gtk/history.py:99 gajim/gtk/roster_item_exchange.py:83
+#: gajim/dialogs.py:752 gajim/dialogs.py:823
+#: gajim/data/gui/groupchat_info_scrolled.ui:16 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/gtk/roster_item_exchange.py:83
 msgid "Name"
 msgstr "Nome"
 
@@ -793,400 +811,345 @@ msgstr "Não pode entrar num chat sem estar ligado."
 msgid "Synchronise"
 msgstr ""
 
-#: gajim/dialogs.py:1043
+#: gajim/dialogs.py:1042
 msgid "an audio and video"
 msgstr ""
 
-#: gajim/dialogs.py:1045
+#: gajim/dialogs.py:1044
 msgid "an audio"
 msgstr ""
 
-#: gajim/dialogs.py:1047
+#: gajim/dialogs.py:1046
 msgid "a video"
 msgstr ""
 
-#: gajim/dialogs.py:1051
+#: gajim/dialogs.py:1050
 #, python-format
 msgid ""
-"%(contact)s wants to start %(type)s session with you. Do you want to answer "
+"%(contact)s wants to start a %(type)s chat with you. Do you want to answer "
 "the call?"
 msgstr ""
 
-#: gajim/groupchat_control.py:505
+#: gajim/groupchat_control.py:511
 #, fuzzy, python-format
 msgid "Send File (max. %s MiB)…"
 msgstr "Guardar Ficheiro como..."
 
-#: gajim/groupchat_control.py:507 gajim/chat_control.py:342
+#: gajim/groupchat_control.py:513 gajim/chat_control.py:344
 #, fuzzy
 msgid "No File Transfer available"
 msgstr "Transferências de Ficheiros"
 
-#: gajim/groupchat_control.py:630 gajim/groupchat_control.py:2349
-msgid "Changing Subject"
-msgstr "Mudar Assunto"
-
-#: gajim/groupchat_control.py:631 gajim/groupchat_control.py:2350
-msgid "Please specify the new subject:"
-msgstr "Por favor, especifique o novo assunto:"
-
-#: gajim/groupchat_control.py:638
-msgid "Changing Nickname"
-msgstr "Mudar Alcunha"
-
-#: gajim/groupchat_control.py:639
-msgid "Please specify the new nickname you want to use:"
-msgstr "Por favor, especifique a nova alcunha a usar:"
-
-#: gajim/groupchat_control.py:657
+#: gajim/groupchat_control.py:655
 #, fuzzy
-msgid "Invalid group chat JID"
+msgid "Invalid group chat XMPP Address"
 msgstr "Jabber ID Inválido"
 
-#: gajim/groupchat_control.py:658
+#: gajim/groupchat_control.py:656
 #, fuzzy
-msgid "The group chat JID has not allowed characters."
+msgid "The group chat XMPP Address has not allowed characters."
 msgstr "Esta sala não tem assunto"
 
-#: gajim/groupchat_control.py:758 gajim/gtk/profile.py:136
+#: gajim/groupchat_control.py:743 gajim/gtk/profile.py:136
 msgid "Could not load image"
 msgstr ""
 
-#: gajim/groupchat_control.py:888
+#: gajim/groupchat_control.py:873
 #, fuzzy
 msgid "Insert Nickname"
 msgstr "Muda Alcu_nha"
 
-#: gajim/groupchat_control.py:1056 gajim/chat_control.py:824
+#: gajim/groupchat_control.py:1041 gajim/chat_control.py:848
 #, fuzzy
 msgid "and authenticated"
 msgstr "Usar autenticação"
 
-#: gajim/groupchat_control.py:1060 gajim/chat_control.py:828
+#: gajim/groupchat_control.py:1045 gajim/chat_control.py:852
 #, fuzzy
 msgid "and NOT authenticated"
 msgstr "Usar autenticação"
 
-#: gajim/groupchat_control.py:1064
+#: gajim/groupchat_control.py:1049
 #, python-format
 msgid "%(type)s encryption is active %(authenticated)s."
 msgstr ""
 
-#: gajim/groupchat_control.py:1111
+#: gajim/groupchat_control.py:1096
 #, fuzzy
 msgid "Conversation with "
 msgstr "Histórico das Conversas"
 
-#: gajim/groupchat_control.py:1113
+#: gajim/groupchat_control.py:1098
 #, fuzzy
 msgid "Continued conversation"
 msgstr "Ligação"
 
-#: gajim/groupchat_control.py:1411
+#: gajim/groupchat_control.py:1357
 #, fuzzy, python-format
 msgid "%(nick)s has set the subject to %(subject)s"
 msgstr "%(nick)s foi expulso: %(reason)s"
 
-#: gajim/groupchat_control.py:1433
-msgid "Room now shows unavailable members"
+#: gajim/groupchat_control.py:1374
+msgid "Group chat now shows unavailable members"
 msgstr ""
 
-#: gajim/groupchat_control.py:1436
-msgid "Room now does not show unavailable members"
-msgstr ""
+#: gajim/groupchat_control.py:1377
+#, fuzzy
+msgid "Group chat now does not show unavailable members"
+msgstr "Tal sala não existe."
 
-#: gajim/groupchat_control.py:1439
+#: gajim/groupchat_control.py:1380
 msgid "A setting not related to privacy has been changed"
 msgstr ""
 
-#: gajim/groupchat_control.py:1446
-msgid "Room logging is now enabled"
-msgstr ""
+#: gajim/groupchat_control.py:1387 gajim/groupchat_control.py:1659
+#, fuzzy
+msgid "Conversations are stored on the server"
+msgstr "Não está ligado ao servidor"
 
-#: gajim/groupchat_control.py:1449
-msgid "Room logging is now disabled"
-msgstr ""
+#: gajim/groupchat_control.py:1390
+#, 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:1452
-msgid "Room is now non-anonymous"
-msgstr ""
+#: gajim/groupchat_control.py:1393
+#, fuzzy
+msgid "Group chat is now non-anonymous"
+msgstr "Chat"
 
-#: gajim/groupchat_control.py:1456
-msgid "Room is now semi-anonymous"
-msgstr ""
+#: gajim/groupchat_control.py:1397
+#, fuzzy
+msgid "Group chat is now semi-anonymous"
+msgstr "Chat"
 
-#: gajim/groupchat_control.py:1460
-msgid "Room is now fully anonymous"
-msgstr ""
+#: gajim/groupchat_control.py:1401
+#, fuzzy
+msgid "Group chat is now fully anonymous"
+msgstr "Chat"
 
-#: gajim/groupchat_control.py:1500
+#: gajim/groupchat_control.py:1439
 #, python-format
 msgid "Ping? (%s)"
 msgstr ""
 
-#: gajim/groupchat_control.py:1503
+#: gajim/groupchat_control.py:1442
 #, python-format
 msgid "Pong! (%(nick)s %(delay)s s.)"
 msgstr ""
 
-#: gajim/groupchat_control.py:1506 gajim/chat_control.py:1213
+#: gajim/groupchat_control.py:1445 gajim/chat_control.py:1237
 #, fuzzy
 msgid "Error."
 msgstr "Erro:"
 
-#: gajim/groupchat_control.py:1711
+#: gajim/groupchat_control.py:1650
 #, fuzzy, python-format
-msgid "You (%s) joined the room"
+msgid "You (%s) joined the group chat"
 msgstr "Neste grupo"
 
-#: gajim/groupchat_control.py:1717
-msgid "Any occupant is allowed to see your full JID"
-msgstr ""
-
-#: gajim/groupchat_control.py:1721
-msgid "Room logging is enabled"
+#: gajim/groupchat_control.py:1655
+msgid "Any participant is allowed to see your full XMPP Address"
 msgstr ""
 
-#: gajim/groupchat_control.py:1725
-msgid "The server has assigned or modified your roomnick"
-msgstr ""
+#: gajim/groupchat_control.py:1663
+#, fuzzy
+msgid "The server has assigned or modified your nickname in this group chat"
+msgstr "Muda Alcu_nha"
 
-#: gajim/groupchat_control.py:1732
+#: gajim/groupchat_control.py:1671
 #, fuzzy
-msgid "A new room has been created"
+msgid "A new group chat has been created"
 msgstr "A sua nova conta foi criada com sucesso"
 
-#: gajim/groupchat_control.py:1740 gajim/privatechat_control.py:112
+#: gajim/groupchat_control.py:1679 gajim/privatechat_control.py:115
 #, python-format
 msgid "You are now known as %s"
 msgstr "É agora conhecido como %s"
 
-#: gajim/groupchat_control.py:1742 gajim/privatechat_control.py:114
+#: gajim/groupchat_control.py:1681 gajim/privatechat_control.py:117
 #, fuzzy, python-brace-format
 msgid "{nick} is now known as {new_nick}"
 msgstr "%s agora é conhecido como %s"
 
-#: gajim/groupchat_control.py:1767 gajim/privatechat_control.py:141
+#: gajim/groupchat_control.py:1706 gajim/privatechat_control.py:144
 #, fuzzy, python-brace-format
 msgid "You are now {show}{status}"
 msgstr "É agora conhecido como %s"
 
-#: gajim/groupchat_control.py:1773 gajim/privatechat_control.py:147
+#: gajim/groupchat_control.py:1712 gajim/privatechat_control.py:150
 #, fuzzy, python-brace-format
 msgid "{nick} is now {show}{status}"
 msgstr "%(nick)s está agora %(status)s"
 
-#: gajim/groupchat_control.py:1790 gajim/groupchat_control.py:1819
-#: gajim/groupchat_control.py:1849 gajim/groupchat_control.py:1909
+#: gajim/groupchat_control.py:1729 gajim/groupchat_control.py:1758
+#: gajim/groupchat_control.py:1788 gajim/groupchat_control.py:1848
 #, python-brace-format
 msgid " by {actor}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1793
+#: gajim/groupchat_control.py:1732
 #, python-brace-format
 msgid "** Your Affiliation has been set to {affiliation}{actor}{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1799
+#: gajim/groupchat_control.py:1738
 #, python-brace-format
 msgid "** Affiliation of {nick} has been set to {affiliation}{actor}{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1822
+#: gajim/groupchat_control.py:1761
 #, fuzzy, python-brace-format
 msgid "** Your Role has been set to {role}{actor}{reason}"
 msgstr "%(nick)s foi expulso por %(who)s: %(reason)s"
 
-#: gajim/groupchat_control.py:1827
+#: gajim/groupchat_control.py:1766
 #, fuzzy, python-brace-format
 msgid "** Role of {nick} has been set to {role}{actor}{reason}"
 msgstr "%(nick)s foi expulso por %(who)s: %(reason)s"
 
-#: gajim/groupchat_control.py:1852
+#: gajim/groupchat_control.py:1791
 #, fuzzy, python-brace-format
-msgid "You have been removed from the room{actor}{reason}"
+msgid "You have been removed from the group chat{actor}{reason}"
 msgstr "%(nick)s foi expulso por %(who)s: %(reason)s"
 
-#: gajim/groupchat_control.py:1857
+#: gajim/groupchat_control.py:1796
 #, python-brace-format
 msgid "You have left due to an error{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1863
+#: gajim/groupchat_control.py:1802
 #, python-brace-format
 msgid "You have been kicked{actor}{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1870
+#: gajim/groupchat_control.py:1809
 #, python-brace-format
 msgid "You have been banned{actor}{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1877 gajim/groupchat_control.py:1943
+#: gajim/groupchat_control.py:1816 gajim/groupchat_control.py:1882
 #, fuzzy
 msgid ": Affiliation changed"
 msgstr "Filiação: "
 
-#: gajim/groupchat_control.py:1883 gajim/groupchat_control.py:1948
-msgid ": Room configuration changed to members-only"
+#: gajim/groupchat_control.py:1822 gajim/groupchat_control.py:1887
+msgid ": Group chat configuration changed to members-only"
 msgstr ""
 
-#: gajim/groupchat_control.py:1912
+#: gajim/groupchat_control.py:1851
 #, fuzzy, python-brace-format
-msgid "{nick} has been removed from the room{by}{reason}"
+msgid "{nick} has been removed from the group chat{by}{reason}"
 msgstr "%(nick)s foi expulso por %(who)s: %(reason)s"
 
-#: gajim/groupchat_control.py:1922
+#: gajim/groupchat_control.py:1861
 #, python-brace-format
 msgid "{nick} has left due to an error{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1928
+#: gajim/groupchat_control.py:1867
 #, fuzzy, python-brace-format
 msgid "{nick} has been kicked{actor}{reason}"
 msgstr "%(nick)s foi expulso: %(reason)s"
 
-#: gajim/groupchat_control.py:1936
+#: gajim/groupchat_control.py:1875
 #, fuzzy, python-brace-format
 msgid "{nick} has been banned{actor}{reason}"
 msgstr "%(nick)s foi banido: %(reason)s"
 
-#: gajim/groupchat_control.py:1953
+#: gajim/groupchat_control.py:1892
 #, python-brace-format
 msgid "{nick} has left{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1970
+#: gajim/groupchat_control.py:1914
 #, fuzzy, python-format
 msgid "%s has joined the group chat"
 msgstr "Neste grupo"
 
-#: gajim/groupchat_control.py:1985 gajim/groupchat_control.py:1990
-#: gajim/groupchat_control.py:1995 gajim/groupchat_control.py:2000
-#: gajim/groupchat_control.py:2011
+#: gajim/groupchat_control.py:1981
 #, fuzzy
-msgid "Unable to join group chat"
-msgstr "Impossível entrar na sala"
+msgid "Group chat has been destroyed"
+msgstr "Autorização foi removida"
 
 #: gajim/groupchat_control.py:1986
 #, fuzzy, python-format
-msgid "You are banned from group chat <b>%s</b>."
-msgstr "Está banido/a desta sala."
-
-#: gajim/groupchat_control.py:1991
-#, fuzzy, python-format
-msgid "Remote server <b>%s</b> does not exist."
-msgstr "Tal sala não existe."
-
-#: gajim/groupchat_control.py:1996
-#, fuzzy, python-format
-msgid "Group chat <b>%s</b> does not exist."
-msgstr "Tal sala não existe."
-
-#: gajim/groupchat_control.py:2001
-#, fuzzy
-msgid "Group chat creation is not permitted."
-msgstr "Criação de salas encontra-se restrita."
-
-#: gajim/groupchat_control.py:2005
-#, fuzzy
-msgid "Unable to join groupchat"
-msgstr "Impossível entrar na sala"
-
-#: gajim/groupchat_control.py:2006
-#, fuzzy, python-format
-msgid "You must use your registered nickname in <b>%s</b>."
-msgstr "A sua alcunha registada tem de ser usada."
-
-#: gajim/groupchat_control.py:2012
-#, fuzzy, python-format
-msgid "You are not in the members list in groupchat %s."
-msgstr "Não está na lista de membros."
-
-#: gajim/groupchat_control.py:2068
-#, fuzzy
-msgid "Room has been destroyed"
-msgstr "Autorização foi removida"
-
-#: gajim/groupchat_control.py:2073
-#, python-format
-msgid "You can join this room instead: xmpp:%s?join"
-msgstr ""
+msgid "You can join this group chat instead: xmpp:%s?join"
+msgstr "Neste grupo"
 
-#: gajim/groupchat_control.py:2306
+#: gajim/groupchat_control.py:2214
 #, fuzzy
 msgid "Leave Group Chat"
 msgstr "Chat"
 
-#: gajim/groupchat_control.py:2307
+#: gajim/groupchat_control.py:2215
 #, fuzzy
 msgid "Are you sure you want to leave this group chat?"
 msgstr "Tem a certeza de que deseja sair da sala \"%s\"?"
 
-#: gajim/groupchat_control.py:2308
+#: gajim/groupchat_control.py:2216
 #, fuzzy, python-format
-msgid "If you close this window, you will be disconnected from '%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:2314
+#: gajim/groupchat_control.py:2222 gajim/roster_window.py:5177
 msgid "_Leave"
 msgstr ""
 
-#: gajim/groupchat_control.py:2377
+#: gajim/groupchat_control.py:2280 gajim/roster_window.py:3008
 #, fuzzy, python-format
 msgid "%(jid)s has been invited to this group chat"
 msgstr "%(nick)s foi expulso por %(who)s: %(reason)s"
 
-#: gajim/groupchat_control.py:2527
+#: gajim/groupchat_control.py:2463
 #, python-format
 msgid "Kicking %s"
 msgstr "Expulsando %s"
 
-#: gajim/groupchat_control.py:2528 gajim/groupchat_control.py:2829
+#: gajim/groupchat_control.py:2464 gajim/groupchat_control.py:2765
 msgid "You may specify a reason below:"
 msgstr "Pode especificar uma razão em baixo:"
 
-#: gajim/groupchat_control.py:2828
+#: gajim/groupchat_control.py:2764
 #, python-format
 msgid "Banning %s"
 msgstr "Banindo %s"
 
-#: gajim/chat_control.py:408
+#: gajim/chat_control.py:432
 #, fuzzy
 msgid "Show a list of formattings"
 msgstr "Clique para inserir um emoticon (Alt+E)"
 
-#: gajim/chat_control.py:412
+#: gajim/chat_control.py:436
 #, fuzzy
 msgid "This contact does not support HTML"
 msgstr "Uma lista de transferências de ficheiros activas, completas e paradas"
 
-#: gajim/chat_control.py:562
+#: gajim/chat_control.py:586
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr ""
 
-#: gajim/chat_control.py:686
+#: gajim/chat_control.py:710
 #, 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:832
+#: gajim/chat_control.py:856
 #, python-format
 msgid "%(type)s encryption is active %(authenticated)s"
 msgstr ""
 
-#: gajim/chat_control.py:1160 gajim/chat_control.py:1168
+#: gajim/chat_control.py:1184 gajim/chat_control.py:1192
 #, fuzzy
 msgid "Close"
 msgstr "E_nviar & Fechar"
 
-#: gajim/chat_control.py:1161
+#: gajim/chat_control.py:1185
 #, fuzzy, python-format
 msgid "You just received a new message from %s"
 msgstr "Recebeu uma nova mensagem de \"%s\""
 
-#: gajim/chat_control.py:1163
+#: gajim/chat_control.py:1187
 #, fuzzy
 msgid ""
 "If you close this tab while having chat history disabled, this message will "
@@ -1195,16 +1158,16 @@ msgstr ""
 "Se fechar esta aba e o histórico estiver desactivado, esta mensagem será "
 "perdida."
 
-#: gajim/chat_control.py:1208
+#: gajim/chat_control.py:1232
 msgid "Ping?"
 msgstr ""
 
-#: gajim/chat_control.py:1211
+#: gajim/chat_control.py:1235
 #, python-format
 msgid "Pong! (%s seconds)"
 msgstr ""
 
-#: gajim/chat_control.py:1308
+#: gajim/chat_control.py:1332
 #, fuzzy, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -1213,279 +1176,285 @@ msgstr ""
 "Assunto: %s\n"
 "%s"
 
-#: gajim/chat_control.py:1416
+#: gajim/chat_control.py:1440
 #, fuzzy, python-format
 msgid "%(name)s is now %(show)s %(status)s"
 msgstr "%(nick)s está agora %(status)s"
 
-#: gajim/chat_control.py:1476 gajim/data/gui/application_menu.ui:32
+#: gajim/chat_control.py:1500 gajim/data/gui/application_menu.ui:32
 #: gajim/gtk/http_upload_progress.py:35
 #, fuzzy
 msgid "File Transfer"
 msgstr "Transferências de Ficheiros"
 
-#: gajim/chat_control.py:1480
+#: gajim/chat_control.py:1504
 #, fuzzy
 msgid "Size"
 msgstr "Tamanho: "
 
-#: gajim/chat_control.py:1482 gajim/chat_control.py:1546
+#: gajim/chat_control.py:1506 gajim/chat_control.py:1566
+#: gajim/gui_interface.py:190
 #: gajim/data/gui/groupchat_invitation_received.ui:77
-#: gajim/gtk/filetransfer.py:485
+#: gajim/gtk/filetransfer.py:490
 #, fuzzy
 msgid "_Accept"
 msgstr "Aceitar"
 
-#: gajim/chat_control.py:1484 gajim/chat_control.py:1548
+#: gajim/chat_control.py:1508 gajim/chat_control.py:1568
 #: gajim/data/gui/groupchat_invitation_received.ui:62
 #, fuzzy
 msgid "_Decline"
 msgstr "_Offline"
 
-#: gajim/chat_control.py:1506 gajim/gui_interface.py:791
-#: gajim/gui_interface.py:821 gajim/gui_interface.py:847
+#: gajim/chat_control.py:1530 gajim/gui_interface.py:777
+#: gajim/gui_interface.py:807 gajim/gui_interface.py:833
 #: gajim/gtk/notification.py:173 gajim/gtk/notification.py:278
 msgid "File Transfer Completed"
 msgstr "Transferência de Ficheiro Completa"
 
-#: gajim/chat_control.py:1510 gajim/gtk/filetransfer.py:259
+#: gajim/chat_control.py:1534 gajim/gtk/filetransfer.py:258
 #, fuzzy
 msgid "Open _Folder"
 msgstr "_Abrir Pasta"
 
-#: gajim/chat_control.py:1512 gajim/chat_control.py:1521
+#: gajim/chat_control.py:1536 gajim/chat_control.py:1545
+#: gajim/data/gui/groupchat_control.ui:962
+#: gajim/data/gui/groupchat_control.ui:1049
+#: gajim/data/gui/groupchat_control.ui:1155
 #, fuzzy
 msgid "_Close"
 msgstr "E_nviar & Fechar"
 
-#: gajim/chat_control.py:1543 gajim/gui_interface.py:484
+#: gajim/chat_control.py:1563 gajim/gui_interface.py:473
+#: gajim/data/gui/groupchat_invitation_received.ui:42
 #: gajim/gtk/notification.py:174 gajim/gtk/notification.py:195
 #: gajim/gtk/notification.py:281
 #, fuzzy
-msgid "Groupchat Invitation"
+msgid "Group Chat Invitation"
 msgstr "?Função do Contacto no Chat:Nenhuma"
 
-#: gajim/chat_control.py:1568 gajim/roster_window.py:1954
+#: gajim/chat_control.py:1588 gajim/roster_window.py:1951
 #, fuzzy
 msgid "Remote contact stopped transfer"
 msgstr "Remove o contacto da lista"
 
-#: gajim/chat_control.py:1570 gajim/roster_window.py:1956
+#: gajim/chat_control.py:1590 gajim/roster_window.py:1953
 #, fuzzy
 msgid "Error opening file"
 msgstr "Erro na leitura do ficheiro:"
 
-#: gajim/chat_control.py:1572 gajim/gtk/filetransfer.py:297
+#: gajim/chat_control.py:1592 gajim/gtk/filetransfer.py:296
 #, fuzzy
 msgid "File transfer stopped"
 msgstr "Transferência de Ficheiro Parada"
 
-#: gajim/chat_control.py:1575 gajim/gtk/filetransfer.py:275
-#: gajim/gtk/filetransfer.py:284
+#: gajim/chat_control.py:1595 gajim/gtk/filetransfer.py:274
+#: gajim/gtk/filetransfer.py:283
 #, fuzzy
 msgid "File transfer cancelled"
 msgstr "Transferência de ficheiro cancelada"
 
-#: gajim/chat_control.py:1576
+#: gajim/chat_control.py:1596
 msgid "Connection with peer cannot be established."
 msgstr "Ligação ao peer não pode ser estabelecida."
 
-#: gajim/application.py:72
+#: gajim/application.py:75
 #, fuzzy
 msgid "Show the application's version"
 msgstr "_Ícone na bandeja (também conhecido por área de notificação)"
 
-#: gajim/application.py:79
+#: gajim/application.py:82
 #, fuzzy
 msgid "Show only critical errors"
 msgstr "Mostrar apenas na _lista"
 
-#: gajim/application.py:86
+#: gajim/application.py:89
 msgid "Separate profile files completely (even history database and plugins)"
 msgstr ""
 
-#: gajim/application.py:94
+#: gajim/application.py:97
 msgid "Print XML stanzas and other debug information"
 msgstr ""
 
-#: gajim/application.py:101
+#: gajim/application.py:104
 #, fuzzy
 msgid "Use defined profile in configuration directory"
 msgstr "Editor de Configuração Avançada"
 
-#: gajim/application.py:109
+#: gajim/application.py:112
 #, fuzzy
 msgid "Set configuration directory"
 msgstr "Configuração da Sala"
 
-#: gajim/application.py:117
+#: gajim/application.py:120
 msgid "Configure logging system"
 msgstr ""
 
-#: gajim/application.py:125
+#: gajim/application.py:128
 #, fuzzy
 msgid "Show all warnings"
 msgstr "Mostrar Todos os _Eventos Pedentes"
 
-#: gajim/application.py:132
+#: gajim/application.py:135
 msgid "Open IPython shell"
 msgstr ""
 
-#: gajim/application.py:139
+#: gajim/application.py:142
 #, 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:145 gajim/data/gui/shortcuts_window.ui:203
+#: gajim/application.py:148 gajim/data/gui/shortcuts_window.ui:203
 #: data/org.gajim.Gajim.desktop.in:21
 #, fuzzy
 msgid "Start a new chat"
 msgstr "Iniciar Conversa"
 
-#: gajim/application.py:152
+#: gajim/application.py:155
 msgid "Simulate loss of connectivity"
 msgstr ""
 
-#: gajim/application.py:159
+#: gajim/application.py:162
 msgid "Simulate regaining connectivity"
 msgstr ""
 
-#: gajim/application.py:201 gajim/gui_interface.py:133
+#: gajim/application.py:204 gajim/gui_interface.py:133
 msgid "Database Error"
 msgstr ""
 
-#: gajim/roster_window.py:294 gajim/roster_window.py:1030
+#: gajim/roster_window.py:291 gajim/roster_window.py:1027
 msgid "Merged accounts"
 msgstr "Contas fundidas"
 
-#: gajim/roster_window.py:853 gajim/roster_window.py:1631
-#: gajim/roster_window.py:1664 gajim/roster_window.py:1715
-#: gajim/roster_window.py:1717 gajim/roster_window.py:1872
-#: gajim/roster_window.py:2531 gajim/roster_window.py:5025
-#: gajim/common/contacts.py:188 gajim/common/contacts.py:447
-#: gajim/common/helpers.py:83 gajim/gtk/discovery.py:129
-#: gajim/gtk/discovery.py:130 gajim/gtk/discovery.py:1416
+#: gajim/roster_window.py:850 gajim/roster_window.py:1628
+#: gajim/roster_window.py:1661 gajim/roster_window.py:1712
+#: gajim/roster_window.py:1714 gajim/roster_window.py:1869
+#: gajim/roster_window.py:2528 gajim/roster_window.py:4331
+#: gajim/roster_window.py:4964 gajim/common/contacts.py:204
+#: gajim/common/contacts.py:463 gajim/common/helpers.py:86
+#: gajim/gtk/discovery.py:127 gajim/gtk/discovery.py:128
+#: gajim/gtk/discovery.py:1414
 msgid "Transports"
 msgstr "Transportes"
 
-#: gajim/roster_window.py:1723 gajim/roster_window.py:1725
-#: gajim/roster_window.py:4995 gajim/gui_interface.py:1613
-#: gajim/gui_interface.py:1639 gajim/common/contacts.py:186
-#: gajim/common/helpers.py:83 gajim/common/modules/adhoc_commands.py:245
+#: gajim/roster_window.py:1720 gajim/roster_window.py:1722
+#: gajim/roster_window.py:4331 gajim/roster_window.py:4934
+#: gajim/gui_interface.py:1527 gajim/common/contacts.py:202
+#: gajim/common/helpers.py:86 gajim/common/modules/adhoc_commands.py:245
 #, fuzzy
-msgid "Groupchats"
+msgid "Group chats"
 msgstr "Chat"
 
-#: gajim/roster_window.py:2012
+#: gajim/roster_window.py:2009
 #, fuzzy
 msgid "Authorization sent"
 msgstr "Autorização foi enviada"
 
-#: gajim/roster_window.py:2013
+#: gajim/roster_window.py:2010
 #, fuzzy, python-format
 msgid "\"%s\" will now see your status."
 msgstr "Agora \"%s\" saberá o seu estado."
 
-#: gajim/roster_window.py:2031
+#: gajim/roster_window.py:2028
 msgid "Subscription request has been sent"
 msgstr "Pedido de subscrição foi enviado"
 
-#: gajim/roster_window.py:2032
-#, python-format
-msgid "If \"%s\" accepts this request you will know his or her status."
+#: gajim/roster_window.py:2029
+#, 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:2046
+#: gajim/roster_window.py:2043
 #, fuzzy
 msgid "Authorization removed"
 msgstr "Autorização foi removida"
 
-#: gajim/roster_window.py:2047
+#: gajim/roster_window.py:2044
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Doravante, \"%s\" vê-lo-á sempre como estando offline."
 
-#: gajim/roster_window.py:2250 gajim/roster_window.py:3504
+#: gajim/roster_window.py:2247 gajim/roster_window.py:3460
 msgid "Disconnect for Invisibility"
 msgstr ""
 
-#: gajim/roster_window.py:2251 gajim/roster_window.py:3505
+#: gajim/roster_window.py:2248 gajim/roster_window.py:3461
 msgid "You are participating in one or more group chats"
 msgstr "Está a participar num ou mais chats"
 
-#: gajim/roster_window.py:2252 gajim/roster_window.py:3506
+#: gajim/roster_window.py:2249 gajim/roster_window.py:3462
 #, fuzzy
 msgid ""
-"Changing your status to invisible will result in disconnection from those "
-"group chats.\n"
+"Changing your status to invisible will result in you leaving those group "
+"chats.\n"
 "Are you sure you want to go invisible?"
 msgstr ""
 "Mudar o seu estado para invisível fará com que seja desligado desses chats. "
 "De certeza que deseja tornar-se invisível?"
 
-#: gajim/roster_window.py:2257 gajim/roster_window.py:3512
-#: gajim/roster_window.py:5238 gajim/data/gui/gc_control_popup_menu.ui:120
+#: gajim/roster_window.py:2254 gajim/roster_window.py:3468
+#: gajim/data/gui/gc_control_popup_menu.ui:120
 #, fuzzy
 msgid "_Disconnect"
 msgstr "Contacto Entrou"
 
-#: gajim/roster_window.py:2285
+#: gajim/roster_window.py:2282
 #, fuzzy
 msgid "desynced"
 msgstr "Avançado"
 
-#: gajim/roster_window.py:2353 gajim/data/gui/shortcuts_window.ui:224
+#: gajim/roster_window.py:2350 gajim/data/gui/shortcuts_window.ui:224
 #, fuzzy
 msgid "Quit Gajim"
 msgstr "Gajim"
 
-#: gajim/roster_window.py:2354
+#: gajim/roster_window.py:2351
 #, fuzzy
 msgid "You are about to quit Gajim"
 msgstr "Tem a certeza de que deseja sair das salas \"%s\"?"
 
-#: gajim/roster_window.py:2355
+#: gajim/roster_window.py:2352
 #, fuzzy
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Tem a certeza de que deseja sair das salas \"%s\"?"
 
-#: gajim/roster_window.py:2356
+#: gajim/roster_window.py:2353
 msgid "_Always quit when closing Gajim"
 msgstr ""
 
-#: gajim/roster_window.py:2359 gajim/roster_window.py:2455
-#: gajim/roster_window.py:2495 gajim/data/gui/systray_context_menu.ui:90
+#: gajim/roster_window.py:2356 gajim/roster_window.py:2452
+#: gajim/roster_window.py:2492 gajim/data/gui/systray_context_menu.ui:83
 #, fuzzy
 msgid "_Quit"
 msgstr "_Sair"
 
-#: gajim/roster_window.py:2448
+#: gajim/roster_window.py:2445
 #, fuzzy
 msgid "Stop File Transfers"
 msgstr "Parar a transferência de ficheiro"
 
-#: gajim/roster_window.py:2449
+#: gajim/roster_window.py:2446
 #, fuzzy
 msgid "You still have running file transfers"
 msgstr "Cancelar transferência de ficheiro"
 
-#: gajim/roster_window.py:2450
+#: gajim/roster_window.py:2447
 msgid ""
 "If you quit now, the file(s) being transferred will be lost.\n"
 "Do you still want to quit?"
 msgstr ""
 
-#: gajim/roster_window.py:2488
+#: gajim/roster_window.py:2485
 #, fuzzy
 msgid "Unread Messages"
 msgstr "Mensagem"
 
-#: gajim/roster_window.py:2489
+#: gajim/roster_window.py:2486
 #, fuzzy
 msgid "You still have unread messages"
 msgstr "Tem mensagens não lidas"
 
-#: gajim/roster_window.py:2490
+#: gajim/roster_window.py:2487
 #, fuzzy
 msgid ""
 "Messages will only be available for reading them later if storing chat "
@@ -1493,20 +1462,20 @@ msgid ""
 msgstr ""
 "As mensagens só poderão ser lidas mais tarde caso tenha o histórico activado."
 
-#: gajim/roster_window.py:2760
+#: gajim/roster_window.py:2753
 msgid "You have unread messages"
 msgstr "Tem mensagens não lidas"
 
-#: gajim/roster_window.py:2761
+#: gajim/roster_window.py:2754
 msgid "You must read them before removing this transport."
 msgstr ""
 
-#: gajim/roster_window.py:2764
+#: gajim/roster_window.py:2757
 #, fuzzy, python-format
 msgid "Transport '%s' will be removed"
 msgstr "Transporte \"%s\" será removido"
 
-#: gajim/roster_window.py:2765
+#: gajim/roster_window.py:2758
 #, fuzzy
 msgid ""
 "You will no longer be able to send and receive messages from and to contacts "
@@ -1515,12 +1484,12 @@ msgstr ""
 "Deixará de poder enviar e receber mensagens aos contactos desde este "
 "transport."
 
-#: gajim/roster_window.py:2768
+#: gajim/roster_window.py:2761
 #, fuzzy
 msgid "Transports will be removed"
 msgstr "Transporte \"%s\" será removido"
 
-#: gajim/roster_window.py:2773
+#: gajim/roster_window.py:2766
 #, fuzzy, python-format
 msgid ""
 "You will no longer be able to send and receive messages from and to contacts "
@@ -1530,88 +1499,83 @@ msgstr ""
 "Deixará de poder enviar e receber mensagens aos contactos desde este "
 "transport."
 
-#: gajim/roster_window.py:2777
+#: gajim/roster_window.py:2770
 #, fuzzy
 msgid "Remove Transport"
 msgstr "Transportes"
 
-#: gajim/roster_window.py:2844
+#: gajim/roster_window.py:2837
 #, fuzzy
 msgid "Block Contact"
 msgstr "Contacto:"
 
-#: gajim/roster_window.py:2845
+#: gajim/roster_window.py:2838
 #, fuzzy
 msgid "Really block this contact?"
 msgstr "Não é possível usar OpenPGP neste computador"
 
-#: gajim/roster_window.py:2846
+#: gajim/roster_window.py:2839
 msgid ""
 "This contact will see you offline and you will not receive any messages sent "
 "to you by this contact."
 msgstr ""
 
-#: gajim/roster_window.py:2851
+#: gajim/roster_window.py:2844
 #, fuzzy
 msgid "_Block Contact"
 msgstr "Contacto:"
 
-#: gajim/roster_window.py:2896
+#: gajim/roster_window.py:2889
 #, fuzzy
 msgid "Rename Contact"
 msgstr "Contacto:"
 
-#: gajim/roster_window.py:2897
+#: gajim/roster_window.py:2890
 #, fuzzy, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Introduza a chave GPG para a conta %s"
 
-#: gajim/roster_window.py:2904
+#: gajim/roster_window.py:2897
 #, fuzzy
 msgid "Rename Group"
 msgstr "_Renomear"
 
-#: gajim/roster_window.py:2905
+#: gajim/roster_window.py:2898
 #, fuzzy, python-format
 msgid "Enter a new name for group %s"
 msgstr "Introduza a chave GPG para a conta %s"
 
-#: gajim/roster_window.py:2953 gajim/roster_window.py:2954
+#: gajim/roster_window.py:2946 gajim/roster_window.py:2947
 #, fuzzy
 msgid "Remove Group"
 msgstr "_Remover"
 
-#: gajim/roster_window.py:2955
+#: gajim/roster_window.py:2948
 #, fuzzy, python-format
 msgid "Do you want to remove %s from the contact list?"
 msgstr "Quero _registar uma nova conta"
 
-#: gajim/roster_window.py:2956
+#: gajim/roster_window.py:2949
 #, fuzzy
 msgid "_Also remove all contacts of this group from contact list"
 msgstr "Remove o contacto da lista"
 
-#: gajim/roster_window.py:3044
-#, fuzzy, python-format
-msgid "%(jid)s has been invited in this room"
-msgstr "%(nick)s foi expulso por %(who)s: %(reason)s"
-
-#: gajim/roster_window.py:3353
+#: gajim/roster_window.py:3309
 #, fuzzy
 msgid "Remove Contact"
 msgstr "Contacto:"
 
-#: gajim/roster_window.py:3354
+#: gajim/roster_window.py:3310
 #, fuzzy
 msgid "Remove contact from contact list"
 msgstr "Remove o contacto da lista"
 
-#: gajim/roster_window.py:3355
+#: gajim/roster_window.py:3311
 #, python-format
 msgid "You are about to remove '%(name)s' (%(jid)s) from your contact list.\n"
 msgstr ""
 
-#: gajim/roster_window.py:3364 gajim/roster_window.py:3384
+#: gajim/roster_window.py:3320 gajim/roster_window.py:3340
 #, fuzzy
 msgid ""
 "By removing this contact you also remove authorization. This means the "
@@ -1620,22 +1584,22 @@ msgstr ""
 "Ao remover este contacto, também remove a autorização. O contacto vê-lo-á "
 "sempre como offline."
 
-#: gajim/roster_window.py:3375
+#: gajim/roster_window.py:3331
 #, fuzzy
 msgid "Do you want to continue?"
 msgstr "<b>O que pretende fazer?</b>"
 
-#: gajim/roster_window.py:3386
+#: gajim/roster_window.py:3342
 #, 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:3393
+#: gajim/roster_window.py:3349
 #, fuzzy
 msgid "Remove contacts from contact list"
 msgstr "Remove o contacto da lista"
 
-#: gajim/roster_window.py:3399
+#: gajim/roster_window.py:3355
 #, fuzzy, python-format
 msgid ""
 "By removing the following contacts, you will also remove authorization. This "
@@ -1646,167 +1610,157 @@ msgstr ""
 "Ao remover este contacto, também remove a autorização. O contacto vê-lo-á "
 "sempre como offline."
 
-#: gajim/roster_window.py:3403
+#: gajim/roster_window.py:3359
 #, fuzzy
 msgid "Remove Contacts"
 msgstr "Contacto:"
 
-#: gajim/roster_window.py:3423
+#: gajim/roster_window.py:3379
 msgid "No account available"
 msgstr "Nenhuma conta disponível"
 
-#: gajim/roster_window.py:3424
+#: gajim/roster_window.py:3380
 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:4060
+#: gajim/roster_window.py:4011
 msgid "Metacontacts storage not supported by your server"
 msgstr ""
 
-#: gajim/roster_window.py:4062
+#: gajim/roster_window.py:4013
 msgid ""
 "Your server does not support storing metacontacts information. So this "
 "information will not be saved on next reconnection."
 msgstr ""
 
-#: gajim/roster_window.py:4159
+#: gajim/roster_window.py:4110
 #, 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:4160
+#: gajim/roster_window.py:4111
 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:4164
+#: gajim/roster_window.py:4115
 #, fuzzy
 msgid "Create Metacontact"
 msgstr "Contacto:"
 
-#: gajim/roster_window.py:4170
+#: gajim/roster_window.py:4121 gajim/data/gui/groupchat_creation.ui:317
 #, fuzzy
 msgid "_Create"
 msgstr "Activo"
 
-#: gajim/roster_window.py:4287
+#: gajim/roster_window.py:4238
 #, fuzzy
 msgid "Invalid file URI:"
 msgstr "Ficheiro Inválido"
 
-#: gajim/roster_window.py:4298
+#: gajim/roster_window.py:4249
 #, fuzzy
 msgid "Send file?"
 msgstr "Enviar _Ficheiro"
 
-#: gajim/roster_window.py:4299
+#: gajim/roster_window.py:4250
 #, fuzzy, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
 msgstr[0] "%s quer enviar-lhe um ficheiro:"
 msgstr[1] "%s quer enviar-lhe um ficheiro:"
 
-#: gajim/roster_window.py:4451
+#: gajim/roster_window.py:4401
 #, fuzzy, python-format
 msgid "Send %(from)s to %(to)s"
 msgstr "Enviar %s"
 
-#: gajim/roster_window.py:4464
+#: gajim/roster_window.py:4414
 #, fuzzy, python-format
 msgid "Make %s first contact"
 msgstr "Envia um ficheiro a um contacto"
 
-#: gajim/roster_window.py:4469
+#: gajim/roster_window.py:4419
 #, fuzzy, python-format
 msgid "Make %(contact1)s and %(contact2)s metacontacts"
 msgstr "Envia um ficheiro a um contacto"
 
-#: gajim/roster_window.py:4825 gajim/roster_window.py:4923
+#: gajim/roster_window.py:4775 gajim/roster_window.py:4862
 msgid "_Change Status Message"
 msgstr "_Mudar Mensagem de Estado"
 
-#: gajim/roster_window.py:4845
+#: gajim/roster_window.py:4795
 #, fuzzy
 msgid "Publish Tune"
 msgstr "_Publicar"
 
-#: gajim/roster_window.py:4856
+#: gajim/roster_window.py:4806
 #, fuzzy
 msgid "Publish Location"
 msgstr "_Publicar"
 
-#: gajim/roster_window.py:4868
-#, fuzzy
-msgid "Configure Services…"
-msgstr "_Descobrir Recursos..."
-
-#: gajim/roster_window.py:4997
+#: gajim/roster_window.py:4936
 msgid "_Maximize All"
 msgstr ""
 
-#: gajim/roster_window.py:5004 gajim/roster_window.py:5146
+#: gajim/roster_window.py:4943 gajim/roster_window.py:5085
 #, fuzzy
 msgid "Send Group M_essage"
 msgstr "Nova Mensagem"
 
-#: gajim/roster_window.py:5011
+#: gajim/roster_window.py:4950
 msgid "To all users"
 msgstr ""
 
-#: gajim/roster_window.py:5015
+#: gajim/roster_window.py:4954
 #, fuzzy
 msgid "To all online users"
 msgstr "Utilizadores _Online"
 
-#: gajim/roster_window.py:5027 gajim/roster_window.py:5152
+#: gajim/roster_window.py:4966 gajim/roster_window.py:5091
 #: gajim/data/gui/gc_occupants_menu.ui:110
 #: gajim/data/gui/contact_context_menu.ui:36
 msgid "In_vite to"
 msgstr ""
 
-#: gajim/roster_window.py:5162
+#: gajim/roster_window.py:5101
 #, fuzzy
 msgid "_Manage Contacts"
 msgstr "Contacto:"
 
-#: gajim/roster_window.py:5168
+#: gajim/roster_window.py:5107
 #, fuzzy
 msgid "Edit _Groups…"
 msgstr "Editar _Grupos"
 
-#: gajim/roster_window.py:5189 gajim/data/gui/filetransfers.ui:12
+#: gajim/roster_window.py:5128 gajim/data/gui/filetransfers.ui:12
 #: gajim/data/gui/remove_account_window.ui:134
 msgid "_Remove"
 msgstr "_Remover"
 
-#: gajim/roster_window.py:5226
+#: gajim/roster_window.py:5165
 msgid "_Maximize"
 msgstr ""
 
-#: gajim/roster_window.py:5233
+#: gajim/roster_window.py:5172
 #, fuzzy
 msgid "_Reconnect"
 msgstr "Contacto Entrou"
 
-#: gajim/roster_window.py:5254 gajim/data/gui/gc_occupants_menu.ui:170
+#: gajim/roster_window.py:5193 gajim/data/gui/gc_occupants_menu.ui:170
 #: gajim/data/gui/gc_control_popup_menu.ui:113
 #: gajim/data/gui/contact_context_menu.ui:205
 msgid "_History"
 msgstr "_Histórico"
 
-#: gajim/roster_window.py:5335 gajim/data/gui/application_menu.ui:86
+#: gajim/roster_window.py:5274 gajim/data/gui/application_menu.ui:83
 #: gajim/data/gui/history_window.ui:57
 #, fuzzy
 msgid "History Manager"
 msgstr "_Histórico"
 
-#: gajim/roster_window.py:5343
-#, fuzzy
-msgid "_Join New Group Chat"
-msgstr "_Entrar num Chat"
-
 #: gajim/dataforms_widget.py:585
 #, fuzzy
 msgid "Unable to load image"
@@ -1930,281 +1884,298 @@ msgstr "Assunto: %s\n"
 msgid "Write a message…"
 msgstr "Nova Mensagem Privada"
 
-#: gajim/message_window.py:250
+#: gajim/message_window.py:356
+#, fuzzy
+msgid "Close Tabs"
+msgstr "E_nviar & Fechar"
+
+#: gajim/message_window.py:357
 #, fuzzy
 msgid "You are going to close several tabs"
 msgstr "Não está ligado ao servidor"
 
-#: gajim/message_window.py:251
+#: gajim/message_window.py:358
 #, fuzzy
 msgid "Do you really want to close them all?"
 msgstr "<b>O que pretende fazer?</b>"
 
-#: gajim/message_window.py:539
+#: gajim/message_window.py:514
 #, fuzzy
 msgid "?Noun:Chats"
 msgstr "Chat"
 
-#: gajim/message_window.py:543
+#: gajim/message_window.py:518
 #, fuzzy
 msgid "Group Chats"
 msgstr "C_hat"
 
-#: gajim/message_window.py:547
+#: gajim/message_window.py:522
 #, fuzzy
 msgid "Private Chats"
 msgstr "Iniciar Conversa"
 
-#: gajim/message_window.py:553
+#: gajim/message_window.py:528
 #, fuzzy
 msgid "Messages"
 msgstr "Mensagem"
 
-#: gajim/gui_interface.py:173
+#: gajim/gui_interface.py:170
+#, 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:175
 msgid "Do you accept this request?"
 msgstr "Aceita este pedido?"
 
-#: gajim/gui_interface.py:175
+#: gajim/gui_interface.py:177
 #, fuzzy, python-format
-msgid "Do you accept this request on account %s?"
+msgid "Do you accept this request (account: %s)?"
 msgstr "Aceita este pedido?"
 
-#: gajim/gui_interface.py:178
-#, 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:182
+#, fuzzy
+msgid "Authorization"
+msgstr "Autorização foi enviada"
 
-#: gajim/gui_interface.py:194 gajim/gtk/notification.py:175
+#: gajim/gui_interface.py:186 gajim/gui_interface.py:420
+#: gajim/gtk/filetransfer.py:338
+#, fuzzy
+msgid "_No"
+msgstr "Nenhum"
+
+#: gajim/gui_interface.py:205 gajim/gtk/notification.py:175
 #: gajim/gtk/notification.py:197
 #, fuzzy
 msgid "Connection Failed"
 msgstr "Ligação"
 
-#: gajim/gui_interface.py:279 gajim/gui_interface.py:529
-msgid "Password Required"
-msgstr "Senha Necessária"
-
-#: gajim/gui_interface.py:280
-#, fuzzy, python-format
-msgid "A Password is required to join the room %s. Please type it."
-msgstr "É necessária uma palavra-passe para esta sala."
-
-#: gajim/gui_interface.py:342 gajim/gui_interface.py:346
+#: gajim/gui_interface.py:325 gajim/gui_interface.py:329
 #, fuzzy, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr "Introduza a sua mensagem :"
 
-#: gajim/gui_interface.py:357 gajim/gui_interface.py:376
+#: gajim/gui_interface.py:340 gajim/gui_interface.py:359
 #: gajim/common/modules/message.py:122
 #, fuzzy, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "erro ao enviar"
 
-#: gajim/gui_interface.py:401 gajim/gtk/notification.py:175
+#: gajim/gui_interface.py:384 gajim/gtk/notification.py:175
 #, fuzzy
 msgid "Subscription request"
 msgstr "Pedido de Subscrição"
 
-#: gajim/gui_interface.py:413 gajim/common/contacts.py:184
-#: gajim/common/helpers.py:83
+#: gajim/gui_interface.py:396 gajim/common/contacts.py:200
+#: gajim/common/helpers.py:86
 #, fuzzy
 msgid "Observers"
 msgstr "Servidor"
 
-#: gajim/gui_interface.py:422
+#: gajim/gui_interface.py:405
 msgid "Authorization accepted"
 msgstr "Autorização aceite"
 
-#: gajim/gui_interface.py:423
+#: gajim/gui_interface.py:406
 #, 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:431
-#, python-format
-msgid "Contact \"%s\" removed subscription from you"
+#: gajim/gui_interface.py:415
+#, fuzzy
+msgid "Subscription Removed"
+msgstr "Pedido de Subscrição"
+
+#: gajim/gui_interface.py:416
+#, fuzzy, python-format
+msgid "Contact '%s' removed subscription from you"
 msgstr "Contacto \"%s\" removeu a sua subscrição para si"
 
-#: gajim/gui_interface.py:432
+#: gajim/gui_interface.py:417
 msgid ""
-"You will always see them as offline.\n"
+"You will always see this contact as offline.\n"
 "Do you want to remove them from your contact list?"
 msgstr ""
 
-#: gajim/gui_interface.py:453 gajim/gtk/notification.py:176
+#: gajim/gui_interface.py:442 gajim/gtk/notification.py:176
 #, fuzzy
 msgid "Unsubscribed"
 msgstr "_Subscrever"
 
-#: gajim/gui_interface.py:465
+#: gajim/gui_interface.py:454
 #, python-format
 msgid "%(jid)s declined the invitation: %(reason)s"
 msgstr ""
 
-#: gajim/gui_interface.py:469
+#: gajim/gui_interface.py:458
 #, python-format
 msgid "%(jid)s declined the invitation"
 msgstr ""
 
-#: gajim/gui_interface.py:485
+#: gajim/gui_interface.py:474
 #, fuzzy, python-brace-format
 msgid "You are invited to {room} by {user}"
 msgstr "Está banido/a desta sala."
 
-#: gajim/gui_interface.py:506
+#: gajim/gui_interface.py:495
 #, fuzzy
 msgid "Certificate Passphrase Required"
 msgstr "Frase de acesso Necessária"
 
-#: gajim/gui_interface.py:507
+#: gajim/gui_interface.py:496
 #, fuzzy, python-format
 msgid "Enter the certificate passphrase for account %s"
 msgstr "Introduza a chave GPG para a conta %s"
 
-#: gajim/gui_interface.py:516 gajim/gtk/accounts.py:963
+#: gajim/gui_interface.py:505 gajim/gtk/accounts.py:966
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Introduza a sua senha para a conta %s"
 
-#: gajim/gui_interface.py:529 gajim/gtk/accounts.py:964
+#: gajim/gui_interface.py:518
+msgid "Password Required"
+msgstr "Senha Necessária"
+
+#: gajim/gui_interface.py:518 gajim/gtk/accounts.py:967
 msgid "Save password"
 msgstr "Guardar senha"
 
-#: gajim/gui_interface.py:601 gajim/gui_interface.py:632
+#: gajim/gui_interface.py:587 gajim/gui_interface.py:618
+#: gajim/gtk/filetransfer.py:332 gajim/gtk/filetransfer.py:333
 #: gajim/gtk/notification.py:173 gajim/gtk/notification.py:276
 msgid "File Transfer Error"
 msgstr "Erro na Transferência de Ficheiro"
 
-#: gajim/gui_interface.py:666
+#: gajim/gui_interface.py:652
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s quer enviar-lhe um ficheiro."
 
-#: gajim/gui_interface.py:668 gajim/gtk/filetransfer.py:479
+#: gajim/gui_interface.py:654 gajim/gtk/filetransfer.py:484
 #: gajim/gtk/notification.py:172 gajim/gtk/notification.py:274
 msgid "File Transfer Request"
 msgstr "Pedido de Transferência de Ficheiro"
 
-#: gajim/gui_interface.py:767
+#: gajim/gui_interface.py:753
 #, fuzzy
 msgid "Remote Contact Stopped Transfer"
 msgstr "Remove o contacto da lista"
 
-#: gajim/gui_interface.py:772
+#: gajim/gui_interface.py:758
 #, fuzzy
 msgid "Error Opening File"
 msgstr "Erro na leitura do ficheiro:"
 
-#: gajim/gui_interface.py:782
+#: gajim/gui_interface.py:768
 #, fuzzy
 msgid "SSL Certificate Error"
 msgstr "Nome de utilizador inválido"
 
-#: gajim/gui_interface.py:795 gajim/gui_interface.py:826
-#: gajim/gui_interface.py:853 gajim/gtk/notification.py:174
+#: gajim/gui_interface.py:781 gajim/gui_interface.py:812
+#: gajim/gui_interface.py:839 gajim/gtk/notification.py:174
 #: gajim/gtk/notification.py:279
 msgid "File Transfer Stopped"
 msgstr "Transferência de Ficheiro Parada"
 
-#: gajim/gui_interface.py:799
+#: gajim/gui_interface.py:785
 #, fuzzy
 msgid "File Transfer Failed"
 msgstr "Transferências de Ficheiros"
 
-#: gajim/gui_interface.py:822
+#: gajim/gui_interface.py:808
 #, fuzzy, python-format
 msgid "%(filename)s received from %(name)s."
 msgstr "Transferência de %(filename)s de %(name)s interrompida."
 
-#: gajim/gui_interface.py:827
+#: gajim/gui_interface.py:813
 #, 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:833
+#: gajim/gui_interface.py:819
 #, 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:848
+#: gajim/gui_interface.py:834
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Enviou com sucesso %(filename)s para %(name)s."
 
-#: gajim/gui_interface.py:854
+#: gajim/gui_interface.py:840
 #, 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:860
+#: gajim/gui_interface.py:846
 #, 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:971
+#: gajim/gui_interface.py:957
 msgid "Username Conflict"
 msgstr ""
 
-#: gajim/gui_interface.py:972
+#: gajim/gui_interface.py:958
 #, fuzzy
 msgid "Please type a new username for your local account"
 msgstr "<b>Por favor preencha os dados para a sua nova conta</b>"
 
-#: gajim/gui_interface.py:995
+#: gajim/gui_interface.py:981
 #, fuzzy
 msgid "Resource Conflict"
 msgstr "Recurso: "
 
-#: gajim/gui_interface.py:996
+#: gajim/gui_interface.py:982
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
 msgstr ""
 
-#: gajim/gui_interface.py:1053
+#: gajim/gui_interface.py:1039
 #, fuzzy, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s quer enviar-lhe um ficheiro."
 
-#: gajim/gui_interface.py:1055
+#: gajim/gui_interface.py:1041
 #, fuzzy
 msgid "Voice Chat Request"
 msgstr "Pedido de Transferência de Ficheiro"
 
-#: gajim/gui_interface.py:1123 gajim/gtk/account_wizard.py:312
+#: gajim/gui_interface.py:1109 gajim/gtk/account_wizard.py:312
 #, fuzzy
 msgid "Certificate Already in File"
 msgstr "Contacto já se encontra na lista"
 
-#: gajim/gui_interface.py:1124 gajim/gtk/account_wizard.py:313
+#: gajim/gui_interface.py:1110 gajim/gtk/account_wizard.py:313
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr ""
 
-#: gajim/gui_interface.py:1145
+#: gajim/gui_interface.py:1131
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid"
 msgstr ""
 
-#: gajim/gui_interface.py:1148
+#: gajim/gui_interface.py:1134
 #, fuzzy, python-format
 msgid ""
 "\n"
 "Unknown SSL error: %d"
 msgstr "Versão D-Bus desconhecida: %s"
 
-#: gajim/gui_interface.py:1150
+#: gajim/gui_interface.py:1136
 #, python-format
 msgid ""
 "\n"
 "SSL Error: <b>%s</b>"
 msgstr ""
 
-#: gajim/gui_interface.py:1155
+#: gajim/gui_interface.py:1141
 msgid "Error verifying SSL certificate"
 msgstr ""
 
-#: gajim/gui_interface.py:1156
+#: gajim/gui_interface.py:1142
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your XMPP server: "
@@ -2212,7 +2183,7 @@ msgid ""
 "Do you still want to connect to this server?"
 msgstr ""
 
-#: gajim/gui_interface.py:1160 gajim/gtk/account_wizard.py:412
+#: gajim/gui_interface.py:1146 gajim/gtk/account_wizard.py:413
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -2222,269 +2193,253 @@ msgid ""
 "%(sha256)s"
 msgstr ""
 
-#: gajim/gui_interface.py:1166
+#: gajim/gui_interface.py:1152
 msgid "Ignore this error for this certificate."
 msgstr ""
 
-#: gajim/gui_interface.py:1174
+#: gajim/gui_interface.py:1160
 #, python-format
 msgid "SSL Certificate Verification for %s"
 msgstr ""
 
-#: gajim/gui_interface.py:1442 gajim/gtk/join_groupchat.py:235
-msgid "You can not join a group chat unless you are connected."
-msgstr "Não pode entrar num chat sem estar ligado."
-
-#: gajim/gui_interface.py:1448
-#, fuzzy
-msgid "JID is not a Groupchat"
-msgstr "Perguntar antes de fechar uma janela/aba de chat."
-
-#: gajim/gui_interface.py:1579
-msgid "This is not a group chat"
-msgstr ""
-
-#: gajim/gui_interface.py:1580
-#, python-format
-msgid ""
-"%(room_jid)s is already in your roster. Please check if %(room_jid)s is a "
-"correct group chat name. If it is, delete it from your roster and try "
-"joining the group chat again."
-msgstr ""
-
-#: gajim/gui_interface.py:1604 gajim/dialog_messages.py:58
+#: gajim/gui_interface.py:1577
 #, fuzzy
 msgid "You cannot join a group chat while you are invisible"
 msgstr "Não pode entrar numa sala quando está invisível"
 
-#: gajim/gui_interface.py:2037
+#: gajim/gui_interface.py:1976
 msgid "Could not save your settings and preferences"
 msgstr "Impossível salvar as suas definições e preferências"
 
-#: gajim/gui_interface.py:2098
+#: gajim/gui_interface.py:2037
 msgid "Gajim: IPython Console"
 msgstr ""
 
-#: gajim/dialog_messages.py:32
-#, fuzzy
-msgid "You can not start a new conversation unless you are connected."
-msgstr "Não pode entrar num chat sem estar ligado."
-
-#: gajim/dialog_messages.py:36 gajim/dialog_messages.py:41
-#: gajim/gtk/single_message.py:305 gajim/gtk/join_groupchat.py:211
-#: gajim/gtk/account_wizard.py:229
+#: gajim/dialog_messages.py:31 gajim/dialog_messages.py:36
+#: gajim/gtk/single_message.py:305 gajim/gtk/account_wizard.py:229
 #, fuzzy
-msgid "Invalid JID"
-msgstr "Jabber ID Inválido"
+msgid "Invalid XMPP Address"
+msgstr "Ficheiro Inválido"
 
-#: gajim/dialog_messages.py:42 gajim/gtk/single_message.py:306
+#: gajim/dialog_messages.py:37
 #, fuzzy, python-format
-msgid "It is not possible to send a message to %s, this JID is not valid."
+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/dialog_messages.py:47
-msgid "Unread events"
-msgstr ""
+#: gajim/dialog_messages.py:42
+#, fuzzy
+msgid "Unread Events"
+msgstr "Mensagem"
 
-#: gajim/dialog_messages.py:48
-msgid "Read all pending events before removing this account."
+#: gajim/dialog_messages.py:43
+msgid "Read or acknowledge all pending events before removing this account."
 msgstr ""
 
-#: gajim/dialog_messages.py:52
+#: gajim/dialog_messages.py:48
 #, fuzzy
 msgid "Invalid Form"
 msgstr "Entrada inválida"
 
-#: gajim/dialog_messages.py:53
+#: gajim/dialog_messages.py:49
 msgid "The form is not filled correctly."
 msgstr "O formulário não foi preenchido correctamente"
 
-#: gajim/dialog_messages.py:57 gajim/common/helpers.py:309
+#: gajim/dialog_messages.py:53 gajim/common/helpers.py:315
 msgid "Invisible"
 msgstr "Invisível"
 
-#: gajim/dialog_messages.py:62
-msgid "A connection is not available"
-msgstr "Uma ligação não está disponível"
+#: gajim/dialog_messages.py:54
+#, fuzzy
+msgid "You cannot join a group chat while being invisible."
+msgstr "Não pode entrar numa sala quando está invisível"
 
-#: gajim/dialog_messages.py:63
+#: gajim/dialog_messages.py:58
+#, fuzzy
+msgid "No Connection Available"
+msgstr "Ligação indisponível"
+
+#: gajim/dialog_messages.py:59
 msgid "Your message can not be sent until you are connected."
 msgstr "A sua mensagem não pode ser enviada enquanto não estiver ligado."
 
-#: gajim/dialog_messages.py:67
-#, fuzzy
-msgid "JID already in list"
-msgstr "Cliente de IM Jabber"
+#: gajim/dialog_messages.py:63
+msgid "XMPP Address Already in List"
+msgstr ""
 
-#: gajim/dialog_messages.py:68
-msgid "The JID you entered is already in the list. Choose another one."
+#: gajim/dialog_messages.py:64
+msgid ""
+"The XMPP Address you entered is already in the list. Please choose another "
+"one."
 msgstr ""
 
-#: gajim/dialog_messages.py:72
+#: gajim/dialog_messages.py:69
 #, fuzzy
-msgid "Invalid answer"
+msgid "Invalid Answer"
 msgstr "Senha Inválida"
 
-#: gajim/dialog_messages.py:73
+#: gajim/dialog_messages.py:70
 #, python-format
 msgid "Transport %(name)s answered wrongly to register request: %(error)s"
 msgstr ""
 
-#: gajim/dialog_messages.py:78
+#: gajim/dialog_messages.py:75
 #, fuzzy
 msgid "Wrong Custom Hostname"
 msgstr "Usar hostname/porta personalizados"
 
-#: gajim/dialog_messages.py:79
+#: gajim/dialog_messages.py:76
 #, fuzzy, python-format
-msgid "Wrong custom hostname \"%s\". Ignoring it."
+msgid "Custom hostname \"%s\" is wrong. It will be ignored."
 msgstr "Usar hostname/porta personalizados"
 
-#: gajim/dialog_messages.py:83
+#: gajim/dialog_messages.py:80
 #, fuzzy
-msgid "Error while removing privacy list"
+msgid "Error While Removing Privacy List"
 msgstr "erro ao enviar"
 
-#: gajim/dialog_messages.py:84
+#: gajim/dialog_messages.py:81
 #, python-format
 msgid ""
-"Privacy list %s has not been removed. It is maybe active in one of your "
-"connected resources. Deactivate it and try again."
+"Privacy list %s has not been removed. It is probably active in one of your "
+"connected resources. Please deactivate it and try again."
 msgstr ""
 
-#: gajim/dialog_messages.py:90
-msgid "Invisibility not supported"
+#: gajim/dialog_messages.py:87
+msgid "Invisibility Not Supported"
 msgstr ""
 
-#: gajim/dialog_messages.py:91
-#, python-format
-msgid "Account %s doesn't support invisibility."
-msgstr ""
+#: gajim/dialog_messages.py:88
+#, fuzzy, python-format
+msgid "This account %s doesn't support invisibility."
+msgstr "Uma lista de transferências de ficheiros activas, completas e paradas"
 
-#: gajim/dialog_messages.py:95
+#: gajim/dialog_messages.py:92
 #, fuzzy
-msgid "Unregister failed"
+msgid "Unregister Failed"
 msgstr "Publicação vCard falhou"
 
-#: gajim/dialog_messages.py:96
-#, python-format
-msgid "Unregistration with server %(server)s failed: %(error)s"
-msgstr ""
+#: gajim/dialog_messages.py:93
+#, fuzzy, python-format
+msgid "Unregistration on server %(server)s failed: %(error)s"
+msgstr "A ligação ao servidor %s falhou"
 
-#: gajim/dialog_messages.py:100
+#: gajim/dialog_messages.py:97
 #, fuzzy
-msgid "Registration succeeded"
+msgid "Registration Succeeded"
 msgstr "Publicação vCard deu-se com sucesso"
 
-#: gajim/dialog_messages.py:101
-#, python-format
-msgid "Registration with agent %s succeeded"
-msgstr ""
+#: gajim/dialog_messages.py:98
+#, fuzzy, python-format
+msgid "Registration with agent %s succeeded."
+msgstr "Publicação vCard deu-se com sucesso"
 
-#: gajim/dialog_messages.py:105 gajim/gtk/service_registration.py:215
+#: gajim/dialog_messages.py:102
 #, fuzzy
-msgid "Registration failed"
+msgid "Registration Failed"
 msgstr "Publicação vCard falhou"
 
-#: gajim/dialog_messages.py:106
+#: gajim/dialog_messages.py:103
 #, python-format
 msgid ""
 "Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
 msgstr ""
 
-#: gajim/dialog_messages.py:111
+#: gajim/dialog_messages.py:108
 #, fuzzy
 msgid "Unable to Join Group Chat"
 msgstr "Impossível entrar na sala"
 
-#: gajim/dialog_messages.py:116
-msgid "GStreamer error"
+#: gajim/dialog_messages.py:113
+msgid "GStreamer Error"
 msgstr ""
 
-#: gajim/dialog_messages.py:117
+#: gajim/dialog_messages.py:114
 #, fuzzy, python-format
 msgid ""
 "Error: %(error)s\n"
 "Debug: %(debug)s"
 msgstr "Introduza a sua mensagem :"
 
-#: gajim/dialog_messages.py:121
+#: gajim/dialog_messages.py:118
 #, fuzzy
-msgid "Wrong host"
+msgid "Wrong Host"
 msgstr "Frase de acesso"
 
-#: gajim/dialog_messages.py:122
+#: gajim/dialog_messages.py:119
 msgid "Invalid local address? :-O"
 msgstr ""
 
-#: gajim/dialog_messages.py:126
-msgid "Avahi error"
-msgstr ""
+#: gajim/dialog_messages.py:123
+#, fuzzy
+msgid "Avahi Error"
+msgstr "Erro:"
 
-#: gajim/dialog_messages.py:127
+#: gajim/dialog_messages.py:124
 #, python-format
 msgid ""
 "%s\n"
 "Link-local messaging might not work properly."
 msgstr ""
 
-#: gajim/dialog_messages.py:131 gajim/dialog_messages.py:136
-msgid "Could not request upload slot"
+#: gajim/dialog_messages.py:128 gajim/dialog_messages.py:133
+msgid "Could not request upload slot for HTTP File Upload"
 msgstr ""
 
-#: gajim/dialog_messages.py:137
-msgid "Got unexpected response from server (see log)"
+#: gajim/dialog_messages.py:134
+msgid "Got unexpected response from server (see log)."
 msgstr ""
 
-#: gajim/dialog_messages.py:141 gajim/dialog_messages.py:146
-msgid "Could not open file"
+#: gajim/dialog_messages.py:138 gajim/dialog_messages.py:143
+msgid "Could not Open File"
 msgstr ""
 
-#: gajim/dialog_messages.py:142
-msgid "Exception raised while opening file (see log)"
+#: gajim/dialog_messages.py:139
+msgid "Exception raised while trying to open file (see log)."
 msgstr ""
 
-#: gajim/dialog_messages.py:151
-msgid "Unsecure"
-msgstr ""
+#: gajim/dialog_messages.py:148
+#, fuzzy
+msgid "Not Secure"
+msgstr "Não iniciada"
 
-#: gajim/dialog_messages.py:152
-msgid "Server returned unsecure transport (HTTP)"
+#: gajim/dialog_messages.py:149
+msgid "The server returned an insecure transport (HTTP)."
 msgstr ""
 
-#: gajim/dialog_messages.py:156
-msgid "Could not upload file"
-msgstr ""
+#: gajim/dialog_messages.py:153
+#, fuzzy
+msgid "Could not Upload File"
+msgstr "Guardar Ficheiro como..."
 
-#: gajim/dialog_messages.py:157
+#: gajim/dialog_messages.py:154
 #, python-format
 msgid "HTTP response code from server: %s"
 msgstr ""
 
-#: gajim/dialog_messages.py:161
+#: gajim/dialog_messages.py:158
 msgid "Upload Error"
 msgstr ""
 
-#: gajim/dialog_messages.py:166
+#: gajim/dialog_messages.py:163
 #, fuzzy
 msgid "Encryption Error"
 msgstr "Encriptação activada"
 
-#: gajim/dialog_messages.py:167
-#, fuzzy
-msgid "For the chosen encryption there is no encryption method available"
-msgstr "Uma ligação não está disponível"
+#: gajim/dialog_messages.py:164
+msgid "There is no encryption method available for the chosen encryption."
+msgstr ""
 
-#: gajim/dialog_messages.py:171
+#: gajim/dialog_messages.py:169
 #, fuzzy
-msgid "Avatar upload failed"
+msgid "Avatar Upload Failed"
 msgstr "Publicação vCard falhou"
 
-#: gajim/privatechat_control.py:204
+#: gajim/privatechat_control.py:207
 msgid "Sending private message failed"
 msgstr "Falha ao enviar uma mensagem privada"
 
-#: gajim/privatechat_control.py:206
+#: gajim/privatechat_control.py:209
 #, 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."
@@ -2508,7 +2463,7 @@ msgstr "mostrar ajuda sobre comando"
 
 #: gajim/gajim_remote.py:85
 #, fuzzy
-msgid "Lists all contacts in roster, one for each line"
+msgid "Lists all contacts in the contact list, one for each line"
 msgstr ""
 "Mostra uma lista de todos os contactos na lista. Cada contacto aparece numa "
 "linha separada"
@@ -2595,11 +2550,13 @@ msgstr ""
 
 #: gajim/gajim_remote.py:118
 #, fuzzy
-msgid "Sends new chat message to a contact in the roster. Account is optional."
+msgid ""
+"Sends new chat message to a contact in the contact list. Account is optional."
 msgstr "Enviar uma mensagem ao contacto"
 
 #: gajim/gajim_remote.py:120 gajim/gajim_remote.py:130
-msgid "JID of the contact that will receive the message"
+#, fuzzy
+msgid "XMPP Address of the contact that will receive the message"
 msgstr "JID do destinatário da mensagem"
 
 #: gajim/gajim_remote.py:121 gajim/gajim_remote.py:132
@@ -2613,8 +2570,10 @@ msgid "if specified, the message will be sent using this account"
 msgstr "se especificado, a mensagem será enviada usadando esta conta"
 
 #: gajim/gajim_remote.py:127
-msgid "Sends a chat message to someone on your roster. Account is optional."
-msgstr ""
+#, fuzzy
+msgid ""
+"Sends a chat message to someone on your contact list. Account is optional."
+msgstr "Enviar uma mensagem ao contacto"
 
 #: gajim/gajim_remote.py:131
 #, fuzzy
@@ -2627,12 +2586,12 @@ msgid "message subject"
 msgstr "Mensagem"
 
 #: gajim/gajim_remote.py:138
-msgid "Sends new message to a groupchat you've joined."
+msgid "Sends new message to a group chat you've joined."
 msgstr ""
 
 #: gajim/gajim_remote.py:140
 #, fuzzy
-msgid "JID of the room that will receive the message"
+msgid "XMPP Address of the group chat that will receive the message"
 msgstr "JID do destinatário da mensagem"
 
 #: gajim/gajim_remote.py:147
@@ -2641,7 +2600,8 @@ msgstr "Busca informações detalhadas sobre um contacto"
 
 #: gajim/gajim_remote.py:149 gajim/gajim_remote.py:162
 #: gajim/gajim_remote.py:192
-msgid "JID of the contact"
+#, fuzzy
+msgid "XMPP Address of the contact"
 msgstr "JID do contacto"
 
 #: gajim/gajim_remote.py:153
@@ -2707,7 +2667,8 @@ msgstr ""
 "Escreve o estado actual das preferências do Gajim para o ficheiro .config"
 
 #: gajim/gajim_remote.py:190
-msgid "Removes contact from roster"
+#, fuzzy
+msgid "Removes contact from contact list"
 msgstr "Remove o contacto da lista"
 
 #: gajim/gajim_remote.py:193
@@ -2758,9 +2719,9 @@ msgid "Missing argument \"contact_jid\""
 msgstr "Argumento em falta \"contacto_jid\""
 
 #: gajim/gajim_remote.py:275
-#, python-format
+#, fuzzy, python-format
 msgid ""
-"'%s' is not in your roster.\n"
+"'%s' is not in your contact list.\n"
 "Please specify account for sending the message."
 msgstr ""
 "'%s' não está na sua lista.\n"
@@ -2991,12 +2952,12 @@ msgstr ""
 msgid "Weekend!"
 msgstr ""
 
-#: gajim/common/logger.py:192 gajim/common/logger.py:197
+#: gajim/common/logger.py:189 gajim/common/logger.py:194
 #, 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:217
+#: gajim/common/logger.py:214
 #, fuzzy, python-format
 msgid "Creating %s"
 msgstr "Descrição: %s"
@@ -3071,24 +3032,23 @@ msgstr "%(nickname)s Terminou Sessão"
 msgid "Contact Signed Out"
 msgstr "Contacto Saiu"
 
-#: gajim/common/contacts.py:455
-#, fuzzy
-msgid "Not in roster"
-msgstr "Fora da lista"
-
 #: gajim/common/config.py:80
+#, fuzzy
 msgid ""
 "Show desktop notification even when a chat window is opened for this contact "
-"and does not have focus"
+"and does not have focus."
 msgstr ""
+"Permitir popup/notificações quando estou _ausente/indisponível/ocupado/"
+"invisível"
 
 #: gajim/common/config.py:81
-msgid "Play sound when user is busy"
+msgid "Play sound even when being busy."
 msgstr ""
 
 #: gajim/common/config.py:83
-msgid "Show only online and free for chat contacts in roster."
-msgstr ""
+#, fuzzy
+msgid "Show only online and free for chat contacts in the contact list."
+msgstr "Gostaria de o adicionar à minha lista de contactos."
 
 #: gajim/common/config.py:86
 msgid "Time in minutes, after which your status changes to away."
@@ -3096,11 +3056,13 @@ msgstr "Tempo, em minutos, após o qual o seu estado muda para Ausente."
 
 #: gajim/common/config.py:87
 #, fuzzy
-msgid "$S (Away as a result of being idle more than $T min)"
+msgid "$S (Away: Idle more than $T min)"
 msgstr "Ausente por estar inactivo"
 
 #: gajim/common/config.py:87
-msgid "$S will be replaced by current status message, $T by autoawaytime."
+msgid ""
+"$S will be replaced by current status message, $T by the 'autoawaytime' "
+"value."
 msgstr ""
 
 #: gajim/common/config.py:89
@@ -3109,70 +3071,70 @@ msgstr "Tempo, em minutos, após o qual o seu estado muda para Indisponível."
 
 #: gajim/common/config.py:90
 #, fuzzy
-msgid "$S (Not available as a result of being idle more than $T min)"
+msgid "$S (Not available: Idle more than $T min)"
 msgstr "Indisponível por estar inactivo"
 
 #: gajim/common/config.py:90
-msgid "$S will be replaced by current status message, $T by autoxatime."
+msgid ""
+"$S will be replaced by current status message, $T by the 'autoxatime' value."
 msgstr ""
 
 #: gajim/common/config.py:93
 msgid ""
-"When to show notification area icon. Can be 'never', 'on_event', 'always'."
+"When to show the notification area icon. Can be 'never', 'on_event', and "
+"'always'."
 msgstr ""
 
 #: gajim/common/config.py:94
-msgid "Allow to hide the roster window even if the tray icon is not shown."
+msgid ""
+"Allow to hide the contact list window even if the notification area icon is "
+"not shown."
 msgstr ""
 
 #: gajim/common/config.py:97
 #, fuzzy
-msgid "Contact signed in notification color."
-msgstr "Mostrar apenas na _lista"
+msgid "Notification color for contacts signing in."
+msgstr "Notificar-me sobre contactos que acabem de se: "
 
 #: gajim/common/config.py:98
 #, fuzzy
-msgid "Contact signout notification color"
-msgstr "Mostrar apenas na _lista"
+msgid "Notification color for contacts signing out."
+msgstr "Notificar-me sobre contactos que acabem de se: "
 
 #: gajim/common/config.py:99
 #, fuzzy
-msgid "New message notification color."
+msgid "Notification color for new message notification."
 msgstr "Noti_ficação do estado da conversa:"
 
 #: gajim/common/config.py:100
 #, fuzzy
-msgid "File transfer request notification color."
-msgstr "Pedido de Transferência de Ficheiro"
+msgid "Notification color for file transfer request."
+msgstr "_Notificar-me quando uma transferência de ficheiro estiver completa"
 
 #: gajim/common/config.py:101
 #, fuzzy
-msgid "File transfer error notification color."
-msgstr "Transferência de ficheiro cancelada"
+msgid "Notification color for file transfer errors."
+msgstr "_Notificar-me quando uma transferência de ficheiro estiver completa"
 
 #: gajim/common/config.py:102
-#, fuzzy
-msgid "File transfer complete or stopped notification color."
+msgid "Notification color for stopped or completed file transfers."
 msgstr ""
-"Quando uma transferência de ficheiro é concluida, exibir um popup de "
-"notificação"
 
 #: gajim/common/config.py:103
-#, fuzzy
-msgid "Groupchat invitation notification color"
-msgstr "?Função do Contacto no Chat:Nenhuma"
+msgid "Notification color for group chat invitations."
+msgstr ""
 
 #: gajim/common/config.py:104
-msgid "Background color of status changed notification"
+msgid "Notification background color for changed status."
 msgstr ""
 
 #: gajim/common/config.py:105
-msgid "Other dialogs color."
+msgid "Notification color for other dialogs."
 msgstr ""
 
 #: gajim/common/config.py:106
 msgid ""
-"List (space separated) of rows (accounts and groups) that are collapsed."
+"List of rows (accounts and groups) that are collapsed (space separated)."
 msgstr ""
 
 #: gajim/common/config.py:107
@@ -3180,8 +3142,9 @@ msgstr ""
 msgid "default"
 msgstr "Apagar MOTD"
 
-#: gajim/common/config.py:113
-msgid "Language used by speller"
+#: gajim/common/config.py:113 gajim/common/config.py:424
+#: gajim/common/config.py:431
+msgid "Language used for spell checking."
 msgstr ""
 
 #: gajim/common/config.py:114
@@ -3194,8 +3157,8 @@ msgstr ""
 #: gajim/common/config.py:115
 msgid ""
 "Print time in chats using Fuzzy Clock. Value of fuzziness from 1 to 4, or 0 "
-"to disable fuzzyclock. 1 is the most precise clock, 4 the least precise one. "
-"This is used only if print_time is 'sometimes'."
+"to disable Fuzzy Clock. 1 is the most precise clock, 4 the least precise "
+"one. This is used only if 'print_time' is 'sometimes'."
 msgstr ""
 
 #: gajim/common/config.py:117
@@ -3209,812 +3172,838 @@ msgstr ""
 #: gajim/common/config.py:120
 #, fuzzy
 msgid ""
-"If true, do not remove */_ . So *abc* will be bold but with * * not removed."
+"If enabled, do not remove */_ . So *abc* will be bold but with * * not "
+"removed."
 msgstr ""
 "Se Verdadeiro (True), não remover */_ . Para que *abc* fique em negrito "
 "(bold) mas * * não seja removido."
 
 #: gajim/common/config.py:123
 msgid ""
-"Uses ReStructured text markup to send HTML, plus ascii formatting if "
-"selected. For syntax, see http://docutils.sourceforge.net/docs/ref/rst/"
-"restructuredtext.html (If you want to use this, install docutils)"
+"Uses ReStructured text markup to send HTML, plus ASCII formatting if "
+"selected. Needs docutils installed (for syntax, see http://docutils."
+"sourceforge.net/docs/ref/rst/restructuredtext.html)."
 msgstr ""
 
 #: gajim/common/config.py:132
 msgid ""
-"Character to add after nickname when using nick completion (tab) in group "
-"chat."
+"Character to add after nickname when using nickname completion (tab) in "
+"group chat."
 msgstr ""
 
 #: gajim/common/config.py:133
 msgid ""
-"Character to propose to add after desired nickname when desired nickname is "
-"used by someone else in group chat."
+"Character to propose to add after desired nickname when nickname is already "
+"used in group chat."
 msgstr ""
 
 #: gajim/common/config.py:155
 msgid ""
-"If true, Gajim will save roster position when hiding roster, and restore it "
-"when showing roster."
+"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:161
-msgid "Place the roster on the right in single window mode"
+msgid "Place the contact list on the right in single window mode"
 msgstr ""
 
 #: gajim/common/config.py:167
 msgid ""
-"This option let you customize timestamp that is printed in conversation. For "
-"example \"[%H:%M] \" will show \"[hour:minute] \". See python doc on "
-"strftime for full documentation: http://docs.python.org/lib/module-time.html"
+"This option lets you customize the timestamp that is printed in "
+"conversation. For example '[%H:%M] ' will show '[hour:minute] '. See python "
+"doc on strftime for full documentation (https://docs.python.org/3/library/"
+"time.html)."
 msgstr ""
 
 #: gajim/common/config.py:168
-msgid "Characters that are printed before the nickname in conversations"
+msgid "Characters that are printed before the nickname in conversations."
 msgstr ""
 
 #: gajim/common/config.py:169
-msgid "Characters that are printed after the nickname in conversations"
+msgid "Characters that are printed after the nickname in conversations."
 msgstr ""
 
 #: gajim/common/config.py:170
-msgid "Add * and [n] in roster title?"
-msgstr "Adicionar * e [n] no título da lista de contactos?"
+#, 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:171
 #, fuzzy
 msgid ""
-"How many history messages should be restored when a chat tab/window is "
-"reopened?"
+"Number of messages from chat history to be restored when a chat tab/window "
+"is reopened."
 msgstr ""
 "Número de linhas, da conversa anterior, a lembrar para quando uma janela/aba "
 "de conversa seja reaberta."
 
 #: gajim/common/config.py:172
-msgid "How far back in time (minutes) history is restored. -1 means no limit."
+msgid ""
+"How far back in time (minutes) chat history is restored. -1 means no limit."
 msgstr ""
 
 #: gajim/common/config.py:173
 msgid ""
-"How many lines to request from server when entering a groupchat. -1 means no "
-"limit"
+"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:174
 msgid ""
-"Minutes of backlog to request when entering a groupchat. -1 means no limit"
+"Should automatic rejoin be activated when you were kicked from a group chat?"
 msgstr ""
 
 #: gajim/common/config.py:175
-msgid ""
-"How many seconds to wait before trying to autorejoin to a conference you are "
-"being disconnected from. Set to 0 to disable autorejoining."
-msgstr ""
-
-#: gajim/common/config.py:176
-msgid "Should autorejoin be activated when kicked from a conference?"
-msgstr ""
-
-#: gajim/common/config.py:177
-msgid ""
-"Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
-"Client default behaviour)."
+#, 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:179
-msgid "How many lines to store for Ctrl+KeyUP."
+#: gajim/common/config.py:177
+#, 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:182
+#: gajim/common/config.py:180
 #, fuzzy, python-format
 msgid ""
-"Either custom URL with %%s in it where %%s is the word/phrase or "
-"'WIKTIONARY' which means use Wikitionary."
+"Either a custom URL with %%s in it (where %%s is the word/phrase) or "
+"'WIKTIONARY' (which means use Wikitionary)."
 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:185
+#: gajim/common/config.py:183
 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:187
+#: gajim/common/config.py:185
 msgid ""
-"When not printing time for every message (print_time==sometimes), print it "
+"When not printing time for every message ('print_time'==sometimes), print it "
 "every x minutes."
 msgstr ""
 
-#: gajim/common/config.py:188
+#: gajim/common/config.py:186
 msgid "Ask before pasting an image."
 msgstr ""
 
-#: gajim/common/config.py:189
+#: gajim/common/config.py:187
 msgid "Ask before closing a group chat tab/window."
 msgstr "Perguntar antes de fechar uma janela/aba de chat."
 
-#: gajim/common/config.py:190
+#: gajim/common/config.py:188
 #, fuzzy
 msgid ""
-"Always ask for confirmation before closing groupchats with any of the JIDs "
-"on this space separated list."
+"Always ask for confirmation before closing group chats with any of the XMPP "
+"Addresses on this list (space separated)."
 msgstr "Perguntar antes de fechar uma janela/aba de chat."
 
-#: gajim/common/config.py:191
+#: gajim/common/config.py:189
 #, fuzzy
 msgid ""
-"Never ask for confirmation before closing groupchats with any of the JIDs on "
-"this space separated list."
+"Never ask for confirmation before closing group chats with any of the XMPP "
+"Addresses on this list (space separated)."
 msgstr "Perguntar antes de fechar uma janela/aba de chat."
 
-#: gajim/common/config.py:192
+#: gajim/common/config.py:190
 msgid ""
-"Ask before closing tabbed chat window if there are controls that can lose "
-"data (chat, private chat, groupchat that will not be minimized)"
+"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:195
+#: gajim/common/config.py:193
 #, fuzzy
 msgid ""
-"Comma separated list of sent hosts, in addition of local interfaces, for "
-"File Transfer in case of address translation/port forwarding."
+"List of send hosts (comma separated) in addition to local interfaces for "
+"file transfers (in case of address translation/port forwarding)."
 msgstr ""
 "Overrides the host we send for File Transfer in case of address translation/"
 "port forwarding."
 
-#: gajim/common/config.py:196
+#: gajim/common/config.py:194
 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:198
+#: gajim/common/config.py:196
 msgid "Notify of events in the notification area."
 msgstr ""
 
-#: gajim/common/config.py:199
+#: gajim/common/config.py:197
 msgid ""
-"If False, Gajim will display a static event icon instead of the blinking "
-"status icon in the notification area when notifying on event."
+"If disabled, Gajim will display a static event icon instead of the blinking "
+"status icon in the notification area when notifying about an event."
 msgstr ""
 
-#: gajim/common/config.py:205
+#: gajim/common/config.py:203
 msgid "Show tab when only one conversation?"
 msgstr "Mostrar aba quando apenas numa conversa?"
 
-#: gajim/common/config.py:206
+#: gajim/common/config.py:204
 #, fuzzy
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "Mostrar borda da aba quando apenas numa conversa?"
 
-#: gajim/common/config.py:207
+#: gajim/common/config.py:205
 msgid "Show close button in tab?"
 msgstr "Mostrar botão de fechar na aba?"
 
-#: gajim/common/config.py:220
+#: gajim/common/config.py:218
 #, fuzzy
 msgid "Preview new messages in notification popup?"
 msgstr "Noti_ficação do estado da conversa:"
 
-#: gajim/common/config.py:223
+#: gajim/common/config.py:221
 #, fuzzy
 msgid ""
-"A semicolon-separated list of words that will be highlighted in group chats."
+"A list of words (semicolon separated) that will be highlighted in group "
+"chats."
 msgstr ""
 "Uma lista de palavras separadas por ponto-e-vírgula e que serão sublinhadas "
 "num chat de vários utilizadores."
 
-#: gajim/common/config.py:224
+#: gajim/common/config.py:222
 #, fuzzy
 msgid ""
-"If true, quits Gajim when X button of Window Manager is clicked. This "
-"setting is taken into account only if notification icon is used."
+"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 ""
 "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:225
+#: gajim/common/config.py:223
 msgid ""
-"If true, Gajim hides the Roster window on pressing the X button instead of "
-"minimizing into the Dock."
+"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:226
+#: gajim/common/config.py:224
 #, fuzzy
 msgid ""
-"If true, Gajim will display an icon on each tab containing unread messages. "
-"Depending on the theme, this icon may be animated."
+"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:227
+#: gajim/common/config.py:225
 #, fuzzy
 msgid ""
-"If true, Gajim will display the status message, if not empty, for every "
-"contact under the contact name in roster window."
+"If enabled, Gajim will display the status message (if not empty) underneath "
+"the contact name in the contact list window."
 msgstr ""
 "Se Verdadeiro (True), Gajim exibirá a mensagem de estado, caso houver, de "
 "cada contacto debaixo do nome de cada um deles na lista"
 
-#: gajim/common/config.py:233
-msgid "Define the position of the avatar in roster. Can be left or right"
+#: gajim/common/config.py:231
+msgid ""
+"Define the position of avatars in the contact list. Can be 'left' or 'right'."
 msgstr ""
 
-#: gajim/common/config.py:234
+#: gajim/common/config.py:232
 #, fuzzy
 msgid ""
-"If False, Gajim will no longer print status line in chats when a contact "
-"changes their status and/or their status message."
+"If disabled, Gajim will no longer print status messages in chats when a "
+"contact changes their status (and/or their status message)."
 msgstr ""
 "Se Falso (False), deixará de ver a linha de estados em conversas quando um "
 "contacto mudar de estado ou de mensagem de estado."
 
-#: gajim/common/config.py:235
+#: gajim/common/config.py:233
 #, fuzzy
 msgid ""
 "Default Setting: Show a status message for every join or leave in a group "
-"chat"
+"chat."
 msgstr "Impossível entrar na sala"
 
-#: gajim/common/config.py:236
+#: gajim/common/config.py:234
+#, fuzzy
 msgid ""
-"Default Setting: Show a status message for all status (away, dnd, etc.) "
-"changes of users in a group chat"
-msgstr ""
+"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:238
-msgid "Log XHTML messages instead of plain text messages."
+#: gajim/common/config.py:236
+msgid "Store XHTML messages in chat history instead of plain text messages."
 msgstr ""
 
-#: gajim/common/config.py:239
+#: gajim/common/config.py:237
 msgid "Don't show avatar for the transport itself."
 msgstr ""
 
-#: gajim/common/config.py:240
-msgid "Don't show roster in the system taskbar."
+#: gajim/common/config.py:238
+msgid "Don't show contact list window in the system taskbar."
 msgstr ""
 
-#: gajim/common/config.py:241
+#: gajim/common/config.py:239
 msgid ""
-"If true, make the window flash (the default behaviour in most Window "
-"Managers) when holding pending events."
+"If enabled, Gajim makes the window flash (the default behaviour in most "
+"Window Managers) when holding pending events."
 msgstr ""
 
-#: gajim/common/config.py:245
+#: gajim/common/config.py:243
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
 "'always_with_roster' - Like 'always' but the messages are in a single window "
-"along with the roster.\n"
+"along with the contact list.\n"
 "'never' - All messages get their own window.\n"
 "'peracct' - Messages for each account are sent to a specific window.\n"
-"'pertype' - Each message type (e.g. chats vs. groupchats) is sent to a "
+"'pertype' - Each message type (e.g. chats vs. group chats) is sent to a "
 "specific window."
 msgstr ""
 
-#: gajim/common/config.py:246
+#: gajim/common/config.py:244
 msgid ""
-"Show roster on startup.\n"
-"'always' - Always show roster.\n"
-"'never' - Never show roster.\n"
-"'last_state' - Restore the last state roster."
+"Show contact list window on startup.\n"
+"'always' - Always show contact list window.\n"
+"'never' - Never show contact list window.\n"
+"'last_state' - Restore last state of the contact list window."
 msgstr ""
 
-#: gajim/common/config.py:247
-msgid "If False, you will no longer see the avatar in the chat window."
+#: gajim/common/config.py:245
+#, 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:248
-msgid "If true, pressing the escape key closes a tab/window."
+#: gajim/common/config.py:246
+msgid "If enabled, pressing Esc closes a tab/window."
 msgstr ""
 
+#: gajim/common/config.py:247
+#, fuzzy
+msgid "Hides the banner in a group chat window."
+msgstr "Perguntar antes de fechar uma janela/aba de chat."
+
+#: gajim/common/config.py:248
+#, 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:249
 #, fuzzy
-msgid "Hides the banner in a group chat window"
+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:250
-msgid "Hides the banner in two persons chat window"
+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:251
-#, fuzzy
-msgid "Hides the group chat occupants list in group chat window."
-msgstr "Perguntar antes de fechar uma janela/aba de chat."
+msgid "Indentation when using merge consecutive nickname."
+msgstr ""
 
 #: gajim/common/config.py:252
 msgid ""
-"In a chat, show the nickname at the beginning of a line only when it's not "
-"the same person talking than in previous message."
+"Ctrl+Tab switches to the next composing tab when there are no tabs with "
+"messages pending."
 msgstr ""
 
 #: gajim/common/config.py:253
-msgid "Indentation when using merge consecutive nickname."
+msgid ""
+"Show a confirmation dialog to create metacontacts? Empty string means never "
+"show the dialog."
 msgstr ""
 
 #: gajim/common/config.py:254
-msgid "Ctrl-Tab go to next composing tab when none is unread."
+msgid ""
+"Show a confirmation dialog to block a contact? Empty string means never show "
+"the dialog."
 msgstr ""
 
 #: gajim/common/config.py:255
 msgid ""
-"Show the confirm metacontacts creation dialog or not? Empty string means "
-"never show the dialog."
+"Show a confirmation dialog for a custom status? Empty string means never "
+"show the dialog."
 msgstr ""
 
 #: gajim/common/config.py:256
 msgid ""
-"Show the confirm block contact dialog or not? Empty string means never show "
-"the dialog."
+"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:257
 msgid ""
-"Show the confirm custom status dialog or not? Empty string means never show "
-"the dialog."
+"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:258
 msgid ""
-"If true, you will be able to set a negative priority to your account in "
-"account modification window. BE CAREFUL, when you are logged in with a "
-"negative priority, you will NOT receive any message from your server."
+"Can be empty, 'chat' or 'normal'. If not empty, all incoming messages are "
+"treated as if they were of this type."
 msgstr ""
 
 #: gajim/common/config.py:259
 msgid ""
-"If true, Gajim will show number of online and total contacts in account and "
-"group rows."
+"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:260
-msgid ""
-"Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
-"as if they were of this type"
+msgid "Time of inactivity needed before the change status window closes down."
 msgstr ""
 
 #: gajim/common/config.py:261
 msgid ""
-"If true, Gajim will scroll and select the contact who sent you the last "
-"message, if chat window is not already opened."
+"Maximum number of lines that are printed in conversations. Oldest lines are "
+"cleared."
 msgstr ""
 
 #: gajim/common/config.py:262
-msgid "Time of inactivity needed before the change status window closes down."
+msgid ""
+"If enabled, notification windows from notification-daemon will be attached "
+"to the notification area icon."
 msgstr ""
 
 #: gajim/common/config.py:263
-msgid ""
-"Maximum number of lines that are printed in conversations. Oldest lines are "
-"cleared."
+msgid "Choose interval between 2 checks of idleness."
 msgstr ""
 
 #: gajim/common/config.py:264
 msgid ""
-"If true, notification windows from notification-daemon will be attached to "
-"notification icon."
+"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:265
-msgid "Choose interval between 2 checks of idleness."
+msgid ""
+"If enabled, completion in group chats will be like a shell auto-completion."
 msgstr ""
 
-#: gajim/common/config.py:266
-msgid ""
-"Valid uri schemes. Only schemes in this list will be accepted as \"real\" "
-"uri. (mailto and xmpp are handled separately)"
+#: gajim/common/config.py:270
+msgid "Optionally fix Jingle output video framerate. Example: 10/1 or 25/2."
 msgstr ""
 
-#: gajim/common/config.py:267
-msgid "If true, completion in groupchats will be like a shell auto-completion"
+#: gajim/common/config.py:271
+msgid "Optionally resize Jingle output video. Example: 320x240."
 msgstr ""
 
 #: gajim/common/config.py:272
-msgid "Optionally fix jingle output video framerate. Example: 10/1 or 25/2"
+msgid "If enabled, you will see your webcam's video stream as well."
 msgstr ""
 
-#: gajim/common/config.py:273
-msgid "Optionally resize jingle output video. Example: 320x240"
+#: gajim/common/config.py:275
+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:274
-msgid "If true, You will also see your webcam"
+#: gajim/common/config.py:276
+msgid "STUN server to use when using Jingle"
 msgstr ""
 
 #: gajim/common/config.py:277
 msgid ""
-"If true, Gajim will try to use a STUN server when using Jingle. The one in "
-"\"stun_server\" option, or the one given by the XMPP server."
+"If enabled, Gajim will show affiliation of group chat participants by adding "
+"a colored square to the status icon."
 msgstr ""
 
 #: gajim/common/config.py:278
-msgid "STUN server to use when using Jingle"
+msgid ""
+"Proxy used for all outgoing connections if the account does not have a "
+"specific proxy configured."
 msgstr ""
 
 #: gajim/common/config.py:279
-msgid ""
-"If true, Gajim will show affiliation of groupchat occupants by adding a "
-"colored square to the status icon"
+msgid "If enabled, Gajim will ignore incoming attention requests ('wizz')."
 msgstr ""
 
 #: gajim/common/config.py:280
 msgid ""
-"Proxy used for all outgoing connections if the account does not have a "
-"specific proxy configured"
+"If enabled, Gajim will reopen chat windows that were opened last time Gajim "
+"was closed."
 msgstr ""
 
 #: gajim/common/config.py:281
-msgid "If true, Gajim will ignore incoming attention requests (\"wizz\")."
+msgid ""
+"If enabled, Gajim will display an icon to show that sent messages have been "
+"received by your contact."
 msgstr ""
 
 #: gajim/common/config.py:282
-msgid ""
-"If enabled, Gajim will reopen chat windows that were opened last time Gajim "
-"was closed."
+msgid "Show a mini avatar in chat window tabs and as the window's icon."
 msgstr ""
 
 #: gajim/common/config.py:283
 msgid ""
-"If enabled, Gajim will show an icon to show that sent message has been "
-"received by your contact"
+"If enabled, Gajim will use the System's Keyring to store account passwords."
 msgstr ""
 
 #: gajim/common/config.py:284
-msgid "Show a mini avatar in chat window tabs and in window icon"
+msgid "If enabled, Gajim will execute XEP-0146 Commands."
 msgstr ""
 
 #: gajim/common/config.py:285
-msgid "If true, Gajim will use the Systems Keyring to store account passwords."
+msgid "2: System, 1: Enabled, 0: Disabled"
 msgstr ""
 
 #: gajim/common/config.py:286
-msgid "If true, Gajim will execute XEP-0146 Commands."
+msgid "Options in days which can be chosen in the sync threshold menu"
 msgstr ""
 
 #: gajim/common/config.py:287
-msgid "2: System, 1: Enabled, 0: Disabled"
+msgid ""
+"Maximum history in days we request from a public group chat archive. 0: As "
+"much as possible."
 msgstr ""
 
 #: gajim/common/config.py:288
-msgid "Options in days which can be chosen in the sync threshold menu"
+msgid ""
+"Maximum history in days we request from a private group chat archive. 0: As "
+"much as possible."
 msgstr ""
 
 #: gajim/common/config.py:289
 msgid ""
-"Maximum history in days we request from a public room archive. 0: As much as "
-"possible"
+"If enabled, Gajim shows the group chat subject in the chat window when "
+"joining."
 msgstr ""
 
 #: gajim/common/config.py:290
+#, fuzzy
 msgid ""
-"Maximum history in days we request from a private room archive. 0: As much "
-"as possible"
-msgstr ""
+"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:291
-msgid "If the room subject is shown in chat on join"
-msgstr ""
+#, 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:292
+#, fuzzy
 msgid ""
-"If the contact row is colored according to the current chatstate of the "
-"contact"
-msgstr ""
+"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:293
-msgid "If the tab is colored according to the current chatstate of the contact"
-msgstr ""
-
-#: gajim/common/config.py:294
-msgid ""
-"Shows a text in the banner that describes the current chatstate of the "
-"contact"
-msgstr ""
-
-#: gajim/common/config.py:295 gajim/common/config.py:424
 msgid ""
 "Chat state notifications that are sent to contacts. Possible values: all, "
 "composing_only, disabled"
 msgstr ""
 
-#: gajim/common/config.py:296 gajim/common/config.py:438
+#: gajim/common/config.py:294
 msgid ""
 "Chat state notifications that are sent to the group chat. Possible values: "
-"all, composing_only, disabled"
+"'all', 'composing_only', 'disabled'"
 msgstr ""
 
-#: gajim/common/config.py:312
-msgid ""
-"Priority will change automatically according to your status. Priorities are "
-"defined in autopriority_* options."
+#: gajim/common/config.py:297
+msgid "API Preferences. Possible values: 'http', 'iq'"
 msgstr ""
 
-#: gajim/common/config.py:320
+#: gajim/common/config.py:313
 msgid ""
-"Status used to autoconnect as. Can be online, chat, away, xa, dnd, "
-"invisible. NOTE: this option is used only if restore_last_status is disabled"
+"Priority will change automatically according to your status. Priorities are "
+"defined in 'autopriority_*' options."
 msgstr ""
 
 #: gajim/common/config.py:321
-msgid "If enabled, restore the last status that was used."
+msgid ""
+"Status to be used automatically when connecting. Can be 'online', 'chat', "
+"'away', 'xa', 'dnd' or 'invisible'. NOTE: This option is used only if "
+"'restore_last_status' is disabled."
 msgstr ""
 
 #: gajim/common/config.py:322
-msgid ""
-"If true, Contacts requesting authorization will be automatically accepted."
+msgid "If enabled, the last status will be restored."
 msgstr ""
 
 #: gajim/common/config.py:323
 msgid ""
-"If False, this account will be disabled and will not appear in roster window."
+"If enabled, Contacts requesting authorization will be accepted automatically."
 msgstr ""
 
-#: gajim/common/config.py:327
-msgid "Allow plaintext connections"
+#: gajim/common/config.py:324
+msgid ""
+"If disabled, this account will be disabled and will not appear in the "
+"contact list window."
 msgstr ""
 
-#: gajim/common/config.py:330
-msgid ""
-"List (space separated) of authentication mechanisms to try. Can contain "
-"ANONYMOUS, EXTERNAL, GSSAPI, SCRAM-SHA-1-PLUS, SCRAM-SHA-1, DIGEST-MD5, "
-"PLAIN, X-MESSENGER-OAUTH2 or XEP-0078"
+#: gajim/common/config.py:328
+msgid "Allow plaintext connections."
 msgstr ""
 
 #: gajim/common/config.py:331
 msgid ""
-"Show a warning dialog before sending password on an plaintext connection. "
-"Can be 'warn', 'connect', 'disconnect'"
+"List of authentication mechanisms to try (space separated). Can contain "
+"'ANONYMOUS', 'EXTERNAL', 'GSSAPI', 'SCRAM-SHA-1-PLUS', 'SCRAM-SHA-1', "
+"'DIGEST-MD5', 'PLAIN', 'X-MESSENGER-OAUTH2' or 'XEP-0078'."
 msgstr ""
 
 #: gajim/common/config.py:332
-msgid "Show a warning dialog before using standard SSL library."
+msgid ""
+"Show a warning dialog before sending password on an plaintext connection. "
+"Can be 'warn', 'connect' or 'disconnect'."
 msgstr ""
 
 #: gajim/common/config.py:333
-msgid ""
-"Show a warning dialog before sending PLAIN password over a plain connection."
+msgid "Show a warning dialog before using standard SSL library."
 msgstr ""
 
 #: gajim/common/config.py:334
-msgid "Space separated list of ssl errors to ignore."
+msgid ""
+"Show a warning dialog before sending PLAIN password over a plain connection."
 msgstr ""
 
-#: gajim/common/config.py:340
-msgid ""
-"Space separated list of JIDs for which you do not want to store logs. You "
-"can also add account name to log nothing for this account."
+#: gajim/common/config.py:335
+msgid "List of SSL errors to ignore (space separated)."
 msgstr ""
 
 #: gajim/common/config.py:341
 msgid ""
-"Space separated list of JIDs for which you accept to not log conversations "
-"if he does not want to."
+"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:343
-msgid "Whitespace sent after inactivity"
+#: gajim/common/config.py:342
+msgid ""
+"List of XMPP Addresses (space separated) for which you accept to not store "
+"chat history if your contact does not want to."
 msgstr ""
 
 #: gajim/common/config.py:344
-msgid "XMPP ping sent after inactivity"
+msgid "If enabled, a whitespace is sent after inactivity (keep alive)."
 msgstr ""
 
-#: gajim/common/config.py:348
-msgid ""
-"How many seconds to wait for the answer of ping alive packet before trying "
-"to reconnect?"
+#: gajim/common/config.py:345
+msgid "If enabled, an XMPP ping is sent after inactivity (ping alive)."
 msgstr ""
 
-#: gajim/common/config.py:352
-msgid "Jabberd2 workaround"
+#: gajim/common/config.py:349
+msgid ""
+"How many seconds to wait for the answer of a ping alive packet before trying "
+"to reconnect."
 msgstr ""
 
-#: gajim/common/config.py:355
-msgid ""
-"If checked, Gajim will use your IP and proxies defined in "
-"file_transfer_proxies option for file transfer."
+#: gajim/common/config.py:353
+msgid "Jabberd2 workaround."
 msgstr ""
 
 #: gajim/common/config.py:356
 msgid ""
-"If true, Gajim will test file transfer proxies on startup to be sure it "
-"works. Openfire's proxies are known to fail this test even if they work."
+"If enabled, Gajim will use your IP and proxies defined in "
+"'file_transfer_proxies' option for file transfers."
 msgstr ""
 
-#: gajim/common/config.py:369
-msgid "Answer to receipt requests"
+#: gajim/common/config.py:357
+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:370
-msgid "Sent receipt requests"
+msgid "If enabled, Gajim will answer to message receipt requests."
+msgstr ""
+
+#: gajim/common/config.py:371
+msgid "If enabled, Gajim will send message receipt requests."
 msgstr ""
 
-#: gajim/common/config.py:379
+#: gajim/common/config.py:380
 #, 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:380
+#: gajim/common/config.py:381
 msgid "Allow Gajim to send your local time."
 msgstr "Permitir que o Gajim envie a sua hora local."
 
-#: gajim/common/config.py:383
+#: gajim/common/config.py:384
 #, fuzzy
-msgid "Message that is sent to contacts you want to add"
+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:384
-msgid ""
-"If enabled, Gajim will send your local IPs so your contact can connect to "
-"your machine to transfer files."
-msgstr ""
-
 #: gajim/common/config.py:385
 msgid ""
-"Space separated list of JIDs for which chat window will be re-opened on next "
-"startup."
+"If enabled, Gajim will send your local IP so your contact can connect to "
+"your machine for file transfers."
 msgstr ""
 
-#: gajim/common/config.py:387
-msgid "HTTP Upload: Enable HTTPS Verification"
+#: gajim/common/config.py:386
+msgid ""
+"List of XMPP Addresses (space separated) for which the chat window will be "
+"re-opened on next startup."
 msgstr ""
 
 #: gajim/common/config.py:388
-msgid ""
-"Preferred file transfer mechanism for file drag&drop on chat window. Can be "
-"'httpupload' (default) or 'jingle'"
+msgid "HTTP File Upload: Enable HTTPS Verification."
 msgstr ""
 
 #: gajim/common/config.py:389
-msgid "Allow cert verification with POSH"
-msgstr ""
-
-#: gajim/common/config.py:423 gajim/common/config.py:430
-msgid "Language for which misspelled words will be checked"
+msgid ""
+"Preferred file transfer mechanism for file drag&drop on a chat window. Can "
+"be 'httpupload' (default) or 'jingle'."
 msgstr ""
 
-#: gajim/common/config.py:427
-msgid "The currently active encryption for that contact"
+#: gajim/common/config.py:390
+msgid "Allow certificate verification with POSH."
 msgstr ""
 
-#: gajim/common/config.py:431
+#: gajim/common/config.py:425
 msgid ""
-"How many lines to request from server when entering a groupchat. -1 means no "
-"limit, -2 means global value"
+"Chat state notifications that are sent to contacts. Possible values: 'all', "
+"'composing_only', 'disabled'"
 msgstr ""
 
+#: gajim/common/config.py:428
+#, fuzzy
+msgid "The currently active encryption for that contact."
+msgstr "Não é possível usar OpenPGP neste computador"
+
 #: gajim/common/config.py:432
 msgid ""
-"Minutes of backlog to request when entering a groupchat. -1 means no limit, "
-"-2 means global value"
+"If enabled, a notification is created for every message in this group chat."
 msgstr ""
 
 #: gajim/common/config.py:433
-msgid "State whether a notification is created for every message in this room"
-msgstr ""
-
-#: gajim/common/config.py:434
+#, fuzzy
 msgid ""
-"Show a status message for all status (away, dnd, etc.) changes of users in a "
-"group chat"
-msgstr ""
+"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:435
+#: gajim/common/config.py:434
 #, fuzzy
-msgid "Show a status message for every join or leave in a group chat"
+msgid "Show a status message for every join or leave in a group chat."
 msgstr "Impossível entrar na sala"
 
+#: gajim/common/config.py:435
+msgid ""
+"If enabled, the group chat is minimized into the contact list when joining "
+"automatically."
+msgstr ""
+
 #: gajim/common/config.py:436
-msgid "If the group chat is minimized into the roster on autojoin"
+msgid ""
+"If enabled, the group chat is minimized into the contact list when closing "
+"it."
 msgstr ""
 
 #: gajim/common/config.py:437
-msgid "If the group chat is minimized into the roster on close"
+msgid ""
+"Chat state notifications that are sent to the group chat. Possible values: "
+"'all', 'composing_only' or 'disabled'."
 msgstr ""
 
-#: gajim/common/config.py:441
+#: gajim/common/config.py:440
 msgid ""
-"State whether plugins should be activated on startup (this is saved on Gajim "
-"exit). This option SHOULD NOT be used to (de)activate plug-ins. Use GUI "
-"instead."
+"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:446 gajim/common/const.py:281
+#: gajim/common/config.py:445 gajim/common/const.py:315
 msgid "Sleeping"
 msgstr "A dormir"
 
-#: gajim/common/config.py:447
+#: gajim/common/config.py:446
 msgid "Back soon"
 msgstr "Volto logo"
 
-#: gajim/common/config.py:447
+#: gajim/common/config.py:446
 msgid "Back in some minutes."
 msgstr "Volto daqui a alguns minutos"
 
-#: gajim/common/config.py:448 gajim/common/const.py:247
+#: gajim/common/config.py:447 gajim/common/const.py:281
 msgid "Eating"
 msgstr "A comer"
 
-#: gajim/common/config.py:448
-msgid "I'm eating, so leave me a message."
-msgstr "Estou a comer, por isso deixe-me uma mensagem"
+#: gajim/common/config.py:447
+#, fuzzy
+msgid "I'm eating."
+msgstr "Estou a trabalhar"
 
-#: gajim/common/config.py:449
+#: gajim/common/config.py:448
 msgid "Movie"
 msgstr "Filme"
 
-#: gajim/common/config.py:449
+#: gajim/common/config.py:448
 msgid "I'm watching a movie."
 msgstr "Estou a ver um filme."
 
-#: gajim/common/config.py:450 gajim/common/const.py:314
+#: gajim/common/config.py:449 gajim/common/const.py:348
 msgid "Working"
 msgstr "A trabalhar"
 
-#: gajim/common/config.py:450
+#: gajim/common/config.py:449
 msgid "I'm working."
 msgstr "Estou a trabalhar"
 
-#: gajim/common/config.py:451
+#: gajim/common/config.py:450
 msgid "Phone"
 msgstr "Telefone"
 
-#: gajim/common/config.py:451
+#: gajim/common/config.py:450
 msgid "I'm on the phone."
 msgstr "Estou ao telefone."
 
-#: gajim/common/config.py:452
+#: gajim/common/config.py:451
 msgid "Out"
 msgstr "Estou fora"
 
-#: gajim/common/config.py:452
+#: gajim/common/config.py:451
 #, fuzzy
 msgid "I'm out enjoying life."
 msgstr "Estou fora, fui apreciar a vida"
 
-#: gajim/common/config.py:463
+#: gajim/common/config.py:462
 #, fuzzy
 msgid "I'm available."
 msgstr "Disponível"
 
-#: gajim/common/config.py:464
+#: gajim/common/config.py:463
 #, fuzzy
 msgid "I'm free for chat."
 msgstr "Livre para conversar"
 
-#: gajim/common/config.py:465 gajim/gtk/accounts.py:134
+#: gajim/common/config.py:464 gajim/gtk/accounts.py:133
 msgid "Be right back."
 msgstr ""
 
-#: gajim/common/config.py:466
+#: gajim/common/config.py:465
 #, fuzzy
 msgid "I'm not available."
 msgstr "Serviço não disponível"
 
-#: gajim/common/config.py:467
+#: gajim/common/config.py:466
 msgid "Do not disturb."
 msgstr ""
 
-#: gajim/common/config.py:468 gajim/common/config.py:469
+#: gajim/common/config.py:467 gajim/common/config.py:468
 msgid "Bye!"
 msgstr ""
 
-#: gajim/common/config.py:480
+#: gajim/common/config.py:479
 #, fuzzy
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
-"muc_highlight_words, or when a group chat message contains your nickname."
+"'muc_highlight_words' your nickname is mentioned."
 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:481
-msgid "Sound to play when any MUC message arrives."
+#: gajim/common/config.py:480
+msgid "Sound to play when any group chat message arrives."
 msgstr ""
 
-#: gajim/common/config.py:485
+#: gajim/common/config.py:484
 #, fuzzy
 msgid "Tor"
 msgstr "Para"
@@ -4024,948 +4013,1044 @@ msgstr "Para"
 msgid "Error: cannot open %s for reading"
 msgstr "Erro: impossível abrir %s para leitura"
 
-#: gajim/common/const.py:214
+#: gajim/common/const.py:216
+#, fuzzy
+msgid "?Group chat name:Team"
+msgstr "?Função do Contacto no Chat:Nenhuma"
+
+#: gajim/common/const.py:217
+msgid "?Group chat description:Project discussion"
+msgstr ""
+
+#: gajim/common/const.py:218
+#, fuzzy
+msgid "?Group chat address:team"
+msgstr "Chat"
+
+#: gajim/common/const.py:219
+#, fuzzy
+msgid "?Group chat name:Family"
+msgstr "Chat"
+
+#: gajim/common/const.py:220
+msgid "?Group chat description:Spring gathering"
+msgstr ""
+
+#: gajim/common/const.py:221
+msgid "?Group chat address:family"
+msgstr ""
+
+#: gajim/common/const.py:222
+#, fuzzy
+msgid "?Group chat name:Vacation"
+msgstr "?Função do Contacto no Chat:Nenhuma"
+
+#: gajim/common/const.py:223
+msgid "?Group chat description:Trip planning"
+msgstr ""
+
+#: gajim/common/const.py:224
+#, fuzzy
+msgid "?Group chat address:vacation"
+msgstr "?Função do Contacto no Chat:Nenhuma"
+
+#: gajim/common/const.py:225
+#, fuzzy
+msgid "?Group chat name:Repairs"
+msgstr "Chat"
+
+#: gajim/common/const.py:226
+msgid "?Group chat description:Local help group"
+msgstr ""
+
+#: gajim/common/const.py:227
+#, fuzzy
+msgid "?Group chat address:repairs"
+msgstr "Chat"
+
+#: gajim/common/const.py:228
+#, fuzzy
+msgid "?Group chat name:News"
+msgstr "?Função do Contacto no Chat:Nenhuma"
+
+#: gajim/common/const.py:229
+#, fuzzy
+msgid "?Group chat description:Local news and reports"
+msgstr "Criação de salas encontra-se restrita."
+
+#: gajim/common/const.py:230
+#, fuzzy
+msgid "?Group chat address:news"
+msgstr "Chat"
+
+#: gajim/common/const.py:235
+#, fuzzy
+msgid "Remote server not found"
+msgstr "O serviço não pôde ser encontrado"
+
+#: gajim/common/const.py:236
+msgid "Remote server timeout"
+msgstr ""
+
+#: gajim/common/const.py:237 gajim/common/const.py:238
+#: gajim/common/const.py:239
+#, 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:240
+#, fuzzy
+msgid "Group chat already exists"
+msgstr "Nome de conta em uso"
+
+#: gajim/common/const.py:241
+#, fuzzy
+msgid "Group chat does not exist"
+msgstr "Tal sala não existe."
+
+#: gajim/common/const.py:247
 msgid "This message was encrypted with OTR and could not be decrypted."
 msgstr ""
 
-#: gajim/common/const.py:217
+#: gajim/common/const.py:250
 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:221
+#: gajim/common/const.py:254
 msgid ""
-"This message was encrypted with OpenPGP for XMPP and could not be decrypted."
+"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:224
+#: gajim/common/const.py:258
 #, python-format
 msgid "This message was encrypted with %s and could not be decrypted."
 msgstr ""
 
-#: gajim/common/const.py:231
+#: gajim/common/const.py:265
 #, fuzzy
 msgid "Doing Chores"
 msgstr "Frase de acesso"
 
-#: gajim/common/const.py:232
+#: gajim/common/const.py:266
 msgid "Buying Groceries"
 msgstr ""
 
-#: gajim/common/const.py:233
+#: gajim/common/const.py:267
 #, fuzzy
 msgid "Cleaning"
 msgstr "Evento"
 
-#: gajim/common/const.py:234
+#: gajim/common/const.py:268
 #, fuzzy
 msgid "Cooking"
 msgstr "A trabalhar"
 
-#: gajim/common/const.py:235
+#: gajim/common/const.py:269
 msgid "Doing Maintenance"
 msgstr ""
 
-#: gajim/common/const.py:236
+#: gajim/common/const.py:270
 msgid "Doing the Dishes"
 msgstr ""
 
-#: gajim/common/const.py:237
+#: gajim/common/const.py:271
 msgid "Doing the Laundry"
 msgstr ""
 
-#: gajim/common/const.py:238
+#: gajim/common/const.py:272
 #, fuzzy
 msgid "Gardening"
 msgstr "A trabalhar"
 
-#: gajim/common/const.py:239
+#: gajim/common/const.py:273
 msgid "Running an Errand"
 msgstr ""
 
-#: gajim/common/const.py:240
+#: gajim/common/const.py:274
 #, fuzzy
 msgid "Walking the Dog"
 msgstr "Neste grupo"
 
-#: gajim/common/const.py:242
+#: gajim/common/const.py:276
 #, fuzzy
 msgid "Drinking"
 msgstr "A trabalhar"
 
-#: gajim/common/const.py:243
+#: gajim/common/const.py:277
 msgid "Having a Beer"
 msgstr ""
 
-#: gajim/common/const.py:244
+#: gajim/common/const.py:278
 msgid "Having Coffee"
 msgstr ""
 
-#: gajim/common/const.py:245
+#: gajim/common/const.py:279
 msgid "Having Tea"
 msgstr ""
 
-#: gajim/common/const.py:248
+#: gajim/common/const.py:282
 msgid "Having a Snack"
 msgstr ""
 
-#: gajim/common/const.py:249
+#: gajim/common/const.py:283
 msgid "Having Breakfast"
 msgstr ""
 
-#: gajim/common/const.py:250
+#: gajim/common/const.py:284
 msgid "Having Dinner"
 msgstr ""
 
-#: gajim/common/const.py:251
+#: gajim/common/const.py:285
 msgid "Having Lunch"
 msgstr ""
 
-#: gajim/common/const.py:253
+#: gajim/common/const.py:287
 msgid "Exercising"
 msgstr ""
 
-#: gajim/common/const.py:254 gajim/common/const.py:305
+#: gajim/common/const.py:288 gajim/common/const.py:339
 msgid "Cycling"
 msgstr ""
 
-#: gajim/common/const.py:255
+#: gajim/common/const.py:289
 #, fuzzy
 msgid "Dancing"
 msgstr "Evento"
 
-#: gajim/common/const.py:256
+#: gajim/common/const.py:290
 #, fuzzy
 msgid "Hiking"
 msgstr "Expulsando %s"
 
-#: gajim/common/const.py:257
+#: gajim/common/const.py:291
 #, fuzzy
 msgid "Jogging"
 msgstr "_Entrar"
 
-#: gajim/common/const.py:258
+#: gajim/common/const.py:292
 msgid "Playing Sports"
 msgstr ""
 
-#: gajim/common/const.py:259
+#: gajim/common/const.py:293
 msgid "Running"
 msgstr ""
 
-#: gajim/common/const.py:260
+#: gajim/common/const.py:294
 #, fuzzy
 msgid "Skiing"
 msgstr "A trabalhar"
 
-#: gajim/common/const.py:261
+#: gajim/common/const.py:295
 msgid "Swimming"
 msgstr ""
 
-#: gajim/common/const.py:262
+#: gajim/common/const.py:296
 #, fuzzy
 msgid "Working out"
 msgstr "A trabalhar"
 
-#: gajim/common/const.py:264
+#: gajim/common/const.py:298
 msgid "Grooming"
 msgstr ""
 
-#: gajim/common/const.py:265
+#: gajim/common/const.py:299
 msgid "At the Spa"
 msgstr ""
 
-#: gajim/common/const.py:266
+#: gajim/common/const.py:300
 msgid "Brushing Teeth"
 msgstr ""
 
-#: gajim/common/const.py:267
+#: gajim/common/const.py:301
 msgid "Getting a Haircut"
 msgstr ""
 
-#: gajim/common/const.py:268
+#: gajim/common/const.py:302
 #, fuzzy
 msgid "Shaving"
 msgstr "A comer"
 
-#: gajim/common/const.py:269
+#: gajim/common/const.py:303
 msgid "Taking a Bath"
 msgstr ""
 
-#: gajim/common/const.py:270
+#: gajim/common/const.py:304
 msgid "Taking a Shower"
 msgstr ""
 
-#: gajim/common/const.py:272
+#: gajim/common/const.py:306
 msgid "Having an Appointment"
 msgstr ""
 
-#: gajim/common/const.py:274
+#: gajim/common/const.py:308
 #, fuzzy
 msgid "Inactive"
 msgstr "Activo"
 
-#: gajim/common/const.py:275
+#: gajim/common/const.py:309
 msgid "Day Off"
 msgstr ""
 
-#: gajim/common/const.py:276
+#: gajim/common/const.py:310
 #, fuzzy
 msgid "Hanging out"
 msgstr "Mudar Assunto"
 
-#: gajim/common/const.py:277
+#: gajim/common/const.py:311
 #, fuzzy
 msgid "Hiding"
 msgstr "Expulsando %s"
 
-#: gajim/common/const.py:278
+#: gajim/common/const.py:312
 msgid "On Vacation"
 msgstr ""
 
-#: gajim/common/const.py:279
+#: gajim/common/const.py:313
 #, fuzzy
 msgid "Praying"
 msgstr "A comer"
 
-#: gajim/common/const.py:280
+#: gajim/common/const.py:314
 msgid "Scheduled Holiday"
 msgstr ""
 
-#: gajim/common/const.py:282
+#: gajim/common/const.py:316
 #, fuzzy
 msgid "Thinking"
 msgstr "A trabalhar"
 
-#: gajim/common/const.py:284
+#: gajim/common/const.py:318
 #, fuzzy
 msgid "Relaxing"
 msgstr "simples"
 
-#: gajim/common/const.py:285
+#: gajim/common/const.py:319
 #, fuzzy
 msgid "Fishing"
 msgstr "Expulsando %s"
 
-#: gajim/common/const.py:286
+#: gajim/common/const.py:320
 #, fuzzy
 msgid "Gaming"
 msgstr "A comer"
 
-#: gajim/common/const.py:287
+#: gajim/common/const.py:321
 #, fuzzy
 msgid "Going out"
 msgstr "_Desligar"
 
-#: gajim/common/const.py:288
+#: gajim/common/const.py:322
 #, fuzzy
 msgid "Partying"
 msgstr "A comer"
 
-#: gajim/common/const.py:289
+#: gajim/common/const.py:323
 #, fuzzy
 msgid "Reading"
 msgstr "A comer"
 
-#: gajim/common/const.py:290
+#: gajim/common/const.py:324
 msgid "Rehearsing"
 msgstr ""
 
-#: gajim/common/const.py:291
+#: gajim/common/const.py:325
 #, fuzzy
 msgid "Shopping"
 msgstr "A dormir"
 
-#: gajim/common/const.py:292
+#: gajim/common/const.py:326
 #, fuzzy
 msgid "Smoking"
 msgstr "A trabalhar"
 
-#: gajim/common/const.py:293
+#: gajim/common/const.py:327
 msgid "Socializing"
 msgstr ""
 
-#: gajim/common/const.py:294
+#: gajim/common/const.py:328
 #, fuzzy
 msgid "Sunbathing"
 msgstr "A comer"
 
-#: gajim/common/const.py:295
+#: gajim/common/const.py:329
 msgid "Watching TV"
 msgstr ""
 
-#: gajim/common/const.py:296
+#: gajim/common/const.py:330
 #, fuzzy
 msgid "Watching a Movie"
 msgstr "Estou a ver um filme."
 
-#: gajim/common/const.py:298
+#: gajim/common/const.py:332
 #, fuzzy
 msgid "Talking"
 msgstr "A comer"
 
-#: gajim/common/const.py:299
+#: gajim/common/const.py:333
 msgid "In Real Life"
 msgstr ""
 
-#: gajim/common/const.py:300
+#: gajim/common/const.py:334
 #, fuzzy
 msgid "On the Phone"
 msgstr "Estou ao telefone."
 
-#: gajim/common/const.py:301
+#: gajim/common/const.py:335
 msgid "On Video Phone"
 msgstr ""
 
-#: gajim/common/const.py:303
+#: gajim/common/const.py:337
 #, fuzzy
 msgid "Traveling"
 msgstr "A transferir"
 
-#: gajim/common/const.py:304
+#: gajim/common/const.py:338
 #, fuzzy
 msgid "Commuting"
 msgstr "Ligando"
 
-#: gajim/common/const.py:306
+#: gajim/common/const.py:340
 msgid "Driving"
 msgstr ""
 
-#: gajim/common/const.py:307
+#: gajim/common/const.py:341
 msgid "In a Car"
 msgstr ""
 
-#: gajim/common/const.py:308
+#: gajim/common/const.py:342
 msgid "On a Bus"
 msgstr ""
 
-#: gajim/common/const.py:309
+#: gajim/common/const.py:343
 msgid "On a Plane"
 msgstr ""
 
-#: gajim/common/const.py:310
+#: gajim/common/const.py:344
 msgid "On a Train"
 msgstr ""
 
-#: gajim/common/const.py:311
+#: gajim/common/const.py:345
 msgid "On a Trip"
 msgstr ""
 
-#: gajim/common/const.py:312
+#: gajim/common/const.py:346
 #, fuzzy
 msgid "Walking"
 msgstr "A trabalhar"
 
-#: gajim/common/const.py:315
+#: gajim/common/const.py:349
 #, fuzzy
 msgid "Coding"
 msgstr "Ligação"
 
-#: gajim/common/const.py:316
+#: gajim/common/const.py:350
 msgid "In a Meeting"
 msgstr ""
 
-#: gajim/common/const.py:317
+#: gajim/common/const.py:351
 msgid "Studying"
 msgstr ""
 
-#: gajim/common/const.py:318
+#: gajim/common/const.py:352
 #, fuzzy
 msgid "Writing"
 msgstr "A trabalhar"
 
-#: gajim/common/const.py:321
+#: gajim/common/const.py:355
 msgid "Afraid"
 msgstr ""
 
-#: gajim/common/const.py:322
+#: gajim/common/const.py:356
 msgid "Amazed"
 msgstr ""
 
-#: gajim/common/const.py:323
+#: gajim/common/const.py:357
 msgid "Amorous"
 msgstr ""
 
-#: gajim/common/const.py:324
+#: gajim/common/const.py:358
 msgid "Angry"
 msgstr ""
 
-#: gajim/common/const.py:325
+#: gajim/common/const.py:359
 msgid "Annoyed"
 msgstr ""
 
-#: gajim/common/const.py:326
+#: gajim/common/const.py:360
 msgid "Anxious"
 msgstr ""
 
-#: gajim/common/const.py:327
+#: gajim/common/const.py:361
 #, fuzzy
 msgid "Aroused"
 msgstr "Pausada"
 
-#: gajim/common/const.py:328
+#: gajim/common/const.py:362
 msgid "Ashamed"
 msgstr ""
 
-#: gajim/common/const.py:329
+#: gajim/common/const.py:363
 #, fuzzy
 msgid "Bored"
 msgstr "Negrito"
 
-#: gajim/common/const.py:330
+#: gajim/common/const.py:364
 msgid "Brave"
 msgstr ""
 
-#: gajim/common/const.py:331
+#: gajim/common/const.py:365
 msgid "Calm"
 msgstr ""
 
-#: gajim/common/const.py:332
+#: gajim/common/const.py:366
 #, fuzzy
 msgid "Cautious"
 msgstr "Conversa"
 
-#: gajim/common/const.py:333
+#: gajim/common/const.py:367
 #, fuzzy
 msgid "Cold"
 msgstr "Negrito"
 
-#: gajim/common/const.py:334
+#: gajim/common/const.py:368
 #, fuzzy
 msgid "Confident"
 msgstr "_Conteúdo"
 
-#: gajim/common/const.py:335
+#: gajim/common/const.py:369
 msgid "Confused"
 msgstr ""
 
-#: gajim/common/const.py:336
+#: gajim/common/const.py:370
 #, fuzzy
 msgid "Contemplative"
 msgstr "Completa"
 
-#: gajim/common/const.py:337
+#: gajim/common/const.py:371
 #, fuzzy
 msgid "Contented"
 msgstr "_Conteúdo"
 
-#: gajim/common/const.py:338
+#: gajim/common/const.py:372
 msgid "Cranky"
 msgstr ""
 
-#: gajim/common/const.py:339
+#: gajim/common/const.py:373
 msgid "Crazy"
 msgstr ""
 
-#: gajim/common/const.py:340
+#: gajim/common/const.py:374
 #, fuzzy
 msgid "Creative"
 msgstr "Activo"
 
-#: gajim/common/const.py:341
+#: gajim/common/const.py:375
 #, fuzzy
 msgid "Curious"
 msgstr "_Anterior"
 
-#: gajim/common/const.py:342
+#: gajim/common/const.py:376
 #, fuzzy
 msgid "Dejected"
 msgstr "Apagar MOTD"
 
-#: gajim/common/const.py:343
+#: gajim/common/const.py:377
 msgid "Depressed"
 msgstr ""
 
-#: gajim/common/const.py:344
+#: gajim/common/const.py:378
 msgid "Disappointed"
 msgstr ""
 
-#: gajim/common/const.py:345
+#: gajim/common/const.py:379
 msgid "Disgusted"
 msgstr ""
 
-#: gajim/common/const.py:346
+#: gajim/common/const.py:380
 msgid "Dismayed"
 msgstr ""
 
-#: gajim/common/const.py:347
+#: gajim/common/const.py:381
 msgid "Distracted"
 msgstr ""
 
-#: gajim/common/const.py:348
+#: gajim/common/const.py:382
 msgid "Embarrassed"
 msgstr ""
 
-#: gajim/common/const.py:349
+#: gajim/common/const.py:383
 #, fuzzy
 msgid "Envious"
 msgstr "_Anterior"
 
-#: gajim/common/const.py:350
+#: gajim/common/const.py:384
 msgid "Excited"
 msgstr ""
 
-#: gajim/common/const.py:351
+#: gajim/common/const.py:385
 msgid "Flirtatious"
 msgstr ""
 
-#: gajim/common/const.py:352
+#: gajim/common/const.py:386
 msgid "Frustrated"
 msgstr ""
 
-#: gajim/common/const.py:353
+#: gajim/common/const.py:387
 msgid "Grateful"
 msgstr ""
 
-#: gajim/common/const.py:354
+#: gajim/common/const.py:388
 msgid "Grieving"
 msgstr ""
 
-#: gajim/common/const.py:355
+#: gajim/common/const.py:389
 #, fuzzy
 msgid "Grumpy"
 msgstr "Grupo"
 
-#: gajim/common/const.py:356
+#: gajim/common/const.py:390
 msgid "Guilty"
 msgstr ""
 
-#: gajim/common/const.py:357
+#: gajim/common/const.py:391
 msgid "Happy"
 msgstr ""
 
-#: gajim/common/const.py:358
+#: gajim/common/const.py:392
 msgid "Hopeful"
 msgstr ""
 
-#: gajim/common/const.py:359
+#: gajim/common/const.py:393
 #, fuzzy
 msgid "Hot"
 msgstr "_Host:"
 
-#: gajim/common/const.py:360
+#: gajim/common/const.py:394
 msgid "Humbled"
 msgstr ""
 
-#: gajim/common/const.py:361
+#: gajim/common/const.py:395
 msgid "Humiliated"
 msgstr ""
 
-#: gajim/common/const.py:362
+#: gajim/common/const.py:396
 msgid "Hungry"
 msgstr ""
 
-#: gajim/common/const.py:363
+#: gajim/common/const.py:397
 msgid "Hurt"
 msgstr ""
 
-#: gajim/common/const.py:364
+#: gajim/common/const.py:398
 #, fuzzy
 msgid "Impressed"
 msgstr "mensagem"
 
-#: gajim/common/const.py:365
+#: gajim/common/const.py:399
 msgid "In Awe"
 msgstr ""
 
-#: gajim/common/const.py:366
+#: gajim/common/const.py:400
 msgid "In Love"
 msgstr ""
 
-#: gajim/common/const.py:367
+#: gajim/common/const.py:401
 msgid "Indignant"
 msgstr ""
 
-#: gajim/common/const.py:368
+#: gajim/common/const.py:402
 msgid "Interested"
 msgstr ""
 
-#: gajim/common/const.py:369
+#: gajim/common/const.py:403
 msgid "Intoxicated"
 msgstr ""
 
-#: gajim/common/const.py:370
+#: gajim/common/const.py:404
 #, fuzzy
 msgid "Invincible"
 msgstr "Invisível"
 
-#: gajim/common/const.py:371
+#: gajim/common/const.py:405
 msgid "Jealous"
 msgstr ""
 
-#: gajim/common/const.py:372
+#: gajim/common/const.py:406
 #, fuzzy
 msgid "Lonely"
 msgstr "Nenhum"
 
-#: gajim/common/const.py:373
+#: gajim/common/const.py:407
 #, fuzzy
 msgid "Lost"
 msgstr "_Host:"
 
-#: gajim/common/const.py:374
+#: gajim/common/const.py:408
 msgid "Lucky"
 msgstr ""
 
-#: gajim/common/const.py:375
+#: gajim/common/const.py:409
 #, fuzzy
 msgid "Mean"
 msgstr "Geral"
 
-#: gajim/common/const.py:376
+#: gajim/common/const.py:410
 #, fuzzy
 msgid "Moody"
 msgstr "_Modificar"
 
-#: gajim/common/const.py:377
+#: gajim/common/const.py:411
 #, fuzzy
 msgid "Nervous"
 msgstr "_Anterior"
 
-#: gajim/common/const.py:378
+#: gajim/common/const.py:412
 msgid "Neutral"
 msgstr ""
 
-#: gajim/common/const.py:379
+#: gajim/common/const.py:413
 #, fuzzy
 msgid "Offended"
 msgstr "Offline"
 
-#: gajim/common/const.py:380
+#: gajim/common/const.py:414
 msgid "Outraged"
 msgstr ""
 
-#: gajim/common/const.py:381
+#: gajim/common/const.py:415
 msgid "Playful"
 msgstr ""
 
-#: gajim/common/const.py:382
+#: gajim/common/const.py:416
 #, fuzzy
 msgid "Proud"
 msgstr "Grupo"
 
-#: gajim/common/const.py:383
+#: gajim/common/const.py:417
 msgid "Relaxed"
 msgstr ""
 
-#: gajim/common/const.py:384
+#: gajim/common/const.py:418
 #, fuzzy
 msgid "Relieved"
 msgstr "Apagar MOTD"
 
-#: gajim/common/const.py:385
+#: gajim/common/const.py:419
 msgid "Remorseful"
 msgstr ""
 
-#: gajim/common/const.py:386
+#: gajim/common/const.py:420
 msgid "Restless"
 msgstr ""
 
-#: gajim/common/const.py:387
+#: gajim/common/const.py:421
 #, fuzzy
 msgid "Sad"
 msgstr "Interrompida"
 
-#: gajim/common/const.py:388
+#: gajim/common/const.py:422
 msgid "Sarcastic"
 msgstr ""
 
-#: gajim/common/const.py:389
+#: gajim/common/const.py:423
 #, fuzzy
 msgid "Satisfied"
 msgstr "Nome:"
 
-#: gajim/common/const.py:390
+#: gajim/common/const.py:424
 #, fuzzy
 msgid "Serious"
 msgstr "_Anterior"
 
-#: gajim/common/const.py:391
+#: gajim/common/const.py:425
 msgid "Shocked"
 msgstr ""
 
-#: gajim/common/const.py:392
+#: gajim/common/const.py:426
 msgid "Shy"
 msgstr ""
 
-#: gajim/common/const.py:393
+#: gajim/common/const.py:427
 #, fuzzy
 msgid "Sick"
 msgstr "_Expulsar"
 
-#: gajim/common/const.py:394
+#: gajim/common/const.py:428
 #, fuzzy
 msgid "Sleepy"
 msgstr "A dormir"
 
-#: gajim/common/const.py:395
+#: gajim/common/const.py:429
 msgid "Spontaneous"
 msgstr ""
 
-#: gajim/common/const.py:396
+#: gajim/common/const.py:430
 #, fuzzy
 msgid "Stressed"
 msgstr "Rua:"
 
-#: gajim/common/const.py:397
+#: gajim/common/const.py:431
 msgid "Strong"
 msgstr ""
 
-#: gajim/common/const.py:398
+#: gajim/common/const.py:432
 #, fuzzy
 msgid "Surprised"
 msgstr "Subscrição"
 
-#: gajim/common/const.py:399
+#: gajim/common/const.py:433
 msgid "Thankful"
 msgstr ""
 
-#: gajim/common/const.py:400
+#: gajim/common/const.py:434
 msgid "Thirsty"
 msgstr ""
 
-#: gajim/common/const.py:401
+#: gajim/common/const.py:435
 #, fuzzy
 msgid "Tired"
 msgstr "Tempo"
 
-#: gajim/common/const.py:402
+#: gajim/common/const.py:436
 #, fuzzy
 msgid "Undefined"
 msgstr "Sublinhar"
 
-#: gajim/common/const.py:403
+#: gajim/common/const.py:437
 msgid "Weak"
 msgstr ""
 
-#: gajim/common/const.py:404
+#: gajim/common/const.py:438
 msgid "Worried"
 msgstr ""
 
-#: gajim/common/const.py:408
+#: gajim/common/const.py:442
 msgid "accuracy"
 msgstr ""
 
-#: gajim/common/const.py:409
+#: gajim/common/const.py:443
 #, fuzzy
 msgid "alt"
 msgstr "Apagar MOTD"
 
-#: gajim/common/const.py:410
+#: gajim/common/const.py:444
 msgid "area"
 msgstr ""
 
-#: gajim/common/const.py:411
+#: gajim/common/const.py:445
 #, fuzzy
 msgid "bearing"
 msgstr "marine"
 
-#: gajim/common/const.py:412
+#: gajim/common/const.py:446
 #, fuzzy
 msgid "building"
 msgstr "Expulsando %s"
 
-#: gajim/common/const.py:413
+#: gajim/common/const.py:447
 #, fuzzy
 msgid "country"
 msgstr "País:"
 
-#: gajim/common/const.py:414
+#: gajim/common/const.py:448
 #, fuzzy
 msgid "countrycode"
 msgstr "Conta"
 
-#: gajim/common/const.py:415
+#: gajim/common/const.py:449
 msgid "datum"
 msgstr ""
 
-#: gajim/common/const.py:416
+#: gajim/common/const.py:450
 #, fuzzy
 msgid "description"
 msgstr "Descrição"
 
-#: gajim/common/const.py:417
+#: gajim/common/const.py:451
 #, fuzzy
 msgid "error"
 msgstr "Erro:"
 
-#: gajim/common/const.py:418
+#: gajim/common/const.py:452
 msgid "floor"
 msgstr ""
 
-#: gajim/common/const.py:419
+#: gajim/common/const.py:453
 msgid "lat"
 msgstr ""
 
-#: gajim/common/const.py:420
+#: gajim/common/const.py:454
 msgid "locality"
 msgstr ""
 
-#: gajim/common/const.py:421
+#: gajim/common/const.py:455
 #, fuzzy
 msgid "lon"
 msgstr "Nenhum"
 
-#: gajim/common/const.py:422
+#: gajim/common/const.py:456
 msgid "postalcode"
 msgstr ""
 
-#: gajim/common/const.py:423
+#: gajim/common/const.py:457
 msgid "region"
 msgstr ""
 
-#: gajim/common/const.py:424
+#: gajim/common/const.py:458
 #, fuzzy
 msgid "room"
 msgstr "De"
 
-#: gajim/common/const.py:425
+#: gajim/common/const.py:459
 msgid "speed"
 msgstr ""
 
-#: gajim/common/const.py:426
+#: gajim/common/const.py:460
 msgid "street"
 msgstr ""
 
-#: gajim/common/const.py:427
+#: gajim/common/const.py:461
 msgid "text"
 msgstr ""
 
-#: gajim/common/const.py:428
+#: gajim/common/const.py:462
 msgid "timestamp"
 msgstr ""
 
-#: gajim/common/const.py:429
+#: gajim/common/const.py:463
 msgid "URI"
 msgstr ""
 
-#: gajim/common/const.py:434
+#: gajim/common/const.py:468
 msgid "Unable to get issuer certificate"
 msgstr ""
 
-#: gajim/common/const.py:435
+#: gajim/common/const.py:469
 msgid "Unable to get certificate CRL"
 msgstr ""
 
-#: gajim/common/const.py:436
+#: gajim/common/const.py:470
 msgid "Unable to decrypt certificate's signature"
 msgstr ""
 
-#: gajim/common/const.py:437
+#: gajim/common/const.py:471
 msgid "Unable to decrypt CRL's signature"
 msgstr ""
 
-#: gajim/common/const.py:438
+#: gajim/common/const.py:472
 #, fuzzy
 msgid "Unable to decode issuer public key"
 msgstr "Impossível entrar na sala"
 
-#: gajim/common/const.py:439
+#: gajim/common/const.py:473
 msgid "Certificate signature failure"
 msgstr ""
 
-#: gajim/common/const.py:440
+#: gajim/common/const.py:474
 msgid "CRL signature failure"
 msgstr ""
 
-#: gajim/common/const.py:441
+#: gajim/common/const.py:475
 msgid "Certificate is not yet valid"
 msgstr ""
 
-#: gajim/common/const.py:442
+#: gajim/common/const.py:476
 msgid "Certificate has expired"
 msgstr ""
 
-#: gajim/common/const.py:443
+#: gajim/common/const.py:477
 msgid "CRL is not yet valid"
 msgstr ""
 
-#: gajim/common/const.py:444
+#: gajim/common/const.py:478
 msgid "CRL has expired"
 msgstr ""
 
-#: gajim/common/const.py:445
+#: gajim/common/const.py:479
 msgid "Format error in certificate's notBefore field"
 msgstr ""
 
-#: gajim/common/const.py:446
+#: gajim/common/const.py:480
 msgid "Format error in certificate's notAfter field"
 msgstr ""
 
-#: gajim/common/const.py:447
+#: gajim/common/const.py:481
 msgid "Format error in CRL's lastUpdate field"
 msgstr ""
 
-#: gajim/common/const.py:448
+#: gajim/common/const.py:482
 msgid "Format error in CRL's nextUpdate field"
 msgstr ""
 
-#: gajim/common/const.py:449
+#: gajim/common/const.py:483
 msgid "Out of memory"
 msgstr ""
 
-#: gajim/common/const.py:450
+#: gajim/common/const.py:484
 msgid "Self signed certificate"
 msgstr ""
 
-#: gajim/common/const.py:451
+#: gajim/common/const.py:485
 msgid "Self signed certificate in certificate chain"
 msgstr ""
 
-#: gajim/common/const.py:452
+#: gajim/common/const.py:486
 msgid "Unable to get local issuer certificate"
 msgstr ""
 
-#: gajim/common/const.py:453
+#: gajim/common/const.py:487
 msgid "Unable to verify the first certificate"
 msgstr ""
 
-#: gajim/common/const.py:454
+#: gajim/common/const.py:488
 msgid "Certificate chain too long"
 msgstr ""
 
-#: gajim/common/const.py:455
+#: gajim/common/const.py:489
 msgid "Certificate revoked"
 msgstr ""
 
-#: gajim/common/const.py:456
+#: gajim/common/const.py:490
 #, fuzzy
 msgid "Invalid CA certificate"
 msgstr "Nome de utilizador inválido"
 
-#: gajim/common/const.py:457
+#: gajim/common/const.py:491
 msgid "Path length constraint exceeded"
 msgstr ""
 
-#: gajim/common/const.py:458
+#: gajim/common/const.py:492
 msgid "Unsupported certificate purpose"
 msgstr ""
 
-#: gajim/common/const.py:459
+#: gajim/common/const.py:493
 msgid "Certificate not trusted"
 msgstr ""
 
-#: gajim/common/const.py:460
+#: gajim/common/const.py:494
 msgid "Certificate rejected"
 msgstr ""
 
-#: gajim/common/const.py:461
+#: gajim/common/const.py:495
 msgid "Subject issuer mismatch"
 msgstr ""
 
-#: gajim/common/const.py:462
+#: gajim/common/const.py:496
 msgid "Authority and subject key identifier mismatch"
 msgstr ""
 
-#: gajim/common/const.py:463
+#: gajim/common/const.py:497
 msgid "Authority and issuer serial number mismatch"
 msgstr ""
 
-#: gajim/common/const.py:464
+#: gajim/common/const.py:498
 msgid "Key usage does not include certificate signing"
 msgstr ""
 
-#: gajim/common/const.py:465
+#: gajim/common/const.py:499
 msgid "Application verification failure"
 msgstr ""
 
@@ -5131,264 +5216,264 @@ msgstr ""
 msgid "video output"
 msgstr ""
 
-#: gajim/common/helpers.py:210
+#: gajim/common/helpers.py:216
 msgid "Server must be between 1 and 1023 bytes"
 msgstr ""
 
-#: gajim/common/helpers.py:214
+#: gajim/common/helpers.py:220
 msgid "Invalid character in hostname."
 msgstr "Caractere inválido no hostname."
 
-#: gajim/common/helpers.py:216
+#: gajim/common/helpers.py:222
 msgid "Server address required."
 msgstr "Endereço de servidor necessário."
 
-#: gajim/common/helpers.py:220
+#: gajim/common/helpers.py:226
 msgid "Username must be between 1 and 1023 bytes"
 msgstr ""
 
-#: gajim/common/helpers.py:224
+#: gajim/common/helpers.py:230
 msgid "Invalid character in username."
 msgstr "Caractere inválido no nome de utilizador"
 
-#: gajim/common/helpers.py:230
+#: gajim/common/helpers.py:236
 msgid "Resource must be between 1 and 1023 bytes"
 msgstr ""
 
-#: gajim/common/helpers.py:234
+#: gajim/common/helpers.py:240
 msgid "Invalid character in resource."
 msgstr "Caractere inválido no recurso."
 
-#: gajim/common/helpers.py:275
+#: gajim/common/helpers.py:281
 msgid "_Busy"
 msgstr "_Ocupado"
 
-#: gajim/common/helpers.py:277 gajim/gtk/tooltips.py:647
+#: gajim/common/helpers.py:283 gajim/gtk/tooltips.py:647
 msgid "Busy"
 msgstr "Ocupado"
 
-#: gajim/common/helpers.py:280
+#: gajim/common/helpers.py:286
 msgid "_Not Available"
 msgstr "_Indisponível"
 
-#: gajim/common/helpers.py:282 gajim/gtk/tooltips.py:649
+#: gajim/common/helpers.py:288 gajim/gtk/tooltips.py:649
 msgid "Not Available"
 msgstr "Indisponível"
 
-#: gajim/common/helpers.py:285
+#: gajim/common/helpers.py:291
 msgid "_Free for Chat"
 msgstr "_Livre para conversar"
 
-#: gajim/common/helpers.py:287 gajim/gtk/tooltips.py:643
+#: gajim/common/helpers.py:293 gajim/gtk/tooltips.py:643
 msgid "Free for Chat"
 msgstr "Livre para conversar"
 
-#: gajim/common/helpers.py:290
+#: gajim/common/helpers.py:296
 #, fuzzy
 msgid "?user status:_Available"
 msgstr "_Disponível"
 
-#: gajim/common/helpers.py:292 gajim/gtk/tooltips.py:641
+#: gajim/common/helpers.py:298 gajim/gtk/tooltips.py:641
 #, fuzzy
 msgid "?user status:Available"
 msgstr "Mostrar hora:"
 
-#: gajim/common/helpers.py:294
+#: gajim/common/helpers.py:300
 msgid "Connecting"
 msgstr "Ligando"
 
-#: gajim/common/helpers.py:297 gajim/data/gui/preferences_window.ui:1251
+#: gajim/common/helpers.py:303 gajim/data/gui/preferences_window.ui:1251
 msgid "A_way"
 msgstr "A_usente"
 
-#: gajim/common/helpers.py:299 gajim/common/modules/adhoc_commands.py:120
-#: gajim/command_system/implementation/standard.py:139
+#: gajim/common/helpers.py:305 gajim/common/modules/adhoc_commands.py:120
+#: gajim/command_system/implementation/standard.py:141
 #: gajim/gtk/tooltips.py:645
 msgid "Away"
 msgstr "Ausente"
 
-#: gajim/common/helpers.py:302
+#: gajim/common/helpers.py:308
 msgid "_Offline"
 msgstr "_Offline"
 
-#: gajim/common/helpers.py:304 gajim/gtk/tooltips.py:651
+#: gajim/common/helpers.py:310 gajim/gtk/tooltips.py:651
 msgid "Offline"
 msgstr "Offline"
 
-#: gajim/common/helpers.py:307
+#: gajim/common/helpers.py:313
 msgid "_Invisible"
 msgstr "In_visível"
 
-#: gajim/common/helpers.py:313
+#: gajim/common/helpers.py:319
 msgid "?contact has status:Unknown"
 msgstr "Desconhecido"
 
-#: gajim/common/helpers.py:315
+#: gajim/common/helpers.py:321
 msgid "?contact has status:Has errors"
 msgstr "Contém erros"
 
-#: gajim/common/helpers.py:330
+#: gajim/common/helpers.py:336
 msgid "?Subscription we already have:None"
 msgstr "Nenhuma"
 
-#: gajim/common/helpers.py:332
+#: gajim/common/helpers.py:338
 msgid "To"
 msgstr "Para"
 
-#: gajim/common/helpers.py:334 gajim/data/gui/groups_post_window.ui:33
+#: gajim/common/helpers.py:340 gajim/data/gui/groups_post_window.ui:33
 msgid "From"
 msgstr "De"
 
-#: gajim/common/helpers.py:336
+#: gajim/common/helpers.py:342
 msgid "Both"
 msgstr "Ambos"
 
-#: gajim/common/helpers.py:338 gajim/gtk/server_info.py:151
+#: gajim/common/helpers.py:344 gajim/gtk/server_info.py:151
 #, fuzzy
 msgid "Unknown"
 msgstr "?SO:Desconhecido"
 
-#: gajim/common/helpers.py:344
+#: gajim/common/helpers.py:350
 msgid "?Ask (for Subscription):None"
 msgstr "Nenhum"
 
-#: gajim/common/helpers.py:346
+#: gajim/common/helpers.py:352
 msgid "Subscribe"
 msgstr "Subscrição"
 
-#: gajim/common/helpers.py:355
+#: gajim/common/helpers.py:361
 msgid "?Group Chat Contact Role:None"
 msgstr "?Função do Contacto no Chat:Nenhuma"
 
-#: gajim/common/helpers.py:358
+#: gajim/common/helpers.py:364
 msgid "Moderators"
 msgstr "Moderadores"
 
-#: gajim/common/helpers.py:360
+#: gajim/common/helpers.py:366
 msgid "Moderator"
 msgstr "Moderador"
 
-#: gajim/common/helpers.py:363
+#: gajim/common/helpers.py:369 gajim/data/gui/groupchat_info_scrolled.ui:243
 msgid "Participants"
 msgstr "Participantes"
 
-#: gajim/common/helpers.py:365
+#: gajim/common/helpers.py:371
 msgid "Participant"
 msgstr "Participante"
 
-#: gajim/common/helpers.py:368
+#: gajim/common/helpers.py:374
 msgid "Visitors"
 msgstr "Visitantes"
 
-#: gajim/common/helpers.py:370
+#: gajim/common/helpers.py:376
 msgid "Visitor"
 msgstr "Visitante"
 
-#: gajim/common/helpers.py:376 gajim/gtk/tooltips.py:253
+#: gajim/common/helpers.py:382 gajim/gtk/tooltips.py:253
 #, fuzzy
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "?Função do Contacto no Chat:Nenhuma"
 
-#: gajim/common/helpers.py:378 gajim/data/gui/groupchat_config.ui:32
+#: gajim/common/helpers.py:384 gajim/data/gui/groupchat_config.ui:32
 #: gajim/gtk/tooltips.py:259
 #, fuzzy
 msgid "Owner"
 msgstr "_Dono"
 
-#: gajim/common/helpers.py:380 gajim/gtk/tooltips.py:257
+#: gajim/common/helpers.py:386 gajim/gtk/tooltips.py:257
 #, fuzzy
 msgid "Administrator"
 msgstr "_Administrador"
 
-#: gajim/common/helpers.py:382 gajim/data/gui/groupchat_config.ui:40
+#: gajim/common/helpers.py:388 gajim/data/gui/groupchat_config.ui:40
 #: gajim/gtk/tooltips.py:255 gajim/gtk/groupchat_config.py:105
 #, fuzzy
 msgid "Member"
 msgstr "_Membro"
 
-#: gajim/common/helpers.py:421
+#: gajim/common/helpers.py:427
 msgid "is paying attention to the conversation"
 msgstr "está a prestar atenção à conversa"
 
-#: gajim/common/helpers.py:423
+#: gajim/common/helpers.py:429
 msgid "is doing something else"
 msgstr "está a fazer outra coisa qualquer"
 
-#: gajim/common/helpers.py:425
+#: gajim/common/helpers.py:431
 #, fuzzy
 msgid "is composing a message…"
 msgstr "está a escrever uma mensagem..."
 
-#: gajim/common/helpers.py:428
+#: gajim/common/helpers.py:434
 msgid "paused composing a message"
 msgstr "pausa na composição da mensagem"
 
-#: gajim/common/helpers.py:430
+#: gajim/common/helpers.py:436
 msgid "has closed the chat window or tab"
 msgstr "fechou a janela de conversa ou aba"
 
-#: gajim/common/helpers.py:936 gajim/common/helpers.py:943
+#: gajim/common/helpers.py:942 gajim/common/helpers.py:949
 #, 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:950
+#: gajim/common/helpers.py:956
 #, fuzzy, python-format
-msgid "from room %s"
-msgstr "De %s"
+msgid "from group chat %s"
+msgstr "_Entrar num Chat"
 
-#: gajim/common/helpers.py:953 gajim/common/helpers.py:970
+#: gajim/common/helpers.py:959 gajim/common/helpers.py:976
 #, fuzzy, python-format
 msgid "from user %s"
 msgstr "De %s"
 
-#: gajim/common/helpers.py:955
+#: gajim/common/helpers.py:961
 #, fuzzy, python-format
 msgid "from %s"
 msgstr "De %s"
 
-#: gajim/common/helpers.py:962 gajim/common/helpers.py:968
+#: gajim/common/helpers.py:968 gajim/common/helpers.py:974
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
 msgstr[0] ""
 msgstr[1] ""
 
-#: gajim/common/helpers.py:986 gajim/common/helpers.py:998
+#: gajim/common/helpers.py:992 gajim/common/helpers.py:1004
 #: gajim/data/gui/roster_window.ui:85 data/org.gajim.Gajim.desktop.in:4
 #: data/org.gajim.Gajim.appdata.xml.in:9
 msgid "Gajim"
 msgstr "Gajim"
 
-#: gajim/common/helpers.py:1000
+#: gajim/common/helpers.py:1006
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: gajim/common/helpers.py:1109 gajim/data/gui/add_new_contact_window.ui:25
+#: gajim/common/helpers.py:1115 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:1111
+#: gajim/common/helpers.py:1117
 msgid "Hello, I am $name."
 msgstr ""
 
-#: gajim/common/helpers.py:1215 gajim/common/helpers.py:1224
-#: gajim/common/helpers.py:1282
+#: gajim/common/helpers.py:1221 gajim/common/helpers.py:1230
+#: gajim/common/helpers.py:1288
 msgid "Timeout loading image"
 msgstr ""
 
-#: gajim/common/helpers.py:1234 gajim/common/helpers.py:1280
+#: gajim/common/helpers.py:1240 gajim/common/helpers.py:1286
 msgid "Image is too big"
 msgstr "Imagem é muito grande"
 
-#: gajim/common/helpers.py:1245
+#: gajim/common/helpers.py:1251
 msgid "PyCURL is not installed"
 msgstr ""
 
-#: gajim/common/helpers.py:1284
+#: gajim/common/helpers.py:1290
 #, fuzzy
 msgid "Error loading image"
 msgstr "Erro na leitura do ficheiro:"
@@ -5569,7 +5654,7 @@ msgstr ""
 #: gajim/common/modules/adhoc_commands.py:202
 #: gajim/common/modules/adhoc_commands.py:239
 #, fuzzy
-msgid "Leave Groupchats"
+msgid "Leave Group Chats"
 msgstr "Chat"
 
 #: gajim/common/modules/adhoc_commands.py:228
@@ -5579,15 +5664,17 @@ msgstr "%(nickname)s na sala %(room_name)s enviou-lhe uma nova mensagem."
 
 #: gajim/common/modules/adhoc_commands.py:232
 #, fuzzy
-msgid "You have not joined a groupchat."
+msgid "You have not joined a group chat."
 msgstr "Neste grupo"
 
 #: gajim/common/modules/adhoc_commands.py:240
-msgid "Choose the groupchats you want to leave"
-msgstr ""
+#, fuzzy
+msgid "Choose the group chats you want to leave"
+msgstr "Por favor preencha os dados do contacto que deseja adicionar"
 
 #: gajim/common/modules/adhoc_commands.py:289
-msgid "You left the following groupchats:"
+#, fuzzy
+msgid "You left the following group chats:"
 msgstr "Saiu das seguintes conversas de grupo:"
 
 #: gajim/common/modules/roster_item_exchange.py:102
@@ -5605,7 +5692,7 @@ msgstr "Contacto:"
 msgid "Blocked Contacts"
 msgstr "Contacto:"
 
-#: gajim/data/gui/destroy_muc_dialog.ui:79 gajim/gtk/dialogs.py:736
+#: gajim/data/gui/destroy_muc_dialog.ui:79 gajim/gtk/dialogs.py:563
 msgid "Destroy this group chat permanently?"
 msgstr ""
 
@@ -5613,7 +5700,7 @@ msgstr ""
 msgid "Reason..."
 msgstr ""
 
-#: gajim/data/gui/destroy_muc_dialog.ui:124 gajim/gtk/dialogs.py:738
+#: gajim/data/gui/destroy_muc_dialog.ui:124 gajim/gtk/dialogs.py:565
 msgid "Where participants should go (optional)"
 msgstr ""
 
@@ -5625,32 +5712,6 @@ msgstr ""
 msgid "_Reason and alternate venue (optional)"
 msgstr ""
 
-#: gajim/data/gui/advanced_configuration_window.ui:7
-#: gajim/data/gui/preferences_window.ui:2723
-#, fuzzy
-msgid "Advanced Configuration Editor (ACE)"
-msgstr "Editor de Configuração Avançada"
-
-#: gajim/data/gui/advanced_configuration_window.ui:52
-msgid "You should restart Gajim for some changes to take effect"
-msgstr ""
-
-#: gajim/data/gui/advanced_configuration_window.ui:84
-#, fuzzy
-msgid "_Filter"
-msgstr "_Filtro:"
-
-#: gajim/data/gui/advanced_configuration_window.ui:153
-#: gajim/data/gui/filetransfers_send_file_dialog.ui:15
-#: gajim/gtk/discovery.py:1666
-msgid "Description"
-msgstr "Descrição"
-
-#: gajim/data/gui/advanced_configuration_window.ui:197
-#, fuzzy
-msgid "_Reset to default"
-msgstr "Voltar às Cores Padrão"
-
 #: gajim/data/gui/join_groupchat_window.ui:56
 #: gajim/data/gui/chat_to_muc_window.ui:67
 #: gajim/data/gui/chat_to_muc_window.ui:78
@@ -5662,9 +5723,8 @@ msgid "Join group chat every time Gajim is started"
 msgstr ""
 
 #: gajim/data/gui/join_groupchat_window.ui:113
-#, fuzzy
-msgid "Auto Join"
-msgstr "Entrar automaticamente"
+msgid "Join Automatically"
+msgstr ""
 
 #: gajim/data/gui/join_groupchat_window.ui:131
 #: gajim/data/gui/profile_window.ui:233
@@ -5673,10 +5733,11 @@ msgstr "Conta"
 
 #: gajim/data/gui/join_groupchat_window.ui:147
 #, fuzzy
-msgid "Room"
-msgstr "Sala:"
+msgid "Group chat"
+msgstr "Chat"
 
-#: gajim/data/gui/join_groupchat_window.ui:180 gajim/gtk/accounts.py:886
+#: gajim/data/gui/join_groupchat_window.ui:180 gajim/data/gui/bookmarks.ui:158
+#: gajim/gtk/accounts.py:889
 #, fuzzy
 msgid "Password"
 msgstr "Senha:"
@@ -5700,92 +5761,11 @@ msgstr "_Entrar num Chat"
 msgid "Search group chats on selected server"
 msgstr ""
 
-#: gajim/data/gui/join_groupchat_window.ui:437 gajim/gtk/discovery.py:1271
+#: gajim/data/gui/join_groupchat_window.ui:437 gajim/gtk/discovery.py:1270
 #, fuzzy
 msgid "Join"
 msgstr "_Entrar"
 
-#: gajim/data/gui/manage_proxies_window.ui:12
-#, fuzzy
-msgid "HTTP Connect"
-msgstr "Ligação HTTP"
-
-#: gajim/data/gui/manage_proxies_window.ui:15
-msgid "SOCKS5"
-msgstr ""
-
-#: gajim/data/gui/manage_proxies_window.ui:18
-msgid "BOSH"
-msgstr ""
-
-#: gajim/data/gui/manage_proxies_window.ui:27
-msgid "Manage Proxy Profiles"
-msgstr "Gerir Perfis de Proxy"
-
-#: gajim/data/gui/manage_proxies_window.ui:83
-#, fuzzy
-msgid "Add Proxy"
-msgstr "Proxy:"
-
-#: gajim/data/gui/manage_proxies_window.ui:97
-#, fuzzy
-msgid "Remove Proxy"
-msgstr "_Remover"
-
-#: gajim/data/gui/manage_proxies_window.ui:141
-#, fuzzy
-msgid "Properties"
-msgstr "<b>Propriedades</b>"
-
-#: gajim/data/gui/manage_proxies_window.ui:157
-#, fuzzy
-msgid "_Name"
-msgstr "_Nome: "
-
-#: gajim/data/gui/manage_proxies_window.ui:173
-#, fuzzy
-msgid "_Type"
-msgstr "Tipo:"
-
-#: gajim/data/gui/manage_proxies_window.ui:236
-msgid "_BOSH URL"
-msgstr ""
-
-#: gajim/data/gui/manage_proxies_window.ui:261
-#, fuzzy
-msgid "Use HTTP prox_y"
-msgstr "_Usar proxy"
-
-#: gajim/data/gui/manage_proxies_window.ui:280
-#, fuzzy
-msgid "Proxy _Host"
-msgstr "Proxy:"
-
-#: gajim/data/gui/manage_proxies_window.ui:307
-#, fuzzy
-msgid "Proxy _Port"
-msgstr "_Porta:"
-
-#: gajim/data/gui/manage_proxies_window.ui:334
-#, fuzzy
-msgid "_Username"
-msgstr "Nome de _utilizador"
-
-#: gajim/data/gui/manage_proxies_window.ui:347
-#, fuzzy
-msgid "Use proxy auth_entication"
-msgstr "Usar autenticação"
-
-#: gajim/data/gui/manage_proxies_window.ui:377
-#, fuzzy
-msgid "Pass_word"
-msgstr "_Senha:"
-
-#: gajim/data/gui/manage_proxies_window.ui:405 gajim/gtk/adhoc.py:321
-#, fuzzy
-msgid "Settings"
-msgstr "Publicação vCard falhou"
-
 #: gajim/data/gui/change_password_dialog.ui:17
 #, fuzzy
 msgid "New Password"
@@ -5816,11 +5796,13 @@ msgid "Status:"
 msgstr "Estado:"
 
 #: gajim/data/gui/zeroconf_information_window.ui:89
-msgid "_Log conversation history"
+#, fuzzy
+msgid "_Store conversation history"
 msgstr "_Histórico das Conversas"
 
 #: gajim/data/gui/zeroconf_information_window.ui:215
 #: gajim/data/gui/vcard_information_window.ui:390
+#: gajim/data/gui/groupchat_info_scrolled.ui:166
 #, fuzzy
 msgid "Contact"
 msgstr "Contacto:"
@@ -5836,8 +5818,9 @@ msgid "Last Name:"
 msgstr "Nome:"
 
 #: gajim/data/gui/zeroconf_information_window.ui:260
-msgid "Jabber ID:"
-msgstr "Jabber ID:"
+#, fuzzy
+msgid "XMPP Address:"
+msgstr "_Endereço:"
 
 #: gajim/data/gui/zeroconf_information_window.ui:273
 msgid "E-Mail:"
@@ -5859,8 +5842,8 @@ msgstr "Enviar _Ficheiro"
 
 #: gajim/data/gui/gc_occupants_menu.ui:29
 #, fuzzy
-msgid "Occupant Actions"
-msgstr "Acções de _Ocupantes"
+msgid "Participant Actions"
+msgstr "Participantes"
 
 #: gajim/data/gui/gc_occupants_menu.ui:38
 msgid "_Voice"
@@ -5891,8 +5874,9 @@ msgid "_Ban"
 msgstr "_Banir"
 
 #: gajim/data/gui/gc_occupants_menu.ui:124
-msgid "_Add to Roster"
-msgstr "_Adicionar à Lista"
+#, fuzzy
+msgid "_Add to Contact List"
+msgstr "_Adicionar Contacto"
 
 #: gajim/data/gui/gc_occupants_menu.ui:132
 #, fuzzy
@@ -5933,11 +5917,6 @@ msgstr "Subscrição:"
 msgid "_Status"
 msgstr "E_stado"
 
-#: gajim/data/gui/zeroconf_context_menu.ui:26
-#: gajim/data/gui/account_context_menu.ui:79
-msgid "_Modify Account..."
-msgstr "_Modificar Conta..."
-
 #: gajim/data/gui/certificate_dialog.ui:66
 #: gajim/data/gui/certificate_dialog.ui:178
 msgid "Common Name (CN)"
@@ -6022,13 +6001,19 @@ msgstr "Nome:"
 msgid "Next entry"
 msgstr ""
 
+#: gajim/data/gui/filetransfers_send_file_dialog.ui:15
+#: gajim/data/gui/advanced_configuration.ui:143
+#: gajim/data/gui/groupchat_info_scrolled.ui:48 gajim/gtk/discovery.py:1663
+msgid "Description"
+msgstr "Descrição"
+
 #: gajim/data/gui/filetransfers_send_file_dialog.ui:54
 #, fuzzy
 msgid "_Send Files"
 msgstr "Enviar _Ficheiro"
 
 #: gajim/data/gui/filetransfers_send_file_dialog.ui:58
-#: gajim/gtk/xml_console.py:90
+#: gajim/gtk/xml_console.py:87
 msgid "Send"
 msgstr "Enviar"
 
@@ -6054,8 +6039,8 @@ msgstr "Muda Alcu_nha"
 
 #: gajim/data/gui/gc_control_popup_menu.ui:20
 #, fuzzy
-msgid "_Manage Room"
-msgstr "Gerir Bookmarks"
+msgid "_Manage Group Chat"
+msgstr "Chat"
 
 #: gajim/data/gui/gc_control_popup_menu.ui:31
 #, fuzzy
@@ -6064,13 +6049,13 @@ msgstr "Muda A_ssunto"
 
 #: gajim/data/gui/gc_control_popup_menu.ui:38
 #, fuzzy
-msgid "Configure _Room..."
-msgstr "Configurar _Sala"
+msgid "Configure _Group Chat..."
+msgstr "_Entrar num Chat..."
 
 #: gajim/data/gui/gc_control_popup_menu.ui:52
 #, fuzzy
-msgid "_Destroy Room"
-msgstr "Descrição: %s"
+msgid "_Destroy Group Chat"
+msgstr "Chat"
 
 #: gajim/data/gui/gc_control_popup_menu.ui:64
 msgid "_Minimize on close"
@@ -6081,7 +6066,7 @@ msgstr ""
 msgid "_Request Voice"
 msgstr "_Voz"
 
-#: gajim/data/gui/gc_control_popup_menu.ui:99 gajim/gtk/discovery.py:1704
+#: gajim/data/gui/gc_control_popup_menu.ui:99
 #, fuzzy
 msgid "_Bookmark"
 msgstr "Adicionar esta Sala aos _Bookmarks"
@@ -6134,14 +6119,6 @@ msgstr "Página pessoal:"
 msgid "E-Mail"
 msgstr "E-Mail:"
 
-#: 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/blocking_list.ui:115 gajim/gtk/add_contact.py:30
-#: gajim/gtk/accounts.py:801
-#, fuzzy
-msgid "Jabber ID"
-msgstr "Jabber ID:"
-
 #: gajim/data/gui/profile_window.ui:440
 msgid "Main"
 msgstr ""
@@ -6278,34 +6255,42 @@ msgstr "Trabalho"
 msgid "About"
 msgstr "Sobre"
 
-#: gajim/data/gui/start_chat_dialog.ui:114 gajim/gtk/discovery.py:1658
-msgid "Users"
-msgstr "Utilizadores"
+#: gajim/data/gui/start_chat_dialog.ui:53
+#, fuzzy
+msgid "Global Group Chat Search"
+msgstr "Entrar num Chat"
 
-#: gajim/data/gui/start_chat_dialog.ui:185
-msgid "Name:"
-msgstr "Nome:"
+#: 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
+msgid "_Back"
+msgstr "Volto logo"
 
-#: gajim/data/gui/start_chat_dialog.ui:197
-msgid "Description:"
-msgstr "Descrição:"
+#: gajim/data/gui/start_chat_dialog.ui:245
+#: gajim/data/gui/groupchat_control.ui:796
+#: gajim/data/gui/groupchat_control.ui:888 gajim/gtk/discovery.py:1701
+#: gajim/gtk/groupchat_join.py:62
+msgid "_Join"
+msgstr "_Entrar"
 
-#: gajim/data/gui/start_chat_dialog.ui:209
+#: gajim/data/gui/start_chat_dialog.ui:289
 #, fuzzy
-msgid "Address:"
-msgstr "_Endereço:"
+msgid "Select Account"
+msgstr "Removendo %s conta"
 
-#: gajim/data/gui/start_chat_dialog.ui:246
-msgid ""
-"Semi-Anonymous\n"
-"<span size=\"small\">(Only moderators can see your XMPP-Address)</span>"
+#: gajim/data/gui/start_chat_dialog.ui:380
+msgid "_Select"
 msgstr ""
 
 #: gajim/data/gui/filetransfers.ui:21
 msgid "Pa_use/Resume"
 msgstr ""
 
-#: gajim/data/gui/filetransfers.ui:30 gajim/gtk/filechoosers.py:178
+#: gajim/data/gui/filetransfers.ui:30 gajim/data/gui/groupchat_control.ui:575
+#: gajim/data/gui/groupchat_control.ui:667
+#: gajim/data/gui/groupchat_control.ui:779
+#: gajim/data/gui/groupchat_control.ui:871 gajim/gtk/filechoosers.py:178
 msgid "_Cancel"
 msgstr "_Cancelar"
 
@@ -6351,7 +6336,7 @@ msgstr ""
 
 #: gajim/data/gui/filetransfers.ui:207
 #, fuzzy
-msgid "Shows a list of file transfers between you and others"
+msgid "Shows a list of file transfers between you and your contacts"
 msgstr ""
 "Mostra uma lista de transferências de ficheiros entre si e outras pessoas"
 
@@ -6374,7 +6359,6 @@ msgid "Strike"
 msgstr "Serviço"
 
 #: gajim/data/gui/groupchat_control.ui:54 gajim/data/gui/chat_control.ui:318
-#: gajim/gtk/advanced_config.py:86
 msgid "Color"
 msgstr ""
 
@@ -6388,16 +6372,46 @@ msgstr "Letra:"
 msgid "Clear formatting"
 msgstr "Informações do Contacto"
 
-#: gajim/data/gui/groupchat_control.ui:290 gajim/data/gui/chat_control.ui:880
+#: gajim/data/gui/groupchat_control.ui:291 gajim/data/gui/chat_control.ui:880
 #, fuzzy
 msgid "Choose encryption"
 msgstr "Escolher Ficheiro para Enviar"
 
-#: gajim/data/gui/groupchat_control.ui:336 gajim/data/gui/chat_control.ui:640
+#: gajim/data/gui/groupchat_control.ui:337 gajim/data/gui/chat_control.ui:640
 #, fuzzy
 msgid "Show a list of emojis (Alt+M)"
 msgstr "Clique para inserir um emoticon (Alt+E)"
 
+#: gajim/data/gui/groupchat_control.ui:484
+#, fuzzy
+msgid "Joining…"
+msgstr "Banindo..."
+
+#: gajim/data/gui/groupchat_control.ui:496
+#, fuzzy
+msgid "_Abort"
+msgstr "_Sobre"
+
+#: gajim/data/gui/groupchat_control.ui:542
+#, fuzzy
+msgid "Enter new nickname"
+msgstr "Depois da alcunha:"
+
+#: gajim/data/gui/groupchat_control.ui:592
+#: gajim/data/gui/groupchat_control.ui:684
+#, fuzzy
+msgid "Ch_ange"
+msgstr "Muda Alcu_nha"
+
+#: gajim/data/gui/groupchat_control.ui:761
+#, fuzzy
+msgid "Enter password"
+msgstr "Introduza a nova senha:"
+
+#: gajim/data/gui/groupchat_control.ui:1067
+msgid "_Try again"
+msgstr ""
+
 #: gajim/data/gui/popup_notification_window.ui:42
 #, fuzzy
 msgid "Event Type"
@@ -6479,8 +6493,8 @@ msgstr "Ausente"
 
 #: gajim/data/gui/mam_preferences.ui:18
 #, fuzzy
-msgid "Roster"
-msgstr "Mostrar _Lista de Contactos"
+msgid "Contact List"
+msgstr "Contacto:"
 
 #: gajim/data/gui/mam_preferences.ui:22
 #: gajim/data/gui/preferences_window.ui:123
@@ -6506,12 +6520,12 @@ msgid "Add"
 msgstr "Endereço"
 
 #: gajim/data/gui/mam_preferences.ui:194 gajim/data/gui/groupchat_config.ui:151
-#: gajim/gtk/dialogs.py:63 gajim/gtk/accounts.py:381
+#: gajim/gtk/dialogs.py:62 gajim/gtk/accounts.py:384
 #, fuzzy
 msgid "Remove"
 msgstr "_Remover"
 
-#: gajim/data/gui/vcard_information_window.ui:72 gajim/gtk/accounts.py:753
+#: gajim/data/gui/vcard_information_window.ui:72 gajim/gtk/accounts.py:756
 #, fuzzy
 msgid "Resource"
 msgstr "Recurso:"
@@ -6564,6 +6578,7 @@ msgstr "Subscrição:"
 #: gajim/data/gui/vcard_information_window.ui:974
 #: gajim/data/gui/vcard_information_window.ui:993
 #: gajim/data/gui/vcard_information_window.ui:1427
+#: gajim/data/gui/groupchat_info_scrolled.ui:222
 msgid "button"
 msgstr ""
 
@@ -6596,15 +6611,15 @@ msgstr "_Notificar-me"
 
 #: gajim/data/gui/preferences_window.ui:58
 #, fuzzy
-msgid "Show only in roster"
-msgstr "Mostrar apenas na _lista"
+msgid "Show only in contact list"
+msgstr "Mostrar Contactos _Offline"
 
 #: gajim/data/gui/preferences_window.ui:69
-msgid "Detached roster with detached chats"
+msgid "Detached contact list with detached chats"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:72
-msgid "Detached roster with single chat"
+msgid "Detached contact list with single chat"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:75
@@ -6612,11 +6627,11 @@ msgid "Single window for everything"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:78
-msgid "Detached roster with chat grouped by account"
+msgid "Detached contact list with chat grouped by account"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:81
-msgid "Detached roster with chat grouped by type"
+msgid "Detached contact list with chat grouped by type"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:92
@@ -6666,7 +6681,7 @@ msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:296
 #, fuzzy
-msgid "_Show roster on startup"
+msgid "_Show contact list on startup"
 msgstr "Mostrar janela principal ao arranque"
 
 #: gajim/data/gui/preferences_window.ui:311
@@ -6682,12 +6697,12 @@ msgid "_Tabs placement"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:363
-msgid "_Quit Gajim when closing roster window"
+msgid "_Quit Gajim when closing contact list"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:367
 msgid ""
-"If enabled, Gajim will quit when closing the roster window instead of "
+"If enabled, Gajim will quit when closing the contact list window instead of "
 "minimizing to the system's notification area"
 msgstr ""
 
@@ -6697,41 +6712,42 @@ msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:423
 #, fuzzy
-msgid "Show a_vatars of contacts in roster"
+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
 #, fuzzy
 msgid ""
-"If checked, avatars of contacts will be shown in the roster window and in "
-"group chats"
+"If checked, avatars of contacts will be shown in the contact list window and "
+"in group chats"
 msgstr ""
 "Se marcado, Gajim exibirá imagens pessoais (avatars) dos seus contactos na "
 "lista"
 
 #: gajim/data/gui/preferences_window.ui:441
 #, fuzzy
-msgid "Show status _messages of contacts in roster"
+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
 #, fuzzy
 msgid ""
 "If checked, status messages of contacts will be shown under the contact's "
-"name, in the roster window, and in group chats"
+"name, in the contact list window, and in group chats"
 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
 #, fuzzy
-msgid "Show e_xtra information of contacts in roster (mood, activity, ...)"
+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
 msgid ""
-"If checked, additional info published by the contact will be shown in "
-"roster. Additional infos (published via PEP) may include e.g. mood, "
+"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 ""
 
@@ -6742,8 +6758,8 @@ msgstr "Ordenar contactos por estados"
 
 #: gajim/data/gui/preferences_window.ui:494
 #, fuzzy
-msgid "in _roster"
-msgstr "Fora da lista"
+msgid "in _contact list"
+msgstr "Contacto:"
 
 #: gajim/data/gui/preferences_window.ui:511
 #, fuzzy
@@ -6752,8 +6768,8 @@ msgstr "_Entrar num Chat"
 
 #: gajim/data/gui/preferences_window.ui:540
 #, fuzzy
-msgid "Roster Appearance"
-msgstr "Aparência"
+msgid "Contact List Appearance"
+msgstr "Contacto Entrou"
 
 #: gajim/data/gui/preferences_window.ui:585
 msgid "Enable spell _checking"
@@ -6810,7 +6826,7 @@ msgstr "Impossível entrar na sala"
 
 #: gajim/data/gui/preferences_window.ui:660
 #, fuzzy
-msgid "If checked, the room subject will be shown when joining a group chat"
+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:682
@@ -6825,13 +6841,13 @@ msgstr ""
 #: gajim/data/gui/preferences_window.ui:701
 msgid ""
 "If join/leave status messages are shown in the group chat. This setting can "
-"be overridden in the groupchat menu."
+"be overridden in the group chat menu."
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:720
 msgid ""
 "The default sync threshold for new public group chats. This setting can be "
-"overridden in the groupchat menu."
+"overridden in the group chat menu."
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:722
@@ -6846,7 +6862,7 @@ msgstr "_Arquivar mudanças de estado dos contactos"
 #: gajim/data/gui/preferences_window.ui:768
 msgid ""
 "If status change messages are shown in the group chat. This setting can be "
-"overridden in the groupchat menu."
+"overridden in the group chat menu."
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:825
@@ -6863,8 +6879,8 @@ msgstr "Se marcado, o Gajim juntar-se-á a este chat no arranque"
 
 #: gajim/data/gui/preferences_window.ui:843
 #, fuzzy
-msgid "Show chatstate in roster"
-msgstr "Exibir imagens pessoais (avatars) dos contactos na lista"
+msgid "Show chatstate in contact list"
+msgstr "Mostrar botão de fechar na aba?"
 
 #: gajim/data/gui/preferences_window.ui:847
 msgid ""
@@ -7165,7 +7181,7 @@ msgstr ""
 msgid "Vi_ew own video source"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2281 gajim/gtk/accounts.py:352
+#: gajim/data/gui/preferences_window.ui:2281 gajim/gtk/accounts.py:355
 msgid "Connection"
 msgstr "Ligação"
 
@@ -7219,7 +7235,8 @@ msgid "_Manage..."
 msgstr "Gerir..."
 
 #: gajim/data/gui/preferences_window.ui:2616
-msgid "_Log status changes of contacts"
+#, fuzzy
+msgid "_Store status changes of contacts in history"
 msgstr "_Arquivar mudanças de estado dos contactos"
 
 #: gajim/data/gui/preferences_window.ui:2633
@@ -7245,9 +7262,14 @@ msgstr ""
 msgid "_Open..."
 msgstr "Abrir..."
 
+#: gajim/data/gui/preferences_window.ui:2723 gajim/gtk/advanced_config.py:84
+#, fuzzy
+msgid "Advanced Configuration Editor (ACE)"
+msgstr "Editor de Configuração Avançada"
+
 #: gajim/data/gui/groupchat_config.ui:55
 msgid ""
-"<b>Jabber-ID</b>\n"
+"<b>XMPP Address</b>\n"
 "&lt;user@domain/resource&gt; (only that resource matches)\n"
 "&lt;user@domain&gt; (any resource matches)\n"
 "&lt;domain/resource&gt; (only that resource matches)\n"
@@ -7260,7 +7282,8 @@ msgstr ""
 msgid "Only Admins and Owners can modify the affiliation"
 msgstr ""
 
-#: gajim/data/gui/groupchat_config.ui:270 gajim/plugins/gui.py:312
+#: gajim/data/gui/groupchat_config.ui:270
+#: gajim/data/gui/groupchat_info_scrolled.ui:210 gajim/plugins/gui.py:324
 #, fuzzy
 msgid "Configuration"
 msgstr "Configuração da Sala"
@@ -7293,7 +7316,7 @@ msgid "Start _Chat"
 msgstr "Iniciar _Conversa"
 
 #: gajim/data/gui/contact_context_menu.ui:20
-#: gajim/data/gui/systray_context_menu.ui:36
+#: gajim/data/gui/systray_context_menu.ui:29
 #, fuzzy
 msgid "Send Single _Message..."
 msgstr "Enviar _Mensagem Simples"
@@ -7363,17 +7386,41 @@ msgstr ""
 
 #: gajim/data/gui/contact_context_menu.ui:174
 #, fuzzy
-msgid "_Add to Roster..."
-msgstr "_Adicionar à Lista"
+msgid "_Add to Contact List..."
+msgstr "_Adicionar Contacto"
+
+#: gajim/data/gui/advanced_configuration.ui:39
+msgid "You should restart Gajim for some changes to take effect"
+msgstr ""
+
+#: gajim/data/gui/advanced_configuration.ui:71
+#, fuzzy
+msgid "_Filter"
+msgstr "_Filtro:"
+
+#: gajim/data/gui/advanced_configuration.ui:88
+msgid "Type to search for values..."
+msgstr ""
+
+#: gajim/data/gui/advanced_configuration.ui:180
+#, fuzzy
+msgid "_Reset Value"
+msgstr "Voltar às Cores Padrão"
+
+#: gajim/data/gui/advanced_configuration.ui:185
+#, fuzzy
+msgid "Resets value to default"
+msgstr "Voltar às Cores Padrão"
 
 #: gajim/data/gui/account_creation_wizard_window.ui:43
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim: Criação Passo-a-passo de uma Conta"
 
 #: gajim/data/gui/account_creation_wizard_window.ui:70
+#, fuzzy
 msgid ""
 "You need to have an account in order to connect\n"
-"to the Jabber network."
+"to the XMPP network."
 msgstr ""
 "Necessita de uma conta para se poder ligar\n"
 "à rede Jabber."
@@ -7396,8 +7443,9 @@ msgid "<b>Please fill in the data for your existing account</b>"
 msgstr "<b>Por favor preencha os dados para a sua conta existente</b>"
 
 #: gajim/data/gui/account_creation_wizard_window.ui:187
-msgid "_Jabber ID:"
-msgstr "_Jabber ID:"
+#, fuzzy
+msgid "_XMPP Address:"
+msgstr "_Endereço:"
 
 #: gajim/data/gui/account_creation_wizard_window.ui:239
 #: gajim/data/gui/account_creation_wizard_window.ui:394
@@ -7488,6 +7536,7 @@ msgid "Privacy Lists:"
 msgstr "Iniciar Conversa"
 
 #: gajim/data/gui/service_discovery_window.ui:111
+#: gajim/data/gui/groupchat_creation.ui:227
 #, fuzzy
 msgid "_Address"
 msgstr "_Endereço:"
@@ -7506,11 +7555,6 @@ msgstr ""
 msgid "Select the contacts you want to synchronise"
 msgstr "JID do contacto com quem deseja conversar"
 
-#: gajim/data/gui/groupchat_invitation_received.ui:42
-#, fuzzy
-msgid "Group Chat Invitation"
-msgstr "?Função do Contacto no Chat:Nenhuma"
-
 #: gajim/data/gui/groupchat_invitation_received.ui:111
 #, fuzzy
 msgid "Message..."
@@ -7562,11 +7606,10 @@ msgstr ""
 
 #: gajim/data/gui/add_new_contact_window.ui:84
 #, fuzzy
-msgid "_Jabber ID"
-msgstr "_Jabber ID:"
+msgid "_XMPP Address"
+msgstr "_Endereço:"
 
 #: gajim/data/gui/add_new_contact_window.ui:100
-#: gajim/data/gui/manage_bookmarks_window.ui:192
 #, fuzzy
 msgid "_Nickname"
 msgstr "_Alcunha:"
@@ -7640,7 +7683,7 @@ msgstr "<b>Registos</b>"
 msgid "<b>Message:</b>"
 msgstr "<b>Registos</b>"
 
-#: gajim/data/gui/plugins_window.ui:10 gajim/data/gui/application_menu.ui:90
+#: gajim/data/gui/plugins_window.ui:10 gajim/data/gui/application_menu.ui:87
 msgid "Plugins"
 msgstr ""
 
@@ -7749,11 +7792,6 @@ msgstr ""
 msgid "Deny"
 msgstr "Negar"
 
-#: gajim/data/gui/privacy_list_window.ui:317
-#, fuzzy
-msgid "JabberID"
-msgstr "Jabber ID:"
-
 #: gajim/data/gui/privacy_list_window.ui:358
 #, fuzzy
 msgid "all in the group"
@@ -7802,7 +7840,7 @@ msgstr "Servidor:"
 msgid "Manage sounds"
 msgstr "Gerir Contas"
 
-#: gajim/data/gui/manage_sounds_window.ui:55 gajim/plugins/gui.py:100
+#: gajim/data/gui/manage_sounds_window.ui:55 gajim/plugins/gui.py:101
 msgid "Active"
 msgstr "Activo"
 
@@ -7842,24 +7880,113 @@ msgstr "Remover conta do Gajim e do _servidor"
 msgid "_Personal Events"
 msgstr "Detalhes Pessoais..."
 
-#: gajim/data/gui/account_context_menu.ui:35
-#: gajim/data/gui/systray_context_menu.ui:28
-msgid "Join _Group Chat"
-msgstr "_Entrar num Chat"
-
-#: gajim/data/gui/account_context_menu.ui:49
+#: gajim/data/gui/account_context_menu.ui:41
 msgid "_Add Contact..."
 msgstr "_Adicionar Contacto"
 
-#: gajim/data/gui/account_context_menu.ui:57
+#: gajim/data/gui/account_context_menu.ui:49
 msgid "_Discover Services"
 msgstr "_Descobrir Recursos"
 
-#: gajim/data/gui/account_context_menu.ui:65
+#: gajim/data/gui/account_context_menu.ui:57
 #, fuzzy
 msgid "_Execute Command..."
 msgstr "comando"
 
+#: gajim/data/gui/account_context_menu.ui:65
+#, fuzzy
+msgid "_View Certificate"
+msgstr "Nome de utilizador inválido"
+
+#: gajim/data/gui/manage_proxies.ui:12
+#, fuzzy
+msgctxt "proxy configuration"
+msgid "HTTP Connect"
+msgstr "Ligação HTTP"
+
+#: gajim/data/gui/manage_proxies.ui:15
+msgctxt "proxy configuration"
+msgid "SOCKS5"
+msgstr ""
+
+#: gajim/data/gui/manage_proxies.ui:18
+msgctxt "proxy configuration"
+msgid "BOSH"
+msgstr ""
+
+#: gajim/data/gui/manage_proxies.ui:68
+#, fuzzy
+msgid "Add Proxy"
+msgstr "Proxy:"
+
+#: gajim/data/gui/manage_proxies.ui:82
+#, fuzzy
+msgid "Remove Proxy"
+msgstr "_Remover"
+
+#: gajim/data/gui/manage_proxies.ui:134
+#, fuzzy
+msgid "Pass_word"
+msgstr "_Senha:"
+
+#: gajim/data/gui/manage_proxies.ui:159
+#, fuzzy
+msgid "Use proxy auth_entication"
+msgstr "Usar autenticação"
+
+#: gajim/data/gui/manage_proxies.ui:179
+#, fuzzy
+msgid "_Username"
+msgstr "Nome de _utilizador"
+
+#: gajim/data/gui/manage_proxies.ui:209
+#, fuzzy
+msgid "_Port"
+msgstr "_Porta:"
+
+#: gajim/data/gui/manage_proxies.ui:226
+msgid "example.org"
+msgstr ""
+
+#: gajim/data/gui/manage_proxies.ui:240
+#, fuzzy
+msgid "_Host"
+msgstr "_Host:"
+
+#: gajim/data/gui/manage_proxies.ui:254
+#, fuzzy
+msgid "Use HTTP prox_y"
+msgstr "_Usar proxy"
+
+#: gajim/data/gui/manage_proxies.ui:275
+msgid "https://example.org/http-bind/"
+msgstr ""
+
+#: gajim/data/gui/manage_proxies.ui:291
+msgid "_BOSH URL"
+msgstr ""
+
+#: gajim/data/gui/manage_proxies.ui:309 gajim/gtk/adhoc.py:322
+#, fuzzy
+msgid "Settings"
+msgstr "Publicação vCard falhou"
+
+#: gajim/data/gui/manage_proxies.ui:344
+#, fuzzy
+msgid "_Type"
+msgstr "Tipo:"
+
+#: gajim/data/gui/manage_proxies.ui:361
+#: gajim/data/gui/groupchat_creation.ui:105
+#, fuzzy
+msgid "_Name"
+msgstr "_Nome: "
+
+#: gajim/data/gui/manage_proxies.ui:391 gajim/gtk/accounts.py:742
+#, fuzzy
+msgid "Proxy"
+msgstr "Proxy:"
+
 #: gajim/data/gui/application_menu.ui:8
 #, fuzzy
 msgid "View"
@@ -7867,8 +7994,8 @@ msgstr "_Voz"
 
 #: gajim/data/gui/application_menu.ui:11
 #, fuzzy
-msgid "Show Roster"
-msgstr "Mostrar _Lista de Contactos"
+msgid "Show Contact List"
+msgstr "Mostrar Contactos _Offline"
 
 #: gajim/data/gui/application_menu.ui:16
 #, fuzzy
@@ -7910,23 +8037,24 @@ msgstr ""
 msgid "Features"
 msgstr "Recursos dos Servidores"
 
-#: gajim/data/gui/application_menu.ui:81
+#: gajim/data/gui/application_menu.ui:77
+#: gajim/data/gui/groupchat_creation.ui:81 gajim/gtk/groupchat_creation.py:45
 #, fuzzy
-msgid "Bookmarks"
-msgstr "Adicionar esta Sala aos _Bookmarks"
+msgid "Create Group Chat"
+msgstr "Chat"
 
-#: gajim/data/gui/application_menu.ui:94 gajim/data/gui/shortcuts_window.ui:189
-#: gajim/gtk/preferences.py:59
+#: gajim/data/gui/application_menu.ui:91 gajim/data/gui/shortcuts_window.ui:189
+#: gajim/gtk/preferences.py:58
 msgid "Preferences"
 msgstr "Preferências"
 
-#: gajim/data/gui/application_menu.ui:99
+#: gajim/data/gui/application_menu.ui:96
 #, fuzzy
 msgid "Quit"
 msgstr "_Sair"
 
 #: gajim/data/gui/httpupload_progress_dialog.ui:110
-#: gajim/gtk/filetransfer.py:121
+#: gajim/gtk/filetransfer.py:120
 msgid "Progress"
 msgstr "Progresso"
 
@@ -7943,52 +8071,33 @@ msgstr ""
 msgid "_Cancel Upload"
 msgstr "_Cancelar"
 
-#: gajim/data/gui/manage_bookmarks_window.ui:13
-#, fuzzy
-msgid "Group Chat Bookmarks"
-msgstr "Chat"
-
-#: gajim/data/gui/manage_bookmarks_window.ui:68
-#, fuzzy
-msgid "Add Bookmark"
-msgstr "Adicionar esta Sala aos _Bookmarks"
-
-#: gajim/data/gui/manage_bookmarks_window.ui:82
-#, fuzzy
-msgid "Remove Bookmark"
-msgstr "Adicionar esta Sala aos _Bookmarks"
+#: gajim/data/gui/groupchat_creation.ui:27
+msgid "Public or Private?"
+msgstr ""
 
-#: gajim/data/gui/manage_bookmarks_window.ui:126
-msgid "N_ame"
+#: 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 ""
 
-#: gajim/data/gui/manage_bookmarks_window.ui:145
-#, fuzzy
-msgid "Bookmark Name"
-msgstr "Adicionar esta Sala aos _Bookmarks"
+#: gajim/data/gui/groupchat_creation.ui:58
+msgid "<b>Public:</b> Anyone who knows the address can join."
+msgstr ""
 
-#: gajim/data/gui/manage_bookmarks_window.ui:160
+#: gajim/data/gui/groupchat_creation.ui:122
 #, fuzzy
-msgid "_Server"
-msgstr "_Servidor:"
+msgid "_Description"
+msgstr "Descrição"
 
-#: gajim/data/gui/manage_bookmarks_window.ui:223
-msgid "Roo_m"
+#: gajim/data/gui/groupchat_creation.ui:164
+msgid "_Public"
 msgstr ""
 
-#: gajim/data/gui/manage_bookmarks_window.ui:253
-#, fuzzy
-msgid "_Password"
-msgstr "_Senha:"
-
-#: gajim/data/gui/manage_bookmarks_window.ui:299
+#: gajim/data/gui/groupchat_creation.ui:278
 #, fuzzy
-msgid "Join chat when connected"
-msgstr "Contacto Entrou"
-
-#: gajim/data/gui/manage_bookmarks_window.ui:307
-msgid "_Join Automatically"
-msgstr ""
+msgid "_Account"
+msgstr "Contas"
 
 #: gajim/data/gui/exception_dialog.ui:49
 msgid "Sorry, that should not have happened"
@@ -8033,6 +8142,28 @@ msgstr "Autorize o contacto para ele saber quando você está ligado"
 msgid "Presets"
 msgstr "_Presença"
 
+#: gajim/data/gui/groupchat_info_scrolled.ui:32
+msgid "Address"
+msgstr "Endereço"
+
+#: gajim/data/gui/groupchat_info_scrolled.ui:64
+msgid "Topic"
+msgstr ""
+
+#: gajim/data/gui/groupchat_info_scrolled.ui:80
+#, fuzzy
+msgid "Author"
+msgstr "_Autorizar"
+
+#: gajim/data/gui/groupchat_info_scrolled.ui:182
+msgid "Discussion Logs"
+msgstr ""
+
+#: gajim/data/gui/groupchat_info_scrolled.ui:260
+#, fuzzy
+msgid "Group Chat Language"
+msgstr "?Função do Contacto no Chat:Nenhuma"
+
 #: gajim/data/gui/emoji_chooser.ui:98
 msgid "No Results Found"
 msgstr ""
@@ -8042,27 +8173,38 @@ msgid "Invite Friends!"
 msgstr ""
 
 #: gajim/data/gui/chat_to_muc_window.ui:39
+#, fuzzy
 msgid ""
-"You are now entering a groupchat.\n"
+"You are now entering a group chat.\n"
 "Select the contacts you want to invite"
 msgstr ""
 "Está neste momento a entrar numa conversa de grupo.\n"
 "Seleccione os contactos que quer convidar"
 
 #: gajim/data/gui/chat_to_muc_window.ui:112
-msgid "Please select a MUC server."
-msgstr ""
+#, fuzzy
+msgid "Please select a group chat server."
+msgstr "Perguntar antes de fechar uma janela/aba de chat."
 
 #: gajim/data/gui/chat_to_muc_window.ui:141
 #, fuzzy
-msgid "MUC server"
-msgstr "Servidor"
+msgid "Group chat server"
+msgstr "Chat"
 
 #: gajim/data/gui/chat_to_muc_window.ui:176
 #, fuzzy
 msgid "In_vite"
 msgstr "Invisível"
 
+#: gajim/data/gui/bookmarks.ui:176
+#, fuzzy
+msgid "Autojoin"
+msgstr "Entrar automaticamente"
+
+#: gajim/data/gui/bookmarks.ui:211
+msgid "_Apply"
+msgstr ""
+
 #: gajim/data/gui/history_manager.ui:11
 msgid "_Export"
 msgstr ""
@@ -8079,11 +8221,11 @@ msgstr "_Histórico"
 
 #: gajim/data/gui/history_manager.ui:108
 msgid ""
-"This log manager is not intended for log viewing. If you are looking for "
-"such functionality, use the history window instead.\n"
+"This history manager is not intended for viewing chat history. If you are "
+"looking for such functionality, please use the history window instead.\n"
 "\n"
-"Use this program to delete or export logs. You can select logs from the left "
-"and/or search database from below."
+"You can use this program to delete or export history. Either select logs "
+"from the left or search the database."
 msgstr ""
 
 #: gajim/data/gui/history_manager.ui:124
@@ -8127,7 +8269,7 @@ msgid "Select an emoji"
 msgstr "Usar _emoticons"
 
 #: gajim/data/gui/shortcuts_window.ui:38
-msgid "Complete a command or a nick"
+msgid "Complete a command or a nickname"
 msgstr ""
 
 #: gajim/data/gui/shortcuts_window.ui:45
@@ -8168,7 +8310,7 @@ msgstr ""
 msgid "Scroll down"
 msgstr ""
 
-#: gajim/data/gui/shortcuts_window.ui:100 gajim/gtk/xml_console.py:72
+#: gajim/data/gui/shortcuts_window.ui:100 gajim/gtk/xml_console.py:69
 #, fuzzy
 msgid "Clear"
 msgstr "Evento"
@@ -8210,8 +8352,9 @@ msgid "Close chat"
 msgstr ""
 
 #: gajim/data/gui/shortcuts_window.ui:173
-msgid "Roster Shortcuts"
-msgstr ""
+#, fuzzy
+msgid "Contact List Shortcuts"
+msgstr "Contacto Entrou"
 
 #: gajim/data/gui/shortcuts_window.ui:196
 #, fuzzy
@@ -8243,7 +8386,7 @@ msgid "Show only active contacts"
 msgstr "Mostrar Contactos _Offline"
 
 #: gajim/data/gui/shortcuts_window.ui:251
-msgid "Enable roster filtering"
+msgid "Enable contact list filtering"
 msgstr ""
 
 #: gajim/data/gui/shortcuts_window.ui:259
@@ -8290,12 +8433,12 @@ msgid "Search selected day only"
 msgstr ""
 
 #: gajim/data/gui/history_window.ui:317
-msgid "Record history for this chat"
+msgid "Store history for this chat"
 msgstr ""
 
 #: gajim/data/gui/history_window.ui:332
 #, fuzzy
-msgid "Record History"
+msgid "Store History"
 msgstr "Histórico dos registos"
 
 #: gajim/data/gui/history_window.ui:350
@@ -8317,9 +8460,10 @@ msgstr ""
 msgid "Fill in the form."
 msgstr "Neste grupo"
 
-#: gajim/data/gui/data_form_window.ui:229
-msgid "Room Configuration"
-msgstr "Configuração da Sala"
+#: gajim/data/gui/data_form_window.ui:229 gajim/gtk/groupchat_config.py:41
+#, fuzzy
+msgid "Group Chat Configuration"
+msgstr "?Função do Contacto no Chat:Nenhuma"
 
 #: gajim/data/gui/roster_item_exchange_window.ui:39
 #: gajim/gtk/roster_item_exchange.py:35
@@ -8341,16 +8485,16 @@ msgstr "Es_tado"
 msgid "_Start Chat..."
 msgstr "_Iniciar Conversa"
 
-#: gajim/data/gui/systray_context_menu.ui:50
+#: gajim/data/gui/systray_context_menu.ui:43
 msgid "Show All Pending _Events"
 msgstr "Mostrar Todos os _Eventos Pedentes"
 
-#: gajim/data/gui/systray_context_menu.ui:59
+#: gajim/data/gui/systray_context_menu.ui:52
 #, fuzzy
 msgid "Mute Sounds"
 msgstr "Sons Wav"
 
-#: gajim/data/gui/systray_context_menu.ui:75
+#: gajim/data/gui/systray_context_menu.ui:68
 #, fuzzy
 msgid "_Preferences"
 msgstr "Preferências"
@@ -8443,33 +8587,33 @@ msgstr ""
 msgid "Execute expression inside a shell, send output"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:45
+#: gajim/command_system/implementation/standard.py:47
 msgid ""
 "Show help on a given command or a list of available commands if -a is given"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:73
+#: gajim/command_system/implementation/standard.py:75
 msgid "Send a message to the contact"
 msgstr "Enviar uma mensagem ao contacto"
 
-#: gajim/command_system/implementation/standard.py:78
+#: gajim/command_system/implementation/standard.py:80
 msgid "Send action (in the third person) to the current chat"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:83
+#: gajim/command_system/implementation/standard.py:85
 msgid "Show logged messages which mention given text"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:88
+#: gajim/command_system/implementation/standard.py:90
 #, fuzzy, python-format
 msgid "%s: Nothing found"
 msgstr "%s não encontrado"
 
-#: gajim/command_system/implementation/standard.py:94
+#: gajim/command_system/implementation/standard.py:96
 msgid "Limit must be an integer"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:118
+#: gajim/command_system/implementation/standard.py:120
 msgid ""
 "\n"
 "    Set the current status\n"
@@ -8479,127 +8623,129 @@ msgid ""
 "    "
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:136
+#: gajim/command_system/implementation/standard.py:138
 msgid "Set the current status to away"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:150
+#: gajim/command_system/implementation/standard.py:152
 msgid "Set the current status to online"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:153
+#: gajim/command_system/implementation/standard.py:155
 #, fuzzy
 msgid "Available"
 msgstr "Indisponível"
 
-#: gajim/command_system/implementation/standard.py:173
-#: gajim/command_system/implementation/standard.py:250
+#: gajim/command_system/implementation/standard.py:175
+#: gajim/command_system/implementation/standard.py:252
 msgid "Clear the text window"
 msgstr "Limpar a janela de texto"
 
-#: gajim/command_system/implementation/standard.py:178
-#: gajim/command_system/implementation/standard.py:397
+#: gajim/command_system/implementation/standard.py:180
+#: gajim/command_system/implementation/standard.py:401
 #, fuzzy
 msgid "Send a ping to the contact"
 msgstr "Uso: /%s, muda a janela de chat para o modo compacto."
 
-#: gajim/command_system/implementation/standard.py:181
-#: gajim/command_system/implementation/standard.py:400
+#: gajim/command_system/implementation/standard.py:183
+#: gajim/command_system/implementation/standard.py:404
 msgid "Command is not supported for zeroconf accounts"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:185
-msgid "Send DTMF sequence through an open audio session"
+#: gajim/command_system/implementation/standard.py:187
+msgid "Send DTMF sequence through an open voice chat"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:188
+#: gajim/command_system/implementation/standard.py:190
 #, fuzzy
-msgid "No open audio sessions with the contact"
+msgid "No open voice chats with the contact"
 msgstr "Clique para ver conversas anteriores com este contacto"
 
-#: gajim/command_system/implementation/standard.py:191
+#: gajim/command_system/implementation/standard.py:193
 #, python-format
 msgid "%s is not a valid tone"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:198
-msgid "Toggle audio session"
+#: gajim/command_system/implementation/standard.py:200
+msgid "Toggle Voice Chat"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:201
+#: gajim/command_system/implementation/standard.py:203
 #, fuzzy
-msgid "Audio sessions are not available"
+msgid "Voice chats are not available"
 msgstr "Sessão bus não está disponível"
 
-#: gajim/command_system/implementation/standard.py:208
-msgid "Toggle video session"
+#: gajim/command_system/implementation/standard.py:210
+msgid "Toggle Video Chat"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:211
+#: gajim/command_system/implementation/standard.py:213
 #, fuzzy
-msgid "Video sessions are not available"
+msgid "Video chats are not available"
 msgstr "Sessão bus não está disponível"
 
-#: gajim/command_system/implementation/standard.py:218
+#: gajim/command_system/implementation/standard.py:220
 #, fuzzy
 msgid "Send a message to the contact that will attract their attention"
 msgstr "Enviar uma mensagem ao contacto"
 
-#: gajim/command_system/implementation/standard.py:255
+#: gajim/command_system/implementation/standard.py:257
 #, fuzzy
 msgid "Change your nickname in a group chat"
 msgstr "Muda Alcu_nha"
 
-#: gajim/command_system/implementation/standard.py:260 gajim/gtk/dialogs.py:674
-#: gajim/gtk/bookmarks.py:272
+#: gajim/command_system/implementation/standard.py:262
 #, fuzzy
 msgid "Invalid nickname"
 msgstr "Nome de utilizador inválido"
 
-#: gajim/command_system/implementation/standard.py:267
-msgid "Open a private chat window with a specified occupant"
+#: gajim/command_system/implementation/standard.py:269
+#, fuzzy
+msgid "Open a private chat window with a specified participant"
 msgstr "Abrir uma janela de conversação privada com um ocupante específico"
 
-#: gajim/command_system/implementation/standard.py:273
-#: gajim/command_system/implementation/standard.py:282
-#: gajim/command_system/implementation/standard.py:332
-#: gajim/command_system/implementation/standard.py:345
-#: gajim/command_system/implementation/standard.py:357
+#: gajim/command_system/implementation/standard.py:275
+#: gajim/command_system/implementation/standard.py:284
+#: gajim/command_system/implementation/standard.py:336
+#: gajim/command_system/implementation/standard.py:349
+#: gajim/command_system/implementation/standard.py:361
 msgid "Nickname not found"
 msgstr "Alcunha não encontrada"
 
-#: gajim/command_system/implementation/standard.py:276
+#: gajim/command_system/implementation/standard.py:278
+#, fuzzy
 msgid ""
-"Open a private chat window with a specified occupant and send him a message"
+"Open a private chat window with a specified participant and send him a "
+"message"
 msgstr ""
 "Abrir uma janela de conversação privada com um ocupante específico e enviar-"
 "lhe uma mensagem"
 
-#: gajim/command_system/implementation/standard.py:285
+#: gajim/command_system/implementation/standard.py:287
 #, fuzzy
 msgid "Display or change a group chat topic"
 msgstr "Perguntar antes de fechar uma janela/aba de chat."
 
-#: gajim/command_system/implementation/standard.py:294
-msgid "Invite a user to a room for a reason"
+#: gajim/command_system/implementation/standard.py:296
+msgid "Invite a user to a group chat for a reason"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:297
+#: gajim/command_system/implementation/standard.py:299
 #, fuzzy, python-format
 msgid "Invited %(jid)s to %(room_jid)s"
 msgstr "%(contact_jid)s foi convidado(a) para %(room_jid)s."
 
-#: gajim/command_system/implementation/standard.py:301
+#: gajim/command_system/implementation/standard.py:303
 #, fuzzy
-msgid "Join a group chat given by a JID"
+msgid "Join a group chat given by an XMPP Address"
 msgstr "_Entrar num Chat"
 
-#: gajim/command_system/implementation/standard.py:309
+#: gajim/command_system/implementation/standard.py:313
 msgid ""
-"Leave the groupchat, optionally giving a reason, and close tab or window"
+"Leave the group chat, optionally giving a reason, and close tab or window"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:314
+#: gajim/command_system/implementation/standard.py:318
 msgid ""
 "\n"
 "    Ban user by a nick or a JID from a groupchat\n"
@@ -8608,45 +8754,46 @@ msgid ""
 "    "
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:329
+#: gajim/command_system/implementation/standard.py:333
 #, fuzzy
-msgid "Kick user by a nick from a groupchat"
+msgid "Kick user by a nick from a group chat"
 msgstr "Está banido/a desta sala."
 
-#: gajim/command_system/implementation/standard.py:338
+#: gajim/command_system/implementation/standard.py:342
 msgid ""
-"Set occupant role in group chat.\n"
+"Set participant role in group chat.\n"
 "    Role can be given as one of the following values:\n"
 "    moderator, participant, visitor, none"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:343
+#: gajim/command_system/implementation/standard.py:347
 #, fuzzy
 msgid "Invalid role given"
 msgstr "Nome de utilizador inválido"
 
-#: gajim/command_system/implementation/standard.py:350
+#: gajim/command_system/implementation/standard.py:354
 msgid ""
-"Set occupant affiliation in group chat.\n"
+"Set participant affiliation in group chat.\n"
 "    Affiliation can be given as one of the following values:\n"
 "    owner, admin, member, outcast, none"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:355
+#: gajim/command_system/implementation/standard.py:359
 #, fuzzy
 msgid "Invalid affiliation given"
 msgstr "Filiação: "
 
-#: gajim/command_system/implementation/standard.py:365
-msgid "Display names of all group chat occupants"
+#: gajim/command_system/implementation/standard.py:369
+#, fuzzy
+msgid "Display names of all group chat participants"
 msgstr "Mostrar nomes de todos os ocupantes da conversa de grupo"
 
-#: gajim/command_system/implementation/standard.py:387
-msgid "Forbid an occupant to send you public or private messages"
+#: gajim/command_system/implementation/standard.py:391
+msgid "Forbid a participant to send you public or private messages"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:392
-msgid "Allow an occupant to send you public or private messages"
+#: gajim/command_system/implementation/standard.py:396
+msgid "Allow a participant to send you public or private messages"
 msgstr ""
 
 #: gajim/command_system/implementation/middleware.py:74
@@ -8657,203 +8804,328 @@ msgstr ""
 msgid "The same as using a doc-string, except it supports translation"
 msgstr ""
 
-#: gajim/gtk/filetransfer.py:91
+#: gajim/gtk/groupchat_info.py:36
+#, fuzzy
+msgid "?Group chat feature:Archiving"
+msgstr "?Função do Contacto no Chat:Nenhuma"
+
+#: gajim/gtk/groupchat_info.py:37
+#, fuzzy
+msgid "Messages are archived on the server"
+msgstr "Não está ligado ao servidor"
+
+#: gajim/gtk/groupchat_info.py:40
+#, fuzzy
+msgid "?Group chat feature:Persistent"
+msgstr "Chat"
+
+#: gajim/gtk/groupchat_info.py:41
+msgid "This group chat persists even if there are no participants"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:45
+#, fuzzy
+msgid "?Group chat feature:Temporary"
+msgstr "?Função do Contacto no Chat:Nenhuma"
+
+#: gajim/gtk/groupchat_info.py:46
+msgid "This group chat will be destroyed once the last participant left"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:50
+#, fuzzy
+msgid "?Group chat feature:Moderated"
+msgstr "?Função do Contacto no Chat:Nenhuma"
+
+#: gajim/gtk/groupchat_info.py:51
+msgid ""
+"Participants entering this group chat need to request permission to send "
+"messages"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:55
+#, fuzzy
+msgid "?Group chat feature:Not Moderated"
+msgstr "Chat"
+
+#: gajim/gtk/groupchat_info.py:56
+msgid "Participants entering this group chat are allowed to send messages"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:60
+#, fuzzy
+msgid "?Group chat feature:Open"
+msgstr "?Função do Contacto no Chat:Nenhuma"
+
+#: gajim/gtk/groupchat_info.py:61
+#, fuzzy
+msgid "Anyone can join this group chat"
+msgstr "Neste grupo"
+
+#: gajim/gtk/groupchat_info.py:64
+#, fuzzy
+msgid "?Group chat feature:Members Only"
+msgstr "Chat"
+
+#: gajim/gtk/groupchat_info.py:65
+msgid "This group chat is restricted to members only"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:69
+#, fuzzy
+msgid "?Group chat feature:Public"
+msgstr "Chat"
+
+#: gajim/gtk/groupchat_info.py:70
+msgid "Group chat can be found via search"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:73
+#, fuzzy
+msgid "?Group chat feature:Hidden"
+msgstr "?Função do Contacto no Chat:Nenhuma"
+
+#: gajim/gtk/groupchat_info.py:74
+#, 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:77
+#, fuzzy
+msgid "?Group chat feature:Not Anonymous"
+msgstr "Chat"
+
+#: gajim/gtk/groupchat_info.py:78
+msgid "All other group chat participants can see your XMPP address"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:82
+#, fuzzy
+msgid "?Group chat feature:Semi-Anonymous"
+msgstr "Chat"
+
+#: gajim/gtk/groupchat_info.py:83
+msgid "Only moderators can see your XMPP address"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:86
+#, fuzzy
+msgid "?Group chat feature:Password Required"
+msgstr "Chat"
+
+#: gajim/gtk/groupchat_info.py:87
+msgid "This group chat does require a password upon entry"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:91
+#, fuzzy
+msgid "?Group chat feature:No Password Required"
+msgstr "Chat"
+
+#: gajim/gtk/groupchat_info.py:92
+msgid "This group chat does not require a password upon entry"
+msgstr ""
+
+#: gajim/gtk/filetransfer.py:90
 msgid "File"
 msgstr "Ficheiro"
 
-#: gajim/gtk/filetransfer.py:108
+#: gajim/gtk/filetransfer.py:107
 msgid "Time"
 msgstr "Tempo"
 
-#: gajim/gtk/filetransfer.py:228
+#: gajim/gtk/filetransfer.py:227
 #, fuzzy, python-format
 msgid "File name: %s"
 msgstr "Nome do ficheiro: %s"
 
-#: gajim/gtk/filetransfer.py:229 gajim/gtk/filetransfer.py:464
+#: gajim/gtk/filetransfer.py:228 gajim/gtk/filetransfer.py:469
 #, python-format
 msgid "Size: %s"
 msgstr "Tamanho: %s"
 
-#: gajim/gtk/filetransfer.py:239
+#: gajim/gtk/filetransfer.py:238
 #, python-format
 msgid "Sender: %s"
 msgstr "Remetente: %s"
 
-#: gajim/gtk/filetransfer.py:240 gajim/gtk/filetransfer.py:744
+#: gajim/gtk/filetransfer.py:239 gajim/gtk/filetransfer.py:749
 #: gajim/gtk/tooltips.py:577
 msgid "Recipient: "
 msgstr "Destinatário: "
 
-#: gajim/gtk/filetransfer.py:251
+#: gajim/gtk/filetransfer.py:250
 #, python-format
 msgid "Saved in: %s"
 msgstr "Guardado em: %s"
 
-#: gajim/gtk/filetransfer.py:256
+#: gajim/gtk/filetransfer.py:255
 msgid "File transfer completed"
 msgstr "Transferência de ficheiro completa"
 
-#: gajim/gtk/filetransfer.py:276 gajim/gtk/filetransfer.py:285
+#: gajim/gtk/filetransfer.py:275 gajim/gtk/filetransfer.py:284
 #, fuzzy
 msgid "Connection with peer could not be established."
 msgstr "Ligação ao peer não pode ser estabelecida."
 
-#: gajim/gtk/filetransfer.py:293
+#: gajim/gtk/filetransfer.py:292
 #, python-format
 msgid "Filename: %s"
 msgstr "Nome do ficheiro: %s"
 
-#: gajim/gtk/filetransfer.py:294
+#: gajim/gtk/filetransfer.py:293
 #, fuzzy, python-format
 msgid "Recipient: %s"
 msgstr "Destinatário: "
 
-#: gajim/gtk/filetransfer.py:296
+#: gajim/gtk/filetransfer.py:295
 #, fuzzy, python-format
 msgid "Error message: %s"
 msgstr "Introduza a sua mensagem :"
 
-#: gajim/gtk/filetransfer.py:333
-#, fuzzy
-msgid "File transfer error"
-msgstr "Erro na Transferência de Ficheiro"
-
 #: gajim/gtk/filetransfer.py:334
 #, python-format
 msgid ""
-"The file %(file)s has been received, but it seems to have been damaged along "
-"the way.\n"
+"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 ""
 
-#: gajim/gtk/filetransfer.py:350
+#: gajim/gtk/filetransfer.py:340
+#, fuzzy
+msgid "_Download Again"
+msgstr "_Não voltar a perguntar"
+
+#: gajim/gtk/filetransfer.py:355
 #, fuzzy
 msgid "Gajim can not read this file"
 msgstr "Gajim não consegue aceder a este ficheiro"
 
-#: gajim/gtk/filetransfer.py:351
+#: gajim/gtk/filetransfer.py:356
 msgid "Another process is using this file."
 msgstr ""
 
-#: gajim/gtk/filetransfer.py:418
+#: gajim/gtk/filetransfer.py:423
 #, fuzzy
 msgid "File Transfer Conflict"
 msgstr "Transferência de Ficheiro Completa"
 
-#: gajim/gtk/filetransfer.py:419
+#: gajim/gtk/filetransfer.py:424
 msgid "This file already exists"
 msgstr "Este ficheiro já existe"
 
-#: gajim/gtk/filetransfer.py:420
+#: gajim/gtk/filetransfer.py:425
 msgid "Resume download or replace file?"
 msgstr ""
 
-#: gajim/gtk/filetransfer.py:424
+#: gajim/gtk/filetransfer.py:429
 #, fuzzy
 msgid "Replace _File"
 msgstr "Evento"
 
-#: gajim/gtk/filetransfer.py:427
+#: gajim/gtk/filetransfer.py:432
 #, fuzzy
 msgid "Resume _Download"
 msgstr "Download"
 
-#: gajim/gtk/filetransfer.py:437
+#: gajim/gtk/filetransfer.py:442
 #, python-format
 msgid "Directory '%s' is not writable"
 msgstr ""
 
-#: gajim/gtk/filetransfer.py:438
+#: gajim/gtk/filetransfer.py:443
 msgid "You do not have permissions to create files in this directory."
 msgstr ""
 
-#: gajim/gtk/filetransfer.py:461
+#: gajim/gtk/filetransfer.py:466
 #, python-format
 msgid "File: %s"
 msgstr "Ficheiro: %s"
 
-#: gajim/gtk/filetransfer.py:467
+#: gajim/gtk/filetransfer.py:472
 #, python-format
 msgid "Type: %s"
 msgstr "Tipo: %s"
 
-#: gajim/gtk/filetransfer.py:469
+#: gajim/gtk/filetransfer.py:474
 #, python-format
 msgid "Description: %s"
 msgstr "Descrição: %s"
 
-#: gajim/gtk/filetransfer.py:480
+#: gajim/gtk/filetransfer.py:485
 #, fuzzy, python-format
 msgid "%s wants to send you a file"
 msgstr "%s quer enviar-lhe um ficheiro."
 
-#: gajim/gtk/filetransfer.py:509
+#: gajim/gtk/filetransfer.py:514
 #, fuzzy
 msgid "Checking file…"
 msgstr "Enviar _Ficheiro"
 
-#: gajim/gtk/filetransfer.py:524
+#: gajim/gtk/filetransfer.py:529
 #, fuzzy
 msgid "File error"
 msgstr "Erro na Transferência de Ficheiro"
 
-#: gajim/gtk/filetransfer.py:561
+#: gajim/gtk/filetransfer.py:566
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 
-#: gajim/gtk/filetransfer.py:658
+#: gajim/gtk/filetransfer.py:663
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/s)"
 
-#: gajim/gtk/filetransfer.py:711 gajim/gtk/filetransfer.py:715
+#: gajim/gtk/filetransfer.py:716 gajim/gtk/filetransfer.py:720
 msgid "Invalid File"
 msgstr "Ficheiro Inválido"
 
-#: gajim/gtk/filetransfer.py:711
+#: gajim/gtk/filetransfer.py:716
 msgid "File: "
 msgstr "Ficheiro: "
 
-#: gajim/gtk/filetransfer.py:716
+#: gajim/gtk/filetransfer.py:721
 msgid "It is not possible to send empty files"
 msgstr "Não é possível enviar ficheiros vazios"
 
-#: gajim/gtk/filetransfer.py:742 gajim/gtk/tooltips.py:571
+#: gajim/gtk/filetransfer.py:747 gajim/gtk/tooltips.py:571
 msgid "Sender: "
 msgstr "Remetente: "
 
-#: gajim/gtk/filetransfer.py:1038
+#: gajim/gtk/filetransfer.py:1043
 #, fuzzy
 msgid "Choose a File to Send…"
 msgstr "Escolher Ficheiro para Enviar"
 
 #: gajim/gtk/start_chat.py:51
 #, fuzzy
-msgid "Start new Conversation"
+msgid "Start New Conversation"
 msgstr "Ligação"
 
-#: gajim/gtk/start_chat.py:424
-#, fuzzy
-msgid "New Groupchat"
-msgstr "Chat"
+#: gajim/gtk/start_chat.py:260 gajim/gtk/start_chat.py:328
+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:603 gajim/gtk/groupchat_join.py:38
+msgid "Join Group Chat"
+msgstr "Entrar num Chat"
 
-#: gajim/gtk/start_chat.py:426
+#: gajim/gtk/start_chat.py:605 gajim/gtk/add_contact.py:40
 #, fuzzy
-msgid "New Contact"
-msgstr "Adicionar Novo Contacto"
+msgid "Add Contact"
+msgstr "_Adicionar Contacto"
 
-#: gajim/gtk/start_chat.py:588
+#: gajim/gtk/start_chat.py:746
 #, fuzzy, python-format
-msgid "%s Group chats found"
+msgid "%s group chats found"
 msgstr "%s não encontrado"
 
-#: gajim/gtk/discovery.py:70
+#: gajim/gtk/discovery.py:69
 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:71
+#: gajim/gtk/discovery.py:70
 #, fuzzy
 msgid ""
 "This service could not respond with detailed information.\n"
@@ -8862,32 +9134,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:128
+#: gajim/gtk/discovery.py:126
 msgid "Others"
 msgstr "Outros"
 
-#: gajim/gtk/discovery.py:131
-msgid "Conference"
-msgstr "Conferência"
+#: gajim/gtk/discovery.py:129
+#, fuzzy
+msgid "Group Chat"
+msgstr "C_hat"
 
-#: gajim/gtk/discovery.py:519
+#: gajim/gtk/discovery.py:518
 msgid "Without a connection, you can not browse available services"
 msgstr "Tem de estar ligado para ver os serviços"
 
-#: gajim/gtk/discovery.py:606
+#: gajim/gtk/discovery.py:605
 #, fuzzy, python-format
 msgid "Service Discovery using account %s"
 msgstr "Buscar Serviço usando conta %s"
 
-#: gajim/gtk/discovery.py:608
+#: gajim/gtk/discovery.py:607
 msgid "Service Discovery"
 msgstr "Buscar Serviço"
 
-#: gajim/gtk/discovery.py:691
+#: gajim/gtk/discovery.py:690
 msgid "The service could not be found"
 msgstr "O serviço não pôde ser encontrado"
 
-#: gajim/gtk/discovery.py:692
+#: gajim/gtk/discovery.py:691
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -8895,102 +9168,82 @@ 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:699 gajim/gtk/discovery.py:1042
+#: gajim/gtk/discovery.py:698 gajim/gtk/discovery.py:1041
 msgid "The service is not browsable"
 msgstr "Serviço não explorável"
 
-#: gajim/gtk/discovery.py:700
+#: gajim/gtk/discovery.py:699
 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:738 gajim/gtk/discovery.py:747
+#: gajim/gtk/discovery.py:737 gajim/gtk/discovery.py:746
 #, fuzzy
 msgid "Invalid Server Name"
 msgstr "Nome de utilizador inválido"
 
-#: gajim/gtk/discovery.py:806
+#: gajim/gtk/discovery.py:805
 #, fuzzy, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "usando a conta %s"
 
-#: gajim/gtk/discovery.py:851
+#: gajim/gtk/discovery.py:850
 #, fuzzy
 msgid "Browse"
 msgstr "_Explorar"
 
-#: gajim/gtk/discovery.py:1043
+#: gajim/gtk/discovery.py:1042
 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:1255
+#: gajim/gtk/discovery.py:1254
 #, fuzzy
 msgid "_Command"
 msgstr "Comandos: %s"
 
-#: gajim/gtk/discovery.py:1264 gajim/gtk/discovery.py:1422
+#: gajim/gtk/discovery.py:1263 gajim/gtk/discovery.py:1420
 msgid "Re_gister"
 msgstr "Re_gistar"
 
-#: gajim/gtk/discovery.py:1277
+#: gajim/gtk/discovery.py:1276
 msgid "_Search"
 msgstr "_Pesquisar"
 
-#: gajim/gtk/discovery.py:1420
+#: gajim/gtk/discovery.py:1418
 msgid "_Edit"
 msgstr "_Editar"
 
-#: gajim/gtk/discovery.py:1458
+#: gajim/gtk/discovery.py:1456
 #, fuzzy, python-format
 msgid "Scanning %(current)d / %(total)d ..."
 msgstr "Buscando %d / %d.."
 
-#: gajim/gtk/discovery.py:1674
+#: gajim/gtk/discovery.py:1655
+msgid "Users"
+msgstr "Utilizadores"
+
+#: gajim/gtk/discovery.py:1671
 msgid "Id"
 msgstr ""
 
-#: gajim/gtk/discovery.py:1713
-msgid "_Join"
-msgstr "_Entrar"
-
-#: gajim/gtk/discovery.py:1736
-msgid "Bookmark already set"
-msgstr "Bookmark já está configurado"
-
-#: gajim/gtk/discovery.py:1737
-#, fuzzy, python-format
-msgid "Group Chat '%s' is already in your bookmarks."
-msgstr "Sala \"%s\" já existe nos seus bookmarks."
-
-#: gajim/gtk/discovery.py:1748
-msgid "Bookmark has been added successfully"
-msgstr "Bookmark foi adicionado com sucesso"
-
-#: gajim/gtk/discovery.py:1749
-#, fuzzy
-msgid ""
-"You can manage your bookmarks by clicking the Bookmarks menu item in your "
-"contact list."
-msgstr "Pode gerir os seus bookmarks pelo menu de Acções na sua janela."
-
-#: gajim/gtk/discovery.py:1950
+#: gajim/gtk/discovery.py:1900
 #, fuzzy
 msgid "Subscribed"
 msgstr "Subscrição"
 
-#: gajim/gtk/discovery.py:1959
+#: gajim/gtk/discovery.py:1909
 msgid "Node"
 msgstr "Nó"
 
-#: gajim/gtk/discovery.py:2028
+#: gajim/gtk/discovery.py:1978
 #, fuzzy
 msgid "_New post"
 msgstr "Nova Sala"
 
-#: gajim/gtk/discovery.py:2037
+#: gajim/gtk/discovery.py:1987
 msgid "_Subscribe"
 msgstr "_Subscrever"
 
-#: gajim/gtk/discovery.py:2045
+#: gajim/gtk/discovery.py:1995
 #, fuzzy
 msgid "_Unsubscribe"
 msgstr "_Subscrever"
@@ -9039,7 +9292,7 @@ msgstr "De %s"
 msgid "Characters typed: %s"
 msgstr "Carácter não permitido"
 
-#: gajim/gtk/single_message.py:274 gajim/gtk/xml_console.py:169
+#: gajim/gtk/single_message.py:274 gajim/gtk/xml_console.py:166
 msgid "Connection not available"
 msgstr "Ligação indisponível"
 
@@ -9048,6 +9301,12 @@ msgstr "Ligação indisponível"
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Por favor, verifique se está ligado com \"%s\"."
 
+#: gajim/gtk/single_message.py:306
+#, 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:330
 #, python-format
 msgid "RE: %s"
@@ -9058,28 +9317,28 @@ msgstr "RE: %s"
 msgid "%s wrote:\n"
 msgstr "%s escreveu:\n"
 
-#: gajim/gtk/pep_config.py:44
+#: gajim/gtk/pep_config.py:45
 #, fuzzy, python-format
 msgid "PEP Service Configuration (%s)"
 msgstr "Configuração da Sala"
 
-#: gajim/gtk/pep_config.py:77
+#: gajim/gtk/pep_config.py:78
 #, fuzzy
 msgid "Service"
 msgstr "Servidor"
 
-#: gajim/gtk/pep_config.py:114
+#: gajim/gtk/pep_config.py:115
 msgid "PEP node was not removed"
 msgstr ""
 
-#: gajim/gtk/pep_config.py:115
+#: gajim/gtk/pep_config.py:116
 #, python-format
 msgid ""
 "PEP node %(node)s was not removed:\n"
 "%(message)s"
 msgstr ""
 
-#: gajim/gtk/pep_config.py:146
+#: gajim/gtk/pep_config.py:147
 #, python-format
 msgid "Configure %s"
 msgstr "Configurar %s"
@@ -9095,17 +9354,22 @@ msgstr "Re_gistar"
 msgid "Registration successful"
 msgstr "Registo da conta efectuado com sucesso"
 
-#: gajim/gtk/dialogs.py:54 gajim/gtk/dataform.py:659 gajim/gtk/adhoc.py:85
+#: gajim/gtk/service_registration.py:215
+#, fuzzy
+msgid "Registration failed"
+msgstr "Publicação vCard falhou"
+
+#: gajim/gtk/dialogs.py:53 gajim/gtk/dataform.py:668 gajim/gtk/adhoc.py:86
 #, fuzzy
 msgid "Cancel"
 msgstr "_Cancelar"
 
-#: gajim/gtk/dialogs.py:129
+#: gajim/gtk/dialogs.py:128
 #, fuzzy, python-format
 msgid "Dictionary for language \"%s\" not available"
 msgstr "Uma ligação não está disponível"
 
-#: gajim/gtk/dialogs.py:130
+#: gajim/gtk/dialogs.py:129
 #, python-format
 msgid ""
 "You have to install the dictionary \"%s\" to use spellchecking, or choose "
@@ -9114,12 +9378,12 @@ msgid ""
 "Highlighting misspelled words feature will not be used"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:410 gajim/gtk/dialogs.py:425
+#: gajim/gtk/dialogs.py:322 gajim/gtk/dialogs.py:337
 #, fuzzy
 msgid "Insecure connection"
 msgstr "Ligação"
 
-#: gajim/gtk/dialogs.py:411
+#: gajim/gtk/dialogs.py:323
 #, fuzzy, python-format
 msgid ""
 "You are about to connect to the account %(account)s (%(server)s) insecurely. "
@@ -9128,119 +9392,114 @@ msgid ""
 "Are you sure you want to do that?"
 msgstr "Tem de criar uma conta antes de poder conversar com outros contactos."
 
-#: gajim/gtk/dialogs.py:416
+#: gajim/gtk/dialogs.py:328
 msgid "Yes, I really want to connect insecurely"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:417
+#: gajim/gtk/dialogs.py:329
 msgid "Gajim will NOT connect unless you check this box"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:675
-#, fuzzy
-msgid "The nickname contains invalid characters."
-msgstr "Alcunha não encontrada: %s"
-
-#: gajim/gtk/dialogs.py:734
+#: gajim/gtk/dialogs.py:561
 #, fuzzy, python-format
 msgid "Destroy %s"
 msgstr "Descrição: %s"
 
-#: gajim/gtk/dialogs.py:775
+#: gajim/gtk/dialogs.py:602
 #, fuzzy
 msgid "Certificate"
 msgstr "Nome de utilizador inválido"
 
-#: gajim/gtk/dialogs.py:786
+#: gajim/gtk/dialogs.py:613
 #, fuzzy, python-format
 msgid ""
 "Certificate for account\n"
 "%s"
 msgstr "para conta %s"
 
-#: gajim/gtk/dialogs.py:824
+#: gajim/gtk/dialogs.py:651
 msgid "Issued to\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:825 gajim/gtk/dialogs.py:830
+#: gajim/gtk/dialogs.py:652 gajim/gtk/dialogs.py:657
 msgid "Common Name (CN): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:826 gajim/gtk/dialogs.py:831
+#: gajim/gtk/dialogs.py:653 gajim/gtk/dialogs.py:658
 msgid "Organization (O): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:827 gajim/gtk/dialogs.py:832
+#: gajim/gtk/dialogs.py:654 gajim/gtk/dialogs.py:659
 msgid "Organizational Unit (OU): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:828
+#: gajim/gtk/dialogs.py:655
 msgid "Serial Number: "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:829
+#: gajim/gtk/dialogs.py:656
 msgid "Issued by\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:833
+#: gajim/gtk/dialogs.py:660
 msgid "Validity\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:834
+#: gajim/gtk/dialogs.py:661
 msgid "Issued on: "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:835
+#: gajim/gtk/dialogs.py:662
 msgid "Expires on: "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:836
+#: gajim/gtk/dialogs.py:663
 msgid "SHA-1:"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:838
+#: gajim/gtk/dialogs.py:665
 msgid "SHA-256:"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:852
+#: gajim/gtk/dialogs.py:679
 #, fuzzy
 msgid "View certificate…"
 msgstr "Nome de utilizador inválido"
 
-#: gajim/gtk/dialogs.py:864 gajim/gtk/accounts.py:893
+#: gajim/gtk/dialogs.py:691 gajim/gtk/accounts.py:896
 msgid "Change Password"
 msgstr "Mudar Senha"
 
-#: gajim/gtk/dialogs.py:878
+#: gajim/gtk/dialogs.py:705
 msgid "_OK"
 msgstr "_OK"
 
-#: gajim/gtk/dialogs.py:891
+#: gajim/gtk/dialogs.py:718
 #, fuzzy
 msgid "You must enter a password"
 msgstr "Deve introduzir uma senha."
 
-#: gajim/gtk/dialogs.py:895
+#: gajim/gtk/dialogs.py:722
 msgid "Passwords do not match"
 msgstr "As senhas não conferem"
 
-#: gajim/gtk/dialogs.py:923
+#: gajim/gtk/dialogs.py:750
 #, fuzzy
 msgid "Group Chat Invitation "
 msgstr "?Função do Contacto no Chat:Nenhuma"
 
-#: gajim/gtk/dialogs.py:948
+#: gajim/gtk/dialogs.py:775
 #, fuzzy, python-format
 msgid "<b>%s</b> has invited you to join a discussion"
 msgstr "%(contact_jid)s foi convidado(a) para %(room_jid)s."
 
-#: gajim/gtk/dialogs.py:951
+#: gajim/gtk/dialogs.py:778
 #, 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:959
+#: gajim/gtk/dialogs.py:786
 #, python-format
 msgid "Comment: %s"
 msgstr "Comentário: %s"
@@ -9253,11 +9512,6 @@ msgstr ""
 msgid "ICQ Number"
 msgstr ""
 
-#: gajim/gtk/add_contact.py:40
-#, fuzzy
-msgid "Add Contact"
-msgstr "_Adicionar Contacto"
-
 #: gajim/gtk/add_contact.py:259
 #, fuzzy, python-format
 msgid "%s Missing"
@@ -9280,7 +9534,7 @@ msgstr "Este serviço não contém quaisquer itens para explorar"
 
 #: gajim/gtk/add_contact.py:299
 #, fuzzy
-msgid "You cannot add yourself to your roster."
+msgid "You cannot add yourself to your contact list."
 msgstr "Eu gostaria de o adicionar à minha lista"
 
 #: gajim/gtk/add_contact.py:304
@@ -9293,11 +9547,13 @@ msgid "Your account must be online to add new contacts."
 msgstr ""
 
 #: gajim/gtk/add_contact.py:321
-msgid "Contact already in roster"
+#, fuzzy
+msgid "Contact Already in Contact List"
 msgstr "Contacto já se encontra na lista"
 
 #: gajim/gtk/add_contact.py:322
-msgid "This contact is already listed in your roster."
+#, fuzzy
+msgid "This contact is already in your contact list."
 msgstr "Este contacto já se encontra na sua lista de contactos."
 
 #: gajim/gtk/add_contact.py:379 gajim/gtk/add_contact.py:417
@@ -9338,12 +9594,12 @@ msgstr "Contacto Saiu"
 
 #: gajim/gtk/themes.py:52
 #, fuzzy
-msgid "MUC Tab New Directed Message"
+msgid "Group Chat Tab New Directed Message"
 msgstr "Nova Mensagem Privada"
 
 #: gajim/gtk/themes.py:56
 #, fuzzy
-msgid "MUC Tab New Message"
+msgid "Group Chat Tab New Message"
 msgstr "Nova Mensagem"
 
 #: gajim/gtk/themes.py:60
@@ -9562,13 +9818,13 @@ msgstr "Todos os ficheiros"
 msgid "Clear File"
 msgstr "Evento"
 
-#: gajim/gtk/settings.py:570
+#: gajim/gtk/settings.py:570 gajim/gtk/proxies.py:32
 #, fuzzy
 msgid "Manage Proxies"
 msgstr "Gerir Perfis de Proxy"
 
-#: gajim/gtk/settings.py:591 gajim/gtk/preferences.py:971
-#: gajim/gtk/preferences.py:984 gajim/gtk/preferences.py:988
+#: gajim/gtk/settings.py:591 gajim/gtk/preferences.py:968
+#: gajim/gtk/preferences.py:982 gajim/gtk/preferences.py:986
 #, fuzzy
 msgid "No Proxy"
 msgstr "Proxy:"
@@ -9648,15 +9904,16 @@ msgid ""
 "        "
 msgstr ""
 
-#: gajim/gtk/about.py:47 data/org.gajim.Gajim.appdata.xml.in:10
+#: gajim/gtk/about.py:47 data/org.gajim.Gajim.desktop.in:6
+#: data/org.gajim.Gajim.appdata.xml.in:10
 #, fuzzy
-msgid "A GTK+ XMPP client"
+msgid "A GTK XMPP client"
 msgstr "Cliente Jabber GTK+"
 
 #: gajim/gtk/about.py:48
-#, python-format
-msgid "GTK+ Version: %s"
-msgstr ""
+#, fuzzy, python-format
+msgid "GTK Version: %s"
+msgstr "Descrição: %s"
 
 #: gajim/gtk/about.py:49
 #, python-format
@@ -9833,6 +10090,25 @@ msgstr "Mostrar hora:"
 msgid "?transfer status:Not started"
 msgstr "Mostrar hora:"
 
+#: gajim/gtk/groupchat_creation.py:97 gajim/gtk/groupchat_creation.py:99
+msgid " (optional)..."
+msgstr ""
+
+#: gajim/gtk/groupchat_creation.py:134
+#, fuzzy
+msgid "Invalid Address"
+msgstr "Ficheiro Inválido"
+
+#: gajim/gtk/groupchat_creation.py:182
+#, fuzzy
+msgid "Not Connected"
+msgstr "Ligação"
+
+#: gajim/gtk/groupchat_creation.py:183
+#, fuzzy
+msgid "You have to be connected to create a group chat."
+msgstr "Neste grupo"
+
 #: gajim/gtk/sounds.py:39
 msgid "Wav Sounds"
 msgstr "Sons Wav"
@@ -9879,50 +10155,45 @@ msgstr ""
 msgid "Group Chat Message Received"
 msgstr ""
 
-#: gajim/gtk/dataform.py:226 gajim/gtk/dataform.py:262
+#: gajim/gtk/dataform.py:232 gajim/gtk/dataform.py:268
 #, fuzzy
 msgid "Required"
 msgstr "Senha Necessária"
 
-#: gajim/gtk/dataform.py:286
+#: gajim/gtk/dataform.py:293
 msgid "Yes"
 msgstr ""
 
-#: gajim/gtk/dataform.py:286
+#: gajim/gtk/dataform.py:293
 #, fuzzy
 msgid "No"
 msgstr "Nenhum"
 
-#: gajim/gtk/dataform.py:661
+#: gajim/gtk/dataform.py:670
 msgid "Submit"
 msgstr ""
 
-#: gajim/gtk/statusicon.py:213
+#: gajim/gtk/statusicon.py:206
 #, fuzzy
 msgid "_Change Status Message…"
 msgstr "_Mudar Mensagem de Estado"
 
-#: gajim/gtk/statusicon.py:247 gajim/gtk/statusicon.py:292
-#: gajim/gtk/statusicon.py:299
+#: gajim/gtk/statusicon.py:258
 #, python-format
 msgid "using account %s"
 msgstr "usando a conta %s"
 
-#: gajim/gtk/statusicon.py:309
+#: gajim/gtk/statusicon.py:269
 #, fuzzy
-msgid "_Manage Bookmarks…"
-msgstr "Gerir Bookmarks"
+msgid "Hide _Contact List"
+msgstr "Contacto:"
 
-#: gajim/gtk/statusicon.py:325
+#: gajim/gtk/statusicon.py:273
 #, fuzzy
-msgid "Hide _Roster"
-msgstr "Fora da lista"
-
-#: gajim/gtk/statusicon.py:329
-msgid "Show _Roster"
-msgstr "Mostrar _Lista de Contactos"
+msgid "Show _Contact List"
+msgstr "Mostrar Contactos _Offline"
 
-#: gajim/gtk/statusicon.py:337
+#: gajim/gtk/statusicon.py:281
 msgid "Hide this menu"
 msgstr "Esconder este menú"
 
@@ -9972,36 +10243,6 @@ msgstr ""
 "Ocorreu um erro na publicação das suas informações pessoais. Tenta novamente "
 "mais tarde."
 
-#: gajim/gtk/join_groupchat.py:202
-#, fuzzy
-msgid "Invalid Room"
-msgstr "Entrada inválida"
-
-#: gajim/gtk/join_groupchat.py:203
-msgid "Please choose a room"
-msgstr ""
-
-#: gajim/gtk/join_groupchat.py:222 gajim/gtk/join_groupchat.py:229
-#, fuzzy
-msgid "Invalid Nickname"
-msgstr "Nome de utilizador inválido"
-
-#: gajim/gtk/join_groupchat.py:223
-msgid "Please choose a nickname"
-msgstr ""
-
-#: gajim/gtk/join_groupchat.py:282 gajim/gtk/join_groupchat.py:288
-#: gajim/gtk/join_groupchat.py:293
-#, fuzzy
-msgid "Wrong server"
-msgstr "Frase de acesso"
-
-#: gajim/gtk/join_groupchat.py:283 gajim/gtk/join_groupchat.py:289
-#: gajim/gtk/join_groupchat.py:294
-#, fuzzy, python-format
-msgid "%s is not a groupchat server"
-msgstr "Perguntar antes de fechar uma janela/aba de chat."
-
 #: gajim/gtk/mam_preferences.py:38
 #, python-format
 msgid "Archiving Preferences for %s"
@@ -10031,48 +10272,55 @@ msgstr ""
 msgid "Archiving Preferences Error"
 msgstr "_Preferências"
 
-#: gajim/gtk/advanced_config.py:81
+#: gajim/gtk/advanced_config.py:95
 #, fuzzy
 msgid "Activated"
 msgstr "Activo"
 
-#: gajim/gtk/advanced_config.py:81
+#: gajim/gtk/advanced_config.py:95
 #, fuzzy
 msgid "Deactivated"
 msgstr "Activo"
 
-#: gajim/gtk/advanced_config.py:83
-msgid "Boolean"
+#: gajim/gtk/advanced_config.py:97
+msgid "?config type:Boolean"
 msgstr ""
 
-#: gajim/gtk/advanced_config.py:84
-#, fuzzy
-msgid "Integer"
-msgstr "Neste grupo"
+#: gajim/gtk/advanced_config.py:98
+msgid "?config type:Integer"
+msgstr ""
 
-#: gajim/gtk/advanced_config.py:85
-msgid "Text"
-msgstr "Texto"
+#: gajim/gtk/advanced_config.py:99
+msgid "?config type:Text"
+msgstr ""
 
-#: gajim/gtk/advanced_config.py:97
-msgid "Preference Name"
+#: gajim/gtk/advanced_config.py:100
+msgid "?config type:Color"
+msgstr ""
+
+#: gajim/gtk/advanced_config.py:112
+#, fuzzy
+msgid "?config:Preference Name"
 msgstr "Nome Preferencial"
 
-#: gajim/gtk/advanced_config.py:104
-msgid "Value"
-msgstr "Valor"
+#: gajim/gtk/advanced_config.py:123
+#, fuzzy
+msgid "?config:Value"
+msgstr "_Continuar"
 
-#: gajim/gtk/advanced_config.py:113
-msgid "Type"
-msgstr "Tipo"
+#: gajim/gtk/advanced_config.py:132
+msgid "?config:Type"
+msgstr ""
 
-#: gajim/gtk/advanced_config.py:168
-msgid "(None)"
-msgstr "(Nenhum)"
+#: gajim/gtk/advanced_config.py:187
+#, fuzzy
+msgid "?config description:None"
+msgstr "Nenhum"
 
-#: gajim/gtk/advanced_config.py:299
-msgid "Hidden"
-msgstr "Escondida"
+#: gajim/gtk/advanced_config.py:322
+#, fuzzy
+msgid "?password:Hidden"
+msgstr "Senha:"
 
 #: gajim/gtk/server_info.py:66
 #, fuzzy
@@ -10084,8 +10332,8 @@ msgstr "_Copiar Localização do Link"
 msgid "%(days)s days, %(hours)s hours"
 msgstr ""
 
-#: gajim/gtk/server_info.py:218 gajim/gtk/accounts.py:749
-#: gajim/gtk/accounts.py:853
+#: gajim/gtk/server_info.py:218 gajim/gtk/accounts.py:752
+#: gajim/gtk/accounts.py:856
 #, fuzzy
 msgid "Hostname"
 msgstr "Nome do Host:"
@@ -10267,11 +10515,6 @@ 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_config.py:41
-#, fuzzy
-msgid "Group Chat Configuration"
-msgstr "?Função do Contacto no Chat:Nenhuma"
-
 #: gajim/gtk/groupchat_config.py:134
 #, fuzzy
 msgid "A Group Chat needs at least one Owner"
@@ -10282,69 +10525,69 @@ msgid "You are not allowed to modify the affiliation of Admins and Owners"
 msgstr ""
 
 #: gajim/gtk/groupchat_config.py:399
-msgid "An entry with this Jabber-ID already exists"
+msgid "An entry with this XMPP Address already exists"
 msgstr ""
 
-#: gajim/gtk/adhoc.py:91
+#: gajim/gtk/adhoc.py:92
 #, fuzzy
 msgid "Finish"
 msgstr "_Terminar"
 
-#: gajim/gtk/adhoc.py:97 gajim/gtk/adhoc.py:283
+#: gajim/gtk/adhoc.py:98 gajim/gtk/adhoc.py:284
 #, fuzzy
 msgid "Commands"
 msgstr "Comandos: %s"
 
-#: gajim/gtk/adhoc.py:103
+#: gajim/gtk/adhoc.py:104
 msgid "Next"
 msgstr ""
 
-#: gajim/gtk/adhoc.py:109
+#: gajim/gtk/adhoc.py:110
 #, fuzzy
 msgid "Previous"
 msgstr "_Anterior"
 
-#: gajim/gtk/adhoc.py:115
+#: gajim/gtk/adhoc.py:116
 #, fuzzy
 msgid "Execute"
 msgstr "comando"
 
-#: gajim/gtk/adhoc.py:195
+#: gajim/gtk/adhoc.py:196
 #, fuzzy
 msgid "No commands available"
 msgstr "Nenhuma conta disponível"
 
-#: gajim/gtk/adhoc.py:244
+#: gajim/gtk/adhoc.py:245
 #, fuzzy
 msgid "Request Command List"
 msgstr "comando"
 
-#: gajim/gtk/adhoc.py:259
+#: gajim/gtk/adhoc.py:260
 #, fuzzy
 msgid "Executing…"
 msgstr "comando"
 
-#: gajim/gtk/adhoc.py:266
+#: gajim/gtk/adhoc.py:267
 #, fuzzy
 msgid "Command List"
 msgstr "Comandos: %s"
 
-#: gajim/gtk/adhoc.py:384
+#: gajim/gtk/adhoc.py:385
 #, fuzzy
 msgid "Finished"
 msgstr "_Terminar"
 
-#: gajim/gtk/adhoc.py:453
+#: gajim/gtk/adhoc.py:454
 #, fuzzy
 msgid "Execution failed"
 msgstr "Ligação"
 
-#: gajim/gtk/blocking.py:37
+#: gajim/gtk/blocking.py:38
 #, python-format
 msgid "Blocking List for %s"
 msgstr ""
 
-#: gajim/gtk/blocking.py:71
+#: gajim/gtk/blocking.py:72
 #, fuzzy
 msgid "Error!"
 msgstr "Erro:"
@@ -10395,8 +10638,7 @@ msgstr "Nome de utilizador inválido"
 msgid "You must provide a username to configure this account."
 msgstr "Deve introduzir um nome de utilizador para configurar esta conta."
 
-#: gajim/gtk/account_wizard.py:252 gajim/gtk/bookmarks.py:290
-#: gajim/gtk/bookmarks.py:303
+#: gajim/gtk/account_wizard.py:252
 #, fuzzy
 msgid "Invalid server"
 msgstr "Nome de utilizador inválido"
@@ -10414,7 +10656,7 @@ msgstr "Entrada inválida"
 msgid "Custom port must be a port number."
 msgstr "A porta do proxy deve ser um número de porta"
 
-#: gajim/gtk/account_wizard.py:405
+#: gajim/gtk/account_wizard.py:406
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -10424,16 +10666,16 @@ msgid ""
 "Do you still want to connect to this server?"
 msgstr ""
 
-#: gajim/gtk/account_wizard.py:446 gajim/gtk/account_wizard.py:480
+#: gajim/gtk/account_wizard.py:447 gajim/gtk/account_wizard.py:481
 #, fuzzy
 msgid "An error occurred during account creation"
 msgstr "Ocorreu um erro ao criar a conta"
 
-#: gajim/gtk/account_wizard.py:545
+#: gajim/gtk/account_wizard.py:546
 msgid "Account name is in use"
 msgstr "Nome de conta em uso"
 
-#: gajim/gtk/account_wizard.py:546
+#: gajim/gtk/account_wizard.py:547
 msgid "You already have an account using this name."
 msgstr "Já tem uma conta usando este nome."
 
@@ -10460,26 +10702,26 @@ msgstr "Transferência de %(filename)s de %(name)s interrompida."
 msgid "%(minutes)s min %(seconds)s sec"
 msgstr ""
 
-#: gajim/gtk/xml_console.py:77
+#: gajim/gtk/xml_console.py:74
 #, fuzzy
 msgid "Filter"
 msgstr "Filtro:"
 
-#: gajim/gtk/xml_console.py:82
+#: gajim/gtk/xml_console.py:79
 #, fuzzy
 msgid "XML Input"
 msgstr "<b>Entrada XML</b>"
 
-#: gajim/gtk/xml_console.py:86
+#: gajim/gtk/xml_console.py:83
 msgid "Paste Last Input"
 msgstr ""
 
-#: gajim/gtk/xml_console.py:170
+#: gajim/gtk/xml_console.py:167
 #, fuzzy, python-format
 msgid "Please make sure you are connected with '%s'."
 msgstr "Por favor, verifique se está ligado com \"%s\"."
 
-#: gajim/gtk/xml_console.py:182
+#: gajim/gtk/xml_console.py:177
 #, fuzzy
 msgid "Invalid Node"
 msgstr "Ficheiro Inválido"
@@ -10513,302 +10755,310 @@ msgstr "_Pesquisar"
 msgid "No results found"
 msgstr "%s não encontrado"
 
-#: gajim/gtk/preferences.py:358 gajim/gtk/preferences.py:362
+#: gajim/gtk/preferences.py:357 gajim/gtk/preferences.py:361
 #, fuzzy
 msgid "Default"
 msgstr "Apagar MOTD"
 
-#: gajim/gtk/preferences.py:801
+#: gajim/gtk/preferences.py:798
 msgid "status message title"
 msgstr "título da mensagem de estado"
 
-#: gajim/gtk/preferences.py:802
+#: gajim/gtk/preferences.py:799
 msgid "status message text"
 msgstr "texto da mensagem de estado"
 
+#: gajim/gtk/accounts.py:137
+msgid "Re-Login"
+msgstr ""
+
 #: gajim/gtk/accounts.py:138
-msgid "Relogin now?"
+msgid "Re-Login now?"
 msgstr ""
 
 #: gajim/gtk/accounts.py:139
-msgid "If you want all the changes to apply instantly, you must relogin."
+msgid "To apply all changes instantly, you have to re-login."
 msgstr ""
 
-#: gajim/gtk/accounts.py:191 gajim/gtk/accounts.py:975
+#: gajim/gtk/accounts.py:141
+#, fuzzy
+msgid "_Later"
+msgstr "Ú_ltimo"
+
+#: gajim/gtk/accounts.py:143
+msgid "_Re-Login"
+msgstr ""
+
+#: gajim/gtk/accounts.py:194 gajim/gtk/accounts.py:978
 #, fuzzy
 msgid "Remove Account"
 msgstr "Removendo %s conta"
 
-#: gajim/gtk/accounts.py:192
+#: gajim/gtk/accounts.py:195
 #, fuzzy, python-format
 msgid "You still have open chats in your account %s"
 msgstr "Não tem nenhuma conta activa"
 
-#: gajim/gtk/accounts.py:193
+#: gajim/gtk/accounts.py:196
 msgid ""
 "All chat and group chat windows will be closed.\n"
 "Do you want to continue?"
 msgstr ""
 
-#: gajim/gtk/accounts.py:424
+#: gajim/gtk/accounts.py:427
 #, fuzzy
 msgid "Back"
 msgstr "Volto logo"
 
-#: gajim/gtk/accounts.py:530
+#: gajim/gtk/accounts.py:533
 msgid "Please check if Bonjour is installed."
 msgstr ""
 
-#: gajim/gtk/accounts.py:532
+#: gajim/gtk/accounts.py:535
 msgid "Please check if Avahi is installed."
 msgstr ""
 
-#: gajim/gtk/accounts.py:569
+#: gajim/gtk/accounts.py:572
 #, fuzzy
 msgid "Disable Account"
 msgstr "Nome de conta inválido"
 
-#: gajim/gtk/accounts.py:570
+#: gajim/gtk/accounts.py:573
 #, fuzzy, python-format
 msgid "Account %s is still connected"
 msgstr "Conta \"%s\" está ligada ao servidor"
 
-#: gajim/gtk/accounts.py:571
+#: gajim/gtk/accounts.py:574
 msgid ""
 "All chat and group chat windows will be closed. Do you want to continue?"
 msgstr ""
 
-#: gajim/gtk/accounts.py:576
+#: gajim/gtk/accounts.py:579
 #, fuzzy
 msgid "_Disable Account"
 msgstr "Nome de conta inválido"
 
-#: gajim/gtk/accounts.py:595
+#: gajim/gtk/accounts.py:598
 #, fuzzy
 msgid "Add Account"
 msgstr "_Adicionar Contacto"
 
-#: gajim/gtk/accounts.py:663
+#: gajim/gtk/accounts.py:666
 msgid "Label"
 msgstr ""
 
-#: gajim/gtk/accounts.py:667
+#: gajim/gtk/accounts.py:670
 msgid "Login"
 msgstr ""
 
-#: gajim/gtk/accounts.py:670
+#: gajim/gtk/accounts.py:673
 #, fuzzy
 msgid "Import Contacts"
 msgstr "Contacto:"
 
-#: gajim/gtk/accounts.py:674 gajim/gtk/accounts.py:870
+#: gajim/gtk/accounts.py:677 gajim/gtk/accounts.py:873
 #, fuzzy
 msgid "Client Certificate"
 msgstr "Nome de utilizador inválido"
 
-#: gajim/gtk/accounts.py:677 gajim/gtk/accounts.py:774
+#: gajim/gtk/accounts.py:680 gajim/gtk/accounts.py:777
 #, fuzzy
 msgid "Connect on startup"
 msgstr "_Ligar ao arranque"
 
-#: gajim/gtk/accounts.py:681 gajim/gtk/accounts.py:779
+#: gajim/gtk/accounts.py:684 gajim/gtk/accounts.py:782
 #, fuzzy
 msgid "Save conversations for all contacts"
 msgstr "Guardar _históricos das conversas para todos os contactos"
 
-#: gajim/gtk/accounts.py:683 gajim/gtk/accounts.py:781
+#: gajim/gtk/accounts.py:686 gajim/gtk/accounts.py:784
 msgid "Store conversations on the harddrive"
 msgstr ""
 
-#: gajim/gtk/accounts.py:685 gajim/gtk/accounts.py:783
+#: gajim/gtk/accounts.py:688 gajim/gtk/accounts.py:786
 #, fuzzy
 msgid "Global Status"
 msgstr "Estado: "
 
-#: gajim/gtk/accounts.py:687
+#: gajim/gtk/accounts.py:690
 #, fuzzy
 msgid "Synchronise the status of all accounts"
 msgstr "Muda o estado de uma ou várias contas"
 
-#: gajim/gtk/accounts.py:689
+#: gajim/gtk/accounts.py:692
 #, fuzzy
 msgid "Use file transfer proxies"
 msgstr "lista de transferências de ficheiros"
 
-#: gajim/gtk/accounts.py:705
+#: gajim/gtk/accounts.py:708
 #, fuzzy
 msgid "Idle Time"
 msgstr "Versão %s"
 
-#: gajim/gtk/accounts.py:707
+#: gajim/gtk/accounts.py:710
 msgid "Disclose the time of your last activity"
 msgstr ""
 
-#: gajim/gtk/accounts.py:709
+#: gajim/gtk/accounts.py:712
 msgid "Local System Time"
 msgstr ""
 
-#: gajim/gtk/accounts.py:711
+#: gajim/gtk/accounts.py:714
 msgid "Disclose the local system time of the device Gajim runs on"
 msgstr ""
 
-#: gajim/gtk/accounts.py:714
+#: gajim/gtk/accounts.py:717
 #, fuzzy
 msgid "Client / Operating System"
 msgstr "Nome de utilizador inválido"
 
-#: gajim/gtk/accounts.py:716
+#: gajim/gtk/accounts.py:719
 #, fuzzy
 msgid ""
 "Disclose informations 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:719
+#: gajim/gtk/accounts.py:722
 #, fuzzy
 msgid "Ignore Unknown Contacts"
 msgstr "Contacto:"
 
-#: gajim/gtk/accounts.py:721
+#: gajim/gtk/accounts.py:724
 #, 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:737 gajim/gtk/accounts.py:776
+#: gajim/gtk/accounts.py:740 gajim/gtk/accounts.py:779
 #, fuzzy
 msgid "Use environment variable"
 msgstr "Sessão bus não está disponível"
 
-#: gajim/gtk/accounts.py:739
-#, fuzzy
-msgid "Proxy"
-msgstr "Proxy:"
-
-#: gajim/gtk/accounts.py:742
+#: gajim/gtk/accounts.py:745
 #, fuzzy
 msgid "Warn on insecure connection"
 msgstr "Ligação"
 
-#: gajim/gtk/accounts.py:746
+#: gajim/gtk/accounts.py:749
 msgid "Send keep-alive packets"
 msgstr "Enviar pacotes keep-alive"
 
-#: gajim/gtk/accounts.py:750
+#: gajim/gtk/accounts.py:753
 msgid "Manually set the hostname for the server"
 msgstr ""
 
-#: gajim/gtk/accounts.py:756 gajim/gtk/accounts.py:826
-#: gajim/gtk/accounts.py:831
+#: gajim/gtk/accounts.py:759 gajim/gtk/accounts.py:829
+#: gajim/gtk/accounts.py:834
 #, fuzzy
 msgid "Priority"
 msgstr "_Prioridade"
 
-#: gajim/gtk/accounts.py:785
+#: gajim/gtk/accounts.py:788
 #, fuzzy
 msgid "Synchronize the status of all accounts"
 msgstr "Muda o estado de uma ou várias contas"
 
-#: gajim/gtk/accounts.py:795
+#: gajim/gtk/accounts.py:798
 #, fuzzy
 msgid "First Name"
 msgstr "Nome:"
 
-#: gajim/gtk/accounts.py:798
+#: gajim/gtk/accounts.py:801
 #, fuzzy
 msgid "Last Name"
 msgstr "Nome:"
 
-#: gajim/gtk/accounts.py:804
+#: gajim/gtk/accounts.py:807
 #, fuzzy
 msgid "Email"
 msgstr "E-Mail"
 
-#: gajim/gtk/accounts.py:822
+#: gajim/gtk/accounts.py:825
 #, fuzzy
 msgid "Adjust to status"
 msgstr "Pedir para ver o estado dele/dela"
 
-#: gajim/gtk/accounts.py:849
+#: gajim/gtk/accounts.py:852
 msgid "Enable"
 msgstr "Activar"
 
-#: gajim/gtk/accounts.py:857
+#: gajim/gtk/accounts.py:860
 #, fuzzy
 msgid "Port"
 msgstr "_Porta:"
 
-#: gajim/gtk/accounts.py:862
+#: gajim/gtk/accounts.py:865
 #, fuzzy
 msgid "Connection Settings"
 msgstr "Ligação"
 
-#: gajim/gtk/accounts.py:872
+#: gajim/gtk/accounts.py:875
 msgid "PKCS12 Files"
 msgstr ""
 
-#: gajim/gtk/accounts.py:874
+#: gajim/gtk/accounts.py:877
 #, fuzzy
 msgid "Encrypted Certificate"
 msgstr "Nome de utilizador inválido"
 
-#: gajim/gtk/accounts.py:878
+#: gajim/gtk/accounts.py:881
 #, fuzzy
 msgid "Certificate Settings"
 msgstr "Nome de utilizador inválido"
 
-#: gajim/gtk/accounts.py:890
+#: gajim/gtk/accounts.py:893
 #, fuzzy
 msgid "Save Password"
 msgstr "Guardar senha"
 
-#: gajim/gtk/accounts.py:898
+#: gajim/gtk/accounts.py:901
 #, fuzzy
 msgid "Login Settings"
 msgstr "Publicação vCard falhou"
 
-#: gajim/gtk/accounts.py:931
+#: gajim/gtk/accounts.py:934
 #, fuzzy, python-format
 msgid "Removing account %s"
 msgstr "Removendo %s conta"
 
-#: gajim/gtk/accounts.py:946
+#: gajim/gtk/accounts.py:949
 #, fuzzy
 msgid "Account is disabled"
 msgstr "Encriptação desactivada"
 
-#: gajim/gtk/accounts.py:947
+#: gajim/gtk/accounts.py:950
 #, fuzzy
 msgid "To unregister from a server, the account must be enabled."
 msgstr "Para mudar o nome da conta, deve estar disconectado."
 
-#: gajim/gtk/accounts.py:962
+#: gajim/gtk/accounts.py:965
 #, fuzzy
 msgid "Password required"
 msgstr "Senha Necessária"
 
-#: gajim/gtk/accounts.py:976
+#: gajim/gtk/accounts.py:979
 #, fuzzy, python-format
 msgid "Account '%s' is still connected to the server"
 msgstr "Conta \"%s\" está ligada ao servidor"
 
-#: gajim/gtk/accounts.py:978
+#: gajim/gtk/accounts.py:981
 msgid "If you remove it, the connection will be lost."
 msgstr "Se remover isto, a ligação será perdida."
 
-#: gajim/gtk/accounts.py:995
+#: gajim/gtk/accounts.py:998
 #, python-format
 msgid "Connection to server %s failed"
 msgstr "A ligação ao servidor %s falhou"
 
-#: gajim/gtk/accounts.py:996
+#: gajim/gtk/accounts.py:999
 msgid "What would you like to do?"
 msgstr "O que pretende fazer?"
 
-#: gajim/gtk/accounts.py:997
+#: gajim/gtk/accounts.py:1000
 #, fuzzy
 msgid "Remove only from Gajim"
 msgstr "Remover conta _apenas do Gajim"
 
-#: gajim/gtk/accounts.py:998
+#: gajim/gtk/accounts.py:1001
 msgid "Don't remove anything. I'll try again later"
 msgstr ""
 
@@ -10832,6 +11082,10 @@ msgstr "Gostaria de o adicionar à minha lista de contactos."
 msgid "Modify"
 msgstr "_Modificar"
 
+#: gajim/gtk/roster_item_exchange.py:80
+msgid "JID"
+msgstr "JID"
+
 #: gajim/gtk/roster_item_exchange.py:86
 #, fuzzy
 msgid "Groups"
@@ -10856,50 +11110,29 @@ msgid_plural "Removed %d contacts"
 msgstr[0] "Remove o contacto da lista"
 msgstr[1] "Remove o contacto da lista"
 
-#: gajim/gtk/util.py:581
+#: gajim/gtk/util.py:583
 msgid "Unknown Artist"
 msgstr "Artista Desconhecido"
 
-#: gajim/gtk/util.py:582
+#: gajim/gtk/util.py:584
 msgid "Unknown Title"
 msgstr "Título Desconhecido"
 
-#: gajim/gtk/util.py:583
+#: gajim/gtk/util.py:585
 msgid "Unknown Source"
 msgstr "Fonte Desconhecida"
 
-#: gajim/gtk/util.py:585
+#: gajim/gtk/util.py:587
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
 "from <i>%(source)s</i>"
 msgstr ""
 
-#: gajim/gtk/bookmarks.py:121
-#, fuzzy
-msgid "New Group Chat"
-msgstr "Chat"
-
-#: gajim/gtk/bookmarks.py:161
-msgid "This bookmark has invalid data"
-msgstr "Este bookmark tem dados inválidos"
-
-#: gajim/gtk/bookmarks.py:162
-msgid ""
-"Please be sure to fill out server and room fields or remove this bookmark."
-msgstr ""
-"Por favor, verifique se preencheu os campos servidor e sala ou remova este "
-"bookmark"
-
-#: gajim/gtk/bookmarks.py:273 gajim/gtk/bookmarks.py:291
-#: gajim/gtk/bookmarks.py:304 gajim/gtk/bookmarks.py:335
-msgid "Character not allowed"
-msgstr "Carácter não permitido"
-
-#: gajim/gtk/bookmarks.py:334
-#, fuzzy
-msgid "Invalid room"
-msgstr "Entrada inválida"
+#: gajim/gtk/bookmarks.py:47
+#, fuzzy, python-format
+msgid "Bookmarks for %s"
+msgstr "Adicionar esta Sala aos _Bookmarks"
 
 #: gajim/plugins/pluginmanager.py:736 gajim/plugins/pluginmanager.py:742
 msgid "Archive corrupted"
@@ -10911,50 +11144,53 @@ msgid "Archive empty"
 msgstr "Localização do ficheiro"
 
 #: gajim/plugins/pluginmanager.py:750 gajim/plugins/pluginmanager.py:758
-#: gajim/plugins/gui.py:257
+#: gajim/plugins/gui.py:258
 msgid "Archive is malformed"
 msgstr ""
 
-#: gajim/plugins/pluginmanager.py:766 gajim/plugins/gui.py:281
-#: gajim/plugins/gui.py:289
+#: gajim/plugins/pluginmanager.py:766 gajim/plugins/gui.py:288
+#: gajim/plugins/gui.py:301
 #, fuzzy
 msgid "Plugin already exists"
 msgstr "Este ficheiro já existe"
 
-#: gajim/plugins/gui.py:82
+#: gajim/plugins/gui.py:83
 msgid "Click to view Gajim's wiki page on how to install plugins in Flatpak."
 msgstr ""
 
-#: gajim/plugins/gui.py:89
+#: gajim/plugins/gui.py:90
 msgid "Plugin"
 msgstr ""
 
-#: gajim/plugins/gui.py:151
+#: gajim/plugins/gui.py:152
 #, fuzzy, python-format
 msgid "Warning: %s"
 msgstr "Banindo %s"
 
-#: gajim/plugins/gui.py:206
+#: gajim/plugins/gui.py:207
 #, fuzzy
 msgid "Plugin failed"
 msgstr "Publicação vCard falhou"
 
-#: gajim/plugins/gui.py:245
+#: gajim/plugins/gui.py:246
 msgid "Unable to properly remove the plugin"
 msgstr ""
 
-#: gajim/plugins/gui.py:281
-msgid "Overwrite?"
-msgstr ""
+#: gajim/plugins/gui.py:287
+#, fuzzy
+msgid "Overwrite Plugin?"
+msgstr "Mensagem de Estado"
+
+#: gajim/plugins/gui.py:289
+#, fuzzy
+msgid "Do you want to overwrite the currently installed version?"
+msgstr "Quero _registar uma nova conta"
 
 #: data/org.gajim.Gajim.desktop.in:5
-msgid "Jabber IM Client"
+#, fuzzy
+msgid "XMPP IM Client"
 msgstr "Cliente de IM Jabber"
 
-#: data/org.gajim.Gajim.desktop.in:6
-msgid "A GTK+ Jabber client"
-msgstr "Cliente Jabber GTK+"
-
 #: data/org.gajim.Gajim.desktop.in:8
 msgid "chat;messaging;im;xmpp;bonjour;voip;"
 msgstr ""
@@ -11006,7 +11242,7 @@ msgid "Easily send pictures, videos or other files to friends and groups"
 msgstr ""
 
 #: data/org.gajim.Gajim.appdata.xml.in:27
-msgid "Chat securely with End-to-End encryption via OMEMO or PGP"
+msgid "Chat securely with End-to-End encryption via OMEMO or OpenPGP"
 msgstr ""
 
 #: data/org.gajim.Gajim.appdata.xml.in:28
@@ -11067,7 +11303,7 @@ msgstr ""
 
 #: data/org.gajim.Gajim.appdata.xml.in:52
 #, fuzzy
-msgid "Roster, list of contacts"
+msgid "Contact list, list of contacts"
 msgstr "_Arquivar mudanças de estado dos contactos"
 
 #: data/org.gajim.Gajim.appdata.xml.in:56
@@ -11089,6 +11325,471 @@ msgstr "Histórico dos registos"
 msgid "Plugin manager"
 msgstr "Publicação vCard falhou"
 
+#, fuzzy
+#~ msgid "Configure Services…"
+#~ msgstr "_Descobrir Recursos..."
+
+#, fuzzy
+#~ msgid "Group Chat Bookmarks"
+#~ msgstr "Chat"
+
+#, fuzzy
+#~ msgid "Add Bookmark"
+#~ msgstr "Adicionar esta Sala aos _Bookmarks"
+
+#, fuzzy
+#~ msgid "Remove Bookmark"
+#~ msgstr "Adicionar esta Sala aos _Bookmarks"
+
+#, fuzzy
+#~ msgid "Bookmark Name"
+#~ msgstr "Adicionar esta Sala aos _Bookmarks"
+
+#, fuzzy
+#~ msgid "_Server"
+#~ msgstr "_Servidor:"
+
+#, fuzzy
+#~ msgid "_Password"
+#~ msgstr "_Senha:"
+
+#, fuzzy
+#~ msgid "Join chat when connected"
+#~ msgstr "Contacto Entrou"
+
+#, fuzzy
+#~ msgid "New Group Chat"
+#~ msgstr "Chat"
+
+#~ msgid "This bookmark has invalid data"
+#~ msgstr "Este bookmark tem dados inválidos"
+
+#, fuzzy
+#~ msgid ""
+#~ "Please be sure to fill out server and group chat fields or remove this "
+#~ "bookmark."
+#~ msgstr ""
+#~ "Por favor, verifique se preencheu os campos servidor e sala ou remova "
+#~ "este bookmark"
+
+#~ msgid "Character not allowed"
+#~ msgstr "Carácter não permitido"
+
+#, fuzzy
+#~ msgid "Invalid Group Chat"
+#~ msgstr "Jabber ID Inválido"
+
+#, fuzzy
+#~ msgid "Unable to join group chat"
+#~ msgstr "Impossível entrar na sala"
+
+#, fuzzy
+#~ msgid "You are banned from group chat <b>%s</b>."
+#~ msgstr "Está banido/a desta sala."
+
+#, fuzzy
+#~ msgid "Remote server <b>%s</b> does not exist."
+#~ msgstr "Tal sala não existe."
+
+#, fuzzy
+#~ msgid "Group chat <b>%s</b> does not exist."
+#~ msgstr "Tal sala não existe."
+
+#, fuzzy
+#~ msgid "Group chat creation is not permitted."
+#~ msgstr "Criação de salas encontra-se restrita."
+
+#, fuzzy
+#~ msgid "You must use your registered nickname in <b>%s</b>."
+#~ msgstr "A sua alcunha registada tem de ser usada."
+
+#, fuzzy
+#~ msgid "You are not in the members list in group chat %s."
+#~ msgstr "Não está na lista de membros."
+
+#, fuzzy
+#~ msgid "XMPP Address is not a group chat"
+#~ msgstr "Perguntar antes de fechar uma janela/aba de chat."
+
+#, fuzzy
+#~ msgid "Please choose a group chat"
+#~ msgstr "_Entrar num Chat"
+
+#, fuzzy
+#~ msgid "Invalid Nickname"
+#~ msgstr "Nome de utilizador inválido"
+
+#, fuzzy
+#~ msgid "Wrong server"
+#~ msgstr "Frase de acesso"
+
+#, fuzzy
+#~ msgid "%s is not a group chat server"
+#~ msgstr "Perguntar antes de fechar uma janela/aba de chat."
+
+#, fuzzy
+#~ msgid "A Password is required to join the group chat %s. Please type it."
+#~ msgstr "É necessária uma palavra-passe para esta sala."
+
+#~ msgid "Not in Roster"
+#~ msgstr "Fora da lista"
+
+#~ msgid "I would like to add you to my roster"
+#~ msgstr "Eu gostaria de o adicionar à minha lista"
+
+#, fuzzy
+#~ msgid "Add to Roster"
+#~ msgstr "_Adicionar à Lista"
+
+#, fuzzy
+#~ msgid "Manage Room"
+#~ msgstr "Gerir Bookmarks"
+
+#, fuzzy
+#~ msgid "Configure Room"
+#~ msgstr "Configurar _Sala"
+
+#, fuzzy
+#~ msgid "Destroy Room"
+#~ msgstr "Descrição: %s"
+
+#, fuzzy
+#~ msgid "Change Nick"
+#~ msgstr "Muda Alcu_nha"
+
+#, fuzzy
+#~ msgid "Disconnect"
+#~ msgstr "Contacto Entrou"
+
+#, fuzzy
+#~ msgid "Copy JID"
+#~ msgstr "Sala:"
+
+#, fuzzy
+#~ msgid "Add to Roster…"
+#~ msgstr "_Adicionar à Lista"
+
+#, fuzzy
+#~ msgid "Copy JID/Email"
+#~ msgstr "_Copiar JID/Endereço de Email"
+
+#, fuzzy
+#~ msgid "JID: <i>%s</i>"
+#~ msgstr "JID: <i>%s</i>"
+
+#~ msgid "Changing Subject"
+#~ msgstr "Mudar Assunto"
+
+#~ msgid "Please specify the new subject:"
+#~ msgstr "Por favor, especifique o novo assunto:"
+
+#, fuzzy
+#~ msgid "You (%s) joined the room"
+#~ msgstr "Neste grupo"
+
+#, fuzzy
+#~ msgid "Unable to join groupchat"
+#~ msgstr "Impossível entrar na sala"
+
+#, fuzzy
+#~ msgid "Groupchat Invitation"
+#~ msgstr "?Função do Contacto no Chat:Nenhuma"
+
+#, fuzzy
+#~ msgid "%(jid)s has been invited in this room"
+#~ msgstr "%(nick)s foi expulso por %(who)s: %(reason)s"
+
+#, fuzzy
+#~ msgid "JID is not a Groupchat"
+#~ msgstr "Perguntar antes de fechar uma janela/aba de chat."
+
+#, fuzzy
+#~ msgid "Invalid JID"
+#~ msgstr "Jabber ID Inválido"
+
+#~ msgid "A connection is not available"
+#~ msgstr "Uma ligação não está disponível"
+
+#, fuzzy
+#~ msgid "JID already in list"
+#~ msgstr "Cliente de IM Jabber"
+
+#, fuzzy
+#~ msgid "For the chosen encryption there is no encryption method available"
+#~ msgstr "Uma ligação não está disponível"
+
+#~ msgid "Removes contact from roster"
+#~ msgstr "Remove o contacto da lista"
+
+#, fuzzy
+#~ msgid "Not in roster"
+#~ msgstr "Fora da lista"
+
+#, fuzzy
+#~ msgid "Contact signed in notification color."
+#~ msgstr "Mostrar apenas na _lista"
+
+#, fuzzy
+#~ msgid "Contact signout notification color"
+#~ msgstr "Mostrar apenas na _lista"
+
+#, fuzzy
+#~ msgid "File transfer request notification color."
+#~ msgstr "Pedido de Transferência de Ficheiro"
+
+#, fuzzy
+#~ msgid "File transfer error notification color."
+#~ msgstr "Transferência de ficheiro cancelada"
+
+#, fuzzy
+#~ msgid "File transfer complete or stopped notification color."
+#~ msgstr ""
+#~ "Quando uma transferência de ficheiro é concluida, exibir um popup de "
+#~ "notificação"
+
+#, fuzzy
+#~ msgid "Groupchat invitation notification color"
+#~ msgstr "?Função do Contacto no Chat:Nenhuma"
+
+#~ msgid "Add * and [n] in roster title?"
+#~ msgstr "Adicionar * e [n] no título da lista de contactos?"
+
+#~ msgid "I'm eating, so leave me a message."
+#~ msgstr "Estou a comer, por isso deixe-me uma mensagem"
+
+#, fuzzy
+#~ msgid "from room %s"
+#~ msgstr "De %s"
+
+#, fuzzy
+#~ msgid "Leave Groupchats"
+#~ msgstr "Chat"
+
+#, fuzzy
+#~ msgid "Auto Join"
+#~ msgstr "Entrar automaticamente"
+
+#, fuzzy
+#~ msgid "Room"
+#~ msgstr "Sala:"
+
+#~ msgid "Jabber ID:"
+#~ msgstr "Jabber ID:"
+
+#, fuzzy
+#~ msgid "Occupant Actions"
+#~ msgstr "Acções de _Ocupantes"
+
+#~ msgid "_Add to Roster"
+#~ msgstr "_Adicionar à Lista"
+
+#, fuzzy
+#~ msgid "_Manage Room"
+#~ msgstr "Gerir Bookmarks"
+
+#, fuzzy
+#~ msgid "Configure _Room..."
+#~ msgstr "Configurar _Sala"
+
+#, fuzzy
+#~ msgid "_Destroy Room"
+#~ msgstr "Descrição: %s"
+
+#, fuzzy
+#~ msgid "Jabber ID"
+#~ msgstr "Jabber ID:"
+
+#, fuzzy
+#~ msgid "account"
+#~ msgstr "conta: "
+
+#, fuzzy
+#~ msgid "Roster"
+#~ msgstr "Mostrar _Lista de Contactos"
+
+#, fuzzy
+#~ msgid "Show only in roster"
+#~ msgstr "Mostrar apenas na _lista"
+
+#, fuzzy
+#~ msgid "in _roster"
+#~ msgstr "Fora da lista"
+
+#, fuzzy
+#~ msgid "Roster Appearance"
+#~ msgstr "Aparência"
+
+#, fuzzy
+#~ msgid "Show chatstate in roster"
+#~ msgstr "Exibir imagens pessoais (avatars) dos contactos na lista"
+
+#, fuzzy
+#~ msgid "_Add to Roster..."
+#~ msgstr "_Adicionar à Lista"
+
+#~ msgid "_Jabber ID:"
+#~ msgstr "_Jabber ID:"
+
+#, fuzzy
+#~ msgid "_Jabber ID"
+#~ msgstr "_Jabber ID:"
+
+#, fuzzy
+#~ msgid "JabberID"
+#~ msgstr "Jabber ID:"
+
+#, fuzzy
+#~ msgid "Show Roster"
+#~ msgstr "Mostrar _Lista de Contactos"
+
+#, fuzzy
+#~ msgid "MUC server"
+#~ msgstr "Servidor"
+
+#~ msgid "Room Configuration"
+#~ msgstr "Configuração da Sala"
+
+#~ msgid "Join _Group Chat"
+#~ msgstr "_Entrar num Chat"
+
+#, fuzzy
+#~ msgid "Audio sessions are not available"
+#~ msgstr "Sessão bus não está disponível"
+
+#~ msgid "Conference"
+#~ msgstr "Conferência"
+
+#, fuzzy
+#~ msgid "_Manage Bookmarks…"
+#~ msgstr "Gerir Bookmarks"
+
+#, fuzzy
+#~ msgid "Hide _Roster"
+#~ msgstr "Fora da lista"
+
+#~ msgid "Show _Roster"
+#~ msgstr "Mostrar _Lista de Contactos"
+
+#, fuzzy
+#~ msgid "Invalid Room"
+#~ msgstr "Entrada inválida"
+
+#, fuzzy
+#~ msgid "Invalid room"
+#~ msgstr "Entrada inválida"
+
+#~ msgid "A GTK+ Jabber client"
+#~ msgstr "Cliente Jabber GTK+"
+
+#~ msgid "Changing Nickname"
+#~ msgstr "Mudar Alcunha"
+
+#~ msgid "Please specify the new nickname you want to use:"
+#~ msgstr "Por favor, especifique a nova alcunha a usar:"
+
+#~ msgid "Bookmark already set"
+#~ msgstr "Bookmark já está configurado"
+
+#, fuzzy
+#~ msgid "Group Chat '%s' is already in your bookmarks."
+#~ msgstr "Sala \"%s\" já existe nos seus bookmarks."
+
+#~ msgid "Bookmark has been added successfully"
+#~ msgstr "Bookmark foi adicionado com sucesso"
+
+#, fuzzy
+#~ msgid ""
+#~ "You can manage your bookmarks by clicking the Bookmarks menu item in your "
+#~ "contact list."
+#~ msgstr "Pode gerir os seus bookmarks pelo menu de Acções na sua janela."
+
+#, fuzzy
+#~ msgid "The nickname contains invalid characters."
+#~ msgstr "Alcunha não encontrada: %s"
+
+#, fuzzy
+#~ msgid "Bookmark Room"
+#~ msgstr "Adicionar esta Sala aos _Bookmarks"
+
+#, fuzzy
+#~ msgid "_Join New Group Chat"
+#~ msgstr "_Entrar num Chat"
+
+#, fuzzy
+#~ msgid "_Create Group Chat"
+#~ msgstr "Chat"
+
+#~ msgid "Name:"
+#~ msgstr "Nome:"
+
+#~ msgid "Description:"
+#~ msgstr "Descrição:"
+
+#, fuzzy
+#~ msgid "Address:"
+#~ msgstr "_Endereço:"
+
+#, fuzzy
+#~ msgid "You can not start a new conversation unless you are connected."
+#~ msgstr "Não pode entrar num chat sem estar ligado."
+
+#, fuzzy
+#~ msgid "Occupants"
+#~ msgstr "Acções de _Ocupantes"
+
+#, fuzzy
+#~ msgid "File transfer error"
+#~ msgstr "Erro na Transferência de Ficheiro"
+
+#, fuzzy
+#~ msgid "No Accounts available"
+#~ msgstr "Nenhuma conta disponível"
+
+#~ msgid "_Modify Account..."
+#~ msgstr "_Modificar Conta..."
+
+#, fuzzy
+#~ msgid "Integer"
+#~ msgstr "Neste grupo"
+
+#~ msgid "Text"
+#~ msgstr "Texto"
+
+#~ msgid "Value"
+#~ msgstr "Valor"
+
+#~ msgid "Type"
+#~ msgstr "Tipo"
+
+#~ msgid "(None)"
+#~ msgstr "(Nenhum)"
+
+#~ msgid "Hidden"
+#~ msgstr "Escondida"
+
+#~ msgid "Manage Proxy Profiles"
+#~ msgstr "Gerir Perfis de Proxy"
+
+#, fuzzy
+#~ msgid "Properties"
+#~ msgstr "<b>Propriedades</b>"
+
+#, fuzzy
+#~ msgid "Proxy _Host"
+#~ msgstr "Proxy:"
+
+#, fuzzy
+#~ msgid "Proxy _Port"
+#~ msgstr "_Porta:"
+
+#, fuzzy
+#~ msgid "New Groupchat"
+#~ msgstr "Chat"
+
+#, fuzzy
+#~ msgid "New Contact"
+#~ msgstr "Adicionar Novo Contacto"
+
 #~ msgid "%s GiB"
 #~ msgstr "%s GiB"
 
@@ -11174,9 +11875,6 @@ msgstr "Publicação vCard falhou"
 #~ msgid "_Pause"
 #~ msgstr "_Pausa"
 
-#~ msgid "Clean _up"
-#~ msgstr "_Limpar"
-
 #~ msgid "Remove file transfer from the list."
 #~ msgstr "Remover a transferência de ficheiro da lista."
 
@@ -11552,10 +12250,6 @@ msgstr "Publicação vCard falhou"
 #~ msgid "Do you wish to delete all correspondence with the selected contacts?"
 #~ msgstr "<b>O que pretende fazer?</b>"
 
-#, fuzzy
-#~ msgid "This can not be undone."
-#~ msgstr "O serviço não pôde ser encontrado"
-
 #~ msgid "<b>What do you want to do?</b>"
 #~ msgstr "<b>O que pretende fazer?</b>"
 
@@ -11677,9 +12371,6 @@ msgstr "Publicação vCard falhou"
 #~ msgid "Nick"
 #~ msgstr "_Expulsar"
 
-#~ msgid "Banning…"
-#~ msgstr "Banindo..."
-
 #~ msgid ""
 #~ "<b>Whom do you want to ban?</b>\n"
 #~ "\n"
@@ -11740,13 +12431,6 @@ msgstr "Publicação vCard falhou"
 #~ msgstr "Filtro:"
 
 #, fuzzy
-#~ msgid ""
-#~ "If checked, Gajim will display the mood of contacts in the roster window"
-#~ msgstr ""
-#~ "Se marcado, Gajim exibirá imagens pessoais (avatars) dos seus contactos "
-#~ "na lista"
-
-#, fuzzy
 #~ msgid "<b>Chat Appearance</b>"
 #~ msgstr "<b>Formato de uma linha</b>"
 
@@ -11963,10 +12647,6 @@ msgstr "Publicação vCard falhou"
 #~ msgstr "Mensagem de estado:"
 
 #, fuzzy
-#~ msgid "Group chat highlight"
-#~ msgstr "Chat"
-
-#, fuzzy
 #~ msgid "Your nickname"
 #~ msgstr "Antes da alcunha:"
 
@@ -12121,9 +12801,6 @@ msgstr "Publicação vCard falhou"
 #~ msgid "The passwords typed in both fields must be identical."
 #~ msgstr "As senhas introduzidas em ambos os campos devem ser idênticas."
 
-#~ msgid "Enter new password:"
-#~ msgstr "Introduza a nova senha:"
-
 #~ msgid "Enter it again for confirmation:"
 #~ msgstr "Introduza novamente para confirmação"
 
@@ -12140,10 +12817,6 @@ msgstr "Publicação vCard falhou"
 #~ msgstr "pedido de remoção de subscrição por %s"
 
 #, fuzzy
-#~ msgid "Autojoin"
-#~ msgstr "Entrar automaticamente"
-
-#, fuzzy
 #~ msgid "Homepage:"
 #~ msgstr "Página pessoal:"
 
@@ -12229,10 +12902,6 @@ msgstr "Publicação vCard falhou"
 #~ msgstr "Gajim - %d mensagem não lida"
 
 #, fuzzy
-#~ msgid "AIM Address:"
-#~ msgstr "_Endereço:"
-
-#, fuzzy
 #~ msgid "MSN Address:"
 #~ msgstr "_Endereço:"
 
@@ -12435,9 +13104,6 @@ msgstr "Publicação vCard falhou"
 #~ msgid "Server:"
 #~ msgstr "Servidor:"
 
-#~ msgid "Password:"
-#~ msgstr "Senha:"
-
 #, fuzzy
 #~ msgid "Join this room _automatically when I connect"
 #~ msgstr "Definir uma imagem pessoal (avatar) quando me ligo"
@@ -12455,11 +13121,6 @@ msgstr "Publicação vCard falhou"
 #~ msgstr "_Histórico"
 
 #, fuzzy
-#~ msgid "This contact does not support file transfer."
-#~ msgstr ""
-#~ "Uma lista de transferências de ficheiros activas, completas e paradas"
-
-#, fuzzy
 #~ msgid "Hides the buttons in chat windows."
 #~ msgstr "Perguntar antes de fechar uma janela/aba de chat."
 
@@ -12691,9 +13352,6 @@ msgstr "Publicação vCard falhou"
 #~ msgid "_Edit Personal Information..."
 #~ msgstr "Editar Detalhes Pessoais..."
 
-#~ msgid "Information about you, as stored in the server"
-#~ msgstr "Informações sobre si, tal como estão gravadas no servidor"
-
 #~ msgid "<b>Personal Information</b>"
 #~ msgstr "<b>Detalhes Pessoais</b>"
 
@@ -12760,10 +13418,6 @@ msgstr "Publicação vCard falhou"
 #~ msgid "Your server can't save your personal information."
 #~ msgstr "Deve primeiro criar sua conta antes de editar suas informações"
 
-#, fuzzy
-#~ msgid "Account Local already exists."
-#~ msgstr "Nome de conta em uso"
-
 #~ msgid "Could not write to %s. Session Management support will not work"
 #~ msgstr "Impossível escrever para %s. Session Management não será suportado"
 
@@ -12833,10 +13487,6 @@ msgstr "Publicação vCard falhou"
 #~ msgid "The following message was NOT encrypted"
 #~ msgstr "[Esta mensagem é encriptada]"
 
-#, fuzzy
-#~ msgid "Encryption used for this contact."
-#~ msgstr "Não é possível usar OpenPGP neste computador"
-
 #~ msgid "Toggle Open_PGP Encryption"
 #~ msgstr "Activar/Desactivar Encriptação Open_PGP"
 
@@ -12897,10 +13547,6 @@ msgstr "Publicação vCard falhou"
 #~ msgstr "_Adicionar Contacto"
 
 #, fuzzy
-#~ msgid "_Accounts"
-#~ msgstr "Contas"
-
-#, fuzzy
 #~ msgid "Profile, A_vatar"
 #~ msgstr "Perfil, Avatar"
 
@@ -13075,13 +13721,6 @@ msgstr "Publicação vCard falhou"
 #~ msgid "Activity: "
 #~ msgstr "Activo"
 
-#~ msgid "Join _Group Chat..."
-#~ msgstr "_Entrar num Chat..."
-
-#, fuzzy
-#~ msgid "_Modify Account"
-#~ msgstr "_Modificar Conta..."
-
 #, fuzzy
 #~ msgid ""
 #~ "If True, Gajim will check if it's the default jabber client on each "
@@ -13190,14 +13829,6 @@ msgstr "Publicação vCard falhou"
 
 #, fuzzy
 #~ msgid ""
-#~ "If checked, Gajim will display the activity of contacts in the roster "
-#~ "window"
-#~ msgstr ""
-#~ "Se marcado, Gajim exibirá imagens pessoais (avatars) dos seus contactos "
-#~ "na lista"
-
-#, fuzzy
-#~ msgid ""
 #~ "If checked, Gajim will display the tunes of contacts in the roster window"
 #~ msgstr ""
 #~ "Se marcado, Gajim exibirá imagens pessoais (avatars) dos seus contactos "
@@ -13516,9 +14147,6 @@ msgstr "Publicação vCard falhou"
 #~ "Clique para ver os serviços (tais como transportes MSN e ICQ) dos "
 #~ "servidores jabber"
 
-#~ msgid "_Host:"
-#~ msgstr "_Host:"
-
 #, fuzzy
 #~ msgid "Show _roster"
 #~ msgstr "Mostrar _Lista de Contactos"
@@ -13595,10 +14223,6 @@ msgstr "Publicação vCard falhou"
 #~ msgid "<b>Interface Customization</b>"
 #~ msgstr "<b>Personalização da Interface</b>"
 
-#, fuzzy
-#~ msgid "A_fter nickname:"
-#~ msgstr "Depois da alcunha:"
-
 #~ msgid "Also known as iChat style"
 #~ msgstr "Conhecido também como estilo iChat"
 
@@ -13674,9 +14298,6 @@ msgstr "Publicação vCard falhou"
 #~ msgid "_Player:"
 #~ msgstr "_Tocador de som:"
 
-#~ msgid "Address"
-#~ msgstr "Endereço"
-
 #~ msgid "Role:"
 #~ msgstr "Função:"
 
@@ -13723,10 +14344,6 @@ msgstr "Publicação vCard falhou"
 #~ msgid "Session Management support not available (missing gnome.ui module)"
 #~ msgstr "Session Management não é suportado (módulo gnome.ui em falta)"
 
-#, fuzzy
-#~ msgid "Private Chat"
-#~ msgstr "Iniciar Conversa"
-
 #~ msgid "%s is now %s"
 #~ msgstr "%s está agora %s"
 
@@ -13919,9 +14536,6 @@ msgstr "Publicação vCard falhou"
 #~ msgid "Timeout"
 #~ msgstr "Timeout"
 
-#~ msgid "account: "
-#~ msgstr "conta: "
-
 #~ msgid "Activate/Disable notification for when a file transfer is complete"
 #~ msgstr ""
 #~ "Activar/Desactivar notificação para quando uma transferência de ficheiro "
@@ -14021,9 +14635,6 @@ msgstr "Publicação vCard falhou"
 #~ msgid "_Earliest"
 #~ msgstr "_Primeiro"
 
-#~ msgid "_Latest"
-#~ msgstr "Ú_ltimo"
-
 #~ msgid "%s is now %s: %s"
 #~ msgstr "%s está agora %s: %s"
 
@@ -14172,8 +14783,5 @@ msgstr "Publicação vCard falhou"
 #~ msgid "If you close the window, this message will be lost."
 #~ msgstr "Se fechar esta janela, esta mensagem será perdida."
 
-#~ msgid "_About"
-#~ msgstr "_Sobre"
-
 #~ msgid "paused"
 #~ msgstr "pausado"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 5d550adac..ebe61a5c1 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: 2019-07-02 02:06+0000\n"
+"POT-Creation-Date: 2019-08-11 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,69 +23,69 @@ msgstr ""
 "X-Poedit-Language: Portuguese\n"
 "X-Poedit-Country: BRAZIL\n"
 
-#: gajim/chat_control_base.py:550
+#: gajim/chat_control_base.py:557
 msgid "_Undo"
 msgstr "_Desfazer"
 
-#: gajim/chat_control_base.py:558 gajim/conversation_textview.py:529
+#: gajim/chat_control_base.py:565 gajim/conversation_textview.py:529
 msgid "_Clear"
 msgstr "_Limpar"
 
-#: gajim/chat_control_base.py:563
+#: gajim/chat_control_base.py:570
 msgid "Paste as quote"
 msgstr ""
 
-#: gajim/chat_control_base.py:613
+#: gajim/chat_control_base.py:620
 #, fuzzy
 msgid "Paste Image"
 msgstr "Escolha imagem"
 
-#: gajim/chat_control_base.py:614
+#: gajim/chat_control_base.py:621
 #, fuzzy
 msgid "You are trying to paste an image"
 msgstr "Você está prestes a fechar todas as abas"
 
-#: gajim/chat_control_base.py:615
+#: gajim/chat_control_base.py:622
 #, fuzzy
 msgid ""
 "Are you sure you want to paste your clipboard's image into the chat window?"
 msgstr "Você tem certeza que quer deixar a conferência \"%s\"?"
 
-#: gajim/chat_control_base.py:617 gajim/groupchat_control.py:2310
-#: gajim/roster_window.py:2848 gajim/roster_window.py:4167
-#: gajim/message_window.py:252 gajim/gtk/dialogs.py:418
+#: gajim/chat_control_base.py:624 gajim/groupchat_control.py:2218
+#: gajim/roster_window.py:2841 gajim/roster_window.py:4118
+#: gajim/message_window.py:359 gajim/gtk/dialogs.py:330
 #, fuzzy
 msgid "_Do not ask me again"
 msgstr "_Não me pergunte novamente"
 
-#: gajim/chat_control_base.py:620
+#: gajim/chat_control_base.py:627
 msgid "_Paste"
 msgstr ""
 
-#: gajim/chat_control_base.py:1162 gajim/gtk/accounts.py:351
+#: gajim/chat_control_base.py:1169 gajim/gtk/accounts.py:354
 msgid "Privacy"
 msgstr "Privacidade"
 
-#: gajim/chat_control_base.py:1163
+#: gajim/chat_control_base.py:1170
 msgid "Warning"
 msgstr "Aviso"
 
-#: gajim/chat_control_base.py:1164
+#: gajim/chat_control_base.py:1171
 #, fuzzy, python-format
 msgid "If you send a file to <b>%s</b>, your real JID will be revealed."
 msgstr "Se você enviar um arquivo para %s, ele(a) saberá o seu JID real."
 
-#: gajim/chat_control_base.py:1169
+#: gajim/chat_control_base.py:1176
 #, fuzzy
 msgid "Continue"
 msgstr "_Continuar"
 
-#: gajim/gtkgui_helpers.py:163 gajim/gtk/filetransfer.py:393
+#: gajim/gtkgui_helpers.py:163 gajim/gtk/filetransfer.py:398
 #, fuzzy, python-format
 msgid "Cannot overwrite existing file '%s'"
 msgstr "Não é possível sobrescrever o arquivo \"%s\""
 
-#: gajim/gtkgui_helpers.py:164 gajim/gtk/filetransfer.py:394
+#: gajim/gtkgui_helpers.py:164 gajim/gtk/filetransfer.py:399
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
@@ -181,390 +181,398 @@ msgstr "Não há requisições de inscrições pendentes."
 msgid " resource with priority "
 msgstr " recurso com prioridade "
 
-#: gajim/gui_menu_builder.py:96
-msgid "_New Group Chat"
-msgstr "_Nova conferência"
-
-#: gajim/gui_menu_builder.py:289 gajim/gui_menu_builder.py:380
-#: gajim/chat_control.py:303 gajim/roster_window.py:786
-#: gajim/roster_window.py:1719 gajim/roster_window.py:1721
-#: gajim/roster_window.py:2030 gajim/roster_window.py:3336
-#: gajim/roster_window.py:3369 gajim/gui_interface.py:413
-#: gajim/common/contacts.py:206 gajim/common/contacts.py:343
-#: gajim/common/helpers.py:83 gajim/common/helpers.py:311
-#: gajim/gtk/add_contact.py:319 gajim/gtk/subscription_request.py:70
-#: gajim/gtk/subscription_request.py:99 gajim/gtk/roster_item_exchange.py:112
-msgid "Not in Roster"
-msgstr "Fora da lista"
+#: gajim/gui_menu_builder.py:251 gajim/gui_menu_builder.py:342
+#: gajim/chat_control.py:305 gajim/roster_window.py:783
+#: gajim/roster_window.py:1716 gajim/roster_window.py:1718
+#: gajim/roster_window.py:2027 gajim/roster_window.py:3292
+#: gajim/roster_window.py:3325 gajim/gui_interface.py:396
+#: gajim/common/contacts.py:222 gajim/common/contacts.py:359
+#: gajim/common/contacts.py:471 gajim/common/helpers.py:86
+#: gajim/common/helpers.py:317 gajim/gtk/add_contact.py:319
+#: gajim/gtk/subscription_request.py:70 gajim/gtk/subscription_request.py:99
+#: gajim/gtk/roster_item_exchange.py:112
+#, fuzzy
+msgid "Not in contact list"
+msgstr "Exibir desc_onectados"
 
-#: gajim/gui_menu_builder.py:393
-msgid "I would like to add you to my roster"
-msgstr "Eu gostaria de adiciona-lo à minha lista"
+#: gajim/gui_menu_builder.py:355
+#, fuzzy
+msgid "I would like to add you to my contact list"
+msgstr "Por favor, eu gostaria de adicioná-lo à minha lista."
 
-#: gajim/gui_menu_builder.py:471
+#: gajim/gui_menu_builder.py:433
 #, fuzzy
 msgid "Send Single _Message…"
 msgstr "Enviar _mensagem simples"
 
-#: gajim/gui_menu_builder.py:486
+#: gajim/gui_menu_builder.py:448
 #, fuzzy
 msgid "E_xecute Command…"
 msgstr "_Executar comando"
 
-#: gajim/gui_menu_builder.py:494
+#: gajim/gui_menu_builder.py:456
 msgid "_Manage Transport"
 msgstr "_Gerenciar transporte"
 
-#: gajim/gui_menu_builder.py:500
+#: gajim/gui_menu_builder.py:462
 msgid "_Modify Transport"
 msgstr "_Modificar transporte"
 
-#: gajim/gui_menu_builder.py:507 gajim/roster_window.py:5046
+#: gajim/gui_menu_builder.py:469 gajim/roster_window.py:4985
 #, fuzzy
 msgid "_Rename…"
 msgstr "_Renomear"
 
-#: gajim/gui_menu_builder.py:518 gajim/roster_window.py:5062
-#: gajim/roster_window.py:5177 gajim/data/gui/blocked_contacts_window.ui:52
+#: gajim/gui_menu_builder.py:480 gajim/roster_window.py:5001
+#: gajim/roster_window.py:5116 gajim/data/gui/blocked_contacts_window.ui:52
 #: gajim/data/gui/gc_occupants_menu.ui:148
 #: gajim/data/gui/contact_context_menu.ui:143
 msgid "_Unblock"
 msgstr "_Desbloquear"
 
-#: gajim/gui_menu_builder.py:521 gajim/roster_window.py:5067
-#: gajim/roster_window.py:5181 gajim/data/gui/gc_occupants_menu.ui:140
+#: gajim/gui_menu_builder.py:483 gajim/roster_window.py:5006
+#: gajim/roster_window.py:5120 gajim/data/gui/gc_occupants_menu.ui:140
 #: gajim/data/gui/contact_context_menu.ui:151
 msgid "_Block"
 msgstr "_Bloquear"
 
-#: gajim/gui_menu_builder.py:529 gajim/roster_window.py:5074
+#: gajim/gui_menu_builder.py:491 gajim/roster_window.py:5013
 #: gajim/data/gui/contact_context_menu.ui:181
 msgid "Remo_ve"
 msgstr "Remo_ver"
 
-#: gajim/gui_menu_builder.py:539 gajim/data/gui/contact_context_menu.ui:198
+#: gajim/gui_menu_builder.py:501 gajim/data/gui/contact_context_menu.ui:198
 msgid "_Information"
 msgstr "_Informações"
 
-#: gajim/gui_menu_builder.py:552
+#: gajim/gui_menu_builder.py:514
 #, fuzzy
 msgid "Save _As"
 msgstr "Possui "
 
-#: gajim/gui_menu_builder.py:564 gajim/groupchat_control.py:501
-#: gajim/chat_control.py:340
+#: gajim/gui_menu_builder.py:526 gajim/groupchat_control.py:507
+#: gajim/chat_control.py:342
 #, fuzzy
 msgid "Send File…"
 msgstr "Enviar _arquivo"
 
-#: gajim/gui_menu_builder.py:565
+#: gajim/gui_menu_builder.py:527
 #, fuzzy
 msgid "Upload File…"
 msgstr "Salvar arquivo como..."
 
-#: gajim/gui_menu_builder.py:566
+#: gajim/gui_menu_builder.py:528
 #, fuzzy
 msgid "Send File Directly…"
 msgstr "Salvar arquivo como..."
 
-#: gajim/gui_menu_builder.py:568 gajim/gui_menu_builder.py:632
+#: gajim/gui_menu_builder.py:530 gajim/gui_menu_builder.py:596
 #, fuzzy
 msgid "Send Chatstate"
 msgstr "Último estado"
 
-#: gajim/gui_menu_builder.py:569
+#: gajim/gui_menu_builder.py:531
 #, fuzzy
 msgid "Invite Contacts"
 msgstr "Convidar _contatos"
 
-#: gajim/gui_menu_builder.py:570
+#: gajim/gui_menu_builder.py:532
 #, fuzzy
-msgid "Add to Roster"
-msgstr "_Adicionar à lista"
+msgid "Add to Contact List"
+msgstr "_Adicionar contato..."
 
-#: gajim/gui_menu_builder.py:571
+#: gajim/gui_menu_builder.py:533
 #, fuzzy
-msgid "Audio Session"
-msgstr "Áudio / Vídeo"
+msgid "Voice Chat"
+msgstr "Solicitação de conversa com voz"
 
-#: gajim/gui_menu_builder.py:572
+#: gajim/gui_menu_builder.py:534
 #, fuzzy
-msgid "Video Session"
-msgstr "Alternar sessão de vídeo"
+msgid "Video Chat"
+msgstr "um video"
 
-#: gajim/gui_menu_builder.py:573
+#: gajim/gui_menu_builder.py:535 gajim/gui_menu_builder.py:582
 #, fuzzy
 msgid "Information"
 msgstr "_Informações"
 
-#: gajim/gui_menu_builder.py:574 gajim/gui_menu_builder.py:639
+#: gajim/gui_menu_builder.py:536 gajim/gui_menu_builder.py:602
 #: gajim/data/gui/application_menu.ui:37
 #, fuzzy
 msgid "History"
 msgstr "_Histórico"
 
-#: gajim/gui_menu_builder.py:580 gajim/gui_menu_builder.py:687
+#: gajim/gui_menu_builder.py:542 gajim/gui_menu_builder.py:650
 #: gajim/data/gui/preferences_window.ui:1823
 msgid "Disabled"
 msgstr "Desabilitado"
 
-#: gajim/gui_menu_builder.py:581 gajim/gui_menu_builder.py:688
+#: gajim/gui_menu_builder.py:543 gajim/gui_menu_builder.py:651
 #, fuzzy
 msgid "Composing only"
 msgstr "Escrevendo"
 
-#: gajim/gui_menu_builder.py:582 gajim/gui_menu_builder.py:689
+#: gajim/gui_menu_builder.py:544 gajim/gui_menu_builder.py:652
 #, fuzzy
 msgid "All chat states"
 msgstr "Totos os status"
 
-#: gajim/gui_menu_builder.py:620
+#: gajim/gui_menu_builder.py:583
 #, fuzzy
-msgid "Manage Room"
-msgstr "_Gerenciar sala"
+msgid "Manage Group Chat"
+msgstr "Sair das salas"
 
-#: gajim/gui_menu_builder.py:621
+#: gajim/gui_menu_builder.py:584 gajim/data/gui/groupchat_control.ui:649
 #, fuzzy
 msgid "Change Subject"
 msgstr "Alterar as_sunto..."
 
-#: gajim/gui_menu_builder.py:622
+#: gajim/gui_menu_builder.py:585
 #, fuzzy
-msgid "Configure Room"
-msgstr "Configurar _sala..."
+msgid "Configure Group Chat"
+msgstr "Sair das salas"
 
-#: gajim/gui_menu_builder.py:623
+#: gajim/gui_menu_builder.py:586
 #, fuzzy
 msgid "Upload Avatar…"
 msgstr "Escolha imagem"
 
-#: gajim/gui_menu_builder.py:624
+#: gajim/gui_menu_builder.py:587
 #, fuzzy
-msgid "Destroy Room"
-msgstr "_Excluir sala"
+msgid "Destroy Group Chat"
+msgstr "Nova conferência"
 
-#: gajim/gui_menu_builder.py:626 gajim/data/gui/preferences_window.ui:790
+#: gajim/gui_menu_builder.py:589 gajim/data/gui/preferences_window.ui:790
 #, fuzzy
 msgid "Chat Settings"
 msgstr "Falha ao registrar"
 
-#: gajim/gui_menu_builder.py:627
+#: gajim/gui_menu_builder.py:590
 msgid "Show join/leave"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:628
+#: gajim/gui_menu_builder.py:591
 #, fuzzy
 msgid "Show status changes"
 msgstr "_Log mudanças de status dos contatos"
 
-#: gajim/gui_menu_builder.py:629 gajim/data/gui/gc_control_popup_menu.ui:72
+#: gajim/gui_menu_builder.py:592 gajim/data/gui/gc_control_popup_menu.ui:72
 #, fuzzy
 msgid "Notify on all messages"
 msgstr "Modelos de mensagens"
 
-#: gajim/gui_menu_builder.py:630
+#: gajim/gui_menu_builder.py:593
 #, fuzzy
 msgid "Minimize on close"
 msgstr "_Minimizar ao fechar"
 
-#: gajim/gui_menu_builder.py:631
+#: gajim/gui_menu_builder.py:595
 #, fuzzy
-msgid "Minimize on autojoin"
+msgid "Minimize when joining automatically"
 msgstr "Minimizar ao entrar automaticamente"
 
-#: gajim/gui_menu_builder.py:634
+#: gajim/gui_menu_builder.py:598
 msgid "Sync Threshold"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:635
+#: gajim/gui_menu_builder.py:599
 #, fuzzy
-msgid "Change Nick"
+msgid "Change Nickname"
 msgstr "Alterar _apelido..."
 
-#: gajim/gui_menu_builder.py:636
-#, fuzzy
-msgid "Bookmark Room"
-msgstr "Adicionar esta sala aos marcadores"
-
-#: gajim/gui_menu_builder.py:637
+#: gajim/gui_menu_builder.py:600
 #, fuzzy
 msgid "Request Voice"
 msgstr "_Voz"
 
-#: gajim/gui_menu_builder.py:638 gajim/roster_window.py:5246
+#: gajim/gui_menu_builder.py:601 gajim/roster_window.py:5185
 #, fuzzy
 msgid "Execute command"
 msgstr "_Executar comando"
 
-#: gajim/gui_menu_builder.py:640
-#, fuzzy
-msgid "Disconnect"
-msgstr "_Desconectar"
+#: gajim/gui_menu_builder.py:603
+msgid "Leave"
+msgstr ""
 
-#: gajim/gui_menu_builder.py:678 gajim/gtk/preferences.py:156
+#: gajim/gui_menu_builder.py:641 gajim/gtk/preferences.py:155
 msgid "No threshold"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:680 gajim/gtk/preferences.py:158
+#: gajim/gui_menu_builder.py:643 gajim/gtk/preferences.py:157
 #, fuzzy, python-format
 msgid "%i day"
 msgid_plural "%i days"
 msgstr[0] "%i dias atrás"
 msgstr[1] "%i dias atrás"
 
-#: gajim/gui_menu_builder.py:709 gajim/gui_menu_builder.py:747
-#: gajim/gtk/join_groupchat.py:43
-msgid "Join Group Chat"
-msgstr "Ingressar numa conferência"
-
-#: gajim/gui_menu_builder.py:746
+#: gajim/gui_menu_builder.py:672
 #, fuzzy
 msgid "Add Contact…"
 msgstr "_Adicionar contato..."
 
-#: gajim/gui_menu_builder.py:748 gajim/gtk/profile.py:52
-#: gajim/gtk/accounts.py:770 gajim/gtk/accounts.py:808
+#: gajim/gui_menu_builder.py:673 gajim/gtk/profile.py:52
+#: gajim/gtk/accounts.py:773 gajim/gtk/accounts.py:811
 #, fuzzy
 msgid "Profile"
 msgstr "arquivo"
 
-#: gajim/gui_menu_builder.py:749
+#: gajim/gui_menu_builder.py:674
+#, fuzzy
+msgid "Send Single Message…"
+msgstr "Enviar _mensagem simples"
+
+#: gajim/gui_menu_builder.py:675
 #, fuzzy
 msgid "Discover Services"
 msgstr "_Descubra serviços"
 
-#: gajim/gui_menu_builder.py:750
+#: gajim/gui_menu_builder.py:676 gajim/gtk/server_info.py:36
 #, fuzzy
-msgid "Send Single Message…"
-msgstr "Enviar _mensagem simples"
+msgid "Server Info"
+msgstr "Servidor"
 
-#: gajim/gui_menu_builder.py:751 gajim/data/gui/preferences_window.ui:2741
+#: gajim/gui_menu_builder.py:677 gajim/data/gui/preferences_window.ui:2741
 msgid "Advanced"
 msgstr "Avançado"
 
-#: gajim/gui_menu_builder.py:752 gajim/gtk/mam_preferences.py:88
+#: gajim/gui_menu_builder.py:678 gajim/gtk/mam_preferences.py:88
 #, fuzzy
 msgid "Archiving Preferences"
 msgstr "_Preferências"
 
-#: gajim/gui_menu_builder.py:753
+#: gajim/gui_menu_builder.py:679
 #, fuzzy
 msgid "Blocking List"
 msgstr "Lista de banidos"
 
-#: gajim/gui_menu_builder.py:754 gajim/gtk/history_sync.py:108
+#: gajim/gui_menu_builder.py:680
+#, fuzzy
+msgid "Bookmarks"
+msgstr "Ma_rcadores"
+
+#: gajim/gui_menu_builder.py:681
+#, fuzzy
+msgid "PEP Configuration"
+msgstr "Configuração da sala"
+
+#: gajim/gui_menu_builder.py:682 gajim/gtk/history_sync.py:108
 #: gajim/gtk/history_sync.py:186
 #, fuzzy
 msgid "Synchronise History"
 msgstr "Sincronizar"
 
-#: gajim/gui_menu_builder.py:755 gajim/gtk/privacy_list.py:427
+#: gajim/gui_menu_builder.py:683 gajim/gtk/privacy_list.py:427
 msgid "Privacy Lists"
 msgstr "Listas de privacidade"
 
-#: gajim/gui_menu_builder.py:756 gajim/gtk/server_info.py:36
-#, fuzzy
-msgid "Server Info"
-msgstr "Servidor"
-
-#: gajim/gui_menu_builder.py:757 gajim/gui_menu_builder.py:768
+#: gajim/gui_menu_builder.py:685 gajim/gui_menu_builder.py:696
 #: gajim/data/gui/xml_console_window.ui:77
 msgid "XML Console"
 msgstr "Console XML"
 
-#: gajim/gui_menu_builder.py:759 gajim/data/gui/groupchat_config.ui:36
+#: gajim/gui_menu_builder.py:687 gajim/data/gui/groupchat_config.ui:36
 #, fuzzy
 msgid "Admin"
 msgstr "_Administração"
 
-#: gajim/gui_menu_builder.py:760
+#: gajim/gui_menu_builder.py:688
 #, fuzzy
 msgid "Send Server Message…"
 msgstr "_Enviar mensagem de servidor..."
 
-#: gajim/gui_menu_builder.py:761
+#: gajim/gui_menu_builder.py:689
 #, fuzzy
 msgid "Set MOTD…"
 msgstr "Definir MOTD..."
 
-#: gajim/gui_menu_builder.py:762
+#: gajim/gui_menu_builder.py:690
 #, fuzzy
 msgid "Update MOTD…"
 msgstr "Atualizar MOTD..."
 
-#: gajim/gui_menu_builder.py:763
+#: gajim/gui_menu_builder.py:691
 #, fuzzy
 msgid "Delete MOTD…"
 msgstr "Excluir MOTD"
 
-#: gajim/gui_menu_builder.py:812
+#: gajim/gui_menu_builder.py:736
 #, fuzzy
-msgid "No Accounts available"
-msgstr "Conta não disponível"
+msgid "_Add Account…"
+msgstr "_Adicionar contato..."
+
+#: gajim/gui_menu_builder.py:742
+#, fuzzy
+msgid "_Modify Accounts…"
+msgstr "_Alterar conta"
+
+#: gajim/gui_menu_builder.py:751 gajim/data/gui/zeroconf_context_menu.ui:26
+#: gajim/data/gui/account_context_menu.ui:79
+#, fuzzy
+msgid "_Modify Account…"
+msgstr "_Alterar conta"
 
-#: gajim/gui_menu_builder.py:823 gajim/data/gui/application_menu.ui:5
-#: gajim/data/gui/application_menu.ui:71 gajim/data/gui/shortcuts_window.ui:182
-#: gajim/gtk/accounts.py:58
+#: gajim/gui_menu_builder.py:755 gajim/data/gui/application_menu.ui:5
+#: gajim/data/gui/shortcuts_window.ui:182 gajim/gtk/accounts.py:57
 msgid "Accounts"
 msgstr "Contas"
 
-#: gajim/gui_menu_builder.py:881 gajim/gui_menu_builder.py:886
+#: gajim/gui_menu_builder.py:784 gajim/gui_menu_builder.py:789
 #, fuzzy
-msgid "Copy JID"
-msgstr "Sala JID"
+msgid "Copy XMPP Address"
+msgstr "_Copiar e-mail/JID"
 
-#: gajim/gui_menu_builder.py:882 gajim/gui_menu_builder.py:914
+#: gajim/gui_menu_builder.py:785 gajim/gui_menu_builder.py:817
 #, fuzzy
 msgid "Join Groupchat"
 msgstr "Ingressar numa conferência"
 
-#: gajim/gui_menu_builder.py:887 gajim/gui_menu_builder.py:913
-#: gajim/data/gui/application_menu.ui:76
+#: gajim/gui_menu_builder.py:790 gajim/gui_menu_builder.py:816
+#: gajim/data/gui/application_menu.ui:71
 #: gajim/data/gui/subscription_request_window.ui:106
 msgid "Start Chat"
 msgstr "Iniciar conversa"
 
-#: gajim/gui_menu_builder.py:888 gajim/gui_menu_builder.py:915
+#: gajim/gui_menu_builder.py:791 gajim/gui_menu_builder.py:818
 #, fuzzy
-msgid "Add to Roster…"
-msgstr "_Adicionar à lista"
+msgid "Add to Contact List…"
+msgstr "_Adicionar contato..."
 
-#: gajim/gui_menu_builder.py:893
+#: gajim/gui_menu_builder.py:796
 #, fuzzy
 msgid "Copy Link Location"
 msgstr "_Copiar URL"
 
-#: gajim/gui_menu_builder.py:894
+#: gajim/gui_menu_builder.py:797
 #, fuzzy
 msgid "Open Link in Browser"
 msgstr "_Visualizar no navegador"
 
-#: gajim/gui_menu_builder.py:899
+#: gajim/gui_menu_builder.py:802
 #, fuzzy
 msgid "Copy Email Address"
 msgstr "_Copiar e-mail/JID"
 
-#: gajim/gui_menu_builder.py:900 gajim/gui_menu_builder.py:912
+#: gajim/gui_menu_builder.py:803 gajim/gui_menu_builder.py:815
 #, fuzzy
 msgid "Open Email Composer"
 msgstr "_Abrir cliente de e-mail"
 
-#: gajim/gui_menu_builder.py:905
+#: gajim/gui_menu_builder.py:808
 #, fuzzy
 msgid "Copy Location"
 msgstr "_Copiar URL"
 
-#: gajim/gui_menu_builder.py:906
+#: gajim/gui_menu_builder.py:809
 #, fuzzy
 msgid "Show Location"
 msgstr "Notificação"
 
-#: gajim/gui_menu_builder.py:911
+#: gajim/gui_menu_builder.py:814
 #, fuzzy
-msgid "Copy JID/Email"
+msgid "Copy XMPP Address/Email"
 msgstr "_Copiar e-mail/JID"
 
-#: gajim/gui_menu_builder.py:945
+#: gajim/gui_menu_builder.py:852
 #, fuzzy
 msgid "Copy"
 msgstr "Sala JID"
@@ -587,44 +595,56 @@ msgstr ""
 msgid "Choose folder for logfile"
 msgstr ""
 
-#: gajim/history_manager.py:107
+#: gajim/history_manager.py:106
 msgid "Cannot find history logs database"
 msgstr "Não foi encontrado banco de dados do histórico de logs"
 
-#: gajim/history_manager.py:108
+#: gajim/history_manager.py:107
 #, fuzzy, python-format
 msgid "%s does not exist."
 msgstr "O arquivo não existe"
 
-#: gajim/history_manager.py:141 gajim/history_manager.py:195
-#: gajim/gtk/discovery.py:829 gajim/gtk/roster_item_exchange.py:80
-msgid "JID"
-msgstr "JID"
+#: gajim/history_manager.py:140 gajim/history_manager.py:194
+#: 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:30
+#: gajim/gtk/accounts.py:804
+#, fuzzy
+msgid "XMPP Address"
+msgstr "Endereço AIM:"
 
-#: gajim/history_manager.py:154 gajim/history_manager.py:202
+#: gajim/history_manager.py:153 gajim/history_manager.py:201
 #: gajim/data/gui/history_window.ui:89 gajim/gtk/history.py:108
 msgid "Date"
 msgstr "Data:"
 
-#: gajim/history_manager.py:161 gajim/history_manager.py:225
+#: gajim/history_manager.py:160 gajim/history_manager.py:224
 #: gajim/data/gui/join_groupchat_window.ui:208
 #: gajim/data/gui/profile_window.ui:214
 #: gajim/data/gui/vcard_information_window.ui:443
+#: gajim/data/gui/bookmarks.ui:140
 msgid "Nickname"
 msgstr "Apelido"
 
-#: gajim/history_manager.py:172 gajim/history_manager.py:211
+#: gajim/history_manager.py:171 gajim/history_manager.py:210
 #: gajim/data/gui/preferences_window.ui:1344
 #: gajim/data/gui/single_message_window.ui:275 gajim/gtk/history.py:117
 msgid "Message"
 msgstr "Mensagem"
 
-#: gajim/history_manager.py:180 gajim/history_manager.py:218
+#: gajim/history_manager.py:179 gajim/history_manager.py:217
 #: gajim/data/gui/groups_post_window.ui:49
 #: gajim/data/gui/single_message_window.ui:214
 msgid "Subject"
 msgstr "Assunto"
 
+#: gajim/history_manager.py:247
+#, fuzzy
+msgid "Database Cleanup"
+msgstr "Erro na base de dados"
+
 #: gajim/history_manager.py:248
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
@@ -636,11 +656,8 @@ msgstr ""
 #: gajim/history_manager.py:250
 #, fuzzy
 msgid ""
-"Normally allocated database size will not be freed, it will just become "
-"reusable. If you really want to reduce database filesize, click YES, else "
-"click NO.\n"
-"\n"
-"In case you click YES, please wait…"
+"Normally, the allocated database size will not be freed, it will just become "
+"reusable. This operation may take a while."
 msgstr ""
 "Normalmente, o tamanho alocado da base de dados não será liberado, ele se "
 "tornará apenas reusável. Se você quiser realmente reduzir o tamanho do "
@@ -650,47 +667,47 @@ msgstr ""
 
 #: gajim/history_manager.py:255
 #, fuzzy
-msgid "Database Cleanup"
-msgstr "Erro na base de dados"
+msgid "_Cleanup"
+msgstr "_Limpar"
 
-#: gajim/history_manager.py:519 gajim/gtk/filetransfer.py:238
-#: gajim/gtk/filetransfer.py:248
+#: gajim/history_manager.py:518 gajim/gtk/filetransfer.py:237
+#: gajim/gtk/filetransfer.py:247
 msgid "You"
 msgstr "Você"
 
-#: gajim/history_manager.py:531
+#: gajim/history_manager.py:530
 #, 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:568 gajim/history_manager.py:607
-#: gajim/gtk/dialogs.py:58 gajim/gtk/themes.py:319
+#: gajim/history_manager.py:567 gajim/history_manager.py:606
+#: gajim/gtk/dialogs.py:57 gajim/gtk/themes.py:319
 #: gajim/gtk/roster_item_exchange.py:75 gajim/gtk/roster_item_exchange.py:185
 msgid "Delete"
 msgstr "Deletar"
 
-#: gajim/history_manager.py:569
+#: gajim/history_manager.py:568
 #, fuzzy
 msgid "Delete Conversation"
 msgid_plural "Delete Conversations"
 msgstr[0] "Cancelar confirmação"
 msgstr[1] "Cancelar confirmação"
 
-#: gajim/history_manager.py:570
+#: gajim/history_manager.py:569
 #, 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] "Você realmente quer excluir a mensagem selecionada?"
 msgstr[1] "Você realmente quer excluir a mensagem selecionada?"
 
-#: gajim/history_manager.py:608
+#: gajim/history_manager.py:607
 #, fuzzy
 msgid "Delete Message"
 msgid_plural "Delete Messages"
 msgstr[0] "Mensagem padrão"
 msgstr[1] "Mensagem padrão"
 
-#: gajim/history_manager.py:609
+#: gajim/history_manager.py:608
 #, fuzzy
 msgid "Do you want to permanently delete this message"
 msgid_plural "Do you want to permanently delete these messages"
@@ -703,15 +720,15 @@ msgid "Contact name: <i>%s</i>"
 msgstr "Nome do contato: <i>%s</i>"
 
 #: gajim/dialogs.py:84
-#, fuzzy, python-format
-msgid "JID: <i>%s</i>"
-msgstr "Jabber ID: <i>%s</i>"
+#, python-format
+msgid "XMPP Address: <i>%s</i>"
+msgstr ""
 
-#: gajim/dialogs.py:115 gajim/dialogs.py:128 gajim/roster_window.py:2901
-#: gajim/roster_window.py:3833 gajim/roster_window.py:5084
-#: gajim/common/contacts.py:157 gajim/common/contacts.py:190
+#: gajim/dialogs.py:115 gajim/dialogs.py:128 gajim/roster_window.py:2894
+#: gajim/roster_window.py:3784 gajim/roster_window.py:5023
+#: gajim/common/contacts.py:157 gajim/common/contacts.py:206
 #: gajim/data/gui/preferences_window.ui:558
-#: gajim/data/gui/shortcuts_window.ui:177 gajim/gtk/accounts.py:349
+#: gajim/data/gui/shortcuts_window.ui:177 gajim/gtk/accounts.py:352
 msgid "General"
 msgstr "Geral"
 
@@ -758,7 +775,7 @@ msgstr ""
 "Este nome já está sendo usado. Você quer sobrescrever essa mensagem de "
 "status?"
 
-#: gajim/dialogs.py:703
+#: gajim/dialogs.py:703 gajim/plugins/gui.py:292
 msgid "_Overwrite"
 msgstr ""
 
@@ -770,9 +787,7 @@ msgstr "Salvar como a mensagem de status pré-configurada"
 msgid "Please type a name for this status message"
 msgstr "Por favor, escreva um nome para esta mensagem de status"
 
-#: gajim/dialogs.py:740 gajim/gui_interface.py:1441 gajim/dialog_messages.py:31
-#: gajim/gtk/discovery.py:518 gajim/gtk/profile.py:323
-#: gajim/gtk/join_groupchat.py:234
+#: gajim/dialogs.py:740 gajim/gtk/discovery.py:517 gajim/gtk/profile.py:323
 msgid "You are not connected to the server"
 msgstr "Você não está conectado ao servidor"
 
@@ -780,9 +795,11 @@ msgstr "Você não está conectado ao servidor"
 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:752 gajim/dialogs.py:823 gajim/gtk/discovery.py:822
-#: gajim/gtk/discovery.py:1648 gajim/gtk/discovery.py:1941
-#: gajim/gtk/history.py:99 gajim/gtk/roster_item_exchange.py:83
+#: gajim/dialogs.py:752 gajim/dialogs.py:823
+#: gajim/data/gui/groupchat_info_scrolled.ui:16 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/gtk/roster_item_exchange.py:83
 msgid "Name"
 msgstr "Nome"
 
@@ -802,397 +819,344 @@ msgstr "Você não pode sincronizar com uma conta a menos que esteja conectado."
 msgid "Synchronise"
 msgstr "Sincronizar"
 
-#: gajim/dialogs.py:1043
+#: gajim/dialogs.py:1042
 msgid "an audio and video"
 msgstr "um áudio e vídeo"
 
-#: gajim/dialogs.py:1045
+#: gajim/dialogs.py:1044
 msgid "an audio"
 msgstr "um áudio"
 
-#: gajim/dialogs.py:1047
+#: gajim/dialogs.py:1046
 msgid "a video"
 msgstr "um video"
 
-#: gajim/dialogs.py:1051
-#, python-format
+#: gajim/dialogs.py:1050
+#, fuzzy, python-format
 msgid ""
-"%(contact)s wants to start %(type)s session with you. Do you want to answer "
+"%(contact)s wants to start a %(type)s chat with you. Do you want to answer "
 "the call?"
 msgstr ""
 "O %(contact)s quer iniciar uma sessão  %(type)s com você. Você quer "
 "responder a chamada?"
 
-#: gajim/groupchat_control.py:505
+#: gajim/groupchat_control.py:511
 #, fuzzy, python-format
 msgid "Send File (max. %s MiB)…"
 msgstr "Salvar arquivo como..."
 
-#: gajim/groupchat_control.py:507 gajim/chat_control.py:342
+#: gajim/groupchat_control.py:513 gajim/chat_control.py:344
 #, fuzzy
 msgid "No File Transfer available"
 msgstr "Transferência de arquivos"
 
-#: gajim/groupchat_control.py:630 gajim/groupchat_control.py:2349
-msgid "Changing Subject"
-msgstr "Mudando assunto"
-
-#: gajim/groupchat_control.py:631 gajim/groupchat_control.py:2350
-msgid "Please specify the new subject:"
-msgstr "Por favor, especifique o novo assunto:"
-
-#: gajim/groupchat_control.py:638
-msgid "Changing Nickname"
-msgstr "Mudando apelido"
-
-#: gajim/groupchat_control.py:639
-msgid "Please specify the new nickname you want to use:"
-msgstr "Por favor, especifique o novo apelido que você quer usar:"
-
-#: gajim/groupchat_control.py:657
+#: gajim/groupchat_control.py:655
 #, fuzzy
-msgid "Invalid group chat JID"
+msgid "Invalid group chat XMPP Address"
 msgstr "Jabber ID da conferência inválido:"
 
-#: gajim/groupchat_control.py:658
+#: gajim/groupchat_control.py:656
 #, fuzzy
-msgid "The group chat JID has not allowed characters."
+msgid "The group chat XMPP Address has not allowed characters."
 msgstr "O Jabber ID da conferência possui caracteres não permitidos."
 
-#: gajim/groupchat_control.py:758 gajim/gtk/profile.py:136
+#: gajim/groupchat_control.py:743 gajim/gtk/profile.py:136
 msgid "Could not load image"
 msgstr "A imagem não pode ser carregada"
 
-#: gajim/groupchat_control.py:888
+#: gajim/groupchat_control.py:873
 msgid "Insert Nickname"
 msgstr "Inserir apelido"
 
-#: gajim/groupchat_control.py:1056 gajim/chat_control.py:824
+#: gajim/groupchat_control.py:1041 gajim/chat_control.py:848
 msgid "and authenticated"
 msgstr "e autenticada"
 
-#: gajim/groupchat_control.py:1060 gajim/chat_control.py:828
+#: gajim/groupchat_control.py:1045 gajim/chat_control.py:852
 msgid "and NOT authenticated"
 msgstr "e NÃO autenticada"
 
-#: gajim/groupchat_control.py:1064
+#: gajim/groupchat_control.py:1049
 #, python-format
 msgid "%(type)s encryption is active %(authenticated)s."
 msgstr "Criptografia %(type)s está ativa %(authenticated)s."
 
-#: gajim/groupchat_control.py:1111
+#: gajim/groupchat_control.py:1096
 msgid "Conversation with "
 msgstr "Conversação com "
 
-#: gajim/groupchat_control.py:1113
+#: gajim/groupchat_control.py:1098
 msgid "Continued conversation"
 msgstr "Conversação continuada"
 
-#: gajim/groupchat_control.py:1411
+#: gajim/groupchat_control.py:1357
 #, 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:1433
+#: gajim/groupchat_control.py:1374
 #, fuzzy
-msgid "Room now shows unavailable members"
+msgid "Group chat now shows unavailable members"
 msgstr "A sala agora exibe membros indisponíveis"
 
-#: gajim/groupchat_control.py:1436
+#: gajim/groupchat_control.py:1377
 #, fuzzy
-msgid "Room now does not show unavailable members"
+msgid "Group chat now does not show unavailable members"
 msgstr "a sala agora não mostra membros indisponíveis"
 
-#: gajim/groupchat_control.py:1439
+#: gajim/groupchat_control.py:1380
 msgid "A setting not related to privacy has been changed"
 msgstr ""
 
-#: gajim/groupchat_control.py:1446
-msgid "Room logging is now enabled"
-msgstr "A gravação das conversas da sala está ativo agora"
+#: gajim/groupchat_control.py:1387 gajim/groupchat_control.py:1659
+#, fuzzy
+msgid "Conversations are stored on the server"
+msgstr "A sessão NÃO SERÁ gravada"
 
-#: gajim/groupchat_control.py:1449
-msgid "Room logging is now disabled"
-msgstr "A gravação das conversas da sala está desligado agora"
+#: gajim/groupchat_control.py:1390
+#, fuzzy
+msgid "Conversations are not stored on the server"
+msgstr "Informações sobre você são gravadas no servidor"
 
-#: gajim/groupchat_control.py:1452
-msgid "Room is now non-anonymous"
+#: gajim/groupchat_control.py:1393
+#, fuzzy
+msgid "Group chat is now non-anonymous"
 msgstr "Agora a sala é não-anônima"
 
-#: gajim/groupchat_control.py:1456
-msgid "Room is now semi-anonymous"
+#: gajim/groupchat_control.py:1397
+#, fuzzy
+msgid "Group chat is now semi-anonymous"
 msgstr "Agora a sala é semi-anônima"
 
-#: gajim/groupchat_control.py:1460
+#: gajim/groupchat_control.py:1401
 #, fuzzy
-msgid "Room is now fully anonymous"
+msgid "Group chat is now fully anonymous"
 msgstr "Agora a sala é totalmente anônima"
 
-#: gajim/groupchat_control.py:1500
+#: gajim/groupchat_control.py:1439
 #, fuzzy, python-format
 msgid "Ping? (%s)"
 msgstr "Pong! (%s s.)"
 
-#: gajim/groupchat_control.py:1503
+#: gajim/groupchat_control.py:1442
 #, python-format
 msgid "Pong! (%(nick)s %(delay)s s.)"
 msgstr "Pong! (%(nick)s %(delay)s s.)"
 
-#: gajim/groupchat_control.py:1506 gajim/chat_control.py:1213
+#: gajim/groupchat_control.py:1445 gajim/chat_control.py:1237
 msgid "Error."
 msgstr "Erro."
 
-#: gajim/groupchat_control.py:1711
+#: gajim/groupchat_control.py:1650
 #, fuzzy, python-format
-msgid "You (%s) joined the room"
+msgid "You (%s) joined the group chat"
 msgstr "%s entrou na conferência"
 
-#: gajim/groupchat_control.py:1717
-msgid "Any occupant is allowed to see your full JID"
+#: gajim/groupchat_control.py:1655
+#, fuzzy
+msgid "Any participant is allowed to see your full XMPP Address"
 msgstr "Algum ocupante tem permissão de ver o seu JID inteiro"
 
-#: gajim/groupchat_control.py:1721
-msgid "Room logging is enabled"
-msgstr "A gravação das conversas da sala está ligado"
-
-#: gajim/groupchat_control.py:1725
-msgid "The server has assigned or modified your roomnick"
+#: gajim/groupchat_control.py:1663
+#, fuzzy
+msgid "The server has assigned or modified your nickname in this group chat"
 msgstr "O servidor atribuiu ou modificou o apelido da sua sala"
 
-#: gajim/groupchat_control.py:1732
-msgid "A new room has been created"
+#: gajim/groupchat_control.py:1671
+#, fuzzy
+msgid "A new group chat has been created"
 msgstr "Uma nova sala foi criada"
 
-#: gajim/groupchat_control.py:1740 gajim/privatechat_control.py:112
+#: gajim/groupchat_control.py:1679 gajim/privatechat_control.py:115
 #, python-format
 msgid "You are now known as %s"
 msgstr "Você agora é conhecido como %s"
 
-#: gajim/groupchat_control.py:1742 gajim/privatechat_control.py:114
+#: gajim/groupchat_control.py:1681 gajim/privatechat_control.py:117
 #, python-brace-format
 msgid "{nick} is now known as {new_nick}"
 msgstr "{nick} agora é conhecido como {new_nick}"
 
-#: gajim/groupchat_control.py:1767 gajim/privatechat_control.py:141
+#: gajim/groupchat_control.py:1706 gajim/privatechat_control.py:144
 #, python-brace-format
 msgid "You are now {show}{status}"
 msgstr "Agora você está {show}{status}"
 
-#: gajim/groupchat_control.py:1773 gajim/privatechat_control.py:147
+#: gajim/groupchat_control.py:1712 gajim/privatechat_control.py:150
 #, python-brace-format
 msgid "{nick} is now {show}{status}"
 msgstr "{nick} agora está {show}{status}"
 
-#: gajim/groupchat_control.py:1790 gajim/groupchat_control.py:1819
-#: gajim/groupchat_control.py:1849 gajim/groupchat_control.py:1909
+#: gajim/groupchat_control.py:1729 gajim/groupchat_control.py:1758
+#: gajim/groupchat_control.py:1788 gajim/groupchat_control.py:1848
 #, python-brace-format
 msgid " by {actor}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1793
+#: gajim/groupchat_control.py:1732
 #, python-brace-format
 msgid "** Your Affiliation has been set to {affiliation}{actor}{reason}"
 msgstr "** Sua Afiliação foi definida como {affiliation}{actor}{reason}"
 
-#: gajim/groupchat_control.py:1799
+#: gajim/groupchat_control.py:1738
 #, python-brace-format
 msgid "** Affiliation of {nick} has been set to {affiliation}{actor}{reason}"
 msgstr ""
 "** A Afiliação de {nick} foi definida como {affiliation}{actor}{reason}"
 
-#: gajim/groupchat_control.py:1822
+#: gajim/groupchat_control.py:1761
 #, python-brace-format
 msgid "** Your Role has been set to {role}{actor}{reason}"
 msgstr "** Seu Cargo foi definido como {role}{actor}{reason}"
 
-#: gajim/groupchat_control.py:1827
+#: gajim/groupchat_control.py:1766
 #, python-brace-format
 msgid "** Role of {nick} has been set to {role}{actor}{reason}"
 msgstr "** O Cargo de %{nick} foi definido como {role}{actor}{reason}"
 
-#: gajim/groupchat_control.py:1852
-#, python-brace-format
-msgid "You have been removed from the room{actor}{reason}"
+#: gajim/groupchat_control.py:1791
+#, fuzzy, python-brace-format
+msgid "You have been removed from the group chat{actor}{reason}"
 msgstr "Você foi removido da sala {actor}{reason}"
 
-#: gajim/groupchat_control.py:1857
+#: gajim/groupchat_control.py:1796
 #, python-brace-format
 msgid "You have left due to an error{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1863
+#: gajim/groupchat_control.py:1802
 #, python-brace-format
 msgid "You have been kicked{actor}{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1870
+#: gajim/groupchat_control.py:1809
 #, python-brace-format
 msgid "You have been banned{actor}{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1877 gajim/groupchat_control.py:1943
+#: gajim/groupchat_control.py:1816 gajim/groupchat_control.py:1882
 #, fuzzy
 msgid ": Affiliation changed"
 msgstr "filiação alterada"
 
-#: gajim/groupchat_control.py:1883 gajim/groupchat_control.py:1948
+#: gajim/groupchat_control.py:1822 gajim/groupchat_control.py:1887
 #, fuzzy
-msgid ": Room configuration changed to members-only"
+msgid ": Group chat configuration changed to members-only"
 msgstr "a configuração da sala mudou para aceitar apenas membros"
 
-#: gajim/groupchat_control.py:1912
-#, python-brace-format
-msgid "{nick} has been removed from the room{by}{reason}"
+#: gajim/groupchat_control.py:1851
+#, fuzzy, python-brace-format
+msgid "{nick} has been removed from the group chat{by}{reason}"
 msgstr "{nick} foi removido da sala {by}{reason}"
 
-#: gajim/groupchat_control.py:1922
+#: gajim/groupchat_control.py:1861
 #, python-brace-format
 msgid "{nick} has left due to an error{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1928
+#: gajim/groupchat_control.py:1867
 #, python-brace-format
 msgid "{nick} has been kicked{actor}{reason}"
 msgstr "{nick} foi expulso {actor}{reason}"
 
-#: gajim/groupchat_control.py:1936
+#: gajim/groupchat_control.py:1875
 #, python-brace-format
 msgid "{nick} has been banned{actor}{reason}"
 msgstr "{nick} foi banido {actor}{reason}"
 
-#: gajim/groupchat_control.py:1953
+#: gajim/groupchat_control.py:1892
 #, python-brace-format
 msgid "{nick} has left{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1970
+#: gajim/groupchat_control.py:1914
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s entrou na conferência"
 
-#: gajim/groupchat_control.py:1985 gajim/groupchat_control.py:1990
-#: gajim/groupchat_control.py:1995 gajim/groupchat_control.py:2000
-#: gajim/groupchat_control.py:2011
-msgid "Unable to join group chat"
-msgstr "Impossível ingressar na sala"
-
-#: gajim/groupchat_control.py:1986
-#, python-format
-msgid "You are banned from group chat <b>%s</b>."
-msgstr "Você está banido da sala <b>%s</b>."
-
-#: gajim/groupchat_control.py:1991
-#, python-format
-msgid "Remote server <b>%s</b> does not exist."
-msgstr "O servidor remoto <b>%s</b> não existe."
-
-#: gajim/groupchat_control.py:1996
-#, python-format
-msgid "Group chat <b>%s</b> does not exist."
-msgstr "A sala <b>%s</b> não existe."
-
-#: gajim/groupchat_control.py:2001
+#: gajim/groupchat_control.py:1981
 #, fuzzy
-msgid "Group chat creation is not permitted."
-msgstr "A criação de sala é restrita."
-
-#: gajim/groupchat_control.py:2005
-#, fuzzy
-msgid "Unable to join groupchat"
-msgstr "Impossível ingressar na sala"
-
-#: gajim/groupchat_control.py:2006
-#, python-format
-msgid "You must use your registered nickname in <b>%s</b>."
-msgstr "Você deve usar seu apelido registrado em <b>%s</b>."
-
-#: gajim/groupchat_control.py:2012
-#, python-format
-msgid "You are not in the members list in groupchat %s."
-msgstr "Você não está na lista de membros da sala %s."
-
-#: gajim/groupchat_control.py:2068
-msgid "Room has been destroyed"
+msgid "Group chat has been destroyed"
 msgstr "A sala foi excluída"
 
-#: gajim/groupchat_control.py:2073
+#: gajim/groupchat_control.py:1986
 #, fuzzy, python-format
-msgid "You can join this room instead: xmpp:%s?join"
+msgid "You can join this group chat instead: xmpp:%s?join"
 msgstr "Você pode entrar nessa sala ao invés: %s"
 
-#: gajim/groupchat_control.py:2306
+#: gajim/groupchat_control.py:2214
 #, fuzzy
 msgid "Leave Group Chat"
 msgstr "Sair das salas"
 
-#: gajim/groupchat_control.py:2307
+#: gajim/groupchat_control.py:2215
 #, fuzzy
 msgid "Are you sure you want to leave this group chat?"
 msgstr "Você tem certeza que quer deixar a conferência \"%s\"?"
 
-#: gajim/groupchat_control.py:2308
+#: gajim/groupchat_control.py:2216
 #, fuzzy, python-format
-msgid "If you close this window, you will be disconnected from '%s'."
+msgid "If you close this window, you will leave '%s'."
 msgstr "Se você fechar esta janela, será desconectado desta conferência."
 
-#: gajim/groupchat_control.py:2314
+#: gajim/groupchat_control.py:2222 gajim/roster_window.py:5177
 msgid "_Leave"
 msgstr ""
 
-#: gajim/groupchat_control.py:2377
+#: gajim/groupchat_control.py:2280 gajim/roster_window.py:3008
 #, fuzzy, python-format
 msgid "%(jid)s has been invited to this group chat"
 msgstr "%(jid)s foi convidado para esta sala"
 
-#: gajim/groupchat_control.py:2527
+#: gajim/groupchat_control.py:2463
 #, python-format
 msgid "Kicking %s"
 msgstr "Chutando %s"
 
-#: gajim/groupchat_control.py:2528 gajim/groupchat_control.py:2829
+#: gajim/groupchat_control.py:2464 gajim/groupchat_control.py:2765
 msgid "You may specify a reason below:"
 msgstr "Você deve especificar uma razão abaixo:"
 
-#: gajim/groupchat_control.py:2828
+#: gajim/groupchat_control.py:2764
 #, python-format
 msgid "Banning %s"
 msgstr "Banindo %s"
 
-#: gajim/chat_control.py:408
+#: gajim/chat_control.py:432
 msgid "Show a list of formattings"
 msgstr "Exibe uma lista de formatações"
 
-#: gajim/chat_control.py:412
+#: gajim/chat_control.py:436
 #, fuzzy
 msgid "This contact does not support HTML"
 msgstr "Este contato não suporta transferência de arquivo."
 
-#: gajim/chat_control.py:562
+#: gajim/chat_control.py:586
 #, 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:686
+#: gajim/chat_control.py:710
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s da conferência %(room_name)s"
 
-#: gajim/chat_control.py:832
+#: gajim/chat_control.py:856
 #, fuzzy, python-format
 msgid "%(type)s encryption is active %(authenticated)s"
 msgstr "Criptografia %(type)s está ativa %(authenticated)s."
 
-#: gajim/chat_control.py:1160 gajim/chat_control.py:1168
+#: gajim/chat_control.py:1184 gajim/chat_control.py:1192
 #, fuzzy
 msgid "Close"
 msgstr "_Enviar & fechar"
 
-#: gajim/chat_control.py:1161
+#: gajim/chat_control.py:1185
 #, fuzzy, python-format
 msgid "You just received a new message from %s"
 msgstr "Você acabou de receber uma nova mensagem de \"%s\""
 
-#: gajim/chat_control.py:1163
+#: gajim/chat_control.py:1187
 #, fuzzy
 msgid ""
 "If you close this tab while having chat history disabled, this message will "
@@ -1201,16 +1165,16 @@ msgstr ""
 "Se você fechar esta aba e o histórico estiver desabilitado, esta mensagem "
 "será perdida."
 
-#: gajim/chat_control.py:1208
+#: gajim/chat_control.py:1232
 msgid "Ping?"
 msgstr "Ping?"
 
-#: gajim/chat_control.py:1211
+#: gajim/chat_control.py:1235
 #, fuzzy, python-format
 msgid "Pong! (%s seconds)"
 msgstr "Pong! (%s s.)"
 
-#: gajim/chat_control.py:1308
+#: gajim/chat_control.py:1332
 #, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -1219,270 +1183,278 @@ msgstr ""
 "Assunto: %(subject)s\n"
 "%(message)s"
 
-#: gajim/chat_control.py:1416
+#: gajim/chat_control.py:1440
 #, python-format
 msgid "%(name)s is now %(show)s %(status)s"
 msgstr "%(name)s está agora %(show)s %(status)s"
 
-#: gajim/chat_control.py:1476 gajim/data/gui/application_menu.ui:32
+#: gajim/chat_control.py:1500 gajim/data/gui/application_menu.ui:32
 #: gajim/gtk/http_upload_progress.py:35
 #, fuzzy
 msgid "File Transfer"
 msgstr "Transferência de arquivos"
 
-#: gajim/chat_control.py:1480
+#: gajim/chat_control.py:1504
 msgid "Size"
 msgstr "Tamanho"
 
-#: gajim/chat_control.py:1482 gajim/chat_control.py:1546
+#: gajim/chat_control.py:1506 gajim/chat_control.py:1566
+#: gajim/gui_interface.py:190
 #: gajim/data/gui/groupchat_invitation_received.ui:77
-#: gajim/gtk/filetransfer.py:485
+#: gajim/gtk/filetransfer.py:490
 #, fuzzy
 msgid "_Accept"
 msgstr "Aceitar"
 
-#: gajim/chat_control.py:1484 gajim/chat_control.py:1548
+#: gajim/chat_control.py:1508 gajim/chat_control.py:1568
 #: gajim/data/gui/groupchat_invitation_received.ui:62
 #, fuzzy
 msgid "_Decline"
 msgstr "_Desconectado"
 
-#: gajim/chat_control.py:1506 gajim/gui_interface.py:791
-#: gajim/gui_interface.py:821 gajim/gui_interface.py:847
+#: gajim/chat_control.py:1530 gajim/gui_interface.py:777
+#: gajim/gui_interface.py:807 gajim/gui_interface.py:833
 #: gajim/gtk/notification.py:173 gajim/gtk/notification.py:278
 msgid "File Transfer Completed"
 msgstr "Transferência do arquivo completa"
 
-#: gajim/chat_control.py:1510 gajim/gtk/filetransfer.py:259
+#: gajim/chat_control.py:1534 gajim/gtk/filetransfer.py:258
 #, fuzzy
 msgid "Open _Folder"
 msgstr "_Abrir pasta do arquivo"
 
-#: gajim/chat_control.py:1512 gajim/chat_control.py:1521
+#: gajim/chat_control.py:1536 gajim/chat_control.py:1545
+#: gajim/data/gui/groupchat_control.ui:962
+#: gajim/data/gui/groupchat_control.ui:1049
+#: gajim/data/gui/groupchat_control.ui:1155
 #, fuzzy
 msgid "_Close"
 msgstr "_Enviar & fechar"
 
-#: gajim/chat_control.py:1543 gajim/gui_interface.py:484
+#: gajim/chat_control.py:1563 gajim/gui_interface.py:473
+#: gajim/data/gui/groupchat_invitation_received.ui:42
 #: gajim/gtk/notification.py:174 gajim/gtk/notification.py:195
 #: gajim/gtk/notification.py:281
-msgid "Groupchat Invitation"
+#, fuzzy
+msgid "Group Chat Invitation"
 msgstr "Convite para conferência"
 
-#: gajim/chat_control.py:1568 gajim/roster_window.py:1954
+#: gajim/chat_control.py:1588 gajim/roster_window.py:1951
 msgid "Remote contact stopped transfer"
 msgstr "O contato remoto parou a transferência"
 
-#: gajim/chat_control.py:1570 gajim/roster_window.py:1956
+#: gajim/chat_control.py:1590 gajim/roster_window.py:1953
 msgid "Error opening file"
 msgstr "Erro abrindo arquivo"
 
-#: gajim/chat_control.py:1572 gajim/gtk/filetransfer.py:297
+#: gajim/chat_control.py:1592 gajim/gtk/filetransfer.py:296
 msgid "File transfer stopped"
 msgstr "Transferência do arquivo parada"
 
-#: gajim/chat_control.py:1575 gajim/gtk/filetransfer.py:275
-#: gajim/gtk/filetransfer.py:284
+#: gajim/chat_control.py:1595 gajim/gtk/filetransfer.py:274
+#: gajim/gtk/filetransfer.py:283
 msgid "File transfer cancelled"
 msgstr "Transferência de arquivos cancelada"
 
-#: gajim/chat_control.py:1576
+#: gajim/chat_control.py:1596
 msgid "Connection with peer cannot be established."
 msgstr "Conexão com o par não pode ser estabelecida."
 
-#: gajim/application.py:72
+#: gajim/application.py:75
 #, fuzzy
 msgid "Show the application's version"
 msgstr "Usar ícone na bandeja (também conhecido por área de notificação)"
 
-#: gajim/application.py:79
+#: gajim/application.py:82
 #, fuzzy
 msgid "Show only critical errors"
 msgstr "Mostre somente na _lista"
 
-#: gajim/application.py:86
+#: gajim/application.py:89
 msgid "Separate profile files completely (even history database and plugins)"
 msgstr ""
 
-#: gajim/application.py:94
+#: gajim/application.py:97
 msgid "Print XML stanzas and other debug information"
 msgstr ""
 
-#: gajim/application.py:101
+#: gajim/application.py:104
 #, fuzzy
 msgid "Use defined profile in configuration directory"
 msgstr "Editor de configurações avançado"
 
-#: gajim/application.py:109
+#: gajim/application.py:112
 #, fuzzy
 msgid "Set configuration directory"
 msgstr "Configuração da sala"
 
-#: gajim/application.py:117
+#: gajim/application.py:120
 msgid "Configure logging system"
 msgstr ""
 
-#: gajim/application.py:125
+#: gajim/application.py:128
 #, fuzzy
 msgid "Show all warnings"
 msgstr "Exibir todos _eventos pendentes"
 
-#: gajim/application.py:132
+#: gajim/application.py:135
 msgid "Open IPython shell"
 msgstr ""
 
-#: gajim/application.py:139
+#: gajim/application.py:142
 msgid "Pops up a window with the next pending event"
 msgstr "Exibir uma janela popup com o próximo evento pendente"
 
-#: gajim/application.py:145 gajim/data/gui/shortcuts_window.ui:203
+#: gajim/application.py:148 gajim/data/gui/shortcuts_window.ui:203
 #: data/org.gajim.Gajim.desktop.in:21
 #, fuzzy
 msgid "Start a new chat"
 msgstr "Iniciar conversa"
 
-#: gajim/application.py:152
+#: gajim/application.py:155
 msgid "Simulate loss of connectivity"
 msgstr ""
 
-#: gajim/application.py:159
+#: gajim/application.py:162
 msgid "Simulate regaining connectivity"
 msgstr ""
 
-#: gajim/application.py:201 gajim/gui_interface.py:133
+#: gajim/application.py:204 gajim/gui_interface.py:133
 msgid "Database Error"
 msgstr "Erro na base de dados"
 
-#: gajim/roster_window.py:294 gajim/roster_window.py:1030
+#: gajim/roster_window.py:291 gajim/roster_window.py:1027
 msgid "Merged accounts"
 msgstr "Juntar contas"
 
-#: gajim/roster_window.py:853 gajim/roster_window.py:1631
-#: gajim/roster_window.py:1664 gajim/roster_window.py:1715
-#: gajim/roster_window.py:1717 gajim/roster_window.py:1872
-#: gajim/roster_window.py:2531 gajim/roster_window.py:5025
-#: gajim/common/contacts.py:188 gajim/common/contacts.py:447
-#: gajim/common/helpers.py:83 gajim/gtk/discovery.py:129
-#: gajim/gtk/discovery.py:130 gajim/gtk/discovery.py:1416
+#: gajim/roster_window.py:850 gajim/roster_window.py:1628
+#: gajim/roster_window.py:1661 gajim/roster_window.py:1712
+#: gajim/roster_window.py:1714 gajim/roster_window.py:1869
+#: gajim/roster_window.py:2528 gajim/roster_window.py:4331
+#: gajim/roster_window.py:4964 gajim/common/contacts.py:204
+#: gajim/common/contacts.py:463 gajim/common/helpers.py:86
+#: gajim/gtk/discovery.py:127 gajim/gtk/discovery.py:128
+#: gajim/gtk/discovery.py:1414
 msgid "Transports"
 msgstr "Transportes"
 
-#: gajim/roster_window.py:1723 gajim/roster_window.py:1725
-#: gajim/roster_window.py:4995 gajim/gui_interface.py:1613
-#: gajim/gui_interface.py:1639 gajim/common/contacts.py:186
-#: gajim/common/helpers.py:83 gajim/common/modules/adhoc_commands.py:245
-msgid "Groupchats"
+#: gajim/roster_window.py:1720 gajim/roster_window.py:1722
+#: gajim/roster_window.py:4331 gajim/roster_window.py:4934
+#: gajim/gui_interface.py:1527 gajim/common/contacts.py:202
+#: gajim/common/helpers.py:86 gajim/common/modules/adhoc_commands.py:245
+#, fuzzy
+msgid "Group chats"
 msgstr "Salas"
 
-#: gajim/roster_window.py:2012
+#: gajim/roster_window.py:2009
 #, fuzzy
 msgid "Authorization sent"
 msgstr "Autorização foi enviada"
 
-#: gajim/roster_window.py:2013
+#: gajim/roster_window.py:2010
 #, fuzzy, python-format
 msgid "\"%s\" will now see your status."
 msgstr "Agora \"%s\" saberá seu status."
 
-#: gajim/roster_window.py:2031
+#: gajim/roster_window.py:2028
 msgid "Subscription request has been sent"
 msgstr "Solicitação de inscrição foi enviada"
 
-#: gajim/roster_window.py:2032
-#, python-format
-msgid "If \"%s\" accepts this request you will know his or her status."
+#: gajim/roster_window.py:2029
+#, fuzzy, python-format
+msgid "If \"%s\" accepts this request you will know their status."
 msgstr "Se \"%s\" aceitar esta solicitação, você saberá o status dele ou dela."
 
-#: gajim/roster_window.py:2046
+#: gajim/roster_window.py:2043
 #, fuzzy
 msgid "Authorization removed"
 msgstr "Autorização foi removida"
 
-#: gajim/roster_window.py:2047
+#: gajim/roster_window.py:2044
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Agora \"%s\" você sempre o verá como offline."
 
-#: gajim/roster_window.py:2250 gajim/roster_window.py:3504
+#: gajim/roster_window.py:2247 gajim/roster_window.py:3460
 msgid "Disconnect for Invisibility"
 msgstr ""
 
-#: gajim/roster_window.py:2251 gajim/roster_window.py:3505
+#: gajim/roster_window.py:2248 gajim/roster_window.py:3461
 msgid "You are participating in one or more group chats"
 msgstr "Você está participando em uma ou mais conferências"
 
-#: gajim/roster_window.py:2252 gajim/roster_window.py:3506
+#: gajim/roster_window.py:2249 gajim/roster_window.py:3462
 #, fuzzy
 msgid ""
-"Changing your status to invisible will result in disconnection from those "
-"group chats.\n"
+"Changing your status to invisible will result in you leaving those group "
+"chats.\n"
 "Are you sure you want to go invisible?"
 msgstr ""
 "Mudando seu status para invisível resulta na desconexão daquelas "
 "conferências. Você tem certeza que quer ir invisível?"
 
-#: gajim/roster_window.py:2257 gajim/roster_window.py:3512
-#: gajim/roster_window.py:5238 gajim/data/gui/gc_control_popup_menu.ui:120
+#: gajim/roster_window.py:2254 gajim/roster_window.py:3468
+#: gajim/data/gui/gc_control_popup_menu.ui:120
 msgid "_Disconnect"
 msgstr "_Desconectar"
 
-#: gajim/roster_window.py:2285
+#: gajim/roster_window.py:2282
 #, fuzzy
 msgid "desynced"
 msgstr "não sincronizado"
 
-#: gajim/roster_window.py:2353 gajim/data/gui/shortcuts_window.ui:224
+#: gajim/roster_window.py:2350 gajim/data/gui/shortcuts_window.ui:224
 #, fuzzy
 msgid "Quit Gajim"
 msgstr "Gajim"
 
-#: gajim/roster_window.py:2354
+#: gajim/roster_window.py:2351
 #, fuzzy
 msgid "You are about to quit Gajim"
 msgstr "Você tem certeza que deseja sair?"
 
-#: gajim/roster_window.py:2355
+#: gajim/roster_window.py:2352
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Você tem certeza que deseja sair?"
 
-#: gajim/roster_window.py:2356
+#: gajim/roster_window.py:2353
 #, fuzzy
 msgid "_Always quit when closing Gajim"
 msgstr "Sempre fechar o Gajim"
 
-#: gajim/roster_window.py:2359 gajim/roster_window.py:2455
-#: gajim/roster_window.py:2495 gajim/data/gui/systray_context_menu.ui:90
+#: gajim/roster_window.py:2356 gajim/roster_window.py:2452
+#: gajim/roster_window.py:2492 gajim/data/gui/systray_context_menu.ui:83
 #, fuzzy
 msgid "_Quit"
 msgstr "_Sair"
 
-#: gajim/roster_window.py:2448
+#: gajim/roster_window.py:2445
 #, fuzzy
 msgid "Stop File Transfers"
 msgstr "Transferência de arquivos"
 
-#: gajim/roster_window.py:2449
+#: gajim/roster_window.py:2446
 #, fuzzy
 msgid "You still have running file transfers"
 msgstr "Cancelar transferência de arquivo"
 
-#: gajim/roster_window.py:2450
+#: gajim/roster_window.py:2447
 msgid ""
 "If you quit now, the file(s) being transferred will be lost.\n"
 "Do you still want to quit?"
 msgstr ""
 
-#: gajim/roster_window.py:2488
+#: gajim/roster_window.py:2485
 #, fuzzy
 msgid "Unread Messages"
 msgstr "Eventos não lidos"
 
-#: gajim/roster_window.py:2489
+#: gajim/roster_window.py:2486
 #, fuzzy
 msgid "You still have unread messages"
 msgstr "Você tem mensagens não lidas"
 
-#: gajim/roster_window.py:2490
+#: gajim/roster_window.py:2487
 #, fuzzy
 msgid ""
 "Messages will only be available for reading them later if storing chat "
@@ -1491,20 +1463,20 @@ msgstr ""
 "Mensagens somente estarão disponíveis para leitura mais tarde se você tiver "
 "o histórico habilitado e contato na sua lista."
 
-#: gajim/roster_window.py:2760
+#: gajim/roster_window.py:2753
 msgid "You have unread messages"
 msgstr "Você tem mensagens não lidas"
 
-#: gajim/roster_window.py:2761
+#: gajim/roster_window.py:2754
 msgid "You must read them before removing this transport."
 msgstr "Você precisa lê-los antes de remover este transporte."
 
-#: gajim/roster_window.py:2764
+#: gajim/roster_window.py:2757
 #, fuzzy, python-format
 msgid "Transport '%s' will be removed"
 msgstr "Transporte \"%s\" será removido"
 
-#: gajim/roster_window.py:2765
+#: gajim/roster_window.py:2758
 #, fuzzy
 msgid ""
 "You will no longer be able to send and receive messages from and to contacts "
@@ -1513,11 +1485,11 @@ msgstr ""
 "Você não poderá mais enviar e receber mensagens dos contatos usando este "
 "transporte."
 
-#: gajim/roster_window.py:2768
+#: gajim/roster_window.py:2761
 msgid "Transports will be removed"
 msgstr "Os transportes serão removidos"
 
-#: gajim/roster_window.py:2773
+#: gajim/roster_window.py:2766
 #, fuzzy, python-format
 msgid ""
 "You will no longer be able to send and receive messages from and to contacts "
@@ -1527,22 +1499,22 @@ msgstr ""
 "Você não poderá mais enviar e receber mensagens dos contatos usando este "
 "transporte."
 
-#: gajim/roster_window.py:2777
+#: gajim/roster_window.py:2770
 #, fuzzy
 msgid "Remove Transport"
 msgstr "Exibir trans_portes"
 
-#: gajim/roster_window.py:2844
+#: gajim/roster_window.py:2837
 #, fuzzy
 msgid "Block Contact"
 msgstr "Contatos bloqueados"
 
-#: gajim/roster_window.py:2845
+#: gajim/roster_window.py:2838
 #, fuzzy
 msgid "Really block this contact?"
 msgstr "O OpenPGP está ativado para este contato?"
 
-#: gajim/roster_window.py:2846
+#: gajim/roster_window.py:2839
 #, fuzzy
 msgid ""
 "This contact will see you offline and you will not receive any messages sent "
@@ -1551,64 +1523,59 @@ msgstr ""
 "Este contato irá ver você desconectado e você não irá receber mensagens que "
 "ele enviar para você."
 
-#: gajim/roster_window.py:2851
+#: gajim/roster_window.py:2844
 #, fuzzy
 msgid "_Block Contact"
 msgstr "Contatos bloqueados"
 
-#: gajim/roster_window.py:2896
+#: gajim/roster_window.py:2889
 msgid "Rename Contact"
 msgstr "Renomear contato"
 
-#: gajim/roster_window.py:2897
+#: gajim/roster_window.py:2890
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Entre com um novo apelido para o contato %s"
 
-#: gajim/roster_window.py:2904
+#: gajim/roster_window.py:2897
 msgid "Rename Group"
 msgstr "Renomear grupo"
 
-#: gajim/roster_window.py:2905
+#: gajim/roster_window.py:2898
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Entre com um novo nome para o grupo %s"
 
-#: gajim/roster_window.py:2953 gajim/roster_window.py:2954
+#: gajim/roster_window.py:2946 gajim/roster_window.py:2947
 msgid "Remove Group"
 msgstr "Remover grupo"
 
-#: gajim/roster_window.py:2955
+#: gajim/roster_window.py:2948
 #, fuzzy, python-format
 msgid "Do you want to remove %s from the contact list?"
 msgstr "Você quer remover o grupo %s da lista?"
 
-#: gajim/roster_window.py:2956
+#: gajim/roster_window.py:2949
 #, fuzzy
 msgid "_Also remove all contacts of this group from contact list"
 msgstr "Também remove todos os contatos neste grupo da sua lista"
 
-#: gajim/roster_window.py:3044
-#, python-format
-msgid "%(jid)s has been invited in this room"
-msgstr "%(jid)s foi convidado para esta sala"
-
-#: gajim/roster_window.py:3353
+#: gajim/roster_window.py:3309
 #, fuzzy
 msgid "Remove Contact"
 msgstr "Renomear contato"
 
-#: gajim/roster_window.py:3354
+#: gajim/roster_window.py:3310
 #, fuzzy
 msgid "Remove contact from contact list"
 msgstr "Remover contato da lista"
 
-#: gajim/roster_window.py:3355
+#: gajim/roster_window.py:3311
 #, fuzzy, python-format
 msgid "You are about to remove '%(name)s' (%(jid)s) from your contact list.\n"
 msgstr "Você realmente deseja remover \"%(name)s\" (%(jid)s) da sua lista.\n"
 
-#: gajim/roster_window.py:3364 gajim/roster_window.py:3384
+#: gajim/roster_window.py:3320 gajim/roster_window.py:3340
 #, fuzzy
 msgid ""
 "By removing this contact you also remove authorization. This means the "
@@ -1617,21 +1584,21 @@ msgstr ""
 "Ao remover este contato, você também remove a autorização, fazendo com que "
 "eles sempre o vejam como offline."
 
-#: gajim/roster_window.py:3375
+#: gajim/roster_window.py:3331
 msgid "Do you want to continue?"
 msgstr "Você quer continuar?"
 
-#: gajim/roster_window.py:3386
+#: gajim/roster_window.py:3342
 #, fuzzy
 msgid "_I want this contact to know my status after removal"
 msgstr "Eu quero que este contato saiba meu status após a remoção"
 
-#: gajim/roster_window.py:3393
+#: gajim/roster_window.py:3349
 #, fuzzy
 msgid "Remove contacts from contact list"
 msgstr "Remover contato da lista"
 
-#: gajim/roster_window.py:3399
+#: gajim/roster_window.py:3355
 #, fuzzy, python-format
 msgid ""
 "By removing the following contacts, you will also remove authorization. This "
@@ -1642,25 +1609,25 @@ msgstr ""
 "Ao remover este contato, você também remove a autorização, fazendo com que "
 "eles sempre o vejam como offline."
 
-#: gajim/roster_window.py:3403
+#: gajim/roster_window.py:3359
 #, fuzzy
 msgid "Remove Contacts"
 msgstr "Renomear contato"
 
-#: gajim/roster_window.py:3423
+#: gajim/roster_window.py:3379
 msgid "No account available"
 msgstr "Conta não disponível"
 
-#: gajim/roster_window.py:3424
+#: gajim/roster_window.py:3380
 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:4060
+#: gajim/roster_window.py:4011
 msgid "Metacontacts storage not supported by your server"
 msgstr "O armazenamento de metacontatos não é suportado pelo seu servidor"
 
-#: gajim/roster_window.py:4062
+#: gajim/roster_window.py:4013
 #, fuzzy
 msgid ""
 "Your server does not support storing metacontacts information. So this "
@@ -1669,13 +1636,13 @@ msgstr ""
 "O seu servidor não suporta a gravação de informação de metacontatos, então "
 "essas informações não estarão salvas na próxima vez que você conectar."
 
-#: gajim/roster_window.py:4159
+#: gajim/roster_window.py:4110
 #, fuzzy
 msgid "You are about to create a metacontact"
 msgstr ""
 "Você está prestes a criar um metacontato. Tem certeza que quer continuar?"
 
-#: gajim/roster_window.py:4160
+#: gajim/roster_window.py:4111
 #, fuzzy
 msgid ""
 "Metacontacts are a way to regroup several contacts in one single contact. "
@@ -1686,124 +1653,115 @@ msgstr ""
 "Geralmente isso é usado quando a mesma pessoa possui muitas contas de Jabber "
 "ou transportes."
 
-#: gajim/roster_window.py:4164
+#: gajim/roster_window.py:4115
 #, fuzzy
 msgid "Create Metacontact"
 msgstr "Renomear contato"
 
-#: gajim/roster_window.py:4170
+#: gajim/roster_window.py:4121 gajim/data/gui/groupchat_creation.ui:317
 #, fuzzy
 msgid "_Create"
 msgstr "Criativo"
 
-#: gajim/roster_window.py:4287
+#: gajim/roster_window.py:4238
 msgid "Invalid file URI:"
 msgstr "Arquivo URI inválido:"
 
-#: gajim/roster_window.py:4298
+#: gajim/roster_window.py:4249
 #, fuzzy
 msgid "Send file?"
 msgstr "Enviar _arquivo"
 
-#: gajim/roster_window.py:4299
+#: gajim/roster_window.py:4250
 #, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
 msgstr[0] "Você quer enviar este arquivo para %s:"
 msgstr[1] "Você quer enviar estes arquivos para %s:"
 
-#: gajim/roster_window.py:4451
+#: gajim/roster_window.py:4401
 #, fuzzy, python-format
 msgid "Send %(from)s to %(to)s"
 msgstr "Enviar %s para %s"
 
-#: gajim/roster_window.py:4464
+#: gajim/roster_window.py:4414
 #, python-format
 msgid "Make %s first contact"
 msgstr "Tornar %s primeiro contato"
 
-#: gajim/roster_window.py:4469
+#: gajim/roster_window.py:4419
 #, fuzzy, python-format
 msgid "Make %(contact1)s and %(contact2)s metacontacts"
 msgstr "Fazer %s e %s metacontatos"
 
-#: gajim/roster_window.py:4825 gajim/roster_window.py:4923
+#: gajim/roster_window.py:4775 gajim/roster_window.py:4862
 msgid "_Change Status Message"
 msgstr "_Mudar mensagem de status"
 
-#: gajim/roster_window.py:4845
+#: gajim/roster_window.py:4795
 msgid "Publish Tune"
 msgstr "Publicar sintonia"
 
-#: gajim/roster_window.py:4856
+#: gajim/roster_window.py:4806
 #, fuzzy
 msgid "Publish Location"
 msgstr "Publicar sintonia"
 
-#: gajim/roster_window.py:4868
-#, fuzzy
-msgid "Configure Services…"
-msgstr "Configurar serviços..."
-
-#: gajim/roster_window.py:4997
+#: gajim/roster_window.py:4936
 msgid "_Maximize All"
 msgstr "_Maximizar tudo"
 
-#: gajim/roster_window.py:5004 gajim/roster_window.py:5146
+#: gajim/roster_window.py:4943 gajim/roster_window.py:5085
 msgid "Send Group M_essage"
 msgstr "Enviar m_ensagem de grupo"
 
-#: gajim/roster_window.py:5011
+#: gajim/roster_window.py:4950
 msgid "To all users"
 msgstr "Para todos os usuários"
 
-#: gajim/roster_window.py:5015
+#: gajim/roster_window.py:4954
 msgid "To all online users"
 msgstr "Para todos os usuários conectados"
 
-#: gajim/roster_window.py:5027 gajim/roster_window.py:5152
+#: gajim/roster_window.py:4966 gajim/roster_window.py:5091
 #: gajim/data/gui/gc_occupants_menu.ui:110
 #: gajim/data/gui/contact_context_menu.ui:36
 msgid "In_vite to"
 msgstr "Con_vidar para"
 
-#: gajim/roster_window.py:5162
+#: gajim/roster_window.py:5101
 msgid "_Manage Contacts"
 msgstr "_Gerenciar contatos"
 
-#: gajim/roster_window.py:5168
+#: gajim/roster_window.py:5107
 #, fuzzy
 msgid "Edit _Groups…"
 msgstr "Editar _grupos"
 
-#: gajim/roster_window.py:5189 gajim/data/gui/filetransfers.ui:12
+#: gajim/roster_window.py:5128 gajim/data/gui/filetransfers.ui:12
 #: gajim/data/gui/remove_account_window.ui:134
 msgid "_Remove"
 msgstr "_Remover"
 
-#: gajim/roster_window.py:5226
+#: gajim/roster_window.py:5165
 msgid "_Maximize"
 msgstr "_Maximizar"
 
-#: gajim/roster_window.py:5233
+#: gajim/roster_window.py:5172
 msgid "_Reconnect"
 msgstr "_Reconectar"
 
-#: gajim/roster_window.py:5254 gajim/data/gui/gc_occupants_menu.ui:170
+#: gajim/roster_window.py:5193 gajim/data/gui/gc_occupants_menu.ui:170
 #: gajim/data/gui/gc_control_popup_menu.ui:113
 #: gajim/data/gui/contact_context_menu.ui:205
 msgid "_History"
 msgstr "_Histórico"
 
-#: gajim/roster_window.py:5335 gajim/data/gui/application_menu.ui:86
+#: gajim/roster_window.py:5274 gajim/data/gui/application_menu.ui:83
 #: gajim/data/gui/history_window.ui:57
 msgid "History Manager"
 msgstr "Gerenciador de histórico"
 
-#: gajim/roster_window.py:5343
-msgid "_Join New Group Chat"
-msgstr "_Ingressar em uma nova Conferência"
-
 #: gajim/dataforms_widget.py:585
 #, fuzzy
 msgid "Unable to load image"
@@ -1926,225 +1884,242 @@ msgstr "Assunto: %s\n"
 msgid "Write a message…"
 msgstr "Enviar mensagem privada"
 
-#: gajim/message_window.py:250
+#: gajim/message_window.py:356
+#, fuzzy
+msgid "Close Tabs"
+msgstr "_Enviar & fechar"
+
+#: gajim/message_window.py:357
 msgid "You are going to close several tabs"
 msgstr "Você está prestes a fechar todas as abas"
 
-#: gajim/message_window.py:251
+#: gajim/message_window.py:358
 msgid "Do you really want to close them all?"
 msgstr "Você realmente deseja fechar todas?"
 
-#: gajim/message_window.py:539
+#: gajim/message_window.py:514
 #, fuzzy
 msgid "?Noun:Chats"
 msgstr "Conferências"
 
-#: gajim/message_window.py:543
+#: gajim/message_window.py:518
 #, fuzzy
 msgid "Group Chats"
 msgstr "Salas"
 
-#: gajim/message_window.py:547
+#: gajim/message_window.py:522
 msgid "Private Chats"
 msgstr "Conversas privadas"
 
-#: gajim/message_window.py:553
+#: gajim/message_window.py:528
 msgid "Messages"
 msgstr "Mensagens"
 
-#: gajim/gui_interface.py:173
+#: gajim/gui_interface.py:170
+#, fuzzy, 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:175
 msgid "Do you accept this request?"
 msgstr "Você aceita a solicitação?"
 
-#: gajim/gui_interface.py:175
-#, python-format
-msgid "Do you accept this request on account %s?"
+#: gajim/gui_interface.py:177
+#, fuzzy, python-format
+msgid "Do you accept this request (account: %s)?"
 msgstr "Você aceita essa requisição na conta %s?"
 
-#: gajim/gui_interface.py:178
-#, fuzzy, 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:182
+#, fuzzy
+msgid "Authorization"
+msgstr "Autorização foi enviada"
 
-#: gajim/gui_interface.py:194 gajim/gtk/notification.py:175
+#: gajim/gui_interface.py:186 gajim/gui_interface.py:420
+#: gajim/gtk/filetransfer.py:338
+#, fuzzy
+msgid "_No"
+msgstr "Nenhum"
+
+#: gajim/gui_interface.py:205 gajim/gtk/notification.py:175
 #: gajim/gtk/notification.py:197
 msgid "Connection Failed"
 msgstr "Falha na conexão"
 
-#: gajim/gui_interface.py:279 gajim/gui_interface.py:529
-msgid "Password Required"
-msgstr "Senha é obrigatória"
-
-#: gajim/gui_interface.py:280
-#, python-format
-msgid "A Password is required to join the room %s. Please type it."
-msgstr "Uma senha é requerida para ingressar na sala %s. Por favor, digite-a."
-
-#: gajim/gui_interface.py:342 gajim/gui_interface.py:346
+#: gajim/gui_interface.py:325 gajim/gui_interface.py:329
 #, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr "Erro %(code)s: %(msg)s"
 
-#: gajim/gui_interface.py:357 gajim/gui_interface.py:376
+#: gajim/gui_interface.py:340 gajim/gui_interface.py:359
 #: gajim/common/modules/message.py:122
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "erro ao enviar %(message)s ( %(error)s )"
 
-#: gajim/gui_interface.py:401 gajim/gtk/notification.py:175
+#: gajim/gui_interface.py:384 gajim/gtk/notification.py:175
 msgid "Subscription request"
 msgstr "Solicitação de inscrição"
 
-#: gajim/gui_interface.py:413 gajim/common/contacts.py:184
-#: gajim/common/helpers.py:83
+#: gajim/gui_interface.py:396 gajim/common/contacts.py:200
+#: gajim/common/helpers.py:86
 msgid "Observers"
 msgstr "Observadores"
 
-#: gajim/gui_interface.py:422
+#: gajim/gui_interface.py:405
 msgid "Authorization accepted"
 msgstr "Autorização aceita"
 
-#: gajim/gui_interface.py:423
+#: gajim/gui_interface.py:406
 #, fuzzy, python-format
 msgid "The contact \"%s\" has authorized you to see their status."
 msgstr "O contato \"%s\" autorizou você para ver seu status."
 
-#: gajim/gui_interface.py:431
-#, python-format
-msgid "Contact \"%s\" removed subscription from you"
+#: gajim/gui_interface.py:415
+#, fuzzy
+msgid "Subscription Removed"
+msgstr "Solicitação de inscrição"
+
+#: gajim/gui_interface.py:416
+#, fuzzy, python-format
+msgid "Contact '%s' removed subscription from you"
 msgstr "Contato \"%s\" removeu sua inscrição"
 
-#: gajim/gui_interface.py:432
+#: gajim/gui_interface.py:417
 #, fuzzy
 msgid ""
-"You will always see them as offline.\n"
+"You will always see this contact as offline.\n"
 "Do you want to remove them from your contact list?"
 msgstr ""
 "Você irá sempre ver ele ou ela como desconectado.\n"
 "Você quer removê-lo ou removê-la da sua lista de contatos?"
 
-#: gajim/gui_interface.py:453 gajim/gtk/notification.py:176
+#: gajim/gui_interface.py:442 gajim/gtk/notification.py:176
 msgid "Unsubscribed"
 msgstr "Desinscrever"
 
-#: gajim/gui_interface.py:465
+#: gajim/gui_interface.py:454
 #, python-format
 msgid "%(jid)s declined the invitation: %(reason)s"
 msgstr ""
 
-#: gajim/gui_interface.py:469
+#: gajim/gui_interface.py:458
 #, python-format
 msgid "%(jid)s declined the invitation"
 msgstr ""
 
-#: gajim/gui_interface.py:485
+#: gajim/gui_interface.py:474
 #, 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:506
+#: gajim/gui_interface.py:495
 #, fuzzy
 msgid "Certificate Passphrase Required"
 msgstr "O certificado expirou"
 
-#: gajim/gui_interface.py:507
+#: gajim/gui_interface.py:496
 #, python-format
 msgid "Enter the certificate passphrase for account %s"
 msgstr "Insira a senha do certificado para a conta %s"
 
-#: gajim/gui_interface.py:516 gajim/gtk/accounts.py:963
+#: gajim/gui_interface.py:505 gajim/gtk/accounts.py:966
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Entre com a senha para conta %s"
 
-#: gajim/gui_interface.py:529 gajim/gtk/accounts.py:964
+#: gajim/gui_interface.py:518
+msgid "Password Required"
+msgstr "Senha é obrigatória"
+
+#: gajim/gui_interface.py:518 gajim/gtk/accounts.py:967
 msgid "Save password"
 msgstr "Salvar senha"
 
-#: gajim/gui_interface.py:601 gajim/gui_interface.py:632
+#: gajim/gui_interface.py:587 gajim/gui_interface.py:618
+#: gajim/gtk/filetransfer.py:332 gajim/gtk/filetransfer.py:333
 #: gajim/gtk/notification.py:173 gajim/gtk/notification.py:276
 msgid "File Transfer Error"
 msgstr "Erro na transferência de arquivos"
 
-#: gajim/gui_interface.py:666
+#: gajim/gui_interface.py:652
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s quer te enviar um arquivo."
 
-#: gajim/gui_interface.py:668 gajim/gtk/filetransfer.py:479
+#: gajim/gui_interface.py:654 gajim/gtk/filetransfer.py:484
 #: gajim/gtk/notification.py:172 gajim/gtk/notification.py:274
 msgid "File Transfer Request"
 msgstr "Solicitação de transferência de arquivos"
 
-#: gajim/gui_interface.py:767
+#: gajim/gui_interface.py:753
 #, fuzzy
 msgid "Remote Contact Stopped Transfer"
 msgstr "O contato remoto parou a transferência"
 
-#: gajim/gui_interface.py:772
+#: gajim/gui_interface.py:758
 #, fuzzy
 msgid "Error Opening File"
 msgstr "Erro abrindo arquivo"
 
-#: gajim/gui_interface.py:782
+#: gajim/gui_interface.py:768
 #, fuzzy
 msgid "SSL Certificate Error"
 msgstr "Erro de certificado SSL"
 
-#: gajim/gui_interface.py:795 gajim/gui_interface.py:826
-#: gajim/gui_interface.py:853 gajim/gtk/notification.py:174
+#: gajim/gui_interface.py:781 gajim/gui_interface.py:812
+#: gajim/gui_interface.py:839 gajim/gtk/notification.py:174
 #: gajim/gtk/notification.py:279
 msgid "File Transfer Stopped"
 msgstr "Transferência do arquivo parada"
 
-#: gajim/gui_interface.py:799
+#: gajim/gui_interface.py:785
 #, fuzzy
 msgid "File Transfer Failed"
 msgstr "Transferência de arquivos"
 
-#: gajim/gui_interface.py:822
+#: gajim/gui_interface.py:808
 #, fuzzy, python-format
 msgid "%(filename)s received from %(name)s."
 msgstr "Transferência de arquivo de %(filename)s de %(name)s parou."
 
-#: gajim/gui_interface.py:827
+#: gajim/gui_interface.py:813
 #, 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:833
+#: gajim/gui_interface.py:819
 #, fuzzy, python-format
 msgid "File transfer of %(filename)s from %(name)s failed."
 msgstr "Transferência de arquivo de %(filename)s de %(name)s parou."
 
-#: gajim/gui_interface.py:848
+#: gajim/gui_interface.py:834
 #, 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:854
+#: gajim/gui_interface.py:840
 #, 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:860
+#: gajim/gui_interface.py:846
 #, fuzzy, python-format
 msgid "File transfer of %(filename)s to %(name)s failed."
 msgstr "Transferência de arquivo de %(filename)s para %(name)s parado."
 
-#: gajim/gui_interface.py:971
+#: gajim/gui_interface.py:957
 msgid "Username Conflict"
 msgstr "Conflito de nome de usuário"
 
-#: gajim/gui_interface.py:972
+#: gajim/gui_interface.py:958
 msgid "Please type 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:995
+#: gajim/gui_interface.py:981
 msgid "Resource Conflict"
 msgstr "Conflito de recurso"
 
-#: gajim/gui_interface.py:996
+#: gajim/gui_interface.py:982
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
@@ -2152,32 +2127,32 @@ msgstr ""
 "Você já está conectado a essa conta com o mesmo recurso. Por favor digite um "
 "novo"
 
-#: gajim/gui_interface.py:1053
+#: gajim/gui_interface.py:1039
 #, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s quer iniciar uma conversa com voz."
 
-#: gajim/gui_interface.py:1055
+#: gajim/gui_interface.py:1041
 msgid "Voice Chat Request"
 msgstr "Solicitação de conversa com voz"
 
-#: gajim/gui_interface.py:1123 gajim/gtk/account_wizard.py:312
+#: gajim/gui_interface.py:1109 gajim/gtk/account_wizard.py:312
 msgid "Certificate Already in File"
 msgstr "Certificado já está no arquivo"
 
-#: gajim/gui_interface.py:1124 gajim/gtk/account_wizard.py:313
+#: gajim/gui_interface.py:1110 gajim/gtk/account_wizard.py:313
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr ""
 "Este certificado já está no arquivo %s, então, ele não será adicionado "
 "novamente."
 
-#: gajim/gui_interface.py:1145
+#: gajim/gui_interface.py:1131
 #, fuzzy, python-format
 msgid "The authenticity of the %s certificate could be invalid"
 msgstr "A autenticidade do certificado %s pode ser inválida."
 
-#: gajim/gui_interface.py:1148
+#: gajim/gui_interface.py:1134
 #, python-format
 msgid ""
 "\n"
@@ -2186,7 +2161,7 @@ msgstr ""
 "\n"
 "Erro de SSL desconhecido: %d"
 
-#: gajim/gui_interface.py:1150
+#: gajim/gui_interface.py:1136
 #, python-format
 msgid ""
 "\n"
@@ -2195,11 +2170,11 @@ msgstr ""
 "\n"
 "Erro de SSL: <b>%s</b>"
 
-#: gajim/gui_interface.py:1155
+#: gajim/gui_interface.py:1141
 msgid "Error verifying SSL certificate"
 msgstr "Erro ao verificar o certificado SSL"
 
-#: gajim/gui_interface.py:1156
+#: gajim/gui_interface.py:1142
 #, fuzzy, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your XMPP server: "
@@ -2210,7 +2185,7 @@ msgstr ""
 "%(error)s\n"
 "Você ainda deseja conectar-se a este servidor?"
 
-#: gajim/gui_interface.py:1160 gajim/gtk/account_wizard.py:412
+#: gajim/gui_interface.py:1146 gajim/gtk/account_wizard.py:413
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -2225,188 +2200,177 @@ msgstr ""
 "Impressão digital SHA-256 do certificado:\n"
 "%(sha256)s"
 
-#: gajim/gui_interface.py:1166
+#: gajim/gui_interface.py:1152
 msgid "Ignore this error for this certificate."
 msgstr "Ignorar este erro para este certificado."
 
-#: gajim/gui_interface.py:1174
+#: gajim/gui_interface.py:1160
 #, python-format
 msgid "SSL Certificate Verification for %s"
 msgstr "Verificação de certificado SSL para %s"
 
-#: gajim/gui_interface.py:1442 gajim/gtk/join_groupchat.py:235
-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/gui_interface.py:1448
-#, fuzzy
-msgid "JID is not a Groupchat"
-msgstr "Isto não é uma conferência"
-
-#: gajim/gui_interface.py:1579
-msgid "This is not a group chat"
-msgstr "Isto não é uma conferência"
-
-#: gajim/gui_interface.py:1580
-#, python-format
-msgid ""
-"%(room_jid)s is already in your roster. Please check if %(room_jid)s is a "
-"correct group chat name. If it is, delete it from your roster and try "
-"joining the group chat again."
-msgstr ""
-
-#: gajim/gui_interface.py:1604 gajim/dialog_messages.py:58
+#: gajim/gui_interface.py:1577
 msgid "You cannot join a group chat while you are invisible"
 msgstr "Você não pode ingressar em uma sala enquanto estiver invisível"
 
-#: gajim/gui_interface.py:2037
+#: gajim/gui_interface.py:1976
 msgid "Could not save your settings and preferences"
 msgstr "Impossível salvar suas preferências"
 
-#: gajim/gui_interface.py:2098
+#: gajim/gui_interface.py:2037
 msgid "Gajim: IPython Console"
 msgstr ""
 
-#: gajim/dialog_messages.py:32
+#: gajim/dialog_messages.py:31 gajim/dialog_messages.py:36
+#: gajim/gtk/single_message.py:305 gajim/gtk/account_wizard.py:229
 #, fuzzy
-msgid "You can not start a new conversation unless you are connected."
-msgstr ""
-"Você não pode ingressar em uma sala de conferência até que esteja conectado."
-
-#: gajim/dialog_messages.py:36 gajim/dialog_messages.py:41
-#: gajim/gtk/single_message.py:305 gajim/gtk/join_groupchat.py:211
-#: gajim/gtk/account_wizard.py:229
-msgid "Invalid JID"
-msgstr "JID inválido:"
+msgid "Invalid XMPP Address"
+msgstr "Arquivo inválido"
 
-#: gajim/dialog_messages.py:42 gajim/gtk/single_message.py:306
-#, python-format
-msgid "It is not possible to send a message to %s, this JID is not valid."
+#: gajim/dialog_messages.py:37
+#, 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/dialog_messages.py:47
-msgid "Unread events"
+#: gajim/dialog_messages.py:42
+#, fuzzy
+msgid "Unread Events"
 msgstr "Eventos não lidos"
 
-#: gajim/dialog_messages.py:48
-msgid "Read all pending events before removing this account."
+#: gajim/dialog_messages.py:43
+#, fuzzy
+msgid "Read or acknowledge all pending events before removing this account."
 msgstr "Ler todos os eventos pendentes antes de remover esta conta."
 
-#: gajim/dialog_messages.py:52
+#: gajim/dialog_messages.py:48
 #, fuzzy
 msgid "Invalid Form"
 msgstr "Sala inválida"
 
-#: gajim/dialog_messages.py:53
+#: gajim/dialog_messages.py:49
 #, fuzzy
 msgid "The form is not filled correctly."
 msgstr "O apelido possui caracteres não permitidos."
 
-#: gajim/dialog_messages.py:57 gajim/common/helpers.py:309
+#: gajim/dialog_messages.py:53 gajim/common/helpers.py:315
 msgid "Invisible"
 msgstr "Invisível"
 
-#: gajim/dialog_messages.py:62
-msgid "A connection is not available"
-msgstr "Uma conexão não está disponível"
+#: gajim/dialog_messages.py:54
+#, fuzzy
+msgid "You cannot join a group chat while being invisible."
+msgstr "Você não pode ingressar em uma sala enquanto estiver invisível"
+
+#: gajim/dialog_messages.py:58
+#, fuzzy
+msgid "No Connection Available"
+msgstr "Conexão não disponível"
 
-#: gajim/dialog_messages.py:63
+#: gajim/dialog_messages.py:59
 msgid "Your message can not be sent until you are connected."
 msgstr "Sua mensagem não pode ser enviada até que esteja conectado."
 
-#: gajim/dialog_messages.py:67
-#, fuzzy
-msgid "JID already in list"
-msgstr "Jabber ID já existente na lista"
+#: gajim/dialog_messages.py:63
+msgid "XMPP Address Already in List"
+msgstr ""
 
-#: gajim/dialog_messages.py:68
+#: gajim/dialog_messages.py:64
 #, fuzzy
-msgid "The JID you entered is already in the list. Choose another one."
+msgid ""
+"The XMPP Address you entered is already in the list. Please choose another "
+"one."
 msgstr "O Jabber ID que você forneceu já está na lista. Escolha outro."
 
-#: gajim/dialog_messages.py:72
-msgid "Invalid answer"
+#: gajim/dialog_messages.py:69
+#, fuzzy
+msgid "Invalid Answer"
 msgstr "Resposta inválida"
 
-#: gajim/dialog_messages.py:73
+#: gajim/dialog_messages.py:70
 #, python-format
 msgid "Transport %(name)s answered wrongly to register request: %(error)s"
 msgstr ""
 "O transporte %(name)s respondeu erroneamente à requisição de registro do "
 "pedido: %(error)s"
 
-#: gajim/dialog_messages.py:78
+#: gajim/dialog_messages.py:75
 #, fuzzy
 msgid "Wrong Custom Hostname"
 msgstr "Usa nome de máquina/porta customizados"
 
-#: gajim/dialog_messages.py:79
-#, python-format
-msgid "Wrong custom hostname \"%s\". Ignoring it."
+#: gajim/dialog_messages.py:76
+#, fuzzy, python-format
+msgid "Custom hostname \"%s\" is wrong. It will be ignored."
 msgstr "Nome de host incorreto \"%s\". Ignorando."
 
-#: gajim/dialog_messages.py:83
-msgid "Error while removing privacy list"
+#: gajim/dialog_messages.py:80
+#, fuzzy
+msgid "Error While Removing Privacy List"
 msgstr "Erro ao remover lista de privacidade"
 
-#: gajim/dialog_messages.py:84
-#, python-format
+#: gajim/dialog_messages.py:81
+#, fuzzy, python-format
 msgid ""
-"Privacy list %s has not been removed. It is maybe active in one of your "
-"connected resources. Deactivate it and try again."
+"Privacy list %s has not been removed. It is probably active in one of your "
+"connected resources. Please deactivate it and try again."
 msgstr ""
 "A lista de privacidade %s não foi removida. Ela pode estar ativa em um ou "
 "mais recursos conectados. Desative-os e tente novamente."
 
-#: gajim/dialog_messages.py:90
-msgid "Invisibility not supported"
+#: gajim/dialog_messages.py:87
+#, fuzzy
+msgid "Invisibility Not Supported"
 msgstr "Sem suporte a invisibilidade"
 
-#: gajim/dialog_messages.py:91
-#, python-format
-msgid "Account %s doesn't support invisibility."
+#: gajim/dialog_messages.py:88
+#, fuzzy, python-format
+msgid "This account %s doesn't support invisibility."
 msgstr "A conta %s não suporta invisibilidade."
 
-#: gajim/dialog_messages.py:95
-msgid "Unregister failed"
+#: gajim/dialog_messages.py:92
+#, fuzzy
+msgid "Unregister Failed"
 msgstr "Falha ao cancelar registro"
 
-#: gajim/dialog_messages.py:96
-#, python-format
-msgid "Unregistration with server %(server)s failed: %(error)s"
+#: gajim/dialog_messages.py:93
+#, fuzzy, python-format
+msgid "Unregistration on server %(server)s failed: %(error)s"
 msgstr "Cancelamento de registro com o servidor %(server)s falhou: %(error)s:"
 
-#: gajim/dialog_messages.py:100
-msgid "Registration succeeded"
+#: gajim/dialog_messages.py:97
+#, fuzzy
+msgid "Registration Succeeded"
 msgstr "Registro realizado com sucesso"
 
-#: gajim/dialog_messages.py:101
-#, python-format
-msgid "Registration with agent %s succeeded"
+#: gajim/dialog_messages.py:98
+#, fuzzy, python-format
+msgid "Registration with agent %s succeeded."
 msgstr "Registro com o agente %s completado com sucesso"
 
-#: gajim/dialog_messages.py:105 gajim/gtk/service_registration.py:215
-msgid "Registration failed"
+#: gajim/dialog_messages.py:102
+#, fuzzy
+msgid "Registration Failed"
 msgstr "Falha ao registrar"
 
-#: gajim/dialog_messages.py:106
+#: gajim/dialog_messages.py:103
 #, python-format
 msgid ""
 "Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
 msgstr ""
 "Registro com o agente %(agent)s falhou com erro %(error)s: %(error_msg)s"
 
-#: gajim/dialog_messages.py:111
+#: gajim/dialog_messages.py:108
 #, fuzzy
 msgid "Unable to Join Group Chat"
 msgstr "Impossível ingressar na sala"
 
-#: gajim/dialog_messages.py:116
-msgid "GStreamer error"
-msgstr ""
+#: gajim/dialog_messages.py:113
+#, fuzzy
+msgid "GStreamer Error"
+msgstr "Erro na base de dados"
 
-#: gajim/dialog_messages.py:117
+#: gajim/dialog_messages.py:114
 #, python-format
 msgid ""
 "Error: %(error)s\n"
@@ -2415,19 +2379,21 @@ msgstr ""
 "Erro: %(error)s\n"
 "Depuração: %(debug)s"
 
-#: gajim/dialog_messages.py:121
-msgid "Wrong host"
+#: gajim/dialog_messages.py:118
+#, fuzzy
+msgid "Wrong Host"
 msgstr "Servidor errado"
 
-#: gajim/dialog_messages.py:122
+#: gajim/dialog_messages.py:119
 msgid "Invalid local address? :-O"
 msgstr "Endereço local inválido? :-O"
 
-#: gajim/dialog_messages.py:126
-msgid "Avahi error"
+#: gajim/dialog_messages.py:123
+#, fuzzy
+msgid "Avahi Error"
 msgstr "Erro do Avahi"
 
-#: gajim/dialog_messages.py:127
+#: gajim/dialog_messages.py:124
 #, python-format
 msgid ""
 "%s\n"
@@ -2436,67 +2402,67 @@ msgstr ""
 "%s\n"
 "Mensagens link-local podem não funcionar adequadamente."
 
-#: gajim/dialog_messages.py:131 gajim/dialog_messages.py:136
+#: gajim/dialog_messages.py:128 gajim/dialog_messages.py:133
 #, fuzzy
-msgid "Could not request upload slot"
+msgid "Could not request upload slot for HTTP File Upload"
 msgstr "Impossível iniciar o serviço local"
 
-#: gajim/dialog_messages.py:137
-msgid "Got unexpected response from server (see log)"
+#: gajim/dialog_messages.py:134
+msgid "Got unexpected response from server (see log)."
 msgstr ""
 
-#: gajim/dialog_messages.py:141 gajim/dialog_messages.py:146
+#: gajim/dialog_messages.py:138 gajim/dialog_messages.py:143
 #, fuzzy
-msgid "Could not open file"
+msgid "Could not Open File"
 msgstr "A imagem não pode ser carregada"
 
-#: gajim/dialog_messages.py:142
-msgid "Exception raised while opening file (see log)"
+#: gajim/dialog_messages.py:139
+msgid "Exception raised while trying to open file (see log)."
 msgstr ""
 
-#: gajim/dialog_messages.py:151
-msgid "Unsecure"
-msgstr ""
+#: gajim/dialog_messages.py:148
+#, fuzzy
+msgid "Not Secure"
+msgstr "Não iniciado"
 
-#: gajim/dialog_messages.py:152
+#: gajim/dialog_messages.py:149
 #, fuzzy
-msgid "Server returned unsecure transport (HTTP)"
+msgid "The server returned an insecure transport (HTTP)."
 msgstr "O serviço retornou um erro."
 
-#: gajim/dialog_messages.py:156
+#: gajim/dialog_messages.py:153
 #, fuzzy
-msgid "Could not upload file"
+msgid "Could not Upload File"
 msgstr "A imagem não pode ser carregada"
 
-#: gajim/dialog_messages.py:157
+#: gajim/dialog_messages.py:154
 #, python-format
 msgid "HTTP response code from server: %s"
 msgstr ""
 
-#: gajim/dialog_messages.py:161
+#: gajim/dialog_messages.py:158
 msgid "Upload Error"
 msgstr ""
 
-#: gajim/dialog_messages.py:166
+#: gajim/dialog_messages.py:163
 #, fuzzy
 msgid "Encryption Error"
 msgstr "Criptografia habilitada"
 
-#: gajim/dialog_messages.py:167
-#, fuzzy
-msgid "For the chosen encryption there is no encryption method available"
-msgstr "Uma conexão não está disponível"
+#: gajim/dialog_messages.py:164
+msgid "There is no encryption method available for the chosen encryption."
+msgstr ""
 
-#: gajim/dialog_messages.py:171
+#: gajim/dialog_messages.py:169
 #, fuzzy
-msgid "Avatar upload failed"
+msgid "Avatar Upload Failed"
 msgstr "Publicação do vCard falhou"
 
-#: gajim/privatechat_control.py:204
+#: gajim/privatechat_control.py:207
 msgid "Sending private message failed"
 msgstr "Falha ao enviar uma mensagem privada"
 
-#: gajim/privatechat_control.py:206
+#: gajim/privatechat_control.py:209
 #, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr ""
@@ -2521,7 +2487,7 @@ msgstr "exibir ajuda no comando"
 
 #: gajim/gajim_remote.py:85
 #, fuzzy
-msgid "Lists all contacts in roster, one for each line"
+msgid "Lists all contacts in the contact list, one for each line"
 msgstr ""
 "Exibir uma lista de todos os contatos na lista. Cada contato aparecerá em "
 "uma linha separada"
@@ -2604,11 +2570,13 @@ msgstr ""
 
 #: gajim/gajim_remote.py:118
 #, fuzzy
-msgid "Sends new chat message to a contact in the roster. Account is optional."
+msgid ""
+"Sends new chat message to a contact in the contact list. Account is optional."
 msgstr "Enviar uma mensagem ao contato"
 
 #: gajim/gajim_remote.py:120 gajim/gajim_remote.py:130
-msgid "JID of the contact that will receive the message"
+#, fuzzy
+msgid "XMPP Address of the contact that will receive the message"
 msgstr "JID do contato que irá receber a mensagem"
 
 #: gajim/gajim_remote.py:121 gajim/gajim_remote.py:132
@@ -2622,8 +2590,10 @@ msgid "if specified, the message will be sent using this account"
 msgstr "se especificada, a mensagem será enviada usando esta conta"
 
 #: gajim/gajim_remote.py:127
-msgid "Sends a chat message to someone on your roster. Account is optional."
-msgstr ""
+#, fuzzy
+msgid ""
+"Sends a chat message to someone on your contact list. Account is optional."
+msgstr "Enviar uma mensagem ao contato"
 
 #: gajim/gajim_remote.py:131
 msgid "subject"
@@ -2634,12 +2604,14 @@ msgid "message subject"
 msgstr "assunto da mensagem"
 
 #: gajim/gajim_remote.py:138
-msgid "Sends new message to a groupchat you've joined."
+#, fuzzy
+msgid "Sends new message to a group chat you've joined."
 msgstr ""
 "Envia uma nova messagem para uma conferência em que você tiver ingressado."
 
 #: gajim/gajim_remote.py:140
-msgid "JID of the room that will receive the message"
+#, fuzzy
+msgid "XMPP Address of the group chat that will receive the message"
 msgstr "O JID do contato que receberá a mensagem"
 
 #: gajim/gajim_remote.py:147
@@ -2648,7 +2620,8 @@ msgstr "Informações detalhadas do contato"
 
 #: gajim/gajim_remote.py:149 gajim/gajim_remote.py:162
 #: gajim/gajim_remote.py:192
-msgid "JID of the contact"
+#, fuzzy
+msgid "XMPP Address of the contact"
 msgstr "JID do contato"
 
 #: gajim/gajim_remote.py:153
@@ -2709,7 +2682,8 @@ msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Escreve o estado atual das preferências do Gajim em um arquivo .config"
 
 #: gajim/gajim_remote.py:190
-msgid "Removes contact from roster"
+#, fuzzy
+msgid "Removes contact from contact list"
 msgstr "Remover contato da lista"
 
 #: gajim/gajim_remote.py:193
@@ -2757,9 +2731,9 @@ msgid "Missing argument \"contact_jid\""
 msgstr "Argumento não informado \"contact_jid\""
 
 #: gajim/gajim_remote.py:275
-#, python-format
+#, fuzzy, python-format
 msgid ""
-"'%s' is not in your roster.\n"
+"'%s' is not in your contact list.\n"
 "Please specify account for sending the message."
 msgstr ""
 "'%s' não está em sua lista.\n"
@@ -2985,12 +2959,12 @@ msgstr "Fim da semana"
 msgid "Weekend!"
 msgstr "Final de semana!"
 
-#: gajim/common/logger.py:192 gajim/common/logger.py:197
+#: gajim/common/logger.py:189 gajim/common/logger.py:194
 #, 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:217
+#: gajim/common/logger.py:214
 #, fuzzy, python-format
 msgid "Creating %s"
 msgstr "Excluindo %s"
@@ -3064,22 +3038,22 @@ msgstr "%(nickname)s desconectou"
 msgid "Contact Signed Out"
 msgstr "Contato desconectou"
 
-#: gajim/common/contacts.py:455
-msgid "Not in roster"
-msgstr "Fora da lista"
-
 #: gajim/common/config.py:80
+#, fuzzy
 msgid ""
 "Show desktop notification even when a chat window is opened for this contact "
-"and does not have focus"
+"and does not have focus."
 msgstr ""
+"Permite janela/notificação quando eu estou _afastado/ND/ocupado/invisível"
 
 #: gajim/common/config.py:81
-msgid "Play sound when user is busy"
+#, fuzzy
+msgid "Play sound even when being busy."
 msgstr "Tocar som quando usuário estiver ocupado"
 
 #: gajim/common/config.py:83
-msgid "Show only online and free for chat contacts in roster."
+#, fuzzy
+msgid "Show only online and free for chat contacts in the contact list."
 msgstr "Exibir somente contatos disponíveis e livres para conversa na lista."
 
 #: gajim/common/config.py:86
@@ -3087,12 +3061,15 @@ msgid "Time in minutes, after which your status changes to away."
 msgstr "Tempo em minutos, depois do qual seu status muda para a afastado."
 
 #: gajim/common/config.py:87
-msgid "$S (Away as a result of being idle more than $T min)"
+#, fuzzy
+msgid "$S (Away: Idle more than $T min)"
 msgstr "$S (Afastado em conseqüência de estar inativo há mais de $T min)"
 
 #: gajim/common/config.py:87
 #, fuzzy
-msgid "$S will be replaced by current status message, $T by autoawaytime."
+msgid ""
+"$S will be replaced by current status message, $T by the 'autoawaytime' "
+"value."
 msgstr ""
 "$S será substituída pela mensagem de status atual, $T pelo tempo de ausência "
 "automática."
@@ -3102,12 +3079,14 @@ msgid "Time in minutes, after which your status changes to not available."
 msgstr "Tempo em minutos, depois do qual seu status muda para não disponível."
 
 #: gajim/common/config.py:90
-msgid "$S (Not available as a result of being idle more than $T min)"
+#, fuzzy
+msgid "$S (Not available: Idle more than $T min)"
 msgstr "$S (Não disponível em conseqüência de estar inativo há mais de $T min)"
 
 #: gajim/common/config.py:90
 #, fuzzy
-msgid "$S will be replaced by current status message, $T by autoxatime."
+msgid ""
+"$S will be replaced by current status message, $T by the 'autoxatime' value."
 msgstr ""
 "$S será substituída pela mensagem de status atual, $T pelo tempo de "
 "indisponibilidade automática."
@@ -3115,62 +3094,64 @@ msgstr ""
 #: gajim/common/config.py:93
 #, fuzzy
 msgid ""
-"When to show notification area icon. Can be 'never', 'on_event', 'always'."
+"When to show the notification area icon. Can be 'never', 'on_event', and "
+"'always'."
 msgstr ""
 "Quando exibir um ícone na área de notificação. Pode ser \"nunca\", com "
 "\"eventos\" e \"sempre\"."
 
 #: gajim/common/config.py:94
-msgid "Allow to hide the roster window even if the tray icon is not shown."
+msgid ""
+"Allow to hide the contact list window even if the notification area icon is "
+"not shown."
 msgstr ""
 
 #: gajim/common/config.py:97
 #, fuzzy
-msgid "Contact signed in notification color."
-msgstr "Mo_strar somente na lista"
+msgid "Notification color for contacts signing in."
+msgstr "Notifique-me sobre contatos ao _conectar"
 
 #: gajim/common/config.py:98
 #, fuzzy
-msgid "Contact signout notification color"
-msgstr "Mo_strar somente na lista"
+msgid "Notification color for contacts signing out."
+msgstr "Notifique-me sobre contatos ao _desconectar"
 
 #: gajim/common/config.py:99
 #, fuzzy
-msgid "New message notification color."
+msgid "Notification color for new message notification."
 msgstr "Pré-visualizar novas mensagens em uma janela popup?"
 
 #: gajim/common/config.py:100
 #, fuzzy
-msgid "File transfer request notification color."
-msgstr "Solicitação de transferência de arquivos"
+msgid "Notification color for file transfer request."
+msgstr "_Notificar-me quando a transmissão do arquivo terminar"
 
 #: gajim/common/config.py:101
 #, fuzzy
-msgid "File transfer error notification color."
-msgstr "Transferência de arquivos cancelada"
+msgid "Notification color for file transfer errors."
+msgstr "_Notificar-me quando a transmissão do arquivo terminar"
 
 #: gajim/common/config.py:102
-#, fuzzy
-msgid "File transfer complete or stopped notification color."
-msgstr "Exibir um alerta visual quanto uma transferência de arquivo terminar"
+msgid "Notification color for stopped or completed file transfers."
+msgstr ""
 
 #: gajim/common/config.py:103
-#, fuzzy
-msgid "Groupchat invitation notification color"
-msgstr "Convite para conferência"
+msgid "Notification color for group chat invitations."
+msgstr ""
 
 #: gajim/common/config.py:104
 #, fuzzy
-msgid "Background color of status changed notification"
+msgid "Notification background color for changed status."
 msgstr "Cor de fundo dos contatos quando eles simplesmente conectarem."
 
 #: gajim/common/config.py:105
-msgid "Other dialogs color."
+msgid "Notification color for other dialogs."
 msgstr ""
 
 #: gajim/common/config.py:106
+#, fuzzy
 msgid ""
-"List (space separated) of rows (accounts and groups) that are collapsed."
+"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 agrupados."
 
@@ -3178,8 +3159,10 @@ msgstr ""
 msgid "default"
 msgstr "padrão"
 
-#: gajim/common/config.py:113
-msgid "Language used by speller"
+#: gajim/common/config.py:113 gajim/common/config.py:424
+#: gajim/common/config.py:431
+#, fuzzy
+msgid "Language used for spell checking."
 msgstr "Idioma usado pelo corretor ortográfico"
 
 #: gajim/common/config.py:114
@@ -3193,10 +3176,11 @@ msgstr ""
 "'nunca' - nunca exibir a hora."
 
 #: gajim/common/config.py:115
+#, fuzzy
 msgid ""
 "Print time in chats using Fuzzy Clock. Value of fuzziness from 1 to 4, or 0 "
-"to disable fuzzyclock. 1 is the most precise clock, 4 the least precise one. "
-"This is used only if print_time is 'sometimes'."
+"to disable Fuzzy Clock. 1 is the most precise clock, 4 the least precise "
+"one. This is used only if 'print_time' is 'sometimes'."
 msgstr ""
 "Exibir a hora nas conversas usando relógio impreciso. O valor de imprecisão "
 "varia de 1 a 4, 0 desabilita a função. 1 é relógio mais preciso, 4 é o "
@@ -3213,16 +3197,18 @@ msgstr "Aproveite os pare * /_ como caracteres de formatação."
 #: gajim/common/config.py:120
 #, fuzzy
 msgid ""
-"If true, do not remove */_ . So *abc* will be bold but with * * not removed."
+"If enabled, do not remove */_ . So *abc* will be bold but with * * not "
+"removed."
 msgstr ""
 "Se verdadeiro, não remova */_. Assim *ABC* será negrito mas com * * não "
 "removido."
 
 #: gajim/common/config.py:123
+#, fuzzy
 msgid ""
-"Uses ReStructured text markup to send HTML, plus ascii formatting if "
-"selected. For syntax, see http://docutils.sourceforge.net/docs/ref/rst/"
-"restructuredtext.html (If you want to use this, install docutils)"
+"Uses ReStructured text markup to send HTML, plus ASCII formatting if "
+"selected. Needs docutils installed (for syntax, see http://docutils."
+"sourceforge.net/docs/ref/rst/restructuredtext.html)."
 msgstr ""
 "Usar marcação de texto ReStructured para HTML, mais formatação ASCII, se "
 "selecionada. Para informações sobre sintaxe, veja http://docutils."
@@ -3230,37 +3216,40 @@ msgstr ""
 "isso, instale o docutils)"
 
 #: gajim/common/config.py:132
+#, fuzzy
 msgid ""
-"Character to add after nickname when using nick completion (tab) in group "
-"chat."
+"Character to add after nickname when using nickname completion (tab) in "
+"group chat."
 msgstr ""
 "Caracter a adicionar ao apelido quando se estiver usando o recurso de "
 "completar apelido (tecla Tab) na conferência."
 
 #: gajim/common/config.py:133
+#, fuzzy
 msgid ""
-"Character to propose to add after desired nickname when desired nickname is "
-"used by someone else in group chat."
+"Character to propose to add after desired nickname when nickname is already "
+"used in group chat."
 msgstr ""
 "O caracter a ser proposto para adicionar ao final do apelido desejado quando "
 "ele já estiver sendo usado por outra pessoa na conferência."
 
 #: gajim/common/config.py:155
 msgid ""
-"If true, Gajim will save roster position when hiding roster, and restore it "
-"when showing roster."
+"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:161
-msgid "Place the roster on the right in single window mode"
+msgid "Place the contact list on the right in single window mode"
 msgstr ""
 
 #: gajim/common/config.py:167
 #, fuzzy
 msgid ""
-"This option let you customize timestamp that is printed in conversation. For "
-"example \"[%H:%M] \" will show \"[hour:minute] \". See python doc on "
-"strftime for full documentation: http://docs.python.org/lib/module-time.html"
+"This option lets you customize the timestamp that is printed in "
+"conversation. For example '[%H:%M] ' will show '[hour:minute] '. See python "
+"doc on strftime for full documentation (https://docs.python.org/3/library/"
+"time.html)."
 msgstr ""
 "Esta opção lhe permite personalizar o carimbo de tempo que é exibido na "
 "conversação. Por exemplo: \"[%H:%M]\" exibirá \"[hora:minuto]\". Procure por "
@@ -3268,267 +3257,266 @@ msgstr ""
 "html"
 
 #: gajim/common/config.py:168
-msgid "Characters that are printed before the nickname in conversations"
+#, fuzzy
+msgid "Characters that are printed before the nickname in conversations."
 msgstr "Os caracteres que são exibidos antes do apelido nas conversas"
 
 #: gajim/common/config.py:169
-msgid "Characters that are printed after the nickname in conversations"
+#, fuzzy
+msgid "Characters that are printed after the nickname in conversations."
 msgstr "Os caracteres que são exibidos após o apelidos nas conversas"
 
 #: gajim/common/config.py:170
-msgid "Add * and [n] in roster title?"
-msgstr "Adicionar * e [n] no título da lista?"
+#, fuzzy
+msgid "If enabled, Gajim will add * and [n] in contact list window title."
+msgstr "Se marcado, Gajim exibirá o humor dos contatos na janela da lista"
 
 #: gajim/common/config.py:171
 #, fuzzy
 msgid ""
-"How many history messages should be restored when a chat tab/window is "
-"reopened?"
+"Number of messages from chat history to be restored when a chat tab/window "
+"is reopened."
 msgstr ""
 "Quantas linhas lembrar da conversação anterior quando uma aba/janela de bate-"
 "papo for reaberta."
 
 #: gajim/common/config.py:172
-msgid "How far back in time (minutes) history is restored. -1 means no limit."
-msgstr ""
-
-#: gajim/common/config.py:173
-#, fuzzy
 msgid ""
-"How many lines to request from server when entering a groupchat. -1 means no "
-"limit"
+"How far back in time (minutes) chat history is restored. -1 means no limit."
 msgstr ""
-"Quantas linhas requisitar ao servidor quando entrar em uma conferência."
 
-#: gajim/common/config.py:174
+#: gajim/common/config.py:173
 #, fuzzy
 msgid ""
-"Minutes of backlog to request when entering a groupchat. -1 means no limit"
-msgstr ""
-"Quantos minutos esperar para requisitar registros quando entrar em uma sala."
-
-#: gajim/common/config.py:175
-msgid ""
-"How many seconds to wait before trying to autorejoin to a conference you are "
-"being disconnected from. Set to 0 to disable autorejoining."
+"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 ""
 "Quantos segundos aguardar antes de tentar reconectar a uma conferência que "
 "você foi desconectado. Definir para 0 irá desabilitar a tentativa de re-"
 "conexão (autorejoining)."
 
-#: gajim/common/config.py:176
-msgid "Should autorejoin be activated when kicked from a conference?"
+#: gajim/common/config.py:174
+msgid ""
+"Should automatic rejoin be activated when you were kicked from a group chat?"
 msgstr ""
 
-#: gajim/common/config.py:177
-msgid ""
-"Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
-"Client default behaviour)."
+#: gajim/common/config.py:175
+#, fuzzy
+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 "
 "(comportamento padrão do cliente ICQ da Mirabilis)."
 
-#: gajim/common/config.py:179
-msgid "How many lines to store for Ctrl+KeyUP."
+#: gajim/common/config.py:177
+#, fuzzy
+msgid "How many lines to store for Ctrl+KeyUP (previously sent messages)."
 msgstr "Quantas linhas armazenar com Ctrl+Acima."
 
-#: gajim/common/config.py:182
+#: gajim/common/config.py:180
 #, fuzzy, python-format
 msgid ""
-"Either custom URL with %%s in it where %%s is the word/phrase or "
-"'WIKTIONARY' which means use Wikitionary."
+"Either a custom URL with %%s in it (where %%s is the word/phrase) or "
+"'WIKTIONARY' (which means use Wikitionary)."
 msgstr ""
 "Uma ou outra URL costuma vir com %s onde %s é a palvra/frase ou em "
 "'WIKTIONARY' que significam o uso wiktionary."
 
-#: gajim/common/config.py:185
+#: gajim/common/config.py:183
 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:187
+#: gajim/common/config.py:185
+#, fuzzy
 msgid ""
-"When not printing time for every message (print_time==sometimes), print it "
+"When not printing time for every message ('print_time'==sometimes), print it "
 "every x minutes."
 msgstr ""
 "Quando não estiver exibindo a hora para cada mensagem (print_time == "
 "simetimes), exibi-lo a cada x minutos."
 
-#: gajim/common/config.py:188
+#: gajim/common/config.py:186
 msgid "Ask before pasting an image."
 msgstr ""
 
-#: gajim/common/config.py:189
+#: gajim/common/config.py:187
 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:190
+#: gajim/common/config.py:188
 #, fuzzy
 msgid ""
-"Always ask for confirmation before closing groupchats with any of the JIDs "
-"on this space separated list."
+"Always ask for confirmation before closing group chats with any of the XMPP "
+"Addresses on this list (space separated)."
 msgstr ""
 "Sempre perguntar antes de fechar um aba/janela nesta lista separada por "
 "espaço de JID's de conferências."
 
-#: gajim/common/config.py:191
+#: gajim/common/config.py:189
 #, fuzzy
 msgid ""
-"Never ask for confirmation before closing groupchats with any of the JIDs on "
-"this space separated list."
+"Never ask for confirmation before closing group chats with any of the XMPP "
+"Addresses on this list (space separated)."
 msgstr ""
 "Nunca perguntar antes de fechar uma aba/janela de conferência nesta lista "
 "separada por espaço de salas separadas por jids."
 
-#: gajim/common/config.py:192
+#: gajim/common/config.py:190
 #, fuzzy
 msgid ""
-"Ask before closing tabbed chat window if there are controls that can lose "
-"data (chat, private chat, groupchat that will not be minimized)"
+"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 ""
 "Perguntar antes de fechar uma aba de janela de conversa se ela puder perder "
 "dados (conversa, conversa privada, conferências que não podem ser "
 "minimizadas)"
 
-#: gajim/common/config.py:195
+#: gajim/common/config.py:193
 #, fuzzy
 msgid ""
-"Comma separated list of sent hosts, in addition of local interfaces, for "
-"File Transfer in case of address translation/port forwarding."
+"List of send hosts (comma separated) in addition to local interfaces for "
+"file transfers (in case of address translation/port forwarding)."
 msgstr ""
 "Lista separada por vírgula dos servidores que nós enviaremos, em adição às "
 "interfaces locais, para Transferência de Arquivo no caso de tradução de "
 "endereço/encaminhamento de porta."
 
-#: gajim/common/config.py:196
+#: gajim/common/config.py:194
 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:198
+#: gajim/common/config.py:196
 #, fuzzy
 msgid "Notify of events in the notification area."
 msgstr "Notificar os eventos no ícone da bandeja do sistema."
 
-#: gajim/common/config.py:199
+#: gajim/common/config.py:197
 msgid ""
-"If False, Gajim will display a static event icon instead of the blinking "
-"status icon in the notification area when notifying on event."
+"If disabled, Gajim will display a static event icon instead of the blinking "
+"status icon in the notification area when notifying about an event."
 msgstr ""
 
-#: gajim/common/config.py:205
+#: gajim/common/config.py:203
 msgid "Show tab when only one conversation?"
 msgstr "Exibir aba quando tiver apenas uma bate papo?"
 
-#: gajim/common/config.py:206
+#: gajim/common/config.py:204
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "Exibir borda de caderno tabulada nas janelas de conversa?"
 
-#: gajim/common/config.py:207
+#: gajim/common/config.py:205
 msgid "Show close button in tab?"
 msgstr "Exibir botão de fechar na aba?"
 
-#: gajim/common/config.py:220
+#: gajim/common/config.py:218
 msgid "Preview new messages in notification popup?"
 msgstr "Pré-visualizar novas mensagens em uma janela popup?"
 
-#: gajim/common/config.py:223
+#: gajim/common/config.py:221
+#, fuzzy
 msgid ""
-"A semicolon-separated list of words that will be highlighted in group chats."
+"A list of words (semicolon separated) that will be highlighted in group "
+"chats."
 msgstr ""
 "Uma lista separada por ponto-e-vírgula das palavras que serão destacadas nas "
 "conferências."
 
-#: gajim/common/config.py:224
+#: gajim/common/config.py:222
 #, fuzzy
 msgid ""
-"If true, quits Gajim when X button of Window Manager is clicked. This "
-"setting is taken into account only if notification icon is used."
+"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 ""
 "Se verdadeiro, o Gajim sairá quando o botão sair da janela for clicado. Esta "
 "opção só faz sentido quando a opção trayicon está sendo usada."
 
-#: gajim/common/config.py:225
+#: gajim/common/config.py:223
 msgid ""
-"If true, Gajim hides the Roster window on pressing the X button instead of "
-"minimizing into the Dock."
+"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:226
+#: gajim/common/config.py:224
 #, fuzzy
 msgid ""
-"If true, Gajim will display an icon on each tab containing unread messages. "
-"Depending on the theme, this icon may be animated."
+"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, Gajim exibirá um ícone para cada aba contendo mensagens não "
 "lidas. Dependendo do tema, este ícone pode ser animado."
 
-#: gajim/common/config.py:227
+#: gajim/common/config.py:225
 #, fuzzy
 msgid ""
-"If true, Gajim will display the status message, if not empty, for every "
-"contact under the contact name in roster window."
+"If enabled, Gajim will display the status message (if not empty) underneath "
+"the contact name in the contact list window."
 msgstr ""
 "Se verdadeiro, o Gajim indicará a mensagem de status, se não estiver vazia, "
 "para cada contato sob o nome do contato na janela da lista."
 
-#: gajim/common/config.py:233
-msgid "Define the position of the avatar in roster. Can be left or right"
+#: gajim/common/config.py:231
+#, fuzzy
+msgid ""
+"Define the position of avatars in the contact list. Can be 'left' or 'right'."
 msgstr "Define a posição do avatar na lista. Pode ser esquerda ou direita"
 
-#: gajim/common/config.py:234
+#: gajim/common/config.py:232
 #, fuzzy
 msgid ""
-"If False, Gajim will no longer print status line in chats when a contact "
-"changes their status and/or their status message."
+"If disabled, Gajim will no longer print status messages in chats when a "
+"contact changes their status (and/or their status message)."
 msgstr ""
 "Se falso, você não verá por mais muito tempo a linha de status nas conversas "
 "quando um contato alterar seu status e/ou sua mensagem de status."
 
-#: gajim/common/config.py:235
+#: gajim/common/config.py:233
 #, fuzzy
 msgid ""
 "Default Setting: Show a status message for every join or leave in a group "
-"chat"
+"chat."
 msgstr "Impossível ingressar na sala"
 
-#: gajim/common/config.py:236
+#: gajim/common/config.py:234
+#, fuzzy
 msgid ""
-"Default Setting: Show a status message for all status (away, dnd, etc.) "
-"changes of users in a group chat"
-msgstr ""
+"Default Setting: 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:238
-msgid "Log XHTML messages instead of plain text messages."
+#: gajim/common/config.py:236
+msgid "Store XHTML messages in chat history instead of plain text messages."
 msgstr ""
 
-#: gajim/common/config.py:239
+#: gajim/common/config.py:237
 msgid "Don't show avatar for the transport itself."
 msgstr "Não exibir o avatar para o próprio transporte."
 
-#: gajim/common/config.py:240
-msgid "Don't show roster in the system taskbar."
+#: gajim/common/config.py:238
+#, fuzzy
+msgid "Don't show contact list window in the system taskbar."
 msgstr "Não exibir a lista na bandeja do sistema."
 
-#: gajim/common/config.py:241
+#: gajim/common/config.py:239
 #, fuzzy
 msgid ""
-"If true, make the window flash (the default behaviour in most Window "
-"Managers) when holding pending events."
+"If enabled, Gajim makes the window flash (the default behaviour in most "
+"Window Managers) when holding pending events."
 msgstr ""
 "Se Verdadeiro e as versões do GTK+ e PyGTK instaladas são menores que 2.8, "
 "faz a janela piscar (o comportamento padrão na maioria dos Gerenciadores de "
 "Janela) quando esperam eventos pendentes."
 
-#: gajim/common/config.py:245
+#: gajim/common/config.py:243
 #, fuzzy
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
 "'always_with_roster' - Like 'always' but the messages are in a single window "
-"along with the roster.\n"
+"along with the contact list.\n"
 "'never' - All messages get their own window.\n"
 "'peracct' - Messages for each account are sent to a specific window.\n"
-"'pertype' - Each message type (e.g. chats vs. groupchats) is sent to a "
+"'pertype' - Each message type (e.g. chats vs. group chats) is sent to a "
 "specific window."
 msgstr ""
 "Controlar a janela onde novas mensagens são colocadas.\n"
@@ -3541,126 +3529,135 @@ msgstr ""
 "'pertype' - Cada tipo de mensagem (ex. bate-papo vs. conferência) são "
 "enviadas para uma janela específica."
 
-#: gajim/common/config.py:246
+#: gajim/common/config.py:244
 msgid ""
-"Show roster on startup.\n"
-"'always' - Always show roster.\n"
-"'never' - Never show roster.\n"
-"'last_state' - Restore the last state roster."
+"Show contact list window on startup.\n"
+"'always' - Always show contact list window.\n"
+"'never' - Never show contact list window.\n"
+"'last_state' - Restore last state of the contact list window."
 msgstr ""
 
-#: gajim/common/config.py:247
-msgid "If False, you will no longer see the avatar in the chat window."
+#: gajim/common/config.py:245
+#, fuzzy
+msgid "If enabled, Gajim displays the avatar in the chat window."
 msgstr ""
 "Se falso, você não verá por muito tempo o avatar na janela do bate-papo."
 
-#: gajim/common/config.py:248
+#: gajim/common/config.py:246
 #, fuzzy
-msgid "If true, pressing the escape key closes a tab/window."
+msgid "If enabled, pressing Esc closes a tab/window."
 msgstr "Se verdadeiro, pressionando a tecla Esc fecha a aba/janela."
 
-#: gajim/common/config.py:249
-msgid "Hides the banner in a group chat window"
+#: gajim/common/config.py:247
+#, fuzzy
+msgid "Hides the banner in a group chat window."
 msgstr "Esconder o banner na janela de conferência"
 
-#: gajim/common/config.py:250
-msgid "Hides the banner in two persons chat window"
-msgstr "Esconder o banner na janela de conversa para duas pessoas"
+#: gajim/common/config.py:248
+#, fuzzy
+msgid "Hides the banner in a 1:1 chat window."
+msgstr "Esconder o banner na janela de conferência"
 
-#: gajim/common/config.py:251
-msgid "Hides the group chat occupants list in group chat window."
+#: gajim/common/config.py:249
+#, 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:252
+#: gajim/common/config.py:250
+#, fuzzy
 msgid ""
 "In a chat, show the nickname at the beginning of a line only when it's not "
-"the same person talking than in previous message."
+"the same person talking as in the previous message."
 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:253
+#: gajim/common/config.py:251
 msgid "Indentation when using merge consecutive nickname."
 msgstr "Usar identação ao mesclar apelidos consecutivos."
 
-#: gajim/common/config.py:254
-msgid "Ctrl-Tab go to next composing tab when none is unread."
+#: gajim/common/config.py:252
+#, fuzzy
+msgid ""
+"Ctrl+Tab switches to the next composing tab when there are no tabs with "
+"messages pending."
 msgstr ""
 "Quando nenhum aba tiver uma mensagem não lida, Ctrl + Tab vai para a próxima "
 "aba."
 
-#: gajim/common/config.py:255
+#: gajim/common/config.py:253
 #, fuzzy
 msgid ""
-"Show the confirm metacontacts creation dialog or not? Empty string means "
-"never show the dialog."
+"Show a confirmation dialog to create metacontacts? Empty string means never "
+"show the dialog."
 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:256
+#: gajim/common/config.py:254
 #, fuzzy
 msgid ""
-"Show the confirm block contact dialog or not? Empty string means never show "
+"Show a confirmation dialog to block a contact? Empty string means never show "
 "the dialog."
 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:257
+#: gajim/common/config.py:255
 #, fuzzy
 msgid ""
-"Show the confirm custom status dialog or not? Empty string means never show "
-"the dialog."
+"Show a confirmation dialog for a custom status? Empty string means never "
+"show the dialog."
 msgstr ""
 "Devemos exibir o diálogo de confirmação status customizados ou não? Uma "
 "string vazia significa que nós nunca devemos exibir o diálogo."
 
-#: gajim/common/config.py:258
+#: gajim/common/config.py:256
 #, fuzzy
 msgid ""
-"If true, you will be able to set a negative priority to your account in "
-"account modification window. BE CAREFUL, when you are logged in with a "
-"negative priority, you will NOT receive any message from your server."
+"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 ""
 "Se Verdadeiro, você poderá especificar uma prioridade negativa para a sua "
 "conta na janela de modificação da conta. CUIDADO, quando você estiver "
 "autenticado com uma prioridade negativa, você NÃO poderá receber nenhuma "
 "mensagem do seu servidor."
 
-#: gajim/common/config.py:259
+#: gajim/common/config.py:257
 #, fuzzy
 msgid ""
-"If true, Gajim will show number of online and total contacts in account and "
-"group rows."
+"If enabled, Gajim will show both the number of online and total contacts in "
+"account rows as well as in group rows."
 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:260
+#: gajim/common/config.py:258
+#, fuzzy
 msgid ""
-"Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
-"as if they were of this type"
+"Can be empty, 'chat' or 'normal'. If not empty, all incoming messages are "
+"treated as if they were of this type."
 msgstr ""
 "Pode ser vazio, 'chat' ou 'normal'. Se for vazio, trata todas as mensagens "
 "recebidas como se elas fossem do tipo especificado"
 
-#: gajim/common/config.py:261
+#: gajim/common/config.py:259
 #, fuzzy
 msgid ""
-"If true, Gajim will scroll and select the contact who sent you the last "
-"message, if chat window is not already opened."
+"If enabled, Gajim will scroll and select the contact who sent you the last "
+"message, if the chat window is not already opened."
 msgstr ""
 "Se Verdadeiro, o Gajim irá rolar e selecionar o contato que lhe enviou a "
 "última mensagem, se a janela de conversa ainda não estiver aberta."
 
-#: gajim/common/config.py:262
+#: gajim/common/config.py:260
 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:263
+#: gajim/common/config.py:261
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
@@ -3668,143 +3665,159 @@ 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:264
+#: gajim/common/config.py:262
 #, fuzzy
 msgid ""
-"If true, notification windows from notification-daemon will be attached to "
-"notification icon."
+"If enabled, notification windows from notification-daemon will be attached "
+"to the notification area icon."
 msgstr ""
 "Se marcado como Verdadeiro as janelas de notificação do notification-daemon "
 "serão anexadas ao ícone da bandeja do sistema."
 
-#: gajim/common/config.py:265
+#: gajim/common/config.py:263
 msgid "Choose interval between 2 checks of idleness."
 msgstr "Escolha intervalo entre 2 verificações de inatividade."
 
-#: gajim/common/config.py:266
+#: gajim/common/config.py:264
+#, fuzzy
 msgid ""
-"Valid uri schemes. Only schemes in this list will be accepted as \"real\" "
-"uri. (mailto and xmpp are handled separately)"
+"Valid URI schemes. Only schemes in this list will be accepted as 'real' URI "
+"(mailto and xmpp are handled separately)."
 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:267
+#: gajim/common/config.py:265
 #, fuzzy
-msgid "If true, completion in groupchats will be like a shell auto-completion"
+msgid ""
+"If enabled, completion in group chats will be like a shell auto-completion."
 msgstr ""
 "Se verdadeiro, a ação de auto-completar na conferência irá ser como a do "
 "shell"
 
-#: gajim/common/config.py:272
-msgid "Optionally fix jingle output video framerate. Example: 10/1 or 25/2"
+#: gajim/common/config.py:270
+msgid "Optionally fix Jingle output video framerate. Example: 10/1 or 25/2."
 msgstr ""
 
-#: gajim/common/config.py:273
-msgid "Optionally resize jingle output video. Example: 320x240"
+#: gajim/common/config.py:271
+msgid "Optionally resize Jingle output video. Example: 320x240."
 msgstr ""
 
-#: gajim/common/config.py:274
-msgid "If true, You will also see your webcam"
+#: gajim/common/config.py:272
+msgid "If enabled, you will see your webcam's video stream as well."
 msgstr ""
 
-#: gajim/common/config.py:277
+#: gajim/common/config.py:275
 msgid ""
-"If true, Gajim will try to use a STUN server when using Jingle. The one in "
-"\"stun_server\" option, or the one given by the XMPP server."
+"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:278
+#: gajim/common/config.py:276
 msgid "STUN server to use when using Jingle"
 msgstr ""
 
-#: gajim/common/config.py:279
+#: gajim/common/config.py:277
 msgid ""
-"If true, Gajim will show affiliation of groupchat occupants by adding a "
-"colored square to the status icon"
+"If enabled, Gajim will show affiliation of group chat participants by adding "
+"a colored square to the status icon."
 msgstr ""
 
-#: gajim/common/config.py:280
+#: gajim/common/config.py:278
 msgid ""
 "Proxy used for all outgoing connections if the account does not have a "
-"specific proxy configured"
+"specific proxy configured."
 msgstr ""
 
-#: gajim/common/config.py:281
-msgid "If true, Gajim will ignore incoming attention requests (\"wizz\")."
+#: gajim/common/config.py:279
+msgid "If enabled, Gajim will ignore incoming attention requests ('wizz')."
 msgstr ""
 
-#: gajim/common/config.py:282
+#: gajim/common/config.py:280
 msgid ""
 "If enabled, Gajim will reopen chat windows that were opened last time Gajim "
 "was closed."
 msgstr ""
 
-#: gajim/common/config.py:283
+#: gajim/common/config.py:281
 #, fuzzy
 msgid ""
-"If enabled, Gajim will show an icon to show that sent message has been "
-"received by your contact"
+"If enabled, Gajim will display an icon to show that sent messages have been "
+"received by your contact."
 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:284
-msgid "Show a mini avatar in chat window tabs and in window icon"
+#: gajim/common/config.py:282
+msgid "Show a mini avatar in chat window tabs and as the window's icon."
 msgstr ""
 
-#: gajim/common/config.py:285
+#: gajim/common/config.py:283
 #, fuzzy
-msgid "If true, Gajim will use the Systems Keyring to store account passwords."
+msgid ""
+"If enabled, Gajim will use the System's Keyring to store account passwords."
 msgstr ""
 "Se verdadeiro, o Gajim usará o Gnome Keyring (se disponível) para armazenar "
 "as senhas das contas."
 
+#: gajim/common/config.py:284
+msgid "If enabled, Gajim will execute XEP-0146 Commands."
+msgstr ""
+
+#: gajim/common/config.py:285
+msgid "2: System, 1: Enabled, 0: Disabled"
+msgstr ""
+
 #: gajim/common/config.py:286
-msgid "If true, Gajim will execute XEP-0146 Commands."
+msgid "Options in days which can be chosen in the sync threshold menu"
 msgstr ""
 
 #: gajim/common/config.py:287
-msgid "2: System, 1: Enabled, 0: Disabled"
+msgid ""
+"Maximum history in days we request from a public group chat archive. 0: As "
+"much as possible."
 msgstr ""
 
 #: gajim/common/config.py:288
-msgid "Options in days which can be chosen in the sync threshold menu"
+msgid ""
+"Maximum history in days we request from a private group chat archive. 0: As "
+"much as possible."
 msgstr ""
 
 #: gajim/common/config.py:289
 msgid ""
-"Maximum history in days we request from a public room archive. 0: As much as "
-"possible"
+"If enabled, Gajim shows the group chat subject in the chat window when "
+"joining."
 msgstr ""
 
 #: gajim/common/config.py:290
+#, fuzzy
 msgid ""
-"Maximum history in days we request from a private room archive. 0: As much "
-"as possible"
+"If enabled, the contact row is colored according to the current chat state "
+"of the contact."
 msgstr ""
+"Se marcado, o Gajim irá permitir que os outros detectem qual o sistema "
+"operacional está usando"
 
 #: gajim/common/config.py:291
-msgid "If the room subject is shown in chat on join"
+#, fuzzy
+msgid ""
+"If enabled, the tab is colored according to the current chat state of the "
+"contact."
 msgstr ""
+"Se marcado, o Gajim irá permitir que os outros detectem qual o sistema "
+"operacional está usando"
 
 #: gajim/common/config.py:292
+#, fuzzy
 msgid ""
-"If the contact row is colored according to the current chatstate of the "
-"contact"
+"Shows a text in the banner that describes the current chat state of the "
+"contact."
 msgstr ""
+"Se marcado, o Gajim irá permitir que os outros detectem qual o sistema "
+"operacional está usando"
 
 #: gajim/common/config.py:293
-msgid "If the tab is colored according to the current chatstate of the contact"
-msgstr ""
-
-#: gajim/common/config.py:294
-msgid ""
-"Shows a text in the banner that describes the current chatstate of the "
-"contact"
-msgstr ""
-
-#: gajim/common/config.py:295 gajim/common/config.py:424
 #, fuzzy
 msgid ""
 "Chat state notifications that are sent to contacts. Possible values: all, "
@@ -3813,75 +3826,85 @@ msgstr ""
 "Notificações de estado de conversa enviados. Pode ser one of all, "
 "composing_only, disabled."
 
-#: gajim/common/config.py:296 gajim/common/config.py:438
+#: gajim/common/config.py:294
 #, fuzzy
 msgid ""
 "Chat state notifications that are sent to the group chat. Possible values: "
-"all, composing_only, disabled"
+"'all', 'composing_only', 'disabled'"
 msgstr ""
 "Notificações de estado de conversa enviados. Pode ser one of all, "
 "composing_only, disabled."
 
-#: gajim/common/config.py:312
+#: gajim/common/config.py:297
+msgid "API Preferences. Possible values: 'http', 'iq'"
+msgstr ""
+
+#: gajim/common/config.py:313
+#, fuzzy
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
-"defined in autopriority_* options."
+"defined in 'autopriority_*' options."
 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:320
+#: gajim/common/config.py:321
+#, fuzzy
 msgid ""
-"Status used to autoconnect as. Can be online, chat, away, xa, dnd, "
-"invisible. NOTE: this option is used only if restore_last_status is disabled"
+"Status to be used automatically when connecting. Can be 'online', 'chat', "
+"'away', 'xa', 'dnd' or 'invisible'. NOTE: This option is used only if "
+"'restore_last_status' is disabled."
 msgstr ""
 "Status usado para conexão automática. Pode ser conectado, bate-papo, "
 "inativo, fora, np, invisível. NOTA: esta opção é usada somente se a opção "
 "restore_last_status estiver desativada"
 
-#: gajim/common/config.py:321
-msgid "If enabled, restore the last status that was used."
+#: gajim/common/config.py:322
+#, fuzzy
+msgid "If enabled, the last status will be restored."
 msgstr "Se habilitado, restaura o último status que foi usado."
 
-#: gajim/common/config.py:322
+#: gajim/common/config.py:323
 #, fuzzy
 msgid ""
-"If true, Contacts requesting authorization will be automatically accepted."
+"If enabled, Contacts requesting authorization will be accepted automatically."
 msgstr ""
 "Se verdadeiro, requisição de autorização de contatos  irão ser "
 "automaticamente aceitos."
 
-#: gajim/common/config.py:323
+#: gajim/common/config.py:324
+#, fuzzy
 msgid ""
-"If False, this account will be disabled and will not appear in roster window."
+"If disabled, this account will be disabled and will not appear in the "
+"contact list window."
 msgstr ""
 "Se falso, esta conta será desativada e não irá aparecer na lista de contatos."
 
-#: gajim/common/config.py:327
-msgid "Allow plaintext connections"
+#: gajim/common/config.py:328
+msgid "Allow plaintext connections."
 msgstr ""
 
-#: gajim/common/config.py:330
+#: gajim/common/config.py:331
 msgid ""
-"List (space separated) of authentication mechanisms to try. Can contain "
-"ANONYMOUS, EXTERNAL, GSSAPI, SCRAM-SHA-1-PLUS, SCRAM-SHA-1, DIGEST-MD5, "
-"PLAIN, X-MESSENGER-OAUTH2 or XEP-0078"
+"List of authentication mechanisms to try (space separated). Can contain "
+"'ANONYMOUS', 'EXTERNAL', 'GSSAPI', 'SCRAM-SHA-1-PLUS', 'SCRAM-SHA-1', "
+"'DIGEST-MD5', 'PLAIN', 'X-MESSENGER-OAUTH2' or 'XEP-0078'."
 msgstr ""
 
-#: gajim/common/config.py:331
+#: gajim/common/config.py:332
 #, fuzzy
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection. "
-"Can be 'warn', 'connect', 'disconnect'"
+"Can be 'warn', 'connect' or 'disconnect'."
 msgstr ""
 "Exibir uma mensagem de alerta antes de enviar uma senha em uma conexão de "
 "texto puro."
 
-#: gajim/common/config.py:332
+#: gajim/common/config.py:333
 msgid "Show a warning dialog before using standard SSL library."
 msgstr "Exibir uma mensagem de alerta antes de usar uma biblioteca padrão SSL."
 
-#: gajim/common/config.py:333
+#: gajim/common/config.py:334
 #, fuzzy
 msgid ""
 "Show a warning dialog before sending PLAIN password over a plain connection."
@@ -3889,66 +3912,74 @@ msgstr ""
 "Exibir uma mensagem de alerta antes de enviar uma senha em uma conexão de "
 "texto puro."
 
-#: gajim/common/config.py:334
-msgid "Space separated list of ssl errors to ignore."
-msgstr "Lista separada por espaços de erros do ssl para ignorar."
+#: gajim/common/config.py:335
+msgid "List of SSL errors to ignore (space separated)."
+msgstr ""
 
-#: gajim/common/config.py:340
+#: gajim/common/config.py:341
 msgid ""
-"Space separated list of JIDs for which you do not want to store logs. You "
-"can also add account name to log nothing for this account."
+"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:341
+#: gajim/common/config.py:342
 msgid ""
-"Space separated list of JIDs for which you accept to not log conversations "
-"if he does not want to."
+"List of XMPP Addresses (space separated) for which you accept to not store "
+"chat history if your contact does not want to."
 msgstr ""
 
-#: gajim/common/config.py:343
-msgid "Whitespace sent after inactivity"
+#: gajim/common/config.py:344
+#, fuzzy
+msgid "If enabled, a whitespace is sent after inactivity (keep alive)."
 msgstr "Espaço em branco enviado após inatividade"
 
-#: gajim/common/config.py:344
-msgid "XMPP ping sent after inactivity"
+#: gajim/common/config.py:345
+#, fuzzy
+msgid "If enabled, an XMPP ping is sent after inactivity (ping alive)."
 msgstr "Ping XMPP enviado após inatividade"
 
-#: gajim/common/config.py:348
+#: gajim/common/config.py:349
 #, fuzzy
 msgid ""
-"How many seconds to wait for the answer of ping alive packet before trying "
-"to reconnect?"
+"How many seconds to wait for the answer of a ping alive packet before trying "
+"to reconnect."
 msgstr ""
 "Quantos segundos aguardar a resposta do pacote de tempo-de-vida antes de "
 "tentar reconectar."
 
-#: gajim/common/config.py:352
-msgid "Jabberd2 workaround"
+#: gajim/common/config.py:353
+#, fuzzy
+msgid "Jabberd2 workaround."
 msgstr "Jabberd2 rodando"
 
-#: gajim/common/config.py:355
+#: gajim/common/config.py:356
+#, fuzzy
 msgid ""
-"If checked, Gajim will use your IP and proxies defined in "
-"file_transfer_proxies option for file transfer."
+"If enabled, Gajim will use your IP and proxies defined in "
+"'file_transfer_proxies' option for file transfers."
 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:356
+#: gajim/common/config.py:357
 msgid ""
-"If true, Gajim will test file transfer proxies on startup to be sure it "
-"works. Openfire's proxies are known to fail this test even if they work."
+"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:369
-msgid "Answer to receipt requests"
-msgstr "Respostas para requisições recebidas"
-
 #: gajim/common/config.py:370
-msgid "Sent receipt requests"
-msgstr "Requisições recebidas enviadas"
+#, 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:371
+msgid "If enabled, Gajim will send message receipt requests."
+msgstr ""
 
-#: gajim/common/config.py:379
+#: gajim/common/config.py:380
 #, fuzzy
 msgid ""
 "Allow Gajim to send information about the operating system you are running."
@@ -3956,185 +3987,196 @@ msgstr ""
 "Se marcado, o Gajim irá permitir que os outros detectem qual o sistema "
 "operacional está usando"
 
-#: gajim/common/config.py:380
+#: gajim/common/config.py:381
 msgid "Allow Gajim to send your local time."
 msgstr "Permitir ao Gajim enviar sua hora local."
 
-#: gajim/common/config.py:383
+#: gajim/common/config.py:384
 #, fuzzy
-msgid "Message that is sent to contacts you want to add"
+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:384
-msgid ""
-"If enabled, Gajim will send your local IPs so your contact can connect to "
-"your machine to transfer files."
-msgstr ""
-
 #: gajim/common/config.py:385
+#, fuzzy
 msgid ""
-"Space separated list of JIDs for which chat window will be re-opened on next "
-"startup."
+"If enabled, Gajim will send your local IP so your contact can connect to "
+"your machine for file transfers."
 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:387
-msgid "HTTP Upload: Enable HTTPS Verification"
+#: gajim/common/config.py:386
+msgid ""
+"List of XMPP Addresses (space separated) for which the chat window will be "
+"re-opened on next startup."
 msgstr ""
 
 #: gajim/common/config.py:388
-msgid ""
-"Preferred file transfer mechanism for file drag&drop on chat window. Can be "
-"'httpupload' (default) or 'jingle'"
+msgid "HTTP File Upload: Enable HTTPS Verification."
 msgstr ""
 
 #: gajim/common/config.py:389
-msgid "Allow cert verification with POSH"
+msgid ""
+"Preferred file transfer mechanism for file drag&drop on a chat window. Can "
+"be 'httpupload' (default) or 'jingle'."
 msgstr ""
 
-#: gajim/common/config.py:423 gajim/common/config.py:430
+#: gajim/common/config.py:390
 #, fuzzy
-msgid "Language for which misspelled words will be checked"
-msgstr "Idioma a usar na verificação ortográficas das palavras"
-
-#: gajim/common/config.py:427
-msgid "The currently active encryption for that contact"
-msgstr ""
+msgid "Allow certificate verification with POSH."
+msgstr "Verificação de certificado SSL para %s"
 
-#: gajim/common/config.py:431
+#: gajim/common/config.py:425
 #, fuzzy
 msgid ""
-"How many lines to request from server when entering a groupchat. -1 means no "
-"limit, -2 means global value"
+"Chat state notifications that are sent to contacts. Possible values: 'all', "
+"'composing_only', 'disabled'"
 msgstr ""
-"Quantas linhas requisitar ao servidor quando entrar em uma conferência."
+"Notificações de estado de conversa enviados. Pode ser one of all, "
+"composing_only, disabled."
 
-#: gajim/common/config.py:432
+#: gajim/common/config.py:428
 #, fuzzy
+msgid "The currently active encryption for that contact."
+msgstr "Habilitar criptografia ESessions para esta conta."
+
+#: gajim/common/config.py:432
 msgid ""
-"Minutes of backlog to request when entering a groupchat. -1 means no limit, "
-"-2 means global value"
+"If enabled, a notification is created for every message in this group chat."
 msgstr ""
-"Quantos minutos esperar para requisitar registros quando entrar em uma sala."
 
 #: gajim/common/config.py:433
-msgid "State whether a notification is created for every message in this room"
-msgstr ""
-
-#: gajim/common/config.py:434
+#, fuzzy
 msgid ""
-"Show a status message for all status (away, dnd, etc.) changes of users in a "
-"group chat"
-msgstr ""
+"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:435
+#: gajim/common/config.py:434
 #, fuzzy
-msgid "Show a status message for every join or leave in a group chat"
+msgid "Show a status message for every join or leave in a group chat."
 msgstr "Impossível ingressar na sala"
 
+#: gajim/common/config.py:435
+msgid ""
+"If enabled, the group chat is minimized into the contact list when joining "
+"automatically."
+msgstr ""
+
 #: gajim/common/config.py:436
-msgid "If the group chat is minimized into the roster on autojoin"
+msgid ""
+"If enabled, the group chat is minimized into the contact list when closing "
+"it."
 msgstr ""
 
 #: gajim/common/config.py:437
-msgid "If the group chat is minimized into the roster on close"
+#, fuzzy
+msgid ""
+"Chat state notifications that are sent to the group chat. Possible values: "
+"'all', 'composing_only' or 'disabled'."
 msgstr ""
+"Notificações de estado de conversa enviados. Pode ser one of all, "
+"composing_only, disabled."
 
-#: gajim/common/config.py:441
+#: gajim/common/config.py:440
 msgid ""
-"State whether plugins should be activated on startup (this is saved on Gajim "
-"exit). This option SHOULD NOT be used to (de)activate plug-ins. Use GUI "
-"instead."
+"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:446 gajim/common/const.py:281
+#: gajim/common/config.py:445 gajim/common/const.py:315
 msgid "Sleeping"
 msgstr "Dormindo"
 
-#: gajim/common/config.py:447
+#: gajim/common/config.py:446
 msgid "Back soon"
 msgstr "Volto logo"
 
-#: gajim/common/config.py:447
+#: gajim/common/config.py:446
 msgid "Back in some minutes."
 msgstr "Volto em alguns minutos."
 
-#: gajim/common/config.py:448 gajim/common/const.py:247
+#: gajim/common/config.py:447 gajim/common/const.py:281
 msgid "Eating"
 msgstr "Comendo"
 
-#: gajim/common/config.py:448
-msgid "I'm eating, so leave me a message."
-msgstr "Eu estou comendo, então deixe-me uma mensagem."
+#: gajim/common/config.py:447
+#, fuzzy
+msgid "I'm eating."
+msgstr "Estou trabalhando."
 
-#: gajim/common/config.py:449
+#: gajim/common/config.py:448
 msgid "Movie"
 msgstr "Filme"
 
-#: gajim/common/config.py:449
+#: gajim/common/config.py:448
 msgid "I'm watching a movie."
 msgstr "Estou assistindo um filme."
 
-#: gajim/common/config.py:450 gajim/common/const.py:314
+#: gajim/common/config.py:449 gajim/common/const.py:348
 msgid "Working"
 msgstr "Trabalhando"
 
-#: gajim/common/config.py:450
+#: gajim/common/config.py:449
 msgid "I'm working."
 msgstr "Estou trabalhando."
 
-#: gajim/common/config.py:451
+#: gajim/common/config.py:450
 msgid "Phone"
 msgstr "Telefone"
 
-#: gajim/common/config.py:451
+#: gajim/common/config.py:450
 msgid "I'm on the phone."
 msgstr "Estou no telefone."
 
-#: gajim/common/config.py:452
+#: gajim/common/config.py:451
 msgid "Out"
 msgstr "Estou fora"
 
-#: gajim/common/config.py:452
+#: gajim/common/config.py:451
 msgid "I'm out enjoying life."
 msgstr "Estou fora curtindo a vida."
 
-#: gajim/common/config.py:463
+#: gajim/common/config.py:462
 msgid "I'm available."
 msgstr "Estou disponível."
 
-#: gajim/common/config.py:464
+#: gajim/common/config.py:463
 msgid "I'm free for chat."
 msgstr "Estou livre para conversar."
 
-#: gajim/common/config.py:465 gajim/gtk/accounts.py:134
+#: gajim/common/config.py:464 gajim/gtk/accounts.py:133
 msgid "Be right back."
 msgstr "Estou de volta."
 
-#: gajim/common/config.py:466
+#: gajim/common/config.py:465
 msgid "I'm not available."
 msgstr "Não estou disponível."
 
-#: gajim/common/config.py:467
+#: gajim/common/config.py:466
 msgid "Do not disturb."
 msgstr "Não perturbe."
 
-#: gajim/common/config.py:468 gajim/common/config.py:469
+#: gajim/common/config.py:467 gajim/common/config.py:468
 msgid "Bye!"
 msgstr "Tchau!"
 
-#: gajim/common/config.py:480
+#: gajim/common/config.py:479
+#, fuzzy
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
-"muc_highlight_words, or when a group chat message contains your nickname."
+"'muc_highlight_words' your nickname is mentioned."
 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:481
-msgid "Sound to play when any MUC message arrives."
+#: gajim/common/config.py:480
+#, 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:485
+#: gajim/common/config.py:484
 #, fuzzy
 msgid "Tor"
 msgstr "Para"
@@ -4144,879 +4186,975 @@ msgstr "Para"
 msgid "Error: cannot open %s for reading"
 msgstr "Erro: impossível abrir %s para leitura"
 
-#: gajim/common/const.py:214
+#: gajim/common/const.py:216
+#, fuzzy
+msgid "?Group chat name:Team"
+msgstr "?Regra do contato para conversa em grupo:Nenhuma"
+
+#: gajim/common/const.py:217
+msgid "?Group chat description:Project discussion"
+msgstr ""
+
+#: gajim/common/const.py:218
+#, fuzzy
+msgid "?Group chat address:team"
+msgstr "Salas"
+
+#: gajim/common/const.py:219
+#, fuzzy
+msgid "?Group chat name:Family"
+msgstr "Mensagem destacada de conferência"
+
+#: gajim/common/const.py:220
+msgid "?Group chat description:Spring gathering"
+msgstr ""
+
+#: gajim/common/const.py:221
+msgid "?Group chat address:family"
+msgstr ""
+
+#: gajim/common/const.py:222
+#, fuzzy
+msgid "?Group chat name:Vacation"
+msgstr "Convite para conferência"
+
+#: gajim/common/const.py:223
+msgid "?Group chat description:Trip planning"
+msgstr ""
+
+#: gajim/common/const.py:224
+#, fuzzy
+msgid "?Group chat address:vacation"
+msgstr "Convite para conferência"
+
+#: gajim/common/const.py:225
+#, fuzzy
+msgid "?Group chat name:Repairs"
+msgstr "_Conferência"
+
+#: gajim/common/const.py:226
+msgid "?Group chat description:Local help group"
+msgstr ""
+
+#: gajim/common/const.py:227
+#, fuzzy
+msgid "?Group chat address:repairs"
+msgstr "Salas"
+
+#: gajim/common/const.py:228
+#, fuzzy
+msgid "?Group chat name:News"
+msgstr "?Regra do contato para conversa em grupo:Nenhuma"
+
+#: gajim/common/const.py:229
+#, fuzzy
+msgid "?Group chat description:Local news and reports"
+msgstr "A criação de sala é restrita."
+
+#: gajim/common/const.py:230
+#, fuzzy
+msgid "?Group chat address:news"
+msgstr "Nova conferência"
+
+#: gajim/common/const.py:235
+#, fuzzy
+msgid "Remote server not found"
+msgstr "O serviço não pode ser encontrado"
+
+#: gajim/common/const.py:236
+msgid "Remote server timeout"
+msgstr ""
+
+#: gajim/common/const.py:237 gajim/common/const.py:238
+#: gajim/common/const.py:239
+#, fuzzy
+msgid "Address does not belong to a group chat server"
+msgstr "%s não é um servidor de conferência"
+
+#: gajim/common/const.py:240
+#, fuzzy
+msgid "Group chat already exists"
+msgstr "Conta local já existe."
+
+#: gajim/common/const.py:241
+#, fuzzy
+msgid "Group chat does not exist"
+msgstr "A sala <b>%s</b> não existe."
+
+#: gajim/common/const.py:247
 msgid "This message was encrypted with OTR and could not be decrypted."
 msgstr ""
 
-#: gajim/common/const.py:217
+#: gajim/common/const.py:250
 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:221
+#: gajim/common/const.py:254
 msgid ""
-"This message was encrypted with OpenPGP for XMPP and could not be decrypted."
+"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:224
+#: gajim/common/const.py:258
 #, python-format
 msgid "This message was encrypted with %s and could not be decrypted."
 msgstr ""
 
-#: gajim/common/const.py:231
+#: gajim/common/const.py:265
 msgid "Doing Chores"
 msgstr "Atarefado"
 
-#: gajim/common/const.py:232
+#: gajim/common/const.py:266
 msgid "Buying Groceries"
 msgstr "Fazendo compras"
 
-#: gajim/common/const.py:233
+#: gajim/common/const.py:267
 msgid "Cleaning"
 msgstr "Limpando"
 
-#: gajim/common/const.py:234
+#: gajim/common/const.py:268
 msgid "Cooking"
 msgstr "Cozinhando"
 
-#: gajim/common/const.py:235
+#: gajim/common/const.py:269
 msgid "Doing Maintenance"
 msgstr "Fazendo manutenção"
 
-#: gajim/common/const.py:236
+#: gajim/common/const.py:270
 msgid "Doing the Dishes"
 msgstr "Lavando a louça"
 
-#: gajim/common/const.py:237
+#: gajim/common/const.py:271
 msgid "Doing the Laundry"
 msgstr "Lavando roupas"
 
-#: gajim/common/const.py:238
+#: gajim/common/const.py:272
 msgid "Gardening"
 msgstr "Fazendo jardinagem"
 
-#: gajim/common/const.py:239
+#: gajim/common/const.py:273
 msgid "Running an Errand"
 msgstr "Realizando uma tarefa"
 
-#: gajim/common/const.py:240
+#: gajim/common/const.py:274
 msgid "Walking the Dog"
 msgstr "Passeando com o cachorro"
 
-#: gajim/common/const.py:242
+#: gajim/common/const.py:276
 msgid "Drinking"
 msgstr "Bebendo"
 
-#: gajim/common/const.py:243
+#: gajim/common/const.py:277
 msgid "Having a Beer"
 msgstr "Bebendo uma cerveja"
 
-#: gajim/common/const.py:244
+#: gajim/common/const.py:278
 msgid "Having Coffee"
 msgstr "Tomando café"
 
-#: gajim/common/const.py:245
+#: gajim/common/const.py:279
 msgid "Having Tea"
 msgstr "Tomando chá"
 
-#: gajim/common/const.py:248
+#: gajim/common/const.py:282
 msgid "Having a Snack"
 msgstr "Fazendo um lanche"
 
-#: gajim/common/const.py:249
+#: gajim/common/const.py:283
 msgid "Having Breakfast"
 msgstr "Tomando café da manhã"
 
-#: gajim/common/const.py:250
+#: gajim/common/const.py:284
 msgid "Having Dinner"
 msgstr "Jantando"
 
-#: gajim/common/const.py:251
+#: gajim/common/const.py:285
 msgid "Having Lunch"
 msgstr "Almoçando"
 
-#: gajim/common/const.py:253
+#: gajim/common/const.py:287
 msgid "Exercising"
 msgstr "Exercitando"
 
-#: gajim/common/const.py:254 gajim/common/const.py:305
+#: gajim/common/const.py:288 gajim/common/const.py:339
 msgid "Cycling"
 msgstr "Andando de bicicleta"
 
-#: gajim/common/const.py:255
+#: gajim/common/const.py:289
 msgid "Dancing"
 msgstr "Dançando"
 
-#: gajim/common/const.py:256
+#: gajim/common/const.py:290
 msgid "Hiking"
 msgstr "Fazendo caminhada"
 
-#: gajim/common/const.py:257
+#: gajim/common/const.py:291
 msgid "Jogging"
 msgstr "Correndo"
 
-#: gajim/common/const.py:258
+#: gajim/common/const.py:292
 msgid "Playing Sports"
 msgstr "Praticando esportes"
 
-#: gajim/common/const.py:259
+#: gajim/common/const.py:293
 msgid "Running"
 msgstr "Correndo"
 
-#: gajim/common/const.py:260
+#: gajim/common/const.py:294
 msgid "Skiing"
 msgstr "Esquiando"
 
-#: gajim/common/const.py:261
+#: gajim/common/const.py:295
 msgid "Swimming"
 msgstr "Nadando"
 
-#: gajim/common/const.py:262
+#: gajim/common/const.py:296
 msgid "Working out"
 msgstr "Trabalhando fora"
 
-#: gajim/common/const.py:264
+#: gajim/common/const.py:298
 msgid "Grooming"
 msgstr "Afagando"
 
-#: gajim/common/const.py:265
+#: gajim/common/const.py:299
 msgid "At the Spa"
 msgstr "No Spa"
 
-#: gajim/common/const.py:266
+#: gajim/common/const.py:300
 msgid "Brushing Teeth"
 msgstr "Escovando os dentes"
 
-#: gajim/common/const.py:267
+#: gajim/common/const.py:301
 msgid "Getting a Haircut"
 msgstr "Cortando o cabelo"
 
-#: gajim/common/const.py:268
+#: gajim/common/const.py:302
 msgid "Shaving"
 msgstr "Fazendo barba"
 
-#: gajim/common/const.py:269
+#: gajim/common/const.py:303
 msgid "Taking a Bath"
 msgstr "Tomando banho"
 
-#: gajim/common/const.py:270
+#: gajim/common/const.py:304
 msgid "Taking a Shower"
 msgstr "Tomando uma ducha"
 
-#: gajim/common/const.py:272
+#: gajim/common/const.py:306
 msgid "Having an Appointment"
 msgstr "Em um compromisso"
 
-#: gajim/common/const.py:274
+#: gajim/common/const.py:308
 msgid "Inactive"
 msgstr "Inativo"
 
-#: gajim/common/const.py:275
+#: gajim/common/const.py:309
 msgid "Day Off"
 msgstr "De folga"
 
-#: gajim/common/const.py:276
+#: gajim/common/const.py:310
 msgid "Hanging out"
 msgstr "Me descontraindo"
 
-#: gajim/common/const.py:277
+#: gajim/common/const.py:311
 msgid "Hiding"
 msgstr "Me escondendo"
 
-#: gajim/common/const.py:278
+#: gajim/common/const.py:312
 msgid "On Vacation"
 msgstr "Em férias"
 
-#: gajim/common/const.py:279
+#: gajim/common/const.py:313
 msgid "Praying"
 msgstr "Orando"
 
-#: gajim/common/const.py:280
+#: gajim/common/const.py:314
 msgid "Scheduled Holiday"
 msgstr "Feriado"
 
-#: gajim/common/const.py:282
+#: gajim/common/const.py:316
 msgid "Thinking"
 msgstr "Pensando"
 
-#: gajim/common/const.py:284
+#: gajim/common/const.py:318
 msgid "Relaxing"
 msgstr "Relaxando"
 
-#: gajim/common/const.py:285
+#: gajim/common/const.py:319
 msgid "Fishing"
 msgstr "Pescando"
 
-#: gajim/common/const.py:286
+#: gajim/common/const.py:320
 msgid "Gaming"
 msgstr "Jogando"
 
-#: gajim/common/const.py:287
+#: gajim/common/const.py:321
 msgid "Going out"
 msgstr "Saindo"
 
-#: gajim/common/const.py:288
+#: gajim/common/const.py:322
 msgid "Partying"
 msgstr "Festejando"
 
-#: gajim/common/const.py:289
+#: gajim/common/const.py:323
 msgid "Reading"
 msgstr "Lendo"
 
-#: gajim/common/const.py:290
+#: gajim/common/const.py:324
 msgid "Rehearsing"
 msgstr "Ensaiando"
 
-#: gajim/common/const.py:291
+#: gajim/common/const.py:325
 msgid "Shopping"
 msgstr "Comprando"
 
-#: gajim/common/const.py:292
+#: gajim/common/const.py:326
 msgid "Smoking"
 msgstr "Fumando"
 
-#: gajim/common/const.py:293
+#: gajim/common/const.py:327
 msgid "Socializing"
 msgstr "Socializando"
 
-#: gajim/common/const.py:294
+#: gajim/common/const.py:328
 msgid "Sunbathing"
 msgstr "Tomando banho de sol"
 
-#: gajim/common/const.py:295
+#: gajim/common/const.py:329
 msgid "Watching TV"
 msgstr "Assitindo TV"
 
-#: gajim/common/const.py:296
+#: gajim/common/const.py:330
 msgid "Watching a Movie"
 msgstr "Assistindo um filme"
 
-#: gajim/common/const.py:298
+#: gajim/common/const.py:332
 msgid "Talking"
 msgstr "Falando"
 
-#: gajim/common/const.py:299
+#: gajim/common/const.py:333
 msgid "In Real Life"
 msgstr "No mundo real"
 
-#: gajim/common/const.py:300
+#: gajim/common/const.py:334
 msgid "On the Phone"
 msgstr "Ao telefone"
 
-#: gajim/common/const.py:301
+#: gajim/common/const.py:335
 msgid "On Video Phone"
 msgstr "Ao telefone"
 
-#: gajim/common/const.py:303
+#: gajim/common/const.py:337
 msgid "Traveling"
 msgstr "Viajando"
 
-#: gajim/common/const.py:304
+#: gajim/common/const.py:338
 msgid "Commuting"
 msgstr "Em trânsito"
 
-#: gajim/common/const.py:306
+#: gajim/common/const.py:340
 msgid "Driving"
 msgstr "Dirigindo"
 
-#: gajim/common/const.py:307
+#: gajim/common/const.py:341
 msgid "In a Car"
 msgstr "Em um carro"
 
-#: gajim/common/const.py:308
+#: gajim/common/const.py:342
 msgid "On a Bus"
 msgstr "Em um ônibus"
 
-#: gajim/common/const.py:309
+#: gajim/common/const.py:343
 msgid "On a Plane"
 msgstr "Em um avião"
 
-#: gajim/common/const.py:310
+#: gajim/common/const.py:344
 msgid "On a Train"
 msgstr "Em um trem"
 
-#: gajim/common/const.py:311
+#: gajim/common/const.py:345
 msgid "On a Trip"
 msgstr "Em um passeio"
 
-#: gajim/common/const.py:312
+#: gajim/common/const.py:346
 msgid "Walking"
 msgstr "Andando"
 
-#: gajim/common/const.py:315
+#: gajim/common/const.py:349
 msgid "Coding"
 msgstr "Codificado"
 
-#: gajim/common/const.py:316
+#: gajim/common/const.py:350
 msgid "In a Meeting"
 msgstr "Em um encontro"
 
-#: gajim/common/const.py:317
+#: gajim/common/const.py:351
 msgid "Studying"
 msgstr "Estudando"
 
-#: gajim/common/const.py:318
+#: gajim/common/const.py:352
 msgid "Writing"
 msgstr "Escrevendo"
 
-#: gajim/common/const.py:321
+#: gajim/common/const.py:355
 msgid "Afraid"
 msgstr "Amedrontado"
 
-#: gajim/common/const.py:322
+#: gajim/common/const.py:356
 msgid "Amazed"
 msgstr "Surpreso"
 
-#: gajim/common/const.py:323
+#: gajim/common/const.py:357
 msgid "Amorous"
 msgstr "Amoroso"
 
-#: gajim/common/const.py:324
+#: gajim/common/const.py:358
 msgid "Angry"
 msgstr "Irado"
 
-#: gajim/common/const.py:325
+#: gajim/common/const.py:359
 msgid "Annoyed"
 msgstr "Chateado"
 
-#: gajim/common/const.py:326
+#: gajim/common/const.py:360
 msgid "Anxious"
 msgstr "Ansioso"
 
-#: gajim/common/const.py:327
+#: gajim/common/const.py:361
 msgid "Aroused"
 msgstr "Estimulado"
 
-#: gajim/common/const.py:328
+#: gajim/common/const.py:362
 msgid "Ashamed"
 msgstr "Envergonhado"
 
-#: gajim/common/const.py:329
+#: gajim/common/const.py:363
 msgid "Bored"
 msgstr "Entediado"
 
-#: gajim/common/const.py:330
+#: gajim/common/const.py:364
 msgid "Brave"
 msgstr "Corajoso"
 
-#: gajim/common/const.py:331
+#: gajim/common/const.py:365
 msgid "Calm"
 msgstr "Calmo"
 
-#: gajim/common/const.py:332
+#: gajim/common/const.py:366
 msgid "Cautious"
 msgstr "Cauteloso"
 
-#: gajim/common/const.py:333
+#: gajim/common/const.py:367
 msgid "Cold"
 msgstr "Indiferente"
 
-#: gajim/common/const.py:334
+#: gajim/common/const.py:368
 msgid "Confident"
 msgstr "Confidente"
 
-#: gajim/common/const.py:335
+#: gajim/common/const.py:369
 msgid "Confused"
 msgstr "Confuso"
 
-#: gajim/common/const.py:336
+#: gajim/common/const.py:370
 msgid "Contemplative"
 msgstr "Contemplativo"
 
-#: gajim/common/const.py:337
+#: gajim/common/const.py:371
 msgid "Contented"
 msgstr "Contente"
 
-#: gajim/common/const.py:338
+#: gajim/common/const.py:372
 msgid "Cranky"
 msgstr "Nervoso"
 
-#: gajim/common/const.py:339
+#: gajim/common/const.py:373
 msgid "Crazy"
 msgstr "Louco"
 
-#: gajim/common/const.py:340
+#: gajim/common/const.py:374
 msgid "Creative"
 msgstr "Criativo"
 
-#: gajim/common/const.py:341
+#: gajim/common/const.py:375
 msgid "Curious"
 msgstr "Curioso"
 
-#: gajim/common/const.py:342
+#: gajim/common/const.py:376
 msgid "Dejected"
 msgstr "Abatido"
 
-#: gajim/common/const.py:343
+#: gajim/common/const.py:377
 msgid "Depressed"
 msgstr "Deprimido"
 
-#: gajim/common/const.py:344
+#: gajim/common/const.py:378
 msgid "Disappointed"
 msgstr "Desapontado"
 
-#: gajim/common/const.py:345
+#: gajim/common/const.py:379
 msgid "Disgusted"
 msgstr "Enojado"
 
-#: gajim/common/const.py:346
+#: gajim/common/const.py:380
 msgid "Dismayed"
 msgstr "Consternado"
 
-#: gajim/common/const.py:347
+#: gajim/common/const.py:381
 msgid "Distracted"
 msgstr "Distraído"
 
-#: gajim/common/const.py:348
+#: gajim/common/const.py:382
 msgid "Embarrassed"
 msgstr "Envergonhado"
 
-#: gajim/common/const.py:349
+#: gajim/common/const.py:383
 msgid "Envious"
 msgstr "Com inveja"
 
-#: gajim/common/const.py:350
+#: gajim/common/const.py:384
 msgid "Excited"
 msgstr "Excitado"
 
-#: gajim/common/const.py:351
+#: gajim/common/const.py:385
 msgid "Flirtatious"
 msgstr "Paquerador"
 
-#: gajim/common/const.py:352
+#: gajim/common/const.py:386
 msgid "Frustrated"
 msgstr "Frustrado"
 
-#: gajim/common/const.py:353
+#: gajim/common/const.py:387
 msgid "Grateful"
 msgstr "Agradecido"
 
-#: gajim/common/const.py:354
+#: gajim/common/const.py:388
 msgid "Grieving"
 msgstr "Angustiado"
 
-#: gajim/common/const.py:355
+#: gajim/common/const.py:389
 msgid "Grumpy"
 msgstr "Mal-humorado"
 
-#: gajim/common/const.py:356
+#: gajim/common/const.py:390
 msgid "Guilty"
 msgstr "Culpado"
 
-#: gajim/common/const.py:357
+#: gajim/common/const.py:391
 msgid "Happy"
 msgstr "Feliz"
 
-#: gajim/common/const.py:358
+#: gajim/common/const.py:392
 msgid "Hopeful"
 msgstr "Esperançoso"
 
-#: gajim/common/const.py:359
+#: gajim/common/const.py:393
 msgid "Hot"
 msgstr "Quente"
 
-#: gajim/common/const.py:360
+#: gajim/common/const.py:394
 msgid "Humbled"
 msgstr "Humilde"
 
-#: gajim/common/const.py:361
+#: gajim/common/const.py:395
 msgid "Humiliated"
 msgstr "Humilhado"
 
-#: gajim/common/const.py:362
+#: gajim/common/const.py:396
 msgid "Hungry"
 msgstr "Com fome"
 
-#: gajim/common/const.py:363
+#: gajim/common/const.py:397
 msgid "Hurt"
 msgstr "Machucado"
 
-#: gajim/common/const.py:364
+#: gajim/common/const.py:398
 msgid "Impressed"
 msgstr "Impressionado"
 
-#: gajim/common/const.py:365
+#: gajim/common/const.py:399
 msgid "In Awe"
 msgstr "Chocado"
 
-#: gajim/common/const.py:366
+#: gajim/common/const.py:400
 msgid "In Love"
 msgstr "Apaixonado"
 
-#: gajim/common/const.py:367
+#: gajim/common/const.py:401
 msgid "Indignant"
 msgstr "Indignado"
 
-#: gajim/common/const.py:368
+#: gajim/common/const.py:402
 msgid "Interested"
 msgstr "Interessado"
 
-#: gajim/common/const.py:369
+#: gajim/common/const.py:403
 msgid "Intoxicated"
 msgstr "Intoxicado"
 
-#: gajim/common/const.py:370
+#: gajim/common/const.py:404
 msgid "Invincible"
 msgstr "Invencível"
 
-#: gajim/common/const.py:371
+#: gajim/common/const.py:405
 msgid "Jealous"
 msgstr "Envergonhado"
 
-#: gajim/common/const.py:372
+#: gajim/common/const.py:406
 msgid "Lonely"
 msgstr "Sozinho"
 
-#: gajim/common/const.py:373
+#: gajim/common/const.py:407
 msgid "Lost"
 msgstr "Perdido"
 
-#: gajim/common/const.py:374
+#: gajim/common/const.py:408
 msgid "Lucky"
 msgstr "Sortudo"
 
-#: gajim/common/const.py:375
+#: gajim/common/const.py:409
 msgid "Mean"
 msgstr "Mau"
 
-#: gajim/common/const.py:376
+#: gajim/common/const.py:410
 msgid "Moody"
 msgstr "Mal-humorado"
 
-#: gajim/common/const.py:377
+#: gajim/common/const.py:411
 msgid "Nervous"
 msgstr "Nervoso"
 
-#: gajim/common/const.py:378
+#: gajim/common/const.py:412
 msgid "Neutral"
 msgstr "Neutro"
 
-#: gajim/common/const.py:379
+#: gajim/common/const.py:413
 msgid "Offended"
 msgstr "Ofendido"
 
-#: gajim/common/const.py:380
+#: gajim/common/const.py:414
 msgid "Outraged"
 msgstr "Indignado"
 
-#: gajim/common/const.py:381
+#: gajim/common/const.py:415
 msgid "Playful"
 msgstr "Brincalhão"
 
-#: gajim/common/const.py:382
+#: gajim/common/const.py:416
 msgid "Proud"
 msgstr "Orgulhoso"
 
-#: gajim/common/const.py:383
+#: gajim/common/const.py:417
 msgid "Relaxed"
 msgstr "Relaxado"
 
-#: gajim/common/const.py:384
+#: gajim/common/const.py:418
 msgid "Relieved"
 msgstr "Aliviado"
 
-#: gajim/common/const.py:385
+#: gajim/common/const.py:419
 msgid "Remorseful"
 msgstr "Arrependido"
 
-#: gajim/common/const.py:386
+#: gajim/common/const.py:420
 msgid "Restless"
 msgstr "Inquieto"
 
-#: gajim/common/const.py:387
+#: gajim/common/const.py:421
 msgid "Sad"
 msgstr "Triste"
 
-#: gajim/common/const.py:388
+#: gajim/common/const.py:422
 msgid "Sarcastic"
 msgstr "Sarcástico"
 
-#: gajim/common/const.py:389
+#: gajim/common/const.py:423
 msgid "Satisfied"
 msgstr "Satisfeito"
 
-#: gajim/common/const.py:390
+#: gajim/common/const.py:424
 msgid "Serious"
 msgstr "Sério"
 
-#: gajim/common/const.py:391
+#: gajim/common/const.py:425
 msgid "Shocked"
 msgstr "Chocado"
 
-#: gajim/common/const.py:392
+#: gajim/common/const.py:426
 msgid "Shy"
 msgstr "Tímido"
 
-#: gajim/common/const.py:393
+#: gajim/common/const.py:427
 msgid "Sick"
 msgstr "Doente"
 
-#: gajim/common/const.py:394
+#: gajim/common/const.py:428
 msgid "Sleepy"
 msgstr "Com sono"
 
-#: gajim/common/const.py:395
+#: gajim/common/const.py:429
 msgid "Spontaneous"
 msgstr "Espontâneo"
 
-#: gajim/common/const.py:396
+#: gajim/common/const.py:430
 msgid "Stressed"
 msgstr "Estressado"
 
-#: gajim/common/const.py:397
+#: gajim/common/const.py:431
 msgid "Strong"
 msgstr "Forte"
 
-#: gajim/common/const.py:398
+#: gajim/common/const.py:432
 msgid "Surprised"
 msgstr "Surpreso"
 
-#: gajim/common/const.py:399
+#: gajim/common/const.py:433
 msgid "Thankful"
 msgstr "Agradecido"
 
-#: gajim/common/const.py:400
+#: gajim/common/const.py:434
 msgid "Thirsty"
 msgstr "Com sede"
 
-#: gajim/common/const.py:401
+#: gajim/common/const.py:435
 msgid "Tired"
 msgstr "Cansado"
 
-#: gajim/common/const.py:402
+#: gajim/common/const.py:436
 msgid "Undefined"
 msgstr "Indefinido"
 
-#: gajim/common/const.py:403
+#: gajim/common/const.py:437
 msgid "Weak"
 msgstr "Fraco"
 
-#: gajim/common/const.py:404
+#: gajim/common/const.py:438
 msgid "Worried"
 msgstr "Preocupado"
 
-#: gajim/common/const.py:408
+#: gajim/common/const.py:442
 msgid "accuracy"
 msgstr ""
 
-#: gajim/common/const.py:409
+#: gajim/common/const.py:443
 #, fuzzy
 msgid "alt"
 msgstr "padrão"
 
-#: gajim/common/const.py:410
+#: gajim/common/const.py:444
 msgid "area"
 msgstr ""
 
-#: gajim/common/const.py:411
+#: gajim/common/const.py:445
 #, fuzzy
 msgid "bearing"
 msgstr "marinho"
 
-#: gajim/common/const.py:412
+#: gajim/common/const.py:446
 #, fuzzy
 msgid "building"
 msgstr "Me escondendo"
 
-#: gajim/common/const.py:413
+#: gajim/common/const.py:447
 #, fuzzy
 msgid "country"
 msgstr "País:"
 
-#: gajim/common/const.py:414
+#: gajim/common/const.py:448
 #, fuzzy
 msgid "countrycode"
 msgstr "Conta"
 
-#: gajim/common/const.py:415
+#: gajim/common/const.py:449
 msgid "datum"
 msgstr ""
 
-#: gajim/common/const.py:416
+#: gajim/common/const.py:450
 #, fuzzy
 msgid "description"
 msgstr "Descrição"
 
-#: gajim/common/const.py:417
+#: gajim/common/const.py:451
 #, fuzzy
 msgid "error"
 msgstr "Erro"
 
-#: gajim/common/const.py:418
+#: gajim/common/const.py:452
 msgid "floor"
 msgstr ""
 
-#: gajim/common/const.py:419
+#: gajim/common/const.py:453
 msgid "lat"
 msgstr ""
 
-#: gajim/common/const.py:420
+#: gajim/common/const.py:454
 msgid "locality"
 msgstr ""
 
-#: gajim/common/const.py:421
+#: gajim/common/const.py:455
 #, fuzzy
 msgid "lon"
 msgstr "um"
 
-#: gajim/common/const.py:422
+#: gajim/common/const.py:456
 msgid "postalcode"
 msgstr ""
 
-#: gajim/common/const.py:423
+#: gajim/common/const.py:457
 msgid "region"
 msgstr ""
 
-#: gajim/common/const.py:424
+#: gajim/common/const.py:458
 msgid "room"
 msgstr "sala"
 
-#: gajim/common/const.py:425
+#: gajim/common/const.py:459
 msgid "speed"
 msgstr ""
 
-#: gajim/common/const.py:426
+#: gajim/common/const.py:460
 msgid "street"
 msgstr ""
 
-#: gajim/common/const.py:427
+#: gajim/common/const.py:461
 msgid "text"
 msgstr ""
 
-#: gajim/common/const.py:428
+#: gajim/common/const.py:462
 msgid "timestamp"
 msgstr ""
 
-#: gajim/common/const.py:429
+#: gajim/common/const.py:463
 msgid "URI"
 msgstr ""
 
-#: gajim/common/const.py:434
+#: gajim/common/const.py:468
 msgid "Unable to get issuer certificate"
 msgstr "Não foi possível obter o certificado do emissor"
 
-#: gajim/common/const.py:435
+#: gajim/common/const.py:469
 msgid "Unable to get certificate CRL"
 msgstr "Não foi possível obter certificado CRL"
 
-#: gajim/common/const.py:436
+#: gajim/common/const.py:470
 msgid "Unable to decrypt certificate's signature"
 msgstr "Não foi possível descriptografar a assinatura do certificado"
 
-#: gajim/common/const.py:437
+#: gajim/common/const.py:471
 msgid "Unable to decrypt CRL's signature"
 msgstr "Não foi possível descriptografar a assinatura CRL"
 
-#: gajim/common/const.py:438
+#: gajim/common/const.py:472
 msgid "Unable to decode issuer public key"
 msgstr "Não foi possível decodificar a chave pública do emissor"
 
-#: gajim/common/const.py:439
+#: gajim/common/const.py:473
 msgid "Certificate signature failure"
 msgstr "Assinatura do certificado falhou"
 
-#: gajim/common/const.py:440
+#: gajim/common/const.py:474
 msgid "CRL signature failure"
 msgstr "Falha na assinatura CRL"
 
-#: gajim/common/const.py:441
+#: gajim/common/const.py:475
 msgid "Certificate is not yet valid"
 msgstr "O certificado ainda não é válido"
 
-#: gajim/common/const.py:442
+#: gajim/common/const.py:476
 msgid "Certificate has expired"
 msgstr "O certificado expirou"
 
-#: gajim/common/const.py:443
+#: gajim/common/const.py:477
 msgid "CRL is not yet valid"
 msgstr "CRL ainda não é válido"
 
-#: gajim/common/const.py:444
+#: gajim/common/const.py:478
 msgid "CRL has expired"
 msgstr "CRL expirou"
 
-#: gajim/common/const.py:445
+#: gajim/common/const.py:479
 msgid "Format error in certificate's notBefore field"
 msgstr "Erro de formato nos certificados no campo notBefore"
 
-#: gajim/common/const.py:446
+#: gajim/common/const.py:480
 msgid "Format error in certificate's notAfter field"
 msgstr "Erro de formato nos certificados no campo notAfter"
 
-#: gajim/common/const.py:447
+#: gajim/common/const.py:481
 msgid "Format error in CRL's lastUpdate field"
 msgstr "Erro de formato no campo lastUpdate do CRL"
 
-#: gajim/common/const.py:448
+#: gajim/common/const.py:482
 msgid "Format error in CRL's nextUpdate field"
 msgstr "Erro de formato no campo nextUpdate do CRL"
 
-#: gajim/common/const.py:449
+#: gajim/common/const.py:483
 msgid "Out of memory"
 msgstr "Memória insuficiente"
 
-#: gajim/common/const.py:450
+#: gajim/common/const.py:484
 msgid "Self signed certificate"
 msgstr "Certificado próprio"
 
-#: gajim/common/const.py:451
+#: gajim/common/const.py:485
 msgid "Self signed certificate in certificate chain"
 msgstr "Certificado próprio na cadeia de certificados"
 
-#: gajim/common/const.py:452
+#: gajim/common/const.py:486
 msgid "Unable to get local issuer certificate"
 msgstr "Não foi possível obter o certificado do emissor local"
 
-#: gajim/common/const.py:453
+#: gajim/common/const.py:487
 msgid "Unable to verify the first certificate"
 msgstr "Não foi possível verificar o primeiro certificado"
 
-#: gajim/common/const.py:454
+#: gajim/common/const.py:488
 msgid "Certificate chain too long"
 msgstr "A cadeia de certificados é muito longa"
 
-#: gajim/common/const.py:455
+#: gajim/common/const.py:489
 msgid "Certificate revoked"
 msgstr "Certificado revocado"
 
-#: gajim/common/const.py:456
+#: gajim/common/const.py:490
 msgid "Invalid CA certificate"
 msgstr "Certificado CA inválido"
 
-#: gajim/common/const.py:457
+#: gajim/common/const.py:491
 msgid "Path length constraint exceeded"
 msgstr "Limite de comprimento do caminho excedido"
 
-#: gajim/common/const.py:458
+#: gajim/common/const.py:492
 msgid "Unsupported certificate purpose"
 msgstr "Certificado de propósito não suportado"
 
-#: gajim/common/const.py:459
+#: gajim/common/const.py:493
 msgid "Certificate not trusted"
 msgstr "Certificado não confiável"
 
-#: gajim/common/const.py:460
+#: gajim/common/const.py:494
 msgid "Certificate rejected"
 msgstr "Certificado rejeitado"
 
-#: gajim/common/const.py:461
+#: gajim/common/const.py:495
 msgid "Subject issuer mismatch"
 msgstr "Assunto do emissor não coincide"
 
-#: gajim/common/const.py:462
+#: gajim/common/const.py:496
 msgid "Authority and subject key identifier mismatch"
 msgstr "Chave identificadora de autoridade e assunto não coincidem"
 
-#: gajim/common/const.py:463
+#: gajim/common/const.py:497
 msgid "Authority and issuer serial number mismatch"
 msgstr "Autoridade e número serial do emissor não coincidem"
 
-#: gajim/common/const.py:464
+#: gajim/common/const.py:498
 msgid "Key usage does not include certificate signing"
 msgstr "O uso das chaves não inclui assinatura de certificado"
 
-#: gajim/common/const.py:465
+#: gajim/common/const.py:499
 msgid "Application verification failure"
 msgstr "Verificação do aplicativo falhou"
 
@@ -5184,261 +5322,261 @@ msgstr ""
 msgid "video output"
 msgstr ""
 
-#: gajim/common/helpers.py:210
+#: gajim/common/helpers.py:216
 msgid "Server must be between 1 and 1023 bytes"
 msgstr ""
 
-#: gajim/common/helpers.py:214
+#: gajim/common/helpers.py:220
 msgid "Invalid character in hostname."
 msgstr "Caracter inválido no nome do host."
 
-#: gajim/common/helpers.py:216
+#: gajim/common/helpers.py:222
 msgid "Server address required."
 msgstr "Endereço do servidor é requerido."
 
-#: gajim/common/helpers.py:220
+#: gajim/common/helpers.py:226
 msgid "Username must be between 1 and 1023 bytes"
 msgstr ""
 
-#: gajim/common/helpers.py:224
+#: gajim/common/helpers.py:230
 msgid "Invalid character in username."
 msgstr "Caracter inválido no nome do usuário."
 
-#: gajim/common/helpers.py:230
+#: gajim/common/helpers.py:236
 msgid "Resource must be between 1 and 1023 bytes"
 msgstr ""
 
-#: gajim/common/helpers.py:234
+#: gajim/common/helpers.py:240
 msgid "Invalid character in resource."
 msgstr "Caracter inválido no recurso."
 
-#: gajim/common/helpers.py:275
+#: gajim/common/helpers.py:281
 msgid "_Busy"
 msgstr "_Ocupado"
 
-#: gajim/common/helpers.py:277 gajim/gtk/tooltips.py:647
+#: gajim/common/helpers.py:283 gajim/gtk/tooltips.py:647
 msgid "Busy"
 msgstr "Ocupado"
 
-#: gajim/common/helpers.py:280
+#: gajim/common/helpers.py:286
 msgid "_Not Available"
 msgstr "_Não disponível"
 
-#: gajim/common/helpers.py:282 gajim/gtk/tooltips.py:649
+#: gajim/common/helpers.py:288 gajim/gtk/tooltips.py:649
 msgid "Not Available"
 msgstr "Não disponível"
 
-#: gajim/common/helpers.py:285
+#: gajim/common/helpers.py:291
 msgid "_Free for Chat"
 msgstr "Livre para _conversa"
 
-#: gajim/common/helpers.py:287 gajim/gtk/tooltips.py:643
+#: gajim/common/helpers.py:293 gajim/gtk/tooltips.py:643
 msgid "Free for Chat"
 msgstr "Livre para conversa"
 
-#: gajim/common/helpers.py:290
+#: gajim/common/helpers.py:296
 #, fuzzy
 msgid "?user status:_Available"
 msgstr "?status da transferência:Parado"
 
-#: gajim/common/helpers.py:292 gajim/gtk/tooltips.py:641
+#: gajim/common/helpers.py:298 gajim/gtk/tooltips.py:641
 #, fuzzy
 msgid "?user status:Available"
 msgstr "?status da transferência:Parado"
 
-#: gajim/common/helpers.py:294
+#: gajim/common/helpers.py:300
 msgid "Connecting"
 msgstr "Conectando"
 
-#: gajim/common/helpers.py:297 gajim/data/gui/preferences_window.ui:1251
+#: gajim/common/helpers.py:303 gajim/data/gui/preferences_window.ui:1251
 msgid "A_way"
 msgstr "_Afastado"
 
-#: gajim/common/helpers.py:299 gajim/common/modules/adhoc_commands.py:120
-#: gajim/command_system/implementation/standard.py:139
+#: gajim/common/helpers.py:305 gajim/common/modules/adhoc_commands.py:120
+#: gajim/command_system/implementation/standard.py:141
 #: gajim/gtk/tooltips.py:645
 msgid "Away"
 msgstr "Afastado"
 
-#: gajim/common/helpers.py:302
+#: gajim/common/helpers.py:308
 msgid "_Offline"
 msgstr "_Desconectado"
 
-#: gajim/common/helpers.py:304 gajim/gtk/tooltips.py:651
+#: gajim/common/helpers.py:310 gajim/gtk/tooltips.py:651
 msgid "Offline"
 msgstr "Desconectado"
 
-#: gajim/common/helpers.py:307
+#: gajim/common/helpers.py:313
 msgid "_Invisible"
 msgstr "_Invisível"
 
-#: gajim/common/helpers.py:313
+#: gajim/common/helpers.py:319
 msgid "?contact has status:Unknown"
 msgstr "?contato tem status:Desconhecido"
 
-#: gajim/common/helpers.py:315
+#: gajim/common/helpers.py:321
 msgid "?contact has status:Has errors"
 msgstr "?contato tem status:Com erros"
 
-#: gajim/common/helpers.py:330
+#: gajim/common/helpers.py:336
 msgid "?Subscription we already have:None"
 msgstr "?Inscrição existente:Nenhuma"
 
-#: gajim/common/helpers.py:332
+#: gajim/common/helpers.py:338
 msgid "To"
 msgstr "Para"
 
-#: gajim/common/helpers.py:334 gajim/data/gui/groups_post_window.ui:33
+#: gajim/common/helpers.py:340 gajim/data/gui/groups_post_window.ui:33
 msgid "From"
 msgstr "De"
 
-#: gajim/common/helpers.py:336
+#: gajim/common/helpers.py:342
 msgid "Both"
 msgstr "Ambos"
 
-#: gajim/common/helpers.py:338 gajim/gtk/server_info.py:151
+#: gajim/common/helpers.py:344 gajim/gtk/server_info.py:151
 #, fuzzy
 msgid "Unknown"
 msgstr "?SO:Desconhecido"
 
-#: gajim/common/helpers.py:344
+#: gajim/common/helpers.py:350
 msgid "?Ask (for Subscription):None"
 msgstr "?Pergunta (para inscrição):Nenhuma"
 
-#: gajim/common/helpers.py:346
+#: gajim/common/helpers.py:352
 msgid "Subscribe"
 msgstr "Inscrever"
 
-#: gajim/common/helpers.py:355
+#: gajim/common/helpers.py:361
 msgid "?Group Chat Contact Role:None"
 msgstr "?Regra do contato para conversa em grupo:Nenhuma"
 
-#: gajim/common/helpers.py:358
+#: gajim/common/helpers.py:364
 msgid "Moderators"
 msgstr "Moderadores"
 
-#: gajim/common/helpers.py:360
+#: gajim/common/helpers.py:366
 msgid "Moderator"
 msgstr "Moderador"
 
-#: gajim/common/helpers.py:363
+#: gajim/common/helpers.py:369 gajim/data/gui/groupchat_info_scrolled.ui:243
 msgid "Participants"
 msgstr "Participantes"
 
-#: gajim/common/helpers.py:365
+#: gajim/common/helpers.py:371
 msgid "Participant"
 msgstr "Participante"
 
-#: gajim/common/helpers.py:368
+#: gajim/common/helpers.py:374
 msgid "Visitors"
 msgstr "Visitantes"
 
-#: gajim/common/helpers.py:370
+#: gajim/common/helpers.py:376
 msgid "Visitor"
 msgstr "Visitante"
 
-#: gajim/common/helpers.py:376 gajim/gtk/tooltips.py:253
+#: gajim/common/helpers.py:382 gajim/gtk/tooltips.py:253
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "?Filiação do contato de conferência:Nenhuma"
 
-#: gajim/common/helpers.py:378 gajim/data/gui/groupchat_config.ui:32
+#: gajim/common/helpers.py:384 gajim/data/gui/groupchat_config.ui:32
 #: gajim/gtk/tooltips.py:259
 msgid "Owner"
 msgstr "Dono"
 
-#: gajim/common/helpers.py:380 gajim/gtk/tooltips.py:257
+#: gajim/common/helpers.py:386 gajim/gtk/tooltips.py:257
 msgid "Administrator"
 msgstr "Administrador"
 
-#: gajim/common/helpers.py:382 gajim/data/gui/groupchat_config.ui:40
+#: gajim/common/helpers.py:388 gajim/data/gui/groupchat_config.ui:40
 #: gajim/gtk/tooltips.py:255 gajim/gtk/groupchat_config.py:105
 msgid "Member"
 msgstr "Membro"
 
-#: gajim/common/helpers.py:421
+#: gajim/common/helpers.py:427
 msgid "is paying attention to the conversation"
 msgstr "está prestando a atenção na conversa"
 
-#: gajim/common/helpers.py:423
+#: gajim/common/helpers.py:429
 msgid "is doing something else"
 msgstr "está fazendo outra coisa"
 
-#: gajim/common/helpers.py:425
+#: gajim/common/helpers.py:431
 #, fuzzy
 msgid "is composing a message…"
 msgstr "está digitando..."
 
-#: gajim/common/helpers.py:428
+#: gajim/common/helpers.py:434
 msgid "paused composing a message"
 msgstr "parou de digitar"
 
-#: gajim/common/helpers.py:430
+#: gajim/common/helpers.py:436
 msgid "has closed the chat window or tab"
 msgstr "fechou a janela de conversa ou aba"
 
-#: gajim/common/helpers.py:936 gajim/common/helpers.py:943
+#: gajim/common/helpers.py:942 gajim/common/helpers.py:949
 #, 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:950
+#: gajim/common/helpers.py:956
 #, fuzzy, python-format
-msgid "from room %s"
-msgstr " da sala %s"
+msgid "from group chat %s"
+msgstr "em uma c_onferência"
 
-#: gajim/common/helpers.py:953 gajim/common/helpers.py:970
+#: gajim/common/helpers.py:959 gajim/common/helpers.py:976
 #, fuzzy, python-format
 msgid "from user %s"
 msgstr " do usuário %s"
 
-#: gajim/common/helpers.py:955
+#: gajim/common/helpers.py:961
 #, fuzzy, python-format
 msgid "from %s"
 msgstr " de %s"
 
-#: gajim/common/helpers.py:962 gajim/common/helpers.py:968
+#: gajim/common/helpers.py:968 gajim/common/helpers.py:974
 #, 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:986 gajim/common/helpers.py:998
+#: gajim/common/helpers.py:992 gajim/common/helpers.py:1004
 #: gajim/data/gui/roster_window.ui:85 data/org.gajim.Gajim.desktop.in:4
 #: data/org.gajim.Gajim.appdata.xml.in:9
 msgid "Gajim"
 msgstr "Gajim"
 
-#: gajim/common/helpers.py:1000
+#: gajim/common/helpers.py:1006
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: gajim/common/helpers.py:1109 gajim/data/gui/add_new_contact_window.ui:25
+#: gajim/common/helpers.py:1115 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:1111
+#: gajim/common/helpers.py:1117
 msgid "Hello, I am $name."
 msgstr ""
 
-#: gajim/common/helpers.py:1215 gajim/common/helpers.py:1224
-#: gajim/common/helpers.py:1282
+#: gajim/common/helpers.py:1221 gajim/common/helpers.py:1230
+#: gajim/common/helpers.py:1288
 msgid "Timeout loading image"
 msgstr "Tempo esgotado ao carregar a imagem"
 
-#: gajim/common/helpers.py:1234 gajim/common/helpers.py:1280
+#: gajim/common/helpers.py:1240 gajim/common/helpers.py:1286
 msgid "Image is too big"
 msgstr "A imagem é grande demais"
 
-#: gajim/common/helpers.py:1245
+#: gajim/common/helpers.py:1251
 #, fuzzy
 msgid "PyCURL is not installed"
 msgstr "CRL ainda não é válido"
 
-#: gajim/common/helpers.py:1284
+#: gajim/common/helpers.py:1290
 #, fuzzy
 msgid "Error loading image"
 msgstr "Tempo esgotado ao carregar a imagem"
@@ -5620,7 +5758,8 @@ msgstr "O status foi alterado."
 
 #: gajim/common/modules/adhoc_commands.py:202
 #: gajim/common/modules/adhoc_commands.py:239
-msgid "Leave Groupchats"
+#, fuzzy
+msgid "Leave Group Chats"
 msgstr "Sair das salas"
 
 #: gajim/common/modules/adhoc_commands.py:228
@@ -5629,15 +5768,18 @@ msgid "%(nickname)s on %(room_jid)s"
 msgstr "%(nickname)s da sala %(room_jid)s"
 
 #: gajim/common/modules/adhoc_commands.py:232
-msgid "You have not joined a groupchat."
+#, fuzzy
+msgid "You have not joined a group chat."
 msgstr "Você não entrou em uma sala."
 
 #: gajim/common/modules/adhoc_commands.py:240
-msgid "Choose the groupchats you want to leave"
+#, fuzzy
+msgid "Choose the group chats you want to leave"
 msgstr "Selecione as salas das quais você quer sair"
 
 #: gajim/common/modules/adhoc_commands.py:289
-msgid "You left the following groupchats:"
+#, fuzzy
+msgid "You left the following group chats:"
 msgstr "Você saiu das seguintes salas:"
 
 #: gajim/common/modules/roster_item_exchange.py:102
@@ -5653,7 +5795,7 @@ msgstr "Enviar contatos:"
 msgid "Blocked Contacts"
 msgstr "Contatos bloqueados"
 
-#: gajim/data/gui/destroy_muc_dialog.ui:79 gajim/gtk/dialogs.py:736
+#: gajim/data/gui/destroy_muc_dialog.ui:79 gajim/gtk/dialogs.py:563
 msgid "Destroy this group chat permanently?"
 msgstr ""
 
@@ -5662,7 +5804,7 @@ msgstr ""
 msgid "Reason..."
 msgstr "Razão"
 
-#: gajim/data/gui/destroy_muc_dialog.ui:124 gajim/gtk/dialogs.py:738
+#: gajim/data/gui/destroy_muc_dialog.ui:124 gajim/gtk/dialogs.py:565
 msgid "Where participants should go (optional)"
 msgstr ""
 
@@ -5675,33 +5817,6 @@ msgstr ""
 msgid "_Reason and alternate venue (optional)"
 msgstr "Você também pode entrar com um ponto de encontro alternativo:"
 
-#: gajim/data/gui/advanced_configuration_window.ui:7
-#: gajim/data/gui/preferences_window.ui:2723
-#, fuzzy
-msgid "Advanced Configuration Editor (ACE)"
-msgstr "Editor de configurações avançado"
-
-#: gajim/data/gui/advanced_configuration_window.ui:52
-msgid "You should restart Gajim for some changes to take effect"
-msgstr ""
-"Você deve reiniciar o Gajim para que algumas configurações tenham efeito"
-
-#: gajim/data/gui/advanced_configuration_window.ui:84
-#, fuzzy
-msgid "_Filter"
-msgstr "_Filtro:"
-
-#: gajim/data/gui/advanced_configuration_window.ui:153
-#: gajim/data/gui/filetransfers_send_file_dialog.ui:15
-#: gajim/gtk/discovery.py:1666
-msgid "Description"
-msgstr "Descrição"
-
-#: gajim/data/gui/advanced_configuration_window.ui:197
-#, fuzzy
-msgid "_Reset to default"
-msgstr "Voltar para as cores _padrões"
-
 #: gajim/data/gui/join_groupchat_window.ui:56
 #: gajim/data/gui/chat_to_muc_window.ui:67
 #: gajim/data/gui/chat_to_muc_window.ui:78
@@ -5713,9 +5828,8 @@ msgid "Join group chat every time Gajim is started"
 msgstr ""
 
 #: gajim/data/gui/join_groupchat_window.ui:113
-#, fuzzy
-msgid "Auto Join"
-msgstr "Ingresso automático"
+msgid "Join Automatically"
+msgstr ""
 
 #: gajim/data/gui/join_groupchat_window.ui:131
 #: gajim/data/gui/profile_window.ui:233
@@ -5724,10 +5838,11 @@ msgstr "Conta"
 
 #: gajim/data/gui/join_groupchat_window.ui:147
 #, fuzzy
-msgid "Room"
-msgstr "Sala:"
+msgid "Group chat"
+msgstr "Salas"
 
-#: gajim/data/gui/join_groupchat_window.ui:180 gajim/gtk/accounts.py:886
+#: gajim/data/gui/join_groupchat_window.ui:180 gajim/data/gui/bookmarks.ui:158
+#: gajim/gtk/accounts.py:889
 #, fuzzy
 msgid "Password"
 msgstr "Senha:"
@@ -5751,89 +5866,11 @@ msgstr "em uma c_onferência"
 msgid "Search group chats on selected server"
 msgstr ""
 
-#: gajim/data/gui/join_groupchat_window.ui:437 gajim/gtk/discovery.py:1271
+#: gajim/data/gui/join_groupchat_window.ui:437 gajim/gtk/discovery.py:1270
 #, fuzzy
 msgid "Join"
 msgstr "_Ingressar"
 
-#: gajim/data/gui/manage_proxies_window.ui:12
-msgid "HTTP Connect"
-msgstr "Conexão HTTP"
-
-#: gajim/data/gui/manage_proxies_window.ui:15
-msgid "SOCKS5"
-msgstr ""
-
-#: gajim/data/gui/manage_proxies_window.ui:18
-msgid "BOSH"
-msgstr ""
-
-#: gajim/data/gui/manage_proxies_window.ui:27
-msgid "Manage Proxy Profiles"
-msgstr "Gerenciar perfis de proxy"
-
-#: gajim/data/gui/manage_proxies_window.ui:83
-#, fuzzy
-msgid "Add Proxy"
-msgstr "Proxy:"
-
-#: gajim/data/gui/manage_proxies_window.ui:97
-#, fuzzy
-msgid "Remove Proxy"
-msgstr "Remover grupo"
-
-#: gajim/data/gui/manage_proxies_window.ui:141
-msgid "Properties"
-msgstr "Propriedades"
-
-#: gajim/data/gui/manage_proxies_window.ui:157
-#, fuzzy
-msgid "_Name"
-msgstr "_Nome:"
-
-#: gajim/data/gui/manage_proxies_window.ui:173
-#, fuzzy
-msgid "_Type"
-msgstr "_Tipo:"
-
-#: gajim/data/gui/manage_proxies_window.ui:236
-#, fuzzy
-msgid "_BOSH URL"
-msgstr "URL _BOSH:"
-
-#: gajim/data/gui/manage_proxies_window.ui:261
-msgid "Use HTTP prox_y"
-msgstr "Usar prox_y HTTP"
-
-#: gajim/data/gui/manage_proxies_window.ui:280
-#, fuzzy
-msgid "Proxy _Host"
-msgstr "Máqu_ina Proxy:"
-
-#: gajim/data/gui/manage_proxies_window.ui:307
-#, fuzzy
-msgid "Proxy _Port"
-msgstr "_Porta do máquina:"
-
-#: gajim/data/gui/manage_proxies_window.ui:334
-#, fuzzy
-msgid "_Username"
-msgstr "Nome de _usuário:"
-
-#: gajim/data/gui/manage_proxies_window.ui:347
-msgid "Use proxy auth_entication"
-msgstr "Usar aut_enticação de proxy"
-
-#: gajim/data/gui/manage_proxies_window.ui:377
-#, fuzzy
-msgid "Pass_word"
-msgstr "_Senha:"
-
-#: gajim/data/gui/manage_proxies_window.ui:405 gajim/gtk/adhoc.py:321
-#, fuzzy
-msgid "Settings"
-msgstr "Falha ao registrar"
-
 #: gajim/data/gui/change_password_dialog.ui:17
 #, fuzzy
 msgid "New Password"
@@ -5864,11 +5901,13 @@ msgid "Status:"
 msgstr "Status:"
 
 #: gajim/data/gui/zeroconf_information_window.ui:89
-msgid "_Log conversation history"
+#, fuzzy
+msgid "_Store conversation history"
 msgstr "_Histórico de conversação"
 
 #: gajim/data/gui/zeroconf_information_window.ui:215
 #: gajim/data/gui/vcard_information_window.ui:390
+#: gajim/data/gui/groupchat_info_scrolled.ui:166
 msgid "Contact"
 msgstr "Contato"
 
@@ -5881,8 +5920,9 @@ msgid "Last Name:"
 msgstr "Último nome:"
 
 #: gajim/data/gui/zeroconf_information_window.ui:260
-msgid "Jabber ID:"
-msgstr "Jabber ID:"
+#, fuzzy
+msgid "XMPP Address:"
+msgstr "Endereço AIM:"
 
 #: gajim/data/gui/zeroconf_information_window.ui:273
 msgid "E-Mail:"
@@ -5902,8 +5942,9 @@ msgid "Send _File"
 msgstr "Enviar _arquivo"
 
 #: gajim/data/gui/gc_occupants_menu.ui:29
-msgid "Occupant Actions"
-msgstr "Ações de ocupante"
+#, fuzzy
+msgid "Participant Actions"
+msgstr "Participantes"
 
 #: gajim/data/gui/gc_occupants_menu.ui:38
 msgid "_Voice"
@@ -5934,8 +5975,9 @@ msgid "_Ban"
 msgstr "_Banir"
 
 #: gajim/data/gui/gc_occupants_menu.ui:124
-msgid "_Add to Roster"
-msgstr "_Adicionar à lista"
+#, fuzzy
+msgid "_Add to Contact List"
+msgstr "_Adicionar contato..."
 
 #: gajim/data/gui/gc_occupants_menu.ui:132
 #, fuzzy
@@ -5973,11 +6015,6 @@ msgstr "Inscrição:"
 msgid "_Status"
 msgstr "_Status"
 
-#: gajim/data/gui/zeroconf_context_menu.ui:26
-#: gajim/data/gui/account_context_menu.ui:79
-msgid "_Modify Account..."
-msgstr "_Alterar conta..."
-
 #: gajim/data/gui/certificate_dialog.ui:66
 #: gajim/data/gui/certificate_dialog.ui:178
 msgid "Common Name (CN)"
@@ -6059,13 +6096,19 @@ msgstr "Modificado:"
 msgid "Next entry"
 msgstr ""
 
+#: gajim/data/gui/filetransfers_send_file_dialog.ui:15
+#: gajim/data/gui/advanced_configuration.ui:143
+#: gajim/data/gui/groupchat_info_scrolled.ui:48 gajim/gtk/discovery.py:1663
+msgid "Description"
+msgstr "Descrição"
+
 #: gajim/data/gui/filetransfers_send_file_dialog.ui:54
 #, fuzzy
 msgid "_Send Files"
 msgstr "Enviar _arquivo"
 
 #: gajim/data/gui/filetransfers_send_file_dialog.ui:58
-#: gajim/gtk/xml_console.py:90
+#: gajim/gtk/xml_console.py:87
 #, fuzzy
 msgid "Send"
 msgstr "_Enviar"
@@ -6090,20 +6133,23 @@ msgid "Change _Nickname..."
 msgstr "Alterar _apelido..."
 
 #: gajim/data/gui/gc_control_popup_menu.ui:20
-msgid "_Manage Room"
-msgstr "_Gerenciar sala"
+#, fuzzy
+msgid "_Manage Group Chat"
+msgstr "_Nova conferência"
 
 #: gajim/data/gui/gc_control_popup_menu.ui:31
 msgid "Change _Subject..."
 msgstr "Alterar as_sunto..."
 
 #: gajim/data/gui/gc_control_popup_menu.ui:38
-msgid "Configure _Room..."
-msgstr "Configurar _sala..."
+#, fuzzy
+msgid "Configure _Group Chat..."
+msgstr "_Entrar em uma conferência..."
 
 #: gajim/data/gui/gc_control_popup_menu.ui:52
-msgid "_Destroy Room"
-msgstr "_Excluir sala"
+#, fuzzy
+msgid "_Destroy Group Chat"
+msgstr "_Nova conferência"
 
 #: gajim/data/gui/gc_control_popup_menu.ui:64
 msgid "_Minimize on close"
@@ -6114,7 +6160,7 @@ msgstr "_Minimizar ao fechar"
 msgid "_Request Voice"
 msgstr "_Voz"
 
-#: gajim/data/gui/gc_control_popup_menu.ui:99 gajim/gtk/discovery.py:1704
+#: gajim/data/gui/gc_control_popup_menu.ui:99
 msgid "_Bookmark"
 msgstr "Ma_rcadores"
 
@@ -6164,13 +6210,6 @@ msgstr "Site pessoal:"
 msgid "E-Mail"
 msgstr "Email:"
 
-#: 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/blocking_list.ui:115 gajim/gtk/add_contact.py:30
-#: gajim/gtk/accounts.py:801
-msgid "Jabber ID"
-msgstr "Jabber ID"
-
 #: gajim/data/gui/profile_window.ui:440
 msgid "Main"
 msgstr ""
@@ -6301,35 +6340,42 @@ msgstr "Trabalho"
 msgid "About"
 msgstr "Sobre"
 
-#: gajim/data/gui/start_chat_dialog.ui:114 gajim/gtk/discovery.py:1658
-msgid "Users"
-msgstr "Usuários"
-
-#: gajim/data/gui/start_chat_dialog.ui:185
-msgid "Name:"
-msgstr "Nome:"
+#: gajim/data/gui/start_chat_dialog.ui:53
+#, fuzzy
+msgid "Global Group Chat Search"
+msgstr "Ingressar numa conferência"
 
-#: gajim/data/gui/start_chat_dialog.ui:197
+#: 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
-msgid "Description:"
-msgstr "Descrição: "
+msgid "_Back"
+msgstr "Volto logo"
+
+#: gajim/data/gui/start_chat_dialog.ui:245
+#: gajim/data/gui/groupchat_control.ui:796
+#: gajim/data/gui/groupchat_control.ui:888 gajim/gtk/discovery.py:1701
+#: gajim/gtk/groupchat_join.py:62
+msgid "_Join"
+msgstr "_Ingressar"
 
-#: gajim/data/gui/start_chat_dialog.ui:209
+#: gajim/data/gui/start_chat_dialog.ui:289
 #, fuzzy
-msgid "Address:"
-msgstr "_Endereço:"
+msgid "Select Account"
+msgstr "Removendo %s conta"
 
-#: gajim/data/gui/start_chat_dialog.ui:246
-msgid ""
-"Semi-Anonymous\n"
-"<span size=\"small\">(Only moderators can see your XMPP-Address)</span>"
+#: gajim/data/gui/start_chat_dialog.ui:380
+msgid "_Select"
 msgstr ""
 
 #: gajim/data/gui/filetransfers.ui:21
 msgid "Pa_use/Resume"
 msgstr ""
 
-#: gajim/data/gui/filetransfers.ui:30 gajim/gtk/filechoosers.py:178
+#: gajim/data/gui/filetransfers.ui:30 gajim/data/gui/groupchat_control.ui:575
+#: gajim/data/gui/groupchat_control.ui:667
+#: gajim/data/gui/groupchat_control.ui:779
+#: gajim/data/gui/groupchat_control.ui:871 gajim/gtk/filechoosers.py:178
 msgid "_Cancel"
 msgstr "_Cancelar"
 
@@ -6374,7 +6420,8 @@ msgstr ""
 "Cancela a transferência de arquivo selecionada e remove o arquivo incompleto"
 
 #: gajim/data/gui/filetransfers.ui:207
-msgid "Shows a list of file transfers between you and others"
+#, fuzzy
+msgid "Shows a list of file transfers between you and your contacts"
 msgstr "Exibe uma lista de transferências de arquivos entre você e os outros"
 
 #: gajim/data/gui/groupchat_control.ui:13 gajim/data/gui/chat_control.ui:277
@@ -6394,7 +6441,6 @@ msgid "Strike"
 msgstr "Tachado"
 
 #: gajim/data/gui/groupchat_control.ui:54 gajim/data/gui/chat_control.ui:318
-#: gajim/gtk/advanced_config.py:86
 msgid "Color"
 msgstr "Cor"
 
@@ -6407,16 +6453,46 @@ msgstr "Fonte"
 msgid "Clear formatting"
 msgstr "Limpar formatação"
 
-#: gajim/data/gui/groupchat_control.ui:290 gajim/data/gui/chat_control.ui:880
+#: gajim/data/gui/groupchat_control.ui:291 gajim/data/gui/chat_control.ui:880
 #, fuzzy
 msgid "Choose encryption"
 msgstr "Escolha o arquivo para enviar..."
 
-#: gajim/data/gui/groupchat_control.ui:336 gajim/data/gui/chat_control.ui:640
+#: gajim/data/gui/groupchat_control.ui:337 gajim/data/gui/chat_control.ui:640
 #, fuzzy
 msgid "Show a list of emojis (Alt+M)"
 msgstr "Exibe uma lista de emoticons (Alt+M)"
 
+#: gajim/data/gui/groupchat_control.ui:484
+#, fuzzy
+msgid "Joining…"
+msgstr "Banindo..."
+
+#: gajim/data/gui/groupchat_control.ui:496
+msgid "_Abort"
+msgstr ""
+
+#: gajim/data/gui/groupchat_control.ui:542
+#, fuzzy
+msgid "Enter new nickname"
+msgstr "Entre com um novo apelido para o contato %s"
+
+#: gajim/data/gui/groupchat_control.ui:592
+#: gajim/data/gui/groupchat_control.ui:684
+#, fuzzy
+msgid "Ch_ange"
+msgstr "Alterar _apelido..."
+
+#: gajim/data/gui/groupchat_control.ui:761
+#, fuzzy
+msgid "Enter password"
+msgstr "Digite sua nova senha:"
+
+#: gajim/data/gui/groupchat_control.ui:1067
+#, fuzzy
+msgid "_Try again"
+msgstr "Verificar novamente..."
+
 #: gajim/data/gui/popup_notification_window.ui:42
 #, fuzzy
 msgid "Event Type"
@@ -6498,8 +6574,8 @@ msgstr "Afastado"
 
 #: gajim/data/gui/mam_preferences.ui:18
 #, fuzzy
-msgid "Roster"
-msgstr "Exibir _lista"
+msgid "Contact List"
+msgstr "Contatos"
 
 #: gajim/data/gui/mam_preferences.ui:22
 #: gajim/data/gui/preferences_window.ui:123
@@ -6524,12 +6600,12 @@ msgid "Add"
 msgstr "Adicionar"
 
 #: gajim/data/gui/mam_preferences.ui:194 gajim/data/gui/groupchat_config.ui:151
-#: gajim/gtk/dialogs.py:63 gajim/gtk/accounts.py:381
+#: gajim/gtk/dialogs.py:62 gajim/gtk/accounts.py:384
 #, fuzzy
 msgid "Remove"
 msgstr "_Remover"
 
-#: gajim/data/gui/vcard_information_window.ui:72 gajim/gtk/accounts.py:753
+#: gajim/data/gui/vcard_information_window.ui:72 gajim/gtk/accounts.py:756
 #, fuzzy
 msgid "Resource"
 msgstr "Recurso:"
@@ -6579,6 +6655,7 @@ msgstr "Inscrição:"
 #: gajim/data/gui/vcard_information_window.ui:974
 #: gajim/data/gui/vcard_information_window.ui:993
 #: gajim/data/gui/vcard_information_window.ui:1427
+#: gajim/data/gui/groupchat_info_scrolled.ui:222
 msgid "button"
 msgstr ""
 
@@ -6611,15 +6688,15 @@ msgstr "_Notifique-me sobre isto"
 
 #: gajim/data/gui/preferences_window.ui:58
 #, fuzzy
-msgid "Show only in roster"
-msgstr "Mostre somente na _lista"
+msgid "Show only in contact list"
+msgstr "Exibir somente _ativos"
 
 #: gajim/data/gui/preferences_window.ui:69
-msgid "Detached roster with detached chats"
+msgid "Detached contact list with detached chats"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:72
-msgid "Detached roster with single chat"
+msgid "Detached contact list with single chat"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:75
@@ -6627,11 +6704,11 @@ msgid "Single window for everything"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:78
-msgid "Detached roster with chat grouped by account"
+msgid "Detached contact list with chat grouped by account"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:81
-msgid "Detached roster with chat grouped by type"
+msgid "Detached contact list with chat grouped by type"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:92
@@ -6682,7 +6759,7 @@ msgstr "Comportamento da jan_ela:"
 
 #: gajim/data/gui/preferences_window.ui:296
 #, fuzzy
-msgid "_Show roster on startup"
+msgid "_Show contact list on startup"
 msgstr "Exibi_r lista"
 
 #: gajim/data/gui/preferences_window.ui:311
@@ -6698,12 +6775,12 @@ msgid "_Tabs placement"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:363
-msgid "_Quit Gajim when closing roster window"
+msgid "_Quit Gajim when closing contact list"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:367
 msgid ""
-"If enabled, Gajim will quit when closing the roster window instead of "
+"If enabled, Gajim will quit when closing the contact list window instead of "
 "minimizing to the system's notification area"
 msgstr ""
 
@@ -6713,41 +6790,42 @@ msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:423
 #, fuzzy
-msgid "Show a_vatars of contacts in roster"
+msgid "Show a_vatars of contacts in contact list"
 msgstr "Exibir a_vatar dos contatos na lista"
 
 #: gajim/data/gui/preferences_window.ui:427
 #, fuzzy
 msgid ""
-"If checked, avatars of contacts will be shown in the roster window and in "
-"group chats"
+"If checked, avatars of contacts will be shown in the contact list window and "
+"in group chats"
 msgstr ""
 "Se marcado, Gajim exibirá avatars dos contatos na janela da lista e na "
 "conferência"
 
 #: gajim/data/gui/preferences_window.ui:441
 #, fuzzy
-msgid "Show status _messages of contacts in roster"
+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
 #, fuzzy
 msgid ""
 "If checked, status messages of contacts will be shown under the contact's "
-"name, in the roster window, and in group chats"
+"name, in the contact list window, and in group chats"
 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
 #, fuzzy
-msgid "Show e_xtra information of contacts in roster (mood, activity, ...)"
+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
 msgid ""
-"If checked, additional info published by the contact will be shown in "
-"roster. Additional infos (published via PEP) may include e.g. mood, "
+"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 ""
 
@@ -6756,16 +6834,18 @@ msgid "Sort contacts by status"
 msgstr "Ordena contatos pelo status"
 
 #: gajim/data/gui/preferences_window.ui:494
-msgid "in _roster"
-msgstr "na _lista"
+#, fuzzy
+msgid "in _contact list"
+msgstr "Enviar contatos:"
 
 #: gajim/data/gui/preferences_window.ui:511
 msgid "in _group chats"
 msgstr "em uma c_onferência"
 
 #: gajim/data/gui/preferences_window.ui:540
-msgid "Roster Appearance"
-msgstr "Aparência da Lista de Contatos"
+#, fuzzy
+msgid "Contact List Appearance"
+msgstr "Troca de itens na lista de contatos"
 
 #: gajim/data/gui/preferences_window.ui:585
 #, fuzzy
@@ -6832,7 +6912,7 @@ msgstr "Impossível ingressar na sala"
 
 #: gajim/data/gui/preferences_window.ui:660
 #, fuzzy
-msgid "If checked, the room subject will be shown when joining a group chat"
+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:682
@@ -6847,13 +6927,13 @@ msgstr ""
 #: gajim/data/gui/preferences_window.ui:701
 msgid ""
 "If join/leave status messages are shown in the group chat. This setting can "
-"be overridden in the groupchat menu."
+"be overridden in the group chat menu."
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:720
 msgid ""
 "The default sync threshold for new public group chats. This setting can be "
-"overridden in the groupchat menu."
+"overridden in the group chat menu."
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:722
@@ -6868,7 +6948,7 @@ msgstr "_Log mudanças de status dos contatos"
 #: gajim/data/gui/preferences_window.ui:768
 msgid ""
 "If status change messages are shown in the group chat. This setting can be "
-"overridden in the groupchat menu."
+"overridden in the group chat menu."
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:825
@@ -6887,8 +6967,8 @@ msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:843
 #, fuzzy
-msgid "Show chatstate in roster"
-msgstr "Exibir a_vatar dos contatos na lista"
+msgid "Show chatstate in contact list"
+msgstr "Exibir botão de fechar na aba?"
 
 #: gajim/data/gui/preferences_window.ui:847
 msgid ""
@@ -7197,7 +7277,7 @@ msgstr "Alternar sessão de vídeo"
 msgid "Vi_ew own video source"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2281 gajim/gtk/accounts.py:352
+#: gajim/data/gui/preferences_window.ui:2281 gajim/gtk/accounts.py:355
 msgid "Connection"
 msgstr "Conexão"
 
@@ -7251,7 +7331,8 @@ msgid "_Manage..."
 msgstr "Gere_nciar..."
 
 #: gajim/data/gui/preferences_window.ui:2616
-msgid "_Log status changes of contacts"
+#, fuzzy
+msgid "_Store status changes of contacts in history"
 msgstr "_Log mudanças de status dos contatos"
 
 #: gajim/data/gui/preferences_window.ui:2633
@@ -7275,9 +7356,15 @@ msgstr ""
 msgid "_Open..."
 msgstr "_Abrir..."
 
+#: gajim/data/gui/preferences_window.ui:2723 gajim/gtk/advanced_config.py:84
+#, fuzzy
+msgid "Advanced Configuration Editor (ACE)"
+msgstr "Editor de configurações avançado"
+
 #: gajim/data/gui/groupchat_config.ui:55
+#, fuzzy
 msgid ""
-"<b>Jabber-ID</b>\n"
+"<b>XMPP Address</b>\n"
 "&lt;user@domain/resource&gt; (only that resource matches)\n"
 "&lt;user@domain&gt; (any resource matches)\n"
 "&lt;domain/resource&gt; (only that resource matches)\n"
@@ -7296,7 +7383,8 @@ msgstr ""
 msgid "Only Admins and Owners can modify the affiliation"
 msgstr ""
 
-#: gajim/data/gui/groupchat_config.ui:270 gajim/plugins/gui.py:312
+#: gajim/data/gui/groupchat_config.ui:270
+#: gajim/data/gui/groupchat_info_scrolled.ui:210 gajim/plugins/gui.py:324
 #, fuzzy
 msgid "Configuration"
 msgstr "Configuração da sala"
@@ -7329,7 +7417,7 @@ msgid "Start _Chat"
 msgstr "Iniciar _conversa"
 
 #: gajim/data/gui/contact_context_menu.ui:20
-#: gajim/data/gui/systray_context_menu.ui:36
+#: gajim/data/gui/systray_context_menu.ui:29
 msgid "Send Single _Message..."
 msgstr "Enviar _mensagem simples..."
 
@@ -7390,17 +7478,43 @@ msgid "_Ignore"
 msgstr "_Ignorar"
 
 #: gajim/data/gui/contact_context_menu.ui:174
-msgid "_Add to Roster..."
-msgstr "_Adicionar à lista..."
+#, fuzzy
+msgid "_Add to Contact List..."
+msgstr "_Adicionar contato..."
+
+#: gajim/data/gui/advanced_configuration.ui:39
+msgid "You should restart Gajim for some changes to take effect"
+msgstr ""
+"Você deve reiniciar o Gajim para que algumas configurações tenham efeito"
+
+#: gajim/data/gui/advanced_configuration.ui:71
+#, fuzzy
+msgid "_Filter"
+msgstr "_Filtro:"
+
+#: gajim/data/gui/advanced_configuration.ui:88
+msgid "Type to search for values..."
+msgstr ""
+
+#: gajim/data/gui/advanced_configuration.ui:180
+#, fuzzy
+msgid "_Reset Value"
+msgstr "Voltar para as cores _padrões"
+
+#: gajim/data/gui/advanced_configuration.ui:185
+#, fuzzy
+msgid "Resets value to default"
+msgstr "Voltar para as cores _padrões"
 
 #: gajim/data/gui/account_creation_wizard_window.ui:43
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim: Assistente de configuração de conta"
 
 #: gajim/data/gui/account_creation_wizard_window.ui:70
+#, fuzzy
 msgid ""
 "You need to have an account in order to connect\n"
-"to the Jabber network."
+"to the XMPP network."
 msgstr ""
 "Você precisa ter uma conta para conectar na\n"
 "rede Jabber."
@@ -7422,8 +7536,9 @@ msgid "<b>Please fill in the data for your existing account</b>"
 msgstr "<b>Por favor, preencha os dados para sua conta existente</b>"
 
 #: gajim/data/gui/account_creation_wizard_window.ui:187
-msgid "_Jabber ID:"
-msgstr "_Jabber ID:"
+#, fuzzy
+msgid "_XMPP Address:"
+msgstr "Endereço AIM:"
 
 #: gajim/data/gui/account_creation_wizard_window.ui:239
 #: gajim/data/gui/account_creation_wizard_window.ui:394
@@ -7510,6 +7625,7 @@ msgid "Privacy Lists:"
 msgstr "Listas de privacidade:"
 
 #: gajim/data/gui/service_discovery_window.ui:111
+#: gajim/data/gui/groupchat_creation.ui:227
 #, fuzzy
 msgid "_Address"
 msgstr "_Endereço:"
@@ -7527,11 +7643,6 @@ msgstr "Sincronizar: selecionar contatos"
 msgid "Select the contacts you want to synchronise"
 msgstr "Selecione os contatos que você quer sincronizar"
 
-#: gajim/data/gui/groupchat_invitation_received.ui:42
-#, fuzzy
-msgid "Group Chat Invitation"
-msgstr "Convite para conferência"
-
 #: gajim/data/gui/groupchat_invitation_received.ui:111
 #, fuzzy
 msgid "Message..."
@@ -7581,11 +7692,10 @@ msgstr ""
 
 #: gajim/data/gui/add_new_contact_window.ui:84
 #, fuzzy
-msgid "_Jabber ID"
-msgstr "_Jabber ID:"
+msgid "_XMPP Address"
+msgstr "_Endereço:"
 
 #: gajim/data/gui/add_new_contact_window.ui:100
-#: gajim/data/gui/manage_bookmarks_window.ui:192
 #, fuzzy
 msgid "_Nickname"
 msgstr "_Apelido:"
@@ -7663,7 +7773,7 @@ msgstr "<b>Humor:</b>"
 msgid "<b>Message:</b>"
 msgstr "<b>Mensagem:</b>"
 
-#: gajim/data/gui/plugins_window.ui:10 gajim/data/gui/application_menu.ui:90
+#: gajim/data/gui/plugins_window.ui:10 gajim/data/gui/application_menu.ui:87
 msgid "Plugins"
 msgstr ""
 
@@ -7772,10 +7882,6 @@ msgstr "Permitir"
 msgid "Deny"
 msgstr "Negar"
 
-#: gajim/data/gui/privacy_list_window.ui:317
-msgid "JabberID"
-msgstr "Jabber ID"
-
 #: gajim/data/gui/privacy_list_window.ui:358
 msgid "all in the group"
 msgstr "todos no grupo"
@@ -7817,7 +7923,7 @@ msgstr "Ordem:"
 msgid "Manage sounds"
 msgstr "Gerenciar contas"
 
-#: gajim/data/gui/manage_sounds_window.ui:55 gajim/plugins/gui.py:100
+#: gajim/data/gui/manage_sounds_window.ui:55 gajim/plugins/gui.py:101
 msgid "Active"
 msgstr "Ativo"
 
@@ -7855,23 +7961,112 @@ msgstr "Remover conta do Gajim e do _servidor"
 msgid "_Personal Events"
 msgstr "Eventos _pessoais"
 
-#: gajim/data/gui/account_context_menu.ui:35
-#: gajim/data/gui/systray_context_menu.ui:28
-msgid "Join _Group Chat"
-msgstr "_Entrar em uma conferência"
-
-#: gajim/data/gui/account_context_menu.ui:49
+#: gajim/data/gui/account_context_menu.ui:41
 msgid "_Add Contact..."
 msgstr "_Adicionar contato..."
 
-#: gajim/data/gui/account_context_menu.ui:57
+#: gajim/data/gui/account_context_menu.ui:49
 msgid "_Discover Services"
 msgstr "_Descubra serviços"
 
-#: gajim/data/gui/account_context_menu.ui:65
+#: gajim/data/gui/account_context_menu.ui:57
 msgid "_Execute Command..."
 msgstr "_Executar comando..."
 
+#: gajim/data/gui/account_context_menu.ui:65
+#, fuzzy
+msgid "_View Certificate"
+msgstr "Certificado próprio"
+
+#: gajim/data/gui/manage_proxies.ui:12
+#, fuzzy
+msgctxt "proxy configuration"
+msgid "HTTP Connect"
+msgstr "Conexão HTTP"
+
+#: gajim/data/gui/manage_proxies.ui:15
+msgctxt "proxy configuration"
+msgid "SOCKS5"
+msgstr ""
+
+#: gajim/data/gui/manage_proxies.ui:18
+#, fuzzy
+msgctxt "proxy configuration"
+msgid "BOSH"
+msgstr "URL _BOSH:"
+
+#: gajim/data/gui/manage_proxies.ui:68
+#, fuzzy
+msgid "Add Proxy"
+msgstr "Proxy:"
+
+#: gajim/data/gui/manage_proxies.ui:82
+#, fuzzy
+msgid "Remove Proxy"
+msgstr "Remover grupo"
+
+#: gajim/data/gui/manage_proxies.ui:134
+#, fuzzy
+msgid "Pass_word"
+msgstr "_Senha:"
+
+#: gajim/data/gui/manage_proxies.ui:159
+msgid "Use proxy auth_entication"
+msgstr "Usar aut_enticação de proxy"
+
+#: gajim/data/gui/manage_proxies.ui:179
+#, fuzzy
+msgid "_Username"
+msgstr "Nome de _usuário:"
+
+#: gajim/data/gui/manage_proxies.ui:209
+#, fuzzy
+msgid "_Port"
+msgstr "_Porta:"
+
+#: gajim/data/gui/manage_proxies.ui:226
+msgid "example.org"
+msgstr ""
+
+#: gajim/data/gui/manage_proxies.ui:240
+#, fuzzy
+msgid "_Host"
+msgstr "_Computador:"
+
+#: gajim/data/gui/manage_proxies.ui:254
+msgid "Use HTTP prox_y"
+msgstr "Usar prox_y HTTP"
+
+#: gajim/data/gui/manage_proxies.ui:275
+msgid "https://example.org/http-bind/"
+msgstr ""
+
+#: gajim/data/gui/manage_proxies.ui:291
+#, fuzzy
+msgid "_BOSH URL"
+msgstr "URL _BOSH:"
+
+#: gajim/data/gui/manage_proxies.ui:309 gajim/gtk/adhoc.py:322
+#, fuzzy
+msgid "Settings"
+msgstr "Falha ao registrar"
+
+#: gajim/data/gui/manage_proxies.ui:344
+#, fuzzy
+msgid "_Type"
+msgstr "_Tipo:"
+
+#: gajim/data/gui/manage_proxies.ui:361
+#: gajim/data/gui/groupchat_creation.ui:105
+#, fuzzy
+msgid "_Name"
+msgstr "_Nome:"
+
+#: gajim/data/gui/manage_proxies.ui:391 gajim/gtk/accounts.py:742
+#, fuzzy
+msgid "Proxy"
+msgstr "Proxy:"
+
 #: gajim/data/gui/application_menu.ui:8
 #, fuzzy
 msgid "View"
@@ -7879,8 +8074,8 @@ msgstr "_Ver"
 
 #: gajim/data/gui/application_menu.ui:11
 #, fuzzy
-msgid "Show Roster"
-msgstr "Exibir _lista"
+msgid "Show Contact List"
+msgstr "Exibir somente _ativos"
 
 #: gajim/data/gui/application_menu.ui:16
 #, fuzzy
@@ -7921,23 +8116,24 @@ msgstr ""
 msgid "Features"
 msgstr "Recursos"
 
-#: gajim/data/gui/application_menu.ui:81
+#: gajim/data/gui/application_menu.ui:77
+#: gajim/data/gui/groupchat_creation.ui:81 gajim/gtk/groupchat_creation.py:45
 #, fuzzy
-msgid "Bookmarks"
-msgstr "Ma_rcadores"
+msgid "Create Group Chat"
+msgstr "Sair das salas"
 
-#: gajim/data/gui/application_menu.ui:94 gajim/data/gui/shortcuts_window.ui:189
-#: gajim/gtk/preferences.py:59
+#: gajim/data/gui/application_menu.ui:91 gajim/data/gui/shortcuts_window.ui:189
+#: gajim/gtk/preferences.py:58
 msgid "Preferences"
 msgstr "Preferências"
 
-#: gajim/data/gui/application_menu.ui:99
+#: gajim/data/gui/application_menu.ui:96
 #, fuzzy
 msgid "Quit"
 msgstr "_Sair"
 
 #: gajim/data/gui/httpupload_progress_dialog.ui:110
-#: gajim/gtk/filetransfer.py:121
+#: gajim/gtk/filetransfer.py:120
 msgid "Progress"
 msgstr "Progresso"
 
@@ -7954,52 +8150,33 @@ msgstr ""
 msgid "_Cancel Upload"
 msgstr "_Cancelar"
 
-#: gajim/data/gui/manage_bookmarks_window.ui:13
-#, fuzzy
-msgid "Group Chat Bookmarks"
-msgstr "_Conferência"
-
-#: gajim/data/gui/manage_bookmarks_window.ui:68
-#, fuzzy
-msgid "Add Bookmark"
-msgstr "Ma_rcadores"
-
-#: gajim/data/gui/manage_bookmarks_window.ui:82
-#, fuzzy
-msgid "Remove Bookmark"
-msgstr "Ma_rcadores"
+#: gajim/data/gui/groupchat_creation.ui:27
+msgid "Public or Private?"
+msgstr ""
 
-#: gajim/data/gui/manage_bookmarks_window.ui:126
-msgid "N_ame"
+#: 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 ""
 
-#: gajim/data/gui/manage_bookmarks_window.ui:145
-#, fuzzy
-msgid "Bookmark Name"
-msgstr "Adicionar esta sala aos marcadores"
+#: gajim/data/gui/groupchat_creation.ui:58
+msgid "<b>Public:</b> Anyone who knows the address can join."
+msgstr ""
 
-#: gajim/data/gui/manage_bookmarks_window.ui:160
+#: gajim/data/gui/groupchat_creation.ui:122
 #, fuzzy
-msgid "_Server"
-msgstr "_Servidor:"
+msgid "_Description"
+msgstr "Descrição"
 
-#: gajim/data/gui/manage_bookmarks_window.ui:223
-msgid "Roo_m"
+#: gajim/data/gui/groupchat_creation.ui:164
+msgid "_Public"
 msgstr ""
 
-#: gajim/data/gui/manage_bookmarks_window.ui:253
+#: gajim/data/gui/groupchat_creation.ui:278
 #, fuzzy
-msgid "_Password"
-msgstr "_Senha:"
-
-#: gajim/data/gui/manage_bookmarks_window.ui:299
-#, fuzzy
-msgid "Join chat when connected"
-msgstr "Contato desconectou"
-
-#: gajim/data/gui/manage_bookmarks_window.ui:307
-msgid "_Join Automatically"
-msgstr ""
+msgid "_Account"
+msgstr "Cont_as"
 
 #: gajim/data/gui/exception_dialog.ui:49
 msgid "Sorry, that should not have happened"
@@ -8045,6 +8222,29 @@ msgstr ""
 msgid "Presets"
 msgstr "_Presença"
 
+#: gajim/data/gui/groupchat_info_scrolled.ui:32
+#, fuzzy
+msgid "Address"
+msgstr "_Endereço:"
+
+#: gajim/data/gui/groupchat_info_scrolled.ui:64
+msgid "Topic"
+msgstr ""
+
+#: gajim/data/gui/groupchat_info_scrolled.ui:80
+#, fuzzy
+msgid "Author"
+msgstr "Au_torizar"
+
+#: gajim/data/gui/groupchat_info_scrolled.ui:182
+msgid "Discussion Logs"
+msgstr ""
+
+#: gajim/data/gui/groupchat_info_scrolled.ui:260
+#, fuzzy
+msgid "Group Chat Language"
+msgstr "Convite para conferência"
+
 #: gajim/data/gui/emoji_chooser.ui:98
 #, fuzzy
 msgid "No Results Found"
@@ -8057,24 +8257,35 @@ msgstr "Convidar amigos!"
 #: gajim/data/gui/chat_to_muc_window.ui:39
 #, fuzzy
 msgid ""
-"You are now entering a groupchat.\n"
+"You are now entering a group chat.\n"
 "Select the contacts you want to invite"
 msgstr ""
 "Você está prestes a iniciar uma Conversa Multi-Usuário (MUC).\n"
 "Selecione os contatos que você quer convidar"
 
 #: gajim/data/gui/chat_to_muc_window.ui:112
-msgid "Please select a MUC server."
+#, fuzzy
+msgid "Please select a group chat server."
 msgstr "Por favor, selecione um servidor MUC."
 
 #: gajim/data/gui/chat_to_muc_window.ui:141
-msgid "MUC server"
-msgstr "Servidor MUC"
+#, fuzzy
+msgid "Group chat server"
+msgstr "Salas"
 
 #: gajim/data/gui/chat_to_muc_window.ui:176
 msgid "In_vite"
 msgstr "Con_vidar"
 
+#: gajim/data/gui/bookmarks.ui:176
+#, fuzzy
+msgid "Autojoin"
+msgstr "Ingresso automático"
+
+#: gajim/data/gui/bookmarks.ui:211
+msgid "_Apply"
+msgstr ""
+
 #: gajim/data/gui/history_manager.ui:11
 #, fuzzy
 msgid "_Export"
@@ -8090,12 +8301,13 @@ msgid "Gajim History Logs Manager"
 msgstr "Gerenciador de histórico de logs do Gajim"
 
 #: gajim/data/gui/history_manager.ui:108
+#, fuzzy
 msgid ""
-"This log manager is not intended for log viewing. If you are looking for "
-"such functionality, use the history window instead.\n"
+"This history manager is not intended for viewing chat history. If you are "
+"looking for such functionality, please use the history window instead.\n"
 "\n"
-"Use this program to delete or export logs. You can select logs from the left "
-"and/or search database from below."
+"You can use this program to delete or export history. Either select logs "
+"from the left or search the database."
 msgstr ""
 "Este gerenciador de logs não tem a intenção de ser um visualizador de logs. "
 "Se você está procurando por esta funcionalidade, use a janela de histórico.\n"
@@ -8148,8 +8360,9 @@ msgid "Select an emoji"
 msgstr ""
 
 #: gajim/data/gui/shortcuts_window.ui:38
-msgid "Complete a command or a nick"
-msgstr ""
+#, fuzzy
+msgid "Complete a command or a nickname"
+msgstr "Crie um novo tema com o nome que você desejar."
 
 #: gajim/data/gui/shortcuts_window.ui:45
 #, fuzzy
@@ -8189,7 +8402,7 @@ msgstr ""
 msgid "Scroll down"
 msgstr ""
 
-#: gajim/data/gui/shortcuts_window.ui:100 gajim/gtk/xml_console.py:72
+#: gajim/data/gui/shortcuts_window.ui:100 gajim/gtk/xml_console.py:69
 #, fuzzy
 msgid "Clear"
 msgstr "Limpando"
@@ -8231,8 +8444,9 @@ msgid "Close chat"
 msgstr ""
 
 #: gajim/data/gui/shortcuts_window.ui:173
-msgid "Roster Shortcuts"
-msgstr ""
+#, fuzzy
+msgid "Contact List Shortcuts"
+msgstr "Troca de itens na lista de contatos"
 
 #: gajim/data/gui/shortcuts_window.ui:196
 #, fuzzy
@@ -8264,7 +8478,7 @@ msgid "Show only active contacts"
 msgstr "Exibir somente _ativos"
 
 #: gajim/data/gui/shortcuts_window.ui:251
-msgid "Enable roster filtering"
+msgid "Enable contact list filtering"
 msgstr ""
 
 #: gajim/data/gui/shortcuts_window.ui:259
@@ -8311,12 +8525,12 @@ msgstr ""
 
 #: gajim/data/gui/history_window.ui:317
 #, fuzzy
-msgid "Record history for this chat"
+msgid "Store history for this chat"
 msgstr "Ignorar este erro para este certificado."
 
 #: gajim/data/gui/history_window.ui:332
 #, fuzzy
-msgid "Record History"
+msgid "Store History"
 msgstr "Recentemente:"
 
 #: gajim/data/gui/history_window.ui:350
@@ -8337,9 +8551,10 @@ msgstr "Criar nova postagem"
 msgid "Fill in the form."
 msgstr "Preencha o formulário."
 
-#: gajim/data/gui/data_form_window.ui:229
-msgid "Room Configuration"
-msgstr "Configuração da sala"
+#: gajim/data/gui/data_form_window.ui:229 gajim/gtk/groupchat_config.py:41
+#, fuzzy
+msgid "Group Chat Configuration"
+msgstr "Convite para conferência"
 
 #: gajim/data/gui/roster_item_exchange_window.ui:39
 #: gajim/gtk/roster_item_exchange.py:35
@@ -8360,15 +8575,15 @@ msgstr "Sta_tus"
 msgid "_Start Chat..."
 msgstr "_Iniciar conversa..."
 
-#: gajim/data/gui/systray_context_menu.ui:50
+#: gajim/data/gui/systray_context_menu.ui:43
 msgid "Show All Pending _Events"
 msgstr "Exibir todos _eventos pendentes"
 
-#: gajim/data/gui/systray_context_menu.ui:59
+#: gajim/data/gui/systray_context_menu.ui:52
 msgid "Mute Sounds"
 msgstr "Sons mudos"
 
-#: gajim/data/gui/systray_context_menu.ui:75
+#: gajim/data/gui/systray_context_menu.ui:68
 #, fuzzy
 msgid "_Preferences"
 msgstr "Preferências"
@@ -8460,33 +8675,33 @@ msgstr ""
 msgid "Execute expression inside a shell, send output"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:45
+#: gajim/command_system/implementation/standard.py:47
 msgid ""
 "Show help on a given command or a list of available commands if -a is given"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:73
+#: gajim/command_system/implementation/standard.py:75
 msgid "Send a message to the contact"
 msgstr "Enviar uma mensagem ao contato"
 
-#: gajim/command_system/implementation/standard.py:78
+#: gajim/command_system/implementation/standard.py:80
 msgid "Send action (in the third person) to the current chat"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:83
+#: gajim/command_system/implementation/standard.py:85
 msgid "Show logged messages which mention given text"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:88
+#: gajim/command_system/implementation/standard.py:90
 #, fuzzy, python-format
 msgid "%s: Nothing found"
 msgstr "%s não encontrado"
 
-#: gajim/command_system/implementation/standard.py:94
+#: gajim/command_system/implementation/standard.py:96
 msgid "Limit must be an integer"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:118
+#: gajim/command_system/implementation/standard.py:120
 msgid ""
 "\n"
 "    Set the current status\n"
@@ -8496,126 +8711,129 @@ msgid ""
 "    "
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:136
+#: gajim/command_system/implementation/standard.py:138
 msgid "Set the current status to away"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:150
+#: gajim/command_system/implementation/standard.py:152
 msgid "Set the current status to online"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:153
+#: gajim/command_system/implementation/standard.py:155
 #, fuzzy
 msgid "Available"
 msgstr "Dis_ponível"
 
-#: gajim/command_system/implementation/standard.py:173
-#: gajim/command_system/implementation/standard.py:250
+#: gajim/command_system/implementation/standard.py:175
+#: gajim/command_system/implementation/standard.py:252
 msgid "Clear the text window"
 msgstr "Limpar a janela de texto"
 
-#: gajim/command_system/implementation/standard.py:178
-#: gajim/command_system/implementation/standard.py:397
+#: gajim/command_system/implementation/standard.py:180
+#: gajim/command_system/implementation/standard.py:401
 msgid "Send a ping to the contact"
 msgstr "Envie um ping para o contato"
 
-#: gajim/command_system/implementation/standard.py:181
-#: gajim/command_system/implementation/standard.py:400
+#: gajim/command_system/implementation/standard.py:183
+#: gajim/command_system/implementation/standard.py:404
 #, fuzzy
 msgid "Command is not supported for zeroconf accounts"
 msgstr "Comando sem suporte para conta zeroconf."
 
-#: gajim/command_system/implementation/standard.py:185
-msgid "Send DTMF sequence through an open audio session"
+#: gajim/command_system/implementation/standard.py:187
+msgid "Send DTMF sequence through an open voice chat"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:188
+#: gajim/command_system/implementation/standard.py:190
 #, fuzzy
-msgid "No open audio sessions with the contact"
+msgid "No open voice chats with the contact"
 msgstr "Clique para ver o histórico de conversas com este contato"
 
-#: gajim/command_system/implementation/standard.py:191
+#: gajim/command_system/implementation/standard.py:193
 #, fuzzy, python-format
 msgid "%s is not a valid tone"
 msgstr "%s não é um nível de gravação (loglevel) válido"
 
-#: gajim/command_system/implementation/standard.py:198
-msgid "Toggle audio session"
-msgstr "Alternar sessão de áudio"
+#: gajim/command_system/implementation/standard.py:200
+msgid "Toggle Voice Chat"
+msgstr ""
 
-#: gajim/command_system/implementation/standard.py:201
+#: gajim/command_system/implementation/standard.py:203
 #, fuzzy
-msgid "Audio sessions are not available"
-msgstr "Uma conexão não está disponível"
+msgid "Voice chats are not available"
+msgstr "Conexão não disponível"
 
-#: gajim/command_system/implementation/standard.py:208
-msgid "Toggle video session"
+#: gajim/command_system/implementation/standard.py:210
+#, fuzzy
+msgid "Toggle Video Chat"
 msgstr "Alternar sessão de vídeo"
 
-#: gajim/command_system/implementation/standard.py:211
+#: gajim/command_system/implementation/standard.py:213
 #, fuzzy
-msgid "Video sessions are not available"
+msgid "Video chats are not available"
 msgstr "Conexão não disponível"
 
-#: gajim/command_system/implementation/standard.py:218
+#: gajim/command_system/implementation/standard.py:220
 #, fuzzy
 msgid "Send a message to the contact that will attract their attention"
 msgstr "Enviar uma mensagem ao contato"
 
-#: gajim/command_system/implementation/standard.py:255
+#: gajim/command_system/implementation/standard.py:257
 #, fuzzy
 msgid "Change your nickname in a group chat"
 msgstr "Alterar o seu apelido (Ctrl+N)"
 
-#: gajim/command_system/implementation/standard.py:260 gajim/gtk/dialogs.py:674
-#: gajim/gtk/bookmarks.py:272
+#: gajim/command_system/implementation/standard.py:262
 msgid "Invalid nickname"
 msgstr "Apelido inválido"
 
-#: gajim/command_system/implementation/standard.py:267
-msgid "Open a private chat window with a specified occupant"
+#: gajim/command_system/implementation/standard.py:269
+#, fuzzy
+msgid "Open a private chat window with a specified participant"
 msgstr "Abrir uma janela de conversação privada com um ocupante específico"
 
-#: gajim/command_system/implementation/standard.py:273
-#: gajim/command_system/implementation/standard.py:282
-#: gajim/command_system/implementation/standard.py:332
-#: gajim/command_system/implementation/standard.py:345
-#: gajim/command_system/implementation/standard.py:357
+#: gajim/command_system/implementation/standard.py:275
+#: gajim/command_system/implementation/standard.py:284
+#: gajim/command_system/implementation/standard.py:336
+#: gajim/command_system/implementation/standard.py:349
+#: gajim/command_system/implementation/standard.py:361
 msgid "Nickname not found"
 msgstr "Apelido não encontrado"
 
-#: gajim/command_system/implementation/standard.py:276
+#: gajim/command_system/implementation/standard.py:278
+#, fuzzy
 msgid ""
-"Open a private chat window with a specified occupant and send him a message"
+"Open a private chat window with a specified participant and send him a "
+"message"
 msgstr ""
 "Abrir uma janela de conversação privada com um ocupante específico e enviar-"
 "lhe uma mensagem"
 
-#: gajim/command_system/implementation/standard.py:285
+#: gajim/command_system/implementation/standard.py:287
 #, fuzzy
 msgid "Display or change a group chat topic"
 msgstr "Perguntar antes de fechar um aba ou janela de conferência."
 
-#: gajim/command_system/implementation/standard.py:294
-msgid "Invite a user to a room for a reason"
+#: gajim/command_system/implementation/standard.py:296
+msgid "Invite a user to a group chat for a reason"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:297
+#: gajim/command_system/implementation/standard.py:299
 #, python-format
 msgid "Invited %(jid)s to %(room_jid)s"
 msgstr "convidado %(jid)s para %(room_jid)s"
 
-#: gajim/command_system/implementation/standard.py:301
+#: gajim/command_system/implementation/standard.py:303
 #, fuzzy
-msgid "Join a group chat given by a JID"
+msgid "Join a group chat given by an XMPP Address"
 msgstr "em uma c_onferência"
 
-#: gajim/command_system/implementation/standard.py:309
+#: gajim/command_system/implementation/standard.py:313
 msgid ""
-"Leave the groupchat, optionally giving a reason, and close tab or window"
+"Leave the group chat, optionally giving a reason, and close tab or window"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:314
+#: gajim/command_system/implementation/standard.py:318
 msgid ""
 "\n"
 "    Ban user by a nick or a JID from a groupchat\n"
@@ -8624,45 +8842,46 @@ msgid ""
 "    "
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:329
+#: gajim/command_system/implementation/standard.py:333
 #, fuzzy
-msgid "Kick user by a nick from a groupchat"
+msgid "Kick user by a nick from a group chat"
 msgstr "Você foi convidado para uma conferência"
 
-#: gajim/command_system/implementation/standard.py:338
+#: gajim/command_system/implementation/standard.py:342
 msgid ""
-"Set occupant role in group chat.\n"
+"Set participant role in group chat.\n"
 "    Role can be given as one of the following values:\n"
 "    moderator, participant, visitor, none"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:343
+#: gajim/command_system/implementation/standard.py:347
 #, fuzzy
 msgid "Invalid role given"
 msgstr "Servidor inválido"
 
-#: gajim/command_system/implementation/standard.py:350
+#: gajim/command_system/implementation/standard.py:354
 msgid ""
-"Set occupant affiliation in group chat.\n"
+"Set participant affiliation in group chat.\n"
 "    Affiliation can be given as one of the following values:\n"
 "    owner, admin, member, outcast, none"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:355
+#: gajim/command_system/implementation/standard.py:359
 #, fuzzy
 msgid "Invalid affiliation given"
 msgstr "filiação alterada"
 
-#: gajim/command_system/implementation/standard.py:365
-msgid "Display names of all group chat occupants"
+#: gajim/command_system/implementation/standard.py:369
+#, fuzzy
+msgid "Display names of all group chat participants"
 msgstr "Mostrar nomes de todos os ocupantes da sala."
 
-#: gajim/command_system/implementation/standard.py:387
-msgid "Forbid an occupant to send you public or private messages"
+#: gajim/command_system/implementation/standard.py:391
+msgid "Forbid a participant to send you public or private messages"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:392
-msgid "Allow an occupant to send you public or private messages"
+#: gajim/command_system/implementation/standard.py:396
+msgid "Allow a participant to send you public or private messages"
 msgstr ""
 
 #: gajim/command_system/implementation/middleware.py:74
@@ -8673,204 +8892,330 @@ msgstr ""
 msgid "The same as using a doc-string, except it supports translation"
 msgstr ""
 
-#: gajim/gtk/filetransfer.py:91
+#: gajim/gtk/groupchat_info.py:36
+#, fuzzy
+msgid "?Group chat feature:Archiving"
+msgstr "Convite para conferência"
+
+#: gajim/gtk/groupchat_info.py:37
+#, fuzzy
+msgid "Messages are archived on the server"
+msgstr "A sessão NÃO SERÁ gravada"
+
+#: gajim/gtk/groupchat_info.py:40
+#, fuzzy
+msgid "?Group chat feature:Persistent"
+msgstr "Salas"
+
+#: gajim/gtk/groupchat_info.py:41
+msgid "This group chat persists even if there are no participants"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:45
+#, fuzzy
+msgid "?Group chat feature:Temporary"
+msgstr "?Regra do contato para conversa em grupo:Nenhuma"
+
+#: gajim/gtk/groupchat_info.py:46
+msgid "This group chat will be destroyed once the last participant left"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:50
+#, fuzzy
+msgid "?Group chat feature:Moderated"
+msgstr "?Regra do contato para conversa em grupo:Nenhuma"
+
+#: gajim/gtk/groupchat_info.py:51
+msgid ""
+"Participants entering this group chat need to request permission to send "
+"messages"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:55
+#, fuzzy
+msgid "?Group chat feature:Not Moderated"
+msgstr "Salas"
+
+#: gajim/gtk/groupchat_info.py:56
+msgid "Participants entering this group chat are allowed to send messages"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:60
+#, fuzzy
+msgid "?Group chat feature:Open"
+msgstr "?Regra do contato para conversa em grupo:Nenhuma"
+
+#: gajim/gtk/groupchat_info.py:61
+#, fuzzy
+msgid "Anyone can join this group chat"
+msgstr "%s entrou na conferência"
+
+#: gajim/gtk/groupchat_info.py:64
+#, fuzzy
+msgid "?Group chat feature:Members Only"
+msgstr "Mensagem destacada de conferência"
+
+#: gajim/gtk/groupchat_info.py:65
+msgid "This group chat is restricted to members only"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:69
+#, fuzzy
+msgid "?Group chat feature:Public"
+msgstr "Mensagem destacada de conferência"
+
+#: gajim/gtk/groupchat_info.py:70
+msgid "Group chat can be found via search"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:73
+#, fuzzy
+msgid "?Group chat feature:Hidden"
+msgstr "?Regra do contato para conversa em grupo:Nenhuma"
+
+#: gajim/gtk/groupchat_info.py:74
+#, fuzzy
+msgid "This group chat can not be found via search"
+msgstr "Esta conferência não tem assunto"
+
+#: gajim/gtk/groupchat_info.py:77
+#, fuzzy
+msgid "?Group chat feature:Not Anonymous"
+msgstr "Salas"
+
+#: gajim/gtk/groupchat_info.py:78
+msgid "All other group chat participants can see your XMPP address"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:82
+#, fuzzy
+msgid "?Group chat feature:Semi-Anonymous"
+msgstr "Mensagem destacada de conferência"
+
+#: gajim/gtk/groupchat_info.py:83
+msgid "Only moderators can see your XMPP address"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:86
+#, fuzzy
+msgid "?Group chat feature:Password Required"
+msgstr "Salas"
+
+#: gajim/gtk/groupchat_info.py:87
+msgid "This group chat does require a password upon entry"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:91
+#, fuzzy
+msgid "?Group chat feature:No Password Required"
+msgstr "Salas"
+
+#: gajim/gtk/groupchat_info.py:92
+msgid "This group chat does not require a password upon entry"
+msgstr ""
+
+#: gajim/gtk/filetransfer.py:90
 msgid "File"
 msgstr "Arquivo"
 
-#: gajim/gtk/filetransfer.py:108
+#: gajim/gtk/filetransfer.py:107
 msgid "Time"
 msgstr "Tempo"
 
-#: gajim/gtk/filetransfer.py:228
+#: gajim/gtk/filetransfer.py:227
 #, fuzzy, python-format
 msgid "File name: %s"
 msgstr "Nome do arquivo: %s"
 
-#: gajim/gtk/filetransfer.py:229 gajim/gtk/filetransfer.py:464
+#: gajim/gtk/filetransfer.py:228 gajim/gtk/filetransfer.py:469
 #, python-format
 msgid "Size: %s"
 msgstr "Tamanho: %s"
 
-#: gajim/gtk/filetransfer.py:239
+#: gajim/gtk/filetransfer.py:238
 #, python-format
 msgid "Sender: %s"
 msgstr "Remetente: %s"
 
-#: gajim/gtk/filetransfer.py:240 gajim/gtk/filetransfer.py:744
+#: gajim/gtk/filetransfer.py:239 gajim/gtk/filetransfer.py:749
 #: gajim/gtk/tooltips.py:577
 msgid "Recipient: "
 msgstr "Destinatário: "
 
-#: gajim/gtk/filetransfer.py:251
+#: gajim/gtk/filetransfer.py:250
 #, python-format
 msgid "Saved in: %s"
 msgstr "Salvo em: %s"
 
-#: gajim/gtk/filetransfer.py:256
+#: gajim/gtk/filetransfer.py:255
 msgid "File transfer completed"
 msgstr "Transferência de arquivos completa"
 
-#: gajim/gtk/filetransfer.py:276 gajim/gtk/filetransfer.py:285
+#: gajim/gtk/filetransfer.py:275 gajim/gtk/filetransfer.py:284
 #, fuzzy
 msgid "Connection with peer could not be established."
 msgstr "Conexão com o par não pode ser estabelecida."
 
-#: gajim/gtk/filetransfer.py:293
+#: gajim/gtk/filetransfer.py:292
 #, python-format
 msgid "Filename: %s"
 msgstr "Nome do arquivo: %s"
 
-#: gajim/gtk/filetransfer.py:294
+#: gajim/gtk/filetransfer.py:293
 #, python-format
 msgid "Recipient: %s"
 msgstr "Conteúdo: %s"
 
-#: gajim/gtk/filetransfer.py:296
+#: gajim/gtk/filetransfer.py:295
 #, python-format
 msgid "Error message: %s"
 msgstr "Mensagem de erro: %s"
 
-#: gajim/gtk/filetransfer.py:333
-#, fuzzy
-msgid "File transfer error"
-msgstr "Erro na transferência de arquivos"
-
 #: gajim/gtk/filetransfer.py:334
 #, python-format
 msgid ""
-"The file %(file)s has been received, but it seems to have been damaged along "
-"the way.\n"
+"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 ""
 
-#: gajim/gtk/filetransfer.py:350
+#: gajim/gtk/filetransfer.py:340
+#, fuzzy
+msgid "_Download Again"
+msgstr "_Não me pergunte novamente"
+
+#: gajim/gtk/filetransfer.py:355
 #, fuzzy
 msgid "Gajim can not read this file"
 msgstr "Gajim não pode acessar este arquivo"
 
-#: gajim/gtk/filetransfer.py:351
+#: gajim/gtk/filetransfer.py:356
 msgid "Another process is using this file."
 msgstr ""
 
-#: gajim/gtk/filetransfer.py:418
+#: gajim/gtk/filetransfer.py:423
 #, fuzzy
 msgid "File Transfer Conflict"
 msgstr "Transferência do arquivo completa"
 
-#: gajim/gtk/filetransfer.py:419
+#: gajim/gtk/filetransfer.py:424
 msgid "This file already exists"
 msgstr "Este arquivo já existe"
 
-#: gajim/gtk/filetransfer.py:420
+#: gajim/gtk/filetransfer.py:425
 msgid "Resume download or replace file?"
 msgstr ""
 
-#: gajim/gtk/filetransfer.py:424
+#: gajim/gtk/filetransfer.py:429
 #, fuzzy
 msgid "Replace _File"
 msgstr "Limpando"
 
-#: gajim/gtk/filetransfer.py:427
+#: gajim/gtk/filetransfer.py:432
 #, fuzzy
 msgid "Resume _Download"
 msgstr "Download"
 
-#: gajim/gtk/filetransfer.py:437
+#: gajim/gtk/filetransfer.py:442
 #, fuzzy, python-format
 msgid "Directory '%s' is not writable"
 msgstr "O diretório \"%s\" não é gravável"
 
-#: gajim/gtk/filetransfer.py:438
+#: gajim/gtk/filetransfer.py:443
 #, fuzzy
 msgid "You do not have permissions to create files in this directory."
 msgstr "Você não tem permissão para criar este diretório."
 
-#: gajim/gtk/filetransfer.py:461
+#: gajim/gtk/filetransfer.py:466
 #, python-format
 msgid "File: %s"
 msgstr "Arquivo: %s"
 
-#: gajim/gtk/filetransfer.py:467
+#: gajim/gtk/filetransfer.py:472
 #, python-format
 msgid "Type: %s"
 msgstr "Tipo: %s"
 
-#: gajim/gtk/filetransfer.py:469
+#: gajim/gtk/filetransfer.py:474
 #, python-format
 msgid "Description: %s"
 msgstr "Descrição: %s"
 
-#: gajim/gtk/filetransfer.py:480
+#: gajim/gtk/filetransfer.py:485
 #, fuzzy, python-format
 msgid "%s wants to send you a file"
 msgstr "%s quer te enviar um arquivo."
 
-#: gajim/gtk/filetransfer.py:509
+#: gajim/gtk/filetransfer.py:514
 #, fuzzy
 msgid "Checking file…"
 msgstr "Enviando perfil..."
 
-#: gajim/gtk/filetransfer.py:524
+#: gajim/gtk/filetransfer.py:529
 #, fuzzy
 msgid "File error"
 msgstr "Erro na transferência de arquivos"
 
-#: gajim/gtk/filetransfer.py:561
+#: gajim/gtk/filetransfer.py:566
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 
-#: gajim/gtk/filetransfer.py:658
+#: gajim/gtk/filetransfer.py:663
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/s)"
 
-#: gajim/gtk/filetransfer.py:711 gajim/gtk/filetransfer.py:715
+#: gajim/gtk/filetransfer.py:716 gajim/gtk/filetransfer.py:720
 msgid "Invalid File"
 msgstr "Arquivo inválido"
 
-#: gajim/gtk/filetransfer.py:711
+#: gajim/gtk/filetransfer.py:716
 msgid "File: "
 msgstr "Arquivo: "
 
-#: gajim/gtk/filetransfer.py:716
+#: gajim/gtk/filetransfer.py:721
 msgid "It is not possible to send empty files"
 msgstr "Não é possível enviar arquivos vazios"
 
-#: gajim/gtk/filetransfer.py:742 gajim/gtk/tooltips.py:571
+#: gajim/gtk/filetransfer.py:747 gajim/gtk/tooltips.py:571
 msgid "Sender: "
 msgstr "Remetente: "
 
-#: gajim/gtk/filetransfer.py:1038
+#: gajim/gtk/filetransfer.py:1043
 #, fuzzy
 msgid "Choose a File to Send…"
 msgstr "Escolha o arquivo para enviar..."
 
 #: gajim/gtk/start_chat.py:51
 #, fuzzy
-msgid "Start new Conversation"
+msgid "Start New Conversation"
 msgstr "Conversação continuada"
 
-#: gajim/gtk/start_chat.py:424
-#, fuzzy
-msgid "New Groupchat"
-msgstr "Nova conferência"
+#: gajim/gtk/start_chat.py:260 gajim/gtk/start_chat.py:328
+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:603 gajim/gtk/groupchat_join.py:38
+msgid "Join Group Chat"
+msgstr "Ingressar numa conferência"
 
-#: gajim/gtk/start_chat.py:426
+#: gajim/gtk/start_chat.py:605 gajim/gtk/add_contact.py:40
 #, fuzzy
-msgid "New Contact"
-msgstr "Adicionar novo contato"
+msgid "Add Contact"
+msgstr "_Adicionar contato..."
 
-#: gajim/gtk/start_chat.py:588
+#: gajim/gtk/start_chat.py:746
 #, fuzzy, python-format
-msgid "%s Group chats found"
+msgid "%s group chats found"
 msgstr "%s não encontrado"
 
-#: gajim/gtk/discovery.py:70
+#: gajim/gtk/discovery.py:69
 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:71
+#: gajim/gtk/discovery.py:70
 #, fuzzy
 msgid ""
 "This service could not respond with detailed information.\n"
@@ -8879,32 +9224,33 @@ msgstr ""
 "Este serviço não pode responder com informações detalhadas.\n"
 "É provável que esteja quebrado"
 
-#: gajim/gtk/discovery.py:128
+#: gajim/gtk/discovery.py:126
 msgid "Others"
 msgstr "Outros"
 
-#: gajim/gtk/discovery.py:131
-msgid "Conference"
-msgstr "Conferência"
+#: gajim/gtk/discovery.py:129
+#, fuzzy
+msgid "Group Chat"
+msgstr "Salas"
 
-#: gajim/gtk/discovery.py:519
+#: gajim/gtk/discovery.py:518
 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:606
+#: gajim/gtk/discovery.py:605
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Buscar serviços usando conta %s"
 
-#: gajim/gtk/discovery.py:608
+#: gajim/gtk/discovery.py:607
 msgid "Service Discovery"
 msgstr "Buscar serviços"
 
-#: gajim/gtk/discovery.py:691
+#: gajim/gtk/discovery.py:690
 msgid "The service could not be found"
 msgstr "O serviço não pode ser encontrado"
 
-#: gajim/gtk/discovery.py:692
+#: gajim/gtk/discovery.py:691
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -8912,101 +9258,80 @@ 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:699 gajim/gtk/discovery.py:1042
+#: gajim/gtk/discovery.py:698 gajim/gtk/discovery.py:1041
 msgid "The service is not browsable"
 msgstr "Serviço não navegável"
 
-#: gajim/gtk/discovery.py:700
+#: gajim/gtk/discovery.py:699
 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:738 gajim/gtk/discovery.py:747
+#: gajim/gtk/discovery.py:737 gajim/gtk/discovery.py:746
 msgid "Invalid Server Name"
 msgstr "Nome do servidor inválido"
 
-#: gajim/gtk/discovery.py:806
+#: gajim/gtk/discovery.py:805
 #, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Explorando %(address)s usando conta %(account)s"
 
-#: gajim/gtk/discovery.py:851
+#: gajim/gtk/discovery.py:850
 #, fuzzy
 msgid "Browse"
 msgstr "_Navegar"
 
-#: gajim/gtk/discovery.py:1043
+#: gajim/gtk/discovery.py:1042
 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:1255
+#: gajim/gtk/discovery.py:1254
 #, fuzzy
 msgid "_Command"
 msgstr "Comandos"
 
-#: gajim/gtk/discovery.py:1264 gajim/gtk/discovery.py:1422
+#: gajim/gtk/discovery.py:1263 gajim/gtk/discovery.py:1420
 msgid "Re_gister"
 msgstr "Re_gistrar"
 
-#: gajim/gtk/discovery.py:1277
+#: gajim/gtk/discovery.py:1276
 msgid "_Search"
 msgstr "_Buscar"
 
-#: gajim/gtk/discovery.py:1420
+#: gajim/gtk/discovery.py:1418
 msgid "_Edit"
 msgstr "_Editar"
 
-#: gajim/gtk/discovery.py:1458
+#: gajim/gtk/discovery.py:1456
 #, fuzzy, python-format
 msgid "Scanning %(current)d / %(total)d ..."
 msgstr "Varrendo %(current)d / %(total)d.."
 
-#: gajim/gtk/discovery.py:1674
+#: gajim/gtk/discovery.py:1655
+msgid "Users"
+msgstr "Usuários"
+
+#: gajim/gtk/discovery.py:1671
 msgid "Id"
 msgstr "Id"
 
-#: gajim/gtk/discovery.py:1713
-msgid "_Join"
-msgstr "_Ingressar"
-
-#: gajim/gtk/discovery.py:1736
-msgid "Bookmark already set"
-msgstr "Marcador já configurado"
-
-#: gajim/gtk/discovery.py:1737
-#, fuzzy, python-format
-msgid "Group Chat '%s' is already in your bookmarks."
-msgstr "A sala \"%s\" já existe nos marcadores."
-
-#: gajim/gtk/discovery.py:1748
-msgid "Bookmark has been added successfully"
-msgstr "Marcador foi adicionado com sucesso"
-
-#: gajim/gtk/discovery.py:1749
-#, fuzzy
-msgid ""
-"You can manage your bookmarks by clicking the Bookmarks menu item in your "
-"contact list."
-msgstr ""
-"Você pode gerenciar seus marcadores pelo menu de ações na janela principal."
-
-#: gajim/gtk/discovery.py:1950
+#: gajim/gtk/discovery.py:1900
 msgid "Subscribed"
 msgstr "Inscrito"
 
-#: gajim/gtk/discovery.py:1959
+#: gajim/gtk/discovery.py:1909
 msgid "Node"
 msgstr "Nó"
 
-#: gajim/gtk/discovery.py:2028
+#: gajim/gtk/discovery.py:1978
 #, fuzzy
 msgid "_New post"
 msgstr "Nova postagem"
 
-#: gajim/gtk/discovery.py:2037
+#: gajim/gtk/discovery.py:1987
 msgid "_Subscribe"
 msgstr "_Inscrever"
 
-#: gajim/gtk/discovery.py:2045
+#: gajim/gtk/discovery.py:1995
 msgid "_Unsubscribe"
 msgstr "_Desinscrever"
 
@@ -9053,7 +9378,7 @@ msgstr "Formulário %s"
 msgid "Characters typed: %s"
 msgstr "Caracteres digitados: %s"
 
-#: gajim/gtk/single_message.py:274 gajim/gtk/xml_console.py:169
+#: gajim/gtk/single_message.py:274 gajim/gtk/xml_console.py:166
 msgid "Connection not available"
 msgstr "Conexão não disponível"
 
@@ -9062,6 +9387,12 @@ msgstr "Conexão não disponível"
 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:306
+#, 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:330
 #, python-format
 msgid "RE: %s"
@@ -9072,28 +9403,28 @@ msgstr "RE: %s"
 msgid "%s wrote:\n"
 msgstr "%s escreveu:\n"
 
-#: gajim/gtk/pep_config.py:44
+#: gajim/gtk/pep_config.py:45
 #, fuzzy, python-format
 msgid "PEP Service Configuration (%s)"
 msgstr "Configuração do serviço PEP"
 
-#: gajim/gtk/pep_config.py:77
+#: gajim/gtk/pep_config.py:78
 #, fuzzy
 msgid "Service"
 msgstr "Servidor"
 
-#: gajim/gtk/pep_config.py:114
+#: gajim/gtk/pep_config.py:115
 msgid "PEP node was not removed"
 msgstr "O nó PEP não foi removido"
 
-#: gajim/gtk/pep_config.py:115
+#: gajim/gtk/pep_config.py:116
 #, fuzzy, python-format
 msgid ""
 "PEP node %(node)s was not removed:\n"
 "%(message)s"
 msgstr "O nó PEP %(node)s não foi removido: %(message)s"
 
-#: gajim/gtk/pep_config.py:146
+#: gajim/gtk/pep_config.py:147
 #, python-format
 msgid "Configure %s"
 msgstr "Configurar %s"
@@ -9109,17 +9440,21 @@ msgstr "_Registrar"
 msgid "Registration successful"
 msgstr "Registro realizado com sucesso"
 
-#: gajim/gtk/dialogs.py:54 gajim/gtk/dataform.py:659 gajim/gtk/adhoc.py:85
+#: gajim/gtk/service_registration.py:215
+msgid "Registration failed"
+msgstr "Falha ao registrar"
+
+#: gajim/gtk/dialogs.py:53 gajim/gtk/dataform.py:668 gajim/gtk/adhoc.py:86
 #, fuzzy
 msgid "Cancel"
 msgstr "_Cancelar"
 
-#: gajim/gtk/dialogs.py:129
+#: gajim/gtk/dialogs.py:128
 #, 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:130
+#: gajim/gtk/dialogs.py:129
 #, fuzzy, python-format
 msgid ""
 "You have to install the dictionary \"%s\" to use spellchecking, or choose "
@@ -9132,11 +9467,11 @@ msgstr ""
 "\n"
 "O recurso de destacar palavras grafadas incorretamente não será usado"
 
-#: gajim/gtk/dialogs.py:410 gajim/gtk/dialogs.py:425
+#: gajim/gtk/dialogs.py:322 gajim/gtk/dialogs.py:337
 msgid "Insecure connection"
 msgstr "Conexão não-segura"
 
-#: gajim/gtk/dialogs.py:411
+#: gajim/gtk/dialogs.py:323
 #, python-format
 msgid ""
 "You are about to connect to the account %(account)s (%(server)s) insecurely. "
@@ -9149,120 +9484,115 @@ msgstr ""
 "altamente desencorajado.\n"
 "Você tem certeza que deseja fazer isso?"
 
-#: gajim/gtk/dialogs.py:416
+#: gajim/gtk/dialogs.py:328
 msgid "Yes, I really want to connect insecurely"
 msgstr "Sim, eu realmente quero me conectar de modo não-seguro"
 
-#: gajim/gtk/dialogs.py:417
+#: gajim/gtk/dialogs.py:329
 msgid "Gajim will NOT connect unless you check this box"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:675
-#, fuzzy
-msgid "The nickname contains invalid characters."
-msgstr "O apelido possui caracteres não permitidos."
-
-#: gajim/gtk/dialogs.py:734
+#: gajim/gtk/dialogs.py:561
 #, fuzzy, python-format
 msgid "Destroy %s"
 msgstr "Excluindo %s"
 
-#: gajim/gtk/dialogs.py:775
+#: gajim/gtk/dialogs.py:602
 #, fuzzy
 msgid "Certificate"
 msgstr "Certificado próprio"
 
-#: gajim/gtk/dialogs.py:786
+#: gajim/gtk/dialogs.py:613
 #, fuzzy, python-format
 msgid ""
 "Certificate for account\n"
 "%s"
 msgstr "para conta %s"
 
-#: gajim/gtk/dialogs.py:824
+#: gajim/gtk/dialogs.py:651
 msgid "Issued to\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:825 gajim/gtk/dialogs.py:830
+#: gajim/gtk/dialogs.py:652 gajim/gtk/dialogs.py:657
 msgid "Common Name (CN): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:826 gajim/gtk/dialogs.py:831
+#: gajim/gtk/dialogs.py:653 gajim/gtk/dialogs.py:658
 msgid "Organization (O): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:827 gajim/gtk/dialogs.py:832
+#: gajim/gtk/dialogs.py:654 gajim/gtk/dialogs.py:659
 msgid "Organizational Unit (OU): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:828
+#: gajim/gtk/dialogs.py:655
 #, fuzzy
 msgid "Serial Number: "
 msgstr "Número de GG:"
 
-#: gajim/gtk/dialogs.py:829
+#: gajim/gtk/dialogs.py:656
 msgid "Issued by\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:833
+#: gajim/gtk/dialogs.py:660
 msgid "Validity\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:834
+#: gajim/gtk/dialogs.py:661
 msgid "Issued on: "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:835
+#: gajim/gtk/dialogs.py:662
 msgid "Expires on: "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:836
+#: gajim/gtk/dialogs.py:663
 msgid "SHA-1:"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:838
+#: gajim/gtk/dialogs.py:665
 msgid "SHA-256:"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:852
+#: gajim/gtk/dialogs.py:679
 #, fuzzy
 msgid "View certificate…"
 msgstr "Certificado próprio"
 
-#: gajim/gtk/dialogs.py:864 gajim/gtk/accounts.py:893
+#: gajim/gtk/dialogs.py:691 gajim/gtk/accounts.py:896
 msgid "Change Password"
 msgstr "Alterar senha"
 
-#: gajim/gtk/dialogs.py:878
+#: gajim/gtk/dialogs.py:705
 msgid "_OK"
 msgstr "_OK"
 
-#: gajim/gtk/dialogs.py:891
+#: gajim/gtk/dialogs.py:718
 #, fuzzy
 msgid "You must enter a password"
 msgstr "Você deve entrar com uma senha."
 
-#: gajim/gtk/dialogs.py:895
+#: gajim/gtk/dialogs.py:722
 msgid "Passwords do not match"
 msgstr "Senhas não conferem"
 
-#: gajim/gtk/dialogs.py:923
+#: gajim/gtk/dialogs.py:750
 #, fuzzy
 msgid "Group Chat Invitation "
 msgstr "Convite para conferência"
 
-#: gajim/gtk/dialogs.py:948
+#: gajim/gtk/dialogs.py:775
 #, fuzzy, python-format
 msgid "<b>%s</b> has invited you to join a discussion"
 msgstr "$Contact convidou você para ingressar em uma discussão"
 
-#: gajim/gtk/dialogs.py:951
+#: gajim/gtk/dialogs.py:778
 #, fuzzy, python-format
 msgid ""
 "<b>%(contact)s</b> has invited you to the group chat <b>%(room_jid)s</b>"
 msgstr "$Contact convidou você para entrar na conferência %(room_jid)s"
 
-#: gajim/gtk/dialogs.py:959
+#: gajim/gtk/dialogs.py:786
 #, python-format
 msgid "Comment: %s"
 msgstr "Comentário: %s"
@@ -9277,11 +9607,6 @@ msgstr "Número de GG:"
 msgid "ICQ Number"
 msgstr "Número de ICQ:"
 
-#: gajim/gtk/add_contact.py:40
-#, fuzzy
-msgid "Add Contact"
-msgstr "_Adicionar contato..."
-
 #: gajim/gtk/add_contact.py:259
 #, fuzzy, python-format
 msgid "%s Missing"
@@ -9302,7 +9627,8 @@ msgid "The user ID must not contain a resource."
 msgstr "O ID do usuário não contém um recurso."
 
 #: gajim/gtk/add_contact.py:299
-msgid "You cannot add yourself to your roster."
+#, fuzzy
+msgid "You cannot add yourself to your contact list."
 msgstr "Você não pode adicionar você mesmo na sua lista."
 
 #: gajim/gtk/add_contact.py:304
@@ -9315,11 +9641,13 @@ msgid "Your account must be online to add new contacts."
 msgstr ""
 
 #: gajim/gtk/add_contact.py:321
-msgid "Contact already in roster"
+#, fuzzy
+msgid "Contact Already in Contact List"
 msgstr "Contato já foi adicionado à lista"
 
 #: gajim/gtk/add_contact.py:322
-msgid "This contact is already listed in your roster."
+#, fuzzy
+msgid "This contact is already in your contact list."
 msgstr "Este contato já encontra-se em sua lista."
 
 #: gajim/gtk/add_contact.py:379 gajim/gtk/add_contact.py:417
@@ -9358,12 +9686,13 @@ msgid "Chatstate Paused"
 msgstr "Alterar status"
 
 #: gajim/gtk/themes.py:52
-msgid "MUC Tab New Directed Message"
+#, fuzzy
+msgid "Group Chat Tab New Directed Message"
 msgstr "Aba de MUC com Nova Mensagem Direcionada"
 
 #: gajim/gtk/themes.py:56
 #, fuzzy
-msgid "MUC Tab New Message"
+msgid "Group Chat Tab New Message"
 msgstr "Nova mensagem"
 
 #: gajim/gtk/themes.py:60
@@ -9580,13 +9909,13 @@ msgstr "Todos os arquivos"
 msgid "Clear File"
 msgstr "Limpando"
 
-#: gajim/gtk/settings.py:570
+#: gajim/gtk/settings.py:570 gajim/gtk/proxies.py:32
 #, fuzzy
 msgid "Manage Proxies"
 msgstr "Gerenciar perfis de proxy"
 
-#: gajim/gtk/settings.py:591 gajim/gtk/preferences.py:971
-#: gajim/gtk/preferences.py:984 gajim/gtk/preferences.py:988
+#: gajim/gtk/settings.py:591 gajim/gtk/preferences.py:968
+#: gajim/gtk/preferences.py:982 gajim/gtk/preferences.py:986
 #, fuzzy
 msgid "No Proxy"
 msgstr "Proxy:"
@@ -9666,14 +9995,15 @@ msgid ""
 "        "
 msgstr ""
 
-#: gajim/gtk/about.py:47 data/org.gajim.Gajim.appdata.xml.in:10
+#: gajim/gtk/about.py:47 data/org.gajim.Gajim.desktop.in:6
+#: data/org.gajim.Gajim.appdata.xml.in:10
 #, fuzzy
-msgid "A GTK+ XMPP client"
+msgid "A GTK XMPP client"
 msgstr "Um cliente Jabber GTK+"
 
 #: gajim/gtk/about.py:48
-#, python-format
-msgid "GTK+ Version: %s"
+#, fuzzy, python-format
+msgid "GTK Version: %s"
 msgstr "Versão do GTK+: %s"
 
 #: gajim/gtk/about.py:49
@@ -9855,6 +10185,25 @@ msgstr "?status da transferência:Parado"
 msgid "?transfer status:Not started"
 msgstr "?status da transferência:Parado"
 
+#: gajim/gtk/groupchat_creation.py:97 gajim/gtk/groupchat_creation.py:99
+msgid " (optional)..."
+msgstr ""
+
+#: gajim/gtk/groupchat_creation.py:134
+#, fuzzy
+msgid "Invalid Address"
+msgstr "Arquivo inválido"
+
+#: gajim/gtk/groupchat_creation.py:182
+#, fuzzy
+msgid "Not Connected"
+msgstr "Conectado"
+
+#: gajim/gtk/groupchat_creation.py:183
+#, fuzzy
+msgid "You have to be connected to create a group chat."
+msgstr "Você não entrou em uma sala."
+
 #: gajim/gtk/sounds.py:39
 msgid "Wav Sounds"
 msgstr "Sons wav"
@@ -9896,50 +10245,45 @@ msgstr "Mensagem destacada de conferência"
 msgid "Group Chat Message Received"
 msgstr "Mensagem de conferência recebida"
 
-#: gajim/gtk/dataform.py:226 gajim/gtk/dataform.py:262
+#: gajim/gtk/dataform.py:232 gajim/gtk/dataform.py:268
 #, fuzzy
 msgid "Required"
 msgstr "Senha é obrigatória"
 
-#: gajim/gtk/dataform.py:286
+#: gajim/gtk/dataform.py:293
 msgid "Yes"
 msgstr ""
 
-#: gajim/gtk/dataform.py:286
+#: gajim/gtk/dataform.py:293
 #, fuzzy
 msgid "No"
 msgstr "Nenhum"
 
-#: gajim/gtk/dataform.py:661
+#: gajim/gtk/dataform.py:670
 msgid "Submit"
 msgstr ""
 
-#: gajim/gtk/statusicon.py:213
+#: gajim/gtk/statusicon.py:206
 #, fuzzy
 msgid "_Change Status Message…"
 msgstr "_Mudar mensagem de status"
 
-#: gajim/gtk/statusicon.py:247 gajim/gtk/statusicon.py:292
-#: gajim/gtk/statusicon.py:299
+#: gajim/gtk/statusicon.py:258
 #, python-format
 msgid "using account %s"
 msgstr "usando conta %s"
 
-#: gajim/gtk/statusicon.py:309
+#: gajim/gtk/statusicon.py:269
 #, fuzzy
-msgid "_Manage Bookmarks…"
-msgstr "Gerenciar marcadores"
+msgid "Hide _Contact List"
+msgstr "Convidar _contatos"
 
-#: gajim/gtk/statusicon.py:325
+#: gajim/gtk/statusicon.py:273
 #, fuzzy
-msgid "Hide _Roster"
-msgstr "na _lista"
-
-#: gajim/gtk/statusicon.py:329
-msgid "Show _Roster"
-msgstr "Exibir _lista"
+msgid "Show _Contact List"
+msgstr "Exibir somente _ativos"
 
-#: gajim/gtk/statusicon.py:337
+#: gajim/gtk/statusicon.py:281
 msgid "Hide this menu"
 msgstr "Esconder este menu"
 
@@ -9987,36 +10331,6 @@ msgid ""
 msgstr ""
 "Houve um erro ao publicar sua informação pessoal, tente outra vez mais tarde."
 
-#: gajim/gtk/join_groupchat.py:202
-#, fuzzy
-msgid "Invalid Room"
-msgstr "Sala inválida"
-
-#: gajim/gtk/join_groupchat.py:203
-msgid "Please choose a room"
-msgstr ""
-
-#: gajim/gtk/join_groupchat.py:222 gajim/gtk/join_groupchat.py:229
-msgid "Invalid Nickname"
-msgstr "Apelido inválido"
-
-#: gajim/gtk/join_groupchat.py:223
-#, fuzzy
-msgid "Please choose a nickname"
-msgstr "Crie um novo tema com o nome que você desejar."
-
-#: gajim/gtk/join_groupchat.py:282 gajim/gtk/join_groupchat.py:288
-#: gajim/gtk/join_groupchat.py:293
-#, fuzzy
-msgid "Wrong server"
-msgstr "URI incorreta"
-
-#: gajim/gtk/join_groupchat.py:283 gajim/gtk/join_groupchat.py:289
-#: gajim/gtk/join_groupchat.py:294
-#, python-format
-msgid "%s is not a groupchat server"
-msgstr "%s não é um servidor de conferência"
-
 #: gajim/gtk/mam_preferences.py:38
 #, python-format
 msgid "Archiving Preferences for %s"
@@ -10046,45 +10360,53 @@ msgstr "Erro recebido: {}"
 msgid "Archiving Preferences Error"
 msgstr "_Preferências"
 
-#: gajim/gtk/advanced_config.py:81
+#: gajim/gtk/advanced_config.py:95
 msgid "Activated"
 msgstr "Ativado"
 
-#: gajim/gtk/advanced_config.py:81
+#: gajim/gtk/advanced_config.py:95
 msgid "Deactivated"
 msgstr "Desativado"
 
-#: gajim/gtk/advanced_config.py:83
-msgid "Boolean"
-msgstr "Booleano"
+#: gajim/gtk/advanced_config.py:97
+msgid "?config type:Boolean"
+msgstr ""
+
+#: gajim/gtk/advanced_config.py:98
+msgid "?config type:Integer"
+msgstr ""
 
-#: gajim/gtk/advanced_config.py:84
-msgid "Integer"
-msgstr "Inteiro"
+#: gajim/gtk/advanced_config.py:99
+msgid "?config type:Text"
+msgstr ""
 
-#: gajim/gtk/advanced_config.py:85
-msgid "Text"
-msgstr "Texto"
+#: gajim/gtk/advanced_config.py:100
+msgid "?config type:Color"
+msgstr ""
 
-#: gajim/gtk/advanced_config.py:97
-msgid "Preference Name"
+#: gajim/gtk/advanced_config.py:112
+#, fuzzy
+msgid "?config:Preference Name"
 msgstr "Nome da preferência"
 
-#: gajim/gtk/advanced_config.py:104
-msgid "Value"
-msgstr "Valor"
+#: gajim/gtk/advanced_config.py:123
+#, fuzzy
+msgid "?config:Value"
+msgstr "_Configurar"
 
-#: gajim/gtk/advanced_config.py:113
-msgid "Type"
-msgstr "Tipo"
+#: gajim/gtk/advanced_config.py:132
+msgid "?config:Type"
+msgstr ""
 
-#: gajim/gtk/advanced_config.py:168
-msgid "(None)"
-msgstr "(Nada)"
+#: gajim/gtk/advanced_config.py:187
+#, fuzzy
+msgid "?config description:None"
+msgstr "?Pergunta (para inscrição):Nenhuma"
 
-#: gajim/gtk/advanced_config.py:299
-msgid "Hidden"
-msgstr "Escondido"
+#: gajim/gtk/advanced_config.py:322
+#, fuzzy
+msgid "?password:Hidden"
+msgstr "Senha:"
 
 #: gajim/gtk/server_info.py:66
 #, fuzzy
@@ -10096,8 +10418,8 @@ msgstr "_Copiar URL"
 msgid "%(days)s days, %(hours)s hours"
 msgstr ""
 
-#: gajim/gtk/server_info.py:218 gajim/gtk/accounts.py:749
-#: gajim/gtk/accounts.py:853
+#: gajim/gtk/server_info.py:218 gajim/gtk/accounts.py:752
+#: gajim/gtk/accounts.py:856
 #, fuzzy
 msgid "Hostname"
 msgstr "_Nome do computador:"
@@ -10289,11 +10611,6 @@ 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_config.py:41
-#, fuzzy
-msgid "Group Chat Configuration"
-msgstr "Convite para conferência"
-
 #: gajim/gtk/groupchat_config.py:134
 #, fuzzy
 msgid "A Group Chat needs at least one Owner"
@@ -10304,67 +10621,67 @@ msgid "You are not allowed to modify the affiliation of Admins and Owners"
 msgstr ""
 
 #: gajim/gtk/groupchat_config.py:399
-msgid "An entry with this Jabber-ID already exists"
+msgid "An entry with this XMPP Address already exists"
 msgstr ""
 
-#: gajim/gtk/adhoc.py:91
+#: gajim/gtk/adhoc.py:92
 #, fuzzy
 msgid "Finish"
 msgstr "_Concluir"
 
-#: gajim/gtk/adhoc.py:97 gajim/gtk/adhoc.py:283
+#: gajim/gtk/adhoc.py:98 gajim/gtk/adhoc.py:284
 msgid "Commands"
 msgstr "Comandos"
 
-#: gajim/gtk/adhoc.py:103
+#: gajim/gtk/adhoc.py:104
 msgid "Next"
 msgstr ""
 
-#: gajim/gtk/adhoc.py:109
+#: gajim/gtk/adhoc.py:110
 #, fuzzy
 msgid "Previous"
 msgstr "Com inveja"
 
-#: gajim/gtk/adhoc.py:115
+#: gajim/gtk/adhoc.py:116
 #, fuzzy
 msgid "Execute"
 msgstr "_Executar comando"
 
-#: gajim/gtk/adhoc.py:195
+#: gajim/gtk/adhoc.py:196
 #, fuzzy
 msgid "No commands available"
 msgstr "Conta não disponível"
 
-#: gajim/gtk/adhoc.py:244
+#: gajim/gtk/adhoc.py:245
 #, fuzzy
 msgid "Request Command List"
 msgstr "_Executar comando"
 
-#: gajim/gtk/adhoc.py:259
+#: gajim/gtk/adhoc.py:260
 #, fuzzy
 msgid "Executing…"
 msgstr "_Executar comando"
 
-#: gajim/gtk/adhoc.py:266
+#: gajim/gtk/adhoc.py:267
 msgid "Command List"
 msgstr "Lista de Comandos"
 
-#: gajim/gtk/adhoc.py:384
+#: gajim/gtk/adhoc.py:385
 #, fuzzy
 msgid "Finished"
 msgstr "_Concluir"
 
-#: gajim/gtk/adhoc.py:453
+#: gajim/gtk/adhoc.py:454
 #, fuzzy
 msgid "Execution failed"
 msgstr "Falha na conexão"
 
-#: gajim/gtk/blocking.py:37
+#: gajim/gtk/blocking.py:38
 #, fuzzy, python-format
 msgid "Blocking List for %s"
 msgstr "Lista de privacidade para %s"
 
-#: gajim/gtk/blocking.py:71
+#: gajim/gtk/blocking.py:72
 #, fuzzy
 msgid "Error!"
 msgstr "Erro"
@@ -10414,8 +10731,7 @@ msgstr "Nome de usuário inválido"
 msgid "You must provide a username to configure this account."
 msgstr "Você deve entrar com um nome para configurar esta conta."
 
-#: gajim/gtk/account_wizard.py:252 gajim/gtk/bookmarks.py:290
-#: gajim/gtk/bookmarks.py:303
+#: gajim/gtk/account_wizard.py:252
 msgid "Invalid server"
 msgstr "Servidor inválido"
 
@@ -10431,7 +10747,7 @@ msgstr "Entrada inválida"
 msgid "Custom port must be a port number."
 msgstr "A porta do proxy deve ser um número de porta."
 
-#: gajim/gtk/account_wizard.py:405
+#: gajim/gtk/account_wizard.py:406
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -10446,15 +10762,15 @@ msgstr ""
 "Erro do SSL: %(error)s\n"
 "Você ainda quer conectar com este servidor?"
 
-#: gajim/gtk/account_wizard.py:446 gajim/gtk/account_wizard.py:480
+#: gajim/gtk/account_wizard.py:447 gajim/gtk/account_wizard.py:481
 msgid "An error occurred during account creation"
 msgstr "Um erro ocorreu durante a criação da conta"
 
-#: gajim/gtk/account_wizard.py:545
+#: gajim/gtk/account_wizard.py:546
 msgid "Account name is in use"
 msgstr "Nome de conta em uso"
 
-#: gajim/gtk/account_wizard.py:546
+#: gajim/gtk/account_wizard.py:547
 msgid "You already have an account using this name."
 msgstr "Você já tem uma conta usando este nome."
 
@@ -10481,25 +10797,25 @@ msgstr "%(received)s de %(max)s"
 msgid "%(minutes)s min %(seconds)s sec"
 msgstr ""
 
-#: gajim/gtk/xml_console.py:77
+#: gajim/gtk/xml_console.py:74
 #, fuzzy
 msgid "Filter"
 msgstr "Filtro:"
 
-#: gajim/gtk/xml_console.py:82
+#: gajim/gtk/xml_console.py:79
 msgid "XML Input"
 msgstr "Entrada XML"
 
-#: gajim/gtk/xml_console.py:86
+#: gajim/gtk/xml_console.py:83
 msgid "Paste Last Input"
 msgstr ""
 
-#: gajim/gtk/xml_console.py:170
+#: gajim/gtk/xml_console.py:167
 #, fuzzy, python-format
 msgid "Please make sure you are connected with '%s'."
 msgstr "Por favor, tenha certeza que você está conectado com \"%s\"."
 
-#: gajim/gtk/xml_console.py:182
+#: gajim/gtk/xml_console.py:177
 #, fuzzy
 msgid "Invalid Node"
 msgstr "Arquivo inválido"
@@ -10532,153 +10848,168 @@ msgstr "Buscar"
 msgid "No results found"
 msgstr "Sem resultados"
 
-#: gajim/gtk/preferences.py:358 gajim/gtk/preferences.py:362
+#: gajim/gtk/preferences.py:357 gajim/gtk/preferences.py:361
 msgid "Default"
 msgstr "Padrão"
 
-#: gajim/gtk/preferences.py:801
+#: gajim/gtk/preferences.py:798
 msgid "status message title"
 msgstr "título da mensagem de status"
 
-#: gajim/gtk/preferences.py:802
+#: gajim/gtk/preferences.py:799
 msgid "status message text"
 msgstr "texto da mensagem de status"
 
+#: gajim/gtk/accounts.py:137
+#, fuzzy
+msgid "Re-Login"
+msgstr "Re-autenticar agora?"
+
 #: gajim/gtk/accounts.py:138
-msgid "Relogin now?"
+#, fuzzy
+msgid "Re-Login now?"
 msgstr "Re-autenticar agora?"
 
 #: gajim/gtk/accounts.py:139
-msgid "If you want all the changes to apply instantly, you must relogin."
+#, 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:191 gajim/gtk/accounts.py:975
+#: gajim/gtk/accounts.py:141
+msgid "_Later"
+msgstr ""
+
+#: gajim/gtk/accounts.py:143
+msgid "_Re-Login"
+msgstr ""
+
+#: gajim/gtk/accounts.py:194 gajim/gtk/accounts.py:978
 #, fuzzy
 msgid "Remove Account"
 msgstr "Removendo %s conta"
 
-#: gajim/gtk/accounts.py:192
+#: gajim/gtk/accounts.py:195
 #, fuzzy, python-format
 msgid "You still have open chats in your account %s"
 msgstr "Você iniciou uma conversa usando a conta %s"
 
-#: gajim/gtk/accounts.py:193
+#: gajim/gtk/accounts.py:196
 #, fuzzy
 msgid ""
 "All chat and group chat windows will be closed.\n"
 "Do you want to continue?"
 msgstr "Todas as janelas de conversa e conferência serão fechadas. Confirma?"
 
-#: gajim/gtk/accounts.py:424
+#: gajim/gtk/accounts.py:427
 #, fuzzy
 msgid "Back"
 msgstr "Volto logo"
 
-#: gajim/gtk/accounts.py:530
+#: gajim/gtk/accounts.py:533
 #, 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:532
+#: gajim/gtk/accounts.py:535
 #, 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:569
+#: gajim/gtk/accounts.py:572
 #, fuzzy
 msgid "Disable Account"
 msgstr "Conta inválida"
 
-#: gajim/gtk/accounts.py:570
+#: gajim/gtk/accounts.py:573
 #, fuzzy, python-format
 msgid "Account %s is still connected"
 msgstr "Conta \"%s\" está conectada ao servidor"
 
-#: gajim/gtk/accounts.py:571
+#: gajim/gtk/accounts.py:574
 #, fuzzy
 msgid ""
 "All chat and group chat windows will be closed. Do you want to continue?"
 msgstr "Todas as janelas de conversa e conferência serão fechadas. Confirma?"
 
-#: gajim/gtk/accounts.py:576
+#: gajim/gtk/accounts.py:579
 #, fuzzy
 msgid "_Disable Account"
 msgstr "Conta inválida"
 
-#: gajim/gtk/accounts.py:595
+#: gajim/gtk/accounts.py:598
 #, fuzzy
 msgid "Add Account"
 msgstr "_Adicionar contato..."
 
-#: gajim/gtk/accounts.py:663
+#: gajim/gtk/accounts.py:666
 msgid "Label"
 msgstr ""
 
-#: gajim/gtk/accounts.py:667
+#: gajim/gtk/accounts.py:670
 msgid "Login"
 msgstr ""
 
-#: gajim/gtk/accounts.py:670
+#: gajim/gtk/accounts.py:673
 #, fuzzy
 msgid "Import Contacts"
 msgstr "Convidar _contatos"
 
-#: gajim/gtk/accounts.py:674 gajim/gtk/accounts.py:870
+#: gajim/gtk/accounts.py:677 gajim/gtk/accounts.py:873
 #, fuzzy
 msgid "Client Certificate"
 msgstr "Certificado próprio"
 
-#: gajim/gtk/accounts.py:677 gajim/gtk/accounts.py:774
+#: gajim/gtk/accounts.py:680 gajim/gtk/accounts.py:777
 #, fuzzy
 msgid "Connect on startup"
 msgstr "C_onectar na inicialização do Gajim"
 
-#: gajim/gtk/accounts.py:681 gajim/gtk/accounts.py:779
+#: gajim/gtk/accounts.py:684 gajim/gtk/accounts.py:782
 #, fuzzy
 msgid "Save conversations for all contacts"
 msgstr "Salvar his_tórico para todos os contatos desta conta"
 
-#: gajim/gtk/accounts.py:683 gajim/gtk/accounts.py:781
+#: gajim/gtk/accounts.py:686 gajim/gtk/accounts.py:784
 msgid "Store conversations on the harddrive"
 msgstr ""
 
-#: gajim/gtk/accounts.py:685 gajim/gtk/accounts.py:783
+#: gajim/gtk/accounts.py:688 gajim/gtk/accounts.py:786
 #, fuzzy
 msgid "Global Status"
 msgstr "Totos os status"
 
-#: gajim/gtk/accounts.py:687
+#: gajim/gtk/accounts.py:690
 #, fuzzy
 msgid "Synchronise the status of all accounts"
 msgstr "Mudar o status da conta ou contas"
 
-#: gajim/gtk/accounts.py:689
+#: gajim/gtk/accounts.py:692
 msgid "Use file transfer proxies"
 msgstr "Usar proxies de transferência de arquivos"
 
-#: gajim/gtk/accounts.py:705
+#: gajim/gtk/accounts.py:708
 #, fuzzy
 msgid "Idle Time"
 msgstr "Ocioso desde:"
 
-#: gajim/gtk/accounts.py:707
+#: gajim/gtk/accounts.py:710
 msgid "Disclose the time of your last activity"
 msgstr ""
 
-#: gajim/gtk/accounts.py:709
+#: gajim/gtk/accounts.py:712
 msgid "Local System Time"
 msgstr ""
 
-#: gajim/gtk/accounts.py:711
+#: gajim/gtk/accounts.py:714
 msgid "Disclose the local system time of the device Gajim runs on"
 msgstr ""
 
-#: gajim/gtk/accounts.py:714
+#: gajim/gtk/accounts.py:717
 #, fuzzy
 msgid "Client / Operating System"
 msgstr "Certificado próprio"
 
-#: gajim/gtk/accounts.py:716
+#: gajim/gtk/accounts.py:719
 #, fuzzy
 msgid ""
 "Disclose informations about the client and operating system you currently use"
@@ -10686,153 +11017,148 @@ msgstr ""
 "Se marcado, o Gajim irá permitir que os outros detectem qual o sistema "
 "operacional está usando"
 
-#: gajim/gtk/accounts.py:719
+#: gajim/gtk/accounts.py:722
 #, fuzzy
 msgid "Ignore Unknown Contacts"
 msgstr "Convidar _contatos"
 
-#: gajim/gtk/accounts.py:721
+#: gajim/gtk/accounts.py:724
 #, 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:737 gajim/gtk/accounts.py:776
+#: gajim/gtk/accounts.py:740 gajim/gtk/accounts.py:779
 #, fuzzy
 msgid "Use environment variable"
 msgstr "_usar variável de ambiente HTTP__PROXY"
 
-#: gajim/gtk/accounts.py:739
-#, fuzzy
-msgid "Proxy"
-msgstr "Proxy:"
-
-#: gajim/gtk/accounts.py:742
+#: gajim/gtk/accounts.py:745
 #, fuzzy
 msgid "Warn on insecure connection"
 msgstr "A_visar antes de usar uma conexão não-segura"
 
-#: gajim/gtk/accounts.py:746
+#: gajim/gtk/accounts.py:749
 msgid "Send keep-alive packets"
 msgstr "Enviar pacotes para manter a conexão (keep-alive)"
 
-#: gajim/gtk/accounts.py:750
+#: gajim/gtk/accounts.py:753
 msgid "Manually set the hostname for the server"
 msgstr ""
 
-#: gajim/gtk/accounts.py:756 gajim/gtk/accounts.py:826
-#: gajim/gtk/accounts.py:831
+#: gajim/gtk/accounts.py:759 gajim/gtk/accounts.py:829
+#: gajim/gtk/accounts.py:834
 #, fuzzy
 msgid "Priority"
 msgstr "_Prioridade:"
 
-#: gajim/gtk/accounts.py:785
+#: gajim/gtk/accounts.py:788
 #, fuzzy
 msgid "Synchronize the status of all accounts"
 msgstr "Mudar o status da conta ou contas"
 
-#: gajim/gtk/accounts.py:795
+#: gajim/gtk/accounts.py:798
 #, fuzzy
 msgid "First Name"
 msgstr "Primeiro nome:"
 
-#: gajim/gtk/accounts.py:798
+#: gajim/gtk/accounts.py:801
 #, fuzzy
 msgid "Last Name"
 msgstr "Último nome:"
 
-#: gajim/gtk/accounts.py:804
+#: gajim/gtk/accounts.py:807
 #, fuzzy
 msgid "Email"
 msgstr "Novo e-mail"
 
-#: gajim/gtk/accounts.py:822
+#: gajim/gtk/accounts.py:825
 #, fuzzy
 msgid "Adjust to status"
 msgstr "_Ajustar para status"
 
-#: gajim/gtk/accounts.py:849
+#: gajim/gtk/accounts.py:852
 msgid "Enable"
 msgstr "Habilitar"
 
-#: gajim/gtk/accounts.py:857
+#: gajim/gtk/accounts.py:860
 #, fuzzy
 msgid "Port"
 msgstr "_Porta:"
 
-#: gajim/gtk/accounts.py:862
+#: gajim/gtk/accounts.py:865
 #, fuzzy
 msgid "Connection Settings"
 msgstr "Conexão"
 
-#: gajim/gtk/accounts.py:872
+#: gajim/gtk/accounts.py:875
 msgid "PKCS12 Files"
 msgstr ""
 
-#: gajim/gtk/accounts.py:874
+#: gajim/gtk/accounts.py:877
 #, fuzzy
 msgid "Encrypted Certificate"
 msgstr "Certificado próprio"
 
-#: gajim/gtk/accounts.py:878
+#: gajim/gtk/accounts.py:881
 #, fuzzy
 msgid "Certificate Settings"
 msgstr "Certificado próprio"
 
-#: gajim/gtk/accounts.py:890
+#: gajim/gtk/accounts.py:893
 #, fuzzy
 msgid "Save Password"
 msgstr "Salvar senha"
 
-#: gajim/gtk/accounts.py:898
+#: gajim/gtk/accounts.py:901
 #, fuzzy
 msgid "Login Settings"
 msgstr "Falha ao registrar"
 
-#: gajim/gtk/accounts.py:931
+#: gajim/gtk/accounts.py:934
 #, fuzzy, python-format
 msgid "Removing account %s"
 msgstr "Removendo %s conta"
 
-#: gajim/gtk/accounts.py:946
+#: gajim/gtk/accounts.py:949
 #, fuzzy
 msgid "Account is disabled"
 msgstr "Emoticons desabilitados"
 
-#: gajim/gtk/accounts.py:947
+#: gajim/gtk/accounts.py:950
 #, fuzzy
 msgid "To unregister from a server, the account must be enabled."
 msgstr "Para desativar esta conta, você deve estar desconectado."
 
-#: gajim/gtk/accounts.py:962
+#: gajim/gtk/accounts.py:965
 #, fuzzy
 msgid "Password required"
 msgstr "Senha é obrigatória"
 
-#: gajim/gtk/accounts.py:976
+#: gajim/gtk/accounts.py:979
 #, fuzzy, python-format
 msgid "Account '%s' is still connected to the server"
 msgstr "Conta \"%s\" está conectada ao servidor"
 
-#: gajim/gtk/accounts.py:978
+#: gajim/gtk/accounts.py:981
 msgid "If you remove it, the connection will be lost."
 msgstr "Se você remover-lo, a conexão será perdida."
 
-#: gajim/gtk/accounts.py:995
+#: gajim/gtk/accounts.py:998
 #, python-format
 msgid "Connection to server %s failed"
 msgstr "A conexão ao servidor %s falhou"
 
-#: gajim/gtk/accounts.py:996
+#: gajim/gtk/accounts.py:999
 #, fuzzy
 msgid "What would you like to do?"
 msgstr "O que você quer fazer?"
 
-#: gajim/gtk/accounts.py:997
+#: gajim/gtk/accounts.py:1000
 #, fuzzy
 msgid "Remove only from Gajim"
 msgstr "Remover conta _somente do Gajim"
 
-#: gajim/gtk/accounts.py:998
+#: gajim/gtk/accounts.py:1001
 msgid "Don't remove anything. I'll try again later"
 msgstr ""
 
@@ -10859,6 +11185,10 @@ msgstr ""
 msgid "Modify"
 msgstr "Modificar"
 
+#: gajim/gtk/roster_item_exchange.py:80
+msgid "JID"
+msgstr "JID"
+
 #: gajim/gtk/roster_item_exchange.py:86
 msgid "Groups"
 msgstr "Grupos"
@@ -10882,19 +11212,19 @@ msgid_plural "Removed %d contacts"
 msgstr[0] "%d contato removido"
 msgstr[1] "%d contatos removidos"
 
-#: gajim/gtk/util.py:581
+#: gajim/gtk/util.py:583
 msgid "Unknown Artist"
 msgstr "Artista desconhecido"
 
-#: gajim/gtk/util.py:582
+#: gajim/gtk/util.py:584
 msgid "Unknown Title"
 msgstr "Título desconhecido"
 
-#: gajim/gtk/util.py:583
+#: gajim/gtk/util.py:585
 msgid "Unknown Source"
 msgstr "Fonte desconhecida"
 
-#: gajim/gtk/util.py:585
+#: gajim/gtk/util.py:587
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
@@ -10903,29 +11233,10 @@ msgstr ""
 "<b>\"%(title)s\"</b> por <i>%(artist)s</i>\n"
 "de <i>%(source)s</i>"
 
-#: gajim/gtk/bookmarks.py:121
-msgid "New Group Chat"
-msgstr "Nova conferência"
-
-#: gajim/gtk/bookmarks.py:161
-msgid "This bookmark has invalid data"
-msgstr "Este marcador tem dados inválidos"
-
-#: gajim/gtk/bookmarks.py:162
-msgid ""
-"Please be sure to fill out server and room fields or remove this bookmark."
-msgstr ""
-"Por favor, tenha certeza que preencheu os campos servidor e sala ou remova "
-"este marcador."
-
-#: gajim/gtk/bookmarks.py:273 gajim/gtk/bookmarks.py:291
-#: gajim/gtk/bookmarks.py:304 gajim/gtk/bookmarks.py:335
-msgid "Character not allowed"
-msgstr "Caractere não permitido"
-
-#: gajim/gtk/bookmarks.py:334
-msgid "Invalid room"
-msgstr "Sala inválida"
+#: gajim/gtk/bookmarks.py:47
+#, fuzzy, python-format
+msgid "Bookmarks for %s"
+msgstr "Ma_rcadores"
 
 #: gajim/plugins/pluginmanager.py:736 gajim/plugins/pluginmanager.py:742
 msgid "Archive corrupted"
@@ -10937,51 +11248,54 @@ msgid "Archive empty"
 msgstr "O arquivo está vazio"
 
 #: gajim/plugins/pluginmanager.py:750 gajim/plugins/pluginmanager.py:758
-#: gajim/plugins/gui.py:257
+#: gajim/plugins/gui.py:258
 #, fuzzy
 msgid "Archive is malformed"
 msgstr "O serviço enviou dados inválidos"
 
-#: gajim/plugins/pluginmanager.py:766 gajim/plugins/gui.py:281
-#: gajim/plugins/gui.py:289
+#: gajim/plugins/pluginmanager.py:766 gajim/plugins/gui.py:288
+#: gajim/plugins/gui.py:301
 #, fuzzy
 msgid "Plugin already exists"
 msgstr "Este arquivo já existe"
 
-#: gajim/plugins/gui.py:82
+#: gajim/plugins/gui.py:83
 msgid "Click to view Gajim's wiki page on how to install plugins in Flatpak."
 msgstr ""
 
-#: gajim/plugins/gui.py:89
+#: gajim/plugins/gui.py:90
 msgid "Plugin"
 msgstr ""
 
-#: gajim/plugins/gui.py:151
+#: gajim/plugins/gui.py:152
 #, fuzzy, python-format
 msgid "Warning: %s"
 msgstr "Banindo %s"
 
-#: gajim/plugins/gui.py:206
+#: gajim/plugins/gui.py:207
 #, fuzzy
 msgid "Plugin failed"
 msgstr "Falha ao registrar"
 
-#: gajim/plugins/gui.py:245
+#: gajim/plugins/gui.py:246
 msgid "Unable to properly remove the plugin"
 msgstr ""
 
-#: gajim/plugins/gui.py:281
-msgid "Overwrite?"
-msgstr ""
+#: gajim/plugins/gui.py:287
+#, fuzzy
+msgid "Overwrite Plugin?"
+msgstr "Sobrescrever mensagem de status?"
+
+#: gajim/plugins/gui.py:289
+#, fuzzy
+msgid "Do you want to overwrite the currently installed version?"
+msgstr "Você quer aceitar este convite?"
 
 #: data/org.gajim.Gajim.desktop.in:5
-msgid "Jabber IM Client"
+#, fuzzy
+msgid "XMPP IM Client"
 msgstr "Um cliente de IM Jabber"
 
-#: data/org.gajim.Gajim.desktop.in:6
-msgid "A GTK+ Jabber client"
-msgstr "Um cliente Jabber GTK+"
-
 #: data/org.gajim.Gajim.desktop.in:8
 msgid "chat;messaging;im;xmpp;bonjour;voip;"
 msgstr ""
@@ -11033,7 +11347,7 @@ msgid "Easily send pictures, videos or other files to friends and groups"
 msgstr ""
 
 #: data/org.gajim.Gajim.appdata.xml.in:27
-msgid "Chat securely with End-to-End encryption via OMEMO or PGP"
+msgid "Chat securely with End-to-End encryption via OMEMO or OpenPGP"
 msgstr ""
 
 #: data/org.gajim.Gajim.appdata.xml.in:28
@@ -11095,7 +11409,7 @@ msgstr ""
 
 #: data/org.gajim.Gajim.appdata.xml.in:52
 #, fuzzy
-msgid "Roster, list of contacts"
+msgid "Contact list, list of contacts"
 msgstr "_Log mudanças de status dos contatos"
 
 #: data/org.gajim.Gajim.appdata.xml.in:56
@@ -11117,6 +11431,538 @@ msgstr "Recentemente:"
 msgid "Plugin manager"
 msgstr "Falha ao registrar"
 
+#, fuzzy
+#~ msgid "Configure Services…"
+#~ msgstr "Configurar serviços..."
+
+#, fuzzy
+#~ msgid "Group Chat Bookmarks"
+#~ msgstr "_Conferência"
+
+#, fuzzy
+#~ msgid "Add Bookmark"
+#~ msgstr "Ma_rcadores"
+
+#, fuzzy
+#~ msgid "Remove Bookmark"
+#~ msgstr "Ma_rcadores"
+
+#, fuzzy
+#~ msgid "Bookmark Name"
+#~ msgstr "Adicionar esta sala aos marcadores"
+
+#, fuzzy
+#~ msgid "_Server"
+#~ msgstr "_Servidor:"
+
+#, fuzzy
+#~ msgid "_Password"
+#~ msgstr "_Senha:"
+
+#, fuzzy
+#~ msgid "Join chat when connected"
+#~ msgstr "Contato desconectou"
+
+#~ msgid "New Group Chat"
+#~ msgstr "Nova conferência"
+
+#~ msgid "This bookmark has invalid data"
+#~ msgstr "Este marcador tem dados inválidos"
+
+#, fuzzy
+#~ msgid ""
+#~ "Please be sure to fill out server and group chat fields or remove this "
+#~ "bookmark."
+#~ msgstr ""
+#~ "Por favor, tenha certeza que preencheu os campos servidor e sala ou "
+#~ "remova este marcador."
+
+#~ msgid "Character not allowed"
+#~ msgstr "Caractere não permitido"
+
+#, fuzzy
+#~ msgid "Invalid Group Chat"
+#~ msgstr "Jabber ID da conferência inválido:"
+
+#~ msgid "Unable to join group chat"
+#~ msgstr "Impossível ingressar na sala"
+
+#~ msgid "You are banned from group chat <b>%s</b>."
+#~ msgstr "Você está banido da sala <b>%s</b>."
+
+#~ msgid "Remote server <b>%s</b> does not exist."
+#~ msgstr "O servidor remoto <b>%s</b> não existe."
+
+#~ msgid "Group chat <b>%s</b> does not exist."
+#~ msgstr "A sala <b>%s</b> não existe."
+
+#, fuzzy
+#~ msgid "Group chat creation is not permitted."
+#~ msgstr "A criação de sala é restrita."
+
+#~ msgid "You must use your registered nickname in <b>%s</b>."
+#~ msgstr "Você deve usar seu apelido registrado em <b>%s</b>."
+
+#, fuzzy
+#~ msgid "You are not in the members list in group chat %s."
+#~ msgstr "Você não está na lista de membros da sala %s."
+
+#, fuzzy
+#~ msgid "XMPP Address is not a group chat"
+#~ msgstr "Isto não é uma conferência"
+
+#~ msgid "This is not a group chat"
+#~ msgstr "Isto não é uma conferência"
+
+#, fuzzy
+#~ msgid "Please choose a group chat"
+#~ msgstr "Crie um novo tema com o nome que você desejar."
+
+#~ msgid "Invalid Nickname"
+#~ msgstr "Apelido inválido"
+
+#, fuzzy
+#~ msgid "Please choose a nickname"
+#~ msgstr "Crie um novo tema com o nome que você desejar."
+
+#, fuzzy
+#~ msgid "Wrong server"
+#~ msgstr "URI incorreta"
+
+#, fuzzy
+#~ msgid "%s is not a group chat server"
+#~ msgstr "%s não é um servidor de conferência"
+
+#, fuzzy
+#~ msgid ""
+#~ "How many lines to request from server when entering a group chat. -1 "
+#~ "means no limit."
+#~ msgstr ""
+#~ "Quantas linhas requisitar ao servidor quando entrar em uma conferência."
+
+#, fuzzy
+#~ msgid ""
+#~ "Minutes of backlog to request when entering a group chat. -1 means no "
+#~ "limit."
+#~ msgstr ""
+#~ "Quantos minutos esperar para requisitar registros quando entrar em uma "
+#~ "sala."
+
+#, fuzzy
+#~ msgid ""
+#~ "How many lines to request from server when entering a group chat. -1 "
+#~ "means no limit, -2 means global value."
+#~ msgstr ""
+#~ "Quantas linhas requisitar ao servidor quando entrar em uma conferência."
+
+#, fuzzy
+#~ msgid ""
+#~ "Minutes of backlog to request when entering a group chat. -1 means no "
+#~ "limit, -2 means global value."
+#~ msgstr ""
+#~ "Quantos minutos esperar para requisitar registros quando entrar em uma "
+#~ "sala."
+
+#, fuzzy
+#~ msgid "A Password is required to join the group chat %s. Please type it."
+#~ msgstr ""
+#~ "Uma senha é requerida para ingressar na sala %s. Por favor, digite-a."
+
+#~ msgid "Not in Roster"
+#~ msgstr "Fora da lista"
+
+#~ msgid "I would like to add you to my roster"
+#~ msgstr "Eu gostaria de adiciona-lo à minha lista"
+
+#, fuzzy
+#~ msgid "Add to Roster"
+#~ msgstr "_Adicionar à lista"
+
+#, fuzzy
+#~ msgid "Audio Session"
+#~ msgstr "Áudio / Vídeo"
+
+#, fuzzy
+#~ msgid "Video Session"
+#~ msgstr "Alternar sessão de vídeo"
+
+#, fuzzy
+#~ msgid "Manage Room"
+#~ msgstr "_Gerenciar sala"
+
+#, fuzzy
+#~ msgid "Configure Room"
+#~ msgstr "Configurar _sala..."
+
+#, fuzzy
+#~ msgid "Destroy Room"
+#~ msgstr "_Excluir sala"
+
+#, fuzzy
+#~ msgid "Change Nick"
+#~ msgstr "Alterar _apelido..."
+
+#, fuzzy
+#~ msgid "Disconnect"
+#~ msgstr "_Desconectar"
+
+#, fuzzy
+#~ msgid "Copy JID"
+#~ msgstr "Sala JID"
+
+#, fuzzy
+#~ msgid "Add to Roster…"
+#~ msgstr "_Adicionar à lista"
+
+#, fuzzy
+#~ msgid "Copy JID/Email"
+#~ msgstr "_Copiar e-mail/JID"
+
+#, fuzzy
+#~ msgid "JID: <i>%s</i>"
+#~ msgstr "Jabber ID: <i>%s</i>"
+
+#~ msgid "Changing Subject"
+#~ msgstr "Mudando assunto"
+
+#~ msgid "Please specify the new subject:"
+#~ msgstr "Por favor, especifique o novo assunto:"
+
+#~ msgid "Room logging is now enabled"
+#~ msgstr "A gravação das conversas da sala está ativo agora"
+
+#~ msgid "Room logging is now disabled"
+#~ msgstr "A gravação das conversas da sala está desligado agora"
+
+#, fuzzy
+#~ msgid "You (%s) joined the room"
+#~ msgstr "%s entrou na conferência"
+
+#~ msgid "Room logging is enabled"
+#~ msgstr "A gravação das conversas da sala está ligado"
+
+#, fuzzy
+#~ msgid "Unable to join groupchat"
+#~ msgstr "Impossível ingressar na sala"
+
+#~ msgid "Groupchat Invitation"
+#~ msgstr "Convite para conferência"
+
+#~ msgid "%(jid)s has been invited in this room"
+#~ msgstr "%(jid)s foi convidado para esta sala"
+
+#, fuzzy
+#~ msgid "JID is not a Groupchat"
+#~ msgstr "Isto não é uma conferência"
+
+#~ msgid "Invalid JID"
+#~ msgstr "JID inválido:"
+
+#~ msgid "A connection is not available"
+#~ msgstr "Uma conexão não está disponível"
+
+#, fuzzy
+#~ msgid "JID already in list"
+#~ msgstr "Jabber ID já existente na lista"
+
+#, fuzzy
+#~ msgid "For the chosen encryption there is no encryption method available"
+#~ msgstr "Uma conexão não está disponível"
+
+#~ msgid "Removes contact from roster"
+#~ msgstr "Remover contato da lista"
+
+#~ msgid "Not in roster"
+#~ msgstr "Fora da lista"
+
+#, fuzzy
+#~ msgid "Contact signed in notification color."
+#~ msgstr "Mo_strar somente na lista"
+
+#, fuzzy
+#~ msgid "Contact signout notification color"
+#~ msgstr "Mo_strar somente na lista"
+
+#, fuzzy
+#~ msgid "File transfer request notification color."
+#~ msgstr "Solicitação de transferência de arquivos"
+
+#, fuzzy
+#~ msgid "File transfer error notification color."
+#~ msgstr "Transferência de arquivos cancelada"
+
+#, fuzzy
+#~ msgid "File transfer complete or stopped notification color."
+#~ msgstr ""
+#~ "Exibir um alerta visual quanto uma transferência de arquivo terminar"
+
+#, fuzzy
+#~ msgid "Groupchat invitation notification color"
+#~ msgstr "Convite para conferência"
+
+#~ msgid "Add * and [n] in roster title?"
+#~ msgstr "Adicionar * e [n] no título da lista?"
+
+#~ msgid "Hides the banner in two persons chat window"
+#~ msgstr "Esconder o banner na janela de conversa para duas pessoas"
+
+#, fuzzy
+#~ msgid ""
+#~ "Show the confirm metacontacts creation dialog or not? Empty string means "
+#~ "never show the dialog."
+#~ 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."
+
+#~ msgid "Space separated list of ssl errors to ignore."
+#~ msgstr "Lista separada por espaços de erros do ssl para ignorar."
+
+#~ msgid "Answer to receipt requests"
+#~ msgstr "Respostas para requisições recebidas"
+
+#~ msgid "Sent receipt requests"
+#~ msgstr "Requisições recebidas enviadas"
+
+#, fuzzy
+#~ msgid "Language for which misspelled words will be checked"
+#~ msgstr "Idioma a usar na verificação ortográficas das palavras"
+
+#~ msgid "I'm eating, so leave me a message."
+#~ msgstr "Eu estou comendo, então deixe-me uma mensagem."
+
+#, fuzzy
+#~ msgid "from room %s"
+#~ msgstr " da sala %s"
+
+#~ msgid "Leave Groupchats"
+#~ msgstr "Sair das salas"
+
+#, fuzzy
+#~ msgid "Auto Join"
+#~ msgstr "Ingresso automático"
+
+#, fuzzy
+#~ msgid "Room"
+#~ msgstr "Sala:"
+
+#~ msgid "Jabber ID:"
+#~ msgstr "Jabber ID:"
+
+#~ msgid "Occupant Actions"
+#~ msgstr "Ações de ocupante"
+
+#~ msgid "_Add to Roster"
+#~ msgstr "_Adicionar à lista"
+
+#~ msgid "_Manage Room"
+#~ msgstr "_Gerenciar sala"
+
+#~ msgid "Configure _Room..."
+#~ msgstr "Configurar _sala..."
+
+#~ msgid "_Destroy Room"
+#~ msgstr "_Excluir sala"
+
+#~ msgid "Jabber ID"
+#~ msgstr "Jabber ID"
+
+#, fuzzy
+#~ msgid "icon"
+#~ msgstr "Ícone da bandeja"
+
+#, fuzzy
+#~ msgid "account"
+#~ msgstr "Conta"
+
+#, fuzzy
+#~ msgid "Roster"
+#~ msgstr "Exibir _lista"
+
+#, fuzzy
+#~ msgid "Show only in roster"
+#~ msgstr "Mostre somente na _lista"
+
+#~ msgid "in _roster"
+#~ msgstr "na _lista"
+
+#~ msgid "Roster Appearance"
+#~ msgstr "Aparência da Lista de Contatos"
+
+#, fuzzy
+#~ msgid "Show chatstate in roster"
+#~ msgstr "Exibir a_vatar dos contatos na lista"
+
+#~ msgid "_Add to Roster..."
+#~ msgstr "_Adicionar à lista..."
+
+#~ msgid "_Jabber ID:"
+#~ msgstr "_Jabber ID:"
+
+#, fuzzy
+#~ msgid "_Jabber ID"
+#~ msgstr "_Jabber ID:"
+
+#~ msgid "JabberID"
+#~ msgstr "Jabber ID"
+
+#, fuzzy
+#~ msgid "Show Roster"
+#~ msgstr "Exibir _lista"
+
+#~ msgid "MUC server"
+#~ msgstr "Servidor MUC"
+
+#~ msgid "Room Configuration"
+#~ msgstr "Configuração da sala"
+
+#~ msgid "Join _Group Chat"
+#~ msgstr "_Entrar em uma conferência"
+
+#~ msgid "Toggle audio session"
+#~ msgstr "Alternar sessão de áudio"
+
+#, fuzzy
+#~ msgid "Audio sessions are not available"
+#~ msgstr "Uma conexão não está disponível"
+
+#~ msgid "Conference"
+#~ msgstr "Conferência"
+
+#, fuzzy
+#~ msgid "_Manage Bookmarks…"
+#~ msgstr "Gerenciar marcadores"
+
+#, fuzzy
+#~ msgid "Hide _Roster"
+#~ msgstr "na _lista"
+
+#~ msgid "Show _Roster"
+#~ msgstr "Exibir _lista"
+
+#, fuzzy
+#~ msgid "Invalid Room"
+#~ msgstr "Sala inválida"
+
+#~ msgid "Invalid room"
+#~ msgstr "Sala inválida"
+
+#~ msgid "A GTK+ Jabber client"
+#~ msgstr "Um cliente Jabber GTK+"
+
+#~ msgid "Changing Nickname"
+#~ msgstr "Mudando apelido"
+
+#~ msgid "Please specify the new nickname you want to use:"
+#~ msgstr "Por favor, especifique o novo apelido que você quer usar:"
+
+#~ msgid "Bookmark already set"
+#~ msgstr "Marcador já configurado"
+
+#, fuzzy
+#~ msgid "Group Chat '%s' is already in your bookmarks."
+#~ msgstr "A sala \"%s\" já existe nos marcadores."
+
+#~ msgid "Bookmark has been added successfully"
+#~ msgstr "Marcador foi adicionado com sucesso"
+
+#, fuzzy
+#~ msgid ""
+#~ "You can manage your bookmarks by clicking the Bookmarks menu item in your "
+#~ "contact list."
+#~ msgstr ""
+#~ "Você pode gerenciar seus marcadores pelo menu de ações na janela "
+#~ "principal."
+
+#, fuzzy
+#~ msgid "The nickname contains invalid characters."
+#~ msgstr "O apelido possui caracteres não permitidos."
+
+#, fuzzy
+#~ msgid "Bookmark Room"
+#~ msgstr "Adicionar esta sala aos marcadores"
+
+#~ msgid "_Join New Group Chat"
+#~ msgstr "_Ingressar em uma nova Conferência"
+
+#, fuzzy
+#~ msgid "_Create Group Chat"
+#~ msgstr "Sair das salas"
+
+#~ msgid "Name:"
+#~ msgstr "Nome:"
+
+#, fuzzy
+#~ msgid "Description:"
+#~ msgstr "Descrição: "
+
+#, fuzzy
+#~ msgid "Address:"
+#~ msgstr "_Endereço:"
+
+#, fuzzy
+#~ msgid "You can not start a new conversation unless you are connected."
+#~ msgstr ""
+#~ "Você não pode ingressar em uma sala de conferência até que esteja "
+#~ "conectado."
+
+#, fuzzy
+#~ msgid "Occupants"
+#~ msgstr "Ações de ocupante"
+
+#, fuzzy
+#~ msgid "File transfer error"
+#~ msgstr "Erro na transferência de arquivos"
+
+#, fuzzy
+#~ msgid "No Accounts available"
+#~ msgstr "Conta não disponível"
+
+#~ msgid "_Modify Account..."
+#~ msgstr "_Alterar conta..."
+
+#~ msgid "Boolean"
+#~ msgstr "Booleano"
+
+#~ msgid "Integer"
+#~ msgstr "Inteiro"
+
+#~ msgid "Text"
+#~ msgstr "Texto"
+
+#~ msgid "Value"
+#~ msgstr "Valor"
+
+#~ msgid "Type"
+#~ msgstr "Tipo"
+
+#~ msgid "(None)"
+#~ msgstr "(Nada)"
+
+#~ msgid "Hidden"
+#~ msgstr "Escondido"
+
+#~ msgid "Manage Proxy Profiles"
+#~ msgstr "Gerenciar perfis de proxy"
+
+#~ msgid "Properties"
+#~ msgstr "Propriedades"
+
+#, fuzzy
+#~ msgid "Proxy _Host"
+#~ msgstr "Máqu_ina Proxy:"
+
+#, fuzzy
+#~ msgid "Proxy _Port"
+#~ msgstr "_Porta do máquina:"
+
+#, fuzzy
+#~ msgid "New Groupchat"
+#~ msgstr "Nova conferência"
+
+#, fuzzy
+#~ msgid "New Contact"
+#~ msgstr "Adicionar novo contato"
+
 #~ msgid "%s GiB"
 #~ msgstr "%s GiB"
 
@@ -11198,9 +12044,6 @@ msgstr "Falha ao registrar"
 #~ msgid "_Pause"
 #~ msgstr "_Pausa"
 
-#~ msgid "Clean _up"
-#~ msgstr "_Limpar"
-
 #~ msgid "Remove file transfer from the list."
 #~ msgstr "Remover a transferência de arquivo da lista."
 
@@ -11651,9 +12494,6 @@ msgstr "Falha ao registrar"
 #~ msgid "You are invited to a groupchat"
 #~ msgstr "Você foi convidado para uma conferência"
 
-#~ msgid "Do you want to accept the invitation?"
-#~ msgstr "Você quer aceitar este convite?"
-
 #~ msgid "_Start Chat"
 #~ msgstr "_Iniciar conversa"
 
@@ -11865,10 +12705,6 @@ msgstr "Falha ao registrar"
 #~ msgid "Nick"
 #~ msgstr "Apelido"
 
-#, fuzzy
-#~ msgid "Banning…"
-#~ msgstr "Banindo..."
-
 #~ msgid ""
 #~ "<b>Whom do you want to ban?</b>\n"
 #~ "\n"
@@ -11950,10 +12786,6 @@ msgstr "Falha ao registrar"
 #~ msgid "Filter:"
 #~ msgstr "Filtro:"
 
-#~ msgid ""
-#~ "If checked, Gajim will display the mood of contacts in the roster window"
-#~ msgstr "Se marcado, Gajim exibirá o humor dos contatos na janela da lista"
-
 #~ msgid "<b>Chat Appearance</b>"
 #~ msgstr "<b>Aparência da conversa</b>"
 
@@ -12215,10 +13047,6 @@ msgstr "Falha ao registrar"
 #~ msgstr "_Mensagem de status:"
 
 #, fuzzy
-#~ msgid "Group chat highlight"
-#~ msgstr "Mensagem destacada de conferência"
-
-#, fuzzy
 #~ msgid "Your nickname"
 #~ msgstr "Seu apelido:"
 
@@ -12360,9 +13188,6 @@ msgstr "Falha ao registrar"
 #~ msgid "The passwords typed in both fields must be identical."
 #~ msgstr "As senhas digitadas em ambos os campos devem ser idênticas."
 
-#~ msgid "Enter new password:"
-#~ msgstr "Digite sua nova senha:"
-
 #~ msgid "Enter it again for confirmation:"
 #~ msgstr "Digite novamente para confirmar:"
 
@@ -12377,10 +13202,6 @@ msgstr "Falha ao registrar"
 #~ msgid "unsubscribe request from %s"
 #~ msgstr "remoção de inscrição solicitada por %s"
 
-#, fuzzy
-#~ msgid "Autojoin"
-#~ msgstr "Ingresso automático"
-
 #~ msgid "Homepage:"
 #~ msgstr "Site pessoal:"
 
@@ -12494,9 +13315,6 @@ msgstr "Falha ao registrar"
 #~ msgid "Forward unread message then disconnect"
 #~ msgstr "Encaminhar mensagens não lidas"
 
-#~ msgid "AIM Address:"
-#~ msgstr "Endereço AIM:"
-
 #~ msgid "MSN Address:"
 #~ msgstr "Endereço MSN:"
 
@@ -12546,10 +13364,6 @@ msgstr "Falha ao registrar"
 #~ msgid "Session negotiation cancelled"
 #~ msgstr "Negociação da sessão cancelada"
 
-#, fuzzy
-#~ msgid "This session WILL NOT be archived on server"
-#~ msgstr "A sessão NÃO SERÁ gravada"
-
 #~ msgid "This session is encrypted"
 #~ msgstr "Esta sessão está criptografada"
 
@@ -12873,9 +13687,6 @@ msgstr "Falha ao registrar"
 #~ msgid "Server:"
 #~ msgstr "Servidor:"
 
-#~ msgid "Password:"
-#~ msgstr "Senha:"
-
 #, fuzzy
 #~ msgid "Join this room _automatically when I connect"
 #~ msgstr "Entrar nesta sala automaticamente quando eu conectar"
@@ -13219,9 +14030,6 @@ msgstr "Falha ao registrar"
 #~ msgid "_Edit Personal Information..."
 #~ msgstr "_Editar detalhes pessoais..."
 
-#~ msgid "Information about you, as stored in the server"
-#~ msgstr "Informações sobre você são gravadas no servidor"
-
 #~ msgid "<b>Personal Information</b>"
 #~ msgstr "<b>Informações pessoais</b>"
 
@@ -13302,9 +14110,6 @@ msgstr "Falha ao registrar"
 #~ msgid "Your server can't save your personal information."
 #~ msgstr "Seu servidor não pode salvar suas informações pessoais."
 
-#~ msgid "Account Local already exists."
-#~ msgstr "Conta local já existe."
-
 #~ msgid "Please rename or remove it before enabling link-local messaging."
 #~ msgstr ""
 #~ "Por favor renomeie ou remova-o antes de ativar troca de mensagens \"link-"
@@ -13400,10 +14205,6 @@ msgstr "Falha ao registrar"
 #~ msgid "The following message was NOT encrypted"
 #~ msgstr "A seguinte mensagem NÃO estava criptografada"
 
-#, fuzzy
-#~ msgid "Encryption used for this contact."
-#~ msgstr "Habilitar criptografia ESessions para esta conta."
-
 #~ msgid "Toggle Open_PGP Encryption"
 #~ msgstr "Ativar criptografia Open_PGP"
 
@@ -13483,10 +14284,6 @@ msgstr "Falha ao registrar"
 #~ msgid "Contact's identity verified"
 #~ msgstr "Identidade do contato verificada"
 
-#, fuzzy
-#~ msgid "Verify again…"
-#~ msgstr "Verificar novamente..."
-
 #~ msgid ""
 #~ "To be certain that <b>only</b> the expected person can read your messages "
 #~ "or send you messages, you need to verify their identity by clicking the "
@@ -13615,9 +14412,6 @@ msgstr "Falha ao registrar"
 #~ msgid "Add _Contact..."
 #~ msgstr "Adicionar _contato..."
 
-#~ msgid "_Accounts"
-#~ msgstr "Cont_as"
-
 #~ msgid "Profile, A_vatar"
 #~ msgstr "Perfil, A_vatar"
 
@@ -13857,12 +14651,6 @@ msgstr "Falha ao registrar"
 #~ msgid "Activity: "
 #~ msgstr "Atividade:"
 
-#~ msgid "Join _Group Chat..."
-#~ msgstr "_Entrar em uma conferência..."
-
-#~ msgid "_Modify Account"
-#~ msgstr "_Alterar conta"
-
 #~ msgid "Check on startup if Gajim is the _default Jabber client"
 #~ msgstr "Sempre verificar ao iniciar se o Gajim é o cliente Jabber _padrão"
 
@@ -14490,9 +15278,6 @@ msgstr "Falha ao registrar"
 #~ msgid "[This message is encrypted]"
 #~ msgstr "[Esta mensagem está criptografada]"
 
-#~ msgid "Trayicon"
-#~ msgstr "Ícone da bandeja"
-
 #~ msgid "A icon in systemtray reflecting the current presence."
 #~ msgstr "Um ícone na bandeja do sistema refletindo a presença atual."
 
@@ -14531,9 +15316,6 @@ msgstr "Falha ao registrar"
 #~ msgid "File transfer stopped by the contact at the other end"
 #~ msgstr "Transferência de arquivo parada pelo contato do outro lado"
 
-#~ msgid "This group chat has no subject"
-#~ msgstr "Esta conferência não tem assunto"
-
 #~ msgid ""
 #~ "Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
 #~ "nickname of an occupant may be substituted, but not if it contains \"@\". "
@@ -14601,9 +15383,6 @@ msgstr "Falha ao registrar"
 #~ "Clique para ver os recursos do servidor jabber (como transportes MSN, "
 #~ "ICQ, etc)"
 
-#~ msgid "_Host:"
-#~ msgstr "_Computador:"
-
 #~ msgid "Select the account with which to synchronise"
 #~ msgstr "Selecione a conta que você quer sincronizar"
 
diff --git a/po/ru.po b/po/ru.po
index 3bc056c13..63038c340 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: 2019-07-02 02:06+0000\n"
+"POT-Creation-Date: 2019-08-11 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,92 +25,90 @@ msgstr ""
 "X-Poedit-Basepath: /home/test/gajim\n"
 "X-Generator: Poedit 1.5.4\n"
 
-#: gajim/chat_control_base.py:550
+#: gajim/chat_control_base.py:557
 msgid "_Undo"
 msgstr "_Отменить"
 
-#: gajim/chat_control_base.py:558 gajim/conversation_textview.py:529
+#: gajim/chat_control_base.py:565 gajim/conversation_textview.py:529
 msgid "_Clear"
 msgstr "_Очистить"
 
-#: gajim/chat_control_base.py:563
+#: gajim/chat_control_base.py:570
 msgid "Paste as quote"
 msgstr ""
 
-#: gajim/chat_control_base.py:613
+#: gajim/chat_control_base.py:620
 #, fuzzy
 msgid "Paste Image"
 msgstr "Выбрать картинку"
 
-#: gajim/chat_control_base.py:614
+#: gajim/chat_control_base.py:621
 #, fuzzy
 msgid "You are trying to paste an image"
 msgstr "Вы собираетесь закрыть несколько вкладок"
 
-#: gajim/chat_control_base.py:615
-#, fuzzy
+#: gajim/chat_control_base.py:622
 msgid ""
 "Are you sure you want to paste your clipboard's image into the chat window?"
-msgstr "Вы точно хотите выйти из комнаты «%s»?"
+msgstr "Вы точно хотите вставить изображение из буфера обмена в окно чата?"
 
-#: gajim/chat_control_base.py:617 gajim/groupchat_control.py:2310
-#: gajim/roster_window.py:2848 gajim/roster_window.py:4167
-#: gajim/message_window.py:252 gajim/gtk/dialogs.py:418
+#: gajim/chat_control_base.py:624 gajim/groupchat_control.py:2218
+#: gajim/roster_window.py:2841 gajim/roster_window.py:4118
+#: gajim/message_window.py:359 gajim/gtk/dialogs.py:330
 msgid "_Do not ask me again"
 msgstr "Не _спрашивать меня снова"
 
-#: gajim/chat_control_base.py:620
+#: gajim/chat_control_base.py:627
 msgid "_Paste"
 msgstr ""
 
-#: gajim/chat_control_base.py:1162 gajim/gtk/accounts.py:351
+#: gajim/chat_control_base.py:1169 gajim/gtk/accounts.py:354
 #, fuzzy
 msgid "Privacy"
 msgstr "Список доступа"
 
-#: gajim/chat_control_base.py:1163
-#, fuzzy
+#: gajim/chat_control_base.py:1170
 msgid "Warning"
-msgstr "Предупреждение:  %s"
+msgstr "Предупреждение"
 
-#: gajim/chat_control_base.py:1164
-#, fuzzy, python-format
+#: gajim/chat_control_base.py:1171
+#, python-format
 msgid "If you send a file to <b>%s</b>, your real JID will be revealed."
-msgstr "Если вы пошлете файл %s, он/она узнает ваш настоящий Jabber ID."
+msgstr ""
+"Если вы пошлете файл — <b>%s</b> станет известен ваш настоящий Jabber ID."
 
-#: gajim/chat_control_base.py:1169
+#: gajim/chat_control_base.py:1176
 #, fuzzy
 msgid "Continue"
 msgstr "_Продолжить"
 
-#: gajim/gtkgui_helpers.py:163 gajim/gtk/filetransfer.py:393
+#: gajim/gtkgui_helpers.py:163 gajim/gtk/filetransfer.py:398
 #, fuzzy, python-format
 msgid "Cannot overwrite existing file '%s'"
 msgstr "Не могу заместить существующий файл «%s»"
 
-#: gajim/gtkgui_helpers.py:164 gajim/gtk/filetransfer.py:394
+#: gajim/gtkgui_helpers.py:164 gajim/gtk/filetransfer.py:399
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
 msgstr "Этот файл уже существует, и у вас нет права его перезаписать."
 
 #: gajim/gtkgui_helpers.py:196
-#, fuzzy
 msgid "Error While Saving"
-msgstr "Ошибка при добавлении службы. %s"
+msgstr "Ошибка при сохранении"
 
 #: gajim/gtkgui_helpers.py:197
 msgid "Extension not supported"
 msgstr "Расширение не поддерживается"
 
 #: gajim/gtkgui_helpers.py:198
-#, fuzzy, python-format
+#, python-format
 msgid ""
 "Image cannot be saved in %(type)s format.\n"
 "Save as %(new_filename)s?"
 msgstr ""
-"Изображение нельзя сохранить в формате %(type)s. Сохранить как "
-"%(new_filename)s?"
+"Изображение нельзя сохранить в формате %(type)s.\n"
+"Сохранить как %(new_filename)s?"
 
 #: gajim/gtkgui_helpers.py:204
 #, fuzzy
@@ -175,205 +173,207 @@ msgstr "Нет ожидающего запроса на подписку."
 msgid " resource with priority "
 msgstr " ресурс с приоритетом "
 
-#: gajim/gui_menu_builder.py:96
-msgid "_New Group Chat"
-msgstr "В _новую комнату"
+#: gajim/gui_menu_builder.py:251 gajim/gui_menu_builder.py:342
+#: gajim/chat_control.py:305 gajim/roster_window.py:783
+#: gajim/roster_window.py:1716 gajim/roster_window.py:1718
+#: gajim/roster_window.py:2027 gajim/roster_window.py:3292
+#: gajim/roster_window.py:3325 gajim/gui_interface.py:396
+#: gajim/common/contacts.py:222 gajim/common/contacts.py:359
+#: gajim/common/contacts.py:471 gajim/common/helpers.py:86
+#: gajim/common/helpers.py:317 gajim/gtk/add_contact.py:319
+#: gajim/gtk/subscription_request.py:70 gajim/gtk/subscription_request.py:99
+#: gajim/gtk/roster_item_exchange.py:112
+#, fuzzy
+msgid "Not in contact list"
+msgstr "Показать контакты не в сети"
+
+#: gajim/gui_menu_builder.py:355
+#, fuzzy
+msgid "I would like to add you to my contact list"
+msgstr "Вы не возражаете, если я добавлю Вас в контакт-лист?"
 
-#: gajim/gui_menu_builder.py:289 gajim/gui_menu_builder.py:380
-#: gajim/chat_control.py:303 gajim/roster_window.py:786
-#: gajim/roster_window.py:1719 gajim/roster_window.py:1721
-#: gajim/roster_window.py:2030 gajim/roster_window.py:3336
-#: gajim/roster_window.py:3369 gajim/gui_interface.py:413
-#: gajim/common/contacts.py:206 gajim/common/contacts.py:343
-#: gajim/common/helpers.py:83 gajim/common/helpers.py:311
-#: gajim/gtk/add_contact.py:319 gajim/gtk/subscription_request.py:70
-#: gajim/gtk/subscription_request.py:99 gajim/gtk/roster_item_exchange.py:112
-msgid "Not in Roster"
-msgstr "Не в ростере"
-
-#: gajim/gui_menu_builder.py:393
-msgid "I would like to add you to my roster"
-msgstr "Вы не против, если я добавлю Вас к себе в ростер?"
-
-#: gajim/gui_menu_builder.py:471
+#: gajim/gui_menu_builder.py:433
 msgid "Send Single _Message…"
 msgstr "Отправить одиночное _сообщение..."
 
-#: gajim/gui_menu_builder.py:486
+#: gajim/gui_menu_builder.py:448
 msgid "E_xecute Command…"
 msgstr "В_ыполнить команду..."
 
-#: gajim/gui_menu_builder.py:494
+#: gajim/gui_menu_builder.py:456
 msgid "_Manage Transport"
 msgstr "_Управление транспортом"
 
-#: gajim/gui_menu_builder.py:500
+#: gajim/gui_menu_builder.py:462
 msgid "_Modify Transport"
 msgstr "_Изменить транспорт"
 
-#: gajim/gui_menu_builder.py:507 gajim/roster_window.py:5046
+#: gajim/gui_menu_builder.py:469 gajim/roster_window.py:4985
 msgid "_Rename…"
 msgstr "П_ереименовать..."
 
-#: gajim/gui_menu_builder.py:518 gajim/roster_window.py:5062
-#: gajim/roster_window.py:5177 gajim/data/gui/blocked_contacts_window.ui:52
+#: gajim/gui_menu_builder.py:480 gajim/roster_window.py:5001
+#: gajim/roster_window.py:5116 gajim/data/gui/blocked_contacts_window.ui:52
 #: gajim/data/gui/gc_occupants_menu.ui:148
 #: gajim/data/gui/contact_context_menu.ui:143
 msgid "_Unblock"
 msgstr "_Разблокировать"
 
-#: gajim/gui_menu_builder.py:521 gajim/roster_window.py:5067
-#: gajim/roster_window.py:5181 gajim/data/gui/gc_occupants_menu.ui:140
+#: gajim/gui_menu_builder.py:483 gajim/roster_window.py:5006
+#: gajim/roster_window.py:5120 gajim/data/gui/gc_occupants_menu.ui:140
 #: gajim/data/gui/contact_context_menu.ui:151
 msgid "_Block"
 msgstr "_Блокировать"
 
-#: gajim/gui_menu_builder.py:529 gajim/roster_window.py:5074
+#: gajim/gui_menu_builder.py:491 gajim/roster_window.py:5013
 #: gajim/data/gui/contact_context_menu.ui:181
 msgid "Remo_ve"
 msgstr "_Удалить"
 
-#: gajim/gui_menu_builder.py:539 gajim/data/gui/contact_context_menu.ui:198
+#: gajim/gui_menu_builder.py:501 gajim/data/gui/contact_context_menu.ui:198
 msgid "_Information"
 msgstr "_Информация о контакте"
 
-#: gajim/gui_menu_builder.py:552
+#: gajim/gui_menu_builder.py:514
 msgid "Save _As"
 msgstr "Сохранить _как"
 
-#: gajim/gui_menu_builder.py:564 gajim/groupchat_control.py:501
-#: gajim/chat_control.py:340
+#: gajim/gui_menu_builder.py:526 gajim/groupchat_control.py:507
+#: gajim/chat_control.py:342
 msgid "Send File…"
 msgstr "Отправить файл..."
 
-#: gajim/gui_menu_builder.py:565
+#: gajim/gui_menu_builder.py:527
 #, fuzzy
 msgid "Upload File…"
 msgstr "Сохранить файл как..."
 
-#: gajim/gui_menu_builder.py:566
+#: gajim/gui_menu_builder.py:528
 msgid "Send File Directly…"
 msgstr "Отправить файл напрямую…"
 
-#: gajim/gui_menu_builder.py:568 gajim/gui_menu_builder.py:632
+#: gajim/gui_menu_builder.py:530 gajim/gui_menu_builder.py:596
 #, fuzzy
 msgid "Send Chatstate"
 msgstr "Последнее состояние"
 
-#: gajim/gui_menu_builder.py:569
+#: gajim/gui_menu_builder.py:531
 msgid "Invite Contacts"
 msgstr "Пригласить участников"
 
-#: gajim/gui_menu_builder.py:570
-msgid "Add to Roster"
-msgstr "Добавить в ростер"
+#: gajim/gui_menu_builder.py:532
+#, fuzzy
+msgid "Add to Contact List"
+msgstr "Добавить контакт..."
 
-#: gajim/gui_menu_builder.py:571
-msgid "Audio Session"
-msgstr "Аудио Сессия"
+#: gajim/gui_menu_builder.py:533
+#, fuzzy
+msgid "Voice Chat"
+msgstr "Запрос аудио сеанса"
 
-#: gajim/gui_menu_builder.py:572
-msgid "Video Session"
-msgstr "Видео Сессия"
+#: gajim/gui_menu_builder.py:534
+#, fuzzy
+msgid "Video Chat"
+msgstr "Тест видео"
 
-#: gajim/gui_menu_builder.py:573
+#: gajim/gui_menu_builder.py:535 gajim/gui_menu_builder.py:582
 msgid "Information"
 msgstr "Информация"
 
-#: gajim/gui_menu_builder.py:574 gajim/gui_menu_builder.py:639
+#: gajim/gui_menu_builder.py:536 gajim/gui_menu_builder.py:602
 #: gajim/data/gui/application_menu.ui:37
 msgid "History"
 msgstr "История"
 
-#: gajim/gui_menu_builder.py:580 gajim/gui_menu_builder.py:687
+#: gajim/gui_menu_builder.py:542 gajim/gui_menu_builder.py:650
 #: gajim/data/gui/preferences_window.ui:1823
 msgid "Disabled"
 msgstr "Отключены"
 
-#: gajim/gui_menu_builder.py:581 gajim/gui_menu_builder.py:688
+#: gajim/gui_menu_builder.py:543 gajim/gui_menu_builder.py:651
 msgid "Composing only"
 msgstr "Только печатает"
 
-#: gajim/gui_menu_builder.py:582 gajim/gui_menu_builder.py:689
+#: gajim/gui_menu_builder.py:544 gajim/gui_menu_builder.py:652
 msgid "All chat states"
 msgstr "При любых изменениях"
 
-#: gajim/gui_menu_builder.py:620
-msgid "Manage Room"
-msgstr "Управление комнатой"
+#: gajim/gui_menu_builder.py:583
+#, fuzzy
+msgid "Manage Group Chat"
+msgstr "Покинуть конференции"
 
-#: gajim/gui_menu_builder.py:621
+#: gajim/gui_menu_builder.py:584 gajim/data/gui/groupchat_control.ui:649
 msgid "Change Subject"
 msgstr "Изменить тему"
 
-#: gajim/gui_menu_builder.py:622
-msgid "Configure Room"
-msgstr "Настроить комнату"
+#: gajim/gui_menu_builder.py:585
+#, fuzzy
+msgid "Configure Group Chat"
+msgstr "Покинуть конференции"
 
-#: gajim/gui_menu_builder.py:623
+#: gajim/gui_menu_builder.py:586
 msgid "Upload Avatar…"
 msgstr "Загрузить аватар…"
 
-#: gajim/gui_menu_builder.py:624
-msgid "Destroy Room"
-msgstr "Уничтожить комнату"
+#: gajim/gui_menu_builder.py:587
+#, fuzzy
+msgid "Destroy Group Chat"
+msgstr "Новая комната"
 
-#: gajim/gui_menu_builder.py:626 gajim/data/gui/preferences_window.ui:790
+#: gajim/gui_menu_builder.py:589 gajim/data/gui/preferences_window.ui:790
 #, fuzzy
 msgid "Chat Settings"
 msgstr "Сочетания клавиш в чате"
 
-#: gajim/gui_menu_builder.py:627
+#: gajim/gui_menu_builder.py:590
 msgid "Show join/leave"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:628
+#: gajim/gui_menu_builder.py:591
 #, fuzzy
 msgid "Show status changes"
 msgstr "Показывать изменения _статуса"
 
-#: gajim/gui_menu_builder.py:629 gajim/data/gui/gc_control_popup_menu.ui:72
+#: gajim/gui_menu_builder.py:592 gajim/data/gui/gc_control_popup_menu.ui:72
 msgid "Notify on all messages"
 msgstr "Уведомлять о всех сообщениях"
 
-#: gajim/gui_menu_builder.py:630
+#: gajim/gui_menu_builder.py:593
 msgid "Minimize on close"
 msgstr "Сворачивать при закрытии"
 
-#: gajim/gui_menu_builder.py:631
+#: gajim/gui_menu_builder.py:595
 #, fuzzy
-msgid "Minimize on autojoin"
+msgid "Minimize when joining automatically"
 msgstr "_Сворачивать при автовходе"
 
-#: gajim/gui_menu_builder.py:634
+#: gajim/gui_menu_builder.py:598
 msgid "Sync Threshold"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:635
-msgid "Change Nick"
-msgstr "Изменить ник"
-
-#: gajim/gui_menu_builder.py:636
-msgid "Bookmark Room"
-msgstr "Добавить комнату в закладки"
+#: gajim/gui_menu_builder.py:599
+#, fuzzy
+msgid "Change Nickname"
+msgstr "Изменить _ник..."
 
-#: gajim/gui_menu_builder.py:637
+#: gajim/gui_menu_builder.py:600
 msgid "Request Voice"
 msgstr "Запросить право говорить"
 
-#: gajim/gui_menu_builder.py:638 gajim/roster_window.py:5246
+#: gajim/gui_menu_builder.py:601 gajim/roster_window.py:5185
 msgid "Execute command"
 msgstr "Выполнить команду"
 
-#: gajim/gui_menu_builder.py:640
-msgid "Disconnect"
-msgstr "Выйти"
+#: gajim/gui_menu_builder.py:603
+msgid "Leave"
+msgstr ""
 
-#: gajim/gui_menu_builder.py:678 gajim/gtk/preferences.py:156
+#: gajim/gui_menu_builder.py:641 gajim/gtk/preferences.py:155
 msgid "No threshold"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:680 gajim/gtk/preferences.py:158
+#: gajim/gui_menu_builder.py:643 gajim/gtk/preferences.py:157
 #, python-format
 msgid "%i day"
 msgid_plural "%i days"
@@ -381,153 +381,168 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: gajim/gui_menu_builder.py:709 gajim/gui_menu_builder.py:747
-#: gajim/gtk/join_groupchat.py:43
-msgid "Join Group Chat"
-msgstr "Войти в комнату"
-
-#: gajim/gui_menu_builder.py:746
+#: gajim/gui_menu_builder.py:672
 #, fuzzy
 msgid "Add Contact…"
 msgstr "Добавить контакт..."
 
-#: gajim/gui_menu_builder.py:748 gajim/gtk/profile.py:52
-#: gajim/gtk/accounts.py:770 gajim/gtk/accounts.py:808
+#: gajim/gui_menu_builder.py:673 gajim/gtk/profile.py:52
+#: gajim/gtk/accounts.py:773 gajim/gtk/accounts.py:811
 msgid "Profile"
 msgstr "Профиль"
 
-#: gajim/gui_menu_builder.py:749
-msgid "Discover Services"
-msgstr "Просмотреть сервисы"
-
-#: gajim/gui_menu_builder.py:750
+#: gajim/gui_menu_builder.py:674
 #, fuzzy
 msgid "Send Single Message…"
 msgstr "Отправить одиночное _сообщение..."
 
-#: gajim/gui_menu_builder.py:751 gajim/data/gui/preferences_window.ui:2741
+#: gajim/gui_menu_builder.py:675
+msgid "Discover Services"
+msgstr "Просмотреть сервисы"
+
+#: gajim/gui_menu_builder.py:676 gajim/gtk/server_info.py:36
+msgid "Server Info"
+msgstr "Данные о сервере"
+
+#: gajim/gui_menu_builder.py:677 gajim/data/gui/preferences_window.ui:2741
 msgid "Advanced"
 msgstr "Расширенные"
 
-#: gajim/gui_menu_builder.py:752 gajim/gtk/mam_preferences.py:88
+#: gajim/gui_menu_builder.py:678 gajim/gtk/mam_preferences.py:88
 msgid "Archiving Preferences"
 msgstr "Настройки Архивации"
 
-#: gajim/gui_menu_builder.py:753
+#: gajim/gui_menu_builder.py:679
 #, fuzzy
 msgid "Blocking List"
 msgstr "Черный список"
 
-#: gajim/gui_menu_builder.py:754 gajim/gtk/history_sync.py:108
+#: gajim/gui_menu_builder.py:680
+msgid "Bookmarks"
+msgstr "Закладки"
+
+#: gajim/gui_menu_builder.py:681
+#, fuzzy
+msgid "PEP Configuration"
+msgstr "Конфигурация"
+
+#: gajim/gui_menu_builder.py:682 gajim/gtk/history_sync.py:108
 #: gajim/gtk/history_sync.py:186
 msgid "Synchronise History"
 msgstr "Синхронизировать историю"
 
-#: gajim/gui_menu_builder.py:755 gajim/gtk/privacy_list.py:427
+#: gajim/gui_menu_builder.py:683 gajim/gtk/privacy_list.py:427
 msgid "Privacy Lists"
 msgstr "Списки доступа"
 
-#: gajim/gui_menu_builder.py:756 gajim/gtk/server_info.py:36
-msgid "Server Info"
-msgstr "Данные о сервере"
-
-#: gajim/gui_menu_builder.py:757 gajim/gui_menu_builder.py:768
+#: gajim/gui_menu_builder.py:685 gajim/gui_menu_builder.py:696
 #: gajim/data/gui/xml_console_window.ui:77
 msgid "XML Console"
 msgstr "Консоль XML"
 
-#: gajim/gui_menu_builder.py:759 gajim/data/gui/groupchat_config.ui:36
+#: gajim/gui_menu_builder.py:687 gajim/data/gui/groupchat_config.ui:36
 #, fuzzy
 msgid "Admin"
 msgstr "_Админ"
 
-#: gajim/gui_menu_builder.py:760
+#: gajim/gui_menu_builder.py:688
 #, fuzzy
 msgid "Send Server Message…"
 msgstr "_Отправить сообщение сервера..."
 
-#: gajim/gui_menu_builder.py:761
+#: gajim/gui_menu_builder.py:689
 #, fuzzy
 msgid "Set MOTD…"
 msgstr "Установить сообщение дня..."
 
-#: gajim/gui_menu_builder.py:762
+#: gajim/gui_menu_builder.py:690
 #, fuzzy
 msgid "Update MOTD…"
 msgstr "Обновить сообщение дня..."
 
-#: gajim/gui_menu_builder.py:763
+#: gajim/gui_menu_builder.py:691
 #, fuzzy
 msgid "Delete MOTD…"
 msgstr "Удалить сообщение дня"
 
-#: gajim/gui_menu_builder.py:812
+#: gajim/gui_menu_builder.py:736
 #, fuzzy
-msgid "No Accounts available"
-msgstr "Нет доступной учетной записи"
+msgid "_Add Account…"
+msgstr "Добавить контакт..."
 
-#: gajim/gui_menu_builder.py:823 gajim/data/gui/application_menu.ui:5
-#: gajim/data/gui/application_menu.ui:71 gajim/data/gui/shortcuts_window.ui:182
-#: gajim/gtk/accounts.py:58
+#: gajim/gui_menu_builder.py:742
+#, fuzzy
+msgid "_Modify Accounts…"
+msgstr "_Редактировать учетную запись"
+
+#: gajim/gui_menu_builder.py:751 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:755 gajim/data/gui/application_menu.ui:5
+#: gajim/data/gui/shortcuts_window.ui:182 gajim/gtk/accounts.py:57
 msgid "Accounts"
 msgstr "Учётные записи"
 
-#: gajim/gui_menu_builder.py:881 gajim/gui_menu_builder.py:886
-msgid "Copy JID"
-msgstr "Копировать JID"
+#: gajim/gui_menu_builder.py:784 gajim/gui_menu_builder.py:789
+#, fuzzy
+msgid "Copy XMPP Address"
+msgstr "_Скопировать JID/почтовый адрес"
 
-#: gajim/gui_menu_builder.py:882 gajim/gui_menu_builder.py:914
+#: gajim/gui_menu_builder.py:785 gajim/gui_menu_builder.py:817
 #, fuzzy
 msgid "Join Groupchat"
 msgstr "Войти в комнату"
 
-#: gajim/gui_menu_builder.py:887 gajim/gui_menu_builder.py:913
-#: gajim/data/gui/application_menu.ui:76
+#: gajim/gui_menu_builder.py:790 gajim/gui_menu_builder.py:816
+#: gajim/data/gui/application_menu.ui:71
 #: gajim/data/gui/subscription_request_window.ui:106
 msgid "Start Chat"
 msgstr "Начать чат"
 
-#: gajim/gui_menu_builder.py:888 gajim/gui_menu_builder.py:915
+#: gajim/gui_menu_builder.py:791 gajim/gui_menu_builder.py:818
 #, fuzzy
-msgid "Add to Roster…"
-msgstr "Добавить в ростер"
+msgid "Add to Contact List…"
+msgstr "Добавить контакт..."
 
-#: gajim/gui_menu_builder.py:893
+#: gajim/gui_menu_builder.py:796
 #, fuzzy
 msgid "Copy Link Location"
 msgstr "_Копировать адрес ссылки"
 
-#: gajim/gui_menu_builder.py:894
+#: gajim/gui_menu_builder.py:797
 #, fuzzy
 msgid "Open Link in Browser"
 msgstr "_Просмотреть ссылку в браузере"
 
-#: gajim/gui_menu_builder.py:899
+#: gajim/gui_menu_builder.py:802
 #, fuzzy
 msgid "Copy Email Address"
 msgstr "_Скопировать JID/почтовый адрес"
 
-#: gajim/gui_menu_builder.py:900 gajim/gui_menu_builder.py:912
+#: gajim/gui_menu_builder.py:803 gajim/gui_menu_builder.py:815
 #, fuzzy
 msgid "Open Email Composer"
 msgstr "_Отправить письмо"
 
-#: gajim/gui_menu_builder.py:905
+#: gajim/gui_menu_builder.py:808
 #, fuzzy
 msgid "Copy Location"
 msgstr "_Копировать адрес ссылки"
 
-#: gajim/gui_menu_builder.py:906
+#: gajim/gui_menu_builder.py:809
 #, fuzzy
 msgid "Show Location"
 msgstr "Местоположение: "
 
-#: gajim/gui_menu_builder.py:911
+#: gajim/gui_menu_builder.py:814
 #, fuzzy
-msgid "Copy JID/Email"
+msgid "Copy XMPP Address/Email"
 msgstr "_Скопировать JID/почтовый адрес"
 
-#: gajim/gui_menu_builder.py:945
+#: gajim/gui_menu_builder.py:852
 #, fuzzy
 msgid "Copy"
 msgstr "Копировать JID"
@@ -548,44 +563,55 @@ msgstr "показать это сообщение и закончить раб�
 msgid "Choose folder for logfile"
 msgstr ""
 
-#: gajim/history_manager.py:107
+#: gajim/history_manager.py:106
 msgid "Cannot find history logs database"
 msgstr "Не могу найти базу данных истории"
 
-#: gajim/history_manager.py:108
-#, fuzzy, python-format
+#: gajim/history_manager.py:107
+#, python-format
 msgid "%s does not exist."
-msgstr "Файл не существует"
+msgstr "Файл %s не существует."
 
-#: gajim/history_manager.py:141 gajim/history_manager.py:195
-#: gajim/gtk/discovery.py:829 gajim/gtk/roster_item_exchange.py:80
-msgid "JID"
-msgstr "JID"
+#: gajim/history_manager.py:140 gajim/history_manager.py:194
+#: 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:30
+#: gajim/gtk/accounts.py:804
+#, fuzzy
+msgid "XMPP Address"
+msgstr "Адрес AIM:"
 
-#: gajim/history_manager.py:154 gajim/history_manager.py:202
+#: gajim/history_manager.py:153 gajim/history_manager.py:201
 #: gajim/data/gui/history_window.ui:89 gajim/gtk/history.py:108
 msgid "Date"
 msgstr "Дата"
 
-#: gajim/history_manager.py:161 gajim/history_manager.py:225
+#: gajim/history_manager.py:160 gajim/history_manager.py:224
 #: gajim/data/gui/join_groupchat_window.ui:208
 #: gajim/data/gui/profile_window.ui:214
 #: gajim/data/gui/vcard_information_window.ui:443
+#: gajim/data/gui/bookmarks.ui:140
 msgid "Nickname"
 msgstr "Ник"
 
-#: gajim/history_manager.py:172 gajim/history_manager.py:211
+#: gajim/history_manager.py:171 gajim/history_manager.py:210
 #: gajim/data/gui/preferences_window.ui:1344
 #: gajim/data/gui/single_message_window.ui:275 gajim/gtk/history.py:117
 msgid "Message"
 msgstr "Сообщение"
 
-#: gajim/history_manager.py:180 gajim/history_manager.py:218
+#: gajim/history_manager.py:179 gajim/history_manager.py:217
 #: gajim/data/gui/groups_post_window.ui:49
 #: gajim/data/gui/single_message_window.ui:214
 msgid "Subject"
 msgstr "Тема"
 
+#: gajim/history_manager.py:247
+msgid "Database Cleanup"
+msgstr "Очистка базы данных"
+
 #: gajim/history_manager.py:248
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
@@ -596,11 +622,8 @@ msgstr ""
 #: gajim/history_manager.py:250
 #, fuzzy
 msgid ""
-"Normally allocated database size will not be freed, it will just become "
-"reusable. If you really want to reduce database filesize, click YES, else "
-"click NO.\n"
-"\n"
-"In case you click YES, please wait…"
+"Normally, the allocated database size will not be freed, it will just become "
+"reusable. This operation may take a while."
 msgstr ""
 "Обычно размер файла базы данных не уменьшается при очистке, а используется "
 "заново. Если вы хотите действительно уменьшить размер файла, нажмите ДА, в "
@@ -609,26 +632,27 @@ msgstr ""
 "Если вы нажали ДА, пожалуйста подождите..."
 
 #: gajim/history_manager.py:255
-msgid "Database Cleanup"
-msgstr "Очистка базы данных"
+#, fuzzy
+msgid "_Cleanup"
+msgstr "_Очистить"
 
-#: gajim/history_manager.py:519 gajim/gtk/filetransfer.py:238
-#: gajim/gtk/filetransfer.py:248
+#: gajim/history_manager.py:518 gajim/gtk/filetransfer.py:237
+#: gajim/gtk/filetransfer.py:247
 msgid "You"
 msgstr "Вы"
 
-#: gajim/history_manager.py:531
+#: gajim/history_manager.py:530
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(who)s в %(time)s сказал: %(message)s\n"
 
-#: gajim/history_manager.py:568 gajim/history_manager.py:607
-#: gajim/gtk/dialogs.py:58 gajim/gtk/themes.py:319
+#: gajim/history_manager.py:567 gajim/history_manager.py:606
+#: gajim/gtk/dialogs.py:57 gajim/gtk/themes.py:319
 #: gajim/gtk/roster_item_exchange.py:75 gajim/gtk/roster_item_exchange.py:185
 msgid "Delete"
 msgstr "Удалить"
 
-#: gajim/history_manager.py:569
+#: gajim/history_manager.py:568
 #, fuzzy
 msgid "Delete Conversation"
 msgid_plural "Delete Conversations"
@@ -636,15 +660,15 @@ msgstr[0] "Подтверждение удаления"
 msgstr[1] "Подтверждение удаления"
 msgstr[2] "Подтверждение удаления"
 
-#: gajim/history_manager.py:570
-#, fuzzy, python-format
+#: gajim/history_manager.py:569
+#, 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] "Вы точно хотите удалить выделенное сообщение?"
+msgstr[0] "Вы точно хотите безвозвратно удалить переписку с <b>%s</b>?"
+msgstr[1] "Вы точно хотите безвозвратно удалить эти переписки?"
 msgstr[2] "Вы точно хотите удалить выделенное сообщение?"
 
-#: gajim/history_manager.py:608
+#: gajim/history_manager.py:607
 #, fuzzy
 msgid "Delete Message"
 msgid_plural "Delete Messages"
@@ -652,7 +676,7 @@ msgstr[0] "Сообщение по умолчанию"
 msgstr[1] "Сообщение по умолчанию"
 msgstr[2] "Сообщение по умолчанию"
 
-#: gajim/history_manager.py:609
+#: gajim/history_manager.py:608
 #, fuzzy
 msgid "Do you want to permanently delete this message"
 msgid_plural "Do you want to permanently delete these messages"
@@ -666,15 +690,15 @@ msgid "Contact name: <i>%s</i>"
 msgstr "Имя контакта: <i>%s</i>"
 
 #: gajim/dialogs.py:84
-#, fuzzy, python-format
-msgid "JID: <i>%s</i>"
-msgstr "Jabber ID: <i>%s</i>"
+#, python-format
+msgid "XMPP Address: <i>%s</i>"
+msgstr ""
 
-#: gajim/dialogs.py:115 gajim/dialogs.py:128 gajim/roster_window.py:2901
-#: gajim/roster_window.py:3833 gajim/roster_window.py:5084
-#: gajim/common/contacts.py:157 gajim/common/contacts.py:190
+#: gajim/dialogs.py:115 gajim/dialogs.py:128 gajim/roster_window.py:2894
+#: gajim/roster_window.py:3784 gajim/roster_window.py:5023
+#: gajim/common/contacts.py:157 gajim/common/contacts.py:206
 #: gajim/data/gui/preferences_window.ui:558
-#: gajim/data/gui/shortcuts_window.ui:177 gajim/gtk/accounts.py:349
+#: gajim/data/gui/shortcuts_window.ui:177 gajim/gtk/accounts.py:352
 msgid "General"
 msgstr "Общие"
 
@@ -720,7 +744,7 @@ msgstr "Изменить сообщение о статусе?"
 msgid "Preset name is already in use. Do you want to overwrite this preset?"
 msgstr "Это имя уже используется. Перезаписать это сообщение о статусе?"
 
-#: gajim/dialogs.py:703
+#: gajim/dialogs.py:703 gajim/plugins/gui.py:292
 #, fuzzy
 msgid "_Overwrite"
 msgstr "Перезаписать?"
@@ -733,9 +757,7 @@ msgstr "Сохранить установленное сообщение о ст
 msgid "Please type a name for this status message"
 msgstr "Введите имя для этого сообщения о статусе"
 
-#: gajim/dialogs.py:740 gajim/gui_interface.py:1441 gajim/dialog_messages.py:31
-#: gajim/gtk/discovery.py:518 gajim/gtk/profile.py:323
-#: gajim/gtk/join_groupchat.py:234
+#: gajim/dialogs.py:740 gajim/gtk/discovery.py:517 gajim/gtk/profile.py:323
 msgid "You are not connected to the server"
 msgstr "Вы не подключены к серверу"
 
@@ -743,9 +765,11 @@ msgstr "Вы не подключены к серверу"
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Чтобы объединить контакты, необходимо подключиться к серверу."
 
-#: gajim/dialogs.py:752 gajim/dialogs.py:823 gajim/gtk/discovery.py:822
-#: gajim/gtk/discovery.py:1648 gajim/gtk/discovery.py:1941
-#: gajim/gtk/history.py:99 gajim/gtk/roster_item_exchange.py:83
+#: gajim/dialogs.py:752 gajim/dialogs.py:823
+#: gajim/data/gui/groupchat_info_scrolled.ui:16 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/gtk/roster_item_exchange.py:83
 msgid "Name"
 msgstr "Имя"
 
@@ -765,392 +789,339 @@ msgstr "Вы не можете синхронизировать учетную �
 msgid "Synchronise"
 msgstr "Синхронизировать"
 
-#: gajim/dialogs.py:1043
+#: gajim/dialogs.py:1042
 msgid "an audio and video"
 msgstr "аудио и видео"
 
-#: gajim/dialogs.py:1045
+#: gajim/dialogs.py:1044
 msgid "an audio"
 msgstr "аудио"
 
-#: gajim/dialogs.py:1047
+#: gajim/dialogs.py:1046
 msgid "a video"
 msgstr "видео"
 
-#: gajim/dialogs.py:1051
-#, python-format
+#: gajim/dialogs.py:1050
+#, fuzzy, python-format
 msgid ""
-"%(contact)s wants to start %(type)s session with you. Do you want to answer "
+"%(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:505
-#, fuzzy, python-format
+#: gajim/groupchat_control.py:511
+#, python-format
 msgid "Send File (max. %s MiB)…"
-msgstr "Сохранить файл как..."
+msgstr "Отправить файл (макс. %s МиБ)…"
 
-#: gajim/groupchat_control.py:507 gajim/chat_control.py:342
+#: gajim/groupchat_control.py:513 gajim/chat_control.py:344
 #, fuzzy
 msgid "No File Transfer available"
 msgstr "Не удалось произвести передачу файлов"
 
-#: gajim/groupchat_control.py:630 gajim/groupchat_control.py:2349
-msgid "Changing Subject"
-msgstr "Смена темы"
-
-#: gajim/groupchat_control.py:631 gajim/groupchat_control.py:2350
-msgid "Please specify the new subject:"
-msgstr "Введите новую тему:"
-
-#: gajim/groupchat_control.py:638
-msgid "Changing Nickname"
-msgstr "Смена ника"
-
-#: gajim/groupchat_control.py:639
-msgid "Please specify the new nickname you want to use:"
-msgstr "Введите новый ник, который вы хотите использовать:"
-
-#: gajim/groupchat_control.py:657
+#: gajim/groupchat_control.py:655
 #, fuzzy
-msgid "Invalid group chat JID"
+msgid "Invalid group chat XMPP Address"
 msgstr "Неверное имя комнаты"
 
-#: gajim/groupchat_control.py:658
+#: gajim/groupchat_control.py:656
 #, fuzzy
-msgid "The group chat JID has not allowed characters."
+msgid "The group chat XMPP Address has not allowed characters."
 msgstr "В Jabber ID комнаты или сервера содержатся недопустимые символы."
 
-#: gajim/groupchat_control.py:758 gajim/gtk/profile.py:136
+#: gajim/groupchat_control.py:743 gajim/gtk/profile.py:136
 msgid "Could not load image"
 msgstr "Не могу загрузить изображение"
 
-#: gajim/groupchat_control.py:888
+#: gajim/groupchat_control.py:873
 msgid "Insert Nickname"
 msgstr "Вставить ник"
 
-#: gajim/groupchat_control.py:1056 gajim/chat_control.py:824
+#: gajim/groupchat_control.py:1041 gajim/chat_control.py:848
 msgid "and authenticated"
 msgstr "и заверено"
 
-#: gajim/groupchat_control.py:1060 gajim/chat_control.py:828
+#: gajim/groupchat_control.py:1045 gajim/chat_control.py:852
 msgid "and NOT authenticated"
 msgstr "и НЕ заверено"
 
-#: gajim/groupchat_control.py:1064
+#: gajim/groupchat_control.py:1049
 #, python-format
 msgid "%(type)s encryption is active %(authenticated)s."
 msgstr "%(type)s шифрование включено %(authenticated)s."
 
-#: gajim/groupchat_control.py:1111
+#: gajim/groupchat_control.py:1096
 msgid "Conversation with "
 msgstr "Беседа с "
 
-#: gajim/groupchat_control.py:1113
+#: gajim/groupchat_control.py:1098
 msgid "Continued conversation"
 msgstr "Возобновлённая беседа"
 
-#: gajim/groupchat_control.py:1411
+#: gajim/groupchat_control.py:1357
 #, python-format
 msgid "%(nick)s has set the subject to %(subject)s"
 msgstr "%(nick)s установил(а) тему: %(subject)s"
 
-#: gajim/groupchat_control.py:1433
-msgid "Room now shows unavailable members"
+#: gajim/groupchat_control.py:1374
+#, fuzzy
+msgid "Group chat now shows unavailable members"
 msgstr "Теперь в комнате отображаются недоступные участники"
 
-#: gajim/groupchat_control.py:1436
-msgid "Room now does not show unavailable members"
+#: gajim/groupchat_control.py:1377
+#, fuzzy
+msgid "Group chat now does not show unavailable members"
 msgstr "теперь в комнате не отображаются недоступные участники"
 
-#: gajim/groupchat_control.py:1439
+#: gajim/groupchat_control.py:1380
 msgid "A setting not related to privacy has been changed"
 msgstr ""
 
-#: gajim/groupchat_control.py:1446
-msgid "Room logging is now enabled"
-msgstr "Запись логов конференции включена"
+#: gajim/groupchat_control.py:1387 gajim/groupchat_control.py:1659
+#, fuzzy
+msgid "Conversations are stored on the server"
+msgstr "История сеанса БУДЕТ сохранена на сервере"
 
-#: gajim/groupchat_control.py:1449
-msgid "Room logging is now disabled"
-msgstr "Запись логов конференции выключена"
+#: gajim/groupchat_control.py:1390
+#, fuzzy
+msgid "Conversations are not stored on the server"
+msgstr "Информация о вас, сохраненная на сервере"
 
-#: gajim/groupchat_control.py:1452
-msgid "Room is now non-anonymous"
+#: gajim/groupchat_control.py:1393
+#, fuzzy
+msgid "Group chat is now non-anonymous"
 msgstr "Конференция не анонимна"
 
-#: gajim/groupchat_control.py:1456
-msgid "Room is now semi-anonymous"
+#: gajim/groupchat_control.py:1397
+#, fuzzy
+msgid "Group chat is now semi-anonymous"
 msgstr "Конференция частично анонимна"
 
-#: gajim/groupchat_control.py:1460
+#: gajim/groupchat_control.py:1401
 #, fuzzy
-msgid "Room is now fully anonymous"
+msgid "Group chat is now fully anonymous"
 msgstr "Конференция полностью анонимна"
 
-#: gajim/groupchat_control.py:1500
+#: gajim/groupchat_control.py:1439
 #, fuzzy, python-format
 msgid "Ping? (%s)"
 msgstr "Pong! (%s сек.)"
 
-#: gajim/groupchat_control.py:1503
-#, fuzzy, python-format
+#: gajim/groupchat_control.py:1442
+#, python-format
 msgid "Pong! (%(nick)s %(delay)s s.)"
-msgstr "Pong! (%s сек.)"
+msgstr "Pong! (%(nick)s %(delay)s сек.)"
 
-#: gajim/groupchat_control.py:1506 gajim/chat_control.py:1213
+#: gajim/groupchat_control.py:1445 gajim/chat_control.py:1237
 msgid "Error."
 msgstr "Ошибка."
 
-#: gajim/groupchat_control.py:1711
+#: gajim/groupchat_control.py:1650
 #, fuzzy, python-format
-msgid "You (%s) joined the room"
+msgid "You (%s) joined the group chat"
 msgstr "%s зашёл в комнату"
 
-#: gajim/groupchat_control.py:1717
-msgid "Any occupant is allowed to see your full JID"
+#: gajim/groupchat_control.py:1655
+#, fuzzy
+msgid "Any participant is allowed to see your full XMPP Address"
 msgstr "Любой участник может увидеть ваш настоящий JID"
 
-#: gajim/groupchat_control.py:1721
-msgid "Room logging is enabled"
-msgstr "Запись логов конференции включена"
-
-#: gajim/groupchat_control.py:1725
-msgid "The server has assigned or modified your roomnick"
+#: gajim/groupchat_control.py:1663
+#, fuzzy
+msgid "The server has assigned or modified your nickname in this group chat"
 msgstr "Сервер присвоил или изменил ваш ник в комнате"
 
-#: gajim/groupchat_control.py:1732
-msgid "A new room has been created"
+#: gajim/groupchat_control.py:1671
+#, fuzzy
+msgid "A new group chat has been created"
 msgstr "Новая комната была создана"
 
-#: gajim/groupchat_control.py:1740 gajim/privatechat_control.py:112
+#: gajim/groupchat_control.py:1679 gajim/privatechat_control.py:115
 #, python-format
 msgid "You are now known as %s"
 msgstr "Вы теперь известны как %s"
 
-#: gajim/groupchat_control.py:1742 gajim/privatechat_control.py:114
-#, fuzzy, python-brace-format
+#: gajim/groupchat_control.py:1681 gajim/privatechat_control.py:117
+#, python-brace-format
 msgid "{nick} is now known as {new_nick}"
-msgstr "%(nick)s теперь известен как %(new_nick)s"
+msgstr "{nick} теперь зовётся {new_nick}"
 
-#: gajim/groupchat_control.py:1767 gajim/privatechat_control.py:141
-#, fuzzy, python-brace-format
+#: gajim/groupchat_control.py:1706 gajim/privatechat_control.py:144
+#, python-brace-format
 msgid "You are now {show}{status}"
-msgstr "Вы теперь известны как %s"
+msgstr "Вы теперь {show} {status}"
 
-#: gajim/groupchat_control.py:1773 gajim/privatechat_control.py:147
-#, fuzzy, python-brace-format
+#: gajim/groupchat_control.py:1712 gajim/privatechat_control.py:150
+#, python-brace-format
 msgid "{nick} is now {show}{status}"
-msgstr "%(nick)s теперь %(status)s"
+msgstr "{nick} теперь {show} {status}"
 
-#: gajim/groupchat_control.py:1790 gajim/groupchat_control.py:1819
-#: gajim/groupchat_control.py:1849 gajim/groupchat_control.py:1909
+#: gajim/groupchat_control.py:1729 gajim/groupchat_control.py:1758
+#: gajim/groupchat_control.py:1788 gajim/groupchat_control.py:1848
 #, python-brace-format
 msgid " by {actor}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1793
-#, fuzzy, python-brace-format
+#: gajim/groupchat_control.py:1732
+#, python-brace-format
 msgid "** Your Affiliation has been set to {affiliation}{actor}{reason}"
-msgstr "** %(actor)s присвоил %(nick)s ранг %(affiliation)s"
+msgstr "** Ваш ранг изменён на {affiliation} {actor} {reason}"
 
-#: gajim/groupchat_control.py:1799
-#, fuzzy, python-brace-format
+#: gajim/groupchat_control.py:1738
+#, python-brace-format
 msgid "** Affiliation of {nick} has been set to {affiliation}{actor}{reason}"
-msgstr "** Ранг %(nick)s был изменен на %(affiliation)s"
+msgstr "** Ранг {nick} изменен на {affiliation} {actor} {reason}"
 
-#: gajim/groupchat_control.py:1822
-#, fuzzy, python-brace-format
+#: gajim/groupchat_control.py:1761
+#, python-brace-format
 msgid "** Your Role has been set to {role}{actor}{reason}"
-msgstr "** %(actor)s присвоил %(nick)s обязанности %(role)s"
+msgstr "** Вам присвоены обязанности {role} {actor} {reason}"
 
-#: gajim/groupchat_control.py:1827
-#, fuzzy, python-brace-format
+#: gajim/groupchat_control.py:1766
+#, python-brace-format
 msgid "** Role of {nick} has been set to {role}{actor}{reason}"
-msgstr "** %(actor)s присвоил %(nick)s обязанности %(role)s"
+msgstr "** {nick} присвоены обязанности {role} {actor} {reason}"
 
-#: gajim/groupchat_control.py:1852
-#, fuzzy, python-brace-format
-msgid "You have been removed from the room{actor}{reason}"
-msgstr "%(nick)s выгнали из комнаты (%(reason)s)"
+#: gajim/groupchat_control.py:1791
+#, python-brace-format
+msgid "You have been removed from the group chat{actor}{reason}"
+msgstr "Вас выгнали из комнаты {actor} {reason}"
 
-#: gajim/groupchat_control.py:1857
+#: gajim/groupchat_control.py:1796
 #, python-brace-format
 msgid "You have left due to an error{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1863
+#: gajim/groupchat_control.py:1802
 #, python-brace-format
 msgid "You have been kicked{actor}{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1870
+#: gajim/groupchat_control.py:1809
 #, python-brace-format
 msgid "You have been banned{actor}{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1877 gajim/groupchat_control.py:1943
+#: gajim/groupchat_control.py:1816 gajim/groupchat_control.py:1882
 #, fuzzy
 msgid ": Affiliation changed"
 msgstr "ранг изменен"
 
-#: gajim/groupchat_control.py:1883 gajim/groupchat_control.py:1948
+#: gajim/groupchat_control.py:1822 gajim/groupchat_control.py:1887
 #, fuzzy
-msgid ": Room configuration changed to members-only"
+msgid ": Group chat configuration changed to members-only"
 msgstr "настройки комнаты были изменены на 'только для участников'"
 
-#: gajim/groupchat_control.py:1912
-#, fuzzy, python-brace-format
-msgid "{nick} has been removed from the room{by}{reason}"
-msgstr "%(nick)s выгнали из комнаты (%(reason)s)"
+#: gajim/groupchat_control.py:1851
+#, python-brace-format
+msgid "{nick} has been removed from the group chat{by}{reason}"
+msgstr "{nick} выгнали из комнаты {by} {reason}"
 
-#: gajim/groupchat_control.py:1922
+#: gajim/groupchat_control.py:1861
 #, python-brace-format
 msgid "{nick} has left due to an error{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1928
-#, fuzzy, python-brace-format
+#: gajim/groupchat_control.py:1867
+#, python-brace-format
 msgid "{nick} has been kicked{actor}{reason}"
-msgstr "%(nick)s выгнали из комнаты: %(reason)s"
+msgstr "{nick} выгнали из комнаты {actor} {reason}"
 
-#: gajim/groupchat_control.py:1936
+#: gajim/groupchat_control.py:1875
 #, fuzzy, python-brace-format
 msgid "{nick} has been banned{actor}{reason}"
-msgstr "%(nick)s запретили заходить в комнату: %(reason)s"
+msgstr "{nick} запретили заходить в комнату{actor} {reason}"
 
-#: gajim/groupchat_control.py:1953
+#: gajim/groupchat_control.py:1892
 #, python-brace-format
 msgid "{nick} has left{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1970
+#: gajim/groupchat_control.py:1914
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s зашёл в комнату"
 
-#: gajim/groupchat_control.py:1985 gajim/groupchat_control.py:1990
-#: gajim/groupchat_control.py:1995 gajim/groupchat_control.py:2000
-#: gajim/groupchat_control.py:2011
-msgid "Unable to join group chat"
-msgstr "Не получается войти в комнату"
-
-#: gajim/groupchat_control.py:1986
-#, python-format
-msgid "You are banned from group chat <b>%s</b>."
-msgstr "Вам запрещено входить в комнату <b>%s</b>."
-
-#: gajim/groupchat_control.py:1991
-#, fuzzy, python-format
-msgid "Remote server <b>%s</b> does not exist."
-msgstr "Комнаты <b>%s</b> не существует."
-
-#: gajim/groupchat_control.py:1996
-#, python-format
-msgid "Group chat <b>%s</b> does not exist."
-msgstr "Комнаты <b>%s</b> не существует."
-
-#: gajim/groupchat_control.py:2001
+#: gajim/groupchat_control.py:1981
 #, fuzzy
-msgid "Group chat creation is not permitted."
-msgstr "Создание комнат запрещено."
-
-#: gajim/groupchat_control.py:2005
-#, fuzzy
-msgid "Unable to join groupchat"
-msgstr "Не получается войти в комнату"
-
-#: gajim/groupchat_control.py:2006
-#, fuzzy, python-format
-msgid "You must use your registered nickname in <b>%s</b>."
-msgstr ""
-"Необходимо использовать ваш зарегистрированный ник в комнате <b>%s</b>."
-
-#: gajim/groupchat_control.py:2012
-#, python-format
-msgid "You are not in the members list in groupchat %s."
-msgstr "Вас нет в списке членов комнаты %s."
-
-#: gajim/groupchat_control.py:2068
-msgid "Room has been destroyed"
+msgid "Group chat has been destroyed"
 msgstr "Комната была удалена"
 
-#: gajim/groupchat_control.py:2073
+#: gajim/groupchat_control.py:1986
 #, fuzzy, python-format
-msgid "You can join this room instead: xmpp:%s?join"
+msgid "You can join this group chat instead: xmpp:%s?join"
 msgstr "Взамен, вы можете присоединиться к комнате: %s"
 
-#: gajim/groupchat_control.py:2306
+#: gajim/groupchat_control.py:2214
 #, fuzzy
 msgid "Leave Group Chat"
 msgstr "Покинуть конференции"
 
-#: gajim/groupchat_control.py:2307
-#, fuzzy
+#: gajim/groupchat_control.py:2215
 msgid "Are you sure you want to leave this group chat?"
-msgstr "Вы точно хотите выйти из комнаты «%s»?"
+msgstr "Вы точно хотите выйти из этой комнаты?"
 
-#: gajim/groupchat_control.py:2308
-#, fuzzy, python-format
-msgid "If you close this window, you will be disconnected from '%s'."
-msgstr "Если вы закроете это окно, то вы выйдете из этой комнаты."
+#: gajim/groupchat_control.py:2216
+#, python-format
+msgid "If you close this window, you will leave '%s'."
+msgstr "Если вы закроете это окно, то вы выйдете из комнаты '%s'."
 
-#: gajim/groupchat_control.py:2314
+#: gajim/groupchat_control.py:2222 gajim/roster_window.py:5177
 msgid "_Leave"
 msgstr ""
 
-#: gajim/groupchat_control.py:2377
+#: gajim/groupchat_control.py:2280 gajim/roster_window.py:3008
 #, fuzzy, python-format
 msgid "%(jid)s has been invited to this group chat"
 msgstr "%(jid)s был приглашен в комнату"
 
-#: gajim/groupchat_control.py:2527
+#: gajim/groupchat_control.py:2463
 #, python-format
 msgid "Kicking %s"
 msgstr "Выгоняем %s"
 
-#: gajim/groupchat_control.py:2528 gajim/groupchat_control.py:2829
+#: gajim/groupchat_control.py:2464 gajim/groupchat_control.py:2765
 msgid "You may specify a reason below:"
 msgstr "Вы можете указать причину ниже:"
 
-#: gajim/groupchat_control.py:2828
+#: gajim/groupchat_control.py:2764
 #, python-format
 msgid "Banning %s"
 msgstr "Забанить %s"
 
-#: gajim/chat_control.py:408
+#: gajim/chat_control.py:432
 msgid "Show a list of formattings"
 msgstr "Показать список форматирования"
 
-#: gajim/chat_control.py:412
+#: gajim/chat_control.py:436
 msgid "This contact does not support HTML"
 msgstr "Этот контакт не поддерживает HTML"
 
-#: gajim/chat_control.py:562
+#: gajim/chat_control.py:586
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr "%(type)s состояние : %(state)s, причина: %(reason)s"
 
-#: gajim/chat_control.py:686
+#: gajim/chat_control.py:710
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s из комнаты %(room_name)s"
 
-#: gajim/chat_control.py:832
+#: gajim/chat_control.py:856
 #, fuzzy, python-format
 msgid "%(type)s encryption is active %(authenticated)s"
 msgstr "%(type)s шифрование включено %(authenticated)s."
 
-#: gajim/chat_control.py:1160 gajim/chat_control.py:1168
+#: gajim/chat_control.py:1184 gajim/chat_control.py:1192
 #, fuzzy
 msgid "Close"
 msgstr "Отправить и _закрыть"
 
-#: gajim/chat_control.py:1161
+#: gajim/chat_control.py:1185
 #, fuzzy, python-format
 msgid "You just received a new message from %s"
 msgstr "Получено новое сообщение от «%s»"
 
-#: gajim/chat_control.py:1163
+#: gajim/chat_control.py:1187
 #, fuzzy
 msgid ""
 "If you close this tab while having chat history disabled, this message will "
@@ -1159,16 +1130,16 @@ msgstr ""
 "Если вы закроете эту вкладку и у вас отключена функция ведения истории "
 "сообщений, то это сообщение будет утеряно."
 
-#: gajim/chat_control.py:1208
+#: gajim/chat_control.py:1232
 msgid "Ping?"
 msgstr "Ping?"
 
-#: gajim/chat_control.py:1211
+#: gajim/chat_control.py:1235
 #, fuzzy, python-format
 msgid "Pong! (%s seconds)"
 msgstr "Pong! (%s сек.)"
 
-#: gajim/chat_control.py:1308
+#: gajim/chat_control.py:1332
 #, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -1177,269 +1148,277 @@ msgstr ""
 "Тема: %(subject)s\n"
 "%(message)s"
 
-#: gajim/chat_control.py:1416
-#, fuzzy, python-format
+#: gajim/chat_control.py:1440
+#, python-format
 msgid "%(name)s is now %(show)s %(status)s"
-msgstr "%(name)s теперь %(status)s"
+msgstr "%(name)s теперь %(show)s %(status)s"
 
-#: gajim/chat_control.py:1476 gajim/data/gui/application_menu.ui:32
+#: gajim/chat_control.py:1500 gajim/data/gui/application_menu.ui:32
 #: gajim/gtk/http_upload_progress.py:35
 #, fuzzy
 msgid "File Transfer"
 msgstr "Передача файлов"
 
-#: gajim/chat_control.py:1480
+#: gajim/chat_control.py:1504
 msgid "Size"
 msgstr "Размер"
 
-#: gajim/chat_control.py:1482 gajim/chat_control.py:1546
+#: gajim/chat_control.py:1506 gajim/chat_control.py:1566
+#: gajim/gui_interface.py:190
 #: gajim/data/gui/groupchat_invitation_received.ui:77
-#: gajim/gtk/filetransfer.py:485
+#: gajim/gtk/filetransfer.py:490
 #, fuzzy
 msgid "_Accept"
 msgstr "_Принять"
 
-#: gajim/chat_control.py:1484 gajim/chat_control.py:1548
+#: gajim/chat_control.py:1508 gajim/chat_control.py:1568
 #: gajim/data/gui/groupchat_invitation_received.ui:62
 #, fuzzy
 msgid "_Decline"
 msgstr "_Отключен"
 
-#: gajim/chat_control.py:1506 gajim/gui_interface.py:791
-#: gajim/gui_interface.py:821 gajim/gui_interface.py:847
+#: gajim/chat_control.py:1530 gajim/gui_interface.py:777
+#: gajim/gui_interface.py:807 gajim/gui_interface.py:833
 #: gajim/gtk/notification.py:173 gajim/gtk/notification.py:278
 msgid "File Transfer Completed"
 msgstr "Передача файла завершена"
 
-#: gajim/chat_control.py:1510 gajim/gtk/filetransfer.py:259
+#: gajim/chat_control.py:1534 gajim/gtk/filetransfer.py:258
 #, fuzzy
 msgid "Open _Folder"
 msgstr "_Открыть папку с принятым файлом"
 
-#: gajim/chat_control.py:1512 gajim/chat_control.py:1521
+#: gajim/chat_control.py:1536 gajim/chat_control.py:1545
+#: gajim/data/gui/groupchat_control.ui:962
+#: gajim/data/gui/groupchat_control.ui:1049
+#: gajim/data/gui/groupchat_control.ui:1155
 #, fuzzy
 msgid "_Close"
 msgstr "Отправить и _закрыть"
 
-#: gajim/chat_control.py:1543 gajim/gui_interface.py:484
+#: gajim/chat_control.py:1563 gajim/gui_interface.py:473
+#: gajim/data/gui/groupchat_invitation_received.ui:42
 #: gajim/gtk/notification.py:174 gajim/gtk/notification.py:195
 #: gajim/gtk/notification.py:281
-msgid "Groupchat Invitation"
+#, fuzzy
+msgid "Group Chat Invitation"
 msgstr "Приглашение в комнату"
 
-#: gajim/chat_control.py:1568 gajim/roster_window.py:1954
+#: gajim/chat_control.py:1588 gajim/roster_window.py:1951
 msgid "Remote contact stopped transfer"
 msgstr "Удаленный контакт остановил передачу"
 
-#: gajim/chat_control.py:1570 gajim/roster_window.py:1956
+#: gajim/chat_control.py:1590 gajim/roster_window.py:1953
 msgid "Error opening file"
 msgstr "Ошибка открытия файла"
 
-#: gajim/chat_control.py:1572 gajim/gtk/filetransfer.py:297
+#: gajim/chat_control.py:1592 gajim/gtk/filetransfer.py:296
 msgid "File transfer stopped"
 msgstr "Передача файла остановлена"
 
-#: gajim/chat_control.py:1575 gajim/gtk/filetransfer.py:275
-#: gajim/gtk/filetransfer.py:284
+#: gajim/chat_control.py:1595 gajim/gtk/filetransfer.py:274
+#: gajim/gtk/filetransfer.py:283
 msgid "File transfer cancelled"
 msgstr "Передача отменена"
 
-#: gajim/chat_control.py:1576
+#: gajim/chat_control.py:1596
 msgid "Connection with peer cannot be established."
 msgstr "Соединение не может быть установлено."
 
-#: gajim/application.py:72
+#: gajim/application.py:75
 #, fuzzy
 msgid "Show the application's version"
 msgstr "Отображать значок в области уведомлений:"
 
-#: gajim/application.py:79
+#: gajim/application.py:82
 msgid "Show only critical errors"
 msgstr "показывать только сообщения об ошибках"
 
-#: gajim/application.py:86
+#: gajim/application.py:89
 msgid "Separate profile files completely (even history database and plugins)"
 msgstr ""
 
-#: gajim/application.py:94
+#: gajim/application.py:97
 #, fuzzy
 msgid "Print XML stanzas and other debug information"
 msgstr "Выводить xml станзы и другую отладочную информацию"
 
-#: gajim/application.py:101
+#: gajim/application.py:104
 msgid "Use defined profile in configuration directory"
 msgstr "Использовать определенный профиль из каталога с настройками"
 
-#: gajim/application.py:109
+#: gajim/application.py:112
 msgid "Set configuration directory"
 msgstr "Установить каталог загрузки конфигурации"
 
-#: gajim/application.py:117
+#: gajim/application.py:120
 msgid "Configure logging system"
 msgstr "Настройки системы логирования"
 
-#: gajim/application.py:125
+#: gajim/application.py:128
 #, fuzzy
 msgid "Show all warnings"
 msgstr "Показать непросмотренные _события"
 
-#: gajim/application.py:132
+#: gajim/application.py:135
 msgid "Open IPython shell"
 msgstr ""
 
-#: gajim/application.py:139
+#: gajim/application.py:142
 msgid "Pops up a window with the next pending event"
 msgstr "Показывать окно со следующим непрочитанным сообщением"
 
-#: gajim/application.py:145 gajim/data/gui/shortcuts_window.ui:203
+#: gajim/application.py:148 gajim/data/gui/shortcuts_window.ui:203
 #: data/org.gajim.Gajim.desktop.in:21
 #, fuzzy
 msgid "Start a new chat"
 msgstr "Начать чат"
 
-#: gajim/application.py:152
+#: gajim/application.py:155
 msgid "Simulate loss of connectivity"
 msgstr ""
 
-#: gajim/application.py:159
+#: gajim/application.py:162
 msgid "Simulate regaining connectivity"
 msgstr ""
 
-#: gajim/application.py:201 gajim/gui_interface.py:133
+#: gajim/application.py:204 gajim/gui_interface.py:133
 msgid "Database Error"
 msgstr "Ошибка базы данных"
 
-#: gajim/roster_window.py:294 gajim/roster_window.py:1030
+#: gajim/roster_window.py:291 gajim/roster_window.py:1027
 msgid "Merged accounts"
 msgstr "Объединенные учетные записи"
 
-#: gajim/roster_window.py:853 gajim/roster_window.py:1631
-#: gajim/roster_window.py:1664 gajim/roster_window.py:1715
-#: gajim/roster_window.py:1717 gajim/roster_window.py:1872
-#: gajim/roster_window.py:2531 gajim/roster_window.py:5025
-#: gajim/common/contacts.py:188 gajim/common/contacts.py:447
-#: gajim/common/helpers.py:83 gajim/gtk/discovery.py:129
-#: gajim/gtk/discovery.py:130 gajim/gtk/discovery.py:1416
+#: gajim/roster_window.py:850 gajim/roster_window.py:1628
+#: gajim/roster_window.py:1661 gajim/roster_window.py:1712
+#: gajim/roster_window.py:1714 gajim/roster_window.py:1869
+#: gajim/roster_window.py:2528 gajim/roster_window.py:4331
+#: gajim/roster_window.py:4964 gajim/common/contacts.py:204
+#: gajim/common/contacts.py:463 gajim/common/helpers.py:86
+#: gajim/gtk/discovery.py:127 gajim/gtk/discovery.py:128
+#: gajim/gtk/discovery.py:1414
 msgid "Transports"
 msgstr "Транспорты"
 
-#: gajim/roster_window.py:1723 gajim/roster_window.py:1725
-#: gajim/roster_window.py:4995 gajim/gui_interface.py:1613
-#: gajim/gui_interface.py:1639 gajim/common/contacts.py:186
-#: gajim/common/helpers.py:83 gajim/common/modules/adhoc_commands.py:245
-msgid "Groupchats"
+#: gajim/roster_window.py:1720 gajim/roster_window.py:1722
+#: gajim/roster_window.py:4331 gajim/roster_window.py:4934
+#: gajim/gui_interface.py:1527 gajim/common/contacts.py:202
+#: gajim/common/helpers.py:86 gajim/common/modules/adhoc_commands.py:245
+#, fuzzy
+msgid "Group chats"
 msgstr "Комнаты"
 
-#: gajim/roster_window.py:2012
+#: gajim/roster_window.py:2009
 #, fuzzy
 msgid "Authorization sent"
 msgstr "Была отправлена авторизация"
 
-#: gajim/roster_window.py:2013
+#: gajim/roster_window.py:2010
 #, fuzzy, python-format
 msgid "\"%s\" will now see your status."
 msgstr "Теперь «%s» будет знать о вашем статусе."
 
-#: gajim/roster_window.py:2031
+#: gajim/roster_window.py:2028
 msgid "Subscription request has been sent"
 msgstr "Был отправлен запрос на подписку "
 
-#: gajim/roster_window.py:2032
-#, python-format
-msgid "If \"%s\" accepts this request you will know his or her status."
+#: gajim/roster_window.py:2029
+#, fuzzy, python-format
+msgid "If \"%s\" accepts this request you will know their status."
 msgstr "Если «%s» примет ваш запрос, вы будете знать его или её статус"
 
-#: gajim/roster_window.py:2046
+#: gajim/roster_window.py:2043
 #, fuzzy
 msgid "Authorization removed"
 msgstr "Авторизация была удалена"
 
-#: gajim/roster_window.py:2047
+#: gajim/roster_window.py:2044
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Теперь «%s» всегда будет видеть вас в оффлайне."
 
-#: gajim/roster_window.py:2250 gajim/roster_window.py:3504
+#: gajim/roster_window.py:2247 gajim/roster_window.py:3460
 msgid "Disconnect for Invisibility"
 msgstr ""
 
-#: gajim/roster_window.py:2251 gajim/roster_window.py:3505
+#: gajim/roster_window.py:2248 gajim/roster_window.py:3461
 msgid "You are participating in one or more group chats"
 msgstr "Вы находитесь в одной или более комнатах"
 
-#: gajim/roster_window.py:2252 gajim/roster_window.py:3506
-#, fuzzy
+#: gajim/roster_window.py:2249 gajim/roster_window.py:3462
 msgid ""
-"Changing your status to invisible will result in disconnection from those "
-"group chats.\n"
+"Changing your status to invisible will result in you leaving those group "
+"chats.\n"
 "Are you sure you want to go invisible?"
 msgstr ""
-"Переход в состояние невидимости приведет к выходу из этих комнат. Вы точно "
-"хотите стать невидимым?"
+"Переход в состояние невидимости приведет к выходу из этих комнат.\n"
+"Вы точно хотите стать невидимым?"
 
-#: gajim/roster_window.py:2257 gajim/roster_window.py:3512
-#: gajim/roster_window.py:5238 gajim/data/gui/gc_control_popup_menu.ui:120
+#: gajim/roster_window.py:2254 gajim/roster_window.py:3468
+#: gajim/data/gui/gc_control_popup_menu.ui:120
 msgid "_Disconnect"
 msgstr "_Выйти"
 
-#: gajim/roster_window.py:2285
+#: gajim/roster_window.py:2282
 #, fuzzy
 msgid "desynced"
 msgstr "не синхронизировано"
 
-#: gajim/roster_window.py:2353 gajim/data/gui/shortcuts_window.ui:224
+#: gajim/roster_window.py:2350 gajim/data/gui/shortcuts_window.ui:224
 #, fuzzy
 msgid "Quit Gajim"
 msgstr "Gajim"
 
-#: gajim/roster_window.py:2354
+#: gajim/roster_window.py:2351
 #, fuzzy
 msgid "You are about to quit Gajim"
 msgstr "Вы точно хотите закрыть Gajim?"
 
-#: gajim/roster_window.py:2355
+#: gajim/roster_window.py:2352
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Вы точно хотите закрыть Gajim?"
 
-#: gajim/roster_window.py:2356
+#: gajim/roster_window.py:2353
 #, fuzzy
 msgid "_Always quit when closing Gajim"
 msgstr "Всегда закрывать Gajim"
 
-#: gajim/roster_window.py:2359 gajim/roster_window.py:2455
-#: gajim/roster_window.py:2495 gajim/data/gui/systray_context_menu.ui:90
+#: gajim/roster_window.py:2356 gajim/roster_window.py:2452
+#: gajim/roster_window.py:2492 gajim/data/gui/systray_context_menu.ui:83
 #, fuzzy
 msgid "_Quit"
 msgstr "_Выйти"
 
-#: gajim/roster_window.py:2448
+#: gajim/roster_window.py:2445
 #, fuzzy
 msgid "Stop File Transfers"
 msgstr "Передача файлов"
 
-#: gajim/roster_window.py:2449
+#: gajim/roster_window.py:2446
 #, fuzzy
 msgid "You still have running file transfers"
 msgstr "Идет передача файлов"
 
-#: gajim/roster_window.py:2450
-#, fuzzy
+#: gajim/roster_window.py:2447
 msgid ""
 "If you quit now, the file(s) being transferred will be lost.\n"
 "Do you still want to quit?"
-msgstr "Если выйти сейчас, передача файла остановится. Выйти?"
+msgstr ""
+"Если выйти сейчас, передача файла остановится.\n"
+"Выйти?"
 
-#: gajim/roster_window.py:2488
+#: gajim/roster_window.py:2485
 #, fuzzy
 msgid "Unread Messages"
 msgstr "Непросмотренные события"
 
-#: gajim/roster_window.py:2489
+#: gajim/roster_window.py:2486
 #, fuzzy
 msgid "You still have unread messages"
 msgstr "У вас есть непрочитанные сообщения"
 
-#: gajim/roster_window.py:2490
+#: gajim/roster_window.py:2487
 #, fuzzy
 msgid ""
 "Messages will only be available for reading them later if storing chat "
@@ -1448,20 +1427,20 @@ msgstr ""
 "Сообщения будут доступны для чтения позже, если у вас активирована опция "
 "истории."
 
-#: gajim/roster_window.py:2760
+#: gajim/roster_window.py:2753
 msgid "You have unread messages"
 msgstr "У вас есть непрочитанные сообщения"
 
-#: gajim/roster_window.py:2761
+#: gajim/roster_window.py:2754
 msgid "You must read them before removing this transport."
 msgstr "Просмотрите все ожидающие события перед удалением транспорта."
 
-#: gajim/roster_window.py:2764
+#: gajim/roster_window.py:2757
 #, fuzzy, python-format
 msgid "Transport '%s' will be removed"
 msgstr "Транспорт «%s» будет удален"
 
-#: gajim/roster_window.py:2765
+#: gajim/roster_window.py:2758
 #, fuzzy
 msgid ""
 "You will no longer be able to send and receive messages from and to contacts "
@@ -1470,36 +1449,37 @@ msgstr ""
 "У вас теперь не будет возможности приема и отправки сообщения контактам "
 "через этот транспорт."
 
-#: gajim/roster_window.py:2768
+#: gajim/roster_window.py:2761
 msgid "Transports will be removed"
 msgstr "Транспорты будут удалены"
 
-#: gajim/roster_window.py:2773
-#, fuzzy, python-format
+#: gajim/roster_window.py:2766
+#, 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:2777
+#: gajim/roster_window.py:2770
 #, fuzzy
 msgid "Remove Transport"
 msgstr "Показать Транспорты"
 
-#: gajim/roster_window.py:2844
+#: gajim/roster_window.py:2837
 #, fuzzy
 msgid "Block Contact"
 msgstr "Заблокированные контакты"
 
-#: gajim/roster_window.py:2845
+#: gajim/roster_window.py:2838
 #, fuzzy
 msgid "Really block this contact?"
 msgstr "Используется ли для этого контакта OpenPGP?"
 
-#: gajim/roster_window.py:2846
+#: gajim/roster_window.py:2839
 #, fuzzy
 msgid ""
 "This contact will see you offline and you will not receive any messages sent "
@@ -1508,65 +1488,60 @@ msgstr ""
 "Этот контакт будет видеть вас как отключенного, а вы не будете получать от "
 "него сообщения."
 
-#: gajim/roster_window.py:2851
+#: gajim/roster_window.py:2844
 #, fuzzy
 msgid "_Block Contact"
 msgstr "Заблокированные контакты"
 
-#: gajim/roster_window.py:2896
+#: gajim/roster_window.py:2889
 msgid "Rename Contact"
 msgstr "Переименовать контакт"
 
-#: gajim/roster_window.py:2897
+#: gajim/roster_window.py:2890
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Введите новый ник для контакта %s"
 
-#: gajim/roster_window.py:2904
+#: gajim/roster_window.py:2897
 msgid "Rename Group"
 msgstr "Переименовать группу"
 
-#: gajim/roster_window.py:2905
+#: gajim/roster_window.py:2898
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Введите новое название для группы %s"
 
-#: gajim/roster_window.py:2953 gajim/roster_window.py:2954
+#: gajim/roster_window.py:2946 gajim/roster_window.py:2947
 msgid "Remove Group"
 msgstr "Удалить группу"
 
-#: gajim/roster_window.py:2955
+#: gajim/roster_window.py:2948
 #, fuzzy, python-format
 msgid "Do you want to remove %s from the contact list?"
 msgstr "Вы точно хотите удалить группу %s из ростера?"
 
-#: gajim/roster_window.py:2956
+#: gajim/roster_window.py:2949
 #, fuzzy
 msgid "_Also remove all contacts of this group from contact list"
 msgstr "Удалить из ростера все контакты в этой группе"
 
-#: gajim/roster_window.py:3044
-#, python-format
-msgid "%(jid)s has been invited in this room"
-msgstr "%(jid)s был приглашен в комнату"
-
-#: gajim/roster_window.py:3353
+#: gajim/roster_window.py:3309
 #, fuzzy
 msgid "Remove Contact"
 msgstr "Переименовать контакт"
 
-#: gajim/roster_window.py:3354
+#: gajim/roster_window.py:3310
 #, fuzzy
 msgid "Remove contact from contact list"
 msgstr "Удаляет контакт из ростера"
 
-#: gajim/roster_window.py:3355
+#: gajim/roster_window.py:3311
 #, 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:3364 gajim/roster_window.py:3384
+#: gajim/roster_window.py:3320 gajim/roster_window.py:3340
 #, fuzzy
 msgid ""
 "By removing this contact you also remove authorization. This means the "
@@ -1575,22 +1550,22 @@ msgstr ""
 "Удаляя контакт, вы удалите и авторизацию, то есть они всегда будут видеть "
 "вас в оффлайне."
 
-#: gajim/roster_window.py:3375
+#: gajim/roster_window.py:3331
 msgid "Do you want to continue?"
 msgstr "Продолжить?"
 
-#: gajim/roster_window.py:3386
+#: gajim/roster_window.py:3342
 #, fuzzy
 msgid "_I want this contact to know my status after removal"
 msgstr "Я хочу, чтобы этот контакт видел мой статус после удаления"
 
-#: gajim/roster_window.py:3393
+#: gajim/roster_window.py:3349
 #, fuzzy
 msgid "Remove contacts from contact list"
 msgstr "Удаляет контакт из ростера"
 
-#: gajim/roster_window.py:3399
-#, fuzzy, python-format
+#: gajim/roster_window.py:3355
+#, python-format
 msgid ""
 "By removing the following contacts, you will also remove authorization. This "
 "means they will see you as offline:\n"
@@ -1598,27 +1573,29 @@ msgid ""
 "%s"
 msgstr ""
 "Удаляя контакт, вы удалите и авторизацию, то есть они всегда будут видеть "
-"вас в оффлайне."
+"вас в оффлайне:\n"
+"\n"
+"%s"
 
-#: gajim/roster_window.py:3403
+#: gajim/roster_window.py:3359
 #, fuzzy
 msgid "Remove Contacts"
 msgstr "Переименовать контакт"
 
-#: gajim/roster_window.py:3423
+#: gajim/roster_window.py:3379
 msgid "No account available"
 msgstr "Нет доступной учетной записи"
 
-#: gajim/roster_window.py:3424
+#: gajim/roster_window.py:3380
 msgid "You must create an account before you can chat with other contacts."
 msgstr ""
 "Для начала беседы с другими людьми прежде необходимо создать учетную запись."
 
-#: gajim/roster_window.py:4060
+#: gajim/roster_window.py:4011
 msgid "Metacontacts storage not supported by your server"
 msgstr "Сервер не умеет хранить метаконтакты"
 
-#: gajim/roster_window.py:4062
+#: gajim/roster_window.py:4013
 msgid ""
 "Your server does not support storing metacontacts information. So this "
 "information will not be saved on next reconnection."
@@ -1626,12 +1603,12 @@ msgstr ""
 "Ваш сервер не умеет хранить данные о метаконтактах. Эта информация не будет "
 "сохранена при следующем подключении."
 
-#: gajim/roster_window.py:4159
+#: gajim/roster_window.py:4110
 #, fuzzy
 msgid "You are about to create a metacontact"
 msgstr "Вы точно хотите создать метаконтакт?"
 
-#: gajim/roster_window.py:4160
+#: gajim/roster_window.py:4111
 #, fuzzy
 msgid ""
 "Metacontacts are a way to regroup several contacts in one single contact. "
@@ -1642,26 +1619,26 @@ msgstr ""
 "Обычно используется, когда один и тот же человек имеет несколько учетных "
 "записей в Jabber или на транспортах."
 
-#: gajim/roster_window.py:4164
+#: gajim/roster_window.py:4115
 #, fuzzy
 msgid "Create Metacontact"
 msgstr "Переименовать контакт"
 
-#: gajim/roster_window.py:4170
+#: gajim/roster_window.py:4121 gajim/data/gui/groupchat_creation.ui:317
 #, fuzzy
 msgid "_Create"
 msgstr "Творческий"
 
-#: gajim/roster_window.py:4287
+#: gajim/roster_window.py:4238
 msgid "Invalid file URI:"
 msgstr "Неверный файл:"
 
-#: gajim/roster_window.py:4298
+#: gajim/roster_window.py:4249
 #, fuzzy
 msgid "Send file?"
 msgstr "Отправить _файл"
 
-#: gajim/roster_window.py:4299
+#: gajim/roster_window.py:4250
 #, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
@@ -1669,97 +1646,88 @@ msgstr[0] "Хотите отправить файл %s:"
 msgstr[1] "Хотите отправить файлы %s:"
 msgstr[2] "Хотите отправить файлы %s:"
 
-#: gajim/roster_window.py:4451
+#: gajim/roster_window.py:4401
 #, fuzzy, python-format
 msgid "Send %(from)s to %(to)s"
 msgstr "Отправить %s контакту %s"
 
-#: gajim/roster_window.py:4464
+#: gajim/roster_window.py:4414
 #, python-format
 msgid "Make %s first contact"
 msgstr "Сделать %s первым контактом"
 
-#: gajim/roster_window.py:4469
+#: gajim/roster_window.py:4419
 #, fuzzy, python-format
 msgid "Make %(contact1)s and %(contact2)s metacontacts"
 msgstr "Обьединить %s и %s в метаконтакт"
 
-#: gajim/roster_window.py:4825 gajim/roster_window.py:4923
+#: gajim/roster_window.py:4775 gajim/roster_window.py:4862
 msgid "_Change Status Message"
 msgstr "_Изменить сообщение о статусе"
 
-#: gajim/roster_window.py:4845
+#: gajim/roster_window.py:4795
 msgid "Publish Tune"
 msgstr "Музыка"
 
-#: gajim/roster_window.py:4856
+#: gajim/roster_window.py:4806
 msgid "Publish Location"
 msgstr "Отправлять Местоположение"
 
-#: gajim/roster_window.py:4868
-#, fuzzy
-msgid "Configure Services…"
-msgstr "Настроить Сервисы..."
-
-#: gajim/roster_window.py:4997
+#: gajim/roster_window.py:4936
 msgid "_Maximize All"
 msgstr "_Развернуть все"
 
-#: gajim/roster_window.py:5004 gajim/roster_window.py:5146
+#: gajim/roster_window.py:4943 gajim/roster_window.py:5085
 msgid "Send Group M_essage"
 msgstr "_Отправить сообщение группе"
 
-#: gajim/roster_window.py:5011
+#: gajim/roster_window.py:4950
 msgid "To all users"
 msgstr "Всем пользователям"
 
-#: gajim/roster_window.py:5015
+#: gajim/roster_window.py:4954
 msgid "To all online users"
 msgstr "Всем, кто подключён"
 
-#: gajim/roster_window.py:5027 gajim/roster_window.py:5152
+#: gajim/roster_window.py:4966 gajim/roster_window.py:5091
 #: gajim/data/gui/gc_occupants_menu.ui:110
 #: gajim/data/gui/contact_context_menu.ui:36
 msgid "In_vite to"
 msgstr "_Пригласить в"
 
-#: gajim/roster_window.py:5162
+#: gajim/roster_window.py:5101
 msgid "_Manage Contacts"
 msgstr "_Управление контактами"
 
-#: gajim/roster_window.py:5168
+#: gajim/roster_window.py:5107
 #, fuzzy
 msgid "Edit _Groups…"
 msgstr "Редактировать _группы"
 
-#: gajim/roster_window.py:5189 gajim/data/gui/filetransfers.ui:12
+#: gajim/roster_window.py:5128 gajim/data/gui/filetransfers.ui:12
 #: gajim/data/gui/remove_account_window.ui:134
 msgid "_Remove"
 msgstr "_Удалить"
 
-#: gajim/roster_window.py:5226
+#: gajim/roster_window.py:5165
 msgid "_Maximize"
 msgstr "Развернут_ь"
 
-#: gajim/roster_window.py:5233
+#: gajim/roster_window.py:5172
 msgid "_Reconnect"
 msgstr "_Переподсоединиться"
 
-#: gajim/roster_window.py:5254 gajim/data/gui/gc_occupants_menu.ui:170
+#: gajim/roster_window.py:5193 gajim/data/gui/gc_occupants_menu.ui:170
 #: gajim/data/gui/gc_control_popup_menu.ui:113
 #: gajim/data/gui/contact_context_menu.ui:205
 msgid "_History"
 msgstr "_История"
 
-#: gajim/roster_window.py:5335 gajim/data/gui/application_menu.ui:86
+#: gajim/roster_window.py:5274 gajim/data/gui/application_menu.ui:83
 #: gajim/data/gui/history_window.ui:57
 msgid "History Manager"
 msgstr "Менеджер истории"
 
-#: gajim/roster_window.py:5343
-msgid "_Join New Group Chat"
-msgstr "_Войти в новую комнату"
-
 #: gajim/dataforms_widget.py:585
 msgid "Unable to load image"
 msgstr "Невозможно загрузить изображение"
@@ -1884,224 +1852,241 @@ msgstr "Тема: %s\n"
 msgid "Write a message…"
 msgstr "Напишите сообщение.."
 
-#: gajim/message_window.py:250
+#: gajim/message_window.py:356
+#, fuzzy
+msgid "Close Tabs"
+msgstr "Закрыть чат"
+
+#: gajim/message_window.py:357
 msgid "You are going to close several tabs"
 msgstr "Вы собираетесь закрыть несколько вкладок"
 
-#: gajim/message_window.py:251
+#: gajim/message_window.py:358
 msgid "Do you really want to close them all?"
 msgstr "Действительно закрыть их всех?"
 
-#: gajim/message_window.py:539
+#: gajim/message_window.py:514
 #, fuzzy
 msgid "?Noun:Chats"
 msgstr "Комнаты"
 
-#: gajim/message_window.py:543
+#: gajim/message_window.py:518
 #, fuzzy
 msgid "Group Chats"
 msgstr "Комнаты"
 
-#: gajim/message_window.py:547
+#: gajim/message_window.py:522
 msgid "Private Chats"
 msgstr "Личные беседы"
 
-#: gajim/message_window.py:553
+#: gajim/message_window.py:528
 msgid "Messages"
 msgstr "Сообщения"
 
-#: gajim/gui_interface.py:173
+#: gajim/gui_interface.py:170
+#, 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:175
 msgid "Do you accept this request?"
 msgstr "Вы принимаете этот запрос?"
 
-#: gajim/gui_interface.py:175
-#, python-format
-msgid "Do you accept this request on account %s?"
+#: gajim/gui_interface.py:177
+#, fuzzy, python-format
+msgid "Do you accept this request (account: %s)?"
 msgstr "Вы принимаете запрос %s?"
 
-#: gajim/gui_interface.py:178
-#, 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:182
+#, fuzzy
+msgid "Authorization"
+msgstr "Была отправлена авторизация"
+
+#: gajim/gui_interface.py:186 gajim/gui_interface.py:420
+#: gajim/gtk/filetransfer.py:338
+#, fuzzy
+msgid "_No"
+msgstr "Нет"
 
-#: gajim/gui_interface.py:194 gajim/gtk/notification.py:175
+#: gajim/gui_interface.py:205 gajim/gtk/notification.py:175
 #: gajim/gtk/notification.py:197
 msgid "Connection Failed"
 msgstr "Соединение разорвалось"
 
-#: gajim/gui_interface.py:279 gajim/gui_interface.py:529
-msgid "Password Required"
-msgstr "Требуется пароль"
-
-#: gajim/gui_interface.py:280
-#, python-format
-msgid "A Password is required to join the room %s. Please type it."
-msgstr "Чтобы войти в комнату %s, нужен пароль."
-
-#: gajim/gui_interface.py:342 gajim/gui_interface.py:346
+#: gajim/gui_interface.py:325 gajim/gui_interface.py:329
 #, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr "Ошибка %(code)s: %(msg)s"
 
-#: gajim/gui_interface.py:357 gajim/gui_interface.py:376
+#: gajim/gui_interface.py:340 gajim/gui_interface.py:359
 #: gajim/common/modules/message.py:122
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "ошибка при отправке %(message)s ( %(error)s )"
 
-#: gajim/gui_interface.py:401 gajim/gtk/notification.py:175
+#: gajim/gui_interface.py:384 gajim/gtk/notification.py:175
 msgid "Subscription request"
 msgstr "Запрос подписки"
 
-#: gajim/gui_interface.py:413 gajim/common/contacts.py:184
-#: gajim/common/helpers.py:83
+#: gajim/gui_interface.py:396 gajim/common/contacts.py:200
+#: gajim/common/helpers.py:86
 msgid "Observers"
 msgstr "Наблюдатели"
 
-#: gajim/gui_interface.py:422
+#: gajim/gui_interface.py:405
 msgid "Authorization accepted"
 msgstr "Авторизация принята"
 
-#: gajim/gui_interface.py:423
+#: gajim/gui_interface.py:406
 #, fuzzy, python-format
 msgid "The contact \"%s\" has authorized you to see their status."
 msgstr "Контакт «%s» авторизовал вас, теперь вы можете видеть его статус."
 
-#: gajim/gui_interface.py:431
-#, python-format
-msgid "Contact \"%s\" removed subscription from you"
+#: gajim/gui_interface.py:415
+#, fuzzy
+msgid "Subscription Removed"
+msgstr "Запрос подписки"
+
+#: gajim/gui_interface.py:416
+#, fuzzy, python-format
+msgid "Contact '%s' removed subscription from you"
 msgstr "Контакт «%s» отозвал подписку с вами"
 
-#: gajim/gui_interface.py:432
+#: gajim/gui_interface.py:417
 #, fuzzy
 msgid ""
-"You will always see them as offline.\n"
+"You will always see this contact as offline.\n"
 "Do you want to remove them from your contact list?"
 msgstr ""
 "Вы всегда будете видеть его или её как отключенными.\n"
 "Удалить его или её из контакт-листа?"
 
-#: gajim/gui_interface.py:453 gajim/gtk/notification.py:176
+#: gajim/gui_interface.py:442 gajim/gtk/notification.py:176
 msgid "Unsubscribed"
 msgstr "От подписки отказался"
 
-#: gajim/gui_interface.py:465
+#: gajim/gui_interface.py:454
 #, python-format
 msgid "%(jid)s declined the invitation: %(reason)s"
 msgstr "%(jid)s отклонил приглашение: %(reason)s"
 
-#: gajim/gui_interface.py:469
+#: gajim/gui_interface.py:458
 #, python-format
 msgid "%(jid)s declined the invitation"
 msgstr "%(jid)s отклонил приглашение"
 
-#: gajim/gui_interface.py:485
-#, fuzzy, python-brace-format
+#: gajim/gui_interface.py:474
+#, python-brace-format
 msgid "You are invited to {room} by {user}"
-msgstr "Вы приглашены в конференцию"
+msgstr "Вы приглашены в конференцию {room} пользователем {user}"
 
-#: gajim/gui_interface.py:506
+#: gajim/gui_interface.py:495
 #, fuzzy
 msgid "Certificate Passphrase Required"
 msgstr "Сервер требует сертификат TLS"
 
-#: gajim/gui_interface.py:507
+#: gajim/gui_interface.py:496
 #, fuzzy, python-format
 msgid "Enter the certificate passphrase for account %s"
 msgstr "Введите пароль для сертификата учетной записи %s"
 
-#: gajim/gui_interface.py:516 gajim/gtk/accounts.py:963
+#: gajim/gui_interface.py:505 gajim/gtk/accounts.py:966
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Введите пароль для учетной записи %s"
 
-#: gajim/gui_interface.py:529 gajim/gtk/accounts.py:964
+#: gajim/gui_interface.py:518
+msgid "Password Required"
+msgstr "Требуется пароль"
+
+#: gajim/gui_interface.py:518 gajim/gtk/accounts.py:967
 msgid "Save password"
 msgstr "Сохранить пароль"
 
-#: gajim/gui_interface.py:601 gajim/gui_interface.py:632
+#: gajim/gui_interface.py:587 gajim/gui_interface.py:618
+#: gajim/gtk/filetransfer.py:332 gajim/gtk/filetransfer.py:333
 #: gajim/gtk/notification.py:173 gajim/gtk/notification.py:276
 msgid "File Transfer Error"
 msgstr "Ошибка передачи"
 
-#: gajim/gui_interface.py:666
+#: gajim/gui_interface.py:652
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s хочет отправить вам файл."
 
-#: gajim/gui_interface.py:668 gajim/gtk/filetransfer.py:479
+#: gajim/gui_interface.py:654 gajim/gtk/filetransfer.py:484
 #: gajim/gtk/notification.py:172 gajim/gtk/notification.py:274
 msgid "File Transfer Request"
 msgstr "Запрос передачи"
 
-#: gajim/gui_interface.py:767
+#: gajim/gui_interface.py:753
 #, fuzzy
 msgid "Remote Contact Stopped Transfer"
 msgstr "Удаленный контакт остановил передачу"
 
-#: gajim/gui_interface.py:772
+#: gajim/gui_interface.py:758
 #, fuzzy
 msgid "Error Opening File"
 msgstr "Ошибка открытия файла"
 
-#: gajim/gui_interface.py:782
+#: gajim/gui_interface.py:768
 #, fuzzy
 msgid "SSL Certificate Error"
 msgstr "Ошибка SSL сертификата"
 
-#: gajim/gui_interface.py:795 gajim/gui_interface.py:826
-#: gajim/gui_interface.py:853 gajim/gtk/notification.py:174
+#: gajim/gui_interface.py:781 gajim/gui_interface.py:812
+#: gajim/gui_interface.py:839 gajim/gtk/notification.py:174
 #: gajim/gtk/notification.py:279
 msgid "File Transfer Stopped"
 msgstr "Передача остановлена"
 
-#: gajim/gui_interface.py:799
+#: gajim/gui_interface.py:785
 msgid "File Transfer Failed"
 msgstr "Не удалось произвести передачу файлов"
 
-#: gajim/gui_interface.py:822
+#: gajim/gui_interface.py:808
 #, fuzzy, python-format
 msgid "%(filename)s received from %(name)s."
 msgstr "Передача файла %(filename)s от %(name)s не удалась."
 
-#: gajim/gui_interface.py:827
+#: gajim/gui_interface.py:813
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Передача файла %(filename)s от %(name)s приостановлена."
 
-#: gajim/gui_interface.py:833
+#: gajim/gui_interface.py:819
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s failed."
 msgstr "Передача файла %(filename)s от %(name)s не удалась."
 
-#: gajim/gui_interface.py:848
+#: gajim/gui_interface.py:834
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "%(name)s успешно получил(а) отправленный вами файл %(filename)s."
 
-#: gajim/gui_interface.py:854
+#: gajim/gui_interface.py:840
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Передача файла %(filename)s к %(name)s приостановлена."
 
-#: gajim/gui_interface.py:860
+#: gajim/gui_interface.py:846
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s failed."
 msgstr "Передача файла %(filename)s к %(name)s не удалась."
 
-#: gajim/gui_interface.py:971
+#: gajim/gui_interface.py:957
 msgid "Username Conflict"
 msgstr "Такое имя уже есть"
 
-#: gajim/gui_interface.py:972
+#: gajim/gui_interface.py:958
 msgid "Please type a new username for your local account"
 msgstr "Введите новое имя пользователя для локальной учетной записи"
 
-#: gajim/gui_interface.py:995
+#: gajim/gui_interface.py:981
 msgid "Resource Conflict"
 msgstr "Такое имя уже есть"
 
-#: gajim/gui_interface.py:996
+#: gajim/gui_interface.py:982
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
@@ -2109,30 +2094,30 @@ msgstr ""
 "Вы уже подсоединены к этой учетной записи с таким же ресурсом. Введите "
 "другой ресурс"
 
-#: gajim/gui_interface.py:1053
+#: gajim/gui_interface.py:1039
 #, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s хочет начать видео сеанс."
 
-#: gajim/gui_interface.py:1055
+#: gajim/gui_interface.py:1041
 msgid "Voice Chat Request"
 msgstr "Запрос аудио сеанса"
 
-#: gajim/gui_interface.py:1123 gajim/gtk/account_wizard.py:312
+#: gajim/gui_interface.py:1109 gajim/gtk/account_wizard.py:312
 msgid "Certificate Already in File"
 msgstr "Сертификат уже находится в файле"
 
-#: gajim/gui_interface.py:1124 gajim/gtk/account_wizard.py:313
+#: gajim/gui_interface.py:1110 gajim/gtk/account_wizard.py:313
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr "Этот сертификат уже есть в файле %s, поэтому он не был добавлен."
 
-#: gajim/gui_interface.py:1145
+#: gajim/gui_interface.py:1131
 #, fuzzy, python-format
 msgid "The authenticity of the %s certificate could be invalid"
 msgstr "Достоверность сертификата %s может быть недействительной."
 
-#: gajim/gui_interface.py:1148
+#: gajim/gui_interface.py:1134
 #, python-format
 msgid ""
 "\n"
@@ -2141,7 +2126,7 @@ msgstr ""
 "\n"
 "Неизвестная ошибка SSL: %d"
 
-#: gajim/gui_interface.py:1150
+#: gajim/gui_interface.py:1136
 #, python-format
 msgid ""
 "\n"
@@ -2150,11 +2135,11 @@ msgstr ""
 "\n"
 "Ошибка SSL: <b>%s</b>"
 
-#: gajim/gui_interface.py:1155
+#: gajim/gui_interface.py:1141
 msgid "Error verifying SSL certificate"
 msgstr "Ошибка при проверке SSL сертификата"
 
-#: gajim/gui_interface.py:1156
+#: gajim/gui_interface.py:1142
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your XMPP server: "
@@ -2165,7 +2150,7 @@ msgstr ""
 "%(error)s\n"
 "Вы всё ещё хотите подключиться к этому серверу?"
 
-#: gajim/gui_interface.py:1160 gajim/gtk/account_wizard.py:412
+#: gajim/gui_interface.py:1146 gajim/gtk/account_wizard.py:413
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -2180,185 +2165,176 @@ msgstr ""
 "Отпечаток SHA-256 сертификата:\n"
 "%(sha256)s"
 
-#: gajim/gui_interface.py:1166
+#: gajim/gui_interface.py:1152
 msgid "Ignore this error for this certificate."
 msgstr "Игнорировать эту ошибку для данного сертификата."
 
-#: gajim/gui_interface.py:1174
+#: gajim/gui_interface.py:1160
 #, python-format
 msgid "SSL Certificate Verification for %s"
 msgstr "Подтверждение SSL сертификата для %s"
 
-#: gajim/gui_interface.py:1442 gajim/gtk/join_groupchat.py:235
-msgid "You can not join a group chat unless you are connected."
-msgstr "Вы не можете зайти в комнату без подключения."
-
-#: gajim/gui_interface.py:1448
-#, fuzzy
-msgid "JID is not a Groupchat"
-msgstr "Это не комната"
-
-#: gajim/gui_interface.py:1579
-msgid "This is not a group chat"
-msgstr "Это не комната"
-
-#: gajim/gui_interface.py:1580
-#, python-format
-msgid ""
-"%(room_jid)s is already in your roster. Please check if %(room_jid)s is a "
-"correct group chat name. If it is, delete it from your roster and try "
-"joining the group chat again."
-msgstr ""
-
-#: gajim/gui_interface.py:1604 gajim/dialog_messages.py:58
+#: gajim/gui_interface.py:1577
 msgid "You cannot join a group chat while you are invisible"
 msgstr "Вы не можете зайти в комнату, так как вы в режиме невидимости."
 
-#: gajim/gui_interface.py:2037
+#: gajim/gui_interface.py:1976
 msgid "Could not save your settings and preferences"
 msgstr "Не могу сохранить ваши установки и настройки"
 
-#: gajim/gui_interface.py:2098
+#: gajim/gui_interface.py:2037
 msgid "Gajim: IPython Console"
 msgstr ""
 
-#: gajim/dialog_messages.py:32
+#: gajim/dialog_messages.py:31 gajim/dialog_messages.py:36
+#: gajim/gtk/single_message.py:305 gajim/gtk/account_wizard.py:229
 #, fuzzy
-msgid "You can not start a new conversation unless you are connected."
-msgstr "Вы не можете зайти в комнату без подключения."
-
-#: gajim/dialog_messages.py:36 gajim/dialog_messages.py:41
-#: gajim/gtk/single_message.py:305 gajim/gtk/join_groupchat.py:211
-#: gajim/gtk/account_wizard.py:229
-msgid "Invalid JID"
-msgstr "Неверный JID"
+msgid "Invalid XMPP Address"
+msgstr "Неверный файл"
 
-#: gajim/dialog_messages.py:42 gajim/gtk/single_message.py:306
-#, python-format
-msgid "It is not possible to send a message to %s, this JID is not valid."
+#: gajim/dialog_messages.py:37
+#, fuzzy, python-format
+msgid ""
+"It is not possible to send a message to %s. This XMPP Address is not valid."
 msgstr "Не удалось передать сообщение %s — этот JID неверен."
 
-#: gajim/dialog_messages.py:47
-msgid "Unread events"
+#: gajim/dialog_messages.py:42
+#, fuzzy
+msgid "Unread Events"
 msgstr "Непросмотренные события"
 
-#: gajim/dialog_messages.py:48
-msgid "Read all pending events before removing this account."
+#: gajim/dialog_messages.py:43
+#, fuzzy
+msgid "Read or acknowledge all pending events before removing this account."
 msgstr "Просмотрите все ожидающие события перед удалением учетной записи."
 
-#: gajim/dialog_messages.py:52
+#: gajim/dialog_messages.py:48
 #, fuzzy
 msgid "Invalid Form"
 msgstr "Составлять вход"
 
-#: gajim/dialog_messages.py:53
+#: gajim/dialog_messages.py:49
 #, fuzzy
 msgid "The form is not filled correctly."
 msgstr "Часы установлены неправильно"
 
-#: gajim/dialog_messages.py:57 gajim/common/helpers.py:309
+#: gajim/dialog_messages.py:53 gajim/common/helpers.py:315
 msgid "Invisible"
 msgstr "Невидимка"
 
-#: gajim/dialog_messages.py:62
-msgid "A connection is not available"
-msgstr "Подключение недоступно"
+#: gajim/dialog_messages.py:54
+#, fuzzy
+msgid "You cannot join a group chat while being invisible."
+msgstr "Вы не можете зайти в комнату, так как вы в режиме невидимости."
 
-#: gajim/dialog_messages.py:63
+#: gajim/dialog_messages.py:58
+#, fuzzy
+msgid "No Connection Available"
+msgstr "Соединение недоступно"
+
+#: gajim/dialog_messages.py:59
 msgid "Your message can not be sent until you are connected."
 msgstr "Ваше сообщение не может быть отправлено, пока вы не подключитесь."
 
-#: gajim/dialog_messages.py:67
-#, fuzzy
-msgid "JID already in list"
-msgstr "Jabber ID уже в списке"
+#: gajim/dialog_messages.py:63
+msgid "XMPP Address Already in List"
+msgstr ""
 
-#: gajim/dialog_messages.py:68
+#: gajim/dialog_messages.py:64
 #, fuzzy
-msgid "The JID you entered is already in the list. Choose another one."
+msgid ""
+"The XMPP Address you entered is already in the list. Please choose another "
+"one."
 msgstr "Jabber ID, который вы ввели, уже существует. Выберите другой."
 
-#: gajim/dialog_messages.py:72
-msgid "Invalid answer"
+#: gajim/dialog_messages.py:69
+#, fuzzy
+msgid "Invalid Answer"
 msgstr "Неверный ответ"
 
-#: gajim/dialog_messages.py:73
+#: gajim/dialog_messages.py:70
 #, python-format
 msgid "Transport %(name)s answered wrongly to register request: %(error)s"
 msgstr "Транспорт %(name)s неверно ответил на запрос о регистрации: %(error)s"
 
-#: gajim/dialog_messages.py:78
+#: gajim/dialog_messages.py:75
 #, fuzzy
 msgid "Wrong Custom Hostname"
 msgstr "Использовать пользовательские хост/порт"
 
-#: gajim/dialog_messages.py:79
-#, python-format
-msgid "Wrong custom hostname \"%s\". Ignoring it."
+#: gajim/dialog_messages.py:76
+#, fuzzy, python-format
+msgid "Custom hostname \"%s\" is wrong. It will be ignored."
 msgstr "Плохое имя сервера\"%s\"."
 
-#: gajim/dialog_messages.py:83
-msgid "Error while removing privacy list"
+#: gajim/dialog_messages.py:80
+#, fuzzy
+msgid "Error While Removing Privacy List"
 msgstr "Ошибка при удалении списка доступа"
 
-#: gajim/dialog_messages.py:84
-#, python-format
+#: gajim/dialog_messages.py:81
+#, fuzzy, python-format
 msgid ""
-"Privacy list %s has not been removed. It is maybe active in one of your "
-"connected resources. Deactivate it and try again."
+"Privacy list %s has not been removed. It is probably active in one of your "
+"connected resources. Please deactivate it and try again."
 msgstr ""
 "Список доступа %s не может быть удален. Возможно, он используется одним из "
 "ваших активных ресурсов. Отключите ресурс и попробуйте снова."
 
-#: gajim/dialog_messages.py:90
-msgid "Invisibility not supported"
+#: gajim/dialog_messages.py:87
+#, fuzzy
+msgid "Invisibility Not Supported"
 msgstr "Невидимость не поддерживается"
 
-#: gajim/dialog_messages.py:91
-#, python-format
-msgid "Account %s doesn't support invisibility."
+#: gajim/dialog_messages.py:88
+#, fuzzy, python-format
+msgid "This account %s doesn't support invisibility."
 msgstr "Учетная запись %s не поддерживает невидимость."
 
-#: gajim/dialog_messages.py:95
-msgid "Unregister failed"
+#: gajim/dialog_messages.py:92
+#, fuzzy
+msgid "Unregister Failed"
 msgstr "Ошибка отказа от регистрации"
 
-#: gajim/dialog_messages.py:96
-#, python-format
-msgid "Unregistration with server %(server)s failed: %(error)s"
+#: gajim/dialog_messages.py:93
+#, fuzzy, python-format
+msgid "Unregistration on server %(server)s failed: %(error)s"
 msgstr ""
 "Отказ от регистрации на сервере %(server)s завершился ошибкой: %(error)s"
 
-#: gajim/dialog_messages.py:100
-msgid "Registration succeeded"
+#: gajim/dialog_messages.py:97
+#, fuzzy
+msgid "Registration Succeeded"
 msgstr "Регистрация завершена"
 
-#: gajim/dialog_messages.py:101
-#, python-format
-msgid "Registration with agent %s succeeded"
+#: gajim/dialog_messages.py:98
+#, fuzzy, python-format
+msgid "Registration with agent %s succeeded."
 msgstr "Регистрация сервиса %s завершена успешно"
 
-#: gajim/dialog_messages.py:105 gajim/gtk/service_registration.py:215
-msgid "Registration failed"
+#: gajim/dialog_messages.py:102
+#, fuzzy
+msgid "Registration Failed"
 msgstr "Ошибка регистрации"
 
-#: gajim/dialog_messages.py:106
+#: gajim/dialog_messages.py:103
 #, python-format
 msgid ""
 "Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
 msgstr ""
 "Регистрация сервиса %(agent)s завершилась ошибкой: %(error)s: %(error_msg)s"
 
-#: gajim/dialog_messages.py:111
+#: gajim/dialog_messages.py:108
 #, fuzzy
 msgid "Unable to Join Group Chat"
 msgstr "Не получается войти в комнату"
 
-#: gajim/dialog_messages.py:116
-msgid "GStreamer error"
+#: gajim/dialog_messages.py:113
+#, fuzzy
+msgid "GStreamer Error"
 msgstr "Ошибка GStreamer"
 
-#: gajim/dialog_messages.py:117
+#: gajim/dialog_messages.py:114
 #, fuzzy, python-format
 msgid ""
 "Error: %(error)s\n"
@@ -2367,21 +2343,23 @@ msgstr ""
 "Ошибка: %s\n"
 "Отладка: %s"
 
-#: gajim/dialog_messages.py:121
-msgid "Wrong host"
+#: gajim/dialog_messages.py:118
+#, fuzzy
+msgid "Wrong Host"
 msgstr "Неверный хост"
 
-#: gajim/dialog_messages.py:122
+#: gajim/dialog_messages.py:119
 msgid "Invalid local address? :-O"
 msgstr "Неправильный локальный адрес? :-O"
 
-#: gajim/dialog_messages.py:126
-msgid "Avahi error"
+#: gajim/dialog_messages.py:123
+#, fuzzy
+msgid "Avahi Error"
 msgstr "Ошибка Avahi"
 
 # link-local это вроде не просто локальный. http://en.wikipedia.org/wiki/Link-
 # local_address
-#: gajim/dialog_messages.py:127
+#: gajim/dialog_messages.py:124
 #, python-format
 msgid ""
 "%s\n"
@@ -2390,64 +2368,66 @@ msgstr ""
 "%s\n"
 "Возможно, обмен локальными сообщениями работает не верно."
 
-#: gajim/dialog_messages.py:131 gajim/dialog_messages.py:136
-msgid "Could not request upload slot"
+#: gajim/dialog_messages.py:128 gajim/dialog_messages.py:133
+#, fuzzy
+msgid "Could not request upload slot for HTTP File Upload"
 msgstr "Не могу запросить слот для загрузки файла"
 
-#: gajim/dialog_messages.py:137
-msgid "Got unexpected response from server (see log)"
+#: gajim/dialog_messages.py:134
+msgid "Got unexpected response from server (see log)."
 msgstr ""
 
-#: gajim/dialog_messages.py:141 gajim/dialog_messages.py:146
-msgid "Could not open file"
+#: gajim/dialog_messages.py:138 gajim/dialog_messages.py:143
+#, fuzzy
+msgid "Could not Open File"
 msgstr "Не могу открыть файл"
 
-#: gajim/dialog_messages.py:142
-msgid "Exception raised while opening file (see log)"
+#: gajim/dialog_messages.py:139
+msgid "Exception raised while trying to open file (see log)."
 msgstr ""
 
-#: gajim/dialog_messages.py:151
-msgid "Unsecure"
-msgstr ""
+#: gajim/dialog_messages.py:148
+#, fuzzy
+msgid "Not Secure"
+msgstr "Не начато"
 
-#: gajim/dialog_messages.py:152
+#: gajim/dialog_messages.py:149
 #, fuzzy
-msgid "Server returned unsecure transport (HTTP)"
+msgid "The server returned an insecure transport (HTTP)."
 msgstr "Сервис ответил ошибкой."
 
-#: gajim/dialog_messages.py:156
+#: gajim/dialog_messages.py:153
 #, fuzzy
-msgid "Could not upload file"
+msgid "Could not Upload File"
 msgstr "Не могу загрузить изображение"
 
-#: gajim/dialog_messages.py:157
+#: gajim/dialog_messages.py:154
 #, python-format
 msgid "HTTP response code from server: %s"
 msgstr ""
 
-#: gajim/dialog_messages.py:161
+#: gajim/dialog_messages.py:158
 msgid "Upload Error"
 msgstr ""
 
-#: gajim/dialog_messages.py:166
+#: gajim/dialog_messages.py:163
 msgid "Encryption Error"
 msgstr ""
 
-#: gajim/dialog_messages.py:167
-#, fuzzy
-msgid "For the chosen encryption there is no encryption method available"
-msgstr "Подключение недоступно"
+#: gajim/dialog_messages.py:164
+msgid "There is no encryption method available for the chosen encryption."
+msgstr ""
 
-#: gajim/dialog_messages.py:171
+#: gajim/dialog_messages.py:169
 #, fuzzy
-msgid "Avatar upload failed"
+msgid "Avatar Upload Failed"
 msgstr "Публикация vCard не удалась"
 
-#: gajim/privatechat_control.py:204
+#: gajim/privatechat_control.py:207
 msgid "Sending private message failed"
 msgstr "Не удалось отправить личное сообщение"
 
-#: gajim/privatechat_control.py:206
+#: gajim/privatechat_control.py:209
 #, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr "Вы больше не находитесь в комнате «%(room)s» или «%(nick)s» вышел."
@@ -2470,7 +2450,7 @@ msgstr "показать помощь по команде"
 
 #: gajim/gajim_remote.py:85
 #, fuzzy
-msgid "Lists all contacts in roster, one for each line"
+msgid "Lists all contacts in the contact list, one for each line"
 msgstr ""
 "Выводит список всех контактов в ростере. Каждый контакт будет в отдельной "
 "строке"
@@ -2550,11 +2530,13 @@ msgstr ""
 
 #: gajim/gajim_remote.py:118
 #, fuzzy
-msgid "Sends new chat message to a contact in the roster. Account is optional."
+msgid ""
+"Sends new chat message to a contact in the contact list. Account is optional."
 msgstr "Отправить сообщение контакту, который привлечет его(её) внимание"
 
 #: gajim/gajim_remote.py:120 gajim/gajim_remote.py:130
-msgid "JID of the contact that will receive the message"
+#, fuzzy
+msgid "XMPP Address of the contact that will receive the message"
 msgstr "JID контакта, который получит сообщение"
 
 #: gajim/gajim_remote.py:121 gajim/gajim_remote.py:132
@@ -2569,8 +2551,10 @@ msgstr ""
 "если указано, сообщение будет отправлено с использованием этой учетной записи"
 
 #: gajim/gajim_remote.py:127
-msgid "Sends a chat message to someone on your roster. Account is optional."
-msgstr ""
+#, fuzzy
+msgid ""
+"Sends a chat message to someone on your contact list. Account is optional."
+msgstr "Отправить сообщение контакту, который привлечет его(её) внимание"
 
 #: gajim/gajim_remote.py:131
 msgid "subject"
@@ -2581,11 +2565,13 @@ msgid "message subject"
 msgstr "тема сообщения"
 
 #: gajim/gajim_remote.py:138
-msgid "Sends new message to a groupchat you've joined."
+#, fuzzy
+msgid "Sends new message to a group chat you've joined."
 msgstr "Отправляет новые сообщения в комнату, к которой вы присоединились."
 
 #: gajim/gajim_remote.py:140
-msgid "JID of the room that will receive the message"
+#, fuzzy
+msgid "XMPP Address of the group chat that will receive the message"
 msgstr "JID контакта, который получит сообщение"
 
 #: gajim/gajim_remote.py:147
@@ -2594,7 +2580,8 @@ msgstr "Получает детальную информацию о контак
 
 #: gajim/gajim_remote.py:149 gajim/gajim_remote.py:162
 #: gajim/gajim_remote.py:192
-msgid "JID of the contact"
+#, fuzzy
+msgid "XMPP Address of the contact"
 msgstr "JID контакта"
 
 #: gajim/gajim_remote.py:153
@@ -2657,7 +2644,8 @@ msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Сохраняет текущее состояние настроек Gajim в файл .config"
 
 #: gajim/gajim_remote.py:190
-msgid "Removes contact from roster"
+#, fuzzy
+msgid "Removes contact from contact list"
 msgstr "Удаляет контакт из ростера"
 
 #: gajim/gajim_remote.py:193
@@ -2707,9 +2695,9 @@ msgid "Missing argument \"contact_jid\""
 msgstr "Пропущен аргумент «JID контакта»"
 
 #: gajim/gajim_remote.py:275
-#, python-format
+#, fuzzy, python-format
 msgid ""
-"'%s' is not in your roster.\n"
+"'%s' is not in your contact list.\n"
 "Please specify account for sending the message."
 msgstr ""
 "'%s' не в вашем ростере.\n"
@@ -2934,12 +2922,12 @@ msgstr "Конец недели"
 msgid "Weekend!"
 msgstr "Выходные!"
 
-#: gajim/common/logger.py:192 gajim/common/logger.py:197
+#: gajim/common/logger.py:189 gajim/common/logger.py:194
 #, python-format
 msgid "%s is a directory but should be a file"
 msgstr "%s должен быть файлом, а не директорией"
 
-#: gajim/common/logger.py:217
+#: gajim/common/logger.py:214
 #, python-format
 msgid "Creating %s"
 msgstr "Создаём %s"
@@ -3014,22 +3002,21 @@ msgstr "%(nickname)s отключается"
 msgid "Contact Signed Out"
 msgstr "Контакт отключился"
 
-#: gajim/common/contacts.py:455
-msgid "Not in roster"
-msgstr "Не в ростере"
-
 #: gajim/common/config.py:80
+#, fuzzy
 msgid ""
 "Show desktop notification even when a chat window is opened for this contact "
-"and does not have focus"
-msgstr ""
+"and does not have focus."
+msgstr "Показывать уведомления когда окно чата открыто"
 
 #: gajim/common/config.py:81
-msgid "Play sound when user is busy"
+#, fuzzy
+msgid "Play sound even when being busy."
 msgstr "Проигрывать звуки, когда пользователь занят"
 
 #: gajim/common/config.py:83
-msgid "Show only online and free for chat contacts in roster."
+#, fuzzy
+msgid "Show only online and free for chat contacts in the contact list."
 msgstr ""
 "Показывать в ростере только контакты со статусами «Доступен» и «Готов "
 "поболтать»."
@@ -3039,12 +3026,15 @@ msgid "Time in minutes, after which your status changes to away."
 msgstr "Время в минутах, после которого ваш статус изменится на Отошел."
 
 #: gajim/common/config.py:87
-msgid "$S (Away as a result of being idle more than $T min)"
+#, fuzzy
+msgid "$S (Away: Idle more than $T min)"
 msgstr "$S (Автостатус 'Отошел' по причине бездействия более $T мин)"
 
 #: gajim/common/config.py:87
 #, fuzzy
-msgid "$S will be replaced by current status message, $T by autoawaytime."
+msgid ""
+"$S will be replaced by current status message, $T by the 'autoawaytime' "
+"value."
 msgstr "$S будет замещено текущим сообщением о статусе, $T — временем простоя."
 
 #: gajim/common/config.py:89
@@ -3052,71 +3042,77 @@ msgid "Time in minutes, after which your status changes to not available."
 msgstr "Время в минутах, после которого ваш статус изменится на Недоступен."
 
 #: gajim/common/config.py:90
-msgid "$S (Not available as a result of being idle more than $T min)"
+#, fuzzy
+msgid "$S (Not available: Idle more than $T min)"
 msgstr "$S (Автостатус 'Недоступен' по причине бездействия более $T мин)"
 
 #: gajim/common/config.py:90
 #, fuzzy
-msgid "$S will be replaced by current status message, $T by autoxatime."
+msgid ""
+"$S will be replaced by current status message, $T by the 'autoxatime' value."
 msgstr "$S будет замещено текущим сообщением о статусе, $T — временем простоя."
 
 #: gajim/common/config.py:93
+#, fuzzy
 msgid ""
-"When to show notification area icon. Can be 'never', 'on_event', 'always'."
+"When to show the notification area icon. Can be 'never', 'on_event', and "
+"'always'."
 msgstr ""
 "Когда показывать иконку в области уведомлений. Возможные значения 'never', "
 "'on_event', 'always'."
 
 #: gajim/common/config.py:94
-msgid "Allow to hide the roster window even if the tray icon is not shown."
+msgid ""
+"Allow to hide the contact list window even if the notification area icon is "
+"not shown."
 msgstr ""
 
 #: gajim/common/config.py:97
 #, fuzzy
-msgid "Contact signed in notification color."
-msgstr "_Показывать событие в области уведомлений"
+msgid "Notification color for contacts signing in."
+msgstr "Уведомлять о контактах, которые _вошли"
 
 #: gajim/common/config.py:98
 #, fuzzy
-msgid "Contact signout notification color"
-msgstr "Цвет фона контакта/переписки"
+msgid "Notification color for contacts signing out."
+msgstr "Уведомлять о контактах, которые _вышли: "
 
 #: gajim/common/config.py:99
 #, fuzzy
-msgid "New message notification color."
+msgid "Notification color for new message notification."
 msgstr "Показывать _уведомления при получении сообщений"
 
 #: gajim/common/config.py:100
-msgid "File transfer request notification color."
-msgstr "Цвет уведомлений о передаче файлов."
+#, fuzzy
+msgid "Notification color for file transfer request."
+msgstr "_Уведомить меня, когда передача файлов закончится"
 
 #: gajim/common/config.py:101
 #, fuzzy
-msgid "File transfer error notification color."
-msgstr "Передача отменена"
+msgid "Notification color for file transfer errors."
+msgstr "_Уведомить меня, когда передача файлов закончится"
 
 #: gajim/common/config.py:102
-#, fuzzy
-msgid "File transfer complete or stopped notification color."
-msgstr "Показать уведомление по окончании загрузки"
+msgid "Notification color for stopped or completed file transfers."
+msgstr ""
 
 #: gajim/common/config.py:103
-msgid "Groupchat invitation notification color"
-msgstr "Цвет, использующийся для шрифта уведомления о наборе"
+msgid "Notification color for group chat invitations."
+msgstr ""
 
 #: gajim/common/config.py:104
 #, fuzzy
-msgid "Background color of status changed notification"
+msgid "Notification background color for changed status."
 msgstr "Фоновый цвет контакта, который только что вошел."
 
 #: gajim/common/config.py:105
-#, fuzzy
-msgid "Other dialogs color."
-msgstr "Цвет ника собеседника."
+msgid "Notification color for other dialogs."
+msgstr ""
 
 #: gajim/common/config.py:106
+#, fuzzy
 msgid ""
-"List (space separated) of rows (accounts and groups) that are collapsed."
+"List of rows (accounts and groups) that are collapsed (space separated)."
 msgstr ""
 "Список (через пробел) строк (учётных записей и групп), которые свёрнуты."
 
@@ -3124,8 +3120,10 @@ msgstr ""
 msgid "default"
 msgstr "По_умолчанию"
 
-#: gajim/common/config.py:113
-msgid "Language used by speller"
+#: gajim/common/config.py:113 gajim/common/config.py:424
+#: gajim/common/config.py:431
+#, fuzzy
+msgid "Language used for spell checking."
 msgstr "Язык, используемый при проверке правописания"
 
 #: gajim/common/config.py:114
@@ -3139,10 +3137,11 @@ msgstr ""
 "«never» — не печатать время."
 
 #: gajim/common/config.py:115
+#, fuzzy
 msgid ""
 "Print time in chats using Fuzzy Clock. Value of fuzziness from 1 to 4, or 0 "
-"to disable fuzzyclock. 1 is the most precise clock, 4 the least precise one. "
-"This is used only if print_time is 'sometimes'."
+"to disable Fuzzy Clock. 1 is the most precise clock, 4 the least precise "
+"one. This is used only if 'print_time' is 'sometimes'."
 msgstr ""
 "Печатать время в беседе как в неточных часах. Степень неточности может быть "
 "от 1 до 4, 0 отключает эту функцию. 1 самые точные часы, 4 самые неточные. "
@@ -3160,16 +3159,18 @@ msgstr "Обрабатывать пары * / _ как возможные фор
 #: gajim/common/config.py:120
 #, fuzzy
 msgid ""
-"If true, do not remove */_ . So *abc* will be bold but with * * not removed."
+"If enabled, do not remove */_ . So *abc* will be bold but with * * not "
+"removed."
 msgstr ""
 "Если активно, то не будут удаляться */_. Так что *фыва* будет написано "
 "полужирным шрифтом, но * * удалены не будут"
 
 #: gajim/common/config.py:123
+#, fuzzy
 msgid ""
-"Uses ReStructured text markup to send HTML, plus ascii formatting if "
-"selected. For syntax, see http://docutils.sourceforge.net/docs/ref/rst/"
-"restructuredtext.html (If you want to use this, install docutils)"
+"Uses ReStructured text markup to send HTML, plus ASCII formatting if "
+"selected. Needs docutils installed (for syntax, see http://docutils."
+"sourceforge.net/docs/ref/rst/restructuredtext.html)."
 msgstr ""
 "Использовать разметку ReStructuredText для отправки HTML, плюс ascii "
 "форматирование, если оно выбрано. Синтаксис описан на http://docutils."
@@ -3177,303 +3178,309 @@ msgstr ""
 "воспользоваться этой опцией, установите docutils)"
 
 #: gajim/common/config.py:132
+#, fuzzy
 msgid ""
-"Character to add after nickname when using nick completion (tab) in group "
-"chat."
+"Character to add after nickname when using nickname completion (tab) in "
+"group chat."
 msgstr ""
 "Символ, который нужно добавлять к нику, когда используется дополнение (tab) "
 "в комнате."
 
 #: gajim/common/config.py:133
+#, fuzzy
 msgid ""
-"Character to propose to add after desired nickname when desired nickname is "
-"used by someone else in group chat."
+"Character to propose to add after desired nickname when nickname is already "
+"used in group chat."
 msgstr ""
 "Символ, который будет добавляться после ника, когда желаемый ник уже занят "
 "кем-нибудь в комнате."
 
 #: gajim/common/config.py:155
 msgid ""
-"If true, Gajim will save roster position when hiding roster, and restore it "
-"when showing roster."
+"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:161
-msgid "Place the roster on the right in single window mode"
+#, fuzzy
+msgid "Place the contact list on the right in single window mode"
 msgstr "Расположить ростер справа в однооконном режиме"
 
 #: gajim/common/config.py:167
 #, fuzzy
 msgid ""
-"This option let you customize timestamp that is printed in conversation. For "
-"example \"[%H:%M] \" will show \"[hour:minute] \". See python doc on "
-"strftime for full documentation: http://docs.python.org/lib/module-time.html"
+"This option lets you customize the timestamp that is printed in "
+"conversation. For example '[%H:%M] ' will show '[hour:minute] '. See python "
+"doc on strftime for full documentation (https://docs.python.org/3/library/"
+"time.html)."
 msgstr ""
 "Эта опция позволяет настроить отпечаток времени, который печатается в чатах. "
 "К примеру «[%H:%M]» будет показано как «[чч:мм]». Смотрите дополнительно "
 "документацию python к strftime (http://docs.python.org/lib/module-time.html)"
 
 #: gajim/common/config.py:168
-msgid "Characters that are printed before the nickname in conversations"
+#, fuzzy
+msgid "Characters that are printed before the nickname in conversations."
 msgstr "Символы, которые будут отображаться перед никами в чате."
 
 #: gajim/common/config.py:169
-msgid "Characters that are printed after the nickname in conversations"
+#, fuzzy
+msgid "Characters that are printed after the nickname in conversations."
 msgstr "Символы, которые будут отображаться после ников в чате"
 
 #: gajim/common/config.py:170
-msgid "Add * and [n] in roster title?"
-msgstr "Добавлять * и [n] в окно ростера?"
+#, fuzzy
+msgid "If enabled, Gajim will add * and [n] in contact list window title."
+msgstr ""
+"Если отмечено, то Gajim будет показывать настроения контактов в окне ростера"
 
 #: gajim/common/config.py:171
 #, fuzzy
 msgid ""
-"How many history messages should be restored when a chat tab/window is "
-"reopened?"
+"Number of messages from chat history to be restored when a chat tab/window "
+"is reopened."
 msgstr ""
 "Сколько строк из предыдущей беседы выводить, когда вкладка/окно открываются "
 "вновь."
 
 #: gajim/common/config.py:172
-msgid "How far back in time (minutes) history is restored. -1 means no limit."
-msgstr ""
-
-#: gajim/common/config.py:173
 msgid ""
-"How many lines to request from server when entering a groupchat. -1 means no "
-"limit"
+"How far back in time (minutes) chat history is restored. -1 means no limit."
 msgstr ""
-"Количество строк истории сообщений, запрашиваемых при входе в комнату. -1 - "
-"не ограничено"
 
-#: gajim/common/config.py:174
+#: gajim/common/config.py:173
 #, fuzzy
 msgid ""
-"Minutes of backlog to request when entering a groupchat. -1 means no limit"
-msgstr ""
-"За какой период (минут назад) запрашивать историю сообщений при входе в "
-"комнату. -1 - не ограничено"
-
-#: gajim/common/config.py:175
-msgid ""
-"How many seconds to wait before trying to autorejoin to a conference you are "
-"being disconnected from. Set to 0 to disable autorejoining."
+"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:176
-msgid "Should autorejoin be activated when kicked from a conference?"
+#: gajim/common/config.py:174
+msgid ""
+"Should automatic rejoin be activated when you were kicked from a group chat?"
 msgstr ""
 
-#: gajim/common/config.py:177
-msgid ""
-"Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
-"Client default behaviour)."
+#: gajim/common/config.py:175
+#, fuzzy
+msgid "Send message on Ctrl+Enter and make a new line with Enter."
 msgstr ""
 "Оправлять сообщения по Ctrl+Enter и Enter создает новую строку (как в "
 "Mirabilis ICQ)"
 
-#: gajim/common/config.py:179
-msgid "How many lines to store for Ctrl+KeyUP."
+#: gajim/common/config.py:177
+#, fuzzy
+msgid "How many lines to store for Ctrl+KeyUP (previously sent messages)."
 msgstr "Сколько строк хранить для Ctrl+Стрелка вверх"
 
-#: gajim/common/config.py:182
+#: gajim/common/config.py:180
 #, fuzzy, python-format
 msgid ""
-"Either custom URL with %%s in it where %%s is the word/phrase or "
-"'WIKTIONARY' which means use Wikitionary."
+"Either a custom URL with %%s in it (where %%s is the word/phrase) or "
+"'WIKTIONARY' (which means use Wikitionary)."
 msgstr ""
 "Введите свою ссылку с %s, в которой %s подменяет слово/фразу, или "
 "«WIKTIONARY», чтобы использовать Викисловарь."
 
-#: gajim/common/config.py:185
+#: gajim/common/config.py:183
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr ""
 "Если отмечено, то Gajim'ом можно будет управлять удаленно с использованием "
 "gajim-remote."
 
-#: gajim/common/config.py:187
+#: gajim/common/config.py:185
+#, fuzzy
 msgid ""
-"When not printing time for every message (print_time==sometimes), print it "
+"When not printing time for every message ('print_time'==sometimes), print it "
 "every x minutes."
 msgstr ""
 "Если отключена печать времени для каждого сообщения, то печатать его каждые "
 "X минут."
 
-#: gajim/common/config.py:188
+#: gajim/common/config.py:186
 msgid "Ask before pasting an image."
 msgstr ""
 
-#: gajim/common/config.py:189
+#: gajim/common/config.py:187
 msgid "Ask before closing a group chat tab/window."
 msgstr "Спрашивать перед закрытием окна/вкладки комнаты."
 
-#: gajim/common/config.py:190
+#: gajim/common/config.py:188
 #, fuzzy
 msgid ""
-"Always ask for confirmation before closing groupchats with any of the JIDs "
-"on this space separated list."
+"Always ask for confirmation before closing group chats with any of the XMPP "
+"Addresses on this list (space separated)."
 msgstr ""
 "Всегда спрашивать перед закрытием окна/вкладки комнаты из этого списка. "
 "Комнаты в списке разделяются пробелом."
 
-#: gajim/common/config.py:191
+#: gajim/common/config.py:189
 #, fuzzy
 msgid ""
-"Never ask for confirmation before closing groupchats with any of the JIDs on "
-"this space separated list."
+"Never ask for confirmation before closing group chats with any of the XMPP "
+"Addresses on this list (space separated)."
 msgstr ""
 "Никогда не спрашивать перед закрытием окна/вкладки комнаты из этого списка. "
 "Комнаты в списке разделяются пробелом."
 
-#: gajim/common/config.py:192
+#: gajim/common/config.py:190
+#, fuzzy
 msgid ""
-"Ask before closing tabbed chat window if there are controls that can lose "
-"data (chat, private chat, groupchat that will not be minimized)"
+"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:195
+#: gajim/common/config.py:193
 #, fuzzy
 msgid ""
-"Comma separated list of sent hosts, in addition of local interfaces, for "
-"File Transfer in case of address translation/port forwarding."
+"List of send hosts (comma separated) in addition to local interfaces for "
+"file transfers (in case of address translation/port forwarding)."
 msgstr ""
 "Разделенный запятыми список хостов, который мы отсылаем в дополнение к "
 "локальным интерфейсам при передаче файлов в случае, если мы за NAT или "
 "используется перенаправление портов."
 
-#: gajim/common/config.py:196
+#: gajim/common/config.py:194
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "IEC стандарт утверждает, что KiB = 1024 байт, KB = 1000 байт"
 
-#: gajim/common/config.py:198
+#: gajim/common/config.py:196
 msgid "Notify of events in the notification area."
 msgstr "Уведомлять о событиях в области уведомлений."
 
-#: gajim/common/config.py:199
+#: gajim/common/config.py:197
 msgid ""
-"If False, Gajim will display a static event icon instead of the blinking "
-"status icon in the notification area when notifying on event."
+"If disabled, Gajim will display a static event icon instead of the blinking "
+"status icon in the notification area when notifying about an event."
 msgstr ""
 
-#: gajim/common/config.py:205
+#: gajim/common/config.py:203
 msgid "Show tab when only one conversation?"
 msgstr "Показывать вкладку при одном чат-окне?"
 
-#: gajim/common/config.py:206
+#: gajim/common/config.py:204
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "Показывать границу вкладки в окне чата?"
 
-#: gajim/common/config.py:207
+#: gajim/common/config.py:205
 msgid "Show close button in tab?"
 msgstr "Показывать кнопку закрытия на вкладке?"
 
-#: gajim/common/config.py:220
+#: gajim/common/config.py:218
 msgid "Preview new messages in notification popup?"
 msgstr "Предпросмотр новых сообщений во всплывающем окне?"
 
-#: gajim/common/config.py:223
+#: gajim/common/config.py:221
+#, fuzzy
 msgid ""
-"A semicolon-separated list of words that will be highlighted in group chats."
+"A list of words (semicolon separated) that will be highlighted in group "
+"chats."
 msgstr ""
 "Список слов (через точку с запятой), которые будут подсвечиваться в комнатах."
 
-#: gajim/common/config.py:224
+#: gajim/common/config.py:222
 #, fuzzy
 msgid ""
-"If true, quits Gajim when X button of Window Manager is clicked. This "
-"setting is taken into account only if notification icon is used."
+"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 будет завершаться при нажатии на кнопку закрытия "
 "окна. Эта опция учитывается, только если используется иконка в области "
 "уведомлений."
 
-#: gajim/common/config.py:225
+#: gajim/common/config.py:223
 msgid ""
-"If true, Gajim hides the Roster window on pressing the X button instead of "
-"minimizing into the Dock."
+"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:226
+#: gajim/common/config.py:224
 #, fuzzy
 msgid ""
-"If true, Gajim will display an icon on each tab containing unread messages. "
-"Depending on the theme, this icon may be animated."
+"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:227
+#: gajim/common/config.py:225
 #, fuzzy
 msgid ""
-"If true, Gajim will display the status message, if not empty, for every "
-"contact under the contact name in roster window."
+"If enabled, Gajim will display the status message (if not empty) underneath "
+"the contact name in the contact list window."
 msgstr ""
 "Если активно то Gajim будет отображать сообщение о статусе, если оно не "
 "пустое, для каждого контакта под именем контакта в окне ростера"
 
-#: gajim/common/config.py:233
-msgid "Define the position of the avatar in roster. Can be left or right"
+#: gajim/common/config.py:231
+#, fuzzy
+msgid ""
+"Define the position of avatars in the contact list. Can be 'left' or 'right'."
 msgstr "Определяет позицию аватар в ростере. Может быть left или right"
 
-#: gajim/common/config.py:234
+#: gajim/common/config.py:232
 #, fuzzy
 msgid ""
-"If False, Gajim will no longer print status line in chats when a contact "
-"changes their status and/or their status message."
+"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/common/config.py:235
+#: gajim/common/config.py:233
 #, fuzzy
 msgid ""
 "Default Setting: Show a status message for every join or leave in a group "
-"chat"
+"chat."
 msgstr "Не получается войти в комнату"
 
-#: gajim/common/config.py:236
+#: gajim/common/config.py:234
+#, fuzzy
 msgid ""
-"Default Setting: Show a status message for all status (away, dnd, etc.) "
-"changes of users in a group chat"
-msgstr ""
+"Default Setting: Show a status message for all status changes (away, dnd, "
+"etc.) of users in a group chat."
+msgstr "Не получается войти в комнату"
 
-#: gajim/common/config.py:238
-msgid "Log XHTML messages instead of plain text messages."
+#: gajim/common/config.py:236
+#, fuzzy
+msgid "Store XHTML messages in chat history instead of plain text messages."
 msgstr "Сохранять XHTML сообщения вместо простых текстовых сообщений"
 
-#: gajim/common/config.py:239
+#: gajim/common/config.py:237
 msgid "Don't show avatar for the transport itself."
 msgstr "Не показывать аватар для транспорта."
 
-#: gajim/common/config.py:240
-msgid "Don't show roster in the system taskbar."
+#: gajim/common/config.py:238
+#, fuzzy
+msgid "Don't show contact list window in the system taskbar."
 msgstr "Не показывать ростер в панели задач."
 
-#: gajim/common/config.py:241
+#: gajim/common/config.py:239
 #, fuzzy
 msgid ""
-"If true, make the window flash (the default behaviour in most Window "
-"Managers) when holding pending events."
+"If enabled, Gajim makes the window flash (the default behaviour in most "
+"Window Managers) when holding pending events."
 msgstr ""
 "Если активно и установлены GTK+ и PyGTK версий 2.8 и выше, то окно будет "
 "мигать (поведение по умолчанию для большинства менеджеров окон) когда "
 "присутствуют не просмотренные события."
 
-#: gajim/common/config.py:245
+#: gajim/common/config.py:243
+#, fuzzy
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
 "'always_with_roster' - Like 'always' but the messages are in a single window "
-"along with the roster.\n"
+"along with the contact list.\n"
 "'never' - All messages get their own window.\n"
 "'peracct' - Messages for each account are sent to a specific window.\n"
-"'pertype' - Each message type (e.g. chats vs. groupchats) is sent to a "
+"'pertype' - Each message type (e.g. chats vs. group chats) is sent to a "
 "specific window."
 msgstr ""
 "Управляет окном, где помещаются новые сообщения.\n"
@@ -3485,278 +3492,310 @@ msgstr ""
 "свое окно. Заметьте, что при изменении этого параметра требуется перезапуск "
 "Gajim, чтобы изменения вступили в силу."
 
-#: gajim/common/config.py:246
+#: gajim/common/config.py:244
+#, fuzzy
 msgid ""
-"Show roster on startup.\n"
-"'always' - Always show roster.\n"
-"'never' - Never show roster.\n"
-"'last_state' - Restore the last state roster."
+"Show contact list window on startup.\n"
+"'always' - Always show contact list window.\n"
+"'never' - Never show contact list window.\n"
+"'last_state' - Restore last state of the contact list window."
 msgstr ""
 "Показывать ростер при запуске.\n"
 "'always' - Всегда показывать ростер.\n"
 "'never' - Никогда не показывать ростер.\n"
 "'last_state' - Восстанавливать последнее состояние ростера."
 
-#: gajim/common/config.py:247
-msgid "If False, you will no longer see the avatar in the chat window."
+#: gajim/common/config.py:245
+#, fuzzy
+msgid "If enabled, Gajim displays the avatar in the chat window."
 msgstr "Если неактивно, вы больше не будете видеть аватары в окне беседы."
 
-#: gajim/common/config.py:248
-msgid "If true, pressing the escape key closes a tab/window."
+#: gajim/common/config.py:246
+#, fuzzy
+msgid "If enabled, pressing Esc closes a tab/window."
 msgstr "Если активно, то нажатие клавиши Escape будет закрывать вкладку/окно."
 
-#: gajim/common/config.py:249
-msgid "Hides the banner in a group chat window"
+#: gajim/common/config.py:247
+#, fuzzy
+msgid "Hides the banner in a group chat window."
 msgstr "Скрывает баннер в окне комнаты"
 
-#: gajim/common/config.py:250
-msgid "Hides the banner in two persons chat window"
-msgstr "Скрывает баннер в окне чата"
+#: gajim/common/config.py:248
+#, fuzzy
+msgid "Hides the banner in a 1:1 chat window."
+msgstr "Скрывает баннер в окне комнаты"
 
-#: gajim/common/config.py:251
-msgid "Hides the group chat occupants list in group chat window."
+#: gajim/common/config.py:249
+#, fuzzy
+msgid "Hides the group chat participants list in a group chat window."
 msgstr "Скрывает список посетителей в окне комнаты."
 
-#: gajim/common/config.py:252
+#: gajim/common/config.py:250
+#, fuzzy
 msgid ""
 "In a chat, show the nickname at the beginning of a line only when it's not "
-"the same person talking than in previous message."
+"the same person talking as in the previous message."
 msgstr ""
 "Показывать ник в начале строки в чате только если предыдущее сообщение было "
 "написано другим участником."
 
-#: gajim/common/config.py:253
+#: gajim/common/config.py:251
 msgid "Indentation when using merge consecutive nickname."
 msgstr ""
 "Разделитель, используемый при активированной настройке "
 "chat_merge_consecutive_nickname."
 
-#: gajim/common/config.py:254
-msgid "Ctrl-Tab go to next composing tab when none is unread."
+#: gajim/common/config.py:252
+#, 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:255
+#: gajim/common/config.py:253
 #, fuzzy
 msgid ""
-"Show the confirm metacontacts creation dialog or not? Empty string means "
-"never show the dialog."
+"Show a confirmation dialog to create metacontacts? Empty string means never "
+"show the dialog."
 msgstr ""
-"Следует ли показывать диалог подтверждения о создании метаконтакта? Пустая "
+"Следует ли показывать диалог подтверждения блокировки контакта? Пустая "
 "строка означает, что сообщение не будет показываться вообще."
 
-#: gajim/common/config.py:256
+#: gajim/common/config.py:254
 #, fuzzy
 msgid ""
-"Show the confirm block contact dialog or not? Empty string means never show "
+"Show a confirmation dialog to block a contact? Empty string means never show "
 "the dialog."
 msgstr ""
 "Следует ли показывать диалог подтверждения блокировки контакта? Пустая "
 "строка означает, что сообщение не будет показываться вообще."
 
-#: gajim/common/config.py:257
+#: gajim/common/config.py:255
 #, fuzzy
 msgid ""
-"Show the confirm custom status dialog or not? Empty string means never show "
-"the dialog."
+"Show a confirmation dialog for a custom status? Empty string means never "
+"show the dialog."
 msgstr ""
 "Следует ли показывать диалог подтверждения блокировки контакта? Пустая "
 "строка означает, что сообщение не будет показываться вообще."
 
-#: gajim/common/config.py:258
+#: gajim/common/config.py:256
 #, fuzzy
 msgid ""
-"If true, you will be able to set a negative priority to your account in "
-"account modification window. BE CAREFUL, when you are logged in with a "
-"negative priority, you will NOT receive any message from your server."
+"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:259
+#: gajim/common/config.py:257
 #, fuzzy
 msgid ""
-"If true, Gajim will show number of online and total contacts in account and "
-"group rows."
+"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:260
+#: gajim/common/config.py:258
+#, fuzzy
 msgid ""
-"Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
-"as if they were of this type"
+"Can be empty, 'chat' or 'normal'. If not empty, all incoming messages are "
+"treated as if they were of this type."
 msgstr ""
 "Может быть пусто, 'chat' или 'normal'. Если не пусто — обрабатывать все "
 "входящие сообщения так, как будто бы они были этого типа."
 
-#: gajim/common/config.py:261
+#: gajim/common/config.py:259
 #, fuzzy
 msgid ""
-"If true, Gajim will scroll and select the contact who sent you the last "
-"message, if chat window is not already opened."
+"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 прокрутит ростер и выделит контакт, который написал вам "
 "сообщение последним, если окно чата еще небыло открыто."
 
-#: gajim/common/config.py:262
+#: gajim/common/config.py:260
 msgid "Time of inactivity needed before the change status window closes down."
 msgstr "Время не активности прежде чем окно изменения статуса закроется."
 
-#: gajim/common/config.py:263
+#: gajim/common/config.py:261
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
 msgstr "Максимальное количество строк в окне. Старые строки будут удалены."
 
-#: gajim/common/config.py:264
+#: gajim/common/config.py:262
 #, fuzzy
 msgid ""
-"If true, notification windows from notification-daemon will be attached to "
-"notification icon."
+"If enabled, notification windows from notification-daemon will be attached "
+"to the notification area icon."
 msgstr ""
 "Если активно, окно уведомления от notification-daemon будет прикреплено к "
 "области уведомлений."
 
-#: gajim/common/config.py:265
+#: gajim/common/config.py:263
 msgid "Choose interval between 2 checks of idleness."
 msgstr "Выберите интервал между 2 проверками на бездействие."
 
-#: gajim/common/config.py:266
+#: gajim/common/config.py:264
+#, fuzzy
 msgid ""
-"Valid uri schemes. Only schemes in this list will be accepted as \"real\" "
-"uri. (mailto and xmpp are handled separately)"
+"Valid URI schemes. Only schemes in this list will be accepted as 'real' URI "
+"(mailto and xmpp are handled separately)."
 msgstr ""
 "Допустимые uri схемы. Только схемы из этого списка будут приняты как «real» "
 "uri.(mailto и xmpp обрабатываются отдельно)"
 
-#: gajim/common/config.py:267
-msgid "If true, completion in groupchats will be like a shell auto-completion"
+#: gajim/common/config.py:265
+#, fuzzy
+msgid ""
+"If enabled, completion in group chats will be like a shell auto-completion."
 msgstr ""
 "Если активно, автодополнение ников в конференциях будет работать как "
 "автодополнение в командной оболочке"
 
-#: gajim/common/config.py:272
-msgid "Optionally fix jingle output video framerate. Example: 10/1 or 25/2"
+#: gajim/common/config.py:270
+#, fuzzy
+msgid "Optionally fix Jingle output video framerate. Example: 10/1 or 25/2."
 msgstr ""
 "Опциональное изменение частоты кадров видео в jingle. Например: 10/1 или 25/2"
 
-#: gajim/common/config.py:273
-msgid "Optionally resize jingle output video. Example: 320x240"
+#: gajim/common/config.py:271
+#, fuzzy
+msgid "Optionally resize Jingle output video. Example: 320x240."
 msgstr "Опциональное изменение размера кадра видео в jingle. Например: 320x240"
 
-#: gajim/common/config.py:274
-msgid "If true, You will also see your webcam"
-msgstr "Если активно, вы также будете видеть изображение со своей вебкамеры"
+#: gajim/common/config.py:272
+msgid "If enabled, you will see your webcam's video stream as well."
+msgstr ""
 
-#: gajim/common/config.py:277
+#: gajim/common/config.py:275
 #, fuzzy
 msgid ""
-"If true, Gajim will try to use a STUN server when using Jingle. The one in "
-"\"stun_server\" option, or the one given by the XMPP server."
+"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 попробует использовать STUN сервер с jingle. Либо "
 "указанный опцией \"stun_server\", либо предоставленный jabber сервером."
 
-#: gajim/common/config.py:278
+#: gajim/common/config.py:276
 #, fuzzy
 msgid "STUN server to use when using Jingle"
 msgstr "Сервер STUN для использования с jingle"
 
-#: gajim/common/config.py:279
+#: gajim/common/config.py:277
 #, fuzzy
 msgid ""
-"If true, Gajim will show affiliation of groupchat occupants by adding a "
-"colored square to the status icon"
+"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:280
+#: gajim/common/config.py:278
+#, fuzzy
 msgid ""
 "Proxy used for all outgoing connections if the account does not have a "
-"specific proxy configured"
+"specific proxy configured."
 msgstr ""
 "Прокси используется для всех исходящих соединений, если в настройках учетной "
 "записи не задан прокси "
 
-#: gajim/common/config.py:281
-msgid "If true, Gajim will ignore incoming attention requests (\"wizz\")."
+#: gajim/common/config.py:279
+msgid "If enabled, Gajim will ignore incoming attention requests ('wizz')."
 msgstr ""
 
-#: gajim/common/config.py:282
+#: gajim/common/config.py:280
 msgid ""
 "If enabled, Gajim will reopen chat windows that were opened last time Gajim "
 "was closed."
 msgstr ""
 
-#: gajim/common/config.py:283
+#: gajim/common/config.py:281
 #, fuzzy
 msgid ""
-"If enabled, Gajim will show an icon to show that sent message has been "
-"received by your contact"
+"If enabled, Gajim will display an icon to show that sent messages have been "
+"received by your contact."
 msgstr ""
 "Если включено, Gajim не будет запрашивать сообщение о статусе. Вместо него "
 "будет использовано соответствующее сообщение по умолчанию."
 
-#: gajim/common/config.py:284
-msgid "Show a mini avatar in chat window tabs and in window icon"
+#: gajim/common/config.py:282
+msgid "Show a mini avatar in chat window tabs and as the window's icon."
 msgstr ""
 
-#: gajim/common/config.py:285
-msgid "If true, Gajim will use the Systems Keyring to store account passwords."
+#: gajim/common/config.py:283
+#, fuzzy
+msgid ""
+"If enabled, Gajim will use the System's Keyring to store account passwords."
 msgstr ""
 "Если активно, Gajim будет использовать Systems Keyring для хранения паролей "
 "учетных записей."
 
+#: gajim/common/config.py:284
+msgid "If enabled, Gajim will execute XEP-0146 Commands."
+msgstr ""
+
+#: gajim/common/config.py:285
+msgid "2: System, 1: Enabled, 0: Disabled"
+msgstr ""
+
 #: gajim/common/config.py:286
-msgid "If true, Gajim will execute XEP-0146 Commands."
+msgid "Options in days which can be chosen in the sync threshold menu"
 msgstr ""
 
 #: gajim/common/config.py:287
-msgid "2: System, 1: Enabled, 0: Disabled"
+msgid ""
+"Maximum history in days we request from a public group chat archive. 0: As "
+"much as possible."
 msgstr ""
 
 #: gajim/common/config.py:288
-msgid "Options in days which can be chosen in the sync threshold menu"
+msgid ""
+"Maximum history in days we request from a private group chat archive. 0: As "
+"much as possible."
 msgstr ""
 
 #: gajim/common/config.py:289
 msgid ""
-"Maximum history in days we request from a public room archive. 0: As much as "
-"possible"
+"If enabled, Gajim shows the group chat subject in the chat window when "
+"joining."
 msgstr ""
 
 #: gajim/common/config.py:290
+#, fuzzy
 msgid ""
-"Maximum history in days we request from a private room archive. 0: As much "
-"as possible"
+"If enabled, the contact row is colored according to the current chat state "
+"of the contact."
 msgstr ""
+"Если отмечено, то Gajim будет разрешать определять время в системе, которую "
+"вы используете"
 
 #: gajim/common/config.py:291
-msgid "If the room subject is shown in chat on join"
+#, fuzzy
+msgid ""
+"If enabled, the tab is colored according to the current chat state of the "
+"contact."
 msgstr ""
+"Если отмечено, то Gajim будет разрешать определять время в системе, которую "
+"вы используете"
 
 #: gajim/common/config.py:292
+#, fuzzy
 msgid ""
-"If the contact row is colored according to the current chatstate of the "
-"contact"
+"Shows a text in the banner that describes the current chat state of the "
+"contact."
 msgstr ""
+"Если отмечено, то Gajim будет разрешать определять время в системе, которую "
+"вы используете"
 
 #: gajim/common/config.py:293
-msgid "If the tab is colored according to the current chatstate of the contact"
-msgstr ""
-
-#: gajim/common/config.py:294
-msgid ""
-"Shows a text in the banner that describes the current chatstate of the "
-"contact"
-msgstr ""
-
-#: gajim/common/config.py:295 gajim/common/config.py:424
 #, fuzzy
 msgid ""
 "Chat state notifications that are sent to contacts. Possible values: all, "
@@ -3765,330 +3804,361 @@ msgstr ""
 "Отсылать уведомления о состоянии беседы. Варианты: all (все), composing_only "
 "(только печать), disabled (никаких уведомлений)."
 
-#: gajim/common/config.py:296 gajim/common/config.py:438
+#: gajim/common/config.py:294
 #, fuzzy
 msgid ""
 "Chat state notifications that are sent to the group chat. Possible values: "
-"all, composing_only, disabled"
+"'all', 'composing_only', 'disabled'"
 msgstr ""
 "Отсылать уведомления о состоянии беседы. Варианты: all (все), composing_only "
 "(только печать), disabled (никаких уведомлений)."
 
-#: gajim/common/config.py:312
+#: gajim/common/config.py:297
+msgid "API Preferences. Possible values: 'http', 'iq'"
+msgstr ""
+
+#: gajim/common/config.py:313
+#, fuzzy
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
-"defined in autopriority_* options."
+"defined in 'autopriority_*' options."
 msgstr ""
 "Приоритет будет изменяться автоматически согласно вашему статусу. Приоритеты "
 "для статусов задаются в пункте autopriority_* ."
 
-#: gajim/common/config.py:320
+#: gajim/common/config.py:321
+#, fuzzy
 msgid ""
-"Status used to autoconnect as. Can be online, chat, away, xa, dnd, "
-"invisible. NOTE: this option is used only if restore_last_status is disabled"
+"Status to be used automatically when connecting. Can be 'online', 'chat', "
+"'away', 'xa', 'dnd' or 'invisible'. NOTE: This option is used only if "
+"'restore_last_status' is disabled."
 msgstr ""
 "Статус, используемый при автоподключении. Варианты: отключен, в сети, готов "
 "поболтать, отошел, недоступен, не беспокоить, невидимка"
 
-#: gajim/common/config.py:321
-msgid "If enabled, restore the last status that was used."
+#: gajim/common/config.py:322
+#, fuzzy
+msgid "If enabled, the last status will be restored."
 msgstr "Если включено, восстанавливать последний использованный статус."
 
-#: gajim/common/config.py:322
+#: gajim/common/config.py:323
 #, fuzzy
 msgid ""
-"If true, Contacts requesting authorization will be automatically accepted."
+"If enabled, Contacts requesting authorization will be accepted automatically."
 msgstr ""
 "Если активно, контакты, запрашивающие авторизацию, будут автоматически её "
 "получать."
 
-#: gajim/common/config.py:323
+#: gajim/common/config.py:324
+#, fuzzy
 msgid ""
-"If False, this account will be disabled and will not appear in roster window."
+"If disabled, this account will be disabled and will not appear in the "
+"contact list window."
 msgstr ""
 "Если неактивно, эта учетная запись будет отключена и не будет отображаться в "
 "окне ростера."
 
-#: gajim/common/config.py:327
-msgid "Allow plaintext connections"
+#: gajim/common/config.py:328
+#, fuzzy
+msgid "Allow plaintext connections."
 msgstr "Разрешить нешифрованные соединения"
 
-#: gajim/common/config.py:330
+#: gajim/common/config.py:331
 msgid ""
-"List (space separated) of authentication mechanisms to try. Can contain "
-"ANONYMOUS, EXTERNAL, GSSAPI, SCRAM-SHA-1-PLUS, SCRAM-SHA-1, DIGEST-MD5, "
-"PLAIN, X-MESSENGER-OAUTH2 or XEP-0078"
+"List of authentication mechanisms to try (space separated). Can contain "
+"'ANONYMOUS', 'EXTERNAL', 'GSSAPI', 'SCRAM-SHA-1-PLUS', 'SCRAM-SHA-1', "
+"'DIGEST-MD5', 'PLAIN', 'X-MESSENGER-OAUTH2' or 'XEP-0078'."
 msgstr ""
 
-#: gajim/common/config.py:331
+#: gajim/common/config.py:332
+#, fuzzy
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection. "
-"Can be 'warn', 'connect', 'disconnect'"
+"Can be 'warn', 'connect' or 'disconnect'."
 msgstr ""
 "Если отмечено, то Gajim будет будет спрашивать вас перед отправкой пароля "
 "через незащищенное соединение. Может быть 'warn', 'connect', 'disconnect'"
 
-#: gajim/common/config.py:332
+#: gajim/common/config.py:333
 msgid "Show a warning dialog before using standard SSL library."
 msgstr "Предупреждать, прежде чем использовать стандартную библиотеку SSL."
 
-#: gajim/common/config.py:333
+#: gajim/common/config.py:334
 msgid ""
 "Show a warning dialog before sending PLAIN password over a plain connection."
 msgstr ""
 "Показывать предупреждение перед отправкой пароля через незащищенное "
 "соединение."
 
-#: gajim/common/config.py:334
-msgid "Space separated list of ssl errors to ignore."
-msgstr "Разделенный пробелами список игнорирования ошибок ssl"
+#: gajim/common/config.py:335
+msgid "List of SSL errors to ignore (space separated)."
+msgstr ""
 
-#: gajim/common/config.py:340
+#: gajim/common/config.py:341
 msgid ""
-"Space separated list of JIDs for which you do not want to store logs. You "
-"can also add account name to log nothing for this account."
+"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:341
+#: gajim/common/config.py:342
 msgid ""
-"Space separated list of JIDs for which you accept to not log conversations "
-"if he does not want to."
+"List of XMPP Addresses (space separated) for which you accept to not store "
+"chat history if your contact does not want to."
 msgstr ""
 
-#: gajim/common/config.py:343
-msgid "Whitespace sent after inactivity"
+#: gajim/common/config.py:344
+#, fuzzy
+msgid "If enabled, a whitespace is sent after inactivity (keep alive)."
 msgstr "Пробел, посылаемый после бездействия"
 
 # дословно: пинг XMPP послал после бездействия. Возможно, ошибка в оригинале.
-#: gajim/common/config.py:344
-msgid "XMPP ping sent after inactivity"
+#: gajim/common/config.py:345
+#, fuzzy
+msgid "If enabled, an XMPP ping is sent after inactivity (ping alive)."
 msgstr "пинг XMPP, посылаемый после бездействия"
 
-#: gajim/common/config.py:348
+#: gajim/common/config.py:349
 #, fuzzy
 msgid ""
-"How many seconds to wait for the answer of ping alive packet before trying "
-"to reconnect?"
+"How many seconds to wait for the answer of a ping alive packet before trying "
+"to reconnect."
 msgstr ""
 "Время ожидания (в секундах) ответа на пинг перед повторной попыткой "
 "соединения."
 
-#: gajim/common/config.py:352
-msgid "Jabberd2 workaround"
+#: gajim/common/config.py:353
+#, fuzzy
+msgid "Jabberd2 workaround."
 msgstr "Костыль для jabberd2"
 
-#: gajim/common/config.py:355
+#: gajim/common/config.py:356
+#, fuzzy
 msgid ""
-"If checked, Gajim will use your IP and proxies defined in "
-"file_transfer_proxies option for file transfer."
+"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/common/config.py:356
+#: gajim/common/config.py:357
 msgid ""
-"If true, Gajim will test file transfer proxies on startup to be sure it "
-"works. Openfire's proxies are known to fail this test even if they work."
+"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:369
-msgid "Answer to receipt requests"
-msgstr "Отвечать на запросы уведомления"
-
 #: gajim/common/config.py:370
-msgid "Sent receipt requests"
-msgstr "Посылать запросы уведомления"
+#, fuzzy
+msgid "If enabled, Gajim will answer to message receipt requests."
+msgstr ""
+"Если включено, Gajim не будет запрашивать сообщение о статусе. Вместо него "
+"будет использовано соответствующее сообщение по умолчанию."
+
+#: gajim/common/config.py:371
+msgid "If enabled, Gajim will send message receipt requests."
+msgstr ""
 
-#: gajim/common/config.py:379
+#: gajim/common/config.py:380
 msgid ""
 "Allow Gajim to send information about the operating system you are running."
 msgstr ""
 "Разрешить Gajim отправлять информацию о операционной системе, которую вы "
 "используете"
 
-#: gajim/common/config.py:380
+#: gajim/common/config.py:381
 msgid "Allow Gajim to send your local time."
 msgstr "Разрешить Gajim отправлять ваше локальное время."
 
-#: gajim/common/config.py:383
-msgid "Message that is sent to contacts you want to add"
-msgstr "Сообщение отправляемое контактам, которых вы хотите добавить"
-
 #: gajim/common/config.py:384
-msgid ""
-"If enabled, Gajim will send your local IPs so your contact can connect to "
-"your machine to transfer files."
-msgstr ""
+#, fuzzy
+msgid "Message that is sent to contacts you want to add."
+msgstr "Сообщение отправляемое контактам, которых вы хотите добавить"
 
 #: gajim/common/config.py:385
+#, fuzzy
 msgid ""
-"Space separated list of JIDs for which chat window will be re-opened on next "
-"startup."
+"If enabled, Gajim will send your local IP so your contact can connect to "
+"your machine for file transfers."
 msgstr ""
+"Если отмечено, Gajim будет использовать ваш IP и прокси, определенные в "
+"параметре file_transfer_proxies для передачи файлов"
 
-#: gajim/common/config.py:387
-msgid "HTTP Upload: Enable HTTPS Verification"
+#: gajim/common/config.py:386
+msgid ""
+"List of XMPP Addresses (space separated) for which the chat window will be "
+"re-opened on next startup."
 msgstr ""
 
 #: gajim/common/config.py:388
-msgid ""
-"Preferred file transfer mechanism for file drag&drop on chat window. Can be "
-"'httpupload' (default) or 'jingle'"
+msgid "HTTP File Upload: Enable HTTPS Verification."
 msgstr ""
 
 #: gajim/common/config.py:389
-msgid "Allow cert verification with POSH"
+msgid ""
+"Preferred file transfer mechanism for file drag&drop on a chat window. Can "
+"be 'httpupload' (default) or 'jingle'."
 msgstr ""
 
-#: gajim/common/config.py:423 gajim/common/config.py:430
-#, fuzzy
-msgid "Language for which misspelled words will be checked"
-msgstr "Язык, который используется при проверке правописания"
+#: gajim/common/config.py:390
+msgid "Allow certificate verification with POSH."
+msgstr "Подтверждение SSL сертификата при помощи POSH"
 
-#: gajim/common/config.py:427
-msgid "The currently active encryption for that contact"
-msgstr ""
-
-#: gajim/common/config.py:431
+#: gajim/common/config.py:425
+#, fuzzy
 msgid ""
-"How many lines to request from server when entering a groupchat. -1 means no "
-"limit, -2 means global value"
+"Chat state notifications that are sent to contacts. Possible values: 'all', "
+"'composing_only', 'disabled'"
 msgstr ""
-"Количество строк истории сообщений, запрашиваемых при входе в комнату. -1 - "
-"не ограничено, -2 - глобальное значение"
+"Отсылать уведомления о состоянии беседы. Варианты: all (все), composing_only "
+"(только печать), disabled (никаких уведомлений)."
 
-#: gajim/common/config.py:432
+#: gajim/common/config.py:428
 #, fuzzy
+msgid "The currently active encryption for that contact."
+msgstr "Включить ESessions шифрование для данной учетной записи."
+
+#: gajim/common/config.py:432
 msgid ""
-"Minutes of backlog to request when entering a groupchat. -1 means no limit, "
-"-2 means global value"
+"If enabled, a notification is created for every message in this group chat."
 msgstr ""
-"За какой период (минут назад) запрашивать историю сообщений при входе в "
-"комнату. -1 - не ограничено, -2 -  глобальное значение"
 
 #: gajim/common/config.py:433
-msgid "State whether a notification is created for every message in this room"
-msgstr ""
-
-#: gajim/common/config.py:434
+#, fuzzy
 msgid ""
-"Show a status message for all status (away, dnd, etc.) changes of users in a "
-"group chat"
-msgstr ""
+"Show a status message for all status changes (away, dnd, etc.) of users in a "
+"group chat."
+msgstr "Не получается войти в комнату"
 
-#: gajim/common/config.py:435
+#: gajim/common/config.py:434
 #, fuzzy
-msgid "Show a status message for every join or leave in a group chat"
+msgid "Show a status message for every join or leave in a group chat."
 msgstr "Не получается войти в комнату"
 
+#: gajim/common/config.py:435
+msgid ""
+"If enabled, the group chat is minimized into the contact list when joining "
+"automatically."
+msgstr ""
+
 #: gajim/common/config.py:436
-msgid "If the group chat is minimized into the roster on autojoin"
+msgid ""
+"If enabled, the group chat is minimized into the contact list when closing "
+"it."
 msgstr ""
 
 #: gajim/common/config.py:437
-msgid "If the group chat is minimized into the roster on close"
+#, fuzzy
+msgid ""
+"Chat state notifications that are sent to the group chat. Possible values: "
+"'all', 'composing_only' or 'disabled'."
 msgstr ""
+"Отсылать уведомления о состоянии беседы. Варианты: all (все), composing_only "
+"(только печать), disabled (никаких уведомлений)."
 
-#: gajim/common/config.py:441
+#: gajim/common/config.py:440
+#, fuzzy
 msgid ""
-"State whether plugins should be activated on startup (this is saved on Gajim "
-"exit). This option SHOULD NOT be used to (de)activate plug-ins. Use GUI "
-"instead."
+"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). Эта "
 "опция НЕ ДОЛЖНА использоваться для включения или выключения модулей. "
 "Используйте графический интерфейс для этого."
 
-#: gajim/common/config.py:446 gajim/common/const.py:281
+#: gajim/common/config.py:445 gajim/common/const.py:315
 msgid "Sleeping"
 msgstr "Сплю"
 
-#: gajim/common/config.py:447
+#: gajim/common/config.py:446
 msgid "Back soon"
 msgstr "Скоро буду"
 
-#: gajim/common/config.py:447
+#: gajim/common/config.py:446
 msgid "Back in some minutes."
 msgstr "Вернусь через несколько минут"
 
-#: gajim/common/config.py:448 gajim/common/const.py:247
+#: gajim/common/config.py:447 gajim/common/const.py:281
 msgid "Eating"
 msgstr "Ем"
 
-#: gajim/common/config.py:448
-msgid "I'm eating, so leave me a message."
-msgstr "Кушаю, так что оставьте сообщение секретарю."
+#: gajim/common/config.py:447
+#, fuzzy
+msgid "I'm eating."
+msgstr "Работаю"
 
-#: gajim/common/config.py:449
+#: gajim/common/config.py:448
 msgid "Movie"
 msgstr "В кино"
 
-#: gajim/common/config.py:449
+#: gajim/common/config.py:448
 msgid "I'm watching a movie."
 msgstr "Смотрю кино"
 
-#: gajim/common/config.py:450 gajim/common/const.py:314
+#: gajim/common/config.py:449 gajim/common/const.py:348
 msgid "Working"
 msgstr "Работаю"
 
-#: gajim/common/config.py:450
+#: gajim/common/config.py:449
 msgid "I'm working."
 msgstr "Работаю"
 
-#: gajim/common/config.py:451
+#: gajim/common/config.py:450
 msgid "Phone"
 msgstr "Телефон"
 
-#: gajim/common/config.py:451
+#: gajim/common/config.py:450
 msgid "I'm on the phone."
 msgstr "Говорю по телефону"
 
-#: gajim/common/config.py:452
+#: gajim/common/config.py:451
 msgid "Out"
 msgstr "Вышел"
 
-#: gajim/common/config.py:452
+#: gajim/common/config.py:451
 msgid "I'm out enjoying life."
 msgstr "Наслаждаюсь жизнью, чего и вам желаю."
 
-#: gajim/common/config.py:463
+#: gajim/common/config.py:462
 msgid "I'm available."
 msgstr "Я здесь."
 
-#: gajim/common/config.py:464
+#: gajim/common/config.py:463
 msgid "I'm free for chat."
 msgstr "Я готов поболтать."
 
-#: gajim/common/config.py:465 gajim/gtk/accounts.py:134
+#: gajim/common/config.py:464 gajim/gtk/accounts.py:133
 msgid "Be right back."
 msgstr "Скоро буду."
 
-#: gajim/common/config.py:466
+#: gajim/common/config.py:465
 msgid "I'm not available."
 msgstr "Меня нет."
 
-#: gajim/common/config.py:467
+#: gajim/common/config.py:466
 msgid "Do not disturb."
 msgstr "Не беспокоить."
 
-#: gajim/common/config.py:468 gajim/common/config.py:469
+#: gajim/common/config.py:467 gajim/common/config.py:468
 msgid "Bye!"
 msgstr "Пока!"
 
-#: gajim/common/config.py:480
+#: gajim/common/config.py:479
+#, fuzzy
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
-"muc_highlight_words, or when a group chat message contains your nickname."
+"'muc_highlight_words' your nickname is mentioned."
 msgstr ""
 "Звук, который нужно воспроизвести, когда в MUC появляется сообщение, которое "
 "содержит слово из списка muc_highlight_words, или когда сообщение содержит "
 "ваш ник."
 
-#: gajim/common/config.py:481
-msgid "Sound to play when any MUC message arrives."
+#: gajim/common/config.py:480
+#, fuzzy
+msgid "Sound to play when any group chat message arrives."
 msgstr "Звук, который нужно проигрывать, когда приходит любое сообщение MUC."
 
-#: gajim/common/config.py:485
+#: gajim/common/config.py:484
 msgid "Tor"
 msgstr "Tor"
 
@@ -4097,873 +4167,967 @@ msgstr "Tor"
 msgid "Error: cannot open %s for reading"
 msgstr "Ошибка: не могу открыть %s для чтения"
 
-#: gajim/common/const.py:214
+#: gajim/common/const.py:216
+#, fuzzy
+msgid "?Group chat name:Team"
+msgstr "Отсутствует"
+
+#: gajim/common/const.py:217
+msgid "?Group chat description:Project discussion"
+msgstr ""
+
+#: gajim/common/const.py:218
+#, fuzzy
+msgid "?Group chat address:team"
+msgstr "Комнаты"
+
+#: gajim/common/const.py:219
+#, fuzzy
+msgid "?Group chat name:Family"
+msgstr "Вас упомянули в комнате"
+
+#: gajim/common/const.py:220
+msgid "?Group chat description:Spring gathering"
+msgstr ""
+
+#: gajim/common/const.py:221
+msgid "?Group chat address:family"
+msgstr ""
+
+#: gajim/common/const.py:222
+#, fuzzy
+msgid "?Group chat name:Vacation"
+msgstr "Приглашение в комнату"
+
+#: gajim/common/const.py:223
+msgid "?Group chat description:Trip planning"
+msgstr ""
+
+#: gajim/common/const.py:224
+#, fuzzy
+msgid "?Group chat address:vacation"
+msgstr "Приглашение в комнату"
+
+#: gajim/common/const.py:225
+#, fuzzy
+msgid "?Group chat name:Repairs"
+msgstr "_Комната"
+
+#: gajim/common/const.py:226
+msgid "?Group chat description:Local help group"
+msgstr ""
+
+#: gajim/common/const.py:227
+#, fuzzy
+msgid "?Group chat address:repairs"
+msgstr "Комнаты"
+
+#: gajim/common/const.py:228
+#, fuzzy
+msgid "?Group chat name:News"
+msgstr "Отсутствует"
+
+#: gajim/common/const.py:229
+#, fuzzy
+msgid "?Group chat description:Local news and reports"
+msgstr "Создание комнат запрещено."
+
+#: gajim/common/const.py:230
+#, fuzzy
+msgid "?Group chat address:news"
+msgstr "Новая комната"
+
+#: gajim/common/const.py:235
+#, fuzzy
+msgid "Remote server not found"
+msgstr "Сервис не обнаружен"
+
+#: gajim/common/const.py:236
+msgid "Remote server timeout"
+msgstr ""
+
+#: gajim/common/const.py:237 gajim/common/const.py:238
+#: gajim/common/const.py:239
+msgid "Address does not belong to a group chat server"
+msgstr "Адрес не принадлежит серверу комнат"
+
+#: gajim/common/const.py:240
+#, fuzzy
+msgid "Group chat already exists"
+msgstr "Учётная запись Local уже существует."
+
+#: gajim/common/const.py:241
+msgid "Group chat does not exist"
+msgstr "Комнаты не существует."
+
+#: gajim/common/const.py:247
 msgid "This message was encrypted with OTR and could not be decrypted."
 msgstr ""
 
-#: gajim/common/const.py:217
+#: gajim/common/const.py:250
 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:221
+#: gajim/common/const.py:254
 msgid ""
-"This message was encrypted with OpenPGP for XMPP and could not be decrypted."
+"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:224
+#: gajim/common/const.py:258
 #, python-format
 msgid "This message was encrypted with %s and could not be decrypted."
 msgstr ""
 
-#: gajim/common/const.py:231
+#: gajim/common/const.py:265
 msgid "Doing Chores"
 msgstr "Занимаюсь хозяйством"
 
-#: gajim/common/const.py:232
+#: gajim/common/const.py:266
 msgid "Buying Groceries"
 msgstr "Покупаю продукты"
 
-#: gajim/common/const.py:233
+#: gajim/common/const.py:267
 msgid "Cleaning"
 msgstr "Делаю уборку"
 
-#: gajim/common/const.py:234
+#: gajim/common/const.py:268
 msgid "Cooking"
 msgstr "Готовлю"
 
-#: gajim/common/const.py:235
+#: gajim/common/const.py:269
 msgid "Doing Maintenance"
 msgstr "Ремонт"
 
-#: gajim/common/const.py:236
+#: gajim/common/const.py:270
 msgid "Doing the Dishes"
 msgstr "Мою посуду"
 
-#: gajim/common/const.py:237
+#: gajim/common/const.py:271
 msgid "Doing the Laundry"
 msgstr "Стираю"
 
-#: gajim/common/const.py:238
+#: gajim/common/const.py:272
 msgid "Gardening"
 msgstr "Работаю в саду"
 
-#: gajim/common/const.py:239
+#: gajim/common/const.py:273
 msgid "Running an Errand"
 msgstr "Ушёл по поручению"
 
-#: gajim/common/const.py:240
+#: gajim/common/const.py:274
 msgid "Walking the Dog"
 msgstr "Гуляю с собакой"
 
-#: gajim/common/const.py:242
+#: gajim/common/const.py:276
 msgid "Drinking"
 msgstr "Пью"
 
-#: gajim/common/const.py:243
+#: gajim/common/const.py:277
 msgid "Having a Beer"
 msgstr "Пью пиво"
 
-#: gajim/common/const.py:244
+#: gajim/common/const.py:278
 msgid "Having Coffee"
 msgstr "Пью кофе"
 
-#: gajim/common/const.py:245
+#: gajim/common/const.py:279
 msgid "Having Tea"
 msgstr "Пью чай"
 
-#: gajim/common/const.py:248
+#: gajim/common/const.py:282
 msgid "Having a Snack"
 msgstr "Перекусываю"
 
-#: gajim/common/const.py:249
+#: gajim/common/const.py:283
 msgid "Having Breakfast"
 msgstr "Завтракаю"
 
-#: gajim/common/const.py:250
+#: gajim/common/const.py:284
 msgid "Having Dinner"
 msgstr "Обедаю"
 
-#: gajim/common/const.py:251
+#: gajim/common/const.py:285
 msgid "Having Lunch"
 msgstr "Ланч"
 
-#: gajim/common/const.py:253
+#: gajim/common/const.py:287
 msgid "Exercising"
 msgstr "Занимаюсь спортом"
 
-#: gajim/common/const.py:254 gajim/common/const.py:305
+#: gajim/common/const.py:288 gajim/common/const.py:339
 msgid "Cycling"
 msgstr "На велосипеде"
 
-#: gajim/common/const.py:255
+#: gajim/common/const.py:289
 msgid "Dancing"
 msgstr "Танцы"
 
-#: gajim/common/const.py:256
+#: gajim/common/const.py:290
 msgid "Hiking"
 msgstr "В походе"
 
-#: gajim/common/const.py:257
+#: gajim/common/const.py:291
 msgid "Jogging"
 msgstr "Пробежка"
 
-#: gajim/common/const.py:258
+#: gajim/common/const.py:292
 msgid "Playing Sports"
 msgstr "Спортивные игры"
 
-#: gajim/common/const.py:259
+#: gajim/common/const.py:293
 msgid "Running"
 msgstr "Бегу"
 
-#: gajim/common/const.py:260
+#: gajim/common/const.py:294
 msgid "Skiing"
 msgstr "Катаюсь на лыжах"
 
-#: gajim/common/const.py:261
+#: gajim/common/const.py:295
 msgid "Swimming"
 msgstr "Плаваю"
 
-#: gajim/common/const.py:262
+#: gajim/common/const.py:296
 msgid "Working out"
 msgstr "Тренировка"
 
-#: gajim/common/const.py:264
+#: gajim/common/const.py:298
 msgid "Grooming"
 msgstr "Уход за собой"
 
-#: gajim/common/const.py:265
+#: gajim/common/const.py:299
 msgid "At the Spa"
 msgstr "В spa салоне"
 
-#: gajim/common/const.py:266
+#: gajim/common/const.py:300
 msgid "Brushing Teeth"
 msgstr "Чищу зубы"
 
-#: gajim/common/const.py:267
+#: gajim/common/const.py:301
 msgid "Getting a Haircut"
 msgstr "Делаю прическу"
 
-#: gajim/common/const.py:268
+#: gajim/common/const.py:302
 msgid "Shaving"
 msgstr "Бреюсь"
 
-#: gajim/common/const.py:269
+#: gajim/common/const.py:303
 msgid "Taking a Bath"
 msgstr "Принимаю ванну"
 
-#: gajim/common/const.py:270
+#: gajim/common/const.py:304
 msgid "Taking a Shower"
 msgstr "Принимаю душ"
 
-#: gajim/common/const.py:272
+#: gajim/common/const.py:306
 msgid "Having an Appointment"
 msgstr "Встреча"
 
-#: gajim/common/const.py:274
+#: gajim/common/const.py:308
 msgid "Inactive"
 msgstr "Неактивен"
 
-#: gajim/common/const.py:275
+#: gajim/common/const.py:309
 msgid "Day Off"
 msgstr "Выходной день"
 
-#: gajim/common/const.py:276
+#: gajim/common/const.py:310
 msgid "Hanging out"
 msgstr "Гуляю"
 
-#: gajim/common/const.py:277
+#: gajim/common/const.py:311
 msgid "Hiding"
 msgstr "Прячусь"
 
-#: gajim/common/const.py:278
+#: gajim/common/const.py:312
 msgid "On Vacation"
 msgstr "В отпуске"
 
-#: gajim/common/const.py:279
+#: gajim/common/const.py:313
 msgid "Praying"
 msgstr "Молюсь"
 
-#: gajim/common/const.py:280
+#: gajim/common/const.py:314
 msgid "Scheduled Holiday"
 msgstr "Запланированный отпуск"
 
-#: gajim/common/const.py:282
+#: gajim/common/const.py:316
 msgid "Thinking"
 msgstr "Размышления"
 
-#: gajim/common/const.py:284
+#: gajim/common/const.py:318
 msgid "Relaxing"
 msgstr "Отдыхаю"
 
-#: gajim/common/const.py:285
+#: gajim/common/const.py:319
 msgid "Fishing"
 msgstr "Рыбалка"
 
-#: gajim/common/const.py:286
+#: gajim/common/const.py:320
 msgid "Gaming"
 msgstr "Играю"
 
-#: gajim/common/const.py:287
+#: gajim/common/const.py:321
 msgid "Going out"
 msgstr "Вышел"
 
-#: gajim/common/const.py:288
+#: gajim/common/const.py:322
 msgid "Partying"
 msgstr "На вечеринке"
 
-#: gajim/common/const.py:289
+#: gajim/common/const.py:323
 msgid "Reading"
 msgstr "Читаю"
 
-#: gajim/common/const.py:290
+#: gajim/common/const.py:324
 msgid "Rehearsing"
 msgstr "Репетиция"
 
-#: gajim/common/const.py:291
+#: gajim/common/const.py:325
 msgid "Shopping"
 msgstr "Покупки"
 
-#: gajim/common/const.py:292
+#: gajim/common/const.py:326
 msgid "Smoking"
 msgstr "Курю"
 
-#: gajim/common/const.py:293
+#: gajim/common/const.py:327
 msgid "Socializing"
 msgstr "Общаюсь"
 
-#: gajim/common/const.py:294
+#: gajim/common/const.py:328
 msgid "Sunbathing"
 msgstr "Загораю"
 
-#: gajim/common/const.py:295
+#: gajim/common/const.py:329
 msgid "Watching TV"
 msgstr "Смотрю ТВ"
 
-#: gajim/common/const.py:296
+#: gajim/common/const.py:330
 msgid "Watching a Movie"
 msgstr "Смотрю кино"
 
-#: gajim/common/const.py:298
+#: gajim/common/const.py:332
 msgid "Talking"
 msgstr "Разговариваю"
 
-#: gajim/common/const.py:299
+#: gajim/common/const.py:333
 msgid "In Real Life"
 msgstr "В реальной жизни"
 
-#: gajim/common/const.py:300
+#: gajim/common/const.py:334
 msgid "On the Phone"
 msgstr "Говорю по телефону"
 
-#: gajim/common/const.py:301
+#: gajim/common/const.py:335
 msgid "On Video Phone"
 msgstr "Говорю по видео телефону"
 
-#: gajim/common/const.py:303
+#: gajim/common/const.py:337
 msgid "Traveling"
 msgstr "Путешествую"
 
-#: gajim/common/const.py:304
+#: gajim/common/const.py:338
 msgid "Commuting"
 msgstr "Еду с работы/на работу"
 
-#: gajim/common/const.py:306
+#: gajim/common/const.py:340
 msgid "Driving"
 msgstr "Вождение"
 
-#: gajim/common/const.py:307
+#: gajim/common/const.py:341
 msgid "In a Car"
 msgstr "В машине"
 
-#: gajim/common/const.py:308
+#: gajim/common/const.py:342
 msgid "On a Bus"
 msgstr "В автобусе"
 
-#: gajim/common/const.py:309
+#: gajim/common/const.py:343
 msgid "On a Plane"
 msgstr "В самолёте"
 
-#: gajim/common/const.py:310
+#: gajim/common/const.py:344
 msgid "On a Train"
 msgstr "В поезде"
 
-#: gajim/common/const.py:311
+#: gajim/common/const.py:345
 msgid "On a Trip"
 msgstr "В поездке"
 
-#: gajim/common/const.py:312
+#: gajim/common/const.py:346
 msgid "Walking"
 msgstr "Прогулка"
 
-#: gajim/common/const.py:315
+#: gajim/common/const.py:349
 msgid "Coding"
 msgstr "Пишу программу"
 
-#: gajim/common/const.py:316
+#: gajim/common/const.py:350
 msgid "In a Meeting"
 msgstr "На совещании"
 
-#: gajim/common/const.py:317
+#: gajim/common/const.py:351
 msgid "Studying"
 msgstr "Учусь"
 
-#: gajim/common/const.py:318
+#: gajim/common/const.py:352
 msgid "Writing"
 msgstr "Пишу"
 
-#: gajim/common/const.py:321
+#: gajim/common/const.py:355
 msgid "Afraid"
 msgstr "Испуганный"
 
-#: gajim/common/const.py:322
+#: gajim/common/const.py:356
 msgid "Amazed"
 msgstr "Изумлённый"
 
-#: gajim/common/const.py:323
+#: gajim/common/const.py:357
 msgid "Amorous"
 msgstr "Влюбчивый"
 
-#: gajim/common/const.py:324
+#: gajim/common/const.py:358
 msgid "Angry"
 msgstr "Сердитый"
 
-#: gajim/common/const.py:325
+#: gajim/common/const.py:359
 msgid "Annoyed"
 msgstr "Раздражённый"
 
-#: gajim/common/const.py:326
+#: gajim/common/const.py:360
 msgid "Anxious"
 msgstr "Озабоченный"
 
-#: gajim/common/const.py:327
+#: gajim/common/const.py:361
 msgid "Aroused"
 msgstr "Возбуждённый"
 
-#: gajim/common/const.py:328
+#: gajim/common/const.py:362
 msgid "Ashamed"
 msgstr "Пристыженный"
 
-#: gajim/common/const.py:329
+#: gajim/common/const.py:363
 msgid "Bored"
 msgstr "Скучающий"
 
-#: gajim/common/const.py:330
+#: gajim/common/const.py:364
 msgid "Brave"
 msgstr "Храбрый"
 
-#: gajim/common/const.py:331
+#: gajim/common/const.py:365
 msgid "Calm"
 msgstr "Невозмутимый"
 
-#: gajim/common/const.py:332
+#: gajim/common/const.py:366
 msgid "Cautious"
 msgstr "Осторожный"
 
-#: gajim/common/const.py:333
+#: gajim/common/const.py:367
 msgid "Cold"
 msgstr "Мерзнущий"
 
-#: gajim/common/const.py:334
+#: gajim/common/const.py:368
 msgid "Confident"
 msgstr "Уверенный"
 
-#: gajim/common/const.py:335
+#: gajim/common/const.py:369
 msgid "Confused"
 msgstr "Смущенный"
 
-#: gajim/common/const.py:336
+#: gajim/common/const.py:370
 msgid "Contemplative"
 msgstr "Задумчивый"
 
-#: gajim/common/const.py:337
+#: gajim/common/const.py:371
 msgid "Contented"
 msgstr "Довольный"
 
-#: gajim/common/const.py:338
+#: gajim/common/const.py:372
 msgid "Cranky"
 msgstr "Раздражительный"
 
-#: gajim/common/const.py:339
+#: gajim/common/const.py:373
 msgid "Crazy"
 msgstr "Сумасшедший"
 
-#: gajim/common/const.py:340
+#: gajim/common/const.py:374
 msgid "Creative"
 msgstr "Творческий"
 
-#: gajim/common/const.py:341
+#: gajim/common/const.py:375
 msgid "Curious"
 msgstr "Любознательный"
 
-#: gajim/common/const.py:342
+#: gajim/common/const.py:376
 msgid "Dejected"
 msgstr "Удрученный"
 
-#: gajim/common/const.py:343
+#: gajim/common/const.py:377
 msgid "Depressed"
 msgstr "Подавленный"
 
-#: gajim/common/const.py:344
+#: gajim/common/const.py:378
 msgid "Disappointed"
 msgstr "Разочарованный"
 
-#: gajim/common/const.py:345
+#: gajim/common/const.py:379
 msgid "Disgusted"
 msgstr "Чувствующий отвращение"
 
-#: gajim/common/const.py:346
+#: gajim/common/const.py:380
 msgid "Dismayed"
 msgstr "Потрясенный"
 
-#: gajim/common/const.py:347
+#: gajim/common/const.py:381
 msgid "Distracted"
 msgstr "Растерянный"
 
-#: gajim/common/const.py:348
+#: gajim/common/const.py:382
 msgid "Embarrassed"
 msgstr "Смущенный"
 
-#: gajim/common/const.py:349
+#: gajim/common/const.py:383
 msgid "Envious"
 msgstr "Завистливый"
 
-#: gajim/common/const.py:350
+#: gajim/common/const.py:384
 msgid "Excited"
 msgstr "Взволнованный"
 
-#: gajim/common/const.py:351
+#: gajim/common/const.py:385
 msgid "Flirtatious"
 msgstr "Кокетливый"
 
-#: gajim/common/const.py:352
+#: gajim/common/const.py:386
 msgid "Frustrated"
 msgstr "Неудовлетворенный"
 
-#: gajim/common/const.py:353
+#: gajim/common/const.py:387
 msgid "Grateful"
 msgstr "Признательный"
 
-#: gajim/common/const.py:354
+#: gajim/common/const.py:388
 msgid "Grieving"
 msgstr "Скорбящий"
 
-#: gajim/common/const.py:355
+#: gajim/common/const.py:389
 msgid "Grumpy"
 msgstr "Сердитый"
 
-#: gajim/common/const.py:356
+#: gajim/common/const.py:390
 msgid "Guilty"
 msgstr "Виноватый"
 
-#: gajim/common/const.py:357
+#: gajim/common/const.py:391
 msgid "Happy"
 msgstr "Счастливый"
 
-#: gajim/common/const.py:358
+#: gajim/common/const.py:392
 msgid "Hopeful"
 msgstr "Надеющийся"
 
-#: gajim/common/const.py:359
+#: gajim/common/const.py:393
 msgid "Hot"
 msgstr "Жарко"
 
-#: gajim/common/const.py:360
+#: gajim/common/const.py:394
 msgid "Humbled"
 msgstr "Скромный"
 
-#: gajim/common/const.py:361
+#: gajim/common/const.py:395
 msgid "Humiliated"
 msgstr "Униженный"
 
-#: gajim/common/const.py:362
+#: gajim/common/const.py:396
 msgid "Hungry"
 msgstr "Голодный"
 
-#: gajim/common/const.py:363
+#: gajim/common/const.py:397
 msgid "Hurt"
 msgstr "Раненый"
 
-#: gajim/common/const.py:364
+#: gajim/common/const.py:398
 msgid "Impressed"
 msgstr "Впечатлённый"
 
-#: gajim/common/const.py:365
+#: gajim/common/const.py:399
 msgid "In Awe"
 msgstr "Благоговеющий"
 
-#: gajim/common/const.py:366
+#: gajim/common/const.py:400
 msgid "In Love"
 msgstr "Влюблённый"
 
-#: gajim/common/const.py:367
+#: gajim/common/const.py:401
 msgid "Indignant"
 msgstr "Возмущённый"
 
-#: gajim/common/const.py:368
+#: gajim/common/const.py:402
 msgid "Interested"
 msgstr "Заинтересованный"
 
-#: gajim/common/const.py:369
+#: gajim/common/const.py:403
 msgid "Intoxicated"
 msgstr "Пьяный"
 
-#: gajim/common/const.py:370
+#: gajim/common/const.py:404
 msgid "Invincible"
 msgstr "Непобедимый"
 
-#: gajim/common/const.py:371
+#: gajim/common/const.py:405
 msgid "Jealous"
 msgstr "Ревнивый"
 
-#: gajim/common/const.py:372
+#: gajim/common/const.py:406
 msgid "Lonely"
 msgstr "Одинокий"
 
-#: gajim/common/const.py:373
+#: gajim/common/const.py:407
 msgid "Lost"
 msgstr "Потерянный"
 
-#: gajim/common/const.py:374
+#: gajim/common/const.py:408
 msgid "Lucky"
 msgstr "Удачливый"
 
-#: gajim/common/const.py:375
+#: gajim/common/const.py:409
 msgid "Mean"
 msgstr "Подлый"
 
-#: gajim/common/const.py:376
+#: gajim/common/const.py:410
 msgid "Moody"
 msgstr "Капризный"
 
-#: gajim/common/const.py:377
+#: gajim/common/const.py:411
 msgid "Nervous"
 msgstr "Нервный"
 
-#: gajim/common/const.py:378
+#: gajim/common/const.py:412
 msgid "Neutral"
 msgstr "Нейтральный"
 
-#: gajim/common/const.py:379
+#: gajim/common/const.py:413
 msgid "Offended"
 msgstr "Обиженный"
 
-#: gajim/common/const.py:380
+#: gajim/common/const.py:414
 msgid "Outraged"
 msgstr "Оскорбленный"
 
-#: gajim/common/const.py:381
+#: gajim/common/const.py:415
 msgid "Playful"
 msgstr "Игривый"
 
-#: gajim/common/const.py:382
+#: gajim/common/const.py:416
 msgid "Proud"
 msgstr "Гордый"
 
-#: gajim/common/const.py:383
+#: gajim/common/const.py:417
 msgid "Relaxed"
 msgstr "Расслабленный"
 
-#: gajim/common/const.py:384
+#: gajim/common/const.py:418
 msgid "Relieved"
 msgstr "Облегчённый"
 
-#: gajim/common/const.py:385
+#: gajim/common/const.py:419
 msgid "Remorseful"
 msgstr "Раскаявшийся"
 
-#: gajim/common/const.py:386
+#: gajim/common/const.py:420
 msgid "Restless"
 msgstr "Неугомонный"
 
-#: gajim/common/const.py:387
+#: gajim/common/const.py:421
 msgid "Sad"
 msgstr "Грустный"
 
-#: gajim/common/const.py:388
+#: gajim/common/const.py:422
 msgid "Sarcastic"
 msgstr "Язвительный"
 
-#: gajim/common/const.py:389
+#: gajim/common/const.py:423
 msgid "Satisfied"
 msgstr "Удовлетворенный"
 
-#: gajim/common/const.py:390
+#: gajim/common/const.py:424
 msgid "Serious"
 msgstr "Серьёзный"
 
-#: gajim/common/const.py:391
+#: gajim/common/const.py:425
 msgid "Shocked"
 msgstr "Шокированный"
 
-#: gajim/common/const.py:392
+#: gajim/common/const.py:426
 msgid "Shy"
 msgstr "Застенчивый"
 
-#: gajim/common/const.py:393
+#: gajim/common/const.py:427
 msgid "Sick"
 msgstr "Больной"
 
-#: gajim/common/const.py:394
+#: gajim/common/const.py:428
 msgid "Sleepy"
 msgstr "Сонный"
 
-#: gajim/common/const.py:395
+#: gajim/common/const.py:429
 msgid "Spontaneous"
 msgstr "Спонтанный"
 
-#: gajim/common/const.py:396
+#: gajim/common/const.py:430
 msgid "Stressed"
 msgstr "Напряженный"
 
-#: gajim/common/const.py:397
+#: gajim/common/const.py:431
 msgid "Strong"
 msgstr "Сильный"
 
-#: gajim/common/const.py:398
+#: gajim/common/const.py:432
 msgid "Surprised"
 msgstr "Удивлённый"
 
-#: gajim/common/const.py:399
+#: gajim/common/const.py:433
 msgid "Thankful"
 msgstr "Благодарный"
 
-#: gajim/common/const.py:400
+#: gajim/common/const.py:434
 msgid "Thirsty"
 msgstr "Жаждущий"
 
-#: gajim/common/const.py:401
+#: gajim/common/const.py:435
 msgid "Tired"
 msgstr "Усталый"
 
-#: gajim/common/const.py:402
+#: gajim/common/const.py:436
 msgid "Undefined"
 msgstr "Неопределенный"
 
-#: gajim/common/const.py:403
+#: gajim/common/const.py:437
 msgid "Weak"
 msgstr "Слабый"
 
-#: gajim/common/const.py:404
+#: gajim/common/const.py:438
 msgid "Worried"
 msgstr "Волнующийся"
 
-#: gajim/common/const.py:408
+#: gajim/common/const.py:442
 #, fuzzy
 msgid "accuracy"
 msgstr "Точность значения"
 
-#: gajim/common/const.py:409
+#: gajim/common/const.py:443
 msgid "alt"
 msgstr "высота"
 
-#: gajim/common/const.py:410
+#: gajim/common/const.py:444
 msgid "area"
 msgstr "район"
 
-#: gajim/common/const.py:411
+#: gajim/common/const.py:445
 msgid "bearing"
 msgstr "направление"
 
-#: gajim/common/const.py:412
+#: gajim/common/const.py:446
 msgid "building"
 msgstr "строение"
 
-#: gajim/common/const.py:413
+#: gajim/common/const.py:447
 msgid "country"
 msgstr "страна"
 
-#: gajim/common/const.py:414
+#: gajim/common/const.py:448
 msgid "countrycode"
 msgstr "код страны"
 
-#: gajim/common/const.py:415
+#: gajim/common/const.py:449
 msgid "datum"
 msgstr ""
 
-#: gajim/common/const.py:416
+#: gajim/common/const.py:450
 msgid "description"
 msgstr "описание"
 
-#: gajim/common/const.py:417
+#: gajim/common/const.py:451
 #, fuzzy
 msgid "error"
 msgstr "error"
 
-#: gajim/common/const.py:418
+#: gajim/common/const.py:452
 msgid "floor"
 msgstr "этаж"
 
-#: gajim/common/const.py:419
+#: gajim/common/const.py:453
 msgid "lat"
 msgstr "широта"
 
-#: gajim/common/const.py:420
+#: gajim/common/const.py:454
 msgid "locality"
 msgstr "населенный пункт"
 
-#: gajim/common/const.py:421
+#: gajim/common/const.py:455
 msgid "lon"
 msgstr "долгота"
 
-#: gajim/common/const.py:422
+#: gajim/common/const.py:456
 msgid "postalcode"
 msgstr "индекс"
 
-#: gajim/common/const.py:423
+#: gajim/common/const.py:457
 msgid "region"
 msgstr "область"
 
-#: gajim/common/const.py:424
+#: gajim/common/const.py:458
 msgid "room"
 msgstr "комната"
 
-#: gajim/common/const.py:425
+#: gajim/common/const.py:459
 msgid "speed"
 msgstr "скорость"
 
-#: gajim/common/const.py:426
+#: gajim/common/const.py:460
 msgid "street"
 msgstr "улица"
 
-#: gajim/common/const.py:427
+#: gajim/common/const.py:461
 msgid "text"
 msgstr "текст"
 
-#: gajim/common/const.py:428
+#: gajim/common/const.py:462
 msgid "timestamp"
 msgstr "время установки"
 
-#: gajim/common/const.py:429
+#: gajim/common/const.py:463
 msgid "URI"
 msgstr ""
 
-#: gajim/common/const.py:434
+#: gajim/common/const.py:468
 msgid "Unable to get issuer certificate"
 msgstr "Не удалось получить сертификат издателя"
 
-#: gajim/common/const.py:435
+#: gajim/common/const.py:469
 msgid "Unable to get certificate CRL"
 msgstr "Не удалось получить сертификат CRL"
 
-#: gajim/common/const.py:436
+#: gajim/common/const.py:470
 msgid "Unable to decrypt certificate's signature"
 msgstr "Не удалось расшифровать подпись сертификата"
 
-#: gajim/common/const.py:437
+#: gajim/common/const.py:471
 msgid "Unable to decrypt CRL's signature"
 msgstr "Не удалось расшифровать подпись CRL"
 
-#: gajim/common/const.py:438
+#: gajim/common/const.py:472
 msgid "Unable to decode issuer public key"
 msgstr "Не удалось расшифровать открытый ключ издателя"
 
-#: gajim/common/const.py:439
+#: gajim/common/const.py:473
 msgid "Certificate signature failure"
 msgstr "Ошибка подписи сертификата"
 
-#: gajim/common/const.py:440
+#: gajim/common/const.py:474
 msgid "CRL signature failure"
 msgstr "Ошибка подписи CRL"
 
-#: gajim/common/const.py:441
+#: gajim/common/const.py:475
 msgid "Certificate is not yet valid"
 msgstr "Сертификат ещё не действителен"
 
-#: gajim/common/const.py:442
+#: gajim/common/const.py:476
 msgid "Certificate has expired"
 msgstr "Сертификат просрочен"
 
-#: gajim/common/const.py:443
+#: gajim/common/const.py:477
 msgid "CRL is not yet valid"
 msgstr "CRL ещё не действителен"
 
-#: gajim/common/const.py:444
+#: gajim/common/const.py:478
 msgid "CRL has expired"
 msgstr "CRL просрочен"
 
-#: gajim/common/const.py:445
+#: gajim/common/const.py:479
 msgid "Format error in certificate's notBefore field"
 msgstr "Ошибка в поле notBefore сертификата"
 
-#: gajim/common/const.py:446
+#: gajim/common/const.py:480
 msgid "Format error in certificate's notAfter field"
 msgstr "Ошибка в поле notAfter сертификата"
 
-#: gajim/common/const.py:447
+#: gajim/common/const.py:481
 msgid "Format error in CRL's lastUpdate field"
 msgstr "Ошибка в поле «lastUpdate» CRL"
 
-#: gajim/common/const.py:448
+#: gajim/common/const.py:482
 msgid "Format error in CRL's nextUpdate field"
 msgstr "Ошибка в поле «nextUpdate» CRL"
 
-#: gajim/common/const.py:449
+#: gajim/common/const.py:483
 msgid "Out of memory"
 msgstr "Недостаточно памяти"
 
-#: gajim/common/const.py:450
+#: gajim/common/const.py:484
 msgid "Self signed certificate"
 msgstr "Сертификат подписан самим владельцем."
 
-#: gajim/common/const.py:451
+#: gajim/common/const.py:485
 msgid "Self signed certificate in certificate chain"
 msgstr "Самостоятельно подписанный сертификат в цепочке сертификатов"
 
-#: gajim/common/const.py:452
+#: gajim/common/const.py:486
 msgid "Unable to get local issuer certificate"
 msgstr "Не удалось получить сертификат локального издателя"
 
-#: gajim/common/const.py:453
+#: gajim/common/const.py:487
 msgid "Unable to verify the first certificate"
 msgstr "Не удалось подтвердить первый сертификат"
 
-#: gajim/common/const.py:454
+#: gajim/common/const.py:488
 msgid "Certificate chain too long"
 msgstr "Цепочка сертификатов слишком длинная"
 
-#: gajim/common/const.py:455
+#: gajim/common/const.py:489
 msgid "Certificate revoked"
 msgstr "Сертификат аннулирован"
 
-#: gajim/common/const.py:456
+#: gajim/common/const.py:490
 msgid "Invalid CA certificate"
 msgstr "Недопустимый сертификат CA"
 
-#: gajim/common/const.py:457
+#: gajim/common/const.py:491
 msgid "Path length constraint exceeded"
 msgstr "Превышено ограничение по длине пути"
 
-#: gajim/common/const.py:458
+#: gajim/common/const.py:492
 msgid "Unsupported certificate purpose"
 msgstr "Неподдерживаемое назначение сертификата"
 
-#: gajim/common/const.py:459
+#: gajim/common/const.py:493
 msgid "Certificate not trusted"
 msgstr "Сертификат не является доверенным"
 
-#: gajim/common/const.py:460
+#: gajim/common/const.py:494
 msgid "Certificate rejected"
 msgstr "Сертификат отклонен"
 
-#: gajim/common/const.py:461
+#: gajim/common/const.py:495
 msgid "Subject issuer mismatch"
 msgstr "Несоответствие поставщика сертификата"
 
-#: gajim/common/const.py:462
+#: gajim/common/const.py:496
 msgid "Authority and subject key identifier mismatch"
 msgstr "Идентификаторы ключа центра сертификации и владельца не совпадают"
 
-#: gajim/common/const.py:463
+#: gajim/common/const.py:497
 msgid "Authority and issuer serial number mismatch"
 msgstr "Идентификаторы ключа центра сертификации и издателя не совпадают"
 
-#: gajim/common/const.py:464
+#: gajim/common/const.py:498
 msgid "Key usage does not include certificate signing"
 msgstr "Назначение ключа не включает подписывание сертификата"
 
-#: gajim/common/const.py:465
+#: gajim/common/const.py:499
 msgid "Application verification failure"
 msgstr "Ошибка при проверке приложения"
 
@@ -5136,200 +5300,200 @@ msgstr "видео вход"
 msgid "video output"
 msgstr "видео выход"
 
-#: gajim/common/helpers.py:210
+#: gajim/common/helpers.py:216
 #, fuzzy
 msgid "Server must be between 1 and 1023 bytes"
 msgstr "Имя сервера должно быть от 1 до 1023 символов"
 
-#: gajim/common/helpers.py:214
+#: gajim/common/helpers.py:220
 msgid "Invalid character in hostname."
 msgstr "Неверный символ в имени сервера"
 
-#: gajim/common/helpers.py:216
+#: gajim/common/helpers.py:222
 msgid "Server address required."
 msgstr "Требуется адрес сервера."
 
-#: gajim/common/helpers.py:220
+#: gajim/common/helpers.py:226
 #, fuzzy
 msgid "Username must be between 1 and 1023 bytes"
 msgstr "Имя должно быть от 1 до 1023 символов"
 
-#: gajim/common/helpers.py:224
+#: gajim/common/helpers.py:230
 msgid "Invalid character in username."
 msgstr "Неверный символ в имени пользователя."
 
-#: gajim/common/helpers.py:230
+#: gajim/common/helpers.py:236
 #, fuzzy
 msgid "Resource must be between 1 and 1023 bytes"
 msgstr "Имя ресурса должно быть от 1 до 1023 символов"
 
-#: gajim/common/helpers.py:234
+#: gajim/common/helpers.py:240
 msgid "Invalid character in resource."
 msgstr "Неверный символ в ресурсе"
 
-#: gajim/common/helpers.py:275
+#: gajim/common/helpers.py:281
 msgid "_Busy"
 msgstr "_Занят"
 
-#: gajim/common/helpers.py:277 gajim/gtk/tooltips.py:647
+#: gajim/common/helpers.py:283 gajim/gtk/tooltips.py:647
 msgid "Busy"
 msgstr "Занят"
 
-#: gajim/common/helpers.py:280
+#: gajim/common/helpers.py:286
 msgid "_Not Available"
 msgstr "_Недоступен"
 
-#: gajim/common/helpers.py:282 gajim/gtk/tooltips.py:649
+#: gajim/common/helpers.py:288 gajim/gtk/tooltips.py:649
 msgid "Not Available"
 msgstr "Недоступен"
 
-#: gajim/common/helpers.py:285
+#: gajim/common/helpers.py:291
 msgid "_Free for Chat"
 msgstr "_Готов поболтать"
 
-#: gajim/common/helpers.py:287 gajim/gtk/tooltips.py:643
+#: gajim/common/helpers.py:293 gajim/gtk/tooltips.py:643
 msgid "Free for Chat"
 msgstr "Готов поболтать"
 
-#: gajim/common/helpers.py:290
+#: gajim/common/helpers.py:296
 msgid "?user status:_Available"
 msgstr "Д_оступен"
 
-#: gajim/common/helpers.py:292 gajim/gtk/tooltips.py:641
+#: gajim/common/helpers.py:298 gajim/gtk/tooltips.py:641
 msgid "?user status:Available"
 msgstr "Доступен"
 
-#: gajim/common/helpers.py:294
+#: gajim/common/helpers.py:300
 msgid "Connecting"
 msgstr "Соединяюсь"
 
-#: gajim/common/helpers.py:297 gajim/data/gui/preferences_window.ui:1251
+#: gajim/common/helpers.py:303 gajim/data/gui/preferences_window.ui:1251
 msgid "A_way"
 msgstr "_Ушел"
 
-#: gajim/common/helpers.py:299 gajim/common/modules/adhoc_commands.py:120
-#: gajim/command_system/implementation/standard.py:139
+#: gajim/common/helpers.py:305 gajim/common/modules/adhoc_commands.py:120
+#: gajim/command_system/implementation/standard.py:141
 #: gajim/gtk/tooltips.py:645
 msgid "Away"
 msgstr "Ушел"
 
-#: gajim/common/helpers.py:302
+#: gajim/common/helpers.py:308
 msgid "_Offline"
 msgstr "_Отключен"
 
-#: gajim/common/helpers.py:304 gajim/gtk/tooltips.py:651
+#: gajim/common/helpers.py:310 gajim/gtk/tooltips.py:651
 msgid "Offline"
 msgstr "Отключен"
 
-#: gajim/common/helpers.py:307
+#: gajim/common/helpers.py:313
 msgid "_Invisible"
 msgstr "_Невидимка"
 
-#: gajim/common/helpers.py:313
+#: gajim/common/helpers.py:319
 msgid "?contact has status:Unknown"
 msgstr "Неизвестен"
 
-#: gajim/common/helpers.py:315
+#: gajim/common/helpers.py:321
 msgid "?contact has status:Has errors"
 msgstr "Ошибка"
 
-#: gajim/common/helpers.py:330
+#: gajim/common/helpers.py:336
 msgid "?Subscription we already have:None"
 msgstr "Нет"
 
-#: gajim/common/helpers.py:332
+#: gajim/common/helpers.py:338
 msgid "To"
 msgstr "К"
 
-#: gajim/common/helpers.py:334 gajim/data/gui/groups_post_window.ui:33
+#: gajim/common/helpers.py:340 gajim/data/gui/groups_post_window.ui:33
 msgid "From"
 msgstr "От"
 
-#: gajim/common/helpers.py:336
+#: gajim/common/helpers.py:342
 msgid "Both"
 msgstr "Оба"
 
-#: gajim/common/helpers.py:338 gajim/gtk/server_info.py:151
+#: gajim/common/helpers.py:344 gajim/gtk/server_info.py:151
 #, fuzzy
 msgid "Unknown"
 msgstr "Неизвестна"
 
-#: gajim/common/helpers.py:344
+#: gajim/common/helpers.py:350
 msgid "?Ask (for Subscription):None"
 msgstr "Нет"
 
-#: gajim/common/helpers.py:346
+#: gajim/common/helpers.py:352
 msgid "Subscribe"
 msgstr "Подписаться"
 
-#: gajim/common/helpers.py:355
+#: gajim/common/helpers.py:361
 msgid "?Group Chat Contact Role:None"
 msgstr "Отсутствует"
 
-#: gajim/common/helpers.py:358
+#: gajim/common/helpers.py:364
 msgid "Moderators"
 msgstr "Модераторы"
 
-#: gajim/common/helpers.py:360
+#: gajim/common/helpers.py:366
 msgid "Moderator"
 msgstr "Модератор"
 
-#: gajim/common/helpers.py:363
+#: gajim/common/helpers.py:369 gajim/data/gui/groupchat_info_scrolled.ui:243
 msgid "Participants"
 msgstr "Участники"
 
-#: gajim/common/helpers.py:365
+#: gajim/common/helpers.py:371
 msgid "Participant"
 msgstr "Участник"
 
-#: gajim/common/helpers.py:368
+#: gajim/common/helpers.py:374
 msgid "Visitors"
 msgstr "Посетители"
 
-#: gajim/common/helpers.py:370
+#: gajim/common/helpers.py:376
 msgid "Visitor"
 msgstr "Посетитель"
 
-#: gajim/common/helpers.py:376 gajim/gtk/tooltips.py:253
+#: gajim/common/helpers.py:382 gajim/gtk/tooltips.py:253
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "?Group Chat Contact Affiliation:Отсутствует"
 
-#: gajim/common/helpers.py:378 gajim/data/gui/groupchat_config.ui:32
+#: gajim/common/helpers.py:384 gajim/data/gui/groupchat_config.ui:32
 #: gajim/gtk/tooltips.py:259
 msgid "Owner"
 msgstr "Владелец"
 
-#: gajim/common/helpers.py:380 gajim/gtk/tooltips.py:257
+#: gajim/common/helpers.py:386 gajim/gtk/tooltips.py:257
 msgid "Administrator"
 msgstr "Администратор"
 
-#: gajim/common/helpers.py:382 gajim/data/gui/groupchat_config.ui:40
+#: gajim/common/helpers.py:388 gajim/data/gui/groupchat_config.ui:40
 #: gajim/gtk/tooltips.py:255 gajim/gtk/groupchat_config.py:105
 msgid "Member"
 msgstr "Участник"
 
-#: gajim/common/helpers.py:421
+#: gajim/common/helpers.py:427
 msgid "is paying attention to the conversation"
 msgstr "читает сообщение"
 
-#: gajim/common/helpers.py:423
+#: gajim/common/helpers.py:429
 msgid "is doing something else"
 msgstr "занят чем-то еще"
 
-#: gajim/common/helpers.py:425
+#: gajim/common/helpers.py:431
 #, fuzzy
 msgid "is composing a message…"
 msgstr "печатает сообщение..."
 
-#: gajim/common/helpers.py:428
+#: gajim/common/helpers.py:434
 msgid "paused composing a message"
 msgstr "перестал печатать сообщение"
 
-#: gajim/common/helpers.py:430
+#: gajim/common/helpers.py:436
 msgid "has closed the chat window or tab"
 msgstr "закрыл окно чата или вкладку"
 
-#: gajim/common/helpers.py:936 gajim/common/helpers.py:943
+#: gajim/common/helpers.py:942 gajim/common/helpers.py:949
 #, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
@@ -5337,22 +5501,22 @@ msgstr[0] "%d пропущенное сообщение"
 msgstr[1] "%d пропущенных сообщения"
 msgstr[2] "%d пропущенных сообщений"
 
-#: gajim/common/helpers.py:950
-#, fuzzy, python-format
-msgid "from room %s"
-msgstr " в комнате %s"
+#: gajim/common/helpers.py:956
+#, python-format
+msgid "from group chat %s"
+msgstr "в комнатах %s"
 
-#: gajim/common/helpers.py:953 gajim/common/helpers.py:970
+#: gajim/common/helpers.py:959 gajim/common/helpers.py:976
 #, fuzzy, python-format
 msgid "from user %s"
 msgstr " от пользователя %s"
 
-#: gajim/common/helpers.py:955
+#: gajim/common/helpers.py:961
 #, fuzzy, python-format
 msgid "from %s"
 msgstr " от %s"
 
-#: gajim/common/helpers.py:962 gajim/common/helpers.py:968
+#: gajim/common/helpers.py:968 gajim/common/helpers.py:974
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
@@ -5360,39 +5524,39 @@ msgstr[0] "%d событие пропущено"
 msgstr[1] "%d события пропущено"
 msgstr[2] "%d событий пропущено"
 
-#: gajim/common/helpers.py:986 gajim/common/helpers.py:998
+#: gajim/common/helpers.py:992 gajim/common/helpers.py:1004
 #: gajim/data/gui/roster_window.ui:85 data/org.gajim.Gajim.desktop.in:4
 #: data/org.gajim.Gajim.appdata.xml.in:9
 msgid "Gajim"
 msgstr "Gajim"
 
-#: gajim/common/helpers.py:1000
+#: gajim/common/helpers.py:1006
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim — %s"
 
-#: gajim/common/helpers.py:1109 gajim/data/gui/add_new_contact_window.ui:25
+#: gajim/common/helpers.py:1115 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:1111
+#: gajim/common/helpers.py:1117
 msgid "Hello, I am $name."
 msgstr "Привет, я $name."
 
-#: gajim/common/helpers.py:1215 gajim/common/helpers.py:1224
-#: gajim/common/helpers.py:1282
+#: gajim/common/helpers.py:1221 gajim/common/helpers.py:1230
+#: gajim/common/helpers.py:1288
 msgid "Timeout loading image"
 msgstr "Не могу загрузить изображение"
 
-#: gajim/common/helpers.py:1234 gajim/common/helpers.py:1280
+#: gajim/common/helpers.py:1240 gajim/common/helpers.py:1286
 msgid "Image is too big"
 msgstr "Изображение слишком большое"
 
-#: gajim/common/helpers.py:1245
+#: gajim/common/helpers.py:1251
 msgid "PyCURL is not installed"
 msgstr "PyCURL не установлен"
 
-#: gajim/common/helpers.py:1284
+#: gajim/common/helpers.py:1290
 msgid "Error loading image"
 msgstr "Ошибка загрузки изображения"
 
@@ -5572,7 +5736,8 @@ msgstr "Статус изменён."
 
 #: gajim/common/modules/adhoc_commands.py:202
 #: gajim/common/modules/adhoc_commands.py:239
-msgid "Leave Groupchats"
+#, fuzzy
+msgid "Leave Group Chats"
 msgstr "Покинуть конференции"
 
 #: gajim/common/modules/adhoc_commands.py:228
@@ -5581,15 +5746,18 @@ msgid "%(nickname)s on %(room_jid)s"
 msgstr "%(nickname)s из комнаты %(room_jid)s"
 
 #: gajim/common/modules/adhoc_commands.py:232
-msgid "You have not joined a groupchat."
+#, fuzzy
+msgid "You have not joined a group chat."
 msgstr "Вы не вошли в комнату."
 
 #: gajim/common/modules/adhoc_commands.py:240
-msgid "Choose the groupchats you want to leave"
+#, fuzzy
+msgid "Choose the group chats you want to leave"
 msgstr "Выберите конференции, которые вы хотите покинуть"
 
 #: gajim/common/modules/adhoc_commands.py:289
-msgid "You left the following groupchats:"
+#, fuzzy
+msgid "You left the following group chats:"
 msgstr "Вы покинули следующие комнаты:"
 
 #: gajim/common/modules/roster_item_exchange.py:102
@@ -5605,7 +5773,7 @@ msgstr "Контакты для отправки:"
 msgid "Blocked Contacts"
 msgstr "Заблокированные контакты"
 
-#: gajim/data/gui/destroy_muc_dialog.ui:79 gajim/gtk/dialogs.py:736
+#: gajim/data/gui/destroy_muc_dialog.ui:79 gajim/gtk/dialogs.py:563
 msgid "Destroy this group chat permanently?"
 msgstr ""
 
@@ -5614,7 +5782,7 @@ msgstr ""
 msgid "Reason..."
 msgstr "Причина"
 
-#: gajim/data/gui/destroy_muc_dialog.ui:124 gajim/gtk/dialogs.py:738
+#: gajim/data/gui/destroy_muc_dialog.ui:124 gajim/gtk/dialogs.py:565
 msgid "Where participants should go (optional)"
 msgstr ""
 
@@ -5627,34 +5795,6 @@ msgstr ""
 msgid "_Reason and alternate venue (optional)"
 msgstr "Можете указать альтернативную комнату:"
 
-#: gajim/data/gui/advanced_configuration_window.ui:7
-#: gajim/data/gui/preferences_window.ui:2723
-#, fuzzy
-msgid "Advanced Configuration Editor (ACE)"
-msgstr "Расширенный редактор настроек"
-
-#: gajim/data/gui/advanced_configuration_window.ui:52
-#, fuzzy
-msgid "You should restart Gajim for some changes to take effect"
-msgstr ""
-"<b>ПРИМЕЧАНИЕ:</b> Необходимо перезапустить Gajim, чтобы некоторые настройки "
-"вступили в силу"
-
-#: gajim/data/gui/advanced_configuration_window.ui:84
-#, fuzzy
-msgid "_Filter"
-msgstr "Фильтр:"
-
-#: gajim/data/gui/advanced_configuration_window.ui:153
-#: gajim/data/gui/filetransfers_send_file_dialog.ui:15
-#: gajim/gtk/discovery.py:1666
-msgid "Description"
-msgstr "Описание"
-
-#: gajim/data/gui/advanced_configuration_window.ui:197
-msgid "_Reset to default"
-msgstr "_Сбросить до исходных"
-
 #: gajim/data/gui/join_groupchat_window.ui:56
 #: gajim/data/gui/chat_to_muc_window.ui:67
 #: gajim/data/gui/chat_to_muc_window.ui:78
@@ -5666,9 +5806,8 @@ msgid "Join group chat every time Gajim is started"
 msgstr ""
 
 #: gajim/data/gui/join_groupchat_window.ui:113
-#, fuzzy
-msgid "Auto Join"
-msgstr "_Автоматическое присоединение"
+msgid "Join Automatically"
+msgstr ""
 
 #: gajim/data/gui/join_groupchat_window.ui:131
 #: gajim/data/gui/profile_window.ui:233
@@ -5677,10 +5816,11 @@ msgstr "Учетные записи"
 
 #: gajim/data/gui/join_groupchat_window.ui:147
 #, fuzzy
-msgid "Room"
-msgstr "Комната:"
+msgid "Group chat"
+msgstr "Комнаты"
 
-#: gajim/data/gui/join_groupchat_window.ui:180 gajim/gtk/accounts.py:886
+#: gajim/data/gui/join_groupchat_window.ui:180 gajim/data/gui/bookmarks.ui:158
+#: gajim/gtk/accounts.py:889
 #, fuzzy
 msgid "Password"
 msgstr "Пароль:"
@@ -5705,90 +5845,11 @@ msgstr "в _комнатах"
 msgid "Search group chats on selected server"
 msgstr "Искать комнаты на этом сервере"
 
-#: gajim/data/gui/join_groupchat_window.ui:437 gajim/gtk/discovery.py:1271
+#: gajim/data/gui/join_groupchat_window.ui:437 gajim/gtk/discovery.py:1270
 #, fuzzy
 msgid "Join"
 msgstr "_Присоединиться"
 
-#: gajim/data/gui/manage_proxies_window.ui:12
-msgid "HTTP Connect"
-msgstr "Соединение HTTP"
-
-#: gajim/data/gui/manage_proxies_window.ui:15
-msgid "SOCKS5"
-msgstr "SOCKS5"
-
-#: gajim/data/gui/manage_proxies_window.ui:18
-msgid "BOSH"
-msgstr "BOSH"
-
-#: gajim/data/gui/manage_proxies_window.ui:27
-msgid "Manage Proxy Profiles"
-msgstr "Управление профилями прокси"
-
-#: gajim/data/gui/manage_proxies_window.ui:83
-#, fuzzy
-msgid "Add Proxy"
-msgstr "Прокси:"
-
-#: gajim/data/gui/manage_proxies_window.ui:97
-#, fuzzy
-msgid "Remove Proxy"
-msgstr "Удалить группу"
-
-#: gajim/data/gui/manage_proxies_window.ui:141
-#, fuzzy
-msgid "Properties"
-msgstr "<b>Свойства</b>"
-
-#: gajim/data/gui/manage_proxies_window.ui:157
-#, fuzzy
-msgid "_Name"
-msgstr "_Имя: "
-
-#: gajim/data/gui/manage_proxies_window.ui:173
-#, fuzzy
-msgid "_Type"
-msgstr "_Тип:"
-
-#: gajim/data/gui/manage_proxies_window.ui:236
-#, fuzzy
-msgid "_BOSH URL"
-msgstr "URL _BOSH:"
-
-#: gajim/data/gui/manage_proxies_window.ui:261
-msgid "Use HTTP prox_y"
-msgstr "Использовать про_кси HTTP"
-
-#: gajim/data/gui/manage_proxies_window.ui:280
-#, fuzzy
-msgid "Proxy _Host"
-msgstr "Хост прокси:"
-
-#: gajim/data/gui/manage_proxies_window.ui:307
-#, fuzzy
-msgid "Proxy _Port"
-msgstr "_Порт прокси:"
-
-#: gajim/data/gui/manage_proxies_window.ui:334
-#, fuzzy
-msgid "_Username"
-msgstr "_Имя пользователя:"
-
-#: gajim/data/gui/manage_proxies_window.ui:347
-msgid "Use proxy auth_entication"
-msgstr "Использовать прокси аут_ентификацию"
-
-#: gajim/data/gui/manage_proxies_window.ui:377
-#, fuzzy
-msgid "Pass_word"
-msgstr "П_ароль"
-
-#: gajim/data/gui/manage_proxies_window.ui:405 gajim/gtk/adhoc.py:321
-#, fuzzy
-msgid "Settings"
-msgstr "Сочетания клавиш в чате"
-
 #: gajim/data/gui/change_password_dialog.ui:17
 #, fuzzy
 msgid "New Password"
@@ -5819,11 +5880,13 @@ msgid "Status:"
 msgstr "Статус:"
 
 #: gajim/data/gui/zeroconf_information_window.ui:89
-msgid "_Log conversation history"
+#, fuzzy
+msgid "_Store conversation history"
 msgstr "_Сохранять историю переписки"
 
 #: gajim/data/gui/zeroconf_information_window.ui:215
 #: gajim/data/gui/vcard_information_window.ui:390
+#: gajim/data/gui/groupchat_info_scrolled.ui:166
 msgid "Contact"
 msgstr "Контакт"
 
@@ -5836,8 +5899,9 @@ msgid "Last Name:"
 msgstr "Фамилия:"
 
 #: gajim/data/gui/zeroconf_information_window.ui:260
-msgid "Jabber ID:"
-msgstr "Jabber ID:"
+#, fuzzy
+msgid "XMPP Address:"
+msgstr "Адрес AIM:"
 
 #: gajim/data/gui/zeroconf_information_window.ui:273
 msgid "E-Mail:"
@@ -5857,8 +5921,9 @@ msgid "Send _File"
 msgstr "Отправить _файл"
 
 #: gajim/data/gui/gc_occupants_menu.ui:29
-msgid "Occupant Actions"
-msgstr "Действия над посетителем"
+#, fuzzy
+msgid "Participant Actions"
+msgstr "Участники"
 
 #: gajim/data/gui/gc_occupants_menu.ui:38
 msgid "_Voice"
@@ -5889,8 +5954,9 @@ msgid "_Ban"
 msgstr "_Забанить"
 
 #: gajim/data/gui/gc_occupants_menu.ui:124
-msgid "_Add to Roster"
-msgstr "_Добавить в ростер"
+#, fuzzy
+msgid "_Add to Contact List"
+msgstr "Добавить контакт..."
 
 #: gajim/data/gui/gc_occupants_menu.ui:132
 #, fuzzy
@@ -5928,11 +5994,6 @@ msgstr "Подписка:"
 msgid "_Status"
 msgstr "_Статус"
 
-#: gajim/data/gui/zeroconf_context_menu.ui:26
-#: gajim/data/gui/account_context_menu.ui:79
-msgid "_Modify Account..."
-msgstr "_Изменить учетную запись..."
-
 #: gajim/data/gui/certificate_dialog.ui:66
 #: gajim/data/gui/certificate_dialog.ui:178
 msgid "Common Name (CN)"
@@ -6016,13 +6077,19 @@ msgstr "Последнее изменение:"
 msgid "Next entry"
 msgstr "Неверная запись"
 
+#: gajim/data/gui/filetransfers_send_file_dialog.ui:15
+#: gajim/data/gui/advanced_configuration.ui:143
+#: gajim/data/gui/groupchat_info_scrolled.ui:48 gajim/gtk/discovery.py:1663
+msgid "Description"
+msgstr "Описание"
+
 #: gajim/data/gui/filetransfers_send_file_dialog.ui:54
 #, fuzzy
 msgid "_Send Files"
 msgstr "Отправить _файл"
 
 #: gajim/data/gui/filetransfers_send_file_dialog.ui:58
-#: gajim/gtk/xml_console.py:90
+#: gajim/gtk/xml_console.py:87
 #, fuzzy
 msgid "Send"
 msgstr "_Отправить"
@@ -6047,20 +6114,23 @@ msgid "Change _Nickname..."
 msgstr "Изменить _ник..."
 
 #: gajim/data/gui/gc_control_popup_menu.ui:20
-msgid "_Manage Room"
-msgstr "_Управление комнатой"
+#, fuzzy
+msgid "_Manage Group Chat"
+msgstr "В _новую комнату"
 
 #: gajim/data/gui/gc_control_popup_menu.ui:31
 msgid "Change _Subject..."
 msgstr "Изменить _тему..."
 
 #: gajim/data/gui/gc_control_popup_menu.ui:38
-msgid "Configure _Room..."
-msgstr "Настроить _комнату..."
+#, fuzzy
+msgid "Configure _Group Chat..."
+msgstr "Войти в _комнату..."
 
 #: gajim/data/gui/gc_control_popup_menu.ui:52
-msgid "_Destroy Room"
-msgstr "_Уничтожить комнату"
+#, fuzzy
+msgid "_Destroy Group Chat"
+msgstr "В _новую комнату"
 
 #: gajim/data/gui/gc_control_popup_menu.ui:64
 msgid "_Minimize on close"
@@ -6070,7 +6140,7 @@ msgstr "_Сворачивать при закрытии"
 msgid "_Request Voice"
 msgstr "_Запросить право говорить"
 
-#: gajim/data/gui/gc_control_popup_menu.ui:99 gajim/gtk/discovery.py:1704
+#: gajim/data/gui/gc_control_popup_menu.ui:99
 msgid "_Bookmark"
 msgstr "Добавить эту комнату в _закладки"
 
@@ -6086,9 +6156,8 @@ msgstr "Выбрать Архив"
 
 #: gajim/data/gui/profile_window.ui:175
 #: gajim/data/gui/vcard_information_window.ui:412
-#, fuzzy
 msgid "Full Name"
-msgstr "<b>Имя</b>"
+msgstr "Имя"
 
 #: gajim/data/gui/profile_window.ui:307 gajim/data/gui/profile_window.ui:1004
 #: gajim/data/gui/vcard_information_window.ui:721
@@ -6104,9 +6173,8 @@ msgstr "Формат: YYYY-MM-DD"
 
 #: gajim/data/gui/profile_window.ui:351
 #: gajim/data/gui/vcard_information_window.ui:771
-#, fuzzy
 msgid "Birthday"
-msgstr "<b>День рождения:</b>"
+msgstr "День рождения"
 
 #: gajim/data/gui/profile_window.ui:370
 #: gajim/data/gui/vcard_information_window.ui:689
@@ -6122,13 +6190,6 @@ msgstr "Домашняя страница:"
 msgid "E-Mail"
 msgstr "Почта:"
 
-#: 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/blocking_list.ui:115 gajim/gtk/add_contact.py:30
-#: gajim/gtk/accounts.py:801
-msgid "Jabber ID"
-msgstr "Jabber ID"
-
 #: gajim/data/gui/profile_window.ui:440
 msgid "Main"
 msgstr ""
@@ -6136,9 +6197,8 @@ msgstr ""
 #. Family Name
 #: gajim/data/gui/profile_window.ui:462
 #: gajim/data/gui/vcard_information_window.ui:806
-#, fuzzy
 msgid "Family"
-msgstr "<b>Фамилия:</b>"
+msgstr "Фамилия"
 
 #. Given Name
 #: gajim/data/gui/profile_window.ui:489
@@ -6178,9 +6238,8 @@ msgstr "улица"
 #: gajim/data/gui/profile_window.ui:624 gajim/data/gui/profile_window.ui:1058
 #: gajim/data/gui/vcard_information_window.ui:580
 #: gajim/data/gui/vcard_information_window.ui:1228
-#, fuzzy
 msgid "Extra Address"
-msgstr "<b>Дополнительный адрес:</b>"
+msgstr "Дополнительный адрес"
 
 #: gajim/data/gui/profile_window.ui:652 gajim/data/gui/profile_window.ui:1085
 #: gajim/data/gui/vcard_information_window.ui:506
@@ -6230,9 +6289,8 @@ msgstr "Компания:"
 
 #: gajim/data/gui/profile_window.ui:881
 #: gajim/data/gui/vcard_information_window.ui:1074
-#, fuzzy
 msgid "Department"
-msgstr "<b>Отделение:</b>"
+msgstr "Отделение"
 
 #: gajim/data/gui/profile_window.ui:908
 #: gajim/data/gui/vcard_information_window.ui:1105
@@ -6263,35 +6321,43 @@ msgstr "Работа"
 msgid "About"
 msgstr "Подробнее"
 
-#: gajim/data/gui/start_chat_dialog.ui:114 gajim/gtk/discovery.py:1658
-msgid "Users"
-msgstr "Пользователи"
+#: gajim/data/gui/start_chat_dialog.ui:53
+#, fuzzy
+msgid "Global Group Chat Search"
+msgstr "Войти в комнату"
 
-#: gajim/data/gui/start_chat_dialog.ui:185
-msgid "Name:"
-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
+msgid "_Back"
+msgstr "Скоро буду"
 
-#: gajim/data/gui/start_chat_dialog.ui:197
-msgid "Description:"
-msgstr "Описание: "
+#: gajim/data/gui/start_chat_dialog.ui:245
+#: gajim/data/gui/groupchat_control.ui:796
+#: gajim/data/gui/groupchat_control.ui:888 gajim/gtk/discovery.py:1701
+#: gajim/gtk/groupchat_join.py:62
+msgid "_Join"
+msgstr "_Присоединиться"
 
-#: gajim/data/gui/start_chat_dialog.ui:209
-#, fuzzy
-msgid "Address:"
-msgstr "_Адрес:"
+#: gajim/data/gui/start_chat_dialog.ui:289
+msgid "Select Account"
+msgstr "Выбрать учётную запись"
 
-#: gajim/data/gui/start_chat_dialog.ui:246
-msgid ""
-"Semi-Anonymous\n"
-"<span size=\"small\">(Only moderators can see your XMPP-Address)</span>"
-msgstr ""
+#: gajim/data/gui/start_chat_dialog.ui:380
+#, fuzzy
+msgid "_Select"
+msgstr "Очистить"
 
 #: gajim/data/gui/filetransfers.ui:21
 #, fuzzy
 msgid "Pa_use/Resume"
 msgstr "_Продолжить"
 
-#: gajim/data/gui/filetransfers.ui:30 gajim/gtk/filechoosers.py:178
+#: gajim/data/gui/filetransfers.ui:30 gajim/data/gui/groupchat_control.ui:575
+#: gajim/data/gui/groupchat_control.ui:667
+#: gajim/data/gui/groupchat_control.ui:779
+#: gajim/data/gui/groupchat_control.ui:871 gajim/gtk/filechoosers.py:178
 msgid "_Cancel"
 msgstr "О_тменить"
 
@@ -6333,7 +6399,8 @@ msgid "Cancel the selected file transfer and remove incomplete files"
 msgstr "Отменяет выбранную передачу и удаляет неполные файлы"
 
 #: gajim/data/gui/filetransfers.ui:207
-msgid "Shows a list of file transfers between you and others"
+#, fuzzy
+msgid "Shows a list of file transfers between you and your contacts"
 msgstr "Показывает список передач между вами и остальными"
 
 #: gajim/data/gui/groupchat_control.ui:13 gajim/data/gui/chat_control.ui:277
@@ -6353,7 +6420,6 @@ msgid "Strike"
 msgstr "Зачеркнутый"
 
 #: gajim/data/gui/groupchat_control.ui:54 gajim/data/gui/chat_control.ui:318
-#: gajim/gtk/advanced_config.py:86
 msgid "Color"
 msgstr "Цвет"
 
@@ -6366,16 +6432,45 @@ msgstr "Шрифт"
 msgid "Clear formatting"
 msgstr "Удалить форматирование"
 
-#: gajim/data/gui/groupchat_control.ui:290 gajim/data/gui/chat_control.ui:880
+#: gajim/data/gui/groupchat_control.ui:291 gajim/data/gui/chat_control.ui:880
 #, fuzzy
 msgid "Choose encryption"
 msgstr "Выбрать сертификат"
 
-#: gajim/data/gui/groupchat_control.ui:336 gajim/data/gui/chat_control.ui:640
+#: gajim/data/gui/groupchat_control.ui:337 gajim/data/gui/chat_control.ui:640
 #, fuzzy
 msgid "Show a list of emojis (Alt+M)"
 msgstr "Показать набор смайлов (Alt+M)"
 
+#: gajim/data/gui/groupchat_control.ui:484
+#, fuzzy
+msgid "Joining…"
+msgstr "Баню..."
+
+#: gajim/data/gui/groupchat_control.ui:496
+msgid "_Abort"
+msgstr ""
+
+#: gajim/data/gui/groupchat_control.ui:542
+msgid "Enter new nickname"
+msgstr "Введите новый ник"
+
+#: gajim/data/gui/groupchat_control.ui:592
+#: gajim/data/gui/groupchat_control.ui:684
+#, fuzzy
+msgid "Ch_ange"
+msgstr "Изменить ник"
+
+#: gajim/data/gui/groupchat_control.ui:761
+#, fuzzy
+msgid "Enter password"
+msgstr "Введите новый пароль"
+
+#: gajim/data/gui/groupchat_control.ui:1067
+#, fuzzy
+msgid "_Try again"
+msgstr "Удостоверить снова..."
+
 #: gajim/data/gui/popup_notification_window.ui:42
 msgid "Event Type"
 msgstr "Тип события"
@@ -6454,8 +6549,8 @@ msgstr "Всегда"
 
 #: gajim/data/gui/mam_preferences.ui:18
 #, fuzzy
-msgid "Roster"
-msgstr "Показать _ростер"
+msgid "Contact List"
+msgstr "Контакты"
 
 #: gajim/data/gui/mam_preferences.ui:22
 #: gajim/data/gui/preferences_window.ui:123
@@ -6479,12 +6574,12 @@ msgid "Add"
 msgstr "Добавить"
 
 #: gajim/data/gui/mam_preferences.ui:194 gajim/data/gui/groupchat_config.ui:151
-#: gajim/gtk/dialogs.py:63 gajim/gtk/accounts.py:381
+#: gajim/gtk/dialogs.py:62 gajim/gtk/accounts.py:384
 #, fuzzy
 msgid "Remove"
 msgstr "_Удалить"
 
-#: gajim/data/gui/vcard_information_window.ui:72 gajim/gtk/accounts.py:753
+#: gajim/data/gui/vcard_information_window.ui:72 gajim/gtk/accounts.py:756
 #, fuzzy
 msgid "Resource"
 msgstr "Ресурс:"
@@ -6503,9 +6598,8 @@ msgstr "Клиент:"
 
 #: gajim/data/gui/vcard_information_window.ui:123
 #: gajim/data/gui/preferences_window.ui:1821
-#, fuzzy
 msgid "System"
-msgstr "<b>Система:</b>"
+msgstr "Система"
 
 #: gajim/data/gui/vcard_information_window.ui:140
 #, fuzzy
@@ -6513,14 +6607,12 @@ msgid "Contact time"
 msgstr "Имя контакта"
 
 #: gajim/data/gui/vcard_information_window.ui:240
-#, fuzzy
 msgid "User avatar"
-msgstr "<b>Аватар пользователя:</b>"
+msgstr "Аватар пользователя"
 
 #: gajim/data/gui/vcard_information_window.ui:255
-#, fuzzy
 msgid "Configured avatar"
-msgstr "<b>Установленный аватар:</b>"
+msgstr "Установленный аватар"
 
 #. Given Name
 #: gajim/data/gui/vcard_information_window.ui:287
@@ -6537,6 +6629,7 @@ msgstr "Подписка:"
 #: gajim/data/gui/vcard_information_window.ui:974
 #: gajim/data/gui/vcard_information_window.ui:993
 #: gajim/data/gui/vcard_information_window.ui:1427
+#: gajim/data/gui/groupchat_info_scrolled.ui:222
 msgid "button"
 msgstr ""
 
@@ -6565,15 +6658,18 @@ msgid "Notify me about it"
 msgstr "Уведомлять об этом"
 
 #: gajim/data/gui/preferences_window.ui:58
-msgid "Show only in roster"
-msgstr "Показывать только в ростере"
+#, fuzzy
+msgid "Show only in contact list"
+msgstr "Показать _только активных"
 
 #: gajim/data/gui/preferences_window.ui:69
-msgid "Detached roster with detached chats"
+#, fuzzy
+msgid "Detached contact list with detached chats"
 msgstr "Окно контактов и окно для каждой беседы"
 
 #: gajim/data/gui/preferences_window.ui:72
-msgid "Detached roster with single chat"
+#, fuzzy
+msgid "Detached contact list with single chat"
 msgstr "Окно контактов и окно с беседами"
 
 #: gajim/data/gui/preferences_window.ui:75
@@ -6581,11 +6677,13 @@ msgid "Single window for everything"
 msgstr "Всё в одном окне"
 
 #: gajim/data/gui/preferences_window.ui:78
-msgid "Detached roster with chat grouped by account"
+#, fuzzy
+msgid "Detached contact list with chat grouped by account"
 msgstr "Окно контактов и окна с беседами, сгруппированными по учетным записям"
 
 #: gajim/data/gui/preferences_window.ui:81
-msgid "Detached roster with chat grouped by type"
+#, fuzzy
+msgid "Detached contact list with chat grouped by type"
 msgstr "Окно контактов и окна с беседами, сгруппированными по типу"
 
 #: gajim/data/gui/preferences_window.ui:92
@@ -6636,7 +6734,7 @@ msgstr "Поведение _окна:"
 
 #: gajim/data/gui/preferences_window.ui:296
 #, fuzzy
-msgid "_Show roster on startup"
+msgid "_Show contact list on startup"
 msgstr "Показ_ывать ростер при запуске:"
 
 #: gajim/data/gui/preferences_window.ui:311
@@ -6652,12 +6750,12 @@ msgid "_Tabs placement"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:363
-msgid "_Quit Gajim when closing roster window"
+msgid "_Quit Gajim when closing contact list"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:367
 msgid ""
-"If enabled, Gajim will quit when closing the roster window instead of "
+"If enabled, Gajim will quit when closing the contact list window instead of "
 "minimizing to the system's notification area"
 msgstr ""
 
@@ -6667,43 +6765,44 @@ msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:423
 #, fuzzy
-msgid "Show a_vatars of contacts in roster"
+msgid "Show a_vatars of contacts in contact list"
 msgstr "Показывать а_ватары для контактов в ростере"
 
 #: gajim/data/gui/preferences_window.ui:427
 #, fuzzy
 msgid ""
-"If checked, avatars of contacts will be shown in the roster window and in "
-"group chats"
+"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
 #, fuzzy
-msgid "Show status _messages of contacts in roster"
+msgid "Show status _messages of contacts in contact list"
 msgstr "Показывать _сообщения о статусе контакта в ростере"
 
 #: gajim/data/gui/preferences_window.ui:445
 #, fuzzy
 msgid ""
 "If checked, status messages of contacts will be shown under the contact's "
-"name, in the roster window, and in group chats"
+"name, in the contact list window, and in group chats"
 msgstr ""
 "Если отмечено, то Gajim будет отображать сообщение о статусе контакта под "
 "его именем в окне ростера и в окнах комнат"
 
 #: gajim/data/gui/preferences_window.ui:459
 #, fuzzy
-msgid "Show e_xtra information of contacts in roster (mood, activity, ...)"
+msgid ""
+"Show e_xtra information of contacts in contact list (mood, activity, ...)"
 msgstr ""
 "Показывать дополнительную информацию контактов в ростере (занятие, "
 "настроение, ...)"
 
 #: gajim/data/gui/preferences_window.ui:463
 msgid ""
-"If checked, additional info published by the contact will be shown in "
-"roster. Additional infos (published via PEP) may include e.g. mood, "
+"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 ""
 
@@ -6712,8 +6811,9 @@ msgid "Sort contacts by status"
 msgstr "Сортировать контакты по статусу"
 
 #: gajim/data/gui/preferences_window.ui:494
-msgid "in _roster"
-msgstr "в _ростере"
+#, fuzzy
+msgid "in _contact list"
+msgstr "Контакты для отправки:"
 
 #: gajim/data/gui/preferences_window.ui:511
 msgid "in _group chats"
@@ -6721,8 +6821,8 @@ msgstr "в _комнатах"
 
 #: gajim/data/gui/preferences_window.ui:540
 #, fuzzy
-msgid "Roster Appearance"
-msgstr "<b>Настройки ростера</b>"
+msgid "Contact List Appearance"
+msgstr "Обмен контактами"
 
 #: gajim/data/gui/preferences_window.ui:585
 #, fuzzy
@@ -6788,7 +6888,7 @@ msgstr "Не получается войти в комнату"
 
 #: gajim/data/gui/preferences_window.ui:660
 #, fuzzy
-msgid "If checked, the room subject will be shown when joining a group chat"
+msgid "If checked, the subject will be shown when joining a group chat"
 msgstr "Не получается войти в комнату"
 
 #: gajim/data/gui/preferences_window.ui:682
@@ -6803,13 +6903,13 @@ msgstr ""
 #: gajim/data/gui/preferences_window.ui:701
 msgid ""
 "If join/leave status messages are shown in the group chat. This setting can "
-"be overridden in the groupchat menu."
+"be overridden in the group chat menu."
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:720
 msgid ""
 "The default sync threshold for new public group chats. This setting can be "
-"overridden in the groupchat menu."
+"overridden in the group chat menu."
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:722
@@ -6824,7 +6924,7 @@ msgstr "Показывать изменения _статуса"
 #: gajim/data/gui/preferences_window.ui:768
 msgid ""
 "If status change messages are shown in the group chat. This setting can be "
-"overridden in the groupchat menu."
+"overridden in the group chat menu."
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:825
@@ -6843,8 +6943,8 @@ msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:843
 #, fuzzy
-msgid "Show chatstate in roster"
-msgstr "Показывать а_ватары для контактов в ростере"
+msgid "Show chatstate in contact list"
+msgstr "Показывать кнопку закрытия на вкладке?"
 
 #: gajim/data/gui/preferences_window.ui:847
 msgid ""
@@ -6915,9 +7015,8 @@ msgid ""
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:1091
-#, fuzzy
 msgid "Visual Notifications"
-msgstr "<b>Уведомления</b>"
+msgstr "Уведомления"
 
 #: gajim/data/gui/preferences_window.ui:1127
 msgid "Play _sounds"
@@ -7049,9 +7148,8 @@ msgid "Status Messages"
 msgstr "Сообщение о статусе"
 
 #: gajim/data/gui/preferences_window.ui:1700
-#, fuzzy
 msgid "Preset Status Messages"
-msgstr "<b>Предустановленные сообщения о статусе</b>"
+msgstr "Предустановленные сообщения о статусе"
 
 #: gajim/data/gui/preferences_window.ui:1741 gajim/data/gui/themes_window.ui:65
 #, fuzzy
@@ -7158,7 +7256,7 @@ msgstr "Разрешение видео"
 msgid "Vi_ew own video source"
 msgstr "Источник слоя Мозаика"
 
-#: gajim/data/gui/preferences_window.ui:2281 gajim/gtk/accounts.py:352
+#: gajim/data/gui/preferences_window.ui:2281 gajim/gtk/accounts.py:355
 msgid "Connection"
 msgstr "Соединение"
 
@@ -7203,9 +7301,8 @@ msgid "Custom applications"
 msgstr "Использовать приложения по умолчанию"
 
 #: gajim/data/gui/preferences_window.ui:2519
-#, fuzzy
 msgid "Applications"
-msgstr "<b>Приложения</b>"
+msgstr "Приложения"
 
 #: gajim/data/gui/preferences_window.ui:2556
 #, fuzzy
@@ -7217,7 +7314,8 @@ msgid "_Manage..."
 msgstr "_Управление..."
 
 #: gajim/data/gui/preferences_window.ui:2616
-msgid "_Log status changes of contacts"
+#, fuzzy
+msgid "_Store status changes of contacts in history"
 msgstr "_Записывать в лог изменения статусов контактов"
 
 #: gajim/data/gui/preferences_window.ui:2633
@@ -7230,9 +7328,8 @@ msgid "If checked, Gajim will store a log file for debugging"
 msgstr "Если отмечено, то Gajim запомнит пароль учетной записи"
 
 #: gajim/data/gui/preferences_window.ui:2655
-#, fuzzy
 msgid "Miscellaneous"
-msgstr "<b>Прочее</b>"
+msgstr "Прочее"
 
 #: gajim/data/gui/preferences_window.ui:2688
 msgid "Attention: Please use these options with caution!"
@@ -7242,29 +7339,34 @@ msgstr ""
 msgid "_Open..."
 msgstr "_Открыть..."
 
-#: gajim/data/gui/groupchat_config.ui:55
+#: gajim/data/gui/preferences_window.ui:2723 gajim/gtk/advanced_config.py:84
 #, fuzzy
+msgid "Advanced Configuration Editor (ACE)"
+msgstr "Расширенный редактор настроек"
+
+#: gajim/data/gui/groupchat_config.ui:55
 msgid ""
-"<b>Jabber-ID</b>\n"
+"<b>XMPP Address</b>\n"
 "&lt;user@domain/resource&gt; (only that resource matches)\n"
 "&lt;user@domain&gt; (any resource matches)\n"
 "&lt;domain/resource&gt; (only that resource matches)\n"
 "&lt;domain&gt; (the domain itself matches, as does any user@domain or domain/"
 "resource)\n"
 msgstr ""
-"Может быть одно из следующего:\n"
-"1. user@domain/resource (только этот ресурс).\n"
-"2. user@domain (любой ресурс).\n"
-"3. domain/resource (только этот ресурс).\n"
-"4. domain (сам домен, т.е. как любое сочетание user@domain,\n"
-"domain/resource, так и адрес, содержащий этот поддомен)"
+"<b>Может быть одно из следующего:</b>\n"
+"&lt;user@domain/resource&gt; (только этот ресурс).\n"
+"&lt;user@domain&gt; (любой ресурс).\n"
+"&lt;domain/resource&gt; (только этот ресурс).\n"
+"&lt;domain&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 ""
 
-#: gajim/data/gui/groupchat_config.ui:270 gajim/plugins/gui.py:312
+#: gajim/data/gui/groupchat_config.ui:270
+#: gajim/data/gui/groupchat_info_scrolled.ui:210 gajim/plugins/gui.py:324
 msgid "Configuration"
 msgstr "Конфигурация"
 
@@ -7296,7 +7398,7 @@ msgid "Start _Chat"
 msgstr "Начать _беседу"
 
 #: gajim/data/gui/contact_context_menu.ui:20
-#: gajim/data/gui/systray_context_menu.ui:36
+#: gajim/data/gui/systray_context_menu.ui:29
 msgid "Send Single _Message..."
 msgstr "Отправить одиночное _сообщение..."
 
@@ -7356,17 +7458,43 @@ msgid "_Ignore"
 msgstr "_Игнорировать"
 
 #: gajim/data/gui/contact_context_menu.ui:174
-msgid "_Add to Roster..."
-msgstr "_Добавить в ростер..."
+#, fuzzy
+msgid "_Add to Contact List..."
+msgstr "_Добавить контакт..."
+
+#: gajim/data/gui/advanced_configuration.ui:39
+msgid "You should restart Gajim for some changes to take effect"
+msgstr ""
+"Необходимо перезапустить Gajim, чтобы некоторые настройки вступили в силу"
+
+#: gajim/data/gui/advanced_configuration.ui:71
+#, fuzzy
+msgid "_Filter"
+msgstr "Фильтр:"
+
+#: gajim/data/gui/advanced_configuration.ui:88
+msgid "Type to search for values..."
+msgstr ""
+
+#: gajim/data/gui/advanced_configuration.ui:180
+#, fuzzy
+msgid "_Reset Value"
+msgstr "_Сбросить до исходных"
+
+#: gajim/data/gui/advanced_configuration.ui:185
+#, fuzzy
+msgid "Resets value to default"
+msgstr "_Сбросить до исходных"
 
 #: gajim/data/gui/account_creation_wizard_window.ui:43
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim: мастер создания учетной записи"
 
 #: gajim/data/gui/account_creation_wizard_window.ui:70
+#, fuzzy
 msgid ""
 "You need to have an account in order to connect\n"
-"to the Jabber network."
+"to the XMPP network."
 msgstr ""
 "Необходимо создать учетную запись для присоединения \n"
 "к сети Jabber."
@@ -7388,8 +7516,9 @@ msgid "<b>Please fill in the data for your existing account</b>"
 msgstr "<b>Заполните данные для вашей новой учетной записи</b>"
 
 #: gajim/data/gui/account_creation_wizard_window.ui:187
-msgid "_Jabber ID:"
-msgstr "_Jabber ID:"
+#, fuzzy
+msgid "_XMPP Address:"
+msgstr "Адрес AIM:"
 
 #: gajim/data/gui/account_creation_wizard_window.ui:239
 #: gajim/data/gui/account_creation_wizard_window.ui:394
@@ -7476,6 +7605,7 @@ msgid "Privacy Lists:"
 msgstr "Списки доступа:"
 
 #: gajim/data/gui/service_discovery_window.ui:111
+#: gajim/data/gui/groupchat_creation.ui:227
 #, fuzzy
 msgid "_Address"
 msgstr "_Адрес:"
@@ -7493,11 +7623,6 @@ msgstr "Синхронизация : выберите контакт"
 msgid "Select the contacts you want to synchronise"
 msgstr "Расширенные статусы"
 
-#: gajim/data/gui/groupchat_invitation_received.ui:42
-#, fuzzy
-msgid "Group Chat Invitation"
-msgstr "Приглашение в комнату"
-
 #: gajim/data/gui/groupchat_invitation_received.ui:111
 #, fuzzy
 msgid "Message..."
@@ -7532,9 +7657,8 @@ msgid "M_ood"
 msgstr ""
 
 #: gajim/data/gui/change_status_message_dialog.ui:314
-#, fuzzy
 msgid "_Type your new status message"
-msgstr "<b>Введите ваше новое сообщение о статусе</b>"
+msgstr "_Введите ваше новое сообщение о статусе"
 
 #: gajim/data/gui/synchronise_select_account_dialog.ui:8
 msgid "Synchronise contacts"
@@ -7550,11 +7674,10 @@ msgstr ""
 
 #: gajim/data/gui/add_new_contact_window.ui:84
 #, fuzzy
-msgid "_Jabber ID"
-msgstr "_Jabber ID:"
+msgid "_XMPP Address"
+msgstr "_Адрес:"
 
 #: gajim/data/gui/add_new_contact_window.ui:100
-#: gajim/data/gui/manage_bookmarks_window.ui:192
 #, fuzzy
 msgid "_Nickname"
 msgstr "_Ник:"
@@ -7631,7 +7754,7 @@ msgstr "<b>Настроение:</b>"
 msgid "<b>Message:</b>"
 msgstr "<b>Сообщение:</b>"
 
-#: gajim/data/gui/plugins_window.ui:10 gajim/data/gui/application_menu.ui:90
+#: gajim/data/gui/plugins_window.ui:10 gajim/data/gui/application_menu.ui:87
 msgid "Plugins"
 msgstr "Модули"
 
@@ -7737,10 +7860,6 @@ msgstr "Разрешить"
 msgid "Deny"
 msgstr "Отклонить"
 
-#: gajim/data/gui/privacy_list_window.ui:317
-msgid "JabberID"
-msgstr "JabberID"
-
 #: gajim/data/gui/privacy_list_window.ui:358
 msgid "all in the group"
 msgstr "всем в группе"
@@ -7782,7 +7901,7 @@ msgstr "Номер:"
 msgid "Manage sounds"
 msgstr "Выключить звук"
 
-#: gajim/data/gui/manage_sounds_window.ui:55 gajim/plugins/gui.py:100
+#: gajim/data/gui/manage_sounds_window.ui:55 gajim/plugins/gui.py:101
 msgid "Active"
 msgstr "Активен"
 
@@ -7820,30 +7939,121 @@ msgstr "Удалить учетную запись из Gajim и с _серве�
 msgid "_Personal Events"
 msgstr "_Расширенный статус"
 
-#: gajim/data/gui/account_context_menu.ui:35
-#: gajim/data/gui/systray_context_menu.ui:28
-msgid "Join _Group Chat"
-msgstr "Войти в _комнату"
-
-#: gajim/data/gui/account_context_menu.ui:49
+#: gajim/data/gui/account_context_menu.ui:41
 msgid "_Add Contact..."
 msgstr "_Добавить контакт..."
 
-#: gajim/data/gui/account_context_menu.ui:57
+#: gajim/data/gui/account_context_menu.ui:49
 msgid "_Discover Services"
 msgstr "_Просмотреть сервисы"
 
-#: gajim/data/gui/account_context_menu.ui:65
+#: gajim/data/gui/account_context_menu.ui:57
 msgid "_Execute Command..."
 msgstr "В_ыполнить команду..."
 
+#: gajim/data/gui/account_context_menu.ui:65
+#, fuzzy
+msgid "_View Certificate"
+msgstr "Просмотреть журнал"
+
+#: gajim/data/gui/manage_proxies.ui:12
+#, fuzzy
+msgctxt "proxy configuration"
+msgid "HTTP Connect"
+msgstr "Соединение HTTP"
+
+#: gajim/data/gui/manage_proxies.ui:15
+#, fuzzy
+msgctxt "proxy configuration"
+msgid "SOCKS5"
+msgstr "SOCKS5"
+
+#: gajim/data/gui/manage_proxies.ui:18
+#, fuzzy
+msgctxt "proxy configuration"
+msgid "BOSH"
+msgstr "BOSH"
+
+#: gajim/data/gui/manage_proxies.ui:68
+#, fuzzy
+msgid "Add Proxy"
+msgstr "Прокси:"
+
+#: gajim/data/gui/manage_proxies.ui:82
+#, fuzzy
+msgid "Remove Proxy"
+msgstr "Удалить группу"
+
+#: gajim/data/gui/manage_proxies.ui:134
+#, fuzzy
+msgid "Pass_word"
+msgstr "П_ароль"
+
+#: gajim/data/gui/manage_proxies.ui:159
+msgid "Use proxy auth_entication"
+msgstr "Использовать прокси аут_ентификацию"
+
+#: gajim/data/gui/manage_proxies.ui:179
+#, fuzzy
+msgid "_Username"
+msgstr "_Имя пользователя:"
+
+#: gajim/data/gui/manage_proxies.ui:209
+#, fuzzy
+msgid "_Port"
+msgstr "_Порт:"
+
+#: gajim/data/gui/manage_proxies.ui:226
+msgid "example.org"
+msgstr ""
+
+#: gajim/data/gui/manage_proxies.ui:240
+#, fuzzy
+msgid "_Host"
+msgstr "_Хост:"
+
+#: gajim/data/gui/manage_proxies.ui:254
+msgid "Use HTTP prox_y"
+msgstr "Использовать про_кси HTTP"
+
+#: gajim/data/gui/manage_proxies.ui:275
+msgid "https://example.org/http-bind/"
+msgstr ""
+
+#: gajim/data/gui/manage_proxies.ui:291
+#, fuzzy
+msgid "_BOSH URL"
+msgstr "URL _BOSH:"
+
+#: gajim/data/gui/manage_proxies.ui:309 gajim/gtk/adhoc.py:322
+#, fuzzy
+msgid "Settings"
+msgstr "Сочетания клавиш в чате"
+
+#: gajim/data/gui/manage_proxies.ui:344
+#, fuzzy
+msgid "_Type"
+msgstr "_Тип:"
+
+#: gajim/data/gui/manage_proxies.ui:361
+#: gajim/data/gui/groupchat_creation.ui:105
+#, fuzzy
+msgid "_Name"
+msgstr "_Имя: "
+
+#: gajim/data/gui/manage_proxies.ui:391 gajim/gtk/accounts.py:742
+#, fuzzy
+msgid "Proxy"
+msgstr "Прокси:"
+
 #: gajim/data/gui/application_menu.ui:8
 msgid "View"
 msgstr "Вид"
 
 #: gajim/data/gui/application_menu.ui:11
-msgid "Show Roster"
-msgstr "Показать ростер"
+#, fuzzy
+msgid "Show Contact List"
+msgstr "Показать только активных"
 
 #: gajim/data/gui/application_menu.ui:16
 msgid "Show Offline Contacts"
@@ -7879,22 +8089,24 @@ msgstr "Сочетания клавиш"
 msgid "Features"
 msgstr "Возможности"
 
-#: gajim/data/gui/application_menu.ui:81
-msgid "Bookmarks"
-msgstr "Закладки"
+#: gajim/data/gui/application_menu.ui:77
+#: gajim/data/gui/groupchat_creation.ui:81 gajim/gtk/groupchat_creation.py:45
+#, fuzzy
+msgid "Create Group Chat"
+msgstr "Покинуть конференции"
 
-#: gajim/data/gui/application_menu.ui:94 gajim/data/gui/shortcuts_window.ui:189
-#: gajim/gtk/preferences.py:59
+#: gajim/data/gui/application_menu.ui:91 gajim/data/gui/shortcuts_window.ui:189
+#: gajim/gtk/preferences.py:58
 msgid "Preferences"
 msgstr "Настройки"
 
-#: gajim/data/gui/application_menu.ui:99
+#: gajim/data/gui/application_menu.ui:96
 #, fuzzy
 msgid "Quit"
 msgstr "_Выйти"
 
 #: gajim/data/gui/httpupload_progress_dialog.ui:110
-#: gajim/gtk/filetransfer.py:121
+#: gajim/gtk/filetransfer.py:120
 msgid "Progress"
 msgstr "Прогресс"
 
@@ -7912,53 +8124,33 @@ msgstr ""
 msgid "_Cancel Upload"
 msgstr "О_тменить"
 
-#: gajim/data/gui/manage_bookmarks_window.ui:13
-#, fuzzy
-msgid "Group Chat Bookmarks"
-msgstr "_Комната"
-
-#: gajim/data/gui/manage_bookmarks_window.ui:68
-#, fuzzy
-msgid "Add Bookmark"
-msgstr "Добавить эту комнату в _закладки"
-
-#: gajim/data/gui/manage_bookmarks_window.ui:82
-#, fuzzy
-msgid "Remove Bookmark"
-msgstr "Добавить эту комнату в _закладки"
-
-#: gajim/data/gui/manage_bookmarks_window.ui:126
-msgid "N_ame"
+#: gajim/data/gui/groupchat_creation.ui:27
+msgid "Public or Private?"
 msgstr ""
 
-#: gajim/data/gui/manage_bookmarks_window.ui:145
-#, fuzzy
-msgid "Bookmark Name"
-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 ""
 
-#: gajim/data/gui/manage_bookmarks_window.ui:160
-#, fuzzy
-msgid "_Server"
-msgstr "_Сервер:"
+#: gajim/data/gui/groupchat_creation.ui:58
+msgid "<b>Public:</b> Anyone who knows the address can join."
+msgstr ""
 
-#: gajim/data/gui/manage_bookmarks_window.ui:223
+#: gajim/data/gui/groupchat_creation.ui:122
 #, fuzzy
-msgid "Roo_m"
-msgstr "_Комната:"
+msgid "_Description"
+msgstr "Описание"
 
-#: gajim/data/gui/manage_bookmarks_window.ui:253
-#, fuzzy
-msgid "_Password"
-msgstr "_Пароль:"
+#: gajim/data/gui/groupchat_creation.ui:164
+msgid "_Public"
+msgstr ""
 
-#: gajim/data/gui/manage_bookmarks_window.ui:299
+#: gajim/data/gui/groupchat_creation.ui:278
 #, fuzzy
-msgid "Join chat when connected"
-msgstr "Контакт отключился"
-
-#: gajim/data/gui/manage_bookmarks_window.ui:307
-msgid "_Join Automatically"
-msgstr ""
+msgid "_Account"
+msgstr "Учётные _записи"
 
 #: gajim/data/gui/exception_dialog.ui:49
 msgid "Sorry, that should not have happened"
@@ -8001,6 +8193,29 @@ msgstr "Авторизовать контакт (он будет видеть в
 msgid "Presets"
 msgstr "_Присутствие"
 
+#: gajim/data/gui/groupchat_info_scrolled.ui:32
+#, fuzzy
+msgid "Address"
+msgstr "_Адрес:"
+
+#: gajim/data/gui/groupchat_info_scrolled.ui:64
+msgid "Topic"
+msgstr ""
+
+#: gajim/data/gui/groupchat_info_scrolled.ui:80
+#, fuzzy
+msgid "Author"
+msgstr "Авторы:"
+
+#: gajim/data/gui/groupchat_info_scrolled.ui:182
+msgid "Discussion Logs"
+msgstr ""
+
+#: gajim/data/gui/groupchat_info_scrolled.ui:260
+#, fuzzy
+msgid "Group Chat Language"
+msgstr "Приглашение в комнату"
+
 #: gajim/data/gui/emoji_chooser.ui:98
 #, fuzzy
 msgid "No Results Found"
@@ -8013,24 +8228,35 @@ msgstr "Пригласить друзей!"
 #: gajim/data/gui/chat_to_muc_window.ui:39
 #, fuzzy
 msgid ""
-"You are now entering a groupchat.\n"
+"You are now entering a group chat.\n"
 "Select the contacts you want to invite"
 msgstr ""
 "Вы собираетесь начать чат (Multi-User Chat).\n"
 "Выберите контакты, которых вы хотите пригласить"
 
 #: gajim/data/gui/chat_to_muc_window.ui:112
-msgid "Please select a MUC server."
+#, fuzzy
+msgid "Please select a group chat server."
 msgstr "Выберите сервер конференций."
 
 #: gajim/data/gui/chat_to_muc_window.ui:141
-msgid "MUC server"
-msgstr "сервер MUC"
+#, fuzzy
+msgid "Group chat server"
+msgstr "Комнаты"
 
 #: gajim/data/gui/chat_to_muc_window.ui:176
 msgid "In_vite"
 msgstr "_Пригласить"
 
+#: gajim/data/gui/bookmarks.ui:176
+#, fuzzy
+msgid "Autojoin"
+msgstr "_Автоматическое присоединение"
+
+#: gajim/data/gui/bookmarks.ui:211
+msgid "_Apply"
+msgstr ""
+
 #: gajim/data/gui/history_manager.ui:11
 msgid "_Export"
 msgstr "Экспорт"
@@ -8045,12 +8271,13 @@ msgid "Gajim History Logs Manager"
 msgstr "Менеджер истории Gajim'а"
 
 #: gajim/data/gui/history_manager.ui:108
+#, fuzzy
 msgid ""
-"This log manager is not intended for log viewing. If you are looking for "
-"such functionality, use the history window instead.\n"
+"This history manager is not intended for viewing chat history. If you are "
+"looking for such functionality, please use the history window instead.\n"
 "\n"
-"Use this program to delete or export logs. You can select logs from the left "
-"and/or search database from below."
+"You can use this program to delete or export history. Either select logs "
+"from the left or search the database."
 msgstr ""
 "Этот менеджер истории не предназначен для просмотра. Если вы хотите "
 "просматривать историю с большим количеством функций, используйте окно "
@@ -8102,8 +8329,9 @@ msgid "Select an emoji"
 msgstr ""
 
 #: gajim/data/gui/shortcuts_window.ui:38
-msgid "Complete a command or a nick"
-msgstr ""
+#, fuzzy
+msgid "Complete a command or a nickname"
+msgstr "Создайте новую тему с желаемым названием."
 
 #: gajim/data/gui/shortcuts_window.ui:45
 #, fuzzy
@@ -8142,7 +8370,7 @@ msgstr ""
 msgid "Scroll down"
 msgstr ""
 
-#: gajim/data/gui/shortcuts_window.ui:100 gajim/gtk/xml_console.py:72
+#: gajim/data/gui/shortcuts_window.ui:100 gajim/gtk/xml_console.py:69
 #, fuzzy
 msgid "Clear"
 msgstr "Делаю уборку"
@@ -8184,8 +8412,9 @@ msgid "Close chat"
 msgstr "Закрыть чат"
 
 #: gajim/data/gui/shortcuts_window.ui:173
-msgid "Roster Shortcuts"
-msgstr "Сочетания клавиш в ростере"
+#, fuzzy
+msgid "Contact List Shortcuts"
+msgstr "Сочетания клавиш в чате"
 
 #: gajim/data/gui/shortcuts_window.ui:196
 #, fuzzy
@@ -8216,7 +8445,7 @@ msgid "Show only active contacts"
 msgstr "Показать _только активных"
 
 #: gajim/data/gui/shortcuts_window.ui:251
-msgid "Enable roster filtering"
+msgid "Enable contact list filtering"
 msgstr ""
 
 #: gajim/data/gui/shortcuts_window.ui:259
@@ -8261,12 +8490,12 @@ msgstr "Использовать только выбранные в диалог
 
 #: gajim/data/gui/history_window.ui:317
 #, fuzzy
-msgid "Record history for this chat"
+msgid "Store history for this chat"
 msgstr "Игнорировать эту ошибку для данного сертификата."
 
 #: gajim/data/gui/history_window.ui:332
 #, fuzzy
-msgid "Record History"
+msgid "Store History"
 msgstr "Недавняя история"
 
 #: gajim/data/gui/history_window.ui:350
@@ -8286,9 +8515,10 @@ msgstr "Создать новое сообщение"
 msgid "Fill in the form."
 msgstr "Заполните форму."
 
-#: gajim/data/gui/data_form_window.ui:229
-msgid "Room Configuration"
-msgstr "Настройки комнаты"
+#: gajim/data/gui/data_form_window.ui:229 gajim/gtk/groupchat_config.py:41
+#, fuzzy
+msgid "Group Chat Configuration"
+msgstr "Приглашение в комнату"
 
 #: gajim/data/gui/roster_item_exchange_window.ui:39
 #: gajim/gtk/roster_item_exchange.py:35
@@ -8309,15 +8539,15 @@ msgstr "Ста_тус"
 msgid "_Start Chat..."
 msgstr "_Начать беседу..."
 
-#: gajim/data/gui/systray_context_menu.ui:50
+#: gajim/data/gui/systray_context_menu.ui:43
 msgid "Show All Pending _Events"
 msgstr "Показать непросмотренные _события"
 
-#: gajim/data/gui/systray_context_menu.ui:59
+#: gajim/data/gui/systray_context_menu.ui:52
 msgid "Mute Sounds"
 msgstr "Выключить звук"
 
-#: gajim/data/gui/systray_context_menu.ui:75
+#: gajim/data/gui/systray_context_menu.ui:68
 #, fuzzy
 msgid "_Preferences"
 msgstr "Настройки"
@@ -8409,34 +8639,34 @@ msgstr ""
 msgid "Execute expression inside a shell, send output"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:45
+#: gajim/command_system/implementation/standard.py:47
 msgid ""
 "Show help on a given command or a list of available commands if -a is given"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:73
+#: gajim/command_system/implementation/standard.py:75
 msgid "Send a message to the contact"
 msgstr "Послать сообщение контакту"
 
-#: gajim/command_system/implementation/standard.py:78
+#: gajim/command_system/implementation/standard.py:80
 msgid "Send action (in the third person) to the current chat"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:83
+#: gajim/command_system/implementation/standard.py:85
 msgid "Show logged messages which mention given text"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:88
+#: gajim/command_system/implementation/standard.py:90
 #, python-format
 msgid "%s: Nothing found"
 msgstr "%s: Ничего не найдено"
 
-#: gajim/command_system/implementation/standard.py:94
+#: gajim/command_system/implementation/standard.py:96
 #, fuzzy
 msgid "Limit must be an integer"
 msgstr "Аргумент предела должен быть целым числом."
 
-#: gajim/command_system/implementation/standard.py:118
+#: gajim/command_system/implementation/standard.py:120
 msgid ""
 "\n"
 "    Set the current status\n"
@@ -8446,123 +8676,128 @@ msgid ""
 "    "
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:136
+#: gajim/command_system/implementation/standard.py:138
 #, fuzzy
 msgid "Set the current status to away"
 msgstr "Установлен статус «не в сети»"
 
-#: gajim/command_system/implementation/standard.py:150
+#: gajim/command_system/implementation/standard.py:152
 #, fuzzy
 msgid "Set the current status to online"
 msgstr "Установлен статус «не в сети»"
 
-#: gajim/command_system/implementation/standard.py:153
+#: gajim/command_system/implementation/standard.py:155
 msgid "Available"
 msgstr "Доступен"
 
-#: gajim/command_system/implementation/standard.py:173
-#: gajim/command_system/implementation/standard.py:250
+#: gajim/command_system/implementation/standard.py:175
+#: gajim/command_system/implementation/standard.py:252
 msgid "Clear the text window"
 msgstr "Очистить текстовое окно"
 
-#: gajim/command_system/implementation/standard.py:178
-#: gajim/command_system/implementation/standard.py:397
+#: gajim/command_system/implementation/standard.py:180
+#: gajim/command_system/implementation/standard.py:401
 msgid "Send a ping to the contact"
 msgstr "Послать пинг контакту"
 
-#: gajim/command_system/implementation/standard.py:181
-#: gajim/command_system/implementation/standard.py:400
+#: gajim/command_system/implementation/standard.py:183
+#: gajim/command_system/implementation/standard.py:404
 msgid "Command is not supported for zeroconf accounts"
 msgstr "Команда не поддерживается учетной записью zeroconf"
 
-#: gajim/command_system/implementation/standard.py:185
-msgid "Send DTMF sequence through an open audio session"
+#: gajim/command_system/implementation/standard.py:187
+msgid "Send DTMF sequence through an open voice chat"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:188
+#: gajim/command_system/implementation/standard.py:190
 #, fuzzy
-msgid "No open audio sessions with the contact"
+msgid "No open voice chats with the contact"
 msgstr "Щелкните для просмотра последних бесед с этим человеком"
 
-#: gajim/command_system/implementation/standard.py:191
+#: gajim/command_system/implementation/standard.py:193
 #, fuzzy, python-format
 msgid "%s is not a valid tone"
 msgstr "%s не является допустимым loglevel"
 
-#: gajim/command_system/implementation/standard.py:198
-msgid "Toggle audio session"
-msgstr "Переключить аудио сеанс"
+#: gajim/command_system/implementation/standard.py:200
+msgid "Toggle Voice Chat"
+msgstr ""
 
-#: gajim/command_system/implementation/standard.py:201
-msgid "Audio sessions are not available"
-msgstr "Аудио сеансы не доступны"
+#: gajim/command_system/implementation/standard.py:203
+#, fuzzy
+msgid "Voice chats are not available"
+msgstr "Видео сеансы не доступны"
 
-#: gajim/command_system/implementation/standard.py:208
-msgid "Toggle video session"
+#: gajim/command_system/implementation/standard.py:210
+#, fuzzy
+msgid "Toggle Video Chat"
 msgstr "Переключить видео сеанс"
 
-#: gajim/command_system/implementation/standard.py:211
-msgid "Video sessions are not available"
+#: gajim/command_system/implementation/standard.py:213
+#, fuzzy
+msgid "Video chats are not available"
 msgstr "Видео сеансы не доступны"
 
-#: gajim/command_system/implementation/standard.py:218
+#: gajim/command_system/implementation/standard.py:220
 #, fuzzy
 msgid "Send a message to the contact that will attract their attention"
 msgstr "Отправить сообщение контакту, который привлечет его(её) внимание"
 
-#: gajim/command_system/implementation/standard.py:255
+#: gajim/command_system/implementation/standard.py:257
 msgid "Change your nickname in a group chat"
 msgstr "Сменить ник в комнате"
 
-#: gajim/command_system/implementation/standard.py:260 gajim/gtk/dialogs.py:674
-#: gajim/gtk/bookmarks.py:272
+#: gajim/command_system/implementation/standard.py:262
 msgid "Invalid nickname"
 msgstr "Неверное имя пользователя"
 
-#: gajim/command_system/implementation/standard.py:267
-msgid "Open a private chat window with a specified occupant"
+#: gajim/command_system/implementation/standard.py:269
+#, fuzzy
+msgid "Open a private chat window with a specified participant"
 msgstr "Открыть окно приватного чата с указанным участником"
 
-#: gajim/command_system/implementation/standard.py:273
-#: gajim/command_system/implementation/standard.py:282
-#: gajim/command_system/implementation/standard.py:332
-#: gajim/command_system/implementation/standard.py:345
-#: gajim/command_system/implementation/standard.py:357
+#: gajim/command_system/implementation/standard.py:275
+#: gajim/command_system/implementation/standard.py:284
+#: gajim/command_system/implementation/standard.py:336
+#: gajim/command_system/implementation/standard.py:349
+#: gajim/command_system/implementation/standard.py:361
 msgid "Nickname not found"
 msgstr "Ник не обнаружен"
 
-#: gajim/command_system/implementation/standard.py:276
+#: gajim/command_system/implementation/standard.py:278
+#, fuzzy
 msgid ""
-"Open a private chat window with a specified occupant and send him a message"
+"Open a private chat window with a specified participant and send him a "
+"message"
 msgstr ""
 "Открыть окно приватного чата с указанным участником и послать сообщение"
 
-#: gajim/command_system/implementation/standard.py:285
+#: gajim/command_system/implementation/standard.py:287
 msgid "Display or change a group chat topic"
 msgstr "Показать или изменить тему комнаты"
 
-#: gajim/command_system/implementation/standard.py:294
+#: gajim/command_system/implementation/standard.py:296
 #, fuzzy
-msgid "Invite a user to a room for a reason"
+msgid "Invite a user to a group chat for a reason"
 msgstr ""
 "invite &lt;пользователь&gt; [сообщение]:  Пригласить пользователя в комнату."
 
-#: gajim/command_system/implementation/standard.py:297
+#: gajim/command_system/implementation/standard.py:299
 #, python-format
 msgid "Invited %(jid)s to %(room_jid)s"
 msgstr "Пригласил(а) %(jid)s в %(room_jid)s"
 
-#: gajim/command_system/implementation/standard.py:301
+#: gajim/command_system/implementation/standard.py:303
 #, fuzzy
-msgid "Join a group chat given by a JID"
+msgid "Join a group chat given by an XMPP Address"
 msgstr "в _комнатах"
 
-#: gajim/command_system/implementation/standard.py:309
+#: gajim/command_system/implementation/standard.py:313
 msgid ""
-"Leave the groupchat, optionally giving a reason, and close tab or window"
+"Leave the group chat, optionally giving a reason, and close tab or window"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:314
+#: gajim/command_system/implementation/standard.py:318
 msgid ""
 "\n"
 "    Ban user by a nick or a JID from a groupchat\n"
@@ -8571,45 +8806,46 @@ msgid ""
 "    "
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:329
+#: gajim/command_system/implementation/standard.py:333
 #, fuzzy
-msgid "Kick user by a nick from a groupchat"
+msgid "Kick user by a nick from a group chat"
 msgstr "Вы приглашены в конференцию"
 
-#: gajim/command_system/implementation/standard.py:338
+#: gajim/command_system/implementation/standard.py:342
 msgid ""
-"Set occupant role in group chat.\n"
+"Set participant role in group chat.\n"
 "    Role can be given as one of the following values:\n"
 "    moderator, participant, visitor, none"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:343
+#: gajim/command_system/implementation/standard.py:347
 #, fuzzy
 msgid "Invalid role given"
 msgstr "задана неверная кодировка"
 
-#: gajim/command_system/implementation/standard.py:350
+#: gajim/command_system/implementation/standard.py:354
 msgid ""
-"Set occupant affiliation in group chat.\n"
+"Set participant affiliation in group chat.\n"
 "    Affiliation can be given as one of the following values:\n"
 "    owner, admin, member, outcast, none"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:355
+#: gajim/command_system/implementation/standard.py:359
 #, fuzzy
 msgid "Invalid affiliation given"
 msgstr "задана неверная кодировка"
 
-#: gajim/command_system/implementation/standard.py:365
-msgid "Display names of all group chat occupants"
+#: gajim/command_system/implementation/standard.py:369
+#, fuzzy
+msgid "Display names of all group chat participants"
 msgstr "Показывает список присутствующих в комнате"
 
-#: gajim/command_system/implementation/standard.py:387
-msgid "Forbid an occupant to send you public or private messages"
+#: gajim/command_system/implementation/standard.py:391
+msgid "Forbid a participant to send you public or private messages"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:392
-msgid "Allow an occupant to send you public or private messages"
+#: gajim/command_system/implementation/standard.py:396
+msgid "Allow a participant to send you public or private messages"
 msgstr ""
 
 #: gajim/command_system/implementation/middleware.py:74
@@ -8621,203 +8857,327 @@ msgstr "Не удалось исполнить команду!"
 msgid "The same as using a doc-string, except it supports translation"
 msgstr ""
 
-#: gajim/gtk/filetransfer.py:91
+#: gajim/gtk/groupchat_info.py:36
+#, fuzzy
+msgid "?Group chat feature:Archiving"
+msgstr "Приглашение в комнату"
+
+#: gajim/gtk/groupchat_info.py:37
+#, fuzzy
+msgid "Messages are archived on the server"
+msgstr "История сеанса БУДЕТ сохранена на сервере"
+
+#: gajim/gtk/groupchat_info.py:40
+#, fuzzy
+msgid "?Group chat feature:Persistent"
+msgstr "Комнаты"
+
+#: gajim/gtk/groupchat_info.py:41
+msgid "This group chat persists even if there are no participants"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:45
+#, fuzzy
+msgid "?Group chat feature:Temporary"
+msgstr "Отсутствует"
+
+#: gajim/gtk/groupchat_info.py:46
+msgid "This group chat will be destroyed once the last participant left"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:50
+#, fuzzy
+msgid "?Group chat feature:Moderated"
+msgstr "Отсутствует"
+
+#: gajim/gtk/groupchat_info.py:51
+msgid ""
+"Participants entering this group chat need to request permission to send "
+"messages"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:55
+#, fuzzy
+msgid "?Group chat feature:Not Moderated"
+msgstr "Комнаты"
+
+#: gajim/gtk/groupchat_info.py:56
+msgid "Participants entering this group chat are allowed to send messages"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:60
+#, fuzzy
+msgid "?Group chat feature:Open"
+msgstr "Отсутствует"
+
+#: gajim/gtk/groupchat_info.py:61
+msgid "Anyone can join this group chat"
+msgstr "Кто угодно может зайти в эту комнату"
+
+#: gajim/gtk/groupchat_info.py:64
+#, fuzzy
+msgid "?Group chat feature:Members Only"
+msgstr "Вас упомянули в комнате"
+
+#: gajim/gtk/groupchat_info.py:65
+msgid "This group chat is restricted to members only"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:69
+#, fuzzy
+msgid "?Group chat feature:Public"
+msgstr "Вас упомянули в комнате"
+
+#: gajim/gtk/groupchat_info.py:70
+msgid "Group chat can be found via search"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:73
+#, fuzzy
+msgid "?Group chat feature:Hidden"
+msgstr "Отсутствует"
+
+#: gajim/gtk/groupchat_info.py:74
+#, fuzzy
+msgid "This group chat can not be found via search"
+msgstr "У этой комнаты нет темы"
+
+#: gajim/gtk/groupchat_info.py:77
+#, fuzzy
+msgid "?Group chat feature:Not Anonymous"
+msgstr "Комнаты"
+
+#: gajim/gtk/groupchat_info.py:78
+msgid "All other group chat participants can see your XMPP address"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:82
+#, fuzzy
+msgid "?Group chat feature:Semi-Anonymous"
+msgstr "Вас упомянули в комнате"
+
+#: gajim/gtk/groupchat_info.py:83
+msgid "Only moderators can see your XMPP address"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:86
+#, fuzzy
+msgid "?Group chat feature:Password Required"
+msgstr "Комнаты"
+
+#: gajim/gtk/groupchat_info.py:87
+msgid "This group chat does require a password upon entry"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:91
+#, fuzzy
+msgid "?Group chat feature:No Password Required"
+msgstr "Комнаты"
+
+#: gajim/gtk/groupchat_info.py:92
+msgid "This group chat does not require a password upon entry"
+msgstr ""
+
+#: gajim/gtk/filetransfer.py:90
 msgid "File"
 msgstr "Файл"
 
-#: gajim/gtk/filetransfer.py:108
+#: gajim/gtk/filetransfer.py:107
 msgid "Time"
 msgstr "Время"
 
-#: gajim/gtk/filetransfer.py:228
+#: gajim/gtk/filetransfer.py:227
 #, fuzzy, python-format
 msgid "File name: %s"
 msgstr "Имя файла: %s"
 
-#: gajim/gtk/filetransfer.py:229 gajim/gtk/filetransfer.py:464
+#: gajim/gtk/filetransfer.py:228 gajim/gtk/filetransfer.py:469
 #, python-format
 msgid "Size: %s"
 msgstr "Размер: %s"
 
-#: gajim/gtk/filetransfer.py:239
+#: gajim/gtk/filetransfer.py:238
 #, python-format
 msgid "Sender: %s"
 msgstr "Отправитель: %s"
 
-#: gajim/gtk/filetransfer.py:240 gajim/gtk/filetransfer.py:744
+#: gajim/gtk/filetransfer.py:239 gajim/gtk/filetransfer.py:749
 #: gajim/gtk/tooltips.py:577
 msgid "Recipient: "
 msgstr "Получатель:"
 
-#: gajim/gtk/filetransfer.py:251
+#: gajim/gtk/filetransfer.py:250
 #, python-format
 msgid "Saved in: %s"
 msgstr "Сохранено в: %s"
 
-#: gajim/gtk/filetransfer.py:256
+#: gajim/gtk/filetransfer.py:255
 msgid "File transfer completed"
 msgstr "Передача завершена"
 
-#: gajim/gtk/filetransfer.py:276 gajim/gtk/filetransfer.py:285
+#: gajim/gtk/filetransfer.py:275 gajim/gtk/filetransfer.py:284
 #, fuzzy
 msgid "Connection with peer could not be established."
 msgstr "Соединение не может быть установлено."
 
-#: gajim/gtk/filetransfer.py:293
+#: gajim/gtk/filetransfer.py:292
 #, python-format
 msgid "Filename: %s"
 msgstr "Имя файла: %s"
 
-#: gajim/gtk/filetransfer.py:294
+#: gajim/gtk/filetransfer.py:293
 #, python-format
 msgid "Recipient: %s"
 msgstr "Получатель: %s"
 
-#: gajim/gtk/filetransfer.py:296
+#: gajim/gtk/filetransfer.py:295
 #, python-format
 msgid "Error message: %s"
 msgstr "Сообщение об ошибке: %s"
 
-#: gajim/gtk/filetransfer.py:333
-#, fuzzy
-msgid "File transfer error"
-msgstr "Ошибка передачи"
-
 #: gajim/gtk/filetransfer.py:334
 #, python-format
 msgid ""
-"The file %(file)s has been received, but it seems to have been damaged along "
-"the way.\n"
+"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:350
+#: gajim/gtk/filetransfer.py:340
+#, fuzzy
+msgid "_Download Again"
+msgstr "Не _спрашивать меня снова"
+
+#: gajim/gtk/filetransfer.py:355
 msgid "Gajim can not read this file"
 msgstr "Gajim не может прочитать файл"
 
-#: gajim/gtk/filetransfer.py:351
+#: gajim/gtk/filetransfer.py:356
 msgid "Another process is using this file."
 msgstr "Файл занят другим процессом."
 
-#: gajim/gtk/filetransfer.py:418
+#: gajim/gtk/filetransfer.py:423
 #, fuzzy
 msgid "File Transfer Conflict"
 msgstr "Передача файла завершена"
 
-#: gajim/gtk/filetransfer.py:419
+#: gajim/gtk/filetransfer.py:424
 msgid "This file already exists"
 msgstr "Файл уже существует"
 
-#: gajim/gtk/filetransfer.py:420
+#: gajim/gtk/filetransfer.py:425
 msgid "Resume download or replace file?"
 msgstr ""
 
-#: gajim/gtk/filetransfer.py:424
+#: gajim/gtk/filetransfer.py:429
 #, fuzzy
 msgid "Replace _File"
 msgstr "_Заменить"
 
-#: gajim/gtk/filetransfer.py:427
+#: gajim/gtk/filetransfer.py:432
 #, fuzzy
 msgid "Resume _Download"
 msgstr "Скачать"
 
-#: gajim/gtk/filetransfer.py:437
+#: gajim/gtk/filetransfer.py:442
 #, fuzzy, python-format
 msgid "Directory '%s' is not writable"
 msgstr "Папка «%s» не доступна для записи"
 
-#: gajim/gtk/filetransfer.py:438
+#: gajim/gtk/filetransfer.py:443
 #, fuzzy
 msgid "You do not have permissions to create files in this directory."
 msgstr "У вас нет права создавать файлы в этой директории."
 
-#: gajim/gtk/filetransfer.py:461
+#: gajim/gtk/filetransfer.py:466
 #, python-format
 msgid "File: %s"
 msgstr "Файл: %s"
 
-#: gajim/gtk/filetransfer.py:467
+#: gajim/gtk/filetransfer.py:472
 #, python-format
 msgid "Type: %s"
 msgstr "Тип: %s"
 
-#: gajim/gtk/filetransfer.py:469
+#: gajim/gtk/filetransfer.py:474
 #, python-format
 msgid "Description: %s"
 msgstr "Описание: %s"
 
-#: gajim/gtk/filetransfer.py:480
+#: gajim/gtk/filetransfer.py:485
 #, fuzzy, python-format
 msgid "%s wants to send you a file"
 msgstr "%s хочет отправить вам файл."
 
-#: gajim/gtk/filetransfer.py:509
+#: gajim/gtk/filetransfer.py:514
 msgid "Checking file…"
 msgstr "Проверяется файл ..."
 
-#: gajim/gtk/filetransfer.py:524
+#: gajim/gtk/filetransfer.py:529
 msgid "File error"
 msgstr "Файловая ошибка"
 
-#: gajim/gtk/filetransfer.py:561
+#: gajim/gtk/filetransfer.py:566
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 
-#: gajim/gtk/filetransfer.py:658
+#: gajim/gtk/filetransfer.py:663
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/s)"
 
-#: gajim/gtk/filetransfer.py:711 gajim/gtk/filetransfer.py:715
+#: gajim/gtk/filetransfer.py:716 gajim/gtk/filetransfer.py:720
 msgid "Invalid File"
 msgstr "Неверный файл"
 
-#: gajim/gtk/filetransfer.py:711
+#: gajim/gtk/filetransfer.py:716
 msgid "File: "
 msgstr "Файл: "
 
-#: gajim/gtk/filetransfer.py:716
+#: gajim/gtk/filetransfer.py:721
 msgid "It is not possible to send empty files"
 msgstr "Нельзя отсылать пустые файлы"
 
-#: gajim/gtk/filetransfer.py:742 gajim/gtk/tooltips.py:571
+#: gajim/gtk/filetransfer.py:747 gajim/gtk/tooltips.py:571
 msgid "Sender: "
 msgstr "Отправитель:"
 
-#: gajim/gtk/filetransfer.py:1038
+#: gajim/gtk/filetransfer.py:1043
 #, fuzzy
 msgid "Choose a File to Send…"
 msgstr "Выбрать файл для отправки..."
 
 #: gajim/gtk/start_chat.py:51
 #, fuzzy
-msgid "Start new Conversation"
+msgid "Start New Conversation"
 msgstr "Возобновлённая беседа"
 
-#: gajim/gtk/start_chat.py:424
-#, fuzzy
-msgid "New Groupchat"
-msgstr "Новая комната"
+#: gajim/gtk/start_chat.py:260 gajim/gtk/start_chat.py:328
+msgid "You can not join a group chat unless you are connected."
+msgstr "Вы не можете зайти в комнату без подключения."
 
-#: gajim/gtk/start_chat.py:426
+#: gajim/gtk/start_chat.py:603 gajim/gtk/groupchat_join.py:38
+msgid "Join Group Chat"
+msgstr "Войти в комнату"
+
+#: gajim/gtk/start_chat.py:605 gajim/gtk/add_contact.py:40
 #, fuzzy
-msgid "New Contact"
-msgstr "Добавить новый контакт"
+msgid "Add Contact"
+msgstr "Добавить контакт..."
 
-#: gajim/gtk/start_chat.py:588
+#: gajim/gtk/start_chat.py:746
 #, fuzzy, python-format
-msgid "%s Group chats found"
+msgid "%s group chats found"
 msgstr "%s не найден"
 
-#: gajim/gtk/discovery.py:70
+#: gajim/gtk/discovery.py:69
 msgid "This service has not yet responded with detailed information"
 msgstr "Этот сервис еще не сообщил информацию о себе"
 
-#: gajim/gtk/discovery.py:71
+#: gajim/gtk/discovery.py:70
 #, fuzzy
 msgid ""
 "This service could not respond with detailed information.\n"
@@ -8826,32 +9186,33 @@ msgstr ""
 "Этот сервис не может предоставить подробную информацию о себе. \n"
 "Скорее всего, он устарел или сломан"
 
-#: gajim/gtk/discovery.py:128
+#: gajim/gtk/discovery.py:126
 msgid "Others"
 msgstr "Другие"
 
-#: gajim/gtk/discovery.py:131
-msgid "Conference"
+#: gajim/gtk/discovery.py:129
+#, fuzzy
+msgid "Group Chat"
 msgstr "Комнаты"
 
-#: gajim/gtk/discovery.py:519
+#: gajim/gtk/discovery.py:518
 msgid "Without a connection, you can not browse available services"
 msgstr "Для просмотра сервисов необходимо сначала подключиться к серверу"
 
-#: gajim/gtk/discovery.py:606
+#: gajim/gtk/discovery.py:605
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Обзор сервисов с учётной записи %s"
 
-#: gajim/gtk/discovery.py:608
+#: gajim/gtk/discovery.py:607
 msgid "Service Discovery"
 msgstr "Обзор сервисов (discovery)"
 
-#: gajim/gtk/discovery.py:691
+#: gajim/gtk/discovery.py:690
 msgid "The service could not be found"
 msgstr "Сервис не обнаружен"
 
-#: gajim/gtk/discovery.py:692
+#: gajim/gtk/discovery.py:691
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -8859,99 +9220,78 @@ msgstr ""
 "По этому адресу сервисы отсутствуют или не отвечают. Проверьте адрес и "
 "попробуйте еще раз."
 
-#: gajim/gtk/discovery.py:699 gajim/gtk/discovery.py:1042
+#: gajim/gtk/discovery.py:698 gajim/gtk/discovery.py:1041
 msgid "The service is not browsable"
 msgstr "Сервис недоступен для просмотра"
 
-#: gajim/gtk/discovery.py:700
+#: gajim/gtk/discovery.py:699
 msgid "This type of service does not contain any items to browse."
 msgstr "Этот сервис не содержит ничего, что можно было бы просмотреть."
 
-#: gajim/gtk/discovery.py:738 gajim/gtk/discovery.py:747
+#: gajim/gtk/discovery.py:737 gajim/gtk/discovery.py:746
 msgid "Invalid Server Name"
 msgstr "Неверное имя сервера"
 
-#: gajim/gtk/discovery.py:806
+#: gajim/gtk/discovery.py:805
 #, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Просмотр %(address)s с учетной записью %(account)s"
 
-#: gajim/gtk/discovery.py:851
+#: gajim/gtk/discovery.py:850
 msgid "Browse"
 msgstr "Просмотреть"
 
-#: gajim/gtk/discovery.py:1043
+#: gajim/gtk/discovery.py:1042
 msgid "This service does not contain any items to browse."
 msgstr "Этот сервис не содержит ничего, что можно было бы просмотреть."
 
-#: gajim/gtk/discovery.py:1255
-#, fuzzy
+#: gajim/gtk/discovery.py:1254
 msgid "_Command"
-msgstr "Команды: %s"
+msgstr "_Команда"
 
-#: gajim/gtk/discovery.py:1264 gajim/gtk/discovery.py:1422
+#: gajim/gtk/discovery.py:1263 gajim/gtk/discovery.py:1420
 msgid "Re_gister"
 msgstr "За_регистрироваться"
 
-#: gajim/gtk/discovery.py:1277
+#: gajim/gtk/discovery.py:1276
 msgid "_Search"
 msgstr "_Поиск"
 
-#: gajim/gtk/discovery.py:1420
+#: gajim/gtk/discovery.py:1418
 msgid "_Edit"
 msgstr "_Правка"
 
-#: gajim/gtk/discovery.py:1458
+#: gajim/gtk/discovery.py:1456
 #, fuzzy, python-format
 msgid "Scanning %(current)d / %(total)d ..."
 msgstr "Сканирую %(current)d / %(total)d.."
 
-#: gajim/gtk/discovery.py:1674
+#: gajim/gtk/discovery.py:1655
+msgid "Users"
+msgstr "Пользователи"
+
+#: gajim/gtk/discovery.py:1671
 msgid "Id"
 msgstr "ID"
 
-#: gajim/gtk/discovery.py:1713
-msgid "_Join"
-msgstr "_Присоединиться"
-
-#: gajim/gtk/discovery.py:1736
-msgid "Bookmark already set"
-msgstr "Закладка уже установлена"
-
-#: gajim/gtk/discovery.py:1737
-#, fuzzy, python-format
-msgid "Group Chat '%s' is already in your bookmarks."
-msgstr "Комната «%s» уже есть в ваших закладках."
-
-#: gajim/gtk/discovery.py:1748
-msgid "Bookmark has been added successfully"
-msgstr "Закладка успешно добавлена"
-
-#: gajim/gtk/discovery.py:1749
-#, fuzzy
-msgid ""
-"You can manage your bookmarks by clicking the Bookmarks menu item in your "
-"contact list."
-msgstr "Вы можете управлять закладками через меню «Действия» в ростере."
-
-#: gajim/gtk/discovery.py:1950
+#: gajim/gtk/discovery.py:1900
 msgid "Subscribed"
 msgstr "Подписка"
 
-#: gajim/gtk/discovery.py:1959
+#: gajim/gtk/discovery.py:1909
 msgid "Node"
 msgstr "Узел"
 
-#: gajim/gtk/discovery.py:2028
+#: gajim/gtk/discovery.py:1978
 #, fuzzy
 msgid "_New post"
 msgstr "Новое сообщение"
 
-#: gajim/gtk/discovery.py:2037
+#: gajim/gtk/discovery.py:1987
 msgid "_Subscribe"
 msgstr "_Подписаться"
 
-#: gajim/gtk/discovery.py:2045
+#: gajim/gtk/discovery.py:1995
 msgid "_Unsubscribe"
 msgstr "_Отписаться"
 
@@ -8994,11 +9334,11 @@ msgid "Form: %s"
 msgstr "От %s"
 
 #: gajim/gtk/single_message.py:269
-#, fuzzy, python-format
+#, python-format
 msgid "Characters typed: %s"
-msgstr "Символ недопустим"
+msgstr "Введённые символы: %s"
 
-#: gajim/gtk/single_message.py:274 gajim/gtk/xml_console.py:169
+#: gajim/gtk/single_message.py:274 gajim/gtk/xml_console.py:166
 msgid "Connection not available"
 msgstr "Соединение недоступно"
 
@@ -9007,6 +9347,12 @@ msgstr "Соединение недоступно"
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Удостоверьтесь, что вы подключены к «%s»."
 
+#: gajim/gtk/single_message.py:306
+#, 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:330
 #, python-format
 msgid "RE: %s"
@@ -9017,28 +9363,30 @@ msgstr "RE: %s"
 msgid "%s wrote:\n"
 msgstr "%s написал:\n"
 
-#: gajim/gtk/pep_config.py:44
-#, fuzzy, python-format
+#: gajim/gtk/pep_config.py:45
+#, python-format
 msgid "PEP Service Configuration (%s)"
-msgstr "Настройка PEP сервисов"
+msgstr "Настройка PEP-сервисов (%s)"
 
-#: gajim/gtk/pep_config.py:77
+#: gajim/gtk/pep_config.py:78
 #, fuzzy
 msgid "Service"
 msgstr "_Сервисы"
 
-#: gajim/gtk/pep_config.py:114
+#: gajim/gtk/pep_config.py:115
 msgid "PEP node was not removed"
 msgstr "PEP узел не был удален"
 
-#: gajim/gtk/pep_config.py:115
-#, fuzzy, python-format
+#: gajim/gtk/pep_config.py:116
+#, 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:146
+#: gajim/gtk/pep_config.py:147
 #, python-format
 msgid "Configure %s"
 msgstr "Настроить %s"
@@ -9054,17 +9402,21 @@ msgstr "За_регистрироваться"
 msgid "Registration successful"
 msgstr "Регистрация завершена"
 
-#: gajim/gtk/dialogs.py:54 gajim/gtk/dataform.py:659 gajim/gtk/adhoc.py:85
+#: gajim/gtk/service_registration.py:215
+msgid "Registration failed"
+msgstr "Ошибка регистрации"
+
+#: gajim/gtk/dialogs.py:53 gajim/gtk/dataform.py:668 gajim/gtk/adhoc.py:86
 #, fuzzy
 msgid "Cancel"
 msgstr "О_тменить"
 
-#: gajim/gtk/dialogs.py:129
+#: gajim/gtk/dialogs.py:128
 #, fuzzy, python-format
 msgid "Dictionary for language \"%s\" not available"
 msgstr "Нет словаря для языка %s"
 
-#: gajim/gtk/dialogs.py:130
+#: gajim/gtk/dialogs.py:129
 #, python-format
 msgid ""
 "You have to install the dictionary \"%s\" to use spellchecking, or choose "
@@ -9077,11 +9429,11 @@ msgstr ""
 "\n"
 "Слова с ошибками подсвечиваться не будут"
 
-#: gajim/gtk/dialogs.py:410 gajim/gtk/dialogs.py:425
+#: gajim/gtk/dialogs.py:322 gajim/gtk/dialogs.py:337
 msgid "Insecure connection"
 msgstr "Небезопасное соединение"
 
-#: gajim/gtk/dialogs.py:411
+#: gajim/gtk/dialogs.py:323
 #, fuzzy, python-format
 msgid ""
 "You are about to connect to the account %(account)s (%(server)s) insecurely. "
@@ -9094,122 +9446,119 @@ msgstr ""
 "подключения не рекомендуется.\n"
 "Вы действительно хотите это сделать?"
 
-#: gajim/gtk/dialogs.py:416
+#: gajim/gtk/dialogs.py:328
 msgid "Yes, I really want to connect insecurely"
 msgstr "Да, я действительно хочу соединиться небезопасно"
 
-#: gajim/gtk/dialogs.py:417
+#: gajim/gtk/dialogs.py:329
 msgid "Gajim will NOT connect unless you check this box"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:675
-#, fuzzy
-msgid "The nickname contains invalid characters."
-msgstr "Имя файла содержит недопустимые символы."
-
 # смотря где вылазит меседж - нужно присмотреться
-#: gajim/gtk/dialogs.py:734
+#: gajim/gtk/dialogs.py:561
 #, fuzzy, python-format
 msgid "Destroy %s"
 msgstr "Удаление %s"
 
-#: gajim/gtk/dialogs.py:775
+#: gajim/gtk/dialogs.py:602
 #, fuzzy
 msgid "Certificate"
 msgstr "Сертификат Владельца"
 
-#: gajim/gtk/dialogs.py:786
-#, fuzzy, python-format
+#: gajim/gtk/dialogs.py:613
+#, python-format
 msgid ""
 "Certificate for account\n"
 "%s"
-msgstr "Сертификат учетной записи %s"
+msgstr ""
+"Сертификат учетной записи\n"
+"%s"
 
-#: gajim/gtk/dialogs.py:824
+#: gajim/gtk/dialogs.py:651
 msgid "Issued to\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:825 gajim/gtk/dialogs.py:830
+#: gajim/gtk/dialogs.py:652 gajim/gtk/dialogs.py:657
 msgid "Common Name (CN): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:826 gajim/gtk/dialogs.py:831
+#: gajim/gtk/dialogs.py:653 gajim/gtk/dialogs.py:658
 msgid "Organization (O): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:827 gajim/gtk/dialogs.py:832
+#: gajim/gtk/dialogs.py:654 gajim/gtk/dialogs.py:659
 msgid "Organizational Unit (OU): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:828
+#: gajim/gtk/dialogs.py:655
 #, fuzzy
 msgid "Serial Number: "
 msgstr "Номер GaduGadu"
 
-#: gajim/gtk/dialogs.py:829
+#: gajim/gtk/dialogs.py:656
 msgid "Issued by\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:833
+#: gajim/gtk/dialogs.py:660
 msgid "Validity\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:834
+#: gajim/gtk/dialogs.py:661
 msgid "Issued on: "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:835
+#: gajim/gtk/dialogs.py:662
 #, fuzzy
 msgid "Expires on: "
 msgstr "Истекает"
 
-#: gajim/gtk/dialogs.py:836
+#: gajim/gtk/dialogs.py:663
 msgid "SHA-1:"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:838
+#: gajim/gtk/dialogs.py:665
 msgid "SHA-256:"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:852
+#: gajim/gtk/dialogs.py:679
 #, fuzzy
 msgid "View certificate…"
 msgstr "Просмотреть журнал"
 
-#: gajim/gtk/dialogs.py:864 gajim/gtk/accounts.py:893
+#: gajim/gtk/dialogs.py:691 gajim/gtk/accounts.py:896
 msgid "Change Password"
 msgstr "Изменить пароль"
 
-#: gajim/gtk/dialogs.py:878
+#: gajim/gtk/dialogs.py:705
 msgid "_OK"
 msgstr "_ОК"
 
-#: gajim/gtk/dialogs.py:891
+#: gajim/gtk/dialogs.py:718
 #, fuzzy
 msgid "You must enter a password"
 msgstr "Необходимо ввести пароль."
 
-#: gajim/gtk/dialogs.py:895
+#: gajim/gtk/dialogs.py:722
 msgid "Passwords do not match"
 msgstr "Пароли не совпадают"
 
-#: gajim/gtk/dialogs.py:923
+#: gajim/gtk/dialogs.py:750
 #, fuzzy
 msgid "Group Chat Invitation "
 msgstr "Приглашение в комнату"
 
-#: gajim/gtk/dialogs.py:948
-#, fuzzy, python-format
+#: gajim/gtk/dialogs.py:775
+#, python-format
 msgid "<b>%s</b> has invited you to join a discussion"
-msgstr "$Contact приглашает вас присоединиться к обсуждению."
+msgstr "<b>%s</b> приглашает вас присоединиться к обсуждению."
 
-#: gajim/gtk/dialogs.py:951
-#, fuzzy, python-format
+#: gajim/gtk/dialogs.py:778
+#, 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:959
+#: gajim/gtk/dialogs.py:786
 #, python-format
 msgid "Comment: %s"
 msgstr "Комментарий: %s"
@@ -9224,11 +9573,6 @@ msgstr "Номер GaduGadu"
 msgid "ICQ Number"
 msgstr "Номер ICQ:"
 
-#: gajim/gtk/add_contact.py:40
-#, fuzzy
-msgid "Add Contact"
-msgstr "Добавить контакт..."
-
 #: gajim/gtk/add_contact.py:259
 #, fuzzy, python-format
 msgid "%s Missing"
@@ -9249,7 +9593,8 @@ msgid "The user ID must not contain a resource."
 msgstr "ID пользователя не должен содержать ресурс."
 
 #: gajim/gtk/add_contact.py:299
-msgid "You cannot add yourself to your roster."
+#, fuzzy
+msgid "You cannot add yourself to your contact list."
 msgstr "Вы не можете добавлять себя в свой ростер."
 
 #: gajim/gtk/add_contact.py:304
@@ -9262,11 +9607,13 @@ msgid "Your account must be online to add new contacts."
 msgstr ""
 
 #: gajim/gtk/add_contact.py:321
-msgid "Contact already in roster"
+#, fuzzy
+msgid "Contact Already in Contact List"
 msgstr "Контакт уже в ростере"
 
 #: gajim/gtk/add_contact.py:322
-msgid "This contact is already listed in your roster."
+#, fuzzy
+msgid "This contact is already in your contact list."
 msgstr "Этот контакт уже содержится в вашем ростере."
 
 #: gajim/gtk/add_contact.py:379 gajim/gtk/add_contact.py:417
@@ -9305,15 +9652,12 @@ msgid "Chatstate Paused"
 msgstr "Контакт изменит статус"
 
 #: gajim/gtk/themes.py:52
-#, fuzzy
-msgid "MUC Tab New Directed Message"
-msgstr ""
-"Адресованные\n"
-"сообщения в конференциях"
+msgid "Group Chat Tab New Directed Message"
+msgstr "Адресованные сообщения в конференциях"
 
 #: gajim/gtk/themes.py:56
 #, fuzzy
-msgid "MUC Tab New Message"
+msgid "Group Chat Tab New Message"
 msgstr "Новое сообщение"
 
 #: gajim/gtk/themes.py:60
@@ -9528,12 +9872,12 @@ msgstr "Все файлы"
 msgid "Clear File"
 msgstr "Очистить"
 
-#: gajim/gtk/settings.py:570
+#: gajim/gtk/settings.py:570 gajim/gtk/proxies.py:32
 msgid "Manage Proxies"
 msgstr "Управление профилями прокси"
 
-#: gajim/gtk/settings.py:591 gajim/gtk/preferences.py:971
-#: gajim/gtk/preferences.py:984 gajim/gtk/preferences.py:988
+#: gajim/gtk/settings.py:591 gajim/gtk/preferences.py:968
+#: gajim/gtk/preferences.py:982 gajim/gtk/preferences.py:986
 #, fuzzy
 msgid "No Proxy"
 msgstr "Прокси:"
@@ -9611,14 +9955,15 @@ msgid ""
 "        "
 msgstr ""
 
-#: gajim/gtk/about.py:47 data/org.gajim.Gajim.appdata.xml.in:10
+#: gajim/gtk/about.py:47 data/org.gajim.Gajim.desktop.in:6
+#: data/org.gajim.Gajim.appdata.xml.in:10
 #, fuzzy
-msgid "A GTK+ XMPP client"
+msgid "A GTK XMPP client"
 msgstr "Jabber/XMPP-клиент на GTK+"
 
 #: gajim/gtk/about.py:48
-#, python-format
-msgid "GTK+ Version: %s"
+#, fuzzy, python-format
+msgid "GTK Version: %s"
 msgstr "Версия GTK+: %s"
 
 #: gajim/gtk/about.py:49
@@ -9732,9 +10077,8 @@ msgid "Disconnected"
 msgstr "Отключен"
 
 #: gajim/gtk/tooltips.py:567
-#, fuzzy
 msgid "File Name: "
-msgstr "Имя файла: %s"
+msgstr "Имя файла:"
 
 #: gajim/gtk/tooltips.py:570
 #, fuzzy
@@ -9794,6 +10138,25 @@ msgstr "Приостановлено"
 msgid "?transfer status:Not started"
 msgstr "Приостановлено"
 
+#: gajim/gtk/groupchat_creation.py:97 gajim/gtk/groupchat_creation.py:99
+msgid " (optional)..."
+msgstr ""
+
+#: gajim/gtk/groupchat_creation.py:134
+#, fuzzy
+msgid "Invalid Address"
+msgstr "Неверный файл"
+
+#: gajim/gtk/groupchat_creation.py:182
+#, fuzzy
+msgid "Not Connected"
+msgstr "Подключен"
+
+#: gajim/gtk/groupchat_creation.py:183
+#, fuzzy
+msgid "You have to be connected to create a group chat."
+msgstr "Вы не вошли в комнату."
+
 #: gajim/gtk/sounds.py:39
 msgid "Wav Sounds"
 msgstr "В формате Wav"
@@ -9835,50 +10198,46 @@ msgstr "Вас упомянули в комнате"
 msgid "Group Chat Message Received"
 msgstr "Получено сообщение в комнате"
 
-#: gajim/gtk/dataform.py:226 gajim/gtk/dataform.py:262
+#: gajim/gtk/dataform.py:232 gajim/gtk/dataform.py:268
 #, fuzzy
 msgid "Required"
 msgstr "Требуемый пакет:"
 
-#: gajim/gtk/dataform.py:286
+#: gajim/gtk/dataform.py:293
 #, fuzzy
 msgid "Yes"
 msgstr "Да"
 
-#: gajim/gtk/dataform.py:286
+#: gajim/gtk/dataform.py:293
 #, fuzzy
 msgid "No"
 msgstr "Нет"
 
-#: gajim/gtk/dataform.py:661
+#: gajim/gtk/dataform.py:670
 msgid "Submit"
 msgstr ""
 
-#: gajim/gtk/statusicon.py:213
+#: gajim/gtk/statusicon.py:206
 #, fuzzy
 msgid "_Change Status Message…"
 msgstr "_Изменить сообщение о статусе"
 
-#: gajim/gtk/statusicon.py:247 gajim/gtk/statusicon.py:292
-#: gajim/gtk/statusicon.py:299
+#: gajim/gtk/statusicon.py:258
 #, python-format
 msgid "using account %s"
 msgstr "используя учетную запись %s"
 
-#: gajim/gtk/statusicon.py:309
+#: gajim/gtk/statusicon.py:269
 #, fuzzy
-msgid "_Manage Bookmarks…"
-msgstr "Управление закладками"
-
-#: gajim/gtk/statusicon.py:325
-msgid "Hide _Roster"
-msgstr "Скрыть _ростер"
+msgid "Hide _Contact List"
+msgstr "Пригласить _участников"
 
-#: gajim/gtk/statusicon.py:329
-msgid "Show _Roster"
-msgstr "Показать _ростер"
+#: gajim/gtk/statusicon.py:273
+#, fuzzy
+msgid "Show _Contact List"
+msgstr "Показать только активных"
 
-#: gajim/gtk/statusicon.py:337
+#: gajim/gtk/statusicon.py:281
 msgid "Hide this menu"
 msgstr "Скрыть это меню"
 
@@ -9923,35 +10282,6 @@ msgid ""
 msgstr ""
 "При публикации вашей личной информации произошла ошибка, попробуйте позже."
 
-#: gajim/gtk/join_groupchat.py:202
-#, fuzzy
-msgid "Invalid Room"
-msgstr "Неверная комната"
-
-#: gajim/gtk/join_groupchat.py:203
-msgid "Please choose a room"
-msgstr ""
-
-#: gajim/gtk/join_groupchat.py:222 gajim/gtk/join_groupchat.py:229
-msgid "Invalid Nickname"
-msgstr "Неверное имя пользователя"
-
-#: gajim/gtk/join_groupchat.py:223
-#, fuzzy
-msgid "Please choose a nickname"
-msgstr "Создайте новую тему с желаемым названием."
-
-#: gajim/gtk/join_groupchat.py:282 gajim/gtk/join_groupchat.py:288
-#: gajim/gtk/join_groupchat.py:293
-msgid "Wrong server"
-msgstr "Неверный сервер"
-
-#: gajim/gtk/join_groupchat.py:283 gajim/gtk/join_groupchat.py:289
-#: gajim/gtk/join_groupchat.py:294
-#, fuzzy, python-format
-msgid "%s is not a groupchat server"
-msgstr "URL «%s» сервера не является корректным"
-
 #: gajim/gtk/mam_preferences.py:38
 #, python-format
 msgid "Archiving Preferences for %s"
@@ -9981,45 +10311,53 @@ msgstr "Получена ошибка: {}"
 msgid "Archiving Preferences Error"
 msgstr "Настройки Архивации"
 
-#: gajim/gtk/advanced_config.py:81
+#: gajim/gtk/advanced_config.py:95
 msgid "Activated"
 msgstr "Активно"
 
-#: gajim/gtk/advanced_config.py:81
+#: gajim/gtk/advanced_config.py:95
 msgid "Deactivated"
 msgstr "Неактивно"
 
-#: gajim/gtk/advanced_config.py:83
-msgid "Boolean"
-msgstr "Булево"
+#: gajim/gtk/advanced_config.py:97
+msgid "?config type:Boolean"
+msgstr ""
+
+#: gajim/gtk/advanced_config.py:98
+msgid "?config type:Integer"
+msgstr ""
 
-#: gajim/gtk/advanced_config.py:84
-msgid "Integer"
-msgstr "Целое"
+#: gajim/gtk/advanced_config.py:99
+msgid "?config type:Text"
+msgstr ""
 
-#: gajim/gtk/advanced_config.py:85
-msgid "Text"
-msgstr "Текст"
+#: gajim/gtk/advanced_config.py:100
+msgid "?config type:Color"
+msgstr ""
 
-#: gajim/gtk/advanced_config.py:97
-msgid "Preference Name"
+#: gajim/gtk/advanced_config.py:112
+#, fuzzy
+msgid "?config:Preference Name"
 msgstr "Название опции"
 
-#: gajim/gtk/advanced_config.py:104
-msgid "Value"
-msgstr "Значение"
+#: gajim/gtk/advanced_config.py:123
+#, fuzzy
+msgid "?config:Value"
+msgstr "Настроить"
 
-#: gajim/gtk/advanced_config.py:113
-msgid "Type"
-msgstr "Тип"
+#: gajim/gtk/advanced_config.py:132
+msgid "?config:Type"
+msgstr ""
 
-#: gajim/gtk/advanced_config.py:168
-msgid "(None)"
-msgstr "(Нет)"
+#: gajim/gtk/advanced_config.py:187
+#, fuzzy
+msgid "?config description:None"
+msgstr "Нет"
 
-#: gajim/gtk/advanced_config.py:299
-msgid "Hidden"
-msgstr "Скрытый"
+#: gajim/gtk/advanced_config.py:322
+#, fuzzy
+msgid "?password:Hidden"
+msgstr "Пароль:"
 
 #: gajim/gtk/server_info.py:66
 #, fuzzy
@@ -10031,8 +10369,8 @@ msgstr "_Копировать адрес ссылки"
 msgid "%(days)s days, %(hours)s hours"
 msgstr ""
 
-#: gajim/gtk/server_info.py:218 gajim/gtk/accounts.py:749
-#: gajim/gtk/accounts.py:853
+#: gajim/gtk/server_info.py:218 gajim/gtk/accounts.py:752
+#: gajim/gtk/accounts.py:856
 #, fuzzy
 msgid "Hostname"
 msgstr "_Хост: "
@@ -10231,11 +10569,6 @@ msgstr "Недопустимое имя списка"
 msgid "You must enter a name to create a privacy list."
 msgstr "Необходимо ввести имя для нового списка доступа."
 
-#: gajim/gtk/groupchat_config.py:41
-#, fuzzy
-msgid "Group Chat Configuration"
-msgstr "Приглашение в комнату"
-
 #: gajim/gtk/groupchat_config.py:134
 #, fuzzy
 msgid "A Group Chat needs at least one Owner"
@@ -10246,69 +10579,67 @@ msgid "You are not allowed to modify the affiliation of Admins and Owners"
 msgstr ""
 
 #: gajim/gtk/groupchat_config.py:399
-msgid "An entry with this Jabber-ID already exists"
+msgid "An entry with this XMPP Address already exists"
 msgstr ""
 
-#: gajim/gtk/adhoc.py:91
+#: gajim/gtk/adhoc.py:92
 #, fuzzy
 msgid "Finish"
 msgstr "_Закончить"
 
-#: gajim/gtk/adhoc.py:97 gajim/gtk/adhoc.py:283
-#, fuzzy
+#: gajim/gtk/adhoc.py:98 gajim/gtk/adhoc.py:284
 msgid "Commands"
-msgstr "Команды: %s"
+msgstr "Команды"
 
-#: gajim/gtk/adhoc.py:103
+#: gajim/gtk/adhoc.py:104
 msgid "Next"
 msgstr ""
 
-#: gajim/gtk/adhoc.py:109
+#: gajim/gtk/adhoc.py:110
 #, fuzzy
 msgid "Previous"
 msgstr "Завистливый"
 
-#: gajim/gtk/adhoc.py:115
+#: gajim/gtk/adhoc.py:116
 #, fuzzy
 msgid "Execute"
 msgstr "Выполнить команду"
 
-#: gajim/gtk/adhoc.py:195
+#: gajim/gtk/adhoc.py:196
 #, fuzzy
 msgid "No commands available"
 msgstr "Нет доступной учетной записи"
 
-#: gajim/gtk/adhoc.py:244
+#: gajim/gtk/adhoc.py:245
 #, fuzzy
 msgid "Request Command List"
 msgstr "В_ыполнить команду..."
 
-#: gajim/gtk/adhoc.py:259
+#: gajim/gtk/adhoc.py:260
 #, fuzzy
 msgid "Executing…"
 msgstr "В_ыполнить команду..."
 
-#: gajim/gtk/adhoc.py:266
-#, fuzzy
+#: gajim/gtk/adhoc.py:267
 msgid "Command List"
-msgstr "Команды: %s"
+msgstr "Команды"
 
-#: gajim/gtk/adhoc.py:384
+#: gajim/gtk/adhoc.py:385
 #, fuzzy
 msgid "Finished"
 msgstr "_Закончить"
 
-#: gajim/gtk/adhoc.py:453
+#: gajim/gtk/adhoc.py:454
 #, fuzzy
 msgid "Execution failed"
 msgstr "Соединение разорвалось"
 
-#: gajim/gtk/blocking.py:37
+#: gajim/gtk/blocking.py:38
 #, fuzzy, python-format
 msgid "Blocking List for %s"
 msgstr "Список доступа для %s"
 
-#: gajim/gtk/blocking.py:71
+#: gajim/gtk/blocking.py:72
 #, fuzzy
 msgid "Error!"
 msgstr "Ошибка"
@@ -10357,8 +10688,7 @@ msgstr "Неверное имя пользователя"
 msgid "You must provide a username to configure this account."
 msgstr "Для настройки учетной записи необходимо ввести имя пользователя."
 
-#: gajim/gtk/account_wizard.py:252 gajim/gtk/bookmarks.py:290
-#: gajim/gtk/bookmarks.py:303
+#: gajim/gtk/account_wizard.py:252
 msgid "Invalid server"
 msgstr "Неверный сервер"
 
@@ -10374,7 +10704,7 @@ msgstr "Неверная запись"
 msgid "Custom port must be a port number."
 msgstr "В качестве номера порта должно выступать число"
 
-#: gajim/gtk/account_wizard.py:405
+#: gajim/gtk/account_wizard.py:406
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -10389,15 +10719,15 @@ msgstr ""
 "Ошибка SSL: %(error)s\n"
 "Соединиться с этим сервером?"
 
-#: gajim/gtk/account_wizard.py:446 gajim/gtk/account_wizard.py:480
+#: gajim/gtk/account_wizard.py:447 gajim/gtk/account_wizard.py:481
 msgid "An error occurred during account creation"
 msgstr "Произошла ошибка при создании учетной записи"
 
-#: gajim/gtk/account_wizard.py:545
+#: gajim/gtk/account_wizard.py:546
 msgid "Account name is in use"
 msgstr "Такое имя учетной записи уже используется"
 
-#: gajim/gtk/account_wizard.py:546
+#: gajim/gtk/account_wizard.py:547
 msgid "You already have an account using this name."
 msgstr "У вас уже есть учетная запись с таким именем."
 
@@ -10417,32 +10747,32 @@ msgstr "Шифруем файл…"
 #: gajim/gtk/http_upload_progress.py:111
 #, fuzzy, python-format
 msgid "%(progress)s of %(total)s"
-msgstr "%(received)s из %(max)s"
+msgstr "%(progress)s из %(total)s"
 
 #: gajim/gtk/http_upload_progress.py:127
 #, python-format
 msgid "%(minutes)s min %(seconds)s sec"
 msgstr ""
 
-#: gajim/gtk/xml_console.py:77
+#: gajim/gtk/xml_console.py:74
 #, fuzzy
 msgid "Filter"
 msgstr "Фильтр:"
 
-#: gajim/gtk/xml_console.py:82
+#: gajim/gtk/xml_console.py:79
 msgid "XML Input"
 msgstr "XML Ввод"
 
-#: gajim/gtk/xml_console.py:86
+#: gajim/gtk/xml_console.py:83
 msgid "Paste Last Input"
 msgstr ""
 
-#: gajim/gtk/xml_console.py:170
+#: gajim/gtk/xml_console.py:167
 #, fuzzy, python-format
 msgid "Please make sure you are connected with '%s'."
 msgstr "Удостоверьтесь, что вы подключены к «%s»."
 
-#: gajim/gtk/xml_console.py:182
+#: gajim/gtk/xml_console.py:177
 #, fuzzy
 msgid "Invalid Node"
 msgstr "Неверный файл"
@@ -10475,152 +10805,168 @@ msgstr "Поиск"
 msgid "No results found"
 msgstr "Нет результата"
 
-#: gajim/gtk/preferences.py:358 gajim/gtk/preferences.py:362
+#: gajim/gtk/preferences.py:357 gajim/gtk/preferences.py:361
 msgid "Default"
 msgstr "По умолчанию"
 
-#: gajim/gtk/preferences.py:801
+#: gajim/gtk/preferences.py:798
 msgid "status message title"
 msgstr "заголовок сообщения о статусе"
 
-#: gajim/gtk/preferences.py:802
+#: gajim/gtk/preferences.py:799
 msgid "status message text"
 msgstr "текст сообщения о статусе"
 
+#: gajim/gtk/accounts.py:137
+#, fuzzy
+msgid "Re-Login"
+msgstr "Авторизация"
+
 #: gajim/gtk/accounts.py:138
-msgid "Relogin now?"
+#, fuzzy
+msgid "Re-Login now?"
 msgstr "Переподключиться сейчас?"
 
 #: gajim/gtk/accounts.py:139
-msgid "If you want all the changes to apply instantly, you must relogin."
+#, fuzzy
+msgid "To apply all changes instantly, you have to re-login."
 msgstr ""
 "Если вы хотите, чтобы изменения были применены немедленно, вы должны "
 "переподключиться."
 
-#: gajim/gtk/accounts.py:191 gajim/gtk/accounts.py:975
+#: gajim/gtk/accounts.py:141
+msgid "_Later"
+msgstr ""
+
+#: gajim/gtk/accounts.py:143
 #, fuzzy
+msgid "_Re-Login"
+msgstr "Авторизация"
+
+#: gajim/gtk/accounts.py:194 gajim/gtk/accounts.py:978
 msgid "Remove Account"
-msgstr "Удаление учетной записи %s"
+msgstr "Удаление учетной записи"
 
-#: gajim/gtk/accounts.py:192
+#: gajim/gtk/accounts.py:195
 #, fuzzy, python-format
 msgid "You still have open chats in your account %s"
 msgstr "У вас есть окна чата под учётной записью %s"
 
-#: gajim/gtk/accounts.py:193
-#, fuzzy
+#: gajim/gtk/accounts.py:196
 msgid ""
 "All chat and group chat windows will be closed.\n"
 "Do you want to continue?"
-msgstr "Все окна чатов и комнат будут закрыты. Продолжить?"
+msgstr ""
+"Все окна чатов и комнат будут закрыты.\n"
+"Продолжить?"
 
-#: gajim/gtk/accounts.py:424
+#: gajim/gtk/accounts.py:427
 #, fuzzy
 msgid "Back"
 msgstr "Скоро буду"
 
-#: gajim/gtk/accounts.py:530
+#: gajim/gtk/accounts.py:533
 #, fuzzy
 msgid "Please check if Bonjour is installed."
 msgstr "Удостоверьтесь, что Avahi или Bonjour установлен."
 
-#: gajim/gtk/accounts.py:532
+#: gajim/gtk/accounts.py:535
 #, fuzzy
 msgid "Please check if Avahi is installed."
 msgstr "Удостоверьтесь, что Avahi или Bonjour установлен."
 
-#: gajim/gtk/accounts.py:569
+#: gajim/gtk/accounts.py:572
 #, fuzzy
 msgid "Disable Account"
 msgstr "Неверное имя учетной записи"
 
-#: gajim/gtk/accounts.py:570
+#: gajim/gtk/accounts.py:573
 #, fuzzy, python-format
 msgid "Account %s is still connected"
 msgstr "Учетная запись «%s» подключена к серверу"
 
-#: gajim/gtk/accounts.py:571
+#: gajim/gtk/accounts.py:574
 #, fuzzy
 msgid ""
 "All chat and group chat windows will be closed. Do you want to continue?"
 msgstr "Все окна чатов и комнат будут закрыты. Продолжить?"
 
-#: gajim/gtk/accounts.py:576
+#: gajim/gtk/accounts.py:579
 #, fuzzy
 msgid "_Disable Account"
 msgstr "Неверное имя учетной записи"
 
-#: gajim/gtk/accounts.py:595
+#: gajim/gtk/accounts.py:598
 #, fuzzy
 msgid "Add Account"
 msgstr "Добавить контакт..."
 
-#: gajim/gtk/accounts.py:663
+#: gajim/gtk/accounts.py:666
 #, fuzzy
 msgid "Label"
 msgstr "статусное сообщение"
 
-#: gajim/gtk/accounts.py:667
+#: gajim/gtk/accounts.py:670
 msgid "Login"
 msgstr "Авторизация"
 
-#: gajim/gtk/accounts.py:670
+#: gajim/gtk/accounts.py:673
 msgid "Import Contacts"
 msgstr "Импорт Контактов"
 
-#: gajim/gtk/accounts.py:674 gajim/gtk/accounts.py:870
+#: gajim/gtk/accounts.py:677 gajim/gtk/accounts.py:873
 msgid "Client Certificate"
 msgstr "Сертификат Владельца"
 
-#: gajim/gtk/accounts.py:677 gajim/gtk/accounts.py:774
+#: gajim/gtk/accounts.py:680 gajim/gtk/accounts.py:777
 #, fuzzy
 msgid "Connect on startup"
 msgstr "_Соединяться при запуске Gajim"
 
-#: gajim/gtk/accounts.py:681 gajim/gtk/accounts.py:779
+#: gajim/gtk/accounts.py:684 gajim/gtk/accounts.py:782
 msgid "Save conversations for all contacts"
 msgstr "Сохранять историю для всех контактов"
 
-#: gajim/gtk/accounts.py:683 gajim/gtk/accounts.py:781
+#: gajim/gtk/accounts.py:686 gajim/gtk/accounts.py:784
 msgid "Store conversations on the harddrive"
 msgstr "Сохранять переписку на жестком диске"
 
-#: gajim/gtk/accounts.py:685 gajim/gtk/accounts.py:783
+#: gajim/gtk/accounts.py:688 gajim/gtk/accounts.py:786
 msgid "Global Status"
 msgstr "Глобальный статус"
 
-#: gajim/gtk/accounts.py:687
+#: gajim/gtk/accounts.py:690
 #, fuzzy
 msgid "Synchronise the status of all accounts"
 msgstr "Изменяет статус учетной записи или записей"
 
-#: gajim/gtk/accounts.py:689
+#: gajim/gtk/accounts.py:692
 msgid "Use file transfer proxies"
 msgstr "Использовать прокси для передачи файла"
 
-#: gajim/gtk/accounts.py:705
+#: gajim/gtk/accounts.py:708
 #, fuzzy
 msgid "Idle Time"
 msgstr "Бездействует с:"
 
-#: gajim/gtk/accounts.py:707
+#: gajim/gtk/accounts.py:710
 msgid "Disclose the time of your last activity"
 msgstr ""
 
-#: gajim/gtk/accounts.py:709
+#: gajim/gtk/accounts.py:712
 msgid "Local System Time"
 msgstr ""
 
-#: gajim/gtk/accounts.py:711
+#: gajim/gtk/accounts.py:714
 msgid "Disclose the local system time of the device Gajim runs on"
 msgstr ""
 
-#: gajim/gtk/accounts.py:714
+#: gajim/gtk/accounts.py:717
 #, fuzzy
 msgid "Client / Operating System"
 msgstr "Сертификат Владельца"
 
-#: gajim/gtk/accounts.py:716
+#: gajim/gtk/accounts.py:719
 #, fuzzy
 msgid ""
 "Disclose informations about the client and operating system you currently use"
@@ -10628,175 +10974,170 @@ msgstr ""
 "Разрешить Gajim отправлять информацию о операционной системе, которую вы "
 "используете"
 
-#: gajim/gtk/accounts.py:719
+#: gajim/gtk/accounts.py:722
 #, fuzzy
 msgid "Ignore Unknown Contacts"
 msgstr "Пригласить участников"
 
-#: gajim/gtk/accounts.py:721
+#: gajim/gtk/accounts.py:724
 #, fuzzy
 msgid "Ignore everything from contacts not in your Roster"
 msgstr "_Игнорировать события от контактов не из ростера"
 
-#: gajim/gtk/accounts.py:737 gajim/gtk/accounts.py:776
+#: gajim/gtk/accounts.py:740 gajim/gtk/accounts.py:779
 msgid "Use environment variable"
 msgstr "Использовать переменную среды"
 
-#: gajim/gtk/accounts.py:739
-#, fuzzy
-msgid "Proxy"
-msgstr "Прокси:"
-
 # insecure - небезопастный или незащищенный?
-#: gajim/gtk/accounts.py:742
+#: gajim/gtk/accounts.py:745
 msgid "Warn on insecure connection"
 msgstr "Предупреждать перед использованием небезапасного соединения"
 
-#: gajim/gtk/accounts.py:746
+#: gajim/gtk/accounts.py:749
 msgid "Send keep-alive packets"
 msgstr "Отправить пинг"
 
-#: gajim/gtk/accounts.py:750
+#: gajim/gtk/accounts.py:753
 msgid "Manually set the hostname for the server"
 msgstr "Ручной ввод имени сервера"
 
-#: gajim/gtk/accounts.py:756 gajim/gtk/accounts.py:826
-#: gajim/gtk/accounts.py:831
+#: gajim/gtk/accounts.py:759 gajim/gtk/accounts.py:829
+#: gajim/gtk/accounts.py:834
 #, fuzzy
 msgid "Priority"
 msgstr "Приори_тет:"
 
-#: gajim/gtk/accounts.py:785
+#: gajim/gtk/accounts.py:788
 #, fuzzy
 msgid "Synchronize the status of all accounts"
 msgstr "Изменяет статус учетной записи или записей"
 
-#: gajim/gtk/accounts.py:795
+#: gajim/gtk/accounts.py:798
 #, fuzzy
 msgid "First Name"
 msgstr "Имя:"
 
-#: gajim/gtk/accounts.py:798
+#: gajim/gtk/accounts.py:801
 #, fuzzy
 msgid "Last Name"
 msgstr "Фамилия:"
 
-#: gajim/gtk/accounts.py:804
+#: gajim/gtk/accounts.py:807
 #, fuzzy
 msgid "Email"
 msgstr "Новое письмо"
 
-#: gajim/gtk/accounts.py:822
+#: gajim/gtk/accounts.py:825
 #, fuzzy
 msgid "Adjust to status"
 msgstr "В _зависимости от статуса"
 
-#: gajim/gtk/accounts.py:849
+#: gajim/gtk/accounts.py:852
 msgid "Enable"
 msgstr "Включить"
 
-#: gajim/gtk/accounts.py:857
+#: gajim/gtk/accounts.py:860
 #, fuzzy
 msgid "Port"
 msgstr "_Порт:"
 
-#: gajim/gtk/accounts.py:862
+#: gajim/gtk/accounts.py:865
 #, fuzzy
 msgid "Connection Settings"
 msgstr "Соединение"
 
-#: gajim/gtk/accounts.py:872
+#: gajim/gtk/accounts.py:875
 msgid "PKCS12 Files"
 msgstr "Файлы PKCS12"
 
-#: gajim/gtk/accounts.py:874
+#: gajim/gtk/accounts.py:877
 msgid "Encrypted Certificate"
 msgstr "Шифрованный Сертификат"
 
-#: gajim/gtk/accounts.py:878
+#: gajim/gtk/accounts.py:881
 #, fuzzy
 msgid "Certificate Settings"
 msgstr "Сертификат владельца"
 
-#: gajim/gtk/accounts.py:890
+#: gajim/gtk/accounts.py:893
 #, fuzzy
 msgid "Save Password"
 msgstr "Сохранить пароль"
 
-#: gajim/gtk/accounts.py:898
+#: gajim/gtk/accounts.py:901
 #, fuzzy
 msgid "Login Settings"
 msgstr "Модули"
 
-#: gajim/gtk/accounts.py:931
+#: gajim/gtk/accounts.py:934
 #, fuzzy, python-format
 msgid "Removing account %s"
 msgstr "Удаление учетной записи %s"
 
-#: gajim/gtk/accounts.py:946
+#: gajim/gtk/accounts.py:949
 msgid "Account is disabled"
 msgstr "Учетная запись отключена"
 
-#: gajim/gtk/accounts.py:947
+#: gajim/gtk/accounts.py:950
 #, fuzzy
 msgid "To unregister from a server, the account must be enabled."
 msgstr ""
 "Для удаления регистрации с сервера, учетная запись должна быть активна."
 
-#: gajim/gtk/accounts.py:962
+#: gajim/gtk/accounts.py:965
 #, fuzzy
 msgid "Password required"
 msgstr "Требуется пароль"
 
-#: gajim/gtk/accounts.py:976
+#: gajim/gtk/accounts.py:979
 #, fuzzy, python-format
 msgid "Account '%s' is still connected to the server"
 msgstr "Учетная запись «%s» подключена к серверу"
 
-#: gajim/gtk/accounts.py:978
+#: gajim/gtk/accounts.py:981
 msgid "If you remove it, the connection will be lost."
 msgstr "Если вы удалите его, произойдет отключение."
 
-#: gajim/gtk/accounts.py:995
+#: gajim/gtk/accounts.py:998
 #, python-format
 msgid "Connection to server %s failed"
 msgstr "Не удалось соединиться с сервером %s"
 
-#: gajim/gtk/accounts.py:996
+#: gajim/gtk/accounts.py:999
 msgid "What would you like to do?"
 msgstr "Что вы хотите сделать?"
 
-#: gajim/gtk/accounts.py:997
+#: gajim/gtk/accounts.py:1000
 msgid "Remove only from Gajim"
 msgstr "Удалить только из Gajim"
 
-#: gajim/gtk/accounts.py:998
+#: gajim/gtk/accounts.py:1001
 msgid "Don't remove anything. I'll try again later"
 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> несколько контактов в ваш список "
-"контактов."
+msgstr "<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> несколько контактов в ваш список "
-"контактов."
+msgstr "<b>%s</b> хочет удалить несколько контактов в вашем списке контактов."
 
 #: gajim/gtk/roster_item_exchange.py:73 gajim/gtk/roster_item_exchange.py:161
 msgid "Modify"
 msgstr "Изменить"
 
+#: gajim/gtk/roster_item_exchange.py:80
+msgid "JID"
+msgstr "JID"
+
 #: gajim/gtk/roster_item_exchange.py:86
 msgid "Groups"
 msgstr "Группы"
@@ -10822,19 +11163,19 @@ msgstr[0] "Удален %d контакт"
 msgstr[1] "Удалено %d контактов"
 msgstr[2] ""
 
-#: gajim/gtk/util.py:581
+#: gajim/gtk/util.py:583
 msgid "Unknown Artist"
 msgstr "Неизвестный исполнитель"
 
-#: gajim/gtk/util.py:582
+#: gajim/gtk/util.py:584
 msgid "Unknown Title"
 msgstr "Неизвестная песня"
 
-#: gajim/gtk/util.py:583
+#: gajim/gtk/util.py:585
 msgid "Unknown Source"
 msgstr "Неизвестный альбом"
 
-#: gajim/gtk/util.py:585
+#: gajim/gtk/util.py:587
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
@@ -10843,29 +11184,10 @@ msgstr ""
 "<b>«%(title)s»</b> <i>%(artist)s</i>\n"
 "из <i>%(source)s</i>"
 
-#: gajim/gtk/bookmarks.py:121
-msgid "New Group Chat"
-msgstr "Новая комната"
-
-#: gajim/gtk/bookmarks.py:161
-msgid "This bookmark has invalid data"
-msgstr "Эта закладка содержит неверные данные"
-
-#: gajim/gtk/bookmarks.py:162
-msgid ""
-"Please be sure to fill out server and room fields or remove this bookmark."
-msgstr ""
-"Удостоверьтесь, что заполнены поля с именем сервера и комнаты, либо удалите "
-"эту закладку."
-
-#: gajim/gtk/bookmarks.py:273 gajim/gtk/bookmarks.py:291
-#: gajim/gtk/bookmarks.py:304 gajim/gtk/bookmarks.py:335
-msgid "Character not allowed"
-msgstr "Символ недопустим"
-
-#: gajim/gtk/bookmarks.py:334
-msgid "Invalid room"
-msgstr "Неверная комната"
+#: gajim/gtk/bookmarks.py:47
+#, fuzzy, python-format
+msgid "Bookmarks for %s"
+msgstr "Закладки"
 
 #: gajim/plugins/pluginmanager.py:736 gajim/plugins/pluginmanager.py:742
 msgid "Archive corrupted"
@@ -10876,48 +11198,51 @@ msgid "Archive empty"
 msgstr "Архив пуст"
 
 #: gajim/plugins/pluginmanager.py:750 gajim/plugins/pluginmanager.py:758
-#: gajim/plugins/gui.py:257
+#: gajim/plugins/gui.py:258
 msgid "Archive is malformed"
 msgstr "Формат архива не поддерживается"
 
-#: gajim/plugins/pluginmanager.py:766 gajim/plugins/gui.py:281
-#: gajim/plugins/gui.py:289
+#: gajim/plugins/pluginmanager.py:766 gajim/plugins/gui.py:288
+#: gajim/plugins/gui.py:301
 msgid "Plugin already exists"
 msgstr "Модуль уже существует"
 
-#: gajim/plugins/gui.py:82
+#: gajim/plugins/gui.py:83
 msgid "Click to view Gajim's wiki page on how to install plugins in Flatpak."
 msgstr ""
 
-#: gajim/plugins/gui.py:89
+#: gajim/plugins/gui.py:90
 msgid "Plugin"
 msgstr "Модуль"
 
-#: gajim/plugins/gui.py:151
+#: gajim/plugins/gui.py:152
 #, python-format
 msgid "Warning: %s"
 msgstr "Предупреждение:  %s"
 
-#: gajim/plugins/gui.py:206
+#: gajim/plugins/gui.py:207
 msgid "Plugin failed"
 msgstr "Ошибка в модуле"
 
-#: gajim/plugins/gui.py:245
+#: gajim/plugins/gui.py:246
 msgid "Unable to properly remove the plugin"
 msgstr "Невозможно правильно удалить модуль"
 
-#: gajim/plugins/gui.py:281
-msgid "Overwrite?"
+#: gajim/plugins/gui.py:287
+#, fuzzy
+msgid "Overwrite Plugin?"
 msgstr "Перезаписать?"
 
+#: gajim/plugins/gui.py:289
+#, fuzzy
+msgid "Do you want to overwrite the currently installed version?"
+msgstr "Вы принимаете приглашение?"
+
 #: data/org.gajim.Gajim.desktop.in:5
-msgid "Jabber IM Client"
+#, fuzzy
+msgid "XMPP IM Client"
 msgstr "Jabber-клиент для мгновенных сообщений"
 
-#: data/org.gajim.Gajim.desktop.in:6
-msgid "A GTK+ Jabber client"
-msgstr "Jabber-клиент на GTK+"
-
 #: data/org.gajim.Gajim.desktop.in:8
 msgid "chat;messaging;im;xmpp;bonjour;voip;"
 msgstr ""
@@ -10969,7 +11294,7 @@ msgid "Easily send pictures, videos or other files to friends and groups"
 msgstr ""
 
 #: data/org.gajim.Gajim.appdata.xml.in:27
-msgid "Chat securely with End-to-End encryption via OMEMO or PGP"
+msgid "Chat securely with End-to-End encryption via OMEMO or OpenPGP"
 msgstr ""
 
 #: data/org.gajim.Gajim.appdata.xml.in:28
@@ -11031,7 +11356,7 @@ msgstr ""
 
 #: data/org.gajim.Gajim.appdata.xml.in:52
 #, fuzzy
-msgid "Roster, list of contacts"
+msgid "Contact list, list of contacts"
 msgstr "_Записывать в лог изменения статусов контактов"
 
 #: data/org.gajim.Gajim.appdata.xml.in:56
@@ -11053,6 +11378,535 @@ msgstr "Недавно:"
 msgid "Plugin manager"
 msgstr "Ошибка в модуле"
 
+#, fuzzy
+#~ msgid "Configure Services…"
+#~ msgstr "Настроить Сервисы..."
+
+#, fuzzy
+#~ msgid "Group Chat Bookmarks"
+#~ msgstr "_Комната"
+
+#, fuzzy
+#~ msgid "Add Bookmark"
+#~ msgstr "Добавить эту комнату в _закладки"
+
+#, fuzzy
+#~ msgid "Remove Bookmark"
+#~ msgstr "Добавить эту комнату в _закладки"
+
+#, fuzzy
+#~ msgid "Bookmark Name"
+#~ msgstr "Добавить комнату в закладки"
+
+#, fuzzy
+#~ msgid "_Server"
+#~ msgstr "_Сервер:"
+
+#, fuzzy
+#~ msgid "Roo_m"
+#~ msgstr "_Комната:"
+
+#, fuzzy
+#~ msgid "_Password"
+#~ msgstr "_Пароль:"
+
+#, fuzzy
+#~ msgid "Join chat when connected"
+#~ msgstr "Контакт отключился"
+
+#~ msgid "New Group Chat"
+#~ msgstr "Новая комната"
+
+#~ msgid "This bookmark has invalid data"
+#~ msgstr "Эта закладка содержит неверные данные"
+
+#, fuzzy
+#~ msgid ""
+#~ "Please be sure to fill out server and group chat fields or remove this "
+#~ "bookmark."
+#~ msgstr ""
+#~ "Удостоверьтесь, что заполнены поля с именем сервера и комнаты, либо "
+#~ "удалите эту закладку."
+
+#~ msgid "Character not allowed"
+#~ msgstr "Символ недопустим"
+
+#, fuzzy
+#~ msgid "Invalid Group Chat"
+#~ msgstr "Неверное имя комнаты"
+
+#~ msgid "Unable to join group chat"
+#~ msgstr "Не получается войти в комнату"
+
+#~ msgid "You are banned from group chat <b>%s</b>."
+#~ msgstr "Вам запрещено входить в комнату <b>%s</b>."
+
+#, fuzzy
+#~ msgid "Remote server <b>%s</b> does not exist."
+#~ msgstr "Комнаты <b>%s</b> не существует."
+
+#~ msgid "Group chat <b>%s</b> does not exist."
+#~ msgstr "Комнаты <b>%s</b> не существует."
+
+#, fuzzy
+#~ msgid "Group chat creation is not permitted."
+#~ msgstr "Создание комнат запрещено."
+
+#, fuzzy
+#~ msgid "You must use your registered nickname in <b>%s</b>."
+#~ msgstr ""
+#~ "Необходимо использовать ваш зарегистрированный ник в комнате <b>%s</b>."
+
+#, fuzzy
+#~ msgid "You are not in the members list in group chat %s."
+#~ msgstr "Вас нет в списке членов комнаты %s."
+
+#, fuzzy
+#~ msgid "XMPP Address is not a group chat"
+#~ msgstr "Это не комната"
+
+#~ msgid "This is not a group chat"
+#~ msgstr "Это не комната"
+
+#, fuzzy
+#~ msgid "Please choose a group chat"
+#~ msgstr "Создайте новую тему с желаемым названием."
+
+#~ msgid "Invalid Nickname"
+#~ msgstr "Неверное имя пользователя"
+
+#, fuzzy
+#~ msgid "Please choose a nickname"
+#~ msgstr "Создайте новую тему с желаемым названием."
+
+#~ msgid "Wrong server"
+#~ msgstr "Неверный сервер"
+
+#, fuzzy
+#~ msgid "%s is not a group chat server"
+#~ msgstr "URL «%s» сервера не является корректным"
+
+#, fuzzy
+#~ msgid ""
+#~ "How many lines to request from server when entering a group chat. -1 "
+#~ "means no limit."
+#~ msgstr ""
+#~ "Количество строк истории сообщений, запрашиваемых при входе в комнату. -1 "
+#~ "- не ограничено"
+
+#, fuzzy
+#~ msgid ""
+#~ "Minutes of backlog to request when entering a group chat. -1 means no "
+#~ "limit."
+#~ msgstr ""
+#~ "За какой период (минут назад) запрашивать историю сообщений при входе в "
+#~ "комнату. -1 - не ограничено"
+
+#, fuzzy
+#~ msgid ""
+#~ "How many lines to request from server when entering a group chat. -1 "
+#~ "means no limit, -2 means global value."
+#~ msgstr ""
+#~ "Количество строк истории сообщений, запрашиваемых при входе в комнату. -1 "
+#~ "- не ограничено, -2 - глобальное значение"
+
+#, fuzzy
+#~ msgid ""
+#~ "Minutes of backlog to request when entering a group chat. -1 means no "
+#~ "limit, -2 means global value."
+#~ msgstr ""
+#~ "За какой период (минут назад) запрашивать историю сообщений при входе в "
+#~ "комнату. -1 - не ограничено, -2 -  глобальное значение"
+
+#, fuzzy
+#~ msgid "A Password is required to join the group chat %s. Please type it."
+#~ msgstr "Чтобы войти в комнату %s, нужен пароль."
+
+#~ msgid "Not in Roster"
+#~ msgstr "Не в ростере"
+
+#~ msgid "I would like to add you to my roster"
+#~ msgstr "Вы не против, если я добавлю Вас к себе в ростер?"
+
+#~ msgid "Add to Roster"
+#~ msgstr "Добавить в ростер"
+
+#~ msgid "Audio Session"
+#~ msgstr "Аудио Сессия"
+
+#~ msgid "Video Session"
+#~ msgstr "Видео Сессия"
+
+#~ msgid "Manage Room"
+#~ msgstr "Управление комнатой"
+
+#~ msgid "Configure Room"
+#~ msgstr "Настроить комнату"
+
+#~ msgid "Destroy Room"
+#~ msgstr "Уничтожить комнату"
+
+#~ msgid "Change Nick"
+#~ msgstr "Изменить ник"
+
+#~ msgid "Disconnect"
+#~ msgstr "Выйти"
+
+#~ msgid "Copy JID"
+#~ msgstr "Копировать JID"
+
+#, fuzzy
+#~ msgid "Add to Roster…"
+#~ msgstr "Добавить в ростер"
+
+#, fuzzy
+#~ msgid "Copy JID/Email"
+#~ msgstr "_Скопировать JID/почтовый адрес"
+
+#, fuzzy
+#~ msgid "JID: <i>%s</i>"
+#~ msgstr "Jabber ID: <i>%s</i>"
+
+#~ msgid "Changing Subject"
+#~ msgstr "Смена темы"
+
+#~ msgid "Please specify the new subject:"
+#~ msgstr "Введите новую тему:"
+
+#~ msgid "Room logging is now enabled"
+#~ msgstr "Запись логов конференции включена"
+
+#~ msgid "Room logging is now disabled"
+#~ msgstr "Запись логов конференции выключена"
+
+#, fuzzy
+#~ msgid "You (%s) joined the room"
+#~ msgstr "%s зашёл в комнату"
+
+#~ msgid "Room logging is enabled"
+#~ msgstr "Запись логов конференции включена"
+
+#, fuzzy
+#~ msgid "Unable to join groupchat"
+#~ msgstr "Не получается войти в комнату"
+
+#~ msgid "Groupchat Invitation"
+#~ msgstr "Приглашение в комнату"
+
+#~ msgid "%(jid)s has been invited in this room"
+#~ msgstr "%(jid)s был приглашен в комнату"
+
+#, fuzzy
+#~ msgid "JID is not a Groupchat"
+#~ msgstr "Это не комната"
+
+#~ msgid "Invalid JID"
+#~ msgstr "Неверный JID"
+
+#~ msgid "A connection is not available"
+#~ msgstr "Подключение недоступно"
+
+#, fuzzy
+#~ msgid "JID already in list"
+#~ msgstr "Jabber ID уже в списке"
+
+#, fuzzy
+#~ msgid "For the chosen encryption there is no encryption method available"
+#~ msgstr "Подключение недоступно"
+
+#~ msgid "Removes contact from roster"
+#~ msgstr "Удаляет контакт из ростера"
+
+#~ msgid "Not in roster"
+#~ msgstr "Не в ростере"
+
+#, fuzzy
+#~ msgid "Contact signed in notification color."
+#~ msgstr "_Показывать событие в области уведомлений"
+
+#, fuzzy
+#~ msgid "Contact signout notification color"
+#~ msgstr "Цвет фона контакта/переписки"
+
+#~ msgid "File transfer request notification color."
+#~ msgstr "Цвет уведомлений о передаче файлов."
+
+#, fuzzy
+#~ msgid "File transfer error notification color."
+#~ msgstr "Передача отменена"
+
+#, fuzzy
+#~ msgid "File transfer complete or stopped notification color."
+#~ msgstr "Показать уведомление по окончании загрузки"
+
+#~ msgid "Groupchat invitation notification color"
+#~ msgstr "Цвет, использующийся для шрифта уведомления о наборе"
+
+#, fuzzy
+#~ msgid "Other dialogs color."
+#~ msgstr "Цвет ника собеседника."
+
+#~ msgid "Add * and [n] in roster title?"
+#~ msgstr "Добавлять * и [n] в окно ростера?"
+
+#~ msgid "Hides the banner in two persons chat window"
+#~ msgstr "Скрывает баннер в окне чата"
+
+#, fuzzy
+#~ msgid ""
+#~ "Show the confirm metacontacts creation dialog or not? Empty string means "
+#~ "never show the dialog."
+#~ msgstr ""
+#~ "Следует ли показывать диалог подтверждения о создании метаконтакта? "
+#~ "Пустая строка означает, что сообщение не будет показываться вообще."
+
+#~ msgid "If true, You will also see your webcam"
+#~ msgstr "Если активно, вы также будете видеть изображение со своей вебкамеры"
+
+#~ msgid "Space separated list of ssl errors to ignore."
+#~ msgstr "Разделенный пробелами список игнорирования ошибок ssl"
+
+#~ msgid "Answer to receipt requests"
+#~ msgstr "Отвечать на запросы уведомления"
+
+#~ msgid "Sent receipt requests"
+#~ msgstr "Посылать запросы уведомления"
+
+#, fuzzy
+#~ msgid "Language for which misspelled words will be checked"
+#~ msgstr "Язык, который используется при проверке правописания"
+
+#~ msgid "I'm eating, so leave me a message."
+#~ msgstr "Кушаю, так что оставьте сообщение секретарю."
+
+#, fuzzy
+#~ msgid "from room %s"
+#~ msgstr " в комнате %s"
+
+#~ msgid "Leave Groupchats"
+#~ msgstr "Покинуть конференции"
+
+#, fuzzy
+#~ msgid "Auto Join"
+#~ msgstr "_Автоматическое присоединение"
+
+#, fuzzy
+#~ msgid "Room"
+#~ msgstr "Комната:"
+
+#~ msgid "Jabber ID:"
+#~ msgstr "Jabber ID:"
+
+#~ msgid "Occupant Actions"
+#~ msgstr "Действия над посетителем"
+
+#~ msgid "_Add to Roster"
+#~ msgstr "_Добавить в ростер"
+
+#~ msgid "_Manage Room"
+#~ msgstr "_Управление комнатой"
+
+#~ msgid "Configure _Room..."
+#~ msgstr "Настроить _комнату..."
+
+#~ msgid "_Destroy Room"
+#~ msgstr "_Уничтожить комнату"
+
+#~ msgid "Jabber ID"
+#~ msgstr "Jabber ID"
+
+#, fuzzy
+#~ msgid "icon"
+#~ msgstr "Иконка в системном трее"
+
+#, fuzzy
+#~ msgid "account"
+#~ msgstr "Учетные записи"
+
+#, fuzzy
+#~ msgid "Roster"
+#~ msgstr "Показать _ростер"
+
+#~ msgid "Show only in roster"
+#~ msgstr "Показывать только в ростере"
+
+#~ msgid "in _roster"
+#~ msgstr "в _ростере"
+
+#, fuzzy
+#~ msgid "Roster Appearance"
+#~ msgstr "<b>Настройки ростера</b>"
+
+#, fuzzy
+#~ msgid "Show chatstate in roster"
+#~ msgstr "Показывать а_ватары для контактов в ростере"
+
+#~ msgid "_Add to Roster..."
+#~ msgstr "_Добавить в ростер..."
+
+#~ msgid "_Jabber ID:"
+#~ msgstr "_Jabber ID:"
+
+#, fuzzy
+#~ msgid "_Jabber ID"
+#~ msgstr "_Jabber ID:"
+
+#~ msgid "JabberID"
+#~ msgstr "JabberID"
+
+#~ msgid "Show Roster"
+#~ msgstr "Показать ростер"
+
+#~ msgid "MUC server"
+#~ msgstr "сервер MUC"
+
+#~ msgid "Roster Shortcuts"
+#~ msgstr "Сочетания клавиш в ростере"
+
+#~ msgid "Room Configuration"
+#~ msgstr "Настройки комнаты"
+
+#~ msgid "Join _Group Chat"
+#~ msgstr "Войти в _комнату"
+
+#~ msgid "Toggle audio session"
+#~ msgstr "Переключить аудио сеанс"
+
+#~ msgid "Audio sessions are not available"
+#~ msgstr "Аудио сеансы не доступны"
+
+#~ msgid "Conference"
+#~ msgstr "Комнаты"
+
+#, fuzzy
+#~ msgid "_Manage Bookmarks…"
+#~ msgstr "Управление закладками"
+
+#~ msgid "Hide _Roster"
+#~ msgstr "Скрыть _ростер"
+
+#~ msgid "Show _Roster"
+#~ msgstr "Показать _ростер"
+
+#, fuzzy
+#~ msgid "Invalid Room"
+#~ msgstr "Неверная комната"
+
+#~ msgid "Invalid room"
+#~ msgstr "Неверная комната"
+
+#~ msgid "A GTK+ Jabber client"
+#~ msgstr "Jabber-клиент на GTK+"
+
+#~ msgid "Changing Nickname"
+#~ msgstr "Смена ника"
+
+#~ msgid "Please specify the new nickname you want to use:"
+#~ msgstr "Введите новый ник, который вы хотите использовать:"
+
+#~ msgid "Bookmark already set"
+#~ msgstr "Закладка уже установлена"
+
+#, fuzzy
+#~ msgid "Group Chat '%s' is already in your bookmarks."
+#~ msgstr "Комната «%s» уже есть в ваших закладках."
+
+#~ msgid "Bookmark has been added successfully"
+#~ msgstr "Закладка успешно добавлена"
+
+#, fuzzy
+#~ msgid ""
+#~ "You can manage your bookmarks by clicking the Bookmarks menu item in your "
+#~ "contact list."
+#~ msgstr "Вы можете управлять закладками через меню «Действия» в ростере."
+
+#, fuzzy
+#~ msgid "The nickname contains invalid characters."
+#~ msgstr "Имя файла содержит недопустимые символы."
+
+#~ msgid "Bookmark Room"
+#~ msgstr "Добавить комнату в закладки"
+
+#~ msgid "_Join New Group Chat"
+#~ msgstr "_Войти в новую комнату"
+
+#, fuzzy
+#~ msgid "_Create Group Chat"
+#~ msgstr "Покинуть конференции"
+
+#~ msgid "Name:"
+#~ msgstr "Имя:"
+
+#~ msgid "Description:"
+#~ msgstr "Описание: "
+
+#, fuzzy
+#~ msgid "Address:"
+#~ msgstr "_Адрес:"
+
+#, fuzzy
+#~ msgid "You can not start a new conversation unless you are connected."
+#~ msgstr "Вы не можете зайти в комнату без подключения."
+
+#, fuzzy
+#~ msgid "Occupants"
+#~ msgstr "Действия над посетителем"
+
+#, fuzzy
+#~ msgid "File transfer error"
+#~ msgstr "Ошибка передачи"
+
+#, fuzzy
+#~ msgid "No Accounts available"
+#~ msgstr "Нет доступной учетной записи"
+
+#~ msgid "_Modify Account..."
+#~ msgstr "_Изменить учетную запись..."
+
+#~ msgid "Boolean"
+#~ msgstr "Булево"
+
+#~ msgid "Integer"
+#~ msgstr "Целое"
+
+#~ msgid "Text"
+#~ msgstr "Текст"
+
+#~ msgid "Value"
+#~ msgstr "Значение"
+
+#~ msgid "Type"
+#~ msgstr "Тип"
+
+#~ msgid "(None)"
+#~ msgstr "(Нет)"
+
+#~ msgid "Hidden"
+#~ msgstr "Скрытый"
+
+#~ msgid "Manage Proxy Profiles"
+#~ msgstr "Управление профилями прокси"
+
+#, fuzzy
+#~ msgid "Properties"
+#~ msgstr "<b>Свойства</b>"
+
+#, fuzzy
+#~ msgid "Proxy _Host"
+#~ msgstr "Хост прокси:"
+
+#, fuzzy
+#~ msgid "Proxy _Port"
+#~ msgstr "_Порт прокси:"
+
+#, fuzzy
+#~ msgid "New Groupchat"
+#~ msgstr "Новая комната"
+
+#, fuzzy
+#~ msgid "New Contact"
+#~ msgstr "Добавить новый контакт"
+
 #~ msgid "%s GiB"
 #~ msgstr "%s GiB"
 
@@ -11132,9 +11986,6 @@ msgstr "Ошибка в модуле"
 #~ msgid "_Pause"
 #~ msgstr "_Приостановить"
 
-#~ msgid "Clean _up"
-#~ msgstr "_Очистить"
-
 #~ msgid "Remove file transfer from the list."
 #~ msgstr "Удалить передачу из списка."
 
@@ -11155,10 +12006,6 @@ msgstr "Ошибка в модуле"
 #~ msgid "When a file transfer is complete show a popup notification"
 #~ msgstr "Показать уведомление по окончании загрузки"
 
-#, fuzzy
-#~ msgid "Select Files"
-#~ msgstr "Очистить"
-
 #~ msgid "From:"
 #~ msgstr "От:"
 
@@ -11583,9 +12430,6 @@ msgstr "Ошибка в модуле"
 #~ msgid "You are invited to a groupchat"
 #~ msgstr "Вы приглашены в конференцию"
 
-#~ msgid "Do you want to accept the invitation?"
-#~ msgstr "Вы принимаете приглашение?"
-
 #~ msgid "_Start Chat"
 #~ msgstr "_Начать беседу"
 
@@ -11799,10 +12643,6 @@ msgstr "Ошибка в модуле"
 #~ msgid "Nick"
 #~ msgstr "Ник"
 
-#, fuzzy
-#~ msgid "Banning…"
-#~ msgstr "Баню..."
-
 #~ msgid ""
 #~ "<b>Whom do you want to ban?</b>\n"
 #~ "\n"
@@ -11889,12 +12729,6 @@ msgstr "Ошибка в модуле"
 #~ msgid "Filter:"
 #~ msgstr "Фильтр:"
 
-#~ msgid ""
-#~ "If checked, Gajim will display the mood of contacts in the roster window"
-#~ msgstr ""
-#~ "Если отмечено, то Gajim будет показывать настроения контактов в окне "
-#~ "ростера"
-
 #~ msgid "<b>Chat Appearance</b>"
 #~ msgstr "<b>Настройки окна чата</b>"
 
@@ -12157,10 +12991,6 @@ msgstr "Ошибка в модуле"
 #~ msgstr "_Сообщение о статусе:"
 
 #, fuzzy
-#~ msgid "Group chat highlight"
-#~ msgstr "Вас упомянули в комнате"
-
-#, fuzzy
 #~ msgid "Your nickname"
 #~ msgstr "Ваш ник:"
 
@@ -12306,9 +13136,6 @@ msgstr "Ошибка в модуле"
 #~ msgid "The passwords typed in both fields must be identical."
 #~ msgstr "Пароли, введенные в оба поля, должны быть одинаковыми."
 
-#~ msgid "Enter new password:"
-#~ msgstr "Введите новый пароль"
-
 #~ msgid "Enter it again for confirmation:"
 #~ msgstr "Введите ещё раз для подтверждения:"
 
@@ -12323,10 +13150,6 @@ msgstr "Ошибка в модуле"
 #~ msgid "unsubscribe request from %s"
 #~ msgstr "%s хочет отменить подписку"
 
-#, fuzzy
-#~ msgid "Autojoin"
-#~ msgstr "_Автоматическое присоединение"
-
 #~ msgid "&lt;empty&gt;"
 #~ msgstr "&lt;empty&gt;"
 
@@ -12440,9 +13263,6 @@ msgstr "Ошибка в модуле"
 #~ msgid "Forward unread message then disconnect"
 #~ msgstr "Переслать непрочитанные сообщения при отключении"
 
-#~ msgid "AIM Address:"
-#~ msgstr "Адрес AIM:"
-
 #~ msgid "MSN Address:"
 #~ msgstr "Адрес в MSN:"
 
@@ -12490,9 +13310,6 @@ msgstr "Ошибка в модуле"
 #~ msgid "Session negotiation cancelled"
 #~ msgstr "Установление сеанса отменено"
 
-#~ msgid "This session WILL be archived on server"
-#~ msgstr "История сеанса БУДЕТ сохранена на сервере"
-
 #~ msgid "This session WILL NOT be archived on server"
 #~ msgstr "История сеанса НЕ БУДЕТ сохранена на сервере"
 
@@ -12835,9 +13652,6 @@ msgstr "Ошибка в модуле"
 #~ msgid "Server:"
 #~ msgstr "Сервер:"
 
-#~ msgid "Password:"
-#~ msgstr "Пароль:"
-
 #~ msgid "Join this room _automatically when I connect"
 #~ msgstr "Входить в кон_ференцию при подключении"
 
@@ -13201,9 +14015,6 @@ msgstr "Ошибка в модуле"
 #~ msgid "_Edit Personal Information..."
 #~ msgstr "Редактировать личную информацию..."
 
-#~ msgid "Information about you, as stored in the server"
-#~ msgstr "Информация о вас, сохраненная на сервере"
-
 #~ msgid "<b>Personal Information</b>"
 #~ msgstr "<b>Личная информация</b>"
 
@@ -13283,9 +14094,6 @@ msgstr "Ошибка в модуле"
 #~ msgid "Your server can't save your personal information."
 #~ msgstr "Ваш сервер не может хранить личную информацию."
 
-#~ msgid "Account Local already exists."
-#~ msgstr "Учётная запись Local уже существует."
-
 #~ msgid "Please rename or remove it before enabling link-local messaging."
 #~ msgstr ""
 #~ "Переименуйте или удалите её, прежде чем включать локальные сообщения."
@@ -13443,10 +14251,6 @@ msgstr "Ошибка в модуле"
 #~ msgid "The following message was NOT encrypted"
 #~ msgstr "Последнее сообщение НЕ БЫЛО зашифровано"
 
-#, fuzzy
-#~ msgid "Encryption used for this contact."
-#~ msgstr "Включить ESessions шифрование для данной учетной записи."
-
 #~ msgid "Toggle Open_PGP Encryption"
 #~ msgstr "Включить Open_PGP шифрование"
 
@@ -13522,10 +14326,6 @@ msgstr "Ошибка в модуле"
 #~ msgid "Contact's identity verified"
 #~ msgstr "Личность контакта удостоверена"
 
-#, fuzzy
-#~ msgid "Verify again…"
-#~ msgstr "Удостоверить снова..."
-
 #~ msgid ""
 #~ "To be certain that <b>only</b> the expected person can read your messages "
 #~ "or send you messages, you need to verify their identity by clicking the "
@@ -13655,9 +14455,6 @@ msgstr "Ошибка в модуле"
 #~ msgid "Add _Contact..."
 #~ msgstr "_Добавить контакт..."
 
-#~ msgid "_Accounts"
-#~ msgstr "Учётные _записи"
-
 #~ msgid "Profile, A_vatar"
 #~ msgstr "Профиль и _аватар"
 
@@ -13915,12 +14712,6 @@ msgstr "Ошибка в модуле"
 #~ msgid "Activity: "
 #~ msgstr "Занятие: "
 
-#~ msgid "Join _Group Chat..."
-#~ msgstr "Войти в _комнату..."
-
-#~ msgid "_Modify Account"
-#~ msgstr "_Редактировать учетную запись"
-
 #~ msgid "Check on startup if Gajim is the _default Jabber client"
 #~ msgstr ""
 #~ "_Всегда проверять при запуске, является ли Gajim jabber-клиентом по "
@@ -14546,9 +15337,6 @@ msgstr "Ошибка в модуле"
 #~ msgid "[This message is encrypted]"
 #~ msgstr "[Это сообщение зашифровано]"
 
-#~ msgid "Trayicon"
-#~ msgstr "Иконка в системном трее"
-
 #~ msgid "A icon in systemtray reflecting the current presence."
 #~ msgstr "Иконка в системном лотке отображающая текущий статус."
 
@@ -14580,9 +15368,6 @@ msgstr "Ошибка в модуле"
 #~ msgid "Nickname not found: %s"
 #~ msgstr "Ник не обнаружен: %s"
 
-#~ msgid "This group chat has no subject"
-#~ msgstr "У этой комнаты нет темы"
-
 #~ msgid ""
 #~ "There is an ambiguity: %d nicks match.\n"
 #~ " Please use graphical interface "
@@ -14730,9 +15515,6 @@ msgstr "Ошибка в модуле"
 #~ msgid "libsexy"
 #~ msgstr "libsexy"
 
-#~ msgid "_Host:"
-#~ msgstr "_Хост:"
-
 #~ msgid "Click to see features (like MSN, ICQ transports) of jabber servers"
 #~ msgstr ""
 #~ "Щелкните, чтобы просмотреть сервисы предоставляемые jabber сервером "
diff --git a/po/sk.po b/po/sk.po
index aa15998d6..e50817b2e 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: 2019-07-02 02:06+0000\n"
+"POT-Creation-Date: 2019-08-11 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,71 +18,71 @@ 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:550
+#: gajim/chat_control_base.py:557
 msgid "_Undo"
 msgstr ""
 
-#: gajim/chat_control_base.py:558 gajim/conversation_textview.py:529
+#: gajim/chat_control_base.py:565 gajim/conversation_textview.py:529
 msgid "_Clear"
 msgstr ""
 
-#: gajim/chat_control_base.py:563
+#: gajim/chat_control_base.py:570
 msgid "Paste as quote"
 msgstr ""
 
-#: gajim/chat_control_base.py:613
+#: gajim/chat_control_base.py:620
 #, fuzzy
 msgid "Paste Image"
 msgstr "Vybrať obrázok"
 
-#: gajim/chat_control_base.py:614
+#: gajim/chat_control_base.py:621
 #, fuzzy
 msgid "You are trying to paste an image"
 msgstr "Chystáte sa zavrieť niekoľko kariet"
 
-#: gajim/chat_control_base.py:615
+#: gajim/chat_control_base.py:622
 #, 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:617 gajim/groupchat_control.py:2310
-#: gajim/roster_window.py:2848 gajim/roster_window.py:4167
-#: gajim/message_window.py:252 gajim/gtk/dialogs.py:418
+#: gajim/chat_control_base.py:624 gajim/groupchat_control.py:2218
+#: gajim/roster_window.py:2841 gajim/roster_window.py:4118
+#: gajim/message_window.py:359 gajim/gtk/dialogs.py:330
 #, fuzzy
 msgid "_Do not ask me again"
 msgstr "Znovu sa už _nepýtať"
 
-#: gajim/chat_control_base.py:620
+#: gajim/chat_control_base.py:627
 msgid "_Paste"
 msgstr ""
 
-#: gajim/chat_control_base.py:1162 gajim/gtk/accounts.py:351
+#: gajim/chat_control_base.py:1169 gajim/gtk/accounts.py:354
 #, fuzzy
 msgid "Privacy"
 msgstr "Súkromný zoznam"
 
-#: gajim/chat_control_base.py:1163
+#: gajim/chat_control_base.py:1170
 #, fuzzy
 msgid "Warning"
 msgstr "Zakazujem %s"
 
-#: gajim/chat_control_base.py:1164
+#: gajim/chat_control_base.py:1171
 #, fuzzy, python-format
 msgid "If you send a file to <b>%s</b>, your real JID 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:1169
+#: gajim/chat_control_base.py:1176
 #, fuzzy
 msgid "Continue"
 msgstr "_Pokračovať"
 
-#: gajim/gtkgui_helpers.py:163 gajim/gtk/filetransfer.py:393
+#: gajim/gtkgui_helpers.py:163 gajim/gtk/filetransfer.py:398
 #, fuzzy, python-format
 msgid "Cannot overwrite existing file '%s'"
 msgstr "Nie je možné prepísať existujúci súbor \"%s\""
 
-#: gajim/gtkgui_helpers.py:164 gajim/gtk/filetransfer.py:394
+#: gajim/gtkgui_helpers.py:164 gajim/gtk/filetransfer.py:399
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
@@ -172,231 +172,224 @@ 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:96
-msgid "_New Group Chat"
-msgstr "_Nová diskusná skupina"
-
-#: gajim/gui_menu_builder.py:289 gajim/gui_menu_builder.py:380
-#: gajim/chat_control.py:303 gajim/roster_window.py:786
-#: gajim/roster_window.py:1719 gajim/roster_window.py:1721
-#: gajim/roster_window.py:2030 gajim/roster_window.py:3336
-#: gajim/roster_window.py:3369 gajim/gui_interface.py:413
-#: gajim/common/contacts.py:206 gajim/common/contacts.py:343
-#: gajim/common/helpers.py:83 gajim/common/helpers.py:311
-#: gajim/gtk/add_contact.py:319 gajim/gtk/subscription_request.py:70
-#: gajim/gtk/subscription_request.py:99 gajim/gtk/roster_item_exchange.py:112
-msgid "Not in Roster"
-msgstr "Nie je v zozname"
+#: gajim/gui_menu_builder.py:251 gajim/gui_menu_builder.py:342
+#: gajim/chat_control.py:305 gajim/roster_window.py:783
+#: gajim/roster_window.py:1716 gajim/roster_window.py:1718
+#: gajim/roster_window.py:2027 gajim/roster_window.py:3292
+#: gajim/roster_window.py:3325 gajim/gui_interface.py:396
+#: gajim/common/contacts.py:222 gajim/common/contacts.py:359
+#: gajim/common/contacts.py:471 gajim/common/helpers.py:86
+#: gajim/common/helpers.py:317 gajim/gtk/add_contact.py:319
+#: gajim/gtk/subscription_request.py:70 gajim/gtk/subscription_request.py:99
+#: gajim/gtk/roster_item_exchange.py:112
+#, fuzzy
+msgid "Not in contact list"
+msgstr "Zobraziť _odhlásené kontakty"
 
-#: gajim/gui_menu_builder.py:393
-msgid "I would like to add you to my roster"
-msgstr "Chcem si vás pridať do svojho zoznamu"
+#: gajim/gui_menu_builder.py:355
+#, 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:471
+#: gajim/gui_menu_builder.py:433
 #, fuzzy
 msgid "Send Single _Message…"
 msgstr "Poslať krátku _správu"
 
-#: gajim/gui_menu_builder.py:486
+#: gajim/gui_menu_builder.py:448
 #, fuzzy
 msgid "E_xecute Command…"
 msgstr "_Vykonať príkaz"
 
-#: gajim/gui_menu_builder.py:494
+#: gajim/gui_menu_builder.py:456
 msgid "_Manage Transport"
 msgstr "S_pravovať transport"
 
-#: gajim/gui_menu_builder.py:500
+#: gajim/gui_menu_builder.py:462
 msgid "_Modify Transport"
 msgstr "_Upraviť transport"
 
-#: gajim/gui_menu_builder.py:507 gajim/roster_window.py:5046
+#: gajim/gui_menu_builder.py:469 gajim/roster_window.py:4985
 #, fuzzy
 msgid "_Rename…"
 msgstr "_Premenovať"
 
-#: gajim/gui_menu_builder.py:518 gajim/roster_window.py:5062
-#: gajim/roster_window.py:5177 gajim/data/gui/blocked_contacts_window.ui:52
+#: gajim/gui_menu_builder.py:480 gajim/roster_window.py:5001
+#: gajim/roster_window.py:5116 gajim/data/gui/blocked_contacts_window.ui:52
 #: gajim/data/gui/gc_occupants_menu.ui:148
 #: gajim/data/gui/contact_context_menu.ui:143
 msgid "_Unblock"
 msgstr "_Odblokovať"
 
-#: gajim/gui_menu_builder.py:521 gajim/roster_window.py:5067
-#: gajim/roster_window.py:5181 gajim/data/gui/gc_occupants_menu.ui:140
+#: gajim/gui_menu_builder.py:483 gajim/roster_window.py:5006
+#: gajim/roster_window.py:5120 gajim/data/gui/gc_occupants_menu.ui:140
 #: gajim/data/gui/contact_context_menu.ui:151
 msgid "_Block"
 msgstr "_Blokovať"
 
-#: gajim/gui_menu_builder.py:529 gajim/roster_window.py:5074
+#: gajim/gui_menu_builder.py:491 gajim/roster_window.py:5013
 #: gajim/data/gui/contact_context_menu.ui:181
 msgid "Remo_ve"
 msgstr "O_dstrániť"
 
-#: gajim/gui_menu_builder.py:539 gajim/data/gui/contact_context_menu.ui:198
+#: gajim/gui_menu_builder.py:501 gajim/data/gui/contact_context_menu.ui:198
 msgid "_Information"
 msgstr "_Informácie"
 
-#: gajim/gui_menu_builder.py:552
+#: gajim/gui_menu_builder.py:514
 #, fuzzy
 msgid "Save _As"
 msgstr "Má"
 
-#: gajim/gui_menu_builder.py:564 gajim/groupchat_control.py:501
-#: gajim/chat_control.py:340
+#: gajim/gui_menu_builder.py:526 gajim/groupchat_control.py:507
+#: gajim/chat_control.py:342
 #, fuzzy
 msgid "Send File…"
 msgstr "Poslať _súbor"
 
-#: gajim/gui_menu_builder.py:565
+#: gajim/gui_menu_builder.py:527
 #, fuzzy
 msgid "Upload File…"
 msgstr "Uložiť súbor ako..."
 
-#: gajim/gui_menu_builder.py:566
+#: gajim/gui_menu_builder.py:528
 #, fuzzy
 msgid "Send File Directly…"
 msgstr "Uložiť súbor ako..."
 
-#: gajim/gui_menu_builder.py:568 gajim/gui_menu_builder.py:632
+#: gajim/gui_menu_builder.py:530 gajim/gui_menu_builder.py:596
 #, fuzzy
 msgid "Send Chatstate"
 msgstr "Posledný stav: %s"
 
-#: gajim/gui_menu_builder.py:569
+#: gajim/gui_menu_builder.py:531
 #, fuzzy
 msgid "Invite Contacts"
 msgstr "Pozvať _kontakty"
 
-#: gajim/gui_menu_builder.py:570
+#: gajim/gui_menu_builder.py:532
 #, fuzzy
-msgid "Add to Roster"
-msgstr "_Pridať do zoznamu"
+msgid "Add to Contact List"
+msgstr "_Pridať kontakt..."
 
-#: gajim/gui_menu_builder.py:571
+#: gajim/gui_menu_builder.py:533
 #, fuzzy
-msgid "Audio Session"
-msgstr "Zvukový test"
+msgid "Voice Chat"
+msgstr "Požiadavka na hlasový rozhovor"
 
-#: gajim/gui_menu_builder.py:572
+#: gajim/gui_menu_builder.py:534
 #, fuzzy
-msgid "Video Session"
+msgid "Video Chat"
 msgstr "Video test"
 
-#: gajim/gui_menu_builder.py:573
+#: gajim/gui_menu_builder.py:535 gajim/gui_menu_builder.py:582
 #, fuzzy
 msgid "Information"
 msgstr "_Informácie"
 
-#: gajim/gui_menu_builder.py:574 gajim/gui_menu_builder.py:639
+#: gajim/gui_menu_builder.py:536 gajim/gui_menu_builder.py:602
 #: gajim/data/gui/application_menu.ui:37
 #, fuzzy
 msgid "History"
 msgstr "_História"
 
-#: gajim/gui_menu_builder.py:580 gajim/gui_menu_builder.py:687
+#: gajim/gui_menu_builder.py:542 gajim/gui_menu_builder.py:650
 #: gajim/data/gui/preferences_window.ui:1823
 msgid "Disabled"
 msgstr "Zakázané"
 
-#: gajim/gui_menu_builder.py:581 gajim/gui_menu_builder.py:688
+#: gajim/gui_menu_builder.py:543 gajim/gui_menu_builder.py:651
 #, fuzzy
 msgid "Composing only"
 msgstr "Píše správu"
 
-#: gajim/gui_menu_builder.py:582 gajim/gui_menu_builder.py:689
+#: gajim/gui_menu_builder.py:544 gajim/gui_menu_builder.py:652
 #, fuzzy
 msgid "All chat states"
 msgstr "Všetky stavy"
 
-#: gajim/gui_menu_builder.py:620
+#: gajim/gui_menu_builder.py:583
 #, fuzzy
-msgid "Manage Room"
-msgstr "S_pravovať miestnosť"
+msgid "Manage Group Chat"
+msgstr "Opustiť diskusnú skupinu"
 
-#: gajim/gui_menu_builder.py:621
+#: gajim/gui_menu_builder.py:584 gajim/data/gui/groupchat_control.ui:649
 #, fuzzy
 msgid "Change Subject"
 msgstr "Zmeniť _predmet..."
 
-#: gajim/gui_menu_builder.py:622
+#: gajim/gui_menu_builder.py:585
 #, fuzzy
-msgid "Configure Room"
-msgstr "Nastaviť _miestnosť..."
+msgid "Configure Group Chat"
+msgstr "Opustiť diskusnú skupinu"
 
-#: gajim/gui_menu_builder.py:623
+#: gajim/gui_menu_builder.py:586
 #, fuzzy
 msgid "Upload Avatar…"
 msgstr "Vybrať obrázok"
 
-#: gajim/gui_menu_builder.py:624
+#: gajim/gui_menu_builder.py:587
 #, fuzzy
-msgid "Destroy Room"
-msgstr "_Zničiť miestnosť"
+msgid "Destroy Group Chat"
+msgstr "Nová diskusná skupina"
 
-#: gajim/gui_menu_builder.py:626 gajim/data/gui/preferences_window.ui:790
+#: gajim/gui_menu_builder.py:589 gajim/data/gui/preferences_window.ui:790
 #, fuzzy
 msgid "Chat Settings"
 msgstr "Registrácia zlyhala"
 
-#: gajim/gui_menu_builder.py:627
+#: gajim/gui_menu_builder.py:590
 msgid "Show join/leave"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:628
+#: gajim/gui_menu_builder.py:591
 #, fuzzy
 msgid "Show status changes"
 msgstr "_Zaznamenať zmenu stavu kontaktu"
 
-#: gajim/gui_menu_builder.py:629 gajim/data/gui/gc_control_popup_menu.ui:72
+#: gajim/gui_menu_builder.py:592 gajim/data/gui/gc_control_popup_menu.ui:72
 #, fuzzy
 msgid "Notify on all messages"
 msgstr "Prednastavené správy:"
 
-#: gajim/gui_menu_builder.py:630
+#: gajim/gui_menu_builder.py:593
 #, fuzzy
 msgid "Minimize on close"
 msgstr "_Minimalizovať pri zavretí"
 
-#: gajim/gui_menu_builder.py:631
+#: gajim/gui_menu_builder.py:595
 #, fuzzy
-msgid "Minimize on autojoin"
+msgid "Minimize when joining automatically"
 msgstr "Minimalizovať pri automatickom pripojení"
 
-#: gajim/gui_menu_builder.py:634
+#: gajim/gui_menu_builder.py:598
 msgid "Sync Threshold"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:635
+#: gajim/gui_menu_builder.py:599
 #, fuzzy
-msgid "Change Nick"
+msgid "Change Nickname"
 msgstr "Zmeniť p_rezývku..."
 
-#: gajim/gui_menu_builder.py:636
-#, fuzzy
-msgid "Bookmark Room"
-msgstr "Zazáložkovať túto miestnosť"
-
-#: gajim/gui_menu_builder.py:637
+#: gajim/gui_menu_builder.py:600
 #, fuzzy
 msgid "Request Voice"
 msgstr "_Hlas"
 
-#: gajim/gui_menu_builder.py:638 gajim/roster_window.py:5246
+#: gajim/gui_menu_builder.py:601 gajim/roster_window.py:5185
 #, fuzzy
 msgid "Execute command"
 msgstr "_Vykonať príkaz"
 
-#: gajim/gui_menu_builder.py:640
-#, fuzzy
-msgid "Disconnect"
-msgstr "O_dpojiť"
+#: gajim/gui_menu_builder.py:603
+msgid "Leave"
+msgstr ""
 
-#: gajim/gui_menu_builder.py:678 gajim/gtk/preferences.py:156
+#: gajim/gui_menu_builder.py:641 gajim/gtk/preferences.py:155
 msgid "No threshold"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:680 gajim/gtk/preferences.py:158
+#: gajim/gui_menu_builder.py:643 gajim/gtk/preferences.py:157
 #, fuzzy, python-format
 msgid "%i day"
 msgid_plural "%i days"
@@ -404,159 +397,174 @@ msgstr[0] "Pred %i dňami"
 msgstr[1] "Pred %i dňami"
 msgstr[2] "Pred %i dňami"
 
-#: gajim/gui_menu_builder.py:709 gajim/gui_menu_builder.py:747
-#: gajim/gtk/join_groupchat.py:43
-msgid "Join Group Chat"
-msgstr "Pripojiť sa k diskusnej skupine"
-
-#: gajim/gui_menu_builder.py:746
+#: gajim/gui_menu_builder.py:672
 #, fuzzy
 msgid "Add Contact…"
 msgstr "_Pridať kontakt..."
 
-#: gajim/gui_menu_builder.py:748 gajim/gtk/profile.py:52
-#: gajim/gtk/accounts.py:770 gajim/gtk/accounts.py:808
+#: gajim/gui_menu_builder.py:673 gajim/gtk/profile.py:52
+#: gajim/gtk/accounts.py:773 gajim/gtk/accounts.py:811
 #, fuzzy
 msgid "Profile"
 msgstr "súbor"
 
-#: gajim/gui_menu_builder.py:749
+#: gajim/gui_menu_builder.py:674
+#, fuzzy
+msgid "Send Single Message…"
+msgstr "Poslať krátku _správu"
+
+#: gajim/gui_menu_builder.py:675
 #, fuzzy
 msgid "Discover Services"
 msgstr "_Preskúmať služby"
 
-#: gajim/gui_menu_builder.py:750
+#: gajim/gui_menu_builder.py:676 gajim/gtk/server_info.py:36
 #, fuzzy
-msgid "Send Single Message…"
-msgstr "Poslať krátku _správu"
+msgid "Server Info"
+msgstr "Server"
 
-#: gajim/gui_menu_builder.py:751 gajim/data/gui/preferences_window.ui:2741
+#: gajim/gui_menu_builder.py:677 gajim/data/gui/preferences_window.ui:2741
 msgid "Advanced"
 msgstr "Pokročilé"
 
-#: gajim/gui_menu_builder.py:752 gajim/gtk/mam_preferences.py:88
+#: gajim/gui_menu_builder.py:678 gajim/gtk/mam_preferences.py:88
 #, fuzzy
 msgid "Archiving Preferences"
 msgstr "_Predvoľby"
 
-#: gajim/gui_menu_builder.py:753
+#: gajim/gui_menu_builder.py:679
 #, fuzzy
 msgid "Blocking List"
 msgstr "Čierna listina"
 
-#: gajim/gui_menu_builder.py:754 gajim/gtk/history_sync.py:108
+#: gajim/gui_menu_builder.py:680
+#, fuzzy
+msgid "Bookmarks"
+msgstr "Zálož_ky"
+
+#: gajim/gui_menu_builder.py:681
+#, fuzzy
+msgid "PEP Configuration"
+msgstr "Konfigurácia miestnosti"
+
+#: gajim/gui_menu_builder.py:682 gajim/gtk/history_sync.py:108
 #: gajim/gtk/history_sync.py:186
 #, fuzzy
 msgid "Synchronise History"
 msgstr "Synchronizovať"
 
-#: gajim/gui_menu_builder.py:755 gajim/gtk/privacy_list.py:427
+#: gajim/gui_menu_builder.py:683 gajim/gtk/privacy_list.py:427
 msgid "Privacy Lists"
 msgstr "Súkromné zoznamy"
 
-#: gajim/gui_menu_builder.py:756 gajim/gtk/server_info.py:36
-#, fuzzy
-msgid "Server Info"
-msgstr "Server"
-
-#: gajim/gui_menu_builder.py:757 gajim/gui_menu_builder.py:768
+#: gajim/gui_menu_builder.py:685 gajim/gui_menu_builder.py:696
 #: gajim/data/gui/xml_console_window.ui:77
 msgid "XML Console"
 msgstr "XML konzola"
 
-#: gajim/gui_menu_builder.py:759 gajim/data/gui/groupchat_config.ui:36
+#: gajim/gui_menu_builder.py:687 gajim/data/gui/groupchat_config.ui:36
 #, fuzzy
 msgid "Admin"
 msgstr "_Admin"
 
-#: gajim/gui_menu_builder.py:760
+#: gajim/gui_menu_builder.py:688
 #, fuzzy
 msgid "Send Server Message…"
 msgstr "_Poslať serverovú správu..."
 
-#: gajim/gui_menu_builder.py:761
+#: gajim/gui_menu_builder.py:689
 #, fuzzy
 msgid "Set MOTD…"
 msgstr "Nastaviť správu dňa..."
 
-#: gajim/gui_menu_builder.py:762
+#: gajim/gui_menu_builder.py:690
 #, fuzzy
 msgid "Update MOTD…"
 msgstr "Aktualizovať správu dňa..."
 
-#: gajim/gui_menu_builder.py:763
+#: gajim/gui_menu_builder.py:691
 #, fuzzy
 msgid "Delete MOTD…"
 msgstr "Odstrániť správu dňa"
 
-#: gajim/gui_menu_builder.py:812
+#: gajim/gui_menu_builder.py:736
 #, fuzzy
-msgid "No Accounts available"
-msgstr "Žiadne účty nie sú dostupné"
+msgid "_Add Account…"
+msgstr "_Pridať kontakt..."
+
+#: gajim/gui_menu_builder.py:742
+#, fuzzy
+msgid "_Modify Accounts…"
+msgstr "_Upraviť účet"
 
-#: gajim/gui_menu_builder.py:823 gajim/data/gui/application_menu.ui:5
-#: gajim/data/gui/application_menu.ui:71 gajim/data/gui/shortcuts_window.ui:182
-#: gajim/gtk/accounts.py:58
+#: gajim/gui_menu_builder.py:751 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:755 gajim/data/gui/application_menu.ui:5
+#: gajim/data/gui/shortcuts_window.ui:182 gajim/gtk/accounts.py:57
 msgid "Accounts"
 msgstr "Účty"
 
-#: gajim/gui_menu_builder.py:881 gajim/gui_menu_builder.py:886
+#: gajim/gui_menu_builder.py:784 gajim/gui_menu_builder.py:789
 #, fuzzy
-msgid "Copy JID"
-msgstr "JID miestnosti"
+msgid "Copy XMPP Address"
+msgstr "_Kopírovať JID/e-mailovú adresu"
 
-#: gajim/gui_menu_builder.py:882 gajim/gui_menu_builder.py:914
+#: gajim/gui_menu_builder.py:785 gajim/gui_menu_builder.py:817
 #, fuzzy
 msgid "Join Groupchat"
 msgstr "Pripojiť sa k diskusnej skupine"
 
-#: gajim/gui_menu_builder.py:887 gajim/gui_menu_builder.py:913
-#: gajim/data/gui/application_menu.ui:76
+#: gajim/gui_menu_builder.py:790 gajim/gui_menu_builder.py:816
+#: gajim/data/gui/application_menu.ui:71
 #: gajim/data/gui/subscription_request_window.ui:106
 msgid "Start Chat"
 msgstr "Začať rozhovor"
 
-#: gajim/gui_menu_builder.py:888 gajim/gui_menu_builder.py:915
+#: gajim/gui_menu_builder.py:791 gajim/gui_menu_builder.py:818
 #, fuzzy
-msgid "Add to Roster…"
-msgstr "_Pridať do zoznamu"
+msgid "Add to Contact List…"
+msgstr "_Pridať kontakt..."
 
-#: gajim/gui_menu_builder.py:893
+#: gajim/gui_menu_builder.py:796
 #, fuzzy
 msgid "Copy Link Location"
 msgstr "_Kopírovať umiestnenie odkazu"
 
-#: gajim/gui_menu_builder.py:894
+#: gajim/gui_menu_builder.py:797
 #, fuzzy
 msgid "Open Link in Browser"
 msgstr "_Otvoriť odkaz v prehliadači"
 
-#: gajim/gui_menu_builder.py:899
+#: gajim/gui_menu_builder.py:802
 #, fuzzy
 msgid "Copy Email Address"
 msgstr "_Kopírovať JID/e-mailovú adresu"
 
-#: gajim/gui_menu_builder.py:900 gajim/gui_menu_builder.py:912
+#: gajim/gui_menu_builder.py:803 gajim/gui_menu_builder.py:815
 #, fuzzy
 msgid "Open Email Composer"
 msgstr "_Otvoriť tvorbu E-mailu"
 
-#: gajim/gui_menu_builder.py:905
+#: gajim/gui_menu_builder.py:808
 #, fuzzy
 msgid "Copy Location"
 msgstr "_Kopírovať umiestnenie odkazu"
 
-#: gajim/gui_menu_builder.py:906
+#: gajim/gui_menu_builder.py:809
 #, fuzzy
 msgid "Show Location"
 msgstr "Umiestnenie:"
 
-#: gajim/gui_menu_builder.py:911
+#: gajim/gui_menu_builder.py:814
 #, fuzzy
-msgid "Copy JID/Email"
+msgid "Copy XMPP Address/Email"
 msgstr "_Kopírovať JID/e-mailovú adresu"
 
-#: gajim/gui_menu_builder.py:945
+#: gajim/gui_menu_builder.py:852
 #, fuzzy
 msgid "Copy"
 msgstr "JID miestnosti"
@@ -579,44 +587,56 @@ msgstr ""
 msgid "Choose folder for logfile"
 msgstr ""
 
-#: gajim/history_manager.py:107
+#: gajim/history_manager.py:106
 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:108
+#: gajim/history_manager.py:107
 #, fuzzy, python-format
 msgid "%s does not exist."
 msgstr "Súbor neexistuje"
 
-#: gajim/history_manager.py:141 gajim/history_manager.py:195
-#: gajim/gtk/discovery.py:829 gajim/gtk/roster_item_exchange.py:80
-msgid "JID"
-msgstr "JID"
+#: gajim/history_manager.py:140 gajim/history_manager.py:194
+#: 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:30
+#: gajim/gtk/accounts.py:804
+#, fuzzy
+msgid "XMPP Address"
+msgstr "AIM adresa:"
 
-#: gajim/history_manager.py:154 gajim/history_manager.py:202
+#: gajim/history_manager.py:153 gajim/history_manager.py:201
 #: gajim/data/gui/history_window.ui:89 gajim/gtk/history.py:108
 msgid "Date"
 msgstr "Dátum"
 
-#: gajim/history_manager.py:161 gajim/history_manager.py:225
+#: gajim/history_manager.py:160 gajim/history_manager.py:224
 #: gajim/data/gui/join_groupchat_window.ui:208
 #: gajim/data/gui/profile_window.ui:214
 #: gajim/data/gui/vcard_information_window.ui:443
+#: gajim/data/gui/bookmarks.ui:140
 msgid "Nickname"
 msgstr "Prezývka"
 
-#: gajim/history_manager.py:172 gajim/history_manager.py:211
+#: gajim/history_manager.py:171 gajim/history_manager.py:210
 #: gajim/data/gui/preferences_window.ui:1344
 #: gajim/data/gui/single_message_window.ui:275 gajim/gtk/history.py:117
 msgid "Message"
 msgstr "Správa"
 
-#: gajim/history_manager.py:180 gajim/history_manager.py:218
+#: gajim/history_manager.py:179 gajim/history_manager.py:217
 #: gajim/data/gui/groups_post_window.ui:49
 #: gajim/data/gui/single_message_window.ui:214
 msgid "Subject"
 msgstr "Predmet"
 
+#: gajim/history_manager.py:247
+#, fuzzy
+msgid "Database Cleanup"
+msgstr "Chyba databázy"
+
 #: gajim/history_manager.py:248
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
@@ -627,11 +647,8 @@ msgstr ""
 #: gajim/history_manager.py:250
 #, fuzzy
 msgid ""
-"Normally allocated database size will not be freed, it will just become "
-"reusable. If you really want to reduce database filesize, click YES, else "
-"click NO.\n"
-"\n"
-"In case you click YES, please wait…"
+"Normally, the allocated database size will not be freed, it will just become "
+"reusable. This operation may take a while."
 msgstr ""
 "Za bežných okolností alokovaná kapacita pre databázu nebude uvoľnená, stane "
 "sa len znovu použiteľná. Ak si želáte skutočne zredukovať veľkosť súborov s "
@@ -641,26 +658,26 @@ msgstr ""
 
 #: gajim/history_manager.py:255
 #, fuzzy
-msgid "Database Cleanup"
-msgstr "Chyba databázy"
+msgid "_Cleanup"
+msgstr "Vyč_istiť"
 
-#: gajim/history_manager.py:519 gajim/gtk/filetransfer.py:238
-#: gajim/gtk/filetransfer.py:248
+#: gajim/history_manager.py:518 gajim/gtk/filetransfer.py:237
+#: gajim/gtk/filetransfer.py:247
 msgid "You"
 msgstr "Vy"
 
-#: gajim/history_manager.py:531
+#: gajim/history_manager.py:530
 #, 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:568 gajim/history_manager.py:607
-#: gajim/gtk/dialogs.py:58 gajim/gtk/themes.py:319
+#: gajim/history_manager.py:567 gajim/history_manager.py:606
+#: gajim/gtk/dialogs.py:57 gajim/gtk/themes.py:319
 #: gajim/gtk/roster_item_exchange.py:75 gajim/gtk/roster_item_exchange.py:185
 msgid "Delete"
 msgstr "Odstrániť"
 
-#: gajim/history_manager.py:569
+#: gajim/history_manager.py:568
 #, fuzzy
 msgid "Delete Conversation"
 msgid_plural "Delete Conversations"
@@ -668,7 +685,7 @@ msgstr[0] "Zrušiť potvrdenie"
 msgstr[1] "Zrušiť potvrdenie"
 msgstr[2] "Zrušiť potvrdenie"
 
-#: gajim/history_manager.py:570
+#: gajim/history_manager.py:569
 #, 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?"
@@ -676,7 +693,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:608
+#: gajim/history_manager.py:607
 #, fuzzy
 msgid "Delete Message"
 msgid_plural "Delete Messages"
@@ -684,7 +701,7 @@ msgstr[0] "Predvolená správa"
 msgstr[1] "Predvolená správa"
 msgstr[2] "Predvolená správa"
 
-#: gajim/history_manager.py:609
+#: gajim/history_manager.py:608
 #, fuzzy
 msgid "Do you want to permanently delete this message"
 msgid_plural "Do you want to permanently delete these messages"
@@ -698,15 +715,15 @@ msgid "Contact name: <i>%s</i>"
 msgstr "Kontaktné meno: <i>%s</i>"
 
 #: gajim/dialogs.py:84
-#, fuzzy, python-format
-msgid "JID: <i>%s</i>"
-msgstr "Jabber ID: <i>%s</i>"
+#, python-format
+msgid "XMPP Address: <i>%s</i>"
+msgstr ""
 
-#: gajim/dialogs.py:115 gajim/dialogs.py:128 gajim/roster_window.py:2901
-#: gajim/roster_window.py:3833 gajim/roster_window.py:5084
-#: gajim/common/contacts.py:157 gajim/common/contacts.py:190
+#: gajim/dialogs.py:115 gajim/dialogs.py:128 gajim/roster_window.py:2894
+#: gajim/roster_window.py:3784 gajim/roster_window.py:5023
+#: gajim/common/contacts.py:157 gajim/common/contacts.py:206
 #: gajim/data/gui/preferences_window.ui:558
-#: gajim/data/gui/shortcuts_window.ui:177 gajim/gtk/accounts.py:349
+#: gajim/data/gui/shortcuts_window.ui:177 gajim/gtk/accounts.py:352
 msgid "General"
 msgstr "Všeobecné"
 
@@ -751,7 +768,7 @@ msgstr "Prepísať správu o stave?"
 msgid "Preset 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:703
+#: gajim/dialogs.py:703 gajim/plugins/gui.py:292
 msgid "_Overwrite"
 msgstr ""
 
@@ -763,9 +780,7 @@ msgstr "Uložiť ako prednastavenú správu o stave"
 msgid "Please type a name for this status message"
 msgstr "Zadajte prosím názov pre túto stavovú správu"
 
-#: gajim/dialogs.py:740 gajim/gui_interface.py:1441 gajim/dialog_messages.py:31
-#: gajim/gtk/discovery.py:518 gajim/gtk/profile.py:323
-#: gajim/gtk/join_groupchat.py:234
+#: gajim/dialogs.py:740 gajim/gtk/discovery.py:517 gajim/gtk/profile.py:323
 msgid "You are not connected to the server"
 msgstr "Nie ste pripojený k serveru"
 
@@ -773,9 +788,11 @@ msgstr "Nie ste pripojený k serveru"
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Bez pripojenie nemôžete synchronizovať vaše kontakty."
 
-#: gajim/dialogs.py:752 gajim/dialogs.py:823 gajim/gtk/discovery.py:822
-#: gajim/gtk/discovery.py:1648 gajim/gtk/discovery.py:1941
-#: gajim/gtk/history.py:99 gajim/gtk/roster_item_exchange.py:83
+#: gajim/dialogs.py:752 gajim/dialogs.py:823
+#: gajim/data/gui/groupchat_info_scrolled.ui:16 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/gtk/roster_item_exchange.py:83
 msgid "Name"
 msgstr "Meno"
 
@@ -795,395 +812,341 @@ msgstr "Nemôžete sa synchronizovať s kontaktom ak nie je prihlásený."
 msgid "Synchronise"
 msgstr "Synchronizovať"
 
-#: gajim/dialogs.py:1043
+#: gajim/dialogs.py:1042
 msgid "an audio and video"
 msgstr "zvuk a video"
 
-#: gajim/dialogs.py:1045
+#: gajim/dialogs.py:1044
 msgid "an audio"
 msgstr "zvuk"
 
-#: gajim/dialogs.py:1047
+#: gajim/dialogs.py:1046
 msgid "a video"
 msgstr "video"
 
-#: gajim/dialogs.py:1051
+#: gajim/dialogs.py:1050
 #, python-format
 msgid ""
-"%(contact)s wants to start %(type)s session with you. Do you want to answer "
+"%(contact)s wants to start a %(type)s chat with you. Do you want to answer "
 "the call?"
 msgstr ""
 
-#: gajim/groupchat_control.py:505
+#: gajim/groupchat_control.py:511
 #, fuzzy, python-format
 msgid "Send File (max. %s MiB)…"
 msgstr "Uložiť súbor ako..."
 
-#: gajim/groupchat_control.py:507 gajim/chat_control.py:342
+#: gajim/groupchat_control.py:513 gajim/chat_control.py:344
 #, fuzzy
 msgid "No File Transfer available"
 msgstr "Prenos súborov"
 
-#: gajim/groupchat_control.py:630 gajim/groupchat_control.py:2349
-msgid "Changing Subject"
-msgstr "Zmena predmetu"
-
-#: gajim/groupchat_control.py:631 gajim/groupchat_control.py:2350
-msgid "Please specify the new subject:"
-msgstr "Prosím, špecifikujte nový predmet:"
-
-#: gajim/groupchat_control.py:638
-msgid "Changing Nickname"
-msgstr "Zmena prezývky"
-
-#: gajim/groupchat_control.py:639
-msgid "Please specify the new nickname you want to use:"
-msgstr "Prosím špecifikujte novú prezývku, ktorú chcete používať:"
-
-#: gajim/groupchat_control.py:657
+#: gajim/groupchat_control.py:655
 #, fuzzy
-msgid "Invalid group chat JID"
+msgid "Invalid group chat XMPP Address"
 msgstr "Nesprávne Jabber ID diskusnej skupiny"
 
-#: gajim/groupchat_control.py:658
+#: gajim/groupchat_control.py:656
 #, fuzzy
-msgid "The group chat JID has not allowed characters."
+msgid "The group chat XMPP Address has not allowed characters."
 msgstr "Jabber ID diskusnej skupiny obsahuje nepovolené znaky."
 
-#: gajim/groupchat_control.py:758 gajim/gtk/profile.py:136
+#: gajim/groupchat_control.py:743 gajim/gtk/profile.py:136
 msgid "Could not load image"
 msgstr "Nie je možné načítať obrázok"
 
-#: gajim/groupchat_control.py:888
+#: gajim/groupchat_control.py:873
 msgid "Insert Nickname"
 msgstr "Vložiť prezývku"
 
-#: gajim/groupchat_control.py:1056 gajim/chat_control.py:824
+#: gajim/groupchat_control.py:1041 gajim/chat_control.py:848
 msgid "and authenticated"
 msgstr "a overený"
 
-#: gajim/groupchat_control.py:1060 gajim/chat_control.py:828
+#: gajim/groupchat_control.py:1045 gajim/chat_control.py:852
 msgid "and NOT authenticated"
 msgstr "a NEoverený"
 
-#: gajim/groupchat_control.py:1064
+#: gajim/groupchat_control.py:1049
 #, python-format
 msgid "%(type)s encryption is active %(authenticated)s."
 msgstr ""
 
-#: gajim/groupchat_control.py:1111
+#: gajim/groupchat_control.py:1096
 msgid "Conversation with "
 msgstr "Rozhovor s "
 
-#: gajim/groupchat_control.py:1113
+#: gajim/groupchat_control.py:1098
 msgid "Continued conversation"
 msgstr "Pokračovanie rozhovoru"
 
-#: gajim/groupchat_control.py:1411
+#: gajim/groupchat_control.py:1357
 #, 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:1433
+#: gajim/groupchat_control.py:1374
 #, fuzzy
-msgid "Room now shows unavailable members"
+msgid "Group chat now shows unavailable members"
 msgstr "Miestnosť práve zobrazuje nedostupného člena"
 
-#: gajim/groupchat_control.py:1436
+#: gajim/groupchat_control.py:1377
 #, fuzzy
-msgid "Room now does not show unavailable members"
+msgid "Group chat now does not show unavailable members"
 msgstr "Miestnosť práve zobrazuje nedostupného člena"
 
-#: gajim/groupchat_control.py:1439
+#: gajim/groupchat_control.py:1380
 msgid "A setting not related to privacy has been changed"
 msgstr ""
 
-#: gajim/groupchat_control.py:1446
-msgid "Room logging is now enabled"
-msgstr "Zaznamenávanie miestnosti je teraz povolené"
+#: gajim/groupchat_control.py:1387 gajim/groupchat_control.py:1659
+#, fuzzy
+msgid "Conversations are stored on the server"
+msgstr "Relácia NEBUDE zaznamenaná"
 
-#: gajim/groupchat_control.py:1449
-msgid "Room logging is now disabled"
-msgstr "Zaznamenávanie miestnosti je teraz zakázané"
+#: gajim/groupchat_control.py:1390
+#, fuzzy
+msgid "Conversations are not stored on the server"
+msgstr "Informácie o vás sú uložené na serveri"
 
-#: gajim/groupchat_control.py:1452
-msgid "Room is now non-anonymous"
+#: gajim/groupchat_control.py:1393
+#, fuzzy
+msgid "Group chat is now non-anonymous"
 msgstr "Miestnosť je teraz neanonymná"
 
-#: gajim/groupchat_control.py:1456
-msgid "Room is now semi-anonymous"
+#: gajim/groupchat_control.py:1397
+#, fuzzy
+msgid "Group chat is now semi-anonymous"
 msgstr "Miestnosť je teraz poloanonymná"
 
-#: gajim/groupchat_control.py:1460
+#: gajim/groupchat_control.py:1401
 #, fuzzy
-msgid "Room is now fully anonymous"
+msgid "Group chat is now fully anonymous"
 msgstr "Miestnosť je teraz anonymná"
 
-#: gajim/groupchat_control.py:1500
+#: gajim/groupchat_control.py:1439
 #, fuzzy, python-format
 msgid "Ping? (%s)"
 msgstr "Pong! (%s s.)"
 
-#: gajim/groupchat_control.py:1503
+#: gajim/groupchat_control.py:1442
 #, fuzzy, python-format
 msgid "Pong! (%(nick)s %(delay)s s.)"
 msgstr "Pong! (%s s.)"
 
-#: gajim/groupchat_control.py:1506 gajim/chat_control.py:1213
+#: gajim/groupchat_control.py:1445 gajim/chat_control.py:1237
 msgid "Error."
 msgstr "Chyba."
 
-#: gajim/groupchat_control.py:1711
+#: gajim/groupchat_control.py:1650
 #, fuzzy, python-format
-msgid "You (%s) joined the room"
+msgid "You (%s) joined the group chat"
 msgstr "%s sa pripojil do diskusnej skupiny"
 
-#: gajim/groupchat_control.py:1717
-msgid "Any occupant is allowed to see your full JID"
+#: gajim/groupchat_control.py:1655
+msgid "Any participant is allowed to see your full XMPP Address"
 msgstr ""
 
-#: gajim/groupchat_control.py:1721
-msgid "Room logging is enabled"
-msgstr "Zaznamenávanie miestosti je povolené"
-
-#: gajim/groupchat_control.py:1725
-msgid "The server has assigned or modified your roomnick"
-msgstr ""
+#: gajim/groupchat_control.py:1663
+#, fuzzy
+msgid "The server has assigned or modified your nickname in this group chat"
+msgstr "Zmeniť vašu prezývku (Ctrl+N)"
 
-#: gajim/groupchat_control.py:1732
-msgid "A new room has been created"
+#: gajim/groupchat_control.py:1671
+#, fuzzy
+msgid "A new group chat has been created"
 msgstr "Bola vytvorená nová miestnosť"
 
-#: gajim/groupchat_control.py:1740 gajim/privatechat_control.py:112
+#: gajim/groupchat_control.py:1679 gajim/privatechat_control.py:115
 #, python-format
 msgid "You are now known as %s"
 msgstr "Teraz ste známy ako %s"
 
-#: gajim/groupchat_control.py:1742 gajim/privatechat_control.py:114
+#: gajim/groupchat_control.py:1681 gajim/privatechat_control.py:117
 #, 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:1767 gajim/privatechat_control.py:141
+#: gajim/groupchat_control.py:1706 gajim/privatechat_control.py:144
 #, fuzzy, python-brace-format
 msgid "You are now {show}{status}"
 msgstr "Teraz ste známy ako %s"
 
-#: gajim/groupchat_control.py:1773 gajim/privatechat_control.py:147
+#: gajim/groupchat_control.py:1712 gajim/privatechat_control.py:150
 #, fuzzy, python-brace-format
 msgid "{nick} is now {show}{status}"
 msgstr "%(nick)s je teraz %(status)s"
 
-#: gajim/groupchat_control.py:1790 gajim/groupchat_control.py:1819
-#: gajim/groupchat_control.py:1849 gajim/groupchat_control.py:1909
+#: gajim/groupchat_control.py:1729 gajim/groupchat_control.py:1758
+#: gajim/groupchat_control.py:1788 gajim/groupchat_control.py:1848
 #, python-brace-format
 msgid " by {actor}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1793
+#: gajim/groupchat_control.py:1732
 #, python-brace-format
 msgid "** Your Affiliation has been set to {affiliation}{actor}{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1799
+#: gajim/groupchat_control.py:1738
 #, python-brace-format
 msgid "** Affiliation of {nick} has been set to {affiliation}{actor}{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1822
+#: gajim/groupchat_control.py:1761
 #, fuzzy, python-brace-format
 msgid "** Your Role has been set to {role}{actor}{reason}"
 msgstr "** Rola %(nick)s bola nastavená na %(role)s kontaktom %(actor)s"
 
-#: gajim/groupchat_control.py:1827
+#: gajim/groupchat_control.py:1766
 #, fuzzy, python-brace-format
 msgid "** Role of {nick} has been set to {role}{actor}{reason}"
 msgstr "** Rola %(nick)s bola nastavená na %(role)s kontaktom %(actor)s"
 
-#: gajim/groupchat_control.py:1852
+#: gajim/groupchat_control.py:1791
 #, fuzzy, python-brace-format
-msgid "You have been removed from the room{actor}{reason}"
+msgid "You have been removed from the group chat{actor}{reason}"
 msgstr "%(nick)s bol odstránený z miestnosti (%(reason)s)"
 
-#: gajim/groupchat_control.py:1857
+#: gajim/groupchat_control.py:1796
 #, python-brace-format
 msgid "You have left due to an error{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1863
+#: gajim/groupchat_control.py:1802
 #, python-brace-format
 msgid "You have been kicked{actor}{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1870
+#: gajim/groupchat_control.py:1809
 #, python-brace-format
 msgid "You have been banned{actor}{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1877 gajim/groupchat_control.py:1943
+#: gajim/groupchat_control.py:1816 gajim/groupchat_control.py:1882
 #, fuzzy
 msgid ": Affiliation changed"
 msgstr "príslušnosť zmenená"
 
-#: gajim/groupchat_control.py:1883 gajim/groupchat_control.py:1948
+#: gajim/groupchat_control.py:1822 gajim/groupchat_control.py:1887
 #, fuzzy
-msgid ": Room configuration changed to members-only"
+msgid ": Group chat configuration changed to members-only"
 msgstr "nastavenie miestnosti sa zmenilo na len členovia"
 
-#: gajim/groupchat_control.py:1912
+#: gajim/groupchat_control.py:1851
 #, fuzzy, python-brace-format
-msgid "{nick} has been removed from the room{by}{reason}"
+msgid "{nick} has been removed from the group chat{by}{reason}"
 msgstr "%(nick)s bol odstránený z miestnosti (%(reason)s)"
 
-#: gajim/groupchat_control.py:1922
+#: gajim/groupchat_control.py:1861
 #, python-brace-format
 msgid "{nick} has left due to an error{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1928
+#: gajim/groupchat_control.py:1867
 #, fuzzy, python-brace-format
 msgid "{nick} has been kicked{actor}{reason}"
 msgstr "%(nick)s bol vykopnutý: %(reason)s"
 
-#: gajim/groupchat_control.py:1936
+#: gajim/groupchat_control.py:1875
 #, fuzzy, python-brace-format
 msgid "{nick} has been banned{actor}{reason}"
 msgstr "%(nick)s bol zakázaný: %(reason)s"
 
-#: gajim/groupchat_control.py:1953
+#: gajim/groupchat_control.py:1892
 #, python-brace-format
 msgid "{nick} has left{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1970
+#: gajim/groupchat_control.py:1914
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s sa pripojil do diskusnej skupiny"
 
-#: gajim/groupchat_control.py:1985 gajim/groupchat_control.py:1990
-#: gajim/groupchat_control.py:1995 gajim/groupchat_control.py:2000
-#: gajim/groupchat_control.py:2011
-msgid "Unable to join group chat"
-msgstr "Nie je možné pripojiť sa do diskusnej skupiny"
-
-#: gajim/groupchat_control.py:1986
-#, fuzzy, python-format
-msgid "You are banned from group chat <b>%s</b>."
-msgstr "Dostali ste ban z diskusnej skupiny %s."
-
-#: gajim/groupchat_control.py:1991
-#, fuzzy, python-format
-msgid "Remote server <b>%s</b> does not exist."
-msgstr "Diskusná skupina %s neexistuje."
-
-#: gajim/groupchat_control.py:1996
-#, fuzzy, python-format
-msgid "Group chat <b>%s</b> does not exist."
-msgstr "Diskusná skupina %s neexistuje."
-
-#: gajim/groupchat_control.py:2001
+#: gajim/groupchat_control.py:1981
 #, fuzzy
-msgid "Group chat creation is not permitted."
-msgstr "Vytváranie diskusných skupín je obmedzené."
-
-#: gajim/groupchat_control.py:2005
-#, fuzzy
-msgid "Unable to join groupchat"
-msgstr "Nie je možné pripojiť sa do diskusnej skupiny"
-
-#: gajim/groupchat_control.py:2006
-#, fuzzy, python-format
-msgid "You must use your registered nickname in <b>%s</b>."
-msgstr "Vaša zaregistrovaná prezývka musí byť použitá v diskusnej skupine %s."
-
-#: gajim/groupchat_control.py:2012
-#, python-format
-msgid "You are not in the members list in groupchat %s."
-msgstr "Nie ste v zozname členov v skupinovej diskusii %s."
-
-#: gajim/groupchat_control.py:2068
-msgid "Room has been destroyed"
+msgid "Group chat has been destroyed"
 msgstr "Miestnosť bola zničená"
 
-#: gajim/groupchat_control.py:2073
+#: gajim/groupchat_control.py:1986
 #, fuzzy, python-format
-msgid "You can join this room instead: xmpp:%s?join"
+msgid "You can join this group chat instead: xmpp:%s?join"
 msgstr "Môžete sa prihlásiť do tejto miestnosti namiesto: %s"
 
-#: gajim/groupchat_control.py:2306
+#: gajim/groupchat_control.py:2214
 #, fuzzy
 msgid "Leave Group Chat"
 msgstr "Opustiť diskusnú skupinu"
 
-#: gajim/groupchat_control.py:2307
+#: gajim/groupchat_control.py:2215
 #, fuzzy
 msgid "Are you sure you want to leave this group chat?"
 msgstr "Ste si istý, že chcete opustiť diskusnú skupinu \"%s\"?"
 
-#: gajim/groupchat_control.py:2308
+#: gajim/groupchat_control.py:2216
 #, fuzzy, python-format
-msgid "If you close this window, you will be disconnected from '%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:2314
+#: gajim/groupchat_control.py:2222 gajim/roster_window.py:5177
 msgid "_Leave"
 msgstr ""
 
-#: gajim/groupchat_control.py:2377
+#: gajim/groupchat_control.py:2280 gajim/roster_window.py:3008
 #, fuzzy, python-format
 msgid "%(jid)s has been invited to this group chat"
 msgstr "%(nick)s bol odstránený z miestnosti (%(reason)s)"
 
-#: gajim/groupchat_control.py:2527
+#: gajim/groupchat_control.py:2463
 #, python-format
 msgid "Kicking %s"
 msgstr "Vykopnúť %s"
 
-#: gajim/groupchat_control.py:2528 gajim/groupchat_control.py:2829
+#: gajim/groupchat_control.py:2464 gajim/groupchat_control.py:2765
 msgid "You may specify a reason below:"
 msgstr "Môžete dole špecifikovať dôvod:"
 
-#: gajim/groupchat_control.py:2828
+#: gajim/groupchat_control.py:2764
 #, python-format
 msgid "Banning %s"
 msgstr "Zakazujem %s"
 
-#: gajim/chat_control.py:408
+#: gajim/chat_control.py:432
 #, fuzzy
 msgid "Show a list of formattings"
 msgstr "Zobraziť zoznam emotikon (Alt+M)"
 
-#: gajim/chat_control.py:412
+#: gajim/chat_control.py:436
 #, fuzzy
 msgid "This contact does not support HTML"
 msgstr "Tento kontakt nepodporuje prenos súborov."
 
-#: gajim/chat_control.py:562
+#: gajim/chat_control.py:586
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr ""
 
-#: gajim/chat_control.py:686
+#: gajim/chat_control.py:710
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s z diskusnej skupiny %(room_name)s"
 
-#: gajim/chat_control.py:832
+#: gajim/chat_control.py:856
 #, python-format
 msgid "%(type)s encryption is active %(authenticated)s"
 msgstr ""
 
-#: gajim/chat_control.py:1160 gajim/chat_control.py:1168
+#: gajim/chat_control.py:1184 gajim/chat_control.py:1192
 #, fuzzy
 msgid "Close"
 msgstr "_Poslať a zatvoriť"
 
-#: gajim/chat_control.py:1161
+#: gajim/chat_control.py:1185
 #, fuzzy, python-format
 msgid "You just received a new message from %s"
 msgstr "Práve ste prijali novú správu od \"%s\""
 
-#: gajim/chat_control.py:1163
+#: gajim/chat_control.py:1187
 #, fuzzy
 msgid ""
 "If you close this tab while having chat history disabled, this message will "
@@ -1191,16 +1154,16 @@ msgid ""
 msgstr ""
 "Ak zatvoríte túto kartu a máte deaktivovanú históriu, správa bude stratená."
 
-#: gajim/chat_control.py:1208
+#: gajim/chat_control.py:1232
 msgid "Ping?"
 msgstr "Ping?"
 
-#: gajim/chat_control.py:1211
+#: gajim/chat_control.py:1235
 #, fuzzy, python-format
 msgid "Pong! (%s seconds)"
 msgstr "Pong! (%s s.)"
 
-#: gajim/chat_control.py:1308
+#: gajim/chat_control.py:1332
 #, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -1209,273 +1172,281 @@ msgstr ""
 "Predmet: %(subject)s\n"
 "%(message)s"
 
-#: gajim/chat_control.py:1416
+#: gajim/chat_control.py:1440
 #, fuzzy, python-format
 msgid "%(name)s is now %(show)s %(status)s"
 msgstr "%(name)s je teraz %(status)s"
 
-#: gajim/chat_control.py:1476 gajim/data/gui/application_menu.ui:32
+#: gajim/chat_control.py:1500 gajim/data/gui/application_menu.ui:32
 #: gajim/gtk/http_upload_progress.py:35
 #, fuzzy
 msgid "File Transfer"
 msgstr "Prenos súborov"
 
-#: gajim/chat_control.py:1480
+#: gajim/chat_control.py:1504
 #, fuzzy
 msgid "Size"
 msgstr "Veľkosť: %s"
 
-#: gajim/chat_control.py:1482 gajim/chat_control.py:1546
+#: gajim/chat_control.py:1506 gajim/chat_control.py:1566
+#: gajim/gui_interface.py:190
 #: gajim/data/gui/groupchat_invitation_received.ui:77
-#: gajim/gtk/filetransfer.py:485
+#: gajim/gtk/filetransfer.py:490
 #, fuzzy
 msgid "_Accept"
 msgstr "Prijať"
 
-#: gajim/chat_control.py:1484 gajim/chat_control.py:1548
+#: gajim/chat_control.py:1508 gajim/chat_control.py:1568
 #: gajim/data/gui/groupchat_invitation_received.ui:62
 #, fuzzy
 msgid "_Decline"
 msgstr "_Odhlásený"
 
-#: gajim/chat_control.py:1506 gajim/gui_interface.py:791
-#: gajim/gui_interface.py:821 gajim/gui_interface.py:847
+#: gajim/chat_control.py:1530 gajim/gui_interface.py:777
+#: gajim/gui_interface.py:807 gajim/gui_interface.py:833
 #: gajim/gtk/notification.py:173 gajim/gtk/notification.py:278
 msgid "File Transfer Completed"
 msgstr "Prenos súboru dokončený"
 
-#: gajim/chat_control.py:1510 gajim/gtk/filetransfer.py:259
+#: gajim/chat_control.py:1534 gajim/gtk/filetransfer.py:258
 #, fuzzy
 msgid "Open _Folder"
 msgstr "_Otvoriť priečinok s obsahom"
 
-#: gajim/chat_control.py:1512 gajim/chat_control.py:1521
+#: gajim/chat_control.py:1536 gajim/chat_control.py:1545
+#: gajim/data/gui/groupchat_control.ui:962
+#: gajim/data/gui/groupchat_control.ui:1049
+#: gajim/data/gui/groupchat_control.ui:1155
 #, fuzzy
 msgid "_Close"
 msgstr "_Poslať a zatvoriť"
 
-#: gajim/chat_control.py:1543 gajim/gui_interface.py:484
+#: gajim/chat_control.py:1563 gajim/gui_interface.py:473
+#: gajim/data/gui/groupchat_invitation_received.ui:42
 #: gajim/gtk/notification.py:174 gajim/gtk/notification.py:195
 #: gajim/gtk/notification.py:281
-msgid "Groupchat Invitation"
+#, fuzzy
+msgid "Group Chat Invitation"
 msgstr "Pozvánka do diskusnej skupiny"
 
-#: gajim/chat_control.py:1568 gajim/roster_window.py:1954
+#: gajim/chat_control.py:1588 gajim/roster_window.py:1951
 msgid "Remote contact stopped transfer"
 msgstr "Vzdialený kontakt zastavil prenos"
 
-#: gajim/chat_control.py:1570 gajim/roster_window.py:1956
+#: gajim/chat_control.py:1590 gajim/roster_window.py:1953
 msgid "Error opening file"
 msgstr "Chyba otvárania súboru"
 
-#: gajim/chat_control.py:1572 gajim/gtk/filetransfer.py:297
+#: gajim/chat_control.py:1592 gajim/gtk/filetransfer.py:296
 msgid "File transfer stopped"
 msgstr "Prenos súboru bol zastavený"
 
-#: gajim/chat_control.py:1575 gajim/gtk/filetransfer.py:275
-#: gajim/gtk/filetransfer.py:284
+#: gajim/chat_control.py:1595 gajim/gtk/filetransfer.py:274
+#: gajim/gtk/filetransfer.py:283
 msgid "File transfer cancelled"
 msgstr "Prenos súboru bol zrušený"
 
-#: gajim/chat_control.py:1576
+#: gajim/chat_control.py:1596
 msgid "Connection with peer cannot be established."
 msgstr "Spojenie s druhou stranou nie je možné nadviazať."
 
-#: gajim/application.py:72
+#: gajim/application.py:75
 #, fuzzy
 msgid "Show the application's version"
 msgstr "Notification-daemon"
 
-#: gajim/application.py:79
+#: gajim/application.py:82
 #, fuzzy
 msgid "Show only critical errors"
 msgstr "_Zobraziť udalosť v zozname"
 
-#: gajim/application.py:86
+#: gajim/application.py:89
 msgid "Separate profile files completely (even history database and plugins)"
 msgstr ""
 
-#: gajim/application.py:94
+#: gajim/application.py:97
 msgid "Print XML stanzas and other debug information"
 msgstr ""
 
-#: gajim/application.py:101
+#: gajim/application.py:104
 #, fuzzy
 msgid "Use defined profile in configuration directory"
 msgstr "Editor rozšírenej konfigurácie"
 
-#: gajim/application.py:109
+#: gajim/application.py:112
 #, fuzzy
 msgid "Set configuration directory"
 msgstr "%s konfiguračná chyba"
 
-#: gajim/application.py:117
+#: gajim/application.py:120
 msgid "Configure logging system"
 msgstr ""
 
-#: gajim/application.py:125
+#: gajim/application.py:128
 #, fuzzy
 msgid "Show all warnings"
 msgstr "Zobraziť všetky čakajúce _udalosti"
 
-#: gajim/application.py:132
+#: gajim/application.py:135
 msgid "Open IPython shell"
 msgstr ""
 
-#: gajim/application.py:139
+#: gajim/application.py:142
 msgid "Pops up a window with the next pending event"
 msgstr "Vyskakovacie okno s ďalšou čakajúcou udalosťou"
 
-#: gajim/application.py:145 gajim/data/gui/shortcuts_window.ui:203
+#: gajim/application.py:148 gajim/data/gui/shortcuts_window.ui:203
 #: data/org.gajim.Gajim.desktop.in:21
 #, fuzzy
 msgid "Start a new chat"
 msgstr "Začať rozhovor"
 
-#: gajim/application.py:152
+#: gajim/application.py:155
 msgid "Simulate loss of connectivity"
 msgstr ""
 
-#: gajim/application.py:159
+#: gajim/application.py:162
 msgid "Simulate regaining connectivity"
 msgstr ""
 
-#: gajim/application.py:201 gajim/gui_interface.py:133
+#: gajim/application.py:204 gajim/gui_interface.py:133
 msgid "Database Error"
 msgstr "Chyba databázy"
 
-#: gajim/roster_window.py:294 gajim/roster_window.py:1030
+#: gajim/roster_window.py:291 gajim/roster_window.py:1027
 msgid "Merged accounts"
 msgstr "Zlúčené účty"
 
-#: gajim/roster_window.py:853 gajim/roster_window.py:1631
-#: gajim/roster_window.py:1664 gajim/roster_window.py:1715
-#: gajim/roster_window.py:1717 gajim/roster_window.py:1872
-#: gajim/roster_window.py:2531 gajim/roster_window.py:5025
-#: gajim/common/contacts.py:188 gajim/common/contacts.py:447
-#: gajim/common/helpers.py:83 gajim/gtk/discovery.py:129
-#: gajim/gtk/discovery.py:130 gajim/gtk/discovery.py:1416
+#: gajim/roster_window.py:850 gajim/roster_window.py:1628
+#: gajim/roster_window.py:1661 gajim/roster_window.py:1712
+#: gajim/roster_window.py:1714 gajim/roster_window.py:1869
+#: gajim/roster_window.py:2528 gajim/roster_window.py:4331
+#: gajim/roster_window.py:4964 gajim/common/contacts.py:204
+#: gajim/common/contacts.py:463 gajim/common/helpers.py:86
+#: gajim/gtk/discovery.py:127 gajim/gtk/discovery.py:128
+#: gajim/gtk/discovery.py:1414
 msgid "Transports"
 msgstr "Transporty"
 
-#: gajim/roster_window.py:1723 gajim/roster_window.py:1725
-#: gajim/roster_window.py:4995 gajim/gui_interface.py:1613
-#: gajim/gui_interface.py:1639 gajim/common/contacts.py:186
-#: gajim/common/helpers.py:83 gajim/common/modules/adhoc_commands.py:245
-msgid "Groupchats"
+#: gajim/roster_window.py:1720 gajim/roster_window.py:1722
+#: gajim/roster_window.py:4331 gajim/roster_window.py:4934
+#: gajim/gui_interface.py:1527 gajim/common/contacts.py:202
+#: gajim/common/helpers.py:86 gajim/common/modules/adhoc_commands.py:245
+#, fuzzy
+msgid "Group chats"
 msgstr "Diskuné skupiny"
 
-#: gajim/roster_window.py:2012
+#: gajim/roster_window.py:2009
 #, fuzzy
 msgid "Authorization sent"
 msgstr "Autorizácia bola odoslaná"
 
-#: gajim/roster_window.py:2013
+#: gajim/roster_window.py:2010
 #, fuzzy, python-format
 msgid "\"%s\" will now see your status."
 msgstr "Od teraz bude \"%s\" vidieť váš stav."
 
-#: gajim/roster_window.py:2031
+#: gajim/roster_window.py:2028
 msgid "Subscription request has been sent"
 msgstr "Žiadosť o zapísanie bola odoslaná"
 
-#: gajim/roster_window.py:2032
-#, python-format
-msgid "If \"%s\" accepts this request you will know his or her status."
+#: gajim/roster_window.py:2029
+#, 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:2046
+#: gajim/roster_window.py:2043
 #, fuzzy
 msgid "Authorization removed"
 msgstr "Autorizácia bola odstránená"
 
-#: gajim/roster_window.py:2047
+#: gajim/roster_window.py:2044
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Odteraz vás \"%s\" uvidí len v stave odhlásený."
 
-#: gajim/roster_window.py:2250 gajim/roster_window.py:3504
+#: gajim/roster_window.py:2247 gajim/roster_window.py:3460
 msgid "Disconnect for Invisibility"
 msgstr ""
 
-#: gajim/roster_window.py:2251 gajim/roster_window.py:3505
+#: gajim/roster_window.py:2248 gajim/roster_window.py:3461
 msgid "You are participating in one or more group chats"
 msgstr "Ste v jednej alebo viacerých diskusných skupinách"
 
-#: gajim/roster_window.py:2252 gajim/roster_window.py:3506
+#: gajim/roster_window.py:2249 gajim/roster_window.py:3462
 #, fuzzy
 msgid ""
-"Changing your status to invisible will result in disconnection from those "
-"group chats.\n"
+"Changing your status to invisible will result in you leaving those group "
+"chats.\n"
 "Are you sure you want to go invisible?"
 msgstr ""
 "Zmena stavu na neviditeľný, automaticky spôsobí, že budete odpojený z "
 "diskusných skupín. Ste si skutočne istý, že chcete zmeniť stav na "
 "neviditeľný?"
 
-#: gajim/roster_window.py:2257 gajim/roster_window.py:3512
-#: gajim/roster_window.py:5238 gajim/data/gui/gc_control_popup_menu.ui:120
+#: gajim/roster_window.py:2254 gajim/roster_window.py:3468
+#: gajim/data/gui/gc_control_popup_menu.ui:120
 msgid "_Disconnect"
 msgstr "O_dpojiť"
 
-#: gajim/roster_window.py:2285
+#: gajim/roster_window.py:2282
 #, fuzzy
 msgid "desynced"
 msgstr "Pokročilé"
 
-#: gajim/roster_window.py:2353 gajim/data/gui/shortcuts_window.ui:224
+#: gajim/roster_window.py:2350 gajim/data/gui/shortcuts_window.ui:224
 #, fuzzy
 msgid "Quit Gajim"
 msgstr "Gajim"
 
-#: gajim/roster_window.py:2354
+#: gajim/roster_window.py:2351
 #, fuzzy
 msgid "You are about to quit Gajim"
 msgstr "Ste si istý, že chcete ukončiť program Gajim?"
 
-#: gajim/roster_window.py:2355
+#: gajim/roster_window.py:2352
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Ste si istý, že chcete ukončiť program Gajim?"
 
-#: gajim/roster_window.py:2356
+#: gajim/roster_window.py:2353
 #, fuzzy
 msgid "_Always quit when closing Gajim"
 msgstr "Vždy zavrieť Gajim"
 
-#: gajim/roster_window.py:2359 gajim/roster_window.py:2455
-#: gajim/roster_window.py:2495 gajim/data/gui/systray_context_menu.ui:90
+#: gajim/roster_window.py:2356 gajim/roster_window.py:2452
+#: gajim/roster_window.py:2492 gajim/data/gui/systray_context_menu.ui:83
 #, fuzzy
 msgid "_Quit"
 msgstr "_Koniec"
 
-#: gajim/roster_window.py:2448
+#: gajim/roster_window.py:2445
 #, fuzzy
 msgid "Stop File Transfers"
 msgstr "Prenos súborov"
 
-#: gajim/roster_window.py:2449
+#: gajim/roster_window.py:2446
 #, fuzzy
 msgid "You still have running file transfers"
 msgstr "Prebiehajú u vás prenosy súborov"
 
-#: gajim/roster_window.py:2450
+#: gajim/roster_window.py:2447
 msgid ""
 "If you quit now, the file(s) being transferred will be lost.\n"
 "Do you still want to quit?"
 msgstr ""
 
-#: gajim/roster_window.py:2488
+#: gajim/roster_window.py:2485
 #, fuzzy
 msgid "Unread Messages"
 msgstr "Neprečítané udalosti"
 
-#: gajim/roster_window.py:2489
+#: gajim/roster_window.py:2486
 #, fuzzy
 msgid "You still have unread messages"
 msgstr "Máte neprečítané správy"
 
-#: gajim/roster_window.py:2490
+#: gajim/roster_window.py:2487
 #, fuzzy
 msgid ""
 "Messages will only be available for reading them later if storing chat "
@@ -1484,20 +1455,20 @@ msgstr ""
 "Správu bude možné prečítať neskôr len vtedy, ak máte povolenú históriu a "
 "kontakt je vo vašom zozname kontaktov."
 
-#: gajim/roster_window.py:2760
+#: gajim/roster_window.py:2753
 msgid "You have unread messages"
 msgstr "Máte neprečítané správy"
 
-#: gajim/roster_window.py:2761
+#: gajim/roster_window.py:2754
 msgid "You must read them before removing this transport."
 msgstr "Musíte si ich prečítať pred odstránením tohoto transportu."
 
-#: gajim/roster_window.py:2764
+#: gajim/roster_window.py:2757
 #, fuzzy, python-format
 msgid "Transport '%s' will be removed"
 msgstr "Transport \"%s\" bude odstránený"
 
-#: gajim/roster_window.py:2765
+#: gajim/roster_window.py:2758
 #, fuzzy
 msgid ""
 "You will no longer be able to send and receive messages from and to contacts "
@@ -1506,11 +1477,11 @@ msgstr ""
 "Už nebudete môcť prijímať a odosielať správy tomuto kontaktu cez tento "
 "transport."
 
-#: gajim/roster_window.py:2768
+#: gajim/roster_window.py:2761
 msgid "Transports will be removed"
 msgstr "Transport bude odstránený"
 
-#: gajim/roster_window.py:2773
+#: gajim/roster_window.py:2766
 #, fuzzy, python-format
 msgid ""
 "You will no longer be able to send and receive messages from and to contacts "
@@ -1520,86 +1491,81 @@ msgstr ""
 "Už nebudete môcť prijímať a odosielať správy tomuto kontaktu cez tento "
 "transport."
 
-#: gajim/roster_window.py:2777
+#: gajim/roster_window.py:2770
 #, fuzzy
 msgid "Remove Transport"
 msgstr "Zobraziť trans_porty"
 
-#: gajim/roster_window.py:2844
+#: gajim/roster_window.py:2837
 #, fuzzy
 msgid "Block Contact"
 msgstr "Blokované kontakty"
 
-#: gajim/roster_window.py:2845
+#: gajim/roster_window.py:2838
 #, fuzzy
 msgid "Really block this contact?"
 msgstr "Má tento kontakt k dispozícii OpenPGP?"
 
-#: gajim/roster_window.py:2846
+#: gajim/roster_window.py:2839
 msgid ""
 "This contact will see you offline and you will not receive any messages sent "
 "to you by this contact."
 msgstr ""
 
-#: gajim/roster_window.py:2851
+#: gajim/roster_window.py:2844
 #, fuzzy
 msgid "_Block Contact"
 msgstr "Blokované kontakty"
 
-#: gajim/roster_window.py:2896
+#: gajim/roster_window.py:2889
 msgid "Rename Contact"
 msgstr "Premenovať kontakt"
 
-#: gajim/roster_window.py:2897
+#: gajim/roster_window.py:2890
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Zadať novú prezývku pre kontakt %s"
 
-#: gajim/roster_window.py:2904
+#: gajim/roster_window.py:2897
 msgid "Rename Group"
 msgstr "Premenovať skupinu"
 
-#: gajim/roster_window.py:2905
+#: gajim/roster_window.py:2898
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Zadať nové meno skupiny %s"
 
-#: gajim/roster_window.py:2953 gajim/roster_window.py:2954
+#: gajim/roster_window.py:2946 gajim/roster_window.py:2947
 msgid "Remove Group"
 msgstr "Odstrániť skupinu"
 
-#: gajim/roster_window.py:2955
+#: gajim/roster_window.py:2948
 #, fuzzy, python-format
 msgid "Do you want to remove %s from the contact list?"
 msgstr "Chcete skutočne odstrániť skupinu %s zo zoznamu kontaktov?"
 
-#: gajim/roster_window.py:2956
+#: gajim/roster_window.py:2949
 #, fuzzy
 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:3044
-#, fuzzy, python-format
-msgid "%(jid)s has been invited in this room"
-msgstr "%(nick)s bol odstránený z miestnosti (%(reason)s)"
-
-#: gajim/roster_window.py:3353
+#: gajim/roster_window.py:3309
 #, fuzzy
 msgid "Remove Contact"
 msgstr "Premenovať kontakt"
 
-#: gajim/roster_window.py:3354
+#: gajim/roster_window.py:3310
 #, fuzzy
 msgid "Remove contact from contact list"
 msgstr "Odstráni kontakt zo zoznamu"
 
-#: gajim/roster_window.py:3355
+#: gajim/roster_window.py:3311
 #, python-format
 msgid "You are about to remove '%(name)s' (%(jid)s) from your contact list.\n"
 msgstr ""
 
-#: gajim/roster_window.py:3364 gajim/roster_window.py:3384
+#: gajim/roster_window.py:3320 gajim/roster_window.py:3340
 #, fuzzy
 msgid ""
 "By removing this contact you also remove authorization. This means the "
@@ -1609,21 +1575,21 @@ msgstr ""
 "taktiež odstránite vašu autorizáciu, to znamená, že vás budú vidieť ako "
 "odhlásený."
 
-#: gajim/roster_window.py:3375
+#: gajim/roster_window.py:3331
 msgid "Do you want to continue?"
 msgstr "Chcete pokračovať?"
 
-#: gajim/roster_window.py:3386
+#: gajim/roster_window.py:3342
 #, 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:3393
+#: gajim/roster_window.py:3349
 #, fuzzy
 msgid "Remove contacts from contact list"
 msgstr "Odstráni kontakt zo zoznamu"
 
-#: gajim/roster_window.py:3399
+#: gajim/roster_window.py:3355
 #, fuzzy, python-format
 msgid ""
 "By removing the following contacts, you will also remove authorization. This "
@@ -1635,25 +1601,25 @@ msgstr ""
 "taktiež odstránite vašu autorizáciu, to znamená, že vás budú vidieť ako "
 "odhlásený."
 
-#: gajim/roster_window.py:3403
+#: gajim/roster_window.py:3359
 #, fuzzy
 msgid "Remove Contacts"
 msgstr "Premenovať kontakt"
 
-#: gajim/roster_window.py:3423
+#: gajim/roster_window.py:3379
 msgid "No account available"
 msgstr "Žiadne účty nie sú dostupné"
 
-#: gajim/roster_window.py:3424
+#: gajim/roster_window.py:3380
 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:4060
+#: gajim/roster_window.py:4011
 msgid "Metacontacts storage not supported by your server"
 msgstr "Server nepodporuje ukladanie metakontaktov"
 
-#: gajim/roster_window.py:4062
+#: gajim/roster_window.py:4013
 #, fuzzy
 msgid ""
 "Your server does not support storing metacontacts information. So this "
@@ -1662,40 +1628,40 @@ msgstr ""
 "Váš server nepodporuje ukladanie informácií metakontaktov. Tak tieto "
 "informácie nebudú uložené pri ďalšom prihlásení."
 
-#: gajim/roster_window.py:4159
+#: gajim/roster_window.py:4110
 #, 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:4160
+#: gajim/roster_window.py:4111
 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:4164
+#: gajim/roster_window.py:4115
 #, fuzzy
 msgid "Create Metacontact"
 msgstr "Premenovať kontakt"
 
-#: gajim/roster_window.py:4170
+#: gajim/roster_window.py:4121 gajim/data/gui/groupchat_creation.ui:317
 #, fuzzy
 msgid "_Create"
 msgstr "Tvorivý"
 
-#: gajim/roster_window.py:4287
+#: gajim/roster_window.py:4238
 msgid "Invalid file URI:"
 msgstr "Neplatná URI súboru:"
 
-#: gajim/roster_window.py:4298
+#: gajim/roster_window.py:4249
 #, fuzzy
 msgid "Send file?"
 msgstr "Poslať _súbor"
 
-#: gajim/roster_window.py:4299
+#: gajim/roster_window.py:4250
 #, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
@@ -1703,97 +1669,88 @@ 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:4451
+#: gajim/roster_window.py:4401
 #, fuzzy, python-format
 msgid "Send %(from)s to %(to)s"
 msgstr "Poslať %s do %s"
 
-#: gajim/roster_window.py:4464
+#: gajim/roster_window.py:4414
 #, fuzzy, python-format
 msgid "Make %s first contact"
 msgstr "Poslať súbor kontaktu"
 
-#: gajim/roster_window.py:4469
+#: gajim/roster_window.py:4419
 #, fuzzy, python-format
 msgid "Make %(contact1)s and %(contact2)s metacontacts"
 msgstr "Poslať súbor kontaktu"
 
-#: gajim/roster_window.py:4825 gajim/roster_window.py:4923
+#: gajim/roster_window.py:4775 gajim/roster_window.py:4862
 msgid "_Change Status Message"
 msgstr "_Zmeniť správu o stave"
 
-#: gajim/roster_window.py:4845
+#: gajim/roster_window.py:4795
 msgid "Publish Tune"
 msgstr "Hudba"
 
-#: gajim/roster_window.py:4856
+#: gajim/roster_window.py:4806
 msgid "Publish Location"
 msgstr "Publikovať umiestnenie"
 
-#: gajim/roster_window.py:4868
-#, fuzzy
-msgid "Configure Services…"
-msgstr "Nastavovať služby..."
-
-#: gajim/roster_window.py:4997
+#: gajim/roster_window.py:4936
 msgid "_Maximize All"
 msgstr "_Maximalizovať všetko"
 
-#: gajim/roster_window.py:5004 gajim/roster_window.py:5146
+#: gajim/roster_window.py:4943 gajim/roster_window.py:5085
 msgid "Send Group M_essage"
 msgstr "Poslať sprá_vu skupine"
 
-#: gajim/roster_window.py:5011
+#: gajim/roster_window.py:4950
 msgid "To all users"
 msgstr "Všetkým používateľom"
 
-#: gajim/roster_window.py:5015
+#: gajim/roster_window.py:4954
 msgid "To all online users"
 msgstr "Všetkým pripojeným používateľom"
 
-#: gajim/roster_window.py:5027 gajim/roster_window.py:5152
+#: gajim/roster_window.py:4966 gajim/roster_window.py:5091
 #: gajim/data/gui/gc_occupants_menu.ui:110
 #: gajim/data/gui/contact_context_menu.ui:36
 msgid "In_vite to"
 msgstr "Poz_vať do"
 
-#: gajim/roster_window.py:5162
+#: gajim/roster_window.py:5101
 msgid "_Manage Contacts"
 msgstr "S_pravovať kontakty"
 
-#: gajim/roster_window.py:5168
+#: gajim/roster_window.py:5107
 #, fuzzy
 msgid "Edit _Groups…"
 msgstr "Upraviť _skupiny"
 
-#: gajim/roster_window.py:5189 gajim/data/gui/filetransfers.ui:12
+#: gajim/roster_window.py:5128 gajim/data/gui/filetransfers.ui:12
 #: gajim/data/gui/remove_account_window.ui:134
 msgid "_Remove"
 msgstr "O_dstrániť"
 
-#: gajim/roster_window.py:5226
+#: gajim/roster_window.py:5165
 msgid "_Maximize"
 msgstr "Ma_ximalizovať"
 
-#: gajim/roster_window.py:5233
+#: gajim/roster_window.py:5172
 msgid "_Reconnect"
 msgstr "Znovu p_ripojiť"
 
-#: gajim/roster_window.py:5254 gajim/data/gui/gc_occupants_menu.ui:170
+#: gajim/roster_window.py:5193 gajim/data/gui/gc_occupants_menu.ui:170
 #: gajim/data/gui/gc_control_popup_menu.ui:113
 #: gajim/data/gui/contact_context_menu.ui:205
 msgid "_History"
 msgstr "_História"
 
-#: gajim/roster_window.py:5335 gajim/data/gui/application_menu.ui:86
+#: gajim/roster_window.py:5274 gajim/data/gui/application_menu.ui:83
 #: gajim/data/gui/history_window.ui:57
 msgid "History Manager"
 msgstr "Správca histórie"
 
-#: gajim/roster_window.py:5343
-msgid "_Join New Group Chat"
-msgstr "_Pripojiť sa k diskusnej skupine"
-
 #: gajim/dataforms_widget.py:585
 #, fuzzy
 msgid "Unable to load image"
@@ -1917,227 +1874,243 @@ msgstr "Predmet: %s\n"
 msgid "Write a message…"
 msgstr "Nová súkromná správa"
 
-#: gajim/message_window.py:250
+#: gajim/message_window.py:356
+#, fuzzy
+msgid "Close Tabs"
+msgstr "Zavrieť"
+
+#: gajim/message_window.py:357
 msgid "You are going to close several tabs"
 msgstr "Chystáte sa zavrieť niekoľko kariet"
 
-#: gajim/message_window.py:251
+#: gajim/message_window.py:358
 msgid "Do you really want to close them all?"
 msgstr "Naozaj chcete zavrieť všetky?"
 
-#: gajim/message_window.py:539
+#: gajim/message_window.py:514
 #, fuzzy
 msgid "?Noun:Chats"
 msgstr "Diskusné skupiny"
 
-#: gajim/message_window.py:543
+#: gajim/message_window.py:518
 #, fuzzy
 msgid "Group Chats"
 msgstr "Diskuné skupiny"
 
-#: gajim/message_window.py:547
+#: gajim/message_window.py:522
 msgid "Private Chats"
 msgstr "Súkromné rozhovory"
 
-#: gajim/message_window.py:553
+#: gajim/message_window.py:528
 msgid "Messages"
 msgstr "Správy"
 
-#: gajim/gui_interface.py:173
-msgid "Do you accept this request?"
-msgstr "Prijať túto požiadavku?"
+#: gajim/gui_interface.py:170
+#, 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:175
-#, python-format
-msgid "Do you accept this request on account %s?"
-msgstr ""
+msgid "Do you accept this request?"
+msgstr "Prijať túto požiadavku?"
 
-#: gajim/gui_interface.py:178
+#: gajim/gui_interface.py:177
 #, 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)"
+msgid "Do you accept this request (account: %s)?"
+msgstr "Prijať túto požiadavku?"
 
-#: gajim/gui_interface.py:194 gajim/gtk/notification.py:175
+#: gajim/gui_interface.py:182
+#, fuzzy
+msgid "Authorization"
+msgstr "Autorizácia bola odoslaná"
+
+#: gajim/gui_interface.py:186 gajim/gui_interface.py:420
+#: gajim/gtk/filetransfer.py:338
+#, fuzzy
+msgid "_No"
+msgstr "Žiadny"
+
+#: gajim/gui_interface.py:205 gajim/gtk/notification.py:175
 #: gajim/gtk/notification.py:197
 msgid "Connection Failed"
 msgstr "Spojenie zlyhalo"
 
-#: gajim/gui_interface.py:279 gajim/gui_interface.py:529
-msgid "Password Required"
-msgstr "Heslo je požadované"
-
-#: gajim/gui_interface.py:280
-#, python-format
-msgid "A Password is required to join the room %s. Please type it."
-msgstr ""
-"Pre prihlásenie do miestnosti %s je potrebné heslo. Zadajte ho, prosím."
-
-#: gajim/gui_interface.py:342 gajim/gui_interface.py:346
+#: gajim/gui_interface.py:325 gajim/gui_interface.py:329
 #, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr "Chyba %(code)s: %(msg)s"
 
-#: gajim/gui_interface.py:357 gajim/gui_interface.py:376
+#: gajim/gui_interface.py:340 gajim/gui_interface.py:359
 #: gajim/common/modules/message.py:122
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "chyba pri odosielaní %(message)s ( %(error)s )"
 
-#: gajim/gui_interface.py:401 gajim/gtk/notification.py:175
+#: gajim/gui_interface.py:384 gajim/gtk/notification.py:175
 msgid "Subscription request"
 msgstr "Požiadavka o zapísanie"
 
-#: gajim/gui_interface.py:413 gajim/common/contacts.py:184
-#: gajim/common/helpers.py:83
+#: gajim/gui_interface.py:396 gajim/common/contacts.py:200
+#: gajim/common/helpers.py:86
 msgid "Observers"
 msgstr "Pozorovatelia"
 
-#: gajim/gui_interface.py:422
+#: gajim/gui_interface.py:405
 msgid "Authorization accepted"
 msgstr "Autorizácia akceptovaná"
 
-#: gajim/gui_interface.py:423
+#: gajim/gui_interface.py:406
 #, 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:431
-#, python-format
-msgid "Contact \"%s\" removed subscription from you"
+#: gajim/gui_interface.py:415
+#, fuzzy
+msgid "Subscription Removed"
+msgstr "Požiadavka o zapísanie"
+
+#: gajim/gui_interface.py:416
+#, fuzzy, python-format
+msgid "Contact '%s' removed subscription from you"
 msgstr "Kontakt \"%s\" vás odstránil zo svojho zoznamu"
 
-#: gajim/gui_interface.py:432
+#: gajim/gui_interface.py:417
 #, fuzzy
 msgid ""
-"You will always see them as offline.\n"
+"You will always see this contact as offline.\n"
 "Do you want to remove them from your contact list?"
 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:453 gajim/gtk/notification.py:176
+#: gajim/gui_interface.py:442 gajim/gtk/notification.py:176
 msgid "Unsubscribed"
 msgstr "Nezapísaný"
 
-#: gajim/gui_interface.py:465
+#: gajim/gui_interface.py:454
 #, python-format
 msgid "%(jid)s declined the invitation: %(reason)s"
 msgstr ""
 
-#: gajim/gui_interface.py:469
+#: gajim/gui_interface.py:458
 #, python-format
 msgid "%(jid)s declined the invitation"
 msgstr ""
 
-#: gajim/gui_interface.py:485
+#: gajim/gui_interface.py:474
 #, fuzzy, python-brace-format
 msgid "You are invited to {room} by {user}"
 msgstr "Ste pozvaný do diskusnej skupiny"
 
-#: gajim/gui_interface.py:506
+#: gajim/gui_interface.py:495
 #, fuzzy
 msgid "Certificate Passphrase Required"
 msgstr "Certifikát vypršal"
 
-#: gajim/gui_interface.py:507
+#: gajim/gui_interface.py:496
 #, 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:516 gajim/gtk/accounts.py:963
+#: gajim/gui_interface.py:505 gajim/gtk/accounts.py:966
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Vložte heslo pre váš účet %s"
 
-#: gajim/gui_interface.py:529 gajim/gtk/accounts.py:964
+#: gajim/gui_interface.py:518
+msgid "Password Required"
+msgstr "Heslo je požadované"
+
+#: gajim/gui_interface.py:518 gajim/gtk/accounts.py:967
 msgid "Save password"
 msgstr "Uložiť heslo"
 
-#: gajim/gui_interface.py:601 gajim/gui_interface.py:632
+#: gajim/gui_interface.py:587 gajim/gui_interface.py:618
+#: gajim/gtk/filetransfer.py:332 gajim/gtk/filetransfer.py:333
 #: gajim/gtk/notification.py:173 gajim/gtk/notification.py:276
 msgid "File Transfer Error"
 msgstr "Chyba pri prenose súboru"
 
-#: gajim/gui_interface.py:666
+#: gajim/gui_interface.py:652
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s vám chce poslať súbor."
 
-#: gajim/gui_interface.py:668 gajim/gtk/filetransfer.py:479
+#: gajim/gui_interface.py:654 gajim/gtk/filetransfer.py:484
 #: gajim/gtk/notification.py:172 gajim/gtk/notification.py:274
 msgid "File Transfer Request"
 msgstr "Požiadavka na prenos súboru"
 
-#: gajim/gui_interface.py:767
+#: gajim/gui_interface.py:753
 #, fuzzy
 msgid "Remote Contact Stopped Transfer"
 msgstr "Vzdialený kontakt zastavil prenos"
 
-#: gajim/gui_interface.py:772
+#: gajim/gui_interface.py:758
 #, fuzzy
 msgid "Error Opening File"
 msgstr "Chyba otvárania súboru"
 
-#: gajim/gui_interface.py:782
+#: gajim/gui_interface.py:768
 #, fuzzy
 msgid "SSL Certificate Error"
 msgstr "Chyba SSL certifikátu"
 
-#: gajim/gui_interface.py:795 gajim/gui_interface.py:826
-#: gajim/gui_interface.py:853 gajim/gtk/notification.py:174
+#: gajim/gui_interface.py:781 gajim/gui_interface.py:812
+#: gajim/gui_interface.py:839 gajim/gtk/notification.py:174
 #: gajim/gtk/notification.py:279
 msgid "File Transfer Stopped"
 msgstr "Prenos súboru zastavený"
 
-#: gajim/gui_interface.py:799
+#: gajim/gui_interface.py:785
 #, fuzzy
 msgid "File Transfer Failed"
 msgstr "Prenos súborov"
 
-#: gajim/gui_interface.py:822
+#: gajim/gui_interface.py:808
 #, fuzzy, python-format
 msgid "%(filename)s received from %(name)s."
 msgstr "Prenos súboru %(filename)s od %(name)s zastavený."
 
-#: gajim/gui_interface.py:827
+#: gajim/gui_interface.py:813
 #, 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:833
+#: gajim/gui_interface.py:819
 #, 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:848
+#: gajim/gui_interface.py:834
 #, 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:854
+#: gajim/gui_interface.py:840
 #, 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:860
+#: gajim/gui_interface.py:846
 #, 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:971
+#: gajim/gui_interface.py:957
 msgid "Username Conflict"
 msgstr "Konflikt používateľských mien"
 
-#: gajim/gui_interface.py:972
+#: gajim/gui_interface.py:958
 msgid "Please type a new username for your local account"
 msgstr "Prosím, zadajte nové používateľské meno pre váš miestny účet"
 
-#: gajim/gui_interface.py:995
+#: gajim/gui_interface.py:981
 msgid "Resource Conflict"
 msgstr "Konflikt zdroju"
 
-#: gajim/gui_interface.py:996
+#: gajim/gui_interface.py:982
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
@@ -2145,30 +2118,30 @@ msgstr ""
 "Práve ste pripojený k tomuto účtu s rovnakými zdrojmi. Zadajte, prosím, nový "
 "zdroj"
 
-#: gajim/gui_interface.py:1053
+#: gajim/gui_interface.py:1039
 #, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s chce začať hlasový rozhovor."
 
-#: gajim/gui_interface.py:1055
+#: gajim/gui_interface.py:1041
 msgid "Voice Chat Request"
 msgstr "Požiadavka na hlasový rozhovor"
 
-#: gajim/gui_interface.py:1123 gajim/gtk/account_wizard.py:312
+#: gajim/gui_interface.py:1109 gajim/gtk/account_wizard.py:312
 msgid "Certificate Already in File"
 msgstr "Certifikát už v súbore"
 
-#: gajim/gui_interface.py:1124 gajim/gtk/account_wizard.py:313
+#: gajim/gui_interface.py:1110 gajim/gtk/account_wizard.py:313
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr "Tento certifikát je práve v súbore %s, preto nebude znova pridaný."
 
-#: gajim/gui_interface.py:1145
+#: gajim/gui_interface.py:1131
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid"
 msgstr ""
 
-#: gajim/gui_interface.py:1148
+#: gajim/gui_interface.py:1134
 #, python-format
 msgid ""
 "\n"
@@ -2177,7 +2150,7 @@ msgstr ""
 "\n"
 "Neznáma chyba SSL: %d"
 
-#: gajim/gui_interface.py:1150
+#: gajim/gui_interface.py:1136
 #, python-format
 msgid ""
 "\n"
@@ -2186,11 +2159,11 @@ msgstr ""
 "\n"
 "Chyba SSL: <b>%s</b>"
 
-#: gajim/gui_interface.py:1155
+#: gajim/gui_interface.py:1141
 msgid "Error verifying SSL certificate"
 msgstr "Chyba overovania SSL certifikátu"
 
-#: gajim/gui_interface.py:1156
+#: gajim/gui_interface.py:1142
 #, fuzzy, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your XMPP server: "
@@ -2203,7 +2176,7 @@ msgstr ""
 "SSL chyba: %(error)s\n"
 "Chcete sa ešte pripojiť k tomuto serveru?"
 
-#: gajim/gui_interface.py:1160 gajim/gtk/account_wizard.py:412
+#: gajim/gui_interface.py:1146 gajim/gtk/account_wizard.py:413
 #, fuzzy, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -2216,172 +2189,162 @@ msgstr ""
 "SHA1 fingerprint certifikátu:\n"
 "%s"
 
-#: gajim/gui_interface.py:1166
+#: gajim/gui_interface.py:1152
 msgid "Ignore this error for this certificate."
 msgstr "Ignorovať túto chybu pre tento certifikát."
 
-#: gajim/gui_interface.py:1174
+#: gajim/gui_interface.py:1160
 #, fuzzy, python-format
 msgid "SSL Certificate Verification for %s"
 msgstr "Chyba SSL certifikátu"
 
-#: gajim/gui_interface.py:1442 gajim/gtk/join_groupchat.py:235
-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/gui_interface.py:1448
-#, fuzzy
-msgid "JID is not a Groupchat"
-msgstr "Toto nie je diskusná skupina"
-
-#: gajim/gui_interface.py:1579
-msgid "This is not a group chat"
-msgstr "Toto nie je diskusná skupina"
-
-#: gajim/gui_interface.py:1580
-#, python-format
-msgid ""
-"%(room_jid)s is already in your roster. Please check if %(room_jid)s is a "
-"correct group chat name. If it is, delete it from your roster and try "
-"joining the group chat again."
-msgstr ""
-
-#: gajim/gui_interface.py:1604 gajim/dialog_messages.py:58
+#: gajim/gui_interface.py:1577
 msgid "You cannot join a group chat while you are invisible"
 msgstr "Nemôžete sa pripojiť do diskusnej skupiny, pokiaľ ste neviditeľný"
 
-#: gajim/gui_interface.py:2037
+#: gajim/gui_interface.py:1976
 msgid "Could not save your settings and preferences"
 msgstr "Nie je možné uložiť nastavenia"
 
-#: gajim/gui_interface.py:2098
+#: gajim/gui_interface.py:2037
 msgid "Gajim: IPython Console"
 msgstr ""
 
-#: gajim/dialog_messages.py:32
+#: gajim/dialog_messages.py:31 gajim/dialog_messages.py:36
+#: gajim/gtk/single_message.py:305 gajim/gtk/account_wizard.py:229
 #, fuzzy
-msgid "You can not start a new conversation unless you are connected."
-msgstr "Nemôžete sa pripojiť do diskusnej skupiny, pokiaľ nie ste prihlásený."
-
-#: gajim/dialog_messages.py:36 gajim/dialog_messages.py:41
-#: gajim/gtk/single_message.py:305 gajim/gtk/join_groupchat.py:211
-#: gajim/gtk/account_wizard.py:229
-msgid "Invalid JID"
-msgstr "Nesprávne JID"
+msgid "Invalid XMPP Address"
+msgstr "Nesprávny súbor"
 
-#: gajim/dialog_messages.py:42 gajim/gtk/single_message.py:306
+#: gajim/dialog_messages.py:37
 #, fuzzy, python-format
-msgid "It is not possible to send a message to %s, this JID is not valid."
+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/dialog_messages.py:47
-msgid "Unread events"
+#: gajim/dialog_messages.py:42
+#, fuzzy
+msgid "Unread Events"
 msgstr "Neprečítané udalosti"
 
-#: gajim/dialog_messages.py:48
-msgid "Read all pending events before removing this account."
+#: gajim/dialog_messages.py:43
+#, fuzzy
+msgid "Read or acknowledge all pending events before removing this account."
 msgstr "Prečítať všetky správy pred odstránením tohoto účtu."
 
-#: gajim/dialog_messages.py:52
+#: gajim/dialog_messages.py:48
 #, fuzzy
 msgid "Invalid Form"
 msgstr "Neplatná miestnosť"
 
-#: gajim/dialog_messages.py:53
+#: gajim/dialog_messages.py:49
 #, fuzzy
 msgid "The form is not filled correctly."
 msgstr "Prezývka obsahuje nepovolené znaky."
 
-#: gajim/dialog_messages.py:57 gajim/common/helpers.py:309
+#: gajim/dialog_messages.py:53 gajim/common/helpers.py:315
 msgid "Invisible"
 msgstr "Neviditeľný"
 
-#: gajim/dialog_messages.py:62
-msgid "A connection is not available"
+#: gajim/dialog_messages.py:54
+#, fuzzy
+msgid "You cannot join a group chat while being invisible."
+msgstr "Nemôžete sa pripojiť do diskusnej skupiny, pokiaľ ste neviditeľný"
+
+#: gajim/dialog_messages.py:58
+#, fuzzy
+msgid "No Connection Available"
 msgstr "Pripojenie nie je dostupné"
 
-#: gajim/dialog_messages.py:63
+#: gajim/dialog_messages.py:59
 msgid "Your message can not be sent until you are connected."
 msgstr "Vašu správu nie je možné odoslať, pokiaľ nebudete pripojený."
 
-#: gajim/dialog_messages.py:67
-#, fuzzy
-msgid "JID already in list"
-msgstr "Jabber Id je už v zozname"
+#: gajim/dialog_messages.py:63
+msgid "XMPP Address Already in List"
+msgstr ""
 
-#: gajim/dialog_messages.py:68
+#: gajim/dialog_messages.py:64
 #, fuzzy
-msgid "The JID you entered is already in the list. Choose another one."
+msgid ""
+"The XMPP Address you entered is already in the list. Please choose another "
+"one."
 msgstr "Zadané Jabber ID je už v zozname. Zvoľte iné."
 
-#: gajim/dialog_messages.py:72
-msgid "Invalid answer"
+#: gajim/dialog_messages.py:69
+#, fuzzy
+msgid "Invalid Answer"
 msgstr "Nesprávna odpoveď"
 
-#: gajim/dialog_messages.py:73
+#: gajim/dialog_messages.py:70
 #, python-format
 msgid "Transport %(name)s answered wrongly to register request: %(error)s"
 msgstr ""
 "Transport %(name)s odpovedal nesprávne pri odoslaní registračnej požiadavky: "
 "%(error)s"
 
-#: gajim/dialog_messages.py:78
+#: gajim/dialog_messages.py:75
 #, fuzzy
 msgid "Wrong Custom Hostname"
 msgstr "Použiť vlastný názov hostiteľa/portu"
 
-#: gajim/dialog_messages.py:79
+#: gajim/dialog_messages.py:76
 #, fuzzy, python-format
-msgid "Wrong custom hostname \"%s\". Ignoring it."
+msgid "Custom hostname \"%s\" is wrong. It will be ignored."
 msgstr "Použiť vlastný názov hostiteľa/portu"
 
-#: gajim/dialog_messages.py:83
-msgid "Error while removing privacy list"
+#: gajim/dialog_messages.py:80
+#, fuzzy
+msgid "Error While Removing Privacy List"
 msgstr "Chyba počas odstraňovania súkromného zoznamu"
 
-#: gajim/dialog_messages.py:84
-#, python-format
+#: gajim/dialog_messages.py:81
+#, fuzzy, python-format
 msgid ""
-"Privacy list %s has not been removed. It is maybe active in one of your "
-"connected resources. Deactivate it and try again."
+"Privacy list %s has not been removed. It is probably active in one of your "
+"connected resources. Please deactivate it and try again."
 msgstr ""
 "Súkromný zoznam %s nebol odstránený. Možno je používaný jedným z vašich "
 "pripojených zdrojov. Deaktivujte ho a skúste to znovu."
 
-#: gajim/dialog_messages.py:90
-msgid "Invisibility not supported"
+#: gajim/dialog_messages.py:87
+#, fuzzy
+msgid "Invisibility Not Supported"
 msgstr "Neviditeľnosť nie je podporovaná"
 
-#: gajim/dialog_messages.py:91
-#, python-format
-msgid "Account %s doesn't support invisibility."
+#: gajim/dialog_messages.py:88
+#, fuzzy, python-format
+msgid "This account %s doesn't support invisibility."
 msgstr "Účet %s nepodporuje neviditeľnosť."
 
-#: gajim/dialog_messages.py:95
-msgid "Unregister failed"
+#: gajim/dialog_messages.py:92
+#, fuzzy
+msgid "Unregister Failed"
 msgstr "Odstránenie účtu zlyhalo"
 
-#: gajim/dialog_messages.py:96
+#: gajim/dialog_messages.py:93
 #, fuzzy, python-format
-msgid "Unregistration with server %(server)s failed: %(error)s"
+msgid "Unregistration on server %(server)s failed: %(error)s"
 msgstr ""
 "Registrácia pomocou agenta %(agent)s zlyhala s chybou %(error)s: "
 "%(error_msg)s"
 
-#: gajim/dialog_messages.py:100
-msgid "Registration succeeded"
+#: gajim/dialog_messages.py:97
+#, fuzzy
+msgid "Registration Succeeded"
 msgstr "Registrácia úspešná"
 
-#: gajim/dialog_messages.py:101
-#, python-format
-msgid "Registration with agent %s succeeded"
+#: gajim/dialog_messages.py:98
+#, fuzzy, python-format
+msgid "Registration with agent %s succeeded."
 msgstr "Registrácia pomocou agenta %s bola úspešná"
 
-#: gajim/dialog_messages.py:105 gajim/gtk/service_registration.py:215
-msgid "Registration failed"
+#: gajim/dialog_messages.py:102
+#, fuzzy
+msgid "Registration Failed"
 msgstr "Registrácia zlyhala"
 
-#: gajim/dialog_messages.py:106
+#: gajim/dialog_messages.py:103
 #, fuzzy, python-format
 msgid ""
 "Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
@@ -2389,35 +2352,38 @@ msgstr ""
 "Registrácia pomocou agenta %(agent)s zlyhala s chybou %(error)s: "
 "%(error_msg)s"
 
-#: gajim/dialog_messages.py:111
+#: gajim/dialog_messages.py:108
 #, fuzzy
 msgid "Unable to Join Group Chat"
 msgstr "Nie je možné pripojiť sa do diskusnej skupiny"
 
-#: gajim/dialog_messages.py:116
-msgid "GStreamer error"
-msgstr ""
+#: gajim/dialog_messages.py:113
+#, fuzzy
+msgid "GStreamer Error"
+msgstr "Chyba databázy"
 
-#: gajim/dialog_messages.py:117
+#: gajim/dialog_messages.py:114
 #, fuzzy, python-format
 msgid ""
 "Error: %(error)s\n"
 "Debug: %(debug)s"
 msgstr "Chybová správa: %s"
 
-#: gajim/dialog_messages.py:121
-msgid "Wrong host"
+#: gajim/dialog_messages.py:118
+#, fuzzy
+msgid "Wrong Host"
 msgstr "Nesprávny hostiteľ"
 
-#: gajim/dialog_messages.py:122
+#: gajim/dialog_messages.py:119
 msgid "Invalid local address? :-O"
 msgstr "Neplatná miestna adresa? :-O"
 
-#: gajim/dialog_messages.py:126
-msgid "Avahi error"
+#: gajim/dialog_messages.py:123
+#, fuzzy
+msgid "Avahi Error"
 msgstr "Chyba Avahi"
 
-#: gajim/dialog_messages.py:127
+#: gajim/dialog_messages.py:124
 #, python-format
 msgid ""
 "%s\n"
@@ -2426,66 +2392,66 @@ msgstr ""
 "%s\n"
 "Link-local správy nemusia správne fungovať."
 
-#: gajim/dialog_messages.py:131 gajim/dialog_messages.py:136
+#: gajim/dialog_messages.py:128 gajim/dialog_messages.py:133
 #, fuzzy
-msgid "Could not request upload slot"
+msgid "Could not request upload slot for HTTP File Upload"
 msgstr "Nie je možné spustiť lokálnu službu"
 
-#: gajim/dialog_messages.py:137
-msgid "Got unexpected response from server (see log)"
+#: gajim/dialog_messages.py:134
+msgid "Got unexpected response from server (see log)."
 msgstr ""
 
-#: gajim/dialog_messages.py:141 gajim/dialog_messages.py:146
+#: gajim/dialog_messages.py:138 gajim/dialog_messages.py:143
 #, fuzzy
-msgid "Could not open file"
+msgid "Could not Open File"
 msgstr "Nie je možné načítať obrázok"
 
-#: gajim/dialog_messages.py:142
-msgid "Exception raised while opening file (see log)"
+#: gajim/dialog_messages.py:139
+msgid "Exception raised while trying to open file (see log)."
 msgstr ""
 
-#: gajim/dialog_messages.py:151
-msgid "Unsecure"
-msgstr ""
+#: gajim/dialog_messages.py:148
+#, fuzzy
+msgid "Not Secure"
+msgstr "Nezačal"
 
-#: gajim/dialog_messages.py:152
+#: gajim/dialog_messages.py:149
 #, fuzzy
-msgid "Server returned unsecure transport (HTTP)"
+msgid "The server returned an insecure transport (HTTP)."
 msgstr "Služba vrátila chybu"
 
-#: gajim/dialog_messages.py:156
+#: gajim/dialog_messages.py:153
 #, fuzzy
-msgid "Could not upload file"
+msgid "Could not Upload File"
 msgstr "Nie je možné načítať obrázok"
 
-#: gajim/dialog_messages.py:157
+#: gajim/dialog_messages.py:154
 #, python-format
 msgid "HTTP response code from server: %s"
 msgstr ""
 
-#: gajim/dialog_messages.py:161
+#: gajim/dialog_messages.py:158
 msgid "Upload Error"
 msgstr ""
 
-#: gajim/dialog_messages.py:166
+#: gajim/dialog_messages.py:163
 msgid "Encryption Error"
 msgstr ""
 
-#: gajim/dialog_messages.py:167
-#, fuzzy
-msgid "For the chosen encryption there is no encryption method available"
-msgstr "Pripojenie nie je dostupné"
+#: gajim/dialog_messages.py:164
+msgid "There is no encryption method available for the chosen encryption."
+msgstr ""
 
-#: gajim/dialog_messages.py:171
+#: gajim/dialog_messages.py:169
 #, fuzzy
-msgid "Avatar upload failed"
+msgid "Avatar Upload Failed"
 msgstr "zverejnenia vCard zlyhalo"
 
-#: gajim/privatechat_control.py:204
+#: gajim/privatechat_control.py:207
 msgid "Sending private message failed"
 msgstr "Odoslanie súkromnej správy sa nepodarilo"
 
-#: gajim/privatechat_control.py:206
+#: gajim/privatechat_control.py:209
 #, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr ""
@@ -2508,7 +2474,7 @@ msgstr "ukáž pomocníka pre príkaz"
 
 #: gajim/gajim_remote.py:85
 #, fuzzy
-msgid "Lists all contacts in roster, one for each line"
+msgid "Lists all contacts in the contact list, one for each line"
 msgstr ""
 "Vypíše zoznam všetkých kontaktov v zozname kontaktov. Každý kontakt sa "
 "zobrazí na novom riadku"
@@ -2592,11 +2558,13 @@ msgstr ""
 
 #: gajim/gajim_remote.py:118
 #, fuzzy
-msgid "Sends new chat message to a contact in the roster. Account is optional."
+msgid ""
+"Sends new chat message to a contact in the contact list. Account is optional."
 msgstr "Použitie: /%s, pošle správu kontaktu"
 
 #: gajim/gajim_remote.py:120 gajim/gajim_remote.py:130
-msgid "JID of the contact that will receive the message"
+#, fuzzy
+msgid "XMPP Address of the contact that will receive the message"
 msgstr "JID kontaktu, ktorý prijme správu"
 
 #: gajim/gajim_remote.py:121 gajim/gajim_remote.py:132
@@ -2610,8 +2578,10 @@ msgid "if specified, the message will be sent using this account"
 msgstr "ak je špecifikovaný, správa bude odoslaná s použitím tohoto účtu"
 
 #: gajim/gajim_remote.py:127
-msgid "Sends a chat message to someone on your roster. Account is optional."
-msgstr ""
+#, fuzzy
+msgid ""
+"Sends a chat message to someone on your contact list. Account is optional."
+msgstr "Použitie: /%s, pošle správu kontaktu"
 
 #: gajim/gajim_remote.py:131
 msgid "subject"
@@ -2622,12 +2592,14 @@ msgid "message subject"
 msgstr "predmet správy"
 
 #: gajim/gajim_remote.py:138
-msgid "Sends new message to a groupchat you've joined."
+#, fuzzy
+msgid "Sends new message to a group chat you've joined."
 msgstr "Pošle novú správu diskusnej skupine do ktorej ste sa prihlásili."
 
 #: gajim/gajim_remote.py:140
-msgid "JID of the room that will receive the message"
-msgstr ""
+#, fuzzy
+msgid "XMPP Address of the group chat that will receive the message"
+msgstr "JID kontaktu, ktorý prijme správu"
 
 #: gajim/gajim_remote.py:147
 msgid "Gets detailed info on a contact"
@@ -2635,7 +2607,8 @@ msgstr "Získať podrobné informácie o kontakte"
 
 #: gajim/gajim_remote.py:149 gajim/gajim_remote.py:162
 #: gajim/gajim_remote.py:192
-msgid "JID of the contact"
+#, fuzzy
+msgid "XMPP Address of the contact"
 msgstr "JID kontaktu"
 
 #: gajim/gajim_remote.py:153
@@ -2697,7 +2670,8 @@ msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Zapíše aktuálny stav nastavení programu Gajim do súboru .config"
 
 #: gajim/gajim_remote.py:190
-msgid "Removes contact from roster"
+#, fuzzy
+msgid "Removes contact from contact list"
 msgstr "Odstráni kontakt zo zoznamu"
 
 #: gajim/gajim_remote.py:193
@@ -2745,9 +2719,9 @@ msgid "Missing argument \"contact_jid\""
 msgstr "Chýbajúci argument \"contact_jid\""
 
 #: gajim/gajim_remote.py:275
-#, python-format
+#, fuzzy, python-format
 msgid ""
-"'%s' is not in your roster.\n"
+"'%s' is not in your contact list.\n"
 "Please specify account for sending the message."
 msgstr ""
 "'%s' nie je vo vašom zozname.\n"
@@ -2970,12 +2944,12 @@ msgstr "Koniec týždňa"
 msgid "Weekend!"
 msgstr "Víkend!"
 
-#: gajim/common/logger.py:192 gajim/common/logger.py:197
+#: gajim/common/logger.py:189 gajim/common/logger.py:194
 #, 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:217
+#: gajim/common/logger.py:214
 #, fuzzy, python-format
 msgid "Creating %s"
 msgstr "jem"
@@ -3050,34 +3024,38 @@ msgstr "%(nickname)s sa odhlásil"
 msgid "Contact Signed Out"
 msgstr "Kontakt sa odhlásil"
 
-#: gajim/common/contacts.py:455
-msgid "Not in roster"
-msgstr "Nie je v zozname"
-
 #: gajim/common/config.py:80
+#, fuzzy
 msgid ""
 "Show desktop notification even when a chat window is opened for this contact "
-"and does not have focus"
+"and does not have focus."
 msgstr ""
+"Povoliť vyskakovacie okná/oznámenia v stavoch _preč/nedostupný/zamestnaný/"
+"neviditeľný"
 
 #: gajim/common/config.py:81
-msgid "Play sound when user is busy"
+#, fuzzy
+msgid "Play sound even when being busy."
 msgstr "Prehrať zvuk keď je používateľ zaneprázdnený"
 
 #: gajim/common/config.py:83
-msgid "Show only online and free for chat contacts in roster."
-msgstr ""
+#, fuzzy
+msgid "Show only online and free for chat contacts in the contact list."
+msgstr "Chcem si vás pridať do môjho zoznamu kontaktov."
 
 #: gajim/common/config.py:86
 msgid "Time in minutes, after which your status changes to away."
 msgstr "Čas v minútach, po ktorých sa zmení stav na preč."
 
 #: gajim/common/config.py:87
-msgid "$S (Away as a result of being idle more than $T min)"
+#, fuzzy
+msgid "$S (Away: Idle more than $T min)"
 msgstr "$S (Preč ako výsledok nečinnosti viac ako $T minút)"
 
 #: gajim/common/config.py:87
-msgid "$S will be replaced by current status message, $T by autoawaytime."
+msgid ""
+"$S will be replaced by current status message, $T by the 'autoawaytime' "
+"value."
 msgstr ""
 
 #: gajim/common/config.py:89
@@ -3085,69 +3063,73 @@ msgid "Time in minutes, after which your status changes to not available."
 msgstr "Čas v minútach, po ktorých sa zmení stav na neprítomný."
 
 #: gajim/common/config.py:90
-msgid "$S (Not available as a result of being idle more than $T min)"
+#, fuzzy
+msgid "$S (Not available: Idle more than $T min)"
 msgstr "$S (Neprítomný ako výsledok nečinnosti viac ako $T minút)"
 
 #: gajim/common/config.py:90
-msgid "$S will be replaced by current status message, $T by autoxatime."
+msgid ""
+"$S will be replaced by current status message, $T by the 'autoxatime' value."
 msgstr ""
 
 #: gajim/common/config.py:93
 msgid ""
-"When to show notification area icon. Can be 'never', 'on_event', 'always'."
+"When to show the notification area icon. Can be 'never', 'on_event', and "
+"'always'."
 msgstr ""
 
 #: gajim/common/config.py:94
-msgid "Allow to hide the roster window even if the tray icon is not shown."
+msgid ""
+"Allow to hide the contact list window even if the notification area icon is "
+"not shown."
 msgstr ""
 
 #: gajim/common/config.py:97
 #, fuzzy
-msgid "Contact signed in notification color."
-msgstr "_Zobraziť udalosť v zozname"
+msgid "Notification color for contacts signing in."
+msgstr "Upozorniť ma, keď sa kontakty pr_ihlásia"
 
 #: gajim/common/config.py:98
 #, fuzzy
-msgid "Contact signout notification color"
-msgstr "_Zobraziť udalosť v zozname"
+msgid "Notification color for contacts signing out."
+msgstr "Upozorniť ma, keď sa kontakty _odhlásia"
 
 #: gajim/common/config.py:99
 #, fuzzy
-msgid "New message notification color."
+msgid "Notification color for new message notification."
 msgstr "Predbežné zobrazenie nových správ vo vyskakovacom oznámení?"
 
 #: gajim/common/config.py:100
 #, fuzzy
-msgid "File transfer request notification color."
-msgstr "Požiadavka na prenos súboru"
+msgid "Notification color for file transfer request."
+msgstr "_Upozorniť ma, keď sa dokončí prenos"
 
 #: gajim/common/config.py:101
 #, fuzzy
-msgid "File transfer error notification color."
-msgstr "Prenos súboru bol zrušený"
+msgid "Notification color for file transfer errors."
+msgstr "_Upozorniť ma, keď sa dokončí prenos"
 
 #: gajim/common/config.py:102
-#, fuzzy
-msgid "File transfer complete or stopped notification color."
-msgstr "Keď je prenos súboru dokončený zobraziť vyskakovacie oznámenie"
+msgid "Notification color for stopped or completed file transfers."
+msgstr ""
 
 #: gajim/common/config.py:103
-#, fuzzy
-msgid "Groupchat invitation notification color"
-msgstr "Pozvánka do diskusnej skupiny"
+msgid "Notification color for group chat invitations."
+msgstr ""
 
 #: gajim/common/config.py:104
 #, fuzzy
-msgid "Background color of status changed notification"
+msgid "Notification background color for changed status."
 msgstr "Farba pozadia použitá pri prihlásení kontaktu."
 
 #: gajim/common/config.py:105
-msgid "Other dialogs color."
+msgid "Notification color for other dialogs."
 msgstr ""
 
 #: gajim/common/config.py:106
+#, fuzzy
 msgid ""
-"List (space separated) of rows (accounts and groups) that are collapsed."
+"List of rows (accounts and groups) that are collapsed (space separated)."
 msgstr ""
 "Zoznam (oddelený medzerami) a riadkov (účet a skupina), ktoré sú zabalené."
 
@@ -3155,8 +3137,10 @@ msgstr ""
 msgid "default"
 msgstr "predvolená"
 
-#: gajim/common/config.py:113
-msgid "Language used by speller"
+#: gajim/common/config.py:113 gajim/common/config.py:424
+#: gajim/common/config.py:431
+#, fuzzy
+msgid "Language used for spell checking."
 msgstr "Jazyk pre kontrolu pravopisu"
 
 #: gajim/common/config.py:114
@@ -3172,8 +3156,8 @@ msgstr ""
 #: gajim/common/config.py:115
 msgid ""
 "Print time in chats using Fuzzy Clock. Value of fuzziness from 1 to 4, or 0 "
-"to disable fuzzyclock. 1 is the most precise clock, 4 the least precise one. "
-"This is used only if print_time is 'sometimes'."
+"to disable Fuzzy Clock. 1 is the most precise clock, 4 the least precise "
+"one. This is used only if 'print_time' is 'sometimes'."
 msgstr ""
 
 #: gajim/common/config.py:117
@@ -3187,16 +3171,18 @@ msgstr "Použiť * / _ pár znakov ako možné formátovacie znaky."
 #: gajim/common/config.py:120
 #, fuzzy
 msgid ""
-"If true, do not remove */_ . So *abc* will be bold but with * * not removed."
+"If enabled, do not remove */_ . So *abc* will be bold but with * * not "
+"removed."
 msgstr ""
 "Ak je pravda, neodstaňuj */_ .  Takže *abc* bude tečné a * * nebude "
 "odstránené."
 
 #: gajim/common/config.py:123
+#, fuzzy
 msgid ""
-"Uses ReStructured text markup to send HTML, plus ascii formatting if "
-"selected. For syntax, see http://docutils.sourceforge.net/docs/ref/rst/"
-"restructuredtext.html (If you want to use this, install docutils)"
+"Uses ReStructured text markup to send HTML, plus ASCII formatting if "
+"selected. Needs docutils installed (for syntax, see http://docutils."
+"sourceforge.net/docs/ref/rst/restructuredtext.html)."
 msgstr ""
 "Používať preštruktúrované značkovanie textu k odoslaniu HTML, plus ascii "
 "formátovanie ak je označený. Pre syntaxu si pozrite http://docutils."
@@ -3204,283 +3190,289 @@ msgstr ""
 "nainštalujte docutils)"
 
 #: gajim/common/config.py:132
+#, fuzzy
 msgid ""
-"Character to add after nickname when using nick completion (tab) in group "
-"chat."
+"Character to add after nickname when using nickname completion (tab) in "
+"group chat."
 msgstr ""
 "Znak použitý za prezývkou, keď sa používa automatické dopĺňanie (tab) v "
 "diskusnej skupine."
 
 #: gajim/common/config.py:133
+#, fuzzy
 msgid ""
-"Character to propose to add after desired nickname when desired nickname is "
-"used by someone else in group chat."
+"Character to propose to add after desired nickname when nickname is already "
+"used in group chat."
 msgstr ""
 "Vaša prezývka sa zhoduje s inou prezývkou v diskusnej miestnosti aj po "
 "pripojení znaku."
 
 #: gajim/common/config.py:155
 msgid ""
-"If true, Gajim will save roster position when hiding roster, and restore it "
-"when showing roster."
+"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:161
-msgid "Place the roster on the right in single window mode"
+msgid "Place the contact list on the right in single window mode"
 msgstr ""
 
 #: gajim/common/config.py:167
 msgid ""
-"This option let you customize timestamp that is printed in conversation. For "
-"example \"[%H:%M] \" will show \"[hour:minute] \". See python doc on "
-"strftime for full documentation: http://docs.python.org/lib/module-time.html"
+"This option lets you customize the timestamp that is printed in "
+"conversation. For example '[%H:%M] ' will show '[hour:minute] '. See python "
+"doc on strftime for full documentation (https://docs.python.org/3/library/"
+"time.html)."
 msgstr ""
 
 #: gajim/common/config.py:168
-msgid "Characters that are printed before the nickname in conversations"
+#, 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:169
-msgid "Characters that are printed after the nickname in conversations"
+#, 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:170
-msgid "Add * and [n] in roster title?"
-msgstr "Pridať * a [n] do titulku zoznamu?"
+#, 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:171
 #, fuzzy
 msgid ""
-"How many history messages should be restored when a chat tab/window is "
-"reopened?"
+"Number of messages from chat history to be restored when a chat tab/window "
+"is reopened."
 msgstr ""
 "Koľko riadkov si pamätať z predchádzajúceho rozhovoru, keď bude karta/okno "
 "znovu otvorená."
 
 #: gajim/common/config.py:172
-msgid "How far back in time (minutes) history is restored. -1 means no limit."
+msgid ""
+"How far back in time (minutes) chat history is restored. -1 means no limit."
 msgstr ""
 
 #: gajim/common/config.py:173
 msgid ""
-"How many lines to request from server when entering a groupchat. -1 means no "
-"limit"
+"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:174
 msgid ""
-"Minutes of backlog to request when entering a groupchat. -1 means no limit"
+"Should automatic rejoin be activated when you were kicked from a group chat?"
 msgstr ""
 
 #: gajim/common/config.py:175
-msgid ""
-"How many seconds to wait before trying to autorejoin to a conference you are "
-"being disconnected from. Set to 0 to disable autorejoining."
-msgstr ""
-
-#: gajim/common/config.py:176
-msgid "Should autorejoin be activated when kicked from a conference?"
-msgstr ""
-
-#: gajim/common/config.py:177
-msgid ""
-"Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
-"Client default behaviour)."
+#, 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:179
-msgid "How many lines to store for Ctrl+KeyUP."
+#: gajim/common/config.py:177
+#, 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:182
+#: gajim/common/config.py:180
 #, fuzzy, python-format
 msgid ""
-"Either custom URL with %%s in it where %%s is the word/phrase or "
-"'WIKTIONARY' which means use Wikitionary."
+"Either a custom URL with %%s in it (where %%s is the word/phrase) or "
+"'WIKTIONARY' (which means use Wikitionary)."
 msgstr ""
 "Ani url s %s kde je %s slovo/fráza alebo 'WIKTIONARY' čo znamená použitie "
 "wiktionary."
 
-#: gajim/common/config.py:185
+#: gajim/common/config.py:183
 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:187
+#: gajim/common/config.py:185
+#, fuzzy
 msgid ""
-"When not printing time for every message (print_time==sometimes), print it "
+"When not printing time for every message ('print_time'==sometimes), print it "
 "every x minutes."
 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:188
+#: gajim/common/config.py:186
 msgid "Ask before pasting an image."
 msgstr ""
 
-#: gajim/common/config.py:189
+#: gajim/common/config.py:187
 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:190
+#: gajim/common/config.py:188
 #, fuzzy
 msgid ""
-"Always ask for confirmation before closing groupchats with any of the JIDs "
-"on this space separated list."
+"Always ask for confirmation before closing group chats with any of the XMPP "
+"Addresses on this list (space separated)."
 msgstr ""
 "Vždy sa spýtať pred zatvorením okna/záložky diskusnej skupiny, ktorej meno "
 "je uvedené v zozname diskusných JID."
 
-#: gajim/common/config.py:191
+#: gajim/common/config.py:189
 #, fuzzy
 msgid ""
-"Never ask for confirmation before closing groupchats with any of the JIDs on "
-"this space separated list."
+"Never ask for confirmation before closing group chats with any of the XMPP "
+"Addresses on this list (space separated)."
 msgstr ""
 "Nikdy sa nepýtať pred zatvorením karty/okna pre diskusnú skupinu, ktorej "
 "meno je uvedené v zozname JID."
 
-#: gajim/common/config.py:192
+#: gajim/common/config.py:190
 msgid ""
-"Ask before closing tabbed chat window if there are controls that can lose "
-"data (chat, private chat, groupchat that will not be minimized)"
+"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:195
+#: gajim/common/config.py:193
 msgid ""
-"Comma separated list of sent hosts, in addition of local interfaces, for "
-"File Transfer in case of address translation/port forwarding."
+"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:196
+#: gajim/common/config.py:194
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "IEC štandard znamená KiB = 1024 bajtov, KB = 1000 bajtov."
 
-#: gajim/common/config.py:198
+#: gajim/common/config.py:196
 #, fuzzy
 msgid "Notify of events in the notification area."
 msgstr "Upozorňovať na udalosti v oblasti systémových upozornení."
 
-#: gajim/common/config.py:199
+#: gajim/common/config.py:197
 msgid ""
-"If False, Gajim will display a static event icon instead of the blinking "
-"status icon in the notification area when notifying on event."
+"If disabled, Gajim will display a static event icon instead of the blinking "
+"status icon in the notification area when notifying about an event."
 msgstr ""
 
-#: gajim/common/config.py:205
+#: gajim/common/config.py:203
 msgid "Show tab when only one conversation?"
 msgstr "Ukázať kartu len ak prebieha konverzácia?"
 
-#: gajim/common/config.py:206
+#: gajim/common/config.py:204
 msgid "Show tabbed notebook border in chat windows?"
 msgstr ""
 
-#: gajim/common/config.py:207
+#: gajim/common/config.py:205
 msgid "Show close button in tab?"
 msgstr "Zobraziť zatváracie tlačidlo v karte?"
 
-#: gajim/common/config.py:220
+#: gajim/common/config.py:218
 msgid "Preview new messages in notification popup?"
 msgstr "Predbežné zobrazenie nových správ vo vyskakovacom oznámení?"
 
-#: gajim/common/config.py:223
+#: gajim/common/config.py:221
+#, fuzzy
 msgid ""
-"A semicolon-separated list of words that will be highlighted in group chats."
+"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:224
+#: gajim/common/config.py:222
 #, fuzzy
 msgid ""
-"If true, quits Gajim when X button of Window Manager is clicked. This "
-"setting is taken into account only if notification icon is used."
+"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 ""
 "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:225
+#: gajim/common/config.py:223
 msgid ""
-"If true, Gajim hides the Roster window on pressing the X button instead of "
-"minimizing into the Dock."
+"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:226
+#: gajim/common/config.py:224
 #, fuzzy
 msgid ""
-"If true, Gajim will display an icon on each tab containing unread messages. "
-"Depending on the theme, this icon may be animated."
+"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:227
+#: gajim/common/config.py:225
 #, fuzzy
 msgid ""
-"If true, Gajim will display the status message, if not empty, for every "
-"contact under the contact name in roster window."
+"If enabled, Gajim will display the status message (if not empty) underneath "
+"the contact name in the contact list window."
 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:233
-msgid "Define the position of the avatar in roster. Can be left or right"
+#: gajim/common/config.py:231
+msgid ""
+"Define the position of avatars in the contact list. Can be 'left' or 'right'."
 msgstr ""
 
-#: gajim/common/config.py:234
+#: gajim/common/config.py:232
 #, fuzzy
 msgid ""
-"If False, Gajim will no longer print status line in chats when a contact "
-"changes their status and/or their status message."
+"If disabled, Gajim will no longer print status messages in chats when a "
+"contact changes their status (and/or their status message)."
 msgstr ""
 "Ak nie je pravda, nebudete vidieť informáciu o zmene stavu kontaktu a jeho/"
 "jej stavovú správu"
 
-#: gajim/common/config.py:235
+#: gajim/common/config.py:233
 #, fuzzy
 msgid ""
 "Default Setting: Show a status message for every join or leave in a group "
-"chat"
+"chat."
 msgstr "Nie je možné pripojiť sa do diskusnej skupiny"
 
-#: gajim/common/config.py:236
+#: gajim/common/config.py:234
+#, fuzzy
 msgid ""
-"Default Setting: Show a status message for all status (away, dnd, etc.) "
-"changes of users in a group chat"
-msgstr ""
+"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:238
-msgid "Log XHTML messages instead of plain text messages."
+#: gajim/common/config.py:236
+msgid "Store XHTML messages in chat history instead of plain text messages."
 msgstr ""
 
-#: gajim/common/config.py:239
+#: gajim/common/config.py:237
 msgid "Don't show avatar for the transport itself."
 msgstr "Nezobrazovať avatarov pre transport."
 
-#: gajim/common/config.py:240
-msgid "Don't show roster in the system taskbar."
+#: gajim/common/config.py:238
+#, fuzzy
+msgid "Don't show contact list window in the system taskbar."
 msgstr "Nezobrazovať zoznam v paneli úloh."
 
-#: gajim/common/config.py:241
+#: gajim/common/config.py:239
 #, fuzzy
 msgid ""
-"If true, make the window flash (the default behaviour in most Window "
-"Managers) when holding pending events."
+"If enabled, Gajim makes the window flash (the default behaviour in most "
+"Window Managers) when holding pending events."
 msgstr ""
 "Ak je pravda a GTK+ je nainštalované a PyGTK nainštalované vo verzii aspoň "
 "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:245
+#: gajim/common/config.py:243
 #, fuzzy
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
 "'always_with_roster' - Like 'always' but the messages are in a single window "
-"along with the roster.\n"
+"along with the contact list.\n"
 "'never' - All messages get their own window.\n"
 "'peracct' - Messages for each account are sent to a specific window.\n"
-"'pertype' - Each message type (e.g. chats vs. groupchats) is sent to a "
+"'pertype' - Each message type (e.g. chats vs. group chats) is sent to a "
 "specific window."
 msgstr ""
 "Ovládanie okna, kde je umiestnená nová správa.\n"
@@ -3492,120 +3484,128 @@ msgstr ""
 "'pertype' - Každý typ správy (napr., rozhovory proti diskusiám) sú odoslané "
 "do špecifikovaného okna."
 
-#: gajim/common/config.py:246
+#: gajim/common/config.py:244
 msgid ""
-"Show roster on startup.\n"
-"'always' - Always show roster.\n"
-"'never' - Never show roster.\n"
-"'last_state' - Restore the last state roster."
+"Show contact list window on startup.\n"
+"'always' - Always show contact list window.\n"
+"'never' - Never show contact list window.\n"
+"'last_state' - Restore last state of the contact list window."
 msgstr ""
 
-#: gajim/common/config.py:247
-msgid "If False, you will no longer see the avatar in the chat window."
+#: gajim/common/config.py:245
+#, 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:248
+#: gajim/common/config.py:246
 #, fuzzy
-msgid "If true, pressing the escape key closes a tab/window."
+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:249
-msgid "Hides the banner in a group chat window"
+#: gajim/common/config.py:247
+#, fuzzy
+msgid "Hides the banner in a group chat window."
 msgstr "Skrývanie titulku v okne s diskusnou skupinou"
 
-#: gajim/common/config.py:250
-msgid "Hides the banner in two persons chat window"
-msgstr "Skryť titulok v okne s diskusiou dvoch osôb."
+#: gajim/common/config.py:248
+#, fuzzy
+msgid "Hides the banner in a 1:1 chat window."
+msgstr "Skrývanie titulku v okne s diskusnou skupinou"
 
-#: gajim/common/config.py:251
-msgid "Hides the group chat occupants list in group chat window."
+#: gajim/common/config.py:249
+#, 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:252
+#: gajim/common/config.py:250
+#, fuzzy
 msgid ""
 "In a chat, show the nickname at the beginning of a line only when it's not "
-"the same person talking than in previous message."
+"the same person talking as in the previous message."
 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:253
+#: gajim/common/config.py:251
 msgid "Indentation when using merge consecutive nickname."
 msgstr ""
 
-#: gajim/common/config.py:254
-msgid "Ctrl-Tab go to next composing tab when none is unread."
+#: gajim/common/config.py:252
+#, fuzzy
+msgid ""
+"Ctrl+Tab switches to the next composing tab when there are no tabs with "
+"messages pending."
 msgstr ""
 "Ctrl-Tab vás presunie na ďalšiu kartu, pokiaľ už nie sú žiadne neprečítané "
 "správy."
 
-#: gajim/common/config.py:255
+#: gajim/common/config.py:253
 #, fuzzy
 msgid ""
-"Show the confirm metacontacts creation dialog or not? Empty string means "
-"never show the dialog."
+"Show a confirmation dialog to create metacontacts? Empty string means never "
+"show the dialog."
 msgstr ""
 "Má byť zobrazovaný dialóg pri vytváraní metakontaktov? Prázdny reťazec "
 "znamená, že dialóg sa nezobrazuje."
 
-#: gajim/common/config.py:256
+#: gajim/common/config.py:254
 #, fuzzy
 msgid ""
-"Show the confirm block contact dialog or not? Empty string means never show "
+"Show a confirmation dialog to block a contact? Empty string means never show "
 "the dialog."
 msgstr ""
 "Má byť zobrazovaný dialóg pri vytváraní metakontaktov? Prázdny reťazec "
 "znamená, že dialóg sa nezobrazuje."
 
-#: gajim/common/config.py:257
+#: gajim/common/config.py:255
 #, fuzzy
 msgid ""
-"Show the confirm custom status dialog or not? Empty string means never show "
-"the dialog."
+"Show a confirmation dialog for a custom status? Empty string means never "
+"show the dialog."
 msgstr ""
 "Má byť zobrazovaný dialóg pri vytváraní metakontaktov? Prázdny reťazec "
 "znamená, že dialóg sa nezobrazuje."
 
-#: gajim/common/config.py:258
+#: gajim/common/config.py:256
 #, fuzzy
 msgid ""
-"If true, you will be able to set a negative priority to your account in "
-"account modification window. BE CAREFUL, when you are logged in with a "
-"negative priority, you will NOT receive any message from your server."
+"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 ""
 "Ak je True, bude možné nasatviť zápornú prioritu pre váš účet v okne úprav "
 "úč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:259
+#: gajim/common/config.py:257
 #, fuzzy
 msgid ""
-"If true, Gajim will show number of online and total contacts in account and "
-"group rows."
+"If enabled, Gajim will show both the number of online and total contacts in "
+"account rows as well as in group rows."
 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:260
+#: gajim/common/config.py:258
 msgid ""
-"Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
-"as if they were of this type"
+"Can be empty, 'chat' or 'normal'. If not empty, all incoming messages are "
+"treated as if they were of this type."
 msgstr ""
 
-#: gajim/common/config.py:261
+#: gajim/common/config.py:259
 #, fuzzy
 msgid ""
-"If true, Gajim will scroll and select the contact who sent you the last "
-"message, if chat window is not already opened."
+"If enabled, Gajim will scroll and select the contact who sent you the last "
+"message, if the chat window is not already opened."
 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:262
+#: gajim/common/config.py:260
 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:263
+#: gajim/common/config.py:261
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
@@ -3613,135 +3613,150 @@ msgstr ""
 "Maximálny počet riadkov zobrazených v rozhovore. Najstaršie riadky budú "
 "zmazané."
 
-#: gajim/common/config.py:264
+#: gajim/common/config.py:262
 msgid ""
-"If true, notification windows from notification-daemon will be attached to "
-"notification icon."
+"If enabled, notification windows from notification-daemon will be attached "
+"to the notification area icon."
 msgstr ""
 
-#: gajim/common/config.py:265
+#: gajim/common/config.py:263
 msgid "Choose interval between 2 checks of idleness."
 msgstr ""
 
-#: gajim/common/config.py:266
+#: gajim/common/config.py:264
 msgid ""
-"Valid uri schemes. Only schemes in this list will be accepted as \"real\" "
-"uri. (mailto and xmpp are handled separately)"
+"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:267
-msgid "If true, completion in groupchats will be like a shell auto-completion"
+#: gajim/common/config.py:265
+msgid ""
+"If enabled, completion in group chats will be like a shell auto-completion."
 msgstr ""
 
-#: gajim/common/config.py:272
-msgid "Optionally fix jingle output video framerate. Example: 10/1 or 25/2"
+#: gajim/common/config.py:270
+msgid "Optionally fix Jingle output video framerate. Example: 10/1 or 25/2."
 msgstr ""
 
-#: gajim/common/config.py:273
-msgid "Optionally resize jingle output video. Example: 320x240"
+#: gajim/common/config.py:271
+msgid "Optionally resize Jingle output video. Example: 320x240."
 msgstr ""
 
-#: gajim/common/config.py:274
-msgid "If true, You will also see your webcam"
+#: gajim/common/config.py:272
+msgid "If enabled, you will see your webcam's video stream as well."
 msgstr ""
 
-#: gajim/common/config.py:277
+#: gajim/common/config.py:275
 msgid ""
-"If true, Gajim will try to use a STUN server when using Jingle. The one in "
-"\"stun_server\" option, or the one given by the XMPP server."
+"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:278
+#: gajim/common/config.py:276
 msgid "STUN server to use when using Jingle"
 msgstr ""
 
-#: gajim/common/config.py:279
+#: gajim/common/config.py:277
 msgid ""
-"If true, Gajim will show affiliation of groupchat occupants by adding a "
-"colored square to the status icon"
+"If enabled, Gajim will show affiliation of group chat participants by adding "
+"a colored square to the status icon."
 msgstr ""
 
-#: gajim/common/config.py:280
+#: gajim/common/config.py:278
 msgid ""
 "Proxy used for all outgoing connections if the account does not have a "
-"specific proxy configured"
+"specific proxy configured."
 msgstr ""
 
-#: gajim/common/config.py:281
-msgid "If true, Gajim will ignore incoming attention requests (\"wizz\")."
+#: gajim/common/config.py:279
+msgid "If enabled, Gajim will ignore incoming attention requests ('wizz')."
 msgstr ""
 
-#: gajim/common/config.py:282
+#: gajim/common/config.py:280
 msgid ""
 "If enabled, Gajim will reopen chat windows that were opened last time Gajim "
 "was closed."
 msgstr ""
 
-#: gajim/common/config.py:283
+#: gajim/common/config.py:281
 #, fuzzy
 msgid ""
-"If enabled, Gajim will show an icon to show that sent message has been "
-"received by your contact"
+"If enabled, Gajim will display an icon to show that sent messages have been "
+"received by your contact."
 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:284
-msgid "Show a mini avatar in chat window tabs and in window icon"
+#: gajim/common/config.py:282
+msgid "Show a mini avatar in chat window tabs and as the window's icon."
 msgstr ""
 
-#: gajim/common/config.py:285
+#: gajim/common/config.py:283
 #, fuzzy
-msgid "If true, Gajim will use the Systems Keyring to store account passwords."
+msgid ""
+"If enabled, Gajim will use the System's Keyring to store account passwords."
 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:284
+msgid "If enabled, Gajim will execute XEP-0146 Commands."
+msgstr ""
+
+#: gajim/common/config.py:285
+msgid "2: System, 1: Enabled, 0: Disabled"
+msgstr ""
+
 #: gajim/common/config.py:286
-msgid "If true, Gajim will execute XEP-0146 Commands."
+msgid "Options in days which can be chosen in the sync threshold menu"
 msgstr ""
 
 #: gajim/common/config.py:287
-msgid "2: System, 1: Enabled, 0: Disabled"
+msgid ""
+"Maximum history in days we request from a public group chat archive. 0: As "
+"much as possible."
 msgstr ""
 
 #: gajim/common/config.py:288
-msgid "Options in days which can be chosen in the sync threshold menu"
+msgid ""
+"Maximum history in days we request from a private group chat archive. 0: As "
+"much as possible."
 msgstr ""
 
 #: gajim/common/config.py:289
 msgid ""
-"Maximum history in days we request from a public room archive. 0: As much as "
-"possible"
+"If enabled, Gajim shows the group chat subject in the chat window when "
+"joining."
 msgstr ""
 
 #: gajim/common/config.py:290
+#, fuzzy
 msgid ""
-"Maximum history in days we request from a private room archive. 0: As much "
-"as possible"
+"If enabled, the contact row is colored according to the current chat state "
+"of the contact."
 msgstr ""
+"Ak je zaškrtnuté, Gajim povolí ostatným zistiť operačný systém, ktorý "
+"používate"
 
 #: gajim/common/config.py:291
-msgid "If the room subject is shown in chat on join"
+#, fuzzy
+msgid ""
+"If enabled, the tab is colored according to the current chat state of the "
+"contact."
 msgstr ""
+"Ak je zaškrtnuté, Gajim povolí ostatným zistiť operačný systém, ktorý "
+"používate"
 
 #: gajim/common/config.py:292
+#, fuzzy
 msgid ""
-"If the contact row is colored according to the current chatstate of the "
-"contact"
+"Shows a text in the banner that describes the current chat state of the "
+"contact."
 msgstr ""
+"Ak je zaškrtnuté, Gajim povolí ostatným zistiť operačný systém, ktorý "
+"používate"
 
 #: gajim/common/config.py:293
-msgid "If the tab is colored according to the current chatstate of the contact"
-msgstr ""
-
-#: gajim/common/config.py:294
-msgid ""
-"Shows a text in the banner that describes the current chatstate of the "
-"contact"
-msgstr ""
-
-#: gajim/common/config.py:295 gajim/common/config.py:424
 #, fuzzy
 msgid ""
 "Chat state notifications that are sent to contacts. Possible values: all, "
@@ -3750,129 +3765,142 @@ msgstr ""
 "Posielanie informácii o stave diskusie. Môže byť nastavené na hodnotu all, "
 "composing_only, disabled."
 
-#: gajim/common/config.py:296 gajim/common/config.py:438
+#: gajim/common/config.py:294
 #, fuzzy
 msgid ""
 "Chat state notifications that are sent to the group chat. Possible values: "
-"all, composing_only, disabled"
+"'all', 'composing_only', 'disabled'"
 msgstr ""
 "Posielanie informácii o stave diskusie. Môže byť nastavené na hodnotu all, "
 "composing_only, disabled."
 
-#: gajim/common/config.py:312
+#: gajim/common/config.py:297
+msgid "API Preferences. Possible values: 'http', 'iq'"
+msgstr ""
+
+#: gajim/common/config.py:313
+#, fuzzy
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
-"defined in autopriority_* options."
+"defined in 'autopriority_*' options."
 msgstr ""
 "Priorita sa zmení automaticky vzhľadom k vášmu stavu. Priority sú definované "
 "v premenných autopriority_* nastaveniach."
 
-#: gajim/common/config.py:320
+#: gajim/common/config.py:321
 msgid ""
-"Status used to autoconnect as. Can be online, chat, away, xa, dnd, "
-"invisible. NOTE: this option is used only if restore_last_status is disabled"
+"Status to be used automatically when connecting. Can be 'online', 'chat', "
+"'away', 'xa', 'dnd' or 'invisible'. NOTE: This option is used only if "
+"'restore_last_status' is disabled."
 msgstr ""
 
-#: gajim/common/config.py:321
-msgid "If enabled, restore the last status that was used."
+#: gajim/common/config.py:322
+#, fuzzy
+msgid "If enabled, the last status will be restored."
 msgstr "Ak je povolené, obnoví sa naposledy použitý stav."
 
-#: gajim/common/config.py:322
+#: gajim/common/config.py:323
 msgid ""
-"If true, Contacts requesting authorization will be automatically accepted."
+"If enabled, Contacts requesting authorization will be accepted automatically."
 msgstr ""
 
-#: gajim/common/config.py:323
+#: gajim/common/config.py:324
 #, fuzzy
 msgid ""
-"If False, this account will be disabled and will not appear in roster window."
+"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:327
-msgid "Allow plaintext connections"
+#: gajim/common/config.py:328
+msgid "Allow plaintext connections."
 msgstr ""
 
-#: gajim/common/config.py:330
+#: gajim/common/config.py:331
 msgid ""
-"List (space separated) of authentication mechanisms to try. Can contain "
-"ANONYMOUS, EXTERNAL, GSSAPI, SCRAM-SHA-1-PLUS, SCRAM-SHA-1, DIGEST-MD5, "
-"PLAIN, X-MESSENGER-OAUTH2 or XEP-0078"
+"List of authentication mechanisms to try (space separated). Can contain "
+"'ANONYMOUS', 'EXTERNAL', 'GSSAPI', 'SCRAM-SHA-1-PLUS', 'SCRAM-SHA-1', "
+"'DIGEST-MD5', 'PLAIN', 'X-MESSENGER-OAUTH2' or 'XEP-0078'."
 msgstr ""
 
-#: gajim/common/config.py:331
+#: gajim/common/config.py:332
 #, fuzzy
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection. "
-"Can be 'warn', 'connect', 'disconnect'"
+"Can be 'warn', 'connect' or 'disconnect'."
 msgstr "Zobraziť upozornenie pred poslaním hesla cez plaintext spojenie."
 
-#: gajim/common/config.py:332
+#: gajim/common/config.py:333
 msgid "Show a warning dialog before using standard SSL library."
 msgstr "Zobraziť upozornenie pred použitím štandardnej SSL knižnice."
 
-#: gajim/common/config.py:333
+#: gajim/common/config.py:334
 #, fuzzy
 msgid ""
 "Show a warning dialog before sending PLAIN password over a plain connection."
 msgstr "Zobraziť upozornenie pred poslaním hesla cez plaintext spojenie."
 
-#: gajim/common/config.py:334
-msgid "Space separated list of ssl errors to ignore."
-msgstr "Medzerami oddelený zoznam ssl chýb, ktoré ignorovať."
-
-#: gajim/common/config.py:340
-msgid ""
-"Space separated list of JIDs for which you do not want to store logs. You "
-"can also add account name to log nothing for this account."
+#: gajim/common/config.py:335
+msgid "List of SSL errors to ignore (space separated)."
 msgstr ""
 
 #: gajim/common/config.py:341
 msgid ""
-"Space separated list of JIDs for which you accept to not log conversations "
-"if he does not want to."
+"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:343
-msgid "Whitespace sent after inactivity"
+#: gajim/common/config.py:342
+msgid ""
+"List of XMPP Addresses (space separated) for which you accept to not store "
+"chat history if your contact does not want to."
 msgstr ""
 
 #: gajim/common/config.py:344
-msgid "XMPP ping sent after inactivity"
+msgid "If enabled, a whitespace is sent after inactivity (keep alive)."
 msgstr ""
 
-#: gajim/common/config.py:348
+#: gajim/common/config.py:345
+msgid "If enabled, an XMPP ping is sent after inactivity (ping alive)."
+msgstr ""
+
+#: gajim/common/config.py:349
 msgid ""
-"How many seconds to wait for the answer of ping alive packet before trying "
-"to reconnect?"
+"How many seconds to wait for the answer of a ping alive packet before trying "
+"to reconnect."
 msgstr ""
 
-#: gajim/common/config.py:352
-msgid "Jabberd2 workaround"
+#: gajim/common/config.py:353
+msgid "Jabberd2 workaround."
 msgstr ""
 
-#: gajim/common/config.py:355
+#: gajim/common/config.py:356
+#, fuzzy
 msgid ""
-"If checked, Gajim will use your IP and proxies defined in "
-"file_transfer_proxies option for file transfer."
+"If enabled, Gajim will use your IP and proxies defined in "
+"'file_transfer_proxies' option for file transfers."
 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:356
+#: gajim/common/config.py:357
 msgid ""
-"If true, Gajim will test file transfer proxies on startup to be sure it "
-"works. Openfire's proxies are known to fail this test even if they work."
+"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:369
-msgid "Answer to receipt requests"
+#: gajim/common/config.py:370
+#, 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:370
-msgid "Sent receipt requests"
+#: gajim/common/config.py:371
+msgid "If enabled, Gajim will send message receipt requests."
 msgstr ""
 
-#: gajim/common/config.py:379
+#: gajim/common/config.py:380
 #, fuzzy
 msgid ""
 "Allow Gajim to send information about the operating system you are running."
@@ -3880,180 +3908,194 @@ msgstr ""
 "Ak je zaškrtnuté, Gajim povolí ostatným zistiť operačný systém, ktorý "
 "používate"
 
-#: gajim/common/config.py:380
+#: gajim/common/config.py:381
 #, fuzzy
 msgid "Allow Gajim to send your local time."
 msgstr "%s vám chce poslať súbor."
 
-#: gajim/common/config.py:383
+#: gajim/common/config.py:384
 #, fuzzy
-msgid "Message that is sent to contacts you want to add"
+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:384
-msgid ""
-"If enabled, Gajim will send your local IPs so your contact can connect to "
-"your machine to transfer files."
-msgstr ""
-
 #: gajim/common/config.py:385
+#, fuzzy
 msgid ""
-"Space separated list of JIDs for which chat window will be re-opened on next "
-"startup."
+"If enabled, Gajim will send your local IP so your contact can connect to "
+"your machine for file transfers."
 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:387
-msgid "HTTP Upload: Enable HTTPS Verification"
+#: gajim/common/config.py:386
+msgid ""
+"List of XMPP Addresses (space separated) for which the chat window will be "
+"re-opened on next startup."
 msgstr ""
 
 #: gajim/common/config.py:388
-msgid ""
-"Preferred file transfer mechanism for file drag&drop on chat window. Can be "
-"'httpupload' (default) or 'jingle'"
+msgid "HTTP File Upload: Enable HTTPS Verification."
 msgstr ""
 
 #: gajim/common/config.py:389
-msgid "Allow cert verification with POSH"
+msgid ""
+"Preferred file transfer mechanism for file drag&drop on a chat window. Can "
+"be 'httpupload' (default) or 'jingle'."
 msgstr ""
 
-#: gajim/common/config.py:423 gajim/common/config.py:430
+#: gajim/common/config.py:390
 #, fuzzy
-msgid "Language for which misspelled words will be checked"
-msgstr "Jazyk v ktorom má byť prevádzaná kontrola pravopisu"
-
-#: gajim/common/config.py:427
-msgid "The currently active encryption for that contact"
-msgstr ""
+msgid "Allow certificate verification with POSH."
+msgstr "Chyba SSL certifikátu"
 
-#: gajim/common/config.py:431
+#: gajim/common/config.py:425
+#, fuzzy
 msgid ""
-"How many lines to request from server when entering a groupchat. -1 means no "
-"limit, -2 means global value"
+"Chat state notifications that are sent to contacts. Possible values: 'all', "
+"'composing_only', 'disabled'"
 msgstr ""
+"Posielanie informácii o stave diskusie. Môže byť nastavené na hodnotu all, "
+"composing_only, disabled."
+
+#: gajim/common/config.py:428
+#, fuzzy
+msgid "The currently active encryption for that contact."
+msgstr "Povoliť šifrovanie ESessions pre tento účet."
 
 #: gajim/common/config.py:432
 msgid ""
-"Minutes of backlog to request when entering a groupchat. -1 means no limit, "
-"-2 means global value"
+"If enabled, a notification is created for every message in this group chat."
 msgstr ""
 
 #: gajim/common/config.py:433
-msgid "State whether a notification is created for every message in this room"
-msgstr ""
-
-#: gajim/common/config.py:434
+#, fuzzy
 msgid ""
-"Show a status message for all status (away, dnd, etc.) changes of users in a "
-"group chat"
-msgstr ""
+"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:435
+#: gajim/common/config.py:434
 #, fuzzy
-msgid "Show a status message for every join or leave in a group chat"
+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:435
+msgid ""
+"If enabled, the group chat is minimized into the contact list when joining "
+"automatically."
+msgstr ""
+
 #: gajim/common/config.py:436
-msgid "If the group chat is minimized into the roster on autojoin"
+msgid ""
+"If enabled, the group chat is minimized into the contact list when closing "
+"it."
 msgstr ""
 
 #: gajim/common/config.py:437
-msgid "If the group chat is minimized into the roster on close"
+#, fuzzy
+msgid ""
+"Chat state notifications that are sent to the group chat. Possible values: "
+"'all', 'composing_only' or 'disabled'."
 msgstr ""
+"Posielanie informácii o stave diskusie. Môže byť nastavené na hodnotu all, "
+"composing_only, disabled."
 
-#: gajim/common/config.py:441
+#: gajim/common/config.py:440
 msgid ""
-"State whether plugins should be activated on startup (this is saved on Gajim "
-"exit). This option SHOULD NOT be used to (de)activate plug-ins. Use GUI "
-"instead."
+"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:446 gajim/common/const.py:281
+#: gajim/common/config.py:445 gajim/common/const.py:315
 msgid "Sleeping"
 msgstr "Spím"
 
-#: gajim/common/config.py:447
+#: gajim/common/config.py:446
 msgid "Back soon"
 msgstr "Hneď som späť"
 
-#: gajim/common/config.py:447
+#: gajim/common/config.py:446
 msgid "Back in some minutes."
 msgstr "Som späť za pár minút."
 
-#: gajim/common/config.py:448 gajim/common/const.py:247
+#: gajim/common/config.py:447 gajim/common/const.py:281
 msgid "Eating"
 msgstr "Jem"
 
-#: gajim/common/config.py:448
-msgid "I'm eating, so leave me a message."
-msgstr "Práve jem, prosím nechajte mi odkaz."
+#: gajim/common/config.py:447
+#, fuzzy
+msgid "I'm eating."
+msgstr "Pracujem."
 
-#: gajim/common/config.py:449
+#: gajim/common/config.py:448
 msgid "Movie"
 msgstr "Film"
 
-#: gajim/common/config.py:449
+#: gajim/common/config.py:448
 msgid "I'm watching a movie."
 msgstr "Pozerám film."
 
-#: gajim/common/config.py:450 gajim/common/const.py:314
+#: gajim/common/config.py:449 gajim/common/const.py:348
 msgid "Working"
 msgstr "Pracujem"
 
-#: gajim/common/config.py:450
+#: gajim/common/config.py:449
 msgid "I'm working."
 msgstr "Pracujem."
 
-#: gajim/common/config.py:451
+#: gajim/common/config.py:450
 msgid "Phone"
 msgstr "Telefonujem"
 
-#: gajim/common/config.py:451
+#: gajim/common/config.py:450
 msgid "I'm on the phone."
 msgstr "Telefonujem."
 
-#: gajim/common/config.py:452
+#: gajim/common/config.py:451
 msgid "Out"
 msgstr "Vonku"
 
-#: gajim/common/config.py:452
+#: gajim/common/config.py:451
 msgid "I'm out enjoying life."
 msgstr "Som vonku a užívam si život."
 
-#: gajim/common/config.py:463
+#: gajim/common/config.py:462
 msgid "I'm available."
 msgstr "Prítomný."
 
-#: gajim/common/config.py:464
+#: gajim/common/config.py:463
 msgid "I'm free for chat."
 msgstr "Mám čas na rozhovor."
 
-#: gajim/common/config.py:465 gajim/gtk/accounts.py:134
+#: gajim/common/config.py:464 gajim/gtk/accounts.py:133
 msgid "Be right back."
 msgstr "Za chvíľu som späť."
 
-#: gajim/common/config.py:466
+#: gajim/common/config.py:465
 msgid "I'm not available."
 msgstr "Nie som prítomný."
 
-#: gajim/common/config.py:467
+#: gajim/common/config.py:466
 msgid "Do not disturb."
 msgstr "Nerušiť."
 
-#: gajim/common/config.py:468 gajim/common/config.py:469
+#: gajim/common/config.py:467 gajim/common/config.py:468
 msgid "Bye!"
 msgstr "Ahoj!"
 
-#: gajim/common/config.py:480
+#: gajim/common/config.py:479
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
-"muc_highlight_words, or when a group chat message contains your nickname."
+"'muc_highlight_words' your nickname is mentioned."
 msgstr ""
 
-#: gajim/common/config.py:481
-msgid "Sound to play when any MUC message arrives."
+#: gajim/common/config.py:480
+#, 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:485
+#: gajim/common/config.py:484
 #, fuzzy
 msgid "Tor"
 msgstr "Pre"
@@ -4063,879 +4105,975 @@ msgstr "Pre"
 msgid "Error: cannot open %s for reading"
 msgstr "Chyba: nie je možné otvoriť %s na čítanie"
 
-#: gajim/common/const.py:214
+#: gajim/common/const.py:216
+#, fuzzy
+msgid "?Group chat name:Team"
+msgstr "?Rola kontaktu v diskusnej skupine: žiadna"
+
+#: gajim/common/const.py:217
+msgid "?Group chat description:Project discussion"
+msgstr ""
+
+#: gajim/common/const.py:218
+#, fuzzy
+msgid "?Group chat address:team"
+msgstr "Diskuné skupiny"
+
+#: gajim/common/const.py:219
+#, fuzzy
+msgid "?Group chat name:Family"
+msgstr "Zvýraznenie správ v diskusnej skupine"
+
+#: gajim/common/const.py:220
+msgid "?Group chat description:Spring gathering"
+msgstr ""
+
+#: gajim/common/const.py:221
+msgid "?Group chat address:family"
+msgstr ""
+
+#: gajim/common/const.py:222
+#, fuzzy
+msgid "?Group chat name:Vacation"
+msgstr "Pozvánka do diskusnej skupiny"
+
+#: gajim/common/const.py:223
+msgid "?Group chat description:Trip planning"
+msgstr ""
+
+#: gajim/common/const.py:224
+#, fuzzy
+msgid "?Group chat address:vacation"
+msgstr "Pozvánka do diskusnej skupiny"
+
+#: gajim/common/const.py:225
+#, fuzzy
+msgid "?Group chat name:Repairs"
+msgstr "_Diskusná skupina"
+
+#: gajim/common/const.py:226
+msgid "?Group chat description:Local help group"
+msgstr ""
+
+#: gajim/common/const.py:227
+#, fuzzy
+msgid "?Group chat address:repairs"
+msgstr "Diskuné skupiny"
+
+#: gajim/common/const.py:228
+#, fuzzy
+msgid "?Group chat name:News"
+msgstr "?Rola kontaktu v diskusnej skupine: žiadna"
+
+#: gajim/common/const.py:229
+#, fuzzy
+msgid "?Group chat description:Local news and reports"
+msgstr "Vytváranie diskusných skupín je obmedzené."
+
+#: gajim/common/const.py:230
+#, fuzzy
+msgid "?Group chat address:news"
+msgstr "Nová diskusná skupina"
+
+#: gajim/common/const.py:235
+#, fuzzy
+msgid "Remote server not found"
+msgstr "Služba nebola nájdená"
+
+#: gajim/common/const.py:236
+msgid "Remote server timeout"
+msgstr ""
+
+#: gajim/common/const.py:237 gajim/common/const.py:238
+#: gajim/common/const.py:239
+#, fuzzy
+msgid "Address does not belong to a group chat server"
+msgstr "Toto nie je diskusná skupina"
+
+#: gajim/common/const.py:240
+#, fuzzy
+msgid "Group chat already exists"
+msgstr "Účet Local už existuje."
+
+#: gajim/common/const.py:241
+#, fuzzy
+msgid "Group chat does not exist"
+msgstr "Diskusná skupina %s neexistuje."
+
+#: gajim/common/const.py:247
 msgid "This message was encrypted with OTR and could not be decrypted."
 msgstr ""
 
-#: gajim/common/const.py:217
+#: gajim/common/const.py:250
 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:221
+#: gajim/common/const.py:254
 msgid ""
-"This message was encrypted with OpenPGP for XMPP and could not be decrypted."
+"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:224
+#: gajim/common/const.py:258
 #, python-format
 msgid "This message was encrypted with %s and could not be decrypted."
 msgstr ""
 
-#: gajim/common/const.py:231
+#: gajim/common/const.py:265
 msgid "Doing Chores"
 msgstr "Domáce práce"
 
-#: gajim/common/const.py:232
+#: gajim/common/const.py:266
 msgid "Buying Groceries"
 msgstr "Kupujem potraviny"
 
-#: gajim/common/const.py:233
+#: gajim/common/const.py:267
 msgid "Cleaning"
 msgstr "Upratujem"
 
-#: gajim/common/const.py:234
+#: gajim/common/const.py:268
 msgid "Cooking"
 msgstr "Varím"
 
-#: gajim/common/const.py:235
+#: gajim/common/const.py:269
 msgid "Doing Maintenance"
 msgstr "Robím údržbu"
 
-#: gajim/common/const.py:236
+#: gajim/common/const.py:270
 msgid "Doing the Dishes"
 msgstr "Umývam riad"
 
-#: gajim/common/const.py:237
+#: gajim/common/const.py:271
 msgid "Doing the Laundry"
 msgstr "Periem"
 
-#: gajim/common/const.py:238
+#: gajim/common/const.py:272
 msgid "Gardening"
 msgstr "Záhradničím"
 
-#: gajim/common/const.py:239
+#: gajim/common/const.py:273
 msgid "Running an Errand"
 msgstr "Na obchôdzke"
 
-#: gajim/common/const.py:240
+#: gajim/common/const.py:274
 msgid "Walking the Dog"
 msgstr "Venčím psa"
 
-#: gajim/common/const.py:242
+#: gajim/common/const.py:276
 msgid "Drinking"
 msgstr "Pijem"
 
-#: gajim/common/const.py:243
+#: gajim/common/const.py:277
 msgid "Having a Beer"
 msgstr "Pijem pivo"
 
-#: gajim/common/const.py:244
+#: gajim/common/const.py:278
 msgid "Having Coffee"
 msgstr "Pijem kávu"
 
-#: gajim/common/const.py:245
+#: gajim/common/const.py:279
 msgid "Having Tea"
 msgstr "Pijem čaj"
 
-#: gajim/common/const.py:248
+#: gajim/common/const.py:282
 msgid "Having a Snack"
 msgstr "Desiatujem"
 
-#: gajim/common/const.py:249
+#: gajim/common/const.py:283
 msgid "Having Breakfast"
 msgstr "Raňajkujem"
 
-#: gajim/common/const.py:250
+#: gajim/common/const.py:284
 msgid "Having Dinner"
 msgstr "Večeriam"
 
-#: gajim/common/const.py:251
+#: gajim/common/const.py:285
 msgid "Having Lunch"
 msgstr "Obedujem"
 
-#: gajim/common/const.py:253
+#: gajim/common/const.py:287
 msgid "Exercising"
 msgstr "Cvičím"
 
-#: gajim/common/const.py:254 gajim/common/const.py:305
+#: gajim/common/const.py:288 gajim/common/const.py:339
 msgid "Cycling"
 msgstr "Bicyklujem"
 
-#: gajim/common/const.py:255
+#: gajim/common/const.py:289
 msgid "Dancing"
 msgstr "Tancujem"
 
-#: gajim/common/const.py:256
+#: gajim/common/const.py:290
 msgid "Hiking"
 msgstr "Som na túre"
 
-#: gajim/common/const.py:257
+#: gajim/common/const.py:291
 msgid "Jogging"
 msgstr "Klusám"
 
-#: gajim/common/const.py:258
+#: gajim/common/const.py:292
 msgid "Playing Sports"
 msgstr "Športujem"
 
-#: gajim/common/const.py:259
+#: gajim/common/const.py:293
 msgid "Running"
 msgstr "Behám"
 
-#: gajim/common/const.py:260
+#: gajim/common/const.py:294
 msgid "Skiing"
 msgstr "Lyžujem"
 
-#: gajim/common/const.py:261
+#: gajim/common/const.py:295
 msgid "Swimming"
 msgstr "Plávam"
 
-#: gajim/common/const.py:262
+#: gajim/common/const.py:296
 msgid "Working out"
 msgstr "Posilňujem"
 
-#: gajim/common/const.py:264
+#: gajim/common/const.py:298
 msgid "Grooming"
 msgstr "Starám sa o seba"
 
-#: gajim/common/const.py:265
+#: gajim/common/const.py:299
 msgid "At the Spa"
 msgstr "V kúpeloch"
 
-#: gajim/common/const.py:266
+#: gajim/common/const.py:300
 msgid "Brushing Teeth"
 msgstr "Čistím si zuby"
 
-#: gajim/common/const.py:267
+#: gajim/common/const.py:301
 msgid "Getting a Haircut"
 msgstr "V kaderníctve"
 
-#: gajim/common/const.py:268
+#: gajim/common/const.py:302
 msgid "Shaving"
 msgstr "Holím sa"
 
-#: gajim/common/const.py:269
+#: gajim/common/const.py:303
 msgid "Taking a Bath"
 msgstr "Kúpem sa"
 
-#: gajim/common/const.py:270
+#: gajim/common/const.py:304
 msgid "Taking a Shower"
 msgstr "Sprchujem sa"
 
-#: gajim/common/const.py:272
+#: gajim/common/const.py:306
 msgid "Having an Appointment"
 msgstr "Na schôdzke"
 
-#: gajim/common/const.py:274
+#: gajim/common/const.py:308
 msgid "Inactive"
 msgstr "Neaktívny"
 
-#: gajim/common/const.py:275
+#: gajim/common/const.py:309
 msgid "Day Off"
 msgstr "Koniec dňa"
 
-#: gajim/common/const.py:276
+#: gajim/common/const.py:310
 msgid "Hanging out"
 msgstr "Som vonku"
 
-#: gajim/common/const.py:277
+#: gajim/common/const.py:311
 msgid "Hiding"
 msgstr "Hrám skrývačku"
 
-#: gajim/common/const.py:278
+#: gajim/common/const.py:312
 msgid "On Vacation"
 msgstr "Na dovolenke"
 
-#: gajim/common/const.py:279
+#: gajim/common/const.py:313
 msgid "Praying"
 msgstr "Modlím sa"
 
-#: gajim/common/const.py:280
+#: gajim/common/const.py:314
 msgid "Scheduled Holiday"
 msgstr "Plánovaná dovolenka"
 
-#: gajim/common/const.py:282
+#: gajim/common/const.py:316
 msgid "Thinking"
 msgstr "Rozmýšľam"
 
-#: gajim/common/const.py:284
+#: gajim/common/const.py:318
 msgid "Relaxing"
 msgstr "Oddychujem"
 
-#: gajim/common/const.py:285
+#: gajim/common/const.py:319
 msgid "Fishing"
 msgstr "Som na rybách"
 
-#: gajim/common/const.py:286
+#: gajim/common/const.py:320
 msgid "Gaming"
 msgstr "Hrám sa"
 
-#: gajim/common/const.py:287
+#: gajim/common/const.py:321
 msgid "Going out"
 msgstr "Som vonku"
 
-#: gajim/common/const.py:288
+#: gajim/common/const.py:322
 msgid "Partying"
 msgstr "Žúrujem"
 
-#: gajim/common/const.py:289
+#: gajim/common/const.py:323
 msgid "Reading"
 msgstr "Čítam"
 
-#: gajim/common/const.py:290
+#: gajim/common/const.py:324
 msgid "Rehearsing"
 msgstr "Nacvičujem"
 
-#: gajim/common/const.py:291
+#: gajim/common/const.py:325
 msgid "Shopping"
 msgstr "Nakupujem"
 
-#: gajim/common/const.py:292
+#: gajim/common/const.py:326
 msgid "Smoking"
 msgstr "Fajčím"
 
-#: gajim/common/const.py:293
+#: gajim/common/const.py:327
 msgid "Socializing"
 msgstr "Mám spoločnosť"
 
-#: gajim/common/const.py:294
+#: gajim/common/const.py:328
 msgid "Sunbathing"
 msgstr "Opalujem sa"
 
-#: gajim/common/const.py:295
+#: gajim/common/const.py:329
 msgid "Watching TV"
 msgstr "Sledujem TV"
 
-#: gajim/common/const.py:296
+#: gajim/common/const.py:330
 msgid "Watching a Movie"
 msgstr "Sledujem film"
 
-#: gajim/common/const.py:298
+#: gajim/common/const.py:332
 msgid "Talking"
 msgstr "Rozprávam"
 
-#: gajim/common/const.py:299
+#: gajim/common/const.py:333
 msgid "In Real Life"
 msgstr "Bezprostredne"
 
-#: gajim/common/const.py:300
+#: gajim/common/const.py:334
 msgid "On the Phone"
 msgstr "Telefonujem"
 
-#: gajim/common/const.py:301
+#: gajim/common/const.py:335
 msgid "On Video Phone"
 msgstr "Mám videohovor"
 
-#: gajim/common/const.py:303
+#: gajim/common/const.py:337
 msgid "Traveling"
 msgstr "Cestujem"
 
-#: gajim/common/const.py:304
+#: gajim/common/const.py:338
 msgid "Commuting"
 msgstr "Prichádzam"
 
-#: gajim/common/const.py:306
+#: gajim/common/const.py:340
 msgid "Driving"
 msgstr "Šoférujem"
 
-#: gajim/common/const.py:307
+#: gajim/common/const.py:341
 msgid "In a Car"
 msgstr "V aute"
 
-#: gajim/common/const.py:308
+#: gajim/common/const.py:342
 msgid "On a Bus"
 msgstr "V autobuse"
 
-#: gajim/common/const.py:309
+#: gajim/common/const.py:343
 msgid "On a Plane"
 msgstr "V lietadle"
 
-#: gajim/common/const.py:310
+#: gajim/common/const.py:344
 msgid "On a Train"
 msgstr "Vo vlaku"
 
-#: gajim/common/const.py:311
+#: gajim/common/const.py:345
 msgid "On a Trip"
 msgstr "Na výlete"
 
-#: gajim/common/const.py:312
+#: gajim/common/const.py:346
 msgid "Walking"
 msgstr "Prechádzam sa"
 
-#: gajim/common/const.py:315
+#: gajim/common/const.py:349
 msgid "Coding"
 msgstr "Kódim"
 
-#: gajim/common/const.py:316
+#: gajim/common/const.py:350
 msgid "In a Meeting"
 msgstr "Na stretnutí"
 
-#: gajim/common/const.py:317
+#: gajim/common/const.py:351
 msgid "Studying"
 msgstr "Študujem"
 
-#: gajim/common/const.py:318
+#: gajim/common/const.py:352
 msgid "Writing"
 msgstr "Píšem"
 
-#: gajim/common/const.py:321
+#: gajim/common/const.py:355
 msgid "Afraid"
 msgstr "Vystrašený"
 
-#: gajim/common/const.py:322
+#: gajim/common/const.py:356
 msgid "Amazed"
 msgstr "Prekvapený"
 
-#: gajim/common/const.py:323
+#: gajim/common/const.py:357
 msgid "Amorous"
 msgstr "Zamilovaný"
 
-#: gajim/common/const.py:324
+#: gajim/common/const.py:358
 msgid "Angry"
 msgstr "Nahnevaný"
 
-#: gajim/common/const.py:325
+#: gajim/common/const.py:359
 msgid "Annoyed"
 msgstr "Mrzutý"
 
-#: gajim/common/const.py:326
+#: gajim/common/const.py:360
 msgid "Anxious"
 msgstr "Znepokojený"
 
-#: gajim/common/const.py:327
+#: gajim/common/const.py:361
 msgid "Aroused"
 msgstr "Vyburcovaný"
 
-#: gajim/common/const.py:328
+#: gajim/common/const.py:362
 msgid "Ashamed"
 msgstr "Zahanbený"
 
-#: gajim/common/const.py:329
+#: gajim/common/const.py:363
 msgid "Bored"
 msgstr "Znudený"
 
-#: gajim/common/const.py:330
+#: gajim/common/const.py:364
 msgid "Brave"
 msgstr "Statočný"
 
-#: gajim/common/const.py:331
+#: gajim/common/const.py:365
 msgid "Calm"
 msgstr "Pokojný"
 
-#: gajim/common/const.py:332
+#: gajim/common/const.py:366
 msgid "Cautious"
 msgstr "Opatrný"
 
-#: gajim/common/const.py:333
+#: gajim/common/const.py:367
 msgid "Cold"
 msgstr "Podchladený"
 
-#: gajim/common/const.py:334
+#: gajim/common/const.py:368
 msgid "Confident"
 msgstr "Sebaistý"
 
-#: gajim/common/const.py:335
+#: gajim/common/const.py:369
 msgid "Confused"
 msgstr "Zmätený"
 
-#: gajim/common/const.py:336
+#: gajim/common/const.py:370
 msgid "Contemplative"
 msgstr "Hĺbavý"
 
-#: gajim/common/const.py:337
+#: gajim/common/const.py:371
 msgid "Contented"
 msgstr "Spokojný"
 
-#: gajim/common/const.py:338
+#: gajim/common/const.py:372
 msgid "Cranky"
 msgstr "Rozhádzaný"
 
-#: gajim/common/const.py:339
+#: gajim/common/const.py:373
 msgid "Crazy"
 msgstr "Bláznivý"
 
-#: gajim/common/const.py:340
+#: gajim/common/const.py:374
 msgid "Creative"
 msgstr "Tvorivý"
 
-#: gajim/common/const.py:341
+#: gajim/common/const.py:375
 msgid "Curious"
 msgstr "Zvedavý"
 
-#: gajim/common/const.py:342
+#: gajim/common/const.py:376
 msgid "Dejected"
 msgstr "Deprimovaný"
 
-#: gajim/common/const.py:343
+#: gajim/common/const.py:377
 msgid "Depressed"
 msgstr "Skľúčený"
 
-#: gajim/common/const.py:344
+#: gajim/common/const.py:378
 msgid "Disappointed"
 msgstr "Sklamaný"
 
-#: gajim/common/const.py:345
+#: gajim/common/const.py:379
 msgid "Disgusted"
 msgstr "Zhnusený"
 
-#: gajim/common/const.py:346
+#: gajim/common/const.py:380
 msgid "Dismayed"
 msgstr "Zhrozený"
 
-#: gajim/common/const.py:347
+#: gajim/common/const.py:381
 msgid "Distracted"
 msgstr "Zmätený"
 
-#: gajim/common/const.py:348
+#: gajim/common/const.py:382
 msgid "Embarrassed"
 msgstr "Rozpačitý"
 
-#: gajim/common/const.py:349
+#: gajim/common/const.py:383
 msgid "Envious"
 msgstr "Zavistlivý"
 
-#: gajim/common/const.py:350
+#: gajim/common/const.py:384
 msgid "Excited"
 msgstr "Vzrušený"
 
-#: gajim/common/const.py:351
+#: gajim/common/const.py:385
 msgid "Flirtatious"
 msgstr "Koketný"
 
-#: gajim/common/const.py:352
+#: gajim/common/const.py:386
 msgid "Frustrated"
 msgstr "Frustrovaný"
 
-#: gajim/common/const.py:353
+#: gajim/common/const.py:387
 msgid "Grateful"
 msgstr "Príjemný"
 
-#: gajim/common/const.py:354
+#: gajim/common/const.py:388
 msgid "Grieving"
 msgstr "Trúchliaci"
 
-#: gajim/common/const.py:355
+#: gajim/common/const.py:389
 msgid "Grumpy"
 msgstr "Podráždený"
 
-#: gajim/common/const.py:356
+#: gajim/common/const.py:390
 msgid "Guilty"
 msgstr "Previnilý"
 
-#: gajim/common/const.py:357
+#: gajim/common/const.py:391
 msgid "Happy"
 msgstr "Šťastný"
 
-#: gajim/common/const.py:358
+#: gajim/common/const.py:392
 msgid "Hopeful"
 msgstr "Nádejný"
 
-#: gajim/common/const.py:359
+#: gajim/common/const.py:393
 msgid "Hot"
 msgstr "Prehriaty"
 
-#: gajim/common/const.py:360
+#: gajim/common/const.py:394
 msgid "Humbled"
 msgstr "Ponížený"
 
-#: gajim/common/const.py:361
+#: gajim/common/const.py:395
 msgid "Humiliated"
 msgstr "Porazený"
 
-#: gajim/common/const.py:362
+#: gajim/common/const.py:396
 msgid "Hungry"
 msgstr "Hladný"
 
-#: gajim/common/const.py:363
+#: gajim/common/const.py:397
 msgid "Hurt"
 msgstr "Zranený"
 
-#: gajim/common/const.py:364
+#: gajim/common/const.py:398
 msgid "Impressed"
 msgstr "Ohromený"
 
-#: gajim/common/const.py:365
+#: gajim/common/const.py:399
 msgid "In Awe"
 msgstr "Rešpektovaný"
 
-#: gajim/common/const.py:366
+#: gajim/common/const.py:400
 msgid "In Love"
 msgstr "Zaľúbený"
 
-#: gajim/common/const.py:367
+#: gajim/common/const.py:401
 msgid "Indignant"
 msgstr "Rozhorčený"
 
-#: gajim/common/const.py:368
+#: gajim/common/const.py:402
 msgid "Interested"
 msgstr "Zainteresovaný"
 
-#: gajim/common/const.py:369
+#: gajim/common/const.py:403
 msgid "Intoxicated"
 msgstr "Opitý"
 
-#: gajim/common/const.py:370
+#: gajim/common/const.py:404
 msgid "Invincible"
 msgstr "Nepremožiteľný"
 
-#: gajim/common/const.py:371
+#: gajim/common/const.py:405
 msgid "Jealous"
 msgstr "Žiarlivý"
 
-#: gajim/common/const.py:372
+#: gajim/common/const.py:406
 msgid "Lonely"
 msgstr "Osamelý"
 
-#: gajim/common/const.py:373
+#: gajim/common/const.py:407
 msgid "Lost"
 msgstr "Stratený"
 
-#: gajim/common/const.py:374
+#: gajim/common/const.py:408
 msgid "Lucky"
 msgstr "Šťastný"
 
-#: gajim/common/const.py:375
+#: gajim/common/const.py:409
 msgid "Mean"
 msgstr "Protivný"
 
-#: gajim/common/const.py:376
+#: gajim/common/const.py:410
 msgid "Moody"
 msgstr "Náladový"
 
-#: gajim/common/const.py:377
+#: gajim/common/const.py:411
 msgid "Nervous"
 msgstr "Nervózny"
 
-#: gajim/common/const.py:378
+#: gajim/common/const.py:412
 msgid "Neutral"
 msgstr "Neutrálny"
 
-#: gajim/common/const.py:379
+#: gajim/common/const.py:413
 msgid "Offended"
 msgstr "Urazený"
 
-#: gajim/common/const.py:380
+#: gajim/common/const.py:414
 msgid "Outraged"
 msgstr "Pobúrený"
 
-#: gajim/common/const.py:381
+#: gajim/common/const.py:415
 msgid "Playful"
 msgstr "Hravý"
 
-#: gajim/common/const.py:382
+#: gajim/common/const.py:416
 msgid "Proud"
 msgstr "Hrdý"
 
-#: gajim/common/const.py:383
+#: gajim/common/const.py:417
 msgid "Relaxed"
 msgstr "Odpočinutý"
 
-#: gajim/common/const.py:384
+#: gajim/common/const.py:418
 msgid "Relieved"
 msgstr "Odľahčený"
 
-#: gajim/common/const.py:385
+#: gajim/common/const.py:419
 msgid "Remorseful"
 msgstr "Kajajúci"
 
-#: gajim/common/const.py:386
+#: gajim/common/const.py:420
 msgid "Restless"
 msgstr "Neposedný"
 
-#: gajim/common/const.py:387
+#: gajim/common/const.py:421
 msgid "Sad"
 msgstr "Smutný"
 
-#: gajim/common/const.py:388
+#: gajim/common/const.py:422
 msgid "Sarcastic"
 msgstr "Uštipačný"
 
-#: gajim/common/const.py:389
+#: gajim/common/const.py:423
 msgid "Satisfied"
 msgstr "Spokojný"
 
-#: gajim/common/const.py:390
+#: gajim/common/const.py:424
 msgid "Serious"
 msgstr "Vážny"
 
-#: gajim/common/const.py:391
+#: gajim/common/const.py:425
 msgid "Shocked"
 msgstr "Šokovaný"
 
-#: gajim/common/const.py:392
+#: gajim/common/const.py:426
 msgid "Shy"
 msgstr "Hanblivý"
 
-#: gajim/common/const.py:393
+#: gajim/common/const.py:427
 msgid "Sick"
 msgstr "Na vracanie"
 
-#: gajim/common/const.py:394
+#: gajim/common/const.py:428
 msgid "Sleepy"
 msgstr "Ospanlivý"
 
-#: gajim/common/const.py:395
+#: gajim/common/const.py:429
 msgid "Spontaneous"
 msgstr "Spontánny"
 
-#: gajim/common/const.py:396
+#: gajim/common/const.py:430
 msgid "Stressed"
 msgstr "Vystresovaný"
 
-#: gajim/common/const.py:397
+#: gajim/common/const.py:431
 msgid "Strong"
 msgstr "Silný"
 
-#: gajim/common/const.py:398
+#: gajim/common/const.py:432
 msgid "Surprised"
 msgstr "Prekvapený"
 
-#: gajim/common/const.py:399
+#: gajim/common/const.py:433
 msgid "Thankful"
 msgstr "Vďačný"
 
-#: gajim/common/const.py:400
+#: gajim/common/const.py:434
 msgid "Thirsty"
 msgstr "Smädný"
 
-#: gajim/common/const.py:401
+#: gajim/common/const.py:435
 msgid "Tired"
 msgstr "Unavený"
 
-#: gajim/common/const.py:402
+#: gajim/common/const.py:436
 msgid "Undefined"
 msgstr "Neurčitý"
 
-#: gajim/common/const.py:403
+#: gajim/common/const.py:437
 msgid "Weak"
 msgstr "Slabý"
 
-#: gajim/common/const.py:404
+#: gajim/common/const.py:438
 msgid "Worried"
 msgstr "Ustarostený"
 
-#: gajim/common/const.py:408
+#: gajim/common/const.py:442
 msgid "accuracy"
 msgstr ""
 
-#: gajim/common/const.py:409
+#: gajim/common/const.py:443
 #, fuzzy
 msgid "alt"
 msgstr "predvolená"
 
-#: gajim/common/const.py:410
+#: gajim/common/const.py:444
 msgid "area"
 msgstr ""
 
-#: gajim/common/const.py:411
+#: gajim/common/const.py:445
 #, fuzzy
 msgid "bearing"
 msgstr "námornícka"
 
-#: gajim/common/const.py:412
+#: gajim/common/const.py:446
 #, fuzzy
 msgid "building"
 msgstr "Hrám skrývačku"
 
-#: gajim/common/const.py:413
+#: gajim/common/const.py:447
 #, fuzzy
 msgid "country"
 msgstr "Účet"
 
-#: gajim/common/const.py:414
+#: gajim/common/const.py:448
 #, fuzzy
 msgid "countrycode"
 msgstr "Účet"
 
-#: gajim/common/const.py:415
+#: gajim/common/const.py:449
 msgid "datum"
 msgstr ""
 
-#: gajim/common/const.py:416
+#: gajim/common/const.py:450
 #, fuzzy
 msgid "description"
 msgstr "Popis"
 
-#: gajim/common/const.py:417
+#: gajim/common/const.py:451
 #, fuzzy
 msgid "error"
 msgstr "Chyba"
 
-#: gajim/common/const.py:418
+#: gajim/common/const.py:452
 msgid "floor"
 msgstr ""
 
-#: gajim/common/const.py:419
+#: gajim/common/const.py:453
 msgid "lat"
 msgstr ""
 
-#: gajim/common/const.py:420
+#: gajim/common/const.py:454
 msgid "locality"
 msgstr ""
 
-#: gajim/common/const.py:421
+#: gajim/common/const.py:455
 #, fuzzy
 msgid "lon"
 msgstr "jeden"
 
-#: gajim/common/const.py:422
+#: gajim/common/const.py:456
 msgid "postalcode"
 msgstr ""
 
-#: gajim/common/const.py:423
+#: gajim/common/const.py:457
 msgid "region"
 msgstr ""
 
-#: gajim/common/const.py:424
+#: gajim/common/const.py:458
 msgid "room"
 msgstr "miestnosť"
 
-#: gajim/common/const.py:425
+#: gajim/common/const.py:459
 msgid "speed"
 msgstr ""
 
-#: gajim/common/const.py:426
+#: gajim/common/const.py:460
 msgid "street"
 msgstr ""
 
-#: gajim/common/const.py:427
+#: gajim/common/const.py:461
 msgid "text"
 msgstr ""
 
-#: gajim/common/const.py:428
+#: gajim/common/const.py:462
 msgid "timestamp"
 msgstr ""
 
-#: gajim/common/const.py:429
+#: gajim/common/const.py:463
 msgid "URI"
 msgstr ""
 
-#: gajim/common/const.py:434
+#: gajim/common/const.py:468
 msgid "Unable to get issuer certificate"
 msgstr "Nepodarilo sa získať problematický certfikát"
 
-#: gajim/common/const.py:435
+#: gajim/common/const.py:469
 msgid "Unable to get certificate CRL"
 msgstr "Nepodarilo sa získať certifikát CRL"
 
-#: gajim/common/const.py:436
+#: gajim/common/const.py:470
 msgid "Unable to decrypt certificate's signature"
 msgstr "Nepodarilo sa dešifrovať podpis certifikátu"
 
-#: gajim/common/const.py:437
+#: gajim/common/const.py:471
 msgid "Unable to decrypt CRL's signature"
 msgstr "Nepodarilo sa dešifrovať CRL podpis"
 
-#: gajim/common/const.py:438
+#: gajim/common/const.py:472
 msgid "Unable to decode issuer public key"
 msgstr ""
 
-#: gajim/common/const.py:439
+#: gajim/common/const.py:473
 msgid "Certificate signature failure"
 msgstr "Podpísanie certifikátu zlyhalo"
 
-#: gajim/common/const.py:440
+#: gajim/common/const.py:474
 msgid "CRL signature failure"
 msgstr "Zlyhanie CRL podpisu"
 
-#: gajim/common/const.py:441
+#: gajim/common/const.py:475
 msgid "Certificate is not yet valid"
 msgstr ""
 
-#: gajim/common/const.py:442
+#: gajim/common/const.py:476
 msgid "Certificate has expired"
 msgstr "Certifikát vypršal"
 
-#: gajim/common/const.py:443
+#: gajim/common/const.py:477
 msgid "CRL is not yet valid"
 msgstr ""
 
-#: gajim/common/const.py:444
+#: gajim/common/const.py:478
 msgid "CRL has expired"
 msgstr "CRL vypršal"
 
-#: gajim/common/const.py:445
+#: gajim/common/const.py:479
 msgid "Format error in certificate's notBefore field"
 msgstr ""
 
-#: gajim/common/const.py:446
+#: gajim/common/const.py:480
 msgid "Format error in certificate's notAfter field"
 msgstr ""
 
-#: gajim/common/const.py:447
+#: gajim/common/const.py:481
 msgid "Format error in CRL's lastUpdate field"
 msgstr ""
 
-#: gajim/common/const.py:448
+#: gajim/common/const.py:482
 msgid "Format error in CRL's nextUpdate field"
 msgstr ""
 
-#: gajim/common/const.py:449
+#: gajim/common/const.py:483
 msgid "Out of memory"
 msgstr ""
 
-#: gajim/common/const.py:450
+#: gajim/common/const.py:484
 msgid "Self signed certificate"
 msgstr "Certifikát podpísaný sám sebou"
 
-#: gajim/common/const.py:451
+#: gajim/common/const.py:485
 msgid "Self signed certificate in certificate chain"
 msgstr ""
 
-#: gajim/common/const.py:452
+#: gajim/common/const.py:486
 msgid "Unable to get local issuer certificate"
 msgstr "Nepodarilo sa získať lokálny problematický certifikát"
 
-#: gajim/common/const.py:453
+#: gajim/common/const.py:487
 msgid "Unable to verify the first certificate"
 msgstr "Nepodarilo sa overiť prvý certifikát"
 
-#: gajim/common/const.py:454
+#: gajim/common/const.py:488
 msgid "Certificate chain too long"
 msgstr "Reťazec certifikátu je príliš dlhý"
 
-#: gajim/common/const.py:455
+#: gajim/common/const.py:489
 msgid "Certificate revoked"
 msgstr ""
 
-#: gajim/common/const.py:456
+#: gajim/common/const.py:490
 msgid "Invalid CA certificate"
 msgstr "Neplatný CA certifikát"
 
-#: gajim/common/const.py:457
+#: gajim/common/const.py:491
 msgid "Path length constraint exceeded"
 msgstr ""
 
-#: gajim/common/const.py:458
+#: gajim/common/const.py:492
 msgid "Unsupported certificate purpose"
 msgstr ""
 
-#: gajim/common/const.py:459
+#: gajim/common/const.py:493
 msgid "Certificate not trusted"
 msgstr "Certifikát nie je dôverný"
 
-#: gajim/common/const.py:460
+#: gajim/common/const.py:494
 msgid "Certificate rejected"
 msgstr "Certifikát odmietnutý"
 
-#: gajim/common/const.py:461
+#: gajim/common/const.py:495
 msgid "Subject issuer mismatch"
 msgstr ""
 
-#: gajim/common/const.py:462
+#: gajim/common/const.py:496
 msgid "Authority and subject key identifier mismatch"
 msgstr ""
 
-#: gajim/common/const.py:463
+#: gajim/common/const.py:497
 msgid "Authority and issuer serial number mismatch"
 msgstr ""
 
-#: gajim/common/const.py:464
+#: gajim/common/const.py:498
 msgid "Key usage does not include certificate signing"
 msgstr ""
 
-#: gajim/common/const.py:465
+#: gajim/common/const.py:499
 msgid "Application verification failure"
 msgstr "Zlyhalo overenie aplikácie"
 
@@ -5101,199 +5239,199 @@ msgstr "video vstup"
 msgid "video output"
 msgstr "video výstup"
 
-#: gajim/common/helpers.py:210
+#: gajim/common/helpers.py:216
 msgid "Server must be between 1 and 1023 bytes"
 msgstr ""
 
-#: gajim/common/helpers.py:214
+#: gajim/common/helpers.py:220
 msgid "Invalid character in hostname."
 msgstr "Nepovolený znak v názve hostiteľa."
 
-#: gajim/common/helpers.py:216
+#: gajim/common/helpers.py:222
 msgid "Server address required."
 msgstr "Adresa serveru je požadovaná."
 
-#: gajim/common/helpers.py:220
+#: gajim/common/helpers.py:226
 msgid "Username must be between 1 and 1023 bytes"
 msgstr ""
 
-#: gajim/common/helpers.py:224
+#: gajim/common/helpers.py:230
 msgid "Invalid character in username."
 msgstr "Nepovolený znak v názve účtu."
 
-#: gajim/common/helpers.py:230
+#: gajim/common/helpers.py:236
 msgid "Resource must be between 1 and 1023 bytes"
 msgstr ""
 
-#: gajim/common/helpers.py:234
+#: gajim/common/helpers.py:240
 msgid "Invalid character in resource."
 msgstr "Nepovolený znak v zdroji."
 
-#: gajim/common/helpers.py:275
+#: gajim/common/helpers.py:281
 msgid "_Busy"
 msgstr "_Zaneprázdnený"
 
-#: gajim/common/helpers.py:277 gajim/gtk/tooltips.py:647
+#: gajim/common/helpers.py:283 gajim/gtk/tooltips.py:647
 msgid "Busy"
 msgstr "Zaneprázdnený"
 
-#: gajim/common/helpers.py:280
+#: gajim/common/helpers.py:286
 msgid "_Not Available"
 msgstr "_Neprítomný"
 
-#: gajim/common/helpers.py:282 gajim/gtk/tooltips.py:649
+#: gajim/common/helpers.py:288 gajim/gtk/tooltips.py:649
 msgid "Not Available"
 msgstr "Neprítomný"
 
-#: gajim/common/helpers.py:285
+#: gajim/common/helpers.py:291
 msgid "_Free for Chat"
 msgstr "_Mám čas na debatu"
 
-#: gajim/common/helpers.py:287 gajim/gtk/tooltips.py:643
+#: gajim/common/helpers.py:293 gajim/gtk/tooltips.py:643
 msgid "Free for Chat"
 msgstr "Mám čas na debatu"
 
-#: gajim/common/helpers.py:290
+#: gajim/common/helpers.py:296
 #, fuzzy
 msgid "?user status:_Available"
 msgstr "?stav prenosu:Pozastavené"
 
-#: gajim/common/helpers.py:292 gajim/gtk/tooltips.py:641
+#: gajim/common/helpers.py:298 gajim/gtk/tooltips.py:641
 #, fuzzy
 msgid "?user status:Available"
 msgstr "?stav prenosu:Pozastavené"
 
-#: gajim/common/helpers.py:294
+#: gajim/common/helpers.py:300
 msgid "Connecting"
 msgstr "Pripájanie"
 
-#: gajim/common/helpers.py:297 gajim/data/gui/preferences_window.ui:1251
+#: gajim/common/helpers.py:303 gajim/data/gui/preferences_window.ui:1251
 msgid "A_way"
 msgstr "P_reč"
 
-#: gajim/common/helpers.py:299 gajim/common/modules/adhoc_commands.py:120
-#: gajim/command_system/implementation/standard.py:139
+#: gajim/common/helpers.py:305 gajim/common/modules/adhoc_commands.py:120
+#: gajim/command_system/implementation/standard.py:141
 #: gajim/gtk/tooltips.py:645
 msgid "Away"
 msgstr "Preč"
 
-#: gajim/common/helpers.py:302
+#: gajim/common/helpers.py:308
 msgid "_Offline"
 msgstr "_Odhlásený"
 
-#: gajim/common/helpers.py:304 gajim/gtk/tooltips.py:651
+#: gajim/common/helpers.py:310 gajim/gtk/tooltips.py:651
 msgid "Offline"
 msgstr "Odhlásený"
 
-#: gajim/common/helpers.py:307
+#: gajim/common/helpers.py:313
 msgid "_Invisible"
 msgstr "_Neviditeľný"
 
-#: gajim/common/helpers.py:313
+#: gajim/common/helpers.py:319
 msgid "?contact has status:Unknown"
 msgstr "?kontakt má stav:Neznámy"
 
-#: gajim/common/helpers.py:315
+#: gajim/common/helpers.py:321
 msgid "?contact has status:Has errors"
 msgstr "?kontakt má stav:Chyba"
 
-#: gajim/common/helpers.py:330
+#: gajim/common/helpers.py:336
 msgid "?Subscription we already have:None"
 msgstr "?Zápis už máme:Žiadny"
 
-#: gajim/common/helpers.py:332
+#: gajim/common/helpers.py:338
 msgid "To"
 msgstr "Pre"
 
-#: gajim/common/helpers.py:334 gajim/data/gui/groups_post_window.ui:33
+#: gajim/common/helpers.py:340 gajim/data/gui/groups_post_window.ui:33
 msgid "From"
 msgstr "Od"
 
-#: gajim/common/helpers.py:336
+#: gajim/common/helpers.py:342
 msgid "Both"
 msgstr "Oba"
 
-#: gajim/common/helpers.py:338 gajim/gtk/server_info.py:151
+#: gajim/common/helpers.py:344 gajim/gtk/server_info.py:151
 #, fuzzy
 msgid "Unknown"
 msgstr "?OS:Neznámy"
 
-#: gajim/common/helpers.py:344
+#: gajim/common/helpers.py:350
 msgid "?Ask (for Subscription):None"
 msgstr "?Vyžiadať (zápis): Žiadny"
 
-#: gajim/common/helpers.py:346
+#: gajim/common/helpers.py:352
 msgid "Subscribe"
 msgstr "Zapísať"
 
-#: gajim/common/helpers.py:355
+#: gajim/common/helpers.py:361
 msgid "?Group Chat Contact Role:None"
 msgstr "?Rola kontaktu v diskusnej skupine: žiadna"
 
-#: gajim/common/helpers.py:358
+#: gajim/common/helpers.py:364
 msgid "Moderators"
 msgstr "Moderátori"
 
-#: gajim/common/helpers.py:360
+#: gajim/common/helpers.py:366
 msgid "Moderator"
 msgstr "Moderátor"
 
-#: gajim/common/helpers.py:363
+#: gajim/common/helpers.py:369 gajim/data/gui/groupchat_info_scrolled.ui:243
 msgid "Participants"
 msgstr "Účastníci"
 
-#: gajim/common/helpers.py:365
+#: gajim/common/helpers.py:371
 msgid "Participant"
 msgstr "Účastník"
 
-#: gajim/common/helpers.py:368
+#: gajim/common/helpers.py:374
 msgid "Visitors"
 msgstr "Návštevníci"
 
-#: gajim/common/helpers.py:370
+#: gajim/common/helpers.py:376
 msgid "Visitor"
 msgstr "Návštevník"
 
-#: gajim/common/helpers.py:376 gajim/gtk/tooltips.py:253
+#: gajim/common/helpers.py:382 gajim/gtk/tooltips.py:253
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "?Príslušnosť kontaktu v diskusnej skupine: žiadna"
 
-#: gajim/common/helpers.py:378 gajim/data/gui/groupchat_config.ui:32
+#: gajim/common/helpers.py:384 gajim/data/gui/groupchat_config.ui:32
 #: gajim/gtk/tooltips.py:259
 msgid "Owner"
 msgstr "Vlastník"
 
-#: gajim/common/helpers.py:380 gajim/gtk/tooltips.py:257
+#: gajim/common/helpers.py:386 gajim/gtk/tooltips.py:257
 msgid "Administrator"
 msgstr "Administrátor"
 
-#: gajim/common/helpers.py:382 gajim/data/gui/groupchat_config.ui:40
+#: gajim/common/helpers.py:388 gajim/data/gui/groupchat_config.ui:40
 #: gajim/gtk/tooltips.py:255 gajim/gtk/groupchat_config.py:105
 msgid "Member"
 msgstr "Člen"
 
-#: gajim/common/helpers.py:421
+#: gajim/common/helpers.py:427
 msgid "is paying attention to the conversation"
 msgstr "sleduje konverzáciu"
 
-#: gajim/common/helpers.py:423
+#: gajim/common/helpers.py:429
 msgid "is doing something else"
 msgstr "robí niečo iné"
 
-#: gajim/common/helpers.py:425
+#: gajim/common/helpers.py:431
 #, fuzzy
 msgid "is composing a message…"
 msgstr "píše správu..."
 
-#: gajim/common/helpers.py:428
+#: gajim/common/helpers.py:434
 msgid "paused composing a message"
 msgstr "prestal písať správu"
 
-#: gajim/common/helpers.py:430
+#: gajim/common/helpers.py:436
 msgid "has closed the chat window or tab"
 msgstr "zatvoril okno alebo záložku"
 
-#: gajim/common/helpers.py:936 gajim/common/helpers.py:943
+#: gajim/common/helpers.py:942 gajim/common/helpers.py:949
 #, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
@@ -5301,22 +5439,22 @@ msgstr[0] "%d správ čaká"
 msgstr[1] "%d správa čaká"
 msgstr[2] "%d správy čakajú"
 
-#: gajim/common/helpers.py:950
+#: gajim/common/helpers.py:956
 #, fuzzy, python-format
-msgid "from room %s"
-msgstr " z miestnosti %s"
+msgid "from group chat %s"
+msgstr "v _diskusných skupiných"
 
-#: gajim/common/helpers.py:953 gajim/common/helpers.py:970
+#: gajim/common/helpers.py:959 gajim/common/helpers.py:976
 #, fuzzy, python-format
 msgid "from user %s"
 msgstr " od používateľa %s"
 
-#: gajim/common/helpers.py:955
+#: gajim/common/helpers.py:961
 #, fuzzy, python-format
 msgid "from %s"
 msgstr " od %s"
 
-#: gajim/common/helpers.py:962 gajim/common/helpers.py:968
+#: gajim/common/helpers.py:968 gajim/common/helpers.py:974
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
@@ -5324,40 +5462,40 @@ msgstr[0] "%d udalostí čaká"
 msgstr[1] "%d udalosť čaká"
 msgstr[2] "%d udalosti čakajú"
 
-#: gajim/common/helpers.py:986 gajim/common/helpers.py:998
+#: gajim/common/helpers.py:992 gajim/common/helpers.py:1004
 #: gajim/data/gui/roster_window.ui:85 data/org.gajim.Gajim.desktop.in:4
 #: data/org.gajim.Gajim.appdata.xml.in:9
 msgid "Gajim"
 msgstr "Gajim"
 
-#: gajim/common/helpers.py:1000
+#: gajim/common/helpers.py:1006
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: gajim/common/helpers.py:1109 gajim/data/gui/add_new_contact_window.ui:25
+#: gajim/common/helpers.py:1115 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:1111
+#: gajim/common/helpers.py:1117
 msgid "Hello, I am $name."
 msgstr ""
 
-#: gajim/common/helpers.py:1215 gajim/common/helpers.py:1224
-#: gajim/common/helpers.py:1282
+#: gajim/common/helpers.py:1221 gajim/common/helpers.py:1230
+#: gajim/common/helpers.py:1288
 msgid "Timeout loading image"
 msgstr "Vypršal čas nahrávania obrázku"
 
-#: gajim/common/helpers.py:1234 gajim/common/helpers.py:1280
+#: gajim/common/helpers.py:1240 gajim/common/helpers.py:1286
 msgid "Image is too big"
 msgstr "Obrázok je príliš veľký"
 
-#: gajim/common/helpers.py:1245
+#: gajim/common/helpers.py:1251
 #, fuzzy
 msgid "PyCURL is not installed"
 msgstr "GPG je nepoužitelný"
 
-#: gajim/common/helpers.py:1284
+#: gajim/common/helpers.py:1290
 #, fuzzy
 msgid "Error loading image"
 msgstr "Vypršal čas nahrávania obrázku"
@@ -5539,7 +5677,8 @@ msgstr "Stav bol zmenený."
 
 #: gajim/common/modules/adhoc_commands.py:202
 #: gajim/common/modules/adhoc_commands.py:239
-msgid "Leave Groupchats"
+#, fuzzy
+msgid "Leave Group Chats"
 msgstr "Opustiť diskusnú skupinu"
 
 #: gajim/common/modules/adhoc_commands.py:228
@@ -5548,15 +5687,18 @@ msgid "%(nickname)s on %(room_jid)s"
 msgstr "%(nickname)s v %(room_jid)s"
 
 #: gajim/common/modules/adhoc_commands.py:232
-msgid "You have not joined a groupchat."
+#, fuzzy
+msgid "You have not joined a group chat."
 msgstr "Neboli ste prihlásený do diskusnej skupiny."
 
 #: gajim/common/modules/adhoc_commands.py:240
-msgid "Choose the groupchats you want to leave"
+#, fuzzy
+msgid "Choose the group chats you want to leave"
 msgstr "Zvolte diskusné skupiny, ktoré chcete opustiť"
 
 #: gajim/common/modules/adhoc_commands.py:289
-msgid "You left the following groupchats:"
+#, fuzzy
+msgid "You left the following group chats:"
 msgstr "Opustili ste nasledujúce diskusné skupiny:"
 
 #: gajim/common/modules/roster_item_exchange.py:102
@@ -5572,7 +5714,7 @@ msgstr "Poslať kontakty:"
 msgid "Blocked Contacts"
 msgstr "Blokované kontakty"
 
-#: gajim/data/gui/destroy_muc_dialog.ui:79 gajim/gtk/dialogs.py:736
+#: gajim/data/gui/destroy_muc_dialog.ui:79 gajim/gtk/dialogs.py:563
 msgid "Destroy this group chat permanently?"
 msgstr ""
 
@@ -5581,7 +5723,7 @@ msgstr ""
 msgid "Reason..."
 msgstr "Dôvod"
 
-#: gajim/data/gui/destroy_muc_dialog.ui:124 gajim/gtk/dialogs.py:738
+#: gajim/data/gui/destroy_muc_dialog.ui:124 gajim/gtk/dialogs.py:565
 msgid "Where participants should go (optional)"
 msgstr ""
 
@@ -5593,33 +5735,6 @@ msgstr ""
 msgid "_Reason and alternate venue (optional)"
 msgstr ""
 
-#: gajim/data/gui/advanced_configuration_window.ui:7
-#: gajim/data/gui/preferences_window.ui:2723
-#, fuzzy
-msgid "Advanced Configuration Editor (ACE)"
-msgstr "Editor rozšírenej konfigurácie"
-
-#: gajim/data/gui/advanced_configuration_window.ui:52
-#, fuzzy
-msgid "You should restart Gajim for some changes to take effect"
-msgstr "<b>POZNÁMKA:</b> Musíte reštartovať Gajim, aby boli použité zmeny"
-
-#: gajim/data/gui/advanced_configuration_window.ui:84
-#, fuzzy
-msgid "_Filter"
-msgstr "Filter:"
-
-#: gajim/data/gui/advanced_configuration_window.ui:153
-#: gajim/data/gui/filetransfers_send_file_dialog.ui:15
-#: gajim/gtk/discovery.py:1666
-msgid "Description"
-msgstr "Popis"
-
-#: gajim/data/gui/advanced_configuration_window.ui:197
-#, fuzzy
-msgid "_Reset to default"
-msgstr "Náv_rat k pôvodnému nastaveniu farieb"
-
 #: gajim/data/gui/join_groupchat_window.ui:56
 #: gajim/data/gui/chat_to_muc_window.ui:67
 #: gajim/data/gui/chat_to_muc_window.ui:78
@@ -5631,9 +5746,8 @@ msgid "Join group chat every time Gajim is started"
 msgstr ""
 
 #: gajim/data/gui/join_groupchat_window.ui:113
-#, fuzzy
-msgid "Auto Join"
-msgstr "Automaticky pripojiť"
+msgid "Join Automatically"
+msgstr ""
 
 #: gajim/data/gui/join_groupchat_window.ui:131
 #: gajim/data/gui/profile_window.ui:233
@@ -5642,10 +5756,11 @@ msgstr "Účet"
 
 #: gajim/data/gui/join_groupchat_window.ui:147
 #, fuzzy
-msgid "Room"
-msgstr "Miestnosť:"
+msgid "Group chat"
+msgstr "Diskuné skupiny"
 
-#: gajim/data/gui/join_groupchat_window.ui:180 gajim/gtk/accounts.py:886
+#: gajim/data/gui/join_groupchat_window.ui:180 gajim/data/gui/bookmarks.ui:158
+#: gajim/gtk/accounts.py:889
 #, fuzzy
 msgid "Password"
 msgstr "Heslo:"
@@ -5669,91 +5784,11 @@ 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:1271
+#: gajim/data/gui/join_groupchat_window.ui:437 gajim/gtk/discovery.py:1270
 #, fuzzy
 msgid "Join"
 msgstr "_Pripojiť"
 
-#: gajim/data/gui/manage_proxies_window.ui:12
-#, fuzzy
-msgid "HTTP Connect"
-msgstr "Pripojený"
-
-#: gajim/data/gui/manage_proxies_window.ui:15
-msgid "SOCKS5"
-msgstr ""
-
-#: gajim/data/gui/manage_proxies_window.ui:18
-msgid "BOSH"
-msgstr ""
-
-#: gajim/data/gui/manage_proxies_window.ui:27
-msgid "Manage Proxy Profiles"
-msgstr "Spravovať Proxy profily"
-
-#: gajim/data/gui/manage_proxies_window.ui:83
-#, fuzzy
-msgid "Add Proxy"
-msgstr "Proxy:"
-
-#: gajim/data/gui/manage_proxies_window.ui:97
-#, fuzzy
-msgid "Remove Proxy"
-msgstr "Odstrániť skupinu"
-
-#: gajim/data/gui/manage_proxies_window.ui:141
-#, fuzzy
-msgid "Properties"
-msgstr "<b>Predvoľby</b>"
-
-#: gajim/data/gui/manage_proxies_window.ui:157
-#, fuzzy
-msgid "_Name"
-msgstr "_Názov:"
-
-#: gajim/data/gui/manage_proxies_window.ui:173
-#, fuzzy
-msgid "_Type"
-msgstr "_Typ:"
-
-#: gajim/data/gui/manage_proxies_window.ui:236
-#, fuzzy
-msgid "_BOSH URL"
-msgstr "_BOSH URL:"
-
-#: gajim/data/gui/manage_proxies_window.ui:261
-msgid "Use HTTP prox_y"
-msgstr "Použiť HTTP prox_y"
-
-#: gajim/data/gui/manage_proxies_window.ui:280
-#, fuzzy
-msgid "Proxy _Host"
-msgstr "_Hostiteľ proxy:"
-
-#: gajim/data/gui/manage_proxies_window.ui:307
-#, fuzzy
-msgid "Proxy _Port"
-msgstr "_Port proxy:"
-
-#: gajim/data/gui/manage_proxies_window.ui:334
-#, fuzzy
-msgid "_Username"
-msgstr "_Používateľské meno:"
-
-#: gajim/data/gui/manage_proxies_window.ui:347
-msgid "Use proxy auth_entication"
-msgstr "Použiť proxy aut_entifikáciu"
-
-#: gajim/data/gui/manage_proxies_window.ui:377
-#, fuzzy
-msgid "Pass_word"
-msgstr "He_slo:"
-
-#: gajim/data/gui/manage_proxies_window.ui:405 gajim/gtk/adhoc.py:321
-#, fuzzy
-msgid "Settings"
-msgstr "Registrácia zlyhala"
-
 #: gajim/data/gui/change_password_dialog.ui:17
 #, fuzzy
 msgid "New Password"
@@ -5784,11 +5819,13 @@ msgid "Status:"
 msgstr "Stav:"
 
 #: gajim/data/gui/zeroconf_information_window.ui:89
-msgid "_Log conversation history"
+#, fuzzy
+msgid "_Store conversation history"
 msgstr "Zaznamenávať históriu k_onverzácie"
 
 #: gajim/data/gui/zeroconf_information_window.ui:215
 #: gajim/data/gui/vcard_information_window.ui:390
+#: gajim/data/gui/groupchat_info_scrolled.ui:166
 msgid "Contact"
 msgstr "Kontakt"
 
@@ -5801,8 +5838,9 @@ msgid "Last Name:"
 msgstr "Posledné meno:"
 
 #: gajim/data/gui/zeroconf_information_window.ui:260
-msgid "Jabber ID:"
-msgstr "Jabber ID:"
+#, fuzzy
+msgid "XMPP Address:"
+msgstr "AIM adresa:"
 
 #: gajim/data/gui/zeroconf_information_window.ui:273
 msgid "E-Mail:"
@@ -5823,8 +5861,8 @@ msgstr "Poslať _súbor"
 
 #: gajim/data/gui/gc_occupants_menu.ui:29
 #, fuzzy
-msgid "Occupant Actions"
-msgstr "Pokročilé akcie"
+msgid "Participant Actions"
+msgstr "Účastníci"
 
 #: gajim/data/gui/gc_occupants_menu.ui:38
 msgid "_Voice"
@@ -5855,8 +5893,9 @@ msgid "_Ban"
 msgstr "_Zakázať"
 
 #: gajim/data/gui/gc_occupants_menu.ui:124
-msgid "_Add to Roster"
-msgstr "_Pridať do zoznamu"
+#, fuzzy
+msgid "_Add to Contact List"
+msgstr "_Pridať kontakt..."
 
 #: gajim/data/gui/gc_occupants_menu.ui:132
 #, fuzzy
@@ -5896,11 +5935,6 @@ msgstr "Zápis: "
 msgid "_Status"
 msgstr "_Stav"
 
-#: gajim/data/gui/zeroconf_context_menu.ui:26
-#: gajim/data/gui/account_context_menu.ui:79
-msgid "_Modify Account..."
-msgstr "_Upraviť účet"
-
 #: gajim/data/gui/certificate_dialog.ui:66
 #: gajim/data/gui/certificate_dialog.ui:178
 msgid "Common Name (CN)"
@@ -5982,13 +6016,19 @@ msgstr "Posledná zmena:"
 msgid "Next entry"
 msgstr ""
 
+#: gajim/data/gui/filetransfers_send_file_dialog.ui:15
+#: gajim/data/gui/advanced_configuration.ui:143
+#: gajim/data/gui/groupchat_info_scrolled.ui:48 gajim/gtk/discovery.py:1663
+msgid "Description"
+msgstr "Popis"
+
 #: gajim/data/gui/filetransfers_send_file_dialog.ui:54
 #, fuzzy
 msgid "_Send Files"
 msgstr "Poslať _súbor"
 
 #: gajim/data/gui/filetransfers_send_file_dialog.ui:58
-#: gajim/gtk/xml_console.py:90
+#: gajim/gtk/xml_console.py:87
 #, fuzzy
 msgid "Send"
 msgstr "_Poslať"
@@ -6013,20 +6053,23 @@ msgid "Change _Nickname..."
 msgstr "Zmeniť p_rezývku..."
 
 #: gajim/data/gui/gc_control_popup_menu.ui:20
-msgid "_Manage Room"
-msgstr "S_pravovať miestnosť"
+#, fuzzy
+msgid "_Manage Group Chat"
+msgstr "_Nová diskusná skupina"
 
 #: gajim/data/gui/gc_control_popup_menu.ui:31
 msgid "Change _Subject..."
 msgstr "Zmeniť _predmet..."
 
 #: gajim/data/gui/gc_control_popup_menu.ui:38
-msgid "Configure _Room..."
-msgstr "Nastaviť _miestnosť..."
+#, fuzzy
+msgid "Configure _Group Chat..."
+msgstr "_Pripojiť sa k diskusnej skupine..."
 
 #: gajim/data/gui/gc_control_popup_menu.ui:52
-msgid "_Destroy Room"
-msgstr "_Zničiť miestnosť"
+#, fuzzy
+msgid "_Destroy Group Chat"
+msgstr "_Nová diskusná skupina"
 
 #: gajim/data/gui/gc_control_popup_menu.ui:64
 msgid "_Minimize on close"
@@ -6037,7 +6080,7 @@ msgstr "_Minimalizovať pri zavretí"
 msgid "_Request Voice"
 msgstr "_Hlas"
 
-#: gajim/data/gui/gc_control_popup_menu.ui:99 gajim/gtk/discovery.py:1704
+#: gajim/data/gui/gc_control_popup_menu.ui:99
 msgid "_Bookmark"
 msgstr "Zálož_ky"
 
@@ -6089,13 +6132,6 @@ msgstr "<b>Domovská stránka:</b>"
 msgid "E-Mail"
 msgstr "E-mail:"
 
-#: 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/blocking_list.ui:115 gajim/gtk/add_contact.py:30
-#: gajim/gtk/accounts.py:801
-msgid "Jabber ID"
-msgstr "Jabber ID"
-
 #: gajim/data/gui/profile_window.ui:440
 msgid "Main"
 msgstr ""
@@ -6228,35 +6264,42 @@ msgstr "Práca"
 msgid "About"
 msgstr "O mne"
 
-#: gajim/data/gui/start_chat_dialog.ui:114 gajim/gtk/discovery.py:1658
-msgid "Users"
-msgstr "Používatelia"
-
-#: gajim/data/gui/start_chat_dialog.ui:185
-msgid "Name:"
-msgstr "Meno:"
+#: gajim/data/gui/start_chat_dialog.ui:53
+#, fuzzy
+msgid "Global Group Chat Search"
+msgstr "Pripojiť sa k diskusnej skupine"
 
-#: gajim/data/gui/start_chat_dialog.ui:197
+#: 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
-msgid "Description:"
-msgstr "Popis:"
+msgid "_Back"
+msgstr "Hneď som späť"
+
+#: gajim/data/gui/start_chat_dialog.ui:245
+#: gajim/data/gui/groupchat_control.ui:796
+#: gajim/data/gui/groupchat_control.ui:888 gajim/gtk/discovery.py:1701
+#: gajim/gtk/groupchat_join.py:62
+msgid "_Join"
+msgstr "_Pripojiť"
 
-#: gajim/data/gui/start_chat_dialog.ui:209
+#: gajim/data/gui/start_chat_dialog.ui:289
 #, fuzzy
-msgid "Address:"
-msgstr "_Adresa:"
+msgid "Select Account"
+msgstr "Odstraňuje sa účet %s"
 
-#: gajim/data/gui/start_chat_dialog.ui:246
-msgid ""
-"Semi-Anonymous\n"
-"<span size=\"small\">(Only moderators can see your XMPP-Address)</span>"
+#: gajim/data/gui/start_chat_dialog.ui:380
+msgid "_Select"
 msgstr ""
 
 #: gajim/data/gui/filetransfers.ui:21
 msgid "Pa_use/Resume"
 msgstr ""
 
-#: gajim/data/gui/filetransfers.ui:30 gajim/gtk/filechoosers.py:178
+#: gajim/data/gui/filetransfers.ui:30 gajim/data/gui/groupchat_control.ui:575
+#: gajim/data/gui/groupchat_control.ui:667
+#: gajim/data/gui/groupchat_control.ui:779
+#: gajim/data/gui/groupchat_control.ui:871 gajim/gtk/filechoosers.py:178
 msgid "_Cancel"
 msgstr "_Zrušiť"
 
@@ -6298,7 +6341,8 @@ msgid "Cancel the selected file transfer and remove incomplete files"
 msgstr "Zrušiť prenos vybraných súborov a odstrániť nekompletné súbory"
 
 #: gajim/data/gui/filetransfers.ui:207
-msgid "Shows a list of file transfers between you and others"
+#, fuzzy
+msgid "Shows a list of file transfers between you and your contacts"
 msgstr "Zobraziť zoznam prenosov súborov medzi vami a ostatnými"
 
 #: gajim/data/gui/groupchat_control.ui:13 gajim/data/gui/chat_control.ui:277
@@ -6318,7 +6362,6 @@ msgid "Strike"
 msgstr "Preškrtnuté"
 
 #: gajim/data/gui/groupchat_control.ui:54 gajim/data/gui/chat_control.ui:318
-#: gajim/gtk/advanced_config.py:86
 msgid "Color"
 msgstr "Farba"
 
@@ -6331,16 +6374,46 @@ msgstr "Písmo"
 msgid "Clear formatting"
 msgstr "Vymazať formátovanie"
 
-#: gajim/data/gui/groupchat_control.ui:290 gajim/data/gui/chat_control.ui:880
+#: gajim/data/gui/groupchat_control.ui:291 gajim/data/gui/chat_control.ui:880
 #, fuzzy
 msgid "Choose encryption"
 msgstr "Vyberte súbor na odoslanie..."
 
-#: gajim/data/gui/groupchat_control.ui:336 gajim/data/gui/chat_control.ui:640
+#: gajim/data/gui/groupchat_control.ui:337 gajim/data/gui/chat_control.ui:640
 #, fuzzy
 msgid "Show a list of emojis (Alt+M)"
 msgstr "Zobraziť zoznam emotikon (Alt+M)"
 
+#: gajim/data/gui/groupchat_control.ui:484
+#, fuzzy
+msgid "Joining…"
+msgstr "Zakazujem..."
+
+#: gajim/data/gui/groupchat_control.ui:496
+msgid "_Abort"
+msgstr ""
+
+#: gajim/data/gui/groupchat_control.ui:542
+#, fuzzy
+msgid "Enter new nickname"
+msgstr "Zadať novú prezývku pre kontakt %s"
+
+#: gajim/data/gui/groupchat_control.ui:592
+#: gajim/data/gui/groupchat_control.ui:684
+#, fuzzy
+msgid "Ch_ange"
+msgstr "Zmeniť p_rezývku..."
+
+#: gajim/data/gui/groupchat_control.ui:761
+#, fuzzy
+msgid "Enter password"
+msgstr "Vložte nové heslo:"
+
+#: gajim/data/gui/groupchat_control.ui:1067
+#, fuzzy
+msgid "_Try again"
+msgstr "Overiť znovu..."
+
 #: gajim/data/gui/popup_notification_window.ui:42
 #, fuzzy
 msgid "Event Type"
@@ -6422,8 +6495,8 @@ msgstr "Preč"
 
 #: gajim/data/gui/mam_preferences.ui:18
 #, fuzzy
-msgid "Roster"
-msgstr "Zobraziť _zoznam"
+msgid "Contact List"
+msgstr "Kontakty"
 
 #: gajim/data/gui/mam_preferences.ui:22
 #: gajim/data/gui/preferences_window.ui:123
@@ -6448,12 +6521,12 @@ msgid "Add"
 msgstr "Pridať"
 
 #: gajim/data/gui/mam_preferences.ui:194 gajim/data/gui/groupchat_config.ui:151
-#: gajim/gtk/dialogs.py:63 gajim/gtk/accounts.py:381
+#: gajim/gtk/dialogs.py:62 gajim/gtk/accounts.py:384
 #, fuzzy
 msgid "Remove"
 msgstr "O_dstrániť"
 
-#: gajim/data/gui/vcard_information_window.ui:72 gajim/gtk/accounts.py:753
+#: gajim/data/gui/vcard_information_window.ui:72 gajim/gtk/accounts.py:756
 #, fuzzy
 msgid "Resource"
 msgstr "Zdroj:"
@@ -6505,6 +6578,7 @@ msgstr "Zápis: "
 #: gajim/data/gui/vcard_information_window.ui:974
 #: gajim/data/gui/vcard_information_window.ui:993
 #: gajim/data/gui/vcard_information_window.ui:1427
+#: gajim/data/gui/groupchat_info_scrolled.ui:222
 msgid "button"
 msgstr ""
 
@@ -6536,15 +6610,15 @@ msgstr "Upozorniť ma, keď sa kontakty _odhlásia"
 
 #: gajim/data/gui/preferences_window.ui:58
 #, fuzzy
-msgid "Show only in roster"
-msgstr "_Zobraziť udalosť v zozname"
+msgid "Show only in contact list"
+msgstr "Zobraziť len _aktívne kontakty"
 
 #: gajim/data/gui/preferences_window.ui:69
-msgid "Detached roster with detached chats"
+msgid "Detached contact list with detached chats"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:72
-msgid "Detached roster with single chat"
+msgid "Detached contact list with single chat"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:75
@@ -6552,11 +6626,11 @@ msgid "Single window for everything"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:78
-msgid "Detached roster with chat grouped by account"
+msgid "Detached contact list with chat grouped by account"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:81
-msgid "Detached roster with chat grouped by type"
+msgid "Detached contact list with chat grouped by type"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:92
@@ -6612,7 +6686,7 @@ msgstr "_Správanie okna:"
 
 #: gajim/data/gui/preferences_window.ui:296
 #, fuzzy
-msgid "_Show roster on startup"
+msgid "_Show contact list on startup"
 msgstr "Zobraziť _zoznam"
 
 #: gajim/data/gui/preferences_window.ui:311
@@ -6628,12 +6702,12 @@ msgid "_Tabs placement"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:363
-msgid "_Quit Gajim when closing roster window"
+msgid "_Quit Gajim when closing contact list"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:367
 msgid ""
-"If enabled, Gajim will quit when closing the roster window instead of "
+"If enabled, Gajim will quit when closing the contact list window instead of "
 "minimizing to the system's notification area"
 msgstr ""
 
@@ -6643,41 +6717,42 @@ msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:423
 #, fuzzy
-msgid "Show a_vatars of contacts in roster"
+msgid "Show a_vatars of contacts in contact list"
 msgstr "Zobraziť a_vatary v zozname kontaktov"
 
 #: gajim/data/gui/preferences_window.ui:427
 #, fuzzy
 msgid ""
-"If checked, avatars of contacts will be shown in the roster window and in "
-"group chats"
+"If checked, avatars of contacts will be shown in the contact list window and "
+"in group chats"
 msgstr ""
 "Ak je zaškrtnuté, Gajim bude zobrazovať avatarov v zozname kontaktov a v "
 "oknách s diskusnými skupinami."
 
 #: gajim/data/gui/preferences_window.ui:441
 #, fuzzy
-msgid "Show status _messages of contacts in roster"
+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
 #, fuzzy
 msgid ""
 "If checked, status messages of contacts will be shown under the contact's "
-"name, in the roster window, and in group chats"
+"name, in the contact list window, and in group chats"
 msgstr ""
 "Ak je zaškrtnuté, Gajim bude zobrazovať správu o stave kontaktov pod menom v "
 "zozname kontaktov a v oknách s diskusnými skupinami"
 
 #: gajim/data/gui/preferences_window.ui:459
 #, fuzzy
-msgid "Show e_xtra information of contacts in roster (mood, activity, ...)"
+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
 msgid ""
-"If checked, additional info published by the contact will be shown in "
-"roster. Additional infos (published via PEP) may include e.g. mood, "
+"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 ""
 
@@ -6687,8 +6762,8 @@ msgstr "Usporiadať kontakty podľa stavu"
 
 #: gajim/data/gui/preferences_window.ui:494
 #, fuzzy
-msgid "in _roster"
-msgstr "Nie je v zozname"
+msgid "in _contact list"
+msgstr "Poslať kontakty:"
 
 #: gajim/data/gui/preferences_window.ui:511
 msgid "in _group chats"
@@ -6696,8 +6771,8 @@ msgstr "v _diskusných skupiných"
 
 #: gajim/data/gui/preferences_window.ui:540
 #, fuzzy
-msgid "Roster Appearance"
-msgstr "<b>Vzhľad zoznamu</b>"
+msgid "Contact List Appearance"
+msgstr "Kontakt odpojený"
 
 #: gajim/data/gui/preferences_window.ui:585
 #, fuzzy
@@ -6764,7 +6839,7 @@ msgstr "Nie je možné pripojiť sa do diskusnej skupiny"
 
 #: gajim/data/gui/preferences_window.ui:660
 #, fuzzy
-msgid "If checked, the room subject will be shown when joining a group chat"
+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:682
@@ -6779,13 +6854,13 @@ msgstr ""
 #: gajim/data/gui/preferences_window.ui:701
 msgid ""
 "If join/leave status messages are shown in the group chat. This setting can "
-"be overridden in the groupchat menu."
+"be overridden in the group chat menu."
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:720
 msgid ""
 "The default sync threshold for new public group chats. This setting can be "
-"overridden in the groupchat menu."
+"overridden in the group chat menu."
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:722
@@ -6800,7 +6875,7 @@ msgstr "_Zaznamenať zmenu stavu kontaktu"
 #: gajim/data/gui/preferences_window.ui:768
 msgid ""
 "If status change messages are shown in the group chat. This setting can be "
-"overridden in the groupchat menu."
+"overridden in the group chat menu."
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:825
@@ -6819,8 +6894,8 @@ msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:843
 #, fuzzy
-msgid "Show chatstate in roster"
-msgstr "Zobraziť a_vatary v zozname kontaktov"
+msgid "Show chatstate in contact list"
+msgstr "Zobraziť zatváracie tlačidlo v karte?"
 
 #: gajim/data/gui/preferences_window.ui:847
 msgid ""
@@ -7131,7 +7206,7 @@ msgstr "Video test"
 msgid "Vi_ew own video source"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2281 gajim/gtk/accounts.py:352
+#: gajim/data/gui/preferences_window.ui:2281 gajim/gtk/accounts.py:355
 msgid "Connection"
 msgstr "Spojenie"
 
@@ -7186,7 +7261,8 @@ msgid "_Manage..."
 msgstr "_Spravovať..."
 
 #: gajim/data/gui/preferences_window.ui:2616
-msgid "_Log status changes of contacts"
+#, fuzzy
+msgid "_Store status changes of contacts in history"
 msgstr "_Zaznamenať zmenu stavu kontaktu"
 
 #: gajim/data/gui/preferences_window.ui:2633
@@ -7211,10 +7287,15 @@ msgstr ""
 msgid "_Open..."
 msgstr "_Otvoriť..."
 
+#: gajim/data/gui/preferences_window.ui:2723 gajim/gtk/advanced_config.py:84
+#, fuzzy
+msgid "Advanced Configuration Editor (ACE)"
+msgstr "Editor rozšírenej konfigurácie"
+
 #: gajim/data/gui/groupchat_config.ui:55
 #, fuzzy
 msgid ""
-"<b>Jabber-ID</b>\n"
+"<b>XMPP Address</b>\n"
 "&lt;user@domain/resource&gt; (only that resource matches)\n"
 "&lt;user@domain&gt; (any resource matches)\n"
 "&lt;domain/resource&gt; (only that resource matches)\n"
@@ -7233,7 +7314,8 @@ msgstr ""
 msgid "Only Admins and Owners can modify the affiliation"
 msgstr ""
 
-#: gajim/data/gui/groupchat_config.ui:270 gajim/plugins/gui.py:312
+#: gajim/data/gui/groupchat_config.ui:270
+#: gajim/data/gui/groupchat_info_scrolled.ui:210 gajim/plugins/gui.py:324
 #, fuzzy
 msgid "Configuration"
 msgstr "Konfigurácia miestnosti"
@@ -7266,7 +7348,7 @@ msgid "Start _Chat"
 msgstr "Začať _rozhovor"
 
 #: gajim/data/gui/contact_context_menu.ui:20
-#: gajim/data/gui/systray_context_menu.ui:36
+#: gajim/data/gui/systray_context_menu.ui:29
 msgid "Send Single _Message..."
 msgstr "Poslať krátku _správu..."
 
@@ -7327,17 +7409,43 @@ msgid "_Ignore"
 msgstr "_Ignorovať"
 
 #: gajim/data/gui/contact_context_menu.ui:174
-msgid "_Add to Roster..."
-msgstr "_Pridať do zoznamu..."
+#, fuzzy
+msgid "_Add to Contact List..."
+msgstr "_Pridať kontakt..."
+
+#: gajim/data/gui/advanced_configuration.ui:39
+#, fuzzy
+msgid "You should restart Gajim for some changes to take effect"
+msgstr "<b>POZNÁMKA:</b> Musíte reštartovať Gajim, aby boli použité zmeny"
+
+#: gajim/data/gui/advanced_configuration.ui:71
+#, fuzzy
+msgid "_Filter"
+msgstr "Filter:"
+
+#: gajim/data/gui/advanced_configuration.ui:88
+msgid "Type to search for values..."
+msgstr ""
+
+#: gajim/data/gui/advanced_configuration.ui:180
+#, fuzzy
+msgid "_Reset Value"
+msgstr "Náv_rat k pôvodnému nastaveniu farieb"
+
+#: gajim/data/gui/advanced_configuration.ui:185
+#, fuzzy
+msgid "Resets value to default"
+msgstr "Náv_rat k pôvodnému nastaveniu farieb"
 
 #: gajim/data/gui/account_creation_wizard_window.ui:43
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim: Pomocník - Tvorba účtu"
 
 #: gajim/data/gui/account_creation_wizard_window.ui:70
+#, fuzzy
 msgid ""
 "You need to have an account in order to connect\n"
-"to the Jabber network."
+"to the XMPP network."
 msgstr ""
 "Potrebujete mať účet, aby ste sa mohli pripojiť\n"
 "do siete Jabber."
@@ -7359,8 +7467,9 @@ msgid "<b>Please fill in the data for your existing account</b>"
 msgstr "<b>Prosím, vyplňte údaje vášho existujúceho účtu</b>"
 
 #: gajim/data/gui/account_creation_wizard_window.ui:187
-msgid "_Jabber ID:"
-msgstr "_Jabber ID:"
+#, fuzzy
+msgid "_XMPP Address:"
+msgstr "AIM adresa:"
 
 #: gajim/data/gui/account_creation_wizard_window.ui:239
 #: gajim/data/gui/account_creation_wizard_window.ui:394
@@ -7447,6 +7556,7 @@ msgid "Privacy Lists:"
 msgstr "Súkromné zoznamy:"
 
 #: gajim/data/gui/service_discovery_window.ui:111
+#: gajim/data/gui/groupchat_creation.ui:227
 #, fuzzy
 msgid "_Address"
 msgstr "_Adresa:"
@@ -7464,11 +7574,6 @@ msgstr "Synchronizovať: vyberte kontakty"
 msgid "Select the contacts you want to synchronise"
 msgstr "Vyberte kontakty, ktoré chcete synchronizovať"
 
-#: gajim/data/gui/groupchat_invitation_received.ui:42
-#, fuzzy
-msgid "Group Chat Invitation"
-msgstr "Pozvánka do diskusnej skupiny"
-
 #: gajim/data/gui/groupchat_invitation_received.ui:111
 #, fuzzy
 msgid "Message..."
@@ -7519,11 +7624,10 @@ msgstr ""
 
 #: gajim/data/gui/add_new_contact_window.ui:84
 #, fuzzy
-msgid "_Jabber ID"
-msgstr "_Jabber ID:"
+msgid "_XMPP Address"
+msgstr "_Adresa:"
 
 #: gajim/data/gui/add_new_contact_window.ui:100
-#: gajim/data/gui/manage_bookmarks_window.ui:192
 #, fuzzy
 msgid "_Nickname"
 msgstr "_Prezývka:"
@@ -7600,7 +7704,7 @@ msgstr "<b>Nálada:</b>"
 msgid "<b>Message:</b>"
 msgstr "<b>Správa:</b>"
 
-#: gajim/data/gui/plugins_window.ui:10 gajim/data/gui/application_menu.ui:90
+#: gajim/data/gui/plugins_window.ui:10 gajim/data/gui/application_menu.ui:87
 msgid "Plugins"
 msgstr ""
 
@@ -7707,10 +7811,6 @@ msgstr "Povoliť"
 msgid "Deny"
 msgstr "Zakázať"
 
-#: gajim/data/gui/privacy_list_window.ui:317
-msgid "JabberID"
-msgstr "JabberID"
-
 #: gajim/data/gui/privacy_list_window.ui:358
 msgid "all in the group"
 msgstr "všetko v skupine"
@@ -7753,7 +7853,7 @@ msgstr "Poradie:"
 msgid "Manage sounds"
 msgstr "Spravovať účty"
 
-#: gajim/data/gui/manage_sounds_window.ui:55 gajim/plugins/gui.py:100
+#: gajim/data/gui/manage_sounds_window.ui:55 gajim/plugins/gui.py:101
 msgid "Active"
 msgstr "Aktívne"
 
@@ -7792,23 +7892,112 @@ msgstr "Odstrániť účet z Gajim aj zo _serveru"
 msgid "_Personal Events"
 msgstr "_Osobné udalosti"
 
-#: gajim/data/gui/account_context_menu.ui:35
-#: gajim/data/gui/systray_context_menu.ui:28
-msgid "Join _Group Chat"
-msgstr "_Pripojiť sa k diskusnej skupine"
-
-#: gajim/data/gui/account_context_menu.ui:49
+#: gajim/data/gui/account_context_menu.ui:41
 msgid "_Add Contact..."
 msgstr "_Pridať kontakt..."
 
-#: gajim/data/gui/account_context_menu.ui:57
+#: gajim/data/gui/account_context_menu.ui:49
 msgid "_Discover Services"
 msgstr "_Preskúmať služby"
 
-#: gajim/data/gui/account_context_menu.ui:65
+#: gajim/data/gui/account_context_menu.ui:57
 msgid "_Execute Command..."
 msgstr "_Vykonať príkaz..."
 
+#: gajim/data/gui/account_context_menu.ui:65
+#, fuzzy
+msgid "_View Certificate"
+msgstr "Certifikát podpísaný sám sebou"
+
+#: gajim/data/gui/manage_proxies.ui:12
+#, fuzzy
+msgctxt "proxy configuration"
+msgid "HTTP Connect"
+msgstr "Pripojený"
+
+#: gajim/data/gui/manage_proxies.ui:15
+msgctxt "proxy configuration"
+msgid "SOCKS5"
+msgstr ""
+
+#: gajim/data/gui/manage_proxies.ui:18
+#, fuzzy
+msgctxt "proxy configuration"
+msgid "BOSH"
+msgstr "_BOSH URL:"
+
+#: gajim/data/gui/manage_proxies.ui:68
+#, fuzzy
+msgid "Add Proxy"
+msgstr "Proxy:"
+
+#: gajim/data/gui/manage_proxies.ui:82
+#, fuzzy
+msgid "Remove Proxy"
+msgstr "Odstrániť skupinu"
+
+#: gajim/data/gui/manage_proxies.ui:134
+#, fuzzy
+msgid "Pass_word"
+msgstr "He_slo:"
+
+#: gajim/data/gui/manage_proxies.ui:159
+msgid "Use proxy auth_entication"
+msgstr "Použiť proxy aut_entifikáciu"
+
+#: gajim/data/gui/manage_proxies.ui:179
+#, fuzzy
+msgid "_Username"
+msgstr "_Používateľské meno:"
+
+#: gajim/data/gui/manage_proxies.ui:209
+#, fuzzy
+msgid "_Port"
+msgstr "_Port:"
+
+#: gajim/data/gui/manage_proxies.ui:226
+msgid "example.org"
+msgstr ""
+
+#: gajim/data/gui/manage_proxies.ui:240
+#, fuzzy
+msgid "_Host"
+msgstr "_Hostiteľ:"
+
+#: gajim/data/gui/manage_proxies.ui:254
+msgid "Use HTTP prox_y"
+msgstr "Použiť HTTP prox_y"
+
+#: gajim/data/gui/manage_proxies.ui:275
+msgid "https://example.org/http-bind/"
+msgstr ""
+
+#: gajim/data/gui/manage_proxies.ui:291
+#, fuzzy
+msgid "_BOSH URL"
+msgstr "_BOSH URL:"
+
+#: gajim/data/gui/manage_proxies.ui:309 gajim/gtk/adhoc.py:322
+#, fuzzy
+msgid "Settings"
+msgstr "Registrácia zlyhala"
+
+#: gajim/data/gui/manage_proxies.ui:344
+#, fuzzy
+msgid "_Type"
+msgstr "_Typ:"
+
+#: gajim/data/gui/manage_proxies.ui:361
+#: gajim/data/gui/groupchat_creation.ui:105
+#, fuzzy
+msgid "_Name"
+msgstr "_Názov:"
+
+#: gajim/data/gui/manage_proxies.ui:391 gajim/gtk/accounts.py:742
+#, fuzzy
+msgid "Proxy"
+msgstr "Proxy:"
+
 #: gajim/data/gui/application_menu.ui:8
 #, fuzzy
 msgid "View"
@@ -7816,8 +8005,8 @@ msgstr "_Zobraziť"
 
 #: gajim/data/gui/application_menu.ui:11
 #, fuzzy
-msgid "Show Roster"
-msgstr "Zobraziť _zoznam"
+msgid "Show Contact List"
+msgstr "Zobraziť len _aktívne kontakty"
 
 #: gajim/data/gui/application_menu.ui:16
 #, fuzzy
@@ -7858,23 +8047,24 @@ msgstr ""
 msgid "Features"
 msgstr "Funkcie"
 
-#: gajim/data/gui/application_menu.ui:81
+#: gajim/data/gui/application_menu.ui:77
+#: gajim/data/gui/groupchat_creation.ui:81 gajim/gtk/groupchat_creation.py:45
 #, fuzzy
-msgid "Bookmarks"
-msgstr "Zálož_ky"
+msgid "Create Group Chat"
+msgstr "Opustiť diskusnú skupinu"
 
-#: gajim/data/gui/application_menu.ui:94 gajim/data/gui/shortcuts_window.ui:189
-#: gajim/gtk/preferences.py:59
+#: gajim/data/gui/application_menu.ui:91 gajim/data/gui/shortcuts_window.ui:189
+#: gajim/gtk/preferences.py:58
 msgid "Preferences"
 msgstr "Predvoľby"
 
-#: gajim/data/gui/application_menu.ui:99
+#: gajim/data/gui/application_menu.ui:96
 #, fuzzy
 msgid "Quit"
 msgstr "_Koniec"
 
 #: gajim/data/gui/httpupload_progress_dialog.ui:110
-#: gajim/gtk/filetransfer.py:121
+#: gajim/gtk/filetransfer.py:120
 msgid "Progress"
 msgstr "Stav"
 
@@ -7891,52 +8081,33 @@ msgstr ""
 msgid "_Cancel Upload"
 msgstr "_Zrušiť"
 
-#: gajim/data/gui/manage_bookmarks_window.ui:13
-#, fuzzy
-msgid "Group Chat Bookmarks"
-msgstr "_Diskusná skupina"
-
-#: gajim/data/gui/manage_bookmarks_window.ui:68
-#, fuzzy
-msgid "Add Bookmark"
-msgstr "Zálož_ky"
-
-#: gajim/data/gui/manage_bookmarks_window.ui:82
-#, fuzzy
-msgid "Remove Bookmark"
-msgstr "Zálož_ky"
+#: gajim/data/gui/groupchat_creation.ui:27
+msgid "Public or Private?"
+msgstr ""
 
-#: gajim/data/gui/manage_bookmarks_window.ui:126
-msgid "N_ame"
+#: 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 ""
 
-#: gajim/data/gui/manage_bookmarks_window.ui:145
-#, fuzzy
-msgid "Bookmark Name"
-msgstr "Zazáložkovať túto miestnosť"
+#: gajim/data/gui/groupchat_creation.ui:58
+msgid "<b>Public:</b> Anyone who knows the address can join."
+msgstr ""
 
-#: gajim/data/gui/manage_bookmarks_window.ui:160
+#: gajim/data/gui/groupchat_creation.ui:122
 #, fuzzy
-msgid "_Server"
-msgstr "_Server:"
+msgid "_Description"
+msgstr "Popis"
 
-#: gajim/data/gui/manage_bookmarks_window.ui:223
-msgid "Roo_m"
+#: gajim/data/gui/groupchat_creation.ui:164
+msgid "_Public"
 msgstr ""
 
-#: gajim/data/gui/manage_bookmarks_window.ui:253
+#: gajim/data/gui/groupchat_creation.ui:278
 #, fuzzy
-msgid "_Password"
-msgstr "_Heslo:"
-
-#: gajim/data/gui/manage_bookmarks_window.ui:299
-#, fuzzy
-msgid "Join chat when connected"
-msgstr "Kontakt odpojený"
-
-#: gajim/data/gui/manage_bookmarks_window.ui:307
-msgid "_Join Automatically"
-msgstr ""
+msgid "_Account"
+msgstr "Úč_ty"
 
 #: gajim/data/gui/exception_dialog.ui:49
 msgid "Sorry, that should not have happened"
@@ -7977,6 +8148,29 @@ msgstr ""
 msgid "Presets"
 msgstr "_Prítomnosť"
 
+#: gajim/data/gui/groupchat_info_scrolled.ui:32
+#, fuzzy
+msgid "Address"
+msgstr "_Adresa:"
+
+#: gajim/data/gui/groupchat_info_scrolled.ui:64
+msgid "Topic"
+msgstr ""
+
+#: gajim/data/gui/groupchat_info_scrolled.ui:80
+#, fuzzy
+msgid "Author"
+msgstr "Au_torizovať"
+
+#: gajim/data/gui/groupchat_info_scrolled.ui:182
+msgid "Discussion Logs"
+msgstr ""
+
+#: gajim/data/gui/groupchat_info_scrolled.ui:260
+#, fuzzy
+msgid "Group Chat Language"
+msgstr "Pozvánka do diskusnej skupiny"
+
 #: gajim/data/gui/emoji_chooser.ui:98
 #, fuzzy
 msgid "No Results Found"
@@ -7989,22 +8183,33 @@ msgstr "Pozvať priateľov!"
 #: gajim/data/gui/chat_to_muc_window.ui:39
 #, fuzzy
 msgid ""
-"You are now entering a groupchat.\n"
+"You are now entering a group chat.\n"
 "Select the contacts you want to invite"
 msgstr "Vyberte kontakty, ktoré chcete synchronizovať"
 
 #: gajim/data/gui/chat_to_muc_window.ui:112
-msgid "Please select a MUC server."
+#, fuzzy
+msgid "Please select a group chat server."
 msgstr "Prosím, zvolte MUC server."
 
 #: gajim/data/gui/chat_to_muc_window.ui:141
-msgid "MUC server"
-msgstr "MUC server"
+#, fuzzy
+msgid "Group chat server"
+msgstr "Diskuné skupiny"
 
 #: gajim/data/gui/chat_to_muc_window.ui:176
 msgid "In_vite"
 msgstr "Poz_vať"
 
+#: gajim/data/gui/bookmarks.ui:176
+#, fuzzy
+msgid "Autojoin"
+msgstr "Automaticky pripojiť"
+
+#: gajim/data/gui/bookmarks.ui:211
+msgid "_Apply"
+msgstr ""
+
 #: gajim/data/gui/history_manager.ui:11
 #, fuzzy
 msgid "_Export"
@@ -8020,12 +8225,13 @@ msgid "Gajim History Logs Manager"
 msgstr "Gajim - správca histórie"
 
 #: gajim/data/gui/history_manager.ui:108
+#, fuzzy
 msgid ""
-"This log manager is not intended for log viewing. If you are looking for "
-"such functionality, use the history window instead.\n"
+"This history manager is not intended for viewing chat history. If you are "
+"looking for such functionality, please use the history window instead.\n"
 "\n"
-"Use this program to delete or export logs. You can select logs from the left "
-"and/or search database from below."
+"You can use this program to delete or export history. Either select logs "
+"from the left or search the database."
 msgstr ""
 "Tento správca záznamov nie je určený k prezeraniu záznamov. Ak hľadáte "
 "lepšiu funkčnosť, použite na to určené okno histórie.\n"
@@ -8078,8 +8284,9 @@ msgid "Select an emoji"
 msgstr ""
 
 #: gajim/data/gui/shortcuts_window.ui:38
-msgid "Complete a command or a nick"
-msgstr ""
+#, fuzzy
+msgid "Complete a command or a nickname"
+msgstr "Vytvorte, prosím, čisto novú tému z vami požadovaným názvom."
 
 #: gajim/data/gui/shortcuts_window.ui:45
 #, fuzzy
@@ -8119,7 +8326,7 @@ msgstr ""
 msgid "Scroll down"
 msgstr ""
 
-#: gajim/data/gui/shortcuts_window.ui:100 gajim/gtk/xml_console.py:72
+#: gajim/data/gui/shortcuts_window.ui:100 gajim/gtk/xml_console.py:69
 #, fuzzy
 msgid "Clear"
 msgstr "Upratujem"
@@ -8162,8 +8369,9 @@ msgid "Close chat"
 msgstr "Zavrieť"
 
 #: gajim/data/gui/shortcuts_window.ui:173
-msgid "Roster Shortcuts"
-msgstr ""
+#, fuzzy
+msgid "Contact List Shortcuts"
+msgstr "Kontakt odpojený"
 
 #: gajim/data/gui/shortcuts_window.ui:196
 #, fuzzy
@@ -8196,7 +8404,7 @@ msgid "Show only active contacts"
 msgstr "Zobraziť len _aktívne kontakty"
 
 #: gajim/data/gui/shortcuts_window.ui:251
-msgid "Enable roster filtering"
+msgid "Enable contact list filtering"
 msgstr ""
 
 #: gajim/data/gui/shortcuts_window.ui:259
@@ -8243,12 +8451,12 @@ msgstr ""
 
 #: gajim/data/gui/history_window.ui:317
 #, fuzzy
-msgid "Record history for this chat"
+msgid "Store history for this chat"
 msgstr "Ignorovať túto chybu pre tento certifikát."
 
 #: gajim/data/gui/history_window.ui:332
 #, fuzzy
-msgid "Record History"
+msgid "Store History"
 msgstr "Posledné:"
 
 #: gajim/data/gui/history_window.ui:350
@@ -8269,9 +8477,10 @@ msgstr "Vytvoriť novú správu"
 msgid "Fill in the form."
 msgstr "Vyplňte formulár."
 
-#: gajim/data/gui/data_form_window.ui:229
-msgid "Room Configuration"
-msgstr "Konfigurácia miestnosti"
+#: gajim/data/gui/data_form_window.ui:229 gajim/gtk/groupchat_config.py:41
+#, fuzzy
+msgid "Group Chat Configuration"
+msgstr "Pozvánka do diskusnej skupiny"
 
 #: gajim/data/gui/roster_item_exchange_window.ui:39
 #: gajim/gtk/roster_item_exchange.py:35
@@ -8292,15 +8501,15 @@ msgstr "S_tav"
 msgid "_Start Chat..."
 msgstr "_Začať rozhovor..."
 
-#: gajim/data/gui/systray_context_menu.ui:50
+#: gajim/data/gui/systray_context_menu.ui:43
 msgid "Show All Pending _Events"
 msgstr "Zobraziť všetky čakajúce _udalosti"
 
-#: gajim/data/gui/systray_context_menu.ui:59
+#: gajim/data/gui/systray_context_menu.ui:52
 msgid "Mute Sounds"
 msgstr "Stlmiť zvuky"
 
-#: gajim/data/gui/systray_context_menu.ui:75
+#: gajim/data/gui/systray_context_menu.ui:68
 #, fuzzy
 msgid "_Preferences"
 msgstr "Predvoľby"
@@ -8392,34 +8601,34 @@ msgstr ""
 msgid "Execute expression inside a shell, send output"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:45
+#: gajim/command_system/implementation/standard.py:47
 msgid ""
 "Show help on a given command or a list of available commands if -a is given"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:73
+#: gajim/command_system/implementation/standard.py:75
 #, fuzzy
 msgid "Send a message to the contact"
 msgstr "Použitie: /%s, pošle správu kontaktu"
 
-#: gajim/command_system/implementation/standard.py:78
+#: gajim/command_system/implementation/standard.py:80
 msgid "Send action (in the third person) to the current chat"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:83
+#: gajim/command_system/implementation/standard.py:85
 msgid "Show logged messages which mention given text"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:88
+#: gajim/command_system/implementation/standard.py:90
 #, fuzzy, python-format
 msgid "%s: Nothing found"
 msgstr "%s nenájdený"
 
-#: gajim/command_system/implementation/standard.py:94
+#: gajim/command_system/implementation/standard.py:96
 msgid "Limit must be an integer"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:118
+#: gajim/command_system/implementation/standard.py:120
 msgid ""
 "\n"
 "    Set the current status\n"
@@ -8429,131 +8638,133 @@ msgid ""
 "    "
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:136
+#: gajim/command_system/implementation/standard.py:138
 msgid "Set the current status to away"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:150
+#: gajim/command_system/implementation/standard.py:152
 msgid "Set the current status to online"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:153
+#: gajim/command_system/implementation/standard.py:155
 #, fuzzy
 msgid "Available"
 msgstr "_Prítomný"
 
-#: gajim/command_system/implementation/standard.py:173
-#: gajim/command_system/implementation/standard.py:250
+#: gajim/command_system/implementation/standard.py:175
+#: gajim/command_system/implementation/standard.py:252
 #, fuzzy
 msgid "Clear the text window"
 msgstr "Použitie: /%s, vyčistí textové okno."
 
-#: gajim/command_system/implementation/standard.py:178
-#: gajim/command_system/implementation/standard.py:397
+#: gajim/command_system/implementation/standard.py:180
+#: gajim/command_system/implementation/standard.py:401
 #, fuzzy
 msgid "Send a ping to the contact"
 msgstr "Použitie: /%s, pošle ping kontaktu"
 
-#: gajim/command_system/implementation/standard.py:181
-#: gajim/command_system/implementation/standard.py:400
+#: gajim/command_system/implementation/standard.py:183
+#: gajim/command_system/implementation/standard.py:404
 msgid "Command is not supported for zeroconf accounts"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:185
-msgid "Send DTMF sequence through an open audio session"
+#: gajim/command_system/implementation/standard.py:187
+msgid "Send DTMF sequence through an open voice chat"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:188
-msgid "No open audio sessions with the contact"
-msgstr ""
+#: gajim/command_system/implementation/standard.py:190
+#, fuzzy
+msgid "No open voice chats with the contact"
+msgstr "okno/karta bola otvorená s týmto kontaktom "
 
-#: gajim/command_system/implementation/standard.py:191
+#: gajim/command_system/implementation/standard.py:193
 #, python-format
 msgid "%s is not a valid tone"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:198
-msgid "Toggle audio session"
-msgstr "Prepnúť zvukovú reláciu"
+#: gajim/command_system/implementation/standard.py:200
+msgid "Toggle Voice Chat"
+msgstr ""
 
-#: gajim/command_system/implementation/standard.py:201
+#: gajim/command_system/implementation/standard.py:203
 #, fuzzy
-msgid "Audio sessions are not available"
+msgid "Voice chats are not available"
 msgstr "Pripojenie nie je dostupné"
 
-#: gajim/command_system/implementation/standard.py:208
-msgid "Toggle video session"
+#: gajim/command_system/implementation/standard.py:210
+#, fuzzy
+msgid "Toggle Video Chat"
 msgstr "Prepnúť video reláciu"
 
-#: gajim/command_system/implementation/standard.py:211
+#: gajim/command_system/implementation/standard.py:213
 #, fuzzy
-msgid "Video sessions are not available"
+msgid "Video chats are not available"
 msgstr "Pripojenie nie je dostupné"
 
-#: gajim/command_system/implementation/standard.py:218
+#: gajim/command_system/implementation/standard.py:220
 #, fuzzy
 msgid "Send a message to the contact that will attract their attention"
 msgstr "Použitie: /%s, pošle správu kontaktu"
 
-#: gajim/command_system/implementation/standard.py:255
+#: gajim/command_system/implementation/standard.py:257
 #, fuzzy
 msgid "Change your nickname in a group chat"
 msgstr "Zmeniť vašu prezývku (Ctrl+N)"
 
-#: gajim/command_system/implementation/standard.py:260 gajim/gtk/dialogs.py:674
-#: gajim/gtk/bookmarks.py:272
+#: gajim/command_system/implementation/standard.py:262
 msgid "Invalid nickname"
 msgstr "Neplatná prezývka"
 
-#: gajim/command_system/implementation/standard.py:267
+#: gajim/command_system/implementation/standard.py:269
 #, fuzzy
-msgid "Open a private chat window with a specified occupant"
+msgid "Open a private chat window with a specified participant"
 msgstr ""
 "Použite: /%s <prezývka>, otvorí okno sukromného rozhovoru s určeným "
 "používateľom."
 
-#: gajim/command_system/implementation/standard.py:273
-#: gajim/command_system/implementation/standard.py:282
-#: gajim/command_system/implementation/standard.py:332
-#: gajim/command_system/implementation/standard.py:345
-#: gajim/command_system/implementation/standard.py:357
+#: gajim/command_system/implementation/standard.py:275
+#: gajim/command_system/implementation/standard.py:284
+#: gajim/command_system/implementation/standard.py:336
+#: gajim/command_system/implementation/standard.py:349
+#: gajim/command_system/implementation/standard.py:361
 #, fuzzy
 msgid "Nickname not found"
 msgstr "Prezývka nenájdená: %s"
 
-#: gajim/command_system/implementation/standard.py:276
+#: gajim/command_system/implementation/standard.py:278
 #, fuzzy
 msgid ""
-"Open a private chat window with a specified occupant and send him a message"
+"Open a private chat window with a specified participant and send him a "
+"message"
 msgstr ""
 "Použite: /%s <prezývka>, otvorí okno sukromného rozhovoru s určeným "
 "používateľom."
 
-#: gajim/command_system/implementation/standard.py:285
+#: gajim/command_system/implementation/standard.py:287
 #, fuzzy
 msgid "Display or change a group chat topic"
 msgstr "Spýtať sa pred zatvorením okna/záložky pre diskusnú skupinu."
 
-#: gajim/command_system/implementation/standard.py:294
-msgid "Invite a user to a room for a reason"
+#: gajim/command_system/implementation/standard.py:296
+msgid "Invite a user to a group chat for a reason"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:297
+#: gajim/command_system/implementation/standard.py:299
 #, fuzzy, python-format
 msgid "Invited %(jid)s to %(room_jid)s"
 msgstr "Pozvaný %(contact_jid)s do %(room_jid)s."
 
-#: gajim/command_system/implementation/standard.py:301
+#: gajim/command_system/implementation/standard.py:303
 #, fuzzy
-msgid "Join a group chat given by a JID"
+msgid "Join a group chat given by an XMPP Address"
 msgstr "v _diskusných skupiných"
 
-#: gajim/command_system/implementation/standard.py:309
+#: gajim/command_system/implementation/standard.py:313
 msgid ""
-"Leave the groupchat, optionally giving a reason, and close tab or window"
+"Leave the group chat, optionally giving a reason, and close tab or window"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:314
+#: gajim/command_system/implementation/standard.py:318
 msgid ""
 "\n"
 "    Ban user by a nick or a JID from a groupchat\n"
@@ -8562,46 +8773,46 @@ msgid ""
 "    "
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:329
+#: gajim/command_system/implementation/standard.py:333
 #, fuzzy
-msgid "Kick user by a nick from a groupchat"
+msgid "Kick user by a nick from a group chat"
 msgstr "Ste pozvaný do diskusnej skupiny"
 
-#: gajim/command_system/implementation/standard.py:338
+#: gajim/command_system/implementation/standard.py:342
 msgid ""
-"Set occupant role in group chat.\n"
+"Set participant role in group chat.\n"
 "    Role can be given as one of the following values:\n"
 "    moderator, participant, visitor, none"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:343
+#: gajim/command_system/implementation/standard.py:347
 #, fuzzy
 msgid "Invalid role given"
 msgstr "Neplatný server"
 
-#: gajim/command_system/implementation/standard.py:350
+#: gajim/command_system/implementation/standard.py:354
 msgid ""
-"Set occupant affiliation in group chat.\n"
+"Set participant affiliation in group chat.\n"
 "    Affiliation can be given as one of the following values:\n"
 "    owner, admin, member, outcast, none"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:355
+#: gajim/command_system/implementation/standard.py:359
 #, fuzzy
 msgid "Invalid affiliation given"
 msgstr "príslušnosť zmenená"
 
-#: gajim/command_system/implementation/standard.py:365
+#: gajim/command_system/implementation/standard.py:369
 #, fuzzy
-msgid "Display names of all group chat occupants"
+msgid "Display names of all group chat participants"
 msgstr "Použitie: /%s , zobrazí mená členov v diskusnej skupine."
 
-#: gajim/command_system/implementation/standard.py:387
-msgid "Forbid an occupant to send you public or private messages"
+#: gajim/command_system/implementation/standard.py:391
+msgid "Forbid a participant to send you public or private messages"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:392
-msgid "Allow an occupant to send you public or private messages"
+#: gajim/command_system/implementation/standard.py:396
+msgid "Allow a participant to send you public or private messages"
 msgstr ""
 
 #: gajim/command_system/implementation/middleware.py:74
@@ -8612,204 +8823,329 @@ msgstr ""
 msgid "The same as using a doc-string, except it supports translation"
 msgstr ""
 
-#: gajim/gtk/filetransfer.py:91
+#: gajim/gtk/groupchat_info.py:36
+#, fuzzy
+msgid "?Group chat feature:Archiving"
+msgstr "Pozvánka do diskusnej skupiny"
+
+#: gajim/gtk/groupchat_info.py:37
+#, fuzzy
+msgid "Messages are archived on the server"
+msgstr "Relácia NEBUDE zaznamenaná"
+
+#: gajim/gtk/groupchat_info.py:40
+#, fuzzy
+msgid "?Group chat feature:Persistent"
+msgstr "Diskuné skupiny"
+
+#: gajim/gtk/groupchat_info.py:41
+msgid "This group chat persists even if there are no participants"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:45
+#, fuzzy
+msgid "?Group chat feature:Temporary"
+msgstr "?Rola kontaktu v diskusnej skupine: žiadna"
+
+#: gajim/gtk/groupchat_info.py:46
+msgid "This group chat will be destroyed once the last participant left"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:50
+#, fuzzy
+msgid "?Group chat feature:Moderated"
+msgstr "?Rola kontaktu v diskusnej skupine: žiadna"
+
+#: gajim/gtk/groupchat_info.py:51
+msgid ""
+"Participants entering this group chat need to request permission to send "
+"messages"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:55
+#, fuzzy
+msgid "?Group chat feature:Not Moderated"
+msgstr "Diskuné skupiny"
+
+#: gajim/gtk/groupchat_info.py:56
+msgid "Participants entering this group chat are allowed to send messages"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:60
+#, fuzzy
+msgid "?Group chat feature:Open"
+msgstr "?Rola kontaktu v diskusnej skupine: žiadna"
+
+#: gajim/gtk/groupchat_info.py:61
+#, fuzzy
+msgid "Anyone can join this group chat"
+msgstr "%s sa pripojil do diskusnej skupiny"
+
+#: gajim/gtk/groupchat_info.py:64
+#, fuzzy
+msgid "?Group chat feature:Members Only"
+msgstr "Zvýraznenie správ v diskusnej skupine"
+
+#: gajim/gtk/groupchat_info.py:65
+msgid "This group chat is restricted to members only"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:69
+#, fuzzy
+msgid "?Group chat feature:Public"
+msgstr "Zvýraznenie správ v diskusnej skupine"
+
+#: gajim/gtk/groupchat_info.py:70
+msgid "Group chat can be found via search"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:73
+#, fuzzy
+msgid "?Group chat feature:Hidden"
+msgstr "?Rola kontaktu v diskusnej skupine: žiadna"
+
+#: gajim/gtk/groupchat_info.py:74
+#, fuzzy
+msgid "This group chat can not be found via search"
+msgstr "Diskusná skupina nemá nastavený predmet"
+
+#: gajim/gtk/groupchat_info.py:77
+#, fuzzy
+msgid "?Group chat feature:Not Anonymous"
+msgstr "Diskuné skupiny"
+
+#: gajim/gtk/groupchat_info.py:78
+msgid "All other group chat participants can see your XMPP address"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:82
+#, fuzzy
+msgid "?Group chat feature:Semi-Anonymous"
+msgstr "Zvýraznenie správ v diskusnej skupine"
+
+#: gajim/gtk/groupchat_info.py:83
+msgid "Only moderators can see your XMPP address"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:86
+#, fuzzy
+msgid "?Group chat feature:Password Required"
+msgstr "Diskuné skupiny"
+
+#: gajim/gtk/groupchat_info.py:87
+msgid "This group chat does require a password upon entry"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:91
+#, fuzzy
+msgid "?Group chat feature:No Password Required"
+msgstr "Diskuné skupiny"
+
+#: gajim/gtk/groupchat_info.py:92
+msgid "This group chat does not require a password upon entry"
+msgstr ""
+
+#: gajim/gtk/filetransfer.py:90
 msgid "File"
 msgstr "Súbor"
 
-#: gajim/gtk/filetransfer.py:108
+#: gajim/gtk/filetransfer.py:107
 msgid "Time"
 msgstr "Čas"
 
-#: gajim/gtk/filetransfer.py:228
+#: gajim/gtk/filetransfer.py:227
 #, fuzzy, python-format
 msgid "File name: %s"
 msgstr "Názov súboru: %s"
 
-#: gajim/gtk/filetransfer.py:229 gajim/gtk/filetransfer.py:464
+#: gajim/gtk/filetransfer.py:228 gajim/gtk/filetransfer.py:469
 #, python-format
 msgid "Size: %s"
 msgstr "Veľkosť: %s"
 
-#: gajim/gtk/filetransfer.py:239
+#: gajim/gtk/filetransfer.py:238
 #, python-format
 msgid "Sender: %s"
 msgstr "Odosielateľ: %s"
 
-#: gajim/gtk/filetransfer.py:240 gajim/gtk/filetransfer.py:744
+#: gajim/gtk/filetransfer.py:239 gajim/gtk/filetransfer.py:749
 #: gajim/gtk/tooltips.py:577
 msgid "Recipient: "
 msgstr "Príjemca: "
 
-#: gajim/gtk/filetransfer.py:251
+#: gajim/gtk/filetransfer.py:250
 #, python-format
 msgid "Saved in: %s"
 msgstr "Uložené do: %s"
 
-#: gajim/gtk/filetransfer.py:256
+#: gajim/gtk/filetransfer.py:255
 msgid "File transfer completed"
 msgstr "Prenos súboru dokončený"
 
-#: gajim/gtk/filetransfer.py:276 gajim/gtk/filetransfer.py:285
+#: gajim/gtk/filetransfer.py:275 gajim/gtk/filetransfer.py:284
 #, fuzzy
 msgid "Connection with peer could not be established."
 msgstr "Spojenie s druhou stranou nie je možné nadviazať."
 
-#: gajim/gtk/filetransfer.py:293
+#: gajim/gtk/filetransfer.py:292
 #, python-format
 msgid "Filename: %s"
 msgstr "Názov súboru: %s"
 
-#: gajim/gtk/filetransfer.py:294
+#: gajim/gtk/filetransfer.py:293
 #, python-format
 msgid "Recipient: %s"
 msgstr "Príjemca: %s"
 
-#: gajim/gtk/filetransfer.py:296
+#: gajim/gtk/filetransfer.py:295
 #, python-format
 msgid "Error message: %s"
 msgstr "Chybová správa: %s"
 
-#: gajim/gtk/filetransfer.py:333
-#, fuzzy
-msgid "File transfer error"
-msgstr "Chyba pri prenose súboru"
-
 #: gajim/gtk/filetransfer.py:334
 #, python-format
 msgid ""
-"The file %(file)s has been received, but it seems to have been damaged along "
-"the way.\n"
+"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 ""
 
-#: gajim/gtk/filetransfer.py:350
+#: gajim/gtk/filetransfer.py:340
+#, fuzzy
+msgid "_Download Again"
+msgstr "Znovu sa už _nepýtať"
+
+#: gajim/gtk/filetransfer.py:355
 #, fuzzy
 msgid "Gajim can not read this file"
 msgstr "Gajim nemôže pristupovať k tomuto súboru"
 
-#: gajim/gtk/filetransfer.py:351
+#: gajim/gtk/filetransfer.py:356
 msgid "Another process is using this file."
 msgstr ""
 
-#: gajim/gtk/filetransfer.py:418
+#: gajim/gtk/filetransfer.py:423
 #, fuzzy
 msgid "File Transfer Conflict"
 msgstr "Prenos súboru dokončený"
 
-#: gajim/gtk/filetransfer.py:419
+#: gajim/gtk/filetransfer.py:424
 msgid "This file already exists"
 msgstr "Tento súbor už existuje"
 
-#: gajim/gtk/filetransfer.py:420
+#: gajim/gtk/filetransfer.py:425
 msgid "Resume download or replace file?"
 msgstr ""
 
-#: gajim/gtk/filetransfer.py:424
+#: gajim/gtk/filetransfer.py:429
 #, fuzzy
 msgid "Replace _File"
 msgstr "Upratujem"
 
-#: gajim/gtk/filetransfer.py:427
+#: gajim/gtk/filetransfer.py:432
 #, fuzzy
 msgid "Resume _Download"
 msgstr "Stiahnuť"
 
-#: gajim/gtk/filetransfer.py:437
+#: gajim/gtk/filetransfer.py:442
 #, fuzzy, python-format
 msgid "Directory '%s' is not writable"
 msgstr "Do priečinku \"%s\" nie je možné zapisovať"
 
-#: gajim/gtk/filetransfer.py:438
+#: gajim/gtk/filetransfer.py:443
 #, fuzzy
 msgid "You do not have permissions to create files in this directory."
 msgstr "Nemáte oprávnenie vytvoriť súbor v tomto priečinku."
 
-#: gajim/gtk/filetransfer.py:461
+#: gajim/gtk/filetransfer.py:466
 #, python-format
 msgid "File: %s"
 msgstr "Súbor: %s"
 
-#: gajim/gtk/filetransfer.py:467
+#: gajim/gtk/filetransfer.py:472
 #, python-format
 msgid "Type: %s"
 msgstr "Typ: %s"
 
-#: gajim/gtk/filetransfer.py:469
+#: gajim/gtk/filetransfer.py:474
 #, python-format
 msgid "Description: %s"
 msgstr "Popis: %s"
 
-#: gajim/gtk/filetransfer.py:480
+#: gajim/gtk/filetransfer.py:485
 #, fuzzy, python-format
 msgid "%s wants to send you a file"
 msgstr "%s vám chce poslať súbor."
 
-#: gajim/gtk/filetransfer.py:509
+#: gajim/gtk/filetransfer.py:514
 #, fuzzy
 msgid "Checking file…"
 msgstr "Odosielanie profilu..."
 
-#: gajim/gtk/filetransfer.py:524
+#: gajim/gtk/filetransfer.py:529
 #, fuzzy
 msgid "File error"
 msgstr "Chyba pri prenose súboru"
 
-#: gajim/gtk/filetransfer.py:561
+#: gajim/gtk/filetransfer.py:566
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 
-#: gajim/gtk/filetransfer.py:658
+#: gajim/gtk/filetransfer.py:663
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/s)"
 
-#: gajim/gtk/filetransfer.py:711 gajim/gtk/filetransfer.py:715
+#: gajim/gtk/filetransfer.py:716 gajim/gtk/filetransfer.py:720
 msgid "Invalid File"
 msgstr "Nesprávny súbor"
 
-#: gajim/gtk/filetransfer.py:711
+#: gajim/gtk/filetransfer.py:716
 msgid "File: "
 msgstr "Súbor:"
 
-#: gajim/gtk/filetransfer.py:716
+#: gajim/gtk/filetransfer.py:721
 msgid "It is not possible to send empty files"
 msgstr "Nie je možné poslať prázdne súbory"
 
-#: gajim/gtk/filetransfer.py:742 gajim/gtk/tooltips.py:571
+#: gajim/gtk/filetransfer.py:747 gajim/gtk/tooltips.py:571
 msgid "Sender: "
 msgstr "Odosielateľ: "
 
-#: gajim/gtk/filetransfer.py:1038
+#: gajim/gtk/filetransfer.py:1043
 #, fuzzy
 msgid "Choose a File to Send…"
 msgstr "Vyberte súbor na odoslanie..."
 
 #: gajim/gtk/start_chat.py:51
 #, fuzzy
-msgid "Start new Conversation"
+msgid "Start New Conversation"
 msgstr "Pokračovanie rozhovoru"
 
-#: gajim/gtk/start_chat.py:424
-#, fuzzy
-msgid "New Groupchat"
-msgstr "Nová diskusná skupina"
+#: gajim/gtk/start_chat.py:260 gajim/gtk/start_chat.py:328
+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:603 gajim/gtk/groupchat_join.py:38
+msgid "Join Group Chat"
+msgstr "Pripojiť sa k diskusnej skupine"
 
-#: gajim/gtk/start_chat.py:426
+#: gajim/gtk/start_chat.py:605 gajim/gtk/add_contact.py:40
 #, fuzzy
-msgid "New Contact"
-msgstr "Pridať nový kontakt"
+msgid "Add Contact"
+msgstr "_Pridať kontakt..."
 
-#: gajim/gtk/start_chat.py:588
+#: gajim/gtk/start_chat.py:746
 #, fuzzy, python-format
-msgid "%s Group chats found"
+msgid "%s group chats found"
 msgstr "%s nenájdený"
 
-#: gajim/gtk/discovery.py:70
+#: gajim/gtk/discovery.py:69
 msgid "This service has not yet responded with detailed information"
 msgstr "Táto služba neodpovedala podrobnejšími informáciami"
 
-#: gajim/gtk/discovery.py:71
+#: gajim/gtk/discovery.py:70
 #, fuzzy
 msgid ""
 "This service could not respond with detailed information.\n"
@@ -8818,32 +9154,33 @@ msgstr ""
 "Táto služba neodpovedala podrobnejšími informáciami.\n"
 "Je pravdepodobne zastaralá alebo poškodená"
 
-#: gajim/gtk/discovery.py:128
+#: gajim/gtk/discovery.py:126
 msgid "Others"
 msgstr "Ostatný"
 
-#: gajim/gtk/discovery.py:131
-msgid "Conference"
-msgstr "Konferencia"
+#: gajim/gtk/discovery.py:129
+#, fuzzy
+msgid "Group Chat"
+msgstr "Diskuné skupiny"
 
-#: gajim/gtk/discovery.py:519
+#: gajim/gtk/discovery.py:518
 msgid "Without a connection, you can not browse available services"
 msgstr "Bez pripojenia, nemôžete prehliadať dostupné služby"
 
-#: gajim/gtk/discovery.py:606
+#: gajim/gtk/discovery.py:605
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Prehliadanie služieb s použitím účtu %s"
 
-#: gajim/gtk/discovery.py:608
+#: gajim/gtk/discovery.py:607
 msgid "Service Discovery"
 msgstr "Prehliadanie služieb"
 
-#: gajim/gtk/discovery.py:691
+#: gajim/gtk/discovery.py:690
 msgid "The service could not be found"
 msgstr "Služba nebola nájdená"
 
-#: gajim/gtk/discovery.py:692
+#: gajim/gtk/discovery.py:691
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -8851,100 +9188,80 @@ msgstr ""
 "Žiadna služba nie je k dispozícii na zadanej adrese alebo neodpovedá. "
 "Skontrolujte adresu a skúste opäť."
 
-#: gajim/gtk/discovery.py:699 gajim/gtk/discovery.py:1042
+#: gajim/gtk/discovery.py:698 gajim/gtk/discovery.py:1041
 msgid "The service is not browsable"
 msgstr "Služba nie je prehľadávateľná"
 
-#: gajim/gtk/discovery.py:700
+#: gajim/gtk/discovery.py:699
 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:738 gajim/gtk/discovery.py:747
+#: gajim/gtk/discovery.py:737 gajim/gtk/discovery.py:746
 msgid "Invalid Server Name"
 msgstr "Neplatný názov servera"
 
-#: gajim/gtk/discovery.py:806
+#: gajim/gtk/discovery.py:805
 #, 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:851
+#: gajim/gtk/discovery.py:850
 #, fuzzy
 msgid "Browse"
 msgstr "_Prehliadať"
 
-#: gajim/gtk/discovery.py:1043
+#: gajim/gtk/discovery.py:1042
 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:1255
+#: gajim/gtk/discovery.py:1254
 #, fuzzy
 msgid "_Command"
 msgstr "príkaz"
 
-#: gajim/gtk/discovery.py:1264 gajim/gtk/discovery.py:1422
+#: gajim/gtk/discovery.py:1263 gajim/gtk/discovery.py:1420
 msgid "Re_gister"
 msgstr "Re_gistrácia"
 
-#: gajim/gtk/discovery.py:1277
+#: gajim/gtk/discovery.py:1276
 msgid "_Search"
 msgstr "_Hľadať"
 
-#: gajim/gtk/discovery.py:1420
+#: gajim/gtk/discovery.py:1418
 msgid "_Edit"
 msgstr "_Upraviť"
 
-#: gajim/gtk/discovery.py:1458
+#: gajim/gtk/discovery.py:1456
 #, fuzzy, python-format
 msgid "Scanning %(current)d / %(total)d ..."
 msgstr "Prieskúmava sa %(current)d / %(total)d.."
 
-#: gajim/gtk/discovery.py:1674
+#: gajim/gtk/discovery.py:1655
+msgid "Users"
+msgstr "Používatelia"
+
+#: gajim/gtk/discovery.py:1671
 msgid "Id"
 msgstr "Id"
 
-#: gajim/gtk/discovery.py:1713
-msgid "_Join"
-msgstr "_Pripojiť"
-
-#: gajim/gtk/discovery.py:1736
-msgid "Bookmark already set"
-msgstr "Záložka je už nastavená"
-
-#: gajim/gtk/discovery.py:1737
-#, fuzzy, python-format
-msgid "Group Chat '%s' is already in your bookmarks."
-msgstr "Diskusná skupina \"%s\" je už vo vašich záložkách."
-
-#: gajim/gtk/discovery.py:1748
-msgid "Bookmark has been added successfully"
-msgstr "Záložka bola úspešne pridaná"
-
-#: gajim/gtk/discovery.py:1749
-#, fuzzy
-msgid ""
-"You can manage your bookmarks by clicking the Bookmarks menu item in your "
-"contact list."
-msgstr "Môžete spravovať záložky cez Akcie v menu vo vašom zozname."
-
-#: gajim/gtk/discovery.py:1950
+#: gajim/gtk/discovery.py:1900
 msgid "Subscribed"
 msgstr "Prihlásiť"
 
-#: gajim/gtk/discovery.py:1959
+#: gajim/gtk/discovery.py:1909
 msgid "Node"
 msgstr ""
 
-#: gajim/gtk/discovery.py:2028
+#: gajim/gtk/discovery.py:1978
 #, fuzzy
 msgid "_New post"
 msgstr "Nová správa"
 
-#: gajim/gtk/discovery.py:2037
+#: gajim/gtk/discovery.py:1987
 msgid "_Subscribe"
 msgstr "_Zapísať"
 
-#: gajim/gtk/discovery.py:2045
+#: gajim/gtk/discovery.py:1995
 msgid "_Unsubscribe"
 msgstr "_Odhlásiť"
 
@@ -8991,7 +9308,7 @@ msgstr "Od %s"
 msgid "Characters typed: %s"
 msgstr "Znak nie je povolený"
 
-#: gajim/gtk/single_message.py:274 gajim/gtk/xml_console.py:169
+#: gajim/gtk/single_message.py:274 gajim/gtk/xml_console.py:166
 msgid "Connection not available"
 msgstr "Pripojenie nie je dostupné"
 
@@ -9000,6 +9317,12 @@ msgstr "Pripojenie nie je dostupné"
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Prosím, uistite sa, že ste pripojený k \"%s\"."
 
+#: gajim/gtk/single_message.py:306
+#, 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:330
 #, python-format
 msgid "RE: %s"
@@ -9010,28 +9333,28 @@ msgstr "RE: %s"
 msgid "%s wrote:\n"
 msgstr "%s napísal:\n"
 
-#: gajim/gtk/pep_config.py:44
+#: gajim/gtk/pep_config.py:45
 #, fuzzy, python-format
 msgid "PEP Service Configuration (%s)"
 msgstr "Konfigurácia služby PEP"
 
-#: gajim/gtk/pep_config.py:77
+#: gajim/gtk/pep_config.py:78
 #, fuzzy
 msgid "Service"
 msgstr "Server"
 
-#: gajim/gtk/pep_config.py:114
+#: gajim/gtk/pep_config.py:115
 msgid "PEP node was not removed"
 msgstr ""
 
-#: gajim/gtk/pep_config.py:115
+#: gajim/gtk/pep_config.py:116
 #, python-format
 msgid ""
 "PEP node %(node)s was not removed:\n"
 "%(message)s"
 msgstr ""
 
-#: gajim/gtk/pep_config.py:146
+#: gajim/gtk/pep_config.py:147
 #, fuzzy, python-format
 msgid "Configure %s"
 msgstr "_Nastavovať"
@@ -9047,17 +9370,21 @@ msgstr "_Registrácia"
 msgid "Registration successful"
 msgstr "Registrácia úspešná"
 
-#: gajim/gtk/dialogs.py:54 gajim/gtk/dataform.py:659 gajim/gtk/adhoc.py:85
+#: gajim/gtk/service_registration.py:215
+msgid "Registration failed"
+msgstr "Registrácia zlyhala"
+
+#: gajim/gtk/dialogs.py:53 gajim/gtk/dataform.py:668 gajim/gtk/adhoc.py:86
 #, fuzzy
 msgid "Cancel"
 msgstr "_Zrušiť"
 
-#: gajim/gtk/dialogs.py:129
+#: gajim/gtk/dialogs.py:128
 #, 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:130
+#: gajim/gtk/dialogs.py:129
 #, fuzzy, python-format
 msgid ""
 "You have to install the dictionary \"%s\" to use spellchecking, or choose "
@@ -9069,11 +9396,11 @@ msgstr ""
 "pravopisu, prípadne si môžete zvoliť iný jazyk na kontrolu pravopisu "
 "nastavením premennej setting the speller_language."
 
-#: gajim/gtk/dialogs.py:410 gajim/gtk/dialogs.py:425
+#: gajim/gtk/dialogs.py:322 gajim/gtk/dialogs.py:337
 msgid "Insecure connection"
 msgstr "Nezabezpečené spojenie"
 
-#: gajim/gtk/dialogs.py:411
+#: gajim/gtk/dialogs.py:323
 #, fuzzy, python-format
 msgid ""
 "You are about to connect to the account %(account)s (%(server)s) insecurely. "
@@ -9084,120 +9411,115 @@ 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/gtk/dialogs.py:416
+#: gajim/gtk/dialogs.py:328
 msgid "Yes, I really want to connect insecurely"
 msgstr "Áno, chcem sa naozaj pripojiť nezabezpečene"
 
-#: gajim/gtk/dialogs.py:417
+#: gajim/gtk/dialogs.py:329
 msgid "Gajim will NOT connect unless you check this box"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:675
-#, fuzzy
-msgid "The nickname contains invalid characters."
-msgstr "Prezývka obsahuje nepovolené znaky."
-
-#: gajim/gtk/dialogs.py:734
+#: gajim/gtk/dialogs.py:561
 #, fuzzy, python-format
 msgid "Destroy %s"
 msgstr "Ničí sa %s"
 
-#: gajim/gtk/dialogs.py:775
+#: gajim/gtk/dialogs.py:602
 #, fuzzy
 msgid "Certificate"
 msgstr "Certifikát podpísaný sám sebou"
 
-#: gajim/gtk/dialogs.py:786
+#: gajim/gtk/dialogs.py:613
 #, fuzzy, python-format
 msgid ""
 "Certificate for account\n"
 "%s"
 msgstr "pre účet %s"
 
-#: gajim/gtk/dialogs.py:824
+#: gajim/gtk/dialogs.py:651
 msgid "Issued to\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:825 gajim/gtk/dialogs.py:830
+#: gajim/gtk/dialogs.py:652 gajim/gtk/dialogs.py:657
 msgid "Common Name (CN): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:826 gajim/gtk/dialogs.py:831
+#: gajim/gtk/dialogs.py:653 gajim/gtk/dialogs.py:658
 msgid "Organization (O): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:827 gajim/gtk/dialogs.py:832
+#: gajim/gtk/dialogs.py:654 gajim/gtk/dialogs.py:659
 msgid "Organizational Unit (OU): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:828
+#: gajim/gtk/dialogs.py:655
 #, fuzzy
 msgid "Serial Number: "
 msgstr "GG číslo:"
 
-#: gajim/gtk/dialogs.py:829
+#: gajim/gtk/dialogs.py:656
 msgid "Issued by\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:833
+#: gajim/gtk/dialogs.py:660
 msgid "Validity\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:834
+#: gajim/gtk/dialogs.py:661
 msgid "Issued on: "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:835
+#: gajim/gtk/dialogs.py:662
 msgid "Expires on: "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:836
+#: gajim/gtk/dialogs.py:663
 msgid "SHA-1:"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:838
+#: gajim/gtk/dialogs.py:665
 msgid "SHA-256:"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:852
+#: gajim/gtk/dialogs.py:679
 #, fuzzy
 msgid "View certificate…"
 msgstr "Certifikát podpísaný sám sebou"
 
-#: gajim/gtk/dialogs.py:864 gajim/gtk/accounts.py:893
+#: gajim/gtk/dialogs.py:691 gajim/gtk/accounts.py:896
 msgid "Change Password"
 msgstr "Zmeniť heslo"
 
-#: gajim/gtk/dialogs.py:878
+#: gajim/gtk/dialogs.py:705
 msgid "_OK"
 msgstr "_OK"
 
-#: gajim/gtk/dialogs.py:891
+#: gajim/gtk/dialogs.py:718
 #, fuzzy
 msgid "You must enter a password"
 msgstr "Musíte vložiť heslo."
 
-#: gajim/gtk/dialogs.py:895
+#: gajim/gtk/dialogs.py:722
 msgid "Passwords do not match"
 msgstr "Heslá sa nezhodujú"
 
-#: gajim/gtk/dialogs.py:923
+#: gajim/gtk/dialogs.py:750
 #, fuzzy
 msgid "Group Chat Invitation "
 msgstr "Pozvánka do diskusnej skupiny"
 
-#: gajim/gtk/dialogs.py:948
+#: gajim/gtk/dialogs.py:775
 #, python-format
 msgid "<b>%s</b> has invited you to join a discussion"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:951
+#: gajim/gtk/dialogs.py:778
 #, python-format
 msgid ""
 "<b>%(contact)s</b> has invited you to the group chat <b>%(room_jid)s</b>"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:959
+#: gajim/gtk/dialogs.py:786
 #, python-format
 msgid "Comment: %s"
 msgstr "Komentár: %s"
@@ -9212,11 +9534,6 @@ msgstr "GG číslo:"
 msgid "ICQ Number"
 msgstr "ICQ číslo:"
 
-#: gajim/gtk/add_contact.py:40
-#, fuzzy
-msgid "Add Contact"
-msgstr "_Pridať kontakt..."
-
 #: gajim/gtk/add_contact.py:259
 #, fuzzy, python-format
 msgid "%s Missing"
@@ -9237,7 +9554,8 @@ msgid "The user ID must not contain a resource."
 msgstr "ID používateľa nesmie obsahovať zdroj."
 
 #: gajim/gtk/add_contact.py:299
-msgid "You cannot add yourself to your roster."
+#, fuzzy
+msgid "You cannot add yourself to your contact list."
 msgstr "Nemôžete pridať seba do vášho zoznamu kontaktov."
 
 #: gajim/gtk/add_contact.py:304
@@ -9250,11 +9568,13 @@ msgid "Your account must be online to add new contacts."
 msgstr ""
 
 #: gajim/gtk/add_contact.py:321
-msgid "Contact already in roster"
+#, fuzzy
+msgid "Contact Already in Contact List"
 msgstr "Kontakt je už v zozname"
 
 #: gajim/gtk/add_contact.py:322
-msgid "This contact is already listed in your roster."
+#, fuzzy
+msgid "This contact is already in your contact list."
 msgstr "Tento kontakt je už uvedený v zozname."
 
 #: gajim/gtk/add_contact.py:379 gajim/gtk/add_contact.py:417
@@ -9295,14 +9615,14 @@ msgstr "Zmeniť stav"
 
 #: gajim/gtk/themes.py:52
 #, fuzzy
-msgid "MUC Tab New Directed Message"
+msgid "Group Chat Tab New Directed Message"
 msgstr ""
 "MUC prichádzajúce\n"
 "správy"
 
 #: gajim/gtk/themes.py:56
 #, fuzzy
-msgid "MUC Tab New Message"
+msgid "Group Chat Tab New Message"
 msgstr "Nová správa"
 
 #: gajim/gtk/themes.py:60
@@ -9519,13 +9839,13 @@ msgstr "Všetky súbory"
 msgid "Clear File"
 msgstr "Upratujem"
 
-#: gajim/gtk/settings.py:570
+#: gajim/gtk/settings.py:570 gajim/gtk/proxies.py:32
 #, fuzzy
 msgid "Manage Proxies"
 msgstr "Spravovať Proxy profily"
 
-#: gajim/gtk/settings.py:591 gajim/gtk/preferences.py:971
-#: gajim/gtk/preferences.py:984 gajim/gtk/preferences.py:988
+#: gajim/gtk/settings.py:591 gajim/gtk/preferences.py:968
+#: gajim/gtk/preferences.py:982 gajim/gtk/preferences.py:986
 #, fuzzy
 msgid "No Proxy"
 msgstr "Proxy:"
@@ -9605,14 +9925,15 @@ msgid ""
 "        "
 msgstr ""
 
-#: gajim/gtk/about.py:47 data/org.gajim.Gajim.appdata.xml.in:10
+#: gajim/gtk/about.py:47 data/org.gajim.Gajim.desktop.in:6
+#: data/org.gajim.Gajim.appdata.xml.in:10
 #, fuzzy
-msgid "A GTK+ XMPP client"
+msgid "A GTK XMPP client"
 msgstr "GTK+ Jabber klient"
 
 #: gajim/gtk/about.py:48
 #, fuzzy, python-format
-msgid "GTK+ Version: %s"
+msgid "GTK Version: %s"
 msgstr "Verzia GTK+:"
 
 #: gajim/gtk/about.py:49
@@ -9792,6 +10113,25 @@ msgstr "?stav prenosu:Pozastavené"
 msgid "?transfer status:Not started"
 msgstr "?stav prenosu:Pozastavené"
 
+#: gajim/gtk/groupchat_creation.py:97 gajim/gtk/groupchat_creation.py:99
+msgid " (optional)..."
+msgstr ""
+
+#: gajim/gtk/groupchat_creation.py:134
+#, fuzzy
+msgid "Invalid Address"
+msgstr "Nesprávny súbor"
+
+#: gajim/gtk/groupchat_creation.py:182
+#, fuzzy
+msgid "Not Connected"
+msgstr "Pripojený"
+
+#: gajim/gtk/groupchat_creation.py:183
+#, fuzzy
+msgid "You have to be connected to create a group chat."
+msgstr "Neboli ste prihlásený do diskusnej skupiny."
+
 #: gajim/gtk/sounds.py:39
 msgid "Wav Sounds"
 msgstr "Wav zvuky"
@@ -9833,50 +10173,45 @@ msgstr "Zvýraznenie správ v diskusnej skupine"
 msgid "Group Chat Message Received"
 msgstr "Prijatá správa - diskusná skupina"
 
-#: gajim/gtk/dataform.py:226 gajim/gtk/dataform.py:262
+#: gajim/gtk/dataform.py:232 gajim/gtk/dataform.py:268
 #, fuzzy
 msgid "Required"
 msgstr "Heslo je požadované"
 
-#: gajim/gtk/dataform.py:286
+#: gajim/gtk/dataform.py:293
 msgid "Yes"
 msgstr ""
 
-#: gajim/gtk/dataform.py:286
+#: gajim/gtk/dataform.py:293
 #, fuzzy
 msgid "No"
 msgstr "Žiadny"
 
-#: gajim/gtk/dataform.py:661
+#: gajim/gtk/dataform.py:670
 msgid "Submit"
 msgstr ""
 
-#: gajim/gtk/statusicon.py:213
+#: gajim/gtk/statusicon.py:206
 #, fuzzy
 msgid "_Change Status Message…"
 msgstr "_Zmeniť správu o stave"
 
-#: gajim/gtk/statusicon.py:247 gajim/gtk/statusicon.py:292
-#: gajim/gtk/statusicon.py:299
+#: gajim/gtk/statusicon.py:258
 #, python-format
 msgid "using account %s"
 msgstr "použiť účet %s"
 
-#: gajim/gtk/statusicon.py:309
+#: gajim/gtk/statusicon.py:269
 #, fuzzy
-msgid "_Manage Bookmarks…"
-msgstr "Spravovať záložky"
+msgid "Hide _Contact List"
+msgstr "Pozvať _kontakty"
 
-#: gajim/gtk/statusicon.py:325
+#: gajim/gtk/statusicon.py:273
 #, fuzzy
-msgid "Hide _Roster"
-msgstr "v _zozname kontaktov"
-
-#: gajim/gtk/statusicon.py:329
-msgid "Show _Roster"
-msgstr "Zobraziť _zoznam"
+msgid "Show _Contact List"
+msgstr "Zobraziť len _aktívne kontakty"
 
-#: gajim/gtk/statusicon.py:337
+#: gajim/gtk/statusicon.py:281
 msgid "Hide this menu"
 msgstr "Skryť toto menu"
 
@@ -9925,36 +10260,6 @@ msgstr ""
 "Nastala chyba pri zverejňovaní vašich osobných údajov, skúste to prosím "
 "neskôr."
 
-#: gajim/gtk/join_groupchat.py:202
-#, fuzzy
-msgid "Invalid Room"
-msgstr "Neplatná miestnosť"
-
-#: gajim/gtk/join_groupchat.py:203
-msgid "Please choose a room"
-msgstr ""
-
-#: gajim/gtk/join_groupchat.py:222 gajim/gtk/join_groupchat.py:229
-msgid "Invalid Nickname"
-msgstr "Neplatná prezývka"
-
-#: gajim/gtk/join_groupchat.py:223
-#, fuzzy
-msgid "Please choose a nickname"
-msgstr "Vytvorte, prosím, čisto novú tému z vami požadovaným názvom."
-
-#: gajim/gtk/join_groupchat.py:282 gajim/gtk/join_groupchat.py:288
-#: gajim/gtk/join_groupchat.py:293
-#, fuzzy
-msgid "Wrong server"
-msgstr "Nesprávna uri"
-
-#: gajim/gtk/join_groupchat.py:283 gajim/gtk/join_groupchat.py:289
-#: gajim/gtk/join_groupchat.py:294
-#, fuzzy, python-format
-msgid "%s is not a groupchat server"
-msgstr "Toto nie je diskusná skupina"
-
 #: gajim/gtk/mam_preferences.py:38
 #, python-format
 msgid "Archiving Preferences for %s"
@@ -9985,45 +10290,53 @@ msgstr "Služba vrátila chybu"
 msgid "Archiving Preferences Error"
 msgstr "_Predvoľby"
 
-#: gajim/gtk/advanced_config.py:81
+#: gajim/gtk/advanced_config.py:95
 msgid "Activated"
 msgstr "Aktivovaná"
 
-#: gajim/gtk/advanced_config.py:81
+#: gajim/gtk/advanced_config.py:95
 msgid "Deactivated"
 msgstr "Deaktivovaná"
 
-#: gajim/gtk/advanced_config.py:83
-msgid "Boolean"
-msgstr "Logický"
+#: gajim/gtk/advanced_config.py:97
+msgid "?config type:Boolean"
+msgstr ""
 
-#: gajim/gtk/advanced_config.py:84
-msgid "Integer"
-msgstr "Celočíselný"
+#: gajim/gtk/advanced_config.py:98
+msgid "?config type:Integer"
+msgstr ""
 
-#: gajim/gtk/advanced_config.py:85
-msgid "Text"
-msgstr "Text"
+#: gajim/gtk/advanced_config.py:99
+msgid "?config type:Text"
+msgstr ""
 
-#: gajim/gtk/advanced_config.py:97
-msgid "Preference Name"
+#: gajim/gtk/advanced_config.py:100
+msgid "?config type:Color"
+msgstr ""
+
+#: gajim/gtk/advanced_config.py:112
+#, fuzzy
+msgid "?config:Preference Name"
 msgstr "Názov vlastnosti"
 
-#: gajim/gtk/advanced_config.py:104
-msgid "Value"
-msgstr "Hodnota"
+#: gajim/gtk/advanced_config.py:123
+#, fuzzy
+msgid "?config:Value"
+msgstr "_Nastavovať"
 
-#: gajim/gtk/advanced_config.py:113
-msgid "Type"
-msgstr "Typ"
+#: gajim/gtk/advanced_config.py:132
+msgid "?config:Type"
+msgstr ""
 
-#: gajim/gtk/advanced_config.py:168
-msgid "(None)"
-msgstr "(Žiadny)"
+#: gajim/gtk/advanced_config.py:187
+#, fuzzy
+msgid "?config description:None"
+msgstr "?Vyžiadať (zápis): Žiadny"
 
-#: gajim/gtk/advanced_config.py:299
-msgid "Hidden"
-msgstr "Skryté"
+#: gajim/gtk/advanced_config.py:322
+#, fuzzy
+msgid "?password:Hidden"
+msgstr "Heslo:"
 
 #: gajim/gtk/server_info.py:66
 #, fuzzy
@@ -10035,8 +10348,8 @@ msgstr "_Kopírovať umiestnenie odkazu"
 msgid "%(days)s days, %(hours)s hours"
 msgstr ""
 
-#: gajim/gtk/server_info.py:218 gajim/gtk/accounts.py:749
-#: gajim/gtk/accounts.py:853
+#: gajim/gtk/server_info.py:218 gajim/gtk/accounts.py:752
+#: gajim/gtk/accounts.py:856
 #, fuzzy
 msgid "Hostname"
 msgstr "Názov _hostiteľa:"
@@ -10224,11 +10537,6 @@ 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_config.py:41
-#, fuzzy
-msgid "Group Chat Configuration"
-msgstr "Pozvánka do diskusnej skupiny"
-
 #: gajim/gtk/groupchat_config.py:134
 #, fuzzy
 msgid "A Group Chat needs at least one Owner"
@@ -10239,69 +10547,69 @@ msgid "You are not allowed to modify the affiliation of Admins and Owners"
 msgstr ""
 
 #: gajim/gtk/groupchat_config.py:399
-msgid "An entry with this Jabber-ID already exists"
+msgid "An entry with this XMPP Address already exists"
 msgstr ""
 
-#: gajim/gtk/adhoc.py:91
+#: gajim/gtk/adhoc.py:92
 #, fuzzy
 msgid "Finish"
 msgstr "_Dokončiť"
 
-#: gajim/gtk/adhoc.py:97 gajim/gtk/adhoc.py:283
+#: gajim/gtk/adhoc.py:98 gajim/gtk/adhoc.py:284
 #, fuzzy
 msgid "Commands"
 msgstr "príkaz"
 
-#: gajim/gtk/adhoc.py:103
+#: gajim/gtk/adhoc.py:104
 msgid "Next"
 msgstr ""
 
-#: gajim/gtk/adhoc.py:109
+#: gajim/gtk/adhoc.py:110
 #, fuzzy
 msgid "Previous"
 msgstr "Zavistlivý"
 
-#: gajim/gtk/adhoc.py:115
+#: gajim/gtk/adhoc.py:116
 #, fuzzy
 msgid "Execute"
 msgstr "_Vykonať príkaz"
 
-#: gajim/gtk/adhoc.py:195
+#: gajim/gtk/adhoc.py:196
 #, fuzzy
 msgid "No commands available"
 msgstr "Žiadne účty nie sú dostupné"
 
-#: gajim/gtk/adhoc.py:244
+#: gajim/gtk/adhoc.py:245
 #, fuzzy
 msgid "Request Command List"
 msgstr "_Vykonať príkaz"
 
-#: gajim/gtk/adhoc.py:259
+#: gajim/gtk/adhoc.py:260
 #, fuzzy
 msgid "Executing…"
 msgstr "_Vykonať príkaz"
 
-#: gajim/gtk/adhoc.py:266
+#: gajim/gtk/adhoc.py:267
 #, fuzzy
 msgid "Command List"
 msgstr "Čierna listina"
 
-#: gajim/gtk/adhoc.py:384
+#: gajim/gtk/adhoc.py:385
 #, fuzzy
 msgid "Finished"
 msgstr "_Dokončiť"
 
-#: gajim/gtk/adhoc.py:453
+#: gajim/gtk/adhoc.py:454
 #, fuzzy
 msgid "Execution failed"
 msgstr "Spojenie zlyhalo"
 
-#: gajim/gtk/blocking.py:37
+#: gajim/gtk/blocking.py:38
 #, fuzzy, python-format
 msgid "Blocking List for %s"
 msgstr "Súkromný zoznam pre %s"
 
-#: gajim/gtk/blocking.py:71
+#: gajim/gtk/blocking.py:72
 #, fuzzy
 msgid "Error!"
 msgstr "Chyba"
@@ -10351,8 +10659,7 @@ msgstr "Nesprávne meno používateľa"
 msgid "You must provide a username to configure this account."
 msgstr "Musíte vložiť meno používateľa pre konfuguráciu tohoto účtu."
 
-#: gajim/gtk/account_wizard.py:252 gajim/gtk/bookmarks.py:290
-#: gajim/gtk/bookmarks.py:303
+#: gajim/gtk/account_wizard.py:252
 msgid "Invalid server"
 msgstr "Neplatný server"
 
@@ -10368,7 +10675,7 @@ msgstr "Nesprávny záznam"
 msgid "Custom port must be a port number."
 msgstr "Vlastný port musí byť číslo portu."
 
-#: gajim/gtk/account_wizard.py:405
+#: gajim/gtk/account_wizard.py:406
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -10383,15 +10690,15 @@ msgstr ""
 "SSL chyba: %(error)s\n"
 "Chcete sa ešte pripojiť k tomuto serveru?"
 
-#: gajim/gtk/account_wizard.py:446 gajim/gtk/account_wizard.py:480
+#: gajim/gtk/account_wizard.py:447 gajim/gtk/account_wizard.py:481
 msgid "An error occurred during account creation"
 msgstr "Vyskytla sa chyba počas tvorby účtu"
 
-#: gajim/gtk/account_wizard.py:545
+#: gajim/gtk/account_wizard.py:546
 msgid "Account name is in use"
 msgstr "Názov účtu je už používaný"
 
-#: gajim/gtk/account_wizard.py:546
+#: gajim/gtk/account_wizard.py:547
 msgid "You already have an account using this name."
 msgstr "Už máte účet s týmto názvom."
 
@@ -10418,26 +10725,26 @@ msgstr "Prenos súboru %(filename)s od %(name)s zastavený."
 msgid "%(minutes)s min %(seconds)s sec"
 msgstr ""
 
-#: gajim/gtk/xml_console.py:77
+#: gajim/gtk/xml_console.py:74
 #, fuzzy
 msgid "Filter"
 msgstr "Filter:"
 
-#: gajim/gtk/xml_console.py:82
+#: gajim/gtk/xml_console.py:79
 #, fuzzy
 msgid "XML Input"
 msgstr "<b>XML vstup</b>"
 
-#: gajim/gtk/xml_console.py:86
+#: gajim/gtk/xml_console.py:83
 msgid "Paste Last Input"
 msgstr ""
 
-#: gajim/gtk/xml_console.py:170
+#: gajim/gtk/xml_console.py:167
 #, fuzzy, python-format
 msgid "Please make sure you are connected with '%s'."
 msgstr "Prosím, uistite sa, že ste pripojený k \"%s\"."
 
-#: gajim/gtk/xml_console.py:182
+#: gajim/gtk/xml_console.py:177
 #, fuzzy
 msgid "Invalid Node"
 msgstr "Nesprávny súbor"
@@ -10470,38 +10777,53 @@ msgstr "Hľadať"
 msgid "No results found"
 msgstr "Žiadny výsledok"
 
-#: gajim/gtk/preferences.py:358 gajim/gtk/preferences.py:362
+#: gajim/gtk/preferences.py:357 gajim/gtk/preferences.py:361
 msgid "Default"
 msgstr "Predvolené"
 
-#: gajim/gtk/preferences.py:801
+#: gajim/gtk/preferences.py:798
 msgid "status message title"
 msgstr "titulok správy o stave"
 
-#: gajim/gtk/preferences.py:802
+#: gajim/gtk/preferences.py:799
 msgid "status message text"
 msgstr "text správy o stave"
 
+#: gajim/gtk/accounts.py:137
+#, fuzzy
+msgid "Re-Login"
+msgstr "Prihlásiť znovu?"
+
 #: gajim/gtk/accounts.py:138
-msgid "Relogin now?"
+#, fuzzy
+msgid "Re-Login now?"
 msgstr "Prihlásiť znovu?"
 
 #: gajim/gtk/accounts.py:139
-msgid "If you want all the changes to apply instantly, you must relogin."
+#, 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:191 gajim/gtk/accounts.py:975
+#: gajim/gtk/accounts.py:141
+msgid "_Later"
+msgstr ""
+
+#: gajim/gtk/accounts.py:143
+msgid "_Re-Login"
+msgstr ""
+
+#: gajim/gtk/accounts.py:194 gajim/gtk/accounts.py:978
 #, fuzzy
 msgid "Remove Account"
 msgstr "Odstraňuje sa účet %s"
 
-#: gajim/gtk/accounts.py:192
+#: gajim/gtk/accounts.py:195
 #, fuzzy, python-format
 msgid "You still have open chats in your account %s"
 msgstr "Máte otvorený rozhovor pod účtom %s"
 
-#: gajim/gtk/accounts.py:193
+#: gajim/gtk/accounts.py:196
 #, fuzzy
 msgid ""
 "All chat and group chat windows will be closed.\n"
@@ -10510,32 +10832,32 @@ msgstr ""
 "Všetky okná s diskusiami a diskusnými skupinami budú zatvorené. Prajete si "
 "pokračovať?"
 
-#: gajim/gtk/accounts.py:424
+#: gajim/gtk/accounts.py:427
 #, fuzzy
 msgid "Back"
 msgstr "Hneď som späť"
 
-#: gajim/gtk/accounts.py:530
+#: gajim/gtk/accounts.py:533
 #, fuzzy
 msgid "Please check if Bonjour is installed."
 msgstr "Prosím skontrolujte, či je nainštalovaný program Avahi alebo Bonjour."
 
-#: gajim/gtk/accounts.py:532
+#: gajim/gtk/accounts.py:535
 #, fuzzy
 msgid "Please check if Avahi is installed."
 msgstr "Prosím skontrolujte, či je nainštalovaný program Avahi alebo Bonjour."
 
-#: gajim/gtk/accounts.py:569
+#: gajim/gtk/accounts.py:572
 #, fuzzy
 msgid "Disable Account"
 msgstr "Neplatný účet"
 
-#: gajim/gtk/accounts.py:570
+#: gajim/gtk/accounts.py:573
 #, fuzzy, python-format
 msgid "Account %s is still connected"
 msgstr "Účet \"%s\" je pripojený na server"
 
-#: gajim/gtk/accounts.py:571
+#: gajim/gtk/accounts.py:574
 #, fuzzy
 msgid ""
 "All chat and group chat windows will be closed. Do you want to continue?"
@@ -10543,85 +10865,85 @@ msgstr ""
 "Všetky okná s diskusiami a diskusnými skupinami budú zatvorené. Prajete si "
 "pokračovať?"
 
-#: gajim/gtk/accounts.py:576
+#: gajim/gtk/accounts.py:579
 #, fuzzy
 msgid "_Disable Account"
 msgstr "Neplatný účet"
 
-#: gajim/gtk/accounts.py:595
+#: gajim/gtk/accounts.py:598
 #, fuzzy
 msgid "Add Account"
 msgstr "_Pridať kontakt..."
 
-#: gajim/gtk/accounts.py:663
+#: gajim/gtk/accounts.py:666
 msgid "Label"
 msgstr ""
 
-#: gajim/gtk/accounts.py:667
+#: gajim/gtk/accounts.py:670
 msgid "Login"
 msgstr ""
 
-#: gajim/gtk/accounts.py:670
+#: gajim/gtk/accounts.py:673
 #, fuzzy
 msgid "Import Contacts"
 msgstr "Pozvať _kontakty"
 
-#: gajim/gtk/accounts.py:674 gajim/gtk/accounts.py:870
+#: gajim/gtk/accounts.py:677 gajim/gtk/accounts.py:873
 #, fuzzy
 msgid "Client Certificate"
 msgstr "Certifikát podpísaný sám sebou"
 
-#: gajim/gtk/accounts.py:677 gajim/gtk/accounts.py:774
+#: gajim/gtk/accounts.py:680 gajim/gtk/accounts.py:777
 #, fuzzy
 msgid "Connect on startup"
 msgstr "Prip_ojiť sa pri štarte programu Gajim"
 
-#: gajim/gtk/accounts.py:681 gajim/gtk/accounts.py:779
+#: gajim/gtk/accounts.py:684 gajim/gtk/accounts.py:782
 #, fuzzy
 msgid "Save conversations for all contacts"
 msgstr "Uložiť _záznam z rozhovoru pre všetky účty"
 
-#: gajim/gtk/accounts.py:683 gajim/gtk/accounts.py:781
+#: gajim/gtk/accounts.py:686 gajim/gtk/accounts.py:784
 msgid "Store conversations on the harddrive"
 msgstr ""
 
-#: gajim/gtk/accounts.py:685 gajim/gtk/accounts.py:783
+#: gajim/gtk/accounts.py:688 gajim/gtk/accounts.py:786
 #, fuzzy
 msgid "Global Status"
 msgstr "Všetky stavy"
 
-#: gajim/gtk/accounts.py:687
+#: gajim/gtk/accounts.py:690
 #, fuzzy
 msgid "Synchronise the status of all accounts"
 msgstr "Zmeniť stav účtu alebo účtov"
 
-#: gajim/gtk/accounts.py:689
+#: gajim/gtk/accounts.py:692
 msgid "Use file transfer proxies"
 msgstr "Použiť proxy pre prenos súborov"
 
-#: gajim/gtk/accounts.py:705
+#: gajim/gtk/accounts.py:708
 #, fuzzy
 msgid "Idle Time"
 msgstr " od %s"
 
-#: gajim/gtk/accounts.py:707
+#: gajim/gtk/accounts.py:710
 msgid "Disclose the time of your last activity"
 msgstr ""
 
-#: gajim/gtk/accounts.py:709
+#: gajim/gtk/accounts.py:712
 msgid "Local System Time"
 msgstr ""
 
-#: gajim/gtk/accounts.py:711
+#: gajim/gtk/accounts.py:714
 msgid "Disclose the local system time of the device Gajim runs on"
 msgstr ""
 
-#: gajim/gtk/accounts.py:714
+#: gajim/gtk/accounts.py:717
 #, fuzzy
 msgid "Client / Operating System"
 msgstr "Certifikát podpísaný sám sebou"
 
-#: gajim/gtk/accounts.py:716
+#: gajim/gtk/accounts.py:719
 #, fuzzy
 msgid ""
 "Disclose informations about the client and operating system you currently use"
@@ -10629,151 +10951,146 @@ msgstr ""
 "Ak je zaškrtnuté, Gajim povolí ostatným zistiť operačný systém, ktorý "
 "používate"
 
-#: gajim/gtk/accounts.py:719
+#: gajim/gtk/accounts.py:722
 #, fuzzy
 msgid "Ignore Unknown Contacts"
 msgstr "Pozvať _kontakty"
 
-#: gajim/gtk/accounts.py:721
+#: gajim/gtk/accounts.py:724
 #, fuzzy
 msgid "Ignore everything from contacts not in your Roster"
 msgstr "_Ignorovať udalosti od kontaktov, ktoré nie sú v zozname"
 
-#: gajim/gtk/accounts.py:737 gajim/gtk/accounts.py:776
+#: gajim/gtk/accounts.py:740 gajim/gtk/accounts.py:779
 #, fuzzy
 msgid "Use environment variable"
 msgstr "po_užiť premennú prostredia HTTP__PROXY"
 
-#: gajim/gtk/accounts.py:739
-#, fuzzy
-msgid "Proxy"
-msgstr "Proxy:"
-
-#: gajim/gtk/accounts.py:742
+#: gajim/gtk/accounts.py:745
 #, fuzzy
 msgid "Warn on insecure connection"
 msgstr "V_arovať pred použitím nezabezpečeného spojenia"
 
-#: gajim/gtk/accounts.py:746
+#: gajim/gtk/accounts.py:749
 msgid "Send keep-alive packets"
 msgstr "Poslať pakety na udržiavanie spojenia"
 
-#: gajim/gtk/accounts.py:750
+#: gajim/gtk/accounts.py:753
 msgid "Manually set the hostname for the server"
 msgstr ""
 
-#: gajim/gtk/accounts.py:756 gajim/gtk/accounts.py:826
-#: gajim/gtk/accounts.py:831
+#: gajim/gtk/accounts.py:759 gajim/gtk/accounts.py:829
+#: gajim/gtk/accounts.py:834
 #, fuzzy
 msgid "Priority"
 msgstr "Priori_ta:"
 
-#: gajim/gtk/accounts.py:785
+#: gajim/gtk/accounts.py:788
 #, fuzzy
 msgid "Synchronize the status of all accounts"
 msgstr "Zmeniť stav účtu alebo účtov"
 
-#: gajim/gtk/accounts.py:795
+#: gajim/gtk/accounts.py:798
 #, fuzzy
 msgid "First Name"
 msgstr "Prvé meno:"
 
-#: gajim/gtk/accounts.py:798
+#: gajim/gtk/accounts.py:801
 #, fuzzy
 msgid "Last Name"
 msgstr "Posledné meno:"
 
-#: gajim/gtk/accounts.py:804
+#: gajim/gtk/accounts.py:807
 #, fuzzy
 msgid "Email"
 msgstr "Nový e-mail"
 
-#: gajim/gtk/accounts.py:822
+#: gajim/gtk/accounts.py:825
 #, fuzzy
 msgid "Adjust to status"
 msgstr "_Upraviť stav"
 
-#: gajim/gtk/accounts.py:849
+#: gajim/gtk/accounts.py:852
 msgid "Enable"
 msgstr "Povoliť"
 
-#: gajim/gtk/accounts.py:857
+#: gajim/gtk/accounts.py:860
 #, fuzzy
 msgid "Port"
 msgstr "_Port:"
 
-#: gajim/gtk/accounts.py:862
+#: gajim/gtk/accounts.py:865
 #, fuzzy
 msgid "Connection Settings"
 msgstr "Spojenie"
 
-#: gajim/gtk/accounts.py:872
+#: gajim/gtk/accounts.py:875
 msgid "PKCS12 Files"
 msgstr ""
 
-#: gajim/gtk/accounts.py:874
+#: gajim/gtk/accounts.py:877
 #, fuzzy
 msgid "Encrypted Certificate"
 msgstr "Certifikát podpísaný sám sebou"
 
-#: gajim/gtk/accounts.py:878
+#: gajim/gtk/accounts.py:881
 #, fuzzy
 msgid "Certificate Settings"
 msgstr "Certifikát podpísaný sám sebou"
 
-#: gajim/gtk/accounts.py:890
+#: gajim/gtk/accounts.py:893
 #, fuzzy
 msgid "Save Password"
 msgstr "Uložiť heslo"
 
-#: gajim/gtk/accounts.py:898
+#: gajim/gtk/accounts.py:901
 #, fuzzy
 msgid "Login Settings"
 msgstr "Registrácia zlyhala"
 
-#: gajim/gtk/accounts.py:931
+#: gajim/gtk/accounts.py:934
 #, fuzzy, python-format
 msgid "Removing account %s"
 msgstr "Odstraňuje sa účet %s"
 
-#: gajim/gtk/accounts.py:946
+#: gajim/gtk/accounts.py:949
 #, fuzzy
 msgid "Account is disabled"
 msgstr "Emotikony zakázané"
 
-#: gajim/gtk/accounts.py:947
+#: gajim/gtk/accounts.py:950
 #, fuzzy
 msgid "To unregister from a server, the account must be enabled."
 msgstr "Pre zakázanie účtu, musíte byť odpojený."
 
-#: gajim/gtk/accounts.py:962
+#: gajim/gtk/accounts.py:965
 #, fuzzy
 msgid "Password required"
 msgstr "Heslo je požadované"
 
-#: gajim/gtk/accounts.py:976
+#: gajim/gtk/accounts.py:979
 #, fuzzy, python-format
 msgid "Account '%s' is still connected to the server"
 msgstr "Účet \"%s\" je pripojený na server"
 
-#: gajim/gtk/accounts.py:978
+#: gajim/gtk/accounts.py:981
 msgid "If you remove it, the connection will be lost."
 msgstr "Ak dôjde k odstráneniu, stratíte spojenie."
 
-#: gajim/gtk/accounts.py:995
+#: gajim/gtk/accounts.py:998
 #, python-format
 msgid "Connection to server %s failed"
 msgstr "Pripojenie k serveru %s zlyhalo"
 
-#: gajim/gtk/accounts.py:996
+#: gajim/gtk/accounts.py:999
 msgid "What would you like to do?"
 msgstr "Čo si prajete vykonať?"
 
-#: gajim/gtk/accounts.py:997
+#: gajim/gtk/accounts.py:1000
 msgid "Remove only from Gajim"
 msgstr "Odstrániť iba z programu Gajim"
 
-#: gajim/gtk/accounts.py:998
+#: gajim/gtk/accounts.py:1001
 msgid "Don't remove anything. I'll try again later"
 msgstr ""
 
@@ -10796,6 +11113,10 @@ msgstr "Chcem si vás pridať do môjho zoznamu kontaktov."
 msgid "Modify"
 msgstr "Upraviť"
 
+#: gajim/gtk/roster_item_exchange.py:80
+msgid "JID"
+msgstr "JID"
+
 #: gajim/gtk/roster_item_exchange.py:86
 msgid "Groups"
 msgstr "Skupiny"
@@ -10821,19 +11142,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:581
+#: gajim/gtk/util.py:583
 msgid "Unknown Artist"
 msgstr "Neznámy umelec"
 
-#: gajim/gtk/util.py:582
+#: gajim/gtk/util.py:584
 msgid "Unknown Title"
 msgstr "Neznámy titulok"
 
-#: gajim/gtk/util.py:583
+#: gajim/gtk/util.py:585
 msgid "Unknown Source"
 msgstr "Neznámy zdroj"
 
-#: gajim/gtk/util.py:585
+#: gajim/gtk/util.py:587
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
@@ -10842,29 +11163,10 @@ msgstr ""
 "<b>\"%(title)s\"</b> od <i>%(artist)s</i>\n"
 "z <i>%(source)s</i>"
 
-#: gajim/gtk/bookmarks.py:121
-msgid "New Group Chat"
-msgstr "Nová diskusná skupina"
-
-#: gajim/gtk/bookmarks.py:161
-msgid "This bookmark has invalid data"
-msgstr "Táto záložka obsahuje chybné údaje"
-
-#: gajim/gtk/bookmarks.py:162
-msgid ""
-"Please be sure to fill out server and room fields or remove this bookmark."
-msgstr ""
-"Prosim, uistite sa, že je vyplnená položka server a miestnosť alebo "
-"odstráňte túto záložku."
-
-#: gajim/gtk/bookmarks.py:273 gajim/gtk/bookmarks.py:291
-#: gajim/gtk/bookmarks.py:304 gajim/gtk/bookmarks.py:335
-msgid "Character not allowed"
-msgstr "Znak nie je povolený"
-
-#: gajim/gtk/bookmarks.py:334
-msgid "Invalid room"
-msgstr "Neplatná miestnosť"
+#: gajim/gtk/bookmarks.py:47
+#, fuzzy, python-format
+msgid "Bookmarks for %s"
+msgstr "Zálož_ky"
 
 #: gajim/plugins/pluginmanager.py:736 gajim/plugins/pluginmanager.py:742
 msgid "Archive corrupted"
@@ -10876,50 +11178,53 @@ msgid "Archive empty"
 msgstr "Súbor je prázdny"
 
 #: gajim/plugins/pluginmanager.py:750 gajim/plugins/pluginmanager.py:758
-#: gajim/plugins/gui.py:257
+#: gajim/plugins/gui.py:258
 msgid "Archive is malformed"
 msgstr ""
 
-#: gajim/plugins/pluginmanager.py:766 gajim/plugins/gui.py:281
-#: gajim/plugins/gui.py:289
+#: gajim/plugins/pluginmanager.py:766 gajim/plugins/gui.py:288
+#: gajim/plugins/gui.py:301
 #, fuzzy
 msgid "Plugin already exists"
 msgstr "Tento súbor už existuje"
 
-#: gajim/plugins/gui.py:82
+#: gajim/plugins/gui.py:83
 msgid "Click to view Gajim's wiki page on how to install plugins in Flatpak."
 msgstr ""
 
-#: gajim/plugins/gui.py:89
+#: gajim/plugins/gui.py:90
 msgid "Plugin"
 msgstr ""
 
-#: gajim/plugins/gui.py:151
+#: gajim/plugins/gui.py:152
 #, fuzzy, python-format
 msgid "Warning: %s"
 msgstr "Zakazujem %s"
 
-#: gajim/plugins/gui.py:206
+#: gajim/plugins/gui.py:207
 #, fuzzy
 msgid "Plugin failed"
 msgstr "Registrácia zlyhala"
 
-#: gajim/plugins/gui.py:245
+#: gajim/plugins/gui.py:246
 msgid "Unable to properly remove the plugin"
 msgstr ""
 
-#: gajim/plugins/gui.py:281
-msgid "Overwrite?"
-msgstr ""
+#: gajim/plugins/gui.py:287
+#, fuzzy
+msgid "Overwrite Plugin?"
+msgstr "Prepísať správu o stave?"
+
+#: gajim/plugins/gui.py:289
+#, fuzzy
+msgid "Do you want to overwrite the currently installed version?"
+msgstr "Chcete prijať pozvanie?"
 
 #: data/org.gajim.Gajim.desktop.in:5
-msgid "Jabber IM Client"
+#, fuzzy
+msgid "XMPP IM Client"
 msgstr "Jabber IM klient"
 
-#: data/org.gajim.Gajim.desktop.in:6
-msgid "A GTK+ Jabber client"
-msgstr "GTK+ Jabber klient"
-
 #: data/org.gajim.Gajim.desktop.in:8
 msgid "chat;messaging;im;xmpp;bonjour;voip;"
 msgstr ""
@@ -10971,7 +11276,7 @@ msgid "Easily send pictures, videos or other files to friends and groups"
 msgstr ""
 
 #: data/org.gajim.Gajim.appdata.xml.in:27
-msgid "Chat securely with End-to-End encryption via OMEMO or PGP"
+msgid "Chat securely with End-to-End encryption via OMEMO or OpenPGP"
 msgstr ""
 
 #: data/org.gajim.Gajim.appdata.xml.in:28
@@ -11033,7 +11338,7 @@ msgstr ""
 
 #: data/org.gajim.Gajim.appdata.xml.in:52
 #, fuzzy
-msgid "Roster, list of contacts"
+msgid "Contact list, list of contacts"
 msgstr "_Zaznamenať zmenu stavu kontaktu"
 
 #: data/org.gajim.Gajim.appdata.xml.in:56
@@ -11055,6 +11360,508 @@ msgstr "Posledné:"
 msgid "Plugin manager"
 msgstr "Registrácia zlyhala"
 
+#, fuzzy
+#~ msgid "Configure Services…"
+#~ msgstr "Nastavovať služby..."
+
+#, fuzzy
+#~ msgid "Group Chat Bookmarks"
+#~ msgstr "_Diskusná skupina"
+
+#, fuzzy
+#~ msgid "Add Bookmark"
+#~ msgstr "Zálož_ky"
+
+#, fuzzy
+#~ msgid "Remove Bookmark"
+#~ msgstr "Zálož_ky"
+
+#, fuzzy
+#~ msgid "Bookmark Name"
+#~ msgstr "Zazáložkovať túto miestnosť"
+
+#, fuzzy
+#~ msgid "_Server"
+#~ msgstr "_Server:"
+
+#, fuzzy
+#~ msgid "_Password"
+#~ msgstr "_Heslo:"
+
+#, fuzzy
+#~ msgid "Join chat when connected"
+#~ msgstr "Kontakt odpojený"
+
+#~ msgid "New Group Chat"
+#~ msgstr "Nová diskusná skupina"
+
+#~ msgid "This bookmark has invalid data"
+#~ msgstr "Táto záložka obsahuje chybné údaje"
+
+#, fuzzy
+#~ msgid ""
+#~ "Please be sure to fill out server and group chat fields or remove this "
+#~ "bookmark."
+#~ msgstr ""
+#~ "Prosim, uistite sa, že je vyplnená položka server a miestnosť alebo "
+#~ "odstráňte túto záložku."
+
+#~ msgid "Character not allowed"
+#~ msgstr "Znak nie je povolený"
+
+#, fuzzy
+#~ msgid "Invalid Group Chat"
+#~ msgstr "Nesprávne Jabber ID diskusnej skupiny"
+
+#~ msgid "Unable to join group chat"
+#~ msgstr "Nie je možné pripojiť sa do diskusnej skupiny"
+
+#, fuzzy
+#~ msgid "You are banned from group chat <b>%s</b>."
+#~ msgstr "Dostali ste ban z diskusnej skupiny %s."
+
+#, fuzzy
+#~ msgid "Remote server <b>%s</b> does not exist."
+#~ msgstr "Diskusná skupina %s neexistuje."
+
+#, fuzzy
+#~ msgid "Group chat <b>%s</b> does not exist."
+#~ msgstr "Diskusná skupina %s neexistuje."
+
+#, fuzzy
+#~ msgid "Group chat creation is not permitted."
+#~ msgstr "Vytváranie diskusných skupín je obmedzené."
+
+#, fuzzy
+#~ msgid "You must use your registered nickname in <b>%s</b>."
+#~ msgstr ""
+#~ "Vaša zaregistrovaná prezývka musí byť použitá v diskusnej skupine %s."
+
+#, fuzzy
+#~ msgid "You are not in the members list in group chat %s."
+#~ msgstr "Nie ste v zozname členov v skupinovej diskusii %s."
+
+#, fuzzy
+#~ msgid "XMPP Address is not a group chat"
+#~ msgstr "Toto nie je diskusná skupina"
+
+#~ msgid "This is not a group chat"
+#~ msgstr "Toto nie je diskusná skupina"
+
+#, fuzzy
+#~ msgid "Please choose a group chat"
+#~ msgstr "Vytvorte, prosím, čisto novú tému z vami požadovaným názvom."
+
+#~ msgid "Invalid Nickname"
+#~ msgstr "Neplatná prezývka"
+
+#, fuzzy
+#~ msgid "Please choose a nickname"
+#~ msgstr "Vytvorte, prosím, čisto novú tému z vami požadovaným názvom."
+
+#, fuzzy
+#~ msgid "Wrong server"
+#~ msgstr "Nesprávna uri"
+
+#, fuzzy
+#~ msgid "%s is not a group chat server"
+#~ msgstr "Toto nie je diskusná skupina"
+
+#, fuzzy
+#~ msgid "A Password is required to join the group chat %s. Please type it."
+#~ msgstr ""
+#~ "Pre prihlásenie do miestnosti %s je potrebné heslo. Zadajte ho, prosím."
+
+#~ msgid "Not in Roster"
+#~ msgstr "Nie je v zozname"
+
+#~ msgid "I would like to add you to my roster"
+#~ msgstr "Chcem si vás pridať do svojho zoznamu"
+
+#, fuzzy
+#~ msgid "Add to Roster"
+#~ msgstr "_Pridať do zoznamu"
+
+#, fuzzy
+#~ msgid "Audio Session"
+#~ msgstr "Zvukový test"
+
+#, fuzzy
+#~ msgid "Video Session"
+#~ msgstr "Video test"
+
+#, fuzzy
+#~ msgid "Manage Room"
+#~ msgstr "S_pravovať miestnosť"
+
+#, fuzzy
+#~ msgid "Configure Room"
+#~ msgstr "Nastaviť _miestnosť..."
+
+#, fuzzy
+#~ msgid "Destroy Room"
+#~ msgstr "_Zničiť miestnosť"
+
+#, fuzzy
+#~ msgid "Change Nick"
+#~ msgstr "Zmeniť p_rezývku..."
+
+#, fuzzy
+#~ msgid "Disconnect"
+#~ msgstr "O_dpojiť"
+
+#, fuzzy
+#~ msgid "Copy JID"
+#~ msgstr "JID miestnosti"
+
+#, fuzzy
+#~ msgid "Add to Roster…"
+#~ msgstr "_Pridať do zoznamu"
+
+#, fuzzy
+#~ msgid "Copy JID/Email"
+#~ msgstr "_Kopírovať JID/e-mailovú adresu"
+
+#, fuzzy
+#~ msgid "JID: <i>%s</i>"
+#~ msgstr "Jabber ID: <i>%s</i>"
+
+#~ msgid "Changing Subject"
+#~ msgstr "Zmena predmetu"
+
+#~ msgid "Please specify the new subject:"
+#~ msgstr "Prosím, špecifikujte nový predmet:"
+
+#~ msgid "Room logging is now enabled"
+#~ msgstr "Zaznamenávanie miestnosti je teraz povolené"
+
+#~ msgid "Room logging is now disabled"
+#~ msgstr "Zaznamenávanie miestnosti je teraz zakázané"
+
+#, fuzzy
+#~ msgid "You (%s) joined the room"
+#~ msgstr "%s sa pripojil do diskusnej skupiny"
+
+#~ msgid "Room logging is enabled"
+#~ msgstr "Zaznamenávanie miestosti je povolené"
+
+#, fuzzy
+#~ msgid "Unable to join groupchat"
+#~ msgstr "Nie je možné pripojiť sa do diskusnej skupiny"
+
+#~ msgid "Groupchat Invitation"
+#~ msgstr "Pozvánka do diskusnej skupiny"
+
+#, fuzzy
+#~ msgid "%(jid)s has been invited in this room"
+#~ msgstr "%(nick)s bol odstránený z miestnosti (%(reason)s)"
+
+#, fuzzy
+#~ msgid "JID is not a Groupchat"
+#~ msgstr "Toto nie je diskusná skupina"
+
+#~ msgid "Invalid JID"
+#~ msgstr "Nesprávne JID"
+
+#~ msgid "A connection is not available"
+#~ msgstr "Pripojenie nie je dostupné"
+
+#, fuzzy
+#~ msgid "JID already in list"
+#~ msgstr "Jabber Id je už v zozname"
+
+#, fuzzy
+#~ msgid "For the chosen encryption there is no encryption method available"
+#~ msgstr "Pripojenie nie je dostupné"
+
+#~ msgid "Removes contact from roster"
+#~ msgstr "Odstráni kontakt zo zoznamu"
+
+#~ msgid "Not in roster"
+#~ msgstr "Nie je v zozname"
+
+#, fuzzy
+#~ msgid "Contact signed in notification color."
+#~ msgstr "_Zobraziť udalosť v zozname"
+
+#, fuzzy
+#~ msgid "Contact signout notification color"
+#~ msgstr "_Zobraziť udalosť v zozname"
+
+#, fuzzy
+#~ msgid "File transfer request notification color."
+#~ msgstr "Požiadavka na prenos súboru"
+
+#, fuzzy
+#~ msgid "File transfer error notification color."
+#~ msgstr "Prenos súboru bol zrušený"
+
+#, fuzzy
+#~ msgid "File transfer complete or stopped notification color."
+#~ msgstr "Keď je prenos súboru dokončený zobraziť vyskakovacie oznámenie"
+
+#, fuzzy
+#~ msgid "Groupchat invitation notification color"
+#~ msgstr "Pozvánka do diskusnej skupiny"
+
+#~ msgid "Add * and [n] in roster title?"
+#~ msgstr "Pridať * a [n] do titulku zoznamu?"
+
+#~ msgid "Hides the banner in two persons chat window"
+#~ msgstr "Skryť titulok v okne s diskusiou dvoch osôb."
+
+#, fuzzy
+#~ msgid ""
+#~ "Show the confirm metacontacts creation dialog or not? Empty string means "
+#~ "never show the dialog."
+#~ msgstr ""
+#~ "Má byť zobrazovaný dialóg pri vytváraní metakontaktov? Prázdny reťazec "
+#~ "znamená, že dialóg sa nezobrazuje."
+
+#~ msgid "Space separated list of ssl errors to ignore."
+#~ msgstr "Medzerami oddelený zoznam ssl chýb, ktoré ignorovať."
+
+#, fuzzy
+#~ msgid "Language for which misspelled words will be checked"
+#~ msgstr "Jazyk v ktorom má byť prevádzaná kontrola pravopisu"
+
+#~ msgid "I'm eating, so leave me a message."
+#~ msgstr "Práve jem, prosím nechajte mi odkaz."
+
+#, fuzzy
+#~ msgid "from room %s"
+#~ msgstr " z miestnosti %s"
+
+#~ msgid "Leave Groupchats"
+#~ msgstr "Opustiť diskusnú skupinu"
+
+#, fuzzy
+#~ msgid "Auto Join"
+#~ msgstr "Automaticky pripojiť"
+
+#, fuzzy
+#~ msgid "Room"
+#~ msgstr "Miestnosť:"
+
+#~ msgid "Jabber ID:"
+#~ msgstr "Jabber ID:"
+
+#, fuzzy
+#~ msgid "Occupant Actions"
+#~ msgstr "Pokročilé akcie"
+
+#~ msgid "_Add to Roster"
+#~ msgstr "_Pridať do zoznamu"
+
+#~ msgid "_Manage Room"
+#~ msgstr "S_pravovať miestnosť"
+
+#~ msgid "Configure _Room..."
+#~ msgstr "Nastaviť _miestnosť..."
+
+#~ msgid "_Destroy Room"
+#~ msgstr "_Zničiť miestnosť"
+
+#~ msgid "Jabber ID"
+#~ msgstr "Jabber ID"
+
+#, fuzzy
+#~ msgid "icon"
+#~ msgstr "Trayikona"
+
+#, fuzzy
+#~ msgid "account"
+#~ msgstr "Účet"
+
+#, fuzzy
+#~ msgid "Roster"
+#~ msgstr "Zobraziť _zoznam"
+
+#, fuzzy
+#~ msgid "Show only in roster"
+#~ msgstr "_Zobraziť udalosť v zozname"
+
+#, fuzzy
+#~ msgid "in _roster"
+#~ msgstr "Nie je v zozname"
+
+#, fuzzy
+#~ msgid "Roster Appearance"
+#~ msgstr "<b>Vzhľad zoznamu</b>"
+
+#, fuzzy
+#~ msgid "Show chatstate in roster"
+#~ msgstr "Zobraziť a_vatary v zozname kontaktov"
+
+#~ msgid "_Add to Roster..."
+#~ msgstr "_Pridať do zoznamu..."
+
+#~ msgid "_Jabber ID:"
+#~ msgstr "_Jabber ID:"
+
+#, fuzzy
+#~ msgid "_Jabber ID"
+#~ msgstr "_Jabber ID:"
+
+#~ msgid "JabberID"
+#~ msgstr "JabberID"
+
+#, fuzzy
+#~ msgid "Show Roster"
+#~ msgstr "Zobraziť _zoznam"
+
+#~ msgid "MUC server"
+#~ msgstr "MUC server"
+
+#~ msgid "Room Configuration"
+#~ msgstr "Konfigurácia miestnosti"
+
+#~ msgid "Join _Group Chat"
+#~ msgstr "_Pripojiť sa k diskusnej skupine"
+
+#~ msgid "Toggle audio session"
+#~ msgstr "Prepnúť zvukovú reláciu"
+
+#, fuzzy
+#~ msgid "Audio sessions are not available"
+#~ msgstr "Pripojenie nie je dostupné"
+
+#~ msgid "Conference"
+#~ msgstr "Konferencia"
+
+#, fuzzy
+#~ msgid "_Manage Bookmarks…"
+#~ msgstr "Spravovať záložky"
+
+#, fuzzy
+#~ msgid "Hide _Roster"
+#~ msgstr "v _zozname kontaktov"
+
+#~ msgid "Show _Roster"
+#~ msgstr "Zobraziť _zoznam"
+
+#, fuzzy
+#~ msgid "Invalid Room"
+#~ msgstr "Neplatná miestnosť"
+
+#~ msgid "Invalid room"
+#~ msgstr "Neplatná miestnosť"
+
+#~ msgid "A GTK+ Jabber client"
+#~ msgstr "GTK+ Jabber klient"
+
+#~ msgid "Changing Nickname"
+#~ msgstr "Zmena prezývky"
+
+#~ msgid "Please specify the new nickname you want to use:"
+#~ msgstr "Prosím špecifikujte novú prezývku, ktorú chcete používať:"
+
+#~ msgid "Bookmark already set"
+#~ msgstr "Záložka je už nastavená"
+
+#, fuzzy
+#~ msgid "Group Chat '%s' is already in your bookmarks."
+#~ msgstr "Diskusná skupina \"%s\" je už vo vašich záložkách."
+
+#~ msgid "Bookmark has been added successfully"
+#~ msgstr "Záložka bola úspešne pridaná"
+
+#, fuzzy
+#~ msgid ""
+#~ "You can manage your bookmarks by clicking the Bookmarks menu item in your "
+#~ "contact list."
+#~ msgstr "Môžete spravovať záložky cez Akcie v menu vo vašom zozname."
+
+#, fuzzy
+#~ msgid "The nickname contains invalid characters."
+#~ msgstr "Prezývka obsahuje nepovolené znaky."
+
+#, fuzzy
+#~ msgid "Bookmark Room"
+#~ msgstr "Zazáložkovať túto miestnosť"
+
+#~ msgid "_Join New Group Chat"
+#~ msgstr "_Pripojiť sa k diskusnej skupine"
+
+#, fuzzy
+#~ msgid "_Create Group Chat"
+#~ msgstr "Opustiť diskusnú skupinu"
+
+#~ msgid "Name:"
+#~ msgstr "Meno:"
+
+#, fuzzy
+#~ msgid "Description:"
+#~ msgstr "Popis:"
+
+#, fuzzy
+#~ msgid "Address:"
+#~ msgstr "_Adresa:"
+
+#, fuzzy
+#~ msgid "You can not start a new conversation unless you are connected."
+#~ msgstr ""
+#~ "Nemôžete sa pripojiť do diskusnej skupiny, pokiaľ nie ste prihlásený."
+
+#, fuzzy
+#~ msgid "Occupants"
+#~ msgstr "Pokročilé akcie"
+
+#, fuzzy
+#~ msgid "File transfer error"
+#~ msgstr "Chyba pri prenose súboru"
+
+#, fuzzy
+#~ msgid "No Accounts available"
+#~ msgstr "Žiadne účty nie sú dostupné"
+
+#~ msgid "_Modify Account..."
+#~ msgstr "_Upraviť účet"
+
+#~ msgid "Boolean"
+#~ msgstr "Logický"
+
+#~ msgid "Integer"
+#~ msgstr "Celočíselný"
+
+#~ msgid "Text"
+#~ msgstr "Text"
+
+#~ msgid "Value"
+#~ msgstr "Hodnota"
+
+#~ msgid "Type"
+#~ msgstr "Typ"
+
+#~ msgid "(None)"
+#~ msgstr "(Žiadny)"
+
+#~ msgid "Hidden"
+#~ msgstr "Skryté"
+
+#~ msgid "Manage Proxy Profiles"
+#~ msgstr "Spravovať Proxy profily"
+
+#, fuzzy
+#~ msgid "Properties"
+#~ msgstr "<b>Predvoľby</b>"
+
+#, fuzzy
+#~ msgid "Proxy _Host"
+#~ msgstr "_Hostiteľ proxy:"
+
+#, fuzzy
+#~ msgid "Proxy _Port"
+#~ msgstr "_Port proxy:"
+
+#, fuzzy
+#~ msgid "New Groupchat"
+#~ msgstr "Nová diskusná skupina"
+
+#, fuzzy
+#~ msgid "New Contact"
+#~ msgstr "Pridať nový kontakt"
+
 #~ msgid "%s GiB"
 #~ msgstr "%s GiB"
 
@@ -11136,9 +11943,6 @@ msgstr "Registrácia zlyhala"
 #~ msgid "_Pause"
 #~ msgstr "_Pozastaviť"
 
-#~ msgid "Clean _up"
-#~ msgstr "Vyč_istiť"
-
 #~ msgid "Remove file transfer from the list."
 #~ msgstr "Odstrániť prenos súboru zo zoznamu."
 
@@ -11539,9 +12343,6 @@ msgstr "Registrácia zlyhala"
 #~ msgid "You are invited to a groupchat"
 #~ msgstr "Ste pozvaný do diskusnej skupiny"
 
-#~ msgid "Do you want to accept the invitation?"
-#~ msgstr "Chcete prijať pozvanie?"
-
 #~ msgid "_Start Chat"
 #~ msgstr "_Začať rozhovor"
 
@@ -11721,10 +12522,6 @@ msgstr "Registrácia zlyhala"
 #~ msgid "Nick"
 #~ msgstr "Prezývka"
 
-#, fuzzy
-#~ msgid "Banning…"
-#~ msgstr "Zakazujem..."
-
 #~ msgid ""
 #~ "<b>Whom do you want to ban?</b>\n"
 #~ "\n"
@@ -11799,12 +12596,6 @@ msgstr "Registrácia zlyhala"
 #~ msgid "Filter:"
 #~ msgstr "Filter:"
 
-#~ msgid ""
-#~ "If checked, Gajim will display the mood of contacts in the roster window"
-#~ msgstr ""
-#~ "Ak je zaškrtnuté, Gajim bude zobrazovať náladu kontaktov v okne so "
-#~ "zoznamom kontaktovi."
-
 #~ msgid "<b>Chat Appearance</b>"
 #~ msgstr "<b>Vzhľad rozhovoru</b>"
 
@@ -12050,10 +12841,6 @@ msgstr "Registrácia zlyhala"
 #~ msgstr "_Správa o stave:"
 
 #, fuzzy
-#~ msgid "Group chat highlight"
-#~ msgstr "Zvýraznenie správ v diskusnej skupine"
-
-#, fuzzy
 #~ msgid "Your nickname"
 #~ msgstr "Vaša prezývka:"
 
@@ -12193,9 +12980,6 @@ msgstr "Registrácia zlyhala"
 #~ msgid "The passwords typed in both fields must be identical."
 #~ msgstr "Heslá vložené do oboch polí sa musia zhodovať."
 
-#~ msgid "Enter new password:"
-#~ msgstr "Vložte nové heslo:"
-
 #~ msgid "Enter it again for confirmation:"
 #~ msgstr "Vložte ešte raz pre potvrdenie:"
 
@@ -12211,10 +12995,6 @@ msgstr "Registrácia zlyhala"
 #~ msgstr "požiadavka na odhlásenie od %s"
 
 #, fuzzy
-#~ msgid "Autojoin"
-#~ msgstr "Automaticky pripojiť"
-
-#, fuzzy
 #~ msgid "Homepage:"
 #~ msgstr "<b>Domovská stránka:</b>"
 
@@ -12309,9 +13089,6 @@ msgstr "Registrácia zlyhala"
 #~ msgid "Forward unread message then disconnect"
 #~ msgstr "Preposlať neprečítané správy"
 
-#~ msgid "AIM Address:"
-#~ msgstr "AIM adresa:"
-
 #~ msgid "MSN Address:"
 #~ msgstr "MSN adresa:"
 
@@ -12344,10 +13121,6 @@ msgstr "Registrácia zlyhala"
 #~ msgid "Requires python-crypto."
 #~ msgstr "Vyžaduje python-crypto."
 
-#, fuzzy
-#~ msgid "This session WILL NOT be archived on server"
-#~ msgstr "Relácia NEBUDE zaznamenaná"
-
 #~ msgid "This session is encrypted"
 #~ msgstr "Táto relácia je šifrovaná"
 
@@ -12606,9 +13379,6 @@ msgstr "Registrácia zlyhala"
 #~ msgid "Server:"
 #~ msgstr "Server:"
 
-#~ msgid "Password:"
-#~ msgstr "Heslo:"
-
 #, fuzzy
 #~ msgid "Join this room _automatically when I connect"
 #~ msgstr "Prihlásiť sa do miestnosti automaticky, keď sa pripojím"
@@ -12945,9 +13715,6 @@ msgstr "Registrácia zlyhala"
 #~ msgid "_Edit Personal Information..."
 #~ msgstr "_Upraviť osobné informácie..."
 
-#~ msgid "Information about you, as stored in the server"
-#~ msgstr "Informácie o vás sú uložené na serveri"
-
 #~ msgid "<b>Personal Information</b>"
 #~ msgstr "<b>Osobné informácie</b>"
 
@@ -13026,9 +13793,6 @@ msgstr "Registrácia zlyhala"
 #~ msgid "Your server can't save your personal information."
 #~ msgstr "Váš server neumožňuje uloženie vašich osobných informácií."
 
-#~ msgid "Account Local already exists."
-#~ msgstr "Účet Local už existuje."
-
 #~ msgid "Please rename or remove it before enabling link-local messaging."
 #~ msgstr ""
 #~ "Prosím, premenujte alebo odstráňte to pred zapnutím link-local správ."
@@ -13108,10 +13872,6 @@ msgstr "Registrácia zlyhala"
 #~ msgid "The following message was NOT encrypted"
 #~ msgstr "Nasledujúca správa NEbola šifrovaná"
 
-#, fuzzy
-#~ msgid "Encryption used for this contact."
-#~ msgstr "Povoliť šifrovanie ESessions pre tento účet."
-
 #~ msgid "Toggle Open_PGP Encryption"
 #~ msgstr "Prepnúť Open_PGP šifrovanie"
 
@@ -13179,10 +13939,6 @@ msgstr "Registrácia zlyhala"
 #~ msgid "Contact's identity verified"
 #~ msgstr "Identita kontaktu overená"
 
-#, fuzzy
-#~ msgid "Verify again…"
-#~ msgstr "Overiť znovu..."
-
 #~ msgid "Contact's identity NOT verified"
 #~ msgstr "Identita kontaktu NEoverená"
 
@@ -13268,9 +14024,6 @@ msgstr "Registrácia zlyhala"
 #~ msgid "Add _Contact..."
 #~ msgstr "Pridať k_ontakt..."
 
-#~ msgid "_Accounts"
-#~ msgstr "Úč_ty"
-
 #~ msgid "Profile, A_vatar"
 #~ msgstr "Profil, a_vatar"
 
@@ -13513,12 +14266,6 @@ msgstr "Registrácia zlyhala"
 #~ msgid "Activity: "
 #~ msgstr "Aktivita:"
 
-#~ msgid "Join _Group Chat..."
-#~ msgstr "_Pripojiť sa k diskusnej skupine..."
-
-#~ msgid "_Modify Account"
-#~ msgstr "_Upraviť účet"
-
 #~ msgid "Check on startup if Gajim is the _default Jabber client"
 #~ msgstr "Kontrolovať pri spustení, či je Gajim pre_dvoleným Jabber klientom"
 
@@ -13542,9 +14289,6 @@ msgstr "Registrácia zlyhala"
 #~ msgid "Execute Command..."
 #~ msgstr "Vykonať príkaz..."
 
-#~ msgid " a window/tab opened with that contact "
-#~ msgstr "okno/karta bola otvorená s týmto kontaktom "
-
 #~ msgid "<b>Actions</b>"
 #~ msgstr "<b>Akcie</b>"
 
@@ -14113,9 +14857,6 @@ msgstr "Registrácia zlyhala"
 #~ "Prosím, uistite sa, že GTK+ a PyGTK majú podporu pre libglade vo vašom "
 #~ "systéme."
 
-#~ msgid "_Host:"
-#~ msgstr "_Hostiteľ:"
-
 #~ msgid "_Incoming message:"
 #~ msgstr "_Prichádzajúca správa:"
 
@@ -14186,9 +14927,6 @@ msgstr "Registrácia zlyhala"
 #~ "Vyžaduje python-gnome2-extras alebo kompiláciu gtkspell modulu zo "
 #~ "zdrojových kódov Gajim."
 
-#~ msgid "Trayicon"
-#~ msgstr "Trayikona"
-
 #~ msgid "A icon in systemtray reflecting the current presence."
 #~ msgstr "Ikona v oblasti systémových upozornení odráža prítomnosť."
 
@@ -14211,9 +14949,6 @@ msgstr "Registrácia zlyhala"
 #~ msgid "libsexy"
 #~ msgstr "libsexy"
 
-#~ msgid "This group chat has no subject"
-#~ msgstr "Diskusná skupina nemá nastavený predmet"
-
 #~ msgid ""
 #~ "Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
 #~ "nickname of an occupant may be substituted, but not if it contains \"@\". "
diff --git a/po/sr.po b/po/sr.po
index 218a2458e..87a185a7e 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: 2019-07-02 02:06+0000\n"
+"POT-Creation-Date: 2019-08-11 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,71 +14,71 @@ msgstr ""
 "X-Pootle-Path: /sr/gajim/sr.po\n"
 "X-Pootle-Revision: 1037\n"
 
-#: gajim/chat_control_base.py:550
+#: gajim/chat_control_base.py:557
 msgid "_Undo"
 msgstr ""
 
-#: gajim/chat_control_base.py:558 gajim/conversation_textview.py:529
+#: gajim/chat_control_base.py:565 gajim/conversation_textview.py:529
 msgid "_Clear"
 msgstr ""
 
-#: gajim/chat_control_base.py:563
+#: gajim/chat_control_base.py:570
 msgid "Paste as quote"
 msgstr ""
 
-#: gajim/chat_control_base.py:613
+#: gajim/chat_control_base.py:620
 #, fuzzy
 msgid "Paste Image"
 msgstr "Одаберите слику"
 
-#: gajim/chat_control_base.py:614
+#: gajim/chat_control_base.py:621
 #, fuzzy
 msgid "You are trying to paste an image"
 msgstr "Затворићете неколико језичака"
 
-#: gajim/chat_control_base.py:615
+#: gajim/chat_control_base.py:622
 #, fuzzy
 msgid ""
 "Are you sure you want to paste your clipboard's image into the chat window?"
 msgstr "Јесте ли сигурни да желите напустити групни разговор \"%s\"?"
 
-#: gajim/chat_control_base.py:617 gajim/groupchat_control.py:2310
-#: gajim/roster_window.py:2848 gajim/roster_window.py:4167
-#: gajim/message_window.py:252 gajim/gtk/dialogs.py:418
+#: gajim/chat_control_base.py:624 gajim/groupchat_control.py:2218
+#: gajim/roster_window.py:2841 gajim/roster_window.py:4118
+#: gajim/message_window.py:359 gajim/gtk/dialogs.py:330
 #, fuzzy
 msgid "_Do not ask me again"
 msgstr "_Не питај ме више"
 
-#: gajim/chat_control_base.py:620
+#: gajim/chat_control_base.py:627
 msgid "_Paste"
 msgstr ""
 
-#: gajim/chat_control_base.py:1162 gajim/gtk/accounts.py:351
+#: gajim/chat_control_base.py:1169 gajim/gtk/accounts.py:354
 #, fuzzy
 msgid "Privacy"
 msgstr "Листа приватности"
 
-#: gajim/chat_control_base.py:1163
+#: gajim/chat_control_base.py:1170
 #, fuzzy
 msgid "Warning"
 msgstr "Забрањујем %s"
 
-#: gajim/chat_control_base.py:1164
+#: gajim/chat_control_base.py:1171
 #, python-format
 msgid "If you send a file to <b>%s</b>, your real JID will be revealed."
 msgstr ""
 
-#: gajim/chat_control_base.py:1169
+#: gajim/chat_control_base.py:1176
 #, fuzzy
 msgid "Continue"
 msgstr "_Настави"
 
-#: gajim/gtkgui_helpers.py:163 gajim/gtk/filetransfer.py:393
+#: gajim/gtkgui_helpers.py:163 gajim/gtk/filetransfer.py:398
 #, fuzzy, python-format
 msgid "Cannot overwrite existing file '%s'"
 msgstr "Није могуће преписати постојећу датотеку \"%s\""
 
-#: gajim/gtkgui_helpers.py:164 gajim/gtk/filetransfer.py:394
+#: gajim/gtkgui_helpers.py:164 gajim/gtk/filetransfer.py:399
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
@@ -170,388 +170,398 @@ msgstr "Нема захтева за претплатом на чекању."
 msgid " resource with priority "
 msgstr " ресурс са приоритетом "
 
-#: gajim/gui_menu_builder.py:96
-msgid "_New Group Chat"
-msgstr "_Нови групни разговор"
-
-#: gajim/gui_menu_builder.py:289 gajim/gui_menu_builder.py:380
-#: gajim/chat_control.py:303 gajim/roster_window.py:786
-#: gajim/roster_window.py:1719 gajim/roster_window.py:1721
-#: gajim/roster_window.py:2030 gajim/roster_window.py:3336
-#: gajim/roster_window.py:3369 gajim/gui_interface.py:413
-#: gajim/common/contacts.py:206 gajim/common/contacts.py:343
-#: gajim/common/helpers.py:83 gajim/common/helpers.py:311
-#: gajim/gtk/add_contact.py:319 gajim/gtk/subscription_request.py:70
-#: gajim/gtk/subscription_request.py:99 gajim/gtk/roster_item_exchange.py:112
-msgid "Not in Roster"
-msgstr "Није на листи контаката"
+#: gajim/gui_menu_builder.py:251 gajim/gui_menu_builder.py:342
+#: gajim/chat_control.py:305 gajim/roster_window.py:783
+#: gajim/roster_window.py:1716 gajim/roster_window.py:1718
+#: gajim/roster_window.py:2027 gajim/roster_window.py:3292
+#: gajim/roster_window.py:3325 gajim/gui_interface.py:396
+#: gajim/common/contacts.py:222 gajim/common/contacts.py:359
+#: gajim/common/contacts.py:471 gajim/common/helpers.py:86
+#: gajim/common/helpers.py:317 gajim/gtk/add_contact.py:319
+#: gajim/gtk/subscription_request.py:70 gajim/gtk/subscription_request.py:99
+#: gajim/gtk/roster_item_exchange.py:112
+#, fuzzy
+msgid "Not in contact list"
+msgstr "Прикажи контакте који нису на вези"
 
-#: gajim/gui_menu_builder.py:393
-msgid "I would like to add you to my roster"
-msgstr "Желео бих Вас додати на моју листу контаката"
+#: gajim/gui_menu_builder.py:355
+#, fuzzy
+msgid "I would like to add you to my contact list"
+msgstr "Желио бих да Вас додам на листу мојих контаката."
 
-#: gajim/gui_menu_builder.py:471
+#: gajim/gui_menu_builder.py:433
 #, fuzzy
 msgid "Send Single _Message…"
 msgstr "Пошаљи једну _поруку..."
 
-#: gajim/gui_menu_builder.py:486
+#: gajim/gui_menu_builder.py:448
 #, fuzzy
 msgid "E_xecute Command…"
 msgstr "_Изврши наредбу"
 
-#: gajim/gui_menu_builder.py:494
+#: gajim/gui_menu_builder.py:456
 msgid "_Manage Transport"
 msgstr "_Управљање транспортима"
 
-#: gajim/gui_menu_builder.py:500
+#: gajim/gui_menu_builder.py:462
 msgid "_Modify Transport"
 msgstr "_Измени транспорт"
 
-#: gajim/gui_menu_builder.py:507 gajim/roster_window.py:5046
+#: gajim/gui_menu_builder.py:469 gajim/roster_window.py:4985
 #, fuzzy
 msgid "_Rename…"
 msgstr "Преи_менуј"
 
-#: gajim/gui_menu_builder.py:518 gajim/roster_window.py:5062
-#: gajim/roster_window.py:5177 gajim/data/gui/blocked_contacts_window.ui:52
+#: gajim/gui_menu_builder.py:480 gajim/roster_window.py:5001
+#: gajim/roster_window.py:5116 gajim/data/gui/blocked_contacts_window.ui:52
 #: gajim/data/gui/gc_occupants_menu.ui:148
 #: gajim/data/gui/contact_context_menu.ui:143
 msgid "_Unblock"
 msgstr "_Одблокирај"
 
-#: gajim/gui_menu_builder.py:521 gajim/roster_window.py:5067
-#: gajim/roster_window.py:5181 gajim/data/gui/gc_occupants_menu.ui:140
+#: gajim/gui_menu_builder.py:483 gajim/roster_window.py:5006
+#: gajim/roster_window.py:5120 gajim/data/gui/gc_occupants_menu.ui:140
 #: gajim/data/gui/contact_context_menu.ui:151
 msgid "_Block"
 msgstr "_Блокирај"
 
-#: gajim/gui_menu_builder.py:529 gajim/roster_window.py:5074
+#: gajim/gui_menu_builder.py:491 gajim/roster_window.py:5013
 #: gajim/data/gui/contact_context_menu.ui:181
 msgid "Remo_ve"
 msgstr "_Уклони"
 
-#: gajim/gui_menu_builder.py:539 gajim/data/gui/contact_context_menu.ui:198
+#: gajim/gui_menu_builder.py:501 gajim/data/gui/contact_context_menu.ui:198
 msgid "_Information"
 msgstr "Информације"
 
-#: gajim/gui_menu_builder.py:552
+#: gajim/gui_menu_builder.py:514
 #, fuzzy
 msgid "Save _As"
 msgstr "Имам "
 
-#: gajim/gui_menu_builder.py:564 gajim/groupchat_control.py:501
-#: gajim/chat_control.py:340
+#: gajim/gui_menu_builder.py:526 gajim/groupchat_control.py:507
+#: gajim/chat_control.py:342
 #, fuzzy
 msgid "Send File…"
 msgstr "Пошаљи _датотеку"
 
-#: gajim/gui_menu_builder.py:565
+#: gajim/gui_menu_builder.py:527
 #, fuzzy
 msgid "Upload File…"
 msgstr "Сними датотеку као..."
 
-#: gajim/gui_menu_builder.py:566
+#: gajim/gui_menu_builder.py:528
 #, fuzzy
 msgid "Send File Directly…"
 msgstr "Сними датотеку као..."
 
-#: gajim/gui_menu_builder.py:568 gajim/gui_menu_builder.py:632
+#: gajim/gui_menu_builder.py:530 gajim/gui_menu_builder.py:596
 #, fuzzy
 msgid "Send Chatstate"
 msgstr "Последњи статус: %s"
 
-#: gajim/gui_menu_builder.py:569
+#: gajim/gui_menu_builder.py:531
 #, fuzzy
 msgid "Invite Contacts"
 msgstr "Позови контакте"
 
-#: gajim/gui_menu_builder.py:570
+#: gajim/gui_menu_builder.py:532
 #, fuzzy
-msgid "Add to Roster"
-msgstr "_Додај на листу контаката"
+msgid "Add to Contact List"
+msgstr "_Додај контакт..."
 
-#: gajim/gui_menu_builder.py:571
-msgid "Audio Session"
-msgstr ""
+#: gajim/gui_menu_builder.py:533
+#, fuzzy
+msgid "Voice Chat"
+msgstr "Захтев за преносом датотеке"
 
-#: gajim/gui_menu_builder.py:572
-msgid "Video Session"
-msgstr ""
+#: gajim/gui_menu_builder.py:534
+#, fuzzy
+msgid "Video Chat"
+msgstr "Приватни Разговори"
 
-#: gajim/gui_menu_builder.py:573
+#: gajim/gui_menu_builder.py:535 gajim/gui_menu_builder.py:582
 #, fuzzy
 msgid "Information"
 msgstr "Информације"
 
-#: gajim/gui_menu_builder.py:574 gajim/gui_menu_builder.py:639
+#: gajim/gui_menu_builder.py:536 gajim/gui_menu_builder.py:602
 #: gajim/data/gui/application_menu.ui:37
 #, fuzzy
 msgid "History"
 msgstr "_Историјат"
 
-#: gajim/gui_menu_builder.py:580 gajim/gui_menu_builder.py:687
+#: gajim/gui_menu_builder.py:542 gajim/gui_menu_builder.py:650
 #: gajim/data/gui/preferences_window.ui:1823
 msgid "Disabled"
 msgstr "Онемогућено"
 
-#: gajim/gui_menu_builder.py:581 gajim/gui_menu_builder.py:688
+#: gajim/gui_menu_builder.py:543 gajim/gui_menu_builder.py:651
 #, fuzzy
 msgid "Composing only"
 msgstr "Састављање"
 
-#: gajim/gui_menu_builder.py:582 gajim/gui_menu_builder.py:689
+#: gajim/gui_menu_builder.py:544 gajim/gui_menu_builder.py:652
 #, fuzzy
 msgid "All chat states"
 msgstr "Сви статуси"
 
-#: gajim/gui_menu_builder.py:620
+#: gajim/gui_menu_builder.py:583
 #, fuzzy
-msgid "Manage Room"
-msgstr "Управљање собама"
+msgid "Manage Group Chat"
+msgstr "Напусти групне разговоре"
 
-#: gajim/gui_menu_builder.py:621
+#: gajim/gui_menu_builder.py:584 gajim/data/gui/groupchat_control.ui:649
 #, fuzzy
 msgid "Change Subject"
 msgstr "Промени _тему..."
 
-#: gajim/gui_menu_builder.py:622
+#: gajim/gui_menu_builder.py:585
 #, fuzzy
-msgid "Configure Room"
-msgstr "Подеси _собу..."
+msgid "Configure Group Chat"
+msgstr "Напусти групне разговоре"
 
-#: gajim/gui_menu_builder.py:623
+#: gajim/gui_menu_builder.py:586
 #, fuzzy
 msgid "Upload Avatar…"
 msgstr "Одаберите слику"
 
-#: gajim/gui_menu_builder.py:624
+#: gajim/gui_menu_builder.py:587
 #, fuzzy
-msgid "Destroy Room"
-msgstr "Уништи собу"
+msgid "Destroy Group Chat"
+msgstr "Нови групни разговор"
 
-#: gajim/gui_menu_builder.py:626 gajim/data/gui/preferences_window.ui:790
+#: gajim/gui_menu_builder.py:589 gajim/data/gui/preferences_window.ui:790
 #, fuzzy
 msgid "Chat Settings"
 msgstr "Регистрација неуспела"
 
-#: gajim/gui_menu_builder.py:627
+#: gajim/gui_menu_builder.py:590
 msgid "Show join/leave"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:628
+#: gajim/gui_menu_builder.py:591
 #, fuzzy
 msgid "Show status changes"
 msgstr "_Записуј у дневник статусне промене контаката"
 
-#: gajim/gui_menu_builder.py:629 gajim/data/gui/gc_control_popup_menu.ui:72
+#: gajim/gui_menu_builder.py:592 gajim/data/gui/gc_control_popup_menu.ui:72
 #, fuzzy
 msgid "Notify on all messages"
 msgstr "Већ постављене поруке:"
 
-#: gajim/gui_menu_builder.py:630
+#: gajim/gui_menu_builder.py:593
 #, fuzzy
 msgid "Minimize on close"
 msgstr "Умањи прозор на затварање"
 
-#: gajim/gui_menu_builder.py:631
+#: gajim/gui_menu_builder.py:595
 #, fuzzy
-msgid "Minimize on autojoin"
+msgid "Minimize when joining automatically"
 msgstr "Умањи прозор на ауто повезивање"
 
-#: gajim/gui_menu_builder.py:634
+#: gajim/gui_menu_builder.py:598
 msgid "Sync Threshold"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:635
+#: gajim/gui_menu_builder.py:599
 #, fuzzy
-msgid "Change Nick"
+msgid "Change Nickname"
 msgstr "Промени _надимак..."
 
-#: gajim/gui_menu_builder.py:636
-#, fuzzy
-msgid "Bookmark Room"
-msgstr "Маркирај ову собу"
-
-#: gajim/gui_menu_builder.py:637
+#: gajim/gui_menu_builder.py:600
 #, fuzzy
 msgid "Request Voice"
 msgstr "_Глас"
 
-#: gajim/gui_menu_builder.py:638 gajim/roster_window.py:5246
+#: gajim/gui_menu_builder.py:601 gajim/roster_window.py:5185
 #, fuzzy
 msgid "Execute command"
 msgstr "_Изврши наредбу"
 
-#: gajim/gui_menu_builder.py:640
-#, fuzzy
-msgid "Disconnect"
-msgstr "_Излогуј се"
+#: gajim/gui_menu_builder.py:603
+msgid "Leave"
+msgstr ""
 
-#: gajim/gui_menu_builder.py:678 gajim/gtk/preferences.py:156
+#: gajim/gui_menu_builder.py:641 gajim/gtk/preferences.py:155
 msgid "No threshold"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:680 gajim/gtk/preferences.py:158
+#: gajim/gui_menu_builder.py:643 gajim/gtk/preferences.py:157
 #, python-format
 msgid "%i day"
 msgid_plural "%i days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: gajim/gui_menu_builder.py:709 gajim/gui_menu_builder.py:747
-#: gajim/gtk/join_groupchat.py:43
-msgid "Join Group Chat"
-msgstr "Придружи се групном разговору"
-
-#: gajim/gui_menu_builder.py:746
+#: gajim/gui_menu_builder.py:672
 #, fuzzy
 msgid "Add Contact…"
 msgstr "_Додај контакт..."
 
-#: gajim/gui_menu_builder.py:748 gajim/gtk/profile.py:52
-#: gajim/gtk/accounts.py:770 gajim/gtk/accounts.py:808
+#: gajim/gui_menu_builder.py:673 gajim/gtk/profile.py:52
+#: gajim/gtk/accounts.py:773 gajim/gtk/accounts.py:811
 #, fuzzy
 msgid "Profile"
 msgstr "датотека"
 
-#: gajim/gui_menu_builder.py:749
+#: gajim/gui_menu_builder.py:674
+#, fuzzy
+msgid "Send Single Message…"
+msgstr "Пошаљи једну _поруку..."
+
+#: gajim/gui_menu_builder.py:675
 #, fuzzy
 msgid "Discover Services"
 msgstr "_Откривање сервиса"
 
-#: gajim/gui_menu_builder.py:750
+#: gajim/gui_menu_builder.py:676 gajim/gtk/server_info.py:36
 #, fuzzy
-msgid "Send Single Message…"
-msgstr "Пошаљи једну _поруку..."
+msgid "Server Info"
+msgstr "Сервер"
 
-#: gajim/gui_menu_builder.py:751 gajim/data/gui/preferences_window.ui:2741
+#: gajim/gui_menu_builder.py:677 gajim/data/gui/preferences_window.ui:2741
 msgid "Advanced"
 msgstr "Напредно"
 
-#: gajim/gui_menu_builder.py:752 gajim/gtk/mam_preferences.py:88
+#: gajim/gui_menu_builder.py:678 gajim/gtk/mam_preferences.py:88
 #, fuzzy
 msgid "Archiving Preferences"
 msgstr "_Подешавања"
 
-#: gajim/gui_menu_builder.py:753
+#: gajim/gui_menu_builder.py:679
 #, fuzzy
 msgid "Blocking List"
 msgstr "Листа забрана"
 
-#: gajim/gui_menu_builder.py:754 gajim/gtk/history_sync.py:108
+#: gajim/gui_menu_builder.py:680
+#, fuzzy
+msgid "Bookmarks"
+msgstr "_Маркирај ову со_бу"
+
+#: gajim/gui_menu_builder.py:681
+#, fuzzy
+msgid "PEP Configuration"
+msgstr "Конфигурација собе"
+
+#: gajim/gui_menu_builder.py:682 gajim/gtk/history_sync.py:108
 #: gajim/gtk/history_sync.py:186
 #, fuzzy
 msgid "Synchronise History"
 msgstr "Синхронизуј"
 
-#: gajim/gui_menu_builder.py:755 gajim/gtk/privacy_list.py:427
+#: gajim/gui_menu_builder.py:683 gajim/gtk/privacy_list.py:427
 msgid "Privacy Lists"
 msgstr "Листа приватности"
 
-#: gajim/gui_menu_builder.py:756 gajim/gtk/server_info.py:36
-#, fuzzy
-msgid "Server Info"
-msgstr "Сервер"
-
-#: gajim/gui_menu_builder.py:757 gajim/gui_menu_builder.py:768
+#: gajim/gui_menu_builder.py:685 gajim/gui_menu_builder.py:696
 #: gajim/data/gui/xml_console_window.ui:77
 msgid "XML Console"
 msgstr "XML Конзола"
 
-#: gajim/gui_menu_builder.py:759 gajim/data/gui/groupchat_config.ui:36
+#: gajim/gui_menu_builder.py:687 gajim/data/gui/groupchat_config.ui:36
 #, fuzzy
 msgid "Admin"
 msgstr "_Админ"
 
-#: gajim/gui_menu_builder.py:760
+#: gajim/gui_menu_builder.py:688
 #, fuzzy
 msgid "Send Server Message…"
 msgstr "_Пошаљи серверску поруку..."
 
-#: gajim/gui_menu_builder.py:761
+#: gajim/gui_menu_builder.py:689
 #, fuzzy
 msgid "Set MOTD…"
 msgstr "Постави поруку дана..."
 
-#: gajim/gui_menu_builder.py:762
+#: gajim/gui_menu_builder.py:690
 #, fuzzy
 msgid "Update MOTD…"
 msgstr "Освежи поруку дана..."
 
-#: gajim/gui_menu_builder.py:763
+#: gajim/gui_menu_builder.py:691
 #, fuzzy
 msgid "Delete MOTD…"
 msgstr "Избриши поруку дана"
 
-#: gajim/gui_menu_builder.py:812
+#: gajim/gui_menu_builder.py:736
 #, fuzzy
-msgid "No Accounts available"
-msgstr "Нема доступних налога"
+msgid "_Add Account…"
+msgstr "_Додај контакт..."
+
+#: gajim/gui_menu_builder.py:742
+#, fuzzy
+msgid "_Modify Accounts…"
+msgstr "_Измени налог..."
 
-#: gajim/gui_menu_builder.py:823 gajim/data/gui/application_menu.ui:5
-#: gajim/data/gui/application_menu.ui:71 gajim/data/gui/shortcuts_window.ui:182
-#: gajim/gtk/accounts.py:58
+#: gajim/gui_menu_builder.py:751 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:755 gajim/data/gui/application_menu.ui:5
+#: gajim/data/gui/shortcuts_window.ui:182 gajim/gtk/accounts.py:57
 msgid "Accounts"
 msgstr "Налози"
 
-#: gajim/gui_menu_builder.py:881 gajim/gui_menu_builder.py:886
+#: gajim/gui_menu_builder.py:784 gajim/gui_menu_builder.py:789
 #, fuzzy
-msgid "Copy JID"
-msgstr "Џабер ID собе:"
+msgid "Copy XMPP Address"
+msgstr "_Копирај џабер ИД/е-мејл адресу"
 
-#: gajim/gui_menu_builder.py:882 gajim/gui_menu_builder.py:914
+#: gajim/gui_menu_builder.py:785 gajim/gui_menu_builder.py:817
 #, fuzzy
 msgid "Join Groupchat"
 msgstr "Придружи се групном разговору"
 
-#: gajim/gui_menu_builder.py:887 gajim/gui_menu_builder.py:913
-#: gajim/data/gui/application_menu.ui:76
+#: gajim/gui_menu_builder.py:790 gajim/gui_menu_builder.py:816
+#: gajim/data/gui/application_menu.ui:71
 #: gajim/data/gui/subscription_request_window.ui:106
 msgid "Start Chat"
 msgstr "Започни разговор"
 
-#: gajim/gui_menu_builder.py:888 gajim/gui_menu_builder.py:915
+#: gajim/gui_menu_builder.py:791 gajim/gui_menu_builder.py:818
 #, fuzzy
-msgid "Add to Roster…"
-msgstr "_Додај на листу контаката"
+msgid "Add to Contact List…"
+msgstr "_Додај контакт..."
 
-#: gajim/gui_menu_builder.py:893
+#: gajim/gui_menu_builder.py:796
 #, fuzzy
 msgid "Copy Link Location"
 msgstr "_Копирај локацију везе"
 
-#: gajim/gui_menu_builder.py:894
+#: gajim/gui_menu_builder.py:797
 #, fuzzy
 msgid "Open Link in Browser"
 msgstr "_Отвори везу у интернет прегледачу"
 
-#: gajim/gui_menu_builder.py:899
+#: gajim/gui_menu_builder.py:802
 #, fuzzy
 msgid "Copy Email Address"
 msgstr "_Копирај џабер ИД/е-мејл адресу"
 
-#: gajim/gui_menu_builder.py:900 gajim/gui_menu_builder.py:912
+#: gajim/gui_menu_builder.py:803 gajim/gui_menu_builder.py:815
 #, fuzzy
 msgid "Open Email Composer"
 msgstr "_Отвори састављач е-мејла"
 
-#: gajim/gui_menu_builder.py:905
+#: gajim/gui_menu_builder.py:808
 #, fuzzy
 msgid "Copy Location"
 msgstr "_Копирај локацију везе"
 
-#: gajim/gui_menu_builder.py:906
+#: gajim/gui_menu_builder.py:809
 #, fuzzy
 msgid "Show Location"
 msgstr "Обавештење"
 
-#: gajim/gui_menu_builder.py:911
+#: gajim/gui_menu_builder.py:814
 #, fuzzy
-msgid "Copy JID/Email"
+msgid "Copy XMPP Address/Email"
 msgstr "_Копирај џабер ИД/е-мејл адресу"
 
-#: gajim/gui_menu_builder.py:945
+#: gajim/gui_menu_builder.py:852
 #, fuzzy
 msgid "Copy"
 msgstr "Џабер ID собе:"
@@ -574,44 +584,56 @@ msgstr ""
 msgid "Choose folder for logfile"
 msgstr ""
 
-#: gajim/history_manager.py:107
+#: gajim/history_manager.py:106
 msgid "Cannot find history logs database"
 msgstr "Није могуће пронаћи дневник историјата базе података"
 
-#: gajim/history_manager.py:108
+#: gajim/history_manager.py:107
 #, fuzzy, python-format
 msgid "%s does not exist."
 msgstr "Датотека не постоји"
 
-#: gajim/history_manager.py:141 gajim/history_manager.py:195
-#: gajim/gtk/discovery.py:829 gajim/gtk/roster_item_exchange.py:80
-msgid "JID"
-msgstr "ЏИД"
+#: gajim/history_manager.py:140 gajim/history_manager.py:194
+#: 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:30
+#: gajim/gtk/accounts.py:804
+#, fuzzy
+msgid "XMPP Address"
+msgstr "АИМ адреса:"
 
-#: gajim/history_manager.py:154 gajim/history_manager.py:202
+#: gajim/history_manager.py:153 gajim/history_manager.py:201
 #: gajim/data/gui/history_window.ui:89 gajim/gtk/history.py:108
 msgid "Date"
 msgstr "Датум"
 
-#: gajim/history_manager.py:161 gajim/history_manager.py:225
+#: gajim/history_manager.py:160 gajim/history_manager.py:224
 #: gajim/data/gui/join_groupchat_window.ui:208
 #: gajim/data/gui/profile_window.ui:214
 #: gajim/data/gui/vcard_information_window.ui:443
+#: gajim/data/gui/bookmarks.ui:140
 msgid "Nickname"
 msgstr "Надимак"
 
-#: gajim/history_manager.py:172 gajim/history_manager.py:211
+#: gajim/history_manager.py:171 gajim/history_manager.py:210
 #: gajim/data/gui/preferences_window.ui:1344
 #: gajim/data/gui/single_message_window.ui:275 gajim/gtk/history.py:117
 msgid "Message"
 msgstr "Порука"
 
-#: gajim/history_manager.py:180 gajim/history_manager.py:218
+#: gajim/history_manager.py:179 gajim/history_manager.py:217
 #: gajim/data/gui/groups_post_window.ui:49
 #: gajim/data/gui/single_message_window.ui:214
 msgid "Subject"
 msgstr "Тема"
 
+#: gajim/history_manager.py:247
+#, fuzzy
+msgid "Database Cleanup"
+msgstr "Грешка са базом података"
+
 #: gajim/history_manager.py:248
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
@@ -622,11 +644,8 @@ msgstr ""
 #: gajim/history_manager.py:250
 #, fuzzy
 msgid ""
-"Normally allocated database size will not be freed, it will just become "
-"reusable. If you really want to reduce database filesize, click YES, else "
-"click NO.\n"
-"\n"
-"In case you click YES, please wait…"
+"Normally, the allocated database size will not be freed, it will just become "
+"reusable. This operation may take a while."
 msgstr ""
 "Нормално, величина алоцираног простора неће бити ослобођена,само ће постати "
 "поново користива. Уколико заиста желите смањити величину базе података "
@@ -636,47 +655,47 @@ msgstr ""
 
 #: gajim/history_manager.py:255
 #, fuzzy
-msgid "Database Cleanup"
-msgstr "Грешка са базом података"
+msgid "_Cleanup"
+msgstr "_Почисти"
 
-#: gajim/history_manager.py:519 gajim/gtk/filetransfer.py:238
-#: gajim/gtk/filetransfer.py:248
+#: gajim/history_manager.py:518 gajim/gtk/filetransfer.py:237
+#: gajim/gtk/filetransfer.py:247
 msgid "You"
 msgstr "Ви"
 
-#: gajim/history_manager.py:531
+#: gajim/history_manager.py:530
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(who)s у %(time)s каже: %(message)s\n"
 
-#: gajim/history_manager.py:568 gajim/history_manager.py:607
-#: gajim/gtk/dialogs.py:58 gajim/gtk/themes.py:319
+#: gajim/history_manager.py:567 gajim/history_manager.py:606
+#: gajim/gtk/dialogs.py:57 gajim/gtk/themes.py:319
 #: gajim/gtk/roster_item_exchange.py:75 gajim/gtk/roster_item_exchange.py:185
 msgid "Delete"
 msgstr "Обриши"
 
-#: gajim/history_manager.py:569
+#: gajim/history_manager.py:568
 #, fuzzy
 msgid "Delete Conversation"
 msgid_plural "Delete Conversations"
 msgstr[0] "Поништи одобравање"
 msgstr[1] "Поништи одобравање"
 
-#: gajim/history_manager.py:570
+#: gajim/history_manager.py:569
 #, 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:608
+#: gajim/history_manager.py:607
 #, fuzzy
 msgid "Delete Message"
 msgid_plural "Delete Messages"
 msgstr[0] "Подразумевана порука"
 msgstr[1] "Подразумевана порука"
 
-#: gajim/history_manager.py:609
+#: gajim/history_manager.py:608
 #, fuzzy
 msgid "Do you want to permanently delete this message"
 msgid_plural "Do you want to permanently delete these messages"
@@ -690,15 +709,15 @@ msgid "Contact name: <i>%s</i>"
 msgstr "Име контакта: <i>%s</i>"
 
 #: gajim/dialogs.py:84
-#, fuzzy, python-format
-msgid "JID: <i>%s</i>"
-msgstr "Џабер ИД: <i>%s</i>"
+#, python-format
+msgid "XMPP Address: <i>%s</i>"
+msgstr ""
 
-#: gajim/dialogs.py:115 gajim/dialogs.py:128 gajim/roster_window.py:2901
-#: gajim/roster_window.py:3833 gajim/roster_window.py:5084
-#: gajim/common/contacts.py:157 gajim/common/contacts.py:190
+#: gajim/dialogs.py:115 gajim/dialogs.py:128 gajim/roster_window.py:2894
+#: gajim/roster_window.py:3784 gajim/roster_window.py:5023
+#: gajim/common/contacts.py:157 gajim/common/contacts.py:206
 #: gajim/data/gui/preferences_window.ui:558
-#: gajim/data/gui/shortcuts_window.ui:177 gajim/gtk/accounts.py:349
+#: gajim/data/gui/shortcuts_window.ui:177 gajim/gtk/accounts.py:352
 msgid "General"
 msgstr "Опште"
 
@@ -743,7 +762,7 @@ msgstr "Препиши статусну поруку?"
 msgid "Preset name is already in use. Do you want to overwrite this preset?"
 msgstr "Ово име се већ користи. Да ли желите да препишете ову статусну поруку?"
 
-#: gajim/dialogs.py:703
+#: gajim/dialogs.py:703 gajim/plugins/gui.py:292
 msgid "_Overwrite"
 msgstr ""
 
@@ -755,9 +774,7 @@ msgstr "Сними као већ постављену статусну пору�
 msgid "Please type a name for this status message"
 msgstr "Молимо унесите име за ову статусну поруку"
 
-#: gajim/dialogs.py:740 gajim/gui_interface.py:1441 gajim/dialog_messages.py:31
-#: gajim/gtk/discovery.py:518 gajim/gtk/profile.py:323
-#: gajim/gtk/join_groupchat.py:234
+#: gajim/dialogs.py:740 gajim/gtk/discovery.py:517 gajim/gtk/profile.py:323
 msgid "You are not connected to the server"
 msgstr "Нисте повезани на сервер"
 
@@ -765,9 +782,11 @@ msgstr "Нисте повезани на сервер"
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Без везе, није могуће синхронизовати контакте."
 
-#: gajim/dialogs.py:752 gajim/dialogs.py:823 gajim/gtk/discovery.py:822
-#: gajim/gtk/discovery.py:1648 gajim/gtk/discovery.py:1941
-#: gajim/gtk/history.py:99 gajim/gtk/roster_item_exchange.py:83
+#: gajim/dialogs.py:752 gajim/dialogs.py:823
+#: gajim/data/gui/groupchat_info_scrolled.ui:16 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/gtk/roster_item_exchange.py:83
 msgid "Name"
 msgstr "Име"
 
@@ -787,401 +806,347 @@ msgstr "Не можете се синхронизовати са налогом
 msgid "Synchronise"
 msgstr "Синхронизуј"
 
-#: gajim/dialogs.py:1043
+#: gajim/dialogs.py:1042
 msgid "an audio and video"
 msgstr ""
 
-#: gajim/dialogs.py:1045
+#: gajim/dialogs.py:1044
 msgid "an audio"
 msgstr ""
 
-#: gajim/dialogs.py:1047
+#: gajim/dialogs.py:1046
 msgid "a video"
 msgstr ""
 
-#: gajim/dialogs.py:1051
+#: gajim/dialogs.py:1050
 #, python-format
 msgid ""
-"%(contact)s wants to start %(type)s session with you. Do you want to answer "
+"%(contact)s wants to start a %(type)s chat with you. Do you want to answer "
 "the call?"
 msgstr ""
 
-#: gajim/groupchat_control.py:505
+#: gajim/groupchat_control.py:511
 #, fuzzy, python-format
 msgid "Send File (max. %s MiB)…"
 msgstr "Сними датотеку као..."
 
-#: gajim/groupchat_control.py:507 gajim/chat_control.py:342
+#: gajim/groupchat_control.py:513 gajim/chat_control.py:344
 #, fuzzy
 msgid "No File Transfer available"
 msgstr "Преноси датотека"
 
-#: gajim/groupchat_control.py:630 gajim/groupchat_control.py:2349
-msgid "Changing Subject"
-msgstr "Промена Теме"
-
-#: gajim/groupchat_control.py:631 gajim/groupchat_control.py:2350
-msgid "Please specify the new subject:"
-msgstr "Молимо одредите нову тему:"
-
-#: gajim/groupchat_control.py:638
-msgid "Changing Nickname"
-msgstr "Промена надимка"
-
-#: gajim/groupchat_control.py:639
-msgid "Please specify the new nickname you want to use:"
-msgstr "Молимо одредите нови надимак који желите да користите:"
-
-#: gajim/groupchat_control.py:657
+#: gajim/groupchat_control.py:655
 #, fuzzy
-msgid "Invalid group chat JID"
+msgid "Invalid group chat XMPP Address"
 msgstr "Неисправан Џабер ИД групног разговора"
 
-#: gajim/groupchat_control.py:658
+#: gajim/groupchat_control.py:656
 #, fuzzy
-msgid "The group chat JID has not allowed characters."
+msgid "The group chat XMPP Address has not allowed characters."
 msgstr "Џабер ИД групног разговора има недозвољене знаке."
 
-#: gajim/groupchat_control.py:758 gajim/gtk/profile.py:136
+#: gajim/groupchat_control.py:743 gajim/gtk/profile.py:136
 msgid "Could not load image"
 msgstr "Не могу учитати слику"
 
-#: gajim/groupchat_control.py:888
+#: gajim/groupchat_control.py:873
 msgid "Insert Nickname"
 msgstr "Убаци надимак"
 
-#: gajim/groupchat_control.py:1056 gajim/chat_control.py:824
+#: gajim/groupchat_control.py:1041 gajim/chat_control.py:848
 msgid "and authenticated"
 msgstr "и пријављени"
 
-#: gajim/groupchat_control.py:1060 gajim/chat_control.py:828
+#: gajim/groupchat_control.py:1045 gajim/chat_control.py:852
 msgid "and NOT authenticated"
 msgstr "и НЕпријављени"
 
-#: gajim/groupchat_control.py:1064
+#: gajim/groupchat_control.py:1049
 #, fuzzy, python-format
 msgid "%(type)s encryption is active %(authenticated)s."
 msgstr ""
 "%(type)s шифровање %(status)s активан %(authenticated)s.\n"
 "Ваша сесија разговора %(logged)s бити памћена."
 
-#: gajim/groupchat_control.py:1111
+#: gajim/groupchat_control.py:1096
 msgid "Conversation with "
 msgstr "Разговор са "
 
-#: gajim/groupchat_control.py:1113
+#: gajim/groupchat_control.py:1098
 msgid "Continued conversation"
 msgstr "Настављени разговор"
 
-#: gajim/groupchat_control.py:1411
+#: gajim/groupchat_control.py:1357
 #, fuzzy, python-format
 msgid "%(nick)s has set the subject to %(subject)s"
 msgstr "%(jid)s је поставио тему на %(subject)s"
 
-#: gajim/groupchat_control.py:1433
+#: gajim/groupchat_control.py:1374
 #, fuzzy
-msgid "Room now shows unavailable members"
+msgid "Group chat now shows unavailable members"
 msgstr "Соба сада приказује недоступне чланове"
 
-#: gajim/groupchat_control.py:1436
+#: gajim/groupchat_control.py:1377
 #, fuzzy
-msgid "Room now does not show unavailable members"
+msgid "Group chat now does not show unavailable members"
 msgstr "соба сада не приказује недоступне чланове"
 
-#: gajim/groupchat_control.py:1439
+#: gajim/groupchat_control.py:1380
 msgid "A setting not related to privacy has been changed"
 msgstr ""
 
-#: gajim/groupchat_control.py:1446
-msgid "Room logging is now enabled"
-msgstr "Логовање у соби је сада омогућено"
+#: gajim/groupchat_control.py:1387 gajim/groupchat_control.py:1659
+#, fuzzy
+msgid "Conversations are stored on the server"
+msgstr "Сесија НЕЋЕ бити памћена"
 
-#: gajim/groupchat_control.py:1449
-msgid "Room logging is now disabled"
-msgstr "Логовање у соби је сада онемогућено"
+#: gajim/groupchat_control.py:1390
+#, fuzzy
+msgid "Conversations are not stored on the server"
+msgstr "Информације о Вама, како су ускладиштене на серверу"
 
-#: gajim/groupchat_control.py:1452
-msgid "Room is now non-anonymous"
+#: gajim/groupchat_control.py:1393
+#, fuzzy
+msgid "Group chat is now non-anonymous"
 msgstr "Соба сада више није анонимна"
 
-#: gajim/groupchat_control.py:1456
-msgid "Room is now semi-anonymous"
+#: gajim/groupchat_control.py:1397
+#, fuzzy
+msgid "Group chat is now semi-anonymous"
 msgstr "Соба је сада полу анонимна"
 
-#: gajim/groupchat_control.py:1460
+#: gajim/groupchat_control.py:1401
 #, fuzzy
-msgid "Room is now fully anonymous"
+msgid "Group chat is now fully anonymous"
 msgstr "Соба је сада потпуно анонимна"
 
-#: gajim/groupchat_control.py:1500
+#: gajim/groupchat_control.py:1439
 #, fuzzy, python-format
 msgid "Ping? (%s)"
 msgstr "Понг! (%s s.)"
 
-#: gajim/groupchat_control.py:1503
+#: gajim/groupchat_control.py:1442
 #, fuzzy, python-format
 msgid "Pong! (%(nick)s %(delay)s s.)"
 msgstr "Понг! (%s s.)"
 
-#: gajim/groupchat_control.py:1506 gajim/chat_control.py:1213
+#: gajim/groupchat_control.py:1445 gajim/chat_control.py:1237
 #, fuzzy
 msgid "Error."
 msgstr "Грешка"
 
-#: gajim/groupchat_control.py:1711
+#: gajim/groupchat_control.py:1650
 #, fuzzy, python-format
-msgid "You (%s) joined the room"
+msgid "You (%s) joined the group chat"
 msgstr "%s се придружио групном разговору"
 
-#: gajim/groupchat_control.py:1717
-msgid "Any occupant is allowed to see your full JID"
+#: gajim/groupchat_control.py:1655
+#, fuzzy
+msgid "Any participant is allowed to see your full XMPP Address"
 msgstr "Свима присутнима је дозвољено да виде ваш пун џабер ID"
 
-#: gajim/groupchat_control.py:1721
-msgid "Room logging is enabled"
-msgstr "Логовање собе је омогућено"
-
-#: gajim/groupchat_control.py:1725
-msgid "The server has assigned or modified your roomnick"
+#: gajim/groupchat_control.py:1663
+#, fuzzy
+msgid "The server has assigned or modified your nickname in this group chat"
 msgstr "Сервер Вам је или доделио надимак или променио постојећи"
 
-#: gajim/groupchat_control.py:1732
-msgid "A new room has been created"
+#: gajim/groupchat_control.py:1671
+#, fuzzy
+msgid "A new group chat has been created"
 msgstr "Нова соба је направљена"
 
-#: gajim/groupchat_control.py:1740 gajim/privatechat_control.py:112
+#: gajim/groupchat_control.py:1679 gajim/privatechat_control.py:115
 #, python-format
 msgid "You are now known as %s"
 msgstr "Од сада сте познати као %s"
 
-#: gajim/groupchat_control.py:1742 gajim/privatechat_control.py:114
+#: gajim/groupchat_control.py:1681 gajim/privatechat_control.py:117
 #, fuzzy, python-brace-format
 msgid "{nick} is now known as {new_nick}"
 msgstr "%(nick)s је од сада познат као %(new_nick)s"
 
-#: gajim/groupchat_control.py:1767 gajim/privatechat_control.py:141
+#: gajim/groupchat_control.py:1706 gajim/privatechat_control.py:144
 #, fuzzy, python-brace-format
 msgid "You are now {show}{status}"
 msgstr "Од сада сте познати као %s"
 
-#: gajim/groupchat_control.py:1773 gajim/privatechat_control.py:147
+#: gajim/groupchat_control.py:1712 gajim/privatechat_control.py:150
 #, fuzzy, python-brace-format
 msgid "{nick} is now {show}{status}"
 msgstr "%(nick)s је тренутно %(status)s"
 
-#: gajim/groupchat_control.py:1790 gajim/groupchat_control.py:1819
-#: gajim/groupchat_control.py:1849 gajim/groupchat_control.py:1909
+#: gajim/groupchat_control.py:1729 gajim/groupchat_control.py:1758
+#: gajim/groupchat_control.py:1788 gajim/groupchat_control.py:1848
 #, python-brace-format
 msgid " by {actor}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1793
+#: gajim/groupchat_control.py:1732
 #, fuzzy, python-brace-format
 msgid "** Your Affiliation has been set to {affiliation}{actor}{reason}"
 msgstr ""
 "** Афилијација %(nick)s је постављена на %(affiliation)s од стране %(actor)s"
 
-#: gajim/groupchat_control.py:1799
+#: gajim/groupchat_control.py:1738
 #, fuzzy, python-brace-format
 msgid "** Affiliation of {nick} has been set to {affiliation}{actor}{reason}"
 msgstr "** Афилијација %(nick)s је постављена на %(affiliation)s"
 
-#: gajim/groupchat_control.py:1822
+#: gajim/groupchat_control.py:1761
 #, fuzzy, python-brace-format
 msgid "** Your Role has been set to {role}{actor}{reason}"
 msgstr "** Улога %(nick)s је постављена на %(role)s од стране %(actor)s"
 
-#: gajim/groupchat_control.py:1827
+#: gajim/groupchat_control.py:1766
 #, fuzzy, python-brace-format
 msgid "** Role of {nick} has been set to {role}{actor}{reason}"
 msgstr "** Улога %(nick)s је постављена на %(role)s од стране %(actor)s"
 
-#: gajim/groupchat_control.py:1852
+#: gajim/groupchat_control.py:1791
 #, fuzzy, python-brace-format
-msgid "You have been removed from the room{actor}{reason}"
+msgid "You have been removed from the group chat{actor}{reason}"
 msgstr "%(nick)s је избачен из собе (%(reason)s)"
 
-#: gajim/groupchat_control.py:1857
+#: gajim/groupchat_control.py:1796
 #, python-brace-format
 msgid "You have left due to an error{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1863
+#: gajim/groupchat_control.py:1802
 #, python-brace-format
 msgid "You have been kicked{actor}{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1870
+#: gajim/groupchat_control.py:1809
 #, python-brace-format
 msgid "You have been banned{actor}{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1877 gajim/groupchat_control.py:1943
+#: gajim/groupchat_control.py:1816 gajim/groupchat_control.py:1882
 #, fuzzy
 msgid ": Affiliation changed"
 msgstr "везаност измењена"
 
-#: gajim/groupchat_control.py:1883 gajim/groupchat_control.py:1948
+#: gajim/groupchat_control.py:1822 gajim/groupchat_control.py:1887
 #, fuzzy
-msgid ": Room configuration changed to members-only"
+msgid ": Group chat configuration changed to members-only"
 msgstr "конфигурација собе се променила на само-чланови"
 
-#: gajim/groupchat_control.py:1912
+#: gajim/groupchat_control.py:1851
 #, fuzzy, python-brace-format
-msgid "{nick} has been removed from the room{by}{reason}"
+msgid "{nick} has been removed from the group chat{by}{reason}"
 msgstr "%(nick)s је избачен из собе (%(reason)s)"
 
-#: gajim/groupchat_control.py:1922
+#: gajim/groupchat_control.py:1861
 #, python-brace-format
 msgid "{nick} has left due to an error{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1928
+#: gajim/groupchat_control.py:1867
 #, fuzzy, python-brace-format
 msgid "{nick} has been kicked{actor}{reason}"
 msgstr "%(nick)s је избачен: %(reason)s"
 
-#: gajim/groupchat_control.py:1936
+#: gajim/groupchat_control.py:1875
 #, fuzzy, python-brace-format
 msgid "{nick} has been banned{actor}{reason}"
 msgstr "%(nick)s има забрану: %(reason)s"
 
-#: gajim/groupchat_control.py:1953
+#: gajim/groupchat_control.py:1892
 #, python-brace-format
 msgid "{nick} has left{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1970
+#: gajim/groupchat_control.py:1914
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s се придружио групном разговору"
 
-#: gajim/groupchat_control.py:1985 gajim/groupchat_control.py:1990
-#: gajim/groupchat_control.py:1995 gajim/groupchat_control.py:2000
-#: gajim/groupchat_control.py:2011
-msgid "Unable to join group chat"
-msgstr "Није могуће придружити се групном разговору"
-
-#: gajim/groupchat_control.py:1986
-#, python-format
-msgid "You are banned from group chat <b>%s</b>."
-msgstr "Забрањен Вам је приступ групном разговору <b>%s</b>."
-
-#: gajim/groupchat_control.py:1991
-#, fuzzy, python-format
-msgid "Remote server <b>%s</b> does not exist."
-msgstr "Групни разговор <b>%s</b> не постоји."
-
-#: gajim/groupchat_control.py:1996
-#, python-format
-msgid "Group chat <b>%s</b> does not exist."
-msgstr "Групни разговор <b>%s</b> не постоји."
-
-#: gajim/groupchat_control.py:2001
-#, fuzzy
-msgid "Group chat creation is not permitted."
-msgstr "Стварање групних разговора Вам није дозвољено."
-
-#: gajim/groupchat_control.py:2005
+#: gajim/groupchat_control.py:1981
 #, fuzzy
-msgid "Unable to join groupchat"
-msgstr "Није могуће придружити се групном разговору"
-
-#: gajim/groupchat_control.py:2006
-#, fuzzy, python-format
-msgid "You must use your registered nickname in <b>%s</b>."
-msgstr ""
-"Морате користити Ваш регистровани надимак у групном разговору <b>%s</b>."
-
-#: gajim/groupchat_control.py:2012
-#, python-format
-msgid "You are not in the members list in groupchat %s."
-msgstr "Нисте у листи чланова групног разговора %s."
-
-#: gajim/groupchat_control.py:2068
-msgid "Room has been destroyed"
+msgid "Group chat has been destroyed"
 msgstr "Соба групног разговора је уништена"
 
-#: gajim/groupchat_control.py:2073
+#: gajim/groupchat_control.py:1986
 #, fuzzy, python-format
-msgid "You can join this room instead: xmpp:%s?join"
+msgid "You can join this group chat instead: xmpp:%s?join"
 msgstr "Можете се прикључити соби %s уместо ове"
 
-#: gajim/groupchat_control.py:2306
+#: gajim/groupchat_control.py:2214
 #, fuzzy
 msgid "Leave Group Chat"
 msgstr "Напусти групне разговоре"
 
-#: gajim/groupchat_control.py:2307
+#: gajim/groupchat_control.py:2215
 #, fuzzy
 msgid "Are you sure you want to leave this group chat?"
 msgstr "Јесте ли сигурни да желите напустити групни разговор \"%s\"?"
 
-#: gajim/groupchat_control.py:2308
+#: gajim/groupchat_control.py:2216
 #, fuzzy, python-format
-msgid "If you close this window, you will be disconnected from '%s'."
+msgid "If you close this window, you will leave '%s'."
 msgstr "Ако затворите овај прозор, бићете искључени са овох групног разговора."
 
-#: gajim/groupchat_control.py:2314
+#: gajim/groupchat_control.py:2222 gajim/roster_window.py:5177
 msgid "_Leave"
 msgstr ""
 
-#: gajim/groupchat_control.py:2377
+#: gajim/groupchat_control.py:2280 gajim/roster_window.py:3008
 #, fuzzy, python-format
 msgid "%(jid)s has been invited to this group chat"
 msgstr "%(nick)s је избачен из собе (%(reason)s)"
 
-#: gajim/groupchat_control.py:2527
+#: gajim/groupchat_control.py:2463
 #, python-format
 msgid "Kicking %s"
 msgstr "Избацујем %s"
 
-#: gajim/groupchat_control.py:2528 gajim/groupchat_control.py:2829
+#: gajim/groupchat_control.py:2464 gajim/groupchat_control.py:2765
 msgid "You may specify a reason below:"
 msgstr "Можете навести разлог испод:"
 
-#: gajim/groupchat_control.py:2828
+#: gajim/groupchat_control.py:2764
 #, python-format
 msgid "Banning %s"
 msgstr "Забрањујем %s"
 
-#: gajim/chat_control.py:408
+#: gajim/chat_control.py:432
 msgid "Show a list of formattings"
 msgstr "Прикажи листу форматирања"
 
-#: gajim/chat_control.py:412
+#: gajim/chat_control.py:436
 #, fuzzy
 msgid "This contact does not support HTML"
 msgstr "Овак контакт не подржава пренос датотека."
 
-#: gajim/chat_control.py:562
+#: gajim/chat_control.py:586
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr ""
 
-#: gajim/chat_control.py:686
+#: gajim/chat_control.py:710
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s са групног разговора у соби %(room_name)s"
 
-#: gajim/chat_control.py:832
+#: gajim/chat_control.py:856
 #, fuzzy, python-format
 msgid "%(type)s encryption is active %(authenticated)s"
 msgstr ""
 "%(type)s шифровање %(status)s активан %(authenticated)s.\n"
 "Ваша сесија разговора %(logged)s бити памћена."
 
-#: gajim/chat_control.py:1160 gajim/chat_control.py:1168
+#: gajim/chat_control.py:1184 gajim/chat_control.py:1192
 #, fuzzy
 msgid "Close"
 msgstr "_Пошаљи и затвори"
 
-#: gajim/chat_control.py:1161
+#: gajim/chat_control.py:1185
 #, fuzzy, python-format
 msgid "You just received a new message from %s"
 msgstr "\"%s\" Вам је управо послао поруку"
 
-#: gajim/chat_control.py:1163
+#: gajim/chat_control.py:1187
 #, fuzzy
 msgid ""
 "If you close this tab while having chat history disabled, this message will "
@@ -1190,16 +1155,16 @@ msgstr ""
 "Ако затворите овај језичак, а историјат разговора није омогућен, ова порука "
 "ће бити изгубљена."
 
-#: gajim/chat_control.py:1208
+#: gajim/chat_control.py:1232
 msgid "Ping?"
 msgstr ""
 
-#: gajim/chat_control.py:1211
+#: gajim/chat_control.py:1235
 #, fuzzy, python-format
 msgid "Pong! (%s seconds)"
 msgstr "Понг! (%s s.)"
 
-#: gajim/chat_control.py:1308
+#: gajim/chat_control.py:1332
 #, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -1208,270 +1173,278 @@ msgstr ""
 "Тема: %(subject)s\n"
 "%(message)s"
 
-#: gajim/chat_control.py:1416
+#: gajim/chat_control.py:1440
 #, fuzzy, python-format
 msgid "%(name)s is now %(show)s %(status)s"
 msgstr "%(name)s је сада %(status)s"
 
-#: gajim/chat_control.py:1476 gajim/data/gui/application_menu.ui:32
+#: gajim/chat_control.py:1500 gajim/data/gui/application_menu.ui:32
 #: gajim/gtk/http_upload_progress.py:35
 #, fuzzy
 msgid "File Transfer"
 msgstr "Преноси датотека"
 
-#: gajim/chat_control.py:1480
+#: gajim/chat_control.py:1504
 #, fuzzy
 msgid "Size"
 msgstr "Величина: %s"
 
-#: gajim/chat_control.py:1482 gajim/chat_control.py:1546
+#: gajim/chat_control.py:1506 gajim/chat_control.py:1566
+#: gajim/gui_interface.py:190
 #: gajim/data/gui/groupchat_invitation_received.ui:77
-#: gajim/gtk/filetransfer.py:485
+#: gajim/gtk/filetransfer.py:490
 #, fuzzy
 msgid "_Accept"
 msgstr "_Налози"
 
-#: gajim/chat_control.py:1484 gajim/chat_control.py:1548
+#: gajim/chat_control.py:1508 gajim/chat_control.py:1568
 #: gajim/data/gui/groupchat_invitation_received.ui:62
 #, fuzzy
 msgid "_Decline"
 msgstr "_Није на вези"
 
-#: gajim/chat_control.py:1506 gajim/gui_interface.py:791
-#: gajim/gui_interface.py:821 gajim/gui_interface.py:847
+#: gajim/chat_control.py:1530 gajim/gui_interface.py:777
+#: gajim/gui_interface.py:807 gajim/gui_interface.py:833
 #: gajim/gtk/notification.py:173 gajim/gtk/notification.py:278
 msgid "File Transfer Completed"
 msgstr "Пренос датотеке завршен"
 
-#: gajim/chat_control.py:1510 gajim/gtk/filetransfer.py:259
+#: gajim/chat_control.py:1534 gajim/gtk/filetransfer.py:258
 #, fuzzy
 msgid "Open _Folder"
 msgstr "_Отвори садржавајућу фасциклу"
 
-#: gajim/chat_control.py:1512 gajim/chat_control.py:1521
+#: gajim/chat_control.py:1536 gajim/chat_control.py:1545
+#: gajim/data/gui/groupchat_control.ui:962
+#: gajim/data/gui/groupchat_control.ui:1049
+#: gajim/data/gui/groupchat_control.ui:1155
 #, fuzzy
 msgid "_Close"
 msgstr "_Пошаљи и затвори"
 
-#: gajim/chat_control.py:1543 gajim/gui_interface.py:484
+#: gajim/chat_control.py:1563 gajim/gui_interface.py:473
+#: gajim/data/gui/groupchat_invitation_received.ui:42
 #: gajim/gtk/notification.py:174 gajim/gtk/notification.py:195
 #: gajim/gtk/notification.py:281
-msgid "Groupchat Invitation"
+#, fuzzy
+msgid "Group Chat Invitation"
 msgstr "Позив на групни разговор"
 
-#: gajim/chat_control.py:1568 gajim/roster_window.py:1954
+#: gajim/chat_control.py:1588 gajim/roster_window.py:1951
 msgid "Remote contact stopped transfer"
 msgstr "Удаљени контакт је прекинуо пренос"
 
-#: gajim/chat_control.py:1570 gajim/roster_window.py:1956
+#: gajim/chat_control.py:1590 gajim/roster_window.py:1953
 msgid "Error opening file"
 msgstr "Грешка при отварању датотеке"
 
-#: gajim/chat_control.py:1572 gajim/gtk/filetransfer.py:297
+#: gajim/chat_control.py:1592 gajim/gtk/filetransfer.py:296
 msgid "File transfer stopped"
 msgstr "Пренос датотеке заустављен"
 
-#: gajim/chat_control.py:1575 gajim/gtk/filetransfer.py:275
-#: gajim/gtk/filetransfer.py:284
+#: gajim/chat_control.py:1595 gajim/gtk/filetransfer.py:274
+#: gajim/gtk/filetransfer.py:283
 msgid "File transfer cancelled"
 msgstr "Пренос датотеке прекинут"
 
-#: gajim/chat_control.py:1576
+#: gajim/chat_control.py:1596
 msgid "Connection with peer cannot be established."
 msgstr "Није могуће успоставити везу са другом страном."
 
-#: gajim/application.py:72
+#: gajim/application.py:75
 #, fuzzy
 msgid "Show the application's version"
 msgstr "Notification-daemon"
 
-#: gajim/application.py:79
+#: gajim/application.py:82
 #, fuzzy
 msgid "Show only critical errors"
 msgstr "Прикажи догађај у листи контаката"
 
-#: gajim/application.py:86
+#: gajim/application.py:89
 msgid "Separate profile files completely (even history database and plugins)"
 msgstr ""
 
-#: gajim/application.py:94
+#: gajim/application.py:97
 msgid "Print XML stanzas and other debug information"
 msgstr ""
 
-#: gajim/application.py:101
+#: gajim/application.py:104
 #, fuzzy
 msgid "Use defined profile in configuration directory"
 msgstr "Напредна измена конфигурације"
 
-#: gajim/application.py:109
+#: gajim/application.py:112
 #, fuzzy
 msgid "Set configuration directory"
 msgstr "Конфигурација собе"
 
-#: gajim/application.py:117
+#: gajim/application.py:120
 msgid "Configure logging system"
 msgstr ""
 
-#: gajim/application.py:125
+#: gajim/application.py:128
 #, fuzzy
 msgid "Show all warnings"
 msgstr "Прикажи св_е догађаје на чекању"
 
-#: gajim/application.py:132
+#: gajim/application.py:135
 msgid "Open IPython shell"
 msgstr ""
 
-#: gajim/application.py:139
+#: gajim/application.py:142
 msgid "Pops up a window with the next pending event"
 msgstr "Искаче прозор са следећим догађајем на чекању"
 
-#: gajim/application.py:145 gajim/data/gui/shortcuts_window.ui:203
+#: gajim/application.py:148 gajim/data/gui/shortcuts_window.ui:203
 #: data/org.gajim.Gajim.desktop.in:21
 #, fuzzy
 msgid "Start a new chat"
 msgstr "Започни разговор"
 
-#: gajim/application.py:152
+#: gajim/application.py:155
 msgid "Simulate loss of connectivity"
 msgstr ""
 
-#: gajim/application.py:159
+#: gajim/application.py:162
 msgid "Simulate regaining connectivity"
 msgstr ""
 
-#: gajim/application.py:201 gajim/gui_interface.py:133
+#: gajim/application.py:204 gajim/gui_interface.py:133
 msgid "Database Error"
 msgstr "Грешка са базом података"
 
-#: gajim/roster_window.py:294 gajim/roster_window.py:1030
+#: gajim/roster_window.py:291 gajim/roster_window.py:1027
 msgid "Merged accounts"
 msgstr "Спојени налози"
 
-#: gajim/roster_window.py:853 gajim/roster_window.py:1631
-#: gajim/roster_window.py:1664 gajim/roster_window.py:1715
-#: gajim/roster_window.py:1717 gajim/roster_window.py:1872
-#: gajim/roster_window.py:2531 gajim/roster_window.py:5025
-#: gajim/common/contacts.py:188 gajim/common/contacts.py:447
-#: gajim/common/helpers.py:83 gajim/gtk/discovery.py:129
-#: gajim/gtk/discovery.py:130 gajim/gtk/discovery.py:1416
+#: gajim/roster_window.py:850 gajim/roster_window.py:1628
+#: gajim/roster_window.py:1661 gajim/roster_window.py:1712
+#: gajim/roster_window.py:1714 gajim/roster_window.py:1869
+#: gajim/roster_window.py:2528 gajim/roster_window.py:4331
+#: gajim/roster_window.py:4964 gajim/common/contacts.py:204
+#: gajim/common/contacts.py:463 gajim/common/helpers.py:86
+#: gajim/gtk/discovery.py:127 gajim/gtk/discovery.py:128
+#: gajim/gtk/discovery.py:1414
 msgid "Transports"
 msgstr "Преноси"
 
-#: gajim/roster_window.py:1723 gajim/roster_window.py:1725
-#: gajim/roster_window.py:4995 gajim/gui_interface.py:1613
-#: gajim/gui_interface.py:1639 gajim/common/contacts.py:186
-#: gajim/common/helpers.py:83 gajim/common/modules/adhoc_commands.py:245
-msgid "Groupchats"
+#: gajim/roster_window.py:1720 gajim/roster_window.py:1722
+#: gajim/roster_window.py:4331 gajim/roster_window.py:4934
+#: gajim/gui_interface.py:1527 gajim/common/contacts.py:202
+#: gajim/common/helpers.py:86 gajim/common/modules/adhoc_commands.py:245
+#, fuzzy
+msgid "Group chats"
 msgstr "Групни разговори"
 
-#: gajim/roster_window.py:2012
+#: gajim/roster_window.py:2009
 #, fuzzy
 msgid "Authorization sent"
 msgstr "Ауторизација послата"
 
-#: gajim/roster_window.py:2013
+#: gajim/roster_window.py:2010
 #, fuzzy, python-format
 msgid "\"%s\" will now see your status."
 msgstr "Сада ће контакт \"%s\" знати Ваш статус."
 
-#: gajim/roster_window.py:2031
+#: gajim/roster_window.py:2028
 msgid "Subscription request has been sent"
 msgstr "Захтев за претплатом послат"
 
-#: gajim/roster_window.py:2032
-#, python-format
-msgid "If \"%s\" accepts this request you will know his or her status."
+#: gajim/roster_window.py:2029
+#, fuzzy, python-format
+msgid "If \"%s\" accepts this request you will know their status."
 msgstr "Ако контакт \"%s\" прихвати овај захтев, знаћете његов/њен статус."
 
-#: gajim/roster_window.py:2046
+#: gajim/roster_window.py:2043
 #, fuzzy
 msgid "Authorization removed"
 msgstr "Ауторизација уклоњена"
 
-#: gajim/roster_window.py:2047
+#: gajim/roster_window.py:2044
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Сада ће Вас контакт \"%s\" увек видети као да нисте на вези."
 
-#: gajim/roster_window.py:2250 gajim/roster_window.py:3504
+#: gajim/roster_window.py:2247 gajim/roster_window.py:3460
 msgid "Disconnect for Invisibility"
 msgstr ""
 
-#: gajim/roster_window.py:2251 gajim/roster_window.py:3505
+#: gajim/roster_window.py:2248 gajim/roster_window.py:3461
 msgid "You are participating in one or more group chats"
 msgstr "Учествујете у једном или више групних разговора"
 
-#: gajim/roster_window.py:2252 gajim/roster_window.py:3506
+#: gajim/roster_window.py:2249 gajim/roster_window.py:3462
 #, fuzzy
 msgid ""
-"Changing your status to invisible will result in disconnection from those "
-"group chats.\n"
+"Changing your status to invisible will result in you leaving those group "
+"chats.\n"
 "Are you sure you want to go invisible?"
 msgstr ""
 "Промена Вашег статуса у Невидљив ће резултовати  одвезивањем са тих групних "
 "разговора. Јесте ли сигурни да желите ићи на невидљиво?"
 
-#: gajim/roster_window.py:2257 gajim/roster_window.py:3512
-#: gajim/roster_window.py:5238 gajim/data/gui/gc_control_popup_menu.ui:120
+#: gajim/roster_window.py:2254 gajim/roster_window.py:3468
+#: gajim/data/gui/gc_control_popup_menu.ui:120
 msgid "_Disconnect"
 msgstr "_Излогуј се"
 
-#: gajim/roster_window.py:2285
+#: gajim/roster_window.py:2282
 #, fuzzy
 msgid "desynced"
 msgstr "десинхронизован"
 
-#: gajim/roster_window.py:2353 gajim/data/gui/shortcuts_window.ui:224
+#: gajim/roster_window.py:2350 gajim/data/gui/shortcuts_window.ui:224
 #, fuzzy
 msgid "Quit Gajim"
 msgstr "Гајим"
 
-#: gajim/roster_window.py:2354
+#: gajim/roster_window.py:2351
 #, fuzzy
 msgid "You are about to quit Gajim"
 msgstr "Јесте ли сигурни да желите затворити Гајим?"
 
-#: gajim/roster_window.py:2355
+#: gajim/roster_window.py:2352
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Јесте ли сигурни да желите затворити Гајим?"
 
-#: gajim/roster_window.py:2356
+#: gajim/roster_window.py:2353
 #, fuzzy
 msgid "_Always quit when closing Gajim"
 msgstr "Увек затвори Гајим"
 
-#: gajim/roster_window.py:2359 gajim/roster_window.py:2455
-#: gajim/roster_window.py:2495 gajim/data/gui/systray_context_menu.ui:90
+#: gajim/roster_window.py:2356 gajim/roster_window.py:2452
+#: gajim/roster_window.py:2492 gajim/data/gui/systray_context_menu.ui:83
 msgid "_Quit"
 msgstr ""
 
-#: gajim/roster_window.py:2448
+#: gajim/roster_window.py:2445
 #, fuzzy
 msgid "Stop File Transfers"
 msgstr "Преноси датотека"
 
-#: gajim/roster_window.py:2449
+#: gajim/roster_window.py:2446
 #, fuzzy
 msgid "You still have running file transfers"
 msgstr "Прекини пренос датотеке"
 
-#: gajim/roster_window.py:2450
+#: gajim/roster_window.py:2447
 msgid ""
 "If you quit now, the file(s) being transferred will be lost.\n"
 "Do you still want to quit?"
 msgstr ""
 
-#: gajim/roster_window.py:2488
+#: gajim/roster_window.py:2485
 #, fuzzy
 msgid "Unread Messages"
 msgstr "Непрочитани догађаји"
 
-#: gajim/roster_window.py:2489
+#: gajim/roster_window.py:2486
 #, fuzzy
 msgid "You still have unread messages"
 msgstr "Имате непрочитаних порука"
 
-#: gajim/roster_window.py:2490
+#: gajim/roster_window.py:2487
 #, fuzzy
 msgid ""
 "Messages will only be available for reading them later if storing chat "
@@ -1480,20 +1453,20 @@ msgstr ""
 "Поруке ће бити доступне за читање и касније ако имате омогућен историјат и "
 "тај контакт у листи."
 
-#: gajim/roster_window.py:2760
+#: gajim/roster_window.py:2753
 msgid "You have unread messages"
 msgstr "Имате непрочитаних порука"
 
-#: gajim/roster_window.py:2761
+#: gajim/roster_window.py:2754
 msgid "You must read them before removing this transport."
 msgstr "Морате их прочитати пре уклањања овог транспорта."
 
-#: gajim/roster_window.py:2764
+#: gajim/roster_window.py:2757
 #, fuzzy, python-format
 msgid "Transport '%s' will be removed"
 msgstr "Транспорт \"%s\" ће бити уклоњен"
 
-#: gajim/roster_window.py:2765
+#: gajim/roster_window.py:2758
 #, fuzzy
 msgid ""
 "You will no longer be able to send and receive messages from and to contacts "
@@ -1502,11 +1475,11 @@ msgstr ""
 "Нећете више бити у могућности да размењујете поруке са конткатима са овог "
 "транспорта."
 
-#: gajim/roster_window.py:2768
+#: gajim/roster_window.py:2761
 msgid "Transports will be removed"
 msgstr "Транспорт ће бити уклоњен"
 
-#: gajim/roster_window.py:2773
+#: gajim/roster_window.py:2766
 #, fuzzy, python-format
 msgid ""
 "You will no longer be able to send and receive messages from and to contacts "
@@ -1516,22 +1489,22 @@ msgstr ""
 "Нећете више бити у могућности да размењујете поруке са конткатима са овог "
 "транспорта."
 
-#: gajim/roster_window.py:2777
+#: gajim/roster_window.py:2770
 #, fuzzy
 msgid "Remove Transport"
 msgstr "Прикажи транс_порте"
 
-#: gajim/roster_window.py:2844
+#: gajim/roster_window.py:2837
 #, fuzzy
 msgid "Block Contact"
 msgstr "Блокирани контакти"
 
-#: gajim/roster_window.py:2845
+#: gajim/roster_window.py:2838
 #, fuzzy
 msgid "Really block this contact?"
 msgstr "Да ли је OpenPGP омогућен за овај контакт?"
 
-#: gajim/roster_window.py:2846
+#: gajim/roster_window.py:2839
 #, fuzzy
 msgid ""
 "This contact will see you offline and you will not receive any messages sent "
@@ -1540,64 +1513,59 @@ msgstr ""
 "Контакт ће вас видети као да нисте на вези и нећете добијати поруке које вам "
 "шаље."
 
-#: gajim/roster_window.py:2851
+#: gajim/roster_window.py:2844
 #, fuzzy
 msgid "_Block Contact"
 msgstr "Блокирани контакти"
 
-#: gajim/roster_window.py:2896
+#: gajim/roster_window.py:2889
 msgid "Rename Contact"
 msgstr "Преименуј контакт"
 
-#: gajim/roster_window.py:2897
+#: gajim/roster_window.py:2890
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Унесите нови надимак за контакт %s"
 
-#: gajim/roster_window.py:2904
+#: gajim/roster_window.py:2897
 msgid "Rename Group"
 msgstr "Преименуј групу"
 
-#: gajim/roster_window.py:2905
+#: gajim/roster_window.py:2898
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Унесите ново име за групу %s"
 
-#: gajim/roster_window.py:2953 gajim/roster_window.py:2954
+#: gajim/roster_window.py:2946 gajim/roster_window.py:2947
 msgid "Remove Group"
 msgstr "Уклони групу"
 
-#: gajim/roster_window.py:2955
+#: gajim/roster_window.py:2948
 #, fuzzy, python-format
 msgid "Do you want to remove %s from the contact list?"
 msgstr "Желите ли уклонити групу %s са листе контаката?"
 
-#: gajim/roster_window.py:2956
+#: gajim/roster_window.py:2949
 #, fuzzy
 msgid "_Also remove all contacts of this group from contact list"
 msgstr "Уједно уклоња и све контакте из ове групе из листе контаката"
 
-#: gajim/roster_window.py:3044
-#, fuzzy, python-format
-msgid "%(jid)s has been invited in this room"
-msgstr "%(nick)s је избачен из собе (%(reason)s)"
-
-#: gajim/roster_window.py:3353
+#: gajim/roster_window.py:3309
 #, fuzzy
 msgid "Remove Contact"
 msgstr "Преименуј контакт"
 
-#: gajim/roster_window.py:3354
+#: gajim/roster_window.py:3310
 #, fuzzy
 msgid "Remove contact from contact list"
 msgstr "Уклања контакт са листе"
 
-#: gajim/roster_window.py:3355
+#: gajim/roster_window.py:3311
 #, 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:3364 gajim/roster_window.py:3384
+#: gajim/roster_window.py:3320 gajim/roster_window.py:3340
 #, fuzzy
 msgid ""
 "By removing this contact you also remove authorization. This means the "
@@ -1607,21 +1575,21 @@ msgstr ""
 "уједно уклањате и одобрење пто значи да ће Вас те особе увек видети као да "
 "нисте на вези."
 
-#: gajim/roster_window.py:3375
+#: gajim/roster_window.py:3331
 msgid "Do you want to continue?"
 msgstr "Да ли желите да наставите?"
 
-#: gajim/roster_window.py:3386
+#: gajim/roster_window.py:3342
 #, fuzzy
 msgid "_I want this contact to know my status after removal"
 msgstr "Желим да овај контакт зна мој статус и након уклањања"
 
-#: gajim/roster_window.py:3393
+#: gajim/roster_window.py:3349
 #, fuzzy
 msgid "Remove contacts from contact list"
 msgstr "Уклања контакт са листе"
 
-#: gajim/roster_window.py:3399
+#: gajim/roster_window.py:3355
 #, fuzzy, python-format
 msgid ""
 "By removing the following contacts, you will also remove authorization. This "
@@ -1633,26 +1601,26 @@ msgstr ""
 "уједно уклањате и одобрење пто значи да ће Вас те особе увек видети као да "
 "нисте на вези."
 
-#: gajim/roster_window.py:3403
+#: gajim/roster_window.py:3359
 #, fuzzy
 msgid "Remove Contacts"
 msgstr "Преименуј контакт"
 
-#: gajim/roster_window.py:3423
+#: gajim/roster_window.py:3379
 msgid "No account available"
 msgstr "Нема доступних налога"
 
-#: gajim/roster_window.py:3424
+#: gajim/roster_window.py:3380
 msgid "You must create an account before you can chat with other contacts."
 msgstr ""
 "Морате креирати налог пре него што можете да разговарате са осталим "
 "контактима."
 
-#: gajim/roster_window.py:4060
+#: gajim/roster_window.py:4011
 msgid "Metacontacts storage not supported by your server"
 msgstr "Чување псеудоконтаката није подржано од стране Вашег сервера"
 
-#: gajim/roster_window.py:4062
+#: gajim/roster_window.py:4013
 #, fuzzy
 msgid ""
 "Your server does not support storing metacontacts information. So this "
@@ -1661,13 +1629,13 @@ msgstr ""
 "Ваш сервер не подржава чување информација псеудоконтаката. Те информације "
 "неће бити сачуване при следећем повезивању."
 
-#: gajim/roster_window.py:4159
+#: gajim/roster_window.py:4110
 #, fuzzy
 msgid "You are about to create a metacontact"
 msgstr ""
 "Управо ћете направити псеудоконткат. Јесте ли сигурни да желите наставити?"
 
-#: gajim/roster_window.py:4160
+#: gajim/roster_window.py:4111
 #, fuzzy
 msgid ""
 "Metacontacts are a way to regroup several contacts in one single contact. "
@@ -1678,26 +1646,26 @@ msgstr ""
 "Генерално, они се користе када иста особа има неколико Џабер налога или "
 "транспортних налога."
 
-#: gajim/roster_window.py:4164
+#: gajim/roster_window.py:4115
 #, fuzzy
 msgid "Create Metacontact"
 msgstr "Преименуј контакт"
 
-#: gajim/roster_window.py:4170
+#: gajim/roster_window.py:4121 gajim/data/gui/groupchat_creation.ui:317
 #, fuzzy
 msgid "_Create"
 msgstr "Креативан"
 
-#: gajim/roster_window.py:4287
+#: gajim/roster_window.py:4238
 msgid "Invalid file URI:"
 msgstr "Неисправан URI датотеке:"
 
-#: gajim/roster_window.py:4298
+#: gajim/roster_window.py:4249
 #, fuzzy
 msgid "Send file?"
 msgstr "Пошаљи _датотеку"
 
-#: gajim/roster_window.py:4299
+#: gajim/roster_window.py:4250
 #, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
@@ -1705,98 +1673,89 @@ msgstr[0] "Да ли желите послати ову датотеку кон�
 msgstr[1] "Да ли желите послати ове датотеке контакту %s:"
 msgstr[2] "Да ли желите послати ове датотеке контакту %s:"
 
-#: gajim/roster_window.py:4451
+#: gajim/roster_window.py:4401
 #, fuzzy, python-format
 msgid "Send %(from)s to %(to)s"
 msgstr "Пошаљи %s за %s"
 
-#: gajim/roster_window.py:4464
+#: gajim/roster_window.py:4414
 #, fuzzy, python-format
 msgid "Make %s first contact"
 msgstr "Направи метаконтакте од %s и %s"
 
-#: gajim/roster_window.py:4469
+#: gajim/roster_window.py:4419
 #, fuzzy, python-format
 msgid "Make %(contact1)s and %(contact2)s metacontacts"
 msgstr "Направи метаконтакте од %s и %s"
 
-#: gajim/roster_window.py:4825 gajim/roster_window.py:4923
+#: gajim/roster_window.py:4775 gajim/roster_window.py:4862
 msgid "_Change Status Message"
 msgstr "_Измени статусну поруку"
 
-#: gajim/roster_window.py:4845
+#: gajim/roster_window.py:4795
 msgid "Publish Tune"
 msgstr "Објави песму"
 
-#: gajim/roster_window.py:4856
+#: gajim/roster_window.py:4806
 #, fuzzy
 msgid "Publish Location"
 msgstr "Објави песму"
 
-#: gajim/roster_window.py:4868
-#, fuzzy
-msgid "Configure Services…"
-msgstr "Конфигуриши сервисе..."
-
-#: gajim/roster_window.py:4997
+#: gajim/roster_window.py:4936
 msgid "_Maximize All"
 msgstr "_Увећај све"
 
-#: gajim/roster_window.py:5004 gajim/roster_window.py:5146
+#: gajim/roster_window.py:4943 gajim/roster_window.py:5085
 msgid "Send Group M_essage"
 msgstr "П_ошаљи групну поруку"
 
-#: gajim/roster_window.py:5011
+#: gajim/roster_window.py:4950
 msgid "To all users"
 msgstr "Свим корисницима"
 
-#: gajim/roster_window.py:5015
+#: gajim/roster_window.py:4954
 msgid "To all online users"
 msgstr "Свим корисницима на вези"
 
-#: gajim/roster_window.py:5027 gajim/roster_window.py:5152
+#: gajim/roster_window.py:4966 gajim/roster_window.py:5091
 #: gajim/data/gui/gc_occupants_menu.ui:110
 #: gajim/data/gui/contact_context_menu.ui:36
 msgid "In_vite to"
 msgstr "Позо_ви у"
 
-#: gajim/roster_window.py:5162
+#: gajim/roster_window.py:5101
 msgid "_Manage Contacts"
 msgstr "_Управљање контактима"
 
-#: gajim/roster_window.py:5168
+#: gajim/roster_window.py:5107
 #, fuzzy
 msgid "Edit _Groups…"
 msgstr "Измени групе"
 
-#: gajim/roster_window.py:5189 gajim/data/gui/filetransfers.ui:12
+#: gajim/roster_window.py:5128 gajim/data/gui/filetransfers.ui:12
 #: gajim/data/gui/remove_account_window.ui:134
 msgid "_Remove"
 msgstr "_Уклони"
 
-#: gajim/roster_window.py:5226
+#: gajim/roster_window.py:5165
 msgid "_Maximize"
 msgstr "_Увећај"
 
-#: gajim/roster_window.py:5233
+#: gajim/roster_window.py:5172
 msgid "_Reconnect"
 msgstr "У_логуј се поново"
 
-#: gajim/roster_window.py:5254 gajim/data/gui/gc_occupants_menu.ui:170
+#: gajim/roster_window.py:5193 gajim/data/gui/gc_occupants_menu.ui:170
 #: gajim/data/gui/gc_control_popup_menu.ui:113
 #: gajim/data/gui/contact_context_menu.ui:205
 msgid "_History"
 msgstr "_Историјат"
 
-#: gajim/roster_window.py:5335 gajim/data/gui/application_menu.ui:86
+#: gajim/roster_window.py:5274 gajim/data/gui/application_menu.ui:83
 #: gajim/data/gui/history_window.ui:57
 msgid "History Manager"
 msgstr "Управник историјатом"
 
-#: gajim/roster_window.py:5343
-msgid "_Join New Group Chat"
-msgstr "_Придруживање новом групном разговору"
-
 #: gajim/dataforms_widget.py:585
 #, fuzzy
 msgid "Unable to load image"
@@ -1920,225 +1879,242 @@ msgstr "Тема: %s\n"
 msgid "Write a message…"
 msgstr "статусна порука"
 
-#: gajim/message_window.py:250
+#: gajim/message_window.py:356
+#, fuzzy
+msgid "Close Tabs"
+msgstr "_Пошаљи и затвори"
+
+#: gajim/message_window.py:357
 msgid "You are going to close several tabs"
 msgstr "Затворићете неколико језичака"
 
-#: gajim/message_window.py:251
+#: gajim/message_window.py:358
 msgid "Do you really want to close them all?"
 msgstr "Да ли заиста желите да их све затворите?"
 
-#: gajim/message_window.py:539
+#: gajim/message_window.py:514
 #, fuzzy
 msgid "?Noun:Chats"
 msgstr "Групни разговори"
 
-#: gajim/message_window.py:543
+#: gajim/message_window.py:518
 #, fuzzy
 msgid "Group Chats"
 msgstr "Групни разговори"
 
-#: gajim/message_window.py:547
+#: gajim/message_window.py:522
 msgid "Private Chats"
 msgstr "Приватни Разговори"
 
-#: gajim/message_window.py:553
+#: gajim/message_window.py:528
 msgid "Messages"
 msgstr "Поруке"
 
-#: gajim/gui_interface.py:173
+#: gajim/gui_interface.py:170
+#, 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:175
 msgid "Do you accept this request?"
 msgstr "Прихватате ли овај захтев?"
 
-#: gajim/gui_interface.py:175
-#, python-format
-msgid "Do you accept this request on account %s?"
+#: gajim/gui_interface.py:177
+#, fuzzy, python-format
+msgid "Do you accept this request (account: %s)?"
 msgstr "Прихватате ли овај захтев на налогу %s?"
 
-#: gajim/gui_interface.py:178
-#, 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:182
+#, fuzzy
+msgid "Authorization"
+msgstr "Ауторизација послата"
 
-#: gajim/gui_interface.py:194 gajim/gtk/notification.py:175
+#: gajim/gui_interface.py:186 gajim/gui_interface.py:420
+#: gajim/gtk/filetransfer.py:338
+#, fuzzy
+msgid "_No"
+msgstr "Ништа"
+
+#: gajim/gui_interface.py:205 gajim/gtk/notification.py:175
 #: gajim/gtk/notification.py:197
 msgid "Connection Failed"
 msgstr "Веза прекинута"
 
-#: gajim/gui_interface.py:279 gajim/gui_interface.py:529
-msgid "Password Required"
-msgstr "Лозинка захтевана"
-
-#: gajim/gui_interface.py:280
-#, python-format
-msgid "A Password is required to join the room %s. Please type it."
-msgstr "Лозинка потребна за придруживање групном разговору %s. Унесите је."
-
-#: gajim/gui_interface.py:342 gajim/gui_interface.py:346
+#: gajim/gui_interface.py:325 gajim/gui_interface.py:329
 #, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr "Грешка %(code)s: %(msg)s"
 
-#: gajim/gui_interface.py:357 gajim/gui_interface.py:376
+#: gajim/gui_interface.py:340 gajim/gui_interface.py:359
 #: gajim/common/modules/message.py:122
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "грешка приликом слања %(message)s ( %(error)s )"
 
-#: gajim/gui_interface.py:401 gajim/gtk/notification.py:175
+#: gajim/gui_interface.py:384 gajim/gtk/notification.py:175
 msgid "Subscription request"
 msgstr "Захтев за претплатом"
 
-#: gajim/gui_interface.py:413 gajim/common/contacts.py:184
-#: gajim/common/helpers.py:83
+#: gajim/gui_interface.py:396 gajim/common/contacts.py:200
+#: gajim/common/helpers.py:86
 msgid "Observers"
 msgstr "Посматрачи"
 
-#: gajim/gui_interface.py:422
+#: gajim/gui_interface.py:405
 msgid "Authorization accepted"
 msgstr "Ауторизација прихваћена"
 
-#: gajim/gui_interface.py:423
+#: gajim/gui_interface.py:406
 #, fuzzy, python-format
 msgid "The contact \"%s\" has authorized you to see their status."
 msgstr "Контакт \"%s\" је прихватио да видите његов/њен статус."
 
-#: gajim/gui_interface.py:431
-#, python-format
-msgid "Contact \"%s\" removed subscription from you"
+#: gajim/gui_interface.py:415
+#, fuzzy
+msgid "Subscription Removed"
+msgstr "Захтев за претплатом"
+
+#: gajim/gui_interface.py:416
+#, fuzzy, python-format
+msgid "Contact '%s' removed subscription from you"
 msgstr "Контакт \"%s\" је укинуо претплату на њега"
 
-#: gajim/gui_interface.py:432
+#: gajim/gui_interface.py:417
 #, fuzzy
 msgid ""
-"You will always see them as offline.\n"
+"You will always see this contact as offline.\n"
 "Do you want to remove them from your contact list?"
 msgstr ""
 "Увек ћете га/је видети као да није на вези.\n"
 "Да ли желите да га/је уклоните са листе контаката?"
 
-#: gajim/gui_interface.py:453 gajim/gtk/notification.py:176
+#: gajim/gui_interface.py:442 gajim/gtk/notification.py:176
 msgid "Unsubscribed"
 msgstr "Укинута претплата"
 
-#: gajim/gui_interface.py:465
+#: gajim/gui_interface.py:454
 #, python-format
 msgid "%(jid)s declined the invitation: %(reason)s"
 msgstr ""
 
-#: gajim/gui_interface.py:469
+#: gajim/gui_interface.py:458
 #, python-format
 msgid "%(jid)s declined the invitation"
 msgstr ""
 
-#: gajim/gui_interface.py:485
+#: gajim/gui_interface.py:474
 #, fuzzy, python-brace-format
 msgid "You are invited to {room} by {user}"
 msgstr "Позвани сте у групни разговор"
 
-#: gajim/gui_interface.py:506
+#: gajim/gui_interface.py:495
 #, fuzzy
 msgid "Certificate Passphrase Required"
 msgstr "Сертификат је истекао"
 
-#: gajim/gui_interface.py:507
+#: gajim/gui_interface.py:496
 #, fuzzy, python-format
 msgid "Enter the certificate passphrase for account %s"
 msgstr "Унесите лозинку GPG кључа %(keyid)s (налог %(account)s)."
 
-#: gajim/gui_interface.py:516 gajim/gtk/accounts.py:963
+#: gajim/gui_interface.py:505 gajim/gtk/accounts.py:966
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Унесите Вашу лозинку за рачун %s"
 
-#: gajim/gui_interface.py:529 gajim/gtk/accounts.py:964
+#: gajim/gui_interface.py:518
+msgid "Password Required"
+msgstr "Лозинка захтевана"
+
+#: gajim/gui_interface.py:518 gajim/gtk/accounts.py:967
 msgid "Save password"
 msgstr "Сачувај лозинку"
 
-#: gajim/gui_interface.py:601 gajim/gui_interface.py:632
+#: gajim/gui_interface.py:587 gajim/gui_interface.py:618
+#: gajim/gtk/filetransfer.py:332 gajim/gtk/filetransfer.py:333
 #: gajim/gtk/notification.py:173 gajim/gtk/notification.py:276
 msgid "File Transfer Error"
 msgstr "Грешка при преносу датотеке"
 
-#: gajim/gui_interface.py:666
+#: gajim/gui_interface.py:652
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s Вам жели послати датотеку."
 
-#: gajim/gui_interface.py:668 gajim/gtk/filetransfer.py:479
+#: gajim/gui_interface.py:654 gajim/gtk/filetransfer.py:484
 #: gajim/gtk/notification.py:172 gajim/gtk/notification.py:274
 msgid "File Transfer Request"
 msgstr "Захтев за преносом датотеке"
 
-#: gajim/gui_interface.py:767
+#: gajim/gui_interface.py:753
 #, fuzzy
 msgid "Remote Contact Stopped Transfer"
 msgstr "Удаљени контакт је прекинуо пренос"
 
-#: gajim/gui_interface.py:772
+#: gajim/gui_interface.py:758
 #, fuzzy
 msgid "Error Opening File"
 msgstr "Грешка при отварању датотеке"
 
-#: gajim/gui_interface.py:782
+#: gajim/gui_interface.py:768
 #, fuzzy
 msgid "SSL Certificate Error"
 msgstr "Грешка SSL сертификата"
 
-#: gajim/gui_interface.py:795 gajim/gui_interface.py:826
-#: gajim/gui_interface.py:853 gajim/gtk/notification.py:174
+#: gajim/gui_interface.py:781 gajim/gui_interface.py:812
+#: gajim/gui_interface.py:839 gajim/gtk/notification.py:174
 #: gajim/gtk/notification.py:279
 msgid "File Transfer Stopped"
 msgstr "Пренос датотеке заустављен"
 
-#: gajim/gui_interface.py:799
+#: gajim/gui_interface.py:785
 #, fuzzy
 msgid "File Transfer Failed"
 msgstr "Преноси датотека"
 
-#: gajim/gui_interface.py:822
+#: gajim/gui_interface.py:808
 #, fuzzy, python-format
 msgid "%(filename)s received from %(name)s."
 msgstr "Пренос датотеке %(filename)s од контакта %(name)s је заустављен."
 
-#: gajim/gui_interface.py:827
+#: gajim/gui_interface.py:813
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Пренос датотеке %(filename)s од контакта %(name)s је заустављен."
 
-#: gajim/gui_interface.py:833
+#: gajim/gui_interface.py:819
 #, fuzzy, python-format
 msgid "File transfer of %(filename)s from %(name)s failed."
 msgstr "Пренос датотеке %(filename)s од контакта %(name)s је заустављен."
 
-#: gajim/gui_interface.py:848
+#: gajim/gui_interface.py:834
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Успешно сте послали датотеку %(filename)s за контакт %(name)s"
 
-#: gajim/gui_interface.py:854
+#: gajim/gui_interface.py:840
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Пренос %(filename)s за контакт %(name)s је заустављен. "
 
-#: gajim/gui_interface.py:860
+#: gajim/gui_interface.py:846
 #, fuzzy, python-format
 msgid "File transfer of %(filename)s to %(name)s failed."
 msgstr "Пренос %(filename)s за контакт %(name)s је заустављен. "
 
-#: gajim/gui_interface.py:971
+#: gajim/gui_interface.py:957
 msgid "Username Conflict"
 msgstr "Конфликт корисничког имена"
 
-#: gajim/gui_interface.py:972
+#: gajim/gui_interface.py:958
 msgid "Please type a new username for your local account"
 msgstr "Молимо Вас унесите ново корисничко име за Ваш локални налог"
 
-#: gajim/gui_interface.py:995
+#: gajim/gui_interface.py:981
 msgid "Resource Conflict"
 msgstr "Конфликт ресурса"
 
-#: gajim/gui_interface.py:996
+#: gajim/gui_interface.py:982
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
@@ -2146,31 +2122,31 @@ msgstr ""
 "Већ сте конектовани на овај налог са истим ресурсем. Молимо Вас, откуцајте "
 "ново име ресурса"
 
-#: gajim/gui_interface.py:1053
+#: gajim/gui_interface.py:1039
 #, fuzzy, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s Вам жели послати датотеку."
 
-#: gajim/gui_interface.py:1055
+#: gajim/gui_interface.py:1041
 #, fuzzy
 msgid "Voice Chat Request"
 msgstr "Захтев за преносом датотеке"
 
-#: gajim/gui_interface.py:1123 gajim/gtk/account_wizard.py:312
+#: gajim/gui_interface.py:1109 gajim/gtk/account_wizard.py:312
 msgid "Certificate Already in File"
 msgstr "Сертификат је већ у датотеци"
 
-#: gajim/gui_interface.py:1124 gajim/gtk/account_wizard.py:313
+#: gajim/gui_interface.py:1110 gajim/gtk/account_wizard.py:313
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr "Сертификат је већ у датотеци %s, па није поново додат."
 
-#: gajim/gui_interface.py:1145
+#: gajim/gui_interface.py:1131
 #, fuzzy, python-format
 msgid "The authenticity of the %s certificate could be invalid"
 msgstr "Аутентичност сертификата %s може бити неисправна."
 
-#: gajim/gui_interface.py:1148
+#: gajim/gui_interface.py:1134
 #, python-format
 msgid ""
 "\n"
@@ -2179,7 +2155,7 @@ msgstr ""
 "\n"
 "Непозната SSL грешка: %d"
 
-#: gajim/gui_interface.py:1150
+#: gajim/gui_interface.py:1136
 #, python-format
 msgid ""
 "\n"
@@ -2188,11 +2164,11 @@ msgstr ""
 "\n"
 "SSL грешка: <b>%s</b>"
 
-#: gajim/gui_interface.py:1155
+#: gajim/gui_interface.py:1141
 msgid "Error verifying SSL certificate"
 msgstr "Грешка при верификацији SSL сертификата"
 
-#: gajim/gui_interface.py:1156
+#: gajim/gui_interface.py:1142
 #, fuzzy, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your XMPP server: "
@@ -2203,7 +2179,7 @@ msgstr ""
 "%(error)s\n"
 "Да ли и даље желите да се конектујете на овај сервер?"
 
-#: gajim/gui_interface.py:1160 gajim/gtk/account_wizard.py:412
+#: gajim/gui_interface.py:1146 gajim/gtk/account_wizard.py:413
 #, fuzzy, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -2218,206 +2194,197 @@ msgstr ""
 "SHA256 отисак овог сертификата:\n"
 "%s"
 
-#: gajim/gui_interface.py:1166
+#: gajim/gui_interface.py:1152
 msgid "Ignore this error for this certificate."
 msgstr "Игнориши ову грешку за овај сертификат."
 
-#: gajim/gui_interface.py:1174
+#: gajim/gui_interface.py:1160
 #, fuzzy, python-format
 msgid "SSL Certificate Verification for %s"
 msgstr "Грешка SSL сертификата"
 
-#: gajim/gui_interface.py:1442 gajim/gtk/join_groupchat.py:235
-msgid "You can not join a group chat unless you are connected."
-msgstr "Не можете се прикључити групном разговору ако нисте повезани."
-
-#: gajim/gui_interface.py:1448
-#, fuzzy
-msgid "JID is not a Groupchat"
-msgstr "Ово није групни разговор"
-
-#: gajim/gui_interface.py:1579
-msgid "This is not a group chat"
-msgstr "Ово није групни разговор"
-
-#: gajim/gui_interface.py:1580
-#, python-format
-msgid ""
-"%(room_jid)s is already in your roster. Please check if %(room_jid)s is a "
-"correct group chat name. If it is, delete it from your roster and try "
-"joining the group chat again."
-msgstr ""
-
-#: gajim/gui_interface.py:1604 gajim/dialog_messages.py:58
+#: gajim/gui_interface.py:1577
 msgid "You cannot join a group chat while you are invisible"
 msgstr "Немогуће је приступити групном разговору ако сте невидљиви"
 
-#: gajim/gui_interface.py:2037
+#: gajim/gui_interface.py:1976
 msgid "Could not save your settings and preferences"
 msgstr "Није могуће чување Ваших подешавања"
 
-#: gajim/gui_interface.py:2098
+#: gajim/gui_interface.py:2037
 msgid "Gajim: IPython Console"
 msgstr ""
 
-#: gajim/dialog_messages.py:32
+#: gajim/dialog_messages.py:31 gajim/dialog_messages.py:36
+#: gajim/gtk/single_message.py:305 gajim/gtk/account_wizard.py:229
 #, fuzzy
-msgid "You can not start a new conversation unless you are connected."
-msgstr "Не можете се прикључити групном разговору ако нисте повезани."
-
-#: gajim/dialog_messages.py:36 gajim/dialog_messages.py:41
-#: gajim/gtk/single_message.py:305 gajim/gtk/join_groupchat.py:211
-#: gajim/gtk/account_wizard.py:229
-msgid "Invalid JID"
-msgstr "Неисправан џабер ИД"
+msgid "Invalid XMPP Address"
+msgstr "Неисправна датотека"
 
-#: gajim/dialog_messages.py:42 gajim/gtk/single_message.py:306
-#, python-format
-msgid "It is not possible to send a message to %s, this JID is not valid."
+#: gajim/dialog_messages.py:37
+#, fuzzy, python-format
+msgid ""
+"It is not possible to send a message to %s. This XMPP Address is not valid."
 msgstr "Није могуће послати поруку за %s, овај џабер ИД није исправан."
 
-#: gajim/dialog_messages.py:47
-msgid "Unread events"
+#: gajim/dialog_messages.py:42
+#, fuzzy
+msgid "Unread Events"
 msgstr "Непрочитани догађаји"
 
-#: gajim/dialog_messages.py:48
-msgid "Read all pending events before removing this account."
+#: gajim/dialog_messages.py:43
+#, fuzzy
+msgid "Read or acknowledge all pending events before removing this account."
 msgstr "Прочитајте све догађаје на чекању пре уклањања налога."
 
-#: gajim/dialog_messages.py:52
+#: gajim/dialog_messages.py:48
 #, fuzzy
 msgid "Invalid Form"
 msgstr "Неисправна соба"
 
-#: gajim/dialog_messages.py:53
+#: gajim/dialog_messages.py:49
 #, fuzzy
 msgid "The form is not filled correctly."
 msgstr "Надимак садржи недозвољене карактере."
 
-#: gajim/dialog_messages.py:57 gajim/common/helpers.py:309
+#: gajim/dialog_messages.py:53 gajim/common/helpers.py:315
 msgid "Invisible"
 msgstr "Невидљив"
 
-#: gajim/dialog_messages.py:62
+#: gajim/dialog_messages.py:54
 #, fuzzy
-msgid "A connection is not available"
+msgid "You cannot join a group chat while being invisible."
+msgstr "Немогуће је приступити групном разговору ако сте невидљиви"
+
+#: gajim/dialog_messages.py:58
+#, fuzzy
+msgid "No Connection Available"
 msgstr "Веза није доступна"
 
-#: gajim/dialog_messages.py:63
+#: gajim/dialog_messages.py:59
 #, fuzzy
 msgid "Your message can not be sent until you are connected."
 msgstr "Не можете се прикључити групном разговору ако нисте повезани."
 
-#: gajim/dialog_messages.py:67
-#, fuzzy
-msgid "JID already in list"
-msgstr "Џабер ID већ у листи контаката"
+#: gajim/dialog_messages.py:63
+msgid "XMPP Address Already in List"
+msgstr ""
 
-#: gajim/dialog_messages.py:68
+#: gajim/dialog_messages.py:64
 #, fuzzy
-msgid "The JID you entered is already in the list. Choose another one."
+msgid ""
+"The XMPP Address you entered is already in the list. Please choose another "
+"one."
 msgstr "Џабер ID који сте унели је већ на листи. Одаберите неки други."
 
-#: gajim/dialog_messages.py:72
-msgid "Invalid answer"
+#: gajim/dialog_messages.py:69
+#, fuzzy
+msgid "Invalid Answer"
 msgstr "Неисправан одговор"
 
-#: gajim/dialog_messages.py:73
+#: gajim/dialog_messages.py:70
 #, python-format
 msgid "Transport %(name)s answered wrongly to register request: %(error)s"
 msgstr "Транспорт %(name)s је лоше одговорио на захтев регистрације: %(error)s"
 
-#: gajim/dialog_messages.py:78
+#: gajim/dialog_messages.py:75
 #, fuzzy
 msgid "Wrong Custom Hostname"
 msgstr "Користи Ваше одређено име хоста/порт "
 
-#: gajim/dialog_messages.py:79
+#: gajim/dialog_messages.py:76
 #, fuzzy, python-format
-msgid "Wrong custom hostname \"%s\". Ignoring it."
+msgid "Custom hostname \"%s\" is wrong. It will be ignored."
 msgstr "Користи Ваше одређено име хоста/порт "
 
-#: gajim/dialog_messages.py:83
-msgid "Error while removing privacy list"
+#: gajim/dialog_messages.py:80
+#, fuzzy
+msgid "Error While Removing Privacy List"
 msgstr "Грешка приликом уклањања листа приватности"
 
-#: gajim/dialog_messages.py:84
-#, python-format
+#: gajim/dialog_messages.py:81
+#, fuzzy, python-format
 msgid ""
-"Privacy list %s has not been removed. It is maybe active in one of your "
-"connected resources. Deactivate it and try again."
+"Privacy list %s has not been removed. It is probably active in one of your "
+"connected resources. Please deactivate it and try again."
 msgstr ""
 "Листа приватности %s није уклоњена. Можда је активна у неком од Ваших "
 "ресурса на вези. Деактивирајте је тамо и покушајте поново."
 
-#: gajim/dialog_messages.py:90
-msgid "Invisibility not supported"
+#: gajim/dialog_messages.py:87
+#, fuzzy
+msgid "Invisibility Not Supported"
 msgstr "Невидљивост није подржана"
 
-#: gajim/dialog_messages.py:91
-#, python-format
-msgid "Account %s doesn't support invisibility."
+#: gajim/dialog_messages.py:88
+#, fuzzy, python-format
+msgid "This account %s doesn't support invisibility."
 msgstr "Налог %s не подржава невидљивост."
 
-#: gajim/dialog_messages.py:95
-msgid "Unregister failed"
+#: gajim/dialog_messages.py:92
+#, fuzzy
+msgid "Unregister Failed"
 msgstr "Одјава регистрације неуспела"
 
-#: gajim/dialog_messages.py:96
-#, python-format
-msgid "Unregistration with server %(server)s failed: %(error)s"
+#: gajim/dialog_messages.py:93
+#, fuzzy, python-format
+msgid "Unregistration on server %(server)s failed: %(error)s"
 msgstr "Одјава регистрације са сервером %(server)s неуспела: %(error)s"
 
-#: gajim/dialog_messages.py:100
-msgid "Registration succeeded"
+#: gajim/dialog_messages.py:97
+#, fuzzy
+msgid "Registration Succeeded"
 msgstr "Регистрација успешна"
 
-#: gajim/dialog_messages.py:101
-#, python-format
-msgid "Registration with agent %s succeeded"
+#: gajim/dialog_messages.py:98
+#, fuzzy, python-format
+msgid "Registration with agent %s succeeded."
 msgstr "Регистрација са агентом %s успешна"
 
-#: gajim/dialog_messages.py:105 gajim/gtk/service_registration.py:215
-msgid "Registration failed"
+#: gajim/dialog_messages.py:102
+#, fuzzy
+msgid "Registration Failed"
 msgstr "Регистрација неуспела"
 
-#: gajim/dialog_messages.py:106
+#: gajim/dialog_messages.py:103
 #, python-format
 msgid ""
 "Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
 msgstr ""
 "Регистрација са агентом %(agent)s неуспела уз грешку %(error)s: %(error_msg)s"
 
-#: gajim/dialog_messages.py:111
+#: gajim/dialog_messages.py:108
 #, fuzzy
 msgid "Unable to Join Group Chat"
 msgstr "Није могуће придружити се групном разговору"
 
-#: gajim/dialog_messages.py:116
-msgid "GStreamer error"
-msgstr ""
+#: gajim/dialog_messages.py:113
+#, fuzzy
+msgid "GStreamer Error"
+msgstr "Грешка са базом података"
 
-#: gajim/dialog_messages.py:117
+#: gajim/dialog_messages.py:114
 #, fuzzy, python-format
 msgid ""
 "Error: %(error)s\n"
 "Debug: %(debug)s"
 msgstr "Порука грешке: %s"
 
-#: gajim/dialog_messages.py:121
+#: gajim/dialog_messages.py:118
 #, fuzzy
-msgid "Wrong host"
+msgid "Wrong Host"
 msgstr "Лош uri"
 
-#: gajim/dialog_messages.py:122
+#: gajim/dialog_messages.py:119
 msgid "Invalid local address? :-O"
 msgstr ""
 
-#: gajim/dialog_messages.py:126
-msgid "Avahi error"
+#: gajim/dialog_messages.py:123
+#, fuzzy
+msgid "Avahi Error"
 msgstr "Авахи грешка"
 
-#: gajim/dialog_messages.py:127
+#: gajim/dialog_messages.py:124
 #, python-format
 msgid ""
 "%s\n"
@@ -2426,66 +2393,66 @@ msgstr ""
 "%s\n"
 "Поруке локалне мреже можда неће радити како треба."
 
-#: gajim/dialog_messages.py:131 gajim/dialog_messages.py:136
+#: gajim/dialog_messages.py:128 gajim/dialog_messages.py:133
 #, fuzzy
-msgid "Could not request upload slot"
+msgid "Could not request upload slot for HTTP File Upload"
 msgstr "Није могуће покренути локални сервис"
 
-#: gajim/dialog_messages.py:137
-msgid "Got unexpected response from server (see log)"
+#: gajim/dialog_messages.py:134
+msgid "Got unexpected response from server (see log)."
 msgstr ""
 
-#: gajim/dialog_messages.py:141 gajim/dialog_messages.py:146
+#: gajim/dialog_messages.py:138 gajim/dialog_messages.py:143
 #, fuzzy
-msgid "Could not open file"
+msgid "Could not Open File"
 msgstr "Не могу учитати слику"
 
-#: gajim/dialog_messages.py:142
-msgid "Exception raised while opening file (see log)"
+#: gajim/dialog_messages.py:139
+msgid "Exception raised while trying to open file (see log)."
 msgstr ""
 
-#: gajim/dialog_messages.py:151
-msgid "Unsecure"
-msgstr ""
+#: gajim/dialog_messages.py:148
+#, fuzzy
+msgid "Not Secure"
+msgstr "Није почео"
 
-#: gajim/dialog_messages.py:152
+#: gajim/dialog_messages.py:149
 #, fuzzy
-msgid "Server returned unsecure transport (HTTP)"
+msgid "The server returned an insecure transport (HTTP)."
 msgstr "Сервис је вратио грешку."
 
-#: gajim/dialog_messages.py:156
+#: gajim/dialog_messages.py:153
 #, fuzzy
-msgid "Could not upload file"
+msgid "Could not Upload File"
 msgstr "Не могу учитати слику"
 
-#: gajim/dialog_messages.py:157
+#: gajim/dialog_messages.py:154
 #, python-format
 msgid "HTTP response code from server: %s"
 msgstr ""
 
-#: gajim/dialog_messages.py:161
+#: gajim/dialog_messages.py:158
 msgid "Upload Error"
 msgstr ""
 
-#: gajim/dialog_messages.py:166
+#: gajim/dialog_messages.py:163
 msgid "Encryption Error"
 msgstr ""
 
-#: gajim/dialog_messages.py:167
-#, fuzzy
-msgid "For the chosen encryption there is no encryption method available"
-msgstr "Веза није доступна"
+#: gajim/dialog_messages.py:164
+msgid "There is no encryption method available for the chosen encryption."
+msgstr ""
 
-#: gajim/dialog_messages.py:171
+#: gajim/dialog_messages.py:169
 #, fuzzy
-msgid "Avatar upload failed"
+msgid "Avatar Upload Failed"
 msgstr "Публикација vCard неуспела"
 
-#: gajim/privatechat_control.py:204
+#: gajim/privatechat_control.py:207
 msgid "Sending private message failed"
 msgstr "Неуспешно слање приватне поруке"
 
-#: gajim/privatechat_control.py:206
+#: gajim/privatechat_control.py:209
 #, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr ""
@@ -2509,7 +2476,7 @@ msgstr "прикажи помоћ за команду"
 
 #: gajim/gajim_remote.py:85
 #, fuzzy
-msgid "Lists all contacts in roster, one for each line"
+msgid "Lists all contacts in the contact list, one for each line"
 msgstr ""
 "Исписује листу свих контаката са листе контаката. Сваки контакт је у "
 "посебној линији"
@@ -2593,11 +2560,13 @@ msgstr ""
 
 #: gajim/gajim_remote.py:118
 #, fuzzy
-msgid "Sends new chat message to a contact in the roster. Account is optional."
+msgid ""
+"Sends new chat message to a contact in the contact list. Account is optional."
 msgstr "Начин коришћења: /%s, шаље поруку контакту"
 
 #: gajim/gajim_remote.py:120 gajim/gajim_remote.py:130
-msgid "JID of the contact that will receive the message"
+#, fuzzy
+msgid "XMPP Address of the contact that will receive the message"
 msgstr "Џабер ИД контакта који ће примити поруку"
 
 #: gajim/gajim_remote.py:121 gajim/gajim_remote.py:132
@@ -2611,8 +2580,10 @@ msgid "if specified, the message will be sent using this account"
 msgstr "ако је назначено, порука ће бити послата користећи овај налог"
 
 #: gajim/gajim_remote.py:127
-msgid "Sends a chat message to someone on your roster. Account is optional."
-msgstr ""
+#, fuzzy
+msgid ""
+"Sends a chat message to someone on your contact list. Account is optional."
+msgstr "Начин коришћења: /%s, шаље поруку контакту"
 
 #: gajim/gajim_remote.py:131
 msgid "subject"
@@ -2623,11 +2594,13 @@ msgid "message subject"
 msgstr "тема поруке"
 
 #: gajim/gajim_remote.py:138
-msgid "Sends new message to a groupchat you've joined."
+#, fuzzy
+msgid "Sends new message to a group chat you've joined."
 msgstr "Шаље нову поруку на групни разговор коме сте се придружили."
 
 #: gajim/gajim_remote.py:140
-msgid "JID of the room that will receive the message"
+#, fuzzy
+msgid "XMPP Address of the group chat that will receive the message"
 msgstr "Џабер ИД собе која ће примити поруку"
 
 #: gajim/gajim_remote.py:147
@@ -2636,7 +2609,8 @@ msgstr "Даје детаљне информације о контакту"
 
 #: gajim/gajim_remote.py:149 gajim/gajim_remote.py:162
 #: gajim/gajim_remote.py:192
-msgid "JID of the contact"
+#, fuzzy
+msgid "XMPP Address of the contact"
 msgstr "Џабер ИД контакта"
 
 #: gajim/gajim_remote.py:153
@@ -2699,7 +2673,8 @@ msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Записује тренутно стање Гајим подешавања у .config датотеку"
 
 #: gajim/gajim_remote.py:190
-msgid "Removes contact from roster"
+#, fuzzy
+msgid "Removes contact from contact list"
 msgstr "Уклања контакт са листе"
 
 #: gajim/gajim_remote.py:193
@@ -2745,9 +2720,9 @@ msgid "Missing argument \"contact_jid\""
 msgstr "Недостаје аргумент \"contact_jid\""
 
 #: gajim/gajim_remote.py:275
-#, python-format
+#, fuzzy, python-format
 msgid ""
-"'%s' is not in your roster.\n"
+"'%s' is not in your contact list.\n"
 "Please specify account for sending the message."
 msgstr ""
 "'%s' није на Вашј листи.\n"
@@ -2971,12 +2946,12 @@ msgstr "Крај недеље"
 msgid "Weekend!"
 msgstr "Викенд!"
 
-#: gajim/common/logger.py:192 gajim/common/logger.py:197
+#: gajim/common/logger.py:189 gajim/common/logger.py:194
 #, python-format
 msgid "%s is a directory but should be a file"
 msgstr "%s jе фасцикла, али би требала бити датотека"
 
-#: gajim/common/logger.py:217
+#: gajim/common/logger.py:214
 #, fuzzy, python-format
 msgid "Creating %s"
 msgstr "Уништавам %s"
@@ -3050,22 +3025,23 @@ msgstr "%(nickname)s је отишао"
 msgid "Contact Signed Out"
 msgstr "Контакт је отишао са везе"
 
-#: gajim/common/contacts.py:455
-msgid "Not in roster"
-msgstr "Није у листи контаката"
-
 #: gajim/common/config.py:80
+#, fuzzy
 msgid ""
 "Show desktop notification even when a chat window is opened for this contact "
-"and does not have focus"
+"and does not have focus."
 msgstr ""
+"Омогући искачуће прозоре/обавештења када сам _одсутан/недоступан/запослен/"
+"невидљив"
 
 #: gajim/common/config.py:81
-msgid "Play sound when user is busy"
+#, fuzzy
+msgid "Play sound even when being busy."
 msgstr "Пусти звук када је корисник заузет"
 
 #: gajim/common/config.py:83
-msgid "Show only online and free for chat contacts in roster."
+#, fuzzy
+msgid "Show only online and free for chat contacts in the contact list."
 msgstr "Прикажи у листи само контакте који су на вези и слободни за ћаскање."
 
 #: gajim/common/config.py:86
@@ -3073,12 +3049,15 @@ msgid "Time in minutes, after which your status changes to away."
 msgstr "Време у минутама, наком кога ће се Ваш статус промеити у Одсутан."
 
 #: gajim/common/config.py:87
-msgid "$S (Away as a result of being idle more than $T min)"
+#, fuzzy
+msgid "$S (Away: Idle more than $T min)"
 msgstr "$S (Одсутан, као последица мировања више од $T мин.)"
 
 #: gajim/common/config.py:87
 #, fuzzy
-msgid "$S will be replaced by current status message, $T by autoawaytime."
+msgid ""
+"$S will be replaced by current status message, $T by the 'autoawaytime' "
+"value."
 msgstr ""
 "$S ће бити замењено са тренутном статусном поруком,$T са временом одсутности."
 
@@ -3088,12 +3067,14 @@ msgstr ""
 "Време у минутама, наком кога ће се Ваш статус промеити у Није доступан."
 
 #: gajim/common/config.py:90
-msgid "$S (Not available as a result of being idle more than $T min)"
+#, fuzzy
+msgid "$S (Not available: Idle more than $T min)"
 msgstr "$S (Није доступан, као последица мировања више од $T мин.)"
 
 #: gajim/common/config.py:90
 #, fuzzy
-msgid "$S will be replaced by current status message, $T by autoxatime."
+msgid ""
+"$S will be replaced by current status message, $T by the 'autoxatime' value."
 msgstr ""
 "$S ће бити замењено са тренутном статусном поруком,$T са временом "
 "недоступности"
@@ -3101,62 +3082,64 @@ msgstr ""
 #: gajim/common/config.py:93
 #, fuzzy
 msgid ""
-"When to show notification area icon. Can be 'never', 'on_event', 'always'."
+"When to show the notification area icon. Can be 'never', 'on_event', and "
+"'always'."
 msgstr ""
 "Када приказати иконицу у системској касети. Може бити 'never', 'on_event', "
 "'always'."
 
 #: gajim/common/config.py:94
-msgid "Allow to hide the roster window even if the tray icon is not shown."
+msgid ""
+"Allow to hide the contact list window even if the notification area icon is "
+"not shown."
 msgstr ""
 
 #: gajim/common/config.py:97
 #, fuzzy
-msgid "Contact signed in notification color."
-msgstr "Прикажи догађај у листи контаката"
+msgid "Notification color for contacts signing in."
+msgstr "Обавести ме о контактима који се _пријаве"
 
 #: gajim/common/config.py:98
 #, fuzzy
-msgid "Contact signout notification color"
-msgstr "Прикажи догађај у листи контаката"
+msgid "Notification color for contacts signing out."
+msgstr "Обавести ме о контактима који се _одјаве"
 
 #: gajim/common/config.py:99
 #, fuzzy
-msgid "New message notification color."
+msgid "Notification color for new message notification."
 msgstr "Прегледај нове поруке у искачућим обавештењима?"
 
 #: gajim/common/config.py:100
 #, fuzzy
-msgid "File transfer request notification color."
-msgstr "Захтев за преносом датотеке"
+msgid "Notification color for file transfer request."
+msgstr "_Обавести ме када се заврши пренос датотеке"
 
 #: gajim/common/config.py:101
 #, fuzzy
-msgid "File transfer error notification color."
-msgstr "Пренос датотеке прекинут"
+msgid "Notification color for file transfer errors."
+msgstr "_Обавести ме када се заврши пренос датотеке"
 
 #: gajim/common/config.py:102
-#, fuzzy
-msgid "File transfer complete or stopped notification color."
-msgstr "Прикажи искачуће обавештење када се заврши пренос датотеке"
+msgid "Notification color for stopped or completed file transfers."
+msgstr ""
 
 #: gajim/common/config.py:103
-#, fuzzy
-msgid "Groupchat invitation notification color"
-msgstr "Позив на групни разговор"
+msgid "Notification color for group chat invitations."
+msgstr ""
 
 #: gajim/common/config.py:104
 #, fuzzy
-msgid "Background color of status changed notification"
+msgid "Notification background color for changed status."
 msgstr "Боја позадине контакта када тек дођу на везу."
 
 #: gajim/common/config.py:105
-msgid "Other dialogs color."
+msgid "Notification color for other dialogs."
 msgstr ""
 
 #: gajim/common/config.py:106
+#, fuzzy
 msgid ""
-"List (space separated) of rows (accounts and groups) that are collapsed."
+"List of rows (accounts and groups) that are collapsed (space separated)."
 msgstr ""
 "Листа (одвојена бланко знаковима) редова (налога и група) који су отворени."
 
@@ -3164,8 +3147,10 @@ msgstr ""
 msgid "default"
 msgstr "подразумевано"
 
-#: gajim/common/config.py:113
-msgid "Language used by speller"
+#: gajim/common/config.py:113 gajim/common/config.py:424
+#: gajim/common/config.py:431
+#, fuzzy
+msgid "Language used for spell checking."
 msgstr "Језик који користи правопис"
 
 #: gajim/common/config.py:114
@@ -3179,10 +3164,11 @@ msgstr ""
 "'никад' - никад не исписуј време."
 
 #: gajim/common/config.py:115
+#, fuzzy
 msgid ""
 "Print time in chats using Fuzzy Clock. Value of fuzziness from 1 to 4, or 0 "
-"to disable fuzzyclock. 1 is the most precise clock, 4 the least precise one. "
-"This is used only if print_time is 'sometimes'."
+"to disable Fuzzy Clock. 1 is the most precise clock, 4 the least precise "
+"one. This is used only if 'print_time' is 'sometimes'."
 msgstr ""
 "Исписуј време у разговорима користећи Расплинути Сат. Вредност расплинутости "
 "од  1 до 4 или 0 за онемогућивање нејасног сата. 1 је најпрецизнији сат, 4 "
@@ -3200,16 +3186,18 @@ msgstr "Сматрај * / _ парове као знакове за форма�
 #: gajim/common/config.py:120
 #, fuzzy
 msgid ""
-"If true, do not remove */_ . So *abc* will be bold but with * * not removed."
+"If enabled, do not remove */_ . So *abc* will be bold but with * * not "
+"removed."
 msgstr ""
 "Ако је истинито, не уклањај */_ . Тако ће *абв* бити подебљано, али "
 "иокружено са * *."
 
 #: gajim/common/config.py:123
+#, fuzzy
 msgid ""
-"Uses ReStructured text markup to send HTML, plus ascii formatting if "
-"selected. For syntax, see http://docutils.sourceforge.net/docs/ref/rst/"
-"restructuredtext.html (If you want to use this, install docutils)"
+"Uses ReStructured text markup to send HTML, plus ASCII formatting if "
+"selected. Needs docutils installed (for syntax, see http://docutils."
+"sourceforge.net/docs/ref/rst/restructuredtext.html)."
 msgstr ""
 "Користи ReStructured текст markup да пошаљете ХТМЛ и ascii форматирање ако "
 "је одабрано. За синтаксу, погледајте http://docutils.sourceforge.net/docs/"
@@ -3217,37 +3205,40 @@ msgstr ""
 "docutils)"
 
 #: gajim/common/config.py:132
+#, fuzzy
 msgid ""
-"Character to add after nickname when using nick completion (tab) in group "
-"chat."
+"Character to add after nickname when using nickname completion (tab) in "
+"group chat."
 msgstr ""
 "Карактер за додавање после надимка када се користи довршавање надимка "
 "(тастером tab) у групном разговору"
 
 #: gajim/common/config.py:133
+#, fuzzy
 msgid ""
-"Character to propose to add after desired nickname when desired nickname is "
-"used by someone else in group chat."
+"Character to propose to add after desired nickname when nickname is already "
+"used in group chat."
 msgstr ""
 "Карактер који желите додати после жељеног надимка уколико је жељени надимак "
 "у групном разговору већ употребљен"
 
 #: gajim/common/config.py:155
 msgid ""
-"If true, Gajim will save roster position when hiding roster, and restore it "
-"when showing roster."
+"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:161
-msgid "Place the roster on the right in single window mode"
+msgid "Place the contact list on the right in single window mode"
 msgstr ""
 
 #: gajim/common/config.py:167
 #, fuzzy
 msgid ""
-"This option let you customize timestamp that is printed in conversation. For "
-"example \"[%H:%M] \" will show \"[hour:minute] \". See python doc on "
-"strftime for full documentation: http://docs.python.org/lib/module-time.html"
+"This option lets you customize the timestamp that is printed in "
+"conversation. For example '[%H:%M] ' will show '[hour:minute] '. See python "
+"doc on strftime for full documentation (https://docs.python.org/3/library/"
+"time.html)."
 msgstr ""
 "Ова опција Вам омогућава подешавање времена које се приказује у разговору. "
 "На пример \"[%H:%M] \" ће приказати \"[сат:минут] \". Погледајте python "
@@ -3255,262 +3246,265 @@ msgstr ""
 "module-time.html"
 
 #: gajim/common/config.py:168
-msgid "Characters that are printed before the nickname in conversations"
+#, fuzzy
+msgid "Characters that are printed before the nickname in conversations."
 msgstr "Карактери који ће бити приказани пре надимка у разговору"
 
 #: gajim/common/config.py:169
-msgid "Characters that are printed after the nickname in conversations"
+#, fuzzy
+msgid "Characters that are printed after the nickname in conversations."
 msgstr "Карактери који ће бити приказани после надимка у разговору"
 
 #: gajim/common/config.py:170
-msgid "Add * and [n] in roster title?"
-msgstr "Додај * и [n] у наслов листе контаката?"
+#, fuzzy
+msgid "If enabled, Gajim will add * and [n] in contact list window title."
+msgstr ""
+"Ако је означена, Гајим ће приказивати расположење контаката у листи контаката"
 
 #: gajim/common/config.py:171
 #, fuzzy
 msgid ""
-"How many history messages should be restored when a chat tab/window is "
-"reopened?"
+"Number of messages from chat history to be restored when a chat tab/window "
+"is reopened."
 msgstr ""
 "Колико линија претходног разговора памтити када се прозор/језичак  за "
 "разговор поново отвори."
 
 #: gajim/common/config.py:172
-msgid "How far back in time (minutes) history is restored. -1 means no limit."
+msgid ""
+"How far back in time (minutes) chat history is restored. -1 means no limit."
 msgstr ""
 
 #: gajim/common/config.py:173
 #, fuzzy
 msgid ""
-"How many lines to request from server when entering a groupchat. -1 means no "
-"limit"
-msgstr "Колико линија тражити од сервера при уласку на групни разговор."
-
-#: gajim/common/config.py:174
-#, fuzzy
-msgid ""
-"Minutes of backlog to request when entering a groupchat. -1 means no limit"
-msgstr "Од пре колико минута тражити дневнике при уласку на групни разговор."
-
-#: gajim/common/config.py:175
-msgid ""
-"How many seconds to wait before trying to autorejoin to a conference you are "
-"being disconnected from. Set to 0 to disable autorejoining."
+"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:176
-msgid "Should autorejoin be activated when kicked from a conference?"
+#: gajim/common/config.py:174
+msgid ""
+"Should automatic rejoin be activated when you were kicked from a group chat?"
 msgstr ""
 
-#: gajim/common/config.py:177
-msgid ""
-"Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
-"Client default behaviour)."
+#: gajim/common/config.py:175
+#, fuzzy
+msgid "Send message on Ctrl+Enter and make a new line with Enter."
 msgstr ""
 "Пошаљи поруку са Ctrl+Enter, а са Enter прави нову линију. (Подразумевано "
 "понашање Миралабисовог ICQ клијента)"
 
-#: gajim/common/config.py:179
-msgid "How many lines to store for Ctrl+KeyUP."
+#: gajim/common/config.py:177
+#, fuzzy
+msgid "How many lines to store for Ctrl+KeyUP (previously sent messages)."
 msgstr "Колико линија сачувати са Ctrl+KeyUP"
 
-#: gajim/common/config.py:182
+#: gajim/common/config.py:180
 #, fuzzy, python-format
 msgid ""
-"Either custom URL with %%s in it where %%s is the word/phrase or "
-"'WIKTIONARY' which means use Wikitionary."
+"Either a custom URL with %%s in it (where %%s is the word/phrase) or "
+"'WIKTIONARY' (which means use Wikitionary)."
 msgstr ""
 "Или Ваш специфицирани УРЛ са %s у њему где је %s реч или фраза или 'ВИКИ-"
 "РЕЧНИК' што значи коришћење вики-речника."
 
-#: gajim/common/config.py:185
+#: gajim/common/config.py:183
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr "Ако је означено, Гајим се може контролисати коришћењем gajim-remote."
 
-#: gajim/common/config.py:187
+#: gajim/common/config.py:185
+#, fuzzy
 msgid ""
-"When not printing time for every message (print_time==sometimes), print it "
+"When not printing time for every message ('print_time'==sometimes), print it "
 "every x minutes."
 msgstr ""
 "Ако се не исписује време за сваку поруку (print_time==понекад), исписати га "
 "сваких x минута"
 
-#: gajim/common/config.py:188
+#: gajim/common/config.py:186
 msgid "Ask before pasting an image."
 msgstr ""
 
-#: gajim/common/config.py:189
+#: gajim/common/config.py:187
 msgid "Ask before closing a group chat tab/window."
 msgstr "Питај пре затварања прозора/језичка групног разговора."
 
-#: gajim/common/config.py:190
+#: gajim/common/config.py:188
 #, fuzzy
 msgid ""
-"Always ask for confirmation before closing groupchats with any of the JIDs "
-"on this space separated list."
+"Always ask for confirmation before closing group chats with any of the XMPP "
+"Addresses on this list (space separated)."
 msgstr ""
 "Увек питај пре затварања језичка/прозора када је у питању ова листа одвојена "
 "бланко карактерима џабер ИД-ова групних разговора."
 
-#: gajim/common/config.py:191
+#: gajim/common/config.py:189
 #, fuzzy
 msgid ""
-"Never ask for confirmation before closing groupchats with any of the JIDs on "
-"this space separated list."
+"Never ask for confirmation before closing group chats with any of the XMPP "
+"Addresses on this list (space separated)."
 msgstr ""
 "Никад не питај пре затварања језичка/прозора групног разговора када је у "
 "питању ова листаодовојена бланко знацима џабер ИД-ова групних разговора."
 
-#: gajim/common/config.py:192
+#: gajim/common/config.py:190
 #, fuzzy
 msgid ""
-"Ask before closing tabbed chat window if there are controls that can lose "
-"data (chat, private chat, groupchat that will not be minimized)"
+"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:195
+#: gajim/common/config.py:193
 #, fuzzy
 msgid ""
-"Comma separated list of sent hosts, in addition of local interfaces, for "
-"File Transfer in case of address translation/port forwarding."
+"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:196
+#: gajim/common/config.py:194
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "IEC стандард дефинише КiБ = 1024 бајтова, КБ = 1000 бајтова"
 
-#: gajim/common/config.py:198
+#: gajim/common/config.py:196
 #, fuzzy
 msgid "Notify of events in the notification area."
 msgstr "Обавести ме о свим догађајима у икони системске касете."
 
-#: gajim/common/config.py:199
+#: gajim/common/config.py:197
 msgid ""
-"If False, Gajim will display a static event icon instead of the blinking "
-"status icon in the notification area when notifying on event."
+"If disabled, Gajim will display a static event icon instead of the blinking "
+"status icon in the notification area when notifying about an event."
 msgstr ""
 
-#: gajim/common/config.py:205
+#: gajim/common/config.py:203
 msgid "Show tab when only one conversation?"
 msgstr "Прикажи језичак иако је само један разговор?"
 
-#: gajim/common/config.py:206
+#: gajim/common/config.py:204
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "Прикаши границу свеске у прозорима разговора?"
 
-#: gajim/common/config.py:207
+#: gajim/common/config.py:205
 msgid "Show close button in tab?"
 msgstr "Прикаши дугме за затварање у језичку?"
 
-#: gajim/common/config.py:220
+#: gajim/common/config.py:218
 msgid "Preview new messages in notification popup?"
 msgstr "Прегледај нове поруке у искачућим обавештењима?"
 
-#: gajim/common/config.py:223
+#: gajim/common/config.py:221
+#, fuzzy
 msgid ""
-"A semicolon-separated list of words that will be highlighted in group chats."
+"A list of words (semicolon separated) that will be highlighted in group "
+"chats."
 msgstr ""
 "Листа речи одвојена бланко карактерима које ће бити обојене у групним "
 "разговорима"
 
-#: gajim/common/config.py:224
+#: gajim/common/config.py:222
 #, fuzzy
 msgid ""
-"If true, quits Gajim when X button of Window Manager is clicked. This "
-"setting is taken into account only if notification icon is used."
+"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/common/config.py:225
+#: gajim/common/config.py:223
 msgid ""
-"If true, Gajim hides the Roster window on pressing the X button instead of "
-"minimizing into the Dock."
+"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:226
+#: gajim/common/config.py:224
 #, fuzzy
 msgid ""
-"If true, Gajim will display an icon on each tab containing unread messages. "
-"Depending on the theme, this icon may be animated."
+"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:227
+#: gajim/common/config.py:225
 #, fuzzy
 msgid ""
-"If true, Gajim will display the status message, if not empty, for every "
-"contact under the contact name in roster window."
+"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:233
-msgid "Define the position of the avatar in roster. Can be left or right"
+#: gajim/common/config.py:231
+#, fuzzy
+msgid ""
+"Define the position of avatars in the contact list. Can be 'left' or 'right'."
 msgstr ""
 "Дефинишите позицију аватара у листи контаката. Може бити лево или десно"
 
-#: gajim/common/config.py:234
+#: gajim/common/config.py:232
 #, fuzzy
 msgid ""
-"If False, Gajim will no longer print status line in chats when a contact "
-"changes their status and/or their status message."
+"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:235
+#: gajim/common/config.py:233
 #, fuzzy
 msgid ""
 "Default Setting: Show a status message for every join or leave in a group "
-"chat"
+"chat."
 msgstr "Није могуће придружити се групном разговору"
 
-#: gajim/common/config.py:236
+#: gajim/common/config.py:234
+#, fuzzy
 msgid ""
-"Default Setting: Show a status message for all status (away, dnd, etc.) "
-"changes of users in a group chat"
-msgstr ""
+"Default Setting: Show a status message for all status changes (away, dnd, "
+"etc.) of users in a group chat."
+msgstr "Није могуће придружити се групном разговору"
 
-#: gajim/common/config.py:238
-msgid "Log XHTML messages instead of plain text messages."
+#: gajim/common/config.py:236
+msgid "Store XHTML messages in chat history instead of plain text messages."
 msgstr ""
 
-#: gajim/common/config.py:239
+#: gajim/common/config.py:237
 msgid "Don't show avatar for the transport itself."
 msgstr "Не приказуј аватар за сам транспорт."
 
-#: gajim/common/config.py:240
-msgid "Don't show roster in the system taskbar."
+#: gajim/common/config.py:238
+#, fuzzy
+msgid "Don't show contact list window in the system taskbar."
 msgstr "Не приказуј листу контаката у системској касети."
 
-#: gajim/common/config.py:241
+#: gajim/common/config.py:239
 #, fuzzy
 msgid ""
-"If true, make the window flash (the default behaviour in most Window "
-"Managers) when holding pending events."
+"If enabled, Gajim makes the window flash (the default behaviour in most "
+"Window Managers) when holding pending events."
 msgstr ""
 "Ако је истинито, и инсталиране верзије ГТК+ и PyГТК су барем 2.8, нека "
 "прозор бљеска (подразумевано понашање у већини менаџера прозора) при новим "
 "догађајима."
 
-#: gajim/common/config.py:245
+#: gajim/common/config.py:243
+#, fuzzy
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
 "'always_with_roster' - Like 'always' but the messages are in a single window "
-"along with the roster.\n"
+"along with the contact list.\n"
 "'never' - All messages get their own window.\n"
 "'peracct' - Messages for each account are sent to a specific window.\n"
-"'pertype' - Each message type (e.g. chats vs. groupchats) is sent to a "
+"'pertype' - Each message type (e.g. chats vs. group chats) is sent to a "
 "specific window."
 msgstr ""
 "Контролише прозор где се смештају нове поруке.\n"
@@ -3522,120 +3516,129 @@ msgstr ""
 "'pertype' - Поруке истог типа (нпр., разговори и групни разговори) се шаљу у "
 "исти прозор."
 
-#: gajim/common/config.py:246
+#: gajim/common/config.py:244
 msgid ""
-"Show roster on startup.\n"
-"'always' - Always show roster.\n"
-"'never' - Never show roster.\n"
-"'last_state' - Restore the last state roster."
+"Show contact list window on startup.\n"
+"'always' - Always show contact list window.\n"
+"'never' - Never show contact list window.\n"
+"'last_state' - Restore last state of the contact list window."
 msgstr ""
 
-#: gajim/common/config.py:247
-msgid "If False, you will no longer see the avatar in the chat window."
+#: gajim/common/config.py:245
+#, fuzzy
+msgid "If enabled, Gajim displays the avatar in the chat window."
 msgstr "Ако није истинито, нећете више видети аватар у прозору разговора."
 
-#: gajim/common/config.py:248
+#: gajim/common/config.py:246
 #, fuzzy
-msgid "If true, pressing the escape key closes a tab/window."
+msgid "If enabled, pressing Esc closes a tab/window."
 msgstr "Ако је истинито, притисак на тастер 'esc' затвара језичак/прозор."
 
-#: gajim/common/config.py:249
-msgid "Hides the banner in a group chat window"
+#: gajim/common/config.py:247
+#, fuzzy
+msgid "Hides the banner in a group chat window."
 msgstr "Сакрива банер у прозору групног разговора."
 
-#: gajim/common/config.py:250
-msgid "Hides the banner in two persons chat window"
-msgstr "Сакрива банер у прозору разговора две особе"
+#: gajim/common/config.py:248
+#, fuzzy
+msgid "Hides the banner in a 1:1 chat window."
+msgstr "Сакрива банер у прозору групног разговора."
 
-#: gajim/common/config.py:251
-msgid "Hides the group chat occupants list in group chat window."
+#: gajim/common/config.py:249
+#, fuzzy
+msgid "Hides the group chat participants list in a group chat window."
 msgstr "Сакрива листу учесника у прозору групног разговора"
 
-#: gajim/common/config.py:252
+#: gajim/common/config.py:250
+#, fuzzy
 msgid ""
 "In a chat, show the nickname at the beginning of a line only when it's not "
-"the same person talking than in previous message."
+"the same person talking as in the previous message."
 msgstr ""
 "У разговору, прикажи надимак на почетку новог реда само када се не ради о "
 "истој особи која је причала и у прошлој поруци."
 
-#: gajim/common/config.py:253
+#: gajim/common/config.py:251
 msgid "Indentation when using merge consecutive nickname."
 msgstr "Увлачење при коришћењу спајања узастопних надимака."
 
-#: gajim/common/config.py:254
-msgid "Ctrl-Tab go to next composing tab when none is unread."
+#: gajim/common/config.py:252
+#, 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:255
+#: gajim/common/config.py:253
 #, fuzzy
 msgid ""
-"Show the confirm metacontacts creation dialog or not? Empty string means "
-"never show the dialog."
+"Show a confirmation dialog to create metacontacts? Empty string means never "
+"show the dialog."
 msgstr ""
-"Треба ли питати за потврду стварања псеудоконтакта или не? Празна ниска "
+"Треба ли приказивати дијалог за потврду блокирања контакта? Празна ниста "
 "значи да никада не приказујемо дијалог."
 
-#: gajim/common/config.py:256
+#: gajim/common/config.py:254
 #, fuzzy
 msgid ""
-"Show the confirm block contact dialog or not? Empty string means never show "
+"Show a confirmation dialog to block a contact? Empty string means never show "
 "the dialog."
 msgstr ""
 "Треба ли приказивати дијалог за потврду блокирања контакта? Празна ниста "
 "значи да никада не приказујемо дијалог."
 
-#: gajim/common/config.py:257
+#: gajim/common/config.py:255
 #, fuzzy
 msgid ""
-"Show the confirm custom status dialog or not? Empty string means never show "
-"the dialog."
+"Show a confirmation dialog for a custom status? Empty string means never "
+"show the dialog."
 msgstr ""
 "Треба ли приказивати дијалог за потврду прилагођеног статуса? Празна ниска "
 "значи да никада не приказујемо дијалог."
 
-#: gajim/common/config.py:258
+#: gajim/common/config.py:256
 #, fuzzy
 msgid ""
-"If true, you will be able to set a negative priority to your account in "
-"account modification window. BE CAREFUL, when you are logged in with a "
-"negative priority, you will NOT receive any message from your server."
+"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:259
+#: gajim/common/config.py:257
 #, fuzzy
 msgid ""
-"If true, Gajim will show number of online and total contacts in account and "
-"group rows."
+"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:260
+#: gajim/common/config.py:258
+#, fuzzy
 msgid ""
-"Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
-"as if they were of this type"
+"Can be empty, 'chat' or 'normal'. If not empty, all incoming messages are "
+"treated as if they were of this type."
 msgstr ""
 "Може бити празно, 'chat' или 'normal'. Ако није празно, третира све долазне "
 "поруке као поруке постављеног типа"
 
-#: gajim/common/config.py:261
+#: gajim/common/config.py:259
 #, fuzzy
 msgid ""
-"If true, Gajim will scroll and select the contact who sent you the last "
-"message, if chat window is not already opened."
+"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:262
+#: gajim/common/config.py:260
 msgid "Time of inactivity needed before the change status window closes down."
 msgstr "Време неактивности после кога се прозор за измену статуса затвара."
 
-#: gajim/common/config.py:263
+#: gajim/common/config.py:261
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
@@ -3643,141 +3646,157 @@ msgstr ""
 "Максимум порука које се приказују у разоговору. Најстарије линије се "
 "склањају."
 
-#: gajim/common/config.py:264
+#: gajim/common/config.py:262
 #, fuzzy
 msgid ""
-"If true, notification windows from notification-daemon will be attached to "
-"notification icon."
+"If enabled, notification windows from notification-daemon will be attached "
+"to the notification area icon."
 msgstr ""
 "Ако је истинито, прозор обавештења од сервиса обавештења ће бити закачен за "
 "системску касету."
 
-#: gajim/common/config.py:265
+#: gajim/common/config.py:263
 msgid "Choose interval between 2 checks of idleness."
 msgstr ""
 "Одаберите интервал између две провере да се ништа не дешава на рачунару."
 
-#: gajim/common/config.py:266
+#: gajim/common/config.py:264
+#, fuzzy
 msgid ""
-"Valid uri schemes. Only schemes in this list will be accepted as \"real\" "
-"uri. (mailto and xmpp are handled separately)"
+"Valid URI schemes. Only schemes in this list will be accepted as 'real' URI "
+"(mailto and xmpp are handled separately)."
 msgstr ""
 "Исправне uri шеме. Само шеме са ове листе ће бити прихваћене као \"стварне\" "
 "uri. (mailto и xmpp се обрађују засебно)"
 
-#: gajim/common/config.py:267
+#: gajim/common/config.py:265
 #, fuzzy
-msgid "If true, completion in groupchats will be like a shell auto-completion"
+msgid ""
+"If enabled, completion in group chats will be like a shell auto-completion."
 msgstr ""
 "Ако је True, допуњавање у групним разговорима ће бити као допуњавање у "
 "конзоли"
 
-#: gajim/common/config.py:272
-msgid "Optionally fix jingle output video framerate. Example: 10/1 or 25/2"
+#: gajim/common/config.py:270
+msgid "Optionally fix Jingle output video framerate. Example: 10/1 or 25/2."
 msgstr ""
 
-#: gajim/common/config.py:273
-msgid "Optionally resize jingle output video. Example: 320x240"
+#: gajim/common/config.py:271
+msgid "Optionally resize Jingle output video. Example: 320x240."
 msgstr ""
 
-#: gajim/common/config.py:274
-msgid "If true, You will also see your webcam"
+#: gajim/common/config.py:272
+msgid "If enabled, you will see your webcam's video stream as well."
 msgstr ""
 
-#: gajim/common/config.py:277
+#: gajim/common/config.py:275
 msgid ""
-"If true, Gajim will try to use a STUN server when using Jingle. The one in "
-"\"stun_server\" option, or the one given by the XMPP server."
+"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:278
+#: gajim/common/config.py:276
 msgid "STUN server to use when using Jingle"
 msgstr ""
 
-#: gajim/common/config.py:279
+#: gajim/common/config.py:277
 msgid ""
-"If true, Gajim will show affiliation of groupchat occupants by adding a "
-"colored square to the status icon"
+"If enabled, Gajim will show affiliation of group chat participants by adding "
+"a colored square to the status icon."
 msgstr ""
 
-#: gajim/common/config.py:280
+#: gajim/common/config.py:278
 msgid ""
 "Proxy used for all outgoing connections if the account does not have a "
-"specific proxy configured"
+"specific proxy configured."
 msgstr ""
 
-#: gajim/common/config.py:281
-msgid "If true, Gajim will ignore incoming attention requests (\"wizz\")."
+#: gajim/common/config.py:279
+msgid "If enabled, Gajim will ignore incoming attention requests ('wizz')."
 msgstr ""
 
-#: gajim/common/config.py:282
+#: gajim/common/config.py:280
 msgid ""
 "If enabled, Gajim will reopen chat windows that were opened last time Gajim "
 "was closed."
 msgstr ""
 
-#: gajim/common/config.py:283
+#: gajim/common/config.py:281
 #, fuzzy
 msgid ""
-"If enabled, Gajim will show an icon to show that sent message has been "
-"received by your contact"
+"If enabled, Gajim will display an icon to show that sent messages have been "
+"received by your contact."
 msgstr ""
 "Ако је означена, Гајим неће питати за статусну поруку. Већ постављена "
 "подразумевана порука ће бити коришћена."
 
+#: gajim/common/config.py:282
+msgid "Show a mini avatar in chat window tabs and as the window's icon."
+msgstr ""
+
+#: gajim/common/config.py:283
+msgid ""
+"If enabled, Gajim will use the System's Keyring to store account passwords."
+msgstr ""
+
 #: gajim/common/config.py:284
-msgid "Show a mini avatar in chat window tabs and in window icon"
+msgid "If enabled, Gajim will execute XEP-0146 Commands."
 msgstr ""
 
 #: gajim/common/config.py:285
-msgid "If true, Gajim will use the Systems Keyring to store account passwords."
+msgid "2: System, 1: Enabled, 0: Disabled"
 msgstr ""
 
 #: gajim/common/config.py:286
-msgid "If true, Gajim will execute XEP-0146 Commands."
+msgid "Options in days which can be chosen in the sync threshold menu"
 msgstr ""
 
 #: gajim/common/config.py:287
-msgid "2: System, 1: Enabled, 0: Disabled"
+msgid ""
+"Maximum history in days we request from a public group chat archive. 0: As "
+"much as possible."
 msgstr ""
 
 #: gajim/common/config.py:288
-msgid "Options in days which can be chosen in the sync threshold menu"
+msgid ""
+"Maximum history in days we request from a private group chat archive. 0: As "
+"much as possible."
 msgstr ""
 
 #: gajim/common/config.py:289
 msgid ""
-"Maximum history in days we request from a public room archive. 0: As much as "
-"possible"
+"If enabled, Gajim shows the group chat subject in the chat window when "
+"joining."
 msgstr ""
 
 #: gajim/common/config.py:290
+#, fuzzy
 msgid ""
-"Maximum history in days we request from a private room archive. 0: As much "
-"as possible"
+"If enabled, the contact row is colored according to the current chat state "
+"of the contact."
 msgstr ""
+"Ако је означена, Гајим ће дозволити другима да погледају који оперативни "
+"систем користите"
 
 #: gajim/common/config.py:291
-msgid "If the room subject is shown in chat on join"
+#, fuzzy
+msgid ""
+"If enabled, the tab is colored according to the current chat state of the "
+"contact."
 msgstr ""
+"Ако је означена, Гајим ће дозволити другима да погледају који оперативни "
+"систем користите"
 
 #: gajim/common/config.py:292
+#, fuzzy
 msgid ""
-"If the contact row is colored according to the current chatstate of the "
-"contact"
+"Shows a text in the banner that describes the current chat state of the "
+"contact."
 msgstr ""
+"Ако је означена, Гајим ће дозволити другима да погледају који оперативни "
+"систем користите"
 
 #: gajim/common/config.py:293
-msgid "If the tab is colored according to the current chatstate of the contact"
-msgstr ""
-
-#: gajim/common/config.py:294
-msgid ""
-"Shows a text in the banner that describes the current chatstate of the "
-"contact"
-msgstr ""
-
-#: gajim/common/config.py:295 gajim/common/config.py:424
 #, fuzzy
 msgid ""
 "Chat state notifications that are sent to contacts. Possible values: all, "
@@ -3786,140 +3805,158 @@ msgstr ""
 "Послата обавештења о стању разговора. Може бити једно од "
 "'сви','само_састављање', 'онемогућено'."
 
-#: gajim/common/config.py:296 gajim/common/config.py:438
+#: gajim/common/config.py:294
 #, fuzzy
 msgid ""
 "Chat state notifications that are sent to the group chat. Possible values: "
-"all, composing_only, disabled"
+"'all', 'composing_only', 'disabled'"
 msgstr ""
 "Послата обавештења о стању разговора. Може бити једно од "
 "'сви','само_састављање', 'онемогућено'."
 
-#: gajim/common/config.py:312
+#: gajim/common/config.py:297
+msgid "API Preferences. Possible values: 'http', 'iq'"
+msgstr ""
+
+#: gajim/common/config.py:313
+#, fuzzy
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
-"defined in autopriority_* options."
+"defined in 'autopriority_*' options."
 msgstr ""
 "Приоритет ће се аутоматски променити у зависности од Вашег статуса. "
 "Приоритети су дефинсани у autopriority_* подешавањима."
 
-#: gajim/common/config.py:320
+#: gajim/common/config.py:321
+#, fuzzy
 msgid ""
-"Status used to autoconnect as. Can be online, chat, away, xa, dnd, "
-"invisible. NOTE: this option is used only if restore_last_status is disabled"
+"Status to be used automatically when connecting. Can be 'online', 'chat', "
+"'away', 'xa', 'dnd' or 'invisible'. NOTE: This option is used only if "
+"'restore_last_status' is disabled."
 msgstr ""
 "Статус са којим се аутоматски повезујете. Може бити online, chat, away, xa, "
 "dnd, invisible. ПАЖЊА: ова опција се користи само ако је "
 "restore_last_status  онемогућена."
 
-#: gajim/common/config.py:321
-msgid "If enabled, restore the last status that was used."
+#: gajim/common/config.py:322
+#, fuzzy
+msgid "If enabled, the last status will be restored."
 msgstr "Ако је омогућено, постави последњи коришћени статус."
 
-#: gajim/common/config.py:322
+#: gajim/common/config.py:323
 #, fuzzy
 msgid ""
-"If true, Contacts requesting authorization will be automatically accepted."
+"If enabled, Contacts requesting authorization will be accepted automatically."
 msgstr ""
 "Ако је True, контакти који траже ауторизацију ће аутоматски бити прихваћени."
 
-#: gajim/common/config.py:323
+#: gajim/common/config.py:324
+#, fuzzy
 msgid ""
-"If False, this account will be disabled and will not appear in roster window."
+"If disabled, this account will be disabled and will not appear in the "
+"contact list window."
 msgstr ""
 "Ако је False, налог ће бити онемогућен и неће се приказивати у листи "
 "контаката."
 
-#: gajim/common/config.py:327
-msgid "Allow plaintext connections"
+#: gajim/common/config.py:328
+msgid "Allow plaintext connections."
 msgstr ""
 
-#: gajim/common/config.py:330
+#: gajim/common/config.py:331
 msgid ""
-"List (space separated) of authentication mechanisms to try. Can contain "
-"ANONYMOUS, EXTERNAL, GSSAPI, SCRAM-SHA-1-PLUS, SCRAM-SHA-1, DIGEST-MD5, "
-"PLAIN, X-MESSENGER-OAUTH2 or XEP-0078"
+"List of authentication mechanisms to try (space separated). Can contain "
+"'ANONYMOUS', 'EXTERNAL', 'GSSAPI', 'SCRAM-SHA-1-PLUS', 'SCRAM-SHA-1', "
+"'DIGEST-MD5', 'PLAIN', 'X-MESSENGER-OAUTH2' or 'XEP-0078'."
 msgstr ""
 
-#: gajim/common/config.py:331
+#: gajim/common/config.py:332
 #, fuzzy
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection. "
-"Can be 'warn', 'connect', 'disconnect'"
+"Can be 'warn', 'connect' or 'disconnect'."
 msgstr ""
 "Прикажи прозор упозорења пре слања нешифроване лозинке преко обичне везе."
 
-#: gajim/common/config.py:332
+#: gajim/common/config.py:333
 msgid "Show a warning dialog before using standard SSL library."
 msgstr "Прикажи прозор упозорења пре коришћења стандардне SSL библиотеке."
 
-#: gajim/common/config.py:333
+#: gajim/common/config.py:334
 #, fuzzy
 msgid ""
 "Show a warning dialog before sending PLAIN password over a plain connection."
 msgstr ""
 "Прикажи прозор упозорења пре слања нешифроване лозинке преко обичне везе."
 
-#: gajim/common/config.py:334
-msgid "Space separated list of ssl errors to ignore."
-msgstr "Листа ssl грешака за игнорисање, одвојена размацима."
+#: gajim/common/config.py:335
+msgid "List of SSL errors to ignore (space separated)."
+msgstr ""
 
-#: gajim/common/config.py:340
+#: gajim/common/config.py:341
 msgid ""
-"Space separated list of JIDs for which you do not want to store logs. You "
-"can also add account name to log nothing for this account."
+"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:341
+#: gajim/common/config.py:342
 msgid ""
-"Space separated list of JIDs for which you accept to not log conversations "
-"if he does not want to."
+"List of XMPP Addresses (space separated) for which you accept to not store "
+"chat history if your contact does not want to."
 msgstr ""
 
-#: gajim/common/config.py:343
-msgid "Whitespace sent after inactivity"
+#: gajim/common/config.py:344
+#, fuzzy
+msgid "If enabled, a whitespace is sent after inactivity (keep alive)."
 msgstr "Слање белина после неактивности"
 
-#: gajim/common/config.py:344
-msgid "XMPP ping sent after inactivity"
+#: gajim/common/config.py:345
+#, fuzzy
+msgid "If enabled, an XMPP ping is sent after inactivity (ping alive)."
 msgstr "Слање XMPP пинга после неактивности"
 
-#: gajim/common/config.py:348
+#: gajim/common/config.py:349
 #, fuzzy
 msgid ""
-"How many seconds to wait for the answer of ping alive packet before trying "
-"to reconnect?"
+"How many seconds to wait for the answer of a ping alive packet before trying "
+"to reconnect."
 msgstr ""
 "Колико секунди чекати на одговор о пакетима о живости пре него што покушамо "
 "поновно успостављање везе."
 
-#: gajim/common/config.py:352
-msgid "Jabberd2 workaround"
+#: gajim/common/config.py:353
+#, fuzzy
+msgid "Jabberd2 workaround."
 msgstr "Jabberd2 привремено решење"
 
-#: gajim/common/config.py:355
+#: gajim/common/config.py:356
+#, fuzzy
 msgid ""
-"If checked, Gajim will use your IP and proxies defined in "
-"file_transfer_proxies option for file transfer."
+"If enabled, Gajim will use your IP and proxies defined in "
+"'file_transfer_proxies' option for file transfers."
 msgstr ""
 "Ако је означено, Гајим ће користити Вашу ИП адресу у прокси који је "
 "дифинисан у file_transfer_proxies подешавањима за пренос."
 
-#: gajim/common/config.py:356
+#: gajim/common/config.py:357
 msgid ""
-"If true, Gajim will test file transfer proxies on startup to be sure it "
-"works. Openfire's proxies are known to fail this test even if they work."
+"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:369
-msgid "Answer to receipt requests"
-msgstr "Одговор на захтев примања"
-
 #: gajim/common/config.py:370
-msgid "Sent receipt requests"
-msgstr "Послати захтев примања"
+#, fuzzy
+msgid "If enabled, Gajim will answer to message receipt requests."
+msgstr ""
+"Ако је означена, Гајим неће питати за статусну поруку. Већ постављена "
+"подразумевана порука ће бити коришћена."
+
+#: gajim/common/config.py:371
+msgid "If enabled, Gajim will send message receipt requests."
+msgstr ""
 
-#: gajim/common/config.py:379
+#: gajim/common/config.py:380
 #, fuzzy
 msgid ""
 "Allow Gajim to send information about the operating system you are running."
@@ -3927,185 +3964,198 @@ msgstr ""
 "Ако је означена, Гајим ће дозволити другима да погледају који оперативни "
 "систем користите"
 
-#: gajim/common/config.py:380
+#: gajim/common/config.py:381
 #, fuzzy
 msgid "Allow Gajim to send your local time."
 msgstr "%s Вам жели послати датотеку."
 
-#: gajim/common/config.py:383
+#: gajim/common/config.py:384
 #, fuzzy
-msgid "Message that is sent to contacts you want to add"
+msgid "Message that is sent to contacts you want to add."
 msgstr "Молимо Вас испуните податке за контакт кога желите додати"
 
-#: gajim/common/config.py:384
-msgid ""
-"If enabled, Gajim will send your local IPs so your contact can connect to "
-"your machine to transfer files."
-msgstr ""
-
 #: gajim/common/config.py:385
+#, fuzzy
 msgid ""
-"Space separated list of JIDs for which chat window will be re-opened on next "
-"startup."
+"If enabled, Gajim will send your local IP so your contact can connect to "
+"your machine for file transfers."
 msgstr ""
+"Ако је означено, Гајим ће користити Вашу ИП адресу у прокси који је "
+"дифинисан у file_transfer_proxies подешавањима за пренос."
 
-#: gajim/common/config.py:387
-msgid "HTTP Upload: Enable HTTPS Verification"
+#: gajim/common/config.py:386
+msgid ""
+"List of XMPP Addresses (space separated) for which the chat window will be "
+"re-opened on next startup."
 msgstr ""
 
 #: gajim/common/config.py:388
-msgid ""
-"Preferred file transfer mechanism for file drag&drop on chat window. Can be "
-"'httpupload' (default) or 'jingle'"
+msgid "HTTP File Upload: Enable HTTPS Verification."
 msgstr ""
 
 #: gajim/common/config.py:389
-msgid "Allow cert verification with POSH"
+msgid ""
+"Preferred file transfer mechanism for file drag&drop on a chat window. Can "
+"be 'httpupload' (default) or 'jingle'."
 msgstr ""
 
-#: gajim/common/config.py:423 gajim/common/config.py:430
+#: gajim/common/config.py:390
 #, fuzzy
-msgid "Language for which misspelled words will be checked"
-msgstr "Језик у коме желите проверавати неисправно написане речи"
+msgid "Allow certificate verification with POSH."
+msgstr "Грешка SSL сертификата"
 
-#: gajim/common/config.py:427
-msgid "The currently active encryption for that contact"
+#: gajim/common/config.py:425
+#, fuzzy
+msgid ""
+"Chat state notifications that are sent to contacts. Possible values: 'all', "
+"'composing_only', 'disabled'"
 msgstr ""
+"Послата обавештења о стању разговора. Може бити једно од "
+"'сви','само_састављање', 'онемогућено'."
 
-#: gajim/common/config.py:431
+#: gajim/common/config.py:428
 #, fuzzy
-msgid ""
-"How many lines to request from server when entering a groupchat. -1 means no "
-"limit, -2 means global value"
-msgstr "Колико линија тражити од сервера при уласку на групни разговор."
+msgid "The currently active encryption for that contact."
+msgstr "Омогући ESessions енкрипцију за овај налог."
 
 #: gajim/common/config.py:432
-#, fuzzy
 msgid ""
-"Minutes of backlog to request when entering a groupchat. -1 means no limit, "
-"-2 means global value"
-msgstr "Од пре колико минута тражити дневнике при уласку на групни разговор."
-
-#: gajim/common/config.py:433
-msgid "State whether a notification is created for every message in this room"
+"If enabled, a notification is created for every message in this group chat."
 msgstr ""
 
-#: gajim/common/config.py:434
+#: gajim/common/config.py:433
+#, fuzzy
 msgid ""
-"Show a status message for all status (away, dnd, etc.) changes of users in a "
-"group chat"
-msgstr ""
+"Show a status message for all status changes (away, dnd, etc.) of users in a "
+"group chat."
+msgstr "Није могуће придружити се групном разговору"
 
-#: gajim/common/config.py:435
+#: gajim/common/config.py:434
 #, fuzzy
-msgid "Show a status message for every join or leave in a group chat"
+msgid "Show a status message for every join or leave in a group chat."
 msgstr "Није могуће придружити се групном разговору"
 
+#: gajim/common/config.py:435
+msgid ""
+"If enabled, the group chat is minimized into the contact list when joining "
+"automatically."
+msgstr ""
+
 #: gajim/common/config.py:436
-msgid "If the group chat is minimized into the roster on autojoin"
+msgid ""
+"If enabled, the group chat is minimized into the contact list when closing "
+"it."
 msgstr ""
 
 #: gajim/common/config.py:437
-msgid "If the group chat is minimized into the roster on close"
+#, fuzzy
+msgid ""
+"Chat state notifications that are sent to the group chat. Possible values: "
+"'all', 'composing_only' or 'disabled'."
 msgstr ""
+"Послата обавештења о стању разговора. Може бити једно од "
+"'сви','само_састављање', 'онемогућено'."
 
-#: gajim/common/config.py:441
+#: gajim/common/config.py:440
 msgid ""
-"State whether plugins should be activated on startup (this is saved on Gajim "
-"exit). This option SHOULD NOT be used to (de)activate plug-ins. Use GUI "
-"instead."
+"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:446 gajim/common/const.py:281
+#: gajim/common/config.py:445 gajim/common/const.py:315
 msgid "Sleeping"
 msgstr "Спавам"
 
-#: gajim/common/config.py:447
+#: gajim/common/config.py:446
 msgid "Back soon"
 msgstr "Враћам се брзо"
 
-#: gajim/common/config.py:447
+#: gajim/common/config.py:446
 msgid "Back in some minutes."
 msgstr "Враћам се за пар минута."
 
-#: gajim/common/config.py:448 gajim/common/const.py:247
+#: gajim/common/config.py:447 gajim/common/const.py:281
 msgid "Eating"
 msgstr "Једем"
 
-#: gajim/common/config.py:448
-msgid "I'm eating, so leave me a message."
-msgstr "Једем, оставите поруку."
+#: gajim/common/config.py:447
+#, fuzzy
+msgid "I'm eating."
+msgstr "Радим."
 
-#: gajim/common/config.py:449
+#: gajim/common/config.py:448
 msgid "Movie"
 msgstr "Филм"
 
-#: gajim/common/config.py:449
+#: gajim/common/config.py:448
 msgid "I'm watching a movie."
 msgstr "Гледам филм."
 
-#: gajim/common/config.py:450 gajim/common/const.py:314
+#: gajim/common/config.py:449 gajim/common/const.py:348
 msgid "Working"
 msgstr "Радим."
 
-#: gajim/common/config.py:450
+#: gajim/common/config.py:449
 msgid "I'm working."
 msgstr "Радим."
 
-#: gajim/common/config.py:451
+#: gajim/common/config.py:450
 msgid "Phone"
 msgstr "Телефон"
 
-#: gajim/common/config.py:451
+#: gajim/common/config.py:450
 msgid "I'm on the phone."
 msgstr "Телефонирам."
 
-#: gajim/common/config.py:452
+#: gajim/common/config.py:451
 msgid "Out"
 msgstr "Напољу"
 
-#: gajim/common/config.py:452
+#: gajim/common/config.py:451
 msgid "I'm out enjoying life."
 msgstr "Напољу сам, уживам у животу."
 
-#: gajim/common/config.py:463
+#: gajim/common/config.py:462
 msgid "I'm available."
 msgstr "Доступан сам."
 
-#: gajim/common/config.py:464
+#: gajim/common/config.py:463
 msgid "I'm free for chat."
 msgstr "Слободан сам за разговор."
 
-#: gajim/common/config.py:465 gajim/gtk/accounts.py:134
+#: gajim/common/config.py:464 gajim/gtk/accounts.py:133
 msgid "Be right back."
 msgstr "Одмах се враћам."
 
-#: gajim/common/config.py:466
+#: gajim/common/config.py:465
 msgid "I'm not available."
 msgstr "Недоступан сам."
 
-#: gajim/common/config.py:467
+#: gajim/common/config.py:466
 msgid "Do not disturb."
 msgstr "Не сметај."
 
-#: gajim/common/config.py:468 gajim/common/config.py:469
+#: gajim/common/config.py:467 gajim/common/config.py:468
 msgid "Bye!"
 msgstr "Поздрав!"
 
-#: gajim/common/config.py:480
+#: gajim/common/config.py:479
+#, fuzzy
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
-"muc_highlight_words, or when a group chat message contains your nickname."
+"'muc_highlight_words' your nickname is mentioned."
 msgstr ""
 "Звук који ће се пустити када порука групног разговора садржи неку реч из "
 "muc_highlight_words, или када нека порука групног разговора садржи Ваш "
 "надимак."
 
-#: gajim/common/config.py:481
-msgid "Sound to play when any MUC message arrives."
+#: gajim/common/config.py:480
+#, fuzzy
+msgid "Sound to play when any group chat message arrives."
 msgstr "Звук који ће се пустити када стигне нека MUC порука."
 
-#: gajim/common/config.py:485
+#: gajim/common/config.py:484
 #, fuzzy
 msgid "Tor"
 msgstr "За"
@@ -4115,879 +4165,975 @@ msgstr "За"
 msgid "Error: cannot open %s for reading"
 msgstr "Грешка: није могуће отворити %s за читање"
 
-#: gajim/common/const.py:214
+#: gajim/common/const.py:216
+#, fuzzy
+msgid "?Group chat name:Team"
+msgstr "?Улога контакта у групном разговору:Никаква"
+
+#: gajim/common/const.py:217
+msgid "?Group chat description:Project discussion"
+msgstr ""
+
+#: gajim/common/const.py:218
+#, fuzzy
+msgid "?Group chat address:team"
+msgstr "Групни разговори"
+
+#: gajim/common/const.py:219
+#, fuzzy
+msgid "?Group chat name:Family"
+msgstr "Бојење Порука Са Групног Разговора"
+
+#: gajim/common/const.py:220
+msgid "?Group chat description:Spring gathering"
+msgstr ""
+
+#: gajim/common/const.py:221
+msgid "?Group chat address:family"
+msgstr ""
+
+#: gajim/common/const.py:222
+#, fuzzy
+msgid "?Group chat name:Vacation"
+msgstr "Позив на групни разговор"
+
+#: gajim/common/const.py:223
+msgid "?Group chat description:Trip planning"
+msgstr ""
+
+#: gajim/common/const.py:224
+#, fuzzy
+msgid "?Group chat address:vacation"
+msgstr "Позив на групни разговор"
+
+#: gajim/common/const.py:225
+#, fuzzy
+msgid "?Group chat name:Repairs"
+msgstr "Групни разговори"
+
+#: gajim/common/const.py:226
+msgid "?Group chat description:Local help group"
+msgstr ""
+
+#: gajim/common/const.py:227
+#, fuzzy
+msgid "?Group chat address:repairs"
+msgstr "Групни разговори"
+
+#: gajim/common/const.py:228
+#, fuzzy
+msgid "?Group chat name:News"
+msgstr "?Улога контакта у групном разговору:Никаква"
+
+#: gajim/common/const.py:229
+#, fuzzy
+msgid "?Group chat description:Local news and reports"
+msgstr "Стварање групних разговора Вам није дозвољено."
+
+#: gajim/common/const.py:230
+#, fuzzy
+msgid "?Group chat address:news"
+msgstr "Нови групни разговор"
+
+#: gajim/common/const.py:235
+#, fuzzy
+msgid "Remote server not found"
+msgstr "Услуга не може бити нађена"
+
+#: gajim/common/const.py:236
+msgid "Remote server timeout"
+msgstr ""
+
+#: gajim/common/const.py:237 gajim/common/const.py:238
+#: gajim/common/const.py:239
+#, fuzzy
+msgid "Address does not belong to a group chat server"
+msgstr "Ово није групни разговор"
+
+#: gajim/common/const.py:240
+#, fuzzy
+msgid "Group chat already exists"
+msgstr "Рачун локал већ постоји."
+
+#: gajim/common/const.py:241
+#, fuzzy
+msgid "Group chat does not exist"
+msgstr "Групни разговор <b>%s</b> не постоји."
+
+#: gajim/common/const.py:247
 msgid "This message was encrypted with OTR and could not be decrypted."
 msgstr ""
 
-#: gajim/common/const.py:217
+#: gajim/common/const.py:250
 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:221
+#: gajim/common/const.py:254
 msgid ""
-"This message was encrypted with OpenPGP for XMPP and could not be decrypted."
+"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:224
+#: gajim/common/const.py:258
 #, python-format
 msgid "This message was encrypted with %s and could not be decrypted."
 msgstr ""
 
-#: gajim/common/const.py:231
+#: gajim/common/const.py:265
 msgid "Doing Chores"
 msgstr "Обавља рутину"
 
-#: gajim/common/const.py:232
+#: gajim/common/const.py:266
 msgid "Buying Groceries"
 msgstr "Купује намирнице"
 
-#: gajim/common/const.py:233
+#: gajim/common/const.py:267
 msgid "Cleaning"
 msgstr "Чисти"
 
-#: gajim/common/const.py:234
+#: gajim/common/const.py:268
 msgid "Cooking"
 msgstr "Кува"
 
-#: gajim/common/const.py:235
+#: gajim/common/const.py:269
 msgid "Doing Maintenance"
 msgstr "Обавља одржавање"
 
-#: gajim/common/const.py:236
+#: gajim/common/const.py:270
 msgid "Doing the Dishes"
 msgstr "Пере судове"
 
-#: gajim/common/const.py:237
+#: gajim/common/const.py:271
 msgid "Doing the Laundry"
 msgstr "Пере веш"
 
-#: gajim/common/const.py:238
+#: gajim/common/const.py:272
 msgid "Gardening"
 msgstr "Баштовани"
 
-#: gajim/common/const.py:239
+#: gajim/common/const.py:273
 msgid "Running an Errand"
 msgstr "На задатку"
 
-#: gajim/common/const.py:240
+#: gajim/common/const.py:274
 msgid "Walking the Dog"
 msgstr "Шета пса"
 
-#: gajim/common/const.py:242
+#: gajim/common/const.py:276
 msgid "Drinking"
 msgstr "Пије"
 
-#: gajim/common/const.py:243
+#: gajim/common/const.py:277
 msgid "Having a Beer"
 msgstr "Пије пиво"
 
-#: gajim/common/const.py:244
+#: gajim/common/const.py:278
 msgid "Having Coffee"
 msgstr "Пије кафу"
 
-#: gajim/common/const.py:245
+#: gajim/common/const.py:279
 msgid "Having Tea"
 msgstr "Пије чај"
 
-#: gajim/common/const.py:248
+#: gajim/common/const.py:282
 msgid "Having a Snack"
 msgstr "Ужина"
 
-#: gajim/common/const.py:249
+#: gajim/common/const.py:283
 msgid "Having Breakfast"
 msgstr "Доручкује"
 
-#: gajim/common/const.py:250
+#: gajim/common/const.py:284
 msgid "Having Dinner"
 msgstr "Руча"
 
-#: gajim/common/const.py:251
+#: gajim/common/const.py:285
 msgid "Having Lunch"
 msgstr "Вечера"
 
-#: gajim/common/const.py:253
+#: gajim/common/const.py:287
 msgid "Exercising"
 msgstr "Вежба"
 
-#: gajim/common/const.py:254 gajim/common/const.py:305
+#: gajim/common/const.py:288 gajim/common/const.py:339
 msgid "Cycling"
 msgstr "Вози бициклу"
 
-#: gajim/common/const.py:255
+#: gajim/common/const.py:289
 msgid "Dancing"
 msgstr "Плеше"
 
-#: gajim/common/const.py:256
+#: gajim/common/const.py:290
 msgid "Hiking"
 msgstr "Шета"
 
-#: gajim/common/const.py:257
+#: gajim/common/const.py:291
 msgid "Jogging"
 msgstr "Џогира"
 
-#: gajim/common/const.py:258
+#: gajim/common/const.py:292
 msgid "Playing Sports"
 msgstr "Бави се спортом"
 
-#: gajim/common/const.py:259
+#: gajim/common/const.py:293
 msgid "Running"
 msgstr "Трчи"
 
-#: gajim/common/const.py:260
+#: gajim/common/const.py:294
 msgid "Skiing"
 msgstr "Скија"
 
-#: gajim/common/const.py:261
+#: gajim/common/const.py:295
 msgid "Swimming"
 msgstr "Плива"
 
-#: gajim/common/const.py:262
+#: gajim/common/const.py:296
 msgid "Working out"
 msgstr "Вежба"
 
-#: gajim/common/const.py:264
+#: gajim/common/const.py:298
 msgid "Grooming"
 msgstr "Чешља се"
 
-#: gajim/common/const.py:265
+#: gajim/common/const.py:299
 msgid "At the Spa"
 msgstr "У бањи"
 
-#: gajim/common/const.py:266
+#: gajim/common/const.py:300
 msgid "Brushing Teeth"
 msgstr "Пере зубе"
 
-#: gajim/common/const.py:267
+#: gajim/common/const.py:301
 msgid "Getting a Haircut"
 msgstr "Шиша се"
 
-#: gajim/common/const.py:268
+#: gajim/common/const.py:302
 msgid "Shaving"
 msgstr "Брије се"
 
-#: gajim/common/const.py:269
+#: gajim/common/const.py:303
 msgid "Taking a Bath"
 msgstr "Купа се"
 
-#: gajim/common/const.py:270
+#: gajim/common/const.py:304
 msgid "Taking a Shower"
 msgstr "Тушира се"
 
-#: gajim/common/const.py:272
+#: gajim/common/const.py:306
 msgid "Having an Appointment"
 msgstr "Састанчи"
 
-#: gajim/common/const.py:274
+#: gajim/common/const.py:308
 msgid "Inactive"
 msgstr "Неактивно"
 
-#: gajim/common/const.py:275
+#: gajim/common/const.py:309
 msgid "Day Off"
 msgstr "Слободан дан"
 
-#: gajim/common/const.py:276
+#: gajim/common/const.py:310
 msgid "Hanging out"
 msgstr "Блеји"
 
-#: gajim/common/const.py:277
+#: gajim/common/const.py:311
 msgid "Hiding"
 msgstr "Крије се"
 
-#: gajim/common/const.py:278
+#: gajim/common/const.py:312
 msgid "On Vacation"
 msgstr "На одмору"
 
-#: gajim/common/const.py:279
+#: gajim/common/const.py:313
 msgid "Praying"
 msgstr "Моли се"
 
-#: gajim/common/const.py:280
+#: gajim/common/const.py:314
 msgid "Scheduled Holiday"
 msgstr "Заказани одмор"
 
-#: gajim/common/const.py:282
+#: gajim/common/const.py:316
 msgid "Thinking"
 msgstr "Размишља"
 
-#: gajim/common/const.py:284
+#: gajim/common/const.py:318
 msgid "Relaxing"
 msgstr "Одмара се"
 
-#: gajim/common/const.py:285
+#: gajim/common/const.py:319
 msgid "Fishing"
 msgstr "Пеца"
 
-#: gajim/common/const.py:286
+#: gajim/common/const.py:320
 msgid "Gaming"
 msgstr "Игра игрице"
 
-#: gajim/common/const.py:287
+#: gajim/common/const.py:321
 msgid "Going out"
 msgstr "Излази напоље"
 
-#: gajim/common/const.py:288
+#: gajim/common/const.py:322
 msgid "Partying"
 msgstr "На проводу"
 
-#: gajim/common/const.py:289
+#: gajim/common/const.py:323
 msgid "Reading"
 msgstr "Чита"
 
-#: gajim/common/const.py:290
+#: gajim/common/const.py:324
 msgid "Rehearsing"
 msgstr "Увежбава"
 
-#: gajim/common/const.py:291
+#: gajim/common/const.py:325
 msgid "Shopping"
 msgstr "У шопингу"
 
-#: gajim/common/const.py:292
+#: gajim/common/const.py:326
 msgid "Smoking"
 msgstr "Пуши"
 
-#: gajim/common/const.py:293
+#: gajim/common/const.py:327
 msgid "Socializing"
 msgstr "Дружи се"
 
-#: gajim/common/const.py:294
+#: gajim/common/const.py:328
 msgid "Sunbathing"
 msgstr "Сунча се"
 
-#: gajim/common/const.py:295
+#: gajim/common/const.py:329
 msgid "Watching TV"
 msgstr "Гледа ТВ"
 
-#: gajim/common/const.py:296
+#: gajim/common/const.py:330
 msgid "Watching a Movie"
 msgstr "Гледа филм"
 
-#: gajim/common/const.py:298
+#: gajim/common/const.py:332
 msgid "Talking"
 msgstr "Прича"
 
-#: gajim/common/const.py:299
+#: gajim/common/const.py:333
 msgid "In Real Life"
 msgstr "У стварном животу"
 
-#: gajim/common/const.py:300
+#: gajim/common/const.py:334
 msgid "On the Phone"
 msgstr "Телефонира"
 
-#: gajim/common/const.py:301
+#: gajim/common/const.py:335
 msgid "On Video Phone"
 msgstr "На видео телефону"
 
-#: gajim/common/const.py:303
+#: gajim/common/const.py:337
 msgid "Traveling"
 msgstr "Путује"
 
-#: gajim/common/const.py:304
+#: gajim/common/const.py:338
 msgid "Commuting"
 msgstr "Мува се"
 
-#: gajim/common/const.py:306
+#: gajim/common/const.py:340
 msgid "Driving"
 msgstr "Вози"
 
-#: gajim/common/const.py:307
+#: gajim/common/const.py:341
 msgid "In a Car"
 msgstr "У колима"
 
-#: gajim/common/const.py:308
+#: gajim/common/const.py:342
 msgid "On a Bus"
 msgstr "У аутобусу"
 
-#: gajim/common/const.py:309
+#: gajim/common/const.py:343
 msgid "On a Plane"
 msgstr "У авиону"
 
-#: gajim/common/const.py:310
+#: gajim/common/const.py:344
 msgid "On a Train"
 msgstr "У возу"
 
-#: gajim/common/const.py:311
+#: gajim/common/const.py:345
 msgid "On a Trip"
 msgstr "На путу"
 
-#: gajim/common/const.py:312
+#: gajim/common/const.py:346
 msgid "Walking"
 msgstr "Шета"
 
-#: gajim/common/const.py:315
+#: gajim/common/const.py:349
 msgid "Coding"
 msgstr "Програмира"
 
-#: gajim/common/const.py:316
+#: gajim/common/const.py:350
 msgid "In a Meeting"
 msgstr "На састанку"
 
-#: gajim/common/const.py:317
+#: gajim/common/const.py:351
 msgid "Studying"
 msgstr "Учи"
 
-#: gajim/common/const.py:318
+#: gajim/common/const.py:352
 msgid "Writing"
 msgstr "Пише"
 
-#: gajim/common/const.py:321
+#: gajim/common/const.py:355
 msgid "Afraid"
 msgstr "Уплашен"
 
-#: gajim/common/const.py:322
+#: gajim/common/const.py:356
 msgid "Amazed"
 msgstr "Одушевљен"
 
-#: gajim/common/const.py:323
+#: gajim/common/const.py:357
 msgid "Amorous"
 msgstr "Заљубљен"
 
-#: gajim/common/const.py:324
+#: gajim/common/const.py:358
 msgid "Angry"
 msgstr "Љут"
 
-#: gajim/common/const.py:325
+#: gajim/common/const.py:359
 msgid "Annoyed"
 msgstr "Изнервиран"
 
-#: gajim/common/const.py:326
+#: gajim/common/const.py:360
 msgid "Anxious"
 msgstr "Анксиозан"
 
-#: gajim/common/const.py:327
+#: gajim/common/const.py:361
 msgid "Aroused"
 msgstr "Напаљен"
 
-#: gajim/common/const.py:328
+#: gajim/common/const.py:362
 msgid "Ashamed"
 msgstr "Посрамљен"
 
-#: gajim/common/const.py:329
+#: gajim/common/const.py:363
 msgid "Bored"
 msgstr "Сморен"
 
-#: gajim/common/const.py:330
+#: gajim/common/const.py:364
 msgid "Brave"
 msgstr "Храбар"
 
-#: gajim/common/const.py:331
+#: gajim/common/const.py:365
 msgid "Calm"
 msgstr "Миран"
 
-#: gajim/common/const.py:332
+#: gajim/common/const.py:366
 msgid "Cautious"
 msgstr "Опрезан"
 
-#: gajim/common/const.py:333
+#: gajim/common/const.py:367
 msgid "Cold"
 msgstr "Смрзнут"
 
-#: gajim/common/const.py:334
+#: gajim/common/const.py:368
 msgid "Confident"
 msgstr "Поуздан"
 
-#: gajim/common/const.py:335
+#: gajim/common/const.py:369
 msgid "Confused"
 msgstr "Збуњен"
 
-#: gajim/common/const.py:336
+#: gajim/common/const.py:370
 msgid "Contemplative"
 msgstr "Задубљен у мисли"
 
-#: gajim/common/const.py:337
+#: gajim/common/const.py:371
 msgid "Contented"
 msgstr "Задовољан"
 
-#: gajim/common/const.py:338
+#: gajim/common/const.py:372
 msgid "Cranky"
 msgstr "На крају живаца"
 
-#: gajim/common/const.py:339
+#: gajim/common/const.py:373
 msgid "Crazy"
 msgstr "Луд"
 
-#: gajim/common/const.py:340
+#: gajim/common/const.py:374
 msgid "Creative"
 msgstr "Креативан"
 
-#: gajim/common/const.py:341
+#: gajim/common/const.py:375
 msgid "Curious"
 msgstr "Заинтересован"
 
-#: gajim/common/const.py:342
+#: gajim/common/const.py:376
 msgid "Dejected"
 msgstr "Потиштен"
 
-#: gajim/common/const.py:343
+#: gajim/common/const.py:377
 msgid "Depressed"
 msgstr "Депресиван"
 
-#: gajim/common/const.py:344
+#: gajim/common/const.py:378
 msgid "Disappointed"
 msgstr "Разочаран"
 
-#: gajim/common/const.py:345
+#: gajim/common/const.py:379
 msgid "Disgusted"
 msgstr "Згађен"
 
-#: gajim/common/const.py:346
+#: gajim/common/const.py:380
 msgid "Dismayed"
 msgstr "Скрхан"
 
-#: gajim/common/const.py:347
+#: gajim/common/const.py:381
 msgid "Distracted"
 msgstr "Ометен"
 
-#: gajim/common/const.py:348
+#: gajim/common/const.py:382
 msgid "Embarrassed"
 msgstr "Постиђен"
 
-#: gajim/common/const.py:349
+#: gajim/common/const.py:383
 msgid "Envious"
 msgstr "Завидљив"
 
-#: gajim/common/const.py:350
+#: gajim/common/const.py:384
 msgid "Excited"
 msgstr "Узбуђен"
 
-#: gajim/common/const.py:351
+#: gajim/common/const.py:385
 msgid "Flirtatious"
 msgstr "За флертовање"
 
-#: gajim/common/const.py:352
+#: gajim/common/const.py:386
 msgid "Frustrated"
 msgstr "Фрустриран"
 
-#: gajim/common/const.py:353
+#: gajim/common/const.py:387
 msgid "Grateful"
 msgstr "Захвалан"
 
-#: gajim/common/const.py:354
+#: gajim/common/const.py:388
 msgid "Grieving"
 msgstr "У патњи"
 
-#: gajim/common/const.py:355
+#: gajim/common/const.py:389
 msgid "Grumpy"
 msgstr "Мргудан"
 
-#: gajim/common/const.py:356
+#: gajim/common/const.py:390
 msgid "Guilty"
 msgstr "Крив"
 
-#: gajim/common/const.py:357
+#: gajim/common/const.py:391
 msgid "Happy"
 msgstr "Срећан"
 
-#: gajim/common/const.py:358
+#: gajim/common/const.py:392
 msgid "Hopeful"
 msgstr "У надању"
 
-#: gajim/common/const.py:359
+#: gajim/common/const.py:393
 msgid "Hot"
 msgstr "Наложен"
 
-#: gajim/common/const.py:360
+#: gajim/common/const.py:394
 msgid "Humbled"
 msgstr "Скроман"
 
-#: gajim/common/const.py:361
+#: gajim/common/const.py:395
 msgid "Humiliated"
 msgstr "Понижен"
 
-#: gajim/common/const.py:362
+#: gajim/common/const.py:396
 msgid "Hungry"
 msgstr "Гладан"
 
-#: gajim/common/const.py:363
+#: gajim/common/const.py:397
 msgid "Hurt"
 msgstr "Повређен"
 
-#: gajim/common/const.py:364
+#: gajim/common/const.py:398
 msgid "Impressed"
 msgstr "Импресиониран"
 
-#: gajim/common/const.py:365
+#: gajim/common/const.py:399
 msgid "In Awe"
 msgstr "Очаран"
 
-#: gajim/common/const.py:366
+#: gajim/common/const.py:400
 msgid "In Love"
 msgstr "Заљубљен"
 
-#: gajim/common/const.py:367
+#: gajim/common/const.py:401
 msgid "Indignant"
 msgstr "Озлојеђен"
 
-#: gajim/common/const.py:368
+#: gajim/common/const.py:402
 msgid "Interested"
 msgstr "Заинтересован"
 
-#: gajim/common/const.py:369
+#: gajim/common/const.py:403
 msgid "Intoxicated"
 msgstr "Отрован"
 
-#: gajim/common/const.py:370
+#: gajim/common/const.py:404
 msgid "Invincible"
 msgstr "Непобедив"
 
-#: gajim/common/const.py:371
+#: gajim/common/const.py:405
 msgid "Jealous"
 msgstr "Љубоморан"
 
-#: gajim/common/const.py:372
+#: gajim/common/const.py:406
 msgid "Lonely"
 msgstr "Усамљен"
 
-#: gajim/common/const.py:373
+#: gajim/common/const.py:407
 msgid "Lost"
 msgstr "Изгубљен"
 
-#: gajim/common/const.py:374
+#: gajim/common/const.py:408
 msgid "Lucky"
 msgstr "Срећан"
 
-#: gajim/common/const.py:375
+#: gajim/common/const.py:409
 msgid "Mean"
 msgstr "Злобан"
 
-#: gajim/common/const.py:376
+#: gajim/common/const.py:410
 msgid "Moody"
 msgstr "Расположен"
 
-#: gajim/common/const.py:377
+#: gajim/common/const.py:411
 msgid "Nervous"
 msgstr "Нервозан"
 
-#: gajim/common/const.py:378
+#: gajim/common/const.py:412
 msgid "Neutral"
 msgstr "Неутралан"
 
-#: gajim/common/const.py:379
+#: gajim/common/const.py:413
 msgid "Offended"
 msgstr "Увређен"
 
-#: gajim/common/const.py:380
+#: gajim/common/const.py:414
 msgid "Outraged"
 msgstr "Побеснео"
 
-#: gajim/common/const.py:381
+#: gajim/common/const.py:415
 msgid "Playful"
 msgstr "Играо би се"
 
-#: gajim/common/const.py:382
+#: gajim/common/const.py:416
 msgid "Proud"
 msgstr "Поносан"
 
-#: gajim/common/const.py:383
+#: gajim/common/const.py:417
 msgid "Relaxed"
 msgstr "Опуштен"
 
-#: gajim/common/const.py:384
+#: gajim/common/const.py:418
 msgid "Relieved"
 msgstr "Олакшан"
 
-#: gajim/common/const.py:385
+#: gajim/common/const.py:419
 msgid "Remorseful"
 msgstr "Самилостан"
 
-#: gajim/common/const.py:386
+#: gajim/common/const.py:420
 msgid "Restless"
 msgstr "Неуморан"
 
-#: gajim/common/const.py:387
+#: gajim/common/const.py:421
 msgid "Sad"
 msgstr "Тужан"
 
-#: gajim/common/const.py:388
+#: gajim/common/const.py:422
 msgid "Sarcastic"
 msgstr "Саркастичан"
 
-#: gajim/common/const.py:389
+#: gajim/common/const.py:423
 msgid "Satisfied"
 msgstr "Задовољан"
 
-#: gajim/common/const.py:390
+#: gajim/common/const.py:424
 msgid "Serious"
 msgstr "Озбиљан"
 
-#: gajim/common/const.py:391
+#: gajim/common/const.py:425
 msgid "Shocked"
 msgstr "Шокиран"
 
-#: gajim/common/const.py:392
+#: gajim/common/const.py:426
 msgid "Shy"
 msgstr "Стидљив"
 
-#: gajim/common/const.py:393
+#: gajim/common/const.py:427
 msgid "Sick"
 msgstr "Болестан"
 
-#: gajim/common/const.py:394
+#: gajim/common/const.py:428
 msgid "Sleepy"
 msgstr "Поспан"
 
-#: gajim/common/const.py:395
+#: gajim/common/const.py:429
 msgid "Spontaneous"
 msgstr "Спонтан"
 
-#: gajim/common/const.py:396
+#: gajim/common/const.py:430
 msgid "Stressed"
 msgstr "Под стресом"
 
-#: gajim/common/const.py:397
+#: gajim/common/const.py:431
 msgid "Strong"
 msgstr "Јак"
 
-#: gajim/common/const.py:398
+#: gajim/common/const.py:432
 msgid "Surprised"
 msgstr "Изненађен"
 
-#: gajim/common/const.py:399
+#: gajim/common/const.py:433
 msgid "Thankful"
 msgstr "Захвалан"
 
-#: gajim/common/const.py:400
+#: gajim/common/const.py:434
 msgid "Thirsty"
 msgstr "Жедан"
 
-#: gajim/common/const.py:401
+#: gajim/common/const.py:435
 msgid "Tired"
 msgstr "Уморан"
 
-#: gajim/common/const.py:402
+#: gajim/common/const.py:436
 msgid "Undefined"
 msgstr "Недефинисан"
 
-#: gajim/common/const.py:403
+#: gajim/common/const.py:437
 msgid "Weak"
 msgstr "Слаб"
 
-#: gajim/common/const.py:404
+#: gajim/common/const.py:438
 msgid "Worried"
 msgstr "Забринут"
 
-#: gajim/common/const.py:408
+#: gajim/common/const.py:442
 msgid "accuracy"
 msgstr ""
 
-#: gajim/common/const.py:409
+#: gajim/common/const.py:443
 #, fuzzy
 msgid "alt"
 msgstr "подразумевано"
 
-#: gajim/common/const.py:410
+#: gajim/common/const.py:444
 msgid "area"
 msgstr ""
 
-#: gajim/common/const.py:411
+#: gajim/common/const.py:445
 #, fuzzy
 msgid "bearing"
 msgstr "морска"
 
-#: gajim/common/const.py:412
+#: gajim/common/const.py:446
 #, fuzzy
 msgid "building"
 msgstr "Крије се"
 
-#: gajim/common/const.py:413
+#: gajim/common/const.py:447
 #, fuzzy
 msgid "country"
 msgstr "Налог"
 
-#: gajim/common/const.py:414
+#: gajim/common/const.py:448
 #, fuzzy
 msgid "countrycode"
 msgstr "Налог"
 
-#: gajim/common/const.py:415
+#: gajim/common/const.py:449
 msgid "datum"
 msgstr ""
 
-#: gajim/common/const.py:416
+#: gajim/common/const.py:450
 #, fuzzy
 msgid "description"
 msgstr "Опис"
 
-#: gajim/common/const.py:417
+#: gajim/common/const.py:451
 #, fuzzy
 msgid "error"
 msgstr "Грешка"
 
-#: gajim/common/const.py:418
+#: gajim/common/const.py:452
 msgid "floor"
 msgstr ""
 
-#: gajim/common/const.py:419
+#: gajim/common/const.py:453
 msgid "lat"
 msgstr ""
 
-#: gajim/common/const.py:420
+#: gajim/common/const.py:454
 msgid "locality"
 msgstr ""
 
-#: gajim/common/const.py:421
+#: gajim/common/const.py:455
 #, fuzzy
 msgid "lon"
 msgstr "један"
 
-#: gajim/common/const.py:422
+#: gajim/common/const.py:456
 msgid "postalcode"
 msgstr ""
 
-#: gajim/common/const.py:423
+#: gajim/common/const.py:457
 msgid "region"
 msgstr ""
 
-#: gajim/common/const.py:424
+#: gajim/common/const.py:458
 msgid "room"
 msgstr "соба"
 
-#: gajim/common/const.py:425
+#: gajim/common/const.py:459
 msgid "speed"
 msgstr ""
 
-#: gajim/common/const.py:426
+#: gajim/common/const.py:460
 msgid "street"
 msgstr ""
 
-#: gajim/common/const.py:427
+#: gajim/common/const.py:461
 msgid "text"
 msgstr ""
 
-#: gajim/common/const.py:428
+#: gajim/common/const.py:462
 msgid "timestamp"
 msgstr ""
 
-#: gajim/common/const.py:429
+#: gajim/common/const.py:463
 msgid "URI"
 msgstr ""
 
-#: gajim/common/const.py:434
+#: gajim/common/const.py:468
 msgid "Unable to get issuer certificate"
 msgstr "Нисам успео да узмем сертификат издавача"
 
-#: gajim/common/const.py:435
+#: gajim/common/const.py:469
 msgid "Unable to get certificate CRL"
 msgstr "Нисам успео да узмем CRL сертификата"
 
-#: gajim/common/const.py:436
+#: gajim/common/const.py:470
 msgid "Unable to decrypt certificate's signature"
 msgstr "Нисам успео да дешифрујем потпис сертификата"
 
-#: gajim/common/const.py:437
+#: gajim/common/const.py:471
 msgid "Unable to decrypt CRL's signature"
 msgstr "Нисам успео да дешифрујем CRL сертификата"
 
-#: gajim/common/const.py:438
+#: gajim/common/const.py:472
 msgid "Unable to decode issuer public key"
 msgstr "Нисам успео да декодирам јавни кључ издавача"
 
-#: gajim/common/const.py:439
+#: gajim/common/const.py:473
 msgid "Certificate signature failure"
 msgstr "Грешка у потпису сертификата"
 
-#: gajim/common/const.py:440
+#: gajim/common/const.py:474
 msgid "CRL signature failure"
 msgstr "Грешка у CRL сертификата"
 
-#: gajim/common/const.py:441
+#: gajim/common/const.py:475
 msgid "Certificate is not yet valid"
 msgstr "Сертификат још није валидан"
 
-#: gajim/common/const.py:442
+#: gajim/common/const.py:476
 msgid "Certificate has expired"
 msgstr "Сертификат је истекао"
 
-#: gajim/common/const.py:443
+#: gajim/common/const.py:477
 msgid "CRL is not yet valid"
 msgstr "CRL није још валидан"
 
-#: gajim/common/const.py:444
+#: gajim/common/const.py:478
 msgid "CRL has expired"
 msgstr "CRL је истекао"
 
-#: gajim/common/const.py:445
+#: gajim/common/const.py:479
 msgid "Format error in certificate's notBefore field"
 msgstr "Грешка у формату сертифаковог поља од када је валидан"
 
-#: gajim/common/const.py:446
+#: gajim/common/const.py:480
 msgid "Format error in certificate's notAfter field"
 msgstr "Грешка у формату сертифаковог поља до када је валидан"
 
-#: gajim/common/const.py:447
+#: gajim/common/const.py:481
 msgid "Format error in CRL's lastUpdate field"
 msgstr "Грешка у формату CRL-овогпоља последњег ажурирања"
 
-#: gajim/common/const.py:448
+#: gajim/common/const.py:482
 msgid "Format error in CRL's nextUpdate field"
 msgstr "Грешка у формату CRL-овогпоља следећег ажурирања"
 
-#: gajim/common/const.py:449
+#: gajim/common/const.py:483
 msgid "Out of memory"
 msgstr "Немам више меморије"
 
-#: gajim/common/const.py:450
+#: gajim/common/const.py:484
 msgid "Self signed certificate"
 msgstr "Самопотписани сертификат"
 
-#: gajim/common/const.py:451
+#: gajim/common/const.py:485
 msgid "Self signed certificate in certificate chain"
 msgstr "Самопотписани сертификат у ланцу сертификата"
 
-#: gajim/common/const.py:452
+#: gajim/common/const.py:486
 msgid "Unable to get local issuer certificate"
 msgstr "У немогућности да узмем сертификат локалног издавача"
 
-#: gajim/common/const.py:453
+#: gajim/common/const.py:487
 msgid "Unable to verify the first certificate"
 msgstr "У немогућности да верификујем први сертификат"
 
-#: gajim/common/const.py:454
+#: gajim/common/const.py:488
 msgid "Certificate chain too long"
 msgstr "Ланац сертификата предугачак"
 
-#: gajim/common/const.py:455
+#: gajim/common/const.py:489
 msgid "Certificate revoked"
 msgstr "Сертификат повучен"
 
-#: gajim/common/const.py:456
+#: gajim/common/const.py:490
 msgid "Invalid CA certificate"
 msgstr "Неисправан сертификат сертификационог тела (CA)"
 
-#: gajim/common/const.py:457
+#: gajim/common/const.py:491
 msgid "Path length constraint exceeded"
 msgstr "Прекорачена дужина путање"
 
-#: gajim/common/const.py:458
+#: gajim/common/const.py:492
 msgid "Unsupported certificate purpose"
 msgstr "Неподржана сврха сертификата"
 
-#: gajim/common/const.py:459
+#: gajim/common/const.py:493
 msgid "Certificate not trusted"
 msgstr "Сертификату се не верује"
 
-#: gajim/common/const.py:460
+#: gajim/common/const.py:494
 msgid "Certificate rejected"
 msgstr "Сертификат одбачен"
 
-#: gajim/common/const.py:461
+#: gajim/common/const.py:495
 msgid "Subject issuer mismatch"
 msgstr "Погрешна тема издавача сертификата"
 
-#: gajim/common/const.py:462
+#: gajim/common/const.py:496
 msgid "Authority and subject key identifier mismatch"
 msgstr "Идентификатор кључа ауторизатора и теме се не поклапају"
 
-#: gajim/common/const.py:463
+#: gajim/common/const.py:497
 msgid "Authority and issuer serial number mismatch"
 msgstr "Серијски број ауторизатора и издавача се не поклапају"
 
-#: gajim/common/const.py:464
+#: gajim/common/const.py:498
 msgid "Key usage does not include certificate signing"
 msgstr "Употреба кључа не укључује потписивање сертификата"
 
-#: gajim/common/const.py:465
+#: gajim/common/const.py:499
 msgid "Application verification failure"
 msgstr "Верификација апликације неуспела"
 
@@ -5152,199 +5298,199 @@ msgstr ""
 msgid "video output"
 msgstr ""
 
-#: gajim/common/helpers.py:210
+#: gajim/common/helpers.py:216
 msgid "Server must be between 1 and 1023 bytes"
 msgstr ""
 
-#: gajim/common/helpers.py:214
+#: gajim/common/helpers.py:220
 msgid "Invalid character in hostname."
 msgstr "Неисправан карактер у имену хоста."
 
-#: gajim/common/helpers.py:216
+#: gajim/common/helpers.py:222
 msgid "Server address required."
 msgstr "Потребна је адреса сервера."
 
-#: gajim/common/helpers.py:220
+#: gajim/common/helpers.py:226
 msgid "Username must be between 1 and 1023 bytes"
 msgstr ""
 
-#: gajim/common/helpers.py:224
+#: gajim/common/helpers.py:230
 msgid "Invalid character in username."
 msgstr "Неисправан карактер у корисничком имену."
 
-#: gajim/common/helpers.py:230
+#: gajim/common/helpers.py:236
 msgid "Resource must be between 1 and 1023 bytes"
 msgstr ""
 
-#: gajim/common/helpers.py:234
+#: gajim/common/helpers.py:240
 msgid "Invalid character in resource."
 msgstr "Неисправан карактер у ресурсу."
 
-#: gajim/common/helpers.py:275
+#: gajim/common/helpers.py:281
 msgid "_Busy"
 msgstr "_Заузет"
 
-#: gajim/common/helpers.py:277 gajim/gtk/tooltips.py:647
+#: gajim/common/helpers.py:283 gajim/gtk/tooltips.py:647
 msgid "Busy"
 msgstr "Заузет"
 
-#: gajim/common/helpers.py:280
+#: gajim/common/helpers.py:286
 msgid "_Not Available"
 msgstr "_Недоступан"
 
-#: gajim/common/helpers.py:282 gajim/gtk/tooltips.py:649
+#: gajim/common/helpers.py:288 gajim/gtk/tooltips.py:649
 msgid "Not Available"
 msgstr "Недоступан"
 
-#: gajim/common/helpers.py:285
+#: gajim/common/helpers.py:291
 msgid "_Free for Chat"
 msgstr "_Слободан за разговор"
 
-#: gajim/common/helpers.py:287 gajim/gtk/tooltips.py:643
+#: gajim/common/helpers.py:293 gajim/gtk/tooltips.py:643
 msgid "Free for Chat"
 msgstr "Слободан за разговор"
 
-#: gajim/common/helpers.py:290
+#: gajim/common/helpers.py:296
 #, fuzzy
 msgid "?user status:_Available"
 msgstr "?статус преноса:Паузиран"
 
-#: gajim/common/helpers.py:292 gajim/gtk/tooltips.py:641
+#: gajim/common/helpers.py:298 gajim/gtk/tooltips.py:641
 #, fuzzy
 msgid "?user status:Available"
 msgstr "?статус преноса:Паузиран"
 
-#: gajim/common/helpers.py:294
+#: gajim/common/helpers.py:300
 msgid "Connecting"
 msgstr "Повезивање"
 
-#: gajim/common/helpers.py:297 gajim/data/gui/preferences_window.ui:1251
+#: gajim/common/helpers.py:303 gajim/data/gui/preferences_window.ui:1251
 msgid "A_way"
 msgstr "О_дсутан"
 
-#: gajim/common/helpers.py:299 gajim/common/modules/adhoc_commands.py:120
-#: gajim/command_system/implementation/standard.py:139
+#: gajim/common/helpers.py:305 gajim/common/modules/adhoc_commands.py:120
+#: gajim/command_system/implementation/standard.py:141
 #: gajim/gtk/tooltips.py:645
 msgid "Away"
 msgstr "Одсутан"
 
-#: gajim/common/helpers.py:302
+#: gajim/common/helpers.py:308
 msgid "_Offline"
 msgstr "_Није на вези"
 
-#: gajim/common/helpers.py:304 gajim/gtk/tooltips.py:651
+#: gajim/common/helpers.py:310 gajim/gtk/tooltips.py:651
 msgid "Offline"
 msgstr "Није на вези"
 
-#: gajim/common/helpers.py:307
+#: gajim/common/helpers.py:313
 msgid "_Invisible"
 msgstr "_Невидљив"
 
-#: gajim/common/helpers.py:313
+#: gajim/common/helpers.py:319
 msgid "?contact has status:Unknown"
 msgstr "?контакт има статус:Непознат"
 
-#: gajim/common/helpers.py:315
+#: gajim/common/helpers.py:321
 msgid "?contact has status:Has errors"
 msgstr "?контакт има статус:Постоје грешке"
 
-#: gajim/common/helpers.py:330
+#: gajim/common/helpers.py:336
 msgid "?Subscription we already have:None"
 msgstr "?Тренутна претплата:Ниједна"
 
-#: gajim/common/helpers.py:332
+#: gajim/common/helpers.py:338
 msgid "To"
 msgstr "За"
 
-#: gajim/common/helpers.py:334 gajim/data/gui/groups_post_window.ui:33
+#: gajim/common/helpers.py:340 gajim/data/gui/groups_post_window.ui:33
 msgid "From"
 msgstr "Од"
 
-#: gajim/common/helpers.py:336
+#: gajim/common/helpers.py:342
 msgid "Both"
 msgstr "Обоје"
 
-#: gajim/common/helpers.py:338 gajim/gtk/server_info.py:151
+#: gajim/common/helpers.py:344 gajim/gtk/server_info.py:151
 #, fuzzy
 msgid "Unknown"
 msgstr "?ОС:Непознат"
 
-#: gajim/common/helpers.py:344
+#: gajim/common/helpers.py:350
 msgid "?Ask (for Subscription):None"
 msgstr "?Питај (за претплату):Ниједна"
 
-#: gajim/common/helpers.py:346
+#: gajim/common/helpers.py:352
 msgid "Subscribe"
 msgstr "Претплатите се"
 
-#: gajim/common/helpers.py:355
+#: gajim/common/helpers.py:361
 msgid "?Group Chat Contact Role:None"
 msgstr "?Улога контакта у групном разговору:Никаква"
 
-#: gajim/common/helpers.py:358
+#: gajim/common/helpers.py:364
 msgid "Moderators"
 msgstr "Модератори"
 
-#: gajim/common/helpers.py:360
+#: gajim/common/helpers.py:366
 msgid "Moderator"
 msgstr "Модератор"
 
-#: gajim/common/helpers.py:363
+#: gajim/common/helpers.py:369 gajim/data/gui/groupchat_info_scrolled.ui:243
 msgid "Participants"
 msgstr "Учесници"
 
-#: gajim/common/helpers.py:365
+#: gajim/common/helpers.py:371
 msgid "Participant"
 msgstr "Учесник"
 
-#: gajim/common/helpers.py:368
+#: gajim/common/helpers.py:374
 msgid "Visitors"
 msgstr "Posjetitelji"
 
-#: gajim/common/helpers.py:370
+#: gajim/common/helpers.py:376
 msgid "Visitor"
 msgstr "Посетилац"
 
-#: gajim/common/helpers.py:376 gajim/gtk/tooltips.py:253
+#: gajim/common/helpers.py:382 gajim/gtk/tooltips.py:253
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "?Везаност контакта у групном разоговру:Никаква"
 
-#: gajim/common/helpers.py:378 gajim/data/gui/groupchat_config.ui:32
+#: gajim/common/helpers.py:384 gajim/data/gui/groupchat_config.ui:32
 #: gajim/gtk/tooltips.py:259
 msgid "Owner"
 msgstr "Власник"
 
-#: gajim/common/helpers.py:380 gajim/gtk/tooltips.py:257
+#: gajim/common/helpers.py:386 gajim/gtk/tooltips.py:257
 msgid "Administrator"
 msgstr "Администратор"
 
-#: gajim/common/helpers.py:382 gajim/data/gui/groupchat_config.ui:40
+#: gajim/common/helpers.py:388 gajim/data/gui/groupchat_config.ui:40
 #: gajim/gtk/tooltips.py:255 gajim/gtk/groupchat_config.py:105
 msgid "Member"
 msgstr "Члан"
 
-#: gajim/common/helpers.py:421
+#: gajim/common/helpers.py:427
 msgid "is paying attention to the conversation"
 msgstr "слуша конверзацију"
 
-#: gajim/common/helpers.py:423
+#: gajim/common/helpers.py:429
 msgid "is doing something else"
 msgstr "ради нешто друго"
 
-#: gajim/common/helpers.py:425
+#: gajim/common/helpers.py:431
 #, fuzzy
 msgid "is composing a message…"
 msgstr "пише поруку..."
 
-#: gajim/common/helpers.py:428
+#: gajim/common/helpers.py:434
 msgid "paused composing a message"
 msgstr "пауза при писању поруке"
 
-#: gajim/common/helpers.py:430
+#: gajim/common/helpers.py:436
 msgid "has closed the chat window or tab"
 msgstr "је затворио/затворила прозор или језичак разговора"
 
-#: gajim/common/helpers.py:936 gajim/common/helpers.py:943
+#: gajim/common/helpers.py:942 gajim/common/helpers.py:949
 #, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
@@ -5352,22 +5498,22 @@ msgstr[0] "%d порука чека"
 msgstr[1] "%d порука чекају"
 msgstr[2] "%d порука чека"
 
-#: gajim/common/helpers.py:950
+#: gajim/common/helpers.py:956
 #, fuzzy, python-format
-msgid "from room %s"
-msgstr " из собе %s"
+msgid "from group chat %s"
+msgstr "у _групним разговорима"
 
-#: gajim/common/helpers.py:953 gajim/common/helpers.py:970
+#: gajim/common/helpers.py:959 gajim/common/helpers.py:976
 #, fuzzy, python-format
 msgid "from user %s"
 msgstr " од корисника %s"
 
-#: gajim/common/helpers.py:955
+#: gajim/common/helpers.py:961
 #, fuzzy, python-format
 msgid "from %s"
 msgstr " од %s"
 
-#: gajim/common/helpers.py:962 gajim/common/helpers.py:968
+#: gajim/common/helpers.py:968 gajim/common/helpers.py:974
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
@@ -5375,40 +5521,40 @@ msgstr[0] "%d догађај на чекању"
 msgstr[1] "%d догађаја на чекању"
 msgstr[2] "%d догађај на чекању"
 
-#: gajim/common/helpers.py:986 gajim/common/helpers.py:998
+#: gajim/common/helpers.py:992 gajim/common/helpers.py:1004
 #: gajim/data/gui/roster_window.ui:85 data/org.gajim.Gajim.desktop.in:4
 #: data/org.gajim.Gajim.appdata.xml.in:9
 msgid "Gajim"
 msgstr "Гајим"
 
-#: gajim/common/helpers.py:1000
+#: gajim/common/helpers.py:1006
 #, python-format
 msgid "Gajim - %s"
 msgstr "Гајим - %s"
 
-#: gajim/common/helpers.py:1109 gajim/data/gui/add_new_contact_window.ui:25
+#: gajim/common/helpers.py:1115 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:1111
+#: gajim/common/helpers.py:1117
 msgid "Hello, I am $name."
 msgstr ""
 
-#: gajim/common/helpers.py:1215 gajim/common/helpers.py:1224
-#: gajim/common/helpers.py:1282
+#: gajim/common/helpers.py:1221 gajim/common/helpers.py:1230
+#: gajim/common/helpers.py:1288
 msgid "Timeout loading image"
 msgstr "Истекло време за учитавање слике"
 
-#: gajim/common/helpers.py:1234 gajim/common/helpers.py:1280
+#: gajim/common/helpers.py:1240 gajim/common/helpers.py:1286
 msgid "Image is too big"
 msgstr "Слика је превелика"
 
-#: gajim/common/helpers.py:1245
+#: gajim/common/helpers.py:1251
 #, fuzzy
 msgid "PyCURL is not installed"
 msgstr "CRL није још валидан"
 
-#: gajim/common/helpers.py:1284
+#: gajim/common/helpers.py:1290
 #, fuzzy
 msgid "Error loading image"
 msgstr "Истекло време за учитавање слике"
@@ -5589,7 +5735,8 @@ msgstr "Статус се променио."
 
 #: gajim/common/modules/adhoc_commands.py:202
 #: gajim/common/modules/adhoc_commands.py:239
-msgid "Leave Groupchats"
+#, fuzzy
+msgid "Leave Group Chats"
 msgstr "Напусти групне разговоре"
 
 #: gajim/common/modules/adhoc_commands.py:228
@@ -5598,15 +5745,18 @@ msgid "%(nickname)s on %(room_jid)s"
 msgstr "%(nickname)s са групног разговора у соби %(room_jid)s"
 
 #: gajim/common/modules/adhoc_commands.py:232
-msgid "You have not joined a groupchat."
+#, fuzzy
+msgid "You have not joined a group chat."
 msgstr "Ппридружили сте се групном разговору."
 
 #: gajim/common/modules/adhoc_commands.py:240
-msgid "Choose the groupchats you want to leave"
+#, fuzzy
+msgid "Choose the group chats you want to leave"
 msgstr "Одаберите групне разговоре које желите да напустите"
 
 #: gajim/common/modules/adhoc_commands.py:289
-msgid "You left the following groupchats:"
+#, fuzzy
+msgid "You left the following group chats:"
 msgstr "Напустили сте следеће групне разговоре:"
 
 #: gajim/common/modules/roster_item_exchange.py:102
@@ -5622,7 +5772,7 @@ msgstr "Послати контакти:"
 msgid "Blocked Contacts"
 msgstr "Блокирани контакти"
 
-#: gajim/data/gui/destroy_muc_dialog.ui:79 gajim/gtk/dialogs.py:736
+#: gajim/data/gui/destroy_muc_dialog.ui:79 gajim/gtk/dialogs.py:563
 msgid "Destroy this group chat permanently?"
 msgstr ""
 
@@ -5631,7 +5781,7 @@ msgstr ""
 msgid "Reason..."
 msgstr "Разлог"
 
-#: gajim/data/gui/destroy_muc_dialog.ui:124 gajim/gtk/dialogs.py:738
+#: gajim/data/gui/destroy_muc_dialog.ui:124 gajim/gtk/dialogs.py:565
 msgid "Where participants should go (optional)"
 msgstr ""
 
@@ -5644,35 +5794,6 @@ msgstr ""
 msgid "_Reason and alternate venue (optional)"
 msgstr "Можете такође унети и алтернативну локацију:"
 
-#: gajim/data/gui/advanced_configuration_window.ui:7
-#: gajim/data/gui/preferences_window.ui:2723
-#, fuzzy
-msgid "Advanced Configuration Editor (ACE)"
-msgstr "Напредна измена конфигурације"
-
-#: gajim/data/gui/advanced_configuration_window.ui:52
-#, fuzzy
-msgid "You should restart Gajim for some changes to take effect"
-msgstr ""
-"<b>НАПОМЕНА:</b> Требало би да поново покренете Гајим да би неке измене "
-"подешавања постале примењене"
-
-#: gajim/data/gui/advanced_configuration_window.ui:84
-#, fuzzy
-msgid "_Filter"
-msgstr "Филтер:"
-
-#: gajim/data/gui/advanced_configuration_window.ui:153
-#: gajim/data/gui/filetransfers_send_file_dialog.ui:15
-#: gajim/gtk/discovery.py:1666
-msgid "Description"
-msgstr "Опис"
-
-#: gajim/data/gui/advanced_configuration_window.ui:197
-#, fuzzy
-msgid "_Reset to default"
-msgstr "_Поново учитај подразумеване боје"
-
 #: gajim/data/gui/join_groupchat_window.ui:56
 #: gajim/data/gui/chat_to_muc_window.ui:67
 #: gajim/data/gui/chat_to_muc_window.ui:78
@@ -5684,9 +5805,8 @@ msgid "Join group chat every time Gajim is started"
 msgstr ""
 
 #: gajim/data/gui/join_groupchat_window.ui:113
-#, fuzzy
-msgid "Auto Join"
-msgstr "Аутоматско повезивање"
+msgid "Join Automatically"
+msgstr ""
 
 #: gajim/data/gui/join_groupchat_window.ui:131
 #: gajim/data/gui/profile_window.ui:233
@@ -5695,10 +5815,11 @@ msgstr "Налог"
 
 #: gajim/data/gui/join_groupchat_window.ui:147
 #, fuzzy
-msgid "Room"
-msgstr "Соба:"
+msgid "Group chat"
+msgstr "Групни разговори"
 
-#: gajim/data/gui/join_groupchat_window.ui:180 gajim/gtk/accounts.py:886
+#: gajim/data/gui/join_groupchat_window.ui:180 gajim/data/gui/bookmarks.ui:158
+#: gajim/gtk/accounts.py:889
 #, fuzzy
 msgid "Password"
 msgstr "Лозинка:"
@@ -5722,90 +5843,11 @@ msgstr "у _групним разговорима"
 msgid "Search group chats on selected server"
 msgstr ""
 
-#: gajim/data/gui/join_groupchat_window.ui:437 gajim/gtk/discovery.py:1271
+#: gajim/data/gui/join_groupchat_window.ui:437 gajim/gtk/discovery.py:1270
 #, fuzzy
 msgid "Join"
 msgstr "_Придружи се"
 
-#: gajim/data/gui/manage_proxies_window.ui:12
-msgid "HTTP Connect"
-msgstr "HTTP спој"
-
-#: gajim/data/gui/manage_proxies_window.ui:15
-msgid "SOCKS5"
-msgstr "SOCKS5"
-
-#: gajim/data/gui/manage_proxies_window.ui:18
-msgid "BOSH"
-msgstr ""
-
-#: gajim/data/gui/manage_proxies_window.ui:27
-msgid "Manage Proxy Profiles"
-msgstr "Подешавање прокси профила"
-
-#: gajim/data/gui/manage_proxies_window.ui:83
-#, fuzzy
-msgid "Add Proxy"
-msgstr "Прок_си:"
-
-#: gajim/data/gui/manage_proxies_window.ui:97
-#, fuzzy
-msgid "Remove Proxy"
-msgstr "Уклони групу"
-
-#: gajim/data/gui/manage_proxies_window.ui:141
-#, fuzzy
-msgid "Properties"
-msgstr "<b>Карактеристике</b>"
-
-#: gajim/data/gui/manage_proxies_window.ui:157
-#, fuzzy
-msgid "_Name"
-msgstr "_Име:"
-
-#: gajim/data/gui/manage_proxies_window.ui:173
-#, fuzzy
-msgid "_Type"
-msgstr "Врс_та:"
-
-#: gajim/data/gui/manage_proxies_window.ui:236
-#, fuzzy
-msgid "_BOSH URL"
-msgstr "_BOSH адреса:"
-
-#: gajim/data/gui/manage_proxies_window.ui:261
-msgid "Use HTTP prox_y"
-msgstr "Кор_исти HTTP прокси"
-
-#: gajim/data/gui/manage_proxies_window.ui:280
-#, fuzzy
-msgid "Proxy _Host"
-msgstr "Прокси _хост:"
-
-#: gajim/data/gui/manage_proxies_window.ui:307
-#, fuzzy
-msgid "Proxy _Port"
-msgstr "Прокси _порт:"
-
-#: gajim/data/gui/manage_proxies_window.ui:334
-#, fuzzy
-msgid "_Username"
-msgstr "_Корисничко име:"
-
-#: gajim/data/gui/manage_proxies_window.ui:347
-msgid "Use proxy auth_entication"
-msgstr "Користи прокси пријављивање"
-
-#: gajim/data/gui/manage_proxies_window.ui:377
-#, fuzzy
-msgid "Pass_word"
-msgstr "Лозинка:"
-
-#: gajim/data/gui/manage_proxies_window.ui:405 gajim/gtk/adhoc.py:321
-#, fuzzy
-msgid "Settings"
-msgstr "Регистрација неуспела"
-
 #: gajim/data/gui/change_password_dialog.ui:17
 #, fuzzy
 msgid "New Password"
@@ -5836,11 +5878,13 @@ msgid "Status:"
 msgstr "Статус:"
 
 #: gajim/data/gui/zeroconf_information_window.ui:89
-msgid "_Log conversation history"
+#, fuzzy
+msgid "_Store conversation history"
 msgstr "_Памти у дневнику историјат разговора"
 
 #: gajim/data/gui/zeroconf_information_window.ui:215
 #: gajim/data/gui/vcard_information_window.ui:390
+#: gajim/data/gui/groupchat_info_scrolled.ui:166
 msgid "Contact"
 msgstr "Контакт"
 
@@ -5853,8 +5897,9 @@ msgid "Last Name:"
 msgstr "Презиме:"
 
 #: gajim/data/gui/zeroconf_information_window.ui:260
-msgid "Jabber ID:"
-msgstr "Џабер ИД:"
+#, fuzzy
+msgid "XMPP Address:"
+msgstr "АИМ адреса:"
 
 #: gajim/data/gui/zeroconf_information_window.ui:273
 msgid "E-Mail:"
@@ -5874,8 +5919,9 @@ msgid "Send _File"
 msgstr "Пошаљи _датотеку"
 
 #: gajim/data/gui/gc_occupants_menu.ui:29
-msgid "Occupant Actions"
-msgstr "_Акције присутних"
+#, fuzzy
+msgid "Participant Actions"
+msgstr "Учесници"
 
 #: gajim/data/gui/gc_occupants_menu.ui:38
 msgid "_Voice"
@@ -5906,8 +5952,9 @@ msgid "_Ban"
 msgstr "_Забрани"
 
 #: gajim/data/gui/gc_occupants_menu.ui:124
-msgid "_Add to Roster"
-msgstr "_Додај на листу контаката"
+#, fuzzy
+msgid "_Add to Contact List"
+msgstr "_Додај контакт..."
 
 #: gajim/data/gui/gc_occupants_menu.ui:132
 #, fuzzy
@@ -5947,11 +5994,6 @@ msgstr "Претплата: "
 msgid "_Status"
 msgstr "_Статус"
 
-#: gajim/data/gui/zeroconf_context_menu.ui:26
-#: gajim/data/gui/account_context_menu.ui:79
-msgid "_Modify Account..."
-msgstr "_Измени налог..."
-
 #: gajim/data/gui/certificate_dialog.ui:66
 #: gajim/data/gui/certificate_dialog.ui:178
 msgid "Common Name (CN)"
@@ -6033,13 +6075,19 @@ msgstr "Задњи пут измењено:"
 msgid "Next entry"
 msgstr ""
 
+#: gajim/data/gui/filetransfers_send_file_dialog.ui:15
+#: gajim/data/gui/advanced_configuration.ui:143
+#: gajim/data/gui/groupchat_info_scrolled.ui:48 gajim/gtk/discovery.py:1663
+msgid "Description"
+msgstr "Опис"
+
 #: gajim/data/gui/filetransfers_send_file_dialog.ui:54
 #, fuzzy
 msgid "_Send Files"
 msgstr "Пошаљи _датотеку"
 
 #: gajim/data/gui/filetransfers_send_file_dialog.ui:58
-#: gajim/gtk/xml_console.py:90
+#: gajim/gtk/xml_console.py:87
 #, fuzzy
 msgid "Send"
 msgstr "_Пошаљи"
@@ -6064,20 +6112,23 @@ msgid "Change _Nickname..."
 msgstr "Промени _надимак..."
 
 #: gajim/data/gui/gc_control_popup_menu.ui:20
-msgid "_Manage Room"
-msgstr "Управљање собама"
+#, fuzzy
+msgid "_Manage Group Chat"
+msgstr "_Нови групни разговор"
 
 #: gajim/data/gui/gc_control_popup_menu.ui:31
 msgid "Change _Subject..."
 msgstr "Промени _тему..."
 
 #: gajim/data/gui/gc_control_popup_menu.ui:38
-msgid "Configure _Room..."
+#, fuzzy
+msgid "Configure _Group Chat..."
 msgstr "Подеси _собу..."
 
 #: gajim/data/gui/gc_control_popup_menu.ui:52
-msgid "_Destroy Room"
-msgstr "Уништи собу"
+#, fuzzy
+msgid "_Destroy Group Chat"
+msgstr "_Нови групни разговор"
 
 #: gajim/data/gui/gc_control_popup_menu.ui:64
 msgid "_Minimize on close"
@@ -6088,7 +6139,7 @@ msgstr "Умањи прозор на затварање"
 msgid "_Request Voice"
 msgstr "_Глас"
 
-#: gajim/data/gui/gc_control_popup_menu.ui:99 gajim/gtk/discovery.py:1704
+#: gajim/data/gui/gc_control_popup_menu.ui:99
 msgid "_Bookmark"
 msgstr "_Маркирај ову со_бу"
 
@@ -6140,13 +6191,6 @@ msgstr "Лична страна:"
 msgid "E-Mail"
 msgstr "Е-мејл:"
 
-#: 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/blocking_list.ui:115 gajim/gtk/add_contact.py:30
-#: gajim/gtk/accounts.py:801
-msgid "Jabber ID"
-msgstr "Џабер ИД"
-
 #: gajim/data/gui/profile_window.ui:440
 msgid "Main"
 msgstr ""
@@ -6279,36 +6323,42 @@ msgstr "Посао"
 msgid "About"
 msgstr "О"
 
-#: gajim/data/gui/start_chat_dialog.ui:114 gajim/gtk/discovery.py:1658
-msgid "Users"
-msgstr "Корисници"
-
-#: gajim/data/gui/start_chat_dialog.ui:185
+#: gajim/data/gui/start_chat_dialog.ui:53
 #, fuzzy
-msgid "Name:"
-msgstr "Име: "
+msgid "Global Group Chat Search"
+msgstr "Придружи се групном разговору"
 
-#: gajim/data/gui/start_chat_dialog.ui:197
+#: 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
-msgid "Description:"
-msgstr "Опис:"
+msgid "_Back"
+msgstr "Враћам се брзо"
+
+#: gajim/data/gui/start_chat_dialog.ui:245
+#: gajim/data/gui/groupchat_control.ui:796
+#: gajim/data/gui/groupchat_control.ui:888 gajim/gtk/discovery.py:1701
+#: gajim/gtk/groupchat_join.py:62
+msgid "_Join"
+msgstr "_Придружи се"
 
-#: gajim/data/gui/start_chat_dialog.ui:209
+#: gajim/data/gui/start_chat_dialog.ui:289
 #, fuzzy
-msgid "Address:"
-msgstr "_Адреса:"
+msgid "Select Account"
+msgstr "Уклањање рачуна %s"
 
-#: gajim/data/gui/start_chat_dialog.ui:246
-msgid ""
-"Semi-Anonymous\n"
-"<span size=\"small\">(Only moderators can see your XMPP-Address)</span>"
+#: gajim/data/gui/start_chat_dialog.ui:380
+msgid "_Select"
 msgstr ""
 
 #: gajim/data/gui/filetransfers.ui:21
 msgid "Pa_use/Resume"
 msgstr ""
 
-#: gajim/data/gui/filetransfers.ui:30 gajim/gtk/filechoosers.py:178
+#: gajim/data/gui/filetransfers.ui:30 gajim/data/gui/groupchat_control.ui:575
+#: gajim/data/gui/groupchat_control.ui:667
+#: gajim/data/gui/groupchat_control.ui:779
+#: gajim/data/gui/groupchat_control.ui:871 gajim/gtk/filechoosers.py:178
 msgid "_Cancel"
 msgstr "_Одустани"
 
@@ -6350,7 +6400,8 @@ msgid "Cancel the selected file transfer and remove incomplete files"
 msgstr "Прекини пренос означене датотеке и избриши недовршену датотеку"
 
 #: gajim/data/gui/filetransfers.ui:207
-msgid "Shows a list of file transfers between you and others"
+#, fuzzy
+msgid "Shows a list of file transfers between you and your contacts"
 msgstr "Приказује листу преноса датотека између Вас и осталих"
 
 #: gajim/data/gui/groupchat_control.ui:13 gajim/data/gui/chat_control.ui:277
@@ -6370,7 +6421,6 @@ msgid "Strike"
 msgstr "Прецртано"
 
 #: gajim/data/gui/groupchat_control.ui:54 gajim/data/gui/chat_control.ui:318
-#: gajim/gtk/advanced_config.py:86
 msgid "Color"
 msgstr "Боја"
 
@@ -6383,16 +6433,46 @@ msgstr "Фонт"
 msgid "Clear formatting"
 msgstr "Очисти форматирање"
 
-#: gajim/data/gui/groupchat_control.ui:290 gajim/data/gui/chat_control.ui:880
+#: gajim/data/gui/groupchat_control.ui:291 gajim/data/gui/chat_control.ui:880
 #, fuzzy
 msgid "Choose encryption"
 msgstr "Шифровање лозинком"
 
-#: gajim/data/gui/groupchat_control.ui:336 gajim/data/gui/chat_control.ui:640
+#: gajim/data/gui/groupchat_control.ui:337 gajim/data/gui/chat_control.ui:640
 #, fuzzy
 msgid "Show a list of emojis (Alt+M)"
 msgstr "Прикажи листу смајлија (Alt+M)"
 
+#: gajim/data/gui/groupchat_control.ui:484
+#, fuzzy
+msgid "Joining…"
+msgstr "Забрана..."
+
+#: gajim/data/gui/groupchat_control.ui:496
+msgid "_Abort"
+msgstr ""
+
+#: gajim/data/gui/groupchat_control.ui:542
+#, fuzzy
+msgid "Enter new nickname"
+msgstr "Унесите нови надимак за контакт %s"
+
+#: gajim/data/gui/groupchat_control.ui:592
+#: gajim/data/gui/groupchat_control.ui:684
+#, fuzzy
+msgid "Ch_ange"
+msgstr "Промени _надимак..."
+
+#: gajim/data/gui/groupchat_control.ui:761
+#, fuzzy
+msgid "Enter password"
+msgstr "Унесите нову лозинку:"
+
+#: gajim/data/gui/groupchat_control.ui:1067
+#, fuzzy
+msgid "_Try again"
+msgstr "Потврдите поново..."
+
 #: gajim/data/gui/popup_notification_window.ui:42
 #, fuzzy
 msgid "Event Type"
@@ -6474,8 +6554,8 @@ msgstr "Одсутан"
 
 #: gajim/data/gui/mam_preferences.ui:18
 #, fuzzy
-msgid "Roster"
-msgstr "_Прикажи листу контаката"
+msgid "Contact List"
+msgstr "Контакт"
 
 #: gajim/data/gui/mam_preferences.ui:22
 #: gajim/data/gui/preferences_window.ui:123
@@ -6500,12 +6580,12 @@ msgid "Add"
 msgstr "Додате"
 
 #: gajim/data/gui/mam_preferences.ui:194 gajim/data/gui/groupchat_config.ui:151
-#: gajim/gtk/dialogs.py:63 gajim/gtk/accounts.py:381
+#: gajim/gtk/dialogs.py:62 gajim/gtk/accounts.py:384
 #, fuzzy
 msgid "Remove"
 msgstr "_Уклони"
 
-#: gajim/data/gui/vcard_information_window.ui:72 gajim/gtk/accounts.py:753
+#: gajim/data/gui/vcard_information_window.ui:72 gajim/gtk/accounts.py:756
 #, fuzzy
 msgid "Resource"
 msgstr "Ресурс:"
@@ -6557,6 +6637,7 @@ msgstr "Претплата: "
 #: gajim/data/gui/vcard_information_window.ui:974
 #: gajim/data/gui/vcard_information_window.ui:993
 #: gajim/data/gui/vcard_information_window.ui:1427
+#: gajim/data/gui/groupchat_info_scrolled.ui:222
 msgid "button"
 msgstr ""
 
@@ -6588,15 +6669,15 @@ msgstr "Обавести ме о контактима који се _одјав�
 
 #: gajim/data/gui/preferences_window.ui:58
 #, fuzzy
-msgid "Show only in roster"
-msgstr "Прикажи догађај у листи контаката"
+msgid "Show only in contact list"
+msgstr "Прикажи само _активне контакте"
 
 #: gajim/data/gui/preferences_window.ui:69
-msgid "Detached roster with detached chats"
+msgid "Detached contact list with detached chats"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:72
-msgid "Detached roster with single chat"
+msgid "Detached contact list with single chat"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:75
@@ -6604,11 +6685,11 @@ msgid "Single window for everything"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:78
-msgid "Detached roster with chat grouped by account"
+msgid "Detached contact list with chat grouped by account"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:81
-msgid "Detached roster with chat grouped by type"
+msgid "Detached contact list with chat grouped by type"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:92
@@ -6660,7 +6741,7 @@ msgstr "Понашање прозора:"
 
 #: gajim/data/gui/preferences_window.ui:296
 #, fuzzy
-msgid "_Show roster on startup"
+msgid "_Show contact list on startup"
 msgstr "_Прикажи листу контаката"
 
 #: gajim/data/gui/preferences_window.ui:311
@@ -6676,12 +6757,12 @@ msgid "_Tabs placement"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:363
-msgid "_Quit Gajim when closing roster window"
+msgid "_Quit Gajim when closing contact list"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:367
 msgid ""
-"If enabled, Gajim will quit when closing the roster window instead of "
+"If enabled, Gajim will quit when closing the contact list window instead of "
 "minimizing to the system's notification area"
 msgstr ""
 
@@ -6691,41 +6772,42 @@ msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:423
 #, fuzzy
-msgid "Show a_vatars of contacts in roster"
+msgid "Show a_vatars of contacts in contact list"
 msgstr "Прикажи _аватаре контаката на листи"
 
 #: gajim/data/gui/preferences_window.ui:427
 #, fuzzy
 msgid ""
-"If checked, avatars of contacts will be shown in the roster window and in "
-"group chats"
+"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
 #, fuzzy
-msgid "Show status _messages of contacts in roster"
+msgid "Show status _messages of contacts in contact list"
 msgstr "Прикажи статусне поруке контаката на листи"
 
 #: gajim/data/gui/preferences_window.ui:445
 #, fuzzy
 msgid ""
 "If checked, status messages of contacts will be shown under the contact's "
-"name, in the roster window, and in group chats"
+"name, in the contact list window, and in group chats"
 msgstr ""
 "Ако је означена, Гајим ће приказивати статусне поруке контаката испод имена "
 "контакта у листи контаката и у групним разговорима"
 
 #: gajim/data/gui/preferences_window.ui:459
 #, fuzzy
-msgid "Show e_xtra information of contacts in roster (mood, activity, ...)"
+msgid ""
+"Show e_xtra information of contacts in contact list (mood, activity, ...)"
 msgstr "Прикажи _расположења контаката на листи"
 
 #: gajim/data/gui/preferences_window.ui:463
 msgid ""
-"If checked, additional info published by the contact will be shown in "
-"roster. Additional infos (published via PEP) may include e.g. mood, "
+"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 ""
 
@@ -6734,8 +6816,9 @@ msgid "Sort contacts by status"
 msgstr "Сортирај контакте по статусу"
 
 #: gajim/data/gui/preferences_window.ui:494
-msgid "in _roster"
-msgstr "у _листи контаката"
+#, fuzzy
+msgid "in _contact list"
+msgstr "Послати контакти:"
 
 #: gajim/data/gui/preferences_window.ui:511
 msgid "in _group chats"
@@ -6743,8 +6826,8 @@ msgstr "у _групним разговорима"
 
 #: gajim/data/gui/preferences_window.ui:540
 #, fuzzy
-msgid "Roster Appearance"
-msgstr "<b>Изглед листе контаката</b>"
+msgid "Contact List Appearance"
+msgstr "Размена ставки контаката"
 
 #: gajim/data/gui/preferences_window.ui:585
 #, fuzzy
@@ -6811,7 +6894,7 @@ msgstr "Није могуће придружити се групном разг�
 
 #: gajim/data/gui/preferences_window.ui:660
 #, fuzzy
-msgid "If checked, the room subject will be shown when joining a group chat"
+msgid "If checked, the subject will be shown when joining a group chat"
 msgstr "Није могуће придружити се групном разговору"
 
 #: gajim/data/gui/preferences_window.ui:682
@@ -6826,13 +6909,13 @@ msgstr ""
 #: gajim/data/gui/preferences_window.ui:701
 msgid ""
 "If join/leave status messages are shown in the group chat. This setting can "
-"be overridden in the groupchat menu."
+"be overridden in the group chat menu."
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:720
 msgid ""
 "The default sync threshold for new public group chats. This setting can be "
-"overridden in the groupchat menu."
+"overridden in the group chat menu."
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:722
@@ -6847,7 +6930,7 @@ msgstr "_Записуј у дневник статусне промене кон
 #: gajim/data/gui/preferences_window.ui:768
 msgid ""
 "If status change messages are shown in the group chat. This setting can be "
-"overridden in the groupchat menu."
+"overridden in the group chat menu."
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:825
@@ -6866,8 +6949,8 @@ msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:843
 #, fuzzy
-msgid "Show chatstate in roster"
-msgstr "Прикажи _аватаре контаката на листи"
+msgid "Show chatstate in contact list"
+msgstr "Прикаши дугме за затварање у језичку?"
 
 #: gajim/data/gui/preferences_window.ui:847
 msgid ""
@@ -7174,7 +7257,7 @@ msgstr ""
 msgid "Vi_ew own video source"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2281 gajim/gtk/accounts.py:352
+#: gajim/data/gui/preferences_window.ui:2281 gajim/gtk/accounts.py:355
 msgid "Connection"
 msgstr "Веза"
 
@@ -7228,7 +7311,8 @@ msgid "_Manage..."
 msgstr "_Подеси..."
 
 #: gajim/data/gui/preferences_window.ui:2616
-msgid "_Log status changes of contacts"
+#, fuzzy
+msgid "_Store status changes of contacts in history"
 msgstr "_Записуј у дневник статусне промене контаката"
 
 #: gajim/data/gui/preferences_window.ui:2633
@@ -7253,10 +7337,15 @@ msgstr ""
 msgid "_Open..."
 msgstr "_Отвори..."
 
+#: gajim/data/gui/preferences_window.ui:2723 gajim/gtk/advanced_config.py:84
+#, fuzzy
+msgid "Advanced Configuration Editor (ACE)"
+msgstr "Напредна измена конфигурације"
+
 #: gajim/data/gui/groupchat_config.ui:55
 #, fuzzy
 msgid ""
-"<b>Jabber-ID</b>\n"
+"<b>XMPP Address</b>\n"
 "&lt;user@domain/resource&gt; (only that resource matches)\n"
 "&lt;user@domain&gt; (any resource matches)\n"
 "&lt;domain/resource&gt; (only that resource matches)\n"
@@ -7275,7 +7364,8 @@ msgstr ""
 msgid "Only Admins and Owners can modify the affiliation"
 msgstr ""
 
-#: gajim/data/gui/groupchat_config.ui:270 gajim/plugins/gui.py:312
+#: gajim/data/gui/groupchat_config.ui:270
+#: gajim/data/gui/groupchat_info_scrolled.ui:210 gajim/plugins/gui.py:324
 #, fuzzy
 msgid "Configuration"
 msgstr "Конфигурација собе"
@@ -7308,7 +7398,7 @@ msgid "Start _Chat"
 msgstr "Започни ра_зговор"
 
 #: gajim/data/gui/contact_context_menu.ui:20
-#: gajim/data/gui/systray_context_menu.ui:36
+#: gajim/data/gui/systray_context_menu.ui:29
 msgid "Send Single _Message..."
 msgstr "Пошаљи једну _поруку..."
 
@@ -7369,17 +7459,45 @@ msgid "_Ignore"
 msgstr "_Игнориши"
 
 #: gajim/data/gui/contact_context_menu.ui:174
-msgid "_Add to Roster..."
-msgstr "_Додај на листу контаката..."
+#, fuzzy
+msgid "_Add to Contact List..."
+msgstr "_Додај контакт..."
+
+#: gajim/data/gui/advanced_configuration.ui:39
+#, fuzzy
+msgid "You should restart Gajim for some changes to take effect"
+msgstr ""
+"<b>НАПОМЕНА:</b> Требало би да поново покренете Гајим да би неке измене "
+"подешавања постале примењене"
+
+#: gajim/data/gui/advanced_configuration.ui:71
+#, fuzzy
+msgid "_Filter"
+msgstr "Филтер:"
+
+#: gajim/data/gui/advanced_configuration.ui:88
+msgid "Type to search for values..."
+msgstr ""
+
+#: gajim/data/gui/advanced_configuration.ui:180
+#, fuzzy
+msgid "_Reset Value"
+msgstr "_Поново учитај подразумеване боје"
+
+#: gajim/data/gui/advanced_configuration.ui:185
+#, fuzzy
+msgid "Resets value to default"
+msgstr "_Поново учитај подразумеване боје"
 
 #: gajim/data/gui/account_creation_wizard_window.ui:43
 msgid "Gajim: Account Creation Wizard"
 msgstr "Гајим: чаробњак за креирање налога"
 
 #: gajim/data/gui/account_creation_wizard_window.ui:70
+#, fuzzy
 msgid ""
 "You need to have an account in order to connect\n"
-"to the Jabber network."
+"to the XMPP network."
 msgstr ""
 "Морате поседовати рачун да бисте се могли повезати\n"
 "на џабер мрежу."
@@ -7401,8 +7519,9 @@ msgid "<b>Please fill in the data for your existing account</b>"
 msgstr "<b>Молимо попуните податке за Ваш постојећи кориснички налог</b>"
 
 #: gajim/data/gui/account_creation_wizard_window.ui:187
-msgid "_Jabber ID:"
-msgstr "_Џабер ИД:"
+#, fuzzy
+msgid "_XMPP Address:"
+msgstr "АИМ адреса:"
 
 #: gajim/data/gui/account_creation_wizard_window.ui:239
 #: gajim/data/gui/account_creation_wizard_window.ui:394
@@ -7489,6 +7608,7 @@ msgid "Privacy Lists:"
 msgstr "Листе приватности:"
 
 #: gajim/data/gui/service_discovery_window.ui:111
+#: gajim/data/gui/groupchat_creation.ui:227
 #, fuzzy
 msgid "_Address"
 msgstr "_Адреса:"
@@ -7506,11 +7626,6 @@ msgstr "Синхронизација: одаберите контакте"
 msgid "Select the contacts you want to synchronise"
 msgstr "Одаберите контакте које желите да синхронизујете"
 
-#: gajim/data/gui/groupchat_invitation_received.ui:42
-#, fuzzy
-msgid "Group Chat Invitation"
-msgstr "Позив на групни разговор"
-
 #: gajim/data/gui/groupchat_invitation_received.ui:111
 #, fuzzy
 msgid "Message..."
@@ -7561,11 +7676,10 @@ msgstr ""
 
 #: gajim/data/gui/add_new_contact_window.ui:84
 #, fuzzy
-msgid "_Jabber ID"
-msgstr "_Џабер ИД:"
+msgid "_XMPP Address"
+msgstr "_Адреса:"
 
 #: gajim/data/gui/add_new_contact_window.ui:100
-#: gajim/data/gui/manage_bookmarks_window.ui:192
 #, fuzzy
 msgid "_Nickname"
 msgstr "_Надимак:"
@@ -7643,7 +7757,7 @@ msgstr "<b>Расположење:</b>"
 msgid "<b>Message:</b>"
 msgstr "<b>Порука:</b>"
 
-#: gajim/data/gui/plugins_window.ui:10 gajim/data/gui/application_menu.ui:90
+#: gajim/data/gui/plugins_window.ui:10 gajim/data/gui/application_menu.ui:87
 msgid "Plugins"
 msgstr ""
 
@@ -7752,10 +7866,6 @@ msgstr "Дозволи"
 msgid "Deny"
 msgstr "Одбиј"
 
-#: gajim/data/gui/privacy_list_window.ui:317
-msgid "JabberID"
-msgstr "Џабер ИД"
-
 #: gajim/data/gui/privacy_list_window.ui:358
 msgid "all in the group"
 msgstr "све у групи"
@@ -7797,7 +7907,7 @@ msgstr "Поредак:"
 msgid "Manage sounds"
 msgstr "Подешавање налога"
 
-#: gajim/data/gui/manage_sounds_window.ui:55 gajim/plugins/gui.py:100
+#: gajim/data/gui/manage_sounds_window.ui:55 gajim/plugins/gui.py:101
 msgid "Active"
 msgstr "Активно"
 
@@ -7835,23 +7945,113 @@ msgstr "Уклони налог и из Гајима и са сервера"
 msgid "_Personal Events"
 msgstr "Лични догађаји"
 
-#: gajim/data/gui/account_context_menu.ui:35
-#: gajim/data/gui/systray_context_menu.ui:28
-msgid "Join _Group Chat"
-msgstr "Прикључи се _групном разговору"
-
-#: gajim/data/gui/account_context_menu.ui:49
+#: gajim/data/gui/account_context_menu.ui:41
 msgid "_Add Contact..."
 msgstr "_Додај контакт..."
 
-#: gajim/data/gui/account_context_menu.ui:57
+#: gajim/data/gui/account_context_menu.ui:49
 msgid "_Discover Services"
 msgstr "_Откривање сервиса"
 
-#: gajim/data/gui/account_context_menu.ui:65
+#: gajim/data/gui/account_context_menu.ui:57
 msgid "_Execute Command..."
 msgstr "_Изврши наредбу..."
 
+#: gajim/data/gui/account_context_menu.ui:65
+#, fuzzy
+msgid "_View Certificate"
+msgstr "Самопотписани сертификат"
+
+#: gajim/data/gui/manage_proxies.ui:12
+#, fuzzy
+msgctxt "proxy configuration"
+msgid "HTTP Connect"
+msgstr "HTTP спој"
+
+#: gajim/data/gui/manage_proxies.ui:15
+#, fuzzy
+msgctxt "proxy configuration"
+msgid "SOCKS5"
+msgstr "SOCKS5"
+
+#: gajim/data/gui/manage_proxies.ui:18
+#, fuzzy
+msgctxt "proxy configuration"
+msgid "BOSH"
+msgstr "_BOSH адреса:"
+
+#: gajim/data/gui/manage_proxies.ui:68
+#, fuzzy
+msgid "Add Proxy"
+msgstr "Прок_си:"
+
+#: gajim/data/gui/manage_proxies.ui:82
+#, fuzzy
+msgid "Remove Proxy"
+msgstr "Уклони групу"
+
+#: gajim/data/gui/manage_proxies.ui:134
+#, fuzzy
+msgid "Pass_word"
+msgstr "Лозинка:"
+
+#: gajim/data/gui/manage_proxies.ui:159
+msgid "Use proxy auth_entication"
+msgstr "Користи прокси пријављивање"
+
+#: gajim/data/gui/manage_proxies.ui:179
+#, fuzzy
+msgid "_Username"
+msgstr "_Корисничко име:"
+
+#: gajim/data/gui/manage_proxies.ui:209
+#, fuzzy
+msgid "_Port"
+msgstr "_Порт:"
+
+#: gajim/data/gui/manage_proxies.ui:226
+msgid "example.org"
+msgstr ""
+
+#: gajim/data/gui/manage_proxies.ui:240
+#, fuzzy
+msgid "_Host"
+msgstr "Име хоста:"
+
+#: gajim/data/gui/manage_proxies.ui:254
+msgid "Use HTTP prox_y"
+msgstr "Кор_исти HTTP прокси"
+
+#: gajim/data/gui/manage_proxies.ui:275
+msgid "https://example.org/http-bind/"
+msgstr ""
+
+#: gajim/data/gui/manage_proxies.ui:291
+#, fuzzy
+msgid "_BOSH URL"
+msgstr "_BOSH адреса:"
+
+#: gajim/data/gui/manage_proxies.ui:309 gajim/gtk/adhoc.py:322
+#, fuzzy
+msgid "Settings"
+msgstr "Регистрација неуспела"
+
+#: gajim/data/gui/manage_proxies.ui:344
+#, fuzzy
+msgid "_Type"
+msgstr "Врс_та:"
+
+#: gajim/data/gui/manage_proxies.ui:361
+#: gajim/data/gui/groupchat_creation.ui:105
+#, fuzzy
+msgid "_Name"
+msgstr "_Име:"
+
+#: gajim/data/gui/manage_proxies.ui:391 gajim/gtk/accounts.py:742
+#, fuzzy
+msgid "Proxy"
+msgstr "Прок_си:"
+
 #: gajim/data/gui/application_menu.ui:8
 #, fuzzy
 msgid "View"
@@ -7859,8 +8059,8 @@ msgstr "_Приказ"
 
 #: gajim/data/gui/application_menu.ui:11
 #, fuzzy
-msgid "Show Roster"
-msgstr "_Прикажи листу контаката"
+msgid "Show Contact List"
+msgstr "Прикажи само _активне контакте"
 
 #: gajim/data/gui/application_menu.ui:16
 #, fuzzy
@@ -7901,22 +8101,23 @@ msgstr ""
 msgid "Features"
 msgstr "Могућности"
 
-#: gajim/data/gui/application_menu.ui:81
+#: gajim/data/gui/application_menu.ui:77
+#: gajim/data/gui/groupchat_creation.ui:81 gajim/gtk/groupchat_creation.py:45
 #, fuzzy
-msgid "Bookmarks"
-msgstr "_Маркирај ову со_бу"
+msgid "Create Group Chat"
+msgstr "Напусти групне разговоре"
 
-#: gajim/data/gui/application_menu.ui:94 gajim/data/gui/shortcuts_window.ui:189
-#: gajim/gtk/preferences.py:59
+#: gajim/data/gui/application_menu.ui:91 gajim/data/gui/shortcuts_window.ui:189
+#: gajim/gtk/preferences.py:58
 msgid "Preferences"
 msgstr "Подешавања"
 
-#: gajim/data/gui/application_menu.ui:99
+#: gajim/data/gui/application_menu.ui:96
 msgid "Quit"
 msgstr ""
 
 #: gajim/data/gui/httpupload_progress_dialog.ui:110
-#: gajim/gtk/filetransfer.py:121
+#: gajim/gtk/filetransfer.py:120
 msgid "Progress"
 msgstr "Напредак"
 
@@ -7933,52 +8134,33 @@ msgstr ""
 msgid "_Cancel Upload"
 msgstr "_Одустани"
 
-#: gajim/data/gui/manage_bookmarks_window.ui:13
-#, fuzzy
-msgid "Group Chat Bookmarks"
-msgstr "Групни разговори"
-
-#: gajim/data/gui/manage_bookmarks_window.ui:68
-#, fuzzy
-msgid "Add Bookmark"
-msgstr "_Маркирај ову со_бу"
-
-#: gajim/data/gui/manage_bookmarks_window.ui:82
-#, fuzzy
-msgid "Remove Bookmark"
-msgstr "_Маркирај ову со_бу"
+#: gajim/data/gui/groupchat_creation.ui:27
+msgid "Public or Private?"
+msgstr ""
 
-#: gajim/data/gui/manage_bookmarks_window.ui:126
-msgid "N_ame"
+#: 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 ""
 
-#: gajim/data/gui/manage_bookmarks_window.ui:145
-#, fuzzy
-msgid "Bookmark Name"
-msgstr "Маркирај ову собу"
+#: gajim/data/gui/groupchat_creation.ui:58
+msgid "<b>Public:</b> Anyone who knows the address can join."
+msgstr ""
 
-#: gajim/data/gui/manage_bookmarks_window.ui:160
+#: gajim/data/gui/groupchat_creation.ui:122
 #, fuzzy
-msgid "_Server"
-msgstr "_Сервер:"
+msgid "_Description"
+msgstr "Опис"
 
-#: gajim/data/gui/manage_bookmarks_window.ui:223
-msgid "Roo_m"
+#: gajim/data/gui/groupchat_creation.ui:164
+msgid "_Public"
 msgstr ""
 
-#: gajim/data/gui/manage_bookmarks_window.ui:253
+#: gajim/data/gui/groupchat_creation.ui:278
 #, fuzzy
-msgid "_Password"
-msgstr "_Лозинка:"
-
-#: gajim/data/gui/manage_bookmarks_window.ui:299
-#, fuzzy
-msgid "Join chat when connected"
-msgstr "Контакт Отишао Са Везе"
-
-#: gajim/data/gui/manage_bookmarks_window.ui:307
-msgid "_Join Automatically"
-msgstr ""
+msgid "_Account"
+msgstr "_Налози"
 
 #: gajim/data/gui/exception_dialog.ui:49
 msgid "Sorry, that should not have happened"
@@ -8020,6 +8202,29 @@ msgstr "Одобри ауторизацију контакта тако да м�
 msgid "Presets"
 msgstr "_Присутност"
 
+#: gajim/data/gui/groupchat_info_scrolled.ui:32
+#, fuzzy
+msgid "Address"
+msgstr "_Адреса:"
+
+#: gajim/data/gui/groupchat_info_scrolled.ui:64
+msgid "Topic"
+msgstr ""
+
+#: gajim/data/gui/groupchat_info_scrolled.ui:80
+#, fuzzy
+msgid "Author"
+msgstr "_Одобри ауторизацију"
+
+#: gajim/data/gui/groupchat_info_scrolled.ui:182
+msgid "Discussion Logs"
+msgstr ""
+
+#: gajim/data/gui/groupchat_info_scrolled.ui:260
+#, fuzzy
+msgid "Group Chat Language"
+msgstr "Позив на групни разговор"
+
 #: gajim/data/gui/emoji_chooser.ui:98
 #, fuzzy
 msgid "No Results Found"
@@ -8032,24 +8237,35 @@ msgstr "Позови пријатеље!"
 #: gajim/data/gui/chat_to_muc_window.ui:39
 #, fuzzy
 msgid ""
-"You are now entering a groupchat.\n"
+"You are now entering a group chat.\n"
 "Select the contacts you want to invite"
 msgstr ""
 "Започећете групни разговор.\n"
 "Одаберите контакте које желите да позовете"
 
 #: gajim/data/gui/chat_to_muc_window.ui:112
-msgid "Please select a MUC server."
+#, fuzzy
+msgid "Please select a group chat server."
 msgstr "Молимо одаберите сервер групног разговора."
 
 #: gajim/data/gui/chat_to_muc_window.ui:141
-msgid "MUC server"
-msgstr "Сервер групног разговора"
+#, fuzzy
+msgid "Group chat server"
+msgstr "Групни разговори"
 
 #: gajim/data/gui/chat_to_muc_window.ui:176
 msgid "In_vite"
 msgstr "Позо_ви"
 
+#: gajim/data/gui/bookmarks.ui:176
+#, fuzzy
+msgid "Autojoin"
+msgstr "Аутоматско повезивање"
+
+#: gajim/data/gui/bookmarks.ui:211
+msgid "_Apply"
+msgstr ""
+
 #: gajim/data/gui/history_manager.ui:11
 #, fuzzy
 msgid "_Export"
@@ -8065,12 +8281,13 @@ msgid "Gajim History Logs Manager"
 msgstr "Гајим менаџер дневника историјата"
 
 #: gajim/data/gui/history_manager.ui:108
+#, fuzzy
 msgid ""
-"This log manager is not intended for log viewing. If you are looking for "
-"such functionality, use the history window instead.\n"
+"This history manager is not intended for viewing chat history. If you are "
+"looking for such functionality, please use the history window instead.\n"
 "\n"
-"Use this program to delete or export logs. You can select logs from the left "
-"and/or search database from below."
+"You can use this program to delete or export history. Either select logs "
+"from the left or search the database."
 msgstr ""
 "Овај менаџер дневника није намењен за преглед дневника. Ако Вам треба та "
 "функционалност, користите менаџер дневника историјата.\n"
@@ -8122,8 +8339,9 @@ msgid "Select an emoji"
 msgstr ""
 
 #: gajim/data/gui/shortcuts_window.ui:38
-msgid "Complete a command or a nick"
-msgstr ""
+#, fuzzy
+msgid "Complete a command or a nickname"
+msgstr "Молимо Вас направите нову чисту тему са жељеним именом."
 
 #: gajim/data/gui/shortcuts_window.ui:45
 #, fuzzy
@@ -8163,7 +8381,7 @@ msgstr ""
 msgid "Scroll down"
 msgstr ""
 
-#: gajim/data/gui/shortcuts_window.ui:100 gajim/gtk/xml_console.py:72
+#: gajim/data/gui/shortcuts_window.ui:100 gajim/gtk/xml_console.py:69
 #, fuzzy
 msgid "Clear"
 msgstr "Чисти"
@@ -8205,8 +8423,9 @@ msgid "Close chat"
 msgstr ""
 
 #: gajim/data/gui/shortcuts_window.ui:173
-msgid "Roster Shortcuts"
-msgstr ""
+#, fuzzy
+msgid "Contact List Shortcuts"
+msgstr "Размена ставки контаката"
 
 #: gajim/data/gui/shortcuts_window.ui:196
 #, fuzzy
@@ -8239,7 +8458,7 @@ msgid "Show only active contacts"
 msgstr "Прикажи само _активне контакте"
 
 #: gajim/data/gui/shortcuts_window.ui:251
-msgid "Enable roster filtering"
+msgid "Enable contact list filtering"
 msgstr ""
 
 #: gajim/data/gui/shortcuts_window.ui:259
@@ -8287,12 +8506,12 @@ msgstr ""
 
 #: gajim/data/gui/history_window.ui:317
 #, fuzzy
-msgid "Record history for this chat"
+msgid "Store history for this chat"
 msgstr "Игнориши ову грешку за овај сертификат."
 
 #: gajim/data/gui/history_window.ui:332
 #, fuzzy
-msgid "Record History"
+msgid "Store History"
 msgstr "Недавно:"
 
 #: gajim/data/gui/history_window.ui:350
@@ -8313,9 +8532,10 @@ msgstr "Направи нову објаву"
 msgid "Fill in the form."
 msgstr "Попуните формулар."
 
-#: gajim/data/gui/data_form_window.ui:229
-msgid "Room Configuration"
-msgstr "Конфигурација собе"
+#: gajim/data/gui/data_form_window.ui:229 gajim/gtk/groupchat_config.py:41
+#, fuzzy
+msgid "Group Chat Configuration"
+msgstr "Позив на групни разговор"
 
 #: gajim/data/gui/roster_item_exchange_window.ui:39
 #: gajim/gtk/roster_item_exchange.py:35
@@ -8336,15 +8556,15 @@ msgstr "Ста_тус"
 msgid "_Start Chat..."
 msgstr "_Започни разговор"
 
-#: gajim/data/gui/systray_context_menu.ui:50
+#: gajim/data/gui/systray_context_menu.ui:43
 msgid "Show All Pending _Events"
 msgstr "Прикажи св_е догађаје на чекању"
 
-#: gajim/data/gui/systray_context_menu.ui:59
+#: gajim/data/gui/systray_context_menu.ui:52
 msgid "Mute Sounds"
 msgstr "Угаси звукове"
 
-#: gajim/data/gui/systray_context_menu.ui:75
+#: gajim/data/gui/systray_context_menu.ui:68
 #, fuzzy
 msgid "_Preferences"
 msgstr "Подешавања"
@@ -8435,34 +8655,34 @@ msgstr ""
 msgid "Execute expression inside a shell, send output"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:45
+#: gajim/command_system/implementation/standard.py:47
 msgid ""
 "Show help on a given command or a list of available commands if -a is given"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:73
+#: gajim/command_system/implementation/standard.py:75
 #, fuzzy
 msgid "Send a message to the contact"
 msgstr "Начин коришћења: /%s, шаље поруку контакту"
 
-#: gajim/command_system/implementation/standard.py:78
+#: gajim/command_system/implementation/standard.py:80
 msgid "Send action (in the third person) to the current chat"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:83
+#: gajim/command_system/implementation/standard.py:85
 msgid "Show logged messages which mention given text"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:88
+#: gajim/command_system/implementation/standard.py:90
 #, fuzzy, python-format
 msgid "%s: Nothing found"
 msgstr "%s није пронађен"
 
-#: gajim/command_system/implementation/standard.py:94
+#: gajim/command_system/implementation/standard.py:96
 msgid "Limit must be an integer"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:118
+#: gajim/command_system/implementation/standard.py:120
 msgid ""
 "\n"
 "    Set the current status\n"
@@ -8472,126 +8692,129 @@ msgid ""
 "    "
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:136
+#: gajim/command_system/implementation/standard.py:138
 msgid "Set the current status to away"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:150
+#: gajim/command_system/implementation/standard.py:152
 msgid "Set the current status to online"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:153
+#: gajim/command_system/implementation/standard.py:155
 #, fuzzy
 msgid "Available"
 msgstr "_Доступан"
 
-#: gajim/command_system/implementation/standard.py:173
-#: gajim/command_system/implementation/standard.py:250
+#: gajim/command_system/implementation/standard.py:175
+#: gajim/command_system/implementation/standard.py:252
 #, fuzzy
 msgid "Clear the text window"
 msgstr "Начин коришћења: /%s, празни текстуални прозор"
 
-#: gajim/command_system/implementation/standard.py:178
-#: gajim/command_system/implementation/standard.py:397
+#: gajim/command_system/implementation/standard.py:180
+#: gajim/command_system/implementation/standard.py:401
 #, fuzzy
 msgid "Send a ping to the contact"
 msgstr "Начин коришћења: /%s, шаље пинк контакту"
 
-#: gajim/command_system/implementation/standard.py:181
-#: gajim/command_system/implementation/standard.py:400
+#: gajim/command_system/implementation/standard.py:183
+#: gajim/command_system/implementation/standard.py:404
 #, fuzzy
 msgid "Command is not supported for zeroconf accounts"
 msgstr "Команда није подржана за zeroconf  налог."
 
-#: gajim/command_system/implementation/standard.py:185
-msgid "Send DTMF sequence through an open audio session"
+#: gajim/command_system/implementation/standard.py:187
+msgid "Send DTMF sequence through an open voice chat"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:188
-msgid "No open audio sessions with the contact"
-msgstr ""
+#: gajim/command_system/implementation/standard.py:190
+#, fuzzy
+msgid "No open voice chats with the contact"
+msgstr "Начин коришћења: /%s, шаље пинк контакту"
 
-#: gajim/command_system/implementation/standard.py:191
+#: gajim/command_system/implementation/standard.py:193
 #, fuzzy, python-format
 msgid "%s is not a valid tone"
 msgstr "%s није исправан ниво логовања"
 
-#: gajim/command_system/implementation/standard.py:198
-msgid "Toggle audio session"
+#: gajim/command_system/implementation/standard.py:200
+msgid "Toggle Voice Chat"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:201
+#: gajim/command_system/implementation/standard.py:203
 #, fuzzy
-msgid "Audio sessions are not available"
+msgid "Voice chats are not available"
 msgstr "Веза није доступна"
 
-#: gajim/command_system/implementation/standard.py:208
-msgid "Toggle video session"
+#: gajim/command_system/implementation/standard.py:210
+msgid "Toggle Video Chat"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:211
+#: gajim/command_system/implementation/standard.py:213
 #, fuzzy
-msgid "Video sessions are not available"
+msgid "Video chats are not available"
 msgstr "Веза није доступна"
 
-#: gajim/command_system/implementation/standard.py:218
+#: gajim/command_system/implementation/standard.py:220
 #, fuzzy
 msgid "Send a message to the contact that will attract their attention"
 msgstr "Начин коришћења: /%s, шаље поруку контакту"
 
-#: gajim/command_system/implementation/standard.py:255
+#: gajim/command_system/implementation/standard.py:257
 #, fuzzy
 msgid "Change your nickname in a group chat"
 msgstr "Промени надимак (Ctrl+N)"
 
-#: gajim/command_system/implementation/standard.py:260 gajim/gtk/dialogs.py:674
-#: gajim/gtk/bookmarks.py:272
+#: gajim/command_system/implementation/standard.py:262
 msgid "Invalid nickname"
 msgstr "Неисправан надимак"
 
-#: gajim/command_system/implementation/standard.py:267
-msgid "Open a private chat window with a specified occupant"
+#: gajim/command_system/implementation/standard.py:269
+#, fuzzy
+msgid "Open a private chat window with a specified participant"
 msgstr "Отвори приватни разговор са одабраним учесником"
 
-#: gajim/command_system/implementation/standard.py:273
-#: gajim/command_system/implementation/standard.py:282
-#: gajim/command_system/implementation/standard.py:332
-#: gajim/command_system/implementation/standard.py:345
-#: gajim/command_system/implementation/standard.py:357
+#: gajim/command_system/implementation/standard.py:275
+#: gajim/command_system/implementation/standard.py:284
+#: gajim/command_system/implementation/standard.py:336
+#: gajim/command_system/implementation/standard.py:349
+#: gajim/command_system/implementation/standard.py:361
 #, fuzzy
 msgid "Nickname not found"
 msgstr "Надимак није пронађен: %s "
 
-#: gajim/command_system/implementation/standard.py:276
+#: gajim/command_system/implementation/standard.py:278
+#, fuzzy
 msgid ""
-"Open a private chat window with a specified occupant and send him a message"
+"Open a private chat window with a specified participant and send him a "
+"message"
 msgstr "Отвори приватни разговор са одабраним учесником и пошаљи му поруку"
 
-#: gajim/command_system/implementation/standard.py:285
+#: gajim/command_system/implementation/standard.py:287
 #, fuzzy
 msgid "Display or change a group chat topic"
 msgstr "Питај пре затварања прозора/језичка групног разговора."
 
-#: gajim/command_system/implementation/standard.py:294
-msgid "Invite a user to a room for a reason"
+#: gajim/command_system/implementation/standard.py:296
+msgid "Invite a user to a group chat for a reason"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:297
+#: gajim/command_system/implementation/standard.py:299
 #, fuzzy, python-format
 msgid "Invited %(jid)s to %(room_jid)s"
 msgstr "Пошаљи %s за %s"
 
-#: gajim/command_system/implementation/standard.py:301
+#: gajim/command_system/implementation/standard.py:303
 #, fuzzy
-msgid "Join a group chat given by a JID"
+msgid "Join a group chat given by an XMPP Address"
 msgstr "у _групним разговорима"
 
-#: gajim/command_system/implementation/standard.py:309
+#: gajim/command_system/implementation/standard.py:313
 msgid ""
-"Leave the groupchat, optionally giving a reason, and close tab or window"
+"Leave the group chat, optionally giving a reason, and close tab or window"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:314
+#: gajim/command_system/implementation/standard.py:318
 msgid ""
 "\n"
 "    Ban user by a nick or a JID from a groupchat\n"
@@ -8600,46 +8823,46 @@ msgid ""
 "    "
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:329
+#: gajim/command_system/implementation/standard.py:333
 #, fuzzy
-msgid "Kick user by a nick from a groupchat"
+msgid "Kick user by a nick from a group chat"
 msgstr "Позвани сте у групни разговор"
 
-#: gajim/command_system/implementation/standard.py:338
+#: gajim/command_system/implementation/standard.py:342
 msgid ""
-"Set occupant role in group chat.\n"
+"Set participant role in group chat.\n"
 "    Role can be given as one of the following values:\n"
 "    moderator, participant, visitor, none"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:343
+#: gajim/command_system/implementation/standard.py:347
 #, fuzzy
 msgid "Invalid role given"
 msgstr "Неисправан сервер"
 
-#: gajim/command_system/implementation/standard.py:350
+#: gajim/command_system/implementation/standard.py:354
 msgid ""
-"Set occupant affiliation in group chat.\n"
+"Set participant affiliation in group chat.\n"
 "    Affiliation can be given as one of the following values:\n"
 "    owner, admin, member, outcast, none"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:355
+#: gajim/command_system/implementation/standard.py:359
 #, fuzzy
 msgid "Invalid affiliation given"
 msgstr "везаност измењена"
 
-#: gajim/command_system/implementation/standard.py:365
+#: gajim/command_system/implementation/standard.py:369
 #, fuzzy
-msgid "Display names of all group chat occupants"
+msgid "Display names of all group chat participants"
 msgstr "Начин коришћења: /%s , приказује имена учесника у групном разговору."
 
-#: gajim/command_system/implementation/standard.py:387
-msgid "Forbid an occupant to send you public or private messages"
+#: gajim/command_system/implementation/standard.py:391
+msgid "Forbid a participant to send you public or private messages"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:392
-msgid "Allow an occupant to send you public or private messages"
+#: gajim/command_system/implementation/standard.py:396
+msgid "Allow a participant to send you public or private messages"
 msgstr ""
 
 #: gajim/command_system/implementation/middleware.py:74
@@ -8650,204 +8873,329 @@ msgstr ""
 msgid "The same as using a doc-string, except it supports translation"
 msgstr ""
 
-#: gajim/gtk/filetransfer.py:91
+#: gajim/gtk/groupchat_info.py:36
+#, fuzzy
+msgid "?Group chat feature:Archiving"
+msgstr "Позив на групни разговор"
+
+#: gajim/gtk/groupchat_info.py:37
+#, fuzzy
+msgid "Messages are archived on the server"
+msgstr "Сесија НЕЋЕ бити памћена"
+
+#: gajim/gtk/groupchat_info.py:40
+#, fuzzy
+msgid "?Group chat feature:Persistent"
+msgstr "Групни разговори"
+
+#: gajim/gtk/groupchat_info.py:41
+msgid "This group chat persists even if there are no participants"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:45
+#, fuzzy
+msgid "?Group chat feature:Temporary"
+msgstr "?Улога контакта у групном разговору:Никаква"
+
+#: gajim/gtk/groupchat_info.py:46
+msgid "This group chat will be destroyed once the last participant left"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:50
+#, fuzzy
+msgid "?Group chat feature:Moderated"
+msgstr "?Улога контакта у групном разговору:Никаква"
+
+#: gajim/gtk/groupchat_info.py:51
+msgid ""
+"Participants entering this group chat need to request permission to send "
+"messages"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:55
+#, fuzzy
+msgid "?Group chat feature:Not Moderated"
+msgstr "Групни разговори"
+
+#: gajim/gtk/groupchat_info.py:56
+msgid "Participants entering this group chat are allowed to send messages"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:60
+#, fuzzy
+msgid "?Group chat feature:Open"
+msgstr "?Улога контакта у групном разговору:Никаква"
+
+#: gajim/gtk/groupchat_info.py:61
+#, fuzzy
+msgid "Anyone can join this group chat"
+msgstr "%s се придружио групном разговору"
+
+#: gajim/gtk/groupchat_info.py:64
+#, fuzzy
+msgid "?Group chat feature:Members Only"
+msgstr "Бојење Порука Са Групног Разговора"
+
+#: gajim/gtk/groupchat_info.py:65
+msgid "This group chat is restricted to members only"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:69
+#, fuzzy
+msgid "?Group chat feature:Public"
+msgstr "Бојење Порука Са Групног Разговора"
+
+#: gajim/gtk/groupchat_info.py:70
+msgid "Group chat can be found via search"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:73
+#, fuzzy
+msgid "?Group chat feature:Hidden"
+msgstr "?Улога контакта у групном разговору:Никаква"
+
+#: gajim/gtk/groupchat_info.py:74
+#, fuzzy
+msgid "This group chat can not be found via search"
+msgstr "Услуга не може бити нађена"
+
+#: gajim/gtk/groupchat_info.py:77
+#, fuzzy
+msgid "?Group chat feature:Not Anonymous"
+msgstr "Групни разговори"
+
+#: gajim/gtk/groupchat_info.py:78
+msgid "All other group chat participants can see your XMPP address"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:82
+#, fuzzy
+msgid "?Group chat feature:Semi-Anonymous"
+msgstr "Бојење Порука Са Групног Разговора"
+
+#: gajim/gtk/groupchat_info.py:83
+msgid "Only moderators can see your XMPP address"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:86
+#, fuzzy
+msgid "?Group chat feature:Password Required"
+msgstr "Групни разговори"
+
+#: gajim/gtk/groupchat_info.py:87
+msgid "This group chat does require a password upon entry"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:91
+#, fuzzy
+msgid "?Group chat feature:No Password Required"
+msgstr "Групни разговори"
+
+#: gajim/gtk/groupchat_info.py:92
+msgid "This group chat does not require a password upon entry"
+msgstr ""
+
+#: gajim/gtk/filetransfer.py:90
 msgid "File"
 msgstr "Датотека"
 
-#: gajim/gtk/filetransfer.py:108
+#: gajim/gtk/filetransfer.py:107
 msgid "Time"
 msgstr "Време"
 
-#: gajim/gtk/filetransfer.py:228
+#: gajim/gtk/filetransfer.py:227
 #, fuzzy, python-format
 msgid "File name: %s"
 msgstr "Име датотеке: %s"
 
-#: gajim/gtk/filetransfer.py:229 gajim/gtk/filetransfer.py:464
+#: gajim/gtk/filetransfer.py:228 gajim/gtk/filetransfer.py:469
 #, python-format
 msgid "Size: %s"
 msgstr "Величина: %s"
 
-#: gajim/gtk/filetransfer.py:239
+#: gajim/gtk/filetransfer.py:238
 #, python-format
 msgid "Sender: %s"
 msgstr "Пошаљилац: %s"
 
-#: gajim/gtk/filetransfer.py:240 gajim/gtk/filetransfer.py:744
+#: gajim/gtk/filetransfer.py:239 gajim/gtk/filetransfer.py:749
 #: gajim/gtk/tooltips.py:577
 msgid "Recipient: "
 msgstr "Примаоц: "
 
-#: gajim/gtk/filetransfer.py:251
+#: gajim/gtk/filetransfer.py:250
 #, python-format
 msgid "Saved in: %s"
 msgstr "Сачувано у: %s"
 
-#: gajim/gtk/filetransfer.py:256
+#: gajim/gtk/filetransfer.py:255
 msgid "File transfer completed"
 msgstr "Пренос датотеке завршен"
 
-#: gajim/gtk/filetransfer.py:276 gajim/gtk/filetransfer.py:285
+#: gajim/gtk/filetransfer.py:275 gajim/gtk/filetransfer.py:284
 #, fuzzy
 msgid "Connection with peer could not be established."
 msgstr "Није могуће успоставити везу са другом страном."
 
-#: gajim/gtk/filetransfer.py:293
+#: gajim/gtk/filetransfer.py:292
 #, python-format
 msgid "Filename: %s"
 msgstr "Име датотеке: %s"
 
-#: gajim/gtk/filetransfer.py:294
+#: gajim/gtk/filetransfer.py:293
 #, python-format
 msgid "Recipient: %s"
 msgstr "Примаоц: %s"
 
-#: gajim/gtk/filetransfer.py:296
+#: gajim/gtk/filetransfer.py:295
 #, python-format
 msgid "Error message: %s"
 msgstr "Порука грешке: %s"
 
-#: gajim/gtk/filetransfer.py:333
-#, fuzzy
-msgid "File transfer error"
-msgstr "Грешка при преносу датотеке"
-
 #: gajim/gtk/filetransfer.py:334
 #, python-format
 msgid ""
-"The file %(file)s has been received, but it seems to have been damaged along "
-"the way.\n"
+"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 ""
 
-#: gajim/gtk/filetransfer.py:350
+#: gajim/gtk/filetransfer.py:340
+#, fuzzy
+msgid "_Download Again"
+msgstr "_Не питај ме више"
+
+#: gajim/gtk/filetransfer.py:355
 #, fuzzy
 msgid "Gajim can not read this file"
 msgstr "Гајим не може приступити овој датотеци"
 
-#: gajim/gtk/filetransfer.py:351
+#: gajim/gtk/filetransfer.py:356
 msgid "Another process is using this file."
 msgstr ""
 
-#: gajim/gtk/filetransfer.py:418
+#: gajim/gtk/filetransfer.py:423
 #, fuzzy
 msgid "File Transfer Conflict"
 msgstr "Пренос датотеке завршен"
 
-#: gajim/gtk/filetransfer.py:419
+#: gajim/gtk/filetransfer.py:424
 msgid "This file already exists"
 msgstr "Ова датотека већ постоји"
 
-#: gajim/gtk/filetransfer.py:420
+#: gajim/gtk/filetransfer.py:425
 msgid "Resume download or replace file?"
 msgstr ""
 
-#: gajim/gtk/filetransfer.py:424
+#: gajim/gtk/filetransfer.py:429
 #, fuzzy
 msgid "Replace _File"
 msgstr "Чисти"
 
-#: gajim/gtk/filetransfer.py:427
+#: gajim/gtk/filetransfer.py:432
 #, fuzzy
 msgid "Resume _Download"
 msgstr "Скидање"
 
-#: gajim/gtk/filetransfer.py:437
+#: gajim/gtk/filetransfer.py:442
 #, fuzzy, python-format
 msgid "Directory '%s' is not writable"
 msgstr "У фасциклу \"%s\" није могуће писање"
 
-#: gajim/gtk/filetransfer.py:438
+#: gajim/gtk/filetransfer.py:443
 #, fuzzy
 msgid "You do not have permissions to create files in this directory."
 msgstr "Немате привилегија за писање у овој фасцикли"
 
-#: gajim/gtk/filetransfer.py:461
+#: gajim/gtk/filetransfer.py:466
 #, python-format
 msgid "File: %s"
 msgstr "Датотека: %s"
 
-#: gajim/gtk/filetransfer.py:467
+#: gajim/gtk/filetransfer.py:472
 #, python-format
 msgid "Type: %s"
 msgstr "Tip: %s"
 
-#: gajim/gtk/filetransfer.py:469
+#: gajim/gtk/filetransfer.py:474
 #, python-format
 msgid "Description: %s"
 msgstr "Опис: %s"
 
-#: gajim/gtk/filetransfer.py:480
+#: gajim/gtk/filetransfer.py:485
 #, fuzzy, python-format
 msgid "%s wants to send you a file"
 msgstr "%s Вам жели послати датотеку."
 
-#: gajim/gtk/filetransfer.py:509
+#: gajim/gtk/filetransfer.py:514
 #, fuzzy
 msgid "Checking file…"
 msgstr "Слање профила..."
 
-#: gajim/gtk/filetransfer.py:524
+#: gajim/gtk/filetransfer.py:529
 #, fuzzy
 msgid "File error"
 msgstr "Грешка при преносу датотеке"
 
-#: gajim/gtk/filetransfer.py:561
+#: gajim/gtk/filetransfer.py:566
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 
-#: gajim/gtk/filetransfer.py:658
+#: gajim/gtk/filetransfer.py:663
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/сек)"
 
-#: gajim/gtk/filetransfer.py:711 gajim/gtk/filetransfer.py:715
+#: gajim/gtk/filetransfer.py:716 gajim/gtk/filetransfer.py:720
 msgid "Invalid File"
 msgstr "Неисправна датотека"
 
-#: gajim/gtk/filetransfer.py:711
+#: gajim/gtk/filetransfer.py:716
 msgid "File: "
 msgstr "Датотека: "
 
-#: gajim/gtk/filetransfer.py:716
+#: gajim/gtk/filetransfer.py:721
 msgid "It is not possible to send empty files"
 msgstr "Није могуће послати празну датотеку"
 
-#: gajim/gtk/filetransfer.py:742 gajim/gtk/tooltips.py:571
+#: gajim/gtk/filetransfer.py:747 gajim/gtk/tooltips.py:571
 msgid "Sender: "
 msgstr "Пошаљилац: "
 
-#: gajim/gtk/filetransfer.py:1038
+#: gajim/gtk/filetransfer.py:1043
 #, fuzzy
 msgid "Choose a File to Send…"
 msgstr "Одаберите датотеку за слање..."
 
 #: gajim/gtk/start_chat.py:51
 #, fuzzy
-msgid "Start new Conversation"
+msgid "Start New Conversation"
 msgstr "Настављени разговор"
 
-#: gajim/gtk/start_chat.py:424
-#, fuzzy
-msgid "New Groupchat"
-msgstr "Нови групни разговор"
+#: gajim/gtk/start_chat.py:260 gajim/gtk/start_chat.py:328
+msgid "You can not join a group chat unless you are connected."
+msgstr "Не можете се прикључити групном разговору ако нисте повезани."
+
+#: gajim/gtk/start_chat.py:603 gajim/gtk/groupchat_join.py:38
+msgid "Join Group Chat"
+msgstr "Придружи се групном разговору"
 
-#: gajim/gtk/start_chat.py:426
+#: gajim/gtk/start_chat.py:605 gajim/gtk/add_contact.py:40
 #, fuzzy
-msgid "New Contact"
-msgstr "Додај нови контакт"
+msgid "Add Contact"
+msgstr "_Додај контакт..."
 
-#: gajim/gtk/start_chat.py:588
+#: gajim/gtk/start_chat.py:746
 #, fuzzy, python-format
-msgid "%s Group chats found"
+msgid "%s group chats found"
 msgstr "%s није пронађен"
 
-#: gajim/gtk/discovery.py:70
+#: gajim/gtk/discovery.py:69
 msgid "This service has not yet responded with detailed information"
 msgstr "Овај сервис још није пружио детаљне информације"
 
-#: gajim/gtk/discovery.py:71
+#: gajim/gtk/discovery.py:70
 #, fuzzy
 msgid ""
 "This service could not respond with detailed information.\n"
@@ -8856,32 +9204,33 @@ msgstr ""
 "Овај сервис није могао одговорити са детаљним информацијама.\n"
 "Највероватније је застарео или у квару"
 
-#: gajim/gtk/discovery.py:128
+#: gajim/gtk/discovery.py:126
 msgid "Others"
 msgstr "Остали"
 
-#: gajim/gtk/discovery.py:131
-msgid "Conference"
-msgstr "Конференција"
+#: gajim/gtk/discovery.py:129
+#, fuzzy
+msgid "Group Chat"
+msgstr "Групни разговори"
 
-#: gajim/gtk/discovery.py:519
+#: gajim/gtk/discovery.py:518
 msgid "Without a connection, you can not browse available services"
 msgstr "Без успостављене везе, не можете разгледати доступне услуге"
 
-#: gajim/gtk/discovery.py:606
+#: gajim/gtk/discovery.py:605
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Откривање услуга са налога %s"
 
-#: gajim/gtk/discovery.py:608
+#: gajim/gtk/discovery.py:607
 msgid "Service Discovery"
 msgstr "Откривање Услуга"
 
-#: gajim/gtk/discovery.py:691
+#: gajim/gtk/discovery.py:690
 msgid "The service could not be found"
 msgstr "Услуга не може бити нађена"
 
-#: gajim/gtk/discovery.py:692
+#: gajim/gtk/discovery.py:691
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -8889,102 +9238,80 @@ msgstr ""
 "На наведеној адреси нема усуга, или нема одговора. Проверите адресу и "
 "покушајте поново."
 
-#: gajim/gtk/discovery.py:699 gajim/gtk/discovery.py:1042
+#: gajim/gtk/discovery.py:698 gajim/gtk/discovery.py:1041
 msgid "The service is not browsable"
 msgstr "Услуге нису претраживе"
 
-#: gajim/gtk/discovery.py:700
+#: gajim/gtk/discovery.py:699
 msgid "This type of service does not contain any items to browse."
 msgstr "Овај тип услуге не садржи елементе за претрагу"
 
-#: gajim/gtk/discovery.py:738 gajim/gtk/discovery.py:747
+#: gajim/gtk/discovery.py:737 gajim/gtk/discovery.py:746
 msgid "Invalid Server Name"
 msgstr "Неисправано име сервера"
 
-#: gajim/gtk/discovery.py:806
+#: gajim/gtk/discovery.py:805
 #, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Претражујем %(address)s користећи налог %(account)s"
 
-#: gajim/gtk/discovery.py:851
+#: gajim/gtk/discovery.py:850
 #, fuzzy
 msgid "Browse"
 msgstr "_Преглед"
 
-#: gajim/gtk/discovery.py:1043
+#: gajim/gtk/discovery.py:1042
 msgid "This service does not contain any items to browse."
 msgstr "Ова услуга не садржи елементе за претрагу"
 
-#: gajim/gtk/discovery.py:1255
+#: gajim/gtk/discovery.py:1254
 #, fuzzy
 msgid "_Command"
 msgstr "наредба"
 
-#: gajim/gtk/discovery.py:1264 gajim/gtk/discovery.py:1422
+#: gajim/gtk/discovery.py:1263 gajim/gtk/discovery.py:1420
 msgid "Re_gister"
 msgstr "Ре_гистрација"
 
-#: gajim/gtk/discovery.py:1277
+#: gajim/gtk/discovery.py:1276
 msgid "_Search"
 msgstr "_Претрага"
 
-#: gajim/gtk/discovery.py:1420
+#: gajim/gtk/discovery.py:1418
 msgid "_Edit"
 msgstr "_Измени"
 
-#: gajim/gtk/discovery.py:1458
+#: gajim/gtk/discovery.py:1456
 #, fuzzy, python-format
 msgid "Scanning %(current)d / %(total)d ..."
 msgstr "Скенирање %(current)d / %(total)d.."
 
-#: gajim/gtk/discovery.py:1674
+#: gajim/gtk/discovery.py:1655
+msgid "Users"
+msgstr "Корисници"
+
+#: gajim/gtk/discovery.py:1671
 msgid "Id"
 msgstr "Идентификација"
 
-#: gajim/gtk/discovery.py:1713
-msgid "_Join"
-msgstr "_Придружи се"
-
-#: gajim/gtk/discovery.py:1736
-msgid "Bookmark already set"
-msgstr "Маркер је већ постављен"
-
-#: gajim/gtk/discovery.py:1737
-#, fuzzy, python-format
-msgid "Group Chat '%s' is already in your bookmarks."
-msgstr "Групни разговор \"%s\" је већ маркиран."
-
-#: gajim/gtk/discovery.py:1748
-msgid "Bookmark has been added successfully"
-msgstr "Маркер успешно додат"
-
-#: gajim/gtk/discovery.py:1749
-#, fuzzy
-msgid ""
-"You can manage your bookmarks by clicking the Bookmarks menu item in your "
-"contact list."
-msgstr ""
-"Можете управљати Вашим маркерима помоћу менија Акције из Ваше листе "
-"контаката."
-
-#: gajim/gtk/discovery.py:1950
+#: gajim/gtk/discovery.py:1900
 msgid "Subscribed"
 msgstr "Претплаћен"
 
-#: gajim/gtk/discovery.py:1959
+#: gajim/gtk/discovery.py:1909
 msgid "Node"
 msgstr "Чвор"
 
-#: gajim/gtk/discovery.py:2028
+#: gajim/gtk/discovery.py:1978
 #, fuzzy
 msgid "_New post"
 msgstr "Нова објава"
 
-#: gajim/gtk/discovery.py:2037
+#: gajim/gtk/discovery.py:1987
 msgid "_Subscribe"
 msgstr "_Претплати се"
 
-#: gajim/gtk/discovery.py:2045
+#: gajim/gtk/discovery.py:1995
 msgid "_Unsubscribe"
 msgstr "_Укини претплату"
 
@@ -9032,7 +9359,7 @@ msgstr "Форма %s"
 msgid "Characters typed: %s"
 msgstr "Карактер није дозвољен"
 
-#: gajim/gtk/single_message.py:274 gajim/gtk/xml_console.py:169
+#: gajim/gtk/single_message.py:274 gajim/gtk/xml_console.py:166
 msgid "Connection not available"
 msgstr "Веза није доступна"
 
@@ -9041,6 +9368,12 @@ msgstr "Веза није доступна"
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Молимо потврдите да сте спојени на \"%s\"."
 
+#: gajim/gtk/single_message.py:306
+#, 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:330
 #, python-format
 msgid "RE: %s"
@@ -9051,28 +9384,28 @@ msgstr "RE: %s"
 msgid "%s wrote:\n"
 msgstr "%s пише:\n"
 
-#: gajim/gtk/pep_config.py:44
+#: gajim/gtk/pep_config.py:45
 #, fuzzy, python-format
 msgid "PEP Service Configuration (%s)"
 msgstr "PEP конфигурација сервиса"
 
-#: gajim/gtk/pep_config.py:77
+#: gajim/gtk/pep_config.py:78
 #, fuzzy
 msgid "Service"
 msgstr "Сервер"
 
-#: gajim/gtk/pep_config.py:114
+#: gajim/gtk/pep_config.py:115
 msgid "PEP node was not removed"
 msgstr "PEP чвор није уклоњен"
 
-#: gajim/gtk/pep_config.py:115
+#: gajim/gtk/pep_config.py:116
 #, fuzzy, python-format
 msgid ""
 "PEP node %(node)s was not removed:\n"
 "%(message)s"
 msgstr "PEP чвор %(node)s није уклоњен: %(message)s"
 
-#: gajim/gtk/pep_config.py:146
+#: gajim/gtk/pep_config.py:147
 #, fuzzy, python-format
 msgid "Configure %s"
 msgstr "_Конфигуриши"
@@ -9088,17 +9421,21 @@ msgstr "_Регистрација"
 msgid "Registration successful"
 msgstr "Регистрација успешна"
 
-#: gajim/gtk/dialogs.py:54 gajim/gtk/dataform.py:659 gajim/gtk/adhoc.py:85
+#: gajim/gtk/service_registration.py:215
+msgid "Registration failed"
+msgstr "Регистрација неуспела"
+
+#: gajim/gtk/dialogs.py:53 gajim/gtk/dataform.py:668 gajim/gtk/adhoc.py:86
 #, fuzzy
 msgid "Cancel"
 msgstr "_Одустани"
 
-#: gajim/gtk/dialogs.py:129
+#: gajim/gtk/dialogs.py:128
 #, fuzzy, python-format
 msgid "Dictionary for language \"%s\" not available"
 msgstr "Речник за језик %s није доступан"
 
-#: gajim/gtk/dialogs.py:130
+#: gajim/gtk/dialogs.py:129
 #, fuzzy, python-format
 msgid ""
 "You have to install the dictionary \"%s\" to use spellchecking, or choose "
@@ -9111,11 +9448,11 @@ msgstr ""
 "\n"
 "Осветљавање лоше написаних речи неће бити у употреби"
 
-#: gajim/gtk/dialogs.py:410 gajim/gtk/dialogs.py:425
+#: gajim/gtk/dialogs.py:322 gajim/gtk/dialogs.py:337
 msgid "Insecure connection"
 msgstr "Несигурна веза"
 
-#: gajim/gtk/dialogs.py:411
+#: gajim/gtk/dialogs.py:323
 #, fuzzy, python-format
 msgid ""
 "You are about to connect to the account %(account)s (%(server)s) insecurely. "
@@ -9128,120 +9465,115 @@ msgstr ""
 "не препоручује.\n"
 "Да ли сте сигурни да желите да се повежете овако?"
 
-#: gajim/gtk/dialogs.py:416
+#: gajim/gtk/dialogs.py:328
 msgid "Yes, I really want to connect insecurely"
 msgstr "Да, заиста желим да се конектујем несигурном везом"
 
-#: gajim/gtk/dialogs.py:417
+#: gajim/gtk/dialogs.py:329
 msgid "Gajim will NOT connect unless you check this box"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:675
-#, fuzzy
-msgid "The nickname contains invalid characters."
-msgstr "Надимак садржи недозвољене карактере."
-
-#: gajim/gtk/dialogs.py:734
+#: gajim/gtk/dialogs.py:561
 #, fuzzy, python-format
 msgid "Destroy %s"
 msgstr "Уништавам %s"
 
-#: gajim/gtk/dialogs.py:775
+#: gajim/gtk/dialogs.py:602
 #, fuzzy
 msgid "Certificate"
 msgstr "Самопотписани сертификат"
 
-#: gajim/gtk/dialogs.py:786
+#: gajim/gtk/dialogs.py:613
 #, fuzzy, python-format
 msgid ""
 "Certificate for account\n"
 "%s"
 msgstr "за налог %s"
 
-#: gajim/gtk/dialogs.py:824
+#: gajim/gtk/dialogs.py:651
 msgid "Issued to\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:825 gajim/gtk/dialogs.py:830
+#: gajim/gtk/dialogs.py:652 gajim/gtk/dialogs.py:657
 msgid "Common Name (CN): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:826 gajim/gtk/dialogs.py:831
+#: gajim/gtk/dialogs.py:653 gajim/gtk/dialogs.py:658
 msgid "Organization (O): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:827 gajim/gtk/dialogs.py:832
+#: gajim/gtk/dialogs.py:654 gajim/gtk/dialogs.py:659
 msgid "Organizational Unit (OU): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:828
+#: gajim/gtk/dialogs.py:655
 #, fuzzy
 msgid "Serial Number: "
 msgstr "ГГ Број:"
 
-#: gajim/gtk/dialogs.py:829
+#: gajim/gtk/dialogs.py:656
 msgid "Issued by\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:833
+#: gajim/gtk/dialogs.py:660
 msgid "Validity\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:834
+#: gajim/gtk/dialogs.py:661
 msgid "Issued on: "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:835
+#: gajim/gtk/dialogs.py:662
 msgid "Expires on: "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:836
+#: gajim/gtk/dialogs.py:663
 msgid "SHA-1:"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:838
+#: gajim/gtk/dialogs.py:665
 msgid "SHA-256:"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:852
+#: gajim/gtk/dialogs.py:679
 #, fuzzy
 msgid "View certificate…"
 msgstr "Самопотписани сертификат"
 
-#: gajim/gtk/dialogs.py:864 gajim/gtk/accounts.py:893
+#: gajim/gtk/dialogs.py:691 gajim/gtk/accounts.py:896
 msgid "Change Password"
 msgstr "Измени лозинку"
 
-#: gajim/gtk/dialogs.py:878
+#: gajim/gtk/dialogs.py:705
 msgid "_OK"
 msgstr "_У реду"
 
-#: gajim/gtk/dialogs.py:891
+#: gajim/gtk/dialogs.py:718
 #, fuzzy
 msgid "You must enter a password"
 msgstr "Морате да унесете лозинку"
 
-#: gajim/gtk/dialogs.py:895
+#: gajim/gtk/dialogs.py:722
 msgid "Passwords do not match"
 msgstr "Лозинке се не поклапају"
 
-#: gajim/gtk/dialogs.py:923
+#: gajim/gtk/dialogs.py:750
 #, fuzzy
 msgid "Group Chat Invitation "
 msgstr "Позив на групни разговор"
 
-#: gajim/gtk/dialogs.py:948
+#: gajim/gtk/dialogs.py:775
 #, fuzzy, python-format
 msgid "<b>%s</b> has invited you to join a discussion"
 msgstr "$Contact Вас је позвао на разговор"
 
-#: gajim/gtk/dialogs.py:951
+#: gajim/gtk/dialogs.py:778
 #, 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:959
+#: gajim/gtk/dialogs.py:786
 #, python-format
 msgid "Comment: %s"
 msgstr "Коментар: %s"
@@ -9256,11 +9588,6 @@ msgstr "ГГ Број:"
 msgid "ICQ Number"
 msgstr "ICQ Број:"
 
-#: gajim/gtk/add_contact.py:40
-#, fuzzy
-msgid "Add Contact"
-msgstr "_Додај контакт..."
-
 #: gajim/gtk/add_contact.py:259
 #, fuzzy, python-format
 msgid "%s Missing"
@@ -9281,7 +9608,8 @@ msgid "The user ID must not contain a resource."
 msgstr "ИД корисника не сме садржавати ресурс."
 
 #: gajim/gtk/add_contact.py:299
-msgid "You cannot add yourself to your roster."
+#, fuzzy
+msgid "You cannot add yourself to your contact list."
 msgstr "Не можете додати себе у Вашу листу контаката."
 
 #: gajim/gtk/add_contact.py:304
@@ -9294,11 +9622,13 @@ msgid "Your account must be online to add new contacts."
 msgstr ""
 
 #: gajim/gtk/add_contact.py:321
-msgid "Contact already in roster"
+#, fuzzy
+msgid "Contact Already in Contact List"
 msgstr "Контакт је већ у листи"
 
 #: gajim/gtk/add_contact.py:322
-msgid "This contact is already listed in your roster."
+#, fuzzy
+msgid "This contact is already in your contact list."
 msgstr "Контакт је већ у листи контаката."
 
 #: gajim/gtk/add_contact.py:379 gajim/gtk/add_contact.py:417
@@ -9339,14 +9669,14 @@ msgstr "Измени статус"
 
 #: gajim/gtk/themes.py:52
 #, fuzzy
-msgid "MUC Tab New Directed Message"
+msgid "Group Chat Tab New Directed Message"
 msgstr ""
 "Усмерене поруке\n"
 "вишекорисничког разговора"
 
 #: gajim/gtk/themes.py:56
 #, fuzzy
-msgid "MUC Tab New Message"
+msgid "Group Chat Tab New Message"
 msgstr "Нова Порука"
 
 #: gajim/gtk/themes.py:60
@@ -9563,13 +9893,13 @@ msgstr "Све датотеке"
 msgid "Clear File"
 msgstr "Чисти"
 
-#: gajim/gtk/settings.py:570
+#: gajim/gtk/settings.py:570 gajim/gtk/proxies.py:32
 #, fuzzy
 msgid "Manage Proxies"
 msgstr "Подешавање прокси профила"
 
-#: gajim/gtk/settings.py:591 gajim/gtk/preferences.py:971
-#: gajim/gtk/preferences.py:984 gajim/gtk/preferences.py:988
+#: gajim/gtk/settings.py:591 gajim/gtk/preferences.py:968
+#: gajim/gtk/preferences.py:982 gajim/gtk/preferences.py:986
 #, fuzzy
 msgid "No Proxy"
 msgstr "Прок_си:"
@@ -9649,14 +9979,15 @@ msgid ""
 "        "
 msgstr ""
 
-#: gajim/gtk/about.py:47 data/org.gajim.Gajim.appdata.xml.in:10
+#: gajim/gtk/about.py:47 data/org.gajim.Gajim.desktop.in:6
+#: data/org.gajim.Gajim.appdata.xml.in:10
 #, fuzzy
-msgid "A GTK+ XMPP client"
+msgid "A GTK XMPP client"
 msgstr "GTK+ Џабер клијент"
 
 #: gajim/gtk/about.py:48
 #, fuzzy, python-format
-msgid "GTK+ Version: %s"
+msgid "GTK Version: %s"
 msgstr "ГТК+ верзија:"
 
 #: gajim/gtk/about.py:49
@@ -9836,6 +10167,25 @@ msgstr "?статус преноса:Паузиран"
 msgid "?transfer status:Not started"
 msgstr "?статус преноса:Паузиран"
 
+#: gajim/gtk/groupchat_creation.py:97 gajim/gtk/groupchat_creation.py:99
+msgid " (optional)..."
+msgstr ""
+
+#: gajim/gtk/groupchat_creation.py:134
+#, fuzzy
+msgid "Invalid Address"
+msgstr "Неисправна датотека"
+
+#: gajim/gtk/groupchat_creation.py:182
+#, fuzzy
+msgid "Not Connected"
+msgstr "На вези"
+
+#: gajim/gtk/groupchat_creation.py:183
+#, fuzzy
+msgid "You have to be connected to create a group chat."
+msgstr "Ппридружили сте се групном разговору."
+
 #: gajim/gtk/sounds.py:39
 msgid "Wav Sounds"
 msgstr "Wav Звукови"
@@ -9877,50 +10227,45 @@ msgstr "Бојење Порука Са Групног Разговора"
 msgid "Group Chat Message Received"
 msgstr "Примљена Порука Са Групног Разговора"
 
-#: gajim/gtk/dataform.py:226 gajim/gtk/dataform.py:262
+#: gajim/gtk/dataform.py:232 gajim/gtk/dataform.py:268
 #, fuzzy
 msgid "Required"
 msgstr "Лозинка захтевана"
 
-#: gajim/gtk/dataform.py:286
+#: gajim/gtk/dataform.py:293
 msgid "Yes"
 msgstr "Да"
 
-#: gajim/gtk/dataform.py:286
+#: gajim/gtk/dataform.py:293
 #, fuzzy
 msgid "No"
 msgstr "Ништа"
 
-#: gajim/gtk/dataform.py:661
+#: gajim/gtk/dataform.py:670
 msgid "Submit"
 msgstr ""
 
-#: gajim/gtk/statusicon.py:213
+#: gajim/gtk/statusicon.py:206
 #, fuzzy
 msgid "_Change Status Message…"
 msgstr "_Измени статусну поруку"
 
-#: gajim/gtk/statusicon.py:247 gajim/gtk/statusicon.py:292
-#: gajim/gtk/statusicon.py:299
+#: gajim/gtk/statusicon.py:258
 #, python-format
 msgid "using account %s"
 msgstr "користећи рачун %s"
 
-#: gajim/gtk/statusicon.py:309
+#: gajim/gtk/statusicon.py:269
 #, fuzzy
-msgid "_Manage Bookmarks…"
-msgstr "Подешавање маркера"
+msgid "Hide _Contact List"
+msgstr "Позови контакте"
 
-#: gajim/gtk/statusicon.py:325
+#: gajim/gtk/statusicon.py:273
 #, fuzzy
-msgid "Hide _Roster"
-msgstr "у _листи контаката"
-
-#: gajim/gtk/statusicon.py:329
-msgid "Show _Roster"
-msgstr "_Прикажи листу контаката"
+msgid "Show _Contact List"
+msgstr "Прикажи само _активне контакте"
 
-#: gajim/gtk/statusicon.py:337
+#: gajim/gtk/statusicon.py:281
 msgid "Hide this menu"
 msgstr "Сакриј овај мени"
 
@@ -9969,36 +10314,6 @@ msgstr ""
 "Настала је грешка приликом објављивања Ваших личних информација, покушајте "
 "поново касније."
 
-#: gajim/gtk/join_groupchat.py:202
-#, fuzzy
-msgid "Invalid Room"
-msgstr "Неисправна соба"
-
-#: gajim/gtk/join_groupchat.py:203
-msgid "Please choose a room"
-msgstr ""
-
-#: gajim/gtk/join_groupchat.py:222 gajim/gtk/join_groupchat.py:229
-msgid "Invalid Nickname"
-msgstr "Неисправан надимак"
-
-#: gajim/gtk/join_groupchat.py:223
-#, fuzzy
-msgid "Please choose a nickname"
-msgstr "Молимо Вас направите нову чисту тему са жељеним именом."
-
-#: gajim/gtk/join_groupchat.py:282 gajim/gtk/join_groupchat.py:288
-#: gajim/gtk/join_groupchat.py:293
-#, fuzzy
-msgid "Wrong server"
-msgstr "Лош uri"
-
-#: gajim/gtk/join_groupchat.py:283 gajim/gtk/join_groupchat.py:289
-#: gajim/gtk/join_groupchat.py:294
-#, fuzzy, python-format
-msgid "%s is not a groupchat server"
-msgstr "Ово није групни разговор"
-
 #: gajim/gtk/mam_preferences.py:38
 #, python-format
 msgid "Archiving Preferences for %s"
@@ -10029,45 +10344,53 @@ msgstr "Грешка у примању форме за податке"
 msgid "Archiving Preferences Error"
 msgstr "_Подешавања"
 
-#: gajim/gtk/advanced_config.py:81
+#: gajim/gtk/advanced_config.py:95
 msgid "Activated"
 msgstr "Активирано"
 
-#: gajim/gtk/advanced_config.py:81
+#: gajim/gtk/advanced_config.py:95
 msgid "Deactivated"
 msgstr "Деактивирано"
 
-#: gajim/gtk/advanced_config.py:83
-msgid "Boolean"
-msgstr "Да/Не"
+#: gajim/gtk/advanced_config.py:97
+msgid "?config type:Boolean"
+msgstr ""
 
-#: gajim/gtk/advanced_config.py:84
-msgid "Integer"
-msgstr "Цео број"
+#: gajim/gtk/advanced_config.py:98
+msgid "?config type:Integer"
+msgstr ""
 
-#: gajim/gtk/advanced_config.py:85
-msgid "Text"
-msgstr "Текст"
+#: gajim/gtk/advanced_config.py:99
+msgid "?config type:Text"
+msgstr ""
 
-#: gajim/gtk/advanced_config.py:97
-msgid "Preference Name"
+#: gajim/gtk/advanced_config.py:100
+msgid "?config type:Color"
+msgstr ""
+
+#: gajim/gtk/advanced_config.py:112
+#, fuzzy
+msgid "?config:Preference Name"
 msgstr "Име поставке"
 
-#: gajim/gtk/advanced_config.py:104
-msgid "Value"
-msgstr "Вредност"
+#: gajim/gtk/advanced_config.py:123
+#, fuzzy
+msgid "?config:Value"
+msgstr "_Конфигуриши"
 
-#: gajim/gtk/advanced_config.py:113
-msgid "Type"
-msgstr "Тип"
+#: gajim/gtk/advanced_config.py:132
+msgid "?config:Type"
+msgstr ""
 
-#: gajim/gtk/advanced_config.py:168
-msgid "(None)"
-msgstr "(ништа)"
+#: gajim/gtk/advanced_config.py:187
+#, fuzzy
+msgid "?config description:None"
+msgstr "?Питај (за претплату):Ниједна"
 
-#: gajim/gtk/advanced_config.py:299
-msgid "Hidden"
-msgstr "Скривен"
+#: gajim/gtk/advanced_config.py:322
+#, fuzzy
+msgid "?password:Hidden"
+msgstr "Лозинка:"
 
 #: gajim/gtk/server_info.py:66
 #, fuzzy
@@ -10079,8 +10402,8 @@ msgstr "_Копирај локацију везе"
 msgid "%(days)s days, %(hours)s hours"
 msgstr ""
 
-#: gajim/gtk/server_info.py:218 gajim/gtk/accounts.py:749
-#: gajim/gtk/accounts.py:853
+#: gajim/gtk/server_info.py:218 gajim/gtk/accounts.py:752
+#: gajim/gtk/accounts.py:856
 #, fuzzy
 msgid "Hostname"
 msgstr "Име хоста:"
@@ -10269,11 +10592,6 @@ msgstr "Неисправно име листе"
 msgid "You must enter a name to create a privacy list."
 msgstr "Морате унети име за креирање листе приватности"
 
-#: gajim/gtk/groupchat_config.py:41
-#, fuzzy
-msgid "Group Chat Configuration"
-msgstr "Позив на групни разговор"
-
 #: gajim/gtk/groupchat_config.py:134
 #, fuzzy
 msgid "A Group Chat needs at least one Owner"
@@ -10284,69 +10602,69 @@ msgid "You are not allowed to modify the affiliation of Admins and Owners"
 msgstr ""
 
 #: gajim/gtk/groupchat_config.py:399
-msgid "An entry with this Jabber-ID already exists"
+msgid "An entry with this XMPP Address already exists"
 msgstr ""
 
-#: gajim/gtk/adhoc.py:91
+#: gajim/gtk/adhoc.py:92
 #, fuzzy
 msgid "Finish"
 msgstr "_Заврши"
 
-#: gajim/gtk/adhoc.py:97 gajim/gtk/adhoc.py:283
+#: gajim/gtk/adhoc.py:98 gajim/gtk/adhoc.py:284
 #, fuzzy
 msgid "Commands"
 msgstr "наредба"
 
-#: gajim/gtk/adhoc.py:103
+#: gajim/gtk/adhoc.py:104
 msgid "Next"
 msgstr ""
 
-#: gajim/gtk/adhoc.py:109
+#: gajim/gtk/adhoc.py:110
 #, fuzzy
 msgid "Previous"
 msgstr "Завидљив"
 
-#: gajim/gtk/adhoc.py:115
+#: gajim/gtk/adhoc.py:116
 #, fuzzy
 msgid "Execute"
 msgstr "_Изврши наредбу"
 
-#: gajim/gtk/adhoc.py:195
+#: gajim/gtk/adhoc.py:196
 #, fuzzy
 msgid "No commands available"
 msgstr "Нема доступних налога"
 
-#: gajim/gtk/adhoc.py:244
+#: gajim/gtk/adhoc.py:245
 #, fuzzy
 msgid "Request Command List"
 msgstr "_Изврши наредбу"
 
-#: gajim/gtk/adhoc.py:259
+#: gajim/gtk/adhoc.py:260
 #, fuzzy
 msgid "Executing…"
 msgstr "_Изврши наредбу"
 
-#: gajim/gtk/adhoc.py:266
+#: gajim/gtk/adhoc.py:267
 #, fuzzy
 msgid "Command List"
 msgstr "Листа забрана"
 
-#: gajim/gtk/adhoc.py:384
+#: gajim/gtk/adhoc.py:385
 #, fuzzy
 msgid "Finished"
 msgstr "_Заврши"
 
-#: gajim/gtk/adhoc.py:453
+#: gajim/gtk/adhoc.py:454
 #, fuzzy
 msgid "Execution failed"
 msgstr "Веза прекинута"
 
-#: gajim/gtk/blocking.py:37
+#: gajim/gtk/blocking.py:38
 #, fuzzy, python-format
 msgid "Blocking List for %s"
 msgstr "Листа приватности за %s"
 
-#: gajim/gtk/blocking.py:71
+#: gajim/gtk/blocking.py:72
 #, fuzzy
 msgid "Error!"
 msgstr "Грешка"
@@ -10395,8 +10713,7 @@ msgstr "Неисправно корисничко име"
 msgid "You must provide a username to configure this account."
 msgstr "Морате уписати корисничко име да бисте конфигурисали овај налог."
 
-#: gajim/gtk/account_wizard.py:252 gajim/gtk/bookmarks.py:290
-#: gajim/gtk/bookmarks.py:303
+#: gajim/gtk/account_wizard.py:252
 msgid "Invalid server"
 msgstr "Неисправан сервер"
 
@@ -10412,7 +10729,7 @@ msgstr "Неисправан унос"
 msgid "Custom port must be a port number."
 msgstr "Ваш порт мора бити број порта."
 
-#: gajim/gtk/account_wizard.py:405
+#: gajim/gtk/account_wizard.py:406
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -10427,15 +10744,15 @@ msgstr ""
 "SSL грешка: %(error)s\n"
 "Да ли и даље желите да се повежете на овај сервер?"
 
-#: gajim/gtk/account_wizard.py:446 gajim/gtk/account_wizard.py:480
+#: gajim/gtk/account_wizard.py:447 gajim/gtk/account_wizard.py:481
 msgid "An error occurred during account creation"
 msgstr "Појавила се грешка при креирању налога"
 
-#: gajim/gtk/account_wizard.py:545
+#: gajim/gtk/account_wizard.py:546
 msgid "Account name is in use"
 msgstr "Име налога је већ употребљено"
 
-#: gajim/gtk/account_wizard.py:546
+#: gajim/gtk/account_wizard.py:547
 msgid "You already have an account using this name."
 msgstr "Већ имате налог са тим именом."
 
@@ -10462,26 +10779,26 @@ msgstr "Пренос датотеке %(filename)s од контакта %(name)
 msgid "%(minutes)s min %(seconds)s sec"
 msgstr ""
 
-#: gajim/gtk/xml_console.py:77
+#: gajim/gtk/xml_console.py:74
 #, fuzzy
 msgid "Filter"
 msgstr "Филтер:"
 
-#: gajim/gtk/xml_console.py:82
+#: gajim/gtk/xml_console.py:79
 #, fuzzy
 msgid "XML Input"
 msgstr "<b>XML Унос</b>"
 
-#: gajim/gtk/xml_console.py:86
+#: gajim/gtk/xml_console.py:83
 msgid "Paste Last Input"
 msgstr ""
 
-#: gajim/gtk/xml_console.py:170
+#: gajim/gtk/xml_console.py:167
 #, fuzzy, python-format
 msgid "Please make sure you are connected with '%s'."
 msgstr "Молимо потврдите да сте спојени на \"%s\"."
 
-#: gajim/gtk/xml_console.py:182
+#: gajim/gtk/xml_console.py:177
 #, fuzzy
 msgid "Invalid Node"
 msgstr "Неисправна датотека"
@@ -10514,38 +10831,53 @@ msgstr "Претрага"
 msgid "No results found"
 msgstr "Нема резултата"
 
-#: gajim/gtk/preferences.py:358 gajim/gtk/preferences.py:362
+#: gajim/gtk/preferences.py:357 gajim/gtk/preferences.py:361
 msgid "Default"
 msgstr "Подразумевано"
 
-#: gajim/gtk/preferences.py:801
+#: gajim/gtk/preferences.py:798
 msgid "status message title"
 msgstr "наслов статусне поруке"
 
-#: gajim/gtk/preferences.py:802
+#: gajim/gtk/preferences.py:799
 msgid "status message text"
 msgstr "текст статусне поруке"
 
+#: gajim/gtk/accounts.py:137
+#, fuzzy
+msgid "Re-Login"
+msgstr "Отићи са везе и повезати се одмах?"
+
 #: gajim/gtk/accounts.py:138
-msgid "Relogin now?"
+#, fuzzy
+msgid "Re-Login now?"
 msgstr "Отићи са везе и повезати се одмах?"
 
 #: gajim/gtk/accounts.py:139
-msgid "If you want all the changes to apply instantly, you must relogin."
+#, fuzzy
+msgid "To apply all changes instantly, you have to re-login."
 msgstr ""
 "Ако желите да се све промене тренутно примене, морате да се поново повежете."
 
-#: gajim/gtk/accounts.py:191 gajim/gtk/accounts.py:975
+#: gajim/gtk/accounts.py:141
+msgid "_Later"
+msgstr ""
+
+#: gajim/gtk/accounts.py:143
+msgid "_Re-Login"
+msgstr ""
+
+#: gajim/gtk/accounts.py:194 gajim/gtk/accounts.py:978
 #, fuzzy
 msgid "Remove Account"
 msgstr "Уклањање рачуна %s"
 
-#: gajim/gtk/accounts.py:192
+#: gajim/gtk/accounts.py:195
 #, fuzzy, python-format
 msgid "You still have open chats in your account %s"
 msgstr "Отворили сте разговор у рачуну %s"
 
-#: gajim/gtk/accounts.py:193
+#: gajim/gtk/accounts.py:196
 #, fuzzy
 msgid ""
 "All chat and group chat windows will be closed.\n"
@@ -10554,32 +10886,32 @@ msgstr ""
 "Прозори свих разговора и групних разговора ће бити затворени. Желите ли да "
 "наставите?"
 
-#: gajim/gtk/accounts.py:424
+#: gajim/gtk/accounts.py:427
 #, fuzzy
 msgid "Back"
 msgstr "Враћам се брзо"
 
-#: gajim/gtk/accounts.py:530
+#: gajim/gtk/accounts.py:533
 #, fuzzy
 msgid "Please check if Bonjour is installed."
 msgstr "Проверите да ли је Авахи или Bonjour инсталиран."
 
-#: gajim/gtk/accounts.py:532
+#: gajim/gtk/accounts.py:535
 #, fuzzy
 msgid "Please check if Avahi is installed."
 msgstr "Проверите да ли је Авахи или Bonjour инсталиран."
 
-#: gajim/gtk/accounts.py:569
+#: gajim/gtk/accounts.py:572
 #, fuzzy
 msgid "Disable Account"
 msgstr "Неисправан налог"
 
-#: gajim/gtk/accounts.py:570
+#: gajim/gtk/accounts.py:573
 #, fuzzy, python-format
 msgid "Account %s is still connected"
 msgstr "Рачун \"%s\" је повезан на сервер"
 
-#: gajim/gtk/accounts.py:571
+#: gajim/gtk/accounts.py:574
 #, fuzzy
 msgid ""
 "All chat and group chat windows will be closed. Do you want to continue?"
@@ -10587,85 +10919,85 @@ msgstr ""
 "Прозори свих разговора и групних разговора ће бити затворени. Желите ли да "
 "наставите?"
 
-#: gajim/gtk/accounts.py:576
+#: gajim/gtk/accounts.py:579
 #, fuzzy
 msgid "_Disable Account"
 msgstr "Неисправан налог"
 
-#: gajim/gtk/accounts.py:595
+#: gajim/gtk/accounts.py:598
 #, fuzzy
 msgid "Add Account"
 msgstr "_Додај контакт..."
 
-#: gajim/gtk/accounts.py:663
+#: gajim/gtk/accounts.py:666
 msgid "Label"
 msgstr ""
 
-#: gajim/gtk/accounts.py:667
+#: gajim/gtk/accounts.py:670
 msgid "Login"
 msgstr ""
 
-#: gajim/gtk/accounts.py:670
+#: gajim/gtk/accounts.py:673
 #, fuzzy
 msgid "Import Contacts"
 msgstr "Позови контакте"
 
-#: gajim/gtk/accounts.py:674 gajim/gtk/accounts.py:870
+#: gajim/gtk/accounts.py:677 gajim/gtk/accounts.py:873
 #, fuzzy
 msgid "Client Certificate"
 msgstr "Самопотписани сертификат"
 
-#: gajim/gtk/accounts.py:677 gajim/gtk/accounts.py:774
+#: gajim/gtk/accounts.py:680 gajim/gtk/accounts.py:777
 #, fuzzy
 msgid "Connect on startup"
 msgstr "По_вежи се приликом покретања Гајима"
 
-#: gajim/gtk/accounts.py:681 gajim/gtk/accounts.py:779
+#: gajim/gtk/accounts.py:684 gajim/gtk/accounts.py:782
 #, fuzzy
 msgid "Save conversations for all contacts"
 msgstr "Сними дневник разговора за све контакте"
 
-#: gajim/gtk/accounts.py:683 gajim/gtk/accounts.py:781
+#: gajim/gtk/accounts.py:686 gajim/gtk/accounts.py:784
 msgid "Store conversations on the harddrive"
 msgstr ""
 
-#: gajim/gtk/accounts.py:685 gajim/gtk/accounts.py:783
+#: gajim/gtk/accounts.py:688 gajim/gtk/accounts.py:786
 #, fuzzy
 msgid "Global Status"
 msgstr "Статус"
 
-#: gajim/gtk/accounts.py:687
+#: gajim/gtk/accounts.py:690
 #, fuzzy
 msgid "Synchronise the status of all accounts"
 msgstr "Мења статус једног или више налога"
 
-#: gajim/gtk/accounts.py:689
+#: gajim/gtk/accounts.py:692
 msgid "Use file transfer proxies"
 msgstr "Користи прокси за пренос датотека"
 
-#: gajim/gtk/accounts.py:705
+#: gajim/gtk/accounts.py:708
 #, fuzzy
 msgid "Idle Time"
 msgstr " од %s"
 
-#: gajim/gtk/accounts.py:707
+#: gajim/gtk/accounts.py:710
 msgid "Disclose the time of your last activity"
 msgstr ""
 
-#: gajim/gtk/accounts.py:709
+#: gajim/gtk/accounts.py:712
 msgid "Local System Time"
 msgstr ""
 
-#: gajim/gtk/accounts.py:711
+#: gajim/gtk/accounts.py:714
 msgid "Disclose the local system time of the device Gajim runs on"
 msgstr ""
 
-#: gajim/gtk/accounts.py:714
+#: gajim/gtk/accounts.py:717
 #, fuzzy
 msgid "Client / Operating System"
 msgstr "Самопотписани сертификат"
 
-#: gajim/gtk/accounts.py:716
+#: gajim/gtk/accounts.py:719
 #, fuzzy
 msgid ""
 "Disclose informations about the client and operating system you currently use"
@@ -10673,155 +11005,150 @@ msgstr ""
 "Ако је означена, Гајим ће дозволити другима да погледају који оперативни "
 "систем користите"
 
-#: gajim/gtk/accounts.py:719
+#: gajim/gtk/accounts.py:722
 #, fuzzy
 msgid "Ignore Unknown Contacts"
 msgstr "Позови контакте"
 
-#: gajim/gtk/accounts.py:721
+#: gajim/gtk/accounts.py:724
 #, fuzzy
 msgid "Ignore everything from contacts not in your Roster"
 msgstr "_Игнориши догађаје од контаката који нису на листи"
 
-#: gajim/gtk/accounts.py:737 gajim/gtk/accounts.py:776
+#: gajim/gtk/accounts.py:740 gajim/gtk/accounts.py:779
 #, fuzzy
 msgid "Use environment variable"
 msgstr "користи HTTP_PROXY променљив_у окружења"
 
-#: gajim/gtk/accounts.py:739
-#, fuzzy
-msgid "Proxy"
-msgstr "Прок_си:"
-
-#: gajim/gtk/accounts.py:742
+#: gajim/gtk/accounts.py:745
 #, fuzzy
 msgid "Warn on insecure connection"
 msgstr "Упозори пре коришћења несигурне везе"
 
-#: gajim/gtk/accounts.py:746
+#: gajim/gtk/accounts.py:749
 #, fuzzy
 msgid "Send keep-alive packets"
 msgstr "Шаљи подат_ке о живости"
 
-#: gajim/gtk/accounts.py:750
+#: gajim/gtk/accounts.py:753
 msgid "Manually set the hostname for the server"
 msgstr ""
 
-#: gajim/gtk/accounts.py:756 gajim/gtk/accounts.py:826
-#: gajim/gtk/accounts.py:831
+#: gajim/gtk/accounts.py:759 gajim/gtk/accounts.py:829
+#: gajim/gtk/accounts.py:834
 #, fuzzy
 msgid "Priority"
 msgstr "Приори_тет"
 
-#: gajim/gtk/accounts.py:785
+#: gajim/gtk/accounts.py:788
 #, fuzzy
 msgid "Synchronize the status of all accounts"
 msgstr "Мења статус једног или више налога"
 
-#: gajim/gtk/accounts.py:795
+#: gajim/gtk/accounts.py:798
 #, fuzzy
 msgid "First Name"
 msgstr "Име:"
 
-#: gajim/gtk/accounts.py:798
+#: gajim/gtk/accounts.py:801
 #, fuzzy
 msgid "Last Name"
 msgstr "Презиме:"
 
-#: gajim/gtk/accounts.py:804
+#: gajim/gtk/accounts.py:807
 #, fuzzy
 msgid "Email"
 msgstr "Нови Е-мејл"
 
-#: gajim/gtk/accounts.py:822
+#: gajim/gtk/accounts.py:825
 #, fuzzy
 msgid "Adjust to status"
 msgstr "По_деси према статусу"
 
-#: gajim/gtk/accounts.py:849
+#: gajim/gtk/accounts.py:852
 #, fuzzy
 msgid "Enable"
 msgstr "Омогућен"
 
-#: gajim/gtk/accounts.py:857
+#: gajim/gtk/accounts.py:860
 #, fuzzy
 msgid "Port"
 msgstr "_Порт:"
 
-#: gajim/gtk/accounts.py:862
+#: gajim/gtk/accounts.py:865
 #, fuzzy
 msgid "Connection Settings"
 msgstr "Веза"
 
-#: gajim/gtk/accounts.py:872
+#: gajim/gtk/accounts.py:875
 msgid "PKCS12 Files"
 msgstr ""
 
-#: gajim/gtk/accounts.py:874
+#: gajim/gtk/accounts.py:877
 #, fuzzy
 msgid "Encrypted Certificate"
 msgstr "Самопотписани сертификат"
 
-#: gajim/gtk/accounts.py:878
+#: gajim/gtk/accounts.py:881
 #, fuzzy
 msgid "Certificate Settings"
 msgstr "Обавештења"
 
-#: gajim/gtk/accounts.py:890
+#: gajim/gtk/accounts.py:893
 #, fuzzy
 msgid "Save Password"
 msgstr "Сачувај лозинку"
 
-#: gajim/gtk/accounts.py:898
+#: gajim/gtk/accounts.py:901
 #, fuzzy
 msgid "Login Settings"
 msgstr "Регистрација неуспела"
 
-#: gajim/gtk/accounts.py:931
+#: gajim/gtk/accounts.py:934
 #, fuzzy, python-format
 msgid "Removing account %s"
 msgstr "Уклањање рачуна %s"
 
-#: gajim/gtk/accounts.py:946
+#: gajim/gtk/accounts.py:949
 #, fuzzy
 msgid "Account is disabled"
 msgstr "Смајлији искључени"
 
-#: gajim/gtk/accounts.py:947
+#: gajim/gtk/accounts.py:950
 #, fuzzy
 msgid "To unregister from a server, the account must be enabled."
 msgstr "Да бисте онемогућили налог, морате бити раскачени."
 
-#: gajim/gtk/accounts.py:962
+#: gajim/gtk/accounts.py:965
 #, fuzzy
 msgid "Password required"
 msgstr "Лозинка захтевана"
 
-#: gajim/gtk/accounts.py:976
+#: gajim/gtk/accounts.py:979
 #, fuzzy, python-format
 msgid "Account '%s' is still connected to the server"
 msgstr "Рачун \"%s\" је повезан на сервер"
 
-#: gajim/gtk/accounts.py:978
+#: gajim/gtk/accounts.py:981
 msgid "If you remove it, the connection will be lost."
 msgstr "Уколико га уклоните, веза ће бити изгубљена."
 
-#: gajim/gtk/accounts.py:995
+#: gajim/gtk/accounts.py:998
 #, fuzzy, python-format
 msgid "Connection to server %s failed"
 msgstr "Веза са проксијем прекинута"
 
-#: gajim/gtk/accounts.py:996
+#: gajim/gtk/accounts.py:999
 #, fuzzy
 msgid "What would you like to do?"
 msgstr "Шта желите да урадите?"
 
-#: gajim/gtk/accounts.py:997
+#: gajim/gtk/accounts.py:1000
 #, fuzzy
 msgid "Remove only from Gajim"
 msgstr "Уклони налог само из Гајима"
 
-#: gajim/gtk/accounts.py:998
+#: gajim/gtk/accounts.py:1001
 msgid "Don't remove anything. I'll try again later"
 msgstr ""
 
@@ -10844,6 +11171,10 @@ msgstr "<b>%s</b> жели да <b>%s</b> неке контакте у лист�
 msgid "Modify"
 msgstr "Измените"
 
+#: gajim/gtk/roster_item_exchange.py:80
+msgid "JID"
+msgstr "ЏИД"
+
 #: gajim/gtk/roster_item_exchange.py:86
 msgid "Groups"
 msgstr "Групе"
@@ -10869,19 +11200,19 @@ msgstr[0] "Уклања контакт са листе"
 msgstr[1] "Уклања контакт са листе"
 msgstr[2] "Уклања контакт са листе"
 
-#: gajim/gtk/util.py:581
+#: gajim/gtk/util.py:583
 msgid "Unknown Artist"
 msgstr "Непознат извођач"
 
-#: gajim/gtk/util.py:582
+#: gajim/gtk/util.py:584
 msgid "Unknown Title"
 msgstr "Непознат наслов"
 
-#: gajim/gtk/util.py:583
+#: gajim/gtk/util.py:585
 msgid "Unknown Source"
 msgstr "Непознат извор"
 
-#: gajim/gtk/util.py:585
+#: gajim/gtk/util.py:587
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
@@ -10890,27 +11221,10 @@ msgstr ""
 "<b>\"%(title)s\"</b> од <i>%(artist)s</i>\n"
 "из <i>%(source)s</i>"
 
-#: gajim/gtk/bookmarks.py:121
-msgid "New Group Chat"
-msgstr "Нови групни разговор"
-
-#: gajim/gtk/bookmarks.py:161
-msgid "This bookmark has invalid data"
-msgstr "Овај маркер има неисправне податке"
-
-#: gajim/gtk/bookmarks.py:162
-msgid ""
-"Please be sure to fill out server and room fields or remove this bookmark."
-msgstr "Молимо обавезно испуните поља сервера и собе или уклоните овај маркер."
-
-#: gajim/gtk/bookmarks.py:273 gajim/gtk/bookmarks.py:291
-#: gajim/gtk/bookmarks.py:304 gajim/gtk/bookmarks.py:335
-msgid "Character not allowed"
-msgstr "Карактер није дозвољен"
-
-#: gajim/gtk/bookmarks.py:334
-msgid "Invalid room"
-msgstr "Неисправна соба"
+#: gajim/gtk/bookmarks.py:47
+#, fuzzy, python-format
+msgid "Bookmarks for %s"
+msgstr "_Маркирај ову со_бу"
 
 #: gajim/plugins/pluginmanager.py:736 gajim/plugins/pluginmanager.py:742
 msgid "Archive corrupted"
@@ -10922,51 +11236,54 @@ msgid "Archive empty"
 msgstr "Датотека је празна"
 
 #: gajim/plugins/pluginmanager.py:750 gajim/plugins/pluginmanager.py:758
-#: gajim/plugins/gui.py:257
+#: gajim/plugins/gui.py:258
 #, fuzzy
 msgid "Archive is malformed"
 msgstr "Сервис је послао лоше податке"
 
-#: gajim/plugins/pluginmanager.py:766 gajim/plugins/gui.py:281
-#: gajim/plugins/gui.py:289
+#: gajim/plugins/pluginmanager.py:766 gajim/plugins/gui.py:288
+#: gajim/plugins/gui.py:301
 #, fuzzy
 msgid "Plugin already exists"
 msgstr "Ова датотека већ постоји"
 
-#: gajim/plugins/gui.py:82
+#: gajim/plugins/gui.py:83
 msgid "Click to view Gajim's wiki page on how to install plugins in Flatpak."
 msgstr ""
 
-#: gajim/plugins/gui.py:89
+#: gajim/plugins/gui.py:90
 msgid "Plugin"
 msgstr ""
 
-#: gajim/plugins/gui.py:151
+#: gajim/plugins/gui.py:152
 #, fuzzy, python-format
 msgid "Warning: %s"
 msgstr "Забрањујем %s"
 
-#: gajim/plugins/gui.py:206
+#: gajim/plugins/gui.py:207
 #, fuzzy
 msgid "Plugin failed"
 msgstr "Регистрација неуспела"
 
-#: gajim/plugins/gui.py:245
+#: gajim/plugins/gui.py:246
 msgid "Unable to properly remove the plugin"
 msgstr ""
 
-#: gajim/plugins/gui.py:281
-msgid "Overwrite?"
-msgstr ""
+#: gajim/plugins/gui.py:287
+#, fuzzy
+msgid "Overwrite Plugin?"
+msgstr "Препиши статусну поруку?"
+
+#: gajim/plugins/gui.py:289
+#, fuzzy
+msgid "Do you want to overwrite the currently installed version?"
+msgstr "Да ли желите да прихватите ову позивницу?"
 
 #: data/org.gajim.Gajim.desktop.in:5
-msgid "Jabber IM Client"
+#, fuzzy
+msgid "XMPP IM Client"
 msgstr "Џабер IM Клијент"
 
-#: data/org.gajim.Gajim.desktop.in:6
-msgid "A GTK+ Jabber client"
-msgstr "GTK+ Џабер клијент"
-
 #: data/org.gajim.Gajim.desktop.in:8
 msgid "chat;messaging;im;xmpp;bonjour;voip;"
 msgstr ""
@@ -11018,7 +11335,7 @@ msgid "Easily send pictures, videos or other files to friends and groups"
 msgstr ""
 
 #: data/org.gajim.Gajim.appdata.xml.in:27
-msgid "Chat securely with End-to-End encryption via OMEMO or PGP"
+msgid "Chat securely with End-to-End encryption via OMEMO or OpenPGP"
 msgstr ""
 
 #: data/org.gajim.Gajim.appdata.xml.in:28
@@ -11080,7 +11397,7 @@ msgstr ""
 
 #: data/org.gajim.Gajim.appdata.xml.in:52
 #, fuzzy
-msgid "Roster, list of contacts"
+msgid "Contact list, list of contacts"
 msgstr "_Записуј у дневник статусне промене контаката"
 
 #: data/org.gajim.Gajim.appdata.xml.in:56
@@ -11102,6 +11419,516 @@ msgstr "Недавно:"
 msgid "Plugin manager"
 msgstr "Регистрација неуспела"
 
+#, fuzzy
+#~ msgid "Configure Services…"
+#~ msgstr "Конфигуриши сервисе..."
+
+#, fuzzy
+#~ msgid "Group Chat Bookmarks"
+#~ msgstr "Групни разговори"
+
+#, fuzzy
+#~ msgid "Add Bookmark"
+#~ msgstr "_Маркирај ову со_бу"
+
+#, fuzzy
+#~ msgid "Remove Bookmark"
+#~ msgstr "_Маркирај ову со_бу"
+
+#, fuzzy
+#~ msgid "Bookmark Name"
+#~ msgstr "Маркирај ову собу"
+
+#, fuzzy
+#~ msgid "_Server"
+#~ msgstr "_Сервер:"
+
+#, fuzzy
+#~ msgid "_Password"
+#~ msgstr "_Лозинка:"
+
+#, fuzzy
+#~ msgid "Join chat when connected"
+#~ msgstr "Контакт Отишао Са Везе"
+
+#~ msgid "New Group Chat"
+#~ msgstr "Нови групни разговор"
+
+#~ msgid "This bookmark has invalid data"
+#~ msgstr "Овај маркер има неисправне податке"
+
+#, fuzzy
+#~ msgid ""
+#~ "Please be sure to fill out server and group chat fields or remove this "
+#~ "bookmark."
+#~ msgstr ""
+#~ "Молимо обавезно испуните поља сервера и собе или уклоните овај маркер."
+
+#~ msgid "Character not allowed"
+#~ msgstr "Карактер није дозвољен"
+
+#, fuzzy
+#~ msgid "Invalid Group Chat"
+#~ msgstr "Неисправан Џабер ИД групног разговора"
+
+#~ msgid "Unable to join group chat"
+#~ msgstr "Није могуће придружити се групном разговору"
+
+#~ msgid "You are banned from group chat <b>%s</b>."
+#~ msgstr "Забрањен Вам је приступ групном разговору <b>%s</b>."
+
+#, fuzzy
+#~ msgid "Remote server <b>%s</b> does not exist."
+#~ msgstr "Групни разговор <b>%s</b> не постоји."
+
+#~ msgid "Group chat <b>%s</b> does not exist."
+#~ msgstr "Групни разговор <b>%s</b> не постоји."
+
+#, fuzzy
+#~ msgid "Group chat creation is not permitted."
+#~ msgstr "Стварање групних разговора Вам није дозвољено."
+
+#, fuzzy
+#~ msgid "You must use your registered nickname in <b>%s</b>."
+#~ msgstr ""
+#~ "Морате користити Ваш регистровани надимак у групном разговору <b>%s</b>."
+
+#, fuzzy
+#~ msgid "You are not in the members list in group chat %s."
+#~ msgstr "Нисте у листи чланова групног разговора %s."
+
+#, fuzzy
+#~ msgid "XMPP Address is not a group chat"
+#~ msgstr "Ово није групни разговор"
+
+#~ msgid "This is not a group chat"
+#~ msgstr "Ово није групни разговор"
+
+#, fuzzy
+#~ msgid "Please choose a group chat"
+#~ msgstr "Молимо Вас направите нову чисту тему са жељеним именом."
+
+#~ msgid "Invalid Nickname"
+#~ msgstr "Неисправан надимак"
+
+#, fuzzy
+#~ msgid "Please choose a nickname"
+#~ msgstr "Молимо Вас направите нову чисту тему са жељеним именом."
+
+#, fuzzy
+#~ msgid "Wrong server"
+#~ msgstr "Лош uri"
+
+#, fuzzy
+#~ msgid "%s is not a group chat server"
+#~ msgstr "Ово није групни разговор"
+
+#, fuzzy
+#~ msgid ""
+#~ "How many lines to request from server when entering a group chat. -1 "
+#~ "means no limit."
+#~ msgstr "Колико линија тражити од сервера при уласку на групни разговор."
+
+#, fuzzy
+#~ msgid ""
+#~ "Minutes of backlog to request when entering a group chat. -1 means no "
+#~ "limit."
+#~ msgstr ""
+#~ "Од пре колико минута тражити дневнике при уласку на групни разговор."
+
+#, fuzzy
+#~ msgid ""
+#~ "How many lines to request from server when entering a group chat. -1 "
+#~ "means no limit, -2 means global value."
+#~ msgstr "Колико линија тражити од сервера при уласку на групни разговор."
+
+#, fuzzy
+#~ msgid ""
+#~ "Minutes of backlog to request when entering a group chat. -1 means no "
+#~ "limit, -2 means global value."
+#~ msgstr ""
+#~ "Од пре колико минута тражити дневнике при уласку на групни разговор."
+
+#, fuzzy
+#~ msgid "A Password is required to join the group chat %s. Please type it."
+#~ msgstr "Лозинка потребна за придруживање групном разговору %s. Унесите је."
+
+#~ msgid "Not in Roster"
+#~ msgstr "Није на листи контаката"
+
+#~ msgid "I would like to add you to my roster"
+#~ msgstr "Желео бих Вас додати на моју листу контаката"
+
+#, fuzzy
+#~ msgid "Add to Roster"
+#~ msgstr "_Додај на листу контаката"
+
+#, fuzzy
+#~ msgid "Manage Room"
+#~ msgstr "Управљање собама"
+
+#, fuzzy
+#~ msgid "Configure Room"
+#~ msgstr "Подеси _собу..."
+
+#, fuzzy
+#~ msgid "Destroy Room"
+#~ msgstr "Уништи собу"
+
+#, fuzzy
+#~ msgid "Change Nick"
+#~ msgstr "Промени _надимак..."
+
+#, fuzzy
+#~ msgid "Disconnect"
+#~ msgstr "_Излогуј се"
+
+#, fuzzy
+#~ msgid "Copy JID"
+#~ msgstr "Џабер ID собе:"
+
+#, fuzzy
+#~ msgid "Add to Roster…"
+#~ msgstr "_Додај на листу контаката"
+
+#, fuzzy
+#~ msgid "Copy JID/Email"
+#~ msgstr "_Копирај џабер ИД/е-мејл адресу"
+
+#, fuzzy
+#~ msgid "JID: <i>%s</i>"
+#~ msgstr "Џабер ИД: <i>%s</i>"
+
+#~ msgid "Changing Subject"
+#~ msgstr "Промена Теме"
+
+#~ msgid "Please specify the new subject:"
+#~ msgstr "Молимо одредите нову тему:"
+
+#~ msgid "Room logging is now enabled"
+#~ msgstr "Логовање у соби је сада омогућено"
+
+#~ msgid "Room logging is now disabled"
+#~ msgstr "Логовање у соби је сада онемогућено"
+
+#, fuzzy
+#~ msgid "You (%s) joined the room"
+#~ msgstr "%s се придружио групном разговору"
+
+#~ msgid "Room logging is enabled"
+#~ msgstr "Логовање собе је омогућено"
+
+#, fuzzy
+#~ msgid "Unable to join groupchat"
+#~ msgstr "Није могуће придружити се групном разговору"
+
+#~ msgid "Groupchat Invitation"
+#~ msgstr "Позив на групни разговор"
+
+#, fuzzy
+#~ msgid "%(jid)s has been invited in this room"
+#~ msgstr "%(nick)s је избачен из собе (%(reason)s)"
+
+#, fuzzy
+#~ msgid "JID is not a Groupchat"
+#~ msgstr "Ово није групни разговор"
+
+#~ msgid "Invalid JID"
+#~ msgstr "Неисправан џабер ИД"
+
+#, fuzzy
+#~ msgid "A connection is not available"
+#~ msgstr "Веза није доступна"
+
+#, fuzzy
+#~ msgid "JID already in list"
+#~ msgstr "Џабер ID већ у листи контаката"
+
+#, fuzzy
+#~ msgid "For the chosen encryption there is no encryption method available"
+#~ msgstr "Веза није доступна"
+
+#~ msgid "Removes contact from roster"
+#~ msgstr "Уклања контакт са листе"
+
+#~ msgid "Not in roster"
+#~ msgstr "Није у листи контаката"
+
+#, fuzzy
+#~ msgid "Contact signed in notification color."
+#~ msgstr "Прикажи догађај у листи контаката"
+
+#, fuzzy
+#~ msgid "Contact signout notification color"
+#~ msgstr "Прикажи догађај у листи контаката"
+
+#, fuzzy
+#~ msgid "File transfer request notification color."
+#~ msgstr "Захтев за преносом датотеке"
+
+#, fuzzy
+#~ msgid "File transfer error notification color."
+#~ msgstr "Пренос датотеке прекинут"
+
+#, fuzzy
+#~ msgid "File transfer complete or stopped notification color."
+#~ msgstr "Прикажи искачуће обавештење када се заврши пренос датотеке"
+
+#, fuzzy
+#~ msgid "Groupchat invitation notification color"
+#~ msgstr "Позив на групни разговор"
+
+#~ msgid "Add * and [n] in roster title?"
+#~ msgstr "Додај * и [n] у наслов листе контаката?"
+
+#~ msgid "Hides the banner in two persons chat window"
+#~ msgstr "Сакрива банер у прозору разговора две особе"
+
+#, fuzzy
+#~ msgid ""
+#~ "Show the confirm metacontacts creation dialog or not? Empty string means "
+#~ "never show the dialog."
+#~ msgstr ""
+#~ "Треба ли питати за потврду стварања псеудоконтакта или не? Празна ниска "
+#~ "значи да никада не приказујемо дијалог."
+
+#~ msgid "Space separated list of ssl errors to ignore."
+#~ msgstr "Листа ssl грешака за игнорисање, одвојена размацима."
+
+#~ msgid "Answer to receipt requests"
+#~ msgstr "Одговор на захтев примања"
+
+#~ msgid "Sent receipt requests"
+#~ msgstr "Послати захтев примања"
+
+#, fuzzy
+#~ msgid "Language for which misspelled words will be checked"
+#~ msgstr "Језик у коме желите проверавати неисправно написане речи"
+
+#~ msgid "I'm eating, so leave me a message."
+#~ msgstr "Једем, оставите поруку."
+
+#, fuzzy
+#~ msgid "from room %s"
+#~ msgstr " из собе %s"
+
+#~ msgid "Leave Groupchats"
+#~ msgstr "Напусти групне разговоре"
+
+#, fuzzy
+#~ msgid "Auto Join"
+#~ msgstr "Аутоматско повезивање"
+
+#, fuzzy
+#~ msgid "Room"
+#~ msgstr "Соба:"
+
+#~ msgid "Jabber ID:"
+#~ msgstr "Џабер ИД:"
+
+#~ msgid "Occupant Actions"
+#~ msgstr "_Акције присутних"
+
+#~ msgid "_Add to Roster"
+#~ msgstr "_Додај на листу контаката"
+
+#~ msgid "_Manage Room"
+#~ msgstr "Управљање собама"
+
+#~ msgid "_Destroy Room"
+#~ msgstr "Уништи собу"
+
+#~ msgid "Jabber ID"
+#~ msgstr "Џабер ИД"
+
+#, fuzzy
+#~ msgid "account"
+#~ msgstr "Налог"
+
+#, fuzzy
+#~ msgid "Roster"
+#~ msgstr "_Прикажи листу контаката"
+
+#, fuzzy
+#~ msgid "Show only in roster"
+#~ msgstr "Прикажи догађај у листи контаката"
+
+#~ msgid "in _roster"
+#~ msgstr "у _листи контаката"
+
+#, fuzzy
+#~ msgid "Roster Appearance"
+#~ msgstr "<b>Изглед листе контаката</b>"
+
+#, fuzzy
+#~ msgid "Show chatstate in roster"
+#~ msgstr "Прикажи _аватаре контаката на листи"
+
+#~ msgid "_Add to Roster..."
+#~ msgstr "_Додај на листу контаката..."
+
+#~ msgid "_Jabber ID:"
+#~ msgstr "_Џабер ИД:"
+
+#, fuzzy
+#~ msgid "_Jabber ID"
+#~ msgstr "_Џабер ИД:"
+
+#~ msgid "JabberID"
+#~ msgstr "Џабер ИД"
+
+#, fuzzy
+#~ msgid "Show Roster"
+#~ msgstr "_Прикажи листу контаката"
+
+#~ msgid "MUC server"
+#~ msgstr "Сервер групног разговора"
+
+#~ msgid "Room Configuration"
+#~ msgstr "Конфигурација собе"
+
+#~ msgid "Join _Group Chat"
+#~ msgstr "Прикључи се _групном разговору"
+
+#, fuzzy
+#~ msgid "Audio sessions are not available"
+#~ msgstr "Веза није доступна"
+
+#~ msgid "Conference"
+#~ msgstr "Конференција"
+
+#, fuzzy
+#~ msgid "_Manage Bookmarks…"
+#~ msgstr "Подешавање маркера"
+
+#, fuzzy
+#~ msgid "Hide _Roster"
+#~ msgstr "у _листи контаката"
+
+#~ msgid "Show _Roster"
+#~ msgstr "_Прикажи листу контаката"
+
+#, fuzzy
+#~ msgid "Invalid Room"
+#~ msgstr "Неисправна соба"
+
+#~ msgid "Invalid room"
+#~ msgstr "Неисправна соба"
+
+#~ msgid "A GTK+ Jabber client"
+#~ msgstr "GTK+ Џабер клијент"
+
+#~ msgid "Changing Nickname"
+#~ msgstr "Промена надимка"
+
+#~ msgid "Please specify the new nickname you want to use:"
+#~ msgstr "Молимо одредите нови надимак који желите да користите:"
+
+#~ msgid "Bookmark already set"
+#~ msgstr "Маркер је већ постављен"
+
+#, fuzzy
+#~ msgid "Group Chat '%s' is already in your bookmarks."
+#~ msgstr "Групни разговор \"%s\" је већ маркиран."
+
+#~ msgid "Bookmark has been added successfully"
+#~ msgstr "Маркер успешно додат"
+
+#, fuzzy
+#~ msgid ""
+#~ "You can manage your bookmarks by clicking the Bookmarks menu item in your "
+#~ "contact list."
+#~ msgstr ""
+#~ "Можете управљати Вашим маркерима помоћу менија Акције из Ваше листе "
+#~ "контаката."
+
+#, fuzzy
+#~ msgid "The nickname contains invalid characters."
+#~ msgstr "Надимак садржи недозвољене карактере."
+
+#, fuzzy
+#~ msgid "Bookmark Room"
+#~ msgstr "Маркирај ову собу"
+
+#~ msgid "_Join New Group Chat"
+#~ msgstr "_Придруживање новом групном разговору"
+
+#, fuzzy
+#~ msgid "_Create Group Chat"
+#~ msgstr "Напусти групне разговоре"
+
+#, fuzzy
+#~ msgid "Name:"
+#~ msgstr "Име: "
+
+#, fuzzy
+#~ msgid "Description:"
+#~ msgstr "Опис:"
+
+#, fuzzy
+#~ msgid "Address:"
+#~ msgstr "_Адреса:"
+
+#, fuzzy
+#~ msgid "You can not start a new conversation unless you are connected."
+#~ msgstr "Не можете се прикључити групном разговору ако нисте повезани."
+
+#, fuzzy
+#~ msgid "Occupants"
+#~ msgstr "_Акције присутних"
+
+#, fuzzy
+#~ msgid "File transfer error"
+#~ msgstr "Грешка при преносу датотеке"
+
+#, fuzzy
+#~ msgid "No Accounts available"
+#~ msgstr "Нема доступних налога"
+
+#~ msgid "Boolean"
+#~ msgstr "Да/Не"
+
+#~ msgid "Integer"
+#~ msgstr "Цео број"
+
+#~ msgid "Text"
+#~ msgstr "Текст"
+
+#~ msgid "Value"
+#~ msgstr "Вредност"
+
+#~ msgid "Type"
+#~ msgstr "Тип"
+
+#~ msgid "(None)"
+#~ msgstr "(ништа)"
+
+#~ msgid "Hidden"
+#~ msgstr "Скривен"
+
+#~ msgid "Manage Proxy Profiles"
+#~ msgstr "Подешавање прокси профила"
+
+#, fuzzy
+#~ msgid "Properties"
+#~ msgstr "<b>Карактеристике</b>"
+
+#, fuzzy
+#~ msgid "Proxy _Host"
+#~ msgstr "Прокси _хост:"
+
+#, fuzzy
+#~ msgid "Proxy _Port"
+#~ msgstr "Прокси _порт:"
+
+#, fuzzy
+#~ msgid "New Groupchat"
+#~ msgstr "Нови групни разговор"
+
+#, fuzzy
+#~ msgid "New Contact"
+#~ msgstr "Додај нови контакт"
+
 #~ msgid "%s GiB"
 #~ msgstr "%s GiB"
 
@@ -11183,9 +12010,6 @@ msgstr "Регистрација неуспела"
 #~ msgid "_Pause"
 #~ msgstr "_Паузирај"
 
-#~ msgid "Clean _up"
-#~ msgstr "_Почисти"
-
 #~ msgid "Remove file transfer from the list."
 #~ msgstr "Уклони пренос датотека са листе"
 
@@ -11629,9 +12453,6 @@ msgstr "Регистрација неуспела"
 #~ msgid "You are invited to a groupchat"
 #~ msgstr "Позвани сте у групни разговор"
 
-#~ msgid "Do you want to accept the invitation?"
-#~ msgstr "Да ли желите да прихватите ову позивницу?"
-
 #~ msgid "_Start Chat"
 #~ msgstr "_Започни разговор"
 
@@ -11656,10 +12477,6 @@ msgstr "Регистрација неуспела"
 #~ msgid "Do you wish to delete all correspondence with the selected contacts?"
 #~ msgstr "Да ли заиста желите избрисати дневник разговора означеног контакта?"
 
-#, fuzzy
-#~ msgid "This can not be undone."
-#~ msgstr "Услуга не може бити нађена"
-
 #~ msgid "<b>What do you want to do?</b>"
 #~ msgstr "<b>Шта желите да урадите?</b>"
 
@@ -11843,10 +12660,6 @@ msgstr "Регистрација неуспела"
 #~ msgid "Nick"
 #~ msgstr "Надимак"
 
-#, fuzzy
-#~ msgid "Banning…"
-#~ msgstr "Забрана..."
-
 #~ msgid ""
 #~ "<b>Whom do you want to ban?</b>\n"
 #~ "\n"
@@ -11928,12 +12741,6 @@ msgstr "Регистрација неуспела"
 #~ msgid "Filter:"
 #~ msgstr "Филтер:"
 
-#~ msgid ""
-#~ "If checked, Gajim will display the mood of contacts in the roster window"
-#~ msgstr ""
-#~ "Ако је означена, Гајим ће приказивати расположење контаката у листи "
-#~ "контаката"
-
 #~ msgid "<b>Chat Appearance</b>"
 #~ msgstr "<b>Изглед разговора</b>"
 
@@ -12183,10 +12990,6 @@ msgstr "Регистрација неуспела"
 #~ msgstr "_Статусна порука:"
 
 #, fuzzy
-#~ msgid "Group chat highlight"
-#~ msgstr "Бојење Порука Са Групног Разговора"
-
-#, fuzzy
 #~ msgid "Your nickname"
 #~ msgstr "Надимак:"
 
@@ -12321,9 +13124,6 @@ msgstr "Регистрација неуспела"
 #~ msgid "The passwords typed in both fields must be identical."
 #~ msgstr "Лозинке уписане у оба поља морају бити идентичне."
 
-#~ msgid "Enter new password:"
-#~ msgstr "Унесите нову лозинку:"
-
 #~ msgid "Enter it again for confirmation:"
 #~ msgstr "Унесите поново као потврду:"
 
@@ -12338,10 +13138,6 @@ msgstr "Регистрација неуспела"
 #~ msgid "unsubscribe request from %s"
 #~ msgstr "захтев за укидање претплате од контакта %s"
 
-#, fuzzy
-#~ msgid "Autojoin"
-#~ msgstr "Аутоматско повезивање"
-
 #~ msgid "Homepage:"
 #~ msgstr "Лична страна:"
 
@@ -12453,9 +13249,6 @@ msgstr "Регистрација неуспела"
 #~ msgid "Forward unread message then disconnect"
 #~ msgstr "Проследи непрочитане поруке"
 
-#~ msgid "AIM Address:"
-#~ msgstr "АИМ адреса:"
-
 #~ msgid "MSN Address:"
 #~ msgstr "MSN адреса:"
 
@@ -12504,10 +13297,6 @@ msgstr "Регистрација неуспела"
 #~ msgid "Session negotiation cancelled"
 #~ msgstr "Успостављање сесије прекинуто"
 
-#, fuzzy
-#~ msgid "This session WILL NOT be archived on server"
-#~ msgstr "Сесија НЕЋЕ бити памћена"
-
 #~ msgid "This session is encrypted"
 #~ msgstr "Ова сесија је шифрована"
 
@@ -12817,9 +13606,6 @@ msgstr "Регистрација неуспела"
 #~ msgid "Server:"
 #~ msgstr "Сервер:"
 
-#~ msgid "Password:"
-#~ msgstr "Лозинка:"
-
 #, fuzzy
 #~ msgid "Join this room _automatically when I connect"
 #~ msgstr "Уђи у ову собу аутоматски када се повежем"
@@ -13146,9 +13932,6 @@ msgstr "Регистрација неуспела"
 #~ msgid "_Edit Personal Information..."
 #~ msgstr "Изм_ени личне информације..."
 
-#~ msgid "Information about you, as stored in the server"
-#~ msgstr "Информације о Вама, како су ускладиштене на серверу"
-
 #~ msgid "<b>Personal Information</b>"
 #~ msgstr "<b>Личне информације</b>"
 
@@ -13227,9 +14010,6 @@ msgstr "Регистрација неуспела"
 #~ msgid "Your server can't save your personal information."
 #~ msgstr "Ваш сервер не може да сачува Ваше личне информације."
 
-#~ msgid "Account Local already exists."
-#~ msgstr "Рачун локал већ постоји."
-
 #~ msgid "Please rename or remove it before enabling link-local messaging."
 #~ msgstr ""
 #~ "Молимо Вас, преименујте или уклоните пре омогућавања локалних порука."
@@ -13318,10 +14098,6 @@ msgstr "Регистрација неуспела"
 #~ msgid "The following message was NOT encrypted"
 #~ msgstr "Следећа порука НИЈЕ била шифрована"
 
-#, fuzzy
-#~ msgid "Encryption used for this contact."
-#~ msgstr "Омогући ESessions енкрипцију за овај налог."
-
 #~ msgid "Toggle Open_PGP Encryption"
 #~ msgstr "Укључи/искључи Open_PGP енкрипцију"
 
@@ -13400,10 +14176,6 @@ msgstr "Регистрација неуспела"
 #~ msgid "Contact's identity verified"
 #~ msgstr "Идентитет контакта потврђен"
 
-#, fuzzy
-#~ msgid "Verify again…"
-#~ msgstr "Потврдите поново..."
-
 #~ msgid ""
 #~ "To be certain that <b>only</b> the expected person can read your messages "
 #~ "or send you messages, you need to verify their identity by clicking the "
@@ -13529,9 +14301,6 @@ msgstr "Регистрација неуспела"
 #~ msgid "Add _Contact..."
 #~ msgstr "_Додај контакт..."
 
-#~ msgid "_Accounts"
-#~ msgstr "_Налози"
-
 #~ msgid "File _Transfers"
 #~ msgstr "Преноси да_тотека"
 
diff --git a/po/sr@Latn.po b/po/sr@Latn.po
index 765500ef9..81a5b85b7 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: 2019-07-02 02:06+0000\n"
+"POT-Creation-Date: 2019-08-11 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,72 +21,72 @@ msgstr ""
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: gajim/chat_control_base.py:550
+#: gajim/chat_control_base.py:557
 msgid "_Undo"
 msgstr ""
 
-#: gajim/chat_control_base.py:558 gajim/conversation_textview.py:529
+#: gajim/chat_control_base.py:565 gajim/conversation_textview.py:529
 msgid "_Clear"
 msgstr ""
 
-#: gajim/chat_control_base.py:563
+#: gajim/chat_control_base.py:570
 msgid "Paste as quote"
 msgstr ""
 
-#: gajim/chat_control_base.py:613
+#: gajim/chat_control_base.py:620
 #, fuzzy
 msgid "Paste Image"
 msgstr "Odaberite sliku"
 
-#: gajim/chat_control_base.py:614
+#: gajim/chat_control_base.py:621
 #, fuzzy
 msgid "You are trying to paste an image"
 msgstr "Zatvorićete nekoliko jezičaka"
 
-#: gajim/chat_control_base.py:615
+#: gajim/chat_control_base.py:622
 #, 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:617 gajim/groupchat_control.py:2310
-#: gajim/roster_window.py:2848 gajim/roster_window.py:4167
-#: gajim/message_window.py:252 gajim/gtk/dialogs.py:418
+#: gajim/chat_control_base.py:624 gajim/groupchat_control.py:2218
+#: gajim/roster_window.py:2841 gajim/roster_window.py:4118
+#: gajim/message_window.py:359 gajim/gtk/dialogs.py:330
 #, fuzzy
 msgid "_Do not ask me again"
 msgstr "_Ne pitaj me više"
 
-#: gajim/chat_control_base.py:620
+#: gajim/chat_control_base.py:627
 msgid "_Paste"
 msgstr ""
 
-#: gajim/chat_control_base.py:1162 gajim/gtk/accounts.py:351
+#: gajim/chat_control_base.py:1169 gajim/gtk/accounts.py:354
 #, fuzzy
 msgid "Privacy"
 msgstr "Lista privatnosti"
 
-#: gajim/chat_control_base.py:1163
+#: gajim/chat_control_base.py:1170
 #, fuzzy
 msgid "Warning"
 msgstr "Zabranjujem %s"
 
-#: gajim/chat_control_base.py:1164
+#: gajim/chat_control_base.py:1171
 #, fuzzy, python-format
 msgid "If you send a file to <b>%s</b>, your real JID will be revealed."
 msgstr ""
 "Ako pošaljete datoteku kontaktu %s, on/ona će znati Vaš pravi džaber ID."
 
-#: gajim/chat_control_base.py:1169
+#: gajim/chat_control_base.py:1176
 #, fuzzy
 msgid "Continue"
 msgstr "_Nastavi"
 
-#: gajim/gtkgui_helpers.py:163 gajim/gtk/filetransfer.py:393
+#: gajim/gtkgui_helpers.py:163 gajim/gtk/filetransfer.py:398
 #, fuzzy, python-format
 msgid "Cannot overwrite existing file '%s'"
 msgstr "Nije moguće prepisati postojeću datoteku \"%s\""
 
-#: gajim/gtkgui_helpers.py:164 gajim/gtk/filetransfer.py:394
+#: gajim/gtkgui_helpers.py:164 gajim/gtk/filetransfer.py:399
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
@@ -178,229 +178,224 @@ msgstr "Nema zahteva za pretplatom na čekanju."
 msgid " resource with priority "
 msgstr " resurs sa prioritetom "
 
-#: gajim/gui_menu_builder.py:96
-msgid "_New Group Chat"
-msgstr "_Novi grupni razgovor"
-
-#: gajim/gui_menu_builder.py:289 gajim/gui_menu_builder.py:380
-#: gajim/chat_control.py:303 gajim/roster_window.py:786
-#: gajim/roster_window.py:1719 gajim/roster_window.py:1721
-#: gajim/roster_window.py:2030 gajim/roster_window.py:3336
-#: gajim/roster_window.py:3369 gajim/gui_interface.py:413
-#: gajim/common/contacts.py:206 gajim/common/contacts.py:343
-#: gajim/common/helpers.py:83 gajim/common/helpers.py:311
-#: gajim/gtk/add_contact.py:319 gajim/gtk/subscription_request.py:70
-#: gajim/gtk/subscription_request.py:99 gajim/gtk/roster_item_exchange.py:112
-msgid "Not in Roster"
-msgstr "Nije na listi kontakata"
+#: gajim/gui_menu_builder.py:251 gajim/gui_menu_builder.py:342
+#: gajim/chat_control.py:305 gajim/roster_window.py:783
+#: gajim/roster_window.py:1716 gajim/roster_window.py:1718
+#: gajim/roster_window.py:2027 gajim/roster_window.py:3292
+#: gajim/roster_window.py:3325 gajim/gui_interface.py:396
+#: gajim/common/contacts.py:222 gajim/common/contacts.py:359
+#: gajim/common/contacts.py:471 gajim/common/helpers.py:86
+#: gajim/common/helpers.py:317 gajim/gtk/add_contact.py:319
+#: gajim/gtk/subscription_request.py:70 gajim/gtk/subscription_request.py:99
+#: 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:393
-msgid "I would like to add you to my roster"
-msgstr "Želeo bih Vas dodati na moju listu kontakata"
+#: gajim/gui_menu_builder.py:355
+#, 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:471
+#: gajim/gui_menu_builder.py:433
 #, fuzzy
 msgid "Send Single _Message…"
 msgstr "Pošalji _jednu poruku"
 
-#: gajim/gui_menu_builder.py:486
+#: gajim/gui_menu_builder.py:448
 #, fuzzy
 msgid "E_xecute Command…"
 msgstr "_Izvrši naredbu"
 
-#: gajim/gui_menu_builder.py:494
+#: gajim/gui_menu_builder.py:456
 msgid "_Manage Transport"
 msgstr "_Upravljanje transportima"
 
-#: gajim/gui_menu_builder.py:500
+#: gajim/gui_menu_builder.py:462
 msgid "_Modify Transport"
 msgstr "_Izmeni transport"
 
-#: gajim/gui_menu_builder.py:507 gajim/roster_window.py:5046
+#: gajim/gui_menu_builder.py:469 gajim/roster_window.py:4985
 #, fuzzy
 msgid "_Rename…"
 msgstr "_Preimenuj"
 
-#: gajim/gui_menu_builder.py:518 gajim/roster_window.py:5062
-#: gajim/roster_window.py:5177 gajim/data/gui/blocked_contacts_window.ui:52
+#: gajim/gui_menu_builder.py:480 gajim/roster_window.py:5001
+#: gajim/roster_window.py:5116 gajim/data/gui/blocked_contacts_window.ui:52
 #: gajim/data/gui/gc_occupants_menu.ui:148
 #: gajim/data/gui/contact_context_menu.ui:143
 msgid "_Unblock"
 msgstr "_Odblokiraj"
 
-#: gajim/gui_menu_builder.py:521 gajim/roster_window.py:5067
-#: gajim/roster_window.py:5181 gajim/data/gui/gc_occupants_menu.ui:140
+#: gajim/gui_menu_builder.py:483 gajim/roster_window.py:5006
+#: gajim/roster_window.py:5120 gajim/data/gui/gc_occupants_menu.ui:140
 #: gajim/data/gui/contact_context_menu.ui:151
 msgid "_Block"
 msgstr "_Blokiraj"
 
-#: gajim/gui_menu_builder.py:529 gajim/roster_window.py:5074
+#: gajim/gui_menu_builder.py:491 gajim/roster_window.py:5013
 #: gajim/data/gui/contact_context_menu.ui:181
 msgid "Remo_ve"
 msgstr "_Ukloni"
 
-#: gajim/gui_menu_builder.py:539 gajim/data/gui/contact_context_menu.ui:198
+#: gajim/gui_menu_builder.py:501 gajim/data/gui/contact_context_menu.ui:198
 msgid "_Information"
 msgstr "Informacije"
 
-#: gajim/gui_menu_builder.py:552
+#: gajim/gui_menu_builder.py:514
 #, fuzzy
 msgid "Save _As"
 msgstr "Imam "
 
-#: gajim/gui_menu_builder.py:564 gajim/groupchat_control.py:501
-#: gajim/chat_control.py:340
+#: gajim/gui_menu_builder.py:526 gajim/groupchat_control.py:507
+#: gajim/chat_control.py:342
 #, fuzzy
 msgid "Send File…"
 msgstr "Pošalji _datoteku"
 
-#: gajim/gui_menu_builder.py:565
+#: gajim/gui_menu_builder.py:527
 #, fuzzy
 msgid "Upload File…"
 msgstr "Snimi datoteku kao..."
 
-#: gajim/gui_menu_builder.py:566
+#: gajim/gui_menu_builder.py:528
 #, fuzzy
 msgid "Send File Directly…"
 msgstr "Snimi datoteku kao..."
 
-#: gajim/gui_menu_builder.py:568 gajim/gui_menu_builder.py:632
+#: gajim/gui_menu_builder.py:530 gajim/gui_menu_builder.py:596
 #, fuzzy
 msgid "Send Chatstate"
 msgstr "Poslednji status: %s"
 
-#: gajim/gui_menu_builder.py:569
+#: gajim/gui_menu_builder.py:531
 #, fuzzy
 msgid "Invite Contacts"
 msgstr "Pozovi kontakte"
 
-#: gajim/gui_menu_builder.py:570
+#: gajim/gui_menu_builder.py:532
 #, fuzzy
-msgid "Add to Roster"
-msgstr "_Dodaj na listu kontakata"
+msgid "Add to Contact List"
+msgstr "_Dodaj kontakt..."
 
-#: gajim/gui_menu_builder.py:571
-msgid "Audio Session"
-msgstr ""
+#: gajim/gui_menu_builder.py:533
+#, fuzzy
+msgid "Voice Chat"
+msgstr "Zahtev za prenosom datoteke"
 
-#: gajim/gui_menu_builder.py:572
-msgid "Video Session"
-msgstr ""
+#: gajim/gui_menu_builder.py:534
+#, fuzzy
+msgid "Video Chat"
+msgstr "Privatni Razgovori"
 
-#: gajim/gui_menu_builder.py:573
+#: gajim/gui_menu_builder.py:535 gajim/gui_menu_builder.py:582
 #, fuzzy
 msgid "Information"
 msgstr "Informacije"
 
-#: gajim/gui_menu_builder.py:574 gajim/gui_menu_builder.py:639
+#: gajim/gui_menu_builder.py:536 gajim/gui_menu_builder.py:602
 #: gajim/data/gui/application_menu.ui:37
 #, fuzzy
 msgid "History"
 msgstr "_Istorijat"
 
-#: gajim/gui_menu_builder.py:580 gajim/gui_menu_builder.py:687
+#: gajim/gui_menu_builder.py:542 gajim/gui_menu_builder.py:650
 #: gajim/data/gui/preferences_window.ui:1823
 msgid "Disabled"
 msgstr "Onemogućeno"
 
-#: gajim/gui_menu_builder.py:581 gajim/gui_menu_builder.py:688
+#: gajim/gui_menu_builder.py:543 gajim/gui_menu_builder.py:651
 #, fuzzy
 msgid "Composing only"
 msgstr "Sastavljanje"
 
-#: gajim/gui_menu_builder.py:582 gajim/gui_menu_builder.py:689
+#: gajim/gui_menu_builder.py:544 gajim/gui_menu_builder.py:652
 #, fuzzy
 msgid "All chat states"
 msgstr "Svi statusi"
 
-#: gajim/gui_menu_builder.py:620
+#: gajim/gui_menu_builder.py:583
 #, fuzzy
-msgid "Manage Room"
-msgstr "Upravljanje sobama"
+msgid "Manage Group Chat"
+msgstr "Napusti grupne razgovore"
 
-#: gajim/gui_menu_builder.py:621
+#: gajim/gui_menu_builder.py:584 gajim/data/gui/groupchat_control.ui:649
 #, fuzzy
 msgid "Change Subject"
 msgstr "Promeni _temu..."
 
-#: gajim/gui_menu_builder.py:622
+#: gajim/gui_menu_builder.py:585
 #, fuzzy
-msgid "Configure Room"
-msgstr "Podesi _sobu..."
+msgid "Configure Group Chat"
+msgstr "Napusti grupne razgovore"
 
-#: gajim/gui_menu_builder.py:623
+#: gajim/gui_menu_builder.py:586
 #, fuzzy
 msgid "Upload Avatar…"
 msgstr "Odaberite sliku"
 
-#: gajim/gui_menu_builder.py:624
+#: gajim/gui_menu_builder.py:587
 #, fuzzy
-msgid "Destroy Room"
-msgstr "Uništi sobu"
+msgid "Destroy Group Chat"
+msgstr "Novi grupni razgovor"
 
-#: gajim/gui_menu_builder.py:626 gajim/data/gui/preferences_window.ui:790
+#: gajim/gui_menu_builder.py:589 gajim/data/gui/preferences_window.ui:790
 #, fuzzy
 msgid "Chat Settings"
 msgstr "Registracija neuspela"
 
-#: gajim/gui_menu_builder.py:627
+#: gajim/gui_menu_builder.py:590
 msgid "Show join/leave"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:628
+#: gajim/gui_menu_builder.py:591
 #, fuzzy
 msgid "Show status changes"
 msgstr "_Zapisuj u dnevnik statusne promene kontakata"
 
-#: gajim/gui_menu_builder.py:629 gajim/data/gui/gc_control_popup_menu.ui:72
+#: gajim/gui_menu_builder.py:592 gajim/data/gui/gc_control_popup_menu.ui:72
 #, fuzzy
 msgid "Notify on all messages"
 msgstr "Već postavljene poruke:"
 
-#: gajim/gui_menu_builder.py:630
+#: gajim/gui_menu_builder.py:593
 #, fuzzy
 msgid "Minimize on close"
 msgstr "Umanji prozor na zatvaranje"
 
-#: gajim/gui_menu_builder.py:631
+#: gajim/gui_menu_builder.py:595
 #, fuzzy
-msgid "Minimize on autojoin"
+msgid "Minimize when joining automatically"
 msgstr "Umanji prozor na auto povezivanje"
 
-#: gajim/gui_menu_builder.py:634
+#: gajim/gui_menu_builder.py:598
 msgid "Sync Threshold"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:635
+#: gajim/gui_menu_builder.py:599
 #, fuzzy
-msgid "Change Nick"
+msgid "Change Nickname"
 msgstr "Promeni _nadimak..."
 
-#: gajim/gui_menu_builder.py:636
-#, fuzzy
-msgid "Bookmark Room"
-msgstr "Markiraj ovu sobu"
-
-#: gajim/gui_menu_builder.py:637
+#: gajim/gui_menu_builder.py:600
 #, fuzzy
 msgid "Request Voice"
 msgstr "_Glas"
 
-#: gajim/gui_menu_builder.py:638 gajim/roster_window.py:5246
+#: gajim/gui_menu_builder.py:601 gajim/roster_window.py:5185
 #, fuzzy
 msgid "Execute command"
 msgstr "_Izvrši naredbu"
 
-#: gajim/gui_menu_builder.py:640
-#, fuzzy
-msgid "Disconnect"
-msgstr "_Izloguj se"
+#: gajim/gui_menu_builder.py:603
+msgid "Leave"
+msgstr ""
 
-#: gajim/gui_menu_builder.py:678 gajim/gtk/preferences.py:156
+#: gajim/gui_menu_builder.py:641 gajim/gtk/preferences.py:155
 msgid "No threshold"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:680 gajim/gtk/preferences.py:158
+#: gajim/gui_menu_builder.py:643 gajim/gtk/preferences.py:157
 #, fuzzy, python-format
 msgid "%i day"
 msgid_plural "%i days"
@@ -408,159 +403,174 @@ msgstr[0] "Pre %i dana"
 msgstr[1] "Pre %i dana"
 msgstr[2] "Pre %i dana"
 
-#: gajim/gui_menu_builder.py:709 gajim/gui_menu_builder.py:747
-#: gajim/gtk/join_groupchat.py:43
-msgid "Join Group Chat"
-msgstr "Pridruži se grupnom razgovoru"
-
-#: gajim/gui_menu_builder.py:746
+#: gajim/gui_menu_builder.py:672
 #, fuzzy
 msgid "Add Contact…"
 msgstr "_Dodaj kontakt..."
 
-#: gajim/gui_menu_builder.py:748 gajim/gtk/profile.py:52
-#: gajim/gtk/accounts.py:770 gajim/gtk/accounts.py:808
+#: gajim/gui_menu_builder.py:673 gajim/gtk/profile.py:52
+#: gajim/gtk/accounts.py:773 gajim/gtk/accounts.py:811
 #, fuzzy
 msgid "Profile"
 msgstr "datoteka"
 
-#: gajim/gui_menu_builder.py:749
+#: gajim/gui_menu_builder.py:674
+#, fuzzy
+msgid "Send Single Message…"
+msgstr "Pošalji _jednu poruku"
+
+#: gajim/gui_menu_builder.py:675
 #, fuzzy
 msgid "Discover Services"
 msgstr "_Otkrivanje servisa"
 
-#: gajim/gui_menu_builder.py:750
+#: gajim/gui_menu_builder.py:676 gajim/gtk/server_info.py:36
 #, fuzzy
-msgid "Send Single Message…"
-msgstr "Pošalji _jednu poruku"
+msgid "Server Info"
+msgstr "Server"
 
-#: gajim/gui_menu_builder.py:751 gajim/data/gui/preferences_window.ui:2741
+#: gajim/gui_menu_builder.py:677 gajim/data/gui/preferences_window.ui:2741
 msgid "Advanced"
 msgstr "Napredno"
 
-#: gajim/gui_menu_builder.py:752 gajim/gtk/mam_preferences.py:88
+#: gajim/gui_menu_builder.py:678 gajim/gtk/mam_preferences.py:88
 #, fuzzy
 msgid "Archiving Preferences"
 msgstr "_Podešavanja"
 
-#: gajim/gui_menu_builder.py:753
+#: gajim/gui_menu_builder.py:679
 #, fuzzy
 msgid "Blocking List"
 msgstr "Lista zabrana"
 
-#: gajim/gui_menu_builder.py:754 gajim/gtk/history_sync.py:108
+#: gajim/gui_menu_builder.py:680
+#, fuzzy
+msgid "Bookmarks"
+msgstr "_Markiraj ovu so_bu"
+
+#: gajim/gui_menu_builder.py:681
+#, fuzzy
+msgid "PEP Configuration"
+msgstr "Konfiguracija sobe"
+
+#: gajim/gui_menu_builder.py:682 gajim/gtk/history_sync.py:108
 #: gajim/gtk/history_sync.py:186
 #, fuzzy
 msgid "Synchronise History"
 msgstr "Sinhronizuj"
 
-#: gajim/gui_menu_builder.py:755 gajim/gtk/privacy_list.py:427
+#: gajim/gui_menu_builder.py:683 gajim/gtk/privacy_list.py:427
 msgid "Privacy Lists"
 msgstr "Lista privatnosti"
 
-#: gajim/gui_menu_builder.py:756 gajim/gtk/server_info.py:36
-#, fuzzy
-msgid "Server Info"
-msgstr "Server"
-
-#: gajim/gui_menu_builder.py:757 gajim/gui_menu_builder.py:768
+#: gajim/gui_menu_builder.py:685 gajim/gui_menu_builder.py:696
 #: gajim/data/gui/xml_console_window.ui:77
 msgid "XML Console"
 msgstr "XML Konzola"
 
-#: gajim/gui_menu_builder.py:759 gajim/data/gui/groupchat_config.ui:36
+#: gajim/gui_menu_builder.py:687 gajim/data/gui/groupchat_config.ui:36
 #, fuzzy
 msgid "Admin"
 msgstr "_Admin"
 
-#: gajim/gui_menu_builder.py:760
+#: gajim/gui_menu_builder.py:688
 #, fuzzy
 msgid "Send Server Message…"
 msgstr "_Pošalji serversku poruku..."
 
-#: gajim/gui_menu_builder.py:761
+#: gajim/gui_menu_builder.py:689
 #, fuzzy
 msgid "Set MOTD…"
 msgstr "Postavi poruku dana..."
 
-#: gajim/gui_menu_builder.py:762
+#: gajim/gui_menu_builder.py:690
 #, fuzzy
 msgid "Update MOTD…"
 msgstr "Osveži poruku dana..."
 
-#: gajim/gui_menu_builder.py:763
+#: gajim/gui_menu_builder.py:691
 #, fuzzy
 msgid "Delete MOTD…"
 msgstr "Izbriši poruku dana"
 
-#: gajim/gui_menu_builder.py:812
+#: gajim/gui_menu_builder.py:736
 #, fuzzy
-msgid "No Accounts available"
-msgstr "Nema dostupnih naloga"
+msgid "_Add Account…"
+msgstr "_Dodaj kontakt..."
+
+#: gajim/gui_menu_builder.py:742
+#, fuzzy
+msgid "_Modify Accounts…"
+msgstr "Izmeni nalog"
+
+#: gajim/gui_menu_builder.py:751 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:823 gajim/data/gui/application_menu.ui:5
-#: gajim/data/gui/application_menu.ui:71 gajim/data/gui/shortcuts_window.ui:182
-#: gajim/gtk/accounts.py:58
+#: gajim/gui_menu_builder.py:755 gajim/data/gui/application_menu.ui:5
+#: gajim/data/gui/shortcuts_window.ui:182 gajim/gtk/accounts.py:57
 msgid "Accounts"
 msgstr "Nalozi"
 
-#: gajim/gui_menu_builder.py:881 gajim/gui_menu_builder.py:886
+#: gajim/gui_menu_builder.py:784 gajim/gui_menu_builder.py:789
 #, fuzzy
-msgid "Copy JID"
-msgstr "Džaber ID sobe:"
+msgid "Copy XMPP Address"
+msgstr "_Kopiraj džaber ID/e-mejl adresu"
 
-#: gajim/gui_menu_builder.py:882 gajim/gui_menu_builder.py:914
+#: gajim/gui_menu_builder.py:785 gajim/gui_menu_builder.py:817
 #, fuzzy
 msgid "Join Groupchat"
 msgstr "Pridruži se grupnom razgovoru"
 
-#: gajim/gui_menu_builder.py:887 gajim/gui_menu_builder.py:913
-#: gajim/data/gui/application_menu.ui:76
+#: gajim/gui_menu_builder.py:790 gajim/gui_menu_builder.py:816
+#: gajim/data/gui/application_menu.ui:71
 #: gajim/data/gui/subscription_request_window.ui:106
 msgid "Start Chat"
 msgstr "Započni razgovor"
 
-#: gajim/gui_menu_builder.py:888 gajim/gui_menu_builder.py:915
+#: gajim/gui_menu_builder.py:791 gajim/gui_menu_builder.py:818
 #, fuzzy
-msgid "Add to Roster…"
-msgstr "_Dodaj na listu kontakata"
+msgid "Add to Contact List…"
+msgstr "_Dodaj kontakt..."
 
-#: gajim/gui_menu_builder.py:893
+#: gajim/gui_menu_builder.py:796
 #, fuzzy
 msgid "Copy Link Location"
 msgstr "_Kopiraj lokaciju veze"
 
-#: gajim/gui_menu_builder.py:894
+#: gajim/gui_menu_builder.py:797
 #, fuzzy
 msgid "Open Link in Browser"
 msgstr "_Otvori vezu u internet pregledaču"
 
-#: gajim/gui_menu_builder.py:899
+#: gajim/gui_menu_builder.py:802
 #, fuzzy
 msgid "Copy Email Address"
 msgstr "_Kopiraj džaber ID/e-mejl adresu"
 
-#: gajim/gui_menu_builder.py:900 gajim/gui_menu_builder.py:912
+#: gajim/gui_menu_builder.py:803 gajim/gui_menu_builder.py:815
 #, fuzzy
 msgid "Open Email Composer"
 msgstr "_Otvori sastavljač e-mejla"
 
-#: gajim/gui_menu_builder.py:905
+#: gajim/gui_menu_builder.py:808
 #, fuzzy
 msgid "Copy Location"
 msgstr "_Kopiraj lokaciju veze"
 
-#: gajim/gui_menu_builder.py:906
+#: gajim/gui_menu_builder.py:809
 #, fuzzy
 msgid "Show Location"
 msgstr "Obaveštenje"
 
-#: gajim/gui_menu_builder.py:911
+#: gajim/gui_menu_builder.py:814
 #, fuzzy
-msgid "Copy JID/Email"
+msgid "Copy XMPP Address/Email"
 msgstr "_Kopiraj džaber ID/e-mejl adresu"
 
-#: gajim/gui_menu_builder.py:945
+#: gajim/gui_menu_builder.py:852
 #, fuzzy
 msgid "Copy"
 msgstr "Džaber ID sobe:"
@@ -583,44 +593,56 @@ msgstr ""
 msgid "Choose folder for logfile"
 msgstr ""
 
-#: gajim/history_manager.py:107
+#: gajim/history_manager.py:106
 msgid "Cannot find history logs database"
 msgstr "Nije moguće pronaći dnevnik istorijata baze podataka"
 
-#: gajim/history_manager.py:108
+#: gajim/history_manager.py:107
 #, fuzzy, python-format
 msgid "%s does not exist."
 msgstr "Datoteka ne postoji"
 
-#: gajim/history_manager.py:141 gajim/history_manager.py:195
-#: gajim/gtk/discovery.py:829 gajim/gtk/roster_item_exchange.py:80
-msgid "JID"
-msgstr "DŽID"
+#: gajim/history_manager.py:140 gajim/history_manager.py:194
+#: 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:30
+#: gajim/gtk/accounts.py:804
+#, fuzzy
+msgid "XMPP Address"
+msgstr "AIM adresa:"
 
-#: gajim/history_manager.py:154 gajim/history_manager.py:202
+#: gajim/history_manager.py:153 gajim/history_manager.py:201
 #: gajim/data/gui/history_window.ui:89 gajim/gtk/history.py:108
 msgid "Date"
 msgstr "Datum"
 
-#: gajim/history_manager.py:161 gajim/history_manager.py:225
+#: gajim/history_manager.py:160 gajim/history_manager.py:224
 #: gajim/data/gui/join_groupchat_window.ui:208
 #: gajim/data/gui/profile_window.ui:214
 #: gajim/data/gui/vcard_information_window.ui:443
+#: gajim/data/gui/bookmarks.ui:140
 msgid "Nickname"
 msgstr "Nadimak"
 
-#: gajim/history_manager.py:172 gajim/history_manager.py:211
+#: gajim/history_manager.py:171 gajim/history_manager.py:210
 #: gajim/data/gui/preferences_window.ui:1344
 #: gajim/data/gui/single_message_window.ui:275 gajim/gtk/history.py:117
 msgid "Message"
 msgstr "Poruka"
 
-#: gajim/history_manager.py:180 gajim/history_manager.py:218
+#: gajim/history_manager.py:179 gajim/history_manager.py:217
 #: gajim/data/gui/groups_post_window.ui:49
 #: gajim/data/gui/single_message_window.ui:214
 msgid "Subject"
 msgstr "Tema"
 
+#: gajim/history_manager.py:247
+#, fuzzy
+msgid "Database Cleanup"
+msgstr "Greška sa bazom podataka"
+
 #: gajim/history_manager.py:248
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
@@ -631,11 +653,8 @@ msgstr ""
 #: gajim/history_manager.py:250
 #, fuzzy
 msgid ""
-"Normally allocated database size will not be freed, it will just become "
-"reusable. If you really want to reduce database filesize, click YES, else "
-"click NO.\n"
-"\n"
-"In case you click YES, please wait…"
+"Normally, the allocated database size will not be freed, it will just become "
+"reusable. This operation may take a while."
 msgstr ""
 "Normalno, veličina alociranog prostora neće biti oslobođena,samo će postati "
 "ponovo koristiva. Ukoliko zaista želite smanjiti veličinu baze podataka "
@@ -645,26 +664,26 @@ msgstr ""
 
 #: gajim/history_manager.py:255
 #, fuzzy
-msgid "Database Cleanup"
-msgstr "Greška sa bazom podataka"
+msgid "_Cleanup"
+msgstr "_Počisti"
 
-#: gajim/history_manager.py:519 gajim/gtk/filetransfer.py:238
-#: gajim/gtk/filetransfer.py:248
+#: gajim/history_manager.py:518 gajim/gtk/filetransfer.py:237
+#: gajim/gtk/filetransfer.py:247
 msgid "You"
 msgstr "Vi"
 
-#: gajim/history_manager.py:531
+#: gajim/history_manager.py:530
 #, 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:568 gajim/history_manager.py:607
-#: gajim/gtk/dialogs.py:58 gajim/gtk/themes.py:319
+#: gajim/history_manager.py:567 gajim/history_manager.py:606
+#: gajim/gtk/dialogs.py:57 gajim/gtk/themes.py:319
 #: gajim/gtk/roster_item_exchange.py:75 gajim/gtk/roster_item_exchange.py:185
 msgid "Delete"
 msgstr "Obriši"
 
-#: gajim/history_manager.py:569
+#: gajim/history_manager.py:568
 #, fuzzy
 msgid "Delete Conversation"
 msgid_plural "Delete Conversations"
@@ -672,7 +691,7 @@ msgstr[0] "Poništi odobravanje"
 msgstr[1] "Poništi odobravanje"
 msgstr[2] "Poništi odobravanje"
 
-#: gajim/history_manager.py:570
+#: gajim/history_manager.py:569
 #, 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?"
@@ -680,7 +699,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:608
+#: gajim/history_manager.py:607
 #, fuzzy
 msgid "Delete Message"
 msgid_plural "Delete Messages"
@@ -688,7 +707,7 @@ msgstr[0] "Podrazumevana poruka"
 msgstr[1] "Podrazumevana poruka"
 msgstr[2] "Podrazumevana poruka"
 
-#: gajim/history_manager.py:609
+#: gajim/history_manager.py:608
 #, fuzzy
 msgid "Do you want to permanently delete this message"
 msgid_plural "Do you want to permanently delete these messages"
@@ -702,15 +721,15 @@ msgid "Contact name: <i>%s</i>"
 msgstr "Ime kontakta: <i>%s</i>"
 
 #: gajim/dialogs.py:84
-#, fuzzy, python-format
-msgid "JID: <i>%s</i>"
-msgstr "Džaber ID: <i>%s</i>"
+#, python-format
+msgid "XMPP Address: <i>%s</i>"
+msgstr ""
 
-#: gajim/dialogs.py:115 gajim/dialogs.py:128 gajim/roster_window.py:2901
-#: gajim/roster_window.py:3833 gajim/roster_window.py:5084
-#: gajim/common/contacts.py:157 gajim/common/contacts.py:190
+#: gajim/dialogs.py:115 gajim/dialogs.py:128 gajim/roster_window.py:2894
+#: gajim/roster_window.py:3784 gajim/roster_window.py:5023
+#: gajim/common/contacts.py:157 gajim/common/contacts.py:206
 #: gajim/data/gui/preferences_window.ui:558
-#: gajim/data/gui/shortcuts_window.ui:177 gajim/gtk/accounts.py:349
+#: gajim/data/gui/shortcuts_window.ui:177 gajim/gtk/accounts.py:352
 msgid "General"
 msgstr "Opšte"
 
@@ -755,7 +774,7 @@ msgstr "Prepiši statusnu poruku?"
 msgid "Preset 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:703
+#: gajim/dialogs.py:703 gajim/plugins/gui.py:292
 msgid "_Overwrite"
 msgstr ""
 
@@ -767,9 +786,7 @@ msgstr "Snimi kao već postavljenu statusnu poruku"
 msgid "Please type a name for this status message"
 msgstr "Molimo unesite ime za ovu statusnu poruku"
 
-#: gajim/dialogs.py:740 gajim/gui_interface.py:1441 gajim/dialog_messages.py:31
-#: gajim/gtk/discovery.py:518 gajim/gtk/profile.py:323
-#: gajim/gtk/join_groupchat.py:234
+#: gajim/dialogs.py:740 gajim/gtk/discovery.py:517 gajim/gtk/profile.py:323
 msgid "You are not connected to the server"
 msgstr "Niste povezani na server"
 
@@ -777,9 +794,11 @@ msgstr "Niste povezani na server"
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Bez veze, nije moguće sinhronizovati kontakte."
 
-#: gajim/dialogs.py:752 gajim/dialogs.py:823 gajim/gtk/discovery.py:822
-#: gajim/gtk/discovery.py:1648 gajim/gtk/discovery.py:1941
-#: gajim/gtk/history.py:99 gajim/gtk/roster_item_exchange.py:83
+#: gajim/dialogs.py:752 gajim/dialogs.py:823
+#: gajim/data/gui/groupchat_info_scrolled.ui:16 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/gtk/roster_item_exchange.py:83
 msgid "Name"
 msgstr "Ime"
 
@@ -799,400 +818,347 @@ msgstr "Ne možete se sinhronizovati sa nalogom ako niste povezani."
 msgid "Synchronise"
 msgstr "Sinhronizuj"
 
-#: gajim/dialogs.py:1043
+#: gajim/dialogs.py:1042
 msgid "an audio and video"
 msgstr ""
 
-#: gajim/dialogs.py:1045
+#: gajim/dialogs.py:1044
 msgid "an audio"
 msgstr ""
 
-#: gajim/dialogs.py:1047
+#: gajim/dialogs.py:1046
 msgid "a video"
 msgstr ""
 
-#: gajim/dialogs.py:1051
+#: gajim/dialogs.py:1050
 #, python-format
 msgid ""
-"%(contact)s wants to start %(type)s session with you. Do you want to answer "
+"%(contact)s wants to start a %(type)s chat with you. Do you want to answer "
 "the call?"
 msgstr ""
 
-#: gajim/groupchat_control.py:505
+#: gajim/groupchat_control.py:511
 #, fuzzy, python-format
 msgid "Send File (max. %s MiB)…"
 msgstr "Snimi datoteku kao..."
 
-#: gajim/groupchat_control.py:507 gajim/chat_control.py:342
+#: gajim/groupchat_control.py:513 gajim/chat_control.py:344
 #, fuzzy
 msgid "No File Transfer available"
 msgstr "Prenosi datoteka"
 
-#: gajim/groupchat_control.py:630 gajim/groupchat_control.py:2349
-msgid "Changing Subject"
-msgstr "Promena Teme"
-
-#: gajim/groupchat_control.py:631 gajim/groupchat_control.py:2350
-msgid "Please specify the new subject:"
-msgstr "Molimo odredite novu temu:"
-
-#: gajim/groupchat_control.py:638
-msgid "Changing Nickname"
-msgstr "Promena nadimka"
-
-#: gajim/groupchat_control.py:639
-msgid "Please specify the new nickname you want to use:"
-msgstr "Molimo odredite novi nadimak koji želite da koristite:"
-
-#: gajim/groupchat_control.py:657
+#: gajim/groupchat_control.py:655
 #, fuzzy
-msgid "Invalid group chat JID"
+msgid "Invalid group chat XMPP Address"
 msgstr "Neispravan Džaber ID grupnog razgovora"
 
-#: gajim/groupchat_control.py:658
+#: gajim/groupchat_control.py:656
 #, fuzzy
-msgid "The group chat JID has not allowed characters."
+msgid "The group chat XMPP Address has not allowed characters."
 msgstr "Džaber ID grupnog razgovora ima nedozvoljene znake."
 
-#: gajim/groupchat_control.py:758 gajim/gtk/profile.py:136
+#: gajim/groupchat_control.py:743 gajim/gtk/profile.py:136
 msgid "Could not load image"
 msgstr "Ne mogu učitati sliku"
 
-#: gajim/groupchat_control.py:888
+#: gajim/groupchat_control.py:873
 msgid "Insert Nickname"
 msgstr "Ubaci nadimak"
 
-#: gajim/groupchat_control.py:1056 gajim/chat_control.py:824
+#: gajim/groupchat_control.py:1041 gajim/chat_control.py:848
 msgid "and authenticated"
 msgstr "i prijavljeni"
 
-#: gajim/groupchat_control.py:1060 gajim/chat_control.py:828
+#: gajim/groupchat_control.py:1045 gajim/chat_control.py:852
 msgid "and NOT authenticated"
 msgstr "i NEprijavljeni"
 
-#: gajim/groupchat_control.py:1064
+#: gajim/groupchat_control.py:1049
 #, 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/groupchat_control.py:1111
+#: gajim/groupchat_control.py:1096
 msgid "Conversation with "
 msgstr "Razgovor sa "
 
-#: gajim/groupchat_control.py:1113
+#: gajim/groupchat_control.py:1098
 msgid "Continued conversation"
 msgstr "Nastavljeni razgovor"
 
-#: gajim/groupchat_control.py:1411
+#: gajim/groupchat_control.py:1357
 #, 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:1433
+#: gajim/groupchat_control.py:1374
 #, fuzzy
-msgid "Room now shows unavailable members"
+msgid "Group chat now shows unavailable members"
 msgstr "Soba sada prikazuje nedostupne članove"
 
-#: gajim/groupchat_control.py:1436
+#: gajim/groupchat_control.py:1377
 #, fuzzy
-msgid "Room now does not show unavailable members"
+msgid "Group chat now does not show unavailable members"
 msgstr "soba sada ne prikazuje nedostupne članove"
 
-#: gajim/groupchat_control.py:1439
+#: gajim/groupchat_control.py:1380
 msgid "A setting not related to privacy has been changed"
 msgstr ""
 
-#: gajim/groupchat_control.py:1446
-msgid "Room logging is now enabled"
-msgstr "Logovanje u sobi je sada omogućeno"
+#: gajim/groupchat_control.py:1387 gajim/groupchat_control.py:1659
+#, fuzzy
+msgid "Conversations are stored on the server"
+msgstr "Sesija NEĆE biti pamćena"
 
-#: gajim/groupchat_control.py:1449
-msgid "Room logging is now disabled"
-msgstr "Logovanje u sobi je sada onemogućeno"
+#: gajim/groupchat_control.py:1390
+#, fuzzy
+msgid "Conversations are not stored on the server"
+msgstr "Informacije o Vama, kako su uskladištene na serveru"
 
-#: gajim/groupchat_control.py:1452
-msgid "Room is now non-anonymous"
+#: gajim/groupchat_control.py:1393
+#, fuzzy
+msgid "Group chat is now non-anonymous"
 msgstr "Soba sada više nije anonimna"
 
-#: gajim/groupchat_control.py:1456
-msgid "Room is now semi-anonymous"
+#: gajim/groupchat_control.py:1397
+#, fuzzy
+msgid "Group chat is now semi-anonymous"
 msgstr "Soba je sada polu anonimna"
 
-#: gajim/groupchat_control.py:1460
+#: gajim/groupchat_control.py:1401
 #, fuzzy
-msgid "Room is now fully anonymous"
+msgid "Group chat is now fully anonymous"
 msgstr "Soba je sada potpuno anonimna"
 
-#: gajim/groupchat_control.py:1500
+#: gajim/groupchat_control.py:1439
 #, fuzzy, python-format
 msgid "Ping? (%s)"
 msgstr "Pong! (%s s.)"
 
-#: gajim/groupchat_control.py:1503
+#: gajim/groupchat_control.py:1442
 #, fuzzy, python-format
 msgid "Pong! (%(nick)s %(delay)s s.)"
 msgstr "Pong! (%s s.)"
 
-#: gajim/groupchat_control.py:1506 gajim/chat_control.py:1213
+#: gajim/groupchat_control.py:1445 gajim/chat_control.py:1237
 msgid "Error."
 msgstr "Greška."
 
-#: gajim/groupchat_control.py:1711
+#: gajim/groupchat_control.py:1650
 #, fuzzy, python-format
-msgid "You (%s) joined the room"
+msgid "You (%s) joined the group chat"
 msgstr "%s se pridružio grupnom razgovoru"
 
-#: gajim/groupchat_control.py:1717
-msgid "Any occupant is allowed to see your full JID"
+#: gajim/groupchat_control.py:1655
+#, fuzzy
+msgid "Any participant is allowed to see your full XMPP Address"
 msgstr "Svima prisutnima je dozvoljeno da vide vaš pun džaber ID"
 
-#: gajim/groupchat_control.py:1721
-msgid "Room logging is enabled"
-msgstr "Logovanje sobe je omogućeno"
-
-#: gajim/groupchat_control.py:1725
-msgid "The server has assigned or modified your roomnick"
+#: gajim/groupchat_control.py:1663
+#, fuzzy
+msgid "The server has assigned or modified your nickname in this group chat"
 msgstr "Server Vam je ili dodelio nadimak ili promenio postojeći"
 
-#: gajim/groupchat_control.py:1732
-msgid "A new room has been created"
+#: gajim/groupchat_control.py:1671
+#, fuzzy
+msgid "A new group chat has been created"
 msgstr "Nova soba je napravljena"
 
-#: gajim/groupchat_control.py:1740 gajim/privatechat_control.py:112
+#: gajim/groupchat_control.py:1679 gajim/privatechat_control.py:115
 #, python-format
 msgid "You are now known as %s"
 msgstr "Od sada ste poznati kao %s"
 
-#: gajim/groupchat_control.py:1742 gajim/privatechat_control.py:114
+#: gajim/groupchat_control.py:1681 gajim/privatechat_control.py:117
 #, 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:1767 gajim/privatechat_control.py:141
+#: gajim/groupchat_control.py:1706 gajim/privatechat_control.py:144
 #, fuzzy, python-brace-format
 msgid "You are now {show}{status}"
 msgstr "Od sada ste poznati kao %s"
 
-#: gajim/groupchat_control.py:1773 gajim/privatechat_control.py:147
+#: gajim/groupchat_control.py:1712 gajim/privatechat_control.py:150
 #, fuzzy, python-brace-format
 msgid "{nick} is now {show}{status}"
 msgstr "%(nick)s je trenutno %(status)s"
 
-#: gajim/groupchat_control.py:1790 gajim/groupchat_control.py:1819
-#: gajim/groupchat_control.py:1849 gajim/groupchat_control.py:1909
+#: gajim/groupchat_control.py:1729 gajim/groupchat_control.py:1758
+#: gajim/groupchat_control.py:1788 gajim/groupchat_control.py:1848
 #, python-brace-format
 msgid " by {actor}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1793
+#: gajim/groupchat_control.py:1732
 #, fuzzy, python-brace-format
 msgid "** Your Affiliation has been set to {affiliation}{actor}{reason}"
 msgstr ""
 "** Afilijacija %(nick)s je postavljena na %(affiliation)s od strane %(actor)s"
 
-#: gajim/groupchat_control.py:1799
+#: gajim/groupchat_control.py:1738
 #, fuzzy, python-brace-format
 msgid "** Affiliation of {nick} has been set to {affiliation}{actor}{reason}"
 msgstr "** Afilijacija %(nick)s je postavljena na %(affiliation)s"
 
-#: gajim/groupchat_control.py:1822
+#: gajim/groupchat_control.py:1761
 #, fuzzy, python-brace-format
 msgid "** Your Role has been set to {role}{actor}{reason}"
 msgstr "** Uloga %(nick)s je postavljena na %(role)s od strane %(actor)s"
 
-#: gajim/groupchat_control.py:1827
+#: gajim/groupchat_control.py:1766
 #, fuzzy, python-brace-format
 msgid "** Role of {nick} has been set to {role}{actor}{reason}"
 msgstr "** Uloga %(nick)s je postavljena na %(role)s od strane %(actor)s"
 
-#: gajim/groupchat_control.py:1852
+#: gajim/groupchat_control.py:1791
 #, fuzzy, python-brace-format
-msgid "You have been removed from the room{actor}{reason}"
+msgid "You have been removed from the group chat{actor}{reason}"
 msgstr "%(nick)s je izbačen iz sobe (%(reason)s)"
 
-#: gajim/groupchat_control.py:1857
+#: gajim/groupchat_control.py:1796
 #, python-brace-format
 msgid "You have left due to an error{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1863
+#: gajim/groupchat_control.py:1802
 #, python-brace-format
 msgid "You have been kicked{actor}{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1870
+#: gajim/groupchat_control.py:1809
 #, python-brace-format
 msgid "You have been banned{actor}{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1877 gajim/groupchat_control.py:1943
+#: gajim/groupchat_control.py:1816 gajim/groupchat_control.py:1882
 #, fuzzy
 msgid ": Affiliation changed"
 msgstr "vezanost izmenjena"
 
-#: gajim/groupchat_control.py:1883 gajim/groupchat_control.py:1948
+#: gajim/groupchat_control.py:1822 gajim/groupchat_control.py:1887
 #, fuzzy
-msgid ": Room configuration changed to members-only"
+msgid ": Group chat configuration changed to members-only"
 msgstr "konfiguracija sobe se promenila na \"samo članovi\""
 
-#: gajim/groupchat_control.py:1912
+#: gajim/groupchat_control.py:1851
 #, fuzzy, python-brace-format
-msgid "{nick} has been removed from the room{by}{reason}"
+msgid "{nick} has been removed from the group chat{by}{reason}"
 msgstr "%(nick)s je izbačen iz sobe (%(reason)s)"
 
-#: gajim/groupchat_control.py:1922
+#: gajim/groupchat_control.py:1861
 #, python-brace-format
 msgid "{nick} has left due to an error{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1928
+#: gajim/groupchat_control.py:1867
 #, fuzzy, python-brace-format
 msgid "{nick} has been kicked{actor}{reason}"
 msgstr "%(nick)s je izbačen: %(reason)s"
 
-#: gajim/groupchat_control.py:1936
+#: gajim/groupchat_control.py:1875
 #, fuzzy, python-brace-format
 msgid "{nick} has been banned{actor}{reason}"
 msgstr "%(nick)s ima zabranu: %(reason)s"
 
-#: gajim/groupchat_control.py:1953
+#: gajim/groupchat_control.py:1892
 #, python-brace-format
 msgid "{nick} has left{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1970
+#: gajim/groupchat_control.py:1914
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s se pridružio grupnom razgovoru"
 
-#: gajim/groupchat_control.py:1985 gajim/groupchat_control.py:1990
-#: gajim/groupchat_control.py:1995 gajim/groupchat_control.py:2000
-#: gajim/groupchat_control.py:2011
-msgid "Unable to join group chat"
-msgstr "Nije moguće pridružiti se grupnom razgovoru"
-
-#: gajim/groupchat_control.py:1986
-#, fuzzy, python-format
-msgid "You are banned from group chat <b>%s</b>."
-msgstr "Zabranjen Vam je pristup ovom grupnom razgovoru %s."
-
-#: gajim/groupchat_control.py:1991
-#, fuzzy, python-format
-msgid "Remote server <b>%s</b> does not exist."
-msgstr "Grupni razgovor.%s ne postoji."
-
-#: gajim/groupchat_control.py:1996
-#, fuzzy, python-format
-msgid "Group chat <b>%s</b> does not exist."
-msgstr "Grupni razgovor.%s ne postoji."
-
-#: gajim/groupchat_control.py:2001
-#, fuzzy
-msgid "Group chat creation is not permitted."
-msgstr "Stvaranje grupnih razgovora Vam nije dozvoljeno."
-
-#: gajim/groupchat_control.py:2005
+#: gajim/groupchat_control.py:1981
 #, fuzzy
-msgid "Unable to join groupchat"
-msgstr "Nije moguće pridružiti se grupnom razgovoru"
-
-#: gajim/groupchat_control.py:2006
-#, fuzzy, python-format
-msgid "You must use your registered nickname in <b>%s</b>."
-msgstr "Morate koristiti Vaš registrovani nadimak u grupnom razgovoru %s."
-
-#: gajim/groupchat_control.py:2012
-#, python-format
-msgid "You are not in the members list in groupchat %s."
-msgstr "Niste u listi članova grupnog razgovora %s."
-
-#: gajim/groupchat_control.py:2068
-msgid "Room has been destroyed"
+msgid "Group chat has been destroyed"
 msgstr "Soba grupnog razgovora je uništena"
 
-#: gajim/groupchat_control.py:2073
+#: gajim/groupchat_control.py:1986
 #, fuzzy, python-format
-msgid "You can join this room instead: xmpp:%s?join"
+msgid "You can join this group chat instead: xmpp:%s?join"
 msgstr "Možete se priključiti sobi %s umesto ove"
 
-#: gajim/groupchat_control.py:2306
+#: gajim/groupchat_control.py:2214
 #, fuzzy
 msgid "Leave Group Chat"
 msgstr "Napusti grupne razgovore"
 
-#: gajim/groupchat_control.py:2307
+#: gajim/groupchat_control.py:2215
 #, fuzzy
 msgid "Are you sure you want to leave this group chat?"
 msgstr "Jeste li sigurni da želite napustiti grupni razgovor \"%s\"?"
 
-#: gajim/groupchat_control.py:2308
+#: gajim/groupchat_control.py:2216
 #, fuzzy, python-format
-msgid "If you close this window, you will be disconnected from '%s'."
+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:2314
+#: gajim/groupchat_control.py:2222 gajim/roster_window.py:5177
 msgid "_Leave"
 msgstr ""
 
-#: gajim/groupchat_control.py:2377
+#: gajim/groupchat_control.py:2280 gajim/roster_window.py:3008
 #, fuzzy, python-format
 msgid "%(jid)s has been invited to this group chat"
 msgstr "%(nick)s je izbačen iz sobe (%(reason)s)"
 
-#: gajim/groupchat_control.py:2527
+#: gajim/groupchat_control.py:2463
 #, python-format
 msgid "Kicking %s"
 msgstr "Izbacujem %s"
 
-#: gajim/groupchat_control.py:2528 gajim/groupchat_control.py:2829
+#: gajim/groupchat_control.py:2464 gajim/groupchat_control.py:2765
 msgid "You may specify a reason below:"
 msgstr "Možete navesti razlog ispod:"
 
-#: gajim/groupchat_control.py:2828
+#: gajim/groupchat_control.py:2764
 #, python-format
 msgid "Banning %s"
 msgstr "Zabranjujem %s"
 
-#: gajim/chat_control.py:408
+#: gajim/chat_control.py:432
 msgid "Show a list of formattings"
 msgstr "Prikaži listu formatiranja"
 
-#: gajim/chat_control.py:412
+#: gajim/chat_control.py:436
 #, fuzzy
 msgid "This contact does not support HTML"
 msgstr "Ovak kontakt ne podržava prenos datoteka."
 
-#: gajim/chat_control.py:562
+#: gajim/chat_control.py:586
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr ""
 
-#: gajim/chat_control.py:686
+#: gajim/chat_control.py:710
 #, 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:832
+#: gajim/chat_control.py:856
 #, 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.py:1160 gajim/chat_control.py:1168
+#: gajim/chat_control.py:1184 gajim/chat_control.py:1192
 #, fuzzy
 msgid "Close"
 msgstr "_Pošalji i zatvori"
 
-#: gajim/chat_control.py:1161
+#: gajim/chat_control.py:1185
 #, fuzzy, python-format
 msgid "You just received a new message from %s"
 msgstr "\"%s\" Vam je upravo poslao poruku"
 
-#: gajim/chat_control.py:1163
+#: gajim/chat_control.py:1187
 #, fuzzy
 msgid ""
 "If you close this tab while having chat history disabled, this message will "
@@ -1201,16 +1167,16 @@ msgstr ""
 "Ako zatvorite ovaj jezičak, a istorijat razgovora nije omogućen, ova poruka "
 "će biti izgubljena."
 
-#: gajim/chat_control.py:1208
+#: gajim/chat_control.py:1232
 msgid "Ping?"
 msgstr "Ping?"
 
-#: gajim/chat_control.py:1211
+#: gajim/chat_control.py:1235
 #, fuzzy, python-format
 msgid "Pong! (%s seconds)"
 msgstr "Pong! (%s s.)"
 
-#: gajim/chat_control.py:1308
+#: gajim/chat_control.py:1332
 #, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -1219,271 +1185,279 @@ msgstr ""
 "Tema: %(subject)s\n"
 "%(message)s"
 
-#: gajim/chat_control.py:1416
+#: gajim/chat_control.py:1440
 #, fuzzy, python-format
 msgid "%(name)s is now %(show)s %(status)s"
 msgstr "%(name)s je sada %(status)s"
 
-#: gajim/chat_control.py:1476 gajim/data/gui/application_menu.ui:32
+#: gajim/chat_control.py:1500 gajim/data/gui/application_menu.ui:32
 #: gajim/gtk/http_upload_progress.py:35
 #, fuzzy
 msgid "File Transfer"
 msgstr "Prenosi datoteka"
 
-#: gajim/chat_control.py:1480
+#: gajim/chat_control.py:1504
 #, fuzzy
 msgid "Size"
 msgstr "Veličina: %s"
 
-#: gajim/chat_control.py:1482 gajim/chat_control.py:1546
+#: gajim/chat_control.py:1506 gajim/chat_control.py:1566
+#: gajim/gui_interface.py:190
 #: gajim/data/gui/groupchat_invitation_received.ui:77
-#: gajim/gtk/filetransfer.py:485
+#: gajim/gtk/filetransfer.py:490
 #, fuzzy
 msgid "_Accept"
 msgstr "_Nalozi"
 
-#: gajim/chat_control.py:1484 gajim/chat_control.py:1548
+#: gajim/chat_control.py:1508 gajim/chat_control.py:1568
 #: gajim/data/gui/groupchat_invitation_received.ui:62
 #, fuzzy
 msgid "_Decline"
 msgstr "_Nije na vezi"
 
-#: gajim/chat_control.py:1506 gajim/gui_interface.py:791
-#: gajim/gui_interface.py:821 gajim/gui_interface.py:847
+#: gajim/chat_control.py:1530 gajim/gui_interface.py:777
+#: gajim/gui_interface.py:807 gajim/gui_interface.py:833
 #: gajim/gtk/notification.py:173 gajim/gtk/notification.py:278
 msgid "File Transfer Completed"
 msgstr "Prenos datoteke završen"
 
-#: gajim/chat_control.py:1510 gajim/gtk/filetransfer.py:259
+#: gajim/chat_control.py:1534 gajim/gtk/filetransfer.py:258
 #, fuzzy
 msgid "Open _Folder"
 msgstr "_Otvori sadržavajuću fasciklu"
 
-#: gajim/chat_control.py:1512 gajim/chat_control.py:1521
+#: gajim/chat_control.py:1536 gajim/chat_control.py:1545
+#: gajim/data/gui/groupchat_control.ui:962
+#: gajim/data/gui/groupchat_control.ui:1049
+#: gajim/data/gui/groupchat_control.ui:1155
 #, fuzzy
 msgid "_Close"
 msgstr "_Pošalji i zatvori"
 
-#: gajim/chat_control.py:1543 gajim/gui_interface.py:484
+#: gajim/chat_control.py:1563 gajim/gui_interface.py:473
+#: gajim/data/gui/groupchat_invitation_received.ui:42
 #: gajim/gtk/notification.py:174 gajim/gtk/notification.py:195
 #: gajim/gtk/notification.py:281
-msgid "Groupchat Invitation"
+#, fuzzy
+msgid "Group Chat Invitation"
 msgstr "Poziv na grupni razgovor"
 
-#: gajim/chat_control.py:1568 gajim/roster_window.py:1954
+#: gajim/chat_control.py:1588 gajim/roster_window.py:1951
 msgid "Remote contact stopped transfer"
 msgstr "Udaljeni kontakt je prekinuo prenos"
 
-#: gajim/chat_control.py:1570 gajim/roster_window.py:1956
+#: gajim/chat_control.py:1590 gajim/roster_window.py:1953
 msgid "Error opening file"
 msgstr "Greška pri otvaranju datoteke"
 
-#: gajim/chat_control.py:1572 gajim/gtk/filetransfer.py:297
+#: gajim/chat_control.py:1592 gajim/gtk/filetransfer.py:296
 msgid "File transfer stopped"
 msgstr "Prenos datoteke zaustavljen"
 
-#: gajim/chat_control.py:1575 gajim/gtk/filetransfer.py:275
-#: gajim/gtk/filetransfer.py:284
+#: gajim/chat_control.py:1595 gajim/gtk/filetransfer.py:274
+#: gajim/gtk/filetransfer.py:283
 msgid "File transfer cancelled"
 msgstr "Prenos datoteke prekinut"
 
-#: gajim/chat_control.py:1576
+#: gajim/chat_control.py:1596
 msgid "Connection with peer cannot be established."
 msgstr "Nije moguće uspostaviti vezu sa drugom stranom."
 
-#: gajim/application.py:72
+#: gajim/application.py:75
 #, fuzzy
 msgid "Show the application's version"
 msgstr "Notification-daemon"
 
-#: gajim/application.py:79
+#: gajim/application.py:82
 #, fuzzy
 msgid "Show only critical errors"
 msgstr "Prikaži događaj u listi kontakata"
 
-#: gajim/application.py:86
+#: gajim/application.py:89
 msgid "Separate profile files completely (even history database and plugins)"
 msgstr ""
 
-#: gajim/application.py:94
+#: gajim/application.py:97
 msgid "Print XML stanzas and other debug information"
 msgstr ""
 
-#: gajim/application.py:101
+#: gajim/application.py:104
 #, fuzzy
 msgid "Use defined profile in configuration directory"
 msgstr "Napredna izmena konfiguracije"
 
-#: gajim/application.py:109
+#: gajim/application.py:112
 #, fuzzy
 msgid "Set configuration directory"
 msgstr "Konfiguracija sobe"
 
-#: gajim/application.py:117
+#: gajim/application.py:120
 msgid "Configure logging system"
 msgstr ""
 
-#: gajim/application.py:125
+#: gajim/application.py:128
 #, fuzzy
 msgid "Show all warnings"
 msgstr "Prikaži sv_e događaje na čekanju"
 
-#: gajim/application.py:132
+#: gajim/application.py:135
 msgid "Open IPython shell"
 msgstr ""
 
-#: gajim/application.py:139
+#: gajim/application.py:142
 msgid "Pops up a window with the next pending event"
 msgstr "Iskače prozor sa sledećim događajem na čekanju"
 
-#: gajim/application.py:145 gajim/data/gui/shortcuts_window.ui:203
+#: gajim/application.py:148 gajim/data/gui/shortcuts_window.ui:203
 #: data/org.gajim.Gajim.desktop.in:21
 #, fuzzy
 msgid "Start a new chat"
 msgstr "Započni razgovor"
 
-#: gajim/application.py:152
+#: gajim/application.py:155
 msgid "Simulate loss of connectivity"
 msgstr ""
 
-#: gajim/application.py:159
+#: gajim/application.py:162
 msgid "Simulate regaining connectivity"
 msgstr ""
 
-#: gajim/application.py:201 gajim/gui_interface.py:133
+#: gajim/application.py:204 gajim/gui_interface.py:133
 msgid "Database Error"
 msgstr "Greška sa bazom podataka"
 
-#: gajim/roster_window.py:294 gajim/roster_window.py:1030
+#: gajim/roster_window.py:291 gajim/roster_window.py:1027
 msgid "Merged accounts"
 msgstr "Spojeni nalozi"
 
-#: gajim/roster_window.py:853 gajim/roster_window.py:1631
-#: gajim/roster_window.py:1664 gajim/roster_window.py:1715
-#: gajim/roster_window.py:1717 gajim/roster_window.py:1872
-#: gajim/roster_window.py:2531 gajim/roster_window.py:5025
-#: gajim/common/contacts.py:188 gajim/common/contacts.py:447
-#: gajim/common/helpers.py:83 gajim/gtk/discovery.py:129
-#: gajim/gtk/discovery.py:130 gajim/gtk/discovery.py:1416
+#: gajim/roster_window.py:850 gajim/roster_window.py:1628
+#: gajim/roster_window.py:1661 gajim/roster_window.py:1712
+#: gajim/roster_window.py:1714 gajim/roster_window.py:1869
+#: gajim/roster_window.py:2528 gajim/roster_window.py:4331
+#: gajim/roster_window.py:4964 gajim/common/contacts.py:204
+#: gajim/common/contacts.py:463 gajim/common/helpers.py:86
+#: gajim/gtk/discovery.py:127 gajim/gtk/discovery.py:128
+#: gajim/gtk/discovery.py:1414
 msgid "Transports"
 msgstr "Prenosi"
 
-#: gajim/roster_window.py:1723 gajim/roster_window.py:1725
-#: gajim/roster_window.py:4995 gajim/gui_interface.py:1613
-#: gajim/gui_interface.py:1639 gajim/common/contacts.py:186
-#: gajim/common/helpers.py:83 gajim/common/modules/adhoc_commands.py:245
-msgid "Groupchats"
+#: gajim/roster_window.py:1720 gajim/roster_window.py:1722
+#: gajim/roster_window.py:4331 gajim/roster_window.py:4934
+#: gajim/gui_interface.py:1527 gajim/common/contacts.py:202
+#: gajim/common/helpers.py:86 gajim/common/modules/adhoc_commands.py:245
+#, fuzzy
+msgid "Group chats"
 msgstr "Grupni razgovori"
 
-#: gajim/roster_window.py:2012
+#: gajim/roster_window.py:2009
 #, fuzzy
 msgid "Authorization sent"
 msgstr "Autorizacija poslata"
 
-#: gajim/roster_window.py:2013
+#: gajim/roster_window.py:2010
 #, fuzzy, python-format
 msgid "\"%s\" will now see your status."
 msgstr "Sada će kontakt \"%s\" znati Vaš status."
 
-#: gajim/roster_window.py:2031
+#: gajim/roster_window.py:2028
 msgid "Subscription request has been sent"
 msgstr "Zahtev za pretplatom poslat"
 
-#: gajim/roster_window.py:2032
-#, python-format
-msgid "If \"%s\" accepts this request you will know his or her status."
+#: gajim/roster_window.py:2029
+#, 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:2046
+#: gajim/roster_window.py:2043
 #, fuzzy
 msgid "Authorization removed"
 msgstr "Autorizacija uklonjena"
 
-#: gajim/roster_window.py:2047
+#: gajim/roster_window.py:2044
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Sada će Vas kontakt \"%s\" uvek videti kao da niste na vezi."
 
-#: gajim/roster_window.py:2250 gajim/roster_window.py:3504
+#: gajim/roster_window.py:2247 gajim/roster_window.py:3460
 msgid "Disconnect for Invisibility"
 msgstr ""
 
-#: gajim/roster_window.py:2251 gajim/roster_window.py:3505
+#: gajim/roster_window.py:2248 gajim/roster_window.py:3461
 msgid "You are participating in one or more group chats"
 msgstr "Učestvujete u jednom ili više grupnih razgovora"
 
-#: gajim/roster_window.py:2252 gajim/roster_window.py:3506
+#: gajim/roster_window.py:2249 gajim/roster_window.py:3462
 #, fuzzy
 msgid ""
-"Changing your status to invisible will result in disconnection from those "
-"group chats.\n"
+"Changing your status to invisible will result in you leaving those group "
+"chats.\n"
 "Are you sure you want to go invisible?"
 msgstr ""
 "Promena Vašeg statusa u Nevidljiv će rezultovati  odvezivanjem sa tih "
 "grupnih razgovora. Jeste li sigurni da želite ići na nevidljivo?"
 
-#: gajim/roster_window.py:2257 gajim/roster_window.py:3512
-#: gajim/roster_window.py:5238 gajim/data/gui/gc_control_popup_menu.ui:120
+#: gajim/roster_window.py:2254 gajim/roster_window.py:3468
+#: gajim/data/gui/gc_control_popup_menu.ui:120
 msgid "_Disconnect"
 msgstr "_Izloguj se"
 
-#: gajim/roster_window.py:2285
+#: gajim/roster_window.py:2282
 #, fuzzy
 msgid "desynced"
 msgstr "desinhronizovan"
 
-#: gajim/roster_window.py:2353 gajim/data/gui/shortcuts_window.ui:224
+#: gajim/roster_window.py:2350 gajim/data/gui/shortcuts_window.ui:224
 #, fuzzy
 msgid "Quit Gajim"
 msgstr "Gajim"
 
-#: gajim/roster_window.py:2354
+#: gajim/roster_window.py:2351
 #, fuzzy
 msgid "You are about to quit Gajim"
 msgstr "Jeste li sigurni da želite zatvoriti Gajim?"
 
-#: gajim/roster_window.py:2355
+#: gajim/roster_window.py:2352
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Jeste li sigurni da želite zatvoriti Gajim?"
 
-#: gajim/roster_window.py:2356
+#: gajim/roster_window.py:2353
 #, fuzzy
 msgid "_Always quit when closing Gajim"
 msgstr "Uvek zatvori Gajim"
 
-#: gajim/roster_window.py:2359 gajim/roster_window.py:2455
-#: gajim/roster_window.py:2495 gajim/data/gui/systray_context_menu.ui:90
+#: gajim/roster_window.py:2356 gajim/roster_window.py:2452
+#: gajim/roster_window.py:2492 gajim/data/gui/systray_context_menu.ui:83
 #, fuzzy
 msgid "_Quit"
 msgstr "_Izlaz"
 
-#: gajim/roster_window.py:2448
+#: gajim/roster_window.py:2445
 #, fuzzy
 msgid "Stop File Transfers"
 msgstr "Prenosi datoteka"
 
-#: gajim/roster_window.py:2449
+#: gajim/roster_window.py:2446
 #, fuzzy
 msgid "You still have running file transfers"
 msgstr "Prekini prenos datoteke"
 
-#: gajim/roster_window.py:2450
+#: gajim/roster_window.py:2447
 msgid ""
 "If you quit now, the file(s) being transferred will be lost.\n"
 "Do you still want to quit?"
 msgstr ""
 
-#: gajim/roster_window.py:2488
+#: gajim/roster_window.py:2485
 #, fuzzy
 msgid "Unread Messages"
 msgstr "Nepročitani događaji"
 
-#: gajim/roster_window.py:2489
+#: gajim/roster_window.py:2486
 #, fuzzy
 msgid "You still have unread messages"
 msgstr "Imate nepročitanih poruka"
 
-#: gajim/roster_window.py:2490
+#: gajim/roster_window.py:2487
 #, fuzzy
 msgid ""
 "Messages will only be available for reading them later if storing chat "
@@ -1492,20 +1466,20 @@ msgstr ""
 "Poruke će biti dostupne za čitanje i kasnije ako imate omogućen istorijat i "
 "taj kontakt u listi."
 
-#: gajim/roster_window.py:2760
+#: gajim/roster_window.py:2753
 msgid "You have unread messages"
 msgstr "Imate nepročitanih poruka"
 
-#: gajim/roster_window.py:2761
+#: gajim/roster_window.py:2754
 msgid "You must read them before removing this transport."
 msgstr "Morate ih pročitati pre uklanjanja ovog transporta."
 
-#: gajim/roster_window.py:2764
+#: gajim/roster_window.py:2757
 #, fuzzy, python-format
 msgid "Transport '%s' will be removed"
 msgstr "Transport \"%s\" će biti uklonjen"
 
-#: gajim/roster_window.py:2765
+#: gajim/roster_window.py:2758
 #, fuzzy
 msgid ""
 "You will no longer be able to send and receive messages from and to contacts "
@@ -1514,11 +1488,11 @@ msgstr ""
 "Nećete više biti u mogućnosti da razmenjujete poruke sa kontkatima sa ovog "
 "transporta."
 
-#: gajim/roster_window.py:2768
+#: gajim/roster_window.py:2761
 msgid "Transports will be removed"
 msgstr "Transport će biti uklonjen"
 
-#: gajim/roster_window.py:2773
+#: gajim/roster_window.py:2766
 #, fuzzy, python-format
 msgid ""
 "You will no longer be able to send and receive messages from and to contacts "
@@ -1528,22 +1502,22 @@ msgstr ""
 "Nećete više biti u mogućnosti da razmenjujete poruke sa kontkatima sa ovog "
 "transporta."
 
-#: gajim/roster_window.py:2777
+#: gajim/roster_window.py:2770
 #, fuzzy
 msgid "Remove Transport"
 msgstr "Prikaži trans_porte"
 
-#: gajim/roster_window.py:2844
+#: gajim/roster_window.py:2837
 #, fuzzy
 msgid "Block Contact"
 msgstr "Blokirani kontakti"
 
-#: gajim/roster_window.py:2845
+#: gajim/roster_window.py:2838
 #, fuzzy
 msgid "Really block this contact?"
 msgstr "Da li je OpenPGP omogućen za ovaj kontakt?"
 
-#: gajim/roster_window.py:2846
+#: gajim/roster_window.py:2839
 #, fuzzy
 msgid ""
 "This contact will see you offline and you will not receive any messages sent "
@@ -1552,64 +1526,59 @@ msgstr ""
 "Kontakt će vas videti kao da niste na vezi i nećete dobijati poruke koje vam "
 "šalje."
 
-#: gajim/roster_window.py:2851
+#: gajim/roster_window.py:2844
 #, fuzzy
 msgid "_Block Contact"
 msgstr "Blokirani kontakti"
 
-#: gajim/roster_window.py:2896
+#: gajim/roster_window.py:2889
 msgid "Rename Contact"
 msgstr "Preimenuj kontakt"
 
-#: gajim/roster_window.py:2897
+#: gajim/roster_window.py:2890
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Unesite novi nadimak za kontakt %s"
 
-#: gajim/roster_window.py:2904
+#: gajim/roster_window.py:2897
 msgid "Rename Group"
 msgstr "Preimenuj grupu"
 
-#: gajim/roster_window.py:2905
+#: gajim/roster_window.py:2898
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Unesite novo ime za grupu %s"
 
-#: gajim/roster_window.py:2953 gajim/roster_window.py:2954
+#: gajim/roster_window.py:2946 gajim/roster_window.py:2947
 msgid "Remove Group"
 msgstr "Ukloni grupu"
 
-#: gajim/roster_window.py:2955
+#: gajim/roster_window.py:2948
 #, fuzzy, python-format
 msgid "Do you want to remove %s from the contact list?"
 msgstr "Želite li ukloniti grupu %s sa liste kontakata?"
 
-#: gajim/roster_window.py:2956
+#: gajim/roster_window.py:2949
 #, fuzzy
 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:3044
-#, fuzzy, python-format
-msgid "%(jid)s has been invited in this room"
-msgstr "%(nick)s je izbačen iz sobe (%(reason)s)"
-
-#: gajim/roster_window.py:3353
+#: gajim/roster_window.py:3309
 #, fuzzy
 msgid "Remove Contact"
 msgstr "Preimenuj kontakt"
 
-#: gajim/roster_window.py:3354
+#: gajim/roster_window.py:3310
 #, fuzzy
 msgid "Remove contact from contact list"
 msgstr "Uklanja kontakt sa liste"
 
-#: gajim/roster_window.py:3355
+#: gajim/roster_window.py:3311
 #, 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:3364 gajim/roster_window.py:3384
+#: gajim/roster_window.py:3320 gajim/roster_window.py:3340
 #, fuzzy
 msgid ""
 "By removing this contact you also remove authorization. This means the "
@@ -1619,21 +1588,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:3375
+#: gajim/roster_window.py:3331
 msgid "Do you want to continue?"
 msgstr "Da li želite da nastavite?"
 
-#: gajim/roster_window.py:3386
+#: gajim/roster_window.py:3342
 #, 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:3393
+#: gajim/roster_window.py:3349
 #, fuzzy
 msgid "Remove contacts from contact list"
 msgstr "Uklanja kontakt sa liste"
 
-#: gajim/roster_window.py:3399
+#: gajim/roster_window.py:3355
 #, fuzzy, python-format
 msgid ""
 "By removing the following contacts, you will also remove authorization. This "
@@ -1645,26 +1614,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:3403
+#: gajim/roster_window.py:3359
 #, fuzzy
 msgid "Remove Contacts"
 msgstr "Preimenuj kontakt"
 
-#: gajim/roster_window.py:3423
+#: gajim/roster_window.py:3379
 msgid "No account available"
 msgstr "Nema dostupnih naloga"
 
-#: gajim/roster_window.py:3424
+#: gajim/roster_window.py:3380
 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:4060
+#: gajim/roster_window.py:4011
 msgid "Metacontacts storage not supported by your server"
 msgstr "Čuvanje pseudokontakata nije podržano od strane Vašeg servera"
 
-#: gajim/roster_window.py:4062
+#: gajim/roster_window.py:4013
 #, fuzzy
 msgid ""
 "Your server does not support storing metacontacts information. So this "
@@ -1673,13 +1642,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:4159
+#: gajim/roster_window.py:4110
 #, fuzzy
 msgid "You are about to create a metacontact"
 msgstr ""
 "Upravo ćete napraviti pseudokontkat. Jeste li sigurni da želite nastaviti?"
 
-#: gajim/roster_window.py:4160
+#: gajim/roster_window.py:4111
 #, fuzzy
 msgid ""
 "Metacontacts are a way to regroup several contacts in one single contact. "
@@ -1690,26 +1659,26 @@ msgstr ""
 "Generalno, oni se koriste kada ista osoba ima nekoliko Džaber naloga ili "
 "transportnih naloga."
 
-#: gajim/roster_window.py:4164
+#: gajim/roster_window.py:4115
 #, fuzzy
 msgid "Create Metacontact"
 msgstr "Preimenuj kontakt"
 
-#: gajim/roster_window.py:4170
+#: gajim/roster_window.py:4121 gajim/data/gui/groupchat_creation.ui:317
 #, fuzzy
 msgid "_Create"
 msgstr "Kreativan"
 
-#: gajim/roster_window.py:4287
+#: gajim/roster_window.py:4238
 msgid "Invalid file URI:"
 msgstr "Neispravan URI datoteke:"
 
-#: gajim/roster_window.py:4298
+#: gajim/roster_window.py:4249
 #, fuzzy
 msgid "Send file?"
 msgstr "Pošalji _datoteku"
 
-#: gajim/roster_window.py:4299
+#: gajim/roster_window.py:4250
 #, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
@@ -1717,98 +1686,89 @@ 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:4451
+#: gajim/roster_window.py:4401
 #, fuzzy, python-format
 msgid "Send %(from)s to %(to)s"
 msgstr "Pošalji %s za %s"
 
-#: gajim/roster_window.py:4464
+#: gajim/roster_window.py:4414
 #, fuzzy, python-format
 msgid "Make %s first contact"
 msgstr "Napravi metakontakte od %s i %s"
 
-#: gajim/roster_window.py:4469
+#: gajim/roster_window.py:4419
 #, fuzzy, python-format
 msgid "Make %(contact1)s and %(contact2)s metacontacts"
 msgstr "Napravi metakontakte od %s i %s"
 
-#: gajim/roster_window.py:4825 gajim/roster_window.py:4923
+#: gajim/roster_window.py:4775 gajim/roster_window.py:4862
 msgid "_Change Status Message"
 msgstr "_Izmeni statusnu poruku"
 
-#: gajim/roster_window.py:4845
+#: gajim/roster_window.py:4795
 msgid "Publish Tune"
 msgstr "Objavi pesmu"
 
-#: gajim/roster_window.py:4856
+#: gajim/roster_window.py:4806
 #, fuzzy
 msgid "Publish Location"
 msgstr "Objavi pesmu"
 
-#: gajim/roster_window.py:4868
-#, fuzzy
-msgid "Configure Services…"
-msgstr "Konfiguriši servise..."
-
-#: gajim/roster_window.py:4997
+#: gajim/roster_window.py:4936
 msgid "_Maximize All"
 msgstr "_Uvećaj sve"
 
-#: gajim/roster_window.py:5004 gajim/roster_window.py:5146
+#: gajim/roster_window.py:4943 gajim/roster_window.py:5085
 msgid "Send Group M_essage"
 msgstr "P_ošalji grupnu poruku"
 
-#: gajim/roster_window.py:5011
+#: gajim/roster_window.py:4950
 msgid "To all users"
 msgstr "Svim korisnicima"
 
-#: gajim/roster_window.py:5015
+#: gajim/roster_window.py:4954
 msgid "To all online users"
 msgstr "Svim korisnicima na vezi"
 
-#: gajim/roster_window.py:5027 gajim/roster_window.py:5152
+#: gajim/roster_window.py:4966 gajim/roster_window.py:5091
 #: gajim/data/gui/gc_occupants_menu.ui:110
 #: gajim/data/gui/contact_context_menu.ui:36
 msgid "In_vite to"
 msgstr "Pozo_vi u"
 
-#: gajim/roster_window.py:5162
+#: gajim/roster_window.py:5101
 msgid "_Manage Contacts"
 msgstr "_Upravljanje kontaktima"
 
-#: gajim/roster_window.py:5168
+#: gajim/roster_window.py:5107
 #, fuzzy
 msgid "Edit _Groups…"
 msgstr "Izmeni _grupe"
 
-#: gajim/roster_window.py:5189 gajim/data/gui/filetransfers.ui:12
+#: gajim/roster_window.py:5128 gajim/data/gui/filetransfers.ui:12
 #: gajim/data/gui/remove_account_window.ui:134
 msgid "_Remove"
 msgstr "_Ukloni"
 
-#: gajim/roster_window.py:5226
+#: gajim/roster_window.py:5165
 msgid "_Maximize"
 msgstr "_Uvećaj"
 
-#: gajim/roster_window.py:5233
+#: gajim/roster_window.py:5172
 msgid "_Reconnect"
 msgstr "U_loguj se ponovo"
 
-#: gajim/roster_window.py:5254 gajim/data/gui/gc_occupants_menu.ui:170
+#: gajim/roster_window.py:5193 gajim/data/gui/gc_occupants_menu.ui:170
 #: gajim/data/gui/gc_control_popup_menu.ui:113
 #: gajim/data/gui/contact_context_menu.ui:205
 msgid "_History"
 msgstr "_Istorijat"
 
-#: gajim/roster_window.py:5335 gajim/data/gui/application_menu.ui:86
+#: gajim/roster_window.py:5274 gajim/data/gui/application_menu.ui:83
 #: gajim/data/gui/history_window.ui:57
 msgid "History Manager"
 msgstr "Upravnik istorijatom"
 
-#: gajim/roster_window.py:5343
-msgid "_Join New Group Chat"
-msgstr "_Pridruživanje novom grupnom razgovoru"
-
 #: gajim/dataforms_widget.py:585
 #, fuzzy
 msgid "Unable to load image"
@@ -1932,225 +1892,242 @@ msgstr "Tema: %s\n"
 msgid "Write a message…"
 msgstr "Nova Privatna Poruka"
 
-#: gajim/message_window.py:250
+#: gajim/message_window.py:356
+#, fuzzy
+msgid "Close Tabs"
+msgstr "_Pošalji i zatvori"
+
+#: gajim/message_window.py:357
 msgid "You are going to close several tabs"
 msgstr "Zatvorićete nekoliko jezičaka"
 
-#: gajim/message_window.py:251
+#: gajim/message_window.py:358
 msgid "Do you really want to close them all?"
 msgstr "Da li zaista želite da ih sve zatvorite?"
 
-#: gajim/message_window.py:539
+#: gajim/message_window.py:514
 #, fuzzy
 msgid "?Noun:Chats"
 msgstr "Grupni razgovori"
 
-#: gajim/message_window.py:543
+#: gajim/message_window.py:518
 #, fuzzy
 msgid "Group Chats"
 msgstr "Grupni razgovori"
 
-#: gajim/message_window.py:547
+#: gajim/message_window.py:522
 msgid "Private Chats"
 msgstr "Privatni Razgovori"
 
-#: gajim/message_window.py:553
+#: gajim/message_window.py:528
 msgid "Messages"
 msgstr "Poruke"
 
-#: gajim/gui_interface.py:173
+#: gajim/gui_interface.py:170
+#, 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:175
 msgid "Do you accept this request?"
 msgstr "Prihvatate li ovaj zahtev?"
 
-#: gajim/gui_interface.py:175
-#, python-format
-msgid "Do you accept this request on account %s?"
+#: gajim/gui_interface.py:177
+#, fuzzy, python-format
+msgid "Do you accept this request (account: %s)?"
 msgstr "Prihvatate li ovaj zahtev na nalogu %s?"
 
-#: gajim/gui_interface.py:178
-#, 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:182
+#, fuzzy
+msgid "Authorization"
+msgstr "Autorizacija poslata"
+
+#: gajim/gui_interface.py:186 gajim/gui_interface.py:420
+#: gajim/gtk/filetransfer.py:338
+#, fuzzy
+msgid "_No"
+msgstr "Ništa"
 
-#: gajim/gui_interface.py:194 gajim/gtk/notification.py:175
+#: gajim/gui_interface.py:205 gajim/gtk/notification.py:175
 #: gajim/gtk/notification.py:197
 msgid "Connection Failed"
 msgstr "Veza prekinuta"
 
-#: gajim/gui_interface.py:279 gajim/gui_interface.py:529
-msgid "Password Required"
-msgstr "Lozinka zahtevana"
-
-#: gajim/gui_interface.py:280
-#, python-format
-msgid "A Password is required to join the room %s. Please type it."
-msgstr "Lozinka potrebna za pridruživanje grupnom razgovoru %s. Unesite je."
-
-#: gajim/gui_interface.py:342 gajim/gui_interface.py:346
+#: gajim/gui_interface.py:325 gajim/gui_interface.py:329
 #, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr "Greška %(code)s: %(msg)s"
 
-#: gajim/gui_interface.py:357 gajim/gui_interface.py:376
+#: gajim/gui_interface.py:340 gajim/gui_interface.py:359
 #: gajim/common/modules/message.py:122
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "greška prilikom slanja %(message)s ( %(error)s )"
 
-#: gajim/gui_interface.py:401 gajim/gtk/notification.py:175
+#: gajim/gui_interface.py:384 gajim/gtk/notification.py:175
 msgid "Subscription request"
 msgstr "Zahtev za pretplatom"
 
-#: gajim/gui_interface.py:413 gajim/common/contacts.py:184
-#: gajim/common/helpers.py:83
+#: gajim/gui_interface.py:396 gajim/common/contacts.py:200
+#: gajim/common/helpers.py:86
 msgid "Observers"
 msgstr "Posmatrači"
 
-#: gajim/gui_interface.py:422
+#: gajim/gui_interface.py:405
 msgid "Authorization accepted"
 msgstr "Autorizacija prihvaćena"
 
-#: gajim/gui_interface.py:423
+#: gajim/gui_interface.py:406
 #, 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:431
-#, python-format
-msgid "Contact \"%s\" removed subscription from you"
+#: gajim/gui_interface.py:415
+#, fuzzy
+msgid "Subscription Removed"
+msgstr "Zahtev za pretplatom"
+
+#: gajim/gui_interface.py:416
+#, fuzzy, python-format
+msgid "Contact '%s' removed subscription from you"
 msgstr "Kontakt \"%s\" je ukinuo pretplatu na njega"
 
-#: gajim/gui_interface.py:432
+#: gajim/gui_interface.py:417
 #, fuzzy
 msgid ""
-"You will always see them as offline.\n"
+"You will always see this contact as offline.\n"
 "Do you want to remove them from your contact list?"
 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:453 gajim/gtk/notification.py:176
+#: gajim/gui_interface.py:442 gajim/gtk/notification.py:176
 msgid "Unsubscribed"
 msgstr "Ukinuta pretplata"
 
-#: gajim/gui_interface.py:465
+#: gajim/gui_interface.py:454
 #, python-format
 msgid "%(jid)s declined the invitation: %(reason)s"
 msgstr ""
 
-#: gajim/gui_interface.py:469
+#: gajim/gui_interface.py:458
 #, python-format
 msgid "%(jid)s declined the invitation"
 msgstr ""
 
-#: gajim/gui_interface.py:485
+#: gajim/gui_interface.py:474
 #, fuzzy, python-brace-format
 msgid "You are invited to {room} by {user}"
 msgstr "Pozvani ste u grupni razgovor"
 
-#: gajim/gui_interface.py:506
+#: gajim/gui_interface.py:495
 #, fuzzy
 msgid "Certificate Passphrase Required"
 msgstr "Sertifikat je istekao"
 
-#: gajim/gui_interface.py:507
+#: gajim/gui_interface.py:496
 #, 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:516 gajim/gtk/accounts.py:963
+#: gajim/gui_interface.py:505 gajim/gtk/accounts.py:966
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Unesite Vašu lozinku za račun %s"
 
-#: gajim/gui_interface.py:529 gajim/gtk/accounts.py:964
+#: gajim/gui_interface.py:518
+msgid "Password Required"
+msgstr "Lozinka zahtevana"
+
+#: gajim/gui_interface.py:518 gajim/gtk/accounts.py:967
 msgid "Save password"
 msgstr "Sačuvaj lozinku"
 
-#: gajim/gui_interface.py:601 gajim/gui_interface.py:632
+#: gajim/gui_interface.py:587 gajim/gui_interface.py:618
+#: gajim/gtk/filetransfer.py:332 gajim/gtk/filetransfer.py:333
 #: gajim/gtk/notification.py:173 gajim/gtk/notification.py:276
 msgid "File Transfer Error"
 msgstr "Greška pri prenosu datoteke"
 
-#: gajim/gui_interface.py:666
+#: gajim/gui_interface.py:652
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s Vam želi poslati datoteku."
 
-#: gajim/gui_interface.py:668 gajim/gtk/filetransfer.py:479
+#: gajim/gui_interface.py:654 gajim/gtk/filetransfer.py:484
 #: gajim/gtk/notification.py:172 gajim/gtk/notification.py:274
 msgid "File Transfer Request"
 msgstr "Zahtev za prenosom datoteke"
 
-#: gajim/gui_interface.py:767
+#: gajim/gui_interface.py:753
 #, fuzzy
 msgid "Remote Contact Stopped Transfer"
 msgstr "Udaljeni kontakt je prekinuo prenos"
 
-#: gajim/gui_interface.py:772
+#: gajim/gui_interface.py:758
 #, fuzzy
 msgid "Error Opening File"
 msgstr "Greška pri otvaranju datoteke"
 
-#: gajim/gui_interface.py:782
+#: gajim/gui_interface.py:768
 #, fuzzy
 msgid "SSL Certificate Error"
 msgstr "Greška SSL sertifikata"
 
-#: gajim/gui_interface.py:795 gajim/gui_interface.py:826
-#: gajim/gui_interface.py:853 gajim/gtk/notification.py:174
+#: gajim/gui_interface.py:781 gajim/gui_interface.py:812
+#: gajim/gui_interface.py:839 gajim/gtk/notification.py:174
 #: gajim/gtk/notification.py:279
 msgid "File Transfer Stopped"
 msgstr "Prenos datoteke zaustavljen"
 
-#: gajim/gui_interface.py:799
+#: gajim/gui_interface.py:785
 #, fuzzy
 msgid "File Transfer Failed"
 msgstr "Prenosi datoteka"
 
-#: gajim/gui_interface.py:822
+#: gajim/gui_interface.py:808
 #, 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:827
+#: gajim/gui_interface.py:813
 #, 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:833
+#: gajim/gui_interface.py:819
 #, 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:848
+#: gajim/gui_interface.py:834
 #, 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:854
+#: gajim/gui_interface.py:840
 #, 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:860
+#: gajim/gui_interface.py:846
 #, 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:971
+#: gajim/gui_interface.py:957
 msgid "Username Conflict"
 msgstr "Konflikt korisničkog imena"
 
-#: gajim/gui_interface.py:972
+#: gajim/gui_interface.py:958
 msgid "Please type a new username for your local account"
 msgstr "Molimo Vas unesite novo korisničko ime za Vaš lokalni nalog"
 
-#: gajim/gui_interface.py:995
+#: gajim/gui_interface.py:981
 msgid "Resource Conflict"
 msgstr "Konflikt resursa"
 
-#: gajim/gui_interface.py:996
+#: gajim/gui_interface.py:982
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
@@ -2158,31 +2135,31 @@ msgstr ""
 "Već ste konektovani na ovaj nalog sa istim resursem. Molimo Vas, otkucajte "
 "novo ime resursa"
 
-#: gajim/gui_interface.py:1053
+#: gajim/gui_interface.py:1039
 #, fuzzy, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s Vam želi poslati datoteku."
 
-#: gajim/gui_interface.py:1055
+#: gajim/gui_interface.py:1041
 #, fuzzy
 msgid "Voice Chat Request"
 msgstr "Zahtev za prenosom datoteke"
 
-#: gajim/gui_interface.py:1123 gajim/gtk/account_wizard.py:312
+#: gajim/gui_interface.py:1109 gajim/gtk/account_wizard.py:312
 msgid "Certificate Already in File"
 msgstr "Sertifikat je već u datoteci"
 
-#: gajim/gui_interface.py:1124 gajim/gtk/account_wizard.py:313
+#: gajim/gui_interface.py:1110 gajim/gtk/account_wizard.py:313
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr "Sertifikat je već u datoteci %s, pa nije ponovo dodat."
 
-#: gajim/gui_interface.py:1145
+#: gajim/gui_interface.py:1131
 #, fuzzy, python-format
 msgid "The authenticity of the %s certificate could be invalid"
 msgstr "Autentičnost sertifikata %s može biti neispravna."
 
-#: gajim/gui_interface.py:1148
+#: gajim/gui_interface.py:1134
 #, python-format
 msgid ""
 "\n"
@@ -2191,7 +2168,7 @@ msgstr ""
 "\n"
 "Nepoznata SSL greška: %d"
 
-#: gajim/gui_interface.py:1150
+#: gajim/gui_interface.py:1136
 #, python-format
 msgid ""
 "\n"
@@ -2200,11 +2177,11 @@ msgstr ""
 "\n"
 "SSL greška: <b>%s</b>"
 
-#: gajim/gui_interface.py:1155
+#: gajim/gui_interface.py:1141
 msgid "Error verifying SSL certificate"
 msgstr "Greška pri verifikaciji SSL sertifikata"
 
-#: gajim/gui_interface.py:1156
+#: gajim/gui_interface.py:1142
 #, fuzzy, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your XMPP server: "
@@ -2215,7 +2192,7 @@ msgstr ""
 "servera:%(error)s\n"
 "Da li i dalje želite da se konektujete na ovaj server?"
 
-#: gajim/gui_interface.py:1160 gajim/gtk/account_wizard.py:412
+#: gajim/gui_interface.py:1146 gajim/gtk/account_wizard.py:413
 #, fuzzy, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -2228,203 +2205,196 @@ msgstr ""
 "SHA1 otisak ovog sertifikata:\n"
 "%s"
 
-#: gajim/gui_interface.py:1166
+#: gajim/gui_interface.py:1152
 msgid "Ignore this error for this certificate."
 msgstr "Ignoriši ovu grešku za ovaj sertifikat."
 
-#: gajim/gui_interface.py:1174
+#: gajim/gui_interface.py:1160
 #, fuzzy, python-format
 msgid "SSL Certificate Verification for %s"
 msgstr "Greška SSL sertifikata"
 
-#: gajim/gui_interface.py:1442 gajim/gtk/join_groupchat.py:235
-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/gui_interface.py:1448
-#, fuzzy
-msgid "JID is not a Groupchat"
-msgstr "Ovo nije grupni razgovor"
-
-#: gajim/gui_interface.py:1579
-msgid "This is not a group chat"
-msgstr "Ovo nije grupni razgovor"
-
-#: gajim/gui_interface.py:1580
-#, python-format
-msgid ""
-"%(room_jid)s is already in your roster. Please check if %(room_jid)s is a "
-"correct group chat name. If it is, delete it from your roster and try "
-"joining the group chat again."
-msgstr ""
-
-#: gajim/gui_interface.py:1604 gajim/dialog_messages.py:58
+#: gajim/gui_interface.py:1577
 msgid "You cannot join a group chat while you are invisible"
 msgstr "Nemoguće je pristupiti grupnom razgovoru ako ste nevidljivi"
 
-#: gajim/gui_interface.py:2037
+#: gajim/gui_interface.py:1976
 msgid "Could not save your settings and preferences"
 msgstr "Nije moguće čuvanje Vaših podešavanja"
 
-#: gajim/gui_interface.py:2098
+#: gajim/gui_interface.py:2037
 msgid "Gajim: IPython Console"
 msgstr ""
 
-#: gajim/dialog_messages.py:32
+#: gajim/dialog_messages.py:31 gajim/dialog_messages.py:36
+#: gajim/gtk/single_message.py:305 gajim/gtk/account_wizard.py:229
 #, fuzzy
-msgid "You can not start a new conversation unless you are connected."
-msgstr "Ne možete se priključiti grupnom razgovoru ako niste povezani."
-
-#: gajim/dialog_messages.py:36 gajim/dialog_messages.py:41
-#: gajim/gtk/single_message.py:305 gajim/gtk/join_groupchat.py:211
-#: gajim/gtk/account_wizard.py:229
-msgid "Invalid JID"
-msgstr "Neispravan džaber ID"
+msgid "Invalid XMPP Address"
+msgstr "Neispravna datoteka"
 
-#: gajim/dialog_messages.py:42 gajim/gtk/single_message.py:306
-#, python-format
-msgid "It is not possible to send a message to %s, this JID is not valid."
+#: gajim/dialog_messages.py:37
+#, 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/dialog_messages.py:47
-msgid "Unread events"
+#: gajim/dialog_messages.py:42
+#, fuzzy
+msgid "Unread Events"
 msgstr "Nepročitani događaji"
 
-#: gajim/dialog_messages.py:48
-msgid "Read all pending events before removing this account."
+#: gajim/dialog_messages.py:43
+#, fuzzy
+msgid "Read or acknowledge all pending events before removing this account."
 msgstr "Pročitajte sve događaje na čekanju pre uklanjanja naloga."
 
-#: gajim/dialog_messages.py:52
+#: gajim/dialog_messages.py:48
 #, fuzzy
 msgid "Invalid Form"
 msgstr "Neispravna soba"
 
-#: gajim/dialog_messages.py:53
+#: gajim/dialog_messages.py:49
 #, fuzzy
 msgid "The form is not filled correctly."
 msgstr "Nadimak sadrži nedozvoljene karaktere."
 
-#: gajim/dialog_messages.py:57 gajim/common/helpers.py:309
+#: gajim/dialog_messages.py:53 gajim/common/helpers.py:315
 msgid "Invisible"
 msgstr "Nevidljiv"
 
-#: gajim/dialog_messages.py:62
-msgid "A connection is not available"
+#: gajim/dialog_messages.py:54
+#, fuzzy
+msgid "You cannot join a group chat while being invisible."
+msgstr "Nemoguće je pristupiti grupnom razgovoru ako ste nevidljivi"
+
+#: gajim/dialog_messages.py:58
+#, fuzzy
+msgid "No Connection Available"
 msgstr "Veza nije dostupna"
 
-#: gajim/dialog_messages.py:63
+#: gajim/dialog_messages.py:59
 msgid "Your message can not be sent until you are connected."
 msgstr "Vaša poruka ne može biti poslata ako niste povezani."
 
-#: gajim/dialog_messages.py:67
-#, fuzzy
-msgid "JID already in list"
-msgstr "Džaber ID već u listi kontakata"
+#: gajim/dialog_messages.py:63
+msgid "XMPP Address Already in List"
+msgstr ""
 
-#: gajim/dialog_messages.py:68
+#: gajim/dialog_messages.py:64
 #, fuzzy
-msgid "The JID you entered is already in the list. Choose another one."
+msgid ""
+"The XMPP Address you entered is already in the list. Please choose another "
+"one."
 msgstr "Džaber ID koji ste uneli je već na listi. Odaberite neki drugi."
 
-#: gajim/dialog_messages.py:72
-msgid "Invalid answer"
+#: gajim/dialog_messages.py:69
+#, fuzzy
+msgid "Invalid Answer"
 msgstr "Neispravan odgovor"
 
-#: gajim/dialog_messages.py:73
+#: gajim/dialog_messages.py:70
 #, python-format
 msgid "Transport %(name)s answered wrongly to register request: %(error)s"
 msgstr "Transport %(name)s je loše odgovorio na zahtev registracije: %(error)s"
 
-#: gajim/dialog_messages.py:78
+#: gajim/dialog_messages.py:75
 #, fuzzy
 msgid "Wrong Custom Hostname"
 msgstr "Koristi Vaše određeno ime hosta/port "
 
-#: gajim/dialog_messages.py:79
+#: gajim/dialog_messages.py:76
 #, fuzzy, python-format
-msgid "Wrong custom hostname \"%s\". Ignoring it."
+msgid "Custom hostname \"%s\" is wrong. It will be ignored."
 msgstr "Koristi Vaše određeno ime hosta/port "
 
-#: gajim/dialog_messages.py:83
-msgid "Error while removing privacy list"
+#: gajim/dialog_messages.py:80
+#, fuzzy
+msgid "Error While Removing Privacy List"
 msgstr "Greška prilikom uklanjanja lista privatnosti"
 
-#: gajim/dialog_messages.py:84
-#, python-format
+#: gajim/dialog_messages.py:81
+#, fuzzy, python-format
 msgid ""
-"Privacy list %s has not been removed. It is maybe active in one of your "
-"connected resources. Deactivate it and try again."
+"Privacy list %s has not been removed. It is probably active in one of your "
+"connected resources. Please deactivate it and try again."
 msgstr ""
 "Lista privatnosti %s nije uklonjena. Možda je aktivna u nekom od Vaših "
 "resursa na vezi. Deaktivirajte je tamo i pokušajte ponovo."
 
-#: gajim/dialog_messages.py:90
-msgid "Invisibility not supported"
+#: gajim/dialog_messages.py:87
+#, fuzzy
+msgid "Invisibility Not Supported"
 msgstr "Nevidljivost nije podržana"
 
-#: gajim/dialog_messages.py:91
-#, python-format
-msgid "Account %s doesn't support invisibility."
+#: gajim/dialog_messages.py:88
+#, fuzzy, python-format
+msgid "This account %s doesn't support invisibility."
 msgstr "Nalog %s ne podržava nevidljivost."
 
-#: gajim/dialog_messages.py:95
-msgid "Unregister failed"
+#: gajim/dialog_messages.py:92
+#, fuzzy
+msgid "Unregister Failed"
 msgstr "Odjava registracije neuspela"
 
-#: gajim/dialog_messages.py:96
-#, python-format
-msgid "Unregistration with server %(server)s failed: %(error)s"
+#: gajim/dialog_messages.py:93
+#, fuzzy, python-format
+msgid "Unregistration on server %(server)s failed: %(error)s"
 msgstr "Odjava registracije sa serverom %(server)s neuspela: %(error)s"
 
-#: gajim/dialog_messages.py:100
-msgid "Registration succeeded"
+#: gajim/dialog_messages.py:97
+#, fuzzy
+msgid "Registration Succeeded"
 msgstr "Registracija uspešna"
 
-#: gajim/dialog_messages.py:101
-#, python-format
-msgid "Registration with agent %s succeeded"
+#: gajim/dialog_messages.py:98
+#, fuzzy, python-format
+msgid "Registration with agent %s succeeded."
 msgstr "Registracija sa agentom %s uspešna"
 
-#: gajim/dialog_messages.py:105 gajim/gtk/service_registration.py:215
-msgid "Registration failed"
+#: gajim/dialog_messages.py:102
+#, fuzzy
+msgid "Registration Failed"
 msgstr "Registracija neuspela"
 
-#: gajim/dialog_messages.py:106
+#: gajim/dialog_messages.py:103
 #, python-format
 msgid ""
 "Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
 msgstr ""
 "Registracija sa agentom %(agent)s neuspela uz grešku %(error)s: %(error_msg)s"
 
-#: gajim/dialog_messages.py:111
+#: gajim/dialog_messages.py:108
 #, fuzzy
 msgid "Unable to Join Group Chat"
 msgstr "Nije moguće pridružiti se grupnom razgovoru"
 
-#: gajim/dialog_messages.py:116
-msgid "GStreamer error"
-msgstr ""
+#: gajim/dialog_messages.py:113
+#, fuzzy
+msgid "GStreamer Error"
+msgstr "Greška sa bazom podataka"
 
-#: gajim/dialog_messages.py:117
+#: gajim/dialog_messages.py:114
 #, fuzzy, python-format
 msgid ""
 "Error: %(error)s\n"
 "Debug: %(debug)s"
 msgstr "Poruka greške: %s"
 
-#: gajim/dialog_messages.py:121
-msgid "Wrong host"
+#: gajim/dialog_messages.py:118
+#, fuzzy
+msgid "Wrong Host"
 msgstr "Loš host"
 
-#: gajim/dialog_messages.py:122
+#: gajim/dialog_messages.py:119
 msgid "Invalid local address? :-O"
 msgstr "Nevalidna lokalna adresa? :-O"
 
-#: gajim/dialog_messages.py:126
-msgid "Avahi error"
+#: gajim/dialog_messages.py:123
+#, fuzzy
+msgid "Avahi Error"
 msgstr "Avahi greška"
 
-#: gajim/dialog_messages.py:127
+#: gajim/dialog_messages.py:124
 #, python-format
 msgid ""
 "%s\n"
@@ -2433,66 +2403,66 @@ msgstr ""
 "%s\n"
 "Poruke lokalne mreže možda neće raditi kako treba."
 
-#: gajim/dialog_messages.py:131 gajim/dialog_messages.py:136
+#: gajim/dialog_messages.py:128 gajim/dialog_messages.py:133
 #, fuzzy
-msgid "Could not request upload slot"
+msgid "Could not request upload slot for HTTP File Upload"
 msgstr "Nije moguće pokrenuti lokalni servis"
 
-#: gajim/dialog_messages.py:137
-msgid "Got unexpected response from server (see log)"
+#: gajim/dialog_messages.py:134
+msgid "Got unexpected response from server (see log)."
 msgstr ""
 
-#: gajim/dialog_messages.py:141 gajim/dialog_messages.py:146
+#: gajim/dialog_messages.py:138 gajim/dialog_messages.py:143
 #, fuzzy
-msgid "Could not open file"
+msgid "Could not Open File"
 msgstr "Ne mogu učitati sliku"
 
-#: gajim/dialog_messages.py:142
-msgid "Exception raised while opening file (see log)"
+#: gajim/dialog_messages.py:139
+msgid "Exception raised while trying to open file (see log)."
 msgstr ""
 
-#: gajim/dialog_messages.py:151
-msgid "Unsecure"
-msgstr ""
+#: gajim/dialog_messages.py:148
+#, fuzzy
+msgid "Not Secure"
+msgstr "Nije počeo"
 
-#: gajim/dialog_messages.py:152
+#: gajim/dialog_messages.py:149
 #, fuzzy
-msgid "Server returned unsecure transport (HTTP)"
+msgid "The server returned an insecure transport (HTTP)."
 msgstr "Servis je vratio grešku."
 
-#: gajim/dialog_messages.py:156
+#: gajim/dialog_messages.py:153
 #, fuzzy
-msgid "Could not upload file"
+msgid "Could not Upload File"
 msgstr "Ne mogu učitati sliku"
 
-#: gajim/dialog_messages.py:157
+#: gajim/dialog_messages.py:154
 #, python-format
 msgid "HTTP response code from server: %s"
 msgstr ""
 
-#: gajim/dialog_messages.py:161
+#: gajim/dialog_messages.py:158
 msgid "Upload Error"
 msgstr ""
 
-#: gajim/dialog_messages.py:166
+#: gajim/dialog_messages.py:163
 msgid "Encryption Error"
 msgstr ""
 
-#: gajim/dialog_messages.py:167
-#, fuzzy
-msgid "For the chosen encryption there is no encryption method available"
-msgstr "Veza nije dostupna"
+#: gajim/dialog_messages.py:164
+msgid "There is no encryption method available for the chosen encryption."
+msgstr ""
 
-#: gajim/dialog_messages.py:171
+#: gajim/dialog_messages.py:169
 #, fuzzy
-msgid "Avatar upload failed"
+msgid "Avatar Upload Failed"
 msgstr "Publikacija vCard neuspela"
 
-#: gajim/privatechat_control.py:204
+#: gajim/privatechat_control.py:207
 msgid "Sending private message failed"
 msgstr "Neuspešno slanje privatne poruke"
 
-#: gajim/privatechat_control.py:206
+#: gajim/privatechat_control.py:209
 #, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr ""
@@ -2516,7 +2486,7 @@ msgstr "prikaži pomoć za komandu"
 
 #: gajim/gajim_remote.py:85
 #, fuzzy
-msgid "Lists all contacts in roster, one for each line"
+msgid "Lists all contacts in the contact list, one for each line"
 msgstr ""
 "Ispisuje listu svih kontakata sa liste kontakata. Svaki kontakt je u "
 "posebnoj liniji"
@@ -2600,11 +2570,13 @@ msgstr ""
 
 #: gajim/gajim_remote.py:118
 #, fuzzy
-msgid "Sends new chat message to a contact in the roster. Account is optional."
+msgid ""
+"Sends new chat message to a contact in the contact list. Account is optional."
 msgstr "Način korišćenja: /%s, šalje poruku kontaktu"
 
 #: gajim/gajim_remote.py:120 gajim/gajim_remote.py:130
-msgid "JID of the contact that will receive the message"
+#, fuzzy
+msgid "XMPP Address of the contact that will receive the message"
 msgstr "Džaber ID kontakta koji će primiti poruku"
 
 #: gajim/gajim_remote.py:121 gajim/gajim_remote.py:132
@@ -2618,8 +2590,10 @@ msgid "if specified, the message will be sent using this account"
 msgstr "ako je naznačeno, poruka će biti poslata koristeći ovaj nalog"
 
 #: gajim/gajim_remote.py:127
-msgid "Sends a chat message to someone on your roster. Account is optional."
-msgstr ""
+#, fuzzy
+msgid ""
+"Sends a chat message to someone on your contact list. Account is optional."
+msgstr "Način korišćenja: /%s, šalje poruku kontaktu"
 
 #: gajim/gajim_remote.py:131
 msgid "subject"
@@ -2630,11 +2604,13 @@ msgid "message subject"
 msgstr "tema poruke"
 
 #: gajim/gajim_remote.py:138
-msgid "Sends new message to a groupchat you've joined."
+#, fuzzy
+msgid "Sends new message to a group chat you've joined."
 msgstr "Šalje novu poruku na grupni razgovor kome ste se pridružili."
 
 #: gajim/gajim_remote.py:140
-msgid "JID of the room that will receive the message"
+#, fuzzy
+msgid "XMPP Address of the group chat that will receive the message"
 msgstr "Džaber ID sobe koja će primiti poruku"
 
 #: gajim/gajim_remote.py:147
@@ -2643,7 +2619,8 @@ msgstr "Daje detaljne informacije o kontaktu"
 
 #: gajim/gajim_remote.py:149 gajim/gajim_remote.py:162
 #: gajim/gajim_remote.py:192
-msgid "JID of the contact"
+#, fuzzy
+msgid "XMPP Address of the contact"
 msgstr "Džaber ID kontakta"
 
 #: gajim/gajim_remote.py:153
@@ -2706,7 +2683,8 @@ msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Zapisuje trenutno stanje Gajim podešavanja u .config datoteku"
 
 #: gajim/gajim_remote.py:190
-msgid "Removes contact from roster"
+#, fuzzy
+msgid "Removes contact from contact list"
 msgstr "Uklanja kontakt sa liste"
 
 #: gajim/gajim_remote.py:193
@@ -2752,9 +2730,9 @@ msgid "Missing argument \"contact_jid\""
 msgstr "Nedostaje argument \"contact_jid\""
 
 #: gajim/gajim_remote.py:275
-#, python-format
+#, fuzzy, python-format
 msgid ""
-"'%s' is not in your roster.\n"
+"'%s' is not in your contact list.\n"
 "Please specify account for sending the message."
 msgstr ""
 "'%s' nije na Vašj listi.\n"
@@ -2977,12 +2955,12 @@ msgstr "Kraj nedelje"
 msgid "Weekend!"
 msgstr "Vikend!"
 
-#: gajim/common/logger.py:192 gajim/common/logger.py:197
+#: gajim/common/logger.py:189 gajim/common/logger.py:194
 #, 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:217
+#: gajim/common/logger.py:214
 #, fuzzy, python-format
 msgid "Creating %s"
 msgstr "Uništavam %s"
@@ -3057,22 +3035,23 @@ msgstr "%(nickname)s je otišao"
 msgid "Contact Signed Out"
 msgstr "Kontakt je otišao sa veze"
 
-#: gajim/common/contacts.py:455
-msgid "Not in roster"
-msgstr "Nije u listi kontakata"
-
 #: gajim/common/config.py:80
+#, fuzzy
 msgid ""
 "Show desktop notification even when a chat window is opened for this contact "
-"and does not have focus"
+"and does not have focus."
 msgstr ""
+"Omogući iskačuće prozore/obaveštenja kada sam _odsutan/nedostupan/zaposlen/"
+"nevidljiv"
 
 #: gajim/common/config.py:81
-msgid "Play sound when user is busy"
+#, fuzzy
+msgid "Play sound even when being busy."
 msgstr "Pusti zvuk kada je korisnik zauzet"
 
 #: gajim/common/config.py:83
-msgid "Show only online and free for chat contacts in roster."
+#, fuzzy
+msgid "Show only online and free for chat contacts in the contact list."
 msgstr "Prikaži u listi samo kontakte koji su na vezi i slobodni za ćaskanje."
 
 #: gajim/common/config.py:86
@@ -3080,12 +3059,15 @@ msgid "Time in minutes, after which your status changes to away."
 msgstr "Vreme u minutama, nakom koga će se Vaš status promeiti u Odsutan."
 
 #: gajim/common/config.py:87
-msgid "$S (Away as a result of being idle more than $T min)"
+#, fuzzy
+msgid "$S (Away: Idle more than $T min)"
 msgstr "$S (Odsutan, kao posledica mirovanja više od $T min.)"
 
 #: gajim/common/config.py:87
 #, fuzzy
-msgid "$S will be replaced by current status message, $T by autoawaytime."
+msgid ""
+"$S will be replaced by current status message, $T by the 'autoawaytime' "
+"value."
 msgstr ""
 "$S će biti zamenjeno sa trenutnom statusnom porukom,$T sa vremenom "
 "odsutnosti."
@@ -3096,12 +3078,14 @@ msgstr ""
 "Vreme u minutama, nakom koga će se Vaš status promeiti u Nije dostupan."
 
 #: gajim/common/config.py:90
-msgid "$S (Not available as a result of being idle more than $T min)"
+#, fuzzy
+msgid "$S (Not available: Idle more than $T min)"
 msgstr "$S (Nije dostupan, kao posledica mirovanja više od $T min.)"
 
 #: gajim/common/config.py:90
 #, fuzzy
-msgid "$S will be replaced by current status message, $T by autoxatime."
+msgid ""
+"$S will be replaced by current status message, $T by the 'autoxatime' value."
 msgstr ""
 "$S će biti zamenjeno sa trenutnom statusnom porukom,$T sa vremenom "
 "nedostupnosti"
@@ -3109,62 +3093,64 @@ msgstr ""
 #: gajim/common/config.py:93
 #, fuzzy
 msgid ""
-"When to show notification area icon. Can be 'never', 'on_event', 'always'."
+"When to show the notification area icon. Can be 'never', 'on_event', and "
+"'always'."
 msgstr ""
 "Kada prikazati ikonicu u sistemskoj kaseti. Može biti 'never', 'on_event', "
 "'always'."
 
 #: gajim/common/config.py:94
-msgid "Allow to hide the roster window even if the tray icon is not shown."
+msgid ""
+"Allow to hide the contact list window even if the notification area icon is "
+"not shown."
 msgstr ""
 
 #: gajim/common/config.py:97
 #, fuzzy
-msgid "Contact signed in notification color."
-msgstr "Prikaži događaj u listi kontakata"
+msgid "Notification color for contacts signing in."
+msgstr "Obavesti me o kontaktima koji se _prijave"
 
 #: gajim/common/config.py:98
 #, fuzzy
-msgid "Contact signout notification color"
-msgstr "Prikaži događaj u listi kontakata"
+msgid "Notification color for contacts signing out."
+msgstr "Obavesti me o kontaktima koji se _odjave"
 
 #: gajim/common/config.py:99
 #, fuzzy
-msgid "New message notification color."
+msgid "Notification color for new message notification."
 msgstr "Pregledaj nove poruke u iskačućim obaveštenjima?"
 
 #: gajim/common/config.py:100
 #, fuzzy
-msgid "File transfer request notification color."
-msgstr "Zahtev za prenosom datoteke"
+msgid "Notification color for file transfer request."
+msgstr "_Obavesti me kada se završi prenos datoteke"
 
 #: gajim/common/config.py:101
 #, fuzzy
-msgid "File transfer error notification color."
-msgstr "Prenos datoteke prekinut"
+msgid "Notification color for file transfer errors."
+msgstr "_Obavesti me kada se završi prenos datoteke"
 
 #: gajim/common/config.py:102
-#, fuzzy
-msgid "File transfer complete or stopped notification color."
-msgstr "Prikaži iskačuće obaveštenje kada se završi prenos datoteke"
+msgid "Notification color for stopped or completed file transfers."
+msgstr ""
 
 #: gajim/common/config.py:103
-#, fuzzy
-msgid "Groupchat invitation notification color"
-msgstr "Poziv na grupni razgovor"
+msgid "Notification color for group chat invitations."
+msgstr ""
 
 #: gajim/common/config.py:104
 #, fuzzy
-msgid "Background color of status changed notification"
+msgid "Notification background color for changed status."
 msgstr "Boja pozadine kontakta kada tek dođu na vezu."
 
 #: gajim/common/config.py:105
-msgid "Other dialogs color."
+msgid "Notification color for other dialogs."
 msgstr ""
 
 #: gajim/common/config.py:106
+#, fuzzy
 msgid ""
-"List (space separated) of rows (accounts and groups) that are collapsed."
+"List of rows (accounts and groups) that are collapsed (space separated)."
 msgstr ""
 "Lista (odvojena blanko znakovima) redova (naloga i grupa) koji su otvoreni."
 
@@ -3172,8 +3158,10 @@ msgstr ""
 msgid "default"
 msgstr "podrazumevano"
 
-#: gajim/common/config.py:113
-msgid "Language used by speller"
+#: gajim/common/config.py:113 gajim/common/config.py:424
+#: gajim/common/config.py:431
+#, fuzzy
+msgid "Language used for spell checking."
 msgstr "Jezik koji koristi pravopis"
 
 #: gajim/common/config.py:114
@@ -3187,10 +3175,11 @@ msgstr ""
 "'nikad' - nikad ne ispisuj vreme."
 
 #: gajim/common/config.py:115
+#, fuzzy
 msgid ""
 "Print time in chats using Fuzzy Clock. Value of fuzziness from 1 to 4, or 0 "
-"to disable fuzzyclock. 1 is the most precise clock, 4 the least precise one. "
-"This is used only if print_time is 'sometimes'."
+"to disable Fuzzy Clock. 1 is the most precise clock, 4 the least precise "
+"one. This is used only if 'print_time' is 'sometimes'."
 msgstr ""
 "Ispisuj vreme u razgovorima koristeći Rasplinuti Sat. Vrednost rasplinutosti "
 "od  1 do 4 ili 0 za onemogućivanje nejasnog sata. 1 je najprecizniji sat, 4 "
@@ -3208,16 +3197,18 @@ msgstr "Smatraj * / _ parove kao znakove za formatiranje."
 #: gajim/common/config.py:120
 #, fuzzy
 msgid ""
-"If true, do not remove */_ . So *abc* will be bold but with * * not removed."
+"If enabled, do not remove */_ . So *abc* will be bold but with * * not "
+"removed."
 msgstr ""
 "Ako je istinito, ne uklanjaj */_ . Tako će *abv* biti podebljano, ali "
 "iokruženo sa * *."
 
 #: gajim/common/config.py:123
+#, fuzzy
 msgid ""
-"Uses ReStructured text markup to send HTML, plus ascii formatting if "
-"selected. For syntax, see http://docutils.sourceforge.net/docs/ref/rst/"
-"restructuredtext.html (If you want to use this, install docutils)"
+"Uses ReStructured text markup to send HTML, plus ASCII formatting if "
+"selected. Needs docutils installed (for syntax, see http://docutils."
+"sourceforge.net/docs/ref/rst/restructuredtext.html)."
 msgstr ""
 "Koristi ReStructured tekst markup da pošaljete HTML i ascii formatiranje ako "
 "je odabrano. Za sintaksu, pogledajte http://docutils.sourceforge.net/docs/"
@@ -3225,37 +3216,40 @@ msgstr ""
 "docutils)"
 
 #: gajim/common/config.py:132
+#, fuzzy
 msgid ""
-"Character to add after nickname when using nick completion (tab) in group "
-"chat."
+"Character to add after nickname when using nickname completion (tab) in "
+"group chat."
 msgstr ""
 "Karakter za dodavanje posle nadimka kada se koristi dovršavanje nadimka "
 "(tasterom tab) u grupnom razgovoru"
 
 #: gajim/common/config.py:133
+#, fuzzy
 msgid ""
-"Character to propose to add after desired nickname when desired nickname is "
-"used by someone else in group chat."
+"Character to propose to add after desired nickname when nickname is already "
+"used in group chat."
 msgstr ""
 "Karakter koji želite dodati posle željenog nadimka ukoliko je željeni "
 "nadimak u grupnom razgovoru već upotrebljen"
 
 #: gajim/common/config.py:155
 msgid ""
-"If true, Gajim will save roster position when hiding roster, and restore it "
-"when showing roster."
+"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:161
-msgid "Place the roster on the right in single window mode"
+msgid "Place the contact list on the right in single window mode"
 msgstr ""
 
 #: gajim/common/config.py:167
 #, fuzzy
 msgid ""
-"This option let you customize timestamp that is printed in conversation. For "
-"example \"[%H:%M] \" will show \"[hour:minute] \". See python doc on "
-"strftime for full documentation: http://docs.python.org/lib/module-time.html"
+"This option lets you customize the timestamp that is printed in "
+"conversation. For example '[%H:%M] ' will show '[hour:minute] '. See python "
+"doc on strftime for full documentation (https://docs.python.org/3/library/"
+"time.html)."
 msgstr ""
 "Ova opcija Vam omogućava podešavanje vremena koje se prikazuje u razgovoru. "
 "Na primer \"[%H:%M] \" će prikazati \"[sat:minut] \". Pogledajte python "
@@ -3263,263 +3257,266 @@ msgstr ""
 "module-time.html"
 
 #: gajim/common/config.py:168
-msgid "Characters that are printed before the nickname in conversations"
+#, 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:169
-msgid "Characters that are printed after the nickname in conversations"
+#, 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:170
-msgid "Add * and [n] in roster title?"
-msgstr "Dodaj * i [n] u naslov liste kontakata?"
+#, 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:171
 #, fuzzy
 msgid ""
-"How many history messages should be restored when a chat tab/window is "
-"reopened?"
+"Number of messages from chat history to be restored when a chat tab/window "
+"is reopened."
 msgstr ""
 "Koliko linija prethodnog razgovora pamtiti kada se prozor/jezičak  za "
 "razgovor ponovo otvori."
 
 #: gajim/common/config.py:172
-msgid "How far back in time (minutes) history is restored. -1 means no limit."
+msgid ""
+"How far back in time (minutes) chat history is restored. -1 means no limit."
 msgstr ""
 
 #: gajim/common/config.py:173
 #, fuzzy
 msgid ""
-"How many lines to request from server when entering a groupchat. -1 means no "
-"limit"
-msgstr "Koliko linija tražiti od servera pri ulasku na grupni razgovor."
-
-#: gajim/common/config.py:174
-#, fuzzy
-msgid ""
-"Minutes of backlog to request when entering a groupchat. -1 means no limit"
-msgstr "Od pre koliko minuta tražiti dnevnike pri ulasku na grupni razgovor."
-
-#: gajim/common/config.py:175
-msgid ""
-"How many seconds to wait before trying to autorejoin to a conference you are "
-"being disconnected from. Set to 0 to disable autorejoining."
+"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 ""
 "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:176
-msgid "Should autorejoin be activated when kicked from a conference?"
+#: gajim/common/config.py:174
+msgid ""
+"Should automatic rejoin be activated when you were kicked from a group chat?"
 msgstr ""
 
-#: gajim/common/config.py:177
-msgid ""
-"Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
-"Client default behaviour)."
+#: gajim/common/config.py:175
+#, 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:179
-msgid "How many lines to store for Ctrl+KeyUP."
+#: gajim/common/config.py:177
+#, 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:182
+#: gajim/common/config.py:180
 #, fuzzy, python-format
 msgid ""
-"Either custom URL with %%s in it where %%s is the word/phrase or "
-"'WIKTIONARY' which means use Wikitionary."
+"Either a custom URL with %%s in it (where %%s is the word/phrase) or "
+"'WIKTIONARY' (which means use Wikitionary)."
 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:185
+#: gajim/common/config.py:183
 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:187
+#: gajim/common/config.py:185
+#, fuzzy
 msgid ""
-"When not printing time for every message (print_time==sometimes), print it "
+"When not printing time for every message ('print_time'==sometimes), print it "
 "every x minutes."
 msgstr ""
 "Ako se ne ispisuje vreme za svaku poruku (print_time==ponekad), ispisati ga "
 "svakih x minuta"
 
-#: gajim/common/config.py:188
+#: gajim/common/config.py:186
 msgid "Ask before pasting an image."
 msgstr ""
 
-#: gajim/common/config.py:189
+#: gajim/common/config.py:187
 msgid "Ask before closing a group chat tab/window."
 msgstr "Pitaj pre zatvaranja prozora/jezička grupnog razgovora."
 
-#: gajim/common/config.py:190
+#: gajim/common/config.py:188
 #, fuzzy
 msgid ""
-"Always ask for confirmation before closing groupchats with any of the JIDs "
-"on this space separated list."
+"Always ask for confirmation before closing group chats with any of the XMPP "
+"Addresses on this list (space separated)."
 msgstr ""
 "Uvek pitaj pre zatvaranja jezička/prozora kada je u pitanju ova lista "
 "odvojena blanko karakterima džaber ID-ova grupnih razgovora."
 
-#: gajim/common/config.py:191
+#: gajim/common/config.py:189
 #, fuzzy
 msgid ""
-"Never ask for confirmation before closing groupchats with any of the JIDs on "
-"this space separated list."
+"Never ask for confirmation before closing group chats with any of the XMPP "
+"Addresses on this list (space separated)."
 msgstr ""
 "Nikad ne pitaj pre zatvaranja jezička/prozora grupnog razgovora kada je u "
 "pitanju ova listaodovojena blanko znacima džaber ID-ova grupnih razgovora."
 
-#: gajim/common/config.py:192
+#: gajim/common/config.py:190
 #, fuzzy
 msgid ""
-"Ask before closing tabbed chat window if there are controls that can lose "
-"data (chat, private chat, groupchat that will not be minimized)"
+"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 ""
 "Pitaj pre zatvaranja jezička ćaskanja ako postoji kontrola koja može "
 "izgubiti podatke (ćaskanje, privatno ćaskanje, grupni razgovor koji neće "
 "biti minimizovan)"
 
-#: gajim/common/config.py:195
+#: gajim/common/config.py:193
 #, fuzzy
 msgid ""
-"Comma separated list of sent hosts, in addition of local interfaces, for "
-"File Transfer in case of address translation/port forwarding."
+"List of send hosts (comma separated) in addition to local interfaces for "
+"file transfers (in case of address translation/port forwarding)."
 msgstr ""
 "Lista hostova odvojena zarezima, koju šaljemo, uz lokalne interefejse, za "
 "transfer datoteka, u slučaju prosleđivanja porta/NATovanja."
 
-#: gajim/common/config.py:196
+#: gajim/common/config.py:194
 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:198
+#: gajim/common/config.py:196
 #, fuzzy
 msgid "Notify of events in the notification area."
 msgstr "Obavesti me o svim događajima u ikoni sistemske kasete."
 
-#: gajim/common/config.py:199
+#: gajim/common/config.py:197
 msgid ""
-"If False, Gajim will display a static event icon instead of the blinking "
-"status icon in the notification area when notifying on event."
+"If disabled, Gajim will display a static event icon instead of the blinking "
+"status icon in the notification area when notifying about an event."
 msgstr ""
 
-#: gajim/common/config.py:205
+#: gajim/common/config.py:203
 msgid "Show tab when only one conversation?"
 msgstr "Prikaži jezičak iako je samo jedan razgovor?"
 
-#: gajim/common/config.py:206
+#: gajim/common/config.py:204
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "Prikaši granicu sveske u prozorima razgovora?"
 
-#: gajim/common/config.py:207
+#: gajim/common/config.py:205
 msgid "Show close button in tab?"
 msgstr "Prikaši dugme za zatvaranje u jezičku?"
 
-#: gajim/common/config.py:220
+#: gajim/common/config.py:218
 msgid "Preview new messages in notification popup?"
 msgstr "Pregledaj nove poruke u iskačućim obaveštenjima?"
 
-#: gajim/common/config.py:223
+#: gajim/common/config.py:221
+#, fuzzy
 msgid ""
-"A semicolon-separated list of words that will be highlighted in group chats."
+"A list of words (semicolon separated) that will be highlighted in group "
+"chats."
 msgstr ""
 "Lista reči odvojena blanko karakterima koje će biti obojene u grupnim "
 "razgovorima"
 
-#: gajim/common/config.py:224
+#: gajim/common/config.py:222
 #, fuzzy
 msgid ""
-"If true, quits Gajim when X button of Window Manager is clicked. This "
-"setting is taken into account only if notification icon is used."
+"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 ""
 "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:225
+#: gajim/common/config.py:223
 msgid ""
-"If true, Gajim hides the Roster window on pressing the X button instead of "
-"minimizing into the Dock."
+"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:226
+#: gajim/common/config.py:224
 #, fuzzy
 msgid ""
-"If true, Gajim will display an icon on each tab containing unread messages. "
-"Depending on the theme, this icon may be animated."
+"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:227
+#: gajim/common/config.py:225
 #, fuzzy
 msgid ""
-"If true, Gajim will display the status message, if not empty, for every "
-"contact under the contact name in roster window."
+"If enabled, Gajim will display the status message (if not empty) underneath "
+"the contact name in the contact list window."
 msgstr ""
 "Ako je istinito, Gajim će prikazivati statusnu poruku (ako nije prazna) za "
 "svaki kontakt u listi kontakata"
 
-#: gajim/common/config.py:233
-msgid "Define the position of the avatar in roster. Can be left or right"
+#: gajim/common/config.py:231
+#, 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:234
+#: gajim/common/config.py:232
 #, fuzzy
 msgid ""
-"If False, Gajim will no longer print status line in chats when a contact "
-"changes their status and/or their status message."
+"If disabled, Gajim will no longer print status messages in chats when a "
+"contact changes their status (and/or their status message)."
 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:235
+#: gajim/common/config.py:233
 #, fuzzy
 msgid ""
 "Default Setting: Show a status message for every join or leave in a group "
-"chat"
+"chat."
 msgstr "Nije moguće pridružiti se grupnom razgovoru"
 
-#: gajim/common/config.py:236
+#: gajim/common/config.py:234
+#, fuzzy
 msgid ""
-"Default Setting: Show a status message for all status (away, dnd, etc.) "
-"changes of users in a group chat"
-msgstr ""
+"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:238
-msgid "Log XHTML messages instead of plain text messages."
+#: gajim/common/config.py:236
+msgid "Store XHTML messages in chat history instead of plain text messages."
 msgstr ""
 
-#: gajim/common/config.py:239
+#: gajim/common/config.py:237
 msgid "Don't show avatar for the transport itself."
 msgstr "Ne prikazuj avatar za sam transport."
 
-#: gajim/common/config.py:240
-msgid "Don't show roster in the system taskbar."
+#: gajim/common/config.py:238
+#, fuzzy
+msgid "Don't show contact list window in the system taskbar."
 msgstr "Ne prikazuj listu kontakata u sistemskoj kaseti."
 
-#: gajim/common/config.py:241
+#: gajim/common/config.py:239
 #, fuzzy
 msgid ""
-"If true, make the window flash (the default behaviour in most Window "
-"Managers) when holding pending events."
+"If enabled, Gajim makes the window flash (the default behaviour in most "
+"Window Managers) when holding pending events."
 msgstr ""
 "Ako je istinito, i instalirane verzije GTK+ i PyGTK su barem 2.8, neka "
 "prozor bljeska (podrazumevano ponašanje u većini menadžera prozora) pri "
 "novim događajima."
 
-#: gajim/common/config.py:245
+#: gajim/common/config.py:243
 #, fuzzy
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
 "'always_with_roster' - Like 'always' but the messages are in a single window "
-"along with the roster.\n"
+"along with the contact list.\n"
 "'never' - All messages get their own window.\n"
 "'peracct' - Messages for each account are sent to a specific window.\n"
-"'pertype' - Each message type (e.g. chats vs. groupchats) is sent to a "
+"'pertype' - Each message type (e.g. chats vs. group chats) is sent to a "
 "specific window."
 msgstr ""
 "Kontroliše prozor gde se smeštaju nove poruke.\n"
@@ -3530,120 +3527,129 @@ msgstr ""
 "'pertype' - Poruke istog tipa (npr., razgovori i grupni razgovori) se šalju "
 "u isti prozor."
 
-#: gajim/common/config.py:246
+#: gajim/common/config.py:244
 msgid ""
-"Show roster on startup.\n"
-"'always' - Always show roster.\n"
-"'never' - Never show roster.\n"
-"'last_state' - Restore the last state roster."
+"Show contact list window on startup.\n"
+"'always' - Always show contact list window.\n"
+"'never' - Never show contact list window.\n"
+"'last_state' - Restore last state of the contact list window."
 msgstr ""
 
-#: gajim/common/config.py:247
-msgid "If False, you will no longer see the avatar in the chat window."
+#: gajim/common/config.py:245
+#, 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:248
+#: gajim/common/config.py:246
 #, fuzzy
-msgid "If true, pressing the escape key closes a tab/window."
+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:249
-msgid "Hides the banner in a group chat window"
+#: gajim/common/config.py:247
+#, fuzzy
+msgid "Hides the banner in a group chat window."
 msgstr "Sakriva baner u prozoru grupnog razgovora."
 
-#: gajim/common/config.py:250
-msgid "Hides the banner in two persons chat window"
-msgstr "Sakriva baner u prozoru razgovora dve osobe"
+#: gajim/common/config.py:248
+#, fuzzy
+msgid "Hides the banner in a 1:1 chat window."
+msgstr "Sakriva baner u prozoru grupnog razgovora."
 
-#: gajim/common/config.py:251
-msgid "Hides the group chat occupants list in group chat window."
+#: gajim/common/config.py:249
+#, 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:252
+#: gajim/common/config.py:250
+#, fuzzy
 msgid ""
 "In a chat, show the nickname at the beginning of a line only when it's not "
-"the same person talking than in previous message."
+"the same person talking as in the previous message."
 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:253
+#: gajim/common/config.py:251
 msgid "Indentation when using merge consecutive nickname."
 msgstr "Uvlačenje pri korišćenju spajanja uzastopnih nadimaka."
 
-#: gajim/common/config.py:254
-msgid "Ctrl-Tab go to next composing tab when none is unread."
+#: gajim/common/config.py:252
+#, 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:255
+#: gajim/common/config.py:253
 #, fuzzy
 msgid ""
-"Show the confirm metacontacts creation dialog or not? Empty string means "
-"never show the dialog."
+"Show a confirmation dialog to create metacontacts? Empty string means never "
+"show the dialog."
 msgstr ""
-"Treba li pitati za potvrdu stvaranja pseudokontakta ili ne? Prazna niska "
+"Treba li prikazivati dijalog za potvrdu blokiranja kontakta? Prazna nista "
 "znači da nikada ne prikazujemo dijalog."
 
-#: gajim/common/config.py:256
+#: gajim/common/config.py:254
 #, fuzzy
 msgid ""
-"Show the confirm block contact dialog or not? Empty string means never show "
+"Show a confirmation dialog to block a contact? Empty string means never show "
 "the dialog."
 msgstr ""
 "Treba li prikazivati dijalog za potvrdu blokiranja kontakta? Prazna nista "
 "znači da nikada ne prikazujemo dijalog."
 
-#: gajim/common/config.py:257
+#: gajim/common/config.py:255
 #, fuzzy
 msgid ""
-"Show the confirm custom status dialog or not? Empty string means never show "
-"the dialog."
+"Show a confirmation dialog for a custom status? Empty string means never "
+"show the dialog."
 msgstr ""
 "Treba li prikazivati dijalog za potvrdu prilagođenog statusa? Prazna niska "
 "znači da nikada ne prikazujemo dijalog."
 
-#: gajim/common/config.py:258
+#: gajim/common/config.py:256
 #, fuzzy
 msgid ""
-"If true, you will be able to set a negative priority to your account in "
-"account modification window. BE CAREFUL, when you are logged in with a "
-"negative priority, you will NOT receive any message from your server."
+"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 ""
 "Ako je istinito, bićete u mogućnosti postaviti negativan prioritetna Vaš "
 "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:259
+#: gajim/common/config.py:257
 #, fuzzy
 msgid ""
-"If true, Gajim will show number of online and total contacts in account and "
-"group rows."
+"If enabled, Gajim will show both the number of online and total contacts in "
+"account rows as well as in group rows."
 msgstr ""
 "Ako je istinito, Gajim će prikazivati ukupan broj korisnika i broj korinsika "
 "na vezi u grupnim redovima."
 
-#: gajim/common/config.py:260
+#: gajim/common/config.py:258
+#, fuzzy
 msgid ""
-"Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
-"as if they were of this type"
+"Can be empty, 'chat' or 'normal'. If not empty, all incoming messages are "
+"treated as if they were of this type."
 msgstr ""
 "Može biti prazno, 'chat' ili 'normal'. Ako nije prazno, tretira sve dolazne "
 "poruke kao poruke postavljenog tipa"
 
-#: gajim/common/config.py:261
+#: gajim/common/config.py:259
 #, fuzzy
 msgid ""
-"If true, Gajim will scroll and select the contact who sent you the last "
-"message, if chat window is not already opened."
+"If enabled, Gajim will scroll and select the contact who sent you the last "
+"message, if the chat window is not already opened."
 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:262
+#: gajim/common/config.py:260
 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:263
+#: gajim/common/config.py:261
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
@@ -3651,144 +3657,160 @@ msgstr ""
 "Maksimum poruka koje se prikazuju u razogovoru. Najstarije linije se "
 "sklanjaju."
 
-#: gajim/common/config.py:264
+#: gajim/common/config.py:262
 #, fuzzy
 msgid ""
-"If true, notification windows from notification-daemon will be attached to "
-"notification icon."
+"If enabled, notification windows from notification-daemon will be attached "
+"to the notification area icon."
 msgstr ""
 "Ako je istinito, prozor obaveštenja od servisa obaveštenja će biti zakačen "
 "za sistemsku kasetu."
 
-#: gajim/common/config.py:265
+#: gajim/common/config.py:263
 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:266
+#: gajim/common/config.py:264
+#, fuzzy
 msgid ""
-"Valid uri schemes. Only schemes in this list will be accepted as \"real\" "
-"uri. (mailto and xmpp are handled separately)"
+"Valid URI schemes. Only schemes in this list will be accepted as 'real' URI "
+"(mailto and xmpp are handled separately)."
 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:267
+#: gajim/common/config.py:265
 #, fuzzy
-msgid "If true, completion in groupchats will be like a shell auto-completion"
+msgid ""
+"If enabled, completion in group chats will be like a shell auto-completion."
 msgstr ""
 "Ako je True, dopunjavanje u grupnim razgovorima će biti kao dopunjavanje u "
 "konzoli"
 
-#: gajim/common/config.py:272
-msgid "Optionally fix jingle output video framerate. Example: 10/1 or 25/2"
+#: gajim/common/config.py:270
+msgid "Optionally fix Jingle output video framerate. Example: 10/1 or 25/2."
 msgstr ""
 
-#: gajim/common/config.py:273
-msgid "Optionally resize jingle output video. Example: 320x240"
+#: gajim/common/config.py:271
+msgid "Optionally resize Jingle output video. Example: 320x240."
 msgstr ""
 
-#: gajim/common/config.py:274
-msgid "If true, You will also see your webcam"
+#: gajim/common/config.py:272
+msgid "If enabled, you will see your webcam's video stream as well."
 msgstr ""
 
-#: gajim/common/config.py:277
+#: gajim/common/config.py:275
 msgid ""
-"If true, Gajim will try to use a STUN server when using Jingle. The one in "
-"\"stun_server\" option, or the one given by the XMPP server."
+"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:278
+#: gajim/common/config.py:276
 msgid "STUN server to use when using Jingle"
 msgstr ""
 
-#: gajim/common/config.py:279
+#: gajim/common/config.py:277
 msgid ""
-"If true, Gajim will show affiliation of groupchat occupants by adding a "
-"colored square to the status icon"
+"If enabled, Gajim will show affiliation of group chat participants by adding "
+"a colored square to the status icon."
 msgstr ""
 
-#: gajim/common/config.py:280
+#: gajim/common/config.py:278
 msgid ""
 "Proxy used for all outgoing connections if the account does not have a "
-"specific proxy configured"
+"specific proxy configured."
 msgstr ""
 
-#: gajim/common/config.py:281
-msgid "If true, Gajim will ignore incoming attention requests (\"wizz\")."
+#: gajim/common/config.py:279
+msgid "If enabled, Gajim will ignore incoming attention requests ('wizz')."
 msgstr ""
 
-#: gajim/common/config.py:282
+#: gajim/common/config.py:280
 msgid ""
 "If enabled, Gajim will reopen chat windows that were opened last time Gajim "
 "was closed."
 msgstr ""
 
-#: gajim/common/config.py:283
+#: gajim/common/config.py:281
 #, fuzzy
 msgid ""
-"If enabled, Gajim will show an icon to show that sent message has been "
-"received by your contact"
+"If enabled, Gajim will display an icon to show that sent messages have been "
+"received by your contact."
 msgstr ""
 "Ako je označena, Gajim neće pitati za statusnu poruku. Već postavljena "
 "podrazumevana poruka će biti korišćena."
 
-#: gajim/common/config.py:284
-msgid "Show a mini avatar in chat window tabs and in window icon"
+#: gajim/common/config.py:282
+msgid "Show a mini avatar in chat window tabs and as the window's icon."
 msgstr ""
 
-#: gajim/common/config.py:285
+#: gajim/common/config.py:283
 #, fuzzy
-msgid "If true, Gajim will use the Systems Keyring to store account passwords."
+msgid ""
+"If enabled, Gajim will use the System's Keyring to store account passwords."
 msgstr ""
 "Ako je istinito, Gajim će koristiti Gnomov Keyring (ako je dostupan) da "
 "uskladišti lozinke naloga."
 
+#: gajim/common/config.py:284
+msgid "If enabled, Gajim will execute XEP-0146 Commands."
+msgstr ""
+
+#: gajim/common/config.py:285
+msgid "2: System, 1: Enabled, 0: Disabled"
+msgstr ""
+
 #: gajim/common/config.py:286
-msgid "If true, Gajim will execute XEP-0146 Commands."
+msgid "Options in days which can be chosen in the sync threshold menu"
 msgstr ""
 
 #: gajim/common/config.py:287
-msgid "2: System, 1: Enabled, 0: Disabled"
+msgid ""
+"Maximum history in days we request from a public group chat archive. 0: As "
+"much as possible."
 msgstr ""
 
 #: gajim/common/config.py:288
-msgid "Options in days which can be chosen in the sync threshold menu"
+msgid ""
+"Maximum history in days we request from a private group chat archive. 0: As "
+"much as possible."
 msgstr ""
 
 #: gajim/common/config.py:289
 msgid ""
-"Maximum history in days we request from a public room archive. 0: As much as "
-"possible"
+"If enabled, Gajim shows the group chat subject in the chat window when "
+"joining."
 msgstr ""
 
 #: gajim/common/config.py:290
+#, fuzzy
 msgid ""
-"Maximum history in days we request from a private room archive. 0: As much "
-"as possible"
+"If enabled, the contact row is colored according to the current chat state "
+"of the contact."
 msgstr ""
+"Ako je označena, Gajim će dozvoliti drugima da pogledaju koji operativni "
+"sistem koristite"
 
 #: gajim/common/config.py:291
-msgid "If the room subject is shown in chat on join"
+#, fuzzy
+msgid ""
+"If enabled, the tab is colored according to the current chat state of the "
+"contact."
 msgstr ""
+"Ako je označena, Gajim će dozvoliti drugima da pogledaju koji operativni "
+"sistem koristite"
 
 #: gajim/common/config.py:292
+#, fuzzy
 msgid ""
-"If the contact row is colored according to the current chatstate of the "
-"contact"
+"Shows a text in the banner that describes the current chat state of the "
+"contact."
 msgstr ""
+"Ako je označena, Gajim će dozvoliti drugima da pogledaju koji operativni "
+"sistem koristite"
 
 #: gajim/common/config.py:293
-msgid "If the tab is colored according to the current chatstate of the contact"
-msgstr ""
-
-#: gajim/common/config.py:294
-msgid ""
-"Shows a text in the banner that describes the current chatstate of the "
-"contact"
-msgstr ""
-
-#: gajim/common/config.py:295 gajim/common/config.py:424
 #, fuzzy
 msgid ""
 "Chat state notifications that are sent to contacts. Possible values: all, "
@@ -3797,140 +3819,158 @@ msgstr ""
 "Poslata obaveštenja o stanju razgovora. Može biti jedno od "
 "'svi','samo_sastavljanje', 'onemogućeno'."
 
-#: gajim/common/config.py:296 gajim/common/config.py:438
+#: gajim/common/config.py:294
 #, fuzzy
 msgid ""
 "Chat state notifications that are sent to the group chat. Possible values: "
-"all, composing_only, disabled"
+"'all', 'composing_only', 'disabled'"
 msgstr ""
 "Poslata obaveštenja o stanju razgovora. Može biti jedno od "
 "'svi','samo_sastavljanje', 'onemogućeno'."
 
-#: gajim/common/config.py:312
+#: gajim/common/config.py:297
+msgid "API Preferences. Possible values: 'http', 'iq'"
+msgstr ""
+
+#: gajim/common/config.py:313
+#, fuzzy
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
-"defined in autopriority_* options."
+"defined in 'autopriority_*' options."
 msgstr ""
 "Prioritet će se automatski promeniti u zavisnosti od Vašeg statusa. "
 "Prioriteti su definsani u autopriority_* podešavanjima."
 
-#: gajim/common/config.py:320
+#: gajim/common/config.py:321
+#, fuzzy
 msgid ""
-"Status used to autoconnect as. Can be online, chat, away, xa, dnd, "
-"invisible. NOTE: this option is used only if restore_last_status is disabled"
+"Status to be used automatically when connecting. Can be 'online', 'chat', "
+"'away', 'xa', 'dnd' or 'invisible'. NOTE: This option is used only if "
+"'restore_last_status' is disabled."
 msgstr ""
 "Status sa kojim se automatski povezujete. Može biti online, chat, away, xa, "
 "dnd, invisible. PAŽNJA: ova opcija se koristi samo ako je "
 "restore_last_status  onemogućena."
 
-#: gajim/common/config.py:321
-msgid "If enabled, restore the last status that was used."
+#: gajim/common/config.py:322
+#, fuzzy
+msgid "If enabled, the last status will be restored."
 msgstr "Ako je omogućeno, postavi poslednji korišćeni status."
 
-#: gajim/common/config.py:322
+#: gajim/common/config.py:323
 #, fuzzy
 msgid ""
-"If true, Contacts requesting authorization will be automatically accepted."
+"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:323
+#: gajim/common/config.py:324
+#, fuzzy
 msgid ""
-"If False, this account will be disabled and will not appear in roster window."
+"If disabled, this account will be disabled and will not appear in the "
+"contact list window."
 msgstr ""
 "Ako je False, nalog će biti onemogućen i neće se prikazivati u listi "
 "kontakata."
 
-#: gajim/common/config.py:327
-msgid "Allow plaintext connections"
+#: gajim/common/config.py:328
+msgid "Allow plaintext connections."
 msgstr ""
 
-#: gajim/common/config.py:330
+#: gajim/common/config.py:331
 msgid ""
-"List (space separated) of authentication mechanisms to try. Can contain "
-"ANONYMOUS, EXTERNAL, GSSAPI, SCRAM-SHA-1-PLUS, SCRAM-SHA-1, DIGEST-MD5, "
-"PLAIN, X-MESSENGER-OAUTH2 or XEP-0078"
+"List of authentication mechanisms to try (space separated). Can contain "
+"'ANONYMOUS', 'EXTERNAL', 'GSSAPI', 'SCRAM-SHA-1-PLUS', 'SCRAM-SHA-1', "
+"'DIGEST-MD5', 'PLAIN', 'X-MESSENGER-OAUTH2' or 'XEP-0078'."
 msgstr ""
 
-#: gajim/common/config.py:331
+#: gajim/common/config.py:332
 #, fuzzy
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection. "
-"Can be 'warn', 'connect', 'disconnect'"
+"Can be 'warn', 'connect' or 'disconnect'."
 msgstr ""
 "Prikaži prozor upozorenja pre slanja nešifrovane lozinke preko obične veze."
 
-#: gajim/common/config.py:332
+#: gajim/common/config.py:333
 msgid "Show a warning dialog before using standard SSL library."
 msgstr "Prikaži prozor upozorenja pre korišćenja standardne SSL biblioteke."
 
-#: gajim/common/config.py:333
+#: gajim/common/config.py:334
 #, fuzzy
 msgid ""
 "Show a warning dialog before sending PLAIN password over a plain connection."
 msgstr ""
 "Prikaži prozor upozorenja pre slanja nešifrovane lozinke preko obične veze."
 
-#: gajim/common/config.py:334
-msgid "Space separated list of ssl errors to ignore."
-msgstr "Lista ssl grešaka za ignorisanje, odvojena razmacima."
+#: gajim/common/config.py:335
+msgid "List of SSL errors to ignore (space separated)."
+msgstr ""
 
-#: gajim/common/config.py:340
+#: gajim/common/config.py:341
 msgid ""
-"Space separated list of JIDs for which you do not want to store logs. You "
-"can also add account name to log nothing for this account."
+"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:341
+#: gajim/common/config.py:342
 msgid ""
-"Space separated list of JIDs for which you accept to not log conversations "
-"if he does not want to."
+"List of XMPP Addresses (space separated) for which you accept to not store "
+"chat history if your contact does not want to."
 msgstr ""
 
-#: gajim/common/config.py:343
-msgid "Whitespace sent after inactivity"
+#: gajim/common/config.py:344
+#, fuzzy
+msgid "If enabled, a whitespace is sent after inactivity (keep alive)."
 msgstr "Slanje belina posle neaktivnosti"
 
-#: gajim/common/config.py:344
-msgid "XMPP ping sent after inactivity"
+#: gajim/common/config.py:345
+#, fuzzy
+msgid "If enabled, an XMPP ping is sent after inactivity (ping alive)."
 msgstr "Slanje XMPP pinga posle neaktivnosti"
 
-#: gajim/common/config.py:348
+#: gajim/common/config.py:349
 #, fuzzy
 msgid ""
-"How many seconds to wait for the answer of ping alive packet before trying "
-"to reconnect?"
+"How many seconds to wait for the answer of a ping alive packet before trying "
+"to reconnect."
 msgstr ""
 "Koliko sekundi čekati na odgovor o paketima o živosti pre nego što pokušamo "
 "ponovno uspostavljanje veze."
 
-#: gajim/common/config.py:352
-msgid "Jabberd2 workaround"
+#: gajim/common/config.py:353
+#, fuzzy
+msgid "Jabberd2 workaround."
 msgstr "Jabberd2 privremeno rešenje"
 
-#: gajim/common/config.py:355
+#: gajim/common/config.py:356
+#, fuzzy
 msgid ""
-"If checked, Gajim will use your IP and proxies defined in "
-"file_transfer_proxies option for file transfer."
+"If enabled, Gajim will use your IP and proxies defined in "
+"'file_transfer_proxies' option for file transfers."
 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:356
+#: gajim/common/config.py:357
 msgid ""
-"If true, Gajim will test file transfer proxies on startup to be sure it "
-"works. Openfire's proxies are known to fail this test even if they work."
+"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:369
-msgid "Answer to receipt requests"
-msgstr "Odgovor na zahtev primanja"
-
 #: gajim/common/config.py:370
-msgid "Sent receipt requests"
-msgstr "Poslati zahtev primanja"
+#, 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:371
+msgid "If enabled, Gajim will send message receipt requests."
+msgstr ""
 
-#: gajim/common/config.py:379
+#: gajim/common/config.py:380
 #, fuzzy
 msgid ""
 "Allow Gajim to send information about the operating system you are running."
@@ -3938,185 +3978,198 @@ msgstr ""
 "Ako je označena, Gajim će dozvoliti drugima da pogledaju koji operativni "
 "sistem koristite"
 
-#: gajim/common/config.py:380
+#: gajim/common/config.py:381
 #, fuzzy
 msgid "Allow Gajim to send your local time."
 msgstr "%s Vam želi poslati datoteku."
 
-#: gajim/common/config.py:383
+#: gajim/common/config.py:384
 #, fuzzy
-msgid "Message that is sent to contacts you want to add"
+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:384
-msgid ""
-"If enabled, Gajim will send your local IPs so your contact can connect to "
-"your machine to transfer files."
-msgstr ""
-
 #: gajim/common/config.py:385
+#, fuzzy
 msgid ""
-"Space separated list of JIDs for which chat window will be re-opened on next "
-"startup."
+"If enabled, Gajim will send your local IP so your contact can connect to "
+"your machine for file transfers."
 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:387
-msgid "HTTP Upload: Enable HTTPS Verification"
+#: gajim/common/config.py:386
+msgid ""
+"List of XMPP Addresses (space separated) for which the chat window will be "
+"re-opened on next startup."
 msgstr ""
 
 #: gajim/common/config.py:388
-msgid ""
-"Preferred file transfer mechanism for file drag&drop on chat window. Can be "
-"'httpupload' (default) or 'jingle'"
+msgid "HTTP File Upload: Enable HTTPS Verification."
 msgstr ""
 
 #: gajim/common/config.py:389
-msgid "Allow cert verification with POSH"
+msgid ""
+"Preferred file transfer mechanism for file drag&drop on a chat window. Can "
+"be 'httpupload' (default) or 'jingle'."
 msgstr ""
 
-#: gajim/common/config.py:423 gajim/common/config.py:430
+#: gajim/common/config.py:390
 #, fuzzy
-msgid "Language for which misspelled words will be checked"
-msgstr "Jezik u kome želite proveravati neispravno napisane reči"
+msgid "Allow certificate verification with POSH."
+msgstr "Greška SSL sertifikata"
 
-#: gajim/common/config.py:427
-msgid "The currently active encryption for that contact"
+#: gajim/common/config.py:425
+#, fuzzy
+msgid ""
+"Chat state notifications that are sent to contacts. Possible values: 'all', "
+"'composing_only', 'disabled'"
 msgstr ""
+"Poslata obaveštenja o stanju razgovora. Može biti jedno od "
+"'svi','samo_sastavljanje', 'onemogućeno'."
 
-#: gajim/common/config.py:431
+#: gajim/common/config.py:428
 #, fuzzy
-msgid ""
-"How many lines to request from server when entering a groupchat. -1 means no "
-"limit, -2 means global value"
-msgstr "Koliko linija tražiti od servera pri ulasku na grupni razgovor."
+msgid "The currently active encryption for that contact."
+msgstr "Omogući ESessions enkripciju za ovaj nalog."
 
 #: gajim/common/config.py:432
-#, fuzzy
 msgid ""
-"Minutes of backlog to request when entering a groupchat. -1 means no limit, "
-"-2 means global value"
-msgstr "Od pre koliko minuta tražiti dnevnike pri ulasku na grupni razgovor."
-
-#: gajim/common/config.py:433
-msgid "State whether a notification is created for every message in this room"
+"If enabled, a notification is created for every message in this group chat."
 msgstr ""
 
-#: gajim/common/config.py:434
+#: gajim/common/config.py:433
+#, fuzzy
 msgid ""
-"Show a status message for all status (away, dnd, etc.) changes of users in a "
-"group chat"
-msgstr ""
+"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:435
+#: gajim/common/config.py:434
 #, fuzzy
-msgid "Show a status message for every join or leave in a group chat"
+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:435
+msgid ""
+"If enabled, the group chat is minimized into the contact list when joining "
+"automatically."
+msgstr ""
+
 #: gajim/common/config.py:436
-msgid "If the group chat is minimized into the roster on autojoin"
+msgid ""
+"If enabled, the group chat is minimized into the contact list when closing "
+"it."
 msgstr ""
 
 #: gajim/common/config.py:437
-msgid "If the group chat is minimized into the roster on close"
+#, fuzzy
+msgid ""
+"Chat state notifications that are sent to the group chat. Possible values: "
+"'all', 'composing_only' or 'disabled'."
 msgstr ""
+"Poslata obaveštenja o stanju razgovora. Može biti jedno od "
+"'svi','samo_sastavljanje', 'onemogućeno'."
 
-#: gajim/common/config.py:441
+#: gajim/common/config.py:440
 msgid ""
-"State whether plugins should be activated on startup (this is saved on Gajim "
-"exit). This option SHOULD NOT be used to (de)activate plug-ins. Use GUI "
-"instead."
+"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:446 gajim/common/const.py:281
+#: gajim/common/config.py:445 gajim/common/const.py:315
 msgid "Sleeping"
 msgstr "Spavam"
 
-#: gajim/common/config.py:447
+#: gajim/common/config.py:446
 msgid "Back soon"
 msgstr "Vraćam se brzo"
 
-#: gajim/common/config.py:447
+#: gajim/common/config.py:446
 msgid "Back in some minutes."
 msgstr "Vraćam se za par minuta."
 
-#: gajim/common/config.py:448 gajim/common/const.py:247
+#: gajim/common/config.py:447 gajim/common/const.py:281
 msgid "Eating"
 msgstr "Jedem"
 
-#: gajim/common/config.py:448
-msgid "I'm eating, so leave me a message."
-msgstr "Jedem, ostavite poruku."
+#: gajim/common/config.py:447
+#, fuzzy
+msgid "I'm eating."
+msgstr "Radim."
 
-#: gajim/common/config.py:449
+#: gajim/common/config.py:448
 msgid "Movie"
 msgstr "Film"
 
-#: gajim/common/config.py:449
+#: gajim/common/config.py:448
 msgid "I'm watching a movie."
 msgstr "Gledam film."
 
-#: gajim/common/config.py:450 gajim/common/const.py:314
+#: gajim/common/config.py:449 gajim/common/const.py:348
 msgid "Working"
 msgstr "Radim."
 
-#: gajim/common/config.py:450
+#: gajim/common/config.py:449
 msgid "I'm working."
 msgstr "Radim."
 
-#: gajim/common/config.py:451
+#: gajim/common/config.py:450
 msgid "Phone"
 msgstr "Telefon"
 
-#: gajim/common/config.py:451
+#: gajim/common/config.py:450
 msgid "I'm on the phone."
 msgstr "Telefoniram."
 
-#: gajim/common/config.py:452
+#: gajim/common/config.py:451
 msgid "Out"
 msgstr "Napolju"
 
-#: gajim/common/config.py:452
+#: gajim/common/config.py:451
 msgid "I'm out enjoying life."
 msgstr "Napolju sam, uživam u životu."
 
-#: gajim/common/config.py:463
+#: gajim/common/config.py:462
 msgid "I'm available."
 msgstr "Dostupan sam."
 
-#: gajim/common/config.py:464
+#: gajim/common/config.py:463
 msgid "I'm free for chat."
 msgstr "Slobodan sam za razgovor."
 
-#: gajim/common/config.py:465 gajim/gtk/accounts.py:134
+#: gajim/common/config.py:464 gajim/gtk/accounts.py:133
 msgid "Be right back."
 msgstr "Odmah se vraćam."
 
-#: gajim/common/config.py:466
+#: gajim/common/config.py:465
 msgid "I'm not available."
 msgstr "Nedostupan sam."
 
-#: gajim/common/config.py:467
+#: gajim/common/config.py:466
 msgid "Do not disturb."
 msgstr "Ne smetaj."
 
-#: gajim/common/config.py:468 gajim/common/config.py:469
+#: gajim/common/config.py:467 gajim/common/config.py:468
 msgid "Bye!"
 msgstr "Pozdrav!"
 
-#: gajim/common/config.py:480
+#: gajim/common/config.py:479
+#, fuzzy
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
-"muc_highlight_words, or when a group chat message contains your nickname."
+"'muc_highlight_words' your nickname is mentioned."
 msgstr ""
 "Zvuk koji će se pustiti kada poruka grupnog razgovora sadrži neku reč iz "
 "muc_highlight_words, ili kada neka poruka grupnog razgovora sadrži Vaš "
 "nadimak."
 
-#: gajim/common/config.py:481
-msgid "Sound to play when any MUC message arrives."
+#: gajim/common/config.py:480
+#, 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:485
+#: gajim/common/config.py:484
 #, fuzzy
 msgid "Tor"
 msgstr "Za"
@@ -4126,879 +4179,975 @@ msgstr "Za"
 msgid "Error: cannot open %s for reading"
 msgstr "Greška: nije moguće otvoriti %s za čitanje"
 
-#: gajim/common/const.py:214
+#: gajim/common/const.py:216
+#, fuzzy
+msgid "?Group chat name:Team"
+msgstr "?Uloga kontakta u grupnom razgovoru:Nikakva"
+
+#: gajim/common/const.py:217
+msgid "?Group chat description:Project discussion"
+msgstr ""
+
+#: gajim/common/const.py:218
+#, fuzzy
+msgid "?Group chat address:team"
+msgstr "Grupni razgovori"
+
+#: gajim/common/const.py:219
+#, fuzzy
+msgid "?Group chat name:Family"
+msgstr "Bojenje Poruka Sa Grupnog Razgovora"
+
+#: gajim/common/const.py:220
+msgid "?Group chat description:Spring gathering"
+msgstr ""
+
+#: gajim/common/const.py:221
+msgid "?Group chat address:family"
+msgstr ""
+
+#: gajim/common/const.py:222
+#, fuzzy
+msgid "?Group chat name:Vacation"
+msgstr "Poziv na grupni razgovor"
+
+#: gajim/common/const.py:223
+msgid "?Group chat description:Trip planning"
+msgstr ""
+
+#: gajim/common/const.py:224
+#, fuzzy
+msgid "?Group chat address:vacation"
+msgstr "Poziv na grupni razgovor"
+
+#: gajim/common/const.py:225
+#, fuzzy
+msgid "?Group chat name:Repairs"
+msgstr "_Grupni razgovor"
+
+#: gajim/common/const.py:226
+msgid "?Group chat description:Local help group"
+msgstr ""
+
+#: gajim/common/const.py:227
+#, fuzzy
+msgid "?Group chat address:repairs"
+msgstr "Grupni razgovori"
+
+#: gajim/common/const.py:228
+#, fuzzy
+msgid "?Group chat name:News"
+msgstr "?Uloga kontakta u grupnom razgovoru:Nikakva"
+
+#: gajim/common/const.py:229
+#, fuzzy
+msgid "?Group chat description:Local news and reports"
+msgstr "Stvaranje grupnih razgovora Vam nije dozvoljeno."
+
+#: gajim/common/const.py:230
+#, fuzzy
+msgid "?Group chat address:news"
+msgstr "Novi grupni razgovor"
+
+#: gajim/common/const.py:235
+#, fuzzy
+msgid "Remote server not found"
+msgstr "Usluga ne može biti nađena"
+
+#: gajim/common/const.py:236
+msgid "Remote server timeout"
+msgstr ""
+
+#: gajim/common/const.py:237 gajim/common/const.py:238
+#: gajim/common/const.py:239
+#, fuzzy
+msgid "Address does not belong to a group chat server"
+msgstr "Ovo nije grupni razgovor"
+
+#: gajim/common/const.py:240
+#, fuzzy
+msgid "Group chat already exists"
+msgstr "Račun lokal već postoji."
+
+#: gajim/common/const.py:241
+#, fuzzy
+msgid "Group chat does not exist"
+msgstr "Grupni razgovor.%s ne postoji."
+
+#: gajim/common/const.py:247
 msgid "This message was encrypted with OTR and could not be decrypted."
 msgstr ""
 
-#: gajim/common/const.py:217
+#: gajim/common/const.py:250
 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:221
+#: gajim/common/const.py:254
 msgid ""
-"This message was encrypted with OpenPGP for XMPP and could not be decrypted."
+"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:224
+#: gajim/common/const.py:258
 #, python-format
 msgid "This message was encrypted with %s and could not be decrypted."
 msgstr ""
 
-#: gajim/common/const.py:231
+#: gajim/common/const.py:265
 msgid "Doing Chores"
 msgstr "Obavlja rutinu"
 
-#: gajim/common/const.py:232
+#: gajim/common/const.py:266
 msgid "Buying Groceries"
 msgstr "Kupuje namirnice"
 
-#: gajim/common/const.py:233
+#: gajim/common/const.py:267
 msgid "Cleaning"
 msgstr "Čisti"
 
-#: gajim/common/const.py:234
+#: gajim/common/const.py:268
 msgid "Cooking"
 msgstr "Kuva"
 
-#: gajim/common/const.py:235
+#: gajim/common/const.py:269
 msgid "Doing Maintenance"
 msgstr "Obavlja održavanje"
 
-#: gajim/common/const.py:236
+#: gajim/common/const.py:270
 msgid "Doing the Dishes"
 msgstr "Pere sudove"
 
-#: gajim/common/const.py:237
+#: gajim/common/const.py:271
 msgid "Doing the Laundry"
 msgstr "Pere veš"
 
-#: gajim/common/const.py:238
+#: gajim/common/const.py:272
 msgid "Gardening"
 msgstr "Baštovani"
 
-#: gajim/common/const.py:239
+#: gajim/common/const.py:273
 msgid "Running an Errand"
 msgstr "Na zadatku"
 
-#: gajim/common/const.py:240
+#: gajim/common/const.py:274
 msgid "Walking the Dog"
 msgstr "Šeta psa"
 
-#: gajim/common/const.py:242
+#: gajim/common/const.py:276
 msgid "Drinking"
 msgstr "Pije"
 
-#: gajim/common/const.py:243
+#: gajim/common/const.py:277
 msgid "Having a Beer"
 msgstr "Pije pivo"
 
-#: gajim/common/const.py:244
+#: gajim/common/const.py:278
 msgid "Having Coffee"
 msgstr "Pije kafu"
 
-#: gajim/common/const.py:245
+#: gajim/common/const.py:279
 msgid "Having Tea"
 msgstr "Pije čaj"
 
-#: gajim/common/const.py:248
+#: gajim/common/const.py:282
 msgid "Having a Snack"
 msgstr "Užina"
 
-#: gajim/common/const.py:249
+#: gajim/common/const.py:283
 msgid "Having Breakfast"
 msgstr "Doručkuje"
 
-#: gajim/common/const.py:250
+#: gajim/common/const.py:284
 msgid "Having Dinner"
 msgstr "Ruča"
 
-#: gajim/common/const.py:251
+#: gajim/common/const.py:285
 msgid "Having Lunch"
 msgstr "Večera"
 
-#: gajim/common/const.py:253
+#: gajim/common/const.py:287
 msgid "Exercising"
 msgstr "Vežba"
 
-#: gajim/common/const.py:254 gajim/common/const.py:305
+#: gajim/common/const.py:288 gajim/common/const.py:339
 msgid "Cycling"
 msgstr "Vozi biciklu"
 
-#: gajim/common/const.py:255
+#: gajim/common/const.py:289
 msgid "Dancing"
 msgstr "Pleše"
 
-#: gajim/common/const.py:256
+#: gajim/common/const.py:290
 msgid "Hiking"
 msgstr "Šeta"
 
-#: gajim/common/const.py:257
+#: gajim/common/const.py:291
 msgid "Jogging"
 msgstr "Džogira"
 
-#: gajim/common/const.py:258
+#: gajim/common/const.py:292
 msgid "Playing Sports"
 msgstr "Bavi se sportom"
 
-#: gajim/common/const.py:259
+#: gajim/common/const.py:293
 msgid "Running"
 msgstr "Trči"
 
-#: gajim/common/const.py:260
+#: gajim/common/const.py:294
 msgid "Skiing"
 msgstr "Skija"
 
-#: gajim/common/const.py:261
+#: gajim/common/const.py:295
 msgid "Swimming"
 msgstr "Pliva"
 
-#: gajim/common/const.py:262
+#: gajim/common/const.py:296
 msgid "Working out"
 msgstr "Vežba"
 
-#: gajim/common/const.py:264
+#: gajim/common/const.py:298
 msgid "Grooming"
 msgstr "Češlja se"
 
-#: gajim/common/const.py:265
+#: gajim/common/const.py:299
 msgid "At the Spa"
 msgstr "U banji"
 
-#: gajim/common/const.py:266
+#: gajim/common/const.py:300
 msgid "Brushing Teeth"
 msgstr "Pere zube"
 
-#: gajim/common/const.py:267
+#: gajim/common/const.py:301
 msgid "Getting a Haircut"
 msgstr "Šiša se"
 
-#: gajim/common/const.py:268
+#: gajim/common/const.py:302
 msgid "Shaving"
 msgstr "Brije se"
 
-#: gajim/common/const.py:269
+#: gajim/common/const.py:303
 msgid "Taking a Bath"
 msgstr "Kupa se"
 
-#: gajim/common/const.py:270
+#: gajim/common/const.py:304
 msgid "Taking a Shower"
 msgstr "Tušira se"
 
-#: gajim/common/const.py:272
+#: gajim/common/const.py:306
 msgid "Having an Appointment"
 msgstr "Sastanči"
 
-#: gajim/common/const.py:274
+#: gajim/common/const.py:308
 msgid "Inactive"
 msgstr "Neaktivno"
 
-#: gajim/common/const.py:275
+#: gajim/common/const.py:309
 msgid "Day Off"
 msgstr "Slobodan dan"
 
-#: gajim/common/const.py:276
+#: gajim/common/const.py:310
 msgid "Hanging out"
 msgstr "Bleji"
 
-#: gajim/common/const.py:277
+#: gajim/common/const.py:311
 msgid "Hiding"
 msgstr "Krije se"
 
-#: gajim/common/const.py:278
+#: gajim/common/const.py:312
 msgid "On Vacation"
 msgstr "Na odmoru"
 
-#: gajim/common/const.py:279
+#: gajim/common/const.py:313
 msgid "Praying"
 msgstr "Moli se"
 
-#: gajim/common/const.py:280
+#: gajim/common/const.py:314
 msgid "Scheduled Holiday"
 msgstr "Zakazani odmor"
 
-#: gajim/common/const.py:282
+#: gajim/common/const.py:316
 msgid "Thinking"
 msgstr "Razmišlja"
 
-#: gajim/common/const.py:284
+#: gajim/common/const.py:318
 msgid "Relaxing"
 msgstr "Odmara se"
 
-#: gajim/common/const.py:285
+#: gajim/common/const.py:319
 msgid "Fishing"
 msgstr "Peca"
 
-#: gajim/common/const.py:286
+#: gajim/common/const.py:320
 msgid "Gaming"
 msgstr "Igra igrice"
 
-#: gajim/common/const.py:287
+#: gajim/common/const.py:321
 msgid "Going out"
 msgstr "Izlazi napolje"
 
-#: gajim/common/const.py:288
+#: gajim/common/const.py:322
 msgid "Partying"
 msgstr "Na provodu"
 
-#: gajim/common/const.py:289
+#: gajim/common/const.py:323
 msgid "Reading"
 msgstr "Čita"
 
-#: gajim/common/const.py:290
+#: gajim/common/const.py:324
 msgid "Rehearsing"
 msgstr "Uvežbava"
 
-#: gajim/common/const.py:291
+#: gajim/common/const.py:325
 msgid "Shopping"
 msgstr "U šopingu"
 
-#: gajim/common/const.py:292
+#: gajim/common/const.py:326
 msgid "Smoking"
 msgstr "Puši"
 
-#: gajim/common/const.py:293
+#: gajim/common/const.py:327
 msgid "Socializing"
 msgstr "Druži se"
 
-#: gajim/common/const.py:294
+#: gajim/common/const.py:328
 msgid "Sunbathing"
 msgstr "Sunča se"
 
-#: gajim/common/const.py:295
+#: gajim/common/const.py:329
 msgid "Watching TV"
 msgstr "Gleda TV"
 
-#: gajim/common/const.py:296
+#: gajim/common/const.py:330
 msgid "Watching a Movie"
 msgstr "Gleda film"
 
-#: gajim/common/const.py:298
+#: gajim/common/const.py:332
 msgid "Talking"
 msgstr "Priča"
 
-#: gajim/common/const.py:299
+#: gajim/common/const.py:333
 msgid "In Real Life"
 msgstr "U stvarnom životu"
 
-#: gajim/common/const.py:300
+#: gajim/common/const.py:334
 msgid "On the Phone"
 msgstr "Telefonira"
 
-#: gajim/common/const.py:301
+#: gajim/common/const.py:335
 msgid "On Video Phone"
 msgstr "Na video telefonu"
 
-#: gajim/common/const.py:303
+#: gajim/common/const.py:337
 msgid "Traveling"
 msgstr "Putuje"
 
-#: gajim/common/const.py:304
+#: gajim/common/const.py:338
 msgid "Commuting"
 msgstr "Muva se"
 
-#: gajim/common/const.py:306
+#: gajim/common/const.py:340
 msgid "Driving"
 msgstr "Vozi"
 
-#: gajim/common/const.py:307
+#: gajim/common/const.py:341
 msgid "In a Car"
 msgstr "U kolima"
 
-#: gajim/common/const.py:308
+#: gajim/common/const.py:342
 msgid "On a Bus"
 msgstr "U autobusu"
 
-#: gajim/common/const.py:309
+#: gajim/common/const.py:343
 msgid "On a Plane"
 msgstr "U avionu"
 
-#: gajim/common/const.py:310
+#: gajim/common/const.py:344
 msgid "On a Train"
 msgstr "U vozu"
 
-#: gajim/common/const.py:311
+#: gajim/common/const.py:345
 msgid "On a Trip"
 msgstr "Na putu"
 
-#: gajim/common/const.py:312
+#: gajim/common/const.py:346
 msgid "Walking"
 msgstr "Šeta"
 
-#: gajim/common/const.py:315
+#: gajim/common/const.py:349
 msgid "Coding"
 msgstr "Programira"
 
-#: gajim/common/const.py:316
+#: gajim/common/const.py:350
 msgid "In a Meeting"
 msgstr "Na sastanku"
 
-#: gajim/common/const.py:317
+#: gajim/common/const.py:351
 msgid "Studying"
 msgstr "Uči"
 
-#: gajim/common/const.py:318
+#: gajim/common/const.py:352
 msgid "Writing"
 msgstr "Piše"
 
-#: gajim/common/const.py:321
+#: gajim/common/const.py:355
 msgid "Afraid"
 msgstr "Uplašen"
 
-#: gajim/common/const.py:322
+#: gajim/common/const.py:356
 msgid "Amazed"
 msgstr "Oduševljen"
 
-#: gajim/common/const.py:323
+#: gajim/common/const.py:357
 msgid "Amorous"
 msgstr "Zaljubljen"
 
-#: gajim/common/const.py:324
+#: gajim/common/const.py:358
 msgid "Angry"
 msgstr "Ljut"
 
-#: gajim/common/const.py:325
+#: gajim/common/const.py:359
 msgid "Annoyed"
 msgstr "Iznerviran"
 
-#: gajim/common/const.py:326
+#: gajim/common/const.py:360
 msgid "Anxious"
 msgstr "Anksiozan"
 
-#: gajim/common/const.py:327
+#: gajim/common/const.py:361
 msgid "Aroused"
 msgstr "Napaljen"
 
-#: gajim/common/const.py:328
+#: gajim/common/const.py:362
 msgid "Ashamed"
 msgstr "Posramljen"
 
-#: gajim/common/const.py:329
+#: gajim/common/const.py:363
 msgid "Bored"
 msgstr "Smoren"
 
-#: gajim/common/const.py:330
+#: gajim/common/const.py:364
 msgid "Brave"
 msgstr "Hrabar"
 
-#: gajim/common/const.py:331
+#: gajim/common/const.py:365
 msgid "Calm"
 msgstr "Miran"
 
-#: gajim/common/const.py:332
+#: gajim/common/const.py:366
 msgid "Cautious"
 msgstr "Oprezan"
 
-#: gajim/common/const.py:333
+#: gajim/common/const.py:367
 msgid "Cold"
 msgstr "Smrznut"
 
-#: gajim/common/const.py:334
+#: gajim/common/const.py:368
 msgid "Confident"
 msgstr "Pouzdan"
 
-#: gajim/common/const.py:335
+#: gajim/common/const.py:369
 msgid "Confused"
 msgstr "Zbunjen"
 
-#: gajim/common/const.py:336
+#: gajim/common/const.py:370
 msgid "Contemplative"
 msgstr "Zadubljen u misli"
 
-#: gajim/common/const.py:337
+#: gajim/common/const.py:371
 msgid "Contented"
 msgstr "Zadovoljan"
 
-#: gajim/common/const.py:338
+#: gajim/common/const.py:372
 msgid "Cranky"
 msgstr "Na kraju živaca"
 
-#: gajim/common/const.py:339
+#: gajim/common/const.py:373
 msgid "Crazy"
 msgstr "Lud"
 
-#: gajim/common/const.py:340
+#: gajim/common/const.py:374
 msgid "Creative"
 msgstr "Kreativan"
 
-#: gajim/common/const.py:341
+#: gajim/common/const.py:375
 msgid "Curious"
 msgstr "Zainteresovan"
 
-#: gajim/common/const.py:342
+#: gajim/common/const.py:376
 msgid "Dejected"
 msgstr "Potišten"
 
-#: gajim/common/const.py:343
+#: gajim/common/const.py:377
 msgid "Depressed"
 msgstr "Depresivan"
 
-#: gajim/common/const.py:344
+#: gajim/common/const.py:378
 msgid "Disappointed"
 msgstr "Razočaran"
 
-#: gajim/common/const.py:345
+#: gajim/common/const.py:379
 msgid "Disgusted"
 msgstr "Zgađen"
 
-#: gajim/common/const.py:346
+#: gajim/common/const.py:380
 msgid "Dismayed"
 msgstr "Skrhan"
 
-#: gajim/common/const.py:347
+#: gajim/common/const.py:381
 msgid "Distracted"
 msgstr "Ometen"
 
-#: gajim/common/const.py:348
+#: gajim/common/const.py:382
 msgid "Embarrassed"
 msgstr "Postiđen"
 
-#: gajim/common/const.py:349
+#: gajim/common/const.py:383
 msgid "Envious"
 msgstr "Zavidljiv"
 
-#: gajim/common/const.py:350
+#: gajim/common/const.py:384
 msgid "Excited"
 msgstr "Uzbuđen"
 
-#: gajim/common/const.py:351
+#: gajim/common/const.py:385
 msgid "Flirtatious"
 msgstr "Za flertovanje"
 
-#: gajim/common/const.py:352
+#: gajim/common/const.py:386
 msgid "Frustrated"
 msgstr "Frustriran"
 
-#: gajim/common/const.py:353
+#: gajim/common/const.py:387
 msgid "Grateful"
 msgstr "Zahvalan"
 
-#: gajim/common/const.py:354
+#: gajim/common/const.py:388
 msgid "Grieving"
 msgstr "U patnji"
 
-#: gajim/common/const.py:355
+#: gajim/common/const.py:389
 msgid "Grumpy"
 msgstr "Mrgudan"
 
-#: gajim/common/const.py:356
+#: gajim/common/const.py:390
 msgid "Guilty"
 msgstr "Kriv"
 
-#: gajim/common/const.py:357
+#: gajim/common/const.py:391
 msgid "Happy"
 msgstr "Srećan"
 
-#: gajim/common/const.py:358
+#: gajim/common/const.py:392
 msgid "Hopeful"
 msgstr "U nadanju"
 
-#: gajim/common/const.py:359
+#: gajim/common/const.py:393
 msgid "Hot"
 msgstr "Naložen"
 
-#: gajim/common/const.py:360
+#: gajim/common/const.py:394
 msgid "Humbled"
 msgstr "Skroman"
 
-#: gajim/common/const.py:361
+#: gajim/common/const.py:395
 msgid "Humiliated"
 msgstr "Ponižen"
 
-#: gajim/common/const.py:362
+#: gajim/common/const.py:396
 msgid "Hungry"
 msgstr "Gladan"
 
-#: gajim/common/const.py:363
+#: gajim/common/const.py:397
 msgid "Hurt"
 msgstr "Povređen"
 
-#: gajim/common/const.py:364
+#: gajim/common/const.py:398
 msgid "Impressed"
 msgstr "Impresioniran"
 
-#: gajim/common/const.py:365
+#: gajim/common/const.py:399
 msgid "In Awe"
 msgstr "Očaran"
 
-#: gajim/common/const.py:366
+#: gajim/common/const.py:400
 msgid "In Love"
 msgstr "Zaljubljen"
 
-#: gajim/common/const.py:367
+#: gajim/common/const.py:401
 msgid "Indignant"
 msgstr "Ozlojeđen"
 
-#: gajim/common/const.py:368
+#: gajim/common/const.py:402
 msgid "Interested"
 msgstr "Zainteresovan"
 
-#: gajim/common/const.py:369
+#: gajim/common/const.py:403
 msgid "Intoxicated"
 msgstr "Otrovan"
 
-#: gajim/common/const.py:370
+#: gajim/common/const.py:404
 msgid "Invincible"
 msgstr "Nepobediv"
 
-#: gajim/common/const.py:371
+#: gajim/common/const.py:405
 msgid "Jealous"
 msgstr "Ljubomoran"
 
-#: gajim/common/const.py:372
+#: gajim/common/const.py:406
 msgid "Lonely"
 msgstr "Usamljen"
 
-#: gajim/common/const.py:373
+#: gajim/common/const.py:407
 msgid "Lost"
 msgstr "Izgubljen"
 
-#: gajim/common/const.py:374
+#: gajim/common/const.py:408
 msgid "Lucky"
 msgstr "Srećan"
 
-#: gajim/common/const.py:375
+#: gajim/common/const.py:409
 msgid "Mean"
 msgstr "Zloban"
 
-#: gajim/common/const.py:376
+#: gajim/common/const.py:410
 msgid "Moody"
 msgstr "Raspoložen"
 
-#: gajim/common/const.py:377
+#: gajim/common/const.py:411
 msgid "Nervous"
 msgstr "Nervozan"
 
-#: gajim/common/const.py:378
+#: gajim/common/const.py:412
 msgid "Neutral"
 msgstr "Neutralan"
 
-#: gajim/common/const.py:379
+#: gajim/common/const.py:413
 msgid "Offended"
 msgstr "Uvređen"
 
-#: gajim/common/const.py:380
+#: gajim/common/const.py:414
 msgid "Outraged"
 msgstr "Pobesneo"
 
-#: gajim/common/const.py:381
+#: gajim/common/const.py:415
 msgid "Playful"
 msgstr "Igrao bi se"
 
-#: gajim/common/const.py:382
+#: gajim/common/const.py:416
 msgid "Proud"
 msgstr "Ponosan"
 
-#: gajim/common/const.py:383
+#: gajim/common/const.py:417
 msgid "Relaxed"
 msgstr "Opušten"
 
-#: gajim/common/const.py:384
+#: gajim/common/const.py:418
 msgid "Relieved"
 msgstr "Olakšan"
 
-#: gajim/common/const.py:385
+#: gajim/common/const.py:419
 msgid "Remorseful"
 msgstr "Samilostan"
 
-#: gajim/common/const.py:386
+#: gajim/common/const.py:420
 msgid "Restless"
 msgstr "Neumoran"
 
-#: gajim/common/const.py:387
+#: gajim/common/const.py:421
 msgid "Sad"
 msgstr "Tužan"
 
-#: gajim/common/const.py:388
+#: gajim/common/const.py:422
 msgid "Sarcastic"
 msgstr "Sarkastičan"
 
-#: gajim/common/const.py:389
+#: gajim/common/const.py:423
 msgid "Satisfied"
 msgstr "Zadovoljan"
 
-#: gajim/common/const.py:390
+#: gajim/common/const.py:424
 msgid "Serious"
 msgstr "Ozbiljan"
 
-#: gajim/common/const.py:391
+#: gajim/common/const.py:425
 msgid "Shocked"
 msgstr "Šokiran"
 
-#: gajim/common/const.py:392
+#: gajim/common/const.py:426
 msgid "Shy"
 msgstr "Stidljiv"
 
-#: gajim/common/const.py:393
+#: gajim/common/const.py:427
 msgid "Sick"
 msgstr "Bolestan"
 
-#: gajim/common/const.py:394
+#: gajim/common/const.py:428
 msgid "Sleepy"
 msgstr "Pospan"
 
-#: gajim/common/const.py:395
+#: gajim/common/const.py:429
 msgid "Spontaneous"
 msgstr "Spontan"
 
-#: gajim/common/const.py:396
+#: gajim/common/const.py:430
 msgid "Stressed"
 msgstr "Pod stresom"
 
-#: gajim/common/const.py:397
+#: gajim/common/const.py:431
 msgid "Strong"
 msgstr "Jak"
 
-#: gajim/common/const.py:398
+#: gajim/common/const.py:432
 msgid "Surprised"
 msgstr "Iznenađen"
 
-#: gajim/common/const.py:399
+#: gajim/common/const.py:433
 msgid "Thankful"
 msgstr "Zahvalan"
 
-#: gajim/common/const.py:400
+#: gajim/common/const.py:434
 msgid "Thirsty"
 msgstr "Žedan"
 
-#: gajim/common/const.py:401
+#: gajim/common/const.py:435
 msgid "Tired"
 msgstr "Umoran"
 
-#: gajim/common/const.py:402
+#: gajim/common/const.py:436
 msgid "Undefined"
 msgstr "Nedefinisan"
 
-#: gajim/common/const.py:403
+#: gajim/common/const.py:437
 msgid "Weak"
 msgstr "Slab"
 
-#: gajim/common/const.py:404
+#: gajim/common/const.py:438
 msgid "Worried"
 msgstr "Zabrinut"
 
-#: gajim/common/const.py:408
+#: gajim/common/const.py:442
 msgid "accuracy"
 msgstr ""
 
-#: gajim/common/const.py:409
+#: gajim/common/const.py:443
 #, fuzzy
 msgid "alt"
 msgstr "podrazumevano"
 
-#: gajim/common/const.py:410
+#: gajim/common/const.py:444
 msgid "area"
 msgstr ""
 
-#: gajim/common/const.py:411
+#: gajim/common/const.py:445
 #, fuzzy
 msgid "bearing"
 msgstr "morska"
 
-#: gajim/common/const.py:412
+#: gajim/common/const.py:446
 #, fuzzy
 msgid "building"
 msgstr "Krije se"
 
-#: gajim/common/const.py:413
+#: gajim/common/const.py:447
 #, fuzzy
 msgid "country"
 msgstr "Nalog"
 
-#: gajim/common/const.py:414
+#: gajim/common/const.py:448
 #, fuzzy
 msgid "countrycode"
 msgstr "Nalog"
 
-#: gajim/common/const.py:415
+#: gajim/common/const.py:449
 msgid "datum"
 msgstr ""
 
-#: gajim/common/const.py:416
+#: gajim/common/const.py:450
 #, fuzzy
 msgid "description"
 msgstr "Opis"
 
-#: gajim/common/const.py:417
+#: gajim/common/const.py:451
 #, fuzzy
 msgid "error"
 msgstr "Greška"
 
-#: gajim/common/const.py:418
+#: gajim/common/const.py:452
 msgid "floor"
 msgstr ""
 
-#: gajim/common/const.py:419
+#: gajim/common/const.py:453
 msgid "lat"
 msgstr ""
 
-#: gajim/common/const.py:420
+#: gajim/common/const.py:454
 msgid "locality"
 msgstr ""
 
-#: gajim/common/const.py:421
+#: gajim/common/const.py:455
 #, fuzzy
 msgid "lon"
 msgstr "jedan"
 
-#: gajim/common/const.py:422
+#: gajim/common/const.py:456
 msgid "postalcode"
 msgstr ""
 
-#: gajim/common/const.py:423
+#: gajim/common/const.py:457
 msgid "region"
 msgstr ""
 
-#: gajim/common/const.py:424
+#: gajim/common/const.py:458
 msgid "room"
 msgstr "soba"
 
-#: gajim/common/const.py:425
+#: gajim/common/const.py:459
 msgid "speed"
 msgstr ""
 
-#: gajim/common/const.py:426
+#: gajim/common/const.py:460
 msgid "street"
 msgstr ""
 
-#: gajim/common/const.py:427
+#: gajim/common/const.py:461
 msgid "text"
 msgstr ""
 
-#: gajim/common/const.py:428
+#: gajim/common/const.py:462
 msgid "timestamp"
 msgstr ""
 
-#: gajim/common/const.py:429
+#: gajim/common/const.py:463
 msgid "URI"
 msgstr ""
 
-#: gajim/common/const.py:434
+#: gajim/common/const.py:468
 msgid "Unable to get issuer certificate"
 msgstr "Nisam uspeo da uzmem sertifikat izdavača"
 
-#: gajim/common/const.py:435
+#: gajim/common/const.py:469
 msgid "Unable to get certificate CRL"
 msgstr "Nisam uspeo da uzmem CRL sertifikata"
 
-#: gajim/common/const.py:436
+#: gajim/common/const.py:470
 msgid "Unable to decrypt certificate's signature"
 msgstr "Nisam uspeo da dešifrujem potpis sertifikata"
 
-#: gajim/common/const.py:437
+#: gajim/common/const.py:471
 msgid "Unable to decrypt CRL's signature"
 msgstr "Nisam uspeo da dešifrujem CRL sertifikata"
 
-#: gajim/common/const.py:438
+#: gajim/common/const.py:472
 msgid "Unable to decode issuer public key"
 msgstr "Nisam uspeo da dekodiram javni ključ izdavača"
 
-#: gajim/common/const.py:439
+#: gajim/common/const.py:473
 msgid "Certificate signature failure"
 msgstr "Greška u potpisu sertifikata"
 
-#: gajim/common/const.py:440
+#: gajim/common/const.py:474
 msgid "CRL signature failure"
 msgstr "Greška u CRL sertifikata"
 
-#: gajim/common/const.py:441
+#: gajim/common/const.py:475
 msgid "Certificate is not yet valid"
 msgstr "Sertifikat još nije validan"
 
-#: gajim/common/const.py:442
+#: gajim/common/const.py:476
 msgid "Certificate has expired"
 msgstr "Sertifikat je istekao"
 
-#: gajim/common/const.py:443
+#: gajim/common/const.py:477
 msgid "CRL is not yet valid"
 msgstr "CRL nije još validan"
 
-#: gajim/common/const.py:444
+#: gajim/common/const.py:478
 msgid "CRL has expired"
 msgstr "CRL je istekao"
 
-#: gajim/common/const.py:445
+#: gajim/common/const.py:479
 msgid "Format error in certificate's notBefore field"
 msgstr "Greška u formatu sertifakovog polja od kada je validan"
 
-#: gajim/common/const.py:446
+#: gajim/common/const.py:480
 msgid "Format error in certificate's notAfter field"
 msgstr "Greška u formatu sertifakovog polja do kada je validan"
 
-#: gajim/common/const.py:447
+#: gajim/common/const.py:481
 msgid "Format error in CRL's lastUpdate field"
 msgstr "Greška u formatu CRL-ovogpolja poslednjeg ažuriranja"
 
-#: gajim/common/const.py:448
+#: gajim/common/const.py:482
 msgid "Format error in CRL's nextUpdate field"
 msgstr "Greška u formatu CRL-ovogpolja sledećeg ažuriranja"
 
-#: gajim/common/const.py:449
+#: gajim/common/const.py:483
 msgid "Out of memory"
 msgstr "Nemam više memorije"
 
-#: gajim/common/const.py:450
+#: gajim/common/const.py:484
 msgid "Self signed certificate"
 msgstr "Samopotpisani sertifikat"
 
-#: gajim/common/const.py:451
+#: gajim/common/const.py:485
 msgid "Self signed certificate in certificate chain"
 msgstr "Samopotpisani sertifikat u lancu sertifikata"
 
-#: gajim/common/const.py:452
+#: gajim/common/const.py:486
 msgid "Unable to get local issuer certificate"
 msgstr "U nemogućnosti da uzmem sertifikat lokalnog izdavača"
 
-#: gajim/common/const.py:453
+#: gajim/common/const.py:487
 msgid "Unable to verify the first certificate"
 msgstr "U nemogućnosti da verifikujem prvi sertifikat"
 
-#: gajim/common/const.py:454
+#: gajim/common/const.py:488
 msgid "Certificate chain too long"
 msgstr "Lanac sertifikata predugačak"
 
-#: gajim/common/const.py:455
+#: gajim/common/const.py:489
 msgid "Certificate revoked"
 msgstr "Sertifikat povučen"
 
-#: gajim/common/const.py:456
+#: gajim/common/const.py:490
 msgid "Invalid CA certificate"
 msgstr "Neispravan sertifikat sertifikacionog tela (CA)"
 
-#: gajim/common/const.py:457
+#: gajim/common/const.py:491
 msgid "Path length constraint exceeded"
 msgstr "Prekoračena dužina putanje"
 
-#: gajim/common/const.py:458
+#: gajim/common/const.py:492
 msgid "Unsupported certificate purpose"
 msgstr "Nepodržana svrha sertifikata"
 
-#: gajim/common/const.py:459
+#: gajim/common/const.py:493
 msgid "Certificate not trusted"
 msgstr "Sertifikatu se ne veruje"
 
-#: gajim/common/const.py:460
+#: gajim/common/const.py:494
 msgid "Certificate rejected"
 msgstr "Sertifikat odbačen"
 
-#: gajim/common/const.py:461
+#: gajim/common/const.py:495
 msgid "Subject issuer mismatch"
 msgstr "Pogrešna tema izdavača sertifikata"
 
-#: gajim/common/const.py:462
+#: gajim/common/const.py:496
 msgid "Authority and subject key identifier mismatch"
 msgstr "Identifikator ključa autorizatora i teme se ne poklapaju"
 
-#: gajim/common/const.py:463
+#: gajim/common/const.py:497
 msgid "Authority and issuer serial number mismatch"
 msgstr "Serijski broj autorizatora i izdavača se ne poklapaju"
 
-#: gajim/common/const.py:464
+#: gajim/common/const.py:498
 msgid "Key usage does not include certificate signing"
 msgstr "Upotreba ključa ne uključuje potpisivanje sertifikata"
 
-#: gajim/common/const.py:465
+#: gajim/common/const.py:499
 msgid "Application verification failure"
 msgstr "Verifikacija aplikacije neuspela"
 
@@ -5163,199 +5312,199 @@ msgstr ""
 msgid "video output"
 msgstr ""
 
-#: gajim/common/helpers.py:210
+#: gajim/common/helpers.py:216
 msgid "Server must be between 1 and 1023 bytes"
 msgstr ""
 
-#: gajim/common/helpers.py:214
+#: gajim/common/helpers.py:220
 msgid "Invalid character in hostname."
 msgstr "Neispravan karakter u imenu hosta."
 
-#: gajim/common/helpers.py:216
+#: gajim/common/helpers.py:222
 msgid "Server address required."
 msgstr "Potrebna je adresa servera."
 
-#: gajim/common/helpers.py:220
+#: gajim/common/helpers.py:226
 msgid "Username must be between 1 and 1023 bytes"
 msgstr ""
 
-#: gajim/common/helpers.py:224
+#: gajim/common/helpers.py:230
 msgid "Invalid character in username."
 msgstr "Neispravan karakter u korisničkom imenu."
 
-#: gajim/common/helpers.py:230
+#: gajim/common/helpers.py:236
 msgid "Resource must be between 1 and 1023 bytes"
 msgstr ""
 
-#: gajim/common/helpers.py:234
+#: gajim/common/helpers.py:240
 msgid "Invalid character in resource."
 msgstr "Neispravan karakter u resursu."
 
-#: gajim/common/helpers.py:275
+#: gajim/common/helpers.py:281
 msgid "_Busy"
 msgstr "_Zauzet"
 
-#: gajim/common/helpers.py:277 gajim/gtk/tooltips.py:647
+#: gajim/common/helpers.py:283 gajim/gtk/tooltips.py:647
 msgid "Busy"
 msgstr "Zauzet"
 
-#: gajim/common/helpers.py:280
+#: gajim/common/helpers.py:286
 msgid "_Not Available"
 msgstr "_Nedostupan"
 
-#: gajim/common/helpers.py:282 gajim/gtk/tooltips.py:649
+#: gajim/common/helpers.py:288 gajim/gtk/tooltips.py:649
 msgid "Not Available"
 msgstr "Nedostupan"
 
-#: gajim/common/helpers.py:285
+#: gajim/common/helpers.py:291
 msgid "_Free for Chat"
 msgstr "_Slobodan za razgovor"
 
-#: gajim/common/helpers.py:287 gajim/gtk/tooltips.py:643
+#: gajim/common/helpers.py:293 gajim/gtk/tooltips.py:643
 msgid "Free for Chat"
 msgstr "Slobodan za razgovor"
 
-#: gajim/common/helpers.py:290
+#: gajim/common/helpers.py:296
 #, fuzzy
 msgid "?user status:_Available"
 msgstr "?status prenosa:Pauziran"
 
-#: gajim/common/helpers.py:292 gajim/gtk/tooltips.py:641
+#: gajim/common/helpers.py:298 gajim/gtk/tooltips.py:641
 #, fuzzy
 msgid "?user status:Available"
 msgstr "?status prenosa:Pauziran"
 
-#: gajim/common/helpers.py:294
+#: gajim/common/helpers.py:300
 msgid "Connecting"
 msgstr "Povezivanje"
 
-#: gajim/common/helpers.py:297 gajim/data/gui/preferences_window.ui:1251
+#: gajim/common/helpers.py:303 gajim/data/gui/preferences_window.ui:1251
 msgid "A_way"
 msgstr "O_dsutan"
 
-#: gajim/common/helpers.py:299 gajim/common/modules/adhoc_commands.py:120
-#: gajim/command_system/implementation/standard.py:139
+#: gajim/common/helpers.py:305 gajim/common/modules/adhoc_commands.py:120
+#: gajim/command_system/implementation/standard.py:141
 #: gajim/gtk/tooltips.py:645
 msgid "Away"
 msgstr "Odsutan"
 
-#: gajim/common/helpers.py:302
+#: gajim/common/helpers.py:308
 msgid "_Offline"
 msgstr "_Nije na vezi"
 
-#: gajim/common/helpers.py:304 gajim/gtk/tooltips.py:651
+#: gajim/common/helpers.py:310 gajim/gtk/tooltips.py:651
 msgid "Offline"
 msgstr "Nije na vezi"
 
-#: gajim/common/helpers.py:307
+#: gajim/common/helpers.py:313
 msgid "_Invisible"
 msgstr "_Nevidljiv"
 
-#: gajim/common/helpers.py:313
+#: gajim/common/helpers.py:319
 msgid "?contact has status:Unknown"
 msgstr "?kontakt ima status:Nepoznat"
 
-#: gajim/common/helpers.py:315
+#: gajim/common/helpers.py:321
 msgid "?contact has status:Has errors"
 msgstr "?kontakt ima status:Postoje greške"
 
-#: gajim/common/helpers.py:330
+#: gajim/common/helpers.py:336
 msgid "?Subscription we already have:None"
 msgstr "?Trenutna pretplata:Nijedna"
 
-#: gajim/common/helpers.py:332
+#: gajim/common/helpers.py:338
 msgid "To"
 msgstr "Za"
 
-#: gajim/common/helpers.py:334 gajim/data/gui/groups_post_window.ui:33
+#: gajim/common/helpers.py:340 gajim/data/gui/groups_post_window.ui:33
 msgid "From"
 msgstr "Od"
 
-#: gajim/common/helpers.py:336
+#: gajim/common/helpers.py:342
 msgid "Both"
 msgstr "Oboje"
 
-#: gajim/common/helpers.py:338 gajim/gtk/server_info.py:151
+#: gajim/common/helpers.py:344 gajim/gtk/server_info.py:151
 #, fuzzy
 msgid "Unknown"
 msgstr "?OS:Nepoznat"
 
-#: gajim/common/helpers.py:344
+#: gajim/common/helpers.py:350
 msgid "?Ask (for Subscription):None"
 msgstr "?Pitaj (za pretplatu):Nijedna"
 
-#: gajim/common/helpers.py:346
+#: gajim/common/helpers.py:352
 msgid "Subscribe"
 msgstr "Pretplatite se"
 
-#: gajim/common/helpers.py:355
+#: gajim/common/helpers.py:361
 msgid "?Group Chat Contact Role:None"
 msgstr "?Uloga kontakta u grupnom razgovoru:Nikakva"
 
-#: gajim/common/helpers.py:358
+#: gajim/common/helpers.py:364
 msgid "Moderators"
 msgstr "Moderatori"
 
-#: gajim/common/helpers.py:360
+#: gajim/common/helpers.py:366
 msgid "Moderator"
 msgstr "Moderator"
 
-#: gajim/common/helpers.py:363
+#: gajim/common/helpers.py:369 gajim/data/gui/groupchat_info_scrolled.ui:243
 msgid "Participants"
 msgstr "Učesnici"
 
-#: gajim/common/helpers.py:365
+#: gajim/common/helpers.py:371
 msgid "Participant"
 msgstr "Učesnik"
 
-#: gajim/common/helpers.py:368
+#: gajim/common/helpers.py:374
 msgid "Visitors"
 msgstr "Posjetitelji"
 
-#: gajim/common/helpers.py:370
+#: gajim/common/helpers.py:376
 msgid "Visitor"
 msgstr "Posetilac"
 
-#: gajim/common/helpers.py:376 gajim/gtk/tooltips.py:253
+#: gajim/common/helpers.py:382 gajim/gtk/tooltips.py:253
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "?Vezanost kontakta u grupnom razogovru:Nikakva"
 
-#: gajim/common/helpers.py:378 gajim/data/gui/groupchat_config.ui:32
+#: gajim/common/helpers.py:384 gajim/data/gui/groupchat_config.ui:32
 #: gajim/gtk/tooltips.py:259
 msgid "Owner"
 msgstr "Vlasnik"
 
-#: gajim/common/helpers.py:380 gajim/gtk/tooltips.py:257
+#: gajim/common/helpers.py:386 gajim/gtk/tooltips.py:257
 msgid "Administrator"
 msgstr "Administrator"
 
-#: gajim/common/helpers.py:382 gajim/data/gui/groupchat_config.ui:40
+#: gajim/common/helpers.py:388 gajim/data/gui/groupchat_config.ui:40
 #: gajim/gtk/tooltips.py:255 gajim/gtk/groupchat_config.py:105
 msgid "Member"
 msgstr "Član"
 
-#: gajim/common/helpers.py:421
+#: gajim/common/helpers.py:427
 msgid "is paying attention to the conversation"
 msgstr "sluša konverzaciju"
 
-#: gajim/common/helpers.py:423
+#: gajim/common/helpers.py:429
 msgid "is doing something else"
 msgstr "radi nešto drugo"
 
-#: gajim/common/helpers.py:425
+#: gajim/common/helpers.py:431
 #, fuzzy
 msgid "is composing a message…"
 msgstr "piše poruku..."
 
-#: gajim/common/helpers.py:428
+#: gajim/common/helpers.py:434
 msgid "paused composing a message"
 msgstr "pauza pri pisanju poruke"
 
-#: gajim/common/helpers.py:430
+#: gajim/common/helpers.py:436
 msgid "has closed the chat window or tab"
 msgstr "je zatvorio/zatvorila prozor ili jezičak razgovora"
 
-#: gajim/common/helpers.py:936 gajim/common/helpers.py:943
+#: gajim/common/helpers.py:942 gajim/common/helpers.py:949
 #, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
@@ -5363,22 +5512,22 @@ msgstr[0] "%d poruka čeka"
 msgstr[1] "%d poruka čekaju"
 msgstr[2] "%d poruka čeka"
 
-#: gajim/common/helpers.py:950
+#: gajim/common/helpers.py:956
 #, fuzzy, python-format
-msgid "from room %s"
-msgstr " iz sobe %s"
+msgid "from group chat %s"
+msgstr "u _grupnim razgovorima"
 
-#: gajim/common/helpers.py:953 gajim/common/helpers.py:970
+#: gajim/common/helpers.py:959 gajim/common/helpers.py:976
 #, fuzzy, python-format
 msgid "from user %s"
 msgstr " od korisnika %s"
 
-#: gajim/common/helpers.py:955
+#: gajim/common/helpers.py:961
 #, fuzzy, python-format
 msgid "from %s"
 msgstr " od %s"
 
-#: gajim/common/helpers.py:962 gajim/common/helpers.py:968
+#: gajim/common/helpers.py:968 gajim/common/helpers.py:974
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
@@ -5386,40 +5535,40 @@ 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:986 gajim/common/helpers.py:998
+#: gajim/common/helpers.py:992 gajim/common/helpers.py:1004
 #: gajim/data/gui/roster_window.ui:85 data/org.gajim.Gajim.desktop.in:4
 #: data/org.gajim.Gajim.appdata.xml.in:9
 msgid "Gajim"
 msgstr "Gajim"
 
-#: gajim/common/helpers.py:1000
+#: gajim/common/helpers.py:1006
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: gajim/common/helpers.py:1109 gajim/data/gui/add_new_contact_window.ui:25
+#: gajim/common/helpers.py:1115 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:1111
+#: gajim/common/helpers.py:1117
 msgid "Hello, I am $name."
 msgstr ""
 
-#: gajim/common/helpers.py:1215 gajim/common/helpers.py:1224
-#: gajim/common/helpers.py:1282
+#: gajim/common/helpers.py:1221 gajim/common/helpers.py:1230
+#: gajim/common/helpers.py:1288
 msgid "Timeout loading image"
 msgstr "Isteklo vreme za učitavanje slike"
 
-#: gajim/common/helpers.py:1234 gajim/common/helpers.py:1280
+#: gajim/common/helpers.py:1240 gajim/common/helpers.py:1286
 msgid "Image is too big"
 msgstr "Slika je prevelika"
 
-#: gajim/common/helpers.py:1245
+#: gajim/common/helpers.py:1251
 #, fuzzy
 msgid "PyCURL is not installed"
 msgstr "CRL nije još validan"
 
-#: gajim/common/helpers.py:1284
+#: gajim/common/helpers.py:1290
 #, fuzzy
 msgid "Error loading image"
 msgstr "Isteklo vreme za učitavanje slike"
@@ -5600,7 +5749,8 @@ msgstr "Status se promenio."
 
 #: gajim/common/modules/adhoc_commands.py:202
 #: gajim/common/modules/adhoc_commands.py:239
-msgid "Leave Groupchats"
+#, fuzzy
+msgid "Leave Group Chats"
 msgstr "Napusti grupne razgovore"
 
 #: gajim/common/modules/adhoc_commands.py:228
@@ -5609,15 +5759,18 @@ msgid "%(nickname)s on %(room_jid)s"
 msgstr "%(nickname)s sa grupnog razgovora u sobi %(room_jid)s"
 
 #: gajim/common/modules/adhoc_commands.py:232
-msgid "You have not joined a groupchat."
+#, fuzzy
+msgid "You have not joined a group chat."
 msgstr "Ppridružili ste se grupnom razgovoru."
 
 #: gajim/common/modules/adhoc_commands.py:240
-msgid "Choose the groupchats you want to leave"
+#, fuzzy
+msgid "Choose the group chats you want to leave"
 msgstr "Odaberite grupne razgovore koje želite da napustite"
 
 #: gajim/common/modules/adhoc_commands.py:289
-msgid "You left the following groupchats:"
+#, fuzzy
+msgid "You left the following group chats:"
 msgstr "Napustili ste sledeće grupne razgovore:"
 
 #: gajim/common/modules/roster_item_exchange.py:102
@@ -5633,7 +5786,7 @@ msgstr "Poslati kontakti:"
 msgid "Blocked Contacts"
 msgstr "Blokirani kontakti"
 
-#: gajim/data/gui/destroy_muc_dialog.ui:79 gajim/gtk/dialogs.py:736
+#: gajim/data/gui/destroy_muc_dialog.ui:79 gajim/gtk/dialogs.py:563
 msgid "Destroy this group chat permanently?"
 msgstr ""
 
@@ -5642,7 +5795,7 @@ msgstr ""
 msgid "Reason..."
 msgstr "Razlog"
 
-#: gajim/data/gui/destroy_muc_dialog.ui:124 gajim/gtk/dialogs.py:738
+#: gajim/data/gui/destroy_muc_dialog.ui:124 gajim/gtk/dialogs.py:565
 msgid "Where participants should go (optional)"
 msgstr ""
 
@@ -5655,35 +5808,6 @@ msgstr ""
 msgid "_Reason and alternate venue (optional)"
 msgstr "Možete takođe uneti i alternativnu lokaciju:"
 
-#: gajim/data/gui/advanced_configuration_window.ui:7
-#: gajim/data/gui/preferences_window.ui:2723
-#, fuzzy
-msgid "Advanced Configuration Editor (ACE)"
-msgstr "Napredna izmena konfiguracije"
-
-#: gajim/data/gui/advanced_configuration_window.ui:52
-#, fuzzy
-msgid "You should restart Gajim for some changes to take effect"
-msgstr ""
-"<b>NAPOMENA:</b> Trebalo bi da ponovo pokrenete Gajim da bi neke izmene "
-"podešavanja postale primenjene"
-
-#: gajim/data/gui/advanced_configuration_window.ui:84
-#, fuzzy
-msgid "_Filter"
-msgstr "Filter:"
-
-#: gajim/data/gui/advanced_configuration_window.ui:153
-#: gajim/data/gui/filetransfers_send_file_dialog.ui:15
-#: gajim/gtk/discovery.py:1666
-msgid "Description"
-msgstr "Opis"
-
-#: gajim/data/gui/advanced_configuration_window.ui:197
-#, fuzzy
-msgid "_Reset to default"
-msgstr "_Ponovo učitaj podrazumevane boje"
-
 #: gajim/data/gui/join_groupchat_window.ui:56
 #: gajim/data/gui/chat_to_muc_window.ui:67
 #: gajim/data/gui/chat_to_muc_window.ui:78
@@ -5695,9 +5819,8 @@ msgid "Join group chat every time Gajim is started"
 msgstr ""
 
 #: gajim/data/gui/join_groupchat_window.ui:113
-#, fuzzy
-msgid "Auto Join"
-msgstr "Automatsko povezivanje"
+msgid "Join Automatically"
+msgstr ""
 
 #: gajim/data/gui/join_groupchat_window.ui:131
 #: gajim/data/gui/profile_window.ui:233
@@ -5706,10 +5829,11 @@ msgstr "Nalog"
 
 #: gajim/data/gui/join_groupchat_window.ui:147
 #, fuzzy
-msgid "Room"
-msgstr "Soba:"
+msgid "Group chat"
+msgstr "Grupni razgovori"
 
-#: gajim/data/gui/join_groupchat_window.ui:180 gajim/gtk/accounts.py:886
+#: gajim/data/gui/join_groupchat_window.ui:180 gajim/data/gui/bookmarks.ui:158
+#: gajim/gtk/accounts.py:889
 #, fuzzy
 msgid "Password"
 msgstr "Lozinka:"
@@ -5733,94 +5857,11 @@ msgstr "u _grupnim razgovorima"
 msgid "Search group chats on selected server"
 msgstr ""
 
-#: gajim/data/gui/join_groupchat_window.ui:437 gajim/gtk/discovery.py:1271
+#: gajim/data/gui/join_groupchat_window.ui:437 gajim/gtk/discovery.py:1270
 #, fuzzy
 msgid "Join"
 msgstr "_Pridruži se"
 
-#: gajim/data/gui/manage_proxies_window.ui:12
-#, fuzzy
-msgid "HTTP Connect"
-msgstr ""
-"HTTP spoj\n"
-"SOCKS5\n"
-"BOSH"
-
-#: gajim/data/gui/manage_proxies_window.ui:15
-msgid "SOCKS5"
-msgstr ""
-
-#: gajim/data/gui/manage_proxies_window.ui:18
-msgid "BOSH"
-msgstr ""
-
-#: gajim/data/gui/manage_proxies_window.ui:27
-msgid "Manage Proxy Profiles"
-msgstr "Podešavanje proksi profila"
-
-#: gajim/data/gui/manage_proxies_window.ui:83
-#, fuzzy
-msgid "Add Proxy"
-msgstr "Proksi:"
-
-#: gajim/data/gui/manage_proxies_window.ui:97
-#, fuzzy
-msgid "Remove Proxy"
-msgstr "Ukloni grupu"
-
-#: gajim/data/gui/manage_proxies_window.ui:141
-#, fuzzy
-msgid "Properties"
-msgstr "<b>Karakteristike</b>"
-
-#: gajim/data/gui/manage_proxies_window.ui:157
-#, fuzzy
-msgid "_Name"
-msgstr "_Ime:"
-
-#: gajim/data/gui/manage_proxies_window.ui:173
-#, fuzzy
-msgid "_Type"
-msgstr "Vrs_ta:"
-
-#: gajim/data/gui/manage_proxies_window.ui:236
-#, fuzzy
-msgid "_BOSH URL"
-msgstr "_BOSH adresa:"
-
-#: gajim/data/gui/manage_proxies_window.ui:261
-msgid "Use HTTP prox_y"
-msgstr "Kor_isti HTTP proksi"
-
-#: gajim/data/gui/manage_proxies_window.ui:280
-#, fuzzy
-msgid "Proxy _Host"
-msgstr "Proksi _host:"
-
-#: gajim/data/gui/manage_proxies_window.ui:307
-#, fuzzy
-msgid "Proxy _Port"
-msgstr "Proksi _port:"
-
-#: gajim/data/gui/manage_proxies_window.ui:334
-#, fuzzy
-msgid "_Username"
-msgstr "_Korisničko ime:"
-
-#: gajim/data/gui/manage_proxies_window.ui:347
-msgid "Use proxy auth_entication"
-msgstr "Koristi proksi prijavljivanje"
-
-#: gajim/data/gui/manage_proxies_window.ui:377
-#, fuzzy
-msgid "Pass_word"
-msgstr "Lozinka:"
-
-#: gajim/data/gui/manage_proxies_window.ui:405 gajim/gtk/adhoc.py:321
-#, fuzzy
-msgid "Settings"
-msgstr "Registracija neuspela"
-
 #: gajim/data/gui/change_password_dialog.ui:17
 #, fuzzy
 msgid "New Password"
@@ -5851,11 +5892,13 @@ msgid "Status:"
 msgstr "Status:"
 
 #: gajim/data/gui/zeroconf_information_window.ui:89
-msgid "_Log conversation history"
+#, fuzzy
+msgid "_Store conversation history"
 msgstr "_Pamti u dnevniku istorijat razgovora"
 
 #: gajim/data/gui/zeroconf_information_window.ui:215
 #: gajim/data/gui/vcard_information_window.ui:390
+#: gajim/data/gui/groupchat_info_scrolled.ui:166
 msgid "Contact"
 msgstr "Kontakt"
 
@@ -5868,8 +5911,9 @@ msgid "Last Name:"
 msgstr "Prezime:"
 
 #: gajim/data/gui/zeroconf_information_window.ui:260
-msgid "Jabber ID:"
-msgstr "Džaber ID:"
+#, fuzzy
+msgid "XMPP Address:"
+msgstr "AIM adresa:"
 
 #: gajim/data/gui/zeroconf_information_window.ui:273
 msgid "E-Mail:"
@@ -5889,8 +5933,9 @@ msgid "Send _File"
 msgstr "Pošalji _datoteku"
 
 #: gajim/data/gui/gc_occupants_menu.ui:29
-msgid "Occupant Actions"
-msgstr "_Akcije prisutnih"
+#, fuzzy
+msgid "Participant Actions"
+msgstr "Učesnici"
 
 #: gajim/data/gui/gc_occupants_menu.ui:38
 msgid "_Voice"
@@ -5921,8 +5966,9 @@ msgid "_Ban"
 msgstr "_Zabrani"
 
 #: gajim/data/gui/gc_occupants_menu.ui:124
-msgid "_Add to Roster"
-msgstr "_Dodaj na listu kontakata"
+#, fuzzy
+msgid "_Add to Contact List"
+msgstr "_Dodaj kontakt..."
 
 #: gajim/data/gui/gc_occupants_menu.ui:132
 #, fuzzy
@@ -5962,11 +6008,6 @@ msgstr "Pretplata: "
 msgid "_Status"
 msgstr "_Status"
 
-#: gajim/data/gui/zeroconf_context_menu.ui:26
-#: gajim/data/gui/account_context_menu.ui:79
-msgid "_Modify Account..."
-msgstr "_Izmeni nalog..."
-
 #: gajim/data/gui/certificate_dialog.ui:66
 #: gajim/data/gui/certificate_dialog.ui:178
 msgid "Common Name (CN)"
@@ -6048,13 +6089,19 @@ msgstr "Zadnji put izmenjeno:"
 msgid "Next entry"
 msgstr ""
 
+#: gajim/data/gui/filetransfers_send_file_dialog.ui:15
+#: gajim/data/gui/advanced_configuration.ui:143
+#: gajim/data/gui/groupchat_info_scrolled.ui:48 gajim/gtk/discovery.py:1663
+msgid "Description"
+msgstr "Opis"
+
 #: gajim/data/gui/filetransfers_send_file_dialog.ui:54
 #, fuzzy
 msgid "_Send Files"
 msgstr "Pošalji _datoteku"
 
 #: gajim/data/gui/filetransfers_send_file_dialog.ui:58
-#: gajim/gtk/xml_console.py:90
+#: gajim/gtk/xml_console.py:87
 #, fuzzy
 msgid "Send"
 msgstr "_Pošalji"
@@ -6079,20 +6126,23 @@ msgid "Change _Nickname..."
 msgstr "Promeni _nadimak..."
 
 #: gajim/data/gui/gc_control_popup_menu.ui:20
-msgid "_Manage Room"
-msgstr "Upravljanje sobama"
+#, fuzzy
+msgid "_Manage Group Chat"
+msgstr "_Novi grupni razgovor"
 
 #: gajim/data/gui/gc_control_popup_menu.ui:31
 msgid "Change _Subject..."
 msgstr "Promeni _temu..."
 
 #: gajim/data/gui/gc_control_popup_menu.ui:38
-msgid "Configure _Room..."
-msgstr "Podesi _sobu..."
+#, fuzzy
+msgid "Configure _Group Chat..."
+msgstr "Priključi se _grupnom razgovoru..."
 
 #: gajim/data/gui/gc_control_popup_menu.ui:52
-msgid "_Destroy Room"
-msgstr "Uništi sobu"
+#, fuzzy
+msgid "_Destroy Group Chat"
+msgstr "_Novi grupni razgovor"
 
 #: gajim/data/gui/gc_control_popup_menu.ui:64
 msgid "_Minimize on close"
@@ -6103,7 +6153,7 @@ msgstr "Umanji prozor na zatvaranje"
 msgid "_Request Voice"
 msgstr "_Glas"
 
-#: gajim/data/gui/gc_control_popup_menu.ui:99 gajim/gtk/discovery.py:1704
+#: gajim/data/gui/gc_control_popup_menu.ui:99
 msgid "_Bookmark"
 msgstr "_Markiraj ovu so_bu"
 
@@ -6155,13 +6205,6 @@ msgstr "<b>Lična strana:</b>"
 msgid "E-Mail"
 msgstr "E-mejl:"
 
-#: 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/blocking_list.ui:115 gajim/gtk/add_contact.py:30
-#: gajim/gtk/accounts.py:801
-msgid "Jabber ID"
-msgstr "Džaber ID"
-
 #: gajim/data/gui/profile_window.ui:440
 msgid "Main"
 msgstr ""
@@ -6294,35 +6337,42 @@ msgstr "Posao"
 msgid "About"
 msgstr "O"
 
-#: gajim/data/gui/start_chat_dialog.ui:114 gajim/gtk/discovery.py:1658
-msgid "Users"
-msgstr "Korisnici"
-
-#: gajim/data/gui/start_chat_dialog.ui:185
-msgid "Name:"
-msgstr "Ime:"
+#: gajim/data/gui/start_chat_dialog.ui:53
+#, fuzzy
+msgid "Global Group Chat Search"
+msgstr "Pridruži se grupnom razgovoru"
 
-#: gajim/data/gui/start_chat_dialog.ui:197
+#: 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
-msgid "Description:"
-msgstr "Opis:"
+msgid "_Back"
+msgstr "Vraćam se brzo"
 
-#: gajim/data/gui/start_chat_dialog.ui:209
+#: gajim/data/gui/start_chat_dialog.ui:245
+#: gajim/data/gui/groupchat_control.ui:796
+#: gajim/data/gui/groupchat_control.ui:888 gajim/gtk/discovery.py:1701
+#: gajim/gtk/groupchat_join.py:62
+msgid "_Join"
+msgstr "_Pridruži se"
+
+#: gajim/data/gui/start_chat_dialog.ui:289
 #, fuzzy
-msgid "Address:"
-msgstr "_Adresa:"
+msgid "Select Account"
+msgstr "Uklanjanje računa %s"
 
-#: gajim/data/gui/start_chat_dialog.ui:246
-msgid ""
-"Semi-Anonymous\n"
-"<span size=\"small\">(Only moderators can see your XMPP-Address)</span>"
+#: gajim/data/gui/start_chat_dialog.ui:380
+msgid "_Select"
 msgstr ""
 
 #: gajim/data/gui/filetransfers.ui:21
 msgid "Pa_use/Resume"
 msgstr ""
 
-#: gajim/data/gui/filetransfers.ui:30 gajim/gtk/filechoosers.py:178
+#: gajim/data/gui/filetransfers.ui:30 gajim/data/gui/groupchat_control.ui:575
+#: gajim/data/gui/groupchat_control.ui:667
+#: gajim/data/gui/groupchat_control.ui:779
+#: gajim/data/gui/groupchat_control.ui:871 gajim/gtk/filechoosers.py:178
 msgid "_Cancel"
 msgstr "_Odustani"
 
@@ -6364,7 +6414,8 @@ msgid "Cancel the selected file transfer and remove incomplete files"
 msgstr "Prekini prenos označene datoteke i izbriši nedovršenu datoteku"
 
 #: gajim/data/gui/filetransfers.ui:207
-msgid "Shows a list of file transfers between you and others"
+#, fuzzy
+msgid "Shows a list of file transfers between you and your contacts"
 msgstr "Prikazuje listu prenosa datoteka između Vas i ostalih"
 
 #: gajim/data/gui/groupchat_control.ui:13 gajim/data/gui/chat_control.ui:277
@@ -6384,7 +6435,6 @@ msgid "Strike"
 msgstr "Precrtano"
 
 #: gajim/data/gui/groupchat_control.ui:54 gajim/data/gui/chat_control.ui:318
-#: gajim/gtk/advanced_config.py:86
 msgid "Color"
 msgstr "Boja"
 
@@ -6397,16 +6447,46 @@ msgstr "Font"
 msgid "Clear formatting"
 msgstr "Očisti formatiranje"
 
-#: gajim/data/gui/groupchat_control.ui:290 gajim/data/gui/chat_control.ui:880
+#: gajim/data/gui/groupchat_control.ui:291 gajim/data/gui/chat_control.ui:880
 #, fuzzy
 msgid "Choose encryption"
 msgstr "Odaberite datoteku za slanje..."
 
-#: gajim/data/gui/groupchat_control.ui:336 gajim/data/gui/chat_control.ui:640
+#: gajim/data/gui/groupchat_control.ui:337 gajim/data/gui/chat_control.ui:640
 #, fuzzy
 msgid "Show a list of emojis (Alt+M)"
 msgstr "Prikaži listu smajlija (Alt+M)"
 
+#: gajim/data/gui/groupchat_control.ui:484
+#, fuzzy
+msgid "Joining…"
+msgstr "Zabrana..."
+
+#: gajim/data/gui/groupchat_control.ui:496
+msgid "_Abort"
+msgstr ""
+
+#: gajim/data/gui/groupchat_control.ui:542
+#, fuzzy
+msgid "Enter new nickname"
+msgstr "Unesite novi nadimak za kontakt %s"
+
+#: gajim/data/gui/groupchat_control.ui:592
+#: gajim/data/gui/groupchat_control.ui:684
+#, fuzzy
+msgid "Ch_ange"
+msgstr "Promeni _nadimak..."
+
+#: gajim/data/gui/groupchat_control.ui:761
+#, fuzzy
+msgid "Enter password"
+msgstr "Unesite novu lozinku:"
+
+#: gajim/data/gui/groupchat_control.ui:1067
+#, fuzzy
+msgid "_Try again"
+msgstr "Potvrdite ponovo..."
+
 #: gajim/data/gui/popup_notification_window.ui:42
 #, fuzzy
 msgid "Event Type"
@@ -6488,8 +6568,8 @@ msgstr "Odsutan"
 
 #: gajim/data/gui/mam_preferences.ui:18
 #, fuzzy
-msgid "Roster"
-msgstr "_Prikaži listu kontakata"
+msgid "Contact List"
+msgstr "Kontakti"
 
 #: gajim/data/gui/mam_preferences.ui:22
 #: gajim/data/gui/preferences_window.ui:123
@@ -6514,12 +6594,12 @@ msgid "Add"
 msgstr "Dodate"
 
 #: gajim/data/gui/mam_preferences.ui:194 gajim/data/gui/groupchat_config.ui:151
-#: gajim/gtk/dialogs.py:63 gajim/gtk/accounts.py:381
+#: gajim/gtk/dialogs.py:62 gajim/gtk/accounts.py:384
 #, fuzzy
 msgid "Remove"
 msgstr "_Ukloni"
 
-#: gajim/data/gui/vcard_information_window.ui:72 gajim/gtk/accounts.py:753
+#: gajim/data/gui/vcard_information_window.ui:72 gajim/gtk/accounts.py:756
 #, fuzzy
 msgid "Resource"
 msgstr "Resurs:"
@@ -6571,6 +6651,7 @@ msgstr "Pretplata: "
 #: gajim/data/gui/vcard_information_window.ui:974
 #: gajim/data/gui/vcard_information_window.ui:993
 #: gajim/data/gui/vcard_information_window.ui:1427
+#: gajim/data/gui/groupchat_info_scrolled.ui:222
 msgid "button"
 msgstr ""
 
@@ -6602,15 +6683,15 @@ msgstr "Obavesti me o kontaktima koji se _odjave"
 
 #: gajim/data/gui/preferences_window.ui:58
 #, fuzzy
-msgid "Show only in roster"
-msgstr "Prikaži događaj u listi kontakata"
+msgid "Show only in contact list"
+msgstr "Prikaži samo _aktivne kontakte"
 
 #: gajim/data/gui/preferences_window.ui:69
-msgid "Detached roster with detached chats"
+msgid "Detached contact list with detached chats"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:72
-msgid "Detached roster with single chat"
+msgid "Detached contact list with single chat"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:75
@@ -6618,11 +6699,11 @@ msgid "Single window for everything"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:78
-msgid "Detached roster with chat grouped by account"
+msgid "Detached contact list with chat grouped by account"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:81
-msgid "Detached roster with chat grouped by type"
+msgid "Detached contact list with chat grouped by type"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:92
@@ -6678,7 +6759,7 @@ msgstr "Ponašanje prozora:"
 
 #: gajim/data/gui/preferences_window.ui:296
 #, fuzzy
-msgid "_Show roster on startup"
+msgid "_Show contact list on startup"
 msgstr "_Prikaži listu kontakata"
 
 #: gajim/data/gui/preferences_window.ui:311
@@ -6694,12 +6775,12 @@ msgid "_Tabs placement"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:363
-msgid "_Quit Gajim when closing roster window"
+msgid "_Quit Gajim when closing contact list"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:367
 msgid ""
-"If enabled, Gajim will quit when closing the roster window instead of "
+"If enabled, Gajim will quit when closing the contact list window instead of "
 "minimizing to the system's notification area"
 msgstr ""
 
@@ -6709,41 +6790,42 @@ msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:423
 #, fuzzy
-msgid "Show a_vatars of contacts in roster"
+msgid "Show a_vatars of contacts in contact list"
 msgstr "Prikaži _avatare kontakata na listi"
 
 #: gajim/data/gui/preferences_window.ui:427
 #, fuzzy
 msgid ""
-"If checked, avatars of contacts will be shown in the roster window and in "
-"group chats"
+"If checked, avatars of contacts will be shown in the contact list window and "
+"in group chats"
 msgstr ""
 "Ako je označena, Gajim će prikazivati avatare kontakata u listi kontakata i "
 "u grupnim razgovorima"
 
 #: gajim/data/gui/preferences_window.ui:441
 #, fuzzy
-msgid "Show status _messages of contacts in roster"
+msgid "Show status _messages of contacts in contact list"
 msgstr "Prikaži statusne poruke kontakata na listi"
 
 #: gajim/data/gui/preferences_window.ui:445
 #, fuzzy
 msgid ""
 "If checked, status messages of contacts will be shown under the contact's "
-"name, in the roster window, and in group chats"
+"name, in the contact list window, and in group chats"
 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
 #, fuzzy
-msgid "Show e_xtra information of contacts in roster (mood, activity, ...)"
+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
 msgid ""
-"If checked, additional info published by the contact will be shown in "
-"roster. Additional infos (published via PEP) may include e.g. mood, "
+"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 ""
 
@@ -6752,8 +6834,9 @@ msgid "Sort contacts by status"
 msgstr "Sortiraj kontakte po statusu"
 
 #: gajim/data/gui/preferences_window.ui:494
-msgid "in _roster"
-msgstr "u _listi kontakata"
+#, fuzzy
+msgid "in _contact list"
+msgstr "Poslati kontakti:"
 
 #: gajim/data/gui/preferences_window.ui:511
 msgid "in _group chats"
@@ -6761,8 +6844,8 @@ msgstr "u _grupnim razgovorima"
 
 #: gajim/data/gui/preferences_window.ui:540
 #, fuzzy
-msgid "Roster Appearance"
-msgstr "<b>Izgled liste kontakata</b>"
+msgid "Contact List Appearance"
+msgstr "Razmena stavki kontakata"
 
 #: gajim/data/gui/preferences_window.ui:585
 #, fuzzy
@@ -6829,7 +6912,7 @@ msgstr "Nije moguće pridružiti se grupnom razgovoru"
 
 #: gajim/data/gui/preferences_window.ui:660
 #, fuzzy
-msgid "If checked, the room subject will be shown when joining a group chat"
+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:682
@@ -6844,13 +6927,13 @@ msgstr ""
 #: gajim/data/gui/preferences_window.ui:701
 msgid ""
 "If join/leave status messages are shown in the group chat. This setting can "
-"be overridden in the groupchat menu."
+"be overridden in the group chat menu."
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:720
 msgid ""
 "The default sync threshold for new public group chats. This setting can be "
-"overridden in the groupchat menu."
+"overridden in the group chat menu."
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:722
@@ -6865,7 +6948,7 @@ msgstr "_Zapisuj u dnevnik statusne promene kontakata"
 #: gajim/data/gui/preferences_window.ui:768
 msgid ""
 "If status change messages are shown in the group chat. This setting can be "
-"overridden in the groupchat menu."
+"overridden in the group chat menu."
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:825
@@ -6884,8 +6967,8 @@ msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:843
 #, fuzzy
-msgid "Show chatstate in roster"
-msgstr "Prikaži _avatare kontakata na listi"
+msgid "Show chatstate in contact list"
+msgstr "Prikaši dugme za zatvaranje u jezičku?"
 
 #: gajim/data/gui/preferences_window.ui:847
 msgid ""
@@ -7192,7 +7275,7 @@ msgstr ""
 msgid "Vi_ew own video source"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2281 gajim/gtk/accounts.py:352
+#: gajim/data/gui/preferences_window.ui:2281 gajim/gtk/accounts.py:355
 msgid "Connection"
 msgstr "Veza"
 
@@ -7246,7 +7329,8 @@ msgid "_Manage..."
 msgstr "_Podesi..."
 
 #: gajim/data/gui/preferences_window.ui:2616
-msgid "_Log status changes of contacts"
+#, fuzzy
+msgid "_Store status changes of contacts in history"
 msgstr "_Zapisuj u dnevnik statusne promene kontakata"
 
 #: gajim/data/gui/preferences_window.ui:2633
@@ -7271,10 +7355,15 @@ msgstr ""
 msgid "_Open..."
 msgstr "_Otvori..."
 
+#: gajim/data/gui/preferences_window.ui:2723 gajim/gtk/advanced_config.py:84
+#, fuzzy
+msgid "Advanced Configuration Editor (ACE)"
+msgstr "Napredna izmena konfiguracije"
+
 #: gajim/data/gui/groupchat_config.ui:55
 #, fuzzy
 msgid ""
-"<b>Jabber-ID</b>\n"
+"<b>XMPP Address</b>\n"
 "&lt;user@domain/resource&gt; (only that resource matches)\n"
 "&lt;user@domain&gt; (any resource matches)\n"
 "&lt;domain/resource&gt; (only that resource matches)\n"
@@ -7293,7 +7382,8 @@ msgstr ""
 msgid "Only Admins and Owners can modify the affiliation"
 msgstr ""
 
-#: gajim/data/gui/groupchat_config.ui:270 gajim/plugins/gui.py:312
+#: gajim/data/gui/groupchat_config.ui:270
+#: gajim/data/gui/groupchat_info_scrolled.ui:210 gajim/plugins/gui.py:324
 #, fuzzy
 msgid "Configuration"
 msgstr "Konfiguracija sobe"
@@ -7326,7 +7416,7 @@ msgid "Start _Chat"
 msgstr "Započni ra_zgovor"
 
 #: gajim/data/gui/contact_context_menu.ui:20
-#: gajim/data/gui/systray_context_menu.ui:36
+#: gajim/data/gui/systray_context_menu.ui:29
 msgid "Send Single _Message..."
 msgstr "Pošalji jednu _poruku..."
 
@@ -7387,17 +7477,45 @@ msgid "_Ignore"
 msgstr "_Ignoriši"
 
 #: gajim/data/gui/contact_context_menu.ui:174
-msgid "_Add to Roster..."
-msgstr "_Dodaj na listu kontakata..."
+#, fuzzy
+msgid "_Add to Contact List..."
+msgstr "_Dodaj kontakt..."
+
+#: gajim/data/gui/advanced_configuration.ui:39
+#, fuzzy
+msgid "You should restart Gajim for some changes to take effect"
+msgstr ""
+"<b>NAPOMENA:</b> Trebalo bi da ponovo pokrenete Gajim da bi neke izmene "
+"podešavanja postale primenjene"
+
+#: gajim/data/gui/advanced_configuration.ui:71
+#, fuzzy
+msgid "_Filter"
+msgstr "Filter:"
+
+#: gajim/data/gui/advanced_configuration.ui:88
+msgid "Type to search for values..."
+msgstr ""
+
+#: gajim/data/gui/advanced_configuration.ui:180
+#, fuzzy
+msgid "_Reset Value"
+msgstr "_Ponovo učitaj podrazumevane boje"
+
+#: gajim/data/gui/advanced_configuration.ui:185
+#, fuzzy
+msgid "Resets value to default"
+msgstr "_Ponovo učitaj podrazumevane boje"
 
 #: gajim/data/gui/account_creation_wizard_window.ui:43
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim: čarobnjak za kreiranje naloga"
 
 #: gajim/data/gui/account_creation_wizard_window.ui:70
+#, fuzzy
 msgid ""
 "You need to have an account in order to connect\n"
-"to the Jabber network."
+"to the XMPP network."
 msgstr ""
 "Morate posedovati račun da biste se mogli povezati\n"
 "na džaber mrežu."
@@ -7419,8 +7537,9 @@ msgid "<b>Please fill in the data for your existing account</b>"
 msgstr "<b>Molimo popunite podatke za Vaš postojeći korisnički nalog</b>"
 
 #: gajim/data/gui/account_creation_wizard_window.ui:187
-msgid "_Jabber ID:"
-msgstr "_Džaber ID:"
+#, fuzzy
+msgid "_XMPP Address:"
+msgstr "AIM adresa:"
 
 #: gajim/data/gui/account_creation_wizard_window.ui:239
 #: gajim/data/gui/account_creation_wizard_window.ui:394
@@ -7507,6 +7626,7 @@ msgid "Privacy Lists:"
 msgstr "Liste privatnosti:"
 
 #: gajim/data/gui/service_discovery_window.ui:111
+#: gajim/data/gui/groupchat_creation.ui:227
 #, fuzzy
 msgid "_Address"
 msgstr "_Adresa:"
@@ -7524,11 +7644,6 @@ msgstr "Sinhronizacija: odaberite kontakte"
 msgid "Select the contacts you want to synchronise"
 msgstr "Odaberite kontakte koje želite da sinhronizujete"
 
-#: gajim/data/gui/groupchat_invitation_received.ui:42
-#, fuzzy
-msgid "Group Chat Invitation"
-msgstr "Poziv na grupni razgovor"
-
 #: gajim/data/gui/groupchat_invitation_received.ui:111
 #, fuzzy
 msgid "Message..."
@@ -7579,11 +7694,10 @@ msgstr ""
 
 #: gajim/data/gui/add_new_contact_window.ui:84
 #, fuzzy
-msgid "_Jabber ID"
-msgstr "_Džaber ID:"
+msgid "_XMPP Address"
+msgstr "_Adresa:"
 
 #: gajim/data/gui/add_new_contact_window.ui:100
-#: gajim/data/gui/manage_bookmarks_window.ui:192
 #, fuzzy
 msgid "_Nickname"
 msgstr "_Nadimak:"
@@ -7661,7 +7775,7 @@ msgstr "<b>Raspoloženje:</b>"
 msgid "<b>Message:</b>"
 msgstr "<b>Poruka:</b>"
 
-#: gajim/data/gui/plugins_window.ui:10 gajim/data/gui/application_menu.ui:90
+#: gajim/data/gui/plugins_window.ui:10 gajim/data/gui/application_menu.ui:87
 msgid "Plugins"
 msgstr ""
 
@@ -7770,10 +7884,6 @@ msgstr "Dozvoli"
 msgid "Deny"
 msgstr "Odbij"
 
-#: gajim/data/gui/privacy_list_window.ui:317
-msgid "JabberID"
-msgstr "Džaber ID"
-
 #: gajim/data/gui/privacy_list_window.ui:358
 msgid "all in the group"
 msgstr "sve u grupi"
@@ -7815,7 +7925,7 @@ msgstr "Poredak:"
 msgid "Manage sounds"
 msgstr "Podešavanje naloga"
 
-#: gajim/data/gui/manage_sounds_window.ui:55 gajim/plugins/gui.py:100
+#: gajim/data/gui/manage_sounds_window.ui:55 gajim/plugins/gui.py:101
 msgid "Active"
 msgstr "Aktivno"
 
@@ -7853,23 +7963,115 @@ msgstr "Ukloni nalog i iz Gajima i sa servera"
 msgid "_Personal Events"
 msgstr "Lični događaji"
 
-#: gajim/data/gui/account_context_menu.ui:35
-#: gajim/data/gui/systray_context_menu.ui:28
-msgid "Join _Group Chat"
-msgstr "Priključi se _grupnom razgovoru"
-
-#: gajim/data/gui/account_context_menu.ui:49
+#: gajim/data/gui/account_context_menu.ui:41
 msgid "_Add Contact..."
 msgstr "_Dodaj kontakt..."
 
-#: gajim/data/gui/account_context_menu.ui:57
+#: gajim/data/gui/account_context_menu.ui:49
 msgid "_Discover Services"
 msgstr "_Otkrivanje servisa"
 
-#: gajim/data/gui/account_context_menu.ui:65
+#: gajim/data/gui/account_context_menu.ui:57
 msgid "_Execute Command..."
 msgstr "_Izvrši naredbu..."
 
+#: gajim/data/gui/account_context_menu.ui:65
+#, fuzzy
+msgid "_View Certificate"
+msgstr "Samopotpisani sertifikat"
+
+#: gajim/data/gui/manage_proxies.ui:12
+#, fuzzy
+msgctxt "proxy configuration"
+msgid "HTTP Connect"
+msgstr ""
+"HTTP spoj\n"
+"SOCKS5\n"
+"BOSH"
+
+#: gajim/data/gui/manage_proxies.ui:15
+msgctxt "proxy configuration"
+msgid "SOCKS5"
+msgstr ""
+
+#: gajim/data/gui/manage_proxies.ui:18
+#, fuzzy
+msgctxt "proxy configuration"
+msgid "BOSH"
+msgstr "_BOSH adresa:"
+
+#: gajim/data/gui/manage_proxies.ui:68
+#, fuzzy
+msgid "Add Proxy"
+msgstr "Proksi:"
+
+#: gajim/data/gui/manage_proxies.ui:82
+#, fuzzy
+msgid "Remove Proxy"
+msgstr "Ukloni grupu"
+
+#: gajim/data/gui/manage_proxies.ui:134
+#, fuzzy
+msgid "Pass_word"
+msgstr "Lozinka:"
+
+#: gajim/data/gui/manage_proxies.ui:159
+msgid "Use proxy auth_entication"
+msgstr "Koristi proksi prijavljivanje"
+
+#: gajim/data/gui/manage_proxies.ui:179
+#, fuzzy
+msgid "_Username"
+msgstr "_Korisničko ime:"
+
+#: gajim/data/gui/manage_proxies.ui:209
+#, fuzzy
+msgid "_Port"
+msgstr "_Port:"
+
+#: gajim/data/gui/manage_proxies.ui:226
+msgid "example.org"
+msgstr ""
+
+#: gajim/data/gui/manage_proxies.ui:240
+#, fuzzy
+msgid "_Host"
+msgstr "_Host:"
+
+#: gajim/data/gui/manage_proxies.ui:254
+msgid "Use HTTP prox_y"
+msgstr "Kor_isti HTTP proksi"
+
+#: gajim/data/gui/manage_proxies.ui:275
+msgid "https://example.org/http-bind/"
+msgstr ""
+
+#: gajim/data/gui/manage_proxies.ui:291
+#, fuzzy
+msgid "_BOSH URL"
+msgstr "_BOSH adresa:"
+
+#: gajim/data/gui/manage_proxies.ui:309 gajim/gtk/adhoc.py:322
+#, fuzzy
+msgid "Settings"
+msgstr "Registracija neuspela"
+
+#: gajim/data/gui/manage_proxies.ui:344
+#, fuzzy
+msgid "_Type"
+msgstr "Vrs_ta:"
+
+#: gajim/data/gui/manage_proxies.ui:361
+#: gajim/data/gui/groupchat_creation.ui:105
+#, fuzzy
+msgid "_Name"
+msgstr "_Ime:"
+
+#: gajim/data/gui/manage_proxies.ui:391 gajim/gtk/accounts.py:742
+#, fuzzy
+msgid "Proxy"
+msgstr "Proksi:"
+
 #: gajim/data/gui/application_menu.ui:8
 #, fuzzy
 msgid "View"
@@ -7877,8 +8079,8 @@ msgstr "_Prikaz"
 
 #: gajim/data/gui/application_menu.ui:11
 #, fuzzy
-msgid "Show Roster"
-msgstr "_Prikaži listu kontakata"
+msgid "Show Contact List"
+msgstr "Prikaži samo _aktivne kontakte"
 
 #: gajim/data/gui/application_menu.ui:16
 #, fuzzy
@@ -7919,23 +8121,24 @@ msgstr ""
 msgid "Features"
 msgstr "Mogućnosti"
 
-#: gajim/data/gui/application_menu.ui:81
+#: gajim/data/gui/application_menu.ui:77
+#: gajim/data/gui/groupchat_creation.ui:81 gajim/gtk/groupchat_creation.py:45
 #, fuzzy
-msgid "Bookmarks"
-msgstr "_Markiraj ovu so_bu"
+msgid "Create Group Chat"
+msgstr "Napusti grupne razgovore"
 
-#: gajim/data/gui/application_menu.ui:94 gajim/data/gui/shortcuts_window.ui:189
-#: gajim/gtk/preferences.py:59
+#: gajim/data/gui/application_menu.ui:91 gajim/data/gui/shortcuts_window.ui:189
+#: gajim/gtk/preferences.py:58
 msgid "Preferences"
 msgstr "Podešavanja"
 
-#: gajim/data/gui/application_menu.ui:99
+#: gajim/data/gui/application_menu.ui:96
 #, fuzzy
 msgid "Quit"
 msgstr "_Izlaz"
 
 #: gajim/data/gui/httpupload_progress_dialog.ui:110
-#: gajim/gtk/filetransfer.py:121
+#: gajim/gtk/filetransfer.py:120
 msgid "Progress"
 msgstr "Napredak"
 
@@ -7952,52 +8155,33 @@ msgstr ""
 msgid "_Cancel Upload"
 msgstr "_Odustani"
 
-#: gajim/data/gui/manage_bookmarks_window.ui:13
-#, fuzzy
-msgid "Group Chat Bookmarks"
-msgstr "_Grupni razgovor"
-
-#: gajim/data/gui/manage_bookmarks_window.ui:68
-#, fuzzy
-msgid "Add Bookmark"
-msgstr "_Markiraj ovu so_bu"
-
-#: gajim/data/gui/manage_bookmarks_window.ui:82
-#, fuzzy
-msgid "Remove Bookmark"
-msgstr "_Markiraj ovu so_bu"
+#: gajim/data/gui/groupchat_creation.ui:27
+msgid "Public or Private?"
+msgstr ""
 
-#: gajim/data/gui/manage_bookmarks_window.ui:126
-msgid "N_ame"
+#: 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 ""
 
-#: gajim/data/gui/manage_bookmarks_window.ui:145
-#, fuzzy
-msgid "Bookmark Name"
-msgstr "Markiraj ovu sobu"
+#: gajim/data/gui/groupchat_creation.ui:58
+msgid "<b>Public:</b> Anyone who knows the address can join."
+msgstr ""
 
-#: gajim/data/gui/manage_bookmarks_window.ui:160
+#: gajim/data/gui/groupchat_creation.ui:122
 #, fuzzy
-msgid "_Server"
-msgstr "_Server:"
+msgid "_Description"
+msgstr "Opis"
 
-#: gajim/data/gui/manage_bookmarks_window.ui:223
-msgid "Roo_m"
+#: gajim/data/gui/groupchat_creation.ui:164
+msgid "_Public"
 msgstr ""
 
-#: gajim/data/gui/manage_bookmarks_window.ui:253
+#: gajim/data/gui/groupchat_creation.ui:278
 #, fuzzy
-msgid "_Password"
-msgstr "_Lozinka:"
-
-#: gajim/data/gui/manage_bookmarks_window.ui:299
-#, fuzzy
-msgid "Join chat when connected"
-msgstr "Kontakt Otišao Sa Veze"
-
-#: gajim/data/gui/manage_bookmarks_window.ui:307
-msgid "_Join Automatically"
-msgstr ""
+msgid "_Account"
+msgstr "_Nalozi"
 
 #: gajim/data/gui/exception_dialog.ui:49
 msgid "Sorry, that should not have happened"
@@ -8040,6 +8224,29 @@ msgstr "Odobri autorizaciju kontakta tako da može da vidi kada ste na vezi"
 msgid "Presets"
 msgstr "_Prisutnost"
 
+#: gajim/data/gui/groupchat_info_scrolled.ui:32
+#, fuzzy
+msgid "Address"
+msgstr "_Adresa:"
+
+#: gajim/data/gui/groupchat_info_scrolled.ui:64
+msgid "Topic"
+msgstr ""
+
+#: gajim/data/gui/groupchat_info_scrolled.ui:80
+#, fuzzy
+msgid "Author"
+msgstr "_Odobri autorizaciju"
+
+#: gajim/data/gui/groupchat_info_scrolled.ui:182
+msgid "Discussion Logs"
+msgstr ""
+
+#: gajim/data/gui/groupchat_info_scrolled.ui:260
+#, fuzzy
+msgid "Group Chat Language"
+msgstr "Poziv na grupni razgovor"
+
 #: gajim/data/gui/emoji_chooser.ui:98
 #, fuzzy
 msgid "No Results Found"
@@ -8052,24 +8259,35 @@ msgstr "Pozovi prijatelje!"
 #: gajim/data/gui/chat_to_muc_window.ui:39
 #, fuzzy
 msgid ""
-"You are now entering a groupchat.\n"
+"You are now entering a group chat.\n"
 "Select the contacts you want to invite"
 msgstr ""
 "Započećete grupni razgovor.\n"
 "Odaberite kontakte koje želite da pozovete"
 
 #: gajim/data/gui/chat_to_muc_window.ui:112
-msgid "Please select a MUC server."
+#, fuzzy
+msgid "Please select a group chat server."
 msgstr "Molimo odaberite server grupnog razgovora."
 
 #: gajim/data/gui/chat_to_muc_window.ui:141
-msgid "MUC server"
-msgstr "Server grupnog razgovora"
+#, fuzzy
+msgid "Group chat server"
+msgstr "Grupni razgovori"
 
 #: gajim/data/gui/chat_to_muc_window.ui:176
 msgid "In_vite"
 msgstr "Pozo_vi"
 
+#: gajim/data/gui/bookmarks.ui:176
+#, fuzzy
+msgid "Autojoin"
+msgstr "Automatsko povezivanje"
+
+#: gajim/data/gui/bookmarks.ui:211
+msgid "_Apply"
+msgstr ""
+
 #: gajim/data/gui/history_manager.ui:11
 #, fuzzy
 msgid "_Export"
@@ -8085,12 +8303,13 @@ msgid "Gajim History Logs Manager"
 msgstr "Gajim menadžer dnevnika istorijata"
 
 #: gajim/data/gui/history_manager.ui:108
+#, fuzzy
 msgid ""
-"This log manager is not intended for log viewing. If you are looking for "
-"such functionality, use the history window instead.\n"
+"This history manager is not intended for viewing chat history. If you are "
+"looking for such functionality, please use the history window instead.\n"
 "\n"
-"Use this program to delete or export logs. You can select logs from the left "
-"and/or search database from below."
+"You can use this program to delete or export history. Either select logs "
+"from the left or search the database."
 msgstr ""
 "Ovaj menadžer dnevnika nije namenjen za pregled dnevnika. Ako Vam treba ta "
 "funkcionalnost, koristite menadžer dnevnika istorijata.\n"
@@ -8143,8 +8362,9 @@ msgid "Select an emoji"
 msgstr ""
 
 #: gajim/data/gui/shortcuts_window.ui:38
-msgid "Complete a command or a nick"
-msgstr ""
+#, fuzzy
+msgid "Complete a command or a nickname"
+msgstr "Molimo Vas napravite novu čistu temu sa željenim imenom."
 
 #: gajim/data/gui/shortcuts_window.ui:45
 #, fuzzy
@@ -8184,7 +8404,7 @@ msgstr ""
 msgid "Scroll down"
 msgstr ""
 
-#: gajim/data/gui/shortcuts_window.ui:100 gajim/gtk/xml_console.py:72
+#: gajim/data/gui/shortcuts_window.ui:100 gajim/gtk/xml_console.py:69
 #, fuzzy
 msgid "Clear"
 msgstr "Čisti"
@@ -8226,8 +8446,9 @@ msgid "Close chat"
 msgstr ""
 
 #: gajim/data/gui/shortcuts_window.ui:173
-msgid "Roster Shortcuts"
-msgstr ""
+#, fuzzy
+msgid "Contact List Shortcuts"
+msgstr "Razmena stavki kontakata"
 
 #: gajim/data/gui/shortcuts_window.ui:196
 #, fuzzy
@@ -8260,7 +8481,7 @@ msgid "Show only active contacts"
 msgstr "Prikaži samo _aktivne kontakte"
 
 #: gajim/data/gui/shortcuts_window.ui:251
-msgid "Enable roster filtering"
+msgid "Enable contact list filtering"
 msgstr ""
 
 #: gajim/data/gui/shortcuts_window.ui:259
@@ -8307,12 +8528,12 @@ msgstr ""
 
 #: gajim/data/gui/history_window.ui:317
 #, fuzzy
-msgid "Record history for this chat"
+msgid "Store history for this chat"
 msgstr "Ignoriši ovu grešku za ovaj sertifikat."
 
 #: gajim/data/gui/history_window.ui:332
 #, fuzzy
-msgid "Record History"
+msgid "Store History"
 msgstr "Nedavno:"
 
 #: gajim/data/gui/history_window.ui:350
@@ -8333,9 +8554,10 @@ msgstr "Napravi novu objavu"
 msgid "Fill in the form."
 msgstr "Popunite formular."
 
-#: gajim/data/gui/data_form_window.ui:229
-msgid "Room Configuration"
-msgstr "Konfiguracija sobe"
+#: gajim/data/gui/data_form_window.ui:229 gajim/gtk/groupchat_config.py:41
+#, fuzzy
+msgid "Group Chat Configuration"
+msgstr "Poziv na grupni razgovor"
 
 #: gajim/data/gui/roster_item_exchange_window.ui:39
 #: gajim/gtk/roster_item_exchange.py:35
@@ -8356,15 +8578,15 @@ msgstr "Sta_tus"
 msgid "_Start Chat..."
 msgstr "_Započni razgovor"
 
-#: gajim/data/gui/systray_context_menu.ui:50
+#: gajim/data/gui/systray_context_menu.ui:43
 msgid "Show All Pending _Events"
 msgstr "Prikaži sv_e događaje na čekanju"
 
-#: gajim/data/gui/systray_context_menu.ui:59
+#: gajim/data/gui/systray_context_menu.ui:52
 msgid "Mute Sounds"
 msgstr "Ugasi zvukove"
 
-#: gajim/data/gui/systray_context_menu.ui:75
+#: gajim/data/gui/systray_context_menu.ui:68
 #, fuzzy
 msgid "_Preferences"
 msgstr "Podešavanja"
@@ -8456,34 +8678,34 @@ msgstr ""
 msgid "Execute expression inside a shell, send output"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:45
+#: gajim/command_system/implementation/standard.py:47
 msgid ""
 "Show help on a given command or a list of available commands if -a is given"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:73
+#: gajim/command_system/implementation/standard.py:75
 #, fuzzy
 msgid "Send a message to the contact"
 msgstr "Način korišćenja: /%s, šalje poruku kontaktu"
 
-#: gajim/command_system/implementation/standard.py:78
+#: gajim/command_system/implementation/standard.py:80
 msgid "Send action (in the third person) to the current chat"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:83
+#: gajim/command_system/implementation/standard.py:85
 msgid "Show logged messages which mention given text"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:88
+#: gajim/command_system/implementation/standard.py:90
 #, fuzzy, python-format
 msgid "%s: Nothing found"
 msgstr "%s nije pronađen"
 
-#: gajim/command_system/implementation/standard.py:94
+#: gajim/command_system/implementation/standard.py:96
 msgid "Limit must be an integer"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:118
+#: gajim/command_system/implementation/standard.py:120
 msgid ""
 "\n"
 "    Set the current status\n"
@@ -8493,130 +8715,131 @@ msgid ""
 "    "
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:136
+#: gajim/command_system/implementation/standard.py:138
 msgid "Set the current status to away"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:150
+#: gajim/command_system/implementation/standard.py:152
 msgid "Set the current status to online"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:153
+#: gajim/command_system/implementation/standard.py:155
 #, fuzzy
 msgid "Available"
 msgstr "_Dostupan"
 
-#: gajim/command_system/implementation/standard.py:173
-#: gajim/command_system/implementation/standard.py:250
+#: gajim/command_system/implementation/standard.py:175
+#: gajim/command_system/implementation/standard.py:252
 #, fuzzy
 msgid "Clear the text window"
 msgstr "Način korišćenja: /%s, prazni tekstualni prozor"
 
-#: gajim/command_system/implementation/standard.py:178
-#: gajim/command_system/implementation/standard.py:397
+#: gajim/command_system/implementation/standard.py:180
+#: gajim/command_system/implementation/standard.py:401
 #, fuzzy
 msgid "Send a ping to the contact"
 msgstr "Način korišćenja: /%s, šalje pink kontaktu"
 
-#: gajim/command_system/implementation/standard.py:181
-#: gajim/command_system/implementation/standard.py:400
+#: gajim/command_system/implementation/standard.py:183
+#: gajim/command_system/implementation/standard.py:404
 #, fuzzy
 msgid "Command is not supported for zeroconf accounts"
 msgstr "Komanda nije podržana za zeroconf  nalog."
 
-#: gajim/command_system/implementation/standard.py:185
-msgid "Send DTMF sequence through an open audio session"
+#: gajim/command_system/implementation/standard.py:187
+msgid "Send DTMF sequence through an open voice chat"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:188
-msgid "No open audio sessions with the contact"
-msgstr ""
+#: gajim/command_system/implementation/standard.py:190
+#, fuzzy
+msgid "No open voice chats with the contact"
+msgstr " otvaranje prozora/jezička sa tim kontaktom "
 
-#: gajim/command_system/implementation/standard.py:191
+#: gajim/command_system/implementation/standard.py:193
 #, fuzzy, python-format
 msgid "%s is not a valid tone"
 msgstr "%s nije ispravan nivo logovanja"
 
-#: gajim/command_system/implementation/standard.py:198
-msgid "Toggle audio session"
+#: gajim/command_system/implementation/standard.py:200
+msgid "Toggle Voice Chat"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:201
+#: gajim/command_system/implementation/standard.py:203
 #, fuzzy
-msgid "Audio sessions are not available"
+msgid "Voice chats are not available"
 msgstr "Veza nije dostupna"
 
-#: gajim/command_system/implementation/standard.py:208
-msgid "Toggle video session"
+#: gajim/command_system/implementation/standard.py:210
+msgid "Toggle Video Chat"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:211
+#: gajim/command_system/implementation/standard.py:213
 #, fuzzy
-msgid "Video sessions are not available"
+msgid "Video chats are not available"
 msgstr "Veza nije dostupna"
 
-#: gajim/command_system/implementation/standard.py:218
+#: gajim/command_system/implementation/standard.py:220
 #, fuzzy
 msgid "Send a message to the contact that will attract their attention"
 msgstr "Način korišćenja: /%s, šalje poruku kontaktu"
 
-#: gajim/command_system/implementation/standard.py:255
+#: gajim/command_system/implementation/standard.py:257
 #, fuzzy
 msgid "Change your nickname in a group chat"
 msgstr "Promeni nadimak (Ctrl+N)"
 
-#: gajim/command_system/implementation/standard.py:260 gajim/gtk/dialogs.py:674
-#: gajim/gtk/bookmarks.py:272
+#: gajim/command_system/implementation/standard.py:262
 msgid "Invalid nickname"
 msgstr "Neispravan nadimak"
 
-#: gajim/command_system/implementation/standard.py:267
+#: gajim/command_system/implementation/standard.py:269
 #, fuzzy
-msgid "Open a private chat window with a specified occupant"
+msgid "Open a private chat window with a specified participant"
 msgstr ""
 "Način korišćenja: /%s <nadimak>, otvara privatni razgovor sa učesnikom."
 
-#: gajim/command_system/implementation/standard.py:273
-#: gajim/command_system/implementation/standard.py:282
-#: gajim/command_system/implementation/standard.py:332
-#: gajim/command_system/implementation/standard.py:345
-#: gajim/command_system/implementation/standard.py:357
+#: gajim/command_system/implementation/standard.py:275
+#: gajim/command_system/implementation/standard.py:284
+#: gajim/command_system/implementation/standard.py:336
+#: gajim/command_system/implementation/standard.py:349
+#: gajim/command_system/implementation/standard.py:361
 #, fuzzy
 msgid "Nickname not found"
 msgstr "Nadimak nije pronađen: %s "
 
-#: gajim/command_system/implementation/standard.py:276
+#: gajim/command_system/implementation/standard.py:278
 #, fuzzy
 msgid ""
-"Open a private chat window with a specified occupant and send him a message"
+"Open a private chat window with a specified participant and send him a "
+"message"
 msgstr ""
 "Način korišćenja: /%s <nadimak>, otvara privatni razgovor sa učesnikom."
 
-#: gajim/command_system/implementation/standard.py:285
+#: gajim/command_system/implementation/standard.py:287
 #, fuzzy
 msgid "Display or change a group chat topic"
 msgstr "Pitaj pre zatvaranja prozora/jezička grupnog razgovora."
 
-#: gajim/command_system/implementation/standard.py:294
-msgid "Invite a user to a room for a reason"
+#: gajim/command_system/implementation/standard.py:296
+msgid "Invite a user to a group chat for a reason"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:297
+#: gajim/command_system/implementation/standard.py:299
 #, fuzzy, python-format
 msgid "Invited %(jid)s to %(room_jid)s"
 msgstr "Pozvali ste %(contact_jid)s u sobu %(room_jid)s"
 
-#: gajim/command_system/implementation/standard.py:301
+#: gajim/command_system/implementation/standard.py:303
 #, fuzzy
-msgid "Join a group chat given by a JID"
+msgid "Join a group chat given by an XMPP Address"
 msgstr "u _grupnim razgovorima"
 
-#: gajim/command_system/implementation/standard.py:309
+#: gajim/command_system/implementation/standard.py:313
 msgid ""
-"Leave the groupchat, optionally giving a reason, and close tab or window"
+"Leave the group chat, optionally giving a reason, and close tab or window"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:314
+#: gajim/command_system/implementation/standard.py:318
 msgid ""
 "\n"
 "    Ban user by a nick or a JID from a groupchat\n"
@@ -8625,46 +8848,46 @@ msgid ""
 "    "
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:329
+#: gajim/command_system/implementation/standard.py:333
 #, fuzzy
-msgid "Kick user by a nick from a groupchat"
+msgid "Kick user by a nick from a group chat"
 msgstr "Pozvani ste u grupni razgovor"
 
-#: gajim/command_system/implementation/standard.py:338
+#: gajim/command_system/implementation/standard.py:342
 msgid ""
-"Set occupant role in group chat.\n"
+"Set participant role in group chat.\n"
 "    Role can be given as one of the following values:\n"
 "    moderator, participant, visitor, none"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:343
+#: gajim/command_system/implementation/standard.py:347
 #, fuzzy
 msgid "Invalid role given"
 msgstr "Neispravan server"
 
-#: gajim/command_system/implementation/standard.py:350
+#: gajim/command_system/implementation/standard.py:354
 msgid ""
-"Set occupant affiliation in group chat.\n"
+"Set participant affiliation in group chat.\n"
 "    Affiliation can be given as one of the following values:\n"
 "    owner, admin, member, outcast, none"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:355
+#: gajim/command_system/implementation/standard.py:359
 #, fuzzy
 msgid "Invalid affiliation given"
 msgstr "vezanost izmenjena"
 
-#: gajim/command_system/implementation/standard.py:365
+#: gajim/command_system/implementation/standard.py:369
 #, fuzzy
-msgid "Display names of all group chat occupants"
+msgid "Display names of all group chat participants"
 msgstr "Način korišćenja: /%s , prikazuje imena učesnika u grupnom razgovoru."
 
-#: gajim/command_system/implementation/standard.py:387
-msgid "Forbid an occupant to send you public or private messages"
+#: gajim/command_system/implementation/standard.py:391
+msgid "Forbid a participant to send you public or private messages"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:392
-msgid "Allow an occupant to send you public or private messages"
+#: gajim/command_system/implementation/standard.py:396
+msgid "Allow a participant to send you public or private messages"
 msgstr ""
 
 #: gajim/command_system/implementation/middleware.py:74
@@ -8675,204 +8898,329 @@ msgstr ""
 msgid "The same as using a doc-string, except it supports translation"
 msgstr ""
 
-#: gajim/gtk/filetransfer.py:91
+#: gajim/gtk/groupchat_info.py:36
+#, fuzzy
+msgid "?Group chat feature:Archiving"
+msgstr "Poziv na grupni razgovor"
+
+#: gajim/gtk/groupchat_info.py:37
+#, fuzzy
+msgid "Messages are archived on the server"
+msgstr "Sesija NEĆE biti pamćena"
+
+#: gajim/gtk/groupchat_info.py:40
+#, fuzzy
+msgid "?Group chat feature:Persistent"
+msgstr "Grupni razgovori"
+
+#: gajim/gtk/groupchat_info.py:41
+msgid "This group chat persists even if there are no participants"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:45
+#, fuzzy
+msgid "?Group chat feature:Temporary"
+msgstr "?Uloga kontakta u grupnom razgovoru:Nikakva"
+
+#: gajim/gtk/groupchat_info.py:46
+msgid "This group chat will be destroyed once the last participant left"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:50
+#, fuzzy
+msgid "?Group chat feature:Moderated"
+msgstr "?Uloga kontakta u grupnom razgovoru:Nikakva"
+
+#: gajim/gtk/groupchat_info.py:51
+msgid ""
+"Participants entering this group chat need to request permission to send "
+"messages"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:55
+#, fuzzy
+msgid "?Group chat feature:Not Moderated"
+msgstr "Grupni razgovori"
+
+#: gajim/gtk/groupchat_info.py:56
+msgid "Participants entering this group chat are allowed to send messages"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:60
+#, fuzzy
+msgid "?Group chat feature:Open"
+msgstr "?Uloga kontakta u grupnom razgovoru:Nikakva"
+
+#: gajim/gtk/groupchat_info.py:61
+#, fuzzy
+msgid "Anyone can join this group chat"
+msgstr "%s se pridružio grupnom razgovoru"
+
+#: gajim/gtk/groupchat_info.py:64
+#, fuzzy
+msgid "?Group chat feature:Members Only"
+msgstr "Bojenje Poruka Sa Grupnog Razgovora"
+
+#: gajim/gtk/groupchat_info.py:65
+msgid "This group chat is restricted to members only"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:69
+#, fuzzy
+msgid "?Group chat feature:Public"
+msgstr "Bojenje Poruka Sa Grupnog Razgovora"
+
+#: gajim/gtk/groupchat_info.py:70
+msgid "Group chat can be found via search"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:73
+#, fuzzy
+msgid "?Group chat feature:Hidden"
+msgstr "?Uloga kontakta u grupnom razgovoru:Nikakva"
+
+#: gajim/gtk/groupchat_info.py:74
+#, fuzzy
+msgid "This group chat can not be found via search"
+msgstr "Ovaj grupni razgovor nema temu"
+
+#: gajim/gtk/groupchat_info.py:77
+#, fuzzy
+msgid "?Group chat feature:Not Anonymous"
+msgstr "Grupni razgovori"
+
+#: gajim/gtk/groupchat_info.py:78
+msgid "All other group chat participants can see your XMPP address"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:82
+#, fuzzy
+msgid "?Group chat feature:Semi-Anonymous"
+msgstr "Bojenje Poruka Sa Grupnog Razgovora"
+
+#: gajim/gtk/groupchat_info.py:83
+msgid "Only moderators can see your XMPP address"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:86
+#, fuzzy
+msgid "?Group chat feature:Password Required"
+msgstr "Grupni razgovori"
+
+#: gajim/gtk/groupchat_info.py:87
+msgid "This group chat does require a password upon entry"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:91
+#, fuzzy
+msgid "?Group chat feature:No Password Required"
+msgstr "Grupni razgovori"
+
+#: gajim/gtk/groupchat_info.py:92
+msgid "This group chat does not require a password upon entry"
+msgstr ""
+
+#: gajim/gtk/filetransfer.py:90
 msgid "File"
 msgstr "Datoteka"
 
-#: gajim/gtk/filetransfer.py:108
+#: gajim/gtk/filetransfer.py:107
 msgid "Time"
 msgstr "Vreme"
 
-#: gajim/gtk/filetransfer.py:228
+#: gajim/gtk/filetransfer.py:227
 #, fuzzy, python-format
 msgid "File name: %s"
 msgstr "Ime datoteke: %s"
 
-#: gajim/gtk/filetransfer.py:229 gajim/gtk/filetransfer.py:464
+#: gajim/gtk/filetransfer.py:228 gajim/gtk/filetransfer.py:469
 #, python-format
 msgid "Size: %s"
 msgstr "Veličina: %s"
 
-#: gajim/gtk/filetransfer.py:239
+#: gajim/gtk/filetransfer.py:238
 #, python-format
 msgid "Sender: %s"
 msgstr "Pošaljilac: %s"
 
-#: gajim/gtk/filetransfer.py:240 gajim/gtk/filetransfer.py:744
+#: gajim/gtk/filetransfer.py:239 gajim/gtk/filetransfer.py:749
 #: gajim/gtk/tooltips.py:577
 msgid "Recipient: "
 msgstr "Primaoc: "
 
-#: gajim/gtk/filetransfer.py:251
+#: gajim/gtk/filetransfer.py:250
 #, python-format
 msgid "Saved in: %s"
 msgstr "Sačuvano u: %s"
 
-#: gajim/gtk/filetransfer.py:256
+#: gajim/gtk/filetransfer.py:255
 msgid "File transfer completed"
 msgstr "Prenos datoteke završen"
 
-#: gajim/gtk/filetransfer.py:276 gajim/gtk/filetransfer.py:285
+#: gajim/gtk/filetransfer.py:275 gajim/gtk/filetransfer.py:284
 #, fuzzy
 msgid "Connection with peer could not be established."
 msgstr "Nije moguće uspostaviti vezu sa drugom stranom."
 
-#: gajim/gtk/filetransfer.py:293
+#: gajim/gtk/filetransfer.py:292
 #, python-format
 msgid "Filename: %s"
 msgstr "Ime datoteke: %s"
 
-#: gajim/gtk/filetransfer.py:294
+#: gajim/gtk/filetransfer.py:293
 #, python-format
 msgid "Recipient: %s"
 msgstr "Primaoc: %s"
 
-#: gajim/gtk/filetransfer.py:296
+#: gajim/gtk/filetransfer.py:295
 #, python-format
 msgid "Error message: %s"
 msgstr "Poruka greške: %s"
 
-#: gajim/gtk/filetransfer.py:333
-#, fuzzy
-msgid "File transfer error"
-msgstr "Greška pri prenosu datoteke"
-
 #: gajim/gtk/filetransfer.py:334
 #, python-format
 msgid ""
-"The file %(file)s has been received, but it seems to have been damaged along "
-"the way.\n"
+"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 ""
 
-#: gajim/gtk/filetransfer.py:350
+#: gajim/gtk/filetransfer.py:340
+#, fuzzy
+msgid "_Download Again"
+msgstr "_Ne pitaj me više"
+
+#: gajim/gtk/filetransfer.py:355
 #, fuzzy
 msgid "Gajim can not read this file"
 msgstr "Gajim ne može pristupiti ovoj datoteci"
 
-#: gajim/gtk/filetransfer.py:351
+#: gajim/gtk/filetransfer.py:356
 msgid "Another process is using this file."
 msgstr ""
 
-#: gajim/gtk/filetransfer.py:418
+#: gajim/gtk/filetransfer.py:423
 #, fuzzy
 msgid "File Transfer Conflict"
 msgstr "Prenos datoteke završen"
 
-#: gajim/gtk/filetransfer.py:419
+#: gajim/gtk/filetransfer.py:424
 msgid "This file already exists"
 msgstr "Ova datoteka već postoji"
 
-#: gajim/gtk/filetransfer.py:420
+#: gajim/gtk/filetransfer.py:425
 msgid "Resume download or replace file?"
 msgstr ""
 
-#: gajim/gtk/filetransfer.py:424
+#: gajim/gtk/filetransfer.py:429
 #, fuzzy
 msgid "Replace _File"
 msgstr "Čisti"
 
-#: gajim/gtk/filetransfer.py:427
+#: gajim/gtk/filetransfer.py:432
 #, fuzzy
 msgid "Resume _Download"
 msgstr "Skidanje"
 
-#: gajim/gtk/filetransfer.py:437
+#: gajim/gtk/filetransfer.py:442
 #, fuzzy, python-format
 msgid "Directory '%s' is not writable"
 msgstr "U fasciklu \"%s\" nije moguće pisanje"
 
-#: gajim/gtk/filetransfer.py:438
+#: gajim/gtk/filetransfer.py:443
 #, fuzzy
 msgid "You do not have permissions to create files in this directory."
 msgstr "Nemate privilegija za pisanje u ovoj fascikli"
 
-#: gajim/gtk/filetransfer.py:461
+#: gajim/gtk/filetransfer.py:466
 #, python-format
 msgid "File: %s"
 msgstr "Datoteka: %s"
 
-#: gajim/gtk/filetransfer.py:467
+#: gajim/gtk/filetransfer.py:472
 #, python-format
 msgid "Type: %s"
 msgstr "Tip: %s"
 
-#: gajim/gtk/filetransfer.py:469
+#: gajim/gtk/filetransfer.py:474
 #, python-format
 msgid "Description: %s"
 msgstr "Opis: %s"
 
-#: gajim/gtk/filetransfer.py:480
+#: gajim/gtk/filetransfer.py:485
 #, fuzzy, python-format
 msgid "%s wants to send you a file"
 msgstr "%s Vam želi poslati datoteku."
 
-#: gajim/gtk/filetransfer.py:509
+#: gajim/gtk/filetransfer.py:514
 #, fuzzy
 msgid "Checking file…"
 msgstr "Slanje profila..."
 
-#: gajim/gtk/filetransfer.py:524
+#: gajim/gtk/filetransfer.py:529
 #, fuzzy
 msgid "File error"
 msgstr "Greška pri prenosu datoteke"
 
-#: gajim/gtk/filetransfer.py:561
+#: gajim/gtk/filetransfer.py:566
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 
-#: gajim/gtk/filetransfer.py:658
+#: gajim/gtk/filetransfer.py:663
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/sek)"
 
-#: gajim/gtk/filetransfer.py:711 gajim/gtk/filetransfer.py:715
+#: gajim/gtk/filetransfer.py:716 gajim/gtk/filetransfer.py:720
 msgid "Invalid File"
 msgstr "Neispravna datoteka"
 
-#: gajim/gtk/filetransfer.py:711
+#: gajim/gtk/filetransfer.py:716
 msgid "File: "
 msgstr "Datoteka: "
 
-#: gajim/gtk/filetransfer.py:716
+#: gajim/gtk/filetransfer.py:721
 msgid "It is not possible to send empty files"
 msgstr "Nije moguće poslati praznu datoteku"
 
-#: gajim/gtk/filetransfer.py:742 gajim/gtk/tooltips.py:571
+#: gajim/gtk/filetransfer.py:747 gajim/gtk/tooltips.py:571
 msgid "Sender: "
 msgstr "Pošaljilac: "
 
-#: gajim/gtk/filetransfer.py:1038
+#: gajim/gtk/filetransfer.py:1043
 #, fuzzy
 msgid "Choose a File to Send…"
 msgstr "Odaberite datoteku za slanje..."
 
 #: gajim/gtk/start_chat.py:51
 #, fuzzy
-msgid "Start new Conversation"
+msgid "Start New Conversation"
 msgstr "Nastavljeni razgovor"
 
-#: gajim/gtk/start_chat.py:424
-#, fuzzy
-msgid "New Groupchat"
-msgstr "Novi grupni razgovor"
+#: gajim/gtk/start_chat.py:260 gajim/gtk/start_chat.py:328
+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:603 gajim/gtk/groupchat_join.py:38
+msgid "Join Group Chat"
+msgstr "Pridruži se grupnom razgovoru"
 
-#: gajim/gtk/start_chat.py:426
+#: gajim/gtk/start_chat.py:605 gajim/gtk/add_contact.py:40
 #, fuzzy
-msgid "New Contact"
-msgstr "Dodaj novi kontakt"
+msgid "Add Contact"
+msgstr "_Dodaj kontakt..."
 
-#: gajim/gtk/start_chat.py:588
+#: gajim/gtk/start_chat.py:746
 #, fuzzy, python-format
-msgid "%s Group chats found"
+msgid "%s group chats found"
 msgstr "%s nije pronađen"
 
-#: gajim/gtk/discovery.py:70
+#: gajim/gtk/discovery.py:69
 msgid "This service has not yet responded with detailed information"
 msgstr "Ovaj servis još nije pružio detaljne informacije"
 
-#: gajim/gtk/discovery.py:71
+#: gajim/gtk/discovery.py:70
 #, fuzzy
 msgid ""
 "This service could not respond with detailed information.\n"
@@ -8881,32 +9229,33 @@ msgstr ""
 "Ovaj servis nije mogao odgovoriti sa detaljnim informacijama.\n"
 "Najverovatnije je zastareo ili u kvaru"
 
-#: gajim/gtk/discovery.py:128
+#: gajim/gtk/discovery.py:126
 msgid "Others"
 msgstr "Ostali"
 
-#: gajim/gtk/discovery.py:131
-msgid "Conference"
-msgstr "Konferencija"
+#: gajim/gtk/discovery.py:129
+#, fuzzy
+msgid "Group Chat"
+msgstr "Grupni razgovori"
 
-#: gajim/gtk/discovery.py:519
+#: gajim/gtk/discovery.py:518
 msgid "Without a connection, you can not browse available services"
 msgstr "Bez uspostavljene veze, ne možete razgledati dostupne usluge"
 
-#: gajim/gtk/discovery.py:606
+#: gajim/gtk/discovery.py:605
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Otkrivanje usluga sa naloga %s"
 
-#: gajim/gtk/discovery.py:608
+#: gajim/gtk/discovery.py:607
 msgid "Service Discovery"
 msgstr "Otkrivanje Usluga"
 
-#: gajim/gtk/discovery.py:691
+#: gajim/gtk/discovery.py:690
 msgid "The service could not be found"
 msgstr "Usluga ne može biti nađena"
 
-#: gajim/gtk/discovery.py:692
+#: gajim/gtk/discovery.py:691
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -8914,102 +9263,80 @@ msgstr ""
 "Na navedenoj adresi nema usuga, ili nema odgovora. Proverite adresu i "
 "pokušajte ponovo."
 
-#: gajim/gtk/discovery.py:699 gajim/gtk/discovery.py:1042
+#: gajim/gtk/discovery.py:698 gajim/gtk/discovery.py:1041
 msgid "The service is not browsable"
 msgstr "Usluge nisu pretražive"
 
-#: gajim/gtk/discovery.py:700
+#: gajim/gtk/discovery.py:699
 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:738 gajim/gtk/discovery.py:747
+#: gajim/gtk/discovery.py:737 gajim/gtk/discovery.py:746
 msgid "Invalid Server Name"
 msgstr "Neispravano ime servera"
 
-#: gajim/gtk/discovery.py:806
+#: gajim/gtk/discovery.py:805
 #, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Pretražujem %(address)s koristeći nalog %(account)s"
 
-#: gajim/gtk/discovery.py:851
+#: gajim/gtk/discovery.py:850
 #, fuzzy
 msgid "Browse"
 msgstr "_Pregled"
 
-#: gajim/gtk/discovery.py:1043
+#: gajim/gtk/discovery.py:1042
 msgid "This service does not contain any items to browse."
 msgstr "Ova usluga ne sadrži elemente za pretragu"
 
-#: gajim/gtk/discovery.py:1255
+#: gajim/gtk/discovery.py:1254
 #, fuzzy
 msgid "_Command"
 msgstr "Komanda: %s"
 
-#: gajim/gtk/discovery.py:1264 gajim/gtk/discovery.py:1422
+#: gajim/gtk/discovery.py:1263 gajim/gtk/discovery.py:1420
 msgid "Re_gister"
 msgstr "Re_gistracija"
 
-#: gajim/gtk/discovery.py:1277
+#: gajim/gtk/discovery.py:1276
 msgid "_Search"
 msgstr "_Pretraga"
 
-#: gajim/gtk/discovery.py:1420
+#: gajim/gtk/discovery.py:1418
 msgid "_Edit"
 msgstr "_Izmeni"
 
-#: gajim/gtk/discovery.py:1458
+#: gajim/gtk/discovery.py:1456
 #, fuzzy, python-format
 msgid "Scanning %(current)d / %(total)d ..."
 msgstr "Skeniranje %(current)d / %(total)d.."
 
-#: gajim/gtk/discovery.py:1674
+#: gajim/gtk/discovery.py:1655
+msgid "Users"
+msgstr "Korisnici"
+
+#: gajim/gtk/discovery.py:1671
 msgid "Id"
 msgstr "Identifikacija"
 
-#: gajim/gtk/discovery.py:1713
-msgid "_Join"
-msgstr "_Pridruži se"
-
-#: gajim/gtk/discovery.py:1736
-msgid "Bookmark already set"
-msgstr "Marker je već postavljen"
-
-#: gajim/gtk/discovery.py:1737
-#, fuzzy, python-format
-msgid "Group Chat '%s' is already in your bookmarks."
-msgstr "Grupni razgovor \"%s\" je već markiran."
-
-#: gajim/gtk/discovery.py:1748
-msgid "Bookmark has been added successfully"
-msgstr "Marker uspešno dodat"
-
-#: gajim/gtk/discovery.py:1749
-#, fuzzy
-msgid ""
-"You can manage your bookmarks by clicking the Bookmarks menu item in your "
-"contact list."
-msgstr ""
-"Možete upravljati Vašim markerima pomoću menija Akcije iz Vaše liste "
-"kontakata."
-
-#: gajim/gtk/discovery.py:1950
+#: gajim/gtk/discovery.py:1900
 msgid "Subscribed"
 msgstr "Pretplaćen"
 
-#: gajim/gtk/discovery.py:1959
+#: gajim/gtk/discovery.py:1909
 msgid "Node"
 msgstr "Čvor"
 
-#: gajim/gtk/discovery.py:2028
+#: gajim/gtk/discovery.py:1978
 #, fuzzy
 msgid "_New post"
 msgstr "Nova objava"
 
-#: gajim/gtk/discovery.py:2037
+#: gajim/gtk/discovery.py:1987
 msgid "_Subscribe"
 msgstr "_Pretplati se"
 
-#: gajim/gtk/discovery.py:2045
+#: gajim/gtk/discovery.py:1995
 msgid "_Unsubscribe"
 msgstr "_Ukini pretplatu"
 
@@ -9056,7 +9383,7 @@ msgstr "Forma %s"
 msgid "Characters typed: %s"
 msgstr "Karakter nije dozvoljen"
 
-#: gajim/gtk/single_message.py:274 gajim/gtk/xml_console.py:169
+#: gajim/gtk/single_message.py:274 gajim/gtk/xml_console.py:166
 msgid "Connection not available"
 msgstr "Veza nije dostupna"
 
@@ -9065,6 +9392,12 @@ msgstr "Veza nije dostupna"
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Molimo potvrdite da ste spojeni na \"%s\"."
 
+#: gajim/gtk/single_message.py:306
+#, 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:330
 #, python-format
 msgid "RE: %s"
@@ -9075,28 +9408,28 @@ msgstr "RE: %s"
 msgid "%s wrote:\n"
 msgstr "%s piše:\n"
 
-#: gajim/gtk/pep_config.py:44
+#: gajim/gtk/pep_config.py:45
 #, fuzzy, python-format
 msgid "PEP Service Configuration (%s)"
 msgstr "PEP konfiguracija servisa"
 
-#: gajim/gtk/pep_config.py:77
+#: gajim/gtk/pep_config.py:78
 #, fuzzy
 msgid "Service"
 msgstr "Server"
 
-#: gajim/gtk/pep_config.py:114
+#: gajim/gtk/pep_config.py:115
 msgid "PEP node was not removed"
 msgstr "PEP čvor nije uklonjen"
 
-#: gajim/gtk/pep_config.py:115
+#: gajim/gtk/pep_config.py:116
 #, fuzzy, python-format
 msgid ""
 "PEP node %(node)s was not removed:\n"
 "%(message)s"
 msgstr "PEP čvor %(node)s nije uklonjen: %(message)s"
 
-#: gajim/gtk/pep_config.py:146
+#: gajim/gtk/pep_config.py:147
 #, fuzzy, python-format
 msgid "Configure %s"
 msgstr "_Konfiguriši"
@@ -9112,17 +9445,21 @@ msgstr "_Registracija"
 msgid "Registration successful"
 msgstr "Registracija uspešna"
 
-#: gajim/gtk/dialogs.py:54 gajim/gtk/dataform.py:659 gajim/gtk/adhoc.py:85
+#: gajim/gtk/service_registration.py:215
+msgid "Registration failed"
+msgstr "Registracija neuspela"
+
+#: gajim/gtk/dialogs.py:53 gajim/gtk/dataform.py:668 gajim/gtk/adhoc.py:86
 #, fuzzy
 msgid "Cancel"
 msgstr "_Odustani"
 
-#: gajim/gtk/dialogs.py:129
+#: gajim/gtk/dialogs.py:128
 #, fuzzy, python-format
 msgid "Dictionary for language \"%s\" not available"
 msgstr "Rečnik za jezik %s nije dostupan"
 
-#: gajim/gtk/dialogs.py:130
+#: gajim/gtk/dialogs.py:129
 #, fuzzy, python-format
 msgid ""
 "You have to install the dictionary \"%s\" to use spellchecking, or choose "
@@ -9135,11 +9472,11 @@ msgstr ""
 "\n"
 "Osvetljavanje loše napisanih reči neće biti u upotrebi"
 
-#: gajim/gtk/dialogs.py:410 gajim/gtk/dialogs.py:425
+#: gajim/gtk/dialogs.py:322 gajim/gtk/dialogs.py:337
 msgid "Insecure connection"
 msgstr "Nesigurna veza"
 
-#: gajim/gtk/dialogs.py:411
+#: gajim/gtk/dialogs.py:323
 #, fuzzy, python-format
 msgid ""
 "You are about to connect to the account %(account)s (%(server)s) insecurely. "
@@ -9150,120 +9487,115 @@ msgstr ""
 "Upravo ćete poslati lozinku preko nesigurne veze. Trebalo bi da instalirate "
 "PyOpenSSL da sprečite ovo. Da li želite da nastavite?"
 
-#: gajim/gtk/dialogs.py:416
+#: gajim/gtk/dialogs.py:328
 msgid "Yes, I really want to connect insecurely"
 msgstr "Da, zaista želim da se konektujem nesigurnom vezom"
 
-#: gajim/gtk/dialogs.py:417
+#: gajim/gtk/dialogs.py:329
 msgid "Gajim will NOT connect unless you check this box"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:675
-#, fuzzy
-msgid "The nickname contains invalid characters."
-msgstr "Nadimak sadrži nedozvoljene karaktere."
-
-#: gajim/gtk/dialogs.py:734
+#: gajim/gtk/dialogs.py:561
 #, fuzzy, python-format
 msgid "Destroy %s"
 msgstr "Uništavam %s"
 
-#: gajim/gtk/dialogs.py:775
+#: gajim/gtk/dialogs.py:602
 #, fuzzy
 msgid "Certificate"
 msgstr "Samopotpisani sertifikat"
 
-#: gajim/gtk/dialogs.py:786
+#: gajim/gtk/dialogs.py:613
 #, fuzzy, python-format
 msgid ""
 "Certificate for account\n"
 "%s"
 msgstr "za nalog %s"
 
-#: gajim/gtk/dialogs.py:824
+#: gajim/gtk/dialogs.py:651
 msgid "Issued to\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:825 gajim/gtk/dialogs.py:830
+#: gajim/gtk/dialogs.py:652 gajim/gtk/dialogs.py:657
 msgid "Common Name (CN): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:826 gajim/gtk/dialogs.py:831
+#: gajim/gtk/dialogs.py:653 gajim/gtk/dialogs.py:658
 msgid "Organization (O): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:827 gajim/gtk/dialogs.py:832
+#: gajim/gtk/dialogs.py:654 gajim/gtk/dialogs.py:659
 msgid "Organizational Unit (OU): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:828
+#: gajim/gtk/dialogs.py:655
 #, fuzzy
 msgid "Serial Number: "
 msgstr "GG Broj:"
 
-#: gajim/gtk/dialogs.py:829
+#: gajim/gtk/dialogs.py:656
 msgid "Issued by\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:833
+#: gajim/gtk/dialogs.py:660
 msgid "Validity\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:834
+#: gajim/gtk/dialogs.py:661
 msgid "Issued on: "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:835
+#: gajim/gtk/dialogs.py:662
 msgid "Expires on: "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:836
+#: gajim/gtk/dialogs.py:663
 msgid "SHA-1:"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:838
+#: gajim/gtk/dialogs.py:665
 msgid "SHA-256:"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:852
+#: gajim/gtk/dialogs.py:679
 #, fuzzy
 msgid "View certificate…"
 msgstr "Samopotpisani sertifikat"
 
-#: gajim/gtk/dialogs.py:864 gajim/gtk/accounts.py:893
+#: gajim/gtk/dialogs.py:691 gajim/gtk/accounts.py:896
 msgid "Change Password"
 msgstr "Izmeni lozinku"
 
-#: gajim/gtk/dialogs.py:878
+#: gajim/gtk/dialogs.py:705
 msgid "_OK"
 msgstr "_U redu"
 
-#: gajim/gtk/dialogs.py:891
+#: gajim/gtk/dialogs.py:718
 #, fuzzy
 msgid "You must enter a password"
 msgstr "Morate da unesete lozinku"
 
-#: gajim/gtk/dialogs.py:895
+#: gajim/gtk/dialogs.py:722
 msgid "Passwords do not match"
 msgstr "Lozinke se ne poklapaju"
 
-#: gajim/gtk/dialogs.py:923
+#: gajim/gtk/dialogs.py:750
 #, fuzzy
 msgid "Group Chat Invitation "
 msgstr "Poziv na grupni razgovor"
 
-#: gajim/gtk/dialogs.py:948
+#: gajim/gtk/dialogs.py:775
 #, fuzzy, python-format
 msgid "<b>%s</b> has invited you to join a discussion"
 msgstr "$Contact Vas je pozvao na razgovor"
 
-#: gajim/gtk/dialogs.py:951
+#: gajim/gtk/dialogs.py:778
 #, 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:959
+#: gajim/gtk/dialogs.py:786
 #, python-format
 msgid "Comment: %s"
 msgstr "Komentar: %s"
@@ -9278,11 +9610,6 @@ msgstr "GG Broj:"
 msgid "ICQ Number"
 msgstr "ICQ Broj:"
 
-#: gajim/gtk/add_contact.py:40
-#, fuzzy
-msgid "Add Contact"
-msgstr "_Dodaj kontakt..."
-
 #: gajim/gtk/add_contact.py:259
 #, fuzzy, python-format
 msgid "%s Missing"
@@ -9303,7 +9630,8 @@ msgid "The user ID must not contain a resource."
 msgstr "ID korisnika ne sme sadržavati resurs."
 
 #: gajim/gtk/add_contact.py:299
-msgid "You cannot add yourself to your roster."
+#, fuzzy
+msgid "You cannot add yourself to your contact list."
 msgstr "Ne možete dodati sebe u Vašu listu kontakata."
 
 #: gajim/gtk/add_contact.py:304
@@ -9316,11 +9644,13 @@ msgid "Your account must be online to add new contacts."
 msgstr ""
 
 #: gajim/gtk/add_contact.py:321
-msgid "Contact already in roster"
+#, fuzzy
+msgid "Contact Already in Contact List"
 msgstr "Kontakt je već u listi"
 
 #: gajim/gtk/add_contact.py:322
-msgid "This contact is already listed in your roster."
+#, fuzzy
+msgid "This contact is already in your contact list."
 msgstr "Kontakt je već u listi kontakata."
 
 #: gajim/gtk/add_contact.py:379 gajim/gtk/add_contact.py:417
@@ -9361,14 +9691,14 @@ msgstr "Izmeni status"
 
 #: gajim/gtk/themes.py:52
 #, fuzzy
-msgid "MUC Tab New Directed Message"
+msgid "Group Chat Tab New Directed Message"
 msgstr ""
 "Usmerene poruke\n"
 "višekorisničkog razgovora"
 
 #: gajim/gtk/themes.py:56
 #, fuzzy
-msgid "MUC Tab New Message"
+msgid "Group Chat Tab New Message"
 msgstr "Nova Poruka"
 
 #: gajim/gtk/themes.py:60
@@ -9585,13 +9915,13 @@ msgstr "Sve datoteke"
 msgid "Clear File"
 msgstr "Čisti"
 
-#: gajim/gtk/settings.py:570
+#: gajim/gtk/settings.py:570 gajim/gtk/proxies.py:32
 #, fuzzy
 msgid "Manage Proxies"
 msgstr "Podešavanje proksi profila"
 
-#: gajim/gtk/settings.py:591 gajim/gtk/preferences.py:971
-#: gajim/gtk/preferences.py:984 gajim/gtk/preferences.py:988
+#: gajim/gtk/settings.py:591 gajim/gtk/preferences.py:968
+#: gajim/gtk/preferences.py:982 gajim/gtk/preferences.py:986
 #, fuzzy
 msgid "No Proxy"
 msgstr "Proksi:"
@@ -9671,14 +10001,15 @@ msgid ""
 "        "
 msgstr ""
 
-#: gajim/gtk/about.py:47 data/org.gajim.Gajim.appdata.xml.in:10
+#: gajim/gtk/about.py:47 data/org.gajim.Gajim.desktop.in:6
+#: data/org.gajim.Gajim.appdata.xml.in:10
 #, fuzzy
-msgid "A GTK+ XMPP client"
+msgid "A GTK XMPP client"
 msgstr "GTK+ Džaber klijent"
 
 #: gajim/gtk/about.py:48
 #, fuzzy, python-format
-msgid "GTK+ Version: %s"
+msgid "GTK Version: %s"
 msgstr "GTK+ verzija:"
 
 #: gajim/gtk/about.py:49
@@ -9858,6 +10189,25 @@ msgstr "?status prenosa:Pauziran"
 msgid "?transfer status:Not started"
 msgstr "?status prenosa:Pauziran"
 
+#: gajim/gtk/groupchat_creation.py:97 gajim/gtk/groupchat_creation.py:99
+msgid " (optional)..."
+msgstr ""
+
+#: gajim/gtk/groupchat_creation.py:134
+#, fuzzy
+msgid "Invalid Address"
+msgstr "Neispravna datoteka"
+
+#: gajim/gtk/groupchat_creation.py:182
+#, fuzzy
+msgid "Not Connected"
+msgstr "Na vezi"
+
+#: gajim/gtk/groupchat_creation.py:183
+#, fuzzy
+msgid "You have to be connected to create a group chat."
+msgstr "Ppridružili ste se grupnom razgovoru."
+
 #: gajim/gtk/sounds.py:39
 msgid "Wav Sounds"
 msgstr "Wav Zvukovi"
@@ -9899,50 +10249,45 @@ msgstr "Bojenje Poruka Sa Grupnog Razgovora"
 msgid "Group Chat Message Received"
 msgstr "Primljena Poruka Sa Grupnog Razgovora"
 
-#: gajim/gtk/dataform.py:226 gajim/gtk/dataform.py:262
+#: gajim/gtk/dataform.py:232 gajim/gtk/dataform.py:268
 #, fuzzy
 msgid "Required"
 msgstr "Lozinka zahtevana"
 
-#: gajim/gtk/dataform.py:286
+#: gajim/gtk/dataform.py:293
 msgid "Yes"
 msgstr ""
 
-#: gajim/gtk/dataform.py:286
+#: gajim/gtk/dataform.py:293
 #, fuzzy
 msgid "No"
 msgstr "Ništa"
 
-#: gajim/gtk/dataform.py:661
+#: gajim/gtk/dataform.py:670
 msgid "Submit"
 msgstr ""
 
-#: gajim/gtk/statusicon.py:213
+#: gajim/gtk/statusicon.py:206
 #, fuzzy
 msgid "_Change Status Message…"
 msgstr "_Izmeni statusnu poruku"
 
-#: gajim/gtk/statusicon.py:247 gajim/gtk/statusicon.py:292
-#: gajim/gtk/statusicon.py:299
+#: gajim/gtk/statusicon.py:258
 #, python-format
 msgid "using account %s"
 msgstr "koristeći račun %s"
 
-#: gajim/gtk/statusicon.py:309
+#: gajim/gtk/statusicon.py:269
 #, fuzzy
-msgid "_Manage Bookmarks…"
-msgstr "Podešavanje markera"
+msgid "Hide _Contact List"
+msgstr "Pozovi kontakte"
 
-#: gajim/gtk/statusicon.py:325
+#: gajim/gtk/statusicon.py:273
 #, fuzzy
-msgid "Hide _Roster"
-msgstr "u _listi kontakata"
-
-#: gajim/gtk/statusicon.py:329
-msgid "Show _Roster"
-msgstr "_Prikaži listu kontakata"
+msgid "Show _Contact List"
+msgstr "Prikaži samo _aktivne kontakte"
 
-#: gajim/gtk/statusicon.py:337
+#: gajim/gtk/statusicon.py:281
 msgid "Hide this menu"
 msgstr "Sakrij ovaj meni"
 
@@ -9991,36 +10336,6 @@ msgstr ""
 "Nastala je greška prilikom objavljivanja Vaših ličnih informacija, pokušajte "
 "ponovo kasnije."
 
-#: gajim/gtk/join_groupchat.py:202
-#, fuzzy
-msgid "Invalid Room"
-msgstr "Neispravna soba"
-
-#: gajim/gtk/join_groupchat.py:203
-msgid "Please choose a room"
-msgstr ""
-
-#: gajim/gtk/join_groupchat.py:222 gajim/gtk/join_groupchat.py:229
-msgid "Invalid Nickname"
-msgstr "Neispravan nadimak"
-
-#: gajim/gtk/join_groupchat.py:223
-#, fuzzy
-msgid "Please choose a nickname"
-msgstr "Molimo Vas napravite novu čistu temu sa željenim imenom."
-
-#: gajim/gtk/join_groupchat.py:282 gajim/gtk/join_groupchat.py:288
-#: gajim/gtk/join_groupchat.py:293
-#, fuzzy
-msgid "Wrong server"
-msgstr "Loš uri"
-
-#: gajim/gtk/join_groupchat.py:283 gajim/gtk/join_groupchat.py:289
-#: gajim/gtk/join_groupchat.py:294
-#, fuzzy, python-format
-msgid "%s is not a groupchat server"
-msgstr "Ovo nije grupni razgovor"
-
 #: gajim/gtk/mam_preferences.py:38
 #, python-format
 msgid "Archiving Preferences for %s"
@@ -10051,45 +10366,53 @@ msgstr "Greška u primanju forme za podatke"
 msgid "Archiving Preferences Error"
 msgstr "_Podešavanja"
 
-#: gajim/gtk/advanced_config.py:81
+#: gajim/gtk/advanced_config.py:95
 msgid "Activated"
 msgstr "Aktivirano"
 
-#: gajim/gtk/advanced_config.py:81
+#: gajim/gtk/advanced_config.py:95
 msgid "Deactivated"
 msgstr "Deaktivirano"
 
-#: gajim/gtk/advanced_config.py:83
-msgid "Boolean"
-msgstr "Da/Ne"
+#: gajim/gtk/advanced_config.py:97
+msgid "?config type:Boolean"
+msgstr ""
+
+#: gajim/gtk/advanced_config.py:98
+msgid "?config type:Integer"
+msgstr ""
 
-#: gajim/gtk/advanced_config.py:84
-msgid "Integer"
-msgstr "Ceo broj"
+#: gajim/gtk/advanced_config.py:99
+msgid "?config type:Text"
+msgstr ""
 
-#: gajim/gtk/advanced_config.py:85
-msgid "Text"
-msgstr "Tekst"
+#: gajim/gtk/advanced_config.py:100
+msgid "?config type:Color"
+msgstr ""
 
-#: gajim/gtk/advanced_config.py:97
-msgid "Preference Name"
+#: gajim/gtk/advanced_config.py:112
+#, fuzzy
+msgid "?config:Preference Name"
 msgstr "Ime postavke"
 
-#: gajim/gtk/advanced_config.py:104
-msgid "Value"
-msgstr "Vrednost"
+#: gajim/gtk/advanced_config.py:123
+#, fuzzy
+msgid "?config:Value"
+msgstr "_Konfiguriši"
 
-#: gajim/gtk/advanced_config.py:113
-msgid "Type"
-msgstr "Tip"
+#: gajim/gtk/advanced_config.py:132
+msgid "?config:Type"
+msgstr ""
 
-#: gajim/gtk/advanced_config.py:168
-msgid "(None)"
-msgstr "(ništa)"
+#: gajim/gtk/advanced_config.py:187
+#, fuzzy
+msgid "?config description:None"
+msgstr "?Pitaj (za pretplatu):Nijedna"
 
-#: gajim/gtk/advanced_config.py:299
-msgid "Hidden"
-msgstr "Skriven"
+#: gajim/gtk/advanced_config.py:322
+#, fuzzy
+msgid "?password:Hidden"
+msgstr "Lozinka:"
 
 #: gajim/gtk/server_info.py:66
 #, fuzzy
@@ -10101,8 +10424,8 @@ msgstr "_Kopiraj lokaciju veze"
 msgid "%(days)s days, %(hours)s hours"
 msgstr ""
 
-#: gajim/gtk/server_info.py:218 gajim/gtk/accounts.py:749
-#: gajim/gtk/accounts.py:853
+#: gajim/gtk/server_info.py:218 gajim/gtk/accounts.py:752
+#: gajim/gtk/accounts.py:856
 #, fuzzy
 msgid "Hostname"
 msgstr "Ime hosta:"
@@ -10292,11 +10615,6 @@ 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_config.py:41
-#, fuzzy
-msgid "Group Chat Configuration"
-msgstr "Poziv na grupni razgovor"
-
 #: gajim/gtk/groupchat_config.py:134
 #, fuzzy
 msgid "A Group Chat needs at least one Owner"
@@ -10307,69 +10625,69 @@ msgid "You are not allowed to modify the affiliation of Admins and Owners"
 msgstr ""
 
 #: gajim/gtk/groupchat_config.py:399
-msgid "An entry with this Jabber-ID already exists"
+msgid "An entry with this XMPP Address already exists"
 msgstr ""
 
-#: gajim/gtk/adhoc.py:91
+#: gajim/gtk/adhoc.py:92
 #, fuzzy
 msgid "Finish"
 msgstr "_Završi"
 
-#: gajim/gtk/adhoc.py:97 gajim/gtk/adhoc.py:283
+#: gajim/gtk/adhoc.py:98 gajim/gtk/adhoc.py:284
 #, fuzzy
 msgid "Commands"
 msgstr "Komanda: %s"
 
-#: gajim/gtk/adhoc.py:103
+#: gajim/gtk/adhoc.py:104
 msgid "Next"
 msgstr ""
 
-#: gajim/gtk/adhoc.py:109
+#: gajim/gtk/adhoc.py:110
 #, fuzzy
 msgid "Previous"
 msgstr "Zavidljiv"
 
-#: gajim/gtk/adhoc.py:115
+#: gajim/gtk/adhoc.py:116
 #, fuzzy
 msgid "Execute"
 msgstr "_Izvrši naredbu"
 
-#: gajim/gtk/adhoc.py:195
+#: gajim/gtk/adhoc.py:196
 #, fuzzy
 msgid "No commands available"
 msgstr "Nema dostupnih naloga"
 
-#: gajim/gtk/adhoc.py:244
+#: gajim/gtk/adhoc.py:245
 #, fuzzy
 msgid "Request Command List"
 msgstr "_Izvrši naredbu"
 
-#: gajim/gtk/adhoc.py:259
+#: gajim/gtk/adhoc.py:260
 #, fuzzy
 msgid "Executing…"
 msgstr "_Izvrši naredbu"
 
-#: gajim/gtk/adhoc.py:266
+#: gajim/gtk/adhoc.py:267
 #, fuzzy
 msgid "Command List"
 msgstr "Komanda: %s"
 
-#: gajim/gtk/adhoc.py:384
+#: gajim/gtk/adhoc.py:385
 #, fuzzy
 msgid "Finished"
 msgstr "_Završi"
 
-#: gajim/gtk/adhoc.py:453
+#: gajim/gtk/adhoc.py:454
 #, fuzzy
 msgid "Execution failed"
 msgstr "Veza prekinuta"
 
-#: gajim/gtk/blocking.py:37
+#: gajim/gtk/blocking.py:38
 #, fuzzy, python-format
 msgid "Blocking List for %s"
 msgstr "Lista privatnosti za %s"
 
-#: gajim/gtk/blocking.py:71
+#: gajim/gtk/blocking.py:72
 #, fuzzy
 msgid "Error!"
 msgstr "Greška"
@@ -10419,8 +10737,7 @@ msgstr "Neispravno korisničko ime"
 msgid "You must provide a username to configure this account."
 msgstr "Morate upisati korisničko ime da biste konfigurisali ovaj nalog."
 
-#: gajim/gtk/account_wizard.py:252 gajim/gtk/bookmarks.py:290
-#: gajim/gtk/bookmarks.py:303
+#: gajim/gtk/account_wizard.py:252
 msgid "Invalid server"
 msgstr "Neispravan server"
 
@@ -10436,7 +10753,7 @@ msgstr "Neispravan unos"
 msgid "Custom port must be a port number."
 msgstr "Vaš port mora biti broj porta."
 
-#: gajim/gtk/account_wizard.py:405
+#: gajim/gtk/account_wizard.py:406
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -10451,15 +10768,15 @@ msgstr ""
 "SSL greška: %(error)s\n"
 "Da li i dalje želite da se povežete na ovaj server?"
 
-#: gajim/gtk/account_wizard.py:446 gajim/gtk/account_wizard.py:480
+#: gajim/gtk/account_wizard.py:447 gajim/gtk/account_wizard.py:481
 msgid "An error occurred during account creation"
 msgstr "Pojavila se greška pri kreiranju naloga"
 
-#: gajim/gtk/account_wizard.py:545
+#: gajim/gtk/account_wizard.py:546
 msgid "Account name is in use"
 msgstr "Ime naloga je već upotrebljeno"
 
-#: gajim/gtk/account_wizard.py:546
+#: gajim/gtk/account_wizard.py:547
 msgid "You already have an account using this name."
 msgstr "Već imate nalog sa tim imenom."
 
@@ -10486,26 +10803,26 @@ msgstr "Prenos datoteke %(filename)s od kontakta %(name)s je zaustavljen."
 msgid "%(minutes)s min %(seconds)s sec"
 msgstr ""
 
-#: gajim/gtk/xml_console.py:77
+#: gajim/gtk/xml_console.py:74
 #, fuzzy
 msgid "Filter"
 msgstr "Filter:"
 
-#: gajim/gtk/xml_console.py:82
+#: gajim/gtk/xml_console.py:79
 #, fuzzy
 msgid "XML Input"
 msgstr "<b>XML Unos</b>"
 
-#: gajim/gtk/xml_console.py:86
+#: gajim/gtk/xml_console.py:83
 msgid "Paste Last Input"
 msgstr ""
 
-#: gajim/gtk/xml_console.py:170
+#: gajim/gtk/xml_console.py:167
 #, fuzzy, python-format
 msgid "Please make sure you are connected with '%s'."
 msgstr "Molimo potvrdite da ste spojeni na \"%s\"."
 
-#: gajim/gtk/xml_console.py:182
+#: gajim/gtk/xml_console.py:177
 #, fuzzy
 msgid "Invalid Node"
 msgstr "Neispravna datoteka"
@@ -10538,38 +10855,53 @@ msgstr "Pretraga"
 msgid "No results found"
 msgstr "Nema rezultata"
 
-#: gajim/gtk/preferences.py:358 gajim/gtk/preferences.py:362
+#: gajim/gtk/preferences.py:357 gajim/gtk/preferences.py:361
 msgid "Default"
 msgstr "Podrazumevano"
 
-#: gajim/gtk/preferences.py:801
+#: gajim/gtk/preferences.py:798
 msgid "status message title"
 msgstr "naslov statusne poruke"
 
-#: gajim/gtk/preferences.py:802
+#: gajim/gtk/preferences.py:799
 msgid "status message text"
 msgstr "tekst statusne poruke"
 
+#: gajim/gtk/accounts.py:137
+#, fuzzy
+msgid "Re-Login"
+msgstr "Otići sa veze i povezati se odmah?"
+
 #: gajim/gtk/accounts.py:138
-msgid "Relogin now?"
+#, fuzzy
+msgid "Re-Login now?"
 msgstr "Otići sa veze i povezati se odmah?"
 
 #: gajim/gtk/accounts.py:139
-msgid "If you want all the changes to apply instantly, you must relogin."
+#, 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:191 gajim/gtk/accounts.py:975
+#: gajim/gtk/accounts.py:141
+msgid "_Later"
+msgstr ""
+
+#: gajim/gtk/accounts.py:143
+msgid "_Re-Login"
+msgstr ""
+
+#: gajim/gtk/accounts.py:194 gajim/gtk/accounts.py:978
 #, fuzzy
 msgid "Remove Account"
 msgstr "Uklanjanje računa %s"
 
-#: gajim/gtk/accounts.py:192
+#: gajim/gtk/accounts.py:195
 #, fuzzy, python-format
 msgid "You still have open chats in your account %s"
 msgstr "Otvorili ste razgovor u računu %s"
 
-#: gajim/gtk/accounts.py:193
+#: gajim/gtk/accounts.py:196
 #, fuzzy
 msgid ""
 "All chat and group chat windows will be closed.\n"
@@ -10578,32 +10910,32 @@ msgstr ""
 "Prozori svih razgovora i grupnih razgovora će biti zatvoreni. Želite li da "
 "nastavite?"
 
-#: gajim/gtk/accounts.py:424
+#: gajim/gtk/accounts.py:427
 #, fuzzy
 msgid "Back"
 msgstr "Vraćam se brzo"
 
-#: gajim/gtk/accounts.py:530
+#: gajim/gtk/accounts.py:533
 #, fuzzy
 msgid "Please check if Bonjour is installed."
 msgstr "Proverite da li je Avahi ili Bonjour instaliran."
 
-#: gajim/gtk/accounts.py:532
+#: gajim/gtk/accounts.py:535
 #, fuzzy
 msgid "Please check if Avahi is installed."
 msgstr "Proverite da li je Avahi ili Bonjour instaliran."
 
-#: gajim/gtk/accounts.py:569
+#: gajim/gtk/accounts.py:572
 #, fuzzy
 msgid "Disable Account"
 msgstr "Neispravan nalog"
 
-#: gajim/gtk/accounts.py:570
+#: gajim/gtk/accounts.py:573
 #, fuzzy, python-format
 msgid "Account %s is still connected"
 msgstr "Račun \"%s\" je povezan na server"
 
-#: gajim/gtk/accounts.py:571
+#: gajim/gtk/accounts.py:574
 #, fuzzy
 msgid ""
 "All chat and group chat windows will be closed. Do you want to continue?"
@@ -10611,85 +10943,85 @@ msgstr ""
 "Prozori svih razgovora i grupnih razgovora će biti zatvoreni. Želite li da "
 "nastavite?"
 
-#: gajim/gtk/accounts.py:576
+#: gajim/gtk/accounts.py:579
 #, fuzzy
 msgid "_Disable Account"
 msgstr "Neispravan nalog"
 
-#: gajim/gtk/accounts.py:595
+#: gajim/gtk/accounts.py:598
 #, fuzzy
 msgid "Add Account"
 msgstr "_Dodaj kontakt..."
 
-#: gajim/gtk/accounts.py:663
+#: gajim/gtk/accounts.py:666
 msgid "Label"
 msgstr ""
 
-#: gajim/gtk/accounts.py:667
+#: gajim/gtk/accounts.py:670
 msgid "Login"
 msgstr ""
 
-#: gajim/gtk/accounts.py:670
+#: gajim/gtk/accounts.py:673
 #, fuzzy
 msgid "Import Contacts"
 msgstr "Pozovi kontakte"
 
-#: gajim/gtk/accounts.py:674 gajim/gtk/accounts.py:870
+#: gajim/gtk/accounts.py:677 gajim/gtk/accounts.py:873
 #, fuzzy
 msgid "Client Certificate"
 msgstr "Samopotpisani sertifikat"
 
-#: gajim/gtk/accounts.py:677 gajim/gtk/accounts.py:774
+#: gajim/gtk/accounts.py:680 gajim/gtk/accounts.py:777
 #, fuzzy
 msgid "Connect on startup"
 msgstr "Po_veži se prilikom pokretanja Gajima"
 
-#: gajim/gtk/accounts.py:681 gajim/gtk/accounts.py:779
+#: gajim/gtk/accounts.py:684 gajim/gtk/accounts.py:782
 #, fuzzy
 msgid "Save conversations for all contacts"
 msgstr "Snimi dnevnik razgovora za sve kontakte"
 
-#: gajim/gtk/accounts.py:683 gajim/gtk/accounts.py:781
+#: gajim/gtk/accounts.py:686 gajim/gtk/accounts.py:784
 msgid "Store conversations on the harddrive"
 msgstr ""
 
-#: gajim/gtk/accounts.py:685 gajim/gtk/accounts.py:783
+#: gajim/gtk/accounts.py:688 gajim/gtk/accounts.py:786
 #, fuzzy
 msgid "Global Status"
 msgstr "Svi statusi"
 
-#: gajim/gtk/accounts.py:687
+#: gajim/gtk/accounts.py:690
 #, fuzzy
 msgid "Synchronise the status of all accounts"
 msgstr "Menja status jednog ili više naloga"
 
-#: gajim/gtk/accounts.py:689
+#: gajim/gtk/accounts.py:692
 msgid "Use file transfer proxies"
 msgstr "Koristi proksi za prenos datoteka"
 
-#: gajim/gtk/accounts.py:705
+#: gajim/gtk/accounts.py:708
 #, fuzzy
 msgid "Idle Time"
 msgstr " od %s"
 
-#: gajim/gtk/accounts.py:707
+#: gajim/gtk/accounts.py:710
 msgid "Disclose the time of your last activity"
 msgstr ""
 
-#: gajim/gtk/accounts.py:709
+#: gajim/gtk/accounts.py:712
 msgid "Local System Time"
 msgstr ""
 
-#: gajim/gtk/accounts.py:711
+#: gajim/gtk/accounts.py:714
 msgid "Disclose the local system time of the device Gajim runs on"
 msgstr ""
 
-#: gajim/gtk/accounts.py:714
+#: gajim/gtk/accounts.py:717
 #, fuzzy
 msgid "Client / Operating System"
 msgstr "Samopotpisani sertifikat"
 
-#: gajim/gtk/accounts.py:716
+#: gajim/gtk/accounts.py:719
 #, fuzzy
 msgid ""
 "Disclose informations about the client and operating system you currently use"
@@ -10697,153 +11029,148 @@ msgstr ""
 "Ako je označena, Gajim će dozvoliti drugima da pogledaju koji operativni "
 "sistem koristite"
 
-#: gajim/gtk/accounts.py:719
+#: gajim/gtk/accounts.py:722
 #, fuzzy
 msgid "Ignore Unknown Contacts"
 msgstr "Pozovi kontakte"
 
-#: gajim/gtk/accounts.py:721
+#: gajim/gtk/accounts.py:724
 #, 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:737 gajim/gtk/accounts.py:776
+#: gajim/gtk/accounts.py:740 gajim/gtk/accounts.py:779
 #, fuzzy
 msgid "Use environment variable"
 msgstr "koristi HTTP_PROXY promenljiv_u okruženja"
 
-#: gajim/gtk/accounts.py:739
-#, fuzzy
-msgid "Proxy"
-msgstr "Proksi:"
-
-#: gajim/gtk/accounts.py:742
+#: gajim/gtk/accounts.py:745
 #, fuzzy
 msgid "Warn on insecure connection"
 msgstr "Upozori pre korišćenja nesigurne veze"
 
-#: gajim/gtk/accounts.py:746
+#: gajim/gtk/accounts.py:749
 msgid "Send keep-alive packets"
 msgstr "Šalji podatke o živosti"
 
-#: gajim/gtk/accounts.py:750
+#: gajim/gtk/accounts.py:753
 msgid "Manually set the hostname for the server"
 msgstr ""
 
-#: gajim/gtk/accounts.py:756 gajim/gtk/accounts.py:826
-#: gajim/gtk/accounts.py:831
+#: gajim/gtk/accounts.py:759 gajim/gtk/accounts.py:829
+#: gajim/gtk/accounts.py:834
 #, fuzzy
 msgid "Priority"
 msgstr "Priori_tet"
 
-#: gajim/gtk/accounts.py:785
+#: gajim/gtk/accounts.py:788
 #, fuzzy
 msgid "Synchronize the status of all accounts"
 msgstr "Menja status jednog ili više naloga"
 
-#: gajim/gtk/accounts.py:795
+#: gajim/gtk/accounts.py:798
 #, fuzzy
 msgid "First Name"
 msgstr "Ime:"
 
-#: gajim/gtk/accounts.py:798
+#: gajim/gtk/accounts.py:801
 #, fuzzy
 msgid "Last Name"
 msgstr "Prezime:"
 
-#: gajim/gtk/accounts.py:804
+#: gajim/gtk/accounts.py:807
 #, fuzzy
 msgid "Email"
 msgstr "Novi E-mejl"
 
-#: gajim/gtk/accounts.py:822
+#: gajim/gtk/accounts.py:825
 #, fuzzy
 msgid "Adjust to status"
 msgstr "_Podesi prema statusu"
 
-#: gajim/gtk/accounts.py:849
+#: gajim/gtk/accounts.py:852
 msgid "Enable"
 msgstr "Omogući"
 
-#: gajim/gtk/accounts.py:857
+#: gajim/gtk/accounts.py:860
 #, fuzzy
 msgid "Port"
 msgstr "_Port:"
 
-#: gajim/gtk/accounts.py:862
+#: gajim/gtk/accounts.py:865
 #, fuzzy
 msgid "Connection Settings"
 msgstr "Veza"
 
-#: gajim/gtk/accounts.py:872
+#: gajim/gtk/accounts.py:875
 msgid "PKCS12 Files"
 msgstr ""
 
-#: gajim/gtk/accounts.py:874
+#: gajim/gtk/accounts.py:877
 #, fuzzy
 msgid "Encrypted Certificate"
 msgstr "Samopotpisani sertifikat"
 
-#: gajim/gtk/accounts.py:878
+#: gajim/gtk/accounts.py:881
 #, fuzzy
 msgid "Certificate Settings"
 msgstr "Samopotpisani sertifikat"
 
-#: gajim/gtk/accounts.py:890
+#: gajim/gtk/accounts.py:893
 #, fuzzy
 msgid "Save Password"
 msgstr "Sačuvaj lozinku"
 
-#: gajim/gtk/accounts.py:898
+#: gajim/gtk/accounts.py:901
 #, fuzzy
 msgid "Login Settings"
 msgstr "Registracija neuspela"
 
-#: gajim/gtk/accounts.py:931
+#: gajim/gtk/accounts.py:934
 #, fuzzy, python-format
 msgid "Removing account %s"
 msgstr "Uklanjanje računa %s"
 
-#: gajim/gtk/accounts.py:946
+#: gajim/gtk/accounts.py:949
 #, fuzzy
 msgid "Account is disabled"
 msgstr "Smajliji isključeni"
 
-#: gajim/gtk/accounts.py:947
+#: gajim/gtk/accounts.py:950
 #, fuzzy
 msgid "To unregister from a server, the account must be enabled."
 msgstr "Da biste onemogućili nalog, morate biti raskačeni."
 
-#: gajim/gtk/accounts.py:962
+#: gajim/gtk/accounts.py:965
 #, fuzzy
 msgid "Password required"
 msgstr "Lozinka zahtevana"
 
-#: gajim/gtk/accounts.py:976
+#: gajim/gtk/accounts.py:979
 #, fuzzy, python-format
 msgid "Account '%s' is still connected to the server"
 msgstr "Račun \"%s\" je povezan na server"
 
-#: gajim/gtk/accounts.py:978
+#: gajim/gtk/accounts.py:981
 msgid "If you remove it, the connection will be lost."
 msgstr "Ukoliko ga uklonite, veza će biti izgubljena."
 
-#: gajim/gtk/accounts.py:995
+#: gajim/gtk/accounts.py:998
 #, fuzzy, python-format
 msgid "Connection to server %s failed"
 msgstr "Veza sa proksijem prekinuta"
 
-#: gajim/gtk/accounts.py:996
+#: gajim/gtk/accounts.py:999
 #, fuzzy
 msgid "What would you like to do?"
 msgstr "Šta želite da uradite?"
 
-#: gajim/gtk/accounts.py:997
+#: gajim/gtk/accounts.py:1000
 #, fuzzy
 msgid "Remove only from Gajim"
 msgstr "Ukloni nalog samo iz Gajima"
 
-#: gajim/gtk/accounts.py:998
+#: gajim/gtk/accounts.py:1001
 msgid "Don't remove anything. I'll try again later"
 msgstr ""
 
@@ -10866,6 +11193,10 @@ msgstr "<b>%s</b> želi da <b>%s</b> neke kontakte u listu vaših kontakata."
 msgid "Modify"
 msgstr "Izmenite"
 
+#: gajim/gtk/roster_item_exchange.py:80
+msgid "JID"
+msgstr "DŽID"
+
 #: gajim/gtk/roster_item_exchange.py:86
 msgid "Groups"
 msgstr "Grupe"
@@ -10891,19 +11222,19 @@ msgstr[0] "Uklanja kontakt sa liste"
 msgstr[1] "Uklanja kontakt sa liste"
 msgstr[2] "Uklanja kontakt sa liste"
 
-#: gajim/gtk/util.py:581
+#: gajim/gtk/util.py:583
 msgid "Unknown Artist"
 msgstr "Nepoznat izvođač"
 
-#: gajim/gtk/util.py:582
+#: gajim/gtk/util.py:584
 msgid "Unknown Title"
 msgstr "Nepoznat naslov"
 
-#: gajim/gtk/util.py:583
+#: gajim/gtk/util.py:585
 msgid "Unknown Source"
 msgstr "Nepoznat izvor"
 
-#: gajim/gtk/util.py:585
+#: gajim/gtk/util.py:587
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
@@ -10912,28 +11243,10 @@ msgstr ""
 "<b>\"%(title)s\"</b> od <i>%(artist)s</i>\n"
 "iz <i>%(source)s</i>"
 
-#: gajim/gtk/bookmarks.py:121
-msgid "New Group Chat"
-msgstr "Novi grupni razgovor"
-
-#: gajim/gtk/bookmarks.py:161
-msgid "This bookmark has invalid data"
-msgstr "Ovaj marker ima neispravne podatke"
-
-#: gajim/gtk/bookmarks.py:162
-msgid ""
-"Please be sure to fill out server and room fields or remove this bookmark."
-msgstr ""
-"Molimo obavezno ispunite polja servera i sobe ili uklonite ovaj marker."
-
-#: gajim/gtk/bookmarks.py:273 gajim/gtk/bookmarks.py:291
-#: gajim/gtk/bookmarks.py:304 gajim/gtk/bookmarks.py:335
-msgid "Character not allowed"
-msgstr "Karakter nije dozvoljen"
-
-#: gajim/gtk/bookmarks.py:334
-msgid "Invalid room"
-msgstr "Neispravna soba"
+#: gajim/gtk/bookmarks.py:47
+#, fuzzy, python-format
+msgid "Bookmarks for %s"
+msgstr "_Markiraj ovu so_bu"
 
 #: gajim/plugins/pluginmanager.py:736 gajim/plugins/pluginmanager.py:742
 msgid "Archive corrupted"
@@ -10945,51 +11258,54 @@ msgid "Archive empty"
 msgstr "Datoteka je prazna"
 
 #: gajim/plugins/pluginmanager.py:750 gajim/plugins/pluginmanager.py:758
-#: gajim/plugins/gui.py:257
+#: gajim/plugins/gui.py:258
 #, fuzzy
 msgid "Archive is malformed"
 msgstr "Servis je poslao loše podatke"
 
-#: gajim/plugins/pluginmanager.py:766 gajim/plugins/gui.py:281
-#: gajim/plugins/gui.py:289
+#: gajim/plugins/pluginmanager.py:766 gajim/plugins/gui.py:288
+#: gajim/plugins/gui.py:301
 #, fuzzy
 msgid "Plugin already exists"
 msgstr "Ova datoteka već postoji"
 
-#: gajim/plugins/gui.py:82
+#: gajim/plugins/gui.py:83
 msgid "Click to view Gajim's wiki page on how to install plugins in Flatpak."
 msgstr ""
 
-#: gajim/plugins/gui.py:89
+#: gajim/plugins/gui.py:90
 msgid "Plugin"
 msgstr ""
 
-#: gajim/plugins/gui.py:151
+#: gajim/plugins/gui.py:152
 #, fuzzy, python-format
 msgid "Warning: %s"
 msgstr "Zabranjujem %s"
 
-#: gajim/plugins/gui.py:206
+#: gajim/plugins/gui.py:207
 #, fuzzy
 msgid "Plugin failed"
 msgstr "Registracija neuspela"
 
-#: gajim/plugins/gui.py:245
+#: gajim/plugins/gui.py:246
 msgid "Unable to properly remove the plugin"
 msgstr ""
 
-#: gajim/plugins/gui.py:281
-msgid "Overwrite?"
-msgstr ""
+#: gajim/plugins/gui.py:287
+#, fuzzy
+msgid "Overwrite Plugin?"
+msgstr "Prepiši statusnu poruku?"
+
+#: gajim/plugins/gui.py:289
+#, fuzzy
+msgid "Do you want to overwrite the currently installed version?"
+msgstr "Da li želite da prihvatite ovu pozivnicu?"
 
 #: data/org.gajim.Gajim.desktop.in:5
-msgid "Jabber IM Client"
+#, fuzzy
+msgid "XMPP IM Client"
 msgstr "Džaber IM Klijent"
 
-#: data/org.gajim.Gajim.desktop.in:6
-msgid "A GTK+ Jabber client"
-msgstr "GTK+ Džaber klijent"
-
 #: data/org.gajim.Gajim.desktop.in:8
 msgid "chat;messaging;im;xmpp;bonjour;voip;"
 msgstr ""
@@ -11041,7 +11357,7 @@ msgid "Easily send pictures, videos or other files to friends and groups"
 msgstr ""
 
 #: data/org.gajim.Gajim.appdata.xml.in:27
-msgid "Chat securely with End-to-End encryption via OMEMO or PGP"
+msgid "Chat securely with End-to-End encryption via OMEMO or OpenPGP"
 msgstr ""
 
 #: data/org.gajim.Gajim.appdata.xml.in:28
@@ -11103,7 +11419,7 @@ msgstr ""
 
 #: data/org.gajim.Gajim.appdata.xml.in:52
 #, fuzzy
-msgid "Roster, list of contacts"
+msgid "Contact list, list of contacts"
 msgstr "_Zapisuj u dnevnik statusne promene kontakata"
 
 #: data/org.gajim.Gajim.appdata.xml.in:56
@@ -11125,6 +11441,525 @@ msgstr "Nedavno:"
 msgid "Plugin manager"
 msgstr "Registracija neuspela"
 
+#, fuzzy
+#~ msgid "Configure Services…"
+#~ msgstr "Konfiguriši servise..."
+
+#, fuzzy
+#~ msgid "Group Chat Bookmarks"
+#~ msgstr "_Grupni razgovor"
+
+#, fuzzy
+#~ msgid "Add Bookmark"
+#~ msgstr "_Markiraj ovu so_bu"
+
+#, fuzzy
+#~ msgid "Remove Bookmark"
+#~ msgstr "_Markiraj ovu so_bu"
+
+#, fuzzy
+#~ msgid "Bookmark Name"
+#~ msgstr "Markiraj ovu sobu"
+
+#, fuzzy
+#~ msgid "_Server"
+#~ msgstr "_Server:"
+
+#, fuzzy
+#~ msgid "_Password"
+#~ msgstr "_Lozinka:"
+
+#, fuzzy
+#~ msgid "Join chat when connected"
+#~ msgstr "Kontakt Otišao Sa Veze"
+
+#~ msgid "New Group Chat"
+#~ msgstr "Novi grupni razgovor"
+
+#~ msgid "This bookmark has invalid data"
+#~ msgstr "Ovaj marker ima neispravne podatke"
+
+#, fuzzy
+#~ msgid ""
+#~ "Please be sure to fill out server and group chat fields or remove this "
+#~ "bookmark."
+#~ msgstr ""
+#~ "Molimo obavezno ispunite polja servera i sobe ili uklonite ovaj marker."
+
+#~ msgid "Character not allowed"
+#~ msgstr "Karakter nije dozvoljen"
+
+#, fuzzy
+#~ msgid "Invalid Group Chat"
+#~ msgstr "Neispravan Džaber ID grupnog razgovora"
+
+#~ msgid "Unable to join group chat"
+#~ msgstr "Nije moguće pridružiti se grupnom razgovoru"
+
+#, fuzzy
+#~ msgid "You are banned from group chat <b>%s</b>."
+#~ msgstr "Zabranjen Vam je pristup ovom grupnom razgovoru %s."
+
+#, fuzzy
+#~ msgid "Remote server <b>%s</b> does not exist."
+#~ msgstr "Grupni razgovor.%s ne postoji."
+
+#, fuzzy
+#~ msgid "Group chat <b>%s</b> does not exist."
+#~ msgstr "Grupni razgovor.%s ne postoji."
+
+#, fuzzy
+#~ msgid "Group chat creation is not permitted."
+#~ msgstr "Stvaranje grupnih razgovora Vam nije dozvoljeno."
+
+#, fuzzy
+#~ msgid "You must use your registered nickname in <b>%s</b>."
+#~ msgstr "Morate koristiti Vaš registrovani nadimak u grupnom razgovoru %s."
+
+#, fuzzy
+#~ msgid "You are not in the members list in group chat %s."
+#~ msgstr "Niste u listi članova grupnog razgovora %s."
+
+#, fuzzy
+#~ msgid "XMPP Address is not a group chat"
+#~ msgstr "Ovo nije grupni razgovor"
+
+#~ msgid "This is not a group chat"
+#~ msgstr "Ovo nije grupni razgovor"
+
+#, fuzzy
+#~ msgid "Please choose a group chat"
+#~ msgstr "Molimo Vas napravite novu čistu temu sa željenim imenom."
+
+#~ msgid "Invalid Nickname"
+#~ msgstr "Neispravan nadimak"
+
+#, fuzzy
+#~ msgid "Please choose a nickname"
+#~ msgstr "Molimo Vas napravite novu čistu temu sa željenim imenom."
+
+#, fuzzy
+#~ msgid "Wrong server"
+#~ msgstr "Loš uri"
+
+#, fuzzy
+#~ msgid "%s is not a group chat server"
+#~ msgstr "Ovo nije grupni razgovor"
+
+#, fuzzy
+#~ msgid ""
+#~ "How many lines to request from server when entering a group chat. -1 "
+#~ "means no limit."
+#~ msgstr "Koliko linija tražiti od servera pri ulasku na grupni razgovor."
+
+#, fuzzy
+#~ msgid ""
+#~ "Minutes of backlog to request when entering a group chat. -1 means no "
+#~ "limit."
+#~ msgstr ""
+#~ "Od pre koliko minuta tražiti dnevnike pri ulasku na grupni razgovor."
+
+#, fuzzy
+#~ msgid ""
+#~ "How many lines to request from server when entering a group chat. -1 "
+#~ "means no limit, -2 means global value."
+#~ msgstr "Koliko linija tražiti od servera pri ulasku na grupni razgovor."
+
+#, fuzzy
+#~ msgid ""
+#~ "Minutes of backlog to request when entering a group chat. -1 means no "
+#~ "limit, -2 means global value."
+#~ msgstr ""
+#~ "Od pre koliko minuta tražiti dnevnike pri ulasku na grupni razgovor."
+
+#, fuzzy
+#~ msgid "A Password is required to join the group chat %s. Please type it."
+#~ msgstr "Lozinka potrebna za pridruživanje grupnom razgovoru %s. Unesite je."
+
+#~ msgid "Not in Roster"
+#~ msgstr "Nije na listi kontakata"
+
+#~ msgid "I would like to add you to my roster"
+#~ msgstr "Želeo bih Vas dodati na moju listu kontakata"
+
+#, fuzzy
+#~ msgid "Add to Roster"
+#~ msgstr "_Dodaj na listu kontakata"
+
+#, fuzzy
+#~ msgid "Manage Room"
+#~ msgstr "Upravljanje sobama"
+
+#, fuzzy
+#~ msgid "Configure Room"
+#~ msgstr "Podesi _sobu..."
+
+#, fuzzy
+#~ msgid "Destroy Room"
+#~ msgstr "Uništi sobu"
+
+#, fuzzy
+#~ msgid "Change Nick"
+#~ msgstr "Promeni _nadimak..."
+
+#, fuzzy
+#~ msgid "Disconnect"
+#~ msgstr "_Izloguj se"
+
+#, fuzzy
+#~ msgid "Copy JID"
+#~ msgstr "Džaber ID sobe:"
+
+#, fuzzy
+#~ msgid "Add to Roster…"
+#~ msgstr "_Dodaj na listu kontakata"
+
+#, fuzzy
+#~ msgid "Copy JID/Email"
+#~ msgstr "_Kopiraj džaber ID/e-mejl adresu"
+
+#, fuzzy
+#~ msgid "JID: <i>%s</i>"
+#~ msgstr "Džaber ID: <i>%s</i>"
+
+#~ msgid "Changing Subject"
+#~ msgstr "Promena Teme"
+
+#~ msgid "Please specify the new subject:"
+#~ msgstr "Molimo odredite novu temu:"
+
+#~ msgid "Room logging is now enabled"
+#~ msgstr "Logovanje u sobi je sada omogućeno"
+
+#~ msgid "Room logging is now disabled"
+#~ msgstr "Logovanje u sobi je sada onemogućeno"
+
+#, fuzzy
+#~ msgid "You (%s) joined the room"
+#~ msgstr "%s se pridružio grupnom razgovoru"
+
+#~ msgid "Room logging is enabled"
+#~ msgstr "Logovanje sobe je omogućeno"
+
+#, fuzzy
+#~ msgid "Unable to join groupchat"
+#~ msgstr "Nije moguće pridružiti se grupnom razgovoru"
+
+#~ msgid "Groupchat Invitation"
+#~ msgstr "Poziv na grupni razgovor"
+
+#, fuzzy
+#~ msgid "%(jid)s has been invited in this room"
+#~ msgstr "%(nick)s je izbačen iz sobe (%(reason)s)"
+
+#, fuzzy
+#~ msgid "JID is not a Groupchat"
+#~ msgstr "Ovo nije grupni razgovor"
+
+#~ msgid "Invalid JID"
+#~ msgstr "Neispravan džaber ID"
+
+#~ msgid "A connection is not available"
+#~ msgstr "Veza nije dostupna"
+
+#, fuzzy
+#~ msgid "JID already in list"
+#~ msgstr "Džaber ID već u listi kontakata"
+
+#, fuzzy
+#~ msgid "For the chosen encryption there is no encryption method available"
+#~ msgstr "Veza nije dostupna"
+
+#~ msgid "Removes contact from roster"
+#~ msgstr "Uklanja kontakt sa liste"
+
+#~ msgid "Not in roster"
+#~ msgstr "Nije u listi kontakata"
+
+#, fuzzy
+#~ msgid "Contact signed in notification color."
+#~ msgstr "Prikaži događaj u listi kontakata"
+
+#, fuzzy
+#~ msgid "Contact signout notification color"
+#~ msgstr "Prikaži događaj u listi kontakata"
+
+#, fuzzy
+#~ msgid "File transfer request notification color."
+#~ msgstr "Zahtev za prenosom datoteke"
+
+#, fuzzy
+#~ msgid "File transfer error notification color."
+#~ msgstr "Prenos datoteke prekinut"
+
+#, fuzzy
+#~ msgid "File transfer complete or stopped notification color."
+#~ msgstr "Prikaži iskačuće obaveštenje kada se završi prenos datoteke"
+
+#, fuzzy
+#~ msgid "Groupchat invitation notification color"
+#~ msgstr "Poziv na grupni razgovor"
+
+#~ msgid "Add * and [n] in roster title?"
+#~ msgstr "Dodaj * i [n] u naslov liste kontakata?"
+
+#~ msgid "Hides the banner in two persons chat window"
+#~ msgstr "Sakriva baner u prozoru razgovora dve osobe"
+
+#, fuzzy
+#~ msgid ""
+#~ "Show the confirm metacontacts creation dialog or not? Empty string means "
+#~ "never show the dialog."
+#~ msgstr ""
+#~ "Treba li pitati za potvrdu stvaranja pseudokontakta ili ne? Prazna niska "
+#~ "znači da nikada ne prikazujemo dijalog."
+
+#~ msgid "Space separated list of ssl errors to ignore."
+#~ msgstr "Lista ssl grešaka za ignorisanje, odvojena razmacima."
+
+#~ msgid "Answer to receipt requests"
+#~ msgstr "Odgovor na zahtev primanja"
+
+#~ msgid "Sent receipt requests"
+#~ msgstr "Poslati zahtev primanja"
+
+#, fuzzy
+#~ msgid "Language for which misspelled words will be checked"
+#~ msgstr "Jezik u kome želite proveravati neispravno napisane reči"
+
+#~ msgid "I'm eating, so leave me a message."
+#~ msgstr "Jedem, ostavite poruku."
+
+#, fuzzy
+#~ msgid "from room %s"
+#~ msgstr " iz sobe %s"
+
+#~ msgid "Leave Groupchats"
+#~ msgstr "Napusti grupne razgovore"
+
+#, fuzzy
+#~ msgid "Auto Join"
+#~ msgstr "Automatsko povezivanje"
+
+#, fuzzy
+#~ msgid "Room"
+#~ msgstr "Soba:"
+
+#~ msgid "Jabber ID:"
+#~ msgstr "Džaber ID:"
+
+#~ msgid "Occupant Actions"
+#~ msgstr "_Akcije prisutnih"
+
+#~ msgid "_Add to Roster"
+#~ msgstr "_Dodaj na listu kontakata"
+
+#~ msgid "_Manage Room"
+#~ msgstr "Upravljanje sobama"
+
+#~ msgid "Configure _Room..."
+#~ msgstr "Podesi _sobu..."
+
+#~ msgid "_Destroy Room"
+#~ msgstr "Uništi sobu"
+
+#~ msgid "Jabber ID"
+#~ msgstr "Džaber ID"
+
+#, fuzzy
+#~ msgid "icon"
+#~ msgstr "Ikona sistemske kasete"
+
+#, fuzzy
+#~ msgid "account"
+#~ msgstr "Nalog"
+
+#, fuzzy
+#~ msgid "Roster"
+#~ msgstr "_Prikaži listu kontakata"
+
+#, fuzzy
+#~ msgid "Show only in roster"
+#~ msgstr "Prikaži događaj u listi kontakata"
+
+#~ msgid "in _roster"
+#~ msgstr "u _listi kontakata"
+
+#, fuzzy
+#~ msgid "Roster Appearance"
+#~ msgstr "<b>Izgled liste kontakata</b>"
+
+#, fuzzy
+#~ msgid "Show chatstate in roster"
+#~ msgstr "Prikaži _avatare kontakata na listi"
+
+#~ msgid "_Add to Roster..."
+#~ msgstr "_Dodaj na listu kontakata..."
+
+#~ msgid "_Jabber ID:"
+#~ msgstr "_Džaber ID:"
+
+#, fuzzy
+#~ msgid "_Jabber ID"
+#~ msgstr "_Džaber ID:"
+
+#~ msgid "JabberID"
+#~ msgstr "Džaber ID"
+
+#, fuzzy
+#~ msgid "Show Roster"
+#~ msgstr "_Prikaži listu kontakata"
+
+#~ msgid "MUC server"
+#~ msgstr "Server grupnog razgovora"
+
+#~ msgid "Room Configuration"
+#~ msgstr "Konfiguracija sobe"
+
+#~ msgid "Join _Group Chat"
+#~ msgstr "Priključi se _grupnom razgovoru"
+
+#, fuzzy
+#~ msgid "Audio sessions are not available"
+#~ msgstr "Veza nije dostupna"
+
+#~ msgid "Conference"
+#~ msgstr "Konferencija"
+
+#, fuzzy
+#~ msgid "_Manage Bookmarks…"
+#~ msgstr "Podešavanje markera"
+
+#, fuzzy
+#~ msgid "Hide _Roster"
+#~ msgstr "u _listi kontakata"
+
+#~ msgid "Show _Roster"
+#~ msgstr "_Prikaži listu kontakata"
+
+#, fuzzy
+#~ msgid "Invalid Room"
+#~ msgstr "Neispravna soba"
+
+#~ msgid "Invalid room"
+#~ msgstr "Neispravna soba"
+
+#~ msgid "A GTK+ Jabber client"
+#~ msgstr "GTK+ Džaber klijent"
+
+#~ msgid "Changing Nickname"
+#~ msgstr "Promena nadimka"
+
+#~ msgid "Please specify the new nickname you want to use:"
+#~ msgstr "Molimo odredite novi nadimak koji želite da koristite:"
+
+#~ msgid "Bookmark already set"
+#~ msgstr "Marker je već postavljen"
+
+#, fuzzy
+#~ msgid "Group Chat '%s' is already in your bookmarks."
+#~ msgstr "Grupni razgovor \"%s\" je već markiran."
+
+#~ msgid "Bookmark has been added successfully"
+#~ msgstr "Marker uspešno dodat"
+
+#, fuzzy
+#~ msgid ""
+#~ "You can manage your bookmarks by clicking the Bookmarks menu item in your "
+#~ "contact list."
+#~ msgstr ""
+#~ "Možete upravljati Vašim markerima pomoću menija Akcije iz Vaše liste "
+#~ "kontakata."
+
+#, fuzzy
+#~ msgid "The nickname contains invalid characters."
+#~ msgstr "Nadimak sadrži nedozvoljene karaktere."
+
+#, fuzzy
+#~ msgid "Bookmark Room"
+#~ msgstr "Markiraj ovu sobu"
+
+#~ msgid "_Join New Group Chat"
+#~ msgstr "_Pridruživanje novom grupnom razgovoru"
+
+#, fuzzy
+#~ msgid "_Create Group Chat"
+#~ msgstr "Napusti grupne razgovore"
+
+#~ msgid "Name:"
+#~ msgstr "Ime:"
+
+#, fuzzy
+#~ msgid "Description:"
+#~ msgstr "Opis:"
+
+#, fuzzy
+#~ msgid "Address:"
+#~ msgstr "_Adresa:"
+
+#, fuzzy
+#~ msgid "You can not start a new conversation unless you are connected."
+#~ msgstr "Ne možete se priključiti grupnom razgovoru ako niste povezani."
+
+#, fuzzy
+#~ msgid "Occupants"
+#~ msgstr "_Akcije prisutnih"
+
+#, fuzzy
+#~ msgid "File transfer error"
+#~ msgstr "Greška pri prenosu datoteke"
+
+#, fuzzy
+#~ msgid "No Accounts available"
+#~ msgstr "Nema dostupnih naloga"
+
+#~ msgid "_Modify Account..."
+#~ msgstr "_Izmeni nalog..."
+
+#~ msgid "Boolean"
+#~ msgstr "Da/Ne"
+
+#~ msgid "Integer"
+#~ msgstr "Ceo broj"
+
+#~ msgid "Text"
+#~ msgstr "Tekst"
+
+#~ msgid "Value"
+#~ msgstr "Vrednost"
+
+#~ msgid "Type"
+#~ msgstr "Tip"
+
+#~ msgid "(None)"
+#~ msgstr "(ništa)"
+
+#~ msgid "Hidden"
+#~ msgstr "Skriven"
+
+#~ msgid "Manage Proxy Profiles"
+#~ msgstr "Podešavanje proksi profila"
+
+#, fuzzy
+#~ msgid "Properties"
+#~ msgstr "<b>Karakteristike</b>"
+
+#, fuzzy
+#~ msgid "Proxy _Host"
+#~ msgstr "Proksi _host:"
+
+#, fuzzy
+#~ msgid "Proxy _Port"
+#~ msgstr "Proksi _port:"
+
+#, fuzzy
+#~ msgid "New Groupchat"
+#~ msgstr "Novi grupni razgovor"
+
+#, fuzzy
+#~ msgid "New Contact"
+#~ msgstr "Dodaj novi kontakt"
+
 #~ msgid "%s GiB"
 #~ msgstr "%s GiB"
 
@@ -11206,9 +12041,6 @@ msgstr "Registracija neuspela"
 #~ msgid "_Pause"
 #~ msgstr "_Pauziraj"
 
-#~ msgid "Clean _up"
-#~ msgstr "_Počisti"
-
 #~ msgid "Remove file transfer from the list."
 #~ msgstr "Ukloni prenos datoteka sa liste"
 
@@ -11660,9 +12492,6 @@ msgstr "Registracija neuspela"
 #~ msgid "You are invited to a groupchat"
 #~ msgstr "Pozvani ste u grupni razgovor"
 
-#~ msgid "Do you want to accept the invitation?"
-#~ msgstr "Da li želite da prihvatite ovu pozivnicu?"
-
 #~ msgid "_Start Chat"
 #~ msgstr "_Započni razgovor"
 
@@ -11877,10 +12706,6 @@ msgstr "Registracija neuspela"
 #~ msgid "Nick"
 #~ msgstr "Nadimak"
 
-#, fuzzy
-#~ msgid "Banning…"
-#~ msgstr "Zabrana..."
-
 #~ msgid ""
 #~ "<b>Whom do you want to ban?</b>\n"
 #~ "\n"
@@ -11962,12 +12787,6 @@ msgstr "Registracija neuspela"
 #~ msgid "Filter:"
 #~ msgstr "Filter:"
 
-#~ msgid ""
-#~ "If checked, Gajim will display the mood of contacts in the roster window"
-#~ msgstr ""
-#~ "Ako je označena, Gajim će prikazivati raspoloženje kontakata u listi "
-#~ "kontakata"
-
 #~ msgid "<b>Chat Appearance</b>"
 #~ msgstr "<b>Izgled razgovora</b>"
 
@@ -12222,10 +13041,6 @@ msgstr "Registracija neuspela"
 #~ msgstr "_Statusna poruka:"
 
 #, fuzzy
-#~ msgid "Group chat highlight"
-#~ msgstr "Bojenje Poruka Sa Grupnog Razgovora"
-
-#, fuzzy
 #~ msgid "Your nickname"
 #~ msgstr "Nadimak:"
 
@@ -12364,9 +13179,6 @@ msgstr "Registracija neuspela"
 #~ msgid "The passwords typed in both fields must be identical."
 #~ msgstr "Lozinke upisane u oba polja moraju biti identične."
 
-#~ msgid "Enter new password:"
-#~ msgstr "Unesite novu lozinku:"
-
 #~ msgid "Enter it again for confirmation:"
 #~ msgstr "Unesite ponovo kao potvrdu:"
 
@@ -12382,10 +13194,6 @@ msgstr "Registracija neuspela"
 #~ msgstr "zahtev za ukidanje pretplate od kontakta %s"
 
 #, fuzzy
-#~ msgid "Autojoin"
-#~ msgstr "Automatsko povezivanje"
-
-#, fuzzy
 #~ msgid "Homepage:"
 #~ msgstr "<b>Lična strana:</b>"
 
@@ -12500,9 +13308,6 @@ msgstr "Registracija neuspela"
 #~ msgid "Forward unread message then disconnect"
 #~ msgstr "Prosledi nepročitane poruke"
 
-#~ msgid "AIM Address:"
-#~ msgstr "AIM adresa:"
-
 #~ msgid "MSN Address:"
 #~ msgstr "MSN adresa:"
 
@@ -12552,10 +13357,6 @@ msgstr "Registracija neuspela"
 #~ msgid "Session negotiation cancelled"
 #~ msgstr "Uspostavljanje sesije prekinuto"
 
-#, fuzzy
-#~ msgid "This session WILL NOT be archived on server"
-#~ msgstr "Sesija NEĆE biti pamćena"
-
 #~ msgid "This session is encrypted"
 #~ msgstr "Ova sesija je šifrovana"
 
@@ -12866,9 +13667,6 @@ msgstr "Registracija neuspela"
 #~ msgid "Server:"
 #~ msgstr "Server:"
 
-#~ msgid "Password:"
-#~ msgstr "Lozinka:"
-
 #, fuzzy
 #~ msgid "Join this room _automatically when I connect"
 #~ msgstr "Uđi u ovu sobu automatski kada se povežem"
@@ -13209,9 +14007,6 @@ msgstr "Registracija neuspela"
 #~ msgid "_Edit Personal Information..."
 #~ msgstr "Izm_eni lične informacije..."
 
-#~ msgid "Information about you, as stored in the server"
-#~ msgstr "Informacije o Vama, kako su uskladištene na serveru"
-
 #~ msgid "<b>Personal Information</b>"
 #~ msgstr "<b>Lične informacije</b>"
 
@@ -13290,9 +14085,6 @@ msgstr "Registracija neuspela"
 #~ msgid "Your server can't save your personal information."
 #~ msgstr "Vaš server ne može da sačuva Vaše lične informacije."
 
-#~ msgid "Account Local already exists."
-#~ msgstr "Račun lokal već postoji."
-
 #~ msgid "Please rename or remove it before enabling link-local messaging."
 #~ msgstr ""
 #~ "Molimo Vas, preimenujte ili uklonite pre omogućavanja lokalnih poruka."
@@ -13381,10 +14173,6 @@ msgstr "Registracija neuspela"
 #~ msgid "The following message was NOT encrypted"
 #~ msgstr "Sledeća poruka NIJE bila šifrovana"
 
-#, fuzzy
-#~ msgid "Encryption used for this contact."
-#~ msgstr "Omogući ESessions enkripciju za ovaj nalog."
-
 #~ msgid "Toggle Open_PGP Encryption"
 #~ msgstr "Uključi/isključi Open_PGP enkripciju"
 
@@ -13463,10 +14251,6 @@ msgstr "Registracija neuspela"
 #~ msgid "Contact's identity verified"
 #~ msgstr "Identitet kontakta potvrđen"
 
-#, fuzzy
-#~ msgid "Verify again…"
-#~ msgstr "Potvrdite ponovo..."
-
 #~ msgid ""
 #~ "To be certain that <b>only</b> the expected person can read your messages "
 #~ "or send you messages, you need to verify their identity by clicking the "
@@ -13592,9 +14376,6 @@ msgstr "Registracija neuspela"
 #~ msgid "Add _Contact..."
 #~ msgstr "_Dodaj kontakt..."
 
-#~ msgid "_Accounts"
-#~ msgstr "_Nalozi"
-
 #~ msgid "Profile, A_vatar"
 #~ msgstr "Profil, A_vatar"
 
@@ -13825,12 +14606,6 @@ msgstr "Registracija neuspela"
 #~ msgid "Activity: "
 #~ msgstr "Aktivnost:"
 
-#~ msgid "Join _Group Chat..."
-#~ msgstr "Priključi se _grupnom razgovoru..."
-
-#~ msgid "_Modify Account"
-#~ msgstr "Izmeni nalog"
-
 #~ msgid "Check on startup if Gajim is the _default Jabber client"
 #~ msgstr "Proveri po startovanju da li je Gajim podrazumevani džaber klijent"
 
@@ -13854,9 +14629,6 @@ msgstr "Registracija neuspela"
 #~ msgid "Execute Command..."
 #~ msgstr "Izvrši naredbu..."
 
-#~ msgid " a window/tab opened with that contact "
-#~ msgstr " otvaranje prozora/jezička sa tim kontaktom "
-
 #~ msgid "<b>Actions</b>"
 #~ msgstr "<b>Akcije</b>"
 
@@ -14449,9 +15221,6 @@ msgstr "Registracija neuspela"
 #~ msgid "[This message is encrypted]"
 #~ msgstr "[Ova poruka je šifrovana]"
 
-#~ msgid "Trayicon"
-#~ msgstr "Ikona sistemske kasete"
-
 #~ msgid "A icon in systemtray reflecting the current presence."
 #~ msgstr "Ikona u sistemskoj kaseti odražava trenutno stanje."
 
@@ -14487,9 +15256,6 @@ msgstr "Registracija neuspela"
 #~ msgid "Nickname not found: %s"
 #~ msgstr "Nadimak nije pronađen: %s "
 
-#~ msgid "This group chat has no subject"
-#~ msgstr "Ovaj grupni razgovor nema temu"
-
 #, fuzzy
 #~ msgid ""
 #~ "Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
@@ -14567,9 +15333,6 @@ msgstr "Registracija neuspela"
 #~ "Kliknite da vidite mogućnosti (kao što su MSN, ICQ transporti) džaber "
 #~ "servera "
 
-#~ msgid "_Host:"
-#~ msgstr "_Host:"
-
 #~ msgid "Select the account with which to synchronise"
 #~ msgstr "Odaberite nalog sa kojim želite da se sinhronizujete"
 
diff --git a/po/sv.po b/po/sv.po
index 90651b513..60779444e 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: 2019-07-02 02:06+0000\n"
+"POT-Creation-Date: 2019-08-11 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,73 +19,73 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: gajim/chat_control_base.py:550
+#: gajim/chat_control_base.py:557
 msgid "_Undo"
 msgstr ""
 
-#: gajim/chat_control_base.py:558 gajim/conversation_textview.py:529
+#: gajim/chat_control_base.py:565 gajim/conversation_textview.py:529
 msgid "_Clear"
 msgstr ""
 
-#: gajim/chat_control_base.py:563
+#: gajim/chat_control_base.py:570
 msgid "Paste as quote"
 msgstr ""
 
-#: gajim/chat_control_base.py:613
+#: gajim/chat_control_base.py:620
 #, fuzzy
 msgid "Paste Image"
 msgstr "Välj Bild"
 
-#: gajim/chat_control_base.py:614
+#: gajim/chat_control_base.py:621
 #, 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:615
+#: gajim/chat_control_base.py:622
 #, 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:617 gajim/groupchat_control.py:2310
-#: gajim/roster_window.py:2848 gajim/roster_window.py:4167
-#: gajim/message_window.py:252 gajim/gtk/dialogs.py:418
+#: gajim/chat_control_base.py:624 gajim/groupchat_control.py:2218
+#: gajim/roster_window.py:2841 gajim/roster_window.py:4118
+#: gajim/message_window.py:359 gajim/gtk/dialogs.py:330
 #, fuzzy
 msgid "_Do not ask me again"
 msgstr "Fråga mig i_nte igen"
 
-#: gajim/chat_control_base.py:620
+#: gajim/chat_control_base.py:627
 msgid "_Paste"
 msgstr ""
 
-#: gajim/chat_control_base.py:1162 gajim/gtk/accounts.py:351
+#: gajim/chat_control_base.py:1169 gajim/gtk/accounts.py:354
 #, fuzzy
 msgid "Privacy"
 msgstr "Integritetslista"
 
-#: gajim/chat_control_base.py:1163
+#: gajim/chat_control_base.py:1170
 #, fuzzy
 msgid "Warning"
 msgstr "Bannlyser %s"
 
-#: gajim/chat_control_base.py:1164
+#: gajim/chat_control_base.py:1171
 #, fuzzy, python-format
 msgid "If you send a file to <b>%s</b>, your real JID will be revealed."
 msgstr ""
 "Om du skickar en fil till %s så kommer han/hon att få veta ditt riktiga "
 "Jabber-ID."
 
-#: gajim/chat_control_base.py:1169
+#: gajim/chat_control_base.py:1176
 #, fuzzy
 msgid "Continue"
 msgstr "_Fortsätt"
 
-#: gajim/gtkgui_helpers.py:163 gajim/gtk/filetransfer.py:393
+#: gajim/gtkgui_helpers.py:163 gajim/gtk/filetransfer.py:398
 #, fuzzy, python-format
 msgid "Cannot overwrite existing file '%s'"
 msgstr "Kan inte skriva över befintliga filen \"%s\""
 
-#: gajim/gtkgui_helpers.py:164 gajim/gtk/filetransfer.py:394
+#: gajim/gtkgui_helpers.py:164 gajim/gtk/filetransfer.py:399
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
@@ -176,388 +176,398 @@ msgstr "Det finns inga väntande prenumerationsbegäran."
 msgid " resource with priority "
 msgstr " resurs med prioritet "
 
-#: gajim/gui_menu_builder.py:96
-msgid "_New Group Chat"
-msgstr "_Ny gruppchatt"
-
-#: gajim/gui_menu_builder.py:289 gajim/gui_menu_builder.py:380
-#: gajim/chat_control.py:303 gajim/roster_window.py:786
-#: gajim/roster_window.py:1719 gajim/roster_window.py:1721
-#: gajim/roster_window.py:2030 gajim/roster_window.py:3336
-#: gajim/roster_window.py:3369 gajim/gui_interface.py:413
-#: gajim/common/contacts.py:206 gajim/common/contacts.py:343
-#: gajim/common/helpers.py:83 gajim/common/helpers.py:311
-#: gajim/gtk/add_contact.py:319 gajim/gtk/subscription_request.py:70
-#: gajim/gtk/subscription_request.py:99 gajim/gtk/roster_item_exchange.py:112
-msgid "Not in Roster"
-msgstr "Inte i kontaktlista"
+#: gajim/gui_menu_builder.py:251 gajim/gui_menu_builder.py:342
+#: gajim/chat_control.py:305 gajim/roster_window.py:783
+#: gajim/roster_window.py:1716 gajim/roster_window.py:1718
+#: gajim/roster_window.py:2027 gajim/roster_window.py:3292
+#: gajim/roster_window.py:3325 gajim/gui_interface.py:396
+#: gajim/common/contacts.py:222 gajim/common/contacts.py:359
+#: gajim/common/contacts.py:471 gajim/common/helpers.py:86
+#: gajim/common/helpers.py:317 gajim/gtk/add_contact.py:319
+#: gajim/gtk/subscription_request.py:70 gajim/gtk/subscription_request.py:99
+#: gajim/gtk/roster_item_exchange.py:112
+#, fuzzy
+msgid "Not in contact list"
+msgstr "Visa frånkopplade _kontakter"
 
-#: gajim/gui_menu_builder.py:393
-msgid "I would like to add you to my roster"
-msgstr "Jag skulle vilja lägga till dig i min kontaktlista"
+#: gajim/gui_menu_builder.py:355
+#, 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:471
+#: gajim/gui_menu_builder.py:433
 #, fuzzy
 msgid "Send Single _Message…"
 msgstr "Skicka ett _meddelande"
 
-#: gajim/gui_menu_builder.py:486
+#: gajim/gui_menu_builder.py:448
 #, fuzzy
 msgid "E_xecute Command…"
 msgstr "_Kör kommando"
 
-#: gajim/gui_menu_builder.py:494
+#: gajim/gui_menu_builder.py:456
 msgid "_Manage Transport"
 msgstr "_Hantera transport"
 
-#: gajim/gui_menu_builder.py:500
+#: gajim/gui_menu_builder.py:462
 msgid "_Modify Transport"
 msgstr "_Ändra transport"
 
-#: gajim/gui_menu_builder.py:507 gajim/roster_window.py:5046
+#: gajim/gui_menu_builder.py:469 gajim/roster_window.py:4985
 #, fuzzy
 msgid "_Rename…"
 msgstr "Byt _namn"
 
-#: gajim/gui_menu_builder.py:518 gajim/roster_window.py:5062
-#: gajim/roster_window.py:5177 gajim/data/gui/blocked_contacts_window.ui:52
+#: gajim/gui_menu_builder.py:480 gajim/roster_window.py:5001
+#: gajim/roster_window.py:5116 gajim/data/gui/blocked_contacts_window.ui:52
 #: gajim/data/gui/gc_occupants_menu.ui:148
 #: gajim/data/gui/contact_context_menu.ui:143
 msgid "_Unblock"
 msgstr "A_vblockera"
 
-#: gajim/gui_menu_builder.py:521 gajim/roster_window.py:5067
-#: gajim/roster_window.py:5181 gajim/data/gui/gc_occupants_menu.ui:140
+#: gajim/gui_menu_builder.py:483 gajim/roster_window.py:5006
+#: gajim/roster_window.py:5120 gajim/data/gui/gc_occupants_menu.ui:140
 #: gajim/data/gui/contact_context_menu.ui:151
 msgid "_Block"
 msgstr "_Blockera"
 
-#: gajim/gui_menu_builder.py:529 gajim/roster_window.py:5074
+#: gajim/gui_menu_builder.py:491 gajim/roster_window.py:5013
 #: gajim/data/gui/contact_context_menu.ui:181
 msgid "Remo_ve"
 msgstr "Ta _bort"
 
-#: gajim/gui_menu_builder.py:539 gajim/data/gui/contact_context_menu.ui:198
+#: gajim/gui_menu_builder.py:501 gajim/data/gui/contact_context_menu.ui:198
 msgid "_Information"
 msgstr "_Information"
 
-#: gajim/gui_menu_builder.py:552
+#: gajim/gui_menu_builder.py:514
 #, fuzzy
 msgid "Save _As"
 msgstr "Har "
 
-#: gajim/gui_menu_builder.py:564 gajim/groupchat_control.py:501
-#: gajim/chat_control.py:340
+#: gajim/gui_menu_builder.py:526 gajim/groupchat_control.py:507
+#: gajim/chat_control.py:342
 #, fuzzy
 msgid "Send File…"
 msgstr "Skicka _fil"
 
-#: gajim/gui_menu_builder.py:565
+#: gajim/gui_menu_builder.py:527
 #, fuzzy
 msgid "Upload File…"
 msgstr "Spara fil som..."
 
-#: gajim/gui_menu_builder.py:566
+#: gajim/gui_menu_builder.py:528
 #, fuzzy
 msgid "Send File Directly…"
 msgstr "Spara fil som..."
 
-#: gajim/gui_menu_builder.py:568 gajim/gui_menu_builder.py:632
+#: gajim/gui_menu_builder.py:530 gajim/gui_menu_builder.py:596
 #, fuzzy
 msgid "Send Chatstate"
 msgstr "Senaste status: %s"
 
-#: gajim/gui_menu_builder.py:569
+#: gajim/gui_menu_builder.py:531
 #, fuzzy
 msgid "Invite Contacts"
 msgstr "Bjud in _kontakter"
 
-#: gajim/gui_menu_builder.py:570
+#: gajim/gui_menu_builder.py:532
 #, fuzzy
-msgid "Add to Roster"
-msgstr "_Lägg till i kontaktlista"
+msgid "Add to Contact List"
+msgstr "_Lägg till kontakt..."
 
-#: gajim/gui_menu_builder.py:571
-msgid "Audio Session"
-msgstr ""
+#: gajim/gui_menu_builder.py:533
+#, fuzzy
+msgid "Voice Chat"
+msgstr "Förfrågan om Filöverföring"
 
-#: gajim/gui_menu_builder.py:572
-msgid "Video Session"
-msgstr ""
+#: gajim/gui_menu_builder.py:534
+#, fuzzy
+msgid "Video Chat"
+msgstr "Privat Chatt"
 
-#: gajim/gui_menu_builder.py:573
+#: gajim/gui_menu_builder.py:535 gajim/gui_menu_builder.py:582
 #, fuzzy
 msgid "Information"
 msgstr "_Information"
 
-#: gajim/gui_menu_builder.py:574 gajim/gui_menu_builder.py:639
+#: gajim/gui_menu_builder.py:536 gajim/gui_menu_builder.py:602
 #: gajim/data/gui/application_menu.ui:37
 #, fuzzy
 msgid "History"
 msgstr "_Historik"
 
-#: gajim/gui_menu_builder.py:580 gajim/gui_menu_builder.py:687
+#: gajim/gui_menu_builder.py:542 gajim/gui_menu_builder.py:650
 #: gajim/data/gui/preferences_window.ui:1823
 msgid "Disabled"
 msgstr "Avstängd"
 
-#: gajim/gui_menu_builder.py:581 gajim/gui_menu_builder.py:688
+#: gajim/gui_menu_builder.py:543 gajim/gui_menu_builder.py:651
 #, fuzzy
 msgid "Composing only"
 msgstr "Skriver"
 
-#: gajim/gui_menu_builder.py:582 gajim/gui_menu_builder.py:689
+#: gajim/gui_menu_builder.py:544 gajim/gui_menu_builder.py:652
 #, fuzzy
 msgid "All chat states"
 msgstr "Alla statusar"
 
-#: gajim/gui_menu_builder.py:620
+#: gajim/gui_menu_builder.py:583
 #, fuzzy
-msgid "Manage Room"
-msgstr "_Hantera rum"
+msgid "Manage Group Chat"
+msgstr "Lämna gruppchattar"
 
-#: gajim/gui_menu_builder.py:621
+#: gajim/gui_menu_builder.py:584 gajim/data/gui/groupchat_control.ui:649
 #, fuzzy
 msgid "Change Subject"
 msgstr "Byt _ämne..."
 
-#: gajim/gui_menu_builder.py:622
+#: gajim/gui_menu_builder.py:585
 #, fuzzy
-msgid "Configure Room"
-msgstr "Konfigurera _rum..."
+msgid "Configure Group Chat"
+msgstr "Lämna gruppchattar"
 
-#: gajim/gui_menu_builder.py:623
+#: gajim/gui_menu_builder.py:586
 #, fuzzy
 msgid "Upload Avatar…"
 msgstr "Välj Bild"
 
-#: gajim/gui_menu_builder.py:624
+#: gajim/gui_menu_builder.py:587
 #, fuzzy
-msgid "Destroy Room"
-msgstr "Förstör %s"
+msgid "Destroy Group Chat"
+msgstr "Ny gruppchatt"
 
-#: gajim/gui_menu_builder.py:626 gajim/data/gui/preferences_window.ui:790
+#: gajim/gui_menu_builder.py:589 gajim/data/gui/preferences_window.ui:790
 #, fuzzy
 msgid "Chat Settings"
 msgstr "Registreringen misslyckades"
 
-#: gajim/gui_menu_builder.py:627
+#: gajim/gui_menu_builder.py:590
 msgid "Show join/leave"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:628
+#: gajim/gui_menu_builder.py:591
 #, fuzzy
 msgid "Show status changes"
 msgstr "_Logga statusändringar för kontakter"
 
-#: gajim/gui_menu_builder.py:629 gajim/data/gui/gc_control_popup_menu.ui:72
+#: gajim/gui_menu_builder.py:592 gajim/data/gui/gc_control_popup_menu.ui:72
 #, fuzzy
 msgid "Notify on all messages"
 msgstr "Förvalda meddelanden:"
 
-#: gajim/gui_menu_builder.py:630
+#: gajim/gui_menu_builder.py:593
 #, fuzzy
 msgid "Minimize on close"
 msgstr "_Minimera vid stängning"
 
-#: gajim/gui_menu_builder.py:631
+#: gajim/gui_menu_builder.py:595
 #, fuzzy
-msgid "Minimize on autojoin"
+msgid "Minimize when joining automatically"
 msgstr "Minimera när du gått in automatiskt"
 
-#: gajim/gui_menu_builder.py:634
+#: gajim/gui_menu_builder.py:598
 msgid "Sync Threshold"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:635
+#: gajim/gui_menu_builder.py:599
 #, fuzzy
-msgid "Change Nick"
+msgid "Change Nickname"
 msgstr "Byt smek_namn..."
 
-#: gajim/gui_menu_builder.py:636
-#, fuzzy
-msgid "Bookmark Room"
-msgstr "Bokmärk detta rum (Ctrl+B)"
-
-#: gajim/gui_menu_builder.py:637
+#: gajim/gui_menu_builder.py:600
 #, fuzzy
 msgid "Request Voice"
 msgstr "_Röst"
 
-#: gajim/gui_menu_builder.py:638 gajim/roster_window.py:5246
+#: gajim/gui_menu_builder.py:601 gajim/roster_window.py:5185
 #, fuzzy
 msgid "Execute command"
 msgstr "_Kör kommando"
 
-#: gajim/gui_menu_builder.py:640
-#, fuzzy
-msgid "Disconnect"
-msgstr "_Koppla från"
+#: gajim/gui_menu_builder.py:603
+msgid "Leave"
+msgstr ""
 
-#: gajim/gui_menu_builder.py:678 gajim/gtk/preferences.py:156
+#: gajim/gui_menu_builder.py:641 gajim/gtk/preferences.py:155
 msgid "No threshold"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:680 gajim/gtk/preferences.py:158
+#: gajim/gui_menu_builder.py:643 gajim/gtk/preferences.py:157
 #, 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:709 gajim/gui_menu_builder.py:747
-#: gajim/gtk/join_groupchat.py:43
-msgid "Join Group Chat"
-msgstr "Gå in i gruppchatt"
-
-#: gajim/gui_menu_builder.py:746
+#: gajim/gui_menu_builder.py:672
 #, fuzzy
 msgid "Add Contact…"
 msgstr "_Lägg till kontakt..."
 
-#: gajim/gui_menu_builder.py:748 gajim/gtk/profile.py:52
-#: gajim/gtk/accounts.py:770 gajim/gtk/accounts.py:808
+#: gajim/gui_menu_builder.py:673 gajim/gtk/profile.py:52
+#: gajim/gtk/accounts.py:773 gajim/gtk/accounts.py:811
 #, fuzzy
 msgid "Profile"
 msgstr "fil"
 
-#: gajim/gui_menu_builder.py:749
+#: gajim/gui_menu_builder.py:674
+#, fuzzy
+msgid "Send Single Message…"
+msgstr "Skicka ett _meddelande"
+
+#: gajim/gui_menu_builder.py:675
 #, fuzzy
 msgid "Discover Services"
 msgstr "_Upptäck tjänster"
 
-#: gajim/gui_menu_builder.py:750
+#: gajim/gui_menu_builder.py:676 gajim/gtk/server_info.py:36
 #, fuzzy
-msgid "Send Single Message…"
-msgstr "Skicka ett _meddelande"
+msgid "Server Info"
+msgstr "Server"
 
-#: gajim/gui_menu_builder.py:751 gajim/data/gui/preferences_window.ui:2741
+#: gajim/gui_menu_builder.py:677 gajim/data/gui/preferences_window.ui:2741
 msgid "Advanced"
 msgstr "Avancerat"
 
-#: gajim/gui_menu_builder.py:752 gajim/gtk/mam_preferences.py:88
+#: gajim/gui_menu_builder.py:678 gajim/gtk/mam_preferences.py:88
 #, fuzzy
 msgid "Archiving Preferences"
 msgstr "_Inställningar"
 
-#: gajim/gui_menu_builder.py:753
+#: gajim/gui_menu_builder.py:679
 #, fuzzy
 msgid "Blocking List"
 msgstr "Bannlista"
 
-#: gajim/gui_menu_builder.py:754 gajim/gtk/history_sync.py:108
+#: gajim/gui_menu_builder.py:680
+#, fuzzy
+msgid "Bookmarks"
+msgstr "_Bokmärk"
+
+#: gajim/gui_menu_builder.py:681
+#, fuzzy
+msgid "PEP Configuration"
+msgstr "Rumkonfiguration"
+
+#: gajim/gui_menu_builder.py:682 gajim/gtk/history_sync.py:108
 #: gajim/gtk/history_sync.py:186
 #, fuzzy
 msgid "Synchronise History"
 msgstr "Synkronisera"
 
-#: gajim/gui_menu_builder.py:755 gajim/gtk/privacy_list.py:427
+#: gajim/gui_menu_builder.py:683 gajim/gtk/privacy_list.py:427
 msgid "Privacy Lists"
 msgstr "Integritetslistor"
 
-#: gajim/gui_menu_builder.py:756 gajim/gtk/server_info.py:36
-#, fuzzy
-msgid "Server Info"
-msgstr "Server"
-
-#: gajim/gui_menu_builder.py:757 gajim/gui_menu_builder.py:768
+#: gajim/gui_menu_builder.py:685 gajim/gui_menu_builder.py:696
 #: gajim/data/gui/xml_console_window.ui:77
 msgid "XML Console"
 msgstr "XML-konsol"
 
-#: gajim/gui_menu_builder.py:759 gajim/data/gui/groupchat_config.ui:36
+#: gajim/gui_menu_builder.py:687 gajim/data/gui/groupchat_config.ui:36
 #, fuzzy
 msgid "Admin"
 msgstr "_Admin"
 
-#: gajim/gui_menu_builder.py:760
+#: gajim/gui_menu_builder.py:688
 #, fuzzy
 msgid "Send Server Message…"
 msgstr "_Skicka servermeddelande..."
 
-#: gajim/gui_menu_builder.py:761
+#: gajim/gui_menu_builder.py:689
 #, fuzzy
 msgid "Set MOTD…"
 msgstr "Ange MOTD..."
 
-#: gajim/gui_menu_builder.py:762
+#: gajim/gui_menu_builder.py:690
 #, fuzzy
 msgid "Update MOTD…"
 msgstr "Uppdatera MOTD..."
 
-#: gajim/gui_menu_builder.py:763
+#: gajim/gui_menu_builder.py:691
 #, fuzzy
 msgid "Delete MOTD…"
 msgstr "Ta bort MOTD"
 
-#: gajim/gui_menu_builder.py:812
+#: gajim/gui_menu_builder.py:736
 #, fuzzy
-msgid "No Accounts available"
-msgstr "Inget konto tillgängligt"
+msgid "_Add Account…"
+msgstr "_Lägg till kontakt..."
 
-#: gajim/gui_menu_builder.py:823 gajim/data/gui/application_menu.ui:5
-#: gajim/data/gui/application_menu.ui:71 gajim/data/gui/shortcuts_window.ui:182
-#: gajim/gtk/accounts.py:58
+#: gajim/gui_menu_builder.py:742
+#, fuzzy
+msgid "_Modify Accounts…"
+msgstr "_Redigera konto"
+
+#: gajim/gui_menu_builder.py:751 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:755 gajim/data/gui/application_menu.ui:5
+#: gajim/data/gui/shortcuts_window.ui:182 gajim/gtk/accounts.py:57
 msgid "Accounts"
 msgstr "Konton"
 
-#: gajim/gui_menu_builder.py:881 gajim/gui_menu_builder.py:886
+#: gajim/gui_menu_builder.py:784 gajim/gui_menu_builder.py:789
 #, fuzzy
-msgid "Copy JID"
-msgstr "Rummets JID"
+msgid "Copy XMPP Address"
+msgstr "_Kopiera JID/e-postadress"
 
-#: gajim/gui_menu_builder.py:882 gajim/gui_menu_builder.py:914
+#: gajim/gui_menu_builder.py:785 gajim/gui_menu_builder.py:817
 #, fuzzy
 msgid "Join Groupchat"
 msgstr "Gå in i gruppchatt"
 
-#: gajim/gui_menu_builder.py:887 gajim/gui_menu_builder.py:913
-#: gajim/data/gui/application_menu.ui:76
+#: gajim/gui_menu_builder.py:790 gajim/gui_menu_builder.py:816
+#: gajim/data/gui/application_menu.ui:71
 #: gajim/data/gui/subscription_request_window.ui:106
 msgid "Start Chat"
 msgstr "Starta Chatt"
 
-#: gajim/gui_menu_builder.py:888 gajim/gui_menu_builder.py:915
+#: gajim/gui_menu_builder.py:791 gajim/gui_menu_builder.py:818
 #, fuzzy
-msgid "Add to Roster…"
-msgstr "_Lägg till i kontaktlista"
+msgid "Add to Contact List…"
+msgstr "_Lägg till kontakt..."
 
-#: gajim/gui_menu_builder.py:893
+#: gajim/gui_menu_builder.py:796
 #, fuzzy
 msgid "Copy Link Location"
 msgstr "_Kopiera länkplats"
 
-#: gajim/gui_menu_builder.py:894
+#: gajim/gui_menu_builder.py:797
 #, fuzzy
 msgid "Open Link in Browser"
 msgstr "_Öppna länk i webbläsare"
 
-#: gajim/gui_menu_builder.py:899
+#: gajim/gui_menu_builder.py:802
 #, fuzzy
 msgid "Copy Email Address"
 msgstr "_Kopiera JID/e-postadress"
 
-#: gajim/gui_menu_builder.py:900 gajim/gui_menu_builder.py:912
+#: gajim/gui_menu_builder.py:803 gajim/gui_menu_builder.py:815
 #, fuzzy
 msgid "Open Email Composer"
 msgstr "_Skriv e-post"
 
-#: gajim/gui_menu_builder.py:905
+#: gajim/gui_menu_builder.py:808
 #, fuzzy
 msgid "Copy Location"
 msgstr "_Kopiera länkplats"
 
-#: gajim/gui_menu_builder.py:906
+#: gajim/gui_menu_builder.py:809
 #, fuzzy
 msgid "Show Location"
 msgstr "Notifiering"
 
-#: gajim/gui_menu_builder.py:911
+#: gajim/gui_menu_builder.py:814
 #, fuzzy
-msgid "Copy JID/Email"
+msgid "Copy XMPP Address/Email"
 msgstr "_Kopiera JID/e-postadress"
 
-#: gajim/gui_menu_builder.py:945
+#: gajim/gui_menu_builder.py:852
 #, fuzzy
 msgid "Copy"
 msgstr "Rummets JID"
@@ -580,44 +590,56 @@ msgstr ""
 msgid "Choose folder for logfile"
 msgstr ""
 
-#: gajim/history_manager.py:107
+#: gajim/history_manager.py:106
 msgid "Cannot find history logs database"
 msgstr "Kan inte hitta historie- och logdatabas"
 
-#: gajim/history_manager.py:108
+#: gajim/history_manager.py:107
 #, fuzzy, python-format
 msgid "%s does not exist."
 msgstr "Filen finns inte"
 
-#: gajim/history_manager.py:141 gajim/history_manager.py:195
-#: gajim/gtk/discovery.py:829 gajim/gtk/roster_item_exchange.py:80
-msgid "JID"
-msgstr "JID"
+#: gajim/history_manager.py:140 gajim/history_manager.py:194
+#: 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:30
+#: gajim/gtk/accounts.py:804
+#, fuzzy
+msgid "XMPP Address"
+msgstr "AIM-adress:"
 
-#: gajim/history_manager.py:154 gajim/history_manager.py:202
+#: gajim/history_manager.py:153 gajim/history_manager.py:201
 #: gajim/data/gui/history_window.ui:89 gajim/gtk/history.py:108
 msgid "Date"
 msgstr "Datum"
 
-#: gajim/history_manager.py:161 gajim/history_manager.py:225
+#: gajim/history_manager.py:160 gajim/history_manager.py:224
 #: gajim/data/gui/join_groupchat_window.ui:208
 #: gajim/data/gui/profile_window.ui:214
 #: gajim/data/gui/vcard_information_window.ui:443
+#: gajim/data/gui/bookmarks.ui:140
 msgid "Nickname"
 msgstr "Smeknamn"
 
-#: gajim/history_manager.py:172 gajim/history_manager.py:211
+#: gajim/history_manager.py:171 gajim/history_manager.py:210
 #: gajim/data/gui/preferences_window.ui:1344
 #: gajim/data/gui/single_message_window.ui:275 gajim/gtk/history.py:117
 msgid "Message"
 msgstr "Meddelande"
 
-#: gajim/history_manager.py:180 gajim/history_manager.py:218
+#: gajim/history_manager.py:179 gajim/history_manager.py:217
 #: gajim/data/gui/groups_post_window.ui:49
 #: gajim/data/gui/single_message_window.ui:214
 msgid "Subject"
 msgstr "Ämne"
 
+#: gajim/history_manager.py:247
+#, fuzzy
+msgid "Database Cleanup"
+msgstr "Databasfel"
+
 #: gajim/history_manager.py:248
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
@@ -627,11 +649,8 @@ msgstr "Vill du städa upp databasen? (DU AVRÅDS ATT GÖRA DETTA OM GAJIM KÖRS
 #: gajim/history_manager.py:250
 #, fuzzy
 msgid ""
-"Normally allocated database size will not be freed, it will just become "
-"reusable. If you really want to reduce database filesize, click YES, else "
-"click NO.\n"
-"\n"
-"In case you click YES, please wait…"
+"Normally, the allocated database size will not be freed, it will just become "
+"reusable. This operation may take a while."
 msgstr ""
 "Normalt så frigörs inte den allokerade databasen, den blir bara "
 "återanvändbar. Om du verkligen vill minska databasens storlok, klicka JA, "
@@ -641,47 +660,47 @@ msgstr ""
 
 #: gajim/history_manager.py:255
 #, fuzzy
-msgid "Database Cleanup"
-msgstr "Databasfel"
+msgid "_Cleanup"
+msgstr "Rensa _upp"
 
-#: gajim/history_manager.py:519 gajim/gtk/filetransfer.py:238
-#: gajim/gtk/filetransfer.py:248
+#: gajim/history_manager.py:518 gajim/gtk/filetransfer.py:237
+#: gajim/gtk/filetransfer.py:247
 msgid "You"
 msgstr "Du"
 
-#: gajim/history_manager.py:531
+#: gajim/history_manager.py:530
 #, 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:568 gajim/history_manager.py:607
-#: gajim/gtk/dialogs.py:58 gajim/gtk/themes.py:319
+#: gajim/history_manager.py:567 gajim/history_manager.py:606
+#: gajim/gtk/dialogs.py:57 gajim/gtk/themes.py:319
 #: gajim/gtk/roster_item_exchange.py:75 gajim/gtk/roster_item_exchange.py:185
 msgid "Delete"
 msgstr "Ta bort"
 
-#: gajim/history_manager.py:569
+#: gajim/history_manager.py:568
 #, fuzzy
 msgid "Delete Conversation"
 msgid_plural "Delete Conversations"
 msgstr[0] "Avbryt bekräftelse"
 msgstr[1] "Avbryt bekräftelse"
 
-#: gajim/history_manager.py:570
+#: gajim/history_manager.py:569
 #, 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:608
+#: gajim/history_manager.py:607
 #, fuzzy
 msgid "Delete Message"
 msgid_plural "Delete Messages"
 msgstr[0] "Standardmeddelande"
 msgstr[1] "Standardmeddelande"
 
-#: gajim/history_manager.py:609
+#: gajim/history_manager.py:608
 #, fuzzy
 msgid "Do you want to permanently delete this message"
 msgid_plural "Do you want to permanently delete these messages"
@@ -694,15 +713,15 @@ msgid "Contact name: <i>%s</i>"
 msgstr "Kontaktens namn: <i>%s</i>"
 
 #: gajim/dialogs.py:84
-#, fuzzy, python-format
-msgid "JID: <i>%s</i>"
-msgstr "Jabber-ID: <i>%s</i>"
+#, python-format
+msgid "XMPP Address: <i>%s</i>"
+msgstr ""
 
-#: gajim/dialogs.py:115 gajim/dialogs.py:128 gajim/roster_window.py:2901
-#: gajim/roster_window.py:3833 gajim/roster_window.py:5084
-#: gajim/common/contacts.py:157 gajim/common/contacts.py:190
+#: gajim/dialogs.py:115 gajim/dialogs.py:128 gajim/roster_window.py:2894
+#: gajim/roster_window.py:3784 gajim/roster_window.py:5023
+#: gajim/common/contacts.py:157 gajim/common/contacts.py:206
 #: gajim/data/gui/preferences_window.ui:558
-#: gajim/data/gui/shortcuts_window.ui:177 gajim/gtk/accounts.py:349
+#: gajim/data/gui/shortcuts_window.ui:177 gajim/gtk/accounts.py:352
 msgid "General"
 msgstr "Allmänt"
 
@@ -747,7 +766,7 @@ msgstr "Skriv över statusmeddelande?"
 msgid "Preset 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:703
+#: gajim/dialogs.py:703 gajim/plugins/gui.py:292
 msgid "_Overwrite"
 msgstr ""
 
@@ -759,9 +778,7 @@ msgstr "Spara som Valbart Statusmeddelande"
 msgid "Please type a name for this status message"
 msgstr "Ange ett namn för detta statusmeddelande"
 
-#: gajim/dialogs.py:740 gajim/gui_interface.py:1441 gajim/dialog_messages.py:31
-#: gajim/gtk/discovery.py:518 gajim/gtk/profile.py:323
-#: gajim/gtk/join_groupchat.py:234
+#: gajim/dialogs.py:740 gajim/gtk/discovery.py:517 gajim/gtk/profile.py:323
 msgid "You are not connected to the server"
 msgstr "Du är inte ansluten till servern"
 
@@ -769,9 +786,11 @@ msgstr "Du är inte ansluten till servern"
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Du kan inte synkronisera dina kontakter utan en anslutning."
 
-#: gajim/dialogs.py:752 gajim/dialogs.py:823 gajim/gtk/discovery.py:822
-#: gajim/gtk/discovery.py:1648 gajim/gtk/discovery.py:1941
-#: gajim/gtk/history.py:99 gajim/gtk/roster_item_exchange.py:83
+#: gajim/dialogs.py:752 gajim/dialogs.py:823
+#: gajim/data/gui/groupchat_info_scrolled.ui:16 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/gtk/roster_item_exchange.py:83
 msgid "Name"
 msgstr "Namn"
 
@@ -791,400 +810,345 @@ msgstr "Du kan inte synkronisera med ett konto utan att vara ansluten."
 msgid "Synchronise"
 msgstr "Synkronisera"
 
-#: gajim/dialogs.py:1043
+#: gajim/dialogs.py:1042
 msgid "an audio and video"
 msgstr ""
 
-#: gajim/dialogs.py:1045
+#: gajim/dialogs.py:1044
 msgid "an audio"
 msgstr ""
 
-#: gajim/dialogs.py:1047
+#: gajim/dialogs.py:1046
 msgid "a video"
 msgstr ""
 
-#: gajim/dialogs.py:1051
+#: gajim/dialogs.py:1050
 #, python-format
 msgid ""
-"%(contact)s wants to start %(type)s session with you. Do you want to answer "
+"%(contact)s wants to start a %(type)s chat with you. Do you want to answer "
 "the call?"
 msgstr ""
 
-#: gajim/groupchat_control.py:505
+#: gajim/groupchat_control.py:511
 #, fuzzy, python-format
 msgid "Send File (max. %s MiB)…"
 msgstr "Spara fil som..."
 
-#: gajim/groupchat_control.py:507 gajim/chat_control.py:342
+#: gajim/groupchat_control.py:513 gajim/chat_control.py:344
 #, fuzzy
 msgid "No File Transfer available"
 msgstr "Filöverföringar"
 
-#: gajim/groupchat_control.py:630 gajim/groupchat_control.py:2349
-msgid "Changing Subject"
-msgstr "Ändrar Ämne"
-
-#: gajim/groupchat_control.py:631 gajim/groupchat_control.py:2350
-msgid "Please specify the new subject:"
-msgstr "Ange det nya ämnet:"
-
-#: gajim/groupchat_control.py:638
-msgid "Changing Nickname"
-msgstr "Byter Smeknamn"
-
-#: gajim/groupchat_control.py:639
-msgid "Please specify the new nickname you want to use:"
-msgstr "Ange det nya smeknamnet du vill använda:"
-
-#: gajim/groupchat_control.py:657
+#: gajim/groupchat_control.py:655
 #, fuzzy
-msgid "Invalid group chat JID"
+msgid "Invalid group chat XMPP Address"
 msgstr "Ogiltigt Jabber-ID"
 
-#: gajim/groupchat_control.py:658
+#: gajim/groupchat_control.py:656
 #, fuzzy
-msgid "The group chat JID has not allowed characters."
+msgid "The group chat XMPP Address has not allowed characters."
 msgstr "Rums- eller servernamnet innehåller icke tillåtna tecken."
 
-#: gajim/groupchat_control.py:758 gajim/gtk/profile.py:136
+#: gajim/groupchat_control.py:743 gajim/gtk/profile.py:136
 msgid "Could not load image"
 msgstr "Kunde inte läsa in bild"
 
-#: gajim/groupchat_control.py:888
+#: gajim/groupchat_control.py:873
 msgid "Insert Nickname"
 msgstr "Infoga smeknamn"
 
-#: gajim/groupchat_control.py:1056 gajim/chat_control.py:824
+#: gajim/groupchat_control.py:1041 gajim/chat_control.py:848
 msgid "and authenticated"
 msgstr "och autentiserad"
 
-#: gajim/groupchat_control.py:1060 gajim/chat_control.py:828
+#: gajim/groupchat_control.py:1045 gajim/chat_control.py:852
 msgid "and NOT authenticated"
 msgstr "och INTE autentiserad"
 
-#: gajim/groupchat_control.py:1064
+#: gajim/groupchat_control.py:1049
 #, 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/groupchat_control.py:1111
+#: gajim/groupchat_control.py:1096
 msgid "Conversation with "
 msgstr "Konversation med "
 
-#: gajim/groupchat_control.py:1113
+#: gajim/groupchat_control.py:1098
 msgid "Continued conversation"
 msgstr "Fortsatt konversation"
 
-#: gajim/groupchat_control.py:1411
+#: gajim/groupchat_control.py:1357
 #, 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:1433
+#: gajim/groupchat_control.py:1374
 #, fuzzy
-msgid "Room now shows unavailable members"
+msgid "Group chat now shows unavailable members"
 msgstr "Rummet visar nu otillgängliga medlemmar"
 
-#: gajim/groupchat_control.py:1436
+#: gajim/groupchat_control.py:1377
 #, fuzzy
-msgid "Room now does not show unavailable members"
+msgid "Group chat now does not show unavailable members"
 msgstr "rummet visar nu inga otillgängliga medlemmar"
 
-#: gajim/groupchat_control.py:1439
+#: gajim/groupchat_control.py:1380
 msgid "A setting not related to privacy has been changed"
 msgstr ""
 
-#: gajim/groupchat_control.py:1446
-msgid "Room logging is now enabled"
-msgstr "Rumsloggning är nu aktiverad"
+#: gajim/groupchat_control.py:1387 gajim/groupchat_control.py:1659
+#, fuzzy
+msgid "Conversations are stored on the server"
+msgstr "Sessionen KOMMER INTE att loggas"
 
-#: gajim/groupchat_control.py:1449
-msgid "Room logging is now disabled"
-msgstr "Rumsloggning är nu inaktiverad"
+#: gajim/groupchat_control.py:1390
+#, fuzzy
+msgid "Conversations are not stored on the server"
+msgstr "Information om dig, som den är sparad på servern"
 
-#: gajim/groupchat_control.py:1452
-msgid "Room is now non-anonymous"
+#: gajim/groupchat_control.py:1393
+#, fuzzy
+msgid "Group chat is now non-anonymous"
 msgstr "Rummet är nu icke-anonymt"
 
-#: gajim/groupchat_control.py:1456
-msgid "Room is now semi-anonymous"
+#: gajim/groupchat_control.py:1397
+#, fuzzy
+msgid "Group chat is now semi-anonymous"
 msgstr "Rummet är nu semi-anonymt"
 
-#: gajim/groupchat_control.py:1460
+#: gajim/groupchat_control.py:1401
 #, fuzzy
-msgid "Room is now fully anonymous"
+msgid "Group chat is now fully anonymous"
 msgstr "Rummet är nu fullständigt anonymt"
 
-#: gajim/groupchat_control.py:1500
+#: gajim/groupchat_control.py:1439
 #, fuzzy, python-format
 msgid "Ping? (%s)"
 msgstr "Pong! (%s s.)"
 
-#: gajim/groupchat_control.py:1503
+#: gajim/groupchat_control.py:1442
 #, fuzzy, python-format
 msgid "Pong! (%(nick)s %(delay)s s.)"
 msgstr "Pong! (%s s.)"
 
-#: gajim/groupchat_control.py:1506 gajim/chat_control.py:1213
+#: gajim/groupchat_control.py:1445 gajim/chat_control.py:1237
 msgid "Error."
 msgstr "Fel."
 
-#: gajim/groupchat_control.py:1711
+#: gajim/groupchat_control.py:1650
 #, fuzzy, python-format
-msgid "You (%s) joined the room"
+msgid "You (%s) joined the group chat"
 msgstr "%s har gått in i gruppchatten"
 
-#: gajim/groupchat_control.py:1717
-msgid "Any occupant is allowed to see your full JID"
+#: gajim/groupchat_control.py:1655
+msgid "Any participant is allowed to see your full XMPP Address"
 msgstr ""
 
-#: gajim/groupchat_control.py:1721
-msgid "Room logging is enabled"
-msgstr "Rumsloggning är aktiverad"
-
-#: gajim/groupchat_control.py:1725
-msgid "The server has assigned or modified your roomnick"
+#: gajim/groupchat_control.py:1663
+#, fuzzy
+msgid "The server has assigned or modified your nickname in this group chat"
 msgstr "Servern har tilldelat eller ändrat ditt rumsnamn"
 
-#: gajim/groupchat_control.py:1732
-msgid "A new room has been created"
+#: gajim/groupchat_control.py:1671
+#, fuzzy
+msgid "A new group chat has been created"
 msgstr "Ett nytt rum har skapats"
 
-#: gajim/groupchat_control.py:1740 gajim/privatechat_control.py:112
+#: gajim/groupchat_control.py:1679 gajim/privatechat_control.py:115
 #, python-format
 msgid "You are now known as %s"
 msgstr "Du är nu känd som %s"
 
-#: gajim/groupchat_control.py:1742 gajim/privatechat_control.py:114
+#: gajim/groupchat_control.py:1681 gajim/privatechat_control.py:117
 #, 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:1767 gajim/privatechat_control.py:141
+#: gajim/groupchat_control.py:1706 gajim/privatechat_control.py:144
 #, fuzzy, python-brace-format
 msgid "You are now {show}{status}"
 msgstr "Du är nu känd som %s"
 
-#: gajim/groupchat_control.py:1773 gajim/privatechat_control.py:147
+#: gajim/groupchat_control.py:1712 gajim/privatechat_control.py:150
 #, fuzzy, python-brace-format
 msgid "{nick} is now {show}{status}"
 msgstr "%(nick)s är nu %(status)s"
 
-#: gajim/groupchat_control.py:1790 gajim/groupchat_control.py:1819
-#: gajim/groupchat_control.py:1849 gajim/groupchat_control.py:1909
+#: gajim/groupchat_control.py:1729 gajim/groupchat_control.py:1758
+#: gajim/groupchat_control.py:1788 gajim/groupchat_control.py:1848
 #, python-brace-format
 msgid " by {actor}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1793
+#: gajim/groupchat_control.py:1732
 #, python-brace-format
 msgid "** Your Affiliation has been set to {affiliation}{actor}{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1799
+#: gajim/groupchat_control.py:1738
 #, python-brace-format
 msgid "** Affiliation of {nick} has been set to {affiliation}{actor}{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1822
+#: gajim/groupchat_control.py:1761
 #, fuzzy, python-brace-format
 msgid "** Your Role has been set to {role}{actor}{reason}"
 msgstr "** Rollen för %(nick)s har ställts in till %(role)s av %(actor)s"
 
-#: gajim/groupchat_control.py:1827
+#: gajim/groupchat_control.py:1766
 #, fuzzy, python-brace-format
 msgid "** Role of {nick} has been set to {role}{actor}{reason}"
 msgstr "** Rollen för %(nick)s har ställts in till %(role)s av %(actor)s"
 
-#: gajim/groupchat_control.py:1852
+#: gajim/groupchat_control.py:1791
 #, fuzzy, python-brace-format
-msgid "You have been removed from the room{actor}{reason}"
+msgid "You have been removed from the group chat{actor}{reason}"
 msgstr "%(nick)s har tagits bort från rummet (%(reason)s)"
 
-#: gajim/groupchat_control.py:1857
+#: gajim/groupchat_control.py:1796
 #, python-brace-format
 msgid "You have left due to an error{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1863
+#: gajim/groupchat_control.py:1802
 #, python-brace-format
 msgid "You have been kicked{actor}{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1870
+#: gajim/groupchat_control.py:1809
 #, python-brace-format
 msgid "You have been banned{actor}{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1877 gajim/groupchat_control.py:1943
+#: gajim/groupchat_control.py:1816 gajim/groupchat_control.py:1882
 #, fuzzy
 msgid ": Affiliation changed"
 msgstr "Anknytning: "
 
-#: gajim/groupchat_control.py:1883 gajim/groupchat_control.py:1948
+#: gajim/groupchat_control.py:1822 gajim/groupchat_control.py:1887
 #, fuzzy
-msgid ": Room configuration changed to members-only"
+msgid ": Group chat configuration changed to members-only"
 msgstr "rumskonfigurationen har ändrats till members-only"
 
-#: gajim/groupchat_control.py:1912
+#: gajim/groupchat_control.py:1851
 #, fuzzy, python-brace-format
-msgid "{nick} has been removed from the room{by}{reason}"
+msgid "{nick} has been removed from the group chat{by}{reason}"
 msgstr "%(nick)s har tagits bort från rummet (%(reason)s)"
 
-#: gajim/groupchat_control.py:1922
+#: gajim/groupchat_control.py:1861
 #, python-brace-format
 msgid "{nick} has left due to an error{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1928
+#: gajim/groupchat_control.py:1867
 #, fuzzy, python-brace-format
 msgid "{nick} has been kicked{actor}{reason}"
 msgstr "%(nick)s har blivit sparkad: %(reason)s"
 
-#: gajim/groupchat_control.py:1936
+#: gajim/groupchat_control.py:1875
 #, fuzzy, python-brace-format
 msgid "{nick} has been banned{actor}{reason}"
 msgstr "%(nick)s har blivit bannlyst: %(reason)s"
 
-#: gajim/groupchat_control.py:1953
+#: gajim/groupchat_control.py:1892
 #, python-brace-format
 msgid "{nick} has left{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1970
+#: gajim/groupchat_control.py:1914
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s har gått in i gruppchatten"
 
-#: gajim/groupchat_control.py:1985 gajim/groupchat_control.py:1990
-#: gajim/groupchat_control.py:1995 gajim/groupchat_control.py:2000
-#: gajim/groupchat_control.py:2011
-msgid "Unable to join group chat"
-msgstr "Kunde inte gå in i gruppchatt"
-
-#: gajim/groupchat_control.py:1986
-#, fuzzy, python-format
-msgid "You are banned from group chat <b>%s</b>."
-msgstr "Du är bannlyst från gruppchatten %s."
-
-#: gajim/groupchat_control.py:1991
-#, fuzzy, python-format
-msgid "Remote server <b>%s</b> does not exist."
-msgstr "Gruppchatten %s finns inte."
-
-#: gajim/groupchat_control.py:1996
-#, fuzzy, python-format
-msgid "Group chat <b>%s</b> does not exist."
-msgstr "Gruppchatten %s finns inte."
-
-#: gajim/groupchat_control.py:2001
-#, fuzzy
-msgid "Group chat creation is not permitted."
-msgstr "Möjligheten att skapa rum är begränsad."
-
-#: gajim/groupchat_control.py:2005
-#, fuzzy
-msgid "Unable to join groupchat"
-msgstr "Kunde inte gå in i gruppchatt"
-
-#: gajim/groupchat_control.py:2006
-#, fuzzy, python-format
-msgid "You must use your registered nickname in <b>%s</b>."
-msgstr "Ditt registrerade smeknamn måste användas i gruppchatten %s."
-
-#: gajim/groupchat_control.py:2012
-#, python-format
-msgid "You are not in the members list in groupchat %s."
-msgstr "Du är inte med i medlemslistan i gruppchatten %s."
-
-#: gajim/groupchat_control.py:2068
+#: gajim/groupchat_control.py:1981
 #, fuzzy
-msgid "Room has been destroyed"
+msgid "Group chat has been destroyed"
 msgstr "Auktorisering har tagits bort"
 
-#: gajim/groupchat_control.py:2073
+#: gajim/groupchat_control.py:1986
 #, fuzzy, python-format
-msgid "You can join this room instead: xmpp:%s?join"
+msgid "You can join this group chat instead: xmpp:%s?join"
 msgstr "Du kan gå in i detta rum istället: %s"
 
-#: gajim/groupchat_control.py:2306
+#: gajim/groupchat_control.py:2214
 #, fuzzy
 msgid "Leave Group Chat"
 msgstr "Lämna gruppchattar"
 
-#: gajim/groupchat_control.py:2307
+#: gajim/groupchat_control.py:2215
 #, fuzzy
 msgid "Are you sure you want to leave this group chat?"
 msgstr "Är du säker på att du vill lämna gruppchatten \"%s\"?"
 
-#: gajim/groupchat_control.py:2308
+#: gajim/groupchat_control.py:2216
 #, fuzzy, python-format
-msgid "If you close this window, you will be disconnected from '%s'."
+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:2314
+#: gajim/groupchat_control.py:2222 gajim/roster_window.py:5177
 msgid "_Leave"
 msgstr ""
 
-#: gajim/groupchat_control.py:2377
+#: gajim/groupchat_control.py:2280 gajim/roster_window.py:3008
 #, 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/groupchat_control.py:2527
+#: gajim/groupchat_control.py:2463
 #, python-format
 msgid "Kicking %s"
 msgstr "Sparkar %s"
 
-#: gajim/groupchat_control.py:2528 gajim/groupchat_control.py:2829
+#: gajim/groupchat_control.py:2464 gajim/groupchat_control.py:2765
 msgid "You may specify a reason below:"
 msgstr "Du kan ange en orsak här under:"
 
-#: gajim/groupchat_control.py:2828
+#: gajim/groupchat_control.py:2764
 #, python-format
 msgid "Banning %s"
 msgstr "Bannlyser %s"
 
-#: gajim/chat_control.py:408
+#: gajim/chat_control.py:432
 msgid "Show a list of formattings"
 msgstr "Visa en lista över formateringar"
 
-#: gajim/chat_control.py:412
+#: gajim/chat_control.py:436
 #, fuzzy
 msgid "This contact does not support HTML"
 msgstr "Denna kontakt har inte stöd för filöverföringar."
 
-#: gajim/chat_control.py:562
+#: gajim/chat_control.py:586
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr ""
 
-#: gajim/chat_control.py:686
+#: gajim/chat_control.py:710
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s från gruppchatten %(room_name)s"
 
-#: gajim/chat_control.py:832
+#: gajim/chat_control.py:856
 #, 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.py:1160 gajim/chat_control.py:1168
+#: gajim/chat_control.py:1184 gajim/chat_control.py:1192
 #, fuzzy
 msgid "Close"
 msgstr "_Skicka och stäng"
 
-#: gajim/chat_control.py:1161
+#: gajim/chat_control.py:1185
 #, fuzzy, python-format
 msgid "You just received a new message from %s"
 msgstr "Du tog just emot ett meddelande från \"%s\""
 
-#: gajim/chat_control.py:1163
+#: gajim/chat_control.py:1187
 #, fuzzy
 msgid ""
 "If you close this tab while having chat history disabled, this message will "
@@ -1193,16 +1157,16 @@ msgstr ""
 "Om du stänger den här fliken och har historik inaktiverad så kommer "
 "meddelandet att förloras."
 
-#: gajim/chat_control.py:1208
+#: gajim/chat_control.py:1232
 msgid "Ping?"
 msgstr "Ping?"
 
-#: gajim/chat_control.py:1211
+#: gajim/chat_control.py:1235
 #, fuzzy, python-format
 msgid "Pong! (%s seconds)"
 msgstr "Pong! (%s s.)"
 
-#: gajim/chat_control.py:1308
+#: gajim/chat_control.py:1332
 #, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -1211,274 +1175,282 @@ msgstr ""
 "Ämne: %(subject)s\n"
 "%(message)s"
 
-#: gajim/chat_control.py:1416
+#: gajim/chat_control.py:1440
 #, fuzzy, python-format
 msgid "%(name)s is now %(show)s %(status)s"
 msgstr "%(name)s är nu %(status)s"
 
-#: gajim/chat_control.py:1476 gajim/data/gui/application_menu.ui:32
+#: gajim/chat_control.py:1500 gajim/data/gui/application_menu.ui:32
 #: gajim/gtk/http_upload_progress.py:35
 #, fuzzy
 msgid "File Transfer"
 msgstr "Filöverföringar"
 
-#: gajim/chat_control.py:1480
+#: gajim/chat_control.py:1504
 #, fuzzy
 msgid "Size"
 msgstr "Storlek: "
 
-#: gajim/chat_control.py:1482 gajim/chat_control.py:1546
+#: gajim/chat_control.py:1506 gajim/chat_control.py:1566
+#: gajim/gui_interface.py:190
 #: gajim/data/gui/groupchat_invitation_received.ui:77
-#: gajim/gtk/filetransfer.py:485
+#: gajim/gtk/filetransfer.py:490
 #, fuzzy
 msgid "_Accept"
 msgstr "Acceptera"
 
-#: gajim/chat_control.py:1484 gajim/chat_control.py:1548
+#: gajim/chat_control.py:1508 gajim/chat_control.py:1568
 #: gajim/data/gui/groupchat_invitation_received.ui:62
 #, fuzzy
 msgid "_Decline"
 msgstr "_Frånkopplad"
 
-#: gajim/chat_control.py:1506 gajim/gui_interface.py:791
-#: gajim/gui_interface.py:821 gajim/gui_interface.py:847
+#: gajim/chat_control.py:1530 gajim/gui_interface.py:777
+#: gajim/gui_interface.py:807 gajim/gui_interface.py:833
 #: gajim/gtk/notification.py:173 gajim/gtk/notification.py:278
 msgid "File Transfer Completed"
 msgstr "Filöverföring Klar"
 
-#: gajim/chat_control.py:1510 gajim/gtk/filetransfer.py:259
+#: gajim/chat_control.py:1534 gajim/gtk/filetransfer.py:258
 #, fuzzy
 msgid "Open _Folder"
 msgstr "_Öppna mapp"
 
-#: gajim/chat_control.py:1512 gajim/chat_control.py:1521
+#: gajim/chat_control.py:1536 gajim/chat_control.py:1545
+#: gajim/data/gui/groupchat_control.ui:962
+#: gajim/data/gui/groupchat_control.ui:1049
+#: gajim/data/gui/groupchat_control.ui:1155
 #, fuzzy
 msgid "_Close"
 msgstr "_Skicka och stäng"
 
-#: gajim/chat_control.py:1543 gajim/gui_interface.py:484
+#: gajim/chat_control.py:1563 gajim/gui_interface.py:473
+#: gajim/data/gui/groupchat_invitation_received.ui:42
 #: gajim/gtk/notification.py:174 gajim/gtk/notification.py:195
 #: gajim/gtk/notification.py:281
-msgid "Groupchat Invitation"
+#, fuzzy
+msgid "Group Chat Invitation"
 msgstr "Inbjudan till Gruppchatt"
 
-#: gajim/chat_control.py:1568 gajim/roster_window.py:1954
+#: gajim/chat_control.py:1588 gajim/roster_window.py:1951
 msgid "Remote contact stopped transfer"
 msgstr "Fjärrkontakten stoppade överföringen"
 
-#: gajim/chat_control.py:1570 gajim/roster_window.py:1956
+#: gajim/chat_control.py:1590 gajim/roster_window.py:1953
 msgid "Error opening file"
 msgstr "Fel vid öppnande av filen"
 
-#: gajim/chat_control.py:1572 gajim/gtk/filetransfer.py:297
+#: gajim/chat_control.py:1592 gajim/gtk/filetransfer.py:296
 msgid "File transfer stopped"
 msgstr "Filöverföringen stoppad"
 
-#: gajim/chat_control.py:1575 gajim/gtk/filetransfer.py:275
-#: gajim/gtk/filetransfer.py:284
+#: gajim/chat_control.py:1595 gajim/gtk/filetransfer.py:274
+#: gajim/gtk/filetransfer.py:283
 msgid "File transfer cancelled"
 msgstr "Filöverföringen avbruten"
 
-#: gajim/chat_control.py:1576
+#: gajim/chat_control.py:1596
 msgid "Connection with peer cannot be established."
 msgstr "Anslutning med motpart kan inte etableras."
 
-#: gajim/application.py:72
+#: gajim/application.py:75
 #, fuzzy
 msgid "Show the application's version"
 msgstr "Använd _aktivitetsfältet (aka. notifieringsyta)"
 
-#: gajim/application.py:79
+#: gajim/application.py:82
 #, fuzzy
 msgid "Show only critical errors"
 msgstr "Visa enbart i _registret"
 
-#: gajim/application.py:86
+#: gajim/application.py:89
 msgid "Separate profile files completely (even history database and plugins)"
 msgstr ""
 
-#: gajim/application.py:94
+#: gajim/application.py:97
 msgid "Print XML stanzas and other debug information"
 msgstr ""
 
-#: gajim/application.py:101
+#: gajim/application.py:104
 #, fuzzy
 msgid "Use defined profile in configuration directory"
 msgstr "Avancerad konfigurationsredigerare"
 
-#: gajim/application.py:109
+#: gajim/application.py:112
 #, fuzzy
 msgid "Set configuration directory"
 msgstr "Rumkonfiguration"
 
-#: gajim/application.py:117
+#: gajim/application.py:120
 msgid "Configure logging system"
 msgstr ""
 
-#: gajim/application.py:125
+#: gajim/application.py:128
 #, fuzzy
 msgid "Show all warnings"
 msgstr "Visa alla väntande _händelser"
 
-#: gajim/application.py:132
+#: gajim/application.py:135
 msgid "Open IPython shell"
 msgstr ""
 
-#: gajim/application.py:139
+#: gajim/application.py:142
 #, 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:145 gajim/data/gui/shortcuts_window.ui:203
+#: gajim/application.py:148 gajim/data/gui/shortcuts_window.ui:203
 #: data/org.gajim.Gajim.desktop.in:21
 #, fuzzy
 msgid "Start a new chat"
 msgstr "Starta Chatt"
 
-#: gajim/application.py:152
+#: gajim/application.py:155
 msgid "Simulate loss of connectivity"
 msgstr ""
 
-#: gajim/application.py:159
+#: gajim/application.py:162
 msgid "Simulate regaining connectivity"
 msgstr ""
 
-#: gajim/application.py:201 gajim/gui_interface.py:133
+#: gajim/application.py:204 gajim/gui_interface.py:133
 msgid "Database Error"
 msgstr "Databasfel"
 
-#: gajim/roster_window.py:294 gajim/roster_window.py:1030
+#: gajim/roster_window.py:291 gajim/roster_window.py:1027
 msgid "Merged accounts"
 msgstr "Sammanfoga konton"
 
-#: gajim/roster_window.py:853 gajim/roster_window.py:1631
-#: gajim/roster_window.py:1664 gajim/roster_window.py:1715
-#: gajim/roster_window.py:1717 gajim/roster_window.py:1872
-#: gajim/roster_window.py:2531 gajim/roster_window.py:5025
-#: gajim/common/contacts.py:188 gajim/common/contacts.py:447
-#: gajim/common/helpers.py:83 gajim/gtk/discovery.py:129
-#: gajim/gtk/discovery.py:130 gajim/gtk/discovery.py:1416
+#: gajim/roster_window.py:850 gajim/roster_window.py:1628
+#: gajim/roster_window.py:1661 gajim/roster_window.py:1712
+#: gajim/roster_window.py:1714 gajim/roster_window.py:1869
+#: gajim/roster_window.py:2528 gajim/roster_window.py:4331
+#: gajim/roster_window.py:4964 gajim/common/contacts.py:204
+#: gajim/common/contacts.py:463 gajim/common/helpers.py:86
+#: gajim/gtk/discovery.py:127 gajim/gtk/discovery.py:128
+#: gajim/gtk/discovery.py:1414
 msgid "Transports"
 msgstr "Transporter"
 
-#: gajim/roster_window.py:1723 gajim/roster_window.py:1725
-#: gajim/roster_window.py:4995 gajim/gui_interface.py:1613
-#: gajim/gui_interface.py:1639 gajim/common/contacts.py:186
-#: gajim/common/helpers.py:83 gajim/common/modules/adhoc_commands.py:245
-msgid "Groupchats"
+#: gajim/roster_window.py:1720 gajim/roster_window.py:1722
+#: gajim/roster_window.py:4331 gajim/roster_window.py:4934
+#: gajim/gui_interface.py:1527 gajim/common/contacts.py:202
+#: gajim/common/helpers.py:86 gajim/common/modules/adhoc_commands.py:245
+#, fuzzy
+msgid "Group chats"
 msgstr "Gruppchattar"
 
-#: gajim/roster_window.py:2012
+#: gajim/roster_window.py:2009
 #, fuzzy
 msgid "Authorization sent"
 msgstr "Auktorisering har sänts"
 
-#: gajim/roster_window.py:2013
+#: gajim/roster_window.py:2010
 #, fuzzy, python-format
 msgid "\"%s\" will now see your status."
 msgstr "Nu kommer \"%s\" veta din status."
 
-#: gajim/roster_window.py:2031
+#: gajim/roster_window.py:2028
 msgid "Subscription request has been sent"
 msgstr "Prenumerationsförfrågan har sänts"
 
-#: gajim/roster_window.py:2032
-#, python-format
-msgid "If \"%s\" accepts this request you will know his or her status."
+#: gajim/roster_window.py:2029
+#, 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:2046
+#: gajim/roster_window.py:2043
 #, fuzzy
 msgid "Authorization removed"
 msgstr "Auktorisering har tagits bort"
 
-#: gajim/roster_window.py:2047
+#: gajim/roster_window.py:2044
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Nu kommer \"%s\" alltid se dig som offline."
 
-#: gajim/roster_window.py:2250 gajim/roster_window.py:3504
+#: gajim/roster_window.py:2247 gajim/roster_window.py:3460
 msgid "Disconnect for Invisibility"
 msgstr ""
 
-#: gajim/roster_window.py:2251 gajim/roster_window.py:3505
+#: gajim/roster_window.py:2248 gajim/roster_window.py:3461
 msgid "You are participating in one or more group chats"
 msgstr "Du deltar i en eller flera guppchatter"
 
-#: gajim/roster_window.py:2252 gajim/roster_window.py:3506
+#: gajim/roster_window.py:2249 gajim/roster_window.py:3462
 #, fuzzy
 msgid ""
-"Changing your status to invisible will result in disconnection from those "
-"group chats.\n"
+"Changing your status to invisible will result in you leaving those group "
+"chats.\n"
 "Are you sure you want to go invisible?"
 msgstr ""
 "Om du byter status till osynlig kommer du att förlora anslutningen till "
 "gruppchatterna. Är du säker på att du vill byta status till osynlig?"
 
-#: gajim/roster_window.py:2257 gajim/roster_window.py:3512
-#: gajim/roster_window.py:5238 gajim/data/gui/gc_control_popup_menu.ui:120
+#: gajim/roster_window.py:2254 gajim/roster_window.py:3468
+#: gajim/data/gui/gc_control_popup_menu.ui:120
 msgid "_Disconnect"
 msgstr "_Koppla från"
 
-#: gajim/roster_window.py:2285
+#: gajim/roster_window.py:2282
 #, fuzzy
 msgid "desynced"
 msgstr "inte i synk"
 
-#: gajim/roster_window.py:2353 gajim/data/gui/shortcuts_window.ui:224
+#: gajim/roster_window.py:2350 gajim/data/gui/shortcuts_window.ui:224
 #, fuzzy
 msgid "Quit Gajim"
 msgstr "Gajim"
 
-#: gajim/roster_window.py:2354
+#: gajim/roster_window.py:2351
 #, fuzzy
 msgid "You are about to quit Gajim"
 msgstr "Är du säker på att du vill avsluta Gajim?"
 
-#: gajim/roster_window.py:2355
+#: gajim/roster_window.py:2352
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Är du säker på att du vill avsluta Gajim?"
 
-#: gajim/roster_window.py:2356
+#: gajim/roster_window.py:2353
 #, fuzzy
 msgid "_Always quit when closing Gajim"
 msgstr "Stäng alltid Gajim"
 
-#: gajim/roster_window.py:2359 gajim/roster_window.py:2455
-#: gajim/roster_window.py:2495 gajim/data/gui/systray_context_menu.ui:90
+#: gajim/roster_window.py:2356 gajim/roster_window.py:2452
+#: gajim/roster_window.py:2492 gajim/data/gui/systray_context_menu.ui:83
 #, fuzzy
 msgid "_Quit"
 msgstr "A_vsluta"
 
-#: gajim/roster_window.py:2448
+#: gajim/roster_window.py:2445
 #, fuzzy
 msgid "Stop File Transfers"
 msgstr "Filöverföringar"
 
-#: gajim/roster_window.py:2449
+#: gajim/roster_window.py:2446
 #, fuzzy
 msgid "You still have running file transfers"
 msgstr "Avbryt filöverföring"
 
-#: gajim/roster_window.py:2450
+#: gajim/roster_window.py:2447
 msgid ""
 "If you quit now, the file(s) being transferred will be lost.\n"
 "Do you still want to quit?"
 msgstr ""
 
-#: gajim/roster_window.py:2488
+#: gajim/roster_window.py:2485
 #, fuzzy
 msgid "Unread Messages"
 msgstr "Olästa händelser"
 
-#: gajim/roster_window.py:2489
+#: gajim/roster_window.py:2486
 #, fuzzy
 msgid "You still have unread messages"
 msgstr "Du har olästa meddelanden"
 
-#: gajim/roster_window.py:2490
+#: gajim/roster_window.py:2487
 #, fuzzy
 msgid ""
 "Messages will only be available for reading them later if storing chat "
@@ -1487,20 +1459,20 @@ msgstr ""
 "Meddelanden kommer endast vara tillgängliga för läsning senare om du har "
 "historik aktiverat och kontakten finns i din kontaktlista."
 
-#: gajim/roster_window.py:2760
+#: gajim/roster_window.py:2753
 msgid "You have unread messages"
 msgstr "Du har olästa meddelanden"
 
-#: gajim/roster_window.py:2761
+#: gajim/roster_window.py:2754
 msgid "You must read them before removing this transport."
 msgstr "Du måste läsa dem innan du tar bort denna transport."
 
-#: gajim/roster_window.py:2764
+#: gajim/roster_window.py:2757
 #, fuzzy, python-format
 msgid "Transport '%s' will be removed"
 msgstr "Transporten \"%s\" kommer tas bort"
 
-#: gajim/roster_window.py:2765
+#: gajim/roster_window.py:2758
 #, fuzzy
 msgid ""
 "You will no longer be able to send and receive messages from and to contacts "
@@ -1509,11 +1481,11 @@ msgstr ""
 "Du kommer inte längre kunna ta emot eller skicka meddelanden till kontakter "
 "med denna transport."
 
-#: gajim/roster_window.py:2768
+#: gajim/roster_window.py:2761
 msgid "Transports will be removed"
 msgstr "Transporter kommer att tas bort"
 
-#: gajim/roster_window.py:2773
+#: gajim/roster_window.py:2766
 #, fuzzy, python-format
 msgid ""
 "You will no longer be able to send and receive messages from and to contacts "
@@ -1523,86 +1495,81 @@ msgstr ""
 "Du kommer inte längre kunna ta emot eller skicka meddelanden till kontakter "
 "med denna transport."
 
-#: gajim/roster_window.py:2777
+#: gajim/roster_window.py:2770
 #, fuzzy
 msgid "Remove Transport"
 msgstr "Visa _transporter"
 
-#: gajim/roster_window.py:2844
+#: gajim/roster_window.py:2837
 #, fuzzy
 msgid "Block Contact"
 msgstr "Blockerade kontakter"
 
-#: gajim/roster_window.py:2845
+#: gajim/roster_window.py:2838
 #, fuzzy
 msgid "Really block this contact?"
 msgstr "Är OpenPGP aktiverat för denna kontakt?"
 
-#: gajim/roster_window.py:2846
+#: gajim/roster_window.py:2839
 msgid ""
 "This contact will see you offline and you will not receive any messages sent "
 "to you by this contact."
 msgstr ""
 
-#: gajim/roster_window.py:2851
+#: gajim/roster_window.py:2844
 #, fuzzy
 msgid "_Block Contact"
 msgstr "Blockerade kontakter"
 
-#: gajim/roster_window.py:2896
+#: gajim/roster_window.py:2889
 msgid "Rename Contact"
 msgstr "Byt namn på kontakt"
 
-#: gajim/roster_window.py:2897
+#: gajim/roster_window.py:2890
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Ange ett nytt smeknamn för kontakten %s"
 
-#: gajim/roster_window.py:2904
+#: gajim/roster_window.py:2897
 msgid "Rename Group"
 msgstr "Byt namn på grupp"
 
-#: gajim/roster_window.py:2905
+#: gajim/roster_window.py:2898
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Ange ett nytt namn för gruppen %s"
 
-#: gajim/roster_window.py:2953 gajim/roster_window.py:2954
+#: gajim/roster_window.py:2946 gajim/roster_window.py:2947
 msgid "Remove Group"
 msgstr "Ta bort grupp"
 
-#: gajim/roster_window.py:2955
+#: gajim/roster_window.py:2948
 #, fuzzy, python-format
 msgid "Do you want to remove %s from the contact list?"
 msgstr "Vill du ta bort gruppen %s från kontaktlistan?"
 
-#: gajim/roster_window.py:2956
+#: gajim/roster_window.py:2949
 #, fuzzy
 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:3044
-#, fuzzy, python-format
-msgid "%(jid)s has been invited in this room"
-msgstr "%(nick)s har tagits bort från rummet (%(reason)s)"
-
-#: gajim/roster_window.py:3353
+#: gajim/roster_window.py:3309
 #, fuzzy
 msgid "Remove Contact"
 msgstr "Byt namn på kontakt"
 
-#: gajim/roster_window.py:3354
+#: gajim/roster_window.py:3310
 #, fuzzy
 msgid "Remove contact from contact list"
 msgstr "Ta bort en kontakt från kontaktlista"
 
-#: gajim/roster_window.py:3355
+#: gajim/roster_window.py:3311
 #, 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:3364 gajim/roster_window.py:3384
+#: gajim/roster_window.py:3320 gajim/roster_window.py:3340
 #, fuzzy
 msgid ""
 "By removing this contact you also remove authorization. This means the "
@@ -1612,23 +1579,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:3375
+#: gajim/roster_window.py:3331
 msgid "Do you want to continue?"
 msgstr "Vill du fortsätta?"
 
-#: gajim/roster_window.py:3386
+#: gajim/roster_window.py:3342
 #, 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:3393
+#: gajim/roster_window.py:3349
 #, fuzzy
 msgid "Remove contacts from contact list"
 msgstr "Ta bort en kontakt från kontaktlista"
 
-#: gajim/roster_window.py:3399
+#: gajim/roster_window.py:3355
 #, fuzzy, python-format
 msgid ""
 "By removing the following contacts, you will also remove authorization. This "
@@ -1640,24 +1607,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:3403
+#: gajim/roster_window.py:3359
 #, fuzzy
 msgid "Remove Contacts"
 msgstr "Byt namn på kontakt"
 
-#: gajim/roster_window.py:3423
+#: gajim/roster_window.py:3379
 msgid "No account available"
 msgstr "Inget konto tillgängligt"
 
-#: gajim/roster_window.py:3424
+#: gajim/roster_window.py:3380
 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:4060
+#: gajim/roster_window.py:4011
 msgid "Metacontacts storage not supported by your server"
 msgstr "Metakontakter kan inte lagras på din server"
 
-#: gajim/roster_window.py:4062
+#: gajim/roster_window.py:4013
 #, fuzzy
 msgid ""
 "Your server does not support storing metacontacts information. So this "
@@ -1666,13 +1633,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:4159
+#: gajim/roster_window.py:4110
 #, 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:4160
+#: gajim/roster_window.py:4111
 #, fuzzy
 msgid ""
 "Metacontacts are a way to regroup several contacts in one single contact. "
@@ -1683,126 +1650,117 @@ msgstr ""
 "Normalt sätt används det när en person har flera Jabberkonton eller "
 "transportkonton."
 
-#: gajim/roster_window.py:4164
+#: gajim/roster_window.py:4115
 #, fuzzy
 msgid "Create Metacontact"
 msgstr "Byt namn på kontakt"
 
-#: gajim/roster_window.py:4170
+#: gajim/roster_window.py:4121 gajim/data/gui/groupchat_creation.ui:317
 #, fuzzy
 msgid "_Create"
 msgstr "Kreativ"
 
-#: gajim/roster_window.py:4287
+#: gajim/roster_window.py:4238
 #, fuzzy
 msgid "Invalid file URI:"
 msgstr "Ogiltig Fil"
 
-#: gajim/roster_window.py:4298
+#: gajim/roster_window.py:4249
 #, fuzzy
 msgid "Send file?"
 msgstr "Skicka _fil"
 
-#: gajim/roster_window.py:4299
+#: gajim/roster_window.py:4250
 #, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
 msgstr[0] "Vill du skicka denna fil till %s:"
 msgstr[1] "Vill du skicka dessa filer till %s:"
 
-#: gajim/roster_window.py:4451
+#: gajim/roster_window.py:4401
 #, fuzzy, python-format
 msgid "Send %(from)s to %(to)s"
 msgstr "Skicka %s till %s"
 
-#: gajim/roster_window.py:4464
+#: gajim/roster_window.py:4414
 #, fuzzy, python-format
 msgid "Make %s first contact"
 msgstr "Gör %s till en metakontakt för %s"
 
-#: gajim/roster_window.py:4469
+#: gajim/roster_window.py:4419
 #, 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:4825 gajim/roster_window.py:4923
+#: gajim/roster_window.py:4775 gajim/roster_window.py:4862
 msgid "_Change Status Message"
 msgstr "_Ändra statusmeddelande"
 
-#: gajim/roster_window.py:4845
+#: gajim/roster_window.py:4795
 msgid "Publish Tune"
 msgstr "Publicera låt"
 
-#: gajim/roster_window.py:4856
+#: gajim/roster_window.py:4806
 #, fuzzy
 msgid "Publish Location"
 msgstr "Publicera låt"
 
-#: gajim/roster_window.py:4868
-#, fuzzy
-msgid "Configure Services…"
-msgstr "Konfigurera tjänster..."
-
-#: gajim/roster_window.py:4997
+#: gajim/roster_window.py:4936
 msgid "_Maximize All"
 msgstr "_Maximera alla"
 
-#: gajim/roster_window.py:5004 gajim/roster_window.py:5146
+#: gajim/roster_window.py:4943 gajim/roster_window.py:5085
 msgid "Send Group M_essage"
 msgstr "Skicka gruppm_eddelande"
 
-#: gajim/roster_window.py:5011
+#: gajim/roster_window.py:4950
 msgid "To all users"
 msgstr "Till alla användare"
 
-#: gajim/roster_window.py:5015
+#: gajim/roster_window.py:4954
 msgid "To all online users"
 msgstr "Till alla anslutna användare"
 
-#: gajim/roster_window.py:5027 gajim/roster_window.py:5152
+#: gajim/roster_window.py:4966 gajim/roster_window.py:5091
 #: gajim/data/gui/gc_occupants_menu.ui:110
 #: gajim/data/gui/contact_context_menu.ui:36
 msgid "In_vite to"
 msgstr "Bjud _in till"
 
-#: gajim/roster_window.py:5162
+#: gajim/roster_window.py:5101
 msgid "_Manage Contacts"
 msgstr "_Hantera kontakter"
 
-#: gajim/roster_window.py:5168
+#: gajim/roster_window.py:5107
 #, fuzzy
 msgid "Edit _Groups…"
 msgstr "Redigera _grupper"
 
-#: gajim/roster_window.py:5189 gajim/data/gui/filetransfers.ui:12
+#: gajim/roster_window.py:5128 gajim/data/gui/filetransfers.ui:12
 #: gajim/data/gui/remove_account_window.ui:134
 msgid "_Remove"
 msgstr "Ta _bort"
 
-#: gajim/roster_window.py:5226
+#: gajim/roster_window.py:5165
 msgid "_Maximize"
 msgstr "_Maximera"
 
-#: gajim/roster_window.py:5233
+#: gajim/roster_window.py:5172
 #, fuzzy
 msgid "_Reconnect"
 msgstr "_Koppla från"
 
-#: gajim/roster_window.py:5254 gajim/data/gui/gc_occupants_menu.ui:170
+#: gajim/roster_window.py:5193 gajim/data/gui/gc_occupants_menu.ui:170
 #: gajim/data/gui/gc_control_popup_menu.ui:113
 #: gajim/data/gui/contact_context_menu.ui:205
 msgid "_History"
 msgstr "_Historik"
 
-#: gajim/roster_window.py:5335 gajim/data/gui/application_menu.ui:86
+#: gajim/roster_window.py:5274 gajim/data/gui/application_menu.ui:83
 #: gajim/data/gui/history_window.ui:57
 msgid "History Manager"
 msgstr "Historikhanterare"
 
-#: gajim/roster_window.py:5343
-msgid "_Join New Group Chat"
-msgstr "_Gå in i ny gruppchatt"
-
 #: gajim/dataforms_widget.py:585
 #, fuzzy
 msgid "Unable to load image"
@@ -1926,258 +1884,275 @@ msgstr "Ämne: %s\n"
 msgid "Write a message…"
 msgstr "Skicka Privat Meddelande"
 
-#: gajim/message_window.py:250
+#: gajim/message_window.py:356
+#, fuzzy
+msgid "Close Tabs"
+msgstr "_Skicka och stäng"
+
+#: gajim/message_window.py:357
 msgid "You are going to close several tabs"
 msgstr "Du är på väg att stänga flera flikar"
 
-#: gajim/message_window.py:251
+#: gajim/message_window.py:358
 msgid "Do you really want to close them all?"
 msgstr "Vill du verkligen stänga alla dem?"
 
-#: gajim/message_window.py:539
+#: gajim/message_window.py:514
 #, fuzzy
 msgid "?Noun:Chats"
 msgstr "Gruppchatt"
 
-#: gajim/message_window.py:543
+#: gajim/message_window.py:518
 #, fuzzy
 msgid "Group Chats"
 msgstr "_Gruppchatt"
 
-#: gajim/message_window.py:547
+#: gajim/message_window.py:522
 msgid "Private Chats"
 msgstr "Privat Chatt"
 
-#: gajim/message_window.py:553
+#: gajim/message_window.py:528
 msgid "Messages"
 msgstr "Meddelanden"
 
-#: gajim/gui_interface.py:173
+#: gajim/gui_interface.py:170
+#, 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:175
 msgid "Do you accept this request?"
 msgstr "Accepterar du den här förfrågan?"
 
-#: gajim/gui_interface.py:175
-#, python-format
-msgid "Do you accept this request on account %s?"
+#: gajim/gui_interface.py:177
+#, 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:178
-#, 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:182
+#, fuzzy
+msgid "Authorization"
+msgstr "Auktorisering har sänts"
 
-#: gajim/gui_interface.py:194 gajim/gtk/notification.py:175
+#: gajim/gui_interface.py:186 gajim/gui_interface.py:420
+#: gajim/gtk/filetransfer.py:338
+#, fuzzy
+msgid "_No"
+msgstr "Ingen"
+
+#: gajim/gui_interface.py:205 gajim/gtk/notification.py:175
 #: gajim/gtk/notification.py:197
 msgid "Connection Failed"
 msgstr "Anslutningsfel"
 
-#: gajim/gui_interface.py:279 gajim/gui_interface.py:529
-msgid "Password Required"
-msgstr "Lösenord krävs"
-
-#: gajim/gui_interface.py:280
-#, python-format
-msgid "A Password is required to join the room %s. Please type it."
-msgstr "Ett lösenord krävs för att gå in i rummet %s. Ange lösenordet."
-
-#: gajim/gui_interface.py:342 gajim/gui_interface.py:346
+#: gajim/gui_interface.py:325 gajim/gui_interface.py:329
 #, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr "Fel %(code)s: %(msg)s"
 
-#: gajim/gui_interface.py:357 gajim/gui_interface.py:376
+#: gajim/gui_interface.py:340 gajim/gui_interface.py:359
 #: gajim/common/modules/message.py:122
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "fel vid sändning av %(message)s ( %(error)s )"
 
-#: gajim/gui_interface.py:401 gajim/gtk/notification.py:175
+#: gajim/gui_interface.py:384 gajim/gtk/notification.py:175
 msgid "Subscription request"
 msgstr "Prenumerationsbegäran"
 
-#: gajim/gui_interface.py:413 gajim/common/contacts.py:184
-#: gajim/common/helpers.py:83
+#: gajim/gui_interface.py:396 gajim/common/contacts.py:200
+#: gajim/common/helpers.py:86
 msgid "Observers"
 msgstr "Observerande"
 
-#: gajim/gui_interface.py:422
+#: gajim/gui_interface.py:405
 msgid "Authorization accepted"
 msgstr "Auktorisering accepterad"
 
-#: gajim/gui_interface.py:423
+#: gajim/gui_interface.py:406
 #, 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:431
-#, python-format
-msgid "Contact \"%s\" removed subscription from you"
+#: gajim/gui_interface.py:415
+#, fuzzy
+msgid "Subscription Removed"
+msgstr "Prenumerationsbegäran"
+
+#: gajim/gui_interface.py:416
+#, fuzzy, python-format
+msgid "Contact '%s' removed subscription from you"
 msgstr "Kontakten \"%s\" tog bort prenumerationen från dig"
 
-#: gajim/gui_interface.py:432
+#: gajim/gui_interface.py:417
 #, fuzzy
 msgid ""
-"You will always see them as offline.\n"
+"You will always see this contact as offline.\n"
 "Do you want to remove them from your contact list?"
 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:453 gajim/gtk/notification.py:176
+#: gajim/gui_interface.py:442 gajim/gtk/notification.py:176
 #, fuzzy
 msgid "Unsubscribed"
 msgstr "Säg _upp prenumeration"
 
-#: gajim/gui_interface.py:465
+#: gajim/gui_interface.py:454
 #, python-format
 msgid "%(jid)s declined the invitation: %(reason)s"
 msgstr ""
 
-#: gajim/gui_interface.py:469
+#: gajim/gui_interface.py:458
 #, python-format
 msgid "%(jid)s declined the invitation"
 msgstr ""
 
-#: gajim/gui_interface.py:485
+#: gajim/gui_interface.py:474
 #, fuzzy, python-brace-format
 msgid "You are invited to {room} by {user}"
 msgstr "Du är inbjuden till en gruppchatt"
 
-#: gajim/gui_interface.py:506
+#: gajim/gui_interface.py:495
 #, fuzzy
 msgid "Certificate Passphrase Required"
 msgstr "Certifikatet har gått ut"
 
-#: gajim/gui_interface.py:507
+#: gajim/gui_interface.py:496
 #, 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:516 gajim/gtk/accounts.py:963
+#: gajim/gui_interface.py:505 gajim/gtk/accounts.py:966
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Ange ditt lösenord för kontot %s"
 
-#: gajim/gui_interface.py:529 gajim/gtk/accounts.py:964
+#: gajim/gui_interface.py:518
+msgid "Password Required"
+msgstr "Lösenord krävs"
+
+#: gajim/gui_interface.py:518 gajim/gtk/accounts.py:967
 msgid "Save password"
 msgstr "Spara lösenord"
 
-#: gajim/gui_interface.py:601 gajim/gui_interface.py:632
+#: gajim/gui_interface.py:587 gajim/gui_interface.py:618
+#: gajim/gtk/filetransfer.py:332 gajim/gtk/filetransfer.py:333
 #: gajim/gtk/notification.py:173 gajim/gtk/notification.py:276
 msgid "File Transfer Error"
 msgstr "Fel i Filöverföring"
 
-#: gajim/gui_interface.py:666
+#: gajim/gui_interface.py:652
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s vill skicka en fil till dig."
 
-#: gajim/gui_interface.py:668 gajim/gtk/filetransfer.py:479
+#: gajim/gui_interface.py:654 gajim/gtk/filetransfer.py:484
 #: gajim/gtk/notification.py:172 gajim/gtk/notification.py:274
 msgid "File Transfer Request"
 msgstr "Förfrågan om Filöverföring"
 
-#: gajim/gui_interface.py:767
+#: gajim/gui_interface.py:753
 #, fuzzy
 msgid "Remote Contact Stopped Transfer"
 msgstr "Fjärrkontakten stoppade överföringen"
 
-#: gajim/gui_interface.py:772
+#: gajim/gui_interface.py:758
 #, fuzzy
 msgid "Error Opening File"
 msgstr "Fel vid öppnande av filen"
 
-#: gajim/gui_interface.py:782
+#: gajim/gui_interface.py:768
 #, fuzzy
 msgid "SSL Certificate Error"
 msgstr "SSL-certifikatfel"
 
-#: gajim/gui_interface.py:795 gajim/gui_interface.py:826
-#: gajim/gui_interface.py:853 gajim/gtk/notification.py:174
+#: gajim/gui_interface.py:781 gajim/gui_interface.py:812
+#: gajim/gui_interface.py:839 gajim/gtk/notification.py:174
 #: gajim/gtk/notification.py:279
 msgid "File Transfer Stopped"
 msgstr "Filöverföring Stoppad"
 
-#: gajim/gui_interface.py:799
+#: gajim/gui_interface.py:785
 #, fuzzy
 msgid "File Transfer Failed"
 msgstr "Filöverföringar"
 
-#: gajim/gui_interface.py:822
+#: gajim/gui_interface.py:808
 #, 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:827
+#: gajim/gui_interface.py:813
 #, 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:833
+#: gajim/gui_interface.py:819
 #, 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:848
+#: gajim/gui_interface.py:834
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "%(filename)s har skickats till %(name)s."
 
-#: gajim/gui_interface.py:854
+#: gajim/gui_interface.py:840
 #, 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:860
+#: gajim/gui_interface.py:846
 #, 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:971
+#: gajim/gui_interface.py:957
 msgid "Username Conflict"
 msgstr "Användarnamn-konflikt"
 
-#: gajim/gui_interface.py:972
+#: gajim/gui_interface.py:958
 msgid "Please type a new username for your local account"
 msgstr "Ange ett nytt användarnamn för ditt lokala konto"
 
-#: gajim/gui_interface.py:995
+#: gajim/gui_interface.py:981
 msgid "Resource Conflict"
 msgstr "Resurskonflikt"
 
-#: gajim/gui_interface.py:996
+#: gajim/gui_interface.py:982
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
 msgstr "Du är redan ansluten till detta konto med samma resurs. Ange en annan"
 
-#: gajim/gui_interface.py:1053
+#: gajim/gui_interface.py:1039
 #, fuzzy, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s vill skicka en fil till dig."
 
-#: gajim/gui_interface.py:1055
+#: gajim/gui_interface.py:1041
 #, fuzzy
 msgid "Voice Chat Request"
 msgstr "Förfrågan om Filöverföring"
 
-#: gajim/gui_interface.py:1123 gajim/gtk/account_wizard.py:312
+#: gajim/gui_interface.py:1109 gajim/gtk/account_wizard.py:312
 msgid "Certificate Already in File"
 msgstr "Certifikatet finns redan i filen"
 
-#: gajim/gui_interface.py:1124 gajim/gtk/account_wizard.py:313
+#: gajim/gui_interface.py:1110 gajim/gtk/account_wizard.py:313
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr ""
 "Detta certifikat finns redan i filen %s så det har inte lagts till igen."
 
-#: gajim/gui_interface.py:1145
+#: gajim/gui_interface.py:1131
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid"
 msgstr ""
 
-#: gajim/gui_interface.py:1148
+#: gajim/gui_interface.py:1134
 #, python-format
 msgid ""
 "\n"
@@ -2186,7 +2161,7 @@ msgstr ""
 "\n"
 "Okänt SSL-fel: %d"
 
-#: gajim/gui_interface.py:1150
+#: gajim/gui_interface.py:1136
 #, python-format
 msgid ""
 "\n"
@@ -2195,11 +2170,11 @@ msgstr ""
 "\n"
 "SSL-fel: <b>%s</b>"
 
-#: gajim/gui_interface.py:1155
+#: gajim/gui_interface.py:1141
 msgid "Error verifying SSL certificate"
 msgstr "Fel vid verifiering av SSL-certifikat"
 
-#: gajim/gui_interface.py:1156
+#: gajim/gui_interface.py:1142
 #, fuzzy, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your XMPP server: "
@@ -2210,7 +2185,7 @@ msgstr ""
 "server: %(error)s\n"
 "Vill du fortfarande ansluta till denna server?"
 
-#: gajim/gui_interface.py:1160 gajim/gtk/account_wizard.py:412
+#: gajim/gui_interface.py:1146 gajim/gtk/account_wizard.py:413
 #, fuzzy, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -2223,171 +2198,161 @@ msgstr ""
 "SHA1-fingeravtryck för certifikatet:\n"
 "%s"
 
-#: gajim/gui_interface.py:1166
+#: gajim/gui_interface.py:1152
 msgid "Ignore this error for this certificate."
 msgstr "Ignorera detta fel med certifikatet."
 
-#: gajim/gui_interface.py:1174
+#: gajim/gui_interface.py:1160
 #, fuzzy, python-format
 msgid "SSL Certificate Verification for %s"
 msgstr "SSL-certifikatfel"
 
-#: gajim/gui_interface.py:1442 gajim/gtk/join_groupchat.py:235
-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/gui_interface.py:1448
-#, fuzzy
-msgid "JID is not a Groupchat"
-msgstr "Det här är ingen gruppchatt"
-
-#: gajim/gui_interface.py:1579
-msgid "This is not a group chat"
-msgstr "Det här är ingen gruppchatt"
-
-#: gajim/gui_interface.py:1580
-#, python-format
-msgid ""
-"%(room_jid)s is already in your roster. Please check if %(room_jid)s is a "
-"correct group chat name. If it is, delete it from your roster and try "
-"joining the group chat again."
-msgstr ""
-
-#: gajim/gui_interface.py:1604 gajim/dialog_messages.py:58
+#: gajim/gui_interface.py:1577
 msgid "You cannot join a group chat while you are invisible"
 msgstr "Du kan inte gå in i en gruppchatt när du är osynlig"
 
-#: gajim/gui_interface.py:2037
+#: gajim/gui_interface.py:1976
 msgid "Could not save your settings and preferences"
 msgstr "Kunde inte spara dina inställningar"
 
-#: gajim/gui_interface.py:2098
+#: gajim/gui_interface.py:2037
 msgid "Gajim: IPython Console"
 msgstr ""
 
-#: gajim/dialog_messages.py:32
+#: gajim/dialog_messages.py:31 gajim/dialog_messages.py:36
+#: gajim/gtk/single_message.py:305 gajim/gtk/account_wizard.py:229
 #, fuzzy
-msgid "You can not start a new conversation unless you are connected."
-msgstr "Du kan inte gå med i en gruppchatt utan att vara ansluten."
-
-#: gajim/dialog_messages.py:36 gajim/dialog_messages.py:41
-#: gajim/gtk/single_message.py:305 gajim/gtk/join_groupchat.py:211
-#: gajim/gtk/account_wizard.py:229
-msgid "Invalid JID"
-msgstr "Ogiltigt JID"
+msgid "Invalid XMPP Address"
+msgstr "Ogiltig Fil"
 
-#: gajim/dialog_messages.py:42 gajim/gtk/single_message.py:306
-#, python-format
-msgid "It is not possible to send a message to %s, this JID is not valid."
+#: gajim/dialog_messages.py:37
+#, 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/dialog_messages.py:47
-msgid "Unread events"
+#: gajim/dialog_messages.py:42
+#, fuzzy
+msgid "Unread Events"
 msgstr "Olästa händelser"
 
-#: gajim/dialog_messages.py:48
-msgid "Read all pending events before removing this account."
+#: gajim/dialog_messages.py:43
+#, fuzzy
+msgid "Read or acknowledge all pending events before removing this account."
 msgstr "Läs alla väntande händelser innan du tar bort detta konto."
 
-#: gajim/dialog_messages.py:52
+#: gajim/dialog_messages.py:48
 #, fuzzy
 msgid "Invalid Form"
 msgstr "Ogiltigt rum"
 
-#: gajim/dialog_messages.py:53
+#: gajim/dialog_messages.py:49
 #, fuzzy
 msgid "The form is not filled correctly."
 msgstr "Smeknamnet innehåller icke-tillåtna tecken."
 
-#: gajim/dialog_messages.py:57 gajim/common/helpers.py:309
+#: gajim/dialog_messages.py:53 gajim/common/helpers.py:315
 msgid "Invisible"
 msgstr "Osynlig"
 
-#: gajim/dialog_messages.py:62
-msgid "A connection is not available"
-msgstr "En anslutning är inte tillgänglig"
+#: gajim/dialog_messages.py:54
+#, fuzzy
+msgid "You cannot join a group chat while being invisible."
+msgstr "Du kan inte gå in i en gruppchatt när du är osynlig"
+
+#: gajim/dialog_messages.py:58
+#, fuzzy
+msgid "No Connection Available"
+msgstr "Anslutningen är inte tillgänglig"
 
-#: gajim/dialog_messages.py:63
+#: gajim/dialog_messages.py:59
 msgid "Your message can not be sent until you are connected."
 msgstr "Ditt meddelande kan inte skickas förrän du är ansluten."
 
-#: gajim/dialog_messages.py:67
-#, fuzzy
-msgid "JID already in list"
-msgstr "Jabber-ID finns redan i listan"
+#: gajim/dialog_messages.py:63
+msgid "XMPP Address Already in List"
+msgstr ""
 
-#: gajim/dialog_messages.py:68
-msgid "The JID you entered is already in the list. Choose another one."
+#: gajim/dialog_messages.py:64
+#, fuzzy
+msgid ""
+"The XMPP Address you entered is already in the list. Please choose another "
+"one."
 msgstr ""
+"Detta namn används redan av ett annat av dina konton. Välj ett annat namn."
 
-#: gajim/dialog_messages.py:72
-msgid "Invalid answer"
+#: gajim/dialog_messages.py:69
+#, fuzzy
+msgid "Invalid Answer"
 msgstr "Ogiltigt lösenord"
 
-#: gajim/dialog_messages.py:73
+#: gajim/dialog_messages.py:70
 #, python-format
 msgid "Transport %(name)s answered wrongly to register request: %(error)s"
 msgstr ""
 "Transporten %(name)s svarade felaktigt på en registreringsbegäran: %(error)s"
 
-#: gajim/dialog_messages.py:78
+#: gajim/dialog_messages.py:75
 #, fuzzy
 msgid "Wrong Custom Hostname"
 msgstr "Använd anpassat värdnamn/port"
 
-#: gajim/dialog_messages.py:79
+#: gajim/dialog_messages.py:76
 #, fuzzy, python-format
-msgid "Wrong custom hostname \"%s\". Ignoring it."
+msgid "Custom hostname \"%s\" is wrong. It will be ignored."
 msgstr "Använd anpassat värdnamn/port"
 
-#: gajim/dialog_messages.py:83
+#: gajim/dialog_messages.py:80
 #, fuzzy
-msgid "Error while removing privacy list"
+msgid "Error While Removing Privacy List"
 msgstr "problem vid sändning %s ( %s )"
 
-#: gajim/dialog_messages.py:84
+#: gajim/dialog_messages.py:81
 #, python-format
 msgid ""
-"Privacy list %s has not been removed. It is maybe active in one of your "
-"connected resources. Deactivate it and try again."
+"Privacy list %s has not been removed. It is probably active in one of your "
+"connected resources. Please deactivate it and try again."
 msgstr ""
 
-#: gajim/dialog_messages.py:90
-msgid "Invisibility not supported"
+#: gajim/dialog_messages.py:87
+#, fuzzy
+msgid "Invisibility Not Supported"
 msgstr "Osynlighet stöds inte"
 
-#: gajim/dialog_messages.py:91
-#, python-format
-msgid "Account %s doesn't support invisibility."
+#: gajim/dialog_messages.py:88
+#, fuzzy, python-format
+msgid "This account %s doesn't support invisibility."
 msgstr "Kontot %s saknar stöd för osynlighet."
 
-#: gajim/dialog_messages.py:95
+#: gajim/dialog_messages.py:92
 #, fuzzy
-msgid "Unregister failed"
+msgid "Unregister Failed"
 msgstr "Registreringen misslyckades"
 
-#: gajim/dialog_messages.py:96
+#: gajim/dialog_messages.py:93
 #, fuzzy, python-format
-msgid "Unregistration with server %(server)s failed: %(error)s"
+msgid "Unregistration on server %(server)s failed: %(error)s"
 msgstr ""
 "Registrering med agenten %(agent)s misslyckades med fel %(error)s: "
 "%(error_msg)s"
 
-#: gajim/dialog_messages.py:100
-msgid "Registration succeeded"
+#: gajim/dialog_messages.py:97
+#, fuzzy
+msgid "Registration Succeeded"
 msgstr "Registreringen lyckades"
 
-#: gajim/dialog_messages.py:101
-#, python-format
-msgid "Registration with agent %s succeeded"
+#: gajim/dialog_messages.py:98
+#, fuzzy, python-format
+msgid "Registration with agent %s succeeded."
 msgstr "Registrering med agenten %s lyckades"
 
-#: gajim/dialog_messages.py:105 gajim/gtk/service_registration.py:215
-msgid "Registration failed"
+#: gajim/dialog_messages.py:102
+#, fuzzy
+msgid "Registration Failed"
 msgstr "Registreringen misslyckades"
 
-#: gajim/dialog_messages.py:106
+#: gajim/dialog_messages.py:103
 #, python-format
 msgid ""
 "Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
@@ -2395,35 +2360,38 @@ msgstr ""
 "Registrering med agenten %(agent)s misslyckades med fel %(error)s: "
 "%(error_msg)s"
 
-#: gajim/dialog_messages.py:111
+#: gajim/dialog_messages.py:108
 #, fuzzy
 msgid "Unable to Join Group Chat"
 msgstr "Kunde inte gå in i gruppchatt"
 
-#: gajim/dialog_messages.py:116
-msgid "GStreamer error"
-msgstr ""
+#: gajim/dialog_messages.py:113
+#, fuzzy
+msgid "GStreamer Error"
+msgstr "Databasfel"
 
-#: gajim/dialog_messages.py:117
+#: gajim/dialog_messages.py:114
 #, fuzzy, python-format
 msgid ""
 "Error: %(error)s\n"
 "Debug: %(debug)s"
 msgstr "Felmeddelande: %s"
 
-#: gajim/dialog_messages.py:121
-msgid "Wrong host"
+#: gajim/dialog_messages.py:118
+#, fuzzy
+msgid "Wrong Host"
 msgstr "Fel värd"
 
-#: gajim/dialog_messages.py:122
+#: gajim/dialog_messages.py:119
 msgid "Invalid local address? :-O"
 msgstr "Ogiltig lokal adress? :-O"
 
-#: gajim/dialog_messages.py:126
-msgid "Avahi error"
+#: gajim/dialog_messages.py:123
+#, fuzzy
+msgid "Avahi Error"
 msgstr "Avahifel"
 
-#: gajim/dialog_messages.py:127
+#: gajim/dialog_messages.py:124
 #, python-format
 msgid ""
 "%s\n"
@@ -2432,67 +2400,67 @@ msgstr ""
 "%s\n"
 "Link-local-meddelanden kanske inte fungerar korrekt."
 
-#: gajim/dialog_messages.py:131 gajim/dialog_messages.py:136
+#: gajim/dialog_messages.py:128 gajim/dialog_messages.py:133
 #, fuzzy
-msgid "Could not request upload slot"
+msgid "Could not request upload slot for HTTP File Upload"
 msgstr "Kunde inte starta lokal tjänst"
 
-#: gajim/dialog_messages.py:137
-msgid "Got unexpected response from server (see log)"
+#: gajim/dialog_messages.py:134
+msgid "Got unexpected response from server (see log)."
 msgstr ""
 
-#: gajim/dialog_messages.py:141 gajim/dialog_messages.py:146
+#: gajim/dialog_messages.py:138 gajim/dialog_messages.py:143
 #, fuzzy
-msgid "Could not open file"
+msgid "Could not Open File"
 msgstr "Kunde inte läsa in bild"
 
-#: gajim/dialog_messages.py:142
-msgid "Exception raised while opening file (see log)"
+#: gajim/dialog_messages.py:139
+msgid "Exception raised while trying to open file (see log)."
 msgstr ""
 
-#: gajim/dialog_messages.py:151
-msgid "Unsecure"
-msgstr ""
+#: gajim/dialog_messages.py:148
+#, fuzzy
+msgid "Not Secure"
+msgstr "Inte startad"
 
-#: gajim/dialog_messages.py:152
+#: gajim/dialog_messages.py:149
 #, fuzzy
-msgid "Server returned unsecure transport (HTTP)"
+msgid "The server returned an insecure transport (HTTP)."
 msgstr "Tjänsten returnerade ett fel."
 
-#: gajim/dialog_messages.py:156
+#: gajim/dialog_messages.py:153
 #, fuzzy
-msgid "Could not upload file"
+msgid "Could not Upload File"
 msgstr "Kunde inte läsa in bild"
 
-#: gajim/dialog_messages.py:157
+#: gajim/dialog_messages.py:154
 #, python-format
 msgid "HTTP response code from server: %s"
 msgstr ""
 
-#: gajim/dialog_messages.py:161
+#: gajim/dialog_messages.py:158
 msgid "Upload Error"
 msgstr ""
 
-#: gajim/dialog_messages.py:166
+#: gajim/dialog_messages.py:163
 #, fuzzy
 msgid "Encryption Error"
 msgstr "Kryptering aktiverad"
 
-#: gajim/dialog_messages.py:167
-#, fuzzy
-msgid "For the chosen encryption there is no encryption method available"
-msgstr "En anslutning är inte tillgänglig"
+#: gajim/dialog_messages.py:164
+msgid "There is no encryption method available for the chosen encryption."
+msgstr ""
 
-#: gajim/dialog_messages.py:171
+#: gajim/dialog_messages.py:169
 #, fuzzy
-msgid "Avatar upload failed"
+msgid "Avatar Upload Failed"
 msgstr "publicering av vCard misslyckades"
 
-#: gajim/privatechat_control.py:204
+#: gajim/privatechat_control.py:207
 msgid "Sending private message failed"
 msgstr "Skicka privat meddelande misslyckades"
 
-#: gajim/privatechat_control.py:206
+#: gajim/privatechat_control.py:209
 #, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr ""
@@ -2516,7 +2484,7 @@ msgstr "visar hjälp för kommando"
 
 #: gajim/gajim_remote.py:85
 #, fuzzy
-msgid "Lists all contacts in roster, one for each line"
+msgid "Lists all contacts in the contact list, one for each line"
 msgstr ""
 "Skriver ut en lista över alla kontakter i kontaktlistan. Varje kontakt "
 "hamnar på en egen rad"
@@ -2599,11 +2567,13 @@ msgstr ""
 
 #: gajim/gajim_remote.py:118
 #, fuzzy
-msgid "Sends new chat message to a contact in the roster. Account is optional."
+msgid ""
+"Sends new chat message to a contact in the contact list. Account is optional."
 msgstr "Användning: /%s, skickar meddelandet till kontakten"
 
 #: gajim/gajim_remote.py:120 gajim/gajim_remote.py:130
-msgid "JID of the contact that will receive the message"
+#, fuzzy
+msgid "XMPP Address of the contact that will receive the message"
 msgstr "JID för kontakten som kommer ta emot meddelandet"
 
 #: gajim/gajim_remote.py:121 gajim/gajim_remote.py:132
@@ -2617,8 +2587,10 @@ msgid "if specified, the message will be sent using this account"
 msgstr "om specificerat kommer meddelandet bli skickat genom det här kontot"
 
 #: gajim/gajim_remote.py:127
-msgid "Sends a chat message to someone on your roster. Account is optional."
-msgstr ""
+#, fuzzy
+msgid ""
+"Sends a chat message to someone on your contact list. Account is optional."
+msgstr "Användning: /%s, skickar meddelandet till kontakten"
 
 #: gajim/gajim_remote.py:131
 msgid "subject"
@@ -2629,11 +2601,13 @@ msgid "message subject"
 msgstr "meddelandeämne"
 
 #: gajim/gajim_remote.py:138
-msgid "Sends new message to a groupchat you've joined."
+#, fuzzy
+msgid "Sends new message to a group chat you've joined."
 msgstr "Skickar nytt meddelande till en gruppchatt som du gått in i."
 
 #: gajim/gajim_remote.py:140
-msgid "JID of the room that will receive the message"
+#, fuzzy
+msgid "XMPP Address of the group chat that will receive the message"
 msgstr "JID för rummet som kommer ta emot meddelandet"
 
 #: gajim/gajim_remote.py:147
@@ -2642,7 +2616,8 @@ msgstr "Hämta detaljerad information om kontakt"
 
 #: gajim/gajim_remote.py:149 gajim/gajim_remote.py:162
 #: gajim/gajim_remote.py:192
-msgid "JID of the contact"
+#, fuzzy
+msgid "XMPP Address of the contact"
 msgstr "JID för kontakten"
 
 #: gajim/gajim_remote.py:153
@@ -2704,7 +2679,8 @@ msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Skriver Gajims nuvarande inställningar till .config-filen"
 
 #: gajim/gajim_remote.py:190
-msgid "Removes contact from roster"
+#, fuzzy
+msgid "Removes contact from contact list"
 msgstr "Ta bort en kontakt från kontaktlista"
 
 #: gajim/gajim_remote.py:193
@@ -2754,9 +2730,9 @@ msgid "Missing argument \"contact_jid\""
 msgstr "Saknar argument \"contact_jid\""
 
 #: gajim/gajim_remote.py:275
-#, python-format
+#, fuzzy, python-format
 msgid ""
-"'%s' is not in your roster.\n"
+"'%s' is not in your contact list.\n"
 "Please specify account for sending the message."
 msgstr ""
 "\"%s\" finns inte i din kontaktlista.\n"
@@ -2981,12 +2957,12 @@ msgstr "Slutet av veckan"
 msgid "Weekend!"
 msgstr "Helg!"
 
-#: gajim/common/logger.py:192 gajim/common/logger.py:197
+#: gajim/common/logger.py:189 gajim/common/logger.py:194
 #, 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:217
+#: gajim/common/logger.py:214
 #, fuzzy, python-format
 msgid "Creating %s"
 msgstr "Förstör %s"
@@ -3060,22 +3036,23 @@ msgstr "%(nickname)s loggade ut"
 msgid "Contact Signed Out"
 msgstr "Kontakt Loggade Ut"
 
-#: gajim/common/contacts.py:455
-msgid "Not in roster"
-msgstr "Inte i kontaktlista"
-
 #: gajim/common/config.py:80
+#, fuzzy
 msgid ""
 "Show desktop notification even when a chat window is opened for this contact "
-"and does not have focus"
+"and does not have focus."
 msgstr ""
+"Tillåt popup/notifieringar när jag är _frånvarande/inte tillgänglig/upptagen/"
+"osynlig"
 
 #: gajim/common/config.py:81
-msgid "Play sound when user is busy"
+#, fuzzy
+msgid "Play sound even when being busy."
 msgstr "Spela upp ljud när användaren är upptagen"
 
 #: gajim/common/config.py:83
-msgid "Show only online and free for chat contacts in roster."
+#, fuzzy
+msgid "Show only online and free for chat contacts in the contact list."
 msgstr ""
 "Visa endast kontakter som är anslutna och lediga för chatt i kontaktlistan."
 
@@ -3084,11 +3061,14 @@ msgid "Time in minutes, after which your status changes to away."
 msgstr "Tid i minuter efter vilken din status ändras till frånvarande."
 
 #: gajim/common/config.py:87
-msgid "$S (Away as a result of being idle more than $T min)"
+#, fuzzy
+msgid "$S (Away: Idle more than $T min)"
 msgstr "$S (Frånvarande på grund av overksam i mer än $T min)"
 
 #: gajim/common/config.py:87
-msgid "$S will be replaced by current status message, $T by autoawaytime."
+msgid ""
+"$S will be replaced by current status message, $T by the 'autoawaytime' "
+"value."
 msgstr ""
 
 #: gajim/common/config.py:89
@@ -3096,77 +3076,82 @@ msgid "Time in minutes, after which your status changes to not available."
 msgstr "Tid i minuter efter vilken din status ändras till inte tillgänglig."
 
 #: gajim/common/config.py:90
-msgid "$S (Not available as a result of being idle more than $T min)"
+#, fuzzy
+msgid "$S (Not available: Idle more than $T min)"
 msgstr "$S (Inte tillgänglig på grund av overksam i mer än $T min)"
 
 #: gajim/common/config.py:90
-msgid "$S will be replaced by current status message, $T by autoxatime."
+msgid ""
+"$S will be replaced by current status message, $T by the 'autoxatime' value."
 msgstr ""
 
 #: gajim/common/config.py:93
 msgid ""
-"When to show notification area icon. Can be 'never', 'on_event', 'always'."
+"When to show the notification area icon. Can be 'never', 'on_event', and "
+"'always'."
 msgstr ""
 
 #: gajim/common/config.py:94
-msgid "Allow to hide the roster window even if the tray icon is not shown."
+msgid ""
+"Allow to hide the contact list window even if the notification area icon is "
+"not shown."
 msgstr ""
 
 #: gajim/common/config.py:97
 #, fuzzy
-msgid "Contact signed in notification color."
-msgstr "_Visa händelse i kontaktlista"
+msgid "Notification color for contacts signing in."
+msgstr "Notifiera mig om kontakter som loggar _in"
 
 #: gajim/common/config.py:98
 #, fuzzy
-msgid "Contact signout notification color"
-msgstr "_Visa händelse i kontaktlista"
+msgid "Notification color for contacts signing out."
+msgstr "Notifiera mig om kontakter som loggar _ut"
 
 #: gajim/common/config.py:99
 #, fuzzy
-msgid "New message notification color."
+msgid "Notification color for new message notification."
 msgstr "Chattstatusmeddelanden:"
 
 #: gajim/common/config.py:100
 #, fuzzy
-msgid "File transfer request notification color."
-msgstr "Förfrågan om Filöverföring"
+msgid "Notification color for file transfer request."
+msgstr "_Meddela mig när en filöverföring är färdig"
 
 #: gajim/common/config.py:101
 #, fuzzy
-msgid "File transfer error notification color."
-msgstr "Filöverföringen avbruten"
+msgid "Notification color for file transfer errors."
+msgstr "_Meddela mig när en filöverföring är färdig"
 
 #: gajim/common/config.py:102
-#, fuzzy
-msgid "File transfer complete or stopped notification color."
-msgstr "När en filöverföring är färdig så visa en popupnotifiering"
+msgid "Notification color for stopped or completed file transfers."
+msgstr ""
 
 #: gajim/common/config.py:103
-#, fuzzy
-msgid "Groupchat invitation notification color"
-msgstr "Inbjudan till Gruppchatt"
+msgid "Notification color for group chat invitations."
+msgstr ""
 
 #: gajim/common/config.py:104
 #, fuzzy
-msgid "Background color of status changed notification"
+msgid "Notification background color for changed status."
 msgstr "Bakgrundsfärg på kontakter när de precis loggat in."
 
 #: gajim/common/config.py:105
-msgid "Other dialogs color."
+msgid "Notification color for other dialogs."
 msgstr ""
 
 #: gajim/common/config.py:106
 msgid ""
-"List (space separated) of rows (accounts and groups) that are collapsed."
+"List of rows (accounts and groups) that are collapsed (space separated)."
 msgstr ""
 
 #: gajim/common/config.py:107
 msgid "default"
 msgstr "standard"
 
-#: gajim/common/config.py:113
-msgid "Language used by speller"
+#: gajim/common/config.py:113 gajim/common/config.py:424
+#: gajim/common/config.py:431
+#, fuzzy
+msgid "Language used for spell checking."
 msgstr "Språk som används för stavningskontroll"
 
 #: gajim/common/config.py:114
@@ -3182,8 +3167,8 @@ msgstr ""
 #: gajim/common/config.py:115
 msgid ""
 "Print time in chats using Fuzzy Clock. Value of fuzziness from 1 to 4, or 0 "
-"to disable fuzzyclock. 1 is the most precise clock, 4 the least precise one. "
-"This is used only if print_time is 'sometimes'."
+"to disable Fuzzy Clock. 1 is the most precise clock, 4 the least precise "
+"one. This is used only if 'print_time' is 'sometimes'."
 msgstr ""
 
 #: gajim/common/config.py:117
@@ -3197,50 +3182,57 @@ msgstr "Behandla par av * / _ som möjliga formateringstecken."
 #: gajim/common/config.py:120
 #, fuzzy
 msgid ""
-"If true, do not remove */_ . So *abc* will be bold but with * * not removed."
+"If enabled, do not remove */_ . So *abc* will be bold but with * * not "
+"removed."
 msgstr ""
 "Om sant så tas inte */_ bort. Så *abc* blir i fet stil men * * / / _ _ tas "
 "inte bort."
 
 #: gajim/common/config.py:123
+#, fuzzy
 msgid ""
-"Uses ReStructured text markup to send HTML, plus ascii formatting if "
-"selected. For syntax, see http://docutils.sourceforge.net/docs/ref/rst/"
-"restructuredtext.html (If you want to use this, install docutils)"
+"Uses ReStructured text markup to send HTML, plus ASCII formatting if "
+"selected. Needs docutils installed (for syntax, see http://docutils."
+"sourceforge.net/docs/ref/rst/restructuredtext.html)."
 msgstr ""
+"Generera XHTML-utdata från RST-kod (se http://docutils.sourceforge.net/docs/"
+"ref/rst/restructuredtext.html)."
 
 #: gajim/common/config.py:132
+#, fuzzy
 msgid ""
-"Character to add after nickname when using nick completion (tab) in group "
-"chat."
+"Character to add after nickname when using nickname completion (tab) in "
+"group chat."
 msgstr ""
 "Tecken att lägga till efter smeknamnet när smeknamnskomplettering används "
 "(tabb) i gruppchatt."
 
 #: gajim/common/config.py:133
+#, fuzzy
 msgid ""
-"Character to propose to add after desired nickname when desired nickname is "
-"used by someone else in group chat."
+"Character to propose to add after desired nickname when nickname is already "
+"used in group chat."
 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:155
 msgid ""
-"If true, Gajim will save roster position when hiding roster, and restore it "
-"when showing roster."
+"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:161
-msgid "Place the roster on the right in single window mode"
+msgid "Place the contact list on the right in single window mode"
 msgstr ""
 
 #: gajim/common/config.py:167
 #, fuzzy
 msgid ""
-"This option let you customize timestamp that is printed in conversation. For "
-"example \"[%H:%M] \" will show \"[hour:minute] \". See python doc on "
-"strftime for full documentation: http://docs.python.org/lib/module-time.html"
+"This option lets you customize the timestamp that is printed in "
+"conversation. For example '[%H:%M] ' will show '[hour:minute] '. See python "
+"doc on strftime for full documentation (https://docs.python.org/3/library/"
+"time.html)."
 msgstr ""
 "Detta alternativ låter dig anpassa tidsstämplar som skrivs ut i "
 "konversationer. Till exempel kommer \"[%H.%M] \" att visa \"[timme.minut] "
@@ -3248,253 +3240,254 @@ msgstr ""
 "docs.python.org/lib/module-time.html"
 
 #: gajim/common/config.py:168
-msgid "Characters that are printed before the nickname in conversations"
+#, 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:169
-msgid "Characters that are printed after the nickname in conversations"
+#, fuzzy
+msgid "Characters that are printed after the nickname in conversations."
 msgstr "Tecken som skrivs ut efter smeknamnet i konversationer"
 
 #: gajim/common/config.py:170
-msgid "Add * and [n] in roster title?"
-msgstr "Lägg till * och [n] i kontaktlistans titel?"
+#, 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:171
 #, fuzzy
 msgid ""
-"How many history messages should be restored when a chat tab/window is "
-"reopened?"
+"Number of messages from chat history to be restored when a chat tab/window "
+"is reopened."
 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:172
-msgid "How far back in time (minutes) history is restored. -1 means no limit."
+msgid ""
+"How far back in time (minutes) chat history is restored. -1 means no limit."
 msgstr ""
 
 #: gajim/common/config.py:173
 msgid ""
-"How many lines to request from server when entering a groupchat. -1 means no "
-"limit"
+"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:174
 msgid ""
-"Minutes of backlog to request when entering a groupchat. -1 means no limit"
+"Should automatic rejoin be activated when you were kicked from a group chat?"
 msgstr ""
 
 #: gajim/common/config.py:175
-msgid ""
-"How many seconds to wait before trying to autorejoin to a conference you are "
-"being disconnected from. Set to 0 to disable autorejoining."
-msgstr ""
-
-#: gajim/common/config.py:176
-msgid "Should autorejoin be activated when kicked from a conference?"
-msgstr ""
-
-#: gajim/common/config.py:177
-msgid ""
-"Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
-"Client default behaviour)."
+#, 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:179
-msgid "How many lines to store for Ctrl+KeyUP."
+#: gajim/common/config.py:177
+#, 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:182
+#: gajim/common/config.py:180
 #, fuzzy, python-format
 msgid ""
-"Either custom URL with %%s in it where %%s is the word/phrase or "
-"'WIKTIONARY' which means use Wikitionary."
+"Either a custom URL with %%s in it (where %%s is the word/phrase) or "
+"'WIKTIONARY' (which means use Wikitionary)."
 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:185
+#: gajim/common/config.py:183
 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:187
+#: gajim/common/config.py:185
 msgid ""
-"When not printing time for every message (print_time==sometimes), print it "
+"When not printing time for every message ('print_time'==sometimes), print it "
 "every x minutes."
 msgstr ""
 
-#: gajim/common/config.py:188
+#: gajim/common/config.py:186
 msgid "Ask before pasting an image."
 msgstr ""
 
-#: gajim/common/config.py:189
+#: gajim/common/config.py:187
 msgid "Ask before closing a group chat tab/window."
 msgstr "Fråga innan gruppchattflik eller -fönster stängs."
 
-#: gajim/common/config.py:190
+#: gajim/common/config.py:188
 #, fuzzy
 msgid ""
-"Always ask for confirmation before closing groupchats with any of the JIDs "
-"on this space separated list."
+"Always ask for confirmation before closing group chats with any of the XMPP "
+"Addresses on this list (space separated)."
 msgstr ""
 "Fråga alltid innan guppchattab/-förster i denna kommaseparerade lista med "
 "rum (jid) stängs."
 
-#: gajim/common/config.py:191
+#: gajim/common/config.py:189
 #, fuzzy
 msgid ""
-"Never ask for confirmation before closing groupchats with any of the JIDs on "
-"this space separated list."
+"Never ask for confirmation before closing group chats with any of the XMPP "
+"Addresses on this list (space separated)."
 msgstr ""
 "Fråga aldrig innan guppchattab/-förster i denna kommaseparerade lista med "
 "rum (jid) stängs."
 
-#: gajim/common/config.py:192
+#: gajim/common/config.py:190
 msgid ""
-"Ask before closing tabbed chat window if there are controls that can lose "
-"data (chat, private chat, groupchat that will not be minimized)"
+"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:195
+#: gajim/common/config.py:193
 #, fuzzy
 msgid ""
-"Comma separated list of sent hosts, in addition of local interfaces, for "
-"File Transfer in case of address translation/port forwarding."
+"List of send hosts (comma separated) in addition to local interfaces for "
+"file transfers (in case of address translation/port forwarding)."
 msgstr ""
 "Åtsidosätter vilket värdnamn vi skickar vid filöverföring, t.ex. vid NAT och "
 "port forwarding."
 
-#: gajim/common/config.py:196
+#: gajim/common/config.py:194
 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:198
+#: gajim/common/config.py:196
 #, fuzzy
 msgid "Notify of events in the notification area."
 msgstr "Notifiera om händelser in systemets statusikon."
 
-#: gajim/common/config.py:199
+#: gajim/common/config.py:197
 msgid ""
-"If False, Gajim will display a static event icon instead of the blinking "
-"status icon in the notification area when notifying on event."
+"If disabled, Gajim will display a static event icon instead of the blinking "
+"status icon in the notification area when notifying about an event."
 msgstr ""
 
-#: gajim/common/config.py:205
+#: gajim/common/config.py:203
 msgid "Show tab when only one conversation?"
 msgstr "Visa flik när endast en konversation är aktiv?"
 
-#: gajim/common/config.py:206
+#: gajim/common/config.py:204
 #, fuzzy
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "Visa flikkant om endast en konversation är aktiv?"
 
-#: gajim/common/config.py:207
+#: gajim/common/config.py:205
 msgid "Show close button in tab?"
 msgstr "Visa stängningsknapp i flik?"
 
-#: gajim/common/config.py:220
+#: gajim/common/config.py:218
 #, fuzzy
 msgid "Preview new messages in notification popup?"
 msgstr "Chattstatusmeddelanden:"
 
-#: gajim/common/config.py:223
+#: gajim/common/config.py:221
 #, fuzzy
 msgid ""
-"A semicolon-separated list of words that will be highlighted in group chats."
+"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:224
+#: gajim/common/config.py:222
 #, fuzzy
 msgid ""
-"If true, quits Gajim when X button of Window Manager is clicked. This "
-"setting is taken into account only if notification icon is used."
+"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 ""
 "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:225
+#: gajim/common/config.py:223
 msgid ""
-"If true, Gajim hides the Roster window on pressing the X button instead of "
-"minimizing into the Dock."
+"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:226
+#: gajim/common/config.py:224
 #, fuzzy
 msgid ""
-"If true, Gajim will display an icon on each tab containing unread messages. "
-"Depending on the theme, this icon may be animated."
+"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:227
+#: gajim/common/config.py:225
 #, fuzzy
 msgid ""
-"If true, Gajim will display the status message, if not empty, for every "
-"contact under the contact name in roster window."
+"If enabled, Gajim will display the status message (if not empty) underneath "
+"the contact name in the contact list window."
 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:233
-msgid "Define the position of the avatar in roster. Can be left or right"
+#: gajim/common/config.py:231
+msgid ""
+"Define the position of avatars in the contact list. Can be 'left' or 'right'."
 msgstr ""
 
-#: gajim/common/config.py:234
+#: gajim/common/config.py:232
 #, fuzzy
 msgid ""
-"If False, Gajim will no longer print status line in chats when a contact "
-"changes their status and/or their status message."
+"If disabled, Gajim will no longer print status messages in chats when a "
+"contact changes their status (and/or their status message)."
 msgstr ""
 "Om False kommer du inte längre att se en statusrad i chattfönstret när en "
 "kontakt byter hans eller hennes status och/eller statusmeddelande."
 
-#: gajim/common/config.py:235
+#: gajim/common/config.py:233
 #, fuzzy
 msgid ""
 "Default Setting: Show a status message for every join or leave in a group "
-"chat"
+"chat."
 msgstr "Kunde inte gå in i gruppchatt"
 
-#: gajim/common/config.py:236
+#: gajim/common/config.py:234
+#, fuzzy
 msgid ""
-"Default Setting: Show a status message for all status (away, dnd, etc.) "
-"changes of users in a group chat"
-msgstr ""
+"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:238
-msgid "Log XHTML messages instead of plain text messages."
+#: gajim/common/config.py:236
+msgid "Store XHTML messages in chat history instead of plain text messages."
 msgstr ""
 
-#: gajim/common/config.py:239
+#: gajim/common/config.py:237
 msgid "Don't show avatar for the transport itself."
 msgstr "Visa inte avatar för själva transporten."
 
-#: gajim/common/config.py:240
-msgid "Don't show roster in the system taskbar."
+#: gajim/common/config.py:238
+#, fuzzy
+msgid "Don't show contact list window in the system taskbar."
 msgstr "Visa inte kontaktlista i systemets fönsterlista."
 
-#: gajim/common/config.py:241
+#: gajim/common/config.py:239
 #, fuzzy
 msgid ""
-"If true, make the window flash (the default behaviour in most Window "
-"Managers) when holding pending events."
+"If enabled, Gajim makes the window flash (the default behaviour in most "
+"Window Managers) when holding pending events."
 msgstr ""
 "Om sant och versionerna av GTK+ och PyGTK är 2.8 eller högre så kommer "
 "fönstret att blinka (standardbeteendet i de flesta fönsterhanterare) när det "
 "finns väntande händelser."
 
-#: gajim/common/config.py:245
+#: gajim/common/config.py:243
 #, fuzzy
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
 "'always_with_roster' - Like 'always' but the messages are in a single window "
-"along with the roster.\n"
+"along with the contact list.\n"
 "'never' - All messages get their own window.\n"
 "'peracct' - Messages for each account are sent to a specific window.\n"
-"'pertype' - Each message type (e.g. chats vs. groupchats) is sent to a "
+"'pertype' - Each message type (e.g. chats vs. group chats) is sent to a "
 "specific window."
 msgstr ""
 "Kontrollerar fönstret där nya meddelanden placeras.\n"
@@ -3505,353 +3498,385 @@ 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:246
+#: gajim/common/config.py:244
 msgid ""
-"Show roster on startup.\n"
-"'always' - Always show roster.\n"
-"'never' - Never show roster.\n"
-"'last_state' - Restore the last state roster."
+"Show contact list window on startup.\n"
+"'always' - Always show contact list window.\n"
+"'never' - Never show contact list window.\n"
+"'last_state' - Restore last state of the contact list window."
 msgstr ""
 
-#: gajim/common/config.py:247
+#: gajim/common/config.py:245
 #, fuzzy
-msgid "If False, you will no longer see the avatar in the chat window."
+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:248
+#: gajim/common/config.py:246
 #, fuzzy
-msgid "If true, pressing the escape key closes a tab/window."
+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:249
-msgid "Hides the banner in a group chat window"
+#: gajim/common/config.py:247
+#, fuzzy
+msgid "Hides the banner in a group chat window."
 msgstr "Döljer bannern i ett gruppchattfönster"
 
-#: gajim/common/config.py:250
-msgid "Hides the banner in two persons chat window"
-msgstr "Döljer bannern i chattfönster för två personer"
+#: gajim/common/config.py:248
+#, fuzzy
+msgid "Hides the banner in a 1:1 chat window."
+msgstr "Döljer bannern i ett gruppchattfönster"
 
-#: gajim/common/config.py:251
-msgid "Hides the group chat occupants list in group chat window."
+#: gajim/common/config.py:249
+#, fuzzy
+msgid "Hides the group chat participants list in a group chat window."
 msgstr "Döljer deltagarlistan i gruppchattfönster."
 
-#: gajim/common/config.py:252
+#: gajim/common/config.py:250
+#, fuzzy
 msgid ""
 "In a chat, show the nickname at the beginning of a line only when it's not "
-"the same person talking than in previous message."
+"the same person talking as in the previous message."
 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:253
+#: gajim/common/config.py:251
 msgid "Indentation when using merge consecutive nickname."
 msgstr ""
 
-#: gajim/common/config.py:254
-msgid "Ctrl-Tab go to next composing tab when none is unread."
+#: gajim/common/config.py:252
+#, 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:253
+msgid ""
+"Show a confirmation dialog to create metacontacts? Empty string means never "
+"show the dialog."
+msgstr ""
+
+#: gajim/common/config.py:254
+msgid ""
+"Show a confirmation dialog to block a contact? Empty string means never show "
+"the dialog."
+msgstr ""
+
 #: gajim/common/config.py:255
 msgid ""
-"Show the confirm metacontacts creation dialog or not? Empty string means "
-"never show the dialog."
+"Show a confirmation dialog for a custom status? Empty string means never "
+"show the dialog."
 msgstr ""
 
 #: gajim/common/config.py:256
 msgid ""
-"Show the confirm block contact dialog or not? Empty string means never show "
-"the dialog."
+"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:257
 msgid ""
-"Show the confirm custom status dialog or not? Empty string means never show "
-"the dialog."
+"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:258
 msgid ""
-"If true, you will be able to set a negative priority to your account in "
-"account modification window. BE CAREFUL, when you are logged in with a "
-"negative priority, you will NOT receive any message from your server."
+"Can be empty, 'chat' or 'normal'. If not empty, all incoming messages are "
+"treated as if they were of this type."
 msgstr ""
 
 #: gajim/common/config.py:259
 msgid ""
-"If true, Gajim will show number of online and total contacts in account and "
-"group rows."
+"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:260
-msgid ""
-"Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
-"as if they were of this type"
+msgid "Time of inactivity needed before the change status window closes down."
 msgstr ""
 
 #: gajim/common/config.py:261
 msgid ""
-"If true, Gajim will scroll and select the contact who sent you the last "
-"message, if chat window is not already opened."
+"Maximum number of lines that are printed in conversations. Oldest lines are "
+"cleared."
 msgstr ""
 
 #: gajim/common/config.py:262
-msgid "Time of inactivity needed before the change status window closes down."
+msgid ""
+"If enabled, notification windows from notification-daemon will be attached "
+"to the notification area icon."
 msgstr ""
 
 #: gajim/common/config.py:263
-msgid ""
-"Maximum number of lines that are printed in conversations. Oldest lines are "
-"cleared."
+msgid "Choose interval between 2 checks of idleness."
 msgstr ""
 
 #: gajim/common/config.py:264
 msgid ""
-"If true, notification windows from notification-daemon will be attached to "
-"notification icon."
+"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:265
-msgid "Choose interval between 2 checks of idleness."
+msgid ""
+"If enabled, completion in group chats will be like a shell auto-completion."
 msgstr ""
 
-#: gajim/common/config.py:266
-msgid ""
-"Valid uri schemes. Only schemes in this list will be accepted as \"real\" "
-"uri. (mailto and xmpp are handled separately)"
+#: gajim/common/config.py:270
+msgid "Optionally fix Jingle output video framerate. Example: 10/1 or 25/2."
 msgstr ""
 
-#: gajim/common/config.py:267
-msgid "If true, completion in groupchats will be like a shell auto-completion"
+#: gajim/common/config.py:271
+msgid "Optionally resize Jingle output video. Example: 320x240."
 msgstr ""
 
 #: gajim/common/config.py:272
-msgid "Optionally fix jingle output video framerate. Example: 10/1 or 25/2"
+msgid "If enabled, you will see your webcam's video stream as well."
 msgstr ""
 
-#: gajim/common/config.py:273
-msgid "Optionally resize jingle output video. Example: 320x240"
+#: gajim/common/config.py:275
+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:274
-msgid "If true, You will also see your webcam"
+#: gajim/common/config.py:276
+msgid "STUN server to use when using Jingle"
 msgstr ""
 
 #: gajim/common/config.py:277
 msgid ""
-"If true, Gajim will try to use a STUN server when using Jingle. The one in "
-"\"stun_server\" option, or the one given by the XMPP server."
+"If enabled, Gajim will show affiliation of group chat participants by adding "
+"a colored square to the status icon."
 msgstr ""
 
 #: gajim/common/config.py:278
-msgid "STUN server to use when using Jingle"
+msgid ""
+"Proxy used for all outgoing connections if the account does not have a "
+"specific proxy configured."
 msgstr ""
 
 #: gajim/common/config.py:279
-msgid ""
-"If true, Gajim will show affiliation of groupchat occupants by adding a "
-"colored square to the status icon"
+msgid "If enabled, Gajim will ignore incoming attention requests ('wizz')."
 msgstr ""
 
 #: gajim/common/config.py:280
 msgid ""
-"Proxy used for all outgoing connections if the account does not have a "
-"specific proxy configured"
+"If enabled, Gajim will reopen chat windows that were opened last time Gajim "
+"was closed."
 msgstr ""
 
 #: gajim/common/config.py:281
-msgid "If true, Gajim will ignore incoming attention requests (\"wizz\")."
+msgid ""
+"If enabled, Gajim will display an icon to show that sent messages have been "
+"received by your contact."
 msgstr ""
 
 #: gajim/common/config.py:282
-msgid ""
-"If enabled, Gajim will reopen chat windows that were opened last time Gajim "
-"was closed."
+msgid "Show a mini avatar in chat window tabs and as the window's icon."
 msgstr ""
 
 #: gajim/common/config.py:283
 msgid ""
-"If enabled, Gajim will show an icon to show that sent message has been "
-"received by your contact"
+"If enabled, Gajim will use the System's Keyring to store account passwords."
 msgstr ""
 
 #: gajim/common/config.py:284
-msgid "Show a mini avatar in chat window tabs and in window icon"
+msgid "If enabled, Gajim will execute XEP-0146 Commands."
 msgstr ""
 
 #: gajim/common/config.py:285
-msgid "If true, Gajim will use the Systems Keyring to store account passwords."
+msgid "2: System, 1: Enabled, 0: Disabled"
 msgstr ""
 
 #: gajim/common/config.py:286
-msgid "If true, Gajim will execute XEP-0146 Commands."
+msgid "Options in days which can be chosen in the sync threshold menu"
 msgstr ""
 
 #: gajim/common/config.py:287
-msgid "2: System, 1: Enabled, 0: Disabled"
+msgid ""
+"Maximum history in days we request from a public group chat archive. 0: As "
+"much as possible."
 msgstr ""
 
 #: gajim/common/config.py:288
-msgid "Options in days which can be chosen in the sync threshold menu"
+msgid ""
+"Maximum history in days we request from a private group chat archive. 0: As "
+"much as possible."
 msgstr ""
 
 #: gajim/common/config.py:289
 msgid ""
-"Maximum history in days we request from a public room archive. 0: As much as "
-"possible"
+"If enabled, Gajim shows the group chat subject in the chat window when "
+"joining."
 msgstr ""
 
 #: gajim/common/config.py:290
+#, fuzzy
 msgid ""
-"Maximum history in days we request from a private room archive. 0: As much "
-"as possible"
+"If enabled, the contact row is colored according to the current chat state "
+"of the contact."
 msgstr ""
+"Om kryssad kommer Gajim att tillåta andra att detektera operativsystemet som "
+"du använder"
 
 #: gajim/common/config.py:291
-msgid "If the room subject is shown in chat on join"
+#, fuzzy
+msgid ""
+"If enabled, the tab is colored according to the current chat state of the "
+"contact."
 msgstr ""
+"Om kryssad kommer Gajim att tillåta andra att detektera operativsystemet som "
+"du använder"
 
 #: gajim/common/config.py:292
+#, fuzzy
 msgid ""
-"If the contact row is colored according to the current chatstate of the "
-"contact"
+"Shows a text in the banner that describes the current chat state of the "
+"contact."
 msgstr ""
+"Om kryssad kommer Gajim att tillåta andra att detektera operativsystemet som "
+"du använder"
 
 #: gajim/common/config.py:293
-msgid "If the tab is colored according to the current chatstate of the contact"
-msgstr ""
-
-#: gajim/common/config.py:294
-msgid ""
-"Shows a text in the banner that describes the current chatstate of the "
-"contact"
-msgstr ""
-
-#: gajim/common/config.py:295 gajim/common/config.py:424
 msgid ""
 "Chat state notifications that are sent to contacts. Possible values: all, "
 "composing_only, disabled"
 msgstr ""
 
-#: gajim/common/config.py:296 gajim/common/config.py:438
+#: gajim/common/config.py:294
 msgid ""
 "Chat state notifications that are sent to the group chat. Possible values: "
-"all, composing_only, disabled"
+"'all', 'composing_only', 'disabled'"
 msgstr ""
 
-#: gajim/common/config.py:312
-msgid ""
-"Priority will change automatically according to your status. Priorities are "
-"defined in autopriority_* options."
+#: gajim/common/config.py:297
+msgid "API Preferences. Possible values: 'http', 'iq'"
 msgstr ""
 
-#: gajim/common/config.py:320
+#: gajim/common/config.py:313
+#, fuzzy
 msgid ""
-"Status used to autoconnect as. Can be online, chat, away, xa, dnd, "
-"invisible. NOTE: this option is used only if restore_last_status is disabled"
-msgstr ""
+"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:321
-msgid "If enabled, restore the last status that was used."
+msgid ""
+"Status to be used automatically when connecting. Can be 'online', 'chat', "
+"'away', 'xa', 'dnd' or 'invisible'. NOTE: This option is used only if "
+"'restore_last_status' is disabled."
 msgstr ""
 
 #: gajim/common/config.py:322
-msgid ""
-"If true, Contacts requesting authorization will be automatically accepted."
+msgid "If enabled, the last status will be restored."
 msgstr ""
 
 #: gajim/common/config.py:323
+msgid ""
+"If enabled, Contacts requesting authorization will be accepted automatically."
+msgstr ""
+
+#: gajim/common/config.py:324
 #, fuzzy
 msgid ""
-"If False, this account will be disabled and will not appear in roster window."
+"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:327
-msgid "Allow plaintext connections"
+#: gajim/common/config.py:328
+msgid "Allow plaintext connections."
 msgstr ""
 
-#: gajim/common/config.py:330
+#: gajim/common/config.py:331
 msgid ""
-"List (space separated) of authentication mechanisms to try. Can contain "
-"ANONYMOUS, EXTERNAL, GSSAPI, SCRAM-SHA-1-PLUS, SCRAM-SHA-1, DIGEST-MD5, "
-"PLAIN, X-MESSENGER-OAUTH2 or XEP-0078"
+"List of authentication mechanisms to try (space separated). Can contain "
+"'ANONYMOUS', 'EXTERNAL', 'GSSAPI', 'SCRAM-SHA-1-PLUS', 'SCRAM-SHA-1', "
+"'DIGEST-MD5', 'PLAIN', 'X-MESSENGER-OAUTH2' or 'XEP-0078'."
 msgstr ""
 
-#: gajim/common/config.py:331
+#: gajim/common/config.py:332
 #, fuzzy
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection. "
-"Can be 'warn', 'connect', 'disconnect'"
+"Can be 'warn', 'connect' or 'disconnect'."
 msgstr ""
 "Visa en varningsdialog innan lösenord skickas i klartext över en anslutning."
 
-#: gajim/common/config.py:332
+#: gajim/common/config.py:333
 msgid "Show a warning dialog before using standard SSL library."
 msgstr "Visa en varningsdialog innan standard-SSL-biblioteket används."
 
-#: gajim/common/config.py:333
+#: gajim/common/config.py:334
 #, fuzzy
 msgid ""
 "Show a warning dialog before sending PLAIN password over a plain connection."
 msgstr ""
 "Visa en varningsdialog innan lösenord skickas i klartext över en anslutning."
 
-#: gajim/common/config.py:334
-msgid "Space separated list of ssl errors to ignore."
+#: gajim/common/config.py:335
+msgid "List of SSL errors to ignore (space separated)."
 msgstr ""
 
-#: gajim/common/config.py:340
+#: gajim/common/config.py:341
 msgid ""
-"Space separated list of JIDs for which you do not want to store logs. You "
-"can also add account name to log nothing for this account."
+"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:341
+#: gajim/common/config.py:342
 msgid ""
-"Space separated list of JIDs for which you accept to not log conversations "
-"if he does not want to."
+"List of XMPP Addresses (space separated) for which you accept to not store "
+"chat history if your contact does not want to."
 msgstr ""
 
-#: gajim/common/config.py:343
-msgid "Whitespace sent after inactivity"
+#: gajim/common/config.py:344
+msgid "If enabled, a whitespace is sent after inactivity (keep alive)."
 msgstr ""
 
-#: gajim/common/config.py:344
-msgid "XMPP ping sent after inactivity"
+#: gajim/common/config.py:345
+msgid "If enabled, an XMPP ping is sent after inactivity (ping alive)."
 msgstr ""
 
-#: gajim/common/config.py:348
+#: gajim/common/config.py:349
 msgid ""
-"How many seconds to wait for the answer of ping alive packet before trying "
-"to reconnect?"
+"How many seconds to wait for the answer of a ping alive packet before trying "
+"to reconnect."
 msgstr ""
 
-#: gajim/common/config.py:352
-msgid "Jabberd2 workaround"
+#: gajim/common/config.py:353
+#, fuzzy
+msgid "Jabberd2 workaround."
 msgstr "Temporär lösning för Jabberd2"
 
-#: gajim/common/config.py:355
+#: gajim/common/config.py:356
+#, fuzzy
 msgid ""
-"If checked, Gajim will use your IP and proxies defined in "
-"file_transfer_proxies option for file transfer."
+"If enabled, Gajim will use your IP and proxies defined in "
+"'file_transfer_proxies' option for file transfers."
 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:356
+#: gajim/common/config.py:357
 msgid ""
-"If true, Gajim will test file transfer proxies on startup to be sure it "
-"works. Openfire's proxies are known to fail this test even if they work."
+"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:369
-msgid "Answer to receipt requests"
+#: gajim/common/config.py:370
+msgid "If enabled, Gajim will answer to message receipt requests."
 msgstr ""
 
-#: gajim/common/config.py:370
-msgid "Sent receipt requests"
+#: gajim/common/config.py:371
+msgid "If enabled, Gajim will send message receipt requests."
 msgstr ""
 
-#: gajim/common/config.py:379
+#: gajim/common/config.py:380
 #, fuzzy
 msgid ""
 "Allow Gajim to send information about the operating system you are running."
@@ -3859,183 +3884,191 @@ msgstr ""
 "Om kryssad kommer Gajim att tillåta andra att detektera operativsystemet som "
 "du använder"
 
-#: gajim/common/config.py:380
+#: gajim/common/config.py:381
 #, fuzzy
 msgid "Allow Gajim to send your local time."
 msgstr "%s vill skicka en fil till dig."
 
-#: gajim/common/config.py:383
+#: gajim/common/config.py:384
 #, fuzzy
-msgid "Message that is sent to contacts you want to add"
+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:384
-msgid ""
-"If enabled, Gajim will send your local IPs so your contact can connect to "
-"your machine to transfer files."
-msgstr ""
-
 #: gajim/common/config.py:385
+#, fuzzy
 msgid ""
-"Space separated list of JIDs for which chat window will be re-opened on next "
-"startup."
+"If enabled, Gajim will send your local IP so your contact can connect to "
+"your machine for file transfers."
 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:387
-msgid "HTTP Upload: Enable HTTPS Verification"
+#: gajim/common/config.py:386
+msgid ""
+"List of XMPP Addresses (space separated) for which the chat window will be "
+"re-opened on next startup."
 msgstr ""
 
 #: gajim/common/config.py:388
-msgid ""
-"Preferred file transfer mechanism for file drag&drop on chat window. Can be "
-"'httpupload' (default) or 'jingle'"
+msgid "HTTP File Upload: Enable HTTPS Verification."
 msgstr ""
 
 #: gajim/common/config.py:389
-msgid "Allow cert verification with POSH"
+msgid ""
+"Preferred file transfer mechanism for file drag&drop on a chat window. Can "
+"be 'httpupload' (default) or 'jingle'."
 msgstr ""
 
-#: gajim/common/config.py:423 gajim/common/config.py:430
+#: gajim/common/config.py:390
 #, fuzzy
-msgid "Language for which misspelled words will be checked"
-msgstr "Språket för vilket vi vill leta efter felstavade ord"
-
-#: gajim/common/config.py:427
-msgid "The currently active encryption for that contact"
-msgstr ""
+msgid "Allow certificate verification with POSH."
+msgstr "SSL-certifikatfel"
 
-#: gajim/common/config.py:431
+#: gajim/common/config.py:425
 msgid ""
-"How many lines to request from server when entering a groupchat. -1 means no "
-"limit, -2 means global value"
+"Chat state notifications that are sent to contacts. Possible values: 'all', "
+"'composing_only', 'disabled'"
 msgstr ""
 
+#: gajim/common/config.py:428
+#, fuzzy
+msgid "The currently active encryption for that contact."
+msgstr "Aktivera ESessions-kryptering för detta konto."
+
 #: gajim/common/config.py:432
 msgid ""
-"Minutes of backlog to request when entering a groupchat. -1 means no limit, "
-"-2 means global value"
+"If enabled, a notification is created for every message in this group chat."
 msgstr ""
 
 #: gajim/common/config.py:433
-msgid "State whether a notification is created for every message in this room"
-msgstr ""
-
-#: gajim/common/config.py:434
+#, fuzzy
 msgid ""
-"Show a status message for all status (away, dnd, etc.) changes of users in a "
-"group chat"
-msgstr ""
+"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:435
+#: gajim/common/config.py:434
 #, fuzzy
-msgid "Show a status message for every join or leave in a group chat"
+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:435
+msgid ""
+"If enabled, the group chat is minimized into the contact list when joining "
+"automatically."
+msgstr ""
+
 #: gajim/common/config.py:436
-msgid "If the group chat is minimized into the roster on autojoin"
+msgid ""
+"If enabled, the group chat is minimized into the contact list when closing "
+"it."
 msgstr ""
 
 #: gajim/common/config.py:437
-msgid "If the group chat is minimized into the roster on close"
+msgid ""
+"Chat state notifications that are sent to the group chat. Possible values: "
+"'all', 'composing_only' or 'disabled'."
 msgstr ""
 
-#: gajim/common/config.py:441
+#: gajim/common/config.py:440
 msgid ""
-"State whether plugins should be activated on startup (this is saved on Gajim "
-"exit). This option SHOULD NOT be used to (de)activate plug-ins. Use GUI "
-"instead."
+"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:446 gajim/common/const.py:281
+#: gajim/common/config.py:445 gajim/common/const.py:315
 msgid "Sleeping"
 msgstr "Sover"
 
-#: gajim/common/config.py:447
+#: gajim/common/config.py:446
 msgid "Back soon"
 msgstr "Snart tillbaka"
 
-#: gajim/common/config.py:447
+#: gajim/common/config.py:446
 msgid "Back in some minutes."
 msgstr "Tillbaka om några minuter."
 
-#: gajim/common/config.py:448 gajim/common/const.py:247
+#: gajim/common/config.py:447 gajim/common/const.py:281
 msgid "Eating"
 msgstr "Äter"
 
-#: gajim/common/config.py:448
-msgid "I'm eating, so leave me a message."
-msgstr "Jag äter, lämna ett meddelande."
+#: gajim/common/config.py:447
+#, fuzzy
+msgid "I'm eating."
+msgstr "Jag arbetar."
 
-#: gajim/common/config.py:449
+#: gajim/common/config.py:448
 msgid "Movie"
 msgstr "Film"
 
-#: gajim/common/config.py:449
+#: gajim/common/config.py:448
 msgid "I'm watching a movie."
 msgstr "Jag tittar på film."
 
-#: gajim/common/config.py:450 gajim/common/const.py:314
+#: gajim/common/config.py:449 gajim/common/const.py:348
 msgid "Working"
 msgstr "Arbetar"
 
-#: gajim/common/config.py:450
+#: gajim/common/config.py:449
 msgid "I'm working."
 msgstr "Jag arbetar."
 
-#: gajim/common/config.py:451
+#: gajim/common/config.py:450
 msgid "Phone"
 msgstr "Telefon"
 
-#: gajim/common/config.py:451
+#: gajim/common/config.py:450
 msgid "I'm on the phone."
 msgstr "Jag pratar i telefon."
 
-#: gajim/common/config.py:452
+#: gajim/common/config.py:451
 msgid "Out"
 msgstr "Ute"
 
-#: gajim/common/config.py:452
+#: gajim/common/config.py:451
 msgid "I'm out enjoying life."
 msgstr "Jag är ute och njuter av livet."
 
-#: gajim/common/config.py:463
+#: gajim/common/config.py:462
 msgid "I'm available."
 msgstr "Jag är tillgänglig."
 
-#: gajim/common/config.py:464
+#: gajim/common/config.py:463
 msgid "I'm free for chat."
 msgstr "Jag är ledig för chatt."
 
-#: gajim/common/config.py:465 gajim/gtk/accounts.py:134
+#: gajim/common/config.py:464 gajim/gtk/accounts.py:133
 msgid "Be right back."
 msgstr "Strax tillbaka."
 
-#: gajim/common/config.py:466
+#: gajim/common/config.py:465
 msgid "I'm not available."
 msgstr "Jag är inte tillgänglig."
 
-#: gajim/common/config.py:467
+#: gajim/common/config.py:466
 msgid "Do not disturb."
 msgstr "Stör inte."
 
-#: gajim/common/config.py:468 gajim/common/config.py:469
+#: gajim/common/config.py:467 gajim/common/config.py:468
 msgid "Bye!"
 msgstr "Hejdå!"
 
-#: gajim/common/config.py:480
+#: gajim/common/config.py:479
 #, fuzzy
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
-"muc_highlight_words, or when a group chat message contains your nickname."
+"'muc_highlight_words' your nickname is mentioned."
 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:481
-msgid "Sound to play when any MUC message arrives."
+#: gajim/common/config.py:480
+#, 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:485
+#: gajim/common/config.py:484
 #, fuzzy
 msgid "Tor"
 msgstr "Till"
@@ -4045,882 +4078,978 @@ msgstr "Till"
 msgid "Error: cannot open %s for reading"
 msgstr "Fel: kan inte öppna %s för läsning"
 
-#: gajim/common/const.py:214
+#: gajim/common/const.py:216
+#, fuzzy
+msgid "?Group chat name:Team"
+msgstr "?Gruppchatt kontaktroll:Ingen"
+
+#: gajim/common/const.py:217
+msgid "?Group chat description:Project discussion"
+msgstr ""
+
+#: gajim/common/const.py:218
+#, fuzzy
+msgid "?Group chat address:team"
+msgstr "Gruppchattar"
+
+#: gajim/common/const.py:219
+#, fuzzy
+msgid "?Group chat name:Family"
+msgstr "Meddelande markerat i gruppchatt"
+
+#: gajim/common/const.py:220
+msgid "?Group chat description:Spring gathering"
+msgstr ""
+
+#: gajim/common/const.py:221
+msgid "?Group chat address:family"
+msgstr ""
+
+#: gajim/common/const.py:222
+#, fuzzy
+msgid "?Group chat name:Vacation"
+msgstr "Inbjudan till Gruppchatt"
+
+#: gajim/common/const.py:223
+msgid "?Group chat description:Trip planning"
+msgstr ""
+
+#: gajim/common/const.py:224
+#, fuzzy
+msgid "?Group chat address:vacation"
+msgstr "Inbjudan till Gruppchatt"
+
+#: gajim/common/const.py:225
+#, fuzzy
+msgid "?Group chat name:Repairs"
+msgstr "Gruppchatt"
+
+#: gajim/common/const.py:226
+msgid "?Group chat description:Local help group"
+msgstr ""
+
+#: gajim/common/const.py:227
+#, fuzzy
+msgid "?Group chat address:repairs"
+msgstr "Gruppchattar"
+
+#: gajim/common/const.py:228
+#, fuzzy
+msgid "?Group chat name:News"
+msgstr "?Gruppchatt kontaktroll:Ingen"
+
+#: gajim/common/const.py:229
+#, fuzzy
+msgid "?Group chat description:Local news and reports"
+msgstr "Möjligheten att skapa rum är begränsad."
+
+#: gajim/common/const.py:230
+#, fuzzy
+msgid "?Group chat address:news"
+msgstr "Ny gruppchatt"
+
+#: gajim/common/const.py:235
+#, fuzzy
+msgid "Remote server not found"
+msgstr "Denna tjänst kunde inte hittas"
+
+#: gajim/common/const.py:236
+msgid "Remote server timeout"
+msgstr ""
+
+#: gajim/common/const.py:237 gajim/common/const.py:238
+#: gajim/common/const.py:239
+#, fuzzy
+msgid "Address does not belong to a group chat server"
+msgstr "Det här är ingen gruppchatt"
+
+#: gajim/common/const.py:240
+#, fuzzy
+msgid "Group chat already exists"
+msgstr "Kontot Local används redan."
+
+#: gajim/common/const.py:241
+#, fuzzy
+msgid "Group chat does not exist"
+msgstr "Gruppchatten %s finns inte."
+
+#: gajim/common/const.py:247
 msgid "This message was encrypted with OTR and could not be decrypted."
 msgstr ""
 
-#: gajim/common/const.py:217
+#: gajim/common/const.py:250
 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:221
+#: gajim/common/const.py:254
 msgid ""
-"This message was encrypted with OpenPGP for XMPP and could not be decrypted."
+"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:224
+#: gajim/common/const.py:258
 #, python-format
 msgid "This message was encrypted with %s and could not be decrypted."
 msgstr ""
 
-#: gajim/common/const.py:231
+#: gajim/common/const.py:265
 #, fuzzy
 msgid "Doing Chores"
 msgstr "Fel Lösenfras"
 
-#: gajim/common/const.py:232
+#: gajim/common/const.py:266
 msgid "Buying Groceries"
 msgstr "Handlar mat"
 
-#: gajim/common/const.py:233
+#: gajim/common/const.py:267
 msgid "Cleaning"
 msgstr "Städar"
 
-#: gajim/common/const.py:234
+#: gajim/common/const.py:268
 msgid "Cooking"
 msgstr "Lagar mat"
 
-#: gajim/common/const.py:235
+#: gajim/common/const.py:269
 msgid "Doing Maintenance"
 msgstr "Reparerar"
 
-#: gajim/common/const.py:236
+#: gajim/common/const.py:270
 msgid "Doing the Dishes"
 msgstr "Diskar"
 
-#: gajim/common/const.py:237
+#: gajim/common/const.py:271
 msgid "Doing the Laundry"
 msgstr "Tvättar"
 
-#: gajim/common/const.py:238
+#: gajim/common/const.py:272
 msgid "Gardening"
 msgstr "Arbetar i trädgården"
 
-#: gajim/common/const.py:239
+#: gajim/common/const.py:273
 msgid "Running an Errand"
 msgstr "Springer ett ärende"
 
-#: gajim/common/const.py:240
+#: gajim/common/const.py:274
 msgid "Walking the Dog"
 msgstr "Ute och går med hunden"
 
-#: gajim/common/const.py:242
+#: gajim/common/const.py:276
 msgid "Drinking"
 msgstr "Dricker"
 
-#: gajim/common/const.py:243
+#: gajim/common/const.py:277
 msgid "Having a Beer"
 msgstr "Tar en öl"
 
-#: gajim/common/const.py:244
+#: gajim/common/const.py:278
 msgid "Having Coffee"
 msgstr "Dricker kaffe"
 
-#: gajim/common/const.py:245
+#: gajim/common/const.py:279
 msgid "Having Tea"
 msgstr "Dricker te"
 
-#: gajim/common/const.py:248
+#: gajim/common/const.py:282
 msgid "Having a Snack"
 msgstr "Tar ett mellanmål"
 
-#: gajim/common/const.py:249
+#: gajim/common/const.py:283
 msgid "Having Breakfast"
 msgstr "Äter frukost"
 
-#: gajim/common/const.py:250
+#: gajim/common/const.py:284
 msgid "Having Dinner"
 msgstr "Äter middag"
 
-#: gajim/common/const.py:251
+#: gajim/common/const.py:285
 msgid "Having Lunch"
 msgstr "Äter lunch"
 
-#: gajim/common/const.py:253
+#: gajim/common/const.py:287
 msgid "Exercising"
 msgstr "Tränar"
 
-#: gajim/common/const.py:254 gajim/common/const.py:305
+#: gajim/common/const.py:288 gajim/common/const.py:339
 msgid "Cycling"
 msgstr "Cyklar"
 
-#: gajim/common/const.py:255
+#: gajim/common/const.py:289
 msgid "Dancing"
 msgstr "Dansar"
 
-#: gajim/common/const.py:256
+#: gajim/common/const.py:290
 #, fuzzy
 msgid "Hiking"
 msgstr "Sparkar %s"
 
-#: gajim/common/const.py:257
+#: gajim/common/const.py:291
 msgid "Jogging"
 msgstr "Joggar"
 
-#: gajim/common/const.py:258
+#: gajim/common/const.py:292
 msgid "Playing Sports"
 msgstr "Sportar"
 
-#: gajim/common/const.py:259
+#: gajim/common/const.py:293
 msgid "Running"
 msgstr "Springer"
 
-#: gajim/common/const.py:260
+#: gajim/common/const.py:294
 msgid "Skiing"
 msgstr "Åker skidor"
 
-#: gajim/common/const.py:261
+#: gajim/common/const.py:295
 msgid "Swimming"
 msgstr "Simmar"
 
-#: gajim/common/const.py:262
+#: gajim/common/const.py:296
 msgid "Working out"
 msgstr "Tränar"
 
-#: gajim/common/const.py:264
+#: gajim/common/const.py:298
 #, fuzzy
 msgid "Grooming"
 msgstr "Från"
 
-#: gajim/common/const.py:265
+#: gajim/common/const.py:299
 msgid "At the Spa"
 msgstr "Njuter på ett spa"
 
-#: gajim/common/const.py:266
+#: gajim/common/const.py:300
 msgid "Brushing Teeth"
 msgstr "Borstar tänderna"
 
-#: gajim/common/const.py:267
+#: gajim/common/const.py:301
 msgid "Getting a Haircut"
 msgstr "Är hos frissan"
 
-#: gajim/common/const.py:268
+#: gajim/common/const.py:302
 msgid "Shaving"
 msgstr "Rakar sig"
 
-#: gajim/common/const.py:269
+#: gajim/common/const.py:303
 msgid "Taking a Bath"
 msgstr "Tar ett bad"
 
-#: gajim/common/const.py:270
+#: gajim/common/const.py:304
 msgid "Taking a Shower"
 msgstr "Tar en dusch"
 
-#: gajim/common/const.py:272
+#: gajim/common/const.py:306
 msgid "Having an Appointment"
 msgstr "I ett möte"
 
-#: gajim/common/const.py:274
+#: gajim/common/const.py:308
 msgid "Inactive"
 msgstr "Inaktiv"
 
-#: gajim/common/const.py:275
+#: gajim/common/const.py:309
 msgid "Day Off"
 msgstr "Har en ledig dag"
 
-#: gajim/common/const.py:276
+#: gajim/common/const.py:310
 msgid "Hanging out"
 msgstr "Hänger"
 
-#: gajim/common/const.py:277
+#: gajim/common/const.py:311
 msgid "Hiding"
 msgstr "Gömmer sig"
 
-#: gajim/common/const.py:278
+#: gajim/common/const.py:312
 msgid "On Vacation"
 msgstr "På semester"
 
-#: gajim/common/const.py:279
+#: gajim/common/const.py:313
 msgid "Praying"
 msgstr "Ber"
 
-#: gajim/common/const.py:280
+#: gajim/common/const.py:314
 msgid "Scheduled Holiday"
 msgstr "Planerad ledighet"
 
-#: gajim/common/const.py:282
+#: gajim/common/const.py:316
 msgid "Thinking"
 msgstr "Tänker"
 
-#: gajim/common/const.py:284
+#: gajim/common/const.py:318
 msgid "Relaxing"
 msgstr "Slappar"
 
-#: gajim/common/const.py:285
+#: gajim/common/const.py:319
 msgid "Fishing"
 msgstr "Fiskar"
 
-#: gajim/common/const.py:286
+#: gajim/common/const.py:320
 msgid "Gaming"
 msgstr "Spelar"
 
-#: gajim/common/const.py:287
+#: gajim/common/const.py:321
 msgid "Going out"
 msgstr "Går ut"
 
-#: gajim/common/const.py:288
+#: gajim/common/const.py:322
 msgid "Partying"
 msgstr "Festar"
 
-#: gajim/common/const.py:289
+#: gajim/common/const.py:323
 msgid "Reading"
 msgstr "Läser"
 
-#: gajim/common/const.py:290
+#: gajim/common/const.py:324
 msgid "Rehearsing"
 msgstr "Pluggar"
 
-#: gajim/common/const.py:291
+#: gajim/common/const.py:325
 msgid "Shopping"
 msgstr "Handlar"
 
-#: gajim/common/const.py:292
+#: gajim/common/const.py:326
 msgid "Smoking"
 msgstr "Röker"
 
-#: gajim/common/const.py:293
+#: gajim/common/const.py:327
 msgid "Socializing"
 msgstr "Minglar"
 
-#: gajim/common/const.py:294
+#: gajim/common/const.py:328
 msgid "Sunbathing"
 msgstr "Solar"
 
-#: gajim/common/const.py:295
+#: gajim/common/const.py:329
 msgid "Watching TV"
 msgstr "Ser på tv"
 
-#: gajim/common/const.py:296
+#: gajim/common/const.py:330
 msgid "Watching a Movie"
 msgstr "Ser en film"
 
-#: gajim/common/const.py:298
+#: gajim/common/const.py:332
 msgid "Talking"
 msgstr "Pratar"
 
-#: gajim/common/const.py:299
+#: gajim/common/const.py:333
 msgid "In Real Life"
 msgstr "I verkliga livet"
 
-#: gajim/common/const.py:300
+#: gajim/common/const.py:334
 msgid "On the Phone"
 msgstr "Pratar i telefon"
 
-#: gajim/common/const.py:301
+#: gajim/common/const.py:335
 msgid "On Video Phone"
 msgstr "I ett videosamtal"
 
-#: gajim/common/const.py:303
+#: gajim/common/const.py:337
 msgid "Traveling"
 msgstr "Reser"
 
-#: gajim/common/const.py:304
+#: gajim/common/const.py:338
 msgid "Commuting"
 msgstr "Pendlar"
 
-#: gajim/common/const.py:306
+#: gajim/common/const.py:340
 msgid "Driving"
 msgstr "Kör bil"
 
-#: gajim/common/const.py:307
+#: gajim/common/const.py:341
 msgid "In a Car"
 msgstr "I en bil"
 
-#: gajim/common/const.py:308
+#: gajim/common/const.py:342
 msgid "On a Bus"
 msgstr "På en buss"
 
-#: gajim/common/const.py:309
+#: gajim/common/const.py:343
 msgid "On a Plane"
 msgstr "På ett flygplan"
 
-#: gajim/common/const.py:310
+#: gajim/common/const.py:344
 msgid "On a Train"
 msgstr "På ett tåg"
 
-#: gajim/common/const.py:311
+#: gajim/common/const.py:345
 msgid "On a Trip"
 msgstr "På resa"
 
-#: gajim/common/const.py:312
+#: gajim/common/const.py:346
 msgid "Walking"
 msgstr "Promenerar"
 
-#: gajim/common/const.py:315
+#: gajim/common/const.py:349
 msgid "Coding"
 msgstr "Programmerar"
 
-#: gajim/common/const.py:316
+#: gajim/common/const.py:350
 msgid "In a Meeting"
 msgstr "I ett möte"
 
-#: gajim/common/const.py:317
+#: gajim/common/const.py:351
 msgid "Studying"
 msgstr "Studerar"
 
-#: gajim/common/const.py:318
+#: gajim/common/const.py:352
 msgid "Writing"
 msgstr "Skriver"
 
-#: gajim/common/const.py:321
+#: gajim/common/const.py:355
 msgid "Afraid"
 msgstr "Rädd"
 
-#: gajim/common/const.py:322
+#: gajim/common/const.py:356
 msgid "Amazed"
 msgstr "Förvånad"
 
-#: gajim/common/const.py:323
+#: gajim/common/const.py:357
 msgid "Amorous"
 msgstr "Kärleksfull"
 
-#: gajim/common/const.py:324
+#: gajim/common/const.py:358
 msgid "Angry"
 msgstr "Arg"
 
-#: gajim/common/const.py:325
+#: gajim/common/const.py:359
 msgid "Annoyed"
 msgstr "Irriterad"
 
-#: gajim/common/const.py:326
+#: gajim/common/const.py:360
 msgid "Anxious"
 msgstr "Ängslig"
 
-#: gajim/common/const.py:327
+#: gajim/common/const.py:361
 msgid "Aroused"
 msgstr "Intresserad"
 
-#: gajim/common/const.py:328
+#: gajim/common/const.py:362
 msgid "Ashamed"
 msgstr "Skamsen"
 
-#: gajim/common/const.py:329
+#: gajim/common/const.py:363
 msgid "Bored"
 msgstr "Uttråkad"
 
-#: gajim/common/const.py:330
+#: gajim/common/const.py:364
 msgid "Brave"
 msgstr "Modig"
 
-#: gajim/common/const.py:331
+#: gajim/common/const.py:365
 msgid "Calm"
 msgstr "Lugn"
 
-#: gajim/common/const.py:332
+#: gajim/common/const.py:366
 msgid "Cautious"
 msgstr "Försiktig"
 
-#: gajim/common/const.py:333
+#: gajim/common/const.py:367
 msgid "Cold"
 msgstr "Kall"
 
-#: gajim/common/const.py:334
+#: gajim/common/const.py:368
 msgid "Confident"
 msgstr "Självsäker"
 
-#: gajim/common/const.py:335
+#: gajim/common/const.py:369
 msgid "Confused"
 msgstr "Förvirrad"
 
-#: gajim/common/const.py:336
+#: gajim/common/const.py:370
 msgid "Contemplative"
 msgstr "Kontemplativ"
 
-#: gajim/common/const.py:337
+#: gajim/common/const.py:371
 msgid "Contented"
 msgstr "Utmanad"
 
-#: gajim/common/const.py:338
+#: gajim/common/const.py:372
 msgid "Cranky"
 msgstr "Excentrisk"
 
-#: gajim/common/const.py:339
+#: gajim/common/const.py:373
 msgid "Crazy"
 msgstr "Galen"
 
-#: gajim/common/const.py:340
+#: gajim/common/const.py:374
 msgid "Creative"
 msgstr "Kreativ"
 
-#: gajim/common/const.py:341
+#: gajim/common/const.py:375
 msgid "Curious"
 msgstr "Nyfiken"
 
-#: gajim/common/const.py:342
+#: gajim/common/const.py:376
 msgid "Dejected"
 msgstr "Bedrövad"
 
-#: gajim/common/const.py:343
+#: gajim/common/const.py:377
 msgid "Depressed"
 msgstr "Deprimerad"
 
-#: gajim/common/const.py:344
+#: gajim/common/const.py:378
 msgid "Disappointed"
 msgstr "Besviken"
 
-#: gajim/common/const.py:345
+#: gajim/common/const.py:379
 msgid "Disgusted"
 msgstr "Äcklad"
 
-#: gajim/common/const.py:346
+#: gajim/common/const.py:380
 msgid "Dismayed"
 msgstr "Förskräckt"
 
-#: gajim/common/const.py:347
+#: gajim/common/const.py:381
 msgid "Distracted"
 msgstr "Distraherad"
 
-#: gajim/common/const.py:348
+#: gajim/common/const.py:382
 msgid "Embarrassed"
 msgstr "Besvärad"
 
-#: gajim/common/const.py:349
+#: gajim/common/const.py:383
 msgid "Envious"
 msgstr "Avundsjuk"
 
-#: gajim/common/const.py:350
+#: gajim/common/const.py:384
 msgid "Excited"
 msgstr "Upphetsad"
 
-#: gajim/common/const.py:351
+#: gajim/common/const.py:385
 msgid "Flirtatious"
 msgstr "Flirtig"
 
-#: gajim/common/const.py:352
+#: gajim/common/const.py:386
 msgid "Frustrated"
 msgstr "Frustrerad"
 
-#: gajim/common/const.py:353
+#: gajim/common/const.py:387
 msgid "Grateful"
 msgstr "Tacksam"
 
-#: gajim/common/const.py:354
+#: gajim/common/const.py:388
 msgid "Grieving"
 msgstr "Sörjer"
 
-#: gajim/common/const.py:355
+#: gajim/common/const.py:389
 msgid "Grumpy"
 msgstr "Grinig"
 
-#: gajim/common/const.py:356
+#: gajim/common/const.py:390
 msgid "Guilty"
 msgstr "Skyldig"
 
-#: gajim/common/const.py:357
+#: gajim/common/const.py:391
 msgid "Happy"
 msgstr "Glad"
 
-#: gajim/common/const.py:358
+#: gajim/common/const.py:392
 msgid "Hopeful"
 msgstr "Hoppfull"
 
-#: gajim/common/const.py:359
+#: gajim/common/const.py:393
 msgid "Hot"
 msgstr "Het"
 
-#: gajim/common/const.py:360
+#: gajim/common/const.py:394
 msgid "Humbled"
 msgstr "Spak"
 
-#: gajim/common/const.py:361
+#: gajim/common/const.py:395
 msgid "Humiliated"
 msgstr "Förödmjukad"
 
-#: gajim/common/const.py:362
+#: gajim/common/const.py:396
 msgid "Hungry"
 msgstr "Hungrig"
 
-#: gajim/common/const.py:363
+#: gajim/common/const.py:397
 msgid "Hurt"
 msgstr "Sårad"
 
-#: gajim/common/const.py:364
+#: gajim/common/const.py:398
 msgid "Impressed"
 msgstr "Imponerad"
 
-#: gajim/common/const.py:365
+#: gajim/common/const.py:399
 msgid "In Awe"
 msgstr "Respektfull"
 
-#: gajim/common/const.py:366
+#: gajim/common/const.py:400
 msgid "In Love"
 msgstr "Kär"
 
-#: gajim/common/const.py:367
+#: gajim/common/const.py:401
 msgid "Indignant"
 msgstr "Upprörd"
 
-#: gajim/common/const.py:368
+#: gajim/common/const.py:402
 msgid "Interested"
 msgstr "Intresserad"
 
-#: gajim/common/const.py:369
+#: gajim/common/const.py:403
 msgid "Intoxicated"
 msgstr "Berusad"
 
-#: gajim/common/const.py:370
+#: gajim/common/const.py:404
 msgid "Invincible"
 msgstr "Oövervinnelig"
 
-#: gajim/common/const.py:371
+#: gajim/common/const.py:405
 msgid "Jealous"
 msgstr "Avundsjuk"
 
-#: gajim/common/const.py:372
+#: gajim/common/const.py:406
 msgid "Lonely"
 msgstr "Ensam"
 
-#: gajim/common/const.py:373
+#: gajim/common/const.py:407
 msgid "Lost"
 msgstr "Förlorad"
 
-#: gajim/common/const.py:374
+#: gajim/common/const.py:408
 msgid "Lucky"
 msgstr "Lycklig"
 
-#: gajim/common/const.py:375
+#: gajim/common/const.py:409
 msgid "Mean"
 msgstr "Elak"
 
-#: gajim/common/const.py:376
+#: gajim/common/const.py:410
 msgid "Moody"
 msgstr "Lynnig"
 
-#: gajim/common/const.py:377
+#: gajim/common/const.py:411
 msgid "Nervous"
 msgstr "Nervös"
 
-#: gajim/common/const.py:378
+#: gajim/common/const.py:412
 msgid "Neutral"
 msgstr "Neutral"
 
-#: gajim/common/const.py:379
+#: gajim/common/const.py:413
 msgid "Offended"
 msgstr "Förolämpad"
 
-#: gajim/common/const.py:380
+#: gajim/common/const.py:414
 msgid "Outraged"
 msgstr "Rasande"
 
-#: gajim/common/const.py:381
+#: gajim/common/const.py:415
 msgid "Playful"
 msgstr "Lekfull"
 
-#: gajim/common/const.py:382
+#: gajim/common/const.py:416
 msgid "Proud"
 msgstr "Stolt"
 
-#: gajim/common/const.py:383
+#: gajim/common/const.py:417
 msgid "Relaxed"
 msgstr "Avslappnad"
 
-#: gajim/common/const.py:384
+#: gajim/common/const.py:418
 msgid "Relieved"
 msgstr "Lättad"
 
-#: gajim/common/const.py:385
+#: gajim/common/const.py:419
 msgid "Remorseful"
 msgstr "Ångerfull"
 
-#: gajim/common/const.py:386
+#: gajim/common/const.py:420
 msgid "Restless"
 msgstr "Rastlös"
 
-#: gajim/common/const.py:387
+#: gajim/common/const.py:421
 msgid "Sad"
 msgstr "Ledsen"
 
-#: gajim/common/const.py:388
+#: gajim/common/const.py:422
 msgid "Sarcastic"
 msgstr "Sarkastisk"
 
-#: gajim/common/const.py:389
+#: gajim/common/const.py:423
 msgid "Satisfied"
 msgstr "Nöjd"
 
-#: gajim/common/const.py:390
+#: gajim/common/const.py:424
 msgid "Serious"
 msgstr "Seriös"
 
-#: gajim/common/const.py:391
+#: gajim/common/const.py:425
 msgid "Shocked"
 msgstr "Chockad"
 
-#: gajim/common/const.py:392
+#: gajim/common/const.py:426
 msgid "Shy"
 msgstr "Blyg"
 
-#: gajim/common/const.py:393
+#: gajim/common/const.py:427
 msgid "Sick"
 msgstr "Sjuk"
 
-#: gajim/common/const.py:394
+#: gajim/common/const.py:428
 msgid "Sleepy"
 msgstr "Sömning"
 
-#: gajim/common/const.py:395
+#: gajim/common/const.py:429
 msgid "Spontaneous"
 msgstr "Spontan"
 
-#: gajim/common/const.py:396
+#: gajim/common/const.py:430
 msgid "Stressed"
 msgstr "Stressad"
 
-#: gajim/common/const.py:397
+#: gajim/common/const.py:431
 msgid "Strong"
 msgstr "Stark"
 
-#: gajim/common/const.py:398
+#: gajim/common/const.py:432
 msgid "Surprised"
 msgstr "Överraskad"
 
-#: gajim/common/const.py:399
+#: gajim/common/const.py:433
 msgid "Thankful"
 msgstr "Tacksam"
 
-#: gajim/common/const.py:400
+#: gajim/common/const.py:434
 msgid "Thirsty"
 msgstr "Törstig"
 
-#: gajim/common/const.py:401
+#: gajim/common/const.py:435
 msgid "Tired"
 msgstr "Trött"
 
-#: gajim/common/const.py:402
+#: gajim/common/const.py:436
 msgid "Undefined"
 msgstr "Odefinierad"
 
-#: gajim/common/const.py:403
+#: gajim/common/const.py:437
 msgid "Weak"
 msgstr "Svag"
 
-#: gajim/common/const.py:404
+#: gajim/common/const.py:438
 msgid "Worried"
 msgstr "Bekymrad"
 
-#: gajim/common/const.py:408
+#: gajim/common/const.py:442
 msgid "accuracy"
 msgstr ""
 
-#: gajim/common/const.py:409
+#: gajim/common/const.py:443
 #, fuzzy
 msgid "alt"
 msgstr "standard"
 
-#: gajim/common/const.py:410
+#: gajim/common/const.py:444
 msgid "area"
 msgstr ""
 
-#: gajim/common/const.py:411
+#: gajim/common/const.py:445
 #, fuzzy
 msgid "bearing"
 msgstr "marine"
 
-#: gajim/common/const.py:412
+#: gajim/common/const.py:446
 #, fuzzy
 msgid "building"
 msgstr "Gömmer sig"
 
-#: gajim/common/const.py:413
+#: gajim/common/const.py:447
 #, fuzzy
 msgid "country"
 msgstr "Land:"
 
-#: gajim/common/const.py:414
+#: gajim/common/const.py:448
 #, fuzzy
 msgid "countrycode"
 msgstr "Konto"
 
-#: gajim/common/const.py:415
+#: gajim/common/const.py:449
 msgid "datum"
 msgstr ""
 
-#: gajim/common/const.py:416
+#: gajim/common/const.py:450
 #, fuzzy
 msgid "description"
 msgstr "Beskrivning"
 
-#: gajim/common/const.py:417
+#: gajim/common/const.py:451
 #, fuzzy
 msgid "error"
 msgstr "Fel."
 
-#: gajim/common/const.py:418
+#: gajim/common/const.py:452
 msgid "floor"
 msgstr ""
 
-#: gajim/common/const.py:419
+#: gajim/common/const.py:453
 msgid "lat"
 msgstr ""
 
-#: gajim/common/const.py:420
+#: gajim/common/const.py:454
 msgid "locality"
 msgstr ""
 
-#: gajim/common/const.py:421
+#: gajim/common/const.py:455
 #, fuzzy
 msgid "lon"
 msgstr "ett"
 
-#: gajim/common/const.py:422
+#: gajim/common/const.py:456
 msgid "postalcode"
 msgstr ""
 
-#: gajim/common/const.py:423
+#: gajim/common/const.py:457
 msgid "region"
 msgstr ""
 
-#: gajim/common/const.py:424
+#: gajim/common/const.py:458
 msgid "room"
 msgstr "rum"
 
-#: gajim/common/const.py:425
+#: gajim/common/const.py:459
 msgid "speed"
 msgstr ""
 
-#: gajim/common/const.py:426
+#: gajim/common/const.py:460
 msgid "street"
 msgstr ""
 
-#: gajim/common/const.py:427
+#: gajim/common/const.py:461
 msgid "text"
 msgstr ""
 
-#: gajim/common/const.py:428
+#: gajim/common/const.py:462
 msgid "timestamp"
 msgstr ""
 
-#: gajim/common/const.py:429
+#: gajim/common/const.py:463
 msgid "URI"
 msgstr ""
 
-#: gajim/common/const.py:434
+#: gajim/common/const.py:468
 msgid "Unable to get issuer certificate"
 msgstr "Kunde inte få tag på utfärdarens certifikat"
 
-#: gajim/common/const.py:435
+#: gajim/common/const.py:469
 msgid "Unable to get certificate CRL"
 msgstr "Kunde inte få tag på certifikatspärrlista"
 
-#: gajim/common/const.py:436
+#: gajim/common/const.py:470
 msgid "Unable to decrypt certificate's signature"
 msgstr "Kunde inte dekryptera certifikatets signatur"
 
-#: gajim/common/const.py:437
+#: gajim/common/const.py:471
 msgid "Unable to decrypt CRL's signature"
 msgstr "Kunde inte dekryptera spärrlistans signatur"
 
-#: gajim/common/const.py:438
+#: gajim/common/const.py:472
 msgid "Unable to decode issuer public key"
 msgstr "Kunde inte avkoda utfärdarens publika nyckel"
 
-#: gajim/common/const.py:439
+#: gajim/common/const.py:473
 msgid "Certificate signature failure"
 msgstr "Fel i certifikatsignatur"
 
-#: gajim/common/const.py:440
+#: gajim/common/const.py:474
 msgid "CRL signature failure"
 msgstr "Fel i spärrlistans signatur"
 
-#: gajim/common/const.py:441
+#: gajim/common/const.py:475
 msgid "Certificate is not yet valid"
 msgstr "Certifikatet är ännu inte giltigt"
 
-#: gajim/common/const.py:442
+#: gajim/common/const.py:476
 msgid "Certificate has expired"
 msgstr "Certifikatet har gått ut"
 
-#: gajim/common/const.py:443
+#: gajim/common/const.py:477
 msgid "CRL is not yet valid"
 msgstr "Spärrlistan är ännu inte giltig"
 
-#: gajim/common/const.py:444
+#: gajim/common/const.py:478
 msgid "CRL has expired"
 msgstr "Spärrlistan har gått ut"
 
-#: gajim/common/const.py:445
+#: gajim/common/const.py:479
 msgid "Format error in certificate's notBefore field"
 msgstr "Formateringsfel i certifikatets notBefore-fält"
 
-#: gajim/common/const.py:446
+#: gajim/common/const.py:480
 msgid "Format error in certificate's notAfter field"
 msgstr "Formateringsfel i certifikatets notAfter-fält"
 
-#: gajim/common/const.py:447
+#: gajim/common/const.py:481
 msgid "Format error in CRL's lastUpdate field"
 msgstr "Formateringsfel i spärrlistans lastUpdate-fält"
 
-#: gajim/common/const.py:448
+#: gajim/common/const.py:482
 msgid "Format error in CRL's nextUpdate field"
 msgstr "Formateringsfel i spärrlistans nextUpdate-fält"
 
-#: gajim/common/const.py:449
+#: gajim/common/const.py:483
 msgid "Out of memory"
 msgstr "Slut på minne"
 
-#: gajim/common/const.py:450
+#: gajim/common/const.py:484
 msgid "Self signed certificate"
 msgstr "Självsignerat certifikat"
 
-#: gajim/common/const.py:451
+#: gajim/common/const.py:485
 msgid "Self signed certificate in certificate chain"
 msgstr "Självsignerat certifikat i certifikatkedja"
 
-#: gajim/common/const.py:452
+#: gajim/common/const.py:486
 msgid "Unable to get local issuer certificate"
 msgstr ""
 
-#: gajim/common/const.py:453
+#: gajim/common/const.py:487
 msgid "Unable to verify the first certificate"
 msgstr "Kunde inte verifiera det första certifikatet"
 
-#: gajim/common/const.py:454
+#: gajim/common/const.py:488
 msgid "Certificate chain too long"
 msgstr "Certifikatkedjan är för lång"
 
-#: gajim/common/const.py:455
+#: gajim/common/const.py:489
 msgid "Certificate revoked"
 msgstr "Certifikatet spärrat"
 
-#: gajim/common/const.py:456
+#: gajim/common/const.py:490
 msgid "Invalid CA certificate"
 msgstr "Ogiltigt CA-certifikat"
 
-#: gajim/common/const.py:457
+#: gajim/common/const.py:491
 msgid "Path length constraint exceeded"
 msgstr ""
 
-#: gajim/common/const.py:458
+#: gajim/common/const.py:492
 msgid "Unsupported certificate purpose"
 msgstr ""
 
-#: gajim/common/const.py:459
+#: gajim/common/const.py:493
 msgid "Certificate not trusted"
 msgstr "Certifikatet är inte pålitligt"
 
-#: gajim/common/const.py:460
+#: gajim/common/const.py:494
 msgid "Certificate rejected"
 msgstr "Certifikatet nekades"
 
-#: gajim/common/const.py:461
+#: gajim/common/const.py:495
 msgid "Subject issuer mismatch"
 msgstr ""
 
-#: gajim/common/const.py:462
+#: gajim/common/const.py:496
 msgid "Authority and subject key identifier mismatch"
 msgstr ""
 
-#: gajim/common/const.py:463
+#: gajim/common/const.py:497
 msgid "Authority and issuer serial number mismatch"
 msgstr ""
 
-#: gajim/common/const.py:464
+#: gajim/common/const.py:498
 msgid "Key usage does not include certificate signing"
 msgstr "Nyckelanvändning inkluderar inte certifikatsignering"
 
-#: gajim/common/const.py:465
+#: gajim/common/const.py:499
 msgid "Application verification failure"
 msgstr ""
 
@@ -5086,262 +5215,262 @@ msgstr ""
 msgid "video output"
 msgstr ""
 
-#: gajim/common/helpers.py:210
+#: gajim/common/helpers.py:216
 msgid "Server must be between 1 and 1023 bytes"
 msgstr ""
 
-#: gajim/common/helpers.py:214
+#: gajim/common/helpers.py:220
 msgid "Invalid character in hostname."
 msgstr "Ogiltigt tecken i värdnamn."
 
-#: gajim/common/helpers.py:216
+#: gajim/common/helpers.py:222
 msgid "Server address required."
 msgstr "Serveradress krävs."
 
-#: gajim/common/helpers.py:220
+#: gajim/common/helpers.py:226
 msgid "Username must be between 1 and 1023 bytes"
 msgstr ""
 
-#: gajim/common/helpers.py:224
+#: gajim/common/helpers.py:230
 msgid "Invalid character in username."
 msgstr "Ogiltigt tecken i användarnamn"
 
-#: gajim/common/helpers.py:230
+#: gajim/common/helpers.py:236
 msgid "Resource must be between 1 and 1023 bytes"
 msgstr ""
 
-#: gajim/common/helpers.py:234
+#: gajim/common/helpers.py:240
 msgid "Invalid character in resource."
 msgstr "Ogiltigt tecken i resurs."
 
-#: gajim/common/helpers.py:275
+#: gajim/common/helpers.py:281
 msgid "_Busy"
 msgstr "_Upptagen"
 
-#: gajim/common/helpers.py:277 gajim/gtk/tooltips.py:647
+#: gajim/common/helpers.py:283 gajim/gtk/tooltips.py:647
 msgid "Busy"
 msgstr "Upptagen"
 
-#: gajim/common/helpers.py:280
+#: gajim/common/helpers.py:286
 msgid "_Not Available"
 msgstr "_Inte tillgänglig"
 
-#: gajim/common/helpers.py:282 gajim/gtk/tooltips.py:649
+#: gajim/common/helpers.py:288 gajim/gtk/tooltips.py:649
 msgid "Not Available"
 msgstr "Inte tillgänglig"
 
-#: gajim/common/helpers.py:285
+#: gajim/common/helpers.py:291
 msgid "_Free for Chat"
 msgstr "_Ledig för chatt"
 
-#: gajim/common/helpers.py:287 gajim/gtk/tooltips.py:643
+#: gajim/common/helpers.py:293 gajim/gtk/tooltips.py:643
 msgid "Free for Chat"
 msgstr "Ledig för chatt"
 
-#: gajim/common/helpers.py:290
+#: gajim/common/helpers.py:296
 #, fuzzy
 msgid "?user status:_Available"
 msgstr "?transfer status:Pausad"
 
-#: gajim/common/helpers.py:292 gajim/gtk/tooltips.py:641
+#: gajim/common/helpers.py:298 gajim/gtk/tooltips.py:641
 #, fuzzy
 msgid "?user status:Available"
 msgstr "?transfer status:Pausad"
 
-#: gajim/common/helpers.py:294
+#: gajim/common/helpers.py:300
 msgid "Connecting"
 msgstr "Ansluter"
 
-#: gajim/common/helpers.py:297 gajim/data/gui/preferences_window.ui:1251
+#: gajim/common/helpers.py:303 gajim/data/gui/preferences_window.ui:1251
 msgid "A_way"
 msgstr "Fr_ånvarande"
 
-#: gajim/common/helpers.py:299 gajim/common/modules/adhoc_commands.py:120
-#: gajim/command_system/implementation/standard.py:139
+#: gajim/common/helpers.py:305 gajim/common/modules/adhoc_commands.py:120
+#: gajim/command_system/implementation/standard.py:141
 #: gajim/gtk/tooltips.py:645
 msgid "Away"
 msgstr "Frånvarande"
 
-#: gajim/common/helpers.py:302
+#: gajim/common/helpers.py:308
 msgid "_Offline"
 msgstr "_Frånkopplad"
 
-#: gajim/common/helpers.py:304 gajim/gtk/tooltips.py:651
+#: gajim/common/helpers.py:310 gajim/gtk/tooltips.py:651
 msgid "Offline"
 msgstr "Frånkopplad"
 
-#: gajim/common/helpers.py:307
+#: gajim/common/helpers.py:313
 msgid "_Invisible"
 msgstr "_Osynlig"
 
-#: gajim/common/helpers.py:313
+#: gajim/common/helpers.py:319
 msgid "?contact has status:Unknown"
 msgstr "?kontakt har status:Okänd"
 
-#: gajim/common/helpers.py:315
+#: gajim/common/helpers.py:321
 msgid "?contact has status:Has errors"
 msgstr "?kontakt har status:Har fel"
 
-#: gajim/common/helpers.py:330
+#: gajim/common/helpers.py:336
 msgid "?Subscription we already have:None"
 msgstr "?Prenumeration vi redan har:Ingen"
 
-#: gajim/common/helpers.py:332
+#: gajim/common/helpers.py:338
 msgid "To"
 msgstr "Till"
 
-#: gajim/common/helpers.py:334 gajim/data/gui/groups_post_window.ui:33
+#: gajim/common/helpers.py:340 gajim/data/gui/groups_post_window.ui:33
 msgid "From"
 msgstr "Från"
 
-#: gajim/common/helpers.py:336
+#: gajim/common/helpers.py:342
 msgid "Both"
 msgstr "Båda"
 
-#: gajim/common/helpers.py:338 gajim/gtk/server_info.py:151
+#: gajim/common/helpers.py:344 gajim/gtk/server_info.py:151
 #, fuzzy
 msgid "Unknown"
 msgstr "?OS:Okänt"
 
-#: gajim/common/helpers.py:344
+#: gajim/common/helpers.py:350
 msgid "?Ask (for Subscription):None"
 msgstr "?Fråga (för prenumeration):Ingen"
 
-#: gajim/common/helpers.py:346
+#: gajim/common/helpers.py:352
 msgid "Subscribe"
 msgstr "Prenumerera"
 
-#: gajim/common/helpers.py:355
+#: gajim/common/helpers.py:361
 msgid "?Group Chat Contact Role:None"
 msgstr "?Gruppchatt kontaktroll:Ingen"
 
-#: gajim/common/helpers.py:358
+#: gajim/common/helpers.py:364
 msgid "Moderators"
 msgstr "Moderatorer"
 
-#: gajim/common/helpers.py:360
+#: gajim/common/helpers.py:366
 msgid "Moderator"
 msgstr "Moderator"
 
-#: gajim/common/helpers.py:363
+#: gajim/common/helpers.py:369 gajim/data/gui/groupchat_info_scrolled.ui:243
 msgid "Participants"
 msgstr "Deltagare"
 
-#: gajim/common/helpers.py:365
+#: gajim/common/helpers.py:371
 msgid "Participant"
 msgstr "Deltagare"
 
-#: gajim/common/helpers.py:368
+#: gajim/common/helpers.py:374
 msgid "Visitors"
 msgstr "Besökare"
 
-#: gajim/common/helpers.py:370
+#: gajim/common/helpers.py:376
 msgid "Visitor"
 msgstr "Besökare"
 
-#: gajim/common/helpers.py:376 gajim/gtk/tooltips.py:253
+#: gajim/common/helpers.py:382 gajim/gtk/tooltips.py:253
 #, fuzzy
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "?Gruppchatt kontaktroll:Ingen"
 
-#: gajim/common/helpers.py:378 gajim/data/gui/groupchat_config.ui:32
+#: gajim/common/helpers.py:384 gajim/data/gui/groupchat_config.ui:32
 #: gajim/gtk/tooltips.py:259
 msgid "Owner"
 msgstr "Ägare"
 
-#: gajim/common/helpers.py:380 gajim/gtk/tooltips.py:257
+#: gajim/common/helpers.py:386 gajim/gtk/tooltips.py:257
 msgid "Administrator"
 msgstr "Administratör"
 
-#: gajim/common/helpers.py:382 gajim/data/gui/groupchat_config.ui:40
+#: gajim/common/helpers.py:388 gajim/data/gui/groupchat_config.ui:40
 #: gajim/gtk/tooltips.py:255 gajim/gtk/groupchat_config.py:105
 msgid "Member"
 msgstr "Medlem"
 
-#: gajim/common/helpers.py:421
+#: gajim/common/helpers.py:427
 msgid "is paying attention to the conversation"
 msgstr "uppmärksammar konversationen"
 
-#: gajim/common/helpers.py:423
+#: gajim/common/helpers.py:429
 msgid "is doing something else"
 msgstr "gör något annat"
 
-#: gajim/common/helpers.py:425
+#: gajim/common/helpers.py:431
 #, fuzzy
 msgid "is composing a message…"
 msgstr "skriver ett meddelande..."
 
-#: gajim/common/helpers.py:428
+#: gajim/common/helpers.py:434
 msgid "paused composing a message"
 msgstr "tog en paus i skrivandet"
 
-#: gajim/common/helpers.py:430
+#: gajim/common/helpers.py:436
 msgid "has closed the chat window or tab"
 msgstr "har stängt chattfönstret eller fliken"
 
-#: gajim/common/helpers.py:936 gajim/common/helpers.py:943
+#: gajim/common/helpers.py:942 gajim/common/helpers.py:949
 #, 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:950
+#: gajim/common/helpers.py:956
 #, fuzzy, python-format
-msgid "from room %s"
-msgstr " från rummet %s"
+msgid "from group chat %s"
+msgstr "i _gruppchattar"
 
-#: gajim/common/helpers.py:953 gajim/common/helpers.py:970
+#: gajim/common/helpers.py:959 gajim/common/helpers.py:976
 #, fuzzy, python-format
 msgid "from user %s"
 msgstr " från användaren %s"
 
-#: gajim/common/helpers.py:955
+#: gajim/common/helpers.py:961
 #, fuzzy, python-format
 msgid "from %s"
 msgstr " från %s"
 
-#: gajim/common/helpers.py:962 gajim/common/helpers.py:968
+#: gajim/common/helpers.py:968 gajim/common/helpers.py:974
 #, 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:986 gajim/common/helpers.py:998
+#: gajim/common/helpers.py:992 gajim/common/helpers.py:1004
 #: gajim/data/gui/roster_window.ui:85 data/org.gajim.Gajim.desktop.in:4
 #: data/org.gajim.Gajim.appdata.xml.in:9
 msgid "Gajim"
 msgstr "Gajim"
 
-#: gajim/common/helpers.py:1000
+#: gajim/common/helpers.py:1006
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: gajim/common/helpers.py:1109 gajim/data/gui/add_new_contact_window.ui:25
+#: gajim/common/helpers.py:1115 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:1111
+#: gajim/common/helpers.py:1117
 msgid "Hello, I am $name."
 msgstr ""
 
-#: gajim/common/helpers.py:1215 gajim/common/helpers.py:1224
-#: gajim/common/helpers.py:1282
+#: gajim/common/helpers.py:1221 gajim/common/helpers.py:1230
+#: gajim/common/helpers.py:1288
 msgid "Timeout loading image"
 msgstr "Tidsgräns översteg vid inläsning av bild"
 
-#: gajim/common/helpers.py:1234 gajim/common/helpers.py:1280
+#: gajim/common/helpers.py:1240 gajim/common/helpers.py:1286
 msgid "Image is too big"
 msgstr "Bild är för stor"
 
-#: gajim/common/helpers.py:1245
+#: gajim/common/helpers.py:1251
 #, fuzzy
 msgid "PyCURL is not installed"
 msgstr "Spärrlistan är ännu inte giltig"
 
-#: gajim/common/helpers.py:1284
+#: gajim/common/helpers.py:1290
 #, fuzzy
 msgid "Error loading image"
 msgstr "Tidsgräns översteg vid inläsning av bild"
@@ -5517,7 +5646,8 @@ msgstr "Statusen har ändrats."
 
 #: gajim/common/modules/adhoc_commands.py:202
 #: gajim/common/modules/adhoc_commands.py:239
-msgid "Leave Groupchats"
+#, fuzzy
+msgid "Leave Group Chats"
 msgstr "Lämna gruppchattar"
 
 #: gajim/common/modules/adhoc_commands.py:228
@@ -5526,15 +5656,18 @@ msgid "%(nickname)s on %(room_jid)s"
 msgstr "%(nickname)s på %(room_jid)s"
 
 #: gajim/common/modules/adhoc_commands.py:232
-msgid "You have not joined a groupchat."
+#, fuzzy
+msgid "You have not joined a group chat."
 msgstr "Du har inte gått in i en gruppchatt."
 
 #: gajim/common/modules/adhoc_commands.py:240
-msgid "Choose the groupchats you want to leave"
+#, fuzzy
+msgid "Choose the group chats you want to leave"
 msgstr "Välj de gruppchattar som du vill lämna"
 
 #: gajim/common/modules/adhoc_commands.py:289
-msgid "You left the following groupchats:"
+#, fuzzy
+msgid "You left the following group chats:"
 msgstr "Du lämnade följande gruppchattar:"
 
 #: gajim/common/modules/roster_item_exchange.py:102
@@ -5551,7 +5684,7 @@ msgstr "Bjud in _kontakter"
 msgid "Blocked Contacts"
 msgstr "Blockerade kontakter"
 
-#: gajim/data/gui/destroy_muc_dialog.ui:79 gajim/gtk/dialogs.py:736
+#: gajim/data/gui/destroy_muc_dialog.ui:79 gajim/gtk/dialogs.py:563
 msgid "Destroy this group chat permanently?"
 msgstr ""
 
@@ -5560,7 +5693,7 @@ msgstr ""
 msgid "Reason..."
 msgstr "Anledning"
 
-#: gajim/data/gui/destroy_muc_dialog.ui:124 gajim/gtk/dialogs.py:738
+#: gajim/data/gui/destroy_muc_dialog.ui:124 gajim/gtk/dialogs.py:565
 msgid "Where participants should go (optional)"
 msgstr ""
 
@@ -5572,35 +5705,6 @@ msgstr ""
 msgid "_Reason and alternate venue (optional)"
 msgstr ""
 
-#: gajim/data/gui/advanced_configuration_window.ui:7
-#: gajim/data/gui/preferences_window.ui:2723
-#, fuzzy
-msgid "Advanced Configuration Editor (ACE)"
-msgstr "Avancerad konfigurationsredigerare"
-
-#: gajim/data/gui/advanced_configuration_window.ui:52
-#, fuzzy
-msgid "You should restart Gajim for some changes to take effect"
-msgstr ""
-"<b>OBSERVERA:</b> Du bör starta om Gajim för att vissa inställningar ska bli "
-"aktiva"
-
-#: gajim/data/gui/advanced_configuration_window.ui:84
-#, fuzzy
-msgid "_Filter"
-msgstr "_Filter:"
-
-#: gajim/data/gui/advanced_configuration_window.ui:153
-#: gajim/data/gui/filetransfers_send_file_dialog.ui:15
-#: gajim/gtk/discovery.py:1666
-msgid "Description"
-msgstr "Beskrivning"
-
-#: gajim/data/gui/advanced_configuration_window.ui:197
-#, fuzzy
-msgid "_Reset to default"
-msgstr "_Återställ till standardfärger"
-
 #: gajim/data/gui/join_groupchat_window.ui:56
 #: gajim/data/gui/chat_to_muc_window.ui:67
 #: gajim/data/gui/chat_to_muc_window.ui:78
@@ -5612,9 +5716,8 @@ msgid "Join group chat every time Gajim is started"
 msgstr ""
 
 #: gajim/data/gui/join_groupchat_window.ui:113
-#, fuzzy
-msgid "Auto Join"
-msgstr "Anslut automatiskt"
+msgid "Join Automatically"
+msgstr ""
 
 #: gajim/data/gui/join_groupchat_window.ui:131
 #: gajim/data/gui/profile_window.ui:233
@@ -5623,10 +5726,11 @@ msgstr "Konto"
 
 #: gajim/data/gui/join_groupchat_window.ui:147
 #, fuzzy
-msgid "Room"
-msgstr "Rum:"
+msgid "Group chat"
+msgstr "Gruppchattar"
 
-#: gajim/data/gui/join_groupchat_window.ui:180 gajim/gtk/accounts.py:886
+#: gajim/data/gui/join_groupchat_window.ui:180 gajim/data/gui/bookmarks.ui:158
+#: gajim/gtk/accounts.py:889
 #, fuzzy
 msgid "Password"
 msgstr "Lösenord:"
@@ -5650,94 +5754,11 @@ msgstr "i _gruppchattar"
 msgid "Search group chats on selected server"
 msgstr ""
 
-#: gajim/data/gui/join_groupchat_window.ui:437 gajim/gtk/discovery.py:1271
+#: gajim/data/gui/join_groupchat_window.ui:437 gajim/gtk/discovery.py:1270
 #, fuzzy
 msgid "Join"
 msgstr "_Gå in i"
 
-#: gajim/data/gui/manage_proxies_window.ui:12
-#, fuzzy
-msgid "HTTP Connect"
-msgstr ""
-"HTTP Connect\n"
-"SOCKS5\n"
-"BOSH"
-
-#: gajim/data/gui/manage_proxies_window.ui:15
-msgid "SOCKS5"
-msgstr ""
-
-#: gajim/data/gui/manage_proxies_window.ui:18
-msgid "BOSH"
-msgstr ""
-
-#: gajim/data/gui/manage_proxies_window.ui:27
-msgid "Manage Proxy Profiles"
-msgstr "Hantera proxyprofiler"
-
-#: gajim/data/gui/manage_proxies_window.ui:83
-#, fuzzy
-msgid "Add Proxy"
-msgstr "Proxyserver:"
-
-#: gajim/data/gui/manage_proxies_window.ui:97
-#, fuzzy
-msgid "Remove Proxy"
-msgstr "Ta bort grupp"
-
-#: gajim/data/gui/manage_proxies_window.ui:141
-#, fuzzy
-msgid "Properties"
-msgstr "<b>Egenskaper</b>"
-
-#: gajim/data/gui/manage_proxies_window.ui:157
-#, fuzzy
-msgid "_Name"
-msgstr "_Namn:"
-
-#: gajim/data/gui/manage_proxies_window.ui:173
-#, fuzzy
-msgid "_Type"
-msgstr "_Typ:"
-
-#: gajim/data/gui/manage_proxies_window.ui:236
-#, fuzzy
-msgid "_BOSH URL"
-msgstr "_BOSH URL:"
-
-#: gajim/data/gui/manage_proxies_window.ui:261
-msgid "Use HTTP prox_y"
-msgstr "Använd HTTP-prox_y"
-
-#: gajim/data/gui/manage_proxies_window.ui:280
-#, fuzzy
-msgid "Proxy _Host"
-msgstr "Proxyser_ver:"
-
-#: gajim/data/gui/manage_proxies_window.ui:307
-#, fuzzy
-msgid "Proxy _Port"
-msgstr "Proxyserverns _port:"
-
-#: gajim/data/gui/manage_proxies_window.ui:334
-#, fuzzy
-msgid "_Username"
-msgstr "_Användarnamn:"
-
-#: gajim/data/gui/manage_proxies_window.ui:347
-msgid "Use proxy auth_entication"
-msgstr "Använd autentiser_ing för proxyserver"
-
-#: gajim/data/gui/manage_proxies_window.ui:377
-#, fuzzy
-msgid "Pass_word"
-msgstr "Lösen_ord:"
-
-#: gajim/data/gui/manage_proxies_window.ui:405 gajim/gtk/adhoc.py:321
-#, fuzzy
-msgid "Settings"
-msgstr "Registreringen misslyckades"
-
 #: gajim/data/gui/change_password_dialog.ui:17
 #, fuzzy
 msgid "New Password"
@@ -5768,11 +5789,13 @@ msgid "Status:"
 msgstr "Status:"
 
 #: gajim/data/gui/zeroconf_information_window.ui:89
-msgid "_Log conversation history"
+#, fuzzy
+msgid "_Store conversation history"
 msgstr "_Logga konversationshistorik"
 
 #: gajim/data/gui/zeroconf_information_window.ui:215
 #: gajim/data/gui/vcard_information_window.ui:390
+#: gajim/data/gui/groupchat_info_scrolled.ui:166
 msgid "Contact"
 msgstr "Kontakt"
 
@@ -5785,8 +5808,9 @@ msgid "Last Name:"
 msgstr "Efternamn:"
 
 #: gajim/data/gui/zeroconf_information_window.ui:260
-msgid "Jabber ID:"
-msgstr "Jabber-ID:"
+#, fuzzy
+msgid "XMPP Address:"
+msgstr "AIM-adress:"
 
 #: gajim/data/gui/zeroconf_information_window.ui:273
 msgid "E-Mail:"
@@ -5806,8 +5830,9 @@ msgid "Send _File"
 msgstr "Skicka _fil"
 
 #: gajim/data/gui/gc_occupants_menu.ui:29
-msgid "Occupant Actions"
-msgstr ""
+#, fuzzy
+msgid "Participant Actions"
+msgstr "Deltagare"
 
 #: gajim/data/gui/gc_occupants_menu.ui:38
 msgid "_Voice"
@@ -5838,8 +5863,9 @@ msgid "_Ban"
 msgstr "_Bannlys"
 
 #: gajim/data/gui/gc_occupants_menu.ui:124
-msgid "_Add to Roster"
-msgstr "_Lägg till i kontaktlista"
+#, fuzzy
+msgid "_Add to Contact List"
+msgstr "_Lägg till kontakt..."
 
 #: gajim/data/gui/gc_occupants_menu.ui:132
 #, fuzzy
@@ -5878,11 +5904,6 @@ msgstr "Prenumeration:"
 msgid "_Status"
 msgstr "_Status"
 
-#: gajim/data/gui/zeroconf_context_menu.ui:26
-#: gajim/data/gui/account_context_menu.ui:79
-msgid "_Modify Account..."
-msgstr "_Redigera konto..."
-
 #: gajim/data/gui/certificate_dialog.ui:66
 #: gajim/data/gui/certificate_dialog.ui:178
 msgid "Common Name (CN)"
@@ -5964,13 +5985,19 @@ msgstr "Senast ändrad:"
 msgid "Next entry"
 msgstr ""
 
+#: gajim/data/gui/filetransfers_send_file_dialog.ui:15
+#: gajim/data/gui/advanced_configuration.ui:143
+#: gajim/data/gui/groupchat_info_scrolled.ui:48 gajim/gtk/discovery.py:1663
+msgid "Description"
+msgstr "Beskrivning"
+
 #: gajim/data/gui/filetransfers_send_file_dialog.ui:54
 #, fuzzy
 msgid "_Send Files"
 msgstr "Skicka _fil"
 
 #: gajim/data/gui/filetransfers_send_file_dialog.ui:58
-#: gajim/gtk/xml_console.py:90
+#: gajim/gtk/xml_console.py:87
 msgid "Send"
 msgstr "Sänd"
 
@@ -5994,21 +6021,23 @@ msgid "Change _Nickname..."
 msgstr "Byt smek_namn..."
 
 #: gajim/data/gui/gc_control_popup_menu.ui:20
-msgid "_Manage Room"
-msgstr "_Hantera rum"
+#, fuzzy
+msgid "_Manage Group Chat"
+msgstr "_Ny gruppchatt"
 
 #: gajim/data/gui/gc_control_popup_menu.ui:31
 msgid "Change _Subject..."
 msgstr "Byt _ämne..."
 
 #: gajim/data/gui/gc_control_popup_menu.ui:38
-msgid "Configure _Room..."
-msgstr "Konfigurera _rum..."
+#, fuzzy
+msgid "Configure _Group Chat..."
+msgstr "Gå in i _gruppchatt..."
 
 #: gajim/data/gui/gc_control_popup_menu.ui:52
 #, fuzzy
-msgid "_Destroy Room"
-msgstr "Förstör %s"
+msgid "_Destroy Group Chat"
+msgstr "_Ny gruppchatt"
 
 #: gajim/data/gui/gc_control_popup_menu.ui:64
 msgid "_Minimize on close"
@@ -6019,7 +6048,7 @@ msgstr "_Minimera vid stängning"
 msgid "_Request Voice"
 msgstr "_Röst"
 
-#: gajim/data/gui/gc_control_popup_menu.ui:99 gajim/gtk/discovery.py:1704
+#: gajim/data/gui/gc_control_popup_menu.ui:99
 msgid "_Bookmark"
 msgstr "_Bokmärk"
 
@@ -6071,13 +6100,6 @@ msgstr "<b>Webbplats:</b>"
 msgid "E-Mail"
 msgstr "E-post:"
 
-#: 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/blocking_list.ui:115 gajim/gtk/add_contact.py:30
-#: gajim/gtk/accounts.py:801
-msgid "Jabber ID"
-msgstr "Jabber-ID"
-
 #: gajim/data/gui/profile_window.ui:440
 msgid "Main"
 msgstr ""
@@ -6212,35 +6234,42 @@ msgstr "Jobb"
 msgid "About"
 msgstr "Om"
 
-#: gajim/data/gui/start_chat_dialog.ui:114 gajim/gtk/discovery.py:1658
-msgid "Users"
-msgstr "Användare"
-
-#: gajim/data/gui/start_chat_dialog.ui:185
-msgid "Name:"
-msgstr "Namn:"
+#: gajim/data/gui/start_chat_dialog.ui:53
+#, fuzzy
+msgid "Global Group Chat Search"
+msgstr "Gå in i gruppchatt"
 
-#: gajim/data/gui/start_chat_dialog.ui:197
+#: 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
-msgid "Description:"
-msgstr "Beskrivning: "
+msgid "_Back"
+msgstr "Snart tillbaka"
+
+#: gajim/data/gui/start_chat_dialog.ui:245
+#: gajim/data/gui/groupchat_control.ui:796
+#: gajim/data/gui/groupchat_control.ui:888 gajim/gtk/discovery.py:1701
+#: gajim/gtk/groupchat_join.py:62
+msgid "_Join"
+msgstr "_Gå in i"
 
-#: gajim/data/gui/start_chat_dialog.ui:209
+#: gajim/data/gui/start_chat_dialog.ui:289
 #, fuzzy
-msgid "Address:"
-msgstr "_Adress:"
+msgid "Select Account"
+msgstr "Tar bort %s konto"
 
-#: gajim/data/gui/start_chat_dialog.ui:246
-msgid ""
-"Semi-Anonymous\n"
-"<span size=\"small\">(Only moderators can see your XMPP-Address)</span>"
+#: gajim/data/gui/start_chat_dialog.ui:380
+msgid "_Select"
 msgstr ""
 
 #: gajim/data/gui/filetransfers.ui:21
 msgid "Pa_use/Resume"
 msgstr ""
 
-#: gajim/data/gui/filetransfers.ui:30 gajim/gtk/filechoosers.py:178
+#: gajim/data/gui/filetransfers.ui:30 gajim/data/gui/groupchat_control.ui:575
+#: gajim/data/gui/groupchat_control.ui:667
+#: gajim/data/gui/groupchat_control.ui:779
+#: gajim/data/gui/groupchat_control.ui:871 gajim/gtk/filechoosers.py:178
 msgid "_Cancel"
 msgstr "_Avbryt"
 
@@ -6283,7 +6312,8 @@ msgstr ""
 "Avbryter den markerade filöverföringen och tar bort den ofullständiga filen"
 
 #: gajim/data/gui/filetransfers.ui:207
-msgid "Shows a list of file transfers between you and others"
+#, fuzzy
+msgid "Shows a list of file transfers between you and your contacts"
 msgstr "Visar en lista med filöverföringar mellan dig och andra"
 
 #: gajim/data/gui/groupchat_control.ui:13 gajim/data/gui/chat_control.ui:277
@@ -6303,7 +6333,6 @@ msgid "Strike"
 msgstr "Genomstruken"
 
 #: gajim/data/gui/groupchat_control.ui:54 gajim/data/gui/chat_control.ui:318
-#: gajim/gtk/advanced_config.py:86
 msgid "Color"
 msgstr "Färg"
 
@@ -6316,16 +6345,46 @@ msgstr "Typsnitt"
 msgid "Clear formatting"
 msgstr "Ingen formatering"
 
-#: gajim/data/gui/groupchat_control.ui:290 gajim/data/gui/chat_control.ui:880
+#: gajim/data/gui/groupchat_control.ui:291 gajim/data/gui/chat_control.ui:880
 #, fuzzy
 msgid "Choose encryption"
 msgstr "Välj fil att skicka..."
 
-#: gajim/data/gui/groupchat_control.ui:336 gajim/data/gui/chat_control.ui:640
+#: gajim/data/gui/groupchat_control.ui:337 gajim/data/gui/chat_control.ui:640
 #, fuzzy
 msgid "Show a list of emojis (Alt+M)"
 msgstr "Visa en lista över känsloikoner (Alt+M)"
 
+#: gajim/data/gui/groupchat_control.ui:484
+#, fuzzy
+msgid "Joining…"
+msgstr "Bannlyser..."
+
+#: gajim/data/gui/groupchat_control.ui:496
+msgid "_Abort"
+msgstr ""
+
+#: gajim/data/gui/groupchat_control.ui:542
+#, fuzzy
+msgid "Enter new nickname"
+msgstr "E_fter smeknamn:"
+
+#: gajim/data/gui/groupchat_control.ui:592
+#: gajim/data/gui/groupchat_control.ui:684
+#, fuzzy
+msgid "Ch_ange"
+msgstr "Byt smek_namn..."
+
+#: gajim/data/gui/groupchat_control.ui:761
+#, fuzzy
+msgid "Enter password"
+msgstr "Ange nytt lösenord:"
+
+#: gajim/data/gui/groupchat_control.ui:1067
+#, fuzzy
+msgid "_Try again"
+msgstr "Verifiera igen..."
+
 #: gajim/data/gui/popup_notification_window.ui:42
 #, fuzzy
 msgid "Event Type"
@@ -6407,8 +6466,8 @@ msgstr "Frånvarande"
 
 #: gajim/data/gui/mam_preferences.ui:18
 #, fuzzy
-msgid "Roster"
-msgstr "Visa _kontaktlista"
+msgid "Contact List"
+msgstr "Kontakter"
 
 #: gajim/data/gui/mam_preferences.ui:22
 #: gajim/data/gui/preferences_window.ui:123
@@ -6433,12 +6492,12 @@ msgid "Add"
 msgstr "Lägg till"
 
 #: gajim/data/gui/mam_preferences.ui:194 gajim/data/gui/groupchat_config.ui:151
-#: gajim/gtk/dialogs.py:63 gajim/gtk/accounts.py:381
+#: gajim/gtk/dialogs.py:62 gajim/gtk/accounts.py:384
 #, fuzzy
 msgid "Remove"
 msgstr "Ta _bort"
 
-#: gajim/data/gui/vcard_information_window.ui:72 gajim/gtk/accounts.py:753
+#: gajim/data/gui/vcard_information_window.ui:72 gajim/gtk/accounts.py:756
 #, fuzzy
 msgid "Resource"
 msgstr "Resurs:"
@@ -6491,6 +6550,7 @@ msgstr "Prenumeration:"
 #: gajim/data/gui/vcard_information_window.ui:974
 #: gajim/data/gui/vcard_information_window.ui:993
 #: gajim/data/gui/vcard_information_window.ui:1427
+#: gajim/data/gui/groupchat_info_scrolled.ui:222
 msgid "button"
 msgstr ""
 
@@ -6523,15 +6583,15 @@ msgstr "_Notifiera mig om det"
 
 #: gajim/data/gui/preferences_window.ui:58
 #, fuzzy
-msgid "Show only in roster"
-msgstr "Visa enbart i _registret"
+msgid "Show only in contact list"
+msgstr "Visa endast _aktiva kontakter"
 
 #: gajim/data/gui/preferences_window.ui:69
-msgid "Detached roster with detached chats"
+msgid "Detached contact list with detached chats"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:72
-msgid "Detached roster with single chat"
+msgid "Detached contact list with single chat"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:75
@@ -6539,11 +6599,11 @@ msgid "Single window for everything"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:78
-msgid "Detached roster with chat grouped by account"
+msgid "Detached contact list with chat grouped by account"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:81
-msgid "Detached roster with chat grouped by type"
+msgid "Detached contact list with chat grouped by type"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:92
@@ -6599,7 +6659,7 @@ msgstr "_Fönsterbeteende:"
 
 #: gajim/data/gui/preferences_window.ui:296
 #, fuzzy
-msgid "_Show roster on startup"
+msgid "_Show contact list on startup"
 msgstr "Visa registerfönstret när Gajim startar"
 
 #: gajim/data/gui/preferences_window.ui:311
@@ -6615,12 +6675,12 @@ msgid "_Tabs placement"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:363
-msgid "_Quit Gajim when closing roster window"
+msgid "_Quit Gajim when closing contact list"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:367
 msgid ""
-"If enabled, Gajim will quit when closing the roster window instead of "
+"If enabled, Gajim will quit when closing the contact list window instead of "
 "minimizing to the system's notification area"
 msgstr ""
 
@@ -6630,41 +6690,42 @@ msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:423
 #, fuzzy
-msgid "Show a_vatars of contacts in roster"
+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
 #, fuzzy
 msgid ""
-"If checked, avatars of contacts will be shown in the roster window and in "
-"group chats"
+"If checked, avatars of contacts will be shown in the contact list window and "
+"in group chats"
 msgstr ""
 "Om kryssad kommer Gajim att visa avatarer för kontakter i kontaktfönster och "
 "gruppchattar"
 
 #: gajim/data/gui/preferences_window.ui:441
 #, fuzzy
-msgid "Show status _messages of contacts in roster"
+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
 #, fuzzy
 msgid ""
 "If checked, status messages of contacts will be shown under the contact's "
-"name, in the roster window, and in group chats"
+"name, in the contact list window, and in group chats"
 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
 #, fuzzy
-msgid "Show e_xtra information of contacts in roster (mood, activity, ...)"
+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
 msgid ""
-"If checked, additional info published by the contact will be shown in "
-"roster. Additional infos (published via PEP) may include e.g. mood, "
+"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 ""
 
@@ -6673,8 +6734,9 @@ msgid "Sort contacts by status"
 msgstr "Sortera kontakter efter status"
 
 #: gajim/data/gui/preferences_window.ui:494
-msgid "in _roster"
-msgstr "i _kontaktlista"
+#, fuzzy
+msgid "in _contact list"
+msgstr "Bjud in _kontakter"
 
 #: gajim/data/gui/preferences_window.ui:511
 msgid "in _group chats"
@@ -6682,8 +6744,8 @@ msgstr "i _gruppchattar"
 
 #: gajim/data/gui/preferences_window.ui:540
 #, fuzzy
-msgid "Roster Appearance"
-msgstr "<b>Kontaktlistans utseende</b>"
+msgid "Contact List Appearance"
+msgstr "Kontakt loggade ut"
 
 #: gajim/data/gui/preferences_window.ui:585
 #, fuzzy
@@ -6745,7 +6807,7 @@ msgstr "Kunde inte gå in i gruppchatt"
 
 #: gajim/data/gui/preferences_window.ui:660
 #, fuzzy
-msgid "If checked, the room subject will be shown when joining a group chat"
+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:682
@@ -6760,13 +6822,13 @@ msgstr ""
 #: gajim/data/gui/preferences_window.ui:701
 msgid ""
 "If join/leave status messages are shown in the group chat. This setting can "
-"be overridden in the groupchat menu."
+"be overridden in the group chat menu."
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:720
 msgid ""
 "The default sync threshold for new public group chats. This setting can be "
-"overridden in the groupchat menu."
+"overridden in the group chat menu."
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:722
@@ -6781,7 +6843,7 @@ msgstr "_Logga statusändringar för kontakter"
 #: gajim/data/gui/preferences_window.ui:768
 msgid ""
 "If status change messages are shown in the group chat. This setting can be "
-"overridden in the groupchat menu."
+"overridden in the group chat menu."
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:825
@@ -6800,8 +6862,8 @@ msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:843
 #, fuzzy
-msgid "Show chatstate in roster"
-msgstr "Visa a_vatarer för kontakter i kontaktlista"
+msgid "Show chatstate in contact list"
+msgstr "Visa stängningsknapp i flik?"
 
 #: gajim/data/gui/preferences_window.ui:847
 msgid ""
@@ -7096,7 +7158,7 @@ msgstr ""
 msgid "Vi_ew own video source"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2281 gajim/gtk/accounts.py:352
+#: gajim/data/gui/preferences_window.ui:2281 gajim/gtk/accounts.py:355
 msgid "Connection"
 msgstr "Anslutning"
 
@@ -7150,7 +7212,8 @@ msgid "_Manage..."
 msgstr "_Hantera..."
 
 #: gajim/data/gui/preferences_window.ui:2616
-msgid "_Log status changes of contacts"
+#, fuzzy
+msgid "_Store status changes of contacts in history"
 msgstr "_Logga statusändringar för kontakter"
 
 #: gajim/data/gui/preferences_window.ui:2633
@@ -7175,10 +7238,15 @@ msgstr ""
 msgid "_Open..."
 msgstr "_Öppna..."
 
+#: gajim/data/gui/preferences_window.ui:2723 gajim/gtk/advanced_config.py:84
+#, fuzzy
+msgid "Advanced Configuration Editor (ACE)"
+msgstr "Avancerad konfigurationsredigerare"
+
 #: gajim/data/gui/groupchat_config.ui:55
 #, fuzzy
 msgid ""
-"<b>Jabber-ID</b>\n"
+"<b>XMPP Address</b>\n"
 "&lt;user@domain/resource&gt; (only that resource matches)\n"
 "&lt;user@domain&gt; (any resource matches)\n"
 "&lt;domain/resource&gt; (only that resource matches)\n"
@@ -7197,7 +7265,8 @@ msgstr ""
 msgid "Only Admins and Owners can modify the affiliation"
 msgstr ""
 
-#: gajim/data/gui/groupchat_config.ui:270 gajim/plugins/gui.py:312
+#: gajim/data/gui/groupchat_config.ui:270
+#: gajim/data/gui/groupchat_info_scrolled.ui:210 gajim/plugins/gui.py:324
 #, fuzzy
 msgid "Configuration"
 msgstr "Rumkonfiguration"
@@ -7230,7 +7299,7 @@ msgid "Start _Chat"
 msgstr "Starta _chatt"
 
 #: gajim/data/gui/contact_context_menu.ui:20
-#: gajim/data/gui/systray_context_menu.ui:36
+#: gajim/data/gui/systray_context_menu.ui:29
 msgid "Send Single _Message..."
 msgstr "Skicka ett _meddelande"
 
@@ -7292,17 +7361,45 @@ msgid "_Ignore"
 msgstr "_Ignorera"
 
 #: gajim/data/gui/contact_context_menu.ui:174
-msgid "_Add to Roster..."
-msgstr "_Lägg till i kontaktlista..."
+#, fuzzy
+msgid "_Add to Contact List..."
+msgstr "_Lägg till kontakt..."
+
+#: gajim/data/gui/advanced_configuration.ui:39
+#, fuzzy
+msgid "You should restart Gajim for some changes to take effect"
+msgstr ""
+"<b>OBSERVERA:</b> Du bör starta om Gajim för att vissa inställningar ska bli "
+"aktiva"
+
+#: gajim/data/gui/advanced_configuration.ui:71
+#, fuzzy
+msgid "_Filter"
+msgstr "_Filter:"
+
+#: gajim/data/gui/advanced_configuration.ui:88
+msgid "Type to search for values..."
+msgstr ""
+
+#: gajim/data/gui/advanced_configuration.ui:180
+#, fuzzy
+msgid "_Reset Value"
+msgstr "_Återställ till standardfärger"
+
+#: gajim/data/gui/advanced_configuration.ui:185
+#, fuzzy
+msgid "Resets value to default"
+msgstr "_Återställ till standardfärger"
 
 #: gajim/data/gui/account_creation_wizard_window.ui:43
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim: Kontoskaparen"
 
 #: gajim/data/gui/account_creation_wizard_window.ui:70
+#, fuzzy
 msgid ""
 "You need to have an account in order to connect\n"
-"to the Jabber network."
+"to the XMPP network."
 msgstr ""
 "Du behöver ha ett konto för att kunna ansluta till\n"
 "Jabber-nätverket."
@@ -7324,8 +7421,9 @@ msgid "<b>Please fill in the data for your existing account</b>"
 msgstr "<b>Fyll i informationen för ditt befintliga konto</b>"
 
 #: gajim/data/gui/account_creation_wizard_window.ui:187
-msgid "_Jabber ID:"
-msgstr "_Jabber-ID:"
+#, fuzzy
+msgid "_XMPP Address:"
+msgstr "AIM-adress:"
 
 #: gajim/data/gui/account_creation_wizard_window.ui:239
 #: gajim/data/gui/account_creation_wizard_window.ui:394
@@ -7412,6 +7510,7 @@ msgid "Privacy Lists:"
 msgstr "Integritetslistor:"
 
 #: gajim/data/gui/service_discovery_window.ui:111
+#: gajim/data/gui/groupchat_creation.ui:227
 #, fuzzy
 msgid "_Address"
 msgstr "_Adress:"
@@ -7429,11 +7528,6 @@ msgstr "Synkronisera : välj kontakter"
 msgid "Select the contacts you want to synchronise"
 msgstr "Välj kontakterna som du vill synkronisera"
 
-#: gajim/data/gui/groupchat_invitation_received.ui:42
-#, fuzzy
-msgid "Group Chat Invitation"
-msgstr "Inbjudan till Gruppchatt"
-
 #: gajim/data/gui/groupchat_invitation_received.ui:111
 #, fuzzy
 msgid "Message..."
@@ -7484,11 +7578,10 @@ msgstr ""
 
 #: gajim/data/gui/add_new_contact_window.ui:84
 #, fuzzy
-msgid "_Jabber ID"
-msgstr "_Jabber-ID:"
+msgid "_XMPP Address"
+msgstr "_Adress:"
 
 #: gajim/data/gui/add_new_contact_window.ui:100
-#: gajim/data/gui/manage_bookmarks_window.ui:192
 #, fuzzy
 msgid "_Nickname"
 msgstr "_Smeknamn:"
@@ -7566,7 +7659,7 @@ msgstr "<b>Humör:</b>"
 msgid "<b>Message:</b>"
 msgstr "<b>Meddelande:</b>"
 
-#: gajim/data/gui/plugins_window.ui:10 gajim/data/gui/application_menu.ui:90
+#: gajim/data/gui/plugins_window.ui:10 gajim/data/gui/application_menu.ui:87
 msgid "Plugins"
 msgstr ""
 
@@ -7675,10 +7768,6 @@ msgstr "Tillåt"
 msgid "Deny"
 msgstr "Neka"
 
-#: gajim/data/gui/privacy_list_window.ui:317
-msgid "JabberID"
-msgstr "JabberID"
-
 #: gajim/data/gui/privacy_list_window.ui:358
 msgid "all in the group"
 msgstr "alla i gruppen"
@@ -7721,7 +7810,7 @@ msgstr "Ordning:"
 msgid "Manage sounds"
 msgstr "Hantera konton"
 
-#: gajim/data/gui/manage_sounds_window.ui:55 gajim/plugins/gui.py:100
+#: gajim/data/gui/manage_sounds_window.ui:55 gajim/plugins/gui.py:101
 msgid "Active"
 msgstr "Aktiv"
 
@@ -7759,23 +7848,115 @@ msgstr "Ta bort kontot från Gajim och från _servern"
 msgid "_Personal Events"
 msgstr "_Personliga händelser"
 
-#: gajim/data/gui/account_context_menu.ui:35
-#: gajim/data/gui/systray_context_menu.ui:28
-msgid "Join _Group Chat"
-msgstr "Gå in i _gruppchatt"
-
-#: gajim/data/gui/account_context_menu.ui:49
+#: gajim/data/gui/account_context_menu.ui:41
 msgid "_Add Contact..."
 msgstr "_Lägg till kontakt..."
 
-#: gajim/data/gui/account_context_menu.ui:57
+#: gajim/data/gui/account_context_menu.ui:49
 msgid "_Discover Services"
 msgstr "_Upptäck tjänster"
 
-#: gajim/data/gui/account_context_menu.ui:65
+#: gajim/data/gui/account_context_menu.ui:57
 msgid "_Execute Command..."
 msgstr "_Kör kommando..."
 
+#: gajim/data/gui/account_context_menu.ui:65
+#, fuzzy
+msgid "_View Certificate"
+msgstr "Självsignerat certifikat"
+
+#: gajim/data/gui/manage_proxies.ui:12
+#, fuzzy
+msgctxt "proxy configuration"
+msgid "HTTP Connect"
+msgstr ""
+"HTTP Connect\n"
+"SOCKS5\n"
+"BOSH"
+
+#: gajim/data/gui/manage_proxies.ui:15
+msgctxt "proxy configuration"
+msgid "SOCKS5"
+msgstr ""
+
+#: gajim/data/gui/manage_proxies.ui:18
+#, fuzzy
+msgctxt "proxy configuration"
+msgid "BOSH"
+msgstr "_BOSH URL:"
+
+#: gajim/data/gui/manage_proxies.ui:68
+#, fuzzy
+msgid "Add Proxy"
+msgstr "Proxyserver:"
+
+#: gajim/data/gui/manage_proxies.ui:82
+#, fuzzy
+msgid "Remove Proxy"
+msgstr "Ta bort grupp"
+
+#: gajim/data/gui/manage_proxies.ui:134
+#, fuzzy
+msgid "Pass_word"
+msgstr "Lösen_ord:"
+
+#: gajim/data/gui/manage_proxies.ui:159
+msgid "Use proxy auth_entication"
+msgstr "Använd autentiser_ing för proxyserver"
+
+#: gajim/data/gui/manage_proxies.ui:179
+#, fuzzy
+msgid "_Username"
+msgstr "_Användarnamn:"
+
+#: gajim/data/gui/manage_proxies.ui:209
+#, fuzzy
+msgid "_Port"
+msgstr "_Port:"
+
+#: gajim/data/gui/manage_proxies.ui:226
+msgid "example.org"
+msgstr ""
+
+#: gajim/data/gui/manage_proxies.ui:240
+#, fuzzy
+msgid "_Host"
+msgstr "_Värd:"
+
+#: gajim/data/gui/manage_proxies.ui:254
+msgid "Use HTTP prox_y"
+msgstr "Använd HTTP-prox_y"
+
+#: gajim/data/gui/manage_proxies.ui:275
+msgid "https://example.org/http-bind/"
+msgstr ""
+
+#: gajim/data/gui/manage_proxies.ui:291
+#, fuzzy
+msgid "_BOSH URL"
+msgstr "_BOSH URL:"
+
+#: gajim/data/gui/manage_proxies.ui:309 gajim/gtk/adhoc.py:322
+#, fuzzy
+msgid "Settings"
+msgstr "Registreringen misslyckades"
+
+#: gajim/data/gui/manage_proxies.ui:344
+#, fuzzy
+msgid "_Type"
+msgstr "_Typ:"
+
+#: gajim/data/gui/manage_proxies.ui:361
+#: gajim/data/gui/groupchat_creation.ui:105
+#, fuzzy
+msgid "_Name"
+msgstr "_Namn:"
+
+#: gajim/data/gui/manage_proxies.ui:391 gajim/gtk/accounts.py:742
+#, fuzzy
+msgid "Proxy"
+msgstr "Proxyserver:"
+
 #: gajim/data/gui/application_menu.ui:8
 #, fuzzy
 msgid "View"
@@ -7783,8 +7964,8 @@ msgstr "_Visa"
 
 #: gajim/data/gui/application_menu.ui:11
 #, fuzzy
-msgid "Show Roster"
-msgstr "Visa _kontaktlista"
+msgid "Show Contact List"
+msgstr "Visa endast _aktiva kontakter"
 
 #: gajim/data/gui/application_menu.ui:16
 #, fuzzy
@@ -7825,23 +8006,24 @@ msgstr ""
 msgid "Features"
 msgstr "Funktioner"
 
-#: gajim/data/gui/application_menu.ui:81
+#: gajim/data/gui/application_menu.ui:77
+#: gajim/data/gui/groupchat_creation.ui:81 gajim/gtk/groupchat_creation.py:45
 #, fuzzy
-msgid "Bookmarks"
-msgstr "_Bokmärk"
+msgid "Create Group Chat"
+msgstr "Lämna gruppchattar"
 
-#: gajim/data/gui/application_menu.ui:94 gajim/data/gui/shortcuts_window.ui:189
-#: gajim/gtk/preferences.py:59
+#: gajim/data/gui/application_menu.ui:91 gajim/data/gui/shortcuts_window.ui:189
+#: gajim/gtk/preferences.py:58
 msgid "Preferences"
 msgstr "Inställningar"
 
-#: gajim/data/gui/application_menu.ui:99
+#: gajim/data/gui/application_menu.ui:96
 #, fuzzy
 msgid "Quit"
 msgstr "A_vsluta"
 
 #: gajim/data/gui/httpupload_progress_dialog.ui:110
-#: gajim/gtk/filetransfer.py:121
+#: gajim/gtk/filetransfer.py:120
 msgid "Progress"
 msgstr "Förlopp"
 
@@ -7858,52 +8040,33 @@ msgstr ""
 msgid "_Cancel Upload"
 msgstr "_Avbryt"
 
-#: gajim/data/gui/manage_bookmarks_window.ui:13
-#, fuzzy
-msgid "Group Chat Bookmarks"
-msgstr "Gruppchatt"
-
-#: gajim/data/gui/manage_bookmarks_window.ui:68
-#, fuzzy
-msgid "Add Bookmark"
-msgstr "_Bokmärk"
-
-#: gajim/data/gui/manage_bookmarks_window.ui:82
-#, fuzzy
-msgid "Remove Bookmark"
-msgstr "_Bokmärk"
+#: gajim/data/gui/groupchat_creation.ui:27
+msgid "Public or Private?"
+msgstr ""
 
-#: gajim/data/gui/manage_bookmarks_window.ui:126
-msgid "N_ame"
+#: 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 ""
 
-#: gajim/data/gui/manage_bookmarks_window.ui:145
-#, fuzzy
-msgid "Bookmark Name"
-msgstr "Bokmärk detta rum (Ctrl+B)"
+#: gajim/data/gui/groupchat_creation.ui:58
+msgid "<b>Public:</b> Anyone who knows the address can join."
+msgstr ""
 
-#: gajim/data/gui/manage_bookmarks_window.ui:160
+#: gajim/data/gui/groupchat_creation.ui:122
 #, fuzzy
-msgid "_Server"
-msgstr "_Server:"
+msgid "_Description"
+msgstr "Beskrivning"
 
-#: gajim/data/gui/manage_bookmarks_window.ui:223
-msgid "Roo_m"
+#: gajim/data/gui/groupchat_creation.ui:164
+msgid "_Public"
 msgstr ""
 
-#: gajim/data/gui/manage_bookmarks_window.ui:253
+#: gajim/data/gui/groupchat_creation.ui:278
 #, fuzzy
-msgid "_Password"
-msgstr "_Lösenord:"
-
-#: gajim/data/gui/manage_bookmarks_window.ui:299
-#, fuzzy
-msgid "Join chat when connected"
-msgstr "Kontakt loggade ut"
-
-#: gajim/data/gui/manage_bookmarks_window.ui:307
-msgid "_Join Automatically"
-msgstr ""
+msgid "_Account"
+msgstr "K_onton"
 
 #: gajim/data/gui/exception_dialog.ui:49
 msgid "Sorry, that should not have happened"
@@ -7948,6 +8111,28 @@ msgstr "Auktorisera kontakt så att han eller hon vet när du är ansluten"
 msgid "Presets"
 msgstr "_Närvaro"
 
+#: gajim/data/gui/groupchat_info_scrolled.ui:32
+msgid "Address"
+msgstr "Adress"
+
+#: gajim/data/gui/groupchat_info_scrolled.ui:64
+msgid "Topic"
+msgstr ""
+
+#: gajim/data/gui/groupchat_info_scrolled.ui:80
+#, fuzzy
+msgid "Author"
+msgstr "Au_ktorisera"
+
+#: gajim/data/gui/groupchat_info_scrolled.ui:182
+msgid "Discussion Logs"
+msgstr ""
+
+#: gajim/data/gui/groupchat_info_scrolled.ui:260
+#, fuzzy
+msgid "Group Chat Language"
+msgstr "Inbjudan till Gruppchatt"
+
 #: gajim/data/gui/emoji_chooser.ui:98
 #, fuzzy
 msgid "No Results Found"
@@ -7960,24 +8145,35 @@ msgstr "Bjud in vänner!"
 #: gajim/data/gui/chat_to_muc_window.ui:39
 #, fuzzy
 msgid ""
-"You are now entering a groupchat.\n"
+"You are now entering a group chat.\n"
 "Select the contacts you want to invite"
 msgstr ""
 "Du är på väg att påbörja en fleranvändarchatt.\n"
 "Välj kontakterna som du vill bjuda in"
 
 #: gajim/data/gui/chat_to_muc_window.ui:112
-msgid "Please select a MUC server."
+#, fuzzy
+msgid "Please select a group chat server."
 msgstr "Välj en MUC-server."
 
 #: gajim/data/gui/chat_to_muc_window.ui:141
-msgid "MUC server"
-msgstr "MUC-server"
+#, fuzzy
+msgid "Group chat server"
+msgstr "Gruppchattar"
 
 #: gajim/data/gui/chat_to_muc_window.ui:176
 msgid "In_vite"
 msgstr "Bjud _in"
 
+#: gajim/data/gui/bookmarks.ui:176
+#, fuzzy
+msgid "Autojoin"
+msgstr "Anslut automatiskt"
+
+#: gajim/data/gui/bookmarks.ui:211
+msgid "_Apply"
+msgstr ""
+
 #: gajim/data/gui/history_manager.ui:11
 #, fuzzy
 msgid "_Export"
@@ -7993,12 +8189,13 @@ msgid "Gajim History Logs Manager"
 msgstr "Gajims hanterare för historikloggar"
 
 #: gajim/data/gui/history_manager.ui:108
+#, fuzzy
 msgid ""
-"This log manager is not intended for log viewing. If you are looking for "
-"such functionality, use the history window instead.\n"
+"This history manager is not intended for viewing chat history. If you are "
+"looking for such functionality, please use the history window instead.\n"
 "\n"
-"Use this program to delete or export logs. You can select logs from the left "
-"and/or search database from below."
+"You can use this program to delete or export history. Either select logs "
+"from the left or search the database."
 msgstr ""
 "Denna logghanterare är inte tänkt för loggvisning. Om du letar efter sådan "
 "funktionalitet så bör du använda historikfönstret istället.\n"
@@ -8051,8 +8248,9 @@ msgid "Select an emoji"
 msgstr "Använd _känsloikoner"
 
 #: gajim/data/gui/shortcuts_window.ui:38
-msgid "Complete a command or a nick"
-msgstr ""
+#, fuzzy
+msgid "Complete a command or a nickname"
+msgstr "Skapa ett nytt, tomt tema med ditt önskade namn."
 
 #: gajim/data/gui/shortcuts_window.ui:45
 #, fuzzy
@@ -8092,7 +8290,7 @@ msgstr ""
 msgid "Scroll down"
 msgstr ""
 
-#: gajim/data/gui/shortcuts_window.ui:100 gajim/gtk/xml_console.py:72
+#: gajim/data/gui/shortcuts_window.ui:100 gajim/gtk/xml_console.py:69
 #, fuzzy
 msgid "Clear"
 msgstr "Städar"
@@ -8134,8 +8332,9 @@ msgid "Close chat"
 msgstr ""
 
 #: gajim/data/gui/shortcuts_window.ui:173
-msgid "Roster Shortcuts"
-msgstr ""
+#, fuzzy
+msgid "Contact List Shortcuts"
+msgstr "Kontakt loggade ut"
 
 #: gajim/data/gui/shortcuts_window.ui:196
 #, fuzzy
@@ -8168,7 +8367,7 @@ msgid "Show only active contacts"
 msgstr "Visa endast _aktiva kontakter"
 
 #: gajim/data/gui/shortcuts_window.ui:251
-msgid "Enable roster filtering"
+msgid "Enable contact list filtering"
 msgstr ""
 
 #: gajim/data/gui/shortcuts_window.ui:259
@@ -8215,12 +8414,12 @@ msgstr ""
 
 #: gajim/data/gui/history_window.ui:317
 #, fuzzy
-msgid "Record history for this chat"
+msgid "Store history for this chat"
 msgstr "Ignorera detta fel med certifikatet."
 
 #: gajim/data/gui/history_window.ui:332
 #, fuzzy
-msgid "Record History"
+msgid "Store History"
 msgstr "Logghistorik"
 
 #: gajim/data/gui/history_window.ui:350
@@ -8241,9 +8440,10 @@ msgstr "Skapa ny post"
 msgid "Fill in the form."
 msgstr "Fyll i formuläret."
 
-#: gajim/data/gui/data_form_window.ui:229
-msgid "Room Configuration"
-msgstr "Rumkonfiguration"
+#: gajim/data/gui/data_form_window.ui:229 gajim/gtk/groupchat_config.py:41
+#, fuzzy
+msgid "Group Chat Configuration"
+msgstr "Inbjudan till Gruppchatt"
 
 #: gajim/data/gui/roster_item_exchange_window.ui:39
 #: gajim/gtk/roster_item_exchange.py:35
@@ -8264,15 +8464,15 @@ msgstr "Sta_tus"
 msgid "_Start Chat..."
 msgstr "_Starta chatt..."
 
-#: gajim/data/gui/systray_context_menu.ui:50
+#: gajim/data/gui/systray_context_menu.ui:43
 msgid "Show All Pending _Events"
 msgstr "Visa alla väntande _händelser"
 
-#: gajim/data/gui/systray_context_menu.ui:59
+#: gajim/data/gui/systray_context_menu.ui:52
 msgid "Mute Sounds"
 msgstr "Inga ljud"
 
-#: gajim/data/gui/systray_context_menu.ui:75
+#: gajim/data/gui/systray_context_menu.ui:68
 #, fuzzy
 msgid "_Preferences"
 msgstr "Inställningar"
@@ -8364,34 +8564,34 @@ msgstr ""
 msgid "Execute expression inside a shell, send output"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:45
+#: gajim/command_system/implementation/standard.py:47
 msgid ""
 "Show help on a given command or a list of available commands if -a is given"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:73
+#: gajim/command_system/implementation/standard.py:75
 #, fuzzy
 msgid "Send a message to the contact"
 msgstr "Användning: /%s, skickar meddelandet till kontakten"
 
-#: gajim/command_system/implementation/standard.py:78
+#: gajim/command_system/implementation/standard.py:80
 msgid "Send action (in the third person) to the current chat"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:83
+#: gajim/command_system/implementation/standard.py:85
 msgid "Show logged messages which mention given text"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:88
+#: gajim/command_system/implementation/standard.py:90
 #, fuzzy, python-format
 msgid "%s: Nothing found"
 msgstr "%s kunde inte hittas"
 
-#: gajim/command_system/implementation/standard.py:94
+#: gajim/command_system/implementation/standard.py:96
 msgid "Limit must be an integer"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:118
+#: gajim/command_system/implementation/standard.py:120
 msgid ""
 "\n"
 "    Set the current status\n"
@@ -8401,132 +8601,132 @@ msgid ""
 "    "
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:136
+#: gajim/command_system/implementation/standard.py:138
 msgid "Set the current status to away"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:150
+#: gajim/command_system/implementation/standard.py:152
 msgid "Set the current status to online"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:153
+#: gajim/command_system/implementation/standard.py:155
 #, fuzzy
 msgid "Available"
 msgstr "_Tillgänglig"
 
-#: gajim/command_system/implementation/standard.py:173
-#: gajim/command_system/implementation/standard.py:250
+#: gajim/command_system/implementation/standard.py:175
+#: gajim/command_system/implementation/standard.py:252
 #, fuzzy
 msgid "Clear the text window"
 msgstr "Användning: /%s, tömmer textfönstret."
 
-#: gajim/command_system/implementation/standard.py:178
-#: gajim/command_system/implementation/standard.py:397
+#: gajim/command_system/implementation/standard.py:180
+#: gajim/command_system/implementation/standard.py:401
 #, fuzzy
 msgid "Send a ping to the contact"
 msgstr "Användning: /%s, skickar en ping till kontakten"
 
-#: gajim/command_system/implementation/standard.py:181
-#: gajim/command_system/implementation/standard.py:400
+#: gajim/command_system/implementation/standard.py:183
+#: gajim/command_system/implementation/standard.py:404
 #, fuzzy
 msgid "Command is not supported for zeroconf accounts"
 msgstr "Kommandot stöds inte för zeroconf-konto."
 
-#: gajim/command_system/implementation/standard.py:185
-msgid "Send DTMF sequence through an open audio session"
+#: gajim/command_system/implementation/standard.py:187
+msgid "Send DTMF sequence through an open voice chat"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:188
+#: gajim/command_system/implementation/standard.py:190
 #, fuzzy
-msgid "No open audio sessions with the contact"
+msgid "No open voice chats with the contact"
 msgstr "Klicka för att visa tidigare konversationer med den här kontakten"
 
-#: gajim/command_system/implementation/standard.py:191
+#: gajim/command_system/implementation/standard.py:193
 #, fuzzy, python-format
 msgid "%s is not a valid tone"
 msgstr "%s är inte en giltig loggnivå"
 
-#: gajim/command_system/implementation/standard.py:198
-msgid "Toggle audio session"
+#: gajim/command_system/implementation/standard.py:200
+msgid "Toggle Voice Chat"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:201
+#: gajim/command_system/implementation/standard.py:203
 #, fuzzy
-msgid "Audio sessions are not available"
+msgid "Voice chats are not available"
 msgstr "Sessionsbus inte tillgänglig"
 
-#: gajim/command_system/implementation/standard.py:208
-msgid "Toggle video session"
+#: gajim/command_system/implementation/standard.py:210
+msgid "Toggle Video Chat"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:211
+#: gajim/command_system/implementation/standard.py:213
 #, fuzzy
-msgid "Video sessions are not available"
+msgid "Video chats are not available"
 msgstr "Sessionsbus inte tillgänglig"
 
-#: gajim/command_system/implementation/standard.py:218
+#: gajim/command_system/implementation/standard.py:220
 #, fuzzy
 msgid "Send a message to the contact that will attract their attention"
 msgstr "Användning: /%s, skickar meddelandet till kontakten"
 
-#: gajim/command_system/implementation/standard.py:255
+#: gajim/command_system/implementation/standard.py:257
 #, fuzzy
 msgid "Change your nickname in a group chat"
 msgstr "Ändra ditt smeknamn (Ctrl+N)"
 
-#: gajim/command_system/implementation/standard.py:260 gajim/gtk/dialogs.py:674
-#: gajim/gtk/bookmarks.py:272
+#: gajim/command_system/implementation/standard.py:262
 msgid "Invalid nickname"
 msgstr "Ogiltigt smeknamn"
 
-#: gajim/command_system/implementation/standard.py:267
+#: gajim/command_system/implementation/standard.py:269
 #, fuzzy
-msgid "Open a private chat window with a specified occupant"
+msgid "Open a private chat window with a specified participant"
 msgstr ""
 "Användning: /%s <smeknamn>, öppnar ett privat chattfönster med den angivna "
 "deltagaren."
 
-#: gajim/command_system/implementation/standard.py:273
-#: gajim/command_system/implementation/standard.py:282
-#: gajim/command_system/implementation/standard.py:332
-#: gajim/command_system/implementation/standard.py:345
-#: gajim/command_system/implementation/standard.py:357
+#: gajim/command_system/implementation/standard.py:275
+#: gajim/command_system/implementation/standard.py:284
+#: gajim/command_system/implementation/standard.py:336
+#: gajim/command_system/implementation/standard.py:349
+#: gajim/command_system/implementation/standard.py:361
 msgid "Nickname not found"
 msgstr "Smeknamnet hittades inte"
 
-#: gajim/command_system/implementation/standard.py:276
+#: gajim/command_system/implementation/standard.py:278
 #, fuzzy
 msgid ""
-"Open a private chat window with a specified occupant and send him a message"
+"Open a private chat window with a specified participant and send him a "
+"message"
 msgstr ""
 "Användning: /%s <smeknamn>, öppnar ett privat chattfönster med den angivna "
 "deltagaren."
 
-#: gajim/command_system/implementation/standard.py:285
+#: gajim/command_system/implementation/standard.py:287
 #, fuzzy
 msgid "Display or change a group chat topic"
 msgstr "Fråga innan gruppchattflik eller -fönster stängs."
 
-#: gajim/command_system/implementation/standard.py:294
-msgid "Invite a user to a room for a reason"
+#: gajim/command_system/implementation/standard.py:296
+msgid "Invite a user to a group chat for a reason"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:297
+#: gajim/command_system/implementation/standard.py:299
 #, fuzzy, python-format
 msgid "Invited %(jid)s to %(room_jid)s"
 msgstr "Bjöd in %(contact_jid)s till %(room_jid)s."
 
-#: gajim/command_system/implementation/standard.py:301
+#: gajim/command_system/implementation/standard.py:303
 #, fuzzy
-msgid "Join a group chat given by a JID"
+msgid "Join a group chat given by an XMPP Address"
 msgstr "i _gruppchattar"
 
-#: gajim/command_system/implementation/standard.py:309
+#: gajim/command_system/implementation/standard.py:313
 msgid ""
-"Leave the groupchat, optionally giving a reason, and close tab or window"
+"Leave the group chat, optionally giving a reason, and close tab or window"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:314
+#: gajim/command_system/implementation/standard.py:318
 msgid ""
 "\n"
 "    Ban user by a nick or a JID from a groupchat\n"
@@ -8535,46 +8735,46 @@ msgid ""
 "    "
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:329
+#: gajim/command_system/implementation/standard.py:333
 #, fuzzy
-msgid "Kick user by a nick from a groupchat"
+msgid "Kick user by a nick from a group chat"
 msgstr "Du är inbjuden till en gruppchatt"
 
-#: gajim/command_system/implementation/standard.py:338
+#: gajim/command_system/implementation/standard.py:342
 msgid ""
-"Set occupant role in group chat.\n"
+"Set participant role in group chat.\n"
 "    Role can be given as one of the following values:\n"
 "    moderator, participant, visitor, none"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:343
+#: gajim/command_system/implementation/standard.py:347
 #, fuzzy
 msgid "Invalid role given"
 msgstr "Ogiltig server"
 
-#: gajim/command_system/implementation/standard.py:350
+#: gajim/command_system/implementation/standard.py:354
 msgid ""
-"Set occupant affiliation in group chat.\n"
+"Set participant affiliation in group chat.\n"
 "    Affiliation can be given as one of the following values:\n"
 "    owner, admin, member, outcast, none"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:355
+#: gajim/command_system/implementation/standard.py:359
 #, fuzzy
 msgid "Invalid affiliation given"
 msgstr "Anknytning: "
 
-#: gajim/command_system/implementation/standard.py:365
+#: gajim/command_system/implementation/standard.py:369
 #, fuzzy
-msgid "Display names of all group chat occupants"
+msgid "Display names of all group chat participants"
 msgstr "Användning: /%s, visa namnen för gruppchattens deltagare."
 
-#: gajim/command_system/implementation/standard.py:387
-msgid "Forbid an occupant to send you public or private messages"
+#: gajim/command_system/implementation/standard.py:391
+msgid "Forbid a participant to send you public or private messages"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:392
-msgid "Allow an occupant to send you public or private messages"
+#: gajim/command_system/implementation/standard.py:396
+msgid "Allow a participant to send you public or private messages"
 msgstr ""
 
 #: gajim/command_system/implementation/middleware.py:74
@@ -8585,204 +8785,329 @@ msgstr ""
 msgid "The same as using a doc-string, except it supports translation"
 msgstr ""
 
-#: gajim/gtk/filetransfer.py:91
+#: gajim/gtk/groupchat_info.py:36
+#, fuzzy
+msgid "?Group chat feature:Archiving"
+msgstr "Inbjudan till Gruppchatt"
+
+#: gajim/gtk/groupchat_info.py:37
+#, fuzzy
+msgid "Messages are archived on the server"
+msgstr "Sessionen KOMMER INTE att loggas"
+
+#: gajim/gtk/groupchat_info.py:40
+#, fuzzy
+msgid "?Group chat feature:Persistent"
+msgstr "Gruppchattar"
+
+#: gajim/gtk/groupchat_info.py:41
+msgid "This group chat persists even if there are no participants"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:45
+#, fuzzy
+msgid "?Group chat feature:Temporary"
+msgstr "?Gruppchatt kontaktroll:Ingen"
+
+#: gajim/gtk/groupchat_info.py:46
+msgid "This group chat will be destroyed once the last participant left"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:50
+#, fuzzy
+msgid "?Group chat feature:Moderated"
+msgstr "?Gruppchatt kontaktroll:Ingen"
+
+#: gajim/gtk/groupchat_info.py:51
+msgid ""
+"Participants entering this group chat need to request permission to send "
+"messages"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:55
+#, fuzzy
+msgid "?Group chat feature:Not Moderated"
+msgstr "Gruppchattar"
+
+#: gajim/gtk/groupchat_info.py:56
+msgid "Participants entering this group chat are allowed to send messages"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:60
+#, fuzzy
+msgid "?Group chat feature:Open"
+msgstr "?Gruppchatt kontaktroll:Ingen"
+
+#: gajim/gtk/groupchat_info.py:61
+#, fuzzy
+msgid "Anyone can join this group chat"
+msgstr "%s har gått in i gruppchatten"
+
+#: gajim/gtk/groupchat_info.py:64
+#, fuzzy
+msgid "?Group chat feature:Members Only"
+msgstr "Meddelande markerat i gruppchatt"
+
+#: gajim/gtk/groupchat_info.py:65
+msgid "This group chat is restricted to members only"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:69
+#, fuzzy
+msgid "?Group chat feature:Public"
+msgstr "Meddelande markerat i gruppchatt"
+
+#: gajim/gtk/groupchat_info.py:70
+msgid "Group chat can be found via search"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:73
+#, fuzzy
+msgid "?Group chat feature:Hidden"
+msgstr "?Gruppchatt kontaktroll:Ingen"
+
+#: gajim/gtk/groupchat_info.py:74
+#, fuzzy
+msgid "This group chat can not be found via search"
+msgstr "Denna gruppchatt saknar ämne"
+
+#: gajim/gtk/groupchat_info.py:77
+#, fuzzy
+msgid "?Group chat feature:Not Anonymous"
+msgstr "Gruppchattar"
+
+#: gajim/gtk/groupchat_info.py:78
+msgid "All other group chat participants can see your XMPP address"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:82
+#, fuzzy
+msgid "?Group chat feature:Semi-Anonymous"
+msgstr "Meddelande markerat i gruppchatt"
+
+#: gajim/gtk/groupchat_info.py:83
+msgid "Only moderators can see your XMPP address"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:86
+#, fuzzy
+msgid "?Group chat feature:Password Required"
+msgstr "Gruppchattar"
+
+#: gajim/gtk/groupchat_info.py:87
+msgid "This group chat does require a password upon entry"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:91
+#, fuzzy
+msgid "?Group chat feature:No Password Required"
+msgstr "Gruppchattar"
+
+#: gajim/gtk/groupchat_info.py:92
+msgid "This group chat does not require a password upon entry"
+msgstr ""
+
+#: gajim/gtk/filetransfer.py:90
 msgid "File"
 msgstr "Fil"
 
-#: gajim/gtk/filetransfer.py:108
+#: gajim/gtk/filetransfer.py:107
 msgid "Time"
 msgstr "Tid"
 
-#: gajim/gtk/filetransfer.py:228
+#: gajim/gtk/filetransfer.py:227
 #, fuzzy, python-format
 msgid "File name: %s"
 msgstr "Filnamn: %s"
 
-#: gajim/gtk/filetransfer.py:229 gajim/gtk/filetransfer.py:464
+#: gajim/gtk/filetransfer.py:228 gajim/gtk/filetransfer.py:469
 #, python-format
 msgid "Size: %s"
 msgstr "Storlek: %s"
 
-#: gajim/gtk/filetransfer.py:239
+#: gajim/gtk/filetransfer.py:238
 #, python-format
 msgid "Sender: %s"
 msgstr "Avsändare: %s"
 
-#: gajim/gtk/filetransfer.py:240 gajim/gtk/filetransfer.py:744
+#: gajim/gtk/filetransfer.py:239 gajim/gtk/filetransfer.py:749
 #: gajim/gtk/tooltips.py:577
 msgid "Recipient: "
 msgstr "Mottagare: "
 
-#: gajim/gtk/filetransfer.py:251
+#: gajim/gtk/filetransfer.py:250
 #, python-format
 msgid "Saved in: %s"
 msgstr "Sparad i: %s"
 
-#: gajim/gtk/filetransfer.py:256
+#: gajim/gtk/filetransfer.py:255
 msgid "File transfer completed"
 msgstr "Filöverföring färdig"
 
-#: gajim/gtk/filetransfer.py:276 gajim/gtk/filetransfer.py:285
+#: gajim/gtk/filetransfer.py:275 gajim/gtk/filetransfer.py:284
 #, fuzzy
 msgid "Connection with peer could not be established."
 msgstr "Anslutning med motpart kan inte etableras."
 
-#: gajim/gtk/filetransfer.py:293
+#: gajim/gtk/filetransfer.py:292
 #, python-format
 msgid "Filename: %s"
 msgstr "Filnamn: %s"
 
-#: gajim/gtk/filetransfer.py:294
+#: gajim/gtk/filetransfer.py:293
 #, python-format
 msgid "Recipient: %s"
 msgstr "Mottagare: %s"
 
-#: gajim/gtk/filetransfer.py:296
+#: gajim/gtk/filetransfer.py:295
 #, python-format
 msgid "Error message: %s"
 msgstr "Felmeddelande: %s"
 
-#: gajim/gtk/filetransfer.py:333
-#, fuzzy
-msgid "File transfer error"
-msgstr "Fel i Filöverföring"
-
 #: gajim/gtk/filetransfer.py:334
 #, python-format
 msgid ""
-"The file %(file)s has been received, but it seems to have been damaged along "
-"the way.\n"
+"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 ""
 
-#: gajim/gtk/filetransfer.py:350
+#: gajim/gtk/filetransfer.py:340
+#, fuzzy
+msgid "_Download Again"
+msgstr "Fråga mig i_nte igen"
+
+#: gajim/gtk/filetransfer.py:355
 #, fuzzy
 msgid "Gajim can not read this file"
 msgstr "Gajim kan inte komma åt denna fil"
 
-#: gajim/gtk/filetransfer.py:351
+#: gajim/gtk/filetransfer.py:356
 msgid "Another process is using this file."
 msgstr ""
 
-#: gajim/gtk/filetransfer.py:418
+#: gajim/gtk/filetransfer.py:423
 #, fuzzy
 msgid "File Transfer Conflict"
 msgstr "Filöverföring Klar"
 
-#: gajim/gtk/filetransfer.py:419
+#: gajim/gtk/filetransfer.py:424
 msgid "This file already exists"
 msgstr "Den här filen finns redan"
 
-#: gajim/gtk/filetransfer.py:420
+#: gajim/gtk/filetransfer.py:425
 msgid "Resume download or replace file?"
 msgstr ""
 
-#: gajim/gtk/filetransfer.py:424
+#: gajim/gtk/filetransfer.py:429
 #, fuzzy
 msgid "Replace _File"
 msgstr "Städar"
 
-#: gajim/gtk/filetransfer.py:427
+#: gajim/gtk/filetransfer.py:432
 #, fuzzy
 msgid "Resume _Download"
 msgstr "Hämta"
 
-#: gajim/gtk/filetransfer.py:437
+#: gajim/gtk/filetransfer.py:442
 #, fuzzy, python-format
 msgid "Directory '%s' is not writable"
 msgstr "Katalogen \"%s\" är inte skrivbar"
 
-#: gajim/gtk/filetransfer.py:438
+#: gajim/gtk/filetransfer.py:443
 #, fuzzy
 msgid "You do not have permissions to create files in this directory."
 msgstr "Du har inte rättigheter att skapa filer i den här katalogen."
 
-#: gajim/gtk/filetransfer.py:461
+#: gajim/gtk/filetransfer.py:466
 #, python-format
 msgid "File: %s"
 msgstr "Fil: %s"
 
-#: gajim/gtk/filetransfer.py:467
+#: gajim/gtk/filetransfer.py:472
 #, python-format
 msgid "Type: %s"
 msgstr "Typ: %s"
 
-#: gajim/gtk/filetransfer.py:469
+#: gajim/gtk/filetransfer.py:474
 #, python-format
 msgid "Description: %s"
 msgstr "Beskrivning: %s"
 
-#: gajim/gtk/filetransfer.py:480
+#: gajim/gtk/filetransfer.py:485
 #, fuzzy, python-format
 msgid "%s wants to send you a file"
 msgstr "%s vill skicka en fil till dig."
 
-#: gajim/gtk/filetransfer.py:509
+#: gajim/gtk/filetransfer.py:514
 #, fuzzy
 msgid "Checking file…"
 msgstr "Skickar profil..."
 
-#: gajim/gtk/filetransfer.py:524
+#: gajim/gtk/filetransfer.py:529
 #, fuzzy
 msgid "File error"
 msgstr "Fel i Filöverföring"
 
-#: gajim/gtk/filetransfer.py:561
+#: gajim/gtk/filetransfer.py:566
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 
-#: gajim/gtk/filetransfer.py:658
+#: gajim/gtk/filetransfer.py:663
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/s)"
 
-#: gajim/gtk/filetransfer.py:711 gajim/gtk/filetransfer.py:715
+#: gajim/gtk/filetransfer.py:716 gajim/gtk/filetransfer.py:720
 msgid "Invalid File"
 msgstr "Ogiltig Fil"
 
-#: gajim/gtk/filetransfer.py:711
+#: gajim/gtk/filetransfer.py:716
 msgid "File: "
 msgstr "Fil: "
 
-#: gajim/gtk/filetransfer.py:716
+#: gajim/gtk/filetransfer.py:721
 msgid "It is not possible to send empty files"
 msgstr "Det är inte möjligt att skicka tomma filer"
 
-#: gajim/gtk/filetransfer.py:742 gajim/gtk/tooltips.py:571
+#: gajim/gtk/filetransfer.py:747 gajim/gtk/tooltips.py:571
 msgid "Sender: "
 msgstr "Sändare: "
 
-#: gajim/gtk/filetransfer.py:1038
+#: gajim/gtk/filetransfer.py:1043
 #, fuzzy
 msgid "Choose a File to Send…"
 msgstr "Välj fil att skicka..."
 
 #: gajim/gtk/start_chat.py:51
 #, fuzzy
-msgid "Start new Conversation"
+msgid "Start New Conversation"
 msgstr "Fortsatt konversation"
 
-#: gajim/gtk/start_chat.py:424
-#, fuzzy
-msgid "New Groupchat"
-msgstr "Ny gruppchatt"
+#: gajim/gtk/start_chat.py:260 gajim/gtk/start_chat.py:328
+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:426
+#: gajim/gtk/start_chat.py:603 gajim/gtk/groupchat_join.py:38
+msgid "Join Group Chat"
+msgstr "Gå in i gruppchatt"
+
+#: gajim/gtk/start_chat.py:605 gajim/gtk/add_contact.py:40
 #, fuzzy
-msgid "New Contact"
-msgstr "Lägg till ny kontakt"
+msgid "Add Contact"
+msgstr "_Lägg till kontakt..."
 
-#: gajim/gtk/start_chat.py:588
+#: gajim/gtk/start_chat.py:746
 #, fuzzy, python-format
-msgid "%s Group chats found"
+msgid "%s group chats found"
 msgstr "%s kunde inte hittas"
 
-#: gajim/gtk/discovery.py:70
+#: gajim/gtk/discovery.py:69
 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:71
+#: gajim/gtk/discovery.py:70
 #, fuzzy
 msgid ""
 "This service could not respond with detailed information.\n"
@@ -8791,32 +9116,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:128
+#: gajim/gtk/discovery.py:126
 msgid "Others"
 msgstr "Andra"
 
-#: gajim/gtk/discovery.py:131
-msgid "Conference"
-msgstr "Konferens"
+#: gajim/gtk/discovery.py:129
+#, fuzzy
+msgid "Group Chat"
+msgstr "_Gruppchatt"
 
-#: gajim/gtk/discovery.py:519
+#: gajim/gtk/discovery.py:518
 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:606
+#: gajim/gtk/discovery.py:605
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Söker tjänster med konto %s"
 
-#: gajim/gtk/discovery.py:608
+#: gajim/gtk/discovery.py:607
 msgid "Service Discovery"
 msgstr "Tjänstefinnare"
 
-#: gajim/gtk/discovery.py:691
+#: gajim/gtk/discovery.py:690
 msgid "The service could not be found"
 msgstr "Denna tjänst kunde inte hittas"
 
-#: gajim/gtk/discovery.py:692
+#: gajim/gtk/discovery.py:691
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -8824,100 +9150,80 @@ 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:699 gajim/gtk/discovery.py:1042
+#: gajim/gtk/discovery.py:698 gajim/gtk/discovery.py:1041
 msgid "The service is not browsable"
 msgstr "Tjänst är inte bläddringsbar"
 
-#: gajim/gtk/discovery.py:700
+#: gajim/gtk/discovery.py:699
 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:738 gajim/gtk/discovery.py:747
+#: gajim/gtk/discovery.py:737 gajim/gtk/discovery.py:746
 msgid "Invalid Server Name"
 msgstr "Ogiltigt servernamn"
 
-#: gajim/gtk/discovery.py:806
+#: gajim/gtk/discovery.py:805
 #, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Bläddrar i %(address)s med kontot %(account)s"
 
-#: gajim/gtk/discovery.py:851
+#: gajim/gtk/discovery.py:850
 #, fuzzy
 msgid "Browse"
 msgstr "_Bläddra"
 
-#: gajim/gtk/discovery.py:1043
+#: gajim/gtk/discovery.py:1042
 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:1255
+#: gajim/gtk/discovery.py:1254
 #, fuzzy
 msgid "_Command"
 msgstr "Kommandon: %s"
 
-#: gajim/gtk/discovery.py:1264 gajim/gtk/discovery.py:1422
+#: gajim/gtk/discovery.py:1263 gajim/gtk/discovery.py:1420
 msgid "Re_gister"
 msgstr "Re_gistrera"
 
-#: gajim/gtk/discovery.py:1277
+#: gajim/gtk/discovery.py:1276
 msgid "_Search"
 msgstr "_Sök"
 
-#: gajim/gtk/discovery.py:1420
+#: gajim/gtk/discovery.py:1418
 msgid "_Edit"
 msgstr "R_edigera"
 
-#: gajim/gtk/discovery.py:1458
+#: gajim/gtk/discovery.py:1456
 #, fuzzy, python-format
 msgid "Scanning %(current)d / %(total)d ..."
 msgstr "Söker av %(current)d / %(total)d.."
 
-#: gajim/gtk/discovery.py:1674
+#: gajim/gtk/discovery.py:1655
+msgid "Users"
+msgstr "Användare"
+
+#: gajim/gtk/discovery.py:1671
 msgid "Id"
 msgstr "ID"
 
-#: gajim/gtk/discovery.py:1713
-msgid "_Join"
-msgstr "_Gå in i"
-
-#: gajim/gtk/discovery.py:1736
-msgid "Bookmark already set"
-msgstr "Bokmärke finns redan"
-
-#: gajim/gtk/discovery.py:1737
-#, fuzzy, python-format
-msgid "Group Chat '%s' is already in your bookmarks."
-msgstr "Gruppchatten \"%s\" finns redan i dina bokmärken."
-
-#: gajim/gtk/discovery.py:1748
-msgid "Bookmark has been added successfully"
-msgstr "Bokmärket har lagts till"
-
-#: gajim/gtk/discovery.py:1749
-#, fuzzy
-msgid ""
-"You can manage your bookmarks by clicking the Bookmarks menu item in your "
-"contact list."
-msgstr "Du kan hantera dina bokmärken via åtgärdsmenyn i din kontaktlista."
-
-#: gajim/gtk/discovery.py:1950
+#: gajim/gtk/discovery.py:1900
 msgid "Subscribed"
 msgstr "Prenumererar"
 
-#: gajim/gtk/discovery.py:1959
+#: gajim/gtk/discovery.py:1909
 msgid "Node"
 msgstr "Nod"
 
-#: gajim/gtk/discovery.py:2028
+#: gajim/gtk/discovery.py:1978
 #, fuzzy
 msgid "_New post"
 msgstr "Ny post"
 
-#: gajim/gtk/discovery.py:2037
+#: gajim/gtk/discovery.py:1987
 msgid "_Subscribe"
 msgstr "_Prenumerera"
 
-#: gajim/gtk/discovery.py:2045
+#: gajim/gtk/discovery.py:1995
 msgid "_Unsubscribe"
 msgstr "Säg _upp prenumeration"
 
@@ -8964,7 +9270,7 @@ msgstr "Från %s"
 msgid "Characters typed: %s"
 msgstr "Tecknet tillåts inte"
 
-#: gajim/gtk/single_message.py:274 gajim/gtk/xml_console.py:169
+#: gajim/gtk/single_message.py:274 gajim/gtk/xml_console.py:166
 msgid "Connection not available"
 msgstr "Anslutningen är inte tillgänglig"
 
@@ -8973,6 +9279,13 @@ msgstr "Anslutningen är inte tillgänglig"
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Kontrollera att du är ansluten med \"%s\"."
 
+#: gajim/gtk/single_message.py:306
+#, 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:330
 #, python-format
 msgid "RE: %s"
@@ -8983,28 +9296,28 @@ msgstr "SV: %s"
 msgid "%s wrote:\n"
 msgstr "%s skrev:\n"
 
-#: gajim/gtk/pep_config.py:44
+#: gajim/gtk/pep_config.py:45
 #, fuzzy, python-format
 msgid "PEP Service Configuration (%s)"
 msgstr "PEP-tjänstekonfiguration"
 
-#: gajim/gtk/pep_config.py:77
+#: gajim/gtk/pep_config.py:78
 #, fuzzy
 msgid "Service"
 msgstr "Server"
 
-#: gajim/gtk/pep_config.py:114
+#: gajim/gtk/pep_config.py:115
 msgid "PEP node was not removed"
 msgstr "PEP-noden togs inte bort"
 
-#: gajim/gtk/pep_config.py:115
+#: gajim/gtk/pep_config.py:116
 #, fuzzy, python-format
 msgid ""
 "PEP node %(node)s was not removed:\n"
 "%(message)s"
 msgstr "PEP-noden %(node)s blev inte borttagen: %(message)s"
 
-#: gajim/gtk/pep_config.py:146
+#: gajim/gtk/pep_config.py:147
 #, fuzzy, python-format
 msgid "Configure %s"
 msgstr "_Konfigurera"
@@ -9020,17 +9333,21 @@ msgstr "_Registrera"
 msgid "Registration successful"
 msgstr "Kontoregistrering lyckades"
 
-#: gajim/gtk/dialogs.py:54 gajim/gtk/dataform.py:659 gajim/gtk/adhoc.py:85
+#: gajim/gtk/service_registration.py:215
+msgid "Registration failed"
+msgstr "Registreringen misslyckades"
+
+#: gajim/gtk/dialogs.py:53 gajim/gtk/dataform.py:668 gajim/gtk/adhoc.py:86
 #, fuzzy
 msgid "Cancel"
 msgstr "_Avbryt"
 
-#: gajim/gtk/dialogs.py:129
+#: gajim/gtk/dialogs.py:128
 #, fuzzy, python-format
 msgid "Dictionary for language \"%s\" not available"
 msgstr "Ordbok för språket %s inte tillgängligt"
 
-#: gajim/gtk/dialogs.py:130
+#: gajim/gtk/dialogs.py:129
 #, fuzzy, python-format
 msgid ""
 "You have to install the dictionary \"%s\" to use spellchecking, or choose "
@@ -9043,11 +9360,11 @@ msgstr ""
 "\n"
 "Markeringsfunktionen för felstavade ord kommer inte att användas"
 
-#: gajim/gtk/dialogs.py:410 gajim/gtk/dialogs.py:425
+#: gajim/gtk/dialogs.py:322 gajim/gtk/dialogs.py:337
 msgid "Insecure connection"
 msgstr "Osäker anslutning"
 
-#: gajim/gtk/dialogs.py:411
+#: gajim/gtk/dialogs.py:323
 #, fuzzy, python-format
 msgid ""
 "You are about to connect to the account %(account)s (%(server)s) insecurely. "
@@ -9059,120 +9376,115 @@ msgstr ""
 "installera PyOpenSSL för att förhindra det. Är du säker på att du vill "
 "skicka lösenordet?"
 
-#: gajim/gtk/dialogs.py:416
+#: gajim/gtk/dialogs.py:328
 msgid "Yes, I really want to connect insecurely"
 msgstr "Ja, jag vill verkligen ansluta på ett osäkert sätt"
 
-#: gajim/gtk/dialogs.py:417
+#: gajim/gtk/dialogs.py:329
 msgid "Gajim will NOT connect unless you check this box"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:675
-#, fuzzy
-msgid "The nickname contains invalid characters."
-msgstr "Smeknamnet innehåller icke-tillåtna tecken."
-
-#: gajim/gtk/dialogs.py:734
+#: gajim/gtk/dialogs.py:561
 #, fuzzy, python-format
 msgid "Destroy %s"
 msgstr "Förstör %s"
 
-#: gajim/gtk/dialogs.py:775
+#: gajim/gtk/dialogs.py:602
 #, fuzzy
 msgid "Certificate"
 msgstr "Självsignerat certifikat"
 
-#: gajim/gtk/dialogs.py:786
+#: gajim/gtk/dialogs.py:613
 #, fuzzy, python-format
 msgid ""
 "Certificate for account\n"
 "%s"
 msgstr "för kontot %s"
 
-#: gajim/gtk/dialogs.py:824
+#: gajim/gtk/dialogs.py:651
 msgid "Issued to\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:825 gajim/gtk/dialogs.py:830
+#: gajim/gtk/dialogs.py:652 gajim/gtk/dialogs.py:657
 msgid "Common Name (CN): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:826 gajim/gtk/dialogs.py:831
+#: gajim/gtk/dialogs.py:653 gajim/gtk/dialogs.py:658
 msgid "Organization (O): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:827 gajim/gtk/dialogs.py:832
+#: gajim/gtk/dialogs.py:654 gajim/gtk/dialogs.py:659
 msgid "Organizational Unit (OU): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:828
+#: gajim/gtk/dialogs.py:655
 #, fuzzy
 msgid "Serial Number: "
 msgstr "GG-nummer:"
 
-#: gajim/gtk/dialogs.py:829
+#: gajim/gtk/dialogs.py:656
 msgid "Issued by\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:833
+#: gajim/gtk/dialogs.py:660
 msgid "Validity\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:834
+#: gajim/gtk/dialogs.py:661
 msgid "Issued on: "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:835
+#: gajim/gtk/dialogs.py:662
 msgid "Expires on: "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:836
+#: gajim/gtk/dialogs.py:663
 msgid "SHA-1:"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:838
+#: gajim/gtk/dialogs.py:665
 msgid "SHA-256:"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:852
+#: gajim/gtk/dialogs.py:679
 #, fuzzy
 msgid "View certificate…"
 msgstr "Självsignerat certifikat"
 
-#: gajim/gtk/dialogs.py:864 gajim/gtk/accounts.py:893
+#: gajim/gtk/dialogs.py:691 gajim/gtk/accounts.py:896
 msgid "Change Password"
 msgstr "Byt lösenord"
 
-#: gajim/gtk/dialogs.py:878
+#: gajim/gtk/dialogs.py:705
 msgid "_OK"
 msgstr "_OK"
 
-#: gajim/gtk/dialogs.py:891
+#: gajim/gtk/dialogs.py:718
 #, fuzzy
 msgid "You must enter a password"
 msgstr "Du måste skriva in ett lösenord."
 
-#: gajim/gtk/dialogs.py:895
+#: gajim/gtk/dialogs.py:722
 msgid "Passwords do not match"
 msgstr "Lösenorden stämmer inte överens"
 
-#: gajim/gtk/dialogs.py:923
+#: gajim/gtk/dialogs.py:750
 #, fuzzy
 msgid "Group Chat Invitation "
 msgstr "Inbjudan till Gruppchatt"
 
-#: gajim/gtk/dialogs.py:948
+#: gajim/gtk/dialogs.py:775
 #, fuzzy, python-format
 msgid "<b>%s</b> has invited you to join a discussion"
 msgstr "$Contact har bjudit in dig till en diskussion"
 
-#: gajim/gtk/dialogs.py:951
+#: gajim/gtk/dialogs.py:778
 #, 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:959
+#: gajim/gtk/dialogs.py:786
 #, python-format
 msgid "Comment: %s"
 msgstr "Kommentar: %s"
@@ -9187,11 +9499,6 @@ msgstr "GG-nummer:"
 msgid "ICQ Number"
 msgstr "ICQ-nummer:"
 
-#: gajim/gtk/add_contact.py:40
-#, fuzzy
-msgid "Add Contact"
-msgstr "_Lägg till kontakt..."
-
 #: gajim/gtk/add_contact.py:259
 #, fuzzy, python-format
 msgid "%s Missing"
@@ -9212,7 +9519,8 @@ msgid "The user ID must not contain a resource."
 msgstr "Användarens ID får inte innehålla en resurs."
 
 #: gajim/gtk/add_contact.py:299
-msgid "You cannot add yourself to your roster."
+#, fuzzy
+msgid "You cannot add yourself to your contact list."
 msgstr "Du kan inte lägga till dig själv i din kontaktlista."
 
 #: gajim/gtk/add_contact.py:304
@@ -9225,11 +9533,13 @@ msgid "Your account must be online to add new contacts."
 msgstr ""
 
 #: gajim/gtk/add_contact.py:321
-msgid "Contact already in roster"
+#, fuzzy
+msgid "Contact Already in Contact List"
 msgstr "Kontakten finns redan i kontaktlistan"
 
 #: gajim/gtk/add_contact.py:322
-msgid "This contact is already listed in your roster."
+#, fuzzy
+msgid "This contact is already in your contact list."
 msgstr "Denna kontakt finns redan i din kontaktlista."
 
 #: gajim/gtk/add_contact.py:379 gajim/gtk/add_contact.py:417
@@ -9270,14 +9580,14 @@ msgstr "Ändra status"
 
 #: gajim/gtk/themes.py:52
 #, fuzzy
-msgid "MUC Tab New Directed Message"
+msgid "Group Chat Tab New Directed Message"
 msgstr ""
 "MUC-dirigerade\n"
 "meddelanden"
 
 #: gajim/gtk/themes.py:56
 #, fuzzy
-msgid "MUC Tab New Message"
+msgid "Group Chat Tab New Message"
 msgstr "Nytt Meddelande"
 
 #: gajim/gtk/themes.py:60
@@ -9495,13 +9805,13 @@ msgstr "Alla filer"
 msgid "Clear File"
 msgstr "Städar"
 
-#: gajim/gtk/settings.py:570
+#: gajim/gtk/settings.py:570 gajim/gtk/proxies.py:32
 #, fuzzy
 msgid "Manage Proxies"
 msgstr "Hantera proxyprofiler"
 
-#: gajim/gtk/settings.py:591 gajim/gtk/preferences.py:971
-#: gajim/gtk/preferences.py:984 gajim/gtk/preferences.py:988
+#: gajim/gtk/settings.py:591 gajim/gtk/preferences.py:968
+#: gajim/gtk/preferences.py:982 gajim/gtk/preferences.py:986
 #, fuzzy
 msgid "No Proxy"
 msgstr "Proxyserver:"
@@ -9581,14 +9891,15 @@ msgid ""
 "        "
 msgstr ""
 
-#: gajim/gtk/about.py:47 data/org.gajim.Gajim.appdata.xml.in:10
+#: gajim/gtk/about.py:47 data/org.gajim.Gajim.desktop.in:6
+#: data/org.gajim.Gajim.appdata.xml.in:10
 #, fuzzy
-msgid "A GTK+ XMPP client"
+msgid "A GTK XMPP client"
 msgstr "En GTK+-baserad Jabber-klient"
 
 #: gajim/gtk/about.py:48
 #, fuzzy, python-format
-msgid "GTK+ Version: %s"
+msgid "GTK Version: %s"
 msgstr "GTK+ version:"
 
 #: gajim/gtk/about.py:49
@@ -9772,6 +10083,25 @@ msgstr "?transfer status:Pausad"
 msgid "?transfer status:Not started"
 msgstr "?transfer status:Pausad"
 
+#: gajim/gtk/groupchat_creation.py:97 gajim/gtk/groupchat_creation.py:99
+msgid " (optional)..."
+msgstr ""
+
+#: gajim/gtk/groupchat_creation.py:134
+#, fuzzy
+msgid "Invalid Address"
+msgstr "Ogiltig Fil"
+
+#: gajim/gtk/groupchat_creation.py:182
+#, fuzzy
+msgid "Not Connected"
+msgstr "Ansluten"
+
+#: gajim/gtk/groupchat_creation.py:183
+#, fuzzy
+msgid "You have to be connected to create a group chat."
+msgstr "Du har inte gått in i en gruppchatt."
+
 #: gajim/gtk/sounds.py:39
 msgid "Wav Sounds"
 msgstr "Wav-ljud"
@@ -9813,50 +10143,45 @@ msgstr "Meddelande markerat i gruppchatt"
 msgid "Group Chat Message Received"
 msgstr "Meddelande mottaget i gruppchatt"
 
-#: gajim/gtk/dataform.py:226 gajim/gtk/dataform.py:262
+#: gajim/gtk/dataform.py:232 gajim/gtk/dataform.py:268
 #, fuzzy
 msgid "Required"
 msgstr "Lösenord krävs"
 
-#: gajim/gtk/dataform.py:286
+#: gajim/gtk/dataform.py:293
 msgid "Yes"
 msgstr ""
 
-#: gajim/gtk/dataform.py:286
+#: gajim/gtk/dataform.py:293
 #, fuzzy
 msgid "No"
 msgstr "Ingen"
 
-#: gajim/gtk/dataform.py:661
+#: gajim/gtk/dataform.py:670
 msgid "Submit"
 msgstr ""
 
-#: gajim/gtk/statusicon.py:213
+#: gajim/gtk/statusicon.py:206
 #, fuzzy
 msgid "_Change Status Message…"
 msgstr "_Ändra statusmeddelande"
 
-#: gajim/gtk/statusicon.py:247 gajim/gtk/statusicon.py:292
-#: gajim/gtk/statusicon.py:299
+#: gajim/gtk/statusicon.py:258
 #, python-format
 msgid "using account %s"
 msgstr "använder kontot %s"
 
-#: gajim/gtk/statusicon.py:309
+#: gajim/gtk/statusicon.py:269
 #, fuzzy
-msgid "_Manage Bookmarks…"
-msgstr "Hantera bokmärken"
+msgid "Hide _Contact List"
+msgstr "Bjud in _kontakter"
 
-#: gajim/gtk/statusicon.py:325
+#: gajim/gtk/statusicon.py:273
 #, fuzzy
-msgid "Hide _Roster"
-msgstr "i _kontaktlista"
-
-#: gajim/gtk/statusicon.py:329
-msgid "Show _Roster"
-msgstr "Visa _kontaktlista"
+msgid "Show _Contact List"
+msgstr "Visa endast _aktiva kontakter"
 
-#: gajim/gtk/statusicon.py:337
+#: gajim/gtk/statusicon.py:281
 msgid "Hide this menu"
 msgstr "Dölj denna meny"
 
@@ -9905,36 +10230,6 @@ msgstr ""
 "Det uppstod ett fel vid publiceringen av er personliga information, försök "
 "igen senare."
 
-#: gajim/gtk/join_groupchat.py:202
-#, fuzzy
-msgid "Invalid Room"
-msgstr "Ogiltigt rum"
-
-#: gajim/gtk/join_groupchat.py:203
-msgid "Please choose a room"
-msgstr ""
-
-#: gajim/gtk/join_groupchat.py:222 gajim/gtk/join_groupchat.py:229
-msgid "Invalid Nickname"
-msgstr "Ogiltigt smeknamn"
-
-#: gajim/gtk/join_groupchat.py:223
-#, fuzzy
-msgid "Please choose a nickname"
-msgstr "Skapa ett nytt, tomt tema med ditt önskade namn."
-
-#: gajim/gtk/join_groupchat.py:282 gajim/gtk/join_groupchat.py:288
-#: gajim/gtk/join_groupchat.py:293
-#, fuzzy
-msgid "Wrong server"
-msgstr "Felaktig uri"
-
-#: gajim/gtk/join_groupchat.py:283 gajim/gtk/join_groupchat.py:289
-#: gajim/gtk/join_groupchat.py:294
-#, fuzzy, python-format
-msgid "%s is not a groupchat server"
-msgstr "Det här är ingen gruppchatt"
-
 #: gajim/gtk/mam_preferences.py:38
 #, python-format
 msgid "Archiving Preferences for %s"
@@ -9965,45 +10260,53 @@ msgstr "Tjänsten returnerade ett fel."
 msgid "Archiving Preferences Error"
 msgstr "_Inställningar"
 
-#: gajim/gtk/advanced_config.py:81
+#: gajim/gtk/advanced_config.py:95
 msgid "Activated"
 msgstr "Aktiverad"
 
-#: gajim/gtk/advanced_config.py:81
+#: gajim/gtk/advanced_config.py:95
 msgid "Deactivated"
 msgstr "Inaktiverad"
 
-#: gajim/gtk/advanced_config.py:83
-msgid "Boolean"
-msgstr "Boolesk"
+#: gajim/gtk/advanced_config.py:97
+msgid "?config type:Boolean"
+msgstr ""
+
+#: gajim/gtk/advanced_config.py:98
+msgid "?config type:Integer"
+msgstr ""
 
-#: gajim/gtk/advanced_config.py:84
-msgid "Integer"
-msgstr "Heltal"
+#: gajim/gtk/advanced_config.py:99
+msgid "?config type:Text"
+msgstr ""
 
-#: gajim/gtk/advanced_config.py:85
-msgid "Text"
-msgstr "Text"
+#: gajim/gtk/advanced_config.py:100
+msgid "?config type:Color"
+msgstr ""
 
-#: gajim/gtk/advanced_config.py:97
-msgid "Preference Name"
+#: gajim/gtk/advanced_config.py:112
+#, fuzzy
+msgid "?config:Preference Name"
 msgstr "Inställningens namn"
 
-#: gajim/gtk/advanced_config.py:104
-msgid "Value"
-msgstr "Värde"
+#: gajim/gtk/advanced_config.py:123
+#, fuzzy
+msgid "?config:Value"
+msgstr "_Konfigurera"
 
-#: gajim/gtk/advanced_config.py:113
-msgid "Type"
-msgstr "Typ"
+#: gajim/gtk/advanced_config.py:132
+msgid "?config:Type"
+msgstr ""
 
-#: gajim/gtk/advanced_config.py:168
-msgid "(None)"
-msgstr "(Ingen)"
+#: gajim/gtk/advanced_config.py:187
+#, fuzzy
+msgid "?config description:None"
+msgstr "?Fråga (för prenumeration):Ingen"
 
-#: gajim/gtk/advanced_config.py:299
-msgid "Hidden"
-msgstr "Dold"
+#: gajim/gtk/advanced_config.py:322
+#, fuzzy
+msgid "?password:Hidden"
+msgstr "Lösenord:"
 
 #: gajim/gtk/server_info.py:66
 #, fuzzy
@@ -10015,8 +10318,8 @@ msgstr "_Kopiera länkplats"
 msgid "%(days)s days, %(hours)s hours"
 msgstr ""
 
-#: gajim/gtk/server_info.py:218 gajim/gtk/accounts.py:749
-#: gajim/gtk/accounts.py:853
+#: gajim/gtk/server_info.py:218 gajim/gtk/accounts.py:752
+#: gajim/gtk/accounts.py:856
 #, fuzzy
 msgid "Hostname"
 msgstr "_Värdnamn:"
@@ -10202,11 +10505,6 @@ 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_config.py:41
-#, fuzzy
-msgid "Group Chat Configuration"
-msgstr "Inbjudan till Gruppchatt"
-
 #: gajim/gtk/groupchat_config.py:134
 #, fuzzy
 msgid "A Group Chat needs at least one Owner"
@@ -10217,69 +10515,69 @@ msgid "You are not allowed to modify the affiliation of Admins and Owners"
 msgstr ""
 
 #: gajim/gtk/groupchat_config.py:399
-msgid "An entry with this Jabber-ID already exists"
+msgid "An entry with this XMPP Address already exists"
 msgstr ""
 
-#: gajim/gtk/adhoc.py:91
+#: gajim/gtk/adhoc.py:92
 #, fuzzy
 msgid "Finish"
 msgstr "F_ärdigställ"
 
-#: gajim/gtk/adhoc.py:97 gajim/gtk/adhoc.py:283
+#: gajim/gtk/adhoc.py:98 gajim/gtk/adhoc.py:284
 #, fuzzy
 msgid "Commands"
 msgstr "Kommandon: %s"
 
-#: gajim/gtk/adhoc.py:103
+#: gajim/gtk/adhoc.py:104
 msgid "Next"
 msgstr ""
 
-#: gajim/gtk/adhoc.py:109
+#: gajim/gtk/adhoc.py:110
 #, fuzzy
 msgid "Previous"
 msgstr "Avundsjuk"
 
-#: gajim/gtk/adhoc.py:115
+#: gajim/gtk/adhoc.py:116
 #, fuzzy
 msgid "Execute"
 msgstr "_Kör kommando"
 
-#: gajim/gtk/adhoc.py:195
+#: gajim/gtk/adhoc.py:196
 #, fuzzy
 msgid "No commands available"
 msgstr "Inget konto tillgängligt"
 
-#: gajim/gtk/adhoc.py:244
+#: gajim/gtk/adhoc.py:245
 #, fuzzy
 msgid "Request Command List"
 msgstr "_Kör kommando"
 
-#: gajim/gtk/adhoc.py:259
+#: gajim/gtk/adhoc.py:260
 #, fuzzy
 msgid "Executing…"
 msgstr "_Kör kommando"
 
-#: gajim/gtk/adhoc.py:266
+#: gajim/gtk/adhoc.py:267
 #, fuzzy
 msgid "Command List"
 msgstr "Kommandon: %s"
 
-#: gajim/gtk/adhoc.py:384
+#: gajim/gtk/adhoc.py:385
 #, fuzzy
 msgid "Finished"
 msgstr "F_ärdigställ"
 
-#: gajim/gtk/adhoc.py:453
+#: gajim/gtk/adhoc.py:454
 #, fuzzy
 msgid "Execution failed"
 msgstr "Anslutningsfel"
 
-#: gajim/gtk/blocking.py:37
+#: gajim/gtk/blocking.py:38
 #, fuzzy, python-format
 msgid "Blocking List for %s"
 msgstr "Privat integritetslista för %s"
 
-#: gajim/gtk/blocking.py:71
+#: gajim/gtk/blocking.py:72
 #, fuzzy
 msgid "Error!"
 msgstr "Fel."
@@ -10329,8 +10627,7 @@ msgstr "Ogiltigt användarnamn"
 msgid "You must provide a username to configure this account."
 msgstr "Du behöver ange ett användarnamn för att konfigurera detta konto."
 
-#: gajim/gtk/account_wizard.py:252 gajim/gtk/bookmarks.py:290
-#: gajim/gtk/bookmarks.py:303
+#: gajim/gtk/account_wizard.py:252
 msgid "Invalid server"
 msgstr "Ogiltig server"
 
@@ -10346,7 +10643,7 @@ msgstr "Ogiltig post"
 msgid "Custom port must be a port number."
 msgstr "Inställd port måste vara ett portnummer."
 
-#: gajim/gtk/account_wizard.py:405
+#: gajim/gtk/account_wizard.py:406
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -10361,15 +10658,15 @@ msgstr ""
 "SSL-fel: %(error)s\n"
 "Vill du fortfarande ansluta till denna server?"
 
-#: gajim/gtk/account_wizard.py:446 gajim/gtk/account_wizard.py:480
+#: gajim/gtk/account_wizard.py:447 gajim/gtk/account_wizard.py:481
 msgid "An error occurred during account creation"
 msgstr "Ett fel uppstod när kontot skapades"
 
-#: gajim/gtk/account_wizard.py:545
+#: gajim/gtk/account_wizard.py:546
 msgid "Account name is in use"
 msgstr "Kontonamnet används redan"
 
-#: gajim/gtk/account_wizard.py:546
+#: gajim/gtk/account_wizard.py:547
 msgid "You already have an account using this name."
 msgstr "Du har redan ett konto med det namnet."
 
@@ -10396,26 +10693,26 @@ msgstr "Överföringen av %(filename)s från %(name)s har stannat."
 msgid "%(minutes)s min %(seconds)s sec"
 msgstr ""
 
-#: gajim/gtk/xml_console.py:77
+#: gajim/gtk/xml_console.py:74
 #, fuzzy
 msgid "Filter"
 msgstr "Filter:"
 
-#: gajim/gtk/xml_console.py:82
+#: gajim/gtk/xml_console.py:79
 #, fuzzy
 msgid "XML Input"
 msgstr "<b>XML-inmatning</b>"
 
-#: gajim/gtk/xml_console.py:86
+#: gajim/gtk/xml_console.py:83
 msgid "Paste Last Input"
 msgstr ""
 
-#: gajim/gtk/xml_console.py:170
+#: gajim/gtk/xml_console.py:167
 #, fuzzy, python-format
 msgid "Please make sure you are connected with '%s'."
 msgstr "Kontrollera att du är ansluten med \"%s\"."
 
-#: gajim/gtk/xml_console.py:182
+#: gajim/gtk/xml_console.py:177
 #, fuzzy
 msgid "Invalid Node"
 msgstr "Ogiltig Fil"
@@ -10448,153 +10745,169 @@ msgstr "Sök"
 msgid "No results found"
 msgstr "Inga resultat"
 
-#: gajim/gtk/preferences.py:358 gajim/gtk/preferences.py:362
+#: gajim/gtk/preferences.py:357 gajim/gtk/preferences.py:361
 msgid "Default"
 msgstr "Standard"
 
-#: gajim/gtk/preferences.py:801
+#: gajim/gtk/preferences.py:798
 msgid "status message title"
 msgstr "titel för statusmeddelande"
 
-#: gajim/gtk/preferences.py:802
+#: gajim/gtk/preferences.py:799
 msgid "status message text"
 msgstr "text för statusmeddelande"
 
+#: gajim/gtk/accounts.py:137
+#, fuzzy
+msgid "Re-Login"
+msgstr "Återanslut nu?"
+
 #: gajim/gtk/accounts.py:138
-msgid "Relogin now?"
+#, fuzzy
+msgid "Re-Login now?"
 msgstr "Återanslut nu?"
 
 #: gajim/gtk/accounts.py:139
-msgid "If you want all the changes to apply instantly, you must relogin."
+#, 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:191 gajim/gtk/accounts.py:975
+#: gajim/gtk/accounts.py:141
+#, fuzzy
+msgid "_Later"
+msgstr "_Tidigaste"
+
+#: gajim/gtk/accounts.py:143
+msgid "_Re-Login"
+msgstr ""
+
+#: gajim/gtk/accounts.py:194 gajim/gtk/accounts.py:978
 #, fuzzy
 msgid "Remove Account"
 msgstr "Tar bort %s konto"
 
-#: gajim/gtk/accounts.py:192
+#: gajim/gtk/accounts.py:195
 #, fuzzy, python-format
 msgid "You still have open chats in your account %s"
 msgstr "Du har öppnat chatt i kontot %s"
 
-#: gajim/gtk/accounts.py:193
+#: gajim/gtk/accounts.py:196
 #, fuzzy
 msgid ""
 "All chat and group chat windows will be closed.\n"
 "Do you want to continue?"
 msgstr "Alla chatts- och gruppchattsfönster kommer stängas. Vill du fortsätta?"
 
-#: gajim/gtk/accounts.py:424
+#: gajim/gtk/accounts.py:427
 #, fuzzy
 msgid "Back"
 msgstr "Snart tillbaka"
 
-#: gajim/gtk/accounts.py:530
+#: gajim/gtk/accounts.py:533
 #, fuzzy
 msgid "Please check if Bonjour is installed."
 msgstr "Kontrollera om Avahi eller Bonjour är installerat."
 
-#: gajim/gtk/accounts.py:532
+#: gajim/gtk/accounts.py:535
 #, fuzzy
 msgid "Please check if Avahi is installed."
 msgstr "Kontrollera om Avahi eller Bonjour är installerat."
 
-#: gajim/gtk/accounts.py:569
+#: gajim/gtk/accounts.py:572
 #, fuzzy
 msgid "Disable Account"
 msgstr "Ogiltigt kontonamn"
 
-#: gajim/gtk/accounts.py:570
+#: gajim/gtk/accounts.py:573
 #, fuzzy, python-format
 msgid "Account %s is still connected"
 msgstr "Konto \"%s\" är anslutet till servern"
 
-#: gajim/gtk/accounts.py:571
+#: gajim/gtk/accounts.py:574
 #, fuzzy
 msgid ""
 "All chat and group chat windows will be closed. Do you want to continue?"
 msgstr "Alla chatts- och gruppchattsfönster kommer stängas. Vill du fortsätta?"
 
-#: gajim/gtk/accounts.py:576
+#: gajim/gtk/accounts.py:579
 #, fuzzy
 msgid "_Disable Account"
 msgstr "Ogiltigt kontonamn"
 
-#: gajim/gtk/accounts.py:595
+#: gajim/gtk/accounts.py:598
 #, fuzzy
 msgid "Add Account"
 msgstr "_Lägg till kontakt..."
 
-#: gajim/gtk/accounts.py:663
+#: gajim/gtk/accounts.py:666
 msgid "Label"
 msgstr ""
 
-#: gajim/gtk/accounts.py:667
+#: gajim/gtk/accounts.py:670
 msgid "Login"
 msgstr ""
 
-#: gajim/gtk/accounts.py:670
+#: gajim/gtk/accounts.py:673
 #, fuzzy
 msgid "Import Contacts"
 msgstr "Bjud in _kontakter"
 
-#: gajim/gtk/accounts.py:674 gajim/gtk/accounts.py:870
+#: gajim/gtk/accounts.py:677 gajim/gtk/accounts.py:873
 #, fuzzy
 msgid "Client Certificate"
 msgstr "Självsignerat certifikat"
 
-#: gajim/gtk/accounts.py:677 gajim/gtk/accounts.py:774
+#: gajim/gtk/accounts.py:680 gajim/gtk/accounts.py:777
 #, fuzzy
 msgid "Connect on startup"
 msgstr "A_nslut vid start av Gajim"
 
-#: gajim/gtk/accounts.py:681 gajim/gtk/accounts.py:779
+#: gajim/gtk/accounts.py:684 gajim/gtk/accounts.py:782
 #, fuzzy
 msgid "Save conversations for all contacts"
 msgstr "Spara konversations_loggar för alla kontakter"
 
-#: gajim/gtk/accounts.py:683 gajim/gtk/accounts.py:781
+#: gajim/gtk/accounts.py:686 gajim/gtk/accounts.py:784
 msgid "Store conversations on the harddrive"
 msgstr ""
 
-#: gajim/gtk/accounts.py:685 gajim/gtk/accounts.py:783
+#: gajim/gtk/accounts.py:688 gajim/gtk/accounts.py:786
 #, fuzzy
 msgid "Global Status"
 msgstr "Alla statusar"
 
-#: gajim/gtk/accounts.py:687
+#: gajim/gtk/accounts.py:690
 #, fuzzy
 msgid "Synchronise the status of all accounts"
 msgstr "Ändrar status för konto eller konton"
 
-#: gajim/gtk/accounts.py:689
+#: gajim/gtk/accounts.py:692
 msgid "Use file transfer proxies"
 msgstr "Använd proxyservrar för filöverföringar"
 
-#: gajim/gtk/accounts.py:705
+#: gajim/gtk/accounts.py:708
 #, fuzzy
 msgid "Idle Time"
 msgstr " sedan %s"
 
-#: gajim/gtk/accounts.py:707
+#: gajim/gtk/accounts.py:710
 msgid "Disclose the time of your last activity"
 msgstr ""
 
-#: gajim/gtk/accounts.py:709
+#: gajim/gtk/accounts.py:712
 msgid "Local System Time"
 msgstr ""
 
-#: gajim/gtk/accounts.py:711
+#: gajim/gtk/accounts.py:714
 msgid "Disclose the local system time of the device Gajim runs on"
 msgstr ""
 
-#: gajim/gtk/accounts.py:714
+#: gajim/gtk/accounts.py:717
 #, fuzzy
 msgid "Client / Operating System"
 msgstr "Självsignerat certifikat"
 
-#: gajim/gtk/accounts.py:716
+#: gajim/gtk/accounts.py:719
 #, fuzzy
 msgid ""
 "Disclose informations about the client and operating system you currently use"
@@ -10602,153 +10915,148 @@ msgstr ""
 "Om kryssad kommer Gajim att tillåta andra att detektera operativsystemet som "
 "du använder"
 
-#: gajim/gtk/accounts.py:719
+#: gajim/gtk/accounts.py:722
 #, fuzzy
 msgid "Ignore Unknown Contacts"
 msgstr "Bjud in _kontakter"
 
-#: gajim/gtk/accounts.py:721
+#: gajim/gtk/accounts.py:724
 #, 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:737 gajim/gtk/accounts.py:776
+#: gajim/gtk/accounts.py:740 gajim/gtk/accounts.py:779
 #, fuzzy
 msgid "Use environment variable"
 msgstr "_Använd miljövariabeln HTTP__PROXY"
 
-#: gajim/gtk/accounts.py:739
-#, fuzzy
-msgid "Proxy"
-msgstr "Proxyserver:"
-
-#: gajim/gtk/accounts.py:742
+#: gajim/gtk/accounts.py:745
 #, fuzzy
 msgid "Warn on insecure connection"
 msgstr "_Varna innan en osäker anslutning används"
 
-#: gajim/gtk/accounts.py:746
+#: gajim/gtk/accounts.py:749
 msgid "Send keep-alive packets"
 msgstr "Skicka keep-alive-paket"
 
-#: gajim/gtk/accounts.py:750
+#: gajim/gtk/accounts.py:753
 msgid "Manually set the hostname for the server"
 msgstr ""
 
-#: gajim/gtk/accounts.py:756 gajim/gtk/accounts.py:826
-#: gajim/gtk/accounts.py:831
+#: gajim/gtk/accounts.py:759 gajim/gtk/accounts.py:829
+#: gajim/gtk/accounts.py:834
 #, fuzzy
 msgid "Priority"
 msgstr "Priori_tet:"
 
-#: gajim/gtk/accounts.py:785
+#: gajim/gtk/accounts.py:788
 #, fuzzy
 msgid "Synchronize the status of all accounts"
 msgstr "Ändrar status för konto eller konton"
 
-#: gajim/gtk/accounts.py:795
+#: gajim/gtk/accounts.py:798
 #, fuzzy
 msgid "First Name"
 msgstr "Förnamn:"
 
-#: gajim/gtk/accounts.py:798
+#: gajim/gtk/accounts.py:801
 #, fuzzy
 msgid "Last Name"
 msgstr "Efternamn:"
 
-#: gajim/gtk/accounts.py:804
+#: gajim/gtk/accounts.py:807
 #, fuzzy
 msgid "Email"
 msgstr "Ny E-post"
 
-#: gajim/gtk/accounts.py:822
+#: gajim/gtk/accounts.py:825
 #, fuzzy
 msgid "Adjust to status"
 msgstr "_Justera efter status"
 
-#: gajim/gtk/accounts.py:849
+#: gajim/gtk/accounts.py:852
 msgid "Enable"
 msgstr "Aktivera"
 
-#: gajim/gtk/accounts.py:857
+#: gajim/gtk/accounts.py:860
 #, fuzzy
 msgid "Port"
 msgstr "_Port:"
 
-#: gajim/gtk/accounts.py:862
+#: gajim/gtk/accounts.py:865
 #, fuzzy
 msgid "Connection Settings"
 msgstr "Anslutning"
 
-#: gajim/gtk/accounts.py:872
+#: gajim/gtk/accounts.py:875
 msgid "PKCS12 Files"
 msgstr ""
 
-#: gajim/gtk/accounts.py:874
+#: gajim/gtk/accounts.py:877
 #, fuzzy
 msgid "Encrypted Certificate"
 msgstr "Självsignerat certifikat"
 
-#: gajim/gtk/accounts.py:878
+#: gajim/gtk/accounts.py:881
 #, fuzzy
 msgid "Certificate Settings"
 msgstr "Självsignerat certifikat"
 
-#: gajim/gtk/accounts.py:890
+#: gajim/gtk/accounts.py:893
 #, fuzzy
 msgid "Save Password"
 msgstr "Spara lösenord"
 
-#: gajim/gtk/accounts.py:898
+#: gajim/gtk/accounts.py:901
 #, fuzzy
 msgid "Login Settings"
 msgstr "Registreringen misslyckades"
 
-#: gajim/gtk/accounts.py:931
+#: gajim/gtk/accounts.py:934
 #, fuzzy, python-format
 msgid "Removing account %s"
 msgstr "Tar bort %s konto"
 
-#: gajim/gtk/accounts.py:946
+#: gajim/gtk/accounts.py:949
 #, fuzzy
 msgid "Account is disabled"
 msgstr "Känsloikoner inaktiverade"
 
-#: gajim/gtk/accounts.py:947
+#: gajim/gtk/accounts.py:950
 #, fuzzy
 msgid "To unregister from a server, the account must be enabled."
 msgstr "För att ändra kontonamnet måste du vara frånkopplad"
 
-#: gajim/gtk/accounts.py:962
+#: gajim/gtk/accounts.py:965
 #, fuzzy
 msgid "Password required"
 msgstr "Lösenord krävs"
 
-#: gajim/gtk/accounts.py:976
+#: gajim/gtk/accounts.py:979
 #, fuzzy, python-format
 msgid "Account '%s' is still connected to the server"
 msgstr "Konto \"%s\" är anslutet till servern"
 
-#: gajim/gtk/accounts.py:978
+#: gajim/gtk/accounts.py:981
 msgid "If you remove it, the connection will be lost."
 msgstr "Om du tar bort det kommer anslutningen att förloras."
 
-#: gajim/gtk/accounts.py:995
+#: gajim/gtk/accounts.py:998
 #, fuzzy, python-format
 msgid "Connection to server %s failed"
 msgstr "Anslutning till proxyservern misslyckades"
 
-#: gajim/gtk/accounts.py:996
+#: gajim/gtk/accounts.py:999
 #, fuzzy
 msgid "What would you like to do?"
 msgstr "Vad vill du göra?"
 
-#: gajim/gtk/accounts.py:997
+#: gajim/gtk/accounts.py:1000
 #, fuzzy
 msgid "Remove only from Gajim"
 msgstr "Ta bort kontot _endast från Gajim"
 
-#: gajim/gtk/accounts.py:998
+#: gajim/gtk/accounts.py:1001
 msgid "Don't remove anything. I'll try again later"
 msgstr ""
 
@@ -10771,6 +11079,10 @@ msgstr "<b>%s</b> vill att du <b>%s</b> några kontakter i din kontaktlista."
 msgid "Modify"
 msgstr "Ändra"
 
+#: gajim/gtk/roster_item_exchange.py:80
+msgid "JID"
+msgstr "JID"
+
 #: gajim/gtk/roster_item_exchange.py:86
 msgid "Groups"
 msgstr "Grupper"
@@ -10794,19 +11106,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:581
+#: gajim/gtk/util.py:583
 msgid "Unknown Artist"
 msgstr "Okänd artist"
 
-#: gajim/gtk/util.py:582
+#: gajim/gtk/util.py:584
 msgid "Unknown Title"
 msgstr "Okänd titel"
 
-#: gajim/gtk/util.py:583
+#: gajim/gtk/util.py:585
 msgid "Unknown Source"
 msgstr "Okänd källa"
 
-#: gajim/gtk/util.py:585
+#: gajim/gtk/util.py:587
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
@@ -10815,29 +11127,10 @@ msgstr ""
 "<b>\"%(title)s\"</b> av <i>%(artist)s</i>\n"
 "från <i>%(source)s</i>"
 
-#: gajim/gtk/bookmarks.py:121
-msgid "New Group Chat"
-msgstr "Ny gruppchatt"
-
-#: gajim/gtk/bookmarks.py:161
-msgid "This bookmark has invalid data"
-msgstr "Det här bokmärket har ogiltig data"
-
-#: gajim/gtk/bookmarks.py:162
-msgid ""
-"Please be sure to fill out server and room fields or remove this bookmark."
-msgstr ""
-"Var säker på att fylla i server- och rumfälten eller ta bort det här "
-"bokmärket."
-
-#: gajim/gtk/bookmarks.py:273 gajim/gtk/bookmarks.py:291
-#: gajim/gtk/bookmarks.py:304 gajim/gtk/bookmarks.py:335
-msgid "Character not allowed"
-msgstr "Tecknet tillåts inte"
-
-#: gajim/gtk/bookmarks.py:334
-msgid "Invalid room"
-msgstr "Ogiltigt rum"
+#: gajim/gtk/bookmarks.py:47
+#, fuzzy, python-format
+msgid "Bookmarks for %s"
+msgstr "_Bokmärk"
 
 #: gajim/plugins/pluginmanager.py:736 gajim/plugins/pluginmanager.py:742
 msgid "Archive corrupted"
@@ -10849,50 +11142,53 @@ msgid "Archive empty"
 msgstr "Filen är tom"
 
 #: gajim/plugins/pluginmanager.py:750 gajim/plugins/pluginmanager.py:758
-#: gajim/plugins/gui.py:257
+#: gajim/plugins/gui.py:258
 msgid "Archive is malformed"
 msgstr ""
 
-#: gajim/plugins/pluginmanager.py:766 gajim/plugins/gui.py:281
-#: gajim/plugins/gui.py:289
+#: gajim/plugins/pluginmanager.py:766 gajim/plugins/gui.py:288
+#: gajim/plugins/gui.py:301
 #, fuzzy
 msgid "Plugin already exists"
 msgstr "Den här filen finns redan"
 
-#: gajim/plugins/gui.py:82
+#: gajim/plugins/gui.py:83
 msgid "Click to view Gajim's wiki page on how to install plugins in Flatpak."
 msgstr ""
 
-#: gajim/plugins/gui.py:89
+#: gajim/plugins/gui.py:90
 msgid "Plugin"
 msgstr ""
 
-#: gajim/plugins/gui.py:151
+#: gajim/plugins/gui.py:152
 #, fuzzy, python-format
 msgid "Warning: %s"
 msgstr "Bannlyser %s"
 
-#: gajim/plugins/gui.py:206
+#: gajim/plugins/gui.py:207
 #, fuzzy
 msgid "Plugin failed"
 msgstr "Registreringen misslyckades"
 
-#: gajim/plugins/gui.py:245
+#: gajim/plugins/gui.py:246
 msgid "Unable to properly remove the plugin"
 msgstr ""
 
-#: gajim/plugins/gui.py:281
-msgid "Overwrite?"
-msgstr ""
+#: gajim/plugins/gui.py:287
+#, fuzzy
+msgid "Overwrite Plugin?"
+msgstr "Skriv över statusmeddelande?"
+
+#: gajim/plugins/gui.py:289
+#, fuzzy
+msgid "Do you want to overwrite the currently installed version?"
+msgstr "Vill du acceptera inbjudan?"
 
 #: data/org.gajim.Gajim.desktop.in:5
-msgid "Jabber IM Client"
+#, fuzzy
+msgid "XMPP IM Client"
 msgstr "Jabber-snabbmeddelandeklient"
 
-#: data/org.gajim.Gajim.desktop.in:6
-msgid "A GTK+ Jabber client"
-msgstr "En GTK+-baserad Jabber-klient"
-
 #: data/org.gajim.Gajim.desktop.in:8
 msgid "chat;messaging;im;xmpp;bonjour;voip;"
 msgstr ""
@@ -10944,7 +11240,7 @@ msgid "Easily send pictures, videos or other files to friends and groups"
 msgstr ""
 
 #: data/org.gajim.Gajim.appdata.xml.in:27
-msgid "Chat securely with End-to-End encryption via OMEMO or PGP"
+msgid "Chat securely with End-to-End encryption via OMEMO or OpenPGP"
 msgstr ""
 
 #: data/org.gajim.Gajim.appdata.xml.in:28
@@ -11006,7 +11302,7 @@ msgstr ""
 
 #: data/org.gajim.Gajim.appdata.xml.in:52
 #, fuzzy
-msgid "Roster, list of contacts"
+msgid "Contact list, list of contacts"
 msgstr "_Logga statusändringar för kontakter"
 
 #: data/org.gajim.Gajim.appdata.xml.in:56
@@ -11028,6 +11324,475 @@ msgstr "Logghistorik"
 msgid "Plugin manager"
 msgstr "Registreringen misslyckades"
 
+#, fuzzy
+#~ msgid "Configure Services…"
+#~ msgstr "Konfigurera tjänster..."
+
+#, fuzzy
+#~ msgid "Group Chat Bookmarks"
+#~ msgstr "Gruppchatt"
+
+#, fuzzy
+#~ msgid "Add Bookmark"
+#~ msgstr "_Bokmärk"
+
+#, fuzzy
+#~ msgid "Remove Bookmark"
+#~ msgstr "_Bokmärk"
+
+#, fuzzy
+#~ msgid "Bookmark Name"
+#~ msgstr "Bokmärk detta rum (Ctrl+B)"
+
+#, fuzzy
+#~ msgid "_Server"
+#~ msgstr "_Server:"
+
+#, fuzzy
+#~ msgid "_Password"
+#~ msgstr "_Lösenord:"
+
+#, fuzzy
+#~ msgid "Join chat when connected"
+#~ msgstr "Kontakt loggade ut"
+
+#~ msgid "New Group Chat"
+#~ msgstr "Ny gruppchatt"
+
+#~ msgid "This bookmark has invalid data"
+#~ msgstr "Det här bokmärket har ogiltig data"
+
+#, fuzzy
+#~ msgid ""
+#~ "Please be sure to fill out server and group chat fields or remove this "
+#~ "bookmark."
+#~ msgstr ""
+#~ "Var säker på att fylla i server- och rumfälten eller ta bort det här "
+#~ "bokmärket."
+
+#~ msgid "Character not allowed"
+#~ msgstr "Tecknet tillåts inte"
+
+#, fuzzy
+#~ msgid "Invalid Group Chat"
+#~ msgstr "Ogiltigt Jabber-ID"
+
+#~ msgid "Unable to join group chat"
+#~ msgstr "Kunde inte gå in i gruppchatt"
+
+#, fuzzy
+#~ msgid "You are banned from group chat <b>%s</b>."
+#~ msgstr "Du är bannlyst från gruppchatten %s."
+
+#, fuzzy
+#~ msgid "Remote server <b>%s</b> does not exist."
+#~ msgstr "Gruppchatten %s finns inte."
+
+#, fuzzy
+#~ msgid "Group chat <b>%s</b> does not exist."
+#~ msgstr "Gruppchatten %s finns inte."
+
+#, fuzzy
+#~ msgid "Group chat creation is not permitted."
+#~ msgstr "Möjligheten att skapa rum är begränsad."
+
+#, fuzzy
+#~ msgid "You must use your registered nickname in <b>%s</b>."
+#~ msgstr "Ditt registrerade smeknamn måste användas i gruppchatten %s."
+
+#, fuzzy
+#~ msgid "You are not in the members list in group chat %s."
+#~ msgstr "Du är inte med i medlemslistan i gruppchatten %s."
+
+#, fuzzy
+#~ msgid "XMPP Address is not a group chat"
+#~ msgstr "Det här är ingen gruppchatt"
+
+#~ msgid "This is not a group chat"
+#~ msgstr "Det här är ingen gruppchatt"
+
+#, fuzzy
+#~ msgid "Please choose a group chat"
+#~ msgstr "Skapa ett nytt, tomt tema med ditt önskade namn."
+
+#~ msgid "Invalid Nickname"
+#~ msgstr "Ogiltigt smeknamn"
+
+#, fuzzy
+#~ msgid "Please choose a nickname"
+#~ msgstr "Skapa ett nytt, tomt tema med ditt önskade namn."
+
+#, fuzzy
+#~ msgid "Wrong server"
+#~ msgstr "Felaktig uri"
+
+#, fuzzy
+#~ msgid "%s is not a group chat server"
+#~ msgstr "Det här är ingen gruppchatt"
+
+#, fuzzy
+#~ msgid "A Password is required to join the group chat %s. Please type it."
+#~ msgstr "Ett lösenord krävs för att gå in i rummet %s. Ange lösenordet."
+
+#~ msgid "Not in Roster"
+#~ msgstr "Inte i kontaktlista"
+
+#~ msgid "I would like to add you to my roster"
+#~ msgstr "Jag skulle vilja lägga till dig i min kontaktlista"
+
+#, fuzzy
+#~ msgid "Add to Roster"
+#~ msgstr "_Lägg till i kontaktlista"
+
+#, fuzzy
+#~ msgid "Manage Room"
+#~ msgstr "_Hantera rum"
+
+#, fuzzy
+#~ msgid "Configure Room"
+#~ msgstr "Konfigurera _rum..."
+
+#, fuzzy
+#~ msgid "Destroy Room"
+#~ msgstr "Förstör %s"
+
+#, fuzzy
+#~ msgid "Change Nick"
+#~ msgstr "Byt smek_namn..."
+
+#, fuzzy
+#~ msgid "Disconnect"
+#~ msgstr "_Koppla från"
+
+#, fuzzy
+#~ msgid "Copy JID"
+#~ msgstr "Rummets JID"
+
+#, fuzzy
+#~ msgid "Add to Roster…"
+#~ msgstr "_Lägg till i kontaktlista"
+
+#, fuzzy
+#~ msgid "Copy JID/Email"
+#~ msgstr "_Kopiera JID/e-postadress"
+
+#, fuzzy
+#~ msgid "JID: <i>%s</i>"
+#~ msgstr "Jabber-ID: <i>%s</i>"
+
+#~ msgid "Changing Subject"
+#~ msgstr "Ändrar Ämne"
+
+#~ msgid "Please specify the new subject:"
+#~ msgstr "Ange det nya ämnet:"
+
+#~ msgid "Room logging is now enabled"
+#~ msgstr "Rumsloggning är nu aktiverad"
+
+#~ msgid "Room logging is now disabled"
+#~ msgstr "Rumsloggning är nu inaktiverad"
+
+#, fuzzy
+#~ msgid "You (%s) joined the room"
+#~ msgstr "%s har gått in i gruppchatten"
+
+#~ msgid "Room logging is enabled"
+#~ msgstr "Rumsloggning är aktiverad"
+
+#, fuzzy
+#~ msgid "Unable to join groupchat"
+#~ msgstr "Kunde inte gå in i gruppchatt"
+
+#~ msgid "Groupchat Invitation"
+#~ msgstr "Inbjudan till Gruppchatt"
+
+#, fuzzy
+#~ msgid "%(jid)s has been invited in this room"
+#~ msgstr "%(nick)s har tagits bort från rummet (%(reason)s)"
+
+#, fuzzy
+#~ msgid "JID is not a Groupchat"
+#~ msgstr "Det här är ingen gruppchatt"
+
+#~ msgid "Invalid JID"
+#~ msgstr "Ogiltigt JID"
+
+#~ msgid "A connection is not available"
+#~ msgstr "En anslutning är inte tillgänglig"
+
+#, fuzzy
+#~ msgid "JID already in list"
+#~ msgstr "Jabber-ID finns redan i listan"
+
+#, fuzzy
+#~ msgid "For the chosen encryption there is no encryption method available"
+#~ msgstr "En anslutning är inte tillgänglig"
+
+#~ msgid "Removes contact from roster"
+#~ msgstr "Ta bort en kontakt från kontaktlista"
+
+#~ msgid "Not in roster"
+#~ msgstr "Inte i kontaktlista"
+
+#, fuzzy
+#~ msgid "Contact signed in notification color."
+#~ msgstr "_Visa händelse i kontaktlista"
+
+#, fuzzy
+#~ msgid "Contact signout notification color"
+#~ msgstr "_Visa händelse i kontaktlista"
+
+#, fuzzy
+#~ msgid "File transfer request notification color."
+#~ msgstr "Förfrågan om Filöverföring"
+
+#, fuzzy
+#~ msgid "File transfer error notification color."
+#~ msgstr "Filöverföringen avbruten"
+
+#, fuzzy
+#~ msgid "File transfer complete or stopped notification color."
+#~ msgstr "När en filöverföring är färdig så visa en popupnotifiering"
+
+#, fuzzy
+#~ msgid "Groupchat invitation notification color"
+#~ msgstr "Inbjudan till Gruppchatt"
+
+#~ msgid "Add * and [n] in roster title?"
+#~ msgstr "Lägg till * och [n] i kontaktlistans titel?"
+
+#~ msgid "Hides the banner in two persons chat window"
+#~ msgstr "Döljer bannern i chattfönster för två personer"
+
+#, fuzzy
+#~ msgid "Language for which misspelled words will be checked"
+#~ msgstr "Språket för vilket vi vill leta efter felstavade ord"
+
+#~ msgid "I'm eating, so leave me a message."
+#~ msgstr "Jag äter, lämna ett meddelande."
+
+#, fuzzy
+#~ msgid "from room %s"
+#~ msgstr " från rummet %s"
+
+#~ msgid "Leave Groupchats"
+#~ msgstr "Lämna gruppchattar"
+
+#, fuzzy
+#~ msgid "Auto Join"
+#~ msgstr "Anslut automatiskt"
+
+#, fuzzy
+#~ msgid "Room"
+#~ msgstr "Rum:"
+
+#~ msgid "Jabber ID:"
+#~ msgstr "Jabber-ID:"
+
+#~ msgid "_Add to Roster"
+#~ msgstr "_Lägg till i kontaktlista"
+
+#~ msgid "_Manage Room"
+#~ msgstr "_Hantera rum"
+
+#~ msgid "Configure _Room..."
+#~ msgstr "Konfigurera _rum..."
+
+#, fuzzy
+#~ msgid "_Destroy Room"
+#~ msgstr "Förstör %s"
+
+#~ msgid "Jabber ID"
+#~ msgstr "Jabber-ID"
+
+#, fuzzy
+#~ msgid "icon"
+#~ msgstr "Aktivitetsikon"
+
+#, fuzzy
+#~ msgid "account"
+#~ msgstr "konto: "
+
+#, fuzzy
+#~ msgid "Roster"
+#~ msgstr "Visa _kontaktlista"
+
+#, fuzzy
+#~ msgid "Show only in roster"
+#~ msgstr "Visa enbart i _registret"
+
+#~ msgid "in _roster"
+#~ msgstr "i _kontaktlista"
+
+#, fuzzy
+#~ msgid "Roster Appearance"
+#~ msgstr "<b>Kontaktlistans utseende</b>"
+
+#, fuzzy
+#~ msgid "Show chatstate in roster"
+#~ msgstr "Visa a_vatarer för kontakter i kontaktlista"
+
+#~ msgid "_Add to Roster..."
+#~ msgstr "_Lägg till i kontaktlista..."
+
+#~ msgid "_Jabber ID:"
+#~ msgstr "_Jabber-ID:"
+
+#, fuzzy
+#~ msgid "_Jabber ID"
+#~ msgstr "_Jabber-ID:"
+
+#~ msgid "JabberID"
+#~ msgstr "JabberID"
+
+#, fuzzy
+#~ msgid "Show Roster"
+#~ msgstr "Visa _kontaktlista"
+
+#~ msgid "MUC server"
+#~ msgstr "MUC-server"
+
+#~ msgid "Room Configuration"
+#~ msgstr "Rumkonfiguration"
+
+#~ msgid "Join _Group Chat"
+#~ msgstr "Gå in i _gruppchatt"
+
+#, fuzzy
+#~ msgid "Audio sessions are not available"
+#~ msgstr "Sessionsbus inte tillgänglig"
+
+#~ msgid "Conference"
+#~ msgstr "Konferens"
+
+#, fuzzy
+#~ msgid "_Manage Bookmarks…"
+#~ msgstr "Hantera bokmärken"
+
+#, fuzzy
+#~ msgid "Hide _Roster"
+#~ msgstr "i _kontaktlista"
+
+#~ msgid "Show _Roster"
+#~ msgstr "Visa _kontaktlista"
+
+#, fuzzy
+#~ msgid "Invalid Room"
+#~ msgstr "Ogiltigt rum"
+
+#~ msgid "Invalid room"
+#~ msgstr "Ogiltigt rum"
+
+#~ msgid "A GTK+ Jabber client"
+#~ msgstr "En GTK+-baserad Jabber-klient"
+
+#~ msgid "Changing Nickname"
+#~ msgstr "Byter Smeknamn"
+
+#~ msgid "Please specify the new nickname you want to use:"
+#~ msgstr "Ange det nya smeknamnet du vill använda:"
+
+#~ msgid "Bookmark already set"
+#~ msgstr "Bokmärke finns redan"
+
+#, fuzzy
+#~ msgid "Group Chat '%s' is already in your bookmarks."
+#~ msgstr "Gruppchatten \"%s\" finns redan i dina bokmärken."
+
+#~ msgid "Bookmark has been added successfully"
+#~ msgstr "Bokmärket har lagts till"
+
+#, fuzzy
+#~ msgid ""
+#~ "You can manage your bookmarks by clicking the Bookmarks menu item in your "
+#~ "contact list."
+#~ msgstr "Du kan hantera dina bokmärken via åtgärdsmenyn i din kontaktlista."
+
+#, fuzzy
+#~ msgid "The nickname contains invalid characters."
+#~ msgstr "Smeknamnet innehåller icke-tillåtna tecken."
+
+#, fuzzy
+#~ msgid "Bookmark Room"
+#~ msgstr "Bokmärk detta rum (Ctrl+B)"
+
+#~ msgid "_Join New Group Chat"
+#~ msgstr "_Gå in i ny gruppchatt"
+
+#, fuzzy
+#~ msgid "_Create Group Chat"
+#~ msgstr "Lämna gruppchattar"
+
+#~ msgid "Name:"
+#~ msgstr "Namn:"
+
+#, fuzzy
+#~ msgid "Description:"
+#~ msgstr "Beskrivning: "
+
+#, fuzzy
+#~ msgid "Address:"
+#~ msgstr "_Adress:"
+
+#, fuzzy
+#~ msgid "You can not start a new conversation unless you are connected."
+#~ msgstr "Du kan inte gå med i en gruppchatt utan att vara ansluten."
+
+#, fuzzy
+#~ msgid "File transfer error"
+#~ msgstr "Fel i Filöverföring"
+
+#, fuzzy
+#~ msgid "No Accounts available"
+#~ msgstr "Inget konto tillgängligt"
+
+#~ msgid "_Modify Account..."
+#~ msgstr "_Redigera konto..."
+
+#~ msgid "Boolean"
+#~ msgstr "Boolesk"
+
+#~ msgid "Integer"
+#~ msgstr "Heltal"
+
+#~ msgid "Text"
+#~ msgstr "Text"
+
+#~ msgid "Value"
+#~ msgstr "Värde"
+
+#~ msgid "Type"
+#~ msgstr "Typ"
+
+#~ msgid "(None)"
+#~ msgstr "(Ingen)"
+
+#~ msgid "Hidden"
+#~ msgstr "Dold"
+
+#~ msgid "Manage Proxy Profiles"
+#~ msgstr "Hantera proxyprofiler"
+
+#, fuzzy
+#~ msgid "Properties"
+#~ msgstr "<b>Egenskaper</b>"
+
+#, fuzzy
+#~ msgid "Proxy _Host"
+#~ msgstr "Proxyser_ver:"
+
+#, fuzzy
+#~ msgid "Proxy _Port"
+#~ msgstr "Proxyserverns _port:"
+
+#, fuzzy
+#~ msgid "New Groupchat"
+#~ msgstr "Ny gruppchatt"
+
+#, fuzzy
+#~ msgid "New Contact"
+#~ msgstr "Lägg till ny kontakt"
+
 #~ msgid "%s GiB"
 #~ msgstr "%s GiB"
 
@@ -11115,9 +11880,6 @@ msgstr "Registreringen misslyckades"
 #~ msgid "_Pause"
 #~ msgstr "_Paus"
 
-#~ msgid "Clean _up"
-#~ msgstr "Rensa _upp"
-
 #~ msgid "Remove file transfer from the list."
 #~ msgstr "Ta bort filöverföring från listan."
 
@@ -11522,9 +12284,6 @@ msgstr "Registreringen misslyckades"
 #~ msgid "You are invited to a groupchat"
 #~ msgstr "Du är inbjuden till en gruppchatt"
 
-#~ msgid "Do you want to accept the invitation?"
-#~ msgstr "Vill du acceptera inbjudan?"
-
 #~ msgid "_Start Chat"
 #~ msgstr "_Starta chatt"
 
@@ -11709,10 +12468,6 @@ msgstr "Registreringen misslyckades"
 #~ msgid "Nick"
 #~ msgstr "Smeknamn"
 
-#, fuzzy
-#~ msgid "Banning…"
-#~ msgstr "Bannlyser..."
-
 #~ msgid ""
 #~ "<b>Whom do you want to ban?</b>\n"
 #~ "\n"
@@ -11777,13 +12532,6 @@ msgstr "Registreringen misslyckades"
 #~ msgid "Requires python2.5."
 #~ msgstr "Kräver python2.5."
 
-#~ msgid ""
-#~ "Generate XHTML output from RST code (see http://docutils.sourceforge.net/"
-#~ "docs/ref/rst/restructuredtext.html)."
-#~ msgstr ""
-#~ "Generera XHTML-utdata från RST-kod (se http://docutils.sourceforge.net/"
-#~ "docs/ref/rst/restructuredtext.html)."
-
 #, fuzzy
 #~ msgid "?features:Available"
 #~ msgstr "Tillgänglig"
@@ -11794,13 +12542,6 @@ msgstr "Registreringen misslyckades"
 #~ msgid "Filter:"
 #~ msgstr "Filter:"
 
-#, fuzzy
-#~ msgid ""
-#~ "If checked, Gajim will display the mood of contacts in the roster window"
-#~ msgstr ""
-#~ "Om kryssad kommer Gajim att visa kontakters avatarer i register- och "
-#~ "gruppchattsfönstren"
-
 #~ msgid "<b>Chat Appearance</b>"
 #~ msgstr "<b>Chattutseende</b>"
 
@@ -12048,10 +12789,6 @@ msgstr "Registreringen misslyckades"
 #~ msgstr "_Statusmeddelande:"
 
 #, fuzzy
-#~ msgid "Group chat highlight"
-#~ msgstr "Meddelande markerat i gruppchatt"
-
-#, fuzzy
 #~ msgid "Your nickname"
 #~ msgstr "För_e smeknamn:"
 
@@ -12191,9 +12928,6 @@ msgstr "Registreringen misslyckades"
 #~ msgid "The passwords typed in both fields must be identical."
 #~ msgstr "Lösenorden skrivna i båda fälten måste vara identiska."
 
-#~ msgid "Enter new password:"
-#~ msgstr "Ange nytt lösenord:"
-
 #~ msgid "Enter it again for confirmation:"
 #~ msgstr "Ange det igen för att bekräfta:"
 
@@ -12209,10 +12943,6 @@ msgstr "Registreringen misslyckades"
 #~ msgstr "avprenumerationsförfrågan från %s"
 
 #, fuzzy
-#~ msgid "Autojoin"
-#~ msgstr "Anslut automatiskt"
-
-#, fuzzy
 #~ msgid "Homepage:"
 #~ msgstr "<b>Webbplats:</b>"
 
@@ -12308,9 +13038,6 @@ msgstr "Registreringen misslyckades"
 #~ msgid "Forward unread message then disconnect"
 #~ msgstr "Vidarebefordra olästa meddelanden"
 
-#~ msgid "AIM Address:"
-#~ msgstr "AIM-adress:"
-
 #~ msgid "MSN Address:"
 #~ msgstr "MSN-adress:"
 
@@ -12361,10 +13088,6 @@ msgstr "Registreringen misslyckades"
 #~ msgid "Session negotiation cancelled"
 #~ msgstr "Sessionsförhandlingen avbröts"
 
-#, fuzzy
-#~ msgid "This session WILL NOT be archived on server"
-#~ msgstr "Sessionen KOMMER INTE att loggas"
-
 #~ msgid "This session is encrypted"
 #~ msgstr "Denna session är krypterad"
 
@@ -12659,9 +13382,6 @@ msgstr "Registreringen misslyckades"
 #~ msgid "Server:"
 #~ msgstr "Server:"
 
-#~ msgid "Password:"
-#~ msgstr "Lösenord:"
-
 #, fuzzy
 #~ msgid "Join this room _automatically when I connect"
 #~ msgstr "Gå in detta rum automatiskt när jag ansluter"
@@ -12879,9 +13599,6 @@ msgstr "Registreringen misslyckades"
 #~ msgid "A_djust to status"
 #~ msgstr "Justera _efter status"
 
-#~ msgid "Priority will change automatically according to your status."
-#~ msgstr "Prioritet kommer att ändras automatiskt beroende på din status."
-
 #~ msgid "Anonymous authentication"
 #~ msgstr "Anonym autentisering"
 
@@ -12996,9 +13713,6 @@ msgstr "Registreringen misslyckades"
 #~ msgid "_Edit Personal Information..."
 #~ msgstr "R_edigera personlig information..."
 
-#~ msgid "Information about you, as stored in the server"
-#~ msgstr "Information om dig, som den är sparad på servern"
-
 #~ msgid "<b>Personal Information</b>"
 #~ msgstr "<b>Personlig information</b>"
 
@@ -13035,12 +13749,6 @@ msgstr "Registreringen misslyckades"
 #~ msgid "Account Name Already Used"
 #~ msgstr "Kontonamn används redan"
 
-#~ msgid ""
-#~ "This name is already used by another of your accounts. Please choose "
-#~ "another name."
-#~ msgstr ""
-#~ "Detta namn används redan av ett annat av dina konton. Välj ett annat namn."
-
 #~ msgid "Invalid account name"
 #~ msgstr "Ogiltigt kontonamn"
 
@@ -13075,9 +13783,6 @@ msgstr "Registreringen misslyckades"
 #~ msgid "Your server can't save your personal information."
 #~ msgstr "Din server kan inte spara din personliga information."
 
-#~ msgid "Account Local already exists."
-#~ msgstr "Kontot Local används redan."
-
 #~ msgid "Please rename or remove it before enabling link-local messaging."
 #~ msgstr ""
 #~ "Byt namn eller ta bort det innan du aktiverar link-local-meddelanden."
@@ -13164,10 +13869,6 @@ msgstr "Registreringen misslyckades"
 #~ msgid "The following message was NOT encrypted"
 #~ msgstr "Följande meddelande var INTE krypterat"
 
-#, fuzzy
-#~ msgid "Encryption used for this contact."
-#~ msgstr "Aktivera ESessions-kryptering för detta konto."
-
 #~ msgid "Toggle Open_PGP Encryption"
 #~ msgstr "Växla Open_PGP-kryptering"
 
@@ -13240,10 +13941,6 @@ msgstr "Registreringen misslyckades"
 #~ msgid "Contact's identity verified"
 #~ msgstr "Kontaktens identitet är verifierad"
 
-#, fuzzy
-#~ msgid "Verify again…"
-#~ msgstr "Verifiera igen..."
-
 #~ msgid "Contact's identity NOT verified"
 #~ msgstr "Kontaktens identitet är INTE verifierad"
 
@@ -13331,9 +14028,6 @@ msgstr "Registreringen misslyckades"
 #~ msgid "Add _Contact..."
 #~ msgstr "Lägg till _kontakt..."
 
-#~ msgid "_Accounts"
-#~ msgstr "K_onton"
-
 #~ msgid "Profile, A_vatar"
 #~ msgstr "Profil, a_vatar"
 
@@ -13550,12 +14244,6 @@ msgstr "Registreringen misslyckades"
 #~ msgid "Activity: "
 #~ msgstr "Aktivitet:"
 
-#~ msgid "Join _Group Chat..."
-#~ msgstr "Gå in i _gruppchatt..."
-
-#~ msgid "_Modify Account"
-#~ msgstr "_Redigera konto"
-
 #~ msgid "Check on startup if Gajim is the _default Jabber client"
 #~ msgstr "Kontrollera vid uppstart om Gajim är _standardklient för Jabber"
 
@@ -14164,9 +14852,6 @@ msgstr "Registreringen misslyckades"
 #~ msgid "[This message is encrypted]"
 #~ msgstr "[Det här meddelandet är krypterat]"
 
-#~ msgid "Trayicon"
-#~ msgstr "Aktivitetsikon"
-
 #~ msgid "A icon in systemtray reflecting the current presence."
 #~ msgstr "En ikon i aktivitetsfältet som beskriver aktuell närvaro."
 
@@ -14202,9 +14887,6 @@ msgstr "Registreringen misslyckades"
 #~ msgid "Nickname not found: %s"
 #~ msgstr "Smeknamnet kunde inte hittas: %s"
 
-#~ msgid "This group chat has no subject"
-#~ msgstr "Denna gruppchatt saknar ämne"
-
 #, fuzzy
 #~ msgid ""
 #~ "Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
@@ -14322,9 +15004,6 @@ msgstr "Registreringen misslyckades"
 #~ msgstr ""
 #~ "Klicka för att visa funktioner (som MSN, ICQ-transporter) på jabberservrar"
 
-#~ msgid "_Host:"
-#~ msgstr "_Värd:"
-
 #~ msgid "Modify Account"
 #~ msgstr "Redigera konto"
 
@@ -14511,9 +15190,6 @@ msgstr "Registreringen misslyckades"
 #~ msgid "_Player:"
 #~ msgstr "_Spelare:"
 
-#~ msgid "Address"
-#~ msgstr "Adress"
-
 #~ msgid "Role:"
 #~ msgstr "Roll:"
 
@@ -14567,9 +15243,6 @@ msgstr "Registreringen misslyckades"
 #~ msgid "Session Management support not available (missing gnome.ui module)"
 #~ msgstr "Session Management-stöd inte tillgängligt (saknar gnome.ui-modul)"
 
-#~ msgid "Private Chat"
-#~ msgstr "Privat Chatt"
-
 #~ msgid "%s does not appear to be a valid JID"
 #~ msgstr "%s verkar inte vara ett giltigt JID"
 
@@ -14648,9 +15321,6 @@ msgstr "Registreringen misslyckades"
 #~ msgid "Soliloquy"
 #~ msgstr "Monolog"
 
-#~ msgid "A_fter nickname:"
-#~ msgstr "E_fter smeknamn:"
-
 #~ msgid "_After time:"
 #~ msgstr "Efter tid:"
 
@@ -14813,9 +15483,6 @@ msgstr "Registreringen misslyckades"
 #~ msgid "Timeout"
 #~ msgstr "Timeout"
 
-#~ msgid "account: "
-#~ msgstr "konto: "
-
 #~ msgid "Activate/Disable notification for when a file transfer is complete"
 #~ msgstr "Aktivera/Deaktivera notifiering för färdiga filöverföringar"
 
@@ -14907,9 +15574,6 @@ msgstr "Registreringen misslyckades"
 #~ msgid "_Earliest"
 #~ msgstr "_Tidigast"
 
-#~ msgid "_Latest"
-#~ msgstr "_Tidigaste"
-
 #~ msgid "%s is now %s: %s"
 #~ msgstr "%s är nu %s: %s"
 
diff --git a/po/tr.po b/po/tr.po
index 4de0ceb06..d81e0f03e 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: 2019-07-02 02:06+0000\n"
+"POT-Creation-Date: 2019-08-11 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,70 +18,70 @@ 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:550
+#: gajim/chat_control_base.py:557
 msgid "_Undo"
 msgstr "_Geri Al"
 
-#: gajim/chat_control_base.py:558 gajim/conversation_textview.py:529
+#: gajim/chat_control_base.py:565 gajim/conversation_textview.py:529
 msgid "_Clear"
 msgstr "_Temizle"
 
-#: gajim/chat_control_base.py:563
+#: gajim/chat_control_base.py:570
 msgid "Paste as quote"
 msgstr ""
 
-#: gajim/chat_control_base.py:613
+#: gajim/chat_control_base.py:620
 #, fuzzy
 msgid "Paste Image"
 msgstr "Resim seç"
 
-#: gajim/chat_control_base.py:614
+#: gajim/chat_control_base.py:621
 msgid "You are trying to paste an image"
 msgstr ""
 
-#: gajim/chat_control_base.py:615
+#: gajim/chat_control_base.py:622
 #, 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:617 gajim/groupchat_control.py:2310
-#: gajim/roster_window.py:2848 gajim/roster_window.py:4167
-#: gajim/message_window.py:252 gajim/gtk/dialogs.py:418
+#: gajim/chat_control_base.py:624 gajim/groupchat_control.py:2218
+#: gajim/roster_window.py:2841 gajim/roster_window.py:4118
+#: gajim/message_window.py:359 gajim/gtk/dialogs.py:330
 #, fuzzy
 msgid "_Do not ask me again"
 msgstr "Bu iletişim kutusunu bir daha _gösterme"
 
-#: gajim/chat_control_base.py:620
+#: gajim/chat_control_base.py:627
 msgid "_Paste"
 msgstr ""
 
-#: gajim/chat_control_base.py:1162 gajim/gtk/accounts.py:351
+#: gajim/chat_control_base.py:1169 gajim/gtk/accounts.py:354
 #, fuzzy
 msgid "Privacy"
 msgstr "Geçersiz Liste İsmi"
 
-#: gajim/chat_control_base.py:1163
+#: gajim/chat_control_base.py:1170
 #, fuzzy
 msgid "Warning"
 msgstr "ben burdaysam"
 
-#: gajim/chat_control_base.py:1164
+#: gajim/chat_control_base.py:1171
 #, python-format
 msgid "If you send a file to <b>%s</b>, your real JID will be revealed."
 msgstr ""
 
-#: gajim/chat_control_base.py:1169
+#: gajim/chat_control_base.py:1176
 #, fuzzy
 msgid "Continue"
 msgstr "_Devam"
 
-#: gajim/gtkgui_helpers.py:163 gajim/gtk/filetransfer.py:393
+#: gajim/gtkgui_helpers.py:163 gajim/gtk/filetransfer.py:398
 #, fuzzy, python-format
 msgid "Cannot overwrite existing file '%s'"
 msgstr "\"%s\" mevcut dosyanın üzerine yazılamıyor"
 
-#: gajim/gtkgui_helpers.py:164 gajim/gtk/filetransfer.py:394
+#: gajim/gtkgui_helpers.py:164 gajim/gtk/filetransfer.py:399
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
@@ -165,390 +165,396 @@ msgstr "Bekleyen üyelemek soru yok."
 msgid " resource with priority "
 msgstr "Beni bir açılan pencereyle _haberle"
 
-#: gajim/gui_menu_builder.py:96
-msgid "_New Group Chat"
-msgstr "_Yeni Bir Grup Sohbeti"
-
-#: gajim/gui_menu_builder.py:289 gajim/gui_menu_builder.py:380
-#: gajim/chat_control.py:303 gajim/roster_window.py:786
-#: gajim/roster_window.py:1719 gajim/roster_window.py:1721
-#: gajim/roster_window.py:2030 gajim/roster_window.py:3336
-#: gajim/roster_window.py:3369 gajim/gui_interface.py:413
-#: gajim/common/contacts.py:206 gajim/common/contacts.py:343
-#: gajim/common/helpers.py:83 gajim/common/helpers.py:311
-#: gajim/gtk/add_contact.py:319 gajim/gtk/subscription_request.py:70
-#: gajim/gtk/subscription_request.py:99 gajim/gtk/roster_item_exchange.py:112
-#, fuzzy
-msgid "Not in Roster"
-msgstr "Kişi listesindeki olayları göster"
+#: gajim/gui_menu_builder.py:251 gajim/gui_menu_builder.py:342
+#: gajim/chat_control.py:305 gajim/roster_window.py:783
+#: gajim/roster_window.py:1716 gajim/roster_window.py:1718
+#: gajim/roster_window.py:2027 gajim/roster_window.py:3292
+#: gajim/roster_window.py:3325 gajim/gui_interface.py:396
+#: gajim/common/contacts.py:222 gajim/common/contacts.py:359
+#: gajim/common/contacts.py:471 gajim/common/helpers.py:86
+#: gajim/common/helpers.py:317 gajim/gtk/add_contact.py:319
+#: gajim/gtk/subscription_request.py:70 gajim/gtk/subscription_request.py:99
+#: gajim/gtk/roster_item_exchange.py:112
+#, fuzzy
+msgid "Not in contact list"
+msgstr "_Çevredışı Kişileri Göster"
 
-#: gajim/gui_menu_builder.py:393
+#: gajim/gui_menu_builder.py:355
 #, fuzzy
-msgid "I would like to add you to my roster"
-msgstr "Seni benim kişi listeye eklemek isterdim"
+msgid "I would like to add you to my contact list"
+msgstr "Seni kişi listeme eklemek isterdim"
 
-#: gajim/gui_menu_builder.py:471
+#: gajim/gui_menu_builder.py:433
 #, fuzzy
 msgid "Send Single _Message…"
 msgstr "Tek bir İlet gönder"
 
-#: gajim/gui_menu_builder.py:486
+#: gajim/gui_menu_builder.py:448
 #, fuzzy
 msgid "E_xecute Command…"
 msgstr "Komuta _Yürüt"
 
-#: gajim/gui_menu_builder.py:494
+#: gajim/gui_menu_builder.py:456
 #, fuzzy
 msgid "_Manage Transport"
 msgstr "Aktarım protokolü"
 
-#: gajim/gui_menu_builder.py:500
+#: gajim/gui_menu_builder.py:462
 #, fuzzy
 msgid "_Modify Transport"
 msgstr "Aktarım protokolü"
 
-#: gajim/gui_menu_builder.py:507 gajim/roster_window.py:5046
+#: gajim/gui_menu_builder.py:469 gajim/roster_window.py:4985
 #, fuzzy
 msgid "_Rename…"
 msgstr "_Ad Değiştir"
 
-#: gajim/gui_menu_builder.py:518 gajim/roster_window.py:5062
-#: gajim/roster_window.py:5177 gajim/data/gui/blocked_contacts_window.ui:52
+#: gajim/gui_menu_builder.py:480 gajim/roster_window.py:5001
+#: gajim/roster_window.py:5116 gajim/data/gui/blocked_contacts_window.ui:52
 #: gajim/data/gui/gc_occupants_menu.ui:148
 #: gajim/data/gui/contact_context_menu.ui:143
 msgid "_Unblock"
 msgstr "Engellemeyi _Kaldır"
 
-#: gajim/gui_menu_builder.py:521 gajim/roster_window.py:5067
-#: gajim/roster_window.py:5181 gajim/data/gui/gc_occupants_menu.ui:140
+#: gajim/gui_menu_builder.py:483 gajim/roster_window.py:5006
+#: gajim/roster_window.py:5120 gajim/data/gui/gc_occupants_menu.ui:140
 #: gajim/data/gui/contact_context_menu.ui:151
 msgid "_Block"
 msgstr "_Engelle"
 
-#: gajim/gui_menu_builder.py:529 gajim/roster_window.py:5074
+#: gajim/gui_menu_builder.py:491 gajim/roster_window.py:5013
 #: gajim/data/gui/contact_context_menu.ui:181
 msgid "Remo_ve"
 msgstr "K_aldır"
 
-#: gajim/gui_menu_builder.py:539 gajim/data/gui/contact_context_menu.ui:198
+#: gajim/gui_menu_builder.py:501 gajim/data/gui/contact_context_menu.ui:198
 msgid "_Information"
 msgstr "_Bilgi"
 
-#: gajim/gui_menu_builder.py:552
+#: gajim/gui_menu_builder.py:514
 #, fuzzy
 msgid "Save _As"
 msgstr "Sahip"
 
-#: gajim/gui_menu_builder.py:564 gajim/groupchat_control.py:501
-#: gajim/chat_control.py:340
+#: gajim/gui_menu_builder.py:526 gajim/groupchat_control.py:507
+#: gajim/chat_control.py:342
 #, fuzzy
 msgid "Send File…"
 msgstr "_Dosya Gönder…"
 
-#: gajim/gui_menu_builder.py:565
+#: gajim/gui_menu_builder.py:527
 #, fuzzy
 msgid "Upload File…"
 msgstr "Dosya Farklı Kaydet..."
 
-#: gajim/gui_menu_builder.py:566
+#: gajim/gui_menu_builder.py:528
 #, fuzzy
 msgid "Send File Directly…"
 msgstr "Dosya Farklı Kaydet..."
 
-#: gajim/gui_menu_builder.py:568 gajim/gui_menu_builder.py:632
+#: gajim/gui_menu_builder.py:530 gajim/gui_menu_builder.py:596
 #, fuzzy
 msgid "Send Chatstate"
 msgstr "Son durum: %s"
 
-#: gajim/gui_menu_builder.py:569
+#: gajim/gui_menu_builder.py:531
 #, fuzzy
 msgid "Invite Contacts"
 msgstr "Kişi Davet _Et"
 
-#: gajim/gui_menu_builder.py:570
+#: gajim/gui_menu_builder.py:532
 #, fuzzy
-msgid "Add to Roster"
-msgstr "Kişi listeye _ekle…"
+msgid "Add to Contact List"
+msgstr "Kişi _ekle"
 
-#: gajim/gui_menu_builder.py:571
+#: gajim/gui_menu_builder.py:533
 #, fuzzy
-msgid "Audio Session"
-msgstr "Ses testi"
+msgid "Voice Chat"
+msgstr "Dosya Gönderme Soru"
 
-#: gajim/gui_menu_builder.py:572
+#: gajim/gui_menu_builder.py:534
 #, fuzzy
-msgid "Video Session"
+msgid "Video Chat"
 msgstr "Video testi"
 
-#: gajim/gui_menu_builder.py:573
+#: gajim/gui_menu_builder.py:535 gajim/gui_menu_builder.py:582
 #, fuzzy
 msgid "Information"
 msgstr "_Bilgi"
 
-#: gajim/gui_menu_builder.py:574 gajim/gui_menu_builder.py:639
+#: gajim/gui_menu_builder.py:536 gajim/gui_menu_builder.py:602
 #: gajim/data/gui/application_menu.ui:37
 #, fuzzy
 msgid "History"
 msgstr "_Geçmiş"
 
-#: gajim/gui_menu_builder.py:580 gajim/gui_menu_builder.py:687
+#: gajim/gui_menu_builder.py:542 gajim/gui_menu_builder.py:650
 #: gajim/data/gui/preferences_window.ui:1823
 msgid "Disabled"
 msgstr "Geçersizleşti"
 
-#: gajim/gui_menu_builder.py:581 gajim/gui_menu_builder.py:688
+#: gajim/gui_menu_builder.py:543 gajim/gui_menu_builder.py:651
 msgid "Composing only"
 msgstr "Sadece yazıştırıyor"
 
-#: gajim/gui_menu_builder.py:582 gajim/gui_menu_builder.py:689
+#: gajim/gui_menu_builder.py:544 gajim/gui_menu_builder.py:652
 msgid "All chat states"
 msgstr "Bütün sohbet durumlar"
 
-#: gajim/gui_menu_builder.py:620
+#: gajim/gui_menu_builder.py:583
 #, fuzzy
-msgid "Manage Room"
-msgstr "Yer imlerini işlet"
+msgid "Manage Group Chat"
+msgstr "Tam-Ekrandan Çık"
 
-#: gajim/gui_menu_builder.py:621
+#: gajim/gui_menu_builder.py:584 gajim/data/gui/groupchat_control.ui:649
 #, fuzzy
 msgid "Change Subject"
 msgstr "Konuk Değiştiriliyor"
 
-#: gajim/gui_menu_builder.py:622
+#: gajim/gui_menu_builder.py:585
 #, fuzzy
-msgid "Configure Room"
-msgstr "Çevrimiçi Servisler"
+msgid "Configure Group Chat"
+msgstr "Tam-Ekrandan Çık"
 
-#: gajim/gui_menu_builder.py:623
+#: gajim/gui_menu_builder.py:586
 #, fuzzy
 msgid "Upload Avatar…"
 msgstr "Resim seç"
 
-#: gajim/gui_menu_builder.py:624
-msgid "Destroy Room"
-msgstr ""
+#: gajim/gui_menu_builder.py:587
+#, fuzzy
+msgid "Destroy Group Chat"
+msgstr "_Yeni Bir Grup Sohbeti"
 
-#: gajim/gui_menu_builder.py:626 gajim/data/gui/preferences_window.ui:790
+#: gajim/gui_menu_builder.py:589 gajim/data/gui/preferences_window.ui:790
 #, fuzzy
 msgid "Chat Settings"
 msgstr "Bağlantı Kurulamıyor"
 
-#: gajim/gui_menu_builder.py:627
+#: gajim/gui_menu_builder.py:590
 msgid "Show join/leave"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:628
+#: gajim/gui_menu_builder.py:591
 #, fuzzy
 msgid "Show status changes"
 msgstr "Tüm _durum değişikliklerini sistem günlüğüne kaydet"
 
-#: gajim/gui_menu_builder.py:629 gajim/data/gui/gc_control_popup_menu.ui:72
+#: gajim/gui_menu_builder.py:592 gajim/data/gui/gc_control_popup_menu.ui:72
 #, fuzzy
 msgid "Notify on all messages"
 msgstr "Önceden hazırlanmış iletleri:"
 
-#: gajim/gui_menu_builder.py:630
+#: gajim/gui_menu_builder.py:593
 #, fuzzy
 msgid "Minimize on close"
 msgstr "Kapatınca küçült"
 
-#: gajim/gui_menu_builder.py:631
+#: gajim/gui_menu_builder.py:595
 #, fuzzy
-msgid "Minimize on autojoin"
+msgid "Minimize when joining automatically"
 msgstr "Kendilinden Katılınca Küçült"
 
-#: gajim/gui_menu_builder.py:634
+#: gajim/gui_menu_builder.py:598
 msgid "Sync Threshold"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:635
+#: gajim/gui_menu_builder.py:599
 #, fuzzy
-msgid "Change Nick"
+msgid "Change Nickname"
 msgstr "Takma Ad Ayarla"
 
-#: gajim/gui_menu_builder.py:636
-#, fuzzy
-msgid "Bookmark Room"
-msgstr "Bu odayi yer imle"
-
-#: gajim/gui_menu_builder.py:637
+#: gajim/gui_menu_builder.py:600
 #, fuzzy
 msgid "Request Voice"
 msgstr "_Ses"
 
-#: gajim/gui_menu_builder.py:638 gajim/roster_window.py:5246
+#: gajim/gui_menu_builder.py:601 gajim/roster_window.py:5185
 #, fuzzy
 msgid "Execute command"
 msgstr "Komuta _Yürüt"
 
-#: gajim/gui_menu_builder.py:640
-#, fuzzy
-msgid "Disconnect"
-msgstr "Bağlantıyı _kes"
+#: gajim/gui_menu_builder.py:603
+msgid "Leave"
+msgstr ""
 
-#: gajim/gui_menu_builder.py:678 gajim/gtk/preferences.py:156
+#: gajim/gui_menu_builder.py:641 gajim/gtk/preferences.py:155
 msgid "No threshold"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:680 gajim/gtk/preferences.py:158
+#: gajim/gui_menu_builder.py:643 gajim/gtk/preferences.py:157
 #, python-format
 msgid "%i day"
 msgid_plural "%i days"
 msgstr[0] ""
 
-#: gajim/gui_menu_builder.py:709 gajim/gui_menu_builder.py:747
-#: gajim/gtk/join_groupchat.py:43
-msgid "Join Group Chat"
-msgstr "Grup Sohbete Katıl"
-
-#: gajim/gui_menu_builder.py:746
+#: gajim/gui_menu_builder.py:672
 #, fuzzy
 msgid "Add Contact…"
 msgstr "Kişi _ekle"
 
-#: gajim/gui_menu_builder.py:748 gajim/gtk/profile.py:52
-#: gajim/gtk/accounts.py:770 gajim/gtk/accounts.py:808
+#: gajim/gui_menu_builder.py:673 gajim/gtk/profile.py:52
+#: gajim/gtk/accounts.py:773 gajim/gtk/accounts.py:811
 #, fuzzy
 msgid "Profile"
 msgstr "dosya"
 
-#: gajim/gui_menu_builder.py:749
+#: gajim/gui_menu_builder.py:674
+#, fuzzy
+msgid "Send Single Message…"
+msgstr "Tek bir İlet gönder"
+
+#: gajim/gui_menu_builder.py:675
 msgid "Discover Services"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:750
+#: gajim/gui_menu_builder.py:676 gajim/gtk/server_info.py:36
 #, fuzzy
-msgid "Send Single Message…"
-msgstr "Tek bir İlet gönder"
+msgid "Server Info"
+msgstr "_Sunuc:"
 
-#: gajim/gui_menu_builder.py:751 gajim/data/gui/preferences_window.ui:2741
+#: gajim/gui_menu_builder.py:677 gajim/data/gui/preferences_window.ui:2741
 msgid "Advanced"
 msgstr "İlerlemiş"
 
-#: gajim/gui_menu_builder.py:752 gajim/gtk/mam_preferences.py:88
+#: gajim/gui_menu_builder.py:678 gajim/gtk/mam_preferences.py:88
 #, fuzzy
 msgid "Archiving Preferences"
 msgstr "Tercihler"
 
-#: gajim/gui_menu_builder.py:753
+#: gajim/gui_menu_builder.py:679
 #, fuzzy
 msgid "Blocking List"
 msgstr "Geçersiz Liste İsmi"
 
-#: gajim/gui_menu_builder.py:754 gajim/gtk/history_sync.py:108
+#: gajim/gui_menu_builder.py:680
+#, fuzzy
+msgid "Bookmarks"
+msgstr "_Yer imi"
+
+#: gajim/gui_menu_builder.py:681
+#, fuzzy
+msgid "PEP Configuration"
+msgstr "Oda Yerleştirme"
+
+#: gajim/gui_menu_builder.py:682 gajim/gtk/history_sync.py:108
 #: gajim/gtk/history_sync.py:186
 #, fuzzy
 msgid "Synchronise History"
 msgstr "Kişileri eşzamana getir"
 
-#: gajim/gui_menu_builder.py:755 gajim/gtk/privacy_list.py:427
+#: gajim/gui_menu_builder.py:683 gajim/gtk/privacy_list.py:427
 #, fuzzy
 msgid "Privacy Lists"
 msgstr "Kişisel Gizlilik Listesini biçimle"
 
-#: gajim/gui_menu_builder.py:756 gajim/gtk/server_info.py:36
-#, fuzzy
-msgid "Server Info"
-msgstr "_Sunuc:"
-
-#: gajim/gui_menu_builder.py:757 gajim/gui_menu_builder.py:768
+#: gajim/gui_menu_builder.py:685 gajim/gui_menu_builder.py:696
 #: gajim/data/gui/xml_console_window.ui:77
 #, fuzzy
 msgid "XML Console"
 msgstr "_XML Konsolu Göster"
 
-#: gajim/gui_menu_builder.py:759 gajim/data/gui/groupchat_config.ui:36
+#: gajim/gui_menu_builder.py:687 gajim/data/gui/groupchat_config.ui:36
 #, fuzzy
 msgid "Admin"
 msgstr "_Yönetici"
 
-#: gajim/gui_menu_builder.py:760
+#: gajim/gui_menu_builder.py:688
 #, fuzzy
 msgid "Send Server Message…"
 msgstr "Tek Bir İleti Gönder…"
 
-#: gajim/gui_menu_builder.py:761
+#: gajim/gui_menu_builder.py:689
 #, fuzzy
 msgid "Set MOTD…"
 msgstr "MOTD'yi yaz"
 
-#: gajim/gui_menu_builder.py:762
+#: gajim/gui_menu_builder.py:690
 #, fuzzy
 msgid "Update MOTD…"
 msgstr "MOTD'yi yenileştir"
 
-#: gajim/gui_menu_builder.py:763
+#: gajim/gui_menu_builder.py:691
 #, fuzzy
 msgid "Delete MOTD…"
 msgstr "Sil"
 
-#: gajim/gui_menu_builder.py:812
+#: gajim/gui_menu_builder.py:736
 #, fuzzy
-msgid "No Accounts available"
-msgstr "Hiç bir hesap bulunmiyor"
+msgid "_Add Account…"
+msgstr "Kişi _ekle"
 
-#: gajim/gui_menu_builder.py:823 gajim/data/gui/application_menu.ui:5
-#: gajim/data/gui/application_menu.ui:71 gajim/data/gui/shortcuts_window.ui:182
-#: gajim/gtk/accounts.py:58
+#: gajim/gui_menu_builder.py:742
+#, fuzzy
+msgid "_Modify Accounts…"
+msgstr "%s hesaptan"
+
+#: gajim/gui_menu_builder.py:751 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:755 gajim/data/gui/application_menu.ui:5
+#: gajim/data/gui/shortcuts_window.ui:182 gajim/gtk/accounts.py:57
 msgid "Accounts"
 msgstr "Hesaplar"
 
-#: gajim/gui_menu_builder.py:881 gajim/gui_menu_builder.py:886
+#: gajim/gui_menu_builder.py:784 gajim/gui_menu_builder.py:789
 #, fuzzy
-msgid "Copy JID"
-msgstr "Oda JID"
+msgid "Copy XMPP Address"
+msgstr "AIM Adres:"
 
-#: gajim/gui_menu_builder.py:882 gajim/gui_menu_builder.py:914
+#: gajim/gui_menu_builder.py:785 gajim/gui_menu_builder.py:817
 #, fuzzy
 msgid "Join Groupchat"
 msgstr "Grup Sohbete Katıl"
 
-#: gajim/gui_menu_builder.py:887 gajim/gui_menu_builder.py:913
-#: gajim/data/gui/application_menu.ui:76
+#: gajim/gui_menu_builder.py:790 gajim/gui_menu_builder.py:816
+#: gajim/data/gui/application_menu.ui:71
 #: gajim/data/gui/subscription_request_window.ui:106
 #, fuzzy
 msgid "Start Chat"
 msgstr "Sohbet _Başla"
 
-#: gajim/gui_menu_builder.py:888 gajim/gui_menu_builder.py:915
+#: gajim/gui_menu_builder.py:791 gajim/gui_menu_builder.py:818
 #, fuzzy
-msgid "Add to Roster…"
-msgstr "Kişi listeye _ekle…"
+msgid "Add to Contact List…"
+msgstr "Kişi _ekle"
 
-#: gajim/gui_menu_builder.py:893
+#: gajim/gui_menu_builder.py:796
 msgid "Copy Link Location"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:894
+#: gajim/gui_menu_builder.py:797
 #, fuzzy
 msgid "Open Link in Browser"
 msgstr "Gmail Gelen Kutusunu _Aç"
 
-#: gajim/gui_menu_builder.py:899
+#: gajim/gui_menu_builder.py:802
 msgid "Copy Email Address"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:900 gajim/gui_menu_builder.py:912
+#: gajim/gui_menu_builder.py:803 gajim/gui_menu_builder.py:815
 #, fuzzy
 msgid "Open Email Composer"
 msgstr "Gmail Gelen Kutusunu _Aç"
 
-#: gajim/gui_menu_builder.py:905
+#: gajim/gui_menu_builder.py:808
 #, fuzzy
 msgid "Copy Location"
 msgstr "Yer:"
 
-#: gajim/gui_menu_builder.py:906
+#: gajim/gui_menu_builder.py:809
 #, fuzzy
 msgid "Show Location"
 msgstr "Yer:"
 
-#: gajim/gui_menu_builder.py:911
-#, fuzzy
-msgid "Copy JID/Email"
-msgstr "Oda JID"
+#: gajim/gui_menu_builder.py:814
+msgid "Copy XMPP Address/Email"
+msgstr ""
 
-#: gajim/gui_menu_builder.py:945
+#: gajim/gui_menu_builder.py:852
 #, fuzzy
 msgid "Copy"
 msgstr "Oda JID"
@@ -571,44 +577,56 @@ msgstr ""
 msgid "Choose folder for logfile"
 msgstr ""
 
-#: gajim/history_manager.py:107
+#: gajim/history_manager.py:106
 msgid "Cannot find history logs database"
 msgstr ""
 
-#: gajim/history_manager.py:108
+#: gajim/history_manager.py:107
 #, fuzzy, python-format
 msgid "%s does not exist."
 msgstr "Dosya mevcut değil"
 
-#: gajim/history_manager.py:141 gajim/history_manager.py:195
-#: gajim/gtk/discovery.py:829 gajim/gtk/roster_item_exchange.py:80
-msgid "JID"
-msgstr "JID"
+#: gajim/history_manager.py:140 gajim/history_manager.py:194
+#: 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:30
+#: gajim/gtk/accounts.py:804
+#, fuzzy
+msgid "XMPP Address"
+msgstr "AIM Adres:"
 
-#: gajim/history_manager.py:154 gajim/history_manager.py:202
+#: gajim/history_manager.py:153 gajim/history_manager.py:201
 #: gajim/data/gui/history_window.ui:89 gajim/gtk/history.py:108
 msgid "Date"
 msgstr "Tarih"
 
-#: gajim/history_manager.py:161 gajim/history_manager.py:225
+#: gajim/history_manager.py:160 gajim/history_manager.py:224
 #: gajim/data/gui/join_groupchat_window.ui:208
 #: gajim/data/gui/profile_window.ui:214
 #: gajim/data/gui/vcard_information_window.ui:443
+#: gajim/data/gui/bookmarks.ui:140
 msgid "Nickname"
 msgstr "Takma ad"
 
-#: gajim/history_manager.py:172 gajim/history_manager.py:211
+#: gajim/history_manager.py:171 gajim/history_manager.py:210
 #: gajim/data/gui/preferences_window.ui:1344
 #: gajim/data/gui/single_message_window.ui:275 gajim/gtk/history.py:117
 msgid "Message"
 msgstr "İleti"
 
-#: gajim/history_manager.py:180 gajim/history_manager.py:218
+#: gajim/history_manager.py:179 gajim/history_manager.py:217
 #: gajim/data/gui/groups_post_window.ui:49
 #: gajim/data/gui/single_message_window.ui:214
 msgid "Subject"
 msgstr "Konu"
 
+#: gajim/history_manager.py:247
+#, fuzzy
+msgid "Database Cleanup"
+msgstr "Hata açıklaması…"
+
 #: gajim/history_manager.py:248
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
@@ -617,53 +635,50 @@ msgstr ""
 
 #: gajim/history_manager.py:250
 msgid ""
-"Normally allocated database size will not be freed, it will just become "
-"reusable. If you really want to reduce database filesize, click YES, else "
-"click NO.\n"
-"\n"
-"In case you click YES, please wait…"
+"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
 #, fuzzy
-msgid "Database Cleanup"
-msgstr "Hata açıklaması…"
+msgid "_Cleanup"
+msgstr "Temizle"
 
-#: gajim/history_manager.py:519 gajim/gtk/filetransfer.py:238
-#: gajim/gtk/filetransfer.py:248
+#: gajim/history_manager.py:518 gajim/gtk/filetransfer.py:237
+#: gajim/gtk/filetransfer.py:247
 msgid "You"
 msgstr "Sen"
 
-#: gajim/history_manager.py:531
+#: gajim/history_manager.py:530
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr ""
 
-#: gajim/history_manager.py:568 gajim/history_manager.py:607
-#: gajim/gtk/dialogs.py:58 gajim/gtk/themes.py:319
+#: gajim/history_manager.py:567 gajim/history_manager.py:606
+#: gajim/gtk/dialogs.py:57 gajim/gtk/themes.py:319
 #: gajim/gtk/roster_item_exchange.py:75 gajim/gtk/roster_item_exchange.py:185
 msgid "Delete"
 msgstr "Sil"
 
-#: gajim/history_manager.py:569
+#: gajim/history_manager.py:568
 #, fuzzy
 msgid "Delete Conversation"
 msgid_plural "Delete Conversations"
 msgstr[0] "Dosya transferi iptal et"
 
-#: gajim/history_manager.py:570
+#: gajim/history_manager.py:569
 #, 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:608
+#: gajim/history_manager.py:607
 #, fuzzy
 msgid "Delete Message"
 msgid_plural "Delete Messages"
 msgstr[0] "Öntanımlı İlet"
 
-#: gajim/history_manager.py:609
+#: gajim/history_manager.py:608
 #, fuzzy
 msgid "Do you want to permanently delete this message"
 msgid_plural "Do you want to permanently delete these messages"
@@ -675,15 +690,15 @@ msgid "Contact name: <i>%s</i>"
 msgstr "İlk Ad:"
 
 #: gajim/dialogs.py:84
-#, fuzzy, python-format
-msgid "JID: <i>%s</i>"
-msgstr "Jabber kimliği: <i>%s</i>"
+#, python-format
+msgid "XMPP Address: <i>%s</i>"
+msgstr ""
 
-#: gajim/dialogs.py:115 gajim/dialogs.py:128 gajim/roster_window.py:2901
-#: gajim/roster_window.py:3833 gajim/roster_window.py:5084
-#: gajim/common/contacts.py:157 gajim/common/contacts.py:190
+#: gajim/dialogs.py:115 gajim/dialogs.py:128 gajim/roster_window.py:2894
+#: gajim/roster_window.py:3784 gajim/roster_window.py:5023
+#: gajim/common/contacts.py:157 gajim/common/contacts.py:206
 #: gajim/data/gui/preferences_window.ui:558
-#: gajim/data/gui/shortcuts_window.ui:177 gajim/gtk/accounts.py:349
+#: gajim/data/gui/shortcuts_window.ui:177 gajim/gtk/accounts.py:352
 msgid "General"
 msgstr "Genel"
 
@@ -729,7 +744,7 @@ msgstr "Durum ileti değiştir"
 msgid "Preset name is already in use. Do you want to overwrite this preset?"
 msgstr ""
 
-#: gajim/dialogs.py:703
+#: gajim/dialogs.py:703 gajim/plugins/gui.py:292
 msgid "_Overwrite"
 msgstr ""
 
@@ -741,9 +756,7 @@ msgstr ""
 msgid "Please type a name for this status message"
 msgstr ""
 
-#: gajim/dialogs.py:740 gajim/gui_interface.py:1441 gajim/dialog_messages.py:31
-#: gajim/gtk/discovery.py:518 gajim/gtk/profile.py:323
-#: gajim/gtk/join_groupchat.py:234
+#: gajim/dialogs.py:740 gajim/gtk/discovery.py:517 gajim/gtk/profile.py:323
 #, fuzzy
 msgid "You are not connected to the server"
 msgstr "Şu anda bir veritabanına bağlı değilsiniz.\n"
@@ -753,9 +766,11 @@ msgstr "Şu anda bir veritabanına bağlı değilsiniz.\n"
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Bağlantızıs kişisel ilanlar sayfayı yazımlayanmiyor"
 
-#: gajim/dialogs.py:752 gajim/dialogs.py:823 gajim/gtk/discovery.py:822
-#: gajim/gtk/discovery.py:1648 gajim/gtk/discovery.py:1941
-#: gajim/gtk/history.py:99 gajim/gtk/roster_item_exchange.py:83
+#: gajim/dialogs.py:752 gajim/dialogs.py:823
+#: gajim/data/gui/groupchat_info_scrolled.ui:16 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/gtk/roster_item_exchange.py:83
 msgid "Name"
 msgstr "Adı"
 
@@ -777,408 +792,353 @@ msgstr ""
 msgid "Synchronise"
 msgstr "Kişileri eşzamana getir"
 
-#: gajim/dialogs.py:1043
+#: gajim/dialogs.py:1042
 msgid "an audio and video"
 msgstr "bir ses ve video"
 
-#: gajim/dialogs.py:1045
+#: gajim/dialogs.py:1044
 msgid "an audio"
 msgstr "bir ses"
 
-#: gajim/dialogs.py:1047
+#: gajim/dialogs.py:1046
 msgid "a video"
 msgstr "bir video"
 
-#: gajim/dialogs.py:1051
+#: gajim/dialogs.py:1050
 #, python-format
 msgid ""
-"%(contact)s wants to start %(type)s session with you. Do you want to answer "
+"%(contact)s wants to start a %(type)s chat with you. Do you want to answer "
 "the call?"
 msgstr ""
 
-#: gajim/groupchat_control.py:505
+#: gajim/groupchat_control.py:511
 #, fuzzy, python-format
 msgid "Send File (max. %s MiB)…"
 msgstr "Dosya Farklı Kaydet..."
 
-#: gajim/groupchat_control.py:507 gajim/chat_control.py:342
+#: gajim/groupchat_control.py:513 gajim/chat_control.py:344
 #, fuzzy
 msgid "No File Transfer available"
 msgstr "Dosya Gönderme Tamamlandı"
 
-#: gajim/groupchat_control.py:630 gajim/groupchat_control.py:2349
-msgid "Changing Subject"
-msgstr "Konuk Değiştiriliyor"
-
-#: gajim/groupchat_control.py:631 gajim/groupchat_control.py:2350
-#, fuzzy
-msgid "Please specify the new subject:"
-msgstr "Lütfen kendiniz için yeni bir takma ad belirtin."
-
-#: gajim/groupchat_control.py:638
-msgid "Changing Nickname"
-msgstr "Takma Ad Ayarla"
-
-#: gajim/groupchat_control.py:639
-msgid "Please specify the new nickname you want to use:"
-msgstr ""
-
-#: gajim/groupchat_control.py:657
+#: gajim/groupchat_control.py:655
 #, fuzzy
-msgid "Invalid group chat JID"
+msgid "Invalid group chat XMPP Address"
 msgstr "Geçersiz grup sohbet Jabber kimliği"
 
-#: gajim/groupchat_control.py:658
-msgid "The group chat JID has not allowed characters."
-msgstr ""
+#: gajim/groupchat_control.py:656
+#, fuzzy
+msgid "The group chat XMPP Address has not allowed characters."
+msgstr "%s: Kontrol karakterleri kullanılamaz.\n"
 
-#: gajim/groupchat_control.py:758 gajim/gtk/profile.py:136
+#: gajim/groupchat_control.py:743 gajim/gtk/profile.py:136
 msgid "Could not load image"
 msgstr "Resim acılamadı"
 
-#: gajim/groupchat_control.py:888
+#: gajim/groupchat_control.py:873
 msgid "Insert Nickname"
 msgstr "Takma Ad girdir"
 
-#: gajim/groupchat_control.py:1056 gajim/chat_control.py:824
+#: gajim/groupchat_control.py:1041 gajim/chat_control.py:848
 #, fuzzy
 msgid "and authenticated"
 msgstr "bir ses ve video"
 
-#: gajim/groupchat_control.py:1060 gajim/chat_control.py:828
+#: gajim/groupchat_control.py:1045 gajim/chat_control.py:852
 msgid "and NOT authenticated"
 msgstr "ve YETKİLENDİRİLMEMİŞ"
 
-#: gajim/groupchat_control.py:1064
+#: gajim/groupchat_control.py:1049
 #, python-format
 msgid "%(type)s encryption is active %(authenticated)s."
 msgstr ""
 
-#: gajim/groupchat_control.py:1111
+#: gajim/groupchat_control.py:1096
 msgid "Conversation with "
 msgstr "Sohbet"
 
-#: gajim/groupchat_control.py:1113
+#: gajim/groupchat_control.py:1098
 msgid "Continued conversation"
 msgstr "Devam edilen sohbet"
 
-#: gajim/groupchat_control.py:1411
+#: gajim/groupchat_control.py:1357
 #, 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:1433
-msgid "Room now shows unavailable members"
+#: gajim/groupchat_control.py:1374
+msgid "Group chat now shows unavailable members"
 msgstr ""
 
-#: gajim/groupchat_control.py:1436
-msgid "Room now does not show unavailable members"
-msgstr ""
+#: gajim/groupchat_control.py:1377
+#, fuzzy
+msgid "Group chat now does not show unavailable members"
+msgstr "grup %s yok - root kullanılacak\n"
 
-#: gajim/groupchat_control.py:1439
+#: gajim/groupchat_control.py:1380
 msgid "A setting not related to privacy has been changed"
 msgstr ""
 
-#: gajim/groupchat_control.py:1446
-msgid "Room logging is now enabled"
-msgstr ""
+#: gajim/groupchat_control.py:1387 gajim/groupchat_control.py:1659
+#, fuzzy
+msgid "Conversations are stored on the server"
+msgstr "%s: OID (-o) 0 olamaz\n"
 
-#: gajim/groupchat_control.py:1449
-msgid "Room logging is now disabled"
-msgstr ""
+#: gajim/groupchat_control.py:1390
+#, fuzzy
+msgid "Conversations are not stored on the server"
+msgstr "Senin kişimsel informationun, nasıl sunucdaysa"
 
-#: gajim/groupchat_control.py:1452
-msgid "Room is now non-anonymous"
-msgstr ""
+#: gajim/groupchat_control.py:1393
+#, fuzzy
+msgid "Group chat is now non-anonymous"
+msgstr "Grup sohbetler"
 
-#: gajim/groupchat_control.py:1456
-msgid "Room is now semi-anonymous"
-msgstr ""
+#: gajim/groupchat_control.py:1397
+#, fuzzy
+msgid "Group chat is now semi-anonymous"
+msgstr "%s grup sohbete katıldı"
 
-#: gajim/groupchat_control.py:1460
-msgid "Room is now fully anonymous"
-msgstr ""
+#: gajim/groupchat_control.py:1401
+#, fuzzy
+msgid "Group chat is now fully anonymous"
+msgstr "Grup sohbetler"
 
-#: gajim/groupchat_control.py:1500
+#: gajim/groupchat_control.py:1439
 #, fuzzy, python-format
 msgid "Ping? (%s)"
 msgstr "Pong! (%s s.)"
 
-#: gajim/groupchat_control.py:1503
+#: gajim/groupchat_control.py:1442
 #, fuzzy, python-format
 msgid "Pong! (%(nick)s %(delay)s s.)"
 msgstr "Pong! (%s s.)"
 
-#: gajim/groupchat_control.py:1506 gajim/chat_control.py:1213
+#: gajim/groupchat_control.py:1445 gajim/chat_control.py:1237
 msgid "Error."
 msgstr "Hata."
 
-#: gajim/groupchat_control.py:1711
+#: gajim/groupchat_control.py:1650
 #, fuzzy, python-format
-msgid "You (%s) joined the room"
+msgid "You (%s) joined the group chat"
 msgstr "%s grup sohbete katıldı"
 
-#: gajim/groupchat_control.py:1717
-msgid "Any occupant is allowed to see your full JID"
+#: gajim/groupchat_control.py:1655
+msgid "Any participant is allowed to see your full XMPP Address"
 msgstr ""
 
-#: gajim/groupchat_control.py:1721
+#: gajim/groupchat_control.py:1663
 #, fuzzy
-msgid "Room logging is enabled"
-msgstr "Konumlaştırma kapalıdır."
-
-#: gajim/groupchat_control.py:1725
-msgid "The server has assigned or modified your roomnick"
-msgstr ""
+msgid "The server has assigned or modified your nickname in this group chat"
+msgstr "[%s sayfasını okuyamazsınız.]"
 
-#: gajim/groupchat_control.py:1732
-msgid "A new room has been created"
+#: gajim/groupchat_control.py:1671
+#, fuzzy
+msgid "A new group chat has been created"
 msgstr "Yeni bir oda yaratılmıştır"
 
-#: gajim/groupchat_control.py:1740 gajim/privatechat_control.py:112
+#: gajim/groupchat_control.py:1679 gajim/privatechat_control.py:115
 #, python-format
 msgid "You are now known as %s"
 msgstr "Adınızı %s olarak değiştirdiniz"
 
-#: gajim/groupchat_control.py:1742 gajim/privatechat_control.py:114
+#: gajim/groupchat_control.py:1681 gajim/privatechat_control.py:117
 #, python-brace-format
 msgid "{nick} is now known as {new_nick}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1767 gajim/privatechat_control.py:141
+#: gajim/groupchat_control.py:1706 gajim/privatechat_control.py:144
 #, fuzzy, python-brace-format
 msgid "You are now {show}{status}"
 msgstr "Adınızı %s olarak değiştirdiniz"
 
-#: gajim/groupchat_control.py:1773 gajim/privatechat_control.py:147
+#: gajim/groupchat_control.py:1712 gajim/privatechat_control.py:150
 #, fuzzy, python-brace-format
 msgid "{nick} is now {show}{status}"
 msgstr "%(nick)s durumu şimdi %(status)s"
 
-#: gajim/groupchat_control.py:1790 gajim/groupchat_control.py:1819
-#: gajim/groupchat_control.py:1849 gajim/groupchat_control.py:1909
+#: gajim/groupchat_control.py:1729 gajim/groupchat_control.py:1758
+#: gajim/groupchat_control.py:1788 gajim/groupchat_control.py:1848
 #, python-brace-format
 msgid " by {actor}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1793
+#: gajim/groupchat_control.py:1732
 #, fuzzy, python-brace-format
 msgid "** Your Affiliation has been set to {affiliation}{actor}{reason}"
 msgstr "Öntanımlı veritabanı dil kodlaması %s olarak ayarlandı.\n"
 
-#: gajim/groupchat_control.py:1799
+#: gajim/groupchat_control.py:1738
 #, fuzzy, python-brace-format
 msgid "** Affiliation of {nick} has been set to {affiliation}{actor}{reason}"
 msgstr "Öntanımlı veritabanı dil kodlaması %s olarak ayarlandı.\n"
 
-#: gajim/groupchat_control.py:1822
+#: gajim/groupchat_control.py:1761
 #, fuzzy, python-brace-format
 msgid "** Your Role has been set to {role}{actor}{reason}"
 msgstr "Öntanımlı veritabanı dil kodlaması %s olarak ayarlandı.\n"
 
-#: gajim/groupchat_control.py:1827
+#: gajim/groupchat_control.py:1766
 #, fuzzy, python-brace-format
 msgid "** Role of {nick} has been set to {role}{actor}{reason}"
 msgstr "Öntanımlı veritabanı dil kodlaması %s olarak ayarlandı.\n"
 
-#: gajim/groupchat_control.py:1852
-#, python-brace-format
-msgid "You have been removed from the room{actor}{reason}"
-msgstr ""
+#: gajim/groupchat_control.py:1791
+#, fuzzy, python-brace-format
+msgid "You have been removed from the group chat{actor}{reason}"
+msgstr "Öntanımlı veritabanı dil kodlaması %s olarak ayarlandı.\n"
 
-#: gajim/groupchat_control.py:1857
+#: gajim/groupchat_control.py:1796
 #, python-brace-format
 msgid "You have left due to an error{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1863
+#: gajim/groupchat_control.py:1802
 #, python-brace-format
 msgid "You have been kicked{actor}{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1870
+#: gajim/groupchat_control.py:1809
 #, python-brace-format
 msgid "You have been banned{actor}{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1877 gajim/groupchat_control.py:1943
+#: gajim/groupchat_control.py:1816 gajim/groupchat_control.py:1882
 #, fuzzy
 msgid ": Affiliation changed"
 msgstr "üyelik değişti"
 
-#: gajim/groupchat_control.py:1883 gajim/groupchat_control.py:1948
-msgid ": Room configuration changed to members-only"
+#: gajim/groupchat_control.py:1822 gajim/groupchat_control.py:1887
+msgid ": Group chat configuration changed to members-only"
 msgstr ""
 
-#: gajim/groupchat_control.py:1912
-#, python-brace-format
-msgid "{nick} has been removed from the room{by}{reason}"
-msgstr ""
+#: gajim/groupchat_control.py:1851
+#, fuzzy, python-brace-format
+msgid "{nick} has been removed from the group chat{by}{reason}"
+msgstr "%s grup sohbete katıldı"
 
-#: gajim/groupchat_control.py:1922
+#: gajim/groupchat_control.py:1861
 #, python-brace-format
 msgid "{nick} has left due to an error{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1928
+#: gajim/groupchat_control.py:1867
 #, python-brace-format
 msgid "{nick} has been kicked{actor}{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1936
+#: gajim/groupchat_control.py:1875
 #, python-brace-format
 msgid "{nick} has been banned{actor}{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1953
+#: gajim/groupchat_control.py:1892
 #, python-brace-format
 msgid "{nick} has left{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1970
+#: gajim/groupchat_control.py:1914
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s grup sohbete katıldı"
 
-#: gajim/groupchat_control.py:1985 gajim/groupchat_control.py:1990
-#: gajim/groupchat_control.py:1995 gajim/groupchat_control.py:2000
-#: gajim/groupchat_control.py:2011
-msgid "Unable to join group chat"
-msgstr "Grup sohbetine girilemiyor"
-
-#: gajim/groupchat_control.py:1986
-#, fuzzy, python-format
-msgid "You are banned from group chat <b>%s</b>."
-msgstr ""
-"Şuraya bir yorum gönderiyorsunuz:\n"
-"  "
-
-#: gajim/groupchat_control.py:1991
-#, fuzzy, python-format
-msgid "Remote server <b>%s</b> does not exist."
-msgstr "grup %s yok - root kullanılacak\n"
-
-#: gajim/groupchat_control.py:1996
-#, fuzzy, python-format
-msgid "Group chat <b>%s</b> does not exist."
-msgstr "grup %s yok - root kullanılacak\n"
-
-#: gajim/groupchat_control.py:2001
+#: gajim/groupchat_control.py:1981
 #, fuzzy
-msgid "Group chat creation is not permitted."
-msgstr "grup %s yok - root kullanılacak\n"
-
-#: gajim/groupchat_control.py:2005
-#, fuzzy
-msgid "Unable to join groupchat"
-msgstr "Grup eklenemedi: grup zaten var"
-
-#: gajim/groupchat_control.py:2006
-#, python-format
-msgid "You must use your registered nickname in <b>%s</b>."
-msgstr ""
-
-#: gajim/groupchat_control.py:2012
-#, python-format
-msgid "You are not in the members list in groupchat %s."
-msgstr ""
-
-#: gajim/groupchat_control.py:2068
-msgid "Room has been destroyed"
+msgid "Group chat has been destroyed"
 msgstr "Oda imha edildi"
 
-#: gajim/groupchat_control.py:2073
-#, python-format
-msgid "You can join this room instead: xmpp:%s?join"
-msgstr ""
+#: gajim/groupchat_control.py:1986
+#, fuzzy, python-format
+msgid "You can join this group chat instead: xmpp:%s?join"
+msgstr "%s grup sohbete katıldı"
 
-#: gajim/groupchat_control.py:2306
+#: gajim/groupchat_control.py:2214
 #, fuzzy
 msgid "Leave Group Chat"
 msgstr "Tam-Ekrandan Çık"
 
-#: gajim/groupchat_control.py:2307
+#: gajim/groupchat_control.py:2215
 #, fuzzy
 msgid "Are you sure you want to leave this group chat?"
 msgstr "Onu kullanmak istediğinizden emin misiniz? (e/H) "
 
-#: gajim/groupchat_control.py:2308
+#: gajim/groupchat_control.py:2216
 #, python-format
-msgid "If you close this window, you will be disconnected from '%s'."
+msgid "If you close this window, you will leave '%s'."
 msgstr ""
 
-#: gajim/groupchat_control.py:2314
+#: gajim/groupchat_control.py:2222 gajim/roster_window.py:5177
 msgid "_Leave"
 msgstr ""
 
-#: gajim/groupchat_control.py:2377
+#: gajim/groupchat_control.py:2280 gajim/roster_window.py:3008
 #, fuzzy, python-format
 msgid "%(jid)s has been invited to this group chat"
 msgstr "%s grup sohbete katıldı"
 
-#: gajim/groupchat_control.py:2527
+#: gajim/groupchat_control.py:2463
 #, python-format
 msgid "Kicking %s"
 msgstr ""
 
-#: gajim/groupchat_control.py:2528 gajim/groupchat_control.py:2829
+#: gajim/groupchat_control.py:2464 gajim/groupchat_control.py:2765
 msgid "You may specify a reason below:"
 msgstr ""
 
-#: gajim/groupchat_control.py:2828
+#: gajim/groupchat_control.py:2764
 #, python-format
 msgid "Banning %s"
 msgstr ""
 
-#: gajim/chat_control.py:408
+#: gajim/chat_control.py:432
 msgid "Show a list of formattings"
 msgstr ""
 
-#: gajim/chat_control.py:412
+#: gajim/chat_control.py:436
 msgid "This contact does not support HTML"
 msgstr ""
 
-#: gajim/chat_control.py:562
+#: gajim/chat_control.py:586
 #, fuzzy, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr "Sohbet durum haberleri _göster:"
 
-#: gajim/chat_control.py:686
+#: gajim/chat_control.py:710
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr ""
 
-#: gajim/chat_control.py:832
+#: gajim/chat_control.py:856
 #, python-format
 msgid "%(type)s encryption is active %(authenticated)s"
 msgstr ""
 
-#: gajim/chat_control.py:1160 gajim/chat_control.py:1168
+#: gajim/chat_control.py:1184 gajim/chat_control.py:1192
 #, fuzzy
 msgid "Close"
 msgstr "_Gönder & Kapat"
 
-#: gajim/chat_control.py:1161
+#: gajim/chat_control.py:1185
 #, fuzzy, python-format
 msgid "You just received a new message from %s"
 msgstr "\"%s\"den yeni bir ileti aldın"
 
-#: gajim/chat_control.py:1163
+#: gajim/chat_control.py:1187
 msgid ""
 "If you close this tab while having chat history disabled, this message will "
 "be lost."
 msgstr ""
 
-#: gajim/chat_control.py:1208
+#: gajim/chat_control.py:1232
 msgid "Ping?"
 msgstr "Ping?"
 
-#: gajim/chat_control.py:1211
+#: gajim/chat_control.py:1235
 #, fuzzy, python-format
 msgid "Pong! (%s seconds)"
 msgstr "Pong! (%s s.)"
 
-#: gajim/chat_control.py:1308
+#: gajim/chat_control.py:1332
 #, fuzzy, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -1187,302 +1147,310 @@ msgstr ""
 "Konu: %(subject)lar\n"
 "%(message)lar"
 
-#: gajim/chat_control.py:1416
+#: gajim/chat_control.py:1440
 #, fuzzy, python-format
 msgid "%(name)s is now %(show)s %(status)s"
 msgstr "%(nick)s durumu şimdi %(status)s"
 
-#: gajim/chat_control.py:1476 gajim/data/gui/application_menu.ui:32
+#: gajim/chat_control.py:1500 gajim/data/gui/application_menu.ui:32
 #: gajim/gtk/http_upload_progress.py:35
 #, fuzzy
 msgid "File Transfer"
 msgstr "Dosya Aktarımları"
 
-#: gajim/chat_control.py:1480
+#: gajim/chat_control.py:1504
 #, fuzzy
 msgid "Size"
 msgstr "%1 (boyut %2)"
 
-#: gajim/chat_control.py:1482 gajim/chat_control.py:1546
+#: gajim/chat_control.py:1506 gajim/chat_control.py:1566
+#: gajim/gui_interface.py:190
 #: gajim/data/gui/groupchat_invitation_received.ui:77
-#: gajim/gtk/filetransfer.py:485
+#: gajim/gtk/filetransfer.py:490
 #, fuzzy
 msgid "_Accept"
 msgstr "Hesaplar"
 
-#: gajim/chat_control.py:1484 gajim/chat_control.py:1548
+#: gajim/chat_control.py:1508 gajim/chat_control.py:1568
 #: gajim/data/gui/groupchat_invitation_received.ui:62
 #, fuzzy
 msgid "_Decline"
 msgstr "Bağlı _değil"
 
-#: gajim/chat_control.py:1506 gajim/gui_interface.py:791
-#: gajim/gui_interface.py:821 gajim/gui_interface.py:847
+#: gajim/chat_control.py:1530 gajim/gui_interface.py:777
+#: gajim/gui_interface.py:807 gajim/gui_interface.py:833
 #: gajim/gtk/notification.py:173 gajim/gtk/notification.py:278
 msgid "File Transfer Completed"
 msgstr "Dosya Gönderimi Tamamlandı"
 
-#: gajim/chat_control.py:1510 gajim/gtk/filetransfer.py:259
+#: gajim/chat_control.py:1534 gajim/gtk/filetransfer.py:258
 #, fuzzy
 msgid "Open _Folder"
 msgstr "Gmail Gelen Kutusunu _Aç"
 
-#: gajim/chat_control.py:1512 gajim/chat_control.py:1521
+#: gajim/chat_control.py:1536 gajim/chat_control.py:1545
+#: gajim/data/gui/groupchat_control.ui:962
+#: gajim/data/gui/groupchat_control.ui:1049
+#: gajim/data/gui/groupchat_control.ui:1155
 #, fuzzy
 msgid "_Close"
 msgstr "_Gönder & Kapat"
 
-#: gajim/chat_control.py:1543 gajim/gui_interface.py:484
+#: gajim/chat_control.py:1563 gajim/gui_interface.py:473
+#: gajim/data/gui/groupchat_invitation_received.ui:42
 #: gajim/gtk/notification.py:174 gajim/gtk/notification.py:195
 #: gajim/gtk/notification.py:281
-msgid "Groupchat Invitation"
+#, fuzzy
+msgid "Group Chat Invitation"
 msgstr "Grup Sohbeti Daveti"
 
-#: gajim/chat_control.py:1568 gajim/roster_window.py:1954
+#: gajim/chat_control.py:1588 gajim/roster_window.py:1951
 msgid "Remote contact stopped transfer"
 msgstr ""
 
-#: gajim/chat_control.py:1570 gajim/roster_window.py:1956
+#: gajim/chat_control.py:1590 gajim/roster_window.py:1953
 msgid "Error opening file"
 msgstr "Dosya açılırken hata"
 
-#: gajim/chat_control.py:1572 gajim/gtk/filetransfer.py:297
+#: gajim/chat_control.py:1592 gajim/gtk/filetransfer.py:296
 #, fuzzy
 msgid "File transfer stopped"
 msgstr "Dosya Gönderme Tamamlandı"
 
-#: gajim/chat_control.py:1575 gajim/gtk/filetransfer.py:275
-#: gajim/gtk/filetransfer.py:284
+#: gajim/chat_control.py:1595 gajim/gtk/filetransfer.py:274
+#: gajim/gtk/filetransfer.py:283
 #, fuzzy
 msgid "File transfer cancelled"
 msgstr "Dosya Gönderme Tamamlandı"
 
-#: gajim/chat_control.py:1576
+#: gajim/chat_control.py:1596
 msgid "Connection with peer cannot be established."
 msgstr ""
 
-#: gajim/application.py:72
+#: gajim/application.py:75
 msgid "Show the application's version"
 msgstr ""
 
-#: gajim/application.py:79
+#: gajim/application.py:82
 #, fuzzy
 msgid "Show only critical errors"
 msgstr "Kişi listesindeki olayları göster"
 
-#: gajim/application.py:86
+#: gajim/application.py:89
 msgid "Separate profile files completely (even history database and plugins)"
 msgstr ""
 
-#: gajim/application.py:94
+#: gajim/application.py:97
 msgid "Print XML stanzas and other debug information"
 msgstr ""
 
-#: gajim/application.py:101
+#: gajim/application.py:104
 #, fuzzy
 msgid "Use defined profile in configuration directory"
 msgstr "İlerlemiş Ayarlama Editörü"
 
-#: gajim/application.py:109
+#: gajim/application.py:112
 #, fuzzy
 msgid "Set configuration directory"
 msgstr "Hata açıklaması…"
 
-#: gajim/application.py:117
+#: gajim/application.py:120
 msgid "Configure logging system"
 msgstr ""
 
-#: gajim/application.py:125
+#: gajim/application.py:128
 #, fuzzy
 msgid "Show all warnings"
 msgstr "Bütün Bekleyen _Olayları Göster"
 
-#: gajim/application.py:132
+#: gajim/application.py:135
 msgid "Open IPython shell"
 msgstr ""
 
-#: gajim/application.py:139
+#: gajim/application.py:142
 msgid "Pops up a window with the next pending event"
 msgstr ""
 
-#: gajim/application.py:145 gajim/data/gui/shortcuts_window.ui:203
+#: gajim/application.py:148 gajim/data/gui/shortcuts_window.ui:203
 #: data/org.gajim.Gajim.desktop.in:21
 #, fuzzy
 msgid "Start a new chat"
 msgstr "Sohbet _Başla"
 
-#: gajim/application.py:152
+#: gajim/application.py:155
 msgid "Simulate loss of connectivity"
 msgstr ""
 
-#: gajim/application.py:159
+#: gajim/application.py:162
 msgid "Simulate regaining connectivity"
 msgstr ""
 
-#: gajim/application.py:201 gajim/gui_interface.py:133
+#: gajim/application.py:204 gajim/gui_interface.py:133
 #, fuzzy
 msgid "Database Error"
 msgstr "Hata açıklaması…"
 
-#: gajim/roster_window.py:294 gajim/roster_window.py:1030
+#: gajim/roster_window.py:291 gajim/roster_window.py:1027
 #, fuzzy
 msgid "Merged accounts"
 msgstr "Hesapları bir_leştir"
 
-#: gajim/roster_window.py:853 gajim/roster_window.py:1631
-#: gajim/roster_window.py:1664 gajim/roster_window.py:1715
-#: gajim/roster_window.py:1717 gajim/roster_window.py:1872
-#: gajim/roster_window.py:2531 gajim/roster_window.py:5025
-#: gajim/common/contacts.py:188 gajim/common/contacts.py:447
-#: gajim/common/helpers.py:83 gajim/gtk/discovery.py:129
-#: gajim/gtk/discovery.py:130 gajim/gtk/discovery.py:1416
+#: gajim/roster_window.py:850 gajim/roster_window.py:1628
+#: gajim/roster_window.py:1661 gajim/roster_window.py:1712
+#: gajim/roster_window.py:1714 gajim/roster_window.py:1869
+#: gajim/roster_window.py:2528 gajim/roster_window.py:4331
+#: gajim/roster_window.py:4964 gajim/common/contacts.py:204
+#: gajim/common/contacts.py:463 gajim/common/helpers.py:86
+#: gajim/gtk/discovery.py:127 gajim/gtk/discovery.py:128
+#: gajim/gtk/discovery.py:1414
 msgid "Transports"
 msgstr "Taşıma"
 
-#: gajim/roster_window.py:1723 gajim/roster_window.py:1725
-#: gajim/roster_window.py:4995 gajim/gui_interface.py:1613
-#: gajim/gui_interface.py:1639 gajim/common/contacts.py:186
-#: gajim/common/helpers.py:83 gajim/common/modules/adhoc_commands.py:245
-msgid "Groupchats"
+#: gajim/roster_window.py:1720 gajim/roster_window.py:1722
+#: gajim/roster_window.py:4331 gajim/roster_window.py:4934
+#: gajim/gui_interface.py:1527 gajim/common/contacts.py:202
+#: gajim/common/helpers.py:86 gajim/common/modules/adhoc_commands.py:245
+#, fuzzy
+msgid "Group chats"
 msgstr "Grup sohbetler"
 
-#: gajim/roster_window.py:2012
+#: gajim/roster_window.py:2009
 #, fuzzy
 msgid "Authorization sent"
 msgstr "Yeni bir oda yaratılmıştır"
 
-#: gajim/roster_window.py:2013
+#: gajim/roster_window.py:2010
 #, fuzzy, python-format
 msgid "\"%s\" will now see your status."
 msgstr "%(nick)s durumu şimdi %(status)s"
 
-#: gajim/roster_window.py:2031
+#: gajim/roster_window.py:2028
 #, fuzzy
 msgid "Subscription request has been sent"
 msgstr "Onay e-postası gönderildi."
 
-#: gajim/roster_window.py:2032
+#: gajim/roster_window.py:2029
 #, python-format
-msgid "If \"%s\" accepts this request you will know his or her status."
+msgid "If \"%s\" accepts this request you will know their status."
 msgstr ""
 
-#: gajim/roster_window.py:2046
+#: gajim/roster_window.py:2043
 #, fuzzy
 msgid "Authorization removed"
 msgstr "Yeni bir oda yaratılmıştır"
 
-#: gajim/roster_window.py:2047
+#: gajim/roster_window.py:2044
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr ""
 
-#: gajim/roster_window.py:2250 gajim/roster_window.py:3504
+#: gajim/roster_window.py:2247 gajim/roster_window.py:3460
 msgid "Disconnect for Invisibility"
 msgstr ""
 
-#: gajim/roster_window.py:2251 gajim/roster_window.py:3505
+#: gajim/roster_window.py:2248 gajim/roster_window.py:3461
 msgid "You are participating in one or more group chats"
 msgstr ""
 
-#: gajim/roster_window.py:2252 gajim/roster_window.py:3506
+#: gajim/roster_window.py:2249 gajim/roster_window.py:3462
 msgid ""
-"Changing your status to invisible will result in disconnection from those "
-"group chats.\n"
+"Changing your status to invisible will result in you leaving those group "
+"chats.\n"
 "Are you sure you want to go invisible?"
 msgstr ""
 
-#: gajim/roster_window.py:2257 gajim/roster_window.py:3512
-#: gajim/roster_window.py:5238 gajim/data/gui/gc_control_popup_menu.ui:120
+#: gajim/roster_window.py:2254 gajim/roster_window.py:3468
+#: gajim/data/gui/gc_control_popup_menu.ui:120
 msgid "_Disconnect"
 msgstr "Bağlantıyı _kes"
 
-#: gajim/roster_window.py:2285
+#: gajim/roster_window.py:2282
 #, fuzzy
 msgid "desynced"
 msgstr "-e  --ed  Bir ed betiği çıktılar."
 
-#: gajim/roster_window.py:2353 gajim/data/gui/shortcuts_window.ui:224
+#: gajim/roster_window.py:2350 gajim/data/gui/shortcuts_window.ui:224
 #, fuzzy
 msgid "Quit Gajim"
 msgstr "Gajim"
 
-#: gajim/roster_window.py:2354
+#: gajim/roster_window.py:2351
 #, fuzzy
 msgid "You are about to quit Gajim"
 msgstr "Onu kullanmak istediğinizden emin misiniz? (e/H) "
 
-#: gajim/roster_window.py:2355
+#: gajim/roster_window.py:2352
 #, fuzzy
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Onu kullanmak istediğinizden emin misiniz? (e/H) "
 
-#: gajim/roster_window.py:2356
+#: gajim/roster_window.py:2353
 #, fuzzy
 msgid "_Always quit when closing Gajim"
 msgstr "Gajimi her zaman kapat"
 
-#: gajim/roster_window.py:2359 gajim/roster_window.py:2455
-#: gajim/roster_window.py:2495 gajim/data/gui/systray_context_menu.ui:90
+#: gajim/roster_window.py:2356 gajim/roster_window.py:2452
+#: gajim/roster_window.py:2492 gajim/data/gui/systray_context_menu.ui:83
 msgid "_Quit"
 msgstr ""
 
-#: gajim/roster_window.py:2448
+#: gajim/roster_window.py:2445
 #, fuzzy
 msgid "Stop File Transfers"
 msgstr "Dosya Aktarımları"
 
-#: gajim/roster_window.py:2449
+#: gajim/roster_window.py:2446
 #, fuzzy
 msgid "You still have running file transfers"
 msgstr "%s size bir dosya göndermek istiyor:"
 
-#: gajim/roster_window.py:2450
+#: gajim/roster_window.py:2447
 msgid ""
 "If you quit now, the file(s) being transferred will be lost.\n"
 "Do you still want to quit?"
 msgstr ""
 
-#: gajim/roster_window.py:2488
+#: gajim/roster_window.py:2485
 #, fuzzy
 msgid "Unread Messages"
 msgstr "Okunmamış iletler var"
 
-#: gajim/roster_window.py:2489
+#: gajim/roster_window.py:2486
 #, fuzzy
 msgid "You still have unread messages"
 msgstr "Okunmamış iletler var"
 
-#: gajim/roster_window.py:2490
+#: gajim/roster_window.py:2487
 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 ""
 
-#: gajim/roster_window.py:2760
+#: gajim/roster_window.py:2753
 msgid "You have unread messages"
 msgstr "Okunmamış iletler var"
 
-#: gajim/roster_window.py:2761
+#: gajim/roster_window.py:2754
 msgid "You must read them before removing this transport."
 msgstr ""
 
-#: gajim/roster_window.py:2764
+#: gajim/roster_window.py:2757
 #, fuzzy, python-format
 msgid "Transport '%s' will be removed"
 msgstr "%d paket kaldırılacak\n"
 
-#: gajim/roster_window.py:2765
+#: gajim/roster_window.py:2758
 msgid ""
 "You will no longer be able to send and receive messages from and to contacts "
 "using this transport."
 msgstr ""
 
-#: gajim/roster_window.py:2768
+#: gajim/roster_window.py:2761
 #, fuzzy
 msgid "Transports will be removed"
 msgstr "%d paket kaldırılacak\n"
 
-#: gajim/roster_window.py:2773
+#: gajim/roster_window.py:2766
 #, python-format
 msgid ""
 "You will no longer be able to send and receive messages from and to contacts "
@@ -1490,105 +1458,100 @@ msgid ""
 "%s"
 msgstr ""
 
-#: gajim/roster_window.py:2777
+#: gajim/roster_window.py:2770
 #, fuzzy
 msgid "Remove Transport"
 msgstr "_XML Konsolu Göster"
 
-#: gajim/roster_window.py:2844
+#: gajim/roster_window.py:2837
 #, fuzzy
 msgid "Block Contact"
 msgstr "Engellenmiş Kişiler"
 
-#: gajim/roster_window.py:2845
+#: gajim/roster_window.py:2838
 #, fuzzy
 msgid "Really block this contact?"
 msgstr "Bu bağlantı için her zaman kabul et"
 
-#: gajim/roster_window.py:2846
+#: gajim/roster_window.py:2839
 msgid ""
 "This contact will see you offline and you will not receive any messages sent "
 "to you by this contact."
 msgstr ""
 
-#: gajim/roster_window.py:2851
+#: gajim/roster_window.py:2844
 #, fuzzy
 msgid "_Block Contact"
 msgstr "Engellenmiş Kişiler"
 
-#: gajim/roster_window.py:2896
+#: gajim/roster_window.py:2889
 msgid "Rename Contact"
 msgstr "Kişiyi yeniden adlandır"
 
-#: gajim/roster_window.py:2897
+#: gajim/roster_window.py:2890
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Bu kişi için %s yeni bir takma ad girin."
 
-#: gajim/roster_window.py:2904
+#: gajim/roster_window.py:2897
 msgid "Rename Group"
 msgstr "Grupu yeniden adlandır"
 
-#: gajim/roster_window.py:2905
+#: gajim/roster_window.py:2898
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Grup %s için yeni isim giriniz: "
 
-#: gajim/roster_window.py:2953 gajim/roster_window.py:2954
+#: gajim/roster_window.py:2946 gajim/roster_window.py:2947
 msgid "Remove Group"
 msgstr "Grubu Sil"
 
-#: gajim/roster_window.py:2955
+#: gajim/roster_window.py:2948
 #, fuzzy, python-format
 msgid "Do you want to remove %s from the contact list?"
 msgstr "%s grupu kişi listesinden silmek istiyor musun?"
 
-#: gajim/roster_window.py:2956
+#: gajim/roster_window.py:2949
 #, fuzzy
 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:3044
-#, python-format
-msgid "%(jid)s has been invited in this room"
-msgstr ""
-
-#: gajim/roster_window.py:3353
+#: gajim/roster_window.py:3309
 #, fuzzy
 msgid "Remove Contact"
 msgstr "Kişiyi yeniden adlandır"
 
-#: gajim/roster_window.py:3354
+#: gajim/roster_window.py:3310
 #, fuzzy
 msgid "Remove contact from contact list"
 msgstr "Kişiyi listeden sil"
 
-#: gajim/roster_window.py:3355
+#: gajim/roster_window.py:3311
 #, python-format
 msgid "You are about to remove '%(name)s' (%(jid)s) from your contact list.\n"
 msgstr ""
 
-#: gajim/roster_window.py:3364 gajim/roster_window.py:3384
+#: gajim/roster_window.py:3320 gajim/roster_window.py:3340
 msgid ""
 "By removing this contact you also remove authorization. This means the "
 "contact will see you as offline."
 msgstr ""
 
-#: gajim/roster_window.py:3375
+#: gajim/roster_window.py:3331
 msgid "Do you want to continue?"
 msgstr "Devam etmek istiyor musunuz?"
 
-#: gajim/roster_window.py:3386
+#: gajim/roster_window.py:3342
 #, 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:3393
+#: gajim/roster_window.py:3349
 #, fuzzy
 msgid "Remove contacts from contact list"
 msgstr "Kişiyi listeden sil"
 
-#: gajim/roster_window.py:3399
+#: gajim/roster_window.py:3355
 #, python-format
 msgid ""
 "By removing the following contacts, you will also remove authorization. This "
@@ -1597,164 +1560,155 @@ msgid ""
 "%s"
 msgstr ""
 
-#: gajim/roster_window.py:3403
+#: gajim/roster_window.py:3359
 #, fuzzy
 msgid "Remove Contacts"
 msgstr "Kişiyi yeniden adlandır"
 
-#: gajim/roster_window.py:3423
+#: gajim/roster_window.py:3379
 msgid "No account available"
 msgstr "Hiç bir hesap bulunmiyor"
 
-#: gajim/roster_window.py:3424
+#: gajim/roster_window.py:3380
 msgid "You must create an account before you can chat with other contacts."
 msgstr ""
 
-#: gajim/roster_window.py:4060
+#: gajim/roster_window.py:4011
 msgid "Metacontacts storage not supported by your server"
 msgstr ""
 
-#: gajim/roster_window.py:4062
+#: gajim/roster_window.py:4013
 msgid ""
 "Your server does not support storing metacontacts information. So this "
 "information will not be saved on next reconnection."
 msgstr ""
 
-#: gajim/roster_window.py:4159
+#: gajim/roster_window.py:4110
 msgid "You are about to create a metacontact"
 msgstr ""
 
-#: gajim/roster_window.py:4160
+#: gajim/roster_window.py:4111
 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:4164
+#: gajim/roster_window.py:4115
 #, fuzzy
 msgid "Create Metacontact"
 msgstr "Kişiyi yeniden adlandır"
 
-#: gajim/roster_window.py:4170
+#: gajim/roster_window.py:4121 gajim/data/gui/groupchat_creation.ui:317
 #, fuzzy
 msgid "_Create"
 msgstr "Yaratıcı"
 
-#: gajim/roster_window.py:4287
+#: gajim/roster_window.py:4238
 #, fuzzy
 msgid "Invalid file URI:"
 msgstr "Adres verilmedi"
 
-#: gajim/roster_window.py:4298
+#: gajim/roster_window.py:4249
 #, fuzzy
 msgid "Send file?"
 msgstr "_Dosya Gönder…"
 
-#: gajim/roster_window.py:4299
+#: gajim/roster_window.py:4250
 #, fuzzy, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
 msgstr[0] "Yapmak istediğiniz şey bu mu?"
 
-#: gajim/roster_window.py:4451
+#: gajim/roster_window.py:4401
 #, fuzzy, python-format
 msgid "Send %(from)s to %(to)s"
 msgstr "Bunu %s buna %s gönder"
 
-#: gajim/roster_window.py:4464
+#: gajim/roster_window.py:4414
 #, fuzzy, python-format
 msgid "Make %s first contact"
 msgstr "bir ses ve video"
 
-#: gajim/roster_window.py:4469
+#: gajim/roster_window.py:4419
 #, fuzzy, python-format
 msgid "Make %(contact1)s and %(contact2)s metacontacts"
 msgstr "bir ses ve video"
 
-#: gajim/roster_window.py:4825 gajim/roster_window.py:4923
+#: gajim/roster_window.py:4775 gajim/roster_window.py:4862
 msgid "_Change Status Message"
 msgstr "Durum ileti değiştir"
 
-#: gajim/roster_window.py:4845
+#: gajim/roster_window.py:4795
 #, fuzzy
 msgid "Publish Tune"
 msgstr "Albüm Ayarı"
 
-#: gajim/roster_window.py:4856
+#: gajim/roster_window.py:4806
 #, fuzzy
 msgid "Publish Location"
 msgstr " B - DosyaKilidi konumu"
 
-#: gajim/roster_window.py:4868
-#, fuzzy
-msgid "Configure Services…"
-msgstr "Çevrimiçi Servisler"
-
-#: gajim/roster_window.py:4997
+#: gajim/roster_window.py:4936
 #, fuzzy
 msgid "_Maximize All"
 msgstr "Bütün durumlar"
 
-#: gajim/roster_window.py:5004 gajim/roster_window.py:5146
+#: gajim/roster_window.py:4943 gajim/roster_window.py:5085
 #, fuzzy
 msgid "Send Group M_essage"
 msgstr "grupdaki herkez"
 
-#: gajim/roster_window.py:5011
+#: gajim/roster_window.py:4950
 msgid "To all users"
 msgstr "Tüm kullanıcılara"
 
-#: gajim/roster_window.py:5015
+#: gajim/roster_window.py:4954
 msgid "To all online users"
 msgstr "Tüm çevredeki kullanıcılara"
 
-#: gajim/roster_window.py:5027 gajim/roster_window.py:5152
+#: gajim/roster_window.py:4966 gajim/roster_window.py:5091
 #: gajim/data/gui/gc_occupants_menu.ui:110
 #: gajim/data/gui/contact_context_menu.ui:36
 msgid "In_vite to"
 msgstr "Buna davet _et"
 
-#: gajim/roster_window.py:5162
+#: gajim/roster_window.py:5101
 #, fuzzy
 msgid "_Manage Contacts"
 msgstr "Kişileri eşzamana getir"
 
-#: gajim/roster_window.py:5168
+#: gajim/roster_window.py:5107
 #, fuzzy
 msgid "Edit _Groups…"
 msgstr "Kişisel ilanlar sayfayı yazımla"
 
-#: gajim/roster_window.py:5189 gajim/data/gui/filetransfers.ui:12
+#: gajim/roster_window.py:5128 gajim/data/gui/filetransfers.ui:12
 #: gajim/data/gui/remove_account_window.ui:134
 msgid "_Remove"
 msgstr "_Kaldır"
 
-#: gajim/roster_window.py:5226
+#: gajim/roster_window.py:5165
 #, fuzzy
 msgid "_Maximize"
 msgstr "Ekranı kapla"
 
-#: gajim/roster_window.py:5233
+#: gajim/roster_window.py:5172
 msgid "_Reconnect"
 msgstr "_Yeniden bağlan"
 
-#: gajim/roster_window.py:5254 gajim/data/gui/gc_occupants_menu.ui:170
+#: gajim/roster_window.py:5193 gajim/data/gui/gc_occupants_menu.ui:170
 #: gajim/data/gui/gc_control_popup_menu.ui:113
 #: gajim/data/gui/contact_context_menu.ui:205
 msgid "_History"
 msgstr "_Geçmiş"
 
-#: gajim/roster_window.py:5335 gajim/data/gui/application_menu.ui:86
+#: gajim/roster_window.py:5274 gajim/data/gui/application_menu.ui:83
 #: gajim/data/gui/history_window.ui:57
 #, fuzzy
 msgid "History Manager"
 msgstr "Paket Yöneticisi"
 
-#: gajim/roster_window.py:5343
-msgid "_Join New Group Chat"
-msgstr "Yeni grup sohbete _katıl"
-
 #: gajim/dataforms_widget.py:585
 #, fuzzy
 msgid "Unable to load image"
@@ -1878,259 +1832,276 @@ msgstr "Konu: %s\n"
 msgid "Write a message…"
 msgstr "Ileti alınıyor"
 
-#: gajim/message_window.py:250
+#: gajim/message_window.py:356
+#, fuzzy
+msgid "Close Tabs"
+msgstr "_Gönder & Kapat"
+
+#: gajim/message_window.py:357
 msgid "You are going to close several tabs"
 msgstr ""
 
-#: gajim/message_window.py:251
+#: gajim/message_window.py:358
 #, fuzzy
 msgid "Do you really want to close them all?"
 msgstr "Tüm yer imlerini kaldırmak istediğinizden emin misiniz?"
 
-#: gajim/message_window.py:539
+#: gajim/message_window.py:514
 #, fuzzy
 msgid "?Noun:Chats"
 msgstr "Grup Sohbetler"
 
-#: gajim/message_window.py:543
+#: gajim/message_window.py:518
 #, fuzzy
 msgid "Group Chats"
 msgstr "Grup sohbetler"
 
-#: gajim/message_window.py:547
+#: gajim/message_window.py:522
 msgid "Private Chats"
 msgstr "Kişisel Sohbetler"
 
-#: gajim/message_window.py:553
+#: gajim/message_window.py:528
 msgid "Messages"
 msgstr "İletler"
 
-#: gajim/gui_interface.py:173
+#: gajim/gui_interface.py:170
+#, python-format
+msgid "HTTP (%(method)s) Authorization for %(url)s (ID: %(id)s)"
+msgstr ""
+
+#: gajim/gui_interface.py:175
 msgid "Do you accept this request?"
 msgstr "Ricayı kabul ediyor musunuz?"
 
-#: gajim/gui_interface.py:175
-#, python-format
-msgid "Do you accept this request on account %s?"
-msgstr ""
+#: gajim/gui_interface.py:177
+#, fuzzy, python-format
+msgid "Do you accept this request (account: %s)?"
+msgstr "Ricayı kabul ediyor musunuz?"
 
-#: gajim/gui_interface.py:178
-#, python-format
-msgid "HTTP (%(method)s) Authorization for %(url)s (ID: %(id)s)"
-msgstr ""
+#: gajim/gui_interface.py:182
+#, fuzzy
+msgid "Authorization"
+msgstr "Yeni bir oda yaratılmıştır"
+
+#: gajim/gui_interface.py:186 gajim/gui_interface.py:420
+#: gajim/gtk/filetransfer.py:338
+#, fuzzy
+msgid "_No"
+msgstr "Hiçbiri"
 
-#: gajim/gui_interface.py:194 gajim/gtk/notification.py:175
+#: gajim/gui_interface.py:205 gajim/gtk/notification.py:175
 #: gajim/gtk/notification.py:197
 msgid "Connection Failed"
 msgstr "Bağlantı Kurulamıyor"
 
-#: gajim/gui_interface.py:279 gajim/gui_interface.py:529
-#, fuzzy
-msgid "Password Required"
-msgstr "Şifre gerekli"
-
-#: gajim/gui_interface.py:280
-#, python-format
-msgid "A Password is required to join the room %s. Please type it."
-msgstr ""
-
-#: gajim/gui_interface.py:342 gajim/gui_interface.py:346
+#: gajim/gui_interface.py:325 gajim/gui_interface.py:329
 #, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr "Hata %(code)s: %(msg)s"
 
-#: gajim/gui_interface.py:357 gajim/gui_interface.py:376
+#: gajim/gui_interface.py:340 gajim/gui_interface.py:359
 #: gajim/common/modules/message.py:122
 #, 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:401 gajim/gtk/notification.py:175
+#: gajim/gui_interface.py:384 gajim/gtk/notification.py:175
 msgid "Subscription request"
 msgstr "Üyelik isteği"
 
-#: gajim/gui_interface.py:413 gajim/common/contacts.py:184
-#: gajim/common/helpers.py:83
+#: gajim/gui_interface.py:396 gajim/common/contacts.py:200
+#: gajim/common/helpers.py:86
 msgid "Observers"
 msgstr "İzlemci"
 
-#: gajim/gui_interface.py:422
+#: gajim/gui_interface.py:405
 #, fuzzy
 msgid "Authorization accepted"
 msgstr "Değer kabul edildi!"
 
-#: gajim/gui_interface.py:423
+#: gajim/gui_interface.py:406
 #, python-format
 msgid "The contact \"%s\" has authorized you to see their status."
 msgstr ""
 
-#: gajim/gui_interface.py:431
+#: gajim/gui_interface.py:415
+#, fuzzy
+msgid "Subscription Removed"
+msgstr "Üyelik İsteği"
+
+#: gajim/gui_interface.py:416
 #, fuzzy, python-format
-msgid "Contact \"%s\" removed subscription from you"
+msgid "Contact '%s' removed subscription from you"
 msgstr "\"%s\" kişi listesinden silincek"
 
-#: gajim/gui_interface.py:432
+#: gajim/gui_interface.py:417
 msgid ""
-"You will always see them as offline.\n"
+"You will always see this contact as offline.\n"
 "Do you want to remove them from your contact list?"
 msgstr ""
 
-#: gajim/gui_interface.py:453 gajim/gtk/notification.py:176
+#: gajim/gui_interface.py:442 gajim/gtk/notification.py:176
 msgid "Unsubscribed"
 msgstr "Üyelikten çıkarıldı"
 
-#: gajim/gui_interface.py:465
+#: gajim/gui_interface.py:454
 #, python-format
 msgid "%(jid)s declined the invitation: %(reason)s"
 msgstr ""
 
-#: gajim/gui_interface.py:469
+#: gajim/gui_interface.py:458
 #, python-format
 msgid "%(jid)s declined the invitation"
 msgstr ""
 
-#: gajim/gui_interface.py:485
+#: gajim/gui_interface.py:474
 #, fuzzy, python-brace-format
 msgid "You are invited to {room} by {user}"
 msgstr ""
 "Şuraya bir yorum gönderiyorsunuz:\n"
 "  "
 
-#: gajim/gui_interface.py:506
+#: gajim/gui_interface.py:495
 #, fuzzy
 msgid "Certificate Passphrase Required"
 msgstr "Bu anahtarın kullanım süresi dolmuş"
 
-#: gajim/gui_interface.py:507
+#: gajim/gui_interface.py:496
 #, 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:516 gajim/gtk/accounts.py:963
+#: gajim/gui_interface.py:505 gajim/gtk/accounts.py:966
 #, fuzzy, python-format
 msgid "Enter your password for account %s"
 msgstr "Gadu-Gudu hesabı için parola değiştir"
 
-#: gajim/gui_interface.py:529 gajim/gtk/accounts.py:964
+#: gajim/gui_interface.py:518
+#, fuzzy
+msgid "Password Required"
+msgstr "Şifre gerekli"
+
+#: gajim/gui_interface.py:518 gajim/gtk/accounts.py:967
 #, fuzzy
 msgid "Save password"
 msgstr "Parolayı Değiştir"
 
-#: gajim/gui_interface.py:601 gajim/gui_interface.py:632
+#: gajim/gui_interface.py:587 gajim/gui_interface.py:618
+#: gajim/gtk/filetransfer.py:332 gajim/gtk/filetransfer.py:333
 #: gajim/gtk/notification.py:173 gajim/gtk/notification.py:276
 msgid "File Transfer Error"
 msgstr "Dosya Gönderim Hatası"
 
-#: gajim/gui_interface.py:666
+#: gajim/gui_interface.py:652
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s size bir dosya göndermek istiyor."
 
-#: gajim/gui_interface.py:668 gajim/gtk/filetransfer.py:479
+#: gajim/gui_interface.py:654 gajim/gtk/filetransfer.py:484
 #: gajim/gtk/notification.py:172 gajim/gtk/notification.py:274
 msgid "File Transfer Request"
 msgstr "Dosya Gönderim İsteği"
 
-#: gajim/gui_interface.py:767
+#: gajim/gui_interface.py:753
 #, fuzzy
 msgid "Remote Contact Stopped Transfer"
 msgstr "Kişiyi listeden sil"
 
-#: gajim/gui_interface.py:772
+#: gajim/gui_interface.py:758
 #, fuzzy
 msgid "Error Opening File"
 msgstr "Dosya açılırken hata"
 
-#: gajim/gui_interface.py:782
+#: gajim/gui_interface.py:768
 #, fuzzy
 msgid "SSL Certificate Error"
 msgstr "<b>Bir hata oluştu:</b>"
 
-#: gajim/gui_interface.py:795 gajim/gui_interface.py:826
-#: gajim/gui_interface.py:853 gajim/gtk/notification.py:174
+#: gajim/gui_interface.py:781 gajim/gui_interface.py:812
+#: gajim/gui_interface.py:839 gajim/gtk/notification.py:174
 #: gajim/gtk/notification.py:279
 msgid "File Transfer Stopped"
 msgstr "Dosya Gönderimi Durduruldu"
 
-#: gajim/gui_interface.py:799
+#: gajim/gui_interface.py:785
 #, fuzzy
 msgid "File Transfer Failed"
 msgstr "Dosya Gönderme Tamamlandı"
 
-#: gajim/gui_interface.py:822
+#: gajim/gui_interface.py:808
 #, python-format
 msgid "%(filename)s received from %(name)s."
 msgstr ""
 
-#: gajim/gui_interface.py:827
+#: gajim/gui_interface.py:813
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr ""
 
-#: gajim/gui_interface.py:833
+#: gajim/gui_interface.py:819
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s failed."
 msgstr ""
 
-#: gajim/gui_interface.py:848
+#: gajim/gui_interface.py:834
 #, 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:854
+#: gajim/gui_interface.py:840
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr ""
 
-#: gajim/gui_interface.py:860
+#: gajim/gui_interface.py:846
 #, 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:971
+#: gajim/gui_interface.py:957
 msgid "Username Conflict"
 msgstr "Kullanan ad Çarpışması"
 
-#: gajim/gui_interface.py:972
+#: gajim/gui_interface.py:958
 msgid "Please type a new username for your local account"
 msgstr ""
 
-#: gajim/gui_interface.py:995
+#: gajim/gui_interface.py:981
 msgid "Resource Conflict"
 msgstr "Kaynak Çarpışması"
 
-#: gajim/gui_interface.py:996
+#: gajim/gui_interface.py:982
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
 msgstr ""
 
-#: gajim/gui_interface.py:1053
+#: gajim/gui_interface.py:1039
 #, python-format
 msgid "%s wants to start a voice chat."
 msgstr ""
 
-#: gajim/gui_interface.py:1055
+#: gajim/gui_interface.py:1041
 #, fuzzy
 msgid "Voice Chat Request"
 msgstr "Dosya Gönderme Soru"
 
-#: gajim/gui_interface.py:1123 gajim/gtk/account_wizard.py:312
+#: gajim/gui_interface.py:1109 gajim/gtk/account_wizard.py:312
 #, fuzzy
 msgid "Certificate Already in File"
 msgstr "Dosyası zaten var"
 
-#: gajim/gui_interface.py:1124 gajim/gtk/account_wizard.py:313
+#: gajim/gui_interface.py:1110 gajim/gtk/account_wizard.py:313
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr ""
 
-#: gajim/gui_interface.py:1145
+#: gajim/gui_interface.py:1131
 #, fuzzy, python-format
 msgid "The authenticity of the %s certificate could be invalid"
 msgstr "sertifika elde edilemedi: %s\n"
 
-#: gajim/gui_interface.py:1148
+#: gajim/gui_interface.py:1134
 #, python-format
 msgid ""
 "\n"
@@ -2139,7 +2110,7 @@ msgstr ""
 "\n"
 "Bilinmeyen SSL hatası: %d"
 
-#: gajim/gui_interface.py:1150
+#: gajim/gui_interface.py:1136
 #, python-format
 msgid ""
 "\n"
@@ -2148,12 +2119,12 @@ msgstr ""
 "\n"
 "SSL Hatası: <b>%s</b>"
 
-#: gajim/gui_interface.py:1155
+#: gajim/gui_interface.py:1141
 #, fuzzy
 msgid "Error verifying SSL certificate"
 msgstr "      --sslcert     ssl istemci sertifikası\n"
 
-#: gajim/gui_interface.py:1156
+#: gajim/gui_interface.py:1142
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your XMPP server: "
@@ -2161,7 +2132,7 @@ msgid ""
 "Do you still want to connect to this server?"
 msgstr ""
 
-#: gajim/gui_interface.py:1160 gajim/gtk/account_wizard.py:412
+#: gajim/gui_interface.py:1146 gajim/gtk/account_wizard.py:413
 #, fuzzy, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -2173,278 +2144,260 @@ msgstr ""
 "Bu doğruluk belgeyi bilinen doğruluk belgelere kat.\n"
 "SHA1 doğruluk belgenin parmakizi:\n"
 
-#: gajim/gui_interface.py:1166
+#: gajim/gui_interface.py:1152
 #, fuzzy
 msgid "Ignore this error for this certificate."
 msgstr "Bu imza için bir yürürlükten kaldırma sertifikası oluşturulsun mu? "
 
-#: gajim/gui_interface.py:1174
+#: gajim/gui_interface.py:1160
 #, fuzzy, python-format
 msgid "SSL Certificate Verification for %s"
 msgstr "<b>Bir hata oluştu:</b>"
 
-#: gajim/gui_interface.py:1442 gajim/gtk/join_groupchat.py:235
-msgid "You can not join a group chat unless you are connected."
-msgstr ""
-
-#: gajim/gui_interface.py:1448
-#, fuzzy
-msgid "JID is not a Groupchat"
-msgstr "%s mevcut bir grubun ismi değil"
-
-#: gajim/gui_interface.py:1579
-#, fuzzy
-msgid "This is not a group chat"
-msgstr "%s mevcut bir grubun ismi değil"
-
-#: gajim/gui_interface.py:1580
-#, python-format
-msgid ""
-"%(room_jid)s is already in your roster. Please check if %(room_jid)s is a "
-"correct group chat name. If it is, delete it from your roster and try "
-"joining the group chat again."
-msgstr ""
-
-#: gajim/gui_interface.py:1604 gajim/dialog_messages.py:58
+#: gajim/gui_interface.py:1577
 msgid "You cannot join a group chat while you are invisible"
 msgstr ""
 
-#: gajim/gui_interface.py:2037
+#: gajim/gui_interface.py:1976
 msgid "Could not save your settings and preferences"
 msgstr ""
 
-#: gajim/gui_interface.py:2098
+#: gajim/gui_interface.py:2037
 msgid "Gajim: IPython Console"
 msgstr ""
 
-#: gajim/dialog_messages.py:32
-#, fuzzy
-msgid "You can not start a new conversation unless you are connected."
-msgstr ""
-"İleti gönderilmemiş olabilir çünkü görünmez iken yollamaya izin verilmiyor:"
-
-#: gajim/dialog_messages.py:36 gajim/dialog_messages.py:41
-#: gajim/gtk/single_message.py:305 gajim/gtk/join_groupchat.py:211
-#: gajim/gtk/account_wizard.py:229
+#: gajim/dialog_messages.py:31 gajim/dialog_messages.py:36
+#: gajim/gtk/single_message.py:305 gajim/gtk/account_wizard.py:229
 #, fuzzy
-msgid "Invalid JID"
-msgstr "Yerel jid:"
+msgid "Invalid XMPP Address"
+msgstr "Geçersiz Dosya"
 
-#: gajim/dialog_messages.py:42 gajim/gtk/single_message.py:306
+#: gajim/dialog_messages.py:37
 #, python-format
-msgid "It is not possible to send a message to %s, this JID is not valid."
+msgid ""
+"It is not possible to send a message to %s. This XMPP Address is not valid."
 msgstr ""
 
-#: gajim/dialog_messages.py:47
+#: gajim/dialog_messages.py:42
 #, fuzzy
-msgid "Unread events"
+msgid "Unread Events"
 msgstr "Okunmamış iletler var"
 
-#: gajim/dialog_messages.py:48
-msgid "Read all pending events before removing this account."
+#: gajim/dialog_messages.py:43
+msgid "Read or acknowledge all pending events before removing this account."
 msgstr ""
 
-#: gajim/dialog_messages.py:52
+#: gajim/dialog_messages.py:48
 #, fuzzy
 msgid "Invalid Form"
 msgstr "Geçersiz oda"
 
-#: gajim/dialog_messages.py:53
+#: gajim/dialog_messages.py:49
 #, fuzzy
 msgid "The form is not filled correctly."
 msgstr "%s: Kontrol karakterleri kullanılamaz.\n"
 
-#: gajim/dialog_messages.py:57 gajim/common/helpers.py:309
+#: gajim/dialog_messages.py:53 gajim/common/helpers.py:315
 msgid "Invisible"
 msgstr "Görünmez"
 
-#: gajim/dialog_messages.py:62
+#: gajim/dialog_messages.py:54
 #, fuzzy
-msgid "A connection is not available"
-msgstr "Bir bağlantı kullanılabilir değil"
+msgid "You cannot join a group chat while being invisible."
+msgstr "[%s sayfasını okuyamazsınız.]"
 
-#: gajim/dialog_messages.py:63
+#: gajim/dialog_messages.py:58
+#, fuzzy
+msgid "No Connection Available"
+msgstr "Hiç bir hesap bulunmiyor"
+
+#: gajim/dialog_messages.py:59
 #, fuzzy
 msgid "Your message can not be sent until you are connected."
 msgstr ""
 "İleti gönderilmemiş olabilir çünkü görünmez iken yollamaya izin verilmiyor:"
 
-#: gajim/dialog_messages.py:67
-#, fuzzy
-msgid "JID already in list"
-msgstr "Jabber kimliği zaten listede"
+#: gajim/dialog_messages.py:63
+msgid "XMPP Address Already in List"
+msgstr ""
 
-#: gajim/dialog_messages.py:68
-msgid "The JID you entered is already in the list. Choose another one."
+#: gajim/dialog_messages.py:64
+msgid ""
+"The XMPP Address you entered is already in the list. Please choose another "
+"one."
 msgstr ""
 
-#: gajim/dialog_messages.py:72
+#: gajim/dialog_messages.py:69
 #, fuzzy
-msgid "Invalid answer"
+msgid "Invalid Answer"
 msgstr "Geçersiz takma ad"
 
-#: gajim/dialog_messages.py:73
+#: gajim/dialog_messages.py:70
 #, python-format
 msgid "Transport %(name)s answered wrongly to register request: %(error)s"
 msgstr ""
 
-#: gajim/dialog_messages.py:78
+#: gajim/dialog_messages.py:75
 #, fuzzy
 msgid "Wrong Custom Hostname"
 msgstr "Kendi bir makine adı/portu kullan"
 
-#: gajim/dialog_messages.py:79
+#: gajim/dialog_messages.py:76
 #, fuzzy, python-format
-msgid "Wrong custom hostname \"%s\". Ignoring it."
+msgid "Custom hostname \"%s\" is wrong. It will be ignored."
 msgstr "Kendi bir makine adı/portu kullan"
 
-#: gajim/dialog_messages.py:83
-msgid "Error while removing privacy list"
-msgstr ""
+#: gajim/dialog_messages.py:80
+#, fuzzy
+msgid "Error While Removing Privacy List"
+msgstr "Eklentilerin etkinleştirilmesinde hata #%d."
 
-#: gajim/dialog_messages.py:84
+#: gajim/dialog_messages.py:81
 #, python-format
 msgid ""
-"Privacy list %s has not been removed. It is maybe active in one of your "
-"connected resources. Deactivate it and try again."
+"Privacy list %s has not been removed. It is probably active in one of your "
+"connected resources. Please deactivate it and try again."
 msgstr ""
 
-#: gajim/dialog_messages.py:90
-msgid "Invisibility not supported"
+#: gajim/dialog_messages.py:87
+#, fuzzy
+msgid "Invisibility Not Supported"
 msgstr "Görünmezlik desteklenmiyor"
 
-#: gajim/dialog_messages.py:91
-#, python-format
-msgid "Account %s doesn't support invisibility."
+#: gajim/dialog_messages.py:88
+#, fuzzy, python-format
+msgid "This account %s doesn't support invisibility."
 msgstr "%s hesabı görünmezliği desteklemiyor."
 
-#: gajim/dialog_messages.py:95
+#: gajim/dialog_messages.py:92
 #, fuzzy
-msgid "Unregister failed"
+msgid "Unregister Failed"
 msgstr "Bağlantı Kurulamıyor"
 
-#: gajim/dialog_messages.py:96
+#: gajim/dialog_messages.py:93
 #, fuzzy, python-format
-msgid "Unregistration with server %(server)s failed: %(error)s"
+msgid "Unregistration on server %(server)s failed: %(error)s"
 msgstr "Sunucuyla iletişimde kurulurken hata oluştu. Bağlantı kapatılıyor."
 
-#: gajim/dialog_messages.py:100
+#: gajim/dialog_messages.py:97
 #, fuzzy
-msgid "Registration succeeded"
+msgid "Registration Succeeded"
 msgstr "Onay başarılı oldu."
 
-#: gajim/dialog_messages.py:101
+#: gajim/dialog_messages.py:98
 #, fuzzy, python-format
-msgid "Registration with agent %s succeeded"
+msgid "Registration with agent %s succeeded."
 msgstr "%s ajanı ile kayıt başarılı"
 
-#: gajim/dialog_messages.py:105 gajim/gtk/service_registration.py:215
-msgid "Registration failed"
+#: gajim/dialog_messages.py:102
+#, fuzzy
+msgid "Registration Failed"
 msgstr "Kayıt başarısız"
 
-#: gajim/dialog_messages.py:106
+#: gajim/dialog_messages.py:103
 #, python-format
 msgid ""
 "Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
 msgstr ""
 
-#: gajim/dialog_messages.py:111
+#: gajim/dialog_messages.py:108
 #, fuzzy
 msgid "Unable to Join Group Chat"
 msgstr "Grup eklenemedi: grup zaten var"
 
-#: gajim/dialog_messages.py:116
-msgid "GStreamer error"
-msgstr ""
+#: gajim/dialog_messages.py:113
+#, fuzzy
+msgid "GStreamer Error"
+msgstr "Hata açıklaması…"
 
-#: gajim/dialog_messages.py:117
+#: gajim/dialog_messages.py:114
 #, fuzzy, python-format
 msgid ""
 "Error: %(error)s\n"
 "Debug: %(debug)s"
 msgstr "Ileti alınıyor"
 
-#: gajim/dialog_messages.py:121
+#: gajim/dialog_messages.py:118
 #, fuzzy
-msgid "Wrong host"
+msgid "Wrong Host"
 msgstr "Adres yanlış"
 
-#: gajim/dialog_messages.py:122
+#: gajim/dialog_messages.py:119
 msgid "Invalid local address? :-O"
 msgstr ""
 
-#: gajim/dialog_messages.py:126
+#: gajim/dialog_messages.py:123
 #, fuzzy
-msgid "Avahi error"
+msgid "Avahi Error"
 msgstr "Hata açıklaması…"
 
-#: gajim/dialog_messages.py:127
+#: gajim/dialog_messages.py:124
 #, python-format
 msgid ""
 "%s\n"
 "Link-local messaging might not work properly."
 msgstr ""
 
-#: gajim/dialog_messages.py:131 gajim/dialog_messages.py:136
+#: gajim/dialog_messages.py:128 gajim/dialog_messages.py:133
 #, fuzzy
-msgid "Could not request upload slot"
+msgid "Could not request upload slot for HTTP File Upload"
 msgstr "%s: \"%s\" servisi başlatılamadı: Hata kodu %d\n"
 
-#: gajim/dialog_messages.py:137
-msgid "Got unexpected response from server (see log)"
+#: gajim/dialog_messages.py:134
+msgid "Got unexpected response from server (see log)."
 msgstr ""
 
-#: gajim/dialog_messages.py:141 gajim/dialog_messages.py:146
+#: gajim/dialog_messages.py:138 gajim/dialog_messages.py:143
 #, fuzzy
-msgid "Could not open file"
+msgid "Could not Open File"
 msgstr "Resim acılamadı"
 
-#: gajim/dialog_messages.py:142
-msgid "Exception raised while opening file (see log)"
+#: gajim/dialog_messages.py:139
+msgid "Exception raised while trying to open file (see log)."
 msgstr ""
 
-#: gajim/dialog_messages.py:151
-msgid "Unsecure"
-msgstr ""
+#: gajim/dialog_messages.py:148
+#, fuzzy
+msgid "Not Secure"
+msgstr "Başlatılmadı"
 
-#: gajim/dialog_messages.py:152
+#: gajim/dialog_messages.py:149
 #, fuzzy
-msgid "Server returned unsecure transport (HTTP)"
+msgid "The server returned an insecure transport (HTTP)."
 msgstr "<b>Bir hata oluştu:</b>"
 
-#: gajim/dialog_messages.py:156
+#: gajim/dialog_messages.py:153
 #, fuzzy
-msgid "Could not upload file"
+msgid "Could not Upload File"
 msgstr "Resim acılamadı"
 
-#: gajim/dialog_messages.py:157
+#: gajim/dialog_messages.py:154
 #, python-format
 msgid "HTTP response code from server: %s"
 msgstr ""
 
-#: gajim/dialog_messages.py:161
+#: gajim/dialog_messages.py:158
 msgid "Upload Error"
 msgstr ""
 
-#: gajim/dialog_messages.py:166
+#: gajim/dialog_messages.py:163
 msgid "Encryption Error"
 msgstr ""
 
-#: gajim/dialog_messages.py:167
-#, fuzzy
-msgid "For the chosen encryption there is no encryption method available"
-msgstr "Bir bağlantı kullanılabilir değil"
+#: gajim/dialog_messages.py:164
+msgid "There is no encryption method available for the chosen encryption."
+msgstr ""
 
-#: gajim/dialog_messages.py:171
+#: gajim/dialog_messages.py:169
 #, fuzzy
-msgid "Avatar upload failed"
+msgid "Avatar Upload Failed"
 msgstr "Kişisel ilet gönderimi başarısız"
 
-#: gajim/privatechat_control.py:204
+#: gajim/privatechat_control.py:207
 msgid "Sending private message failed"
 msgstr "Kişisel ilet gönderimi başarısız"
 
-#: gajim/privatechat_control.py:206
+#: gajim/privatechat_control.py:209
 #, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr ""
@@ -2466,7 +2419,7 @@ msgid "show help on command"
 msgstr "komut yardımını göster"
 
 #: gajim/gajim_remote.py:85
-msgid "Lists all contacts in roster, one for each line"
+msgid "Lists all contacts in the contact list, one for each line"
 msgstr ""
 
 #: gajim/gajim_remote.py:87 gajim/gajim_remote.py:102 gajim/gajim_remote.py:112
@@ -2539,12 +2492,14 @@ msgstr ""
 
 #: gajim/gajim_remote.py:118
 #, fuzzy
-msgid "Sends new chat message to a contact in the roster. Account is optional."
+msgid ""
+"Sends new chat message to a contact in the contact list. Account is optional."
 msgstr "Dosyayı bir kişiye gönderir"
 
 #: gajim/gajim_remote.py:120 gajim/gajim_remote.py:130
-msgid "JID of the contact that will receive the message"
-msgstr ""
+#, fuzzy
+msgid "XMPP Address of the contact that will receive the message"
+msgstr "Dosyayı bir kişiye gönderir"
 
 #: gajim/gajim_remote.py:121 gajim/gajim_remote.py:132
 #: gajim/gajim_remote.py:141
@@ -2557,8 +2512,10 @@ msgid "if specified, the message will be sent using this account"
 msgstr ""
 
 #: gajim/gajim_remote.py:127
-msgid "Sends a chat message to someone on your roster. Account is optional."
-msgstr ""
+#, fuzzy
+msgid ""
+"Sends a chat message to someone on your contact list. Account is optional."
+msgstr "Dosyayı bir kişiye gönderir"
 
 #: gajim/gajim_remote.py:131
 msgid "subject"
@@ -2569,11 +2526,11 @@ msgid "message subject"
 msgstr "iletinin konusu"
 
 #: gajim/gajim_remote.py:138
-msgid "Sends new message to a groupchat you've joined."
+msgid "Sends new message to a group chat you've joined."
 msgstr ""
 
 #: gajim/gajim_remote.py:140
-msgid "JID of the room that will receive the message"
+msgid "XMPP Address of the group chat that will receive the message"
 msgstr ""
 
 #: gajim/gajim_remote.py:147
@@ -2582,7 +2539,8 @@ msgstr ""
 
 #: gajim/gajim_remote.py:149 gajim/gajim_remote.py:162
 #: gajim/gajim_remote.py:192
-msgid "JID of the contact"
+#, fuzzy
+msgid "XMPP Address of the contact"
 msgstr "Kişinin JIDsi"
 
 #: gajim/gajim_remote.py:153
@@ -2644,7 +2602,8 @@ msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr ""
 
 #: gajim/gajim_remote.py:190
-msgid "Removes contact from roster"
+#, fuzzy
+msgid "Removes contact from contact list"
 msgstr "Kişiyi listeden sil"
 
 #: gajim/gajim_remote.py:193
@@ -2691,7 +2650,7 @@ msgstr "JID veya Kişi adı girdir"
 #: gajim/gajim_remote.py:275
 #, python-format
 msgid ""
-"'%s' is not in your roster.\n"
+"'%s' is not in your contact list.\n"
 "Please specify account for sending the message."
 msgstr ""
 
@@ -2912,12 +2871,12 @@ msgstr "Ayrıştırmayı bitir"
 msgid "Weekend!"
 msgstr "Hafta sonu!"
 
-#: gajim/common/logger.py:192 gajim/common/logger.py:197
+#: gajim/common/logger.py:189 gajim/common/logger.py:194
 #, python-format
 msgid "%s is a directory but should be a file"
 msgstr ""
 
-#: gajim/common/logger.py:217
+#: gajim/common/logger.py:214
 #, fuzzy, python-format
 msgid "Creating %s"
 msgstr "Yaratıcı"
@@ -2990,23 +2949,20 @@ msgstr "%(nickname)s Çıktı"
 msgid "Contact Signed Out"
 msgstr "Bağlantı Çıkış Yaptı"
 
-#: gajim/common/contacts.py:455
-#, fuzzy
-msgid "Not in roster"
-msgstr "Kişi listesindeki olayları göster"
-
 #: gajim/common/config.py:80
 msgid ""
 "Show desktop notification even when a chat window is opened for this contact "
-"and does not have focus"
+"and does not have focus."
 msgstr ""
 
 #: gajim/common/config.py:81
-msgid "Play sound when user is busy"
+#, fuzzy
+msgid "Play sound even when being busy."
 msgstr "Kişi meşgulsa ses çal"
 
 #: gajim/common/config.py:83
-msgid "Show only online and free for chat contacts in roster."
+#, fuzzy
+msgid "Show only online and free for chat contacts in the contact list."
 msgstr "Kişi listede sadece mevcut ile sohbete hazır olanları göster"
 
 #: gajim/common/config.py:86
@@ -3014,11 +2970,13 @@ msgid "Time in minutes, after which your status changes to away."
 msgstr ""
 
 #: gajim/common/config.py:87
-msgid "$S (Away as a result of being idle more than $T min)"
+msgid "$S (Away: Idle more than $T min)"
 msgstr ""
 
 #: gajim/common/config.py:87
-msgid "$S will be replaced by current status message, $T by autoawaytime."
+msgid ""
+"$S will be replaced by current status message, $T by the 'autoawaytime' "
+"value."
 msgstr ""
 
 #: gajim/common/config.py:89
@@ -3026,75 +2984,80 @@ msgid "Time in minutes, after which your status changes to not available."
 msgstr ""
 
 #: gajim/common/config.py:90
-msgid "$S (Not available as a result of being idle more than $T min)"
+msgid "$S (Not available: Idle more than $T min)"
 msgstr ""
 
 #: gajim/common/config.py:90
-msgid "$S will be replaced by current status message, $T by autoxatime."
+msgid ""
+"$S will be replaced by current status message, $T by the 'autoxatime' value."
 msgstr ""
 
 #: gajim/common/config.py:93
 msgid ""
-"When to show notification area icon. Can be 'never', 'on_event', 'always'."
+"When to show the notification area icon. Can be 'never', 'on_event', and "
+"'always'."
 msgstr ""
 
 #: gajim/common/config.py:94
-msgid "Allow to hide the roster window even if the tray icon is not shown."
+msgid ""
+"Allow to hide the contact list window even if the notification area icon is "
+"not shown."
 msgstr ""
 
 #: gajim/common/config.py:97
-msgid "Contact signed in notification color."
-msgstr ""
+#, fuzzy
+msgid "Notification color for contacts signing in."
+msgstr "_Giren kişilerden haber ver"
 
 #: gajim/common/config.py:98
-msgid "Contact signout notification color"
-msgstr ""
+#, fuzzy
+msgid "Notification color for contacts signing out."
+msgstr "_Çıkan kişilerden haber ver"
 
 #: gajim/common/config.py:99
 #, fuzzy
-msgid "New message notification color."
+msgid "Notification color for new message notification."
 msgstr "Dosya Gönderme Tamamlandı"
 
 #: gajim/common/config.py:100
 #, fuzzy
-msgid "File transfer request notification color."
-msgstr "Dosya Gönderme Soru"
+msgid "Notification color for file transfer request."
+msgstr "_Bir dosya aktarımı tamamlandığında beni bilgilendir"
 
 #: gajim/common/config.py:101
 #, fuzzy
-msgid "File transfer error notification color."
-msgstr "Dosya Gönderme Tamamlandı"
+msgid "Notification color for file transfer errors."
+msgstr "_Bir dosya aktarımı tamamlandığında beni bilgilendir"
 
 #: gajim/common/config.py:102
-#, fuzzy
-msgid "File transfer complete or stopped notification color."
-msgstr "Dosya Gönderme Tamamlandı"
+msgid "Notification color for stopped or completed file transfers."
+msgstr ""
 
 #: gajim/common/config.py:103
-#, fuzzy
-msgid "Groupchat invitation notification color"
-msgstr "Sadece davetliler"
+msgid "Notification color for group chat invitations."
+msgstr ""
 
 #: gajim/common/config.py:104
-msgid "Background color of status changed notification"
+msgid "Notification background color for changed status."
 msgstr ""
 
 #: gajim/common/config.py:105
-msgid "Other dialogs color."
+msgid "Notification color for other dialogs."
 msgstr ""
 
 #: gajim/common/config.py:106
 msgid ""
-"List (space separated) of rows (accounts and groups) that are collapsed."
+"List of rows (accounts and groups) that are collapsed (space separated)."
 msgstr ""
 
 #: gajim/common/config.py:107
 msgid "default"
 msgstr "öntanımlı"
 
-#: gajim/common/config.py:113
+#: gajim/common/config.py:113 gajim/common/config.py:424
+#: gajim/common/config.py:431
 #, fuzzy
-msgid "Language used by speller"
+msgid "Language used for spell checking."
 msgstr "başka programlarca kullanılan: "
 
 #: gajim/common/config.py:114
@@ -3107,8 +3070,8 @@ msgstr ""
 #: gajim/common/config.py:115
 msgid ""
 "Print time in chats using Fuzzy Clock. Value of fuzziness from 1 to 4, or 0 "
-"to disable fuzzyclock. 1 is the most precise clock, 4 the least precise one. "
-"This is used only if print_time is 'sometimes'."
+"to disable Fuzzy Clock. 1 is the most precise clock, 4 the least precise "
+"one. This is used only if 'print_time' is 'sometimes'."
 msgstr ""
 
 #: gajim/common/config.py:117
@@ -3121,538 +3084,553 @@ msgstr ""
 
 #: gajim/common/config.py:120
 msgid ""
-"If true, do not remove */_ . So *abc* will be bold but with * * not removed."
+"If enabled, do not remove */_ . So *abc* will be bold but with * * not "
+"removed."
 msgstr ""
 
 #: gajim/common/config.py:123
 msgid ""
-"Uses ReStructured text markup to send HTML, plus ascii formatting if "
-"selected. For syntax, see http://docutils.sourceforge.net/docs/ref/rst/"
-"restructuredtext.html (If you want to use this, install docutils)"
+"Uses ReStructured text markup to send HTML, plus ASCII formatting if "
+"selected. Needs docutils installed (for syntax, see http://docutils."
+"sourceforge.net/docs/ref/rst/restructuredtext.html)."
 msgstr ""
 
 #: gajim/common/config.py:132
 msgid ""
-"Character to add after nickname when using nick completion (tab) in group "
-"chat."
+"Character to add after nickname when using nickname completion (tab) in "
+"group chat."
 msgstr ""
 
 #: gajim/common/config.py:133
 msgid ""
-"Character to propose to add after desired nickname when desired nickname is "
-"used by someone else in group chat."
+"Character to propose to add after desired nickname when nickname is already "
+"used in group chat."
 msgstr ""
 
 #: gajim/common/config.py:155
 msgid ""
-"If true, Gajim will save roster position when hiding roster, and restore it "
-"when showing roster."
+"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:161
-msgid "Place the roster on the right in single window mode"
+msgid "Place the contact list on the right in single window mode"
 msgstr ""
 
 #: gajim/common/config.py:167
 msgid ""
-"This option let you customize timestamp that is printed in conversation. For "
-"example \"[%H:%M] \" will show \"[hour:minute] \". See python doc on "
-"strftime for full documentation: http://docs.python.org/lib/module-time.html"
+"This option lets you customize the timestamp that is printed in "
+"conversation. For example '[%H:%M] ' will show '[hour:minute] '. See python "
+"doc on strftime for full documentation (https://docs.python.org/3/library/"
+"time.html)."
 msgstr ""
 
 #: gajim/common/config.py:168
-msgid "Characters that are printed before the nickname in conversations"
+msgid "Characters that are printed before the nickname in conversations."
 msgstr ""
 
 #: gajim/common/config.py:169
-msgid "Characters that are printed after the nickname in conversations"
+msgid "Characters that are printed after the nickname in conversations."
 msgstr ""
 
 #: gajim/common/config.py:170
-msgid "Add * and [n] in roster title?"
-msgstr "* ile [n] kişi listeye eklensin mi?"
+msgid "If enabled, Gajim will add * and [n] in contact list window title."
+msgstr ""
 
 #: gajim/common/config.py:171
 msgid ""
-"How many history messages should be restored when a chat tab/window is "
-"reopened?"
+"Number of messages from chat history to be restored when a chat tab/window "
+"is reopened."
 msgstr ""
 
 #: gajim/common/config.py:172
-msgid "How far back in time (minutes) history is restored. -1 means no limit."
+msgid ""
+"How far back in time (minutes) chat history is restored. -1 means no limit."
 msgstr ""
 
 #: gajim/common/config.py:173
 msgid ""
-"How many lines to request from server when entering a groupchat. -1 means no "
-"limit"
+"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:174
 msgid ""
-"Minutes of backlog to request when entering a groupchat. -1 means no limit"
+"Should automatic rejoin be activated when you were kicked from a group chat?"
 msgstr ""
 
 #: gajim/common/config.py:175
-msgid ""
-"How many seconds to wait before trying to autorejoin to a conference you are "
-"being disconnected from. Set to 0 to disable autorejoining."
-msgstr ""
-
-#: gajim/common/config.py:176
-msgid "Should autorejoin be activated when kicked from a conference?"
+msgid "Send message on Ctrl+Enter and make a new line with Enter."
 msgstr ""
 
 #: gajim/common/config.py:177
-msgid ""
-"Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
-"Client default behaviour)."
-msgstr ""
-
-#: gajim/common/config.py:179
-msgid "How many lines to store for Ctrl+KeyUP."
+msgid "How many lines to store for Ctrl+KeyUP (previously sent messages)."
 msgstr ""
 
-#: gajim/common/config.py:182
+#: gajim/common/config.py:180
 #, python-format
 msgid ""
-"Either custom URL with %%s in it where %%s is the word/phrase or "
-"'WIKTIONARY' which means use Wikitionary."
+"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:185
+#: gajim/common/config.py:183
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr ""
 
-#: gajim/common/config.py:187
+#: gajim/common/config.py:185
 msgid ""
-"When not printing time for every message (print_time==sometimes), print it "
+"When not printing time for every message ('print_time'==sometimes), print it "
 "every x minutes."
 msgstr ""
 
-#: gajim/common/config.py:188
+#: gajim/common/config.py:186
 msgid "Ask before pasting an image."
 msgstr ""
 
-#: gajim/common/config.py:189
+#: gajim/common/config.py:187
 msgid "Ask before closing a group chat tab/window."
 msgstr ""
 
-#: gajim/common/config.py:190
+#: gajim/common/config.py:188
 msgid ""
-"Always ask for confirmation before closing groupchats with any of the JIDs "
-"on this space separated list."
+"Always ask for confirmation before closing group chats with any of the XMPP "
+"Addresses on this list (space separated)."
 msgstr ""
 
-#: gajim/common/config.py:191
+#: gajim/common/config.py:189
 msgid ""
-"Never ask for confirmation before closing groupchats with any of the JIDs on "
-"this space separated list."
+"Never ask for confirmation before closing group chats with any of the XMPP "
+"Addresses on this list (space separated)."
 msgstr ""
 
-#: gajim/common/config.py:192
+#: gajim/common/config.py:190
 msgid ""
-"Ask before closing tabbed chat window if there are controls that can lose "
-"data (chat, private chat, groupchat that will not be minimized)"
+"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:195
+#: gajim/common/config.py:193
 msgid ""
-"Comma separated list of sent hosts, in addition of local interfaces, for "
-"File Transfer in case of address translation/port forwarding."
+"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:196
+#: gajim/common/config.py:194
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr ""
 
-#: gajim/common/config.py:198
+#: gajim/common/config.py:196
 msgid "Notify of events in the notification area."
 msgstr ""
 
-#: gajim/common/config.py:199
+#: gajim/common/config.py:197
 msgid ""
-"If False, Gajim will display a static event icon instead of the blinking "
-"status icon in the notification area when notifying on event."
+"If disabled, Gajim will display a static event icon instead of the blinking "
+"status icon in the notification area when notifying about an event."
 msgstr ""
 
-#: gajim/common/config.py:205
+#: gajim/common/config.py:203
 msgid "Show tab when only one conversation?"
 msgstr ""
 
-#: gajim/common/config.py:206
+#: gajim/common/config.py:204
 msgid "Show tabbed notebook border in chat windows?"
 msgstr ""
 
-#: gajim/common/config.py:207
+#: gajim/common/config.py:205
 #, 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:220
+#: gajim/common/config.py:218
 msgid "Preview new messages in notification popup?"
 msgstr ""
 
-#: gajim/common/config.py:223
+#: gajim/common/config.py:221
 msgid ""
-"A semicolon-separated list of words that will be highlighted in group chats."
+"A list of words (semicolon separated) that will be highlighted in group "
+"chats."
 msgstr ""
 
-#: gajim/common/config.py:224
+#: gajim/common/config.py:222
 msgid ""
-"If true, quits Gajim when X button of Window Manager is clicked. This "
-"setting is taken into account only if notification icon is used."
+"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:225
+#: gajim/common/config.py:223
 msgid ""
-"If true, Gajim hides the Roster window on pressing the X button instead of "
-"minimizing into the Dock."
+"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:226
+#: gajim/common/config.py:224
 msgid ""
-"If true, Gajim will display an icon on each tab containing unread messages. "
-"Depending on the theme, this icon may be animated."
+"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:227
+#: gajim/common/config.py:225
 msgid ""
-"If true, Gajim will display the status message, if not empty, for every "
-"contact under the contact name in roster window."
+"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:233
-msgid "Define the position of the avatar in roster. Can be left or right"
+#: gajim/common/config.py:231
+msgid ""
+"Define the position of avatars in the contact list. Can be 'left' or 'right'."
 msgstr ""
 
-#: gajim/common/config.py:234
+#: gajim/common/config.py:232
 msgid ""
-"If False, Gajim will no longer print status line in chats when a contact "
-"changes their status and/or their status message."
+"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:235
+#: gajim/common/config.py:233
 #, fuzzy
 msgid ""
 "Default Setting: Show a status message for every join or leave in a group "
-"chat"
+"chat."
 msgstr "Grup sohbetine girilemiyor"
 
-#: gajim/common/config.py:236
+#: gajim/common/config.py:234
+#, fuzzy
 msgid ""
-"Default Setting: Show a status message for all status (away, dnd, etc.) "
-"changes of users in a group chat"
-msgstr ""
+"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:238
-msgid "Log XHTML messages instead of plain text messages."
+#: gajim/common/config.py:236
+msgid "Store XHTML messages in chat history instead of plain text messages."
 msgstr ""
 
-#: gajim/common/config.py:239
+#: gajim/common/config.py:237
 msgid "Don't show avatar for the transport itself."
 msgstr ""
 
-#: gajim/common/config.py:240
-msgid "Don't show roster in the system taskbar."
+#: gajim/common/config.py:238
+msgid "Don't show contact list window in the system taskbar."
 msgstr ""
 
-#: gajim/common/config.py:241
+#: gajim/common/config.py:239
 msgid ""
-"If true, make the window flash (the default behaviour in most Window "
-"Managers) when holding pending events."
+"If enabled, Gajim makes the window flash (the default behaviour in most "
+"Window Managers) when holding pending events."
 msgstr ""
 
-#: gajim/common/config.py:245
+#: gajim/common/config.py:243
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
 "'always_with_roster' - Like 'always' but the messages are in a single window "
-"along with the roster.\n"
+"along with the contact list.\n"
 "'never' - All messages get their own window.\n"
 "'peracct' - Messages for each account are sent to a specific window.\n"
-"'pertype' - Each message type (e.g. chats vs. groupchats) is sent to a "
+"'pertype' - Each message type (e.g. chats vs. group chats) is sent to a "
 "specific window."
 msgstr ""
 
-#: gajim/common/config.py:246
+#: gajim/common/config.py:244
 msgid ""
-"Show roster on startup.\n"
-"'always' - Always show roster.\n"
-"'never' - Never show roster.\n"
-"'last_state' - Restore the last state roster."
+"Show contact list window on startup.\n"
+"'always' - Always show contact list window.\n"
+"'never' - Never show contact list window.\n"
+"'last_state' - Restore last state of the contact list window."
 msgstr ""
 
-#: gajim/common/config.py:247
-msgid "If False, you will no longer see the avatar in the chat window."
+#: gajim/common/config.py:245
+msgid "If enabled, Gajim displays the avatar in the chat window."
 msgstr ""
 
-#: gajim/common/config.py:248
-msgid "If true, pressing the escape key closes a tab/window."
+#: gajim/common/config.py:246
+msgid "If enabled, pressing Esc closes a tab/window."
 msgstr ""
 
+#: gajim/common/config.py:247
+#, fuzzy
+msgid "Hides the banner in a group chat window."
+msgstr "%s mevcut bir grubun ismi değil"
+
+#: gajim/common/config.py:248
+#, fuzzy
+msgid "Hides the banner in a 1:1 chat window."
+msgstr "Konuşma penceresinde tüm düğmeleri gizle"
+
 #: gajim/common/config.py:249
-msgid "Hides the banner in a group chat window"
+msgid "Hides the group chat participants list in a group chat window."
 msgstr ""
 
 #: gajim/common/config.py:250
-msgid "Hides the banner in two persons chat window"
+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:251
-msgid "Hides the group chat occupants list in group chat window."
+msgid "Indentation when using merge consecutive nickname."
 msgstr ""
 
 #: gajim/common/config.py:252
 msgid ""
-"In a chat, show the nickname at the beginning of a line only when it's not "
-"the same person talking than in previous message."
+"Ctrl+Tab switches to the next composing tab when there are no tabs with "
+"messages pending."
 msgstr ""
 
 #: gajim/common/config.py:253
-msgid "Indentation when using merge consecutive nickname."
+msgid ""
+"Show a confirmation dialog to create metacontacts? Empty string means never "
+"show the dialog."
 msgstr ""
 
 #: gajim/common/config.py:254
-msgid "Ctrl-Tab go to next composing tab when none is unread."
+msgid ""
+"Show a confirmation dialog to block a contact? Empty string means never show "
+"the dialog."
 msgstr ""
 
 #: gajim/common/config.py:255
 msgid ""
-"Show the confirm metacontacts creation dialog or not? Empty string means "
-"never show the dialog."
+"Show a confirmation dialog for a custom status? Empty string means never "
+"show the dialog."
 msgstr ""
 
 #: gajim/common/config.py:256
 msgid ""
-"Show the confirm block contact dialog or not? Empty string means never show "
-"the dialog."
+"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:257
 msgid ""
-"Show the confirm custom status dialog or not? Empty string means never show "
-"the dialog."
+"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:258
 msgid ""
-"If true, you will be able to set a negative priority to your account in "
-"account modification window. BE CAREFUL, when you are logged in with a "
-"negative priority, you will NOT receive any message from your server."
+"Can be empty, 'chat' or 'normal'. If not empty, all incoming messages are "
+"treated as if they were of this type."
 msgstr ""
 
 #: gajim/common/config.py:259
 msgid ""
-"If true, Gajim will show number of online and total contacts in account and "
-"group rows."
+"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:260
-msgid ""
-"Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
-"as if they were of this type"
+msgid "Time of inactivity needed before the change status window closes down."
 msgstr ""
 
 #: gajim/common/config.py:261
 msgid ""
-"If true, Gajim will scroll and select the contact who sent you the last "
-"message, if chat window is not already opened."
+"Maximum number of lines that are printed in conversations. Oldest lines are "
+"cleared."
 msgstr ""
 
 #: gajim/common/config.py:262
-msgid "Time of inactivity needed before the change status window closes down."
+msgid ""
+"If enabled, notification windows from notification-daemon will be attached "
+"to the notification area icon."
 msgstr ""
 
 #: gajim/common/config.py:263
-msgid ""
-"Maximum number of lines that are printed in conversations. Oldest lines are "
-"cleared."
-msgstr ""
+#, fuzzy
+msgid "Choose interval between 2 checks of idleness."
+msgstr "Denetimler arasındaki süre %lu saniye olarak belirleniyor\n"
 
 #: gajim/common/config.py:264
 msgid ""
-"If true, notification windows from notification-daemon will be attached to "
-"notification icon."
+"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:265
-#, fuzzy
-msgid "Choose interval between 2 checks of idleness."
-msgstr "Denetimler arasındaki süre %lu saniye olarak belirleniyor\n"
-
-#: gajim/common/config.py:266
 msgid ""
-"Valid uri schemes. Only schemes in this list will be accepted as \"real\" "
-"uri. (mailto and xmpp are handled separately)"
+"If enabled, completion in group chats will be like a shell auto-completion."
 msgstr ""
 
-#: gajim/common/config.py:267
-msgid "If true, completion in groupchats will be like a shell auto-completion"
+#: gajim/common/config.py:270
+msgid "Optionally fix Jingle output video framerate. Example: 10/1 or 25/2."
+msgstr ""
+
+#: gajim/common/config.py:271
+msgid "Optionally resize Jingle output video. Example: 320x240."
 msgstr ""
 
 #: gajim/common/config.py:272
-msgid "Optionally fix jingle output video framerate. Example: 10/1 or 25/2"
+msgid "If enabled, you will see your webcam's video stream as well."
 msgstr ""
 
-#: gajim/common/config.py:273
-msgid "Optionally resize jingle output video. Example: 320x240"
+#: gajim/common/config.py:275
+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:274
-msgid "If true, You will also see your webcam"
+#: gajim/common/config.py:276
+msgid "STUN server to use when using Jingle"
 msgstr ""
 
 #: gajim/common/config.py:277
 msgid ""
-"If true, Gajim will try to use a STUN server when using Jingle. The one in "
-"\"stun_server\" option, or the one given by the XMPP server."
+"If enabled, Gajim will show affiliation of group chat participants by adding "
+"a colored square to the status icon."
 msgstr ""
 
 #: gajim/common/config.py:278
-msgid "STUN server to use when using Jingle"
+msgid ""
+"Proxy used for all outgoing connections if the account does not have a "
+"specific proxy configured."
 msgstr ""
 
 #: gajim/common/config.py:279
-msgid ""
-"If true, Gajim will show affiliation of groupchat occupants by adding a "
-"colored square to the status icon"
+msgid "If enabled, Gajim will ignore incoming attention requests ('wizz')."
 msgstr ""
 
 #: gajim/common/config.py:280
 msgid ""
-"Proxy used for all outgoing connections if the account does not have a "
-"specific proxy configured"
+"If enabled, Gajim will reopen chat windows that were opened last time Gajim "
+"was closed."
 msgstr ""
 
 #: gajim/common/config.py:281
-msgid "If true, Gajim will ignore incoming attention requests (\"wizz\")."
+msgid ""
+"If enabled, Gajim will display an icon to show that sent messages have been "
+"received by your contact."
 msgstr ""
 
 #: gajim/common/config.py:282
-msgid ""
-"If enabled, Gajim will reopen chat windows that were opened last time Gajim "
-"was closed."
+msgid "Show a mini avatar in chat window tabs and as the window's icon."
 msgstr ""
 
 #: gajim/common/config.py:283
 msgid ""
-"If enabled, Gajim will show an icon to show that sent message has been "
-"received by your contact"
+"If enabled, Gajim will use the System's Keyring to store account passwords."
 msgstr ""
 
 #: gajim/common/config.py:284
-msgid "Show a mini avatar in chat window tabs and in window icon"
+msgid "If enabled, Gajim will execute XEP-0146 Commands."
 msgstr ""
 
 #: gajim/common/config.py:285
-msgid "If true, Gajim will use the Systems Keyring to store account passwords."
+msgid "2: System, 1: Enabled, 0: Disabled"
 msgstr ""
 
 #: gajim/common/config.py:286
-msgid "If true, Gajim will execute XEP-0146 Commands."
+msgid "Options in days which can be chosen in the sync threshold menu"
 msgstr ""
 
 #: gajim/common/config.py:287
-msgid "2: System, 1: Enabled, 0: Disabled"
+msgid ""
+"Maximum history in days we request from a public group chat archive. 0: As "
+"much as possible."
 msgstr ""
 
 #: gajim/common/config.py:288
-msgid "Options in days which can be chosen in the sync threshold menu"
+msgid ""
+"Maximum history in days we request from a private group chat archive. 0: As "
+"much as possible."
 msgstr ""
 
 #: gajim/common/config.py:289
 msgid ""
-"Maximum history in days we request from a public room archive. 0: As much as "
-"possible"
+"If enabled, Gajim shows the group chat subject in the chat window when "
+"joining."
 msgstr ""
 
 #: gajim/common/config.py:290
 msgid ""
-"Maximum history in days we request from a private room archive. 0: As much "
-"as possible"
+"If enabled, the contact row is colored according to the current chat state "
+"of the contact."
 msgstr ""
 
 #: gajim/common/config.py:291
-msgid "If the room subject is shown in chat on join"
+msgid ""
+"If enabled, the tab is colored according to the current chat state of the "
+"contact."
 msgstr ""
 
 #: gajim/common/config.py:292
 msgid ""
-"If the contact row is colored according to the current chatstate of the "
-"contact"
+"Shows a text in the banner that describes the current chat state of the "
+"contact."
 msgstr ""
 
 #: gajim/common/config.py:293
-msgid "If the tab is colored according to the current chatstate of the contact"
-msgstr ""
-
-#: gajim/common/config.py:294
-msgid ""
-"Shows a text in the banner that describes the current chatstate of the "
-"contact"
-msgstr ""
-
-#: gajim/common/config.py:295 gajim/common/config.py:424
 msgid ""
 "Chat state notifications that are sent to contacts. Possible values: all, "
 "composing_only, disabled"
 msgstr ""
 
-#: gajim/common/config.py:296 gajim/common/config.py:438
+#: gajim/common/config.py:294
 msgid ""
 "Chat state notifications that are sent to the group chat. Possible values: "
-"all, composing_only, disabled"
+"'all', 'composing_only', 'disabled'"
 msgstr ""
 
-#: gajim/common/config.py:312
-msgid ""
-"Priority will change automatically according to your status. Priorities are "
-"defined in autopriority_* options."
+#: gajim/common/config.py:297
+msgid "API Preferences. Possible values: 'http', 'iq'"
 msgstr ""
 
-#: gajim/common/config.py:320
+#: gajim/common/config.py:313
+#, fuzzy
 msgid ""
-"Status used to autoconnect as. Can be online, chat, away, xa, dnd, "
-"invisible. NOTE: this option is used only if restore_last_status is disabled"
-msgstr ""
+"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:321
-msgid "If enabled, restore the last status that was used."
+msgid ""
+"Status to be used automatically when connecting. Can be 'online', 'chat', "
+"'away', 'xa', 'dnd' or 'invisible'. NOTE: This option is used only if "
+"'restore_last_status' is disabled."
 msgstr ""
 
 #: gajim/common/config.py:322
-msgid ""
-"If true, Contacts requesting authorization will be automatically accepted."
+msgid "If enabled, the last status will be restored."
 msgstr ""
 
 #: gajim/common/config.py:323
 msgid ""
-"If False, this account will be disabled and will not appear in roster window."
+"If enabled, Contacts requesting authorization will be accepted automatically."
 msgstr ""
 
-#: gajim/common/config.py:327
-msgid "Allow plaintext connections"
+#: gajim/common/config.py:324
+msgid ""
+"If disabled, this account will be disabled and will not appear in the "
+"contact list window."
 msgstr ""
 
-#: gajim/common/config.py:330
-msgid ""
-"List (space separated) of authentication mechanisms to try. Can contain "
-"ANONYMOUS, EXTERNAL, GSSAPI, SCRAM-SHA-1-PLUS, SCRAM-SHA-1, DIGEST-MD5, "
-"PLAIN, X-MESSENGER-OAUTH2 or XEP-0078"
+#: gajim/common/config.py:328
+msgid "Allow plaintext connections."
 msgstr ""
 
 #: gajim/common/config.py:331
 msgid ""
-"Show a warning dialog before sending password on an plaintext connection. "
-"Can be 'warn', 'connect', 'disconnect'"
+"List of authentication mechanisms to try (space separated). Can contain "
+"'ANONYMOUS', 'EXTERNAL', 'GSSAPI', 'SCRAM-SHA-1-PLUS', 'SCRAM-SHA-1', "
+"'DIGEST-MD5', 'PLAIN', 'X-MESSENGER-OAUTH2' or 'XEP-0078'."
 msgstr ""
 
 #: gajim/common/config.py:332
-msgid "Show a warning dialog before using standard SSL library."
+#, fuzzy
+msgid ""
+"Show a warning dialog before sending password on an plaintext connection. "
+"Can be 'warn', 'connect' or 'disconnect'."
 msgstr ""
+"Bunu işaretleyince Gajim göndermeden sorar parolayı tehlikeli bir bağlantı "
+"üzerinden göndersin mi diye."
 
 #: gajim/common/config.py:333
+msgid "Show a warning dialog before using standard SSL library."
+msgstr ""
+
+#: gajim/common/config.py:334
 #, fuzzy
 msgid ""
 "Show a warning dialog before sending PLAIN password over a plain connection."
@@ -3660,248 +3638,253 @@ msgstr ""
 "Bunu işaretleyince Gajim göndermeden sorar parolayı tehlikeli bir bağlantı "
 "üzerinden göndersin mi diye."
 
-#: gajim/common/config.py:334
-msgid "Space separated list of ssl errors to ignore."
+#: gajim/common/config.py:335
+msgid "List of SSL errors to ignore (space separated)."
 msgstr ""
 
-#: gajim/common/config.py:340
+#: gajim/common/config.py:341
 msgid ""
-"Space separated list of JIDs for which you do not want to store logs. You "
-"can also add account name to log nothing for this account."
+"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:341
+#: gajim/common/config.py:342
 msgid ""
-"Space separated list of JIDs for which you accept to not log conversations "
-"if he does not want to."
+"List of XMPP Addresses (space separated) for which you accept to not store "
+"chat history if your contact does not want to."
 msgstr ""
 
-#: gajim/common/config.py:343
+#: gajim/common/config.py:344
 #, fuzzy
-msgid "Whitespace sent after inactivity"
+msgid "If enabled, a whitespace is sent after inactivity (keep alive)."
 msgstr "|N|N saniyelik durgunluktan sonra kartı ayırır"
 
-#: gajim/common/config.py:344
-msgid "XMPP ping sent after inactivity"
+#: gajim/common/config.py:345
+msgid "If enabled, an XMPP ping is sent after inactivity (ping alive)."
 msgstr ""
 
-#: gajim/common/config.py:348
+#: gajim/common/config.py:349
 msgid ""
-"How many seconds to wait for the answer of ping alive packet before trying "
-"to reconnect?"
+"How many seconds to wait for the answer of a ping alive packet before trying "
+"to reconnect."
 msgstr ""
 
-#: gajim/common/config.py:352
+#: gajim/common/config.py:353
 #, fuzzy
-msgid "Jabberd2 workaround"
+msgid "Jabberd2 workaround."
 msgstr "Bug'ları hallet"
 
-#: gajim/common/config.py:355
+#: gajim/common/config.py:356
 msgid ""
-"If checked, Gajim will use your IP and proxies defined in "
-"file_transfer_proxies option for file transfer."
+"If enabled, Gajim will use your IP and proxies defined in "
+"'file_transfer_proxies' option for file transfers."
 msgstr ""
 
-#: gajim/common/config.py:356
+#: gajim/common/config.py:357
 msgid ""
-"If true, Gajim will test file transfer proxies on startup to be sure it "
-"works. Openfire's proxies are known to fail this test even if they work."
+"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:369
-#, fuzzy
-msgid "Answer to receipt requests"
-msgstr "matematik probleminin yanıtını yaz"
-
 #: gajim/common/config.py:370
-#, fuzzy
-msgid "Sent receipt requests"
-msgstr "     İsteklerin gideceği adres: %(requestaddr)s"
+msgid "If enabled, Gajim will answer to message receipt requests."
+msgstr ""
 
-#: gajim/common/config.py:379
+#: gajim/common/config.py:371
+msgid "If enabled, Gajim will send message receipt requests."
+msgstr ""
+
+#: gajim/common/config.py:380
 msgid ""
 "Allow Gajim to send information about the operating system you are running."
 msgstr ""
 
-#: gajim/common/config.py:380
+#: gajim/common/config.py:381
 #, fuzzy
 msgid "Allow Gajim to send your local time."
 msgstr "%s size bir dosya göndermek istiyor."
 
-#: gajim/common/config.py:383
-msgid "Message that is sent to contacts you want to add"
-msgstr ""
-
 #: gajim/common/config.py:384
-msgid ""
-"If enabled, Gajim will send your local IPs so your contact can connect to "
-"your machine to transfer files."
-msgstr ""
+#, 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:385
 msgid ""
-"Space separated list of JIDs for which chat window will be re-opened on next "
-"startup."
+"If enabled, Gajim will send your local IP so your contact can connect to "
+"your machine for file transfers."
 msgstr ""
 
-#: gajim/common/config.py:387
-msgid "HTTP Upload: Enable HTTPS Verification"
+#: gajim/common/config.py:386
+msgid ""
+"List of XMPP Addresses (space separated) for which the chat window will be "
+"re-opened on next startup."
 msgstr ""
 
 #: gajim/common/config.py:388
-msgid ""
-"Preferred file transfer mechanism for file drag&drop on chat window. Can be "
-"'httpupload' (default) or 'jingle'"
+msgid "HTTP File Upload: Enable HTTPS Verification."
 msgstr ""
 
 #: gajim/common/config.py:389
-msgid "Allow cert verification with POSH"
-msgstr ""
-
-#: gajim/common/config.py:423 gajim/common/config.py:430
-msgid "Language for which misspelled words will be checked"
+msgid ""
+"Preferred file transfer mechanism for file drag&drop on a chat window. Can "
+"be 'httpupload' (default) or 'jingle'."
 msgstr ""
 
-#: gajim/common/config.py:427
-msgid "The currently active encryption for that contact"
-msgstr ""
+#: gajim/common/config.py:390
+#, fuzzy
+msgid "Allow certificate verification with POSH."
+msgstr "<b>Bir hata oluştu:</b>"
 
-#: gajim/common/config.py:431
+#: gajim/common/config.py:425
 msgid ""
-"How many lines to request from server when entering a groupchat. -1 means no "
-"limit, -2 means global value"
+"Chat state notifications that are sent to contacts. Possible values: 'all', "
+"'composing_only', 'disabled'"
 msgstr ""
 
+#: gajim/common/config.py:428
+#, fuzzy
+msgid "The currently active encryption for that contact."
+msgstr "Bu dizin için seçici erişim etkinleştirilmemiş"
+
 #: gajim/common/config.py:432
 msgid ""
-"Minutes of backlog to request when entering a groupchat. -1 means no limit, "
-"-2 means global value"
+"If enabled, a notification is created for every message in this group chat."
 msgstr ""
 
 #: gajim/common/config.py:433
-msgid "State whether a notification is created for every message in this room"
-msgstr ""
-
-#: gajim/common/config.py:434
+#, fuzzy
 msgid ""
-"Show a status message for all status (away, dnd, etc.) changes of users in a "
-"group chat"
-msgstr ""
+"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:435
+#: gajim/common/config.py:434
 #, fuzzy
-msgid "Show a status message for every join or leave in a group chat"
+msgid "Show a status message for every join or leave in a group chat."
 msgstr "Grup sohbetine girilemiyor"
 
+#: gajim/common/config.py:435
+msgid ""
+"If enabled, the group chat is minimized into the contact list when joining "
+"automatically."
+msgstr ""
+
 #: gajim/common/config.py:436
-msgid "If the group chat is minimized into the roster on autojoin"
+msgid ""
+"If enabled, the group chat is minimized into the contact list when closing "
+"it."
 msgstr ""
 
 #: gajim/common/config.py:437
-msgid "If the group chat is minimized into the roster on close"
+msgid ""
+"Chat state notifications that are sent to the group chat. Possible values: "
+"'all', 'composing_only' or 'disabled'."
 msgstr ""
 
-#: gajim/common/config.py:441
+#: gajim/common/config.py:440
 msgid ""
-"State whether plugins should be activated on startup (this is saved on Gajim "
-"exit). This option SHOULD NOT be used to (de)activate plug-ins. Use GUI "
-"instead."
+"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:446 gajim/common/const.py:281
+#: gajim/common/config.py:445 gajim/common/const.py:315
 #, fuzzy
 msgid "Sleeping"
 msgstr "Uyuyan bir kapibara."
 
-#: gajim/common/config.py:447
+#: gajim/common/config.py:446
 #, fuzzy
 msgid "Back soon"
 msgstr "Geri Düğme"
 
-#: gajim/common/config.py:447
+#: gajim/common/config.py:446
 #, fuzzy
 msgid "Back in some minutes."
 msgstr "Bekleme süresi (dakikalar)"
 
-#: gajim/common/config.py:448 gajim/common/const.py:247
+#: gajim/common/config.py:447 gajim/common/const.py:281
 msgid "Eating"
 msgstr "Yemelik"
 
-#: gajim/common/config.py:448
-msgid "I'm eating, so leave me a message."
-msgstr "Yemek yiyorum, bu yüzden bana bir mesaj brak."
+#: gajim/common/config.py:447
+#, fuzzy
+msgid "I'm eating."
+msgstr " Çalışılıyorum"
 
-#: gajim/common/config.py:449
+#: gajim/common/config.py:448
 msgid "Movie"
 msgstr "Filim"
 
-#: gajim/common/config.py:449
+#: gajim/common/config.py:448
 msgid "I'm watching a movie."
 msgstr "Bir filim bakiyorum."
 
-#: gajim/common/config.py:450 gajim/common/const.py:314
+#: gajim/common/config.py:449 gajim/common/const.py:348
 msgid "Working"
 msgstr " Çalışılıyor"
 
-#: gajim/common/config.py:450
+#: gajim/common/config.py:449
 msgid "I'm working."
 msgstr " Çalışılıyorum"
 
-#: gajim/common/config.py:451
+#: gajim/common/config.py:450
 msgid "Phone"
 msgstr "Telefon"
 
-#: gajim/common/config.py:451
+#: gajim/common/config.py:450
 msgid "I'm on the phone."
 msgstr "Telefondayım"
 
-#: gajim/common/config.py:452
+#: gajim/common/config.py:451
 msgid "Out"
 msgstr "Dış"
 
-#: gajim/common/config.py:452
+#: gajim/common/config.py:451
 #, fuzzy
 msgid "I'm out enjoying life."
 msgstr "%(nickname)s Çıktı"
 
-#: gajim/common/config.py:463
+#: gajim/common/config.py:462
 #, fuzzy
 msgid "I'm available."
 msgstr "Mevcut Değil"
 
-#: gajim/common/config.py:464
+#: gajim/common/config.py:463
 msgid "I'm free for chat."
 msgstr "Sohbet için Hazırım"
 
-#: gajim/common/config.py:465 gajim/gtk/accounts.py:134
+#: gajim/common/config.py:464 gajim/gtk/accounts.py:133
 #, fuzzy
 msgid "Be right back."
 msgstr "Hemen Dönecek"
 
-#: gajim/common/config.py:466
+#: gajim/common/config.py:465
 #, fuzzy
 msgid "I'm not available."
 msgstr "Mevcut Değil"
 
-#: gajim/common/config.py:467
+#: gajim/common/config.py:466
 msgid "Do not disturb."
 msgstr "Rahatsız Etme."
 
-#: gajim/common/config.py:468 gajim/common/config.py:469
+#: gajim/common/config.py:467 gajim/common/config.py:468
 msgid "Bye!"
 msgstr "Güle Güle!"
 
-#: gajim/common/config.py:480
+#: gajim/common/config.py:479
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
-"muc_highlight_words, or when a group chat message contains your nickname."
+"'muc_highlight_words' your nickname is mentioned."
 msgstr ""
 
-#: gajim/common/config.py:481
-msgid "Sound to play when any MUC message arrives."
+#: gajim/common/config.py:480
+msgid "Sound to play when any group chat message arrives."
 msgstr ""
 
-#: gajim/common/config.py:485
+#: gajim/common/config.py:484
 #, fuzzy
 msgid "Tor"
 msgstr "Kime"
@@ -3911,928 +3894,1024 @@ msgstr "Kime"
 msgid "Error: cannot open %s for reading"
 msgstr "Hata: %s okumak için açılamıyor"
 
-#: gajim/common/const.py:214
+#: gajim/common/const.py:216
+#, fuzzy
+msgid "?Group chat name:Team"
+msgstr "?Group Chat Contact Role:Hiç biri"
+
+#: gajim/common/const.py:217
+msgid "?Group chat description:Project discussion"
+msgstr ""
+
+#: gajim/common/const.py:218
+#, fuzzy
+msgid "?Group chat address:team"
+msgstr "Grup sohbetler"
+
+#: gajim/common/const.py:219
+#, fuzzy
+msgid "?Group chat name:Family"
+msgstr "%s grup sohbete katıldı"
+
+#: gajim/common/const.py:220
+msgid "?Group chat description:Spring gathering"
+msgstr ""
+
+#: gajim/common/const.py:221
+msgid "?Group chat address:family"
+msgstr ""
+
+#: gajim/common/const.py:222
+#, fuzzy
+msgid "?Group chat name:Vacation"
+msgstr "Grup Sohbeti Daveti"
+
+#: gajim/common/const.py:223
+msgid "?Group chat description:Trip planning"
+msgstr ""
+
+#: gajim/common/const.py:224
+#, fuzzy
+msgid "?Group chat address:vacation"
+msgstr "Grup Sohbeti Daveti"
+
+#: gajim/common/const.py:225
+#, fuzzy
+msgid "?Group chat name:Repairs"
+msgstr "Grup Sohbetler"
+
+#: gajim/common/const.py:226
+msgid "?Group chat description:Local help group"
+msgstr ""
+
+#: gajim/common/const.py:227
+#, fuzzy
+msgid "?Group chat address:repairs"
+msgstr "Grup sohbetler"
+
+#: gajim/common/const.py:228
+#, fuzzy
+msgid "?Group chat name:News"
+msgstr "?Group Chat Contact Role:Hiç biri"
+
+#: gajim/common/const.py:229
+#, fuzzy
+msgid "?Group chat description:Local news and reports"
+msgstr "grup %s yok - root kullanılacak\n"
+
+#: gajim/common/const.py:230
+#, fuzzy
+msgid "?Group chat address:news"
+msgstr "_Yeni Bir Grup Sohbeti"
+
+#: gajim/common/const.py:235
+#, fuzzy
+msgid "Remote server not found"
+msgstr "Hizmet bulunamadı"
+
+#: gajim/common/const.py:236
+msgid "Remote server timeout"
+msgstr ""
+
+#: gajim/common/const.py:237 gajim/common/const.py:238
+#: gajim/common/const.py:239
+#, fuzzy
+msgid "Address does not belong to a group chat server"
+msgstr "%s mevcut bir grubun ismi değil"
+
+#: gajim/common/const.py:240
+#, fuzzy
+msgid "Group chat already exists"
+msgstr "Dosyası zaten var"
+
+#: gajim/common/const.py:241
+#, fuzzy
+msgid "Group chat does not exist"
+msgstr "grup %s yok - root kullanılacak\n"
+
+#: gajim/common/const.py:247
 msgid "This message was encrypted with OTR and could not be decrypted."
 msgstr ""
 
-#: gajim/common/const.py:217
+#: gajim/common/const.py:250
 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:221
+#: gajim/common/const.py:254
 msgid ""
-"This message was encrypted with OpenPGP for XMPP and could not be decrypted."
+"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:224
+#: gajim/common/const.py:258
 #, python-format
 msgid "This message was encrypted with %s and could not be decrypted."
 msgstr ""
 
-#: gajim/common/const.py:231
+#: gajim/common/const.py:265
 #, fuzzy
 msgid "Doing Chores"
 msgstr "dosya indeksi taraması yapılırken"
 
-#: gajim/common/const.py:232
+#: gajim/common/const.py:266
 msgid "Buying Groceries"
 msgstr "Alişverişde"
 
-#: gajim/common/const.py:233
+#: gajim/common/const.py:267
 msgid "Cleaning"
 msgstr "Temizleniyor"
 
-#: gajim/common/const.py:234
+#: gajim/common/const.py:268
 msgid "Cooking"
 msgstr "Pişirmede"
 
-#: gajim/common/const.py:235
+#: gajim/common/const.py:269
 #, fuzzy
 msgid "Doing Maintenance"
 msgstr "teşhis için; zıpla, zıpla"
 
-#: gajim/common/const.py:236
+#: gajim/common/const.py:270
 #, fuzzy
 msgid "Doing the Dishes"
 msgstr "dosya indeksi taraması yapılırken"
 
-#: gajim/common/const.py:237
+#: gajim/common/const.py:271
 #, fuzzy
 msgid "Doing the Laundry"
 msgstr "dosya indeksi taraması yapılırken"
 
-#: gajim/common/const.py:238
+#: gajim/common/const.py:272
 msgid "Gardening"
 msgstr "Bahçecilik"
 
-#: gajim/common/const.py:239
+#: gajim/common/const.py:273
 #, fuzzy
 msgid "Running an Errand"
 msgstr "Başka bir Gajim zaten çalışıyor "
 
-#: gajim/common/const.py:240
+#: gajim/common/const.py:274
 #, fuzzy
 msgid "Walking the Dog"
 msgstr "Ağaçta gezinme başarısız"
 
-#: gajim/common/const.py:242
+#: gajim/common/const.py:276
 msgid "Drinking"
 msgstr "İçmede"
 
-#: gajim/common/const.py:243
+#: gajim/common/const.py:277
 msgid "Having a Beer"
 msgstr "Bir Birada"
 
-#: gajim/common/const.py:244
+#: gajim/common/const.py:278
 #, fuzzy
 msgid "Having Coffee"
 msgstr "Bir Birada"
 
-#: gajim/common/const.py:245
+#: gajim/common/const.py:279
 msgid "Having Tea"
 msgstr "Bir Çayda"
 
-#: gajim/common/const.py:248
+#: gajim/common/const.py:282
 msgid "Having a Snack"
 msgstr "Bir hafif Yemekte"
 
-#: gajim/common/const.py:249
+#: gajim/common/const.py:283
 msgid "Having Breakfast"
 msgstr "Kahvaltıda"
 
-#: gajim/common/const.py:250
+#: gajim/common/const.py:284
 msgid "Having Dinner"
 msgstr "Akşam yemekte"
 
-#: gajim/common/const.py:251
+#: gajim/common/const.py:285
 msgid "Having Lunch"
 msgstr "Yemekte"
 
-#: gajim/common/const.py:253
+#: gajim/common/const.py:287
 msgid "Exercising"
 msgstr "Antrenmanda"
 
-#: gajim/common/const.py:254 gajim/common/const.py:305
+#: gajim/common/const.py:288 gajim/common/const.py:339
 #, fuzzy
 msgid "Cycling"
 msgstr "Çevrim renkleri"
 
-#: gajim/common/const.py:255
+#: gajim/common/const.py:289
 msgid "Dancing"
 msgstr "Dansda"
 
-#: gajim/common/const.py:256
+#: gajim/common/const.py:290
 msgid "Hiking"
 msgstr "Yürüşde"
 
-#: gajim/common/const.py:257
+#: gajim/common/const.py:291
 msgid "Jogging"
 msgstr "Koşuda"
 
-#: gajim/common/const.py:258
+#: gajim/common/const.py:292
 #, fuzzy
 msgid "Playing Sports"
 msgstr "DVD'leri Oynatmak"
 
-#: gajim/common/const.py:259
+#: gajim/common/const.py:293
 #, fuzzy
 msgid "Running"
 msgstr "Çalıştırılıyor"
 
-#: gajim/common/const.py:260
+#: gajim/common/const.py:294
 msgid "Skiing"
 msgstr "Kayakta"
 
-#: gajim/common/const.py:261
+#: gajim/common/const.py:295
 msgid "Swimming"
 msgstr "Yüzmekte"
 
-#: gajim/common/const.py:262
+#: gajim/common/const.py:296
 #, fuzzy
 msgid "Working out"
 msgstr "%(nickname)s Çıktı"
 
-#: gajim/common/const.py:264
+#: gajim/common/const.py:298
 msgid "Grooming"
 msgstr "Tımarlamada"
 
-#: gajim/common/const.py:265
+#: gajim/common/const.py:299
 msgid "At the Spa"
 msgstr "Spa'da"
 
-#: gajim/common/const.py:266
+#: gajim/common/const.py:300
 msgid "Brushing Teeth"
 msgstr "Diş furçalamada"
 
-#: gajim/common/const.py:267
+#: gajim/common/const.py:301
 msgid "Getting a Haircut"
 msgstr "Berberde"
 
-#: gajim/common/const.py:268
+#: gajim/common/const.py:302
 msgid "Shaving"
 msgstr "Traşda"
 
-#: gajim/common/const.py:269
+#: gajim/common/const.py:303
 msgid "Taking a Bath"
 msgstr "Banyo yapıyor"
 
-#: gajim/common/const.py:270
+#: gajim/common/const.py:304
 msgid "Taking a Shower"
 msgstr "Duş alıyor"
 
-#: gajim/common/const.py:272
+#: gajim/common/const.py:306
 msgid "Having an Appointment"
 msgstr "Bir Buluşmada"
 
-#: gajim/common/const.py:274
+#: gajim/common/const.py:308
 msgid "Inactive"
 msgstr "Pasif"
 
-#: gajim/common/const.py:275
+#: gajim/common/const.py:309
 #, fuzzy
 msgid "Day Off"
 msgstr "Günün İletisini Sil"
 
-#: gajim/common/const.py:276
+#: gajim/common/const.py:310
 #, fuzzy
 msgid "Hanging out"
 msgstr "%(nickname)s Çıktı"
 
-#: gajim/common/const.py:277
+#: gajim/common/const.py:311
 msgid "Hiding"
 msgstr "Saklanmada"
 
-#: gajim/common/const.py:278
+#: gajim/common/const.py:312
 #, fuzzy
 msgid "On Vacation"
 msgstr "Telefondayım"
 
-#: gajim/common/const.py:279
+#: gajim/common/const.py:313
 msgid "Praying"
 msgstr "Namaz kılmada"
 
-#: gajim/common/const.py:280
+#: gajim/common/const.py:314
 msgid "Scheduled Holiday"
 msgstr "Planlamış Tatilde"
 
-#: gajim/common/const.py:282
+#: gajim/common/const.py:316
 msgid "Thinking"
 msgstr "Düşüncede"
 
-#: gajim/common/const.py:284
+#: gajim/common/const.py:318
 #, fuzzy
 msgid "Relaxing"
 msgstr "İlintileyici esnekliği etkin olur"
 
-#: gajim/common/const.py:285
+#: gajim/common/const.py:319
 msgid "Fishing"
 msgstr "Balık avlamada"
 
-#: gajim/common/const.py:286
+#: gajim/common/const.py:320
 msgid "Gaming"
 msgstr "Oyunda"
 
-#: gajim/common/const.py:287
+#: gajim/common/const.py:321
 #, fuzzy
 msgid "Going out"
 msgstr "%(nickname)s Çıktı"
 
-#: gajim/common/const.py:288
+#: gajim/common/const.py:322
 msgid "Partying"
 msgstr "Eğlencede"
 
-#: gajim/common/const.py:289
+#: gajim/common/const.py:323
 #, fuzzy
 msgid "Reading"
 msgstr "Dosya okunurken hata:"
 
-#: gajim/common/const.py:290
+#: gajim/common/const.py:324
 msgid "Rehearsing"
 msgstr "Provada"
 
-#: gajim/common/const.py:291
+#: gajim/common/const.py:325
 msgid "Shopping"
 msgstr "Alışverişde"
 
-#: gajim/common/const.py:292
+#: gajim/common/const.py:326
 msgid "Smoking"
 msgstr "Sigara içmekte"
 
-#: gajim/common/const.py:293
+#: gajim/common/const.py:327
 msgid "Socializing"
 msgstr "Arkadaşlarlan buluşmakta"
 
-#: gajim/common/const.py:294
+#: gajim/common/const.py:328
 msgid "Sunbathing"
 msgstr "Güneşlencede"
 
-#: gajim/common/const.py:295
+#: gajim/common/const.py:329
 #, fuzzy
 msgid "Watching TV"
 msgstr "Bir filim bakiyorum."
 
-#: gajim/common/const.py:296
+#: gajim/common/const.py:330
 msgid "Watching a Movie"
 msgstr "Filim bakmakta"
 
-#: gajim/common/const.py:298
+#: gajim/common/const.py:332
 #, fuzzy
 msgid "Talking"
 msgstr "%s'le konuşurken hata oldu (%s)"
 
-#: gajim/common/const.py:299
+#: gajim/common/const.py:333
 #, fuzzy
 msgid "In Real Life"
 msgstr "Buna davet _et"
 
-#: gajim/common/const.py:300
+#: gajim/common/const.py:334
 msgid "On the Phone"
 msgstr "Telefondayım"
 
-#: gajim/common/const.py:301
+#: gajim/common/const.py:335
 #, fuzzy
 msgid "On Video Phone"
 msgstr "bir ses ve video"
 
-#: gajim/common/const.py:303
+#: gajim/common/const.py:337
 msgid "Traveling"
 msgstr "Gezide"
 
-#: gajim/common/const.py:304
+#: gajim/common/const.py:338
 msgid "Commuting"
 msgstr "Değiştircede"
 
-#: gajim/common/const.py:306
+#: gajim/common/const.py:340
 msgid "Driving"
 msgstr "Araba sürüyor"
 
-#: gajim/common/const.py:307
+#: gajim/common/const.py:341
 #, fuzzy
 msgid "In a Car"
 msgstr "ben burdaysam"
 
-#: gajim/common/const.py:308
+#: gajim/common/const.py:342
 #, fuzzy
 msgid "On a Bus"
 msgstr "Telefondayım"
 
-#: gajim/common/const.py:309
+#: gajim/common/const.py:343
 #, fuzzy
 msgid "On a Plane"
 msgstr "Telefondayım"
 
-#: gajim/common/const.py:310
+#: gajim/common/const.py:344
 msgid "On a Train"
 msgstr "Trende"
 
-#: gajim/common/const.py:311
+#: gajim/common/const.py:345
 #, fuzzy
 msgid "On a Trip"
 msgstr "Telefondayım"
 
-#: gajim/common/const.py:312
+#: gajim/common/const.py:346
 msgid "Walking"
 msgstr "Yürüyor"
 
-#: gajim/common/const.py:315
+#: gajim/common/const.py:349
 msgid "Coding"
 msgstr "Kodlamada"
 
-#: gajim/common/const.py:316
+#: gajim/common/const.py:350
 #, fuzzy
 msgid "In a Meeting"
 msgstr "ben burdaysam"
 
-#: gajim/common/const.py:317
+#: gajim/common/const.py:351
 msgid "Studying"
 msgstr "Okumakta"
 
-#: gajim/common/const.py:318
+#: gajim/common/const.py:352
 #, fuzzy
 msgid "Writing"
 msgstr "%s yazılıyor..."
 
-#: gajim/common/const.py:321
+#: gajim/common/const.py:355
 msgid "Afraid"
 msgstr "Korkmuş"
 
-#: gajim/common/const.py:322
+#: gajim/common/const.py:356
 msgid "Amazed"
 msgstr "Şaşkın"
 
-#: gajim/common/const.py:323
+#: gajim/common/const.py:357
 msgid "Amorous"
 msgstr "Sevdalı"
 
-#: gajim/common/const.py:324
+#: gajim/common/const.py:358
 msgid "Angry"
 msgstr "Kızgın"
 
-#: gajim/common/const.py:325
+#: gajim/common/const.py:359
 msgid "Annoyed"
 msgstr "Sinirli"
 
-#: gajim/common/const.py:326
+#: gajim/common/const.py:360
 msgid "Anxious"
 msgstr "Sıkıntılı"
 
-#: gajim/common/const.py:327
+#: gajim/common/const.py:361
 msgid "Aroused"
 msgstr "Uyandırılmış"
 
-#: gajim/common/const.py:328
+#: gajim/common/const.py:362
 msgid "Ashamed"
 msgstr "Mahçup"
 
-#: gajim/common/const.py:329
+#: gajim/common/const.py:363
 msgid "Bored"
 msgstr "Sıkılmış"
 
-#: gajim/common/const.py:330
+#: gajim/common/const.py:364
 msgid "Brave"
 msgstr "Cesur"
 
-#: gajim/common/const.py:331
+#: gajim/common/const.py:365
 msgid "Calm"
 msgstr "Sakin"
 
-#: gajim/common/const.py:332
+#: gajim/common/const.py:366
 msgid "Cautious"
 msgstr "Dikkatli"
 
-#: gajim/common/const.py:333
+#: gajim/common/const.py:367
 msgid "Cold"
 msgstr "Soğuk"
 
-#: gajim/common/const.py:334
+#: gajim/common/const.py:368
 msgid "Confident"
 msgstr "Cüretli"
 
-#: gajim/common/const.py:335
+#: gajim/common/const.py:369
 msgid "Confused"
 msgstr "Şaşkın"
 
-#: gajim/common/const.py:336
+#: gajim/common/const.py:370
 msgid "Contemplative"
 msgstr "Dalgın"
 
-#: gajim/common/const.py:337
+#: gajim/common/const.py:371
 msgid "Contented"
 msgstr "Mutlu"
 
-#: gajim/common/const.py:338
+#: gajim/common/const.py:372
 msgid "Cranky"
 msgstr "Tuhaf"
 
-#: gajim/common/const.py:339
+#: gajim/common/const.py:373
 msgid "Crazy"
 msgstr "Çılgın"
 
-#: gajim/common/const.py:340
+#: gajim/common/const.py:374
 msgid "Creative"
 msgstr "Yaratıcı"
 
-#: gajim/common/const.py:341
+#: gajim/common/const.py:375
 msgid "Curious"
 msgstr "Meraklı"
 
-#: gajim/common/const.py:342
+#: gajim/common/const.py:376
 msgid "Dejected"
 msgstr "Üzgün"
 
-#: gajim/common/const.py:343
+#: gajim/common/const.py:377
 msgid "Depressed"
 msgstr "Deprese"
 
-#: gajim/common/const.py:344
+#: gajim/common/const.py:378
 msgid "Disappointed"
 msgstr "Kırgın"
 
-#: gajim/common/const.py:345
+#: gajim/common/const.py:379
 msgid "Disgusted"
 msgstr "İğrenmiş"
 
-#: gajim/common/const.py:346
+#: gajim/common/const.py:380
 msgid "Dismayed"
 msgstr "Korkutulmuş"
 
-#: gajim/common/const.py:347
+#: gajim/common/const.py:381
 msgid "Distracted"
 msgstr "Şaşırmış"
 
-#: gajim/common/const.py:348
+#: gajim/common/const.py:382
 msgid "Embarrassed"
 msgstr "Utangaç"
 
-#: gajim/common/const.py:349
+#: gajim/common/const.py:383
 msgid "Envious"
 msgstr "Kıskanç"
 
-#: gajim/common/const.py:350
+#: gajim/common/const.py:384
 msgid "Excited"
 msgstr "Heyecanlı"
 
-#: gajim/common/const.py:351
+#: gajim/common/const.py:385
 msgid "Flirtatious"
 msgstr "Çapkın"
 
-#: gajim/common/const.py:352
+#: gajim/common/const.py:386
 msgid "Frustrated"
 msgstr "Yılmış"
 
-#: gajim/common/const.py:353
+#: gajim/common/const.py:387
 msgid "Grateful"
 msgstr "Memnun"
 
-#: gajim/common/const.py:354
+#: gajim/common/const.py:388
 msgid "Grieving"
 msgstr "Matemli"
 
-#: gajim/common/const.py:355
+#: gajim/common/const.py:389
 msgid "Grumpy"
 msgstr "Somurtkan"
 
-#: gajim/common/const.py:356
+#: gajim/common/const.py:390
 msgid "Guilty"
 msgstr "Suçlu"
 
-#: gajim/common/const.py:357
+#: gajim/common/const.py:391
 msgid "Happy"
 msgstr "Mutlu"
 
-#: gajim/common/const.py:358
+#: gajim/common/const.py:392
 msgid "Hopeful"
 msgstr "Ümitli"
 
-#: gajim/common/const.py:359
+#: gajim/common/const.py:393
 msgid "Hot"
 msgstr "Sıcak"
 
-#: gajim/common/const.py:360
+#: gajim/common/const.py:394
 msgid "Humbled"
 msgstr "Mütevazi"
 
-#: gajim/common/const.py:361
+#: gajim/common/const.py:395
 msgid "Humiliated"
 msgstr "Alçalmiş"
 
-#: gajim/common/const.py:362
+#: gajim/common/const.py:396
 msgid "Hungry"
 msgstr "Aç"
 
-#: gajim/common/const.py:363
+#: gajim/common/const.py:397
 msgid "Hurt"
 msgstr "Kırgın"
 
-#: gajim/common/const.py:364
+#: gajim/common/const.py:398
 msgid "Impressed"
 msgstr "Üzerinde etki bırakılmış"
 
-#: gajim/common/const.py:365
+#: gajim/common/const.py:399
 msgid "In Awe"
 msgstr "Üzgün"
 
-#: gajim/common/const.py:366
+#: gajim/common/const.py:400
 msgid "In Love"
 msgstr "Aşık"
 
-#: gajim/common/const.py:367
+#: gajim/common/const.py:401
 msgid "Indignant"
 msgstr "Öfkeli"
 
-#: gajim/common/const.py:368
+#: gajim/common/const.py:402
 msgid "Interested"
 msgstr "İlgili"
 
-#: gajim/common/const.py:369
+#: gajim/common/const.py:403
 msgid "Intoxicated"
 msgstr "Sarhoş"
 
-#: gajim/common/const.py:370
+#: gajim/common/const.py:404
 msgid "Invincible"
 msgstr "Yenilmez"
 
-#: gajim/common/const.py:371
+#: gajim/common/const.py:405
 msgid "Jealous"
 msgstr "Kıskanç"
 
-#: gajim/common/const.py:372
+#: gajim/common/const.py:406
 msgid "Lonely"
 msgstr "Yanlız"
 
-#: gajim/common/const.py:373
+#: gajim/common/const.py:407
 msgid "Lost"
 msgstr "Kaybettin"
 
-#: gajim/common/const.py:374
+#: gajim/common/const.py:408
 msgid "Lucky"
 msgstr "Uğurlu"
 
-#: gajim/common/const.py:375
+#: gajim/common/const.py:409
 msgid "Mean"
 msgstr "Ortalama"
 
-#: gajim/common/const.py:376
+#: gajim/common/const.py:410
 msgid "Moody"
 msgstr "Değişken"
 
-#: gajim/common/const.py:377
+#: gajim/common/const.py:411
 msgid "Nervous"
 msgstr "Heyecanlı"
 
-#: gajim/common/const.py:378
+#: gajim/common/const.py:412
 msgid "Neutral"
 msgstr "Nötr"
 
-#: gajim/common/const.py:379
+#: gajim/common/const.py:413
 msgid "Offended"
 msgstr "Küskün"
 
-#: gajim/common/const.py:380
+#: gajim/common/const.py:414
 msgid "Outraged"
 msgstr "Nefretli"
 
-#: gajim/common/const.py:381
+#: gajim/common/const.py:415
 msgid "Playful"
 msgstr "Oyunbaz"
 
-#: gajim/common/const.py:382
+#: gajim/common/const.py:416
 msgid "Proud"
 msgstr "Şerefli"
 
-#: gajim/common/const.py:383
+#: gajim/common/const.py:417
 #, fuzzy
 msgid "Relaxed"
 msgstr "gevşek (TagSoup kipi)"
 
-#: gajim/common/const.py:384
+#: gajim/common/const.py:418
 msgid "Relieved"
 msgstr "Ferahlamiş"
 
-#: gajim/common/const.py:385
+#: gajim/common/const.py:419
 msgid "Remorseful"
 msgstr "Pişmanlı"
 
-#: gajim/common/const.py:386
+#: gajim/common/const.py:420
 msgid "Restless"
 msgstr "Rahatsız"
 
-#: gajim/common/const.py:387
+#: gajim/common/const.py:421
 msgid "Sad"
 msgstr "Üzgün"
 
-#: gajim/common/const.py:388
+#: gajim/common/const.py:422
 msgid "Sarcastic"
 msgstr "Kinayeli"
 
-#: gajim/common/const.py:389
+#: gajim/common/const.py:423
 msgid "Satisfied"
 msgstr "Memnun"
 
-#: gajim/common/const.py:390
+#: gajim/common/const.py:424
 msgid "Serious"
 msgstr "Ciddi"
 
-#: gajim/common/const.py:391
+#: gajim/common/const.py:425
 msgid "Shocked"
 msgstr "Sarsılmış"
 
-#: gajim/common/const.py:392
+#: gajim/common/const.py:426
 msgid "Shy"
 msgstr "Utangaç"
 
-#: gajim/common/const.py:393
+#: gajim/common/const.py:427
 msgid "Sick"
 msgstr "Hasta"
 
-#: gajim/common/const.py:394
+#: gajim/common/const.py:428
 msgid "Sleepy"
 msgstr "Uykulu"
 
-#: gajim/common/const.py:395
+#: gajim/common/const.py:429
 msgid "Spontaneous"
 msgstr "Spontan"
 
-#: gajim/common/const.py:396
+#: gajim/common/const.py:430
 msgid "Stressed"
 msgstr "Vurgulu"
 
-#: gajim/common/const.py:397
+#: gajim/common/const.py:431
 msgid "Strong"
 msgstr "Güçlü"
 
-#: gajim/common/const.py:398
+#: gajim/common/const.py:432
 msgid "Surprised"
 msgstr "Şaşırmış"
 
-#: gajim/common/const.py:399
+#: gajim/common/const.py:433
 msgid "Thankful"
 msgstr "Şükreden"
 
-#: gajim/common/const.py:400
+#: gajim/common/const.py:434
 msgid "Thirsty"
 msgstr "Susamış"
 
-#: gajim/common/const.py:401
+#: gajim/common/const.py:435
 msgid "Tired"
 msgstr "Yorgun"
 
-#: gajim/common/const.py:402
+#: gajim/common/const.py:436
 msgid "Undefined"
 msgstr "Tanımsız"
 
-#: gajim/common/const.py:403
+#: gajim/common/const.py:437
 msgid "Weak"
 msgstr "Kuvvetsiz"
 
-#: gajim/common/const.py:404
+#: gajim/common/const.py:438
 msgid "Worried"
 msgstr "Düşünceli"
 
-#: gajim/common/const.py:408
+#: gajim/common/const.py:442
 msgid "accuracy"
 msgstr ""
 
-#: gajim/common/const.py:409
+#: gajim/common/const.py:443
 #, fuzzy
 msgid "alt"
 msgstr "öntanımlı"
 
-#: gajim/common/const.py:410
+#: gajim/common/const.py:444
 msgid "area"
 msgstr ""
 
-#: gajim/common/const.py:411
+#: gajim/common/const.py:445
 #, fuzzy
 msgid "bearing"
 msgstr "denizcilik"
 
-#: gajim/common/const.py:412
+#: gajim/common/const.py:446
 #, fuzzy
 msgid "building"
 msgstr "Saklanmada"
 
-#: gajim/common/const.py:413
+#: gajim/common/const.py:447
 #, fuzzy
 msgid "country"
 msgstr "Hesap"
 
-#: gajim/common/const.py:414
+#: gajim/common/const.py:448
 #, fuzzy
 msgid "countrycode"
 msgstr "Hesap sırası"
 
-#: gajim/common/const.py:415
+#: gajim/common/const.py:449
 msgid "datum"
 msgstr ""
 
-#: gajim/common/const.py:416
+#: gajim/common/const.py:450
 #, fuzzy
 msgid "description"
 msgstr "Açıklama"
 
-#: gajim/common/const.py:417
+#: gajim/common/const.py:451
 #, fuzzy
 msgid "error"
 msgstr "Hata"
 
-#: gajim/common/const.py:418
+#: gajim/common/const.py:452
 msgid "floor"
 msgstr ""
 
-#: gajim/common/const.py:419
+#: gajim/common/const.py:453
 msgid "lat"
 msgstr ""
 
-#: gajim/common/const.py:420
+#: gajim/common/const.py:454
 msgid "locality"
 msgstr ""
 
-#: gajim/common/const.py:421
+#: gajim/common/const.py:455
 #, fuzzy
 msgid "lon"
 msgstr "bir"
 
-#: gajim/common/const.py:422
+#: gajim/common/const.py:456
 msgid "postalcode"
 msgstr ""
 
-#: gajim/common/const.py:423
+#: gajim/common/const.py:457
 msgid "region"
 msgstr ""
 
-#: gajim/common/const.py:424
+#: gajim/common/const.py:458
 msgid "room"
 msgstr "oda"
 
-#: gajim/common/const.py:425
+#: gajim/common/const.py:459
 msgid "speed"
 msgstr ""
 
-#: gajim/common/const.py:426
+#: gajim/common/const.py:460
 msgid "street"
 msgstr ""
 
-#: gajim/common/const.py:427
+#: gajim/common/const.py:461
 msgid "text"
 msgstr ""
 
-#: gajim/common/const.py:428
+#: gajim/common/const.py:462
 msgid "timestamp"
 msgstr ""
 
-#: gajim/common/const.py:429
+#: gajim/common/const.py:463
 msgid "URI"
 msgstr ""
 
-#: gajim/common/const.py:434
+#: gajim/common/const.py:468
 #, fuzzy
 msgid "Unable to get issuer certificate"
 msgstr "başlangıç dizini belirlenemedi"
 
-#: gajim/common/const.py:435
+#: gajim/common/const.py:469
 #, fuzzy
 msgid "Unable to get certificate CRL"
 msgstr "başlangıç dizini belirlenemedi"
 
-#: gajim/common/const.py:436
+#: gajim/common/const.py:470
 #, fuzzy
 msgid "Unable to decrypt certificate's signature"
 msgstr "başlangıç dizini belirlenemedi"
 
-#: gajim/common/const.py:437
+#: gajim/common/const.py:471
 msgid "Unable to decrypt CRL's signature"
 msgstr ""
 
-#: gajim/common/const.py:438
+#: gajim/common/const.py:472
 msgid "Unable to decode issuer public key"
 msgstr ""
 
-#: gajim/common/const.py:439
+#: gajim/common/const.py:473
 #, fuzzy
 msgid "Certificate signature failure"
 msgstr "Hata: Yanlış imza"
 
-#: gajim/common/const.py:440
+#: gajim/common/const.py:474
 #, fuzzy
 msgid "CRL signature failure"
 msgstr "Hata: Yanlış imza"
 
-#: gajim/common/const.py:441
+#: gajim/common/const.py:475
 #, fuzzy
 msgid "Certificate is not yet valid"
 msgstr "Sertifika henüz geçerli değil"
 
-#: gajim/common/const.py:442
+#: gajim/common/const.py:476
 #, fuzzy
 msgid "Certificate has expired"
 msgstr "Bu anahtarın kullanım süresi dolmuş"
 
-#: gajim/common/const.py:443
+#: gajim/common/const.py:477
 #, fuzzy
 msgid "CRL is not yet valid"
 msgstr "Sertifika henüz geçerli değil"
 
-#: gajim/common/const.py:444
+#: gajim/common/const.py:478
 #, fuzzy
 msgid "CRL has expired"
 msgstr "Bu anahtarın kullanım süresi dolmuş"
 
-#: gajim/common/const.py:445
+#: gajim/common/const.py:479
 msgid "Format error in certificate's notBefore field"
 msgstr ""
 
-#: gajim/common/const.py:446
+#: gajim/common/const.py:480
 msgid "Format error in certificate's notAfter field"
 msgstr ""
 
-#: gajim/common/const.py:447
+#: gajim/common/const.py:481
 msgid "Format error in CRL's lastUpdate field"
 msgstr ""
 
-#: gajim/common/const.py:448
+#: gajim/common/const.py:482
 msgid "Format error in CRL's nextUpdate field"
 msgstr ""
 
-#: gajim/common/const.py:449
+#: gajim/common/const.py:483
 #, fuzzy
 msgid "Out of memory"
 msgstr "%(nickname)s Çıktı"
 
-#: gajim/common/const.py:450
+#: gajim/common/const.py:484
 #, fuzzy
 msgid "Self signed certificate"
 msgstr "%(nickname)s Girdi"
 
-#: gajim/common/const.py:451
+#: gajim/common/const.py:485
 #, fuzzy
 msgid "Self signed certificate in certificate chain"
 msgstr "öz-imzalı sertifika KÖTÜ bir imzaya sahip"
 
-#: gajim/common/const.py:452
+#: gajim/common/const.py:486
 #, fuzzy
 msgid "Unable to get local issuer certificate"
 msgstr "başlangıç dizini belirlenemedi"
 
-#: gajim/common/const.py:453
+#: gajim/common/const.py:487
 #, fuzzy
 msgid "Unable to verify the first certificate"
 msgstr "başlangıç dizini belirlenemedi"
 
-#: gajim/common/const.py:454
+#: gajim/common/const.py:488
 msgid "Certificate chain too long"
 msgstr "Sertifika zinciri çok uzun"
 
-#: gajim/common/const.py:455
+#: gajim/common/const.py:489
 #, fuzzy
 msgid "Certificate revoked"
 msgstr "sertifika hükümsüz kılınmış"
 
-#: gajim/common/const.py:456
+#: gajim/common/const.py:490
 #, fuzzy
 msgid "Invalid CA certificate"
 msgstr "Geçersiz Jabber kimliği"
 
-#: gajim/common/const.py:457
+#: gajim/common/const.py:491
 #, fuzzy
 msgid "Path length constraint exceeded"
 msgstr "Kağıt Uçağın Gideceği Yol Uzunluğu"
 
-#: gajim/common/const.py:458
+#: gajim/common/const.py:492
 #, fuzzy
 msgid "Unsupported certificate purpose"
 msgstr "Sertifika doğrulama hatası (%s)"
 
-#: gajim/common/const.py:459
+#: gajim/common/const.py:493
 #, fuzzy
 msgid "Certificate not trusted"
 msgstr "GPG anahtara güvenilmiyor"
 
-#: gajim/common/const.py:460
+#: gajim/common/const.py:494
 #, fuzzy
 msgid "Certificate rejected"
 msgstr "^Rededilmiş durumunu değiştir"
 
-#: gajim/common/const.py:461
+#: gajim/common/const.py:495
 #, fuzzy
 msgid "Subject issuer mismatch"
 msgstr "ifade yığıtı uyumsuzluğu"
 
-#: gajim/common/const.py:462
+#: gajim/common/const.py:496
 msgid "Authority and subject key identifier mismatch"
 msgstr ""
 
-#: gajim/common/const.py:463
+#: gajim/common/const.py:497
 msgid "Authority and issuer serial number mismatch"
 msgstr ""
 
-#: gajim/common/const.py:464
+#: gajim/common/const.py:498
 msgid "Key usage does not include certificate signing"
 msgstr ""
 
-#: gajim/common/const.py:465
+#: gajim/common/const.py:499
 #, fuzzy
 msgid "Application verification failure"
 msgstr "'%s' çözülürken geçici bozukluk"
@@ -5003,264 +5082,264 @@ msgstr "video girdisi"
 msgid "video output"
 msgstr "video çıktısı"
 
-#: gajim/common/helpers.py:210
+#: gajim/common/helpers.py:216
 msgid "Server must be between 1 and 1023 bytes"
 msgstr ""
 
-#: gajim/common/helpers.py:214
+#: gajim/common/helpers.py:220
 #, fuzzy
 msgid "Invalid character in hostname."
 msgstr "İpucunda geçersiz %s karakteri"
 
-#: gajim/common/helpers.py:216
+#: gajim/common/helpers.py:222
 #, fuzzy
 msgid "Server address required."
 msgstr "<b>Lütfen sunucu seçiniz</b>"
 
-#: gajim/common/helpers.py:220
+#: gajim/common/helpers.py:226
 msgid "Username must be between 1 and 1023 bytes"
 msgstr ""
 
-#: gajim/common/helpers.py:224
+#: gajim/common/helpers.py:230
 #, fuzzy
 msgid "Invalid character in username."
 msgstr "İpucunda geçersiz %s karakteri"
 
-#: gajim/common/helpers.py:230
+#: gajim/common/helpers.py:236
 msgid "Resource must be between 1 and 1023 bytes"
 msgstr ""
 
-#: gajim/common/helpers.py:234
+#: gajim/common/helpers.py:240
 #, fuzzy
 msgid "Invalid character in resource."
 msgstr "İpucunda geçersiz %s karakteri"
 
-#: gajim/common/helpers.py:275
+#: gajim/common/helpers.py:281
 msgid "_Busy"
 msgstr "_Meşgul"
 
-#: gajim/common/helpers.py:277 gajim/gtk/tooltips.py:647
+#: gajim/common/helpers.py:283 gajim/gtk/tooltips.py:647
 msgid "Busy"
 msgstr "Meşgul"
 
-#: gajim/common/helpers.py:280
+#: gajim/common/helpers.py:286
 msgid "_Not Available"
 msgstr "_Mevcut Değil"
 
-#: gajim/common/helpers.py:282 gajim/gtk/tooltips.py:649
+#: gajim/common/helpers.py:288 gajim/gtk/tooltips.py:649
 msgid "Not Available"
 msgstr "Mevcut Değil"
 
-#: gajim/common/helpers.py:285
+#: gajim/common/helpers.py:291
 msgid "_Free for Chat"
 msgstr "Sohbet için _Hazır"
 
-#: gajim/common/helpers.py:287 gajim/gtk/tooltips.py:643
+#: gajim/common/helpers.py:293 gajim/gtk/tooltips.py:643
 msgid "Free for Chat"
 msgstr "Sohbet için Hazır"
 
-#: gajim/common/helpers.py:290
+#: gajim/common/helpers.py:296
 #, fuzzy
 msgid "?user status:_Available"
 msgstr "?transfer status:Duraklanıldı"
 
-#: gajim/common/helpers.py:292 gajim/gtk/tooltips.py:641
+#: gajim/common/helpers.py:298 gajim/gtk/tooltips.py:641
 #, fuzzy
 msgid "?user status:Available"
 msgstr "?transfer status:Duraklanıldı"
 
-#: gajim/common/helpers.py:294
+#: gajim/common/helpers.py:300
 msgid "Connecting"
 msgstr "Connecting"
 
-#: gajim/common/helpers.py:297 gajim/data/gui/preferences_window.ui:1251
+#: gajim/common/helpers.py:303 gajim/data/gui/preferences_window.ui:1251
 msgid "A_way"
 msgstr "_Uzakta"
 
-#: gajim/common/helpers.py:299 gajim/common/modules/adhoc_commands.py:120
-#: gajim/command_system/implementation/standard.py:139
+#: gajim/common/helpers.py:305 gajim/common/modules/adhoc_commands.py:120
+#: gajim/command_system/implementation/standard.py:141
 #: gajim/gtk/tooltips.py:645
 msgid "Away"
 msgstr "Uzakta"
 
-#: gajim/common/helpers.py:302
+#: gajim/common/helpers.py:308
 msgid "_Offline"
 msgstr "Bağlı _değil"
 
-#: gajim/common/helpers.py:304 gajim/gtk/tooltips.py:651
+#: gajim/common/helpers.py:310 gajim/gtk/tooltips.py:651
 msgid "Offline"
 msgstr "Bağlı değil"
 
-#: gajim/common/helpers.py:307
+#: gajim/common/helpers.py:313
 msgid "_Invisible"
 msgstr "Görünmez"
 
-#: gajim/common/helpers.py:313
+#: gajim/common/helpers.py:319
 msgid "?contact has status:Unknown"
 msgstr "?contact has status:Bilinmez"
 
-#: gajim/common/helpers.py:315
+#: gajim/common/helpers.py:321
 msgid "?contact has status:Has errors"
 msgstr "?contact has status:Hatalı"
 
-#: gajim/common/helpers.py:330
+#: gajim/common/helpers.py:336
 msgid "?Subscription we already have:None"
 msgstr "?Subscription we already have:Hiç biri"
 
-#: gajim/common/helpers.py:332
+#: gajim/common/helpers.py:338
 msgid "To"
 msgstr "Kime"
 
-#: gajim/common/helpers.py:334 gajim/data/gui/groups_post_window.ui:33
+#: gajim/common/helpers.py:340 gajim/data/gui/groups_post_window.ui:33
 msgid "From"
 msgstr "Gönderen"
 
-#: gajim/common/helpers.py:336
+#: gajim/common/helpers.py:342
 msgid "Both"
 msgstr "İkisi de"
 
-#: gajim/common/helpers.py:338 gajim/gtk/server_info.py:151
+#: gajim/common/helpers.py:344 gajim/gtk/server_info.py:151
 #, fuzzy
 msgid "Unknown"
 msgstr "?OS:Unknown?OS:Bilinmez"
 
-#: gajim/common/helpers.py:344
+#: gajim/common/helpers.py:350
 msgid "?Ask (for Subscription):None"
 msgstr "?Ask (for Subscription):Hiç biri"
 
-#: gajim/common/helpers.py:346
+#: gajim/common/helpers.py:352
 msgid "Subscribe"
 msgstr "Üye yap"
 
-#: gajim/common/helpers.py:355
+#: gajim/common/helpers.py:361
 msgid "?Group Chat Contact Role:None"
 msgstr "?Group Chat Contact Role:Hiç biri"
 
-#: gajim/common/helpers.py:358
+#: gajim/common/helpers.py:364
 msgid "Moderators"
 msgstr "Moderatör"
 
-#: gajim/common/helpers.py:360
+#: gajim/common/helpers.py:366
 msgid "Moderator"
 msgstr "Moderatör"
 
-#: gajim/common/helpers.py:363
+#: gajim/common/helpers.py:369 gajim/data/gui/groupchat_info_scrolled.ui:243
 msgid "Participants"
 msgstr "Katılanlar"
 
-#: gajim/common/helpers.py:365
+#: gajim/common/helpers.py:371
 msgid "Participant"
 msgstr "Katılan"
 
-#: gajim/common/helpers.py:368
+#: gajim/common/helpers.py:374
 msgid "Visitors"
 msgstr "Ziyaretçiler"
 
-#: gajim/common/helpers.py:370
+#: gajim/common/helpers.py:376
 msgid "Visitor"
 msgstr "Ziyaretçi"
 
-#: gajim/common/helpers.py:376 gajim/gtk/tooltips.py:253
+#: gajim/common/helpers.py:382 gajim/gtk/tooltips.py:253
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "?Group Chat Contact Affiliation:Hiç biri"
 
-#: gajim/common/helpers.py:378 gajim/data/gui/groupchat_config.ui:32
+#: gajim/common/helpers.py:384 gajim/data/gui/groupchat_config.ui:32
 #: gajim/gtk/tooltips.py:259
 msgid "Owner"
 msgstr "Sahibi"
 
-#: gajim/common/helpers.py:380 gajim/gtk/tooltips.py:257
+#: gajim/common/helpers.py:386 gajim/gtk/tooltips.py:257
 msgid "Administrator"
 msgstr "Yönetici"
 
-#: gajim/common/helpers.py:382 gajim/data/gui/groupchat_config.ui:40
+#: gajim/common/helpers.py:388 gajim/data/gui/groupchat_config.ui:40
 #: gajim/gtk/tooltips.py:255 gajim/gtk/groupchat_config.py:105
 msgid "Member"
 msgstr "Üye"
 
-#: gajim/common/helpers.py:421
+#: gajim/common/helpers.py:427
 msgid "is paying attention to the conversation"
 msgstr "sobete dikkat veriyor"
 
-#: gajim/common/helpers.py:423
+#: gajim/common/helpers.py:429
 msgid "is doing something else"
 msgstr "başka bir şey yapıyor"
 
-#: gajim/common/helpers.py:425
+#: gajim/common/helpers.py:431
 #, fuzzy
 msgid "is composing a message…"
 msgstr "ilet yazıyor…"
 
-#: gajim/common/helpers.py:428
+#: gajim/common/helpers.py:434
 msgid "paused composing a message"
 msgstr "ilet yazarken durdu"
 
-#: gajim/common/helpers.py:430
+#: gajim/common/helpers.py:436
 msgid "has closed the chat window or tab"
 msgstr ""
 
-#: gajim/common/helpers.py:936 gajim/common/helpers.py:943
+#: gajim/common/helpers.py:942 gajim/common/helpers.py:949
 #, fuzzy, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
 msgstr[0] "Ileti alınıyor"
 
-#: gajim/common/helpers.py:950
+#: gajim/common/helpers.py:956
 #, fuzzy, python-format
-msgid "from room %s"
-msgstr " gönderen oda %s"
+msgid "from group chat %s"
+msgstr "grupdaki herkez"
 
-#: gajim/common/helpers.py:953 gajim/common/helpers.py:970
+#: gajim/common/helpers.py:959 gajim/common/helpers.py:976
 #, fuzzy, python-format
 msgid "from user %s"
 msgstr " gönderen kişi %s"
 
-#: gajim/common/helpers.py:955
+#: gajim/common/helpers.py:961
 #, fuzzy, python-format
 msgid "from %s"
 msgstr " gönderen %s"
 
-#: gajim/common/helpers.py:962 gajim/common/helpers.py:968
+#: gajim/common/helpers.py:968 gajim/common/helpers.py:974
 #, fuzzy, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
 msgstr[0] "Kişi listesindeki olayları göster"
 
-#: gajim/common/helpers.py:986 gajim/common/helpers.py:998
+#: gajim/common/helpers.py:992 gajim/common/helpers.py:1004
 #: gajim/data/gui/roster_window.ui:85 data/org.gajim.Gajim.desktop.in:4
 #: data/org.gajim.Gajim.appdata.xml.in:9
 msgid "Gajim"
 msgstr "Gajim"
 
-#: gajim/common/helpers.py:1000
+#: gajim/common/helpers.py:1006
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: gajim/common/helpers.py:1109 gajim/data/gui/add_new_contact_window.ui:25
+#: gajim/common/helpers.py:1115 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:1111
+#: gajim/common/helpers.py:1117
 msgid "Hello, I am $name."
 msgstr "Merhaba, benim adım $name."
 
-#: gajim/common/helpers.py:1215 gajim/common/helpers.py:1224
-#: gajim/common/helpers.py:1282
+#: gajim/common/helpers.py:1221 gajim/common/helpers.py:1230
+#: gajim/common/helpers.py:1288
 #, fuzzy
 msgid "Timeout loading image"
 msgstr "Resimi Farklı Kaydet..."
 
-#: gajim/common/helpers.py:1234 gajim/common/helpers.py:1280
+#: gajim/common/helpers.py:1240 gajim/common/helpers.py:1286
 msgid "Image is too big"
 msgstr "Resim çok büyük"
 
-#: gajim/common/helpers.py:1245
+#: gajim/common/helpers.py:1251
 #, fuzzy
 msgid "PyCURL is not installed"
 msgstr "Sertifika henüz geçerli değil"
 
-#: gajim/common/helpers.py:1284
+#: gajim/common/helpers.py:1290
 #, fuzzy
 msgid "Error loading image"
 msgstr "Resimi Farklı Kaydet..."
@@ -5439,7 +5518,7 @@ msgstr "Yeni bir oda yaratılmıştır"
 #: gajim/common/modules/adhoc_commands.py:202
 #: gajim/common/modules/adhoc_commands.py:239
 #, fuzzy
-msgid "Leave Groupchats"
+msgid "Leave Group Chats"
 msgstr "Tam-Ekrandan Çık"
 
 #: gajim/common/modules/adhoc_commands.py:228
@@ -5449,17 +5528,17 @@ msgstr "%(room_jid)s daki %(nickname)s"
 
 #: gajim/common/modules/adhoc_commands.py:232
 #, fuzzy
-msgid "You have not joined a groupchat."
+msgid "You have not joined a group chat."
 msgstr "[%s sayfasını okuyamazsınız.]"
 
 #: gajim/common/modules/adhoc_commands.py:240
 #, fuzzy
-msgid "Choose the groupchats you want to leave"
+msgid "Choose the group chats you want to leave"
 msgstr "Lütfen göstermek istediğiniz kaynak dosyasındaki satırı seçiniz:"
 
 #: gajim/common/modules/adhoc_commands.py:289
 #, fuzzy
-msgid "You left the following groupchats:"
+msgid "You left the following group chats:"
 msgstr "Sobetten ayrıldınız."
 
 #: gajim/common/modules/roster_item_exchange.py:102
@@ -5476,7 +5555,7 @@ msgstr "Kişileri eşzamana getir"
 msgid "Blocked Contacts"
 msgstr "Engellenmiş Kişiler"
 
-#: gajim/data/gui/destroy_muc_dialog.ui:79 gajim/gtk/dialogs.py:736
+#: gajim/data/gui/destroy_muc_dialog.ui:79 gajim/gtk/dialogs.py:563
 msgid "Destroy this group chat permanently?"
 msgstr ""
 
@@ -5485,7 +5564,7 @@ msgstr ""
 msgid "Reason..."
 msgstr "Neden"
 
-#: gajim/data/gui/destroy_muc_dialog.ui:124 gajim/gtk/dialogs.py:738
+#: gajim/data/gui/destroy_muc_dialog.ui:124 gajim/gtk/dialogs.py:565
 msgid "Where participants should go (optional)"
 msgstr ""
 
@@ -5497,32 +5576,6 @@ msgstr ""
 msgid "_Reason and alternate venue (optional)"
 msgstr ""
 
-#: gajim/data/gui/advanced_configuration_window.ui:7
-#: gajim/data/gui/preferences_window.ui:2723
-#, fuzzy
-msgid "Advanced Configuration Editor (ACE)"
-msgstr "İlerlemiş Ayarlama Editörü"
-
-#: gajim/data/gui/advanced_configuration_window.ui:52
-msgid "You should restart Gajim for some changes to take effect"
-msgstr ""
-
-#: gajim/data/gui/advanced_configuration_window.ui:84
-#, fuzzy
-msgid "_Filter"
-msgstr "Filtre:"
-
-#: gajim/data/gui/advanced_configuration_window.ui:153
-#: gajim/data/gui/filetransfers_send_file_dialog.ui:15
-#: gajim/gtk/discovery.py:1666
-msgid "Description"
-msgstr "Açıklama"
-
-#: gajim/data/gui/advanced_configuration_window.ui:197
-#, fuzzy
-msgid "_Reset to default"
-msgstr "Öntanımlı değerlerine geri al"
-
 #: gajim/data/gui/join_groupchat_window.ui:56
 #: gajim/data/gui/chat_to_muc_window.ui:67
 #: gajim/data/gui/chat_to_muc_window.ui:78
@@ -5534,9 +5587,8 @@ msgid "Join group chat every time Gajim is started"
 msgstr ""
 
 #: gajim/data/gui/join_groupchat_window.ui:113
-#, fuzzy
-msgid "Auto Join"
-msgstr "Kendiliğinden Katıl"
+msgid "Join Automatically"
+msgstr ""
 
 #: gajim/data/gui/join_groupchat_window.ui:131
 #: gajim/data/gui/profile_window.ui:233
@@ -5545,10 +5597,11 @@ msgstr "Hesap"
 
 #: gajim/data/gui/join_groupchat_window.ui:147
 #, fuzzy
-msgid "Room"
-msgstr "Oda:"
+msgid "Group chat"
+msgstr "Grup sohbetler"
 
-#: gajim/data/gui/join_groupchat_window.ui:180 gajim/gtk/accounts.py:886
+#: gajim/data/gui/join_groupchat_window.ui:180 gajim/data/gui/bookmarks.ui:158
+#: gajim/gtk/accounts.py:889
 #, fuzzy
 msgid "Password"
 msgstr "Parola:"
@@ -5572,90 +5625,11 @@ msgstr "grupdaki herkez"
 msgid "Search group chats on selected server"
 msgstr ""
 
-#: gajim/data/gui/join_groupchat_window.ui:437 gajim/gtk/discovery.py:1271
+#: gajim/data/gui/join_groupchat_window.ui:437 gajim/gtk/discovery.py:1270
 #, fuzzy
 msgid "Join"
 msgstr "_Katıl"
 
-#: gajim/data/gui/manage_proxies_window.ui:12
-msgid "HTTP Connect"
-msgstr "HTTP Bağlantı"
-
-#: gajim/data/gui/manage_proxies_window.ui:15
-msgid "SOCKS5"
-msgstr "SOCKS5"
-
-#: gajim/data/gui/manage_proxies_window.ui:18
-msgid "BOSH"
-msgstr "BOSH"
-
-#: gajim/data/gui/manage_proxies_window.ui:27
-msgid "Manage Proxy Profiles"
-msgstr "Vekil Sunuc Profili İşlet"
-
-#: gajim/data/gui/manage_proxies_window.ui:83
-#, fuzzy
-msgid "Add Proxy"
-msgstr "Prox_y:"
-
-#: gajim/data/gui/manage_proxies_window.ui:97
-#, fuzzy
-msgid "Remove Proxy"
-msgstr "Grubu Sil"
-
-#: gajim/data/gui/manage_proxies_window.ui:141
-#, fuzzy
-msgid "Properties"
-msgstr "<b>Ayarları</b>"
-
-#: gajim/data/gui/manage_proxies_window.ui:157
-#, fuzzy
-msgid "_Name"
-msgstr "_Ad:"
-
-#: gajim/data/gui/manage_proxies_window.ui:173
-#, fuzzy
-msgid "_Type"
-msgstr "_Türü:"
-
-#: gajim/data/gui/manage_proxies_window.ui:236
-#, fuzzy
-msgid "_BOSH URL"
-msgstr "_BOSH URL:"
-
-#: gajim/data/gui/manage_proxies_window.ui:261
-msgid "Use HTTP prox_y"
-msgstr "HTTP _vekili kullan"
-
-#: gajim/data/gui/manage_proxies_window.ui:280
-#, fuzzy
-msgid "Proxy _Host"
-msgstr "Vekil _Makine:"
-
-#: gajim/data/gui/manage_proxies_window.ui:307
-#, fuzzy
-msgid "Proxy _Port"
-msgstr "Vekil _Portası:"
-
-#: gajim/data/gui/manage_proxies_window.ui:334
-#, fuzzy
-msgid "_Username"
-msgstr "_Kullanıcı ismi"
-
-#: gajim/data/gui/manage_proxies_window.ui:347
-msgid "Use proxy auth_entication"
-msgstr "Vergil do_ğrulama kullan"
-
-#: gajim/data/gui/manage_proxies_window.ui:377
-#, fuzzy
-msgid "Pass_word"
-msgstr "Şif_re:"
-
-#: gajim/data/gui/manage_proxies_window.ui:405 gajim/gtk/adhoc.py:321
-#, fuzzy
-msgid "Settings"
-msgstr "Bağlantı Kurulamıyor"
-
 #: gajim/data/gui/change_password_dialog.ui:17
 #, fuzzy
 msgid "New Password"
@@ -5686,11 +5660,13 @@ msgid "Status:"
 msgstr "Durum:"
 
 #: gajim/data/gui/zeroconf_information_window.ui:89
-msgid "_Log conversation history"
+#, fuzzy
+msgid "_Store conversation history"
 msgstr "Sohbet kayıtı _kaydet"
 
 #: gajim/data/gui/zeroconf_information_window.ui:215
 #: gajim/data/gui/vcard_information_window.ui:390
+#: gajim/data/gui/groupchat_info_scrolled.ui:166
 msgid "Contact"
 msgstr "Bağlantı"
 
@@ -5703,8 +5679,9 @@ msgid "Last Name:"
 msgstr "Soy Ad:"
 
 #: gajim/data/gui/zeroconf_information_window.ui:260
-msgid "Jabber ID:"
-msgstr "Jabber kimliği:"
+#, fuzzy
+msgid "XMPP Address:"
+msgstr "AIM Adres:"
 
 #: gajim/data/gui/zeroconf_information_window.ui:273
 msgid "E-Mail:"
@@ -5727,8 +5704,8 @@ msgstr "_Dosya Gönder…"
 
 #: gajim/data/gui/gc_occupants_menu.ui:29
 #, fuzzy
-msgid "Occupant Actions"
-msgstr "Özel Eylemler"
+msgid "Participant Actions"
+msgstr "Katılanlar"
 
 #: gajim/data/gui/gc_occupants_menu.ui:38
 msgid "_Voice"
@@ -5760,8 +5737,8 @@ msgstr ""
 
 #: gajim/data/gui/gc_occupants_menu.ui:124
 #, fuzzy
-msgid "_Add to Roster"
-msgstr "Kişi listeye _ekle…"
+msgid "_Add to Contact List"
+msgstr "Kişi _ekle"
 
 #: gajim/data/gui/gc_occupants_menu.ui:132
 #, fuzzy
@@ -5802,11 +5779,6 @@ msgstr "Üyelik:"
 msgid "_Status"
 msgstr "Durum"
 
-#: gajim/data/gui/zeroconf_context_menu.ui:26
-#: gajim/data/gui/account_context_menu.ui:79
-msgid "_Modify Account..."
-msgstr ""
-
 #: gajim/data/gui/certificate_dialog.ui:66
 #: gajim/data/gui/certificate_dialog.ui:178
 msgid "Common Name (CN)"
@@ -5889,13 +5861,19 @@ msgstr "Son değişiklik:"
 msgid "Next entry"
 msgstr ""
 
+#: gajim/data/gui/filetransfers_send_file_dialog.ui:15
+#: gajim/data/gui/advanced_configuration.ui:143
+#: gajim/data/gui/groupchat_info_scrolled.ui:48 gajim/gtk/discovery.py:1663
+msgid "Description"
+msgstr "Açıklama"
+
 #: gajim/data/gui/filetransfers_send_file_dialog.ui:54
 #, fuzzy
 msgid "_Send Files"
 msgstr "_Dosya Gönder…"
 
 #: gajim/data/gui/filetransfers_send_file_dialog.ui:58
-#: gajim/gtk/xml_console.py:90
+#: gajim/gtk/xml_console.py:87
 #, fuzzy
 msgid "Send"
 msgstr "_Gönder"
@@ -5922,8 +5900,8 @@ msgstr "Takma Ad Ayarla"
 
 #: gajim/data/gui/gc_control_popup_menu.ui:20
 #, fuzzy
-msgid "_Manage Room"
-msgstr "Yer imlerini işlet"
+msgid "_Manage Group Chat"
+msgstr "_Yeni Bir Grup Sohbeti"
 
 #: gajim/data/gui/gc_control_popup_menu.ui:31
 #, fuzzy
@@ -5932,12 +5910,13 @@ msgstr "Konuk Değiştiriliyor"
 
 #: gajim/data/gui/gc_control_popup_menu.ui:38
 #, fuzzy
-msgid "Configure _Room..."
-msgstr "Çevrimiçi Servisler"
+msgid "Configure _Group Chat..."
+msgstr "Grup Sohbete Katıl"
 
 #: gajim/data/gui/gc_control_popup_menu.ui:52
-msgid "_Destroy Room"
-msgstr ""
+#, fuzzy
+msgid "_Destroy Group Chat"
+msgstr "_Yeni Bir Grup Sohbeti"
 
 #: gajim/data/gui/gc_control_popup_menu.ui:64
 msgid "_Minimize on close"
@@ -5948,7 +5927,7 @@ msgstr "Kapatınca küçült"
 msgid "_Request Voice"
 msgstr "_Ses"
 
-#: gajim/data/gui/gc_control_popup_menu.ui:99 gajim/gtk/discovery.py:1704
+#: gajim/data/gui/gc_control_popup_menu.ui:99
 msgid "_Bookmark"
 msgstr "_Yer imi"
 
@@ -6001,13 +5980,6 @@ msgstr "<b>Ana Sayfa:</b>"
 msgid "E-Mail"
 msgstr "E-Mail:"
 
-#: 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/blocking_list.ui:115 gajim/gtk/add_contact.py:30
-#: gajim/gtk/accounts.py:801
-msgid "Jabber ID"
-msgstr "Jabber kimliği"
-
 #: gajim/data/gui/profile_window.ui:440
 msgid "Main"
 msgstr ""
@@ -6141,36 +6113,42 @@ msgstr "İş"
 msgid "About"
 msgstr "Hakkında"
 
-#: gajim/data/gui/start_chat_dialog.ui:114 gajim/gtk/discovery.py:1658
-msgid "Users"
-msgstr "Kullanıcılar"
-
-#: gajim/data/gui/start_chat_dialog.ui:185
+#: gajim/data/gui/start_chat_dialog.ui:53
 #, fuzzy
-msgid "Name:"
-msgstr "İsim: "
+msgid "Global Group Chat Search"
+msgstr "Grup Sohbete Katıl"
 
-#: gajim/data/gui/start_chat_dialog.ui:197
+#: 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
-msgid "Description:"
-msgstr "Açıklama: "
+msgid "_Back"
+msgstr "Geri Düğme"
+
+#: gajim/data/gui/start_chat_dialog.ui:245
+#: gajim/data/gui/groupchat_control.ui:796
+#: gajim/data/gui/groupchat_control.ui:888 gajim/gtk/discovery.py:1701
+#: gajim/gtk/groupchat_join.py:62
+msgid "_Join"
+msgstr "_Katıl"
 
-#: gajim/data/gui/start_chat_dialog.ui:209
+#: gajim/data/gui/start_chat_dialog.ui:289
 #, fuzzy
-msgid "Address:"
-msgstr "_Adres:"
+msgid "Select Account"
+msgstr "XMPP hesabı %s@%s"
 
-#: gajim/data/gui/start_chat_dialog.ui:246
-msgid ""
-"Semi-Anonymous\n"
-"<span size=\"small\">(Only moderators can see your XMPP-Address)</span>"
+#: gajim/data/gui/start_chat_dialog.ui:380
+msgid "_Select"
 msgstr ""
 
 #: gajim/data/gui/filetransfers.ui:21
 msgid "Pa_use/Resume"
 msgstr ""
 
-#: gajim/data/gui/filetransfers.ui:30 gajim/gtk/filechoosers.py:178
+#: gajim/data/gui/filetransfers.ui:30 gajim/data/gui/groupchat_control.ui:575
+#: gajim/data/gui/groupchat_control.ui:667
+#: gajim/data/gui/groupchat_control.ui:779
+#: gajim/data/gui/groupchat_control.ui:871 gajim/gtk/filechoosers.py:178
 msgid "_Cancel"
 msgstr "_İptal"
 
@@ -6212,7 +6190,7 @@ msgid "Cancel the selected file transfer and remove incomplete files"
 msgstr "Seçilmiş dosya aktarımı iptal ediyor"
 
 #: gajim/data/gui/filetransfers.ui:207
-msgid "Shows a list of file transfers between you and others"
+msgid "Shows a list of file transfers between you and your contacts"
 msgstr ""
 
 #: gajim/data/gui/groupchat_control.ui:13 gajim/data/gui/chat_control.ui:277
@@ -6233,7 +6211,6 @@ msgid "Strike"
 msgstr "Ü&stü Çizili"
 
 #: gajim/data/gui/groupchat_control.ui:54 gajim/data/gui/chat_control.ui:318
-#: gajim/gtk/advanced_config.py:86
 msgid "Color"
 msgstr "Renk"
 
@@ -6246,15 +6223,44 @@ msgstr "Yazıtipi"
 msgid "Clear formatting"
 msgstr "Işareti temizle"
 
-#: gajim/data/gui/groupchat_control.ui:290 gajim/data/gui/chat_control.ui:880
+#: gajim/data/gui/groupchat_control.ui:291 gajim/data/gui/chat_control.ui:880
 #, fuzzy
 msgid "Choose encryption"
 msgstr "Parolayı Değiştir"
 
-#: gajim/data/gui/groupchat_control.ui:336 gajim/data/gui/chat_control.ui:640
+#: gajim/data/gui/groupchat_control.ui:337 gajim/data/gui/chat_control.ui:640
 msgid "Show a list of emojis (Alt+M)"
 msgstr ""
 
+#: gajim/data/gui/groupchat_control.ui:484
+msgid "Joining…"
+msgstr ""
+
+#: gajim/data/gui/groupchat_control.ui:496
+msgid "_Abort"
+msgstr ""
+
+#: gajim/data/gui/groupchat_control.ui:542
+#, fuzzy
+msgid "Enter new nickname"
+msgstr "Bu kişi için %s yeni bir takma ad girin."
+
+#: gajim/data/gui/groupchat_control.ui:592
+#: gajim/data/gui/groupchat_control.ui:684
+#, fuzzy
+msgid "Ch_ange"
+msgstr "Takma Ad Ayarla"
+
+#: gajim/data/gui/groupchat_control.ui:761
+#, fuzzy
+msgid "Enter password"
+msgstr "Yeni parola girin: "
+
+#: gajim/data/gui/groupchat_control.ui:1067
+#, fuzzy
+msgid "_Try again"
+msgstr "Tekrar dene ? [e/H] "
+
 #: gajim/data/gui/popup_notification_window.ui:42
 #, fuzzy
 msgid "Event Type"
@@ -6335,8 +6341,8 @@ msgstr "Herzaman"
 
 #: gajim/data/gui/mam_preferences.ui:18
 #, fuzzy
-msgid "Roster"
-msgstr "Kişi Listesini Göster"
+msgid "Contact List"
+msgstr "Kişiler"
 
 #: gajim/data/gui/mam_preferences.ui:22
 #: gajim/data/gui/preferences_window.ui:123
@@ -6360,12 +6366,12 @@ msgid "Add"
 msgstr "Ekle"
 
 #: gajim/data/gui/mam_preferences.ui:194 gajim/data/gui/groupchat_config.ui:151
-#: gajim/gtk/dialogs.py:63 gajim/gtk/accounts.py:381
+#: gajim/gtk/dialogs.py:62 gajim/gtk/accounts.py:384
 #, fuzzy
 msgid "Remove"
 msgstr "_Kaldır"
 
-#: gajim/data/gui/vcard_information_window.ui:72 gajim/gtk/accounts.py:753
+#: gajim/data/gui/vcard_information_window.ui:72 gajim/gtk/accounts.py:756
 #, fuzzy
 msgid "Resource"
 msgstr "Kaynak:"
@@ -6417,6 +6423,7 @@ msgstr "Üyelik:"
 #: gajim/data/gui/vcard_information_window.ui:974
 #: gajim/data/gui/vcard_information_window.ui:993
 #: gajim/data/gui/vcard_information_window.ui:1427
+#: gajim/data/gui/groupchat_info_scrolled.ui:222
 msgid "button"
 msgstr ""
 
@@ -6449,15 +6456,15 @@ msgstr "Ona dair bana haber ver"
 
 #: gajim/data/gui/preferences_window.ui:58
 #, fuzzy
-msgid "Show only in roster"
-msgstr "Kişi listesindeki olayları göster"
+msgid "Show only in contact list"
+msgstr "Sadece _Çecredeki Kişileri Göster"
 
 #: gajim/data/gui/preferences_window.ui:69
-msgid "Detached roster with detached chats"
+msgid "Detached contact list with detached chats"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:72
-msgid "Detached roster with single chat"
+msgid "Detached contact list with single chat"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:75
@@ -6466,11 +6473,11 @@ msgid "Single window for everything"
 msgstr "Pencere başlığı için arkaplan rengi"
 
 #: gajim/data/gui/preferences_window.ui:78
-msgid "Detached roster with chat grouped by account"
+msgid "Detached contact list with chat grouped by account"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:81
-msgid "Detached roster with chat grouped by type"
+msgid "Detached contact list with chat grouped by type"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:92
@@ -6522,7 +6529,7 @@ msgstr "Varolan açılan penceryi _engelle"
 
 #: gajim/data/gui/preferences_window.ui:296
 #, fuzzy
-msgid "_Show roster on startup"
+msgid "_Show contact list on startup"
 msgstr "Gajim açılırken bağlan"
 
 #: gajim/data/gui/preferences_window.ui:311
@@ -6538,12 +6545,12 @@ msgid "_Tabs placement"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:363
-msgid "_Quit Gajim when closing roster window"
+msgid "_Quit Gajim when closing contact list"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:367
 msgid ""
-"If enabled, Gajim will quit when closing the roster window instead of "
+"If enabled, Gajim will quit when closing the contact list window instead of "
 "minimizing to the system's notification area"
 msgstr ""
 
@@ -6553,34 +6560,36 @@ msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:423
 #, fuzzy
-msgid "Show a_vatars of contacts in roster"
+msgid "Show a_vatars of contacts in contact list"
 msgstr "Kişi listesindeki olayları göster"
 
 #: gajim/data/gui/preferences_window.ui:427
+#, fuzzy
 msgid ""
-"If checked, avatars of contacts will be shown in the roster window and in "
-"group chats"
-msgstr ""
+"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
 #, fuzzy
-msgid "Show status _messages of contacts in roster"
+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
 msgid ""
 "If checked, status messages of contacts will be shown under the contact's "
-"name, in the roster window, and in group chats"
+"name, in the contact list window, and in group chats"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:459
-msgid "Show e_xtra information of contacts in roster (mood, activity, ...)"
+msgid ""
+"Show e_xtra information of contacts in contact list (mood, activity, ...)"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:463
 msgid ""
-"If checked, additional info published by the contact will be shown in "
-"roster. Additional infos (published via PEP) may include e.g. mood, "
+"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 ""
 
@@ -6591,8 +6600,8 @@ msgstr "Port numarasına göre sırala"
 
 #: gajim/data/gui/preferences_window.ui:494
 #, fuzzy
-msgid "in _roster"
-msgstr "Kişi listesindeki olayları göster"
+msgid "in _contact list"
+msgstr "Kişileri eşzamana getir"
 
 #: gajim/data/gui/preferences_window.ui:511
 #, fuzzy
@@ -6601,8 +6610,8 @@ msgstr "grupdaki herkez"
 
 #: gajim/data/gui/preferences_window.ui:540
 #, fuzzy
-msgid "Roster Appearance"
-msgstr "<b>Kişi Listesi Görünümü</b>"
+msgid "Contact List Appearance"
+msgstr "Kişi listesindeki olayları göster"
 
 #: gajim/data/gui/preferences_window.ui:585
 #, fuzzy
@@ -6657,7 +6666,7 @@ msgstr "Grup sohbetine girilemiyor"
 
 #: gajim/data/gui/preferences_window.ui:660
 #, fuzzy
-msgid "If checked, the room subject will be shown when joining a group chat"
+msgid "If checked, the subject will be shown when joining a group chat"
 msgstr "Grup sohbetine girilemiyor"
 
 #: gajim/data/gui/preferences_window.ui:682
@@ -6672,13 +6681,13 @@ msgstr ""
 #: gajim/data/gui/preferences_window.ui:701
 msgid ""
 "If join/leave status messages are shown in the group chat. This setting can "
-"be overridden in the groupchat menu."
+"be overridden in the group chat menu."
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:720
 msgid ""
 "The default sync threshold for new public group chats. This setting can be "
-"overridden in the groupchat menu."
+"overridden in the group chat menu."
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:722
@@ -6693,7 +6702,7 @@ msgstr "Tüm _durum değişikliklerini sistem günlüğüne kaydet"
 #: gajim/data/gui/preferences_window.ui:768
 msgid ""
 "If status change messages are shown in the group chat. This setting can be "
-"overridden in the groupchat menu."
+"overridden in the group chat menu."
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:825
@@ -6709,8 +6718,8 @@ msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:843
 #, fuzzy
-msgid "Show chatstate in roster"
-msgstr "Kişi listesindeki olayları göster"
+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:847
 msgid ""
@@ -6997,7 +7006,7 @@ msgstr "Video testi"
 msgid "Vi_ew own video source"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2281 gajim/gtk/accounts.py:352
+#: gajim/data/gui/preferences_window.ui:2281 gajim/gtk/accounts.py:355
 msgid "Connection"
 msgstr "Bağlantı"
 
@@ -7053,7 +7062,7 @@ msgstr "_Yönet..."
 
 #: gajim/data/gui/preferences_window.ui:2616
 #, fuzzy
-msgid "_Log status changes of contacts"
+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:2633
@@ -7078,9 +7087,14 @@ msgstr ""
 msgid "_Open..."
 msgstr "_Aç..."
 
+#: gajim/data/gui/preferences_window.ui:2723 gajim/gtk/advanced_config.py:84
+#, fuzzy
+msgid "Advanced Configuration Editor (ACE)"
+msgstr "İlerlemiş Ayarlama Editörü"
+
 #: gajim/data/gui/groupchat_config.ui:55
 msgid ""
-"<b>Jabber-ID</b>\n"
+"<b>XMPP Address</b>\n"
 "&lt;user@domain/resource&gt; (only that resource matches)\n"
 "&lt;user@domain&gt; (any resource matches)\n"
 "&lt;domain/resource&gt; (only that resource matches)\n"
@@ -7093,7 +7107,8 @@ msgstr ""
 msgid "Only Admins and Owners can modify the affiliation"
 msgstr ""
 
-#: gajim/data/gui/groupchat_config.ui:270 gajim/plugins/gui.py:312
+#: gajim/data/gui/groupchat_config.ui:270
+#: gajim/data/gui/groupchat_info_scrolled.ui:210 gajim/plugins/gui.py:324
 #, fuzzy
 msgid "Configuration"
 msgstr "Oda Yerleştirme"
@@ -7127,7 +7142,7 @@ msgid "Start _Chat"
 msgstr "Sohbet _Başla"
 
 #: gajim/data/gui/contact_context_menu.ui:20
-#: gajim/data/gui/systray_context_menu.ui:36
+#: gajim/data/gui/systray_context_menu.ui:29
 msgid "Send Single _Message..."
 msgstr "Tek Bir İleti Gönder…"
 
@@ -7188,17 +7203,42 @@ msgid "_Ignore"
 msgstr "_Yoksay"
 
 #: gajim/data/gui/contact_context_menu.ui:174
-msgid "_Add to Roster..."
-msgstr "Kişi listeye _ekle…"
+#, fuzzy
+msgid "_Add to Contact List..."
+msgstr "Kişi _ekle"
+
+#: gajim/data/gui/advanced_configuration.ui:39
+msgid "You should restart Gajim for some changes to take effect"
+msgstr ""
+
+#: gajim/data/gui/advanced_configuration.ui:71
+#, fuzzy
+msgid "_Filter"
+msgstr "Filtre:"
+
+#: gajim/data/gui/advanced_configuration.ui:88
+msgid "Type to search for values..."
+msgstr ""
+
+#: gajim/data/gui/advanced_configuration.ui:180
+#, fuzzy
+msgid "_Reset Value"
+msgstr "Öntanımlı değerlerine geri al"
+
+#: gajim/data/gui/advanced_configuration.ui:185
+#, fuzzy
+msgid "Resets value to default"
+msgstr "Öntanımlı değerlerine geri al"
 
 #: gajim/data/gui/account_creation_wizard_window.ui:43
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim: Hesap oluşturma yardımcı"
 
 #: gajim/data/gui/account_creation_wizard_window.ui:70
+#, fuzzy
 msgid ""
 "You need to have an account in order to connect\n"
-"to the Jabber network."
+"to the XMPP network."
 msgstr ""
 "Önce bir hesap lazım Jabber ağa\n"
 "bağlanmak için"
@@ -7220,8 +7260,9 @@ msgid "<b>Please fill in the data for your existing account</b>"
 msgstr "<b>Lütfen varolan hesapının verisini doldurun</b>"
 
 #: gajim/data/gui/account_creation_wizard_window.ui:187
-msgid "_Jabber ID:"
-msgstr "_Jabber kimliği:"
+#, fuzzy
+msgid "_XMPP Address:"
+msgstr "AIM Adres:"
 
 #: gajim/data/gui/account_creation_wizard_window.ui:239
 #: gajim/data/gui/account_creation_wizard_window.ui:394
@@ -7308,6 +7349,7 @@ msgid "Privacy Lists:"
 msgstr "Kişisel Gizlilik Listesi:"
 
 #: gajim/data/gui/service_discovery_window.ui:111
+#: gajim/data/gui/groupchat_creation.ui:227
 #, fuzzy
 msgid "_Address"
 msgstr "_Adres:"
@@ -7327,11 +7369,6 @@ msgstr "<b>Lütfen sunucu seçiniz</b>"
 msgid "Select the contacts you want to synchronise"
 msgstr "(Burada %d seçtiğiniz varsayılıyor)\n"
 
-#: gajim/data/gui/groupchat_invitation_received.ui:42
-#, fuzzy
-msgid "Group Chat Invitation"
-msgstr "Grup Sohbeti Daveti"
-
 #: gajim/data/gui/groupchat_invitation_received.ui:111
 #, fuzzy
 msgid "Message..."
@@ -7382,11 +7419,10 @@ msgstr ""
 
 #: gajim/data/gui/add_new_contact_window.ui:84
 #, fuzzy
-msgid "_Jabber ID"
-msgstr "_Jabber kimliği:"
+msgid "_XMPP Address"
+msgstr "_Adres:"
 
 #: gajim/data/gui/add_new_contact_window.ui:100
-#: gajim/data/gui/manage_bookmarks_window.ui:192
 #, fuzzy
 msgid "_Nickname"
 msgstr "_Takma Ad:"
@@ -7456,7 +7492,7 @@ msgstr "<b>Ruh Hali:</b>"
 msgid "<b>Message:</b>"
 msgstr "<b>Mesaj:</b>"
 
-#: gajim/data/gui/plugins_window.ui:10 gajim/data/gui/application_menu.ui:90
+#: gajim/data/gui/plugins_window.ui:10 gajim/data/gui/application_menu.ui:87
 msgid "Plugins"
 msgstr ""
 
@@ -7565,10 +7601,6 @@ msgstr "İzin ver"
 msgid "Deny"
 msgstr "Reddet"
 
-#: gajim/data/gui/privacy_list_window.ui:317
-msgid "JabberID"
-msgstr "Jabber kimliği"
-
 #: gajim/data/gui/privacy_list_window.ui:358
 msgid "all in the group"
 msgstr "grupdaki herkez"
@@ -7615,7 +7647,7 @@ msgstr "Sıralama:"
 msgid "Manage sounds"
 msgstr "Kişileri eşzamana getir"
 
-#: gajim/data/gui/manage_sounds_window.ui:55 gajim/plugins/gui.py:100
+#: gajim/data/gui/manage_sounds_window.ui:55 gajim/plugins/gui.py:101
 msgid "Active"
 msgstr "Aktif"
 
@@ -7655,26 +7687,115 @@ msgstr ""
 msgid "_Personal Events"
 msgstr "Kişisel Olaylar"
 
-#: gajim/data/gui/account_context_menu.ui:35
-#: gajim/data/gui/systray_context_menu.ui:28
-#, fuzzy
-msgid "Join _Group Chat"
-msgstr "Grup Sohbete Katıl"
-
-#: gajim/data/gui/account_context_menu.ui:49
+#: gajim/data/gui/account_context_menu.ui:41
 #, fuzzy
 msgid "_Add Contact..."
 msgstr "Kişi _ekle"
 
-#: gajim/data/gui/account_context_menu.ui:57
+#: gajim/data/gui/account_context_menu.ui:49
 msgid "_Discover Services"
 msgstr ""
 
-#: gajim/data/gui/account_context_menu.ui:65
+#: gajim/data/gui/account_context_menu.ui:57
 #, fuzzy
 msgid "_Execute Command..."
 msgstr "<b>Yürütecek komutayı seç</b>"
 
+#: gajim/data/gui/account_context_menu.ui:65
+#, fuzzy
+msgid "_View Certificate"
+msgstr "%(nickname)s Girdi"
+
+#: gajim/data/gui/manage_proxies.ui:12
+#, fuzzy
+msgctxt "proxy configuration"
+msgid "HTTP Connect"
+msgstr "HTTP Bağlantı"
+
+#: gajim/data/gui/manage_proxies.ui:15
+#, fuzzy
+msgctxt "proxy configuration"
+msgid "SOCKS5"
+msgstr "SOCKS5"
+
+#: gajim/data/gui/manage_proxies.ui:18
+#, fuzzy
+msgctxt "proxy configuration"
+msgid "BOSH"
+msgstr "BOSH"
+
+#: gajim/data/gui/manage_proxies.ui:68
+#, fuzzy
+msgid "Add Proxy"
+msgstr "Prox_y:"
+
+#: gajim/data/gui/manage_proxies.ui:82
+#, fuzzy
+msgid "Remove Proxy"
+msgstr "Grubu Sil"
+
+#: gajim/data/gui/manage_proxies.ui:134
+#, fuzzy
+msgid "Pass_word"
+msgstr "Şif_re:"
+
+#: gajim/data/gui/manage_proxies.ui:159
+msgid "Use proxy auth_entication"
+msgstr "Vergil do_ğrulama kullan"
+
+#: gajim/data/gui/manage_proxies.ui:179
+#, fuzzy
+msgid "_Username"
+msgstr "_Kullanıcı ismi"
+
+#: gajim/data/gui/manage_proxies.ui:209
+#, fuzzy
+msgid "_Port"
+msgstr "_Porta:"
+
+#: gajim/data/gui/manage_proxies.ui:226
+msgid "example.org"
+msgstr ""
+
+#: gajim/data/gui/manage_proxies.ui:240
+#, fuzzy
+msgid "_Host"
+msgstr "_Bilgisayar adı:"
+
+#: gajim/data/gui/manage_proxies.ui:254
+msgid "Use HTTP prox_y"
+msgstr "HTTP _vekili kullan"
+
+#: gajim/data/gui/manage_proxies.ui:275
+msgid "https://example.org/http-bind/"
+msgstr ""
+
+#: gajim/data/gui/manage_proxies.ui:291
+#, fuzzy
+msgid "_BOSH URL"
+msgstr "_BOSH URL:"
+
+#: gajim/data/gui/manage_proxies.ui:309 gajim/gtk/adhoc.py:322
+#, fuzzy
+msgid "Settings"
+msgstr "Bağlantı Kurulamıyor"
+
+#: gajim/data/gui/manage_proxies.ui:344
+#, fuzzy
+msgid "_Type"
+msgstr "_Türü:"
+
+#: gajim/data/gui/manage_proxies.ui:361
+#: gajim/data/gui/groupchat_creation.ui:105
+#, fuzzy
+msgid "_Name"
+msgstr "_Ad:"
+
+#: gajim/data/gui/manage_proxies.ui:391 gajim/gtk/accounts.py:742
+#, fuzzy
+msgid "Proxy"
+msgstr "Prox_y:"
+
 #: gajim/data/gui/application_menu.ui:8
 #, fuzzy
 msgid "View"
@@ -7682,8 +7803,8 @@ msgstr "_Görünüm"
 
 #: gajim/data/gui/application_menu.ui:11
 #, fuzzy
-msgid "Show Roster"
-msgstr "Kişi Listesini Göster"
+msgid "Show Contact List"
+msgstr "Sadece _Çecredeki Kişileri Göster"
 
 #: gajim/data/gui/application_menu.ui:16
 #, fuzzy
@@ -7723,23 +7844,24 @@ msgstr ""
 msgid "Features"
 msgstr "Özellikler:"
 
-#: gajim/data/gui/application_menu.ui:81
+#: gajim/data/gui/application_menu.ui:77
+#: gajim/data/gui/groupchat_creation.ui:81 gajim/gtk/groupchat_creation.py:45
 #, fuzzy
-msgid "Bookmarks"
-msgstr "_Yer imi"
+msgid "Create Group Chat"
+msgstr "Tam-Ekrandan Çık"
 
-#: gajim/data/gui/application_menu.ui:94 gajim/data/gui/shortcuts_window.ui:189
-#: gajim/gtk/preferences.py:59
+#: gajim/data/gui/application_menu.ui:91 gajim/data/gui/shortcuts_window.ui:189
+#: gajim/gtk/preferences.py:58
 #, fuzzy
 msgid "Preferences"
 msgstr "Tercihler"
 
-#: gajim/data/gui/application_menu.ui:99
+#: gajim/data/gui/application_menu.ui:96
 msgid "Quit"
 msgstr ""
 
 #: gajim/data/gui/httpupload_progress_dialog.ui:110
-#: gajim/gtk/filetransfer.py:121
+#: gajim/gtk/filetransfer.py:120
 msgid "Progress"
 msgstr "İlerleme"
 
@@ -7756,52 +7878,33 @@ msgstr ""
 msgid "_Cancel Upload"
 msgstr "_İptal"
 
-#: gajim/data/gui/manage_bookmarks_window.ui:13
-#, fuzzy
-msgid "Group Chat Bookmarks"
-msgstr "Grup Sohbetler"
-
-#: gajim/data/gui/manage_bookmarks_window.ui:68
-#, fuzzy
-msgid "Add Bookmark"
-msgstr "_Yer imi"
-
-#: gajim/data/gui/manage_bookmarks_window.ui:82
-#, fuzzy
-msgid "Remove Bookmark"
-msgstr "_Yer imi"
+#: gajim/data/gui/groupchat_creation.ui:27
+msgid "Public or Private?"
+msgstr ""
 
-#: gajim/data/gui/manage_bookmarks_window.ui:126
-msgid "N_ame"
+#: 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 ""
 
-#: gajim/data/gui/manage_bookmarks_window.ui:145
-#, fuzzy
-msgid "Bookmark Name"
-msgstr "Bu odayi yer imle"
+#: gajim/data/gui/groupchat_creation.ui:58
+msgid "<b>Public:</b> Anyone who knows the address can join."
+msgstr ""
 
-#: gajim/data/gui/manage_bookmarks_window.ui:160
+#: gajim/data/gui/groupchat_creation.ui:122
 #, fuzzy
-msgid "_Server"
-msgstr "_Sunuc:"
+msgid "_Description"
+msgstr "Açıklama"
 
-#: gajim/data/gui/manage_bookmarks_window.ui:223
-msgid "Roo_m"
+#: gajim/data/gui/groupchat_creation.ui:164
+msgid "_Public"
 msgstr ""
 
-#: gajim/data/gui/manage_bookmarks_window.ui:253
-#, fuzzy
-msgid "_Password"
-msgstr "_Parola:"
-
-#: gajim/data/gui/manage_bookmarks_window.ui:299
+#: gajim/data/gui/groupchat_creation.ui:278
 #, fuzzy
-msgid "Join chat when connected"
-msgstr "Kişinin bağlantısı kesildi"
-
-#: gajim/data/gui/manage_bookmarks_window.ui:307
-msgid "_Join Automatically"
-msgstr ""
+msgid "_Account"
+msgstr "Hesap"
 
 #: gajim/data/gui/exception_dialog.ui:49
 msgid "Sorry, that should not have happened"
@@ -7841,6 +7944,29 @@ msgstr ""
 msgid "Presets"
 msgstr "_Bulunma"
 
+#: gajim/data/gui/groupchat_info_scrolled.ui:32
+#, fuzzy
+msgid "Address"
+msgstr "_Adres:"
+
+#: gajim/data/gui/groupchat_info_scrolled.ui:64
+msgid "Topic"
+msgstr ""
+
+#: gajim/data/gui/groupchat_info_scrolled.ui:80
+#, fuzzy
+msgid "Author"
+msgstr "AU ayırıcı"
+
+#: gajim/data/gui/groupchat_info_scrolled.ui:182
+msgid "Discussion Logs"
+msgstr ""
+
+#: gajim/data/gui/groupchat_info_scrolled.ui:260
+#, fuzzy
+msgid "Group Chat Language"
+msgstr "Grup Sohbeti Daveti"
+
 #: gajim/data/gui/emoji_chooser.ui:98
 #, fuzzy
 msgid "No Results Found"
@@ -7853,22 +7979,33 @@ msgstr "Arkadaşları Davet Et!"
 #: gajim/data/gui/chat_to_muc_window.ui:39
 #, fuzzy
 msgid ""
-"You are now entering a groupchat.\n"
+"You are now entering a group chat.\n"
 "Select the contacts you want to invite"
 msgstr "(Burada %d seçtiğiniz varsayılıyor)\n"
 
 #: gajim/data/gui/chat_to_muc_window.ui:112
-msgid "Please select a MUC server."
+#, fuzzy
+msgid "Please select a group chat server."
 msgstr "Lütfen bir MUC sunucu seç."
 
 #: gajim/data/gui/chat_to_muc_window.ui:141
-msgid "MUC server"
-msgstr "MUC sunucusu"
+#, fuzzy
+msgid "Group chat server"
+msgstr "Grup sohbetler"
 
 #: gajim/data/gui/chat_to_muc_window.ui:176
 msgid "In_vite"
 msgstr "Davet _et"
 
+#: gajim/data/gui/bookmarks.ui:176
+#, fuzzy
+msgid "Autojoin"
+msgstr "Kendiliğinden Katıl"
+
+#: gajim/data/gui/bookmarks.ui:211
+msgid "_Apply"
+msgstr ""
+
 #: gajim/data/gui/history_manager.ui:11
 #, fuzzy
 msgid "_Export"
@@ -7885,11 +8022,11 @@ msgstr "Kayıt Tarihleri Yöneticisi"
 
 #: gajim/data/gui/history_manager.ui:108
 msgid ""
-"This log manager is not intended for log viewing. If you are looking for "
-"such functionality, use the history window instead.\n"
+"This history manager is not intended for viewing chat history. If you are "
+"looking for such functionality, please use the history window instead.\n"
 "\n"
-"Use this program to delete or export logs. You can select logs from the left "
-"and/or search database from below."
+"You can use this program to delete or export history. Either select logs "
+"from the left or search the database."
 msgstr ""
 
 #: gajim/data/gui/history_manager.ui:124
@@ -7933,8 +8070,9 @@ msgid "Select an emoji"
 msgstr ""
 
 #: gajim/data/gui/shortcuts_window.ui:38
-msgid "Complete a command or a nick"
-msgstr ""
+#, fuzzy
+msgid "Complete a command or a nickname"
+msgstr "Yeni posta yarat"
 
 #: gajim/data/gui/shortcuts_window.ui:45
 #, fuzzy
@@ -7974,7 +8112,7 @@ msgstr ""
 msgid "Scroll down"
 msgstr ""
 
-#: gajim/data/gui/shortcuts_window.ui:100 gajim/gtk/xml_console.py:72
+#: gajim/data/gui/shortcuts_window.ui:100 gajim/gtk/xml_console.py:69
 #, fuzzy
 msgid "Clear"
 msgstr "Temizleniyor"
@@ -8016,8 +8154,9 @@ msgid "Close chat"
 msgstr ""
 
 #: gajim/data/gui/shortcuts_window.ui:173
-msgid "Roster Shortcuts"
-msgstr ""
+#, fuzzy
+msgid "Contact List Shortcuts"
+msgstr "Kişi listesindeki olayları göster"
 
 #: gajim/data/gui/shortcuts_window.ui:196
 #, fuzzy
@@ -8050,7 +8189,7 @@ msgid "Show only active contacts"
 msgstr "Sadece _Çecredeki Kişileri Göster"
 
 #: gajim/data/gui/shortcuts_window.ui:251
-msgid "Enable roster filtering"
+msgid "Enable contact list filtering"
 msgstr ""
 
 #: gajim/data/gui/shortcuts_window.ui:259
@@ -8097,12 +8236,12 @@ msgstr ""
 
 #: gajim/data/gui/history_window.ui:317
 #, fuzzy
-msgid "Record history for this chat"
+msgid "Store history for this chat"
 msgstr "Bu imza için bir yürürlükten kaldırma sertifikası oluşturulsun mu? "
 
 #: gajim/data/gui/history_window.ui:332
 #, fuzzy
-msgid "Record History"
+msgid "Store History"
 msgstr "Son Kullanılan:"
 
 #: gajim/data/gui/history_window.ui:350
@@ -8123,9 +8262,10 @@ msgstr "Yeni posta yarat"
 msgid "Fill in the form."
 msgstr "Formu doldur."
 
-#: gajim/data/gui/data_form_window.ui:229
-msgid "Room Configuration"
-msgstr "Oda Yerleştirme"
+#: gajim/data/gui/data_form_window.ui:229 gajim/gtk/groupchat_config.py:41
+#, fuzzy
+msgid "Group Chat Configuration"
+msgstr "Grup Sohbeti Daveti"
 
 #: gajim/data/gui/roster_item_exchange_window.ui:39
 #: gajim/gtk/roster_item_exchange.py:35
@@ -8147,15 +8287,15 @@ msgstr ""
 msgid "_Start Chat..."
 msgstr "Sohbet _Başla"
 
-#: gajim/data/gui/systray_context_menu.ui:50
+#: gajim/data/gui/systray_context_menu.ui:43
 msgid "Show All Pending _Events"
 msgstr "Bütün Bekleyen _Olayları Göster"
 
-#: gajim/data/gui/systray_context_menu.ui:59
+#: gajim/data/gui/systray_context_menu.ui:52
 msgid "Mute Sounds"
 msgstr "Sesi Kapat"
 
-#: gajim/data/gui/systray_context_menu.ui:75
+#: gajim/data/gui/systray_context_menu.ui:68
 #, fuzzy
 msgid "_Preferences"
 msgstr "Tercihler"
@@ -8247,34 +8387,34 @@ msgstr ""
 msgid "Execute expression inside a shell, send output"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:45
+#: gajim/command_system/implementation/standard.py:47
 msgid ""
 "Show help on a given command or a list of available commands if -a is given"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:73
+#: gajim/command_system/implementation/standard.py:75
 #, fuzzy
 msgid "Send a message to the contact"
 msgstr "Dosyayı bir kişiye gönderir"
 
-#: gajim/command_system/implementation/standard.py:78
+#: gajim/command_system/implementation/standard.py:80
 msgid "Send action (in the third person) to the current chat"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:83
+#: gajim/command_system/implementation/standard.py:85
 msgid "Show logged messages which mention given text"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:88
+#: gajim/command_system/implementation/standard.py:90
 #, fuzzy, python-format
 msgid "%s: Nothing found"
 msgstr "%s bulunamadı"
 
-#: gajim/command_system/implementation/standard.py:94
+#: gajim/command_system/implementation/standard.py:96
 msgid "Limit must be an integer"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:118
+#: gajim/command_system/implementation/standard.py:120
 msgid ""
 "\n"
 "    Set the current status\n"
@@ -8284,125 +8424,127 @@ msgid ""
 "    "
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:136
+#: gajim/command_system/implementation/standard.py:138
 msgid "Set the current status to away"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:150
+#: gajim/command_system/implementation/standard.py:152
 msgid "Set the current status to online"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:153
+#: gajim/command_system/implementation/standard.py:155
 msgid "Available"
 msgstr "Mevcut"
 
-#: gajim/command_system/implementation/standard.py:173
-#: gajim/command_system/implementation/standard.py:250
+#: gajim/command_system/implementation/standard.py:175
+#: gajim/command_system/implementation/standard.py:252
 #, fuzzy
 msgid "Clear the text window"
 msgstr "Pencereyi gizler"
 
-#: gajim/command_system/implementation/standard.py:178
-#: gajim/command_system/implementation/standard.py:397
+#: gajim/command_system/implementation/standard.py:180
+#: gajim/command_system/implementation/standard.py:401
 #, fuzzy
 msgid "Send a ping to the contact"
 msgstr "Dosyayı bir kişiye gönderir"
 
-#: gajim/command_system/implementation/standard.py:181
-#: gajim/command_system/implementation/standard.py:400
+#: gajim/command_system/implementation/standard.py:183
+#: gajim/command_system/implementation/standard.py:404
 msgid "Command is not supported for zeroconf accounts"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:185
-msgid "Send DTMF sequence through an open audio session"
+#: gajim/command_system/implementation/standard.py:187
+msgid "Send DTMF sequence through an open voice chat"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:188
-msgid "No open audio sessions with the contact"
-msgstr ""
+#: gajim/command_system/implementation/standard.py:190
+#, fuzzy
+msgid "No open voice chats with the contact"
+msgstr "Dosyayı bir kişiye gönderir"
 
-#: gajim/command_system/implementation/standard.py:191
+#: gajim/command_system/implementation/standard.py:193
 #, fuzzy, python-format
 msgid "%s is not a valid tone"
 msgstr "Klasör \"%s\" yazılabilir değil"
 
-#: gajim/command_system/implementation/standard.py:198
-msgid "Toggle audio session"
+#: gajim/command_system/implementation/standard.py:200
+msgid "Toggle Voice Chat"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:201
+#: gajim/command_system/implementation/standard.py:203
 #, fuzzy
-msgid "Audio sessions are not available"
-msgstr "Klasör \"%s\" yazılabilir değil"
+msgid "Voice chats are not available"
+msgstr "Hiç bir hesap bulunmiyor"
 
-#: gajim/command_system/implementation/standard.py:208
-msgid "Toggle video session"
+#: gajim/command_system/implementation/standard.py:210
+msgid "Toggle Video Chat"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:211
+#: gajim/command_system/implementation/standard.py:213
 #, fuzzy
-msgid "Video sessions are not available"
+msgid "Video chats are not available"
 msgstr "Hiç bir hesap bulunmiyor"
 
-#: gajim/command_system/implementation/standard.py:218
+#: gajim/command_system/implementation/standard.py:220
 #, fuzzy
 msgid "Send a message to the contact that will attract their attention"
 msgstr "Dosyayı bir kişiye gönderir"
 
-#: gajim/command_system/implementation/standard.py:255
+#: gajim/command_system/implementation/standard.py:257
 #, fuzzy
 msgid "Change your nickname in a group chat"
 msgstr "[%s sayfasını okuyamazsınız.]"
 
-#: gajim/command_system/implementation/standard.py:260 gajim/gtk/dialogs.py:674
-#: gajim/gtk/bookmarks.py:272
+#: gajim/command_system/implementation/standard.py:262
 msgid "Invalid nickname"
 msgstr "Geçersiz takma ad"
 
-#: gajim/command_system/implementation/standard.py:267
+#: gajim/command_system/implementation/standard.py:269
 #, fuzzy
-msgid "Open a private chat window with a specified occupant"
+msgid "Open a private chat window with a specified participant"
 msgstr "Kişiyle sohbet pencere _aç"
 
-#: gajim/command_system/implementation/standard.py:273
-#: gajim/command_system/implementation/standard.py:282
-#: gajim/command_system/implementation/standard.py:332
-#: gajim/command_system/implementation/standard.py:345
-#: gajim/command_system/implementation/standard.py:357
+#: gajim/command_system/implementation/standard.py:275
+#: gajim/command_system/implementation/standard.py:284
+#: gajim/command_system/implementation/standard.py:336
+#: gajim/command_system/implementation/standard.py:349
+#: gajim/command_system/implementation/standard.py:361
 #, fuzzy
 msgid "Nickname not found"
 msgstr "Kullanıcak takma ad"
 
-#: gajim/command_system/implementation/standard.py:276
+#: gajim/command_system/implementation/standard.py:278
+#, fuzzy
 msgid ""
-"Open a private chat window with a specified occupant and send him a message"
-msgstr ""
+"Open a private chat window with a specified participant and send him a "
+"message"
+msgstr "Kişiyle sohbet pencere _aç"
 
-#: gajim/command_system/implementation/standard.py:285
+#: gajim/command_system/implementation/standard.py:287
 #, fuzzy
 msgid "Display or change a group chat topic"
 msgstr "%s mevcut bir grubun ismi değil"
 
-#: gajim/command_system/implementation/standard.py:294
-msgid "Invite a user to a room for a reason"
+#: gajim/command_system/implementation/standard.py:296
+msgid "Invite a user to a group chat for a reason"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:297
+#: gajim/command_system/implementation/standard.py:299
 #, fuzzy, python-format
 msgid "Invited %(jid)s to %(room_jid)s"
 msgstr "Bunu %s buna %s gönder"
 
-#: gajim/command_system/implementation/standard.py:301
+#: gajim/command_system/implementation/standard.py:303
 #, fuzzy
-msgid "Join a group chat given by a JID"
+msgid "Join a group chat given by an XMPP Address"
 msgstr "grupdaki herkez"
 
-#: gajim/command_system/implementation/standard.py:309
+#: gajim/command_system/implementation/standard.py:313
 msgid ""
-"Leave the groupchat, optionally giving a reason, and close tab or window"
+"Leave the group chat, optionally giving a reason, and close tab or window"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:314
+#: gajim/command_system/implementation/standard.py:318
 msgid ""
 "\n"
 "    Ban user by a nick or a JID from a groupchat\n"
@@ -8411,48 +8553,48 @@ msgid ""
 "    "
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:329
+#: gajim/command_system/implementation/standard.py:333
 #, fuzzy
-msgid "Kick user by a nick from a groupchat"
+msgid "Kick user by a nick from a group chat"
 msgstr ""
 "Şuraya bir yorum gönderiyorsunuz:\n"
 "  "
 
-#: gajim/command_system/implementation/standard.py:338
+#: gajim/command_system/implementation/standard.py:342
 msgid ""
-"Set occupant role in group chat.\n"
+"Set participant role in group chat.\n"
 "    Role can be given as one of the following values:\n"
 "    moderator, participant, visitor, none"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:343
+#: gajim/command_system/implementation/standard.py:347
 #, fuzzy
 msgid "Invalid role given"
 msgstr "Geçersiz sunucu"
 
-#: gajim/command_system/implementation/standard.py:350
+#: gajim/command_system/implementation/standard.py:354
 msgid ""
-"Set occupant affiliation in group chat.\n"
+"Set participant affiliation in group chat.\n"
 "    Affiliation can be given as one of the following values:\n"
 "    owner, admin, member, outcast, none"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:355
+#: gajim/command_system/implementation/standard.py:359
 #, fuzzy
 msgid "Invalid affiliation given"
 msgstr "üyelik değişti"
 
-#: gajim/command_system/implementation/standard.py:365
+#: gajim/command_system/implementation/standard.py:369
 #, fuzzy
-msgid "Display names of all group chat occupants"
+msgid "Display names of all group chat participants"
 msgstr "%s mevcut bir grubun ismi değil"
 
-#: gajim/command_system/implementation/standard.py:387
-msgid "Forbid an occupant to send you public or private messages"
+#: gajim/command_system/implementation/standard.py:391
+msgid "Forbid a participant to send you public or private messages"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:392
-msgid "Allow an occupant to send you public or private messages"
+#: gajim/command_system/implementation/standard.py:396
+msgid "Allow a participant to send you public or private messages"
 msgstr ""
 
 #: gajim/command_system/implementation/middleware.py:74
@@ -8463,335 +8605,442 @@ msgstr ""
 msgid "The same as using a doc-string, except it supports translation"
 msgstr ""
 
-#: gajim/gtk/filetransfer.py:91
+#: gajim/gtk/groupchat_info.py:36
+#, fuzzy
+msgid "?Group chat feature:Archiving"
+msgstr "Grup Sohbeti Daveti"
+
+#: gajim/gtk/groupchat_info.py:37
+#, fuzzy
+msgid "Messages are archived on the server"
+msgstr "%s: OID (-o) 0 olamaz\n"
+
+#: gajim/gtk/groupchat_info.py:40
+#, fuzzy
+msgid "?Group chat feature:Persistent"
+msgstr "Grup sohbetler"
+
+#: gajim/gtk/groupchat_info.py:41
+msgid "This group chat persists even if there are no participants"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:45
+#, fuzzy
+msgid "?Group chat feature:Temporary"
+msgstr "?Group Chat Contact Role:Hiç biri"
+
+#: gajim/gtk/groupchat_info.py:46
+msgid "This group chat will be destroyed once the last participant left"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:50
+#, fuzzy
+msgid "?Group chat feature:Moderated"
+msgstr "?Group Chat Contact Role:Hiç biri"
+
+#: gajim/gtk/groupchat_info.py:51
+msgid ""
+"Participants entering this group chat need to request permission to send "
+"messages"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:55
+#, fuzzy
+msgid "?Group chat feature:Not Moderated"
+msgstr "Grup sohbetler"
+
+#: gajim/gtk/groupchat_info.py:56
+msgid "Participants entering this group chat are allowed to send messages"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:60
+#, fuzzy
+msgid "?Group chat feature:Open"
+msgstr "?Group Chat Contact Role:Hiç biri"
+
+#: gajim/gtk/groupchat_info.py:61
+#, fuzzy
+msgid "Anyone can join this group chat"
+msgstr "%s grup sohbete katıldı"
+
+#: gajim/gtk/groupchat_info.py:64
+#, fuzzy
+msgid "?Group chat feature:Members Only"
+msgstr "%s grup sohbete katıldı"
+
+#: gajim/gtk/groupchat_info.py:65
+msgid "This group chat is restricted to members only"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:69
+#, fuzzy
+msgid "?Group chat feature:Public"
+msgstr "%s grup sohbete katıldı"
+
+#: gajim/gtk/groupchat_info.py:70
+msgid "Group chat can be found via search"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:73
+#, fuzzy
+msgid "?Group chat feature:Hidden"
+msgstr "?Group Chat Contact Role:Hiç biri"
+
+#: gajim/gtk/groupchat_info.py:74
+#, fuzzy
+msgid "This group chat can not be found via search"
+msgstr "Paket bulunamadı"
+
+#: gajim/gtk/groupchat_info.py:77
+#, fuzzy
+msgid "?Group chat feature:Not Anonymous"
+msgstr "Grup sohbetler"
+
+#: gajim/gtk/groupchat_info.py:78
+msgid "All other group chat participants can see your XMPP address"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:82
+#, fuzzy
+msgid "?Group chat feature:Semi-Anonymous"
+msgstr "%s grup sohbete katıldı"
+
+#: gajim/gtk/groupchat_info.py:83
+msgid "Only moderators can see your XMPP address"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:86
+#, fuzzy
+msgid "?Group chat feature:Password Required"
+msgstr "Grup sohbetler"
+
+#: gajim/gtk/groupchat_info.py:87
+msgid "This group chat does require a password upon entry"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:91
+#, fuzzy
+msgid "?Group chat feature:No Password Required"
+msgstr "Grup sohbetler"
+
+#: gajim/gtk/groupchat_info.py:92
+msgid "This group chat does not require a password upon entry"
+msgstr ""
+
+#: gajim/gtk/filetransfer.py:90
 msgid "File"
 msgstr "Dosya"
 
-#: gajim/gtk/filetransfer.py:108
+#: gajim/gtk/filetransfer.py:107
 msgid "Time"
 msgstr "Süre"
 
-#: gajim/gtk/filetransfer.py:228
+#: gajim/gtk/filetransfer.py:227
 #, fuzzy, python-format
 msgid "File name: %s"
 msgstr "Dosya adı: %s"
 
-#: gajim/gtk/filetransfer.py:229 gajim/gtk/filetransfer.py:464
+#: gajim/gtk/filetransfer.py:228 gajim/gtk/filetransfer.py:469
 #, fuzzy, python-format
 msgid "Size: %s"
 msgstr "%1 (boyut %2)"
 
-#: gajim/gtk/filetransfer.py:239
+#: gajim/gtk/filetransfer.py:238
 #, python-format
 msgid "Sender: %s"
 msgstr "Gönderen: %s"
 
-#: gajim/gtk/filetransfer.py:240 gajim/gtk/filetransfer.py:744
+#: gajim/gtk/filetransfer.py:239 gajim/gtk/filetransfer.py:749
 #: gajim/gtk/tooltips.py:577
 msgid "Recipient: "
 msgstr "Alıcı:"
 
-#: gajim/gtk/filetransfer.py:251
+#: gajim/gtk/filetransfer.py:250
 #, fuzzy, python-format
 msgid "Saved in: %s"
 msgstr "ben burdaysam"
 
-#: gajim/gtk/filetransfer.py:256
+#: gajim/gtk/filetransfer.py:255
 #, fuzzy
 msgid "File transfer completed"
 msgstr "Dosya Gönderme Tamamlandı"
 
-#: gajim/gtk/filetransfer.py:276 gajim/gtk/filetransfer.py:285
+#: gajim/gtk/filetransfer.py:275 gajim/gtk/filetransfer.py:284
 #, fuzzy
 msgid "Connection with peer could not be established."
 msgstr "işlem 'pmuls' ile birleştirilemez"
 
-#: gajim/gtk/filetransfer.py:293
+#: gajim/gtk/filetransfer.py:292
 #, python-format
 msgid "Filename: %s"
 msgstr "Dosya adı: %s"
 
-#: gajim/gtk/filetransfer.py:294
+#: gajim/gtk/filetransfer.py:293
 #, python-format
 msgid "Recipient: %s"
 msgstr "Alıcı: %s"
 
-#: gajim/gtk/filetransfer.py:296
+#: gajim/gtk/filetransfer.py:295
 #, fuzzy, python-format
 msgid "Error message: %s"
 msgstr "Ileti alınıyor"
 
-#: gajim/gtk/filetransfer.py:333
-#, fuzzy
-msgid "File transfer error"
-msgstr "Dosya Gönderim Hatası"
-
 #: gajim/gtk/filetransfer.py:334
 #, python-format
 msgid ""
-"The file %(file)s has been received, but it seems to have been damaged along "
-"the way.\n"
+"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 ""
 
-#: gajim/gtk/filetransfer.py:350
+#: gajim/gtk/filetransfer.py:340
+#, fuzzy
+msgid "_Download Again"
+msgstr "Bu iletişim kutusunu bir daha _gösterme"
+
+#: gajim/gtk/filetransfer.py:355
 #, fuzzy
 msgid "Gajim can not read this file"
 msgstr "%s sunucu konfigurasyon dosyasına \"%s\" erişilemiyor: %s\n"
 
-#: gajim/gtk/filetransfer.py:351
+#: gajim/gtk/filetransfer.py:356
 msgid "Another process is using this file."
 msgstr ""
 
-#: gajim/gtk/filetransfer.py:418
+#: gajim/gtk/filetransfer.py:423
 #, fuzzy
 msgid "File Transfer Conflict"
 msgstr "Dosya Gönderimi Tamamlandı"
 
-#: gajim/gtk/filetransfer.py:419
+#: gajim/gtk/filetransfer.py:424
 msgid "This file already exists"
 msgstr "Dosyası zaten var"
 
-#: gajim/gtk/filetransfer.py:420
+#: gajim/gtk/filetransfer.py:425
 msgid "Resume download or replace file?"
 msgstr ""
 
-#: gajim/gtk/filetransfer.py:424
+#: gajim/gtk/filetransfer.py:429
 #, fuzzy
 msgid "Replace _File"
 msgstr "Temizleniyor"
 
-#: gajim/gtk/filetransfer.py:427
+#: gajim/gtk/filetransfer.py:432
 #, fuzzy
 msgid "Resume _Download"
 msgstr "Yükleme"
 
-#: gajim/gtk/filetransfer.py:437
+#: gajim/gtk/filetransfer.py:442
 #, fuzzy, python-format
 msgid "Directory '%s' is not writable"
 msgstr "Klasör \"%s\" yazılabilir değil"
 
-#: gajim/gtk/filetransfer.py:438
+#: gajim/gtk/filetransfer.py:443
 msgid "You do not have permissions to create files in this directory."
 msgstr ""
 
-#: gajim/gtk/filetransfer.py:461
+#: gajim/gtk/filetransfer.py:466
 #, python-format
 msgid "File: %s"
 msgstr "Dosya: %s"
 
-#: gajim/gtk/filetransfer.py:467
+#: gajim/gtk/filetransfer.py:472
 #, fuzzy, python-format
 msgid "Type: %s"
 msgstr "_Türü:"
 
-#: gajim/gtk/filetransfer.py:469
+#: gajim/gtk/filetransfer.py:474
 #, python-format
 msgid "Description: %s"
 msgstr "Açıklama: %s"
 
-#: gajim/gtk/filetransfer.py:480
+#: gajim/gtk/filetransfer.py:485
 #, fuzzy, python-format
 msgid "%s wants to send you a file"
 msgstr "%s size bir dosya göndermek istiyor."
 
-#: gajim/gtk/filetransfer.py:509
+#: gajim/gtk/filetransfer.py:514
 #, fuzzy
 msgid "Checking file…"
 msgstr "Profil gönderiliyor…"
 
-#: gajim/gtk/filetransfer.py:524
+#: gajim/gtk/filetransfer.py:529
 #, fuzzy
 msgid "File error"
 msgstr "Dosya okunurken hata:"
 
-#: gajim/gtk/filetransfer.py:561
+#: gajim/gtk/filetransfer.py:566
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 
-#: gajim/gtk/filetransfer.py:658
+#: gajim/gtk/filetransfer.py:663
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/s)"
 
-#: gajim/gtk/filetransfer.py:711 gajim/gtk/filetransfer.py:715
+#: gajim/gtk/filetransfer.py:716 gajim/gtk/filetransfer.py:720
 msgid "Invalid File"
 msgstr "Geçersiz Dosya"
 
-#: gajim/gtk/filetransfer.py:711
+#: gajim/gtk/filetransfer.py:716
 msgid "File: "
 msgstr "Dosya: "
 
-#: gajim/gtk/filetransfer.py:716
+#: gajim/gtk/filetransfer.py:721
 msgid "It is not possible to send empty files"
 msgstr ""
 
-#: gajim/gtk/filetransfer.py:742 gajim/gtk/tooltips.py:571
+#: gajim/gtk/filetransfer.py:747 gajim/gtk/tooltips.py:571
 msgid "Sender: "
 msgstr "Gönderen"
 
-#: gajim/gtk/filetransfer.py:1038
+#: gajim/gtk/filetransfer.py:1043
 #, fuzzy
 msgid "Choose a File to Send…"
 msgstr "%s size bir dosya göndermek istiyor:"
 
 #: gajim/gtk/start_chat.py:51
 #, fuzzy
-msgid "Start new Conversation"
+msgid "Start New Conversation"
 msgstr "Devam edilen sohbet"
 
-#: gajim/gtk/start_chat.py:424
-#, fuzzy
-msgid "New Groupchat"
-msgstr "_Yeni Bir Grup Sohbeti"
+#: gajim/gtk/start_chat.py:260 gajim/gtk/start_chat.py:328
+msgid "You can not join a group chat unless you are connected."
+msgstr ""
+
+#: gajim/gtk/start_chat.py:603 gajim/gtk/groupchat_join.py:38
+msgid "Join Group Chat"
+msgstr "Grup Sohbete Katıl"
 
-#: gajim/gtk/start_chat.py:426
+#: gajim/gtk/start_chat.py:605 gajim/gtk/add_contact.py:40
 #, fuzzy
-msgid "New Contact"
-msgstr "Yeni Kişi Ekle"
+msgid "Add Contact"
+msgstr "Kişi _ekle"
 
-#: gajim/gtk/start_chat.py:588
+#: gajim/gtk/start_chat.py:746
 #, fuzzy, python-format
-msgid "%s Group chats found"
+msgid "%s group chats found"
 msgstr "%s bulunamadı"
 
-#: gajim/gtk/discovery.py:70
+#: gajim/gtk/discovery.py:69
 msgid "This service has not yet responded with detailed information"
 msgstr ""
 
-#: gajim/gtk/discovery.py:71
+#: gajim/gtk/discovery.py:70
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely a legacy service or broken."
 msgstr ""
 
-#: gajim/gtk/discovery.py:128
+#: gajim/gtk/discovery.py:126
 msgid "Others"
 msgstr "Diğer"
 
-#: gajim/gtk/discovery.py:131
-msgid "Conference"
-msgstr "Konferans"
+#: gajim/gtk/discovery.py:129
+#, fuzzy
+msgid "Group Chat"
+msgstr "Grup sohbetler"
 
-#: gajim/gtk/discovery.py:519
+#: gajim/gtk/discovery.py:518
 msgid "Without a connection, you can not browse available services"
 msgstr ""
 
-#: gajim/gtk/discovery.py:606
+#: gajim/gtk/discovery.py:605
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr ""
 
-#: gajim/gtk/discovery.py:608
+#: gajim/gtk/discovery.py:607
 msgid "Service Discovery"
 msgstr "Hizmet Keşfi"
 
-#: gajim/gtk/discovery.py:691
+#: gajim/gtk/discovery.py:690
 msgid "The service could not be found"
 msgstr "Hizmet bulunamadı"
 
-#: gajim/gtk/discovery.py:692
+#: gajim/gtk/discovery.py:691
 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:699 gajim/gtk/discovery.py:1042
+#: gajim/gtk/discovery.py:698 gajim/gtk/discovery.py:1041
 msgid "The service is not browsable"
 msgstr "Bu hizmet gözatılabilir değil"
 
-#: gajim/gtk/discovery.py:700
+#: gajim/gtk/discovery.py:699
 msgid "This type of service does not contain any items to browse."
 msgstr ""
 
-#: gajim/gtk/discovery.py:738 gajim/gtk/discovery.py:747
+#: gajim/gtk/discovery.py:737 gajim/gtk/discovery.py:746
 msgid "Invalid Server Name"
 msgstr "Geçersiz Sunucu Adı"
 
-#: gajim/gtk/discovery.py:806
+#: gajim/gtk/discovery.py:805
 #, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr ""
 
-#: gajim/gtk/discovery.py:851
+#: gajim/gtk/discovery.py:850
 #, fuzzy
 msgid "Browse"
 msgstr "_Göz at"
 
-#: gajim/gtk/discovery.py:1043
+#: gajim/gtk/discovery.py:1042
 msgid "This service does not contain any items to browse."
 msgstr ""
 
-#: gajim/gtk/discovery.py:1255
+#: gajim/gtk/discovery.py:1254
 #, fuzzy
 msgid "_Command"
 msgstr "komut"
 
-#: gajim/gtk/discovery.py:1264 gajim/gtk/discovery.py:1422
+#: gajim/gtk/discovery.py:1263 gajim/gtk/discovery.py:1420
 #, fuzzy
 msgid "Re_gister"
 msgstr "_Kaydol"
 
-#: gajim/gtk/discovery.py:1277
+#: gajim/gtk/discovery.py:1276
 msgid "_Search"
 msgstr "_Ara"
 
-#: gajim/gtk/discovery.py:1420
+#: gajim/gtk/discovery.py:1418
 msgid "_Edit"
 msgstr "Düz_en"
 
-#: gajim/gtk/discovery.py:1458
+#: gajim/gtk/discovery.py:1456
 #, fuzzy, python-format
 msgid "Scanning %(current)d / %(total)d ..."
 msgstr "İndirilen dosya: %(current)li  / %(total)li"
 
-#: gajim/gtk/discovery.py:1674
+#: gajim/gtk/discovery.py:1655
+msgid "Users"
+msgstr "Kullanıcılar"
+
+#: gajim/gtk/discovery.py:1671
 msgid "Id"
 msgstr "Id"
 
-#: gajim/gtk/discovery.py:1713
-msgid "_Join"
-msgstr "_Katıl"
-
-#: gajim/gtk/discovery.py:1736
-msgid "Bookmark already set"
-msgstr "Yer imi zaten kuruldu"
-
-#: gajim/gtk/discovery.py:1737
-#, python-format
-msgid "Group Chat '%s' is already in your bookmarks."
-msgstr ""
-
-#: gajim/gtk/discovery.py:1748
-msgid "Bookmark has been added successfully"
-msgstr "Yer imi başarılı eklendi"
-
-#: gajim/gtk/discovery.py:1749
-msgid ""
-"You can manage your bookmarks by clicking the Bookmarks menu item in your "
-"contact list."
-msgstr ""
-
-#: gajim/gtk/discovery.py:1950
+#: gajim/gtk/discovery.py:1900
 msgid "Subscribed"
 msgstr "Üyeldi"
 
-#: gajim/gtk/discovery.py:1959
+#: gajim/gtk/discovery.py:1909
 #, fuzzy
 msgid "Node"
 msgstr "Ağ Sil"
 
-#: gajim/gtk/discovery.py:2028
+#: gajim/gtk/discovery.py:1978
 #, fuzzy
 msgid "_New post"
 msgstr "Yeni posta"
 
-#: gajim/gtk/discovery.py:2037
+#: gajim/gtk/discovery.py:1987
 msgid "_Subscribe"
 msgstr "_Üye yap"
 
-#: gajim/gtk/discovery.py:2045
+#: gajim/gtk/discovery.py:1995
 msgid "_Unsubscribe"
 msgstr "_Üyelikten çık"
 
@@ -8839,7 +9088,7 @@ msgstr "Form"
 msgid "Characters typed: %s"
 msgstr "Rahatsız etmeyin"
 
-#: gajim/gtk/single_message.py:274 gajim/gtk/xml_console.py:169
+#: gajim/gtk/single_message.py:274 gajim/gtk/xml_console.py:166
 #, fuzzy
 msgid "Connection not available"
 msgstr "Hiç bir hesap bulunmiyor"
@@ -8849,6 +9098,12 @@ msgstr "Hiç bir hesap bulunmiyor"
 msgid "Please make sure you are connected with \"%s\"."
 msgstr ""
 
+#: gajim/gtk/single_message.py:306
+#, 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:330
 #, fuzzy, python-format
 msgid "RE: %s"
@@ -8859,28 +9114,28 @@ msgstr "Adı _değiştir"
 msgid "%s wrote:\n"
 msgstr "Yazıldı: %s\n"
 
-#: gajim/gtk/pep_config.py:44
+#: gajim/gtk/pep_config.py:45
 #, fuzzy, python-format
 msgid "PEP Service Configuration (%s)"
 msgstr "PEP Servis Yerleştirme"
 
-#: gajim/gtk/pep_config.py:77
+#: gajim/gtk/pep_config.py:78
 #, fuzzy
 msgid "Service"
 msgstr "_Sunuc:"
 
-#: gajim/gtk/pep_config.py:114
+#: gajim/gtk/pep_config.py:115
 msgid "PEP node was not removed"
 msgstr ""
 
-#: gajim/gtk/pep_config.py:115
+#: gajim/gtk/pep_config.py:116
 #, python-format
 msgid ""
 "PEP node %(node)s was not removed:\n"
 "%(message)s"
 msgstr ""
 
-#: gajim/gtk/pep_config.py:146
+#: gajim/gtk/pep_config.py:147
 #, fuzzy, python-format
 msgid "Configure %s"
 msgstr "_Yerleştir"
@@ -8896,17 +9151,21 @@ msgstr "_Kayıt Ol"
 msgid "Registration successful"
 msgstr "Onay başarılı oldu."
 
-#: gajim/gtk/dialogs.py:54 gajim/gtk/dataform.py:659 gajim/gtk/adhoc.py:85
+#: gajim/gtk/service_registration.py:215
+msgid "Registration failed"
+msgstr "Kayıt başarısız"
+
+#: gajim/gtk/dialogs.py:53 gajim/gtk/dataform.py:668 gajim/gtk/adhoc.py:86
 #, fuzzy
 msgid "Cancel"
 msgstr "_İptal"
 
-#: gajim/gtk/dialogs.py:129
+#: gajim/gtk/dialogs.py:128
 #, 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:130
+#: gajim/gtk/dialogs.py:129
 #, python-format
 msgid ""
 "You have to install the dictionary \"%s\" to use spellchecking, or choose "
@@ -8915,11 +9174,11 @@ msgid ""
 "Highlighting misspelled words feature will not be used"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:410 gajim/gtk/dialogs.py:425
+#: gajim/gtk/dialogs.py:322 gajim/gtk/dialogs.py:337
 msgid "Insecure connection"
 msgstr "Tehlikeli bağlantı"
 
-#: gajim/gtk/dialogs.py:411
+#: gajim/gtk/dialogs.py:323
 #, python-format
 msgid ""
 "You are about to connect to the account %(account)s (%(server)s) insecurely. "
@@ -8928,120 +9187,115 @@ msgid ""
 "Are you sure you want to do that?"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:416
+#: gajim/gtk/dialogs.py:328
 msgid "Yes, I really want to connect insecurely"
 msgstr "Evet, gerçekten tehlikeli bağlanmak istiyorum"
 
-#: gajim/gtk/dialogs.py:417
+#: gajim/gtk/dialogs.py:329
 msgid "Gajim will NOT connect unless you check this box"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:675
-#, fuzzy
-msgid "The nickname contains invalid characters."
-msgstr "%s: Kontrol karakterleri kullanılamaz.\n"
-
-#: gajim/gtk/dialogs.py:734
+#: gajim/gtk/dialogs.py:561
 #, python-format
 msgid "Destroy %s"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:775
+#: gajim/gtk/dialogs.py:602
 #, fuzzy
 msgid "Certificate"
 msgstr "%(nickname)s Girdi"
 
-#: gajim/gtk/dialogs.py:786
+#: gajim/gtk/dialogs.py:613
 #, fuzzy, python-format
 msgid ""
 "Certificate for account\n"
 "%s"
 msgstr "%s hesapına"
 
-#: gajim/gtk/dialogs.py:824
+#: gajim/gtk/dialogs.py:651
 msgid "Issued to\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:825 gajim/gtk/dialogs.py:830
+#: gajim/gtk/dialogs.py:652 gajim/gtk/dialogs.py:657
 msgid "Common Name (CN): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:826 gajim/gtk/dialogs.py:831
+#: gajim/gtk/dialogs.py:653 gajim/gtk/dialogs.py:658
 msgid "Organization (O): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:827 gajim/gtk/dialogs.py:832
+#: gajim/gtk/dialogs.py:654 gajim/gtk/dialogs.py:659
 msgid "Organizational Unit (OU): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:828
+#: gajim/gtk/dialogs.py:655
 #, fuzzy
 msgid "Serial Number: "
 msgstr "GG Numara:"
 
-#: gajim/gtk/dialogs.py:829
+#: gajim/gtk/dialogs.py:656
 msgid "Issued by\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:833
+#: gajim/gtk/dialogs.py:660
 msgid "Validity\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:834
+#: gajim/gtk/dialogs.py:661
 msgid "Issued on: "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:835
+#: gajim/gtk/dialogs.py:662
 msgid "Expires on: "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:836
+#: gajim/gtk/dialogs.py:663
 msgid "SHA-1:"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:838
+#: gajim/gtk/dialogs.py:665
 msgid "SHA-256:"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:852
+#: gajim/gtk/dialogs.py:679
 #, fuzzy
 msgid "View certificate…"
 msgstr "%(nickname)s Girdi"
 
-#: gajim/gtk/dialogs.py:864 gajim/gtk/accounts.py:893
+#: gajim/gtk/dialogs.py:691 gajim/gtk/accounts.py:896
 msgid "Change Password"
 msgstr "Parolayı Değiştir"
 
-#: gajim/gtk/dialogs.py:878
+#: gajim/gtk/dialogs.py:705
 msgid "_OK"
 msgstr "_Tamam"
 
-#: gajim/gtk/dialogs.py:891
+#: gajim/gtk/dialogs.py:718
 #, fuzzy
 msgid "You must enter a password"
 msgstr "Bir parola girmelisiniz."
 
-#: gajim/gtk/dialogs.py:895
+#: gajim/gtk/dialogs.py:722
 msgid "Passwords do not match"
 msgstr "Parolalar uyuşmuyor"
 
-#: gajim/gtk/dialogs.py:923
+#: gajim/gtk/dialogs.py:750
 #, fuzzy
 msgid "Group Chat Invitation "
 msgstr "Grup Sohbeti Daveti"
 
-#: gajim/gtk/dialogs.py:948
+#: gajim/gtk/dialogs.py:775
 #, python-format
 msgid "<b>%s</b> has invited you to join a discussion"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:951
+#: gajim/gtk/dialogs.py:778
 #, python-format
 msgid ""
 "<b>%(contact)s</b> has invited you to the group chat <b>%(room_jid)s</b>"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:959
+#: gajim/gtk/dialogs.py:786
 #, fuzzy, python-format
 msgid "Comment: %s"
 msgstr "Yorum:"
@@ -9056,11 +9310,6 @@ msgstr "GG Numara:"
 msgid "ICQ Number"
 msgstr "ICQ Numara:"
 
-#: gajim/gtk/add_contact.py:40
-#, fuzzy
-msgid "Add Contact"
-msgstr "Kişi _ekle"
-
 #: gajim/gtk/add_contact.py:259
 #, fuzzy, python-format
 msgid "%s Missing"
@@ -9082,8 +9331,9 @@ msgid "The user ID must not contain a resource."
 msgstr ""
 
 #: gajim/gtk/add_contact.py:299
-msgid "You cannot add yourself to your roster."
-msgstr ""
+#, fuzzy
+msgid "You cannot add yourself to your contact list."
+msgstr "Seni kişi listeme eklemek isterdim"
 
 #: gajim/gtk/add_contact.py:304
 #, fuzzy
@@ -9096,12 +9346,13 @@ msgstr ""
 
 #: gajim/gtk/add_contact.py:321
 #, fuzzy
-msgid "Contact already in roster"
+msgid "Contact Already in Contact List"
 msgstr "Kişi listesindeki olayları göster"
 
 #: gajim/gtk/add_contact.py:322
-msgid "This contact is already listed in your roster."
-msgstr ""
+#, fuzzy
+msgid "This contact is already in your contact list."
+msgstr "Kişiyi listeden sil"
 
 #: gajim/gtk/add_contact.py:379 gajim/gtk/add_contact.py:417
 msgid "User ID:"
@@ -9141,14 +9392,14 @@ msgstr "Durumu Değiştir"
 
 #: gajim/gtk/themes.py:52
 #, fuzzy
-msgid "MUC Tab New Directed Message"
+msgid "Group Chat Tab New Directed Message"
 msgstr ""
 "Yönetilmiş MUC\n"
 "İletler"
 
 #: gajim/gtk/themes.py:56
 #, fuzzy
-msgid "MUC Tab New Message"
+msgid "Group Chat Tab New Message"
 msgstr "Yeni Mesaj"
 
 #: gajim/gtk/themes.py:60
@@ -9366,13 +9617,13 @@ msgstr "Tüm dosyalar"
 msgid "Clear File"
 msgstr "Temizleniyor"
 
-#: gajim/gtk/settings.py:570
+#: gajim/gtk/settings.py:570 gajim/gtk/proxies.py:32
 #, fuzzy
 msgid "Manage Proxies"
 msgstr "Vekil Sunuc Profili İşlet"
 
-#: gajim/gtk/settings.py:591 gajim/gtk/preferences.py:971
-#: gajim/gtk/preferences.py:984 gajim/gtk/preferences.py:988
+#: gajim/gtk/settings.py:591 gajim/gtk/preferences.py:968
+#: gajim/gtk/preferences.py:982 gajim/gtk/preferences.py:986
 #, fuzzy
 msgid "No Proxy"
 msgstr "Prox_y:"
@@ -9452,14 +9703,15 @@ msgid ""
 "        "
 msgstr ""
 
-#: gajim/gtk/about.py:47 data/org.gajim.Gajim.appdata.xml.in:10
+#: gajim/gtk/about.py:47 data/org.gajim.Gajim.desktop.in:6
+#: data/org.gajim.Gajim.appdata.xml.in:10
 #, fuzzy
-msgid "A GTK+ XMPP client"
+msgid "A GTK XMPP client"
 msgstr "Geçersiz Jabber kimliği"
 
 #: gajim/gtk/about.py:48
 #, fuzzy, python-format
-msgid "GTK+ Version: %s"
+msgid "GTK Version: %s"
 msgstr "GTK+ Runtime Sürümü"
 
 #: gajim/gtk/about.py:49
@@ -9638,6 +9890,25 @@ msgstr "?transfer status:Duraklanıldı"
 msgid "?transfer status:Not started"
 msgstr "?transfer status:Duraklanıldı"
 
+#: gajim/gtk/groupchat_creation.py:97 gajim/gtk/groupchat_creation.py:99
+msgid " (optional)..."
+msgstr ""
+
+#: gajim/gtk/groupchat_creation.py:134
+#, fuzzy
+msgid "Invalid Address"
+msgstr "Geçersiz Dosya"
+
+#: gajim/gtk/groupchat_creation.py:182
+#, fuzzy
+msgid "Not Connected"
+msgstr "Bağlantılı"
+
+#: gajim/gtk/groupchat_creation.py:183
+#, fuzzy
+msgid "You have to be connected to create a group chat."
+msgstr "[%s sayfasını okuyamazsınız.]"
+
 #: gajim/gtk/sounds.py:39
 msgid "Wav Sounds"
 msgstr "Wav Sesleri"
@@ -9687,50 +9958,45 @@ msgstr "%s grup sohbete katıldı"
 msgid "Group Chat Message Received"
 msgstr "%s grup sohbete katıldı"
 
-#: gajim/gtk/dataform.py:226 gajim/gtk/dataform.py:262
+#: gajim/gtk/dataform.py:232 gajim/gtk/dataform.py:268
 #, fuzzy
 msgid "Required"
 msgstr "Şifre gerekli"
 
-#: gajim/gtk/dataform.py:286
+#: gajim/gtk/dataform.py:293
 msgid "Yes"
 msgstr ""
 
-#: gajim/gtk/dataform.py:286
+#: gajim/gtk/dataform.py:293
 #, fuzzy
 msgid "No"
 msgstr "Hiçbiri"
 
-#: gajim/gtk/dataform.py:661
+#: gajim/gtk/dataform.py:670
 msgid "Submit"
 msgstr ""
 
-#: gajim/gtk/statusicon.py:213
+#: gajim/gtk/statusicon.py:206
 #, fuzzy
 msgid "_Change Status Message…"
 msgstr "Durum ileti değiştir"
 
-#: gajim/gtk/statusicon.py:247 gajim/gtk/statusicon.py:292
-#: gajim/gtk/statusicon.py:299
+#: gajim/gtk/statusicon.py:258
 #, python-format
 msgid "using account %s"
 msgstr "%s hesapı kullanıp"
 
-#: gajim/gtk/statusicon.py:309
+#: gajim/gtk/statusicon.py:269
 #, fuzzy
-msgid "_Manage Bookmarks…"
-msgstr "Yer imlerini işlet"
+msgid "Hide _Contact List"
+msgstr "Kişi Davet _Et"
 
-#: gajim/gtk/statusicon.py:325
+#: gajim/gtk/statusicon.py:273
 #, fuzzy
-msgid "Hide _Roster"
-msgstr "<b>Kişi Listesi Görünümü</b>"
-
-#: gajim/gtk/statusicon.py:329
-msgid "Show _Roster"
-msgstr "Kişi Listesini Göster"
+msgid "Show _Contact List"
+msgstr "Sadece _Çecredeki Kişileri Göster"
 
-#: gajim/gtk/statusicon.py:337
+#: gajim/gtk/statusicon.py:281
 msgid "Hide this menu"
 msgstr "Menüyi gizle"
 
@@ -9780,36 +10046,6 @@ msgid ""
 msgstr ""
 "Kişisel ilanlar sayfayı yayınlarken bir hata çıktı, sonra bir daha prova et."
 
-#: gajim/gtk/join_groupchat.py:202
-#, fuzzy
-msgid "Invalid Room"
-msgstr "Geçersiz oda"
-
-#: gajim/gtk/join_groupchat.py:203
-msgid "Please choose a room"
-msgstr ""
-
-#: gajim/gtk/join_groupchat.py:222 gajim/gtk/join_groupchat.py:229
-msgid "Invalid Nickname"
-msgstr "Geçersiz Takma ad"
-
-#: gajim/gtk/join_groupchat.py:223
-#, fuzzy
-msgid "Please choose a nickname"
-msgstr "Yeni posta yarat"
-
-#: gajim/gtk/join_groupchat.py:282 gajim/gtk/join_groupchat.py:288
-#: gajim/gtk/join_groupchat.py:293
-#, fuzzy
-msgid "Wrong server"
-msgstr "Adres yanlış"
-
-#: gajim/gtk/join_groupchat.py:283 gajim/gtk/join_groupchat.py:289
-#: gajim/gtk/join_groupchat.py:294
-#, fuzzy, python-format
-msgid "%s is not a groupchat server"
-msgstr "%s mevcut bir grubun ismi değil"
-
 #: gajim/gtk/mam_preferences.py:38
 #, python-format
 msgid "Archiving Preferences for %s"
@@ -9839,48 +10075,54 @@ msgstr "Komuta satrında hata: %s\n"
 msgid "Archiving Preferences Error"
 msgstr "Tercihler"
 
-#: gajim/gtk/advanced_config.py:81
+#: gajim/gtk/advanced_config.py:95
 #, fuzzy
 msgid "Activated"
 msgstr "Etkin çıkışta"
 
-#: gajim/gtk/advanced_config.py:81
+#: gajim/gtk/advanced_config.py:95
 msgid "Deactivated"
 msgstr ""
 
-#: gajim/gtk/advanced_config.py:83
-#, fuzzy
-msgid "Boolean"
-msgstr "Mantıksal Değer"
+#: gajim/gtk/advanced_config.py:97
+msgid "?config type:Boolean"
+msgstr ""
 
-#: gajim/gtk/advanced_config.py:84
-#, fuzzy
-msgid "Integer"
-msgstr "Tamsayı"
+#: gajim/gtk/advanced_config.py:98
+msgid "?config type:Integer"
+msgstr ""
 
-#: gajim/gtk/advanced_config.py:85
-msgid "Text"
-msgstr "Metin"
+#: gajim/gtk/advanced_config.py:99
+msgid "?config type:Text"
+msgstr ""
 
-#: gajim/gtk/advanced_config.py:97
-msgid "Preference Name"
+#: gajim/gtk/advanced_config.py:100
+msgid "?config type:Color"
+msgstr ""
+
+#: gajim/gtk/advanced_config.py:112
+#, fuzzy
+msgid "?config:Preference Name"
 msgstr "Tercih Adı"
 
-#: gajim/gtk/advanced_config.py:104
-msgid "Value"
-msgstr "Değer"
+#: gajim/gtk/advanced_config.py:123
+#, fuzzy
+msgid "?config:Value"
+msgstr "_Yerleştir"
 
-#: gajim/gtk/advanced_config.py:113
-msgid "Type"
-msgstr "Tip"
+#: gajim/gtk/advanced_config.py:132
+msgid "?config:Type"
+msgstr ""
 
-#: gajim/gtk/advanced_config.py:168
-msgid "(None)"
-msgstr "(Hiçbiri)"
+#: gajim/gtk/advanced_config.py:187
+#, fuzzy
+msgid "?config description:None"
+msgstr "?Ask (for Subscription):Hiç biri"
 
-#: gajim/gtk/advanced_config.py:299
-msgid "Hidden"
-msgstr "Gizli"
+#: gajim/gtk/advanced_config.py:322
+#, fuzzy
+msgid "?password:Hidden"
+msgstr "Parola:"
 
 #: gajim/gtk/server_info.py:66
 msgid "Copy info to clipboard"
@@ -9891,8 +10133,8 @@ msgstr ""
 msgid "%(days)s days, %(hours)s hours"
 msgstr ""
 
-#: gajim/gtk/server_info.py:218 gajim/gtk/accounts.py:749
-#: gajim/gtk/accounts.py:853
+#: gajim/gtk/server_info.py:218 gajim/gtk/accounts.py:752
+#: gajim/gtk/accounts.py:856
 #, fuzzy
 msgid "Hostname"
 msgstr "_Bilgisayar adı:"
@@ -10076,11 +10318,6 @@ msgstr "Geçersiz Liste İsmi"
 msgid "You must enter a name to create a privacy list."
 msgstr ""
 
-#: gajim/gtk/groupchat_config.py:41
-#, fuzzy
-msgid "Group Chat Configuration"
-msgstr "Grup Sohbeti Daveti"
-
 #: gajim/gtk/groupchat_config.py:134
 #, fuzzy
 msgid "A Group Chat needs at least one Owner"
@@ -10091,69 +10328,69 @@ msgid "You are not allowed to modify the affiliation of Admins and Owners"
 msgstr ""
 
 #: gajim/gtk/groupchat_config.py:399
-msgid "An entry with this Jabber-ID already exists"
+msgid "An entry with this XMPP Address already exists"
 msgstr ""
 
-#: gajim/gtk/adhoc.py:91
+#: gajim/gtk/adhoc.py:92
 #, fuzzy
 msgid "Finish"
 msgstr "_Bitir"
 
-#: gajim/gtk/adhoc.py:97 gajim/gtk/adhoc.py:283
+#: gajim/gtk/adhoc.py:98 gajim/gtk/adhoc.py:284
 #, fuzzy
 msgid "Commands"
 msgstr "komut"
 
-#: gajim/gtk/adhoc.py:103
+#: gajim/gtk/adhoc.py:104
 msgid "Next"
 msgstr ""
 
-#: gajim/gtk/adhoc.py:109
+#: gajim/gtk/adhoc.py:110
 #, fuzzy
 msgid "Previous"
 msgstr "Kıskanç"
 
-#: gajim/gtk/adhoc.py:115
+#: gajim/gtk/adhoc.py:116
 #, fuzzy
 msgid "Execute"
 msgstr "Komuta _Yürüt"
 
-#: gajim/gtk/adhoc.py:195
+#: gajim/gtk/adhoc.py:196
 #, fuzzy
 msgid "No commands available"
 msgstr "Hiç bir hesap bulunmiyor"
 
-#: gajim/gtk/adhoc.py:244
+#: gajim/gtk/adhoc.py:245
 #, fuzzy
 msgid "Request Command List"
 msgstr "Komuta _Yürüt"
 
-#: gajim/gtk/adhoc.py:259
+#: gajim/gtk/adhoc.py:260
 #, fuzzy
 msgid "Executing…"
 msgstr "Komuta _Yürüt"
 
-#: gajim/gtk/adhoc.py:266
+#: gajim/gtk/adhoc.py:267
 #, fuzzy
 msgid "Command List"
 msgstr "Geçersiz Liste İsmi"
 
-#: gajim/gtk/adhoc.py:384
+#: gajim/gtk/adhoc.py:385
 #, fuzzy
 msgid "Finished"
 msgstr "_Bitir"
 
-#: gajim/gtk/adhoc.py:453
+#: gajim/gtk/adhoc.py:454
 #, fuzzy
 msgid "Execution failed"
 msgstr "Bağlantı Kurulamıyor"
 
-#: gajim/gtk/blocking.py:37
+#: gajim/gtk/blocking.py:38
 #, fuzzy, python-format
 msgid "Blocking List for %s"
 msgstr "Sohbet için Hazır"
 
-#: gajim/gtk/blocking.py:71
+#: gajim/gtk/blocking.py:72
 #, fuzzy
 msgid "Error!"
 msgstr "Hata"
@@ -10201,8 +10438,7 @@ msgstr "Geçersiz kullanıcı adı"
 msgid "You must provide a username to configure this account."
 msgstr ""
 
-#: gajim/gtk/account_wizard.py:252 gajim/gtk/bookmarks.py:290
-#: gajim/gtk/bookmarks.py:303
+#: gajim/gtk/account_wizard.py:252
 msgid "Invalid server"
 msgstr "Geçersiz sunucu"
 
@@ -10220,7 +10456,7 @@ msgstr "Geçersiz takma ad"
 msgid "Custom port must be a port number."
 msgstr "url portu bir sayı olmalı\n"
 
-#: gajim/gtk/account_wizard.py:405
+#: gajim/gtk/account_wizard.py:406
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -10230,17 +10466,17 @@ msgid ""
 "Do you still want to connect to this server?"
 msgstr ""
 
-#: gajim/gtk/account_wizard.py:446 gajim/gtk/account_wizard.py:480
+#: gajim/gtk/account_wizard.py:447 gajim/gtk/account_wizard.py:481
 #, 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:545
+#: gajim/gtk/account_wizard.py:546
 #, fuzzy
 msgid "Account name is in use"
 msgstr "Bu sohbet adı zaten kullanımda"
 
-#: gajim/gtk/account_wizard.py:546
+#: gajim/gtk/account_wizard.py:547
 msgid "You already have an account using this name."
 msgstr ""
 
@@ -10267,26 +10503,26 @@ msgstr "Bunu %s buna %s gönder"
 msgid "%(minutes)s min %(seconds)s sec"
 msgstr ""
 
-#: gajim/gtk/xml_console.py:77
+#: gajim/gtk/xml_console.py:74
 #, fuzzy
 msgid "Filter"
 msgstr "Filtre:"
 
-#: gajim/gtk/xml_console.py:82
+#: gajim/gtk/xml_console.py:79
 #, fuzzy
 msgid "XML Input"
 msgstr "ses girdisi"
 
-#: gajim/gtk/xml_console.py:86
+#: gajim/gtk/xml_console.py:83
 msgid "Paste Last Input"
 msgstr ""
 
-#: gajim/gtk/xml_console.py:170
+#: gajim/gtk/xml_console.py:167
 #, python-format
 msgid "Please make sure you are connected with '%s'."
 msgstr ""
 
-#: gajim/gtk/xml_console.py:182
+#: gajim/gtk/xml_console.py:177
 #, fuzzy
 msgid "Invalid Node"
 msgstr "Geçersiz Dosya"
@@ -10319,291 +10555,299 @@ msgstr "Ara"
 msgid "No results found"
 msgstr "<b>Telefon numara:</b>"
 
-#: gajim/gtk/preferences.py:358 gajim/gtk/preferences.py:362
+#: gajim/gtk/preferences.py:357 gajim/gtk/preferences.py:361
 msgid "Default"
 msgstr "Öntanımlı"
 
-#: gajim/gtk/preferences.py:801
+#: gajim/gtk/preferences.py:798
 #, fuzzy
 msgid "status message title"
 msgstr "Durum ileti değiştir"
 
-#: gajim/gtk/preferences.py:802
+#: gajim/gtk/preferences.py:799
 #, fuzzy
 msgid "status message text"
 msgstr "Durum ileti değiştir"
 
+#: gajim/gtk/accounts.py:137
+#, fuzzy
+msgid "Re-Login"
+msgstr "%(nick)s durumu şimdi %(status)s"
+
 #: gajim/gtk/accounts.py:138
 #, fuzzy
-msgid "Relogin now?"
+msgid "Re-Login now?"
 msgstr "%(nick)s durumu şimdi %(status)s"
 
 #: gajim/gtk/accounts.py:139
-msgid "If you want all the changes to apply instantly, you must relogin."
+msgid "To apply all changes instantly, you have to re-login."
+msgstr ""
+
+#: gajim/gtk/accounts.py:141
+msgid "_Later"
 msgstr ""
 
-#: gajim/gtk/accounts.py:191 gajim/gtk/accounts.py:975
+#: gajim/gtk/accounts.py:143
+msgid "_Re-Login"
+msgstr ""
+
+#: gajim/gtk/accounts.py:194 gajim/gtk/accounts.py:978
 #, fuzzy
 msgid "Remove Account"
 msgstr "XMPP hesabı %s@%s"
 
-#: gajim/gtk/accounts.py:192
+#: gajim/gtk/accounts.py:195
 #, fuzzy, python-format
 msgid "You still have open chats in your account %s"
 msgstr "Bir hesap seçmek zorundasınız."
 
-#: gajim/gtk/accounts.py:193
+#: gajim/gtk/accounts.py:196
 msgid ""
 "All chat and group chat windows will be closed.\n"
 "Do you want to continue?"
 msgstr ""
 
-#: gajim/gtk/accounts.py:424
+#: gajim/gtk/accounts.py:427
 #, fuzzy
 msgid "Back"
 msgstr "Geri Düğme"
 
-#: gajim/gtk/accounts.py:530
+#: gajim/gtk/accounts.py:533
 #, fuzzy
 msgid "Please check if Bonjour is installed."
 msgstr "Paket sisteminin kilitli olup olmadığını kontrol edin."
 
-#: gajim/gtk/accounts.py:532
+#: gajim/gtk/accounts.py:535
 #, fuzzy
 msgid "Please check if Avahi is installed."
 msgstr "Paket sisteminin kilitli olup olmadığını kontrol edin."
 
-#: gajim/gtk/accounts.py:569
+#: gajim/gtk/accounts.py:572
 #, fuzzy
 msgid "Disable Account"
 msgstr "XMPP hesabı %s@%s"
 
-#: gajim/gtk/accounts.py:570
+#: gajim/gtk/accounts.py:573
 #, fuzzy, python-format
 msgid "Account %s is still connected"
 msgstr "ping:  Bağlanılan sunucuya PING at."
 
-#: gajim/gtk/accounts.py:571
+#: gajim/gtk/accounts.py:574
 msgid ""
 "All chat and group chat windows will be closed. Do you want to continue?"
 msgstr ""
 
-#: gajim/gtk/accounts.py:576
+#: gajim/gtk/accounts.py:579
 #, fuzzy
 msgid "_Disable Account"
 msgstr "XMPP hesabı %s@%s"
 
-#: gajim/gtk/accounts.py:595
+#: gajim/gtk/accounts.py:598
 #, fuzzy
 msgid "Add Account"
 msgstr "Kişi _ekle"
 
-#: gajim/gtk/accounts.py:663
+#: gajim/gtk/accounts.py:666
 #, fuzzy
 msgid "Label"
 msgstr "etiket"
 
-#: gajim/gtk/accounts.py:667
+#: gajim/gtk/accounts.py:670
 msgid "Login"
 msgstr ""
 
-#: gajim/gtk/accounts.py:670
+#: gajim/gtk/accounts.py:673
 #, fuzzy
 msgid "Import Contacts"
 msgstr "Kişi Davet _Et"
 
-#: gajim/gtk/accounts.py:674 gajim/gtk/accounts.py:870
+#: gajim/gtk/accounts.py:677 gajim/gtk/accounts.py:873
 #, fuzzy
 msgid "Client Certificate"
 msgstr "%(nickname)s Girdi"
 
-#: gajim/gtk/accounts.py:677 gajim/gtk/accounts.py:774
+#: gajim/gtk/accounts.py:680 gajim/gtk/accounts.py:777
 #, fuzzy
 msgid "Connect on startup"
 msgstr "Gajim açılırken bağlan"
 
-#: gajim/gtk/accounts.py:681 gajim/gtk/accounts.py:779
+#: gajim/gtk/accounts.py:684 gajim/gtk/accounts.py:782
 #, fuzzy
 msgid "Save conversations for all contacts"
 msgstr "Her kişinin sohbet _kaydını kaydet"
 
-#: gajim/gtk/accounts.py:683 gajim/gtk/accounts.py:781
+#: gajim/gtk/accounts.py:686 gajim/gtk/accounts.py:784
 msgid "Store conversations on the harddrive"
 msgstr ""
 
-#: gajim/gtk/accounts.py:685 gajim/gtk/accounts.py:783
+#: gajim/gtk/accounts.py:688 gajim/gtk/accounts.py:786
 #, fuzzy
 msgid "Global Status"
 msgstr "Bütün durumlar"
 
-#: gajim/gtk/accounts.py:687
+#: gajim/gtk/accounts.py:690
 #, fuzzy
 msgid "Synchronise the status of all accounts"
 msgstr "Durum satırı okunamadı"
 
-#: gajim/gtk/accounts.py:689
+#: gajim/gtk/accounts.py:692
 msgid "Use file transfer proxies"
 msgstr "Dosya aktarım vekil sunucları kullan"
 
-#: gajim/gtk/accounts.py:705
+#: gajim/gtk/accounts.py:708
 #, fuzzy
 msgid "Idle Time"
 msgstr "Üye olduğu süre:"
 
-#: gajim/gtk/accounts.py:707
+#: gajim/gtk/accounts.py:710
 msgid "Disclose the time of your last activity"
 msgstr ""
 
-#: gajim/gtk/accounts.py:709
+#: gajim/gtk/accounts.py:712
 msgid "Local System Time"
 msgstr ""
 
-#: gajim/gtk/accounts.py:711
+#: gajim/gtk/accounts.py:714
 msgid "Disclose the local system time of the device Gajim runs on"
 msgstr ""
 
-#: gajim/gtk/accounts.py:714
+#: gajim/gtk/accounts.py:717
 #, fuzzy
 msgid "Client / Operating System"
 msgstr "%(nickname)s Girdi"
 
-#: gajim/gtk/accounts.py:716
+#: gajim/gtk/accounts.py:719
 msgid ""
 "Disclose informations about the client and operating system you currently use"
 msgstr ""
 
-#: gajim/gtk/accounts.py:719
+#: gajim/gtk/accounts.py:722
 #, fuzzy
 msgid "Ignore Unknown Contacts"
 msgstr "Kişi Davet _Et"
 
-#: gajim/gtk/accounts.py:721
+#: gajim/gtk/accounts.py:724
 msgid "Ignore everything from contacts not in your Roster"
 msgstr ""
 
-#: gajim/gtk/accounts.py:737 gajim/gtk/accounts.py:776
+#: gajim/gtk/accounts.py:740 gajim/gtk/accounts.py:779
 #, fuzzy
 msgid "Use environment variable"
 msgstr "sistemin HTTP vekil ayarları kullanılır"
 
-#: gajim/gtk/accounts.py:739
-#, fuzzy
-msgid "Proxy"
-msgstr "Prox_y:"
-
-#: gajim/gtk/accounts.py:742
+#: gajim/gtk/accounts.py:745
 #, fuzzy
 msgid "Warn on insecure connection"
 msgstr "Tehlikeli bağlantı kurmadan önce uyar"
 
-#: gajim/gtk/accounts.py:746
+#: gajim/gtk/accounts.py:749
 #, fuzzy
 msgid "Send keep-alive packets"
 msgstr "_Yaşamda kal paketleri gönder"
 
-#: gajim/gtk/accounts.py:750
+#: gajim/gtk/accounts.py:753
 msgid "Manually set the hostname for the server"
 msgstr ""
 
-#: gajim/gtk/accounts.py:756 gajim/gtk/accounts.py:826
-#: gajim/gtk/accounts.py:831
+#: gajim/gtk/accounts.py:759 gajim/gtk/accounts.py:829
+#: gajim/gtk/accounts.py:834
 #, fuzzy
 msgid "Priority"
 msgstr "Ön_celik:"
 
-#: gajim/gtk/accounts.py:785
+#: gajim/gtk/accounts.py:788
 #, fuzzy
 msgid "Synchronize the status of all accounts"
 msgstr "Durum satırı okunamadı"
 
-#: gajim/gtk/accounts.py:795
+#: gajim/gtk/accounts.py:798
 #, fuzzy
 msgid "First Name"
 msgstr "İlk Ad:"
 
-#: gajim/gtk/accounts.py:798
+#: gajim/gtk/accounts.py:801
 #, fuzzy
 msgid "Last Name"
 msgstr "Soy Ad:"
 
-#: gajim/gtk/accounts.py:804
+#: gajim/gtk/accounts.py:807
 #, fuzzy
 msgid "Email"
 msgstr "Yeni E-mail"
 
-#: gajim/gtk/accounts.py:822
+#: gajim/gtk/accounts.py:825
 #, fuzzy
 msgid "Adjust to status"
 msgstr "Durumu a_yarla"
 
-#: gajim/gtk/accounts.py:849
+#: gajim/gtk/accounts.py:852
 #, fuzzy
 msgid "Enable"
 msgstr "Etkin"
 
-#: gajim/gtk/accounts.py:857
+#: gajim/gtk/accounts.py:860
 #, fuzzy
 msgid "Port"
 msgstr "_Porta:"
 
-#: gajim/gtk/accounts.py:862
+#: gajim/gtk/accounts.py:865
 #, fuzzy
 msgid "Connection Settings"
 msgstr "Bağlantı"
 
-#: gajim/gtk/accounts.py:872
+#: gajim/gtk/accounts.py:875
 msgid "PKCS12 Files"
 msgstr ""
 
-#: gajim/gtk/accounts.py:874
+#: gajim/gtk/accounts.py:877
 #, fuzzy
 msgid "Encrypted Certificate"
 msgstr "sertifika hükümsüz kılınmış"
 
-#: gajim/gtk/accounts.py:878
+#: gajim/gtk/accounts.py:881
 #, fuzzy
 msgid "Certificate Settings"
 msgstr "sertifika hükümsüz kılınmış"
 
-#: gajim/gtk/accounts.py:890
+#: gajim/gtk/accounts.py:893
 #, fuzzy
 msgid "Save Password"
 msgstr "Parolayı Değiştir"
 
-#: gajim/gtk/accounts.py:898
+#: gajim/gtk/accounts.py:901
 #, fuzzy
 msgid "Login Settings"
 msgstr "Bağlantı Kurulamıyor"
 
-#: gajim/gtk/accounts.py:931
+#: gajim/gtk/accounts.py:934
 #, fuzzy, python-format
 msgid "Removing account %s"
 msgstr "XMPP hesabı %s@%s"
 
-#: gajim/gtk/accounts.py:946
+#: gajim/gtk/accounts.py:949
 #, fuzzy
 msgid "Account is disabled"
 msgstr "Dosya boş"
 
-#: gajim/gtk/accounts.py:947
+#: gajim/gtk/accounts.py:950
 msgid "To unregister from a server, the account must be enabled."
 msgstr ""
 
-#: gajim/gtk/accounts.py:962
+#: gajim/gtk/accounts.py:965
 #, fuzzy
 msgid "Password required"
 msgstr "Şifre gerekli"
 
-#: gajim/gtk/accounts.py:976
+#: gajim/gtk/accounts.py:979
 #, fuzzy, python-format
 msgid "Account '%s' is still connected to the server"
 msgstr "ping:  Bağlanılan sunucuya PING at."
 
-#: gajim/gtk/accounts.py:978
+#: gajim/gtk/accounts.py:981
 msgid "If you remove it, the connection will be lost."
 msgstr ""
 
-#: gajim/gtk/accounts.py:995
+#: gajim/gtk/accounts.py:998
 #, fuzzy, python-format
 msgid "Connection to server %s failed"
 msgstr ""
@@ -10611,17 +10855,17 @@ msgstr ""
 "\n"
 "Bekleyiniz lütfen..."
 
-#: gajim/gtk/accounts.py:996
+#: gajim/gtk/accounts.py:999
 #, fuzzy
 msgid "What would you like to do?"
 msgstr "Seni benim kişi listeye eklemek isterdim"
 
-#: gajim/gtk/accounts.py:997
+#: gajim/gtk/accounts.py:1000
 #, fuzzy
 msgid "Remove only from Gajim"
 msgstr "Gruptan kullanıcı çıkart:"
 
-#: gajim/gtk/accounts.py:998
+#: gajim/gtk/accounts.py:1001
 msgid "Don't remove anything. I'll try again later"
 msgstr ""
 
@@ -10644,6 +10888,10 @@ msgstr "Seni kişi listeme eklemek isterdim"
 msgid "Modify"
 msgstr "Düzenle"
 
+#: gajim/gtk/roster_item_exchange.py:80
+msgid "JID"
+msgstr "JID"
+
 #: gajim/gtk/roster_item_exchange.py:86
 msgid "Groups"
 msgstr "Gruplar"
@@ -10665,48 +10913,29 @@ msgid "Removed %d contact"
 msgid_plural "Removed %d contacts"
 msgstr[0] "Kişileri eşzamana getir"
 
-#: gajim/gtk/util.py:581
+#: gajim/gtk/util.py:583
 msgid "Unknown Artist"
 msgstr "Bilinmeyen Sanatçı"
 
-#: gajim/gtk/util.py:582
+#: gajim/gtk/util.py:584
 msgid "Unknown Title"
 msgstr "Bilinmeyen Parça"
 
-#: gajim/gtk/util.py:583
+#: gajim/gtk/util.py:585
 msgid "Unknown Source"
 msgstr "Bilinmeyen Kaynak"
 
-#: gajim/gtk/util.py:585
+#: gajim/gtk/util.py:587
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
 "from <i>%(source)s</i>"
 msgstr ""
 
-#: gajim/gtk/bookmarks.py:121
-#, fuzzy
-msgid "New Group Chat"
-msgstr "_Yeni Bir Grup Sohbeti"
-
-#: gajim/gtk/bookmarks.py:161
-msgid "This bookmark has invalid data"
-msgstr ""
-
-#: gajim/gtk/bookmarks.py:162
-msgid ""
-"Please be sure to fill out server and room fields or remove this bookmark."
-msgstr ""
-
-#: gajim/gtk/bookmarks.py:273 gajim/gtk/bookmarks.py:291
-#: gajim/gtk/bookmarks.py:304 gajim/gtk/bookmarks.py:335
-#, fuzzy
-msgid "Character not allowed"
-msgstr "Rahatsız etmeyin"
-
-#: gajim/gtk/bookmarks.py:334
-msgid "Invalid room"
-msgstr "Geçersiz oda"
+#: gajim/gtk/bookmarks.py:47
+#, fuzzy, python-format
+msgid "Bookmarks for %s"
+msgstr "_Yer imi"
 
 #: gajim/plugins/pluginmanager.py:736 gajim/plugins/pluginmanager.py:742
 msgid "Archive corrupted"
@@ -10718,51 +10947,54 @@ msgid "Archive empty"
 msgstr "Dosya boş"
 
 #: gajim/plugins/pluginmanager.py:750 gajim/plugins/pluginmanager.py:758
-#: gajim/plugins/gui.py:257
+#: gajim/plugins/gui.py:258
 #, fuzzy
 msgid "Archive is malformed"
 msgstr "Karalı servisin TXT verisi"
 
-#: gajim/plugins/pluginmanager.py:766 gajim/plugins/gui.py:281
-#: gajim/plugins/gui.py:289
+#: gajim/plugins/pluginmanager.py:766 gajim/plugins/gui.py:288
+#: gajim/plugins/gui.py:301
 #, fuzzy
 msgid "Plugin already exists"
 msgstr "Dosyası zaten var"
 
-#: gajim/plugins/gui.py:82
+#: gajim/plugins/gui.py:83
 msgid "Click to view Gajim's wiki page on how to install plugins in Flatpak."
 msgstr ""
 
-#: gajim/plugins/gui.py:89
+#: gajim/plugins/gui.py:90
 msgid "Plugin"
 msgstr ""
 
-#: gajim/plugins/gui.py:151
+#: gajim/plugins/gui.py:152
 #, fuzzy, python-format
 msgid "Warning: %s"
 msgstr "ben burdaysam"
 
-#: gajim/plugins/gui.py:206
+#: gajim/plugins/gui.py:207
 #, fuzzy
 msgid "Plugin failed"
 msgstr "Bağlantı Kurulamıyor"
 
-#: gajim/plugins/gui.py:245
+#: gajim/plugins/gui.py:246
 msgid "Unable to properly remove the plugin"
 msgstr ""
 
-#: gajim/plugins/gui.py:281
-msgid "Overwrite?"
-msgstr ""
+#: gajim/plugins/gui.py:287
+#, fuzzy
+msgid "Overwrite Plugin?"
+msgstr "Durum ileti değiştir"
+
+#: gajim/plugins/gui.py:289
+#, fuzzy
+msgid "Do you want to overwrite the currently installed version?"
+msgstr "%s grupu kişi listesinden silmek istiyor musun?"
 
 #: data/org.gajim.Gajim.desktop.in:5
-msgid "Jabber IM Client"
+#, fuzzy
+msgid "XMPP IM Client"
 msgstr "Jabber IM İstemcisi"
 
-#: data/org.gajim.Gajim.desktop.in:6
-msgid "A GTK+ Jabber client"
-msgstr "Bir GTK+ Jabber istemcisi"
-
 #: data/org.gajim.Gajim.desktop.in:8
 msgid "chat;messaging;im;xmpp;bonjour;voip;"
 msgstr ""
@@ -10814,7 +11046,7 @@ msgid "Easily send pictures, videos or other files to friends and groups"
 msgstr ""
 
 #: data/org.gajim.Gajim.appdata.xml.in:27
-msgid "Chat securely with End-to-End encryption via OMEMO or PGP"
+msgid "Chat securely with End-to-End encryption via OMEMO or OpenPGP"
 msgstr ""
 
 #: data/org.gajim.Gajim.appdata.xml.in:28
@@ -10875,7 +11107,7 @@ msgstr ""
 
 #: data/org.gajim.Gajim.appdata.xml.in:52
 #, fuzzy
-msgid "Roster, list of contacts"
+msgid "Contact list, list of contacts"
 msgstr "Tüm _durum değişikliklerini sistem günlüğüne kaydet"
 
 #: data/org.gajim.Gajim.appdata.xml.in:56
@@ -10897,6 +11129,450 @@ msgstr "Son Kullanılan:"
 msgid "Plugin manager"
 msgstr "Bağlantı Kurulamıyor"
 
+#, fuzzy
+#~ msgid "Configure Services…"
+#~ msgstr "Çevrimiçi Servisler"
+
+#, fuzzy
+#~ msgid "Group Chat Bookmarks"
+#~ msgstr "Grup Sohbetler"
+
+#, fuzzy
+#~ msgid "Add Bookmark"
+#~ msgstr "_Yer imi"
+
+#, fuzzy
+#~ msgid "Remove Bookmark"
+#~ msgstr "_Yer imi"
+
+#, fuzzy
+#~ msgid "Bookmark Name"
+#~ msgstr "Bu odayi yer imle"
+
+#, fuzzy
+#~ msgid "_Server"
+#~ msgstr "_Sunuc:"
+
+#, fuzzy
+#~ msgid "_Password"
+#~ msgstr "_Parola:"
+
+#, fuzzy
+#~ msgid "Join chat when connected"
+#~ msgstr "Kişinin bağlantısı kesildi"
+
+#, fuzzy
+#~ msgid "New Group Chat"
+#~ msgstr "_Yeni Bir Grup Sohbeti"
+
+#, fuzzy
+#~ msgid "Character not allowed"
+#~ msgstr "Rahatsız etmeyin"
+
+#, fuzzy
+#~ msgid "Invalid Group Chat"
+#~ msgstr "Geçersiz grup sohbet Jabber kimliği"
+
+#~ msgid "Unable to join group chat"
+#~ msgstr "Grup sohbetine girilemiyor"
+
+#, fuzzy
+#~ msgid "You are banned from group chat <b>%s</b>."
+#~ msgstr ""
+#~ "Şuraya bir yorum gönderiyorsunuz:\n"
+#~ "  "
+
+#, fuzzy
+#~ msgid "Remote server <b>%s</b> does not exist."
+#~ msgstr "grup %s yok - root kullanılacak\n"
+
+#, fuzzy
+#~ msgid "Group chat <b>%s</b> does not exist."
+#~ msgstr "grup %s yok - root kullanılacak\n"
+
+#, fuzzy
+#~ msgid "Group chat creation is not permitted."
+#~ msgstr "grup %s yok - root kullanılacak\n"
+
+#, fuzzy
+#~ msgid "You are not in the members list in group chat %s."
+#~ msgstr "[%s sayfasını okuyamazsınız.]"
+
+#, fuzzy
+#~ msgid "XMPP Address is not a group chat"
+#~ msgstr "%s mevcut bir grubun ismi değil"
+
+#, fuzzy
+#~ msgid "This is not a group chat"
+#~ msgstr "%s mevcut bir grubun ismi değil"
+
+#, fuzzy
+#~ msgid "Please choose a group chat"
+#~ msgstr "Yeni posta yarat"
+
+#~ msgid "Invalid Nickname"
+#~ msgstr "Geçersiz Takma ad"
+
+#, fuzzy
+#~ msgid "Please choose a nickname"
+#~ msgstr "Yeni posta yarat"
+
+#, fuzzy
+#~ msgid "Wrong server"
+#~ msgstr "Adres yanlış"
+
+#, fuzzy
+#~ msgid "%s is not a group chat server"
+#~ msgstr "%s mevcut bir grubun ismi değil"
+
+#, fuzzy
+#~ msgid "Not in Roster"
+#~ msgstr "Kişi listesindeki olayları göster"
+
+#, fuzzy
+#~ msgid "I would like to add you to my roster"
+#~ msgstr "Seni benim kişi listeye eklemek isterdim"
+
+#, fuzzy
+#~ msgid "Add to Roster"
+#~ msgstr "Kişi listeye _ekle…"
+
+#, fuzzy
+#~ msgid "Audio Session"
+#~ msgstr "Ses testi"
+
+#, fuzzy
+#~ msgid "Video Session"
+#~ msgstr "Video testi"
+
+#, fuzzy
+#~ msgid "Manage Room"
+#~ msgstr "Yer imlerini işlet"
+
+#, fuzzy
+#~ msgid "Configure Room"
+#~ msgstr "Çevrimiçi Servisler"
+
+#, fuzzy
+#~ msgid "Change Nick"
+#~ msgstr "Takma Ad Ayarla"
+
+#, fuzzy
+#~ msgid "Disconnect"
+#~ msgstr "Bağlantıyı _kes"
+
+#, fuzzy
+#~ msgid "Copy JID"
+#~ msgstr "Oda JID"
+
+#, fuzzy
+#~ msgid "Add to Roster…"
+#~ msgstr "Kişi listeye _ekle…"
+
+#, fuzzy
+#~ msgid "Copy JID/Email"
+#~ msgstr "Oda JID"
+
+#, fuzzy
+#~ msgid "JID: <i>%s</i>"
+#~ msgstr "Jabber kimliği: <i>%s</i>"
+
+#~ msgid "Changing Subject"
+#~ msgstr "Konuk Değiştiriliyor"
+
+#, fuzzy
+#~ msgid "Please specify the new subject:"
+#~ msgstr "Lütfen kendiniz için yeni bir takma ad belirtin."
+
+#, fuzzy
+#~ msgid "You (%s) joined the room"
+#~ msgstr "%s grup sohbete katıldı"
+
+#, fuzzy
+#~ msgid "Room logging is enabled"
+#~ msgstr "Konumlaştırma kapalıdır."
+
+#, fuzzy
+#~ msgid "Unable to join groupchat"
+#~ msgstr "Grup eklenemedi: grup zaten var"
+
+#~ msgid "Groupchat Invitation"
+#~ msgstr "Grup Sohbeti Daveti"
+
+#, fuzzy
+#~ msgid "JID is not a Groupchat"
+#~ msgstr "%s mevcut bir grubun ismi değil"
+
+#, fuzzy
+#~ msgid "Invalid JID"
+#~ msgstr "Yerel jid:"
+
+#, fuzzy
+#~ msgid "A connection is not available"
+#~ msgstr "Bir bağlantı kullanılabilir değil"
+
+#, fuzzy
+#~ msgid "JID already in list"
+#~ msgstr "Jabber kimliği zaten listede"
+
+#, fuzzy
+#~ msgid "For the chosen encryption there is no encryption method available"
+#~ msgstr "Bir bağlantı kullanılabilir değil"
+
+#~ msgid "Removes contact from roster"
+#~ msgstr "Kişiyi listeden sil"
+
+#, fuzzy
+#~ msgid "Not in roster"
+#~ msgstr "Kişi listesindeki olayları göster"
+
+#, fuzzy
+#~ msgid "File transfer request notification color."
+#~ msgstr "Dosya Gönderme Soru"
+
+#, fuzzy
+#~ msgid "File transfer error notification color."
+#~ msgstr "Dosya Gönderme Tamamlandı"
+
+#, fuzzy
+#~ msgid "File transfer complete or stopped notification color."
+#~ msgstr "Dosya Gönderme Tamamlandı"
+
+#, fuzzy
+#~ msgid "Groupchat invitation notification color"
+#~ msgstr "Sadece davetliler"
+
+#~ msgid "Add * and [n] in roster title?"
+#~ msgstr "* ile [n] kişi listeye eklensin mi?"
+
+#, fuzzy
+#~ msgid "Answer to receipt requests"
+#~ msgstr "matematik probleminin yanıtını yaz"
+
+#, fuzzy
+#~ msgid "Sent receipt requests"
+#~ msgstr "     İsteklerin gideceği adres: %(requestaddr)s"
+
+#~ msgid "I'm eating, so leave me a message."
+#~ msgstr "Yemek yiyorum, bu yüzden bana bir mesaj brak."
+
+#, fuzzy
+#~ msgid "from room %s"
+#~ msgstr " gönderen oda %s"
+
+#, fuzzy
+#~ msgid "Leave Groupchats"
+#~ msgstr "Tam-Ekrandan Çık"
+
+#, fuzzy
+#~ msgid "Auto Join"
+#~ msgstr "Kendiliğinden Katıl"
+
+#, fuzzy
+#~ msgid "Room"
+#~ msgstr "Oda:"
+
+#~ msgid "Jabber ID:"
+#~ msgstr "Jabber kimliği:"
+
+#, fuzzy
+#~ msgid "Occupant Actions"
+#~ msgstr "Özel Eylemler"
+
+#, fuzzy
+#~ msgid "_Add to Roster"
+#~ msgstr "Kişi listeye _ekle…"
+
+#, fuzzy
+#~ msgid "_Manage Room"
+#~ msgstr "Yer imlerini işlet"
+
+#, fuzzy
+#~ msgid "Configure _Room..."
+#~ msgstr "Çevrimiçi Servisler"
+
+#~ msgid "Jabber ID"
+#~ msgstr "Jabber kimliği"
+
+#, fuzzy
+#~ msgid "account"
+#~ msgstr "Hesap"
+
+#, fuzzy
+#~ msgid "Roster"
+#~ msgstr "Kişi Listesini Göster"
+
+#, fuzzy
+#~ msgid "Show only in roster"
+#~ msgstr "Kişi listesindeki olayları göster"
+
+#, fuzzy
+#~ msgid "in _roster"
+#~ msgstr "Kişi listesindeki olayları göster"
+
+#, fuzzy
+#~ msgid "Roster Appearance"
+#~ msgstr "<b>Kişi Listesi Görünümü</b>"
+
+#, fuzzy
+#~ msgid "Show chatstate in roster"
+#~ msgstr "Kişi listesindeki olayları göster"
+
+#~ msgid "_Add to Roster..."
+#~ msgstr "Kişi listeye _ekle…"
+
+#~ msgid "_Jabber ID:"
+#~ msgstr "_Jabber kimliği:"
+
+#, fuzzy
+#~ msgid "_Jabber ID"
+#~ msgstr "_Jabber kimliği:"
+
+#~ msgid "JabberID"
+#~ msgstr "Jabber kimliği"
+
+#, fuzzy
+#~ msgid "Show Roster"
+#~ msgstr "Kişi Listesini Göster"
+
+#~ msgid "MUC server"
+#~ msgstr "MUC sunucusu"
+
+#~ msgid "Room Configuration"
+#~ msgstr "Oda Yerleştirme"
+
+#, fuzzy
+#~ msgid "Join _Group Chat"
+#~ msgstr "Grup Sohbete Katıl"
+
+#, fuzzy
+#~ msgid "Audio sessions are not available"
+#~ msgstr "Klasör \"%s\" yazılabilir değil"
+
+#~ msgid "Conference"
+#~ msgstr "Konferans"
+
+#, fuzzy
+#~ msgid "_Manage Bookmarks…"
+#~ msgstr "Yer imlerini işlet"
+
+#, fuzzy
+#~ msgid "Hide _Roster"
+#~ msgstr "<b>Kişi Listesi Görünümü</b>"
+
+#~ msgid "Show _Roster"
+#~ msgstr "Kişi Listesini Göster"
+
+#, fuzzy
+#~ msgid "Invalid Room"
+#~ msgstr "Geçersiz oda"
+
+#~ msgid "Invalid room"
+#~ msgstr "Geçersiz oda"
+
+#~ msgid "A GTK+ Jabber client"
+#~ msgstr "Bir GTK+ Jabber istemcisi"
+
+#~ msgid "Changing Nickname"
+#~ msgstr "Takma Ad Ayarla"
+
+#~ msgid "Bookmark already set"
+#~ msgstr "Yer imi zaten kuruldu"
+
+#~ msgid "Bookmark has been added successfully"
+#~ msgstr "Yer imi başarılı eklendi"
+
+#, fuzzy
+#~ msgid "The nickname contains invalid characters."
+#~ msgstr "%s: Kontrol karakterleri kullanılamaz.\n"
+
+#, fuzzy
+#~ msgid "Bookmark Room"
+#~ msgstr "Bu odayi yer imle"
+
+#~ msgid "_Join New Group Chat"
+#~ msgstr "Yeni grup sohbete _katıl"
+
+#, fuzzy
+#~ msgid "_Create Group Chat"
+#~ msgstr "Tam-Ekrandan Çık"
+
+#, fuzzy
+#~ msgid "Name:"
+#~ msgstr "İsim: "
+
+#, fuzzy
+#~ msgid "Description:"
+#~ msgstr "Açıklama: "
+
+#, fuzzy
+#~ msgid "Address:"
+#~ msgstr "_Adres:"
+
+#, fuzzy
+#~ msgid "You can not start a new conversation unless you are connected."
+#~ msgstr ""
+#~ "İleti gönderilmemiş olabilir çünkü görünmez iken yollamaya izin "
+#~ "verilmiyor:"
+
+#, fuzzy
+#~ msgid "Occupants"
+#~ msgstr "Özel Eylemler"
+
+#, fuzzy
+#~ msgid "File transfer error"
+#~ msgstr "Dosya Gönderim Hatası"
+
+#, fuzzy
+#~ msgid "No Accounts available"
+#~ msgstr "Hiç bir hesap bulunmiyor"
+
+#, fuzzy
+#~ msgid "Boolean"
+#~ msgstr "Mantıksal Değer"
+
+#, fuzzy
+#~ msgid "Integer"
+#~ msgstr "Tamsayı"
+
+#~ msgid "Text"
+#~ msgstr "Metin"
+
+#~ msgid "Value"
+#~ msgstr "Değer"
+
+#~ msgid "Type"
+#~ msgstr "Tip"
+
+#~ msgid "(None)"
+#~ msgstr "(Hiçbiri)"
+
+#~ msgid "Hidden"
+#~ msgstr "Gizli"
+
+#~ msgid "Manage Proxy Profiles"
+#~ msgstr "Vekil Sunuc Profili İşlet"
+
+#, fuzzy
+#~ msgid "Properties"
+#~ msgstr "<b>Ayarları</b>"
+
+#, fuzzy
+#~ msgid "Proxy _Host"
+#~ msgstr "Vekil _Makine:"
+
+#, fuzzy
+#~ msgid "Proxy _Port"
+#~ msgstr "Vekil _Portası:"
+
+#, fuzzy
+#~ msgid "New Groupchat"
+#~ msgstr "_Yeni Bir Grup Sohbeti"
+
+#, fuzzy
+#~ msgid "New Contact"
+#~ msgstr "Yeni Kişi Ekle"
+
 #~ msgid "%s GiB"
 #~ msgstr "%s GiB"
 
@@ -10951,9 +11627,6 @@ msgstr "Bağlantı Kurulamıyor"
 #~ msgid "_Pause"
 #~ msgstr "_Durakla"
 
-#~ msgid "Clean _up"
-#~ msgstr "Temizle"
-
 #~ msgid "Remove file transfer from the list."
 #~ msgstr "Dosya aktarımları listeden sil."
 
@@ -11238,10 +11911,6 @@ msgstr "Bağlantı Kurulamıyor"
 #~ "  "
 
 #, fuzzy
-#~ msgid "Do you want to accept the invitation?"
-#~ msgstr "%s grupu kişi listesinden silmek istiyor musun?"
-
-#, fuzzy
 #~ msgid "_Start Chat"
 #~ msgstr "Sohbet _Başla"
 
@@ -11269,10 +11938,6 @@ msgstr "Bağlantı Kurulamıyor"
 #~ msgid "Do you wish to delete all correspondence with the selected contacts?"
 #~ msgstr "Seçilen anahtarları gerçekten silmek istiyor musunuz? "
 
-#, fuzzy
-#~ msgid "This can not be undone."
-#~ msgstr "Paket bulunamadı"
-
 #~ msgid "<b>What do you want to do?</b>"
 #~ msgstr "<b>Ne yapmak istiyorsun?</b>"
 
@@ -11602,10 +12267,6 @@ msgstr "Bağlantı Kurulamıyor"
 #~ msgstr "_Durum ileti:"
 
 #, fuzzy
-#~ msgid "Group chat highlight"
-#~ msgstr "%s grup sohbete katıldı"
-
-#, fuzzy
 #~ msgid "Your nickname"
 #~ msgstr "Senin takma adın:"
 
@@ -11744,9 +12405,6 @@ msgstr "Bağlantı Kurulamıyor"
 #~ msgid "Invalid password"
 #~ msgstr "Parolayı Değiştir"
 
-#~ msgid "Enter new password:"
-#~ msgstr "Yeni parola girin: "
-
 #~ msgid "Enter it again for confirmation:"
 #~ msgstr "Olaylamak için bir daha tuşla:"
 
@@ -11754,10 +12412,6 @@ msgstr "Bağlantı Kurulamıyor"
 #~ msgstr "%s tarafından abonelikten çıkma isteği"
 
 #, fuzzy
-#~ msgid "Autojoin"
-#~ msgstr "Kendiliğinden Katıl"
-
-#, fuzzy
 #~ msgid "Homepage:"
 #~ msgstr "<b>Ana Sayfa:</b>"
 
@@ -11838,9 +12492,6 @@ msgstr "Bağlantı Kurulamıyor"
 #~ msgid "Forward unread message then disconnect"
 #~ msgstr "Okunmamış iletler var"
 
-#~ msgid "AIM Address:"
-#~ msgstr "AIM Adres:"
-
 #~ msgid "MSN Address:"
 #~ msgstr "MSN Adres:"
 
@@ -11861,10 +12512,6 @@ msgstr "Bağlantı Kurulamıyor"
 #~ msgstr "Kullanıcı vazgeçti"
 
 #, fuzzy
-#~ msgid "This session WILL NOT be archived on server"
-#~ msgstr "%s: OID (-o) 0 olamaz\n"
-
-#, fuzzy
 #~ msgid "This session is encrypted"
 #~ msgstr "      --ssl         ssl ile şifrelenmiş oturumu etkinleştir\n"
 
@@ -11999,10 +12646,6 @@ msgstr "Bağlantı Kurulamıyor"
 #~ msgstr "Sohbet _Başla"
 
 #, fuzzy
-#~ msgid "The group chat JID contains invalid characters."
-#~ msgstr "%s: Kontrol karakterleri kullanılamaz.\n"
-
-#, fuzzy
 #~ msgid "Start Chat with account %s"
 #~ msgstr "Kişiyle sohbet pencere _aç"
 
@@ -12054,9 +12697,6 @@ msgstr "Bağlantı Kurulamıyor"
 #~ msgid "Server:"
 #~ msgstr "Sunuc:"
 
-#~ msgid "Password:"
-#~ msgstr "Parola:"
-
 #~ msgid "Bro_wse Rooms"
 #~ msgstr "Odalara Göz At"
 
@@ -12096,9 +12736,6 @@ msgstr "Bağlantı Kurulamıyor"
 #~ msgid "Show the contact's profile (Ctrl+I)"
 #~ msgstr "Kişiyi listeye ekle"
 
-#~ msgid "Hide all buttons in chat windows"
-#~ msgstr "Konuşma penceresinde tüm düğmeleri gizle"
-
 #, fuzzy
 #~ msgid "Disk Write Error"
 #~ msgstr "<b>Bir hata oluştu:</b>"
@@ -12172,9 +12809,6 @@ msgstr "Bağlantı Kurulamıyor"
 #~ msgid "Resour_ce:"
 #~ msgstr "Kay_nak:"
 
-#~ msgid "Priority will change automatically according to your status."
-#~ msgstr "Durumuna göre öncelik kendilinden değişir."
-
 #~ msgid "Anonymous authentication"
 #~ msgstr "Kimliksiz kimlik doğrulaması"
 
@@ -12282,9 +12916,6 @@ msgstr "Bağlantı Kurulamıyor"
 #~ msgid "_Edit Personal Information..."
 #~ msgstr "Kişisel ilanlar sayfayı yazımla"
 
-#~ msgid "Information about you, as stored in the server"
-#~ msgstr "Senin kişimsel informationun, nasıl sunucdaysa"
-
 #~ msgid "<b>Personal Information</b>"
 #~ msgstr "<b>Kişisel ilanlar sayfası</b>"
 
@@ -12344,10 +12975,6 @@ msgstr "Bağlantı Kurulamıyor"
 #~ msgid "Your server can't save your personal information."
 #~ msgstr "Sunuc kişisel ilanlar sayfayı kaydet edemedi"
 
-#, fuzzy
-#~ msgid "Account Local already exists."
-#~ msgstr "Dosyası zaten var"
-
 #~ msgid "THANKS:"
 #~ msgstr "Teşekkürler:"
 
@@ -12436,10 +13063,6 @@ msgstr "Bağlantı Kurulamıyor"
 #~ "%s@%s:%d iletisinin uzunluğu beklendiği kadar değil (gerçekte %d != "
 #~ "beklenen %d)\n"
 
-#, fuzzy
-#~ msgid "Encryption used for this contact."
-#~ msgstr "Bu dizin için seçici erişim etkinleştirilmemiş"
-
 #~ msgid "Toggle Open_PGP Encryption"
 #~ msgstr "Open_PGP şifrelemeyi değiştir"
 
@@ -12488,10 +13111,6 @@ msgstr "Bağlantı Kurulamıyor"
 #~ msgstr "Yeni Kişi Ekle"
 
 #, fuzzy
-#~ msgid "Verify again…"
-#~ msgstr "Tekrar dene ? [e/H] "
-
-#, fuzzy
 #~ msgid "Contact's identity NOT verified"
 #~ msgstr "Passport hesabı henüz doğrulanmadı"
 
@@ -12637,10 +13256,6 @@ msgstr "Bağlantı Kurulamıyor"
 #~ msgid "creating %s directory"
 #~ msgstr "Klasör \"%s\" yazılabilir değil"
 
-#, fuzzy
-#~ msgid "%s is not the name of a group chat."
-#~ msgstr "%s mevcut bir grubun ismi değil"
-
 #~ msgid "Session Management"
 #~ msgstr "Oturum Yönetimi"
 
@@ -12688,14 +13303,6 @@ msgstr "Bağlantı Kurulamıyor"
 #~ msgstr "Etkinlik:"
 
 #, fuzzy
-#~ msgid "Join _Group Chat..."
-#~ msgstr "Grup Sohbete Katıl"
-
-#, fuzzy
-#~ msgid "_Modify Account"
-#~ msgstr "%s hesaptan"
-
-#, fuzzy
 #~ msgid "Execute Command..."
 #~ msgstr "<b>Yürütecek komutayı seç</b>"
 
diff --git a/po/uk.po b/po/uk.po
index 1d0ba86a9..f0b04fac7 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: 2019-07-02 02:06+0000\n"
+"POT-Creation-Date: 2019-08-11 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,72 +19,71 @@ msgstr ""
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Generator: Lokalize 1.5\n"
 
-#: gajim/chat_control_base.py:550
+#: gajim/chat_control_base.py:557
 msgid "_Undo"
 msgstr "_Скасувати"
 
-#: gajim/chat_control_base.py:558 gajim/conversation_textview.py:529
+#: gajim/chat_control_base.py:565 gajim/conversation_textview.py:529
 msgid "_Clear"
 msgstr "_Очистити"
 
-#: gajim/chat_control_base.py:563
+#: gajim/chat_control_base.py:570
 msgid "Paste as quote"
 msgstr ""
 
-#: gajim/chat_control_base.py:613
+#: gajim/chat_control_base.py:620
 #, fuzzy
 msgid "Paste Image"
 msgstr "Вибрати зображення"
 
-#: gajim/chat_control_base.py:614
+#: gajim/chat_control_base.py:621
 #, fuzzy
 msgid "You are trying to paste an image"
 msgstr "Ви збираєтесь закрити кілька вкладок"
 
-#: gajim/chat_control_base.py:615
-#, fuzzy
+#: gajim/chat_control_base.py:622
 msgid ""
 "Are you sure you want to paste your clipboard's image into the chat window?"
-msgstr "Ви справді бажаєте полишити групову балачку «%s»?"
+msgstr ""
+"Ви справді бажаєте вставити зображення з буфера обміну до вікна балачки?"
 
-#: gajim/chat_control_base.py:617 gajim/groupchat_control.py:2310
-#: gajim/roster_window.py:2848 gajim/roster_window.py:4167
-#: gajim/message_window.py:252 gajim/gtk/dialogs.py:418
+#: gajim/chat_control_base.py:624 gajim/groupchat_control.py:2218
+#: gajim/roster_window.py:2841 gajim/roster_window.py:4118
+#: gajim/message_window.py:359 gajim/gtk/dialogs.py:330
 msgid "_Do not ask me again"
 msgstr "Більше _не питати мене"
 
-#: gajim/chat_control_base.py:620
+#: gajim/chat_control_base.py:627
 msgid "_Paste"
 msgstr ""
 
-#: gajim/chat_control_base.py:1162 gajim/gtk/accounts.py:351
+#: gajim/chat_control_base.py:1169 gajim/gtk/accounts.py:354
 #, fuzzy
 msgid "Privacy"
 msgstr "Список конфіденційності"
 
-#: gajim/chat_control_base.py:1163
-#, fuzzy
+#: gajim/chat_control_base.py:1170
 msgid "Warning"
-msgstr "Попередження: %s"
+msgstr "Попередження"
 
-#: gajim/chat_control_base.py:1164
-#, fuzzy, python-format
+#: gajim/chat_control_base.py:1171
+#, python-format
 msgid "If you send a file to <b>%s</b>, your real JID will be revealed."
 msgstr ""
-"Якщо ви надішлете файл %s, він або вона дізнаються про ваш справжній "
+"Якщо ви надішлете файл — <b>%s</b> дізнається про ваш справжній "
 "ідентифікатор Jabber."
 
-#: gajim/chat_control_base.py:1169
+#: gajim/chat_control_base.py:1176
 #, fuzzy
 msgid "Continue"
 msgstr "_Продовжити"
 
-#: gajim/gtkgui_helpers.py:163 gajim/gtk/filetransfer.py:393
+#: gajim/gtkgui_helpers.py:163 gajim/gtk/filetransfer.py:398
 #, fuzzy, python-format
 msgid "Cannot overwrite existing file '%s'"
 msgstr "Не вдалося перезаписати існуючий файл «%s»"
 
-#: gajim/gtkgui_helpers.py:164 gajim/gtk/filetransfer.py:394
+#: gajim/gtkgui_helpers.py:164 gajim/gtk/filetransfer.py:399
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
@@ -92,22 +91,21 @@ msgstr ""
 "Файл з такою назвою вже існує, у вас немає дозволів для його перезапису."
 
 #: gajim/gtkgui_helpers.py:196
-#, fuzzy
 msgid "Error While Saving"
-msgstr "Помилка під час додавання служби. %s"
+msgstr "Помилка при збереженні"
 
 #: gajim/gtkgui_helpers.py:197
 msgid "Extension not supported"
 msgstr "Додаток не підтримується"
 
 #: gajim/gtkgui_helpers.py:198
-#, fuzzy, python-format
+#, python-format
 msgid ""
 "Image cannot be saved in %(type)s format.\n"
 "Save as %(new_filename)s?"
 msgstr ""
-"Зображення не може бути збережено у форматі %(type)s. Зберегти як "
-"%(new_filename)s?"
+"Зображення не може бути збережено у форматі %(type)s.\n"
+"Зберегти як %(new_filename)s?"
 
 #: gajim/gtkgui_helpers.py:204
 #, fuzzy
@@ -179,219 +177,217 @@ msgstr "У черзі немає запитів на підписку."
 msgid " resource with priority "
 msgstr " пріоритетний ресурс"
 
-#: gajim/gui_menu_builder.py:96
-msgid "_New Group Chat"
-msgstr "_Створити групову балачку"
+#: gajim/gui_menu_builder.py:251 gajim/gui_menu_builder.py:342
+#: gajim/chat_control.py:305 gajim/roster_window.py:783
+#: gajim/roster_window.py:1716 gajim/roster_window.py:1718
+#: gajim/roster_window.py:2027 gajim/roster_window.py:3292
+#: gajim/roster_window.py:3325 gajim/gui_interface.py:396
+#: gajim/common/contacts.py:222 gajim/common/contacts.py:359
+#: gajim/common/contacts.py:471 gajim/common/helpers.py:86
+#: gajim/common/helpers.py:317 gajim/gtk/add_contact.py:319
+#: gajim/gtk/subscription_request.py:70 gajim/gtk/subscription_request.py:99
+#: gajim/gtk/roster_item_exchange.py:112
+#, fuzzy
+msgid "Not in contact list"
+msgstr "Показувати _від’єднані контакти"
+
+#: gajim/gui_menu_builder.py:355
+#, fuzzy
+msgid "I would like to add you to my contact list"
+msgstr "Я хочу додати вас до мого списку контактів."
 
-#: gajim/gui_menu_builder.py:289 gajim/gui_menu_builder.py:380
-#: gajim/chat_control.py:303 gajim/roster_window.py:786
-#: gajim/roster_window.py:1719 gajim/roster_window.py:1721
-#: gajim/roster_window.py:2030 gajim/roster_window.py:3336
-#: gajim/roster_window.py:3369 gajim/gui_interface.py:413
-#: gajim/common/contacts.py:206 gajim/common/contacts.py:343
-#: gajim/common/helpers.py:83 gajim/common/helpers.py:311
-#: gajim/gtk/add_contact.py:319 gajim/gtk/subscription_request.py:70
-#: gajim/gtk/subscription_request.py:99 gajim/gtk/roster_item_exchange.py:112
-msgid "Not in Roster"
-msgstr "Немає у реєстрі"
-
-#: gajim/gui_menu_builder.py:393
-msgid "I would like to add you to my roster"
-msgstr "Я хочу додати вас до свого реєстру"
-
-#: gajim/gui_menu_builder.py:471
+#: gajim/gui_menu_builder.py:433
 msgid "Send Single _Message…"
 msgstr "Надіслати окреме _повідомлення"
 
-#: gajim/gui_menu_builder.py:486
+#: gajim/gui_menu_builder.py:448
 #, fuzzy
 msgid "E_xecute Command…"
 msgstr "Ви_конати команду"
 
-#: gajim/gui_menu_builder.py:494
+#: gajim/gui_menu_builder.py:456
 msgid "_Manage Transport"
 msgstr "_Керування транспортом"
 
-#: gajim/gui_menu_builder.py:500
+#: gajim/gui_menu_builder.py:462
 msgid "_Modify Transport"
 msgstr "_Змінити транспорт"
 
-#: gajim/gui_menu_builder.py:507 gajim/roster_window.py:5046
+#: gajim/gui_menu_builder.py:469 gajim/roster_window.py:4985
 #, fuzzy
 msgid "_Rename…"
 msgstr "Пере_йменувати"
 
-#: gajim/gui_menu_builder.py:518 gajim/roster_window.py:5062
-#: gajim/roster_window.py:5177 gajim/data/gui/blocked_contacts_window.ui:52
+#: gajim/gui_menu_builder.py:480 gajim/roster_window.py:5001
+#: gajim/roster_window.py:5116 gajim/data/gui/blocked_contacts_window.ui:52
 #: gajim/data/gui/gc_occupants_menu.ui:148
 #: gajim/data/gui/contact_context_menu.ui:143
 msgid "_Unblock"
 msgstr "_Розблокувати"
 
-#: gajim/gui_menu_builder.py:521 gajim/roster_window.py:5067
-#: gajim/roster_window.py:5181 gajim/data/gui/gc_occupants_menu.ui:140
+#: gajim/gui_menu_builder.py:483 gajim/roster_window.py:5006
+#: gajim/roster_window.py:5120 gajim/data/gui/gc_occupants_menu.ui:140
 #: gajim/data/gui/contact_context_menu.ui:151
 msgid "_Block"
 msgstr "_Заблокувати"
 
-#: gajim/gui_menu_builder.py:529 gajim/roster_window.py:5074
+#: gajim/gui_menu_builder.py:491 gajim/roster_window.py:5013
 #: gajim/data/gui/contact_context_menu.ui:181
 msgid "Remo_ve"
 msgstr "В_илучити"
 
-#: gajim/gui_menu_builder.py:539 gajim/data/gui/contact_context_menu.ui:198
+#: gajim/gui_menu_builder.py:501 gajim/data/gui/contact_context_menu.ui:198
 msgid "_Information"
 msgstr "_Інформація"
 
-#: gajim/gui_menu_builder.py:552
+#: gajim/gui_menu_builder.py:514
 msgid "Save _As"
 msgstr "Зберегти _як"
 
-#: gajim/gui_menu_builder.py:564 gajim/groupchat_control.py:501
-#: gajim/chat_control.py:340
+#: gajim/gui_menu_builder.py:526 gajim/groupchat_control.py:507
+#: gajim/chat_control.py:342
 msgid "Send File…"
 msgstr "Надіслати файл…"
 
-#: gajim/gui_menu_builder.py:565
+#: gajim/gui_menu_builder.py:527
 #, fuzzy
 msgid "Upload File…"
 msgstr "Зберегти файл як..."
 
-#: gajim/gui_menu_builder.py:566
+#: gajim/gui_menu_builder.py:528
 #, fuzzy
 msgid "Send File Directly…"
 msgstr "Зберегти файл як..."
 
-#: gajim/gui_menu_builder.py:568 gajim/gui_menu_builder.py:632
+#: gajim/gui_menu_builder.py:530 gajim/gui_menu_builder.py:596
 #, fuzzy
 msgid "Send Chatstate"
 msgstr "Попередній стан: %"
 
-#: gajim/gui_menu_builder.py:569
+#: gajim/gui_menu_builder.py:531
 #, fuzzy
 msgid "Invite Contacts"
 msgstr "Запросити _контакти"
 
-#: gajim/gui_menu_builder.py:570
-msgid "Add to Roster"
-msgstr "Додати до реєстру"
+#: gajim/gui_menu_builder.py:532
+#, fuzzy
+msgid "Add to Contact List"
+msgstr "_Додати контакт..."
 
-#: gajim/gui_menu_builder.py:571
+#: gajim/gui_menu_builder.py:533
 #, fuzzy
-msgid "Audio Session"
-msgstr "Тест аудіо"
+msgid "Voice Chat"
+msgstr "Запит на голосову розмову"
 
-#: gajim/gui_menu_builder.py:572
+#: gajim/gui_menu_builder.py:534
 #, fuzzy
-msgid "Video Session"
+msgid "Video Chat"
 msgstr "Тест відео"
 
-#: gajim/gui_menu_builder.py:573
+#: gajim/gui_menu_builder.py:535 gajim/gui_menu_builder.py:582
 #, fuzzy
 msgid "Information"
 msgstr "_Інформація"
 
-#: gajim/gui_menu_builder.py:574 gajim/gui_menu_builder.py:639
+#: gajim/gui_menu_builder.py:536 gajim/gui_menu_builder.py:602
 #: gajim/data/gui/application_menu.ui:37
 #, fuzzy
 msgid "History"
 msgstr "_Журнал"
 
-#: gajim/gui_menu_builder.py:580 gajim/gui_menu_builder.py:687
+#: gajim/gui_menu_builder.py:542 gajim/gui_menu_builder.py:650
 #: gajim/data/gui/preferences_window.ui:1823
 msgid "Disabled"
 msgstr "Вимкнено"
 
-#: gajim/gui_menu_builder.py:581 gajim/gui_menu_builder.py:688
+#: gajim/gui_menu_builder.py:543 gajim/gui_menu_builder.py:651
 msgid "Composing only"
 msgstr "Лише друк"
 
-#: gajim/gui_menu_builder.py:582 gajim/gui_menu_builder.py:689
+#: gajim/gui_menu_builder.py:544 gajim/gui_menu_builder.py:652
 msgid "All chat states"
 msgstr "Усі стани балачок"
 
-#: gajim/gui_menu_builder.py:620
-msgid "Manage Room"
-msgstr "Керування кімнатою"
+#: gajim/gui_menu_builder.py:583
+#, fuzzy
+msgid "Manage Group Chat"
+msgstr "Полишити групові балачки"
 
-#: gajim/gui_menu_builder.py:621
+#: gajim/gui_menu_builder.py:584 gajim/data/gui/groupchat_control.ui:649
 msgid "Change Subject"
 msgstr "Змінити _тему..."
 
-#: gajim/gui_menu_builder.py:622
-msgid "Configure Room"
-msgstr "Налаштувати кімнату..."
+#: gajim/gui_menu_builder.py:585
+#, fuzzy
+msgid "Configure Group Chat"
+msgstr "Полишити групові балачки"
 
-#: gajim/gui_menu_builder.py:623
+#: gajim/gui_menu_builder.py:586
 msgid "Upload Avatar…"
 msgstr "Вивантажити аватар…"
 
-#: gajim/gui_menu_builder.py:624
-msgid "Destroy Room"
-msgstr "Знищити кімнату"
+#: gajim/gui_menu_builder.py:587
+#, fuzzy
+msgid "Destroy Group Chat"
+msgstr "Створити групову балачку"
 
-#: gajim/gui_menu_builder.py:626 gajim/data/gui/preferences_window.ui:790
+#: gajim/gui_menu_builder.py:589 gajim/data/gui/preferences_window.ui:790
 #, fuzzy
 msgid "Chat Settings"
 msgstr "Гарячі клавіші"
 
-#: gajim/gui_menu_builder.py:627
+#: gajim/gui_menu_builder.py:590
 msgid "Show join/leave"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:628
+#: gajim/gui_menu_builder.py:591
 #, fuzzy
 msgid "Show status changes"
 msgstr "_Показати зміни стану"
 
-#: gajim/gui_menu_builder.py:629 gajim/data/gui/gc_control_popup_menu.ui:72
+#: gajim/gui_menu_builder.py:592 gajim/data/gui/gc_control_popup_menu.ui:72
 #, fuzzy
 msgid "Notify on all messages"
 msgstr "Зразки повідомлень:"
 
-#: gajim/gui_menu_builder.py:630
+#: gajim/gui_menu_builder.py:593
 #, fuzzy
 msgid "Minimize on close"
 msgstr "_Мінімізувати після закриття"
 
-#: gajim/gui_menu_builder.py:631
+#: gajim/gui_menu_builder.py:595
 #, fuzzy
-msgid "Minimize on autojoin"
+msgid "Minimize when joining automatically"
 msgstr "Мінімізувати після автоматичного приєднання"
 
-#: gajim/gui_menu_builder.py:634
+#: gajim/gui_menu_builder.py:598
 msgid "Sync Threshold"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:635
+#: gajim/gui_menu_builder.py:599
 #, fuzzy
-msgid "Change Nick"
+msgid "Change Nickname"
 msgstr "Змінити _псевдонім..."
 
-#: gajim/gui_menu_builder.py:636
-msgid "Bookmark Room"
-msgstr "Зробити закладку на цій кімнаті"
-
-#: gajim/gui_menu_builder.py:637
+#: gajim/gui_menu_builder.py:600
 #, fuzzy
 msgid "Request Voice"
 msgstr "_Запит голосу"
 
-#: gajim/gui_menu_builder.py:638 gajim/roster_window.py:5246
+#: gajim/gui_menu_builder.py:601 gajim/roster_window.py:5185
 #, fuzzy
 msgid "Execute command"
 msgstr "Ви_конати команду"
 
-#: gajim/gui_menu_builder.py:640
-#, fuzzy
-msgid "Disconnect"
-msgstr "_Роз'єднати"
+#: gajim/gui_menu_builder.py:603
+msgid "Leave"
+msgstr ""
 
-#: gajim/gui_menu_builder.py:678 gajim/gtk/preferences.py:156
+#: gajim/gui_menu_builder.py:641 gajim/gtk/preferences.py:155
 msgid "No threshold"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:680 gajim/gtk/preferences.py:158
+#: gajim/gui_menu_builder.py:643 gajim/gtk/preferences.py:157
 #, python-format
 msgid "%i day"
 msgid_plural "%i days"
@@ -399,153 +395,168 @@ msgstr[0] "%i день"
 msgstr[1] "%i дні"
 msgstr[2] "%i днів"
 
-#: gajim/gui_menu_builder.py:709 gajim/gui_menu_builder.py:747
-#: gajim/gtk/join_groupchat.py:43
-msgid "Join Group Chat"
-msgstr "Приєднатись до групової балачки"
-
-#: gajim/gui_menu_builder.py:746
+#: gajim/gui_menu_builder.py:672
 msgid "Add Contact…"
 msgstr "Додати контакт..."
 
-#: gajim/gui_menu_builder.py:748 gajim/gtk/profile.py:52
-#: gajim/gtk/accounts.py:770 gajim/gtk/accounts.py:808
+#: gajim/gui_menu_builder.py:673 gajim/gtk/profile.py:52
+#: gajim/gtk/accounts.py:773 gajim/gtk/accounts.py:811
 msgid "Profile"
 msgstr "Профіль"
 
-#: gajim/gui_menu_builder.py:749
+#: gajim/gui_menu_builder.py:674
+msgid "Send Single Message…"
+msgstr "Надіслати окреме повідомлення…"
+
+#: gajim/gui_menu_builder.py:675
 msgid "Discover Services"
 msgstr "Переглянути служби"
 
-#: gajim/gui_menu_builder.py:750
-msgid "Send Single Message…"
-msgstr "Надіслати окреме повідомлення…"
+#: gajim/gui_menu_builder.py:676 gajim/gtk/server_info.py:36
+#, fuzzy
+msgid "Server Info"
+msgstr "Сервер"
 
-#: gajim/gui_menu_builder.py:751 gajim/data/gui/preferences_window.ui:2741
+#: gajim/gui_menu_builder.py:677 gajim/data/gui/preferences_window.ui:2741
 msgid "Advanced"
 msgstr "Додатково"
 
-#: gajim/gui_menu_builder.py:752 gajim/gtk/mam_preferences.py:88
+#: gajim/gui_menu_builder.py:678 gajim/gtk/mam_preferences.py:88
 msgid "Archiving Preferences"
 msgstr "Налаштування архівації"
 
-#: gajim/gui_menu_builder.py:753
+#: gajim/gui_menu_builder.py:679
 #, fuzzy
 msgid "Blocking List"
 msgstr "Список заборон"
 
-#: gajim/gui_menu_builder.py:754 gajim/gtk/history_sync.py:108
+#: gajim/gui_menu_builder.py:680
+#, fuzzy
+msgid "Bookmarks"
+msgstr "_Закладка"
+
+#: gajim/gui_menu_builder.py:681
+#, fuzzy
+msgid "PEP Configuration"
+msgstr "Налаштування"
+
+#: gajim/gui_menu_builder.py:682 gajim/gtk/history_sync.py:108
 #: gajim/gtk/history_sync.py:186
 msgid "Synchronise History"
 msgstr "Синхронізувати історію"
 
-#: gajim/gui_menu_builder.py:755 gajim/gtk/privacy_list.py:427
+#: gajim/gui_menu_builder.py:683 gajim/gtk/privacy_list.py:427
 msgid "Privacy Lists"
 msgstr "Списки конфіденційності"
 
-#: gajim/gui_menu_builder.py:756 gajim/gtk/server_info.py:36
-#, fuzzy
-msgid "Server Info"
-msgstr "Сервер"
-
-#: gajim/gui_menu_builder.py:757 gajim/gui_menu_builder.py:768
+#: gajim/gui_menu_builder.py:685 gajim/gui_menu_builder.py:696
 #: gajim/data/gui/xml_console_window.ui:77
 msgid "XML Console"
 msgstr "Консоль XML"
 
-#: gajim/gui_menu_builder.py:759 gajim/data/gui/groupchat_config.ui:36
+#: gajim/gui_menu_builder.py:687 gajim/data/gui/groupchat_config.ui:36
 #, fuzzy
 msgid "Admin"
 msgstr "_Адміністратор"
 
-#: gajim/gui_menu_builder.py:760
+#: gajim/gui_menu_builder.py:688
 #, fuzzy
 msgid "Send Server Message…"
 msgstr "_Надіслати серверне повідомлення..."
 
-#: gajim/gui_menu_builder.py:761
+#: gajim/gui_menu_builder.py:689
 #, fuzzy
 msgid "Set MOTD…"
 msgstr "Встановити «Повідомлення дня»..."
 
-#: gajim/gui_menu_builder.py:762
+#: gajim/gui_menu_builder.py:690
 #, fuzzy
 msgid "Update MOTD…"
 msgstr "Оновити «Повідомлення дня»..."
 
-#: gajim/gui_menu_builder.py:763
+#: gajim/gui_menu_builder.py:691
 #, fuzzy
 msgid "Delete MOTD…"
 msgstr "Вилучити «Повідомлення дня»"
 
-#: gajim/gui_menu_builder.py:812
+#: gajim/gui_menu_builder.py:736
 #, fuzzy
-msgid "No Accounts available"
-msgstr "Немає жодного облікового запису"
+msgid "_Add Account…"
+msgstr "_Додати контакт..."
+
+#: gajim/gui_menu_builder.py:742
+#, fuzzy
+msgid "_Modify Accounts…"
+msgstr "_Змінити обліковий запис"
+
+#: gajim/gui_menu_builder.py:751 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:823 gajim/data/gui/application_menu.ui:5
-#: gajim/data/gui/application_menu.ui:71 gajim/data/gui/shortcuts_window.ui:182
-#: gajim/gtk/accounts.py:58
+#: gajim/gui_menu_builder.py:755 gajim/data/gui/application_menu.ui:5
+#: gajim/data/gui/shortcuts_window.ui:182 gajim/gtk/accounts.py:57
 msgid "Accounts"
 msgstr "Облікові записи"
 
-#: gajim/gui_menu_builder.py:881 gajim/gui_menu_builder.py:886
+#: gajim/gui_menu_builder.py:784 gajim/gui_menu_builder.py:789
 #, fuzzy
-msgid "Copy JID"
-msgstr "JID кімнати"
+msgid "Copy XMPP Address"
+msgstr "_Копіювати JID/адресу електронної пошти"
 
-#: gajim/gui_menu_builder.py:882 gajim/gui_menu_builder.py:914
+#: gajim/gui_menu_builder.py:785 gajim/gui_menu_builder.py:817
 #, fuzzy
 msgid "Join Groupchat"
 msgstr "Приєднатись до групової балачки"
 
-#: gajim/gui_menu_builder.py:887 gajim/gui_menu_builder.py:913
-#: gajim/data/gui/application_menu.ui:76
+#: gajim/gui_menu_builder.py:790 gajim/gui_menu_builder.py:816
+#: gajim/data/gui/application_menu.ui:71
 #: gajim/data/gui/subscription_request_window.ui:106
 msgid "Start Chat"
 msgstr "Почати балачку"
 
-#: gajim/gui_menu_builder.py:888 gajim/gui_menu_builder.py:915
+#: gajim/gui_menu_builder.py:791 gajim/gui_menu_builder.py:818
 #, fuzzy
-msgid "Add to Roster…"
-msgstr "_Додати до реєстру"
+msgid "Add to Contact List…"
+msgstr "Додати контакт..."
 
-#: gajim/gui_menu_builder.py:893
+#: gajim/gui_menu_builder.py:796
 #, fuzzy
 msgid "Copy Link Location"
 msgstr "_Копіювати посилання"
 
-#: gajim/gui_menu_builder.py:894
+#: gajim/gui_menu_builder.py:797
 #, fuzzy
 msgid "Open Link in Browser"
 msgstr "_Відкрити посилання у веб-переглядачі"
 
-#: gajim/gui_menu_builder.py:899
+#: gajim/gui_menu_builder.py:802
 #, fuzzy
 msgid "Copy Email Address"
 msgstr "_Копіювати JID/адресу електронної пошти"
 
-#: gajim/gui_menu_builder.py:900 gajim/gui_menu_builder.py:912
+#: gajim/gui_menu_builder.py:803 gajim/gui_menu_builder.py:815
 #, fuzzy
 msgid "Open Email Composer"
 msgstr "_Відкрити редактор поштових повідомлень"
 
-#: gajim/gui_menu_builder.py:905
+#: gajim/gui_menu_builder.py:808
 #, fuzzy
 msgid "Copy Location"
 msgstr "_Копіювати посилання"
 
-#: gajim/gui_menu_builder.py:906
+#: gajim/gui_menu_builder.py:809
 #, fuzzy
 msgid "Show Location"
 msgstr "Положення:"
 
-#: gajim/gui_menu_builder.py:911
+#: gajim/gui_menu_builder.py:814
 #, fuzzy
-msgid "Copy JID/Email"
+msgid "Copy XMPP Address/Email"
 msgstr "_Копіювати JID/адресу електронної пошти"
 
-#: gajim/gui_menu_builder.py:945
+#: gajim/gui_menu_builder.py:852
 #, fuzzy
 msgid "Copy"
 msgstr "JID кімнати"
@@ -566,44 +577,55 @@ msgstr "Показати цю довідку та вийти"
 msgid "Choose folder for logfile"
 msgstr ""
 
-#: gajim/history_manager.py:107
+#: gajim/history_manager.py:106
 msgid "Cannot find history logs database"
 msgstr "Не можу знайти базу даних журналу"
 
-#: gajim/history_manager.py:108
-#, fuzzy, python-format
+#: gajim/history_manager.py:107
+#, python-format
 msgid "%s does not exist."
-msgstr "Файла не існує"
+msgstr "Файла %s не існує."
 
-#: gajim/history_manager.py:141 gajim/history_manager.py:195
-#: gajim/gtk/discovery.py:829 gajim/gtk/roster_item_exchange.py:80
-msgid "JID"
-msgstr "JID"
+#: gajim/history_manager.py:140 gajim/history_manager.py:194
+#: 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:30
+#: gajim/gtk/accounts.py:804
+#, fuzzy
+msgid "XMPP Address"
+msgstr "Адреса AIM:"
 
-#: gajim/history_manager.py:154 gajim/history_manager.py:202
+#: gajim/history_manager.py:153 gajim/history_manager.py:201
 #: gajim/data/gui/history_window.ui:89 gajim/gtk/history.py:108
 msgid "Date"
 msgstr "Дата"
 
-#: gajim/history_manager.py:161 gajim/history_manager.py:225
+#: gajim/history_manager.py:160 gajim/history_manager.py:224
 #: gajim/data/gui/join_groupchat_window.ui:208
 #: gajim/data/gui/profile_window.ui:214
 #: gajim/data/gui/vcard_information_window.ui:443
+#: gajim/data/gui/bookmarks.ui:140
 msgid "Nickname"
 msgstr "Псевдонім"
 
-#: gajim/history_manager.py:172 gajim/history_manager.py:211
+#: gajim/history_manager.py:171 gajim/history_manager.py:210
 #: gajim/data/gui/preferences_window.ui:1344
 #: gajim/data/gui/single_message_window.ui:275 gajim/gtk/history.py:117
 msgid "Message"
 msgstr "Повідомлення"
 
-#: gajim/history_manager.py:180 gajim/history_manager.py:218
+#: gajim/history_manager.py:179 gajim/history_manager.py:217
 #: gajim/data/gui/groups_post_window.ui:49
 #: gajim/data/gui/single_message_window.ui:214
 msgid "Subject"
 msgstr "Тема"
 
+#: gajim/history_manager.py:247
+msgid "Database Cleanup"
+msgstr "Очищення бази даних"
+
 #: gajim/history_manager.py:248
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
@@ -615,11 +637,8 @@ msgstr ""
 #: gajim/history_manager.py:250
 #, fuzzy
 msgid ""
-"Normally allocated database size will not be freed, it will just become "
-"reusable. If you really want to reduce database filesize, click YES, else "
-"click NO.\n"
-"\n"
-"In case you click YES, please wait…"
+"Normally, the allocated database size will not be freed, it will just become "
+"reusable. This operation may take a while."
 msgstr ""
 "Зазвичай, пам’ять, виділену для бази даних не буде звільнено, її просто "
 "можна буде використати повторно. Якщо ви справді бажаєте зменшити розмір "
@@ -629,26 +648,27 @@ msgstr ""
 "Якщо ви натиснете кнопку «ТАК», вам доведеться зачекати..."
 
 #: gajim/history_manager.py:255
-msgid "Database Cleanup"
-msgstr "Очищення бази даних"
+#, fuzzy
+msgid "_Cleanup"
+msgstr "Споро_жнити"
 
-#: gajim/history_manager.py:519 gajim/gtk/filetransfer.py:238
-#: gajim/gtk/filetransfer.py:248
+#: gajim/history_manager.py:518 gajim/gtk/filetransfer.py:237
+#: gajim/gtk/filetransfer.py:247
 msgid "You"
 msgstr "Ви"
 
-#: gajim/history_manager.py:531
+#: gajim/history_manager.py:530
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(who)s %(time)s повідомив: %(message)s\n"
 
-#: gajim/history_manager.py:568 gajim/history_manager.py:607
-#: gajim/gtk/dialogs.py:58 gajim/gtk/themes.py:319
+#: gajim/history_manager.py:567 gajim/history_manager.py:606
+#: gajim/gtk/dialogs.py:57 gajim/gtk/themes.py:319
 #: gajim/gtk/roster_item_exchange.py:75 gajim/gtk/roster_item_exchange.py:185
 msgid "Delete"
 msgstr "Вилучити"
 
-#: gajim/history_manager.py:569
+#: gajim/history_manager.py:568
 #, fuzzy
 msgid "Delete Conversation"
 msgid_plural "Delete Conversations"
@@ -656,15 +676,15 @@ msgstr[0] "Підтвердження видалення"
 msgstr[1] "Підтвердження видалення"
 msgstr[2] "Підтвердження видалення"
 
-#: gajim/history_manager.py:570
+#: gajim/history_manager.py:569
 #, 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] "Ви справді бажаєте вилучити виділене повідомлення?"
+msgstr[0] "Ви справді бажаєте незворотньо видалити перемовини з <b>%s</b>?"
+msgstr[1] "Ви справді бажаєте незворотньо видалити ці перемовини?"
 msgstr[2] "Ви справді бажаєте вилучити виділене повідомлення?"
 
-#: gajim/history_manager.py:608
+#: gajim/history_manager.py:607
 #, fuzzy
 msgid "Delete Message"
 msgid_plural "Delete Messages"
@@ -672,7 +692,7 @@ msgstr[0] "Типове повідомлення"
 msgstr[1] "Типове повідомлення"
 msgstr[2] "Типове повідомлення"
 
-#: gajim/history_manager.py:609
+#: gajim/history_manager.py:608
 #, fuzzy
 msgid "Do you want to permanently delete this message"
 msgid_plural "Do you want to permanently delete these messages"
@@ -686,15 +706,15 @@ msgid "Contact name: <i>%s</i>"
 msgstr "Назва контакту: <i>%s</i>"
 
 #: gajim/dialogs.py:84
-#, fuzzy, python-format
-msgid "JID: <i>%s</i>"
-msgstr "Jabber ID: <i>%s</i>"
+#, python-format
+msgid "XMPP Address: <i>%s</i>"
+msgstr ""
 
-#: gajim/dialogs.py:115 gajim/dialogs.py:128 gajim/roster_window.py:2901
-#: gajim/roster_window.py:3833 gajim/roster_window.py:5084
-#: gajim/common/contacts.py:157 gajim/common/contacts.py:190
+#: gajim/dialogs.py:115 gajim/dialogs.py:128 gajim/roster_window.py:2894
+#: gajim/roster_window.py:3784 gajim/roster_window.py:5023
+#: gajim/common/contacts.py:157 gajim/common/contacts.py:206
 #: gajim/data/gui/preferences_window.ui:558
-#: gajim/data/gui/shortcuts_window.ui:177 gajim/gtk/accounts.py:349
+#: gajim/data/gui/shortcuts_window.ui:177 gajim/gtk/accounts.py:352
 msgid "General"
 msgstr "Загальне"
 
@@ -741,7 +761,7 @@ msgid "Preset name is already in use. Do you want to overwrite this preset?"
 msgstr ""
 "Цю назву вже було використано. Бажаєте перезаписати повідомлення про стан?"
 
-#: gajim/dialogs.py:703
+#: gajim/dialogs.py:703 gajim/plugins/gui.py:292
 #, fuzzy
 msgid "_Overwrite"
 msgstr "Перезаписати?"
@@ -754,9 +774,7 @@ msgstr "Зберегти як стандартне повідомлення пр
 msgid "Please type a name for this status message"
 msgstr "Будь ласка, введіть назву цього повідомлення про стан"
 
-#: gajim/dialogs.py:740 gajim/gui_interface.py:1441 gajim/dialog_messages.py:31
-#: gajim/gtk/discovery.py:518 gajim/gtk/profile.py:323
-#: gajim/gtk/join_groupchat.py:234
+#: gajim/dialogs.py:740 gajim/gtk/discovery.py:517 gajim/gtk/profile.py:323
 msgid "You are not connected to the server"
 msgstr "Ваш комп’ютер не з’єднано з сервером"
 
@@ -766,9 +784,11 @@ msgstr ""
 "Для синхронізації ваших контактів потрібно встановити з’єднання облікового "
 "запису з сервером."
 
-#: gajim/dialogs.py:752 gajim/dialogs.py:823 gajim/gtk/discovery.py:822
-#: gajim/gtk/discovery.py:1648 gajim/gtk/discovery.py:1941
-#: gajim/gtk/history.py:99 gajim/gtk/roster_item_exchange.py:83
+#: gajim/dialogs.py:752 gajim/dialogs.py:823
+#: gajim/data/gui/groupchat_info_scrolled.ui:16 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/gtk/roster_item_exchange.py:83
 msgid "Name"
 msgstr "Назва"
 
@@ -790,397 +810,346 @@ msgstr ""
 msgid "Synchronise"
 msgstr "Синхронізувати"
 
-#: gajim/dialogs.py:1043
+#: gajim/dialogs.py:1042
 msgid "an audio and video"
 msgstr "аудіо та відео"
 
-#: gajim/dialogs.py:1045
+#: gajim/dialogs.py:1044
 msgid "an audio"
 msgstr "аудіо"
 
-#: gajim/dialogs.py:1047
+#: gajim/dialogs.py:1046
 msgid "a video"
 msgstr "відео"
 
-#: gajim/dialogs.py:1051
-#, python-format
+#: gajim/dialogs.py:1050
+#, fuzzy, python-format
 msgid ""
-"%(contact)s wants to start %(type)s session with you. Do you want to answer "
+"%(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:505
-#, fuzzy, python-format
+#: gajim/groupchat_control.py:511
+#, python-format
 msgid "Send File (max. %s MiB)…"
-msgstr "Зберегти файл як..."
+msgstr "Надіслати файл (макс. %s МіБ)…"
 
-#: gajim/groupchat_control.py:507 gajim/chat_control.py:342
+#: gajim/groupchat_control.py:513 gajim/chat_control.py:344
 #, fuzzy
 msgid "No File Transfer available"
 msgstr "Перенесення файлу не вдалося"
 
-#: gajim/groupchat_control.py:630 gajim/groupchat_control.py:2349
-msgid "Changing Subject"
-msgstr "Зміна теми"
-
-#: gajim/groupchat_control.py:631 gajim/groupchat_control.py:2350
-msgid "Please specify the new subject:"
-msgstr "Будь ласка, вкажіть нову тему:"
-
-#: gajim/groupchat_control.py:638
-msgid "Changing Nickname"
-msgstr "Зміна псевдоніма"
-
-#: gajim/groupchat_control.py:639
-msgid "Please specify the new nickname you want to use:"
-msgstr "Будь ласка, вкажіть новий псевдонім, яким ви бажаєте скористатися:"
-
-#: gajim/groupchat_control.py:657
+#: gajim/groupchat_control.py:655
 #, fuzzy
-msgid "Invalid group chat JID"
+msgid "Invalid group chat XMPP Address"
 msgstr "Некоректний ідентифікатор Jabber групової балачки"
 
-#: gajim/groupchat_control.py:658
+#: gajim/groupchat_control.py:656
 #, fuzzy
-msgid "The group chat JID has not allowed characters."
+msgid "The group chat XMPP Address has not allowed characters."
 msgstr ""
 "У ідентифікаторі Jabber групової балачки містяться недозволені символи."
 
-#: gajim/groupchat_control.py:758 gajim/gtk/profile.py:136
+#: gajim/groupchat_control.py:743 gajim/gtk/profile.py:136
 msgid "Could not load image"
 msgstr "Не вдалося завантажити зображення"
 
-#: gajim/groupchat_control.py:888
+#: gajim/groupchat_control.py:873
 msgid "Insert Nickname"
 msgstr "Вставити псевдонім"
 
-#: gajim/groupchat_control.py:1056 gajim/chat_control.py:824
+#: gajim/groupchat_control.py:1041 gajim/chat_control.py:848
 msgid "and authenticated"
 msgstr "і уповноваженим"
 
-#: gajim/groupchat_control.py:1060 gajim/chat_control.py:828
+#: gajim/groupchat_control.py:1045 gajim/chat_control.py:852
 msgid "and NOT authenticated"
 msgstr "і НЕ уповноваженим"
 
-#: gajim/groupchat_control.py:1064
+#: gajim/groupchat_control.py:1049
 #, python-format
 msgid "%(type)s encryption is active %(authenticated)s."
 msgstr "%(type)s шифрування увімкнено %(authenticated)s."
 
-#: gajim/groupchat_control.py:1111
+#: gajim/groupchat_control.py:1096
 msgid "Conversation with "
 msgstr "Спілкування з"
 
-#: gajim/groupchat_control.py:1113
+#: gajim/groupchat_control.py:1098
 msgid "Continued conversation"
 msgstr "Спілкування з продовженням"
 
-#: gajim/groupchat_control.py:1411
+#: gajim/groupchat_control.py:1357
 #, python-format
 msgid "%(nick)s has set the subject to %(subject)s"
 msgstr "%(nick)s встановив тему %(subject)s"
 
-#: gajim/groupchat_control.py:1433
-msgid "Room now shows unavailable members"
+#: gajim/groupchat_control.py:1374
+#, fuzzy
+msgid "Group chat now shows unavailable members"
 msgstr "Тепер у кімнаті буде показано недоступних постійних учасників"
 
-#: gajim/groupchat_control.py:1436
-msgid "Room now does not show unavailable members"
+#: gajim/groupchat_control.py:1377
+#, fuzzy
+msgid "Group chat now does not show unavailable members"
 msgstr "тепер у кімнаті не можна буде бачити недоступних постійних учасників"
 
-#: gajim/groupchat_control.py:1439
+#: gajim/groupchat_control.py:1380
 msgid "A setting not related to privacy has been changed"
 msgstr ""
 
-#: gajim/groupchat_control.py:1446
-msgid "Room logging is now enabled"
-msgstr "Тепер увімкнено запис повідомлень кімнати"
+#: gajim/groupchat_control.py:1387 gajim/groupchat_control.py:1659
+#, fuzzy
+msgid "Conversations are stored on the server"
+msgstr "Цей сеанс БУДЕ збережена на сервері"
 
-#: gajim/groupchat_control.py:1449
-msgid "Room logging is now disabled"
-msgstr "Тепер запис кімнати вимкнено"
+#: gajim/groupchat_control.py:1390
+#, fuzzy
+msgid "Conversations are not stored on the server"
+msgstr "Відомості про вас, які зберігаються на сервері"
 
-#: gajim/groupchat_control.py:1452
-msgid "Room is now non-anonymous"
+#: gajim/groupchat_control.py:1393
+#, fuzzy
+msgid "Group chat is now non-anonymous"
 msgstr "Тепер у кімнаті вимкнено анонімність"
 
-#: gajim/groupchat_control.py:1456
-msgid "Room is now semi-anonymous"
+#: gajim/groupchat_control.py:1397
+#, fuzzy
+msgid "Group chat is now semi-anonymous"
 msgstr "Тепер у кімнаті увімкнено напіванонімність"
 
-#: gajim/groupchat_control.py:1460
+#: gajim/groupchat_control.py:1401
 #, fuzzy
-msgid "Room is now fully anonymous"
+msgid "Group chat is now fully anonymous"
 msgstr "Тепер у кімнаті увімкнено анонімність"
 
-#: gajim/groupchat_control.py:1500
+#: gajim/groupchat_control.py:1439
 #, fuzzy, python-format
 msgid "Ping? (%s)"
 msgstr "Га! (%s s.)"
 
-#: gajim/groupchat_control.py:1503
+#: gajim/groupchat_control.py:1442
 #, python-format
 msgid "Pong! (%(nick)s %(delay)s s.)"
 msgstr "Га! (%(nick)s %(delay)s s.)"
 
-#: gajim/groupchat_control.py:1506 gajim/chat_control.py:1213
+#: gajim/groupchat_control.py:1445 gajim/chat_control.py:1237
 msgid "Error."
 msgstr "Помилка."
 
-#: gajim/groupchat_control.py:1711
+#: gajim/groupchat_control.py:1650
 #, fuzzy, python-format
-msgid "You (%s) joined the room"
+msgid "You (%s) joined the group chat"
 msgstr "%s приєднався до групової балачки"
 
-#: gajim/groupchat_control.py:1717
-msgid "Any occupant is allowed to see your full JID"
+#: gajim/groupchat_control.py:1655
+#, fuzzy
+msgid "Any participant is allowed to see your full XMPP Address"
 msgstr "Всі учасники можуть бачити ваш JID повністю"
 
-#: gajim/groupchat_control.py:1721
-msgid "Room logging is enabled"
-msgstr "Увімкнено запис кімнати"
-
-#: gajim/groupchat_control.py:1725
-msgid "The server has assigned or modified your roomnick"
+#: gajim/groupchat_control.py:1663
+#, fuzzy
+msgid "The server has assigned or modified your nickname in this group chat"
 msgstr "Сервер призначив вам псевдонім у кімнаті або змінив цей псевдонім"
 
-#: gajim/groupchat_control.py:1732
-msgid "A new room has been created"
+#: gajim/groupchat_control.py:1671
+#, fuzzy
+msgid "A new group chat has been created"
 msgstr "Було створено нову кімнату"
 
-#: gajim/groupchat_control.py:1740 gajim/privatechat_control.py:112
+#: gajim/groupchat_control.py:1679 gajim/privatechat_control.py:115
 #, python-format
 msgid "You are now known as %s"
 msgstr "Ви тепер відомі як %s"
 
-#: gajim/groupchat_control.py:1742 gajim/privatechat_control.py:114
+#: gajim/groupchat_control.py:1681 gajim/privatechat_control.py:117
 #, fuzzy, python-brace-format
 msgid "{nick} is now known as {new_nick}"
-msgstr "%(nick)s тепер стає %(new_nick)s"
+msgstr "{nick} тепер стає {new_nick}"
 
-#: gajim/groupchat_control.py:1767 gajim/privatechat_control.py:141
-#, fuzzy, python-brace-format
+#: gajim/groupchat_control.py:1706 gajim/privatechat_control.py:144
+#, python-brace-format
 msgid "You are now {show}{status}"
-msgstr "Ви тепер відомі як %s"
+msgstr "Ви тепер {show} {status}"
 
-#: gajim/groupchat_control.py:1773 gajim/privatechat_control.py:147
+#: gajim/groupchat_control.py:1712 gajim/privatechat_control.py:150
 #, fuzzy, python-brace-format
 msgid "{nick} is now {show}{status}"
-msgstr "%(nick)s тепер %(status)s"
+msgstr "{nick} тепер {show} {status}"
 
-#: gajim/groupchat_control.py:1790 gajim/groupchat_control.py:1819
-#: gajim/groupchat_control.py:1849 gajim/groupchat_control.py:1909
+#: gajim/groupchat_control.py:1729 gajim/groupchat_control.py:1758
+#: gajim/groupchat_control.py:1788 gajim/groupchat_control.py:1848
 #, python-brace-format
 msgid " by {actor}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1793
+#: gajim/groupchat_control.py:1732
 #, fuzzy, python-brace-format
 msgid "** Your Affiliation has been set to {affiliation}{actor}{reason}"
 msgstr ""
-"** Належність %(nick)s було встановлено у значення %(affiliation)s %(actor)s"
+"** Вашу належність було встановлено у значення {affiliation} {actor} {reason}"
 
-#: gajim/groupchat_control.py:1799
-#, fuzzy, python-brace-format
+#: gajim/groupchat_control.py:1738
+#, python-brace-format
 msgid "** Affiliation of {nick} has been set to {affiliation}{actor}{reason}"
-msgstr "** Належність of %(nick)s було встановлено у значення %(affiliation)s"
+msgstr ""
+"** Належність {nick} було встановлено у значення {affiliation} {actor} "
+"{reason}"
 
-#: gajim/groupchat_control.py:1822
-#, fuzzy, python-brace-format
+#: gajim/groupchat_control.py:1761
+#, python-brace-format
 msgid "** Your Role has been set to {role}{actor}{reason}"
-msgstr "** Роль %(nick)s було встановлено у значення %(role)s %(actor)s"
+msgstr "** Вашу роль було встановлено у значення {role} {actor} {reason}"
 
-#: gajim/groupchat_control.py:1827
-#, fuzzy, python-brace-format
+#: gajim/groupchat_control.py:1766
+#, python-brace-format
 msgid "** Role of {nick} has been set to {role}{actor}{reason}"
-msgstr "** Роль %(nick)s було встановлено у значення %(role)s %(actor)s"
+msgstr "** Роль {nick} було встановлено у значення {role} {actor} {reason}"
 
-#: gajim/groupchat_control.py:1852
-#, fuzzy, python-brace-format
-msgid "You have been removed from the room{actor}{reason}"
-msgstr "%(nick)s було вилучено з кімнати (%(reason)s)"
+#: gajim/groupchat_control.py:1791
+#, python-brace-format
+msgid "You have been removed from the group chat{actor}{reason}"
+msgstr "Вас вилучено з кімнати{actor} {reason}"
 
-#: gajim/groupchat_control.py:1857
+#: gajim/groupchat_control.py:1796
 #, python-brace-format
 msgid "You have left due to an error{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1863
+#: gajim/groupchat_control.py:1802
 #, python-brace-format
 msgid "You have been kicked{actor}{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1870
+#: gajim/groupchat_control.py:1809
 #, python-brace-format
 msgid "You have been banned{actor}{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1877 gajim/groupchat_control.py:1943
+#: gajim/groupchat_control.py:1816 gajim/groupchat_control.py:1882
 #, fuzzy
 msgid ": Affiliation changed"
 msgstr "змінено місце роботи"
 
-#: gajim/groupchat_control.py:1883 gajim/groupchat_control.py:1948
+#: gajim/groupchat_control.py:1822 gajim/groupchat_control.py:1887
 #, fuzzy
-msgid ": Room configuration changed to members-only"
+msgid ": Group chat configuration changed to members-only"
 msgstr "налаштування кімнати змінено на «лише для постійних учасників»"
 
-#: gajim/groupchat_control.py:1912
+#: gajim/groupchat_control.py:1851
 #, fuzzy, python-brace-format
-msgid "{nick} has been removed from the room{by}{reason}"
-msgstr "%(nick)s було вилучено з кімнати (%(reason)s)"
+msgid "{nick} has been removed from the group chat{by}{reason}"
+msgstr "{nick} було вилучено з кімнати {by} {reason}"
 
-#: gajim/groupchat_control.py:1922
+#: gajim/groupchat_control.py:1861
 #, python-brace-format
 msgid "{nick} has left due to an error{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1928
-#, fuzzy, python-brace-format
+#: gajim/groupchat_control.py:1867
+#, python-brace-format
 msgid "{nick} has been kicked{actor}{reason}"
-msgstr "%(nick)s було викинуто: %(reason)s"
+msgstr "{nick} було викинуто{actor} {reason}"
 
-#: gajim/groupchat_control.py:1936
-#, fuzzy, python-brace-format
+#: gajim/groupchat_control.py:1875
+#, python-brace-format
 msgid "{nick} has been banned{actor}{reason}"
-msgstr "%(nick)s було заблоковано: %(reason)s"
+msgstr "{nick} було заблоковано{actor} {reason}"
 
-#: gajim/groupchat_control.py:1953
+#: gajim/groupchat_control.py:1892
 #, python-brace-format
 msgid "{nick} has left{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1970
+#: gajim/groupchat_control.py:1914
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s приєднався до групової балачки"
 
-#: gajim/groupchat_control.py:1985 gajim/groupchat_control.py:1990
-#: gajim/groupchat_control.py:1995 gajim/groupchat_control.py:2000
-#: gajim/groupchat_control.py:2011
-msgid "Unable to join group chat"
-msgstr "Не вдалося приєднатися до групової балачки"
-
-#: gajim/groupchat_control.py:1986
-#, python-format
-msgid "You are banned from group chat <b>%s</b>."
-msgstr "Вас заблокували у груповій балачці <b>%s</b>."
-
-#: gajim/groupchat_control.py:1991
-#, fuzzy, python-format
-msgid "Remote server <b>%s</b> does not exist."
-msgstr "Групової балачки <b>%s</b> не існує."
-
-#: gajim/groupchat_control.py:1996
-#, python-format
-msgid "Group chat <b>%s</b> does not exist."
-msgstr "Групової балачки <b>%s</b> не існує."
-
-#: gajim/groupchat_control.py:2001
+#: gajim/groupchat_control.py:1981
 #, fuzzy
-msgid "Group chat creation is not permitted."
-msgstr "Можливість створення групових балачок обмежено."
-
-#: gajim/groupchat_control.py:2005
-#, fuzzy
-msgid "Unable to join groupchat"
-msgstr "Не вдалося приєднатися до групової балачки"
-
-#: gajim/groupchat_control.py:2006
-#, fuzzy, python-format
-msgid "You must use your registered nickname in <b>%s</b>."
-msgstr ""
-"Для групової балачки <b>%s</b> слід використовувати псевдонім, під яким ви "
-"зареєструвалися."
-
-#: gajim/groupchat_control.py:2012
-#, python-format
-msgid "You are not in the members list in groupchat %s."
-msgstr "Вас немає у списку постійних учасників групової балачки %s."
-
-#: gajim/groupchat_control.py:2068
-msgid "Room has been destroyed"
+msgid "Group chat has been destroyed"
 msgstr "Кімнату було знищено"
 
-#: gajim/groupchat_control.py:2073
+#: gajim/groupchat_control.py:1986
 #, fuzzy, python-format
-msgid "You can join this room instead: xmpp:%s?join"
+msgid "You can join this group chat instead: xmpp:%s?join"
 msgstr "Ви можете приєднатися замість цієї кімнати до %s"
 
-#: gajim/groupchat_control.py:2306
+#: gajim/groupchat_control.py:2214
 #, fuzzy
 msgid "Leave Group Chat"
 msgstr "Полишити групові балачки"
 
-#: gajim/groupchat_control.py:2307
-#, fuzzy
+#: gajim/groupchat_control.py:2215
 msgid "Are you sure you want to leave this group chat?"
-msgstr "Ви справді бажаєте полишити групову балачку «%s»?"
+msgstr "Ви справді бажаєте полишити цю групову балачку?"
 
-#: gajim/groupchat_control.py:2308
-#, fuzzy, python-format
-msgid "If you close this window, you will be disconnected from '%s'."
-msgstr "Якщо ви закриєте це вікно, вас буде від’єднано від групової балачки."
+#: gajim/groupchat_control.py:2216
+#, python-format
+msgid "If you close this window, you will leave '%s'."
+msgstr ""
+"Якщо ви закриєте це вікно, вас буде від’єднано від групової балачки «%s»."
 
-#: gajim/groupchat_control.py:2314
+#: gajim/groupchat_control.py:2222 gajim/roster_window.py:5177
 msgid "_Leave"
 msgstr ""
 
-#: gajim/groupchat_control.py:2377
+#: gajim/groupchat_control.py:2280 gajim/roster_window.py:3008
 #, fuzzy, python-format
 msgid "%(jid)s has been invited to this group chat"
 msgstr "%(jid)s було запрошено до цієї кімнати"
 
-#: gajim/groupchat_control.py:2527
+#: gajim/groupchat_control.py:2463
 #, python-format
 msgid "Kicking %s"
 msgstr "Викидання %s"
 
-#: gajim/groupchat_control.py:2528 gajim/groupchat_control.py:2829
+#: gajim/groupchat_control.py:2464 gajim/groupchat_control.py:2765
 msgid "You may specify a reason below:"
 msgstr "Нижче ви можете зазначити причину:"
 
-#: gajim/groupchat_control.py:2828
+#: gajim/groupchat_control.py:2764
 #, python-format
 msgid "Banning %s"
 msgstr "Блокування %s"
 
-#: gajim/chat_control.py:408
+#: gajim/chat_control.py:432
 msgid "Show a list of formattings"
 msgstr "Показати список інструментів форматування"
 
-#: gajim/chat_control.py:412
+#: gajim/chat_control.py:436
 msgid "This contact does not support HTML"
 msgstr "Цей контакт не підтримує HTML"
 
-#: gajim/chat_control.py:562
+#: gajim/chat_control.py:586
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr "%(type)s стан : %(state)s, причина: %(reason)s"
 
-#: gajim/chat_control.py:686
+#: gajim/chat_control.py:710
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s з групової балачки %(room_name)s"
 
-#: gajim/chat_control.py:832
+#: gajim/chat_control.py:856
 #, fuzzy, python-format
 msgid "%(type)s encryption is active %(authenticated)s"
 msgstr "%(type)s шифрування увімкнено %(authenticated)s."
 
-#: gajim/chat_control.py:1160 gajim/chat_control.py:1168
+#: gajim/chat_control.py:1184 gajim/chat_control.py:1192
 #, fuzzy
 msgid "Close"
 msgstr "_Надіслати і закрити"
 
-#: gajim/chat_control.py:1161
+#: gajim/chat_control.py:1185
 #, fuzzy, python-format
 msgid "You just received a new message from %s"
 msgstr "Ви щойно отримали нове повідомлення від «%s»"
 
-#: gajim/chat_control.py:1163
+#: gajim/chat_control.py:1187
 #, fuzzy
 msgid ""
 "If you close this tab while having chat history disabled, this message will "
@@ -1189,16 +1158,16 @@ msgstr ""
 "Якщо ви закриєте вкладку, а журнал було вимкнено, це повідомлення буде "
 "втрачено."
 
-#: gajim/chat_control.py:1208
+#: gajim/chat_control.py:1232
 msgid "Ping?"
 msgstr "Гу?"
 
-#: gajim/chat_control.py:1211
+#: gajim/chat_control.py:1235
 #, fuzzy, python-format
 msgid "Pong! (%s seconds)"
 msgstr "Га! (%s s.)"
 
-#: gajim/chat_control.py:1308
+#: gajim/chat_control.py:1332
 #, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -1207,271 +1176,278 @@ msgstr ""
 "Тема: %(subject)s\n"
 "%(message)s"
 
-#: gajim/chat_control.py:1416
+#: gajim/chat_control.py:1440
 #, python-format
 msgid "%(name)s is now %(show)s %(status)s"
 msgstr "%(name)s тепер %(show)s %(status)s"
 
-#: gajim/chat_control.py:1476 gajim/data/gui/application_menu.ui:32
+#: gajim/chat_control.py:1500 gajim/data/gui/application_menu.ui:32
 #: gajim/gtk/http_upload_progress.py:35
 #, fuzzy
 msgid "File Transfer"
 msgstr "Перенесення файлів"
 
-#: gajim/chat_control.py:1480
+#: gajim/chat_control.py:1504
 msgid "Size"
 msgstr "Розмір"
 
-#: gajim/chat_control.py:1482 gajim/chat_control.py:1546
+#: gajim/chat_control.py:1506 gajim/chat_control.py:1566
+#: gajim/gui_interface.py:190
 #: gajim/data/gui/groupchat_invitation_received.ui:77
-#: gajim/gtk/filetransfer.py:485
+#: gajim/gtk/filetransfer.py:490
 #, fuzzy
 msgid "_Accept"
 msgstr "_Прийняти"
 
-#: gajim/chat_control.py:1484 gajim/chat_control.py:1548
+#: gajim/chat_control.py:1508 gajim/chat_control.py:1568
 #: gajim/data/gui/groupchat_invitation_received.ui:62
 #, fuzzy
 msgid "_Decline"
 msgstr "_Поза мережею"
 
-#: gajim/chat_control.py:1506 gajim/gui_interface.py:791
-#: gajim/gui_interface.py:821 gajim/gui_interface.py:847
+#: gajim/chat_control.py:1530 gajim/gui_interface.py:777
+#: gajim/gui_interface.py:807 gajim/gui_interface.py:833
 #: gajim/gtk/notification.py:173 gajim/gtk/notification.py:278
 msgid "File Transfer Completed"
 msgstr "Завершення передавання файла"
 
-#: gajim/chat_control.py:1510 gajim/gtk/filetransfer.py:259
+#: gajim/chat_control.py:1534 gajim/gtk/filetransfer.py:258
 #, fuzzy
 msgid "Open _Folder"
 msgstr "В_ідкриту теку, яка містить цей файл"
 
-#: gajim/chat_control.py:1512 gajim/chat_control.py:1521
+#: gajim/chat_control.py:1536 gajim/chat_control.py:1545
+#: gajim/data/gui/groupchat_control.ui:962
+#: gajim/data/gui/groupchat_control.ui:1049
+#: gajim/data/gui/groupchat_control.ui:1155
 #, fuzzy
 msgid "_Close"
 msgstr "_Надіслати і закрити"
 
-#: gajim/chat_control.py:1543 gajim/gui_interface.py:484
+#: gajim/chat_control.py:1563 gajim/gui_interface.py:473
+#: gajim/data/gui/groupchat_invitation_received.ui:42
 #: gajim/gtk/notification.py:174 gajim/gtk/notification.py:195
 #: gajim/gtk/notification.py:281
-msgid "Groupchat Invitation"
+#, fuzzy
+msgid "Group Chat Invitation"
 msgstr "Запрошення до групової балачки"
 
-#: gajim/chat_control.py:1568 gajim/roster_window.py:1954
+#: gajim/chat_control.py:1588 gajim/roster_window.py:1951
 msgid "Remote contact stopped transfer"
 msgstr "Віддалений контакт зупинив передавання файлу"
 
-#: gajim/chat_control.py:1570 gajim/roster_window.py:1956
+#: gajim/chat_control.py:1590 gajim/roster_window.py:1953
 msgid "Error opening file"
 msgstr "Помилка під час спроби прочитати файл"
 
-#: gajim/chat_control.py:1572 gajim/gtk/filetransfer.py:297
+#: gajim/chat_control.py:1592 gajim/gtk/filetransfer.py:296
 msgid "File transfer stopped"
 msgstr "Зупинка передавання файла"
 
-#: gajim/chat_control.py:1575 gajim/gtk/filetransfer.py:275
-#: gajim/gtk/filetransfer.py:284
+#: gajim/chat_control.py:1595 gajim/gtk/filetransfer.py:274
+#: gajim/gtk/filetransfer.py:283
 msgid "File transfer cancelled"
 msgstr "Передавання файла скасовано"
 
-#: gajim/chat_control.py:1576
+#: gajim/chat_control.py:1596
 msgid "Connection with peer cannot be established."
 msgstr "Не вдалося встановити з’єднання з вузлом."
 
-#: gajim/application.py:72
+#: gajim/application.py:75
 #, fuzzy
 msgid "Show the application's version"
 msgstr "Показувати піктограму зони сповіщень"
 
-#: gajim/application.py:79
+#: gajim/application.py:82
 msgid "Show only critical errors"
 msgstr "_Показати лише критичні помилки"
 
-#: gajim/application.py:86
+#: gajim/application.py:89
 msgid "Separate profile files completely (even history database and plugins)"
 msgstr ""
 
-#: gajim/application.py:94
+#: gajim/application.py:97
 #, fuzzy
 msgid "Print XML stanzas and other debug information"
 msgstr "Показувати повідомлення xml та іншу відлагоджувальну інформацію"
 
-#: gajim/application.py:101
+#: gajim/application.py:104
 msgid "Use defined profile in configuration directory"
 msgstr "Використовувати призначений профіль у каталозі налаштувань"
 
-#: gajim/application.py:109
+#: gajim/application.py:112
 msgid "Set configuration directory"
 msgstr "Призначити конфігураційний каталог"
 
-#: gajim/application.py:117
+#: gajim/application.py:120
 msgid "Configure logging system"
 msgstr "Налаштувати ведення журналів"
 
-#: gajim/application.py:125
+#: gajim/application.py:128
 #, fuzzy
 msgid "Show all warnings"
 msgstr "Показати усі _події з черги"
 
-#: gajim/application.py:132
+#: gajim/application.py:135
 msgid "Open IPython shell"
 msgstr ""
 
-#: gajim/application.py:139
+#: gajim/application.py:142
 msgid "Pops up a window with the next pending event"
 msgstr ""
 "Відкриває контекстне вікно з повідомленням про наступну заплановану подію"
 
-#: gajim/application.py:145 gajim/data/gui/shortcuts_window.ui:203
+#: gajim/application.py:148 gajim/data/gui/shortcuts_window.ui:203
 #: data/org.gajim.Gajim.desktop.in:21
 #, fuzzy
 msgid "Start a new chat"
 msgstr "Почати балачку"
 
-#: gajim/application.py:152
+#: gajim/application.py:155
 msgid "Simulate loss of connectivity"
 msgstr ""
 
-#: gajim/application.py:159
+#: gajim/application.py:162
 msgid "Simulate regaining connectivity"
 msgstr ""
 
-#: gajim/application.py:201 gajim/gui_interface.py:133
+#: gajim/application.py:204 gajim/gui_interface.py:133
 msgid "Database Error"
 msgstr "Помилка бази даних"
 
-#: gajim/roster_window.py:294 gajim/roster_window.py:1030
+#: gajim/roster_window.py:291 gajim/roster_window.py:1027
 msgid "Merged accounts"
 msgstr "Об’єднані облікові записи"
 
-#: gajim/roster_window.py:853 gajim/roster_window.py:1631
-#: gajim/roster_window.py:1664 gajim/roster_window.py:1715
-#: gajim/roster_window.py:1717 gajim/roster_window.py:1872
-#: gajim/roster_window.py:2531 gajim/roster_window.py:5025
-#: gajim/common/contacts.py:188 gajim/common/contacts.py:447
-#: gajim/common/helpers.py:83 gajim/gtk/discovery.py:129
-#: gajim/gtk/discovery.py:130 gajim/gtk/discovery.py:1416
+#: gajim/roster_window.py:850 gajim/roster_window.py:1628
+#: gajim/roster_window.py:1661 gajim/roster_window.py:1712
+#: gajim/roster_window.py:1714 gajim/roster_window.py:1869
+#: gajim/roster_window.py:2528 gajim/roster_window.py:4331
+#: gajim/roster_window.py:4964 gajim/common/contacts.py:204
+#: gajim/common/contacts.py:463 gajim/common/helpers.py:86
+#: gajim/gtk/discovery.py:127 gajim/gtk/discovery.py:128
+#: gajim/gtk/discovery.py:1414
 msgid "Transports"
 msgstr "Транспорти"
 
-#: gajim/roster_window.py:1723 gajim/roster_window.py:1725
-#: gajim/roster_window.py:4995 gajim/gui_interface.py:1613
-#: gajim/gui_interface.py:1639 gajim/common/contacts.py:186
-#: gajim/common/helpers.py:83 gajim/common/modules/adhoc_commands.py:245
-msgid "Groupchats"
+#: gajim/roster_window.py:1720 gajim/roster_window.py:1722
+#: gajim/roster_window.py:4331 gajim/roster_window.py:4934
+#: gajim/gui_interface.py:1527 gajim/common/contacts.py:202
+#: gajim/common/helpers.py:86 gajim/common/modules/adhoc_commands.py:245
+#, fuzzy
+msgid "Group chats"
 msgstr "Групові балачки"
 
-#: gajim/roster_window.py:2012
+#: gajim/roster_window.py:2009
 #, fuzzy
 msgid "Authorization sent"
 msgstr "Було надіслано уповноваження"
 
-#: gajim/roster_window.py:2013
+#: gajim/roster_window.py:2010
 #, fuzzy, python-format
 msgid "\"%s\" will now see your status."
 msgstr "Тепер «%s» буде відомий ваш стан."
 
-#: gajim/roster_window.py:2031
+#: gajim/roster_window.py:2028
 msgid "Subscription request has been sent"
 msgstr "Було надіслано запит на підписку"
 
-#: gajim/roster_window.py:2032
-#, python-format
-msgid "If \"%s\" accepts this request you will know his or her status."
+#: gajim/roster_window.py:2029
+#, fuzzy, python-format
+msgid "If \"%s\" accepts this request you will know their status."
 msgstr "Якщо «%s» прийме цей запит, ви дізнаватиметеся про його або її стан."
 
-#: gajim/roster_window.py:2046
+#: gajim/roster_window.py:2043
 #, fuzzy
 msgid "Authorization removed"
 msgstr "Уповноваження було вилучено"
 
-#: gajim/roster_window.py:2047
+#: gajim/roster_window.py:2044
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Тепер «%s» завжди бачитиме вас як «поза мережею»."
 
-#: gajim/roster_window.py:2250 gajim/roster_window.py:3504
+#: gajim/roster_window.py:2247 gajim/roster_window.py:3460
 msgid "Disconnect for Invisibility"
 msgstr ""
 
-#: gajim/roster_window.py:2251 gajim/roster_window.py:3505
+#: gajim/roster_window.py:2248 gajim/roster_window.py:3461
 msgid "You are participating in one or more group chats"
 msgstr "Ви берете участь у одній або декількох групових балачках"
 
-#: gajim/roster_window.py:2252 gajim/roster_window.py:3506
-#, fuzzy
+#: gajim/roster_window.py:2249 gajim/roster_window.py:3462
 msgid ""
-"Changing your status to invisible will result in disconnection from those "
-"group chats.\n"
+"Changing your status to invisible will result in you leaving those group "
+"chats.\n"
 "Are you sure you want to go invisible?"
 msgstr ""
 "Зміна стану на «невидимий» призведе до вашого виходу з наведених групових "
-"балачок. Ви справді бажаєте змінити стан на «невидимий»?"
+"балачок.\n"
+"Ви справді бажаєте змінити стан на «невидимий»?"
 
-#: gajim/roster_window.py:2257 gajim/roster_window.py:3512
-#: gajim/roster_window.py:5238 gajim/data/gui/gc_control_popup_menu.ui:120
+#: gajim/roster_window.py:2254 gajim/roster_window.py:3468
+#: gajim/data/gui/gc_control_popup_menu.ui:120
 msgid "_Disconnect"
 msgstr "_Роз'єднати"
 
-#: gajim/roster_window.py:2285
+#: gajim/roster_window.py:2282
 #, fuzzy
 msgid "desynced"
 msgstr "розсинхронізація"
 
-#: gajim/roster_window.py:2353 gajim/data/gui/shortcuts_window.ui:224
+#: gajim/roster_window.py:2350 gajim/data/gui/shortcuts_window.ui:224
 #, fuzzy
 msgid "Quit Gajim"
 msgstr "Gajim"
 
-#: gajim/roster_window.py:2354
+#: gajim/roster_window.py:2351
 #, fuzzy
 msgid "You are about to quit Gajim"
 msgstr "Ви справді бажаєте вийти з Gajim?"
 
-#: gajim/roster_window.py:2355
+#: gajim/roster_window.py:2352
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Ви справді бажаєте вийти з Gajim?"
 
-#: gajim/roster_window.py:2356
+#: gajim/roster_window.py:2353
 #, fuzzy
 msgid "_Always quit when closing Gajim"
 msgstr "Завжди закривати Gajim"
 
-#: gajim/roster_window.py:2359 gajim/roster_window.py:2455
-#: gajim/roster_window.py:2495 gajim/data/gui/systray_context_menu.ui:90
+#: gajim/roster_window.py:2356 gajim/roster_window.py:2452
+#: gajim/roster_window.py:2492 gajim/data/gui/systray_context_menu.ui:83
 msgid "_Quit"
 msgstr ""
 
-#: gajim/roster_window.py:2448
+#: gajim/roster_window.py:2445
 #, fuzzy
 msgid "Stop File Transfers"
 msgstr "Перенесення файлів"
 
-#: gajim/roster_window.py:2449
+#: gajim/roster_window.py:2446
 #, fuzzy
 msgid "You still have running file transfers"
 msgstr "Ви маєте активні перенесення файлів"
 
-#: gajim/roster_window.py:2450
-#, fuzzy
+#: gajim/roster_window.py:2447
 msgid ""
 "If you quit now, the file(s) being transferred will be lost.\n"
 "Do you still want to quit?"
 msgstr ""
-"Якщо ви вийдете зараз, усі передачі файлів буде зупинено. Ви все ще бажаєте "
-"вийти?"
+"Якщо ви вийдете зараз, усі передачі файлів буде зупинено.\n"
+"Ви все ще бажаєте вийти?"
 
-#: gajim/roster_window.py:2488
+#: gajim/roster_window.py:2485
 #, fuzzy
 msgid "Unread Messages"
 msgstr "Непрочитані події"
 
-#: gajim/roster_window.py:2489
+#: gajim/roster_window.py:2486
 #, fuzzy
 msgid "You still have unread messages"
 msgstr "У вас є непрочитані повідомлення"
 
-#: gajim/roster_window.py:2490
+#: gajim/roster_window.py:2487
 #, fuzzy
 msgid ""
 "Messages will only be available for reading them later if storing chat "
@@ -1480,20 +1456,20 @@ msgstr ""
 "Доступ для читання повідомлень буде можливим, лише якщо ви увімкнули журнал, "
 "а контакт наявний у вашому реєстрі."
 
-#: gajim/roster_window.py:2760
+#: gajim/roster_window.py:2753
 msgid "You have unread messages"
 msgstr "У вас є непрочитані повідомлення"
 
-#: gajim/roster_window.py:2761
+#: gajim/roster_window.py:2754
 msgid "You must read them before removing this transport."
 msgstr "Вам слід прочитати їх, перш ніж вилучати цей транспорт."
 
-#: gajim/roster_window.py:2764
+#: gajim/roster_window.py:2757
 #, fuzzy, python-format
 msgid "Transport '%s' will be removed"
 msgstr "Транспорт \"%s\" буде вилучено"
 
-#: gajim/roster_window.py:2765
+#: gajim/roster_window.py:2758
 #, fuzzy
 msgid ""
 "You will no longer be able to send and receive messages from and to contacts "
@@ -1502,36 +1478,37 @@ msgstr ""
 "Ви більше не зможете надсилати і отримувати повідомлення від контактів за "
 "допомогою цього транспорту."
 
-#: gajim/roster_window.py:2768
+#: gajim/roster_window.py:2761
 msgid "Transports will be removed"
 msgstr "Транспорти буде вилучено"
 
-#: gajim/roster_window.py:2773
-#, fuzzy, python-format
+#: gajim/roster_window.py:2766
+#, 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:2777
+#: gajim/roster_window.py:2770
 #, fuzzy
 msgid "Remove Transport"
 msgstr "Показувати транс_порти"
 
-#: gajim/roster_window.py:2844
+#: gajim/roster_window.py:2837
 #, fuzzy
 msgid "Block Contact"
 msgstr "Заблоковані контакти"
 
-#: gajim/roster_window.py:2845
+#: gajim/roster_window.py:2838
 #, fuzzy
 msgid "Really block this contact?"
 msgstr "Чи увімкнено OpenPGP для цього контакту?"
 
-#: gajim/roster_window.py:2846
+#: gajim/roster_window.py:2839
 #, fuzzy
 msgid ""
 "This contact will see you offline and you will not receive any messages sent "
@@ -1540,64 +1517,59 @@ msgstr ""
 "Цей контакт буде бачити вас як \"поза мережею\" та ви не будете отримувати "
 "від нього повідомлень."
 
-#: gajim/roster_window.py:2851
+#: gajim/roster_window.py:2844
 #, fuzzy
 msgid "_Block Contact"
 msgstr "Заблоковані контакти"
 
-#: gajim/roster_window.py:2896
+#: gajim/roster_window.py:2889
 msgid "Rename Contact"
 msgstr "Перейменувати контакт"
 
-#: gajim/roster_window.py:2897
+#: gajim/roster_window.py:2890
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Введіть новий псевдонім для контакту %s"
 
-#: gajim/roster_window.py:2904
+#: gajim/roster_window.py:2897
 msgid "Rename Group"
 msgstr "Перейменувати групу"
 
-#: gajim/roster_window.py:2905
+#: gajim/roster_window.py:2898
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Введіть нову назву для групи %s"
 
-#: gajim/roster_window.py:2953 gajim/roster_window.py:2954
+#: gajim/roster_window.py:2946 gajim/roster_window.py:2947
 msgid "Remove Group"
 msgstr "Вилучити групу"
 
-#: gajim/roster_window.py:2955
+#: gajim/roster_window.py:2948
 #, fuzzy, python-format
 msgid "Do you want to remove %s from the contact list?"
 msgstr "Бажаєте вилучити групу %s з реєстру?"
 
-#: gajim/roster_window.py:2956
+#: gajim/roster_window.py:2949
 #, fuzzy
 msgid "_Also remove all contacts of this group from contact list"
 msgstr "Крім того, вилучити всі контакти з цієї групи з вашого реєстру"
 
-#: gajim/roster_window.py:3044
-#, python-format
-msgid "%(jid)s has been invited in this room"
-msgstr "%(jid)s було запрошено до цієї кімнати"
-
-#: gajim/roster_window.py:3353
+#: gajim/roster_window.py:3309
 #, fuzzy
 msgid "Remove Contact"
 msgstr "Перейменувати контакт"
 
-#: gajim/roster_window.py:3354
+#: gajim/roster_window.py:3310
 #, fuzzy
 msgid "Remove contact from contact list"
 msgstr "Вилучає контакт з реєстру"
 
-#: gajim/roster_window.py:3355
+#: gajim/roster_window.py:3311
 #, 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:3364 gajim/roster_window.py:3384
+#: gajim/roster_window.py:3320 gajim/roster_window.py:3340
 #, fuzzy
 msgid ""
 "By removing this contact you also remove authorization. This means the "
@@ -1606,51 +1578,53 @@ msgstr ""
 "Вилучаючи цей контакт ви також відкликаєте авторизацію, тобто тепер вас "
 "бачитимуть як поза мережею."
 
-#: gajim/roster_window.py:3375
+#: gajim/roster_window.py:3331
 msgid "Do you want to continue?"
 msgstr "Бажаєте продовжити виконання операції?"
 
-#: gajim/roster_window.py:3386
+#: gajim/roster_window.py:3342
 #, fuzzy
 msgid "_I want this contact to know my status after removal"
 msgstr "Я хочу, щоб цей контакт знав про мій стан після вилучення"
 
-#: gajim/roster_window.py:3393
+#: gajim/roster_window.py:3349
 #, fuzzy
 msgid "Remove contacts from contact list"
 msgstr "Вилучає контакт з реєстру"
 
-#: gajim/roster_window.py:3399
-#, fuzzy, python-format
+#: gajim/roster_window.py:3355
+#, python-format
 msgid ""
 "By removing the following contacts, you will also remove authorization. This "
 "means they will see you as offline:\n"
 "\n"
 "%s"
 msgstr ""
-"Вилучаючи цей контакт ви також відкликаєте авторизацію, тобто тепер вас "
-"бачитимуть як поза мережею."
+"Вилучаючи ці контакти, ви також відкликаєте авторизацію, тобто тепер вас "
+"бачитимуть як поза мережею:\n"
+"\n"
+"%s"
 
-#: gajim/roster_window.py:3403
+#: gajim/roster_window.py:3359
 #, fuzzy
 msgid "Remove Contacts"
 msgstr "Перейменувати контакт"
 
-#: gajim/roster_window.py:3423
+#: gajim/roster_window.py:3379
 msgid "No account available"
 msgstr "Немає жодного облікового запису"
 
-#: gajim/roster_window.py:3424
+#: gajim/roster_window.py:3380
 msgid "You must create an account before you can chat with other contacts."
 msgstr ""
 "Перш ніж ви зможете розпочати балачку з контактами, вам слід створити "
 "обліковий запис."
 
-#: gajim/roster_window.py:4060
+#: gajim/roster_window.py:4011
 msgid "Metacontacts storage not supported by your server"
 msgstr "Збереження метаконтактів не підтримується вашим сервером"
 
-#: gajim/roster_window.py:4062
+#: gajim/roster_window.py:4013
 msgid ""
 "Your server does not support storing metacontacts information. So this "
 "information will not be saved on next reconnection."
@@ -1658,12 +1632,12 @@ msgstr ""
 "Ваш сервер не підтримує збереження відомостей щодо метаконтактів. Отже ці "
 "відомості не буде збережено до наступного з’єднання."
 
-#: gajim/roster_window.py:4159
+#: gajim/roster_window.py:4110
 #, fuzzy
 msgid "You are about to create a metacontact"
 msgstr "Ви маєте намір створити метаконтакт. Ви справді цього бажаєте?"
 
-#: gajim/roster_window.py:4160
+#: gajim/roster_window.py:4111
 #, fuzzy
 msgid ""
 "Metacontacts are a way to regroup several contacts in one single contact. "
@@ -1674,26 +1648,26 @@ msgstr ""
 "списку. Загалом кажучи, метаконтакти використовуються, якщо вашим контактом "
 "є особа з декількома обліковими записами або транспортами Jabber."
 
-#: gajim/roster_window.py:4164
+#: gajim/roster_window.py:4115
 #, fuzzy
 msgid "Create Metacontact"
 msgstr "Перейменувати контакт"
 
-#: gajim/roster_window.py:4170
+#: gajim/roster_window.py:4121 gajim/data/gui/groupchat_creation.ui:317
 #, fuzzy
 msgid "_Create"
 msgstr "Творчий"
 
-#: gajim/roster_window.py:4287
+#: gajim/roster_window.py:4238
 msgid "Invalid file URI:"
 msgstr "Некоректна адреса файла:"
 
-#: gajim/roster_window.py:4298
+#: gajim/roster_window.py:4249
 #, fuzzy
 msgid "Send file?"
 msgstr "Надіслати _файл"
 
-#: gajim/roster_window.py:4299
+#: gajim/roster_window.py:4250
 #, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
@@ -1701,97 +1675,88 @@ msgstr[0] "Ви справді бажаєте надіслати цей файл
 msgstr[1] "Ви справді бажаєте надіслати ці файли до %s:"
 msgstr[2] "Ви справді бажаєте надіслати ці файли до %s:"
 
-#: gajim/roster_window.py:4451
+#: gajim/roster_window.py:4401
 #, fuzzy, python-format
 msgid "Send %(from)s to %(to)s"
 msgstr "Надіслати %s до %s"
 
-#: gajim/roster_window.py:4464
+#: gajim/roster_window.py:4414
 #, python-format
 msgid "Make %s first contact"
 msgstr "Зробити %s першим контактом."
 
-#: gajim/roster_window.py:4469
+#: gajim/roster_window.py:4419
 #, fuzzy, python-format
 msgid "Make %(contact1)s and %(contact2)s metacontacts"
 msgstr "Робить %s та %s метаконтактом."
 
-#: gajim/roster_window.py:4825 gajim/roster_window.py:4923
+#: gajim/roster_window.py:4775 gajim/roster_window.py:4862
 msgid "_Change Status Message"
 msgstr "_Змінити повідомлення про стан"
 
-#: gajim/roster_window.py:4845
+#: gajim/roster_window.py:4795
 msgid "Publish Tune"
 msgstr "Оприлюднити музику"
 
-#: gajim/roster_window.py:4856
+#: gajim/roster_window.py:4806
 msgid "Publish Location"
 msgstr "Оприлюднити положення"
 
-#: gajim/roster_window.py:4868
-#, fuzzy
-msgid "Configure Services…"
-msgstr "Налаштувати служби..."
-
-#: gajim/roster_window.py:4997
+#: gajim/roster_window.py:4936
 msgid "_Maximize All"
 msgstr "_Максимізувати всі"
 
-#: gajim/roster_window.py:5004 gajim/roster_window.py:5146
+#: gajim/roster_window.py:4943 gajim/roster_window.py:5085
 msgid "Send Group M_essage"
 msgstr "Надіслати групове п_овідомлення"
 
-#: gajim/roster_window.py:5011
+#: gajim/roster_window.py:4950
 msgid "To all users"
 msgstr "Усім користувачам"
 
-#: gajim/roster_window.py:5015
+#: gajim/roster_window.py:4954
 msgid "To all online users"
 msgstr "Усім користувачам на зв'язку"
 
-#: gajim/roster_window.py:5027 gajim/roster_window.py:5152
+#: gajim/roster_window.py:4966 gajim/roster_window.py:5091
 #: gajim/data/gui/gc_occupants_menu.ui:110
 #: gajim/data/gui/contact_context_menu.ui:36
 msgid "In_vite to"
 msgstr "За_просити до"
 
-#: gajim/roster_window.py:5162
+#: gajim/roster_window.py:5101
 msgid "_Manage Contacts"
 msgstr "_Керування контактами"
 
-#: gajim/roster_window.py:5168
+#: gajim/roster_window.py:5107
 #, fuzzy
 msgid "Edit _Groups…"
 msgstr "Редагувати _групи"
 
-#: gajim/roster_window.py:5189 gajim/data/gui/filetransfers.ui:12
+#: gajim/roster_window.py:5128 gajim/data/gui/filetransfers.ui:12
 #: gajim/data/gui/remove_account_window.ui:134
 msgid "_Remove"
 msgstr "В_илучити"
 
-#: gajim/roster_window.py:5226
+#: gajim/roster_window.py:5165
 msgid "_Maximize"
 msgstr "_Максимізувати"
 
-#: gajim/roster_window.py:5233
+#: gajim/roster_window.py:5172
 msgid "_Reconnect"
 msgstr "_Перез’єднати"
 
-#: gajim/roster_window.py:5254 gajim/data/gui/gc_occupants_menu.ui:170
+#: gajim/roster_window.py:5193 gajim/data/gui/gc_occupants_menu.ui:170
 #: gajim/data/gui/gc_control_popup_menu.ui:113
 #: gajim/data/gui/contact_context_menu.ui:205
 msgid "_History"
 msgstr "_Журнал"
 
-#: gajim/roster_window.py:5335 gajim/data/gui/application_menu.ui:86
+#: gajim/roster_window.py:5274 gajim/data/gui/application_menu.ui:83
 #: gajim/data/gui/history_window.ui:57
 msgid "History Manager"
 msgstr "Керування журналом"
 
-#: gajim/roster_window.py:5343
-msgid "_Join New Group Chat"
-msgstr "_Приєднатись до нової групової балачки"
-
 #: gajim/dataforms_widget.py:585
 msgid "Unable to load image"
 msgstr "Не вдалося завантажити зображення"
@@ -1916,226 +1881,242 @@ msgstr "Тема: %s\n"
 msgid "Write a message…"
 msgstr "Отримано повідомлення"
 
-#: gajim/message_window.py:250
+#: gajim/message_window.py:356
+#, fuzzy
+msgid "Close Tabs"
+msgstr "_Надіслати і закрити"
+
+#: gajim/message_window.py:357
 msgid "You are going to close several tabs"
 msgstr "Ви збираєтесь закрити кілька вкладок"
 
-#: gajim/message_window.py:251
+#: gajim/message_window.py:358
 msgid "Do you really want to close them all?"
 msgstr "Ви справді бажаєте закритити їх усі?"
 
-#: gajim/message_window.py:539
+#: gajim/message_window.py:514
 #, fuzzy
 msgid "?Noun:Chats"
 msgstr "Групові балачки"
 
-#: gajim/message_window.py:543
+#: gajim/message_window.py:518
 #, fuzzy
 msgid "Group Chats"
 msgstr "Групові балачки"
 
-#: gajim/message_window.py:547
+#: gajim/message_window.py:522
 msgid "Private Chats"
 msgstr "Конфіденційні балачки"
 
-#: gajim/message_window.py:553
+#: gajim/message_window.py:528
 msgid "Messages"
 msgstr "Повідомлення"
 
-#: gajim/gui_interface.py:173
+#: gajim/gui_interface.py:170
+#, 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:175
 msgid "Do you accept this request?"
 msgstr "Чи приймаєте ви цей запит?"
 
-#: gajim/gui_interface.py:175
-#, python-format
-msgid "Do you accept this request on account %s?"
+#: gajim/gui_interface.py:177
+#, fuzzy, python-format
+msgid "Do you accept this request (account: %s)?"
 msgstr "Чи приймаєте ви запит щодо облікового запису %s?"
 
-#: gajim/gui_interface.py:178
-#, 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:182
+#, fuzzy
+msgid "Authorization"
+msgstr "Було надіслано уповноваження"
+
+#: gajim/gui_interface.py:186 gajim/gui_interface.py:420
+#: gajim/gtk/filetransfer.py:338
+#, fuzzy
+msgid "_No"
+msgstr "Ні"
 
-#: gajim/gui_interface.py:194 gajim/gtk/notification.py:175
+#: gajim/gui_interface.py:205 gajim/gtk/notification.py:175
 #: gajim/gtk/notification.py:197
 msgid "Connection Failed"
 msgstr "Спроба з’єднання завершилася невдало"
 
-#: gajim/gui_interface.py:279 gajim/gui_interface.py:529
-msgid "Password Required"
-msgstr "Слід ввести пароль"
-
-#: gajim/gui_interface.py:280
-#, python-format
-msgid "A Password is required to join the room %s. Please type it."
-msgstr ""
-"Для приєднання до кімнати %s потрібен пароль. Будь ласка, введіть його."
-
-#: gajim/gui_interface.py:342 gajim/gui_interface.py:346
+#: gajim/gui_interface.py:325 gajim/gui_interface.py:329
 #, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr "Помилка %(code)s: %(msg)s"
 
-#: gajim/gui_interface.py:357 gajim/gui_interface.py:376
+#: gajim/gui_interface.py:340 gajim/gui_interface.py:359
 #: gajim/common/modules/message.py:122
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "помилка під час надсилання %(message)s ( %(error)s )"
 
-#: gajim/gui_interface.py:401 gajim/gtk/notification.py:175
+#: gajim/gui_interface.py:384 gajim/gtk/notification.py:175
 msgid "Subscription request"
 msgstr "Запит на підписку"
 
-#: gajim/gui_interface.py:413 gajim/common/contacts.py:184
-#: gajim/common/helpers.py:83
+#: gajim/gui_interface.py:396 gajim/common/contacts.py:200
+#: gajim/common/helpers.py:86
 msgid "Observers"
 msgstr "Спостерігачі"
 
-#: gajim/gui_interface.py:422
+#: gajim/gui_interface.py:405
 msgid "Authorization accepted"
 msgstr "Уповноваження прийнято"
 
-#: gajim/gui_interface.py:423
+#: gajim/gui_interface.py:406
 #, fuzzy, python-format
 msgid "The contact \"%s\" has authorized you to see their status."
 msgstr "Контакт «%s» уповноважив вас на перегляд свого стану."
 
-#: gajim/gui_interface.py:431
-#, python-format
-msgid "Contact \"%s\" removed subscription from you"
+#: gajim/gui_interface.py:415
+#, fuzzy
+msgid "Subscription Removed"
+msgstr "Запит на підписку"
+
+#: gajim/gui_interface.py:416
+#, fuzzy, python-format
+msgid "Contact '%s' removed subscription from you"
 msgstr "Контакт «%s» вилучив вашу підписку"
 
-#: gajim/gui_interface.py:432
+#: gajim/gui_interface.py:417
 #, fuzzy
 msgid ""
-"You will always see them as offline.\n"
+"You will always see this contact as offline.\n"
 "Do you want to remove them from your contact list?"
 msgstr ""
 "Цей контакт завжди буде показано зі станом «поза мережею».\n"
 "Бажаєте вилучити контакт з вашого списку контактів?"
 
-#: gajim/gui_interface.py:453 gajim/gtk/notification.py:176
+#: gajim/gui_interface.py:442 gajim/gtk/notification.py:176
 msgid "Unsubscribed"
 msgstr "_Непідписаний"
 
-#: gajim/gui_interface.py:465
+#: gajim/gui_interface.py:454
 #, python-format
 msgid "%(jid)s declined the invitation: %(reason)s"
 msgstr "%(jid)s відхилив запрошення: %(reason)s"
 
-#: gajim/gui_interface.py:469
+#: gajim/gui_interface.py:458
 #, python-format
 msgid "%(jid)s declined the invitation"
 msgstr "%(jid)s відхилив запрошення"
 
-#: gajim/gui_interface.py:485
+#: gajim/gui_interface.py:474
 #, python-brace-format
 msgid "You are invited to {room} by {user}"
 msgstr "Вас запрошено до {room} від {user}"
 
-#: gajim/gui_interface.py:506
+#: gajim/gui_interface.py:495
 msgid "Certificate Passphrase Required"
 msgstr "Потрібна кодова фраза для сертифікату"
 
-#: gajim/gui_interface.py:507
+#: gajim/gui_interface.py:496
 #, fuzzy, python-format
 msgid "Enter the certificate passphrase for account %s"
 msgstr "Введіть пароль ключа GPG для сертифікату від облікового запису %s"
 
-#: gajim/gui_interface.py:516 gajim/gtk/accounts.py:963
+#: gajim/gui_interface.py:505 gajim/gtk/accounts.py:966
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Введіть ваш пароль для облікового запису %s"
 
-#: gajim/gui_interface.py:529 gajim/gtk/accounts.py:964
+#: gajim/gui_interface.py:518
+msgid "Password Required"
+msgstr "Слід ввести пароль"
+
+#: gajim/gui_interface.py:518 gajim/gtk/accounts.py:967
 msgid "Save password"
 msgstr "Зберегти пароль"
 
-#: gajim/gui_interface.py:601 gajim/gui_interface.py:632
+#: gajim/gui_interface.py:587 gajim/gui_interface.py:618
+#: gajim/gtk/filetransfer.py:332 gajim/gtk/filetransfer.py:333
 #: gajim/gtk/notification.py:173 gajim/gtk/notification.py:276
 msgid "File Transfer Error"
 msgstr "Помилка під час передавання файла"
 
-#: gajim/gui_interface.py:666
+#: gajim/gui_interface.py:652
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s бажає надіслати вам файл."
 
-#: gajim/gui_interface.py:668 gajim/gtk/filetransfer.py:479
+#: gajim/gui_interface.py:654 gajim/gtk/filetransfer.py:484
 #: gajim/gtk/notification.py:172 gajim/gtk/notification.py:274
 msgid "File Transfer Request"
 msgstr "Запит на передавання файла"
 
-#: gajim/gui_interface.py:767
+#: gajim/gui_interface.py:753
 #, fuzzy
 msgid "Remote Contact Stopped Transfer"
 msgstr "Віддалений контакт зупинив передавання файлу"
 
-#: gajim/gui_interface.py:772
+#: gajim/gui_interface.py:758
 #, fuzzy
 msgid "Error Opening File"
 msgstr "Помилка під час спроби прочитати файл"
 
-#: gajim/gui_interface.py:782
+#: gajim/gui_interface.py:768
 #, fuzzy
 msgid "SSL Certificate Error"
 msgstr "Помилка сертифіката SSL"
 
-#: gajim/gui_interface.py:795 gajim/gui_interface.py:826
-#: gajim/gui_interface.py:853 gajim/gtk/notification.py:174
+#: gajim/gui_interface.py:781 gajim/gui_interface.py:812
+#: gajim/gui_interface.py:839 gajim/gtk/notification.py:174
 #: gajim/gtk/notification.py:279
 msgid "File Transfer Stopped"
 msgstr "Зупинка передавання файла"
 
-#: gajim/gui_interface.py:799
+#: gajim/gui_interface.py:785
 msgid "File Transfer Failed"
 msgstr "Перенесення файлу не вдалося"
 
-#: gajim/gui_interface.py:822
+#: gajim/gui_interface.py:808
 #, fuzzy, python-format
 msgid "%(filename)s received from %(name)s."
 msgstr "Передавання файлу·%(filename)s·від·%(name)s невдале"
 
-#: gajim/gui_interface.py:827
+#: gajim/gui_interface.py:813
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Передавання файлу·%(filename)s·від·%(name)s·зупинено."
 
-#: gajim/gui_interface.py:833
+#: gajim/gui_interface.py:819
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s failed."
 msgstr "Передавання файлу·%(filename)s·від·%(name)s невдале"
 
-#: gajim/gui_interface.py:848
+#: gajim/gui_interface.py:834
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Ви успішно надіслали %(filename)s до %(name)s."
 
-#: gajim/gui_interface.py:854
+#: gajim/gui_interface.py:840
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Надсилання файлу %(filename)s до %(name)s зупинено"
 
-#: gajim/gui_interface.py:860
+#: gajim/gui_interface.py:846
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s failed."
 msgstr "Надсилання файлу %(filename)s до %(name)s невдале."
 
-#: gajim/gui_interface.py:971
+#: gajim/gui_interface.py:957
 msgid "Username Conflict"
 msgstr "Конфлікт імен користувачів"
 
-#: gajim/gui_interface.py:972
+#: gajim/gui_interface.py:958
 msgid "Please type a new username for your local account"
 msgstr ""
 "Будь ласка, введіть нове ім'я користувача для вашого локального облікового "
 "запису"
 
-#: gajim/gui_interface.py:995
+#: gajim/gui_interface.py:981
 msgid "Resource Conflict"
 msgstr "Конфлікт ресурсів"
 
-#: gajim/gui_interface.py:996
+#: gajim/gui_interface.py:982
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
@@ -2143,31 +2124,31 @@ msgstr ""
 "Ваш клієнт вже з’єднано з цим обліковим записом і тим самим ресурсом. Будь "
 "ласка, вкажіть інший ресурс"
 
-#: gajim/gui_interface.py:1053
+#: gajim/gui_interface.py:1039
 #, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s бажає розпочати голосову розмову."
 
-#: gajim/gui_interface.py:1055
+#: gajim/gui_interface.py:1041
 msgid "Voice Chat Request"
 msgstr "Запит на голосову розмову"
 
-#: gajim/gui_interface.py:1123 gajim/gtk/account_wizard.py:312
+#: gajim/gui_interface.py:1109 gajim/gtk/account_wizard.py:312
 msgid "Certificate Already in File"
 msgstr "Сертифікат вже наявний у файлі"
 
-#: gajim/gui_interface.py:1124 gajim/gtk/account_wizard.py:313
+#: gajim/gui_interface.py:1110 gajim/gtk/account_wizard.py:313
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr ""
 "Цей сертифікат вже існує у файлі %s, програма не буде додавати його ще раз."
 
-#: gajim/gui_interface.py:1145
+#: gajim/gui_interface.py:1131
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid"
 msgstr "Достовірність сертифіката %s знаходиться під питанням."
 
-#: gajim/gui_interface.py:1148
+#: gajim/gui_interface.py:1134
 #, python-format
 msgid ""
 "\n"
@@ -2176,7 +2157,7 @@ msgstr ""
 "\n"
 "Невідома помилка SSL: %d"
 
-#: gajim/gui_interface.py:1150
+#: gajim/gui_interface.py:1136
 #, python-format
 msgid ""
 "\n"
@@ -2185,11 +2166,11 @@ msgstr ""
 "\n"
 "Помилка SSL: <b>%s</b>"
 
-#: gajim/gui_interface.py:1155
+#: gajim/gui_interface.py:1141
 msgid "Error verifying SSL certificate"
 msgstr "Помилка під час перевірки сертифіката SSL"
 
-#: gajim/gui_interface.py:1156
+#: gajim/gui_interface.py:1142
 #, fuzzy, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your XMPP server: "
@@ -2200,7 +2181,7 @@ msgstr ""
 "помилка: %(error)s\n"
 "Ви все ще маєте намір з’єднатися з сервером?"
 
-#: gajim/gui_interface.py:1160 gajim/gtk/account_wizard.py:412
+#: gajim/gui_interface.py:1146 gajim/gtk/account_wizard.py:413
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -2215,191 +2196,180 @@ msgstr ""
 "Відбиток SHA256 сертифікату:\n"
 "%(sha256)s"
 
-#: gajim/gui_interface.py:1166
+#: gajim/gui_interface.py:1152
 msgid "Ignore this error for this certificate."
 msgstr "Ігнорувати цю помилку для цього сертифіката."
 
-#: gajim/gui_interface.py:1174
+#: gajim/gui_interface.py:1160
 #, python-format
 msgid "SSL Certificate Verification for %s"
 msgstr "Перевірка сертифіката SSL для %s"
 
-#: gajim/gui_interface.py:1442 gajim/gtk/join_groupchat.py:235
-msgid "You can not join a group chat unless you are connected."
-msgstr ""
-"Вам слід з’єднати ваш обліковий запис, щоб взяти участь у груповій балачці."
-
-#: gajim/gui_interface.py:1448
-#, fuzzy
-msgid "JID is not a Groupchat"
-msgstr "Це не групова балачка"
-
-#: gajim/gui_interface.py:1579
-msgid "This is not a group chat"
-msgstr "Це не групова балачка"
-
-#: gajim/gui_interface.py:1580
-#, python-format
-msgid ""
-"%(room_jid)s is already in your roster. Please check if %(room_jid)s is a "
-"correct group chat name. If it is, delete it from your roster and try "
-"joining the group chat again."
-msgstr ""
-
-#: gajim/gui_interface.py:1604 gajim/dialog_messages.py:58
+#: gajim/gui_interface.py:1577
 msgid "You cannot join a group chat while you are invisible"
 msgstr "Ви не можете приєднуватися до групової балачки зі станом «невидимий»"
 
-#: gajim/gui_interface.py:2037
+#: gajim/gui_interface.py:1976
 msgid "Could not save your settings and preferences"
 msgstr "Не вдалося зберегти ваші налаштування і параметри"
 
-#: gajim/gui_interface.py:2098
+#: gajim/gui_interface.py:2037
 msgid "Gajim: IPython Console"
 msgstr ""
 
-#: gajim/dialog_messages.py:32
+#: gajim/dialog_messages.py:31 gajim/dialog_messages.py:36
+#: gajim/gtk/single_message.py:305 gajim/gtk/account_wizard.py:229
 #, fuzzy
-msgid "You can not start a new conversation unless you are connected."
-msgstr ""
-"Вам слід з’єднати ваш обліковий запис, щоб взяти участь у груповій балачці."
-
-#: gajim/dialog_messages.py:36 gajim/dialog_messages.py:41
-#: gajim/gtk/single_message.py:305 gajim/gtk/join_groupchat.py:211
-#: gajim/gtk/account_wizard.py:229
-msgid "Invalid JID"
-msgstr "Некоректний JID"
+msgid "Invalid XMPP Address"
+msgstr "Некоректний файл"
 
-#: gajim/dialog_messages.py:42 gajim/gtk/single_message.py:306
-#, python-format
-msgid "It is not possible to send a message to %s, this JID is not valid."
+#: gajim/dialog_messages.py:37
+#, fuzzy, python-format
+msgid ""
+"It is not possible to send a message to %s. This XMPP Address is not valid."
 msgstr "Неможливо надіслати повідомлення до %s, вказаний JID не є коректним."
 
-#: gajim/dialog_messages.py:47
-msgid "Unread events"
+#: gajim/dialog_messages.py:42
+#, fuzzy
+msgid "Unread Events"
 msgstr "Непрочитані події"
 
-#: gajim/dialog_messages.py:48
-msgid "Read all pending events before removing this account."
+#: gajim/dialog_messages.py:43
+#, fuzzy
+msgid "Read or acknowledge all pending events before removing this account."
 msgstr ""
 "Перш ніж вилучати цей обліковий запис, прочитайте усі повідомлення з черги "
 "подій."
 
-#: gajim/dialog_messages.py:52
+#: gajim/dialog_messages.py:48
 msgid "Invalid Form"
 msgstr "Некоректна форма"
 
-#: gajim/dialog_messages.py:53
+#: gajim/dialog_messages.py:49
 msgid "The form is not filled correctly."
 msgstr "Форму заповнено некоректно"
 
-#: gajim/dialog_messages.py:57 gajim/common/helpers.py:309
+#: gajim/dialog_messages.py:53 gajim/common/helpers.py:315
 msgid "Invisible"
 msgstr "Невидимка"
 
-#: gajim/dialog_messages.py:62
-msgid "A connection is not available"
-msgstr "З'єднання недоступне"
+#: gajim/dialog_messages.py:54
+#, fuzzy
+msgid "You cannot join a group chat while being invisible."
+msgstr "Ви не можете приєднуватися до групової балачки зі станом «невидимий»"
 
-#: gajim/dialog_messages.py:63
+#: gajim/dialog_messages.py:58
+#, fuzzy
+msgid "No Connection Available"
+msgstr "З’єднання недоступне"
+
+#: gajim/dialog_messages.py:59
 msgid "Your message can not be sent until you are connected."
 msgstr "Ваше повідомлення не може бути відправлене до встановлення з'єднання."
 
-#: gajim/dialog_messages.py:67
-#, fuzzy
-msgid "JID already in list"
-msgstr "Ідентифікатор Jabber вже є у списку"
+#: gajim/dialog_messages.py:63
+msgid "XMPP Address Already in List"
+msgstr ""
 
-#: gajim/dialog_messages.py:68
+#: gajim/dialog_messages.py:64
 #, fuzzy
-msgid "The JID you entered is already in the list. Choose another one."
+msgid ""
+"The XMPP Address you entered is already in the list. Please choose another "
+"one."
 msgstr ""
 "Введений вами ідентифікатор Jabber вже є у списку. Оберіть якийсь інший."
 
-#: gajim/dialog_messages.py:72
-msgid "Invalid answer"
+#: gajim/dialog_messages.py:69
+#, fuzzy
+msgid "Invalid Answer"
 msgstr "Некоректна відповідь"
 
-#: gajim/dialog_messages.py:73
+#: gajim/dialog_messages.py:70
 #, python-format
 msgid "Transport %(name)s answered wrongly to register request: %(error)s"
 msgstr ""
 "Транспорт %(name)s надіслав помилкову відповідь на запит щодо реєстрації: "
 "%(error)s"
 
-#: gajim/dialog_messages.py:78
+#: gajim/dialog_messages.py:75
 #, fuzzy
 msgid "Wrong Custom Hostname"
 msgstr "Використовувати інші вузол/порт"
 
-#: gajim/dialog_messages.py:79
-#, python-format
-msgid "Wrong custom hostname \"%s\". Ignoring it."
+#: gajim/dialog_messages.py:76
+#, fuzzy, python-format
+msgid "Custom hostname \"%s\" is wrong. It will be ignored."
 msgstr "Неправильне ім'я сеерверу \"%s\". Ігноруємо його."
 
-#: gajim/dialog_messages.py:83
-msgid "Error while removing privacy list"
+#: gajim/dialog_messages.py:80
+#, fuzzy
+msgid "Error While Removing Privacy List"
 msgstr "Помилка під час вилучення списку конфіденційності"
 
-#: gajim/dialog_messages.py:84
-#, python-format
+#: gajim/dialog_messages.py:81
+#, fuzzy, python-format
 msgid ""
-"Privacy list %s has not been removed. It is maybe active in one of your "
-"connected resources. Deactivate it and try again."
+"Privacy list %s has not been removed. It is probably active in one of your "
+"connected resources. Please deactivate it and try again."
 msgstr ""
 "Список конфіденційності %s не було вилучено. Ймовірно, він використовується "
 "у одному з ресурсів, з яким з’єднано ваш клієнт. Вимкніть цей ресурс і "
 "повторіть спробу."
 
-#: gajim/dialog_messages.py:90
-msgid "Invisibility not supported"
+#: gajim/dialog_messages.py:87
+#, fuzzy
+msgid "Invisibility Not Supported"
 msgstr "Невидимість не підтримується"
 
-#: gajim/dialog_messages.py:91
-#, python-format
-msgid "Account %s doesn't support invisibility."
+#: gajim/dialog_messages.py:88
+#, fuzzy, python-format
+msgid "This account %s doesn't support invisibility."
 msgstr "Обліковий запис %s не підтримує невидимості."
 
-#: gajim/dialog_messages.py:95
-msgid "Unregister failed"
+#: gajim/dialog_messages.py:92
+#, fuzzy
+msgid "Unregister Failed"
 msgstr "Спроба скасування реєстрації завершилася невдало"
 
-#: gajim/dialog_messages.py:96
-#, python-format
-msgid "Unregistration with server %(server)s failed: %(error)s"
+#: gajim/dialog_messages.py:93
+#, fuzzy, python-format
+msgid "Unregistration on server %(server)s failed: %(error)s"
 msgstr ""
 "Видалення реєстрації з серверу %(server)s не вдалося через помилку: %(error)s"
 
-#: gajim/dialog_messages.py:100
-msgid "Registration succeeded"
+#: gajim/dialog_messages.py:97
+#, fuzzy
+msgid "Registration Succeeded"
 msgstr "Реєстрацію завершено"
 
-#: gajim/dialog_messages.py:101
-#, python-format
-msgid "Registration with agent %s succeeded"
+#: gajim/dialog_messages.py:98
+#, fuzzy, python-format
+msgid "Registration with agent %s succeeded."
 msgstr "Реєстрацію з агентом %s вдало закінчено"
 
-#: gajim/dialog_messages.py:105 gajim/gtk/service_registration.py:215
-msgid "Registration failed"
+#: gajim/dialog_messages.py:102
+#, fuzzy
+msgid "Registration Failed"
 msgstr "Спроба з’єднання завершилася невдало"
 
-#: gajim/dialog_messages.py:106
+#: gajim/dialog_messages.py:103
 #, python-format
 msgid ""
 "Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
 msgstr ""
 "Реєстрація з агентом %(agent)s невдала через помилку %(error)s: %(error_msg)s"
 
-#: gajim/dialog_messages.py:111
+#: gajim/dialog_messages.py:108
 #, fuzzy
 msgid "Unable to Join Group Chat"
 msgstr "Не вдалося приєднатися до групової балачки"
 
-#: gajim/dialog_messages.py:116
-msgid "GStreamer error"
+#: gajim/dialog_messages.py:113
+#, fuzzy
+msgid "GStreamer Error"
 msgstr "Помилка GStreamer"
 
-#: gajim/dialog_messages.py:117
+#: gajim/dialog_messages.py:114
 #, fuzzy, python-format
 msgid ""
 "Error: %(error)s\n"
@@ -2408,20 +2378,21 @@ msgstr ""
 "Повідомлення про помилку: %s\n"
 "Відлагодження: %s"
 
-#: gajim/dialog_messages.py:121
+#: gajim/dialog_messages.py:118
 #, fuzzy
-msgid "Wrong host"
+msgid "Wrong Host"
 msgstr "Неправильний сервер"
 
-#: gajim/dialog_messages.py:122
+#: gajim/dialog_messages.py:119
 msgid "Invalid local address? :-O"
 msgstr ""
 
-#: gajim/dialog_messages.py:126
-msgid "Avahi error"
+#: gajim/dialog_messages.py:123
+#, fuzzy
+msgid "Avahi Error"
 msgstr "Помилка Avahi"
 
-#: gajim/dialog_messages.py:127
+#: gajim/dialog_messages.py:124
 #, python-format
 msgid ""
 "%s\n"
@@ -2430,66 +2401,66 @@ msgstr ""
 "%s\n"
 "Обмін локальними повідомленнями може працювати з помилками."
 
-#: gajim/dialog_messages.py:131 gajim/dialog_messages.py:136
+#: gajim/dialog_messages.py:128 gajim/dialog_messages.py:133
 #, fuzzy
-msgid "Could not request upload slot"
+msgid "Could not request upload slot for HTTP File Upload"
 msgstr "Не вдалося запустити локальну службу"
 
-#: gajim/dialog_messages.py:137
-msgid "Got unexpected response from server (see log)"
+#: gajim/dialog_messages.py:134
+msgid "Got unexpected response from server (see log)."
 msgstr ""
 
-#: gajim/dialog_messages.py:141 gajim/dialog_messages.py:146
+#: gajim/dialog_messages.py:138 gajim/dialog_messages.py:143
 #, fuzzy
-msgid "Could not open file"
+msgid "Could not Open File"
 msgstr "Не вдалося завантажити зображення"
 
-#: gajim/dialog_messages.py:142
-msgid "Exception raised while opening file (see log)"
+#: gajim/dialog_messages.py:139
+msgid "Exception raised while trying to open file (see log)."
 msgstr ""
 
-#: gajim/dialog_messages.py:151
-msgid "Unsecure"
-msgstr ""
+#: gajim/dialog_messages.py:148
+#, fuzzy
+msgid "Not Secure"
+msgstr "Не розпочато"
 
-#: gajim/dialog_messages.py:152
+#: gajim/dialog_messages.py:149
 #, fuzzy
-msgid "Server returned unsecure transport (HTTP)"
+msgid "The server returned an insecure transport (HTTP)."
 msgstr "Служба повернула повідомлення про помилку."
 
-#: gajim/dialog_messages.py:156
+#: gajim/dialog_messages.py:153
 #, fuzzy
-msgid "Could not upload file"
+msgid "Could not Upload File"
 msgstr "Не вдалося завантажити зображення"
 
-#: gajim/dialog_messages.py:157
+#: gajim/dialog_messages.py:154
 #, python-format
 msgid "HTTP response code from server: %s"
 msgstr ""
 
-#: gajim/dialog_messages.py:161
+#: gajim/dialog_messages.py:158
 msgid "Upload Error"
 msgstr ""
 
-#: gajim/dialog_messages.py:166
+#: gajim/dialog_messages.py:163
 msgid "Encryption Error"
 msgstr ""
 
-#: gajim/dialog_messages.py:167
-#, fuzzy
-msgid "For the chosen encryption there is no encryption method available"
-msgstr "З'єднання недоступне"
+#: gajim/dialog_messages.py:164
+msgid "There is no encryption method available for the chosen encryption."
+msgstr ""
 
-#: gajim/dialog_messages.py:171
+#: gajim/dialog_messages.py:169
 #, fuzzy
-msgid "Avatar upload failed"
+msgid "Avatar Upload Failed"
 msgstr "Спроба оприлюднення vCard зазнала невдачі"
 
-#: gajim/privatechat_control.py:204
+#: gajim/privatechat_control.py:207
 msgid "Sending private message failed"
 msgstr "Спроба надсилання конфіденційного повідомлення зазнала невдачі"
 
-#: gajim/privatechat_control.py:206
+#: gajim/privatechat_control.py:209
 #, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr ""
@@ -2513,7 +2484,7 @@ msgstr "показати довідку щодо команди"
 
 #: gajim/gajim_remote.py:85
 #, fuzzy
-msgid "Lists all contacts in roster, one for each line"
+msgid "Lists all contacts in the contact list, one for each line"
 msgstr ""
 "Показує список всіх контактів з реєстру. Кожен з записів контактів буде "
 "показано у окремому рядку"
@@ -2594,11 +2565,13 @@ msgstr ""
 
 #: gajim/gajim_remote.py:118
 #, fuzzy
-msgid "Sends new chat message to a contact in the roster. Account is optional."
+msgid ""
+"Sends new chat message to a contact in the contact list. Account is optional."
 msgstr "Надіслати повідомлення контакту щоб привернути його (її) увагу"
 
 #: gajim/gajim_remote.py:120 gajim/gajim_remote.py:130
-msgid "JID of the contact that will receive the message"
+#, fuzzy
+msgid "XMPP Address of the contact that will receive the message"
 msgstr "JID контакту, який отримає це повідомлення"
 
 #: gajim/gajim_remote.py:121 gajim/gajim_remote.py:132
@@ -2612,8 +2585,10 @@ msgid "if specified, the message will be sent using this account"
 msgstr "якщо вказано, повідомлення буде надіслано з цього облікового запису"
 
 #: gajim/gajim_remote.py:127
-msgid "Sends a chat message to someone on your roster. Account is optional."
-msgstr ""
+#, fuzzy
+msgid ""
+"Sends a chat message to someone on your contact list. Account is optional."
+msgstr "Надіслати повідомлення контакту щоб привернути його (її) увагу"
 
 #: gajim/gajim_remote.py:131
 msgid "subject"
@@ -2624,12 +2599,14 @@ msgid "message subject"
 msgstr "тема повідомлення"
 
 #: gajim/gajim_remote.py:138
-msgid "Sends new message to a groupchat you've joined."
+#, fuzzy
+msgid "Sends new message to a group chat you've joined."
 msgstr ""
 "Надсилає нове повідомлення до групової балачки, до якої ви приєдналися."
 
 #: gajim/gajim_remote.py:140
-msgid "JID of the room that will receive the message"
+#, fuzzy
+msgid "XMPP Address of the group chat that will receive the message"
 msgstr "JID кімнати, де буде отримано це повідомлення"
 
 #: gajim/gajim_remote.py:147
@@ -2638,7 +2615,8 @@ msgstr "Отримує докладні відомості щодо контак
 
 #: gajim/gajim_remote.py:149 gajim/gajim_remote.py:162
 #: gajim/gajim_remote.py:192
-msgid "JID of the contact"
+#, fuzzy
+msgid "XMPP Address of the contact"
 msgstr "JID контакту"
 
 #: gajim/gajim_remote.py:153
@@ -2699,7 +2677,8 @@ msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Записує поточні значення параметрів Gajim до файла .config"
 
 #: gajim/gajim_remote.py:190
-msgid "Removes contact from roster"
+#, fuzzy
+msgid "Removes contact from contact list"
 msgstr "Вилучає контакт з реєстру"
 
 #: gajim/gajim_remote.py:193
@@ -2750,9 +2729,9 @@ msgid "Missing argument \"contact_jid\""
 msgstr "Пропущено аргумент «contact_jid»"
 
 #: gajim/gajim_remote.py:275
-#, python-format
+#, fuzzy, python-format
 msgid ""
-"'%s' is not in your roster.\n"
+"'%s' is not in your contact list.\n"
 "Please specify account for sending the message."
 msgstr ""
 "«%s» немає у реєстрі.\n"
@@ -2978,12 +2957,12 @@ msgstr "Кінець тижня"
 msgid "Weekend!"
 msgstr "Вихідні!"
 
-#: gajim/common/logger.py:192 gajim/common/logger.py:197
+#: gajim/common/logger.py:189 gajim/common/logger.py:194
 #, python-format
 msgid "%s is a directory but should be a file"
 msgstr "%s є каталогом, а має бути файлом"
 
-#: gajim/common/logger.py:217
+#: gajim/common/logger.py:214
 #, fuzzy, python-format
 msgid "Creating %s"
 msgstr "Знищення %s"
@@ -3058,22 +3037,22 @@ msgstr "%(nickname)s вийшов з мережі"
 msgid "Contact Signed Out"
 msgstr "Контакт вийшов з мережі"
 
-#: gajim/common/contacts.py:455
-msgid "Not in roster"
-msgstr "Немає у реєстрі"
-
 #: gajim/common/config.py:80
+#, fuzzy
 msgid ""
 "Show desktop notification even when a chat window is opened for this contact "
-"and does not have focus"
+"and does not have focus."
 msgstr ""
+"Дозволити сповіщення у разі встановленого стану в_ідійшов/зайнятий/тощо"
 
 #: gajim/common/config.py:81
-msgid "Play sound when user is busy"
+#, fuzzy
+msgid "Play sound even when being busy."
 msgstr "Програвати звук, коли користувач зайнятий"
 
 #: gajim/common/config.py:83
-msgid "Show only online and free for chat contacts in roster."
+#, fuzzy
+msgid "Show only online and free for chat contacts in the contact list."
 msgstr "Показувати лише користувачів в мережі або бажаючих спілкуватись"
 
 #: gajim/common/config.py:86
@@ -3081,12 +3060,16 @@ msgid "Time in minutes, after which your status changes to away."
 msgstr "Час у хвилинах, за який ваш стан буде змінено на «відсутній»."
 
 #: gajim/common/config.py:87
-msgid "$S (Away as a result of being idle more than $T min)"
+#, fuzzy
+msgid "$S (Away: Idle more than $T min)"
 msgstr ""
 "$S (Позначено як «відсутній» через відсутність активності протягом $T хв)"
 
 #: gajim/common/config.py:87
-msgid "$S will be replaced by current status message, $T by autoawaytime."
+#, fuzzy
+msgid ""
+"$S will be replaced by current status message, $T by the 'autoawaytime' "
+"value."
 msgstr ""
 "$S буде замінено поточним повідомленням про стан, $T — часом автоматичного "
 "виявлення відсутності."
@@ -3096,69 +3079,82 @@ msgid "Time in minutes, after which your status changes to not available."
 msgstr "Час у хвилинах, за який ваш стан буде змінено на «недоступний»."
 
 #: gajim/common/config.py:90
-msgid "$S (Not available as a result of being idle more than $T min)"
+#, fuzzy
+msgid "$S (Not available: Idle more than $T min)"
 msgstr ""
 "$S (Позначено як «недоступний» через відсутність активності протягом $T хв)"
 
 #: gajim/common/config.py:90
-msgid "$S will be replaced by current status message, $T by autoxatime."
+#, fuzzy
+msgid ""
+"$S will be replaced by current status message, $T by the 'autoxatime' value."
 msgstr ""
 "$S буде замінено поточним повідомленням про стан, $T — часом автоматичного "
 "виявлення недоступності."
 
 #: gajim/common/config.py:93
+#, fuzzy
 msgid ""
-"When to show notification area icon. Can be 'never', 'on_event', 'always'."
+"When to show the notification area icon. Can be 'never', 'on_event', and "
+"'always'."
 msgstr ""
 "Коли показувати піктограму у зоні сповіщень. Можливі варіанти ніколи "
 "(never), при події (on_event) та завжди (always)."
 
 #: gajim/common/config.py:94
-msgid "Allow to hide the roster window even if the tray icon is not shown."
+#, fuzzy
+msgid ""
+"Allow to hide the contact list window even if the notification area icon is "
+"not shown."
 msgstr ""
 "Дозволити ховати вікно реєстру навіть якщо піктограму сповіщення не задіяно"
 
 #: gajim/common/config.py:97
-msgid "Contact signed in notification color."
-msgstr "Колір сповіщення появи контакту"
+#, fuzzy
+msgid "Notification color for contacts signing in."
+msgstr "Сповіщати мене про в_хід контактів до мережі"
 
 #: gajim/common/config.py:98
-msgid "Contact signout notification color"
-msgstr "Колір сповіщення виходу контакту"
+#, fuzzy
+msgid "Notification color for contacts signing out."
+msgstr "Сповіщати мене про в_ихід контактів з мережі"
 
 #: gajim/common/config.py:99
 #, fuzzy
-msgid "New message notification color."
+msgid "Notification color for new message notification."
 msgstr "Колір сповіщення про новий лист або повідомлення"
 
 #: gajim/common/config.py:100
-msgid "File transfer request notification color."
-msgstr "Колір сповіщення передавання файлів"
+#, fuzzy
+msgid "Notification color for file transfer request."
+msgstr "П_овідомити мене про завершення передавання файлу"
 
 #: gajim/common/config.py:101
-msgid "File transfer error notification color."
-msgstr "Колір сповіщення про помилку передавання файлу"
+#, fuzzy
+msgid "Notification color for file transfer errors."
+msgstr "П_овідомити мене про завершення передавання файлу"
 
 #: gajim/common/config.py:102
-msgid "File transfer complete or stopped notification color."
-msgstr "Колір сповіщення про закінчене або зупинене передавання файлів"
+msgid "Notification color for stopped or completed file transfers."
+msgstr ""
 
 #: gajim/common/config.py:103
-msgid "Groupchat invitation notification color"
-msgstr "Колір запрошення до групової балачки"
+msgid "Notification color for group chat invitations."
+msgstr ""
 
 #: gajim/common/config.py:104
 #, fuzzy
-msgid "Background color of status changed notification"
+msgid "Notification background color for changed status."
 msgstr "Колір контактів, які тільки-но увійшли до мережі."
 
 #: gajim/common/config.py:105
-msgid "Other dialogs color."
-msgstr "Інші кольори діалогів"
+msgid "Notification color for other dialogs."
+msgstr ""
 
 #: gajim/common/config.py:106
+#, fuzzy
 msgid ""
-"List (space separated) of rows (accounts and groups) that are collapsed."
+"List of rows (accounts and groups) that are collapsed (space separated)."
 msgstr ""
 "Список (відокремлених комами) рядків (облікових записів і груп), які буде "
 "згорнуто."
@@ -3167,8 +3163,10 @@ msgstr ""
 msgid "default"
 msgstr "типовий"
 
-#: gajim/common/config.py:113
-msgid "Language used by speller"
+#: gajim/common/config.py:113 gajim/common/config.py:424
+#: gajim/common/config.py:431
+#, fuzzy
+msgid "Language used for spell checking."
 msgstr "Мова, яку використовуватиме інструмент перевірки правопису"
 
 #: gajim/common/config.py:114
@@ -3182,10 +3180,11 @@ msgstr ""
 "'never' — ніколи не виводити час."
 
 #: gajim/common/config.py:115
+#, fuzzy
 msgid ""
 "Print time in chats using Fuzzy Clock. Value of fuzziness from 1 to 4, or 0 "
-"to disable fuzzyclock. 1 is the most precise clock, 4 the least precise one. "
-"This is used only if print_time is 'sometimes'."
+"to disable Fuzzy Clock. 1 is the most precise clock, 4 the least precise "
+"one. This is used only if 'print_time' is 'sometimes'."
 msgstr ""
 "Показувати час у балачках за допомогою Fuzzy Clock. Значення нечіткості може "
 "змінюватися у межах від 1 до 4, значення 0 вимикає нечіткий годинник. 1 — "
@@ -3203,16 +3202,18 @@ msgstr "Вважати пари символів * / _ символами фор
 #: gajim/common/config.py:120
 #, fuzzy
 msgid ""
-"If true, do not remove */_ . So *abc* will be bold but with * * not removed."
+"If enabled, do not remove */_ . So *abc* will be bold but with * * not "
+"removed."
 msgstr ""
 "Якщо має значення «True», не вилучати */_ . Наприклад, рядок *abc* "
 "вважатиметься рядком з напівжирним шрифтом після вилучення позначок * *."
 
 #: gajim/common/config.py:123
+#, fuzzy
 msgid ""
-"Uses ReStructured text markup to send HTML, plus ascii formatting if "
-"selected. For syntax, see http://docutils.sourceforge.net/docs/ref/rst/"
-"restructuredtext.html (If you want to use this, install docutils)"
+"Uses ReStructured text markup to send HTML, plus ASCII formatting if "
+"selected. Needs docutils installed (for syntax, see http://docutils."
+"sourceforge.net/docs/ref/rst/restructuredtext.html)."
 msgstr ""
 "Використовує розмітку тексту ReStructured для надсилання HTML і форматування "
 "ascii, якщо його увімкнено. Правила синтаксису можна переглянути за адресою "
@@ -3220,17 +3221,19 @@ msgstr ""
 "бажаєте користуватися ними, встановіть docutils)"
 
 #: gajim/common/config.py:132
+#, fuzzy
 msgid ""
-"Character to add after nickname when using nick completion (tab) in group "
-"chat."
+"Character to add after nickname when using nickname completion (tab) in "
+"group chat."
 msgstr ""
 "Символ, який буде додано після псевдоніма, якщо ви використовуєте "
 "автоматичне доповнення псевдоніма (tab) у груповій балачці."
 
 #: gajim/common/config.py:133
+#, fuzzy
 msgid ""
-"Character to propose to add after desired nickname when desired nickname is "
-"used by someone else in group chat."
+"Character to propose to add after desired nickname when nickname is already "
+"used in group chat."
 msgstr ""
 "Символ, який буде запропоновано додати після бажаного псевдоніма, якщо "
 "псевдонім буде використано кимось з групової балачки."
@@ -3238,22 +3241,23 @@ msgstr ""
 #: gajim/common/config.py:155
 #, fuzzy
 msgid ""
-"If true, Gajim will save roster position when hiding roster, and restore it "
-"when showing roster."
+"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:161
-msgid "Place the roster on the right in single window mode"
+msgid "Place the contact list on the right in single window mode"
 msgstr ""
 
 #: gajim/common/config.py:167
 #, fuzzy
 msgid ""
-"This option let you customize timestamp that is printed in conversation. For "
-"example \"[%H:%M] \" will show \"[hour:minute] \". See python doc on "
-"strftime for full documentation: http://docs.python.org/lib/module-time.html"
+"This option lets you customize the timestamp that is printed in "
+"conversation. For example '[%H:%M] ' will show '[hour:minute] '. See python "
+"doc on strftime for full documentation (https://docs.python.org/3/library/"
+"time.html)."
 msgstr ""
 "За допомогою цього параметра ви зможете налаштувати часову позначку, яка "
 "показуватиметься під час спілкування. Наприклад, \"[%H:%M] \" відповідатиме "
@@ -3261,278 +3265,282 @@ msgstr ""
 "дізнатися більше: http://docs.python.org/lib/module-time.html"
 
 #: gajim/common/config.py:168
-msgid "Characters that are printed before the nickname in conversations"
+#, fuzzy
+msgid "Characters that are printed before the nickname in conversations."
 msgstr "Символи, які буде показано перед псевдонімами під час спілкування"
 
 #: gajim/common/config.py:169
-msgid "Characters that are printed after the nickname in conversations"
+#, fuzzy
+msgid "Characters that are printed after the nickname in conversations."
 msgstr "Символи, які буде показано після псевдонімів під час спілкування"
 
 #: gajim/common/config.py:170
-msgid "Add * and [n] in roster title?"
-msgstr "Додати * і [n] у заголовок реєстру?"
+#, fuzzy
+msgid "If enabled, Gajim will add * and [n] in contact list window title."
+msgstr ""
+"Якщо буде позначено цей пункт, Gajim показуватиме настрій контактів у вікні "
+"реєстру"
 
 #: gajim/common/config.py:171
 #, fuzzy
 msgid ""
-"How many history messages should be restored when a chat tab/window is "
-"reopened?"
+"Number of messages from chat history to be restored when a chat tab/window "
+"is reopened."
 msgstr ""
 "Кількість рядків тесту, які слід запам’ятати з попереднього спілкування для "
 "показу під час повторного відкриття вкладки або вікна балачки."
 
 #: gajim/common/config.py:172
-msgid "How far back in time (minutes) history is restored. -1 means no limit."
-msgstr ""
-
-#: gajim/common/config.py:173
 msgid ""
-"How many lines to request from server when entering a groupchat. -1 means no "
-"limit"
+"How far back in time (minutes) chat history is restored. -1 means no limit."
 msgstr ""
-"Як багато робити запитів до сервера при під'єднанні до групової балачки. -1 "
-"означає без обмежень"
 
-#: gajim/common/config.py:174
+#: gajim/common/config.py:173
 #, fuzzy
 msgid ""
-"Minutes of backlog to request when entering a groupchat. -1 means no limit"
-msgstr ""
-"За скільки хвилин запитувати журнал, при вході у групову балачку. -1 означає "
-"без обмеження"
-
-#: gajim/common/config.py:175
-msgid ""
-"How many seconds to wait before trying to autorejoin to a conference you are "
-"being disconnected from. Set to 0 to disable autorejoining."
+"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:176
+#: gajim/common/config.py:174
 #, fuzzy
-msgid "Should autorejoin be activated when kicked from a conference?"
+msgid ""
+"Should automatic rejoin be activated when you were kicked from a group chat?"
 msgstr ""
 "Чи має бути активним автоматичне повторне підключення у випадку якщо вас "
 "викинули з конференції?"
 
-#: gajim/common/config.py:177
-msgid ""
-"Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
-"Client default behaviour)."
+#: gajim/common/config.py:175
+#, fuzzy
+msgid "Send message on Ctrl+Enter and make a new line with Enter."
 msgstr ""
 "Надсилати повідомлення за Ctrl+Enter, а за допомогою Enter розривати рядок "
 "(типова поведінка клієнта Mirabilis ICQ)."
 
-#: gajim/common/config.py:179
-msgid "How many lines to store for Ctrl+KeyUP."
+#: gajim/common/config.py:177
+#, fuzzy
+msgid "How many lines to store for Ctrl+KeyUP (previously sent messages)."
 msgstr "Кількість рядків, які слід зберігати для Ctrl+Стрілка_вгору."
 
-#: gajim/common/config.py:182
+#: gajim/common/config.py:180
 #, fuzzy, python-format
 msgid ""
-"Either custom URL with %%s in it where %%s is the word/phrase or "
-"'WIKTIONARY' which means use Wikitionary."
+"Either a custom URL with %%s in it (where %%s is the word/phrase) or "
+"'WIKTIONARY' (which means use Wikitionary)."
 msgstr ""
 "Або нетипова адреса url з підрядком %s, де %s — слово або фраза, або "
 "'WIKTIONARY' (це означає, що слід використовувати службу wiktionary)."
 
-#: gajim/common/config.py:185
+#: gajim/common/config.py:183
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr ""
 "Якщо позначено цей пункт, Gajim можна віддалено керувати за допомогою gajim-"
 "remote."
 
-#: gajim/common/config.py:187
+#: gajim/common/config.py:185
+#, fuzzy
 msgid ""
-"When not printing time for every message (print_time==sometimes), print it "
+"When not printing time for every message ('print_time'==sometimes), print it "
 "every x minutes."
 msgstr ""
 "Якщо не вказано, що програма має виводити час для кожного з повідомлень "
 "(print_time==sometimes), виводити час кожні x хвилин."
 
-#: gajim/common/config.py:188
+#: gajim/common/config.py:186
 msgid "Ask before pasting an image."
 msgstr ""
 
-#: gajim/common/config.py:189
+#: gajim/common/config.py:187
 msgid "Ask before closing a group chat tab/window."
 msgstr "Запитувати перед закриттям вкладки або вікна групової балачки."
 
-#: gajim/common/config.py:190
+#: gajim/common/config.py:188
 #, fuzzy
 msgid ""
-"Always ask for confirmation before closing groupchats with any of the JIDs "
-"on this space separated list."
+"Always ask for confirmation before closing group chats with any of the XMPP "
+"Addresses on this list (space separated)."
 msgstr ""
 "Завжди запитувати про дію перед закриттям вікна або вкладки групової "
 "балачки, яку вказано у цьому відокремленому пробілами списку jid групових "
 "балачок."
 
-#: gajim/common/config.py:191
+#: gajim/common/config.py:189
 #, fuzzy
 msgid ""
-"Never ask for confirmation before closing groupchats with any of the JIDs on "
-"this space separated list."
+"Never ask for confirmation before closing group chats with any of the XMPP "
+"Addresses on this list (space separated)."
 msgstr ""
 "Ніколи не запитувати про дію перед закриттям вікна або вкладки групової "
 "балачки, яку вказано у цьому відокремленому пробілами списку jid групових "
 "балачок."
 
-#: gajim/common/config.py:192
+#: gajim/common/config.py:190
+#, fuzzy
 msgid ""
-"Ask before closing tabbed chat window if there are controls that can lose "
-"data (chat, private chat, groupchat that will not be minimized)"
+"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:195
+#: gajim/common/config.py:193
 #, fuzzy
 msgid ""
-"Comma separated list of sent hosts, in addition of local interfaces, for "
-"File Transfer in case of address translation/port forwarding."
+"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:196
+#: gajim/common/config.py:194
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "Згідно до стандарту IEC: кіБ = 1024 байтам, кБ = 1000 байтам."
 
-#: gajim/common/config.py:198
+#: gajim/common/config.py:196
 msgid "Notify of events in the notification area."
 msgstr "Сповіщення про події у зоні сповіщень."
 
-#: gajim/common/config.py:199
+#: gajim/common/config.py:197
+#, fuzzy
 msgid ""
-"If False, Gajim will display a static event icon instead of the blinking "
-"status icon in the notification area when notifying on event."
+"If disabled, Gajim will display a static event icon instead of the blinking "
+"status icon in the notification area when notifying about an event."
 msgstr ""
 "Якщо «Ні», Gajim покаже статичну піктограму події, замість миготливого "
 "значка у зоні сповіщень."
 
-#: gajim/common/config.py:205
+#: gajim/common/config.py:203
 msgid "Show tab when only one conversation?"
 msgstr "Показувати вкладку за умови єдиної бесіди?"
 
-#: gajim/common/config.py:206
+#: gajim/common/config.py:204
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "Показувати бічну панель з вкладками у вікнах балачки?"
 
-#: gajim/common/config.py:207
+#: gajim/common/config.py:205
 msgid "Show close button in tab?"
 msgstr "Показувати кнопку закриття на вкладці?"
 
-#: gajim/common/config.py:220
+#: gajim/common/config.py:218
 msgid "Preview new messages in notification popup?"
 msgstr ""
 "Здійснювати попередній перегляд нових повідомлень у виринаючому сповіщенні?"
 
-#: gajim/common/config.py:223
+#: gajim/common/config.py:221
+#, fuzzy
 msgid ""
-"A semicolon-separated list of words that will be highlighted in group chats."
+"A list of words (semicolon separated) that will be highlighted in group "
+"chats."
 msgstr ""
 "Список відокремлених крапкою з комою слів, які буде виділено у групових "
 "балачках."
 
-#: gajim/common/config.py:224
+#: gajim/common/config.py:222
 #, fuzzy
 msgid ""
-"If true, quits Gajim when X button of Window Manager is clicked. This "
-"setting is taken into account only if notification icon is used."
+"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 ""
 "Якщо має значення «True», роботу Gajim буде завершено після натискання "
 "кнопки з позначкою «X» у менеджері вікон. Цей параметр братиметься до уваги, "
 "лише якщо використовується піктограма лотка."
 
-#: gajim/common/config.py:225
+#: gajim/common/config.py:223
 msgid ""
-"If true, Gajim hides the Roster window on pressing the X button instead of "
-"minimizing into the Dock."
+"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:226
+#: gajim/common/config.py:224
 #, fuzzy
 msgid ""
-"If true, Gajim will display an icon on each tab containing unread messages. "
-"Depending on the theme, this icon may be animated."
+"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:227
+#: gajim/common/config.py:225
 #, fuzzy
 msgid ""
-"If true, Gajim will display the status message, if not empty, for every "
-"contact under the contact name in roster window."
+"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:233
-msgid "Define the position of the avatar in roster. Can be left or right"
+#: gajim/common/config.py:231
+#, fuzzy
+msgid ""
+"Define the position of avatars in the contact list. Can be 'left' or 'right'."
 msgstr "Визначає позицію аватару у реєстрі. Можливі значення: left і right"
 
-#: gajim/common/config.py:234
+#: gajim/common/config.py:232
 #, fuzzy
 msgid ""
-"If False, Gajim will no longer print status line in chats when a contact "
-"changes their status and/or their status message."
+"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 більше не буде виводити "
 "рядок стану у балачках, коли контакт змінює свій стан і/або своє "
 "повідомлення про стан."
 
-#: gajim/common/config.py:235
+#: gajim/common/config.py:233
 #, fuzzy
 msgid ""
 "Default Setting: Show a status message for every join or leave in a group "
-"chat"
+"chat."
 msgstr "Не вдалося приєднатися до групової балачки"
 
-#: gajim/common/config.py:236
+#: gajim/common/config.py:234
+#, fuzzy
 msgid ""
-"Default Setting: Show a status message for all status (away, dnd, etc.) "
-"changes of users in a group chat"
-msgstr ""
+"Default Setting: Show a status message for all status changes (away, dnd, "
+"etc.) of users in a group chat."
+msgstr "Не вдалося приєднатися до групової балачки"
 
-#: gajim/common/config.py:238
-msgid "Log XHTML messages instead of plain text messages."
+#: gajim/common/config.py:236
+#, fuzzy
+msgid "Store XHTML messages in chat history instead of plain text messages."
 msgstr "Зберігати повідомлення як XHTML замість звичайного тексту."
 
-#: gajim/common/config.py:239
+#: gajim/common/config.py:237
 msgid "Don't show avatar for the transport itself."
 msgstr "Не показувати аватар транспорту."
 
-#: gajim/common/config.py:240
-msgid "Don't show roster in the system taskbar."
+#: gajim/common/config.py:238
+#, fuzzy
+msgid "Don't show contact list window in the system taskbar."
 msgstr "Не показувати реєстр на системній панелі задач."
 
-#: gajim/common/config.py:241
+#: gajim/common/config.py:239
 #, fuzzy
 msgid ""
-"If true, make the window flash (the default behaviour in most Window "
-"Managers) when holding pending events."
+"If enabled, Gajim makes the window flash (the default behaviour in most "
+"Window Managers) when holding pending events."
 msgstr ""
 "Якщо цей параметр матиме значення «True» і у системі буде встановлено версії "
 "GTK+ і PyGTK не старіші за 2.8, у разі наявності подій у черзі позначка "
 "вікна програми почне блимати (типова поведінка у більшості менеджерів вікон)."
 
-#: gajim/common/config.py:245
+#: gajim/common/config.py:243
+#, fuzzy
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
 "'always_with_roster' - Like 'always' but the messages are in a single window "
-"along with the roster.\n"
+"along with the contact list.\n"
 "'never' - All messages get their own window.\n"
 "'peracct' - Messages for each account are sent to a specific window.\n"
-"'pertype' - Each message type (e.g. chats vs. groupchats) is sent to a "
+"'pertype' - Each message type (e.g. chats vs. group chats) is sent to a "
 "specific window."
 msgstr ""
 "Керує вікно, куди виводяться нові повідомлення.\n"
@@ -3545,136 +3553,146 @@ msgstr ""
 "'pertype' — повідомлення буде розподілено за типом (наприклад, прості і "
 "групові балачки) між окремими вікнами."
 
-#: gajim/common/config.py:246
+#: gajim/common/config.py:244
+#, fuzzy
 msgid ""
-"Show roster on startup.\n"
-"'always' - Always show roster.\n"
-"'never' - Never show roster.\n"
-"'last_state' - Restore the last state roster."
+"Show contact list window on startup.\n"
+"'always' - Always show contact list window.\n"
+"'never' - Never show contact list window.\n"
+"'last_state' - Restore last state of the contact list window."
 msgstr ""
 "Показувати реєстр при старті.\n"
 "'always' - Завжди показувати реєстр.\n"
 "'never' - Ніколи не показувати реєстр.\n"
 "'last_state' - Відновити останній стан реєстру.ртсик"
 
-#: gajim/common/config.py:247
-msgid "If False, you will no longer see the avatar in the chat window."
+#: gajim/common/config.py:245
+#, fuzzy
+msgid "If enabled, Gajim displays the avatar in the chat window."
 msgstr ""
 "Якщо цей параметр матиме значення «False», ви не бачитимете аватарів у вікні "
 "балачки."
 
-#: gajim/common/config.py:248
+#: gajim/common/config.py:246
 #, fuzzy
-msgid "If true, pressing the escape key closes a tab/window."
+msgid "If enabled, pressing Esc closes a tab/window."
 msgstr ""
 "Якщо цей параметр матиме значення «True», натискання клавіші escape "
 "закриватиме вкладку або вікно програми."
 
-#: gajim/common/config.py:249
-msgid "Hides the banner in a group chat window"
+#: gajim/common/config.py:247
+#, fuzzy
+msgid "Hides the banner in a group chat window."
 msgstr "Приховує підпис у вікні групової балачки"
 
-#: gajim/common/config.py:250
-msgid "Hides the banner in two persons chat window"
-msgstr "Ховає підпис у вікні балачки між двома особами"
+#: gajim/common/config.py:248
+#, fuzzy
+msgid "Hides the banner in a 1:1 chat window."
+msgstr "Приховує підпис у вікні групової балачки"
 
-#: gajim/common/config.py:251
-msgid "Hides the group chat occupants list in group chat window."
+#: gajim/common/config.py:249
+#, fuzzy
+msgid "Hides the group chat participants list in a group chat window."
 msgstr "Ховає список учасників групової балачки у вікні групової балачки."
 
-#: gajim/common/config.py:252
+#: gajim/common/config.py:250
+#, fuzzy
 msgid ""
 "In a chat, show the nickname at the beginning of a line only when it's not "
-"the same person talking than in previous message."
+"the same person talking as in the previous message."
 msgstr ""
 "У балачках, показувати псевдонім на початку рядка повідомлення, лише якщо це "
 "повідомлення не тої самої особи, якою було надіслано попереднє повідомлення."
 
-#: gajim/common/config.py:253
+#: gajim/common/config.py:251
 msgid "Indentation when using merge consecutive nickname."
 msgstr ""
 "Відступ за використання об’єднання послідовних повідомлень від однієї особи."
 
-#: gajim/common/config.py:254
-msgid "Ctrl-Tab go to next composing tab when none is unread."
+#: gajim/common/config.py:252
+#, 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:255
+#: gajim/common/config.py:253
 #, fuzzy
 msgid ""
-"Show the confirm metacontacts creation dialog or not? Empty string means "
-"never show the dialog."
+"Show a confirmation dialog to create metacontacts? Empty string means never "
+"show the dialog."
 msgstr ""
-"Чи слід показувати діалогове вікно підтвердження створення метаконтактів? "
+"Чи слід показувати діалогове вікно підтвердження блокування контактів? "
 "Порожній рядок вказуватиме на те, що це діалогове вікно не слід показувати."
 
-#: gajim/common/config.py:256
+#: gajim/common/config.py:254
 #, fuzzy
 msgid ""
-"Show the confirm block contact dialog or not? Empty string means never show "
+"Show a confirmation dialog to block a contact? Empty string means never show "
 "the dialog."
 msgstr ""
 "Чи слід показувати діалогове вікно підтвердження блокування контактів? "
 "Порожній рядок вказуватиме на те, що це діалогове вікно не слід показувати."
 
-#: gajim/common/config.py:257
+#: gajim/common/config.py:255
 #, fuzzy
 msgid ""
-"Show the confirm custom status dialog or not? Empty string means never show "
-"the dialog."
+"Show a confirmation dialog for a custom status? Empty string means never "
+"show the dialog."
 msgstr ""
 "Чи слід показувати діалогове вікно підтвердження створення особливих "
 "статусів? Порожній рядок вказуватиме на те, що це діалогове вікно не слід "
 "показувати."
 
-#: gajim/common/config.py:258
+#: gajim/common/config.py:256
 #, fuzzy
 msgid ""
-"If true, you will be able to set a negative priority to your account in "
-"account modification window. BE CAREFUL, when you are logged in with a "
-"negative priority, you will NOT receive any message from your server."
+"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 ""
 "Якщо цей параметр матиме значення «True», ви зможете встановлювати від’ємне "
 "значення пріоритету для вашого облікового запису у вікні зміни параметрів "
 "облікового запису. БУДЬТЕ ОБЕРЕЖНІ за умови входу з від’ємним пріоритетом: у "
 "такому разі ви НЕ отримуватимете повідомлень від вашого сервера."
 
-#: gajim/common/config.py:259
+#: gajim/common/config.py:257
 #, fuzzy
 msgid ""
-"If true, Gajim will show number of online and total contacts in account and "
-"group rows."
+"If enabled, Gajim will show both the number of online and total contacts in "
+"account rows as well as in group rows."
 msgstr ""
 "Якщо цей параметр матиме значення «True», Gajim показуватиме кількість "
 "контактів у мережі і загальну кількість контактів у рядках облікових записів "
 "і груп."
 
-#: gajim/common/config.py:260
+#: gajim/common/config.py:258
+#, fuzzy
 msgid ""
-"Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
-"as if they were of this type"
+"Can be empty, 'chat' or 'normal'. If not empty, all incoming messages are "
+"treated as if they were of this type."
 msgstr ""
 "Може мати порожнє значення або значення 'chat' і 'normal'. Якщо вказано "
 "непорожнє значення, вважати всі вхідні повідомлення повідомленнями вказано "
 "типу"
 
-#: gajim/common/config.py:261
+#: gajim/common/config.py:259
 #, fuzzy
 msgid ""
-"If true, Gajim will scroll and select the contact who sent you the last "
-"message, if chat window is not already opened."
+"If enabled, Gajim will scroll and select the contact who sent you the last "
+"message, if the chat window is not already opened."
 msgstr ""
 "Якщо цей параметр матиме значення «True», Gajim гортатиме список і обиратиме "
 "у ньому контакт, яким вам було надіслано останнє повідомлення, якщо вікно "
 "балачки ще не було відкрито."
 
-#: gajim/common/config.py:262
+#: gajim/common/config.py:260
 msgid "Time of inactivity needed before the change status window closes down."
 msgstr "Час відсутності активності потрібний для закриття вікна зміни стану."
 
-#: gajim/common/config.py:263
+#: gajim/common/config.py:261
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
@@ -3682,88 +3700,92 @@ msgstr ""
 "Максимальна кількість рядків, які буде показано протягом спілкування. "
 "Застарілі рядки понад вказане число вилучатимуться."
 
-#: gajim/common/config.py:264
+#: gajim/common/config.py:262
 #, fuzzy
 msgid ""
-"If true, notification windows from notification-daemon will be attached to "
-"notification icon."
+"If enabled, notification windows from notification-daemon will be attached "
+"to the notification area icon."
 msgstr ""
 "Якщо цей параметр матиме значення «True», вікна сповіщення від фонової "
 "служби сповіщення (notification-daemon) буде приєднано до піктограми у "
 "системному лотку."
 
-#: gajim/common/config.py:265
+#: gajim/common/config.py:263
 msgid "Choose interval between 2 checks of idleness."
 msgstr ""
 "Оберіть інтервал між двома послідовними перевірками на відсутність "
 "активності."
 
-#: gajim/common/config.py:266
+#: gajim/common/config.py:264
+#, fuzzy
 msgid ""
-"Valid uri schemes. Only schemes in this list will be accepted as \"real\" "
-"uri. (mailto and xmpp are handled separately)"
+"Valid URI schemes. Only schemes in this list will be accepted as 'real' URI "
+"(mailto and xmpp are handled separately)."
 msgstr ""
 "Чинні схеми uri. «Справжніми» uri вважатимуться лише схеми вказані у списку. "
 "(mailto і xmpp обробляються окремо)"
 
-#: gajim/common/config.py:267
+#: gajim/common/config.py:265
 #, fuzzy
-msgid "If true, completion in groupchats will be like a shell auto-completion"
+msgid ""
+"If enabled, completion in group chats will be like a shell auto-completion."
 msgstr ""
 "Якщо Істино, доповнення у групових балачках будуть схожі на автодоповнення "
 "командної оболонки."
 
-#: gajim/common/config.py:272
-msgid "Optionally fix jingle output video framerate. Example: 10/1 or 25/2"
+#: gajim/common/config.py:270
+#, fuzzy
+msgid "Optionally fix Jingle output video framerate. Example: 10/1 or 25/2."
 msgstr ""
 "Опціонально виправляти частоту кадрів вихідного відео Jingle. Приклад: 10/1 "
 "або 25/2"
 
-#: gajim/common/config.py:273
-msgid "Optionally resize jingle output video. Example: 320x240"
+#: gajim/common/config.py:271
+#, fuzzy
+msgid "Optionally resize Jingle output video. Example: 320x240."
 msgstr "Опціонально змінювати розмір вихідного відео Jingle. Приклад: 320х240"
 
-#: gajim/common/config.py:274
-#, fuzzy
-msgid "If true, You will also see your webcam"
-msgstr "Якщо «Так», ви також бачитимете власну вебкамеру."
+#: gajim/common/config.py:272
+msgid "If enabled, you will see your webcam's video stream as well."
+msgstr ""
 
-#: gajim/common/config.py:277
+#: gajim/common/config.py:275
 #, fuzzy
 msgid ""
-"If true, Gajim will try to use a STUN server when using Jingle. The one in "
-"\"stun_server\" option, or the one given by the XMPP server."
+"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 спробує використати STUN-сервер для Jingle. Буде "
 "використано значення параметру \"stun_server\", або отримане з серверу "
 "Jabber."
 
-#: gajim/common/config.py:278
+#: gajim/common/config.py:276
 #, fuzzy
 msgid "STUN server to use when using Jingle"
 msgstr "Сервер STUN для використання з Jingle"
 
-#: gajim/common/config.py:279
+#: gajim/common/config.py:277
 #, fuzzy
 msgid ""
-"If true, Gajim will show affiliation of groupchat occupants by adding a "
-"colored square to the status icon"
+"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:280
+#: gajim/common/config.py:278
+#, fuzzy
 msgid ""
 "Proxy used for all outgoing connections if the account does not have a "
-"specific proxy configured"
+"specific proxy configured."
 msgstr "Проксі що використовується для усіх вихідних з’єднань не налаштовано"
 
-#: gajim/common/config.py:281
+#: gajim/common/config.py:279
 #, fuzzy
-msgid "If true, Gajim will ignore incoming attention requests (\"wizz\")."
+msgid "If enabled, Gajim will ignore incoming attention requests ('wizz')."
 msgstr "Якщо «Так», Gajim буде ігнорувати вхідні запити уваги (\"wizz\")."
 
-#: gajim/common/config.py:282
+#: gajim/common/config.py:280
 msgid ""
 "If enabled, Gajim will reopen chat windows that were opened last time Gajim "
 "was closed."
@@ -3771,70 +3793,85 @@ msgstr ""
 "Якщо активовано, Gajim буде повторно відкривати вікна балачок, що були "
 "відкриті минулого разу."
 
-#: gajim/common/config.py:283
+#: gajim/common/config.py:281
+#, fuzzy
 msgid ""
-"If enabled, Gajim will show an icon to show that sent message has been "
-"received by your contact"
+"If enabled, Gajim will display an icon to show that sent messages have been "
+"received by your contact."
 msgstr ""
 "Якщо буде позначено цей пункт, Gajim буде показувати піктограму про "
 "отримання повідомлення вашим співрозмовником."
 
-#: gajim/common/config.py:284
-msgid "Show a mini avatar in chat window tabs and in window icon"
+#: gajim/common/config.py:282
+msgid "Show a mini avatar in chat window tabs and as the window's icon."
 msgstr ""
 
-#: gajim/common/config.py:285
+#: gajim/common/config.py:283
 #, fuzzy
-msgid "If true, Gajim will use the Systems Keyring to store account passwords."
+msgid ""
+"If enabled, Gajim will use the System's Keyring to store account passwords."
 msgstr ""
 "Якщо цей параметр матиме значення «True», Gajim використовуватиме Gnome "
 "Keyring (за його наявності) для зберігання паролі облікових записів."
 
+#: gajim/common/config.py:284
+msgid "If enabled, Gajim will execute XEP-0146 Commands."
+msgstr ""
+
+#: gajim/common/config.py:285
+msgid "2: System, 1: Enabled, 0: Disabled"
+msgstr ""
+
 #: gajim/common/config.py:286
-msgid "If true, Gajim will execute XEP-0146 Commands."
+msgid "Options in days which can be chosen in the sync threshold menu"
 msgstr ""
 
 #: gajim/common/config.py:287
-msgid "2: System, 1: Enabled, 0: Disabled"
+msgid ""
+"Maximum history in days we request from a public group chat archive. 0: As "
+"much as possible."
 msgstr ""
 
 #: gajim/common/config.py:288
-msgid "Options in days which can be chosen in the sync threshold menu"
+msgid ""
+"Maximum history in days we request from a private group chat archive. 0: As "
+"much as possible."
 msgstr ""
 
 #: gajim/common/config.py:289
 msgid ""
-"Maximum history in days we request from a public room archive. 0: As much as "
-"possible"
+"If enabled, Gajim shows the group chat subject in the chat window when "
+"joining."
 msgstr ""
 
 #: gajim/common/config.py:290
+#, fuzzy
 msgid ""
-"Maximum history in days we request from a private room archive. 0: As much "
-"as possible"
+"If enabled, the contact row is colored according to the current chat state "
+"of the contact."
 msgstr ""
+"Якщо буде позначено цей пункт, Gajim дозволить іншим визначати ваш місцевий "
+"час"
 
 #: gajim/common/config.py:291
-msgid "If the room subject is shown in chat on join"
+#, fuzzy
+msgid ""
+"If enabled, the tab is colored according to the current chat state of the "
+"contact."
 msgstr ""
+"Якщо буде позначено цей пункт, Gajim дозволить іншим визначати ваш місцевий "
+"час"
 
 #: gajim/common/config.py:292
+#, fuzzy
 msgid ""
-"If the contact row is colored according to the current chatstate of the "
-"contact"
+"Shows a text in the banner that describes the current chat state of the "
+"contact."
 msgstr ""
+"Якщо буде позначено цей пункт, Gajim дозволить іншим визначати ваш місцевий "
+"час"
 
 #: gajim/common/config.py:293
-msgid "If the tab is colored according to the current chatstate of the contact"
-msgstr ""
-
-#: gajim/common/config.py:294
-msgid ""
-"Shows a text in the banner that describes the current chatstate of the "
-"contact"
-msgstr ""
-
-#: gajim/common/config.py:295 gajim/common/config.py:424
 #, fuzzy
 msgid ""
 "Chat state notifications that are sent to contacts. Possible values: all, "
@@ -3843,346 +3880,376 @@ msgstr ""
 "Надсилати сповіщення про стан балачки. Може мати значення all, "
 "composing_only, disabled."
 
-#: gajim/common/config.py:296 gajim/common/config.py:438
+#: gajim/common/config.py:294
 #, fuzzy
 msgid ""
 "Chat state notifications that are sent to the group chat. Possible values: "
-"all, composing_only, disabled"
+"'all', 'composing_only', 'disabled'"
 msgstr ""
 "Надсилати сповіщення про стан балачки. Може мати значення all, "
 "composing_only, disabled."
 
-#: gajim/common/config.py:312
+#: gajim/common/config.py:297
+msgid "API Preferences. Possible values: 'http', 'iq'"
+msgstr ""
+
+#: gajim/common/config.py:313
+#, fuzzy
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
-"defined in autopriority_* options."
+"defined in 'autopriority_*' options."
 msgstr ""
 "Пріоритет автоматично змінюватиметься залежно від вашого стану. Пріоритети "
 "визначаються за допомогою параметрів autopriority_*."
 
-#: gajim/common/config.py:320
+#: gajim/common/config.py:321
+#, fuzzy
 msgid ""
-"Status used to autoconnect as. Can be online, chat, away, xa, dnd, "
-"invisible. NOTE: this option is used only if restore_last_status is disabled"
+"Status to be used automatically when connecting. Can be 'online', 'chat', "
+"'away', 'xa', 'dnd' or 'invisible'. NOTE: This option is used only if "
+"'restore_last_status' is disabled."
 msgstr ""
 "Стан, який буде використано під час автоматичного з’єднання. Можливі "
 "значення: online, chat, away, xa, dnd, invisible. ЗАУВАЖЕННЯ: цей параметр "
 "використовуватиметься, лише якщо вимкнено параметр restore_last_status"
 
-#: gajim/common/config.py:321
-msgid "If enabled, restore the last status that was used."
+#: gajim/common/config.py:322
+#, fuzzy
+msgid "If enabled, the last status will be restored."
 msgstr "Якщо увімкнено, відновлювати попередній використаний стан."
 
-#: gajim/common/config.py:322
+#: gajim/common/config.py:323
 #, fuzzy
 msgid ""
-"If true, Contacts requesting authorization will be automatically accepted."
+"If enabled, Contacts requesting authorization will be accepted automatically."
 msgstr "Якщо Істино, усі запити авторизації буде автоматично задоволено."
 
-#: gajim/common/config.py:323
+#: gajim/common/config.py:324
+#, fuzzy
 msgid ""
-"If False, this account will be disabled and will not appear in roster window."
+"If disabled, this account will be disabled and will not appear in the "
+"contact list window."
 msgstr ""
 "Якщо цей параметр матиме значення «False», обліковий запис буде вимкнено та "
 "не буде відображатись у вікні реєстру."
 
-#: gajim/common/config.py:327
-msgid "Allow plaintext connections"
+#: gajim/common/config.py:328
+msgid "Allow plaintext connections."
 msgstr ""
 
-#: gajim/common/config.py:330
+#: gajim/common/config.py:331
 msgid ""
-"List (space separated) of authentication mechanisms to try. Can contain "
-"ANONYMOUS, EXTERNAL, GSSAPI, SCRAM-SHA-1-PLUS, SCRAM-SHA-1, DIGEST-MD5, "
-"PLAIN, X-MESSENGER-OAUTH2 or XEP-0078"
+"List of authentication mechanisms to try (space separated). Can contain "
+"'ANONYMOUS', 'EXTERNAL', 'GSSAPI', 'SCRAM-SHA-1-PLUS', 'SCRAM-SHA-1', "
+"'DIGEST-MD5', 'PLAIN', 'X-MESSENGER-OAUTH2' or 'XEP-0078'."
 msgstr ""
 
-#: gajim/common/config.py:331
+#: gajim/common/config.py:332
+#, fuzzy
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection. "
-"Can be 'warn', 'connect', 'disconnect'"
+"Can be 'warn', 'connect' or 'disconnect'."
 msgstr ""
 "Показувати діалогове вікно попередження, перш ніж надсилати пароль звичайним "
 "текстом. Може бути 'поперджати', 'з’єднувати', 'відключати'"
 
-#: gajim/common/config.py:332
+#: gajim/common/config.py:333
 msgid "Show a warning dialog before using standard SSL library."
 msgstr ""
 "Показувати діалогове вікно попередження, перш ніж користуватися стандартною "
 "бібліотекою SSL."
 
-#: gajim/common/config.py:333
+#: gajim/common/config.py:334
 msgid ""
 "Show a warning dialog before sending PLAIN password over a plain connection."
 msgstr ""
 "Показувати діалогове вікно попередження, перш ніж надсилати відкритий пароль "
 "незашифрованим з'єднанням."
 
-#: gajim/common/config.py:334
-msgid "Space separated list of ssl errors to ignore."
-msgstr "Відокремлений пробілами список помилок ssl, які слід ігнорувати."
+#: gajim/common/config.py:335
+msgid "List of SSL errors to ignore (space separated)."
+msgstr ""
 
-#: gajim/common/config.py:340
+#: gajim/common/config.py:341
+#, fuzzy
 msgid ""
-"Space separated list of JIDs for which you do not want to store logs. You "
-"can also add account name to log nothing for this account."
+"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 ""
 "Ідентифікатори JID розділені пробілами, для яких ви не бажаєте зберігати "
 "журнали. Ви можете також додати назву облікового запису для якого не буде "
 "вестись журналювання."
 
-#: gajim/common/config.py:341
+#: gajim/common/config.py:342
+#, fuzzy
 msgid ""
-"Space separated list of JIDs for which you accept to not log conversations "
-"if he does not want to."
+"List of XMPP Addresses (space separated) for which you accept to not store "
+"chat history if your contact does not want to."
 msgstr ""
 "Розділений пробілами перелік ідентифікаторів JID для яких ви згодні не "
 "зберігати записи якщо вони цього не хочуть."
 
-#: gajim/common/config.py:343
-msgid "Whitespace sent after inactivity"
+#: gajim/common/config.py:344
+#, fuzzy
+msgid "If enabled, a whitespace is sent after inactivity (keep alive)."
 msgstr "Надсилання порожнього повідомлення після неактивності."
 
-#: gajim/common/config.py:344
-msgid "XMPP ping sent after inactivity"
+#: gajim/common/config.py:345
+#, fuzzy
+msgid "If enabled, an XMPP ping is sent after inactivity (ping alive)."
 msgstr "Надсилання XMPP ехо після неактивності."
 
-#: gajim/common/config.py:348
+#: gajim/common/config.py:349
 #, fuzzy
 msgid ""
-"How many seconds to wait for the answer of ping alive packet before trying "
-"to reconnect?"
+"How many seconds to wait for the answer of a ping alive packet before trying "
+"to reconnect."
 msgstr ""
 "Проміжок часу у секундах, протягом якого слід очікувати на відповідь на "
 "пакет підтримування зв’язку, перш ніж розпочати процедуру повторного "
 "з’єднання."
 
-#: gajim/common/config.py:352
-msgid "Jabberd2 workaround"
+#: gajim/common/config.py:353
+#, fuzzy
+msgid "Jabberd2 workaround."
 msgstr "Обхідний прийом для Jabberd2"
 
-#: gajim/common/config.py:355
+#: gajim/common/config.py:356
+#, fuzzy
 msgid ""
-"If checked, Gajim will use your IP and proxies defined in "
-"file_transfer_proxies option for file transfer."
+"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/common/config.py:356
+#: gajim/common/config.py:357
 #, fuzzy
 msgid ""
-"If true, Gajim will test file transfer proxies on startup to be sure it "
-"works. Openfire's proxies are known to fail this test even if they work."
+"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/common/config.py:369
-msgid "Answer to receipt requests"
-msgstr "Відповідати на запити щодо підтвердження отримання"
-
 #: gajim/common/config.py:370
-msgid "Sent receipt requests"
-msgstr "Надіслані запити на підтвердження отримання"
+#, fuzzy
+msgid "If enabled, Gajim will answer to message receipt requests."
+msgstr ""
+"Якщо буде позначено цей пункт, Gajim буде показувати піктограму про "
+"отримання повідомлення вашим співрозмовником."
+
+#: gajim/common/config.py:371
+msgid "If enabled, Gajim will send message receipt requests."
+msgstr ""
 
-#: gajim/common/config.py:379
+#: gajim/common/config.py:380
 msgid ""
 "Allow Gajim to send information about the operating system you are running."
 msgstr ""
 "Дозволити Gajim надсилати інформацію, яку операційну систему ви "
 "використовуєте"
 
-#: gajim/common/config.py:380
+#: gajim/common/config.py:381
 msgid "Allow Gajim to send your local time."
 msgstr "Дозволятии Gajim надсилати ваш локальний часд"
 
-#: gajim/common/config.py:383
-msgid "Message that is sent to contacts you want to add"
+#: gajim/common/config.py:384
+#, fuzzy
+msgid "Message that is sent to contacts you want to add."
 msgstr "Повідомлення що буде надіслано контакту який ви бажаєте додати"
 
-#: gajim/common/config.py:384
+#: gajim/common/config.py:385
+#, fuzzy
 msgid ""
-"If enabled, Gajim will send your local IPs so your contact can connect to "
-"your machine to transfer files."
+"If enabled, Gajim will send your local IP so your contact can connect to "
+"your machine for file transfers."
 msgstr ""
 "Якщо увімкнено, Gajim надішле ваш локальний IP щоб контакт міг з’єднатись та "
 "надіслати вам файли."
 
-#: gajim/common/config.py:385
+#: gajim/common/config.py:386
 #, fuzzy
 msgid ""
-"Space separated list of JIDs for which chat window will be re-opened on next "
-"startup."
+"List of XMPP Addresses (space separated) for which the chat window will be "
+"re-opened on next startup."
 msgstr ""
 "Розділений пробілами перелік ідентифікаторів JID для яких ви хочете "
 "відкривати вікно балачки при наступному запуску."
 
-#: gajim/common/config.py:387
-msgid "HTTP Upload: Enable HTTPS Verification"
-msgstr ""
-
 #: gajim/common/config.py:388
-msgid ""
-"Preferred file transfer mechanism for file drag&drop on chat window. Can be "
-"'httpupload' (default) or 'jingle'"
+msgid "HTTP File Upload: Enable HTTPS Verification."
 msgstr ""
 
 #: gajim/common/config.py:389
-msgid "Allow cert verification with POSH"
+msgid ""
+"Preferred file transfer mechanism for file drag&drop on a chat window. Can "
+"be 'httpupload' (default) or 'jingle'."
 msgstr ""
 
-#: gajim/common/config.py:423 gajim/common/config.py:430
-#, fuzzy
-msgid "Language for which misspelled words will be checked"
-msgstr "Мова, згідно правил якої відбуватиметься перевірка правопису слів"
-
-#: gajim/common/config.py:427
-msgid "The currently active encryption for that contact"
-msgstr ""
+#: gajim/common/config.py:390
+msgid "Allow certificate verification with POSH."
+msgstr "Перевірка сертифіката SSL за допомогою POSH."
 
-#: gajim/common/config.py:431
+#: gajim/common/config.py:425
+#, fuzzy
 msgid ""
-"How many lines to request from server when entering a groupchat. -1 means no "
-"limit, -2 means global value"
+"Chat state notifications that are sent to contacts. Possible values: 'all', "
+"'composing_only', 'disabled'"
 msgstr ""
-"Як багато робити запитів до сервера при під’єднанні до групової балачки. -1 "
-"означає без обмежень, -2 означає глобальні налаштування"
+"Надсилати сповіщення про стан балачки. Може мати значення all, "
+"composing_only, disabled."
 
-#: gajim/common/config.py:432
+#: gajim/common/config.py:428
 #, fuzzy
+msgid "The currently active encryption for that contact."
+msgstr "Увімкнути шифрування ESession для цього облікового запису."
+
+#: gajim/common/config.py:432
 msgid ""
-"Minutes of backlog to request when entering a groupchat. -1 means no limit, "
-"-2 means global value"
+"If enabled, a notification is created for every message in this group chat."
 msgstr ""
-"За скільки хвилин запитувати журнал, при вході у групову балачку. -1 означає "
-"без обмеження, -2 означає глобальні налаштування."
 
 #: gajim/common/config.py:433
-msgid "State whether a notification is created for every message in this room"
-msgstr ""
-
-#: gajim/common/config.py:434
+#, fuzzy
 msgid ""
-"Show a status message for all status (away, dnd, etc.) changes of users in a "
-"group chat"
-msgstr ""
+"Show a status message for all status changes (away, dnd, etc.) of users in a "
+"group chat."
+msgstr "Не вдалося приєднатися до групової балачки"
 
-#: gajim/common/config.py:435
+#: gajim/common/config.py:434
 #, fuzzy
-msgid "Show a status message for every join or leave in a group chat"
+msgid "Show a status message for every join or leave in a group chat."
 msgstr "Не вдалося приєднатися до групової балачки"
 
+#: gajim/common/config.py:435
+msgid ""
+"If enabled, the group chat is minimized into the contact list when joining "
+"automatically."
+msgstr ""
+
 #: gajim/common/config.py:436
-msgid "If the group chat is minimized into the roster on autojoin"
+msgid ""
+"If enabled, the group chat is minimized into the contact list when closing "
+"it."
 msgstr ""
 
 #: gajim/common/config.py:437
-msgid "If the group chat is minimized into the roster on close"
+#, fuzzy
+msgid ""
+"Chat state notifications that are sent to the group chat. Possible values: "
+"'all', 'composing_only' or 'disabled'."
 msgstr ""
+"Надсилати сповіщення про стан балачки. Може мати значення all, "
+"composing_only, disabled."
 
-#: gajim/common/config.py:441
+#: gajim/common/config.py:440
+#, fuzzy
 msgid ""
-"State whether plugins should be activated on startup (this is saved on Gajim "
-"exit). This option SHOULD NOT be used to (de)activate plug-ins. Use GUI "
-"instead."
+"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). Ця опція НЕ ПОВИННА бути використана для (де)активації "
 "додатків. Використовуйте для цього графічний інтерфейс користувача."
 
-#: gajim/common/config.py:446 gajim/common/const.py:281
+#: gajim/common/config.py:445 gajim/common/const.py:315
 msgid "Sleeping"
 msgstr "Сплю"
 
-#: gajim/common/config.py:447
+#: gajim/common/config.py:446
 msgid "Back soon"
 msgstr "Скоро повернуся"
 
-#: gajim/common/config.py:447
+#: gajim/common/config.py:446
 msgid "Back in some minutes."
 msgstr "Повернуся за декілька хвилин."
 
-#: gajim/common/config.py:448 gajim/common/const.py:247
+#: gajim/common/config.py:447 gajim/common/const.py:281
 msgid "Eating"
 msgstr "Їм"
 
-#: gajim/common/config.py:448
-msgid "I'm eating, so leave me a message."
-msgstr "Зараз їм, залиште повідомлення, перегляну пізніше."
+#: gajim/common/config.py:447
+#, fuzzy
+msgid "I'm eating."
+msgstr "Я працюю."
 
-#: gajim/common/config.py:449
+#: gajim/common/config.py:448
 msgid "Movie"
 msgstr "Відео"
 
-#: gajim/common/config.py:449
+#: gajim/common/config.py:448
 msgid "I'm watching a movie."
 msgstr "Я дивлюся відео."
 
-#: gajim/common/config.py:450 gajim/common/const.py:314
+#: gajim/common/config.py:449 gajim/common/const.py:348
 msgid "Working"
 msgstr "Працюю"
 
-#: gajim/common/config.py:450
+#: gajim/common/config.py:449
 msgid "I'm working."
 msgstr "Я працюю."
 
-#: gajim/common/config.py:451
+#: gajim/common/config.py:450
 msgid "Phone"
 msgstr "Телефон"
 
-#: gajim/common/config.py:451
+#: gajim/common/config.py:450
 msgid "I'm on the phone."
 msgstr "Я розмовляю телефоном."
 
-#: gajim/common/config.py:452
+#: gajim/common/config.py:451
 msgid "Out"
 msgstr "Відійшов(шла)"
 
-#: gajim/common/config.py:452
+#: gajim/common/config.py:451
 msgid "I'm out enjoying life."
 msgstr "Я насолоджуюся життям."
 
-#: gajim/common/config.py:463
+#: gajim/common/config.py:462
 msgid "I'm available."
 msgstr "Я — доступний (доступна) для балачки."
 
-#: gajim/common/config.py:464
+#: gajim/common/config.py:463
 msgid "I'm free for chat."
 msgstr "Я — вільний (вільна) для балачки."
 
-#: gajim/common/config.py:465 gajim/gtk/accounts.py:134
+#: gajim/common/config.py:464 gajim/gtk/accounts.py:133
 msgid "Be right back."
 msgstr "Скоро повернуся."
 
-#: gajim/common/config.py:466
+#: gajim/common/config.py:465
 msgid "I'm not available."
 msgstr "Я — недоступний (недоступна) для балачки."
 
-#: gajim/common/config.py:467
+#: gajim/common/config.py:466
 msgid "Do not disturb."
 msgstr "Не турбувати."
 
-#: gajim/common/config.py:468 gajim/common/config.py:469
+#: gajim/common/config.py:467 gajim/common/config.py:468
 msgid "Bye!"
 msgstr "Пока!"
 
-#: gajim/common/config.py:480
+#: gajim/common/config.py:479
+#, fuzzy
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
-"muc_highlight_words, or when a group chat message contains your nickname."
+"'muc_highlight_words' your nickname is mentioned."
 msgstr ""
 "Звук, який слід відтворити, якщо повідомлення групової балачки містить одне "
 "зі слів, вказаних за допомогою параметра muc_highlight_words, або якщо "
 "повідомлення групової балачки містить ваш псевдонім."
 
-#: gajim/common/config.py:481
-msgid "Sound to play when any MUC message arrives."
+#: gajim/common/config.py:480
+#, fuzzy
+msgid "Sound to play when any group chat message arrives."
 msgstr "Звук, який буде відтворено за появи повідомлення групової балачки."
 
-#: gajim/common/config.py:485
+#: gajim/common/config.py:484
 msgid "Tor"
 msgstr "Tor"
 
@@ -4191,871 +4258,965 @@ msgstr "Tor"
 msgid "Error: cannot open %s for reading"
 msgstr "Помилка: не вдалося відкрити %s для читання"
 
-#: gajim/common/const.py:214
+#: gajim/common/const.py:216
+#, fuzzy
+msgid "?Group chat name:Team"
+msgstr "?Роль у груповій балачці:Немає"
+
+#: gajim/common/const.py:217
+msgid "?Group chat description:Project discussion"
+msgstr ""
+
+#: gajim/common/const.py:218
+#, fuzzy
+msgid "?Group chat address:team"
+msgstr "Групові балачки"
+
+#: gajim/common/const.py:219
+#, fuzzy
+msgid "?Group chat name:Family"
+msgstr "Виділення повідомлення групової балачки:"
+
+#: gajim/common/const.py:220
+msgid "?Group chat description:Spring gathering"
+msgstr ""
+
+#: gajim/common/const.py:221
+msgid "?Group chat address:family"
+msgstr ""
+
+#: gajim/common/const.py:222
+#, fuzzy
+msgid "?Group chat name:Vacation"
+msgstr "Запрошення до групової балачки"
+
+#: gajim/common/const.py:223
+msgid "?Group chat description:Trip planning"
+msgstr ""
+
+#: gajim/common/const.py:224
+#, fuzzy
+msgid "?Group chat address:vacation"
+msgstr "Запрошення до групової балачки"
+
+#: gajim/common/const.py:225
+#, fuzzy
+msgid "?Group chat name:Repairs"
+msgstr "_Групова балачка"
+
+#: gajim/common/const.py:226
+msgid "?Group chat description:Local help group"
+msgstr ""
+
+#: gajim/common/const.py:227
+#, fuzzy
+msgid "?Group chat address:repairs"
+msgstr "Групові балачки"
+
+#: gajim/common/const.py:228
+#, fuzzy
+msgid "?Group chat name:News"
+msgstr "?Роль у груповій балачці:Немає"
+
+#: gajim/common/const.py:229
+#, fuzzy
+msgid "?Group chat description:Local news and reports"
+msgstr "Можливість створення групових балачок обмежено."
+
+#: gajim/common/const.py:230
+#, fuzzy
+msgid "?Group chat address:news"
+msgstr "Створити групову балачку"
+
+#: gajim/common/const.py:235
+#, fuzzy
+msgid "Remote server not found"
+msgstr "Не вдалося знайти службу"
+
+#: gajim/common/const.py:236
+msgid "Remote server timeout"
+msgstr ""
+
+#: gajim/common/const.py:237 gajim/common/const.py:238
+#: gajim/common/const.py:239
+msgid "Address does not belong to a group chat server"
+msgstr "Адреса не належить серверові групових балачок"
+
+#: gajim/common/const.py:240
+#, fuzzy
+msgid "Group chat already exists"
+msgstr "Обліковий запис Local вже існує."
+
+#: gajim/common/const.py:241
+msgid "Group chat does not exist"
+msgstr "Групової балачки не існує."
+
+#: gajim/common/const.py:247
 msgid "This message was encrypted with OTR and could not be decrypted."
 msgstr ""
 
-#: gajim/common/const.py:217
+#: gajim/common/const.py:250
 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:221
+#: gajim/common/const.py:254
 msgid ""
-"This message was encrypted with OpenPGP for XMPP and could not be decrypted."
+"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:224
+#: gajim/common/const.py:258
 #, python-format
 msgid "This message was encrypted with %s and could not be decrypted."
 msgstr ""
 
-#: gajim/common/const.py:231
+#: gajim/common/const.py:265
 msgid "Doing Chores"
 msgstr "Займаюся повсякденною роботою"
 
-#: gajim/common/const.py:232
+#: gajim/common/const.py:266
 msgid "Buying Groceries"
 msgstr "Закуповую бакалію"
 
-#: gajim/common/const.py:233
+#: gajim/common/const.py:267
 msgid "Cleaning"
 msgstr "Прибираю"
 
-#: gajim/common/const.py:234
+#: gajim/common/const.py:268
 msgid "Cooking"
 msgstr "Куховарю"
 
-#: gajim/common/const.py:235
+#: gajim/common/const.py:269
 msgid "Doing Maintenance"
 msgstr "Роблю ремонт"
 
-#: gajim/common/const.py:236
+#: gajim/common/const.py:270
 msgid "Doing the Dishes"
 msgstr "Мию посуд"
 
-#: gajim/common/const.py:237
+#: gajim/common/const.py:271
 msgid "Doing the Laundry"
 msgstr "Перу"
 
-#: gajim/common/const.py:238
+#: gajim/common/const.py:272
 msgid "Gardening"
 msgstr "Займаюся садівництвом"
 
-#: gajim/common/const.py:239
+#: gajim/common/const.py:273
 msgid "Running an Errand"
 msgstr "У відрядженні"
 
-#: gajim/common/const.py:240
+#: gajim/common/const.py:274
 msgid "Walking the Dog"
 msgstr "Вигулюю собаку"
 
-#: gajim/common/const.py:242
+#: gajim/common/const.py:276
 msgid "Drinking"
 msgstr "Випиваю"
 
-#: gajim/common/const.py:243
+#: gajim/common/const.py:277
 msgid "Having a Beer"
 msgstr "П’ю пиво"
 
-#: gajim/common/const.py:244
+#: gajim/common/const.py:278
 msgid "Having Coffee"
 msgstr "П’ю каву"
 
-#: gajim/common/const.py:245
+#: gajim/common/const.py:279
 msgid "Having Tea"
 msgstr "П’ю чай"
 
-#: gajim/common/const.py:248
+#: gajim/common/const.py:282
 msgid "Having a Snack"
 msgstr "Їм"
 
-#: gajim/common/const.py:249
+#: gajim/common/const.py:283
 msgid "Having Breakfast"
 msgstr "Снідаю"
 
-#: gajim/common/const.py:250
+#: gajim/common/const.py:284
 msgid "Having Dinner"
 msgstr "Вечеряю"
 
-#: gajim/common/const.py:251
+#: gajim/common/const.py:285
 msgid "Having Lunch"
 msgstr "Обідаю"
 
-#: gajim/common/const.py:253
+#: gajim/common/const.py:287
 msgid "Exercising"
 msgstr "Вправляюся"
 
-#: gajim/common/const.py:254 gajim/common/const.py:305
+#: gajim/common/const.py:288 gajim/common/const.py:339
 msgid "Cycling"
 msgstr "Катаюся на велосипеді"
 
-#: gajim/common/const.py:255
+#: gajim/common/const.py:289
 msgid "Dancing"
 msgstr "Танцюю"
 
-#: gajim/common/const.py:256
+#: gajim/common/const.py:290
 msgid "Hiking"
 msgstr "Займаюся туризмом"
 
-#: gajim/common/const.py:257
+#: gajim/common/const.py:291
 msgid "Jogging"
 msgstr "Бігаю підтюпцем"
 
-#: gajim/common/const.py:258
+#: gajim/common/const.py:292
 msgid "Playing Sports"
 msgstr "Граю у спортивні ігри"
 
-#: gajim/common/const.py:259
+#: gajim/common/const.py:293
 msgid "Running"
 msgstr "Бігаю"
 
-#: gajim/common/const.py:260
+#: gajim/common/const.py:294
 msgid "Skiing"
 msgstr "Катаюся на лижах"
 
-#: gajim/common/const.py:261
+#: gajim/common/const.py:295
 msgid "Swimming"
 msgstr "Займаюся плаванням"
 
-#: gajim/common/const.py:262
+#: gajim/common/const.py:296
 msgid "Working out"
 msgstr "Ладнаю справи"
 
-#: gajim/common/const.py:264
+#: gajim/common/const.py:298
 msgid "Grooming"
 msgstr "Доглядаю за конем"
 
-#: gajim/common/const.py:265
+#: gajim/common/const.py:299
 msgid "At the Spa"
 msgstr "На гідромасажі"
 
-#: gajim/common/const.py:266
+#: gajim/common/const.py:300
 msgid "Brushing Teeth"
 msgstr "Чищу зуби"
 
-#: gajim/common/const.py:267
+#: gajim/common/const.py:301
 msgid "Getting a Haircut"
 msgstr "Стрижуся"
 
-#: gajim/common/const.py:268
+#: gajim/common/const.py:302
 msgid "Shaving"
 msgstr "Голюся"
 
-#: gajim/common/const.py:269
+#: gajim/common/const.py:303
 msgid "Taking a Bath"
 msgstr "Приймаю вану"
 
-#: gajim/common/const.py:270
+#: gajim/common/const.py:304
 msgid "Taking a Shower"
 msgstr "Приймаю душ"
 
-#: gajim/common/const.py:272
+#: gajim/common/const.py:306
 msgid "Having an Appointment"
 msgstr "На побаченні"
 
-#: gajim/common/const.py:274
+#: gajim/common/const.py:308
 msgid "Inactive"
 msgstr "Неактивний"
 
-#: gajim/common/const.py:275
+#: gajim/common/const.py:309
 msgid "Day Off"
 msgstr "Вихідний"
 
-#: gajim/common/const.py:276
+#: gajim/common/const.py:310
 msgid "Hanging out"
 msgstr "Тиняюся"
 
-#: gajim/common/const.py:277
+#: gajim/common/const.py:311
 msgid "Hiding"
 msgstr "Ховаюся"
 
-#: gajim/common/const.py:278
+#: gajim/common/const.py:312
 msgid "On Vacation"
 msgstr "У відпустці"
 
-#: gajim/common/const.py:279
+#: gajim/common/const.py:313
 msgid "Praying"
 msgstr "Молюся"
 
-#: gajim/common/const.py:280
+#: gajim/common/const.py:314
 msgid "Scheduled Holiday"
 msgstr "Запланований вихідний"
 
-#: gajim/common/const.py:282
+#: gajim/common/const.py:316
 msgid "Thinking"
 msgstr "Думаю"
 
-#: gajim/common/const.py:284
+#: gajim/common/const.py:318
 msgid "Relaxing"
 msgstr "Розслабляюся"
 
-#: gajim/common/const.py:285
+#: gajim/common/const.py:319
 msgid "Fishing"
 msgstr "Рибалю"
 
-#: gajim/common/const.py:286
+#: gajim/common/const.py:320
 msgid "Gaming"
 msgstr "Граюсь"
 
-#: gajim/common/const.py:287
+#: gajim/common/const.py:321
 msgid "Going out"
 msgstr "Гуляю"
 
-#: gajim/common/const.py:288
+#: gajim/common/const.py:322
 msgid "Partying"
 msgstr "Бере участь у вечірці"
 
-#: gajim/common/const.py:289
+#: gajim/common/const.py:323
 msgid "Reading"
 msgstr "Читаю"
 
-#: gajim/common/const.py:290
+#: gajim/common/const.py:324
 msgid "Rehearsing"
 msgstr "Репетирую"
 
-#: gajim/common/const.py:291
+#: gajim/common/const.py:325
 msgid "Shopping"
 msgstr "Роблю закупи"
 
-#: gajim/common/const.py:292
+#: gajim/common/const.py:326
 msgid "Smoking"
 msgstr "Курю"
 
-#: gajim/common/const.py:293
+#: gajim/common/const.py:327
 msgid "Socializing"
 msgstr "Спілкуюся"
 
-#: gajim/common/const.py:294
+#: gajim/common/const.py:328
 msgid "Sunbathing"
 msgstr "Засмагаю"
 
-#: gajim/common/const.py:295
+#: gajim/common/const.py:329
 msgid "Watching TV"
 msgstr "Дивлюся телевізор"
 
-#: gajim/common/const.py:296
+#: gajim/common/const.py:330
 msgid "Watching a Movie"
 msgstr "Дивиться кіно"
 
-#: gajim/common/const.py:298
+#: gajim/common/const.py:332
 msgid "Talking"
 msgstr "Розмовляю"
 
-#: gajim/common/const.py:299
+#: gajim/common/const.py:333
 msgid "In Real Life"
 msgstr "У реальному житті"
 
-#: gajim/common/const.py:300
+#: gajim/common/const.py:334
 msgid "On the Phone"
 msgstr "Розмовляю телефоном"
 
-#: gajim/common/const.py:301
+#: gajim/common/const.py:335
 msgid "On Video Phone"
 msgstr "Розмовляю відеотелефоном"
 
-#: gajim/common/const.py:303
+#: gajim/common/const.py:337
 msgid "Traveling"
 msgstr "Подорожую"
 
-#: gajim/common/const.py:304
+#: gajim/common/const.py:338
 msgid "Commuting"
 msgstr "Їду на роботу або з роботи"
 
-#: gajim/common/const.py:306
+#: gajim/common/const.py:340
 msgid "Driving"
 msgstr "Веду машину"
 
-#: gajim/common/const.py:307
+#: gajim/common/const.py:341
 msgid "In a Car"
 msgstr "У автомобілі"
 
-#: gajim/common/const.py:308
+#: gajim/common/const.py:342
 msgid "On a Bus"
 msgstr "У автобусі"
 
-#: gajim/common/const.py:309
+#: gajim/common/const.py:343
 msgid "On a Plane"
 msgstr "На літаку"
 
-#: gajim/common/const.py:310
+#: gajim/common/const.py:344
 msgid "On a Train"
 msgstr "У поїзді"
 
-#: gajim/common/const.py:311
+#: gajim/common/const.py:345
 msgid "On a Trip"
 msgstr "У мандрах"
 
-#: gajim/common/const.py:312
+#: gajim/common/const.py:346
 msgid "Walking"
 msgstr "На прогулянці"
 
-#: gajim/common/const.py:315
+#: gajim/common/const.py:349
 msgid "Coding"
 msgstr "Програмую"
 
-#: gajim/common/const.py:316
+#: gajim/common/const.py:350
 msgid "In a Meeting"
 msgstr "На зустрічі"
 
-#: gajim/common/const.py:317
+#: gajim/common/const.py:351
 msgid "Studying"
 msgstr "Вчуся"
 
-#: gajim/common/const.py:318
+#: gajim/common/const.py:352
 msgid "Writing"
 msgstr "Пишу"
 
-#: gajim/common/const.py:321
+#: gajim/common/const.py:355
 msgid "Afraid"
 msgstr "Зляканий"
 
-#: gajim/common/const.py:322
+#: gajim/common/const.py:356
 msgid "Amazed"
 msgstr "Зачарований"
 
-#: gajim/common/const.py:323
+#: gajim/common/const.py:357
 msgid "Amorous"
 msgstr "Закоханий"
 
-#: gajim/common/const.py:324
+#: gajim/common/const.py:358
 msgid "Angry"
 msgstr "Злий"
 
-#: gajim/common/const.py:325
+#: gajim/common/const.py:359
 msgid "Annoyed"
 msgstr "Роздратований"
 
-#: gajim/common/const.py:326
+#: gajim/common/const.py:360
 msgid "Anxious"
 msgstr "Стривожений"
 
-#: gajim/common/const.py:327
+#: gajim/common/const.py:361
 msgid "Aroused"
 msgstr "Збуджений"
 
-#: gajim/common/const.py:328
+#: gajim/common/const.py:362
 msgid "Ashamed"
 msgstr "Засоромлений"
 
-#: gajim/common/const.py:329
+#: gajim/common/const.py:363
 msgid "Bored"
 msgstr "Знудьгований"
 
-#: gajim/common/const.py:330
+#: gajim/common/const.py:364
 msgid "Brave"
 msgstr "Безстрашний"
 
-#: gajim/common/const.py:331
+#: gajim/common/const.py:365
 msgid "Calm"
 msgstr "Спокійний"
 
-#: gajim/common/const.py:332
+#: gajim/common/const.py:366
 msgid "Cautious"
 msgstr "Обережний"
 
-#: gajim/common/const.py:333
+#: gajim/common/const.py:367
 msgid "Cold"
 msgstr "Незворушний"
 
-#: gajim/common/const.py:334
+#: gajim/common/const.py:368
 msgid "Confident"
 msgstr "Впевнений"
 
-#: gajim/common/const.py:335
+#: gajim/common/const.py:369
 msgid "Confused"
 msgstr "Збентежений"
 
-#: gajim/common/const.py:336
+#: gajim/common/const.py:370
 msgid "Contemplative"
 msgstr "Задумливий"
 
-#: gajim/common/const.py:337
+#: gajim/common/const.py:371
 msgid "Contented"
 msgstr "Задоволений"
 
-#: gajim/common/const.py:338
+#: gajim/common/const.py:372
 msgid "Cranky"
 msgstr "Недужий"
 
-#: gajim/common/const.py:339
+#: gajim/common/const.py:373
 msgid "Crazy"
 msgstr "Шалений"
 
-#: gajim/common/const.py:340
+#: gajim/common/const.py:374
 msgid "Creative"
 msgstr "Творчий"
 
-#: gajim/common/const.py:341
+#: gajim/common/const.py:375
 msgid "Curious"
 msgstr "Допитливий"
 
-#: gajim/common/const.py:342
+#: gajim/common/const.py:376
 msgid "Dejected"
 msgstr "Пригнічений"
 
-#: gajim/common/const.py:343
+#: gajim/common/const.py:377
 msgid "Depressed"
 msgstr "Пригнічений"
 
-#: gajim/common/const.py:344
+#: gajim/common/const.py:378
 msgid "Disappointed"
 msgstr "Розчарований"
 
-#: gajim/common/const.py:345
+#: gajim/common/const.py:379
 msgid "Disgusted"
 msgstr "Відражений"
 
-#: gajim/common/const.py:346
+#: gajim/common/const.py:380
 msgid "Dismayed"
 msgstr "Нажаханий"
 
-#: gajim/common/const.py:347
+#: gajim/common/const.py:381
 msgid "Distracted"
 msgstr "Зніяковілий"
 
-#: gajim/common/const.py:348
+#: gajim/common/const.py:382
 msgid "Embarrassed"
 msgstr "Стурбований"
 
-#: gajim/common/const.py:349
+#: gajim/common/const.py:383
 msgid "Envious"
 msgstr "Сповнений заздрощів"
 
-#: gajim/common/const.py:350
+#: gajim/common/const.py:384
 msgid "Excited"
 msgstr "Захоплений"
 
-#: gajim/common/const.py:351
+#: gajim/common/const.py:385
 msgid "Flirtatious"
 msgstr "Кокетливий"
 
-#: gajim/common/const.py:352
+#: gajim/common/const.py:386
 msgid "Frustrated"
 msgstr "Зневірений"
 
-#: gajim/common/const.py:353
+#: gajim/common/const.py:387
 msgid "Grateful"
 msgstr "Дуже вдячний"
 
-#: gajim/common/const.py:354
+#: gajim/common/const.py:388
 msgid "Grieving"
 msgstr "Засмучений"
 
-#: gajim/common/const.py:355
+#: gajim/common/const.py:389
 msgid "Grumpy"
 msgstr "Сердитий"
 
-#: gajim/common/const.py:356
+#: gajim/common/const.py:390
 msgid "Guilty"
 msgstr "Винний"
 
-#: gajim/common/const.py:357
+#: gajim/common/const.py:391
 msgid "Happy"
 msgstr "Щасливий"
 
-#: gajim/common/const.py:358
+#: gajim/common/const.py:392
 msgid "Hopeful"
 msgstr "Сповнений надій"
 
-#: gajim/common/const.py:359
+#: gajim/common/const.py:393
 msgid "Hot"
 msgstr "Гарячий"
 
-#: gajim/common/const.py:360
+#: gajim/common/const.py:394
 msgid "Humbled"
 msgstr "Скромний"
 
-#: gajim/common/const.py:361
+#: gajim/common/const.py:395
 msgid "Humiliated"
 msgstr "Принижений"
 
-#: gajim/common/const.py:362
+#: gajim/common/const.py:396
 msgid "Hungry"
 msgstr "Голодний"
 
-#: gajim/common/const.py:363
+#: gajim/common/const.py:397
 msgid "Hurt"
 msgstr "Поранений"
 
-#: gajim/common/const.py:364
+#: gajim/common/const.py:398
 msgid "Impressed"
 msgstr "Вражений"
 
-#: gajim/common/const.py:365
+#: gajim/common/const.py:399
 msgid "In Awe"
 msgstr "Пригнічений величчю"
 
-#: gajim/common/const.py:366
+#: gajim/common/const.py:400
 msgid "In Love"
 msgstr "Закоханий"
 
-#: gajim/common/const.py:367
+#: gajim/common/const.py:401
 msgid "Indignant"
 msgstr "Обурений"
 
-#: gajim/common/const.py:368
+#: gajim/common/const.py:402
 msgid "Interested"
 msgstr "Зацікавлений"
 
-#: gajim/common/const.py:369
+#: gajim/common/const.py:403
 msgid "Intoxicated"
 msgstr "Отруєний"
 
-#: gajim/common/const.py:370
+#: gajim/common/const.py:404
 msgid "Invincible"
 msgstr "Невидимий"
 
-#: gajim/common/const.py:371
+#: gajim/common/const.py:405
 msgid "Jealous"
 msgstr "Заздрісний"
 
-#: gajim/common/const.py:372
+#: gajim/common/const.py:406
 msgid "Lonely"
 msgstr "Одинокий"
 
-#: gajim/common/const.py:373
+#: gajim/common/const.py:407
 msgid "Lost"
 msgstr "Втрачений"
 
-#: gajim/common/const.py:374
+#: gajim/common/const.py:408
 msgid "Lucky"
 msgstr "Щасливий"
 
-#: gajim/common/const.py:375
+#: gajim/common/const.py:409
 msgid "Mean"
 msgstr "Жалюгідний"
 
-#: gajim/common/const.py:376
+#: gajim/common/const.py:410
 msgid "Moody"
 msgstr "Смутний"
 
-#: gajim/common/const.py:377
+#: gajim/common/const.py:411
 msgid "Nervous"
 msgstr "Знервований"
 
-#: gajim/common/const.py:378
+#: gajim/common/const.py:412
 msgid "Neutral"
 msgstr "Нейтральний"
 
-#: gajim/common/const.py:379
+#: gajim/common/const.py:413
 msgid "Offended"
 msgstr "Ображений"
 
-#: gajim/common/const.py:380
+#: gajim/common/const.py:414
 msgid "Outraged"
 msgstr "Обурений"
 
-#: gajim/common/const.py:381
+#: gajim/common/const.py:415
 msgid "Playful"
 msgstr "Грайливий"
 
-#: gajim/common/const.py:382
+#: gajim/common/const.py:416
 msgid "Proud"
 msgstr "Гордий"
 
-#: gajim/common/const.py:383
+#: gajim/common/const.py:417
 msgid "Relaxed"
 msgstr "Розслаблений"
 
-#: gajim/common/const.py:384
+#: gajim/common/const.py:418
 msgid "Relieved"
 msgstr "Врятований"
 
-#: gajim/common/const.py:385
+#: gajim/common/const.py:419
 msgid "Remorseful"
 msgstr "Співчутливий"
 
-#: gajim/common/const.py:386
+#: gajim/common/const.py:420
 msgid "Restless"
 msgstr "Нетерплячий"
 
-#: gajim/common/const.py:387
+#: gajim/common/const.py:421
 msgid "Sad"
 msgstr "Сумний"
 
-#: gajim/common/const.py:388
+#: gajim/common/const.py:422
 msgid "Sarcastic"
 msgstr "Саркастичний"
 
-#: gajim/common/const.py:389
+#: gajim/common/const.py:423
 msgid "Satisfied"
 msgstr "Вдоволений"
 
-#: gajim/common/const.py:390
+#: gajim/common/const.py:424
 msgid "Serious"
 msgstr "Серйозний"
 
-#: gajim/common/const.py:391
+#: gajim/common/const.py:425
 msgid "Shocked"
 msgstr "Шокований"
 
-#: gajim/common/const.py:392
+#: gajim/common/const.py:426
 msgid "Shy"
 msgstr "Сором’язливий"
 
-#: gajim/common/const.py:393
+#: gajim/common/const.py:427
 msgid "Sick"
 msgstr "Хворий"
 
-#: gajim/common/const.py:394
+#: gajim/common/const.py:428
 msgid "Sleepy"
 msgstr "Сонний"
 
-#: gajim/common/const.py:395
+#: gajim/common/const.py:429
 msgid "Spontaneous"
 msgstr "Непередбачуваний"
 
-#: gajim/common/const.py:396
+#: gajim/common/const.py:430
 msgid "Stressed"
 msgstr "Напружений"
 
-#: gajim/common/const.py:397
+#: gajim/common/const.py:431
 msgid "Strong"
 msgstr "Сильний"
 
-#: gajim/common/const.py:398
+#: gajim/common/const.py:432
 msgid "Surprised"
 msgstr "Здивований"
 
-#: gajim/common/const.py:399
+#: gajim/common/const.py:433
 msgid "Thankful"
 msgstr "Вдячний"
 
-#: gajim/common/const.py:400
+#: gajim/common/const.py:434
 msgid "Thirsty"
 msgstr "Спраглий"
 
-#: gajim/common/const.py:401
+#: gajim/common/const.py:435
 msgid "Tired"
 msgstr "Втомлений"
 
-#: gajim/common/const.py:402
+#: gajim/common/const.py:436
 msgid "Undefined"
 msgstr "Непевний"
 
-#: gajim/common/const.py:403
+#: gajim/common/const.py:437
 msgid "Weak"
 msgstr "Слабкий"
 
-#: gajim/common/const.py:404
+#: gajim/common/const.py:438
 msgid "Worried"
 msgstr "Занепокоєний"
 
-#: gajim/common/const.py:408
+#: gajim/common/const.py:442
 msgid "accuracy"
 msgstr "точність"
 
-#: gajim/common/const.py:409
+#: gajim/common/const.py:443
 msgid "alt"
 msgstr "висота"
 
-#: gajim/common/const.py:410
+#: gajim/common/const.py:444
 msgid "area"
 msgstr "зона"
 
-#: gajim/common/const.py:411
+#: gajim/common/const.py:445
 msgid "bearing"
 msgstr "пеленг"
 
-#: gajim/common/const.py:412
+#: gajim/common/const.py:446
 msgid "building"
 msgstr "будівля"
 
-#: gajim/common/const.py:413
+#: gajim/common/const.py:447
 msgid "country"
 msgstr "країні"
 
-#: gajim/common/const.py:414
+#: gajim/common/const.py:448
 msgid "countrycode"
 msgstr "код країни"
 
-#: gajim/common/const.py:415
+#: gajim/common/const.py:449
 msgid "datum"
 msgstr "характеристика"
 
-#: gajim/common/const.py:416
+#: gajim/common/const.py:450
 msgid "description"
 msgstr "опис"
 
-#: gajim/common/const.py:417
+#: gajim/common/const.py:451
 msgid "error"
 msgstr "помилка"
 
-#: gajim/common/const.py:418
+#: gajim/common/const.py:452
 msgid "floor"
 msgstr "поверх"
 
-#: gajim/common/const.py:419
+#: gajim/common/const.py:453
 msgid "lat"
 msgstr "широта"
 
-#: gajim/common/const.py:420
+#: gajim/common/const.py:454
 msgid "locality"
 msgstr "місцевість"
 
-#: gajim/common/const.py:421
+#: gajim/common/const.py:455
 msgid "lon"
 msgstr "довгота"
 
-#: gajim/common/const.py:422
+#: gajim/common/const.py:456
 msgid "postalcode"
 msgstr "поштовий індекс"
 
-#: gajim/common/const.py:423
+#: gajim/common/const.py:457
 msgid "region"
 msgstr "регіон"
 
-#: gajim/common/const.py:424
+#: gajim/common/const.py:458
 msgid "room"
 msgstr "кімната"
 
-#: gajim/common/const.py:425
+#: gajim/common/const.py:459
 msgid "speed"
 msgstr "швидкість"
 
-#: gajim/common/const.py:426
+#: gajim/common/const.py:460
 msgid "street"
 msgstr "вулиця"
 
-#: gajim/common/const.py:427
+#: gajim/common/const.py:461
 msgid "text"
 msgstr "текст"
 
-#: gajim/common/const.py:428
+#: gajim/common/const.py:462
 msgid "timestamp"
 msgstr "мітка часу"
 
-#: gajim/common/const.py:429
+#: gajim/common/const.py:463
 msgid "URI"
 msgstr ""
 
-#: gajim/common/const.py:434
+#: gajim/common/const.py:468
 msgid "Unable to get issuer certificate"
 msgstr "Не вдається отримати сертифікат видавця"
 
-#: gajim/common/const.py:435
+#: gajim/common/const.py:469
 msgid "Unable to get certificate CRL"
 msgstr "Не вдалося отримати список відкликаних сертифікатів"
 
-#: gajim/common/const.py:436
+#: gajim/common/const.py:470
 msgid "Unable to decrypt certificate's signature"
 msgstr "Не вдалося розшифрувати підпис сертифікату"
 
-#: gajim/common/const.py:437
+#: gajim/common/const.py:471
 msgid "Unable to decrypt CRL's signature"
 msgstr "Не вдалося розшифрувати підпис списку відкликаних сертифікатів"
 
-#: gajim/common/const.py:438
+#: gajim/common/const.py:472
 msgid "Unable to decode issuer public key"
 msgstr "Не вдалося декодувати відкритий ключ видавця"
 
-#: gajim/common/const.py:439
+#: gajim/common/const.py:473
 msgid "Certificate signature failure"
 msgstr "Помилка під час підписування сертифіката"
 
-#: gajim/common/const.py:440
+#: gajim/common/const.py:474
 msgid "CRL signature failure"
 msgstr "Помилка під час роботи з підписом списку відкликаних сертифікатів"
 
-#: gajim/common/const.py:441
+#: gajim/common/const.py:475
 msgid "Certificate is not yet valid"
 msgstr "Сертифікат ще не набув чинності"
 
-#: gajim/common/const.py:442
+#: gajim/common/const.py:476
 msgid "Certificate has expired"
 msgstr "Строк дії сертифікату завершився!"
 
-#: gajim/common/const.py:443
+#: gajim/common/const.py:477
 msgid "CRL is not yet valid"
 msgstr "Строк дії CRL ще не почався"
 
-#: gajim/common/const.py:444
+#: gajim/common/const.py:478
 msgid "CRL has expired"
 msgstr "Строк дії CRL завершився"
 
-#: gajim/common/const.py:445
+#: gajim/common/const.py:479
 msgid "Format error in certificate's notBefore field"
 msgstr "Помилка форматування у полі сертифіката notBefore"
 
-#: gajim/common/const.py:446
+#: gajim/common/const.py:480
 msgid "Format error in certificate's notAfter field"
 msgstr "Помилка форматування у полі сертифіката notAfter"
 
-#: gajim/common/const.py:447
+#: gajim/common/const.py:481
 msgid "Format error in CRL's lastUpdate field"
 msgstr "Помилка форматування у полі сертифіката lastUpdate"
 
-#: gajim/common/const.py:448
+#: gajim/common/const.py:482
 msgid "Format error in CRL's nextUpdate field"
 msgstr "Помилка форматування у полі сертифіката nextUpdate"
 
-#: gajim/common/const.py:449
+#: gajim/common/const.py:483
 msgid "Out of memory"
 msgstr "Не вистачає пам'яті"
 
-#: gajim/common/const.py:450
+#: gajim/common/const.py:484
 msgid "Self signed certificate"
 msgstr "Сертифікат є самопідписаним"
 
-#: gajim/common/const.py:451
+#: gajim/common/const.py:485
 msgid "Self signed certificate in certificate chain"
 msgstr "Самопідписаний сертифікат у ланцюжку сертифікатів"
 
-#: gajim/common/const.py:452
+#: gajim/common/const.py:486
 msgid "Unable to get local issuer certificate"
 msgstr "Не вдалося отримати сертифікат локального видавця"
 
-#: gajim/common/const.py:453
+#: gajim/common/const.py:487
 msgid "Unable to verify the first certificate"
 msgstr "Не вдалося перевірити перший сертифікат"
 
-#: gajim/common/const.py:454
+#: gajim/common/const.py:488
 msgid "Certificate chain too long"
 msgstr "Ланцюжок сертифіката занадто великий"
 
-#: gajim/common/const.py:455
+#: gajim/common/const.py:489
 msgid "Certificate revoked"
 msgstr "Сертифікат відкликано"
 
-#: gajim/common/const.py:456
+#: gajim/common/const.py:490
 msgid "Invalid CA certificate"
 msgstr "Некоректний сертифікат CA"
 
-#: gajim/common/const.py:457
+#: gajim/common/const.py:491
 msgid "Path length constraint exceeded"
 msgstr "Перевищення обмеження на довжину адреси"
 
-#: gajim/common/const.py:458
+#: gajim/common/const.py:492
 msgid "Unsupported certificate purpose"
 msgstr "Непідтримуване призначення сертифіката"
 
-#: gajim/common/const.py:459
+#: gajim/common/const.py:493
 msgid "Certificate not trusted"
 msgstr "Сертифікат є недостовірним"
 
-#: gajim/common/const.py:460
+#: gajim/common/const.py:494
 msgid "Certificate rejected"
 msgstr "Сертифікат відхилено"
 
-#: gajim/common/const.py:461
+#: gajim/common/const.py:495
 msgid "Subject issuer mismatch"
 msgstr "Видано для іншого призначення"
 
-#: gajim/common/const.py:462
+#: gajim/common/const.py:496
 msgid "Authority and subject key identifier mismatch"
 msgstr "Не збігаються поля видавця та ідентифікатора призначення ключа"
 
-#: gajim/common/const.py:463
+#: gajim/common/const.py:497
 msgid "Authority and issuer serial number mismatch"
 msgstr "Серійні номери служби сертифікації і видавця не збігаються"
 
-#: gajim/common/const.py:464
+#: gajim/common/const.py:498
 msgid "Key usage does not include certificate signing"
 msgstr "До призначення ключа не належить підписування сертифікатів"
 
-#: gajim/common/const.py:465
+#: gajim/common/const.py:499
 msgid "Application verification failure"
 msgstr "Помилка під час перевірки програми"
 
@@ -5229,200 +5390,200 @@ msgstr "відео вхід"
 msgid "video output"
 msgstr "відео вихід"
 
-#: gajim/common/helpers.py:210
+#: gajim/common/helpers.py:216
 #, fuzzy
 msgid "Server must be between 1 and 1023 bytes"
 msgstr "Сервер має бути від 1 до 1023 символів"
 
-#: gajim/common/helpers.py:214
+#: gajim/common/helpers.py:220
 msgid "Invalid character in hostname."
 msgstr "Некоректний символ у назві вузла."
 
-#: gajim/common/helpers.py:216
+#: gajim/common/helpers.py:222
 msgid "Server address required."
 msgstr "Слід вказати адресу сервера."
 
-#: gajim/common/helpers.py:220
+#: gajim/common/helpers.py:226
 #, fuzzy
 msgid "Username must be between 1 and 1023 bytes"
 msgstr "Ім’я користувача повинно бути від 1 до 1023 символів"
 
-#: gajim/common/helpers.py:224
+#: gajim/common/helpers.py:230
 msgid "Invalid character in username."
 msgstr "Некоректний символ у імені користувача."
 
-#: gajim/common/helpers.py:230
+#: gajim/common/helpers.py:236
 #, fuzzy
 msgid "Resource must be between 1 and 1023 bytes"
 msgstr "Ресурс має бути від 1 до 1023 символів"
 
-#: gajim/common/helpers.py:234
+#: gajim/common/helpers.py:240
 msgid "Invalid character in resource."
 msgstr "Некоректний символ у назві ресурсу."
 
-#: gajim/common/helpers.py:275
+#: gajim/common/helpers.py:281
 msgid "_Busy"
 msgstr "_Зайнятий"
 
-#: gajim/common/helpers.py:277 gajim/gtk/tooltips.py:647
+#: gajim/common/helpers.py:283 gajim/gtk/tooltips.py:647
 msgid "Busy"
 msgstr "Зайнятий"
 
-#: gajim/common/helpers.py:280
+#: gajim/common/helpers.py:286
 msgid "_Not Available"
 msgstr "_Не доступний"
 
-#: gajim/common/helpers.py:282 gajim/gtk/tooltips.py:649
+#: gajim/common/helpers.py:288 gajim/gtk/tooltips.py:649
 msgid "Not Available"
 msgstr "Дуже далеко"
 
-#: gajim/common/helpers.py:285
+#: gajim/common/helpers.py:291
 msgid "_Free for Chat"
 msgstr "_Вільний для балачки"
 
-#: gajim/common/helpers.py:287 gajim/gtk/tooltips.py:643
+#: gajim/common/helpers.py:293 gajim/gtk/tooltips.py:643
 msgid "Free for Chat"
 msgstr "Вільний для балачки"
 
-#: gajim/common/helpers.py:290
+#: gajim/common/helpers.py:296
 msgid "?user status:_Available"
 msgstr "?стан користувача:_Доступний"
 
-#: gajim/common/helpers.py:292 gajim/gtk/tooltips.py:641
+#: gajim/common/helpers.py:298 gajim/gtk/tooltips.py:641
 msgid "?user status:Available"
 msgstr "?стан користувача:Доступний"
 
-#: gajim/common/helpers.py:294
+#: gajim/common/helpers.py:300
 msgid "Connecting"
 msgstr "Виконується з'єднання"
 
-#: gajim/common/helpers.py:297 gajim/data/gui/preferences_window.ui:1251
+#: gajim/common/helpers.py:303 gajim/data/gui/preferences_window.ui:1251
 msgid "A_way"
 msgstr "В_ідійшов"
 
-#: gajim/common/helpers.py:299 gajim/common/modules/adhoc_commands.py:120
-#: gajim/command_system/implementation/standard.py:139
+#: gajim/common/helpers.py:305 gajim/common/modules/adhoc_commands.py:120
+#: gajim/command_system/implementation/standard.py:141
 #: gajim/gtk/tooltips.py:645
 msgid "Away"
 msgstr "Далеко"
 
-#: gajim/common/helpers.py:302
+#: gajim/common/helpers.py:308
 msgid "_Offline"
 msgstr "_Поза мережею"
 
-#: gajim/common/helpers.py:304 gajim/gtk/tooltips.py:651
+#: gajim/common/helpers.py:310 gajim/gtk/tooltips.py:651
 msgid "Offline"
 msgstr "Поза мережею"
 
-#: gajim/common/helpers.py:307
+#: gajim/common/helpers.py:313
 msgid "_Invisible"
 msgstr "_Невидимий"
 
-#: gajim/common/helpers.py:313
+#: gajim/common/helpers.py:319
 msgid "?contact has status:Unknown"
 msgstr "?стан контакту:Невідомий"
 
-#: gajim/common/helpers.py:315
+#: gajim/common/helpers.py:321
 msgid "?contact has status:Has errors"
 msgstr "?стан контакту:З помилками"
 
-#: gajim/common/helpers.py:330
+#: gajim/common/helpers.py:336
 msgid "?Subscription we already have:None"
 msgstr "?Підписка яку ми вже маємо:Жодної"
 
-#: gajim/common/helpers.py:332
+#: gajim/common/helpers.py:338
 msgid "To"
 msgstr "До"
 
-#: gajim/common/helpers.py:334 gajim/data/gui/groups_post_window.ui:33
+#: gajim/common/helpers.py:340 gajim/data/gui/groups_post_window.ui:33
 msgid "From"
 msgstr "Від"
 
-#: gajim/common/helpers.py:336
+#: gajim/common/helpers.py:342
 msgid "Both"
 msgstr "Обидва"
 
-#: gajim/common/helpers.py:338 gajim/gtk/server_info.py:151
+#: gajim/common/helpers.py:344 gajim/gtk/server_info.py:151
 #, fuzzy
 msgid "Unknown"
 msgstr "?ОС:Невідома"
 
-#: gajim/common/helpers.py:344
+#: gajim/common/helpers.py:350
 msgid "?Ask (for Subscription):None"
 msgstr "?Запит (на підписку):Немає"
 
-#: gajim/common/helpers.py:346
+#: gajim/common/helpers.py:352
 msgid "Subscribe"
 msgstr "Підписатися"
 
-#: gajim/common/helpers.py:355
+#: gajim/common/helpers.py:361
 msgid "?Group Chat Contact Role:None"
 msgstr "?Роль у груповій балачці:Немає"
 
-#: gajim/common/helpers.py:358
+#: gajim/common/helpers.py:364
 msgid "Moderators"
 msgstr "Модератори"
 
-#: gajim/common/helpers.py:360
+#: gajim/common/helpers.py:366
 msgid "Moderator"
 msgstr "Модератор"
 
-#: gajim/common/helpers.py:363
+#: gajim/common/helpers.py:369 gajim/data/gui/groupchat_info_scrolled.ui:243
 msgid "Participants"
 msgstr "Учасники"
 
-#: gajim/common/helpers.py:365
+#: gajim/common/helpers.py:371
 msgid "Participant"
 msgstr "Учасник"
 
-#: gajim/common/helpers.py:368
+#: gajim/common/helpers.py:374
 msgid "Visitors"
 msgstr "Відвідувачі"
 
-#: gajim/common/helpers.py:370
+#: gajim/common/helpers.py:376
 msgid "Visitor"
 msgstr "Відвідувач"
 
-#: gajim/common/helpers.py:376 gajim/gtk/tooltips.py:253
+#: gajim/common/helpers.py:382 gajim/gtk/tooltips.py:253
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "?Членство контакту у груповій балачці:Жодного"
 
-#: gajim/common/helpers.py:378 gajim/data/gui/groupchat_config.ui:32
+#: gajim/common/helpers.py:384 gajim/data/gui/groupchat_config.ui:32
 #: gajim/gtk/tooltips.py:259
 msgid "Owner"
 msgstr "Власник"
 
-#: gajim/common/helpers.py:380 gajim/gtk/tooltips.py:257
+#: gajim/common/helpers.py:386 gajim/gtk/tooltips.py:257
 msgid "Administrator"
 msgstr "Адміністратор"
 
-#: gajim/common/helpers.py:382 gajim/data/gui/groupchat_config.ui:40
+#: gajim/common/helpers.py:388 gajim/data/gui/groupchat_config.ui:40
 #: gajim/gtk/tooltips.py:255 gajim/gtk/groupchat_config.py:105
 msgid "Member"
 msgstr "Учасник"
 
-#: gajim/common/helpers.py:421
+#: gajim/common/helpers.py:427
 msgid "is paying attention to the conversation"
 msgstr "спілкується"
 
-#: gajim/common/helpers.py:423
+#: gajim/common/helpers.py:429
 msgid "is doing something else"
 msgstr "робить щось інше"
 
-#: gajim/common/helpers.py:425
+#: gajim/common/helpers.py:431
 #, fuzzy
 msgid "is composing a message…"
 msgstr "пише повідомлення..."
 
-#: gajim/common/helpers.py:428
+#: gajim/common/helpers.py:434
 msgid "paused composing a message"
 msgstr "призупинив (призупинила) створення повідомлення"
 
-#: gajim/common/helpers.py:430
+#: gajim/common/helpers.py:436
 msgid "has closed the chat window or tab"
 msgstr "закрив (закрила) вікно або вкладку балачки"
 
-#: gajim/common/helpers.py:936 gajim/common/helpers.py:943
+#: gajim/common/helpers.py:942 gajim/common/helpers.py:949
 #, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
@@ -5430,22 +5591,22 @@ msgstr[0] "у черзі %d повідомлення"
 msgstr[1] "у черзі %d повідомлення"
 msgstr[2] "у черзі %d повідомлень"
 
-#: gajim/common/helpers.py:950
-#, fuzzy, python-format
-msgid "from room %s"
-msgstr " з кімнати %s"
+#: gajim/common/helpers.py:956
+#, python-format
+msgid "from group chat %s"
+msgstr "у групових балачках %s"
 
-#: gajim/common/helpers.py:953 gajim/common/helpers.py:970
+#: gajim/common/helpers.py:959 gajim/common/helpers.py:976
 #, fuzzy, python-format
 msgid "from user %s"
 msgstr " від користувача %s"
 
-#: gajim/common/helpers.py:955
+#: gajim/common/helpers.py:961
 #, fuzzy, python-format
 msgid "from %s"
 msgstr " від %s"
 
-#: gajim/common/helpers.py:962 gajim/common/helpers.py:968
+#: gajim/common/helpers.py:968 gajim/common/helpers.py:974
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
@@ -5453,39 +5614,39 @@ msgstr[0] "у черзі %d подія"
 msgstr[1] "у черзі %d події"
 msgstr[2] "у черзі %d подій"
 
-#: gajim/common/helpers.py:986 gajim/common/helpers.py:998
+#: gajim/common/helpers.py:992 gajim/common/helpers.py:1004
 #: gajim/data/gui/roster_window.ui:85 data/org.gajim.Gajim.desktop.in:4
 #: data/org.gajim.Gajim.appdata.xml.in:9
 msgid "Gajim"
 msgstr "Gajim"
 
-#: gajim/common/helpers.py:1000
+#: gajim/common/helpers.py:1006
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: gajim/common/helpers.py:1109 gajim/data/gui/add_new_contact_window.ui:25
+#: gajim/common/helpers.py:1115 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:1111
+#: gajim/common/helpers.py:1117
 msgid "Hello, I am $name."
 msgstr "Привіт, я $name."
 
-#: gajim/common/helpers.py:1215 gajim/common/helpers.py:1224
-#: gajim/common/helpers.py:1282
+#: gajim/common/helpers.py:1221 gajim/common/helpers.py:1230
+#: gajim/common/helpers.py:1288
 msgid "Timeout loading image"
 msgstr "Перевищення часу очікування під час завантаження зображення"
 
-#: gajim/common/helpers.py:1234 gajim/common/helpers.py:1280
+#: gajim/common/helpers.py:1240 gajim/common/helpers.py:1286
 msgid "Image is too big"
 msgstr "Зображення є завеликим"
 
-#: gajim/common/helpers.py:1245
+#: gajim/common/helpers.py:1251
 msgid "PyCURL is not installed"
 msgstr "PyCURL не встановлено"
 
-#: gajim/common/helpers.py:1284
+#: gajim/common/helpers.py:1290
 msgid "Error loading image"
 msgstr "Помилка завантаження зображення"
 
@@ -5668,7 +5829,8 @@ msgstr "Стан було змінено."
 
 #: gajim/common/modules/adhoc_commands.py:202
 #: gajim/common/modules/adhoc_commands.py:239
-msgid "Leave Groupchats"
+#, fuzzy
+msgid "Leave Group Chats"
 msgstr "Полишити групові балачки"
 
 #: gajim/common/modules/adhoc_commands.py:228
@@ -5677,15 +5839,18 @@ msgid "%(nickname)s on %(room_jid)s"
 msgstr "%(nickname)s у %(room_jid)s"
 
 #: gajim/common/modules/adhoc_commands.py:232
-msgid "You have not joined a groupchat."
+#, fuzzy
+msgid "You have not joined a group chat."
 msgstr "Ви не приєдналися до групової балачки."
 
 #: gajim/common/modules/adhoc_commands.py:240
-msgid "Choose the groupchats you want to leave"
+#, fuzzy
+msgid "Choose the group chats you want to leave"
 msgstr "Оберіть групові балачки, які ви бажаєте полишити"
 
 #: gajim/common/modules/adhoc_commands.py:289
-msgid "You left the following groupchats:"
+#, fuzzy
+msgid "You left the following group chats:"
 msgstr "Ви полишили такі групові балачки:"
 
 #: gajim/common/modules/roster_item_exchange.py:102
@@ -5701,7 +5866,7 @@ msgstr "Надіслати контакти:"
 msgid "Blocked Contacts"
 msgstr "Заблоковані контакти"
 
-#: gajim/data/gui/destroy_muc_dialog.ui:79 gajim/gtk/dialogs.py:736
+#: gajim/data/gui/destroy_muc_dialog.ui:79 gajim/gtk/dialogs.py:563
 msgid "Destroy this group chat permanently?"
 msgstr ""
 
@@ -5710,7 +5875,7 @@ msgstr ""
 msgid "Reason..."
 msgstr "Підстава"
 
-#: gajim/data/gui/destroy_muc_dialog.ui:124 gajim/gtk/dialogs.py:738
+#: gajim/data/gui/destroy_muc_dialog.ui:124 gajim/gtk/dialogs.py:565
 msgid "Where participants should go (optional)"
 msgstr ""
 
@@ -5723,31 +5888,6 @@ msgstr ""
 msgid "_Reason and alternate venue (optional)"
 msgstr "Ви також можете вказати альтернативне місце зустрічі:"
 
-#: gajim/data/gui/advanced_configuration_window.ui:7
-#: gajim/data/gui/preferences_window.ui:2723
-#, fuzzy
-msgid "Advanced Configuration Editor (ACE)"
-msgstr "Редактор додаткових налаштувань"
-
-#: gajim/data/gui/advanced_configuration_window.ui:52
-msgid "You should restart Gajim for some changes to take effect"
-msgstr "Ви маєте перезавантажити Gajim, щоб деякі з параметрів набули чинності"
-
-#: gajim/data/gui/advanced_configuration_window.ui:84
-#, fuzzy
-msgid "_Filter"
-msgstr "Фільтр:"
-
-#: gajim/data/gui/advanced_configuration_window.ui:153
-#: gajim/data/gui/filetransfers_send_file_dialog.ui:15
-#: gajim/gtk/discovery.py:1666
-msgid "Description"
-msgstr "Опис"
-
-#: gajim/data/gui/advanced_configuration_window.ui:197
-msgid "_Reset to default"
-msgstr "_Скинути до типових"
-
 #: gajim/data/gui/join_groupchat_window.ui:56
 #: gajim/data/gui/chat_to_muc_window.ui:67
 #: gajim/data/gui/chat_to_muc_window.ui:78
@@ -5759,9 +5899,8 @@ msgid "Join group chat every time Gajim is started"
 msgstr ""
 
 #: gajim/data/gui/join_groupchat_window.ui:113
-#, fuzzy
-msgid "Auto Join"
-msgstr "Автоматичне приєднання"
+msgid "Join Automatically"
+msgstr ""
 
 #: gajim/data/gui/join_groupchat_window.ui:131
 #: gajim/data/gui/profile_window.ui:233
@@ -5770,10 +5909,11 @@ msgstr "Обліковий запис"
 
 #: gajim/data/gui/join_groupchat_window.ui:147
 #, fuzzy
-msgid "Room"
-msgstr "Кімната:"
+msgid "Group chat"
+msgstr "Групові балачки"
 
-#: gajim/data/gui/join_groupchat_window.ui:180 gajim/gtk/accounts.py:886
+#: gajim/data/gui/join_groupchat_window.ui:180 gajim/data/gui/bookmarks.ui:158
+#: gajim/gtk/accounts.py:889
 #, fuzzy
 msgid "Password"
 msgstr "Пароль:"
@@ -5797,90 +5937,11 @@ msgstr "у _групових балачках"
 msgid "Search group chats on selected server"
 msgstr ""
 
-#: gajim/data/gui/join_groupchat_window.ui:437 gajim/gtk/discovery.py:1271
+#: gajim/data/gui/join_groupchat_window.ui:437 gajim/gtk/discovery.py:1270
 #, fuzzy
 msgid "Join"
 msgstr "При_єднатися"
 
-#: gajim/data/gui/manage_proxies_window.ui:12
-msgid "HTTP Connect"
-msgstr "HTTP-з’єднання"
-
-#: gajim/data/gui/manage_proxies_window.ui:15
-msgid "SOCKS5"
-msgstr "SOCKS5"
-
-#: gajim/data/gui/manage_proxies_window.ui:18
-msgid "BOSH"
-msgstr "BOSH"
-
-#: gajim/data/gui/manage_proxies_window.ui:27
-msgid "Manage Proxy Profiles"
-msgstr "Керування профілями проксі"
-
-#: gajim/data/gui/manage_proxies_window.ui:83
-#, fuzzy
-msgid "Add Proxy"
-msgstr "Прокс_і:"
-
-#: gajim/data/gui/manage_proxies_window.ui:97
-#, fuzzy
-msgid "Remove Proxy"
-msgstr "Вилучити групу"
-
-#: gajim/data/gui/manage_proxies_window.ui:141
-#, fuzzy
-msgid "Properties"
-msgstr "<b>Властивості</b>"
-
-#: gajim/data/gui/manage_proxies_window.ui:157
-#, fuzzy
-msgid "_Name"
-msgstr "_Назва:"
-
-#: gajim/data/gui/manage_proxies_window.ui:173
-#, fuzzy
-msgid "_Type"
-msgstr "Тип:"
-
-#: gajim/data/gui/manage_proxies_window.ui:236
-#, fuzzy
-msgid "_BOSH URL"
-msgstr "_Адреса URL BOSH:"
-
-#: gajim/data/gui/manage_proxies_window.ui:261
-msgid "Use HTTP prox_y"
-msgstr "Використовувати HTTP-проксі"
-
-#: gajim/data/gui/manage_proxies_window.ui:280
-#, fuzzy
-msgid "Proxy _Host"
-msgstr "Проксі-_вузол:"
-
-#: gajim/data/gui/manage_proxies_window.ui:307
-#, fuzzy
-msgid "Proxy _Port"
-msgstr "Проксі-п_орт:"
-
-#: gajim/data/gui/manage_proxies_window.ui:334
-#, fuzzy
-msgid "_Username"
-msgstr "_Користувач:"
-
-#: gajim/data/gui/manage_proxies_window.ui:347
-msgid "Use proxy auth_entication"
-msgstr "Використовувати розпізнавання на проксі"
-
-#: gajim/data/gui/manage_proxies_window.ui:377
-#, fuzzy
-msgid "Pass_word"
-msgstr "Па_роль:"
-
-#: gajim/data/gui/manage_proxies_window.ui:405 gajim/gtk/adhoc.py:321
-#, fuzzy
-msgid "Settings"
-msgstr "Гарячі клавіші"
-
 #: gajim/data/gui/change_password_dialog.ui:17
 #, fuzzy
 msgid "New Password"
@@ -5911,11 +5972,13 @@ msgid "Status:"
 msgstr "Стан:"
 
 #: gajim/data/gui/zeroconf_information_window.ui:89
-msgid "_Log conversation history"
+#, fuzzy
+msgid "_Store conversation history"
 msgstr "_Зберігати журнал спілкування"
 
 #: gajim/data/gui/zeroconf_information_window.ui:215
 #: gajim/data/gui/vcard_information_window.ui:390
+#: gajim/data/gui/groupchat_info_scrolled.ui:166
 msgid "Contact"
 msgstr "Контакт"
 
@@ -5928,8 +5991,9 @@ msgid "Last Name:"
 msgstr "Прізвище:"
 
 #: gajim/data/gui/zeroconf_information_window.ui:260
-msgid "Jabber ID:"
-msgstr "Jabber ID:"
+#, fuzzy
+msgid "XMPP Address:"
+msgstr "Адреса AIM:"
 
 #: gajim/data/gui/zeroconf_information_window.ui:273
 msgid "E-Mail:"
@@ -5949,8 +6013,9 @@ msgid "Send _File"
 msgstr "Надіслати _файл"
 
 #: gajim/data/gui/gc_occupants_menu.ui:29
-msgid "Occupant Actions"
-msgstr "Дії учасника"
+#, fuzzy
+msgid "Participant Actions"
+msgstr "Учасники"
 
 #: gajim/data/gui/gc_occupants_menu.ui:38
 msgid "_Voice"
@@ -5981,8 +6046,9 @@ msgid "_Ban"
 msgstr "_Заблокувати"
 
 #: gajim/data/gui/gc_occupants_menu.ui:124
-msgid "_Add to Roster"
-msgstr "_Додати до реєстру"
+#, fuzzy
+msgid "_Add to Contact List"
+msgstr "_Додати контакт..."
 
 #: gajim/data/gui/gc_occupants_menu.ui:132
 #, fuzzy
@@ -6021,11 +6087,6 @@ msgstr "Підписка:"
 msgid "_Status"
 msgstr "_Стан"
 
-#: gajim/data/gui/zeroconf_context_menu.ui:26
-#: gajim/data/gui/account_context_menu.ui:79
-msgid "_Modify Account..."
-msgstr "_Змінити обліковий запис..."
-
 #: gajim/data/gui/certificate_dialog.ui:66
 #: gajim/data/gui/certificate_dialog.ui:178
 msgid "Common Name (CN)"
@@ -6108,13 +6169,19 @@ msgstr "Востаннє змінено:"
 msgid "Next entry"
 msgstr "Наступне"
 
+#: gajim/data/gui/filetransfers_send_file_dialog.ui:15
+#: gajim/data/gui/advanced_configuration.ui:143
+#: gajim/data/gui/groupchat_info_scrolled.ui:48 gajim/gtk/discovery.py:1663
+msgid "Description"
+msgstr "Опис"
+
 #: gajim/data/gui/filetransfers_send_file_dialog.ui:54
 #, fuzzy
 msgid "_Send Files"
 msgstr "Надіслати _файл"
 
 #: gajim/data/gui/filetransfers_send_file_dialog.ui:58
-#: gajim/gtk/xml_console.py:90
+#: gajim/gtk/xml_console.py:87
 #, fuzzy
 msgid "Send"
 msgstr "_Надіслати"
@@ -6139,20 +6206,23 @@ msgid "Change _Nickname..."
 msgstr "Змінити _псевдонім..."
 
 #: gajim/data/gui/gc_control_popup_menu.ui:20
-msgid "_Manage Room"
-msgstr "_Керування кімнатою"
+#, fuzzy
+msgid "_Manage Group Chat"
+msgstr "_Створити групову балачку"
 
 #: gajim/data/gui/gc_control_popup_menu.ui:31
 msgid "Change _Subject..."
 msgstr "Змінити _тему..."
 
 #: gajim/data/gui/gc_control_popup_menu.ui:38
-msgid "Configure _Room..."
-msgstr "Налаштувати _кімнату..."
+#, fuzzy
+msgid "Configure _Group Chat..."
+msgstr "Приєднатись до _групової балачки"
 
 #: gajim/data/gui/gc_control_popup_menu.ui:52
-msgid "_Destroy Room"
-msgstr "_Знищити кімнату"
+#, fuzzy
+msgid "_Destroy Group Chat"
+msgstr "_Створити групову балачку"
 
 #: gajim/data/gui/gc_control_popup_menu.ui:64
 msgid "_Minimize on close"
@@ -6162,7 +6232,7 @@ msgstr "_Мінімізувати після закриття"
 msgid "_Request Voice"
 msgstr "_Запит голосу"
 
-#: gajim/data/gui/gc_control_popup_menu.ui:99 gajim/gtk/discovery.py:1704
+#: gajim/data/gui/gc_control_popup_menu.ui:99
 msgid "_Bookmark"
 msgstr "_Закладка"
 
@@ -6212,13 +6282,6 @@ msgstr "Домашня сторінка:"
 msgid "E-Mail"
 msgstr "Ел. пошта:"
 
-#: 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/blocking_list.ui:115 gajim/gtk/add_contact.py:30
-#: gajim/gtk/accounts.py:801
-msgid "Jabber ID"
-msgstr "Jabber ID:"
-
 #: gajim/data/gui/profile_window.ui:440
 msgid "Main"
 msgstr ""
@@ -6346,36 +6409,43 @@ msgstr "Робота"
 msgid "About"
 msgstr "Відомості"
 
-#: gajim/data/gui/start_chat_dialog.ui:114 gajim/gtk/discovery.py:1658
-msgid "Users"
-msgstr "Користувачі"
+#: gajim/data/gui/start_chat_dialog.ui:53
+#, fuzzy
+msgid "Global Group Chat Search"
+msgstr "Приєднатись до групової балачки"
 
-#: gajim/data/gui/start_chat_dialog.ui:185
+#: 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
-msgid "Name:"
-msgstr "Назва: "
+msgid "_Back"
+msgstr "Скоро повернуся"
 
-#: gajim/data/gui/start_chat_dialog.ui:197
-msgid "Description:"
-msgstr "Опис: "
+#: gajim/data/gui/start_chat_dialog.ui:245
+#: gajim/data/gui/groupchat_control.ui:796
+#: gajim/data/gui/groupchat_control.ui:888 gajim/gtk/discovery.py:1701
+#: gajim/gtk/groupchat_join.py:62
+msgid "_Join"
+msgstr "При_єднатися"
 
-#: gajim/data/gui/start_chat_dialog.ui:209
-#, fuzzy
-msgid "Address:"
-msgstr "_Адреса:"
+#: gajim/data/gui/start_chat_dialog.ui:289
+msgid "Select Account"
+msgstr "Виберіть обліковий запис"
 
-#: gajim/data/gui/start_chat_dialog.ui:246
-msgid ""
-"Semi-Anonymous\n"
-"<span size=\"small\">(Only moderators can see your XMPP-Address)</span>"
-msgstr ""
+#: gajim/data/gui/start_chat_dialog.ui:380
+#, fuzzy
+msgid "_Select"
+msgstr "Прибираю"
 
 #: gajim/data/gui/filetransfers.ui:21
 #, fuzzy
 msgid "Pa_use/Resume"
 msgstr "_Продовжити"
 
-#: gajim/data/gui/filetransfers.ui:30 gajim/gtk/filechoosers.py:178
+#: gajim/data/gui/filetransfers.ui:30 gajim/data/gui/groupchat_control.ui:575
+#: gajim/data/gui/groupchat_control.ui:667
+#: gajim/data/gui/groupchat_control.ui:779
+#: gajim/data/gui/groupchat_control.ui:871 gajim/gtk/filechoosers.py:178
 msgid "_Cancel"
 msgstr "_Скасувати"
 
@@ -6417,7 +6487,8 @@ msgid "Cancel the selected file transfer and remove incomplete files"
 msgstr "Скасовує обране передавання файлу і вилучає незавершені файли"
 
 #: gajim/data/gui/filetransfers.ui:207
-msgid "Shows a list of file transfers between you and others"
+#, fuzzy
+msgid "Shows a list of file transfers between you and your contacts"
 msgstr "Показує список передавань файлів"
 
 #: gajim/data/gui/groupchat_control.ui:13 gajim/data/gui/chat_control.ui:277
@@ -6437,7 +6508,6 @@ msgid "Strike"
 msgstr "Перекреслити"
 
 #: gajim/data/gui/groupchat_control.ui:54 gajim/data/gui/chat_control.ui:318
-#: gajim/gtk/advanced_config.py:86
 msgid "Color"
 msgstr "Колір"
 
@@ -6450,16 +6520,45 @@ msgstr "Шрифт"
 msgid "Clear formatting"
 msgstr "Зняти форматування"
 
-#: gajim/data/gui/groupchat_control.ui:290 gajim/data/gui/chat_control.ui:880
+#: gajim/data/gui/groupchat_control.ui:291 gajim/data/gui/chat_control.ui:880
 #, fuzzy
 msgid "Choose encryption"
 msgstr "Оберіть клієнтський сертифікат"
 
-#: gajim/data/gui/groupchat_control.ui:336 gajim/data/gui/chat_control.ui:640
+#: gajim/data/gui/groupchat_control.ui:337 gajim/data/gui/chat_control.ui:640
 #, fuzzy
 msgid "Show a list of emojis (Alt+M)"
 msgstr "Показати список емоційок (Alt+M)"
 
+#: gajim/data/gui/groupchat_control.ui:484
+#, fuzzy
+msgid "Joining…"
+msgstr "Блокування..."
+
+#: gajim/data/gui/groupchat_control.ui:496
+msgid "_Abort"
+msgstr ""
+
+#: gajim/data/gui/groupchat_control.ui:542
+msgid "Enter new nickname"
+msgstr "Введіть новий псевдонім"
+
+#: gajim/data/gui/groupchat_control.ui:592
+#: gajim/data/gui/groupchat_control.ui:684
+#, fuzzy
+msgid "Ch_ange"
+msgstr "Змінити _псевдонім..."
+
+#: gajim/data/gui/groupchat_control.ui:761
+#, fuzzy
+msgid "Enter password"
+msgstr "Введіть новий пароль:"
+
+#: gajim/data/gui/groupchat_control.ui:1067
+#, fuzzy
+msgid "_Try again"
+msgstr "Повторити перевірку..."
+
 #: gajim/data/gui/popup_notification_window.ui:42
 msgid "Event Type"
 msgstr "Тип події"
@@ -6538,8 +6637,8 @@ msgstr "Завжди"
 
 #: gajim/data/gui/mam_preferences.ui:18
 #, fuzzy
-msgid "Roster"
-msgstr "Показати _реєстр"
+msgid "Contact List"
+msgstr "Контакти"
 
 #: gajim/data/gui/mam_preferences.ui:22
 #: gajim/data/gui/preferences_window.ui:123
@@ -6563,12 +6662,12 @@ msgid "Add"
 msgstr "Додати"
 
 #: gajim/data/gui/mam_preferences.ui:194 gajim/data/gui/groupchat_config.ui:151
-#: gajim/gtk/dialogs.py:63 gajim/gtk/accounts.py:381
+#: gajim/gtk/dialogs.py:62 gajim/gtk/accounts.py:384
 #, fuzzy
 msgid "Remove"
 msgstr "В_илучити"
 
-#: gajim/data/gui/vcard_information_window.ui:72 gajim/gtk/accounts.py:753
+#: gajim/data/gui/vcard_information_window.ui:72 gajim/gtk/accounts.py:756
 #, fuzzy
 msgid "Resource"
 msgstr "Ресурс:"
@@ -6616,6 +6715,7 @@ msgstr "Підписка:"
 #: gajim/data/gui/vcard_information_window.ui:974
 #: gajim/data/gui/vcard_information_window.ui:993
 #: gajim/data/gui/vcard_information_window.ui:1427
+#: gajim/data/gui/groupchat_info_scrolled.ui:222
 msgid "button"
 msgstr "кнопка"
 
@@ -6644,15 +6744,18 @@ msgid "Notify me about it"
 msgstr "Сповіщати мене про це"
 
 #: gajim/data/gui/preferences_window.ui:58
-msgid "Show only in roster"
-msgstr "_Показати лише у реєстрі"
+#, fuzzy
+msgid "Show only in contact list"
+msgstr "Показувати лише _активні контакти"
 
 #: gajim/data/gui/preferences_window.ui:69
-msgid "Detached roster with detached chats"
+#, fuzzy
+msgid "Detached contact list with detached chats"
 msgstr "Відокремлений реєстр з окремими балачками"
 
 #: gajim/data/gui/preferences_window.ui:72
-msgid "Detached roster with single chat"
+#, fuzzy
+msgid "Detached contact list with single chat"
 msgstr "Відокремлений реєстр з єдиним вікном балачок"
 
 #: gajim/data/gui/preferences_window.ui:75
@@ -6660,12 +6763,14 @@ msgid "Single window for everything"
 msgstr "Єдине вікно для усього"
 
 #: gajim/data/gui/preferences_window.ui:78
-msgid "Detached roster with chat grouped by account"
+#, fuzzy
+msgid "Detached contact list with chat grouped by account"
 msgstr ""
 "Відокремлений реєстр з балачками згуртованими відповідно облікових записів"
 
 #: gajim/data/gui/preferences_window.ui:81
-msgid "Detached roster with chat grouped by type"
+#, fuzzy
+msgid "Detached contact list with chat grouped by type"
 msgstr "Відокремлений реєстр з балачками згуртованими відповідно типу"
 
 #: gajim/data/gui/preferences_window.ui:92
@@ -6716,7 +6821,7 @@ msgstr "Пов_едінка вікна:"
 
 #: gajim/data/gui/preferences_window.ui:296
 #, fuzzy
-msgid "_Show roster on startup"
+msgid "_Show contact list on startup"
 msgstr "_Показувати реєстр при старті:з"
 
 #: gajim/data/gui/preferences_window.ui:311
@@ -6732,12 +6837,12 @@ msgid "_Tabs placement"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:363
-msgid "_Quit Gajim when closing roster window"
+msgid "_Quit Gajim when closing contact list"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:367
 msgid ""
-"If enabled, Gajim will quit when closing the roster window instead of "
+"If enabled, Gajim will quit when closing the contact list window instead of "
 "minimizing to the system's notification area"
 msgstr ""
 
@@ -6747,43 +6852,44 @@ msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:423
 #, fuzzy
-msgid "Show a_vatars of contacts in roster"
+msgid "Show a_vatars of contacts in contact list"
 msgstr "Показувати _аватари контактів у реєстрі"
 
 #: gajim/data/gui/preferences_window.ui:427
 #, fuzzy
 msgid ""
-"If checked, avatars of contacts will be shown in the roster window and in "
-"group chats"
+"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
 #, fuzzy
-msgid "Show status _messages of contacts in roster"
+msgid "Show status _messages of contacts in contact list"
 msgstr "Показувати _повідомлення  про стан контактів з реєстру"
 
 #: gajim/data/gui/preferences_window.ui:445
 #, fuzzy
 msgid ""
 "If checked, status messages of contacts will be shown under the contact's "
-"name, in the roster window, and in group chats"
+"name, in the contact list window, and in group chats"
 msgstr ""
 "Якщо буде позначено цей пункт, Gajim буде показувати повідомлення про стан "
 "під ім'ям контакту у вікні реєстру і групових балачках"
 
 #: gajim/data/gui/preferences_window.ui:459
 #, fuzzy
-msgid "Show e_xtra information of contacts in roster (mood, activity, ...)"
+msgid ""
+"Show e_xtra information of contacts in contact list (mood, activity, ...)"
 msgstr ""
 "Показувати _розширену інформацію про контакт у реєстрі (настрій, діяльність, "
 "тощо)"
 
 #: gajim/data/gui/preferences_window.ui:463
 msgid ""
-"If checked, additional info published by the contact will be shown in "
-"roster. Additional infos (published via PEP) may include e.g. mood, "
+"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 ""
 
@@ -6792,16 +6898,18 @@ msgid "Sort contacts by status"
 msgstr "Впорядкувати контакти за станом"
 
 #: gajim/data/gui/preferences_window.ui:494
-msgid "in _roster"
-msgstr "у _реєстрі"
+#, fuzzy
+msgid "in _contact list"
+msgstr "Надіслати контакти:"
 
 #: gajim/data/gui/preferences_window.ui:511
 msgid "in _group chats"
 msgstr "у _групових балачках"
 
 #: gajim/data/gui/preferences_window.ui:540
-msgid "Roster Appearance"
-msgstr "Вигляд реєстру"
+#, fuzzy
+msgid "Contact List Appearance"
+msgstr "Обмін елементами реєстру"
 
 #: gajim/data/gui/preferences_window.ui:585
 #, fuzzy
@@ -6870,7 +6978,7 @@ msgstr "Не вдалося приєднатися до групової бал�
 
 #: gajim/data/gui/preferences_window.ui:660
 #, fuzzy
-msgid "If checked, the room subject will be shown when joining a group chat"
+msgid "If checked, the subject will be shown when joining a group chat"
 msgstr "Не вдалося приєднатися до групової балачки"
 
 #: gajim/data/gui/preferences_window.ui:682
@@ -6885,13 +6993,13 @@ msgstr ""
 #: gajim/data/gui/preferences_window.ui:701
 msgid ""
 "If join/leave status messages are shown in the group chat. This setting can "
-"be overridden in the groupchat menu."
+"be overridden in the group chat menu."
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:720
 msgid ""
 "The default sync threshold for new public group chats. This setting can be "
-"overridden in the groupchat menu."
+"overridden in the group chat menu."
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:722
@@ -6906,7 +7014,7 @@ msgstr "_Показати зміни стану"
 #: gajim/data/gui/preferences_window.ui:768
 msgid ""
 "If status change messages are shown in the group chat. This setting can be "
-"overridden in the groupchat menu."
+"overridden in the group chat menu."
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:825
@@ -6925,8 +7033,8 @@ msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:843
 #, fuzzy
-msgid "Show chatstate in roster"
-msgstr "Показувати _аватари контактів у реєстрі"
+msgid "Show chatstate in contact list"
+msgstr "Показувати кнопку закриття на вкладці?"
 
 #: gajim/data/gui/preferences_window.ui:847
 msgid ""
@@ -7234,7 +7342,7 @@ msgstr "Розмір відео"
 msgid "Vi_ew own video source"
 msgstr "Подивитись власне відео"
 
-#: gajim/data/gui/preferences_window.ui:2281 gajim/gtk/accounts.py:352
+#: gajim/data/gui/preferences_window.ui:2281 gajim/gtk/accounts.py:355
 msgid "Connection"
 msgstr "З'єднання"
 
@@ -7292,7 +7400,8 @@ msgid "_Manage..."
 msgstr "Керування..."
 
 #: gajim/data/gui/preferences_window.ui:2616
-msgid "_Log status changes of contacts"
+#, fuzzy
+msgid "_Store status changes of contacts in history"
 msgstr "_Записувати зміни стану контактів"
 
 #: gajim/data/gui/preferences_window.ui:2633
@@ -7318,29 +7427,34 @@ msgstr ""
 msgid "_Open..."
 msgstr "_Відкрити..."
 
-#: gajim/data/gui/groupchat_config.ui:55
+#: gajim/data/gui/preferences_window.ui:2723 gajim/gtk/advanced_config.py:84
 #, fuzzy
+msgid "Advanced Configuration Editor (ACE)"
+msgstr "Редактор додаткових налаштувань"
+
+#: gajim/data/gui/groupchat_config.ui:55
 msgid ""
-"<b>Jabber-ID</b>\n"
+"<b>XMPP Address</b>\n"
 "&lt;user@domain/resource&gt; (only that resource matches)\n"
 "&lt;user@domain&gt; (any resource matches)\n"
 "&lt;domain/resource&gt; (only that resource matches)\n"
 "&lt;domain&gt; (the domain itself matches, as does any user@domain or domain/"
 "resource)\n"
 msgstr ""
-"Можна використовувати записи у такому форматі:\n"
-"1. користувач@домен/ресурс (пошук лише вказаного ресурсу).\n"
-"2. користувач@домен (пошук будь-якого ресурсу).\n"
-"3. домен/ресурс (пошук лише вказаного ресурсу).\n"
-"4. домен (пошук лише домену: записів користувач@домен,\n"
-"домен/ресурс або адреси, що містить піддомен)."
+"<b>Можна використовувати записи у такому форматі:</b>\n"
+"&lt;користувач@домен/ресурс&gt; (пошук лише вказаного ресурсу).\n"
+"&lt;користувач@домен&gt; (пошук будь-якого ресурсу).\n"
+"&lt;домен/ресурс&gt; (пошук лише вказаного ресурсу).\n"
+"&lt;домен&gt; (пошук лише домену: записів користувач@домен, домен/ресурс або "
+"адреси, що містить піддомен)\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 ""
 
-#: gajim/data/gui/groupchat_config.ui:270 gajim/plugins/gui.py:312
+#: gajim/data/gui/groupchat_config.ui:270
+#: gajim/data/gui/groupchat_info_scrolled.ui:210 gajim/plugins/gui.py:324
 msgid "Configuration"
 msgstr "Налаштування"
 
@@ -7350,9 +7464,8 @@ msgid "Reserved Name"
 msgstr "Назва параметра"
 
 #: gajim/data/gui/groupchat_config.ui:358
-#, fuzzy
 msgid "Affiliation"
-msgstr "<b>Належність:</b>"
+msgstr "Належність"
 
 #: gajim/data/gui/groupchat_config.ui:389
 #, fuzzy
@@ -7372,7 +7485,7 @@ msgid "Start _Chat"
 msgstr "Почати _балачку"
 
 #: gajim/data/gui/contact_context_menu.ui:20
-#: gajim/data/gui/systray_context_menu.ui:36
+#: gajim/data/gui/systray_context_menu.ui:29
 msgid "Send Single _Message..."
 msgstr "Надіслати окреме _повідомлення..."
 
@@ -7429,17 +7542,42 @@ msgid "_Ignore"
 msgstr "_Ігнорувати"
 
 #: gajim/data/gui/contact_context_menu.ui:174
-msgid "_Add to Roster..."
-msgstr "_Додати до реєстру..."
+#, fuzzy
+msgid "_Add to Contact List..."
+msgstr "_Додати контакт..."
+
+#: gajim/data/gui/advanced_configuration.ui:39
+msgid "You should restart Gajim for some changes to take effect"
+msgstr "Ви маєте перезавантажити Gajim, щоб деякі з параметрів набули чинності"
+
+#: gajim/data/gui/advanced_configuration.ui:71
+#, fuzzy
+msgid "_Filter"
+msgstr "Фільтр:"
+
+#: gajim/data/gui/advanced_configuration.ui:88
+msgid "Type to search for values..."
+msgstr ""
+
+#: gajim/data/gui/advanced_configuration.ui:180
+#, fuzzy
+msgid "_Reset Value"
+msgstr "_Скинути до типових"
+
+#: gajim/data/gui/advanced_configuration.ui:185
+#, fuzzy
+msgid "Resets value to default"
+msgstr "_Скинути до типових"
 
 #: gajim/data/gui/account_creation_wizard_window.ui:43
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim: Майстер створення облікових записів"
 
 #: gajim/data/gui/account_creation_wizard_window.ui:70
+#, fuzzy
 msgid ""
 "You need to have an account in order to connect\n"
-"to the Jabber network."
+"to the XMPP network."
 msgstr ""
 "Для з’єднання з мережею Jabber вам потрібен обліковий\n"
 "запис."
@@ -7461,8 +7599,9 @@ msgid "<b>Please fill in the data for your existing account</b>"
 msgstr "<b>Будь ласка, вкажіть відомості щодо вашого облікового запису</b>"
 
 #: gajim/data/gui/account_creation_wizard_window.ui:187
-msgid "_Jabber ID:"
-msgstr "_Jabber ID:"
+#, fuzzy
+msgid "_XMPP Address:"
+msgstr "Адреса AIM:"
 
 #: gajim/data/gui/account_creation_wizard_window.ui:239
 #: gajim/data/gui/account_creation_wizard_window.ui:394
@@ -7551,6 +7690,7 @@ msgid "Privacy Lists:"
 msgstr "Списки конфіденційності:"
 
 #: gajim/data/gui/service_discovery_window.ui:111
+#: gajim/data/gui/groupchat_creation.ui:227
 #, fuzzy
 msgid "_Address"
 msgstr "_Адреса:"
@@ -7568,11 +7708,6 @@ msgstr "Синхронізація: оберіть контакти"
 msgid "Select the contacts you want to synchronise"
 msgstr "Виберіть контакти, які ви бажаєте синхронізувати"
 
-#: gajim/data/gui/groupchat_invitation_received.ui:42
-#, fuzzy
-msgid "Group Chat Invitation"
-msgstr "Запрошення до групової балачки"
-
 #: gajim/data/gui/groupchat_invitation_received.ui:111
 #, fuzzy
 msgid "Message..."
@@ -7624,11 +7759,10 @@ msgstr ""
 
 #: gajim/data/gui/add_new_contact_window.ui:84
 #, fuzzy
-msgid "_Jabber ID"
-msgstr "_Jabber ID:"
+msgid "_XMPP Address"
+msgstr "_Адреса:"
 
 #: gajim/data/gui/add_new_contact_window.ui:100
-#: gajim/data/gui/manage_bookmarks_window.ui:192
 #, fuzzy
 msgid "_Nickname"
 msgstr "_Прізвисько:"
@@ -7705,7 +7839,7 @@ msgstr "<b>Настрій:</b>"
 msgid "<b>Message:</b>"
 msgstr "<b>Повідомлення:</b>"
 
-#: gajim/data/gui/plugins_window.ui:10 gajim/data/gui/application_menu.ui:90
+#: gajim/data/gui/plugins_window.ui:10 gajim/data/gui/application_menu.ui:87
 msgid "Plugins"
 msgstr "Додатки"
 
@@ -7813,10 +7947,6 @@ msgstr "Дозволити"
 msgid "Deny"
 msgstr "Відмовити"
 
-#: gajim/data/gui/privacy_list_window.ui:317
-msgid "JabberID"
-msgstr "JabberID"
-
 #: gajim/data/gui/privacy_list_window.ui:358
 msgid "all in the group"
 msgstr "всі у групі"
@@ -7857,7 +7987,7 @@ msgstr "Порядок:"
 msgid "Manage sounds"
 msgstr "_Керування звуками"
 
-#: gajim/data/gui/manage_sounds_window.ui:55 gajim/plugins/gui.py:100
+#: gajim/data/gui/manage_sounds_window.ui:55 gajim/plugins/gui.py:101
 msgid "Active"
 msgstr "Активний"
 
@@ -7895,23 +8025,113 @@ msgstr "Вилучити обліковий запис з Gajim та з _сер�
 msgid "_Personal Events"
 msgstr "_Особисті події"
 
-#: gajim/data/gui/account_context_menu.ui:35
-#: gajim/data/gui/systray_context_menu.ui:28
-msgid "Join _Group Chat"
-msgstr "Приєднатись до _групової балачки"
-
-#: gajim/data/gui/account_context_menu.ui:49
+#: gajim/data/gui/account_context_menu.ui:41
 msgid "_Add Contact..."
 msgstr "_Додати контакт..."
 
-#: gajim/data/gui/account_context_menu.ui:57
+#: gajim/data/gui/account_context_menu.ui:49
 msgid "_Discover Services"
 msgstr "Ви_явити служби"
 
-#: gajim/data/gui/account_context_menu.ui:65
+#: gajim/data/gui/account_context_menu.ui:57
 msgid "_Execute Command..."
 msgstr "_Виконати команду..."
 
+#: gajim/data/gui/account_context_menu.ui:65
+#, fuzzy
+msgid "_View Certificate"
+msgstr "Перегляд сертифікату..."
+
+#: gajim/data/gui/manage_proxies.ui:12
+#, fuzzy
+msgctxt "proxy configuration"
+msgid "HTTP Connect"
+msgstr "HTTP-з’єднання"
+
+#: gajim/data/gui/manage_proxies.ui:15
+#, fuzzy
+msgctxt "proxy configuration"
+msgid "SOCKS5"
+msgstr "SOCKS5"
+
+#: gajim/data/gui/manage_proxies.ui:18
+#, fuzzy
+msgctxt "proxy configuration"
+msgid "BOSH"
+msgstr "BOSH"
+
+#: gajim/data/gui/manage_proxies.ui:68
+#, fuzzy
+msgid "Add Proxy"
+msgstr "Прокс_і:"
+
+#: gajim/data/gui/manage_proxies.ui:82
+#, fuzzy
+msgid "Remove Proxy"
+msgstr "Вилучити групу"
+
+#: gajim/data/gui/manage_proxies.ui:134
+#, fuzzy
+msgid "Pass_word"
+msgstr "Па_роль:"
+
+#: gajim/data/gui/manage_proxies.ui:159
+msgid "Use proxy auth_entication"
+msgstr "Використовувати розпізнавання на проксі"
+
+#: gajim/data/gui/manage_proxies.ui:179
+#, fuzzy
+msgid "_Username"
+msgstr "_Користувач:"
+
+#: gajim/data/gui/manage_proxies.ui:209
+#, fuzzy
+msgid "_Port"
+msgstr "_Порт:"
+
+#: gajim/data/gui/manage_proxies.ui:226
+msgid "example.org"
+msgstr ""
+
+#: gajim/data/gui/manage_proxies.ui:240
+#, fuzzy
+msgid "_Host"
+msgstr "Назва _вузла:"
+
+#: gajim/data/gui/manage_proxies.ui:254
+msgid "Use HTTP prox_y"
+msgstr "Використовувати HTTP-проксі"
+
+#: gajim/data/gui/manage_proxies.ui:275
+msgid "https://example.org/http-bind/"
+msgstr ""
+
+#: gajim/data/gui/manage_proxies.ui:291
+#, fuzzy
+msgid "_BOSH URL"
+msgstr "_Адреса URL BOSH:"
+
+#: gajim/data/gui/manage_proxies.ui:309 gajim/gtk/adhoc.py:322
+#, fuzzy
+msgid "Settings"
+msgstr "Гарячі клавіші"
+
+#: gajim/data/gui/manage_proxies.ui:344
+#, fuzzy
+msgid "_Type"
+msgstr "Тип:"
+
+#: gajim/data/gui/manage_proxies.ui:361
+#: gajim/data/gui/groupchat_creation.ui:105
+#, fuzzy
+msgid "_Name"
+msgstr "_Назва:"
+
+#: gajim/data/gui/manage_proxies.ui:391 gajim/gtk/accounts.py:742
+#, fuzzy
+msgid "Proxy"
+msgstr "Прокс_і:"
+
 #: gajim/data/gui/application_menu.ui:8
 #, fuzzy
 msgid "View"
@@ -7919,8 +8139,8 @@ msgstr "П_ерегляд"
 
 #: gajim/data/gui/application_menu.ui:11
 #, fuzzy
-msgid "Show Roster"
-msgstr "Показати _реєстр"
+msgid "Show Contact List"
+msgstr "Показувати лише _активні контакти"
 
 #: gajim/data/gui/application_menu.ui:16
 #, fuzzy
@@ -7961,22 +8181,23 @@ msgstr "Гарячі клавіші"
 msgid "Features"
 msgstr "Можливості"
 
-#: gajim/data/gui/application_menu.ui:81
+#: gajim/data/gui/application_menu.ui:77
+#: gajim/data/gui/groupchat_creation.ui:81 gajim/gtk/groupchat_creation.py:45
 #, fuzzy
-msgid "Bookmarks"
-msgstr "_Закладка"
+msgid "Create Group Chat"
+msgstr "Полишити групові балачки"
 
-#: gajim/data/gui/application_menu.ui:94 gajim/data/gui/shortcuts_window.ui:189
-#: gajim/gtk/preferences.py:59
+#: gajim/data/gui/application_menu.ui:91 gajim/data/gui/shortcuts_window.ui:189
+#: gajim/gtk/preferences.py:58
 msgid "Preferences"
 msgstr "Параметри"
 
-#: gajim/data/gui/application_menu.ui:99
+#: gajim/data/gui/application_menu.ui:96
 msgid "Quit"
 msgstr ""
 
 #: gajim/data/gui/httpupload_progress_dialog.ui:110
-#: gajim/gtk/filetransfer.py:121
+#: gajim/gtk/filetransfer.py:120
 msgid "Progress"
 msgstr "Поступ"
 
@@ -7994,53 +8215,33 @@ msgstr ""
 msgid "_Cancel Upload"
 msgstr "_Скасувати"
 
-#: gajim/data/gui/manage_bookmarks_window.ui:13
-#, fuzzy
-msgid "Group Chat Bookmarks"
-msgstr "_Групова балачка"
-
-#: gajim/data/gui/manage_bookmarks_window.ui:68
-#, fuzzy
-msgid "Add Bookmark"
-msgstr "_Закладка"
-
-#: gajim/data/gui/manage_bookmarks_window.ui:82
-#, fuzzy
-msgid "Remove Bookmark"
-msgstr "_Закладка"
-
-#: gajim/data/gui/manage_bookmarks_window.ui:126
-msgid "N_ame"
+#: gajim/data/gui/groupchat_creation.ui:27
+msgid "Public or Private?"
 msgstr ""
 
-#: gajim/data/gui/manage_bookmarks_window.ui:145
-#, fuzzy
-msgid "Bookmark Name"
-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 ""
 
-#: gajim/data/gui/manage_bookmarks_window.ui:160
-#, fuzzy
-msgid "_Server"
-msgstr "_Сервер:"
+#: gajim/data/gui/groupchat_creation.ui:58
+msgid "<b>Public:</b> Anyone who knows the address can join."
+msgstr ""
 
-#: gajim/data/gui/manage_bookmarks_window.ui:223
+#: gajim/data/gui/groupchat_creation.ui:122
 #, fuzzy
-msgid "Roo_m"
-msgstr "Кімната:"
+msgid "_Description"
+msgstr "Опис"
 
-#: gajim/data/gui/manage_bookmarks_window.ui:253
-#, fuzzy
-msgid "_Password"
-msgstr "_Password:"
+#: gajim/data/gui/groupchat_creation.ui:164
+msgid "_Public"
+msgstr ""
 
-#: gajim/data/gui/manage_bookmarks_window.ui:299
+#: gajim/data/gui/groupchat_creation.ui:278
 #, fuzzy
-msgid "Join chat when connected"
-msgstr "Контакт від'єднано"
-
-#: gajim/data/gui/manage_bookmarks_window.ui:307
-msgid "_Join Automatically"
-msgstr ""
+msgid "_Account"
+msgstr "_Облікові записи"
 
 #: gajim/data/gui/exception_dialog.ui:49
 msgid "Sorry, that should not have happened"
@@ -8087,6 +8288,29 @@ msgstr ""
 msgid "Presets"
 msgstr "П_рисутність"
 
+#: gajim/data/gui/groupchat_info_scrolled.ui:32
+#, fuzzy
+msgid "Address"
+msgstr "_Адреса:"
+
+#: gajim/data/gui/groupchat_info_scrolled.ui:64
+msgid "Topic"
+msgstr ""
+
+#: gajim/data/gui/groupchat_info_scrolled.ui:80
+#, fuzzy
+msgid "Author"
+msgstr "Автори:"
+
+#: gajim/data/gui/groupchat_info_scrolled.ui:182
+msgid "Discussion Logs"
+msgstr ""
+
+#: gajim/data/gui/groupchat_info_scrolled.ui:260
+#, fuzzy
+msgid "Group Chat Language"
+msgstr "Запрошення до групової балачки"
+
 #: gajim/data/gui/emoji_chooser.ui:98
 #, fuzzy
 msgid "No Results Found"
@@ -8099,24 +8323,35 @@ msgstr "Запросіть друзів!"
 #: gajim/data/gui/chat_to_muc_window.ui:39
 #, fuzzy
 msgid ""
-"You are now entering a groupchat.\n"
+"You are now entering a group chat.\n"
 "Select the contacts you want to invite"
 msgstr ""
 "Ви маєте намір почати групову балачку.\n"
 "Оберіть контакти, які ви бажаєте запросити"
 
 #: gajim/data/gui/chat_to_muc_window.ui:112
-msgid "Please select a MUC server."
+#, fuzzy
+msgid "Please select a group chat server."
 msgstr "Будь ласка, оберіть сервер групової балачки."
 
 #: gajim/data/gui/chat_to_muc_window.ui:141
-msgid "MUC server"
-msgstr "Сервер групової балачки"
+#, fuzzy
+msgid "Group chat server"
+msgstr "Групові балачки"
 
 #: gajim/data/gui/chat_to_muc_window.ui:176
 msgid "In_vite"
 msgstr "_Запросити"
 
+#: gajim/data/gui/bookmarks.ui:176
+#, fuzzy
+msgid "Autojoin"
+msgstr "Автоматичне приєднання"
+
+#: gajim/data/gui/bookmarks.ui:211
+msgid "_Apply"
+msgstr ""
+
 #: gajim/data/gui/history_manager.ui:11
 #, fuzzy
 msgid "_Export"
@@ -8132,12 +8367,13 @@ msgid "Gajim History Logs Manager"
 msgstr "Інструмент керування журналами Gajim"
 
 #: gajim/data/gui/history_manager.ui:108
+#, fuzzy
 msgid ""
-"This log manager is not intended for log viewing. If you are looking for "
-"such functionality, use the history window instead.\n"
+"This history manager is not intended for viewing chat history. If you are "
+"looking for such functionality, please use the history window instead.\n"
 "\n"
-"Use this program to delete or export logs. You can select logs from the left "
-"and/or search database from below."
+"You can use this program to delete or export history. Either select logs "
+"from the left or search the database."
 msgstr ""
 "Цей інструмент керування журналом не призначено для перегляду журналу. Якщо "
 "вам потрібно переглянути журнал, скористайтеся вікном історії.\n"
@@ -8192,8 +8428,9 @@ msgid "Select an emoji"
 msgstr ""
 
 #: gajim/data/gui/shortcuts_window.ui:38
-msgid "Complete a command or a nick"
-msgstr ""
+#, fuzzy
+msgid "Complete a command or a nickname"
+msgstr "Будь ласка, спершу створіть нову порожню тему з бажаною назвою."
 
 #: gajim/data/gui/shortcuts_window.ui:45
 #, fuzzy
@@ -8233,7 +8470,7 @@ msgstr ""
 msgid "Scroll down"
 msgstr ""
 
-#: gajim/data/gui/shortcuts_window.ui:100 gajim/gtk/xml_console.py:72
+#: gajim/data/gui/shortcuts_window.ui:100 gajim/gtk/xml_console.py:69
 #, fuzzy
 msgid "Clear"
 msgstr "Прибираю"
@@ -8276,7 +8513,7 @@ msgstr ""
 
 #: gajim/data/gui/shortcuts_window.ui:173
 #, fuzzy
-msgid "Roster Shortcuts"
+msgid "Contact List Shortcuts"
 msgstr "Гарячі клавіші"
 
 #: gajim/data/gui/shortcuts_window.ui:196
@@ -8309,7 +8546,7 @@ msgid "Show only active contacts"
 msgstr "Показувати лише _активні контакти"
 
 #: gajim/data/gui/shortcuts_window.ui:251
-msgid "Enable roster filtering"
+msgid "Enable contact list filtering"
 msgstr ""
 
 #: gajim/data/gui/shortcuts_window.ui:259
@@ -8357,12 +8594,12 @@ msgstr "Шукати лише у зазначений день"
 
 #: gajim/data/gui/history_window.ui:317
 #, fuzzy
-msgid "Record history for this chat"
+msgid "Store history for this chat"
 msgstr "Ігнорувати цю помилку для цього сертифіката."
 
 #: gajim/data/gui/history_window.ui:332
 #, fuzzy
-msgid "Record History"
+msgid "Store History"
 msgstr "Нещодавно:"
 
 #: gajim/data/gui/history_window.ui:350
@@ -8382,9 +8619,10 @@ msgstr "Створити нове повідомлення"
 msgid "Fill in the form."
 msgstr "Заповніть форму."
 
-#: gajim/data/gui/data_form_window.ui:229
-msgid "Room Configuration"
-msgstr "Налаштування кімнати"
+#: gajim/data/gui/data_form_window.ui:229 gajim/gtk/groupchat_config.py:41
+#, fuzzy
+msgid "Group Chat Configuration"
+msgstr "Запрошення до групової балачки"
 
 #: gajim/data/gui/roster_item_exchange_window.ui:39
 #: gajim/gtk/roster_item_exchange.py:35
@@ -8405,15 +8643,15 @@ msgstr "Ста_н"
 msgid "_Start Chat..."
 msgstr "_Почати балачку..."
 
-#: gajim/data/gui/systray_context_menu.ui:50
+#: gajim/data/gui/systray_context_menu.ui:43
 msgid "Show All Pending _Events"
 msgstr "Показати усі _події з черги"
 
-#: gajim/data/gui/systray_context_menu.ui:59
+#: gajim/data/gui/systray_context_menu.ui:52
 msgid "Mute Sounds"
 msgstr "Вимкнути звук"
 
-#: gajim/data/gui/systray_context_menu.ui:75
+#: gajim/data/gui/systray_context_menu.ui:68
 #, fuzzy
 msgid "_Preferences"
 msgstr "Параметри"
@@ -8504,33 +8742,33 @@ msgstr "Виконати вираз у оболонці, показати рез
 msgid "Execute expression inside a shell, send output"
 msgstr "Виконати вираз у оболонці, надіслати результат"
 
-#: gajim/command_system/implementation/standard.py:45
+#: gajim/command_system/implementation/standard.py:47
 msgid ""
 "Show help on a given command or a list of available commands if -a is given"
 msgstr "Показати довідку по команді або перелік команд якщо вказано -a"
 
-#: gajim/command_system/implementation/standard.py:73
+#: gajim/command_system/implementation/standard.py:75
 msgid "Send a message to the contact"
 msgstr "Надіслати повідомлення контакту"
 
-#: gajim/command_system/implementation/standard.py:78
+#: gajim/command_system/implementation/standard.py:80
 msgid "Send action (in the third person) to the current chat"
 msgstr "Надіслати дію (від третьої особи) до поточної балачки"
 
-#: gajim/command_system/implementation/standard.py:83
+#: gajim/command_system/implementation/standard.py:85
 msgid "Show logged messages which mention given text"
 msgstr "Показувати збережені повідомлення що містять відповідний текст"
 
-#: gajim/command_system/implementation/standard.py:88
+#: gajim/command_system/implementation/standard.py:90
 #, python-format
 msgid "%s: Nothing found"
 msgstr "%s: не знайдено"
 
-#: gajim/command_system/implementation/standard.py:94
+#: gajim/command_system/implementation/standard.py:96
 msgid "Limit must be an integer"
 msgstr "Обмеження має бути цілим числом"
 
-#: gajim/command_system/implementation/standard.py:118
+#: gajim/command_system/implementation/standard.py:120
 msgid ""
 "\n"
 "    Set the current status\n"
@@ -8546,121 +8784,130 @@ msgstr ""
 "    chat, xa, dnd.\n"
 "    "
 
-#: gajim/command_system/implementation/standard.py:136
+#: gajim/command_system/implementation/standard.py:138
 msgid "Set the current status to away"
 msgstr "Встановити поточний стан як відсутній"
 
-#: gajim/command_system/implementation/standard.py:150
+#: gajim/command_system/implementation/standard.py:152
 msgid "Set the current status to online"
 msgstr "Встановити поточний стан як на зв’язку"
 
-#: gajim/command_system/implementation/standard.py:153
+#: gajim/command_system/implementation/standard.py:155
 msgid "Available"
 msgstr "Доступний"
 
-#: gajim/command_system/implementation/standard.py:173
-#: gajim/command_system/implementation/standard.py:250
+#: gajim/command_system/implementation/standard.py:175
+#: gajim/command_system/implementation/standard.py:252
 msgid "Clear the text window"
 msgstr "Очистити текстове вікно"
 
-#: gajim/command_system/implementation/standard.py:178
-#: gajim/command_system/implementation/standard.py:397
+#: gajim/command_system/implementation/standard.py:180
+#: gajim/command_system/implementation/standard.py:401
 msgid "Send a ping to the contact"
 msgstr "Надіслати запит присутності до контакту"
 
-#: gajim/command_system/implementation/standard.py:181
-#: gajim/command_system/implementation/standard.py:400
+#: gajim/command_system/implementation/standard.py:183
+#: gajim/command_system/implementation/standard.py:404
 msgid "Command is not supported for zeroconf accounts"
 msgstr "Команда не підтримується для облікових записів zeroconf"
 
-#: gajim/command_system/implementation/standard.py:185
-msgid "Send DTMF sequence through an open audio session"
+#: gajim/command_system/implementation/standard.py:187
+#, fuzzy
+msgid "Send DTMF sequence through an open voice chat"
 msgstr "Надіслати DTMF послідовність через відкриту аудіо сесію"
 
-#: gajim/command_system/implementation/standard.py:188
-msgid "No open audio sessions with the contact"
+#: gajim/command_system/implementation/standard.py:190
+#, fuzzy
+msgid "No open voice chats with the contact"
 msgstr "Нема відкритих аудіо сесій з контактом"
 
-#: gajim/command_system/implementation/standard.py:191
+#: gajim/command_system/implementation/standard.py:193
 #, python-format
 msgid "%s is not a valid tone"
 msgstr "%s не є коректним тоном"
 
-#: gajim/command_system/implementation/standard.py:198
-msgid "Toggle audio session"
-msgstr "Перемкнути аудіо сессію"
+#: gajim/command_system/implementation/standard.py:200
+msgid "Toggle Voice Chat"
+msgstr ""
 
-#: gajim/command_system/implementation/standard.py:201
-msgid "Audio sessions are not available"
-msgstr "Аудіо сесія недоступна"
+#: gajim/command_system/implementation/standard.py:203
+#, fuzzy
+msgid "Voice chats are not available"
+msgstr "Відео сесія недоступна"
 
-#: gajim/command_system/implementation/standard.py:208
-msgid "Toggle video session"
+#: gajim/command_system/implementation/standard.py:210
+#, fuzzy
+msgid "Toggle Video Chat"
 msgstr "Перемкнути відео сессію"
 
-#: gajim/command_system/implementation/standard.py:211
-msgid "Video sessions are not available"
+#: gajim/command_system/implementation/standard.py:213
+#, fuzzy
+msgid "Video chats are not available"
 msgstr "Відео сесія недоступна"
 
-#: gajim/command_system/implementation/standard.py:218
+#: gajim/command_system/implementation/standard.py:220
 #, fuzzy
 msgid "Send a message to the contact that will attract their attention"
 msgstr "Надіслати повідомлення контакту щоб привернути його (її) увагу"
 
-#: gajim/command_system/implementation/standard.py:255
+#: gajim/command_system/implementation/standard.py:257
 msgid "Change your nickname in a group chat"
 msgstr "Змінити ваш псевдонім у груповій балачці"
 
-#: gajim/command_system/implementation/standard.py:260 gajim/gtk/dialogs.py:674
-#: gajim/gtk/bookmarks.py:272
+#: gajim/command_system/implementation/standard.py:262
 msgid "Invalid nickname"
 msgstr "Некоректний псевдонім"
 
-#: gajim/command_system/implementation/standard.py:267
-msgid "Open a private chat window with a specified occupant"
+#: gajim/command_system/implementation/standard.py:269
+#, fuzzy
+msgid "Open a private chat window with a specified participant"
 msgstr "_Відкрити вікно приватної балачки з зазначеним користувачем"
 
-#: gajim/command_system/implementation/standard.py:273
-#: gajim/command_system/implementation/standard.py:282
-#: gajim/command_system/implementation/standard.py:332
-#: gajim/command_system/implementation/standard.py:345
-#: gajim/command_system/implementation/standard.py:357
+#: gajim/command_system/implementation/standard.py:275
+#: gajim/command_system/implementation/standard.py:284
+#: gajim/command_system/implementation/standard.py:336
+#: gajim/command_system/implementation/standard.py:349
+#: gajim/command_system/implementation/standard.py:361
 msgid "Nickname not found"
 msgstr "Псевдонім не знайдено"
 
-#: gajim/command_system/implementation/standard.py:276
+#: gajim/command_system/implementation/standard.py:278
+#, fuzzy
 msgid ""
-"Open a private chat window with a specified occupant and send him a message"
+"Open a private chat window with a specified participant and send him a "
+"message"
 msgstr ""
 "Відкрити вікно приватної балачки з зазначеним користувачем та надіслати йому "
 "повідомлення"
 
-#: gajim/command_system/implementation/standard.py:285
+#: gajim/command_system/implementation/standard.py:287
 msgid "Display or change a group chat topic"
 msgstr "Показати або змінити тему групової балачки"
 
-#: gajim/command_system/implementation/standard.py:294
-msgid "Invite a user to a room for a reason"
+#: gajim/command_system/implementation/standard.py:296
+#, fuzzy
+msgid "Invite a user to a group chat for a reason"
 msgstr "Запросити користувача в кімнату вказавши причину"
 
-#: gajim/command_system/implementation/standard.py:297
+#: gajim/command_system/implementation/standard.py:299
 #, fuzzy, python-format
 msgid "Invited %(jid)s to %(room_jid)s"
 msgstr "Запрошено %s до %s"
 
-#: gajim/command_system/implementation/standard.py:301
+#: gajim/command_system/implementation/standard.py:303
 #, fuzzy
-msgid "Join a group chat given by a JID"
+msgid "Join a group chat given by an XMPP Address"
 msgstr "у _групових балачках"
 
-#: gajim/command_system/implementation/standard.py:309
+#: gajim/command_system/implementation/standard.py:313
+#, fuzzy
 msgid ""
-"Leave the groupchat, optionally giving a reason, and close tab or window"
+"Leave the group chat, optionally giving a reason, and close tab or window"
 msgstr ""
 "Покинути групову балачку, за бажанням вказавши причину, та закрити вкладку "
 "або вікно"
 
-#: gajim/command_system/implementation/standard.py:314
+#: gajim/command_system/implementation/standard.py:318
 #, fuzzy
 msgid ""
 "\n"
@@ -8675,13 +8922,15 @@ msgstr ""
 "    Якщо вказаний псевдонім не буде знайдено, він буде оброблений як jid.\n"
 "    "
 
-#: gajim/command_system/implementation/standard.py:329
-msgid "Kick user by a nick from a groupchat"
+#: gajim/command_system/implementation/standard.py:333
+#, fuzzy
+msgid "Kick user by a nick from a group chat"
 msgstr "Викинути користувача з групової балачки за псевдонімом"
 
-#: gajim/command_system/implementation/standard.py:338
+#: gajim/command_system/implementation/standard.py:342
+#, fuzzy
 msgid ""
-"Set occupant role in group chat.\n"
+"Set participant role in group chat.\n"
 "    Role can be given as one of the following values:\n"
 "    moderator, participant, visitor, none"
 msgstr ""
@@ -8689,13 +8938,14 @@ msgstr ""
 "    Роль може бути одним з наведених:\n"
 "    moderator, participant, visitor, none"
 
-#: gajim/command_system/implementation/standard.py:343
+#: gajim/command_system/implementation/standard.py:347
 msgid "Invalid role given"
 msgstr "Некоректна роль"
 
-#: gajim/command_system/implementation/standard.py:350
+#: gajim/command_system/implementation/standard.py:354
+#, fuzzy
 msgid ""
-"Set occupant affiliation in group chat.\n"
+"Set participant affiliation in group chat.\n"
 "    Affiliation can be given as one of the following values:\n"
 "    owner, admin, member, outcast, none"
 msgstr ""
@@ -8703,20 +8953,23 @@ msgstr ""
 "    Може бути одним з наведених:\n"
 "    owner, admin, member, outcast, none"
 
-#: gajim/command_system/implementation/standard.py:355
+#: gajim/command_system/implementation/standard.py:359
 msgid "Invalid affiliation given"
 msgstr "Вказано невірні права"
 
-#: gajim/command_system/implementation/standard.py:365
-msgid "Display names of all group chat occupants"
+#: gajim/command_system/implementation/standard.py:369
+#, fuzzy
+msgid "Display names of all group chat participants"
 msgstr "Показати імена усіх учасників балачки"
 
-#: gajim/command_system/implementation/standard.py:387
-msgid "Forbid an occupant to send you public or private messages"
+#: gajim/command_system/implementation/standard.py:391
+#, fuzzy
+msgid "Forbid a participant to send you public or private messages"
 msgstr "Заборонити учаснику надсилати вам особисті або публічні повідомлення"
 
-#: gajim/command_system/implementation/standard.py:392
-msgid "Allow an occupant to send you public or private messages"
+#: gajim/command_system/implementation/standard.py:396
+#, fuzzy
+msgid "Allow a participant to send you public or private messages"
 msgstr "Дозволити учаснику надсилати вам особисті або публічні повідомлення"
 
 #: gajim/command_system/implementation/middleware.py:74
@@ -8729,205 +8982,330 @@ msgstr ""
 "Так само як для використання doc-string, за виключенням наявної підтримки "
 "перекладів"
 
-#: gajim/gtk/filetransfer.py:91
+#: gajim/gtk/groupchat_info.py:36
+#, fuzzy
+msgid "?Group chat feature:Archiving"
+msgstr "Запрошення до групової балачки"
+
+#: gajim/gtk/groupchat_info.py:37
+#, fuzzy
+msgid "Messages are archived on the server"
+msgstr "Цей сеанс БУДЕ збережена на сервері"
+
+#: gajim/gtk/groupchat_info.py:40
+#, fuzzy
+msgid "?Group chat feature:Persistent"
+msgstr "Групові балачки"
+
+#: gajim/gtk/groupchat_info.py:41
+msgid "This group chat persists even if there are no participants"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:45
+#, fuzzy
+msgid "?Group chat feature:Temporary"
+msgstr "?Роль у груповій балачці:Немає"
+
+#: gajim/gtk/groupchat_info.py:46
+msgid "This group chat will be destroyed once the last participant left"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:50
+#, fuzzy
+msgid "?Group chat feature:Moderated"
+msgstr "?Роль у груповій балачці:Немає"
+
+#: gajim/gtk/groupchat_info.py:51
+msgid ""
+"Participants entering this group chat need to request permission to send "
+"messages"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:55
+#, fuzzy
+msgid "?Group chat feature:Not Moderated"
+msgstr "Групові балачки"
+
+#: gajim/gtk/groupchat_info.py:56
+msgid "Participants entering this group chat are allowed to send messages"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:60
+#, fuzzy
+msgid "?Group chat feature:Open"
+msgstr "?Роль у груповій балачці:Немає"
+
+#: gajim/gtk/groupchat_info.py:61
+msgid "Anyone can join this group chat"
+msgstr "Хто завгодно може приєднатися до цієї групової балачки"
+
+#: gajim/gtk/groupchat_info.py:64
+#, fuzzy
+msgid "?Group chat feature:Members Only"
+msgstr "Виділення повідомлення групової балачки:"
+
+#: gajim/gtk/groupchat_info.py:65
+msgid "This group chat is restricted to members only"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:69
+#, fuzzy
+msgid "?Group chat feature:Public"
+msgstr "Виділення повідомлення групової балачки:"
+
+#: gajim/gtk/groupchat_info.py:70
+msgid "Group chat can be found via search"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:73
+#, fuzzy
+msgid "?Group chat feature:Hidden"
+msgstr "?Роль у груповій балачці:Немає"
+
+#: gajim/gtk/groupchat_info.py:74
+#, fuzzy
+msgid "This group chat can not be found via search"
+msgstr "Не вдалося знайти службу"
+
+#: gajim/gtk/groupchat_info.py:77
+#, fuzzy
+msgid "?Group chat feature:Not Anonymous"
+msgstr "Групові балачки"
+
+#: gajim/gtk/groupchat_info.py:78
+msgid "All other group chat participants can see your XMPP address"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:82
+#, fuzzy
+msgid "?Group chat feature:Semi-Anonymous"
+msgstr "Виділення повідомлення групової балачки:"
+
+#: gajim/gtk/groupchat_info.py:83
+msgid "Only moderators can see your XMPP address"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:86
+#, fuzzy
+msgid "?Group chat feature:Password Required"
+msgstr "Групові балачки"
+
+#: gajim/gtk/groupchat_info.py:87
+msgid "This group chat does require a password upon entry"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:91
+#, fuzzy
+msgid "?Group chat feature:No Password Required"
+msgstr "Групові балачки"
+
+#: gajim/gtk/groupchat_info.py:92
+msgid "This group chat does not require a password upon entry"
+msgstr ""
+
+#: gajim/gtk/filetransfer.py:90
 msgid "File"
 msgstr "Файл"
 
-#: gajim/gtk/filetransfer.py:108
+#: gajim/gtk/filetransfer.py:107
 msgid "Time"
 msgstr "Час"
 
-#: gajim/gtk/filetransfer.py:228
+#: gajim/gtk/filetransfer.py:227
 #, fuzzy, python-format
 msgid "File name: %s"
 msgstr "Назва файла: %s"
 
-#: gajim/gtk/filetransfer.py:229 gajim/gtk/filetransfer.py:464
+#: gajim/gtk/filetransfer.py:228 gajim/gtk/filetransfer.py:469
 #, python-format
 msgid "Size: %s"
 msgstr "Розмір: %s"
 
-#: gajim/gtk/filetransfer.py:239
+#: gajim/gtk/filetransfer.py:238
 #, python-format
 msgid "Sender: %s"
 msgstr "Відправник: %s"
 
-#: gajim/gtk/filetransfer.py:240 gajim/gtk/filetransfer.py:744
+#: gajim/gtk/filetransfer.py:239 gajim/gtk/filetransfer.py:749
 #: gajim/gtk/tooltips.py:577
 msgid "Recipient: "
 msgstr "Отримувач:"
 
-#: gajim/gtk/filetransfer.py:251
+#: gajim/gtk/filetransfer.py:250
 #, python-format
 msgid "Saved in: %s"
 msgstr "Збережено за адресою: %s"
 
-#: gajim/gtk/filetransfer.py:256
+#: gajim/gtk/filetransfer.py:255
 msgid "File transfer completed"
 msgstr "Передавання файла завершено"
 
-#: gajim/gtk/filetransfer.py:276 gajim/gtk/filetransfer.py:285
+#: gajim/gtk/filetransfer.py:275 gajim/gtk/filetransfer.py:284
 #, fuzzy
 msgid "Connection with peer could not be established."
 msgstr "Не вдалося встановити з’єднання з вузлом."
 
-#: gajim/gtk/filetransfer.py:293
+#: gajim/gtk/filetransfer.py:292
 #, python-format
 msgid "Filename: %s"
 msgstr "Назва файла: %s"
 
-#: gajim/gtk/filetransfer.py:294
+#: gajim/gtk/filetransfer.py:293
 #, python-format
 msgid "Recipient: %s"
 msgstr "Отримувач: %s"
 
-#: gajim/gtk/filetransfer.py:296
+#: gajim/gtk/filetransfer.py:295
 #, python-format
 msgid "Error message: %s"
 msgstr "Повідомлення про помилку: %s"
 
-#: gajim/gtk/filetransfer.py:333
-#, fuzzy
-msgid "File transfer error"
-msgstr "Помилка під час передавання файла"
-
 #: gajim/gtk/filetransfer.py:334
-#, fuzzy, python-format
+#, python-format
 msgid ""
-"The file %(file)s has been received, but it seems to have been damaged along "
-"the way.\n"
+"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:350
+#: gajim/gtk/filetransfer.py:340
+#, fuzzy
+msgid "_Download Again"
+msgstr "Більше _не питати мене"
+
+#: gajim/gtk/filetransfer.py:355
 #, fuzzy
 msgid "Gajim can not read this file"
 msgstr "Gajim не може отримати доступу до цього файла"
 
-#: gajim/gtk/filetransfer.py:351
+#: gajim/gtk/filetransfer.py:356
 msgid "Another process is using this file."
 msgstr ""
 
-#: gajim/gtk/filetransfer.py:418
+#: gajim/gtk/filetransfer.py:423
 #, fuzzy
 msgid "File Transfer Conflict"
 msgstr "Завершення передавання файла"
 
-#: gajim/gtk/filetransfer.py:419
+#: gajim/gtk/filetransfer.py:424
 msgid "This file already exists"
 msgstr "Файл з такою назвою вже існує."
 
-#: gajim/gtk/filetransfer.py:420
+#: gajim/gtk/filetransfer.py:425
 msgid "Resume download or replace file?"
 msgstr ""
 
-#: gajim/gtk/filetransfer.py:424
+#: gajim/gtk/filetransfer.py:429
 #, fuzzy
 msgid "Replace _File"
 msgstr "За_мінити"
 
-#: gajim/gtk/filetransfer.py:427
+#: gajim/gtk/filetransfer.py:432
 #, fuzzy
 msgid "Resume _Download"
 msgstr "Звантажити"
 
-#: gajim/gtk/filetransfer.py:437
+#: gajim/gtk/filetransfer.py:442
 #, fuzzy, python-format
 msgid "Directory '%s' is not writable"
 msgstr "Запис до каталогу «%s» неможливий"
 
-#: gajim/gtk/filetransfer.py:438
+#: gajim/gtk/filetransfer.py:443
 #, fuzzy
 msgid "You do not have permissions to create files in this directory."
 msgstr "Ваш користувач не має права на створення файлів у цьому каталозі."
 
-#: gajim/gtk/filetransfer.py:461
+#: gajim/gtk/filetransfer.py:466
 #, python-format
 msgid "File: %s"
 msgstr "Файл: %s"
 
-#: gajim/gtk/filetransfer.py:467
+#: gajim/gtk/filetransfer.py:472
 #, python-format
 msgid "Type: %s"
 msgstr "Тип: %s"
 
-#: gajim/gtk/filetransfer.py:469
+#: gajim/gtk/filetransfer.py:474
 #, python-format
 msgid "Description: %s"
 msgstr "Опис: %s"
 
-#: gajim/gtk/filetransfer.py:480
+#: gajim/gtk/filetransfer.py:485
 #, fuzzy, python-format
 msgid "%s wants to send you a file"
 msgstr "%s бажає надіслати вам файл."
 
-#: gajim/gtk/filetransfer.py:509
+#: gajim/gtk/filetransfer.py:514
 #, fuzzy
 msgid "Checking file…"
 msgstr "Перевірка файлу..."
 
-#: gajim/gtk/filetransfer.py:524
+#: gajim/gtk/filetransfer.py:529
 msgid "File error"
 msgstr "Помилка файлу"
 
-#: gajim/gtk/filetransfer.py:561
+#: gajim/gtk/filetransfer.py:566
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 
-#: gajim/gtk/filetransfer.py:658
+#: gajim/gtk/filetransfer.py:663
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/s)"
 
-#: gajim/gtk/filetransfer.py:711 gajim/gtk/filetransfer.py:715
+#: gajim/gtk/filetransfer.py:716 gajim/gtk/filetransfer.py:720
 msgid "Invalid File"
 msgstr "Некоректний файл"
 
-#: gajim/gtk/filetransfer.py:711
+#: gajim/gtk/filetransfer.py:716
 msgid "File: "
 msgstr "Файл: "
 
-#: gajim/gtk/filetransfer.py:716
+#: gajim/gtk/filetransfer.py:721
 msgid "It is not possible to send empty files"
 msgstr "Надсилання порожніх файлів не передбачено"
 
-#: gajim/gtk/filetransfer.py:742 gajim/gtk/tooltips.py:571
+#: gajim/gtk/filetransfer.py:747 gajim/gtk/tooltips.py:571
 msgid "Sender: "
 msgstr "Відправник:"
 
-#: gajim/gtk/filetransfer.py:1038
+#: gajim/gtk/filetransfer.py:1043
 #, fuzzy
 msgid "Choose a File to Send…"
 msgstr "Вибрати файл для надсилання..."
 
 #: gajim/gtk/start_chat.py:51
 #, fuzzy
-msgid "Start new Conversation"
+msgid "Start New Conversation"
 msgstr "Спілкування з продовженням"
 
-#: gajim/gtk/start_chat.py:424
-#, fuzzy
-msgid "New Groupchat"
-msgstr "Створити групову балачку"
+#: gajim/gtk/start_chat.py:260 gajim/gtk/start_chat.py:328
+msgid "You can not join a group chat unless you are connected."
+msgstr ""
+"Вам слід з’єднати ваш обліковий запис, щоб взяти участь у груповій балачці."
+
+#: gajim/gtk/start_chat.py:603 gajim/gtk/groupchat_join.py:38
+msgid "Join Group Chat"
+msgstr "Приєднатись до групової балачки"
 
-#: gajim/gtk/start_chat.py:426
+#: gajim/gtk/start_chat.py:605 gajim/gtk/add_contact.py:40
 #, fuzzy
-msgid "New Contact"
-msgstr "Додати новий контакт"
+msgid "Add Contact"
+msgstr "_Додати контакт..."
 
-#: gajim/gtk/start_chat.py:588
+#: gajim/gtk/start_chat.py:746
 #, fuzzy, python-format
-msgid "%s Group chats found"
+msgid "%s group chats found"
 msgstr "%s не знайдено"
 
-#: gajim/gtk/discovery.py:70
+#: gajim/gtk/discovery.py:69
 msgid "This service has not yet responded with detailed information"
 msgstr "Ця служба ще не надала докладних відомостей"
 
-#: gajim/gtk/discovery.py:71
+#: gajim/gtk/discovery.py:70
 #, fuzzy
 msgid ""
 "This service could not respond with detailed information.\n"
@@ -8936,33 +9314,34 @@ msgstr ""
 "Ця служба не може надсилати у відповідь докладні відомості.\n"
 "Причиною є застарілість або пошкодженість служби"
 
-#: gajim/gtk/discovery.py:128
+#: gajim/gtk/discovery.py:126
 msgid "Others"
 msgstr "Інші"
 
-#: gajim/gtk/discovery.py:131
-msgid "Conference"
-msgstr "Конференція"
+#: gajim/gtk/discovery.py:129
+#, fuzzy
+msgid "Group Chat"
+msgstr "Групові балачки"
 
-#: gajim/gtk/discovery.py:519
+#: gajim/gtk/discovery.py:518
 msgid "Without a connection, you can not browse available services"
 msgstr ""
 "Для того, щоб переглядати доступні служби, вам слід встановити з’єднання"
 
-#: gajim/gtk/discovery.py:606
+#: gajim/gtk/discovery.py:605
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Пошук служб за допомогою облікового запису %s"
 
-#: gajim/gtk/discovery.py:608
+#: gajim/gtk/discovery.py:607
 msgid "Service Discovery"
 msgstr "Пошук у службі"
 
-#: gajim/gtk/discovery.py:691
+#: gajim/gtk/discovery.py:690
 msgid "The service could not be found"
 msgstr "Не вдалося знайти службу"
 
-#: gajim/gtk/discovery.py:692
+#: gajim/gtk/discovery.py:691
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -8970,101 +9349,80 @@ msgstr ""
 "За вказаною вами адресою служб не виявлено, або ця адреса не відповідає. "
 "Перевірте, чи правильно вказано адресу, а потім повторіть спробу."
 
-#: gajim/gtk/discovery.py:699 gajim/gtk/discovery.py:1042
+#: gajim/gtk/discovery.py:698 gajim/gtk/discovery.py:1041
 msgid "The service is not browsable"
 msgstr "Служба не придатна для перегляду"
 
-#: gajim/gtk/discovery.py:700
+#: gajim/gtk/discovery.py:699
 msgid "This type of service does not contain any items to browse."
 msgstr "Служби такого типу не містять елементів, які можна було б переглядати."
 
-#: gajim/gtk/discovery.py:738 gajim/gtk/discovery.py:747
+#: gajim/gtk/discovery.py:737 gajim/gtk/discovery.py:746
 msgid "Invalid Server Name"
 msgstr "Некоректна назва сервера"
 
-#: gajim/gtk/discovery.py:806
+#: gajim/gtk/discovery.py:805
 #, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Перегляд %(address)s з використанням облікового запису %(account)s"
 
-#: gajim/gtk/discovery.py:851
+#: gajim/gtk/discovery.py:850
 #, fuzzy
 msgid "Browse"
 msgstr "_Перегляд"
 
-#: gajim/gtk/discovery.py:1043
+#: gajim/gtk/discovery.py:1042
 msgid "This service does not contain any items to browse."
 msgstr "Ця служба не містить жодних елементів, які можна було б переглядати."
 
-#: gajim/gtk/discovery.py:1255
+#: gajim/gtk/discovery.py:1254
 #, fuzzy
 msgid "_Command"
 msgstr "команда"
 
-#: gajim/gtk/discovery.py:1264 gajim/gtk/discovery.py:1422
+#: gajim/gtk/discovery.py:1263 gajim/gtk/discovery.py:1420
 msgid "Re_gister"
 msgstr "За_реєструватися"
 
-#: gajim/gtk/discovery.py:1277
+#: gajim/gtk/discovery.py:1276
 msgid "_Search"
 msgstr "_Пошук"
 
-#: gajim/gtk/discovery.py:1420
+#: gajim/gtk/discovery.py:1418
 msgid "_Edit"
 msgstr "_Правка"
 
-#: gajim/gtk/discovery.py:1458
+#: gajim/gtk/discovery.py:1456
 #, fuzzy, python-format
 msgid "Scanning %(current)d / %(total)d ..."
 msgstr "Пошук %(current)d / %(total)d.."
 
-#: gajim/gtk/discovery.py:1674
+#: gajim/gtk/discovery.py:1655
+msgid "Users"
+msgstr "Користувачі"
+
+#: gajim/gtk/discovery.py:1671
 msgid "Id"
 msgstr "Ідентифікатор"
 
-#: gajim/gtk/discovery.py:1713
-msgid "_Join"
-msgstr "При_єднатися"
-
-#: gajim/gtk/discovery.py:1736
-msgid "Bookmark already set"
-msgstr "Закладку вже встановлено"
-
-#: gajim/gtk/discovery.py:1737
-#, fuzzy, python-format
-msgid "Group Chat '%s' is already in your bookmarks."
-msgstr "Закладка на груповій балачці «%s» вже існує."
-
-#: gajim/gtk/discovery.py:1748
-msgid "Bookmark has been added successfully"
-msgstr "Закладку було успішно додано"
-
-#: gajim/gtk/discovery.py:1749
-#, fuzzy
-msgid ""
-"You can manage your bookmarks by clicking the Bookmarks menu item in your "
-"contact list."
-msgstr ""
-"Керувати вашими закладками можна за допомогою меню дій у вашому реєстрі."
-
-#: gajim/gtk/discovery.py:1950
+#: gajim/gtk/discovery.py:1900
 msgid "Subscribed"
 msgstr "Підписано"
 
-#: gajim/gtk/discovery.py:1959
+#: gajim/gtk/discovery.py:1909
 msgid "Node"
 msgstr "Вузол"
 
-#: gajim/gtk/discovery.py:2028
+#: gajim/gtk/discovery.py:1978
 #, fuzzy
 msgid "_New post"
 msgstr "Нове повідомлення"
 
-#: gajim/gtk/discovery.py:2037
+#: gajim/gtk/discovery.py:1987
 msgid "_Subscribe"
 msgstr "_Підписатися"
 
-#: gajim/gtk/discovery.py:2045
+#: gajim/gtk/discovery.py:1995
 msgid "_Unsubscribe"
 msgstr "_Скасувати підписку"
 
@@ -9107,11 +9465,11 @@ msgid "Form: %s"
 msgstr "Форма %s"
 
 #: gajim/gtk/single_message.py:269
-#, fuzzy, python-format
+#, python-format
 msgid "Characters typed: %s"
-msgstr "Заборонений символ"
+msgstr "Уведені символи: %s"
 
-#: gajim/gtk/single_message.py:274 gajim/gtk/xml_console.py:169
+#: gajim/gtk/single_message.py:274 gajim/gtk/xml_console.py:166
 msgid "Connection not available"
 msgstr "З’єднання недоступне"
 
@@ -9120,6 +9478,12 @@ msgstr "З’єднання недоступне"
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Будь ласка, переконайтеся, що клієнт з’єднано з «%s»."
 
+#: gajim/gtk/single_message.py:306
+#, 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:330
 #, python-format
 msgid "RE: %s"
@@ -9130,28 +9494,30 @@ msgstr "Відповідь: %s"
 msgid "%s wrote:\n"
 msgstr "%s написав(-ла):\n"
 
-#: gajim/gtk/pep_config.py:44
-#, fuzzy, python-format
+#: gajim/gtk/pep_config.py:45
+#, python-format
 msgid "PEP Service Configuration (%s)"
-msgstr "Налаштування служби повідомлення про стан"
+msgstr "Налаштування служби повідомлення про стан (%s)"
 
-#: gajim/gtk/pep_config.py:77
+#: gajim/gtk/pep_config.py:78
 #, fuzzy
 msgid "Service"
 msgstr "Сервер"
 
-#: gajim/gtk/pep_config.py:114
+#: gajim/gtk/pep_config.py:115
 msgid "PEP node was not removed"
 msgstr "Вузол повідомлення про стан було вилучено"
 
-#: gajim/gtk/pep_config.py:115
-#, fuzzy, python-format
+#: gajim/gtk/pep_config.py:116
+#, python-format
 msgid ""
 "PEP node %(node)s was not removed:\n"
 "%(message)s"
-msgstr "Вузол повідомлення про стан %(node)s було вилучено: %(message)s"
+msgstr ""
+"Вузол повідомлення про стан %(node)s було вилучено:\n"
+"%(message)s"
 
-#: gajim/gtk/pep_config.py:146
+#: gajim/gtk/pep_config.py:147
 #, python-format
 msgid "Configure %s"
 msgstr "Налаштувати %s"
@@ -9166,17 +9532,21 @@ msgstr "_Зареєструвати"
 msgid "Registration successful"
 msgstr "Реєстрація вдала"
 
-#: gajim/gtk/dialogs.py:54 gajim/gtk/dataform.py:659 gajim/gtk/adhoc.py:85
+#: gajim/gtk/service_registration.py:215
+msgid "Registration failed"
+msgstr "Спроба з’єднання завершилася невдало"
+
+#: gajim/gtk/dialogs.py:53 gajim/gtk/dataform.py:668 gajim/gtk/adhoc.py:86
 #, fuzzy
 msgid "Cancel"
 msgstr "_Скасувати"
 
-#: gajim/gtk/dialogs.py:129
+#: gajim/gtk/dialogs.py:128
 #, fuzzy, python-format
 msgid "Dictionary for language \"%s\" not available"
 msgstr "Словники для мови %s не доступні"
 
-#: gajim/gtk/dialogs.py:130
+#: gajim/gtk/dialogs.py:129
 #, fuzzy, python-format
 msgid ""
 "You have to install the dictionary \"%s\" to use spellchecking, or choose "
@@ -9189,11 +9559,11 @@ msgstr ""
 "\n"
 "Можливість підсвічування неправильно написаних слів буде поки що вимкнено"
 
-#: gajim/gtk/dialogs.py:410 gajim/gtk/dialogs.py:425
+#: gajim/gtk/dialogs.py:322 gajim/gtk/dialogs.py:337
 msgid "Insecure connection"
 msgstr "Небезпечне з’єднання"
 
-#: gajim/gtk/dialogs.py:411
+#: gajim/gtk/dialogs.py:323
 #, python-format
 msgid ""
 "You are about to connect to the account %(account)s (%(server)s) insecurely. "
@@ -9206,120 +9576,119 @@ msgstr ""
 "незашифрованим. Цей тип з’єднання справді ненадійний. \n"
 "Ви справді бажаєте це зробити?"
 
-#: gajim/gtk/dialogs.py:416
+#: gajim/gtk/dialogs.py:328
 msgid "Yes, I really want to connect insecurely"
 msgstr "Так, я справді бажаю знехтувати безпекою"
 
-#: gajim/gtk/dialogs.py:417
+#: gajim/gtk/dialogs.py:329
 msgid "Gajim will NOT connect unless you check this box"
 msgstr "Gajim НЕ буде з’єднуватись доки ви не відмітите цю опцію"
 
-#: gajim/gtk/dialogs.py:675
-msgid "The nickname contains invalid characters."
-msgstr "У псевдонімі є недозволені символи."
-
-#: gajim/gtk/dialogs.py:734
+#: gajim/gtk/dialogs.py:561
 #, fuzzy, python-format
 msgid "Destroy %s"
 msgstr "Знищення %s"
 
-#: gajim/gtk/dialogs.py:775
+#: gajim/gtk/dialogs.py:602
 #, fuzzy
 msgid "Certificate"
 msgstr "Клієнтський сертифікат"
 
-#: gajim/gtk/dialogs.py:786
-#, fuzzy, python-format
+#: gajim/gtk/dialogs.py:613
+#, python-format
 msgid ""
 "Certificate for account\n"
 "%s"
-msgstr "Сертифікат до облікового запису %s"
+msgstr ""
+"Сертифікат до облікового запису\n"
+"%s"
 
-#: gajim/gtk/dialogs.py:824
+#: gajim/gtk/dialogs.py:651
 msgid "Issued to\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:825 gajim/gtk/dialogs.py:830
+#: gajim/gtk/dialogs.py:652 gajim/gtk/dialogs.py:657
 msgid "Common Name (CN): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:826 gajim/gtk/dialogs.py:831
+#: gajim/gtk/dialogs.py:653 gajim/gtk/dialogs.py:658
 msgid "Organization (O): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:827 gajim/gtk/dialogs.py:832
+#: gajim/gtk/dialogs.py:654 gajim/gtk/dialogs.py:659
 msgid "Organizational Unit (OU): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:828
+#: gajim/gtk/dialogs.py:655
 #, fuzzy
 msgid "Serial Number: "
 msgstr "Номер GG:"
 
-#: gajim/gtk/dialogs.py:829
+#: gajim/gtk/dialogs.py:656
 msgid "Issued by\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:833
+#: gajim/gtk/dialogs.py:660
 msgid "Validity\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:834
+#: gajim/gtk/dialogs.py:661
 msgid "Issued on: "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:835
+#: gajim/gtk/dialogs.py:662
 #, fuzzy
 msgid "Expires on: "
 msgstr "застаріти"
 
-#: gajim/gtk/dialogs.py:836
+#: gajim/gtk/dialogs.py:663
 msgid "SHA-1:"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:838
+#: gajim/gtk/dialogs.py:665
 msgid "SHA-256:"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:852
+#: gajim/gtk/dialogs.py:679
 #, fuzzy
 msgid "View certificate…"
 msgstr "Перегляд сертифікату..."
 
-#: gajim/gtk/dialogs.py:864 gajim/gtk/accounts.py:893
+#: gajim/gtk/dialogs.py:691 gajim/gtk/accounts.py:896
 msgid "Change Password"
 msgstr "Змінити пароль"
 
-#: gajim/gtk/dialogs.py:878
+#: gajim/gtk/dialogs.py:705
 msgid "_OK"
 msgstr "_Гаразд"
 
-#: gajim/gtk/dialogs.py:891
+#: gajim/gtk/dialogs.py:718
 #, fuzzy
 msgid "You must enter a password"
 msgstr "Вам слід ввести пароль."
 
-#: gajim/gtk/dialogs.py:895
+#: gajim/gtk/dialogs.py:722
 msgid "Passwords do not match"
 msgstr "Паролі не збігаються"
 
-#: gajim/gtk/dialogs.py:923
+#: gajim/gtk/dialogs.py:750
 #, fuzzy
 msgid "Group Chat Invitation "
 msgstr "Запрошення до групової балачки"
 
-#: gajim/gtk/dialogs.py:948
-#, fuzzy, python-format
+#: gajim/gtk/dialogs.py:775
+#, python-format
 msgid "<b>%s</b> has invited you to join a discussion"
-msgstr "$Contact запросив вас до участі у обговоренні"
+msgstr "<b>%s</b> запрошує вас до участі в обговоренні"
 
-#: gajim/gtk/dialogs.py:951
-#, fuzzy, python-format
+#: gajim/gtk/dialogs.py:778
+#, 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:959
+#: gajim/gtk/dialogs.py:786
 #, python-format
 msgid "Comment: %s"
 msgstr "Коментар: %s"
@@ -9334,11 +9703,6 @@ msgstr "Номер GG:"
 msgid "ICQ Number"
 msgstr "Номер ICQ:"
 
-#: gajim/gtk/add_contact.py:40
-#, fuzzy
-msgid "Add Contact"
-msgstr "_Додати контакт..."
-
 #: gajim/gtk/add_contact.py:259
 #, fuzzy, python-format
 msgid "%s Missing"
@@ -9359,7 +9723,8 @@ msgid "The user ID must not contain a resource."
 msgstr "У ідентифікаторі користувача не повинно міститися назви ресурсу."
 
 #: gajim/gtk/add_contact.py:299
-msgid "You cannot add yourself to your roster."
+#, fuzzy
+msgid "You cannot add yourself to your contact list."
 msgstr "Ви не можете додавати себе ж до реєстру."
 
 #: gajim/gtk/add_contact.py:304
@@ -9372,11 +9737,13 @@ msgid "Your account must be online to add new contacts."
 msgstr ""
 
 #: gajim/gtk/add_contact.py:321
-msgid "Contact already in roster"
+#, fuzzy
+msgid "Contact Already in Contact List"
 msgstr "Цей контакт вже є у реєстрі"
 
 #: gajim/gtk/add_contact.py:322
-msgid "This contact is already listed in your roster."
+#, fuzzy
+msgid "This contact is already in your contact list."
 msgstr "Цей контакт уже є у вашому реєстрі."
 
 #: gajim/gtk/add_contact.py:379 gajim/gtk/add_contact.py:417
@@ -9415,12 +9782,13 @@ msgid "Chatstate Paused"
 msgstr "Змінити стан"
 
 #: gajim/gtk/themes.py:52
-msgid "MUC Tab New Directed Message"
+#, fuzzy
+msgid "Group Chat Tab New Directed Message"
 msgstr "Спрямовані повідомлення групової балачки"
 
 #: gajim/gtk/themes.py:56
 #, fuzzy
-msgid "MUC Tab New Message"
+msgid "Group Chat Tab New Message"
 msgstr "Нове повідомлення"
 
 #: gajim/gtk/themes.py:60
@@ -9636,13 +10004,13 @@ msgstr "Всі файли"
 msgid "Clear File"
 msgstr "Прибираю"
 
-#: gajim/gtk/settings.py:570
+#: gajim/gtk/settings.py:570 gajim/gtk/proxies.py:32
 #, fuzzy
 msgid "Manage Proxies"
 msgstr "Керування профілями проксі"
 
-#: gajim/gtk/settings.py:591 gajim/gtk/preferences.py:971
-#: gajim/gtk/preferences.py:984 gajim/gtk/preferences.py:988
+#: gajim/gtk/settings.py:591 gajim/gtk/preferences.py:968
+#: gajim/gtk/preferences.py:982 gajim/gtk/preferences.py:986
 #, fuzzy
 msgid "No Proxy"
 msgstr "Прокс_і:"
@@ -9721,14 +10089,15 @@ msgid ""
 "        "
 msgstr ""
 
-#: gajim/gtk/about.py:47 data/org.gajim.Gajim.appdata.xml.in:10
+#: gajim/gtk/about.py:47 data/org.gajim.Gajim.desktop.in:6
+#: data/org.gajim.Gajim.appdata.xml.in:10
 #, fuzzy
-msgid "A GTK+ XMPP client"
+msgid "A GTK XMPP client"
 msgstr "Jabber/XMPP клієнт, що базується на GTK+"
 
 #: gajim/gtk/about.py:48
-#, python-format
-msgid "GTK+ Version: %s"
+#, fuzzy, python-format
+msgid "GTK Version: %s"
 msgstr "Версія GTK+: %s"
 
 #: gajim/gtk/about.py:49
@@ -9845,9 +10214,8 @@ msgid "Disconnected"
 msgstr "Роз'єднано"
 
 #: gajim/gtk/tooltips.py:567
-#, fuzzy
 msgid "File Name: "
-msgstr "Назва файла: %s"
+msgstr "Назва файлу:"
 
 #: gajim/gtk/tooltips.py:570
 #, fuzzy
@@ -9907,6 +10275,25 @@ msgstr "Призупинено"
 msgid "?transfer status:Not started"
 msgstr "Призупинено"
 
+#: gajim/gtk/groupchat_creation.py:97 gajim/gtk/groupchat_creation.py:99
+msgid " (optional)..."
+msgstr ""
+
+#: gajim/gtk/groupchat_creation.py:134
+#, fuzzy
+msgid "Invalid Address"
+msgstr "Некоректний файл"
+
+#: gajim/gtk/groupchat_creation.py:182
+#, fuzzy
+msgid "Not Connected"
+msgstr "З'єднано"
+
+#: gajim/gtk/groupchat_creation.py:183
+#, fuzzy
+msgid "You have to be connected to create a group chat."
+msgstr "Ви не приєдналися до групової балачки."
+
 #: gajim/gtk/sounds.py:39
 msgid "Wav Sounds"
 msgstr "Звуки wav"
@@ -9947,48 +10334,44 @@ msgstr "Виділення повідомлення групової балач�
 msgid "Group Chat Message Received"
 msgstr "Отримано повідомлення групової балачки"
 
-#: gajim/gtk/dataform.py:226 gajim/gtk/dataform.py:262
+#: gajim/gtk/dataform.py:232 gajim/gtk/dataform.py:268
 #, fuzzy
 msgid "Required"
 msgstr "вимагати"
 
-#: gajim/gtk/dataform.py:286
+#: gajim/gtk/dataform.py:293
 msgid "Yes"
 msgstr "Так"
 
-#: gajim/gtk/dataform.py:286
+#: gajim/gtk/dataform.py:293
 msgid "No"
 msgstr "Ні"
 
-#: gajim/gtk/dataform.py:661
+#: gajim/gtk/dataform.py:670
 msgid "Submit"
 msgstr ""
 
-#: gajim/gtk/statusicon.py:213
+#: gajim/gtk/statusicon.py:206
 #, fuzzy
 msgid "_Change Status Message…"
 msgstr "_Змінити повідомлення про стан"
 
-#: gajim/gtk/statusicon.py:247 gajim/gtk/statusicon.py:292
-#: gajim/gtk/statusicon.py:299
+#: gajim/gtk/statusicon.py:258
 #, python-format
 msgid "using account %s"
 msgstr "з облікового запису %s"
 
-#: gajim/gtk/statusicon.py:309
+#: gajim/gtk/statusicon.py:269
 #, fuzzy
-msgid "_Manage Bookmarks…"
-msgstr "Керування закладками"
-
-#: gajim/gtk/statusicon.py:325
-msgid "Hide _Roster"
-msgstr "Сховати реєстр"
+msgid "Hide _Contact List"
+msgstr "Запросити _контакти"
 
-#: gajim/gtk/statusicon.py:329
-msgid "Show _Roster"
-msgstr "Показати _реєстр"
+#: gajim/gtk/statusicon.py:273
+#, fuzzy
+msgid "Show _Contact List"
+msgstr "Показувати лише _активні контакти"
 
-#: gajim/gtk/statusicon.py:337
+#: gajim/gtk/statusicon.py:281
 msgid "Hide this menu"
 msgstr "Сховати це меню"
 
@@ -10035,35 +10418,6 @@ msgid ""
 msgstr ""
 "Під час спроби оприлюднення ваших особистих відомостей, спробуйте пізніше."
 
-#: gajim/gtk/join_groupchat.py:202
-#, fuzzy
-msgid "Invalid Room"
-msgstr "Некоректна кімната"
-
-#: gajim/gtk/join_groupchat.py:203
-msgid "Please choose a room"
-msgstr ""
-
-#: gajim/gtk/join_groupchat.py:222 gajim/gtk/join_groupchat.py:229
-msgid "Invalid Nickname"
-msgstr "Некоректний псевдонім"
-
-#: gajim/gtk/join_groupchat.py:223
-#, fuzzy
-msgid "Please choose a nickname"
-msgstr "Будь ласка, спершу створіть нову порожню тему з бажаною назвою."
-
-#: gajim/gtk/join_groupchat.py:282 gajim/gtk/join_groupchat.py:288
-#: gajim/gtk/join_groupchat.py:293
-msgid "Wrong server"
-msgstr "Неправильний сервер"
-
-#: gajim/gtk/join_groupchat.py:283 gajim/gtk/join_groupchat.py:289
-#: gajim/gtk/join_groupchat.py:294
-#, python-format
-msgid "%s is not a groupchat server"
-msgstr "%s не є сервером групових балачок"
-
 #: gajim/gtk/mam_preferences.py:38
 #, python-format
 msgid "Archiving Preferences for %s"
@@ -10093,45 +10447,53 @@ msgstr "Отримано помилку: {}"
 msgid "Archiving Preferences Error"
 msgstr "Налаштування архівації"
 
-#: gajim/gtk/advanced_config.py:81
+#: gajim/gtk/advanced_config.py:95
 msgid "Activated"
 msgstr "Увімкнено"
 
-#: gajim/gtk/advanced_config.py:81
+#: gajim/gtk/advanced_config.py:95
 msgid "Deactivated"
 msgstr "Вимкнено"
 
-#: gajim/gtk/advanced_config.py:83
-msgid "Boolean"
-msgstr "Булеве"
+#: gajim/gtk/advanced_config.py:97
+msgid "?config type:Boolean"
+msgstr ""
 
-#: gajim/gtk/advanced_config.py:84
-msgid "Integer"
-msgstr "Ціле число"
+#: gajim/gtk/advanced_config.py:98
+msgid "?config type:Integer"
+msgstr ""
 
-#: gajim/gtk/advanced_config.py:85
-msgid "Text"
-msgstr "Текст"
+#: gajim/gtk/advanced_config.py:99
+msgid "?config type:Text"
+msgstr ""
 
-#: gajim/gtk/advanced_config.py:97
-msgid "Preference Name"
+#: gajim/gtk/advanced_config.py:100
+msgid "?config type:Color"
+msgstr ""
+
+#: gajim/gtk/advanced_config.py:112
+#, fuzzy
+msgid "?config:Preference Name"
 msgstr "Назва параметра"
 
-#: gajim/gtk/advanced_config.py:104
-msgid "Value"
-msgstr "Значення"
+#: gajim/gtk/advanced_config.py:123
+#, fuzzy
+msgid "?config:Value"
+msgstr "Налаштувати"
 
-#: gajim/gtk/advanced_config.py:113
-msgid "Type"
-msgstr "Тип"
+#: gajim/gtk/advanced_config.py:132
+msgid "?config:Type"
+msgstr ""
 
-#: gajim/gtk/advanced_config.py:168
-msgid "(None)"
-msgstr "(Немає)"
+#: gajim/gtk/advanced_config.py:187
+#, fuzzy
+msgid "?config description:None"
+msgstr "?Запит (на підписку):Немає"
 
-#: gajim/gtk/advanced_config.py:299
-msgid "Hidden"
-msgstr "Сховано"
+#: gajim/gtk/advanced_config.py:322
+#, fuzzy
+msgid "?password:Hidden"
+msgstr "Пароль:"
 
 #: gajim/gtk/server_info.py:66
 #, fuzzy
@@ -10143,8 +10505,8 @@ msgstr "_Копіювати посилання"
 msgid "%(days)s days, %(hours)s hours"
 msgstr ""
 
-#: gajim/gtk/server_info.py:218 gajim/gtk/accounts.py:749
-#: gajim/gtk/accounts.py:853
+#: gajim/gtk/server_info.py:218 gajim/gtk/accounts.py:752
+#: gajim/gtk/accounts.py:856
 #, fuzzy
 msgid "Hostname"
 msgstr "Назва _вузла:"
@@ -10337,11 +10699,6 @@ msgstr "Некоректна назва списку"
 msgid "You must enter a name to create a privacy list."
 msgstr "Для створення списку конфіденційності вам слід ввести його назву."
 
-#: gajim/gtk/groupchat_config.py:41
-#, fuzzy
-msgid "Group Chat Configuration"
-msgstr "Запрошення до групової балачки"
-
 #: gajim/gtk/groupchat_config.py:134
 #, fuzzy
 msgid "A Group Chat needs at least one Owner"
@@ -10352,69 +10709,69 @@ msgid "You are not allowed to modify the affiliation of Admins and Owners"
 msgstr ""
 
 #: gajim/gtk/groupchat_config.py:399
-msgid "An entry with this Jabber-ID already exists"
+msgid "An entry with this XMPP Address already exists"
 msgstr ""
 
-#: gajim/gtk/adhoc.py:91
+#: gajim/gtk/adhoc.py:92
 #, fuzzy
 msgid "Finish"
 msgstr "_Завершити"
 
-#: gajim/gtk/adhoc.py:97 gajim/gtk/adhoc.py:283
+#: gajim/gtk/adhoc.py:98 gajim/gtk/adhoc.py:284
 #, fuzzy
 msgid "Commands"
 msgstr "команда"
 
-#: gajim/gtk/adhoc.py:103
+#: gajim/gtk/adhoc.py:104
 msgid "Next"
 msgstr ""
 
-#: gajim/gtk/adhoc.py:109
+#: gajim/gtk/adhoc.py:110
 #, fuzzy
 msgid "Previous"
 msgstr "Сповнений заздрощів"
 
-#: gajim/gtk/adhoc.py:115
+#: gajim/gtk/adhoc.py:116
 #, fuzzy
 msgid "Execute"
 msgstr "Ви_конати команду"
 
-#: gajim/gtk/adhoc.py:195
+#: gajim/gtk/adhoc.py:196
 #, fuzzy
 msgid "No commands available"
 msgstr "Немає жодного облікового запису"
 
-#: gajim/gtk/adhoc.py:244
+#: gajim/gtk/adhoc.py:245
 #, fuzzy
 msgid "Request Command List"
 msgstr "Ви_конати команду"
 
-#: gajim/gtk/adhoc.py:259
+#: gajim/gtk/adhoc.py:260
 #, fuzzy
 msgid "Executing…"
 msgstr "Ви_конати команду"
 
-#: gajim/gtk/adhoc.py:266
+#: gajim/gtk/adhoc.py:267
 #, fuzzy
 msgid "Command List"
 msgstr "Список заборон"
 
-#: gajim/gtk/adhoc.py:384
+#: gajim/gtk/adhoc.py:385
 #, fuzzy
 msgid "Finished"
 msgstr "_Завершити"
 
-#: gajim/gtk/adhoc.py:453
+#: gajim/gtk/adhoc.py:454
 #, fuzzy
 msgid "Execution failed"
 msgstr "Спроба з’єднання завершилася невдало"
 
-#: gajim/gtk/blocking.py:37
+#: gajim/gtk/blocking.py:38
 #, fuzzy, python-format
 msgid "Blocking List for %s"
 msgstr "Списки приватності для %s"
 
-#: gajim/gtk/blocking.py:71
+#: gajim/gtk/blocking.py:72
 #, fuzzy
 msgid "Error!"
 msgstr "Помилка."
@@ -10464,8 +10821,7 @@ msgid "You must provide a username to configure this account."
 msgstr ""
 "Щоб налаштувати цей обліковий запис, вам слід вказати ім’я користувача."
 
-#: gajim/gtk/account_wizard.py:252 gajim/gtk/bookmarks.py:290
-#: gajim/gtk/bookmarks.py:303
+#: gajim/gtk/account_wizard.py:252
 msgid "Invalid server"
 msgstr "Некоректний сервер"
 
@@ -10482,7 +10838,7 @@ msgstr "Некоректний запис"
 msgid "Custom port must be a port number."
 msgstr "Нетиповий порти слід вказувати у вигляді номера."
 
-#: gajim/gtk/account_wizard.py:405
+#: gajim/gtk/account_wizard.py:406
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -10497,15 +10853,15 @@ msgstr ""
 "Помилка SSL: %(error)s\n"
 "Ви все ще бажаєте з’єднатися з цим сервером?"
 
-#: gajim/gtk/account_wizard.py:446 gajim/gtk/account_wizard.py:480
+#: gajim/gtk/account_wizard.py:447 gajim/gtk/account_wizard.py:481
 msgid "An error occurred during account creation"
 msgstr "Під час спроби створення облікового запису сталася помилка"
 
-#: gajim/gtk/account_wizard.py:545
+#: gajim/gtk/account_wizard.py:546
 msgid "Account name is in use"
 msgstr "Цю назву облікового запису вже використано"
 
-#: gajim/gtk/account_wizard.py:546
+#: gajim/gtk/account_wizard.py:547
 msgid "You already have an account using this name."
 msgstr "У вас вже є обліковий запис з такою назвою."
 
@@ -10523,34 +10879,34 @@ msgid "Encrypting file…"
 msgstr "Шифрування E2E вимкнено"
 
 #: gajim/gtk/http_upload_progress.py:111
-#, fuzzy, python-format
+#, python-format
 msgid "%(progress)s of %(total)s"
-msgstr "%(received)s з %(max)s"
+msgstr "%(progress)s з %(total)s"
 
 #: gajim/gtk/http_upload_progress.py:127
 #, python-format
 msgid "%(minutes)s min %(seconds)s sec"
 msgstr ""
 
-#: gajim/gtk/xml_console.py:77
+#: gajim/gtk/xml_console.py:74
 #, fuzzy
 msgid "Filter"
 msgstr "Фільтр:"
 
-#: gajim/gtk/xml_console.py:82
+#: gajim/gtk/xml_console.py:79
 msgid "XML Input"
 msgstr "Ввід XML"
 
-#: gajim/gtk/xml_console.py:86
+#: gajim/gtk/xml_console.py:83
 msgid "Paste Last Input"
 msgstr ""
 
-#: gajim/gtk/xml_console.py:170
+#: gajim/gtk/xml_console.py:167
 #, fuzzy, python-format
 msgid "Please make sure you are connected with '%s'."
 msgstr "Будь ласка, переконайтеся, що клієнт з’єднано з «%s»."
 
-#: gajim/gtk/xml_console.py:182
+#: gajim/gtk/xml_console.py:177
 #, fuzzy
 msgid "Invalid Node"
 msgstr "Некоректний файл"
@@ -10583,73 +10939,86 @@ msgstr "Пошук"
 msgid "No results found"
 msgstr "Результату немає"
 
-#: gajim/gtk/preferences.py:358 gajim/gtk/preferences.py:362
+#: gajim/gtk/preferences.py:357 gajim/gtk/preferences.py:361
 msgid "Default"
 msgstr "Типовий"
 
-#: gajim/gtk/preferences.py:801
+#: gajim/gtk/preferences.py:798
 msgid "status message title"
 msgstr "заголовок повідомлення про стан"
 
-#: gajim/gtk/preferences.py:802
+#: gajim/gtk/preferences.py:799
 msgid "status message text"
 msgstr "текст повідомлення про стан"
 
+#: gajim/gtk/accounts.py:137
+#, fuzzy
+msgid "Re-Login"
+msgstr "Повторно увійти зараз?"
+
 #: gajim/gtk/accounts.py:138
-msgid "Relogin now?"
+#, fuzzy
+msgid "Re-Login now?"
 msgstr "Повторно увійти зараз?"
 
 #: gajim/gtk/accounts.py:139
-msgid "If you want all the changes to apply instantly, you must relogin."
+#, fuzzy
+msgid "To apply all changes instantly, you have to re-login."
 msgstr ""
 "Якщо ви бажаєте, щоб всі зміни негайно набули чинності, вам слід вийти з "
 "облікового запису, а потім знову туди увійти."
 
-#: gajim/gtk/accounts.py:191 gajim/gtk/accounts.py:975
-#, fuzzy
+#: gajim/gtk/accounts.py:141
+msgid "_Later"
+msgstr ""
+
+#: gajim/gtk/accounts.py:143
+msgid "_Re-Login"
+msgstr ""
+
+#: gajim/gtk/accounts.py:194 gajim/gtk/accounts.py:978
 msgid "Remove Account"
-msgstr "Вилучення облікового запису %s"
+msgstr "Вилучення облікового запису"
 
-#: gajim/gtk/accounts.py:192
+#: gajim/gtk/accounts.py:195
 #, fuzzy, python-format
 msgid "You still have open chats in your account %s"
 msgstr "Ви розпочали балачку за допомогою облікового запису %s"
 
-#: gajim/gtk/accounts.py:193
-#, fuzzy
+#: gajim/gtk/accounts.py:196
 msgid ""
 "All chat and group chat windows will be closed.\n"
 "Do you want to continue?"
 msgstr ""
-"Всі вікна балачок і групових балачок буде закрито. Бажаєте продовжити "
-"процедуру виходу?"
+"Всі вікна балачок і групових балачок буде закрито.\n"
+"Бажаєте продовжити процедуру виходу?"
 
-#: gajim/gtk/accounts.py:424
+#: gajim/gtk/accounts.py:427
 #, fuzzy
 msgid "Back"
 msgstr "Скоро повернуся"
 
-#: gajim/gtk/accounts.py:530
+#: gajim/gtk/accounts.py:533
 #, fuzzy
 msgid "Please check if Bonjour is installed."
 msgstr "Будь ласка, переконайтеся, що встановлено Avahi або Bonjour."
 
-#: gajim/gtk/accounts.py:532
+#: gajim/gtk/accounts.py:535
 #, fuzzy
 msgid "Please check if Avahi is installed."
 msgstr "Будь ласка, переконайтеся, що встановлено Avahi або Bonjour."
 
-#: gajim/gtk/accounts.py:569
+#: gajim/gtk/accounts.py:572
 #, fuzzy
 msgid "Disable Account"
 msgstr "Некоректний обліковий запис"
 
-#: gajim/gtk/accounts.py:570
+#: gajim/gtk/accounts.py:573
 #, fuzzy, python-format
 msgid "Account %s is still connected"
 msgstr "Обліковий запис «%s» з’єднано з сервером"
 
-#: gajim/gtk/accounts.py:571
+#: gajim/gtk/accounts.py:574
 #, fuzzy
 msgid ""
 "All chat and group chat windows will be closed. Do you want to continue?"
@@ -10657,86 +11026,86 @@ msgstr ""
 "Всі вікна балачок і групових балачок буде закрито. Бажаєте продовжити "
 "процедуру виходу?"
 
-#: gajim/gtk/accounts.py:576
+#: gajim/gtk/accounts.py:579
 #, fuzzy
 msgid "_Disable Account"
 msgstr "Некоректний обліковий запис"
 
-#: gajim/gtk/accounts.py:595
+#: gajim/gtk/accounts.py:598
 #, fuzzy
 msgid "Add Account"
 msgstr "_Додати контакт..."
 
-#: gajim/gtk/accounts.py:663
+#: gajim/gtk/accounts.py:666
 #, fuzzy
 msgid "Label"
 msgstr "мітка"
 
-#: gajim/gtk/accounts.py:667
+#: gajim/gtk/accounts.py:670
 msgid "Login"
 msgstr ""
 
-#: gajim/gtk/accounts.py:670
+#: gajim/gtk/accounts.py:673
 #, fuzzy
 msgid "Import Contacts"
 msgstr "Запросити _контакти"
 
-#: gajim/gtk/accounts.py:674 gajim/gtk/accounts.py:870
+#: gajim/gtk/accounts.py:677 gajim/gtk/accounts.py:873
 #, fuzzy
 msgid "Client Certificate"
 msgstr "Клієнтський сертифікат"
 
-#: gajim/gtk/accounts.py:677 gajim/gtk/accounts.py:774
+#: gajim/gtk/accounts.py:680 gajim/gtk/accounts.py:777
 #, fuzzy
 msgid "Connect on startup"
 msgstr "_З'єднуватись після запуску Gajim"
 
-#: gajim/gtk/accounts.py:681 gajim/gtk/accounts.py:779
+#: gajim/gtk/accounts.py:684 gajim/gtk/accounts.py:782
 #, fuzzy
 msgid "Save conversations for all contacts"
 msgstr "Зберігати _журнал спілкування для усіх контактів"
 
-#: gajim/gtk/accounts.py:683 gajim/gtk/accounts.py:781
+#: gajim/gtk/accounts.py:686 gajim/gtk/accounts.py:784
 msgid "Store conversations on the harddrive"
 msgstr ""
 
-#: gajim/gtk/accounts.py:685 gajim/gtk/accounts.py:783
+#: gajim/gtk/accounts.py:688 gajim/gtk/accounts.py:786
 #, fuzzy
 msgid "Global Status"
 msgstr "Усі стани"
 
-#: gajim/gtk/accounts.py:687
+#: gajim/gtk/accounts.py:690
 #, fuzzy
 msgid "Synchronise the status of all accounts"
 msgstr "Змінює стан облікового запису або обліковий запис"
 
-#: gajim/gtk/accounts.py:689
+#: gajim/gtk/accounts.py:692
 msgid "Use file transfer proxies"
 msgstr "Використовувати проксі передавання файлів"
 
-#: gajim/gtk/accounts.py:705
+#: gajim/gtk/accounts.py:708
 #, fuzzy
 msgid "Idle Time"
 msgstr "Відсутній з:"
 
-#: gajim/gtk/accounts.py:707
+#: gajim/gtk/accounts.py:710
 msgid "Disclose the time of your last activity"
 msgstr ""
 
-#: gajim/gtk/accounts.py:709
+#: gajim/gtk/accounts.py:712
 msgid "Local System Time"
 msgstr ""
 
-#: gajim/gtk/accounts.py:711
+#: gajim/gtk/accounts.py:714
 msgid "Disclose the local system time of the device Gajim runs on"
 msgstr ""
 
-#: gajim/gtk/accounts.py:714
+#: gajim/gtk/accounts.py:717
 #, fuzzy
 msgid "Client / Operating System"
 msgstr "Клієнтський сертифікат"
 
-#: gajim/gtk/accounts.py:716
+#: gajim/gtk/accounts.py:719
 #, fuzzy
 msgid ""
 "Disclose informations about the client and operating system you currently use"
@@ -10744,176 +11113,173 @@ msgstr ""
 "Дозволити Gajim надсилати інформацію, яку операційну систему ви "
 "використовуєте"
 
-#: gajim/gtk/accounts.py:719
+#: gajim/gtk/accounts.py:722
 #, fuzzy
 msgid "Ignore Unknown Contacts"
 msgstr "Запросити _контакти"
 
-#: gajim/gtk/accounts.py:721
+#: gajim/gtk/accounts.py:724
 #, fuzzy
 msgid "Ignore everything from contacts not in your Roster"
 msgstr "_Ігнорувати події від контактів поза реєстром"
 
-#: gajim/gtk/accounts.py:737 gajim/gtk/accounts.py:776
+#: gajim/gtk/accounts.py:740 gajim/gtk/accounts.py:779
 #, fuzzy
 msgid "Use environment variable"
 msgstr "використовувати змінну середовища HTTP_PROXY"
 
-#: gajim/gtk/accounts.py:739
-#, fuzzy
-msgid "Proxy"
-msgstr "Прокс_і:"
-
-#: gajim/gtk/accounts.py:742
+#: gajim/gtk/accounts.py:745
 #, fuzzy
 msgid "Warn on insecure connection"
 msgstr "_Попереджати перед використанням незахищеного з’єднання"
 
-#: gajim/gtk/accounts.py:746
+#: gajim/gtk/accounts.py:749
 #, fuzzy
 msgid "Send keep-alive packets"
 msgstr "Надсилати пакети підтвердження дієздатності"
 
-#: gajim/gtk/accounts.py:750
+#: gajim/gtk/accounts.py:753
 msgid "Manually set the hostname for the server"
 msgstr ""
 
-#: gajim/gtk/accounts.py:756 gajim/gtk/accounts.py:826
-#: gajim/gtk/accounts.py:831
+#: gajim/gtk/accounts.py:759 gajim/gtk/accounts.py:829
+#: gajim/gtk/accounts.py:834
 #, fuzzy
 msgid "Priority"
 msgstr "Пріорите_т:"
 
-#: gajim/gtk/accounts.py:785
+#: gajim/gtk/accounts.py:788
 #, fuzzy
 msgid "Synchronize the status of all accounts"
 msgstr "Змінює стан облікового запису або обліковий запис"
 
-#: gajim/gtk/accounts.py:795
+#: gajim/gtk/accounts.py:798
 #, fuzzy
 msgid "First Name"
 msgstr "Ім'я:"
 
-#: gajim/gtk/accounts.py:798
+#: gajim/gtk/accounts.py:801
 #, fuzzy
 msgid "Last Name"
 msgstr "Прізвище:"
 
-#: gajim/gtk/accounts.py:804
+#: gajim/gtk/accounts.py:807
 #, fuzzy
 msgid "Email"
 msgstr "Нове повідомлення електронної пошти"
 
-#: gajim/gtk/accounts.py:822
+#: gajim/gtk/accounts.py:825
 #, fuzzy
 msgid "Adjust to status"
 msgstr "_Узгодити зі станом"
 
-#: gajim/gtk/accounts.py:849
+#: gajim/gtk/accounts.py:852
 #, fuzzy
 msgid "Enable"
 msgstr "Увімкнено"
 
-#: gajim/gtk/accounts.py:857
+#: gajim/gtk/accounts.py:860
 #, fuzzy
 msgid "Port"
 msgstr "_Порт:"
 
-#: gajim/gtk/accounts.py:862
+#: gajim/gtk/accounts.py:865
 #, fuzzy
 msgid "Connection Settings"
 msgstr "З'єднання"
 
-#: gajim/gtk/accounts.py:872
+#: gajim/gtk/accounts.py:875
 msgid "PKCS12 Files"
 msgstr "Файли PKCS12"
 
-#: gajim/gtk/accounts.py:874
+#: gajim/gtk/accounts.py:877
 #, fuzzy
 msgid "Encrypted Certificate"
 msgstr "Cертифікат"
 
-#: gajim/gtk/accounts.py:878
+#: gajim/gtk/accounts.py:881
 #, fuzzy
 msgid "Certificate Settings"
 msgstr "Cертифікат"
 
-#: gajim/gtk/accounts.py:890
+#: gajim/gtk/accounts.py:893
 #, fuzzy
 msgid "Save Password"
 msgstr "Зберегти пароль"
 
-#: gajim/gtk/accounts.py:898
+#: gajim/gtk/accounts.py:901
 #, fuzzy
 msgid "Login Settings"
 msgstr "Додатки"
 
-#: gajim/gtk/accounts.py:931
+#: gajim/gtk/accounts.py:934
 #, fuzzy, python-format
 msgid "Removing account %s"
 msgstr "Вилучення облікового запису %s"
 
-#: gajim/gtk/accounts.py:946
+#: gajim/gtk/accounts.py:949
 msgid "Account is disabled"
 msgstr "Обліковий запис вимкнено"
 
-#: gajim/gtk/accounts.py:947
+#: gajim/gtk/accounts.py:950
 #, fuzzy
 msgid "To unregister from a server, the account must be enabled."
 msgstr "Щоб зняти реєстрацію з серверу, обліковий запис має бути активним."
 
-#: gajim/gtk/accounts.py:962
+#: gajim/gtk/accounts.py:965
 #, fuzzy
 msgid "Password required"
 msgstr "Слід ввести пароль"
 
-#: gajim/gtk/accounts.py:976
+#: gajim/gtk/accounts.py:979
 #, fuzzy, python-format
 msgid "Account '%s' is still connected to the server"
 msgstr "Обліковий запис «%s» з’єднано з сервером"
 
-#: gajim/gtk/accounts.py:978
+#: gajim/gtk/accounts.py:981
 msgid "If you remove it, the connection will be lost."
 msgstr "Якщо ви вилучите його, з’єднання буде розірвано."
 
-#: gajim/gtk/accounts.py:995
+#: gajim/gtk/accounts.py:998
 #, python-format
 msgid "Connection to server %s failed"
 msgstr "Спроба встановити з'єднання з сервером %s завершилася невдало"
 
-#: gajim/gtk/accounts.py:996
+#: gajim/gtk/accounts.py:999
 msgid "What would you like to do?"
 msgstr "Що ви хочете зробити?"
 
-#: gajim/gtk/accounts.py:997
+#: gajim/gtk/accounts.py:1000
 msgid "Remove only from Gajim"
 msgstr "Вилучити _лише з Gajim"
 
-#: gajim/gtk/accounts.py:998
+#: gajim/gtk/accounts.py:1001
 msgid "Don't remove anything. I'll try again later"
 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> кілька контактів у вашому реєстрі."
+msgstr "<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> кілька контактів у вашому реєстрі."
+msgstr "<b>%s</b> бажає вилучити кілька контактів із вашого реєстру."
 
 #: gajim/gtk/roster_item_exchange.py:73 gajim/gtk/roster_item_exchange.py:161
 msgid "Modify"
 msgstr "Змінити"
 
+#: gajim/gtk/roster_item_exchange.py:80
+msgid "JID"
+msgstr "JID"
+
 #: gajim/gtk/roster_item_exchange.py:86
 msgid "Groups"
 msgstr "Групи"
@@ -10939,19 +11305,19 @@ msgstr[0] "Вилучено %d контакт"
 msgstr[1] "Вилучено %d контакти"
 msgstr[2] "Вилучено %d контактів"
 
-#: gajim/gtk/util.py:581
+#: gajim/gtk/util.py:583
 msgid "Unknown Artist"
 msgstr "Невідомий виконавець"
 
-#: gajim/gtk/util.py:582
+#: gajim/gtk/util.py:584
 msgid "Unknown Title"
 msgstr "Невідома назва"
 
-#: gajim/gtk/util.py:583
+#: gajim/gtk/util.py:585
 msgid "Unknown Source"
 msgstr "Невідоме джерело"
 
-#: gajim/gtk/util.py:585
+#: gajim/gtk/util.py:587
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
@@ -10960,27 +11326,10 @@ msgstr ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
 "з <i>%(source)s</i>"
 
-#: gajim/gtk/bookmarks.py:121
-msgid "New Group Chat"
-msgstr "Створити групову балачку"
-
-#: gajim/gtk/bookmarks.py:161
-msgid "This bookmark has invalid data"
-msgstr "У цій закладці містяться некоректні дані"
-
-#: gajim/gtk/bookmarks.py:162
-msgid ""
-"Please be sure to fill out server and room fields or remove this bookmark."
-msgstr "Будь ласка, заповніть поля сервера і кімнати або вилучіть цю закладку."
-
-#: gajim/gtk/bookmarks.py:273 gajim/gtk/bookmarks.py:291
-#: gajim/gtk/bookmarks.py:304 gajim/gtk/bookmarks.py:335
-msgid "Character not allowed"
-msgstr "Заборонений символ"
-
-#: gajim/gtk/bookmarks.py:334
-msgid "Invalid room"
-msgstr "Некоректна кімната"
+#: gajim/gtk/bookmarks.py:47
+#, fuzzy, python-format
+msgid "Bookmarks for %s"
+msgstr "_Закладка"
 
 #: gajim/plugins/pluginmanager.py:736 gajim/plugins/pluginmanager.py:742
 msgid "Archive corrupted"
@@ -10991,48 +11340,51 @@ msgid "Archive empty"
 msgstr "Архів порожній "
 
 #: gajim/plugins/pluginmanager.py:750 gajim/plugins/pluginmanager.py:758
-#: gajim/plugins/gui.py:257
+#: gajim/plugins/gui.py:258
 msgid "Archive is malformed"
 msgstr "Архів пошкоджений"
 
-#: gajim/plugins/pluginmanager.py:766 gajim/plugins/gui.py:281
-#: gajim/plugins/gui.py:289
+#: gajim/plugins/pluginmanager.py:766 gajim/plugins/gui.py:288
+#: gajim/plugins/gui.py:301
 msgid "Plugin already exists"
 msgstr "Додаток вже встановлено"
 
-#: gajim/plugins/gui.py:82
+#: gajim/plugins/gui.py:83
 msgid "Click to view Gajim's wiki page on how to install plugins in Flatpak."
 msgstr ""
 
-#: gajim/plugins/gui.py:89
+#: gajim/plugins/gui.py:90
 msgid "Plugin"
 msgstr "Додатки"
 
-#: gajim/plugins/gui.py:151
+#: gajim/plugins/gui.py:152
 #, python-format
 msgid "Warning: %s"
 msgstr "Попередження: %s"
 
-#: gajim/plugins/gui.py:206
+#: gajim/plugins/gui.py:207
 msgid "Plugin failed"
 msgstr "Активація додатка невдалаДодаток"
 
-#: gajim/plugins/gui.py:245
+#: gajim/plugins/gui.py:246
 msgid "Unable to properly remove the plugin"
 msgstr "Не вдається коректно вилучити додаток лм"
 
-#: gajim/plugins/gui.py:281
-msgid "Overwrite?"
+#: gajim/plugins/gui.py:287
+#, fuzzy
+msgid "Overwrite Plugin?"
 msgstr "Перезаписати?"
 
+#: gajim/plugins/gui.py:289
+#, fuzzy
+msgid "Do you want to overwrite the currently installed version?"
+msgstr "Чи бажаєте ви прийняти це запрошення?"
+
 #: data/org.gajim.Gajim.desktop.in:5
-msgid "Jabber IM Client"
+#, fuzzy
+msgid "XMPP IM Client"
 msgstr "Клієнт служби миттєвих повідомлень Jabber"
 
-#: data/org.gajim.Gajim.desktop.in:6
-msgid "A GTK+ Jabber client"
-msgstr "Jabber клієнт, що базується на GTK+"
-
 #: data/org.gajim.Gajim.desktop.in:8
 #, fuzzy
 msgid "chat;messaging;im;xmpp;bonjour;voip;"
@@ -11085,7 +11437,7 @@ msgid "Easily send pictures, videos or other files to friends and groups"
 msgstr ""
 
 #: data/org.gajim.Gajim.appdata.xml.in:27
-msgid "Chat securely with End-to-End encryption via OMEMO or PGP"
+msgid "Chat securely with End-to-End encryption via OMEMO or OpenPGP"
 msgstr ""
 
 #: data/org.gajim.Gajim.appdata.xml.in:28
@@ -11146,7 +11498,7 @@ msgstr ""
 
 #: data/org.gajim.Gajim.appdata.xml.in:52
 #, fuzzy
-msgid "Roster, list of contacts"
+msgid "Contact list, list of contacts"
 msgstr "_Записувати зміни стану контактів"
 
 #: data/org.gajim.Gajim.appdata.xml.in:56
@@ -11168,6 +11520,538 @@ msgstr "Нещодавно:"
 msgid "Plugin manager"
 msgstr "Активація додатка невдалаДодаток"
 
+#, fuzzy
+#~ msgid "Configure Services…"
+#~ msgstr "Налаштувати служби..."
+
+#, fuzzy
+#~ msgid "Group Chat Bookmarks"
+#~ msgstr "_Групова балачка"
+
+#, fuzzy
+#~ msgid "Add Bookmark"
+#~ msgstr "_Закладка"
+
+#, fuzzy
+#~ msgid "Remove Bookmark"
+#~ msgstr "_Закладка"
+
+#, fuzzy
+#~ msgid "Bookmark Name"
+#~ msgstr "Зробити закладку на цій кімнаті"
+
+#, fuzzy
+#~ msgid "_Server"
+#~ msgstr "_Сервер:"
+
+#, fuzzy
+#~ msgid "Roo_m"
+#~ msgstr "Кімната:"
+
+#, fuzzy
+#~ msgid "_Password"
+#~ msgstr "_Password:"
+
+#, fuzzy
+#~ msgid "Join chat when connected"
+#~ msgstr "Контакт від'єднано"
+
+#~ msgid "New Group Chat"
+#~ msgstr "Створити групову балачку"
+
+#~ msgid "This bookmark has invalid data"
+#~ msgstr "У цій закладці містяться некоректні дані"
+
+#, fuzzy
+#~ msgid ""
+#~ "Please be sure to fill out server and group chat fields or remove this "
+#~ "bookmark."
+#~ msgstr ""
+#~ "Будь ласка, заповніть поля сервера і кімнати або вилучіть цю закладку."
+
+#~ msgid "Character not allowed"
+#~ msgstr "Заборонений символ"
+
+#, fuzzy
+#~ msgid "Invalid Group Chat"
+#~ msgstr "Некоректний ідентифікатор Jabber групової балачки"
+
+#~ msgid "Unable to join group chat"
+#~ msgstr "Не вдалося приєднатися до групової балачки"
+
+#~ msgid "You are banned from group chat <b>%s</b>."
+#~ msgstr "Вас заблокували у груповій балачці <b>%s</b>."
+
+#, fuzzy
+#~ msgid "Remote server <b>%s</b> does not exist."
+#~ msgstr "Групової балачки <b>%s</b> не існує."
+
+#~ msgid "Group chat <b>%s</b> does not exist."
+#~ msgstr "Групової балачки <b>%s</b> не існує."
+
+#, fuzzy
+#~ msgid "Group chat creation is not permitted."
+#~ msgstr "Можливість створення групових балачок обмежено."
+
+#, fuzzy
+#~ msgid "You must use your registered nickname in <b>%s</b>."
+#~ msgstr ""
+#~ "Для групової балачки <b>%s</b> слід використовувати псевдонім, під яким "
+#~ "ви зареєструвалися."
+
+#, fuzzy
+#~ msgid "You are not in the members list in group chat %s."
+#~ msgstr "Вас немає у списку постійних учасників групової балачки %s."
+
+#, fuzzy
+#~ msgid "XMPP Address is not a group chat"
+#~ msgstr "Це не групова балачка"
+
+#~ msgid "This is not a group chat"
+#~ msgstr "Це не групова балачка"
+
+#, fuzzy
+#~ msgid "Please choose a group chat"
+#~ msgstr "Будь ласка, спершу створіть нову порожню тему з бажаною назвою."
+
+#~ msgid "Invalid Nickname"
+#~ msgstr "Некоректний псевдонім"
+
+#, fuzzy
+#~ msgid "Please choose a nickname"
+#~ msgstr "Будь ласка, спершу створіть нову порожню тему з бажаною назвою."
+
+#~ msgid "Wrong server"
+#~ msgstr "Неправильний сервер"
+
+#, fuzzy
+#~ msgid "%s is not a group chat server"
+#~ msgstr "%s не є сервером групових балачок"
+
+#, fuzzy
+#~ msgid ""
+#~ "How many lines to request from server when entering a group chat. -1 "
+#~ "means no limit."
+#~ msgstr ""
+#~ "Як багато робити запитів до сервера при під'єднанні до групової балачки. "
+#~ "-1 означає без обмежень"
+
+#, fuzzy
+#~ msgid ""
+#~ "Minutes of backlog to request when entering a group chat. -1 means no "
+#~ "limit."
+#~ msgstr ""
+#~ "За скільки хвилин запитувати журнал, при вході у групову балачку. -1 "
+#~ "означає без обмеження"
+
+#, fuzzy
+#~ msgid ""
+#~ "How many lines to request from server when entering a group chat. -1 "
+#~ "means no limit, -2 means global value."
+#~ msgstr ""
+#~ "Як багато робити запитів до сервера при під’єднанні до групової балачки. "
+#~ "-1 означає без обмежень, -2 означає глобальні налаштування"
+
+#, fuzzy
+#~ msgid ""
+#~ "Minutes of backlog to request when entering a group chat. -1 means no "
+#~ "limit, -2 means global value."
+#~ msgstr ""
+#~ "За скільки хвилин запитувати журнал, при вході у групову балачку. -1 "
+#~ "означає без обмеження, -2 означає глобальні налаштування."
+
+#, fuzzy
+#~ msgid "A Password is required to join the group chat %s. Please type it."
+#~ msgstr ""
+#~ "Для приєднання до кімнати %s потрібен пароль. Будь ласка, введіть його."
+
+#~ msgid "Not in Roster"
+#~ msgstr "Немає у реєстрі"
+
+#~ msgid "I would like to add you to my roster"
+#~ msgstr "Я хочу додати вас до свого реєстру"
+
+#~ msgid "Add to Roster"
+#~ msgstr "Додати до реєстру"
+
+#, fuzzy
+#~ msgid "Audio Session"
+#~ msgstr "Тест аудіо"
+
+#, fuzzy
+#~ msgid "Video Session"
+#~ msgstr "Тест відео"
+
+#~ msgid "Manage Room"
+#~ msgstr "Керування кімнатою"
+
+#~ msgid "Configure Room"
+#~ msgstr "Налаштувати кімнату..."
+
+#~ msgid "Destroy Room"
+#~ msgstr "Знищити кімнату"
+
+#, fuzzy
+#~ msgid "Change Nick"
+#~ msgstr "Змінити _псевдонім..."
+
+#, fuzzy
+#~ msgid "Disconnect"
+#~ msgstr "_Роз'єднати"
+
+#, fuzzy
+#~ msgid "Copy JID"
+#~ msgstr "JID кімнати"
+
+#, fuzzy
+#~ msgid "Add to Roster…"
+#~ msgstr "_Додати до реєстру"
+
+#, fuzzy
+#~ msgid "Copy JID/Email"
+#~ msgstr "_Копіювати JID/адресу електронної пошти"
+
+#, fuzzy
+#~ msgid "JID: <i>%s</i>"
+#~ msgstr "Jabber ID: <i>%s</i>"
+
+#~ msgid "Changing Subject"
+#~ msgstr "Зміна теми"
+
+#~ msgid "Please specify the new subject:"
+#~ msgstr "Будь ласка, вкажіть нову тему:"
+
+#~ msgid "Room logging is now enabled"
+#~ msgstr "Тепер увімкнено запис повідомлень кімнати"
+
+#~ msgid "Room logging is now disabled"
+#~ msgstr "Тепер запис кімнати вимкнено"
+
+#, fuzzy
+#~ msgid "You (%s) joined the room"
+#~ msgstr "%s приєднався до групової балачки"
+
+#~ msgid "Room logging is enabled"
+#~ msgstr "Увімкнено запис кімнати"
+
+#, fuzzy
+#~ msgid "Unable to join groupchat"
+#~ msgstr "Не вдалося приєднатися до групової балачки"
+
+#~ msgid "Groupchat Invitation"
+#~ msgstr "Запрошення до групової балачки"
+
+#~ msgid "%(jid)s has been invited in this room"
+#~ msgstr "%(jid)s було запрошено до цієї кімнати"
+
+#, fuzzy
+#~ msgid "JID is not a Groupchat"
+#~ msgstr "Це не групова балачка"
+
+#~ msgid "Invalid JID"
+#~ msgstr "Некоректний JID"
+
+#~ msgid "A connection is not available"
+#~ msgstr "З'єднання недоступне"
+
+#, fuzzy
+#~ msgid "JID already in list"
+#~ msgstr "Ідентифікатор Jabber вже є у списку"
+
+#, fuzzy
+#~ msgid "For the chosen encryption there is no encryption method available"
+#~ msgstr "З'єднання недоступне"
+
+#~ msgid "Removes contact from roster"
+#~ msgstr "Вилучає контакт з реєстру"
+
+#~ msgid "Not in roster"
+#~ msgstr "Немає у реєстрі"
+
+#~ msgid "Contact signed in notification color."
+#~ msgstr "Колір сповіщення появи контакту"
+
+#~ msgid "Contact signout notification color"
+#~ msgstr "Колір сповіщення виходу контакту"
+
+#~ msgid "File transfer request notification color."
+#~ msgstr "Колір сповіщення передавання файлів"
+
+#~ msgid "File transfer error notification color."
+#~ msgstr "Колір сповіщення про помилку передавання файлу"
+
+#~ msgid "File transfer complete or stopped notification color."
+#~ msgstr "Колір сповіщення про закінчене або зупинене передавання файлів"
+
+#~ msgid "Groupchat invitation notification color"
+#~ msgstr "Колір запрошення до групової балачки"
+
+#~ msgid "Other dialogs color."
+#~ msgstr "Інші кольори діалогів"
+
+#~ msgid "Add * and [n] in roster title?"
+#~ msgstr "Додати * і [n] у заголовок реєстру?"
+
+#~ msgid "Hides the banner in two persons chat window"
+#~ msgstr "Ховає підпис у вікні балачки між двома особами"
+
+#, fuzzy
+#~ msgid ""
+#~ "Show the confirm metacontacts creation dialog or not? Empty string means "
+#~ "never show the dialog."
+#~ msgstr ""
+#~ "Чи слід показувати діалогове вікно підтвердження створення метаконтактів? "
+#~ "Порожній рядок вказуватиме на те, що це діалогове вікно не слід "
+#~ "показувати."
+
+#, fuzzy
+#~ msgid "If true, You will also see your webcam"
+#~ msgstr "Якщо «Так», ви також бачитимете власну вебкамеру."
+
+#~ msgid "Space separated list of ssl errors to ignore."
+#~ msgstr "Відокремлений пробілами список помилок ssl, які слід ігнорувати."
+
+#~ msgid "Answer to receipt requests"
+#~ msgstr "Відповідати на запити щодо підтвердження отримання"
+
+#~ msgid "Sent receipt requests"
+#~ msgstr "Надіслані запити на підтвердження отримання"
+
+#, fuzzy
+#~ msgid "Language for which misspelled words will be checked"
+#~ msgstr "Мова, згідно правил якої відбуватиметься перевірка правопису слів"
+
+#~ msgid "I'm eating, so leave me a message."
+#~ msgstr "Зараз їм, залиште повідомлення, перегляну пізніше."
+
+#, fuzzy
+#~ msgid "from room %s"
+#~ msgstr " з кімнати %s"
+
+#~ msgid "Leave Groupchats"
+#~ msgstr "Полишити групові балачки"
+
+#, fuzzy
+#~ msgid "Auto Join"
+#~ msgstr "Автоматичне приєднання"
+
+#, fuzzy
+#~ msgid "Room"
+#~ msgstr "Кімната:"
+
+#~ msgid "Jabber ID:"
+#~ msgstr "Jabber ID:"
+
+#~ msgid "Occupant Actions"
+#~ msgstr "Дії учасника"
+
+#~ msgid "_Add to Roster"
+#~ msgstr "_Додати до реєстру"
+
+#~ msgid "_Manage Room"
+#~ msgstr "_Керування кімнатою"
+
+#~ msgid "Configure _Room..."
+#~ msgstr "Налаштувати _кімнату..."
+
+#~ msgid "_Destroy Room"
+#~ msgstr "_Знищити кімнату"
+
+#~ msgid "Jabber ID"
+#~ msgstr "Jabber ID:"
+
+#, fuzzy
+#~ msgid "account"
+#~ msgstr "Обліковий запис"
+
+#, fuzzy
+#~ msgid "Roster"
+#~ msgstr "Показати _реєстр"
+
+#~ msgid "Show only in roster"
+#~ msgstr "_Показати лише у реєстрі"
+
+#~ msgid "in _roster"
+#~ msgstr "у _реєстрі"
+
+#~ msgid "Roster Appearance"
+#~ msgstr "Вигляд реєстру"
+
+#, fuzzy
+#~ msgid "Show chatstate in roster"
+#~ msgstr "Показувати _аватари контактів у реєстрі"
+
+#~ msgid "_Add to Roster..."
+#~ msgstr "_Додати до реєстру..."
+
+#~ msgid "_Jabber ID:"
+#~ msgstr "_Jabber ID:"
+
+#, fuzzy
+#~ msgid "_Jabber ID"
+#~ msgstr "_Jabber ID:"
+
+#~ msgid "JabberID"
+#~ msgstr "JabberID"
+
+#, fuzzy
+#~ msgid "Show Roster"
+#~ msgstr "Показати _реєстр"
+
+#~ msgid "MUC server"
+#~ msgstr "Сервер групової балачки"
+
+#, fuzzy
+#~ msgid "Roster Shortcuts"
+#~ msgstr "Гарячі клавіші"
+
+#~ msgid "Room Configuration"
+#~ msgstr "Налаштування кімнати"
+
+#~ msgid "Join _Group Chat"
+#~ msgstr "Приєднатись до _групової балачки"
+
+#~ msgid "Toggle audio session"
+#~ msgstr "Перемкнути аудіо сессію"
+
+#~ msgid "Audio sessions are not available"
+#~ msgstr "Аудіо сесія недоступна"
+
+#~ msgid "Conference"
+#~ msgstr "Конференція"
+
+#, fuzzy
+#~ msgid "_Manage Bookmarks…"
+#~ msgstr "Керування закладками"
+
+#~ msgid "Hide _Roster"
+#~ msgstr "Сховати реєстр"
+
+#~ msgid "Show _Roster"
+#~ msgstr "Показати _реєстр"
+
+#, fuzzy
+#~ msgid "Invalid Room"
+#~ msgstr "Некоректна кімната"
+
+#~ msgid "Invalid room"
+#~ msgstr "Некоректна кімната"
+
+#~ msgid "A GTK+ Jabber client"
+#~ msgstr "Jabber клієнт, що базується на GTK+"
+
+#~ msgid "Changing Nickname"
+#~ msgstr "Зміна псевдоніма"
+
+#~ msgid "Please specify the new nickname you want to use:"
+#~ msgstr "Будь ласка, вкажіть новий псевдонім, яким ви бажаєте скористатися:"
+
+#~ msgid "Bookmark already set"
+#~ msgstr "Закладку вже встановлено"
+
+#, fuzzy
+#~ msgid "Group Chat '%s' is already in your bookmarks."
+#~ msgstr "Закладка на груповій балачці «%s» вже існує."
+
+#~ msgid "Bookmark has been added successfully"
+#~ msgstr "Закладку було успішно додано"
+
+#, fuzzy
+#~ msgid ""
+#~ "You can manage your bookmarks by clicking the Bookmarks menu item in your "
+#~ "contact list."
+#~ msgstr ""
+#~ "Керувати вашими закладками можна за допомогою меню дій у вашому реєстрі."
+
+#~ msgid "The nickname contains invalid characters."
+#~ msgstr "У псевдонімі є недозволені символи."
+
+#~ msgid "Bookmark Room"
+#~ msgstr "Зробити закладку на цій кімнаті"
+
+#~ msgid "_Join New Group Chat"
+#~ msgstr "_Приєднатись до нової групової балачки"
+
+#, fuzzy
+#~ msgid "_Create Group Chat"
+#~ msgstr "Полишити групові балачки"
+
+#, fuzzy
+#~ msgid "Name:"
+#~ msgstr "Назва: "
+
+#~ msgid "Description:"
+#~ msgstr "Опис: "
+
+#, fuzzy
+#~ msgid "Address:"
+#~ msgstr "_Адреса:"
+
+#, fuzzy
+#~ msgid "You can not start a new conversation unless you are connected."
+#~ msgstr ""
+#~ "Вам слід з’єднати ваш обліковий запис, щоб взяти участь у груповій "
+#~ "балачці."
+
+#, fuzzy
+#~ msgid "Occupants"
+#~ msgstr "Дії учасника"
+
+#, fuzzy
+#~ msgid "File transfer error"
+#~ msgstr "Помилка під час передавання файла"
+
+#, fuzzy
+#~ msgid "No Accounts available"
+#~ msgstr "Немає жодного облікового запису"
+
+#~ msgid "_Modify Account..."
+#~ msgstr "_Змінити обліковий запис..."
+
+#~ msgid "Boolean"
+#~ msgstr "Булеве"
+
+#~ msgid "Integer"
+#~ msgstr "Ціле число"
+
+#~ msgid "Text"
+#~ msgstr "Текст"
+
+#~ msgid "Value"
+#~ msgstr "Значення"
+
+#~ msgid "Type"
+#~ msgstr "Тип"
+
+#~ msgid "(None)"
+#~ msgstr "(Немає)"
+
+#~ msgid "Hidden"
+#~ msgstr "Сховано"
+
+#~ msgid "Manage Proxy Profiles"
+#~ msgstr "Керування профілями проксі"
+
+#, fuzzy
+#~ msgid "Properties"
+#~ msgstr "<b>Властивості</b>"
+
+#, fuzzy
+#~ msgid "Proxy _Host"
+#~ msgstr "Проксі-_вузол:"
+
+#, fuzzy
+#~ msgid "Proxy _Port"
+#~ msgstr "Проксі-п_орт:"
+
+#, fuzzy
+#~ msgid "New Groupchat"
+#~ msgstr "Створити групову балачку"
+
+#, fuzzy
+#~ msgid "New Contact"
+#~ msgstr "Додати новий контакт"
+
 #~ msgid "%s GiB"
 #~ msgstr "%s ГіБ"
 
@@ -11252,9 +12136,6 @@ msgstr "Активація додатка невдалаДодаток"
 #~ msgid "_Pause"
 #~ msgstr "П_ризупинити"
 
-#~ msgid "Clean _up"
-#~ msgstr "Споро_жнити"
-
 #~ msgid "Remove file transfer from the list."
 #~ msgstr "Вилучити передавання файла зі списку."
 
@@ -11276,10 +12157,6 @@ msgstr "Активація додатка невдалаДодаток"
 #~ msgid "When a file transfer is complete show a popup notification"
 #~ msgstr "Показувати контекстне сповіщення про завершення передавання файла"
 
-#, fuzzy
-#~ msgid "Select Files"
-#~ msgstr "Прибираю"
-
 #~ msgid "From:"
 #~ msgstr "Від:"
 
@@ -11708,9 +12585,6 @@ msgstr "Активація додатка невдалаДодаток"
 #~ msgid "You are invited to a groupchat"
 #~ msgstr "Вас запрошено до групової балачки"
 
-#~ msgid "Do you want to accept the invitation?"
-#~ msgstr "Чи бажаєте ви прийняти це запрошення?"
-
 #~ msgid ""
 #~ "<b>Issued to:</b>\n"
 #~ "Common Name (CN): %(scn)s\n"
@@ -11780,10 +12654,6 @@ msgstr "Активація додатка невдалаДодаток"
 #~ msgid "Do you wish to delete all correspondence with the selected contacts?"
 #~ msgstr "Ви справді бажаєте вилучити журнали для обраних контактів?"
 
-#, fuzzy
-#~ msgid "This can not be undone."
-#~ msgstr "Не вдалося знайти службу"
-
 #~ msgid "<b>What do you want to do?</b>"
 #~ msgstr "<b>Що бажаєте робити?</b>"
 
@@ -11974,10 +12844,6 @@ msgstr "Активація додатка невдалаДодаток"
 #~ msgid "Nick"
 #~ msgstr "Прізвисько"
 
-#, fuzzy
-#~ msgid "Banning…"
-#~ msgstr "Блокування..."
-
 #~ msgid ""
 #~ "<b>Whom do you want to ban?</b>\n"
 #~ "\n"
@@ -12061,12 +12927,6 @@ msgstr "Активація додатка невдалаДодаток"
 #~ msgid "Filter:"
 #~ msgstr "Фільтр:"
 
-#~ msgid ""
-#~ "If checked, Gajim will display the mood of contacts in the roster window"
-#~ msgstr ""
-#~ "Якщо буде позначено цей пункт, Gajim показуватиме настрій контактів у "
-#~ "вікні реєстру"
-
 #~ msgid "<b>Chat Appearance</b>"
 #~ msgstr "<b>Вигляд вікна балачки</b>"
 
@@ -12332,10 +13192,6 @@ msgstr "Активація додатка невдалаДодаток"
 #~ msgstr "_Повідомлення про стан:"
 
 #, fuzzy
-#~ msgid "Group chat highlight"
-#~ msgstr "Виділення повідомлення групової балачки:"
-
-#, fuzzy
 #~ msgid "Your nickname"
 #~ msgstr "Ваш псевдонім:"
 
@@ -12479,9 +13335,6 @@ msgstr "Активація додатка невдалаДодаток"
 #~ msgid "The passwords typed in both fields must be identical."
 #~ msgstr "Паролі, введені у обидва поля, мають бути тотожними."
 
-#~ msgid "Enter new password:"
-#~ msgstr "Введіть новий пароль:"
-
 #~ msgid "Enter it again for confirmation:"
 #~ msgstr "Введіть ще раз для підтвердження:"
 
@@ -12496,10 +13349,6 @@ msgstr "Активація додатка невдалаДодаток"
 #~ msgid "unsubscribe request from %s"
 #~ msgstr "запит на скасування підписки від %s"
 
-#, fuzzy
-#~ msgid "Autojoin"
-#~ msgstr "Автоматичне приєднання"
-
 #~ msgid "&lt;empty&gt;"
 #~ msgstr "&lt;порожньо&gt;"
 
@@ -12613,9 +13462,6 @@ msgstr "Активація додатка невдалаДодаток"
 #~ msgid "Forward unread message then disconnect"
 #~ msgstr "Переспрямувати непрочитані повідомлення на від’єднатись"
 
-#~ msgid "AIM Address:"
-#~ msgstr "Адреса AIM:"
-
 #~ msgid "MSN Address:"
 #~ msgstr "Адреса MSN:"
 
@@ -12663,9 +13509,6 @@ msgstr "Активація додатка невдалаДодаток"
 #~ msgid "Session negotiation cancelled"
 #~ msgstr "Встановлення сеансу було скасовано"
 
-#~ msgid "This session WILL be archived on server"
-#~ msgstr "Цей сеанс БУДЕ збережена на сервері"
-
 #~ msgid "This session WILL NOT be archived on server"
 #~ msgstr "Цей сеанс НЕ БУДЕ збережено на сервері"
 
@@ -13014,9 +13857,6 @@ msgstr "Активація додатка невдалаДодаток"
 #~ msgid "Server:"
 #~ msgstr "Сервер:"
 
-#~ msgid "Password:"
-#~ msgstr "Пароль:"
-
 #~ msgid "Join this room _automatically when I connect"
 #~ msgstr "Автоматично заходити до цієї кімнати після з’єднання"
 
@@ -13377,9 +14217,6 @@ msgstr "Активація додатка невдалаДодаток"
 #~ msgid "_Edit Personal Information..."
 #~ msgstr "Редагувати особисті відомості..."
 
-#~ msgid "Information about you, as stored in the server"
-#~ msgstr "Відомості про вас, які зберігаються на сервері"
-
 #~ msgid "<b>Personal Information</b>"
 #~ msgstr "<b>Особиста інформація</b>"
 
@@ -13461,9 +14298,6 @@ msgstr "Активація додатка невдалаДодаток"
 #~ msgid "Your server can't save your personal information."
 #~ msgstr "Ваш сервер не може зберігати ваші особисті відомості."
 
-#~ msgid "Account Local already exists."
-#~ msgstr "Обліковий запис Local вже існує."
-
 #~ msgid "Please rename or remove it before enabling link-local messaging."
 #~ msgstr ""
 #~ "Будь ласка, перейменуйте або вилучіть його, перш ніж вмикати локальні "
@@ -13617,10 +14451,6 @@ msgstr "Активація додатка невдалаДодаток"
 #~ msgid "The following message was NOT encrypted"
 #~ msgstr "Наступне повідомлення НЕ було зашифровано"
 
-#, fuzzy
-#~ msgid "Encryption used for this contact."
-#~ msgstr "Увімкнути шифрування ESession для цього облікового запису."
-
 #~ msgid "Toggle Open_PGP Encryption"
 #~ msgstr "Увімкнути або вимкнути Open_PGP-шифрування"
 
@@ -13697,10 +14527,6 @@ msgstr "Активація додатка невдалаДодаток"
 #~ msgid "Contact's identity verified"
 #~ msgstr "Особу контакту перевірено"
 
-#, fuzzy
-#~ msgid "Verify again…"
-#~ msgstr "Повторити перевірку..."
-
 #~ msgid ""
 #~ "To be certain that <b>only</b> the expected person can read your messages "
 #~ "or send you messages, you need to verify their identity by clicking the "
@@ -13832,9 +14658,6 @@ msgstr "Активація додатка невдалаДодаток"
 #~ msgid "Add _Contact..."
 #~ msgstr "Додати _контакт..."
 
-#~ msgid "_Accounts"
-#~ msgstr "_Облікові записи"
-
 #~ msgid "Profile, A_vatar"
 #~ msgstr "Профіль, _аватар"
 
@@ -14116,12 +14939,6 @@ msgstr "Активація додатка невдалаДодаток"
 #~ msgstr ""
 #~ "Завжди перевіряти, чи є Gajim типовим клієнтом Jabber, під час запуску"
 
-#~ msgid "Join _Group Chat..."
-#~ msgstr "Приєднатись до _групової балачки"
-
-#~ msgid "_Modify Account"
-#~ msgstr "_Змінити обліковий запис"
-
 #~ msgid "Execute Command..."
 #~ msgstr "Виконати команду..."
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index aa565f811..3306b3d54 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: 2019-07-02 02:06+0000\n"
+"POT-Creation-Date: 2019-08-11 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,70 +20,70 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: gajim/chat_control_base.py:550
+#: gajim/chat_control_base.py:557
 msgid "_Undo"
 msgstr ""
 
-#: gajim/chat_control_base.py:558 gajim/conversation_textview.py:529
+#: gajim/chat_control_base.py:565 gajim/conversation_textview.py:529
 msgid "_Clear"
 msgstr ""
 
-#: gajim/chat_control_base.py:563
+#: gajim/chat_control_base.py:570
 msgid "Paste as quote"
 msgstr ""
 
-#: gajim/chat_control_base.py:613
+#: gajim/chat_control_base.py:620
 #, fuzzy
 msgid "Paste Image"
 msgstr "选择图像"
 
-#: gajim/chat_control_base.py:614
+#: gajim/chat_control_base.py:621
 #, fuzzy
 msgid "You are trying to paste an image"
 msgstr "您将要关闭多个标签"
 
-#: gajim/chat_control_base.py:615
+#: gajim/chat_control_base.py:622
 #, fuzzy
 msgid ""
 "Are you sure you want to paste your clipboard's image into the chat window?"
 msgstr "您确定要离开聊天室\"%s\"吗?"
 
-#: gajim/chat_control_base.py:617 gajim/groupchat_control.py:2310
-#: gajim/roster_window.py:2848 gajim/roster_window.py:4167
-#: gajim/message_window.py:252 gajim/gtk/dialogs.py:418
+#: gajim/chat_control_base.py:624 gajim/groupchat_control.py:2218
+#: gajim/roster_window.py:2841 gajim/roster_window.py:4118
+#: gajim/message_window.py:359 gajim/gtk/dialogs.py:330
 msgid "_Do not ask me again"
 msgstr "不再询问(_D)"
 
-#: gajim/chat_control_base.py:620
+#: gajim/chat_control_base.py:627
 msgid "_Paste"
 msgstr ""
 
-#: gajim/chat_control_base.py:1162 gajim/gtk/accounts.py:351
+#: gajim/chat_control_base.py:1169 gajim/gtk/accounts.py:354
 #, fuzzy
 msgid "Privacy"
 msgstr "隐私策略列表"
 
-#: gajim/chat_control_base.py:1163
+#: gajim/chat_control_base.py:1170
 #, fuzzy
 msgid "Warning"
 msgstr "将封禁 %s"
 
-#: gajim/chat_control_base.py:1164
+#: gajim/chat_control_base.py:1171
 #, fuzzy, python-format
 msgid "If you send a file to <b>%s</b>, your real JID will be revealed."
 msgstr "如果您想向 %s 发送文件, 对方会获知您的真实JID。"
 
-#: gajim/chat_control_base.py:1169
+#: gajim/chat_control_base.py:1176
 #, fuzzy
 msgid "Continue"
 msgstr "继续(_C)"
 
-#: gajim/gtkgui_helpers.py:163 gajim/gtk/filetransfer.py:393
+#: gajim/gtkgui_helpers.py:163 gajim/gtk/filetransfer.py:398
 #, fuzzy, python-format
 msgid "Cannot overwrite existing file '%s'"
 msgstr "无法覆盖现有文件\"%s\""
 
-#: gajim/gtkgui_helpers.py:164 gajim/gtk/filetransfer.py:394
+#: gajim/gtkgui_helpers.py:164 gajim/gtk/filetransfer.py:399
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
@@ -164,383 +164,391 @@ msgstr "没有未处理的认证请求"
 msgid " resource with priority "
 msgstr " 带有优先级的资源 "
 
-#: gajim/gui_menu_builder.py:96
-msgid "_New Group Chat"
-msgstr "新聊天室(_N)"
+#: gajim/gui_menu_builder.py:251 gajim/gui_menu_builder.py:342
+#: gajim/chat_control.py:305 gajim/roster_window.py:783
+#: gajim/roster_window.py:1716 gajim/roster_window.py:1718
+#: gajim/roster_window.py:2027 gajim/roster_window.py:3292
+#: gajim/roster_window.py:3325 gajim/gui_interface.py:396
+#: gajim/common/contacts.py:222 gajim/common/contacts.py:359
+#: gajim/common/contacts.py:471 gajim/common/helpers.py:86
+#: gajim/common/helpers.py:317 gajim/gtk/add_contact.py:319
+#: gajim/gtk/subscription_request.py:70 gajim/gtk/subscription_request.py:99
+#: gajim/gtk/roster_item_exchange.py:112
+#, fuzzy
+msgid "Not in contact list"
+msgstr "显示离线联系人"
+
+#: gajim/gui_menu_builder.py:355
+#, fuzzy
+msgid "I would like to add you to my contact list"
+msgstr "我想添加您到我的联系人列表"
 
-#: gajim/gui_menu_builder.py:289 gajim/gui_menu_builder.py:380
-#: gajim/chat_control.py:303 gajim/roster_window.py:786
-#: gajim/roster_window.py:1719 gajim/roster_window.py:1721
-#: gajim/roster_window.py:2030 gajim/roster_window.py:3336
-#: gajim/roster_window.py:3369 gajim/gui_interface.py:413
-#: gajim/common/contacts.py:206 gajim/common/contacts.py:343
-#: gajim/common/helpers.py:83 gajim/common/helpers.py:311
-#: gajim/gtk/add_contact.py:319 gajim/gtk/subscription_request.py:70
-#: gajim/gtk/subscription_request.py:99 gajim/gtk/roster_item_exchange.py:112
-msgid "Not in Roster"
-msgstr "不在联系人列表中"
-
-#: gajim/gui_menu_builder.py:393
-msgid "I would like to add you to my roster"
-msgstr "我希望将您添加到我的联系人列表"
-
-#: gajim/gui_menu_builder.py:471
+#: gajim/gui_menu_builder.py:433
 msgid "Send Single _Message…"
 msgstr "发送单条(_M)…"
 
-#: gajim/gui_menu_builder.py:486
+#: gajim/gui_menu_builder.py:448
 #, fuzzy
 msgid "E_xecute Command…"
 msgstr "执行命令(_E)..."
 
-#: gajim/gui_menu_builder.py:494
+#: gajim/gui_menu_builder.py:456
 msgid "_Manage Transport"
 msgstr "管理代理(_M)"
 
-#: gajim/gui_menu_builder.py:500
+#: gajim/gui_menu_builder.py:462
 msgid "_Modify Transport"
 msgstr "修改代理(_M)"
 
-#: gajim/gui_menu_builder.py:507 gajim/roster_window.py:5046
+#: gajim/gui_menu_builder.py:469 gajim/roster_window.py:4985
 #, fuzzy
 msgid "_Rename…"
 msgstr "重命名(_R)"
 
-#: gajim/gui_menu_builder.py:518 gajim/roster_window.py:5062
-#: gajim/roster_window.py:5177 gajim/data/gui/blocked_contacts_window.ui:52
+#: gajim/gui_menu_builder.py:480 gajim/roster_window.py:5001
+#: gajim/roster_window.py:5116 gajim/data/gui/blocked_contacts_window.ui:52
 #: gajim/data/gui/gc_occupants_menu.ui:148
 #: gajim/data/gui/contact_context_menu.ui:143
 msgid "_Unblock"
 msgstr "解除屏蔽(_U)"
 
-#: gajim/gui_menu_builder.py:521 gajim/roster_window.py:5067
-#: gajim/roster_window.py:5181 gajim/data/gui/gc_occupants_menu.ui:140
+#: gajim/gui_menu_builder.py:483 gajim/roster_window.py:5006
+#: gajim/roster_window.py:5120 gajim/data/gui/gc_occupants_menu.ui:140
 #: gajim/data/gui/contact_context_menu.ui:151
 msgid "_Block"
 msgstr "屏蔽(_B)"
 
-#: gajim/gui_menu_builder.py:529 gajim/roster_window.py:5074
+#: gajim/gui_menu_builder.py:491 gajim/roster_window.py:5013
 #: gajim/data/gui/contact_context_menu.ui:181
 msgid "Remo_ve"
 msgstr "移除(_R)"
 
-#: gajim/gui_menu_builder.py:539 gajim/data/gui/contact_context_menu.ui:198
+#: gajim/gui_menu_builder.py:501 gajim/data/gui/contact_context_menu.ui:198
 msgid "_Information"
 msgstr "信息(_I)"
 
-#: gajim/gui_menu_builder.py:552
+#: gajim/gui_menu_builder.py:514
 msgid "Save _As"
 msgstr "另存为(_A)"
 
-#: gajim/gui_menu_builder.py:564 gajim/groupchat_control.py:501
-#: gajim/chat_control.py:340
+#: gajim/gui_menu_builder.py:526 gajim/groupchat_control.py:507
+#: gajim/chat_control.py:342
 #, fuzzy
 msgid "Send File…"
 msgstr "发送文件(_F)"
 
-#: gajim/gui_menu_builder.py:565
+#: gajim/gui_menu_builder.py:527
 #, fuzzy
 msgid "Upload File…"
 msgstr "另存为..."
 
-#: gajim/gui_menu_builder.py:566
+#: gajim/gui_menu_builder.py:528
 #, fuzzy
 msgid "Send File Directly…"
 msgstr "另存为..."
 
-#: gajim/gui_menu_builder.py:568 gajim/gui_menu_builder.py:632
+#: gajim/gui_menu_builder.py:530 gajim/gui_menu_builder.py:596
 #, fuzzy
 msgid "Send Chatstate"
 msgstr "最后状态"
 
-#: gajim/gui_menu_builder.py:569
+#: gajim/gui_menu_builder.py:531
 #, fuzzy
 msgid "Invite Contacts"
 msgstr "邀请联系人(_C)"
 
-#: gajim/gui_menu_builder.py:570
+#: gajim/gui_menu_builder.py:532
 #, fuzzy
-msgid "Add to Roster"
-msgstr "添加至联系人列表(_A)"
+msgid "Add to Contact List"
+msgstr "添加联系人(_A)..."
 
-#: gajim/gui_menu_builder.py:571
+#: gajim/gui_menu_builder.py:533
 #, fuzzy
-msgid "Audio Session"
-msgstr "音频测试"
+msgid "Voice Chat"
+msgstr "语音聊天请求"
 
-#: gajim/gui_menu_builder.py:572
+#: gajim/gui_menu_builder.py:534
 #, fuzzy
-msgid "Video Session"
+msgid "Video Chat"
 msgstr "视频测试"
 
-#: gajim/gui_menu_builder.py:573
+#: gajim/gui_menu_builder.py:535 gajim/gui_menu_builder.py:582
 #, fuzzy
 msgid "Information"
 msgstr "信息(_I)"
 
-#: gajim/gui_menu_builder.py:574 gajim/gui_menu_builder.py:639
+#: gajim/gui_menu_builder.py:536 gajim/gui_menu_builder.py:602
 #: gajim/data/gui/application_menu.ui:37
 #, fuzzy
 msgid "History"
 msgstr "历史(_H)"
 
-#: gajim/gui_menu_builder.py:580 gajim/gui_menu_builder.py:687
+#: gajim/gui_menu_builder.py:542 gajim/gui_menu_builder.py:650
 #: gajim/data/gui/preferences_window.ui:1823
 msgid "Disabled"
 msgstr "禁用"
 
-#: gajim/gui_menu_builder.py:581 gajim/gui_menu_builder.py:688
+#: gajim/gui_menu_builder.py:543 gajim/gui_menu_builder.py:651
 msgid "Composing only"
 msgstr "仅正在编辑"
 
-#: gajim/gui_menu_builder.py:582 gajim/gui_menu_builder.py:689
+#: gajim/gui_menu_builder.py:544 gajim/gui_menu_builder.py:652
 msgid "All chat states"
 msgstr "所有聊天状态"
 
-#: gajim/gui_menu_builder.py:620
+#: gajim/gui_menu_builder.py:583
 #, fuzzy
-msgid "Manage Room"
-msgstr "管理聊天室(_M)"
+msgid "Manage Group Chat"
+msgstr "离开聊天室"
 
-#: gajim/gui_menu_builder.py:621
+#: gajim/gui_menu_builder.py:584 gajim/data/gui/groupchat_control.ui:649
 #, fuzzy
 msgid "Change Subject"
 msgstr "更改主题(_S)"
 
-#: gajim/gui_menu_builder.py:622
+#: gajim/gui_menu_builder.py:585
 #, fuzzy
-msgid "Configure Room"
-msgstr "设置聊天室(_R)"
+msgid "Configure Group Chat"
+msgstr "离开聊天室"
 
-#: gajim/gui_menu_builder.py:623
+#: gajim/gui_menu_builder.py:586
 #, fuzzy
 msgid "Upload Avatar…"
 msgstr "选择归档文件"
 
-#: gajim/gui_menu_builder.py:624
+#: gajim/gui_menu_builder.py:587
 #, fuzzy
-msgid "Destroy Room"
-msgstr "删除聊天室(_D)"
+msgid "Destroy Group Chat"
+msgstr "新聊天室"
 
-#: gajim/gui_menu_builder.py:626 gajim/data/gui/preferences_window.ui:790
+#: gajim/gui_menu_builder.py:589 gajim/data/gui/preferences_window.ui:790
 #, fuzzy
 msgid "Chat Settings"
 msgstr "插件"
 
-#: gajim/gui_menu_builder.py:627
+#: gajim/gui_menu_builder.py:590
 msgid "Show join/leave"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:628
+#: gajim/gui_menu_builder.py:591
 #, fuzzy
 msgid "Show status changes"
 msgstr "记录联系人状态变化(_L)"
 
-#: gajim/gui_menu_builder.py:629 gajim/data/gui/gc_control_popup_menu.ui:72
+#: gajim/gui_menu_builder.py:592 gajim/data/gui/gc_control_popup_menu.ui:72
 #, fuzzy
 msgid "Notify on all messages"
 msgstr "预设的消息: "
 
-#: gajim/gui_menu_builder.py:630
+#: gajim/gui_menu_builder.py:593
 #, fuzzy
 msgid "Minimize on close"
 msgstr "关闭时最小化窗口"
 
-#: gajim/gui_menu_builder.py:631
+#: gajim/gui_menu_builder.py:595
 #, fuzzy
-msgid "Minimize on autojoin"
+msgid "Minimize when joining automatically"
 msgstr "自动加入时最小化"
 
-#: gajim/gui_menu_builder.py:634
+#: gajim/gui_menu_builder.py:598
 msgid "Sync Threshold"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:635
+#: gajim/gui_menu_builder.py:599
 #, fuzzy
-msgid "Change Nick"
+msgid "Change Nickname"
 msgstr "更改昵称(_N)"
 
-#: gajim/gui_menu_builder.py:636
-#, fuzzy
-msgid "Bookmark Room"
-msgstr "将本聊天室加入书签(_B)"
-
-#: gajim/gui_menu_builder.py:637
+#: gajim/gui_menu_builder.py:600
 #, fuzzy
 msgid "Request Voice"
 msgstr "语音(_V)"
 
-#: gajim/gui_menu_builder.py:638 gajim/roster_window.py:5246
+#: gajim/gui_menu_builder.py:601 gajim/roster_window.py:5185
 #, fuzzy
 msgid "Execute command"
 msgstr "执行命令(_E)..."
 
-#: gajim/gui_menu_builder.py:640
-#, fuzzy
-msgid "Disconnect"
-msgstr "断开连接(_D)"
+#: gajim/gui_menu_builder.py:603
+msgid "Leave"
+msgstr ""
 
-#: gajim/gui_menu_builder.py:678 gajim/gtk/preferences.py:156
+#: gajim/gui_menu_builder.py:641 gajim/gtk/preferences.py:155
 msgid "No threshold"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:680 gajim/gtk/preferences.py:158
+#: gajim/gui_menu_builder.py:643 gajim/gtk/preferences.py:157
 #, python-format
 msgid "%i day"
 msgid_plural "%i days"
 msgstr[0] ""
 
-#: gajim/gui_menu_builder.py:709 gajim/gui_menu_builder.py:747
-#: gajim/gtk/join_groupchat.py:43
-msgid "Join Group Chat"
-msgstr "加入聊天室"
-
-#: gajim/gui_menu_builder.py:746
+#: gajim/gui_menu_builder.py:672
 #, fuzzy
 msgid "Add Contact…"
 msgstr "添加联系人(_A)..."
 
-#: gajim/gui_menu_builder.py:748 gajim/gtk/profile.py:52
-#: gajim/gtk/accounts.py:770 gajim/gtk/accounts.py:808
+#: gajim/gui_menu_builder.py:673 gajim/gtk/profile.py:52
+#: gajim/gtk/accounts.py:773 gajim/gtk/accounts.py:811
 #, fuzzy
 msgid "Profile"
 msgstr "文件"
 
-#: gajim/gui_menu_builder.py:749
+#: gajim/gui_menu_builder.py:674
+msgid "Send Single Message…"
+msgstr "发送单条消息…"
+
+#: gajim/gui_menu_builder.py:675
 #, fuzzy
 msgid "Discover Services"
 msgstr "发现服务(_D)"
 
-#: gajim/gui_menu_builder.py:750
-msgid "Send Single Message…"
-msgstr "发送单条消息…"
+#: gajim/gui_menu_builder.py:676 gajim/gtk/server_info.py:36
+#, fuzzy
+msgid "Server Info"
+msgstr "服务器"
 
-#: gajim/gui_menu_builder.py:751 gajim/data/gui/preferences_window.ui:2741
+#: gajim/gui_menu_builder.py:677 gajim/data/gui/preferences_window.ui:2741
 msgid "Advanced"
 msgstr "高级"
 
-#: gajim/gui_menu_builder.py:752 gajim/gtk/mam_preferences.py:88
+#: gajim/gui_menu_builder.py:678 gajim/gtk/mam_preferences.py:88
 #, fuzzy
 msgid "Archiving Preferences"
 msgstr "编辑存档首选项(_V)"
 
-#: gajim/gui_menu_builder.py:753
+#: gajim/gui_menu_builder.py:679
 #, fuzzy
 msgid "Blocking List"
 msgstr "封禁名单"
 
-#: gajim/gui_menu_builder.py:754 gajim/gtk/history_sync.py:108
+#: gajim/gui_menu_builder.py:680
+#, fuzzy
+msgid "Bookmarks"
+msgstr "将本聊天室加入书签(_B)"
+
+#: gajim/gui_menu_builder.py:681
+#, fuzzy
+msgid "PEP Configuration"
+msgstr "聊天室设置"
+
+#: gajim/gui_menu_builder.py:682 gajim/gtk/history_sync.py:108
 #: gajim/gtk/history_sync.py:186
 #, fuzzy
 msgid "Synchronise History"
 msgstr "同步"
 
-#: gajim/gui_menu_builder.py:755 gajim/gtk/privacy_list.py:427
+#: gajim/gui_menu_builder.py:683 gajim/gtk/privacy_list.py:427
 msgid "Privacy Lists"
 msgstr "隐私策略列表"
 
-#: gajim/gui_menu_builder.py:756 gajim/gtk/server_info.py:36
-#, fuzzy
-msgid "Server Info"
-msgstr "服务器"
-
-#: gajim/gui_menu_builder.py:757 gajim/gui_menu_builder.py:768
+#: gajim/gui_menu_builder.py:685 gajim/gui_menu_builder.py:696
 #: gajim/data/gui/xml_console_window.ui:77
 msgid "XML Console"
 msgstr "XML 控制台"
 
-#: gajim/gui_menu_builder.py:759 gajim/data/gui/groupchat_config.ui:36
+#: gajim/gui_menu_builder.py:687 gajim/data/gui/groupchat_config.ui:36
 #, fuzzy
 msgid "Admin"
 msgstr "管理(_A)"
 
-#: gajim/gui_menu_builder.py:760
+#: gajim/gui_menu_builder.py:688
 #, fuzzy
 msgid "Send Server Message…"
 msgstr "发送服务器消息(_S)"
 
-#: gajim/gui_menu_builder.py:761
+#: gajim/gui_menu_builder.py:689
 #, fuzzy
 msgid "Set MOTD…"
 msgstr "设定 MOTD..."
 
-#: gajim/gui_menu_builder.py:762
+#: gajim/gui_menu_builder.py:690
 #, fuzzy
 msgid "Update MOTD…"
 msgstr "更新 MOTD..."
 
-#: gajim/gui_menu_builder.py:763
+#: gajim/gui_menu_builder.py:691
 #, fuzzy
 msgid "Delete MOTD…"
 msgstr "删除 MOTD"
 
-#: gajim/gui_menu_builder.py:812
+#: gajim/gui_menu_builder.py:736
 #, fuzzy
-msgid "No Accounts available"
-msgstr "没有有效账户"
+msgid "_Add Account…"
+msgstr "添加联系人(_A)..."
+
+#: gajim/gui_menu_builder.py:742
+#, fuzzy
+msgid "_Modify Accounts…"
+msgstr "修改账户信息(_M)"
 
-#: gajim/gui_menu_builder.py:823 gajim/data/gui/application_menu.ui:5
-#: gajim/data/gui/application_menu.ui:71 gajim/data/gui/shortcuts_window.ui:182
-#: gajim/gtk/accounts.py:58
+#: gajim/gui_menu_builder.py:751 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:755 gajim/data/gui/application_menu.ui:5
+#: gajim/data/gui/shortcuts_window.ui:182 gajim/gtk/accounts.py:57
 msgid "Accounts"
 msgstr "账户"
 
-#: gajim/gui_menu_builder.py:881 gajim/gui_menu_builder.py:886
+#: gajim/gui_menu_builder.py:784 gajim/gui_menu_builder.py:789
 #, fuzzy
-msgid "Copy JID"
-msgstr "聊天室 JID"
+msgid "Copy XMPP Address"
+msgstr "复制 JID/电子邮件地址(_C)"
 
-#: gajim/gui_menu_builder.py:882 gajim/gui_menu_builder.py:914
+#: gajim/gui_menu_builder.py:785 gajim/gui_menu_builder.py:817
 msgid "Join Groupchat"
 msgstr "加入聊天室"
 
-#: gajim/gui_menu_builder.py:887 gajim/gui_menu_builder.py:913
-#: gajim/data/gui/application_menu.ui:76
+#: gajim/gui_menu_builder.py:790 gajim/gui_menu_builder.py:816
+#: gajim/data/gui/application_menu.ui:71
 #: gajim/data/gui/subscription_request_window.ui:106
 msgid "Start Chat"
 msgstr "开始聊天"
 
-#: gajim/gui_menu_builder.py:888 gajim/gui_menu_builder.py:915
+#: gajim/gui_menu_builder.py:791 gajim/gui_menu_builder.py:818
 #, fuzzy
-msgid "Add to Roster…"
-msgstr "添加至联系人列表(_A)"
+msgid "Add to Contact List…"
+msgstr "添加联系人(_A)..."
 
-#: gajim/gui_menu_builder.py:893
+#: gajim/gui_menu_builder.py:796
 #, fuzzy
 msgid "Copy Link Location"
 msgstr "复制链接位置(_C)"
 
-#: gajim/gui_menu_builder.py:894
+#: gajim/gui_menu_builder.py:797
 #, fuzzy
 msgid "Open Link in Browser"
 msgstr "在浏览器中打开链接(_O)"
 
-#: gajim/gui_menu_builder.py:899
+#: gajim/gui_menu_builder.py:802
 #, fuzzy
 msgid "Copy Email Address"
 msgstr "复制 JID/电子邮件地址(_C)"
 
-#: gajim/gui_menu_builder.py:900 gajim/gui_menu_builder.py:912
+#: gajim/gui_menu_builder.py:803 gajim/gui_menu_builder.py:815
 #, fuzzy
 msgid "Open Email Composer"
 msgstr "打开邮件编辑器(_O)"
 
-#: gajim/gui_menu_builder.py:905
+#: gajim/gui_menu_builder.py:808
 #, fuzzy
 msgid "Copy Location"
 msgstr "复制链接位置(_C)"
 
-#: gajim/gui_menu_builder.py:906
+#: gajim/gui_menu_builder.py:809
 #, fuzzy
 msgid "Show Location"
 msgstr "位置："
 
-#: gajim/gui_menu_builder.py:911
+#: gajim/gui_menu_builder.py:814
 #, fuzzy
-msgid "Copy JID/Email"
+msgid "Copy XMPP Address/Email"
 msgstr "复制 JID/电子邮件地址(_C)"
 
-#: gajim/gui_menu_builder.py:945
+#: gajim/gui_menu_builder.py:852
 #, fuzzy
 msgid "Copy"
 msgstr "聊天室 JID"
@@ -563,44 +571,56 @@ msgstr ""
 msgid "Choose folder for logfile"
 msgstr ""
 
-#: gajim/history_manager.py:107
+#: gajim/history_manager.py:106
 msgid "Cannot find history logs database"
 msgstr "无法找到历史记录数据库"
 
-#: gajim/history_manager.py:108
+#: gajim/history_manager.py:107
 #, fuzzy, python-format
 msgid "%s does not exist."
 msgstr "文件不存在"
 
-#: gajim/history_manager.py:141 gajim/history_manager.py:195
-#: gajim/gtk/discovery.py:829 gajim/gtk/roster_item_exchange.py:80
-msgid "JID"
-msgstr "JID"
+#: gajim/history_manager.py:140 gajim/history_manager.py:194
+#: 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:30
+#: gajim/gtk/accounts.py:804
+#, fuzzy
+msgid "XMPP Address"
+msgstr "AIM 地址: "
 
-#: gajim/history_manager.py:154 gajim/history_manager.py:202
+#: gajim/history_manager.py:153 gajim/history_manager.py:201
 #: gajim/data/gui/history_window.ui:89 gajim/gtk/history.py:108
 msgid "Date"
 msgstr "日期"
 
-#: gajim/history_manager.py:161 gajim/history_manager.py:225
+#: gajim/history_manager.py:160 gajim/history_manager.py:224
 #: gajim/data/gui/join_groupchat_window.ui:208
 #: gajim/data/gui/profile_window.ui:214
 #: gajim/data/gui/vcard_information_window.ui:443
+#: gajim/data/gui/bookmarks.ui:140
 msgid "Nickname"
 msgstr "昵称"
 
-#: gajim/history_manager.py:172 gajim/history_manager.py:211
+#: gajim/history_manager.py:171 gajim/history_manager.py:210
 #: gajim/data/gui/preferences_window.ui:1344
 #: gajim/data/gui/single_message_window.ui:275 gajim/gtk/history.py:117
 msgid "Message"
 msgstr "消息"
 
-#: gajim/history_manager.py:180 gajim/history_manager.py:218
+#: gajim/history_manager.py:179 gajim/history_manager.py:217
 #: gajim/data/gui/groups_post_window.ui:49
 #: gajim/data/gui/single_message_window.ui:214
 msgid "Subject"
 msgstr "主题"
 
+#: gajim/history_manager.py:247
+#, fuzzy
+msgid "Database Cleanup"
+msgstr "数据库错误"
+
 #: gajim/history_manager.py:248
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
@@ -610,11 +630,8 @@ msgstr "您确定要清除数据库?（强烈建议 GAJIM 运行时不要进行�
 #: gajim/history_manager.py:250
 #, fuzzy
 msgid ""
-"Normally allocated database size will not be freed, it will just become "
-"reusable. If you really want to reduce database filesize, click YES, else "
-"click NO.\n"
-"\n"
-"In case you click YES, please wait…"
+"Normally, the allocated database size will not be freed, it will just become "
+"reusable. This operation may take a while."
 msgstr ""
 "通常已占用的数据库空间不会被释放, 以便于恢复操作。如果您的确需要压缩数据库的"
 "体积, 点击 \"是\", 否则点击\"否\"。\n"
@@ -623,44 +640,44 @@ msgstr ""
 
 #: gajim/history_manager.py:255
 #, fuzzy
-msgid "Database Cleanup"
-msgstr "数据库错误"
+msgid "_Cleanup"
+msgstr "清除(_U)"
 
-#: gajim/history_manager.py:519 gajim/gtk/filetransfer.py:238
-#: gajim/gtk/filetransfer.py:248
+#: gajim/history_manager.py:518 gajim/gtk/filetransfer.py:237
+#: gajim/gtk/filetransfer.py:247
 msgid "You"
 msgstr "您"
 
-#: gajim/history_manager.py:531
+#: gajim/history_manager.py:530
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(who)s 在 %(time)s 时说: %(message)s\n"
 
-#: gajim/history_manager.py:568 gajim/history_manager.py:607
-#: gajim/gtk/dialogs.py:58 gajim/gtk/themes.py:319
+#: gajim/history_manager.py:567 gajim/history_manager.py:606
+#: gajim/gtk/dialogs.py:57 gajim/gtk/themes.py:319
 #: gajim/gtk/roster_item_exchange.py:75 gajim/gtk/roster_item_exchange.py:185
 msgid "Delete"
 msgstr "删除"
 
-#: gajim/history_manager.py:569
+#: gajim/history_manager.py:568
 #, fuzzy
 msgid "Delete Conversation"
 msgid_plural "Delete Conversations"
 msgstr[0] "删除确认"
 
-#: gajim/history_manager.py:570
+#: gajim/history_manager.py:569
 #, 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:608
+#: gajim/history_manager.py:607
 #, fuzzy
 msgid "Delete Message"
 msgid_plural "Delete Messages"
 msgstr[0] "默认消息"
 
-#: gajim/history_manager.py:609
+#: gajim/history_manager.py:608
 #, fuzzy
 msgid "Do you want to permanently delete this message"
 msgid_plural "Do you want to permanently delete these messages"
@@ -673,14 +690,14 @@ msgstr "联系人名称: <i>%s</i>"
 
 #: gajim/dialogs.py:84
 #, python-format
-msgid "JID: <i>%s</i>"
-msgstr "JID: <i>%s</i>"
+msgid "XMPP Address: <i>%s</i>"
+msgstr ""
 
-#: gajim/dialogs.py:115 gajim/dialogs.py:128 gajim/roster_window.py:2901
-#: gajim/roster_window.py:3833 gajim/roster_window.py:5084
-#: gajim/common/contacts.py:157 gajim/common/contacts.py:190
+#: gajim/dialogs.py:115 gajim/dialogs.py:128 gajim/roster_window.py:2894
+#: gajim/roster_window.py:3784 gajim/roster_window.py:5023
+#: gajim/common/contacts.py:157 gajim/common/contacts.py:206
 #: gajim/data/gui/preferences_window.ui:558
-#: gajim/data/gui/shortcuts_window.ui:177 gajim/gtk/accounts.py:349
+#: gajim/data/gui/shortcuts_window.ui:177 gajim/gtk/accounts.py:352
 msgid "General"
 msgstr "常规"
 
@@ -725,7 +742,7 @@ msgstr "覆盖状态信息?"
 msgid "Preset name is already in use. Do you want to overwrite this preset?"
 msgstr "这个名称已被使用。您想要覆盖这个状态信息吗?"
 
-#: gajim/dialogs.py:703
+#: gajim/dialogs.py:703 gajim/plugins/gui.py:292
 msgid "_Overwrite"
 msgstr ""
 
@@ -737,9 +754,7 @@ msgstr "保存为预设状态信息"
 msgid "Please type a name for this status message"
 msgstr "请为这个状态信息输入一个名称"
 
-#: gajim/dialogs.py:740 gajim/gui_interface.py:1441 gajim/dialog_messages.py:31
-#: gajim/gtk/discovery.py:518 gajim/gtk/profile.py:323
-#: gajim/gtk/join_groupchat.py:234
+#: gajim/dialogs.py:740 gajim/gtk/discovery.py:517 gajim/gtk/profile.py:323
 msgid "You are not connected to the server"
 msgstr "尚未连接到服务器"
 
@@ -747,9 +762,11 @@ msgstr "尚未连接到服务器"
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "未连接时，您不能同步您的联系人。"
 
-#: gajim/dialogs.py:752 gajim/dialogs.py:823 gajim/gtk/discovery.py:822
-#: gajim/gtk/discovery.py:1648 gajim/gtk/discovery.py:1941
-#: gajim/gtk/history.py:99 gajim/gtk/roster_item_exchange.py:83
+#: gajim/dialogs.py:752 gajim/dialogs.py:823
+#: gajim/data/gui/groupchat_info_scrolled.ui:16 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/gtk/roster_item_exchange.py:83
 msgid "Name"
 msgstr "名称"
 
@@ -769,409 +786,357 @@ msgstr "这个账户连接后您才可以与之同步"
 msgid "Synchronise"
 msgstr "同步"
 
-#: gajim/dialogs.py:1043
+#: gajim/dialogs.py:1042
 msgid "an audio and video"
 msgstr "一个音频和视频"
 
-#: gajim/dialogs.py:1045
+#: gajim/dialogs.py:1044
 msgid "an audio"
 msgstr "一个音频"
 
-#: gajim/dialogs.py:1047
+#: gajim/dialogs.py:1046
 msgid "a video"
 msgstr "一个视频"
 
-#: gajim/dialogs.py:1051
-#, python-format
+#: gajim/dialogs.py:1050
+#, fuzzy, python-format
 msgid ""
-"%(contact)s wants to start %(type)s session with you. Do you want to answer "
+"%(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:505
+#: gajim/groupchat_control.py:511
 #, fuzzy, python-format
 msgid "Send File (max. %s MiB)…"
 msgstr "另存为..."
 
-#: gajim/groupchat_control.py:507 gajim/chat_control.py:342
+#: gajim/groupchat_control.py:513 gajim/chat_control.py:344
 #, fuzzy
 msgid "No File Transfer available"
 msgstr "文件传输完毕"
 
-#: gajim/groupchat_control.py:630 gajim/groupchat_control.py:2349
-msgid "Changing Subject"
-msgstr "正在更换话题"
-
-#: gajim/groupchat_control.py:631 gajim/groupchat_control.py:2350
-msgid "Please specify the new subject:"
-msgstr "请指定新话题: "
-
-#: gajim/groupchat_control.py:638
-msgid "Changing Nickname"
-msgstr "正在更换昵称"
-
-#: gajim/groupchat_control.py:639
-msgid "Please specify the new nickname you want to use:"
-msgstr "请指定您想使用的新昵称: "
-
-#: gajim/groupchat_control.py:657
+#: gajim/groupchat_control.py:655
 #, fuzzy
-msgid "Invalid group chat JID"
+msgid "Invalid group chat XMPP Address"
 msgstr "无效的聊天室 Jabber ID"
 
-#: gajim/groupchat_control.py:658
+#: gajim/groupchat_control.py:656
 #, fuzzy
-msgid "The group chat JID has not allowed characters."
+msgid "The group chat XMPP Address has not allowed characters."
 msgstr "聊天室 Jabber ID 包含不合法字符。"
 
-#: gajim/groupchat_control.py:758 gajim/gtk/profile.py:136
+#: gajim/groupchat_control.py:743 gajim/gtk/profile.py:136
 msgid "Could not load image"
 msgstr "无法读取图片"
 
-#: gajim/groupchat_control.py:888
+#: gajim/groupchat_control.py:873
 msgid "Insert Nickname"
 msgstr "插入昵称"
 
-#: gajim/groupchat_control.py:1056 gajim/chat_control.py:824
+#: gajim/groupchat_control.py:1041 gajim/chat_control.py:848
 msgid "and authenticated"
 msgstr "且已被认证"
 
-#: gajim/groupchat_control.py:1060 gajim/chat_control.py:828
+#: gajim/groupchat_control.py:1045 gajim/chat_control.py:852
 msgid "and NOT authenticated"
 msgstr "且未被认证"
 
-#: gajim/groupchat_control.py:1064
+#: gajim/groupchat_control.py:1049
 #, python-format
 msgid "%(type)s encryption is active %(authenticated)s."
 msgstr "%(type)s 加密已启用%(authenticated)s。"
 
-#: gajim/groupchat_control.py:1111
+#: gajim/groupchat_control.py:1096
 msgid "Conversation with "
 msgstr "对话，与 "
 
-#: gajim/groupchat_control.py:1113
+#: gajim/groupchat_control.py:1098
 msgid "Continued conversation"
 msgstr "继续对话"
 
-#: gajim/groupchat_control.py:1411
+#: gajim/groupchat_control.py:1357
 #, python-format
 msgid "%(nick)s has set the subject to %(subject)s"
 msgstr "%(nick)s 将主题设置为 %(subject)s"
 
-#: gajim/groupchat_control.py:1433
+#: gajim/groupchat_control.py:1374
 #, fuzzy
-msgid "Room now shows unavailable members"
+msgid "Group chat now shows unavailable members"
 msgstr "聊天室现在显示了不可用的成员"
 
-#: gajim/groupchat_control.py:1436
-msgid "Room now does not show unavailable members"
+#: gajim/groupchat_control.py:1377
+#, fuzzy
+msgid "Group chat now does not show unavailable members"
 msgstr "聊天室现在不显示禁止的成员"
 
-#: gajim/groupchat_control.py:1439
+#: gajim/groupchat_control.py:1380
 msgid "A setting not related to privacy has been changed"
 msgstr ""
 
-#: gajim/groupchat_control.py:1446
-msgid "Room logging is now enabled"
-msgstr "聊天室消息记录已启用"
+#: gajim/groupchat_control.py:1387 gajim/groupchat_control.py:1659
+#, fuzzy
+msgid "Conversations are stored on the server"
+msgstr "本次会话将在服务器上被存档"
 
-#: gajim/groupchat_control.py:1449
-msgid "Room logging is now disabled"
-msgstr "聊天室消息记录已禁用"
+#: gajim/groupchat_control.py:1390
+#, fuzzy
+msgid "Conversations are not stored on the server"
+msgstr "服务器中保存的关于您的信息"
 
-#: gajim/groupchat_control.py:1452
-msgid "Room is now non-anonymous"
+#: gajim/groupchat_control.py:1393
+#, fuzzy
+msgid "Group chat is now non-anonymous"
 msgstr "聊天室现在是非匿名的"
 
-#: gajim/groupchat_control.py:1456
-msgid "Room is now semi-anonymous"
+#: gajim/groupchat_control.py:1397
+#, fuzzy
+msgid "Group chat is now semi-anonymous"
 msgstr "聊天室现在是半匿名的"
 
-#: gajim/groupchat_control.py:1460
+#: gajim/groupchat_control.py:1401
 #, fuzzy
-msgid "Room is now fully anonymous"
+msgid "Group chat is now fully anonymous"
 msgstr "聊天室现在是完全匿名的"
 
-#: gajim/groupchat_control.py:1500
+#: gajim/groupchat_control.py:1439
 #, fuzzy, python-format
 msgid "Ping? (%s)"
 msgstr "Pong! (%s s.)"
 
-#: gajim/groupchat_control.py:1503
+#: gajim/groupchat_control.py:1442
 #, python-format
 msgid "Pong! (%(nick)s %(delay)s s.)"
 msgstr "Pong! (%(nick)s %(delay)s s.)"
 
-#: gajim/groupchat_control.py:1506 gajim/chat_control.py:1213
+#: gajim/groupchat_control.py:1445 gajim/chat_control.py:1237
 msgid "Error."
 msgstr "错误。"
 
-#: gajim/groupchat_control.py:1711
+#: gajim/groupchat_control.py:1650
 #, fuzzy, python-format
-msgid "You (%s) joined the room"
+msgid "You (%s) joined the group chat"
 msgstr "%s 加入聊天室"
 
-#: gajim/groupchat_control.py:1717
-msgid "Any occupant is allowed to see your full JID"
+#: gajim/groupchat_control.py:1655
+#, fuzzy
+msgid "Any participant is allowed to see your full XMPP Address"
 msgstr "所有成员可以看到您的全部 JID"
 
-#: gajim/groupchat_control.py:1721
-msgid "Room logging is enabled"
-msgstr "聊天室记录被启用"
-
-#: gajim/groupchat_control.py:1725
-msgid "The server has assigned or modified your roomnick"
+#: gajim/groupchat_control.py:1663
+#, fuzzy
+msgid "The server has assigned or modified your nickname in this group chat"
 msgstr "服务器指定或修改了您的聊天室昵称"
 
-#: gajim/groupchat_control.py:1732
-msgid "A new room has been created"
+#: gajim/groupchat_control.py:1671
+#, fuzzy
+msgid "A new group chat has been created"
 msgstr "一个新的聊天室被创建"
 
-#: gajim/groupchat_control.py:1740 gajim/privatechat_control.py:112
+#: gajim/groupchat_control.py:1679 gajim/privatechat_control.py:115
 #, python-format
 msgid "You are now known as %s"
 msgstr "您现在成了 %s "
 
-#: gajim/groupchat_control.py:1742 gajim/privatechat_control.py:114
+#: gajim/groupchat_control.py:1681 gajim/privatechat_control.py:117
 #, python-brace-format
 msgid "{nick} is now known as {new_nick}"
 msgstr "{nick} 现在改名为{new_nick}"
 
-#: gajim/groupchat_control.py:1767 gajim/privatechat_control.py:141
+#: gajim/groupchat_control.py:1706 gajim/privatechat_control.py:144
 #, python-brace-format
 msgid "You are now {show}{status}"
 msgstr "您现在成了{show}{status}"
 
-#: gajim/groupchat_control.py:1773 gajim/privatechat_control.py:147
+#: gajim/groupchat_control.py:1712 gajim/privatechat_control.py:150
 #, python-brace-format
 msgid "{nick} is now {show}{status}"
 msgstr "{nick} 的状态是 {show}{status}"
 
-#: gajim/groupchat_control.py:1790 gajim/groupchat_control.py:1819
-#: gajim/groupchat_control.py:1849 gajim/groupchat_control.py:1909
+#: gajim/groupchat_control.py:1729 gajim/groupchat_control.py:1758
+#: gajim/groupchat_control.py:1788 gajim/groupchat_control.py:1848
 #, python-brace-format
 msgid " by {actor}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1793
+#: gajim/groupchat_control.py:1732
 #, python-brace-format
 msgid "** Your Affiliation has been set to {affiliation}{actor}{reason}"
 msgstr "** 你的的隶属关系被设置为 {affiliation}{actor}{reason}"
 
-#: gajim/groupchat_control.py:1799
+#: gajim/groupchat_control.py:1738
 #, python-brace-format
 msgid "** Affiliation of {nick} has been set to {affiliation}{actor}{reason}"
 msgstr "** {nick} 的阶级被设置为{affiliation}{actor}{reason}"
 
-#: gajim/groupchat_control.py:1822
+#: gajim/groupchat_control.py:1761
 #, python-brace-format
 msgid "** Your Role has been set to {role}{actor}{reason}"
 msgstr "**你的角色被 设置为{role}{actor}{reason}"
 
-#: gajim/groupchat_control.py:1827
+#: gajim/groupchat_control.py:1766
 #, python-brace-format
 msgid "** Role of {nick} has been set to {role}{actor}{reason}"
 msgstr "** 角色 {nick} 被 设置为{role}{actor}{reason}"
 
-#: gajim/groupchat_control.py:1852
-#, python-brace-format
-msgid "You have been removed from the room{actor}{reason}"
+#: gajim/groupchat_control.py:1791
+#, fuzzy, python-brace-format
+msgid "You have been removed from the group chat{actor}{reason}"
 msgstr "你已经被从聊天室移除{actor}{reason}"
 
-#: gajim/groupchat_control.py:1857
+#: gajim/groupchat_control.py:1796
 #, python-brace-format
 msgid "You have left due to an error{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1863
+#: gajim/groupchat_control.py:1802
 #, python-brace-format
 msgid "You have been kicked{actor}{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1870
+#: gajim/groupchat_control.py:1809
 #, python-brace-format
 msgid "You have been banned{actor}{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1877 gajim/groupchat_control.py:1943
+#: gajim/groupchat_control.py:1816 gajim/groupchat_control.py:1882
 #, fuzzy
 msgid ": Affiliation changed"
 msgstr "阶级变更"
 
-#: gajim/groupchat_control.py:1883 gajim/groupchat_control.py:1948
+#: gajim/groupchat_control.py:1822 gajim/groupchat_control.py:1887
 #, fuzzy
-msgid ": Room configuration changed to members-only"
+msgid ": Group chat configuration changed to members-only"
 msgstr "聊天室配置变为\"仅成员\""
 
-#: gajim/groupchat_control.py:1912
-#, python-brace-format
-msgid "{nick} has been removed from the room{by}{reason}"
+#: gajim/groupchat_control.py:1851
+#, fuzzy, python-brace-format
+msgid "{nick} has been removed from the group chat{by}{reason}"
 msgstr "{nick} 已从聊天室移除{by}{reason}"
 
-#: gajim/groupchat_control.py:1922
+#: gajim/groupchat_control.py:1861
 #, python-brace-format
 msgid "{nick} has left due to an error{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1928
+#: gajim/groupchat_control.py:1867
 #, python-brace-format
 msgid "{nick} has been kicked{actor}{reason}"
 msgstr "{nick} 被踢出{actor}{reason}"
 
-#: gajim/groupchat_control.py:1936
+#: gajim/groupchat_control.py:1875
 #, python-brace-format
 msgid "{nick} has been banned{actor}{reason}"
 msgstr "{nick}被封禁{actor}{reason}"
 
-#: gajim/groupchat_control.py:1953
+#: gajim/groupchat_control.py:1892
 #, python-brace-format
 msgid "{nick} has left{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1970
+#: gajim/groupchat_control.py:1914
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s 加入聊天室"
 
-#: gajim/groupchat_control.py:1985 gajim/groupchat_control.py:1990
-#: gajim/groupchat_control.py:1995 gajim/groupchat_control.py:2000
-#: gajim/groupchat_control.py:2011
-msgid "Unable to join group chat"
-msgstr "无法加入聊天室"
-
-#: gajim/groupchat_control.py:1986
-#, python-format
-msgid "You are banned from group chat <b>%s</b>."
-msgstr "您已从聊天室 <b>%s</b> 封禁。"
-
-#: gajim/groupchat_control.py:1991
-#, python-format
-msgid "Remote server <b>%s</b> does not exist."
-msgstr "远程服务器 <b>%s</b> 不存在。"
-
-#: gajim/groupchat_control.py:1996
-#, python-format
-msgid "Group chat <b>%s</b> does not exist."
-msgstr "聊天室 <b>%s</b> 不存在。"
-
-#: gajim/groupchat_control.py:2001
+#: gajim/groupchat_control.py:1981
 #, fuzzy
-msgid "Group chat creation is not permitted."
-msgstr "聊天室创建是受限的。"
-
-#: gajim/groupchat_control.py:2005
-#, fuzzy
-msgid "Unable to join groupchat"
-msgstr "无法加入聊天室"
-
-#: gajim/groupchat_control.py:2006
-#, python-format
-msgid "You must use your registered nickname in <b>%s</b>."
-msgstr "您必须在 <b>%s</b> 使用您的已注册昵称。"
-
-#: gajim/groupchat_control.py:2012
-#, python-format
-msgid "You are not in the members list in groupchat %s."
-msgstr "您不再聊天室 %s 的成员列表中。"
-
-#: gajim/groupchat_control.py:2068
-msgid "Room has been destroyed"
+msgid "Group chat has been destroyed"
 msgstr "聊天室已经被销毁了"
 
-#: gajim/groupchat_control.py:2073
+#: gajim/groupchat_control.py:1986
 #, fuzzy, python-format
-msgid "You can join this room instead: xmpp:%s?join"
+msgid "You can join this group chat instead: xmpp:%s?join"
 msgstr "作为替代, 您可以加入这个聊天室: %s"
 
-#: gajim/groupchat_control.py:2306
+#: gajim/groupchat_control.py:2214
 #, fuzzy
 msgid "Leave Group Chat"
 msgstr "离开聊天室"
 
-#: gajim/groupchat_control.py:2307
+#: gajim/groupchat_control.py:2215
 #, fuzzy
 msgid "Are you sure you want to leave this group chat?"
 msgstr "您确定要离开聊天室\"%s\"吗?"
 
-#: gajim/groupchat_control.py:2308
+#: gajim/groupchat_control.py:2216
 #, fuzzy, python-format
-msgid "If you close this window, you will be disconnected from '%s'."
+msgid "If you close this window, you will leave '%s'."
 msgstr "如果关闭此窗口, 您将断开此聊天室的连接。"
 
-#: gajim/groupchat_control.py:2314
+#: gajim/groupchat_control.py:2222 gajim/roster_window.py:5177
 msgid "_Leave"
 msgstr ""
 
-#: gajim/groupchat_control.py:2377
+#: gajim/groupchat_control.py:2280 gajim/roster_window.py:3008
 #, fuzzy, python-format
 msgid "%(jid)s has been invited to this group chat"
 msgstr "%(jid)s 已经被邀请加入该聊天室"
 
-#: gajim/groupchat_control.py:2527
+#: gajim/groupchat_control.py:2463
 #, python-format
 msgid "Kicking %s"
 msgstr "将踢走 %s"
 
-#: gajim/groupchat_control.py:2528 gajim/groupchat_control.py:2829
+#: gajim/groupchat_control.py:2464 gajim/groupchat_control.py:2765
 msgid "You may specify a reason below:"
 msgstr "您可以指定一个原因: "
 
-#: gajim/groupchat_control.py:2828
+#: gajim/groupchat_control.py:2764
 #, python-format
 msgid "Banning %s"
 msgstr "将封禁 %s"
 
-#: gajim/chat_control.py:408
+#: gajim/chat_control.py:432
 msgid "Show a list of formattings"
 msgstr "显示格式列表(Alt+M)"
 
-#: gajim/chat_control.py:412
+#: gajim/chat_control.py:436
 #, fuzzy
 msgid "This contact does not support HTML"
 msgstr "这个联系人不支持文件传输"
 
-#: gajim/chat_control.py:562
+#: gajim/chat_control.py:586
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr "%(type)s 状态: %(state)s, 原因: %(reason)s"
 
-#: gajim/chat_control.py:686
+#: gajim/chat_control.py:710
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "聊天室 %(room_name)s 的 %(nickname)s"
 
-#: gajim/chat_control.py:832
+#: gajim/chat_control.py:856
 #, fuzzy, python-format
 msgid "%(type)s encryption is active %(authenticated)s"
 msgstr "%(type)s 加密已启用%(authenticated)s。"
 
-#: gajim/chat_control.py:1160 gajim/chat_control.py:1168
+#: gajim/chat_control.py:1184 gajim/chat_control.py:1192
 #, fuzzy
 msgid "Close"
 msgstr "发送并关闭(_S)"
 
-#: gajim/chat_control.py:1161
+#: gajim/chat_control.py:1185
 #, fuzzy, python-format
 msgid "You just received a new message from %s"
 msgstr "您刚刚收到一条来自 \"%s\" 的消息"
 
-#: gajim/chat_control.py:1163
+#: gajim/chat_control.py:1187
 #, fuzzy
 msgid ""
 "If you close this tab while having chat history disabled, this message will "
 "be lost."
 msgstr "如果您关闭此标签并且禁用了历史, 此消息会丢失。"
 
-#: gajim/chat_control.py:1208
+#: gajim/chat_control.py:1232
 msgid "Ping?"
 msgstr "Ping?"
 
-#: gajim/chat_control.py:1211
+#: gajim/chat_control.py:1235
 #, fuzzy, python-format
 msgid "Pong! (%s seconds)"
 msgstr "Pong! (%s s.)"
 
-#: gajim/chat_control.py:1308
+#: gajim/chat_control.py:1332
 #, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -1180,265 +1145,273 @@ msgstr ""
 "主题: %(subject)s\n"
 "%(message)s"
 
-#: gajim/chat_control.py:1416
+#: gajim/chat_control.py:1440
 #, python-format
 msgid "%(name)s is now %(show)s %(status)s"
 msgstr "%(name)s 的状态是 %(show)s %(status)s"
 
-#: gajim/chat_control.py:1476 gajim/data/gui/application_menu.ui:32
+#: gajim/chat_control.py:1500 gajim/data/gui/application_menu.ui:32
 #: gajim/gtk/http_upload_progress.py:35
 #, fuzzy
 msgid "File Transfer"
 msgstr "文件传输"
 
-#: gajim/chat_control.py:1480
+#: gajim/chat_control.py:1504
 msgid "Size"
 msgstr "大小"
 
-#: gajim/chat_control.py:1482 gajim/chat_control.py:1546
+#: gajim/chat_control.py:1506 gajim/chat_control.py:1566
+#: gajim/gui_interface.py:190
 #: gajim/data/gui/groupchat_invitation_received.ui:77
-#: gajim/gtk/filetransfer.py:485
+#: gajim/gtk/filetransfer.py:490
 #, fuzzy
 msgid "_Accept"
 msgstr "帐户(_A)"
 
-#: gajim/chat_control.py:1484 gajim/chat_control.py:1548
+#: gajim/chat_control.py:1508 gajim/chat_control.py:1568
 #: gajim/data/gui/groupchat_invitation_received.ui:62
 #, fuzzy
 msgid "_Decline"
 msgstr "离线(_O)"
 
-#: gajim/chat_control.py:1506 gajim/gui_interface.py:791
-#: gajim/gui_interface.py:821 gajim/gui_interface.py:847
+#: gajim/chat_control.py:1530 gajim/gui_interface.py:777
+#: gajim/gui_interface.py:807 gajim/gui_interface.py:833
 #: gajim/gtk/notification.py:173 gajim/gtk/notification.py:278
 msgid "File Transfer Completed"
 msgstr "文件传输完成"
 
-#: gajim/chat_control.py:1510 gajim/gtk/filetransfer.py:259
+#: gajim/chat_control.py:1534 gajim/gtk/filetransfer.py:258
 #, fuzzy
 msgid "Open _Folder"
 msgstr "打开文件夹(_O)"
 
-#: gajim/chat_control.py:1512 gajim/chat_control.py:1521
+#: gajim/chat_control.py:1536 gajim/chat_control.py:1545
+#: gajim/data/gui/groupchat_control.ui:962
+#: gajim/data/gui/groupchat_control.ui:1049
+#: gajim/data/gui/groupchat_control.ui:1155
 #, fuzzy
 msgid "_Close"
 msgstr "发送并关闭(_S)"
 
-#: gajim/chat_control.py:1543 gajim/gui_interface.py:484
+#: gajim/chat_control.py:1563 gajim/gui_interface.py:473
+#: gajim/data/gui/groupchat_invitation_received.ui:42
 #: gajim/gtk/notification.py:174 gajim/gtk/notification.py:195
 #: gajim/gtk/notification.py:281
-msgid "Groupchat Invitation"
+#, fuzzy
+msgid "Group Chat Invitation"
 msgstr "聊天室邀请"
 
-#: gajim/chat_control.py:1568 gajim/roster_window.py:1954
+#: gajim/chat_control.py:1588 gajim/roster_window.py:1951
 msgid "Remote contact stopped transfer"
 msgstr "远程联系人停止了传输"
 
-#: gajim/chat_control.py:1570 gajim/roster_window.py:1956
+#: gajim/chat_control.py:1590 gajim/roster_window.py:1953
 msgid "Error opening file"
 msgstr "打开文件错误"
 
-#: gajim/chat_control.py:1572 gajim/gtk/filetransfer.py:297
+#: gajim/chat_control.py:1592 gajim/gtk/filetransfer.py:296
 msgid "File transfer stopped"
 msgstr "文件传输已停止"
 
-#: gajim/chat_control.py:1575 gajim/gtk/filetransfer.py:275
-#: gajim/gtk/filetransfer.py:284
+#: gajim/chat_control.py:1595 gajim/gtk/filetransfer.py:274
+#: gajim/gtk/filetransfer.py:283
 msgid "File transfer cancelled"
 msgstr "文件传输已取消"
 
-#: gajim/chat_control.py:1576
+#: gajim/chat_control.py:1596
 msgid "Connection with peer cannot be established."
 msgstr "无法与对方建立连接。"
 
-#: gajim/application.py:72
+#: gajim/application.py:75
 #, fuzzy
 msgid "Show the application's version"
 msgstr "在通知区域显示图标: "
 
-#: gajim/application.py:79
+#: gajim/application.py:82
 #, fuzzy
 msgid "Show only critical errors"
 msgstr "只显示在联系人列表中"
 
-#: gajim/application.py:86
+#: gajim/application.py:89
 msgid "Separate profile files completely (even history database and plugins)"
 msgstr ""
 
-#: gajim/application.py:94
+#: gajim/application.py:97
 msgid "Print XML stanzas and other debug information"
 msgstr ""
 
-#: gajim/application.py:101
+#: gajim/application.py:104
 #, fuzzy
 msgid "Use defined profile in configuration directory"
 msgstr "高级设置编辑器"
 
-#: gajim/application.py:109
+#: gajim/application.py:112
 msgid "Set configuration directory"
 msgstr "设置配置文件目录"
 
-#: gajim/application.py:117
+#: gajim/application.py:120
 msgid "Configure logging system"
 msgstr "配置日志系统"
 
-#: gajim/application.py:125
+#: gajim/application.py:128
 msgid "Show all warnings"
 msgstr "显示所有警告"
 
-#: gajim/application.py:132
+#: gajim/application.py:135
 msgid "Open IPython shell"
 msgstr "打开 IPython shell"
 
-#: gajim/application.py:139
+#: gajim/application.py:142
 msgid "Pops up a window with the next pending event"
 msgstr "为下一条未处理事件弹出窗口"
 
-#: gajim/application.py:145 gajim/data/gui/shortcuts_window.ui:203
+#: gajim/application.py:148 gajim/data/gui/shortcuts_window.ui:203
 #: data/org.gajim.Gajim.desktop.in:21
 msgid "Start a new chat"
 msgstr "开始新聊天"
 
-#: gajim/application.py:152
+#: gajim/application.py:155
 msgid "Simulate loss of connectivity"
 msgstr ""
 
-#: gajim/application.py:159
+#: gajim/application.py:162
 msgid "Simulate regaining connectivity"
 msgstr ""
 
-#: gajim/application.py:201 gajim/gui_interface.py:133
+#: gajim/application.py:204 gajim/gui_interface.py:133
 msgid "Database Error"
 msgstr "数据库错误"
 
-#: gajim/roster_window.py:294 gajim/roster_window.py:1030
+#: gajim/roster_window.py:291 gajim/roster_window.py:1027
 msgid "Merged accounts"
 msgstr "已合并的帐户"
 
-#: gajim/roster_window.py:853 gajim/roster_window.py:1631
-#: gajim/roster_window.py:1664 gajim/roster_window.py:1715
-#: gajim/roster_window.py:1717 gajim/roster_window.py:1872
-#: gajim/roster_window.py:2531 gajim/roster_window.py:5025
-#: gajim/common/contacts.py:188 gajim/common/contacts.py:447
-#: gajim/common/helpers.py:83 gajim/gtk/discovery.py:129
-#: gajim/gtk/discovery.py:130 gajim/gtk/discovery.py:1416
+#: gajim/roster_window.py:850 gajim/roster_window.py:1628
+#: gajim/roster_window.py:1661 gajim/roster_window.py:1712
+#: gajim/roster_window.py:1714 gajim/roster_window.py:1869
+#: gajim/roster_window.py:2528 gajim/roster_window.py:4331
+#: gajim/roster_window.py:4964 gajim/common/contacts.py:204
+#: gajim/common/contacts.py:463 gajim/common/helpers.py:86
+#: gajim/gtk/discovery.py:127 gajim/gtk/discovery.py:128
+#: gajim/gtk/discovery.py:1414
 msgid "Transports"
 msgstr "服务代理"
 
-#: gajim/roster_window.py:1723 gajim/roster_window.py:1725
-#: gajim/roster_window.py:4995 gajim/gui_interface.py:1613
-#: gajim/gui_interface.py:1639 gajim/common/contacts.py:186
-#: gajim/common/helpers.py:83 gajim/common/modules/adhoc_commands.py:245
-msgid "Groupchats"
+#: gajim/roster_window.py:1720 gajim/roster_window.py:1722
+#: gajim/roster_window.py:4331 gajim/roster_window.py:4934
+#: gajim/gui_interface.py:1527 gajim/common/contacts.py:202
+#: gajim/common/helpers.py:86 gajim/common/modules/adhoc_commands.py:245
+#, fuzzy
+msgid "Group chats"
 msgstr "聊天室"
 
-#: gajim/roster_window.py:2012
+#: gajim/roster_window.py:2009
 #, fuzzy
 msgid "Authorization sent"
 msgstr "授权发送成功"
 
-#: gajim/roster_window.py:2013
+#: gajim/roster_window.py:2010
 #, fuzzy, python-format
 msgid "\"%s\" will now see your status."
 msgstr "现在\"%s\"将知道您的状态。"
 
-#: gajim/roster_window.py:2031
+#: gajim/roster_window.py:2028
 msgid "Subscription request has been sent"
 msgstr "认证请求已发出"
 
-#: gajim/roster_window.py:2032
-#, python-format
-msgid "If \"%s\" accepts this request you will know his or her status."
+#: gajim/roster_window.py:2029
+#, fuzzy, python-format
+msgid "If \"%s\" accepts this request you will know their status."
 msgstr "如果\"%s\"接受此请求, 您将知道他/她的状态。"
 
-#: gajim/roster_window.py:2046
+#: gajim/roster_window.py:2043
 #, fuzzy
 msgid "Authorization removed"
 msgstr "授权被移除"
 
-#: gajim/roster_window.py:2047
+#: gajim/roster_window.py:2044
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "\"%s\" 将一直看到您的状态为离线。"
 
-#: gajim/roster_window.py:2250 gajim/roster_window.py:3504
+#: gajim/roster_window.py:2247 gajim/roster_window.py:3460
 msgid "Disconnect for Invisibility"
 msgstr ""
 
-#: gajim/roster_window.py:2251 gajim/roster_window.py:3505
+#: gajim/roster_window.py:2248 gajim/roster_window.py:3461
 msgid "You are participating in one or more group chats"
 msgstr "您正在参与一个或多个聊天室"
 
-#: gajim/roster_window.py:2252 gajim/roster_window.py:3506
+#: gajim/roster_window.py:2249 gajim/roster_window.py:3462
 #, fuzzy
 msgid ""
-"Changing your status to invisible will result in disconnection from those "
-"group chats.\n"
+"Changing your status to invisible will result in you leaving those group "
+"chats.\n"
 "Are you sure you want to go invisible?"
 msgstr "隐身将使您从这些聊天室中断开。确定要隐身?"
 
-#: gajim/roster_window.py:2257 gajim/roster_window.py:3512
-#: gajim/roster_window.py:5238 gajim/data/gui/gc_control_popup_menu.ui:120
+#: gajim/roster_window.py:2254 gajim/roster_window.py:3468
+#: gajim/data/gui/gc_control_popup_menu.ui:120
 msgid "_Disconnect"
 msgstr "断开连接(_D)"
 
-#: gajim/roster_window.py:2285
+#: gajim/roster_window.py:2282
 #, fuzzy
 msgid "desynced"
 msgstr "未同步"
 
-#: gajim/roster_window.py:2353 gajim/data/gui/shortcuts_window.ui:224
+#: gajim/roster_window.py:2350 gajim/data/gui/shortcuts_window.ui:224
 #, fuzzy
 msgid "Quit Gajim"
 msgstr "Gajim"
 
-#: gajim/roster_window.py:2354
+#: gajim/roster_window.py:2351
 #, fuzzy
 msgid "You are about to quit Gajim"
 msgstr "您确定您要退出 Gajim 吗?"
 
-#: gajim/roster_window.py:2355
+#: gajim/roster_window.py:2352
 msgid "Are you sure you want to quit Gajim?"
 msgstr "您确定您要退出 Gajim 吗?"
 
-#: gajim/roster_window.py:2356
+#: gajim/roster_window.py:2353
 #, fuzzy
 msgid "_Always quit when closing Gajim"
 msgstr "总是关闭 Gajim"
 
-#: gajim/roster_window.py:2359 gajim/roster_window.py:2455
-#: gajim/roster_window.py:2495 gajim/data/gui/systray_context_menu.ui:90
+#: gajim/roster_window.py:2356 gajim/roster_window.py:2452
+#: gajim/roster_window.py:2492 gajim/data/gui/systray_context_menu.ui:83
 msgid "_Quit"
 msgstr ""
 
-#: gajim/roster_window.py:2448
+#: gajim/roster_window.py:2445
 #, fuzzy
 msgid "Stop File Transfers"
 msgstr "文件传输"
 
-#: gajim/roster_window.py:2449
+#: gajim/roster_window.py:2446
 #, fuzzy
 msgid "You still have running file transfers"
 msgstr "您有正在传输的文件"
 
-#: gajim/roster_window.py:2450
+#: gajim/roster_window.py:2447
 #, fuzzy
 msgid ""
 "If you quit now, the file(s) being transferred will be lost.\n"
 "Do you still want to quit?"
 msgstr "如果现在退出, 正在传输的文件会停止传输。您仍然要退出吗?"
 
-#: gajim/roster_window.py:2488
+#: gajim/roster_window.py:2485
 #, fuzzy
 msgid "Unread Messages"
 msgstr "未读取的事件"
 
-#: gajim/roster_window.py:2489
+#: gajim/roster_window.py:2486
 #, fuzzy
 msgid "You still have unread messages"
 msgstr "您有未读消息"
 
-#: gajim/roster_window.py:2490
+#: gajim/roster_window.py:2487
 #, fuzzy
 msgid ""
 "Messages will only be available for reading them later if storing chat "
@@ -1447,31 +1420,31 @@ msgstr ""
 "除非您启用了历史记录而且向您发送消息的联系人在您的联系人列表中，您才能在以后"
 "读到这些消息。"
 
-#: gajim/roster_window.py:2760
+#: gajim/roster_window.py:2753
 msgid "You have unread messages"
 msgstr "您有未读消息"
 
-#: gajim/roster_window.py:2761
+#: gajim/roster_window.py:2754
 msgid "You must read them before removing this transport."
 msgstr "在移除代理之前您必须阅读它们。"
 
-#: gajim/roster_window.py:2764
+#: gajim/roster_window.py:2757
 #, fuzzy, python-format
 msgid "Transport '%s' will be removed"
 msgstr "代理\"%s\"将被移除"
 
-#: gajim/roster_window.py:2765
+#: gajim/roster_window.py:2758
 #, fuzzy
 msgid ""
 "You will no longer be able to send and receive messages from and to contacts "
 "using this transport."
 msgstr "您将无法再和使用这个代理的联系人收发消息。"
 
-#: gajim/roster_window.py:2768
+#: gajim/roster_window.py:2761
 msgid "Transports will be removed"
 msgstr "代理将被移除"
 
-#: gajim/roster_window.py:2773
+#: gajim/roster_window.py:2766
 #, fuzzy, python-format
 msgid ""
 "You will no longer be able to send and receive messages from and to contacts "
@@ -1479,107 +1452,102 @@ msgid ""
 "%s"
 msgstr "您将无法再和使用这个代理的联系人收发消息。"
 
-#: gajim/roster_window.py:2777
+#: gajim/roster_window.py:2770
 #, fuzzy
 msgid "Remove Transport"
 msgstr "显示代理(_P)"
 
-#: gajim/roster_window.py:2844
+#: gajim/roster_window.py:2837
 #, fuzzy
 msgid "Block Contact"
 msgstr "被屏蔽的联系人"
 
-#: gajim/roster_window.py:2845
+#: gajim/roster_window.py:2838
 #, fuzzy
 msgid "Really block this contact?"
 msgstr "是否为此联系人使用 OpenPGP?"
 
-#: gajim/roster_window.py:2846
+#: gajim/roster_window.py:2839
 #, fuzzy
 msgid ""
 "This contact will see you offline and you will not receive any messages sent "
 "to you by this contact."
 msgstr "这个联系人将看到您离线并且您不会在收到他发送给您的消息。"
 
-#: gajim/roster_window.py:2851
+#: gajim/roster_window.py:2844
 #, fuzzy
 msgid "_Block Contact"
 msgstr "被屏蔽的联系人"
 
-#: gajim/roster_window.py:2896
+#: gajim/roster_window.py:2889
 msgid "Rename Contact"
 msgstr "重命名联系人"
 
-#: gajim/roster_window.py:2897
+#: gajim/roster_window.py:2890
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "为联系人 %s 输入新的昵称"
 
-#: gajim/roster_window.py:2904
+#: gajim/roster_window.py:2897
 msgid "Rename Group"
 msgstr "重命名群组"
 
-#: gajim/roster_window.py:2905
+#: gajim/roster_window.py:2898
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "为群组 %s 输入新的名称"
 
-#: gajim/roster_window.py:2953 gajim/roster_window.py:2954
+#: gajim/roster_window.py:2946 gajim/roster_window.py:2947
 msgid "Remove Group"
 msgstr "移除群组"
 
-#: gajim/roster_window.py:2955
+#: gajim/roster_window.py:2948
 #, fuzzy, python-format
 msgid "Do you want to remove %s from the contact list?"
 msgstr "您想从联系人列表中删除组 %s ?"
 
-#: gajim/roster_window.py:2956
+#: gajim/roster_window.py:2949
 #, fuzzy
 msgid "_Also remove all contacts of this group from contact list"
 msgstr "同时从联系人列表删除这个群组的所有联系人"
 
-#: gajim/roster_window.py:3044
-#, python-format
-msgid "%(jid)s has been invited in this room"
-msgstr "%(jid)s 已经被邀请加入该聊天室"
-
-#: gajim/roster_window.py:3353
+#: gajim/roster_window.py:3309
 #, fuzzy
 msgid "Remove Contact"
 msgstr "重命名联系人"
 
-#: gajim/roster_window.py:3354
+#: gajim/roster_window.py:3310
 #, fuzzy
 msgid "Remove contact from contact list"
 msgstr "从联系人列表删除联系人"
 
-#: gajim/roster_window.py:3355
+#: gajim/roster_window.py:3311
 #, 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:3364 gajim/roster_window.py:3384
+#: gajim/roster_window.py:3320 gajim/roster_window.py:3340
 #, fuzzy
 msgid ""
 "By removing this contact you also remove authorization. This means the "
 "contact will see you as offline."
 msgstr "删除此联系人的同时将删除认证，这将导致对方一直看到您为离线。"
 
-#: gajim/roster_window.py:3375
+#: gajim/roster_window.py:3331
 msgid "Do you want to continue?"
 msgstr "您要继续吗?"
 
-#: gajim/roster_window.py:3386
+#: gajim/roster_window.py:3342
 #, fuzzy
 msgid "_I want this contact to know my status after removal"
 msgstr "我想让此联系人在被移除之后仍然知道我的状态"
 
-#: gajim/roster_window.py:3393
+#: gajim/roster_window.py:3349
 #, fuzzy
 msgid "Remove contacts from contact list"
 msgstr "从联系人列表删除联系人"
 
-#: gajim/roster_window.py:3399
+#: gajim/roster_window.py:3355
 #, fuzzy, python-format
 msgid ""
 "By removing the following contacts, you will also remove authorization. This "
@@ -1588,24 +1556,24 @@ msgid ""
 "%s"
 msgstr "删除此联系人的同时将删除认证，这将导致对方一直看到您为离线。"
 
-#: gajim/roster_window.py:3403
+#: gajim/roster_window.py:3359
 #, fuzzy
 msgid "Remove Contacts"
 msgstr "重命名联系人"
 
-#: gajim/roster_window.py:3423
+#: gajim/roster_window.py:3379
 msgid "No account available"
 msgstr "没有有效账户"
 
-#: gajim/roster_window.py:3424
+#: gajim/roster_window.py:3380
 msgid "You must create an account before you can chat with other contacts."
 msgstr "您必须在与他人聊天前新建账户。"
 
-#: gajim/roster_window.py:4060
+#: gajim/roster_window.py:4011
 msgid "Metacontacts storage not supported by your server"
 msgstr "您的服务器不支持存储元联系人信息"
 
-#: gajim/roster_window.py:4062
+#: gajim/roster_window.py:4013
 #, fuzzy
 msgid ""
 "Your server does not support storing metacontacts information. So this "
@@ -1613,12 +1581,12 @@ msgid ""
 msgstr ""
 "您的服务器不支持存储元联系人信息。所以这些信息在下次重新连接时不会被保存。"
 
-#: gajim/roster_window.py:4159
+#: gajim/roster_window.py:4110
 #, fuzzy
 msgid "You are about to create a metacontact"
 msgstr "您在创建一个元联系人。确定继续?"
 
-#: gajim/roster_window.py:4160
+#: gajim/roster_window.py:4111
 #, fuzzy
 msgid ""
 "Metacontacts are a way to regroup several contacts in one single contact. "
@@ -1628,121 +1596,112 @@ msgstr ""
 "元联系人是将几个联系人组合起来显示在同一行。通常在某个人有几个XMPP 账户或代理"
 "账户时用到。"
 
-#: gajim/roster_window.py:4164
+#: gajim/roster_window.py:4115
 #, fuzzy
 msgid "Create Metacontact"
 msgstr "重命名联系人"
 
-#: gajim/roster_window.py:4170
+#: gajim/roster_window.py:4121 gajim/data/gui/groupchat_creation.ui:317
 #, fuzzy
 msgid "_Create"
 msgstr "创造"
 
-#: gajim/roster_window.py:4287
+#: gajim/roster_window.py:4238
 msgid "Invalid file URI:"
 msgstr "无效的文件地址: "
 
-#: gajim/roster_window.py:4298
+#: gajim/roster_window.py:4249
 #, fuzzy
 msgid "Send file?"
 msgstr "发送文件(_F)"
 
-#: gajim/roster_window.py:4299
+#: gajim/roster_window.py:4250
 #, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
 msgstr[0] "您想要将文件发送给 %s 吗: "
 
-#: gajim/roster_window.py:4451
+#: gajim/roster_window.py:4401
 #, fuzzy, python-format
 msgid "Send %(from)s to %(to)s"
 msgstr "发送 %s 给 %s"
 
-#: gajim/roster_window.py:4464
+#: gajim/roster_window.py:4414
 #, python-format
 msgid "Make %s first contact"
 msgstr "将 %s 设为第一联系人"
 
-#: gajim/roster_window.py:4469
+#: gajim/roster_window.py:4419
 #, python-format
 msgid "Make %(contact1)s and %(contact2)s metacontacts"
 msgstr "使用 %(contact1)s 与 %(contact2)s 创建元联系人"
 
-#: gajim/roster_window.py:4825 gajim/roster_window.py:4923
+#: gajim/roster_window.py:4775 gajim/roster_window.py:4862
 msgid "_Change Status Message"
 msgstr "更改状态信息(_C)"
 
-#: gajim/roster_window.py:4845
+#: gajim/roster_window.py:4795
 msgid "Publish Tune"
 msgstr "发布音乐"
 
-#: gajim/roster_window.py:4856
+#: gajim/roster_window.py:4806
 msgid "Publish Location"
 msgstr "发布位置信息"
 
-#: gajim/roster_window.py:4868
-#, fuzzy
-msgid "Configure Services…"
-msgstr "配置服务..."
-
-#: gajim/roster_window.py:4997
+#: gajim/roster_window.py:4936
 msgid "_Maximize All"
 msgstr "最大化全部(_M)"
 
-#: gajim/roster_window.py:5004 gajim/roster_window.py:5146
+#: gajim/roster_window.py:4943 gajim/roster_window.py:5085
 msgid "Send Group M_essage"
 msgstr "发送群组消息(_E)"
 
-#: gajim/roster_window.py:5011
+#: gajim/roster_window.py:4950
 msgid "To all users"
 msgstr "向所有的用户"
 
-#: gajim/roster_window.py:5015
+#: gajim/roster_window.py:4954
 msgid "To all online users"
 msgstr "向所有在线用户"
 
-#: gajim/roster_window.py:5027 gajim/roster_window.py:5152
+#: gajim/roster_window.py:4966 gajim/roster_window.py:5091
 #: gajim/data/gui/gc_occupants_menu.ui:110
 #: gajim/data/gui/contact_context_menu.ui:36
 msgid "In_vite to"
 msgstr "邀请到(_V)"
 
-#: gajim/roster_window.py:5162
+#: gajim/roster_window.py:5101
 msgid "_Manage Contacts"
 msgstr "管理联系人(_M)"
 
-#: gajim/roster_window.py:5168
+#: gajim/roster_window.py:5107
 msgid "Edit _Groups…"
 msgstr "编辑群组(_G)…"
 
-#: gajim/roster_window.py:5189 gajim/data/gui/filetransfers.ui:12
+#: gajim/roster_window.py:5128 gajim/data/gui/filetransfers.ui:12
 #: gajim/data/gui/remove_account_window.ui:134
 msgid "_Remove"
 msgstr "移除(_R)"
 
-#: gajim/roster_window.py:5226
+#: gajim/roster_window.py:5165
 msgid "_Maximize"
 msgstr "最大化(_M)"
 
-#: gajim/roster_window.py:5233
+#: gajim/roster_window.py:5172
 msgid "_Reconnect"
 msgstr "重新连接(_R)"
 
-#: gajim/roster_window.py:5254 gajim/data/gui/gc_occupants_menu.ui:170
+#: gajim/roster_window.py:5193 gajim/data/gui/gc_occupants_menu.ui:170
 #: gajim/data/gui/gc_control_popup_menu.ui:113
 #: gajim/data/gui/contact_context_menu.ui:205
 msgid "_History"
 msgstr "历史(_H)"
 
-#: gajim/roster_window.py:5335 gajim/data/gui/application_menu.ui:86
+#: gajim/roster_window.py:5274 gajim/data/gui/application_menu.ui:83
 #: gajim/data/gui/history_window.ui:57
 msgid "History Manager"
 msgstr "历史记录管理器"
 
-#: gajim/roster_window.py:5343
-msgid "_Join New Group Chat"
-msgstr "加入新的聊天室(_J)"
-
 #: gajim/dataforms_widget.py:585
 msgid "Unable to load image"
 msgstr "无法载入图像"
@@ -1863,252 +1822,270 @@ msgstr "主题: %s\n"
 msgid "Write a message…"
 msgstr "收到一条消息"
 
-#: gajim/message_window.py:250
+#: gajim/message_window.py:356
+#, fuzzy
+msgid "Close Tabs"
+msgstr "发送并关闭(_S)"
+
+#: gajim/message_window.py:357
 msgid "You are going to close several tabs"
 msgstr "您将要关闭多个标签"
 
-#: gajim/message_window.py:251
+#: gajim/message_window.py:358
 msgid "Do you really want to close them all?"
 msgstr "您确定要关闭所有这些吗"
 
-#: gajim/message_window.py:539
+#: gajim/message_window.py:514
 msgid "?Noun:Chats"
 msgstr "?Noun:聊天"
 
-#: gajim/message_window.py:543
+#: gajim/message_window.py:518
 #, fuzzy
 msgid "Group Chats"
 msgstr "聊天室"
 
-#: gajim/message_window.py:547
+#: gajim/message_window.py:522
 msgid "Private Chats"
 msgstr "私聊"
 
-#: gajim/message_window.py:553
+#: gajim/message_window.py:528
 msgid "Messages"
 msgstr "消息"
 
-#: gajim/gui_interface.py:173
+#: gajim/gui_interface.py:170
+#, 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:175
 msgid "Do you accept this request?"
 msgstr "是否接受这个请求?"
 
-#: gajim/gui_interface.py:175
-#, python-format
-msgid "Do you accept this request on account %s?"
+#: gajim/gui_interface.py:177
+#, fuzzy, python-format
+msgid "Do you accept this request (account: %s)?"
 msgstr "是否接受这个对账户 %s 的请求?"
 
-#: gajim/gui_interface.py:178
-#, 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:182
+#, fuzzy
+msgid "Authorization"
+msgstr "授权发送成功"
+
+#: gajim/gui_interface.py:186 gajim/gui_interface.py:420
+#: gajim/gtk/filetransfer.py:338
+#, fuzzy
+msgid "_No"
+msgstr "No"
 
-#: gajim/gui_interface.py:194 gajim/gtk/notification.py:175
+#: gajim/gui_interface.py:205 gajim/gtk/notification.py:175
 #: gajim/gtk/notification.py:197
 msgid "Connection Failed"
 msgstr "连接失败"
 
-#: gajim/gui_interface.py:279 gajim/gui_interface.py:529
-msgid "Password Required"
-msgstr "需要密码"
-
-#: gajim/gui_interface.py:280
-#, python-format
-msgid "A Password is required to join the room %s. Please type it."
-msgstr "需要密码才能加入聊天室 %s。请输入一个密码。"
-
-#: gajim/gui_interface.py:342 gajim/gui_interface.py:346
+#: gajim/gui_interface.py:325 gajim/gui_interface.py:329
 #, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr "错误 %(code)s: %(msg)s"
 
-#: gajim/gui_interface.py:357 gajim/gui_interface.py:376
+#: gajim/gui_interface.py:340 gajim/gui_interface.py:359
 #: gajim/common/modules/message.py:122
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "发送 %(message)s 时出现错误( %(error)s )"
 
-#: gajim/gui_interface.py:401 gajim/gtk/notification.py:175
+#: gajim/gui_interface.py:384 gajim/gtk/notification.py:175
 msgid "Subscription request"
 msgstr "认证请求"
 
-#: gajim/gui_interface.py:413 gajim/common/contacts.py:184
-#: gajim/common/helpers.py:83
+#: gajim/gui_interface.py:396 gajim/common/contacts.py:200
+#: gajim/common/helpers.py:86
 msgid "Observers"
 msgstr "旁观者"
 
-#: gajim/gui_interface.py:422
+#: gajim/gui_interface.py:405
 msgid "Authorization accepted"
 msgstr "授权被接受"
 
-#: gajim/gui_interface.py:423
+#: gajim/gui_interface.py:406
 #, fuzzy, python-format
 msgid "The contact \"%s\" has authorized you to see their status."
 msgstr "联系人\"%s\"已授权您查看他/她的状态。"
 
-#: gajim/gui_interface.py:431
-#, python-format
-msgid "Contact \"%s\" removed subscription from you"
+#: gajim/gui_interface.py:415
+#, fuzzy
+msgid "Subscription Removed"
+msgstr "认证请求"
+
+#: gajim/gui_interface.py:416
+#, fuzzy, python-format
+msgid "Contact '%s' removed subscription from you"
 msgstr "联系人\"%s\"移除了对您的关注"
 
-#: gajim/gui_interface.py:432
+#: gajim/gui_interface.py:417
+#, fuzzy
 msgid ""
-"You will always see them as offline.\n"
+"You will always see this contact as offline.\n"
 "Do you want to remove them from your contact list?"
 msgstr ""
 "您将一直看到对方处于离线状态。\n"
 "要将对方从您的联系人列表中移除吗?"
 
-#: gajim/gui_interface.py:453 gajim/gtk/notification.py:176
+#: gajim/gui_interface.py:442 gajim/gtk/notification.py:176
 msgid "Unsubscribed"
 msgstr "已取消认证的"
 
-#: gajim/gui_interface.py:465
+#: gajim/gui_interface.py:454
 #, python-format
 msgid "%(jid)s declined the invitation: %(reason)s"
 msgstr ""
 
-#: gajim/gui_interface.py:469
+#: gajim/gui_interface.py:458
 #, python-format
 msgid "%(jid)s declined the invitation"
 msgstr ""
 
-#: gajim/gui_interface.py:485
+#: gajim/gui_interface.py:474
 #, python-brace-format
 msgid "You are invited to {room} by {user}"
 msgstr "您被 {user}邀请到聊天室 {room}"
 
-#: gajim/gui_interface.py:506
+#: gajim/gui_interface.py:495
 #, fuzzy
 msgid "Certificate Passphrase Required"
 msgstr "证书已过期"
 
-#: gajim/gui_interface.py:507
+#: gajim/gui_interface.py:496
 #, python-format
 msgid "Enter the certificate passphrase for account %s"
 msgstr "输入账户 %s 的证书密码。"
 
-#: gajim/gui_interface.py:516 gajim/gtk/accounts.py:963
+#: gajim/gui_interface.py:505 gajim/gtk/accounts.py:966
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "输入帐户 %s 的密码"
 
-#: gajim/gui_interface.py:529 gajim/gtk/accounts.py:964
+#: gajim/gui_interface.py:518
+msgid "Password Required"
+msgstr "需要密码"
+
+#: gajim/gui_interface.py:518 gajim/gtk/accounts.py:967
 msgid "Save password"
 msgstr "保存密码"
 
-#: gajim/gui_interface.py:601 gajim/gui_interface.py:632
+#: gajim/gui_interface.py:587 gajim/gui_interface.py:618
+#: gajim/gtk/filetransfer.py:332 gajim/gtk/filetransfer.py:333
 #: gajim/gtk/notification.py:173 gajim/gtk/notification.py:276
 msgid "File Transfer Error"
 msgstr "文件传输错误"
 
-#: gajim/gui_interface.py:666
+#: gajim/gui_interface.py:652
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s 想发送给您一个文件。"
 
-#: gajim/gui_interface.py:668 gajim/gtk/filetransfer.py:479
+#: gajim/gui_interface.py:654 gajim/gtk/filetransfer.py:484
 #: gajim/gtk/notification.py:172 gajim/gtk/notification.py:274
 msgid "File Transfer Request"
 msgstr "文件传输请求"
 
-#: gajim/gui_interface.py:767
+#: gajim/gui_interface.py:753
 #, fuzzy
 msgid "Remote Contact Stopped Transfer"
 msgstr "远程联系人停止了传输"
 
-#: gajim/gui_interface.py:772
+#: gajim/gui_interface.py:758
 #, fuzzy
 msgid "Error Opening File"
 msgstr "打开文件错误"
 
-#: gajim/gui_interface.py:782
+#: gajim/gui_interface.py:768
 #, fuzzy
 msgid "SSL Certificate Error"
 msgstr "SSL证书错误"
 
-#: gajim/gui_interface.py:795 gajim/gui_interface.py:826
-#: gajim/gui_interface.py:853 gajim/gtk/notification.py:174
+#: gajim/gui_interface.py:781 gajim/gui_interface.py:812
+#: gajim/gui_interface.py:839 gajim/gtk/notification.py:174
 #: gajim/gtk/notification.py:279
 msgid "File Transfer Stopped"
 msgstr "文件传输已停止"
 
-#: gajim/gui_interface.py:799
+#: gajim/gui_interface.py:785
 #, fuzzy
 msgid "File Transfer Failed"
 msgstr "文件传输完毕"
 
-#: gajim/gui_interface.py:822
+#: gajim/gui_interface.py:808
 #, fuzzy, python-format
 msgid "%(filename)s received from %(name)s."
 msgstr "从 %(name)s 传输的文件 %(filename)s 被停止。"
 
-#: gajim/gui_interface.py:827
+#: gajim/gui_interface.py:813
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "从 %(name)s 传输的文件 %(filename)s 被停止。"
 
-#: gajim/gui_interface.py:833
+#: gajim/gui_interface.py:819
 #, fuzzy, python-format
 msgid "File transfer of %(filename)s from %(name)s failed."
 msgstr "从 %(name)s 传输的文件 %(filename)s 被停止。"
 
-#: gajim/gui_interface.py:848
+#: gajim/gui_interface.py:834
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "您成功的给 %(name)s 发送了文件 %(filename)s。"
 
-#: gajim/gui_interface.py:854
+#: gajim/gui_interface.py:840
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "到 %(name)s 的文件传输 %(filename)s 被停止。"
 
-#: gajim/gui_interface.py:860
+#: gajim/gui_interface.py:846
 #, fuzzy, python-format
 msgid "File transfer of %(filename)s to %(name)s failed."
 msgstr "到 %(name)s 的文件传输 %(filename)s 被停止。"
 
-#: gajim/gui_interface.py:971
+#: gajim/gui_interface.py:957
 msgid "Username Conflict"
 msgstr "用户名冲突"
 
-#: gajim/gui_interface.py:972
+#: gajim/gui_interface.py:958
 msgid "Please type a new username for your local account"
 msgstr "请在您本地账户填写新的用户名"
 
-#: gajim/gui_interface.py:995
+#: gajim/gui_interface.py:981
 msgid "Resource Conflict"
 msgstr "资源冲突"
 
-#: gajim/gui_interface.py:996
+#: gajim/gui_interface.py:982
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
 msgstr "您已经用同一个资源连接到这个账户了。请输入一个新的资源"
 
-#: gajim/gui_interface.py:1053
+#: gajim/gui_interface.py:1039
 #, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s 想要发起语音聊天。"
 
-#: gajim/gui_interface.py:1055
+#: gajim/gui_interface.py:1041
 msgid "Voice Chat Request"
 msgstr "语音聊天请求"
 
-#: gajim/gui_interface.py:1123 gajim/gtk/account_wizard.py:312
+#: gajim/gui_interface.py:1109 gajim/gtk/account_wizard.py:312
 msgid "Certificate Already in File"
 msgstr "证书已经在文件中"
 
-#: gajim/gui_interface.py:1124 gajim/gtk/account_wizard.py:313
+#: gajim/gui_interface.py:1110 gajim/gtk/account_wizard.py:313
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr "证书已经在文件 %s 中, 所以它没有被再次添加。"
 
-#: gajim/gui_interface.py:1145
+#: gajim/gui_interface.py:1131
 #, fuzzy, python-format
 msgid "The authenticity of the %s certificate could be invalid"
 msgstr "%s 证书的认证可能是无效的"
 
-#: gajim/gui_interface.py:1148
+#: gajim/gui_interface.py:1134
 #, python-format
 msgid ""
 "\n"
@@ -2117,7 +2094,7 @@ msgstr ""
 "\n"
 "未知 SSL 错误: %d"
 
-#: gajim/gui_interface.py:1150
+#: gajim/gui_interface.py:1136
 #, python-format
 msgid ""
 "\n"
@@ -2126,11 +2103,11 @@ msgstr ""
 "\n"
 "SSL 错误: <b>%s</b>"
 
-#: gajim/gui_interface.py:1155
+#: gajim/gui_interface.py:1141
 msgid "Error verifying SSL certificate"
 msgstr "验证 SSL 证书出错"
 
-#: gajim/gui_interface.py:1156
+#: gajim/gui_interface.py:1142
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your XMPP server: "
@@ -2140,7 +2117,7 @@ msgstr ""
 "在验证您的XMPP服务器的SSL证书时出错: %(error)s\n"
 "您仍然想要连接这个服务器吗?"
 
-#: gajim/gui_interface.py:1160 gajim/gtk/account_wizard.py:412
+#: gajim/gui_interface.py:1146 gajim/gtk/account_wizard.py:413
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -2155,181 +2132,172 @@ msgstr ""
 "此证书的 SHA-256指纹信息:\n"
 "%(sha256)s"
 
-#: gajim/gui_interface.py:1166
+#: gajim/gui_interface.py:1152
 msgid "Ignore this error for this certificate."
 msgstr "忽略这个证书的这个错误。"
 
-#: gajim/gui_interface.py:1174
+#: gajim/gui_interface.py:1160
 #, python-format
 msgid "SSL Certificate Verification for %s"
 msgstr "%s 的SSL证书验证"
 
-#: gajim/gui_interface.py:1442 gajim/gtk/join_groupchat.py:235
-msgid "You can not join a group chat unless you are connected."
-msgstr "您必须连接才能加入聊天室。"
-
-#: gajim/gui_interface.py:1448
-#, fuzzy
-msgid "JID is not a Groupchat"
-msgstr "这不是一个聊天室"
-
-#: gajim/gui_interface.py:1579
-msgid "This is not a group chat"
-msgstr "这不是一个聊天室"
-
-#: gajim/gui_interface.py:1580
-#, python-format
-msgid ""
-"%(room_jid)s is already in your roster. Please check if %(room_jid)s is a "
-"correct group chat name. If it is, delete it from your roster and try "
-"joining the group chat again."
-msgstr ""
-
-#: gajim/gui_interface.py:1604 gajim/dialog_messages.py:58
+#: gajim/gui_interface.py:1577
 msgid "You cannot join a group chat while you are invisible"
 msgstr "隐身时无法加入聊天室"
 
-#: gajim/gui_interface.py:2037
+#: gajim/gui_interface.py:1976
 msgid "Could not save your settings and preferences"
 msgstr "无法保存您的设置。"
 
-#: gajim/gui_interface.py:2098
+#: gajim/gui_interface.py:2037
 msgid "Gajim: IPython Console"
 msgstr ""
 
-#: gajim/dialog_messages.py:32
+#: gajim/dialog_messages.py:31 gajim/dialog_messages.py:36
+#: gajim/gtk/single_message.py:305 gajim/gtk/account_wizard.py:229
 #, fuzzy
-msgid "You can not start a new conversation unless you are connected."
-msgstr "您必须连接才能加入聊天室。"
-
-#: gajim/dialog_messages.py:36 gajim/dialog_messages.py:41
-#: gajim/gtk/single_message.py:305 gajim/gtk/join_groupchat.py:211
-#: gajim/gtk/account_wizard.py:229
-msgid "Invalid JID"
-msgstr "无效的 JID"
+msgid "Invalid XMPP Address"
+msgstr "无效文件"
 
-#: gajim/dialog_messages.py:42 gajim/gtk/single_message.py:306
-#, python-format
-msgid "It is not possible to send a message to %s, this JID is not valid."
+#: gajim/dialog_messages.py:37
+#, fuzzy, python-format
+msgid ""
+"It is not possible to send a message to %s. This XMPP Address is not valid."
 msgstr "不能向 %s 发送消息, 无效的 JID。"
 
-#: gajim/dialog_messages.py:47
-msgid "Unread events"
+#: gajim/dialog_messages.py:42
+#, fuzzy
+msgid "Unread Events"
 msgstr "未读取的事件"
 
-#: gajim/dialog_messages.py:48
-msgid "Read all pending events before removing this account."
+#: gajim/dialog_messages.py:43
+#, fuzzy
+msgid "Read or acknowledge all pending events before removing this account."
 msgstr "移除账户前请阅读所有未处理事件。"
 
-#: gajim/dialog_messages.py:52
+#: gajim/dialog_messages.py:48
 msgid "Invalid Form"
 msgstr "不合法的格式"
 
-#: gajim/dialog_messages.py:53
+#: gajim/dialog_messages.py:49
 msgid "The form is not filled correctly."
 msgstr "表格没有被正确得填写。"
 
-#: gajim/dialog_messages.py:57 gajim/common/helpers.py:309
+#: gajim/dialog_messages.py:53 gajim/common/helpers.py:315
 msgid "Invisible"
 msgstr "隐身"
 
-#: gajim/dialog_messages.py:62
-msgid "A connection is not available"
+#: gajim/dialog_messages.py:54
+#, fuzzy
+msgid "You cannot join a group chat while being invisible."
+msgstr "隐身时无法加入聊天室"
+
+#: gajim/dialog_messages.py:58
+#, fuzzy
+msgid "No Connection Available"
 msgstr "连接不可用"
 
-#: gajim/dialog_messages.py:63
+#: gajim/dialog_messages.py:59
 msgid "Your message can not be sent until you are connected."
 msgstr "连接之后您的消息才能发送"
 
-#: gajim/dialog_messages.py:67
-#, fuzzy
-msgid "JID already in list"
-msgstr "Jabber ID 已经在列表中了"
+#: gajim/dialog_messages.py:63
+msgid "XMPP Address Already in List"
+msgstr ""
 
-#: gajim/dialog_messages.py:68
+#: gajim/dialog_messages.py:64
 #, fuzzy
-msgid "The JID you entered is already in the list. Choose another one."
+msgid ""
+"The XMPP Address you entered is already in the list. Please choose another "
+"one."
 msgstr "您输入的 Jabber ID 已经在列表中了。请选择另外一个。"
 
-#: gajim/dialog_messages.py:72
-msgid "Invalid answer"
+#: gajim/dialog_messages.py:69
+#, fuzzy
+msgid "Invalid Answer"
 msgstr "答案错误"
 
-#: gajim/dialog_messages.py:73
+#: gajim/dialog_messages.py:70
 #, python-format
 msgid "Transport %(name)s answered wrongly to register request: %(error)s"
 msgstr "服务代理 %(name)s 对注册请求的响应有误: %(error)s"
 
-#: gajim/dialog_messages.py:78
+#: gajim/dialog_messages.py:75
 #, fuzzy
 msgid "Wrong Custom Hostname"
 msgstr "使用自定义的主机名/端口"
 
-#: gajim/dialog_messages.py:79
-#, python-format
-msgid "Wrong custom hostname \"%s\". Ignoring it."
+#: gajim/dialog_messages.py:76
+#, fuzzy, python-format
+msgid "Custom hostname \"%s\" is wrong. It will be ignored."
 msgstr "错误的自定义主机名 \"%s\".正在忽略它."
 
-#: gajim/dialog_messages.py:83
-msgid "Error while removing privacy list"
+#: gajim/dialog_messages.py:80
+#, fuzzy
+msgid "Error While Removing Privacy List"
 msgstr "移除隐私策略列表时出错"
 
-#: gajim/dialog_messages.py:84
-#, python-format
+#: gajim/dialog_messages.py:81
+#, fuzzy, python-format
 msgid ""
-"Privacy list %s has not been removed. It is maybe active in one of your "
-"connected resources. Deactivate it and try again."
+"Privacy list %s has not been removed. It is probably active in one of your "
+"connected resources. Please deactivate it and try again."
 msgstr ""
 "隐私策略列表 %s 还没有被移除。它可能在您的某个连接的资源中是活动的。禁用它然"
 "后重试。"
 
-#: gajim/dialog_messages.py:90
-msgid "Invisibility not supported"
+#: gajim/dialog_messages.py:87
+#, fuzzy
+msgid "Invisibility Not Supported"
 msgstr "不支持隐身"
 
-#: gajim/dialog_messages.py:91
-#, python-format
-msgid "Account %s doesn't support invisibility."
+#: gajim/dialog_messages.py:88
+#, fuzzy, python-format
+msgid "This account %s doesn't support invisibility."
 msgstr "账户 %s 不支持隐身"
 
-#: gajim/dialog_messages.py:95
-msgid "Unregister failed"
+#: gajim/dialog_messages.py:92
+#, fuzzy
+msgid "Unregister Failed"
 msgstr "移除注册失败"
 
-#: gajim/dialog_messages.py:96
-#, python-format
-msgid "Unregistration with server %(server)s failed: %(error)s"
+#: gajim/dialog_messages.py:93
+#, fuzzy, python-format
+msgid "Unregistration on server %(server)s failed: %(error)s"
 msgstr "在服务器上 %(server)s 移除注册失败: %(error)s"
 
-#: gajim/dialog_messages.py:100
-msgid "Registration succeeded"
+#: gajim/dialog_messages.py:97
+#, fuzzy
+msgid "Registration Succeeded"
 msgstr "注册成功"
 
-#: gajim/dialog_messages.py:101
-#, python-format
-msgid "Registration with agent %s succeeded"
+#: gajim/dialog_messages.py:98
+#, fuzzy, python-format
+msgid "Registration with agent %s succeeded."
 msgstr "注册成功, agent %s"
 
-#: gajim/dialog_messages.py:105 gajim/gtk/service_registration.py:215
-msgid "Registration failed"
+#: gajim/dialog_messages.py:102
+#, fuzzy
+msgid "Registration Failed"
 msgstr "注册失败"
 
-#: gajim/dialog_messages.py:106
+#: gajim/dialog_messages.py:103
 #, python-format
 msgid ""
 "Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
 msgstr "注册失败, agent %(agent)s, 错误 %(error)s: %(error_msg)s"
 
-#: gajim/dialog_messages.py:111
+#: gajim/dialog_messages.py:108
 #, fuzzy
 msgid "Unable to Join Group Chat"
 msgstr "无法加入聊天室"
 
-#: gajim/dialog_messages.py:116
-msgid "GStreamer error"
+#: gajim/dialog_messages.py:113
+#, fuzzy
+msgid "GStreamer Error"
 msgstr "GStreamer 错误"
 
-#: gajim/dialog_messages.py:117
+#: gajim/dialog_messages.py:114
 #, fuzzy, python-format
 msgid ""
 "Error: %(error)s\n"
@@ -2338,20 +2306,21 @@ msgstr ""
 "错误: %s\n"
 "调试信息: %s"
 
-#: gajim/dialog_messages.py:121
+#: gajim/dialog_messages.py:118
 #, fuzzy
-msgid "Wrong host"
+msgid "Wrong Host"
 msgstr "错误的 uri"
 
-#: gajim/dialog_messages.py:122
+#: gajim/dialog_messages.py:119
 msgid "Invalid local address? :-O"
 msgstr ""
 
-#: gajim/dialog_messages.py:126
-msgid "Avahi error"
+#: gajim/dialog_messages.py:123
+#, fuzzy
+msgid "Avahi Error"
 msgstr "Avahi 错误"
 
-#: gajim/dialog_messages.py:127
+#: gajim/dialog_messages.py:124
 #, python-format
 msgid ""
 "%s\n"
@@ -2360,66 +2329,66 @@ msgstr ""
 "%s\n"
 "Link-local 消息可能无法正常工作。"
 
-#: gajim/dialog_messages.py:131 gajim/dialog_messages.py:136
+#: gajim/dialog_messages.py:128 gajim/dialog_messages.py:133
 #, fuzzy
-msgid "Could not request upload slot"
+msgid "Could not request upload slot for HTTP File Upload"
 msgstr "无法启动本地服务"
 
-#: gajim/dialog_messages.py:137
-msgid "Got unexpected response from server (see log)"
+#: gajim/dialog_messages.py:134
+msgid "Got unexpected response from server (see log)."
 msgstr ""
 
-#: gajim/dialog_messages.py:141 gajim/dialog_messages.py:146
+#: gajim/dialog_messages.py:138 gajim/dialog_messages.py:143
 #, fuzzy
-msgid "Could not open file"
+msgid "Could not Open File"
 msgstr "无法读取图片"
 
-#: gajim/dialog_messages.py:142
-msgid "Exception raised while opening file (see log)"
+#: gajim/dialog_messages.py:139
+msgid "Exception raised while trying to open file (see log)."
 msgstr ""
 
-#: gajim/dialog_messages.py:151
-msgid "Unsecure"
-msgstr ""
+#: gajim/dialog_messages.py:148
+#, fuzzy
+msgid "Not Secure"
+msgstr "未开始"
 
-#: gajim/dialog_messages.py:152
+#: gajim/dialog_messages.py:149
 #, fuzzy
-msgid "Server returned unsecure transport (HTTP)"
+msgid "The server returned an insecure transport (HTTP)."
 msgstr "服务返回了一个错误。"
 
-#: gajim/dialog_messages.py:156
+#: gajim/dialog_messages.py:153
 #, fuzzy
-msgid "Could not upload file"
+msgid "Could not Upload File"
 msgstr "无法读取图片"
 
-#: gajim/dialog_messages.py:157
+#: gajim/dialog_messages.py:154
 #, python-format
 msgid "HTTP response code from server: %s"
 msgstr ""
 
-#: gajim/dialog_messages.py:161
+#: gajim/dialog_messages.py:158
 msgid "Upload Error"
 msgstr ""
 
-#: gajim/dialog_messages.py:166
+#: gajim/dialog_messages.py:163
 msgid "Encryption Error"
 msgstr ""
 
-#: gajim/dialog_messages.py:167
-#, fuzzy
-msgid "For the chosen encryption there is no encryption method available"
-msgstr "一个连接不可用"
+#: gajim/dialog_messages.py:164
+msgid "There is no encryption method available for the chosen encryption."
+msgstr ""
 
-#: gajim/dialog_messages.py:171
+#: gajim/dialog_messages.py:169
 #, fuzzy
-msgid "Avatar upload failed"
+msgid "Avatar Upload Failed"
 msgstr "vCard 发布失败"
 
-#: gajim/privatechat_control.py:204
+#: gajim/privatechat_control.py:207
 msgid "Sending private message failed"
 msgstr "发送私有消息失败"
 
-#: gajim/privatechat_control.py:206
+#: gajim/privatechat_control.py:209
 #, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr "您不再在聊天室\"%(room)s\"中或\"%(nick)s\"已离开。"
@@ -2442,7 +2411,7 @@ msgstr "为命令显示帮助"
 
 #: gajim/gajim_remote.py:85
 #, fuzzy
-msgid "Lists all contacts in roster, one for each line"
+msgid "Lists all contacts in the contact list, one for each line"
 msgstr "打印联系人列表中所有联系人。每个联系人一行。"
 
 #: gajim/gajim_remote.py:87 gajim/gajim_remote.py:102 gajim/gajim_remote.py:112
@@ -2520,11 +2489,13 @@ msgstr ""
 
 #: gajim/gajim_remote.py:118
 #, fuzzy
-msgid "Sends new chat message to a contact in the roster. Account is optional."
+msgid ""
+"Sends new chat message to a contact in the contact list. Account is optional."
 msgstr "向联系人发送文件"
 
 #: gajim/gajim_remote.py:120 gajim/gajim_remote.py:130
-msgid "JID of the contact that will receive the message"
+#, fuzzy
+msgid "XMPP Address of the contact that will receive the message"
 msgstr "联系人的JID将收到消息"
 
 #: gajim/gajim_remote.py:121 gajim/gajim_remote.py:132
@@ -2538,8 +2509,10 @@ msgid "if specified, the message will be sent using this account"
 msgstr "如指定, 消息将被用此账户发送"
 
 #: gajim/gajim_remote.py:127
-msgid "Sends a chat message to someone on your roster. Account is optional."
-msgstr ""
+#, fuzzy
+msgid ""
+"Sends a chat message to someone on your contact list. Account is optional."
+msgstr "向联系人发送文件"
 
 #: gajim/gajim_remote.py:131
 msgid "subject"
@@ -2550,11 +2523,13 @@ msgid "message subject"
 msgstr "消息主题"
 
 #: gajim/gajim_remote.py:138
-msgid "Sends new message to a groupchat you've joined."
+#, fuzzy
+msgid "Sends new message to a group chat you've joined."
 msgstr "向一个您加入的聊天室发送新消息。"
 
 #: gajim/gajim_remote.py:140
-msgid "JID of the room that will receive the message"
+#, fuzzy
+msgid "XMPP Address of the group chat that will receive the message"
 msgstr "要收到这条消息的聊天室的 JID"
 
 #: gajim/gajim_remote.py:147
@@ -2563,7 +2538,8 @@ msgstr "获得联系人的详细信息"
 
 #: gajim/gajim_remote.py:149 gajim/gajim_remote.py:162
 #: gajim/gajim_remote.py:192
-msgid "JID of the contact"
+#, fuzzy
+msgid "XMPP Address of the contact"
 msgstr "联系人的 JID "
 
 #: gajim/gajim_remote.py:153
@@ -2624,7 +2600,8 @@ msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "将当前Gajim的国家设置写入 .config 文件"
 
 #: gajim/gajim_remote.py:190
-msgid "Removes contact from roster"
+#, fuzzy
+msgid "Removes contact from contact list"
 msgstr "从联系人列表删除联系人"
 
 #: gajim/gajim_remote.py:193
@@ -2668,9 +2645,9 @@ msgid "Missing argument \"contact_jid\""
 msgstr "缺失的\"联系人 JID\"参数"
 
 #: gajim/gajim_remote.py:275
-#, python-format
+#, fuzzy, python-format
 msgid ""
-"'%s' is not in your roster.\n"
+"'%s' is not in your contact list.\n"
 "Please specify account for sending the message."
 msgstr ""
 "\"%s\" 不在您的联系人列表中。\n"
@@ -2895,12 +2872,12 @@ msgstr "一周末"
 msgid "Weekend!"
 msgstr "周末"
 
-#: gajim/common/logger.py:192 gajim/common/logger.py:197
+#: gajim/common/logger.py:189 gajim/common/logger.py:194
 #, python-format
 msgid "%s is a directory but should be a file"
 msgstr "%s 是一个目录但它应该是一个文件"
 
-#: gajim/common/logger.py:217
+#: gajim/common/logger.py:214
 #, fuzzy, python-format
 msgid "Creating %s"
 msgstr "正在销毁 %s"
@@ -2973,22 +2950,21 @@ msgstr "%(nickname)s 离开了"
 msgid "Contact Signed Out"
 msgstr "联系人退出登录"
 
-#: gajim/common/contacts.py:455
-msgid "Not in roster"
-msgstr "不在联系人列表中"
-
 #: gajim/common/config.py:80
+#, fuzzy
 msgid ""
 "Show desktop notification even when a chat window is opened for this contact "
-"and does not have focus"
-msgstr ""
+"and does not have focus."
+msgstr "允许弹出提示, 当我离开/不可用/忙/隐身(_A)"
 
 #: gajim/common/config.py:81
-msgid "Play sound when user is busy"
+#, fuzzy
+msgid "Play sound even when being busy."
 msgstr "在用于忙是播放声音"
 
 #: gajim/common/config.py:83
-msgid "Show only online and free for chat contacts in roster."
+#, fuzzy
+msgid "Show only online and free for chat contacts in the contact list."
 msgstr "在联系人列表中只显示在线和和我聊天吧的联系人。"
 
 #: gajim/common/config.py:86
@@ -2996,11 +2972,15 @@ msgid "Time in minutes, after which your status changes to away."
 msgstr "时间, 以分钟为单位。在此时间后将状态更改为离开。"
 
 #: gajim/common/config.py:87
-msgid "$S (Away as a result of being idle more than $T min)"
+#, fuzzy
+msgid "$S (Away: Idle more than $T min)"
 msgstr "$S (离开, 因为闲置超过了$T分钟)"
 
 #: gajim/common/config.py:87
-msgid "$S will be replaced by current status message, $T by autoawaytime."
+#, fuzzy
+msgid ""
+"$S will be replaced by current status message, $T by the 'autoawaytime' "
+"value."
 msgstr "$S 会被当前的状态信息替换, $T 会被autoawaytime替换。"
 
 #: gajim/common/config.py:89
@@ -3008,70 +2988,85 @@ msgid "Time in minutes, after which your status changes to not available."
 msgstr "时间, 以分钟为单位。在此时间后将状态更改为禁止。"
 
 #: gajim/common/config.py:90
-msgid "$S (Not available as a result of being idle more than $T min)"
+#, fuzzy
+msgid "$S (Not available: Idle more than $T min)"
 msgstr "$S (禁止, 因为闲置超过了$T分钟)"
 
 #: gajim/common/config.py:90
-msgid "$S will be replaced by current status message, $T by autoxatime."
+#, fuzzy
+msgid ""
+"$S will be replaced by current status message, $T by the 'autoxatime' value."
 msgstr "$S 会被当前的状态信息替换, $T 会被autoxatime替换。"
 
 #: gajim/common/config.py:93
+#, fuzzy
 msgid ""
-"When to show notification area icon. Can be 'never', 'on_event', 'always'."
+"When to show the notification area icon. Can be 'never', 'on_event', and "
+"'always'."
 msgstr "何时在通知区域显示图标。可以是'never', 'on_event', 'always'。"
 
 #: gajim/common/config.py:94
-msgid "Allow to hide the roster window even if the tray icon is not shown."
+msgid ""
+"Allow to hide the contact list window even if the notification area icon is "
+"not shown."
 msgstr ""
 
 #: gajim/common/config.py:97
-msgid "Contact signed in notification color."
-msgstr "联系人登录通知的颜色。"
+#, fuzzy
+msgid "Notification color for contacts signing in."
+msgstr "提醒我联系人登录(_I)"
 
 #: gajim/common/config.py:98
-msgid "Contact signout notification color"
-msgstr "联系人登出通知的颜色"
+#, fuzzy
+msgid "Notification color for contacts signing out."
+msgstr "提醒我联系人登出(_O)"
 
 #: gajim/common/config.py:99
 #, fuzzy
-msgid "New message notification color."
+msgid "Notification color for new message notification."
 msgstr "在弹出提示中预览消息?"
 
 #: gajim/common/config.py:100
-msgid "File transfer request notification color."
-msgstr "文件传输请求通知的颜色。"
+#, fuzzy
+msgid "Notification color for file transfer request."
+msgstr "文件传输完成时提醒我(_N)"
 
 #: gajim/common/config.py:101
-msgid "File transfer error notification color."
-msgstr "文件传输发生错误的通知的颜色。"
+#, fuzzy
+msgid "Notification color for file transfer errors."
+msgstr "文件传输完成时提醒我(_N)"
 
 #: gajim/common/config.py:102
-msgid "File transfer complete or stopped notification color."
-msgstr "文件传输完成或停止通知的颜色。"
+msgid "Notification color for stopped or completed file transfers."
+msgstr ""
 
 #: gajim/common/config.py:103
-msgid "Groupchat invitation notification color"
-msgstr "聊天室邀请通知的颜色"
+msgid "Notification color for group chat invitations."
+msgstr ""
 
 #: gajim/common/config.py:104
-msgid "Background color of status changed notification"
+#, fuzzy
+msgid "Notification background color for changed status."
 msgstr "状态变更通知的背景色"
 
 #: gajim/common/config.py:105
-msgid "Other dialogs color."
-msgstr "其他对话框的颜色。"
+msgid "Notification color for other dialogs."
+msgstr ""
 
 #: gajim/common/config.py:106
+#, fuzzy
 msgid ""
-"List (space separated) of rows (accounts and groups) that are collapsed."
+"List of rows (accounts and groups) that are collapsed (space separated)."
 msgstr "折叠的行(账户和组)的列表(空格分隔)。"
 
 #: gajim/common/config.py:107
 msgid "default"
 msgstr "默认"
 
-#: gajim/common/config.py:113
-msgid "Language used by speller"
+#: gajim/common/config.py:113 gajim/common/config.py:424
+#: gajim/common/config.py:431
+#, fuzzy
+msgid "Language used for spell checking."
 msgstr "拼写检查的语言"
 
 #: gajim/common/config.py:114
@@ -3085,10 +3080,11 @@ msgstr ""
 "'从不' - 从不显示时间。"
 
 #: gajim/common/config.py:115
+#, fuzzy
 msgid ""
 "Print time in chats using Fuzzy Clock. Value of fuzziness from 1 to 4, or 0 "
-"to disable fuzzyclock. 1 is the most precise clock, 4 the least precise one. "
-"This is used only if print_time is 'sometimes'."
+"to disable Fuzzy Clock. 1 is the most precise clock, 4 the least precise "
+"one. This is used only if 'print_time' is 'sometimes'."
 msgstr ""
 "使用模糊时钟打印时间。模糊度的值从 1 到 4, 或者 0 禁用模糊时钟。1 是最精确的"
 "时钟, 4 是最不精确的。只在'有时'显示时间时使用。"
@@ -3102,286 +3098,301 @@ msgid "Treat * / _ pairs as possible formatting characters."
 msgstr "将成对出现的 * / _ 视为可能的格式控制字符。"
 
 #: gajim/common/config.py:120
+#, fuzzy
 msgid ""
-"If true, do not remove */_ . So *abc* will be bold but with * * not removed."
+"If enabled, do not remove */_ . So *abc* will be bold but with * * not "
+"removed."
 msgstr "如果为真, 则不要移除 */_。这样 *abc* 将被加粗，但是* * 不会被去除。"
 
 #: gajim/common/config.py:123
+#, fuzzy
 msgid ""
-"Uses ReStructured text markup to send HTML, plus ascii formatting if "
-"selected. For syntax, see http://docutils.sourceforge.net/docs/ref/rst/"
-"restructuredtext.html (If you want to use this, install docutils)"
+"Uses ReStructured text markup to send HTML, plus ASCII formatting if "
+"selected. Needs docutils installed (for syntax, see http://docutils."
+"sourceforge.net/docs/ref/rst/restructuredtext.html)."
 msgstr ""
 "使用重构的文本标记发送 HTML, 并加入 ASCII 格式控制(如果选中)。语法请参考"
 "http://docutils.sourceforge.net/docs/ref/rst/restructuredtext.html (如果您想"
 "使用此功能, 请安装 docutils)"
 
 #: gajim/common/config.py:132
+#, fuzzy
 msgid ""
-"Character to add after nickname when using nick completion (tab) in group "
-"chat."
+"Character to add after nickname when using nickname completion (tab) in "
+"group chat."
 msgstr "当在聊天室中使用昵称补全(Tab)时加到昵称后的字符。"
 
 #: gajim/common/config.py:133
+#, fuzzy
 msgid ""
-"Character to propose to add after desired nickname when desired nickname is "
-"used by someone else in group chat."
+"Character to propose to add after desired nickname when nickname is already "
+"used in group chat."
 msgstr "当请求的昵称被聊天室中的其他人使用时加到请求的昵称后的字符。"
 
 #: gajim/common/config.py:155
 msgid ""
-"If true, Gajim will save roster position when hiding roster, and restore it "
-"when showing roster."
+"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:161
-msgid "Place the roster on the right in single window mode"
+msgid "Place the contact list on the right in single window mode"
 msgstr ""
 
 #: gajim/common/config.py:167
 #, fuzzy
 msgid ""
-"This option let you customize timestamp that is printed in conversation. For "
-"example \"[%H:%M] \" will show \"[hour:minute] \". See python doc on "
-"strftime for full documentation: http://docs.python.org/lib/module-time.html"
+"This option lets you customize the timestamp that is printed in "
+"conversation. For example '[%H:%M] ' will show '[hour:minute] '. See python "
+"doc on strftime for full documentation (https://docs.python.org/3/library/"
+"time.html)."
 msgstr ""
 "这个选项允许您自定义对话中显示的时间戳格式。比如\"[%H:%M]\"会显示为\"[小时:分"
 "钟]\"。请参考Python文档关于strftime的完整文档:http://docs.python.org/lib/"
 "module-time.html"
 
 #: gajim/common/config.py:168
-msgid "Characters that are printed before the nickname in conversations"
+#, fuzzy
+msgid "Characters that are printed before the nickname in conversations."
 msgstr "在对话中显示在昵称前的字符"
 
 #: gajim/common/config.py:169
-msgid "Characters that are printed after the nickname in conversations"
+#, fuzzy
+msgid "Characters that are printed after the nickname in conversations."
 msgstr "在对话中显示在昵称后的字符"
 
 #: gajim/common/config.py:170
-msgid "Add * and [n] in roster title?"
-msgstr "在联系人列表标题中加入 * 和 [n]?"
+#, fuzzy
+msgid "If enabled, Gajim will add * and [n] in contact list window title."
+msgstr "如果选中, Gajim 会在联系人列表窗口中显示显示联系人的心情。"
 
 #: gajim/common/config.py:171
 #, fuzzy
 msgid ""
-"How many history messages should be restored when a chat tab/window is "
-"reopened?"
+"Number of messages from chat history to be restored when a chat tab/window "
+"is reopened."
 msgstr "聊天标签/窗口被重新打开时显示之前进行的对话的最后多少行。"
 
 #: gajim/common/config.py:172
-msgid "How far back in time (minutes) history is restored. -1 means no limit."
+msgid ""
+"How far back in time (minutes) chat history is restored. -1 means no limit."
 msgstr ""
 
 #: gajim/common/config.py:173
+#, fuzzy
 msgid ""
-"How many lines to request from server when entering a groupchat. -1 means no "
-"limit"
-msgstr "当加入聊天室时向服务器请求聊天记录的行数。(-1表示不限制)"
-
-#: gajim/common/config.py:174
-msgid ""
-"Minutes of backlog to request when entering a groupchat. -1 means no limit"
-msgstr "当加入聊天室时请求多少分钟以内的聊天记录。（-1表示不限制）"
-
-#: gajim/common/config.py:175
-msgid ""
-"How many seconds to wait before trying to autorejoin to a conference you are "
-"being disconnected from. Set to 0 to disable autorejoining."
+"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:176
-msgid "Should autorejoin be activated when kicked from a conference?"
+#: gajim/common/config.py:174
+msgid ""
+"Should automatic rejoin be activated when you were kicked from a group chat?"
 msgstr ""
 
-#: gajim/common/config.py:177
-msgid ""
-"Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
-"Client default behaviour)."
+#: gajim/common/config.py:175
+#, fuzzy
+msgid "Send message on Ctrl+Enter and make a new line with Enter."
 msgstr "用 Ctrl+Enter 发送消息, Enter 开始新行(紫茉莉 ICQ 客户端默认操作)。"
 
-#: gajim/common/config.py:179
-msgid "How many lines to store for Ctrl+KeyUP."
+#: gajim/common/config.py:177
+#, fuzzy
+msgid "How many lines to store for Ctrl+KeyUP (previously sent messages)."
 msgstr "为 Ctrl+KeyUP 存储多少行。"
 
-#: gajim/common/config.py:182
+#: gajim/common/config.py:180
 #, fuzzy, python-format
 msgid ""
-"Either custom URL with %%s in it where %%s is the word/phrase or "
-"'WIKTIONARY' which means use Wikitionary."
+"Either a custom URL with %%s in it (where %%s is the word/phrase) or "
+"'WIKTIONARY' (which means use Wikitionary)."
 msgstr ""
 "自定义地址, 在其中应包含 %s, %s 是单词/短语; 或'WIKTIONARY'以使用 "
 "wiktionary。"
 
-#: gajim/common/config.py:185
+#: gajim/common/config.py:183
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr "如果选中, Gajim 可以被 gajim-remote 远程控制。"
 
-#: gajim/common/config.py:187
+#: gajim/common/config.py:185
+#, fuzzy
 msgid ""
-"When not printing time for every message (print_time==sometimes), print it "
+"When not printing time for every message ('print_time'==sometimes), print it "
 "every x minutes."
 msgstr "当不是每条消息都显示时间('有时'显示时间)时, 每多少分钟显示时间。"
 
-#: gajim/common/config.py:188
+#: gajim/common/config.py:186
 msgid "Ask before pasting an image."
 msgstr ""
 
-#: gajim/common/config.py:189
+#: gajim/common/config.py:187
 msgid "Ask before closing a group chat tab/window."
 msgstr "关闭聊天室标签/窗口前询问。"
 
-#: gajim/common/config.py:190
+#: gajim/common/config.py:188
 #, fuzzy
 msgid ""
-"Always ask for confirmation before closing groupchats with any of the JIDs "
-"on this space separated list."
+"Always ask for confirmation before closing group chats with any of the XMPP "
+"Addresses on this list (space separated)."
 msgstr "关闭这个空格分隔的列表中的聊天室的标签/窗口前总是询问。"
 
-#: gajim/common/config.py:191
+#: gajim/common/config.py:189
 #, fuzzy
 msgid ""
-"Never ask for confirmation before closing groupchats with any of the JIDs on "
-"this space separated list."
+"Never ask for confirmation before closing group chats with any of the XMPP "
+"Addresses on this list (space separated)."
 msgstr "关闭这个空格分隔的列表中的聊天室的标签/窗口前从不询问。"
 
-#: gajim/common/config.py:192
+#: gajim/common/config.py:190
+#, fuzzy
 msgid ""
-"Ask before closing tabbed chat window if there are controls that can lose "
-"data (chat, private chat, groupchat that will not be minimized)"
+"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:195
+#: gajim/common/config.py:193
+#, fuzzy
 msgid ""
-"Comma separated list of sent hosts, in addition of local interfaces, for "
-"File Transfer in case of address translation/port forwarding."
+"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:196
+#: gajim/common/config.py:194
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "IEC 标准规定 1 KiB = 1024 bytes(字节), 1 KB = 1000 bytes。"
 
-#: gajim/common/config.py:198
+#: gajim/common/config.py:196
 msgid "Notify of events in the notification area."
 msgstr "在通知区域中提示事件"
 
-#: gajim/common/config.py:199
+#: gajim/common/config.py:197
 msgid ""
-"If False, Gajim will display a static event icon instead of the blinking "
-"status icon in the notification area when notifying on event."
+"If disabled, Gajim will display a static event icon instead of the blinking "
+"status icon in the notification area when notifying about an event."
 msgstr ""
 
-#: gajim/common/config.py:205
+#: gajim/common/config.py:203
 msgid "Show tab when only one conversation?"
 msgstr "只有一个对话时显示标签?"
 
-#: gajim/common/config.py:206
+#: gajim/common/config.py:204
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "在聊天窗口中显示标签组的边框。"
 
-#: gajim/common/config.py:207
+#: gajim/common/config.py:205
 msgid "Show close button in tab?"
 msgstr "在标签上显示关闭按钮?"
 
-#: gajim/common/config.py:220
+#: gajim/common/config.py:218
 msgid "Preview new messages in notification popup?"
 msgstr "在弹出提示中预览消息?"
 
-#: gajim/common/config.py:223
+#: gajim/common/config.py:221
+#, fuzzy
 msgid ""
-"A semicolon-separated list of words that will be highlighted in group chats."
+"A list of words (semicolon separated) that will be highlighted in group "
+"chats."
 msgstr "用分号隔开的在聊天室中将高亮显示的单词列表。"
 
-#: gajim/common/config.py:224
+#: gajim/common/config.py:222
 #, fuzzy
 msgid ""
-"If true, quits Gajim when X button of Window Manager is clicked. This "
-"setting is taken into account only if notification icon is used."
+"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。这一设定仅当启用通知区域图标时"
 "会生效。"
 
-#: gajim/common/config.py:225
+#: gajim/common/config.py:223
 msgid ""
-"If true, Gajim hides the Roster window on pressing the X button instead of "
-"minimizing into the Dock."
+"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:226
+#: gajim/common/config.py:224
+#, fuzzy
 msgid ""
-"If true, Gajim will display an icon on each tab containing unread messages. "
-"Depending on the theme, this icon may be animated."
+"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:227
+#: gajim/common/config.py:225
+#, fuzzy
 msgid ""
-"If true, Gajim will display the status message, if not empty, for every "
-"contact under the contact name in roster window."
+"If enabled, Gajim will display the status message (if not empty) underneath "
+"the contact name in the contact list window."
 msgstr ""
 "如果为真, Gajim 将在联系人列表窗口中每一个联系人名字的下方显示状态信息（如果"
 "不为空）。"
 
-#: gajim/common/config.py:233
-msgid "Define the position of the avatar in roster. Can be left or right"
+#: gajim/common/config.py:231
+#, fuzzy
+msgid ""
+"Define the position of avatars in the contact list. Can be 'left' or 'right'."
 msgstr "定义了在联系人列表中头像的显示位置。可以是左或右"
 
-#: gajim/common/config.py:234
+#: gajim/common/config.py:232
 #, fuzzy
 msgid ""
-"If False, Gajim will no longer print status line in chats when a contact "
-"changes their status and/or their status message."
+"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/common/config.py:235
+#: gajim/common/config.py:233
 #, fuzzy
 msgid ""
 "Default Setting: Show a status message for every join or leave in a group "
-"chat"
+"chat."
 msgstr "无法加入聊天室"
 
-#: gajim/common/config.py:236
+#: gajim/common/config.py:234
+#, fuzzy
 msgid ""
-"Default Setting: Show a status message for all status (away, dnd, etc.) "
-"changes of users in a group chat"
-msgstr ""
+"Default Setting: Show a status message for all status changes (away, dnd, "
+"etc.) of users in a group chat."
+msgstr "无法加入聊天室"
 
-#: gajim/common/config.py:238
-msgid "Log XHTML messages instead of plain text messages."
+#: gajim/common/config.py:236
+msgid "Store XHTML messages in chat history instead of plain text messages."
 msgstr ""
 
-#: gajim/common/config.py:239
+#: gajim/common/config.py:237
 msgid "Don't show avatar for the transport itself."
 msgstr "不显示代理本身的头像。"
 
-#: gajim/common/config.py:240
-msgid "Don't show roster in the system taskbar."
+#: gajim/common/config.py:238
+#, fuzzy
+msgid "Don't show contact list window in the system taskbar."
 msgstr "不要将联系人列表窗口显示在系统的任务栏中。"
 
-#: gajim/common/config.py:241
+#: gajim/common/config.py:239
+#, fuzzy
 msgid ""
-"If true, make the window flash (the default behaviour in most Window "
-"Managers) when holding pending events."
+"If enabled, Gajim makes the window flash (the default behaviour in most "
+"Window Managers) when holding pending events."
 msgstr ""
 "如果为真并且安装的 GTK+ 和 PyGTK 的版本至少为 2.8, 当有未处理事件时使窗口闪烁"
 "(大部分窗口管理器的默认响应)"
 
-#: gajim/common/config.py:245
+#: gajim/common/config.py:243
+#, fuzzy
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
 "'always_with_roster' - Like 'always' but the messages are in a single window "
-"along with the roster.\n"
+"along with the contact list.\n"
 "'never' - All messages get their own window.\n"
 "'peracct' - Messages for each account are sent to a specific window.\n"
-"'pertype' - Each message type (e.g. chats vs. groupchats) is sent to a "
+"'pertype' - Each message type (e.g. chats vs. group chats) is sent to a "
 "specific window."
 msgstr ""
 "控制新消息被放置的窗口。\n"
@@ -3392,557 +3403,606 @@ msgstr ""
 "'peracct' - 每个账户的消息发送到一个单独的窗口。\n"
 "'pertype' - 每种类型的消息 (例如, 聊天 及 聊天室) 发送到一个单独的窗口。"
 
-#: gajim/common/config.py:246
+#: gajim/common/config.py:244
 msgid ""
-"Show roster on startup.\n"
-"'always' - Always show roster.\n"
-"'never' - Never show roster.\n"
-"'last_state' - Restore the last state roster."
+"Show contact list window on startup.\n"
+"'always' - Always show contact list window.\n"
+"'never' - Never show contact list window.\n"
+"'last_state' - Restore last state of the contact list window."
 msgstr ""
 
-#: gajim/common/config.py:247
-msgid "If False, you will no longer see the avatar in the chat window."
+#: gajim/common/config.py:245
+#, fuzzy
+msgid "If enabled, Gajim displays the avatar in the chat window."
 msgstr "如果为假, 您将不会在窗口中看到头像。"
 
-#: gajim/common/config.py:248
+#: gajim/common/config.py:246
 #, fuzzy
-msgid "If true, pressing the escape key closes a tab/window."
+msgid "If enabled, pressing Esc closes a tab/window."
 msgstr "如果为真, 按 Escape 键将关闭标签/窗口。"
 
-#: gajim/common/config.py:249
-msgid "Hides the banner in a group chat window"
+#: gajim/common/config.py:247
+#, fuzzy
+msgid "Hides the banner in a group chat window."
 msgstr "在聊天室窗口中隐藏标语"
 
-#: gajim/common/config.py:250
-msgid "Hides the banner in two persons chat window"
-msgstr "在双人聊天窗口中隐藏标语"
+#: gajim/common/config.py:248
+#, fuzzy
+msgid "Hides the banner in a 1:1 chat window."
+msgstr "在聊天室窗口中隐藏标语"
 
-#: gajim/common/config.py:251
-msgid "Hides the group chat occupants list in group chat window."
+#: gajim/common/config.py:249
+#, fuzzy
+msgid "Hides the group chat participants list in a group chat window."
 msgstr "在聊天室聊天窗口中隐藏成员列表。"
 
-#: gajim/common/config.py:252
+#: gajim/common/config.py:250
+#, fuzzy
 msgid ""
 "In a chat, show the nickname at the beginning of a line only when it's not "
-"the same person talking than in previous message."
+"the same person talking as in the previous message."
 msgstr ""
 "在聊天中, 只在当前一条消息不是由同一个人发出的的时候才在一行前显示昵称。"
 
-#: gajim/common/config.py:253
+#: gajim/common/config.py:251
 msgid "Indentation when using merge consecutive nickname."
 msgstr "当合并连续昵称时缩进。"
 
-#: gajim/common/config.py:254
-msgid "Ctrl-Tab go to next composing tab when none is unread."
+#: gajim/common/config.py:252
+#, 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:255
+#: gajim/common/config.py:253
 #, fuzzy
 msgid ""
-"Show the confirm metacontacts creation dialog or not? Empty string means "
-"never show the dialog."
-msgstr "是否显示确认元联系人创建对话框?空字符串意味着从不显示对话框。"
+"Show a confirmation dialog to create metacontacts? Empty string means never "
+"show the dialog."
+msgstr "是否显示确认屏蔽联系人对话框?空字符串意味着从不显示对话框。"
 
-#: gajim/common/config.py:256
+#: gajim/common/config.py:254
 #, fuzzy
 msgid ""
-"Show the confirm block contact dialog or not? Empty string means never show "
+"Show a confirmation dialog to block a contact? Empty string means never show "
 "the dialog."
 msgstr "是否显示确认屏蔽联系人对话框?空字符串意味着从不显示对话框。"
 
-#: gajim/common/config.py:257
+#: gajim/common/config.py:255
 #, fuzzy
 msgid ""
-"Show the confirm custom status dialog or not? Empty string means never show "
-"the dialog."
+"Show a confirmation dialog for a custom status? Empty string means never "
+"show the dialog."
 msgstr "是否显示确认发送自定义状态对话框?空字符串意味着从不显示对话框。"
 
-#: gajim/common/config.py:258
+#: gajim/common/config.py:256
 #, fuzzy
 msgid ""
-"If true, you will be able to set a negative priority to your account in "
-"account modification window. BE CAREFUL, when you are logged in with a "
-"negative priority, you will NOT receive any message from your server."
+"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:259
+#: gajim/common/config.py:257
+#, fuzzy
 msgid ""
-"If true, Gajim will show number of online and total contacts in account and "
-"group rows."
+"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:260
+#: gajim/common/config.py:258
+#, fuzzy
 msgid ""
-"Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
-"as if they were of this type"
+"Can be empty, 'chat' or 'normal'. If not empty, all incoming messages are "
+"treated as if they were of this type."
 msgstr ""
 "可以是空字符串, 'chat'或'normal'。如果不为空, 将把所有收到的消息当作这个类"
 "型。"
 
-#: gajim/common/config.py:261
+#: gajim/common/config.py:259
 #, fuzzy
 msgid ""
-"If true, Gajim will scroll and select the contact who sent you the last "
-"message, if chat window is not already opened."
+"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 会滚动并选出最后给您发送消息的联系人。"
 
-#: gajim/common/config.py:262
+#: gajim/common/config.py:260
 msgid "Time of inactivity needed before the change status window closes down."
 msgstr "时间, 如果在此时间内没有活动, 将改变状态窗口关闭。"
 
-#: gajim/common/config.py:263
+#: gajim/common/config.py:261
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
 msgstr "在对话中最多显示的行数。最旧的那些行会被清除。"
 
-#: gajim/common/config.py:264
+#: gajim/common/config.py:262
 #, fuzzy
 msgid ""
-"If true, notification windows from notification-daemon will be attached to "
-"notification icon."
+"If enabled, notification windows from notification-daemon will be attached "
+"to the notification area icon."
 msgstr "如果为真, 由 notification-daemon 创建的提示窗口会依附于通知区域图标。"
 
-#: gajim/common/config.py:265
+#: gajim/common/config.py:263
 msgid "Choose interval between 2 checks of idleness."
 msgstr "2次检查闲置之间的时间间隔。"
 
-#: gajim/common/config.py:266
+#: gajim/common/config.py:264
+#, fuzzy
 msgid ""
-"Valid uri schemes. Only schemes in this list will be accepted as \"real\" "
-"uri. (mailto and xmpp are handled separately)"
+"Valid URI schemes. Only schemes in this list will be accepted as 'real' URI "
+"(mailto and xmpp are handled separately)."
 msgstr ""
 "合法的 URI Scheme。只有这个列表中的 Scheme 会被接受为\"真正的\" URI。(mailto "
 "和 xmpp 被分开处理)"
 
-#: gajim/common/config.py:267
-msgid "If true, completion in groupchats will be like a shell auto-completion"
+#: gajim/common/config.py:265
+#, fuzzy
+msgid ""
+"If enabled, completion in group chats will be like a shell auto-completion."
 msgstr "如果为是, 聊天室中会像命令符一样自动补全"
 
-#: gajim/common/config.py:272
-msgid "Optionally fix jingle output video framerate. Example: 10/1 or 25/2"
+#: gajim/common/config.py:270
+#, fuzzy
+msgid "Optionally fix Jingle output video framerate. Example: 10/1 or 25/2."
 msgstr "可选地修正 jingle 视频输出的帧速率。比如: 10/1 或 25/2"
 
-#: gajim/common/config.py:273
-msgid "Optionally resize jingle output video. Example: 320x240"
+#: gajim/common/config.py:271
+#, fuzzy
+msgid "Optionally resize Jingle output video. Example: 320x240."
 msgstr "可选地缩放 jingle 视频输出尺寸。比如: 320x240"
 
-#: gajim/common/config.py:274
-msgid "If true, You will also see your webcam"
+#: gajim/common/config.py:272
+msgid "If enabled, you will see your webcam's video stream as well."
 msgstr ""
 
-#: gajim/common/config.py:277
+#: gajim/common/config.py:275
 #, fuzzy
 msgid ""
-"If true, Gajim will try to use a STUN server when using Jingle. The one in "
-"\"stun_server\" option, or the one given by the XMPP server."
+"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\"选项给出, 或由 jabber 服务器给出。"
 
-#: gajim/common/config.py:278
+#: gajim/common/config.py:276
 #, fuzzy
 msgid "STUN server to use when using Jingle"
 msgstr "在使用 jingle 时使用的 STUN 服务器"
 
-#: gajim/common/config.py:279
+#: gajim/common/config.py:277
+#, fuzzy
 msgid ""
-"If true, Gajim will show affiliation of groupchat occupants by adding a "
-"colored square to the status icon"
+"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:280
+#: gajim/common/config.py:278
 msgid ""
 "Proxy used for all outgoing connections if the account does not have a "
-"specific proxy configured"
+"specific proxy configured."
 msgstr ""
 
-#: gajim/common/config.py:281
-msgid "If true, Gajim will ignore incoming attention requests (\"wizz\")."
+#: gajim/common/config.py:279
+msgid "If enabled, Gajim will ignore incoming attention requests ('wizz')."
 msgstr ""
 
-#: gajim/common/config.py:282
+#: gajim/common/config.py:280
 msgid ""
 "If enabled, Gajim will reopen chat windows that were opened last time Gajim "
 "was closed."
 msgstr ""
 
-#: gajim/common/config.py:283
+#: gajim/common/config.py:281
+#, fuzzy
 msgid ""
-"If enabled, Gajim will show an icon to show that sent message has been "
-"received by your contact"
+"If enabled, Gajim will display an icon to show that sent messages have been "
+"received by your contact."
 msgstr "如果选中, Gajim 在您发送的消息被您的联系人接收后不会显示图标"
 
-#: gajim/common/config.py:284
-msgid "Show a mini avatar in chat window tabs and in window icon"
+#: gajim/common/config.py:282
+msgid "Show a mini avatar in chat window tabs and as the window's icon."
 msgstr ""
 
-#: gajim/common/config.py:285
+#: gajim/common/config.py:283
 #, fuzzy
-msgid "If true, Gajim will use the Systems Keyring to store account passwords."
+msgid ""
+"If enabled, Gajim will use the System's Keyring to store account passwords."
 msgstr "如果为真, Gajim 会使用 Gnome Keyring (如果可用) 存储账户的密码。"
 
+#: gajim/common/config.py:284
+msgid "If enabled, Gajim will execute XEP-0146 Commands."
+msgstr ""
+
+#: gajim/common/config.py:285
+msgid "2: System, 1: Enabled, 0: Disabled"
+msgstr ""
+
 #: gajim/common/config.py:286
-msgid "If true, Gajim will execute XEP-0146 Commands."
+msgid "Options in days which can be chosen in the sync threshold menu"
 msgstr ""
 
 #: gajim/common/config.py:287
-msgid "2: System, 1: Enabled, 0: Disabled"
+msgid ""
+"Maximum history in days we request from a public group chat archive. 0: As "
+"much as possible."
 msgstr ""
 
 #: gajim/common/config.py:288
-msgid "Options in days which can be chosen in the sync threshold menu"
+msgid ""
+"Maximum history in days we request from a private group chat archive. 0: As "
+"much as possible."
 msgstr ""
 
 #: gajim/common/config.py:289
 msgid ""
-"Maximum history in days we request from a public room archive. 0: As much as "
-"possible"
+"If enabled, Gajim shows the group chat subject in the chat window when "
+"joining."
 msgstr ""
 
 #: gajim/common/config.py:290
+#, fuzzy
 msgid ""
-"Maximum history in days we request from a private room archive. 0: As much "
-"as possible"
-msgstr ""
+"If enabled, the contact row is colored according to the current chat state "
+"of the contact."
+msgstr "如果选定, Gajim 会允许他人侦测到您所使用的操作系统"
 
 #: gajim/common/config.py:291
-msgid "If the room subject is shown in chat on join"
-msgstr ""
+#, fuzzy
+msgid ""
+"If enabled, the tab is colored according to the current chat state of the "
+"contact."
+msgstr "如果选定, Gajim 会允许他人侦测到您所使用的操作系统"
 
 #: gajim/common/config.py:292
+#, fuzzy
 msgid ""
-"If the contact row is colored according to the current chatstate of the "
-"contact"
-msgstr ""
+"Shows a text in the banner that describes the current chat state of the "
+"contact."
+msgstr "如果选定, Gajim 会允许他人侦测到您所使用的操作系统"
 
 #: gajim/common/config.py:293
-msgid "If the tab is colored according to the current chatstate of the contact"
-msgstr ""
-
-#: gajim/common/config.py:294
-msgid ""
-"Shows a text in the banner that describes the current chatstate of the "
-"contact"
-msgstr ""
-
-#: gajim/common/config.py:295 gajim/common/config.py:424
 #, fuzzy
 msgid ""
 "Chat state notifications that are sent to contacts. Possible values: all, "
 "composing_only, disabled"
 msgstr "发送聊天状态通知。可以是全部, 仅正在编辑, 禁用中的一个。"
 
-#: gajim/common/config.py:296 gajim/common/config.py:438
+#: gajim/common/config.py:294
 #, fuzzy
 msgid ""
 "Chat state notifications that are sent to the group chat. Possible values: "
-"all, composing_only, disabled"
+"'all', 'composing_only', 'disabled'"
 msgstr "发送聊天状态通知。可以是全部, 仅正在编辑, 禁用中的一个。"
 
-#: gajim/common/config.py:312
+#: gajim/common/config.py:297
+msgid "API Preferences. Possible values: 'http', 'iq'"
+msgstr ""
+
+#: gajim/common/config.py:313
+#, fuzzy
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
-"defined in autopriority_* options."
+"defined in 'autopriority_*' options."
 msgstr "优先级将根据您的状态自动改变。优先级在 autopriority_* 选项中定义。"
 
-#: gajim/common/config.py:320
+#: gajim/common/config.py:321
+#, fuzzy
 msgid ""
-"Status used to autoconnect as. Can be online, chat, away, xa, dnd, "
-"invisible. NOTE: this option is used only if restore_last_status is disabled"
+"Status to be used automatically when connecting. Can be 'online', 'chat', "
+"'away', 'xa', 'dnd' or 'invisible'. NOTE: This option is used only if "
+"'restore_last_status' is disabled."
 msgstr ""
 "自动连接时使用的状态。可以是\"在线\", \"聊天\", \"离开\", \"离开很久了\", "
 "\"请勿打扰\", \"隐身\"。注意: 仅当 restore_last_status 被禁用时这个选项其作用"
 
-#: gajim/common/config.py:321
-msgid "If enabled, restore the last status that was used."
+#: gajim/common/config.py:322
+#, fuzzy
+msgid "If enabled, the last status will be restored."
 msgstr "如果启用, 则恢复上次使用的状态。"
 
-#: gajim/common/config.py:322
+#: gajim/common/config.py:323
 #, fuzzy
 msgid ""
-"If true, Contacts requesting authorization will be automatically accepted."
+"If enabled, Contacts requesting authorization will be accepted automatically."
 msgstr "如果为真, 联系人的认证请求将被自动接受。"
 
-#: gajim/common/config.py:323
+#: gajim/common/config.py:324
+#, fuzzy
 msgid ""
-"If False, this account will be disabled and will not appear in roster window."
+"If disabled, this account will be disabled and will not appear in the "
+"contact list window."
 msgstr "如果为假, 这个账户将被禁用且不会出现在联系人列表窗口中。"
 
-#: gajim/common/config.py:327
-msgid "Allow plaintext connections"
+#: gajim/common/config.py:328
+msgid "Allow plaintext connections."
 msgstr ""
 
-#: gajim/common/config.py:330
+#: gajim/common/config.py:331
 msgid ""
-"List (space separated) of authentication mechanisms to try. Can contain "
-"ANONYMOUS, EXTERNAL, GSSAPI, SCRAM-SHA-1-PLUS, SCRAM-SHA-1, DIGEST-MD5, "
-"PLAIN, X-MESSENGER-OAUTH2 or XEP-0078"
+"List of authentication mechanisms to try (space separated). Can contain "
+"'ANONYMOUS', 'EXTERNAL', 'GSSAPI', 'SCRAM-SHA-1-PLUS', 'SCRAM-SHA-1', "
+"'DIGEST-MD5', 'PLAIN', 'X-MESSENGER-OAUTH2' or 'XEP-0078'."
 msgstr ""
 
-#: gajim/common/config.py:331
+#: gajim/common/config.py:332
 #, fuzzy
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection. "
-"Can be 'warn', 'connect', 'disconnect'"
+"Can be 'warn', 'connect' or 'disconnect'."
 msgstr "在使用明文连接发送密码前显示一个警告对话框。"
 
-#: gajim/common/config.py:332
+#: gajim/common/config.py:333
 msgid "Show a warning dialog before using standard SSL library."
 msgstr "在使用标准 SSL 库前显示一个警告对话框。"
 
-#: gajim/common/config.py:333
+#: gajim/common/config.py:334
 #, fuzzy
 msgid ""
 "Show a warning dialog before sending PLAIN password over a plain connection."
 msgstr "在通过明文连接明文发送密码前显示一个警告对话框。"
 
-#: gajim/common/config.py:334
-msgid "Space separated list of ssl errors to ignore."
-msgstr "应忽略的 SSL 错误列表, 以空格分隔"
+#: gajim/common/config.py:335
+msgid "List of SSL errors to ignore (space separated)."
+msgstr ""
 
-#: gajim/common/config.py:340
+#: gajim/common/config.py:341
 msgid ""
-"Space separated list of JIDs for which you do not want to store logs. You "
-"can also add account name to log nothing for this account."
+"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:341
+#: gajim/common/config.py:342
 msgid ""
-"Space separated list of JIDs for which you accept to not log conversations "
-"if he does not want to."
+"List of XMPP Addresses (space separated) for which you accept to not store "
+"chat history if your contact does not want to."
 msgstr ""
 
-#: gajim/common/config.py:343
-msgid "Whitespace sent after inactivity"
+#: gajim/common/config.py:344
+#, fuzzy
+msgid "If enabled, a whitespace is sent after inactivity (keep alive)."
 msgstr "在不活动后发送的空白"
 
-#: gajim/common/config.py:344
-msgid "XMPP ping sent after inactivity"
+#: gajim/common/config.py:345
+#, fuzzy
+msgid "If enabled, an XMPP ping is sent after inactivity (ping alive)."
 msgstr "在不活动后发送的 XMPP ping"
 
-#: gajim/common/config.py:348
+#: gajim/common/config.py:349
 #, fuzzy
 msgid ""
-"How many seconds to wait for the answer of ping alive packet before trying "
-"to reconnect?"
+"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:352
-msgid "Jabberd2 workaround"
+#: gajim/common/config.py:353
+#, fuzzy
+msgid "Jabberd2 workaround."
 msgstr "为 Jabberd2 变通"
 
-#: gajim/common/config.py:355
+#: gajim/common/config.py:356
+#, fuzzy
 msgid ""
-"If checked, Gajim will use your IP and proxies defined in "
-"file_transfer_proxies option for file transfer."
+"If enabled, Gajim will use your IP and proxies defined in "
+"'file_transfer_proxies' option for file transfers."
 msgstr ""
 "如果选中, Gajim 会使用您在 file_transfer_proxies 选项中定义的 IP 和代理进行文"
 "件传输。"
 
-#: gajim/common/config.py:356
+#: gajim/common/config.py:357
 msgid ""
-"If true, Gajim will test file transfer proxies on startup to be sure it "
-"works. Openfire's proxies are known to fail this test even if they work."
+"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:369
-msgid "Answer to receipt requests"
-msgstr "对回执请求的回应"
-
 #: gajim/common/config.py:370
-msgid "Sent receipt requests"
-msgstr "发送回执请求"
+#, fuzzy
+msgid "If enabled, Gajim will answer to message receipt requests."
+msgstr "如果选中, Gajim 在您发送的消息被您的联系人接收后不会显示图标"
+
+#: gajim/common/config.py:371
+msgid "If enabled, Gajim will send message receipt requests."
+msgstr ""
 
-#: gajim/common/config.py:379
+#: gajim/common/config.py:380
 #, fuzzy
 msgid ""
 "Allow Gajim to send information about the operating system you are running."
 msgstr "如果选定, Gajim 会允许他人侦测到您所使用的操作系统"
 
-#: gajim/common/config.py:380
+#: gajim/common/config.py:381
 msgid "Allow Gajim to send your local time."
 msgstr "允许Gajim发送您的本地时间。"
 
-#: gajim/common/config.py:383
-msgid "Message that is sent to contacts you want to add"
-msgstr "向您希望添加的联系人发送的消息"
-
 #: gajim/common/config.py:384
-msgid ""
-"If enabled, Gajim will send your local IPs so your contact can connect to "
-"your machine to transfer files."
-msgstr ""
+#, fuzzy
+msgid "Message that is sent to contacts you want to add."
+msgstr "向您希望添加的联系人发送的消息"
 
 #: gajim/common/config.py:385
+#, fuzzy
 msgid ""
-"Space separated list of JIDs for which chat window will be re-opened on next "
-"startup."
+"If enabled, Gajim will send your local IP so your contact can connect to "
+"your machine for file transfers."
 msgstr ""
+"如果选中, Gajim 会使用您在 file_transfer_proxies 选项中定义的 IP 和代理进行文"
+"件传输。"
 
-#: gajim/common/config.py:387
-msgid "HTTP Upload: Enable HTTPS Verification"
+#: gajim/common/config.py:386
+msgid ""
+"List of XMPP Addresses (space separated) for which the chat window will be "
+"re-opened on next startup."
 msgstr ""
 
 #: gajim/common/config.py:388
-msgid ""
-"Preferred file transfer mechanism for file drag&drop on chat window. Can be "
-"'httpupload' (default) or 'jingle'"
+msgid "HTTP File Upload: Enable HTTPS Verification."
 msgstr ""
 
 #: gajim/common/config.py:389
-msgid "Allow cert verification with POSH"
+msgid ""
+"Preferred file transfer mechanism for file drag&drop on a chat window. Can "
+"be 'httpupload' (default) or 'jingle'."
 msgstr ""
 
-#: gajim/common/config.py:423 gajim/common/config.py:430
+#: gajim/common/config.py:390
 #, fuzzy
-msgid "Language for which misspelled words will be checked"
-msgstr "想要进行拼写检查的语言"
-
-#: gajim/common/config.py:427
-msgid "The currently active encryption for that contact"
-msgstr ""
+msgid "Allow certificate verification with POSH."
+msgstr "%s 的SSL证书验证"
 
-#: gajim/common/config.py:431
+#: gajim/common/config.py:425
+#, fuzzy
 msgid ""
-"How many lines to request from server when entering a groupchat. -1 means no "
-"limit, -2 means global value"
-msgstr ""
-"当加入聊天室时向服务器请求聊天记录的行数。（-1表示不限制，-2表示使用全局设"
-"置）"
+"Chat state notifications that are sent to contacts. Possible values: 'all', "
+"'composing_only', 'disabled'"
+msgstr "发送聊天状态通知。可以是全部, 仅正在编辑, 禁用中的一个。"
+
+#: gajim/common/config.py:428
+#, fuzzy
+msgid "The currently active encryption for that contact."
+msgstr "为这个账户启用 ESession 加密。"
 
 #: gajim/common/config.py:432
 msgid ""
-"Minutes of backlog to request when entering a groupchat. -1 means no limit, "
-"-2 means global value"
+"If enabled, a notification is created for every message in this group chat."
 msgstr ""
-"当加入聊天室时请求多少分钟以内的聊天记录。（-1表示不限制，-2表示使用全局设"
-"置）"
 
 #: gajim/common/config.py:433
-msgid "State whether a notification is created for every message in this room"
-msgstr ""
-
-#: gajim/common/config.py:434
+#, fuzzy
 msgid ""
-"Show a status message for all status (away, dnd, etc.) changes of users in a "
-"group chat"
-msgstr ""
+"Show a status message for all status changes (away, dnd, etc.) of users in a "
+"group chat."
+msgstr "无法加入聊天室"
 
-#: gajim/common/config.py:435
+#: gajim/common/config.py:434
 #, fuzzy
-msgid "Show a status message for every join or leave in a group chat"
+msgid "Show a status message for every join or leave in a group chat."
 msgstr "无法加入聊天室"
 
+#: gajim/common/config.py:435
+msgid ""
+"If enabled, the group chat is minimized into the contact list when joining "
+"automatically."
+msgstr ""
+
 #: gajim/common/config.py:436
-msgid "If the group chat is minimized into the roster on autojoin"
+msgid ""
+"If enabled, the group chat is minimized into the contact list when closing "
+"it."
 msgstr ""
 
 #: gajim/common/config.py:437
-msgid "If the group chat is minimized into the roster on close"
-msgstr ""
+#, fuzzy
+msgid ""
+"Chat state notifications that are sent to the group chat. Possible values: "
+"'all', 'composing_only' or 'disabled'."
+msgstr "发送聊天状态通知。可以是全部, 仅正在编辑, 禁用中的一个。"
 
-#: gajim/common/config.py:441
+#: gajim/common/config.py:440
 #, fuzzy
 msgid ""
-"State whether plugins should be activated on startup (this is saved on Gajim "
-"exit). This option SHOULD NOT be used to (de)activate plug-ins. Use GUI "
-"instead."
+"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 退出时这会被保存)。这个选项不应该用于激活或"
 "禁用插件。使用图形界面代替。"
 
-#: gajim/common/config.py:446 gajim/common/const.py:281
+#: gajim/common/config.py:445 gajim/common/const.py:315
 msgid "Sleeping"
 msgstr "正在睡觉"
 
-#: gajim/common/config.py:447
+#: gajim/common/config.py:446
 msgid "Back soon"
 msgstr "马上回来"
 
-#: gajim/common/config.py:447
+#: gajim/common/config.py:446
 msgid "Back in some minutes."
 msgstr "几分钟就回来。"
 
-#: gajim/common/config.py:448 gajim/common/const.py:247
+#: gajim/common/config.py:447 gajim/common/const.py:281
 msgid "Eating"
 msgstr "吃东西"
 
-#: gajim/common/config.py:448
-msgid "I'm eating, so leave me a message."
-msgstr "我在吃东西, 请留言"
+#: gajim/common/config.py:447
+#, fuzzy
+msgid "I'm eating."
+msgstr "我正在工作。"
 
-#: gajim/common/config.py:449
+#: gajim/common/config.py:448
 msgid "Movie"
 msgstr "电影"
 
-#: gajim/common/config.py:449
+#: gajim/common/config.py:448
 msgid "I'm watching a movie."
 msgstr "我正在看电影。"
 
-#: gajim/common/config.py:450 gajim/common/const.py:314
+#: gajim/common/config.py:449 gajim/common/const.py:348
 msgid "Working"
 msgstr "工作"
 
-#: gajim/common/config.py:450
+#: gajim/common/config.py:449
 msgid "I'm working."
 msgstr "我正在工作。"
 
-#: gajim/common/config.py:451
+#: gajim/common/config.py:450
 msgid "Phone"
 msgstr "打电话"
 
-#: gajim/common/config.py:451
+#: gajim/common/config.py:450
 msgid "I'm on the phone."
 msgstr "我正在打电话"
 
-#: gajim/common/config.py:452
+#: gajim/common/config.py:451
 msgid "Out"
 msgstr "外出"
 
-#: gajim/common/config.py:452
+#: gajim/common/config.py:451
 msgid "I'm out enjoying life."
 msgstr "我正在享受户外生活。"
 
-#: gajim/common/config.py:463
+#: gajim/common/config.py:462
 msgid "I'm available."
 msgstr "我现在在线。"
 
-#: gajim/common/config.py:464
+#: gajim/common/config.py:463
 msgid "I'm free for chat."
 msgstr "和我聊天吧"
 
-#: gajim/common/config.py:465 gajim/gtk/accounts.py:134
+#: gajim/common/config.py:464 gajim/gtk/accounts.py:133
 msgid "Be right back."
 msgstr "很快回来。"
 
-#: gajim/common/config.py:466
+#: gajim/common/config.py:465
 msgid "I'm not available."
 msgstr "我现在处于禁止状态。"
 
-#: gajim/common/config.py:467
+#: gajim/common/config.py:466
 msgid "Do not disturb."
 msgstr "请勿打扰。"
 
-#: gajim/common/config.py:468 gajim/common/config.py:469
+#: gajim/common/config.py:467 gajim/common/config.py:468
 msgid "Bye!"
 msgstr "再见!"
 
-#: gajim/common/config.py:480
+#: gajim/common/config.py:479
+#, fuzzy
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
-"muc_highlight_words, or when a group chat message contains your nickname."
+"'muc_highlight_words' your nickname is mentioned."
 msgstr ""
 "当收到的聊天室的消息包含muc_highlight_words内的词或您的昵称时播放的声音。"
 
-#: gajim/common/config.py:481
-msgid "Sound to play when any MUC message arrives."
+#: gajim/common/config.py:480
+#, fuzzy
+msgid "Sound to play when any group chat message arrives."
 msgstr "收到任意MUC消息时播放的声音。"
 
-#: gajim/common/config.py:485
+#: gajim/common/config.py:484
 #, fuzzy
 msgid "Tor"
 msgstr "To"
@@ -3952,880 +4012,976 @@ msgstr "To"
 msgid "Error: cannot open %s for reading"
 msgstr "错误: 无法按读打开文件 %s"
 
-#: gajim/common/const.py:214
+#: gajim/common/const.py:216
+#, fuzzy
+msgid "?Group chat name:Team"
+msgstr "无"
+
+#: gajim/common/const.py:217
+msgid "?Group chat description:Project discussion"
+msgstr ""
+
+#: gajim/common/const.py:218
+#, fuzzy
+msgid "?Group chat address:team"
+msgstr "聊天室支持"
+
+#: gajim/common/const.py:219
+#, fuzzy
+msgid "?Group chat name:Family"
+msgstr "聊天室突出显示："
+
+#: gajim/common/const.py:220
+msgid "?Group chat description:Spring gathering"
+msgstr ""
+
+#: gajim/common/const.py:221
+msgid "?Group chat address:family"
+msgstr ""
+
+#: gajim/common/const.py:222
+#, fuzzy
+msgid "?Group chat name:Vacation"
+msgstr "聊天室邀请"
+
+#: gajim/common/const.py:223
+msgid "?Group chat description:Trip planning"
+msgstr ""
+
+#: gajim/common/const.py:224
+#, fuzzy
+msgid "?Group chat address:vacation"
+msgstr "聊天室邀请"
+
+#: gajim/common/const.py:225
+#, fuzzy
+msgid "?Group chat name:Repairs"
+msgstr "多人聊天(_G)"
+
+#: gajim/common/const.py:226
+msgid "?Group chat description:Local help group"
+msgstr ""
+
+#: gajim/common/const.py:227
+#, fuzzy
+msgid "?Group chat address:repairs"
+msgstr "聊天室支持"
+
+#: gajim/common/const.py:228
+#, fuzzy
+msgid "?Group chat name:News"
+msgstr "无"
+
+#: gajim/common/const.py:229
+#, fuzzy
+msgid "?Group chat description:Local news and reports"
+msgstr "聊天室创建是受限的。"
+
+#: gajim/common/const.py:230
+#, fuzzy
+msgid "?Group chat address:news"
+msgstr "新聊天室"
+
+#: gajim/common/const.py:235
+#, fuzzy
+msgid "Remote server not found"
+msgstr "找不到该服务"
+
+#: gajim/common/const.py:236
+msgid "Remote server timeout"
+msgstr ""
+
+#: gajim/common/const.py:237 gajim/common/const.py:238
+#: gajim/common/const.py:239
+#, fuzzy
+msgid "Address does not belong to a group chat server"
+msgstr "%s 不是一个聊天室服务器"
+
+#: gajim/common/const.py:240
+#, fuzzy
+msgid "Group chat already exists"
+msgstr "帐户本地已存在。"
+
+#: gajim/common/const.py:241
+#, fuzzy
+msgid "Group chat does not exist"
+msgstr "聊天室 <b>%s</b> 不存在。"
+
+#: gajim/common/const.py:247
 msgid "This message was encrypted with OTR and could not be decrypted."
 msgstr ""
 
-#: gajim/common/const.py:217
+#: gajim/common/const.py:250
 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:221
+#: gajim/common/const.py:254
 msgid ""
-"This message was encrypted with OpenPGP for XMPP and could not be decrypted."
+"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:224
+#: gajim/common/const.py:258
 #, python-format
 msgid "This message was encrypted with %s and could not be decrypted."
 msgstr ""
 
-#: gajim/common/const.py:231
+#: gajim/common/const.py:265
 msgid "Doing Chores"
 msgstr "做家务"
 
-#: gajim/common/const.py:232
+#: gajim/common/const.py:266
 msgid "Buying Groceries"
 msgstr "买杂货"
 
-#: gajim/common/const.py:233
+#: gajim/common/const.py:267
 msgid "Cleaning"
 msgstr "清洁"
 
-#: gajim/common/const.py:234
+#: gajim/common/const.py:268
 msgid "Cooking"
 msgstr "做饭"
 
-#: gajim/common/const.py:235
+#: gajim/common/const.py:269
 msgid "Doing Maintenance"
 msgstr "做保养"
 
-#: gajim/common/const.py:236
+#: gajim/common/const.py:270
 msgid "Doing the Dishes"
 msgstr "洗碗"
 
-#: gajim/common/const.py:237
+#: gajim/common/const.py:271
 msgid "Doing the Laundry"
 msgstr "洗衣服"
 
-#: gajim/common/const.py:238
+#: gajim/common/const.py:272
 msgid "Gardening"
 msgstr "园艺"
 
-#: gajim/common/const.py:239
+#: gajim/common/const.py:273
 msgid "Running an Errand"
 msgstr "奔波"
 
-#: gajim/common/const.py:240
+#: gajim/common/const.py:274
 msgid "Walking the Dog"
 msgstr "遛狗"
 
-#: gajim/common/const.py:242
+#: gajim/common/const.py:276
 msgid "Drinking"
 msgstr "喝酒"
 
-#: gajim/common/const.py:243
+#: gajim/common/const.py:277
 msgid "Having a Beer"
 msgstr "喝啤酒"
 
-#: gajim/common/const.py:244
+#: gajim/common/const.py:278
 msgid "Having Coffee"
 msgstr "喝咖啡"
 
-#: gajim/common/const.py:245
+#: gajim/common/const.py:279
 msgid "Having Tea"
 msgstr "喝茶"
 
-#: gajim/common/const.py:248
+#: gajim/common/const.py:282
 msgid "Having a Snack"
 msgstr "吃点心"
 
-#: gajim/common/const.py:249
+#: gajim/common/const.py:283
 msgid "Having Breakfast"
 msgstr "吃早餐"
 
-#: gajim/common/const.py:250
+#: gajim/common/const.py:284
 msgid "Having Dinner"
 msgstr "吃晚餐"
 
-#: gajim/common/const.py:251
+#: gajim/common/const.py:285
 msgid "Having Lunch"
 msgstr "吃午餐"
 
-#: gajim/common/const.py:253
+#: gajim/common/const.py:287
 msgid "Exercising"
 msgstr "锻炼"
 
-#: gajim/common/const.py:254 gajim/common/const.py:305
+#: gajim/common/const.py:288 gajim/common/const.py:339
 msgid "Cycling"
 msgstr "骑车"
 
-#: gajim/common/const.py:255
+#: gajim/common/const.py:289
 msgid "Dancing"
 msgstr "跳舞"
 
-#: gajim/common/const.py:256
+#: gajim/common/const.py:290
 msgid "Hiking"
 msgstr "步行"
 
-#: gajim/common/const.py:257
+#: gajim/common/const.py:291
 msgid "Jogging"
 msgstr "慢跑"
 
-#: gajim/common/const.py:258
+#: gajim/common/const.py:292
 msgid "Playing Sports"
 msgstr "运动"
 
-#: gajim/common/const.py:259
+#: gajim/common/const.py:293
 msgid "Running"
 msgstr "跑步"
 
-#: gajim/common/const.py:260
+#: gajim/common/const.py:294
 msgid "Skiing"
 msgstr "滑雪"
 
-#: gajim/common/const.py:261
+#: gajim/common/const.py:295
 msgid "Swimming"
 msgstr "游泳"
 
-#: gajim/common/const.py:262
+#: gajim/common/const.py:296
 msgid "Working out"
 msgstr "锻炼"
 
-#: gajim/common/const.py:264
+#: gajim/common/const.py:298
 msgid "Grooming"
 msgstr "打扮"
 
-#: gajim/common/const.py:265
+#: gajim/common/const.py:299
 msgid "At the Spa"
 msgstr "泡温泉"
 
-#: gajim/common/const.py:266
+#: gajim/common/const.py:300
 msgid "Brushing Teeth"
 msgstr "刷牙"
 
-#: gajim/common/const.py:267
+#: gajim/common/const.py:301
 msgid "Getting a Haircut"
 msgstr "剪头发"
 
-#: gajim/common/const.py:268
+#: gajim/common/const.py:302
 msgid "Shaving"
 msgstr "刮胡子"
 
-#: gajim/common/const.py:269
+#: gajim/common/const.py:303
 msgid "Taking a Bath"
 msgstr "洗澡"
 
-#: gajim/common/const.py:270
+#: gajim/common/const.py:304
 msgid "Taking a Shower"
 msgstr "洗澡"
 
-#: gajim/common/const.py:272
+#: gajim/common/const.py:306
 msgid "Having an Appointment"
 msgstr "赴约"
 
-#: gajim/common/const.py:274
+#: gajim/common/const.py:308
 msgid "Inactive"
 msgstr "未活动的"
 
-#: gajim/common/const.py:275
+#: gajim/common/const.py:309
 msgid "Day Off"
 msgstr "休息日"
 
-#: gajim/common/const.py:276
+#: gajim/common/const.py:310
 msgid "Hanging out"
 msgstr "溜达"
 
-#: gajim/common/const.py:277
+#: gajim/common/const.py:311
 msgid "Hiding"
 msgstr "藏起来"
 
-#: gajim/common/const.py:278
+#: gajim/common/const.py:312
 msgid "On Vacation"
 msgstr "渡假"
 
-#: gajim/common/const.py:279
+#: gajim/common/const.py:313
 msgid "Praying"
 msgstr "祈祷"
 
-#: gajim/common/const.py:280
+#: gajim/common/const.py:314
 msgid "Scheduled Holiday"
 msgstr "规划假期"
 
-#: gajim/common/const.py:282
+#: gajim/common/const.py:316
 msgid "Thinking"
 msgstr "思考"
 
-#: gajim/common/const.py:284
+#: gajim/common/const.py:318
 msgid "Relaxing"
 msgstr "放松"
 
-#: gajim/common/const.py:285
+#: gajim/common/const.py:319
 msgid "Fishing"
 msgstr "钓鱼"
 
-#: gajim/common/const.py:286
+#: gajim/common/const.py:320
 msgid "Gaming"
 msgstr "游戏"
 
-#: gajim/common/const.py:287
+#: gajim/common/const.py:321
 msgid "Going out"
 msgstr "外出"
 
-#: gajim/common/const.py:288
+#: gajim/common/const.py:322
 msgid "Partying"
 msgstr "聚会"
 
-#: gajim/common/const.py:289
+#: gajim/common/const.py:323
 msgid "Reading"
 msgstr "读书"
 
-#: gajim/common/const.py:290
+#: gajim/common/const.py:324
 msgid "Rehearsing"
 msgstr "排练"
 
-#: gajim/common/const.py:291
+#: gajim/common/const.py:325
 msgid "Shopping"
 msgstr "购物"
 
-#: gajim/common/const.py:292
+#: gajim/common/const.py:326
 msgid "Smoking"
 msgstr "抽烟"
 
-#: gajim/common/const.py:293
+#: gajim/common/const.py:327
 msgid "Socializing"
 msgstr "社交"
 
-#: gajim/common/const.py:294
+#: gajim/common/const.py:328
 msgid "Sunbathing"
 msgstr "日光浴"
 
-#: gajim/common/const.py:295
+#: gajim/common/const.py:329
 msgid "Watching TV"
 msgstr "看电视"
 
-#: gajim/common/const.py:296
+#: gajim/common/const.py:330
 msgid "Watching a Movie"
 msgstr "看电影"
 
-#: gajim/common/const.py:298
+#: gajim/common/const.py:332
 msgid "Talking"
 msgstr "谈话"
 
-#: gajim/common/const.py:299
+#: gajim/common/const.py:333
 msgid "In Real Life"
 msgstr "在现实世界中"
 
-#: gajim/common/const.py:300
+#: gajim/common/const.py:334
 msgid "On the Phone"
 msgstr "打电话"
 
-#: gajim/common/const.py:301
+#: gajim/common/const.py:335
 msgid "On Video Phone"
 msgstr "视频电话"
 
-#: gajim/common/const.py:303
+#: gajim/common/const.py:337
 msgid "Traveling"
 msgstr "旅行"
 
-#: gajim/common/const.py:304
+#: gajim/common/const.py:338
 msgid "Commuting"
 msgstr "上下班"
 
-#: gajim/common/const.py:306
+#: gajim/common/const.py:340
 msgid "Driving"
 msgstr "开车"
 
-#: gajim/common/const.py:307
+#: gajim/common/const.py:341
 msgid "In a Car"
 msgstr "坐车"
 
-#: gajim/common/const.py:308
+#: gajim/common/const.py:342
 msgid "On a Bus"
 msgstr "坐公交车"
 
-#: gajim/common/const.py:309
+#: gajim/common/const.py:343
 msgid "On a Plane"
 msgstr "坐飞机"
 
-#: gajim/common/const.py:310
+#: gajim/common/const.py:344
 msgid "On a Train"
 msgstr "坐火车"
 
-#: gajim/common/const.py:311
+#: gajim/common/const.py:345
 msgid "On a Trip"
 msgstr "旅途"
 
-#: gajim/common/const.py:312
+#: gajim/common/const.py:346
 msgid "Walking"
 msgstr "走路"
 
-#: gajim/common/const.py:315
+#: gajim/common/const.py:349
 msgid "Coding"
 msgstr "编写代码"
 
-#: gajim/common/const.py:316
+#: gajim/common/const.py:350
 msgid "In a Meeting"
 msgstr "开会"
 
-#: gajim/common/const.py:317
+#: gajim/common/const.py:351
 msgid "Studying"
 msgstr "学习"
 
-#: gajim/common/const.py:318
+#: gajim/common/const.py:352
 msgid "Writing"
 msgstr "写作"
 
-#: gajim/common/const.py:321
+#: gajim/common/const.py:355
 msgid "Afraid"
 msgstr "害怕"
 
-#: gajim/common/const.py:322
+#: gajim/common/const.py:356
 msgid "Amazed"
 msgstr "大为惊奇"
 
-#: gajim/common/const.py:323
+#: gajim/common/const.py:357
 msgid "Amorous"
 msgstr "含情脉脉"
 
-#: gajim/common/const.py:324
+#: gajim/common/const.py:358
 msgid "Angry"
 msgstr "生气"
 
-#: gajim/common/const.py:325
+#: gajim/common/const.py:359
 msgid "Annoyed"
 msgstr "恼怒"
 
-#: gajim/common/const.py:326
+#: gajim/common/const.py:360
 msgid "Anxious"
 msgstr "焦虑"
 
-#: gajim/common/const.py:327
+#: gajim/common/const.py:361
 msgid "Aroused"
 msgstr "激情澎湃"
 
-#: gajim/common/const.py:328
+#: gajim/common/const.py:362
 msgid "Ashamed"
 msgstr "羞愧"
 
-#: gajim/common/const.py:329
+#: gajim/common/const.py:363
 msgid "Bored"
 msgstr "厌倦"
 
-#: gajim/common/const.py:330
+#: gajim/common/const.py:364
 msgid "Brave"
 msgstr "勇敢"
 
-#: gajim/common/const.py:331
+#: gajim/common/const.py:365
 msgid "Calm"
 msgstr "冷静"
 
-#: gajim/common/const.py:332
+#: gajim/common/const.py:366
 msgid "Cautious"
 msgstr "谨慎"
 
-#: gajim/common/const.py:333
+#: gajim/common/const.py:367
 msgid "Cold"
 msgstr "冰冷"
 
-#: gajim/common/const.py:334
+#: gajim/common/const.py:368
 msgid "Confident"
 msgstr "自信"
 
-#: gajim/common/const.py:335
+#: gajim/common/const.py:369
 msgid "Confused"
 msgstr "困惑"
 
-#: gajim/common/const.py:336
+#: gajim/common/const.py:370
 msgid "Contemplative"
 msgstr "沉思, 冥想"
 
-#: gajim/common/const.py:337
+#: gajim/common/const.py:371
 msgid "Contented"
 msgstr "争辩"
 
-#: gajim/common/const.py:338
+#: gajim/common/const.py:372
 msgid "Cranky"
 msgstr "古怪"
 
-#: gajim/common/const.py:339
+#: gajim/common/const.py:373
 msgid "Crazy"
 msgstr "疯狂"
 
-#: gajim/common/const.py:340
+#: gajim/common/const.py:374
 msgid "Creative"
 msgstr "创造"
 
-#: gajim/common/const.py:341
+#: gajim/common/const.py:375
 msgid "Curious"
 msgstr "好奇"
 
-#: gajim/common/const.py:342
+#: gajim/common/const.py:376
 msgid "Dejected"
 msgstr "沮丧"
 
-#: gajim/common/const.py:343
+#: gajim/common/const.py:377
 msgid "Depressed"
 msgstr "消沉"
 
-#: gajim/common/const.py:344
+#: gajim/common/const.py:378
 msgid "Disappointed"
 msgstr "失望"
 
-#: gajim/common/const.py:345
+#: gajim/common/const.py:379
 msgid "Disgusted"
 msgstr "厌恶"
 
-#: gajim/common/const.py:346
+#: gajim/common/const.py:380
 msgid "Dismayed"
 msgstr "诧异"
 
-#: gajim/common/const.py:347
+#: gajim/common/const.py:381
 msgid "Distracted"
 msgstr "心烦意乱"
 
-#: gajim/common/const.py:348
+#: gajim/common/const.py:382
 msgid "Embarrassed"
 msgstr "尴尬"
 
-#: gajim/common/const.py:349
+#: gajim/common/const.py:383
 msgid "Envious"
 msgstr "羡慕"
 
-#: gajim/common/const.py:350
+#: gajim/common/const.py:384
 msgid "Excited"
 msgstr "兴奋"
 
-#: gajim/common/const.py:351
+#: gajim/common/const.py:385
 msgid "Flirtatious"
 msgstr "卖弄风情"
 
-#: gajim/common/const.py:352
+#: gajim/common/const.py:386
 msgid "Frustrated"
 msgstr "懊丧"
 
-#: gajim/common/const.py:353
+#: gajim/common/const.py:387
 msgid "Grateful"
 msgstr "感激"
 
-#: gajim/common/const.py:354
+#: gajim/common/const.py:388
 msgid "Grieving"
 msgstr "悲伤"
 
-#: gajim/common/const.py:355
+#: gajim/common/const.py:389
 msgid "Grumpy"
 msgstr "暴躁"
 
-#: gajim/common/const.py:356
+#: gajim/common/const.py:390
 msgid "Guilty"
 msgstr "内疚"
 
-#: gajim/common/const.py:357
+#: gajim/common/const.py:391
 msgid "Happy"
 msgstr "快乐"
 
-#: gajim/common/const.py:358
+#: gajim/common/const.py:392
 msgid "Hopeful"
 msgstr "满怀希望"
 
-#: gajim/common/const.py:359
+#: gajim/common/const.py:393
 msgid "Hot"
 msgstr "活跃"
 
-#: gajim/common/const.py:360
+#: gajim/common/const.py:394
 msgid "Humbled"
 msgstr "谦逊"
 
-#: gajim/common/const.py:361
+#: gajim/common/const.py:395
 msgid "Humiliated"
 msgstr "丢脸"
 
-#: gajim/common/const.py:362
+#: gajim/common/const.py:396
 msgid "Hungry"
 msgstr "饿"
 
-#: gajim/common/const.py:363
+#: gajim/common/const.py:397
 msgid "Hurt"
 msgstr "受伤"
 
-#: gajim/common/const.py:364
+#: gajim/common/const.py:398
 msgid "Impressed"
 msgstr "印象深刻"
 
-#: gajim/common/const.py:365
+#: gajim/common/const.py:399
 msgid "In Awe"
 msgstr "敬畏"
 
-#: gajim/common/const.py:366
+#: gajim/common/const.py:400
 msgid "In Love"
 msgstr "恋爱"
 
-#: gajim/common/const.py:367
+#: gajim/common/const.py:401
 msgid "Indignant"
 msgstr "愤慨"
 
-#: gajim/common/const.py:368
+#: gajim/common/const.py:402
 msgid "Interested"
 msgstr "感兴趣"
 
-#: gajim/common/const.py:369
+#: gajim/common/const.py:403
 msgid "Intoxicated"
 msgstr "麻醉"
 
-#: gajim/common/const.py:370
+#: gajim/common/const.py:404
 msgid "Invincible"
 msgstr "无敌的"
 
-#: gajim/common/const.py:371
+#: gajim/common/const.py:405
 msgid "Jealous"
 msgstr "吃醋"
 
-#: gajim/common/const.py:372
+#: gajim/common/const.py:406
 msgid "Lonely"
 msgstr "寂寞"
 
-#: gajim/common/const.py:373
+#: gajim/common/const.py:407
 msgid "Lost"
 msgstr "迷惘"
 
-#: gajim/common/const.py:374
+#: gajim/common/const.py:408
 msgid "Lucky"
 msgstr "幸运"
 
-#: gajim/common/const.py:375
+#: gajim/common/const.py:409
 msgid "Mean"
 msgstr "小气"
 
-#: gajim/common/const.py:376
+#: gajim/common/const.py:410
 msgid "Moody"
 msgstr "喜怒无常"
 
-#: gajim/common/const.py:377
+#: gajim/common/const.py:411
 msgid "Nervous"
 msgstr "紧张"
 
-#: gajim/common/const.py:378
+#: gajim/common/const.py:412
 msgid "Neutral"
 msgstr "中立"
 
-#: gajim/common/const.py:379
+#: gajim/common/const.py:413
 msgid "Offended"
 msgstr "生气"
 
-#: gajim/common/const.py:380
+#: gajim/common/const.py:414
 msgid "Outraged"
 msgstr "义愤填膺"
 
-#: gajim/common/const.py:381
+#: gajim/common/const.py:415
 msgid "Playful"
 msgstr "有趣"
 
-#: gajim/common/const.py:382
+#: gajim/common/const.py:416
 msgid "Proud"
 msgstr "骄傲"
 
-#: gajim/common/const.py:383
+#: gajim/common/const.py:417
 msgid "Relaxed"
 msgstr "放松"
 
-#: gajim/common/const.py:384
+#: gajim/common/const.py:418
 msgid "Relieved"
 msgstr "宽慰"
 
-#: gajim/common/const.py:385
+#: gajim/common/const.py:419
 msgid "Remorseful"
 msgstr "后悔"
 
-#: gajim/common/const.py:386
+#: gajim/common/const.py:420
 msgid "Restless"
 msgstr "坐立不安"
 
-#: gajim/common/const.py:387
+#: gajim/common/const.py:421
 msgid "Sad"
 msgstr "伤心"
 
-#: gajim/common/const.py:388
+#: gajim/common/const.py:422
 msgid "Sarcastic"
 msgstr "讽刺"
 
-#: gajim/common/const.py:389
+#: gajim/common/const.py:423
 msgid "Satisfied"
 msgstr "满意"
 
-#: gajim/common/const.py:390
+#: gajim/common/const.py:424
 msgid "Serious"
 msgstr "严肃"
 
-#: gajim/common/const.py:391
+#: gajim/common/const.py:425
 msgid "Shocked"
 msgstr "震惊"
 
-#: gajim/common/const.py:392
+#: gajim/common/const.py:426
 msgid "Shy"
 msgstr "害羞"
 
-#: gajim/common/const.py:393
+#: gajim/common/const.py:427
 msgid "Sick"
 msgstr "不舒服"
 
-#: gajim/common/const.py:394
+#: gajim/common/const.py:428
 msgid "Sleepy"
 msgstr "瞌睡"
 
-#: gajim/common/const.py:395
+#: gajim/common/const.py:429
 msgid "Spontaneous"
 msgstr "心血来潮"
 
-#: gajim/common/const.py:396
+#: gajim/common/const.py:430
 msgid "Stressed"
 msgstr "压力很大"
 
-#: gajim/common/const.py:397
+#: gajim/common/const.py:431
 msgid "Strong"
 msgstr "强壮"
 
-#: gajim/common/const.py:398
+#: gajim/common/const.py:432
 msgid "Surprised"
 msgstr "惊讶"
 
-#: gajim/common/const.py:399
+#: gajim/common/const.py:433
 msgid "Thankful"
 msgstr "感激"
 
-#: gajim/common/const.py:400
+#: gajim/common/const.py:434
 msgid "Thirsty"
 msgstr "渴"
 
-#: gajim/common/const.py:401
+#: gajim/common/const.py:435
 msgid "Tired"
 msgstr "累"
 
-#: gajim/common/const.py:402
+#: gajim/common/const.py:436
 msgid "Undefined"
 msgstr "未定义"
 
-#: gajim/common/const.py:403
+#: gajim/common/const.py:437
 msgid "Weak"
 msgstr "虚弱"
 
-#: gajim/common/const.py:404
+#: gajim/common/const.py:438
 msgid "Worried"
 msgstr "担忧"
 
-#: gajim/common/const.py:408
+#: gajim/common/const.py:442
 msgid "accuracy"
 msgstr ""
 
-#: gajim/common/const.py:409
+#: gajim/common/const.py:443
 #, fuzzy
 msgid "alt"
 msgstr "默认"
 
-#: gajim/common/const.py:410
+#: gajim/common/const.py:444
 msgid "area"
 msgstr ""
 
-#: gajim/common/const.py:411
+#: gajim/common/const.py:445
 #, fuzzy
 msgid "bearing"
 msgstr "海洋"
 
-#: gajim/common/const.py:412
+#: gajim/common/const.py:446
 #, fuzzy
 msgid "building"
 msgstr "藏起来"
 
-#: gajim/common/const.py:413
+#: gajim/common/const.py:447
 #, fuzzy
 msgid "country"
 msgstr "账号"
 
-#: gajim/common/const.py:414
+#: gajim/common/const.py:448
 #, fuzzy
 msgid "countrycode"
 msgstr "账户"
 
-#: gajim/common/const.py:415
+#: gajim/common/const.py:449
 msgid "datum"
 msgstr ""
 
-#: gajim/common/const.py:416
+#: gajim/common/const.py:450
 #, fuzzy
 msgid "description"
 msgstr "描述"
 
-#: gajim/common/const.py:417
+#: gajim/common/const.py:451
 #, fuzzy
 msgid "error"
 msgstr "错误"
 
-#: gajim/common/const.py:418
+#: gajim/common/const.py:452
 msgid "floor"
 msgstr ""
 
-#: gajim/common/const.py:419
+#: gajim/common/const.py:453
 msgid "lat"
 msgstr ""
 
-#: gajim/common/const.py:420
+#: gajim/common/const.py:454
 msgid "locality"
 msgstr ""
 
-#: gajim/common/const.py:421
+#: gajim/common/const.py:455
 #, fuzzy
 msgid "lon"
 msgstr "一"
 
-#: gajim/common/const.py:422
+#: gajim/common/const.py:456
 msgid "postalcode"
 msgstr ""
 
-#: gajim/common/const.py:423
+#: gajim/common/const.py:457
 msgid "region"
 msgstr ""
 
-#: gajim/common/const.py:424
+#: gajim/common/const.py:458
 msgid "room"
 msgstr "聊天室"
 
-#: gajim/common/const.py:425
+#: gajim/common/const.py:459
 msgid "speed"
 msgstr ""
 
-#: gajim/common/const.py:426
+#: gajim/common/const.py:460
 #, fuzzy
 msgid "street"
 msgstr "stream"
 
-#: gajim/common/const.py:427
+#: gajim/common/const.py:461
 msgid "text"
 msgstr ""
 
-#: gajim/common/const.py:428
+#: gajim/common/const.py:462
 msgid "timestamp"
 msgstr ""
 
-#: gajim/common/const.py:429
+#: gajim/common/const.py:463
 msgid "URI"
 msgstr ""
 
-#: gajim/common/const.py:434
+#: gajim/common/const.py:468
 msgid "Unable to get issuer certificate"
 msgstr "无法获得发行者的证书"
 
-#: gajim/common/const.py:435
+#: gajim/common/const.py:469
 msgid "Unable to get certificate CRL"
 msgstr "无法获得证书吊销列表"
 
-#: gajim/common/const.py:436
+#: gajim/common/const.py:470
 msgid "Unable to decrypt certificate's signature"
 msgstr "无法解密证书签名"
 
-#: gajim/common/const.py:437
+#: gajim/common/const.py:471
 msgid "Unable to decrypt CRL's signature"
 msgstr "无法解密证书吊销列表的签名"
 
-#: gajim/common/const.py:438
+#: gajim/common/const.py:472
 msgid "Unable to decode issuer public key"
 msgstr "无法解码发行者的公钥"
 
-#: gajim/common/const.py:439
+#: gajim/common/const.py:473
 msgid "Certificate signature failure"
 msgstr "证书签名失败"
 
-#: gajim/common/const.py:440
+#: gajim/common/const.py:474
 msgid "CRL signature failure"
 msgstr "吊销证书列表签名失败"
 
-#: gajim/common/const.py:441
+#: gajim/common/const.py:475
 msgid "Certificate is not yet valid"
 msgstr "证书还未生效"
 
-#: gajim/common/const.py:442
+#: gajim/common/const.py:476
 msgid "Certificate has expired"
 msgstr "证书已过期"
 
-#: gajim/common/const.py:443
+#: gajim/common/const.py:477
 msgid "CRL is not yet valid"
 msgstr "证书吊销列表还未生效"
 
-#: gajim/common/const.py:444
+#: gajim/common/const.py:478
 msgid "CRL has expired"
 msgstr "证书吊销列表已过期"
 
-#: gajim/common/const.py:445
+#: gajim/common/const.py:479
 msgid "Format error in certificate's notBefore field"
 msgstr "格式错误, 在证书的'不早于'字段"
 
-#: gajim/common/const.py:446
+#: gajim/common/const.py:480
 msgid "Format error in certificate's notAfter field"
 msgstr "格式错误, 在证书的'不迟于'字段"
 
-#: gajim/common/const.py:447
+#: gajim/common/const.py:481
 msgid "Format error in CRL's lastUpdate field"
 msgstr "格式错误, 在证书吊销列表的'最后更新'字段"
 
-#: gajim/common/const.py:448
+#: gajim/common/const.py:482
 msgid "Format error in CRL's nextUpdate field"
 msgstr "格式错误, 在证书吊销列表的'下次更新'字段"
 
-#: gajim/common/const.py:449
+#: gajim/common/const.py:483
 msgid "Out of memory"
 msgstr "内存耗尽"
 
-#: gajim/common/const.py:450
+#: gajim/common/const.py:484
 msgid "Self signed certificate"
 msgstr "自签名的证书"
 
-#: gajim/common/const.py:451
+#: gajim/common/const.py:485
 msgid "Self signed certificate in certificate chain"
 msgstr "自签名的证书, 在证书链中"
 
-#: gajim/common/const.py:452
+#: gajim/common/const.py:486
 msgid "Unable to get local issuer certificate"
 msgstr "无法获得本地发行者证书"
 
-#: gajim/common/const.py:453
+#: gajim/common/const.py:487
 msgid "Unable to verify the first certificate"
 msgstr "无法验证第一个证书"
 
-#: gajim/common/const.py:454
+#: gajim/common/const.py:488
 msgid "Certificate chain too long"
 msgstr "证书链太长"
 
-#: gajim/common/const.py:455
+#: gajim/common/const.py:489
 msgid "Certificate revoked"
 msgstr "证书已被吊销"
 
-#: gajim/common/const.py:456
+#: gajim/common/const.py:490
 msgid "Invalid CA certificate"
 msgstr "无效的 CA 证书"
 
-#: gajim/common/const.py:457
+#: gajim/common/const.py:491
 msgid "Path length constraint exceeded"
 msgstr "超过了路径长度限制"
 
-#: gajim/common/const.py:458
+#: gajim/common/const.py:492
 msgid "Unsupported certificate purpose"
 msgstr "不支持的证书用途"
 
-#: gajim/common/const.py:459
+#: gajim/common/const.py:493
 msgid "Certificate not trusted"
 msgstr "不被信任的证书"
 
-#: gajim/common/const.py:460
+#: gajim/common/const.py:494
 msgid "Certificate rejected"
 msgstr "证书被拒绝"
 
-#: gajim/common/const.py:461
+#: gajim/common/const.py:495
 msgid "Subject issuer mismatch"
 msgstr "Subject 与 发行者 不匹配"
 
-#: gajim/common/const.py:462
+#: gajim/common/const.py:496
 msgid "Authority and subject key identifier mismatch"
 msgstr "Authority 与 subject key identifier 不匹配"
 
-#: gajim/common/const.py:463
+#: gajim/common/const.py:497
 msgid "Authority and issuer serial number mismatch"
 msgstr "Authority 与 发行者序列号 不匹配"
 
-#: gajim/common/const.py:464
+#: gajim/common/const.py:498
 msgid "Key usage does not include certificate signing"
 msgstr "密钥用途中不包含证书签名"
 
-#: gajim/common/const.py:465
+#: gajim/common/const.py:499
 msgid "Application verification failure"
 msgstr "应用程序验证失败"
 
@@ -4998,260 +5154,260 @@ msgstr "视频输入"
 msgid "video output"
 msgstr "视频输出"
 
-#: gajim/common/helpers.py:210
+#: gajim/common/helpers.py:216
 #, fuzzy
 msgid "Server must be between 1 and 1023 bytes"
 msgstr "服务器名必须在 1 到 1023 个字符之间"
 
-#: gajim/common/helpers.py:214
+#: gajim/common/helpers.py:220
 msgid "Invalid character in hostname."
 msgstr "主机名中有无效的字符。"
 
-#: gajim/common/helpers.py:216
+#: gajim/common/helpers.py:222
 msgid "Server address required."
 msgstr "服务器的地址是必须的。"
 
-#: gajim/common/helpers.py:220
+#: gajim/common/helpers.py:226
 #, fuzzy
 msgid "Username must be between 1 and 1023 bytes"
 msgstr "用户名必须在 1 到 1023 个字符之间"
 
-#: gajim/common/helpers.py:224
+#: gajim/common/helpers.py:230
 msgid "Invalid character in username."
 msgstr "在用户名中有无效的字符。"
 
-#: gajim/common/helpers.py:230
+#: gajim/common/helpers.py:236
 #, fuzzy
 msgid "Resource must be between 1 and 1023 bytes"
 msgstr "资源必须在 1 到 1023 个字符之间"
 
-#: gajim/common/helpers.py:234
+#: gajim/common/helpers.py:240
 msgid "Invalid character in resource."
 msgstr "资源中含有无效字符。"
 
-#: gajim/common/helpers.py:275
+#: gajim/common/helpers.py:281
 msgid "_Busy"
 msgstr "忙碌(_B)"
 
-#: gajim/common/helpers.py:277 gajim/gtk/tooltips.py:647
+#: gajim/common/helpers.py:283 gajim/gtk/tooltips.py:647
 msgid "Busy"
 msgstr "忙碌"
 
-#: gajim/common/helpers.py:280
+#: gajim/common/helpers.py:286
 msgid "_Not Available"
 msgstr "禁止(_N)"
 
-#: gajim/common/helpers.py:282 gajim/gtk/tooltips.py:649
+#: gajim/common/helpers.py:288 gajim/gtk/tooltips.py:649
 msgid "Not Available"
 msgstr "禁止"
 
-#: gajim/common/helpers.py:285
+#: gajim/common/helpers.py:291
 msgid "_Free for Chat"
 msgstr "和我聊天吧(_F)"
 
-#: gajim/common/helpers.py:287 gajim/gtk/tooltips.py:643
+#: gajim/common/helpers.py:293 gajim/gtk/tooltips.py:643
 msgid "Free for Chat"
 msgstr "和我聊天吧"
 
-#: gajim/common/helpers.py:290
+#: gajim/common/helpers.py:296
 msgid "?user status:_Available"
 msgstr "在线(_A)"
 
-#: gajim/common/helpers.py:292 gajim/gtk/tooltips.py:641
+#: gajim/common/helpers.py:298 gajim/gtk/tooltips.py:641
 msgid "?user status:Available"
 msgstr "在线"
 
-#: gajim/common/helpers.py:294
+#: gajim/common/helpers.py:300
 msgid "Connecting"
 msgstr "正在连接"
 
-#: gajim/common/helpers.py:297 gajim/data/gui/preferences_window.ui:1251
+#: gajim/common/helpers.py:303 gajim/data/gui/preferences_window.ui:1251
 msgid "A_way"
 msgstr "离开(_A)"
 
-#: gajim/common/helpers.py:299 gajim/common/modules/adhoc_commands.py:120
-#: gajim/command_system/implementation/standard.py:139
+#: gajim/common/helpers.py:305 gajim/common/modules/adhoc_commands.py:120
+#: gajim/command_system/implementation/standard.py:141
 #: gajim/gtk/tooltips.py:645
 msgid "Away"
 msgstr "离开"
 
-#: gajim/common/helpers.py:302
+#: gajim/common/helpers.py:308
 msgid "_Offline"
 msgstr "离线(_O)"
 
-#: gajim/common/helpers.py:304 gajim/gtk/tooltips.py:651
+#: gajim/common/helpers.py:310 gajim/gtk/tooltips.py:651
 msgid "Offline"
 msgstr "离线"
 
-#: gajim/common/helpers.py:307
+#: gajim/common/helpers.py:313
 msgid "_Invisible"
 msgstr "隐身(_I)"
 
-#: gajim/common/helpers.py:313
+#: gajim/common/helpers.py:319
 msgid "?contact has status:Unknown"
 msgstr "未知"
 
-#: gajim/common/helpers.py:315
+#: gajim/common/helpers.py:321
 msgid "?contact has status:Has errors"
 msgstr "有错误"
 
-#: gajim/common/helpers.py:330
+#: gajim/common/helpers.py:336
 msgid "?Subscription we already have:None"
 msgstr "无"
 
-#: gajim/common/helpers.py:332
+#: gajim/common/helpers.py:338
 msgid "To"
 msgstr "To"
 
-#: gajim/common/helpers.py:334 gajim/data/gui/groups_post_window.ui:33
+#: gajim/common/helpers.py:340 gajim/data/gui/groups_post_window.ui:33
 msgid "From"
 msgstr "From"
 
-#: gajim/common/helpers.py:336
+#: gajim/common/helpers.py:342
 msgid "Both"
 msgstr "Both"
 
-#: gajim/common/helpers.py:338 gajim/gtk/server_info.py:151
+#: gajim/common/helpers.py:344 gajim/gtk/server_info.py:151
 #, fuzzy
 msgid "Unknown"
 msgstr "未知"
 
-#: gajim/common/helpers.py:344
+#: gajim/common/helpers.py:350
 msgid "?Ask (for Subscription):None"
 msgstr "无"
 
-#: gajim/common/helpers.py:346
+#: gajim/common/helpers.py:352
 msgid "Subscribe"
 msgstr "认证"
 
-#: gajim/common/helpers.py:355
+#: gajim/common/helpers.py:361
 msgid "?Group Chat Contact Role:None"
 msgstr "无"
 
-#: gajim/common/helpers.py:358
+#: gajim/common/helpers.py:364
 msgid "Moderators"
 msgstr "主持人"
 
-#: gajim/common/helpers.py:360
+#: gajim/common/helpers.py:366
 msgid "Moderator"
 msgstr "主持人"
 
-#: gajim/common/helpers.py:363
+#: gajim/common/helpers.py:369 gajim/data/gui/groupchat_info_scrolled.ui:243
 msgid "Participants"
 msgstr "参与者"
 
-#: gajim/common/helpers.py:365
+#: gajim/common/helpers.py:371
 msgid "Participant"
 msgstr "参与者"
 
-#: gajim/common/helpers.py:368
+#: gajim/common/helpers.py:374
 msgid "Visitors"
 msgstr "访客"
 
-#: gajim/common/helpers.py:370
+#: gajim/common/helpers.py:376
 msgid "Visitor"
 msgstr "访客"
 
-#: gajim/common/helpers.py:376 gajim/gtk/tooltips.py:253
+#: gajim/common/helpers.py:382 gajim/gtk/tooltips.py:253
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "?聊天室联系人阶级:None"
 
-#: gajim/common/helpers.py:378 gajim/data/gui/groupchat_config.ui:32
+#: gajim/common/helpers.py:384 gajim/data/gui/groupchat_config.ui:32
 #: gajim/gtk/tooltips.py:259
 msgid "Owner"
 msgstr "所有者"
 
-#: gajim/common/helpers.py:380 gajim/gtk/tooltips.py:257
+#: gajim/common/helpers.py:386 gajim/gtk/tooltips.py:257
 msgid "Administrator"
 msgstr "管理员"
 
-#: gajim/common/helpers.py:382 gajim/data/gui/groupchat_config.ui:40
+#: gajim/common/helpers.py:388 gajim/data/gui/groupchat_config.ui:40
 #: gajim/gtk/tooltips.py:255 gajim/gtk/groupchat_config.py:105
 msgid "Member"
 msgstr "成员"
 
-#: gajim/common/helpers.py:421
+#: gajim/common/helpers.py:427
 msgid "is paying attention to the conversation"
 msgstr "注意着与您的对话"
 
-#: gajim/common/helpers.py:423
+#: gajim/common/helpers.py:429
 msgid "is doing something else"
 msgstr "在做其他事情"
 
-#: gajim/common/helpers.py:425
+#: gajim/common/helpers.py:431
 #, fuzzy
 msgid "is composing a message…"
 msgstr "正在输入消息..."
 
-#: gajim/common/helpers.py:428
+#: gajim/common/helpers.py:434
 msgid "paused composing a message"
 msgstr "暂停输入消息"
 
-#: gajim/common/helpers.py:430
+#: gajim/common/helpers.py:436
 msgid "has closed the chat window or tab"
 msgstr "关闭了聊天窗口或标签"
 
-#: gajim/common/helpers.py:936 gajim/common/helpers.py:943
+#: gajim/common/helpers.py:942 gajim/common/helpers.py:949
 #, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
 msgstr[0] "%d 条消息未处理"
 
-#: gajim/common/helpers.py:950
-#, python-format
-msgid "from room %s"
-msgstr "来自聊天室 %s"
+#: gajim/common/helpers.py:956
+#, fuzzy, python-format
+msgid "from group chat %s"
+msgstr "在聊天室中(_G)"
 
-#: gajim/common/helpers.py:953 gajim/common/helpers.py:970
+#: gajim/common/helpers.py:959 gajim/common/helpers.py:976
 #, python-format
 msgid "from user %s"
 msgstr "来自用户 %s"
 
-#: gajim/common/helpers.py:955
+#: gajim/common/helpers.py:961
 #, python-format
 msgid "from %s"
 msgstr "来自 %s"
 
-#: gajim/common/helpers.py:962 gajim/common/helpers.py:968
+#: gajim/common/helpers.py:968 gajim/common/helpers.py:974
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
 msgstr[0] "%d 个未处理事件"
 
-#: gajim/common/helpers.py:986 gajim/common/helpers.py:998
+#: gajim/common/helpers.py:992 gajim/common/helpers.py:1004
 #: gajim/data/gui/roster_window.ui:85 data/org.gajim.Gajim.desktop.in:4
 #: data/org.gajim.Gajim.appdata.xml.in:9
 msgid "Gajim"
 msgstr "Gajim"
 
-#: gajim/common/helpers.py:1000
+#: gajim/common/helpers.py:1006
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: gajim/common/helpers.py:1109 gajim/data/gui/add_new_contact_window.ui:25
+#: gajim/common/helpers.py:1115 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:1111
+#: gajim/common/helpers.py:1117
 msgid "Hello, I am $name."
 msgstr "您好, 我是$name"
 
-#: gajim/common/helpers.py:1215 gajim/common/helpers.py:1224
-#: gajim/common/helpers.py:1282
+#: gajim/common/helpers.py:1221 gajim/common/helpers.py:1230
+#: gajim/common/helpers.py:1288
 msgid "Timeout loading image"
 msgstr "读取文件超时"
 
-#: gajim/common/helpers.py:1234 gajim/common/helpers.py:1280
+#: gajim/common/helpers.py:1240 gajim/common/helpers.py:1286
 msgid "Image is too big"
 msgstr "图片太大"
 
-#: gajim/common/helpers.py:1245
+#: gajim/common/helpers.py:1251
 #, fuzzy
 msgid "PyCURL is not installed"
 msgstr "证书吊销列表还未生效"
 
-#: gajim/common/helpers.py:1284
+#: gajim/common/helpers.py:1290
 #, fuzzy
 msgid "Error loading image"
 msgstr "读取文件超时"
@@ -5428,7 +5584,8 @@ msgstr "状态发生了变化。"
 
 #: gajim/common/modules/adhoc_commands.py:202
 #: gajim/common/modules/adhoc_commands.py:239
-msgid "Leave Groupchats"
+#, fuzzy
+msgid "Leave Group Chats"
 msgstr "离开聊天室"
 
 #: gajim/common/modules/adhoc_commands.py:228
@@ -5437,15 +5594,18 @@ msgid "%(nickname)s on %(room_jid)s"
 msgstr "聊天室 %(room_jid)s 的 %(nickname)s"
 
 #: gajim/common/modules/adhoc_commands.py:232
-msgid "You have not joined a groupchat."
+#, fuzzy
+msgid "You have not joined a group chat."
 msgstr "您还没有加入聊天室。"
 
 #: gajim/common/modules/adhoc_commands.py:240
-msgid "Choose the groupchats you want to leave"
+#, fuzzy
+msgid "Choose the group chats you want to leave"
 msgstr "选择您想要离开的聊天室"
 
 #: gajim/common/modules/adhoc_commands.py:289
-msgid "You left the following groupchats:"
+#, fuzzy
+msgid "You left the following group chats:"
 msgstr "您退出了下列聊天室: "
 
 #: gajim/common/modules/roster_item_exchange.py:102
@@ -5461,7 +5621,7 @@ msgstr "已发送联系人: "
 msgid "Blocked Contacts"
 msgstr "被屏蔽的联系人"
 
-#: gajim/data/gui/destroy_muc_dialog.ui:79 gajim/gtk/dialogs.py:736
+#: gajim/data/gui/destroy_muc_dialog.ui:79 gajim/gtk/dialogs.py:563
 msgid "Destroy this group chat permanently?"
 msgstr ""
 
@@ -5470,7 +5630,7 @@ msgstr ""
 msgid "Reason..."
 msgstr "原因"
 
-#: gajim/data/gui/destroy_muc_dialog.ui:124 gajim/gtk/dialogs.py:738
+#: gajim/data/gui/destroy_muc_dialog.ui:124 gajim/gtk/dialogs.py:565
 msgid "Where participants should go (optional)"
 msgstr ""
 
@@ -5483,32 +5643,6 @@ msgstr ""
 msgid "_Reason and alternate venue (optional)"
 msgstr "您也可以输入一个可选的替代地点: "
 
-#: gajim/data/gui/advanced_configuration_window.ui:7
-#: gajim/data/gui/preferences_window.ui:2723
-#, fuzzy
-msgid "Advanced Configuration Editor (ACE)"
-msgstr "高级设置编辑器"
-
-#: gajim/data/gui/advanced_configuration_window.ui:52
-msgid "You should restart Gajim for some changes to take effect"
-msgstr "注意:您必须重新启动 gajim 以使某些设置生效"
-
-#: gajim/data/gui/advanced_configuration_window.ui:84
-#, fuzzy
-msgid "_Filter"
-msgstr "过滤器: "
-
-#: gajim/data/gui/advanced_configuration_window.ui:153
-#: gajim/data/gui/filetransfers_send_file_dialog.ui:15
-#: gajim/gtk/discovery.py:1666
-msgid "Description"
-msgstr "描述"
-
-#: gajim/data/gui/advanced_configuration_window.ui:197
-#, fuzzy
-msgid "_Reset to default"
-msgstr "恢复为默认颜色设置(_R)"
-
 #: gajim/data/gui/join_groupchat_window.ui:56
 #: gajim/data/gui/chat_to_muc_window.ui:67
 #: gajim/data/gui/chat_to_muc_window.ui:78
@@ -5520,9 +5654,8 @@ msgid "Join group chat every time Gajim is started"
 msgstr ""
 
 #: gajim/data/gui/join_groupchat_window.ui:113
-#, fuzzy
-msgid "Auto Join"
-msgstr "自动加入"
+msgid "Join Automatically"
+msgstr ""
 
 #: gajim/data/gui/join_groupchat_window.ui:131
 #: gajim/data/gui/profile_window.ui:233
@@ -5531,10 +5664,11 @@ msgstr "账号"
 
 #: gajim/data/gui/join_groupchat_window.ui:147
 #, fuzzy
-msgid "Room"
-msgstr "聊天室: "
+msgid "Group chat"
+msgstr "聊天室"
 
-#: gajim/data/gui/join_groupchat_window.ui:180 gajim/gtk/accounts.py:886
+#: gajim/data/gui/join_groupchat_window.ui:180 gajim/data/gui/bookmarks.ui:158
+#: gajim/gtk/accounts.py:889
 #, fuzzy
 msgid "Password"
 msgstr "密码: "
@@ -5558,89 +5692,11 @@ msgstr "在聊天室中(_G)"
 msgid "Search group chats on selected server"
 msgstr ""
 
-#: gajim/data/gui/join_groupchat_window.ui:437 gajim/gtk/discovery.py:1271
+#: gajim/data/gui/join_groupchat_window.ui:437 gajim/gtk/discovery.py:1270
 #, fuzzy
 msgid "Join"
 msgstr "加入(_J)"
 
-#: gajim/data/gui/manage_proxies_window.ui:12
-msgid "HTTP Connect"
-msgstr "HTTP 连接"
-
-#: gajim/data/gui/manage_proxies_window.ui:15
-msgid "SOCKS5"
-msgstr "SOCKS5"
-
-#: gajim/data/gui/manage_proxies_window.ui:18
-msgid "BOSH"
-msgstr "BOSH"
-
-#: gajim/data/gui/manage_proxies_window.ui:27
-msgid "Manage Proxy Profiles"
-msgstr "管理代理服务器设置"
-
-#: gajim/data/gui/manage_proxies_window.ui:83
-#, fuzzy
-msgid "Add Proxy"
-msgstr "代理服务器(_Y): "
-
-#: gajim/data/gui/manage_proxies_window.ui:97
-#, fuzzy
-msgid "Remove Proxy"
-msgstr "移除群组"
-
-#: gajim/data/gui/manage_proxies_window.ui:141
-msgid "Properties"
-msgstr "属性"
-
-#: gajim/data/gui/manage_proxies_window.ui:157
-#, fuzzy
-msgid "_Name"
-msgstr "名称(_N): "
-
-#: gajim/data/gui/manage_proxies_window.ui:173
-#, fuzzy
-msgid "_Type"
-msgstr "类型(_T): "
-
-#: gajim/data/gui/manage_proxies_window.ui:236
-#, fuzzy
-msgid "_BOSH URL"
-msgstr "_BOSH URL:"
-
-#: gajim/data/gui/manage_proxies_window.ui:261
-msgid "Use HTTP prox_y"
-msgstr "使用 HTTP 代理(_Y)"
-
-#: gajim/data/gui/manage_proxies_window.ui:280
-#, fuzzy
-msgid "Proxy _Host"
-msgstr "代理服务器地址(_H): "
-
-#: gajim/data/gui/manage_proxies_window.ui:307
-#, fuzzy
-msgid "Proxy _Port"
-msgstr "代理服务器端口(_P): "
-
-#: gajim/data/gui/manage_proxies_window.ui:334
-#, fuzzy
-msgid "_Username"
-msgstr "用户名(_U): "
-
-#: gajim/data/gui/manage_proxies_window.ui:347
-msgid "Use proxy auth_entication"
-msgstr "代理服务器需要认证"
-
-#: gajim/data/gui/manage_proxies_window.ui:377
-#, fuzzy
-msgid "Pass_word"
-msgstr "密码(_W)"
-
-#: gajim/data/gui/manage_proxies_window.ui:405 gajim/gtk/adhoc.py:321
-#, fuzzy
-msgid "Settings"
-msgstr "插件"
-
 #: gajim/data/gui/change_password_dialog.ui:17
 #, fuzzy
 msgid "New Password"
@@ -5671,11 +5727,13 @@ msgid "Status:"
 msgstr "状态: "
 
 #: gajim/data/gui/zeroconf_information_window.ui:89
-msgid "_Log conversation history"
+#, fuzzy
+msgid "_Store conversation history"
 msgstr "记录聊天历史(_L)"
 
 #: gajim/data/gui/zeroconf_information_window.ui:215
 #: gajim/data/gui/vcard_information_window.ui:390
+#: gajim/data/gui/groupchat_info_scrolled.ui:166
 msgid "Contact"
 msgstr "联系人"
 
@@ -5688,8 +5746,9 @@ msgid "Last Name:"
 msgstr "姓: "
 
 #: gajim/data/gui/zeroconf_information_window.ui:260
-msgid "Jabber ID:"
-msgstr "Jabber ID"
+#, fuzzy
+msgid "XMPP Address:"
+msgstr "AIM 地址: "
 
 #: gajim/data/gui/zeroconf_information_window.ui:273
 msgid "E-Mail:"
@@ -5709,8 +5768,9 @@ msgid "Send _File"
 msgstr "发送文件(_F)"
 
 #: gajim/data/gui/gc_occupants_menu.ui:29
-msgid "Occupant Actions"
-msgstr "成员操作"
+#, fuzzy
+msgid "Participant Actions"
+msgstr "参与者"
 
 #: gajim/data/gui/gc_occupants_menu.ui:38
 msgid "_Voice"
@@ -5741,8 +5801,9 @@ msgid "_Ban"
 msgstr "封禁(_B)"
 
 #: gajim/data/gui/gc_occupants_menu.ui:124
-msgid "_Add to Roster"
-msgstr "添加至联系人列表(_A)"
+#, fuzzy
+msgid "_Add to Contact List"
+msgstr "添加联系人(_A)..."
 
 #: gajim/data/gui/gc_occupants_menu.ui:132
 #, fuzzy
@@ -5779,11 +5840,6 @@ msgstr "认证: "
 msgid "_Status"
 msgstr "状态(_S)"
 
-#: gajim/data/gui/zeroconf_context_menu.ui:26
-#: gajim/data/gui/account_context_menu.ui:79
-msgid "_Modify Account..."
-msgstr "修改帐户(_M)..."
-
 #: gajim/data/gui/certificate_dialog.ui:66
 #: gajim/data/gui/certificate_dialog.ui:178
 msgid "Common Name (CN)"
@@ -5866,13 +5922,19 @@ msgstr "Last modified:"
 msgid "Next entry"
 msgstr ""
 
+#: gajim/data/gui/filetransfers_send_file_dialog.ui:15
+#: gajim/data/gui/advanced_configuration.ui:143
+#: gajim/data/gui/groupchat_info_scrolled.ui:48 gajim/gtk/discovery.py:1663
+msgid "Description"
+msgstr "描述"
+
 #: gajim/data/gui/filetransfers_send_file_dialog.ui:54
 #, fuzzy
 msgid "_Send Files"
 msgstr "发送文件(_F)"
 
 #: gajim/data/gui/filetransfers_send_file_dialog.ui:58
-#: gajim/gtk/xml_console.py:90
+#: gajim/gtk/xml_console.py:87
 #, fuzzy
 msgid "Send"
 msgstr "发送(_S)"
@@ -5897,20 +5959,23 @@ msgid "Change _Nickname..."
 msgstr "更改昵称(_N)"
 
 #: gajim/data/gui/gc_control_popup_menu.ui:20
-msgid "_Manage Room"
-msgstr "管理聊天室(_M)"
+#, fuzzy
+msgid "_Manage Group Chat"
+msgstr "新聊天室(_N)"
 
 #: gajim/data/gui/gc_control_popup_menu.ui:31
 msgid "Change _Subject..."
 msgstr "更改主题(_S)"
 
 #: gajim/data/gui/gc_control_popup_menu.ui:38
-msgid "Configure _Room..."
-msgstr "设置聊天室(_R)"
+#, fuzzy
+msgid "Configure _Group Chat..."
+msgstr "加入聊天室(_G)"
 
 #: gajim/data/gui/gc_control_popup_menu.ui:52
-msgid "_Destroy Room"
-msgstr "删除聊天室(_D)"
+#, fuzzy
+msgid "_Destroy Group Chat"
+msgstr "新聊天室(_N)"
 
 #: gajim/data/gui/gc_control_popup_menu.ui:64
 msgid "_Minimize on close"
@@ -5921,7 +5986,7 @@ msgstr "关闭时最小化窗口"
 msgid "_Request Voice"
 msgstr "语音(_V)"
 
-#: gajim/data/gui/gc_control_popup_menu.ui:99 gajim/gtk/discovery.py:1704
+#: gajim/data/gui/gc_control_popup_menu.ui:99
 msgid "_Bookmark"
 msgstr "将本聊天室加入书签(_B)"
 
@@ -5971,13 +6036,6 @@ msgstr "主页: "
 msgid "E-Mail"
 msgstr "E-Mail : "
 
-#: 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/blocking_list.ui:115 gajim/gtk/add_contact.py:30
-#: gajim/gtk/accounts.py:801
-msgid "Jabber ID"
-msgstr "Jabber ID"
-
 #: gajim/data/gui/profile_window.ui:440
 msgid "Main"
 msgstr ""
@@ -6105,37 +6163,44 @@ msgstr "工作"
 msgid "About"
 msgstr "关于"
 
-#: gajim/data/gui/start_chat_dialog.ui:114 gajim/gtk/discovery.py:1658
-msgid "Users"
-msgstr "用户"
-
-#: gajim/data/gui/start_chat_dialog.ui:185
+#: gajim/data/gui/start_chat_dialog.ui:53
 #, fuzzy
-msgid "Name:"
-msgstr "名称: "
+msgid "Global Group Chat Search"
+msgstr "加入聊天室"
 
-#: gajim/data/gui/start_chat_dialog.ui:197
+#: 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
-msgid "Description:"
-msgstr "描述: "
+msgid "_Back"
+msgstr "马上回来"
 
-#: gajim/data/gui/start_chat_dialog.ui:209
+#: gajim/data/gui/start_chat_dialog.ui:245
+#: gajim/data/gui/groupchat_control.ui:796
+#: gajim/data/gui/groupchat_control.ui:888 gajim/gtk/discovery.py:1701
+#: gajim/gtk/groupchat_join.py:62
+msgid "_Join"
+msgstr "加入(_J)"
+
+#: gajim/data/gui/start_chat_dialog.ui:289
 #, fuzzy
-msgid "Address:"
-msgstr "地址(_A):"
+msgid "Select Account"
+msgstr "移除账户 %s"
 
-#: gajim/data/gui/start_chat_dialog.ui:246
-msgid ""
-"Semi-Anonymous\n"
-"<span size=\"small\">(Only moderators can see your XMPP-Address)</span>"
-msgstr ""
+#: gajim/data/gui/start_chat_dialog.ui:380
+#, fuzzy
+msgid "_Select"
+msgstr "清洁"
 
 #: gajim/data/gui/filetransfers.ui:21
 #, fuzzy
 msgid "Pa_use/Resume"
 msgstr "继续(_R)"
 
-#: gajim/data/gui/filetransfers.ui:30 gajim/gtk/filechoosers.py:178
+#: gajim/data/gui/filetransfers.ui:30 gajim/data/gui/groupchat_control.ui:575
+#: gajim/data/gui/groupchat_control.ui:667
+#: gajim/data/gui/groupchat_control.ui:779
+#: gajim/data/gui/groupchat_control.ui:871 gajim/gtk/filechoosers.py:178
 msgid "_Cancel"
 msgstr "取消(_C)"
 
@@ -6177,7 +6242,8 @@ msgid "Cancel the selected file transfer and remove incomplete files"
 msgstr "取消选定文件传输并删除未完成文件"
 
 #: gajim/data/gui/filetransfers.ui:207
-msgid "Shows a list of file transfers between you and others"
+#, fuzzy
+msgid "Shows a list of file transfers between you and your contacts"
 msgstr "显示您与他人进行的传输文件列表"
 
 #: gajim/data/gui/groupchat_control.ui:13 gajim/data/gui/chat_control.ui:277
@@ -6197,7 +6263,6 @@ msgid "Strike"
 msgstr "划去"
 
 #: gajim/data/gui/groupchat_control.ui:54 gajim/data/gui/chat_control.ui:318
-#: gajim/gtk/advanced_config.py:86
 msgid "Color"
 msgstr "Color"
 
@@ -6210,16 +6275,46 @@ msgstr "字体"
 msgid "Clear formatting"
 msgstr "清楚格式"
 
-#: gajim/data/gui/groupchat_control.ui:290 gajim/data/gui/chat_control.ui:880
+#: gajim/data/gui/groupchat_control.ui:291 gajim/data/gui/chat_control.ui:880
 #, fuzzy
 msgid "Choose encryption"
 msgstr "选择客户端证书"
 
-#: gajim/data/gui/groupchat_control.ui:336 gajim/data/gui/chat_control.ui:640
+#: gajim/data/gui/groupchat_control.ui:337 gajim/data/gui/chat_control.ui:640
 #, fuzzy
 msgid "Show a list of emojis (Alt+M)"
 msgstr "显示表情列表(Alt+M)"
 
+#: gajim/data/gui/groupchat_control.ui:484
+#, fuzzy
+msgid "Joining…"
+msgstr "封禁..."
+
+#: gajim/data/gui/groupchat_control.ui:496
+msgid "_Abort"
+msgstr ""
+
+#: gajim/data/gui/groupchat_control.ui:542
+#, fuzzy
+msgid "Enter new nickname"
+msgstr "为联系人 %s 输入新的昵称"
+
+#: gajim/data/gui/groupchat_control.ui:592
+#: gajim/data/gui/groupchat_control.ui:684
+#, fuzzy
+msgid "Ch_ange"
+msgstr "更改昵称(_N)"
+
+#: gajim/data/gui/groupchat_control.ui:761
+#, fuzzy
+msgid "Enter password"
+msgstr "输入新密码"
+
+#: gajim/data/gui/groupchat_control.ui:1067
+#, fuzzy
+msgid "_Try again"
+msgstr "重新验证"
+
 #: gajim/data/gui/popup_notification_window.ui:42
 msgid "Event Type"
 msgstr "事件类型"
@@ -6290,8 +6385,8 @@ msgstr "总是"
 
 #: gajim/data/gui/mam_preferences.ui:18
 #, fuzzy
-msgid "Roster"
-msgstr "显示联系人列表(_R)"
+msgid "Contact List"
+msgstr "联系人"
 
 #: gajim/data/gui/mam_preferences.ui:22
 #: gajim/data/gui/preferences_window.ui:123
@@ -6315,12 +6410,12 @@ msgid "Add"
 msgstr "添加"
 
 #: gajim/data/gui/mam_preferences.ui:194 gajim/data/gui/groupchat_config.ui:151
-#: gajim/gtk/dialogs.py:63 gajim/gtk/accounts.py:381
+#: gajim/gtk/dialogs.py:62 gajim/gtk/accounts.py:384
 #, fuzzy
 msgid "Remove"
 msgstr "移除(_R)"
 
-#: gajim/data/gui/vcard_information_window.ui:72 gajim/gtk/accounts.py:753
+#: gajim/data/gui/vcard_information_window.ui:72 gajim/gtk/accounts.py:756
 #, fuzzy
 msgid "Resource"
 msgstr "资源: "
@@ -6369,6 +6464,7 @@ msgstr "认证: "
 #: gajim/data/gui/vcard_information_window.ui:974
 #: gajim/data/gui/vcard_information_window.ui:993
 #: gajim/data/gui/vcard_information_window.ui:1427
+#: gajim/data/gui/groupchat_info_scrolled.ui:222
 msgid "button"
 msgstr "按钮"
 
@@ -6397,15 +6493,18 @@ msgid "Notify me about it"
 msgstr "提醒我"
 
 #: gajim/data/gui/preferences_window.ui:58
-msgid "Show only in roster"
-msgstr "只显示在联系人列表中"
+#, fuzzy
+msgid "Show only in contact list"
+msgstr "只显示活动的联系人(_A)"
 
 #: gajim/data/gui/preferences_window.ui:69
-msgid "Detached roster with detached chats"
+#, fuzzy
+msgid "Detached contact list with detached chats"
 msgstr "聊天窗口与联系人列表分离, 且互相分离"
 
 #: gajim/data/gui/preferences_window.ui:72
-msgid "Detached roster with single chat"
+#, fuzzy
+msgid "Detached contact list with single chat"
 msgstr "单一聊天窗口, 与联系人列表分离"
 
 #: gajim/data/gui/preferences_window.ui:75
@@ -6413,11 +6512,13 @@ msgid "Single window for everything"
 msgstr "只使用单一窗口"
 
 #: gajim/data/gui/preferences_window.ui:78
-msgid "Detached roster with chat grouped by account"
+#, fuzzy
+msgid "Detached contact list with chat grouped by account"
 msgstr "聊天窗口与联系人列表分离, 依据账户分组"
 
 #: gajim/data/gui/preferences_window.ui:81
-msgid "Detached roster with chat grouped by type"
+#, fuzzy
+msgid "Detached contact list with chat grouped by type"
 msgstr "聊天窗口与联系人列表分离, 依据类型分组"
 
 #: gajim/data/gui/preferences_window.ui:92
@@ -6468,7 +6569,7 @@ msgstr "窗口行为(_W)"
 
 #: gajim/data/gui/preferences_window.ui:296
 #, fuzzy
-msgid "_Show roster on startup"
+msgid "_Show contact list on startup"
 msgstr "Gajim 启动时连接(_O)"
 
 #: gajim/data/gui/preferences_window.ui:311
@@ -6484,12 +6585,12 @@ msgid "_Tabs placement"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:363
-msgid "_Quit Gajim when closing roster window"
+msgid "_Quit Gajim when closing contact list"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:367
 msgid ""
-"If enabled, Gajim will quit when closing the roster window instead of "
+"If enabled, Gajim will quit when closing the contact list window instead of "
 "minimizing to the system's notification area"
 msgstr ""
 
@@ -6499,38 +6600,39 @@ msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:423
 #, fuzzy
-msgid "Show a_vatars of contacts in roster"
+msgid "Show a_vatars of contacts in contact list"
 msgstr "在联系人列表显示中联系人的头像(_V)"
 
 #: gajim/data/gui/preferences_window.ui:427
 #, fuzzy
 msgid ""
-"If checked, avatars of contacts will be shown in the roster window and in "
-"group chats"
+"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
 #, fuzzy
-msgid "Show status _messages of contacts in roster"
+msgid "Show status _messages of contacts in contact list"
 msgstr "在联系人列表中显示联系人的状态信息(_M)"
 
 #: gajim/data/gui/preferences_window.ui:445
 #, fuzzy
 msgid ""
 "If checked, status messages of contacts will be shown under the contact's "
-"name, in the roster window, and in group chats"
+"name, in the contact list window, and in group chats"
 msgstr ""
 "如果选定, Gajim 会在联系人列表和聊天室窗口中联系人名称下方显示联系人状态信息"
 
 #: gajim/data/gui/preferences_window.ui:459
 #, fuzzy
-msgid "Show e_xtra information of contacts in roster (mood, activity, ...)"
+msgid ""
+"Show e_xtra information of contacts in contact list (mood, activity, ...)"
 msgstr "在联系人列表中显示联系人的位置信息(_L)"
 
 #: gajim/data/gui/preferences_window.ui:463
 msgid ""
-"If checked, additional info published by the contact will be shown in "
-"roster. Additional infos (published via PEP) may include e.g. mood, "
+"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 ""
 
@@ -6539,16 +6641,18 @@ msgid "Sort contacts by status"
 msgstr "将联系人按状态排序"
 
 #: gajim/data/gui/preferences_window.ui:494
-msgid "in _roster"
-msgstr "在联系人列表中(_R)"
+#, fuzzy
+msgid "in _contact list"
+msgstr "已发送联系人: "
 
 #: gajim/data/gui/preferences_window.ui:511
 msgid "in _group chats"
 msgstr "在聊天室中(_G)"
 
 #: gajim/data/gui/preferences_window.ui:540
-msgid "Roster Appearance"
-msgstr "联系人列表外观"
+#, fuzzy
+msgid "Contact List Appearance"
+msgstr "联系人列表项交换"
 
 #: gajim/data/gui/preferences_window.ui:585
 #, fuzzy
@@ -6610,7 +6714,7 @@ msgstr "无法加入聊天室"
 
 #: gajim/data/gui/preferences_window.ui:660
 #, fuzzy
-msgid "If checked, the room subject will be shown when joining a group chat"
+msgid "If checked, the subject will be shown when joining a group chat"
 msgstr "无法加入聊天室"
 
 #: gajim/data/gui/preferences_window.ui:682
@@ -6625,13 +6729,13 @@ msgstr ""
 #: gajim/data/gui/preferences_window.ui:701
 msgid ""
 "If join/leave status messages are shown in the group chat. This setting can "
-"be overridden in the groupchat menu."
+"be overridden in the group chat menu."
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:720
 msgid ""
 "The default sync threshold for new public group chats. This setting can be "
-"overridden in the groupchat menu."
+"overridden in the group chat menu."
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:722
@@ -6646,7 +6750,7 @@ msgstr "记录联系人状态变化(_L)"
 #: gajim/data/gui/preferences_window.ui:768
 msgid ""
 "If status change messages are shown in the group chat. This setting can be "
-"overridden in the groupchat menu."
+"overridden in the group chat menu."
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:825
@@ -6663,8 +6767,8 @@ msgstr "如果选定, Gajim 会允许他人侦测到您所使用的操作系统"
 
 #: gajim/data/gui/preferences_window.ui:843
 #, fuzzy
-msgid "Show chatstate in roster"
-msgstr "在联系人列表显示中联系人的头像(_V)"
+msgid "Show chatstate in contact list"
+msgstr "在标签上显示关闭按钮?"
 
 #: gajim/data/gui/preferences_window.ui:847
 msgid ""
@@ -6961,7 +7065,7 @@ msgstr "视频尺寸"
 msgid "Vi_ew own video source"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2281 gajim/gtk/accounts.py:352
+#: gajim/data/gui/preferences_window.ui:2281 gajim/gtk/accounts.py:355
 msgid "Connection"
 msgstr "连接"
 
@@ -7017,7 +7121,8 @@ msgid "_Manage..."
 msgstr "管理..."
 
 #: gajim/data/gui/preferences_window.ui:2616
-msgid "_Log status changes of contacts"
+#, fuzzy
+msgid "_Store status changes of contacts in history"
 msgstr "记录联系人状态变化(_L)"
 
 #: gajim/data/gui/preferences_window.ui:2633
@@ -7041,9 +7146,15 @@ msgstr ""
 msgid "_Open..."
 msgstr "打开...(_O)"
 
+#: gajim/data/gui/preferences_window.ui:2723 gajim/gtk/advanced_config.py:84
+#, fuzzy
+msgid "Advanced Configuration Editor (ACE)"
+msgstr "高级设置编辑器"
+
 #: gajim/data/gui/groupchat_config.ui:55
+#, fuzzy
 msgid ""
-"<b>Jabber-ID</b>\n"
+"<b>XMPP Address</b>\n"
 "&lt;user@domain/resource&gt; (only that resource matches)\n"
 "&lt;user@domain&gt; (any resource matches)\n"
 "&lt;domain/resource&gt; (only that resource matches)\n"
@@ -7062,7 +7173,8 @@ msgstr ""
 msgid "Only Admins and Owners can modify the affiliation"
 msgstr ""
 
-#: gajim/data/gui/groupchat_config.ui:270 gajim/plugins/gui.py:312
+#: gajim/data/gui/groupchat_config.ui:270
+#: gajim/data/gui/groupchat_info_scrolled.ui:210 gajim/plugins/gui.py:324
 #, fuzzy
 msgid "Configuration"
 msgstr "聊天室设置"
@@ -7093,7 +7205,7 @@ msgid "Start _Chat"
 msgstr "开始聊天(_C)"
 
 #: gajim/data/gui/contact_context_menu.ui:20
-#: gajim/data/gui/systray_context_menu.ui:36
+#: gajim/data/gui/systray_context_menu.ui:29
 msgid "Send Single _Message..."
 msgstr "发送单条(_M)..."
 
@@ -7154,17 +7266,42 @@ msgid "_Ignore"
 msgstr "忽略(_I)"
 
 #: gajim/data/gui/contact_context_menu.ui:174
-msgid "_Add to Roster..."
-msgstr "添加至联系人列表(_A)"
+#, fuzzy
+msgid "_Add to Contact List..."
+msgstr "添加联系人(_A)..."
+
+#: gajim/data/gui/advanced_configuration.ui:39
+msgid "You should restart Gajim for some changes to take effect"
+msgstr "注意:您必须重新启动 gajim 以使某些设置生效"
+
+#: gajim/data/gui/advanced_configuration.ui:71
+#, fuzzy
+msgid "_Filter"
+msgstr "过滤器: "
+
+#: gajim/data/gui/advanced_configuration.ui:88
+msgid "Type to search for values..."
+msgstr ""
+
+#: gajim/data/gui/advanced_configuration.ui:180
+#, fuzzy
+msgid "_Reset Value"
+msgstr "恢复为默认颜色设置(_R)"
+
+#: gajim/data/gui/advanced_configuration.ui:185
+#, fuzzy
+msgid "Resets value to default"
+msgstr "恢复为默认颜色设置(_R)"
 
 #: gajim/data/gui/account_creation_wizard_window.ui:43
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim: 账户创建向导"
 
 #: gajim/data/gui/account_creation_wizard_window.ui:70
+#, fuzzy
 msgid ""
 "You need to have an account in order to connect\n"
-"to the Jabber network."
+"to the XMPP network."
 msgstr ""
 "您必须拥有一个账户以连接\n"
 "Jabber 网络"
@@ -7186,8 +7323,9 @@ msgid "<b>Please fill in the data for your existing account</b>"
 msgstr "<b>请填写您现有账号的信息</b>"
 
 #: gajim/data/gui/account_creation_wizard_window.ui:187
-msgid "_Jabber ID:"
-msgstr "_Jabber ID:"
+#, fuzzy
+msgid "_XMPP Address:"
+msgstr "AIM 地址: "
 
 #: gajim/data/gui/account_creation_wizard_window.ui:239
 #: gajim/data/gui/account_creation_wizard_window.ui:394
@@ -7274,6 +7412,7 @@ msgid "Privacy Lists:"
 msgstr "隐私策略列表: "
 
 #: gajim/data/gui/service_discovery_window.ui:111
+#: gajim/data/gui/groupchat_creation.ui:227
 #, fuzzy
 msgid "_Address"
 msgstr "地址(_A):"
@@ -7291,11 +7430,6 @@ msgstr "同步: 选择联系人"
 msgid "Select the contacts you want to synchronise"
 msgstr "选择您想要同步的联系人"
 
-#: gajim/data/gui/groupchat_invitation_received.ui:42
-#, fuzzy
-msgid "Group Chat Invitation"
-msgstr "聊天室邀请"
-
 #: gajim/data/gui/groupchat_invitation_received.ui:111
 #, fuzzy
 msgid "Message..."
@@ -7345,11 +7479,10 @@ msgstr ""
 
 #: gajim/data/gui/add_new_contact_window.ui:84
 #, fuzzy
-msgid "_Jabber ID"
-msgstr "_Jabber ID:"
+msgid "_XMPP Address"
+msgstr "地址(_A):"
 
 #: gajim/data/gui/add_new_contact_window.ui:100
-#: gajim/data/gui/manage_bookmarks_window.ui:192
 #, fuzzy
 msgid "_Nickname"
 msgstr "昵称(_N): "
@@ -7423,7 +7556,7 @@ msgstr "<b>心情: </b>"
 msgid "<b>Message:</b>"
 msgstr "<b>消息: </b>"
 
-#: gajim/data/gui/plugins_window.ui:10 gajim/data/gui/application_menu.ui:90
+#: gajim/data/gui/plugins_window.ui:10 gajim/data/gui/application_menu.ui:87
 msgid "Plugins"
 msgstr "插件"
 
@@ -7529,10 +7662,6 @@ msgstr "允许"
 msgid "Deny"
 msgstr "拒绝"
 
-#: gajim/data/gui/privacy_list_window.ui:317
-msgid "JabberID"
-msgstr "JabberID"
-
 #: gajim/data/gui/privacy_list_window.ui:358
 msgid "all in the group"
 msgstr "所有在群组中的"
@@ -7574,7 +7703,7 @@ msgstr "Order:"
 msgid "Manage sounds"
 msgstr "管理联系人(_M)"
 
-#: gajim/data/gui/manage_sounds_window.ui:55 gajim/plugins/gui.py:100
+#: gajim/data/gui/manage_sounds_window.ui:55 gajim/plugins/gui.py:101
 msgid "Active"
 msgstr "活动"
 
@@ -7612,23 +7741,113 @@ msgstr "同时从 Gajim 和服务器移除帐户(_S)"
 msgid "_Personal Events"
 msgstr "个人事件"
 
-#: gajim/data/gui/account_context_menu.ui:35
-#: gajim/data/gui/systray_context_menu.ui:28
-msgid "Join _Group Chat"
-msgstr "加入聊天室(_G)"
-
-#: gajim/data/gui/account_context_menu.ui:49
+#: gajim/data/gui/account_context_menu.ui:41
 msgid "_Add Contact..."
 msgstr "添加联系人(_A)..."
 
-#: gajim/data/gui/account_context_menu.ui:57
+#: gajim/data/gui/account_context_menu.ui:49
 msgid "_Discover Services"
 msgstr "发现服务(_D)"
 
-#: gajim/data/gui/account_context_menu.ui:65
+#: gajim/data/gui/account_context_menu.ui:57
 msgid "_Execute Command..."
 msgstr "执行命令(_E)..."
 
+#: gajim/data/gui/account_context_menu.ui:65
+#, fuzzy
+msgid "_View Certificate"
+msgstr "查看证书…"
+
+#: gajim/data/gui/manage_proxies.ui:12
+#, fuzzy
+msgctxt "proxy configuration"
+msgid "HTTP Connect"
+msgstr "HTTP 连接"
+
+#: gajim/data/gui/manage_proxies.ui:15
+#, fuzzy
+msgctxt "proxy configuration"
+msgid "SOCKS5"
+msgstr "SOCKS5"
+
+#: gajim/data/gui/manage_proxies.ui:18
+#, fuzzy
+msgctxt "proxy configuration"
+msgid "BOSH"
+msgstr "BOSH"
+
+#: gajim/data/gui/manage_proxies.ui:68
+#, fuzzy
+msgid "Add Proxy"
+msgstr "代理服务器(_Y): "
+
+#: gajim/data/gui/manage_proxies.ui:82
+#, fuzzy
+msgid "Remove Proxy"
+msgstr "移除群组"
+
+#: gajim/data/gui/manage_proxies.ui:134
+#, fuzzy
+msgid "Pass_word"
+msgstr "密码(_W)"
+
+#: gajim/data/gui/manage_proxies.ui:159
+msgid "Use proxy auth_entication"
+msgstr "代理服务器需要认证"
+
+#: gajim/data/gui/manage_proxies.ui:179
+#, fuzzy
+msgid "_Username"
+msgstr "用户名(_U): "
+
+#: gajim/data/gui/manage_proxies.ui:209
+#, fuzzy
+msgid "_Port"
+msgstr "端口(_P)"
+
+#: gajim/data/gui/manage_proxies.ui:226
+msgid "example.org"
+msgstr ""
+
+#: gajim/data/gui/manage_proxies.ui:240
+#, fuzzy
+msgid "_Host"
+msgstr "主机名(_H): "
+
+#: gajim/data/gui/manage_proxies.ui:254
+msgid "Use HTTP prox_y"
+msgstr "使用 HTTP 代理(_Y)"
+
+#: gajim/data/gui/manage_proxies.ui:275
+msgid "https://example.org/http-bind/"
+msgstr ""
+
+#: gajim/data/gui/manage_proxies.ui:291
+#, fuzzy
+msgid "_BOSH URL"
+msgstr "_BOSH URL:"
+
+#: gajim/data/gui/manage_proxies.ui:309 gajim/gtk/adhoc.py:322
+#, fuzzy
+msgid "Settings"
+msgstr "插件"
+
+#: gajim/data/gui/manage_proxies.ui:344
+#, fuzzy
+msgid "_Type"
+msgstr "类型(_T): "
+
+#: gajim/data/gui/manage_proxies.ui:361
+#: gajim/data/gui/groupchat_creation.ui:105
+#, fuzzy
+msgid "_Name"
+msgstr "名称(_N): "
+
+#: gajim/data/gui/manage_proxies.ui:391 gajim/gtk/accounts.py:742
+#, fuzzy
+msgid "Proxy"
+msgstr "代理服务器(_Y): "
+
 #: gajim/data/gui/application_menu.ui:8
 #, fuzzy
 msgid "View"
@@ -7636,8 +7855,8 @@ msgstr "视图(_V)"
 
 #: gajim/data/gui/application_menu.ui:11
 #, fuzzy
-msgid "Show Roster"
-msgstr "显示联系人列表(_R)"
+msgid "Show Contact List"
+msgstr "只显示活动的联系人(_A)"
 
 #: gajim/data/gui/application_menu.ui:16
 #, fuzzy
@@ -7678,22 +7897,23 @@ msgstr ""
 msgid "Features"
 msgstr "特性"
 
-#: gajim/data/gui/application_menu.ui:81
+#: gajim/data/gui/application_menu.ui:77
+#: gajim/data/gui/groupchat_creation.ui:81 gajim/gtk/groupchat_creation.py:45
 #, fuzzy
-msgid "Bookmarks"
-msgstr "将本聊天室加入书签(_B)"
+msgid "Create Group Chat"
+msgstr "离开聊天室"
 
-#: gajim/data/gui/application_menu.ui:94 gajim/data/gui/shortcuts_window.ui:189
-#: gajim/gtk/preferences.py:59
+#: gajim/data/gui/application_menu.ui:91 gajim/data/gui/shortcuts_window.ui:189
+#: gajim/gtk/preferences.py:58
 msgid "Preferences"
 msgstr "参数"
 
-#: gajim/data/gui/application_menu.ui:99
+#: gajim/data/gui/application_menu.ui:96
 msgid "Quit"
 msgstr ""
 
 #: gajim/data/gui/httpupload_progress_dialog.ui:110
-#: gajim/gtk/filetransfer.py:121
+#: gajim/gtk/filetransfer.py:120
 msgid "Progress"
 msgstr "进程"
 
@@ -7710,52 +7930,33 @@ msgstr ""
 msgid "_Cancel Upload"
 msgstr "取消(_C)"
 
-#: gajim/data/gui/manage_bookmarks_window.ui:13
-#, fuzzy
-msgid "Group Chat Bookmarks"
-msgstr "多人聊天(_G)"
-
-#: gajim/data/gui/manage_bookmarks_window.ui:68
-#, fuzzy
-msgid "Add Bookmark"
-msgstr "将本聊天室加入书签(_B)"
-
-#: gajim/data/gui/manage_bookmarks_window.ui:82
-#, fuzzy
-msgid "Remove Bookmark"
-msgstr "将本聊天室加入书签(_B)"
+#: gajim/data/gui/groupchat_creation.ui:27
+msgid "Public or Private?"
+msgstr ""
 
-#: gajim/data/gui/manage_bookmarks_window.ui:126
-msgid "N_ame"
+#: 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 ""
 
-#: gajim/data/gui/manage_bookmarks_window.ui:145
-#, fuzzy
-msgid "Bookmark Name"
-msgstr "将本聊天室加入书签(_B)"
+#: gajim/data/gui/groupchat_creation.ui:58
+msgid "<b>Public:</b> Anyone who knows the address can join."
+msgstr ""
 
-#: gajim/data/gui/manage_bookmarks_window.ui:160
+#: gajim/data/gui/groupchat_creation.ui:122
 #, fuzzy
-msgid "_Server"
-msgstr "服务器(_S): "
+msgid "_Description"
+msgstr "描述"
 
-#: gajim/data/gui/manage_bookmarks_window.ui:223
-msgid "Roo_m"
+#: gajim/data/gui/groupchat_creation.ui:164
+msgid "_Public"
 msgstr ""
 
-#: gajim/data/gui/manage_bookmarks_window.ui:253
+#: gajim/data/gui/groupchat_creation.ui:278
 #, fuzzy
-msgid "_Password"
-msgstr "密码(_P): "
-
-#: gajim/data/gui/manage_bookmarks_window.ui:299
-#, fuzzy
-msgid "Join chat when connected"
-msgstr "联系人已断开连接"
-
-#: gajim/data/gui/manage_bookmarks_window.ui:307
-msgid "_Join Automatically"
-msgstr ""
+msgid "_Account"
+msgstr "帐户(_A)"
 
 #: gajim/data/gui/exception_dialog.ui:49
 msgid "Sorry, that should not have happened"
@@ -7798,6 +7999,29 @@ msgstr "向联系人授权则他/她将知道您是否在线"
 msgid "Presets"
 msgstr "_Presence"
 
+#: gajim/data/gui/groupchat_info_scrolled.ui:32
+#, fuzzy
+msgid "Address"
+msgstr "地址(_A):"
+
+#: gajim/data/gui/groupchat_info_scrolled.ui:64
+msgid "Topic"
+msgstr ""
+
+#: gajim/data/gui/groupchat_info_scrolled.ui:80
+#, fuzzy
+msgid "Author"
+msgstr "作者: "
+
+#: gajim/data/gui/groupchat_info_scrolled.ui:182
+msgid "Discussion Logs"
+msgstr ""
+
+#: gajim/data/gui/groupchat_info_scrolled.ui:260
+#, fuzzy
+msgid "Group Chat Language"
+msgstr "聊天室邀请"
+
 #: gajim/data/gui/emoji_chooser.ui:98
 #, fuzzy
 msgid "No Results Found"
@@ -7808,25 +8032,37 @@ msgid "Invite Friends!"
 msgstr "邀请朋友!"
 
 #: gajim/data/gui/chat_to_muc_window.ui:39
+#, fuzzy
 msgid ""
-"You are now entering a groupchat.\n"
+"You are now entering a group chat.\n"
 "Select the contacts you want to invite"
 msgstr ""
 "您正在进入聊天室。\n"
 "选择您想要邀请的联系人"
 
 #: gajim/data/gui/chat_to_muc_window.ui:112
-msgid "Please select a MUC server."
+#, fuzzy
+msgid "Please select a group chat server."
 msgstr "请选择一个多人聊天服务器。"
 
 #: gajim/data/gui/chat_to_muc_window.ui:141
-msgid "MUC server"
-msgstr "多人聊天服务器"
+#, fuzzy
+msgid "Group chat server"
+msgstr "聊天室支持"
 
 #: gajim/data/gui/chat_to_muc_window.ui:176
 msgid "In_vite"
 msgstr "邀请(_V)"
 
+#: gajim/data/gui/bookmarks.ui:176
+#, fuzzy
+msgid "Autojoin"
+msgstr "自动加入"
+
+#: gajim/data/gui/bookmarks.ui:211
+msgid "_Apply"
+msgstr ""
+
 #: gajim/data/gui/history_manager.ui:11
 #, fuzzy
 msgid "_Export"
@@ -7842,12 +8078,13 @@ msgid "Gajim History Logs Manager"
 msgstr "Gajim 历史记录管理器"
 
 #: gajim/data/gui/history_manager.ui:108
+#, fuzzy
 msgid ""
-"This log manager is not intended for log viewing. If you are looking for "
-"such functionality, use the history window instead.\n"
+"This history manager is not intended for viewing chat history. If you are "
+"looking for such functionality, please use the history window instead.\n"
 "\n"
-"Use this program to delete or export logs. You can select logs from the left "
-"and/or search database from below."
+"You can use this program to delete or export history. Either select logs "
+"from the left or search the database."
 msgstr ""
 "这个历史记录管理器并非为了浏览历史记录而设计。如果您需要浏览历史记录, 请使用"
 "历史窗口。\n"
@@ -7898,8 +8135,9 @@ msgid "Select an emoji"
 msgstr ""
 
 #: gajim/data/gui/shortcuts_window.ui:38
-msgid "Complete a command or a nick"
-msgstr ""
+#, fuzzy
+msgid "Complete a command or a nickname"
+msgstr "请选择一个昵称"
 
 #: gajim/data/gui/shortcuts_window.ui:45
 #, fuzzy
@@ -7938,7 +8176,7 @@ msgstr ""
 msgid "Scroll down"
 msgstr ""
 
-#: gajim/data/gui/shortcuts_window.ui:100 gajim/gtk/xml_console.py:72
+#: gajim/data/gui/shortcuts_window.ui:100 gajim/gtk/xml_console.py:69
 #, fuzzy
 msgid "Clear"
 msgstr "清洁"
@@ -7980,8 +8218,9 @@ msgid "Close chat"
 msgstr ""
 
 #: gajim/data/gui/shortcuts_window.ui:173
-msgid "Roster Shortcuts"
-msgstr ""
+#, fuzzy
+msgid "Contact List Shortcuts"
+msgstr "联系人列表项交换"
 
 #: gajim/data/gui/shortcuts_window.ui:196
 #, fuzzy
@@ -8011,7 +8250,7 @@ msgid "Show only active contacts"
 msgstr "只显示活动的联系人(_A)"
 
 #: gajim/data/gui/shortcuts_window.ui:251
-msgid "Enable roster filtering"
+msgid "Enable contact list filtering"
 msgstr ""
 
 #: gajim/data/gui/shortcuts_window.ui:259
@@ -8058,12 +8297,12 @@ msgstr ""
 
 #: gajim/data/gui/history_window.ui:317
 #, fuzzy
-msgid "Record history for this chat"
+msgid "Store history for this chat"
 msgstr "忽略这个证书的这个错误。"
 
 #: gajim/data/gui/history_window.ui:332
 #, fuzzy
-msgid "Record History"
+msgid "Store History"
 msgstr "最近: "
 
 #: gajim/data/gui/history_window.ui:350
@@ -8083,9 +8322,10 @@ msgstr "创建新消息"
 msgid "Fill in the form."
 msgstr "请填写表格。"
 
-#: gajim/data/gui/data_form_window.ui:229
-msgid "Room Configuration"
-msgstr "聊天室设置"
+#: gajim/data/gui/data_form_window.ui:229 gajim/gtk/groupchat_config.py:41
+#, fuzzy
+msgid "Group Chat Configuration"
+msgstr "聊天室邀请"
 
 #: gajim/data/gui/roster_item_exchange_window.ui:39
 #: gajim/gtk/roster_item_exchange.py:35
@@ -8106,15 +8346,15 @@ msgstr "状态(_T)"
 msgid "_Start Chat..."
 msgstr "开始聊天(_S)"
 
-#: gajim/data/gui/systray_context_menu.ui:50
+#: gajim/data/gui/systray_context_menu.ui:43
 msgid "Show All Pending _Events"
 msgstr "显示所有未处理事件(_E)"
 
-#: gajim/data/gui/systray_context_menu.ui:59
+#: gajim/data/gui/systray_context_menu.ui:52
 msgid "Mute Sounds"
 msgstr "静音"
 
-#: gajim/data/gui/systray_context_menu.ui:75
+#: gajim/data/gui/systray_context_menu.ui:68
 #, fuzzy
 msgid "_Preferences"
 msgstr "参数"
@@ -8206,34 +8446,34 @@ msgstr ""
 msgid "Execute expression inside a shell, send output"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:45
+#: gajim/command_system/implementation/standard.py:47
 msgid ""
 "Show help on a given command or a list of available commands if -a is given"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:73
+#: gajim/command_system/implementation/standard.py:75
 #, fuzzy
 msgid "Send a message to the contact"
 msgstr "向联系人发送文件"
 
-#: gajim/command_system/implementation/standard.py:78
+#: gajim/command_system/implementation/standard.py:80
 msgid "Send action (in the third person) to the current chat"
 msgstr "发送操作（在第三人称）到当前聊天"
 
-#: gajim/command_system/implementation/standard.py:83
+#: gajim/command_system/implementation/standard.py:85
 msgid "Show logged messages which mention given text"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:88
+#: gajim/command_system/implementation/standard.py:90
 #, python-format
 msgid "%s: Nothing found"
 msgstr "%s 未找到"
 
-#: gajim/command_system/implementation/standard.py:94
+#: gajim/command_system/implementation/standard.py:96
 msgid "Limit must be an integer"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:118
+#: gajim/command_system/implementation/standard.py:120
 msgid ""
 "\n"
 "    Set the current status\n"
@@ -8243,120 +8483,127 @@ msgid ""
 "    "
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:136
+#: gajim/command_system/implementation/standard.py:138
 msgid "Set the current status to away"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:150
+#: gajim/command_system/implementation/standard.py:152
 msgid "Set the current status to online"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:153
+#: gajim/command_system/implementation/standard.py:155
 msgid "Available"
 msgstr "在线"
 
-#: gajim/command_system/implementation/standard.py:173
-#: gajim/command_system/implementation/standard.py:250
+#: gajim/command_system/implementation/standard.py:175
+#: gajim/command_system/implementation/standard.py:252
 #, fuzzy
 msgid "Clear the text window"
 msgstr "隐藏该窗口"
 
-#: gajim/command_system/implementation/standard.py:178
-#: gajim/command_system/implementation/standard.py:397
+#: gajim/command_system/implementation/standard.py:180
+#: gajim/command_system/implementation/standard.py:401
 #, fuzzy
 msgid "Send a ping to the contact"
 msgstr "向联系人发送文件"
 
-#: gajim/command_system/implementation/standard.py:181
-#: gajim/command_system/implementation/standard.py:400
+#: gajim/command_system/implementation/standard.py:183
+#: gajim/command_system/implementation/standard.py:404
 msgid "Command is not supported for zeroconf accounts"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:185
-msgid "Send DTMF sequence through an open audio session"
+#: gajim/command_system/implementation/standard.py:187
+msgid "Send DTMF sequence through an open voice chat"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:188
-msgid "No open audio sessions with the contact"
-msgstr ""
+#: gajim/command_system/implementation/standard.py:190
+#, fuzzy
+msgid "No open voice chats with the contact"
+msgstr "与此联系人聊天时打开的窗口/标签"
 
-#: gajim/command_system/implementation/standard.py:191
+#: gajim/command_system/implementation/standard.py:193
 #, fuzzy, python-format
 msgid "%s is not a valid tone"
 msgstr "%s 不是一个合法的日志级别"
 
-#: gajim/command_system/implementation/standard.py:198
-msgid "Toggle audio session"
-msgstr "切换语音会话"
+#: gajim/command_system/implementation/standard.py:200
+msgid "Toggle Voice Chat"
+msgstr ""
 
-#: gajim/command_system/implementation/standard.py:201
-msgid "Audio sessions are not available"
-msgstr "音频会话不可用"
+#: gajim/command_system/implementation/standard.py:203
+#, fuzzy
+msgid "Voice chats are not available"
+msgstr "视频会话不可用"
 
-#: gajim/command_system/implementation/standard.py:208
-msgid "Toggle video session"
+#: gajim/command_system/implementation/standard.py:210
+#, fuzzy
+msgid "Toggle Video Chat"
 msgstr "切换视频会话"
 
-#: gajim/command_system/implementation/standard.py:211
-msgid "Video sessions are not available"
+#: gajim/command_system/implementation/standard.py:213
+#, fuzzy
+msgid "Video chats are not available"
 msgstr "视频会话不可用"
 
-#: gajim/command_system/implementation/standard.py:218
+#: gajim/command_system/implementation/standard.py:220
 #, fuzzy
 msgid "Send a message to the contact that will attract their attention"
 msgstr "向联系人发送文件"
 
-#: gajim/command_system/implementation/standard.py:255
+#: gajim/command_system/implementation/standard.py:257
 #, fuzzy
 msgid "Change your nickname in a group chat"
 msgstr "更改您的昵称(Ctrl+N)"
 
-#: gajim/command_system/implementation/standard.py:260 gajim/gtk/dialogs.py:674
-#: gajim/gtk/bookmarks.py:272
+#: gajim/command_system/implementation/standard.py:262
 msgid "Invalid nickname"
 msgstr "无效的昵称"
 
-#: gajim/command_system/implementation/standard.py:267
-msgid "Open a private chat window with a specified occupant"
+#: gajim/command_system/implementation/standard.py:269
+#, fuzzy
+msgid "Open a private chat window with a specified participant"
 msgstr "于特定成员打开私人聊天窗口"
 
-#: gajim/command_system/implementation/standard.py:273
-#: gajim/command_system/implementation/standard.py:282
-#: gajim/command_system/implementation/standard.py:332
-#: gajim/command_system/implementation/standard.py:345
-#: gajim/command_system/implementation/standard.py:357
+#: gajim/command_system/implementation/standard.py:275
+#: gajim/command_system/implementation/standard.py:284
+#: gajim/command_system/implementation/standard.py:336
+#: gajim/command_system/implementation/standard.py:349
+#: gajim/command_system/implementation/standard.py:361
 #, fuzzy
 msgid "Nickname not found"
 msgstr "要使用的昵称"
 
-#: gajim/command_system/implementation/standard.py:276
+#: gajim/command_system/implementation/standard.py:278
+#, fuzzy
 msgid ""
-"Open a private chat window with a specified occupant and send him a message"
+"Open a private chat window with a specified participant and send him a "
+"message"
 msgstr "于特定成员打开私人聊天窗口并发送消息"
 
-#: gajim/command_system/implementation/standard.py:285
+#: gajim/command_system/implementation/standard.py:287
 msgid "Display or change a group chat topic"
 msgstr "显示或更改聊天室主题"
 
-#: gajim/command_system/implementation/standard.py:294
-msgid "Invite a user to a room for a reason"
+#: gajim/command_system/implementation/standard.py:296
+msgid "Invite a user to a group chat for a reason"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:297
+#: gajim/command_system/implementation/standard.py:299
 #, fuzzy, python-format
 msgid "Invited %(jid)s to %(room_jid)s"
 msgstr "发送 %s 给 %s"
 
-#: gajim/command_system/implementation/standard.py:301
-msgid "Join a group chat given by a JID"
+#: gajim/command_system/implementation/standard.py:303
+#, fuzzy
+msgid "Join a group chat given by an XMPP Address"
 msgstr "加入JID给出的聊天室"
 
-#: gajim/command_system/implementation/standard.py:309
+#: gajim/command_system/implementation/standard.py:313
 msgid ""
-"Leave the groupchat, optionally giving a reason, and close tab or window"
+"Leave the group chat, optionally giving a reason, and close tab or window"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:314
+#: gajim/command_system/implementation/standard.py:318
 msgid ""
 "\n"
 "    Ban user by a nick or a JID from a groupchat\n"
@@ -8365,14 +8612,15 @@ msgid ""
 "    "
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:329
+#: gajim/command_system/implementation/standard.py:333
 #, fuzzy
-msgid "Kick user by a nick from a groupchat"
+msgid "Kick user by a nick from a group chat"
 msgstr "您被邀请到一个聊天室"
 
-#: gajim/command_system/implementation/standard.py:338
+#: gajim/command_system/implementation/standard.py:342
+#, fuzzy
 msgid ""
-"Set occupant role in group chat.\n"
+"Set participant role in group chat.\n"
 "    Role can be given as one of the following values:\n"
 "    moderator, participant, visitor, none"
 msgstr ""
@@ -8380,14 +8628,15 @@ msgstr ""
 "    可以给于以下身份：\n"
 "    moderator, participant, visitor, none"
 
-#: gajim/command_system/implementation/standard.py:343
+#: gajim/command_system/implementation/standard.py:347
 #, fuzzy
 msgid "Invalid role given"
 msgstr "无效的服务器"
 
-#: gajim/command_system/implementation/standard.py:350
+#: gajim/command_system/implementation/standard.py:354
+#, fuzzy
 msgid ""
-"Set occupant affiliation in group chat.\n"
+"Set participant affiliation in group chat.\n"
 "    Affiliation can be given as one of the following values:\n"
 "    owner, admin, member, outcast, none"
 msgstr ""
@@ -8395,20 +8644,23 @@ msgstr ""
 "    可以给于以下阶级：\n"
 "    owner, admin, member, outcast, none"
 
-#: gajim/command_system/implementation/standard.py:355
+#: gajim/command_system/implementation/standard.py:359
 msgid "Invalid affiliation given"
 msgstr "无效的阶级给与"
 
-#: gajim/command_system/implementation/standard.py:365
-msgid "Display names of all group chat occupants"
+#: gajim/command_system/implementation/standard.py:369
+#, fuzzy
+msgid "Display names of all group chat participants"
 msgstr "显示所有聊天室的成员名称"
 
-#: gajim/command_system/implementation/standard.py:387
-msgid "Forbid an occupant to send you public or private messages"
+#: gajim/command_system/implementation/standard.py:391
+#, fuzzy
+msgid "Forbid a participant to send you public or private messages"
 msgstr "禁止成员向您发送公开或私人消息"
 
-#: gajim/command_system/implementation/standard.py:392
-msgid "Allow an occupant to send you public or private messages"
+#: gajim/command_system/implementation/standard.py:396
+#, fuzzy
+msgid "Allow a participant to send you public or private messages"
 msgstr "允许成员向您发送公开或私人消息"
 
 #: gajim/command_system/implementation/middleware.py:74
@@ -8419,199 +8671,327 @@ msgstr ""
 msgid "The same as using a doc-string, except it supports translation"
 msgstr ""
 
-#: gajim/gtk/filetransfer.py:91
+#: gajim/gtk/groupchat_info.py:36
+#, fuzzy
+msgid "?Group chat feature:Archiving"
+msgstr "聊天室邀请"
+
+#: gajim/gtk/groupchat_info.py:37
+#, fuzzy
+msgid "Messages are archived on the server"
+msgstr "本次会话将在服务器上被存档"
+
+#: gajim/gtk/groupchat_info.py:40
+#, fuzzy
+msgid "?Group chat feature:Persistent"
+msgstr "聊天室支持"
+
+#: gajim/gtk/groupchat_info.py:41
+msgid "This group chat persists even if there are no participants"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:45
+#, fuzzy
+msgid "?Group chat feature:Temporary"
+msgstr "无"
+
+#: gajim/gtk/groupchat_info.py:46
+msgid "This group chat will be destroyed once the last participant left"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:50
+#, fuzzy
+msgid "?Group chat feature:Moderated"
+msgstr "无"
+
+#: gajim/gtk/groupchat_info.py:51
+msgid ""
+"Participants entering this group chat need to request permission to send "
+"messages"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:55
+#, fuzzy
+msgid "?Group chat feature:Not Moderated"
+msgstr "聊天室支持"
+
+#: gajim/gtk/groupchat_info.py:56
+msgid "Participants entering this group chat are allowed to send messages"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:60
+#, fuzzy
+msgid "?Group chat feature:Open"
+msgstr "无"
+
+#: gajim/gtk/groupchat_info.py:61
+#, fuzzy
+msgid "Anyone can join this group chat"
+msgstr "%s 加入聊天室"
+
+#: gajim/gtk/groupchat_info.py:64
+#, fuzzy
+msgid "?Group chat feature:Members Only"
+msgstr "聊天室突出显示："
+
+#: gajim/gtk/groupchat_info.py:65
+msgid "This group chat is restricted to members only"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:69
+#, fuzzy
+msgid "?Group chat feature:Public"
+msgstr "聊天室突出显示："
+
+#: gajim/gtk/groupchat_info.py:70
+msgid "Group chat can be found via search"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:73
+#, fuzzy
+msgid "?Group chat feature:Hidden"
+msgstr "无"
+
+#: gajim/gtk/groupchat_info.py:74
+#, fuzzy
+msgid "This group chat can not be found via search"
+msgstr "该操作无法撤销。"
+
+#: gajim/gtk/groupchat_info.py:77
+#, fuzzy
+msgid "?Group chat feature:Not Anonymous"
+msgstr "聊天室支持"
+
+#: gajim/gtk/groupchat_info.py:78
+msgid "All other group chat participants can see your XMPP address"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:82
+#, fuzzy
+msgid "?Group chat feature:Semi-Anonymous"
+msgstr "聊天室突出显示："
+
+#: gajim/gtk/groupchat_info.py:83
+msgid "Only moderators can see your XMPP address"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:86
+#, fuzzy
+msgid "?Group chat feature:Password Required"
+msgstr "聊天室支持"
+
+#: gajim/gtk/groupchat_info.py:87
+msgid "This group chat does require a password upon entry"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:91
+#, fuzzy
+msgid "?Group chat feature:No Password Required"
+msgstr "聊天室支持"
+
+#: gajim/gtk/groupchat_info.py:92
+msgid "This group chat does not require a password upon entry"
+msgstr ""
+
+#: gajim/gtk/filetransfer.py:90
 msgid "File"
 msgstr "文件"
 
-#: gajim/gtk/filetransfer.py:108
+#: gajim/gtk/filetransfer.py:107
 msgid "Time"
 msgstr "时间"
 
-#: gajim/gtk/filetransfer.py:228
+#: gajim/gtk/filetransfer.py:227
 #, fuzzy, python-format
 msgid "File name: %s"
 msgstr "文件名: %s"
 
-#: gajim/gtk/filetransfer.py:229 gajim/gtk/filetransfer.py:464
+#: gajim/gtk/filetransfer.py:228 gajim/gtk/filetransfer.py:469
 #, python-format
 msgid "Size: %s"
 msgstr "大小:%s"
 
-#: gajim/gtk/filetransfer.py:239
+#: gajim/gtk/filetransfer.py:238
 #, python-format
 msgid "Sender: %s"
 msgstr "发送者: %s"
 
-#: gajim/gtk/filetransfer.py:240 gajim/gtk/filetransfer.py:744
+#: gajim/gtk/filetransfer.py:239 gajim/gtk/filetransfer.py:749
 #: gajim/gtk/tooltips.py:577
 msgid "Recipient: "
 msgstr "接收者："
 
-#: gajim/gtk/filetransfer.py:251
+#: gajim/gtk/filetransfer.py:250
 #, python-format
 msgid "Saved in: %s"
 msgstr "保存在: %s"
 
-#: gajim/gtk/filetransfer.py:256
+#: gajim/gtk/filetransfer.py:255
 msgid "File transfer completed"
 msgstr "文件传输已完成"
 
-#: gajim/gtk/filetransfer.py:276 gajim/gtk/filetransfer.py:285
+#: gajim/gtk/filetransfer.py:275 gajim/gtk/filetransfer.py:284
 #, fuzzy
 msgid "Connection with peer could not be established."
 msgstr "无法与对方建立连接。"
 
-#: gajim/gtk/filetransfer.py:293
+#: gajim/gtk/filetransfer.py:292
 #, python-format
 msgid "Filename: %s"
 msgstr "文件名: %s"
 
-#: gajim/gtk/filetransfer.py:294
+#: gajim/gtk/filetransfer.py:293
 #, python-format
 msgid "Recipient: %s"
 msgstr "接收者: %s"
 
-#: gajim/gtk/filetransfer.py:296
+#: gajim/gtk/filetransfer.py:295
 #, python-format
 msgid "Error message: %s"
 msgstr "错误消息: %s"
 
-#: gajim/gtk/filetransfer.py:333
-#, fuzzy
-msgid "File transfer error"
-msgstr "文件传输错误"
-
 #: gajim/gtk/filetransfer.py:334
-#, python-format
+#, fuzzy, python-format
 msgid ""
-"The file %(file)s has been received, but it seems to have been damaged along "
-"the way.\n"
+"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"
 "重新下载？"
 
-#: gajim/gtk/filetransfer.py:350
+#: gajim/gtk/filetransfer.py:340
+#, fuzzy
+msgid "_Download Again"
+msgstr "不再询问(_D)"
+
+#: gajim/gtk/filetransfer.py:355
 msgid "Gajim can not read this file"
 msgstr "Gajim 无法读取此文件"
 
-#: gajim/gtk/filetransfer.py:351
+#: gajim/gtk/filetransfer.py:356
 msgid "Another process is using this file."
 msgstr "此文件正在其他进程运行。"
 
-#: gajim/gtk/filetransfer.py:418
+#: gajim/gtk/filetransfer.py:423
 #, fuzzy
 msgid "File Transfer Conflict"
 msgstr "文件传输完成"
 
-#: gajim/gtk/filetransfer.py:419
+#: gajim/gtk/filetransfer.py:424
 msgid "This file already exists"
 msgstr "文件已经存在"
 
-#: gajim/gtk/filetransfer.py:420
+#: gajim/gtk/filetransfer.py:425
 msgid "Resume download or replace file?"
 msgstr ""
 
-#: gajim/gtk/filetransfer.py:424
+#: gajim/gtk/filetransfer.py:429
 #, fuzzy
 msgid "Replace _File"
 msgstr "替换(_P)"
 
-#: gajim/gtk/filetransfer.py:427
+#: gajim/gtk/filetransfer.py:432
 #, fuzzy
 msgid "Resume _Download"
 msgstr "下载"
 
-#: gajim/gtk/filetransfer.py:437
+#: gajim/gtk/filetransfer.py:442
 #, fuzzy, python-format
 msgid "Directory '%s' is not writable"
 msgstr "目录 \"%s\" 不可写"
 
-#: gajim/gtk/filetransfer.py:438
+#: gajim/gtk/filetransfer.py:443
 #, fuzzy
 msgid "You do not have permissions to create files in this directory."
 msgstr "您没有权限在这个目录里创建文件。"
 
-#: gajim/gtk/filetransfer.py:461
+#: gajim/gtk/filetransfer.py:466
 #, python-format
 msgid "File: %s"
 msgstr "文件: %s"
 
-#: gajim/gtk/filetransfer.py:467
+#: gajim/gtk/filetransfer.py:472
 #, python-format
 msgid "Type: %s"
 msgstr "类型: %s"
 
-#: gajim/gtk/filetransfer.py:469
+#: gajim/gtk/filetransfer.py:474
 #, python-format
 msgid "Description: %s"
 msgstr "描述: %s"
 
-#: gajim/gtk/filetransfer.py:480
+#: gajim/gtk/filetransfer.py:485
 #, fuzzy, python-format
 msgid "%s wants to send you a file"
 msgstr "%s 想发送给您一个文件。"
 
-#: gajim/gtk/filetransfer.py:509
+#: gajim/gtk/filetransfer.py:514
 msgid "Checking file…"
 msgstr "正在检查文件…"
 
-#: gajim/gtk/filetransfer.py:524
+#: gajim/gtk/filetransfer.py:529
 msgid "File error"
 msgstr "文件错误"
 
-#: gajim/gtk/filetransfer.py:561
+#: gajim/gtk/filetransfer.py:566
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 
-#: gajim/gtk/filetransfer.py:658
+#: gajim/gtk/filetransfer.py:663
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/s)"
 
-#: gajim/gtk/filetransfer.py:711 gajim/gtk/filetransfer.py:715
+#: gajim/gtk/filetransfer.py:716 gajim/gtk/filetransfer.py:720
 msgid "Invalid File"
 msgstr "无效文件"
 
-#: gajim/gtk/filetransfer.py:711
+#: gajim/gtk/filetransfer.py:716
 msgid "File: "
 msgstr "文件: "
 
-#: gajim/gtk/filetransfer.py:716
+#: gajim/gtk/filetransfer.py:721
 msgid "It is not possible to send empty files"
 msgstr "无法发送空文件"
 
-#: gajim/gtk/filetransfer.py:742 gajim/gtk/tooltips.py:571
+#: gajim/gtk/filetransfer.py:747 gajim/gtk/tooltips.py:571
 msgid "Sender: "
 msgstr "发送者: "
 
-#: gajim/gtk/filetransfer.py:1038
+#: gajim/gtk/filetransfer.py:1043
 msgid "Choose a File to Send…"
 msgstr "选择要发送的文件…"
 
 #: gajim/gtk/start_chat.py:51
-msgid "Start new Conversation"
+#, fuzzy
+msgid "Start New Conversation"
 msgstr "开始新对话"
 
-#: gajim/gtk/start_chat.py:424
-msgid "New Groupchat"
-msgstr "新的聊天室"
+#: gajim/gtk/start_chat.py:260 gajim/gtk/start_chat.py:328
+msgid "You can not join a group chat unless you are connected."
+msgstr "您必须连接才能加入聊天室。"
+
+#: gajim/gtk/start_chat.py:603 gajim/gtk/groupchat_join.py:38
+msgid "Join Group Chat"
+msgstr "加入聊天室"
 
-#: gajim/gtk/start_chat.py:426
-msgid "New Contact"
-msgstr "新联系人"
+#: gajim/gtk/start_chat.py:605 gajim/gtk/add_contact.py:40
+#, fuzzy
+msgid "Add Contact"
+msgstr "添加联系人(_A)..."
 
-#: gajim/gtk/start_chat.py:588
+#: gajim/gtk/start_chat.py:746
 #, fuzzy, python-format
-msgid "%s Group chats found"
+msgid "%s group chats found"
 msgstr "%s 未找到"
 
-#: gajim/gtk/discovery.py:70
+#: gajim/gtk/discovery.py:69
 msgid "This service has not yet responded with detailed information"
 msgstr "服务还没有详细的信息应答"
 
-#: gajim/gtk/discovery.py:71
+#: gajim/gtk/discovery.py:70
 #, fuzzy
 msgid ""
 "This service could not respond with detailed information.\n"
@@ -8620,131 +9000,112 @@ msgstr ""
 "这个服务无法应答详细的信息。\n"
 "这很可能是服务器的遗留问题, 或者服务器被损坏了"
 
-#: gajim/gtk/discovery.py:128
+#: gajim/gtk/discovery.py:126
 msgid "Others"
 msgstr "其他"
 
-#: gajim/gtk/discovery.py:131
-msgid "Conference"
-msgstr "会议"
+#: gajim/gtk/discovery.py:129
+#, fuzzy
+msgid "Group Chat"
+msgstr "聊天室"
 
-#: gajim/gtk/discovery.py:519
+#: gajim/gtk/discovery.py:518
 msgid "Without a connection, you can not browse available services"
 msgstr "连接后才可浏览可用服务"
 
-#: gajim/gtk/discovery.py:606
+#: gajim/gtk/discovery.py:605
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "正在使用账户 %s 来发掘服务"
 
-#: gajim/gtk/discovery.py:608
+#: gajim/gtk/discovery.py:607
 msgid "Service Discovery"
 msgstr "搜索服务"
 
-#: gajim/gtk/discovery.py:691
+#: gajim/gtk/discovery.py:690
 msgid "The service could not be found"
 msgstr "找不到该服务"
 
-#: gajim/gtk/discovery.py:692
+#: gajim/gtk/discovery.py:691
 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:699 gajim/gtk/discovery.py:1042
+#: gajim/gtk/discovery.py:698 gajim/gtk/discovery.py:1041
 msgid "The service is not browsable"
 msgstr "该服务无法浏览"
 
-#: gajim/gtk/discovery.py:700
+#: gajim/gtk/discovery.py:699
 msgid "This type of service does not contain any items to browse."
 msgstr "此服务没有项目可浏览。"
 
-#: gajim/gtk/discovery.py:738 gajim/gtk/discovery.py:747
+#: gajim/gtk/discovery.py:737 gajim/gtk/discovery.py:746
 msgid "Invalid Server Name"
 msgstr "无效的服务器名"
 
-#: gajim/gtk/discovery.py:806
+#: gajim/gtk/discovery.py:805
 #, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "用账户 %(account)s 浏览地址 %(address)s"
 
-#: gajim/gtk/discovery.py:851
+#: gajim/gtk/discovery.py:850
 #, fuzzy
 msgid "Browse"
 msgstr "浏览(_B)"
 
-#: gajim/gtk/discovery.py:1043
+#: gajim/gtk/discovery.py:1042
 msgid "This service does not contain any items to browse."
 msgstr "此服务不包含任何项目可浏览。"
 
-#: gajim/gtk/discovery.py:1255
+#: gajim/gtk/discovery.py:1254
 #, fuzzy
 msgid "_Command"
 msgstr "命令"
 
-#: gajim/gtk/discovery.py:1264 gajim/gtk/discovery.py:1422
+#: gajim/gtk/discovery.py:1263 gajim/gtk/discovery.py:1420
 msgid "Re_gister"
 msgstr "注册(_G)"
 
-#: gajim/gtk/discovery.py:1277
+#: gajim/gtk/discovery.py:1276
 msgid "_Search"
 msgstr "查找(_S)"
 
-#: gajim/gtk/discovery.py:1420
+#: gajim/gtk/discovery.py:1418
 msgid "_Edit"
 msgstr "编辑(_E)"
 
-#: gajim/gtk/discovery.py:1458
+#: gajim/gtk/discovery.py:1456
 #, fuzzy, python-format
 msgid "Scanning %(current)d / %(total)d ..."
 msgstr "已扫描 %(current)d / %(total)d.."
 
-#: gajim/gtk/discovery.py:1674
+#: gajim/gtk/discovery.py:1655
+msgid "Users"
+msgstr "用户"
+
+#: gajim/gtk/discovery.py:1671
 msgid "Id"
 msgstr "Id"
 
-#: gajim/gtk/discovery.py:1713
-msgid "_Join"
-msgstr "加入(_J)"
-
-#: gajim/gtk/discovery.py:1736
-msgid "Bookmark already set"
-msgstr "书签已设定"
-
-#: gajim/gtk/discovery.py:1737
-#, fuzzy, python-format
-msgid "Group Chat '%s' is already in your bookmarks."
-msgstr "聊天室\"%s\"已在您的书签中。"
-
-#: gajim/gtk/discovery.py:1748
-msgid "Bookmark has been added successfully"
-msgstr "书签添加成功"
-
-#: gajim/gtk/discovery.py:1749
-#, fuzzy
-msgid ""
-"You can manage your bookmarks by clicking the Bookmarks menu item in your "
-"contact list."
-msgstr "您可以通过\"操作\"菜单管理您的书签。"
-
-#: gajim/gtk/discovery.py:1950
+#: gajim/gtk/discovery.py:1900
 msgid "Subscribed"
 msgstr "订阅"
 
-#: gajim/gtk/discovery.py:1959
+#: gajim/gtk/discovery.py:1909
 msgid "Node"
 msgstr "节点"
 
-#: gajim/gtk/discovery.py:2028
+#: gajim/gtk/discovery.py:1978
 #, fuzzy
 msgid "_New post"
 msgstr "新发表"
 
-#: gajim/gtk/discovery.py:2037
+#: gajim/gtk/discovery.py:1987
 msgid "_Subscribe"
 msgstr "订阅(_S)"
 
-#: gajim/gtk/discovery.py:2045
+#: gajim/gtk/discovery.py:1995
 msgid "_Unsubscribe"
 msgstr "退订(_S)"
 
@@ -8791,7 +9152,7 @@ msgstr "来自 %s"
 msgid "Characters typed: %s"
 msgstr "不允许的字符"
 
-#: gajim/gtk/single_message.py:274 gajim/gtk/xml_console.py:169
+#: gajim/gtk/single_message.py:274 gajim/gtk/xml_console.py:166
 msgid "Connection not available"
 msgstr "连接不可用"
 
@@ -8800,6 +9161,12 @@ msgstr "连接不可用"
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "请确认您已经连接到 \"%s\"。"
 
+#: gajim/gtk/single_message.py:306
+#, 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:330
 #, python-format
 msgid "RE: %s"
@@ -8810,28 +9177,28 @@ msgstr "回复: %s"
 msgid "%s wrote:\n"
 msgstr "%s 写道: \n"
 
-#: gajim/gtk/pep_config.py:44
+#: gajim/gtk/pep_config.py:45
 #, fuzzy, python-format
 msgid "PEP Service Configuration (%s)"
 msgstr "个人事件服务配置"
 
-#: gajim/gtk/pep_config.py:77
+#: gajim/gtk/pep_config.py:78
 #, fuzzy
 msgid "Service"
 msgstr "服务器"
 
-#: gajim/gtk/pep_config.py:114
+#: gajim/gtk/pep_config.py:115
 msgid "PEP node was not removed"
 msgstr "PEP节点没有被移除"
 
-#: gajim/gtk/pep_config.py:115
+#: gajim/gtk/pep_config.py:116
 #, fuzzy, python-format
 msgid ""
 "PEP node %(node)s was not removed:\n"
 "%(message)s"
 msgstr "PEP 节点 %(node)s 没有被移除: %(message)s"
 
-#: gajim/gtk/pep_config.py:146
+#: gajim/gtk/pep_config.py:147
 #, python-format
 msgid "Configure %s"
 msgstr "配置 %s"
@@ -8847,17 +9214,21 @@ msgstr "注册(_G): "
 msgid "Registration successful"
 msgstr "注册成功"
 
-#: gajim/gtk/dialogs.py:54 gajim/gtk/dataform.py:659 gajim/gtk/adhoc.py:85
+#: gajim/gtk/service_registration.py:215
+msgid "Registration failed"
+msgstr "注册失败"
+
+#: gajim/gtk/dialogs.py:53 gajim/gtk/dataform.py:668 gajim/gtk/adhoc.py:86
 #, fuzzy
 msgid "Cancel"
 msgstr "取消(_C)"
 
-#: gajim/gtk/dialogs.py:129
+#: gajim/gtk/dialogs.py:128
 #, python-format
 msgid "Dictionary for language \"%s\" not available"
 msgstr "语言“%s”的词典不可用"
 
-#: gajim/gtk/dialogs.py:130
+#: gajim/gtk/dialogs.py:129
 #, python-format
 msgid ""
 "You have to install the dictionary \"%s\" to use spellchecking, or choose "
@@ -8870,11 +9241,11 @@ msgstr ""
 "\n"
 "高亮拼写错误功能将不会被启用"
 
-#: gajim/gtk/dialogs.py:410 gajim/gtk/dialogs.py:425
+#: gajim/gtk/dialogs.py:322 gajim/gtk/dialogs.py:337
 msgid "Insecure connection"
 msgstr "不安全的连接"
 
-#: gajim/gtk/dialogs.py:411
+#: gajim/gtk/dialogs.py:323
 #, python-format
 msgid ""
 "You are about to connect to the account %(account)s (%(server)s) insecurely. "
@@ -8886,121 +9257,116 @@ msgstr ""
 "对话都不会被加密。强烈建议您不要这么做。\n"
 "您确定要这样做吗？"
 
-#: gajim/gtk/dialogs.py:416
+#: gajim/gtk/dialogs.py:328
 msgid "Yes, I really want to connect insecurely"
 msgstr "是的, 我确实想要不安全地连接"
 
-#: gajim/gtk/dialogs.py:417
+#: gajim/gtk/dialogs.py:329
 msgid "Gajim will NOT connect unless you check this box"
 msgstr "Gajim 将不会发起连接，除非您选择此选项"
 
-#: gajim/gtk/dialogs.py:675
-#, fuzzy
-msgid "The nickname contains invalid characters."
-msgstr "昵称包含不合法字符。"
-
-#: gajim/gtk/dialogs.py:734
+#: gajim/gtk/dialogs.py:561
 #, fuzzy, python-format
 msgid "Destroy %s"
 msgstr "正在销毁 %s"
 
-#: gajim/gtk/dialogs.py:775
+#: gajim/gtk/dialogs.py:602
 #, fuzzy
 msgid "Certificate"
 msgstr "客户端证书"
 
-#: gajim/gtk/dialogs.py:786
+#: gajim/gtk/dialogs.py:613
 #, fuzzy, python-format
 msgid ""
 "Certificate for account\n"
 "%s"
 msgstr "帐户 %s"
 
-#: gajim/gtk/dialogs.py:824
+#: gajim/gtk/dialogs.py:651
 msgid "Issued to\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:825 gajim/gtk/dialogs.py:830
+#: gajim/gtk/dialogs.py:652 gajim/gtk/dialogs.py:657
 msgid "Common Name (CN): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:826 gajim/gtk/dialogs.py:831
+#: gajim/gtk/dialogs.py:653 gajim/gtk/dialogs.py:658
 msgid "Organization (O): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:827 gajim/gtk/dialogs.py:832
+#: gajim/gtk/dialogs.py:654 gajim/gtk/dialogs.py:659
 msgid "Organizational Unit (OU): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:828
+#: gajim/gtk/dialogs.py:655
 #, fuzzy
 msgid "Serial Number: "
 msgstr "GG 号码: "
 
-#: gajim/gtk/dialogs.py:829
+#: gajim/gtk/dialogs.py:656
 msgid "Issued by\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:833
+#: gajim/gtk/dialogs.py:660
 msgid "Validity\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:834
+#: gajim/gtk/dialogs.py:661
 msgid "Issued on: "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:835
+#: gajim/gtk/dialogs.py:662
 #, fuzzy
 msgid "Expires on: "
 msgstr "expire"
 
-#: gajim/gtk/dialogs.py:836
+#: gajim/gtk/dialogs.py:663
 msgid "SHA-1:"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:838
+#: gajim/gtk/dialogs.py:665
 msgid "SHA-256:"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:852
+#: gajim/gtk/dialogs.py:679
 #, fuzzy
 msgid "View certificate…"
 msgstr "查看证书…"
 
-#: gajim/gtk/dialogs.py:864 gajim/gtk/accounts.py:893
+#: gajim/gtk/dialogs.py:691 gajim/gtk/accounts.py:896
 msgid "Change Password"
 msgstr "更改密码"
 
-#: gajim/gtk/dialogs.py:878
+#: gajim/gtk/dialogs.py:705
 msgid "_OK"
 msgstr "确定(_O)"
 
-#: gajim/gtk/dialogs.py:891
+#: gajim/gtk/dialogs.py:718
 #, fuzzy
 msgid "You must enter a password"
 msgstr "您必须输入密码"
 
-#: gajim/gtk/dialogs.py:895
+#: gajim/gtk/dialogs.py:722
 msgid "Passwords do not match"
 msgstr "密码不匹配"
 
-#: gajim/gtk/dialogs.py:923
+#: gajim/gtk/dialogs.py:750
 #, fuzzy
 msgid "Group Chat Invitation "
 msgstr "聊天室邀请"
 
-#: gajim/gtk/dialogs.py:948
+#: gajim/gtk/dialogs.py:775
 #, fuzzy, python-format
 msgid "<b>%s</b> has invited you to join a discussion"
 msgstr "$Contact 邀请您加入一个聊天室"
 
-#: gajim/gtk/dialogs.py:951
+#: gajim/gtk/dialogs.py:778
 #, 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:959
+#: gajim/gtk/dialogs.py:786
 #, python-format
 msgid "Comment: %s"
 msgstr "注释: %s"
@@ -9015,11 +9381,6 @@ msgstr "GG 号码: "
 msgid "ICQ Number"
 msgstr "ICQ 号码: "
 
-#: gajim/gtk/add_contact.py:40
-#, fuzzy
-msgid "Add Contact"
-msgstr "添加联系人(_A)..."
-
 #: gajim/gtk/add_contact.py:259
 #, fuzzy, python-format
 msgid "%s Missing"
@@ -9040,7 +9401,8 @@ msgid "The user ID must not contain a resource."
 msgstr "用户ID不应包含资源。"
 
 #: gajim/gtk/add_contact.py:299
-msgid "You cannot add yourself to your roster."
+#, fuzzy
+msgid "You cannot add yourself to your contact list."
 msgstr "您不能将您自己添加到您的联系人列表中。"
 
 #: gajim/gtk/add_contact.py:304
@@ -9053,11 +9415,13 @@ msgid "Your account must be online to add new contacts."
 msgstr ""
 
 #: gajim/gtk/add_contact.py:321
-msgid "Contact already in roster"
+#, fuzzy
+msgid "Contact Already in Contact List"
 msgstr "联系人已经在联系人列表中"
 
 #: gajim/gtk/add_contact.py:322
-msgid "This contact is already listed in your roster."
+#, fuzzy
+msgid "This contact is already in your contact list."
 msgstr "此联系人已经在您的联系人列表中了"
 
 #: gajim/gtk/add_contact.py:379 gajim/gtk/add_contact.py:417
@@ -9099,12 +9463,13 @@ msgid "Chatstate Paused"
 msgstr "改变状态"
 
 #: gajim/gtk/themes.py:52
-msgid "MUC Tab New Directed Message"
+#, fuzzy
+msgid "Group Chat Tab New Directed Message"
 msgstr "MUC重定向消息"
 
 #: gajim/gtk/themes.py:56
 #, fuzzy
-msgid "MUC Tab New Message"
+msgid "Group Chat Tab New Message"
 msgstr "新消息"
 
 #: gajim/gtk/themes.py:60
@@ -9319,12 +9684,12 @@ msgstr "所有文件"
 msgid "Clear File"
 msgstr "清除文件"
 
-#: gajim/gtk/settings.py:570
+#: gajim/gtk/settings.py:570 gajim/gtk/proxies.py:32
 msgid "Manage Proxies"
 msgstr "管理代理服务器设置"
 
-#: gajim/gtk/settings.py:591 gajim/gtk/preferences.py:971
-#: gajim/gtk/preferences.py:984 gajim/gtk/preferences.py:988
+#: gajim/gtk/settings.py:591 gajim/gtk/preferences.py:968
+#: gajim/gtk/preferences.py:982 gajim/gtk/preferences.py:986
 #, fuzzy
 msgid "No Proxy"
 msgstr "代理服务器(_Y): "
@@ -9405,13 +9770,15 @@ msgid ""
 "        "
 msgstr ""
 
-#: gajim/gtk/about.py:47 data/org.gajim.Gajim.appdata.xml.in:10
-msgid "A GTK+ XMPP client"
+#: gajim/gtk/about.py:47 data/org.gajim.Gajim.desktop.in:6
+#: data/org.gajim.Gajim.appdata.xml.in:10
+#, fuzzy
+msgid "A GTK XMPP client"
 msgstr "一个 GTK+ 的 XMPP 客户端"
 
 #: gajim/gtk/about.py:48
-#, python-format
-msgid "GTK+ Version: %s"
+#, fuzzy, python-format
+msgid "GTK Version: %s"
 msgstr "GTK+ 版本：%s"
 
 #: gajim/gtk/about.py:49
@@ -9584,6 +9951,25 @@ msgstr "?transfer status:暂停"
 msgid "?transfer status:Not started"
 msgstr "?transfer status:暂停"
 
+#: gajim/gtk/groupchat_creation.py:97 gajim/gtk/groupchat_creation.py:99
+msgid " (optional)..."
+msgstr ""
+
+#: gajim/gtk/groupchat_creation.py:134
+#, fuzzy
+msgid "Invalid Address"
+msgstr "无效文件"
+
+#: gajim/gtk/groupchat_creation.py:182
+#, fuzzy
+msgid "Not Connected"
+msgstr "已连接"
+
+#: gajim/gtk/groupchat_creation.py:183
+#, fuzzy
+msgid "You have to be connected to create a group chat."
+msgstr "您还没有加入聊天室。"
+
 #: gajim/gtk/sounds.py:39
 msgid "Wav Sounds"
 msgstr "Wav声音"
@@ -9625,47 +10011,43 @@ msgstr "聊天室消息突出显示"
 msgid "Group Chat Message Received"
 msgstr "收到的聊天室消息"
 
-#: gajim/gtk/dataform.py:226 gajim/gtk/dataform.py:262
+#: gajim/gtk/dataform.py:232 gajim/gtk/dataform.py:268
 #, fuzzy
 msgid "Required"
 msgstr "require"
 
-#: gajim/gtk/dataform.py:286
+#: gajim/gtk/dataform.py:293
 msgid "Yes"
 msgstr "Yes"
 
-#: gajim/gtk/dataform.py:286
+#: gajim/gtk/dataform.py:293
 msgid "No"
 msgstr "No"
 
-#: gajim/gtk/dataform.py:661
+#: gajim/gtk/dataform.py:670
 msgid "Submit"
 msgstr ""
 
-#: gajim/gtk/statusicon.py:213
+#: gajim/gtk/statusicon.py:206
 msgid "_Change Status Message…"
 msgstr "更改状态信息…(_C)"
 
-#: gajim/gtk/statusicon.py:247 gajim/gtk/statusicon.py:292
-#: gajim/gtk/statusicon.py:299
+#: gajim/gtk/statusicon.py:258
 #, python-format
 msgid "using account %s"
 msgstr "使用账户 %s"
 
-#: gajim/gtk/statusicon.py:309
+#: gajim/gtk/statusicon.py:269
 #, fuzzy
-msgid "_Manage Bookmarks…"
-msgstr "书签管理"
-
-#: gajim/gtk/statusicon.py:325
-msgid "Hide _Roster"
-msgstr "隐藏联系人列表(_R)"
+msgid "Hide _Contact List"
+msgstr "邀请联系人(_C)"
 
-#: gajim/gtk/statusicon.py:329
-msgid "Show _Roster"
-msgstr "显示联系人列表(_R)"
+#: gajim/gtk/statusicon.py:273
+#, fuzzy
+msgid "Show _Contact List"
+msgstr "只显示活动的联系人(_A)"
 
-#: gajim/gtk/statusicon.py:337
+#: gajim/gtk/statusicon.py:281
 msgid "Hide this menu"
 msgstr "隐藏本菜单"
 
@@ -9708,33 +10090,6 @@ msgid ""
 "later."
 msgstr "发布您的个人信息时发生错误, 请稍后重试。"
 
-#: gajim/gtk/join_groupchat.py:202
-msgid "Invalid Room"
-msgstr "无效的聊天室"
-
-#: gajim/gtk/join_groupchat.py:203
-msgid "Please choose a room"
-msgstr "请选择一个聊天室"
-
-#: gajim/gtk/join_groupchat.py:222 gajim/gtk/join_groupchat.py:229
-msgid "Invalid Nickname"
-msgstr "不合法的昵称"
-
-#: gajim/gtk/join_groupchat.py:223
-msgid "Please choose a nickname"
-msgstr "请选择一个昵称"
-
-#: gajim/gtk/join_groupchat.py:282 gajim/gtk/join_groupchat.py:288
-#: gajim/gtk/join_groupchat.py:293
-msgid "Wrong server"
-msgstr "错误的服务器"
-
-#: gajim/gtk/join_groupchat.py:283 gajim/gtk/join_groupchat.py:289
-#: gajim/gtk/join_groupchat.py:294
-#, python-format
-msgid "%s is not a groupchat server"
-msgstr "%s 不是一个聊天室服务器"
-
 #: gajim/gtk/mam_preferences.py:38
 #, python-format
 msgid "Archiving Preferences for %s"
@@ -9764,45 +10119,53 @@ msgstr "收到错误：{}"
 msgid "Archiving Preferences Error"
 msgstr "编辑存档首选项(_V)"
 
-#: gajim/gtk/advanced_config.py:81
+#: gajim/gtk/advanced_config.py:95
 msgid "Activated"
 msgstr "激活的"
 
-#: gajim/gtk/advanced_config.py:81
+#: gajim/gtk/advanced_config.py:95
 msgid "Deactivated"
 msgstr "未激活的"
 
-#: gajim/gtk/advanced_config.py:83
-msgid "Boolean"
-msgstr "Boolean"
+#: gajim/gtk/advanced_config.py:97
+msgid "?config type:Boolean"
+msgstr ""
+
+#: gajim/gtk/advanced_config.py:98
+msgid "?config type:Integer"
+msgstr ""
 
-#: gajim/gtk/advanced_config.py:84
-msgid "Integer"
-msgstr "Integer"
+#: gajim/gtk/advanced_config.py:99
+msgid "?config type:Text"
+msgstr ""
 
-#: gajim/gtk/advanced_config.py:85
-msgid "Text"
-msgstr "Text"
+#: gajim/gtk/advanced_config.py:100
+msgid "?config type:Color"
+msgstr ""
 
-#: gajim/gtk/advanced_config.py:97
-msgid "Preference Name"
+#: gajim/gtk/advanced_config.py:112
+#, fuzzy
+msgid "?config:Preference Name"
 msgstr "Preference Name"
 
-#: gajim/gtk/advanced_config.py:104
-msgid "Value"
-msgstr "值"
+#: gajim/gtk/advanced_config.py:123
+#, fuzzy
+msgid "?config:Value"
+msgstr "配置"
 
-#: gajim/gtk/advanced_config.py:113
-msgid "Type"
-msgstr "类型"
+#: gajim/gtk/advanced_config.py:132
+msgid "?config:Type"
+msgstr ""
 
-#: gajim/gtk/advanced_config.py:168
-msgid "(None)"
-msgstr "(无)"
+#: gajim/gtk/advanced_config.py:187
+#, fuzzy
+msgid "?config description:None"
+msgstr "无"
 
-#: gajim/gtk/advanced_config.py:299
-msgid "Hidden"
-msgstr "隐藏"
+#: gajim/gtk/advanced_config.py:322
+#, fuzzy
+msgid "?password:Hidden"
+msgstr "密码: "
 
 #: gajim/gtk/server_info.py:66
 #, fuzzy
@@ -9814,8 +10177,8 @@ msgstr "复制链接位置(_C)"
 msgid "%(days)s days, %(hours)s hours"
 msgstr ""
 
-#: gajim/gtk/server_info.py:218 gajim/gtk/accounts.py:749
-#: gajim/gtk/accounts.py:853
+#: gajim/gtk/server_info.py:218 gajim/gtk/accounts.py:752
+#: gajim/gtk/accounts.py:856
 #, fuzzy
 msgid "Hostname"
 msgstr "主机名(_H): "
@@ -10000,11 +10363,6 @@ msgstr "不合法的列表名"
 msgid "You must enter a name to create a privacy list."
 msgstr "您必须输入一个名称以创建一个隐私策略列表。"
 
-#: gajim/gtk/groupchat_config.py:41
-#, fuzzy
-msgid "Group Chat Configuration"
-msgstr "聊天室邀请"
-
 #: gajim/gtk/groupchat_config.py:134
 #, fuzzy
 msgid "A Group Chat needs at least one Owner"
@@ -10015,69 +10373,69 @@ msgid "You are not allowed to modify the affiliation of Admins and Owners"
 msgstr ""
 
 #: gajim/gtk/groupchat_config.py:399
-msgid "An entry with this Jabber-ID already exists"
+msgid "An entry with this XMPP Address already exists"
 msgstr ""
 
-#: gajim/gtk/adhoc.py:91
+#: gajim/gtk/adhoc.py:92
 #, fuzzy
 msgid "Finish"
 msgstr "完成(_F)"
 
-#: gajim/gtk/adhoc.py:97 gajim/gtk/adhoc.py:283
+#: gajim/gtk/adhoc.py:98 gajim/gtk/adhoc.py:284
 #, fuzzy
 msgid "Commands"
 msgstr "命令"
 
-#: gajim/gtk/adhoc.py:103
+#: gajim/gtk/adhoc.py:104
 msgid "Next"
 msgstr ""
 
-#: gajim/gtk/adhoc.py:109
+#: gajim/gtk/adhoc.py:110
 #, fuzzy
 msgid "Previous"
 msgstr "羡慕"
 
-#: gajim/gtk/adhoc.py:115
+#: gajim/gtk/adhoc.py:116
 #, fuzzy
 msgid "Execute"
 msgstr "执行命令(_E)..."
 
-#: gajim/gtk/adhoc.py:195
+#: gajim/gtk/adhoc.py:196
 #, fuzzy
 msgid "No commands available"
 msgstr "没有有效账户"
 
-#: gajim/gtk/adhoc.py:244
+#: gajim/gtk/adhoc.py:245
 #, fuzzy
 msgid "Request Command List"
 msgstr "执行命令(_E)..."
 
-#: gajim/gtk/adhoc.py:259
+#: gajim/gtk/adhoc.py:260
 #, fuzzy
 msgid "Executing…"
 msgstr "执行命令(_E)..."
 
-#: gajim/gtk/adhoc.py:266
+#: gajim/gtk/adhoc.py:267
 #, fuzzy
 msgid "Command List"
 msgstr "封禁名单"
 
-#: gajim/gtk/adhoc.py:384
+#: gajim/gtk/adhoc.py:385
 #, fuzzy
 msgid "Finished"
 msgstr "完成(_F)"
 
-#: gajim/gtk/adhoc.py:453
+#: gajim/gtk/adhoc.py:454
 #, fuzzy
 msgid "Execution failed"
 msgstr "连接失败"
 
-#: gajim/gtk/blocking.py:37
+#: gajim/gtk/blocking.py:38
 #, fuzzy, python-format
 msgid "Blocking List for %s"
 msgstr "%s 的隐私策略列表"
 
-#: gajim/gtk/blocking.py:71
+#: gajim/gtk/blocking.py:72
 #, fuzzy
 msgid "Error!"
 msgstr "错误"
@@ -10126,8 +10484,7 @@ msgstr "无效用户名"
 msgid "You must provide a username to configure this account."
 msgstr "必须提供用户名来配置此账户。"
 
-#: gajim/gtk/account_wizard.py:252 gajim/gtk/bookmarks.py:290
-#: gajim/gtk/bookmarks.py:303
+#: gajim/gtk/account_wizard.py:252
 msgid "Invalid server"
 msgstr "无效的服务器"
 
@@ -10143,7 +10500,7 @@ msgstr "无效输入"
 msgid "Custom port must be a port number."
 msgstr "自定义端口必须为端口号。"
 
-#: gajim/gtk/account_wizard.py:405
+#: gajim/gtk/account_wizard.py:406
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -10158,15 +10515,15 @@ msgstr ""
 "SSL 错误: %(error)s\n"
 "您仍然想要连接到这个服务器吗?"
 
-#: gajim/gtk/account_wizard.py:446 gajim/gtk/account_wizard.py:480
+#: gajim/gtk/account_wizard.py:447 gajim/gtk/account_wizard.py:481
 msgid "An error occurred during account creation"
 msgstr "创建帐户过程中发生错误"
 
-#: gajim/gtk/account_wizard.py:545
+#: gajim/gtk/account_wizard.py:546
 msgid "Account name is in use"
 msgstr "帐户名已经被使用"
 
-#: gajim/gtk/account_wizard.py:546
+#: gajim/gtk/account_wizard.py:547
 msgid "You already have an account using this name."
 msgstr "您已经有账户使用了这个名字了。"
 
@@ -10193,25 +10550,25 @@ msgstr "已收到 %(max)s 中的 %(received)s"
 msgid "%(minutes)s min %(seconds)s sec"
 msgstr ""
 
-#: gajim/gtk/xml_console.py:77
+#: gajim/gtk/xml_console.py:74
 #, fuzzy
 msgid "Filter"
 msgstr "过滤器: "
 
-#: gajim/gtk/xml_console.py:82
+#: gajim/gtk/xml_console.py:79
 msgid "XML Input"
 msgstr "XML 输入"
 
-#: gajim/gtk/xml_console.py:86
+#: gajim/gtk/xml_console.py:83
 msgid "Paste Last Input"
 msgstr ""
 
-#: gajim/gtk/xml_console.py:170
+#: gajim/gtk/xml_console.py:167
 #, fuzzy, python-format
 msgid "Please make sure you are connected with '%s'."
 msgstr "请确认您已经连接到 \"%s\"。"
 
-#: gajim/gtk/xml_console.py:182
+#: gajim/gtk/xml_console.py:177
 #, fuzzy
 msgid "Invalid Node"
 msgstr "无效文件"
@@ -10244,305 +10601,315 @@ msgstr "查找"
 msgid "No results found"
 msgstr "无结果"
 
-#: gajim/gtk/preferences.py:358 gajim/gtk/preferences.py:362
+#: gajim/gtk/preferences.py:357 gajim/gtk/preferences.py:361
 msgid "Default"
 msgstr "默认"
 
-#: gajim/gtk/preferences.py:801
+#: gajim/gtk/preferences.py:798
 msgid "status message title"
 msgstr "状态信息标题"
 
-#: gajim/gtk/preferences.py:802
+#: gajim/gtk/preferences.py:799
 msgid "status message text"
 msgstr "状态信息文本"
 
+#: gajim/gtk/accounts.py:137
+#, fuzzy
+msgid "Re-Login"
+msgstr "现在重新登录?"
+
 #: gajim/gtk/accounts.py:138
-msgid "Relogin now?"
+#, fuzzy
+msgid "Re-Login now?"
 msgstr "现在重新登录?"
 
 #: gajim/gtk/accounts.py:139
-msgid "If you want all the changes to apply instantly, you must relogin."
+#, fuzzy
+msgid "To apply all changes instantly, you have to re-login."
 msgstr "如果想使所有调整立即生效, 您必须重新登录。"
 
-#: gajim/gtk/accounts.py:191 gajim/gtk/accounts.py:975
+#: gajim/gtk/accounts.py:141
+msgid "_Later"
+msgstr ""
+
+#: gajim/gtk/accounts.py:143
+msgid "_Re-Login"
+msgstr ""
+
+#: gajim/gtk/accounts.py:194 gajim/gtk/accounts.py:978
 #, fuzzy
 msgid "Remove Account"
 msgstr "移除账户 %s"
 
-#: gajim/gtk/accounts.py:192
+#: gajim/gtk/accounts.py:195
 #, fuzzy, python-format
 msgid "You still have open chats in your account %s"
 msgstr "您已在账户 %s 打开聊天"
 
-#: gajim/gtk/accounts.py:193
+#: gajim/gtk/accounts.py:196
 #, fuzzy
 msgid ""
 "All chat and group chat windows will be closed.\n"
 "Do you want to continue?"
 msgstr "所有的聊天和聊天室窗口将会关闭。您想继续吗?"
 
-#: gajim/gtk/accounts.py:424
+#: gajim/gtk/accounts.py:427
 #, fuzzy
 msgid "Back"
 msgstr "马上回来"
 
-#: gajim/gtk/accounts.py:530
+#: gajim/gtk/accounts.py:533
 #, fuzzy
 msgid "Please check if Bonjour is installed."
 msgstr "请检查 Avahi 或者 Bonjour 是否已经安装。"
 
-#: gajim/gtk/accounts.py:532
+#: gajim/gtk/accounts.py:535
 #, fuzzy
 msgid "Please check if Avahi is installed."
 msgstr "请检查 Avahi 或者 Bonjour 是否已经安装。"
 
-#: gajim/gtk/accounts.py:569
+#: gajim/gtk/accounts.py:572
 #, fuzzy
 msgid "Disable Account"
 msgstr "无效的账户"
 
-#: gajim/gtk/accounts.py:570
+#: gajim/gtk/accounts.py:573
 #, fuzzy, python-format
 msgid "Account %s is still connected"
 msgstr "账户 \"%s\" 已连接到服务器"
 
-#: gajim/gtk/accounts.py:571
+#: gajim/gtk/accounts.py:574
 #, fuzzy
 msgid ""
 "All chat and group chat windows will be closed. Do you want to continue?"
 msgstr "所有的聊天和聊天室窗口将会关闭。您想继续吗?"
 
-#: gajim/gtk/accounts.py:576
+#: gajim/gtk/accounts.py:579
 #, fuzzy
 msgid "_Disable Account"
 msgstr "无效的账户"
 
-#: gajim/gtk/accounts.py:595
+#: gajim/gtk/accounts.py:598
 #, fuzzy
 msgid "Add Account"
 msgstr "添加联系人(_A)..."
 
-#: gajim/gtk/accounts.py:663
+#: gajim/gtk/accounts.py:666
 #, fuzzy
 msgid "Label"
 msgstr "标签"
 
-#: gajim/gtk/accounts.py:667
+#: gajim/gtk/accounts.py:670
 msgid "Login"
 msgstr ""
 
-#: gajim/gtk/accounts.py:670
+#: gajim/gtk/accounts.py:673
 #, fuzzy
 msgid "Import Contacts"
 msgstr "邀请联系人(_C)"
 
-#: gajim/gtk/accounts.py:674 gajim/gtk/accounts.py:870
+#: gajim/gtk/accounts.py:677 gajim/gtk/accounts.py:873
 #, fuzzy
 msgid "Client Certificate"
 msgstr "客户端证书"
 
-#: gajim/gtk/accounts.py:677 gajim/gtk/accounts.py:774
+#: gajim/gtk/accounts.py:680 gajim/gtk/accounts.py:777
 #, fuzzy
 msgid "Connect on startup"
 msgstr "Gajim 启动时连接(_O)"
 
-#: gajim/gtk/accounts.py:681 gajim/gtk/accounts.py:779
+#: gajim/gtk/accounts.py:684 gajim/gtk/accounts.py:782
 #, fuzzy
 msgid "Save conversations for all contacts"
 msgstr "保存与所有联系人的聊天记录(_L)"
 
-#: gajim/gtk/accounts.py:683 gajim/gtk/accounts.py:781
+#: gajim/gtk/accounts.py:686 gajim/gtk/accounts.py:784
 msgid "Store conversations on the harddrive"
 msgstr ""
 
-#: gajim/gtk/accounts.py:685 gajim/gtk/accounts.py:783
+#: gajim/gtk/accounts.py:688 gajim/gtk/accounts.py:786
 #, fuzzy
 msgid "Global Status"
 msgstr "所有状态"
 
-#: gajim/gtk/accounts.py:687
+#: gajim/gtk/accounts.py:690
 #, fuzzy
 msgid "Synchronise the status of all accounts"
 msgstr "改变一个或多个账户状态"
 
-#: gajim/gtk/accounts.py:689
+#: gajim/gtk/accounts.py:692
 msgid "Use file transfer proxies"
 msgstr "使用文件传输代理服务器"
 
-#: gajim/gtk/accounts.py:705
+#: gajim/gtk/accounts.py:708
 #, fuzzy
 msgid "Idle Time"
 msgstr "空闲开始时间："
 
-#: gajim/gtk/accounts.py:707
+#: gajim/gtk/accounts.py:710
 msgid "Disclose the time of your last activity"
 msgstr ""
 
-#: gajim/gtk/accounts.py:709
+#: gajim/gtk/accounts.py:712
 msgid "Local System Time"
 msgstr ""
 
-#: gajim/gtk/accounts.py:711
+#: gajim/gtk/accounts.py:714
 msgid "Disclose the local system time of the device Gajim runs on"
 msgstr ""
 
-#: gajim/gtk/accounts.py:714
+#: gajim/gtk/accounts.py:717
 #, fuzzy
 msgid "Client / Operating System"
 msgstr "客户端证书"
 
-#: gajim/gtk/accounts.py:716
+#: gajim/gtk/accounts.py:719
 #, fuzzy
 msgid ""
 "Disclose informations about the client and operating system you currently use"
 msgstr "如果选定, Gajim 会允许他人侦测到您所使用的操作系统"
 
-#: gajim/gtk/accounts.py:719
+#: gajim/gtk/accounts.py:722
 #, fuzzy
 msgid "Ignore Unknown Contacts"
 msgstr "邀请联系人(_C)"
 
-#: gajim/gtk/accounts.py:721
+#: gajim/gtk/accounts.py:724
 #, fuzzy
 msgid "Ignore everything from contacts not in your Roster"
 msgstr "忽略联系人列表以外的联系人触发的事件(_I)"
 
-#: gajim/gtk/accounts.py:737 gajim/gtk/accounts.py:776
+#: gajim/gtk/accounts.py:740 gajim/gtk/accounts.py:779
 #, fuzzy
 msgid "Use environment variable"
 msgstr "使用 HTTP__PROXY 环境变量(_U)"
 
-#: gajim/gtk/accounts.py:739
-#, fuzzy
-msgid "Proxy"
-msgstr "代理服务器(_Y): "
-
-#: gajim/gtk/accounts.py:742
+#: gajim/gtk/accounts.py:745
 #, fuzzy
 msgid "Warn on insecure connection"
 msgstr "在使用不安全的连接之前警告（_W）"
 
-#: gajim/gtk/accounts.py:746
+#: gajim/gtk/accounts.py:749
 #, fuzzy
 msgid "Send keep-alive packets"
 msgstr "发送数据包以防止连接超时"
 
-#: gajim/gtk/accounts.py:750
+#: gajim/gtk/accounts.py:753
 msgid "Manually set the hostname for the server"
 msgstr ""
 
-#: gajim/gtk/accounts.py:756 gajim/gtk/accounts.py:826
-#: gajim/gtk/accounts.py:831
+#: gajim/gtk/accounts.py:759 gajim/gtk/accounts.py:829
+#: gajim/gtk/accounts.py:834
 #, fuzzy
 msgid "Priority"
 msgstr "优先级(_T):"
 
-#: gajim/gtk/accounts.py:785
+#: gajim/gtk/accounts.py:788
 #, fuzzy
 msgid "Synchronize the status of all accounts"
 msgstr "改变一个或多个账户状态"
 
-#: gajim/gtk/accounts.py:795
+#: gajim/gtk/accounts.py:798
 #, fuzzy
 msgid "First Name"
 msgstr "名: "
 
-#: gajim/gtk/accounts.py:798
+#: gajim/gtk/accounts.py:801
 #, fuzzy
 msgid "Last Name"
 msgstr "姓: "
 
-#: gajim/gtk/accounts.py:804
+#: gajim/gtk/accounts.py:807
 #, fuzzy
 msgid "Email"
 msgstr "新电子邮件"
 
-#: gajim/gtk/accounts.py:822
+#: gajim/gtk/accounts.py:825
 #, fuzzy
 msgid "Adjust to status"
 msgstr "依据状态调整(_A)"
 
-#: gajim/gtk/accounts.py:849
+#: gajim/gtk/accounts.py:852
 #, fuzzy
 msgid "Enable"
 msgstr "启用"
 
-#: gajim/gtk/accounts.py:857
+#: gajim/gtk/accounts.py:860
 #, fuzzy
 msgid "Port"
 msgstr "端口(_P)"
 
-#: gajim/gtk/accounts.py:862
+#: gajim/gtk/accounts.py:865
 #, fuzzy
 msgid "Connection Settings"
 msgstr "连接"
 
-#: gajim/gtk/accounts.py:872
+#: gajim/gtk/accounts.py:875
 msgid "PKCS12 Files"
 msgstr "PKCS12 文件"
 
-#: gajim/gtk/accounts.py:874
+#: gajim/gtk/accounts.py:877
 #, fuzzy
 msgid "Encrypted Certificate"
 msgstr "客户端证书"
 
-#: gajim/gtk/accounts.py:878
+#: gajim/gtk/accounts.py:881
 #, fuzzy
 msgid "Certificate Settings"
 msgstr "客户端证书"
 
-#: gajim/gtk/accounts.py:890
+#: gajim/gtk/accounts.py:893
 #, fuzzy
 msgid "Save Password"
 msgstr "保存密码"
 
-#: gajim/gtk/accounts.py:898
+#: gajim/gtk/accounts.py:901
 #, fuzzy
 msgid "Login Settings"
 msgstr "插件"
 
-#: gajim/gtk/accounts.py:931
+#: gajim/gtk/accounts.py:934
 #, fuzzy, python-format
 msgid "Removing account %s"
 msgstr "移除账户 %s"
 
-#: gajim/gtk/accounts.py:946
+#: gajim/gtk/accounts.py:949
 msgid "Account is disabled"
 msgstr "账户被禁用"
 
-#: gajim/gtk/accounts.py:947
+#: gajim/gtk/accounts.py:950
 #, fuzzy
 msgid "To unregister from a server, the account must be enabled."
 msgstr "要从服务器移除注册, 账户必须被启用。"
 
-#: gajim/gtk/accounts.py:962
+#: gajim/gtk/accounts.py:965
 #, fuzzy
 msgid "Password required"
 msgstr "需要密码"
 
-#: gajim/gtk/accounts.py:976
+#: gajim/gtk/accounts.py:979
 #, fuzzy, python-format
 msgid "Account '%s' is still connected to the server"
 msgstr "账户 \"%s\" 已连接到服务器"
 
-#: gajim/gtk/accounts.py:978
+#: gajim/gtk/accounts.py:981
 msgid "If you remove it, the connection will be lost."
 msgstr "如果移除, 将会丢失连接"
 
-#: gajim/gtk/accounts.py:995
+#: gajim/gtk/accounts.py:998
 #, python-format
 msgid "Connection to server %s failed"
 msgstr "连接服务器 %s 失败"
 
-#: gajim/gtk/accounts.py:996
+#: gajim/gtk/accounts.py:999
 msgid "What would you like to do?"
 msgstr "您想做什么?"
 
-#: gajim/gtk/accounts.py:997
+#: gajim/gtk/accounts.py:1000
 msgid "Remove only from Gajim"
 msgstr "仅从 Gajim 移除帐户"
 
-#: gajim/gtk/accounts.py:998
+#: gajim/gtk/accounts.py:1001
 msgid "Don't remove anything. I'll try again later"
 msgstr "不要移除任何东西。我过一会儿会再试一下"
 
@@ -10565,6 +10932,10 @@ msgstr "<b>%(jid)s</b> 希望您 <b>%(action)s</b> 您的一些联系人。"
 msgid "Modify"
 msgstr "修改"
 
+#: gajim/gtk/roster_item_exchange.py:80
+msgid "JID"
+msgstr "JID"
+
 #: gajim/gtk/roster_item_exchange.py:86
 msgid "Groups"
 msgstr "群组"
@@ -10586,19 +10957,19 @@ msgid "Removed %d contact"
 msgid_plural "Removed %d contacts"
 msgstr[0] "删除了%d个联系人"
 
-#: gajim/gtk/util.py:581
+#: gajim/gtk/util.py:583
 msgid "Unknown Artist"
 msgstr "未知艺术家"
 
-#: gajim/gtk/util.py:582
+#: gajim/gtk/util.py:584
 msgid "Unknown Title"
 msgstr "未知标题"
 
-#: gajim/gtk/util.py:583
+#: gajim/gtk/util.py:585
 msgid "Unknown Source"
 msgstr "未知来源"
 
-#: gajim/gtk/util.py:585
+#: gajim/gtk/util.py:587
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
@@ -10607,27 +10978,10 @@ msgstr ""
 "<b>\"%(title)s\"</b> 作者 <i>%(artist)s</i>\n"
 "出自 <i>%(source)s</i>"
 
-#: gajim/gtk/bookmarks.py:121
-msgid "New Group Chat"
-msgstr "新聊天室"
-
-#: gajim/gtk/bookmarks.py:161
-msgid "This bookmark has invalid data"
-msgstr "此书签含无效数据"
-
-#: gajim/gtk/bookmarks.py:162
-msgid ""
-"Please be sure to fill out server and room fields or remove this bookmark."
-msgstr "请确认填写服务器与聊天室字段或移除此书签。"
-
-#: gajim/gtk/bookmarks.py:273 gajim/gtk/bookmarks.py:291
-#: gajim/gtk/bookmarks.py:304 gajim/gtk/bookmarks.py:335
-msgid "Character not allowed"
-msgstr "不允许的字符"
-
-#: gajim/gtk/bookmarks.py:334
-msgid "Invalid room"
-msgstr "无效聊天室"
+#: gajim/gtk/bookmarks.py:47
+#, fuzzy, python-format
+msgid "Bookmarks for %s"
+msgstr "将本聊天室加入书签(_B)"
 
 #: gajim/plugins/pluginmanager.py:736 gajim/plugins/pluginmanager.py:742
 msgid "Archive corrupted"
@@ -10639,52 +10993,55 @@ msgid "Archive empty"
 msgstr "文件为空"
 
 #: gajim/plugins/pluginmanager.py:750 gajim/plugins/pluginmanager.py:758
-#: gajim/plugins/gui.py:257
+#: gajim/plugins/gui.py:258
 #, fuzzy
 msgid "Archive is malformed"
 msgstr "服务发送了畸形的数据"
 
-#: gajim/plugins/pluginmanager.py:766 gajim/plugins/gui.py:281
-#: gajim/plugins/gui.py:289
+#: gajim/plugins/pluginmanager.py:766 gajim/plugins/gui.py:288
+#: gajim/plugins/gui.py:301
 #, fuzzy
 msgid "Plugin already exists"
 msgstr "文件已经存在"
 
-#: gajim/plugins/gui.py:82
+#: gajim/plugins/gui.py:83
 msgid "Click to view Gajim's wiki page on how to install plugins in Flatpak."
 msgstr ""
 
-#: gajim/plugins/gui.py:89
+#: gajim/plugins/gui.py:90
 #, fuzzy
 msgid "Plugin"
 msgstr "插件"
 
-#: gajim/plugins/gui.py:151
+#: gajim/plugins/gui.py:152
 #, fuzzy, python-format
 msgid "Warning: %s"
 msgstr "将封禁 %s"
 
-#: gajim/plugins/gui.py:206
+#: gajim/plugins/gui.py:207
 #, fuzzy
 msgid "Plugin failed"
 msgstr "注册失败"
 
-#: gajim/plugins/gui.py:245
+#: gajim/plugins/gui.py:246
 msgid "Unable to properly remove the plugin"
 msgstr ""
 
-#: gajim/plugins/gui.py:281
-msgid "Overwrite?"
-msgstr ""
+#: gajim/plugins/gui.py:287
+#, fuzzy
+msgid "Overwrite Plugin?"
+msgstr "覆盖状态信息?"
+
+#: gajim/plugins/gui.py:289
+#, fuzzy
+msgid "Do you want to overwrite the currently installed version?"
+msgstr "您是否接受邀请?"
 
 #: data/org.gajim.Gajim.desktop.in:5
-msgid "Jabber IM Client"
+#, fuzzy
+msgid "XMPP IM Client"
 msgstr "Jabber 即时消息客户端"
 
-#: data/org.gajim.Gajim.desktop.in:6
-msgid "A GTK+ Jabber client"
-msgstr "一个 GTK+ 的 Jabber 客户端"
-
 #: data/org.gajim.Gajim.desktop.in:8
 msgid "chat;messaging;im;xmpp;bonjour;voip;"
 msgstr ""
@@ -10736,7 +11093,7 @@ msgid "Easily send pictures, videos or other files to friends and groups"
 msgstr ""
 
 #: data/org.gajim.Gajim.appdata.xml.in:27
-msgid "Chat securely with End-to-End encryption via OMEMO or PGP"
+msgid "Chat securely with End-to-End encryption via OMEMO or OpenPGP"
 msgstr ""
 
 #: data/org.gajim.Gajim.appdata.xml.in:28
@@ -10797,7 +11154,7 @@ msgstr ""
 
 #: data/org.gajim.Gajim.appdata.xml.in:52
 #, fuzzy
-msgid "Roster, list of contacts"
+msgid "Contact list, list of contacts"
 msgstr "记录联系人状态变化(_L)"
 
 #: data/org.gajim.Gajim.appdata.xml.in:56
@@ -10818,6 +11175,510 @@ msgstr "最近: "
 msgid "Plugin manager"
 msgstr "注册失败"
 
+#, fuzzy
+#~ msgid "Configure Services…"
+#~ msgstr "配置服务..."
+
+#, fuzzy
+#~ msgid "Group Chat Bookmarks"
+#~ msgstr "多人聊天(_G)"
+
+#, fuzzy
+#~ msgid "Add Bookmark"
+#~ msgstr "将本聊天室加入书签(_B)"
+
+#, fuzzy
+#~ msgid "Remove Bookmark"
+#~ msgstr "将本聊天室加入书签(_B)"
+
+#, fuzzy
+#~ msgid "Bookmark Name"
+#~ msgstr "将本聊天室加入书签(_B)"
+
+#, fuzzy
+#~ msgid "_Server"
+#~ msgstr "服务器(_S): "
+
+#, fuzzy
+#~ msgid "_Password"
+#~ msgstr "密码(_P): "
+
+#, fuzzy
+#~ msgid "Join chat when connected"
+#~ msgstr "联系人已断开连接"
+
+#~ msgid "New Group Chat"
+#~ msgstr "新聊天室"
+
+#~ msgid "This bookmark has invalid data"
+#~ msgstr "此书签含无效数据"
+
+#, fuzzy
+#~ msgid ""
+#~ "Please be sure to fill out server and group chat fields or remove this "
+#~ "bookmark."
+#~ msgstr "请确认填写服务器与聊天室字段或移除此书签。"
+
+#~ msgid "Character not allowed"
+#~ msgstr "不允许的字符"
+
+#, fuzzy
+#~ msgid "Invalid Group Chat"
+#~ msgstr "无效的聊天室 Jabber ID"
+
+#~ msgid "Unable to join group chat"
+#~ msgstr "无法加入聊天室"
+
+#~ msgid "You are banned from group chat <b>%s</b>."
+#~ msgstr "您已从聊天室 <b>%s</b> 封禁。"
+
+#~ msgid "Remote server <b>%s</b> does not exist."
+#~ msgstr "远程服务器 <b>%s</b> 不存在。"
+
+#~ msgid "Group chat <b>%s</b> does not exist."
+#~ msgstr "聊天室 <b>%s</b> 不存在。"
+
+#, fuzzy
+#~ msgid "Group chat creation is not permitted."
+#~ msgstr "聊天室创建是受限的。"
+
+#~ msgid "You must use your registered nickname in <b>%s</b>."
+#~ msgstr "您必须在 <b>%s</b> 使用您的已注册昵称。"
+
+#, fuzzy
+#~ msgid "You are not in the members list in group chat %s."
+#~ msgstr "您不再聊天室 %s 的成员列表中。"
+
+#, fuzzy
+#~ msgid "XMPP Address is not a group chat"
+#~ msgstr "这不是一个聊天室"
+
+#~ msgid "This is not a group chat"
+#~ msgstr "这不是一个聊天室"
+
+#, fuzzy
+#~ msgid "Please choose a group chat"
+#~ msgstr "请选择一个聊天室"
+
+#~ msgid "Invalid Nickname"
+#~ msgstr "不合法的昵称"
+
+#~ msgid "Please choose a nickname"
+#~ msgstr "请选择一个昵称"
+
+#~ msgid "Wrong server"
+#~ msgstr "错误的服务器"
+
+#, fuzzy
+#~ msgid "%s is not a group chat server"
+#~ msgstr "%s 不是一个聊天室服务器"
+
+#, fuzzy
+#~ msgid ""
+#~ "How many lines to request from server when entering a group chat. -1 "
+#~ "means no limit."
+#~ msgstr "当加入聊天室时向服务器请求聊天记录的行数。(-1表示不限制)"
+
+#, fuzzy
+#~ msgid ""
+#~ "Minutes of backlog to request when entering a group chat. -1 means no "
+#~ "limit."
+#~ msgstr "当加入聊天室时请求多少分钟以内的聊天记录。（-1表示不限制）"
+
+#, fuzzy
+#~ msgid ""
+#~ "How many lines to request from server when entering a group chat. -1 "
+#~ "means no limit, -2 means global value."
+#~ msgstr ""
+#~ "当加入聊天室时向服务器请求聊天记录的行数。（-1表示不限制，-2表示使用全局设"
+#~ "置）"
+
+#, fuzzy
+#~ msgid ""
+#~ "Minutes of backlog to request when entering a group chat. -1 means no "
+#~ "limit, -2 means global value."
+#~ msgstr ""
+#~ "当加入聊天室时请求多少分钟以内的聊天记录。（-1表示不限制，-2表示使用全局设"
+#~ "置）"
+
+#, fuzzy
+#~ msgid "A Password is required to join the group chat %s. Please type it."
+#~ msgstr "需要密码才能加入聊天室 %s。请输入一个密码。"
+
+#~ msgid "Not in Roster"
+#~ msgstr "不在联系人列表中"
+
+#~ msgid "I would like to add you to my roster"
+#~ msgstr "我希望将您添加到我的联系人列表"
+
+#, fuzzy
+#~ msgid "Add to Roster"
+#~ msgstr "添加至联系人列表(_A)"
+
+#, fuzzy
+#~ msgid "Audio Session"
+#~ msgstr "音频测试"
+
+#, fuzzy
+#~ msgid "Video Session"
+#~ msgstr "视频测试"
+
+#, fuzzy
+#~ msgid "Manage Room"
+#~ msgstr "管理聊天室(_M)"
+
+#, fuzzy
+#~ msgid "Configure Room"
+#~ msgstr "设置聊天室(_R)"
+
+#, fuzzy
+#~ msgid "Destroy Room"
+#~ msgstr "删除聊天室(_D)"
+
+#, fuzzy
+#~ msgid "Change Nick"
+#~ msgstr "更改昵称(_N)"
+
+#, fuzzy
+#~ msgid "Disconnect"
+#~ msgstr "断开连接(_D)"
+
+#, fuzzy
+#~ msgid "Copy JID"
+#~ msgstr "聊天室 JID"
+
+#, fuzzy
+#~ msgid "Add to Roster…"
+#~ msgstr "添加至联系人列表(_A)"
+
+#, fuzzy
+#~ msgid "Copy JID/Email"
+#~ msgstr "复制 JID/电子邮件地址(_C)"
+
+#~ msgid "JID: <i>%s</i>"
+#~ msgstr "JID: <i>%s</i>"
+
+#~ msgid "Changing Subject"
+#~ msgstr "正在更换话题"
+
+#~ msgid "Please specify the new subject:"
+#~ msgstr "请指定新话题: "
+
+#~ msgid "Room logging is now enabled"
+#~ msgstr "聊天室消息记录已启用"
+
+#~ msgid "Room logging is now disabled"
+#~ msgstr "聊天室消息记录已禁用"
+
+#, fuzzy
+#~ msgid "You (%s) joined the room"
+#~ msgstr "%s 加入聊天室"
+
+#~ msgid "Room logging is enabled"
+#~ msgstr "聊天室记录被启用"
+
+#, fuzzy
+#~ msgid "Unable to join groupchat"
+#~ msgstr "无法加入聊天室"
+
+#~ msgid "Groupchat Invitation"
+#~ msgstr "聊天室邀请"
+
+#~ msgid "%(jid)s has been invited in this room"
+#~ msgstr "%(jid)s 已经被邀请加入该聊天室"
+
+#, fuzzy
+#~ msgid "JID is not a Groupchat"
+#~ msgstr "这不是一个聊天室"
+
+#~ msgid "Invalid JID"
+#~ msgstr "无效的 JID"
+
+#~ msgid "A connection is not available"
+#~ msgstr "连接不可用"
+
+#, fuzzy
+#~ msgid "JID already in list"
+#~ msgstr "Jabber ID 已经在列表中了"
+
+#, fuzzy
+#~ msgid "For the chosen encryption there is no encryption method available"
+#~ msgstr "一个连接不可用"
+
+#~ msgid "Removes contact from roster"
+#~ msgstr "从联系人列表删除联系人"
+
+#~ msgid "Not in roster"
+#~ msgstr "不在联系人列表中"
+
+#~ msgid "Contact signed in notification color."
+#~ msgstr "联系人登录通知的颜色。"
+
+#~ msgid "Contact signout notification color"
+#~ msgstr "联系人登出通知的颜色"
+
+#~ msgid "File transfer request notification color."
+#~ msgstr "文件传输请求通知的颜色。"
+
+#~ msgid "File transfer error notification color."
+#~ msgstr "文件传输发生错误的通知的颜色。"
+
+#~ msgid "File transfer complete or stopped notification color."
+#~ msgstr "文件传输完成或停止通知的颜色。"
+
+#~ msgid "Groupchat invitation notification color"
+#~ msgstr "聊天室邀请通知的颜色"
+
+#~ msgid "Other dialogs color."
+#~ msgstr "其他对话框的颜色。"
+
+#~ msgid "Add * and [n] in roster title?"
+#~ msgstr "在联系人列表标题中加入 * 和 [n]?"
+
+#~ msgid "Hides the banner in two persons chat window"
+#~ msgstr "在双人聊天窗口中隐藏标语"
+
+#, fuzzy
+#~ msgid ""
+#~ "Show the confirm metacontacts creation dialog or not? Empty string means "
+#~ "never show the dialog."
+#~ msgstr "是否显示确认元联系人创建对话框?空字符串意味着从不显示对话框。"
+
+#~ msgid "Space separated list of ssl errors to ignore."
+#~ msgstr "应忽略的 SSL 错误列表, 以空格分隔"
+
+#~ msgid "Answer to receipt requests"
+#~ msgstr "对回执请求的回应"
+
+#~ msgid "Sent receipt requests"
+#~ msgstr "发送回执请求"
+
+#, fuzzy
+#~ msgid "Language for which misspelled words will be checked"
+#~ msgstr "想要进行拼写检查的语言"
+
+#~ msgid "I'm eating, so leave me a message."
+#~ msgstr "我在吃东西, 请留言"
+
+#~ msgid "from room %s"
+#~ msgstr "来自聊天室 %s"
+
+#~ msgid "Leave Groupchats"
+#~ msgstr "离开聊天室"
+
+#, fuzzy
+#~ msgid "Auto Join"
+#~ msgstr "自动加入"
+
+#, fuzzy
+#~ msgid "Room"
+#~ msgstr "聊天室: "
+
+#~ msgid "Jabber ID:"
+#~ msgstr "Jabber ID"
+
+#~ msgid "Occupant Actions"
+#~ msgstr "成员操作"
+
+#~ msgid "_Add to Roster"
+#~ msgstr "添加至联系人列表(_A)"
+
+#~ msgid "_Manage Room"
+#~ msgstr "管理聊天室(_M)"
+
+#~ msgid "Configure _Room..."
+#~ msgstr "设置聊天室(_R)"
+
+#~ msgid "_Destroy Room"
+#~ msgstr "删除聊天室(_D)"
+
+#~ msgid "Jabber ID"
+#~ msgstr "Jabber ID"
+
+#, fuzzy
+#~ msgid "account"
+#~ msgstr "账号"
+
+#, fuzzy
+#~ msgid "Roster"
+#~ msgstr "显示联系人列表(_R)"
+
+#~ msgid "Show only in roster"
+#~ msgstr "只显示在联系人列表中"
+
+#~ msgid "in _roster"
+#~ msgstr "在联系人列表中(_R)"
+
+#~ msgid "Roster Appearance"
+#~ msgstr "联系人列表外观"
+
+#, fuzzy
+#~ msgid "Show chatstate in roster"
+#~ msgstr "在联系人列表显示中联系人的头像(_V)"
+
+#~ msgid "_Add to Roster..."
+#~ msgstr "添加至联系人列表(_A)"
+
+#~ msgid "_Jabber ID:"
+#~ msgstr "_Jabber ID:"
+
+#, fuzzy
+#~ msgid "_Jabber ID"
+#~ msgstr "_Jabber ID:"
+
+#~ msgid "JabberID"
+#~ msgstr "JabberID"
+
+#, fuzzy
+#~ msgid "Show Roster"
+#~ msgstr "显示联系人列表(_R)"
+
+#~ msgid "MUC server"
+#~ msgstr "多人聊天服务器"
+
+#~ msgid "Room Configuration"
+#~ msgstr "聊天室设置"
+
+#~ msgid "Join _Group Chat"
+#~ msgstr "加入聊天室(_G)"
+
+#~ msgid "Toggle audio session"
+#~ msgstr "切换语音会话"
+
+#~ msgid "Audio sessions are not available"
+#~ msgstr "音频会话不可用"
+
+#~ msgid "Conference"
+#~ msgstr "会议"
+
+#, fuzzy
+#~ msgid "_Manage Bookmarks…"
+#~ msgstr "书签管理"
+
+#~ msgid "Hide _Roster"
+#~ msgstr "隐藏联系人列表(_R)"
+
+#~ msgid "Show _Roster"
+#~ msgstr "显示联系人列表(_R)"
+
+#~ msgid "Invalid Room"
+#~ msgstr "无效的聊天室"
+
+#~ msgid "Invalid room"
+#~ msgstr "无效聊天室"
+
+#~ msgid "A GTK+ Jabber client"
+#~ msgstr "一个 GTK+ 的 Jabber 客户端"
+
+#~ msgid "Changing Nickname"
+#~ msgstr "正在更换昵称"
+
+#~ msgid "Please specify the new nickname you want to use:"
+#~ msgstr "请指定您想使用的新昵称: "
+
+#~ msgid "Bookmark already set"
+#~ msgstr "书签已设定"
+
+#, fuzzy
+#~ msgid "Group Chat '%s' is already in your bookmarks."
+#~ msgstr "聊天室\"%s\"已在您的书签中。"
+
+#~ msgid "Bookmark has been added successfully"
+#~ msgstr "书签添加成功"
+
+#, fuzzy
+#~ msgid ""
+#~ "You can manage your bookmarks by clicking the Bookmarks menu item in your "
+#~ "contact list."
+#~ msgstr "您可以通过\"操作\"菜单管理您的书签。"
+
+#, fuzzy
+#~ msgid "The nickname contains invalid characters."
+#~ msgstr "昵称包含不合法字符。"
+
+#, fuzzy
+#~ msgid "Bookmark Room"
+#~ msgstr "将本聊天室加入书签(_B)"
+
+#~ msgid "_Join New Group Chat"
+#~ msgstr "加入新的聊天室(_J)"
+
+#, fuzzy
+#~ msgid "_Create Group Chat"
+#~ msgstr "离开聊天室"
+
+#, fuzzy
+#~ msgid "Name:"
+#~ msgstr "名称: "
+
+#, fuzzy
+#~ msgid "Description:"
+#~ msgstr "描述: "
+
+#, fuzzy
+#~ msgid "Address:"
+#~ msgstr "地址(_A):"
+
+#, fuzzy
+#~ msgid "You can not start a new conversation unless you are connected."
+#~ msgstr "您必须连接才能加入聊天室。"
+
+#, fuzzy
+#~ msgid "Occupants"
+#~ msgstr "成员操作"
+
+#, fuzzy
+#~ msgid "File transfer error"
+#~ msgstr "文件传输错误"
+
+#, fuzzy
+#~ msgid "No Accounts available"
+#~ msgstr "没有有效账户"
+
+#~ msgid "_Modify Account..."
+#~ msgstr "修改帐户(_M)..."
+
+#~ msgid "Boolean"
+#~ msgstr "Boolean"
+
+#~ msgid "Integer"
+#~ msgstr "Integer"
+
+#~ msgid "Text"
+#~ msgstr "Text"
+
+#~ msgid "Value"
+#~ msgstr "值"
+
+#~ msgid "Type"
+#~ msgstr "类型"
+
+#~ msgid "(None)"
+#~ msgstr "(无)"
+
+#~ msgid "Hidden"
+#~ msgstr "隐藏"
+
+#~ msgid "Manage Proxy Profiles"
+#~ msgstr "管理代理服务器设置"
+
+#~ msgid "Properties"
+#~ msgstr "属性"
+
+#, fuzzy
+#~ msgid "Proxy _Host"
+#~ msgstr "代理服务器地址(_H): "
+
+#, fuzzy
+#~ msgid "Proxy _Port"
+#~ msgstr "代理服务器端口(_P): "
+
+#~ msgid "New Groupchat"
+#~ msgstr "新的聊天室"
+
+#~ msgid "New Contact"
+#~ msgstr "新联系人"
+
 #~ msgid "%s GiB"
 #~ msgstr "%s GiB"
 
@@ -10897,9 +11758,6 @@ msgstr "注册失败"
 #~ msgid "_Pause"
 #~ msgstr "暂停(_P)"
 
-#~ msgid "Clean _up"
-#~ msgstr "清除(_U)"
-
 #~ msgid "Remove file transfer from the list."
 #~ msgstr "从列表中移除文件传输。"
 
@@ -10920,10 +11778,6 @@ msgstr "注册失败"
 #~ msgid "When a file transfer is complete show a popup notification"
 #~ msgstr "当文件传输完成时弹出提示"
 
-#, fuzzy
-#~ msgid "Select Files"
-#~ msgstr "清洁"
-
 #~ msgid "From:"
 #~ msgstr "从: "
 
@@ -11317,9 +12171,6 @@ msgstr "注册失败"
 #~ msgid "You are invited to a groupchat"
 #~ msgstr "您被邀请到一个聊天室"
 
-#~ msgid "Do you want to accept the invitation?"
-#~ msgstr "您是否接受邀请?"
-
 #~ msgid "_Start Chat"
 #~ msgstr "开始聊天(_S)"
 
@@ -11345,9 +12196,6 @@ msgstr "注册失败"
 #~ msgid "Do you wish to delete all correspondence with the selected contacts?"
 #~ msgstr "您确定要删除所选定联系人的历史记录？"
 
-#~ msgid "This can not be undone."
-#~ msgstr "该操作无法撤销。"
-
 #~ msgid "<b>What do you want to do?</b>"
 #~ msgstr "<b>您想要做什么?</b>"
 
@@ -11513,10 +12361,6 @@ msgstr "注册失败"
 #~ msgid "Nick"
 #~ msgstr "昵称"
 
-#, fuzzy
-#~ msgid "Banning…"
-#~ msgstr "封禁..."
-
 #~ msgid ""
 #~ "<b>Whom do you want to ban?</b>\n"
 #~ "\n"
@@ -11597,10 +12441,6 @@ msgstr "注册失败"
 #~ msgid "Filter:"
 #~ msgstr "过滤器: "
 
-#~ msgid ""
-#~ "If checked, Gajim will display the mood of contacts in the roster window"
-#~ msgstr "如果选中, Gajim 会在联系人列表窗口中显示显示联系人的心情。"
-
 #~ msgid "<b>Chat Appearance</b>"
 #~ msgstr "<b>聊天窗口外观</b>"
 
@@ -11853,10 +12693,6 @@ msgstr "注册失败"
 #~ msgstr "状态信息: (_S)"
 
 #, fuzzy
-#~ msgid "Group chat highlight"
-#~ msgstr "聊天室突出显示："
-
-#, fuzzy
 #~ msgid "Your nickname"
 #~ msgstr "您的昵称: "
 
@@ -11995,9 +12831,6 @@ msgstr "注册失败"
 #~ msgid "The passwords typed in both fields must be identical."
 #~ msgstr "在两个输入框中输入的密码必须一致。"
 
-#~ msgid "Enter new password:"
-#~ msgstr "输入新密码"
-
 #~ msgid "Enter it again for confirmation:"
 #~ msgstr "再次输入以确认: "
 
@@ -12011,10 +12844,6 @@ msgstr "注册失败"
 #~ msgid "unsubscribe request from %s"
 #~ msgstr "来自 %s 的解除认证请求"
 
-#, fuzzy
-#~ msgid "Autojoin"
-#~ msgstr "自动加入"
-
 #~ msgid "&lt;empty&gt;"
 #~ msgstr "&lt;empty&gt;"
 
@@ -12119,9 +12948,6 @@ msgstr "注册失败"
 #~ msgid "Forward unread message then disconnect"
 #~ msgstr " 转发未读消息然后断开连接"
 
-#~ msgid "AIM Address:"
-#~ msgstr "AIM 地址: "
-
 #~ msgid "MSN Address:"
 #~ msgstr "MSN 地址: "
 
@@ -12170,9 +12996,6 @@ msgstr "注册失败"
 #~ msgid "Session negotiation cancelled"
 #~ msgstr "会话协商已取消"
 
-#~ msgid "This session WILL be archived on server"
-#~ msgstr "本次会话将在服务器上被存档"
-
 #~ msgid "This session WILL NOT be archived on server"
 #~ msgstr "本次会话将不会在服务器上被存档"
 
@@ -12487,9 +13310,6 @@ msgstr "注册失败"
 #~ msgid "Server:"
 #~ msgstr "服务器: "
 
-#~ msgid "Password:"
-#~ msgstr "密码: "
-
 #~ msgid "Join this room _automatically when I connect"
 #~ msgstr "当我连接后自动加入此聊天室(_A)"
 
@@ -12808,9 +13628,6 @@ msgstr "注册失败"
 #~ msgid "_Edit Personal Information..."
 #~ msgstr "编辑个人信息..."
 
-#~ msgid "Information about you, as stored in the server"
-#~ msgstr "服务器中保存的关于您的信息"
-
 #~ msgid "<b>Personal Information</b>"
 #~ msgstr "<b>个人信息</b>"
 
@@ -12884,9 +13701,6 @@ msgstr "注册失败"
 #~ msgid "Your server can't save your personal information."
 #~ msgstr "您的服务器无法保存您的个人信息。"
 
-#~ msgid "Account Local already exists."
-#~ msgstr "帐户本地已存在。"
-
 #~ msgid "Please rename or remove it before enabling link-local messaging."
 #~ msgstr "请在使用本地消息前重命名或移除它。"
 
@@ -13033,10 +13847,6 @@ msgstr "注册失败"
 #~ msgid "The following message was NOT encrypted"
 #~ msgstr "下面的消息没有被加密"
 
-#, fuzzy
-#~ msgid "Encryption used for this contact."
-#~ msgstr "为这个账户启用 ESession 加密。"
-
 #~ msgid "Toggle Open_PGP Encryption"
 #~ msgstr "切换Open_PGP加密"
 
@@ -13111,10 +13921,6 @@ msgstr "注册失败"
 #~ msgid "Contact's identity verified"
 #~ msgstr "联系人身份已确认"
 
-#, fuzzy
-#~ msgid "Verify again…"
-#~ msgstr "重新验证"
-
 #~ msgid ""
 #~ "To be certain that <b>only</b> the expected person can read your messages "
 #~ "or send you messages, you need to verify their identity by clicking the "
@@ -13230,9 +14036,6 @@ msgstr "注册失败"
 #~ msgid "Add _Contact..."
 #~ msgstr "添加联系人(_C)..."
 
-#~ msgid "_Accounts"
-#~ msgstr "帐户(_A)"
-
 #~ msgid "Profile, A_vatar"
 #~ msgstr "名片, 头像(V)"
 
@@ -13480,12 +14283,6 @@ msgstr "注册失败"
 #~ msgid "Activity: "
 #~ msgstr "活动: "
 
-#~ msgid "Join _Group Chat..."
-#~ msgstr "加入聊天室(_G)"
-
-#~ msgid "_Modify Account"
-#~ msgstr "修改账户信息(_M)"
-
 #~ msgid "Check on startup if Gajim is the _default Jabber client"
 #~ msgstr "在启动是检测 Gajim 是否是默认的 Jabber 客户端程序"
 
@@ -13509,9 +14306,6 @@ msgstr "注册失败"
 #~ msgid "The path to the client certificate and key in PKCS#12 format"
 #~ msgstr "客户端证书路径（PKCS#12 格式）"
 
-#~ msgid " a window/tab opened with that contact "
-#~ msgstr "与此联系人聊天时打开的窗口/标签"
-
 #~ msgid "<b>Actions</b>"
 #~ msgstr "<b>动作</b>"
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 5b28d0e9a..1cf38e031 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: 2019-07-02 02:06+0000\n"
+"POT-Creation-Date: 2019-08-11 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,70 +20,70 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: gajim/chat_control_base.py:550
+#: gajim/chat_control_base.py:557
 msgid "_Undo"
 msgstr ""
 
-#: gajim/chat_control_base.py:558 gajim/conversation_textview.py:529
+#: gajim/chat_control_base.py:565 gajim/conversation_textview.py:529
 msgid "_Clear"
 msgstr ""
 
-#: gajim/chat_control_base.py:563
+#: gajim/chat_control_base.py:570
 msgid "Paste as quote"
 msgstr ""
 
-#: gajim/chat_control_base.py:613
+#: gajim/chat_control_base.py:620
 #, fuzzy
 msgid "Paste Image"
 msgstr "選擇圖像"
 
-#: gajim/chat_control_base.py:614
+#: gajim/chat_control_base.py:621
 #, fuzzy
 msgid "You are trying to paste an image"
 msgstr "您將要關閉多個標籤"
 
-#: gajim/chat_control_base.py:615
+#: gajim/chat_control_base.py:622
 #, fuzzy
 msgid ""
 "Are you sure you want to paste your clipboard's image into the chat window?"
 msgstr "您確定要離開聊天室\"%s\"嗎?"
 
-#: gajim/chat_control_base.py:617 gajim/groupchat_control.py:2310
-#: gajim/roster_window.py:2848 gajim/roster_window.py:4167
-#: gajim/message_window.py:252 gajim/gtk/dialogs.py:418
+#: gajim/chat_control_base.py:624 gajim/groupchat_control.py:2218
+#: gajim/roster_window.py:2841 gajim/roster_window.py:4118
+#: gajim/message_window.py:359 gajim/gtk/dialogs.py:330
 msgid "_Do not ask me again"
 msgstr "不要再問我了(_D)"
 
-#: gajim/chat_control_base.py:620
+#: gajim/chat_control_base.py:627
 msgid "_Paste"
 msgstr ""
 
-#: gajim/chat_control_base.py:1162 gajim/gtk/accounts.py:351
+#: gajim/chat_control_base.py:1169 gajim/gtk/accounts.py:354
 #, fuzzy
 msgid "Privacy"
 msgstr "隱私策略清單"
 
-#: gajim/chat_control_base.py:1163
+#: gajim/chat_control_base.py:1170
 #, fuzzy
 msgid "Warning"
 msgstr "將封禁 %s"
 
-#: gajim/chat_control_base.py:1164
+#: gajim/chat_control_base.py:1171
 #, fuzzy, python-format
 msgid "If you send a file to <b>%s</b>, your real JID will be revealed."
 msgstr "如果您想 %s 傳送檔案，他/她會獲知您的真實 Jabber ID。"
 
-#: gajim/chat_control_base.py:1169
+#: gajim/chat_control_base.py:1176
 #, fuzzy
 msgid "Continue"
 msgstr "繼續(_C)"
 
-#: gajim/gtkgui_helpers.py:163 gajim/gtk/filetransfer.py:393
+#: gajim/gtkgui_helpers.py:163 gajim/gtk/filetransfer.py:398
 #, fuzzy, python-format
 msgid "Cannot overwrite existing file '%s'"
 msgstr "無法覆寫現有檔案\"%s\""
 
-#: gajim/gtkgui_helpers.py:164 gajim/gtk/filetransfer.py:394
+#: gajim/gtkgui_helpers.py:164 gajim/gtk/filetransfer.py:399
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
@@ -168,387 +168,395 @@ msgstr "沒有未處理的認證請求"
 msgid " resource with priority "
 msgstr "帶有優先等級的資源"
 
-#: gajim/gui_menu_builder.py:96
-msgid "_New Group Chat"
-msgstr "新聊天室(_N)"
-
-#: gajim/gui_menu_builder.py:289 gajim/gui_menu_builder.py:380
-#: gajim/chat_control.py:303 gajim/roster_window.py:786
-#: gajim/roster_window.py:1719 gajim/roster_window.py:1721
-#: gajim/roster_window.py:2030 gajim/roster_window.py:3336
-#: gajim/roster_window.py:3369 gajim/gui_interface.py:413
-#: gajim/common/contacts.py:206 gajim/common/contacts.py:343
-#: gajim/common/helpers.py:83 gajim/common/helpers.py:311
-#: gajim/gtk/add_contact.py:319 gajim/gtk/subscription_request.py:70
-#: gajim/gtk/subscription_request.py:99 gajim/gtk/roster_item_exchange.py:112
-msgid "Not in Roster"
-msgstr "不在聯絡人清單中"
+#: gajim/gui_menu_builder.py:251 gajim/gui_menu_builder.py:342
+#: gajim/chat_control.py:305 gajim/roster_window.py:783
+#: gajim/roster_window.py:1716 gajim/roster_window.py:1718
+#: gajim/roster_window.py:2027 gajim/roster_window.py:3292
+#: gajim/roster_window.py:3325 gajim/gui_interface.py:396
+#: gajim/common/contacts.py:222 gajim/common/contacts.py:359
+#: gajim/common/contacts.py:471 gajim/common/helpers.py:86
+#: gajim/common/helpers.py:317 gajim/gtk/add_contact.py:319
+#: gajim/gtk/subscription_request.py:70 gajim/gtk/subscription_request.py:99
+#: gajim/gtk/roster_item_exchange.py:112
+#, fuzzy
+msgid "Not in contact list"
+msgstr "顯示離線聯絡人"
 
-#: gajim/gui_menu_builder.py:393
-msgid "I would like to add you to my roster"
-msgstr "我希望將您加入到我的聯絡人清單"
+#: gajim/gui_menu_builder.py:355
+#, fuzzy
+msgid "I would like to add you to my contact list"
+msgstr "我想加入您到我的聯絡人清單"
 
-#: gajim/gui_menu_builder.py:471
+#: gajim/gui_menu_builder.py:433
 #, fuzzy
 msgid "Send Single _Message…"
 msgstr "傳送單條訊息(_M)"
 
-#: gajim/gui_menu_builder.py:486
+#: gajim/gui_menu_builder.py:448
 #, fuzzy
 msgid "E_xecute Command…"
 msgstr "執行命令(_E)…"
 
-#: gajim/gui_menu_builder.py:494
+#: gajim/gui_menu_builder.py:456
 msgid "_Manage Transport"
 msgstr "管理代理(_M)"
 
-#: gajim/gui_menu_builder.py:500
+#: gajim/gui_menu_builder.py:462
 msgid "_Modify Transport"
 msgstr "修改代理(_M)"
 
-#: gajim/gui_menu_builder.py:507 gajim/roster_window.py:5046
+#: gajim/gui_menu_builder.py:469 gajim/roster_window.py:4985
 #, fuzzy
 msgid "_Rename…"
 msgstr "重新命名(_R)"
 
-#: gajim/gui_menu_builder.py:518 gajim/roster_window.py:5062
-#: gajim/roster_window.py:5177 gajim/data/gui/blocked_contacts_window.ui:52
+#: gajim/gui_menu_builder.py:480 gajim/roster_window.py:5001
+#: gajim/roster_window.py:5116 gajim/data/gui/blocked_contacts_window.ui:52
 #: gajim/data/gui/gc_occupants_menu.ui:148
 #: gajim/data/gui/contact_context_menu.ui:143
 msgid "_Unblock"
 msgstr "解除阻斷(_U)"
 
-#: gajim/gui_menu_builder.py:521 gajim/roster_window.py:5067
-#: gajim/roster_window.py:5181 gajim/data/gui/gc_occupants_menu.ui:140
+#: gajim/gui_menu_builder.py:483 gajim/roster_window.py:5006
+#: gajim/roster_window.py:5120 gajim/data/gui/gc_occupants_menu.ui:140
 #: gajim/data/gui/contact_context_menu.ui:151
 msgid "_Block"
 msgstr "阻斷(_B)"
 
-#: gajim/gui_menu_builder.py:529 gajim/roster_window.py:5074
+#: gajim/gui_menu_builder.py:491 gajim/roster_window.py:5013
 #: gajim/data/gui/contact_context_menu.ui:181
 msgid "Remo_ve"
 msgstr "移除(_R)"
 
-#: gajim/gui_menu_builder.py:539 gajim/data/gui/contact_context_menu.ui:198
+#: gajim/gui_menu_builder.py:501 gajim/data/gui/contact_context_menu.ui:198
 msgid "_Information"
 msgstr "資訊(_I)"
 
-#: gajim/gui_menu_builder.py:552
+#: gajim/gui_menu_builder.py:514
 #, fuzzy
 msgid "Save _As"
 msgstr "儲存在: %s"
 
-#: gajim/gui_menu_builder.py:564 gajim/groupchat_control.py:501
-#: gajim/chat_control.py:340
+#: gajim/gui_menu_builder.py:526 gajim/groupchat_control.py:507
+#: gajim/chat_control.py:342
 #, fuzzy
 msgid "Send File…"
 msgstr "傳送檔案(_F)"
 
-#: gajim/gui_menu_builder.py:565
+#: gajim/gui_menu_builder.py:527
 #, fuzzy
 msgid "Upload File…"
 msgstr "另存為…"
 
-#: gajim/gui_menu_builder.py:566
+#: gajim/gui_menu_builder.py:528
 #, fuzzy
 msgid "Send File Directly…"
 msgstr "另存為…"
 
-#: gajim/gui_menu_builder.py:568 gajim/gui_menu_builder.py:632
+#: gajim/gui_menu_builder.py:530 gajim/gui_menu_builder.py:596
 #, fuzzy
 msgid "Send Chatstate"
 msgstr "最後狀態"
 
-#: gajim/gui_menu_builder.py:569
+#: gajim/gui_menu_builder.py:531
 #, fuzzy
 msgid "Invite Contacts"
 msgstr "邀請聯絡人(_C)"
 
-#: gajim/gui_menu_builder.py:570
+#: gajim/gui_menu_builder.py:532
 #, fuzzy
-msgid "Add to Roster"
-msgstr "加入至聯絡人清單(_A)"
+msgid "Add to Contact List"
+msgstr "加入聯絡人(_A)…"
 
-#: gajim/gui_menu_builder.py:571
+#: gajim/gui_menu_builder.py:533
 #, fuzzy
-msgid "Audio Session"
-msgstr "音訊測試"
+msgid "Voice Chat"
+msgstr "語音聊天請求"
 
-#: gajim/gui_menu_builder.py:572
+#: gajim/gui_menu_builder.py:534
 #, fuzzy
-msgid "Video Session"
+msgid "Video Chat"
 msgstr "視訊測試"
 
-#: gajim/gui_menu_builder.py:573
+#: gajim/gui_menu_builder.py:535 gajim/gui_menu_builder.py:582
 #, fuzzy
 msgid "Information"
 msgstr "資訊(_I)"
 
-#: gajim/gui_menu_builder.py:574 gajim/gui_menu_builder.py:639
+#: gajim/gui_menu_builder.py:536 gajim/gui_menu_builder.py:602
 #: gajim/data/gui/application_menu.ui:37
 #, fuzzy
 msgid "History"
 msgstr "命令歷程(_H)"
 
-#: gajim/gui_menu_builder.py:580 gajim/gui_menu_builder.py:687
+#: gajim/gui_menu_builder.py:542 gajim/gui_menu_builder.py:650
 #: gajim/data/gui/preferences_window.ui:1823
 msgid "Disabled"
 msgstr "停用"
 
-#: gajim/gui_menu_builder.py:581 gajim/gui_menu_builder.py:688
+#: gajim/gui_menu_builder.py:543 gajim/gui_menu_builder.py:651
 msgid "Composing only"
 msgstr "僅正在編輯"
 
-#: gajim/gui_menu_builder.py:582 gajim/gui_menu_builder.py:689
+#: gajim/gui_menu_builder.py:544 gajim/gui_menu_builder.py:652
 msgid "All chat states"
 msgstr "所有聊天狀態"
 
-#: gajim/gui_menu_builder.py:620
+#: gajim/gui_menu_builder.py:583
 #, fuzzy
-msgid "Manage Room"
-msgstr "管理聊天室(_M)"
+msgid "Manage Group Chat"
+msgstr "離開聊天室"
 
-#: gajim/gui_menu_builder.py:621
+#: gajim/gui_menu_builder.py:584 gajim/data/gui/groupchat_control.ui:649
 #, fuzzy
 msgid "Change Subject"
 msgstr "變更主題(_S)…"
 
-#: gajim/gui_menu_builder.py:622
+#: gajim/gui_menu_builder.py:585
 #, fuzzy
-msgid "Configure Room"
-msgstr "設定聊天室(_R)…"
+msgid "Configure Group Chat"
+msgstr "離開聊天室"
 
-#: gajim/gui_menu_builder.py:623
+#: gajim/gui_menu_builder.py:586
 #, fuzzy
 msgid "Upload Avatar…"
 msgstr "選擇歸檔檔案"
 
-#: gajim/gui_menu_builder.py:624
+#: gajim/gui_menu_builder.py:587
 #, fuzzy
-msgid "Destroy Room"
-msgstr "刪除聊天室(_D)"
+msgid "Destroy Group Chat"
+msgstr "新聊天室"
 
-#: gajim/gui_menu_builder.py:626 gajim/data/gui/preferences_window.ui:790
+#: gajim/gui_menu_builder.py:589 gajim/data/gui/preferences_window.ui:790
 #, fuzzy
 msgid "Chat Settings"
 msgstr "外掛程式"
 
-#: gajim/gui_menu_builder.py:627
+#: gajim/gui_menu_builder.py:590
 msgid "Show join/leave"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:628
+#: gajim/gui_menu_builder.py:591
 #, fuzzy
 msgid "Show status changes"
 msgstr "記錄聯絡人狀態變化(_L)"
 
-#: gajim/gui_menu_builder.py:629 gajim/data/gui/gc_control_popup_menu.ui:72
+#: gajim/gui_menu_builder.py:592 gajim/data/gui/gc_control_popup_menu.ui:72
 #, fuzzy
 msgid "Notify on all messages"
 msgstr "預設的訊息:"
 
-#: gajim/gui_menu_builder.py:630
+#: gajim/gui_menu_builder.py:593
 #, fuzzy
 msgid "Minimize on close"
 msgstr "關閉時最小化視窗"
 
-#: gajim/gui_menu_builder.py:631
+#: gajim/gui_menu_builder.py:595
 #, fuzzy
-msgid "Minimize on autojoin"
+msgid "Minimize when joining automatically"
 msgstr "自動聯結時縮到最小(_Z)"
 
-#: gajim/gui_menu_builder.py:634
+#: gajim/gui_menu_builder.py:598
 msgid "Sync Threshold"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:635
+#: gajim/gui_menu_builder.py:599
 #, fuzzy
-msgid "Change Nick"
+msgid "Change Nickname"
 msgstr "變更暱稱(_N)…"
 
-#: gajim/gui_menu_builder.py:636
-#, fuzzy
-msgid "Bookmark Room"
-msgstr "將本聊天室加入書籤(_B)"
-
-#: gajim/gui_menu_builder.py:637
+#: gajim/gui_menu_builder.py:600
 #, fuzzy
 msgid "Request Voice"
 msgstr "要求語音(_R)"
 
-#: gajim/gui_menu_builder.py:638 gajim/roster_window.py:5246
+#: gajim/gui_menu_builder.py:601 gajim/roster_window.py:5185
 #, fuzzy
 msgid "Execute command"
 msgstr "執行命令(_E)…"
 
-#: gajim/gui_menu_builder.py:640
-#, fuzzy
-msgid "Disconnect"
-msgstr "中斷連線(_D)"
+#: gajim/gui_menu_builder.py:603
+msgid "Leave"
+msgstr ""
 
-#: gajim/gui_menu_builder.py:678 gajim/gtk/preferences.py:156
+#: gajim/gui_menu_builder.py:641 gajim/gtk/preferences.py:155
 msgid "No threshold"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:680 gajim/gtk/preferences.py:158
+#: gajim/gui_menu_builder.py:643 gajim/gtk/preferences.py:157
 #, python-format
 msgid "%i day"
 msgid_plural "%i days"
 msgstr[0] ""
 
-#: gajim/gui_menu_builder.py:709 gajim/gui_menu_builder.py:747
-#: gajim/gtk/join_groupchat.py:43
-msgid "Join Group Chat"
-msgstr "加入多人聊天"
-
-#: gajim/gui_menu_builder.py:746
+#: gajim/gui_menu_builder.py:672
 #, fuzzy
 msgid "Add Contact…"
 msgstr "加入聯絡人(_A)…"
 
-#: gajim/gui_menu_builder.py:748 gajim/gtk/profile.py:52
-#: gajim/gtk/accounts.py:770 gajim/gtk/accounts.py:808
+#: gajim/gui_menu_builder.py:673 gajim/gtk/profile.py:52
+#: gajim/gtk/accounts.py:773 gajim/gtk/accounts.py:811
 #, fuzzy
 msgid "Profile"
 msgstr "檔案"
 
-#: gajim/gui_menu_builder.py:749
+#: gajim/gui_menu_builder.py:674
+#, fuzzy
+msgid "Send Single Message…"
+msgstr "傳送單條訊息(_M)"
+
+#: gajim/gui_menu_builder.py:675
 #, fuzzy
 msgid "Discover Services"
 msgstr "探索服務(_D)"
 
-#: gajim/gui_menu_builder.py:750
+#: gajim/gui_menu_builder.py:676 gajim/gtk/server_info.py:36
 #, fuzzy
-msgid "Send Single Message…"
-msgstr "傳送單條訊息(_M)"
+msgid "Server Info"
+msgstr "伺服器"
 
-#: gajim/gui_menu_builder.py:751 gajim/data/gui/preferences_window.ui:2741
+#: gajim/gui_menu_builder.py:677 gajim/data/gui/preferences_window.ui:2741
 msgid "Advanced"
 msgstr "進階"
 
-#: gajim/gui_menu_builder.py:752 gajim/gtk/mam_preferences.py:88
+#: gajim/gui_menu_builder.py:678 gajim/gtk/mam_preferences.py:88
 #, fuzzy
 msgid "Archiving Preferences"
 msgstr "編輯存檔偏好設定(_V)"
 
-#: gajim/gui_menu_builder.py:753
+#: gajim/gui_menu_builder.py:679
 #, fuzzy
 msgid "Blocking List"
 msgstr "封禁名單"
 
-#: gajim/gui_menu_builder.py:754 gajim/gtk/history_sync.py:108
+#: gajim/gui_menu_builder.py:680
+#, fuzzy
+msgid "Bookmarks"
+msgstr "將本聊天室加入書籤(_B)"
+
+#: gajim/gui_menu_builder.py:681
+#, fuzzy
+msgid "PEP Configuration"
+msgstr "組態"
+
+#: gajim/gui_menu_builder.py:682 gajim/gtk/history_sync.py:108
 #: gajim/gtk/history_sync.py:186
 #, fuzzy
 msgid "Synchronise History"
 msgstr "同步"
 
-#: gajim/gui_menu_builder.py:755 gajim/gtk/privacy_list.py:427
+#: gajim/gui_menu_builder.py:683 gajim/gtk/privacy_list.py:427
 msgid "Privacy Lists"
 msgstr "隱私策略清單"
 
-#: gajim/gui_menu_builder.py:756 gajim/gtk/server_info.py:36
-#, fuzzy
-msgid "Server Info"
-msgstr "伺服器"
-
-#: gajim/gui_menu_builder.py:757 gajim/gui_menu_builder.py:768
+#: gajim/gui_menu_builder.py:685 gajim/gui_menu_builder.py:696
 #: gajim/data/gui/xml_console_window.ui:77
 msgid "XML Console"
 msgstr " XML 主控臺"
 
-#: gajim/gui_menu_builder.py:759 gajim/data/gui/groupchat_config.ui:36
+#: gajim/gui_menu_builder.py:687 gajim/data/gui/groupchat_config.ui:36
 #, fuzzy
 msgid "Admin"
 msgstr "管理(_A)"
 
-#: gajim/gui_menu_builder.py:760
+#: gajim/gui_menu_builder.py:688
 #, fuzzy
 msgid "Send Server Message…"
 msgstr "傳送伺服器訊息(_S)…"
 
-#: gajim/gui_menu_builder.py:761
+#: gajim/gui_menu_builder.py:689
 #, fuzzy
 msgid "Set MOTD…"
 msgstr "設定 MOTD…"
 
-#: gajim/gui_menu_builder.py:762
+#: gajim/gui_menu_builder.py:690
 #, fuzzy
 msgid "Update MOTD…"
 msgstr "更新 MOTD…"
 
-#: gajim/gui_menu_builder.py:763
+#: gajim/gui_menu_builder.py:691
 #, fuzzy
 msgid "Delete MOTD…"
 msgstr "刪除 MOTD"
 
-#: gajim/gui_menu_builder.py:812
+#: gajim/gui_menu_builder.py:736
 #, fuzzy
-msgid "No Accounts available"
-msgstr "沒有有效帳號"
+msgid "_Add Account…"
+msgstr "加入聯絡人(_A)…"
+
+#: gajim/gui_menu_builder.py:742
+#, fuzzy
+msgid "_Modify Accounts…"
+msgstr "修改帳號資訊(_M)"
 
-#: gajim/gui_menu_builder.py:823 gajim/data/gui/application_menu.ui:5
-#: gajim/data/gui/application_menu.ui:71 gajim/data/gui/shortcuts_window.ui:182
-#: gajim/gtk/accounts.py:58
+#: gajim/gui_menu_builder.py:751 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:755 gajim/data/gui/application_menu.ui:5
+#: gajim/data/gui/shortcuts_window.ui:182 gajim/gtk/accounts.py:57
 msgid "Accounts"
 msgstr "帳號"
 
-#: gajim/gui_menu_builder.py:881 gajim/gui_menu_builder.py:886
+#: gajim/gui_menu_builder.py:784 gajim/gui_menu_builder.py:789
 #, fuzzy
-msgid "Copy JID"
-msgstr "聊天室 JID"
+msgid "Copy XMPP Address"
+msgstr "複製 JID/電子郵件位址(_C)"
 
-#: gajim/gui_menu_builder.py:882 gajim/gui_menu_builder.py:914
+#: gajim/gui_menu_builder.py:785 gajim/gui_menu_builder.py:817
 #, fuzzy
 msgid "Join Groupchat"
 msgstr "加入多人聊天"
 
-#: gajim/gui_menu_builder.py:887 gajim/gui_menu_builder.py:913
-#: gajim/data/gui/application_menu.ui:76
+#: gajim/gui_menu_builder.py:790 gajim/gui_menu_builder.py:816
+#: gajim/data/gui/application_menu.ui:71
 #: gajim/data/gui/subscription_request_window.ui:106
 msgid "Start Chat"
 msgstr "開始聊天"
 
-#: gajim/gui_menu_builder.py:888 gajim/gui_menu_builder.py:915
+#: gajim/gui_menu_builder.py:791 gajim/gui_menu_builder.py:818
 #, fuzzy
-msgid "Add to Roster…"
-msgstr "加入至聯絡人清單(_A)"
+msgid "Add to Contact List…"
+msgstr "加入聯絡人(_A)…"
 
-#: gajim/gui_menu_builder.py:893
+#: gajim/gui_menu_builder.py:796
 #, fuzzy
 msgid "Copy Link Location"
 msgstr "複製連結位置(_C)"
 
-#: gajim/gui_menu_builder.py:894
+#: gajim/gui_menu_builder.py:797
 #, fuzzy
 msgid "Open Link in Browser"
 msgstr "在瀏覽器中開啟連結(_O)"
 
-#: gajim/gui_menu_builder.py:899
+#: gajim/gui_menu_builder.py:802
 #, fuzzy
 msgid "Copy Email Address"
 msgstr "複製 JID/電子郵件位址(_C)"
 
-#: gajim/gui_menu_builder.py:900 gajim/gui_menu_builder.py:912
+#: gajim/gui_menu_builder.py:803 gajim/gui_menu_builder.py:815
 #, fuzzy
 msgid "Open Email Composer"
 msgstr "開啟郵件編輯器(_O)"
 
-#: gajim/gui_menu_builder.py:905
+#: gajim/gui_menu_builder.py:808
 #, fuzzy
 msgid "Copy Location"
 msgstr "複製連結位置(_C)"
 
-#: gajim/gui_menu_builder.py:906
+#: gajim/gui_menu_builder.py:809
 #, fuzzy
 msgid "Show Location"
 msgstr "位置: %s"
 
-#: gajim/gui_menu_builder.py:911
+#: gajim/gui_menu_builder.py:814
 #, fuzzy
-msgid "Copy JID/Email"
+msgid "Copy XMPP Address/Email"
 msgstr "複製 JID/電子郵件位址(_C)"
 
-#: gajim/gui_menu_builder.py:945
+#: gajim/gui_menu_builder.py:852
 #, fuzzy
 msgid "Copy"
 msgstr "聊天室 JID"
@@ -571,44 +579,55 @@ msgstr ""
 msgid "Choose folder for logfile"
 msgstr ""
 
-#: gajim/history_manager.py:107
+#: gajim/history_manager.py:106
 msgid "Cannot find history logs database"
 msgstr "無法找到命令歷程記錄資料庫"
 
-#: gajim/history_manager.py:108
+#: gajim/history_manager.py:107
 #, fuzzy, python-format
 msgid "%s does not exist."
 msgstr "檔案不存在"
 
-#: gajim/history_manager.py:141 gajim/history_manager.py:195
-#: gajim/gtk/discovery.py:829 gajim/gtk/roster_item_exchange.py:80
-msgid "JID"
-msgstr "JID"
+#: gajim/history_manager.py:140 gajim/history_manager.py:194
+#: 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:30
+#: gajim/gtk/accounts.py:804
+#, fuzzy
+msgid "XMPP Address"
+msgstr "AIM 位址:"
 
-#: gajim/history_manager.py:154 gajim/history_manager.py:202
+#: gajim/history_manager.py:153 gajim/history_manager.py:201
 #: gajim/data/gui/history_window.ui:89 gajim/gtk/history.py:108
 msgid "Date"
 msgstr "日期"
 
-#: gajim/history_manager.py:161 gajim/history_manager.py:225
+#: gajim/history_manager.py:160 gajim/history_manager.py:224
 #: gajim/data/gui/join_groupchat_window.ui:208
 #: gajim/data/gui/profile_window.ui:214
 #: gajim/data/gui/vcard_information_window.ui:443
+#: gajim/data/gui/bookmarks.ui:140
 msgid "Nickname"
 msgstr "暱稱"
 
-#: gajim/history_manager.py:172 gajim/history_manager.py:211
+#: gajim/history_manager.py:171 gajim/history_manager.py:210
 #: gajim/data/gui/preferences_window.ui:1344
 #: gajim/data/gui/single_message_window.ui:275 gajim/gtk/history.py:117
 msgid "Message"
 msgstr "訊息"
 
-#: gajim/history_manager.py:180 gajim/history_manager.py:218
+#: gajim/history_manager.py:179 gajim/history_manager.py:217
 #: gajim/data/gui/groups_post_window.ui:49
 #: gajim/data/gui/single_message_window.ui:214
 msgid "Subject"
 msgstr "主題"
 
+#: gajim/history_manager.py:247
+msgid "Database Cleanup"
+msgstr "資料庫清理"
+
 #: gajim/history_manager.py:248
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
@@ -618,11 +637,8 @@ msgstr "您確定要清除資料庫?(強烈建議 GAJIM 執行時不要進行此
 #: gajim/history_manager.py:250
 #, fuzzy
 msgid ""
-"Normally allocated database size will not be freed, it will just become "
-"reusable. If you really want to reduce database filesize, click YES, else "
-"click NO.\n"
-"\n"
-"In case you click YES, please wait…"
+"Normally, the allocated database size will not be freed, it will just become "
+"reusable. This operation may take a while."
 msgstr ""
 "一般已佔用的資料庫空間不會被釋放，以便於恢復作業。如果您的確需要壓縮資料庫的"
 "體積，點擊 \"是\"，否則點擊\"否\"。\n"
@@ -630,44 +646,45 @@ msgstr ""
 "如果您點擊\"是\"，請等待…"
 
 #: gajim/history_manager.py:255
-msgid "Database Cleanup"
-msgstr "資料庫清理"
+#, fuzzy
+msgid "_Cleanup"
+msgstr "清除(_U)"
 
-#: gajim/history_manager.py:519 gajim/gtk/filetransfer.py:238
-#: gajim/gtk/filetransfer.py:248
+#: gajim/history_manager.py:518 gajim/gtk/filetransfer.py:237
+#: gajim/gtk/filetransfer.py:247
 msgid "You"
 msgstr "您"
 
-#: gajim/history_manager.py:531
+#: gajim/history_manager.py:530
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(who)s 在 %(time)s 時說:  %(message)s\n"
 
-#: gajim/history_manager.py:568 gajim/history_manager.py:607
-#: gajim/gtk/dialogs.py:58 gajim/gtk/themes.py:319
+#: gajim/history_manager.py:567 gajim/history_manager.py:606
+#: gajim/gtk/dialogs.py:57 gajim/gtk/themes.py:319
 #: gajim/gtk/roster_item_exchange.py:75 gajim/gtk/roster_item_exchange.py:185
 msgid "Delete"
 msgstr "刪除"
 
-#: gajim/history_manager.py:569
+#: gajim/history_manager.py:568
 #, fuzzy
 msgid "Delete Conversation"
 msgid_plural "Delete Conversations"
 msgstr[0] "刪除確認"
 
-#: gajim/history_manager.py:570
+#: gajim/history_manager.py:569
 #, 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:608
+#: gajim/history_manager.py:607
 #, fuzzy
 msgid "Delete Message"
 msgid_plural "Delete Messages"
 msgstr[0] "預設訊息"
 
-#: gajim/history_manager.py:609
+#: gajim/history_manager.py:608
 #, fuzzy
 msgid "Do you want to permanently delete this message"
 msgid_plural "Do you want to permanently delete these messages"
@@ -679,15 +696,15 @@ msgid "Contact name: <i>%s</i>"
 msgstr "聯絡人名稱: <i>%s</i>"
 
 #: gajim/dialogs.py:84
-#, fuzzy, python-format
-msgid "JID: <i>%s</i>"
-msgstr "Jabber ID: <i>%s</i>"
+#, python-format
+msgid "XMPP Address: <i>%s</i>"
+msgstr ""
 
-#: gajim/dialogs.py:115 gajim/dialogs.py:128 gajim/roster_window.py:2901
-#: gajim/roster_window.py:3833 gajim/roster_window.py:5084
-#: gajim/common/contacts.py:157 gajim/common/contacts.py:190
+#: gajim/dialogs.py:115 gajim/dialogs.py:128 gajim/roster_window.py:2894
+#: gajim/roster_window.py:3784 gajim/roster_window.py:5023
+#: gajim/common/contacts.py:157 gajim/common/contacts.py:206
 #: gajim/data/gui/preferences_window.ui:558
-#: gajim/data/gui/shortcuts_window.ui:177 gajim/gtk/accounts.py:349
+#: gajim/data/gui/shortcuts_window.ui:177 gajim/gtk/accounts.py:352
 msgid "General"
 msgstr "一般"
 
@@ -733,7 +750,7 @@ msgstr "覆寫狀態訊息?"
 msgid "Preset name is already in use. Do you want to overwrite this preset?"
 msgstr "這個名稱已被使用。您想要覆寫這個狀態訊息嗎?"
 
-#: gajim/dialogs.py:703
+#: gajim/dialogs.py:703 gajim/plugins/gui.py:292
 #, fuzzy
 msgid "_Overwrite"
 msgstr "覆寫？"
@@ -746,9 +763,7 @@ msgstr "另存為預設狀態訊息"
 msgid "Please type a name for this status message"
 msgstr "請為這個狀態訊息輸入一個名稱"
 
-#: gajim/dialogs.py:740 gajim/gui_interface.py:1441 gajim/dialog_messages.py:31
-#: gajim/gtk/discovery.py:518 gajim/gtk/profile.py:323
-#: gajim/gtk/join_groupchat.py:234
+#: gajim/dialogs.py:740 gajim/gtk/discovery.py:517 gajim/gtk/profile.py:323
 msgid "You are not connected to the server"
 msgstr "尚未連線到伺服器"
 
@@ -756,9 +771,11 @@ msgstr "尚未連線到伺服器"
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "未連線時，您不能同步您的聯絡人。"
 
-#: gajim/dialogs.py:752 gajim/dialogs.py:823 gajim/gtk/discovery.py:822
-#: gajim/gtk/discovery.py:1648 gajim/gtk/discovery.py:1941
-#: gajim/gtk/history.py:99 gajim/gtk/roster_item_exchange.py:83
+#: gajim/dialogs.py:752 gajim/dialogs.py:823
+#: gajim/data/gui/groupchat_info_scrolled.ui:16 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/gtk/roster_item_exchange.py:83
 msgid "Name"
 msgstr "名稱"
 
@@ -778,414 +795,361 @@ msgstr "這個帳號連線後您才可以與之同步"
 msgid "Synchronise"
 msgstr "同步"
 
-#: gajim/dialogs.py:1043
+#: gajim/dialogs.py:1042
 msgid "an audio and video"
 msgstr "一個音訊和視訊"
 
-#: gajim/dialogs.py:1045
+#: gajim/dialogs.py:1044
 msgid "an audio"
 msgstr "一個音訊"
 
-#: gajim/dialogs.py:1047
+#: gajim/dialogs.py:1046
 msgid "a video"
 msgstr "一個視訊"
 
-#: gajim/dialogs.py:1051
-#, python-format
+#: gajim/dialogs.py:1050
+#, fuzzy, python-format
 msgid ""
-"%(contact)s wants to start %(type)s session with you. Do you want to answer "
+"%(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:505
+#: gajim/groupchat_control.py:511
 #, fuzzy, python-format
 msgid "Send File (max. %s MiB)…"
 msgstr "另存為…"
 
-#: gajim/groupchat_control.py:507 gajim/chat_control.py:342
+#: gajim/groupchat_control.py:513 gajim/chat_control.py:344
 #, fuzzy
 msgid "No File Transfer available"
 msgstr "檔案傳輸完成"
 
-#: gajim/groupchat_control.py:630 gajim/groupchat_control.py:2349
-msgid "Changing Subject"
-msgstr "正在更換話題"
-
-#: gajim/groupchat_control.py:631 gajim/groupchat_control.py:2350
-msgid "Please specify the new subject:"
-msgstr "請指定新話題:"
-
-#: gajim/groupchat_control.py:638
-msgid "Changing Nickname"
-msgstr "正在更換暱稱"
-
-#: gajim/groupchat_control.py:639
-msgid "Please specify the new nickname you want to use:"
-msgstr "請指定您想使用的新暱稱:"
-
-#: gajim/groupchat_control.py:657
+#: gajim/groupchat_control.py:655
 #, fuzzy
-msgid "Invalid group chat JID"
+msgid "Invalid group chat XMPP Address"
 msgstr "無效的聊天室 Jabber ID"
 
-#: gajim/groupchat_control.py:658
+#: gajim/groupchat_control.py:656
 #, fuzzy
-msgid "The group chat JID has not allowed characters."
+msgid "The group chat XMPP Address has not allowed characters."
 msgstr "聊天室 Jabber ID 包含不合法字元。"
 
-#: gajim/groupchat_control.py:758 gajim/gtk/profile.py:136
+#: gajim/groupchat_control.py:743 gajim/gtk/profile.py:136
 msgid "Could not load image"
 msgstr "無法讀取圖片"
 
-#: gajim/groupchat_control.py:888
+#: gajim/groupchat_control.py:873
 msgid "Insert Nickname"
 msgstr "插入暱稱"
 
-#: gajim/groupchat_control.py:1056 gajim/chat_control.py:824
+#: gajim/groupchat_control.py:1041 gajim/chat_control.py:848
 msgid "and authenticated"
 msgstr "且已被認證"
 
-#: gajim/groupchat_control.py:1060 gajim/chat_control.py:828
+#: gajim/groupchat_control.py:1045 gajim/chat_control.py:852
 msgid "and NOT authenticated"
 msgstr "且未被認證"
 
-#: gajim/groupchat_control.py:1064
+#: gajim/groupchat_control.py:1049
 #, fuzzy, python-format
 msgid "%(type)s encryption is active %(authenticated)s."
 msgstr ""
 "%(type)s 加密 %(status)s 活動 %(authenticated)s。\n"
 "您的聊天作業階段 %(logged)s 將被記錄。"
 
-#: gajim/groupchat_control.py:1111
+#: gajim/groupchat_control.py:1096
 msgid "Conversation with "
 msgstr "對話，與"
 
-#: gajim/groupchat_control.py:1113
+#: gajim/groupchat_control.py:1098
 msgid "Continued conversation"
 msgstr "繼續對話"
 
-#: gajim/groupchat_control.py:1411
+#: gajim/groupchat_control.py:1357
 #, python-format
 msgid "%(nick)s has set the subject to %(subject)s"
 msgstr "%(nick)s 將主題設定為 %(subject)s"
 
-#: gajim/groupchat_control.py:1433
+#: gajim/groupchat_control.py:1374
 #, fuzzy
-msgid "Room now shows unavailable members"
+msgid "Group chat now shows unavailable members"
 msgstr "聊天室現在顯示了無法使用的成員"
 
-#: gajim/groupchat_control.py:1436
+#: gajim/groupchat_control.py:1377
 #, fuzzy
-msgid "Room now does not show unavailable members"
+msgid "Group chat now does not show unavailable members"
 msgstr "聊天室現在不顯示無法使用的成員"
 
-#: gajim/groupchat_control.py:1439
+#: gajim/groupchat_control.py:1380
 msgid "A setting not related to privacy has been changed"
 msgstr ""
 
-#: gajim/groupchat_control.py:1446
-msgid "Room logging is now enabled"
-msgstr "聊天室訊息記錄已啟用"
+#: gajim/groupchat_control.py:1387 gajim/groupchat_control.py:1659
+#, fuzzy
+msgid "Conversations are stored on the server"
+msgstr "本次作業階段將在伺服器上被存檔"
 
-#: gajim/groupchat_control.py:1449
-msgid "Room logging is now disabled"
-msgstr "聊天室訊息記錄已停用"
+#: gajim/groupchat_control.py:1390
+#, fuzzy
+msgid "Conversations are not stored on the server"
+msgstr "伺服器中儲存的關於您的資訊"
 
-#: gajim/groupchat_control.py:1452
-msgid "Room is now non-anonymous"
+#: gajim/groupchat_control.py:1393
+#, fuzzy
+msgid "Group chat is now non-anonymous"
 msgstr "聊天室現在是非匿名的"
 
-#: gajim/groupchat_control.py:1456
-msgid "Room is now semi-anonymous"
+#: gajim/groupchat_control.py:1397
+#, fuzzy
+msgid "Group chat is now semi-anonymous"
 msgstr "聊天室現在是半匿名的"
 
-#: gajim/groupchat_control.py:1460
+#: gajim/groupchat_control.py:1401
 #, fuzzy
-msgid "Room is now fully anonymous"
+msgid "Group chat is now fully anonymous"
 msgstr "聊天室現在是完全匿名的"
 
-#: gajim/groupchat_control.py:1500
+#: gajim/groupchat_control.py:1439
 #, fuzzy, python-format
 msgid "Ping? (%s)"
 msgstr "Pong! (%s s.)"
 
-#: gajim/groupchat_control.py:1503
+#: gajim/groupchat_control.py:1442
 #, fuzzy, python-format
 msgid "Pong! (%(nick)s %(delay)s s.)"
 msgstr "Pong! (%s s.)"
 
-#: gajim/groupchat_control.py:1506 gajim/chat_control.py:1213
+#: gajim/groupchat_control.py:1445 gajim/chat_control.py:1237
 msgid "Error."
 msgstr "錯誤。"
 
-#: gajim/groupchat_control.py:1711
+#: gajim/groupchat_control.py:1650
 #, fuzzy, python-format
-msgid "You (%s) joined the room"
+msgid "You (%s) joined the group chat"
 msgstr "%s 加入聊天室"
 
-#: gajim/groupchat_control.py:1717
-msgid "Any occupant is allowed to see your full JID"
+#: gajim/groupchat_control.py:1655
+#, fuzzy
+msgid "Any participant is allowed to see your full XMPP Address"
 msgstr "所有室友可以看到您的全部 JID"
 
-#: gajim/groupchat_control.py:1721
-msgid "Room logging is enabled"
-msgstr "聊天室記錄被啟用"
-
-#: gajim/groupchat_control.py:1725
-msgid "The server has assigned or modified your roomnick"
+#: gajim/groupchat_control.py:1663
+#, fuzzy
+msgid "The server has assigned or modified your nickname in this group chat"
 msgstr "伺服器指定或修改了您的聊天室暱稱"
 
-#: gajim/groupchat_control.py:1732
-msgid "A new room has been created"
+#: gajim/groupchat_control.py:1671
+#, fuzzy
+msgid "A new group chat has been created"
 msgstr "一個新的聊天室被建立"
 
-#: gajim/groupchat_control.py:1740 gajim/privatechat_control.py:112
+#: gajim/groupchat_control.py:1679 gajim/privatechat_control.py:115
 #, python-format
 msgid "You are now known as %s"
 msgstr "您現在成了 %s "
 
-#: gajim/groupchat_control.py:1742 gajim/privatechat_control.py:114
+#: gajim/groupchat_control.py:1681 gajim/privatechat_control.py:117
 #, fuzzy, python-brace-format
 msgid "{nick} is now known as {new_nick}"
 msgstr "%(nick)s 現在成了 %(new_nick)s"
 
-#: gajim/groupchat_control.py:1767 gajim/privatechat_control.py:141
+#: gajim/groupchat_control.py:1706 gajim/privatechat_control.py:144
 #, fuzzy, python-brace-format
 msgid "You are now {show}{status}"
 msgstr "您現在成了 %s "
 
-#: gajim/groupchat_control.py:1773 gajim/privatechat_control.py:147
+#: gajim/groupchat_control.py:1712 gajim/privatechat_control.py:150
 #, fuzzy, python-brace-format
 msgid "{nick} is now {show}{status}"
 msgstr "%(nick)s 的狀態是 %(status)s"
 
-#: gajim/groupchat_control.py:1790 gajim/groupchat_control.py:1819
-#: gajim/groupchat_control.py:1849 gajim/groupchat_control.py:1909
+#: gajim/groupchat_control.py:1729 gajim/groupchat_control.py:1758
+#: gajim/groupchat_control.py:1788 gajim/groupchat_control.py:1848
 #, python-brace-format
 msgid " by {actor}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1793
+#: gajim/groupchat_control.py:1732
 #, fuzzy, python-brace-format
 msgid "** Your Affiliation has been set to {affiliation}{actor}{reason}"
 msgstr "** %(nick)s 的歸屬被 %(actor)s 設定為 %(affiliation)s"
 
-#: gajim/groupchat_control.py:1799
+#: gajim/groupchat_control.py:1738
 #, fuzzy, python-brace-format
 msgid "** Affiliation of {nick} has been set to {affiliation}{actor}{reason}"
 msgstr "** %(nick)s 的歸屬被設定為 %(affiliation)s"
 
-#: gajim/groupchat_control.py:1822
+#: gajim/groupchat_control.py:1761
 #, fuzzy, python-brace-format
 msgid "** Your Role has been set to {role}{actor}{reason}"
 msgstr "** %(nick)s 的角色被 %(actor)s 設定為 %(role)s"
 
-#: gajim/groupchat_control.py:1827
+#: gajim/groupchat_control.py:1766
 #, fuzzy, python-brace-format
 msgid "** Role of {nick} has been set to {role}{actor}{reason}"
 msgstr "** %(nick)s 的角色被 %(actor)s 設定為 %(role)s"
 
-#: gajim/groupchat_control.py:1852
+#: gajim/groupchat_control.py:1791
 #, fuzzy, python-brace-format
-msgid "You have been removed from the room{actor}{reason}"
+msgid "You have been removed from the group chat{actor}{reason}"
 msgstr "%(nick)s 已經被從這個聊天室移除(%(reason)s)"
 
-#: gajim/groupchat_control.py:1857
+#: gajim/groupchat_control.py:1796
 #, python-brace-format
 msgid "You have left due to an error{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1863
+#: gajim/groupchat_control.py:1802
 #, python-brace-format
 msgid "You have been kicked{actor}{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1870
+#: gajim/groupchat_control.py:1809
 #, python-brace-format
 msgid "You have been banned{actor}{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1877 gajim/groupchat_control.py:1943
+#: gajim/groupchat_control.py:1816 gajim/groupchat_control.py:1882
 #, fuzzy
 msgid ": Affiliation changed"
 msgstr "歸屬變更"
 
-#: gajim/groupchat_control.py:1883 gajim/groupchat_control.py:1948
+#: gajim/groupchat_control.py:1822 gajim/groupchat_control.py:1887
 #, fuzzy
-msgid ": Room configuration changed to members-only"
+msgid ": Group chat configuration changed to members-only"
 msgstr "聊天室配置變為\"僅成員\""
 
-#: gajim/groupchat_control.py:1912
+#: gajim/groupchat_control.py:1851
 #, fuzzy, python-brace-format
-msgid "{nick} has been removed from the room{by}{reason}"
+msgid "{nick} has been removed from the group chat{by}{reason}"
 msgstr "%(nick)s 已經被從這個聊天室移除(%(reason)s)"
 
-#: gajim/groupchat_control.py:1922
+#: gajim/groupchat_control.py:1861
 #, python-brace-format
 msgid "{nick} has left due to an error{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1928
+#: gajim/groupchat_control.py:1867
 #, fuzzy, python-brace-format
 msgid "{nick} has been kicked{actor}{reason}"
 msgstr "%(nick)s 被踢出: %(reason)s"
 
-#: gajim/groupchat_control.py:1936
+#: gajim/groupchat_control.py:1875
 #, fuzzy, python-brace-format
 msgid "{nick} has been banned{actor}{reason}"
 msgstr "%(nick)s 被封禁: %(reason)s"
 
-#: gajim/groupchat_control.py:1953
+#: gajim/groupchat_control.py:1892
 #, python-brace-format
 msgid "{nick} has left{reason}"
 msgstr ""
 
-#: gajim/groupchat_control.py:1970
+#: gajim/groupchat_control.py:1914
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s 加入聊天室"
 
-#: gajim/groupchat_control.py:1985 gajim/groupchat_control.py:1990
-#: gajim/groupchat_control.py:1995 gajim/groupchat_control.py:2000
-#: gajim/groupchat_control.py:2011
-msgid "Unable to join group chat"
-msgstr "無法加入聊天室"
-
-#: gajim/groupchat_control.py:1986
-#, python-format
-msgid "You are banned from group chat <b>%s</b>."
-msgstr "您被多人聊天 <b>%s</b> 封禁。"
-
-#: gajim/groupchat_control.py:1991
-#, fuzzy, python-format
-msgid "Remote server <b>%s</b> does not exist."
-msgstr "多人聊天 <b>%s</b> 不存在。"
-
-#: gajim/groupchat_control.py:1996
-#, python-format
-msgid "Group chat <b>%s</b> does not exist."
-msgstr "多人聊天 <b>%s</b> 不存在。"
-
-#: gajim/groupchat_control.py:2001
+#: gajim/groupchat_control.py:1981
 #, fuzzy
-msgid "Group chat creation is not permitted."
-msgstr "聊天室建立是受限的。"
-
-#: gajim/groupchat_control.py:2005
-#, fuzzy
-msgid "Unable to join groupchat"
-msgstr "無法加入聊天室"
-
-#: gajim/groupchat_control.py:2006
-#, fuzzy, python-format
-msgid "You must use your registered nickname in <b>%s</b>."
-msgstr "您已註冊的暱稱必須在多人聊天 <b>%s</b> 中使用。"
-
-#: gajim/groupchat_control.py:2012
-#, python-format
-msgid "You are not in the members list in groupchat %s."
-msgstr "您不在聊天室 %s 的成員清單中。"
-
-#: gajim/groupchat_control.py:2068
-msgid "Room has been destroyed"
+msgid "Group chat has been destroyed"
 msgstr "聊天室已經被銷毀了"
 
-#: gajim/groupchat_control.py:2073
+#: gajim/groupchat_control.py:1986
 #, fuzzy, python-format
-msgid "You can join this room instead: xmpp:%s?join"
+msgid "You can join this group chat instead: xmpp:%s?join"
 msgstr "做為替代，您可以加入這個聊天室: %s"
 
-#: gajim/groupchat_control.py:2306
+#: gajim/groupchat_control.py:2214
 #, fuzzy
 msgid "Leave Group Chat"
 msgstr "離開聊天室"
 
-#: gajim/groupchat_control.py:2307
+#: gajim/groupchat_control.py:2215
 #, fuzzy
 msgid "Are you sure you want to leave this group chat?"
 msgstr "您確定要離開聊天室\"%s\"嗎?"
 
-#: gajim/groupchat_control.py:2308
+#: gajim/groupchat_control.py:2216
 #, fuzzy, python-format
-msgid "If you close this window, you will be disconnected from '%s'."
+msgid "If you close this window, you will leave '%s'."
 msgstr "如果關閉此視窗，您將中斷此聊天室的連線。"
 
-#: gajim/groupchat_control.py:2314
+#: gajim/groupchat_control.py:2222 gajim/roster_window.py:5177
 msgid "_Leave"
 msgstr ""
 
-#: gajim/groupchat_control.py:2377
+#: gajim/groupchat_control.py:2280 gajim/roster_window.py:3008
 #, fuzzy, python-format
 msgid "%(jid)s has been invited to this group chat"
 msgstr "%(nick)s 已經被從這個聊天室移除(%(reason)s)"
 
-#: gajim/groupchat_control.py:2527
+#: gajim/groupchat_control.py:2463
 #, python-format
 msgid "Kicking %s"
 msgstr "將踢走 %s"
 
-#: gajim/groupchat_control.py:2528 gajim/groupchat_control.py:2829
+#: gajim/groupchat_control.py:2464 gajim/groupchat_control.py:2765
 msgid "You may specify a reason below:"
 msgstr "您可以指定一個原因:"
 
-#: gajim/groupchat_control.py:2828
+#: gajim/groupchat_control.py:2764
 #, python-format
 msgid "Banning %s"
 msgstr "將封禁 %s"
 
-#: gajim/chat_control.py:408
+#: gajim/chat_control.py:432
 msgid "Show a list of formattings"
 msgstr "顯示格式清單(Alt+M)"
 
-#: gajim/chat_control.py:412
+#: gajim/chat_control.py:436
 #, fuzzy
 msgid "This contact does not support HTML"
 msgstr "這個聯絡人不支援檔案傳輸"
 
-#: gajim/chat_control.py:562
+#: gajim/chat_control.py:586
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr "%(type)s 狀態: %(state)s，原因: %(reason)s"
 
-#: gajim/chat_control.py:686
+#: gajim/chat_control.py:710
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "聊天室 %(room_name)s 的 %(nickname)s"
 
-#: gajim/chat_control.py:832
+#: gajim/chat_control.py:856
 #, fuzzy, python-format
 msgid "%(type)s encryption is active %(authenticated)s"
 msgstr ""
 "%(type)s 加密 %(status)s 活動 %(authenticated)s。\n"
 "您的聊天作業階段 %(logged)s 將被記錄。"
 
-#: gajim/chat_control.py:1160 gajim/chat_control.py:1168
+#: gajim/chat_control.py:1184 gajim/chat_control.py:1192
 #, fuzzy
 msgid "Close"
 msgstr "傳送並關閉(_S)"
 
-#: gajim/chat_control.py:1161
+#: gajim/chat_control.py:1185
 #, fuzzy, python-format
 msgid "You just received a new message from %s"
 msgstr "您剛剛收到一條來自 \"%s\" 的訊息"
 
-#: gajim/chat_control.py:1163
+#: gajim/chat_control.py:1187
 #, fuzzy
 msgid ""
 "If you close this tab while having chat history disabled, this message will "
 "be lost."
 msgstr "如果您關閉此標籤並且停用了命令歷程，此訊息會丟失。"
 
-#: gajim/chat_control.py:1208
+#: gajim/chat_control.py:1232
 msgid "Ping?"
 msgstr "Ping?"
 
-#: gajim/chat_control.py:1211
+#: gajim/chat_control.py:1235
 #, fuzzy, python-format
 msgid "Pong! (%s seconds)"
 msgstr "Pong! (%s s.)"
 
-#: gajim/chat_control.py:1308
+#: gajim/chat_control.py:1332
 #, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -1194,270 +1158,278 @@ msgstr ""
 "主題: %(subject)s\n"
 "%(message)s"
 
-#: gajim/chat_control.py:1416
+#: gajim/chat_control.py:1440
 #, fuzzy, python-format
 msgid "%(name)s is now %(show)s %(status)s"
 msgstr "%(name)s 的狀態是 %(status)s"
 
-#: gajim/chat_control.py:1476 gajim/data/gui/application_menu.ui:32
+#: gajim/chat_control.py:1500 gajim/data/gui/application_menu.ui:32
 #: gajim/gtk/http_upload_progress.py:35
 #, fuzzy
 msgid "File Transfer"
 msgstr "檔案傳輸"
 
-#: gajim/chat_control.py:1480
+#: gajim/chat_control.py:1504
 #, fuzzy
 msgid "Size"
 msgstr "大小:  %s"
 
-#: gajim/chat_control.py:1482 gajim/chat_control.py:1546
+#: gajim/chat_control.py:1506 gajim/chat_control.py:1566
+#: gajim/gui_interface.py:190
 #: gajim/data/gui/groupchat_invitation_received.ui:77
-#: gajim/gtk/filetransfer.py:485
+#: gajim/gtk/filetransfer.py:490
 #, fuzzy
 msgid "_Accept"
 msgstr "帳號(_A)"
 
-#: gajim/chat_control.py:1484 gajim/chat_control.py:1548
+#: gajim/chat_control.py:1508 gajim/chat_control.py:1568
 #: gajim/data/gui/groupchat_invitation_received.ui:62
 #, fuzzy
 msgid "_Decline"
 msgstr "離線(_O)"
 
-#: gajim/chat_control.py:1506 gajim/gui_interface.py:791
-#: gajim/gui_interface.py:821 gajim/gui_interface.py:847
+#: gajim/chat_control.py:1530 gajim/gui_interface.py:777
+#: gajim/gui_interface.py:807 gajim/gui_interface.py:833
 #: gajim/gtk/notification.py:173 gajim/gtk/notification.py:278
 msgid "File Transfer Completed"
 msgstr "檔案傳輸完成"
 
-#: gajim/chat_control.py:1510 gajim/gtk/filetransfer.py:259
+#: gajim/chat_control.py:1534 gajim/gtk/filetransfer.py:258
 #, fuzzy
 msgid "Open _Folder"
 msgstr "開啟資料夾(_O)"
 
-#: gajim/chat_control.py:1512 gajim/chat_control.py:1521
+#: gajim/chat_control.py:1536 gajim/chat_control.py:1545
+#: gajim/data/gui/groupchat_control.ui:962
+#: gajim/data/gui/groupchat_control.ui:1049
+#: gajim/data/gui/groupchat_control.ui:1155
 #, fuzzy
 msgid "_Close"
 msgstr "傳送並關閉(_S)"
 
-#: gajim/chat_control.py:1543 gajim/gui_interface.py:484
+#: gajim/chat_control.py:1563 gajim/gui_interface.py:473
+#: gajim/data/gui/groupchat_invitation_received.ui:42
 #: gajim/gtk/notification.py:174 gajim/gtk/notification.py:195
 #: gajim/gtk/notification.py:281
-msgid "Groupchat Invitation"
+#, fuzzy
+msgid "Group Chat Invitation"
 msgstr "多人聊天邀請"
 
-#: gajim/chat_control.py:1568 gajim/roster_window.py:1954
+#: gajim/chat_control.py:1588 gajim/roster_window.py:1951
 msgid "Remote contact stopped transfer"
 msgstr "遠端聯絡人停止了傳輸"
 
-#: gajim/chat_control.py:1570 gajim/roster_window.py:1956
+#: gajim/chat_control.py:1590 gajim/roster_window.py:1953
 msgid "Error opening file"
 msgstr "開啟檔案錯誤"
 
-#: gajim/chat_control.py:1572 gajim/gtk/filetransfer.py:297
+#: gajim/chat_control.py:1592 gajim/gtk/filetransfer.py:296
 msgid "File transfer stopped"
 msgstr "檔案傳輸已停止"
 
-#: gajim/chat_control.py:1575 gajim/gtk/filetransfer.py:275
-#: gajim/gtk/filetransfer.py:284
+#: gajim/chat_control.py:1595 gajim/gtk/filetransfer.py:274
+#: gajim/gtk/filetransfer.py:283
 msgid "File transfer cancelled"
 msgstr "檔案傳輸已取消"
 
-#: gajim/chat_control.py:1576
+#: gajim/chat_control.py:1596
 msgid "Connection with peer cannot be established."
 msgstr "無法與對方建立連線。"
 
-#: gajim/application.py:72
+#: gajim/application.py:75
 #, fuzzy
 msgid "Show the application's version"
 msgstr "在通知區域顯示圖示:"
 
-#: gajim/application.py:79
+#: gajim/application.py:82
 #, fuzzy
 msgid "Show only critical errors"
 msgstr "只顯示在聯絡人清單中"
 
-#: gajim/application.py:86
+#: gajim/application.py:89
 msgid "Separate profile files completely (even history database and plugins)"
 msgstr ""
 
-#: gajim/application.py:94
+#: gajim/application.py:97
 msgid "Print XML stanzas and other debug information"
 msgstr ""
 
-#: gajim/application.py:101
+#: gajim/application.py:104
 #, fuzzy
 msgid "Use defined profile in configuration directory"
 msgstr "進階設定編輯器"
 
-#: gajim/application.py:109
+#: gajim/application.py:112
 #, fuzzy
 msgid "Set configuration directory"
 msgstr "%s 設定錯誤"
 
-#: gajim/application.py:117
+#: gajim/application.py:120
 #, fuzzy
 msgid "Configure logging system"
 msgstr "組配 %s"
 
-#: gajim/application.py:125
+#: gajim/application.py:128
 #, fuzzy
 msgid "Show all warnings"
 msgstr "顯示所有未處理事件(_E)"
 
-#: gajim/application.py:132
+#: gajim/application.py:135
 msgid "Open IPython shell"
 msgstr ""
 
-#: gajim/application.py:139
+#: gajim/application.py:142
 msgid "Pops up a window with the next pending event"
 msgstr "為下一筆未處理事件彈出視窗"
 
-#: gajim/application.py:145 gajim/data/gui/shortcuts_window.ui:203
+#: gajim/application.py:148 gajim/data/gui/shortcuts_window.ui:203
 #: data/org.gajim.Gajim.desktop.in:21
 #, fuzzy
 msgid "Start a new chat"
 msgstr "開始聊天"
 
-#: gajim/application.py:152
+#: gajim/application.py:155
 msgid "Simulate loss of connectivity"
 msgstr ""
 
-#: gajim/application.py:159
+#: gajim/application.py:162
 msgid "Simulate regaining connectivity"
 msgstr ""
 
-#: gajim/application.py:201 gajim/gui_interface.py:133
+#: gajim/application.py:204 gajim/gui_interface.py:133
 msgid "Database Error"
 msgstr "資料庫錯誤"
 
-#: gajim/roster_window.py:294 gajim/roster_window.py:1030
+#: gajim/roster_window.py:291 gajim/roster_window.py:1027
 msgid "Merged accounts"
 msgstr "已合併的帳號"
 
-#: gajim/roster_window.py:853 gajim/roster_window.py:1631
-#: gajim/roster_window.py:1664 gajim/roster_window.py:1715
-#: gajim/roster_window.py:1717 gajim/roster_window.py:1872
-#: gajim/roster_window.py:2531 gajim/roster_window.py:5025
-#: gajim/common/contacts.py:188 gajim/common/contacts.py:447
-#: gajim/common/helpers.py:83 gajim/gtk/discovery.py:129
-#: gajim/gtk/discovery.py:130 gajim/gtk/discovery.py:1416
+#: gajim/roster_window.py:850 gajim/roster_window.py:1628
+#: gajim/roster_window.py:1661 gajim/roster_window.py:1712
+#: gajim/roster_window.py:1714 gajim/roster_window.py:1869
+#: gajim/roster_window.py:2528 gajim/roster_window.py:4331
+#: gajim/roster_window.py:4964 gajim/common/contacts.py:204
+#: gajim/common/contacts.py:463 gajim/common/helpers.py:86
+#: gajim/gtk/discovery.py:127 gajim/gtk/discovery.py:128
+#: gajim/gtk/discovery.py:1414
 msgid "Transports"
 msgstr "服務代理"
 
-#: gajim/roster_window.py:1723 gajim/roster_window.py:1725
-#: gajim/roster_window.py:4995 gajim/gui_interface.py:1613
-#: gajim/gui_interface.py:1639 gajim/common/contacts.py:186
-#: gajim/common/helpers.py:83 gajim/common/modules/adhoc_commands.py:245
-msgid "Groupchats"
+#: gajim/roster_window.py:1720 gajim/roster_window.py:1722
+#: gajim/roster_window.py:4331 gajim/roster_window.py:4934
+#: gajim/gui_interface.py:1527 gajim/common/contacts.py:202
+#: gajim/common/helpers.py:86 gajim/common/modules/adhoc_commands.py:245
+#, fuzzy
+msgid "Group chats"
 msgstr "多人聊天"
 
-#: gajim/roster_window.py:2012
+#: gajim/roster_window.py:2009
 #, fuzzy
 msgid "Authorization sent"
 msgstr "授權傳送成功"
 
-#: gajim/roster_window.py:2013
+#: gajim/roster_window.py:2010
 #, fuzzy, python-format
 msgid "\"%s\" will now see your status."
 msgstr "現在\"%s\"將知道您的狀態。"
 
-#: gajim/roster_window.py:2031
+#: gajim/roster_window.py:2028
 msgid "Subscription request has been sent"
 msgstr "認證請求已發出"
 
-#: gajim/roster_window.py:2032
-#, python-format
-msgid "If \"%s\" accepts this request you will know his or her status."
+#: gajim/roster_window.py:2029
+#, fuzzy, python-format
+msgid "If \"%s\" accepts this request you will know their status."
 msgstr "如果\"%s\"接受此請求，您將知道他/她的狀態。"
 
-#: gajim/roster_window.py:2046
+#: gajim/roster_window.py:2043
 #, fuzzy
 msgid "Authorization removed"
 msgstr "授權被移除"
 
-#: gajim/roster_window.py:2047
+#: gajim/roster_window.py:2044
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "\"%s\" 將一直看到您的狀態為離線。"
 
-#: gajim/roster_window.py:2250 gajim/roster_window.py:3504
+#: gajim/roster_window.py:2247 gajim/roster_window.py:3460
 msgid "Disconnect for Invisibility"
 msgstr ""
 
-#: gajim/roster_window.py:2251 gajim/roster_window.py:3505
+#: gajim/roster_window.py:2248 gajim/roster_window.py:3461
 msgid "You are participating in one or more group chats"
 msgstr "您正在參與一個或多個多人聊天"
 
-#: gajim/roster_window.py:2252 gajim/roster_window.py:3506
+#: gajim/roster_window.py:2249 gajim/roster_window.py:3462
 #, fuzzy
 msgid ""
-"Changing your status to invisible will result in disconnection from those "
-"group chats.\n"
+"Changing your status to invisible will result in you leaving those group "
+"chats.\n"
 "Are you sure you want to go invisible?"
 msgstr "隱身將使您從這些聊天室插斷開。確定要隱身?"
 
-#: gajim/roster_window.py:2257 gajim/roster_window.py:3512
-#: gajim/roster_window.py:5238 gajim/data/gui/gc_control_popup_menu.ui:120
+#: gajim/roster_window.py:2254 gajim/roster_window.py:3468
+#: gajim/data/gui/gc_control_popup_menu.ui:120
 msgid "_Disconnect"
 msgstr "中斷連線(_D)"
 
-#: gajim/roster_window.py:2285
+#: gajim/roster_window.py:2282
 #, fuzzy
 msgid "desynced"
 msgstr "未同步"
 
-#: gajim/roster_window.py:2353 gajim/data/gui/shortcuts_window.ui:224
+#: gajim/roster_window.py:2350 gajim/data/gui/shortcuts_window.ui:224
 #, fuzzy
 msgid "Quit Gajim"
 msgstr "Gajim"
 
-#: gajim/roster_window.py:2354
+#: gajim/roster_window.py:2351
 #, fuzzy
 msgid "You are about to quit Gajim"
 msgstr "您確定您要離開 Gajim 嗎?"
 
-#: gajim/roster_window.py:2355
+#: gajim/roster_window.py:2352
 msgid "Are you sure you want to quit Gajim?"
 msgstr "您確定您要離開 Gajim 嗎?"
 
-#: gajim/roster_window.py:2356
+#: gajim/roster_window.py:2353
 #, fuzzy
 msgid "_Always quit when closing Gajim"
 msgstr "總是關閉 Gajim"
 
-#: gajim/roster_window.py:2359 gajim/roster_window.py:2455
-#: gajim/roster_window.py:2495 gajim/data/gui/systray_context_menu.ui:90
+#: gajim/roster_window.py:2356 gajim/roster_window.py:2452
+#: gajim/roster_window.py:2492 gajim/data/gui/systray_context_menu.ui:83
 msgid "_Quit"
 msgstr ""
 
-#: gajim/roster_window.py:2448
+#: gajim/roster_window.py:2445
 #, fuzzy
 msgid "Stop File Transfers"
 msgstr "檔案傳輸"
 
-#: gajim/roster_window.py:2449
+#: gajim/roster_window.py:2446
 #, fuzzy
 msgid "You still have running file transfers"
 msgstr "您有傳送中的檔案"
 
-#: gajim/roster_window.py:2450
+#: gajim/roster_window.py:2447
 #, fuzzy
 msgid ""
 "If you quit now, the file(s) being transferred will be lost.\n"
 "Do you still want to quit?"
 msgstr "如果現在離開，傳送中的檔案會停止傳輸。您仍然要離開嗎?"
 
-#: gajim/roster_window.py:2488
+#: gajim/roster_window.py:2485
 #, fuzzy
 msgid "Unread Messages"
 msgstr "未讀取的事件"
 
-#: gajim/roster_window.py:2489
+#: gajim/roster_window.py:2486
 #, fuzzy
 msgid "You still have unread messages"
 msgstr "您有未讀訊息"
 
-#: gajim/roster_window.py:2490
+#: gajim/roster_window.py:2487
 #, fuzzy
 msgid ""
 "Messages will only be available for reading them later if storing chat "
@@ -1466,31 +1438,31 @@ msgstr ""
 "除非您啟用了命令歷程記錄而且向您傳送訊息的聯絡人在您的聯絡人清單中，您才能\n"
 "在以後讀到這些訊息。"
 
-#: gajim/roster_window.py:2760
+#: gajim/roster_window.py:2753
 msgid "You have unread messages"
 msgstr "您有未讀訊息"
 
-#: gajim/roster_window.py:2761
+#: gajim/roster_window.py:2754
 msgid "You must read them before removing this transport."
 msgstr "在移除代理之前您必須檢視它們。"
 
-#: gajim/roster_window.py:2764
+#: gajim/roster_window.py:2757
 #, fuzzy, python-format
 msgid "Transport '%s' will be removed"
 msgstr "代理\"%s\"將被移除"
 
-#: gajim/roster_window.py:2765
+#: gajim/roster_window.py:2758
 #, fuzzy
 msgid ""
 "You will no longer be able to send and receive messages from and to contacts "
 "using this transport."
 msgstr "您將無法再和使用這個代理的聯絡人收發訊息。"
 
-#: gajim/roster_window.py:2768
+#: gajim/roster_window.py:2761
 msgid "Transports will be removed"
 msgstr "代理將被移除"
 
-#: gajim/roster_window.py:2773
+#: gajim/roster_window.py:2766
 #, fuzzy, python-format
 msgid ""
 "You will no longer be able to send and receive messages from and to contacts "
@@ -1498,86 +1470,81 @@ msgid ""
 "%s"
 msgstr "您將無法再和使用這個代理的聯絡人收發訊息。"
 
-#: gajim/roster_window.py:2777
+#: gajim/roster_window.py:2770
 #, fuzzy
 msgid "Remove Transport"
 msgstr "顯示代理(_P)"
 
-#: gajim/roster_window.py:2844
+#: gajim/roster_window.py:2837
 #, fuzzy
 msgid "Block Contact"
 msgstr "被阻斷的聯絡人"
 
-#: gajim/roster_window.py:2845
+#: gajim/roster_window.py:2838
 #, fuzzy
 msgid "Really block this contact?"
 msgstr "是否為此聯絡人使用 OpenPGP?"
 
-#: gajim/roster_window.py:2846
+#: gajim/roster_window.py:2839
 #, fuzzy
 msgid ""
 "This contact will see you offline and you will not receive any messages sent "
 "to you by this contact."
 msgstr "這個聯絡人將看到您離線並且您不會在收到他傳送給您的訊息。"
 
-#: gajim/roster_window.py:2851
+#: gajim/roster_window.py:2844
 #, fuzzy
 msgid "_Block Contact"
 msgstr "被阻斷的聯絡人"
 
-#: gajim/roster_window.py:2896
+#: gajim/roster_window.py:2889
 msgid "Rename Contact"
 msgstr "重新命名聯絡人"
 
-#: gajim/roster_window.py:2897
+#: gajim/roster_window.py:2890
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "為聯絡人 %s 輸入新的暱稱"
 
-#: gajim/roster_window.py:2904
+#: gajim/roster_window.py:2897
 msgid "Rename Group"
 msgstr "重新命名群組"
 
-#: gajim/roster_window.py:2905
+#: gajim/roster_window.py:2898
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "為群組 %s 輸入新的名稱"
 
-#: gajim/roster_window.py:2953 gajim/roster_window.py:2954
+#: gajim/roster_window.py:2946 gajim/roster_window.py:2947
 msgid "Remove Group"
 msgstr "移除群組"
 
-#: gajim/roster_window.py:2955
+#: gajim/roster_window.py:2948
 #, fuzzy, python-format
 msgid "Do you want to remove %s from the contact list?"
 msgstr "您想從聯絡人清單中刪除組 %s ?"
 
-#: gajim/roster_window.py:2956
+#: gajim/roster_window.py:2949
 #, fuzzy
 msgid "_Also remove all contacts of this group from contact list"
 msgstr "同時從聯絡人清單移除這個群組的所有聯絡人"
 
-#: gajim/roster_window.py:3044
-#, fuzzy, python-format
-msgid "%(jid)s has been invited in this room"
-msgstr "%(nick)s 已經被從這個聊天室移除(%(reason)s)"
-
-#: gajim/roster_window.py:3353
+#: gajim/roster_window.py:3309
 #, fuzzy
 msgid "Remove Contact"
 msgstr "重新命名聯絡人"
 
-#: gajim/roster_window.py:3354
+#: gajim/roster_window.py:3310
 #, fuzzy
 msgid "Remove contact from contact list"
 msgstr "從聯絡人清單移除聯絡人"
 
-#: gajim/roster_window.py:3355
+#: gajim/roster_window.py:3311
 #, 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:3364 gajim/roster_window.py:3384
+#: gajim/roster_window.py:3320 gajim/roster_window.py:3340
 #, fuzzy
 msgid ""
 "By removing this contact you also remove authorization. This means the "
@@ -1586,21 +1553,21 @@ msgstr ""
 "移除這些聯絡人: %s 的同時\n"
 "將移除認證導致他們將一直看到您為離線。"
 
-#: gajim/roster_window.py:3375
+#: gajim/roster_window.py:3331
 msgid "Do you want to continue?"
 msgstr "您要繼續嗎?"
 
-#: gajim/roster_window.py:3386
+#: gajim/roster_window.py:3342
 #, fuzzy
 msgid "_I want this contact to know my status after removal"
 msgstr "我想讓此聯絡人在被移除之後仍然知道我的狀態"
 
-#: gajim/roster_window.py:3393
+#: gajim/roster_window.py:3349
 #, fuzzy
 msgid "Remove contacts from contact list"
 msgstr "從聯絡人清單移除聯絡人"
 
-#: gajim/roster_window.py:3399
+#: gajim/roster_window.py:3355
 #, fuzzy, python-format
 msgid ""
 "By removing the following contacts, you will also remove authorization. This "
@@ -1611,24 +1578,24 @@ msgstr ""
 "移除這些聯絡人: %s 的同時\n"
 "將移除認證導致他們將一直看到您為離線。"
 
-#: gajim/roster_window.py:3403
+#: gajim/roster_window.py:3359
 #, fuzzy
 msgid "Remove Contacts"
 msgstr "重新命名聯絡人"
 
-#: gajim/roster_window.py:3423
+#: gajim/roster_window.py:3379
 msgid "No account available"
 msgstr "沒有有效帳號"
 
-#: gajim/roster_window.py:3424
+#: gajim/roster_window.py:3380
 msgid "You must create an account before you can chat with other contacts."
 msgstr "您必須在與他人聊天前新增帳號。"
 
-#: gajim/roster_window.py:4060
+#: gajim/roster_window.py:4011
 msgid "Metacontacts storage not supported by your server"
 msgstr "您的伺服器不支援儲存元聯絡人資訊"
 
-#: gajim/roster_window.py:4062
+#: gajim/roster_window.py:4013
 #, fuzzy
 msgid ""
 "Your server does not support storing metacontacts information. So this "
@@ -1636,12 +1603,12 @@ msgid ""
 msgstr ""
 "您的伺服器不支援儲存元聯絡人資訊。所以這些資訊在下次重新連線時不會被儲存。"
 
-#: gajim/roster_window.py:4159
+#: gajim/roster_window.py:4110
 #, fuzzy
 msgid "You are about to create a metacontact"
 msgstr "您在建立一個元聯絡人。確定繼續?"
 
-#: gajim/roster_window.py:4160
+#: gajim/roster_window.py:4111
 #, fuzzy
 msgid ""
 "Metacontacts are a way to regroup several contacts in one single contact. "
@@ -1651,122 +1618,113 @@ msgstr ""
 "元聯絡人是將幾個聯絡人組合起來顯示在同一列。一般在某個人有幾個 Jabber\n"
 "帳號或代理帳號時用到。"
 
-#: gajim/roster_window.py:4164
+#: gajim/roster_window.py:4115
 #, fuzzy
 msgid "Create Metacontact"
 msgstr "重新命名聯絡人"
 
-#: gajim/roster_window.py:4170
+#: gajim/roster_window.py:4121 gajim/data/gui/groupchat_creation.ui:317
 #, fuzzy
 msgid "_Create"
 msgstr "創造"
 
-#: gajim/roster_window.py:4287
+#: gajim/roster_window.py:4238
 msgid "Invalid file URI:"
 msgstr "無效的檔案位址:"
 
-#: gajim/roster_window.py:4298
+#: gajim/roster_window.py:4249
 #, fuzzy
 msgid "Send file?"
 msgstr "傳送檔案(_F)"
 
-#: gajim/roster_window.py:4299
+#: gajim/roster_window.py:4250
 #, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
 msgstr[0] "您想要將檔案傳送給 %s 嗎:"
 
-#: gajim/roster_window.py:4451
+#: gajim/roster_window.py:4401
 #, fuzzy, python-format
 msgid "Send %(from)s to %(to)s"
 msgstr "傳送 %s 給 %s"
 
-#: gajim/roster_window.py:4464
+#: gajim/roster_window.py:4414
 #, python-format
 msgid "Make %s first contact"
 msgstr "將 %s 設為第一聯絡人"
 
-#: gajim/roster_window.py:4469
+#: gajim/roster_window.py:4419
 #, fuzzy, python-format
 msgid "Make %(contact1)s and %(contact2)s metacontacts"
 msgstr "將 %s 與 %s 設為中繼聯絡人"
 
-#: gajim/roster_window.py:4825 gajim/roster_window.py:4923
+#: gajim/roster_window.py:4775 gajim/roster_window.py:4862
 msgid "_Change Status Message"
 msgstr "變更狀態訊息(_C)"
 
-#: gajim/roster_window.py:4845
+#: gajim/roster_window.py:4795
 msgid "Publish Tune"
 msgstr "發布音樂"
 
-#: gajim/roster_window.py:4856
+#: gajim/roster_window.py:4806
 msgid "Publish Location"
 msgstr "發布位置資訊"
 
-#: gajim/roster_window.py:4868
-#, fuzzy
-msgid "Configure Services…"
-msgstr "配置服務…"
-
-#: gajim/roster_window.py:4997
+#: gajim/roster_window.py:4936
 msgid "_Maximize All"
 msgstr "放到最大全部(_M)"
 
-#: gajim/roster_window.py:5004 gajim/roster_window.py:5146
+#: gajim/roster_window.py:4943 gajim/roster_window.py:5085
 msgid "Send Group M_essage"
 msgstr "傳送群組訊息(_E)"
 
-#: gajim/roster_window.py:5011
+#: gajim/roster_window.py:4950
 msgid "To all users"
 msgstr "向所有的使用者"
 
-#: gajim/roster_window.py:5015
+#: gajim/roster_window.py:4954
 msgid "To all online users"
 msgstr "向所有線上使用者"
 
-#: gajim/roster_window.py:5027 gajim/roster_window.py:5152
+#: gajim/roster_window.py:4966 gajim/roster_window.py:5091
 #: gajim/data/gui/gc_occupants_menu.ui:110
 #: gajim/data/gui/contact_context_menu.ui:36
 msgid "In_vite to"
 msgstr "邀請到(_V)"
 
-#: gajim/roster_window.py:5162
+#: gajim/roster_window.py:5101
 msgid "_Manage Contacts"
 msgstr "管理聯絡人(_M)"
 
-#: gajim/roster_window.py:5168
+#: gajim/roster_window.py:5107
 #, fuzzy
 msgid "Edit _Groups…"
 msgstr "編輯群組(_G)"
 
-#: gajim/roster_window.py:5189 gajim/data/gui/filetransfers.ui:12
+#: gajim/roster_window.py:5128 gajim/data/gui/filetransfers.ui:12
 #: gajim/data/gui/remove_account_window.ui:134
 msgid "_Remove"
 msgstr "移除(_R)"
 
-#: gajim/roster_window.py:5226
+#: gajim/roster_window.py:5165
 msgid "_Maximize"
 msgstr "放到最大(_M)"
 
-#: gajim/roster_window.py:5233
+#: gajim/roster_window.py:5172
 msgid "_Reconnect"
 msgstr "重新連線(_R)"
 
-#: gajim/roster_window.py:5254 gajim/data/gui/gc_occupants_menu.ui:170
+#: gajim/roster_window.py:5193 gajim/data/gui/gc_occupants_menu.ui:170
 #: gajim/data/gui/gc_control_popup_menu.ui:113
 #: gajim/data/gui/contact_context_menu.ui:205
 msgid "_History"
 msgstr "命令歷程(_H)"
 
-#: gajim/roster_window.py:5335 gajim/data/gui/application_menu.ui:86
+#: gajim/roster_window.py:5274 gajim/data/gui/application_menu.ui:83
 #: gajim/data/gui/history_window.ui:57
 msgid "History Manager"
 msgstr "命令歷程記錄管理器"
 
-#: gajim/roster_window.py:5343
-msgid "_Join New Group Chat"
-msgstr "加入新的聊天室(_J)"
-
 #: gajim/dataforms_widget.py:585
 msgid "Unable to load image"
 msgstr "無法載入圖像"
@@ -1885,253 +1843,270 @@ msgstr "主題: %s\n"
 msgid "Write a message…"
 msgstr "狀態訊息"
 
-#: gajim/message_window.py:250
+#: gajim/message_window.py:356
+#, fuzzy
+msgid "Close Tabs"
+msgstr "傳送並關閉(_S)"
+
+#: gajim/message_window.py:357
 msgid "You are going to close several tabs"
 msgstr "您將要關閉多個標籤"
 
-#: gajim/message_window.py:251
+#: gajim/message_window.py:358
 msgid "Do you really want to close them all?"
 msgstr "您確定要關閉所有這些嗎"
 
-#: gajim/message_window.py:539
+#: gajim/message_window.py:514
 #, fuzzy
 msgid "?Noun:Chats"
 msgstr "多人聊天"
 
-#: gajim/message_window.py:543
+#: gajim/message_window.py:518
 #, fuzzy
 msgid "Group Chats"
 msgstr "多人聊天"
 
-#: gajim/message_window.py:547
+#: gajim/message_window.py:522
 msgid "Private Chats"
 msgstr "私人聊天"
 
-#: gajim/message_window.py:553
+#: gajim/message_window.py:528
 msgid "Messages"
 msgstr "訊息"
 
-#: gajim/gui_interface.py:173
+#: gajim/gui_interface.py:170
+#, 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:175
 msgid "Do you accept this request?"
 msgstr "是否接受這個請求?"
 
-#: gajim/gui_interface.py:175
-#, python-format
-msgid "Do you accept this request on account %s?"
+#: gajim/gui_interface.py:177
+#, fuzzy, python-format
+msgid "Do you accept this request (account: %s)?"
 msgstr "是否接受這個對帳號 %s 的請求?"
 
-#: gajim/gui_interface.py:178
-#, 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:182
+#, fuzzy
+msgid "Authorization"
+msgstr "授權傳送成功"
 
-#: gajim/gui_interface.py:194 gajim/gtk/notification.py:175
+#: gajim/gui_interface.py:186 gajim/gui_interface.py:420
+#: gajim/gtk/filetransfer.py:338
+#, fuzzy
+msgid "_No"
+msgstr "No"
+
+#: gajim/gui_interface.py:205 gajim/gtk/notification.py:175
 #: gajim/gtk/notification.py:197
 msgid "Connection Failed"
 msgstr "連線失敗"
 
-#: gajim/gui_interface.py:279 gajim/gui_interface.py:529
-msgid "Password Required"
-msgstr "需要密碼"
-
-#: gajim/gui_interface.py:280
-#, python-format
-msgid "A Password is required to join the room %s. Please type it."
-msgstr "需要密碼才能加入聊天室 %s。請輸入一個密碼。"
-
-#: gajim/gui_interface.py:342 gajim/gui_interface.py:346
+#: gajim/gui_interface.py:325 gajim/gui_interface.py:329
 #, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr "錯誤 %(code)s: %(msg)s"
 
-#: gajim/gui_interface.py:357 gajim/gui_interface.py:376
+#: gajim/gui_interface.py:340 gajim/gui_interface.py:359
 #: gajim/common/modules/message.py:122
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "傳送 %(message)s 時出現錯誤( %(error)s )"
 
-#: gajim/gui_interface.py:401 gajim/gtk/notification.py:175
+#: gajim/gui_interface.py:384 gajim/gtk/notification.py:175
 msgid "Subscription request"
 msgstr "認證請求"
 
-#: gajim/gui_interface.py:413 gajim/common/contacts.py:184
-#: gajim/common/helpers.py:83
+#: gajim/gui_interface.py:396 gajim/common/contacts.py:200
+#: gajim/common/helpers.py:86
 msgid "Observers"
 msgstr "旁觀者"
 
-#: gajim/gui_interface.py:422
+#: gajim/gui_interface.py:405
 msgid "Authorization accepted"
 msgstr "授權被接受"
 
-#: gajim/gui_interface.py:423
+#: gajim/gui_interface.py:406
 #, fuzzy, python-format
 msgid "The contact \"%s\" has authorized you to see their status."
 msgstr "聯絡人\"%s\"已授權您檢視他/她的狀態。"
 
-#: gajim/gui_interface.py:431
-#, python-format
-msgid "Contact \"%s\" removed subscription from you"
+#: gajim/gui_interface.py:415
+#, fuzzy
+msgid "Subscription Removed"
+msgstr "認證請求"
+
+#: gajim/gui_interface.py:416
+#, fuzzy, python-format
+msgid "Contact '%s' removed subscription from you"
 msgstr "聯絡人\"%s\"移除了對您的認證"
 
-#: gajim/gui_interface.py:432
+#: gajim/gui_interface.py:417
 #, fuzzy
 msgid ""
-"You will always see them as offline.\n"
+"You will always see this contact as offline.\n"
 "Do you want to remove them from your contact list?"
 msgstr ""
 "您將一直看到他/她處於離線狀態。\n"
 "要將他/她從您的聯絡人清單中移除嗎?"
 
-#: gajim/gui_interface.py:453 gajim/gtk/notification.py:176
+#: gajim/gui_interface.py:442 gajim/gtk/notification.py:176
 msgid "Unsubscribed"
 msgstr "已取消認證的"
 
-#: gajim/gui_interface.py:465
+#: gajim/gui_interface.py:454
 #, python-format
 msgid "%(jid)s declined the invitation: %(reason)s"
 msgstr ""
 
-#: gajim/gui_interface.py:469
+#: gajim/gui_interface.py:458
 #, python-format
 msgid "%(jid)s declined the invitation"
 msgstr ""
 
-#: gajim/gui_interface.py:485
+#: gajim/gui_interface.py:474
 #, fuzzy, python-brace-format
 msgid "You are invited to {room} by {user}"
 msgstr "您被邀請到一個聊天室"
 
-#: gajim/gui_interface.py:506
+#: gajim/gui_interface.py:495
 msgid "Certificate Passphrase Required"
 msgstr "要求憑證密語"
 
-#: gajim/gui_interface.py:507
+#: gajim/gui_interface.py:496
 #, fuzzy, python-format
 msgid "Enter the certificate passphrase for account %s"
 msgstr "輸入密語用於帳號憑證 %s"
 
-#: gajim/gui_interface.py:516 gajim/gtk/accounts.py:963
+#: gajim/gui_interface.py:505 gajim/gtk/accounts.py:966
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "輸入帳號 %s 的密碼"
 
-#: gajim/gui_interface.py:529 gajim/gtk/accounts.py:964
+#: gajim/gui_interface.py:518
+msgid "Password Required"
+msgstr "需要密碼"
+
+#: gajim/gui_interface.py:518 gajim/gtk/accounts.py:967
 msgid "Save password"
 msgstr "儲存密碼"
 
-#: gajim/gui_interface.py:601 gajim/gui_interface.py:632
+#: gajim/gui_interface.py:587 gajim/gui_interface.py:618
+#: gajim/gtk/filetransfer.py:332 gajim/gtk/filetransfer.py:333
 #: gajim/gtk/notification.py:173 gajim/gtk/notification.py:276
 msgid "File Transfer Error"
 msgstr "檔案傳輸錯誤"
 
-#: gajim/gui_interface.py:666
+#: gajim/gui_interface.py:652
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s 想傳送給您一個檔案。"
 
-#: gajim/gui_interface.py:668 gajim/gtk/filetransfer.py:479
+#: gajim/gui_interface.py:654 gajim/gtk/filetransfer.py:484
 #: gajim/gtk/notification.py:172 gajim/gtk/notification.py:274
 msgid "File Transfer Request"
 msgstr "檔案傳輸請求"
 
-#: gajim/gui_interface.py:767
+#: gajim/gui_interface.py:753
 #, fuzzy
 msgid "Remote Contact Stopped Transfer"
 msgstr "遠端聯絡人停止了傳輸"
 
-#: gajim/gui_interface.py:772
+#: gajim/gui_interface.py:758
 #, fuzzy
 msgid "Error Opening File"
 msgstr "開啟檔案錯誤"
 
-#: gajim/gui_interface.py:782
+#: gajim/gui_interface.py:768
 #, fuzzy
 msgid "SSL Certificate Error"
 msgstr "SSL證書錯誤"
 
-#: gajim/gui_interface.py:795 gajim/gui_interface.py:826
-#: gajim/gui_interface.py:853 gajim/gtk/notification.py:174
+#: gajim/gui_interface.py:781 gajim/gui_interface.py:812
+#: gajim/gui_interface.py:839 gajim/gtk/notification.py:174
 #: gajim/gtk/notification.py:279
 msgid "File Transfer Stopped"
 msgstr "檔案傳輸已停止"
 
-#: gajim/gui_interface.py:799
+#: gajim/gui_interface.py:785
 #, fuzzy
 msgid "File Transfer Failed"
 msgstr "檔案傳輸完成"
 
-#: gajim/gui_interface.py:822
+#: gajim/gui_interface.py:808
 #, fuzzy, python-format
 msgid "%(filename)s received from %(name)s."
 msgstr "從 %(name)s 傳輸的檔案 %(filename)s 被停止。"
 
-#: gajim/gui_interface.py:827
+#: gajim/gui_interface.py:813
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "從 %(name)s 傳輸的檔案 %(filename)s 被停止。"
 
-#: gajim/gui_interface.py:833
+#: gajim/gui_interface.py:819
 #, fuzzy, python-format
 msgid "File transfer of %(filename)s from %(name)s failed."
 msgstr "從 %(name)s 傳輸的檔案 %(filename)s 被停止。"
 
-#: gajim/gui_interface.py:848
+#: gajim/gui_interface.py:834
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "您成功的給 %(name)s 傳送了檔案 %(filename)s。"
 
-#: gajim/gui_interface.py:854
+#: gajim/gui_interface.py:840
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "到 %(name)s 的檔案傳輸 %(filename)s 被停止。"
 
-#: gajim/gui_interface.py:860
+#: gajim/gui_interface.py:846
 #, fuzzy, python-format
 msgid "File transfer of %(filename)s to %(name)s failed."
 msgstr "到 %(name)s 的檔案傳輸 %(filename)s 被停止。"
 
-#: gajim/gui_interface.py:971
+#: gajim/gui_interface.py:957
 msgid "Username Conflict"
 msgstr "使用者名稱衝突"
 
-#: gajim/gui_interface.py:972
+#: gajim/gui_interface.py:958
 msgid "Please type a new username for your local account"
 msgstr "<b>請在您本地帳號填寫新的使用者名稱</b>"
 
-#: gajim/gui_interface.py:995
+#: gajim/gui_interface.py:981
 msgid "Resource Conflict"
 msgstr "資源衝突"
 
-#: gajim/gui_interface.py:996
+#: gajim/gui_interface.py:982
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
 msgstr "您已經用同一個資源連線到這個帳號了。請輸入一個新的資源"
 
-#: gajim/gui_interface.py:1053
+#: gajim/gui_interface.py:1039
 #, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s 想要發起語音聊天。"
 
-#: gajim/gui_interface.py:1055
+#: gajim/gui_interface.py:1041
 msgid "Voice Chat Request"
 msgstr "語音聊天請求"
 
-#: gajim/gui_interface.py:1123 gajim/gtk/account_wizard.py:312
+#: gajim/gui_interface.py:1109 gajim/gtk/account_wizard.py:312
 msgid "Certificate Already in File"
 msgstr "證書已經在檔案中"
 
-#: gajim/gui_interface.py:1124 gajim/gtk/account_wizard.py:313
+#: gajim/gui_interface.py:1110 gajim/gtk/account_wizard.py:313
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr "證書已經在檔案 %s 中，所以它沒有被再次加入。"
 
-#: gajim/gui_interface.py:1145
+#: gajim/gui_interface.py:1131
 #, fuzzy, python-format
 msgid "The authenticity of the %s certificate could be invalid"
 msgstr "%s 證書的認證可能是無效的"
 
-#: gajim/gui_interface.py:1148
+#: gajim/gui_interface.py:1134
 #, python-format
 msgid ""
 "\n"
@@ -2140,7 +2115,7 @@ msgstr ""
 "\n"
 "不明 SSL 錯誤: %d"
 
-#: gajim/gui_interface.py:1150
+#: gajim/gui_interface.py:1136
 #, python-format
 msgid ""
 "\n"
@@ -2149,11 +2124,11 @@ msgstr ""
 "\n"
 "SSL 錯誤: <b>%s</b>"
 
-#: gajim/gui_interface.py:1155
+#: gajim/gui_interface.py:1141
 msgid "Error verifying SSL certificate"
 msgstr "驗證 SSL 證書發生錯誤"
 
-#: gajim/gui_interface.py:1156
+#: gajim/gui_interface.py:1142
 #, fuzzy, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your XMPP server: "
@@ -2164,7 +2139,7 @@ msgstr ""
 "%(error)s\n"
 "您仍然想要連線這個伺服器嗎?"
 
-#: gajim/gui_interface.py:1160 gajim/gtk/account_wizard.py:412
+#: gajim/gui_interface.py:1146 gajim/gtk/account_wizard.py:413
 #, fuzzy, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -2177,181 +2152,172 @@ msgstr ""
 "這個證書的 SHA1 指紋資訊: \n"
 "%s"
 
-#: gajim/gui_interface.py:1166
+#: gajim/gui_interface.py:1152
 msgid "Ignore this error for this certificate."
 msgstr "忽略這個證書的這個錯誤。"
 
-#: gajim/gui_interface.py:1174
+#: gajim/gui_interface.py:1160
 #, fuzzy, python-format
 msgid "SSL Certificate Verification for %s"
 msgstr "SSL 憑證驗證"
 
-#: gajim/gui_interface.py:1442 gajim/gtk/join_groupchat.py:235
-msgid "You can not join a group chat unless you are connected."
-msgstr "您必須連線才能加入聊天室。"
-
-#: gajim/gui_interface.py:1448
-#, fuzzy
-msgid "JID is not a Groupchat"
-msgstr "這不是一個聊天室"
-
-#: gajim/gui_interface.py:1579
-msgid "This is not a group chat"
-msgstr "這不是一個聊天室"
-
-#: gajim/gui_interface.py:1580
-#, python-format
-msgid ""
-"%(room_jid)s is already in your roster. Please check if %(room_jid)s is a "
-"correct group chat name. If it is, delete it from your roster and try "
-"joining the group chat again."
-msgstr ""
-
-#: gajim/gui_interface.py:1604 gajim/dialog_messages.py:58
+#: gajim/gui_interface.py:1577
 msgid "You cannot join a group chat while you are invisible"
 msgstr "隱身時無法加入聊天室"
 
-#: gajim/gui_interface.py:2037
+#: gajim/gui_interface.py:1976
 msgid "Could not save your settings and preferences"
 msgstr "無法儲存您的設定。"
 
-#: gajim/gui_interface.py:2098
+#: gajim/gui_interface.py:2037
 msgid "Gajim: IPython Console"
 msgstr ""
 
-#: gajim/dialog_messages.py:32
+#: gajim/dialog_messages.py:31 gajim/dialog_messages.py:36
+#: gajim/gtk/single_message.py:305 gajim/gtk/account_wizard.py:229
 #, fuzzy
-msgid "You can not start a new conversation unless you are connected."
-msgstr "您必須連線才能加入聊天室。"
-
-#: gajim/dialog_messages.py:36 gajim/dialog_messages.py:41
-#: gajim/gtk/single_message.py:305 gajim/gtk/join_groupchat.py:211
-#: gajim/gtk/account_wizard.py:229
-msgid "Invalid JID"
-msgstr "無效的 JID"
+msgid "Invalid XMPP Address"
+msgstr "無效檔案"
 
-#: gajim/dialog_messages.py:42 gajim/gtk/single_message.py:306
-#, python-format
-msgid "It is not possible to send a message to %s, this JID is not valid."
+#: gajim/dialog_messages.py:37
+#, fuzzy, python-format
+msgid ""
+"It is not possible to send a message to %s. This XMPP Address is not valid."
 msgstr "不能向 %s 傳送訊息，無效的 JID。"
 
-#: gajim/dialog_messages.py:47
-msgid "Unread events"
+#: gajim/dialog_messages.py:42
+#, fuzzy
+msgid "Unread Events"
 msgstr "未讀取的事件"
 
-#: gajim/dialog_messages.py:48
-msgid "Read all pending events before removing this account."
+#: gajim/dialog_messages.py:43
+#, fuzzy
+msgid "Read or acknowledge all pending events before removing this account."
 msgstr "移除帳號前請檢視所有未處理事件。"
 
-#: gajim/dialog_messages.py:52
+#: gajim/dialog_messages.py:48
 msgid "Invalid Form"
 msgstr "不合法的格式"
 
-#: gajim/dialog_messages.py:53
+#: gajim/dialog_messages.py:49
 msgid "The form is not filled correctly."
 msgstr "表格沒有被正確地填寫。"
 
-#: gajim/dialog_messages.py:57 gajim/common/helpers.py:309
+#: gajim/dialog_messages.py:53 gajim/common/helpers.py:315
 msgid "Invisible"
 msgstr "隱身"
 
-#: gajim/dialog_messages.py:62
-msgid "A connection is not available"
-msgstr "一個連線無法使用"
+#: gajim/dialog_messages.py:54
+#, fuzzy
+msgid "You cannot join a group chat while being invisible."
+msgstr "隱身時無法加入聊天室"
 
-#: gajim/dialog_messages.py:63
+#: gajim/dialog_messages.py:58
+#, fuzzy
+msgid "No Connection Available"
+msgstr "連線無法使用"
+
+#: gajim/dialog_messages.py:59
 msgid "Your message can not be sent until you are connected."
 msgstr "連線之後您的訊息才能傳送"
 
-#: gajim/dialog_messages.py:67
-#, fuzzy
-msgid "JID already in list"
-msgstr "Jabber ID 已經在清單中了"
+#: gajim/dialog_messages.py:63
+msgid "XMPP Address Already in List"
+msgstr ""
 
-#: gajim/dialog_messages.py:68
+#: gajim/dialog_messages.py:64
 #, fuzzy
-msgid "The JID you entered is already in the list. Choose another one."
+msgid ""
+"The XMPP Address you entered is already in the list. Please choose another "
+"one."
 msgstr "您輸入的 Jabber ID 已經在清單中了。請選擇另外一個。"
 
-#: gajim/dialog_messages.py:72
-msgid "Invalid answer"
+#: gajim/dialog_messages.py:69
+#, fuzzy
+msgid "Invalid Answer"
 msgstr "答案錯誤"
 
-#: gajim/dialog_messages.py:73
+#: gajim/dialog_messages.py:70
 #, python-format
 msgid "Transport %(name)s answered wrongly to register request: %(error)s"
 msgstr "服務代理 %(name)s 對註冊請求的回應有誤: %(error)s"
 
-#: gajim/dialog_messages.py:78
+#: gajim/dialog_messages.py:75
 #, fuzzy
 msgid "Wrong Custom Hostname"
 msgstr "使用自訂的主機名稱/連接埠"
 
-#: gajim/dialog_messages.py:79
+#: gajim/dialog_messages.py:76
 #, fuzzy, python-format
-msgid "Wrong custom hostname \"%s\". Ignoring it."
+msgid "Custom hostname \"%s\" is wrong. It will be ignored."
 msgstr "使用自訂的主機名稱/連接埠"
 
-#: gajim/dialog_messages.py:83
-msgid "Error while removing privacy list"
+#: gajim/dialog_messages.py:80
+#, fuzzy
+msgid "Error While Removing Privacy List"
 msgstr "移除隱私策略清單時發生錯誤"
 
-#: gajim/dialog_messages.py:84
-#, python-format
+#: gajim/dialog_messages.py:81
+#, fuzzy, python-format
 msgid ""
-"Privacy list %s has not been removed. It is maybe active in one of your "
-"connected resources. Deactivate it and try again."
+"Privacy list %s has not been removed. It is probably active in one of your "
+"connected resources. Please deactivate it and try again."
 msgstr ""
 "隱私策略清單 %s 還沒有被移除。它可能在您的某個連線的資源中是活動的。停用它然"
 "後重試。"
 
-#: gajim/dialog_messages.py:90
-msgid "Invisibility not supported"
+#: gajim/dialog_messages.py:87
+#, fuzzy
+msgid "Invisibility Not Supported"
 msgstr "不支援隱身"
 
-#: gajim/dialog_messages.py:91
-#, python-format
-msgid "Account %s doesn't support invisibility."
+#: gajim/dialog_messages.py:88
+#, fuzzy, python-format
+msgid "This account %s doesn't support invisibility."
 msgstr "帳號 %s 不支援隱身"
 
-#: gajim/dialog_messages.py:95
-msgid "Unregister failed"
+#: gajim/dialog_messages.py:92
+#, fuzzy
+msgid "Unregister Failed"
 msgstr "移除註冊失敗"
 
-#: gajim/dialog_messages.py:96
-#, python-format
-msgid "Unregistration with server %(server)s failed: %(error)s"
+#: gajim/dialog_messages.py:93
+#, fuzzy, python-format
+msgid "Unregistration on server %(server)s failed: %(error)s"
 msgstr "在伺服器上 %(server)s 移除註冊失敗: %(error)s"
 
-#: gajim/dialog_messages.py:100
-msgid "Registration succeeded"
+#: gajim/dialog_messages.py:97
+#, fuzzy
+msgid "Registration Succeeded"
 msgstr "註冊成功"
 
-#: gajim/dialog_messages.py:101
-#, python-format
-msgid "Registration with agent %s succeeded"
+#: gajim/dialog_messages.py:98
+#, fuzzy, python-format
+msgid "Registration with agent %s succeeded."
 msgstr "註冊成功，agent %s"
 
-#: gajim/dialog_messages.py:105 gajim/gtk/service_registration.py:215
-msgid "Registration failed"
+#: gajim/dialog_messages.py:102
+#, fuzzy
+msgid "Registration Failed"
 msgstr "註冊失敗"
 
-#: gajim/dialog_messages.py:106
+#: gajim/dialog_messages.py:103
 #, python-format
 msgid ""
 "Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
 msgstr "註冊失敗，agent %(agent)s，錯誤 %(error)s: %(error_msg)s"
 
-#: gajim/dialog_messages.py:111
+#: gajim/dialog_messages.py:108
 #, fuzzy
 msgid "Unable to Join Group Chat"
 msgstr "無法加入聊天室"
 
-#: gajim/dialog_messages.py:116
-msgid "GStreamer error"
+#: gajim/dialog_messages.py:113
+#, fuzzy
+msgid "GStreamer Error"
 msgstr "GStreamer 錯誤"
 
-#: gajim/dialog_messages.py:117
+#: gajim/dialog_messages.py:114
 #, fuzzy, python-format
 msgid ""
 "Error: %(error)s\n"
@@ -2360,20 +2326,21 @@ msgstr ""
 "錯誤: %s\n"
 "除錯資訊: %s"
 
-#: gajim/dialog_messages.py:121
+#: gajim/dialog_messages.py:118
 #, fuzzy
-msgid "Wrong host"
+msgid "Wrong Host"
 msgstr "錯誤的 uri"
 
-#: gajim/dialog_messages.py:122
+#: gajim/dialog_messages.py:119
 msgid "Invalid local address? :-O"
 msgstr ""
 
-#: gajim/dialog_messages.py:126
-msgid "Avahi error"
+#: gajim/dialog_messages.py:123
+#, fuzzy
+msgid "Avahi Error"
 msgstr "Avahi 錯誤"
 
-#: gajim/dialog_messages.py:127
+#: gajim/dialog_messages.py:124
 #, python-format
 msgid ""
 "%s\n"
@@ -2382,66 +2349,66 @@ msgstr ""
 "%s\n"
 "Link-local 訊息可能無法正常工作。"
 
-#: gajim/dialog_messages.py:131 gajim/dialog_messages.py:136
+#: gajim/dialog_messages.py:128 gajim/dialog_messages.py:133
 #, fuzzy
-msgid "Could not request upload slot"
+msgid "Could not request upload slot for HTTP File Upload"
 msgstr "無法啟動本地服務"
 
-#: gajim/dialog_messages.py:137
-msgid "Got unexpected response from server (see log)"
+#: gajim/dialog_messages.py:134
+msgid "Got unexpected response from server (see log)."
 msgstr ""
 
-#: gajim/dialog_messages.py:141 gajim/dialog_messages.py:146
+#: gajim/dialog_messages.py:138 gajim/dialog_messages.py:143
 #, fuzzy
-msgid "Could not open file"
+msgid "Could not Open File"
 msgstr "無法讀取圖片"
 
-#: gajim/dialog_messages.py:142
-msgid "Exception raised while opening file (see log)"
+#: gajim/dialog_messages.py:139
+msgid "Exception raised while trying to open file (see log)."
 msgstr ""
 
-#: gajim/dialog_messages.py:151
-msgid "Unsecure"
-msgstr ""
+#: gajim/dialog_messages.py:148
+#, fuzzy
+msgid "Not Secure"
+msgstr "未開始"
 
-#: gajim/dialog_messages.py:152
+#: gajim/dialog_messages.py:149
 #, fuzzy
-msgid "Server returned unsecure transport (HTTP)"
+msgid "The server returned an insecure transport (HTTP)."
 msgstr "服務回傳了一個錯誤。"
 
-#: gajim/dialog_messages.py:156
+#: gajim/dialog_messages.py:153
 #, fuzzy
-msgid "Could not upload file"
+msgid "Could not Upload File"
 msgstr "無法讀取圖片"
 
-#: gajim/dialog_messages.py:157
+#: gajim/dialog_messages.py:154
 #, python-format
 msgid "HTTP response code from server: %s"
 msgstr ""
 
-#: gajim/dialog_messages.py:161
+#: gajim/dialog_messages.py:158
 msgid "Upload Error"
 msgstr ""
 
-#: gajim/dialog_messages.py:166
+#: gajim/dialog_messages.py:163
 msgid "Encryption Error"
 msgstr ""
 
-#: gajim/dialog_messages.py:167
-#, fuzzy
-msgid "For the chosen encryption there is no encryption method available"
-msgstr "一個連線無法使用"
+#: gajim/dialog_messages.py:164
+msgid "There is no encryption method available for the chosen encryption."
+msgstr ""
 
-#: gajim/dialog_messages.py:171
+#: gajim/dialog_messages.py:169
 #, fuzzy
-msgid "Avatar upload failed"
+msgid "Avatar Upload Failed"
 msgstr "vCard 發布失敗"
 
-#: gajim/privatechat_control.py:204
+#: gajim/privatechat_control.py:207
 msgid "Sending private message failed"
 msgstr "傳送私有訊息失敗"
 
-#: gajim/privatechat_control.py:206
+#: gajim/privatechat_control.py:209
 #, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr "您不再在聊天室\"%(room)s\"中或\"%(nick)s\"已離開。"
@@ -2464,7 +2431,7 @@ msgstr "為命令顯示求助"
 
 #: gajim/gajim_remote.py:85
 #, fuzzy
-msgid "Lists all contacts in roster, one for each line"
+msgid "Lists all contacts in the contact list, one for each line"
 msgstr "列印聯絡人清單中所有聯絡人。每個聯絡人一列。"
 
 #: gajim/gajim_remote.py:87 gajim/gajim_remote.py:102 gajim/gajim_remote.py:112
@@ -2542,11 +2509,13 @@ msgstr ""
 
 #: gajim/gajim_remote.py:118
 #, fuzzy
-msgid "Sends new chat message to a contact in the roster. Account is optional."
+msgid ""
+"Sends new chat message to a contact in the contact list. Account is optional."
 msgstr "向聯絡人傳送檔案"
 
 #: gajim/gajim_remote.py:120 gajim/gajim_remote.py:130
-msgid "JID of the contact that will receive the message"
+#, fuzzy
+msgid "XMPP Address of the contact that will receive the message"
 msgstr "聯絡人的JID將收到訊息"
 
 #: gajim/gajim_remote.py:121 gajim/gajim_remote.py:132
@@ -2560,8 +2529,10 @@ msgid "if specified, the message will be sent using this account"
 msgstr "如指定，訊息將被用此帳號傳送"
 
 #: gajim/gajim_remote.py:127
-msgid "Sends a chat message to someone on your roster. Account is optional."
-msgstr ""
+#, fuzzy
+msgid ""
+"Sends a chat message to someone on your contact list. Account is optional."
+msgstr "向聯絡人傳送檔案"
 
 #: gajim/gajim_remote.py:131
 msgid "subject"
@@ -2572,11 +2543,13 @@ msgid "message subject"
 msgstr "訊息主題"
 
 #: gajim/gajim_remote.py:138
-msgid "Sends new message to a groupchat you've joined."
+#, fuzzy
+msgid "Sends new message to a group chat you've joined."
 msgstr "向一個您加入的聊天室傳送新訊息。"
 
 #: gajim/gajim_remote.py:140
-msgid "JID of the room that will receive the message"
+#, fuzzy
+msgid "XMPP Address of the group chat that will receive the message"
 msgstr "要收到這條訊息的聊天室的 JID"
 
 #: gajim/gajim_remote.py:147
@@ -2585,7 +2558,8 @@ msgstr "獲得聯絡人的詳細資訊"
 
 #: gajim/gajim_remote.py:149 gajim/gajim_remote.py:162
 #: gajim/gajim_remote.py:192
-msgid "JID of the contact"
+#, fuzzy
+msgid "XMPP Address of the contact"
 msgstr "聯絡人的 JID "
 
 #: gajim/gajim_remote.py:153
@@ -2646,7 +2620,8 @@ msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "將目前Gajim的國家設定寫入 .config 檔案"
 
 #: gajim/gajim_remote.py:190
-msgid "Removes contact from roster"
+#, fuzzy
+msgid "Removes contact from contact list"
 msgstr "從聯絡人清單移除聯絡人"
 
 #: gajim/gajim_remote.py:193
@@ -2690,9 +2665,9 @@ msgid "Missing argument \"contact_jid\""
 msgstr "缺失的\"聯絡人 JID\"參數"
 
 #: gajim/gajim_remote.py:275
-#, python-format
+#, fuzzy, python-format
 msgid ""
-"'%s' is not in your roster.\n"
+"'%s' is not in your contact list.\n"
 "Please specify account for sending the message."
 msgstr ""
 "\"%s\" 不在您的聯絡人清單中。\n"
@@ -2915,12 +2890,12 @@ msgstr "一週末"
 msgid "Weekend!"
 msgstr "週末"
 
-#: gajim/common/logger.py:192 gajim/common/logger.py:197
+#: gajim/common/logger.py:189 gajim/common/logger.py:194
 #, python-format
 msgid "%s is a directory but should be a file"
 msgstr "%s 是一個目錄但它應該是一個檔案"
 
-#: gajim/common/logger.py:217
+#: gajim/common/logger.py:214
 #, fuzzy, python-format
 msgid "Creating %s"
 msgstr "正在銷毀 %s"
@@ -2993,22 +2968,21 @@ msgstr "%(nickname)s 離開了"
 msgid "Contact Signed Out"
 msgstr "聯絡人離開登入"
 
-#: gajim/common/contacts.py:455
-msgid "Not in roster"
-msgstr "不在聯絡人清單中"
-
 #: gajim/common/config.py:80
+#, fuzzy
 msgid ""
 "Show desktop notification even when a chat window is opened for this contact "
-"and does not have focus"
-msgstr ""
+"and does not have focus."
+msgstr "允許彈出提示，當我離開/無法使用/忙/隱身(_A)"
 
 #: gajim/common/config.py:81
-msgid "Play sound when user is busy"
+#, fuzzy
+msgid "Play sound even when being busy."
 msgstr "在用於忙是播放聲音"
 
 #: gajim/common/config.py:83
-msgid "Show only online and free for chat contacts in roster."
+#, fuzzy
+msgid "Show only online and free for chat contacts in the contact list."
 msgstr "在聯絡人清單中只顯示線上和和我聊天吧的聯絡人。"
 
 #: gajim/common/config.py:86
@@ -3016,12 +2990,15 @@ msgid "Time in minutes, after which your status changes to away."
 msgstr "時間，以分鐘為單位。在此時間後將狀態變更為離開。"
 
 #: gajim/common/config.py:87
-msgid "$S (Away as a result of being idle more than $T min)"
+#, fuzzy
+msgid "$S (Away: Idle more than $T min)"
 msgstr "$S (離開，因為閒置超過了$T分鐘)"
 
 #: gajim/common/config.py:87
 #, fuzzy
-msgid "$S will be replaced by current status message, $T by autoawaytime."
+msgid ""
+"$S will be replaced by current status message, $T by the 'autoawaytime' "
+"value."
 msgstr "$S 會被目前的狀態訊息替換，$T 會被自動離開的時間替換。"
 
 #: gajim/common/config.py:89
@@ -3029,76 +3006,86 @@ msgid "Time in minutes, after which your status changes to not available."
 msgstr "時間，以分鐘為單位。在此時間後將狀態變更為離開很久了。"
 
 #: gajim/common/config.py:90
-msgid "$S (Not available as a result of being idle more than $T min)"
+#, fuzzy
+msgid "$S (Not available: Idle more than $T min)"
 msgstr "$S (離開很久了，因為閒置超過了$T分鐘)"
 
 #: gajim/common/config.py:90
 #, fuzzy
-msgid "$S will be replaced by current status message, $T by autoxatime."
+msgid ""
+"$S will be replaced by current status message, $T by the 'autoxatime' value."
 msgstr "$S 會被目前的狀態訊息替換，$T 會被自動無法使用的時間替換。"
 
 #: gajim/common/config.py:93
+#, fuzzy
 msgid ""
-"When to show notification area icon. Can be 'never', 'on_event', 'always'."
+"When to show the notification area icon. Can be 'never', 'on_event', and "
+"'always'."
 msgstr "何時在通知區域顯示圖示。可以是'永遠不'，'當有未處理的事件時'，'總是'。"
 
 #: gajim/common/config.py:94
-msgid "Allow to hide the roster window even if the tray icon is not shown."
+#, fuzzy
+msgid ""
+"Allow to hide the contact list window even if the notification area icon is "
+"not shown."
 msgstr "即使系統匣圖示未顯示，仍然允許隱藏名冊視窗。"
 
 #: gajim/common/config.py:97
-msgid "Contact signed in notification color."
-msgstr ""
+#, fuzzy
+msgid "Notification color for contacts signing in."
+msgstr "提醒我聯絡人登入(_I)"
 
 #: gajim/common/config.py:98
-msgid "Contact signout notification color"
-msgstr ""
+#, fuzzy
+msgid "Notification color for contacts signing out."
+msgstr "提醒我聯絡人登出(_O)"
 
 #: gajim/common/config.py:99
 #, fuzzy
-msgid "New message notification color."
+msgid "Notification color for new message notification."
 msgstr "在彈出提示中預覽訊息?"
 
 #: gajim/common/config.py:100
 #, fuzzy
-msgid "File transfer request notification color."
-msgstr "檔案傳輸請求"
+msgid "Notification color for file transfer request."
+msgstr "檔案傳輸完成時提醒我(_N)"
 
 #: gajim/common/config.py:101
 #, fuzzy
-msgid "File transfer error notification color."
-msgstr "檔案傳輸已取消"
+msgid "Notification color for file transfer errors."
+msgstr "檔案傳輸完成時提醒我(_N)"
 
 #: gajim/common/config.py:102
-#, fuzzy
-msgid "File transfer complete or stopped notification color."
-msgstr "當檔案傳輸完成時彈出提示"
+msgid "Notification color for stopped or completed file transfers."
+msgstr ""
 
 #: gajim/common/config.py:103
-#, fuzzy
-msgid "Groupchat invitation notification color"
-msgstr "多人聊天邀請"
+msgid "Notification color for group chat invitations."
+msgstr ""
 
 #: gajim/common/config.py:104
 #, fuzzy
-msgid "Background color of status changed notification"
+msgid "Notification background color for changed status."
 msgstr "當聯絡人剛剛登入時的背景色。"
 
 #: gajim/common/config.py:105
-msgid "Other dialogs color."
+msgid "Notification color for other dialogs."
 msgstr ""
 
 #: gajim/common/config.py:106
+#, fuzzy
 msgid ""
-"List (space separated) of rows (accounts and groups) that are collapsed."
+"List of rows (accounts and groups) that are collapsed (space separated)."
 msgstr "折疊的列(帳號和組)的清單(空格分隔)。"
 
 #: gajim/common/config.py:107
 msgid "default"
 msgstr "預設"
 
-#: gajim/common/config.py:113
-msgid "Language used by speller"
+#: gajim/common/config.py:113 gajim/common/config.py:424
+#: gajim/common/config.py:431
+#, fuzzy
+msgid "Language used for spell checking."
 msgstr "拼寫檢查的語言"
 
 #: gajim/common/config.py:114
@@ -3112,10 +3099,11 @@ msgstr ""
 "'永遠不' - 永遠不顯示時間。"
 
 #: gajim/common/config.py:115
+#, fuzzy
 msgid ""
 "Print time in chats using Fuzzy Clock. Value of fuzziness from 1 to 4, or 0 "
-"to disable fuzzyclock. 1 is the most precise clock, 4 the least precise one. "
-"This is used only if print_time is 'sometimes'."
+"to disable Fuzzy Clock. 1 is the most precise clock, 4 the least precise "
+"one. This is used only if 'print_time' is 'sometimes'."
 msgstr ""
 "使用模糊時鐘列印時間。模糊度的值從 1 到 4，或是 0 停用模糊時鐘。1 是最精確的"
 "時鐘，4 是最不精確的。只在'有時'顯示時間時使用。"
@@ -3131,293 +3119,300 @@ msgstr "將成對出現的 * / _ 視為可能的格式控制字元。"
 #: gajim/common/config.py:120
 #, fuzzy
 msgid ""
-"If true, do not remove */_ . So *abc* will be bold but with * * not removed."
+"If enabled, do not remove */_ . So *abc* will be bold but with * * not "
+"removed."
 msgstr "如果為真，則不移除 */_。這樣 *abc* 將被加粗但 * * 不會被移除。"
 
 #: gajim/common/config.py:123
+#, fuzzy
 msgid ""
-"Uses ReStructured text markup to send HTML, plus ascii formatting if "
-"selected. For syntax, see http://docutils.sourceforge.net/docs/ref/rst/"
-"restructuredtext.html (If you want to use this, install docutils)"
+"Uses ReStructured text markup to send HTML, plus ASCII formatting if "
+"selected. Needs docutils installed (for syntax, see http://docutils."
+"sourceforge.net/docs/ref/rst/restructuredtext.html)."
 msgstr ""
 "使用重構的文字標記傳送 HTML，並加入 ASCII 格式控制(如果選取)。語法請參\n"
 "考http://docutils.sourceforge.net/docs/ref/rst/restructuredtext.html (如果\n"
 "您想使用此功能，請安裝 docutils)"
 
 #: gajim/common/config.py:132
+#, fuzzy
 msgid ""
-"Character to add after nickname when using nick completion (tab) in group "
-"chat."
+"Character to add after nickname when using nickname completion (tab) in "
+"group chat."
 msgstr "當在多人聊天中使用暱稱補全(Tab)時加到暱稱後的字元。"
 
 #: gajim/common/config.py:133
+#, fuzzy
 msgid ""
-"Character to propose to add after desired nickname when desired nickname is "
-"used by someone else in group chat."
+"Character to propose to add after desired nickname when nickname is already "
+"used in group chat."
 msgstr "當請求的暱稱被聊天室中的其他人使用時加到請求的暱稱後的字元。"
 
 #: gajim/common/config.py:155
 #, fuzzy
 msgid ""
-"If true, Gajim will save roster position when hiding roster, and restore it "
-"when showing roster."
+"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:161
-msgid "Place the roster on the right in single window mode"
+msgid "Place the contact list on the right in single window mode"
 msgstr ""
 
 #: gajim/common/config.py:167
 #, fuzzy
 msgid ""
-"This option let you customize timestamp that is printed in conversation. For "
-"example \"[%H:%M] \" will show \"[hour:minute] \". See python doc on "
-"strftime for full documentation: http://docs.python.org/lib/module-time.html"
+"This option lets you customize the timestamp that is printed in "
+"conversation. For example '[%H:%M] ' will show '[hour:minute] '. See python "
+"doc on strftime for full documentation (https://docs.python.org/3/library/"
+"time.html)."
 msgstr ""
 "這個選項允許您自訂對話中顯示的時間戳記格式。比如，\"[%H:%M] \" 會顯示為\n"
 "\"[小時:分鐘]\"。請參考 Python doc 關於 strftime 的文件:\n"
 "http://docs.python.org/lib/module-time.html"
 
 #: gajim/common/config.py:168
-msgid "Characters that are printed before the nickname in conversations"
+#, fuzzy
+msgid "Characters that are printed before the nickname in conversations."
 msgstr "在對話中顯示在暱稱前的字元"
 
 #: gajim/common/config.py:169
-msgid "Characters that are printed after the nickname in conversations"
+#, fuzzy
+msgid "Characters that are printed after the nickname in conversations."
 msgstr "在對話中顯示在暱稱後的字元"
 
 #: gajim/common/config.py:170
-msgid "Add * and [n] in roster title?"
-msgstr "在聯絡人清單標題中加入 * 和 [n]?"
+#, fuzzy
+msgid "If enabled, Gajim will add * and [n] in contact list window title."
+msgstr "如果選取，Gajim 會在聯絡人清單視窗中顯示聯絡人的心情。"
 
 #: gajim/common/config.py:171
 #, fuzzy
 msgid ""
-"How many history messages should be restored when a chat tab/window is "
-"reopened?"
+"Number of messages from chat history to be restored when a chat tab/window "
+"is reopened."
 msgstr "聊天標籤/視窗被重新開啟時顯示之前進行的對話的最後多少列。"
 
 #: gajim/common/config.py:172
-msgid "How far back in time (minutes) history is restored. -1 means no limit."
+msgid ""
+"How far back in time (minutes) chat history is restored. -1 means no limit."
 msgstr ""
 
 #: gajim/common/config.py:173
 #, fuzzy
 msgid ""
-"How many lines to request from server when entering a groupchat. -1 means no "
-"limit"
-msgstr "當加入多人聊天時，向伺服器請求聊天記錄的列數。-1 表示無限制"
+"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:174
 #, fuzzy
 msgid ""
-"Minutes of backlog to request when entering a groupchat. -1 means no limit"
-msgstr "當加入多人聊天時，向伺服器請求多少分鐘以內的聊天記錄。-1 表示無限制"
+"Should automatic rejoin be activated when you were kicked from a group chat?"
+msgstr "當我們從會議中被踢出時，是否應該啟用自動重新加入？"
 
 #: gajim/common/config.py:175
-msgid ""
-"How many seconds to wait before trying to autorejoin to a conference you are "
-"being disconnected from. Set to 0 to disable autorejoining."
-msgstr "自動重新加入一個中斷的聊天室前等待多少秒。設為 0 以停用自動重新加入。"
-
-#: gajim/common/config.py:176
 #, fuzzy
-msgid "Should autorejoin be activated when kicked from a conference?"
-msgstr "當我們從會議中被踢出時，是否應該啟用自動重新加入？"
-
-#: gajim/common/config.py:177
-msgid ""
-"Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
-"Client default behaviour)."
+msgid "Send message on Ctrl+Enter and make a new line with Enter."
 msgstr "用 Ctrl+Enter 傳送訊息，Enter 開始新列(紫茉莉 ICQ 客戶端預設作業)。"
 
-#: gajim/common/config.py:179
-msgid "How many lines to store for Ctrl+KeyUP."
+#: gajim/common/config.py:177
+#, fuzzy
+msgid "How many lines to store for Ctrl+KeyUP (previously sent messages)."
 msgstr "為 Ctrl+KeyUP 儲存多少列。"
 
-#: gajim/common/config.py:182
+#: gajim/common/config.py:180
 #, fuzzy, python-format
 msgid ""
-"Either custom URL with %%s in it where %%s is the word/phrase or "
-"'WIKTIONARY' which means use Wikitionary."
+"Either a custom URL with %%s in it (where %%s is the word/phrase) or "
+"'WIKTIONARY' (which means use Wikitionary)."
 msgstr ""
 "自訂位址，在其中應包含 %s，%s 是單字/片語; 或'WIKTIONARY'以使用 wiktionary。"
 
-#: gajim/common/config.py:185
+#: gajim/common/config.py:183
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr "如果選取，Gajim 可以被 gajim-remote 遠端控制。"
 
-#: gajim/common/config.py:187
+#: gajim/common/config.py:185
+#, fuzzy
 msgid ""
-"When not printing time for every message (print_time==sometimes), print it "
+"When not printing time for every message ('print_time'==sometimes), print it "
 "every x minutes."
 msgstr "當不是每條訊息都顯示時間('有時'顯示時間)時，每多少分鐘顯示時間。"
 
-#: gajim/common/config.py:188
+#: gajim/common/config.py:186
 msgid "Ask before pasting an image."
 msgstr ""
 
-#: gajim/common/config.py:189
+#: gajim/common/config.py:187
 msgid "Ask before closing a group chat tab/window."
 msgstr "關閉多人聊天標籤/視窗前詢問。"
 
-#: gajim/common/config.py:190
+#: gajim/common/config.py:188
 #, fuzzy
 msgid ""
-"Always ask for confirmation before closing groupchats with any of the JIDs "
-"on this space separated list."
+"Always ask for confirmation before closing group chats with any of the XMPP "
+"Addresses on this list (space separated)."
 msgstr "關閉這個空格分隔的清單中的聊天室的標籤/視窗前總是詢問。"
 
-#: gajim/common/config.py:191
+#: gajim/common/config.py:189
 #, fuzzy
 msgid ""
-"Never ask for confirmation before closing groupchats with any of the JIDs on "
-"this space separated list."
+"Never ask for confirmation before closing group chats with any of the XMPP "
+"Addresses on this list (space separated)."
 msgstr "關閉這個空格分隔的清單中的聊天室的標籤/視窗前永遠不詢問。"
 
-#: gajim/common/config.py:192
+#: gajim/common/config.py:190
 #, fuzzy
 msgid ""
-"Ask before closing tabbed chat window if there are controls that can lose "
-"data (chat, private chat, groupchat that will not be minimized)"
+"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 ""
 "如果有可能丟失資料的控制項(不會被最小化的聊天，私人聊天，多人聊天)，在關\n"
 "閉有標籤的視窗前詢問。"
 
-#: gajim/common/config.py:195
+#: gajim/common/config.py:193
 #, fuzzy
 msgid ""
-"Comma separated list of sent hosts, in addition of local interfaces, for "
-"File Transfer in case of address translation/port forwarding."
+"List of send hosts (comma separated) in addition to local interfaces for "
+"file transfers (in case of address translation/port forwarding)."
 msgstr ""
 "逗號分割的清單。在有位址翻譯/連接埠轉發的情況下，除了本地介面，還將向其中\n"
 "的主機傳送檔案傳輸請求。"
 
-#: gajim/common/config.py:196
+#: gajim/common/config.py:194
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "IEC 標準規定 1 KiB = 1024 bytes(位元組)，1 KB = 1000 bytes。"
 
-#: gajim/common/config.py:198
+#: gajim/common/config.py:196
 msgid "Notify of events in the notification area."
 msgstr "在通知區域中提示事件"
 
-#: gajim/common/config.py:199
+#: gajim/common/config.py:197
 msgid ""
-"If False, Gajim will display a static event icon instead of the blinking "
-"status icon in the notification area when notifying on event."
+"If disabled, Gajim will display a static event icon instead of the blinking "
+"status icon in the notification area when notifying about an event."
 msgstr ""
 
-#: gajim/common/config.py:205
+#: gajim/common/config.py:203
 msgid "Show tab when only one conversation?"
 msgstr "只有一個對話時顯示標籤?"
 
-#: gajim/common/config.py:206
+#: gajim/common/config.py:204
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "在聊天視窗中顯示標籤組的邊框。"
 
-#: gajim/common/config.py:207
+#: gajim/common/config.py:205
 msgid "Show close button in tab?"
 msgstr "在標籤上顯示關閉按鈕?"
 
-#: gajim/common/config.py:220
+#: gajim/common/config.py:218
 msgid "Preview new messages in notification popup?"
 msgstr "在彈出提示中預覽訊息?"
 
-#: gajim/common/config.py:223
+#: gajim/common/config.py:221
+#, fuzzy
 msgid ""
-"A semicolon-separated list of words that will be highlighted in group chats."
+"A list of words (semicolon separated) that will be highlighted in group "
+"chats."
 msgstr "用分號隔開的在多人聊天中將高亮度顯示的單字清單。"
 
-#: gajim/common/config.py:224
+#: gajim/common/config.py:222
 #, fuzzy
 msgid ""
-"If true, quits Gajim when X button of Window Manager is clicked. This "
-"setting is taken into account only if notification icon is used."
+"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。此一設定僅當啟用通知區域圖示"
 "時會生效。"
 
-#: gajim/common/config.py:225
+#: gajim/common/config.py:223
 msgid ""
-"If true, Gajim hides the Roster window on pressing the X button instead of "
-"minimizing into the Dock."
+"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:226
+#: gajim/common/config.py:224
 #, fuzzy
 msgid ""
-"If true, Gajim will display an icon on each tab containing unread messages. "
-"Depending on the theme, this icon may be animated."
+"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:227
+#: gajim/common/config.py:225
 #, fuzzy
 msgid ""
-"If true, Gajim will display the status message, if not empty, for every "
-"contact under the contact name in roster window."
+"If enabled, Gajim will display the status message (if not empty) underneath "
+"the contact name in the contact list window."
 msgstr ""
 "如果為真， Gajim 將在聯絡人清單視窗中每一個聯絡人名稱的下方顯示狀態資訊(如果"
 "不為空)。"
 
-#: gajim/common/config.py:233
-msgid "Define the position of the avatar in roster. Can be left or right"
+#: gajim/common/config.py:231
+#, fuzzy
+msgid ""
+"Define the position of avatars in the contact list. Can be 'left' or 'right'."
 msgstr "定義了在聯絡人清單中頭像的顯示位置。可以是左或右"
 
-#: gajim/common/config.py:234
+#: gajim/common/config.py:232
 #, fuzzy
 msgid ""
-"If False, Gajim will no longer print status line in chats when a contact "
-"changes their status and/or their status message."
+"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/common/config.py:235
+#: gajim/common/config.py:233
 #, fuzzy
 msgid ""
 "Default Setting: Show a status message for every join or leave in a group "
-"chat"
+"chat."
 msgstr "無法加入聊天室"
 
-#: gajim/common/config.py:236
+#: gajim/common/config.py:234
+#, fuzzy
 msgid ""
-"Default Setting: Show a status message for all status (away, dnd, etc.) "
-"changes of users in a group chat"
-msgstr ""
+"Default Setting: Show a status message for all status changes (away, dnd, "
+"etc.) of users in a group chat."
+msgstr "無法加入聊天室"
 
-#: gajim/common/config.py:238
-msgid "Log XHTML messages instead of plain text messages."
+#: gajim/common/config.py:236
+#, fuzzy
+msgid "Store XHTML messages in chat history instead of plain text messages."
 msgstr "記錄 XHTML 訊息以代替純文字訊息。"
 
-#: gajim/common/config.py:239
+#: gajim/common/config.py:237
 msgid "Don't show avatar for the transport itself."
 msgstr "不顯示代理本身的頭像。"
 
-#: gajim/common/config.py:240
-msgid "Don't show roster in the system taskbar."
+#: gajim/common/config.py:238
+#, fuzzy
+msgid "Don't show contact list window in the system taskbar."
 msgstr "不要將聯絡人清單視窗顯示在系統的工作列中。"
 
-#: gajim/common/config.py:241
+#: gajim/common/config.py:239
 #, fuzzy
 msgid ""
-"If true, make the window flash (the default behaviour in most Window "
-"Managers) when holding pending events."
+"If enabled, Gajim makes the window flash (the default behaviour in most "
+"Window Managers) when holding pending events."
 msgstr ""
 "如果為真並且安裝的 GTK+ 和 PyGTK 的版本至少為 2.8，當有未處理事件時使窗\n"
 "口閃爍(大部分視窗管理器的預設回應)"
 
-#: gajim/common/config.py:245
+#: gajim/common/config.py:243
 #, fuzzy
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
 "'always_with_roster' - Like 'always' but the messages are in a single window "
-"along with the roster.\n"
+"along with the contact list.\n"
 "'never' - All messages get their own window.\n"
 "'peracct' - Messages for each account are sent to a specific window.\n"
-"'pertype' - Each message type (e.g. chats vs. groupchats) is sent to a "
+"'pertype' - Each message type (e.g. chats vs. group chats) is sent to a "
 "specific window."
 msgstr ""
 "控制新訊息被放置的視窗。\n"
@@ -3428,561 +3423,609 @@ msgstr ""
 "'peracct' - 每個帳號的訊息傳送到一個單獨的視窗。\n"
 "'pertype' - 每種類型的訊息 (例如，聊天 及 多人聊天) 傳送到一個單獨的視窗。"
 
-#: gajim/common/config.py:246
+#: gajim/common/config.py:244
+#, fuzzy
 msgid ""
-"Show roster on startup.\n"
-"'always' - Always show roster.\n"
-"'never' - Never show roster.\n"
-"'last_state' - Restore the last state roster."
+"Show contact list window on startup.\n"
+"'always' - Always show contact list window.\n"
+"'never' - Never show contact list window.\n"
+"'last_state' - Restore last state of the contact list window."
 msgstr ""
 "啟動時顯示名冊。\n"
 "「自動」- 自動顯示名冊。\n"
 "「永不」- 永不顯示名冊。\n"
 "「last_state」- 還原最後狀態名冊。"
 
-#: gajim/common/config.py:247
-msgid "If False, you will no longer see the avatar in the chat window."
+#: gajim/common/config.py:245
+#, fuzzy
+msgid "If enabled, Gajim displays the avatar in the chat window."
 msgstr "如果為假，您將不會在視窗中看到頭像。"
 
-#: gajim/common/config.py:248
+#: gajim/common/config.py:246
 #, fuzzy
-msgid "If true, pressing the escape key closes a tab/window."
+msgid "If enabled, pressing Esc closes a tab/window."
 msgstr "如果為真，按 Escape 鍵將關閉標籤/視窗。"
 
-#: gajim/common/config.py:249
-msgid "Hides the banner in a group chat window"
+#: gajim/common/config.py:247
+#, fuzzy
+msgid "Hides the banner in a group chat window."
 msgstr "在多人聊天視窗中隱藏標語"
 
-#: gajim/common/config.py:250
-msgid "Hides the banner in two persons chat window"
-msgstr "在雙人聊天視窗中隱藏標語"
+#: gajim/common/config.py:248
+#, fuzzy
+msgid "Hides the banner in a 1:1 chat window."
+msgstr "在多人聊天視窗中隱藏標語"
 
-#: gajim/common/config.py:251
-msgid "Hides the group chat occupants list in group chat window."
+#: gajim/common/config.py:249
+#, fuzzy
+msgid "Hides the group chat participants list in a group chat window."
 msgstr "在多人聊天視窗中隱藏室友清單。"
 
-#: gajim/common/config.py:252
+#: gajim/common/config.py:250
+#, fuzzy
 msgid ""
 "In a chat, show the nickname at the beginning of a line only when it's not "
-"the same person talking than in previous message."
+"the same person talking as in the previous message."
 msgstr ""
 "在聊天中，只在目前一條訊息不是由同一個人發出的的時候才在一列前顯示暱稱。"
 
-#: gajim/common/config.py:253
+#: gajim/common/config.py:251
 msgid "Indentation when using merge consecutive nickname."
 msgstr "當合併連續暱稱時縮排。"
 
-#: gajim/common/config.py:254
-msgid "Ctrl-Tab go to next composing tab when none is unread."
+#: gajim/common/config.py:252
+#, 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:255
+#: gajim/common/config.py:253
 #, fuzzy
 msgid ""
-"Show the confirm metacontacts creation dialog or not? Empty string means "
-"never show the dialog."
-msgstr "是否顯示確認元聯絡人建立對話方塊?空字串意味著永遠不顯示對話方塊。"
+"Show a confirmation dialog to create metacontacts? Empty string means never "
+"show the dialog."
+msgstr "是否顯示確認阻斷聯絡人對話方塊?空字串意味著永遠不顯示對話方塊。"
 
-#: gajim/common/config.py:256
+#: gajim/common/config.py:254
 #, fuzzy
 msgid ""
-"Show the confirm block contact dialog or not? Empty string means never show "
+"Show a confirmation dialog to block a contact? Empty string means never show "
 "the dialog."
 msgstr "是否顯示確認阻斷聯絡人對話方塊?空字串意味著永遠不顯示對話方塊。"
 
-#: gajim/common/config.py:257
+#: gajim/common/config.py:255
 #, fuzzy
 msgid ""
-"Show the confirm custom status dialog or not? Empty string means never show "
-"the dialog."
+"Show a confirmation dialog for a custom status? Empty string means never "
+"show the dialog."
 msgstr "是否顯示確認傳送自訂狀態對話方塊?空字串意味著永遠不顯示對話方塊。"
 
-#: gajim/common/config.py:258
+#: gajim/common/config.py:256
 #, fuzzy
 msgid ""
-"If true, you will be able to set a negative priority to your account in "
-"account modification window. BE CAREFUL, when you are logged in with a "
-"negative priority, you will NOT receive any message from your server."
+"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:259
+#: gajim/common/config.py:257
 #, fuzzy
 msgid ""
-"If true, Gajim will show number of online and total contacts in account and "
-"group rows."
+"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:260
+#: gajim/common/config.py:258
+#, fuzzy
 msgid ""
-"Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
-"as if they were of this type"
+"Can be empty, 'chat' or 'normal'. If not empty, all incoming messages are "
+"treated as if they were of this type."
 msgstr ""
 "可以是空字串，'chat'或'normal'。如果不為空，將把所有收到的訊息當作這個類型。"
 
-#: gajim/common/config.py:261
+#: gajim/common/config.py:259
 #, fuzzy
 msgid ""
-"If true, Gajim will scroll and select the contact who sent you the last "
-"message, if chat window is not already opened."
+"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 會捲動並選出最後給您傳送訊息的聯絡人。"
 
-#: gajim/common/config.py:262
+#: gajim/common/config.py:260
 msgid "Time of inactivity needed before the change status window closes down."
 msgstr "時間，如果在此時間內沒有活動，將變更狀態視窗關閉。"
 
-#: gajim/common/config.py:263
+#: gajim/common/config.py:261
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
 msgstr "在對話中最多顯示的列數。最舊的那些列會被清除。"
 
-#: gajim/common/config.py:264
+#: gajim/common/config.py:262
 #, fuzzy
 msgid ""
-"If true, notification windows from notification-daemon will be attached to "
-"notification icon."
+"If enabled, notification windows from notification-daemon will be attached "
+"to the notification area icon."
 msgstr "如果為真，由 notification-daemon 建立的提示視窗會依附於通知區域圖示。"
 
-#: gajim/common/config.py:265
+#: gajim/common/config.py:263
 msgid "Choose interval between 2 checks of idleness."
 msgstr "兩次檢查閒置之間的時間間隔。"
 
-#: gajim/common/config.py:266
+#: gajim/common/config.py:264
+#, fuzzy
 msgid ""
-"Valid uri schemes. Only schemes in this list will be accepted as \"real\" "
-"uri. (mailto and xmpp are handled separately)"
+"Valid URI schemes. Only schemes in this list will be accepted as 'real' URI "
+"(mailto and xmpp are handled separately)."
 msgstr ""
 "合法的 URI Scheme。只有這個清單中的 Scheme 會被接受為\"真正的\" URI。(mailto "
 "和 xmpp 被分開處理)"
 
-#: gajim/common/config.py:267
+#: gajim/common/config.py:265
 #, fuzzy
-msgid "If true, completion in groupchats will be like a shell auto-completion"
+msgid ""
+"If enabled, completion in group chats will be like a shell auto-completion."
 msgstr "如果為真，多人聊天中會像 shell 一樣自動補全"
 
-#: gajim/common/config.py:272
-msgid "Optionally fix jingle output video framerate. Example: 10/1 or 25/2"
+#: gajim/common/config.py:270
+#, fuzzy
+msgid "Optionally fix Jingle output video framerate. Example: 10/1 or 25/2."
 msgstr "可選地修正 jingle 視訊輸出的圖框速率。比如: 10/1 或 25/2"
 
-#: gajim/common/config.py:273
-msgid "Optionally resize jingle output video. Example: 320x240"
+#: gajim/common/config.py:271
+#, fuzzy
+msgid "Optionally resize Jingle output video. Example: 320x240."
 msgstr "可選地縮放 jingle 視訊輸出尺寸。比如: 320x240"
 
-#: gajim/common/config.py:274
-msgid "If true, You will also see your webcam"
+#: gajim/common/config.py:272
+msgid "If enabled, you will see your webcam's video stream as well."
 msgstr ""
 
-#: gajim/common/config.py:277
+#: gajim/common/config.py:275
 #, fuzzy
 msgid ""
-"If true, Gajim will try to use a STUN server when using Jingle. The one in "
-"\"stun_server\" option, or the one given by the XMPP server."
+"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\"選項給出，或由 jabber 伺服器給出。"
 
-#: gajim/common/config.py:278
+#: gajim/common/config.py:276
 #, fuzzy
 msgid "STUN server to use when using Jingle"
 msgstr "在使用 jingle 時使用的 STUN 伺服器"
 
-#: gajim/common/config.py:279
+#: gajim/common/config.py:277
 #, fuzzy
 msgid ""
-"If true, Gajim will show affiliation of groupchat occupants by adding a "
-"colored square to the status icon"
+"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:280
+#: gajim/common/config.py:278
 msgid ""
 "Proxy used for all outgoing connections if the account does not have a "
-"specific proxy configured"
+"specific proxy configured."
 msgstr ""
 
-#: gajim/common/config.py:281
-msgid "If true, Gajim will ignore incoming attention requests (\"wizz\")."
+#: gajim/common/config.py:279
+msgid "If enabled, Gajim will ignore incoming attention requests ('wizz')."
 msgstr ""
 
-#: gajim/common/config.py:282
+#: gajim/common/config.py:280
 msgid ""
 "If enabled, Gajim will reopen chat windows that were opened last time Gajim "
 "was closed."
 msgstr ""
 
-#: gajim/common/config.py:283
+#: gajim/common/config.py:281
 #, fuzzy
 msgid ""
-"If enabled, Gajim will show an icon to show that sent message has been "
-"received by your contact"
+"If enabled, Gajim will display an icon to show that sent messages have been "
+"received by your contact."
 msgstr "如果選取，Gajim 不會詢問狀態訊息，而使用特定的預設訊息。"
 
-#: gajim/common/config.py:284
-msgid "Show a mini avatar in chat window tabs and in window icon"
+#: gajim/common/config.py:282
+msgid "Show a mini avatar in chat window tabs and as the window's icon."
 msgstr ""
 
-#: gajim/common/config.py:285
+#: gajim/common/config.py:283
 #, fuzzy
-msgid "If true, Gajim will use the Systems Keyring to store account passwords."
+msgid ""
+"If enabled, Gajim will use the System's Keyring to store account passwords."
 msgstr "如果為真，Gajim 會使用 Gnome Keyring (如果可用) 儲存帳號的密碼。"
 
+#: gajim/common/config.py:284
+msgid "If enabled, Gajim will execute XEP-0146 Commands."
+msgstr ""
+
+#: gajim/common/config.py:285
+msgid "2: System, 1: Enabled, 0: Disabled"
+msgstr ""
+
 #: gajim/common/config.py:286
-msgid "If true, Gajim will execute XEP-0146 Commands."
+msgid "Options in days which can be chosen in the sync threshold menu"
 msgstr ""
 
 #: gajim/common/config.py:287
-msgid "2: System, 1: Enabled, 0: Disabled"
+msgid ""
+"Maximum history in days we request from a public group chat archive. 0: As "
+"much as possible."
 msgstr ""
 
 #: gajim/common/config.py:288
-msgid "Options in days which can be chosen in the sync threshold menu"
+msgid ""
+"Maximum history in days we request from a private group chat archive. 0: As "
+"much as possible."
 msgstr ""
 
 #: gajim/common/config.py:289
 msgid ""
-"Maximum history in days we request from a public room archive. 0: As much as "
-"possible"
+"If enabled, Gajim shows the group chat subject in the chat window when "
+"joining."
 msgstr ""
 
 #: gajim/common/config.py:290
+#, fuzzy
 msgid ""
-"Maximum history in days we request from a private room archive. 0: As much "
-"as possible"
-msgstr ""
+"If enabled, the contact row is colored according to the current chat state "
+"of the contact."
+msgstr "如果選取，Gajim 會允許他人偵測到您所使用的作業系統"
 
 #: gajim/common/config.py:291
-msgid "If the room subject is shown in chat on join"
-msgstr ""
+#, fuzzy
+msgid ""
+"If enabled, the tab is colored according to the current chat state of the "
+"contact."
+msgstr "如果選取，Gajim 會允許他人偵測到您所使用的作業系統"
 
 #: gajim/common/config.py:292
+#, fuzzy
 msgid ""
-"If the contact row is colored according to the current chatstate of the "
-"contact"
-msgstr ""
+"Shows a text in the banner that describes the current chat state of the "
+"contact."
+msgstr "如果選取，Gajim 會允許他人偵測到您所使用的作業系統"
 
 #: gajim/common/config.py:293
-msgid "If the tab is colored according to the current chatstate of the contact"
-msgstr ""
-
-#: gajim/common/config.py:294
-msgid ""
-"Shows a text in the banner that describes the current chatstate of the "
-"contact"
-msgstr ""
-
-#: gajim/common/config.py:295 gajim/common/config.py:424
 #, fuzzy
 msgid ""
 "Chat state notifications that are sent to contacts. Possible values: all, "
 "composing_only, disabled"
 msgstr "傳送聊天狀態通知。可以是全部，僅正在編輯，停用中的一個。"
 
-#: gajim/common/config.py:296 gajim/common/config.py:438
+#: gajim/common/config.py:294
 #, fuzzy
 msgid ""
 "Chat state notifications that are sent to the group chat. Possible values: "
-"all, composing_only, disabled"
+"'all', 'composing_only', 'disabled'"
 msgstr "傳送聊天狀態通知。可以是全部，僅正在編輯，停用中的一個。"
 
-#: gajim/common/config.py:312
+#: gajim/common/config.py:297
+msgid "API Preferences. Possible values: 'http', 'iq'"
+msgstr ""
+
+#: gajim/common/config.py:313
+#, fuzzy
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
-"defined in autopriority_* options."
+"defined in 'autopriority_*' options."
 msgstr "優先等級將根據您的狀態自動變更。優先等級在 autopriority_* 選項中定義。"
 
-#: gajim/common/config.py:320
+#: gajim/common/config.py:321
+#, fuzzy
 msgid ""
-"Status used to autoconnect as. Can be online, chat, away, xa, dnd, "
-"invisible. NOTE: this option is used only if restore_last_status is disabled"
+"Status to be used automatically when connecting. Can be 'online', 'chat', "
+"'away', 'xa', 'dnd' or 'invisible'. NOTE: This option is used only if "
+"'restore_last_status' is disabled."
 msgstr ""
 "自動連線時使用的狀態。可以是\"線上\"，\"聊天\"，\"離開\"，\"離開很久了"
 "\"，\"請勿\n"
 "打擾\"，\"隱身\"。注意: 僅當 restore_last_status 被停用時這個選項其作用"
 
-#: gajim/common/config.py:321
-msgid "If enabled, restore the last status that was used."
+#: gajim/common/config.py:322
+#, fuzzy
+msgid "If enabled, the last status will be restored."
 msgstr "如果啟用，則恢復上次使用的狀態。"
 
-#: gajim/common/config.py:322
+#: gajim/common/config.py:323
 #, fuzzy
 msgid ""
-"If true, Contacts requesting authorization will be automatically accepted."
+"If enabled, Contacts requesting authorization will be accepted automatically."
 msgstr "如果為真，聯絡人的認證請求將被自動接受。"
 
-#: gajim/common/config.py:323
+#: gajim/common/config.py:324
+#, fuzzy
 msgid ""
-"If False, this account will be disabled and will not appear in roster window."
+"If disabled, this account will be disabled and will not appear in the "
+"contact list window."
 msgstr "如果為假，這個帳號將被停用且不會出現在聯絡人清單視窗中。"
 
-#: gajim/common/config.py:327
-msgid "Allow plaintext connections"
+#: gajim/common/config.py:328
+msgid "Allow plaintext connections."
 msgstr ""
 
-#: gajim/common/config.py:330
+#: gajim/common/config.py:331
 msgid ""
-"List (space separated) of authentication mechanisms to try. Can contain "
-"ANONYMOUS, EXTERNAL, GSSAPI, SCRAM-SHA-1-PLUS, SCRAM-SHA-1, DIGEST-MD5, "
-"PLAIN, X-MESSENGER-OAUTH2 or XEP-0078"
+"List of authentication mechanisms to try (space separated). Can contain "
+"'ANONYMOUS', 'EXTERNAL', 'GSSAPI', 'SCRAM-SHA-1-PLUS', 'SCRAM-SHA-1', "
+"'DIGEST-MD5', 'PLAIN', 'X-MESSENGER-OAUTH2' or 'XEP-0078'."
 msgstr ""
 
-#: gajim/common/config.py:331
+#: gajim/common/config.py:332
 #, fuzzy
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection. "
-"Can be 'warn', 'connect', 'disconnect'"
+"Can be 'warn', 'connect' or 'disconnect'."
 msgstr "在使用明文連線傳送密碼前顯示一個警告對話方塊。"
 
-#: gajim/common/config.py:332
+#: gajim/common/config.py:333
 msgid "Show a warning dialog before using standard SSL library."
 msgstr "在使用標準 SSL 函式庫前顯示一個警告對話方塊。"
 
-#: gajim/common/config.py:333
+#: gajim/common/config.py:334
 msgid ""
 "Show a warning dialog before sending PLAIN password over a plain connection."
 msgstr "在透過明文連線傳送明文密碼前顯示警告對話框。"
 
-#: gajim/common/config.py:334
-msgid "Space separated list of ssl errors to ignore."
-msgstr "應忽略的 SSL 錯誤清單，以空格分隔"
+#: gajim/common/config.py:335
+msgid "List of SSL errors to ignore (space separated)."
+msgstr ""
 
-#: gajim/common/config.py:340
+#: gajim/common/config.py:341
 msgid ""
-"Space separated list of JIDs for which you do not want to store logs. You "
-"can also add account name to log nothing for this account."
+"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:341
+#: gajim/common/config.py:342
 msgid ""
-"Space separated list of JIDs for which you accept to not log conversations "
-"if he does not want to."
+"List of XMPP Addresses (space separated) for which you accept to not store "
+"chat history if your contact does not want to."
 msgstr ""
 
-#: gajim/common/config.py:343
-msgid "Whitespace sent after inactivity"
+#: gajim/common/config.py:344
+#, fuzzy
+msgid "If enabled, a whitespace is sent after inactivity (keep alive)."
 msgstr "在不活動後傳送的空白"
 
-#: gajim/common/config.py:344
-msgid "XMPP ping sent after inactivity"
+#: gajim/common/config.py:345
+#, fuzzy
+msgid "If enabled, an XMPP ping is sent after inactivity (ping alive)."
 msgstr "在不活動後傳送的 XMPP ping"
 
-#: gajim/common/config.py:348
+#: gajim/common/config.py:349
 #, fuzzy
 msgid ""
-"How many seconds to wait for the answer of ping alive packet before trying "
-"to reconnect?"
+"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:352
-msgid "Jabberd2 workaround"
+#: gajim/common/config.py:353
+#, fuzzy
+msgid "Jabberd2 workaround."
 msgstr "為 Jabberd2 變通"
 
-#: gajim/common/config.py:355
+#: gajim/common/config.py:356
+#, fuzzy
 msgid ""
-"If checked, Gajim will use your IP and proxies defined in "
-"file_transfer_proxies option for file transfer."
+"If enabled, Gajim will use your IP and proxies defined in "
+"'file_transfer_proxies' option for file transfers."
 msgstr ""
 "如果選取，Gajim 會使用您在 file_transfer_proxies 選項中定義的 IP 和代理進行檔"
 "案傳輸。"
 
-#: gajim/common/config.py:356
+#: gajim/common/config.py:357
 msgid ""
-"If true, Gajim will test file transfer proxies on startup to be sure it "
-"works. Openfire's proxies are known to fail this test even if they work."
+"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:369
-msgid "Answer to receipt requests"
-msgstr "對回執請求的回應"
-
 #: gajim/common/config.py:370
-msgid "Sent receipt requests"
-msgstr "傳送回執請求"
+#, fuzzy
+msgid "If enabled, Gajim will answer to message receipt requests."
+msgstr "如果選取，Gajim 不會詢問狀態訊息，而使用特定的預設訊息。"
+
+#: gajim/common/config.py:371
+msgid "If enabled, Gajim will send message receipt requests."
+msgstr ""
 
-#: gajim/common/config.py:379
+#: gajim/common/config.py:380
 msgid ""
 "Allow Gajim to send information about the operating system you are running."
 msgstr "允許 Gajim 發送您正在執行的作業系統相關資訊。"
 
-#: gajim/common/config.py:380
+#: gajim/common/config.py:381
 msgid "Allow Gajim to send your local time."
 msgstr "允許 Gajim 發送您的本地時間。"
 
-#: gajim/common/config.py:383
-msgid "Message that is sent to contacts you want to add"
-msgstr "向您希望加入的聯絡人傳送的訊息"
-
 #: gajim/common/config.py:384
-msgid ""
-"If enabled, Gajim will send your local IPs so your contact can connect to "
-"your machine to transfer files."
-msgstr ""
+#, fuzzy
+msgid "Message that is sent to contacts you want to add."
+msgstr "向您希望加入的聯絡人傳送的訊息"
 
 #: gajim/common/config.py:385
+#, fuzzy
 msgid ""
-"Space separated list of JIDs for which chat window will be re-opened on next "
-"startup."
+"If enabled, Gajim will send your local IP so your contact can connect to "
+"your machine for file transfers."
 msgstr ""
+"如果選取，Gajim 會使用您在 file_transfer_proxies 選項中定義的 IP 和代理進行檔"
+"案傳輸。"
 
-#: gajim/common/config.py:387
-msgid "HTTP Upload: Enable HTTPS Verification"
+#: gajim/common/config.py:386
+msgid ""
+"List of XMPP Addresses (space separated) for which the chat window will be "
+"re-opened on next startup."
 msgstr ""
 
 #: gajim/common/config.py:388
-msgid ""
-"Preferred file transfer mechanism for file drag&drop on chat window. Can be "
-"'httpupload' (default) or 'jingle'"
+msgid "HTTP File Upload: Enable HTTPS Verification."
 msgstr ""
 
 #: gajim/common/config.py:389
-msgid "Allow cert verification with POSH"
+msgid ""
+"Preferred file transfer mechanism for file drag&drop on a chat window. Can "
+"be 'httpupload' (default) or 'jingle'."
 msgstr ""
 
-#: gajim/common/config.py:423 gajim/common/config.py:430
+#: gajim/common/config.py:390
 #, fuzzy
-msgid "Language for which misspelled words will be checked"
-msgstr "想要進行拼寫檢查的語言"
-
-#: gajim/common/config.py:427
-msgid "The currently active encryption for that contact"
-msgstr ""
+msgid "Allow certificate verification with POSH."
+msgstr "SSL 憑證驗證"
 
-#: gajim/common/config.py:431
+#: gajim/common/config.py:425
 #, fuzzy
 msgid ""
-"How many lines to request from server when entering a groupchat. -1 means no "
-"limit, -2 means global value"
-msgstr "當加入多人聊天時，向伺服器請求聊天記錄的列數。-1 表示無限制"
+"Chat state notifications that are sent to contacts. Possible values: 'all', "
+"'composing_only', 'disabled'"
+msgstr "傳送聊天狀態通知。可以是全部，僅正在編輯，停用中的一個。"
 
-#: gajim/common/config.py:432
+#: gajim/common/config.py:428
 #, fuzzy
-msgid ""
-"Minutes of backlog to request when entering a groupchat. -1 means no limit, "
-"-2 means global value"
-msgstr "當加入多人聊天時，向伺服器請求多少分鐘以內的聊天記錄。-1 表示無限制"
+msgid "The currently active encryption for that contact."
+msgstr "為這個帳號啟用 ESession 加密。"
 
-#: gajim/common/config.py:433
-msgid "State whether a notification is created for every message in this room"
+#: gajim/common/config.py:432
+msgid ""
+"If enabled, a notification is created for every message in this group chat."
 msgstr ""
 
-#: gajim/common/config.py:434
+#: gajim/common/config.py:433
+#, fuzzy
 msgid ""
-"Show a status message for all status (away, dnd, etc.) changes of users in a "
-"group chat"
-msgstr ""
+"Show a status message for all status changes (away, dnd, etc.) of users in a "
+"group chat."
+msgstr "無法加入聊天室"
 
-#: gajim/common/config.py:435
+#: gajim/common/config.py:434
 #, fuzzy
-msgid "Show a status message for every join or leave in a group chat"
+msgid "Show a status message for every join or leave in a group chat."
 msgstr "無法加入聊天室"
 
+#: gajim/common/config.py:435
+msgid ""
+"If enabled, the group chat is minimized into the contact list when joining "
+"automatically."
+msgstr ""
+
 #: gajim/common/config.py:436
-msgid "If the group chat is minimized into the roster on autojoin"
+msgid ""
+"If enabled, the group chat is minimized into the contact list when closing "
+"it."
 msgstr ""
 
 #: gajim/common/config.py:437
-msgid "If the group chat is minimized into the roster on close"
-msgstr ""
+#, fuzzy
+msgid ""
+"Chat state notifications that are sent to the group chat. Possible values: "
+"'all', 'composing_only' or 'disabled'."
+msgstr "傳送聊天狀態通知。可以是全部，僅正在編輯，停用中的一個。"
 
-#: gajim/common/config.py:441
+#: gajim/common/config.py:440
 #, fuzzy
 msgid ""
-"State whether plugins should be activated on startup (this is saved on Gajim "
-"exit). This option SHOULD NOT be used to (de)activate plug-ins. Use GUI "
-"instead."
+"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 離開時這會被儲存)。這個選項不應該用於啟"
 "用或停用外掛程式。使用圖形介面代替。"
 
-#: gajim/common/config.py:446 gajim/common/const.py:281
+#: gajim/common/config.py:445 gajim/common/const.py:315
 msgid "Sleeping"
 msgstr "正在睡覺"
 
-#: gajim/common/config.py:447
+#: gajim/common/config.py:446
 msgid "Back soon"
 msgstr "馬上回來"
 
-#: gajim/common/config.py:447
+#: gajim/common/config.py:446
 msgid "Back in some minutes."
 msgstr "幾分鐘就回來。"
 
-#: gajim/common/config.py:448 gajim/common/const.py:247
+#: gajim/common/config.py:447 gajim/common/const.py:281
 msgid "Eating"
 msgstr "吃東西"
 
-#: gajim/common/config.py:448
-msgid "I'm eating, so leave me a message."
-msgstr "我在吃東西，請留言"
+#: gajim/common/config.py:447
+#, fuzzy
+msgid "I'm eating."
+msgstr "我正在工作。"
 
-#: gajim/common/config.py:449
+#: gajim/common/config.py:448
 msgid "Movie"
 msgstr "電影"
 
-#: gajim/common/config.py:449
+#: gajim/common/config.py:448
 msgid "I'm watching a movie."
 msgstr "我正在看電影。"
 
-#: gajim/common/config.py:450 gajim/common/const.py:314
+#: gajim/common/config.py:449 gajim/common/const.py:348
 msgid "Working"
 msgstr "工作"
 
-#: gajim/common/config.py:450
+#: gajim/common/config.py:449
 msgid "I'm working."
 msgstr "我正在工作。"
 
-#: gajim/common/config.py:451
+#: gajim/common/config.py:450
 msgid "Phone"
 msgstr "打電話"
 
-#: gajim/common/config.py:451
+#: gajim/common/config.py:450
 msgid "I'm on the phone."
 msgstr "我正在打電話"
 
-#: gajim/common/config.py:452
+#: gajim/common/config.py:451
 msgid "Out"
 msgstr "外出"
 
-#: gajim/common/config.py:452
+#: gajim/common/config.py:451
 msgid "I'm out enjoying life."
 msgstr "我正在享受戶外生活。"
 
-#: gajim/common/config.py:463
+#: gajim/common/config.py:462
 msgid "I'm available."
 msgstr "我現在線上。"
 
-#: gajim/common/config.py:464
+#: gajim/common/config.py:463
 msgid "I'm free for chat."
 msgstr "和我聊天吧"
 
-#: gajim/common/config.py:465 gajim/gtk/accounts.py:134
+#: gajim/common/config.py:464 gajim/gtk/accounts.py:133
 msgid "Be right back."
 msgstr "很快回來。"
 
-#: gajim/common/config.py:466
+#: gajim/common/config.py:465
 msgid "I'm not available."
 msgstr "我已經很久不在了。"
 
-#: gajim/common/config.py:467
+#: gajim/common/config.py:466
 msgid "Do not disturb."
 msgstr "請勿打擾。"
 
-#: gajim/common/config.py:468 gajim/common/config.py:469
+#: gajim/common/config.py:467 gajim/common/config.py:468
 msgid "Bye!"
 msgstr "再見!"
 
-#: gajim/common/config.py:480
+#: gajim/common/config.py:479
+#, fuzzy
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
-"muc_highlight_words, or when a group chat message contains your nickname."
+"'muc_highlight_words' your nickname is mentioned."
 msgstr ""
 "當收到的多人聊天訊息包含 \"muc_highlight_words\" 或您的暱稱時播放的聲音。"
 
-#: gajim/common/config.py:481
-msgid "Sound to play when any MUC message arrives."
+#: gajim/common/config.py:480
+#, fuzzy
+msgid "Sound to play when any group chat message arrives."
 msgstr "收到任意多人聊天訊息播放的聲音。"
 
-#: gajim/common/config.py:485
+#: gajim/common/config.py:484
 #, fuzzy
 msgid "Tor"
 msgstr "To"
@@ -3992,880 +4035,976 @@ msgstr "To"
 msgid "Error: cannot open %s for reading"
 msgstr "錯誤: 無法按讀開啟檔案 %s"
 
-#: gajim/common/const.py:214
+#: gajim/common/const.py:216
+#, fuzzy
+msgid "?Group chat name:Team"
+msgstr "無"
+
+#: gajim/common/const.py:217
+msgid "?Group chat description:Project discussion"
+msgstr ""
+
+#: gajim/common/const.py:218
+#, fuzzy
+msgid "?Group chat address:team"
+msgstr "多人聊天"
+
+#: gajim/common/const.py:219
+#, fuzzy
+msgid "?Group chat name:Family"
+msgstr "多人聊天訊息高亮度顯示"
+
+#: gajim/common/const.py:220
+msgid "?Group chat description:Spring gathering"
+msgstr ""
+
+#: gajim/common/const.py:221
+msgid "?Group chat address:family"
+msgstr ""
+
+#: gajim/common/const.py:222
+#, fuzzy
+msgid "?Group chat name:Vacation"
+msgstr "多人聊天邀請"
+
+#: gajim/common/const.py:223
+msgid "?Group chat description:Trip planning"
+msgstr ""
+
+#: gajim/common/const.py:224
+#, fuzzy
+msgid "?Group chat address:vacation"
+msgstr "多人聊天邀請"
+
+#: gajim/common/const.py:225
+#, fuzzy
+msgid "?Group chat name:Repairs"
+msgstr "多人聊天(_G)"
+
+#: gajim/common/const.py:226
+msgid "?Group chat description:Local help group"
+msgstr ""
+
+#: gajim/common/const.py:227
+#, fuzzy
+msgid "?Group chat address:repairs"
+msgstr "多人聊天"
+
+#: gajim/common/const.py:228
+#, fuzzy
+msgid "?Group chat name:News"
+msgstr "無"
+
+#: gajim/common/const.py:229
+#, fuzzy
+msgid "?Group chat description:Local news and reports"
+msgstr "聊天室建立是受限的。"
+
+#: gajim/common/const.py:230
+#, fuzzy
+msgid "?Group chat address:news"
+msgstr "新聊天室"
+
+#: gajim/common/const.py:235
+#, fuzzy
+msgid "Remote server not found"
+msgstr "找不到該服務"
+
+#: gajim/common/const.py:236
+msgid "Remote server timeout"
+msgstr ""
+
+#: gajim/common/const.py:237 gajim/common/const.py:238
+#: gajim/common/const.py:239
+#, fuzzy
+msgid "Address does not belong to a group chat server"
+msgstr "這不是一個聊天室"
+
+#: gajim/common/const.py:240
+#, fuzzy
+msgid "Group chat already exists"
+msgstr "帳號本地已存在。"
+
+#: gajim/common/const.py:241
+#, fuzzy
+msgid "Group chat does not exist"
+msgstr "多人聊天 <b>%s</b> 不存在。"
+
+#: gajim/common/const.py:247
 msgid "This message was encrypted with OTR and could not be decrypted."
 msgstr ""
 
-#: gajim/common/const.py:217
+#: gajim/common/const.py:250
 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:221
+#: gajim/common/const.py:254
 msgid ""
-"This message was encrypted with OpenPGP for XMPP and could not be decrypted."
+"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:224
+#: gajim/common/const.py:258
 #, python-format
 msgid "This message was encrypted with %s and could not be decrypted."
 msgstr ""
 
-#: gajim/common/const.py:231
+#: gajim/common/const.py:265
 msgid "Doing Chores"
 msgstr "做家務"
 
-#: gajim/common/const.py:232
+#: gajim/common/const.py:266
 msgid "Buying Groceries"
 msgstr "買雜貨"
 
-#: gajim/common/const.py:233
+#: gajim/common/const.py:267
 msgid "Cleaning"
 msgstr "清潔"
 
-#: gajim/common/const.py:234
+#: gajim/common/const.py:268
 msgid "Cooking"
 msgstr "做飯"
 
-#: gajim/common/const.py:235
+#: gajim/common/const.py:269
 msgid "Doing Maintenance"
 msgstr "做保養"
 
-#: gajim/common/const.py:236
+#: gajim/common/const.py:270
 msgid "Doing the Dishes"
 msgstr "洗碗"
 
-#: gajim/common/const.py:237
+#: gajim/common/const.py:271
 msgid "Doing the Laundry"
 msgstr "洗衣服"
 
-#: gajim/common/const.py:238
+#: gajim/common/const.py:272
 msgid "Gardening"
 msgstr "園藝"
 
-#: gajim/common/const.py:239
+#: gajim/common/const.py:273
 msgid "Running an Errand"
 msgstr "奔波"
 
-#: gajim/common/const.py:240
+#: gajim/common/const.py:274
 msgid "Walking the Dog"
 msgstr "遛狗"
 
-#: gajim/common/const.py:242
+#: gajim/common/const.py:276
 msgid "Drinking"
 msgstr "喝酒"
 
-#: gajim/common/const.py:243
+#: gajim/common/const.py:277
 msgid "Having a Beer"
 msgstr "喝啤酒"
 
-#: gajim/common/const.py:244
+#: gajim/common/const.py:278
 msgid "Having Coffee"
 msgstr "喝咖啡"
 
-#: gajim/common/const.py:245
+#: gajim/common/const.py:279
 msgid "Having Tea"
 msgstr "喝茶"
 
-#: gajim/common/const.py:248
+#: gajim/common/const.py:282
 msgid "Having a Snack"
 msgstr "吃點心"
 
-#: gajim/common/const.py:249
+#: gajim/common/const.py:283
 msgid "Having Breakfast"
 msgstr "吃早餐"
 
-#: gajim/common/const.py:250
+#: gajim/common/const.py:284
 msgid "Having Dinner"
 msgstr "吃晚餐"
 
-#: gajim/common/const.py:251
+#: gajim/common/const.py:285
 msgid "Having Lunch"
 msgstr "吃午餐"
 
-#: gajim/common/const.py:253
+#: gajim/common/const.py:287
 msgid "Exercising"
 msgstr "鍛煉"
 
-#: gajim/common/const.py:254 gajim/common/const.py:305
+#: gajim/common/const.py:288 gajim/common/const.py:339
 msgid "Cycling"
 msgstr "騎車"
 
-#: gajim/common/const.py:255
+#: gajim/common/const.py:289
 msgid "Dancing"
 msgstr "跳舞"
 
-#: gajim/common/const.py:256
+#: gajim/common/const.py:290
 msgid "Hiking"
 msgstr "步行"
 
-#: gajim/common/const.py:257
+#: gajim/common/const.py:291
 msgid "Jogging"
 msgstr "慢跑"
 
-#: gajim/common/const.py:258
+#: gajim/common/const.py:292
 msgid "Playing Sports"
 msgstr "運動"
 
-#: gajim/common/const.py:259
+#: gajim/common/const.py:293
 msgid "Running"
 msgstr "跑步"
 
-#: gajim/common/const.py:260
+#: gajim/common/const.py:294
 msgid "Skiing"
 msgstr "滑雪"
 
-#: gajim/common/const.py:261
+#: gajim/common/const.py:295
 msgid "Swimming"
 msgstr "游泳"
 
-#: gajim/common/const.py:262
+#: gajim/common/const.py:296
 msgid "Working out"
 msgstr "鍛煉"
 
-#: gajim/common/const.py:264
+#: gajim/common/const.py:298
 msgid "Grooming"
 msgstr "打扮"
 
-#: gajim/common/const.py:265
+#: gajim/common/const.py:299
 msgid "At the Spa"
 msgstr "泡溫泉"
 
-#: gajim/common/const.py:266
+#: gajim/common/const.py:300
 msgid "Brushing Teeth"
 msgstr "刷牙"
 
-#: gajim/common/const.py:267
+#: gajim/common/const.py:301
 msgid "Getting a Haircut"
 msgstr "剪頭發"
 
-#: gajim/common/const.py:268
+#: gajim/common/const.py:302
 msgid "Shaving"
 msgstr "颳鬍子"
 
-#: gajim/common/const.py:269
+#: gajim/common/const.py:303
 msgid "Taking a Bath"
 msgstr "洗澡"
 
-#: gajim/common/const.py:270
+#: gajim/common/const.py:304
 msgid "Taking a Shower"
 msgstr "洗澡"
 
-#: gajim/common/const.py:272
+#: gajim/common/const.py:306
 msgid "Having an Appointment"
 msgstr "赴約"
 
-#: gajim/common/const.py:274
+#: gajim/common/const.py:308
 msgid "Inactive"
 msgstr "未活動的"
 
-#: gajim/common/const.py:275
+#: gajim/common/const.py:309
 msgid "Day Off"
 msgstr "休息日"
 
-#: gajim/common/const.py:276
+#: gajim/common/const.py:310
 msgid "Hanging out"
 msgstr "溜達"
 
-#: gajim/common/const.py:277
+#: gajim/common/const.py:311
 msgid "Hiding"
 msgstr "藏起來"
 
-#: gajim/common/const.py:278
+#: gajim/common/const.py:312
 msgid "On Vacation"
 msgstr "渡假"
 
-#: gajim/common/const.py:279
+#: gajim/common/const.py:313
 msgid "Praying"
 msgstr "祈禱"
 
-#: gajim/common/const.py:280
+#: gajim/common/const.py:314
 msgid "Scheduled Holiday"
 msgstr "規劃假期"
 
-#: gajim/common/const.py:282
+#: gajim/common/const.py:316
 msgid "Thinking"
 msgstr "思考"
 
-#: gajim/common/const.py:284
+#: gajim/common/const.py:318
 msgid "Relaxing"
 msgstr "放鬆"
 
-#: gajim/common/const.py:285
+#: gajim/common/const.py:319
 msgid "Fishing"
 msgstr "釣魚"
 
-#: gajim/common/const.py:286
+#: gajim/common/const.py:320
 msgid "Gaming"
 msgstr "遊戲"
 
-#: gajim/common/const.py:287
+#: gajim/common/const.py:321
 msgid "Going out"
 msgstr "外出"
 
-#: gajim/common/const.py:288
+#: gajim/common/const.py:322
 msgid "Partying"
 msgstr "聚會"
 
-#: gajim/common/const.py:289
+#: gajim/common/const.py:323
 msgid "Reading"
 msgstr "讀書"
 
-#: gajim/common/const.py:290
+#: gajim/common/const.py:324
 msgid "Rehearsing"
 msgstr "排練"
 
-#: gajim/common/const.py:291
+#: gajim/common/const.py:325
 msgid "Shopping"
 msgstr "購物"
 
-#: gajim/common/const.py:292
+#: gajim/common/const.py:326
 msgid "Smoking"
 msgstr "抽煙"
 
-#: gajim/common/const.py:293
+#: gajim/common/const.py:327
 msgid "Socializing"
 msgstr "社交"
 
-#: gajim/common/const.py:294
+#: gajim/common/const.py:328
 msgid "Sunbathing"
 msgstr "日光浴"
 
-#: gajim/common/const.py:295
+#: gajim/common/const.py:329
 msgid "Watching TV"
 msgstr "看電視"
 
-#: gajim/common/const.py:296
+#: gajim/common/const.py:330
 msgid "Watching a Movie"
 msgstr "看電影"
 
-#: gajim/common/const.py:298
+#: gajim/common/const.py:332
 msgid "Talking"
 msgstr "談話"
 
-#: gajim/common/const.py:299
+#: gajim/common/const.py:333
 msgid "In Real Life"
 msgstr "在現實世界中"
 
-#: gajim/common/const.py:300
+#: gajim/common/const.py:334
 msgid "On the Phone"
 msgstr "打電話"
 
-#: gajim/common/const.py:301
+#: gajim/common/const.py:335
 msgid "On Video Phone"
 msgstr "視訊電話"
 
-#: gajim/common/const.py:303
+#: gajim/common/const.py:337
 msgid "Traveling"
 msgstr "旅行"
 
-#: gajim/common/const.py:304
+#: gajim/common/const.py:338
 msgid "Commuting"
 msgstr "上下班"
 
-#: gajim/common/const.py:306
+#: gajim/common/const.py:340
 msgid "Driving"
 msgstr "開車"
 
-#: gajim/common/const.py:307
+#: gajim/common/const.py:341
 msgid "In a Car"
 msgstr "坐車"
 
-#: gajim/common/const.py:308
+#: gajim/common/const.py:342
 msgid "On a Bus"
 msgstr "坐公共汽車"
 
-#: gajim/common/const.py:309
+#: gajim/common/const.py:343
 msgid "On a Plane"
 msgstr "坐飛機"
 
-#: gajim/common/const.py:310
+#: gajim/common/const.py:344
 msgid "On a Train"
 msgstr "坐火車"
 
-#: gajim/common/const.py:311
+#: gajim/common/const.py:345
 msgid "On a Trip"
 msgstr "旅途"
 
-#: gajim/common/const.py:312
+#: gajim/common/const.py:346
 msgid "Walking"
 msgstr "走路"
 
-#: gajim/common/const.py:315
+#: gajim/common/const.py:349
 msgid "Coding"
 msgstr "編寫程式碼"
 
-#: gajim/common/const.py:316
+#: gajim/common/const.py:350
 msgid "In a Meeting"
 msgstr "開會"
 
-#: gajim/common/const.py:317
+#: gajim/common/const.py:351
 msgid "Studying"
 msgstr "學習"
 
-#: gajim/common/const.py:318
+#: gajim/common/const.py:352
 msgid "Writing"
 msgstr "寫作"
 
-#: gajim/common/const.py:321
+#: gajim/common/const.py:355
 msgid "Afraid"
 msgstr "害怕"
 
-#: gajim/common/const.py:322
+#: gajim/common/const.py:356
 msgid "Amazed"
 msgstr "大為驚奇"
 
-#: gajim/common/const.py:323
+#: gajim/common/const.py:357
 msgid "Amorous"
 msgstr "含情脈脈"
 
-#: gajim/common/const.py:324
+#: gajim/common/const.py:358
 msgid "Angry"
 msgstr "生氣"
 
-#: gajim/common/const.py:325
+#: gajim/common/const.py:359
 msgid "Annoyed"
 msgstr "惱怒"
 
-#: gajim/common/const.py:326
+#: gajim/common/const.py:360
 msgid "Anxious"
 msgstr "焦慮"
 
-#: gajim/common/const.py:327
+#: gajim/common/const.py:361
 msgid "Aroused"
 msgstr "激情澎湃"
 
-#: gajim/common/const.py:328
+#: gajim/common/const.py:362
 msgid "Ashamed"
 msgstr "羞愧"
 
-#: gajim/common/const.py:329
+#: gajim/common/const.py:363
 msgid "Bored"
 msgstr "厭倦"
 
-#: gajim/common/const.py:330
+#: gajim/common/const.py:364
 msgid "Brave"
 msgstr "勇敢"
 
-#: gajim/common/const.py:331
+#: gajim/common/const.py:365
 msgid "Calm"
 msgstr "冷靜"
 
-#: gajim/common/const.py:332
+#: gajim/common/const.py:366
 msgid "Cautious"
 msgstr "謹慎"
 
-#: gajim/common/const.py:333
+#: gajim/common/const.py:367
 msgid "Cold"
 msgstr "冰冷"
 
-#: gajim/common/const.py:334
+#: gajim/common/const.py:368
 msgid "Confident"
 msgstr "自信"
 
-#: gajim/common/const.py:335
+#: gajim/common/const.py:369
 msgid "Confused"
 msgstr "困惑"
 
-#: gajim/common/const.py:336
+#: gajim/common/const.py:370
 msgid "Contemplative"
 msgstr "沉思，冥想"
 
-#: gajim/common/const.py:337
+#: gajim/common/const.py:371
 msgid "Contented"
 msgstr "爭辯"
 
-#: gajim/common/const.py:338
+#: gajim/common/const.py:372
 msgid "Cranky"
 msgstr "古怪"
 
-#: gajim/common/const.py:339
+#: gajim/common/const.py:373
 msgid "Crazy"
 msgstr "瘋狂"
 
-#: gajim/common/const.py:340
+#: gajim/common/const.py:374
 msgid "Creative"
 msgstr "創造"
 
-#: gajim/common/const.py:341
+#: gajim/common/const.py:375
 msgid "Curious"
 msgstr "好奇"
 
-#: gajim/common/const.py:342
+#: gajim/common/const.py:376
 msgid "Dejected"
 msgstr "沮喪"
 
-#: gajim/common/const.py:343
+#: gajim/common/const.py:377
 msgid "Depressed"
 msgstr "消沉"
 
-#: gajim/common/const.py:344
+#: gajim/common/const.py:378
 msgid "Disappointed"
 msgstr "失望"
 
-#: gajim/common/const.py:345
+#: gajim/common/const.py:379
 msgid "Disgusted"
 msgstr "厭惡"
 
-#: gajim/common/const.py:346
+#: gajim/common/const.py:380
 msgid "Dismayed"
 msgstr "詫異"
 
-#: gajim/common/const.py:347
+#: gajim/common/const.py:381
 msgid "Distracted"
 msgstr "心煩意亂"
 
-#: gajim/common/const.py:348
+#: gajim/common/const.py:382
 msgid "Embarrassed"
 msgstr "尷尬"
 
-#: gajim/common/const.py:349
+#: gajim/common/const.py:383
 msgid "Envious"
 msgstr "羨慕"
 
-#: gajim/common/const.py:350
+#: gajim/common/const.py:384
 msgid "Excited"
 msgstr "興奮"
 
-#: gajim/common/const.py:351
+#: gajim/common/const.py:385
 msgid "Flirtatious"
 msgstr "賣弄風情"
 
-#: gajim/common/const.py:352
+#: gajim/common/const.py:386
 msgid "Frustrated"
 msgstr "懊喪"
 
-#: gajim/common/const.py:353
+#: gajim/common/const.py:387
 msgid "Grateful"
 msgstr "感激"
 
-#: gajim/common/const.py:354
+#: gajim/common/const.py:388
 msgid "Grieving"
 msgstr "悲傷"
 
-#: gajim/common/const.py:355
+#: gajim/common/const.py:389
 msgid "Grumpy"
 msgstr "暴躁"
 
-#: gajim/common/const.py:356
+#: gajim/common/const.py:390
 msgid "Guilty"
 msgstr "內疚"
 
-#: gajim/common/const.py:357
+#: gajim/common/const.py:391
 msgid "Happy"
 msgstr "快樂"
 
-#: gajim/common/const.py:358
+#: gajim/common/const.py:392
 msgid "Hopeful"
 msgstr "滿懷希望"
 
-#: gajim/common/const.py:359
+#: gajim/common/const.py:393
 msgid "Hot"
 msgstr "活躍"
 
-#: gajim/common/const.py:360
+#: gajim/common/const.py:394
 msgid "Humbled"
 msgstr "謙遜"
 
-#: gajim/common/const.py:361
+#: gajim/common/const.py:395
 msgid "Humiliated"
 msgstr "丟臉"
 
-#: gajim/common/const.py:362
+#: gajim/common/const.py:396
 msgid "Hungry"
 msgstr "餓"
 
-#: gajim/common/const.py:363
+#: gajim/common/const.py:397
 msgid "Hurt"
 msgstr "受傷"
 
-#: gajim/common/const.py:364
+#: gajim/common/const.py:398
 msgid "Impressed"
 msgstr "印像深刻"
 
-#: gajim/common/const.py:365
+#: gajim/common/const.py:399
 msgid "In Awe"
 msgstr "敬畏"
 
-#: gajim/common/const.py:366
+#: gajim/common/const.py:400
 msgid "In Love"
 msgstr "戀愛"
 
-#: gajim/common/const.py:367
+#: gajim/common/const.py:401
 msgid "Indignant"
 msgstr "憤慨"
 
-#: gajim/common/const.py:368
+#: gajim/common/const.py:402
 msgid "Interested"
 msgstr "感興趣"
 
-#: gajim/common/const.py:369
+#: gajim/common/const.py:403
 msgid "Intoxicated"
 msgstr "麻醉"
 
-#: gajim/common/const.py:370
+#: gajim/common/const.py:404
 msgid "Invincible"
 msgstr "無敵的"
 
-#: gajim/common/const.py:371
+#: gajim/common/const.py:405
 msgid "Jealous"
 msgstr "吃醋"
 
-#: gajim/common/const.py:372
+#: gajim/common/const.py:406
 msgid "Lonely"
 msgstr "寂寞"
 
-#: gajim/common/const.py:373
+#: gajim/common/const.py:407
 msgid "Lost"
 msgstr "迷惘"
 
-#: gajim/common/const.py:374
+#: gajim/common/const.py:408
 msgid "Lucky"
 msgstr "幸運"
 
-#: gajim/common/const.py:375
+#: gajim/common/const.py:409
 msgid "Mean"
 msgstr "小氣"
 
-#: gajim/common/const.py:376
+#: gajim/common/const.py:410
 msgid "Moody"
 msgstr "喜怒無常"
 
-#: gajim/common/const.py:377
+#: gajim/common/const.py:411
 msgid "Nervous"
 msgstr "緊張"
 
-#: gajim/common/const.py:378
+#: gajim/common/const.py:412
 msgid "Neutral"
 msgstr "中立"
 
-#: gajim/common/const.py:379
+#: gajim/common/const.py:413
 msgid "Offended"
 msgstr "生氣"
 
-#: gajim/common/const.py:380
+#: gajim/common/const.py:414
 msgid "Outraged"
 msgstr "義憤填膺"
 
-#: gajim/common/const.py:381
+#: gajim/common/const.py:415
 msgid "Playful"
 msgstr "有趣"
 
-#: gajim/common/const.py:382
+#: gajim/common/const.py:416
 msgid "Proud"
 msgstr "驕傲"
 
-#: gajim/common/const.py:383
+#: gajim/common/const.py:417
 msgid "Relaxed"
 msgstr "放鬆"
 
-#: gajim/common/const.py:384
+#: gajim/common/const.py:418
 msgid "Relieved"
 msgstr "寬慰"
 
-#: gajim/common/const.py:385
+#: gajim/common/const.py:419
 msgid "Remorseful"
 msgstr "後悔"
 
-#: gajim/common/const.py:386
+#: gajim/common/const.py:420
 msgid "Restless"
 msgstr "坐立不安"
 
-#: gajim/common/const.py:387
+#: gajim/common/const.py:421
 msgid "Sad"
 msgstr "傷心"
 
-#: gajim/common/const.py:388
+#: gajim/common/const.py:422
 msgid "Sarcastic"
 msgstr "諷刺"
 
-#: gajim/common/const.py:389
+#: gajim/common/const.py:423
 msgid "Satisfied"
 msgstr "滿意"
 
-#: gajim/common/const.py:390
+#: gajim/common/const.py:424
 msgid "Serious"
 msgstr "嚴肅"
 
-#: gajim/common/const.py:391
+#: gajim/common/const.py:425
 msgid "Shocked"
 msgstr "震驚"
 
-#: gajim/common/const.py:392
+#: gajim/common/const.py:426
 msgid "Shy"
 msgstr "害羞"
 
-#: gajim/common/const.py:393
+#: gajim/common/const.py:427
 msgid "Sick"
 msgstr "不舒服"
 
-#: gajim/common/const.py:394
+#: gajim/common/const.py:428
 msgid "Sleepy"
 msgstr "瞌睡"
 
-#: gajim/common/const.py:395
+#: gajim/common/const.py:429
 msgid "Spontaneous"
 msgstr "心血來潮"
 
-#: gajim/common/const.py:396
+#: gajim/common/const.py:430
 msgid "Stressed"
 msgstr "壓力很大"
 
-#: gajim/common/const.py:397
+#: gajim/common/const.py:431
 msgid "Strong"
 msgstr "強壯"
 
-#: gajim/common/const.py:398
+#: gajim/common/const.py:432
 msgid "Surprised"
 msgstr "驚訝"
 
-#: gajim/common/const.py:399
+#: gajim/common/const.py:433
 msgid "Thankful"
 msgstr "感激"
 
-#: gajim/common/const.py:400
+#: gajim/common/const.py:434
 msgid "Thirsty"
 msgstr "渴"
 
-#: gajim/common/const.py:401
+#: gajim/common/const.py:435
 msgid "Tired"
 msgstr "累"
 
-#: gajim/common/const.py:402
+#: gajim/common/const.py:436
 msgid "Undefined"
 msgstr "未定義"
 
-#: gajim/common/const.py:403
+#: gajim/common/const.py:437
 msgid "Weak"
 msgstr "虛弱"
 
-#: gajim/common/const.py:404
+#: gajim/common/const.py:438
 msgid "Worried"
 msgstr "擔憂"
 
-#: gajim/common/const.py:408
+#: gajim/common/const.py:442
 msgid "accuracy"
 msgstr ""
 
-#: gajim/common/const.py:409
+#: gajim/common/const.py:443
 #, fuzzy
 msgid "alt"
 msgstr "預設"
 
-#: gajim/common/const.py:410
+#: gajim/common/const.py:444
 msgid "area"
 msgstr ""
 
-#: gajim/common/const.py:411
+#: gajim/common/const.py:445
 #, fuzzy
 msgid "bearing"
 msgstr "海洋"
 
-#: gajim/common/const.py:412
+#: gajim/common/const.py:446
 #, fuzzy
 msgid "building"
 msgstr "藏起來"
 
-#: gajim/common/const.py:413
+#: gajim/common/const.py:447
 #, fuzzy
 msgid "country"
 msgstr "帳號"
 
-#: gajim/common/const.py:414
+#: gajim/common/const.py:448
 #, fuzzy
 msgid "countrycode"
 msgstr "帳號"
 
-#: gajim/common/const.py:415
+#: gajim/common/const.py:449
 msgid "datum"
 msgstr ""
 
-#: gajim/common/const.py:416
+#: gajim/common/const.py:450
 #, fuzzy
 msgid "description"
 msgstr "描述"
 
-#: gajim/common/const.py:417
+#: gajim/common/const.py:451
 #, fuzzy
 msgid "error"
 msgstr "錯誤"
 
-#: gajim/common/const.py:418
+#: gajim/common/const.py:452
 msgid "floor"
 msgstr ""
 
-#: gajim/common/const.py:419
+#: gajim/common/const.py:453
 msgid "lat"
 msgstr ""
 
-#: gajim/common/const.py:420
+#: gajim/common/const.py:454
 msgid "locality"
 msgstr ""
 
-#: gajim/common/const.py:421
+#: gajim/common/const.py:455
 #, fuzzy
 msgid "lon"
 msgstr "一"
 
-#: gajim/common/const.py:422
+#: gajim/common/const.py:456
 msgid "postalcode"
 msgstr ""
 
-#: gajim/common/const.py:423
+#: gajim/common/const.py:457
 msgid "region"
 msgstr ""
 
-#: gajim/common/const.py:424
+#: gajim/common/const.py:458
 msgid "room"
 msgstr "聊天室"
 
-#: gajim/common/const.py:425
+#: gajim/common/const.py:459
 msgid "speed"
 msgstr ""
 
-#: gajim/common/const.py:426
+#: gajim/common/const.py:460
 #, fuzzy
 msgid "street"
 msgstr "stream"
 
-#: gajim/common/const.py:427
+#: gajim/common/const.py:461
 msgid "text"
 msgstr ""
 
-#: gajim/common/const.py:428
+#: gajim/common/const.py:462
 msgid "timestamp"
 msgstr ""
 
-#: gajim/common/const.py:429
+#: gajim/common/const.py:463
 msgid "URI"
 msgstr ""
 
-#: gajim/common/const.py:434
+#: gajim/common/const.py:468
 msgid "Unable to get issuer certificate"
 msgstr "無法獲得發行者的證書"
 
-#: gajim/common/const.py:435
+#: gajim/common/const.py:469
 msgid "Unable to get certificate CRL"
 msgstr "無法獲得證書吊銷清單"
 
-#: gajim/common/const.py:436
+#: gajim/common/const.py:470
 msgid "Unable to decrypt certificate's signature"
 msgstr "無法解密證書籤名稱"
 
-#: gajim/common/const.py:437
+#: gajim/common/const.py:471
 msgid "Unable to decrypt CRL's signature"
 msgstr "無法解密證書吊銷清單的簽名"
 
-#: gajim/common/const.py:438
+#: gajim/common/const.py:472
 msgid "Unable to decode issuer public key"
 msgstr "無法解碼發行者的公鑰"
 
-#: gajim/common/const.py:439
+#: gajim/common/const.py:473
 msgid "Certificate signature failure"
 msgstr "證書籤名稱失敗"
 
-#: gajim/common/const.py:440
+#: gajim/common/const.py:474
 msgid "CRL signature failure"
 msgstr "吊銷證書清單簽名失敗"
 
-#: gajim/common/const.py:441
+#: gajim/common/const.py:475
 msgid "Certificate is not yet valid"
 msgstr "證書還未生效"
 
-#: gajim/common/const.py:442
+#: gajim/common/const.py:476
 msgid "Certificate has expired"
 msgstr "證書已過期"
 
-#: gajim/common/const.py:443
+#: gajim/common/const.py:477
 msgid "CRL is not yet valid"
 msgstr "證書吊銷清單還未生效"
 
-#: gajim/common/const.py:444
+#: gajim/common/const.py:478
 msgid "CRL has expired"
 msgstr "證書吊銷清單已過期"
 
-#: gajim/common/const.py:445
+#: gajim/common/const.py:479
 msgid "Format error in certificate's notBefore field"
 msgstr "格式錯誤，在證書的'不早於'欄位"
 
-#: gajim/common/const.py:446
+#: gajim/common/const.py:480
 msgid "Format error in certificate's notAfter field"
 msgstr "格式錯誤，在證書的'不遲於'欄位"
 
-#: gajim/common/const.py:447
+#: gajim/common/const.py:481
 msgid "Format error in CRL's lastUpdate field"
 msgstr "格式錯誤，在證書吊銷清單的'最後更新'欄位"
 
-#: gajim/common/const.py:448
+#: gajim/common/const.py:482
 msgid "Format error in CRL's nextUpdate field"
 msgstr "格式錯誤，在證書吊銷清單的'下次更新'欄位"
 
-#: gajim/common/const.py:449
+#: gajim/common/const.py:483
 msgid "Out of memory"
 msgstr "記憶體耗盡"
 
-#: gajim/common/const.py:450
+#: gajim/common/const.py:484
 msgid "Self signed certificate"
 msgstr "自簽名的證書"
 
-#: gajim/common/const.py:451
+#: gajim/common/const.py:485
 msgid "Self signed certificate in certificate chain"
 msgstr "自簽名的證書，在證書鏈中"
 
-#: gajim/common/const.py:452
+#: gajim/common/const.py:486
 msgid "Unable to get local issuer certificate"
 msgstr "無法獲得本地發行者證書"
 
-#: gajim/common/const.py:453
+#: gajim/common/const.py:487
 msgid "Unable to verify the first certificate"
 msgstr "無法驗證第一個證書"
 
-#: gajim/common/const.py:454
+#: gajim/common/const.py:488
 msgid "Certificate chain too long"
 msgstr "證書鏈太長"
 
-#: gajim/common/const.py:455
+#: gajim/common/const.py:489
 msgid "Certificate revoked"
 msgstr "證書已被吊銷"
 
-#: gajim/common/const.py:456
+#: gajim/common/const.py:490
 msgid "Invalid CA certificate"
 msgstr "無效的 CA 證書"
 
-#: gajim/common/const.py:457
+#: gajim/common/const.py:491
 msgid "Path length constraint exceeded"
 msgstr "超過了路徑長度限制"
 
-#: gajim/common/const.py:458
+#: gajim/common/const.py:492
 msgid "Unsupported certificate purpose"
 msgstr "不支援的證書用途"
 
-#: gajim/common/const.py:459
+#: gajim/common/const.py:493
 msgid "Certificate not trusted"
 msgstr "不被信任的證書"
 
-#: gajim/common/const.py:460
+#: gajim/common/const.py:494
 msgid "Certificate rejected"
 msgstr "證書被拒絕"
 
-#: gajim/common/const.py:461
+#: gajim/common/const.py:495
 msgid "Subject issuer mismatch"
 msgstr "Subject 與 發行者 不匹配"
 
-#: gajim/common/const.py:462
+#: gajim/common/const.py:496
 msgid "Authority and subject key identifier mismatch"
 msgstr "Authority 與 subject key identifier 不匹配"
 
-#: gajim/common/const.py:463
+#: gajim/common/const.py:497
 msgid "Authority and issuer serial number mismatch"
 msgstr "Authority 與 發行者序號 不匹配"
 
-#: gajim/common/const.py:464
+#: gajim/common/const.py:498
 msgid "Key usage does not include certificate signing"
 msgstr "密鑰用途中不包含證書籤名稱"
 
-#: gajim/common/const.py:465
+#: gajim/common/const.py:499
 msgid "Application verification failure"
 msgstr "應用程式驗證失敗"
 
@@ -5038,260 +5177,260 @@ msgstr "視訊輸入"
 msgid "video output"
 msgstr "視訊輸出"
 
-#: gajim/common/helpers.py:210
+#: gajim/common/helpers.py:216
 #, fuzzy
 msgid "Server must be between 1 and 1023 bytes"
 msgstr "伺服器名稱必須在 1 到 1023 個字元之間"
 
-#: gajim/common/helpers.py:214
+#: gajim/common/helpers.py:220
 msgid "Invalid character in hostname."
 msgstr "主機名稱中有無效的字元。"
 
-#: gajim/common/helpers.py:216
+#: gajim/common/helpers.py:222
 msgid "Server address required."
 msgstr "伺服器的位址是必須的。"
 
-#: gajim/common/helpers.py:220
+#: gajim/common/helpers.py:226
 #, fuzzy
 msgid "Username must be between 1 and 1023 bytes"
 msgstr "使用者名稱必須在 1 到 1023 個字元之間"
 
-#: gajim/common/helpers.py:224
+#: gajim/common/helpers.py:230
 msgid "Invalid character in username."
 msgstr "在使用者名稱中有無效的字元。"
 
-#: gajim/common/helpers.py:230
+#: gajim/common/helpers.py:236
 #, fuzzy
 msgid "Resource must be between 1 and 1023 bytes"
 msgstr "資源必須在 1 到 1023 個字元之間"
 
-#: gajim/common/helpers.py:234
+#: gajim/common/helpers.py:240
 msgid "Invalid character in resource."
 msgstr "資源中含有無效字元。"
 
-#: gajim/common/helpers.py:275
+#: gajim/common/helpers.py:281
 msgid "_Busy"
 msgstr "忙碌(_B)"
 
-#: gajim/common/helpers.py:277 gajim/gtk/tooltips.py:647
+#: gajim/common/helpers.py:283 gajim/gtk/tooltips.py:647
 msgid "Busy"
 msgstr "忙碌"
 
-#: gajim/common/helpers.py:280
+#: gajim/common/helpers.py:286
 msgid "_Not Available"
 msgstr "離開很久了(_N)"
 
-#: gajim/common/helpers.py:282 gajim/gtk/tooltips.py:649
+#: gajim/common/helpers.py:288 gajim/gtk/tooltips.py:649
 msgid "Not Available"
 msgstr "離開很久了"
 
-#: gajim/common/helpers.py:285
+#: gajim/common/helpers.py:291
 msgid "_Free for Chat"
 msgstr "和我聊天吧(_F)"
 
-#: gajim/common/helpers.py:287 gajim/gtk/tooltips.py:643
+#: gajim/common/helpers.py:293 gajim/gtk/tooltips.py:643
 msgid "Free for Chat"
 msgstr "和我聊天吧"
 
-#: gajim/common/helpers.py:290
+#: gajim/common/helpers.py:296
 msgid "?user status:_Available"
 msgstr "線上(_A)"
 
-#: gajim/common/helpers.py:292 gajim/gtk/tooltips.py:641
+#: gajim/common/helpers.py:298 gajim/gtk/tooltips.py:641
 msgid "?user status:Available"
 msgstr "線上"
 
-#: gajim/common/helpers.py:294
+#: gajim/common/helpers.py:300
 msgid "Connecting"
 msgstr "正在連線"
 
-#: gajim/common/helpers.py:297 gajim/data/gui/preferences_window.ui:1251
+#: gajim/common/helpers.py:303 gajim/data/gui/preferences_window.ui:1251
 msgid "A_way"
 msgstr "離開(_A)"
 
-#: gajim/common/helpers.py:299 gajim/common/modules/adhoc_commands.py:120
-#: gajim/command_system/implementation/standard.py:139
+#: gajim/common/helpers.py:305 gajim/common/modules/adhoc_commands.py:120
+#: gajim/command_system/implementation/standard.py:141
 #: gajim/gtk/tooltips.py:645
 msgid "Away"
 msgstr "離開"
 
-#: gajim/common/helpers.py:302
+#: gajim/common/helpers.py:308
 msgid "_Offline"
 msgstr "離線(_O)"
 
-#: gajim/common/helpers.py:304 gajim/gtk/tooltips.py:651
+#: gajim/common/helpers.py:310 gajim/gtk/tooltips.py:651
 msgid "Offline"
 msgstr "離線"
 
-#: gajim/common/helpers.py:307
+#: gajim/common/helpers.py:313
 msgid "_Invisible"
 msgstr "隱身(_I)"
 
-#: gajim/common/helpers.py:313
+#: gajim/common/helpers.py:319
 msgid "?contact has status:Unknown"
 msgstr "不明"
 
-#: gajim/common/helpers.py:315
+#: gajim/common/helpers.py:321
 msgid "?contact has status:Has errors"
 msgstr "有錯誤"
 
-#: gajim/common/helpers.py:330
+#: gajim/common/helpers.py:336
 msgid "?Subscription we already have:None"
 msgstr "無"
 
-#: gajim/common/helpers.py:332
+#: gajim/common/helpers.py:338
 msgid "To"
 msgstr "To"
 
-#: gajim/common/helpers.py:334 gajim/data/gui/groups_post_window.ui:33
+#: gajim/common/helpers.py:340 gajim/data/gui/groups_post_window.ui:33
 msgid "From"
 msgstr "From"
 
-#: gajim/common/helpers.py:336
+#: gajim/common/helpers.py:342
 msgid "Both"
 msgstr "Both"
 
-#: gajim/common/helpers.py:338 gajim/gtk/server_info.py:151
+#: gajim/common/helpers.py:344 gajim/gtk/server_info.py:151
 #, fuzzy
 msgid "Unknown"
 msgstr "不明"
 
-#: gajim/common/helpers.py:344
+#: gajim/common/helpers.py:350
 msgid "?Ask (for Subscription):None"
 msgstr "無"
 
-#: gajim/common/helpers.py:346
+#: gajim/common/helpers.py:352
 msgid "Subscribe"
 msgstr "認證"
 
-#: gajim/common/helpers.py:355
+#: gajim/common/helpers.py:361
 msgid "?Group Chat Contact Role:None"
 msgstr "無"
 
-#: gajim/common/helpers.py:358
+#: gajim/common/helpers.py:364
 msgid "Moderators"
 msgstr "主持人"
 
-#: gajim/common/helpers.py:360
+#: gajim/common/helpers.py:366
 msgid "Moderator"
 msgstr "主持人"
 
-#: gajim/common/helpers.py:363
+#: gajim/common/helpers.py:369 gajim/data/gui/groupchat_info_scrolled.ui:243
 msgid "Participants"
 msgstr "參與者"
 
-#: gajim/common/helpers.py:365
+#: gajim/common/helpers.py:371
 msgid "Participant"
 msgstr "參與者"
 
-#: gajim/common/helpers.py:368
+#: gajim/common/helpers.py:374
 msgid "Visitors"
 msgstr "訪客"
 
-#: gajim/common/helpers.py:370
+#: gajim/common/helpers.py:376
 msgid "Visitor"
 msgstr "訪客"
 
-#: gajim/common/helpers.py:376 gajim/gtk/tooltips.py:253
+#: gajim/common/helpers.py:382 gajim/gtk/tooltips.py:253
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "無"
 
-#: gajim/common/helpers.py:378 gajim/data/gui/groupchat_config.ui:32
+#: gajim/common/helpers.py:384 gajim/data/gui/groupchat_config.ui:32
 #: gajim/gtk/tooltips.py:259
 msgid "Owner"
 msgstr "所有者"
 
-#: gajim/common/helpers.py:380 gajim/gtk/tooltips.py:257
+#: gajim/common/helpers.py:386 gajim/gtk/tooltips.py:257
 msgid "Administrator"
 msgstr "管理員"
 
-#: gajim/common/helpers.py:382 gajim/data/gui/groupchat_config.ui:40
+#: gajim/common/helpers.py:388 gajim/data/gui/groupchat_config.ui:40
 #: gajim/gtk/tooltips.py:255 gajim/gtk/groupchat_config.py:105
 msgid "Member"
 msgstr "成員"
 
-#: gajim/common/helpers.py:421
+#: gajim/common/helpers.py:427
 msgid "is paying attention to the conversation"
 msgstr "注意著與您的對話"
 
-#: gajim/common/helpers.py:423
+#: gajim/common/helpers.py:429
 msgid "is doing something else"
 msgstr "在做其他事情"
 
-#: gajim/common/helpers.py:425
+#: gajim/common/helpers.py:431
 #, fuzzy
 msgid "is composing a message…"
 msgstr "正在輸入訊息…"
 
-#: gajim/common/helpers.py:428
+#: gajim/common/helpers.py:434
 msgid "paused composing a message"
 msgstr "暫停輸入訊息"
 
-#: gajim/common/helpers.py:430
+#: gajim/common/helpers.py:436
 msgid "has closed the chat window or tab"
 msgstr "關閉了聊天視窗或標籤"
 
-#: gajim/common/helpers.py:936 gajim/common/helpers.py:943
+#: gajim/common/helpers.py:942 gajim/common/helpers.py:949
 #, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
 msgstr[0] "%d 條訊息未處理"
 
-#: gajim/common/helpers.py:950
+#: gajim/common/helpers.py:956
 #, fuzzy, python-format
-msgid "from room %s"
-msgstr " 來自聊天室 %s"
+msgid "from group chat %s"
+msgstr "在多人聊天視窗中(_G)"
 
-#: gajim/common/helpers.py:953 gajim/common/helpers.py:970
+#: gajim/common/helpers.py:959 gajim/common/helpers.py:976
 #, fuzzy, python-format
 msgid "from user %s"
 msgstr " 來自使用者 %s"
 
-#: gajim/common/helpers.py:955
+#: gajim/common/helpers.py:961
 #, fuzzy, python-format
 msgid "from %s"
 msgstr " 來自 %s"
 
-#: gajim/common/helpers.py:962 gajim/common/helpers.py:968
+#: gajim/common/helpers.py:968 gajim/common/helpers.py:974
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
 msgstr[0] "%d 個未處理事件"
 
-#: gajim/common/helpers.py:986 gajim/common/helpers.py:998
+#: gajim/common/helpers.py:992 gajim/common/helpers.py:1004
 #: gajim/data/gui/roster_window.ui:85 data/org.gajim.Gajim.desktop.in:4
 #: data/org.gajim.Gajim.appdata.xml.in:9
 msgid "Gajim"
 msgstr "Gajim"
 
-#: gajim/common/helpers.py:1000
+#: gajim/common/helpers.py:1006
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: gajim/common/helpers.py:1109 gajim/data/gui/add_new_contact_window.ui:25
+#: gajim/common/helpers.py:1115 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:1111
+#: gajim/common/helpers.py:1117
 msgid "Hello, I am $name."
 msgstr "您好，我是$name"
 
-#: gajim/common/helpers.py:1215 gajim/common/helpers.py:1224
-#: gajim/common/helpers.py:1282
+#: gajim/common/helpers.py:1221 gajim/common/helpers.py:1230
+#: gajim/common/helpers.py:1288
 msgid "Timeout loading image"
 msgstr "讀取檔案逾時"
 
-#: gajim/common/helpers.py:1234 gajim/common/helpers.py:1280
+#: gajim/common/helpers.py:1240 gajim/common/helpers.py:1286
 msgid "Image is too big"
 msgstr "圖片太大"
 
-#: gajim/common/helpers.py:1245
+#: gajim/common/helpers.py:1251
 #, fuzzy
 msgid "PyCURL is not installed"
 msgstr "證書吊銷清單還未生效"
 
-#: gajim/common/helpers.py:1284
+#: gajim/common/helpers.py:1290
 #, fuzzy
 msgid "Error loading image"
 msgstr "讀取檔案逾時"
@@ -5468,7 +5607,8 @@ msgstr "狀態發生了變化。"
 
 #: gajim/common/modules/adhoc_commands.py:202
 #: gajim/common/modules/adhoc_commands.py:239
-msgid "Leave Groupchats"
+#, fuzzy
+msgid "Leave Group Chats"
 msgstr "離開聊天室"
 
 #: gajim/common/modules/adhoc_commands.py:228
@@ -5477,15 +5617,18 @@ msgid "%(nickname)s on %(room_jid)s"
 msgstr "聊天室 %(room_jid)s 的 %(nickname)s"
 
 #: gajim/common/modules/adhoc_commands.py:232
-msgid "You have not joined a groupchat."
+#, fuzzy
+msgid "You have not joined a group chat."
 msgstr "您還沒有加入聊天室。"
 
 #: gajim/common/modules/adhoc_commands.py:240
-msgid "Choose the groupchats you want to leave"
+#, fuzzy
+msgid "Choose the group chats you want to leave"
 msgstr "選擇您想要離開的聊天室"
 
 #: gajim/common/modules/adhoc_commands.py:289
-msgid "You left the following groupchats:"
+#, fuzzy
+msgid "You left the following group chats:"
 msgstr "您離開了下列聊天室:"
 
 #: gajim/common/modules/roster_item_exchange.py:102
@@ -5501,7 +5644,7 @@ msgstr "已傳送聯絡人:"
 msgid "Blocked Contacts"
 msgstr "被阻斷的聯絡人"
 
-#: gajim/data/gui/destroy_muc_dialog.ui:79 gajim/gtk/dialogs.py:736
+#: gajim/data/gui/destroy_muc_dialog.ui:79 gajim/gtk/dialogs.py:563
 msgid "Destroy this group chat permanently?"
 msgstr ""
 
@@ -5510,7 +5653,7 @@ msgstr ""
 msgid "Reason..."
 msgstr "原因"
 
-#: gajim/data/gui/destroy_muc_dialog.ui:124 gajim/gtk/dialogs.py:738
+#: gajim/data/gui/destroy_muc_dialog.ui:124 gajim/gtk/dialogs.py:565
 msgid "Where participants should go (optional)"
 msgstr ""
 
@@ -5523,33 +5666,6 @@ msgstr ""
 msgid "_Reason and alternate venue (optional)"
 msgstr "您也可以輸入一個可選的替代地點:"
 
-#: gajim/data/gui/advanced_configuration_window.ui:7
-#: gajim/data/gui/preferences_window.ui:2723
-#, fuzzy
-msgid "Advanced Configuration Editor (ACE)"
-msgstr "進階設定編輯器"
-
-#: gajim/data/gui/advanced_configuration_window.ui:52
-#, fuzzy
-msgid "You should restart Gajim for some changes to take effect"
-msgstr "<b>注意:</b>您必須重新啟動 gajim 以使某些設定生效"
-
-#: gajim/data/gui/advanced_configuration_window.ui:84
-#, fuzzy
-msgid "_Filter"
-msgstr "過濾器:"
-
-#: gajim/data/gui/advanced_configuration_window.ui:153
-#: gajim/data/gui/filetransfers_send_file_dialog.ui:15
-#: gajim/gtk/discovery.py:1666
-msgid "Description"
-msgstr "描述"
-
-#: gajim/data/gui/advanced_configuration_window.ui:197
-#, fuzzy
-msgid "_Reset to default"
-msgstr "恢復為預設顏色設定(_R)"
-
 #: gajim/data/gui/join_groupchat_window.ui:56
 #: gajim/data/gui/chat_to_muc_window.ui:67
 #: gajim/data/gui/chat_to_muc_window.ui:78
@@ -5561,9 +5677,8 @@ msgid "Join group chat every time Gajim is started"
 msgstr ""
 
 #: gajim/data/gui/join_groupchat_window.ui:113
-#, fuzzy
-msgid "Auto Join"
-msgstr "自動聯結(_U)"
+msgid "Join Automatically"
+msgstr ""
 
 #: gajim/data/gui/join_groupchat_window.ui:131
 #: gajim/data/gui/profile_window.ui:233
@@ -5572,10 +5687,11 @@ msgstr "帳號"
 
 #: gajim/data/gui/join_groupchat_window.ui:147
 #, fuzzy
-msgid "Room"
-msgstr "聊天室:"
+msgid "Group chat"
+msgstr "多人聊天"
 
-#: gajim/data/gui/join_groupchat_window.ui:180 gajim/gtk/accounts.py:886
+#: gajim/data/gui/join_groupchat_window.ui:180 gajim/data/gui/bookmarks.ui:158
+#: gajim/gtk/accounts.py:889
 #, fuzzy
 msgid "Password"
 msgstr "密碼:"
@@ -5599,90 +5715,11 @@ msgstr "在多人聊天視窗中(_G)"
 msgid "Search group chats on selected server"
 msgstr ""
 
-#: gajim/data/gui/join_groupchat_window.ui:437 gajim/gtk/discovery.py:1271
+#: gajim/data/gui/join_groupchat_window.ui:437 gajim/gtk/discovery.py:1270
 #, fuzzy
 msgid "Join"
 msgstr "加入(_J)"
 
-#: gajim/data/gui/manage_proxies_window.ui:12
-msgid "HTTP Connect"
-msgstr "HTTP 連線"
-
-#: gajim/data/gui/manage_proxies_window.ui:15
-msgid "SOCKS5"
-msgstr "SOCKS5"
-
-#: gajim/data/gui/manage_proxies_window.ui:18
-msgid "BOSH"
-msgstr "BOSH"
-
-#: gajim/data/gui/manage_proxies_window.ui:27
-msgid "Manage Proxy Profiles"
-msgstr "管理代理伺服器設定"
-
-#: gajim/data/gui/manage_proxies_window.ui:83
-#, fuzzy
-msgid "Add Proxy"
-msgstr "代理伺服器(_Y):"
-
-#: gajim/data/gui/manage_proxies_window.ui:97
-#, fuzzy
-msgid "Remove Proxy"
-msgstr "移除群組"
-
-#: gajim/data/gui/manage_proxies_window.ui:141
-#, fuzzy
-msgid "Properties"
-msgstr "<b>屬性</b>"
-
-#: gajim/data/gui/manage_proxies_window.ui:157
-#, fuzzy
-msgid "_Name"
-msgstr "名稱(_N):"
-
-#: gajim/data/gui/manage_proxies_window.ui:173
-#, fuzzy
-msgid "_Type"
-msgstr "類型(_T):"
-
-#: gajim/data/gui/manage_proxies_window.ui:236
-#, fuzzy
-msgid "_BOSH URL"
-msgstr "_BOSH URL:"
-
-#: gajim/data/gui/manage_proxies_window.ui:261
-msgid "Use HTTP prox_y"
-msgstr "使用 HTTP 代理(_Y)"
-
-#: gajim/data/gui/manage_proxies_window.ui:280
-#, fuzzy
-msgid "Proxy _Host"
-msgstr "代理伺服器位址(_H):"
-
-#: gajim/data/gui/manage_proxies_window.ui:307
-#, fuzzy
-msgid "Proxy _Port"
-msgstr "代理伺服器連接埠(_P):"
-
-#: gajim/data/gui/manage_proxies_window.ui:334
-#, fuzzy
-msgid "_Username"
-msgstr "使用者名稱(_U):"
-
-#: gajim/data/gui/manage_proxies_window.ui:347
-msgid "Use proxy auth_entication"
-msgstr "代理伺服器需要認證"
-
-#: gajim/data/gui/manage_proxies_window.ui:377
-#, fuzzy
-msgid "Pass_word"
-msgstr "密碼(_W)"
-
-#: gajim/data/gui/manage_proxies_window.ui:405 gajim/gtk/adhoc.py:321
-#, fuzzy
-msgid "Settings"
-msgstr "外掛程式"
-
 #: gajim/data/gui/change_password_dialog.ui:17
 #, fuzzy
 msgid "New Password"
@@ -5713,11 +5750,13 @@ msgid "Status:"
 msgstr "狀態:"
 
 #: gajim/data/gui/zeroconf_information_window.ui:89
-msgid "_Log conversation history"
+#, fuzzy
+msgid "_Store conversation history"
 msgstr "記錄聊天命令歷程(_L)"
 
 #: gajim/data/gui/zeroconf_information_window.ui:215
 #: gajim/data/gui/vcard_information_window.ui:390
+#: gajim/data/gui/groupchat_info_scrolled.ui:166
 msgid "Contact"
 msgstr "聯絡人"
 
@@ -5730,8 +5769,9 @@ msgid "Last Name:"
 msgstr "姓:"
 
 #: gajim/data/gui/zeroconf_information_window.ui:260
-msgid "Jabber ID:"
-msgstr "Jabber ID"
+#, fuzzy
+msgid "XMPP Address:"
+msgstr "AIM 位址:"
 
 #: gajim/data/gui/zeroconf_information_window.ui:273
 msgid "E-Mail:"
@@ -5751,8 +5791,9 @@ msgid "Send _File"
 msgstr "傳送檔案(_F)"
 
 #: gajim/data/gui/gc_occupants_menu.ui:29
-msgid "Occupant Actions"
-msgstr "室友動作"
+#, fuzzy
+msgid "Participant Actions"
+msgstr "參與者"
 
 #: gajim/data/gui/gc_occupants_menu.ui:38
 msgid "_Voice"
@@ -5783,8 +5824,9 @@ msgid "_Ban"
 msgstr "封禁(_B)"
 
 #: gajim/data/gui/gc_occupants_menu.ui:124
-msgid "_Add to Roster"
-msgstr "加入至聯絡人清單(_A)"
+#, fuzzy
+msgid "_Add to Contact List"
+msgstr "加入聯絡人(_A)…"
 
 #: gajim/data/gui/gc_occupants_menu.ui:132
 #, fuzzy
@@ -5824,11 +5866,6 @@ msgstr "認證: "
 msgid "_Status"
 msgstr "狀態(_S)"
 
-#: gajim/data/gui/zeroconf_context_menu.ui:26
-#: gajim/data/gui/account_context_menu.ui:79
-msgid "_Modify Account..."
-msgstr "修改帳號(_M)…"
-
 #: gajim/data/gui/certificate_dialog.ui:66
 #: gajim/data/gui/certificate_dialog.ui:178
 msgid "Common Name (CN)"
@@ -5911,13 +5948,19 @@ msgstr "Last modified:"
 msgid "Next entry"
 msgstr ""
 
+#: gajim/data/gui/filetransfers_send_file_dialog.ui:15
+#: gajim/data/gui/advanced_configuration.ui:143
+#: gajim/data/gui/groupchat_info_scrolled.ui:48 gajim/gtk/discovery.py:1663
+msgid "Description"
+msgstr "描述"
+
 #: gajim/data/gui/filetransfers_send_file_dialog.ui:54
 #, fuzzy
 msgid "_Send Files"
 msgstr "傳送檔案(_F)"
 
 #: gajim/data/gui/filetransfers_send_file_dialog.ui:58
-#: gajim/gtk/xml_console.py:90
+#: gajim/gtk/xml_console.py:87
 #, fuzzy
 msgid "Send"
 msgstr "傳送(_S)"
@@ -5942,20 +5985,23 @@ msgid "Change _Nickname..."
 msgstr "變更暱稱(_N)…"
 
 #: gajim/data/gui/gc_control_popup_menu.ui:20
-msgid "_Manage Room"
-msgstr "管理聊天室(_M)"
+#, fuzzy
+msgid "_Manage Group Chat"
+msgstr "新聊天室(_N)"
 
 #: gajim/data/gui/gc_control_popup_menu.ui:31
 msgid "Change _Subject..."
 msgstr "變更主題(_S)…"
 
 #: gajim/data/gui/gc_control_popup_menu.ui:38
-msgid "Configure _Room..."
-msgstr "設定聊天室(_R)…"
+#, fuzzy
+msgid "Configure _Group Chat..."
+msgstr "加入聊天室(_G)…"
 
 #: gajim/data/gui/gc_control_popup_menu.ui:52
-msgid "_Destroy Room"
-msgstr "刪除聊天室(_D)"
+#, fuzzy
+msgid "_Destroy Group Chat"
+msgstr "新聊天室(_N)"
 
 #: gajim/data/gui/gc_control_popup_menu.ui:64
 msgid "_Minimize on close"
@@ -5965,7 +6011,7 @@ msgstr "關閉時最小化視窗"
 msgid "_Request Voice"
 msgstr "要求語音(_R)"
 
-#: gajim/data/gui/gc_control_popup_menu.ui:99 gajim/gtk/discovery.py:1704
+#: gajim/data/gui/gc_control_popup_menu.ui:99
 msgid "_Bookmark"
 msgstr "將本聊天室加入書籤(_B)"
 
@@ -6017,13 +6063,6 @@ msgstr "首頁:"
 msgid "E-Mail"
 msgstr "E-Mail:"
 
-#: 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/blocking_list.ui:115 gajim/gtk/add_contact.py:30
-#: gajim/gtk/accounts.py:801
-msgid "Jabber ID"
-msgstr "Jabber ID"
-
 #: gajim/data/gui/profile_window.ui:440
 msgid "Main"
 msgstr ""
@@ -6156,36 +6195,44 @@ msgstr "工作"
 msgid "About"
 msgstr "關於"
 
-#: gajim/data/gui/start_chat_dialog.ui:114 gajim/gtk/discovery.py:1658
-msgid "Users"
-msgstr "使用者"
+#: gajim/data/gui/start_chat_dialog.ui:53
+#, fuzzy
+msgid "Global Group Chat Search"
+msgstr "加入多人聊天"
 
-#: gajim/data/gui/start_chat_dialog.ui:185
+#: 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
-msgid "Name:"
-msgstr "名稱: "
+msgid "_Back"
+msgstr "馬上回來"
 
-#: gajim/data/gui/start_chat_dialog.ui:197
-msgid "Description:"
-msgstr "描述:"
+#: gajim/data/gui/start_chat_dialog.ui:245
+#: gajim/data/gui/groupchat_control.ui:796
+#: gajim/data/gui/groupchat_control.ui:888 gajim/gtk/discovery.py:1701
+#: gajim/gtk/groupchat_join.py:62
+msgid "_Join"
+msgstr "加入(_J)"
 
-#: gajim/data/gui/start_chat_dialog.ui:209
+#: gajim/data/gui/start_chat_dialog.ui:289
 #, fuzzy
-msgid "Address:"
-msgstr "位址(_A):"
+msgid "Select Account"
+msgstr "移除帳號 %s"
 
-#: gajim/data/gui/start_chat_dialog.ui:246
-msgid ""
-"Semi-Anonymous\n"
-"<span size=\"small\">(Only moderators can see your XMPP-Address)</span>"
-msgstr ""
+#: gajim/data/gui/start_chat_dialog.ui:380
+#, fuzzy
+msgid "_Select"
+msgstr "清潔"
 
 #: gajim/data/gui/filetransfers.ui:21
 #, fuzzy
 msgid "Pa_use/Resume"
 msgstr "再續(_R)"
 
-#: gajim/data/gui/filetransfers.ui:30 gajim/gtk/filechoosers.py:178
+#: gajim/data/gui/filetransfers.ui:30 gajim/data/gui/groupchat_control.ui:575
+#: gajim/data/gui/groupchat_control.ui:667
+#: gajim/data/gui/groupchat_control.ui:779
+#: gajim/data/gui/groupchat_control.ui:871 gajim/gtk/filechoosers.py:178
 msgid "_Cancel"
 msgstr "取消(_C)"
 
@@ -6227,7 +6274,8 @@ msgid "Cancel the selected file transfer and remove incomplete files"
 msgstr "取消選取檔案傳輸並刪除未完成檔案"
 
 #: gajim/data/gui/filetransfers.ui:207
-msgid "Shows a list of file transfers between you and others"
+#, fuzzy
+msgid "Shows a list of file transfers between you and your contacts"
 msgstr "顯示您與他人進行的傳輸檔案清單"
 
 #: gajim/data/gui/groupchat_control.ui:13 gajim/data/gui/chat_control.ui:277
@@ -6247,7 +6295,6 @@ msgid "Strike"
 msgstr "劃去"
 
 #: gajim/data/gui/groupchat_control.ui:54 gajim/data/gui/chat_control.ui:318
-#: gajim/gtk/advanced_config.py:86
 msgid "Color"
 msgstr "Color"
 
@@ -6260,16 +6307,46 @@ msgstr "字型"
 msgid "Clear formatting"
 msgstr "清楚格式"
 
-#: gajim/data/gui/groupchat_control.ui:290 gajim/data/gui/chat_control.ui:880
+#: gajim/data/gui/groupchat_control.ui:291 gajim/data/gui/chat_control.ui:880
 #, fuzzy
 msgid "Choose encryption"
 msgstr "密碼加密"
 
-#: gajim/data/gui/groupchat_control.ui:336 gajim/data/gui/chat_control.ui:640
+#: gajim/data/gui/groupchat_control.ui:337 gajim/data/gui/chat_control.ui:640
 #, fuzzy
 msgid "Show a list of emojis (Alt+M)"
 msgstr "顯示表情清單(Alt+M)"
 
+#: gajim/data/gui/groupchat_control.ui:484
+#, fuzzy
+msgid "Joining…"
+msgstr "封禁…"
+
+#: gajim/data/gui/groupchat_control.ui:496
+msgid "_Abort"
+msgstr ""
+
+#: gajim/data/gui/groupchat_control.ui:542
+#, fuzzy
+msgid "Enter new nickname"
+msgstr "為聯絡人 %s 輸入新的暱稱"
+
+#: gajim/data/gui/groupchat_control.ui:592
+#: gajim/data/gui/groupchat_control.ui:684
+#, fuzzy
+msgid "Ch_ange"
+msgstr "變更暱稱(_N)…"
+
+#: gajim/data/gui/groupchat_control.ui:761
+#, fuzzy
+msgid "Enter password"
+msgstr "輸入新的密碼"
+
+#: gajim/data/gui/groupchat_control.ui:1067
+#, fuzzy
+msgid "_Try again"
+msgstr "重新驗證…"
+
 #: gajim/data/gui/popup_notification_window.ui:42
 msgid "Event Type"
 msgstr "事件類型"
@@ -6348,8 +6425,8 @@ msgstr "總是"
 
 #: gajim/data/gui/mam_preferences.ui:18
 #, fuzzy
-msgid "Roster"
-msgstr "顯示聯絡人清單(_R)"
+msgid "Contact List"
+msgstr "聯絡人"
 
 #: gajim/data/gui/mam_preferences.ui:22
 #: gajim/data/gui/preferences_window.ui:123
@@ -6373,12 +6450,12 @@ msgid "Add"
 msgstr "加入"
 
 #: gajim/data/gui/mam_preferences.ui:194 gajim/data/gui/groupchat_config.ui:151
-#: gajim/gtk/dialogs.py:63 gajim/gtk/accounts.py:381
+#: gajim/gtk/dialogs.py:62 gajim/gtk/accounts.py:384
 #, fuzzy
 msgid "Remove"
 msgstr "移除(_R)"
 
-#: gajim/data/gui/vcard_information_window.ui:72 gajim/gtk/accounts.py:753
+#: gajim/data/gui/vcard_information_window.ui:72 gajim/gtk/accounts.py:756
 #, fuzzy
 msgid "Resource"
 msgstr "資源:"
@@ -6430,6 +6507,7 @@ msgstr "認證: "
 #: gajim/data/gui/vcard_information_window.ui:974
 #: gajim/data/gui/vcard_information_window.ui:993
 #: gajim/data/gui/vcard_information_window.ui:1427
+#: gajim/data/gui/groupchat_info_scrolled.ui:222
 msgid "button"
 msgstr ""
 
@@ -6458,15 +6536,18 @@ msgid "Notify me about it"
 msgstr "提醒我"
 
 #: gajim/data/gui/preferences_window.ui:58
-msgid "Show only in roster"
-msgstr "只顯示在聯絡人清單中"
+#, fuzzy
+msgid "Show only in contact list"
+msgstr "只顯示活動的聯絡人(_A)"
 
 #: gajim/data/gui/preferences_window.ui:69
-msgid "Detached roster with detached chats"
+#, fuzzy
+msgid "Detached contact list with detached chats"
 msgstr "聊天視窗與聯絡人清單分離，且互相分離"
 
 #: gajim/data/gui/preferences_window.ui:72
-msgid "Detached roster with single chat"
+#, fuzzy
+msgid "Detached contact list with single chat"
 msgstr "單一聊天視窗，與聯絡人清單分離"
 
 #: gajim/data/gui/preferences_window.ui:75
@@ -6474,11 +6555,13 @@ msgid "Single window for everything"
 msgstr "只使用單一視窗"
 
 #: gajim/data/gui/preferences_window.ui:78
-msgid "Detached roster with chat grouped by account"
+#, fuzzy
+msgid "Detached contact list with chat grouped by account"
 msgstr "聊天視窗與聯絡人清單分離，依據帳號分組"
 
 #: gajim/data/gui/preferences_window.ui:81
-msgid "Detached roster with chat grouped by type"
+#, fuzzy
+msgid "Detached contact list with chat grouped by type"
 msgstr "聊天視窗與聯絡人清單分離，依據類型分組"
 
 #: gajim/data/gui/preferences_window.ui:92
@@ -6529,7 +6612,7 @@ msgstr "視窗行為(_W)"
 
 #: gajim/data/gui/preferences_window.ui:296
 #, fuzzy
-msgid "_Show roster on startup"
+msgid "_Show contact list on startup"
 msgstr "啟動時顯示名冊(_S):"
 
 #: gajim/data/gui/preferences_window.ui:311
@@ -6545,12 +6628,12 @@ msgid "_Tabs placement"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:363
-msgid "_Quit Gajim when closing roster window"
+msgid "_Quit Gajim when closing contact list"
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:367
 msgid ""
-"If enabled, Gajim will quit when closing the roster window instead of "
+"If enabled, Gajim will quit when closing the contact list window instead of "
 "minimizing to the system's notification area"
 msgstr ""
 
@@ -6560,40 +6643,41 @@ msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:423
 #, fuzzy
-msgid "Show a_vatars of contacts in roster"
+msgid "Show a_vatars of contacts in contact list"
 msgstr "在聯絡人清單顯示中聯絡人的頭像(_V)"
 
 #: gajim/data/gui/preferences_window.ui:427
 #, fuzzy
 msgid ""
-"If checked, avatars of contacts will be shown in the roster window and in "
-"group chats"
+"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
 #, fuzzy
-msgid "Show status _messages of contacts in roster"
+msgid "Show status _messages of contacts in contact list"
 msgstr "在聯絡人清單中顯示聯絡人的狀態資訊(_M)"
 
 #: gajim/data/gui/preferences_window.ui:445
 #, fuzzy
 msgid ""
 "If checked, status messages of contacts will be shown under the contact's "
-"name, in the roster window, and in group chats"
+"name, in the contact list window, and in group chats"
 msgstr ""
 "如果選取，Gajim 會在聯絡人清單和多人聊天視窗中聯絡人名稱下方顯示聯絡人狀態訊"
 "息"
 
 #: gajim/data/gui/preferences_window.ui:459
 #, fuzzy
-msgid "Show e_xtra information of contacts in roster (mood, activity, ...)"
+msgid ""
+"Show e_xtra information of contacts in contact list (mood, activity, ...)"
 msgstr "在聯絡人清單中顯示聯絡人的位置資訊(_L)"
 
 #: gajim/data/gui/preferences_window.ui:463
 msgid ""
-"If checked, additional info published by the contact will be shown in "
-"roster. Additional infos (published via PEP) may include e.g. mood, "
+"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 ""
 
@@ -6602,8 +6686,9 @@ msgid "Sort contacts by status"
 msgstr "將聯絡人按狀態排序"
 
 #: gajim/data/gui/preferences_window.ui:494
-msgid "in _roster"
-msgstr "在聯絡人清單中(_R)"
+#, fuzzy
+msgid "in _contact list"
+msgstr "已傳送聯絡人:"
 
 #: gajim/data/gui/preferences_window.ui:511
 msgid "in _group chats"
@@ -6611,8 +6696,8 @@ msgstr "在多人聊天視窗中(_G)"
 
 #: gajim/data/gui/preferences_window.ui:540
 #, fuzzy
-msgid "Roster Appearance"
-msgstr "<b>聯絡人清單外觀</b>"
+msgid "Contact List Appearance"
+msgstr "聯絡人清單項交換"
 
 #: gajim/data/gui/preferences_window.ui:585
 #, fuzzy
@@ -6678,7 +6763,7 @@ msgstr "無法加入聊天室"
 
 #: gajim/data/gui/preferences_window.ui:660
 #, fuzzy
-msgid "If checked, the room subject will be shown when joining a group chat"
+msgid "If checked, the subject will be shown when joining a group chat"
 msgstr "無法加入聊天室"
 
 #: gajim/data/gui/preferences_window.ui:682
@@ -6693,13 +6778,13 @@ msgstr ""
 #: gajim/data/gui/preferences_window.ui:701
 msgid ""
 "If join/leave status messages are shown in the group chat. This setting can "
-"be overridden in the groupchat menu."
+"be overridden in the group chat menu."
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:720
 msgid ""
 "The default sync threshold for new public group chats. This setting can be "
-"overridden in the groupchat menu."
+"overridden in the group chat menu."
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:722
@@ -6714,7 +6799,7 @@ msgstr "記錄聯絡人狀態變化(_L)"
 #: gajim/data/gui/preferences_window.ui:768
 msgid ""
 "If status change messages are shown in the group chat. This setting can be "
-"overridden in the groupchat menu."
+"overridden in the group chat menu."
 msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:825
@@ -6731,8 +6816,8 @@ msgstr "如果選取，Gajim 會允許他人偵測到您所使用的作業系統
 
 #: gajim/data/gui/preferences_window.ui:843
 #, fuzzy
-msgid "Show chatstate in roster"
-msgstr "在聯絡人清單顯示中聯絡人的頭像(_V)"
+msgid "Show chatstate in contact list"
+msgstr "在標籤上顯示關閉按鈕?"
 
 #: gajim/data/gui/preferences_window.ui:847
 msgid ""
@@ -7034,7 +7119,7 @@ msgstr "視訊尺寸"
 msgid "Vi_ew own video source"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2281 gajim/gtk/accounts.py:352
+#: gajim/data/gui/preferences_window.ui:2281 gajim/gtk/accounts.py:355
 msgid "Connection"
 msgstr "連線"
 
@@ -7090,7 +7175,8 @@ msgid "_Manage..."
 msgstr "管理…"
 
 #: gajim/data/gui/preferences_window.ui:2616
-msgid "_Log status changes of contacts"
+#, fuzzy
+msgid "_Store status changes of contacts in history"
 msgstr "記錄聯絡人狀態變化(_L)"
 
 #: gajim/data/gui/preferences_window.ui:2633
@@ -7115,10 +7201,15 @@ msgstr ""
 msgid "_Open..."
 msgstr "開啟(_O)…"
 
+#: gajim/data/gui/preferences_window.ui:2723 gajim/gtk/advanced_config.py:84
+#, fuzzy
+msgid "Advanced Configuration Editor (ACE)"
+msgstr "進階設定編輯器"
+
 #: gajim/data/gui/groupchat_config.ui:55
 #, fuzzy
 msgid ""
-"<b>Jabber-ID</b>\n"
+"<b>XMPP Address</b>\n"
 "&lt;user@domain/resource&gt; (only that resource matches)\n"
 "&lt;user@domain&gt; (any resource matches)\n"
 "&lt;domain/resource&gt; (only that resource matches)\n"
@@ -7137,7 +7228,8 @@ msgstr ""
 msgid "Only Admins and Owners can modify the affiliation"
 msgstr ""
 
-#: gajim/data/gui/groupchat_config.ui:270 gajim/plugins/gui.py:312
+#: gajim/data/gui/groupchat_config.ui:270
+#: gajim/data/gui/groupchat_info_scrolled.ui:210 gajim/plugins/gui.py:324
 msgid "Configuration"
 msgstr "組態"
 
@@ -7169,7 +7261,7 @@ msgid "Start _Chat"
 msgstr "開始聊天(_C)"
 
 #: gajim/data/gui/contact_context_menu.ui:20
-#: gajim/data/gui/systray_context_menu.ui:36
+#: gajim/data/gui/systray_context_menu.ui:29
 msgid "Send Single _Message..."
 msgstr "傳送單條訊息(_M)…"
 
@@ -7230,17 +7322,43 @@ msgid "_Ignore"
 msgstr "忽略(_I)"
 
 #: gajim/data/gui/contact_context_menu.ui:174
-msgid "_Add to Roster..."
-msgstr "加入至聯絡人清單(_A)…"
+#, fuzzy
+msgid "_Add to Contact List..."
+msgstr "加入聯絡人(_A)…"
+
+#: gajim/data/gui/advanced_configuration.ui:39
+#, fuzzy
+msgid "You should restart Gajim for some changes to take effect"
+msgstr "<b>注意:</b>您必須重新啟動 gajim 以使某些設定生效"
+
+#: gajim/data/gui/advanced_configuration.ui:71
+#, fuzzy
+msgid "_Filter"
+msgstr "過濾器:"
+
+#: gajim/data/gui/advanced_configuration.ui:88
+msgid "Type to search for values..."
+msgstr ""
+
+#: gajim/data/gui/advanced_configuration.ui:180
+#, fuzzy
+msgid "_Reset Value"
+msgstr "恢復為預設顏色設定(_R)"
+
+#: gajim/data/gui/advanced_configuration.ui:185
+#, fuzzy
+msgid "Resets value to default"
+msgstr "恢復為預設顏色設定(_R)"
 
 #: gajim/data/gui/account_creation_wizard_window.ui:43
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim: 帳號建立精靈"
 
 #: gajim/data/gui/account_creation_wizard_window.ui:70
+#, fuzzy
 msgid ""
 "You need to have an account in order to connect\n"
-"to the Jabber network."
+"to the XMPP network."
 msgstr ""
 "您必須擁有一個帳號以連線\n"
 "Jabber 網路"
@@ -7262,8 +7380,9 @@ msgid "<b>Please fill in the data for your existing account</b>"
 msgstr "<b>請填寫您現有帳號的資訊</b>"
 
 #: gajim/data/gui/account_creation_wizard_window.ui:187
-msgid "_Jabber ID:"
-msgstr "_Jabber ID:"
+#, fuzzy
+msgid "_XMPP Address:"
+msgstr "AIM 位址:"
 
 #: gajim/data/gui/account_creation_wizard_window.ui:239
 #: gajim/data/gui/account_creation_wizard_window.ui:394
@@ -7350,6 +7469,7 @@ msgid "Privacy Lists:"
 msgstr "隱私策略清單:"
 
 #: gajim/data/gui/service_discovery_window.ui:111
+#: gajim/data/gui/groupchat_creation.ui:227
 #, fuzzy
 msgid "_Address"
 msgstr "位址(_A):"
@@ -7367,11 +7487,6 @@ msgstr "同步: 選擇聯絡人"
 msgid "Select the contacts you want to synchronise"
 msgstr "選擇您想要同步的聯絡人"
 
-#: gajim/data/gui/groupchat_invitation_received.ui:42
-#, fuzzy
-msgid "Group Chat Invitation"
-msgstr "多人聊天邀請"
-
 #: gajim/data/gui/groupchat_invitation_received.ui:111
 #, fuzzy
 msgid "Message..."
@@ -7422,11 +7537,10 @@ msgstr ""
 
 #: gajim/data/gui/add_new_contact_window.ui:84
 #, fuzzy
-msgid "_Jabber ID"
-msgstr "_Jabber ID:"
+msgid "_XMPP Address"
+msgstr "位址(_A):"
 
 #: gajim/data/gui/add_new_contact_window.ui:100
-#: gajim/data/gui/manage_bookmarks_window.ui:192
 #, fuzzy
 msgid "_Nickname"
 msgstr "暱稱(_N):"
@@ -7502,7 +7616,7 @@ msgstr "<b>心情:</b>"
 msgid "<b>Message:</b>"
 msgstr "<b>訊息:</b>"
 
-#: gajim/data/gui/plugins_window.ui:10 gajim/data/gui/application_menu.ui:90
+#: gajim/data/gui/plugins_window.ui:10 gajim/data/gui/application_menu.ui:87
 msgid "Plugins"
 msgstr "外掛程式"
 
@@ -7608,10 +7722,6 @@ msgstr "允許"
 msgid "Deny"
 msgstr "拒絕"
 
-#: gajim/data/gui/privacy_list_window.ui:317
-msgid "JabberID"
-msgstr "JabberID"
-
 #: gajim/data/gui/privacy_list_window.ui:358
 msgid "all in the group"
 msgstr "所有在群組中的"
@@ -7653,7 +7763,7 @@ msgstr "Order:"
 msgid "Manage sounds"
 msgstr "管理聯絡人(_M)"
 
-#: gajim/data/gui/manage_sounds_window.ui:55 gajim/plugins/gui.py:100
+#: gajim/data/gui/manage_sounds_window.ui:55 gajim/plugins/gui.py:101
 msgid "Active"
 msgstr "活動"
 
@@ -7691,23 +7801,113 @@ msgstr "同時從 Gajim 和伺服器移除帳號(_S)"
 msgid "_Personal Events"
 msgstr "個人事件"
 
-#: gajim/data/gui/account_context_menu.ui:35
-#: gajim/data/gui/systray_context_menu.ui:28
-msgid "Join _Group Chat"
-msgstr "加入聊天室(_G)"
-
-#: gajim/data/gui/account_context_menu.ui:49
+#: gajim/data/gui/account_context_menu.ui:41
 msgid "_Add Contact..."
 msgstr "加入聯絡人(_A)…"
 
-#: gajim/data/gui/account_context_menu.ui:57
+#: gajim/data/gui/account_context_menu.ui:49
 msgid "_Discover Services"
 msgstr "探索服務(_D)"
 
-#: gajim/data/gui/account_context_menu.ui:65
+#: gajim/data/gui/account_context_menu.ui:57
 msgid "_Execute Command..."
 msgstr "執行命令(_E)…"
 
+#: gajim/data/gui/account_context_menu.ui:65
+#, fuzzy
+msgid "_View Certificate"
+msgstr "檢視憑證…"
+
+#: gajim/data/gui/manage_proxies.ui:12
+#, fuzzy
+msgctxt "proxy configuration"
+msgid "HTTP Connect"
+msgstr "HTTP 連線"
+
+#: gajim/data/gui/manage_proxies.ui:15
+#, fuzzy
+msgctxt "proxy configuration"
+msgid "SOCKS5"
+msgstr "SOCKS5"
+
+#: gajim/data/gui/manage_proxies.ui:18
+#, fuzzy
+msgctxt "proxy configuration"
+msgid "BOSH"
+msgstr "BOSH"
+
+#: gajim/data/gui/manage_proxies.ui:68
+#, fuzzy
+msgid "Add Proxy"
+msgstr "代理伺服器(_Y):"
+
+#: gajim/data/gui/manage_proxies.ui:82
+#, fuzzy
+msgid "Remove Proxy"
+msgstr "移除群組"
+
+#: gajim/data/gui/manage_proxies.ui:134
+#, fuzzy
+msgid "Pass_word"
+msgstr "密碼(_W)"
+
+#: gajim/data/gui/manage_proxies.ui:159
+msgid "Use proxy auth_entication"
+msgstr "代理伺服器需要認證"
+
+#: gajim/data/gui/manage_proxies.ui:179
+#, fuzzy
+msgid "_Username"
+msgstr "使用者名稱(_U):"
+
+#: gajim/data/gui/manage_proxies.ui:209
+#, fuzzy
+msgid "_Port"
+msgstr "連接埠(_P):"
+
+#: gajim/data/gui/manage_proxies.ui:226
+msgid "example.org"
+msgstr ""
+
+#: gajim/data/gui/manage_proxies.ui:240
+#, fuzzy
+msgid "_Host"
+msgstr "主機名稱(_H):"
+
+#: gajim/data/gui/manage_proxies.ui:254
+msgid "Use HTTP prox_y"
+msgstr "使用 HTTP 代理(_Y)"
+
+#: gajim/data/gui/manage_proxies.ui:275
+msgid "https://example.org/http-bind/"
+msgstr ""
+
+#: gajim/data/gui/manage_proxies.ui:291
+#, fuzzy
+msgid "_BOSH URL"
+msgstr "_BOSH URL:"
+
+#: gajim/data/gui/manage_proxies.ui:309 gajim/gtk/adhoc.py:322
+#, fuzzy
+msgid "Settings"
+msgstr "外掛程式"
+
+#: gajim/data/gui/manage_proxies.ui:344
+#, fuzzy
+msgid "_Type"
+msgstr "類型(_T):"
+
+#: gajim/data/gui/manage_proxies.ui:361
+#: gajim/data/gui/groupchat_creation.ui:105
+#, fuzzy
+msgid "_Name"
+msgstr "名稱(_N):"
+
+#: gajim/data/gui/manage_proxies.ui:391 gajim/gtk/accounts.py:742
+#, fuzzy
+msgid "Proxy"
+msgstr "代理伺服器(_Y):"
+
 #: gajim/data/gui/application_menu.ui:8
 #, fuzzy
 msgid "View"
@@ -7715,8 +7915,8 @@ msgstr "檢視(_V)"
 
 #: gajim/data/gui/application_menu.ui:11
 #, fuzzy
-msgid "Show Roster"
-msgstr "顯示聯絡人清單(_R)"
+msgid "Show Contact List"
+msgstr "只顯示活動的聯絡人(_A)"
 
 #: gajim/data/gui/application_menu.ui:16
 #, fuzzy
@@ -7757,22 +7957,23 @@ msgstr ""
 msgid "Features"
 msgstr "特性"
 
-#: gajim/data/gui/application_menu.ui:81
+#: gajim/data/gui/application_menu.ui:77
+#: gajim/data/gui/groupchat_creation.ui:81 gajim/gtk/groupchat_creation.py:45
 #, fuzzy
-msgid "Bookmarks"
-msgstr "將本聊天室加入書籤(_B)"
+msgid "Create Group Chat"
+msgstr "離開聊天室"
 
-#: gajim/data/gui/application_menu.ui:94 gajim/data/gui/shortcuts_window.ui:189
-#: gajim/gtk/preferences.py:59
+#: gajim/data/gui/application_menu.ui:91 gajim/data/gui/shortcuts_window.ui:189
+#: gajim/gtk/preferences.py:58
 msgid "Preferences"
 msgstr "參數"
 
-#: gajim/data/gui/application_menu.ui:99
+#: gajim/data/gui/application_menu.ui:96
 msgid "Quit"
 msgstr ""
 
 #: gajim/data/gui/httpupload_progress_dialog.ui:110
-#: gajim/gtk/filetransfer.py:121
+#: gajim/gtk/filetransfer.py:120
 msgid "Progress"
 msgstr "處理序"
 
@@ -7789,53 +7990,33 @@ msgstr ""
 msgid "_Cancel Upload"
 msgstr "取消(_C)"
 
-#: gajim/data/gui/manage_bookmarks_window.ui:13
-#, fuzzy
-msgid "Group Chat Bookmarks"
-msgstr "多人聊天(_G)"
-
-#: gajim/data/gui/manage_bookmarks_window.ui:68
-#, fuzzy
-msgid "Add Bookmark"
-msgstr "將本聊天室加入書籤(_B)"
-
-#: gajim/data/gui/manage_bookmarks_window.ui:82
-#, fuzzy
-msgid "Remove Bookmark"
-msgstr "將本聊天室加入書籤(_B)"
-
-#: gajim/data/gui/manage_bookmarks_window.ui:126
-msgid "N_ame"
+#: gajim/data/gui/groupchat_creation.ui:27
+msgid "Public or Private?"
 msgstr ""
 
-#: gajim/data/gui/manage_bookmarks_window.ui:145
-#, fuzzy
-msgid "Bookmark Name"
-msgstr "將本聊天室加入書籤(_B)"
+#: 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 ""
 
-#: gajim/data/gui/manage_bookmarks_window.ui:160
-#, fuzzy
-msgid "_Server"
-msgstr "伺服器(_S):"
+#: gajim/data/gui/groupchat_creation.ui:58
+msgid "<b>Public:</b> Anyone who knows the address can join."
+msgstr ""
 
-#: gajim/data/gui/manage_bookmarks_window.ui:223
+#: gajim/data/gui/groupchat_creation.ui:122
 #, fuzzy
-msgid "Roo_m"
-msgstr "聊天室(_M):"
+msgid "_Description"
+msgstr "描述"
 
-#: gajim/data/gui/manage_bookmarks_window.ui:253
-#, fuzzy
-msgid "_Password"
-msgstr "密碼(_P):"
+#: gajim/data/gui/groupchat_creation.ui:164
+msgid "_Public"
+msgstr ""
 
-#: gajim/data/gui/manage_bookmarks_window.ui:299
+#: gajim/data/gui/groupchat_creation.ui:278
 #, fuzzy
-msgid "Join chat when connected"
-msgstr "聯絡人已中斷連線"
-
-#: gajim/data/gui/manage_bookmarks_window.ui:307
-msgid "_Join Automatically"
-msgstr ""
+msgid "_Account"
+msgstr "帳號(_A)"
 
 #: gajim/data/gui/exception_dialog.ui:49
 msgid "Sorry, that should not have happened"
@@ -7878,6 +8059,29 @@ msgstr "向聯絡人授權則他/她將知道您是否線上"
 msgid "Presets"
 msgstr "_Presence"
 
+#: gajim/data/gui/groupchat_info_scrolled.ui:32
+#, fuzzy
+msgid "Address"
+msgstr "位址(_A):"
+
+#: gajim/data/gui/groupchat_info_scrolled.ui:64
+msgid "Topic"
+msgstr ""
+
+#: gajim/data/gui/groupchat_info_scrolled.ui:80
+#, fuzzy
+msgid "Author"
+msgstr "作者:"
+
+#: gajim/data/gui/groupchat_info_scrolled.ui:182
+msgid "Discussion Logs"
+msgstr ""
+
+#: gajim/data/gui/groupchat_info_scrolled.ui:260
+#, fuzzy
+msgid "Group Chat Language"
+msgstr "多人聊天邀請"
+
 #: gajim/data/gui/emoji_chooser.ui:98
 #, fuzzy
 msgid "No Results Found"
@@ -7890,24 +8094,35 @@ msgstr "邀請朋友!"
 #: gajim/data/gui/chat_to_muc_window.ui:39
 #, fuzzy
 msgid ""
-"You are now entering a groupchat.\n"
+"You are now entering a group chat.\n"
 "Select the contacts you want to invite"
 msgstr ""
 "您將開始進行多人聊天。\n"
 "選擇您想要邀請的聯絡人"
 
 #: gajim/data/gui/chat_to_muc_window.ui:112
-msgid "Please select a MUC server."
+#, fuzzy
+msgid "Please select a group chat server."
 msgstr "請選擇一個多人聊天伺服器"
 
 #: gajim/data/gui/chat_to_muc_window.ui:141
-msgid "MUC server"
-msgstr "多人聊天伺服器"
+#, fuzzy
+msgid "Group chat server"
+msgstr "多人聊天"
 
 #: gajim/data/gui/chat_to_muc_window.ui:176
 msgid "In_vite"
 msgstr "邀請(_V)"
 
+#: gajim/data/gui/bookmarks.ui:176
+#, fuzzy
+msgid "Autojoin"
+msgstr "自動聯結(_U)"
+
+#: gajim/data/gui/bookmarks.ui:211
+msgid "_Apply"
+msgstr ""
+
 #: gajim/data/gui/history_manager.ui:11
 #, fuzzy
 msgid "_Export"
@@ -7923,12 +8138,13 @@ msgid "Gajim History Logs Manager"
 msgstr "Gajim 命令歷程記錄管理器"
 
 #: gajim/data/gui/history_manager.ui:108
+#, fuzzy
 msgid ""
-"This log manager is not intended for log viewing. If you are looking for "
-"such functionality, use the history window instead.\n"
+"This history manager is not intended for viewing chat history. If you are "
+"looking for such functionality, please use the history window instead.\n"
 "\n"
-"Use this program to delete or export logs. You can select logs from the left "
-"and/or search database from below."
+"You can use this program to delete or export history. Either select logs "
+"from the left or search the database."
 msgstr ""
 "這個命令歷程記錄管理器並非為了瀏覽命令歷程記錄而設計。如果您需要瀏覽命令歷程"
 "記錄，請使用命令歷程視窗。\n"
@@ -7980,8 +8196,9 @@ msgid "Select an emoji"
 msgstr ""
 
 #: gajim/data/gui/shortcuts_window.ui:38
-msgid "Complete a command or a nick"
-msgstr ""
+#, fuzzy
+msgid "Complete a command or a nickname"
+msgstr "請用您想要的名稱新增一個主題。"
 
 #: gajim/data/gui/shortcuts_window.ui:45
 #, fuzzy
@@ -8021,7 +8238,7 @@ msgstr ""
 msgid "Scroll down"
 msgstr ""
 
-#: gajim/data/gui/shortcuts_window.ui:100 gajim/gtk/xml_console.py:72
+#: gajim/data/gui/shortcuts_window.ui:100 gajim/gtk/xml_console.py:69
 #, fuzzy
 msgid "Clear"
 msgstr "清潔"
@@ -8063,8 +8280,9 @@ msgid "Close chat"
 msgstr ""
 
 #: gajim/data/gui/shortcuts_window.ui:173
-msgid "Roster Shortcuts"
-msgstr ""
+#, fuzzy
+msgid "Contact List Shortcuts"
+msgstr "聯絡人清單項交換"
 
 #: gajim/data/gui/shortcuts_window.ui:196
 #, fuzzy
@@ -8097,7 +8315,7 @@ msgid "Show only active contacts"
 msgstr "只顯示活動的聯絡人(_A)"
 
 #: gajim/data/gui/shortcuts_window.ui:251
-msgid "Enable roster filtering"
+msgid "Enable contact list filtering"
 msgstr ""
 
 #: gajim/data/gui/shortcuts_window.ui:259
@@ -8144,12 +8362,12 @@ msgstr ""
 
 #: gajim/data/gui/history_window.ui:317
 #, fuzzy
-msgid "Record history for this chat"
+msgid "Store history for this chat"
 msgstr "忽略這個證書的這個錯誤。"
 
 #: gajim/data/gui/history_window.ui:332
 #, fuzzy
-msgid "Record History"
+msgid "Store History"
 msgstr "最近:"
 
 #: gajim/data/gui/history_window.ui:350
@@ -8169,9 +8387,10 @@ msgstr "建立新訊息"
 msgid "Fill in the form."
 msgstr "請填寫表格。"
 
-#: gajim/data/gui/data_form_window.ui:229
-msgid "Room Configuration"
-msgstr "聊天室設定"
+#: gajim/data/gui/data_form_window.ui:229 gajim/gtk/groupchat_config.py:41
+#, fuzzy
+msgid "Group Chat Configuration"
+msgstr "多人聊天邀請"
 
 #: gajim/data/gui/roster_item_exchange_window.ui:39
 #: gajim/gtk/roster_item_exchange.py:35
@@ -8192,15 +8411,15 @@ msgstr "狀態(_T)"
 msgid "_Start Chat..."
 msgstr "開始聊天(_S)…"
 
-#: gajim/data/gui/systray_context_menu.ui:50
+#: gajim/data/gui/systray_context_menu.ui:43
 msgid "Show All Pending _Events"
 msgstr "顯示所有未處理事件(_E)"
 
-#: gajim/data/gui/systray_context_menu.ui:59
+#: gajim/data/gui/systray_context_menu.ui:52
 msgid "Mute Sounds"
 msgstr "靜音"
 
-#: gajim/data/gui/systray_context_menu.ui:75
+#: gajim/data/gui/systray_context_menu.ui:68
 #, fuzzy
 msgid "_Preferences"
 msgstr "參數"
@@ -8292,34 +8511,34 @@ msgstr ""
 msgid "Execute expression inside a shell, send output"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:45
+#: gajim/command_system/implementation/standard.py:47
 msgid ""
 "Show help on a given command or a list of available commands if -a is given"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:73
+#: gajim/command_system/implementation/standard.py:75
 #, fuzzy
 msgid "Send a message to the contact"
 msgstr "向聯絡人傳送檔案"
 
-#: gajim/command_system/implementation/standard.py:78
+#: gajim/command_system/implementation/standard.py:80
 msgid "Send action (in the third person) to the current chat"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:83
+#: gajim/command_system/implementation/standard.py:85
 msgid "Show logged messages which mention given text"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:88
+#: gajim/command_system/implementation/standard.py:90
 #, fuzzy, python-format
 msgid "%s: Nothing found"
 msgstr " %s 找不到"
 
-#: gajim/command_system/implementation/standard.py:94
+#: gajim/command_system/implementation/standard.py:96
 msgid "Limit must be an integer"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:118
+#: gajim/command_system/implementation/standard.py:120
 msgid ""
 "\n"
 "    Set the current status\n"
@@ -8329,125 +8548,127 @@ msgid ""
 "    "
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:136
+#: gajim/command_system/implementation/standard.py:138
 msgid "Set the current status to away"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:150
+#: gajim/command_system/implementation/standard.py:152
 msgid "Set the current status to online"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:153
+#: gajim/command_system/implementation/standard.py:155
 #, fuzzy
 msgid "Available"
 msgstr "離開很久了"
 
-#: gajim/command_system/implementation/standard.py:173
-#: gajim/command_system/implementation/standard.py:250
+#: gajim/command_system/implementation/standard.py:175
+#: gajim/command_system/implementation/standard.py:252
 #, fuzzy
 msgid "Clear the text window"
 msgstr "隱藏該視窗"
 
-#: gajim/command_system/implementation/standard.py:178
-#: gajim/command_system/implementation/standard.py:397
+#: gajim/command_system/implementation/standard.py:180
+#: gajim/command_system/implementation/standard.py:401
 #, fuzzy
 msgid "Send a ping to the contact"
 msgstr "向聯絡人傳送檔案"
 
-#: gajim/command_system/implementation/standard.py:181
-#: gajim/command_system/implementation/standard.py:400
+#: gajim/command_system/implementation/standard.py:183
+#: gajim/command_system/implementation/standard.py:404
 msgid "Command is not supported for zeroconf accounts"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:185
-msgid "Send DTMF sequence through an open audio session"
+#: gajim/command_system/implementation/standard.py:187
+msgid "Send DTMF sequence through an open voice chat"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:188
-msgid "No open audio sessions with the contact"
-msgstr ""
+#: gajim/command_system/implementation/standard.py:190
+#, fuzzy
+msgid "No open voice chats with the contact"
+msgstr "向聯絡人傳送檔案"
 
-#: gajim/command_system/implementation/standard.py:191
+#: gajim/command_system/implementation/standard.py:193
 #, fuzzy, python-format
 msgid "%s is not a valid tone"
 msgstr "%s 不是一個合法的日誌層級"
 
-#: gajim/command_system/implementation/standard.py:198
-msgid "Toggle audio session"
-msgstr "切換語音作業階段"
+#: gajim/command_system/implementation/standard.py:200
+msgid "Toggle Voice Chat"
+msgstr ""
 
-#: gajim/command_system/implementation/standard.py:201
+#: gajim/command_system/implementation/standard.py:203
 #, fuzzy
-msgid "Audio sessions are not available"
-msgstr "一個連線無法使用"
+msgid "Voice chats are not available"
+msgstr "連線無法使用"
 
-#: gajim/command_system/implementation/standard.py:208
-msgid "Toggle video session"
+#: gajim/command_system/implementation/standard.py:210
+#, fuzzy
+msgid "Toggle Video Chat"
 msgstr "切換視訊作業階段"
 
-#: gajim/command_system/implementation/standard.py:211
+#: gajim/command_system/implementation/standard.py:213
 #, fuzzy
-msgid "Video sessions are not available"
+msgid "Video chats are not available"
 msgstr "連線無法使用"
 
-#: gajim/command_system/implementation/standard.py:218
+#: gajim/command_system/implementation/standard.py:220
 #, fuzzy
 msgid "Send a message to the contact that will attract their attention"
 msgstr "向聯絡人傳送檔案"
 
-#: gajim/command_system/implementation/standard.py:255
+#: gajim/command_system/implementation/standard.py:257
 #, fuzzy
 msgid "Change your nickname in a group chat"
 msgstr "變更您的暱稱(Ctrl+N)"
 
-#: gajim/command_system/implementation/standard.py:260 gajim/gtk/dialogs.py:674
-#: gajim/gtk/bookmarks.py:272
+#: gajim/command_system/implementation/standard.py:262
 msgid "Invalid nickname"
 msgstr "無效的暱稱"
 
-#: gajim/command_system/implementation/standard.py:267
-msgid "Open a private chat window with a specified occupant"
+#: gajim/command_system/implementation/standard.py:269
+msgid "Open a private chat window with a specified participant"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:273
-#: gajim/command_system/implementation/standard.py:282
-#: gajim/command_system/implementation/standard.py:332
-#: gajim/command_system/implementation/standard.py:345
-#: gajim/command_system/implementation/standard.py:357
+#: gajim/command_system/implementation/standard.py:275
+#: gajim/command_system/implementation/standard.py:284
+#: gajim/command_system/implementation/standard.py:336
+#: gajim/command_system/implementation/standard.py:349
+#: gajim/command_system/implementation/standard.py:361
 #, fuzzy
 msgid "Nickname not found"
 msgstr "要使用的暱稱"
 
-#: gajim/command_system/implementation/standard.py:276
+#: gajim/command_system/implementation/standard.py:278
 msgid ""
-"Open a private chat window with a specified occupant and send him a message"
+"Open a private chat window with a specified participant and send him a "
+"message"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:285
+#: gajim/command_system/implementation/standard.py:287
 #, fuzzy
 msgid "Display or change a group chat topic"
 msgstr "關閉多人聊天標籤/視窗前詢問。"
 
-#: gajim/command_system/implementation/standard.py:294
-msgid "Invite a user to a room for a reason"
+#: gajim/command_system/implementation/standard.py:296
+msgid "Invite a user to a group chat for a reason"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:297
+#: gajim/command_system/implementation/standard.py:299
 #, fuzzy, python-format
 msgid "Invited %(jid)s to %(room_jid)s"
 msgstr "傳送 %s 給 %s"
 
-#: gajim/command_system/implementation/standard.py:301
+#: gajim/command_system/implementation/standard.py:303
 #, fuzzy
-msgid "Join a group chat given by a JID"
+msgid "Join a group chat given by an XMPP Address"
 msgstr "在多人聊天視窗中(_G)"
 
-#: gajim/command_system/implementation/standard.py:309
+#: gajim/command_system/implementation/standard.py:313
 msgid ""
-"Leave the groupchat, optionally giving a reason, and close tab or window"
+"Leave the group chat, optionally giving a reason, and close tab or window"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:314
+#: gajim/command_system/implementation/standard.py:318
 msgid ""
 "\n"
 "    Ban user by a nick or a JID from a groupchat\n"
@@ -8456,46 +8677,46 @@ msgid ""
 "    "
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:329
+#: gajim/command_system/implementation/standard.py:333
 #, fuzzy
-msgid "Kick user by a nick from a groupchat"
+msgid "Kick user by a nick from a group chat"
 msgstr "您被邀請到一個聊天室"
 
-#: gajim/command_system/implementation/standard.py:338
+#: gajim/command_system/implementation/standard.py:342
 msgid ""
-"Set occupant role in group chat.\n"
+"Set participant role in group chat.\n"
 "    Role can be given as one of the following values:\n"
 "    moderator, participant, visitor, none"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:343
+#: gajim/command_system/implementation/standard.py:347
 #, fuzzy
 msgid "Invalid role given"
 msgstr "無效的伺服器"
 
-#: gajim/command_system/implementation/standard.py:350
+#: gajim/command_system/implementation/standard.py:354
 msgid ""
-"Set occupant affiliation in group chat.\n"
+"Set participant affiliation in group chat.\n"
 "    Affiliation can be given as one of the following values:\n"
 "    owner, admin, member, outcast, none"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:355
+#: gajim/command_system/implementation/standard.py:359
 #, fuzzy
 msgid "Invalid affiliation given"
 msgstr "歸屬變更"
 
-#: gajim/command_system/implementation/standard.py:365
+#: gajim/command_system/implementation/standard.py:369
 #, fuzzy
-msgid "Display names of all group chat occupants"
+msgid "Display names of all group chat participants"
 msgstr "%s 不是一個聊天室的名稱。"
 
-#: gajim/command_system/implementation/standard.py:387
-msgid "Forbid an occupant to send you public or private messages"
+#: gajim/command_system/implementation/standard.py:391
+msgid "Forbid a participant to send you public or private messages"
 msgstr ""
 
-#: gajim/command_system/implementation/standard.py:392
-msgid "Allow an occupant to send you public or private messages"
+#: gajim/command_system/implementation/standard.py:396
+msgid "Allow a participant to send you public or private messages"
 msgstr ""
 
 #: gajim/command_system/implementation/middleware.py:74
@@ -8506,204 +8727,329 @@ msgstr ""
 msgid "The same as using a doc-string, except it supports translation"
 msgstr ""
 
-#: gajim/gtk/filetransfer.py:91
+#: gajim/gtk/groupchat_info.py:36
+#, fuzzy
+msgid "?Group chat feature:Archiving"
+msgstr "多人聊天邀請"
+
+#: gajim/gtk/groupchat_info.py:37
+#, fuzzy
+msgid "Messages are archived on the server"
+msgstr "本次作業階段將在伺服器上被存檔"
+
+#: gajim/gtk/groupchat_info.py:40
+#, fuzzy
+msgid "?Group chat feature:Persistent"
+msgstr "多人聊天"
+
+#: gajim/gtk/groupchat_info.py:41
+msgid "This group chat persists even if there are no participants"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:45
+#, fuzzy
+msgid "?Group chat feature:Temporary"
+msgstr "無"
+
+#: gajim/gtk/groupchat_info.py:46
+msgid "This group chat will be destroyed once the last participant left"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:50
+#, fuzzy
+msgid "?Group chat feature:Moderated"
+msgstr "無"
+
+#: gajim/gtk/groupchat_info.py:51
+msgid ""
+"Participants entering this group chat need to request permission to send "
+"messages"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:55
+#, fuzzy
+msgid "?Group chat feature:Not Moderated"
+msgstr "多人聊天"
+
+#: gajim/gtk/groupchat_info.py:56
+msgid "Participants entering this group chat are allowed to send messages"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:60
+#, fuzzy
+msgid "?Group chat feature:Open"
+msgstr "無"
+
+#: gajim/gtk/groupchat_info.py:61
+#, fuzzy
+msgid "Anyone can join this group chat"
+msgstr "%s 加入聊天室"
+
+#: gajim/gtk/groupchat_info.py:64
+#, fuzzy
+msgid "?Group chat feature:Members Only"
+msgstr "多人聊天訊息高亮度顯示"
+
+#: gajim/gtk/groupchat_info.py:65
+msgid "This group chat is restricted to members only"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:69
+#, fuzzy
+msgid "?Group chat feature:Public"
+msgstr "多人聊天訊息高亮度顯示"
+
+#: gajim/gtk/groupchat_info.py:70
+msgid "Group chat can be found via search"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:73
+#, fuzzy
+msgid "?Group chat feature:Hidden"
+msgstr "無"
+
+#: gajim/gtk/groupchat_info.py:74
+#, fuzzy
+msgid "This group chat can not be found via search"
+msgstr "找不到該服務"
+
+#: gajim/gtk/groupchat_info.py:77
+#, fuzzy
+msgid "?Group chat feature:Not Anonymous"
+msgstr "多人聊天"
+
+#: gajim/gtk/groupchat_info.py:78
+msgid "All other group chat participants can see your XMPP address"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:82
+#, fuzzy
+msgid "?Group chat feature:Semi-Anonymous"
+msgstr "多人聊天訊息高亮度顯示"
+
+#: gajim/gtk/groupchat_info.py:83
+msgid "Only moderators can see your XMPP address"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:86
+#, fuzzy
+msgid "?Group chat feature:Password Required"
+msgstr "多人聊天"
+
+#: gajim/gtk/groupchat_info.py:87
+msgid "This group chat does require a password upon entry"
+msgstr ""
+
+#: gajim/gtk/groupchat_info.py:91
+#, fuzzy
+msgid "?Group chat feature:No Password Required"
+msgstr "多人聊天"
+
+#: gajim/gtk/groupchat_info.py:92
+msgid "This group chat does not require a password upon entry"
+msgstr ""
+
+#: gajim/gtk/filetransfer.py:90
 msgid "File"
 msgstr "檔案"
 
-#: gajim/gtk/filetransfer.py:108
+#: gajim/gtk/filetransfer.py:107
 msgid "Time"
 msgstr "時間"
 
-#: gajim/gtk/filetransfer.py:228
+#: gajim/gtk/filetransfer.py:227
 #, fuzzy, python-format
 msgid "File name: %s"
 msgstr "檔案名稱:  %s"
 
-#: gajim/gtk/filetransfer.py:229 gajim/gtk/filetransfer.py:464
+#: gajim/gtk/filetransfer.py:228 gajim/gtk/filetransfer.py:469
 #, python-format
 msgid "Size: %s"
 msgstr "大小:  %s"
 
-#: gajim/gtk/filetransfer.py:239
+#: gajim/gtk/filetransfer.py:238
 #, python-format
 msgid "Sender: %s"
 msgstr "傳送者:  %s"
 
-#: gajim/gtk/filetransfer.py:240 gajim/gtk/filetransfer.py:744
+#: gajim/gtk/filetransfer.py:239 gajim/gtk/filetransfer.py:749
 #: gajim/gtk/tooltips.py:577
 msgid "Recipient: "
 msgstr "接收者: "
 
-#: gajim/gtk/filetransfer.py:251
+#: gajim/gtk/filetransfer.py:250
 #, python-format
 msgid "Saved in: %s"
 msgstr "儲存在: %s"
 
-#: gajim/gtk/filetransfer.py:256
+#: gajim/gtk/filetransfer.py:255
 msgid "File transfer completed"
 msgstr "檔案傳輸已完成"
 
-#: gajim/gtk/filetransfer.py:276 gajim/gtk/filetransfer.py:285
+#: gajim/gtk/filetransfer.py:275 gajim/gtk/filetransfer.py:284
 #, fuzzy
 msgid "Connection with peer could not be established."
 msgstr "無法與對方建立連線。"
 
-#: gajim/gtk/filetransfer.py:293
+#: gajim/gtk/filetransfer.py:292
 #, python-format
 msgid "Filename: %s"
 msgstr "檔案名稱:  %s"
 
-#: gajim/gtk/filetransfer.py:294
+#: gajim/gtk/filetransfer.py:293
 #, python-format
 msgid "Recipient: %s"
 msgstr "接收者:  %s"
 
-#: gajim/gtk/filetransfer.py:296
+#: gajim/gtk/filetransfer.py:295
 #, python-format
 msgid "Error message: %s"
 msgstr "錯誤訊息: %s"
 
-#: gajim/gtk/filetransfer.py:333
-#, fuzzy
-msgid "File transfer error"
-msgstr "檔案傳輸錯誤"
-
 #: gajim/gtk/filetransfer.py:334
 #, python-format
 msgid ""
-"The file %(file)s has been received, but it seems to have been damaged along "
-"the way.\n"
+"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 ""
 
-#: gajim/gtk/filetransfer.py:350
+#: gajim/gtk/filetransfer.py:340
+#, fuzzy
+msgid "_Download Again"
+msgstr "不要再問我了(_D)"
+
+#: gajim/gtk/filetransfer.py:355
 #, fuzzy
 msgid "Gajim can not read this file"
 msgstr "Gajim 無法存取此檔案"
 
-#: gajim/gtk/filetransfer.py:351
+#: gajim/gtk/filetransfer.py:356
 msgid "Another process is using this file."
 msgstr ""
 
-#: gajim/gtk/filetransfer.py:418
+#: gajim/gtk/filetransfer.py:423
 #, fuzzy
 msgid "File Transfer Conflict"
 msgstr "檔案傳輸完成"
 
-#: gajim/gtk/filetransfer.py:419
+#: gajim/gtk/filetransfer.py:424
 msgid "This file already exists"
 msgstr "檔案已經存在"
 
-#: gajim/gtk/filetransfer.py:420
+#: gajim/gtk/filetransfer.py:425
 msgid "Resume download or replace file?"
 msgstr ""
 
-#: gajim/gtk/filetransfer.py:424
+#: gajim/gtk/filetransfer.py:429
 #, fuzzy
 msgid "Replace _File"
 msgstr "置換(_P)"
 
-#: gajim/gtk/filetransfer.py:427
+#: gajim/gtk/filetransfer.py:432
 #, fuzzy
 msgid "Resume _Download"
 msgstr "下載"
 
-#: gajim/gtk/filetransfer.py:437
+#: gajim/gtk/filetransfer.py:442
 #, fuzzy, python-format
 msgid "Directory '%s' is not writable"
 msgstr "目錄 \"%s\" 不可寫"
 
-#: gajim/gtk/filetransfer.py:438
+#: gajim/gtk/filetransfer.py:443
 #, fuzzy
 msgid "You do not have permissions to create files in this directory."
 msgstr "您沒有權限在這個目錄裡建立檔案。"
 
-#: gajim/gtk/filetransfer.py:461
+#: gajim/gtk/filetransfer.py:466
 #, python-format
 msgid "File: %s"
 msgstr "檔案:  %s"
 
-#: gajim/gtk/filetransfer.py:467
+#: gajim/gtk/filetransfer.py:472
 #, python-format
 msgid "Type: %s"
 msgstr "類型: %s"
 
-#: gajim/gtk/filetransfer.py:469
+#: gajim/gtk/filetransfer.py:474
 #, python-format
 msgid "Description: %s"
 msgstr "描述:  %s"
 
-#: gajim/gtk/filetransfer.py:480
+#: gajim/gtk/filetransfer.py:485
 #, fuzzy, python-format
 msgid "%s wants to send you a file"
 msgstr "%s 想傳送給您一個檔案。"
 
-#: gajim/gtk/filetransfer.py:509
+#: gajim/gtk/filetransfer.py:514
 #, fuzzy
 msgid "Checking file…"
 msgstr "傳送側寫…"
 
-#: gajim/gtk/filetransfer.py:524
+#: gajim/gtk/filetransfer.py:529
 #, fuzzy
 msgid "File error"
 msgstr "檔案傳輸錯誤"
 
-#: gajim/gtk/filetransfer.py:561
+#: gajim/gtk/filetransfer.py:566
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 
-#: gajim/gtk/filetransfer.py:658
+#: gajim/gtk/filetransfer.py:663
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/s)"
 
-#: gajim/gtk/filetransfer.py:711 gajim/gtk/filetransfer.py:715
+#: gajim/gtk/filetransfer.py:716 gajim/gtk/filetransfer.py:720
 msgid "Invalid File"
 msgstr "無效檔案"
 
-#: gajim/gtk/filetransfer.py:711
+#: gajim/gtk/filetransfer.py:716
 msgid "File: "
 msgstr "檔案: "
 
-#: gajim/gtk/filetransfer.py:716
+#: gajim/gtk/filetransfer.py:721
 msgid "It is not possible to send empty files"
 msgstr "無法傳送空檔案"
 
-#: gajim/gtk/filetransfer.py:742 gajim/gtk/tooltips.py:571
+#: gajim/gtk/filetransfer.py:747 gajim/gtk/tooltips.py:571
 msgid "Sender: "
 msgstr "傳送者: "
 
-#: gajim/gtk/filetransfer.py:1038
+#: gajim/gtk/filetransfer.py:1043
 #, fuzzy
 msgid "Choose a File to Send…"
 msgstr "選擇要傳送的檔案…"
 
 #: gajim/gtk/start_chat.py:51
 #, fuzzy
-msgid "Start new Conversation"
+msgid "Start New Conversation"
 msgstr "繼續對話"
 
-#: gajim/gtk/start_chat.py:424
-#, fuzzy
-msgid "New Groupchat"
-msgstr "新聊天室"
+#: gajim/gtk/start_chat.py:260 gajim/gtk/start_chat.py:328
+msgid "You can not join a group chat unless you are connected."
+msgstr "您必須連線才能加入聊天室。"
 
-#: gajim/gtk/start_chat.py:426
+#: gajim/gtk/start_chat.py:603 gajim/gtk/groupchat_join.py:38
+msgid "Join Group Chat"
+msgstr "加入多人聊天"
+
+#: gajim/gtk/start_chat.py:605 gajim/gtk/add_contact.py:40
 #, fuzzy
-msgid "New Contact"
-msgstr "加入聯絡人"
+msgid "Add Contact"
+msgstr "加入聯絡人(_A)…"
 
-#: gajim/gtk/start_chat.py:588
+#: gajim/gtk/start_chat.py:746
 #, fuzzy, python-format
-msgid "%s Group chats found"
+msgid "%s group chats found"
 msgstr " %s 找不到"
 
-#: gajim/gtk/discovery.py:70
+#: gajim/gtk/discovery.py:69
 msgid "This service has not yet responded with detailed information"
 msgstr "服務還沒有詳細的資訊應答"
 
-#: gajim/gtk/discovery.py:71
+#: gajim/gtk/discovery.py:70
 #, fuzzy
 msgid ""
 "This service could not respond with detailed information.\n"
@@ -8712,131 +9058,112 @@ msgstr ""
 "這個服務無法應答詳細的資訊。\n"
 "這很可能是伺服器的遺留問題，或是伺服器被損壞了"
 
-#: gajim/gtk/discovery.py:128
+#: gajim/gtk/discovery.py:126
 msgid "Others"
 msgstr "其他"
 
-#: gajim/gtk/discovery.py:131
-msgid "Conference"
-msgstr "會議"
+#: gajim/gtk/discovery.py:129
+#, fuzzy
+msgid "Group Chat"
+msgstr "多人聊天"
 
-#: gajim/gtk/discovery.py:519
+#: gajim/gtk/discovery.py:518
 msgid "Without a connection, you can not browse available services"
 msgstr "連線後才可瀏覽可用服務"
 
-#: gajim/gtk/discovery.py:606
+#: gajim/gtk/discovery.py:605
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "正在使用帳號 %s 來發掘服務"
 
-#: gajim/gtk/discovery.py:608
+#: gajim/gtk/discovery.py:607
 msgid "Service Discovery"
 msgstr "搜尋服務"
 
-#: gajim/gtk/discovery.py:691
+#: gajim/gtk/discovery.py:690
 msgid "The service could not be found"
 msgstr "找不到該服務"
 
-#: gajim/gtk/discovery.py:692
+#: gajim/gtk/discovery.py:691
 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:699 gajim/gtk/discovery.py:1042
+#: gajim/gtk/discovery.py:698 gajim/gtk/discovery.py:1041
 msgid "The service is not browsable"
 msgstr "該服務無法瀏覽"
 
-#: gajim/gtk/discovery.py:700
+#: gajim/gtk/discovery.py:699
 msgid "This type of service does not contain any items to browse."
 msgstr "此服務沒有項目可瀏覽。"
 
-#: gajim/gtk/discovery.py:738 gajim/gtk/discovery.py:747
+#: gajim/gtk/discovery.py:737 gajim/gtk/discovery.py:746
 msgid "Invalid Server Name"
 msgstr "無效的伺服器名稱"
 
-#: gajim/gtk/discovery.py:806
+#: gajim/gtk/discovery.py:805
 #, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "用帳號 %(account)s 瀏覽位址 %(address)s"
 
-#: gajim/gtk/discovery.py:851
+#: gajim/gtk/discovery.py:850
 #, fuzzy
 msgid "Browse"
 msgstr "瀏覽(_B)"
 
-#: gajim/gtk/discovery.py:1043
+#: gajim/gtk/discovery.py:1042
 msgid "This service does not contain any items to browse."
 msgstr "此服務不包含任何項目可瀏覽。"
 
-#: gajim/gtk/discovery.py:1255
+#: gajim/gtk/discovery.py:1254
 #, fuzzy
 msgid "_Command"
 msgstr "命令"
 
-#: gajim/gtk/discovery.py:1264 gajim/gtk/discovery.py:1422
+#: gajim/gtk/discovery.py:1263 gajim/gtk/discovery.py:1420
 msgid "Re_gister"
 msgstr "註冊(_G)"
 
-#: gajim/gtk/discovery.py:1277
+#: gajim/gtk/discovery.py:1276
 msgid "_Search"
 msgstr "搜尋(_S)"
 
-#: gajim/gtk/discovery.py:1420
+#: gajim/gtk/discovery.py:1418
 msgid "_Edit"
 msgstr "編輯(_E)"
 
-#: gajim/gtk/discovery.py:1458
+#: gajim/gtk/discovery.py:1456
 #, fuzzy, python-format
 msgid "Scanning %(current)d / %(total)d ..."
 msgstr "已掃描 %(current)d / %(total)d.."
 
-#: gajim/gtk/discovery.py:1674
+#: gajim/gtk/discovery.py:1655
+msgid "Users"
+msgstr "使用者"
+
+#: gajim/gtk/discovery.py:1671
 msgid "Id"
 msgstr "Id"
 
-#: gajim/gtk/discovery.py:1713
-msgid "_Join"
-msgstr "加入(_J)"
-
-#: gajim/gtk/discovery.py:1736
-msgid "Bookmark already set"
-msgstr "書籤已設定"
-
-#: gajim/gtk/discovery.py:1737
-#, fuzzy, python-format
-msgid "Group Chat '%s' is already in your bookmarks."
-msgstr "聊天室\"%s\"已在您的書籤中。"
-
-#: gajim/gtk/discovery.py:1748
-msgid "Bookmark has been added successfully"
-msgstr "書籤加入成功"
-
-#: gajim/gtk/discovery.py:1749
-#, fuzzy
-msgid ""
-"You can manage your bookmarks by clicking the Bookmarks menu item in your "
-"contact list."
-msgstr "您可以透過\"動作\"選單管理您的書籤。"
-
-#: gajim/gtk/discovery.py:1950
+#: gajim/gtk/discovery.py:1900
 msgid "Subscribed"
 msgstr "訂閱"
 
-#: gajim/gtk/discovery.py:1959
+#: gajim/gtk/discovery.py:1909
 msgid "Node"
 msgstr "節點"
 
-#: gajim/gtk/discovery.py:2028
+#: gajim/gtk/discovery.py:1978
 #, fuzzy
 msgid "_New post"
 msgstr "新發表"
 
-#: gajim/gtk/discovery.py:2037
+#: gajim/gtk/discovery.py:1987
 msgid "_Subscribe"
 msgstr "訂閱(_S)"
 
-#: gajim/gtk/discovery.py:2045
+#: gajim/gtk/discovery.py:1995
 msgid "_Unsubscribe"
 msgstr "退訂(_S)"
 
@@ -8883,7 +9210,7 @@ msgstr "來自 %s"
 msgid "Characters typed: %s"
 msgstr "不允許的字元"
 
-#: gajim/gtk/single_message.py:274 gajim/gtk/xml_console.py:169
+#: gajim/gtk/single_message.py:274 gajim/gtk/xml_console.py:166
 msgid "Connection not available"
 msgstr "連線無法使用"
 
@@ -8892,6 +9219,12 @@ msgstr "連線無法使用"
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "請確認您已經連線到 \"%s\"。"
 
+#: gajim/gtk/single_message.py:306
+#, 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:330
 #, python-format
 msgid "RE: %s"
@@ -8902,28 +9235,28 @@ msgstr "回復: %s"
 msgid "%s wrote:\n"
 msgstr "%s 寫道: \n"
 
-#: gajim/gtk/pep_config.py:44
+#: gajim/gtk/pep_config.py:45
 #, fuzzy, python-format
 msgid "PEP Service Configuration (%s)"
 msgstr "個人事件服務配置"
 
-#: gajim/gtk/pep_config.py:77
+#: gajim/gtk/pep_config.py:78
 #, fuzzy
 msgid "Service"
 msgstr "伺服器"
 
-#: gajim/gtk/pep_config.py:114
+#: gajim/gtk/pep_config.py:115
 msgid "PEP node was not removed"
 msgstr "PEP節點沒有被移除"
 
-#: gajim/gtk/pep_config.py:115
+#: gajim/gtk/pep_config.py:116
 #, fuzzy, python-format
 msgid ""
 "PEP node %(node)s was not removed:\n"
 "%(message)s"
 msgstr "PEP 節點 %(node)s 沒有被移除: %(message)s"
 
-#: gajim/gtk/pep_config.py:146
+#: gajim/gtk/pep_config.py:147
 #, python-format
 msgid "Configure %s"
 msgstr "組配 %s"
@@ -8939,17 +9272,21 @@ msgstr "註冊(_G):"
 msgid "Registration successful"
 msgstr "註冊成功"
 
-#: gajim/gtk/dialogs.py:54 gajim/gtk/dataform.py:659 gajim/gtk/adhoc.py:85
+#: gajim/gtk/service_registration.py:215
+msgid "Registration failed"
+msgstr "註冊失敗"
+
+#: gajim/gtk/dialogs.py:53 gajim/gtk/dataform.py:668 gajim/gtk/adhoc.py:86
 #, fuzzy
 msgid "Cancel"
 msgstr "取消(_C)"
 
-#: gajim/gtk/dialogs.py:129
+#: gajim/gtk/dialogs.py:128
 #, fuzzy, python-format
 msgid "Dictionary for language \"%s\" not available"
 msgstr "語言 %s 的詞典無法使用"
 
-#: gajim/gtk/dialogs.py:130
+#: gajim/gtk/dialogs.py:129
 #, fuzzy, python-format
 msgid ""
 "You have to install the dictionary \"%s\" to use spellchecking, or choose "
@@ -8961,11 +9298,11 @@ msgstr ""
 "言。\n"
 "高亮度拼寫錯誤的特性不會被啟用。"
 
-#: gajim/gtk/dialogs.py:410 gajim/gtk/dialogs.py:425
+#: gajim/gtk/dialogs.py:322 gajim/gtk/dialogs.py:337
 msgid "Insecure connection"
 msgstr "不安全的連線"
 
-#: gajim/gtk/dialogs.py:411
+#: gajim/gtk/dialogs.py:323
 #, fuzzy, python-format
 msgid ""
 "You are about to connect to the account %(account)s (%(server)s) insecurely. "
@@ -8976,121 +9313,116 @@ msgstr ""
 "您即將透過不安全的連線與帳號 %(account)s (%(server)s) 連接。這意味著您的所有"
 "對話都會不經加密地被交換。您確定要這樣做嗎？"
 
-#: gajim/gtk/dialogs.py:416
+#: gajim/gtk/dialogs.py:328
 msgid "Yes, I really want to connect insecurely"
 msgstr "是的，我確實想要不安全地連線"
 
-#: gajim/gtk/dialogs.py:417
+#: gajim/gtk/dialogs.py:329
 msgid "Gajim will NOT connect unless you check this box"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:675
-#, fuzzy
-msgid "The nickname contains invalid characters."
-msgstr "暱稱包含不合法字元。"
-
-#: gajim/gtk/dialogs.py:734
+#: gajim/gtk/dialogs.py:561
 #, fuzzy, python-format
 msgid "Destroy %s"
 msgstr "正在銷毀 %s"
 
-#: gajim/gtk/dialogs.py:775
+#: gajim/gtk/dialogs.py:602
 #, fuzzy
 msgid "Certificate"
 msgstr "客戶端證書"
 
-#: gajim/gtk/dialogs.py:786
+#: gajim/gtk/dialogs.py:613
 #, fuzzy, python-format
 msgid ""
 "Certificate for account\n"
 "%s"
 msgstr "帳號憑證 %s"
 
-#: gajim/gtk/dialogs.py:824
+#: gajim/gtk/dialogs.py:651
 msgid "Issued to\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:825 gajim/gtk/dialogs.py:830
+#: gajim/gtk/dialogs.py:652 gajim/gtk/dialogs.py:657
 msgid "Common Name (CN): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:826 gajim/gtk/dialogs.py:831
+#: gajim/gtk/dialogs.py:653 gajim/gtk/dialogs.py:658
 msgid "Organization (O): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:827 gajim/gtk/dialogs.py:832
+#: gajim/gtk/dialogs.py:654 gajim/gtk/dialogs.py:659
 msgid "Organizational Unit (OU): "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:828
+#: gajim/gtk/dialogs.py:655
 #, fuzzy
 msgid "Serial Number: "
 msgstr "GG 號碼:"
 
-#: gajim/gtk/dialogs.py:829
+#: gajim/gtk/dialogs.py:656
 msgid "Issued by\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:833
+#: gajim/gtk/dialogs.py:660
 msgid "Validity\n"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:834
+#: gajim/gtk/dialogs.py:661
 msgid "Issued on: "
 msgstr ""
 
-#: gajim/gtk/dialogs.py:835
+#: gajim/gtk/dialogs.py:662
 #, fuzzy
 msgid "Expires on: "
 msgstr "expire"
 
-#: gajim/gtk/dialogs.py:836
+#: gajim/gtk/dialogs.py:663
 msgid "SHA-1:"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:838
+#: gajim/gtk/dialogs.py:665
 msgid "SHA-256:"
 msgstr ""
 
-#: gajim/gtk/dialogs.py:852
+#: gajim/gtk/dialogs.py:679
 #, fuzzy
 msgid "View certificate…"
 msgstr "檢視憑證…"
 
-#: gajim/gtk/dialogs.py:864 gajim/gtk/accounts.py:893
+#: gajim/gtk/dialogs.py:691 gajim/gtk/accounts.py:896
 msgid "Change Password"
 msgstr "變更密碼"
 
-#: gajim/gtk/dialogs.py:878
+#: gajim/gtk/dialogs.py:705
 msgid "_OK"
 msgstr "確定(_O)"
 
-#: gajim/gtk/dialogs.py:891
+#: gajim/gtk/dialogs.py:718
 #, fuzzy
 msgid "You must enter a password"
 msgstr "您必須輸入密碼"
 
-#: gajim/gtk/dialogs.py:895
+#: gajim/gtk/dialogs.py:722
 msgid "Passwords do not match"
 msgstr "密碼不符"
 
-#: gajim/gtk/dialogs.py:923
+#: gajim/gtk/dialogs.py:750
 #, fuzzy
 msgid "Group Chat Invitation "
 msgstr "多人聊天邀請"
 
-#: gajim/gtk/dialogs.py:948
+#: gajim/gtk/dialogs.py:775
 #, fuzzy, python-format
 msgid "<b>%s</b> has invited you to join a discussion"
 msgstr "$Contact 邀請您加入一個聊天室"
 
-#: gajim/gtk/dialogs.py:951
+#: gajim/gtk/dialogs.py:778
 #, 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:959
+#: gajim/gtk/dialogs.py:786
 #, python-format
 msgid "Comment: %s"
 msgstr "註釋: %s"
@@ -9105,11 +9437,6 @@ msgstr "GG 號碼:"
 msgid "ICQ Number"
 msgstr "ICQ 號碼:"
 
-#: gajim/gtk/add_contact.py:40
-#, fuzzy
-msgid "Add Contact"
-msgstr "加入聯絡人(_A)…"
-
 #: gajim/gtk/add_contact.py:259
 #, fuzzy, python-format
 msgid "%s Missing"
@@ -9130,7 +9457,8 @@ msgid "The user ID must not contain a resource."
 msgstr "使用者ID不應包含資源。"
 
 #: gajim/gtk/add_contact.py:299
-msgid "You cannot add yourself to your roster."
+#, fuzzy
+msgid "You cannot add yourself to your contact list."
 msgstr "您不能將您自己加入到您的聯絡人清單中。"
 
 #: gajim/gtk/add_contact.py:304
@@ -9143,11 +9471,13 @@ msgid "Your account must be online to add new contacts."
 msgstr ""
 
 #: gajim/gtk/add_contact.py:321
-msgid "Contact already in roster"
+#, fuzzy
+msgid "Contact Already in Contact List"
 msgstr "聯絡人已經在聯絡人清單中"
 
 #: gajim/gtk/add_contact.py:322
-msgid "This contact is already listed in your roster."
+#, fuzzy
+msgid "This contact is already in your contact list."
 msgstr "此聯絡人已經在您的聯絡人清單中了"
 
 #: gajim/gtk/add_contact.py:379 gajim/gtk/add_contact.py:417
@@ -9188,14 +9518,14 @@ msgstr "變更狀態"
 
 #: gajim/gtk/themes.py:52
 #, fuzzy
-msgid "MUC Tab New Directed Message"
+msgid "Group Chat Tab New Directed Message"
 msgstr ""
 "多人聊天指示性\n"
 "訊息"
 
 #: gajim/gtk/themes.py:56
 #, fuzzy
-msgid "MUC Tab New Message"
+msgid "Group Chat Tab New Message"
 msgstr "新訊息"
 
 #: gajim/gtk/themes.py:60
@@ -9412,13 +9742,13 @@ msgstr "所有檔案"
 msgid "Clear File"
 msgstr "清潔"
 
-#: gajim/gtk/settings.py:570
+#: gajim/gtk/settings.py:570 gajim/gtk/proxies.py:32
 #, fuzzy
 msgid "Manage Proxies"
 msgstr "管理代理伺服器設定"
 
-#: gajim/gtk/settings.py:591 gajim/gtk/preferences.py:971
-#: gajim/gtk/preferences.py:984 gajim/gtk/preferences.py:988
+#: gajim/gtk/settings.py:591 gajim/gtk/preferences.py:968
+#: gajim/gtk/preferences.py:982 gajim/gtk/preferences.py:986
 #, fuzzy
 msgid "No Proxy"
 msgstr "代理伺服器(_Y):"
@@ -9498,14 +9828,15 @@ msgid ""
 "        "
 msgstr ""
 
-#: gajim/gtk/about.py:47 data/org.gajim.Gajim.appdata.xml.in:10
+#: gajim/gtk/about.py:47 data/org.gajim.Gajim.desktop.in:6
+#: data/org.gajim.Gajim.appdata.xml.in:10
 #, fuzzy
-msgid "A GTK+ XMPP client"
+msgid "A GTK XMPP client"
 msgstr "一個 GTK+ 的 Jabber 客戶端"
 
 #: gajim/gtk/about.py:48
 #, fuzzy, python-format
-msgid "GTK+ Version: %s"
+msgid "GTK Version: %s"
 msgstr "GTK+ 版本:"
 
 #: gajim/gtk/about.py:49
@@ -9687,6 +10018,25 @@ msgstr "?transfer status:暫停"
 msgid "?transfer status:Not started"
 msgstr "?transfer status:暫停"
 
+#: gajim/gtk/groupchat_creation.py:97 gajim/gtk/groupchat_creation.py:99
+msgid " (optional)..."
+msgstr ""
+
+#: gajim/gtk/groupchat_creation.py:134
+#, fuzzy
+msgid "Invalid Address"
+msgstr "無效檔案"
+
+#: gajim/gtk/groupchat_creation.py:182
+#, fuzzy
+msgid "Not Connected"
+msgstr "已連線"
+
+#: gajim/gtk/groupchat_creation.py:183
+#, fuzzy
+msgid "You have to be connected to create a group chat."
+msgstr "您還沒有加入聊天室。"
+
 #: gajim/gtk/sounds.py:39
 msgid "Wav Sounds"
 msgstr "Wav聲音"
@@ -9728,48 +10078,44 @@ msgstr "多人聊天訊息高亮度顯示"
 msgid "Group Chat Message Received"
 msgstr "收到的多人聊天訊息"
 
-#: gajim/gtk/dataform.py:226 gajim/gtk/dataform.py:262
+#: gajim/gtk/dataform.py:232 gajim/gtk/dataform.py:268
 #, fuzzy
 msgid "Required"
 msgstr "require"
 
-#: gajim/gtk/dataform.py:286
+#: gajim/gtk/dataform.py:293
 msgid "Yes"
 msgstr "Yes"
 
-#: gajim/gtk/dataform.py:286
+#: gajim/gtk/dataform.py:293
 msgid "No"
 msgstr "No"
 
-#: gajim/gtk/dataform.py:661
+#: gajim/gtk/dataform.py:670
 msgid "Submit"
 msgstr ""
 
-#: gajim/gtk/statusicon.py:213
+#: gajim/gtk/statusicon.py:206
 #, fuzzy
 msgid "_Change Status Message…"
 msgstr "變更狀態訊息(_C)"
 
-#: gajim/gtk/statusicon.py:247 gajim/gtk/statusicon.py:292
-#: gajim/gtk/statusicon.py:299
+#: gajim/gtk/statusicon.py:258
 #, python-format
 msgid "using account %s"
 msgstr "使用帳號 %s"
 
-#: gajim/gtk/statusicon.py:309
+#: gajim/gtk/statusicon.py:269
 #, fuzzy
-msgid "_Manage Bookmarks…"
-msgstr "書籤管理"
-
-#: gajim/gtk/statusicon.py:325
-msgid "Hide _Roster"
-msgstr "隱藏聯絡人清單(_R)"
+msgid "Hide _Contact List"
+msgstr "邀請聯絡人(_C)"
 
-#: gajim/gtk/statusicon.py:329
-msgid "Show _Roster"
-msgstr "顯示聯絡人清單(_R)"
+#: gajim/gtk/statusicon.py:273
+#, fuzzy
+msgid "Show _Contact List"
+msgstr "只顯示活動的聯絡人(_A)"
 
-#: gajim/gtk/statusicon.py:337
+#: gajim/gtk/statusicon.py:281
 msgid "Hide this menu"
 msgstr "隱藏本選單"
 
@@ -9814,36 +10160,6 @@ msgid ""
 "later."
 msgstr "發布您的個人資訊時發生錯誤，請稍後重試。"
 
-#: gajim/gtk/join_groupchat.py:202
-#, fuzzy
-msgid "Invalid Room"
-msgstr "無效聊天室"
-
-#: gajim/gtk/join_groupchat.py:203
-msgid "Please choose a room"
-msgstr ""
-
-#: gajim/gtk/join_groupchat.py:222 gajim/gtk/join_groupchat.py:229
-msgid "Invalid Nickname"
-msgstr "不合法的暱稱"
-
-#: gajim/gtk/join_groupchat.py:223
-#, fuzzy
-msgid "Please choose a nickname"
-msgstr "請用您想要的名稱新增一個主題。"
-
-#: gajim/gtk/join_groupchat.py:282 gajim/gtk/join_groupchat.py:288
-#: gajim/gtk/join_groupchat.py:293
-#, fuzzy
-msgid "Wrong server"
-msgstr "錯誤的 uri"
-
-#: gajim/gtk/join_groupchat.py:283 gajim/gtk/join_groupchat.py:289
-#: gajim/gtk/join_groupchat.py:294
-#, fuzzy, python-format
-msgid "%s is not a groupchat server"
-msgstr "這不是一個聊天室"
-
 #: gajim/gtk/mam_preferences.py:38
 #, python-format
 msgid "Archiving Preferences for %s"
@@ -9874,45 +10190,53 @@ msgstr "在收到的資料表中有錯誤"
 msgid "Archiving Preferences Error"
 msgstr "編輯存檔偏好設定(_V)"
 
-#: gajim/gtk/advanced_config.py:81
+#: gajim/gtk/advanced_config.py:95
 msgid "Activated"
 msgstr "啟用的"
 
-#: gajim/gtk/advanced_config.py:81
+#: gajim/gtk/advanced_config.py:95
 msgid "Deactivated"
 msgstr "未啟用的"
 
-#: gajim/gtk/advanced_config.py:83
-msgid "Boolean"
-msgstr "Boolean"
+#: gajim/gtk/advanced_config.py:97
+msgid "?config type:Boolean"
+msgstr ""
 
-#: gajim/gtk/advanced_config.py:84
-msgid "Integer"
-msgstr "Integer"
+#: gajim/gtk/advanced_config.py:98
+msgid "?config type:Integer"
+msgstr ""
 
-#: gajim/gtk/advanced_config.py:85
-msgid "Text"
-msgstr "Text"
+#: gajim/gtk/advanced_config.py:99
+msgid "?config type:Text"
+msgstr ""
 
-#: gajim/gtk/advanced_config.py:97
-msgid "Preference Name"
+#: gajim/gtk/advanced_config.py:100
+msgid "?config type:Color"
+msgstr ""
+
+#: gajim/gtk/advanced_config.py:112
+#, fuzzy
+msgid "?config:Preference Name"
 msgstr "Preference Name"
 
-#: gajim/gtk/advanced_config.py:104
-msgid "Value"
-msgstr "值"
+#: gajim/gtk/advanced_config.py:123
+#, fuzzy
+msgid "?config:Value"
+msgstr "配置"
 
-#: gajim/gtk/advanced_config.py:113
-msgid "Type"
-msgstr "類型"
+#: gajim/gtk/advanced_config.py:132
+msgid "?config:Type"
+msgstr ""
 
-#: gajim/gtk/advanced_config.py:168
-msgid "(None)"
-msgstr "(無)"
+#: gajim/gtk/advanced_config.py:187
+#, fuzzy
+msgid "?config description:None"
+msgstr "無"
 
-#: gajim/gtk/advanced_config.py:299
-msgid "Hidden"
-msgstr "隱藏"
+#: gajim/gtk/advanced_config.py:322
+#, fuzzy
+msgid "?password:Hidden"
+msgstr "密碼:"
 
 #: gajim/gtk/server_info.py:66
 #, fuzzy
@@ -9924,8 +10248,8 @@ msgstr "複製連結位置(_C)"
 msgid "%(days)s days, %(hours)s hours"
 msgstr ""
 
-#: gajim/gtk/server_info.py:218 gajim/gtk/accounts.py:749
-#: gajim/gtk/accounts.py:853
+#: gajim/gtk/server_info.py:218 gajim/gtk/accounts.py:752
+#: gajim/gtk/accounts.py:856
 #, fuzzy
 msgid "Hostname"
 msgstr "主機名稱(_H):"
@@ -10113,11 +10437,6 @@ msgstr "不合法的清單名稱"
 msgid "You must enter a name to create a privacy list."
 msgstr "您必須輸入一個名稱以建立一個隱私策略清單。"
 
-#: gajim/gtk/groupchat_config.py:41
-#, fuzzy
-msgid "Group Chat Configuration"
-msgstr "多人聊天邀請"
-
 #: gajim/gtk/groupchat_config.py:134
 #, fuzzy
 msgid "A Group Chat needs at least one Owner"
@@ -10128,69 +10447,69 @@ msgid "You are not allowed to modify the affiliation of Admins and Owners"
 msgstr ""
 
 #: gajim/gtk/groupchat_config.py:399
-msgid "An entry with this Jabber-ID already exists"
+msgid "An entry with this XMPP Address already exists"
 msgstr ""
 
-#: gajim/gtk/adhoc.py:91
+#: gajim/gtk/adhoc.py:92
 #, fuzzy
 msgid "Finish"
 msgstr "完成(_F)"
 
-#: gajim/gtk/adhoc.py:97 gajim/gtk/adhoc.py:283
+#: gajim/gtk/adhoc.py:98 gajim/gtk/adhoc.py:284
 #, fuzzy
 msgid "Commands"
 msgstr "命令"
 
-#: gajim/gtk/adhoc.py:103
+#: gajim/gtk/adhoc.py:104
 msgid "Next"
 msgstr ""
 
-#: gajim/gtk/adhoc.py:109
+#: gajim/gtk/adhoc.py:110
 #, fuzzy
 msgid "Previous"
 msgstr "羨慕"
 
-#: gajim/gtk/adhoc.py:115
+#: gajim/gtk/adhoc.py:116
 #, fuzzy
 msgid "Execute"
 msgstr "執行命令(_E)…"
 
-#: gajim/gtk/adhoc.py:195
+#: gajim/gtk/adhoc.py:196
 #, fuzzy
 msgid "No commands available"
 msgstr "沒有有效帳號"
 
-#: gajim/gtk/adhoc.py:244
+#: gajim/gtk/adhoc.py:245
 #, fuzzy
 msgid "Request Command List"
 msgstr "執行命令(_E)…"
 
-#: gajim/gtk/adhoc.py:259
+#: gajim/gtk/adhoc.py:260
 #, fuzzy
 msgid "Executing…"
 msgstr "執行命令(_E)…"
 
-#: gajim/gtk/adhoc.py:266
+#: gajim/gtk/adhoc.py:267
 #, fuzzy
 msgid "Command List"
 msgstr "封禁名單"
 
-#: gajim/gtk/adhoc.py:384
+#: gajim/gtk/adhoc.py:385
 #, fuzzy
 msgid "Finished"
 msgstr "完成(_F)"
 
-#: gajim/gtk/adhoc.py:453
+#: gajim/gtk/adhoc.py:454
 #, fuzzy
 msgid "Execution failed"
 msgstr "連線失敗"
 
-#: gajim/gtk/blocking.py:37
+#: gajim/gtk/blocking.py:38
 #, fuzzy, python-format
 msgid "Blocking List for %s"
 msgstr "%s 的隱私策略清單"
 
-#: gajim/gtk/blocking.py:71
+#: gajim/gtk/blocking.py:72
 #, fuzzy
 msgid "Error!"
 msgstr "錯誤"
@@ -10238,8 +10557,7 @@ msgstr "無效使用者名稱"
 msgid "You must provide a username to configure this account."
 msgstr "必須提供使用者名稱來配置此帳號。"
 
-#: gajim/gtk/account_wizard.py:252 gajim/gtk/bookmarks.py:290
-#: gajim/gtk/bookmarks.py:303
+#: gajim/gtk/account_wizard.py:252
 msgid "Invalid server"
 msgstr "無效的伺服器"
 
@@ -10255,7 +10573,7 @@ msgstr "無效輸入"
 msgid "Custom port must be a port number."
 msgstr "自訂連接埠必須為連接埠號碼。"
 
-#: gajim/gtk/account_wizard.py:405
+#: gajim/gtk/account_wizard.py:406
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -10270,15 +10588,15 @@ msgstr ""
 "SSL 錯誤: %(error)s\n"
 "您仍然想要連線到這個伺服器嗎?"
 
-#: gajim/gtk/account_wizard.py:446 gajim/gtk/account_wizard.py:480
+#: gajim/gtk/account_wizard.py:447 gajim/gtk/account_wizard.py:481
 msgid "An error occurred during account creation"
 msgstr "建立帳號期間發生錯誤"
 
-#: gajim/gtk/account_wizard.py:545
+#: gajim/gtk/account_wizard.py:546
 msgid "Account name is in use"
 msgstr "帳號名稱已經被使用"
 
-#: gajim/gtk/account_wizard.py:546
+#: gajim/gtk/account_wizard.py:547
 msgid "You already have an account using this name."
 msgstr "您已經有帳號使用這個名稱了。"
 
@@ -10305,26 +10623,26 @@ msgstr "從 %(name)s 傳輸的檔案 %(filename)s 被停止。"
 msgid "%(minutes)s min %(seconds)s sec"
 msgstr ""
 
-#: gajim/gtk/xml_console.py:77
+#: gajim/gtk/xml_console.py:74
 #, fuzzy
 msgid "Filter"
 msgstr "過濾器:"
 
-#: gajim/gtk/xml_console.py:82
+#: gajim/gtk/xml_console.py:79
 #, fuzzy
 msgid "XML Input"
 msgstr "<b>XML 輸入</b>"
 
-#: gajim/gtk/xml_console.py:86
+#: gajim/gtk/xml_console.py:83
 msgid "Paste Last Input"
 msgstr ""
 
-#: gajim/gtk/xml_console.py:170
+#: gajim/gtk/xml_console.py:167
 #, fuzzy, python-format
 msgid "Please make sure you are connected with '%s'."
 msgstr "請確認您已經連線到 \"%s\"。"
 
-#: gajim/gtk/xml_console.py:182
+#: gajim/gtk/xml_console.py:177
 #, fuzzy
 msgid "Invalid Node"
 msgstr "無效檔案"
@@ -10357,305 +10675,315 @@ msgstr "搜尋"
 msgid "No results found"
 msgstr "無結果"
 
-#: gajim/gtk/preferences.py:358 gajim/gtk/preferences.py:362
+#: gajim/gtk/preferences.py:357 gajim/gtk/preferences.py:361
 msgid "Default"
 msgstr "預設"
 
-#: gajim/gtk/preferences.py:801
+#: gajim/gtk/preferences.py:798
 msgid "status message title"
 msgstr "狀態訊息標題"
 
-#: gajim/gtk/preferences.py:802
+#: gajim/gtk/preferences.py:799
 msgid "status message text"
 msgstr "狀態訊息文字"
 
+#: gajim/gtk/accounts.py:137
+#, fuzzy
+msgid "Re-Login"
+msgstr "現在重新登入?"
+
 #: gajim/gtk/accounts.py:138
-msgid "Relogin now?"
+#, fuzzy
+msgid "Re-Login now?"
 msgstr "現在重新登入?"
 
 #: gajim/gtk/accounts.py:139
-msgid "If you want all the changes to apply instantly, you must relogin."
+#, fuzzy
+msgid "To apply all changes instantly, you have to re-login."
 msgstr "如果想使所有調整立即生效，您必須重新登入。"
 
-#: gajim/gtk/accounts.py:191 gajim/gtk/accounts.py:975
+#: gajim/gtk/accounts.py:141
+msgid "_Later"
+msgstr ""
+
+#: gajim/gtk/accounts.py:143
+msgid "_Re-Login"
+msgstr ""
+
+#: gajim/gtk/accounts.py:194 gajim/gtk/accounts.py:978
 #, fuzzy
 msgid "Remove Account"
 msgstr "移除帳號 %s"
 
-#: gajim/gtk/accounts.py:192
+#: gajim/gtk/accounts.py:195
 #, fuzzy, python-format
 msgid "You still have open chats in your account %s"
 msgstr "您已在帳號 %s 開啟聊天"
 
-#: gajim/gtk/accounts.py:193
+#: gajim/gtk/accounts.py:196
 #, fuzzy
 msgid ""
 "All chat and group chat windows will be closed.\n"
 "Do you want to continue?"
 msgstr "所有的聊天和多人聊天視窗將會關閉。您想繼續嗎?"
 
-#: gajim/gtk/accounts.py:424
+#: gajim/gtk/accounts.py:427
 #, fuzzy
 msgid "Back"
 msgstr "馬上回來"
 
-#: gajim/gtk/accounts.py:530
+#: gajim/gtk/accounts.py:533
 #, fuzzy
 msgid "Please check if Bonjour is installed."
 msgstr "請檢查 Avahi 或是 Bonjour 是否已經安裝。"
 
-#: gajim/gtk/accounts.py:532
+#: gajim/gtk/accounts.py:535
 #, fuzzy
 msgid "Please check if Avahi is installed."
 msgstr "請檢查 Avahi 或是 Bonjour 是否已經安裝。"
 
-#: gajim/gtk/accounts.py:569
+#: gajim/gtk/accounts.py:572
 #, fuzzy
 msgid "Disable Account"
 msgstr "無效的帳號"
 
-#: gajim/gtk/accounts.py:570
+#: gajim/gtk/accounts.py:573
 #, fuzzy, python-format
 msgid "Account %s is still connected"
 msgstr "帳號 \"%s\" 已連線到伺服器"
 
-#: gajim/gtk/accounts.py:571
+#: gajim/gtk/accounts.py:574
 #, fuzzy
 msgid ""
 "All chat and group chat windows will be closed. Do you want to continue?"
 msgstr "所有的聊天和多人聊天視窗將會關閉。您想繼續嗎?"
 
-#: gajim/gtk/accounts.py:576
+#: gajim/gtk/accounts.py:579
 #, fuzzy
 msgid "_Disable Account"
 msgstr "無效的帳號"
 
-#: gajim/gtk/accounts.py:595
+#: gajim/gtk/accounts.py:598
 #, fuzzy
 msgid "Add Account"
 msgstr "加入聯絡人(_A)…"
 
-#: gajim/gtk/accounts.py:663
+#: gajim/gtk/accounts.py:666
 #, fuzzy
 msgid "Label"
 msgstr "標籤"
 
-#: gajim/gtk/accounts.py:667
+#: gajim/gtk/accounts.py:670
 msgid "Login"
 msgstr ""
 
-#: gajim/gtk/accounts.py:670
+#: gajim/gtk/accounts.py:673
 #, fuzzy
 msgid "Import Contacts"
 msgstr "邀請聯絡人(_C)"
 
-#: gajim/gtk/accounts.py:674 gajim/gtk/accounts.py:870
+#: gajim/gtk/accounts.py:677 gajim/gtk/accounts.py:873
 #, fuzzy
 msgid "Client Certificate"
 msgstr "客戶端證書"
 
-#: gajim/gtk/accounts.py:677 gajim/gtk/accounts.py:774
+#: gajim/gtk/accounts.py:680 gajim/gtk/accounts.py:777
 #, fuzzy
 msgid "Connect on startup"
 msgstr "Gajim 啟動時連線(_O)"
 
-#: gajim/gtk/accounts.py:681 gajim/gtk/accounts.py:779
+#: gajim/gtk/accounts.py:684 gajim/gtk/accounts.py:782
 #, fuzzy
 msgid "Save conversations for all contacts"
 msgstr "儲存與所有聯絡人的聊天記錄(_L)"
 
-#: gajim/gtk/accounts.py:683 gajim/gtk/accounts.py:781
+#: gajim/gtk/accounts.py:686 gajim/gtk/accounts.py:784
 msgid "Store conversations on the harddrive"
 msgstr ""
 
-#: gajim/gtk/accounts.py:685 gajim/gtk/accounts.py:783
+#: gajim/gtk/accounts.py:688 gajim/gtk/accounts.py:786
 #, fuzzy
 msgid "Global Status"
 msgstr "狀態"
 
-#: gajim/gtk/accounts.py:687
+#: gajim/gtk/accounts.py:690
 #, fuzzy
 msgid "Synchronise the status of all accounts"
 msgstr "變更一個或多個帳號狀態"
 
-#: gajim/gtk/accounts.py:689
+#: gajim/gtk/accounts.py:692
 msgid "Use file transfer proxies"
 msgstr "使用檔案傳輸代理伺服器"
 
-#: gajim/gtk/accounts.py:705
+#: gajim/gtk/accounts.py:708
 #, fuzzy
 msgid "Idle Time"
 msgstr "閒置，自從 %s"
 
-#: gajim/gtk/accounts.py:707
+#: gajim/gtk/accounts.py:710
 msgid "Disclose the time of your last activity"
 msgstr ""
 
-#: gajim/gtk/accounts.py:709
+#: gajim/gtk/accounts.py:712
 msgid "Local System Time"
 msgstr ""
 
-#: gajim/gtk/accounts.py:711
+#: gajim/gtk/accounts.py:714
 msgid "Disclose the local system time of the device Gajim runs on"
 msgstr ""
 
-#: gajim/gtk/accounts.py:714
+#: gajim/gtk/accounts.py:717
 #, fuzzy
 msgid "Client / Operating System"
 msgstr "客戶端證書"
 
-#: gajim/gtk/accounts.py:716
+#: gajim/gtk/accounts.py:719
 #, fuzzy
 msgid ""
 "Disclose informations about the client and operating system you currently use"
 msgstr "允許 Gajim 發送您正在執行的作業系統相關資訊。"
 
-#: gajim/gtk/accounts.py:719
+#: gajim/gtk/accounts.py:722
 #, fuzzy
 msgid "Ignore Unknown Contacts"
 msgstr "邀請聯絡人(_C)"
 
-#: gajim/gtk/accounts.py:721
+#: gajim/gtk/accounts.py:724
 #, fuzzy
 msgid "Ignore everything from contacts not in your Roster"
 msgstr "忽略聯絡人清單以外的聯絡人觸發的事件(_I)"
 
-#: gajim/gtk/accounts.py:737 gajim/gtk/accounts.py:776
+#: gajim/gtk/accounts.py:740 gajim/gtk/accounts.py:779
 #, fuzzy
 msgid "Use environment variable"
 msgstr "使用 HTTP__PROXY 環境變數(_U)"
 
-#: gajim/gtk/accounts.py:739
-#, fuzzy
-msgid "Proxy"
-msgstr "代理伺服器(_Y):"
-
-#: gajim/gtk/accounts.py:742
+#: gajim/gtk/accounts.py:745
 #, fuzzy
 msgid "Warn on insecure connection"
 msgstr "在使用不安全的連線之前警告(_W)"
 
-#: gajim/gtk/accounts.py:746
+#: gajim/gtk/accounts.py:749
 #, fuzzy
 msgid "Send keep-alive packets"
 msgstr "傳送資料封包以防止連線逾時"
 
-#: gajim/gtk/accounts.py:750
+#: gajim/gtk/accounts.py:753
 msgid "Manually set the hostname for the server"
 msgstr ""
 
-#: gajim/gtk/accounts.py:756 gajim/gtk/accounts.py:826
-#: gajim/gtk/accounts.py:831
+#: gajim/gtk/accounts.py:759 gajim/gtk/accounts.py:829
+#: gajim/gtk/accounts.py:834
 #, fuzzy
 msgid "Priority"
 msgstr "優先等級(_T):"
 
-#: gajim/gtk/accounts.py:785
+#: gajim/gtk/accounts.py:788
 #, fuzzy
 msgid "Synchronize the status of all accounts"
 msgstr "變更一個或多個帳號狀態"
 
-#: gajim/gtk/accounts.py:795
+#: gajim/gtk/accounts.py:798
 #, fuzzy
 msgid "First Name"
 msgstr "名稱:"
 
-#: gajim/gtk/accounts.py:798
+#: gajim/gtk/accounts.py:801
 #, fuzzy
 msgid "Last Name"
 msgstr "姓:"
 
-#: gajim/gtk/accounts.py:804
+#: gajim/gtk/accounts.py:807
 #, fuzzy
 msgid "Email"
 msgstr "新電子郵件"
 
-#: gajim/gtk/accounts.py:822
+#: gajim/gtk/accounts.py:825
 #, fuzzy
 msgid "Adjust to status"
 msgstr "依據狀態調整(_A)"
 
-#: gajim/gtk/accounts.py:849
+#: gajim/gtk/accounts.py:852
 #, fuzzy
 msgid "Enable"
 msgstr "啟用"
 
-#: gajim/gtk/accounts.py:857
+#: gajim/gtk/accounts.py:860
 #, fuzzy
 msgid "Port"
 msgstr "連接埠(_P):"
 
-#: gajim/gtk/accounts.py:862
+#: gajim/gtk/accounts.py:865
 #, fuzzy
 msgid "Connection Settings"
 msgstr "連線"
 
-#: gajim/gtk/accounts.py:872
+#: gajim/gtk/accounts.py:875
 msgid "PKCS12 Files"
 msgstr "PKCS12 檔案"
 
-#: gajim/gtk/accounts.py:874
+#: gajim/gtk/accounts.py:877
 #, fuzzy
 msgid "Encrypted Certificate"
 msgstr "客戶端證書"
 
-#: gajim/gtk/accounts.py:878
+#: gajim/gtk/accounts.py:881
 #, fuzzy
 msgid "Certificate Settings"
 msgstr "客戶端證書"
 
-#: gajim/gtk/accounts.py:890
+#: gajim/gtk/accounts.py:893
 #, fuzzy
 msgid "Save Password"
 msgstr "儲存密碼"
 
-#: gajim/gtk/accounts.py:898
+#: gajim/gtk/accounts.py:901
 #, fuzzy
 msgid "Login Settings"
 msgstr "外掛程式"
 
-#: gajim/gtk/accounts.py:931
+#: gajim/gtk/accounts.py:934
 #, fuzzy, python-format
 msgid "Removing account %s"
 msgstr "移除帳號 %s"
 
-#: gajim/gtk/accounts.py:946
+#: gajim/gtk/accounts.py:949
 msgid "Account is disabled"
 msgstr "帳號被停用"
 
-#: gajim/gtk/accounts.py:947
+#: gajim/gtk/accounts.py:950
 #, fuzzy
 msgid "To unregister from a server, the account must be enabled."
 msgstr "要從伺服器移除註冊，帳號必須被啟用。"
 
-#: gajim/gtk/accounts.py:962
+#: gajim/gtk/accounts.py:965
 #, fuzzy
 msgid "Password required"
 msgstr "需要密碼"
 
-#: gajim/gtk/accounts.py:976
+#: gajim/gtk/accounts.py:979
 #, fuzzy, python-format
 msgid "Account '%s' is still connected to the server"
 msgstr "帳號 \"%s\" 已連線到伺服器"
 
-#: gajim/gtk/accounts.py:978
+#: gajim/gtk/accounts.py:981
 msgid "If you remove it, the connection will be lost."
 msgstr "如果移除，將會丟失連線"
 
-#: gajim/gtk/accounts.py:995
+#: gajim/gtk/accounts.py:998
 #, python-format
 msgid "Connection to server %s failed"
 msgstr "連線伺服器 %s 失敗"
 
-#: gajim/gtk/accounts.py:996
+#: gajim/gtk/accounts.py:999
 msgid "What would you like to do?"
 msgstr "您想做什麼?"
 
-#: gajim/gtk/accounts.py:997
+#: gajim/gtk/accounts.py:1000
 msgid "Remove only from Gajim"
 msgstr "僅從 Gajim 移除帳號"
 
-#: gajim/gtk/accounts.py:998
+#: gajim/gtk/accounts.py:1001
 msgid "Don't remove anything. I'll try again later"
 msgstr "不要移除任何東西。我過一會兒會重試一下"
 
@@ -10678,6 +11006,10 @@ msgstr "<b>%(jid)s</b> 希望您 <b>%(action)s</b> 您的一些聯絡人。"
 msgid "Modify"
 msgstr "修改"
 
+#: gajim/gtk/roster_item_exchange.py:80
+msgid "JID"
+msgstr "JID"
+
 #: gajim/gtk/roster_item_exchange.py:86
 msgid "Groups"
 msgstr "群組"
@@ -10699,19 +11031,19 @@ msgid "Removed %d contact"
 msgid_plural "Removed %d contacts"
 msgstr[0] "移除了 %s 聯絡人"
 
-#: gajim/gtk/util.py:581
+#: gajim/gtk/util.py:583
 msgid "Unknown Artist"
 msgstr "不明演出者"
 
-#: gajim/gtk/util.py:582
+#: gajim/gtk/util.py:584
 msgid "Unknown Title"
 msgstr "不明標題"
 
-#: gajim/gtk/util.py:583
+#: gajim/gtk/util.py:585
 msgid "Unknown Source"
 msgstr "不明來源"
 
-#: gajim/gtk/util.py:585
+#: gajim/gtk/util.py:587
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
@@ -10720,27 +11052,10 @@ msgstr ""
 "<b>\"%(title)s\"</b> 作者 <i>%(artist)s</i>\n"
 "出自 <i>%(source)s</i>"
 
-#: gajim/gtk/bookmarks.py:121
-msgid "New Group Chat"
-msgstr "新聊天室"
-
-#: gajim/gtk/bookmarks.py:161
-msgid "This bookmark has invalid data"
-msgstr "此書籤含無效資料"
-
-#: gajim/gtk/bookmarks.py:162
-msgid ""
-"Please be sure to fill out server and room fields or remove this bookmark."
-msgstr "請確認填寫伺服器與聊天室欄位或移除此書籤。"
-
-#: gajim/gtk/bookmarks.py:273 gajim/gtk/bookmarks.py:291
-#: gajim/gtk/bookmarks.py:304 gajim/gtk/bookmarks.py:335
-msgid "Character not allowed"
-msgstr "不允許的字元"
-
-#: gajim/gtk/bookmarks.py:334
-msgid "Invalid room"
-msgstr "無效聊天室"
+#: gajim/gtk/bookmarks.py:47
+#, fuzzy, python-format
+msgid "Bookmarks for %s"
+msgstr "將本聊天室加入書籤(_B)"
 
 #: gajim/plugins/pluginmanager.py:736 gajim/plugins/pluginmanager.py:742
 msgid "Archive corrupted"
@@ -10751,48 +11066,51 @@ msgid "Archive empty"
 msgstr "存檔為空"
 
 #: gajim/plugins/pluginmanager.py:750 gajim/plugins/pluginmanager.py:758
-#: gajim/plugins/gui.py:257
+#: gajim/plugins/gui.py:258
 msgid "Archive is malformed"
 msgstr "存檔異常"
 
-#: gajim/plugins/pluginmanager.py:766 gajim/plugins/gui.py:281
-#: gajim/plugins/gui.py:289
+#: gajim/plugins/pluginmanager.py:766 gajim/plugins/gui.py:288
+#: gajim/plugins/gui.py:301
 msgid "Plugin already exists"
 msgstr "外掛程式已經存在"
 
-#: gajim/plugins/gui.py:82
+#: gajim/plugins/gui.py:83
 msgid "Click to view Gajim's wiki page on how to install plugins in Flatpak."
 msgstr ""
 
-#: gajim/plugins/gui.py:89
+#: gajim/plugins/gui.py:90
 msgid "Plugin"
 msgstr "外掛程式"
 
-#: gajim/plugins/gui.py:151
+#: gajim/plugins/gui.py:152
 #, fuzzy, python-format
 msgid "Warning: %s"
 msgstr "將封禁 %s"
 
-#: gajim/plugins/gui.py:206
+#: gajim/plugins/gui.py:207
 msgid "Plugin failed"
 msgstr "外掛程式失敗"
 
-#: gajim/plugins/gui.py:245
+#: gajim/plugins/gui.py:246
 msgid "Unable to properly remove the plugin"
 msgstr "無法適當地移除外掛程式"
 
-#: gajim/plugins/gui.py:281
-msgid "Overwrite?"
+#: gajim/plugins/gui.py:287
+#, fuzzy
+msgid "Overwrite Plugin?"
 msgstr "覆寫？"
 
+#: gajim/plugins/gui.py:289
+#, fuzzy
+msgid "Do you want to overwrite the currently installed version?"
+msgstr "您是否接受邀請?"
+
 #: data/org.gajim.Gajim.desktop.in:5
-msgid "Jabber IM Client"
+#, fuzzy
+msgid "XMPP IM Client"
 msgstr "Jabber 即時訊息客戶端"
 
-#: data/org.gajim.Gajim.desktop.in:6
-msgid "A GTK+ Jabber client"
-msgstr "一個 GTK+ 的 Jabber 客戶端"
-
 #: data/org.gajim.Gajim.desktop.in:8
 msgid "chat;messaging;im;xmpp;bonjour;voip;"
 msgstr ""
@@ -10844,7 +11162,7 @@ msgid "Easily send pictures, videos or other files to friends and groups"
 msgstr ""
 
 #: data/org.gajim.Gajim.appdata.xml.in:27
-msgid "Chat securely with End-to-End encryption via OMEMO or PGP"
+msgid "Chat securely with End-to-End encryption via OMEMO or OpenPGP"
 msgstr ""
 
 #: data/org.gajim.Gajim.appdata.xml.in:28
@@ -10906,7 +11224,7 @@ msgstr ""
 
 #: data/org.gajim.Gajim.appdata.xml.in:52
 #, fuzzy
-msgid "Roster, list of contacts"
+msgid "Contact list, list of contacts"
 msgstr "記錄聯絡人狀態變化(_L)"
 
 #: data/org.gajim.Gajim.appdata.xml.in:56
@@ -10928,6 +11246,517 @@ msgstr "最近:"
 msgid "Plugin manager"
 msgstr "外掛程式失敗"
 
+#, fuzzy
+#~ msgid "Configure Services…"
+#~ msgstr "配置服務…"
+
+#, fuzzy
+#~ msgid "Group Chat Bookmarks"
+#~ msgstr "多人聊天(_G)"
+
+#, fuzzy
+#~ msgid "Add Bookmark"
+#~ msgstr "將本聊天室加入書籤(_B)"
+
+#, fuzzy
+#~ msgid "Remove Bookmark"
+#~ msgstr "將本聊天室加入書籤(_B)"
+
+#, fuzzy
+#~ msgid "Bookmark Name"
+#~ msgstr "將本聊天室加入書籤(_B)"
+
+#, fuzzy
+#~ msgid "_Server"
+#~ msgstr "伺服器(_S):"
+
+#, fuzzy
+#~ msgid "Roo_m"
+#~ msgstr "聊天室(_M):"
+
+#, fuzzy
+#~ msgid "_Password"
+#~ msgstr "密碼(_P):"
+
+#, fuzzy
+#~ msgid "Join chat when connected"
+#~ msgstr "聯絡人已中斷連線"
+
+#~ msgid "New Group Chat"
+#~ msgstr "新聊天室"
+
+#~ msgid "This bookmark has invalid data"
+#~ msgstr "此書籤含無效資料"
+
+#, fuzzy
+#~ msgid ""
+#~ "Please be sure to fill out server and group chat fields or remove this "
+#~ "bookmark."
+#~ msgstr "請確認填寫伺服器與聊天室欄位或移除此書籤。"
+
+#~ msgid "Character not allowed"
+#~ msgstr "不允許的字元"
+
+#, fuzzy
+#~ msgid "Invalid Group Chat"
+#~ msgstr "無效的聊天室 Jabber ID"
+
+#~ msgid "Unable to join group chat"
+#~ msgstr "無法加入聊天室"
+
+#~ msgid "You are banned from group chat <b>%s</b>."
+#~ msgstr "您被多人聊天 <b>%s</b> 封禁。"
+
+#, fuzzy
+#~ msgid "Remote server <b>%s</b> does not exist."
+#~ msgstr "多人聊天 <b>%s</b> 不存在。"
+
+#~ msgid "Group chat <b>%s</b> does not exist."
+#~ msgstr "多人聊天 <b>%s</b> 不存在。"
+
+#, fuzzy
+#~ msgid "Group chat creation is not permitted."
+#~ msgstr "聊天室建立是受限的。"
+
+#, fuzzy
+#~ msgid "You must use your registered nickname in <b>%s</b>."
+#~ msgstr "您已註冊的暱稱必須在多人聊天 <b>%s</b> 中使用。"
+
+#, fuzzy
+#~ msgid "You are not in the members list in group chat %s."
+#~ msgstr "您不在聊天室 %s 的成員清單中。"
+
+#, fuzzy
+#~ msgid "XMPP Address is not a group chat"
+#~ msgstr "這不是一個聊天室"
+
+#~ msgid "This is not a group chat"
+#~ msgstr "這不是一個聊天室"
+
+#, fuzzy
+#~ msgid "Please choose a group chat"
+#~ msgstr "請用您想要的名稱新增一個主題。"
+
+#~ msgid "Invalid Nickname"
+#~ msgstr "不合法的暱稱"
+
+#, fuzzy
+#~ msgid "Please choose a nickname"
+#~ msgstr "請用您想要的名稱新增一個主題。"
+
+#, fuzzy
+#~ msgid "Wrong server"
+#~ msgstr "錯誤的 uri"
+
+#, fuzzy
+#~ msgid "%s is not a group chat server"
+#~ msgstr "這不是一個聊天室"
+
+#, fuzzy
+#~ msgid ""
+#~ "How many lines to request from server when entering a group chat. -1 "
+#~ "means no limit."
+#~ msgstr "當加入多人聊天時，向伺服器請求聊天記錄的列數。-1 表示無限制"
+
+#, fuzzy
+#~ msgid ""
+#~ "Minutes of backlog to request when entering a group chat. -1 means no "
+#~ "limit."
+#~ msgstr "當加入多人聊天時，向伺服器請求多少分鐘以內的聊天記錄。-1 表示無限制"
+
+#, fuzzy
+#~ msgid ""
+#~ "How many lines to request from server when entering a group chat. -1 "
+#~ "means no limit, -2 means global value."
+#~ msgstr "當加入多人聊天時，向伺服器請求聊天記錄的列數。-1 表示無限制"
+
+#, fuzzy
+#~ msgid ""
+#~ "Minutes of backlog to request when entering a group chat. -1 means no "
+#~ "limit, -2 means global value."
+#~ msgstr "當加入多人聊天時，向伺服器請求多少分鐘以內的聊天記錄。-1 表示無限制"
+
+#, fuzzy
+#~ msgid "A Password is required to join the group chat %s. Please type it."
+#~ msgstr "需要密碼才能加入聊天室 %s。請輸入一個密碼。"
+
+#~ msgid "Not in Roster"
+#~ msgstr "不在聯絡人清單中"
+
+#~ msgid "I would like to add you to my roster"
+#~ msgstr "我希望將您加入到我的聯絡人清單"
+
+#, fuzzy
+#~ msgid "Add to Roster"
+#~ msgstr "加入至聯絡人清單(_A)"
+
+#, fuzzy
+#~ msgid "Audio Session"
+#~ msgstr "音訊測試"
+
+#, fuzzy
+#~ msgid "Video Session"
+#~ msgstr "視訊測試"
+
+#, fuzzy
+#~ msgid "Manage Room"
+#~ msgstr "管理聊天室(_M)"
+
+#, fuzzy
+#~ msgid "Configure Room"
+#~ msgstr "設定聊天室(_R)…"
+
+#, fuzzy
+#~ msgid "Destroy Room"
+#~ msgstr "刪除聊天室(_D)"
+
+#, fuzzy
+#~ msgid "Change Nick"
+#~ msgstr "變更暱稱(_N)…"
+
+#, fuzzy
+#~ msgid "Disconnect"
+#~ msgstr "中斷連線(_D)"
+
+#, fuzzy
+#~ msgid "Copy JID"
+#~ msgstr "聊天室 JID"
+
+#, fuzzy
+#~ msgid "Add to Roster…"
+#~ msgstr "加入至聯絡人清單(_A)"
+
+#, fuzzy
+#~ msgid "Copy JID/Email"
+#~ msgstr "複製 JID/電子郵件位址(_C)"
+
+#, fuzzy
+#~ msgid "JID: <i>%s</i>"
+#~ msgstr "Jabber ID: <i>%s</i>"
+
+#~ msgid "Changing Subject"
+#~ msgstr "正在更換話題"
+
+#~ msgid "Please specify the new subject:"
+#~ msgstr "請指定新話題:"
+
+#~ msgid "Room logging is now enabled"
+#~ msgstr "聊天室訊息記錄已啟用"
+
+#~ msgid "Room logging is now disabled"
+#~ msgstr "聊天室訊息記錄已停用"
+
+#, fuzzy
+#~ msgid "You (%s) joined the room"
+#~ msgstr "%s 加入聊天室"
+
+#~ msgid "Room logging is enabled"
+#~ msgstr "聊天室記錄被啟用"
+
+#, fuzzy
+#~ msgid "Unable to join groupchat"
+#~ msgstr "無法加入聊天室"
+
+#~ msgid "Groupchat Invitation"
+#~ msgstr "多人聊天邀請"
+
+#, fuzzy
+#~ msgid "%(jid)s has been invited in this room"
+#~ msgstr "%(nick)s 已經被從這個聊天室移除(%(reason)s)"
+
+#, fuzzy
+#~ msgid "JID is not a Groupchat"
+#~ msgstr "這不是一個聊天室"
+
+#~ msgid "Invalid JID"
+#~ msgstr "無效的 JID"
+
+#~ msgid "A connection is not available"
+#~ msgstr "一個連線無法使用"
+
+#, fuzzy
+#~ msgid "JID already in list"
+#~ msgstr "Jabber ID 已經在清單中了"
+
+#, fuzzy
+#~ msgid "For the chosen encryption there is no encryption method available"
+#~ msgstr "一個連線無法使用"
+
+#~ msgid "Removes contact from roster"
+#~ msgstr "從聯絡人清單移除聯絡人"
+
+#~ msgid "Not in roster"
+#~ msgstr "不在聯絡人清單中"
+
+#, fuzzy
+#~ msgid "File transfer request notification color."
+#~ msgstr "檔案傳輸請求"
+
+#, fuzzy
+#~ msgid "File transfer error notification color."
+#~ msgstr "檔案傳輸已取消"
+
+#, fuzzy
+#~ msgid "File transfer complete or stopped notification color."
+#~ msgstr "當檔案傳輸完成時彈出提示"
+
+#, fuzzy
+#~ msgid "Groupchat invitation notification color"
+#~ msgstr "多人聊天邀請"
+
+#~ msgid "Add * and [n] in roster title?"
+#~ msgstr "在聯絡人清單標題中加入 * 和 [n]?"
+
+#~ msgid "Hides the banner in two persons chat window"
+#~ msgstr "在雙人聊天視窗中隱藏標語"
+
+#, fuzzy
+#~ msgid ""
+#~ "Show the confirm metacontacts creation dialog or not? Empty string means "
+#~ "never show the dialog."
+#~ msgstr "是否顯示確認元聯絡人建立對話方塊?空字串意味著永遠不顯示對話方塊。"
+
+#~ msgid "Space separated list of ssl errors to ignore."
+#~ msgstr "應忽略的 SSL 錯誤清單，以空格分隔"
+
+#~ msgid "Answer to receipt requests"
+#~ msgstr "對回執請求的回應"
+
+#~ msgid "Sent receipt requests"
+#~ msgstr "傳送回執請求"
+
+#, fuzzy
+#~ msgid "Language for which misspelled words will be checked"
+#~ msgstr "想要進行拼寫檢查的語言"
+
+#~ msgid "I'm eating, so leave me a message."
+#~ msgstr "我在吃東西，請留言"
+
+#, fuzzy
+#~ msgid "from room %s"
+#~ msgstr " 來自聊天室 %s"
+
+#~ msgid "Leave Groupchats"
+#~ msgstr "離開聊天室"
+
+#, fuzzy
+#~ msgid "Auto Join"
+#~ msgstr "自動聯結(_U)"
+
+#, fuzzy
+#~ msgid "Room"
+#~ msgstr "聊天室:"
+
+#~ msgid "Jabber ID:"
+#~ msgstr "Jabber ID"
+
+#~ msgid "Occupant Actions"
+#~ msgstr "室友動作"
+
+#~ msgid "_Add to Roster"
+#~ msgstr "加入至聯絡人清單(_A)"
+
+#~ msgid "_Manage Room"
+#~ msgstr "管理聊天室(_M)"
+
+#~ msgid "Configure _Room..."
+#~ msgstr "設定聊天室(_R)…"
+
+#~ msgid "_Destroy Room"
+#~ msgstr "刪除聊天室(_D)"
+
+#~ msgid "Jabber ID"
+#~ msgstr "Jabber ID"
+
+#, fuzzy
+#~ msgid "account"
+#~ msgstr "帳號"
+
+#, fuzzy
+#~ msgid "Roster"
+#~ msgstr "顯示聯絡人清單(_R)"
+
+#~ msgid "Show only in roster"
+#~ msgstr "只顯示在聯絡人清單中"
+
+#~ msgid "in _roster"
+#~ msgstr "在聯絡人清單中(_R)"
+
+#, fuzzy
+#~ msgid "Roster Appearance"
+#~ msgstr "<b>聯絡人清單外觀</b>"
+
+#, fuzzy
+#~ msgid "Show chatstate in roster"
+#~ msgstr "在聯絡人清單顯示中聯絡人的頭像(_V)"
+
+#~ msgid "_Add to Roster..."
+#~ msgstr "加入至聯絡人清單(_A)…"
+
+#~ msgid "_Jabber ID:"
+#~ msgstr "_Jabber ID:"
+
+#, fuzzy
+#~ msgid "_Jabber ID"
+#~ msgstr "_Jabber ID:"
+
+#~ msgid "JabberID"
+#~ msgstr "JabberID"
+
+#, fuzzy
+#~ msgid "Show Roster"
+#~ msgstr "顯示聯絡人清單(_R)"
+
+#~ msgid "MUC server"
+#~ msgstr "多人聊天伺服器"
+
+#~ msgid "Room Configuration"
+#~ msgstr "聊天室設定"
+
+#~ msgid "Join _Group Chat"
+#~ msgstr "加入聊天室(_G)"
+
+#~ msgid "Toggle audio session"
+#~ msgstr "切換語音作業階段"
+
+#, fuzzy
+#~ msgid "Audio sessions are not available"
+#~ msgstr "一個連線無法使用"
+
+#~ msgid "Conference"
+#~ msgstr "會議"
+
+#, fuzzy
+#~ msgid "_Manage Bookmarks…"
+#~ msgstr "書籤管理"
+
+#~ msgid "Hide _Roster"
+#~ msgstr "隱藏聯絡人清單(_R)"
+
+#~ msgid "Show _Roster"
+#~ msgstr "顯示聯絡人清單(_R)"
+
+#, fuzzy
+#~ msgid "Invalid Room"
+#~ msgstr "無效聊天室"
+
+#~ msgid "Invalid room"
+#~ msgstr "無效聊天室"
+
+#~ msgid "A GTK+ Jabber client"
+#~ msgstr "一個 GTK+ 的 Jabber 客戶端"
+
+#~ msgid "Changing Nickname"
+#~ msgstr "正在更換暱稱"
+
+#~ msgid "Please specify the new nickname you want to use:"
+#~ msgstr "請指定您想使用的新暱稱:"
+
+#~ msgid "Bookmark already set"
+#~ msgstr "書籤已設定"
+
+#, fuzzy
+#~ msgid "Group Chat '%s' is already in your bookmarks."
+#~ msgstr "聊天室\"%s\"已在您的書籤中。"
+
+#~ msgid "Bookmark has been added successfully"
+#~ msgstr "書籤加入成功"
+
+#, fuzzy
+#~ msgid ""
+#~ "You can manage your bookmarks by clicking the Bookmarks menu item in your "
+#~ "contact list."
+#~ msgstr "您可以透過\"動作\"選單管理您的書籤。"
+
+#, fuzzy
+#~ msgid "The nickname contains invalid characters."
+#~ msgstr "暱稱包含不合法字元。"
+
+#, fuzzy
+#~ msgid "Bookmark Room"
+#~ msgstr "將本聊天室加入書籤(_B)"
+
+#~ msgid "_Join New Group Chat"
+#~ msgstr "加入新的聊天室(_J)"
+
+#, fuzzy
+#~ msgid "_Create Group Chat"
+#~ msgstr "離開聊天室"
+
+#, fuzzy
+#~ msgid "Name:"
+#~ msgstr "名稱: "
+
+#~ msgid "Description:"
+#~ msgstr "描述:"
+
+#, fuzzy
+#~ msgid "Address:"
+#~ msgstr "位址(_A):"
+
+#, fuzzy
+#~ msgid "You can not start a new conversation unless you are connected."
+#~ msgstr "您必須連線才能加入聊天室。"
+
+#, fuzzy
+#~ msgid "Occupants"
+#~ msgstr "室友動作"
+
+#, fuzzy
+#~ msgid "File transfer error"
+#~ msgstr "檔案傳輸錯誤"
+
+#, fuzzy
+#~ msgid "No Accounts available"
+#~ msgstr "沒有有效帳號"
+
+#~ msgid "_Modify Account..."
+#~ msgstr "修改帳號(_M)…"
+
+#~ msgid "Boolean"
+#~ msgstr "Boolean"
+
+#~ msgid "Integer"
+#~ msgstr "Integer"
+
+#~ msgid "Text"
+#~ msgstr "Text"
+
+#~ msgid "Value"
+#~ msgstr "值"
+
+#~ msgid "Type"
+#~ msgstr "類型"
+
+#~ msgid "(None)"
+#~ msgstr "(無)"
+
+#~ msgid "Hidden"
+#~ msgstr "隱藏"
+
+#~ msgid "Manage Proxy Profiles"
+#~ msgstr "管理代理伺服器設定"
+
+#, fuzzy
+#~ msgid "Properties"
+#~ msgstr "<b>屬性</b>"
+
+#, fuzzy
+#~ msgid "Proxy _Host"
+#~ msgstr "代理伺服器位址(_H):"
+
+#, fuzzy
+#~ msgid "Proxy _Port"
+#~ msgstr "代理伺服器連接埠(_P):"
+
+#, fuzzy
+#~ msgid "New Groupchat"
+#~ msgstr "新聊天室"
+
+#, fuzzy
+#~ msgid "New Contact"
+#~ msgstr "加入聯絡人"
+
 #~ msgid "%s GiB"
 #~ msgstr "%s GiB"
 
@@ -11004,9 +11833,6 @@ msgstr "外掛程式失敗"
 #~ msgid "_Pause"
 #~ msgstr "暫停(_P)"
 
-#~ msgid "Clean _up"
-#~ msgstr "清除(_U)"
-
 #~ msgid "Remove file transfer from the list."
 #~ msgstr "從清單中移除檔案傳輸。"
 
@@ -11027,10 +11853,6 @@ msgstr "外掛程式失敗"
 #~ msgid "When a file transfer is complete show a popup notification"
 #~ msgstr "當檔案傳輸完成時彈出提示"
 
-#, fuzzy
-#~ msgid "Select Files"
-#~ msgstr "清潔"
-
 #~ msgid "From:"
 #~ msgstr "從:"
 
@@ -11423,9 +12245,6 @@ msgstr "外掛程式失敗"
 #~ msgid "You are invited to a groupchat"
 #~ msgstr "您被邀請到一個聊天室"
 
-#~ msgid "Do you want to accept the invitation?"
-#~ msgstr "您是否接受邀請?"
-
 #, fuzzy
 #~ msgid ""
 #~ "<b>Issued to:</b>\n"
@@ -11493,10 +12312,6 @@ msgstr "外掛程式失敗"
 #~ msgid "Do you wish to delete all correspondence with the selected contacts?"
 #~ msgstr "您真的要刪除已選聯絡人的記錄檔嗎？"
 
-#, fuzzy
-#~ msgid "This can not be undone."
-#~ msgstr "找不到該服務"
-
 #~ msgid "<b>What do you want to do?</b>"
 #~ msgstr "<b>您想要做什麼?</b>"
 
@@ -11665,10 +12480,6 @@ msgstr "外掛程式失敗"
 #~ msgid "Nick"
 #~ msgstr "暱稱"
 
-#, fuzzy
-#~ msgid "Banning…"
-#~ msgstr "封禁…"
-
 #~ msgid ""
 #~ "<b>Whom do you want to ban?</b>\n"
 #~ "\n"
@@ -11752,10 +12563,6 @@ msgstr "外掛程式失敗"
 #~ msgid "Filter:"
 #~ msgstr "過濾器:"
 
-#~ msgid ""
-#~ "If checked, Gajim will display the mood of contacts in the roster window"
-#~ msgstr "如果選取，Gajim 會在聯絡人清單視窗中顯示聯絡人的心情。"
-
 #~ msgid "<b>Chat Appearance</b>"
 #~ msgstr "<b>聊天視窗外觀</b>"
 
@@ -12006,10 +12813,6 @@ msgstr "外掛程式失敗"
 #~ msgstr "狀態訊息:(_S)"
 
 #, fuzzy
-#~ msgid "Group chat highlight"
-#~ msgstr "多人聊天訊息高亮度顯示"
-
-#, fuzzy
 #~ msgid "Your nickname"
 #~ msgstr "您的暱稱:"
 
@@ -12148,9 +12951,6 @@ msgstr "外掛程式失敗"
 #~ msgid "The passwords typed in both fields must be identical."
 #~ msgstr "在兩個輸入框中輸入的密碼必須一致。"
 
-#~ msgid "Enter new password:"
-#~ msgstr "輸入新的密碼"
-
 #~ msgid "Enter it again for confirmation:"
 #~ msgstr "再次輸入以確認:"
 
@@ -12164,10 +12964,6 @@ msgstr "外掛程式失敗"
 #~ msgid "unsubscribe request from %s"
 #~ msgstr "來自 %s 的解除認證請求"
 
-#, fuzzy
-#~ msgid "Autojoin"
-#~ msgstr "自動聯結(_U)"
-
 #~ msgid "&lt;empty&gt;"
 #~ msgstr "&lt;empty&gt;"
 
@@ -12273,9 +13069,6 @@ msgstr "外掛程式失敗"
 #~ msgid "Forward unread message then disconnect"
 #~ msgstr " 轉發未讀訊息然後中斷連線"
 
-#~ msgid "AIM Address:"
-#~ msgstr "AIM 位址:"
-
 #~ msgid "MSN Address:"
 #~ msgstr "MSN 位址:"
 
@@ -12326,9 +13119,6 @@ msgstr "外掛程式失敗"
 #~ msgid "Session negotiation cancelled"
 #~ msgstr "作業階段協商已取消"
 
-#~ msgid "This session WILL be archived on server"
-#~ msgstr "本次作業階段將在伺服器上被存檔"
-
 #~ msgid "This session WILL NOT be archived on server"
 #~ msgstr "本次作業階段將不會在伺服器上被存檔"
 
@@ -12644,9 +13434,6 @@ msgstr "外掛程式失敗"
 #~ msgid "Server:"
 #~ msgstr "伺服器:"
 
-#~ msgid "Password:"
-#~ msgstr "密碼:"
-
 #~ msgid "Join this room _automatically when I connect"
 #~ msgstr "當我連線後自動加入此聊天室(_A)"
 
@@ -12963,9 +13750,6 @@ msgstr "外掛程式失敗"
 #~ msgid "_Edit Personal Information..."
 #~ msgstr "編輯個人資訊…"
 
-#~ msgid "Information about you, as stored in the server"
-#~ msgstr "伺服器中儲存的關於您的資訊"
-
 #~ msgid "<b>Personal Information</b>"
 #~ msgstr "<b>個人資訊</b>"
 
@@ -13039,9 +13823,6 @@ msgstr "外掛程式失敗"
 #~ msgid "Your server can't save your personal information."
 #~ msgstr "您的伺服器無法儲存您的個人資訊。"
 
-#~ msgid "Account Local already exists."
-#~ msgstr "帳號本地已存在。"
-
 #~ msgid "Please rename or remove it before enabling link-local messaging."
 #~ msgstr "請在使用本地訊息前重新命名或移除它。"
 
@@ -13188,10 +13969,6 @@ msgstr "外掛程式失敗"
 #~ msgid "The following message was NOT encrypted"
 #~ msgstr "下面的訊息沒有被加密"
 
-#, fuzzy
-#~ msgid "Encryption used for this contact."
-#~ msgstr "為這個帳號啟用 ESession 加密。"
-
 #~ msgid "Toggle Open_PGP Encryption"
 #~ msgstr "切換Open_PGP加密"
 
@@ -13266,10 +14043,6 @@ msgstr "外掛程式失敗"
 #~ msgid "Contact's identity verified"
 #~ msgstr "聯絡人身分已確認"
 
-#, fuzzy
-#~ msgid "Verify again…"
-#~ msgstr "重新驗證…"
-
 #~ msgid ""
 #~ "To be certain that <b>only</b> the expected person can read your messages "
 #~ "or send you messages, you need to verify their identity by clicking the "
@@ -13386,9 +14159,6 @@ msgstr "外掛程式失敗"
 #~ msgid "Add _Contact..."
 #~ msgstr "加入聯絡人(_C)…"
 
-#~ msgid "_Accounts"
-#~ msgstr "帳號(_A)"
-
 #~ msgid "P_lugins"
 #~ msgstr "外掛程式(_L)"
 
@@ -13634,12 +14404,6 @@ msgstr "外掛程式失敗"
 #~ msgid "Activity: "
 #~ msgstr "活動:"
 
-#~ msgid "Join _Group Chat..."
-#~ msgstr "加入聊天室(_G)…"
-
-#~ msgid "_Modify Account"
-#~ msgstr "修改帳號資訊(_M)"
-
 #~ msgid "Check on startup if Gajim is the _default Jabber client"
 #~ msgstr "在啟動是偵測 Gajim 是否是預設的 Jabber 客戶端程式"